From db7d33cfd7ed93c1c4a58320589b142f4348284a Mon Sep 17 00:00:00 2001 From: James <> Date: Tue, 11 Feb 2014 11:49:23 +0000 Subject: fish --- master/config | 4172 + master/endstop | 2510 + master/feeds | 1276641 ++++++++++++++++++++++++++++++++++ master/fix-asterisk | 13 + master/modem-manager-and-deps | 1240 + master/network-manager | 306 + master/newer-dbus-glib | 920 + master/status | 0 master/tpl3040-always-bitbang-spi | 177 + master/tpl3040-big-roms | 46 + master/tpl3040-fix-ethernet | 19 + master/tpl3040-kernel-config | 0 master/tpl3040-sdcard-spi | 119 + 13 files changed, 1286163 insertions(+) create mode 100644 master/config create mode 100644 master/endstop create mode 100644 master/feeds create mode 100644 master/fix-asterisk create mode 100644 master/modem-manager-and-deps create mode 100644 master/network-manager create mode 100644 master/newer-dbus-glib create mode 100644 master/status create mode 100644 master/tpl3040-always-bitbang-spi create mode 100644 master/tpl3040-big-roms create mode 100644 master/tpl3040-fix-ethernet create mode 100644 master/tpl3040-kernel-config create mode 100644 master/tpl3040-sdcard-spi diff --git a/master/config b/master/config new file mode 100644 index 0000000..4f372ad --- /dev/null +++ b/master/config @@ -0,0 +1,4172 @@ +diff --git a/.config b/.config +new file mode 100644 +index 0000000..cce1efc +--- /dev/null ++++ b/.config +@@ -0,0 +1,4166 @@ ++# ++# Automatically generated make config: don't edit ++# OpenWrt version: Barrier Breaker (r36060) ++# Sat Mar 23 05:43:05 2013 ++# ++CONFIG_HAVE_DOT_CONFIG=y ++# CONFIG_TARGET_ppc40x is not set ++# CONFIG_TARGET_ppc44x is not set ++# CONFIG_TARGET_realview is not set ++# CONFIG_TARGET_atheros is not set ++CONFIG_TARGET_ar71xx=y ++# CONFIG_TARGET_at91 is not set ++# CONFIG_TARGET_avr32 is not set ++# CONFIG_TARGET_brcm2708 is not set ++# CONFIG_TARGET_brcm63xx is not set ++# CONFIG_TARGET_brcm47xx is not set ++# CONFIG_TARGET_sibyte is not set ++# CONFIG_TARGET_cns21xx is not set ++# CONFIG_TARGET_cns3xxx is not set ++# CONFIG_TARGET_ep93xx is not set ++# CONFIG_TARGET_cobalt is not set ++# CONFIG_TARGET_gemini is not set ++# CONFIG_TARGET_mpc52xx is not set ++# CONFIG_TARGET_mpc83xx is not set ++# CONFIG_TARGET_mpc85xx is not set ++# CONFIG_TARGET_amazon is not set ++# CONFIG_TARGET_adm8668 is not set ++# CONFIG_TARGET_adm5120 is not set ++# CONFIG_TARGET_xburst is not set ++# CONFIG_TARGET_iop32x is not set ++# CONFIG_TARGET_ixp4xx is not set ++# CONFIG_TARGET_lantiq is not set ++# CONFIG_TARGET_malta is not set ++# CONFIG_TARGET_mvebu is not set ++# CONFIG_TARGET_kirkwood is not set ++# CONFIG_TARGET_orion is not set ++# CONFIG_TARGET_pxa is not set ++# CONFIG_TARGET_rb532 is not set ++# CONFIG_TARGET_mcs814x is not set ++# CONFIG_TARGET_au1000 is not set ++# CONFIG_TARGET_ramips is not set ++# CONFIG_TARGET_sparc is not set ++# CONFIG_TARGET_ar7 is not set ++# CONFIG_TARGET_omap24xx is not set ++# CONFIG_TARGET_omap4 is not set ++# CONFIG_TARGET_uml is not set ++# CONFIG_TARGET_x86 is not set ++# CONFIG_TARGET_at91_9g20 is not set ++# CONFIG_TARGET_at91_9260 is not set ++# CONFIG_TARGET_at91_9263 is not set ++CONFIG_TARGET_ar71xx_generic=y ++# CONFIG_TARGET_ar71xx_nand is not set ++# CONFIG_TARGET_x86_generic is not set ++# CONFIG_TARGET_x86_olpc is not set ++# CONFIG_TARGET_x86_xen_domu is not set ++# CONFIG_TARGET_x86_ep80579 is not set ++# CONFIG_TARGET_x86_net5501 is not set ++# CONFIG_TARGET_x86_kvm_guest is not set ++# CONFIG_TARGET_x86_geos is not set ++# CONFIG_TARGET_x86_alix2 is not set ++# CONFIG_TARGET_x86_thincan is not set ++# CONFIG_TARGET_x86_rdc is not set ++# CONFIG_TARGET_malta_le is not set ++# CONFIG_TARGET_malta_be is not set ++# CONFIG_TARGET_adm5120_router_le is not set ++# CONFIG_TARGET_adm5120_router_be is not set ++# CONFIG_TARGET_adm5120_rb1xx is not set ++# CONFIG_TARGET_orion_generic is not set ++# CONFIG_TARGET_orion_harddisk is not set ++# CONFIG_TARGET_orion_dns323 is not set ++# CONFIG_TARGET_ixp4xx_generic is not set ++# CONFIG_TARGET_ixp4xx_harddisk is not set ++# CONFIG_TARGET_au1000_au1500 is not set ++# CONFIG_TARGET_au1000_au1550 is not set ++# CONFIG_TARGET_ramips_rt288x is not set ++# CONFIG_TARGET_ramips_rt305x is not set ++# CONFIG_TARGET_ramips_rt3883 is not set ++# CONFIG_TARGET_xburst_qi_lb60 is not set ++# CONFIG_TARGET_xburst_n516 is not set ++# CONFIG_TARGET_xburst_n526 is not set ++# CONFIG_TARGET_xburst_id800wt is not set ++# CONFIG_TARGET_lantiq_xway is not set ++# CONFIG_TARGET_lantiq_ase is not set ++# CONFIG_TARGET_lantiq_falcon is not set ++# CONFIG_TARGET_ar7_generic is not set ++# CONFIG_TARGET_ar7_ac49x is not set ++# CONFIG_TARGET_at91_9g20_Default is not set ++# CONFIG_TARGET_at91_9260_flexibity-minimal is not set ++# CONFIG_TARGET_at91_9260_flexibity-xwrt is not set ++# CONFIG_TARGET_at91_9260_flexibity-luci is not set ++# CONFIG_TARGET_at91_9263_Default is not set ++# CONFIG_TARGET_cns3xxx_Default is not set ++# CONFIG_TARGET_mpc85xx_Default is not set ++# CONFIG_TARGET_mpc85xx_TLWDR4900 is not set ++# CONFIG_TARGET_realview_Default is not set ++# CONFIG_TARGET_ppc40x_Default is not set ++# CONFIG_TARGET_ep93xx_Default is not set ++# CONFIG_TARGET_ep93xx_Simone is not set ++# CONFIG_TARGET_sparc_Default is not set ++# CONFIG_TARGET_ar71xx_generic_Default is not set ++# CONFIG_TARGET_ar71xx_generic_Minimal is not set ++# CONFIG_TARGET_ar71xx_generic_ath5k is not set ++# CONFIG_TARGET_ar71xx_generic_ALFAAP96 is not set ++# CONFIG_TARGET_ar71xx_generic_HORNETUB is not set ++# CONFIG_TARGET_ar71xx_generic_ALFANX is not set ++# CONFIG_TARGET_ar71xx_generic_ALL0305 is not set ++# CONFIG_TARGET_ar71xx_generic_ALL0258N is not set ++# CONFIG_TARGET_ar71xx_generic_ALL0315N is not set ++# CONFIG_TARGET_ar71xx_generic_AP113 is not set ++# CONFIG_TARGET_ar71xx_generic_AP121 is not set ++# CONFIG_TARGET_ar71xx_generic_AP121MINI is not set ++# CONFIG_TARGET_ar71xx_generic_AP132 is not set ++# CONFIG_TARGET_ar71xx_generic_AP135 is not set ++# CONFIG_TARGET_ar71xx_generic_AP136 is not set ++# CONFIG_TARGET_ar71xx_generic_AP81 is not set ++# CONFIG_TARGET_ar71xx_generic_AP83 is not set ++# CONFIG_TARGET_ar71xx_generic_AP96 is not set ++# CONFIG_TARGET_ar71xx_generic_DB120 is not set ++# CONFIG_TARGET_ar71xx_generic_PB42 is not set ++# CONFIG_TARGET_ar71xx_generic_PB44 is not set ++# CONFIG_TARGET_ar71xx_generic_PB92 is not set ++# CONFIG_TARGET_ar71xx_generic_A02RBW300N is not set ++# CONFIG_TARGET_ar71xx_generic_WZRHPG300NH is not set ++# CONFIG_TARGET_ar71xx_generic_WZRHPG300NH2 is not set ++# CONFIG_TARGET_ar71xx_generic_WZRHPAG300H is not set ++# CONFIG_TARGET_ar71xx_generic_WZRHPG450H is not set ++# CONFIG_TARGET_ar71xx_generic_WZR600DHP is not set ++# CONFIG_TARGET_ar71xx_generic_WHRG301N is not set ++# CONFIG_TARGET_ar71xx_generic_WHRHPG300N is not set ++# CONFIG_TARGET_ar71xx_generic_WHRHPGN is not set ++# CONFIG_TARGET_ar71xx_generic_WLAEAG300N is not set ++# CONFIG_TARGET_ar71xx_generic_WP543 is not set ++# CONFIG_TARGET_ar71xx_generic_WPE72 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR600A1 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR601A1 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR615C1 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR615E4 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR825B1 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR825C1 is not set ++# CONFIG_TARGET_ar71xx_generic_DIR835A1 is not set ++# CONFIG_TARGET_ar71xx_generic_EWDORIN is not set ++# CONFIG_TARGET_ar71xx_generic_JA76PF is not set ++# CONFIG_TARGET_ar71xx_generic_JA76PF2 is not set ++# CONFIG_TARGET_ar71xx_generic_JWAP003 is not set ++# CONFIG_TARGET_ar71xx_generic_WRT160NL is not set ++# CONFIG_TARGET_ar71xx_generic_WRT400N is not set ++# CONFIG_TARGET_ar71xx_generic_WNDR3700 is not set ++# CONFIG_TARGET_ar71xx_generic_WNDR4300 is not set ++# CONFIG_TARGET_ar71xx_generic_OM2P is not set ++# CONFIG_TARGET_ar71xx_generic_MR600 is not set ++# CONFIG_TARGET_ar71xx_generic_OPENMESH is not set ++# CONFIG_TARGET_ar71xx_generic_UBDEV01 is not set ++# CONFIG_TARGET_ar71xx_generic_DLRTDEV01 is not set ++# CONFIG_TARGET_ar71xx_generic_MZKW04NU is not set ++# CONFIG_TARGET_ar71xx_generic_MZKW300NH is not set ++# CONFIG_TARGET_ar71xx_generic_RW2458N is not set ++# CONFIG_TARGET_ar71xx_generic_CAP4200AG is not set ++# CONFIG_TARGET_ar71xx_generic_TLMR11U is not set ++# CONFIG_TARGET_ar71xx_generic_TLMR3020 is not set ++CONFIG_TARGET_ar71xx_generic_TLMR3040=y ++# CONFIG_TARGET_ar71xx_generic_TLMR3220 is not set ++# CONFIG_TARGET_ar71xx_generic_TLMR3420 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR703 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWA701 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWA7510 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWA801 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWA830 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWA901 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWDR4300 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR740 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR741 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR743 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR841 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR842 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR941 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR1041 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR1043 is not set ++# CONFIG_TARGET_ar71xx_generic_TLWR2543 is not set ++# CONFIG_TARGET_ar71xx_generic_TEW632BRP is not set ++# CONFIG_TARGET_ar71xx_generic_TEW652BRP is not set ++# CONFIG_TARGET_ar71xx_generic_TEW673GRU is not set ++# CONFIG_TARGET_ar71xx_generic_TEW712BR is not set ++# CONFIG_TARGET_ar71xx_generic_UBNTRS is not set ++# CONFIG_TARGET_ar71xx_generic_UBNTRSPRO is not set ++# CONFIG_TARGET_ar71xx_generic_UBNTUNIFI is not set ++# CONFIG_TARGET_ar71xx_generic_UBNTUNIFIOUTDOOR is not set ++# CONFIG_TARGET_ar71xx_generic_UAPPRO is not set ++# CONFIG_TARGET_ar71xx_generic_UBNT is not set ++# CONFIG_TARGET_ar71xx_generic_ZCN1523H28 is not set ++# CONFIG_TARGET_ar71xx_generic_ZCN1523H516 is not set ++# CONFIG_TARGET_ar71xx_generic_NBG_460N_550N_550NH is not set ++# CONFIG_TARGET_ar71xx_nand_DefaultNoWifi is not set ++# CONFIG_TARGET_ar71xx_nand_Ath5k is not set ++# CONFIG_TARGET_pxa_Default is not set ++# CONFIG_TARGET_pxa_Gumstix is not set ++# CONFIG_TARGET_x86_generic_Generic is not set ++# CONFIG_TARGET_x86_generic_Soekris45xx is not set ++# CONFIG_TARGET_x86_generic_Soekris48xx is not set ++# CONFIG_TARGET_x86_generic_Wrap is not set ++# CONFIG_TARGET_x86_olpc_Default is not set ++# CONFIG_TARGET_x86_xen_domu_Default is not set ++# CONFIG_TARGET_x86_ep80579_Default is not set ++# CONFIG_TARGET_x86_net5501_Default is not set ++# CONFIG_TARGET_x86_kvm_guest_Default is not set ++# CONFIG_TARGET_x86_geos_Default is not set ++# CONFIG_TARGET_x86_alix2_Default is not set ++# CONFIG_TARGET_x86_thincan_DBE61 is not set ++# CONFIG_TARGET_x86_rdc_ar525w is not set ++# CONFIG_TARGET_x86_rdc_bifferboard is not set ++# CONFIG_TARGET_x86_rdc_r8610 is not set ++# CONFIG_TARGET_x86_rdc_sitecom is not set ++# CONFIG_TARGET_avr32_Default is not set ++# CONFIG_TARGET_iop32x_Default is not set ++# CONFIG_TARGET_malta_le_Default is not set ++# CONFIG_TARGET_malta_be_Default is not set ++# CONFIG_TARGET_adm5120_router_le_Generic is not set ++# CONFIG_TARGET_adm5120_router_le_EB-214A is not set ++# CONFIG_TARGET_adm5120_router_le_CAS630 is not set ++# CONFIG_TARGET_adm5120_router_le_CAS630W is not set ++# CONFIG_TARGET_adm5120_router_le_CAS670 is not set ++# CONFIG_TARGET_adm5120_router_le_CAS670W is not set ++# CONFIG_TARGET_adm5120_router_le_CAS700 is not set ++# CONFIG_TARGET_adm5120_router_le_CAS700W is not set ++# CONFIG_TARGET_adm5120_router_le_CAS771 is not set ++# CONFIG_TARGET_adm5120_router_le_CAS771W is not set ++# CONFIG_TARGET_adm5120_router_le_CAS790 is not set ++# CONFIG_TARGET_adm5120_router_le_CAS861 is not set ++# CONFIG_TARGET_adm5120_router_le_CAS861W is not set ++# CONFIG_TARGET_adm5120_router_le_NFS101U is not set ++# CONFIG_TARGET_adm5120_router_le_NFS101WU is not set ++# CONFIG_TARGET_adm5120_router_le_NP27G is not set ++# CONFIG_TARGET_adm5120_router_le_NP28G is not set ++# CONFIG_TARGET_adm5120_router_le_WP54 is not set ++# CONFIG_TARGET_adm5120_router_le_BR6104K is not set ++# CONFIG_TARGET_adm5120_router_le_BR6104KP is not set ++# CONFIG_TARGET_adm5120_router_le_BR6104WG is not set ++# CONFIG_TARGET_adm5120_router_le_BR6114WG is not set ++# CONFIG_TARGET_adm5120_router_le_EASY5120RT is not set ++# CONFIG_TARGET_adm5120_router_le_EASY5120PATA is not set ++# CONFIG_TARGET_adm5120_router_le_PMUGW is not set ++# CONFIG_TARGET_adm5120_router_le_5GXI is not set ++# CONFIG_TARGET_adm5120_router_be_Generic is not set ++# CONFIG_TARGET_adm5120_router_be_P334WT is not set ++# CONFIG_TARGET_adm5120_router_be_P335WT is not set ++# CONFIG_TARGET_adm5120_rb1xx_RouterBoard is not set ++# CONFIG_TARGET_atheros_Default is not set ++# CONFIG_TARGET_mvebu_Generic is not set ++# CONFIG_TARGET_sibyte_Default is not set ++# CONFIG_TARGET_cobalt_Default is not set ++# CONFIG_TARGET_ppc44x_Default is not set ++# CONFIG_TARGET_uml_Default is not set ++# CONFIG_TARGET_adm8668_WRTU54G-TM is not set ++# CONFIG_TARGET_orion_generic_Default is not set ++# CONFIG_TARGET_orion_harddisk_Default is not set ++# CONFIG_TARGET_orion_dns323_Default is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-b43 is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-wl is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-ath5k is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-none is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-b44-b43 is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-b44-wl is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-b44-ath5k is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-b44-none is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-tg3-b43 is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-tg3-wl is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-tg3-none is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-bgmac-b43 is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-bgmac-wl is not set ++# CONFIG_TARGET_brcm47xx_Broadcom-bgmac-none is not set ++# CONFIG_TARGET_brcm47xx_Ps1208mfg is not set ++# CONFIG_TARGET_brcm47xx_WGT634U is not set ++# CONFIG_TARGET_brcm47xx_WL500GPv1 is not set ++# CONFIG_TARGET_brcm47xx_WRT350Nv1 is not set ++# CONFIG_TARGET_brcm47xx_WRTSL54GS is not set ++# CONFIG_TARGET_mcs814x_Generic is not set ++# CONFIG_TARGET_mcs814x_dLAN_USB_Extender is not set ++# CONFIG_TARGET_ixp4xx_generic_Default is not set ++# CONFIG_TARGET_ixp4xx_generic_Atheros-ath5k is not set ++# CONFIG_TARGET_ixp4xx_generic_NSLU2 is not set ++# CONFIG_TARGET_ixp4xx_generic_NAS100d is not set ++# CONFIG_TARGET_ixp4xx_generic_DSMG600RevA is not set ++# CONFIG_TARGET_ixp4xx_generic_USR8200 is not set ++# CONFIG_TARGET_ixp4xx_harddisk_FSG3 is not set ++# CONFIG_TARGET_au1000_au1500_Atheros is not set ++# CONFIG_TARGET_au1000_au1500_InternetBox is not set ++# CONFIG_TARGET_au1000_au1500_MeshCube is not set ++# CONFIG_TARGET_au1000_au1550_DBAu1550 is not set ++# CONFIG_TARGET_cns21xx_Default is not set ++# CONFIG_TARGET_mpc83xx_Default is not set ++# CONFIG_TARGET_ramips_rt288x_Default is not set ++# CONFIG_TARGET_ramips_rt288x_RTN15 is not set ++# CONFIG_TARGET_ramips_rt288x_F5D8235V1 is not set ++# CONFIG_TARGET_ramips_rt288x_BR6524N is not set ++# CONFIG_TARGET_ramips_rt305x_Default is not set ++# CONFIG_TARGET_ramips_rt305x_ALL02393G is not set ++# CONFIG_TARGET_ramips_rt305x_ALL0256N is not set ++# CONFIG_TARGET_ramips_rt305x_ALL5002 is not set ++# CONFIG_TARGET_ramips_rt305x_HW5503G is not set ++# CONFIG_TARGET_ramips_rt305x_F5D8235V2 is not set ++# CONFIG_TARGET_ramips_rt305x_BROADWAY is not set ++# CONFIG_TARGET_ramips_rt305x_ESR9753 is not set ++# CONFIG_TARGET_ramips_rt305x_FONERA20N is not set ++# CONFIG_TARGET_ramips_rt305x_FREESTATION5 is not set ++# CONFIG_TARGET_ramips_rt305x_RT-N13U is not set ++# CONFIG_TARGET_ramips_rt305x_3G300M is not set ++# CONFIG_TARGET_ramips_rt305x_W306R_V20 is not set ++# CONFIG_TARGET_ramips_rt305x_UPVEL is not set ++# CONFIG_TARGET_ramips_rt305x_UPVEL_326 is not set ++# CONFIG_TARGET_ramips_rt3883_Default is not set ++# CONFIG_TARGET_ramips_rt3883_RTN56U is not set ++# CONFIG_TARGET_ramips_rt3883_DIR645 is not set ++# CONFIG_TARGET_ramips_rt3883_TEW691GR is not set ++# CONFIG_TARGET_ramips_rt3883_TEW692GR is not set ++# CONFIG_TARGET_brcm2708_RaspberryPi is not set ++# CONFIG_TARGET_rb532_Default is not set ++# CONFIG_TARGET_gemini_Default is not set ++# CONFIG_TARGET_omap24xx_n810-base is not set ++# CONFIG_TARGET_omap24xx_n810-gui is not set ++# CONFIG_TARGET_brcm63xx_Broadcom is not set ++# CONFIG_TARGET_brcm63xx_Broadcom-wl is not set ++# CONFIG_TARGET_brcm63xx_Atheros is not set ++# CONFIG_TARGET_brcm63xx_Ralink is not set ++# CONFIG_TARGET_brcm63xx_NoWiFi is not set ++# CONFIG_TARGET_brcm63xx_Broadcom-brcmsmac is not set ++# CONFIG_TARGET_brcm63xx_GW6X00 is not set ++# CONFIG_TARGET_brcm63xx_HW556 is not set ++# CONFIG_TARGET_kirkwood_Default is not set ++# CONFIG_TARGET_xburst_qi_lb60_Default is not set ++# CONFIG_TARGET_xburst_n516_Default is not set ++# CONFIG_TARGET_xburst_n526_Default is not set ++# CONFIG_TARGET_xburst_id800wt_Default is not set ++# CONFIG_TARGET_omap4_Default is not set ++# CONFIG_TARGET_amazon_Default is not set ++# CONFIG_TARGET_mpc52xx_Default is not set ++# CONFIG_TARGET_lantiq_xway_ARV4525PW is not set ++# CONFIG_TARGET_lantiq_xway_ARV7525PW is not set ++# CONFIG_TARGET_lantiq_xway_ARV4518PWR01 is not set ++# CONFIG_TARGET_lantiq_xway_ARV4518PWR01A is not set ++# CONFIG_TARGET_lantiq_xway_ARV4510PW is not set ++# CONFIG_TARGET_lantiq_xway_ARV7518PW is not set ++# CONFIG_TARGET_lantiq_xway_ARV4520PW is not set ++# CONFIG_TARGET_lantiq_xway_ARV452CQW is not set ++# CONFIG_TARGET_lantiq_xway_ARV752DPW is not set ++# CONFIG_TARGET_lantiq_xway_ARV752DPW22 is not set ++# CONFIG_TARGET_lantiq_xway_ACMP252 is not set ++# CONFIG_TARGET_lantiq_xway_FRITZ7320 is not set ++# CONFIG_TARGET_lantiq_xway_FRITZ3370 is not set ++# CONFIG_TARGET_lantiq_xway_WBMRA is not set ++# CONFIG_TARGET_lantiq_xway_WBMRB is not set ++# CONFIG_TARGET_lantiq_xway_EASY50712 is not set ++# CONFIG_TARGET_lantiq_xway_EASY80920NOR is not set ++# CONFIG_TARGET_lantiq_xway_EASY80920NAND is not set ++# CONFIG_TARGET_lantiq_xway_DGN3500 is not set ++# CONFIG_TARGET_lantiq_xway_DGN3500B is not set ++# CONFIG_TARGET_lantiq_ase_DGN1000B is not set ++# CONFIG_TARGET_lantiq_falcon_EASY98000NOR is not set ++# CONFIG_TARGET_lantiq_falcon_EASY98000SFLASH is not set ++# CONFIG_TARGET_ar7_generic_Annex-A is not set ++# CONFIG_TARGET_ar7_generic_Annex-B is not set ++# CONFIG_TARGET_ar7_generic_Texas is not set ++# CONFIG_TARGET_ar7_generic_None is not set ++# CONFIG_TARGET_ar7_ac49x_None is not set ++CONFIG_HAS_SUBTARGETS=y ++CONFIG_TARGET_BOARD="ar71xx" ++CONFIG_TARGET_ARCH_PACKAGES="ar71xx" ++CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely" ++CONFIG_LINUX_3_8=y ++CONFIG_DEFAULT_base-files=y ++CONFIG_DEFAULT_busybox=y ++CONFIG_DEFAULT_dnsmasq=y ++CONFIG_DEFAULT_dropbear=y ++CONFIG_DEFAULT_firewall3=y ++CONFIG_DEFAULT_hotplug2=y ++CONFIG_DEFAULT_iptables=y ++CONFIG_DEFAULT_kmod-ath9k=y ++CONFIG_DEFAULT_kmod-gpio-button-hotplug=y ++CONFIG_DEFAULT_kmod-ipt-nathelper=y ++CONFIG_DEFAULT_kmod-leds-gpio=y ++CONFIG_DEFAULT_kmod-ledtrig-default-on=y ++CONFIG_DEFAULT_kmod-ledtrig-netdev=y ++CONFIG_DEFAULT_kmod-ledtrig-timer=y ++CONFIG_DEFAULT_kmod-ledtrig-usbdev=y ++CONFIG_DEFAULT_kmod-usb-core=y ++CONFIG_DEFAULT_kmod-usb2=y ++CONFIG_DEFAULT_kmod-wdt-ath79=y ++CONFIG_DEFAULT_libc=y ++CONFIG_DEFAULT_libgcc=y ++CONFIG_DEFAULT_mtd=y ++CONFIG_DEFAULT_netifd=y ++CONFIG_DEFAULT_opkg=y ++CONFIG_DEFAULT_ppp=y ++CONFIG_DEFAULT_ppp-mod-pppoe=y ++CONFIG_DEFAULT_swconfig=y ++CONFIG_DEFAULT_uboot-envtools=y ++CONFIG_DEFAULT_uci=y ++CONFIG_DEFAULT_wpad-mini=y ++CONFIG_AUDIO_SUPPORT=y ++CONFIG_GPIO_SUPPORT=y ++CONFIG_PCI_SUPPORT=y ++CONFIG_USB_SUPPORT=y ++CONFIG_BIG_ENDIAN=y ++CONFIG_USES_SQUASHFS=y ++CONFIG_USES_JFFS2=y ++CONFIG_USES_TARGZ=y ++CONFIG_mips=y ++CONFIG_ARCH="mips" ++ ++# ++# Target Images ++# ++# CONFIG_TARGET_ROOTFS_INITRAMFS is not set ++CONFIG_EXTERNAL_CPIO="" ++ ++# ++# Root filesystem archives ++# ++# CONFIG_TARGET_ROOTFS_CPIOGZ is not set ++CONFIG_TARGET_ROOTFS_TARGZ=y ++ ++# ++# Root filesystem images ++# ++# CONFIG_TARGET_ROOTFS_EXT4FS is not set ++CONFIG_TARGET_ROOTFS_JFFS2=y ++CONFIG_TARGET_ROOTFS_SQUASHFS=y ++ ++# ++# Image Options ++# ++ ++# ++# Global build settings ++# ++# CONFIG_ALL is not set ++ ++# ++# General build options ++# ++# CONFIG_DISPLAY_SUPPORT is not set ++CONFIG_BUILD_PATENTED=y ++# CONFIG_BUILD_NLS is not set ++# CONFIG_BUILD_STATIC_TOOLS is not set ++CONFIG_SHADOW_PASSWORDS=y ++# CONFIG_CLEAN_IPKG is not set ++# CONFIG_COLLECT_KERNEL_DEBUG is not set ++ ++# ++# Kernel build options ++# ++CONFIG_KERNEL_DEBUG_FS=y ++# CONFIG_KERNEL_PERF_EVENTS is not set ++# CONFIG_KERNEL_PROFILING is not set ++# CONFIG_KERNEL_KALLSYMS is not set ++# CONFIG_KERNEL_FTRACE is not set ++# CONFIG_KERNEL_DEBUG_KERNEL is not set ++# CONFIG_KERNEL_DEBUG_INFO is not set ++# CONFIG_KERNEL_AIO is not set ++# CONFIG_KERNEL_DIRECT_IO is not set ++CONFIG_KERNEL_MAGIC_SYSRQ=y ++CONFIG_KERNEL_COREDUMP=y ++CONFIG_KERNEL_ELF_CORE=y ++# CONFIG_KERNEL_PROVE_LOCKING is not set ++CONFIG_KERNEL_PRINTK_TIME=y ++CONFIG_KERNEL_RELAY=y ++# CONFIG_KERNEL_CGROUPS is not set ++# CONFIG_KERNEL_NAMESPACES is not set ++ ++# ++# Package build options ++# ++# CONFIG_DEBUG is not set ++CONFIG_IPV6=y ++CONFIG_PKG_BUILD_PARALLEL=y ++CONFIG_PKG_BUILD_USE_JOBSERVER=y ++ ++# ++# Stripping options ++# ++# CONFIG_NO_STRIP is not set ++# CONFIG_USE_STRIP is not set ++CONFIG_USE_SSTRIP=y ++# CONFIG_STRIP_KERNEL_EXPORTS is not set ++# CONFIG_USE_MKLIBS is not set ++CONFIG_USE_UCLIBCXX=y ++# CONFIG_USE_LIBSTDCXX is not set ++# CONFIG_DEVEL is not set ++# CONFIG_BROKEN is not set ++CONFIG_DOWNLOAD_FOLDER="" ++CONFIG_LOCALMIRROR="" ++CONFIG_AUTOREBUILD=y ++CONFIG_BUILD_SUFFIX="" ++CONFIG_TARGET_ROOTFS_DIR="" ++# CONFIG_CCACHE is not set ++CONFIG_EXTERNAL_KERNEL_TREE="" ++CONFIG_KERNEL_GIT_CLONE_URI="" ++CONFIG_KERNEL_GIT_LOCAL_REPOSITORY="" ++CONFIG_TARGET_OPTIMIZATION="-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely" ++CONFIG_SOFT_FLOAT=y ++# CONFIG_EXTRA_TARGET_ARCH is not set ++CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS="" ++CONFIG_BINUTILS_VERSION="2.22" ++CONFIG_GCC_VERSION_4_6_LINARO=y ++CONFIG_EXTRA_GCC_CONFIG_OPTIONS="" ++# CONFIG_SSP_SUPPORT is not set ++# CONFIG_TLS_SUPPORT is not set ++# CONFIG_SJLJ_EXCEPTIONS is not set ++CONFIG_INSTALL_LIBSTDCPP=y ++# CONFIG_INSTALL_LIBGCJ is not set ++# CONFIG_INSTALL_GFORTRAN is not set ++CONFIG_USE_UCLIBC=y ++CONFIG_UCLIBC_VERSION_0_9_33=y ++CONFIG_GDB=y ++# CONFIG_INSIGHT is not set ++CONFIG_GCC_DEFAULT_VERSION_4_6_LINARO=y ++CONFIG_GCC_VERSION="4.6-linaro" ++CONFIG_GCC_VERSION_4_6=y ++CONFIG_UCLIBC_VERSION="0.9.33.2" ++CONFIG_LIBC="uClibc" ++CONFIG_LIBC_VERSION="0.9.33.2" ++CONFIG_TARGET_SUFFIX="uclibc" ++# CONFIG_IB is not set ++# CONFIG_SDK is not set ++# CONFIG_MAKE_TOOLCHAIN is not set ++# CONFIG_IMAGEOPT is not set ++# CONFIG_PREINITOPT is not set ++CONFIG_TARGET_PREINIT_SUPPRESS_STDERR=y ++CONFIG_TARGET_PREINIT_TIMEOUT=2 ++# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set ++# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set ++CONFIG_TARGET_PREINIT_IFNAME="" ++CONFIG_TARGET_PREINIT_IP="192.168.1.1" ++CONFIG_TARGET_PREINIT_NETMASK="255.255.255.0" ++CONFIG_TARGET_PREINIT_BROADCAST="192.168.1.255" ++# CONFIG_INITOPT is not set ++CONFIG_TARGET_INIT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" ++CONFIG_TARGET_INIT_ENV="" ++CONFIG_TARGET_INIT_CMD="/sbin/init" ++CONFIG_TARGET_INIT_SUPPRESS_STDERR=y ++# CONFIG_VERSIONOPT is not set ++ ++# ++# Package features ++# ++CONFIG_FEATURE_drawing-backend_DirectFB=y ++ ++# ++# Base system ++# ++CONFIG_PACKAGE_base-files=y ++# CONFIG_PROCD_INIT is not set ++# CONFIG_PACKAGE_block-mount is not set ++CONFIG_EXTROOT_SETTLETIME=20 ++# CONFIG_PACKAGE_bridge is not set ++CONFIG_PACKAGE_busybox=y ++# CONFIG_BUSYBOX_CONFIG_NOMMU is not set ++# CONFIG_CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH is not set ++# CONFIG_BUSYBOX_CONFIG_HUSH is not set ++CONFIG_BUSYBOX_CONFIG_HAVE_DOT_CONFIG=y ++ ++# ++# Busybox Settings ++# ++ ++# ++# General Configuration ++# ++# CONFIG_BUSYBOX_CONFIG_DESKTOP is not set ++# CONFIG_BUSYBOX_CONFIG_EXTRA_COMPAT is not set ++CONFIG_BUSYBOX_CONFIG_INCLUDE_SUSv2=y ++# CONFIG_BUSYBOX_CONFIG_USE_PORTABLE_CODE is not set ++CONFIG_BUSYBOX_CONFIG_PLATFORM_LINUX=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set ++CONFIG_BUSYBOX_CONFIG_SHOW_USAGE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_INSTALLER is not set ++# CONFIG_BUSYBOX_CONFIG_INSTALL_NO_USR is not set ++# CONFIG_BUSYBOX_CONFIG_LOCALE_SUPPORT is not set ++# CONFIG_BUSYBOX_CONFIG_UNICODE_SUPPORT is not set ++CONFIG_BUSYBOX_CONFIG_LONG_OPTS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_DEVPTS=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_CLEAN_UP is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_UTMP is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_PIDFILE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_SUID=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SUID_CONFIG is not set ++# CONFIG_BUSYBOX_CONFIG_SELINUX is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS=y ++CONFIG_BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" ++CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_HAVE_RPC is not set ++ ++# ++# Build Options ++# ++# CONFIG_BUSYBOX_CONFIG_STATIC is not set ++# CONFIG_BUSYBOX_CONFIG_PIE is not set ++CONFIG_BUSYBOX_CONFIG_LFS=y ++CONFIG_BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX="" ++CONFIG_BUSYBOX_CONFIG_EXTRA_CFLAGS="" ++ ++# ++# Debugging Options ++# ++# CONFIG_BUSYBOX_CONFIG_DEBUG is not set ++# CONFIG_BUSYBOX_CONFIG_WERROR is not set ++CONFIG_BUSYBOX_CONFIG_NO_DEBUG_LIB=y ++# CONFIG_BUSYBOX_CONFIG_DMALLOC is not set ++# CONFIG_BUSYBOX_CONFIG_EFENCE is not set ++ ++# ++# Installation Options ("make install" behavior) ++# ++CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS=y ++# CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS is not set ++# CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set ++# CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_DONT is not set ++CONFIG_BUSYBOX_CONFIG_PREFIX="./_install" ++ ++# ++# Busybox Library Tuning ++# ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SYSTEMD is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_RTMINMAX is not set ++CONFIG_BUSYBOX_CONFIG_PASSWORD_MINLEN=6 ++CONFIG_BUSYBOX_CONFIG_MD5_SIZE_VS_SPEED=2 ++CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN=512 ++# CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_VI is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY=256 ++# CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_NON_POSIX_CP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_COPYBUF_KB=4 ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SKIP_ROOTFS is not set ++# CONFIG_BUSYBOX_CONFIG_MONOTONIC_SYSCALL is not set ++CONFIG_BUSYBOX_CONFIG_IOCTL_HEX2STR_ERROR=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_HWIB is not set ++ ++# ++# Applets ++# ++ ++# ++# Archival Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_LZMA is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2 is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z is not set ++# CONFIG_BUSYBOX_CONFIG_AR is not set ++CONFIG_BUSYBOX_CONFIG_BUNZIP2=y ++# CONFIG_BUSYBOX_CONFIG_BZIP2 is not set ++# CONFIG_BUSYBOX_CONFIG_CPIO is not set ++# CONFIG_BUSYBOX_CONFIG_DPKG is not set ++# CONFIG_BUSYBOX_CONFIG_DPKG_DEB is not set ++CONFIG_BUSYBOX_CONFIG_GUNZIP=y ++CONFIG_BUSYBOX_CONFIG_GZIP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set ++# CONFIG_BUSYBOX_CONFIG_LZOP is not set ++# CONFIG_BUSYBOX_CONFIG_RPM2CPIO is not set ++# CONFIG_BUSYBOX_CONFIG_RPM is not set ++CONFIG_BUSYBOX_CONFIG_TAR=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_CREATE=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_FROM=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set ++# CONFIG_BUSYBOX_CONFIG_UNCOMPRESS is not set ++# CONFIG_BUSYBOX_CONFIG_UNLZMA is not set ++# CONFIG_BUSYBOX_CONFIG_UNXZ is not set ++# CONFIG_BUSYBOX_CONFIG_UNZIP is not set ++ ++# ++# Coreutils ++# ++CONFIG_BUSYBOX_CONFIG_BASENAME=y ++CONFIG_BUSYBOX_CONFIG_CAT=y ++CONFIG_BUSYBOX_CONFIG_DATE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_COMPAT is not set ++CONFIG_BUSYBOX_CONFIG_ID=y ++# CONFIG_BUSYBOX_CONFIG_GROUPS is not set ++CONFIG_BUSYBOX_CONFIG_TEST=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64=y ++CONFIG_BUSYBOX_CONFIG_TOUCH=y ++CONFIG_BUSYBOX_CONFIG_TR=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TR_CLASSES is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TR_EQUIV is not set ++# CONFIG_BUSYBOX_CONFIG_BASE64 is not set ++# CONFIG_BUSYBOX_CONFIG_CAL is not set ++# CONFIG_BUSYBOX_CONFIG_CATV is not set ++CONFIG_BUSYBOX_CONFIG_CHGRP=y ++CONFIG_BUSYBOX_CONFIG_CHMOD=y ++CONFIG_BUSYBOX_CONFIG_CHOWN=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set ++CONFIG_BUSYBOX_CONFIG_CHROOT=y ++# CONFIG_BUSYBOX_CONFIG_CKSUM is not set ++# CONFIG_BUSYBOX_CONFIG_COMM is not set ++CONFIG_BUSYBOX_CONFIG_CP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS is not set ++CONFIG_BUSYBOX_CONFIG_CUT=y ++CONFIG_BUSYBOX_CONFIG_DD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS=y ++CONFIG_BUSYBOX_CONFIG_DF=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_DF_FANCY is not set ++CONFIG_BUSYBOX_CONFIG_DIRNAME=y ++# CONFIG_BUSYBOX_CONFIG_DOS2UNIX is not set ++CONFIG_BUSYBOX_CONFIG_DU=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y ++CONFIG_BUSYBOX_CONFIG_ECHO=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_ECHO=y ++CONFIG_BUSYBOX_CONFIG_ENV=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS is not set ++# CONFIG_BUSYBOX_CONFIG_EXPAND is not set ++CONFIG_BUSYBOX_CONFIG_EXPR=y ++CONFIG_BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64=y ++CONFIG_BUSYBOX_CONFIG_FALSE=y ++# CONFIG_BUSYBOX_CONFIG_FOLD is not set ++CONFIG_BUSYBOX_CONFIG_FSYNC=y ++CONFIG_BUSYBOX_CONFIG_HEAD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_HEAD=y ++CONFIG_BUSYBOX_CONFIG_HOSTID=y ++# CONFIG_BUSYBOX_CONFIG_INSTALL is not set ++CONFIG_BUSYBOX_CONFIG_LN=y ++# CONFIG_BUSYBOX_CONFIG_LOGNAME is not set ++CONFIG_BUSYBOX_CONFIG_LS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_FILETYPES=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_SORTFILES=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_USERNAME=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y ++CONFIG_BUSYBOX_CONFIG_MD5SUM=y ++CONFIG_BUSYBOX_CONFIG_MKDIR=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set ++CONFIG_BUSYBOX_CONFIG_MKFIFO=y ++CONFIG_BUSYBOX_CONFIG_MKNOD=y ++CONFIG_BUSYBOX_CONFIG_MV=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS is not set ++CONFIG_BUSYBOX_CONFIG_NICE=y ++# CONFIG_BUSYBOX_CONFIG_NOHUP is not set ++# CONFIG_BUSYBOX_CONFIG_OD is not set ++# CONFIG_BUSYBOX_CONFIG_PRINTENV is not set ++CONFIG_BUSYBOX_CONFIG_PRINTF=y ++CONFIG_BUSYBOX_CONFIG_PWD=y ++CONFIG_BUSYBOX_CONFIG_READLINK=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW=y ++# CONFIG_BUSYBOX_CONFIG_REALPATH is not set ++CONFIG_BUSYBOX_CONFIG_RM=y ++CONFIG_BUSYBOX_CONFIG_RMDIR=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set ++CONFIG_BUSYBOX_CONFIG_SEQ=y ++# CONFIG_BUSYBOX_CONFIG_SHA1SUM is not set ++# CONFIG_BUSYBOX_CONFIG_SHA256SUM is not set ++# CONFIG_BUSYBOX_CONFIG_SHA512SUM is not set ++CONFIG_BUSYBOX_CONFIG_SLEEP=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP is not set ++CONFIG_BUSYBOX_CONFIG_SORT=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SORT_BIG is not set ++# CONFIG_BUSYBOX_CONFIG_SPLIT is not set ++# CONFIG_BUSYBOX_CONFIG_STAT is not set ++# CONFIG_BUSYBOX_CONFIG_STTY is not set ++# CONFIG_BUSYBOX_CONFIG_SUM is not set ++CONFIG_BUSYBOX_CONFIG_SYNC=y ++# CONFIG_BUSYBOX_CONFIG_TAC is not set ++CONFIG_BUSYBOX_CONFIG_TAIL=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_TAIL=y ++CONFIG_BUSYBOX_CONFIG_TEE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO=y ++CONFIG_BUSYBOX_CONFIG_TRUE=y ++# CONFIG_BUSYBOX_CONFIG_TTY is not set ++CONFIG_BUSYBOX_CONFIG_UNAME=y ++# CONFIG_BUSYBOX_CONFIG_UNEXPAND is not set ++CONFIG_BUSYBOX_CONFIG_UNIQ=y ++# CONFIG_BUSYBOX_CONFIG_USLEEP is not set ++# CONFIG_BUSYBOX_CONFIG_UUDECODE is not set ++# CONFIG_BUSYBOX_CONFIG_UUENCODE is not set ++CONFIG_BUSYBOX_CONFIG_WC=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_WC_LARGE is not set ++# CONFIG_BUSYBOX_CONFIG_WHOAMI is not set ++CONFIG_BUSYBOX_CONFIG_YES=y ++ ++# ++# Common options for cp and mv ++# ++CONFIG_BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS=y ++ ++# ++# Common options for ls, more and telnet ++# ++CONFIG_BUSYBOX_CONFIG_FEATURE_AUTOWIDTH=y ++ ++# ++# Common options for df, du, ls ++# ++CONFIG_BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE=y ++ ++# ++# Common options for md5sum, sha1sum, sha256sum, sha512sum ++# ++CONFIG_BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y ++ ++# ++# Console Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_CHVT is not set ++# CONFIG_BUSYBOX_CONFIG_FGCONSOLE is not set ++CONFIG_BUSYBOX_CONFIG_CLEAR=y ++# CONFIG_BUSYBOX_CONFIG_DEALLOCVT is not set ++# CONFIG_BUSYBOX_CONFIG_DUMPKMAP is not set ++# CONFIG_BUSYBOX_CONFIG_KBD_MODE is not set ++# CONFIG_BUSYBOX_CONFIG_LOADFONT is not set ++# CONFIG_BUSYBOX_CONFIG_LOADKMAP is not set ++# CONFIG_BUSYBOX_CONFIG_OPENVT is not set ++CONFIG_BUSYBOX_CONFIG_RESET=y ++# CONFIG_BUSYBOX_CONFIG_RESIZE is not set ++# CONFIG_BUSYBOX_CONFIG_SETCONSOLE is not set ++# CONFIG_BUSYBOX_CONFIG_SETFONT is not set ++# CONFIG_BUSYBOX_CONFIG_SETKEYCODES is not set ++# CONFIG_BUSYBOX_CONFIG_SETLOGCONS is not set ++# CONFIG_BUSYBOX_CONFIG_SHOWKEY is not set ++ ++# ++# Debian Utilities ++# ++CONFIG_BUSYBOX_CONFIG_MKTEMP=y ++# CONFIG_BUSYBOX_CONFIG_PIPE_PROGRESS is not set ++# CONFIG_BUSYBOX_CONFIG_RUN_PARTS is not set ++CONFIG_BUSYBOX_CONFIG_START_STOP_DAEMON=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set ++CONFIG_BUSYBOX_CONFIG_WHICH=y ++ ++# ++# Editors ++# ++# CONFIG_BUSYBOX_CONFIG_PATCH is not set ++CONFIG_BUSYBOX_CONFIG_VI=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN=1024 ++# CONFIG_BUSYBOX_CONFIG_FEATURE_VI_8BIT is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_COLON=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_YANKMARK=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SEARCH=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_READONLY=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SETOPTS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SET=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y ++CONFIG_BUSYBOX_CONFIG_AWK=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_AWK_LIBM=y ++CONFIG_BUSYBOX_CONFIG_CMP=y ++# CONFIG_BUSYBOX_CONFIG_DIFF is not set ++# CONFIG_BUSYBOX_CONFIG_ED is not set ++CONFIG_BUSYBOX_CONFIG_SED=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC=y ++ ++# ++# Finding Utilities ++# ++CONFIG_BUSYBOX_CONFIG_FIND=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRINT0=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MTIME is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MMIN is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PERM=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_TYPE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_XDEV=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_NEWER is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_INUM is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_EXEC=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_USER=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_GROUP=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_NOT=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DEPTH=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PAREN=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_SIZE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRUNE=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DELETE is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_REGEX=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_LINKS is not set ++CONFIG_BUSYBOX_CONFIG_GREP=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT=y ++CONFIG_BUSYBOX_CONFIG_XARGS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y ++ ++# ++# Init Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_BOOTCHARTD is not set ++CONFIG_BUSYBOX_CONFIG_HALT=y ++CONFIG_BUSYBOX_CONFIG_INIT=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_USE_INITTAB=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_KILL_REMOVED is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_INIT_SCTTY is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_INIT_SYSLOG=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_INITRD is not set ++CONFIG_BUSYBOX_CONFIG_INIT_TERMINAL_TYPE="linux" ++# CONFIG_BUSYBOX_CONFIG_MESG is not set ++ ++# ++# Login/Password Management Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_ADD_SHELL is not set ++# CONFIG_BUSYBOX_CONFIG_REMOVE_SHELL is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS=y ++# CONFIG_BUSYBOX_CONFIG_USE_BB_PWD_GRP is not set ++# CONFIG_BUSYBOX_CONFIG_USE_BB_CRYPT is not set ++# CONFIG_BUSYBOX_CONFIG_ADDUSER is not set ++# CONFIG_BUSYBOX_CONFIG_ADDGROUP is not set ++# CONFIG_BUSYBOX_CONFIG_DELUSER is not set ++# CONFIG_BUSYBOX_CONFIG_DELGROUP is not set ++# CONFIG_BUSYBOX_CONFIG_GETTY is not set ++# CONFIG_BUSYBOX_CONFIG_LOGIN is not set ++CONFIG_BUSYBOX_CONFIG_PASSWD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK=y ++# CONFIG_BUSYBOX_CONFIG_CRYPTPW is not set ++# CONFIG_BUSYBOX_CONFIG_CHPASSWD is not set ++# CONFIG_BUSYBOX_CONFIG_SU is not set ++# CONFIG_BUSYBOX_CONFIG_SULOGIN is not set ++# CONFIG_BUSYBOX_CONFIG_VLOCK is not set ++ ++# ++# Linux Ext2 FS Progs ++# ++# CONFIG_BUSYBOX_CONFIG_CHATTR is not set ++# CONFIG_BUSYBOX_CONFIG_FSCK is not set ++# CONFIG_BUSYBOX_CONFIG_LSATTR is not set ++# CONFIG_BUSYBOX_CONFIG_TUNE2FS is not set ++ ++# ++# Linux Module Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_MODINFO is not set ++# CONFIG_BUSYBOX_CONFIG_MODPROBE_SMALL is not set ++CONFIG_BUSYBOX_CONFIG_INSMOD=y ++CONFIG_BUSYBOX_CONFIG_RMMOD=y ++CONFIG_BUSYBOX_CONFIG_LSMOD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y ++# CONFIG_BUSYBOX_CONFIG_MODPROBE is not set ++# CONFIG_BUSYBOX_CONFIG_DEPMOD is not set ++ ++# ++# Options common to multiple modutils ++# ++# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y ++CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules" ++ ++# ++# Linux System Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_BLOCKDEV is not set ++# CONFIG_BUSYBOX_CONFIG_REV is not set ++# CONFIG_BUSYBOX_CONFIG_ACPID is not set ++# CONFIG_BUSYBOX_CONFIG_BLKID is not set ++CONFIG_BUSYBOX_CONFIG_DMESG=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY=y ++# CONFIG_BUSYBOX_CONFIG_FBSET is not set ++# CONFIG_BUSYBOX_CONFIG_FDFLUSH is not set ++# CONFIG_BUSYBOX_CONFIG_FDFORMAT is not set ++# CONFIG_BUSYBOX_CONFIG_FDISK is not set ++# CONFIG_BUSYBOX_CONFIG_FINDFS is not set ++# CONFIG_BUSYBOX_CONFIG_FLOCK is not set ++# CONFIG_BUSYBOX_CONFIG_FREERAMDISK is not set ++# CONFIG_BUSYBOX_CONFIG_FSCK_MINIX is not set ++# CONFIG_BUSYBOX_CONFIG_MKFS_EXT2 is not set ++# CONFIG_BUSYBOX_CONFIG_MKFS_MINIX is not set ++# CONFIG_BUSYBOX_CONFIG_MKFS_REISER is not set ++# CONFIG_BUSYBOX_CONFIG_MKFS_VFAT is not set ++# CONFIG_BUSYBOX_CONFIG_GETOPT is not set ++CONFIG_BUSYBOX_CONFIG_HEXDUMP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE is not set ++# CONFIG_BUSYBOX_CONFIG_HD is not set ++CONFIG_BUSYBOX_CONFIG_HWCLOCK=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set ++# CONFIG_BUSYBOX_CONFIG_IPCRM is not set ++# CONFIG_BUSYBOX_CONFIG_IPCS is not set ++# CONFIG_BUSYBOX_CONFIG_LOSETUP is not set ++# CONFIG_BUSYBOX_CONFIG_LSPCI is not set ++# CONFIG_BUSYBOX_CONFIG_LSUSB is not set ++# CONFIG_BUSYBOX_CONFIG_MDEV is not set ++# CONFIG_BUSYBOX_CONFIG_MKSWAP is not set ++# CONFIG_BUSYBOX_CONFIG_MORE is not set ++CONFIG_BUSYBOX_CONFIG_MOUNT=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB=y ++CONFIG_BUSYBOX_CONFIG_PIVOT_ROOT=y ++# CONFIG_BUSYBOX_CONFIG_RDATE is not set ++# CONFIG_BUSYBOX_CONFIG_RDEV is not set ++# CONFIG_BUSYBOX_CONFIG_READPROFILE is not set ++# CONFIG_BUSYBOX_CONFIG_RTCWAKE is not set ++# CONFIG_BUSYBOX_CONFIG_SCRIPT is not set ++# CONFIG_BUSYBOX_CONFIG_SCRIPTREPLAY is not set ++# CONFIG_BUSYBOX_CONFIG_SETARCH is not set ++# CONFIG_BUSYBOX_CONFIG_SWAPONOFF is not set ++CONFIG_BUSYBOX_CONFIG_SWITCH_ROOT=y ++CONFIG_BUSYBOX_CONFIG_UMOUNT=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL=y ++ ++# ++# Common options for mount/umount ++# ++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT is not set ++# CONFIG_BUSYBOX_CONFIG_VOLUMEID is not set ++ ++# ++# Miscellaneous Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_CONSPY is not set ++CONFIG_BUSYBOX_CONFIG_LESS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES=9999999 ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_FLAGS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_MARKS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_REGEXP is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_WINCH is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD is not set ++# CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set ++# CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set ++# CONFIG_BUSYBOX_CONFIG_SETSERIAL is not set ++# CONFIG_BUSYBOX_CONFIG_UBIATTACH is not set ++# CONFIG_BUSYBOX_CONFIG_UBIDETACH is not set ++# CONFIG_BUSYBOX_CONFIG_UBIMKVOL is not set ++# CONFIG_BUSYBOX_CONFIG_UBIRMVOL is not set ++# CONFIG_BUSYBOX_CONFIG_UBIRSVOL is not set ++# CONFIG_BUSYBOX_CONFIG_UBIUPDATEVOL is not set ++# CONFIG_BUSYBOX_CONFIG_ADJTIMEX is not set ++# CONFIG_BUSYBOX_CONFIG_BBCONFIG is not set ++# CONFIG_BUSYBOX_CONFIG_BEEP is not set ++# CONFIG_BUSYBOX_CONFIG_CHAT is not set ++# CONFIG_BUSYBOX_CONFIG_CHRT is not set ++CONFIG_BUSYBOX_CONFIG_CROND=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_D is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_DIR="/var/spool/cron" ++CONFIG_BUSYBOX_CONFIG_CRONTAB=y ++# CONFIG_BUSYBOX_CONFIG_DC is not set ++# CONFIG_BUSYBOX_CONFIG_DEVFSD is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_DEVFS is not set ++# CONFIG_BUSYBOX_CONFIG_DEVMEM is not set ++# CONFIG_BUSYBOX_CONFIG_EJECT is not set ++# CONFIG_BUSYBOX_CONFIG_FBSPLASH is not set ++# CONFIG_BUSYBOX_CONFIG_FLASHCP is not set ++# CONFIG_BUSYBOX_CONFIG_FLASH_LOCK is not set ++# CONFIG_BUSYBOX_CONFIG_FLASH_UNLOCK is not set ++# CONFIG_BUSYBOX_CONFIG_FLASH_ERASEALL is not set ++# CONFIG_BUSYBOX_CONFIG_IONICE is not set ++# CONFIG_BUSYBOX_CONFIG_INOTIFYD is not set ++# CONFIG_BUSYBOX_CONFIG_HDPARM is not set ++CONFIG_BUSYBOX_CONFIG_LOCK=y ++# CONFIG_BUSYBOX_CONFIG_MAKEDEVS is not set ++# CONFIG_BUSYBOX_CONFIG_MAN is not set ++# CONFIG_BUSYBOX_CONFIG_MICROCOM is not set ++# CONFIG_BUSYBOX_CONFIG_MOUNTPOINT is not set ++# CONFIG_BUSYBOX_CONFIG_MT is not set ++# CONFIG_BUSYBOX_CONFIG_RAIDAUTORUN is not set ++# CONFIG_BUSYBOX_CONFIG_READAHEAD is not set ++# CONFIG_BUSYBOX_CONFIG_RFKILL is not set ++# CONFIG_BUSYBOX_CONFIG_RX is not set ++# CONFIG_BUSYBOX_CONFIG_SETSID is not set ++CONFIG_BUSYBOX_CONFIG_STRINGS=y ++# CONFIG_BUSYBOX_CONFIG_TASKSET is not set ++CONFIG_BUSYBOX_CONFIG_TIME=y ++# CONFIG_BUSYBOX_CONFIG_TIMEOUT is not set ++# CONFIG_BUSYBOX_CONFIG_TTYSIZE is not set ++# CONFIG_BUSYBOX_CONFIG_VOLNAME is not set ++CONFIG_BUSYBOX_CONFIG_WATCHDOG=y ++ ++# ++# Networking Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_NAMEIF is not set ++# CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set ++CONFIG_BUSYBOX_CONFIG_NC=y ++# CONFIG_BUSYBOX_CONFIG_NC_SERVER is not set ++# CONFIG_BUSYBOX_CONFIG_NC_EXTRA is not set ++# CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT is not set ++CONFIG_BUSYBOX_CONFIG_PING=y ++CONFIG_BUSYBOX_CONFIG_PING6=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING=y ++# CONFIG_BUSYBOX_CONFIG_WHOIS is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_UNIX_LOCAL is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y ++CONFIG_BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS=y ++# CONFIG_BUSYBOX_CONFIG_ARP is not set ++CONFIG_BUSYBOX_CONFIG_ARPING=y ++CONFIG_BUSYBOX_CONFIG_BRCTL=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW=y ++# CONFIG_BUSYBOX_CONFIG_DNSD is not set ++# CONFIG_BUSYBOX_CONFIG_ETHER_WAKE is not set ++# CONFIG_BUSYBOX_CONFIG_FAKEIDENTD is not set ++# CONFIG_BUSYBOX_CONFIG_FTPD is not set ++# CONFIG_BUSYBOX_CONFIG_FTPGET is not set ++# CONFIG_BUSYBOX_CONFIG_FTPPUT is not set ++# CONFIG_BUSYBOX_CONFIG_HOSTNAME is not set ++# CONFIG_BUSYBOX_CONFIG_HTTPD is not set ++CONFIG_BUSYBOX_CONFIG_IFCONFIG=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y ++# CONFIG_BUSYBOX_CONFIG_IFENSLAVE is not set ++# CONFIG_BUSYBOX_CONFIG_IFPLUGD is not set ++# CONFIG_BUSYBOX_CONFIG_IFUPDOWN is not set ++# CONFIG_BUSYBOX_CONFIG_INETD is not set ++# CONFIG_BUSYBOX_CONFIG_IP is not set ++# CONFIG_BUSYBOX_CONFIG_IPCALC is not set ++CONFIG_BUSYBOX_CONFIG_NETMSG=y ++CONFIG_BUSYBOX_CONFIG_NETSTAT=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG=y ++CONFIG_BUSYBOX_CONFIG_NSLOOKUP=y ++CONFIG_BUSYBOX_CONFIG_NTPD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER=y ++# CONFIG_BUSYBOX_CONFIG_PSCAN is not set ++CONFIG_BUSYBOX_CONFIG_ROUTE=y ++# CONFIG_BUSYBOX_CONFIG_SLATTACH is not set ++# CONFIG_BUSYBOX_CONFIG_TCPSVD is not set ++CONFIG_BUSYBOX_CONFIG_TELNET=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN is not set ++CONFIG_BUSYBOX_CONFIG_TELNETD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TELNETD_STANDALONE=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TELNETD_INETD_WAIT is not set ++# CONFIG_BUSYBOX_CONFIG_TFTP is not set ++# CONFIG_BUSYBOX_CONFIG_TFTPD is not set ++CONFIG_BUSYBOX_CONFIG_TRACEROUTE=y ++# CONFIG_BUSYBOX_CONFIG_TRACEROUTE6 is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set ++# CONFIG_BUSYBOX_CONFIG_TUNCTL is not set ++# CONFIG_BUSYBOX_CONFIG_UDHCPD is not set ++CONFIG_BUSYBOX_CONFIG_UDHCPC=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_PORT is not set ++CONFIG_BUSYBOX_CONFIG_UDHCP_DEBUG=0 ++CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q is not set ++CONFIG_BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" ++CONFIG_BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 ++# CONFIG_BUSYBOX_CONFIG_UDPSVD is not set ++CONFIG_BUSYBOX_CONFIG_VCONFIG=y ++CONFIG_BUSYBOX_CONFIG_WGET=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT is not set ++# CONFIG_BUSYBOX_CONFIG_ZCIP is not set ++ ++# ++# Print Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_LPD is not set ++# CONFIG_BUSYBOX_CONFIG_LPR is not set ++# CONFIG_BUSYBOX_CONFIG_LPQ is not set ++ ++# ++# Mail Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_MAKEMIME is not set ++# CONFIG_BUSYBOX_CONFIG_POPMAILDIR is not set ++# CONFIG_BUSYBOX_CONFIG_REFORMIME is not set ++# CONFIG_BUSYBOX_CONFIG_SENDMAIL is not set ++ ++# ++# Process Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_IOSTAT is not set ++# CONFIG_BUSYBOX_CONFIG_MPSTAT is not set ++# CONFIG_BUSYBOX_CONFIG_NMETER is not set ++# CONFIG_BUSYBOX_CONFIG_PMAP is not set ++# CONFIG_BUSYBOX_CONFIG_POWERTOP is not set ++# CONFIG_BUSYBOX_CONFIG_PSTREE is not set ++# CONFIG_BUSYBOX_CONFIG_PWDX is not set ++# CONFIG_BUSYBOX_CONFIG_SMEMCAP is not set ++CONFIG_BUSYBOX_CONFIG_UPTIME=y ++CONFIG_BUSYBOX_CONFIG_FREE=y ++# CONFIG_BUSYBOX_CONFIG_FUSER is not set ++CONFIG_BUSYBOX_CONFIG_KILL=y ++CONFIG_BUSYBOX_CONFIG_KILLALL=y ++# CONFIG_BUSYBOX_CONFIG_KILLALL5 is not set ++CONFIG_BUSYBOX_CONFIG_PGREP=y ++CONFIG_BUSYBOX_CONFIG_PIDOF=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT is not set ++# CONFIG_BUSYBOX_CONFIG_PKILL is not set ++CONFIG_BUSYBOX_CONFIG_PS=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_PS_WIDE=y ++# CONFIG_BUSYBOX_CONFIG_RENICE is not set ++CONFIG_BUSYBOX_CONFIG_BB_SYSCTL=y ++CONFIG_BUSYBOX_CONFIG_TOP=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_TOPMEM is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS is not set ++# CONFIG_BUSYBOX_CONFIG_WATCH is not set ++ ++# ++# Runit Utilities ++# ++# CONFIG_BUSYBOX_CONFIG_RUNSV is not set ++# CONFIG_BUSYBOX_CONFIG_RUNSVDIR is not set ++# CONFIG_BUSYBOX_CONFIG_SV is not set ++# CONFIG_BUSYBOX_CONFIG_SVLOGD is not set ++# CONFIG_BUSYBOX_CONFIG_CHPST is not set ++# CONFIG_BUSYBOX_CONFIG_SETUIDGID is not set ++# CONFIG_BUSYBOX_CONFIG_ENVUIDGID is not set ++# CONFIG_BUSYBOX_CONFIG_ENVDIR is not set ++# CONFIG_BUSYBOX_CONFIG_SOFTLIMIT is not set ++ ++# ++# Shells ++# ++CONFIG_BUSYBOX_CONFIG_ASH=y ++CONFIG_BUSYBOX_CONFIG_ASH_BASH_COMPAT=y ++# CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT is not set ++CONFIG_BUSYBOX_CONFIG_ASH_JOB_CONTROL=y ++CONFIG_BUSYBOX_CONFIG_ASH_ALIAS=y ++CONFIG_BUSYBOX_CONFIG_ASH_GETOPTS=y ++CONFIG_BUSYBOX_CONFIG_ASH_BUILTIN_ECHO=y ++CONFIG_BUSYBOX_CONFIG_ASH_BUILTIN_PRINTF=y ++CONFIG_BUSYBOX_CONFIG_ASH_BUILTIN_TEST=y ++CONFIG_BUSYBOX_CONFIG_ASH_CMDCMD=y ++# CONFIG_BUSYBOX_CONFIG_ASH_MAIL is not set ++# CONFIG_BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set ++# CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT is not set ++CONFIG_BUSYBOX_CONFIG_ASH_EXPAND_PRMT=y ++# CONFIG_BUSYBOX_CONFIG_CTTYHACK is not set ++# CONFIG_BUSYBOX_CONFIG_MSH is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_ASH=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_NONE is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_BASH_IS_ASH is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_BASH_IS_HUSH is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_BASH_IS_NONE=y ++CONFIG_BUSYBOX_CONFIG_SH_MATH_SUPPORT=y ++CONFIG_BUSYBOX_CONFIG_SH_MATH_SUPPORT_64=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_STANDALONE is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_NOFORK is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE is not set ++ ++# ++# System Logging Utilities ++# ++CONFIG_BUSYBOX_CONFIG_SYSLOGD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_REMOTE_LOG=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_DUP is not set ++# CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_CFG is not set ++CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 ++CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 ++CONFIG_BUSYBOX_CONFIG_LOGREAD=y ++# CONFIG_BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set ++CONFIG_BUSYBOX_CONFIG_KLOGD=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL=y ++CONFIG_BUSYBOX_CONFIG_LOGGER=y ++# CONFIG_PACKAGE_dash is not set ++CONFIG_PACKAGE_dnsmasq=y ++# CONFIG_PACKAGE_dnsmasq-dhcpv6 is not set ++# CONFIG_PACKAGE_dropbear is not set ++# CONFIG_PACKAGE_ead is not set ++CONFIG_PACKAGE_firewall=y ++CONFIG_PACKAGE_hotplug2=y ++# CONFIG_PACKAGE_hsflowd is not set ++CONFIG_PACKAGE_libc=y ++CONFIG_PACKAGE_libgcc=y ++CONFIG_PACKAGE_libpthread=y ++CONFIG_PACKAGE_librt=y ++# CONFIG_PACKAGE_libstdcpp is not set ++# CONFIG_PACKAGE_libthread-db is not set ++# CONFIG_PACKAGE_mksh is not set ++CONFIG_PACKAGE_mtd=y ++CONFIG_PACKAGE_netifd=y ++# CONFIG_PACKAGE_nvram is not set ++# CONFIG_PACKAGE_om-watchdog is not set ++CONFIG_PACKAGE_opkg=y ++CONFIG_PACKAGE_procd=y ++# CONFIG_PACKAGE_qos-scripts is not set ++# CONFIG_PACKAGE_resolveip is not set ++# CONFIG_PACKAGE_sflowovsd is not set ++CONFIG_PACKAGE_swconfig=y ++CONFIG_PACKAGE_uci=y ++# CONFIG_PACKAGE_udev is not set ++CONFIG_PACKAGE_wireless-tools=y ++# CONFIG_PACKAGE_zram-swap is not set ++ ++# ++# IPv6 ++# ++ ++# ++# Firewall ++# ++# CONFIG_PACKAGE_ip6tables is not set ++# CONFIG_PACKAGE_shorewall6-lite is not set ++ ++# ++# IPv6 discovery tools ++# ++# CONFIG_PACKAGE_ndisc6 is not set ++# CONFIG_PACKAGE_rdisc6 is not set ++# CONFIG_PACKAGE_rdnssd is not set ++# CONFIG_PACKAGE_traceroute6 is not set ++ ++# ++# THC-IPv6 attack and analyzing toolkit ++# ++# CONFIG_PACKAGE_thc-ipv6-address6 is not set ++# CONFIG_PACKAGE_thc-ipv6-alive6 is not set ++# CONFIG_PACKAGE_thc-ipv6-covert-send6 is not set ++# CONFIG_PACKAGE_thc-ipv6-covert-send6d is not set ++# CONFIG_PACKAGE_thc-ipv6-denial6 is not set ++# CONFIG_PACKAGE_thc-ipv6-detect-new-ip6 is not set ++# CONFIG_PACKAGE_thc-ipv6-detect-sniffer6 is not set ++# CONFIG_PACKAGE_thc-ipv6-dnsdict6 is not set ++# CONFIG_PACKAGE_thc-ipv6-dnsrevenum6 is not set ++# CONFIG_PACKAGE_thc-ipv6-dos-new-ip6 is not set ++# CONFIG_PACKAGE_thc-ipv6-dump-router6 is not set ++# CONFIG_PACKAGE_thc-ipv6-exploit6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-advertise6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-dhcps6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-dns6d is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-dnsupdate6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-mipv6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-mld26 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-mld6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-mldrouter6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-router26 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-router6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fake-solicitate6 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-advertise6 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-dhcpc6 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-mld26 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-mld6 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-mldrouter6 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-router26 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-router6 is not set ++# CONFIG_PACKAGE_thc-ipv6-flood-solicitate6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fragmentation6 is not set ++# CONFIG_PACKAGE_thc-ipv6-fuzz-ip6 is not set ++# CONFIG_PACKAGE_thc-ipv6-implementation6 is not set ++# CONFIG_PACKAGE_thc-ipv6-implementation6d is not set ++# CONFIG_PACKAGE_thc-ipv6-inverse-lookup6 is not set ++# CONFIG_PACKAGE_thc-ipv6-kill-router6 is not set ++# CONFIG_PACKAGE_thc-ipv6-ndpexhaust6 is not set ++# CONFIG_PACKAGE_thc-ipv6-node-query6 is not set ++# CONFIG_PACKAGE_thc-ipv6-parasite6 is not set ++# CONFIG_PACKAGE_thc-ipv6-passive-discovery6 is not set ++# CONFIG_PACKAGE_thc-ipv6-randicmp6 is not set ++# CONFIG_PACKAGE_thc-ipv6-redir6 is not set ++# CONFIG_PACKAGE_thc-ipv6-rsmurf6 is not set ++# CONFIG_PACKAGE_thc-ipv6-sendpees6 is not set ++# CONFIG_PACKAGE_thc-ipv6-sendpeesmp6 is not set ++# CONFIG_PACKAGE_thc-ipv6-smurf6 is not set ++# CONFIG_PACKAGE_thc-ipv6-thcping6 is not set ++# CONFIG_PACKAGE_thc-ipv6-toobig6 is not set ++# CONFIG_PACKAGE_thc-ipv6-trace6 is not set ++ ++# ++# miredo: Teredo (IPv6 tunneling over UDP through NAT) ++# ++# CONFIG_PACKAGE_miredo-client is not set ++# CONFIG_PACKAGE_miredo-common is not set ++# CONFIG_PACKAGE_miredo-server is not set ++ ++# ++# wide-dhcpv6 ++# ++# CONFIG_PACKAGE_wide-dhcpv6-client is not set ++# CONFIG_PACKAGE_wide-dhcpv6-control is not set ++# CONFIG_PACKAGE_wide-dhcpv6-relay is not set ++# CONFIG_PACKAGE_wide-dhcpv6-server is not set ++# CONFIG_PACKAGE_6in4 is not set ++# CONFIG_PACKAGE_6rd is not set ++# CONFIG_PACKAGE_6relayd is not set ++# CONFIG_PACKAGE_6to4 is not set ++# CONFIG_PACKAGE_6tunnel is not set ++# CONFIG_PACKAGE_ahcpd is not set ++# CONFIG_PACKAGE_aiccu is not set ++# CONFIG_PACKAGE_bird6 is not set ++# CONFIG_PACKAGE_birdc6 is not set ++# CONFIG_PACKAGE_dhcp6-client is not set ++# CONFIG_PACKAGE_dhcp6-server is not set ++# CONFIG_PACKAGE_dibbler-client is not set ++# CONFIG_PACKAGE_dibbler-relay is not set ++# CONFIG_PACKAGE_dibbler-requestor is not set ++# CONFIG_PACKAGE_dibbler-server is not set ++# CONFIG_PACKAGE_gw6c is not set ++# CONFIG_PACKAGE_ipv6-support is not set ++# CONFIG_PACKAGE_ipv6calc is not set ++# CONFIG_PACKAGE_ipv6calc-mini is not set ++# CONFIG_PACKAGE_ipv6log is not set ++# CONFIG_PACKAGE_ipv6log-mini is not set ++# CONFIG_PACKAGE_mrd6 is not set ++# CONFIG_PACKAGE_ndppd is not set ++# CONFIG_PACKAGE_odhcp6c is not set ++# CONFIG_PACKAGE_ptrtd is not set ++# CONFIG_PACKAGE_radvd is not set ++# CONFIG_PACKAGE_radvdump is not set ++# CONFIG_PACKAGE_send is not set ++# CONFIG_PACKAGE_tayga is not set ++# CONFIG_PACKAGE_totd is not set ++# CONFIG_PACKAGE_tspc is not set ++# CONFIG_PACKAGE_tunslip6 is not set ++ ++# ++# LuCI ++# ++ ++# ++# 1. Collections ++# ++CONFIG_PACKAGE_luci=y ++CONFIG_PACKAGE_luci-ssl=y ++ ++# ++# 2. Modules ++# ++CONFIG_PACKAGE_luci-mod-admin-core=y ++CONFIG_PACKAGE_luci-mod-admin-full=y ++# CONFIG_PACKAGE_luci-mod-failsafe is not set ++# CONFIG_PACKAGE_luci-mod-freifunk is not set ++# CONFIG_PACKAGE_luci-mod-rpc is not set ++ ++# ++# 3. Applications ++# ++# CONFIG_PACKAGE_luci-app-ahcp is not set ++# CONFIG_PACKAGE_luci-app-commands is not set ++# CONFIG_PACKAGE_luci-app-ddns is not set ++# CONFIG_PACKAGE_luci-app-diag-core is not set ++# CONFIG_PACKAGE_luci-app-diag-devinfo is not set ++CONFIG_PACKAGE_luci-app-firewall=y ++# CONFIG_PACKAGE_luci-app-freifunk-diagnostics is not set ++# CONFIG_PACKAGE_luci-app-freifunk-policyrouting is not set ++# CONFIG_PACKAGE_luci-app-freifunk-widgets is not set ++# CONFIG_PACKAGE_luci-app-hd-idle is not set ++# CONFIG_PACKAGE_luci-app-ltqtapi is not set ++# CONFIG_PACKAGE_luci-app-meshwizard is not set ++# CONFIG_PACKAGE_luci-app-mmc-over-gpio is not set ++CONFIG_PACKAGE_luci-app-multiwan=y ++# CONFIG_PACKAGE_luci-app-ntpc is not set ++# CONFIG_PACKAGE_luci-app-olsr is not set ++# CONFIG_PACKAGE_luci-app-p2pblock is not set ++# CONFIG_PACKAGE_luci-app-p910nd is not set ++# CONFIG_PACKAGE_luci-app-pbx is not set ++# CONFIG_PACKAGE_luci-app-polipo is not set ++# CONFIG_PACKAGE_luci-app-qos is not set ++# CONFIG_PACKAGE_luci-app-radvd is not set ++# CONFIG_PACKAGE_luci-app-samba is not set ++# CONFIG_PACKAGE_luci-app-siitwizard is not set ++# CONFIG_PACKAGE_luci-app-splash is not set ++# CONFIG_PACKAGE_luci-app-statistics is not set ++# CONFIG_PACKAGE_luci-app-tinyproxy is not set ++# CONFIG_PACKAGE_luci-app-transmission is not set ++# CONFIG_PACKAGE_luci-app-upnp is not set ++# CONFIG_PACKAGE_luci-app-vnstat is not set ++# CONFIG_PACKAGE_luci-app-voice-core is not set ++# CONFIG_PACKAGE_luci-app-watchcat is not set ++# CONFIG_PACKAGE_luci-app-wol is not set ++# CONFIG_PACKAGE_luci-app-wshaper is not set ++ ++# ++# 4. Themes ++# ++CONFIG_PACKAGE_luci-theme-base=y ++# CONFIG_PACKAGE_luci-theme-bootstrap is not set ++# CONFIG_PACKAGE_luci-theme-freifunk-bno is not set ++# CONFIG_PACKAGE_luci-theme-freifunk-generic is not set ++CONFIG_PACKAGE_luci-theme-openwrt=y ++ ++# ++# 5. Translations ++# ++# CONFIG_PACKAGE_luci-i18n-catalan is not set ++# CONFIG_PACKAGE_luci-i18n-chinese is not set ++CONFIG_PACKAGE_luci-i18n-english=y ++# CONFIG_PACKAGE_luci-i18n-french is not set ++# CONFIG_PACKAGE_luci-i18n-german is not set ++# CONFIG_PACKAGE_luci-i18n-greek is not set ++# CONFIG_PACKAGE_luci-i18n-hebrew is not set ++# CONFIG_PACKAGE_luci-i18n-hungarian is not set ++# CONFIG_PACKAGE_luci-i18n-italian is not set ++# CONFIG_PACKAGE_luci-i18n-japanese is not set ++# CONFIG_PACKAGE_luci-i18n-malay is not set ++# CONFIG_PACKAGE_luci-i18n-norwegian is not set ++# CONFIG_PACKAGE_luci-i18n-polish is not set ++# CONFIG_PACKAGE_luci-i18n-portuguese is not set ++# CONFIG_PACKAGE_luci-i18n-portuguese-brazilian is not set ++# CONFIG_PACKAGE_luci-i18n-romanian is not set ++# CONFIG_PACKAGE_luci-i18n-russian is not set ++# CONFIG_PACKAGE_luci-i18n-spanish is not set ++# CONFIG_PACKAGE_luci-i18n-ukrainian is not set ++# CONFIG_PACKAGE_luci-i18n-vietnamese is not set ++ ++# ++# 6. Protocols ++# ++CONFIG_PACKAGE_luci-proto-3g=y ++CONFIG_PACKAGE_luci-proto-core=y ++# CONFIG_PACKAGE_luci-proto-ipv6 is not set ++CONFIG_PACKAGE_luci-proto-ppp=y ++# CONFIG_PACKAGE_luci-proto-relay is not set ++ ++# ++# 7. Server Interfaces ++# ++CONFIG_PACKAGE_luci-sgi-cgi=y ++CONFIG_PACKAGE_luci-sgi-uhttpd=y ++ ++# ++# 8. Libraries ++# ++CONFIG_PACKAGE_luci-lib-core=y ++# CONFIG_PACKAGE_luci-lib-core_compile is not set ++CONFIG_PACKAGE_luci-lib-core_stripped=y ++# CONFIG_PACKAGE_luci-lib-core_srcdiet is not set ++# CONFIG_PACKAGE_luci-lib-core_source is not set ++# CONFIG_PACKAGE_luci-lib-fastindex is not set ++# CONFIG_PACKAGE_luci-lib-httpclient is not set ++CONFIG_PACKAGE_luci-lib-ipkg=y ++# CONFIG_PACKAGE_luci-lib-json is not set ++# CONFIG_PACKAGE_luci-lib-lucid is not set ++# CONFIG_PACKAGE_luci-lib-lucid-http is not set ++# CONFIG_PACKAGE_luci-lib-lucid-rpc is not set ++CONFIG_PACKAGE_luci-lib-nixio=y ++# CONFIG_PACKAGE_luci-lib-nixio_notls is not set ++# CONFIG_PACKAGE_luci-lib-nixio_axtls is not set ++# CONFIG_PACKAGE_luci-lib-nixio_cyassl is not set ++CONFIG_PACKAGE_luci-lib-nixio_openssl=y ++# CONFIG_PACKAGE_luci-lib-px5g is not set ++CONFIG_PACKAGE_luci-lib-sys=y ++CONFIG_PACKAGE_luci-lib-web=y ++ ++# ++# 9. Freifunk ++# ++# CONFIG_PACKAGE_freifunk-common is not set ++# CONFIG_PACKAGE_freifunk-firewall is not set ++# CONFIG_PACKAGE_freifunk-p2pblock is not set ++# CONFIG_PACKAGE_freifunk-policyrouting is not set ++# CONFIG_PACKAGE_freifunk-watchdog is not set ++# CONFIG_PACKAGE_luci-mod-freifunk-community is not set ++# CONFIG_PACKAGE_meshwizard is not set ++# CONFIG_PACKAGE_remote-update is not set ++ ++# ++# Kernel modules ++# ++ ++# ++# Block Devices ++# ++# CONFIG_PACKAGE_kmod-aoe is not set ++# CONFIG_PACKAGE_kmod-ata-core is not set ++# CONFIG_PACKAGE_kmod-block2mtd is not set ++# CONFIG_PACKAGE_kmod-dm is not set ++# CONFIG_PACKAGE_kmod-ide-core is not set ++# CONFIG_PACKAGE_kmod-libsas is not set ++# CONFIG_PACKAGE_kmod-loop is not set ++# CONFIG_PACKAGE_kmod-md-mod is not set ++# CONFIG_PACKAGE_kmod-nbd is not set ++# CONFIG_PACKAGE_kmod-scsi-cdrom is not set ++CONFIG_PACKAGE_kmod-scsi-core=y ++# CONFIG_PACKAGE_kmod-scsi-generic is not set ++ ++# ++# Cryptographic API modules ++# ++CONFIG_PACKAGE_kmod-crypto-aes=y ++CONFIG_PACKAGE_kmod-crypto-arc4=y ++# CONFIG_PACKAGE_kmod-crypto-authenc is not set ++# CONFIG_PACKAGE_kmod-crypto-cbc is not set ++CONFIG_PACKAGE_kmod-crypto-core=y ++# CONFIG_PACKAGE_kmod-crypto-crc32c is not set ++# CONFIG_PACKAGE_kmod-crypto-deflate is not set ++# CONFIG_PACKAGE_kmod-crypto-des is not set ++# CONFIG_PACKAGE_kmod-crypto-ecb is not set ++CONFIG_PACKAGE_kmod-crypto-hash=y ++# CONFIG_PACKAGE_kmod-crypto-hmac is not set ++# CONFIG_PACKAGE_kmod-crypto-hw-geode is not set ++# CONFIG_PACKAGE_kmod-crypto-hw-hifn-795x is not set ++# CONFIG_PACKAGE_kmod-crypto-hw-padlock is not set ++# CONFIG_PACKAGE_kmod-crypto-iv is not set ++CONFIG_PACKAGE_kmod-crypto-manager=y ++# CONFIG_PACKAGE_kmod-crypto-md4 is not set ++# CONFIG_PACKAGE_kmod-crypto-md5 is not set ++# CONFIG_PACKAGE_kmod-crypto-michael-mic is not set ++# CONFIG_PACKAGE_kmod-crypto-misc is not set ++# CONFIG_PACKAGE_kmod-crypto-null is not set ++# CONFIG_PACKAGE_kmod-crypto-ocf is not set ++# CONFIG_PACKAGE_kmod-crypto-pcompress is not set ++# CONFIG_PACKAGE_kmod-crypto-rng is not set ++# CONFIG_PACKAGE_kmod-crypto-sha1 is not set ++# CONFIG_PACKAGE_kmod-crypto-sha256 is not set ++# CONFIG_PACKAGE_kmod-crypto-test is not set ++# CONFIG_PACKAGE_kmod-crypto-user is not set ++# CONFIG_PACKAGE_kmod-crypto-wq is not set ++# CONFIG_PACKAGE_kmod-crypto-xts is not set ++# CONFIG_PACKAGE_kmod-loop-aes is not set ++ ++# ++# Filesystems ++# ++# CONFIG_PACKAGE_kmod-fs-autofs4 is not set ++# CONFIG_PACKAGE_kmod-fs-btrfs is not set ++# CONFIG_PACKAGE_kmod-fs-cifs is not set ++# CONFIG_PACKAGE_kmod-fs-configfs is not set ++# CONFIG_PACKAGE_kmod-fs-exportfs is not set ++# CONFIG_PACKAGE_kmod-fs-ext4 is not set ++# CONFIG_PACKAGE_kmod-fs-hfs is not set ++# CONFIG_PACKAGE_kmod-fs-hfsplus is not set ++# CONFIG_PACKAGE_kmod-fs-isofs is not set ++# CONFIG_PACKAGE_kmod-fs-minix is not set ++# CONFIG_PACKAGE_kmod-fs-msdos is not set ++# CONFIG_PACKAGE_kmod-fs-nfs is not set ++# CONFIG_PACKAGE_kmod-fs-nfs-common is not set ++# CONFIG_PACKAGE_kmod-fs-nfsd is not set ++# CONFIG_PACKAGE_kmod-fs-ntfs is not set ++# CONFIG_PACKAGE_kmod-fs-reiserfs is not set ++# CONFIG_PACKAGE_kmod-fs-udf is not set ++# CONFIG_PACKAGE_kmod-fs-vfat is not set ++# CONFIG_PACKAGE_kmod-fs-xfs is not set ++# CONFIG_PACKAGE_kmod-fuse is not set ++ ++# ++# FireWire support ++# ++# CONFIG_PACKAGE_kmod-firewire is not set ++ ++# ++# Hardware Monitoring Support ++# ++# CONFIG_PACKAGE_kmod-hwmon-core is not set ++ ++# ++# I2C support ++# ++# CONFIG_PACKAGE_kmod-i2c-core is not set ++# CONFIG_PACKAGE_kmod-i2c-gpio-custom is not set ++ ++# ++# Input modules ++# ++# CONFIG_PACKAGE_kmod-hid is not set ++# CONFIG_PACKAGE_kmod-input-core is not set ++# CONFIG_PACKAGE_kmod-input-evdev is not set ++# CONFIG_PACKAGE_kmod-input-gpio-buttons is not set ++# CONFIG_PACKAGE_kmod-input-gpio-encoder is not set ++# CONFIG_PACKAGE_kmod-input-gpio-keys is not set ++# CONFIG_PACKAGE_kmod-input-gpio-keys-polled is not set ++# CONFIG_PACKAGE_kmod-input-joydev is not set ++# CONFIG_PACKAGE_kmod-input-matrixkmap is not set ++# CONFIG_PACKAGE_kmod-input-polldev is not set ++ ++# ++# LED modules ++# ++CONFIG_PACKAGE_kmod-leds-gpio=y ++# CONFIG_PACKAGE_kmod-leds-rb750 is not set ++# CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set ++CONFIG_PACKAGE_kmod-ledtrig-default-on=y ++# CONFIG_PACKAGE_kmod-ledtrig-gpio is not set ++# CONFIG_PACKAGE_kmod-ledtrig-heartbeat is not set ++# CONFIG_PACKAGE_kmod-ledtrig-morse is not set ++CONFIG_PACKAGE_kmod-ledtrig-netdev=y ++# CONFIG_PACKAGE_kmod-ledtrig-netfilter is not set ++# CONFIG_PACKAGE_kmod-ledtrig-oneshot is not set ++CONFIG_PACKAGE_kmod-ledtrig-timer=y ++CONFIG_PACKAGE_kmod-ledtrig-usbdev=y ++ ++# ++# Libraries ++# ++# CONFIG_PACKAGE_kmod-lib-cordic is not set ++CONFIG_PACKAGE_kmod-lib-crc-ccitt=y ++CONFIG_PACKAGE_kmod-lib-crc-itu-t=y ++# CONFIG_PACKAGE_kmod-lib-crc16 is not set ++# CONFIG_PACKAGE_kmod-lib-crc32c is not set ++# CONFIG_PACKAGE_kmod-lib-crc7 is not set ++# CONFIG_PACKAGE_kmod-lib-crc8 is not set ++# CONFIG_PACKAGE_kmod-lib-lzo is not set ++# CONFIG_PACKAGE_kmod-lib-textsearch is not set ++# CONFIG_PACKAGE_kmod-lib-zlib is not set ++ ++# ++# Native Language Support ++# ++CONFIG_PACKAGE_kmod-nls-base=y ++# CONFIG_PACKAGE_kmod-nls-cp1250 is not set ++# CONFIG_PACKAGE_kmod-nls-cp1251 is not set ++# CONFIG_PACKAGE_kmod-nls-cp437 is not set ++# CONFIG_PACKAGE_kmod-nls-cp775 is not set ++# CONFIG_PACKAGE_kmod-nls-cp850 is not set ++# CONFIG_PACKAGE_kmod-nls-cp852 is not set ++# CONFIG_PACKAGE_kmod-nls-cp866 is not set ++# CONFIG_PACKAGE_kmod-nls-iso8859-1 is not set ++# CONFIG_PACKAGE_kmod-nls-iso8859-13 is not set ++# CONFIG_PACKAGE_kmod-nls-iso8859-15 is not set ++# CONFIG_PACKAGE_kmod-nls-iso8859-2 is not set ++# CONFIG_PACKAGE_kmod-nls-koi8r is not set ++# CONFIG_PACKAGE_kmod-nls-utf8 is not set ++ ++# ++# Netfilter Extensions ++# ++# CONFIG_PACKAGE_kmod-arptables is not set ++# CONFIG_PACKAGE_kmod-ebtables is not set ++# CONFIG_PACKAGE_kmod-ip6tables is not set ++CONFIG_PACKAGE_kmod-ipt-core=y ++# CONFIG_PACKAGE_kmod-ipt-account is not set ++# CONFIG_PACKAGE_kmod-ipt-chaos is not set ++# CONFIG_PACKAGE_kmod-ipt-compat-xtables is not set ++# CONFIG_PACKAGE_kmod-ipt-condition is not set ++CONFIG_PACKAGE_kmod-ipt-conntrack=y ++CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y ++# CONFIG_PACKAGE_kmod-ipt-debug is not set ++# CONFIG_PACKAGE_kmod-ipt-delude is not set ++# CONFIG_PACKAGE_kmod-ipt-dhcpmac is not set ++# CONFIG_PACKAGE_kmod-ipt-dnetmap is not set ++# CONFIG_PACKAGE_kmod-ipt-extra is not set ++# CONFIG_PACKAGE_kmod-ipt-filter is not set ++# CONFIG_PACKAGE_kmod-ipt-fuzzy is not set ++# CONFIG_PACKAGE_kmod-ipt-geoip is not set ++# CONFIG_PACKAGE_kmod-ipt-hashlimit is not set ++# CONFIG_PACKAGE_kmod-ipt-iface is not set ++# CONFIG_PACKAGE_kmod-ipt-ipmark is not set ++CONFIG_PACKAGE_kmod-ipt-ipopt=y ++# CONFIG_PACKAGE_kmod-ipt-ipp2p is not set ++# CONFIG_PACKAGE_kmod-ipt-iprange is not set ++# CONFIG_PACKAGE_kmod-ipt-ipsec is not set ++# CONFIG_PACKAGE_kmod-ipt-ipset is not set ++# CONFIG_PACKAGE_kmod-ipt-ipv4options is not set ++# CONFIG_PACKAGE_kmod-ipt-led is not set ++# CONFIG_PACKAGE_kmod-ipt-length2 is not set ++# CONFIG_PACKAGE_kmod-ipt-logmark is not set ++# CONFIG_PACKAGE_kmod-ipt-lscan is not set ++# CONFIG_PACKAGE_kmod-ipt-lua is not set ++CONFIG_PACKAGE_kmod-ipt-nat=y ++# CONFIG_PACKAGE_kmod-ipt-nat-extra is not set ++CONFIG_PACKAGE_kmod-ipt-nathelper=y ++# CONFIG_PACKAGE_kmod-ipt-nathelper-extra is not set ++# CONFIG_PACKAGE_kmod-ipt-nathelper-rtsp is not set ++# CONFIG_PACKAGE_kmod-ipt-psd is not set ++# CONFIG_PACKAGE_kmod-ipt-queue is not set ++# CONFIG_PACKAGE_kmod-ipt-quota2 is not set ++# CONFIG_PACKAGE_kmod-ipt-rawnat is not set ++# CONFIG_PACKAGE_kmod-ipt-rawpost is not set ++# CONFIG_PACKAGE_kmod-ipt-steal is not set ++# CONFIG_PACKAGE_kmod-ipt-sysrq is not set ++# CONFIG_PACKAGE_kmod-ipt-tarpit is not set ++# CONFIG_PACKAGE_kmod-ipt-tee is not set ++# CONFIG_PACKAGE_kmod-ipt-tproxy is not set ++# CONFIG_PACKAGE_kmod-ipt-u32 is not set ++# CONFIG_PACKAGE_kmod-ipt-ulog is not set ++CONFIG_PACKAGE_kmod-nf-conntrack-netlink=y ++CONFIG_PACKAGE_kmod-nfnetlink=y ++# CONFIG_PACKAGE_kmod-nfnetlink-log is not set ++# CONFIG_PACKAGE_kmod-nfnetlink-queue is not set ++ ++# ++# Network Devices ++# ++# CONFIG_PACKAGE_kmod-3c59x is not set ++# CONFIG_PACKAGE_kmod-8139cp is not set ++# CONFIG_PACKAGE_kmod-8139too is not set ++# CONFIG_PACKAGE_kmod-atl1 is not set ++# CONFIG_PACKAGE_kmod-atl1c is not set ++# CONFIG_PACKAGE_kmod-atl1e is not set ++# CONFIG_PACKAGE_kmod-atl2 is not set ++# CONFIG_PACKAGE_kmod-b44 is not set ++# CONFIG_PACKAGE_kmod-dm9000 is not set ++# CONFIG_PACKAGE_kmod-dummy is not set ++# CONFIG_PACKAGE_kmod-e100 is not set ++# CONFIG_PACKAGE_kmod-e1000 is not set ++# CONFIG_PACKAGE_kmod-et131x is not set ++# CONFIG_PACKAGE_kmod-forcedeth is not set ++# CONFIG_PACKAGE_kmod-gigaset is not set ++# CONFIG_PACKAGE_kmod-hfcmulti is not set ++# CONFIG_PACKAGE_kmod-hfcpci is not set ++# CONFIG_PACKAGE_kmod-ifb is not set ++# CONFIG_PACKAGE_kmod-libphy is not set ++# CONFIG_PACKAGE_kmod-macvlan is not set ++# CONFIG_PACKAGE_kmod-natsemi is not set ++# CONFIG_PACKAGE_kmod-ne2k-pci is not set ++# CONFIG_PACKAGE_kmod-of-mdio is not set ++# CONFIG_PACKAGE_kmod-pcnet32 is not set ++# CONFIG_PACKAGE_kmod-r6040 is not set ++# CONFIG_PACKAGE_kmod-r8169 is not set ++# CONFIG_PACKAGE_kmod-siit is not set ++# CONFIG_PACKAGE_kmod-sis190 is not set ++# CONFIG_PACKAGE_kmod-sis900 is not set ++# CONFIG_PACKAGE_kmod-skge is not set ++# CONFIG_PACKAGE_kmod-sky2 is not set ++# CONFIG_PACKAGE_kmod-solos-pci is not set ++# CONFIG_PACKAGE_kmod-swconfig is not set ++# CONFIG_PACKAGE_kmod-switch-ip17xx is not set ++# CONFIG_PACKAGE_kmod-switch-rtl8366-smi is not set ++# CONFIG_PACKAGE_kmod-switch-rtl8366rb is not set ++# CONFIG_PACKAGE_kmod-switch-rtl8366s is not set ++# CONFIG_PACKAGE_kmod-tg3 is not set ++# CONFIG_PACKAGE_kmod-tulip is not set ++# CONFIG_PACKAGE_kmod-via-rhine is not set ++# CONFIG_PACKAGE_kmod-via-velocity is not set ++ ++# ++# Network Support ++# ++# CONFIG_PACKAGE_kmod-8021q is not set ++# CONFIG_PACKAGE_kmod-appletalk is not set ++# CONFIG_PACKAGE_kmod-atm is not set ++# CONFIG_PACKAGE_kmod-ax25 is not set ++# CONFIG_PACKAGE_kmod-batman-adv is not set ++# CONFIG_PACKAGE_kmod-bonding is not set ++# CONFIG_PACKAGE_kmod-bridge is not set ++# CONFIG_PACKAGE_kmod-capi is not set ++# CONFIG_PACKAGE_kmod-gre is not set ++# CONFIG_PACKAGE_kmod-gre6 is not set ++# CONFIG_PACKAGE_kmod-ip6-tunnel is not set ++# CONFIG_PACKAGE_kmod-ipip is not set ++# CONFIG_PACKAGE_kmod-ipsec is not set ++# CONFIG_PACKAGE_kmod-iptunnel4 is not set ++# CONFIG_PACKAGE_kmod-iptunnel6 is not set ++# CONFIG_PACKAGE_kmod-ipv6 is not set ++# CONFIG_PACKAGE_kmod-isdn4linux is not set ++# CONFIG_PACKAGE_kmod-l2tp is not set ++# CONFIG_PACKAGE_kmod-l2tp-eth is not set ++# CONFIG_PACKAGE_kmod-l2tp-ip is not set ++# CONFIG_PACKAGE_kmod-llc is not set ++# CONFIG_PACKAGE_kmod-misdn is not set ++# CONFIG_PACKAGE_kmod-mp-alg is not set ++# CONFIG_PACKAGE_kmod-netem is not set ++# CONFIG_PACKAGE_kmod-openswan is not set ++# CONFIG_PACKAGE_kmod-pktgen is not set ++CONFIG_PACKAGE_kmod-ppp=y ++# CONFIG_PACKAGE_kmod-mppe is not set ++# CONFIG_PACKAGE_kmod-ppp-synctty is not set ++# CONFIG_PACKAGE_kmod-pppoa is not set ++CONFIG_PACKAGE_kmod-pppoe=y ++# CONFIG_PACKAGE_kmod-pppol2tp is not set ++CONFIG_PACKAGE_kmod-pppox=y ++# CONFIG_PACKAGE_kmod-pptp is not set ++# CONFIG_PACKAGE_kmod-sched is not set ++# CONFIG_PACKAGE_kmod-sched-connmark is not set ++# CONFIG_PACKAGE_kmod-sched-core is not set ++# CONFIG_PACKAGE_kmod-sched-esfq is not set ++# CONFIG_PACKAGE_kmod-sctp is not set ++# CONFIG_PACKAGE_kmod-sit is not set ++# CONFIG_PACKAGE_kmod-slip is not set ++# CONFIG_PACKAGE_kmod-stp is not set ++# CONFIG_PACKAGE_kmod-trelay is not set ++CONFIG_PACKAGE_kmod-tun=y ++# CONFIG_PACKAGE_kmod-wprobe is not set ++ ++# ++# Other modules ++# ++# CONFIG_PACKAGE_kmod-bcma is not set ++# CONFIG_PACKAGE_kmod-bluetooth is not set ++# CONFIG_PACKAGE_kmod-button-hotplug is not set ++# CONFIG_PACKAGE_kmod-eeprom-93cx6 is not set ++# CONFIG_PACKAGE_kmod-eeprom-at24 is not set ++# CONFIG_PACKAGE_kmod-eeprom-at25 is not set ++CONFIG_PACKAGE_kmod-gpio-button-hotplug=y ++# CONFIG_PACKAGE_kmod-gpio-dev is not set ++# CONFIG_PACKAGE_kmod-gpio-nxp-74hc164 is not set ++# CONFIG_PACKAGE_kmod-gpiotoggling is not set ++# CONFIG_PACKAGE_kmod-ikconfig is not set ++# CONFIG_PACKAGE_kmod-mmc is not set ++# CONFIG_PACKAGE_kmod-mmc-over-gpio is not set ++# CONFIG_PACKAGE_kmod-mtdtests is not set ++# CONFIG_PACKAGE_kmod-nand is not set ++# CONFIG_PACKAGE_kmod-nand-ar934x is not set ++# CONFIG_PACKAGE_kmod-nandsim is not set ++# CONFIG_PACKAGE_kmod-pps is not set ++# CONFIG_PACKAGE_kmod-ptp is not set ++# CONFIG_PACKAGE_kmod-pwm is not set ++# CONFIG_PACKAGE_kmod-pwm-gpio is not set ++# CONFIG_PACKAGE_kmod-regmap is not set ++# CONFIG_PACKAGE_kmod-rfkill is not set ++# CONFIG_PACKAGE_kmod-rotary-gpio-custom is not set ++# CONFIG_PACKAGE_kmod-serial-8250 is not set ++# CONFIG_PACKAGE_kmod-softdog is not set ++# CONFIG_PACKAGE_kmod-ssb is not set ++CONFIG_PACKAGE_kmod-wdt-ath79=y ++# CONFIG_PACKAGE_kmod-zram is not set ++ ++# ++# PCMCIA support ++# ++ ++# ++# SPI Support ++# ++# CONFIG_PACKAGE_kmod-mmc-spi is not set ++# CONFIG_PACKAGE_kmod-spi-bitbang is not set ++# CONFIG_PACKAGE_kmod-spi-dev is not set ++# CONFIG_PACKAGE_kmod-spi-gpio is not set ++# CONFIG_PACKAGE_kmod-spi-gpio-old is not set ++# CONFIG_PACKAGE_kmod-spi-ks8995 is not set ++# CONFIG_PACKAGE_kmod-spi-vsc7385 is not set ++ ++# ++# Sound Support ++# ++# CONFIG_PACKAGE_kmod-sound-core is not set ++ ++# ++# USB Support ++# ++CONFIG_PACKAGE_kmod-usb-acm=y ++# CONFIG_PACKAGE_kmod-usb-atm is not set ++# CONFIG_PACKAGE_kmod-usb-cm109 is not set ++CONFIG_PACKAGE_kmod-usb-core=y ++# CONFIG_PACKAGE_kmod-usb-hid is not set ++# CONFIG_PACKAGE_kmod-usb-net is not set ++# CONFIG_PACKAGE_kmod-usb-ohci is not set ++# CONFIG_PACKAGE_kmod-usb-printer is not set ++CONFIG_PACKAGE_kmod-usb-serial=y ++# CONFIG_PACKAGE_kmod-usb-serial-ark3116 is not set ++# CONFIG_PACKAGE_kmod-usb-serial-belkin is not set ++# CONFIG_PACKAGE_kmod-usb-serial-ch341 is not set ++# CONFIG_PACKAGE_kmod-usb-serial-cp210x is not set ++# CONFIG_PACKAGE_kmod-usb-serial-cypress-m8 is not set ++CONFIG_PACKAGE_kmod-usb-serial-ftdi=y ++# CONFIG_PACKAGE_kmod-usb-serial-ipw is not set ++# CONFIG_PACKAGE_kmod-usb-serial-keyspan is not set ++# CONFIG_PACKAGE_kmod-usb-serial-mct is not set ++# CONFIG_PACKAGE_kmod-usb-serial-mos7720 is not set ++CONFIG_PACKAGE_kmod-usb-serial-motorola-phone=y ++CONFIG_PACKAGE_kmod-usb-serial-option=y ++# CONFIG_PACKAGE_kmod-usb-serial-oti6858 is not set ++# CONFIG_PACKAGE_kmod-usb-serial-pl2303 is not set ++CONFIG_PACKAGE_kmod-usb-serial-qualcomm=y ++CONFIG_PACKAGE_kmod-usb-serial-sierrawireless=y ++# CONFIG_PACKAGE_kmod-usb-serial-ti-usb is not set ++# CONFIG_PACKAGE_kmod-usb-serial-visor is not set ++CONFIG_PACKAGE_kmod-usb-serial-wwan=y ++CONFIG_PACKAGE_kmod-usb-storage=y ++# CONFIG_PACKAGE_kmod-usb-storage-extras is not set ++# CONFIG_PACKAGE_kmod-usb-uhci is not set ++# CONFIG_PACKAGE_kmod-usb-wdm is not set ++# CONFIG_PACKAGE_kmod-usb-yealink is not set ++CONFIG_PACKAGE_kmod-usb2=y ++# CONFIG_PACKAGE_kmod-usb2-pci is not set ++# CONFIG_PACKAGE_kmod-usbip is not set ++# CONFIG_PACKAGE_kmod-usbip-client is not set ++# CONFIG_PACKAGE_kmod-usbip-server is not set ++ ++# ++# Video Support ++# ++# CONFIG_PACKAGE_kmod-video-core is not set ++ ++# ++# Virtualization Support ++# ++ ++# ++# Voice over IP ++# ++# CONFIG_PACKAGE_kmod-zaptel14 is not set ++# CONFIG_PACKAGE_kmod-zaptel14-dummy is not set ++# CONFIG_PACKAGE_kmod-zaptel14-wctdm is not set ++# CONFIG_PACKAGE_kmod-zaptel14-wcusb is not set ++ ++# ++# W1 support ++# ++# CONFIG_PACKAGE_kmod-w1 is not set ++ ++# ++# Wireless Drivers ++# ++# CONFIG_PACKAGE_kmod-adm8211 is not set ++CONFIG_PACKAGE_kmod-ath=y ++# CONFIG_ATH_USER_REGD is not set ++# CONFIG_PACKAGE_ATH_DEBUG is not set ++# CONFIG_PACKAGE_kmod-ath5k is not set ++CONFIG_PACKAGE_kmod-ath9k=y ++CONFIG_PACKAGE_kmod-ath9k-common=y ++# CONFIG_PACKAGE_kmod-ath9k-htc is not set ++# CONFIG_PACKAGE_kmod-b43 is not set ++# CONFIG_PACKAGE_kmod-b43legacy is not set ++# CONFIG_PACKAGE_kmod-brcmfmac is not set ++# CONFIG_PACKAGE_kmod-brcmsmac is not set ++# CONFIG_PACKAGE_kmod-brcmutil is not set ++# CONFIG_PACKAGE_kmod-carl9170 is not set ++CONFIG_PACKAGE_kmod-cfg80211=y ++# CONFIG_PACKAGE_kmod-hostap is not set ++# CONFIG_PACKAGE_kmod-hostap-pci is not set ++# CONFIG_PACKAGE_kmod-hostap-plx is not set ++# CONFIG_PACKAGE_kmod-iwl-legacy is not set ++# CONFIG_PACKAGE_kmod-iwl3945 is not set ++# CONFIG_PACKAGE_kmod-iwl4965 is not set ++# CONFIG_PACKAGE_kmod-iwlagn is not set ++# CONFIG_PACKAGE_kmod-lib80211 is not set ++# CONFIG_PACKAGE_kmod-libertas-sd is not set ++# CONFIG_PACKAGE_kmod-libertas-usb is not set ++CONFIG_PACKAGE_kmod-mac80211=y ++CONFIG_PACKAGE_MAC80211_DEBUGFS=y ++CONFIG_PACKAGE_MAC80211_MESH=y ++# CONFIG_PACKAGE_kmod-mac80211-hwsim is not set ++# CONFIG_PACKAGE_kmod-madwifi is not set ++# CONFIG_PACKAGE_kmod-mwl8k is not set ++# CONFIG_PACKAGE_kmod-net-airo is not set ++# CONFIG_PACKAGE_kmod-net-hermes is not set ++# CONFIG_PACKAGE_kmod-net-hermes-pci is not set ++# CONFIG_PACKAGE_kmod-net-hermes-plx is not set ++# CONFIG_PACKAGE_kmod-net-ipw2100 is not set ++# CONFIG_PACKAGE_kmod-net-ipw2200 is not set ++# CONFIG_PACKAGE_kmod-net-libipw is not set ++# CONFIG_PACKAGE_kmod-net-prism54 is not set ++# CONFIG_PACKAGE_kmod-net-zd1201 is not set ++# CONFIG_PACKAGE_kmod-p54-common is not set ++# CONFIG_PACKAGE_kmod-p54-pci is not set ++# CONFIG_PACKAGE_kmod-p54-usb is not set ++# CONFIG_PACKAGE_kmod-rt2400-pci is not set ++# CONFIG_PACKAGE_kmod-rt2500-pci is not set ++CONFIG_PACKAGE_kmod-rt2500-usb=y ++CONFIG_PACKAGE_kmod-rt2800-lib=y ++# CONFIG_PACKAGE_kmod-rt2800-pci is not set ++CONFIG_PACKAGE_kmod-rt2800-usb=y ++CONFIG_PACKAGE_kmod-rt2x00-lib=y ++# CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS is not set ++# CONFIG_PACKAGE_RT2X00_DEBUG is not set ++# CONFIG_PACKAGE_kmod-rt2x00-pci is not set ++CONFIG_PACKAGE_kmod-rt2x00-usb=y ++# CONFIG_PACKAGE_kmod-rt61-pci is not set ++# CONFIG_PACKAGE_kmod-rt73-usb is not set ++# CONFIG_PACKAGE_kmod-rtl8180 is not set ++# CONFIG_PACKAGE_kmod-rtl8187 is not set ++# CONFIG_PACKAGE_kmod-zd1211rw is not set ++ ++# ++# Boot Loaders ++# ++# CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh is not set ++ ++# ++# Administration ++# ++ ++# ++# Pmacct suite ++# ++# CONFIG_PACKAGE_nfacctd is not set ++# CONFIG_PACKAGE_nfacctd-mysql is not set ++# CONFIG_PACKAGE_nfacctd-pgsql is not set ++# CONFIG_PACKAGE_nfacctd-sqlite is not set ++# CONFIG_PACKAGE_pmacct-client is not set ++# CONFIG_PACKAGE_pmacctd is not set ++# CONFIG_PACKAGE_pmacctd-mysql is not set ++# CONFIG_PACKAGE_pmacctd-pgsql is not set ++# CONFIG_PACKAGE_pmacctd-sqlite is not set ++# CONFIG_PACKAGE_sfacctd is not set ++# CONFIG_PACKAGE_sfacctd-mysql is not set ++# CONFIG_PACKAGE_sfacctd-pgsql is not set ++# CONFIG_PACKAGE_sfacctd-sqlite is not set ++# CONFIG_PACKAGE_uacctd is not set ++# CONFIG_PACKAGE_uacctd-mysql is not set ++# CONFIG_PACKAGE_uacctd-pgsql is not set ++# CONFIG_PACKAGE_uacctd-sqlite is not set ++ ++# ++# webif ++# ++# CONFIG_PACKAGE_webif is not set ++# CONFIG_PACKAGE_webif-applications is not set ++# CONFIG_PACKAGE_webif-batman is not set ++# CONFIG_PACKAGE_webif-fonheartbeat is not set ++# CONFIG_PACKAGE_webif-freeloader is not set ++# CONFIG_PACKAGE_webif-freeloader-lang-cs is not set ++# CONFIG_PACKAGE_webif-hotspot is not set ++# CONFIG_PACKAGE_webif-iw-lua is not set ++# CONFIG_PACKAGE_webif-iw-lua-chillispot is not set ++# CONFIG_PACKAGE_webif-iw-lua-openssl is not set ++# CONFIG_PACKAGE_webif-iw-lua-openvpn is not set ++# CONFIG_PACKAGE_webif-lang-ca is not set ++# CONFIG_PACKAGE_webif-lang-cs is not set ++# CONFIG_PACKAGE_webif-lang-da is not set ++# CONFIG_PACKAGE_webif-lang-de is not set ++# CONFIG_PACKAGE_webif-lang-ee is not set ++# CONFIG_PACKAGE_webif-lang-es is not set ++# CONFIG_PACKAGE_webif-lang-fr is not set ++# CONFIG_PACKAGE_webif-lang-hr is not set ++# CONFIG_PACKAGE_webif-lang-hu is not set ++# CONFIG_PACKAGE_webif-lang-it is not set ++# CONFIG_PACKAGE_webif-lang-nl is not set ++# CONFIG_PACKAGE_webif-lang-no is not set ++# CONFIG_PACKAGE_webif-lang-pl is not set ++# CONFIG_PACKAGE_webif-lang-pt is not set ++# CONFIG_PACKAGE_webif-lang-ru is not set ++# CONFIG_PACKAGE_webif-lang-sq is not set ++# CONFIG_PACKAGE_webif-lang-sv is not set ++# CONFIG_PACKAGE_webif-lang-uk is not set ++# CONFIG_PACKAGE_webif-lang-zh is not set ++# CONFIG_PACKAGE_webif-mesh is not set ++# CONFIG_PACKAGE_webif-netsukuku is not set ++# CONFIG_PACKAGE_webif-theme-clubman is not set ++# CONFIG_PACKAGE_webif-theme-sedky1 is not set ++# CONFIG_PACKAGE_webif-theme-xwrt is not set ++# CONFIG_PACKAGE_webif-theme-xwrt-mini is not set ++# CONFIG_PACKAGE_webif-theme-zephyr is not set ++# CONFIG_PACKAGE_webif-vpn is not set ++ ++# ++# zabbix ++# ++# CONFIG_PACKAGE_zabbix-agent is not set ++# CONFIG_PACKAGE_zabbix-agentd is not set ++# CONFIG_PACKAGE_zabbix-get is not set ++# CONFIG_PACKAGE_zabbix-proxy is not set ++# CONFIG_PACKAGE_zabbix-sender is not set ++# CONFIG_PACKAGE_zabbix-server is not set ++# CONFIG_PACKAGE_gkrellmd is not set ++# CONFIG_PACKAGE_htop is not set ++# CONFIG_PACKAGE_monit is not set ++# CONFIG_PACKAGE_monit-nossl is not set ++# CONFIG_PACKAGE_muninlite is not set ++# CONFIG_PACKAGE_nagios is not set ++# CONFIG_PACKAGE_nagios-plugins is not set ++# CONFIG_PACKAGE_nrpe is not set ++# CONFIG_PACKAGE_osirisd is not set ++# CONFIG_PACKAGE_ostiary is not set ++# CONFIG_PACKAGE_send-nsca is not set ++# CONFIG_PACKAGE_sudo is not set ++# CONFIG_PACKAGE_syslog-ng is not set ++# CONFIG_PACKAGE_syslog-ng3 is not set ++ ++# ++# Video Streaming ++# ++# CONFIG_PACKAGE_openrtsp is not set ++ ++# ++# Xorg ++# ++ ++# ++# libraries ++# ++# CONFIG_PACKAGE_orbit2 is not set ++ ++# ++# Mail ++# ++# CONFIG_PACKAGE_dovecot is not set ++# CONFIG_PACKAGE_fetchmail is not set ++# CONFIG_PACKAGE_fetchmail-nossl is not set ++# CONFIG_PACKAGE_imapfilter is not set ++# CONFIG_PACKAGE_mini-sendmail is not set ++# CONFIG_PACKAGE_msmtp is not set ++# CONFIG_PACKAGE_msmtp-nossl is not set ++# CONFIG_PACKAGE_msmtp-queue is not set ++# CONFIG_PACKAGE_mutt is not set ++# CONFIG_PACKAGE_nullmailer is not set ++# CONFIG_PACKAGE_procmail is not set ++# CONFIG_PACKAGE_ssmtp is not set ++# CONFIG_PACKAGE_xmail is not set ++ ++# ++# Network ++# ++ ++# ++# BitTorrent ++# ++# CONFIG_PACKAGE_btpd is not set ++# CONFIG_PACKAGE_cbtt is not set ++# CONFIG_PACKAGE_cbtt-mysql is not set ++# CONFIG_PACKAGE_ctorrent is not set ++# CONFIG_PACKAGE_ctorrent-nossl is not set ++# CONFIG_PACKAGE_rtorrent is not set ++# CONFIG_PACKAGE_transmission-daemon is not set ++# CONFIG_PACKAGE_transmission-remote is not set ++ ++# ++# Captive Portals ++# ++# CONFIG_PACKAGE_chillispot is not set ++# CONFIG_PACKAGE_coova-chilli is not set ++# CONFIG_PACKAGE_nocatauth is not set ++# CONFIG_PACKAGE_nocatsplash is not set ++# CONFIG_PACKAGE_nodogsplash is not set ++# CONFIG_PACKAGE_pepperspot is not set ++# CONFIG_PACKAGE_wifidog is not set ++ ++# ++# File Transfer ++# ++# CONFIG_PACKAGE_aria2 is not set ++# CONFIG_PACKAGE_atftp is not set ++# CONFIG_PACKAGE_atftpd is not set ++# CONFIG_PACKAGE_axel is not set ++# CONFIG_PACKAGE_cmdftp is not set ++# CONFIG_PACKAGE_curl is not set ++# CONFIG_PACKAGE_lftp is not set ++# CONFIG_PACKAGE_ncftp is not set ++# CONFIG_PACKAGE_ncftp-utils is not set ++# CONFIG_PACKAGE_proftpd is not set ++# CONFIG_PACKAGE_pure-ftpd is not set ++# CONFIG_PACKAGE_pure-ftpd-tls is not set ++# CONFIG_PACKAGE_rsync is not set ++# CONFIG_PACKAGE_rsyncd is not set ++# CONFIG_PACKAGE_tftp-hpa is not set ++# CONFIG_PACKAGE_tftpd-hpa is not set ++# CONFIG_PACKAGE_uftp is not set ++# CONFIG_PACKAGE_uftp-keymgt is not set ++# CONFIG_PACKAGE_uftp-notls is not set ++# CONFIG_PACKAGE_uftpd is not set ++# CONFIG_PACKAGE_uftpd-notls is not set ++# CONFIG_PACKAGE_uftpproxyd is not set ++# CONFIG_PACKAGE_uftpproxyd-notls is not set ++# CONFIG_PACKAGE_uucp is not set ++# CONFIG_PACKAGE_vsftpd is not set ++# CONFIG_PACKAGE_wget is not set ++# CONFIG_PACKAGE_wget-nossl is not set ++# CONFIG_PACKAGE_wput is not set ++# CONFIG_PACKAGE_yafc is not set ++# CONFIG_PACKAGE_zstream is not set ++ ++# ++# Filesystem ++# ++# CONFIG_PACKAGE_curlftpfs is not set ++# CONFIG_PACKAGE_netatalk is not set ++# CONFIG_PACKAGE_nfs-kernel-server is not set ++# CONFIG_PACKAGE_nfs-server is not set ++# CONFIG_PACKAGE_owftpd is not set ++# CONFIG_PACKAGE_owhttpd is not set ++# CONFIG_PACKAGE_owserver is not set ++# CONFIG_PACKAGE_remotefs is not set ++# CONFIG_PACKAGE_remotefs-server is not set ++# CONFIG_PACKAGE_sshfs is not set ++# CONFIG_PACKAGE_unfs3 is not set ++ ++# ++# Firewall ++# ++# CONFIG_PACKAGE_amwall is not set ++# CONFIG_PACKAGE_arptables is not set ++CONFIG_PACKAGE_conntrack-tools=y ++# CONFIG_PACKAGE_ebtables is not set ++# CONFIG_PACKAGE_fwknop is not set ++# CONFIG_PACKAGE_fwknopd is not set ++# CONFIG_PACKAGE_ipkungfu is not set ++CONFIG_PACKAGE_iptables=y ++# CONFIG_PACKAGE_iptables-mod-account is not set ++# CONFIG_PACKAGE_iptables-mod-chaos is not set ++# CONFIG_PACKAGE_iptables-mod-condition is not set ++CONFIG_PACKAGE_iptables-mod-conntrack-extra=y ++# CONFIG_PACKAGE_iptables-mod-delude is not set ++# CONFIG_PACKAGE_iptables-mod-dhcpmac is not set ++# CONFIG_PACKAGE_iptables-mod-dnetmap is not set ++# CONFIG_PACKAGE_iptables-mod-extra is not set ++# CONFIG_PACKAGE_iptables-mod-filter is not set ++# CONFIG_PACKAGE_iptables-mod-fuzzy is not set ++# CONFIG_PACKAGE_iptables-mod-geoip is not set ++# CONFIG_PACKAGE_iptables-mod-hashlimit is not set ++# CONFIG_PACKAGE_iptables-mod-iface is not set ++# CONFIG_PACKAGE_iptables-mod-ipmark is not set ++CONFIG_PACKAGE_iptables-mod-ipopt=y ++# CONFIG_PACKAGE_iptables-mod-ipp2p is not set ++# CONFIG_PACKAGE_iptables-mod-iprange is not set ++# CONFIG_PACKAGE_iptables-mod-ipsec is not set ++# CONFIG_PACKAGE_iptables-mod-ipset is not set ++# CONFIG_PACKAGE_iptables-mod-ipv4options is not set ++# CONFIG_PACKAGE_iptables-mod-led is not set ++# CONFIG_PACKAGE_iptables-mod-length2 is not set ++# CONFIG_PACKAGE_iptables-mod-logmark is not set ++# CONFIG_PACKAGE_iptables-mod-lscan is not set ++# CONFIG_PACKAGE_iptables-mod-lua is not set ++# CONFIG_PACKAGE_iptables-mod-nat-extra is not set ++# CONFIG_PACKAGE_iptables-mod-psd is not set ++# CONFIG_PACKAGE_iptables-mod-quota2 is not set ++# CONFIG_PACKAGE_iptables-mod-rawnat is not set ++# CONFIG_PACKAGE_iptables-mod-steal is not set ++# CONFIG_PACKAGE_iptables-mod-sysrq is not set ++# CONFIG_PACKAGE_iptables-mod-tarpit is not set ++# CONFIG_PACKAGE_iptables-mod-tee is not set ++# CONFIG_PACKAGE_iptables-mod-tproxy is not set ++# CONFIG_PACKAGE_iptables-mod-u32 is not set ++# CONFIG_PACKAGE_iptables-mod-ulog is not set ++# CONFIG_PACKAGE_iptables-snmp is not set ++# CONFIG_PACKAGE_iptaccount is not set ++# CONFIG_PACKAGE_knock is not set ++# CONFIG_PACKAGE_knockd is not set ++# CONFIG_PACKAGE_miniupnpc is not set ++# CONFIG_PACKAGE_miniupnpd is not set ++# CONFIG_PACKAGE_natpmp is not set ++# CONFIG_PACKAGE_natpmpc is not set ++# CONFIG_PACKAGE_nufw is not set ++# CONFIG_PACKAGE_nufw-modules is not set ++# CONFIG_PACKAGE_nufw-python is not set ++# CONFIG_PACKAGE_nutcpc is not set ++# CONFIG_PACKAGE_portsentry is not set ++# CONFIG_PACKAGE_scanlogd is not set ++# CONFIG_PACKAGE_shorewall-core is not set ++# CONFIG_PACKAGE_shorewall-lite is not set ++# CONFIG_PACKAGE_snort is not set ++# CONFIG_PACKAGE_snort-mysql is not set ++# CONFIG_PACKAGE_snort-pgsql is not set ++# CONFIG_PACKAGE_snortsam is not set ++ ++# ++# Firewall Tunnel ++# ++# CONFIG_PACKAGE_httptunnel is not set ++# CONFIG_PACKAGE_icmptx is not set ++CONFIG_PACKAGE_iodine=m ++# CONFIG_PACKAGE_iodined is not set ++# CONFIG_PACKAGE_nstx is not set ++# CONFIG_PACKAGE_nstxd is not set ++# CONFIG_PACKAGE_ptunnel is not set ++ ++# ++# IP Addresses and Names ++# ++# CONFIG_PACKAGE_avahi-autoipd is not set ++# CONFIG_PACKAGE_avahi-daemon is not set ++# CONFIG_PACKAGE_avahi-dnsconfd is not set ++# CONFIG_PACKAGE_avahi-utils is not set ++# CONFIG_PACKAGE_bind-check is not set ++# CONFIG_PACKAGE_bind-client is not set ++# CONFIG_PACKAGE_bind-dig is not set ++# CONFIG_PACKAGE_bind-dnssec is not set ++# CONFIG_PACKAGE_bind-host is not set ++# CONFIG_PACKAGE_bind-rndc is not set ++# CONFIG_PACKAGE_bind-server is not set ++# CONFIG_PACKAGE_bind-tools is not set ++# CONFIG_PACKAGE_ddns-scripts is not set ++# CONFIG_PACKAGE_dhcp-forwarder is not set ++# CONFIG_PACKAGE_dhcpcd is not set ++# CONFIG_PACKAGE_djbdns-axfrdns is not set ++# CONFIG_PACKAGE_djbdns-base is not set ++# CONFIG_PACKAGE_djbdns-dnscache is not set ++# CONFIG_PACKAGE_djbdns-rbldns is not set ++# CONFIG_PACKAGE_djbdns-tinydns is not set ++# CONFIG_PACKAGE_djbdns-tools is not set ++# CONFIG_PACKAGE_djbdns-walldns is not set ++# CONFIG_PACKAGE_drill is not set ++# CONFIG_PACKAGE_dudders is not set ++# CONFIG_PACKAGE_ez-ipupdate is not set ++# CONFIG_PACKAGE_howl-autoipd is not set ++# CONFIG_PACKAGE_howl-mdnsresponder is not set ++# CONFIG_PACKAGE_howl-nifd is not set ++# CONFIG_PACKAGE_howl-utils is not set ++# CONFIG_PACKAGE_ipupdate is not set ++# CONFIG_PACKAGE_isc-dhcp-client-ipv4 is not set ++# CONFIG_PACKAGE_isc-dhcp-client-ipv6 is not set ++# CONFIG_PACKAGE_isc-dhcp-omshell-ipv4 is not set ++# CONFIG_PACKAGE_isc-dhcp-omshell-ipv6 is not set ++# CONFIG_PACKAGE_isc-dhcp-relay-ipv4 is not set ++# CONFIG_PACKAGE_isc-dhcp-relay-ipv6 is not set ++# CONFIG_PACKAGE_isc-dhcp-server-ipv4 is not set ++# CONFIG_PACKAGE_isc-dhcp-server-ipv6 is not set ++# CONFIG_PACKAGE_maradns is not set ++# CONFIG_PACKAGE_mdns-utils is not set ++# CONFIG_PACKAGE_mdnsd is not set ++# CONFIG_PACKAGE_mdnsresponder is not set ++# CONFIG_PACKAGE_ndyndns is not set ++# CONFIG_PACKAGE_rarpd is not set ++# CONFIG_PACKAGE_unbound is not set ++# CONFIG_PACKAGE_unbound-anchor is not set ++# CONFIG_PACKAGE_unbound-control is not set ++# CONFIG_PACKAGE_unbound-control-setup is not set ++# CONFIG_PACKAGE_unbound-host is not set ++# CONFIG_PACKAGE_updatedd is not set ++# CONFIG_PACKAGE_yaddns is not set ++ ++# ++# Instant Messaging ++# ++# CONFIG_PACKAGE_bahamut is not set ++# CONFIG_PACKAGE_bitchx is not set ++# CONFIG_PACKAGE_bitlbee is not set ++# CONFIG_PACKAGE_dircproxy is not set ++# CONFIG_PACKAGE_ekg is not set ++# CONFIG_PACKAGE_imsnif is not set ++# CONFIG_PACKAGE_imspector is not set ++# CONFIG_PACKAGE_irssi is not set ++# CONFIG_PACKAGE_irssi-glib1 is not set ++# CONFIG_PACKAGE_irssi-nossl is not set ++# CONFIG_PACKAGE_miau is not set ++# CONFIG_PACKAGE_ngircd is not set ++# CONFIG_PACKAGE_ngircd-nossl is not set ++# CONFIG_PACKAGE_prosody is not set ++# CONFIG_PACKAGE_psybnc is not set ++# CONFIG_PACKAGE_reaim is not set ++# CONFIG_PACKAGE_tmsnc is not set ++# CONFIG_PACKAGE_umurmur-openssl is not set ++# CONFIG_PACKAGE_umurmur-polarssl is not set ++# CONFIG_PACKAGE_weechat is not set ++# CONFIG_PACKAGE_znc is not set ++ ++# ++# Linux ATM tools ++# ++ ++# ++# NMAP Suite ++# ++# CONFIG_PACKAGE_ncat is not set ++# CONFIG_PACKAGE_ncat-ssl is not set ++# CONFIG_PACKAGE_ndiff is not set ++# CONFIG_PACKAGE_nmap is not set ++# CONFIG_PACKAGE_nmap-ssl is not set ++# CONFIG_PACKAGE_nping is not set ++ ++# ++# NNTP ++# ++# CONFIG_PACKAGE_leafnode is not set ++# CONFIG_PACKAGE_nzbget is not set ++# CONFIG_PACKAGE_nzbgetweb is not set ++ ++# ++# NTRIP ++# ++# CONFIG_PACKAGE_ntripcaster is not set ++# CONFIG_PACKAGE_ntripclient is not set ++# CONFIG_PACKAGE_ntripserver is not set ++ ++# ++# P2P ++# ++# CONFIG_PACKAGE_amule is not set ++# CONFIG_PACKAGE_mutella is not set ++# CONFIG_PACKAGE_opendchub is not set ++# CONFIG_PACKAGE_peerguardian is not set ++# CONFIG_PACKAGE_uhub is not set ++ ++# ++# Printing ++# ++# CONFIG_PACKAGE_cups is not set ++# CONFIG_PACKAGE_cups-bsd is not set ++# CONFIG_PACKAGE_cups-client is not set ++# CONFIG_PACKAGE_cups-filters is not set ++# CONFIG_PACKAGE_cups-locale-da is not set ++# CONFIG_PACKAGE_cups-locale-de is not set ++# CONFIG_PACKAGE_cups-locale-es is not set ++# CONFIG_PACKAGE_cups-locale-eu is not set ++# CONFIG_PACKAGE_cups-locale-fi is not set ++# CONFIG_PACKAGE_cups-locale-fr is not set ++# CONFIG_PACKAGE_cups-locale-hu is not set ++# CONFIG_PACKAGE_cups-locale-id is not set ++# CONFIG_PACKAGE_cups-locale-it is not set ++# CONFIG_PACKAGE_cups-locale-ja is not set ++# CONFIG_PACKAGE_cups-locale-ko is not set ++# CONFIG_PACKAGE_cups-locale-nl is not set ++# CONFIG_PACKAGE_cups-locale-no is not set ++# CONFIG_PACKAGE_cups-locale-pl is not set ++# CONFIG_PACKAGE_cups-locale-pt is not set ++# CONFIG_PACKAGE_cups-locale-pt_BR is not set ++# CONFIG_PACKAGE_cups-locale-ru is not set ++# CONFIG_PACKAGE_cups-locale-sv is not set ++# CONFIG_PACKAGE_cups-locale-zh is not set ++# CONFIG_PACKAGE_cups-locale-zh_TW is not set ++# CONFIG_PACKAGE_cups-ppdc is not set ++# CONFIG_PACKAGE_p910nd is not set ++ ++# ++# Routing and Redirection ++# ++# CONFIG_PACKAGE_babeld is not set ++# CONFIG_PACKAGE_batmand is not set ++# CONFIG_PACKAGE_bird4 is not set ++# CONFIG_PACKAGE_birdc4 is not set ++# CONFIG_PACKAGE_bmx6 is not set ++# CONFIG_PACKAGE_bmxd is not set ++# CONFIG_PACKAGE_igmpproxy is not set ++CONFIG_PACKAGE_ip=y ++# CONFIG_PACKAGE_lldpd is not set ++# CONFIG_PACKAGE_net-tools-route is not set ++# CONFIG_PACKAGE_olsrd is not set ++# CONFIG_PACKAGE_parprouted is not set ++CONFIG_PACKAGE_quagga=y ++# CONFIG_PACKAGE_quagga-babeld is not set ++CONFIG_PACKAGE_quagga-bgpd=y ++# CONFIG_PACKAGE_quagga-isisd is not set ++# CONFIG_PACKAGE_quagga-libospf is not set ++CONFIG_PACKAGE_quagga-libzebra=y ++# CONFIG_PACKAGE_quagga-ospf6d is not set ++# CONFIG_PACKAGE_quagga-ospfd is not set ++# CONFIG_PACKAGE_quagga-ripd is not set ++# CONFIG_PACKAGE_quagga-ripngd is not set ++CONFIG_PACKAGE_quagga-vtysh=y ++CONFIG_PACKAGE_quagga-watchquagga=y ++CONFIG_PACKAGE_quagga-zebra=y ++# CONFIG_PACKAGE_redir is not set ++# CONFIG_PACKAGE_relayd is not set ++# CONFIG_PACKAGE_rinetd is not set ++# CONFIG_PACKAGE_smcroute is not set ++# CONFIG_PACKAGE_sslh is not set ++# CONFIG_PACKAGE_udp-broadcast-relay is not set ++# CONFIG_PACKAGE_vis is not set ++# CONFIG_PACKAGE_vrrpd is not set ++# CONFIG_PACKAGE_wing is not set ++ ++# ++# SSH ++# ++# CONFIG_PACKAGE_autossh is not set ++# CONFIG_PACKAGE_corkscrew is not set ++# CONFIG_PACKAGE_gesftpserver is not set ++CONFIG_PACKAGE_openssh-client=y ++CONFIG_PACKAGE_openssh-client-utils=m ++CONFIG_PACKAGE_openssh-keygen=y ++CONFIG_PACKAGE_openssh-moduli=y ++CONFIG_PACKAGE_openssh-server=y ++# CONFIG_PACKAGE_openssh-sftp-client is not set ++# CONFIG_PACKAGE_openssh-sftp-server is not set ++# CONFIG_PACKAGE_rssh is not set ++# CONFIG_PACKAGE_sshtunnel is not set ++ ++# ++# Telephony ++# ++# CONFIG_PACKAGE_asterisk11 is not set ++CONFIG_PACKAGE_asterisk18=m ++CONFIG_PACKAGE_asterisk18-app-alarmreceiver=m ++CONFIG_PACKAGE_asterisk18-app-authenticate=m ++CONFIG_PACKAGE_asterisk18-app-chanisavail=m ++CONFIG_PACKAGE_asterisk18-app-chanspy=m ++CONFIG_PACKAGE_asterisk18-app-directed-pickup=m ++CONFIG_PACKAGE_asterisk18-app-disa=m ++CONFIG_PACKAGE_asterisk18-app-exec=m ++CONFIG_PACKAGE_asterisk18-app-minivm=m ++CONFIG_PACKAGE_asterisk18-app-mixmonitor=m ++CONFIG_PACKAGE_asterisk18-app-originate=m ++CONFIG_PACKAGE_asterisk18-app-playtones=m ++CONFIG_PACKAGE_asterisk18-app-read=m ++CONFIG_PACKAGE_asterisk18-app-readexten=m ++CONFIG_PACKAGE_asterisk18-app-record=m ++CONFIG_PACKAGE_asterisk18-app-sayunixtime=m ++CONFIG_PACKAGE_asterisk18-app-senddtmf=m ++CONFIG_PACKAGE_asterisk18-app-setcallerid=m ++CONFIG_PACKAGE_asterisk18-app-sms=m ++CONFIG_PACKAGE_asterisk18-app-stack=m ++CONFIG_PACKAGE_asterisk18-app-system=m ++CONFIG_PACKAGE_asterisk18-app-talkdetect=m ++CONFIG_PACKAGE_asterisk18-app-verbose=m ++CONFIG_PACKAGE_asterisk18-app-waituntil=m ++CONFIG_PACKAGE_asterisk18-app-while=m ++CONFIG_PACKAGE_asterisk18-chan-agent=m ++CONFIG_PACKAGE_asterisk18-chan-gtalk=m ++CONFIG_PACKAGE_asterisk18-chan-iax2=m ++CONFIG_PACKAGE_asterisk18-chan-local=m ++CONFIG_PACKAGE_asterisk18-chan-mgcp=m ++CONFIG_PACKAGE_asterisk18-chan-mobile=m ++# CONFIG_PACKAGE_asterisk18-chan-sccp-b is not set ++CONFIG_PACKAGE_asterisk18-chan-skinny=m ++CONFIG_PACKAGE_asterisk18-codec-a-mu=m ++CONFIG_PACKAGE_asterisk18-codec-alaw=m ++CONFIG_PACKAGE_asterisk18-codec-g722=m ++CONFIG_PACKAGE_asterisk18-codec-g726=m ++CONFIG_PACKAGE_asterisk18-curl=m ++CONFIG_PACKAGE_asterisk18-format-g726=m ++CONFIG_PACKAGE_asterisk18-format-g729=m ++CONFIG_PACKAGE_asterisk18-format-sln=m ++CONFIG_PACKAGE_asterisk18-format-sln16=m ++CONFIG_PACKAGE_asterisk18-func-blacklist=m ++CONFIG_PACKAGE_asterisk18-func-channel=m ++CONFIG_PACKAGE_asterisk18-func-cut=m ++CONFIG_PACKAGE_asterisk18-func-db=m ++CONFIG_PACKAGE_asterisk18-func-devstate=m ++CONFIG_PACKAGE_asterisk18-func-extstate=m ++CONFIG_PACKAGE_asterisk18-func-global=m ++CONFIG_PACKAGE_asterisk18-func-shell=m ++CONFIG_PACKAGE_asterisk18-func-uri=m ++CONFIG_PACKAGE_asterisk18-func-vmcount=m ++# CONFIG_PACKAGE_asterisk18-mysql is not set ++# CONFIG_PACKAGE_asterisk18-odbc is not set ++CONFIG_PACKAGE_asterisk18-pbx-ael=m ++CONFIG_PACKAGE_asterisk18-pbx-spool=m ++CONFIG_PACKAGE_asterisk18-res-ael-share=m ++CONFIG_PACKAGE_asterisk18-res-agi=m ++CONFIG_PACKAGE_asterisk18-res-clioriginate=m ++CONFIG_PACKAGE_asterisk18-res-crypto=m ++CONFIG_PACKAGE_asterisk18-res-fax=m ++CONFIG_PACKAGE_asterisk18-res-fax-spandsp=m ++CONFIG_PACKAGE_asterisk18-res-musiconhold=m ++CONFIG_PACKAGE_asterisk18-res-timing-pthread=m ++CONFIG_PACKAGE_asterisk18-res-timing-timerfd=m ++CONFIG_PACKAGE_asterisk18-sounds=m ++CONFIG_PACKAGE_asterisk18-voicemail=m ++# CONFIG_PACKAGE_baresip is not set ++# CONFIG_PACKAGE_freeswitch is not set ++# CONFIG_PACKAGE_kamailio is not set ++# CONFIG_PACKAGE_kamailio3 is not set ++# CONFIG_PACKAGE_miax is not set ++# CONFIG_PACKAGE_openser is not set ++# CONFIG_PACKAGE_opensips is not set ++# CONFIG_PACKAGE_pcapsipdump is not set ++# CONFIG_PACKAGE_restund is not set ++# CONFIG_PACKAGE_rtpproxy is not set ++# CONFIG_PACKAGE_sipp is not set ++# CONFIG_PACKAGE_siproxd is not set ++# CONFIG_PACKAGE_sipsak is not set ++# CONFIG_PACKAGE_smap is not set ++# CONFIG_PACKAGE_yate is not set ++ ++# ++# Time Synchronization ++# ++# CONFIG_PACKAGE_chrony is not set ++# CONFIG_PACKAGE_htpdate is not set ++# CONFIG_PACKAGE_ntp-keygen is not set ++# CONFIG_PACKAGE_ntp-keygen-ssl is not set ++# CONFIG_PACKAGE_ntp-utils is not set ++# CONFIG_PACKAGE_ntpclient is not set ++# CONFIG_PACKAGE_ntpd is not set ++# CONFIG_PACKAGE_ntpd-ssl is not set ++# CONFIG_PACKAGE_ntpdate is not set ++# CONFIG_PACKAGE_openntpd is not set ++# CONFIG_PACKAGE_ptpd is not set ++ ++# ++# VPN ++# ++# CONFIG_PACKAGE_chaosvpn is not set ++# CONFIG_PACKAGE_etherpuppet is not set ++# CONFIG_PACKAGE_frickin is not set ++# CONFIG_PACKAGE_ipsec-tools is not set ++# CONFIG_PACKAGE_isakmpd is not set ++# CONFIG_PACKAGE_l2tpd is not set ++# CONFIG_PACKAGE_l2tpns is not set ++# CONFIG_PACKAGE_matrixtunnel is not set ++# CONFIG_PACKAGE_n2n is not set ++# CONFIG_PACKAGE_openconnect is not set ++# CONFIG_PACKAGE_openl2tp-full is not set ++# CONFIG_PACKAGE_openl2tp-mini is not set ++# CONFIG_PACKAGE_opennhrp is not set ++# CONFIG_PACKAGE_openswan is not set ++# CONFIG_PACKAGE_openvpn-easy-rsa is not set ++# CONFIG_PACKAGE_openvpn-nossl is not set ++CONFIG_PACKAGE_openvpn-openssl=y ++CONFIG_OPENVPN_openssl_ENABLE_LZO=y ++CONFIG_OPENVPN_openssl_ENABLE_X509_ALT_USERNAME=y ++CONFIG_OPENVPN_openssl_ENABLE_SERVER=y ++# CONFIG_OPENVPN_openssl_ENABLE_MANAGEMENT is not set ++CONFIG_OPENVPN_openssl_ENABLE_HTTP=y ++CONFIG_OPENVPN_openssl_ENABLE_SOCKS=y ++CONFIG_OPENVPN_openssl_ENABLE_FRAGMENT=y ++CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME=y ++CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE=y ++CONFIG_OPENVPN_openssl_ENABLE_DEF_AUTH=y ++CONFIG_OPENVPN_openssl_ENABLE_PF=y ++CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y ++# CONFIG_PACKAGE_openvpn-polarssl is not set ++# CONFIG_PACKAGE_pptpd is not set ++# CONFIG_PACKAGE_quicktun is not set ++# CONFIG_PACKAGE_ssltunnel is not set ++# CONFIG_PACKAGE_strongswan is not set ++# CONFIG_PACKAGE_strongswan-charon is not set ++# CONFIG_PACKAGE_strongswan-default is not set ++# CONFIG_PACKAGE_strongswan-libfast is not set ++# CONFIG_PACKAGE_strongswan-minimal is not set ++# CONFIG_PACKAGE_strongswan-mod-addrblock is not set ++# CONFIG_PACKAGE_strongswan-mod-aes is not set ++# CONFIG_PACKAGE_strongswan-mod-af-alg is not set ++# CONFIG_PACKAGE_strongswan-mod-agent is not set ++# CONFIG_PACKAGE_strongswan-mod-attr is not set ++# CONFIG_PACKAGE_strongswan-mod-attr-sql is not set ++# CONFIG_PACKAGE_strongswan-mod-blowfish is not set ++# CONFIG_PACKAGE_strongswan-mod-ccm is not set ++# CONFIG_PACKAGE_strongswan-mod-cmac is not set ++# CONFIG_PACKAGE_strongswan-mod-constraints is not set ++# CONFIG_PACKAGE_strongswan-mod-coupling is not set ++# CONFIG_PACKAGE_strongswan-mod-ctr is not set ++# CONFIG_PACKAGE_strongswan-mod-curl is not set ++# CONFIG_PACKAGE_strongswan-mod-des is not set ++# CONFIG_PACKAGE_strongswan-mod-dhcp is not set ++# CONFIG_PACKAGE_strongswan-mod-dnskey is not set ++# CONFIG_PACKAGE_strongswan-mod-duplicheck is not set ++# CONFIG_PACKAGE_strongswan-mod-eap-identity is not set ++# CONFIG_PACKAGE_strongswan-mod-eap-md5 is not set ++# CONFIG_PACKAGE_strongswan-mod-eap-mschapv2 is not set ++# CONFIG_PACKAGE_strongswan-mod-farp is not set ++# CONFIG_PACKAGE_strongswan-mod-fips-prf is not set ++# CONFIG_PACKAGE_strongswan-mod-gcm is not set ++# CONFIG_PACKAGE_strongswan-mod-gcrypt is not set ++# CONFIG_PACKAGE_strongswan-mod-gmp is not set ++# CONFIG_PACKAGE_strongswan-mod-ha is not set ++# CONFIG_PACKAGE_strongswan-mod-hmac is not set ++# CONFIG_PACKAGE_strongswan-mod-kernel-klips is not set ++# CONFIG_PACKAGE_strongswan-mod-kernel-netlink is not set ++# CONFIG_PACKAGE_strongswan-mod-kernel-pfkey is not set ++# CONFIG_PACKAGE_strongswan-mod-ldap is not set ++# CONFIG_PACKAGE_strongswan-mod-led is not set ++# CONFIG_PACKAGE_strongswan-mod-load-tester is not set ++# CONFIG_PACKAGE_strongswan-mod-md4 is not set ++# CONFIG_PACKAGE_strongswan-mod-md5 is not set ++# CONFIG_PACKAGE_strongswan-mod-mysql is not set ++# CONFIG_PACKAGE_strongswan-mod-nonce is not set ++# CONFIG_PACKAGE_strongswan-mod-openssl is not set ++# CONFIG_PACKAGE_strongswan-mod-pem is not set ++# CONFIG_PACKAGE_strongswan-mod-pgp is not set ++# CONFIG_PACKAGE_strongswan-mod-pkcs1 is not set ++# CONFIG_PACKAGE_strongswan-mod-pkcs11 is not set ++# CONFIG_PACKAGE_strongswan-mod-pkcs8 is not set ++# CONFIG_PACKAGE_strongswan-mod-pubkey is not set ++# CONFIG_PACKAGE_strongswan-mod-random is not set ++# CONFIG_PACKAGE_strongswan-mod-resolve is not set ++# CONFIG_PACKAGE_strongswan-mod-revocation is not set ++# CONFIG_PACKAGE_strongswan-mod-sha1 is not set ++# CONFIG_PACKAGE_strongswan-mod-sha2 is not set ++# CONFIG_PACKAGE_strongswan-mod-smp is not set ++# CONFIG_PACKAGE_strongswan-mod-socket-default is not set ++# CONFIG_PACKAGE_strongswan-mod-socket-dynamic is not set ++# CONFIG_PACKAGE_strongswan-mod-sql is not set ++# CONFIG_PACKAGE_strongswan-mod-sqlite is not set ++# CONFIG_PACKAGE_strongswan-mod-stroke is not set ++# CONFIG_PACKAGE_strongswan-mod-test-vectors is not set ++# CONFIG_PACKAGE_strongswan-mod-uci is not set ++# CONFIG_PACKAGE_strongswan-mod-unity is not set ++# CONFIG_PACKAGE_strongswan-mod-updown is not set ++# CONFIG_PACKAGE_strongswan-mod-whitelist is not set ++# CONFIG_PACKAGE_strongswan-mod-x509 is not set ++# CONFIG_PACKAGE_strongswan-mod-xauth-eap is not set ++# CONFIG_PACKAGE_strongswan-mod-xauth-generic is not set ++# CONFIG_PACKAGE_strongswan-mod-xcbc is not set ++# CONFIG_PACKAGE_strongswan-utils is not set ++# CONFIG_PACKAGE_tinc is not set ++# CONFIG_PACKAGE_uanytun is not set ++# CONFIG_PACKAGE_uanytun-nocrypt is not set ++# CONFIG_PACKAGE_uanytun-sslcrypt is not set ++# CONFIG_PACKAGE_vpnc is not set ++# CONFIG_PACKAGE_vpnc-scripts is not set ++# CONFIG_PACKAGE_vpzone is not set ++# CONFIG_PACKAGE_vtun is not set ++# CONFIG_PACKAGE_xl2tpd is not set ++ ++# ++# Version Control Systems ++# ++# CONFIG_PACKAGE_git is not set ++# CONFIG_PACKAGE_mercurial is not set ++# CONFIG_PACKAGE_subversion-libs is not set ++ ++# ++# Web Servers/Proxies ++# ++# CONFIG_PACKAGE_apache is not set ++# CONFIG_PACKAGE_appweb is not set ++# CONFIG_PACKAGE_axhttpd is not set ++# CONFIG_PACKAGE_axtlswrap is not set ++# CONFIG_PACKAGE_crowdcontrol is not set ++# CONFIG_PACKAGE_dansguardian is not set ++# CONFIG_PACKAGE_gatling is not set ++# CONFIG_PACKAGE_haproxy is not set ++# CONFIG_PACKAGE_hiawatha is not set ++# CONFIG_PACKAGE_lighttpd is not set ++# CONFIG_PACKAGE_mini-httpd is not set ++# CONFIG_PACKAGE_mini-httpd-htpasswd is not set ++# CONFIG_PACKAGE_mini-httpd-matrixssl is not set ++# CONFIG_PACKAGE_mini-httpd-openssl is not set ++# CONFIG_PACKAGE_nginx is not set ++# CONFIG_PACKAGE_obfsproxy is not set ++# CONFIG_PACKAGE_pdnsd is not set ++# CONFIG_PACKAGE_pepsal is not set ++# CONFIG_PACKAGE_polipo is not set ++# CONFIG_PACKAGE_privoxy is not set ++# CONFIG_PACKAGE_redsocks is not set ++# CONFIG_PACKAGE_seeks is not set ++# CONFIG_PACKAGE_sockd is not set ++# CONFIG_PACKAGE_socksify is not set ++# CONFIG_PACKAGE_spawn-fcgi is not set ++# CONFIG_PACKAGE_squid is not set ++# CONFIG_PACKAGE_srelay is not set ++# CONFIG_PACKAGE_tinyproxy is not set ++# CONFIG_PACKAGE_transocks is not set ++# CONFIG_PACKAGE_tsocks is not set ++CONFIG_PACKAGE_uhttpd=y ++# CONFIG_PACKAGE_uhttpd_debug is not set ++CONFIG_PACKAGE_uhttpd-mod-lua=y ++CONFIG_PACKAGE_uhttpd-mod-tls=y ++# CONFIG_PACKAGE_uhttpd-mod-tls_cyassl is not set ++CONFIG_PACKAGE_uhttpd-mod-tls_openssl=y ++CONFIG_PACKAGE_uhttpd-mod-ubus=y ++# CONFIG_PACKAGE_wccpd is not set ++ ++# ++# dial-in/up ++# ++# CONFIG_PACKAGE_rp-l2tpd is not set ++# CONFIG_PACKAGE_rp-pppoe-relay is not set ++# CONFIG_PACKAGE_rp-pppoe-server is not set ++# CONFIG_PACKAGE_rp-pppoe-sniff is not set ++ ++# ++# firmware ++# ++# CONFIG_PACKAGE_speedtouch-usb-firmware is not set ++ ++# ++# wireless ++# ++# CONFIG_PACKAGE_aircrack-ng is not set ++# CONFIG_PACKAGE_aircrack-ptw is not set ++# CONFIG_PACKAGE_airpwn is not set ++# CONFIG_PACKAGE_horst is not set ++# CONFIG_PACKAGE_karma is not set ++# CONFIG_PACKAGE_kismet-client is not set ++# CONFIG_PACKAGE_kismet-drone is not set ++# CONFIG_PACKAGE_kismet-server is not set ++# CONFIG_PACKAGE_mdk3 is not set ++# CONFIG_PACKAGE_reaver is not set ++# CONFIG_PACKAGE_snort-wireless is not set ++# CONFIG_PACKAGE_snort-wireless-mysql is not set ++# CONFIG_PACKAGE_snort-wireless-pgsql is not set ++# CONFIG_PACKAGE_wavemon is not set ++# CONFIG_PACKAGE_xsupplicant is not set ++# CONFIG_PACKAGE_aoetools is not set ++# CONFIG_PACKAGE_apf is not set ++# CONFIG_PACKAGE_aprx is not set ++# CONFIG_PACKAGE_arpd is not set ++# CONFIG_PACKAGE_arpwatch is not set ++# CONFIG_PACKAGE_bing is not set ++# CONFIG_PACKAGE_bmon is not set ++# CONFIG_PACKAGE_bwm is not set ++# CONFIG_PACKAGE_bwping is not set ++# CONFIG_PACKAGE_cdp-tools is not set ++CONFIG_PACKAGE_chat=y ++# CONFIG_PACKAGE_cifsmount is not set ++# CONFIG_PACKAGE_crda is not set ++# CONFIG_PACKAGE_daemonlogger is not set ++# CONFIG_PACKAGE_darkstat is not set ++# CONFIG_PACKAGE_ditg is not set ++# CONFIG_PACKAGE_dmapd is not set ++# CONFIG_PACKAGE_dns2tcp is not set ++# CONFIG_PACKAGE_dns2tcpd is not set ++# CONFIG_PACKAGE_dsl-qos-queue is not set ++# CONFIG_PACKAGE_e169-stats is not set ++# CONFIG_PACKAGE_elinks is not set ++# CONFIG_PACKAGE_etherwake is not set ++# CONFIG_PACKAGE_ethtool is not set ++# CONFIG_PACKAGE_ettercap is not set ++# CONFIG_PACKAGE_faifa is not set ++# CONFIG_PACKAGE_fakeidentd is not set ++CONFIG_PACKAGE_firewall3=y ++# CONFIG_PACKAGE_flow-tools is not set ++# CONFIG_PACKAGE_fping is not set ++# CONFIG_PACKAGE_fprobe is not set ++# CONFIG_PACKAGE_fprobe-ulog is not set ++# CONFIG_PACKAGE_freeradius2 is not set ++# CONFIG_PACKAGE_genl is not set ++# CONFIG_PACKAGE_gpsd is not set ++# CONFIG_PACKAGE_gpsd-clients is not set ++# CONFIG_PACKAGE_hostapd is not set ++# CONFIG_PACKAGE_hostapd-mini is not set ++# CONFIG_PACKAGE_hostapd-utils is not set ++# CONFIG_PACKAGE_hpavcfg is not set ++# CONFIG_PACKAGE_hping3 is not set ++# CONFIG_PACKAGE_httping is not set ++# CONFIG_PACKAGE_httping-nossl is not set ++# CONFIG_PACKAGE_ifenslave is not set ++# CONFIG_PACKAGE_ifstat is not set ++# CONFIG_PACKAGE_iftop is not set ++# CONFIG_PACKAGE_ipcad is not set ++# CONFIG_PACKAGE_iperf is not set ++# CONFIG_PACKAGE_iperf-mt is not set ++# CONFIG_PACKAGE_ipset is not set ++# CONFIG_PACKAGE_iptraf is not set ++# CONFIG_PACKAGE_iputils-arping is not set ++# CONFIG_PACKAGE_iputils-clockdiff is not set ++# CONFIG_PACKAGE_iputils-ping is not set ++# CONFIG_PACKAGE_iputils-ping6 is not set ++# CONFIG_PACKAGE_iputils-tftpd is not set ++# CONFIG_PACKAGE_iputils-tracepath is not set ++# CONFIG_PACKAGE_iputils-tracepath6 is not set ++# CONFIG_PACKAGE_iputils-traceroute6 is not set ++CONFIG_PACKAGE_iw=y ++# CONFIG_PACKAGE_jtg is not set ++# CONFIG_PACKAGE_keepalived is not set ++# CONFIG_PACKAGE_keynote is not set ++# CONFIG_PACKAGE_krb5-client is not set ++# CONFIG_PACKAGE_krb5-libs is not set ++# CONFIG_PACKAGE_krb5-server is not set ++# CONFIG_PACKAGE_l2tpv3tun is not set ++# CONFIG_PACKAGE_lft is not set ++# CONFIG_PACKAGE_lispd is not set ++# CONFIG_PACKAGE_lsm is not set ++# CONFIG_PACKAGE_m-route is not set ++# CONFIG_PACKAGE_mac-to-devinfo is not set ++# CONFIG_PACKAGE_madwimax is not set ++# CONFIG_PACKAGE_memcached is not set ++# CONFIG_PACKAGE_mgen is not set ++# CONFIG_PACKAGE_mii-tool is not set ++# CONFIG_PACKAGE_mini-snmpd is not set ++# CONFIG_PACKAGE_mosquitto is not set ++# CONFIG_PACKAGE_mosquitto-client is not set ++# CONFIG_PACKAGE_mosquitto-client-nossl is not set ++# CONFIG_PACKAGE_mosquitto-nossl is not set ++# CONFIG_PACKAGE_mrtg is not set ++# CONFIG_PACKAGE_mtr is not set ++CONFIG_PACKAGE_multiwan=y ++# CONFIG_PACKAGE_mvprelay is not set ++# CONFIG_PACKAGE_nbd is not set ++# CONFIG_PACKAGE_nbtscan is not set ++# CONFIG_PACKAGE_net-tools-arp is not set ++# CONFIG_PACKAGE_net-tools-hostname is not set ++# CONFIG_PACKAGE_net-tools-ifconfig is not set ++# CONFIG_PACKAGE_net-tools-ipmaddr is not set ++# CONFIG_PACKAGE_net-tools-iptunnel is not set ++# CONFIG_PACKAGE_net-tools-mii-tool is not set ++# CONFIG_PACKAGE_net-tools-nameif is not set ++# CONFIG_PACKAGE_net-tools-netstat is not set ++# CONFIG_PACKAGE_net-tools-plipconfig is not set ++# CONFIG_PACKAGE_net-tools-rarp is not set ++# CONFIG_PACKAGE_net-tools-slattach is not set ++# CONFIG_PACKAGE_netcat is not set ++# CONFIG_PACKAGE_netdiscover is not set ++# CONFIG_PACKAGE_netio is not set ++# CONFIG_PACKAGE_netperf is not set ++# CONFIG_PACKAGE_netpipe is not set ++# CONFIG_PACKAGE_netstat-nat is not set ++# CONFIG_PACKAGE_ngrep is not set ++# CONFIG_PACKAGE_noping is not set ++# CONFIG_PACKAGE_nuttcp is not set ++# CONFIG_PACKAGE_nuttcp-xinetd is not set ++# CONFIG_PACKAGE_oidentd is not set ++# CONFIG_PACKAGE_openldap-server is not set ++# CONFIG_PACKAGE_openrrcp is not set ++# CONFIG_PACKAGE_openslp is not set ++# CONFIG_PACKAGE_oping is not set ++# CONFIG_PACKAGE_paris-traceroute is not set ++# CONFIG_PACKAGE_peervpn is not set ++# CONFIG_PACKAGE_pen is not set ++# CONFIG_PACKAGE_portmap is not set ++CONFIG_PACKAGE_ppp=y ++# CONFIG_PACKAGE_ppp-mod-pppoa is not set ++CONFIG_PACKAGE_ppp-mod-pppoe=y ++# CONFIG_PACKAGE_ppp-mod-pppol2tp is not set ++# CONFIG_PACKAGE_ppp-mod-pptp is not set ++# CONFIG_PACKAGE_ppp-mod-radius is not set ++# CONFIG_PACKAGE_ppp-multilink is not set ++# CONFIG_PACKAGE_pppdump is not set ++# CONFIG_PACKAGE_pppstats is not set ++# CONFIG_PACKAGE_pyload is not set ++# CONFIG_PACKAGE_pyrit is not set ++# CONFIG_PACKAGE_qolyester is not set ++# CONFIG_PACKAGE_raddump is not set ++# CONFIG_PACKAGE_radiusclient-ng is not set ++# CONFIG_PACKAGE_radsecproxy is not set ++# CONFIG_PACKAGE_rrs is not set ++# CONFIG_PACKAGE_rrs-nossl is not set ++# CONFIG_PACKAGE_rssileds is not set ++# CONFIG_PACKAGE_samba36-client is not set ++# CONFIG_PACKAGE_samba36-server is not set ++# CONFIG_PACKAGE_scdp is not set ++# CONFIG_PACKAGE_sctp is not set ++# CONFIG_PACKAGE_ser2net is not set ++# CONFIG_PACKAGE_serialoverip is not set ++# CONFIG_PACKAGE_shat is not set ++# CONFIG_PACKAGE_slurm is not set ++# CONFIG_PACKAGE_smtptrapd is not set ++# CONFIG_PACKAGE_snmp-utils is not set ++# CONFIG_PACKAGE_snmpd is not set ++# CONFIG_PACKAGE_snmpd-static is not set ++# CONFIG_PACKAGE_socat is not set ++# CONFIG_PACKAGE_softflowd is not set ++# CONFIG_PACKAGE_soloscli is not set ++# CONFIG_PACKAGE_ss is not set ++# CONFIG_PACKAGE_sscep is not set ++# CONFIG_PACKAGE_sslcat is not set ++# CONFIG_PACKAGE_sslsniff is not set ++# CONFIG_PACKAGE_sslstrip is not set ++# CONFIG_PACKAGE_stun-client is not set ++# CONFIG_PACKAGE_stund is not set ++# CONFIG_PACKAGE_stunnel is not set ++# CONFIG_PACKAGE_synce-dccm is not set ++# CONFIG_PACKAGE_tc is not set ++CONFIG_PACKAGE_tcpdump=y ++# CONFIG_PACKAGE_tcpdump-mini is not set ++# CONFIG_PACKAGE_tcptraceroute is not set ++# CONFIG_PACKAGE_tctool is not set ++# CONFIG_PACKAGE_tor is not set ++# CONFIG_PACKAGE_tor-alpha is not set ++# CONFIG_PACKAGE_tor-alpha-fw-helper is not set ++# CONFIG_PACKAGE_tor-alpha-geoip is not set ++# CONFIG_PACKAGE_tor-fw-helper is not set ++# CONFIG_PACKAGE_tor-geoip is not set ++# CONFIG_PACKAGE_ttcp is not set ++# CONFIG_PACKAGE_ucarp is not set ++# CONFIG_PACKAGE_ucspi-tcp is not set ++# CONFIG_PACKAGE_udpcast is not set ++# CONFIG_PACKAGE_udpxy is not set ++# CONFIG_PACKAGE_ulogd is not set ++# CONFIG_PACKAGE_uob-nomad is not set ++# CONFIG_PACKAGE_usbip is not set ++# CONFIG_PACKAGE_vblade is not set ++# CONFIG_PACKAGE_veth is not set ++# CONFIG_PACKAGE_vgp is not set ++# CONFIG_PACKAGE_vnc-reflector is not set ++# CONFIG_PACKAGE_vncrepeater is not set ++# CONFIG_PACKAGE_vnstat is not set ++# CONFIG_PACKAGE_vsc7385-ucode-ap83 is not set ++# CONFIG_PACKAGE_vsc7385-ucode-pb44 is not set ++# CONFIG_PACKAGE_vsc7395-ucode-ap83 is not set ++# CONFIG_PACKAGE_vsc7395-ucode-pb44 is not set ++# CONFIG_PACKAGE_wdiag is not set ++# CONFIG_PACKAGE_whob is not set ++# CONFIG_PACKAGE_wiviz is not set ++# CONFIG_PACKAGE_wol is not set ++# CONFIG_PACKAGE_wpa-cli is not set ++# CONFIG_PACKAGE_wpa-supplicant is not set ++# CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK is not set ++# CONFIG_WPA_RFKILL_SUPPORT is not set ++CONFIG_WPA_MSG_MIN_PRIORITY=3 ++# CONFIG_DRIVER_WEXT_SUPPORT is not set ++CONFIG_DRIVER_11N_SUPPORT=y ++# CONFIG_PACKAGE_wpa-supplicant-mini is not set ++# CONFIG_PACKAGE_wpad is not set ++CONFIG_PACKAGE_wpad-mini=y ++# CONFIG_PACKAGE_wprobe-export is not set ++# CONFIG_PACKAGE_wprobe-util is not set ++# CONFIG_PACKAGE_wshaper is not set ++# CONFIG_PACKAGE_xinetd is not set ++ ++# ++# Libraries ++# ++ ++# ++# Filesystem ++# ++CONFIG_PACKAGE_libcom_err=y ++CONFIG_PACKAGE_libext2fs=y ++# CONFIG_PACKAGE_libfuse is not set ++# CONFIG_PACKAGE_libnfsidmap is not set ++# CONFIG_PACKAGE_libow is not set ++# CONFIG_PACKAGE_libow-capi is not set ++# CONFIG_PACKAGE_libsysfs is not set ++ ++# ++# Firewall ++# ++# CONFIG_PACKAGE_libfko is not set ++CONFIG_PACKAGE_libip4tc=y ++CONFIG_PACKAGE_libip6tc=y ++# CONFIG_PACKAGE_libiptc is not set ++CONFIG_PACKAGE_libxtables=y ++ ++# ++# Printing ++# ++# CONFIG_PACKAGE_libcups is not set ++# CONFIG_PACKAGE_libcupscgi is not set ++# CONFIG_PACKAGE_libcupsdriver is not set ++# CONFIG_PACKAGE_libcupsimage is not set ++# CONFIG_PACKAGE_libcupsmime is not set ++# CONFIG_PACKAGE_libcupsppdc is not set ++ ++# ++# SSL ++# ++# CONFIG_PACKAGE_libaxtls is not set ++CONFIG_PACKAGE_libcyassl=y ++CONFIG_PACKAGE_libgnutls=m ++# CONFIG_PACKAGE_libgnutls-extra is not set ++# CONFIG_PACKAGE_libgnutls-openssl is not set ++# CONFIG_PACKAGE_libmatrixssl is not set ++CONFIG_PACKAGE_libopenssl=y ++ ++# ++# Configuration ++# ++# CONFIG_OPENSSL_ENGINE_CRYPTO is not set ++# CONFIG_PACKAGE_libpolarssl is not set ++ ++# ++# Sound ++# ++# CONFIG_PACKAGE_liblo is not set ++ ++# ++# database ++# ++CONFIG_PACKAGE_libpq=m ++# CONFIG_PACKAGE_libsqlite2 is not set ++# CONFIG_PACKAGE_libsqlite3 is not set ++# CONFIG_PACKAGE_pgsqlodbc is not set ++# CONFIG_PACKAGE_tokyocabinet is not set ++CONFIG_PACKAGE_unixodbc=m ++# CONFIG_PACKAGE_alsa-lib is not set ++# CONFIG_PACKAGE_argp-standalone is not set ++# CONFIG_PACKAGE_argtable is not set ++# CONFIG_PACKAGE_bind-libs is not set ++CONFIG_PACKAGE_bluez-libs=m ++# CONFIG_PACKAGE_boost-chrono is not set ++# CONFIG_PACKAGE_boost-date_time is not set ++# CONFIG_PACKAGE_boost-filesystem is not set ++# CONFIG_PACKAGE_boost-graph is not set ++# CONFIG_PACKAGE_boost-iostreams is not set ++# CONFIG_PACKAGE_boost-locale is not set ++# CONFIG_PACKAGE_boost-math is not set ++# CONFIG_PACKAGE_boost-program_options is not set ++# CONFIG_PACKAGE_boost-python is not set ++# CONFIG_PACKAGE_boost-random is not set ++# CONFIG_PACKAGE_boost-regex is not set ++# CONFIG_PACKAGE_boost-serialization is not set ++# CONFIG_PACKAGE_boost-signals is not set ++# CONFIG_PACKAGE_boost-system is not set ++# CONFIG_PACKAGE_boost-test is not set ++# CONFIG_PACKAGE_boost-thread is not set ++# CONFIG_PACKAGE_boost-wave is not set ++# CONFIG_PACKAGE_ccid is not set ++# CONFIG_PACKAGE_cgilib is not set ++# CONFIG_PACKAGE_check is not set ++# CONFIG_PACKAGE_classpath is not set ++# CONFIG_PACKAGE_classpath-tools is not set ++# CONFIG_PACKAGE_clearsilver is not set ++# CONFIG_PACKAGE_confuse is not set ++# CONFIG_PACKAGE_credis is not set ++# CONFIG_PACKAGE_directfb is not set ++# CONFIG_PACKAGE_fcgi is not set ++# CONFIG_PACKAGE_fftw3 is not set ++# CONFIG_PACKAGE_fftw3f is not set ++# CONFIG_PACKAGE_firewall-mod-save is not set ++# CONFIG_PACKAGE_fribidi is not set ++# CONFIG_PACKAGE_ftplib is not set ++# CONFIG_PACKAGE_giflib is not set ++# CONFIG_PACKAGE_glib1 is not set ++CONFIG_PACKAGE_glib2=m ++# CONFIG_PACKAGE_glibmm is not set ++# CONFIG_PACKAGE_id3lib is not set ++# CONFIG_PACKAGE_jansson is not set ++# CONFIG_PACKAGE_libIDL2 is not set ++# CONFIG_PACKAGE_libaa is not set ++# CONFIG_PACKAGE_libaio is not set ++# CONFIG_PACKAGE_libamsel is not set ++# CONFIG_PACKAGE_libao is not set ++# CONFIG_PACKAGE_libapr is not set ++# CONFIG_PACKAGE_libaprutil is not set ++# CONFIG_PACKAGE_libart is not set ++# CONFIG_PACKAGE_libassuan is not set ++# CONFIG_PACKAGE_libatomicops is not set ++# CONFIG_PACKAGE_libaudiofile is not set ++# CONFIG_PACKAGE_libavahi is not set ++# CONFIG_PACKAGE_libavahi-client is not set ++# CONFIG_PACKAGE_libavahi-dbus-support is not set ++CONFIG_PACKAGE_libblkid=y ++CONFIG_PACKAGE_libblobmsg-json=y ++# CONFIG_PACKAGE_libboblight is not set ++# CONFIG_PACKAGE_libbz2 is not set ++# CONFIG_PACKAGE_libcap is not set ++# CONFIG_PACKAGE_libcares is not set ++# CONFIG_PACKAGE_libcelt is not set ++# CONFIG_PACKAGE_libcharset is not set ++# CONFIG_PACKAGE_libcli is not set ++# CONFIG_PACKAGE_libclinkc is not set ++# CONFIG_PACKAGE_libconfig is not set ++# CONFIG_PACKAGE_libcroco is not set ++# CONFIG_PACKAGE_libcryptoxx is not set ++# CONFIG_PACKAGE_libcunit is not set ++CONFIG_PACKAGE_libcurl=m ++# CONFIG_PACKAGE_libcwiid is not set ++# CONFIG_PACKAGE_libdaemon is not set ++# CONFIG_PACKAGE_libdaq is not set ++# CONFIG_PACKAGE_libdb47 is not set ++# CONFIG_PACKAGE_libdb47xx is not set ++# CONFIG_PACKAGE_libdbi is not set ++CONFIG_PACKAGE_libdbus=m ++CONFIG_PACKAGE_libdbus-glib=m ++# CONFIG_PACKAGE_libdevmapper is not set ++# CONFIG_PACKAGE_libdmapsharing is not set ++# CONFIG_PACKAGE_libdnet is not set ++# CONFIG_PACKAGE_libdvbpsi is not set ++# CONFIG_PACKAGE_libdvdread is not set ++# CONFIG_PACKAGE_libelf1 is not set ++# CONFIG_PACKAGE_libevent is not set ++# CONFIG_PACKAGE_libevent2 is not set ++# CONFIG_PACKAGE_libevent2-core is not set ++# CONFIG_PACKAGE_libevent2-extra is not set ++# CONFIG_PACKAGE_libevent2-openssl is not set ++# CONFIG_PACKAGE_libevent2-pthreads is not set ++# CONFIG_PACKAGE_libeventlog is not set ++# CONFIG_PACKAGE_libexif is not set ++# CONFIG_PACKAGE_libexpat is not set ++# CONFIG_PACKAGE_libexslt is not set ++# CONFIG_PACKAGE_libezxml is not set ++# CONFIG_PACKAGE_libfaad2 is not set ++# CONFIG_PACKAGE_libfaifa is not set ++CONFIG_PACKAGE_libffi=m ++# CONFIG_PACKAGE_libffmpeg-full is not set ++# CONFIG_PACKAGE_libffmpeg-mini is not set ++# CONFIG_PACKAGE_libflac is not set ++# CONFIG_PACKAGE_libfreecwmp is not set ++# CONFIG_PACKAGE_libfreefare is not set ++# CONFIG_PACKAGE_libfreenect is not set ++# CONFIG_PACKAGE_libfreetype is not set ++# CONFIG_PACKAGE_libftdi is not set ++CONFIG_PACKAGE_libgcrypt=m ++# CONFIG_PACKAGE_libgd is not set ++# CONFIG_PACKAGE_libgdbm is not set ++# CONFIG_PACKAGE_libgee is not set ++# CONFIG_PACKAGE_libgmp is not set ++CONFIG_PACKAGE_libgpg-error=m ++# CONFIG_PACKAGE_libgpgme is not set ++# CONFIG_PACKAGE_libgphoto2 is not set ++# CONFIG_PACKAGE_libgps is not set ++# CONFIG_PACKAGE_libgpsd is not set ++# CONFIG_PACKAGE_libgsl is not set ++# CONFIG_PACKAGE_libgsm is not set ++# CONFIG_PACKAGE_libgssapi is not set ++# CONFIG_PACKAGE_libgssdp is not set ++# CONFIG_PACKAGE_libgupnp is not set ++# CONFIG_PACKAGE_libgupnp-av is not set ++# CONFIG_PACKAGE_libgupnp-dlna is not set ++# CONFIG_PACKAGE_libhowl is not set ++# CONFIG_PACKAGE_libiconv is not set ++# CONFIG_PACKAGE_libiconv-full is not set ++# CONFIG_PACKAGE_libid3tag is not set ++# CONFIG_PACKAGE_libidn is not set ++CONFIG_PACKAGE_libiksemel=m ++# CONFIG_PACKAGE_libimobiledevice is not set ++# CONFIG_PACKAGE_libinklevel is not set ++CONFIG_PACKAGE_libintl=m ++# CONFIG_PACKAGE_libintl-full is not set ++CONFIG_PACKAGE_libiw=m ++CONFIG_PACKAGE_libiwinfo=y ++CONFIG_PACKAGE_libjpeg=m ++# CONFIG_PACKAGE_libjpeg-turbo is not set ++# CONFIG_PACKAGE_libjs is not set ++CONFIG_PACKAGE_libjson=y ++# CONFIG_PACKAGE_libldns is not set ++# CONFIG_PACKAGE_libleptonica is not set ++CONFIG_PACKAGE_libltdl=m ++CONFIG_PACKAGE_liblua=y ++CONFIG_PACKAGE_liblzo=y ++# CONFIG_PACKAGE_libmad is not set ++# CONFIG_PACKAGE_libmagic is not set ++# CONFIG_PACKAGE_libmbus is not set ++# CONFIG_PACKAGE_libmcrypt is not set ++# CONFIG_PACKAGE_libmicrohttpd is not set ++# CONFIG_PACKAGE_libmicroxml is not set ++# CONFIG_PACKAGE_libmikmod is not set ++# CONFIG_PACKAGE_libminiupnpc is not set ++# CONFIG_PACKAGE_libmms is not set ++# CONFIG_PACKAGE_libmnl is not set ++# CONFIG_PACKAGE_libmodbus is not set ++# CONFIG_PACKAGE_libmosquitto is not set ++# CONFIG_PACKAGE_libmosquitto-nossl is not set ++# CONFIG_PACKAGE_libmount is not set ++# CONFIG_PACKAGE_libmpcdec is not set ++# CONFIG_PACKAGE_libmpd is not set ++# CONFIG_PACKAGE_libmpdclient is not set ++# CONFIG_PACKAGE_libmpeg2 is not set ++CONFIG_PACKAGE_libmysqlclient=m ++# CONFIG_PACKAGE_libmysqlclient-r is not set ++# CONFIG_PACKAGE_libnatpmp is not set ++CONFIG_PACKAGE_libncurses=y ++# CONFIG_PACKAGE_libncursesw is not set ++# CONFIG_PACKAGE_libneon is not set ++# CONFIG_PACKAGE_libnet0 is not set ++# CONFIG_PACKAGE_libnet1 is not set ++CONFIG_PACKAGE_libnetfilter-conntrack=y ++# CONFIG_PACKAGE_libnetfilter-log is not set ++# CONFIG_PACKAGE_libnetfilter-queue is not set ++# CONFIG_PACKAGE_libnetsnmp is not set ++# CONFIG_PACKAGE_libnewt is not set ++# CONFIG_PACKAGE_libnfc is not set ++CONFIG_PACKAGE_libnfnetlink=y ++# CONFIG_PACKAGE_libnids is not set ++CONFIG_PACKAGE_libnl=m ++CONFIG_PACKAGE_libnl-tiny=y ++# CONFIG_PACKAGE_libnmeap is not set ++# CONFIG_PACKAGE_libogg is not set ++# CONFIG_PACKAGE_liboil is not set ++# CONFIG_PACKAGE_libol is not set ++# CONFIG_PACKAGE_libopal is not set ++# CONFIG_PACKAGE_libopencdk is not set ++# CONFIG_PACKAGE_libopenh323 is not set ++# CONFIG_PACKAGE_libopenldap is not set ++# CONFIG_PACKAGE_liboping is not set ++# CONFIG_PACKAGE_libortp is not set ++# CONFIG_PACKAGE_libosip2 is not set ++# CONFIG_PACKAGE_libowfat is not set ++# CONFIG_PACKAGE_libpar2 is not set ++CONFIG_PACKAGE_libpcap=y ++ ++# ++# Configuration ++# ++CONFIG_PCAP_HAS_USB=y ++# CONFIG_PACKAGE_libpcre is not set ++# CONFIG_PACKAGE_libpcrecpp is not set ++# CONFIG_PACKAGE_libpcsclite is not set ++# CONFIG_PACKAGE_libpiano is not set ++# CONFIG_PACKAGE_libplist is not set ++# CONFIG_PACKAGE_libplistcxx is not set ++# CONFIG_PACKAGE_libpng is not set ++CONFIG_PACKAGE_libpopt=m ++# CONFIG_PACKAGE_libprotobuf-c is not set ++# CONFIG_PACKAGE_libptmalloc3 is not set ++# CONFIG_PACKAGE_libradiusclient-ng is not set ++# CONFIG_PACKAGE_libre is not set ++CONFIG_PACKAGE_libreadline=y ++# CONFIG_PACKAGE_librem is not set ++# CONFIG_PACKAGE_librpc is not set ++# CONFIG_PACKAGE_librpcsecgss is not set ++# CONFIG_PACKAGE_librrd is not set ++# CONFIG_PACKAGE_librrd1 is not set ++# CONFIG_PACKAGE_librsync is not set ++# CONFIG_PACKAGE_librtlsdr is not set ++# CONFIG_PACKAGE_libruby is not set ++# CONFIG_PACKAGE_libsamplerate is not set ++# CONFIG_PACKAGE_libsasl2 is not set ++# CONFIG_PACKAGE_libsdl is not set ++# CONFIG_PACKAGE_libsdl-mixer is not set ++# CONFIG_PACKAGE_libsdl-sound is not set ++# CONFIG_PACKAGE_libsensors is not set ++# CONFIG_PACKAGE_libshout is not set ++# CONFIG_PACKAGE_libsigcxx is not set ++# CONFIG_PACKAGE_libslang2 is not set ++# CONFIG_PACKAGE_libsml is not set ++# CONFIG_PACKAGE_libsndfile is not set ++# CONFIG_PACKAGE_libsocks is not set ++# CONFIG_PACKAGE_libsoup is not set ++CONFIG_PACKAGE_libspandsp=m ++# CONFIG_PACKAGE_libspeex is not set ++# CONFIG_PACKAGE_libspeexdsp is not set ++# CONFIG_PACKAGE_libsrtp is not set ++# CONFIG_PACKAGE_libssh2 is not set ++# CONFIG_PACKAGE_libsynce is not set ++CONFIG_PACKAGE_libtasn1=m ++# CONFIG_PACKAGE_libtheora is not set ++CONFIG_PACKAGE_libtiff=m ++# CONFIG_PACKAGE_libtiffxx is not set ++# CONFIG_PACKAGE_libtorrent is not set ++# CONFIG_PACKAGE_libtwin is not set ++CONFIG_PACKAGE_libubox=y ++CONFIG_PACKAGE_libuci=y ++CONFIG_PACKAGE_libuci-lua=y ++# CONFIG_PACKAGE_libucl is not set ++# CONFIG_PACKAGE_libugpio is not set ++# CONFIG_PACKAGE_libunbound is not set ++# CONFIG_PACKAGE_libupnp is not set ++# CONFIG_PACKAGE_liburcu is not set ++# CONFIG_PACKAGE_libusb-1.0 is not set ++# CONFIG_PACKAGE_libusb-compat is not set ++# CONFIG_PACKAGE_libusbmuxd is not set ++CONFIG_PACKAGE_libustream-cyassl=y ++CONFIG_PACKAGE_libustream-openssl=y ++CONFIG_PACKAGE_libuuid=y ++# CONFIG_PACKAGE_libv4l is not set ++# CONFIG_PACKAGE_libvncserver is not set ++# CONFIG_PACKAGE_libvorbis is not set ++# CONFIG_PACKAGE_libvorbisidec is not set ++# CONFIG_PACKAGE_libwrap is not set ++# CONFIG_PACKAGE_libwxbase is not set ++# CONFIG_PACKAGE_libxapian is not set ++# CONFIG_PACKAGE_libxml2 is not set ++# CONFIG_PACKAGE_libxslt is not set ++# CONFIG_PACKAGE_libzip is not set ++# CONFIG_PACKAGE_libzstream is not set ++# CONFIG_PACKAGE_linux-atm is not set ++# CONFIG_PACKAGE_lttng-ust is not set ++# CONFIG_PACKAGE_mxml is not set ++# CONFIG_PACKAGE_nacl is not set ++# CONFIG_PACKAGE_phidget21 is not set ++# CONFIG_PACKAGE_poco is not set ++# CONFIG_PACKAGE_protobuf is not set ++# CONFIG_PACKAGE_ptlib is not set ++# CONFIG_PACKAGE_pwlib is not set ++# CONFIG_PACKAGE_radlib is not set ++# CONFIG_PACKAGE_sane-libs is not set ++# CONFIG_PACKAGE_serdisplib is not set ++# CONFIG_PACKAGE_shflags is not set ++# CONFIG_PACKAGE_st2205tool is not set ++# CONFIG_PACKAGE_taglib is not set ++# CONFIG_PACKAGE_taglibc is not set ++CONFIG_PACKAGE_terminfo=y ++CONFIG_PACKAGE_uclibcxx=m ++# CONFIG_PACKAGE_ustl is not set ++# CONFIG_PACKAGE_wt is not set ++# CONFIG_PACKAGE_xmlrpc-c is not set ++# CONFIG_PACKAGE_xmlrpc-c-abyss is not set ++# CONFIG_PACKAGE_xmlrpc-c-client is not set ++# CONFIG_PACKAGE_xmlrpc-c-common is not set ++# CONFIG_PACKAGE_xmlrpc-c-internal is not set ++# CONFIG_PACKAGE_xmlrpc-c-server is not set ++# CONFIG_PACKAGE_xmlrpc-c-server-abyss is not set ++# CONFIG_PACKAGE_xmpp4r is not set ++# CONFIG_PACKAGE_zaptel-libtonezone is not set ++# CONFIG_PACKAGE_zaptel14-libtonezone is not set ++CONFIG_PACKAGE_zlib=y ++ ++# ++# LuCI2 ++# ++ ++# ++# Libraries ++# ++CONFIG_PACKAGE_libubus=y ++CONFIG_PACKAGE_libubus-lua=y ++ ++# ++# System ++# ++CONFIG_PACKAGE_ubus=y ++CONFIG_PACKAGE_ubusd=y ++ ++# ++# Multimedia ++# ++ ++# ++# Streaming ++# ++# CONFIG_PACKAGE_darkice is not set ++# CONFIG_PACKAGE_GraphicsMagick is not set ++# CONFIG_PACKAGE_GraphicsMagick-jpeg is not set ++# CONFIG_PACKAGE_crtmpserver is not set ++# CONFIG_PACKAGE_ffmpeg is not set ++# CONFIG_PACKAGE_ffprobe is not set ++# CONFIG_PACKAGE_ffserver is not set ++# CONFIG_PACKAGE_fswebcam is not set ++# CONFIG_PACKAGE_ftpd-topfield is not set ++# CONFIG_PACKAGE_gmediaserver is not set ++# CONFIG_PACKAGE_gphoto2 is not set ++# CONFIG_PACKAGE_gst-ffmpeg is not set ++# CONFIG_PACKAGE_gst-mod-adpcmdec is not set ++# CONFIG_PACKAGE_gst-mod-adpcmenc is not set ++# CONFIG_PACKAGE_gst-mod-aiff is not set ++# CONFIG_PACKAGE_gst-mod-alsa is not set ++# CONFIG_PACKAGE_gst-mod-app is not set ++# CONFIG_PACKAGE_gst-mod-asf is not set ++# CONFIG_PACKAGE_gst-mod-asfmux is not set ++# CONFIG_PACKAGE_gst-mod-audioconvert is not set ++# CONFIG_PACKAGE_gst-mod-audiofx is not set ++# CONFIG_PACKAGE_gst-mod-audioparsers is not set ++# CONFIG_PACKAGE_gst-mod-audiorate is not set ++# CONFIG_PACKAGE_gst-mod-audioresample is not set ++# CONFIG_PACKAGE_gst-mod-audiotestsrc is not set ++# CONFIG_PACKAGE_gst-mod-autoconvert is not set ++# CONFIG_PACKAGE_gst-mod-autodetect is not set ++# CONFIG_PACKAGE_gst-mod-bayer is not set ++# CONFIG_PACKAGE_gst-mod-camerabin is not set ++# CONFIG_PACKAGE_gst-mod-cdxaparse is not set ++# CONFIG_PACKAGE_gst-mod-cutter is not set ++# CONFIG_PACKAGE_gst-mod-dataurisrc is not set ++# CONFIG_PACKAGE_gst-mod-dccp is not set ++# CONFIG_PACKAGE_gst-mod-debug is not set ++# CONFIG_PACKAGE_gst-mod-debugutilsbad is not set ++# CONFIG_PACKAGE_gst-mod-decodebin is not set ++# CONFIG_PACKAGE_gst-mod-decodebin2 is not set ++# CONFIG_PACKAGE_gst-mod-dtmf is not set ++# CONFIG_PACKAGE_gst-mod-dvdspu is not set ++# CONFIG_PACKAGE_gst-mod-equalizer is not set ++# CONFIG_PACKAGE_gst-mod-faad is not set ++# CONFIG_PACKAGE_gst-mod-festival is not set ++# CONFIG_PACKAGE_gst-mod-flac is not set ++# CONFIG_PACKAGE_gst-mod-freeze is not set ++# CONFIG_PACKAGE_gst-mod-frei0r is not set ++# CONFIG_PACKAGE_gst-mod-gio is not set ++# CONFIG_PACKAGE_gst-mod-h264parse is not set ++# CONFIG_PACKAGE_gst-mod-hdvparse is not set ++# CONFIG_PACKAGE_gst-mod-icydemux is not set ++# CONFIG_PACKAGE_gst-mod-id3demux is not set ++# CONFIG_PACKAGE_gst-mod-id3tag is not set ++# CONFIG_PACKAGE_gst-mod-interleave is not set ++# CONFIG_PACKAGE_gst-mod-isomp4 is not set ++# CONFIG_PACKAGE_gst-mod-jpegformat is not set ++# CONFIG_PACKAGE_gst-mod-lame is not set ++# CONFIG_PACKAGE_gst-mod-legacyresample is not set ++# CONFIG_PACKAGE_gst-mod-level is not set ++# CONFIG_PACKAGE_gst-mod-liveadder is not set ++# CONFIG_PACKAGE_gst-mod-mad is not set ++# CONFIG_PACKAGE_gst-mod-mms is not set ++# CONFIG_PACKAGE_gst-mod-mpeg2dec is not set ++# CONFIG_PACKAGE_gst-mod-mpegdemux is not set ++# CONFIG_PACKAGE_gst-mod-mpegpsmux is not set ++# CONFIG_PACKAGE_gst-mod-mpegtsmux is not set ++# CONFIG_PACKAGE_gst-mod-mpegvideoparse is not set ++# CONFIG_PACKAGE_gst-mod-multifile is not set ++# CONFIG_PACKAGE_gst-mod-multipart is not set ++# CONFIG_PACKAGE_gst-mod-mve is not set ++# CONFIG_PACKAGE_gst-mod-mxf is not set ++# CONFIG_PACKAGE_gst-mod-nsf is not set ++# CONFIG_PACKAGE_gst-mod-nuvdemux is not set ++# CONFIG_PACKAGE_gst-mod-ogg is not set ++# CONFIG_PACKAGE_gst-mod-ossaudio is not set ++# CONFIG_PACKAGE_gst-mod-pcapparse is not set ++# CONFIG_PACKAGE_gst-mod-playbin is not set ++# CONFIG_PACKAGE_gst-mod-pnm is not set ++# CONFIG_PACKAGE_gst-mod-rawparse is not set ++# CONFIG_PACKAGE_gst-mod-replaygain is not set ++# CONFIG_PACKAGE_gst-mod-rtp is not set ++# CONFIG_PACKAGE_gst-mod-rtpmux is not set ++# CONFIG_PACKAGE_gst-mod-rtsp is not set ++# CONFIG_PACKAGE_gst-mod-scaletempoplugin is not set ++# CONFIG_PACKAGE_gst-mod-sdpelem is not set ++# CONFIG_PACKAGE_gst-mod-segmentclip is not set ++# CONFIG_PACKAGE_gst-mod-siren is not set ++# CONFIG_PACKAGE_gst-mod-souphttpsrc is not set ++# CONFIG_PACKAGE_gst-mod-spectrum is not set ++# CONFIG_PACKAGE_gst-mod-speed is not set ++# CONFIG_PACKAGE_gst-mod-stereo is not set ++# CONFIG_PACKAGE_gst-mod-subenc is not set ++# CONFIG_PACKAGE_gst-mod-tcp is not set ++# CONFIG_PACKAGE_gst-mod-theora is not set ++# CONFIG_PACKAGE_gst-mod-tta is not set ++# CONFIG_PACKAGE_gst-mod-typefindfunctions is not set ++# CONFIG_PACKAGE_gst-mod-udp is not set ++# CONFIG_PACKAGE_gst-mod-videomeasure is not set ++# CONFIG_PACKAGE_gst-mod-videosignal is not set ++# CONFIG_PACKAGE_gst-mod-videotestsrc is not set ++# CONFIG_PACKAGE_gst-mod-vmnc is not set ++# CONFIG_PACKAGE_gst-mod-volume is not set ++# CONFIG_PACKAGE_gst-mod-vorbis is not set ++# CONFIG_PACKAGE_gst-mod-wavenc is not set ++# CONFIG_PACKAGE_gst-mod-wavparse is not set ++# CONFIG_PACKAGE_gst-plugins-bad is not set ++# CONFIG_PACKAGE_gst-plugins-base is not set ++# CONFIG_PACKAGE_gst-plugins-good is not set ++# CONFIG_PACKAGE_gst-plugins-ugly is not set ++# CONFIG_PACKAGE_gstreamer is not set ++# CONFIG_PACKAGE_gstreamer-utils is not set ++# CONFIG_PACKAGE_hasciicam is not set ++# CONFIG_PACKAGE_icecast is not set ++# CONFIG_PACKAGE_imagemagick is not set ++# CONFIG_PACKAGE_imagemagick-jpeg is not set ++# CONFIG_PACKAGE_imagemagick-png is not set ++# CONFIG_PACKAGE_imagemagick-tiff is not set ++# CONFIG_PACKAGE_imagemagick-tools is not set ++# CONFIG_PACKAGE_kissdx is not set ++# CONFIG_PACKAGE_libgstapp is not set ++# CONFIG_PACKAGE_libgstaudio is not set ++# CONFIG_PACKAGE_libgstcdda is not set ++# CONFIG_PACKAGE_libgstcheck is not set ++# CONFIG_PACKAGE_libgstcontroller is not set ++# CONFIG_PACKAGE_libgstdataprotocol is not set ++# CONFIG_PACKAGE_libgstfft is not set ++# CONFIG_PACKAGE_libgstinterfaces is not set ++# CONFIG_PACKAGE_libgstnet is not set ++# CONFIG_PACKAGE_libgstnetbuffer is not set ++# CONFIG_PACKAGE_libgstpbutils is not set ++# CONFIG_PACKAGE_libgstphotography is not set ++# CONFIG_PACKAGE_libgstreamer is not set ++# CONFIG_PACKAGE_libgstriff is not set ++# CONFIG_PACKAGE_libgstrtp is not set ++# CONFIG_PACKAGE_libgstrtsp is not set ++# CONFIG_PACKAGE_libgstsdp is not set ++# CONFIG_PACKAGE_libgsttag is not set ++# CONFIG_PACKAGE_libgstvideo is not set ++# CONFIG_PACKAGE_mjpg-streamer is not set ++# CONFIG_PACKAGE_motion is not set ++# CONFIG_PACKAGE_peercast is not set ++# CONFIG_PACKAGE_puppy is not set ++# CONFIG_PACKAGE_rygel is not set ++# CONFIG_PACKAGE_rygel-external is not set ++# CONFIG_PACKAGE_rygel-media-export is not set ++# CONFIG_PACKAGE_rygel-mpris is not set ++# CONFIG_PACKAGE_rygel-playbin is not set ++# CONFIG_PACKAGE_rygel-playbin-gst-suggested is not set ++# CONFIG_PACKAGE_rygel-tracker is not set ++# CONFIG_PACKAGE_shairport is not set ++# CONFIG_PACKAGE_streamripper is not set ++# CONFIG_PACKAGE_tvheadend is not set ++# CONFIG_PACKAGE_vips is not set ++ ++# ++# Utilities ++# ++ ++# ++# Boot Loaders ++# ++ ++# ++# CPU tools ++# ++# CONFIG_PACKAGE_msr-tools is not set ++ ++# ++# Editors ++# ++# CONFIG_PACKAGE_joe is not set ++# CONFIG_PACKAGE_mg is not set ++# CONFIG_PACKAGE_nano is not set ++# CONFIG_PACKAGE_vim is not set ++# CONFIG_PACKAGE_vim-full is not set ++# CONFIG_PACKAGE_vim-help is not set ++# CONFIG_PACKAGE_vim-runtime is not set ++# CONFIG_PACKAGE_zile is not set ++ ++# ++# Filesystem ++# ++# CONFIG_PACKAGE_badblocks is not set ++# CONFIG_PACKAGE_btrfs-progs is not set ++# CONFIG_PACKAGE_disktype is not set ++# CONFIG_PACKAGE_dosfsck is not set ++# CONFIG_PACKAGE_dosfslabel is not set ++CONFIG_PACKAGE_e2fsprogs=y ++# CONFIG_PACKAGE_fuse-utils is not set ++# CONFIG_PACKAGE_mkdosfs is not set ++# CONFIG_PACKAGE_nfs-utils is not set ++# CONFIG_PACKAGE_ntfs-3g is not set ++# CONFIG_PACKAGE_ntfs-3g-low is not set ++# CONFIG_PACKAGE_ntfs-3g-utils is not set ++# CONFIG_PACKAGE_ntfsprogs is not set ++# CONFIG_PACKAGE_ntfsprogs_ntfs-3g is not set ++# CONFIG_PACKAGE_owfs is not set ++# CONFIG_PACKAGE_owshell is not set ++# CONFIG_PACKAGE_reiserfsprogs is not set ++# CONFIG_PACKAGE_resize2fs is not set ++# CONFIG_PACKAGE_sysfsutils is not set ++# CONFIG_PACKAGE_tune2fs is not set ++ ++# ++# SSL ++# ++# CONFIG_PACKAGE_certtool is not set ++# CONFIG_PACKAGE_gnutls-utils is not set ++# CONFIG_PACKAGE_polarssl-progs is not set ++ ++# ++# Sound ++# ++# CONFIG_PACKAGE_liblo-utils is not set ++ ++# ++# Terminal ++# ++# CONFIG_PACKAGE_agetty is not set ++# CONFIG_PACKAGE_microcom is not set ++# CONFIG_PACKAGE_minicom is not set ++# CONFIG_PACKAGE_picocom is not set ++# CONFIG_PACKAGE_script-utils is not set ++# CONFIG_PACKAGE_setserial is not set ++# CONFIG_PACKAGE_setterm is not set ++# CONFIG_PACKAGE_wall is not set ++ ++# ++# backup ++# ++# CONFIG_PACKAGE_boxbackup is not set ++# CONFIG_PACKAGE_rdiff-backup is not set ++# CONFIG_PACKAGE_rsnapshot is not set ++ ++# ++# compression ++# ++# CONFIG_PACKAGE_libzip-utils is not set ++# CONFIG_PACKAGE_unrar is not set ++# CONFIG_PACKAGE_unzip is not set ++# CONFIG_PACKAGE_zip is not set ++ ++# ++# database ++# ++# CONFIG_PACKAGE_mysql-server is not set ++# CONFIG_PACKAGE_pgsql-cli is not set ++CONFIG_PACKAGE_pgsql-server=m ++# CONFIG_PACKAGE_sqlite2-cli is not set ++# CONFIG_PACKAGE_sqlite3-cli is not set ++# CONFIG_PACKAGE_unixodbc-tools is not set ++ ++# ++# disc ++# ++# CONFIG_PACKAGE_blkid is not set ++# CONFIG_PACKAGE_cfdisk is not set ++# CONFIG_PACKAGE_devio is not set ++CONFIG_PACKAGE_fdisk=y ++# CONFIG_PACKAGE_findfs is not set ++# CONFIG_PACKAGE_hd-idle is not set ++# CONFIG_PACKAGE_hdparm is not set ++# CONFIG_PACKAGE_lsblk is not set ++# CONFIG_PACKAGE_lvm2 is not set ++# CONFIG_PACKAGE_partx-utils is not set ++# CONFIG_PACKAGE_sdparm is not set ++# CONFIG_PACKAGE_sfdisk is not set ++# CONFIG_PACKAGE_swap-utils is not set ++# CONFIG_PACKAGE_wipefs is not set ++ ++# ++# filemanager ++# ++# CONFIG_PACKAGE_deco is not set ++# CONFIG_PACKAGE_mc is not set ++ ++# ++# zoneinfo ++# ++# CONFIG_PACKAGE_zoneinfo-africa is not set ++# CONFIG_PACKAGE_zoneinfo-asia is not set ++# CONFIG_PACKAGE_zoneinfo-atlantic is not set ++# CONFIG_PACKAGE_zoneinfo-australia-nz is not set ++# CONFIG_PACKAGE_zoneinfo-core is not set ++# CONFIG_PACKAGE_zoneinfo-europe is not set ++# CONFIG_PACKAGE_zoneinfo-india is not set ++# CONFIG_PACKAGE_zoneinfo-middleeast is not set ++# CONFIG_PACKAGE_zoneinfo-northamerica is not set ++# CONFIG_PACKAGE_zoneinfo-pacific is not set ++# CONFIG_PACKAGE_zoneinfo-poles is not set ++# CONFIG_PACKAGE_zoneinfo-simple is not set ++# CONFIG_PACKAGE_zoneinfo-southamerica is not set ++# CONFIG_PACKAGE_alsa-utils is not set ++# CONFIG_PACKAGE_alsa-utils-seq is not set ++# CONFIG_PACKAGE_alsa-utils-tests is not set ++# CONFIG_PACKAGE_anyremote is not set ++# CONFIG_PACKAGE_ap51-flash is not set ++# CONFIG_PACKAGE_apcupsd is not set ++# CONFIG_PACKAGE_at is not set ++# CONFIG_PACKAGE_avrdude is not set ++# CONFIG_PACKAGE_avrusbboot is not set ++# CONFIG_PACKAGE_bandwidthd is not set ++# CONFIG_PACKAGE_bash is not set ++# CONFIG_PACKAGE_bash-completion is not set ++# CONFIG_PACKAGE_bc is not set ++# CONFIG_PACKAGE_bluelog is not set ++# CONFIG_PACKAGE_bluez-hcidump is not set ++# CONFIG_PACKAGE_bluez-utils is not set ++# CONFIG_PACKAGE_boblight-client is not set ++# CONFIG_PACKAGE_boblight-daemon is not set ++# CONFIG_PACKAGE_bonniexx is not set ++# CONFIG_PACKAGE_bsdiff is not set ++# CONFIG_PACKAGE_byobu is not set ++# CONFIG_PACKAGE_bzip2 is not set ++# CONFIG_PACKAGE_cal is not set ++# CONFIG_PACKAGE_calcurse is not set ++# CONFIG_PACKAGE_calvaria is not set ++# CONFIG_PACKAGE_ccrypt is not set ++# CONFIG_PACKAGE_cdparanoia is not set ++# CONFIG_PACKAGE_cksfv is not set ++# CONFIG_PACKAGE_clish is not set ++# CONFIG_PACKAGE_cmdpad is not set ++# CONFIG_PACKAGE_collectd is not set ++CONFIG_PACKAGE_comgt=y ++# CONFIG_PACKAGE_coreutils is not set ++# CONFIG_PACKAGE_cpusage is not set ++# CONFIG_PACKAGE_crypto-tools is not set ++# CONFIG_PACKAGE_cryptsetup is not set ++# CONFIG_PACKAGE_daemontools is not set ++# CONFIG_PACKAGE_dbus is not set ++# CONFIG_PACKAGE_devmem2 is not set ++# CONFIG_PACKAGE_dfu-util is not set ++# CONFIG_PACKAGE_dialog is not set ++# CONFIG_PACKAGE_digitemp is not set ++# CONFIG_PACKAGE_digitemp-usb is not set ++# CONFIG_PACKAGE_dir300-flash is not set ++# CONFIG_PACKAGE_dmesg is not set ++# CONFIG_PACKAGE_dropbearconvert is not set ++# CONFIG_PACKAGE_dstat is not set ++# CONFIG_PACKAGE_dt is not set ++# CONFIG_PACKAGE_dtach is not set ++# CONFIG_PACKAGE_empty is not set ++# CONFIG_PACKAGE_event_test is not set ++# CONFIG_PACKAGE_fancontroled is not set ++# CONFIG_PACKAGE_fconfig is not set ++# CONFIG_PACKAGE_file is not set ++# CONFIG_PACKAGE_firmwarehotplug is not set ++# CONFIG_PACKAGE_flock is not set ++# CONFIG_PACKAGE_fortune-mod is not set ++# CONFIG_PACKAGE_fowsr is not set ++# CONFIG_PACKAGE_freecwmp-curl is not set ++# CONFIG_PACKAGE_freecwmp-zstream is not set ++# CONFIG_PACKAGE_fxload is not set ++# CONFIG_PACKAGE_gawk is not set ++# CONFIG_PACKAGE_getopt is not set ++# CONFIG_PACKAGE_gnokii is not set ++# CONFIG_PACKAGE_gnupg is not set ++# CONFIG_PACKAGE_gnuplot is not set ++# CONFIG_PACKAGE_gpioctl-sysfs is not set ++# CONFIG_PACKAGE_gsm-utils is not set ++# CONFIG_PACKAGE_gzip is not set ++# CONFIG_PACKAGE_haserl is not set ++# CONFIG_PACKAGE_haveged is not set ++# CONFIG_PACKAGE_heyu is not set ++# CONFIG_PACKAGE_hplip is not set ++# CONFIG_PACKAGE_huaweiaktbbo is not set ++# CONFIG_PACKAGE_hwclock is not set ++# CONFIG_PACKAGE_i2c-tools is not set ++# CONFIG_PACKAGE_iconv is not set ++# CONFIG_PACKAGE_iioutils is not set ++# CONFIG_PACKAGE_ink is not set ++# CONFIG_PACKAGE_input-utils is not set ++# CONFIG_PACKAGE_io is not set ++# CONFIG_PACKAGE_ipmitool is not set ++# CONFIG_PACKAGE_iwcap is not set ++# CONFIG_PACKAGE_iwinfo is not set ++# CONFIG_PACKAGE_jpeg-tools is not set ++CONFIG_PACKAGE_jshn=y ++# CONFIG_PACKAGE_kexec-tools is not set ++# CONFIG_PACKAGE_klish is not set ++# CONFIG_PACKAGE_kmemtrace-user is not set ++# CONFIG_PACKAGE_ksymoops is not set ++# CONFIG_PACKAGE_lcd4linux-custom is not set ++# CONFIG_PACKAGE_lcd4linux-tew673gru is not set ++# CONFIG_PACKAGE_lcdproc is not set ++# CONFIG_PACKAGE_ldconfig is not set ++# CONFIG_PACKAGE_ldd is not set ++# CONFIG_PACKAGE_less is not set ++# CONFIG_PACKAGE_less-wide is not set ++# CONFIG_PACKAGE_libfreefare-examples is not set ++# CONFIG_PACKAGE_libimobiledevice-utils is not set ++# CONFIG_PACKAGE_libjpeg-turbo-tests is not set ++CONFIG_PACKAGE_libjson-script=y ++# CONFIG_PACKAGE_libnfc-bin is not set ++# CONFIG_PACKAGE_libnfc-examples is not set ++# CONFIG_PACKAGE_libplist-utils is not set ++# CONFIG_PACKAGE_lirc is not set ++# CONFIG_PACKAGE_lm-sensors is not set ++# CONFIG_PACKAGE_lm-sensors-detect is not set ++# CONFIG_PACKAGE_lmbench is not set ++# CONFIG_PACKAGE_logger is not set ++# CONFIG_PACKAGE_logrotate is not set ++# CONFIG_PACKAGE_logtrigger is not set ++# CONFIG_PACKAGE_look is not set ++# CONFIG_PACKAGE_losetup is not set ++# CONFIG_PACKAGE_lrzsz is not set ++# CONFIG_PACKAGE_lsof is not set ++# CONFIG_PACKAGE_maccalc is not set ++# CONFIG_PACKAGE_macchanger is not set ++# CONFIG_PACKAGE_mbus-serial is not set ++# CONFIG_PACKAGE_mbus-tcp is not set ++# CONFIG_PACKAGE_mcookie is not set ++# CONFIG_PACKAGE_md5deep is not set ++# CONFIG_PACKAGE_mdadm is not set ++# CONFIG_PACKAGE_memtester is not set ++# CONFIG_PACKAGE_mgetty is not set ++# CONFIG_PACKAGE_mount-utils is not set ++# CONFIG_PACKAGE_mountd is not set ++# CONFIG_PACKAGE_mtd-utils is not set ++# CONFIG_PACKAGE_namei is not set ++# CONFIG_PACKAGE_nprobe is not set ++# CONFIG_PACKAGE_nut is not set ++# CONFIG_PACKAGE_ocf-crypto-headers is not set ++# CONFIG_PACKAGE_open-plc-utils is not set ++# CONFIG_PACKAGE_open2300 is not set ++# CONFIG_PACKAGE_openldap-utils is not set ++CONFIG_PACKAGE_openssl-util=m ++# CONFIG_PACKAGE_owipcalc is not set ++# CONFIG_PACKAGE_oww is not set ++# CONFIG_PACKAGE_pciutils is not set ++# CONFIG_PACKAGE_pcscd is not set ++# CONFIG_PACKAGE_pipacs is not set ++# CONFIG_PACKAGE_powertop is not set ++# CONFIG_PACKAGE_procps is not set ++# CONFIG_PACKAGE_psmisc is not set ++# CONFIG_PACKAGE_psplash is not set ++# CONFIG_PACKAGE_pv is not set ++# CONFIG_PACKAGE_pwcrypt is not set ++# CONFIG_PACKAGE_pwgen is not set ++CONFIG_PACKAGE_px5g=y ++# CONFIG_PACKAGE_rbcfg is not set ++# CONFIG_PACKAGE_rcs is not set ++# CONFIG_PACKAGE_remind is not set ++# CONFIG_PACKAGE_rename is not set ++# CONFIG_PACKAGE_restorefactory is not set ++# CONFIG_PACKAGE_rng-tools is not set ++# CONFIG_PACKAGE_robocfg is not set ++# CONFIG_PACKAGE_rrdcgi is not set ++# CONFIG_PACKAGE_rrdcgi1 is not set ++# CONFIG_PACKAGE_rrdcollect10 is not set ++# CONFIG_PACKAGE_rrdcollect12 is not set ++# CONFIG_PACKAGE_rrdtool is not set ++# CONFIG_PACKAGE_rrdtool1 is not set ++# CONFIG_PACKAGE_rsyncrypto is not set ++# CONFIG_PACKAGE_rtl-sdr is not set ++# CONFIG_PACKAGE_sane-backends is not set ++# CONFIG_PACKAGE_sane-frontends is not set ++# CONFIG_PACKAGE_schedtool is not set ++# CONFIG_PACKAGE_scponly is not set ++# CONFIG_PACKAGE_screen is not set ++# CONFIG_PACKAGE_sed is not set ++# CONFIG_PACKAGE_sg3-utils is not set ++# CONFIG_PACKAGE_shadow is not set ++CONFIG_PACKAGE_shadow-common=m ++# CONFIG_PACKAGE_shadow-groupadd is not set ++# CONFIG_PACKAGE_shadow-groupdel is not set ++# CONFIG_PACKAGE_shadow-groupmod is not set ++# CONFIG_PACKAGE_shadow-groups is not set ++# CONFIG_PACKAGE_shadow-passwd is not set ++CONFIG_PACKAGE_shadow-su=m ++# CONFIG_PACKAGE_shadow-useradd is not set ++# CONFIG_PACKAGE_shadow-userdel is not set ++# CONFIG_PACKAGE_shadow-usermod is not set ++# CONFIG_PACKAGE_sispmctl is not set ++# CONFIG_PACKAGE_smartd is not set ++# CONFIG_PACKAGE_smartmontools is not set ++# CONFIG_PACKAGE_spidev-test is not set ++# CONFIG_PACKAGE_ssldump is not set ++# CONFIG_PACKAGE_stm32flash is not set ++# CONFIG_PACKAGE_strace is not set ++# CONFIG_PACKAGE_stress is not set ++# CONFIG_PACKAGE_sysstat is not set ++# CONFIG_PACKAGE_tar is not set ++# CONFIG_PACKAGE_taskwarrior is not set ++# CONFIG_PACKAGE_tcpser is not set ++# CONFIG_PACKAGE_tcsh is not set ++# CONFIG_PACKAGE_tesseract is not set ++# CONFIG_PACKAGE_tiff-utils is not set ++# CONFIG_PACKAGE_time is not set ++# CONFIG_PACKAGE_tmux is not set ++# CONFIG_PACKAGE_triggerhappy is not set ++CONFIG_PACKAGE_uboot-envtools=y ++# CONFIG_PACKAGE_uboot-envtools-mmc is not set ++# CONFIG_PACKAGE_upx is not set ++# CONFIG_PACKAGE_usb-modeswitch is not set ++# CONFIG_PACKAGE_usbmuxd is not set ++# CONFIG_PACKAGE_usbreset is not set ++# CONFIG_PACKAGE_usbutils is not set ++# CONFIG_PACKAGE_uuidd is not set ++# CONFIG_PACKAGE_uuidgen is not set ++# CONFIG_PACKAGE_v4l-utils is not set ++# CONFIG_PACKAGE_watchcat is not set ++# CONFIG_PACKAGE_wattsup is not set ++# CONFIG_PACKAGE_whereis is not set ++# CONFIG_PACKAGE_whiptail is not set ++# CONFIG_PACKAGE_wifitoggle is not set ++# CONFIG_PACKAGE_wminput is not set ++# CONFIG_PACKAGE_wview is not set ++# CONFIG_PACKAGE_wx200d is not set ++# CONFIG_PACKAGE_xdelta3 is not set ++# CONFIG_PACKAGE_xfs-fsck is not set ++# CONFIG_PACKAGE_xfs-growfs is not set ++# CONFIG_PACKAGE_xfs-mkfs is not set ++# CONFIG_PACKAGE_xsltproc is not set ++# CONFIG_PACKAGE_xxd is not set ++# CONFIG_PACKAGE_zaptel14-util is not set ++# CONFIG_PACKAGE_zsh is not set ++ ++# ++# Sound ++# ++# CONFIG_PACKAGE_cmus is not set ++# CONFIG_PACKAGE_empcd is not set ++# CONFIG_PACKAGE_faad2 is not set ++# CONFIG_PACKAGE_flite is not set ++# CONFIG_PACKAGE_ices is not set ++# CONFIG_PACKAGE_lame is not set ++# CONFIG_PACKAGE_lame-lib is not set ++# CONFIG_PACKAGE_listener is not set ++# CONFIG_PACKAGE_madplay is not set ++# CONFIG_PACKAGE_mpc is not set ++# CONFIG_PACKAGE_mpd-mini is not set ++# CONFIG_PACKAGE_mpdas is not set ++# CONFIG_PACKAGE_mt-daapd is not set ++# CONFIG_PACKAGE_pianobar is not set ++# CONFIG_PACKAGE_pulseaudio-daemon is not set ++# CONFIG_PACKAGE_pulseaudio-daemon-avahi is not set ++# CONFIG_PACKAGE_scmpc is not set ++# CONFIG_PACKAGE_shell-fm is not set ++# CONFIG_PACKAGE_sox is not set ++ ++# ++# Development ++# ++# CONFIG_PACKAGE_binutils is not set ++# CONFIG_PACKAGE_cppunit is not set ++# CONFIG_PACKAGE_diffutils is not set ++# CONFIG_PACKAGE_gdb is not set ++# CONFIG_PACKAGE_gdbserver is not set ++# CONFIG_PACKAGE_lttng-tools is not set ++# CONFIG_PACKAGE_make is not set ++# CONFIG_PACKAGE_objdump is not set ++# CONFIG_PACKAGE_patch is not set ++# CONFIG_PACKAGE_perf is not set ++# CONFIG_PACKAGE_python-sip is not set ++# CONFIG_PACKAGE_tig is not set ++# CONFIG_PACKAGE_trace-cmd is not set ++# CONFIG_PACKAGE_trace-cmd-extra is not set ++# CONFIG_PACKAGE_valgrind is not set ++ ++# ++# Emulators ++# ++ ++# ++# Languages ++# ++ ++# ++# Erlang ++# ++# CONFIG_PACKAGE_erlang is not set ++# CONFIG_PACKAGE_erlang-asn1 is not set ++# CONFIG_PACKAGE_erlang-compiler is not set ++# CONFIG_PACKAGE_erlang-crypto is not set ++# CONFIG_PACKAGE_erlang-hipe is not set ++# CONFIG_PACKAGE_erlang-inets is not set ++# CONFIG_PACKAGE_erlang-mnesia is not set ++# CONFIG_PACKAGE_erlang-runtime-tools is not set ++# CONFIG_PACKAGE_erlang-snmp is not set ++# CONFIG_PACKAGE_erlang-ssh is not set ++# CONFIG_PACKAGE_erlang-ssl is not set ++# CONFIG_PACKAGE_erlang-syntax-tools is not set ++ ++# ++# Java ++# ++# CONFIG_PACKAGE_jamvm is not set ++ ++# ++# JavaScript ++# ++# CONFIG_PACKAGE_js is not set ++ ++# ++# Lua ++# ++CONFIG_PACKAGE_libiwinfo-lua=y ++# CONFIG_PACKAGE_lsqlite3 is not set ++CONFIG_PACKAGE_lua=y ++# CONFIG_PACKAGE_lua-examples is not set ++# CONFIG_PACKAGE_luac is not set ++# CONFIG_PACKAGE_luaexpat is not set ++# CONFIG_PACKAGE_luafilesystem is not set ++# CONFIG_PACKAGE_luaposix is not set ++# CONFIG_PACKAGE_luaprofiler is not set ++# CONFIG_PACKAGE_luasec is not set ++# CONFIG_PACKAGE_luasoap is not set ++# CONFIG_PACKAGE_luasocket is not set ++# CONFIG_PACKAGE_luasql-mysql is not set ++# CONFIG_PACKAGE_luasql-pgsql is not set ++# CONFIG_PACKAGE_luasql-sqlite3 is not set ++ ++# ++# PHP ++# ++# CONFIG_PACKAGE_php-pear is not set ++# CONFIG_PACKAGE_php4 is not set ++# CONFIG_PACKAGE_php5 is not set ++ ++# ++# Perl ++# ++# CONFIG_PACKAGE_microperl is not set ++# CONFIG_PACKAGE_perl is not set ++# CONFIG_PACKAGE_perl-test-harness is not set ++ ++# ++# Python ++# ++# CONFIG_PACKAGE_cython is not set ++# CONFIG_PACKAGE_dbus-python is not set ++# CONFIG_PACKAGE_distribute is not set ++# CONFIG_PACKAGE_gst-python is not set ++# CONFIG_PACKAGE_ipython is not set ++# CONFIG_PACKAGE_jsonpath is not set ++# CONFIG_PACKAGE_libyaml is not set ++# CONFIG_PACKAGE_logilab-astng is not set ++# CONFIG_PACKAGE_logilab-common is not set ++# CONFIG_PACKAGE_mako is not set ++# CONFIG_PACKAGE_pyclips is not set ++# CONFIG_PACKAGE_pyopenssl is not set ++# CONFIG_PACKAGE_pyrrd is not set ++# CONFIG_PACKAGE_pyserial is not set ++# CONFIG_PACKAGE_python is not set ++# CONFIG_PACKAGE_python-bluez is not set ++# CONFIG_PACKAGE_python-bzip2 is not set ++# CONFIG_PACKAGE_python-cjson is not set ++# CONFIG_PACKAGE_python-crypto is not set ++# CONFIG_PACKAGE_python-curl is not set ++# CONFIG_PACKAGE_python-cwiid is not set ++# CONFIG_PACKAGE_python-django is not set ++# CONFIG_PACKAGE_python-doc is not set ++# CONFIG_PACKAGE_python-eeml is not set ++# CONFIG_PACKAGE_python-egenix-mx is not set ++# CONFIG_PACKAGE_python-event is not set ++# CONFIG_PACKAGE_python-expat is not set ++# CONFIG_PACKAGE_python-flup is not set ++# CONFIG_PACKAGE_python-gdbm is not set ++# CONFIG_PACKAGE_python-gobject is not set ++# CONFIG_PACKAGE_python-gzip is not set ++# CONFIG_PACKAGE_python-ifconfig is not set ++# CONFIG_PACKAGE_python-imaging-library is not set ++# CONFIG_PACKAGE_python-json is not set ++# CONFIG_PACKAGE_python-kid is not set ++# CONFIG_PACKAGE_python-mimms is not set ++# CONFIG_PACKAGE_python-mini is not set ++# CONFIG_PACKAGE_python-mysql is not set ++# CONFIG_PACKAGE_python-ncurses is not set ++# CONFIG_PACKAGE_python-openssl is not set ++# CONFIG_PACKAGE_python-pcap is not set ++# CONFIG_PACKAGE_python-psycopg is not set ++# CONFIG_PACKAGE_python-pydaemon is not set ++# CONFIG_PACKAGE_python-pyosc is not set ++# CONFIG_PACKAGE_python-rsfile is not set ++# CONFIG_PACKAGE_python-shutil is not set ++# CONFIG_PACKAGE_python-smbus is not set ++# CONFIG_PACKAGE_python-sqlite is not set ++# CONFIG_PACKAGE_python-sqlite3 is not set ++# CONFIG_PACKAGE_python-webpy is not set ++# CONFIG_PACKAGE_python-xapian is not set ++# CONFIG_PACKAGE_python-yapsnmp is not set ++# CONFIG_PACKAGE_python2-chardet is not set ++# CONFIG_PACKAGE_pyusb is not set ++# CONFIG_PACKAGE_pyxdg is not set ++# CONFIG_PACKAGE_pyyaml is not set ++# CONFIG_PACKAGE_simplejson is not set ++# CONFIG_PACKAGE_telepathy-python is not set ++# CONFIG_PACKAGE_twisted is not set ++# CONFIG_PACKAGE_zope-interface is not set ++ ++# ++# Ruby ++# ++# CONFIG_PACKAGE_ruby is not set ++# CONFIG_PACKAGE_4th is not set ++# CONFIG_PACKAGE_eggdrop is not set ++# CONFIG_PACKAGE_libgupnp-vala is not set ++# CONFIG_PACKAGE_sigscheme is not set ++# CONFIG_PACKAGE_slsh is not set ++# CONFIG_PACKAGE_tcl is not set ++# CONFIG_PACKAGE_vala is not set diff --git a/master/endstop b/master/endstop new file mode 100644 index 0000000..8c9db8d --- /dev/null +++ b/master/endstop @@ -0,0 +1,2510 @@ +diff --git a/.config b/.config +index c633d20..65a8c38 100644 +--- a/.config ++++ b/.config +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # OpenWrt version: Barrier Breaker (r36060) +-# Sat Mar 23 05:43:05 2013 ++# Sun May 12 00:29:53 2013 + # + CONFIG_HAVE_DOT_CONFIG=y + # CONFIG_TARGET_ppc40x is not set +@@ -1012,9 +1012,10 @@ CONFIG_BUSYBOX_CONFIG_HWCLOCK=y + # CONFIG_BUSYBOX_CONFIG_IPCS is not set + # CONFIG_BUSYBOX_CONFIG_LOSETUP is not set + # CONFIG_BUSYBOX_CONFIG_LSPCI is not set +-# CONFIG_BUSYBOX_CONFIG_LSUSB is not set ++CONFIG_BUSYBOX_CONFIG_LSUSB=y + # CONFIG_BUSYBOX_CONFIG_MDEV is not set +-# CONFIG_BUSYBOX_CONFIG_MKSWAP is not set ++CONFIG_BUSYBOX_CONFIG_MKSWAP=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID=y + # CONFIG_BUSYBOX_CONFIG_MORE is not set + CONFIG_BUSYBOX_CONFIG_MOUNT=y + # CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE is not set +@@ -1033,7 +1034,8 @@ CONFIG_BUSYBOX_CONFIG_PIVOT_ROOT=y + # CONFIG_BUSYBOX_CONFIG_SCRIPT is not set + # CONFIG_BUSYBOX_CONFIG_SCRIPTREPLAY is not set + # CONFIG_BUSYBOX_CONFIG_SETARCH is not set +-# CONFIG_BUSYBOX_CONFIG_SWAPONOFF is not set ++CONFIG_BUSYBOX_CONFIG_SWAPONOFF=y ++CONFIG_BUSYBOX_CONFIG_FEATURE_SWAPON_PRI=y + CONFIG_BUSYBOX_CONFIG_SWITCH_ROOT=y + CONFIG_BUSYBOX_CONFIG_UMOUNT=y + CONFIG_BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL=y +@@ -1319,7 +1321,7 @@ CONFIG_PACKAGE_libgcc=y + CONFIG_PACKAGE_libpthread=y + CONFIG_PACKAGE_librt=y + # CONFIG_PACKAGE_libstdcpp is not set +-# CONFIG_PACKAGE_libthread-db is not set ++CONFIG_PACKAGE_libthread-db=m + # CONFIG_PACKAGE_mksh is not set + CONFIG_PACKAGE_mtd=y + CONFIG_PACKAGE_netifd=y +@@ -1332,7 +1334,28 @@ CONFIG_PACKAGE_procd=y + # CONFIG_PACKAGE_sflowovsd is not set + CONFIG_PACKAGE_swconfig=y + CONFIG_PACKAGE_uci=y +-# CONFIG_PACKAGE_udev is not set ++CONFIG_PACKAGE_udev=y ++ ++# ++# Configuration ++# ++# CONFIG_UDEV_DISABLE_LOGGING is not set ++# CONFIG_UDEV_ENABLE_DEBUG is not set ++CONFIG_UDEV_EXTRA_accelerometer=y ++CONFIG_UDEV_EXTRA_ata_id=y ++CONFIG_UDEV_EXTRA_cdrom_id=y ++# CONFIG_UDEV_EXTRA_collect is not set ++# CONFIG_UDEV_EXTRA_edd_id is not set ++# CONFIG_UDEV_EXTRA_firmware is not set ++# CONFIG_UDEV_EXTRA_floppy is not set ++CONFIG_UDEV_EXTRA_input_id=y ++CONFIG_UDEV_EXTRA_mtd_probe=y ++CONFIG_UDEV_EXTRA_path_id=y ++# CONFIG_UDEV_EXTRA_qemu is not set ++CONFIG_UDEV_EXTRA_rule_generator=y ++CONFIG_UDEV_EXTRA_scsi_id=y ++CONFIG_UDEV_EXTRA_usb_id=y ++CONFIG_UDEV_EXTRA_v4l_id=y + CONFIG_PACKAGE_wireless-tools=y + # CONFIG_PACKAGE_zram-swap is not set + +@@ -2416,7 +2439,7 @@ CONFIG_PACKAGE_iodine=m + # CONFIG_PACKAGE_howl-nifd is not set + # CONFIG_PACKAGE_howl-utils is not set + # CONFIG_PACKAGE_ipupdate is not set +-# CONFIG_PACKAGE_isc-dhcp-client-ipv4 is not set ++CONFIG_PACKAGE_isc-dhcp-client-ipv4=m + # CONFIG_PACKAGE_isc-dhcp-client-ipv6 is not set + # CONFIG_PACKAGE_isc-dhcp-omshell-ipv4 is not set + # CONFIG_PACKAGE_isc-dhcp-omshell-ipv6 is not set +@@ -2894,7 +2917,6 @@ CONFIG_PACKAGE_uhttpd-mod-ubus=y + # CONFIG_PACKAGE_cdp-tools is not set + CONFIG_PACKAGE_chat=y + # CONFIG_PACKAGE_cifsmount is not set +-# CONFIG_PACKAGE_crda is not set + # CONFIG_PACKAGE_daemonlogger is not set + # CONFIG_PACKAGE_darkstat is not set + # CONFIG_PACKAGE_ditg is not set +@@ -3076,15 +3098,17 @@ CONFIG_PACKAGE_tcpdump=y + # CONFIG_PACKAGE_wiviz is not set + # CONFIG_PACKAGE_wol is not set + # CONFIG_PACKAGE_wpa-cli is not set +-# CONFIG_PACKAGE_wpa-supplicant is not set +-# CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK is not set ++CONFIG_PACKAGE_wpa-supplicant=y ++CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK=y ++# CONFIG_WPA_SUPPLICANT_INTERNAL is not set ++CONFIG_WPA_SUPPLICANT_OPENSSL=y + # CONFIG_WPA_RFKILL_SUPPORT is not set + CONFIG_WPA_MSG_MIN_PRIORITY=3 + # CONFIG_DRIVER_WEXT_SUPPORT is not set + CONFIG_DRIVER_11N_SUPPORT=y + # CONFIG_PACKAGE_wpa-supplicant-mini is not set +-# CONFIG_PACKAGE_wpad is not set +-CONFIG_PACKAGE_wpad-mini=y ++CONFIG_PACKAGE_wpad=y ++# CONFIG_PACKAGE_wpad-mini is not set + # CONFIG_PACKAGE_wprobe-export is not set + # CONFIG_PACKAGE_wprobe-util is not set + # CONFIG_PACKAGE_wshaper is not set +@@ -3194,7 +3218,7 @@ CONFIG_PACKAGE_bluez-libs=m + # CONFIG_PACKAGE_ftplib is not set + # CONFIG_PACKAGE_giflib is not set + # CONFIG_PACKAGE_glib1 is not set +-CONFIG_PACKAGE_glib2=m ++CONFIG_PACKAGE_glib2=y + # CONFIG_PACKAGE_glibmm is not set + # CONFIG_PACKAGE_id3lib is not set + # CONFIG_PACKAGE_jansson is not set +@@ -3233,7 +3257,7 @@ CONFIG_PACKAGE_libcurl=m + # CONFIG_PACKAGE_libdb47 is not set + # CONFIG_PACKAGE_libdb47xx is not set + # CONFIG_PACKAGE_libdbi is not set +-CONFIG_PACKAGE_libdbus=m ++CONFIG_PACKAGE_libdbus=y + CONFIG_PACKAGE_libdbus-glib=m + # CONFIG_PACKAGE_libdevmapper is not set + # CONFIG_PACKAGE_libdmapsharing is not set +@@ -3249,12 +3273,12 @@ CONFIG_PACKAGE_libdbus-glib=m + # CONFIG_PACKAGE_libevent2-pthreads is not set + # CONFIG_PACKAGE_libeventlog is not set + # CONFIG_PACKAGE_libexif is not set +-CONFIG_PACKAGE_libexpat=m ++CONFIG_PACKAGE_libexpat=y + # CONFIG_PACKAGE_libexslt is not set + # CONFIG_PACKAGE_libezxml is not set + # CONFIG_PACKAGE_libfaad2 is not set + # CONFIG_PACKAGE_libfaifa is not set +-CONFIG_PACKAGE_libffi=m ++CONFIG_PACKAGE_libffi=y + # CONFIG_PACKAGE_libffmpeg-full is not set + # CONFIG_PACKAGE_libffmpeg-mini is not set + # CONFIG_PACKAGE_libflac is not set +@@ -3412,8 +3436,8 @@ CONFIG_PACKAGE_libuci-lua=y + # CONFIG_PACKAGE_libunbound is not set + # CONFIG_PACKAGE_libupnp is not set + # CONFIG_PACKAGE_liburcu is not set +-# CONFIG_PACKAGE_libusb-1.0 is not set +-# CONFIG_PACKAGE_libusb-compat is not set ++CONFIG_PACKAGE_libusb-1.0=y ++CONFIG_PACKAGE_libusb-compat=y + # CONFIG_PACKAGE_libusbmuxd is not set + CONFIG_PACKAGE_libustream-cyassl=y + CONFIG_PACKAGE_libustream-openssl=y +@@ -3811,7 +3835,7 @@ CONFIG_PACKAGE_comgt=y + # CONFIG_PACKAGE_crypto-tools is not set + # CONFIG_PACKAGE_cryptsetup is not set + # CONFIG_PACKAGE_daemontools is not set +-CONFIG_PACKAGE_dbus=m ++CONFIG_PACKAGE_dbus=y + CONFIG_PACKAGE_dbus-utils=m + # CONFIG_PACKAGE_devmem2 is not set + # CONFIG_PACKAGE_dfu-util is not set +@@ -3962,23 +3986,9 @@ CONFIG_PACKAGE_shadow-su=m + # CONFIG_PACKAGE_spidev-test is not set + # CONFIG_PACKAGE_ssldump is not set + # CONFIG_PACKAGE_stm32flash is not set +-# CONFIG_PACKAGE_strace is not set ++CONFIG_PACKAGE_strace=y + # CONFIG_PACKAGE_stress is not set + # CONFIG_PACKAGE_sysstat is not set +-CONFIG_PACKAGE_systemd-udev=m +- +-# +-# Configuration +-# +-# CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV is not set +-# CONFIG_SYSTEMD_UDEV_EXTRA_ata_id is not set +-CONFIG_SYSTEMD_UDEV_EXTRA_cdrom_id=y +-# CONFIG_SYSTEMD_UDEV_EXTRA_collect is not set +-CONFIG_SYSTEMD_UDEV_EXTRA_scsi_id=y +-# CONFIG_SYSTEMD_UDEV_EXTRA_v4l_id is not set +-# CONFIG_SYSTEMD_UDEV_EXTRA_accelerometer is not set +-CONFIG_SYSTEMD_UDEV_EXTRA_mtd_probe=y +-# CONFIG_SYSTEMD_UDEV_EXTRA_qemu is not set + # CONFIG_PACKAGE_tar is not set + # CONFIG_PACKAGE_taskwarrior is not set + # CONFIG_PACKAGE_tcpser is not set +@@ -3991,7 +4001,8 @@ CONFIG_SYSTEMD_UDEV_EXTRA_mtd_probe=y + CONFIG_PACKAGE_uboot-envtools=y + # CONFIG_PACKAGE_uboot-envtools-mmc is not set + # CONFIG_PACKAGE_upx is not set +-# CONFIG_PACKAGE_usb-modeswitch is not set ++CONFIG_PACKAGE_usb-modeswitch=y ++CONFIG_PACKAGE_usb-modeswitch-data=y + # CONFIG_PACKAGE_usbmuxd is not set + # CONFIG_PACKAGE_usbreset is not set + # CONFIG_PACKAGE_usbutils is not set +@@ -4044,7 +4055,7 @@ CONFIG_PACKAGE_uboot-envtools=y + # CONFIG_PACKAGE_binutils is not set + # CONFIG_PACKAGE_cppunit is not set + # CONFIG_PACKAGE_diffutils is not set +-# CONFIG_PACKAGE_gdb is not set ++CONFIG_PACKAGE_gdb=m + # CONFIG_PACKAGE_gdbserver is not set + # CONFIG_PACKAGE_lttng-tools is not set + # CONFIG_PACKAGE_make is not set +diff --git a/feeds/packages/libs/dbus-glib/patches/dont-segv-on-null-object-path.patch b/feeds/packages/libs/dbus-glib/patches/dont-segv-on-null-object-path.patch +new file mode 100644 +index 0000000..02cc604 +--- /dev/null ++++ b/feeds/packages/libs/dbus-glib/patches/dont-segv-on-null-object-path.patch +@@ -0,0 +1,15 @@ ++Index: dbus-glib-0.94/dbus/dbus-gvalue.c ++=================================================================== ++--- dbus-glib-0.94.orig/dbus/dbus-gvalue.c +++++ dbus-glib-0.94/dbus/dbus-gvalue.c ++@@ -1593,6 +1593,10 @@ marshal_object (DBusMessageIter ++ g_return_val_if_fail (G_IS_OBJECT (obj), FALSE); ++ ++ path = _dbus_gobject_get_path (obj); +++ if (!path) { +++ g_warning ("Cannot marshal NULL object path of object %p",obj); +++ return FALSE; +++ } ++ g_return_val_if_fail (g_variant_is_object_path (path), FALSE); ++ ++ if (!dbus_message_iter_append_basic (iter, +diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile +index 16db2d8..7b10ed5 100644 +--- a/package/network/services/hostapd/Makefile ++++ b/package/network/services/hostapd/Makefile +@@ -86,7 +86,7 @@ ifneq ($(LOCAL_TYPE),hostapd) + CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) + endif + +-DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!TARGET_avr32||BROKEN) ++DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!TARGET_avr32||BROKEN) +dbus + + define Package/hostapd/Default + SECTION:=net +@@ -163,7 +163,7 @@ define Package/wpa-supplicant + CATEGORY:=Network + TITLE:=WPA Supplicant + URL:=http://hostap.epitest.fi/wpa_supplicant/ +- DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl ++ DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl + VARIANT:=supplicant-full + endef + +@@ -230,6 +230,9 @@ ifdef CONFIG_PACKAGE_kmod-mac80211 + TARGET_LDFLAGS += -lm -lnl-tiny + endif + ++TARGET_LDFLAGS += -ldbus-1 ++DEPENDS += ++ + define Build/RunMake + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \ +diff --git a/package/network/services/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config +index f5abbad..28a0ae9 100644 +--- a/package/network/services/hostapd/files/wpa_supplicant-full.config ++++ b/package/network/services/hostapd/files/wpa_supplicant-full.config +@@ -346,7 +346,7 @@ CONFIG_INTERNAL_LIBTOMMATH_FAST=y + + # Add support for new DBus control interface + # (fi.w1.hostap.wpa_supplicant1) +-#CONFIG_CTRL_IFACE_DBUS_NEW=y ++CONFIG_CTRL_IFACE_DBUS_NEW=y + + # Add introspection support for new DBus control interface + #CONFIG_CTRL_IFACE_DBUS_INTRO=y +diff --git a/package/network/utils/modemmanager/Makefile b/package/network/utils/modemmanager/Makefile +new file mode 100644 +index 0000000..df05f2f +--- /dev/null ++++ b/package/network/utils/modemmanager/Makefile +@@ -0,0 +1,103 @@ ++# ++# 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:=modemmanager ++PKG_VERSION:=2013-02-13 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://anongit.freedesktop.org/ModemManager/ModemManager ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=c1ef36b860931d32bd216af85d143b061913f2ce ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/modemmanager ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=ModemManager ++ URL:=http://cgit.freedesktop.org/ModemManager/ModemManager ++ DEPENDS:= \ ++ +udev \ ++ +glib2 \ ++ +libqmi \ ++ +dbus \ ++ +kmod-usb-net-cdc-ncm \ ++ +kmod-usb-net-hso \ ++ +kmod-usb-net-rndis \ ++ +kmod-usb-net-sierrawireless \ ++ +kmod-usb-acm \ ++ +kmod-usb-serial-option \ ++ +kmod-usb-serial-qualcomm \ ++ +kmod-usb-serial-sierrawireless \ ++ +kmod-usb-serial-option \ ++ +kmod-usb-serial-wwan ++endef ++ ++define Package/modemmanager/description ++ ModemManager is a DBus-activated service which allows controlling mobile ++ broadband modems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --prefix=/usr \ ++ --sysconfdir=/etc \ ++ --localstatedir=/var \ ++ --without-docs \ ++ --without-tests \ ++ --without-polkit \ ++ --without-qmi ++ ++ ++ ++define autoreconf_target ++ ( cd "$(PKG_BUILD_DIR)"; ./autogen.sh ); \ ++ $(strip $(call autoreconf, \ ++ $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \ ++ $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \ ++ $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS))) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/ModemManager ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ModemManager/*.h $(1)/usr/include/ModemManager ++ $(INSTALL_DIR) $(1)/usr/include/libmm-glib ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libmm-glib/*.h $(1)/usr/include/libmm-glib ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so* $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ModemManager.pc $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mm-glib.pc $(1)/usr/lib/pkgconfig ++endef ++ ++define Package/modemmanager/install ++ $(INSTALL_DIR) $(1)/lib/udev/rules.d ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/udev/rules.d/*.rules $(1)/lib/udev/rules.d ++ ++ $(INSTALL_DIR) $(1)/etc/dbus-1/system.d/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/*.conf $(1)/etc/dbus-1/system.d/ ++ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmm-glib.so* $(1)/usr/lib ++ ++ $(INSTALL_DIR) $(1)/usr/lib/ModemManager ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-plugin-*.so* $(1)/usr/lib/ModemManager ++endef ++ ++$(eval $(call BuildPackage,modemmanager)) +diff --git a/package/network/utils/modemmanager/patches/001-qmi-has-no-primary.patch b/package/network/utils/modemmanager/patches/001-qmi-has-no-primary.patch +new file mode 100644 +index 0000000..6baae13 +--- /dev/null ++++ b/package/network/utils/modemmanager/patches/001-qmi-has-no-primary.patch +@@ -0,0 +1,25 @@ ++Index: modemmanager-2013-02-13/src/mm-base-modem.c ++=================================================================== ++--- modemmanager-2013-02-13.orig/src/mm-base-modem.c +++++ modemmanager-2013-02-13/src/mm-base-modem.c ++@@ -1014,7 +1014,8 @@ mm_base_modem_organize_ports (MMBaseMode ++ #endif ++ ++ /* We keep new refs to the objects here */ ++- self->priv->primary = g_object_ref (primary); +++ // JMM - qmi has primary == NULL here, can't g_object_ref that +++ self->priv->primary = primary ? g_object_ref (primary) : NULL; ++ self->priv->secondary = (secondary ? g_object_ref (secondary) : NULL); ++ self->priv->qcdm = (qcdm ? g_object_ref (qcdm) : NULL); ++ self->priv->gps_control = (gps_control ? g_object_ref (gps_control) : NULL); ++@@ -1301,7 +1302,9 @@ dispose (GObject *object) ++ g_cancellable_cancel (self->priv->cancellable); ++ g_clear_object (&self->priv->cancellable); ++ ++- g_clear_object (&self->priv->primary); +++ // JMM - primary is NULL for qmi +++ if (self->priv->primary) +++ g_clear_object (&self->priv->primary); ++ g_clear_object (&self->priv->secondary); ++ g_list_free_full (self->priv->data, g_object_unref); ++ self->priv->data = NULL; +diff --git a/package/network/utils/modemmanager/patches/002-qmi-pin-status.patch b/package/network/utils/modemmanager/patches/002-qmi-pin-status.patch +new file mode 100644 +index 0000000..fc8ece9 +--- /dev/null ++++ b/package/network/utils/modemmanager/patches/002-qmi-pin-status.patch +@@ -0,0 +1,21 @@ ++Index: modemmanager-2013-02-13/src/mm-broadband-modem-qmi.c ++=================================================================== ++--- modemmanager-2013-02-13.orig/src/mm-broadband-modem-qmi.c +++++ modemmanager-2013-02-13/src/mm-broadband-modem-qmi.c ++@@ -1141,6 +1141,8 @@ dms_uim_get_pin_status_ready (QmiClientD ++ NULL)) ++ lock = mm_modem_lock_from_qmi_uim_pin_status (current_status, TRUE); ++ +++#if 0 +++ // JMM - pin2 does not need to be provisioned or unlocked for the modem to work ++ if (lock == MM_MODEM_LOCK_NONE && ++ qmi_message_dms_uim_get_pin_status_output_get_pin2_status ( ++ output, ++@@ -1149,6 +1151,7 @@ dms_uim_get_pin_status_ready (QmiClientD ++ NULL, /* unblock_retries_left */ ++ NULL)) ++ lock = mm_modem_lock_from_qmi_uim_pin_status (current_status, FALSE); +++#endif ++ ++ g_simple_async_result_set_op_res_gpointer (simple, GUINT_TO_POINTER (lock), NULL); ++ } +diff --git a/package/network/utils/network-manager/0.9.6.4-fixes/libnl-ifr-collision.patch b/package/network/utils/network-manager/0.9.6.4-fixes/libnl-ifr-collision.patch +new file mode 100644 +index 0000000..4058528 +--- /dev/null ++++ b/package/network/utils/network-manager/0.9.6.4-fixes/libnl-ifr-collision.patch +@@ -0,0 +1,104 @@ ++Index: NetworkManager-0.9.6.4/src/nm-device-ethernet.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/nm-device-ethernet.c +++++ NetworkManager-0.9.6.4/src/nm-device-ethernet.c ++@@ -29,7 +29,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ ++Index: NetworkManager-0.9.6.4/src/nm-device-olpc-mesh.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/nm-device-olpc-mesh.c +++++ NetworkManager-0.9.6.4/src/nm-device-olpc-mesh.c ++@@ -36,7 +36,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ ++Index: NetworkManager-0.9.6.4/src/nm-device-wired.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/nm-device-wired.c +++++ NetworkManager-0.9.6.4/src/nm-device-wired.c ++@@ -22,7 +22,7 @@ ++ #include "config.h" ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ #include ++Index: NetworkManager-0.9.6.4/src/nm-device.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/nm-device.c +++++ NetworkManager-0.9.6.4/src/nm-device.c ++@@ -35,7 +35,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ ++ #include "nm-glib-compat.h" ++ #include "nm-device.h" ++Index: NetworkManager-0.9.6.4/src/nm-system.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/nm-system.c +++++ NetworkManager-0.9.6.4/src/nm-system.c ++@@ -41,7 +41,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ #include ++Index: NetworkManager-0.9.6.4/src/ppp-manager/nm-ppp-manager.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/ppp-manager/nm-ppp-manager.c +++++ NetworkManager-0.9.6.4/src/ppp-manager/nm-ppp-manager.c ++@@ -32,7 +32,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ #include ++Index: NetworkManager-0.9.6.4/src/wifi/wifi-utils-wext.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/wifi/wifi-utils-wext.c +++++ NetworkManager-0.9.6.4/src/wifi/wifi-utils-wext.c ++@@ -41,7 +41,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ ++Index: NetworkManager-0.9.6.4/src/wimax/nm-device-wimax.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/wimax/nm-device-wimax.c +++++ NetworkManager-0.9.6.4/src/wimax/nm-device-wimax.c ++@@ -24,7 +24,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ #include +diff --git a/package/network/utils/network-manager/0.9.6.4-fixes/no-crashdump.patch b/package/network/utils/network-manager/0.9.6.4-fixes/no-crashdump.patch +new file mode 100644 +index 0000000..b65d9a4 +--- /dev/null ++++ b/package/network/utils/network-manager/0.9.6.4-fixes/no-crashdump.patch +@@ -0,0 +1,12 @@ ++Index: NetworkManager-0.9.6.4/src/logging/nm-logging.c ++=================================================================== ++--- NetworkManager-0.9.6.4.orig/src/logging/nm-logging.c +++++ NetworkManager-0.9.6.4/src/logging/nm-logging.c ++@@ -32,6 +32,7 @@ ++ #include ++ #include ++ +++#undef ENABLE_CRASHTRACE ++ #ifdef ENABLE_CRASHTRACE ++ #include ++ #endif +diff --git a/package/network/utils/network-manager/0.9.6.4-fixes/series b/package/network/utils/network-manager/0.9.6.4-fixes/series +new file mode 100644 +index 0000000..3f53eae +--- /dev/null ++++ b/package/network/utils/network-manager/0.9.6.4-fixes/series +@@ -0,0 +1,2 @@ ++libnl-ifr-collision.patch ++no-crashdump.patch +diff --git a/package/network/utils/network-manager/001-no-test-no-examples.patch b/package/network/utils/network-manager/001-no-test-no-examples.patch +new file mode 100644 +index 0000000..1aa40e3 +--- /dev/null ++++ b/package/network/utils/network-manager/001-no-test-no-examples.patch +@@ -0,0 +1,32 @@ ++Index: NetworkManager-0.9.8.0/Makefile.in ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/Makefile.in +++++ NetworkManager-0.9.8.0/Makefile.in ++@@ -440,11 +440,9 @@ SUBDIRS = \ ++ tools \ ++ policy \ ++ data \ ++- test \ ++ po \ ++ man \ ++ docs \ ++- examples \ ++ vapi ++ ++ EXTRA_DIST = \ ++Index: NetworkManager-0.9.8.0/Makefile.am ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/Makefile.am +++++ NetworkManager-0.9.8.0/Makefile.am ++@@ -11,11 +11,9 @@ SUBDIRS = \ ++ tools \ ++ policy \ ++ data \ ++- test \ ++ po \ ++ man \ ++ docs \ ++- examples \ ++ vapi ++ ++ EXTRA_DIST = \ +diff --git a/package/network/utils/network-manager/999-1-assorted-fixes.patch b/package/network/utils/network-manager/999-1-assorted-fixes.patch +new file mode 100644 +index 0000000..5919cef +--- /dev/null ++++ b/package/network/utils/network-manager/999-1-assorted-fixes.patch +@@ -0,0 +1,59 @@ ++Index: NetworkManager-0.9.8.0/src/nm-device-ethernet.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-device-ethernet.c +++++ NetworkManager-0.9.8.0/src/nm-device-ethernet.c ++@@ -431,21 +431,16 @@ update_permanent_hw_address (NMDevice *d ++ memset (&req, 0, sizeof (struct ifreq)); ++ strncpy (req.ifr_name, nm_device_get_iface (dev), IFNAMSIZ); ++ ++- epaddr = g_malloc0 (sizeof (struct ethtool_perm_addr) + ETH_ALEN); ++- epaddr->cmd = ETHTOOL_GPERMADDR; ++- epaddr->size = ETH_ALEN; ++- req.ifr_data = (void *) epaddr; +++ ret = ioctl (fd, SIOCGIFHWADDR, &req); ++ ++- errno = 0; ++- ret = ioctl (fd, SIOCETHTOOL, &req); ++- if ((ret < 0) || !nm_ethernet_address_is_valid ((struct ether_addr *) epaddr->data)) { +++ if ((ret < 0) || !nm_ethernet_address_is_valid ((struct ether_addr *) req.ifr_hwaddr.sa_data)) { ++ nm_log_err (LOGD_HW | LOGD_ETHER, "(%s): unable to read permanent MAC address (error %d)", ++ nm_device_get_iface (dev), errno); ++ /* Fall back to current address */ ++- memcpy (epaddr->data, priv->hw_addr, ETH_ALEN); +++ memcpy (req.ifr_hwaddr.sa_data, priv->hw_addr, ETH_ALEN); ++ } ++ ++- if (memcmp (&priv->perm_hw_addr, epaddr->data, ETH_ALEN)) { +++ if (memcmp (&priv->perm_hw_addr, req.ifr_hwaddr.sa_data, ETH_ALEN)) { ++ memcpy (&priv->perm_hw_addr, epaddr->data, ETH_ALEN); ++ g_object_notify (G_OBJECT (dev), NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS); ++ } ++Index: NetworkManager-0.9.8.0/src/nm-manager.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-manager.c +++++ NetworkManager-0.9.8.0/src/nm-manager.c ++@@ -2227,6 +2227,9 @@ udev_device_added_cb (NMUdevManager *ude ++ g_return_if_fail (sysfs_path != NULL); ++ g_return_if_fail (driver != NULL); ++ +++ //g_return_if_fail (strcmp(iface, "eth0")); +++ //g_return_if_fail (strcmp(iface, "wlan0")); +++ ++ /* Most devices will have an ifindex here */ ++ if (ifindex > 0) { ++ device = find_device_by_ifindex (self, ifindex); ++Index: NetworkManager-0.9.8.0/src/settings/nm-settings.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/settings/nm-settings.c +++++ NetworkManager-0.9.8.0/src/settings/nm-settings.c ++@@ -880,8 +880,10 @@ claim_connection (NMSettings *self, ++ g_signal_emit (self, signals[CONNECTION_ADDED], 0, connection); ++ g_signal_emit_by_name (self, NM_CP_SIGNAL_CONNECTION_ADDED, connection); ++ +++#if 1 // I segfault ++ /* Exported D-Bus signal */ ++ g_signal_emit (self, signals[NEW_CONNECTION], 0, connection); +++#endif ++ } ++ } ++ +diff --git a/package/network/utils/network-manager/Makefile b/package/network/utils/network-manager/Makefile +index 463658a..fc6bf66 100644 +--- a/package/network/utils/network-manager/Makefile ++++ b/package/network/utils/network-manager/Makefile +@@ -31,7 +31,7 @@ define Package/network-manager + SUBMENU:=app + TITLE:=Network Manager + URL:=http://network-manager.sourceforge.net/ +- DEPENDS:=+wireless-tools +hal +libnl +libgcrypt +libiw +libuuid +libgnutls +dbus +glib2 +libnl3 +libpthread +librt +libdbus-glib +modemmanager +systemd ++ DEPENDS:=+wireless-tools +libnl +libgcrypt +libiw +libuuid +libgnutls +dbus +glib2 +libnl3 +libpthread +librt +libdbus-glib +modemmanager + endef + + SITE_VARS+= enable_ifcfg_rh=no +diff --git a/package/network/utils/network-manager/patches/999-0-use-linux-if-not-libnl.patch b/package/network/utils/network-manager/patches/999-0-use-linux-if-not-libnl.patch +new file mode 100644 +index 0000000..2896f14 +--- /dev/null ++++ b/package/network/utils/network-manager/patches/999-0-use-linux-if-not-libnl.patch +@@ -0,0 +1,130 @@ ++Index: NetworkManager-0.9.8.0/src/nm-device-ethernet.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-device-ethernet.c +++++ NetworkManager-0.9.8.0/src/nm-device-ethernet.c ++@@ -29,7 +29,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ ++Index: NetworkManager-0.9.8.0/src/nm-device-olpc-mesh.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-device-olpc-mesh.c +++++ NetworkManager-0.9.8.0/src/nm-device-olpc-mesh.c ++@@ -36,7 +36,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ ++Index: NetworkManager-0.9.8.0/src/nm-device-vlan.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-device-vlan.c +++++ NetworkManager-0.9.8.0/src/nm-device-vlan.c ++@@ -24,7 +24,7 @@ ++ #include ++ ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ #include "nm-device-vlan.h" ++Index: NetworkManager-0.9.8.0/src/nm-device-wired.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-device-wired.c +++++ NetworkManager-0.9.8.0/src/nm-device-wired.c ++@@ -22,7 +22,7 @@ ++ #include "config.h" ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ #include ++Index: NetworkManager-0.9.8.0/src/nm-device.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-device.c +++++ NetworkManager-0.9.8.0/src/nm-device.c ++@@ -35,7 +35,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ ++ #include "nm-glib-compat.h" ++ #include "nm-device.h" ++Index: NetworkManager-0.9.8.0/src/nm-system.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/nm-system.c +++++ NetworkManager-0.9.8.0/src/nm-system.c ++@@ -40,7 +40,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ #include ++ #include ++Index: NetworkManager-0.9.8.0/src/ppp-manager/nm-ppp-manager.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/ppp-manager/nm-ppp-manager.c +++++ NetworkManager-0.9.8.0/src/ppp-manager/nm-ppp-manager.c ++@@ -32,7 +32,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ #include ++Index: NetworkManager-0.9.8.0/src/wifi/wifi-utils-wext.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/wifi/wifi-utils-wext.c +++++ NetworkManager-0.9.8.0/src/wifi/wifi-utils-wext.c ++@@ -41,7 +41,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ ++Index: NetworkManager-0.9.8.0/src/wimax/iwmxsdk.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/wimax/iwmxsdk.c +++++ NetworkManager-0.9.8.0/src/wimax/iwmxsdk.c ++@@ -28,7 +28,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ ++ #include ++ ++Index: NetworkManager-0.9.8.0/src/wimax/nm-device-wimax.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/wimax/nm-device-wimax.c +++++ NetworkManager-0.9.8.0/src/wimax/nm-device-wimax.c ++@@ -24,7 +24,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include <../include/linux/if.h> ++ #include ++ ++ #include +diff --git a/package/network/utils/network-manager/patches/999-2-move-resolv-conf.patch b/package/network/utils/network-manager/patches/999-2-move-resolv-conf.patch +new file mode 100644 +index 0000000..1af8469 +--- /dev/null ++++ b/package/network/utils/network-manager/patches/999-2-move-resolv-conf.patch +@@ -0,0 +1,13 @@ ++Index: NetworkManager-0.9.8.0/src/dns-manager/nm-dns-manager.c ++=================================================================== ++--- NetworkManager-0.9.8.0.orig/src/dns-manager/nm-dns-manager.c +++++ NetworkManager-0.9.8.0/src/dns-manager/nm-dns-manager.c ++@@ -47,7 +47,7 @@ ++ #include "nm-dns-dnsmasq.h" ++ ++ #ifndef RESOLV_CONF ++-#define RESOLV_CONF "/etc/resolv.conf" +++#define RESOLV_CONF "/tmp/resolv.conf.nm" ++ #endif ++ ++ G_DEFINE_TYPE(NMDnsManager, nm_dns_manager, G_TYPE_OBJECT) +diff --git a/package/network/utils/network-manager/patches/999-use-linux-if-not-libnl.patch b/package/network/utils/network-manager/patches/999-use-linux-if-not-libnl.patch +deleted file mode 100644 +index 2896f14..0000000 +--- a/package/network/utils/network-manager/patches/999-use-linux-if-not-libnl.patch ++++ /dev/null +@@ -1,130 +0,0 @@ +-Index: NetworkManager-0.9.8.0/src/nm-device-ethernet.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/nm-device-ethernet.c +-+++ NetworkManager-0.9.8.0/src/nm-device-ethernet.c +-@@ -29,7 +29,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- #include +- +-Index: NetworkManager-0.9.8.0/src/nm-device-olpc-mesh.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/nm-device-olpc-mesh.c +-+++ NetworkManager-0.9.8.0/src/nm-device-olpc-mesh.c +-@@ -36,7 +36,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- #include +- +-Index: NetworkManager-0.9.8.0/src/nm-device-vlan.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/nm-device-vlan.c +-+++ NetworkManager-0.9.8.0/src/nm-device-vlan.c +-@@ -24,7 +24,7 @@ +- #include +- +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- +- #include "nm-device-vlan.h" +-Index: NetworkManager-0.9.8.0/src/nm-device-wired.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/nm-device-wired.c +-+++ NetworkManager-0.9.8.0/src/nm-device-wired.c +-@@ -22,7 +22,7 @@ +- #include "config.h" +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- #include +- #include +-Index: NetworkManager-0.9.8.0/src/nm-device.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/nm-device.c +-+++ NetworkManager-0.9.8.0/src/nm-device.c +-@@ -35,7 +35,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- +- #include "nm-glib-compat.h" +- #include "nm-device.h" +-Index: NetworkManager-0.9.8.0/src/nm-system.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/nm-system.c +-+++ NetworkManager-0.9.8.0/src/nm-system.c +-@@ -40,7 +40,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- #include +- #include +-Index: NetworkManager-0.9.8.0/src/ppp-manager/nm-ppp-manager.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/ppp-manager/nm-ppp-manager.c +-+++ NetworkManager-0.9.8.0/src/ppp-manager/nm-ppp-manager.c +-@@ -32,7 +32,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- +- #include +-Index: NetworkManager-0.9.8.0/src/wifi/wifi-utils-wext.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/wifi/wifi-utils-wext.c +-+++ NetworkManager-0.9.8.0/src/wifi/wifi-utils-wext.c +-@@ -41,7 +41,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- +- +-Index: NetworkManager-0.9.8.0/src/wimax/iwmxsdk.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/wimax/iwmxsdk.c +-+++ NetworkManager-0.9.8.0/src/wimax/iwmxsdk.c +-@@ -28,7 +28,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- +- #include +- +-Index: NetworkManager-0.9.8.0/src/wimax/nm-device-wimax.c +-=================================================================== +---- NetworkManager-0.9.8.0.orig/src/wimax/nm-device-wimax.c +-+++ NetworkManager-0.9.8.0/src/wimax/nm-device-wimax.c +-@@ -24,7 +24,7 @@ +- #include +- #include +- #include +--#include +-+#include <../include/linux/if.h> +- #include +- +- #include +diff --git a/package/systemd-udev/Config.in b/package/systemd-udev/Config.in +deleted file mode 100644 +index dcc2908..0000000 +--- a/package/systemd-udev/Config.in ++++ /dev/null +@@ -1,64 +0,0 @@ +-# systemd-udev package config +- +-menu "Configuration" +- depends on PACKAGE_systemd-udev +- +-config SYSTEMD_UDEV_DISABLE_GUDEV +- bool "Disable libgudev" +- default n +- help +- Disable compilation of libgudev +- +-config SYSTEMD_UDEV_EXTRA_ata_id +- bool "Install udev ata_id callout" +- default y +- help +- ata_id - udev callout to read product/serial number +- from ATA drives +- +-config SYSTEMD_UDEV_EXTRA_cdrom_id +- bool "Install udev cdrom_id callout" +- default y +- help +- cdrom_id - udev callout to determine the capabilities +- of optical drives and media +- +-config SYSTEMD_UDEV_EXTRA_collect +- bool "Install udev collect" +- default n +- help +- Adds ID to the list governed by +- +-config SYSTEMD_UDEV_EXTRA_scsi_id +- bool "Install udev scsi_id callout" +- default y +- help +- scsi_id - retrieve and generate a unique SCSI identifier +- +-config SYSTEMD_UDEV_EXTRA_v4l_id +- bool "Install udev v4l_id callout" +- default y +- help +- v4l_id - udev callout to identify Video4Linux devices +- +-config SYSTEMD_UDEV_EXTRA_accelerometer +- bool "Install udev accelerometer callout" +- default y +- help +- accelerometer - udev callout to export device orientation +- through property +- +-config SYSTEMD_UDEV_EXTRA_mtd_probe +- bool "Install mtd_probe callout" +- default y +- help +- mtd_probe - udev callout to probe mtd devices +- +-config SYSTEMD_UDEV_EXTRA_qemu +- bool "Install qemu specific rules" +- default y +- help +- Install rules for autosuspension of QEMU emulated +- USB HID devices +- +-endmenu +diff --git a/package/systemd-udev/Makefile b/package/systemd-udev/Makefile +deleted file mode 100644 +index 104379a..0000000 +--- a/package/systemd-udev/Makefile ++++ /dev/null +@@ -1,191 +0,0 @@ +-# +-# Copyright (C) 2006-2103 OpenWrt.org +-# +-# This is free software, licensed under the GNU General Public License v2. +-# See /LICENSE for more information. +-# +-# Since udev 182, the sources are integrated within the systemd tree. +-# +- +-include $(TOPDIR)/rules.mk +- +-PKG_NAME:=systemd +-PKG_VERSION:=197 +-PKG_RELEASE:=1 +- +-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +-PKG_SOURCE_URL:=http://www.freedesktop.org/software/systemd/ +-PKG_MD5SUM:=56a860dceadfafe59f40141eb5223743 +- +-PKG_FIXUP:=autoreconf +- +-include $(INCLUDE_DIR)/package.mk +- +-PKG_INSTALL=1 +- +-define Package/systemd-udev +- SECTION:=utils +- CATEGORY:=Utilities +- TITLE:=Dynamic device management subsystem +- URL:=http://www.freedesktop.org/wiki/Software/systemd/ +- MENU:=1 +- DEPENDS:=+librt +dbus +libcap +glib2 +-endef +- +-define Package/systemd-udev/description +- udev allows Linux users to have a dynamic /dev directory and it +- provides the ability to have persistent device names. +-endef +- +-define Package/systemd-udev/conffiles +-/etc/udev/udev.conf +-endef +- +-define Package/systemd-udev/config +- source "$(SOURCE)/Config.in" +-endef +- +-# gudev args +-systemd-udev-args-$(CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV) += --disable-gudev +- +- +-CONFIGURE_ARGS += \ +- --prefix=/usr \ +- --sysconfdir=/etc \ +- --without-python \ +- --disable-gtk-doc-html \ +- --disable-introspection \ +- --disable-kmod \ +- --disable-blkid \ +- --disable-ima \ +- --disable-chkconfig \ +- --disable-selinux \ +- --disable-xz \ +- --disable-tcpwrap \ +- --disable-pam \ +- --disable-acl \ +- --disable-xattr \ +- --disable-gcrypt \ +- --disable-audit \ +- --disable-libcryptsetup \ +- --disable-qrencode \ +- --disable-microhttpd \ +- --disable-binfmt \ +- --disable-vconsole \ +- --disable-readahead \ +- --disable-bootchart \ +- --disable-quotacheck \ +- --disable-randomseed \ +- --disable-logind \ +- --disable-hostnamed \ +- --disable-timedated \ +- --disable-localed \ +- --disable-coredump \ +- --disable-myhostname \ +- --disable-keymap \ +- --disable-manpages \ +- $(systemd-udev-args-y) +- +-# ata_id callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_ata_id) += ata_id +- +-# cdrom_id callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_cdrom_id) += cdrom_id +-systemd-udev-extra-rules-$(CONFIG_SYSTEMD_UDEV_EXTRA_cdrom_id) += 60-cdrom_id.rules +- +-# collect callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_collect) += collect +- +-# scsi_id callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_scsi_id) += scsi_id +- +-# v4l_id callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_v4l_id) += v4l_id +-systemd-udev-extra-rules-$(CONFIG_SYSTEMD_UDEV_EXTRA_v4l_id) += 60-persistent-v4l.rules +- +-# accelerometer callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_accelerometer) += accelerometer +-systemd-udev-extra-rules-$(CONFIG_SYSTEMD_UDEV_EXTRA_accelerometer) += 61-accelerometer.rules +- +-# mtd_probe callout +-systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_mtd_probe) += mtd_probe +-systemd-udev-extra-rules-$(CONFIG_SYSTEMD_UDEV_EXTRA_mtd_probe) += 75-probe_mtd.rules +- +-# qemu rules +-systemd-udev-extra-rules-$(CONFIG_SYSTEMD_UDEV_EXTRA_qemu) += 42-usb-hid-pm.rules +- +-# TODO: keymap +- +-define Build/InstallDev +- $(INSTALL_DIR) $(1)/usr/include +- $(CP) $(PKG_INSTALL_DIR)/usr/include/libudev.h $(1)/usr/include +- $(INSTALL_DIR) $(1)/usr/share/pkgconfig +- $(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/udev.pc $(1)/usr/share/pkgconfig +- $(INSTALL_DIR) $(1)/usr/lib +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libudev.so* $(1)/usr/lib +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsystemd-daemon.so* $(1)/usr/lib +- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libudev.pc $(1)/usr/lib/pkgconfig +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsystemd-daemon.pc $(1)/usr/lib/pkgconfig +-ifneq ($(CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV),y) +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgudev-1.0.so* $(1)/usr/lib +- $(INSTALL_DIR) $(1)/usr/include/gudev-1.0/gudev +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudev.h $(1)/usr/include/gudev-1.0/gudev/gudev.h +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudevclient.h $(1)/usr/include/gudev-1.0/gudev/gudevclient.h +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudevdevice.h $(1)/usr/include/gudev-1.0/gudev/gudevdevice.h +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudevenumerator.h $(1)/usr/include/gudev-1.0/gudev/gudevenumerator.h +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudevenums.h $(1)/usr/include/gudev-1.0/gudev/gudevenums.h +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudevenumtypes.h $(1)/usr/include/gudev-1.0/gudev/gudevenumtypes.h +- $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/gudevtypes.h $(1)/usr/include/gudev-1.0/gudev/gudevtypes.h +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gudev-1.0.pc $(1)/usr/lib/pkgconfig +- # for really complicated reasons we need this +- sed -i -e 's%libdir=/usr%libdir=$$$${exec_prefix}%g' $(1)/usr/lib/pkgconfig/gudev-1.0.pc +- sed -i -e 's%includedir=/usr%includedir=$$$${prefix}%g' $(1)/usr/lib/pkgconfig/gudev-1.0.pc +-endif +-endef +- +-define Package/systemd-udev/install +- $(INSTALL_DIR) $(1)/etc/udev/rules.d +- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/udev/udev.conf $(1)/etc/udev +- +- $(INSTALL_DIR) $(1)/sbin +- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevadm $(1)/sbin/ +- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/systemd/systemd-udevd $(1)/sbin/udevd +- +- $(INSTALL_DIR) $(1)/lib/udev/rules.d +- $(INSTALL_DATA) \ +- $(addprefix $(PKG_INSTALL_DIR)/usr/lib/udev/rules.d/, \ +- $(systemd-udev-extra-rules-y)) \ +- $(addprefix $(PKG_INSTALL_DIR)/usr/lib/udev/rules.d/, \ +- 50-udev-default.rules \ +- 60-persistent-alsa.rules \ +- 60-persistent-input.rules \ +- 60-persistent-serial.rules \ +- 60-persistent-storage.rules \ +- 60-persistent-storage-tape.rules \ +- 64-btrfs.rules \ +- 75-net-description.rules \ +- 75-tty-description.rules \ +- 78-sound-card.rules \ +- 80-net-name-slot.rules \ +- 95-udev-late.rules \ +- 99-systemd.rules) \ +- $(1)/lib/udev/rules.d +- +- $(INSTALL_DIR) $(1)/lib +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libudev.so* $(1)/lib +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsystemd-daemon.so* $(1)/lib +-ifneq ($(CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV),y) +- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgudev-1.0.so* $(1)/lib +-endif +- +- $(INSTALL_DIR) $(1)/lib/udev +-ifneq ($(systemd-udev-extra-lib-bin-y),) +- $(INSTALL_BIN) \ +- $(addprefix $(PKG_INSTALL_DIR)/usr/lib/udev/, \ +- $(systemd-udev-extra-lib-bin-y)) \ +- $(1)/lib/udev/ +-endif +-endef +- +-$(eval $(call BuildPackage,systemd-udev)) +diff --git a/package/systemd-udev/patches/0001-missing-define-MS_REC-and-MS_SHARED-if-not-defined-a.patch b/package/systemd-udev/patches/0001-missing-define-MS_REC-and-MS_SHARED-if-not-defined-a.patch +deleted file mode 100644 +index e519c77..0000000 +--- a/package/systemd-udev/patches/0001-missing-define-MS_REC-and-MS_SHARED-if-not-defined-a.patch ++++ /dev/null +@@ -1,32 +0,0 @@ +-From 1125071483e501023ce60f79f27601fba3098cad Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Tue, 12 Feb 2013 13:07:23 +0100 +-Subject: [PATCH 1/8] missing: define MS_REC and MS_SHARED if not defined +- already +- +---- +- src/shared/missing.h | 8 ++++++++ +- 1 file changed, 8 insertions(+) +- +-diff --git a/src/shared/missing.h b/src/shared/missing.h +-index c53579f..d4ba0d3 100644 +---- a/src/shared/missing.h +-+++ b/src/shared/missing.h +-@@ -196,6 +196,14 @@ static inline pid_t gettid(void) { +- #define MS_STRICTATIME (1<<24) +- #endif +- +-+#ifndef MS_REC +-+#define MS_REC 16384 +-+#endif +-+ +-+#ifndef MS_SHARED +-+#define MS_SHARED (1<<20) +-+#endif +-+ +- #ifndef PR_SET_NO_NEW_PRIVS +- #define PR_SET_NO_NEW_PRIVS 38 +- #endif +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0002-uclibc-use-plain-getenv-instead.patch b/package/systemd-udev/patches/0002-uclibc-use-plain-getenv-instead.patch +deleted file mode 100644 +index 2615afe..0000000 +--- a/package/systemd-udev/patches/0002-uclibc-use-plain-getenv-instead.patch ++++ /dev/null +@@ -1,27 +0,0 @@ +-From a2fbd49c5d0b73e2f6c1a0482fc7c3d40b23829e Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Mon, 11 Feb 2013 14:47:49 +0100 +-Subject: [PATCH 2/8] uclibc: use plain getenv() instead +- +-uclibc doesn't implement secure_getenv(), fallback to getenv() instead just to +-get this compiled. +---- +- src/shared/missing.h | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- +-diff --git a/src/shared/missing.h b/src/shared/missing.h +-index d4ba0d3..865f16b 100644 +---- a/src/shared/missing.h +-+++ b/src/shared/missing.h +-@@ -254,7 +254,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle +- # ifdef HAVE___SECURE_GETENV +- # define secure_getenv __secure_getenv +- # else +--# error neither secure_getenv nor __secure_getenv are available +-+# define secure_getenv getenv +- # endif +- #endif +- +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0003-uclibc-use-execvp-instead-of-execvpe.patch b/package/systemd-udev/patches/0003-uclibc-use-execvp-instead-of-execvpe.patch +deleted file mode 100644 +index f5c7ed1..0000000 +--- a/package/systemd-udev/patches/0003-uclibc-use-execvp-instead-of-execvpe.patch ++++ /dev/null +@@ -1,55 +0,0 @@ +-From e2d2de2ac6a60d2a1bac09dcdb09021961172e93 Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Tue, 12 Feb 2013 15:04:12 +0100 +-Subject: [PATCH 3/8] uclibc: use execvp instead of execvpe +- +---- +- configure.ac | 1 + +- src/nspawn/nspawn.c | 11 +++++++++-- +- 2 files changed, 10 insertions(+), 2 deletions(-) +- +-diff --git a/configure.ac b/configure.ac +-index 56694ff..4a481a7 100644 +---- a/configure.ac +-+++ b/configure.ac +-@@ -193,6 +193,7 @@ CAP_LIBS="$LIBS" +- LIBS="$save_LIBS" +- AC_SUBST(CAP_LIBS) +- +-+AC_CHECK_FUNCS([execvpe]) +- AC_CHECK_FUNCS([fanotify_init fanotify_mark]) +- AC_CHECK_FUNCS([__secure_getenv secure_getenv]) +- AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include +-diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +-index 4c87371..68f7436 100644 +---- a/src/nspawn/nspawn.c +-+++ b/src/nspawn/nspawn.c +-@@ -58,6 +58,8 @@ +- #include "fdset.h" +- #include "build.h" +- +-+#include "config.h" +-+ +- typedef enum LinkJournal { +- LINK_NO, +- LINK_AUTO, +-@@ -1468,9 +1470,14 @@ int main(int argc, char *argv[]) { +- +- a[0] = (char*) "/sbin/init"; +- execve(a[0], a, (char**) envp); +-- } else if (argc > optind) +-+ } else if (argc > optind) { +-+#ifdef HAVE_EXECVPE +- execvpe(argv[optind], argv + optind, (char**) envp); +-- else { +-+#else +-+ environ = (char **)envp; +-+ execvp(argv[optind], argv + optind); +-+#endif /* HAVE_EXECVPE */ +-+ }else { +- chdir(home ? home : "/root"); +- execle("/bin/bash", "-bash", NULL, (char**) envp); +- } +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0004-uclibc-use-mkstemp-instead-of-mkostemp.patch b/package/systemd-udev/patches/0004-uclibc-use-mkstemp-instead-of-mkostemp.patch +deleted file mode 100644 +index e3d5b02..0000000 +--- a/package/systemd-udev/patches/0004-uclibc-use-mkstemp-instead-of-mkostemp.patch ++++ /dev/null +@@ -1,258 +0,0 @@ +-From b4f13b8f304175b8999fef41685bba73c24d3e4f Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Tue, 12 Feb 2013 15:16:16 +0100 +-Subject: [PATCH 4/8] uclibc: use mkstemp instead of mkostemp +- +---- +- configure.ac | 2 +- +- src/core/manager.c | 10 ++++++++++ +- src/journal/coredumpctl.c | 6 ++++++ +- src/journal/journal-send.c | 9 +++++++++ +- src/journal/journal-verify.c | 23 +++++++++++++++++++++++ +- src/journal/journalctl.c | 10 ++++++++++ +- src/shared/ask-password-api.c | 10 ++++++++++ +- src/shared/util.c | 9 +++++++++ +- 8 files changed, 78 insertions(+), 1 deletion(-) +- +-diff --git a/configure.ac b/configure.ac +-index 4a481a7..f02cfdc 100644 +---- a/configure.ac +-+++ b/configure.ac +-@@ -193,7 +193,7 @@ CAP_LIBS="$LIBS" +- LIBS="$save_LIBS" +- AC_SUBST(CAP_LIBS) +- +--AC_CHECK_FUNCS([execvpe]) +-+AC_CHECK_FUNCS([execvpe mkostemp]) +- AC_CHECK_FUNCS([fanotify_init fanotify_mark]) +- AC_CHECK_FUNCS([__secure_getenv secure_getenv]) +- AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include +-diff --git a/src/core/manager.c b/src/core/manager.c +-index 4bebb29..84a379b 100644 +---- a/src/core/manager.c +-+++ b/src/core/manager.c +-@@ -73,6 +73,8 @@ +- #include "efivars.h" +- #include "env-util.h" +- +-+#include "config.h" +-+ +- /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */ +- #define GC_QUEUE_ENTRIES_MAX 16 +- +-@@ -1830,7 +1832,15 @@ int manager_open_serialization(Manager *m, FILE **_f) { +- return -ENOMEM; +- +- saved_umask = umask(0077); +-+ +-+#ifdef HAVE_MKOSTEMP +- fd = mkostemp(path, O_RDWR|O_CLOEXEC); +-+#else +-+ fd = mkstemp(path); +-+ if (fd >= 0) +-+ fcntl(fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- umask(saved_umask); +- +- if (fd < 0) { +-diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c +-index b6e5581..74e1489 100644 +---- a/src/journal/coredumpctl.c +-+++ b/src/journal/coredumpctl.c +-@@ -35,6 +35,8 @@ +- #include "path-util.h" +- #include "pager.h" +- +-+#include "config.h" +-+ +- static enum { +- ACTION_NONE, +- ACTION_LIST, +-@@ -472,7 +474,11 @@ static int run_gdb(sd_journal *j) { +- data = (const uint8_t*) data + 9; +- len -= 9; +- +-+#ifdef HAVE_MKOSTEMP +- fd = mkostemp(path, O_WRONLY); +-+#else +-+ fd = mkstemp(path); +-+#endif +- if (fd < 0) { +- log_error("Failed to create temporary file: %m"); +- return -errno; +-diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c +-index d5ec73e..32f9eba9 100644 +---- a/src/journal/journal-send.c +-+++ b/src/journal/journal-send.c +-@@ -33,6 +33,8 @@ +- #include "util.h" +- #include "socket-util.h" +- +-+#include "config.h" +-+ +- #define SNDBUF_SIZE (8*1024*1024) +- +- #define ALLOCA_CODE_FUNC(f, func) \ +-@@ -330,7 +332,14 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { +- * file and just pass a file descriptor of it to the other +- * side */ +- +-+#ifdef HAVE_MKOSTEMP +- buffer_fd = mkostemp(path, O_CLOEXEC|O_RDWR); +-+#else +-+ buffer_fd = mkstemp(path); +-+ if (buffer_fd >= 0) +-+ fcntl(buffer_fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- if (buffer_fd < 0) { +- r = -errno; +- goto finish; +-diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c +-index ed28b45..f9e1dba 100644 +---- a/src/journal/journal-verify.c +-+++ b/src/journal/journal-verify.c +-@@ -34,6 +34,8 @@ +- #include "compress.h" +- #include "fsprg.h" +- +-+#include "config.h" +-+ +- static int journal_file_object_verify(JournalFile *f, Object *o) { +- uint64_t i; +- +-@@ -701,7 +703,14 @@ int journal_file_verify( +- } else if (f->seal) +- return -ENOKEY; +- +-+#ifdef HAVE_MKOSTEMP +- data_fd = mkostemp(data_path, O_CLOEXEC); +-+#else +-+ data_fd = mkstemp(data_path); +-+ if (data_fd >= 0) +-+ fcntl(data_fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- if (data_fd < 0) { +- log_error("Failed to create data file: %m"); +- r = -errno; +-@@ -709,7 +718,14 @@ int journal_file_verify( +- } +- unlink(data_path); +- +-+#ifdef HAVE_MKOSTEMP +- entry_fd = mkostemp(entry_path, O_CLOEXEC); +-+#else +-+ entry_fd = mkstemp(entry_path); +-+ if (entry_fd >= 0) +-+ fcntl(entry_fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- if (entry_fd < 0) { +- log_error("Failed to create entry file: %m"); +- r = -errno; +-@@ -717,7 +733,14 @@ int journal_file_verify( +- } +- unlink(entry_path); +- +-+#ifdef HAVE_MKOSTEMP +- entry_array_fd = mkostemp(entry_array_path, O_CLOEXEC); +-+#else +-+ entry_array_fd = mkstemp(entry_array_path); +-+ if (entry_array_fd >= 0) +-+ fcntl(entry_array_fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- if (entry_array_fd < 0) { +- log_error("Failed to create entry array file: %m"); +- r = -errno; +-diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +-index 0afeef9..a00010c 100644 +---- a/src/journal/journalctl.c +-+++ b/src/journal/journalctl.c +-@@ -53,6 +53,8 @@ +- #include "unit-name.h" +- #include "catalog.h" +- +-+#include "config.h" +-+ +- #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) +- +- static OutputMode arg_output = OUTPUT_SHORT; +-@@ -679,7 +681,15 @@ static int setup_keys(void) { +- n /= arg_interval; +- +- close_nointr_nofail(fd); +-+ +-+#ifdef HAVE_MKOSTEMP +- fd = mkostemp(k, O_WRONLY|O_CLOEXEC|O_NOCTTY); +-+#else +-+ fd = mkstemp(k); +-+ if (fd >= 0) +-+ fcntl(fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- if (fd < 0) { +- log_error("Failed to open %s: %m", k); +- r = -errno; +-diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c +-index 8a0fb89..e5e9afd 100644 +---- a/src/shared/ask-password-api.c +-+++ b/src/shared/ask-password-api.c +-@@ -37,6 +37,8 @@ +- +- #include "ask-password-api.h" +- +-+#include "config.h" +-+ +- static void backspace_chars(int ttyfd, size_t p) { +- +- if (ttyfd < 0) +-@@ -326,7 +328,15 @@ int ask_password_agent( +- mkdir_p_label("/run/systemd/ask-password", 0755); +- +- u = umask(0022); +-+ +-+#ifdef HAVE_MKOSTEMP +- fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY); +-+#else +-+ fd = mkstemp(temp); +-+ if (fd >= 0) +-+ fcntl(fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- umask(u); +- +- if (fd < 0) { +-diff --git a/src/shared/util.c b/src/shared/util.c +-index 24f9e7e..35cee2a 100644 +---- a/src/shared/util.c +-+++ b/src/shared/util.c +-@@ -72,6 +72,8 @@ +- #include "hashmap.h" +- #include "env-util.h" +- +-+#include "config.h" +-+ +- int saved_argc = 0; +- char **saved_argv = NULL; +- +-@@ -4144,7 +4146,14 @@ int fopen_temporary(const char *path, FILE **_f, char **_temp_path) { +- t[k] = '.'; +- stpcpy(stpcpy(t+k+1, fn), "XXXXXX"); +- +-+#ifdef HAVE_MKOSTEMP +- fd = mkostemp(t, O_WRONLY|O_CLOEXEC); +-+#else +-+ fd = mkstemp(t); +-+ if (fd >= 0) +-+ fcntl(fd, F_SETFD, FD_CLOEXEC); +-+#endif /* HAVE_MKOSTEMP */ +-+ +- if (fd < 0) { +- free(t); +- return -errno; +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0005-uclibc-skip-using-unavailable-posix_fallocate.patch b/package/systemd-udev/patches/0005-uclibc-skip-using-unavailable-posix_fallocate.patch +deleted file mode 100644 +index 66f56a8..0000000 +--- a/package/systemd-udev/patches/0005-uclibc-skip-using-unavailable-posix_fallocate.patch ++++ /dev/null +@@ -1,109 +0,0 @@ +-From b9f0b9ba87c58a38b8c4116a5cffc5b1cfa4ff34 Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Tue, 12 Feb 2013 15:25:42 +0100 +-Subject: [PATCH 5/8] uclibc: skip using unavailable posix_fallocate() +- +---- +- configure.ac | 2 +- +- src/journal/journal-file.c | 19 ++++++++++++++++++- +- src/journal/journald-kmsg.c | 16 ++++++++++++++-- +- 3 files changed, 33 insertions(+), 4 deletions(-) +- +-diff --git a/configure.ac b/configure.ac +-index f02cfdc..dbb2680 100644 +---- a/configure.ac +-+++ b/configure.ac +-@@ -193,7 +193,7 @@ CAP_LIBS="$LIBS" +- LIBS="$save_LIBS" +- AC_SUBST(CAP_LIBS) +- +--AC_CHECK_FUNCS([execvpe mkostemp]) +-+AC_CHECK_FUNCS([execvpe mkostemp posix_fallocate]) +- AC_CHECK_FUNCS([fanotify_init fanotify_mark]) +- AC_CHECK_FUNCS([__secure_getenv secure_getenv]) +- AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include +-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +-index 13fc8ed..df4333b 100644 +---- a/src/journal/journal-file.c +-+++ b/src/journal/journal-file.c +-@@ -38,6 +38,8 @@ +- #include "compress.h" +- #include "fsprg.h" +- +-+#include "config.h" +-+ +- #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) +- #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) +- +-@@ -276,7 +278,7 @@ static int journal_file_verify_header(JournalFile *f) { +- +- static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { +- uint64_t old_size, new_size; +-- int r; +-+ int r = 0; +- +- assert(f); +- +-@@ -321,10 +323,25 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) +- /* Note that the glibc fallocate() fallback is very +- inefficient, hence we try to minimize the allocation area +- as we can. */ +-+#ifdef HAVE_POSIX_ALLOCATE +- r = posix_fallocate(f->fd, old_size, new_size - old_size); +- if (r != 0) +- return -r; +- +-+#else +-+ /* Use good old method to write zeros into the journal file +-+ perhaps very inefficient yet working. */ +-+ if(new_size > old_size) { +-+ char *buf = alloca(new_size - old_size); +-+ off_t oldpos = lseek(f->fd, 0, SEEK_CUR); +-+ bzero(buf, new_size - old_size); +-+ lseek(f->fd, old_size, SEEK_SET); +-+ r = write(f->fd, buf, new_size - old_size); +-+ lseek(f->fd, oldpos, SEEK_SET); +-+ } +-+ if (r < 0) +-+ return -errno; +-+#endif /* HAVE_POSIX_FALLOCATE */ +- if (fstat(f->fd, &f->last_stat) < 0) +- return -errno; +- +-diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c +-index b819876..0d18bba 100644 +---- a/src/journal/journald-kmsg.c +-+++ b/src/journal/journald-kmsg.c +-@@ -404,6 +404,7 @@ int server_open_dev_kmsg(Server *s) { +- +- int server_open_kernel_seqnum(Server *s) { +- int fd; +-+ int r = 0; +- uint64_t *p; +- +- assert(s); +-@@ -417,8 +418,19 @@ int server_open_kernel_seqnum(Server *s) { +- log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); +- return 0; +- } +-- +-- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) { +-+#ifdef HAVE_POSIX_ALLOCATE +-+ r = posix_fallocate(fd, 0, sizeof(uint64_t)); +-+#else +-+ /* Use good old method to write zeros into the journal file +-+ perhaps very inefficient yet working. */ +-+ char *buf = alloca(sizeof(uint64_t)); +-+ off_t oldpos = lseek(fd, 0, SEEK_CUR); +-+ bzero(buf, sizeof(uint64_t)); +-+ lseek(fd, 0, SEEK_SET); +-+ r = write(fd, buf, sizeof(uint64_t)); +-+ lseek(fd, oldpos, SEEK_SET); +-+#endif /* HAVE_POSIX_FALLOCATE */ +-+ if (r < 0) { +- log_error("Failed to allocate sequential number file, ignoring: %m"); +- close_nointr_nofail(fd); +- return 0; +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0006-uclibc-use-dup2-instead-of-dup3.patch b/package/systemd-udev/patches/0006-uclibc-use-dup2-instead-of-dup3.patch +deleted file mode 100644 +index 92062c7..0000000 +--- a/package/systemd-udev/patches/0006-uclibc-use-dup2-instead-of-dup3.patch ++++ /dev/null +@@ -1,86 +0,0 @@ +-From 868897a6c4af2b8b27805ae097890630bfb202c4 Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Tue, 12 Feb 2013 15:35:01 +0100 +-Subject: [PATCH 6/8] uclibc: use dup2() instead of dup3() +- +---- +- configure.ac | 2 +- +- src/journal/cat.c | 11 +++++++++++ +- src/shared/util.c | 6 ++++++ +- 3 files changed, 18 insertions(+), 1 deletion(-) +- +-diff --git a/configure.ac b/configure.ac +-index dbb2680..98d9413 100644 +---- a/configure.ac +-+++ b/configure.ac +-@@ -193,7 +193,7 @@ CAP_LIBS="$LIBS" +- LIBS="$save_LIBS" +- AC_SUBST(CAP_LIBS) +- +--AC_CHECK_FUNCS([execvpe mkostemp posix_fallocate]) +-+AC_CHECK_FUNCS([execvpe mkostemp posix_fallocate dup3]) +- AC_CHECK_FUNCS([fanotify_init fanotify_mark]) +- AC_CHECK_FUNCS([__secure_getenv secure_getenv]) +- AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include +-diff --git a/src/journal/cat.c b/src/journal/cat.c +-index a95392c..f631f2b 100644 +---- a/src/journal/cat.c +-+++ b/src/journal/cat.c +-@@ -32,6 +32,8 @@ +- #include "util.h" +- #include "build.h" +- +-+#include "config.h" +-+ +- static char *arg_identifier = NULL; +- static int arg_priority = LOG_INFO; +- static bool arg_level_prefix = true; +-@@ -143,8 +145,13 @@ int main(int argc, char *argv[]) { +- +- saved_stderr = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 3); +- +-+#if HAVE_DUP3 +- if (dup3(fd, STDOUT_FILENO, 0) < 0 || +- dup3(fd, STDERR_FILENO, 0) < 0) { +-+#else +-+ if (dup2(fd, STDOUT_FILENO) < 0 || +-+ dup2(fd, STDERR_FILENO) < 0) { +-+#endif /* HAVE_DUP3 */ +- log_error("Failed to duplicate fd: %m"); +- r = -errno; +- goto finish; +-@@ -164,7 +171,11 @@ int main(int argc, char *argv[]) { +- +- /* Let's try to restore a working stderr, so we can print the error message */ +- if (saved_stderr >= 0) +-+#if HAVE_DUP3 +- dup3(saved_stderr, STDERR_FILENO, 0); +-+#else +-+ dup2(saved_stderr, STDERR_FILENO); +-+#endif /* HAVE_DUP3 */ +- +- log_error("Failed to execute process: %s", strerror(-r)); +- +-diff --git a/src/shared/util.c b/src/shared/util.c +-index 35cee2a..659f650 100644 +---- a/src/shared/util.c +-+++ b/src/shared/util.c +-@@ -2600,9 +2600,15 @@ int make_stdio(int fd) { +- +- assert(fd >= 0); +- +-+#if HAVE_DUP3 +- r = dup3(fd, STDIN_FILENO, 0); +- s = dup3(fd, STDOUT_FILENO, 0); +- t = dup3(fd, STDERR_FILENO, 0); +-+#else +-+ r = dup2(fd, STDIN_FILENO); +-+ s = dup2(fd, STDOUT_FILENO); +-+ t = dup2(fd, STDERR_FILENO); +-+#endif /* HAVE_DUP3 */ +- +- if (fd >= 3) +- close_nointr_nofail(fd); +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0007-test-udev-include-missing.h.patch b/package/systemd-udev/patches/0007-test-udev-include-missing.h.patch +deleted file mode 100644 +index 43a5e67..0000000 +--- a/package/systemd-udev/patches/0007-test-udev-include-missing.h.patch ++++ /dev/null +@@ -1,26 +0,0 @@ +-From c3b23153355fd3dbcf0a6be300b295c62423377b Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Tue, 12 Feb 2013 15:38:48 +0100 +-Subject: [PATCH 7/8] test-udev: include missing.h +- +-We need MS_REC and MS_SHARED defined for a proper compilation, so get them from +-'missing.h' if not defined already. +---- +- src/test/test-udev.c | 1 + +- 1 file changed, 1 insertion(+) +- +-diff --git a/src/test/test-udev.c b/src/test/test-udev.c +-index 7cb93ed..aee87f7 100644 +---- a/src/test/test-udev.c +-+++ b/src/test/test-udev.c +-@@ -32,6 +32,7 @@ +- #include +- #include +- +-+#include "missing.h" +- #include "udev.h" +- +- void udev_main_log(struct udev *udev, int priority, +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0008-uclibc-don-t-require-SSP.patch b/package/systemd-udev/patches/0008-uclibc-don-t-require-SSP.patch +deleted file mode 100644 +index 755a67c..0000000 +--- a/package/systemd-udev/patches/0008-uclibc-don-t-require-SSP.patch ++++ /dev/null +@@ -1,27 +0,0 @@ +-From 156bc19bb657fe0e2fdbe6f2bd1f63450e695635 Mon Sep 17 00:00:00 2001 +-From: Aleksander Morgado +-Date: Wed, 13 Feb 2013 17:20:38 +0100 +-Subject: [PATCH 8/8] uclibc: don't require SSP +- +---- +- configure.ac | 4 +--- +- 1 file changed, 1 insertion(+), 3 deletions(-) +- +-diff --git a/configure.ac b/configure.ac +-index 98d9413..35646ec 100644 +---- a/configure.ac +-+++ b/configure.ac +-@@ -130,9 +130,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ +- -fno-strict-aliasing \ +- -fvisibility=hidden \ +- -ffunction-sections \ +-- -fdata-sections \ +-- -fstack-protector \ +-- --param=ssp-buffer-size=4]) +-+ -fdata-sections]) +- AC_SUBST([OUR_CFLAGS], $with_cflags) +- +- AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], [ +--- +-1.8.1.2 +- +diff --git a/package/systemd-udev/patches/0009-uclibc-no-utmpx.patch b/package/systemd-udev/patches/0009-uclibc-no-utmpx.patch +deleted file mode 100644 +index efd21f0..0000000 +--- a/package/systemd-udev/patches/0009-uclibc-no-utmpx.patch ++++ /dev/null +@@ -1,210 +0,0 @@ +-Index: systemd-197/src/shared/utmp-wtmp.c +-=================================================================== +---- systemd-197.orig/src/shared/utmp-wtmp.c +-+++ systemd-197/src/shared/utmp-wtmp.c +-@@ -19,7 +19,7 @@ +- along with systemd; If not, see . +- ***/ +- +--#include +-+#include +- #include +- #include +- #include +-@@ -33,7 +33,7 @@ +- #include "utmp-wtmp.h" +- +- int utmp_get_runlevel(int *runlevel, int *previous) { +-- struct utmpx lookup, *found; +-+ struct utmp lookup, *found; +- int r; +- const char *e; +- +-@@ -61,15 +61,15 @@ int utmp_get_runlevel(int *runlevel, int +- return 0; +- } +- +-- if (utmpxname(_PATH_UTMPX) < 0) +-+ if (utmpname(_PATH_UTMP) < 0) +- return -errno; +- +-- setutxent(); +-+ setutent(); +- +- zero(lookup); +- lookup.ut_type = RUN_LVL; +- +-- if (!(found = getutxid(&lookup))) +-+ if (!(found = getutid(&lookup))) +- r = -errno; +- else { +- int a, b; +-@@ -88,12 +88,12 @@ int utmp_get_runlevel(int *runlevel, int +- } +- } +- +-- endutxent(); +-+ endutent(); +- +- return r; +- } +- +--static void init_timestamp(struct utmpx *store, usec_t t) { +-+static void init_timestamp(struct utmp *store, usec_t t) { +- assert(store); +- +- zero(*store); +-@@ -105,7 +105,7 @@ static void init_timestamp(struct utmpx +- store->ut_tv.tv_usec = t % USEC_PER_SEC; +- } +- +--static void init_entry(struct utmpx *store, usec_t t) { +-+static void init_entry(struct utmp *store, usec_t t) { +- struct utsname uts; +- +- assert(store); +-@@ -121,7 +121,7 @@ static void init_entry(struct utmpx *sto +- strncpy(store->ut_id, "~~", sizeof(store->ut_id)); +- } +- +--static int write_entry_utmp(const struct utmpx *store) { +-+static int write_entry_utmp(const struct utmp *store) { +- int r; +- +- assert(store); +-@@ -130,33 +130,33 @@ static int write_entry_utmp(const struct +- * each entry type resp. user; i.e. basically a key/value +- * table. */ +- +-- if (utmpxname(_PATH_UTMPX) < 0) +-+ if (utmpname(_PATH_UTMP) < 0) +- return -errno; +- +-- setutxent(); +-+ setutent(); +- +-- if (!pututxline(store)) +-+ if (!pututline(store)) +- r = -errno; +- else +- r = 0; +- +-- endutxent(); +-+ endutent(); +- +- return r; +- } +- +--static int write_entry_wtmp(const struct utmpx *store) { +-+static int write_entry_wtmp(const struct utmp *store) { +- assert(store); +- +- /* wtmp is a simple append-only file where each entry is +- simply appended to * the end; i.e. basically a log. */ +- +- errno = 0; +-- updwtmpx(_PATH_WTMPX, store); +-+ updwtmp(_PATH_WTMP, store); +- return -errno; +- } +- +--static int write_utmp_wtmp(const struct utmpx *store_utmp, const struct utmpx *store_wtmp) { +-+static int write_utmp_wtmp(const struct utmp *store_utmp, const struct utmp *store_wtmp) { +- int r, s; +- +- r = write_entry_utmp(store_utmp); +-@@ -173,12 +173,12 @@ static int write_utmp_wtmp(const struct +- return r; +- } +- +--static int write_entry_both(const struct utmpx *store) { +-+static int write_entry_both(const struct utmp *store) { +- return write_utmp_wtmp(store, store); +- } +- +- int utmp_put_shutdown(void) { +-- struct utmpx store; +-+ struct utmp store; +- +- init_entry(&store, 0); +- +-@@ -189,7 +189,7 @@ int utmp_put_shutdown(void) { +- } +- +- int utmp_put_reboot(usec_t t) { +-- struct utmpx store; +-+ struct utmp store; +- +- init_entry(&store, t); +- +-@@ -205,14 +205,14 @@ static const char *sanitize_id(const cha +- assert(id); +- l = strlen(id); +- +-- if (l <= sizeof(((struct utmpx*) NULL)->ut_id)) +-+ if (l <= sizeof(((struct utmp*) NULL)->ut_id)) +- return id; +- +-- return id + l - sizeof(((struct utmpx*) NULL)->ut_id); +-+ return id + l - sizeof(((struct utmp*) NULL)->ut_id); +- } +- +- int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line) { +-- struct utmpx store; +-+ struct utmp store; +- +- assert(id); +- +-@@ -231,17 +231,17 @@ int utmp_put_init_process(const char *id +- } +- +- int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) { +-- struct utmpx lookup, store, store_wtmp, *found; +-+ struct utmp lookup, store, store_wtmp, *found; +- +- assert(id); +- +-- setutxent(); +-+ setutent(); +- +- zero(lookup); +- lookup.ut_type = INIT_PROCESS; /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */ +- strncpy(lookup.ut_id, sanitize_id(id), sizeof(lookup.ut_id)); +- +-- if (!(found = getutxid(&lookup))) +-+ if (!(found = getutid(&lookup))) +- return 0; +- +- if (found->ut_pid != pid) +-@@ -265,7 +265,7 @@ int utmp_put_dead_process(const char *id +- +- +- int utmp_put_runlevel(int runlevel, int previous) { +-- struct utmpx store; +-+ struct utmp store; +- int r; +- +- assert(runlevel > 0); +-@@ -366,7 +366,7 @@ finish: +- } +- +- int utmp_wall(const char *message, bool (*match_tty)(const char *tty)) { +-- struct utmpx *u; +-+ struct utmp *u; +- char date[FORMAT_TIMESTAMP_MAX]; +- char *text = NULL, *hn = NULL, *un = NULL, *tty = NULL; +- int r; +-@@ -391,11 +391,11 @@ int utmp_wall(const char *message, bool +- goto finish; +- } +- +-- setutxent(); +-+ setutent(); +- +- r = 0; +- +-- while ((u = getutxent())) { +-+ while ((u = getutent())) { +- int q; +- const char *path; +- char *buf = NULL; +diff --git a/package/udev/Makefile b/package/udev/Makefile +index 4679917..9c0f3dd 100644 +--- a/package/udev/Makefile ++++ b/package/udev/Makefile +@@ -26,7 +26,7 @@ define Package/udev + URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html + MAINTAINER:=Geoff Levand + MENU:=1 +- DEPENDS:=+librt ++ DEPENDS:=+librt +glib2 + endef + + define Package/udev/description +@@ -50,7 +50,7 @@ udev-args-$(CONFIG_UDEV_EXTRA_floppy) += --enable-floppy + # TODO: make hwdb and introspection work + + CONFIGURE_ARGS += --prefix=/usr --exec-prefix= --sysconfdir=/etc \ +- --disable-hwdb --disable-keymap --disable-gudev --disable-introspection \ ++ --disable-hwdb --disable-keymap --enable-gudev --disable-introspection \ + --libexecdir=/lib/udev --disable-gtk-doc-html \ + --sbindir=/sbin $(udev-args-y) + +@@ -72,8 +72,6 @@ udev-extra-rules-$(CONFIG_UDEV_EXTRA_firmware) += 50-firmware.rules + + udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_floppy) += create_floppy_devices + +-# TODO: make gudev work +- + udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_input_id) += input_id + + # TODO: make keymap work +@@ -110,6 +108,11 @@ define Build/InstallDev + $(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/lib/pkgconfig/libudev.pc $(1)/usr/lib/pkgconfig ++ $(INSTALL_DIR) $(1)/usr/include/gudev-1.0/gudev ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gudev-1.0/gudev/* $(1)/usr/include/gudev-1.0/gudev/ ++ $(INSTALL_DIR) $(1)/lib ++ $(CP) $(PKG_INSTALL_DIR)/lib/libgudev-1.0.so* $(1)/lib ++ $(CP) $(PKG_INSTALL_DIR)/lib/pkgconfig/gudev-1.0.pc $(1)/usr/lib/pkgconfig + endef + + define Package/udev/install +@@ -137,6 +140,7 @@ define Package/udev/install + + $(INSTALL_DIR) $(1)/lib + $(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib ++ $(CP) $(PKG_INSTALL_DIR)/lib/libgudev-1.0.so* $(1)/lib + + $(INSTALL_DIR) $(1)/lib/udev + ifneq ($(udev-extra-lib-bin-y),) +diff --git a/package/udev/patches/9999-add-libudev-to-gudev-deps b/package/udev/patches/9999-add-libudev-to-gudev-deps +new file mode 100644 +index 0000000..2bb363b +--- /dev/null ++++ b/package/udev/patches/9999-add-libudev-to-gudev-deps +@@ -0,0 +1,12 @@ ++Index: udev-173/extras/gudev/gudev-1.0.pc.in ++=================================================================== ++--- udev-173.orig/extras/gudev/gudev-1.0.pc.in +++++ udev-173/extras/gudev/gudev-1.0.pc.in ++@@ -6,6 +6,6 @@ includedir=@includedir@ ++ Name: gudev-1.0 ++ Description: GObject bindings for libudev ++ Version: @VERSION@ ++-Requires: glib-2.0, gobject-2.0 +++Requires: libudev, glib-2.0, gobject-2.0 ++ Libs: -L${libdir} -lgudev-1.0 ++ Cflags: -I${includedir}/gudev-1.0 +diff --git a/rules.mk b/rules.mk +index 6455fde..2225b2b 100644 +--- a/rules.mk ++++ b/rules.mk +@@ -109,7 +109,7 @@ BUILD_LOG_DIR:=$(TOPDIR)/logs + PKG_INFO_DIR := $(STAGING_DIR)/pkginfo + + TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH))))) +-TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) ++TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -O0 -g3) + TARGET_CXXFLAGS = $(TARGET_CFLAGS) + TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include + TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib +diff --git a/target/linux/ar71xx/config-3.8 b/target/linux/ar71xx/config-3.8 +index 847b9a5..a124def 100644 +--- a/target/linux/ar71xx/config-3.8 ++++ b/target/linux/ar71xx/config-3.8 +@@ -97,8 +97,12 @@ CONFIG_ATH79_NVRAM=y + CONFIG_ATH79_PCI_ATH9K_FIXUP=y + CONFIG_ATH79_ROUTERBOOT=y + # CONFIG_ATH79_WDT is not set ++CONFIG_BLK_DEV_SD=y ++CONFIG_BLK_DEV_SR=m ++# CONFIG_BLK_DEV_SR_VENDOR is not set + CONFIG_CC_OPTIMIZE_FOR_SIZE=y + CONFIG_CEVT_R4K=y ++CONFIG_CHR_DEV_SG=m + CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd" + CONFIG_CMDLINE_BOOL=y + # CONFIG_CMDLINE_OVERRIDE is not set +@@ -113,11 +117,18 @@ CONFIG_CPU_R4K_CACHE_TLB=y + CONFIG_CPU_R4K_FPU=y + CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y + CONFIG_CPU_SUPPORTS_HIGHMEM=y ++CONFIG_CRC16=y ++CONFIG_CRC7=y ++CONFIG_CRC_ITU_T=y ++CONFIG_CRYPTO_CRC32C=y ++CONFIG_CRYPTO_HASH=y ++CONFIG_CRYPTO_HASH2=y + CONFIG_CSRC_R4K=y + CONFIG_DECOMPRESS_LZMA=y + CONFIG_DMA_NONCOHERENT=y + CONFIG_EARLY_PRINTK=y + CONFIG_ETHERNET_PACKET_MANGLE=y ++CONFIG_EXT3_FS=y + CONFIG_GENERIC_ATOMIC64=y + CONFIG_GENERIC_CLOCKEVENTS=y + CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +@@ -129,7 +140,6 @@ CONFIG_GENERIC_PCI_IOMAP=y + CONFIG_GENERIC_SMP_IDLE_THREAD=y + CONFIG_GPIOLIB=y + CONFIG_GPIO_NXP_74HC153=y +-CONFIG_GPIO_PCF857X=y + CONFIG_GPIO_SYSFS=y + CONFIG_HARDWARE_WATCHPOINTS=y + CONFIG_HAS_DMA=y +@@ -159,27 +169,21 @@ CONFIG_HAVE_NET_DSA=y + CONFIG_HAVE_OPROFILE=y + CONFIG_HAVE_PERF_EVENTS=y + CONFIG_HW_HAS_PCI=y +-CONFIG_I2C=y +-CONFIG_I2C_ALGOBIT=y +-CONFIG_I2C_BOARDINFO=y +-CONFIG_I2C_GPIO=y + CONFIG_IMAGE_CMDLINE_HACK=y + CONFIG_INITRAMFS_ROOT_GID=0 + CONFIG_INITRAMFS_ROOT_UID=0 + CONFIG_INITRAMFS_SOURCE="../../root" +-CONFIG_IP17XX_PHY=y + CONFIG_IRQ_CPU=y +-CONFIG_IRQ_DOMAIN=y + CONFIG_IRQ_FORCED_THREADING=y ++# CONFIG_ISDN is not set ++CONFIG_JBD=y + # CONFIG_LEDS_RB750 is not set + # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set + # CONFIG_LEDS_TRIGGER_NETDEV is not set + # CONFIG_LEDS_TRIGGER_TIMER is not set + # CONFIG_LEDS_WNDR3700_USB is not set + # CONFIG_M25PXX_USE_FAST_READ is not set +-CONFIG_MARVELL_PHY=y + CONFIG_MDIO_BOARDINFO=y +-CONFIG_MICREL_PHY=y + CONFIG_MIPS=y + # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set + CONFIG_MIPS_L1_CACHE_SHIFT=5 +@@ -204,10 +208,48 @@ CONFIG_MTD_WRT160NL_PARTS=y + CONFIG_MYLOADER=y + CONFIG_NEED_DMA_MAP_STATE=y + CONFIG_NEED_PER_CPU_KM=y ++# CONFIG_NETWORK_FILESYSTEMS is not set ++# CONFIG_NET_CADENCE is not set + CONFIG_NET_DSA=y + CONFIG_NET_DSA_MV88E6060=y + CONFIG_NET_DSA_MV88E6063=y + CONFIG_NET_DSA_TAG_TRAILER=y ++# CONFIG_NET_VENDOR_3COM is not set ++# CONFIG_NET_VENDOR_ADAPTEC is not set ++# CONFIG_NET_VENDOR_ALTEON is not set ++# CONFIG_NET_VENDOR_AMD is not set ++# CONFIG_NET_VENDOR_BROADCOM is not set ++# CONFIG_NET_VENDOR_BROCADE is not set ++# CONFIG_NET_VENDOR_CHELSIO is not set ++# CONFIG_NET_VENDOR_CISCO is not set ++# CONFIG_NET_VENDOR_DEC is not set ++# CONFIG_NET_VENDOR_DLINK is not set ++# CONFIG_NET_VENDOR_EMULEX is not set ++# CONFIG_NET_VENDOR_EXAR is not set ++# CONFIG_NET_VENDOR_HP is not set ++# CONFIG_NET_VENDOR_INTEL is not set ++# CONFIG_NET_VENDOR_MARVELL is not set ++# CONFIG_NET_VENDOR_MELLANOX is not set ++# CONFIG_NET_VENDOR_MICREL is not set ++# CONFIG_NET_VENDOR_MICROCHIP is not set ++# CONFIG_NET_VENDOR_MYRI is not set ++# CONFIG_NET_VENDOR_NATSEMI is not set ++# CONFIG_NET_VENDOR_NVIDIA is not set ++# CONFIG_NET_VENDOR_OKI is not set ++# CONFIG_NET_VENDOR_QLOGIC is not set ++# CONFIG_NET_VENDOR_RDC is not set ++# CONFIG_NET_VENDOR_REALTEK is not set ++# CONFIG_NET_VENDOR_SEEQ is not set ++# CONFIG_NET_VENDOR_SILAN is not set ++# CONFIG_NET_VENDOR_SIS is not set ++# CONFIG_NET_VENDOR_SMSC is not set ++# CONFIG_NET_VENDOR_STMICRO is not set ++# CONFIG_NET_VENDOR_SUN is not set ++# CONFIG_NET_VENDOR_TEHUTI is not set ++# CONFIG_NET_VENDOR_TI is not set ++# CONFIG_NET_VENDOR_TOSHIBA is not set ++# CONFIG_NET_VENDOR_VIA is not set ++CONFIG_NLS=y + CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y + CONFIG_PAGEFLAGS_EXTENDED=y + CONFIG_PCI=y +@@ -219,12 +261,8 @@ CONFIG_PERF_USE_VMALLOC=y + CONFIG_PHYLIB=y + # CONFIG_PREEMPT_RCU is not set + CONFIG_RLE_DECOMPRESS=y +-CONFIG_RTL8306_PHY=y +-CONFIG_RTL8366RB_PHY=y +-CONFIG_RTL8366S_PHY=y + CONFIG_RTL8366_SMI=y +-CONFIG_RTL8367_PHY=y +-# CONFIG_SCSI_DMA is not set ++CONFIG_SCSI=y + CONFIG_SERIAL_8250_NR_UARTS=1 + CONFIG_SERIAL_8250_RUNTIME_UARTS=1 + CONFIG_SERIAL_AR933X=y +@@ -255,6 +293,29 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y + CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y + CONFIG_TICK_CPU_ACCOUNTING=y + CONFIG_UIDGID_CONVERTED=y ++CONFIG_USB=y ++CONFIG_USB_ACM=m + CONFIG_USB_ARCH_HAS_XHCI=y ++CONFIG_USB_COMMON=y ++# CONFIG_USB_EHCI_ATH79 is not set ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_HCD_PLATFORM=y ++CONFIG_USB_EHCI_PCI=y ++CONFIG_USB_NET_CDCETHER=m ++CONFIG_USB_NET_CDC_EEM=m ++CONFIG_USB_NET_CDC_MBIM=m ++CONFIG_USB_NET_CDC_NCM=m ++CONFIG_USB_NET_QMI_WWAN=m ++CONFIG_USB_SERIAL=m ++CONFIG_USB_SERIAL_OPTION=m ++CONFIG_USB_SERIAL_QCAUX=m ++CONFIG_USB_SERIAL_QUALCOMM=m ++CONFIG_USB_SERIAL_WWAN=m ++CONFIG_USB_SERIAL_ZTE=m ++CONFIG_USB_SIERRA_NET=m ++CONFIG_USB_STORAGE=y + CONFIG_USB_SUPPORT=y ++# CONFIG_USB_UHCI_HCD is not set ++CONFIG_USB_USBNET=m ++CONFIG_USB_WDM=m + CONFIG_ZONE_DMA_FLAG=0 +diff --git a/target/linux/ar71xx/patches-3.8/999-1-always-bitbang-spi b/target/linux/ar71xx/patches-3.8/999-1-always-bitbang-spi +index 44cd2f2..825d022 100644 +--- a/target/linux/ar71xx/patches-3.8/999-1-always-bitbang-spi ++++ b/target/linux/ar71xx/patches-3.8/999-1-always-bitbang-spi +@@ -84,7 +84,7 @@ Index: linux-3.8.3/arch/mips/ath79/mach-tl-mr11u.c + + #include "common.h" + #include "dev-eth.h" +-@@ -82,11 +84,60 @@ static struct gpio_keys_button tl_mr11u_ ++@@ -82,11 +84,61 @@ static struct gpio_keys_button tl_mr11u_ + }, + }; + +@@ -112,6 +112,7 @@ Index: linux-3.8.3/arch/mips/ath79/mach-tl-mr11u.c + + ath79_register_eth(0); + + ath79_eth0_data.phy_mask = BIT(0); + + +++ mac[MAC_LEN - 1] ^= 1; + + } + + + + if (!strcmp(mtd->name, "art") && !art) { +@@ -148,9 +149,9 @@ Index: linux-3.8.3/arch/mips/ath79/mach-tl-mr11u.c + /* Disable hardware control LAN1 and LAN2 LEDs, enabling GPIO14 and GPIO15 */ + ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN | + AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN); +-@@ -94,18 +145,13 @@ static void __init common_setup(void) ++@@ -94,18 +146,13 @@ static void __init common_setup(void) + /* disable PHY_SWAP and PHY_ADDR_SWAP bits */ +- ath79_setup_ar933x_phy4_switch(false, false); ++ ath79_setup_ar933x_phy4_switch(false, true); + + + register_mtd_user(&spi_notifier); + + +diff --git a/target/linux/ar71xx/patches-3.8/999-2-sdcard-spi b/target/linux/ar71xx/patches-3.8/999-2-sdcard-spi +index cb31388..44ccfc7 100644 +--- a/target/linux/ar71xx/patches-3.8/999-2-sdcard-spi ++++ b/target/linux/ar71xx/patches-3.8/999-2-sdcard-spi +@@ -1,23 +1,20 @@ +-Index: linux-3.6.10/arch/mips/ath79/mach-tl-mr11u.c ++Index: linux-3.8.3/arch/mips/ath79/mach-tl-mr11u.c + =================================================================== +---- linux-3.6.10.orig/arch/mips/ath79/mach-tl-mr11u.c +-+++ linux-3.6.10/arch/mips/ath79/mach-tl-mr11u.c +-@@ -12,7 +12,14 @@ +- #include ++--- linux-3.8.3.orig/arch/mips/ath79/mach-tl-mr11u.c +++++ linux-3.8.3/arch/mips/ath79/mach-tl-mr11u.c ++@@ -13,6 +13,11 @@ + + #include +-+#include ++ #include + +#include + +#include + +#include + +#include + +#include ++ #include ++ #include + +-+#include "common.h" +- #include "dev-eth.h" +- #include "dev-gpio-buttons.h" +- #include "dev-leds-gpio.h" +-@@ -34,6 +41,47 @@ ++@@ -38,6 +43,47 @@ + #define TL_MR11U_KEYS_POLL_INTERVAL 20 /* msecs */ + #define TL_MR11U_KEYS_DEBOUNCE_INTERVAL (3 * TL_MR11U_KEYS_POLL_INTERVAL) + +@@ -51,7 +48,7 @@ Index: linux-3.6.10/arch/mips/ath79/mach-tl-mr11u.c + +}; + + + +static struct platform_device tl_mr3040_spi_device = { +-+#if 0 +++#if 1 + + .name = "tl_mr3040_spi", + +#else + + .name = "spi_gpio", +@@ -65,7 +62,7 @@ Index: linux-3.6.10/arch/mips/ath79/mach-tl-mr11u.c + static const char *tl_mr11u_part_probes[] = { + "tp-link", + NULL, +-@@ -119,6 +167,10 @@ MIPS_MACHINE(ATH79_MACH_TL_MR11U, "TL-MR ++@@ -172,6 +218,10 @@ MIPS_MACHINE(ATH79_MACH_TL_MR11U, "TL-MR + + static void __init tl_mr3040_setup(void) + { +@@ -76,7 +73,7 @@ Index: linux-3.6.10/arch/mips/ath79/mach-tl-mr11u.c + common_setup(); + + ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL, +-@@ -126,6 +178,10 @@ static void __init tl_mr3040_setup(void) ++@@ -179,6 +229,10 @@ static void __init tl_mr3040_setup(void) + gpio_request_one(TL_MR3040_GPIO_USB_POWER, + GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, + "USB power"); +@@ -87,10 +84,10 @@ Index: linux-3.6.10/arch/mips/ath79/mach-tl-mr11u.c + } + + MIPS_MACHINE(ATH79_MACH_TL_MR3040, "TL-MR3040", "TP-LINK TL-MR3040", +-Index: linux-3.6.10/drivers/spi/spi-tl_mr3040.c ++Index: linux-3.8.3/drivers/spi/spi-tl_mr3040.c + =================================================================== + --- /dev/null +-+++ linux-3.6.10/drivers/spi/spi-tl_mr3040.c +++++ linux-3.8.3/drivers/spi/spi-tl_mr3040.c + @@ -0,0 +1,7 @@ + +#define DRIVER_NAME "tl_mr3040_spi" + +#define SPI_MISO_GPIO 13 +@@ -99,10 +96,10 @@ Index: linux-3.6.10/drivers/spi/spi-tl_mr3040.c + +#define SPI_N_CHIPSEL 1 + +#undef NEED_SPIDELAY + +#include "spi-gpio.c" +-Index: linux-3.6.10/drivers/spi/Makefile ++Index: linux-3.8.3/drivers/spi/Makefile + =================================================================== +---- linux-3.6.10.orig/drivers/spi/Makefile +-+++ linux-3.6.10/drivers/spi/Makefile ++--- linux-3.8.3.orig/drivers/spi/Makefile +++++ linux-3.8.3/drivers/spi/Makefile + @@ -14,6 +14,7 @@ obj-$(CONFIG_SPI_ALTERA) += spi-altera. + obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o + obj-$(CONFIG_SPI_AP83) += spi-ap83.o diff --git a/master/feeds b/master/feeds new file mode 100644 index 0000000..9c1b48a --- /dev/null +++ b/master/feeds @@ -0,0 +1,1276641 @@ +diff --git a/feeds/luci/.svn/all-wcprops b/feeds/luci/.svn/all-wcprops +new file mode 100644 +index 0000000..33b069a +--- /dev/null ++++ b/feeds/luci/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 41 ++/!svn/ver/9679/luci/trunk/contrib/package ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 50 ++/!svn/ver/3591/luci/trunk/contrib/package/Makefile ++END +diff --git a/feeds/luci/.svn/dir-prop-base b/feeds/luci/.svn/dir-prop-base +new file mode 100644 +index 0000000..a082b88 +--- /dev/null ++++ b/feeds/luci/.svn/dir-prop-base +@@ -0,0 +1,6 @@ ++K 10 ++svn:ignore ++V 5 ++dist ++ ++END +diff --git a/feeds/luci/.svn/entries b/feeds/luci/.svn/entries +new file mode 100644 +index 0000000..3c843cb +--- /dev/null ++++ b/feeds/luci/.svn/entries +@@ -0,0 +1,95 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-03-09T22:52:53.779777Z ++9679 ++iordan ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-common ++dir ++ ++freifunk-gwcheck ++dir ++ ++freifunk-p2pblock ++dir ++ ++community-profiles ++dir ++ ++freifunk-mapupdate ++dir ++ ++freifunk-watchdog ++dir ++ ++remote-update ++dir ++ ++freifunk-firewall ++dir ++ ++luci ++dir ++ ++meshwizard ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++f1f6e420b1487ea32da1fc4d1c34a4f4 ++2008-07-24T13:55:11.304188Z ++2658 ++Cyrus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++60 ++ ++freifunk-policyrouting ++dir ++ +diff --git a/feeds/luci/.svn/text-base/Makefile.svn-base b/feeds/luci/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f7fac77 +--- /dev/null ++++ b/feeds/luci/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,2 @@ ++include ../../build/config.mk ++include ../../build/module.mk +diff --git a/feeds/luci/Makefile b/feeds/luci/Makefile +new file mode 100644 +index 0000000..f7fac77 +--- /dev/null ++++ b/feeds/luci/Makefile +@@ -0,0 +1,2 @@ ++include ../../build/config.mk ++include ../../build/module.mk +diff --git a/feeds/luci/community-profiles/.svn/all-wcprops b/feeds/luci/community-profiles/.svn/all-wcprops +new file mode 100644 +index 0000000..f5da958 +--- /dev/null ++++ b/feeds/luci/community-profiles/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/!svn/ver/9675/luci/trunk/contrib/package/community-profiles ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/!svn/ver/7771/luci/trunk/contrib/package/community-profiles/Makefile ++END +diff --git a/feeds/luci/community-profiles/.svn/entries b/feeds/luci/community-profiles/.svn/entries +new file mode 100644 +index 0000000..5c8b865 +--- /dev/null ++++ b/feeds/luci/community-profiles/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/community-profiles ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:56:59.093371Z ++9675 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++54c14727064ce2cdf826ee81753dd841 ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++853 ++ +diff --git a/feeds/luci/community-profiles/.svn/text-base/Makefile.svn-base b/feeds/luci/community-profiles/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3129a36 +--- /dev/null ++++ b/feeds/luci/community-profiles/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=community-profiles ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/community-profiles ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Community profiles ++ DEPENDS:=freifunk-common ++endef ++ ++define Package/community-profiles/description ++ These community profiles set defaults for various free network/freifunk communities and are used by wizards like ffwizard and meshwizard. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/community-profiles/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,community-profiles)) +diff --git a/feeds/luci/community-profiles/Makefile b/feeds/luci/community-profiles/Makefile +new file mode 100644 +index 0000000..3129a36 +--- /dev/null ++++ b/feeds/luci/community-profiles/Makefile +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=community-profiles ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/community-profiles ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Community profiles ++ DEPENDS:=freifunk-common ++endef ++ ++define Package/community-profiles/description ++ These community profiles set defaults for various free network/freifunk communities and are used by wizards like ffwizard and meshwizard. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/community-profiles/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,community-profiles)) +diff --git a/feeds/luci/community-profiles/files/.svn/all-wcprops b/feeds/luci/community-profiles/files/.svn/all-wcprops +new file mode 100644 +index 0000000..21f330c +--- /dev/null ++++ b/feeds/luci/community-profiles/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/!svn/ver/9675/luci/trunk/contrib/package/community-profiles/files ++END +diff --git a/feeds/luci/community-profiles/files/.svn/entries b/feeds/luci/community-profiles/files/.svn/entries +new file mode 100644 +index 0000000..9b1cadc +--- /dev/null ++++ b/feeds/luci/community-profiles/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/community-profiles/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:56:59.093371Z ++9675 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++etc ++dir ++ +diff --git a/feeds/luci/community-profiles/files/etc/.svn/all-wcprops b/feeds/luci/community-profiles/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..92ca64c +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/9675/luci/trunk/contrib/package/community-profiles/files/etc ++END +diff --git a/feeds/luci/community-profiles/files/etc/.svn/entries b/feeds/luci/community-profiles/files/etc/.svn/entries +new file mode 100644 +index 0000000..589a231 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/community-profiles/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:56:59.093371Z ++9675 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++config ++dir ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/all-wcprops b/feeds/luci/community-profiles/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..d03a7d4 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,239 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/!svn/ver/9675/luci/trunk/contrib/package/community-profiles/files/etc/config ++END ++profile_pberg ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/!svn/ver/9646/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_pberg ++END ++profile_marburg ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_marburg ++END ++profile_gadow ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_gadow ++END ++profile_stuttgart ++K 25 ++svn:wc:ra_dav:version-url ++V 95 ++/!svn/ver/8315/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_stuttgart ++END ++profile_potsdam ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/7905/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_potsdam ++END ++profile_evernet ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_evernet ++END ++profile_Freifunk ++K 25 ++svn:wc:ra_dav:version-url ++V 94 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_Freifunk ++END ++profile_berlin ++K 25 ++svn:wc:ra_dav:version-url ++V 92 ++/!svn/ver/9646/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_berlin ++END ++profile_jena ++K 25 ++svn:wc:ra_dav:version-url ++V 90 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_jena ++END ++profile_bergischesland ++K 25 ++svn:wc:ra_dav:version-url ++V 100 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_bergischesland ++END ++profile_augsburg ++K 25 ++svn:wc:ra_dav:version-url ++V 94 ++/!svn/ver/9675/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_augsburg ++END ++profile_hannover ++K 25 ++svn:wc:ra_dav:version-url ++V 94 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_hannover ++END ++profile_oldenburg ++K 25 ++svn:wc:ra_dav:version-url ++V 95 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_oldenburg ++END ++profile_rosbach ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_rosbach ++END ++profile_heppenheim ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_heppenheim ++END ++profile_bayreuth ++K 25 ++svn:wc:ra_dav:version-url ++V 94 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_bayreuth ++END ++profile_weimar ++K 25 ++svn:wc:ra_dav:version-url ++V 92 ++/!svn/ver/8876/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_weimar ++END ++profile_wlanljubljana ++K 25 ++svn:wc:ra_dav:version-url ++V 99 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana ++END ++profile_openwireless_bern ++K 25 ++svn:wc:ra_dav:version-url ++V 103 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern ++END ++profile_halle ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/!svn/ver/8555/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_halle ++END ++profile_bensheim ++K 25 ++svn:wc:ra_dav:version-url ++V 94 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_bensheim ++END ++profile_neuss ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_neuss ++END ++profile_weinstadt ++K 25 ++svn:wc:ra_dav:version-url ++V 95 ++/!svn/ver/8319/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_weinstadt ++END ++profile_leipzig ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/9664/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_leipzig ++END ++profile_arig_neot_semadar ++K 25 ++svn:wc:ra_dav:version-url ++V 103 ++/!svn/ver/8871/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_arig_neot_semadar ++END ++profile_guifibages ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_guifibages ++END ++profile_piraten_dresden ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden ++END ++profile_kiberpipa ++K 25 ++svn:wc:ra_dav:version-url ++V 95 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_kiberpipa ++END ++profile_seefeld ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_seefeld ++END ++profile_l59 ++K 25 ++svn:wc:ra_dav:version-url ++V 89 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_l59 ++END ++profile_arig_arad ++K 25 ++svn:wc:ra_dav:version-url ++V 95 ++/!svn/ver/8871/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_arig_arad ++END ++profile_mainz ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_mainz ++END ++profile_bno ++K 25 ++svn:wc:ra_dav:version-url ++V 89 ++/!svn/ver/9646/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_bno ++END ++profile_vogtland ++K 25 ++svn:wc:ra_dav:version-url ++V 94 ++/!svn/ver/9663/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_vogtland ++END ++profile_aachen ++K 25 ++svn:wc:ra_dav:version-url ++V 92 ++/!svn/ver/7602/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_aachen ++END ++profile_duesseldorf ++K 25 ++svn:wc:ra_dav:version-url ++V 97 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_duesseldorf ++END ++profile_franken ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/8672/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_franken ++END ++profile_arig_tel-aviv ++K 25 ++svn:wc:ra_dav:version-url ++V 99 ++/!svn/ver/8871/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_arig_tel-aviv ++END ++profile_carbodebit ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/!svn/ver/7576/luci/trunk/contrib/package/community-profiles/files/etc/config/profile_carbodebit ++END +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/entries b/feeds/luci/community-profiles/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..ca7a12b +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/entries +@@ -0,0 +1,1354 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/community-profiles/files/etc/config ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:56:59.093371Z ++9675 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++profile_pberg ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++e12899c69f1fc10e3c4e72d487a2a144 ++2013-01-26T01:06:29.897494Z ++9646 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1099 ++ ++profile_marburg ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++6095cb6a0893bba4523c24f5c8718dd8 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++389 ++ ++profile_gadow ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++ddc282bffa7ef87d4d3442213cc26adf ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++431 ++ ++profile_stuttgart ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++9fa1e2185a4ed264c854c4acaddc970e ++2012-02-21T09:40:50.218452Z ++8315 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++455 ++ ++profile_potsdam ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++abcd5f26f79f13b8192159729af0074a ++2011-11-09T12:40:04.837031Z ++7905 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++416 ++ ++profile_evernet ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++11972101b2507d0059ac681498a1b1da ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++658 ++ ++profile_Freifunk ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++bd65527276ff64be9240af6795405072 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++294 ++ ++profile_berlin ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++cef3b794508f1583ea32c50a9947e090 ++2013-01-26T01:06:29.897494Z ++9646 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1085 ++ ++profile_jena ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++ccf4bdf4818c33d7d7b78ef85d398c26 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++400 ++ ++profile_bergischesland ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++4c9f4ac80a8641d808c9d43773e0b2b4 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++460 ++ ++profile_augsburg ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++9f30294674da04ef3893c6b011acbe68 ++2013-02-28T19:56:59.093371Z ++9675 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1873 ++ ++profile_hannover ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++c970f9cb897036a2b21b48ad077f9f17 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++388 ++ ++profile_oldenburg ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++e5e46dd20e6ae44b729f2281ad7c44ae ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++447 ++ ++profile_rosbach ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++c8864dc84cc27f5ea5bf440d0c08c864 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++429 ++ ++profile_heppenheim ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++5af311689f17a70b5d53b283be06d41a ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++330 ++ ++profile_bayreuth ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++67cf45182c7e18a6e4fa0b44b6831821 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++622 ++ ++profile_weimar ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++c6ede6881410c8439624059d51644461 ++2012-07-09T05:53:28.947144Z ++8876 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++320 ++ ++profile_wlanljubljana ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++6763f63a957e688b431baff30cdf7566 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++431 ++ ++profile_openwireless_bern ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b282fc74e7eabcac65c88ced1f631084 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++481 ++ ++profile_halle ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++688a4cf675e761a30627bebdb33b9930 ++2012-04-11T17:29:40.023109Z ++8555 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++469 ++ ++profile_bensheim ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++95de9c97f6e71754cc4210d570c5fc34 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++322 ++ ++profile_neuss ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++65930daadf8c92cf708f97e47c54ac6d ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++437 ++ ++profile_weinstadt ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++fd2d7db3de33a18c8c5fbe34496ef14c ++2012-02-21T17:02:31.529226Z ++8319 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++539 ++ ++profile_leipzig ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++1a6c7f79628a3a12b5b5c0943c432a76 ++2013-01-31T23:41:04.326329Z ++9664 ++ufo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1142 ++ ++profile_arig_neot_semadar ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++3bd49803ea3913c146ee8af2b1425d24 ++2012-07-05T04:37:12.085029Z ++8871 ++dgolle ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++686 ++ ++profile_guifibages ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++fd46c61019ed89bed89e701df618480b ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++647 ++ ++profile_piraten_dresden ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++5a53edfea6cf4a62ad25a26cffb93823 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++384 ++ ++profile_kiberpipa ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++04b97c7349c7ad54c52e8a81cde0f4af ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++454 ++ ++profile_seefeld ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++6aae9ee885816d7743a4c7a92001d90a ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++429 ++ ++profile_l59 ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a8b741ac300a56ee30d03bb9d58f8172 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++371 ++ ++profile_arig_arad ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++15cc75a633ebcd8eb11bdb40b267df4c ++2012-07-05T04:37:12.085029Z ++8871 ++dgolle ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++667 ++ ++profile_mainz ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++1886418094b877686a2654e96e28c8ac ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++435 ++ ++profile_bno ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++d84ed12ddc24e9fac48d51922d250cd7 ++2013-01-26T01:06:29.897494Z ++9646 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1109 ++ ++profile_vogtland ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++5806a2d3788114771738a3b55dc7110b ++2013-01-30T23:27:36.775813Z ++9663 ++ufo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++458 ++ ++profile_aachen ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b54a2c602cd094b27961e0577381a8de ++2011-10-02T21:03:09.159059Z ++7602 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++330 ++ ++profile_duesseldorf ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++e853ede9c193c6dbcf04c80030187d7c ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++454 ++ ++profile_franken ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++8eedfcc97a364141c7e8af8961e0a224 ++2012-05-03T13:22:06.092118Z ++8672 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++532 ++ ++profile_arig_tel-aviv ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++8611514ab0819a29f9d057c0f5942b88 ++2012-07-05T04:37:12.085029Z ++8871 ++dgolle ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++673 ++ ++profile_carbodebit ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++4e2500bd35760c0bdac5dd82839a82d9 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++594 ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_Freifunk.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_Freifunk.svn-base +new file mode 100644 +index 0000000..b8f445a +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_Freifunk.svn-base +@@ -0,0 +1,10 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk' ++ option 'homepage' 'http://freifunk.net' ++ option 'ssid' 'www.freifunk.net' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '52.000' ++ option 'longitude' '10.000' ++ option 'splash_prefix' '28' ++ option 'mesh_network' '10.0.0.0/8' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_aachen.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_aachen.svn-base +new file mode 100644 +index 0000000..cc643e1 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_aachen.svn-base +@@ -0,0 +1,10 @@ ++config 'community' 'profile' ++ option 'name' 'Aachen' ++ option 'homepage' 'http://aachen.freifunk.net' ++ option 'ssid' 'aachen.freifunk.net' ++ option 'suffix' 'ffac' ++ option 'latitude' '50.77900' ++ option 'longitude' '6.05399' ++ option 'mesh_network' '10.90.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '28' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_arad.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_arad.svn-base +new file mode 100644 +index 0000000..55d012f +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_arad.svn-base +@@ -0,0 +1,22 @@ ++config 'community' 'profile' ++ option 'name' 'arig Arad' ++ option 'homepage' 'http://arig.org.il' ++ option 'ssid' 'arig.org.il' ++ option 'latitude' '31.26' ++ option 'longitude' '35.21' ++ option 'splash_prefix' '28' ++ option 'suffix' 'arig' ++ option 'mesh_network' '10.81.8.0/22' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'IL' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_neot_semadar.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_neot_semadar.svn-base +new file mode 100644 +index 0000000..062b18e +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_neot_semadar.svn-base +@@ -0,0 +1,22 @@ ++config 'community' 'profile' ++ option 'name' 'arig Neot Semadar' ++ option 'homepage' 'http://www.neot-semadar.com' ++ option 'ssid' 'arig.org.il' ++ option 'latitude' '30.05' ++ option 'longitude' '35.02' ++ option 'splash_prefix' '272' ++ option 'suffix' 'arig' ++ option 'mesh_network' '10.81.12.0/22' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'IL' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_tel-aviv.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_tel-aviv.svn-base +new file mode 100644 +index 0000000..fe7df22 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_arig_tel-aviv.svn-base +@@ -0,0 +1,22 @@ ++config 'community' 'profile' ++ option 'name' 'arig Tel Aviv' ++ option 'homepage' 'http://arig.org.il' ++ option 'ssid' 'arig.org.il' ++ option 'latitude' '32.056' ++ option 'longitude' '34.772' ++ option 'splash_prefix' '28' ++ option 'suffix' 'arig' ++ option 'mesh_network' '10.81.0.0/21' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'IL' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_augsburg.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_augsburg.svn-base +new file mode 100644 +index 0000000..04d5398 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_augsburg.svn-base +@@ -0,0 +1,64 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Augsburg' ++ option 'homepage' 'http://augsburg.freifunk.net' ++ option 'ssid' 'augsburg.freifunk.net' ++ option 'mesh_network' '10.11.0.0/18' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '48.37071' ++ option 'longitude' '10.89475' ++ option 'suffix' 'ffa' ++ option 'splash_prefix' '27' ++ option 'ipv6' '1' ++ option 'ipv6_config' 'auto-ipv6-fromv4' ++ option 'ipv6_prefix' 'fdca:ffee:ffa::/48' ++ option 'extrapackages' 'luci-app-owm luci-app-owm-ant luci-app-owm-cmd luci-app-owm-gui' ++ list mapserver 'http://openwifimap.net/openwifimap/' ++ list mapserver 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.192.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'luci_splash' ++ option 'limit_up' '20' ++ option 'limit_down' '20' ++ ++config widget 'customindex' ++ option enabled '1' ++ option width '50%' ++ option paddingright '5%' ++ option template 'html' ++ ++config widget 'rssffa' ++ option enabled '1' ++ option max '10' ++ option cache '3600' ++ option width '50%' ++ option title 'Freifunk Augsburg Blog' ++ option template 'rssfeed' ++ option url 'http://augsburg.freifunk.net/blog?type=100' ++ ++config widget 'rssaugsburg' ++ option cache '3600' ++ option width '50%' ++ option title 'Augsburger Blogs' ++ option template 'rssfeed' ++ option enabled '1' ++ option max '10' ++ option url 'http://wgaugsburg.de/augsburg/rss20.xml' ++ ++config widget 'search' ++ option template 'search' ++ option title 'Search' ++ option enabled '1' ++ option width '50%' ++ list engine 'Google|http://www.google.de/search?q=' ++ list engine 'Freifunk Augsburg|http://www.google.de/search?q=site:augsburg.freifunk.net+' ++ list engine 'Freifunk Wiki|http://wiki.freifunk.net/index.php?search=' ++ ++config widget 'clear1' ++ option template 'clear' ++ option enabled '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bayreuth.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bayreuth.svn-base +new file mode 100644 +index 0000000..90fccbd +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bayreuth.svn-base +@@ -0,0 +1,20 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Bayreuth' ++ option 'homepage' 'http://bayreuth.freifunk.net' ++ option 'ssid' 'bayreuth.freifunk.net' ++ option 'mesh_network' '10.195.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '49.945812' ++ option 'longitude' '11.575045' ++ option 'suffix' 'ffbt' ++ option 'splash_prefix' '28' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.192.0' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '4' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '42:CA:FF:EE:BA:BE' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bensheim.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bensheim.svn-base +new file mode 100644 +index 0000000..48c1d47 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bensheim.svn-base +@@ -0,0 +1,9 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Bensheim' ++ option 'homepage' 'http://bensheim.freifunk.net' ++ option 'ssid' 'bensheim.freifunk.net' ++ option 'mesh_network' '10.49.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '49.63939' ++ option 'longitude' '8.633718' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bergischesland.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bergischesland.svn-base +new file mode 100644 +index 0000000..0de4543 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bergischesland.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Piratenfreifunk Bergisches Land' ++ option 'homepage' 'http://www.piraten-bergisches-land.de' ++ option 'ssid' 'PiratenfunkBL' ++ option 'mesh_network' '10.3.0.0/16' ++ option 'splash_network' '192.168.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.26849' ++ option 'longitude' '7.19476' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '11' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:40:00:42:42:42' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_berlin.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_berlin.svn-base +new file mode 100644 +index 0000000..be31e94 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_berlin.svn-base +@@ -0,0 +1,36 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Berlin' ++ option 'homepage' 'http://berlin.freifunk.net' ++ option 'ssid' 'olsr.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.52075' ++ option 'longitude' '13.40948' ++ list 'mapserver' 'http://openwifimap.net/openwifimap/' ++ list 'mapserver' 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'olsr_interface' ++ option 'Ip4Broadcast' '255.255.255.255' ++ option 'HelloInterval' '3.0' ++ option 'HelloValidityTime' '125.0' ++ option 'TcInterval' '2.0' ++ option 'TcValidityTime' '500.0' ++ option 'MidInterval' '25.0' ++ option 'MidValidityTime' '500.0' ++ option 'HnaInterval' '10.0' ++ option 'HnaValidityTime' '125.0' ++ ++config 'defaults' 'olsrd' ++ option 'AllowNoInt' 'yes' ++ option 'FIBMetric' 'flat' ++ option 'Pollrate' '0.025' ++ option 'TcRedundancy' '2' ++ option 'NatThreshold' '0.75' ++ option 'LinkQualityAlgorithm' 'etx_ff' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bno.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bno.svn-base +new file mode 100644 +index 0000000..0699552 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_bno.svn-base +@@ -0,0 +1,37 @@ ++config 'community' 'profile' ++ option 'name' 'Berlin NordOst' ++ option 'homepage' 'http://www.freifunk-bno.de/' ++ option 'ssid' 'olsr.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.55010' ++ option 'longitude' '13.45889' ++ option 'suffix' 'olsr' ++ list 'mapserver' 'http://openwifimap.net/openwifimap/' ++ list 'mapserver' 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'olsr_interface' ++ option 'Ip4Broadcast' '255.255.255.255' ++ option 'HelloInterval' '3.0' ++ option 'HelloValidityTime' '125.0' ++ option 'TcInterval' '2.0' ++ option 'TcValidityTime' '500.0' ++ option 'MidInterval' '25.0' ++ option 'MidValidityTime' '500.0' ++ option 'HnaInterval' '10.0' ++ option 'HnaValidityTime' '125.0' ++ ++config 'defaults' 'olsrd' ++ option 'AllowNoInt' 'yes' ++ option 'FIBMetric' 'flat' ++ option 'Pollrate' '0.025' ++ option 'TcRedundancy' '2' ++ option 'NatThreshold' '0.75' ++ option 'LinkQualityAlgorithm' 'etx_ff' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_carbodebit.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_carbodebit.svn-base +new file mode 100644 +index 0000000..0b263f9 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_carbodebit.svn-base +@@ -0,0 +1,23 @@ ++config 'community' 'profile' ++ option 'name' 'carbodebit' ++ option 'homepage' 'http://carbodebit.net' ++ option 'ssid' 'VHDCARBES' ++ option 'mesh_network' '10.72.1.0/24' ++ option 'latitude' '43.633683' ++ option 'longitude' '2.160894' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'DE:78:70:E4:FA:B8' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.255.0' ++ option 'dns' '10.70.1.1 213.190.64.170 213.190.64.166' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '11' ++ option 'country' 'FR' ++ option 'distance' '2000' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' 'DE:78:70:E4:FA:B8' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_duesseldorf.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_duesseldorf.svn-base +new file mode 100644 +index 0000000..cb36aab +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_duesseldorf.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Duesseldorf' ++ option 'homepage' 'http://freifunk-duesseldorf.de' ++ option 'ssid' 'duesseldorf.freifunk.net' ++ option 'mesh_network' '10.40.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.217812' ++ option 'longitude' '6.761564' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '3' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_evernet.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_evernet.svn-base +new file mode 100644 +index 0000000..0545360 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_evernet.svn-base +@@ -0,0 +1,25 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Evernet eG' ++ option 'homepage' 'http://www.evernet-eg.de' ++ option 'ssid' 'evernet.freifunk.net' ++ option 'mesh_network' '10.0.0.0/8' ++ option 'latitude' '51.15692062509162' ++ option 'longitude' '10.716041922569275' ++ option 'suffix' 'evernet' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' '02:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'DE' ++ option 'txpower' '19' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ option 'noscan' '0' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_franken.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_franken.svn-base +new file mode 100644 +index 0000000..c999ac4 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_franken.svn-base +@@ -0,0 +1,19 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Franken' ++ option 'homepage' 'http://franken.freifunk.net' ++ option 'ssid' 'franken.freifunk.net' ++ option 'mesh_network' '10.50.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '49.506485' ++ option 'longitude' '11.013565' ++ option 'splash_prefix' '27' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'luci_splash' ++ option 'limit_up' '40' ++ option 'limit_down' '40' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_gadow.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_gadow.svn-base +new file mode 100644 +index 0000000..79466f1 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_gadow.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Gadow' ++ option 'homepage' 'http://gadow.freifunk.net' ++ option 'ssid' 'gadow.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.61.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '53.11' ++ option 'longitude' '12.61' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_guifibages.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_guifibages.svn-base +new file mode 100644 +index 0000000..a0fc4fc +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_guifibages.svn-base +@@ -0,0 +1,19 @@ ++config 'community' 'profile' ++ option 'name' 'Guifi Bages' ++ option 'homepage' 'http://guifi.net/PlaBages' ++ option 'ssid' 'guifibages' ++ option 'mesh_network' '10.224.3.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'theme' 'luci-theme-freifunk-generic' ++ option 'latitude' '41.718437' ++ option 'longitude' '1.826477' ++ option 'suffix' 'guifibages.cat' ++ option 'splash_prefix' '27' ++ option 'extrapackages' 'luci-app-olsr-viz luci-i18n-catalan' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' '12:34:56:78:9a:bc' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_halle.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_halle.svn-base +new file mode 100644 +index 0000000..559d581 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_halle.svn-base +@@ -0,0 +1,17 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Halle' ++ option 'homepage' 'http://freifunk-halle.net' ++ option 'ssid' 'halle.freifunk.net' ++ option 'mesh_network' '104.62.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.47911' ++ option 'longitude' '11.96901' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' '02:CA:FF:EE:BA:BE' ++ ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_hannover.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_hannover.svn-base +new file mode 100644 +index 0000000..008b6c7 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_hannover.svn-base +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Hannover' ++ option 'homepage' 'http://hannover.freifunk.net' ++ option 'ssid' 'hannover.freifunk.net' ++ option 'mesh_network' '10.2.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.38427' ++ option 'longitude' '9.74359' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'CA:FF:EE:CA:FF:EE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_heppenheim.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_heppenheim.svn-base +new file mode 100644 +index 0000000..a830494 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_heppenheim.svn-base +@@ -0,0 +1,9 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Heppenheim' ++ option 'homepage' 'http://heppenheim.freifunk.net' ++ option 'ssid' 'heppenheim.freifunk.net' ++ option 'mesh_network' '10.48.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.151786' ++ option 'longitude' '10.415039' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_jena.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_jena.svn-base +new file mode 100644 +index 0000000..5741d09 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_jena.svn-base +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Jena' ++ option 'homepage' 'http://www.freifunk-jena.de' ++ option 'ssid' 'www.freifunk-jena.de' ++ option 'mesh_network' '10.127.0.0/20' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '29' ++ option 'latitude' '50.92779' ++ option 'longitude' '11.58431' ++ ++config 'defaults' 'interface' ++ option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_kiberpipa.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_kiberpipa.svn-base +new file mode 100644 +index 0000000..c2a96e4 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_kiberpipa.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Kiberpipa.net' ++ option 'homepage' 'http://www.kiberpipa.net' ++ option 'ssid' 'open.kiberpipa.net' ++ option 'mesh_network' '10.14.0.0/16' ++ option 'splash_network' '10.14.128.0/17' ++ option 'splash_prefix' '27' ++ option 'latitude' '46.05063' ++ option 'longitude' '14.50402' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '8' ++ ++config 'defaults' 'interface' ++ option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_l59.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_l59.svn-base +new file mode 100644 +index 0000000..6185f02 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_l59.svn-base +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk L59' ++ option 'homepage' 'http://freifunk.net' ++ option 'ssid' 'start.freifunk.net' ++ option 'mesh_network' '104.59.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.26337' ++ option 'longitude' '10.52103' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_leipzig.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_leipzig.svn-base +new file mode 100644 +index 0000000..28151ba +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_leipzig.svn-base +@@ -0,0 +1,44 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Leipzig' ++ option 'homepage' 'http://leipzig.freifunk.net' ++ option 'ssid' 'leipzig.freifunk.net' ++ option 'mesh_network' '104.61.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.33348' ++ option 'longitude' '12.40297' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ ++config widget 'customindex' ++ option enabled '1' ++ option width '50%' ++ option paddingright '5%' ++ option template 'html' ++ ++config widget 'rssffl' ++ option enabled '1' ++ option max '10' ++ option cache '3600' ++ option width '50%' ++ option title 'interner Freifunk Leipzig Blog' ++ option template 'rssfeed' ++ option url 'http://104.61.0.101/wordpress/' ++ ++config widget 'rssbundesweit' ++ option cache '3600' ++ option width '50%' ++ option title 'bundesweiter Freifunk Blog' ++ option template 'rssfeed' ++ option enabled '1' ++ option max '10' ++ option url 'http://blog.freifunk.net/rss.xml' ++ ++ ++config widget 'clear1' ++ option template 'clear' ++ option enabled '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_mainz.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_mainz.svn-base +new file mode 100644 +index 0000000..2d08618 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_mainz.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Mainz' ++ option 'homepage' 'http://mainz.freifunk.net' ++ option 'ssid' 'mainz.freifunk.net' ++ option 'mesh_network' '10.37.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '49.99635' ++ option 'longitude' '8.27417' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:ca:ff:ee:ba:be' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_marburg.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_marburg.svn-base +new file mode 100644 +index 0000000..18cff80 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_marburg.svn-base +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Marburg' ++ option 'homepage' ' http://marburg.freifunk.de' ++ option 'ssid' 'marburg.freifunk.net' ++ option 'mesh_network' '10.128.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '29' ++ option 'latitude' '49.63939' ++ option 'longitude' '8.633718' ++ ++config 'defaults' 'interface' ++ option 'dns' '8.8.8.8 212.204.49.83' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_neuss.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_neuss.svn-base +new file mode 100644 +index 0000000..8e30617 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_neuss.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Neuss' ++ option 'homepage' 'http://neuss.freifunk.net' ++ option 'ssid' 'neuss.freifunk.net' ++ option 'mesh_network' '172.28.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.19045' ++ option 'longitude' '6.69471' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '11' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'DE:AD:BE:EF:CA:FE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_oldenburg.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_oldenburg.svn-base +new file mode 100644 +index 0000000..e967fdb +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_oldenburg.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Oldenburg' ++ option 'homepage' 'http://oldenburg.freifunk.net' ++ option 'ssid' 'oldenburg.freifunk.net' ++ option 'mesh_network' '10.18.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '53.14083' ++ option 'longitude' '8.21314' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '6' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_openwireless_bern.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_openwireless_bern.svn-base +new file mode 100644 +index 0000000..810ad8f +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_openwireless_bern.svn-base +@@ -0,0 +1,18 @@ ++config 'community' 'profile' ++ option 'name' 'Openwireless Bern' ++ option 'homepage' 'http://bern.openwireless.ch/' ++ option 'ssid' 'www.openwireless.ch' ++ option 'mesh_network' '10.247.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '50.814788' ++ option 'longitude' '8.769239' ++ ++config 'defaults' 'interface' ++ option 'dns' '208.67.222.222 208.67.220.220' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ option 'country' '756' ++ ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_pberg.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_pberg.svn-base +new file mode 100644 +index 0000000..cb620f6 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_pberg.svn-base +@@ -0,0 +1,37 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Berlin Prenzlauer Berg' ++ option 'homepage' 'http://pberg.freifunk.net' ++ option 'ssid' 'olsr.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.5427' ++ option 'longitude' '13.4172' ++ list 'mapserver' 'http://openwifimap.net/openwifimap/' ++ list 'mapserver' 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'olsr_interface' ++ option 'Ip4Broadcast' '255.255.255.255' ++ option 'HelloInterval' '3.0' ++ option 'HelloValidityTime' '125.0' ++ option 'TcInterval' '2.0' ++ option 'TcValidityTime' '500.0' ++ option 'MidInterval' '25.0' ++ option 'MidValidityTime' '500.0' ++ option 'HnaInterval' '10.0' ++ option 'HnaValidityTime' '125.0' ++ ++config 'defaults' 'olsrd' ++ option 'AllowNoInt' 'yes' ++ option 'FIBMetric' 'flat' ++ option 'Pollrate' '0.025' ++ option 'TcRedundancy' '2' ++ option 'NatThreshold' '0.75' ++ option 'LinkQualityAlgorithm' 'etx_ff' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_piraten_dresden.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_piraten_dresden.svn-base +new file mode 100644 +index 0000000..2af0e31 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_piraten_dresden.svn-base +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Piratenfreifunk Dresden' ++ option 'homepage' 'http://www.piraten-sachsen.de/' ++ option 'ssid' 'dresden.freifunk.net' ++ option 'mesh_network' '10.12.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.05081' ++ option 'longitude' '13.73420' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_potsdam.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_potsdam.svn-base +new file mode 100644 +index 0000000..458b18b +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_potsdam.svn-base +@@ -0,0 +1,13 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Potsdam' ++ option 'homepage' 'http://potsdam.freifunk.net' ++ option 'ssid' 'www.freifunk-potsdam.de' ++ option 'mesh_network' '10.22.0.0/16' ++ option 'splash_network' '192.168.22.0/24' ++ option 'splash_prefix' '24' ++ option 'latitude' '52.39349' ++ option 'longitude' '13.06489' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'bssid' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_rosbach.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_rosbach.svn-base +new file mode 100644 +index 0000000..4444f70 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_rosbach.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Rosbach' ++ option 'homepage' 'freifunk-rosbach.de' ++ option 'ssid' 'rosbach.freifunk.net' ++ option 'mesh_network' '10.212.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '50.18' ++ option 'longitude' '8.42' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'D2:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_seefeld.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_seefeld.svn-base +new file mode 100644 +index 0000000..5d03f7d +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_seefeld.svn-base +@@ -0,0 +1,13 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Seefeld' ++ option 'homepage' 'http://wiki.freifunk.net/Seefeld.freifunk.net' ++ option 'ssid' 'seefeld.freifunk.net' ++ option 'mesh_network' '10.111.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '48.03485' ++ option 'longitude' '11.21279' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' ++ option 'bssid' '02:CA:FF:EE:BA:BB' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_stuttgart.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_stuttgart.svn-base +new file mode 100644 +index 0000000..28d60d8 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_stuttgart.svn-base +@@ -0,0 +1,13 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Stuttgart' ++ option 'homepage' 'http://freifunk-stuttgart.de' ++ option 'ssid' 'Freifunk Stuttgart' ++ option 'mesh_network' '172.21.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '48' ++ option 'longitude' '9' ++ option 'splash_prefix' '27' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '5' ++ option 'bssid' '52:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_vogtland.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_vogtland.svn-base +new file mode 100644 +index 0000000..4df8253 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_vogtland.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Vogtland' ++ option 'homepage' 'http://wiki.freifunk.net/Freifunk_Vogtland' ++ option 'ssid' 'vogtland.freifunk.net' ++ option 'mesh_network' '10.204.0.0/16' ++ option 'splash_network' '6.204.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '53.11' ++ option 'longitude' '12.61' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_weimar.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_weimar.svn-base +new file mode 100644 +index 0000000..65938e7 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_weimar.svn-base +@@ -0,0 +1,10 @@ ++config 'community' 'profile' ++ option 'name' 'Weimarnetz e.V.' ++ option 'homepage' 'http://www.weimarnetz.de' ++ option 'ssid' 'weimarnetz' ++ option 'mesh_network' '10.63.0.0/16' ++ option 'latitude' '50.989530' ++ option 'longitude' '11.338675' ++ ++config 'defaults' 'interface' ++ option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_weinstadt.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_weinstadt.svn-base +new file mode 100644 +index 0000000..51f3eab +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_weinstadt.svn-base +@@ -0,0 +1,16 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Weinstadt' ++ option 'homepage' 'http://freifunk-weinstadt.de' ++ option 'ssid' 'freifunk-weinstadt' ++ option 'mesh_network' '172.21.0.0/16' ++ option 'splash_network' '172.21.85.0/30' ++ option 'latitude' '48.81' ++ option 'longitude' '9.39' ++ option 'splash_prefix' '30' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '5' ++ option 'bssid' '02:07:01:03:08:04' ++ ++config 'defaults' 'bssidscheme' ++ option '5' '02:07:01:03:08:04' +diff --git a/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_wlanljubljana.svn-base b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_wlanljubljana.svn-base +new file mode 100644 +index 0000000..eeefbd2 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/.svn/text-base/profile_wlanljubljana.svn-base +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'wlan ljubljana' ++ option 'homepage' 'http://wlan-lj.net' ++ option 'ssid' 'open.wlan-lj.net' ++ option 'mesh_network' '10.254.0.0/16' ++ option 'splash_network' '10.254.120.0/21' ++ option 'splash_prefix' '27' ++ option 'latitude' '46.05063' ++ option 'longitude' '14.50402' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '8' ++ ++config 'defaults' 'interface' ++ option 'dns' '10.254.0.1 10.254.0.2' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_Freifunk b/feeds/luci/community-profiles/files/etc/config/profile_Freifunk +new file mode 100644 +index 0000000..b8f445a +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_Freifunk +@@ -0,0 +1,10 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk' ++ option 'homepage' 'http://freifunk.net' ++ option 'ssid' 'www.freifunk.net' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '52.000' ++ option 'longitude' '10.000' ++ option 'splash_prefix' '28' ++ option 'mesh_network' '10.0.0.0/8' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_aachen b/feeds/luci/community-profiles/files/etc/config/profile_aachen +new file mode 100644 +index 0000000..cc643e1 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_aachen +@@ -0,0 +1,10 @@ ++config 'community' 'profile' ++ option 'name' 'Aachen' ++ option 'homepage' 'http://aachen.freifunk.net' ++ option 'ssid' 'aachen.freifunk.net' ++ option 'suffix' 'ffac' ++ option 'latitude' '50.77900' ++ option 'longitude' '6.05399' ++ option 'mesh_network' '10.90.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '28' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_arig_arad b/feeds/luci/community-profiles/files/etc/config/profile_arig_arad +new file mode 100644 +index 0000000..55d012f +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_arig_arad +@@ -0,0 +1,22 @@ ++config 'community' 'profile' ++ option 'name' 'arig Arad' ++ option 'homepage' 'http://arig.org.il' ++ option 'ssid' 'arig.org.il' ++ option 'latitude' '31.26' ++ option 'longitude' '35.21' ++ option 'splash_prefix' '28' ++ option 'suffix' 'arig' ++ option 'mesh_network' '10.81.8.0/22' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'IL' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_arig_neot_semadar b/feeds/luci/community-profiles/files/etc/config/profile_arig_neot_semadar +new file mode 100644 +index 0000000..062b18e +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_arig_neot_semadar +@@ -0,0 +1,22 @@ ++config 'community' 'profile' ++ option 'name' 'arig Neot Semadar' ++ option 'homepage' 'http://www.neot-semadar.com' ++ option 'ssid' 'arig.org.il' ++ option 'latitude' '30.05' ++ option 'longitude' '35.02' ++ option 'splash_prefix' '272' ++ option 'suffix' 'arig' ++ option 'mesh_network' '10.81.12.0/22' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'IL' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_arig_tel-aviv b/feeds/luci/community-profiles/files/etc/config/profile_arig_tel-aviv +new file mode 100644 +index 0000000..fe7df22 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_arig_tel-aviv +@@ -0,0 +1,22 @@ ++config 'community' 'profile' ++ option 'name' 'arig Tel Aviv' ++ option 'homepage' 'http://arig.org.il' ++ option 'ssid' 'arig.org.il' ++ option 'latitude' '32.056' ++ option 'longitude' '34.772' ++ option 'splash_prefix' '28' ++ option 'suffix' 'arig' ++ option 'mesh_network' '10.81.0.0/21' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'IL' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_augsburg b/feeds/luci/community-profiles/files/etc/config/profile_augsburg +new file mode 100644 +index 0000000..04d5398 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_augsburg +@@ -0,0 +1,64 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Augsburg' ++ option 'homepage' 'http://augsburg.freifunk.net' ++ option 'ssid' 'augsburg.freifunk.net' ++ option 'mesh_network' '10.11.0.0/18' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '48.37071' ++ option 'longitude' '10.89475' ++ option 'suffix' 'ffa' ++ option 'splash_prefix' '27' ++ option 'ipv6' '1' ++ option 'ipv6_config' 'auto-ipv6-fromv4' ++ option 'ipv6_prefix' 'fdca:ffee:ffa::/48' ++ option 'extrapackages' 'luci-app-owm luci-app-owm-ant luci-app-owm-cmd luci-app-owm-gui' ++ list mapserver 'http://openwifimap.net/openwifimap/' ++ list mapserver 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.192.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ option '13' '13:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'luci_splash' ++ option 'limit_up' '20' ++ option 'limit_down' '20' ++ ++config widget 'customindex' ++ option enabled '1' ++ option width '50%' ++ option paddingright '5%' ++ option template 'html' ++ ++config widget 'rssffa' ++ option enabled '1' ++ option max '10' ++ option cache '3600' ++ option width '50%' ++ option title 'Freifunk Augsburg Blog' ++ option template 'rssfeed' ++ option url 'http://augsburg.freifunk.net/blog?type=100' ++ ++config widget 'rssaugsburg' ++ option cache '3600' ++ option width '50%' ++ option title 'Augsburger Blogs' ++ option template 'rssfeed' ++ option enabled '1' ++ option max '10' ++ option url 'http://wgaugsburg.de/augsburg/rss20.xml' ++ ++config widget 'search' ++ option template 'search' ++ option title 'Search' ++ option enabled '1' ++ option width '50%' ++ list engine 'Google|http://www.google.de/search?q=' ++ list engine 'Freifunk Augsburg|http://www.google.de/search?q=site:augsburg.freifunk.net+' ++ list engine 'Freifunk Wiki|http://wiki.freifunk.net/index.php?search=' ++ ++config widget 'clear1' ++ option template 'clear' ++ option enabled '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_bayreuth b/feeds/luci/community-profiles/files/etc/config/profile_bayreuth +new file mode 100644 +index 0000000..90fccbd +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_bayreuth +@@ -0,0 +1,20 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Bayreuth' ++ option 'homepage' 'http://bayreuth.freifunk.net' ++ option 'ssid' 'bayreuth.freifunk.net' ++ option 'mesh_network' '10.195.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '49.945812' ++ option 'longitude' '11.575045' ++ option 'suffix' 'ffbt' ++ option 'splash_prefix' '28' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.192.0' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '4' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '42:CA:FF:EE:BA:BE' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_bensheim b/feeds/luci/community-profiles/files/etc/config/profile_bensheim +new file mode 100644 +index 0000000..48c1d47 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_bensheim +@@ -0,0 +1,9 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Bensheim' ++ option 'homepage' 'http://bensheim.freifunk.net' ++ option 'ssid' 'bensheim.freifunk.net' ++ option 'mesh_network' '10.49.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '49.63939' ++ option 'longitude' '8.633718' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_bergischesland b/feeds/luci/community-profiles/files/etc/config/profile_bergischesland +new file mode 100644 +index 0000000..0de4543 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_bergischesland +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Piratenfreifunk Bergisches Land' ++ option 'homepage' 'http://www.piraten-bergisches-land.de' ++ option 'ssid' 'PiratenfunkBL' ++ option 'mesh_network' '10.3.0.0/16' ++ option 'splash_network' '192.168.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.26849' ++ option 'longitude' '7.19476' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '11' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:40:00:42:42:42' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_berlin b/feeds/luci/community-profiles/files/etc/config/profile_berlin +new file mode 100644 +index 0000000..be31e94 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_berlin +@@ -0,0 +1,36 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Berlin' ++ option 'homepage' 'http://berlin.freifunk.net' ++ option 'ssid' 'olsr.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.52075' ++ option 'longitude' '13.40948' ++ list 'mapserver' 'http://openwifimap.net/openwifimap/' ++ list 'mapserver' 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'olsr_interface' ++ option 'Ip4Broadcast' '255.255.255.255' ++ option 'HelloInterval' '3.0' ++ option 'HelloValidityTime' '125.0' ++ option 'TcInterval' '2.0' ++ option 'TcValidityTime' '500.0' ++ option 'MidInterval' '25.0' ++ option 'MidValidityTime' '500.0' ++ option 'HnaInterval' '10.0' ++ option 'HnaValidityTime' '125.0' ++ ++config 'defaults' 'olsrd' ++ option 'AllowNoInt' 'yes' ++ option 'FIBMetric' 'flat' ++ option 'Pollrate' '0.025' ++ option 'TcRedundancy' '2' ++ option 'NatThreshold' '0.75' ++ option 'LinkQualityAlgorithm' 'etx_ff' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_bno b/feeds/luci/community-profiles/files/etc/config/profile_bno +new file mode 100644 +index 0000000..0699552 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_bno +@@ -0,0 +1,37 @@ ++config 'community' 'profile' ++ option 'name' 'Berlin NordOst' ++ option 'homepage' 'http://www.freifunk-bno.de/' ++ option 'ssid' 'olsr.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.55010' ++ option 'longitude' '13.45889' ++ option 'suffix' 'olsr' ++ list 'mapserver' 'http://openwifimap.net/openwifimap/' ++ list 'mapserver' 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'olsr_interface' ++ option 'Ip4Broadcast' '255.255.255.255' ++ option 'HelloInterval' '3.0' ++ option 'HelloValidityTime' '125.0' ++ option 'TcInterval' '2.0' ++ option 'TcValidityTime' '500.0' ++ option 'MidInterval' '25.0' ++ option 'MidValidityTime' '500.0' ++ option 'HnaInterval' '10.0' ++ option 'HnaValidityTime' '125.0' ++ ++config 'defaults' 'olsrd' ++ option 'AllowNoInt' 'yes' ++ option 'FIBMetric' 'flat' ++ option 'Pollrate' '0.025' ++ option 'TcRedundancy' '2' ++ option 'NatThreshold' '0.75' ++ option 'LinkQualityAlgorithm' 'etx_ff' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_carbodebit b/feeds/luci/community-profiles/files/etc/config/profile_carbodebit +new file mode 100644 +index 0000000..0b263f9 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_carbodebit +@@ -0,0 +1,23 @@ ++config 'community' 'profile' ++ option 'name' 'carbodebit' ++ option 'homepage' 'http://carbodebit.net' ++ option 'ssid' 'VHDCARBES' ++ option 'mesh_network' '10.72.1.0/24' ++ option 'latitude' '43.633683' ++ option 'longitude' '2.160894' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'DE:78:70:E4:FA:B8' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.255.0' ++ option 'dns' '10.70.1.1 213.190.64.170 213.190.64.166' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '11' ++ option 'country' 'FR' ++ option 'distance' '2000' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' 'DE:78:70:E4:FA:B8' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_duesseldorf b/feeds/luci/community-profiles/files/etc/config/profile_duesseldorf +new file mode 100644 +index 0000000..cb36aab +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_duesseldorf +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Duesseldorf' ++ option 'homepage' 'http://freifunk-duesseldorf.de' ++ option 'ssid' 'duesseldorf.freifunk.net' ++ option 'mesh_network' '10.40.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.217812' ++ option 'longitude' '6.761564' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '3' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_evernet b/feeds/luci/community-profiles/files/etc/config/profile_evernet +new file mode 100644 +index 0000000..0545360 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_evernet +@@ -0,0 +1,25 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Evernet eG' ++ option 'homepage' 'http://www.evernet-eg.de' ++ option 'ssid' 'evernet.freifunk.net' ++ option 'mesh_network' '10.0.0.0/8' ++ option 'latitude' '51.15692062509162' ++ option 'longitude' '10.716041922569275' ++ option 'suffix' 'evernet' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' '02:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'country' 'DE' ++ option 'txpower' '19' ++ option 'beacon_int' '5000' ++ option 'distance' '1500' ++ option 'noscan' '0' ++ ++config 'defaults' 'wifi_iface' ++ option 'mcast_rate' '6000' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_franken b/feeds/luci/community-profiles/files/etc/config/profile_franken +new file mode 100644 +index 0000000..c999ac4 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_franken +@@ -0,0 +1,19 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Franken' ++ option 'homepage' 'http://franken.freifunk.net' ++ option 'ssid' 'franken.freifunk.net' ++ option 'mesh_network' '10.50.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '49.506485' ++ option 'longitude' '11.013565' ++ option 'splash_prefix' '27' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ ++config 'defaults' 'luci_splash' ++ option 'limit_up' '40' ++ option 'limit_down' '40' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_gadow b/feeds/luci/community-profiles/files/etc/config/profile_gadow +new file mode 100644 +index 0000000..79466f1 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_gadow +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Gadow' ++ option 'homepage' 'http://gadow.freifunk.net' ++ option 'ssid' 'gadow.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.61.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '53.11' ++ option 'longitude' '12.61' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_guifibages b/feeds/luci/community-profiles/files/etc/config/profile_guifibages +new file mode 100644 +index 0000000..a0fc4fc +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_guifibages +@@ -0,0 +1,19 @@ ++config 'community' 'profile' ++ option 'name' 'Guifi Bages' ++ option 'homepage' 'http://guifi.net/PlaBages' ++ option 'ssid' 'guifibages' ++ option 'mesh_network' '10.224.3.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'theme' 'luci-theme-freifunk-generic' ++ option 'latitude' '41.718437' ++ option 'longitude' '1.826477' ++ option 'suffix' 'guifibages.cat' ++ option 'splash_prefix' '27' ++ option 'extrapackages' 'luci-app-olsr-viz luci-i18n-catalan' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' '12:34:56:78:9a:bc' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_halle b/feeds/luci/community-profiles/files/etc/config/profile_halle +new file mode 100644 +index 0000000..559d581 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_halle +@@ -0,0 +1,17 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Halle' ++ option 'homepage' 'http://freifunk-halle.net' ++ option 'ssid' 'halle.freifunk.net' ++ option 'mesh_network' '104.62.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.47911' ++ option 'longitude' '11.96901' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ ++config 'defaults' 'bssidscheme' ++ option 'all' '02:CA:FF:EE:BA:BE' ++ ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_hannover b/feeds/luci/community-profiles/files/etc/config/profile_hannover +new file mode 100644 +index 0000000..008b6c7 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_hannover +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Hannover' ++ option 'homepage' 'http://hannover.freifunk.net' ++ option 'ssid' 'hannover.freifunk.net' ++ option 'mesh_network' '10.2.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.38427' ++ option 'longitude' '9.74359' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'CA:FF:EE:CA:FF:EE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_heppenheim b/feeds/luci/community-profiles/files/etc/config/profile_heppenheim +new file mode 100644 +index 0000000..a830494 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_heppenheim +@@ -0,0 +1,9 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Heppenheim' ++ option 'homepage' 'http://heppenheim.freifunk.net' ++ option 'ssid' 'heppenheim.freifunk.net' ++ option 'mesh_network' '10.48.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.151786' ++ option 'longitude' '10.415039' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_jena b/feeds/luci/community-profiles/files/etc/config/profile_jena +new file mode 100644 +index 0000000..5741d09 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_jena +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Jena' ++ option 'homepage' 'http://www.freifunk-jena.de' ++ option 'ssid' 'www.freifunk-jena.de' ++ option 'mesh_network' '10.127.0.0/20' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '29' ++ option 'latitude' '50.92779' ++ option 'longitude' '11.58431' ++ ++config 'defaults' 'interface' ++ option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_kiberpipa b/feeds/luci/community-profiles/files/etc/config/profile_kiberpipa +new file mode 100644 +index 0000000..c2a96e4 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_kiberpipa +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Kiberpipa.net' ++ option 'homepage' 'http://www.kiberpipa.net' ++ option 'ssid' 'open.kiberpipa.net' ++ option 'mesh_network' '10.14.0.0/16' ++ option 'splash_network' '10.14.128.0/17' ++ option 'splash_prefix' '27' ++ option 'latitude' '46.05063' ++ option 'longitude' '14.50402' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '8' ++ ++config 'defaults' 'interface' ++ option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_l59 b/feeds/luci/community-profiles/files/etc/config/profile_l59 +new file mode 100644 +index 0000000..6185f02 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_l59 +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk L59' ++ option 'homepage' 'http://freifunk.net' ++ option 'ssid' 'start.freifunk.net' ++ option 'mesh_network' '104.59.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.26337' ++ option 'longitude' '10.52103' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_leipzig b/feeds/luci/community-profiles/files/etc/config/profile_leipzig +new file mode 100644 +index 0000000..28151ba +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_leipzig +@@ -0,0 +1,44 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Leipzig' ++ option 'homepage' 'http://leipzig.freifunk.net' ++ option 'ssid' 'leipzig.freifunk.net' ++ option 'mesh_network' '104.61.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.33348' ++ option 'longitude' '12.40297' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' ++ ++config widget 'customindex' ++ option enabled '1' ++ option width '50%' ++ option paddingright '5%' ++ option template 'html' ++ ++config widget 'rssffl' ++ option enabled '1' ++ option max '10' ++ option cache '3600' ++ option width '50%' ++ option title 'interner Freifunk Leipzig Blog' ++ option template 'rssfeed' ++ option url 'http://104.61.0.101/wordpress/' ++ ++config widget 'rssbundesweit' ++ option cache '3600' ++ option width '50%' ++ option title 'bundesweiter Freifunk Blog' ++ option template 'rssfeed' ++ option enabled '1' ++ option max '10' ++ option url 'http://blog.freifunk.net/rss.xml' ++ ++ ++config widget 'clear1' ++ option template 'clear' ++ option enabled '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_mainz b/feeds/luci/community-profiles/files/etc/config/profile_mainz +new file mode 100644 +index 0000000..2d08618 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_mainz +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Mainz' ++ option 'homepage' 'http://mainz.freifunk.net' ++ option 'ssid' 'mainz.freifunk.net' ++ option 'mesh_network' '10.37.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '49.99635' ++ option 'longitude' '8.27417' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:ca:ff:ee:ba:be' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_marburg b/feeds/luci/community-profiles/files/etc/config/profile_marburg +new file mode 100644 +index 0000000..18cff80 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_marburg +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Marburg' ++ option 'homepage' ' http://marburg.freifunk.de' ++ option 'ssid' 'marburg.freifunk.net' ++ option 'mesh_network' '10.128.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '29' ++ option 'latitude' '49.63939' ++ option 'longitude' '8.633718' ++ ++config 'defaults' 'interface' ++ option 'dns' '8.8.8.8 212.204.49.83' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_neuss b/feeds/luci/community-profiles/files/etc/config/profile_neuss +new file mode 100644 +index 0000000..8e30617 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_neuss +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Neuss' ++ option 'homepage' 'http://neuss.freifunk.net' ++ option 'ssid' 'neuss.freifunk.net' ++ option 'mesh_network' '172.28.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.19045' ++ option 'longitude' '6.69471' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '11' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'DE:AD:BE:EF:CA:FE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_oldenburg b/feeds/luci/community-profiles/files/etc/config/profile_oldenburg +new file mode 100644 +index 0000000..e967fdb +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_oldenburg +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Oldenburg' ++ option 'homepage' 'http://oldenburg.freifunk.net' ++ option 'ssid' 'oldenburg.freifunk.net' ++ option 'mesh_network' '10.18.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '53.14083' ++ option 'longitude' '8.21314' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '6' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_openwireless_bern b/feeds/luci/community-profiles/files/etc/config/profile_openwireless_bern +new file mode 100644 +index 0000000..810ad8f +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_openwireless_bern +@@ -0,0 +1,18 @@ ++config 'community' 'profile' ++ option 'name' 'Openwireless Bern' ++ option 'homepage' 'http://bern.openwireless.ch/' ++ option 'ssid' 'www.openwireless.ch' ++ option 'mesh_network' '10.247.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '50.814788' ++ option 'longitude' '8.769239' ++ ++config 'defaults' 'interface' ++ option 'dns' '208.67.222.222 208.67.220.220' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ option 'country' '756' ++ ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_pberg b/feeds/luci/community-profiles/files/etc/config/profile_pberg +new file mode 100644 +index 0000000..cb620f6 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_pberg +@@ -0,0 +1,37 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Berlin Prenzlauer Berg' ++ option 'homepage' 'http://pberg.freifunk.net' ++ option 'ssid' 'olsr.freifunk.net' ++ option 'mesh_network' '104.0.0.0/8' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '52.5427' ++ option 'longitude' '13.4172' ++ list 'mapserver' 'http://openwifimap.net/openwifimap/' ++ list 'mapserver' 'http://map.pberg.freifunk.net/openwifimap/' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '10' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.0.0.0' ++ ++config 'defaults' 'olsr_interface' ++ option 'Ip4Broadcast' '255.255.255.255' ++ option 'HelloInterval' '3.0' ++ option 'HelloValidityTime' '125.0' ++ option 'TcInterval' '2.0' ++ option 'TcValidityTime' '500.0' ++ option 'MidInterval' '25.0' ++ option 'MidValidityTime' '500.0' ++ option 'HnaInterval' '10.0' ++ option 'HnaValidityTime' '125.0' ++ ++config 'defaults' 'olsrd' ++ option 'AllowNoInt' 'yes' ++ option 'FIBMetric' 'flat' ++ option 'Pollrate' '0.025' ++ option 'TcRedundancy' '2' ++ option 'NatThreshold' '0.75' ++ option 'LinkQualityAlgorithm' 'etx_ff' ++ +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_piraten_dresden b/feeds/luci/community-profiles/files/etc/config/profile_piraten_dresden +new file mode 100644 +index 0000000..2af0e31 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_piraten_dresden +@@ -0,0 +1,12 @@ ++config 'community' 'profile' ++ option 'name' 'Piratenfreifunk Dresden' ++ option 'homepage' 'http://www.piraten-sachsen.de/' ++ option 'ssid' 'dresden.freifunk.net' ++ option 'mesh_network' '10.12.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '51.05081' ++ option 'longitude' '13.73420' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_potsdam b/feeds/luci/community-profiles/files/etc/config/profile_potsdam +new file mode 100644 +index 0000000..458b18b +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_potsdam +@@ -0,0 +1,13 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Potsdam' ++ option 'homepage' 'http://potsdam.freifunk.net' ++ option 'ssid' 'www.freifunk-potsdam.de' ++ option 'mesh_network' '10.22.0.0/16' ++ option 'splash_network' '192.168.22.0/24' ++ option 'splash_prefix' '24' ++ option 'latitude' '52.39349' ++ option 'longitude' '13.06489' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ option 'bssid' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_rosbach b/feeds/luci/community-profiles/files/etc/config/profile_rosbach +new file mode 100644 +index 0000000..4444f70 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_rosbach +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Rosbach' ++ option 'homepage' 'freifunk-rosbach.de' ++ option 'ssid' 'rosbach.freifunk.net' ++ option 'mesh_network' '10.212.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '50.18' ++ option 'longitude' '8.42' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '13' ++ ++config 'defaults' 'wifi_iface' ++ option 'bssid' 'D2:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_seefeld b/feeds/luci/community-profiles/files/etc/config/profile_seefeld +new file mode 100644 +index 0000000..5d03f7d +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_seefeld +@@ -0,0 +1,13 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Seefeld' ++ option 'homepage' 'http://wiki.freifunk.net/Seefeld.freifunk.net' ++ option 'ssid' 'seefeld.freifunk.net' ++ option 'mesh_network' '10.111.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '48.03485' ++ option 'longitude' '11.21279' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' ++ option 'bssid' '02:CA:FF:EE:BA:BB' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_stuttgart b/feeds/luci/community-profiles/files/etc/config/profile_stuttgart +new file mode 100644 +index 0000000..28d60d8 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_stuttgart +@@ -0,0 +1,13 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Stuttgart' ++ option 'homepage' 'http://freifunk-stuttgart.de' ++ option 'ssid' 'Freifunk Stuttgart' ++ option 'mesh_network' '172.21.0.0/16' ++ option 'splash_network' '10.104.0.0/16' ++ option 'latitude' '48' ++ option 'longitude' '9' ++ option 'splash_prefix' '27' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '5' ++ option 'bssid' '52:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_vogtland b/feeds/luci/community-profiles/files/etc/config/profile_vogtland +new file mode 100644 +index 0000000..4df8253 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_vogtland +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Vogtland' ++ option 'homepage' 'http://wiki.freifunk.net/Freifunk_Vogtland' ++ option 'ssid' 'vogtland.freifunk.net' ++ option 'mesh_network' '10.204.0.0/16' ++ option 'splash_network' '6.204.0.0/16' ++ option 'splash_prefix' '27' ++ option 'latitude' '53.11' ++ option 'longitude' '12.61' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ ++config 'defaults' 'bssidscheme' ++ option '1' '02:CA:FF:EE:BA:BE' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_weimar b/feeds/luci/community-profiles/files/etc/config/profile_weimar +new file mode 100644 +index 0000000..65938e7 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_weimar +@@ -0,0 +1,10 @@ ++config 'community' 'profile' ++ option 'name' 'Weimarnetz e.V.' ++ option 'homepage' 'http://www.weimarnetz.de' ++ option 'ssid' 'weimarnetz' ++ option 'mesh_network' '10.63.0.0/16' ++ option 'latitude' '50.989530' ++ option 'longitude' '11.338675' ++ ++config 'defaults' 'interface' ++ option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_weinstadt b/feeds/luci/community-profiles/files/etc/config/profile_weinstadt +new file mode 100644 +index 0000000..51f3eab +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_weinstadt +@@ -0,0 +1,16 @@ ++config 'community' 'profile' ++ option 'name' 'Freifunk Weinstadt' ++ option 'homepage' 'http://freifunk-weinstadt.de' ++ option 'ssid' 'freifunk-weinstadt' ++ option 'mesh_network' '172.21.0.0/16' ++ option 'splash_network' '172.21.85.0/30' ++ option 'latitude' '48.81' ++ option 'longitude' '9.39' ++ option 'splash_prefix' '30' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '5' ++ option 'bssid' '02:07:01:03:08:04' ++ ++config 'defaults' 'bssidscheme' ++ option '5' '02:07:01:03:08:04' +diff --git a/feeds/luci/community-profiles/files/etc/config/profile_wlanljubljana b/feeds/luci/community-profiles/files/etc/config/profile_wlanljubljana +new file mode 100644 +index 0000000..eeefbd2 +--- /dev/null ++++ b/feeds/luci/community-profiles/files/etc/config/profile_wlanljubljana +@@ -0,0 +1,15 @@ ++config 'community' 'profile' ++ option 'name' 'wlan ljubljana' ++ option 'homepage' 'http://wlan-lj.net' ++ option 'ssid' 'open.wlan-lj.net' ++ option 'mesh_network' '10.254.0.0/16' ++ option 'splash_network' '10.254.120.0/21' ++ option 'splash_prefix' '27' ++ option 'latitude' '46.05063' ++ option 'longitude' '14.50402' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '8' ++ ++config 'defaults' 'interface' ++ option 'dns' '10.254.0.1 10.254.0.2' +diff --git a/feeds/luci/freifunk-common/.svn/all-wcprops b/feeds/luci/freifunk-common/.svn/all-wcprops +new file mode 100644 +index 0000000..aff8956 +--- /dev/null ++++ b/feeds/luci/freifunk-common/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 57 ++/!svn/ver/9644/luci/trunk/contrib/package/freifunk-common ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/!svn/ver/7771/luci/trunk/contrib/package/freifunk-common/Makefile ++END +diff --git a/feeds/luci/freifunk-common/.svn/entries b/feeds/luci/freifunk-common/.svn/entries +new file mode 100644 +index 0000000..02d491c +--- /dev/null ++++ b/feeds/luci/freifunk-common/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-24T09:45:56.612394Z ++9644 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++ipkg ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++2a6dd066109f68b62a2d4020fe3528b5 ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++824 ++ +diff --git a/feeds/luci/freifunk-common/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-common/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c15f02d +--- /dev/null ++++ b/feeds/luci/freifunk-common/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-common ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-common ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk common files ++endef ++ ++define Package/freifunk-common/description ++ Common files and scripts that are needed to run free wireless mesh networks. ++endef ++ ++define Package/luci-mod-freifunk/conffiles ++/etc/config/freifunk ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-common/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-common)) +diff --git a/feeds/luci/freifunk-common/Makefile b/feeds/luci/freifunk-common/Makefile +new file mode 100644 +index 0000000..c15f02d +--- /dev/null ++++ b/feeds/luci/freifunk-common/Makefile +@@ -0,0 +1,42 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-common ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-common ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk common files ++endef ++ ++define Package/freifunk-common/description ++ Common files and scripts that are needed to run free wireless mesh networks. ++endef ++ ++define Package/luci-mod-freifunk/conffiles ++/etc/config/freifunk ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-common/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-common)) +diff --git a/feeds/luci/freifunk-common/files/.svn/all-wcprops b/feeds/luci/freifunk-common/files/.svn/all-wcprops +new file mode 100644 +index 0000000..03255fe +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 63 ++/!svn/ver/9644/luci/trunk/contrib/package/freifunk-common/files ++END +diff --git a/feeds/luci/freifunk-common/files/.svn/entries b/feeds/luci/freifunk-common/files/.svn/entries +new file mode 100644 +index 0000000..6e8578d +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-24T09:45:56.612394Z ++9644 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++usr ++dir ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-common/files/etc/.svn/all-wcprops b/feeds/luci/freifunk-common/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..cae4af8 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 67 ++/!svn/ver/8775/luci/trunk/contrib/package/freifunk-common/files/etc ++END +diff --git a/feeds/luci/freifunk-common/files/etc/.svn/entries b/feeds/luci/freifunk-common/files/etc/.svn/entries +new file mode 100644 +index 0000000..82a1144 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/.svn/entries +@@ -0,0 +1,40 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-06-23T09:07:51.882810Z ++8775 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++rc.local.d ++dir ++ ++config ++dir ++ ++init.d ++dir ++ ++uci-defaults ++dir ++ +diff --git a/feeds/luci/freifunk-common/files/etc/config/.svn/all-wcprops b/feeds/luci/freifunk-common/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..3b01932 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/!svn/ver/7965/luci/trunk/contrib/package/freifunk-common/files/etc/config ++END ++freifunk ++K 25 ++svn:wc:ra_dav:version-url ++V 83 ++/!svn/ver/7965/luci/trunk/contrib/package/freifunk-common/files/etc/config/freifunk ++END +diff --git a/feeds/luci/freifunk-common/files/etc/config/.svn/entries b/feeds/luci/freifunk-common/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..cc02676 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/etc/config ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-11-18T10:45:29.189766Z ++7965 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++2a3599c33839933a0bd8d2956a8df9d7 ++2011-11-18T10:45:29.189766Z ++7965 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2860 ++ +diff --git a/feeds/luci/freifunk-common/files/etc/config/.svn/text-base/freifunk.svn-base b/feeds/luci/freifunk-common/files/etc/config/.svn/text-base/freifunk.svn-base +new file mode 100644 +index 0000000..935d624 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/config/.svn/text-base/freifunk.svn-base +@@ -0,0 +1,128 @@ ++package 'freifunk' ++ ++config 'public' 'contact' ++ option 'nickname' '' ++ option 'name' '' ++ option 'mail' '' ++ option 'phone' '' ++ option 'note' '' ++ ++config 'public' 'community' ++ option 'name' 'Freifunk' ++ option 'homepage' 'http://freifunk.net' ++ ++config 'fw_zone' 'zone_freifunk' ++ option 'name' 'freifunk' ++ option 'input' 'REJECT' ++ option 'forward' 'REJECT' ++ option 'output' 'ACCEPT' ++ ++config 'fw_rule' 'fficmp' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'icmp' ++ ++config 'fw_rule' 'ffhttp' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '80' ++ ++config 'fw_rule' 'ffhttps' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '443' ++ ++config 'fw_rule' 'ffssh' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '22' ++ ++config 'fw_rule' 'ffolsr' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'udp' ++ option 'dest_port' '698' ++ ++config 'fw_rule' 'ffwprobe' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '17990' ++ ++config 'fw_rule' 'ffdns' ++ option 'dest_port' '53' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'udp' ++ ++config 'fw_rule' 'ffdhcp' ++ option 'src_port' '68' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'dest_port' '67' ++ option 'proto' 'udp' ++ option 'leasetime' '30m' ++ ++config 'fw_rule' 'ffsplash' ++ option 'dest_port' '8082' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ ++config 'fw_forwarding' 'lanfffwd' ++ option 'src' 'lan' ++ option 'dest' 'freifunk' ++ ++config 'fw_forwarding' 'ffwanfwd' ++ option 'src' 'freifunk' ++ option 'dest' 'wan' ++ ++config 'fw_forwarding' 'fffwd' ++ option 'src' 'freifunk' ++ option 'dest' 'freifunk' ++ ++config 'include' 'freifunk' ++ option 'path' '/etc/firewall.freifunk' ++ ++config 'defaults' 'system' ++ option 'zonename' 'Europe/Berlin' ++ option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' ++ option 'diversity' '1' ++ option 'disabled' '0' ++ option 'country' 'DE' ++ option 'hwmode' '11g' ++ option 'distance' '1000' ++ ++config 'defaults' 'wifi_iface' ++ option 'mode' 'adhoc' ++ option 'encryption' 'none' ++ option 'bgscan' '0' ++ option 'bssid' '12:CA:FF:EE:BA:BE' ++ option 'sw_merge' '1' ++ option 'mcast_rate' '5500' ++ option 'probereq' '1' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1' ++ ++config 'defaults' 'alias' ++ option 'netmask' '255.255.255.0' ++ ++config 'defaults' 'dhcp' ++ option 'leasetime' '30m' ++ option 'force' '1' ++ ++config 'defaults' 'olsr_interfacedefaults' ++ option 'Ip4Broadcast' '255.255.255.255' ++ ++config 'defaults' 'upgrade' ++ option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots' ++ option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml' ++ +diff --git a/feeds/luci/freifunk-common/files/etc/config/freifunk b/feeds/luci/freifunk-common/files/etc/config/freifunk +new file mode 100644 +index 0000000..935d624 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/config/freifunk +@@ -0,0 +1,128 @@ ++package 'freifunk' ++ ++config 'public' 'contact' ++ option 'nickname' '' ++ option 'name' '' ++ option 'mail' '' ++ option 'phone' '' ++ option 'note' '' ++ ++config 'public' 'community' ++ option 'name' 'Freifunk' ++ option 'homepage' 'http://freifunk.net' ++ ++config 'fw_zone' 'zone_freifunk' ++ option 'name' 'freifunk' ++ option 'input' 'REJECT' ++ option 'forward' 'REJECT' ++ option 'output' 'ACCEPT' ++ ++config 'fw_rule' 'fficmp' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'icmp' ++ ++config 'fw_rule' 'ffhttp' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '80' ++ ++config 'fw_rule' 'ffhttps' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '443' ++ ++config 'fw_rule' 'ffssh' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '22' ++ ++config 'fw_rule' 'ffolsr' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'udp' ++ option 'dest_port' '698' ++ ++config 'fw_rule' 'ffwprobe' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ option 'dest_port' '17990' ++ ++config 'fw_rule' 'ffdns' ++ option 'dest_port' '53' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'udp' ++ ++config 'fw_rule' 'ffdhcp' ++ option 'src_port' '68' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'dest_port' '67' ++ option 'proto' 'udp' ++ option 'leasetime' '30m' ++ ++config 'fw_rule' 'ffsplash' ++ option 'dest_port' '8082' ++ option 'src' 'freifunk' ++ option 'target' 'ACCEPT' ++ option 'proto' 'tcp' ++ ++config 'fw_forwarding' 'lanfffwd' ++ option 'src' 'lan' ++ option 'dest' 'freifunk' ++ ++config 'fw_forwarding' 'ffwanfwd' ++ option 'src' 'freifunk' ++ option 'dest' 'wan' ++ ++config 'fw_forwarding' 'fffwd' ++ option 'src' 'freifunk' ++ option 'dest' 'freifunk' ++ ++config 'include' 'freifunk' ++ option 'path' '/etc/firewall.freifunk' ++ ++config 'defaults' 'system' ++ option 'zonename' 'Europe/Berlin' ++ option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3' ++ ++config 'defaults' 'wifi_device' ++ option 'channel' '1' ++ option 'diversity' '1' ++ option 'disabled' '0' ++ option 'country' 'DE' ++ option 'hwmode' '11g' ++ option 'distance' '1000' ++ ++config 'defaults' 'wifi_iface' ++ option 'mode' 'adhoc' ++ option 'encryption' 'none' ++ option 'bgscan' '0' ++ option 'bssid' '12:CA:FF:EE:BA:BE' ++ option 'sw_merge' '1' ++ option 'mcast_rate' '5500' ++ option 'probereq' '1' ++ ++config 'defaults' 'interface' ++ option 'netmask' '255.255.0.0' ++ option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1' ++ ++config 'defaults' 'alias' ++ option 'netmask' '255.255.255.0' ++ ++config 'defaults' 'dhcp' ++ option 'leasetime' '30m' ++ option 'force' '1' ++ ++config 'defaults' 'olsr_interfacedefaults' ++ option 'Ip4Broadcast' '255.255.255.255' ++ ++config 'defaults' 'upgrade' ++ option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots' ++ option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml' ++ +diff --git a/feeds/luci/freifunk-common/files/etc/init.d/.svn/all-wcprops b/feeds/luci/freifunk-common/files/etc/init.d/.svn/all-wcprops +new file mode 100644 +index 0000000..e57064d +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/init.d/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/!svn/ver/8775/luci/trunk/contrib/package/freifunk-common/files/etc/init.d ++END ++freifunk ++K 25 ++svn:wc:ra_dav:version-url ++V 83 ++/!svn/ver/8775/luci/trunk/contrib/package/freifunk-common/files/etc/init.d/freifunk ++END +diff --git a/feeds/luci/freifunk-common/files/etc/init.d/.svn/entries b/feeds/luci/freifunk-common/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..b325411 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/etc/init.d ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-06-23T09:07:51.882810Z ++8775 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++1bf031ca1e3f1a2615ad6dd674674d2e ++2012-06-23T09:07:51.882810Z ++8775 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++565 ++ +diff --git a/feeds/luci/freifunk-common/files/etc/init.d/.svn/prop-base/freifunk.svn-base b/feeds/luci/freifunk-common/files/etc/init.d/.svn/prop-base/freifunk.svn-base +new file mode 100644 +index 0000000..8df8946 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/init.d/.svn/prop-base/freifunk.svn-base +@@ -0,0 +1,9 @@ ++K 14 ++svn:executable ++V 1 ++* ++K 12 ++svn:keywords ++V 2 ++Id ++END +diff --git a/feeds/luci/freifunk-common/files/etc/init.d/.svn/text-base/freifunk.svn-base b/feeds/luci/freifunk-common/files/etc/init.d/.svn/text-base/freifunk.svn-base +new file mode 100644 +index 0000000..dbe648a +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/init.d/.svn/text-base/freifunk.svn-base +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++# Freifunk Init ++# $Id$ ++ ++START=99 ++ ++boot() { ++ test -f /etc/crontabs/root || touch /etc/crontabs/root ++ ++ grep -q 'killall -HUP dnsmasq' /etc/crontabs/root || { ++ echo "*/5 * * * * killall -HUP dnsmasq" >> /etc/crontabs/root ++ } ++ ++ grep -q '/usr/sbin/ff_olsr_watchdog' /etc/crontabs/root || { ++ echo "*/5 * * * * /usr/sbin/ff_olsr_watchdog" >> /etc/crontabs/root ++ } ++ ++ [ -d /etc/rc.local.d ] && { ++ for file in /etc/rc.local.d/*; do ++ test -f "$file" && . "$file" ++ done ++ } ++ ++ /etc/init.d/cron restart & ++} +diff --git a/feeds/luci/freifunk-common/files/etc/init.d/freifunk b/feeds/luci/freifunk-common/files/etc/init.d/freifunk +new file mode 100755 +index 0000000..244b338 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/init.d/freifunk +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++# Freifunk Init ++# $Id: freifunk 8775 2012-06-23 09:07:51Z soma $ ++ ++START=99 ++ ++boot() { ++ test -f /etc/crontabs/root || touch /etc/crontabs/root ++ ++ grep -q 'killall -HUP dnsmasq' /etc/crontabs/root || { ++ echo "*/5 * * * * killall -HUP dnsmasq" >> /etc/crontabs/root ++ } ++ ++ grep -q '/usr/sbin/ff_olsr_watchdog' /etc/crontabs/root || { ++ echo "*/5 * * * * /usr/sbin/ff_olsr_watchdog" >> /etc/crontabs/root ++ } ++ ++ [ -d /etc/rc.local.d ] && { ++ for file in /etc/rc.local.d/*; do ++ test -f "$file" && . "$file" ++ done ++ } ++ ++ /etc/init.d/cron restart & ++} +diff --git a/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/all-wcprops b/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/all-wcprops +new file mode 100644 +index 0000000..fa4f57c +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/!svn/ver/7576/luci/trunk/contrib/package/freifunk-common/files/etc/rc.local.d ++END ++01-config-migration ++K 25 ++svn:wc:ra_dav:version-url ++V 98 ++/!svn/ver/7576/luci/trunk/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration ++END +diff --git a/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/entries b/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/entries +new file mode 100644 +index 0000000..e9f4845 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/etc/rc.local.d ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++01-config-migration ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++47ca041b6ac3b11ae0ed39fb6f0655c1 ++2009-09-17T11:12:01.048932Z ++5334 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1213 ++ +diff --git a/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/text-base/01-config-migration.svn-base b/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/text-base/01-config-migration.svn-base +new file mode 100644 +index 0000000..11f1ad6 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/rc.local.d/.svn/text-base/01-config-migration.svn-base +@@ -0,0 +1,51 @@ ++# Fixup various configurations to remove quirks ++# from former versions. ++ ++_log() { ++ logger -t "Config Migration" "$1" ++} ++ ++_uci() { ++ uci ${2:+-c $2} get "$1" 2>/dev/null ++} ++ ++ ++# Splash redirector had a wrong virtual url match ++# which resulted in "No such handler" ++ ++[ "$(_uci lucid.splashredir.virtual)" == "/" ] && { ++ _log "Fix splash redirector configuration" ++ uci set lucid.splashredir.virtual='' ++ uci commit lucid ++ /etc/init.d/lucid restart ++} ++ ++ ++# Newer OLSR versions have the MinTCVtime hack active, ++# ensure proper timings or olsrd won't start ++ ++FIX=0 ++for i in 0 1 2 3 4; do ++ [ -z "$(_uci olsrd.@Interface[$i].TcInterval)" ] && \ ++ [ -z "$(_uci olsrd.@Interface[$i].TcValidityTime)" ] || { ++ uci delete olsrd.@Interface[$i].TcInterval ++ uci delete olsrd.@Interface[$i].TcValidityTime ++ FIX=1 ++ } ++done ++ ++[ "$FIX" == 1 ] && { ++ _log "Fix olsrd configuration for MinTCVTime hack" ++ uci commit olsrd ++ /etc/init.d/olsrd restart ++} ++ ++ ++# Ensure that the community definitions are in the ++# new format ++ ++[ -z "$(_uci freifunk.leipzig.mesh_network)" ] && \ ++[ -n "$(_uci freifunk.leipzig.mesh_network /rom/etc/config)" ] && { ++ _log "Converting freifunk configuration to new format" ++ cp /rom/etc/config/freifunk /etc/config/freifunk ++} +diff --git a/feeds/luci/freifunk-common/files/etc/rc.local.d/01-config-migration b/feeds/luci/freifunk-common/files/etc/rc.local.d/01-config-migration +new file mode 100644 +index 0000000..11f1ad6 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/rc.local.d/01-config-migration +@@ -0,0 +1,51 @@ ++# Fixup various configurations to remove quirks ++# from former versions. ++ ++_log() { ++ logger -t "Config Migration" "$1" ++} ++ ++_uci() { ++ uci ${2:+-c $2} get "$1" 2>/dev/null ++} ++ ++ ++# Splash redirector had a wrong virtual url match ++# which resulted in "No such handler" ++ ++[ "$(_uci lucid.splashredir.virtual)" == "/" ] && { ++ _log "Fix splash redirector configuration" ++ uci set lucid.splashredir.virtual='' ++ uci commit lucid ++ /etc/init.d/lucid restart ++} ++ ++ ++# Newer OLSR versions have the MinTCVtime hack active, ++# ensure proper timings or olsrd won't start ++ ++FIX=0 ++for i in 0 1 2 3 4; do ++ [ -z "$(_uci olsrd.@Interface[$i].TcInterval)" ] && \ ++ [ -z "$(_uci olsrd.@Interface[$i].TcValidityTime)" ] || { ++ uci delete olsrd.@Interface[$i].TcInterval ++ uci delete olsrd.@Interface[$i].TcValidityTime ++ FIX=1 ++ } ++done ++ ++[ "$FIX" == 1 ] && { ++ _log "Fix olsrd configuration for MinTCVTime hack" ++ uci commit olsrd ++ /etc/init.d/olsrd restart ++} ++ ++ ++# Ensure that the community definitions are in the ++# new format ++ ++[ -z "$(_uci freifunk.leipzig.mesh_network)" ] && \ ++[ -n "$(_uci freifunk.leipzig.mesh_network /rom/etc/config)" ] && { ++ _log "Converting freifunk configuration to new format" ++ cp /rom/etc/config/freifunk /etc/config/freifunk ++} +diff --git a/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/all-wcprops b/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/all-wcprops +new file mode 100644 +index 0000000..4e1aeaf +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 80 ++/!svn/ver/7579/luci/trunk/contrib/package/freifunk-common/files/etc/uci-defaults ++END ++freifunk ++K 25 ++svn:wc:ra_dav:version-url ++V 89 ++/!svn/ver/7579/luci/trunk/contrib/package/freifunk-common/files/etc/uci-defaults/freifunk ++END +diff --git a/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/entries b/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/entries +new file mode 100644 +index 0000000..902655b +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/etc/uci-defaults ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-30T08:44:22.909225Z ++7579 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++b32f563e4be8238a58e3fcb17ea8a00b ++2011-09-30T08:44:22.909225Z ++7579 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++55 ++ +diff --git a/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/text-base/freifunk.svn-base b/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/text-base/freifunk.svn-base +new file mode 100644 +index 0000000..fe6586c +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/uci-defaults/.svn/text-base/freifunk.svn-base +@@ -0,0 +1,2 @@ ++uci set uhttpd.main.rfc1918_filter=0 ++uci commit uhttpd +diff --git a/feeds/luci/freifunk-common/files/etc/uci-defaults/freifunk b/feeds/luci/freifunk-common/files/etc/uci-defaults/freifunk +new file mode 100644 +index 0000000..fe6586c +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/etc/uci-defaults/freifunk +@@ -0,0 +1,2 @@ ++uci set uhttpd.main.rfc1918_filter=0 ++uci commit uhttpd +diff --git a/feeds/luci/freifunk-common/files/usr/.svn/all-wcprops b/feeds/luci/freifunk-common/files/usr/.svn/all-wcprops +new file mode 100644 +index 0000000..3c413f7 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 67 ++/!svn/ver/9644/luci/trunk/contrib/package/freifunk-common/files/usr ++END +diff --git a/feeds/luci/freifunk-common/files/usr/.svn/entries b/feeds/luci/freifunk-common/files/usr/.svn/entries +new file mode 100644 +index 0000000..d94d6d1 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/usr ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-24T09:45:56.612394Z ++9644 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++bin ++dir ++ ++sbin ++dir ++ +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/all-wcprops b/feeds/luci/freifunk-common/files/usr/bin/.svn/all-wcprops +new file mode 100644 +index 0000000..ec05798 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/all-wcprops +@@ -0,0 +1,23 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/!svn/ver/9644/luci/trunk/contrib/package/freifunk-common/files/usr/bin ++END ++ffdzero ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/!svn/ver/7576/luci/trunk/contrib/package/freifunk-common/files/usr/bin/ffdzero ++END ++watch.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 80 ++/!svn/ver/8686/luci/trunk/contrib/package/freifunk-common/files/usr/bin/watch.sh ++END ++neigh.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 80 ++/!svn/ver/9644/luci/trunk/contrib/package/freifunk-common/files/usr/bin/neigh.sh ++END +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/entries b/feeds/luci/freifunk-common/files/usr/bin/.svn/entries +new file mode 100644 +index 0000000..7bea7a5 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/usr/bin ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-24T09:45:56.612394Z ++9644 ++stargieg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++ffdzero ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++935d1ea887c5307363f5a752acdfb309 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++413 ++ ++watch.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++05a8f5e53122835b86534ce2e63ee964 ++2012-05-30T18:26:09.335598Z ++8686 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++316 ++ ++neigh.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++0be5e676fb0ab889ddc52239fdebfdf0 ++2013-01-24T09:45:56.612394Z ++9644 ++stargieg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++233 ++ +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/ffdzero.svn-base b/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/ffdzero.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/ffdzero.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/neigh.sh.svn-base b/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/neigh.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/neigh.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/watch.sh.svn-base b/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/watch.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/prop-base/watch.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/ffdzero.svn-base b/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/ffdzero.svn-base +new file mode 100644 +index 0000000..24e8c2e +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/ffdzero.svn-base +@@ -0,0 +1,10 @@ ++#!/bin/sh ++ ++test "$1" = "-h" && echo -e "Usage:\n\t$0 -h\n\t$0 [ { ip | hostname } ]" >&2 && exit 1 ++ ++host="${1:-leipzig.freifunk.net}" ++ ++wget -O /dev/null http://$host/cgi-bin-dev-zero.bin ++test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/dev-zero.bin ++test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/luci/freifunk/status/zeroes ++test "$?" = "1" && echo "$host: no zero download found..." && exit 1 +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/neigh.sh.svn-base b/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/neigh.sh.svn-base +new file mode 100644 +index 0000000..eee9cd3 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/neigh.sh.svn-base +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++wget -q -O - http://localhost:2006/neighbours|sed -e's/LinkQuality/LQ/;s/Hysteresis/Hyst./;s/Willingness/Will./' ++wget -q -O - http://[::1]:2006/neighbours|sed -e's/LinkQuality/LQ/;s/Hysteresis/Hyst./;s/Willingness/Will./' +diff --git a/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/watch.sh.svn-base b/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/watch.sh.svn-base +new file mode 100644 +index 0000000..728526b +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/.svn/text-base/watch.sh.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh ++command="$1" ++interval="$2"; [ -z "$interval" ] && interval=1 ++ ++if [ -z $command ]; then ++ echo 'Usage: watch.sh "command [options]" [interval], e.g. watch "ifconfig ath0" 2' ++ echo 'interval is optional and defaults to 1' ++ exit 1 ++fi ++ ++while true; do clear; $command; sleep $interval; done +diff --git a/feeds/luci/freifunk-common/files/usr/bin/ffdzero b/feeds/luci/freifunk-common/files/usr/bin/ffdzero +new file mode 100755 +index 0000000..24e8c2e +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/ffdzero +@@ -0,0 +1,10 @@ ++#!/bin/sh ++ ++test "$1" = "-h" && echo -e "Usage:\n\t$0 -h\n\t$0 [ { ip | hostname } ]" >&2 && exit 1 ++ ++host="${1:-leipzig.freifunk.net}" ++ ++wget -O /dev/null http://$host/cgi-bin-dev-zero.bin ++test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/dev-zero.bin ++test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/luci/freifunk/status/zeroes ++test "$?" = "1" && echo "$host: no zero download found..." && exit 1 +diff --git a/feeds/luci/freifunk-common/files/usr/bin/neigh.sh b/feeds/luci/freifunk-common/files/usr/bin/neigh.sh +new file mode 100755 +index 0000000..eee9cd3 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/neigh.sh +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++wget -q -O - http://localhost:2006/neighbours|sed -e's/LinkQuality/LQ/;s/Hysteresis/Hyst./;s/Willingness/Will./' ++wget -q -O - http://[::1]:2006/neighbours|sed -e's/LinkQuality/LQ/;s/Hysteresis/Hyst./;s/Willingness/Will./' +diff --git a/feeds/luci/freifunk-common/files/usr/bin/watch.sh b/feeds/luci/freifunk-common/files/usr/bin/watch.sh +new file mode 100755 +index 0000000..728526b +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/bin/watch.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh ++command="$1" ++interval="$2"; [ -z "$interval" ] && interval=1 ++ ++if [ -z $command ]; then ++ echo 'Usage: watch.sh "command [options]" [interval], e.g. watch "ifconfig ath0" 2' ++ echo 'interval is optional and defaults to 1' ++ exit 1 ++fi ++ ++while true; do clear; $command; sleep $interval; done +diff --git a/feeds/luci/freifunk-common/files/usr/sbin/.svn/all-wcprops b/feeds/luci/freifunk-common/files/usr/sbin/.svn/all-wcprops +new file mode 100644 +index 0000000..4ca2403 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/sbin/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/!svn/ver/8775/luci/trunk/contrib/package/freifunk-common/files/usr/sbin ++END ++ff_olsr_watchdog ++K 25 ++svn:wc:ra_dav:version-url ++V 89 ++/!svn/ver/7576/luci/trunk/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog ++END +diff --git a/feeds/luci/freifunk-common/files/usr/sbin/.svn/entries b/feeds/luci/freifunk-common/files/usr/sbin/.svn/entries +new file mode 100644 +index 0000000..696f7c2 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/sbin/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/files/usr/sbin ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-06-23T09:07:51.882810Z ++8775 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++ff_olsr_watchdog ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++64cda7d494ac3c11d3de0b82d9dc3037 ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++636 ++ +diff --git a/feeds/luci/freifunk-common/files/usr/sbin/.svn/prop-base/ff_olsr_watchdog.svn-base b/feeds/luci/freifunk-common/files/usr/sbin/.svn/prop-base/ff_olsr_watchdog.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/sbin/.svn/prop-base/ff_olsr_watchdog.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-common/files/usr/sbin/.svn/text-base/ff_olsr_watchdog.svn-base b/feeds/luci/freifunk-common/files/usr/sbin/.svn/text-base/ff_olsr_watchdog.svn-base +new file mode 100644 +index 0000000..aa8de61 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/sbin/.svn/text-base/ff_olsr_watchdog.svn-base +@@ -0,0 +1,29 @@ ++#!/usr/bin/lua ++ ++require "os" ++require "io" ++require "uci" ++local fs = require "nixio.fs" ++ ++if fs.access("/var/run/olsrd.pid") then ++ local stamp, intv ++ local x = uci.cursor() ++ ++ x:foreach("olsrd", "LoadPlugin", ++ function(s) ++ if s.library == "olsrd_watchdog.so.0.1" then ++ intv = tonumber(s.interval) ++ stamp = s.file ++ end ++ end) ++ ++ if intv and fs.access(stamp) then ++ local systime = os.time() ++ local wdgtime = tonumber(io.lines(stamp)()) ++ ++ if not wdgtime or ( systime - wdgtime ) > ( intv * 2 ) then ++ os.execute("logger -t 'OLSR watchdog' 'Process died - restarting!'") ++ os.execute("/etc/init.d/olsrd restart") ++ end ++ end ++end +diff --git a/feeds/luci/freifunk-common/files/usr/sbin/ff_olsr_watchdog b/feeds/luci/freifunk-common/files/usr/sbin/ff_olsr_watchdog +new file mode 100755 +index 0000000..aa8de61 +--- /dev/null ++++ b/feeds/luci/freifunk-common/files/usr/sbin/ff_olsr_watchdog +@@ -0,0 +1,29 @@ ++#!/usr/bin/lua ++ ++require "os" ++require "io" ++require "uci" ++local fs = require "nixio.fs" ++ ++if fs.access("/var/run/olsrd.pid") then ++ local stamp, intv ++ local x = uci.cursor() ++ ++ x:foreach("olsrd", "LoadPlugin", ++ function(s) ++ if s.library == "olsrd_watchdog.so.0.1" then ++ intv = tonumber(s.interval) ++ stamp = s.file ++ end ++ end) ++ ++ if intv and fs.access(stamp) then ++ local systime = os.time() ++ local wdgtime = tonumber(io.lines(stamp)()) ++ ++ if not wdgtime or ( systime - wdgtime ) > ( intv * 2 ) then ++ os.execute("logger -t 'OLSR watchdog' 'Process died - restarting!'") ++ os.execute("/etc/init.d/olsrd restart") ++ end ++ end ++end +diff --git a/feeds/luci/freifunk-common/ipkg/.svn/all-wcprops b/feeds/luci/freifunk-common/ipkg/.svn/all-wcprops +new file mode 100644 +index 0000000..be1622d +--- /dev/null ++++ b/feeds/luci/freifunk-common/ipkg/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 62 ++/!svn/ver/7576/luci/trunk/contrib/package/freifunk-common/ipkg ++END ++postinst ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/!svn/ver/7576/luci/trunk/contrib/package/freifunk-common/ipkg/postinst ++END +diff --git a/feeds/luci/freifunk-common/ipkg/.svn/entries b/feeds/luci/freifunk-common/ipkg/.svn/entries +new file mode 100644 +index 0000000..d7a2375 +--- /dev/null ++++ b/feeds/luci/freifunk-common/ipkg/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-common/ipkg ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-28T00:20:56.147143Z ++7576 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++postinst ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++50737a73fb0728408e312d184888d643 ++2010-07-01T09:52:12.010450Z ++6201 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++113 ++ +diff --git a/feeds/luci/freifunk-common/ipkg/.svn/prop-base/postinst.svn-base b/feeds/luci/freifunk-common/ipkg/.svn/prop-base/postinst.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-common/ipkg/.svn/prop-base/postinst.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-common/ipkg/.svn/text-base/postinst.svn-base b/feeds/luci/freifunk-common/ipkg/.svn/text-base/postinst.svn-base +new file mode 100644 +index 0000000..52bedb2 +--- /dev/null ++++ b/feeds/luci/freifunk-common/ipkg/.svn/text-base/postinst.svn-base +@@ -0,0 +1,6 @@ ++#!/bin/sh ++ ++[ -n "${IPKG_INSTROOT}" ] || { ++ /etc/init.d/freifunk enabled || /etc/init.d/freifunk enable ++ exit 0 ++} +diff --git a/feeds/luci/freifunk-common/ipkg/postinst b/feeds/luci/freifunk-common/ipkg/postinst +new file mode 100755 +index 0000000..52bedb2 +--- /dev/null ++++ b/feeds/luci/freifunk-common/ipkg/postinst +@@ -0,0 +1,6 @@ ++#!/bin/sh ++ ++[ -n "${IPKG_INSTROOT}" ] || { ++ /etc/init.d/freifunk enabled || /etc/init.d/freifunk enable ++ exit 0 ++} +diff --git a/feeds/luci/freifunk-firewall/.svn/all-wcprops b/feeds/luci/freifunk-firewall/.svn/all-wcprops +new file mode 100644 +index 0000000..411be84 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 59 ++/!svn/ver/7807/luci/trunk/contrib/package/freifunk-firewall ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 68 ++/!svn/ver/7771/luci/trunk/contrib/package/freifunk-firewall/Makefile ++END +diff --git a/feeds/luci/freifunk-firewall/.svn/entries b/feeds/luci/freifunk-firewall/.svn/entries +new file mode 100644 +index 0000000..4211d1f +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-firewall ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-10-27T14:40:45.155725Z ++7807 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++2b347eb1851bcd57a7f26bf77a87c9b6 ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1085 ++ +diff --git a/feeds/luci/freifunk-firewall/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-firewall/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eed1d7a +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2009 Jo-Philipp Wich ++# ++# This is free software, licensed under the Apache 2.0 license. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-firewall ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-firewall ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk Firewall Addon ++ DEPENDS:=+firewall ++endef ++ ++define Package/freifunk-firewall/description ++ Various firewall extensions for Freifunk. Includes NAT fixes and advanced settings. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-firewall/postinst ++#!/bin/sh ++[ -n "$${IPKG_INSTROOT}" ] || { ++ if ! grep -q /etc/firewall.freifunk /etc/config/firewall; then ++ uci add firewall include >/dev/null ++ uci set firewall.@include[-1].path=/etc/firewall.freifunk ++ uci commit firewall ++ fi ++} ++endef ++ ++define Package/freifunk-firewall/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-firewall)) +diff --git a/feeds/luci/freifunk-firewall/Makefile b/feeds/luci/freifunk-firewall/Makefile +new file mode 100644 +index 0000000..eed1d7a +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/Makefile +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2009 Jo-Philipp Wich ++# ++# This is free software, licensed under the Apache 2.0 license. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-firewall ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-firewall ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk Firewall Addon ++ DEPENDS:=+firewall ++endef ++ ++define Package/freifunk-firewall/description ++ Various firewall extensions for Freifunk. Includes NAT fixes and advanced settings. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-firewall/postinst ++#!/bin/sh ++[ -n "$${IPKG_INSTROOT}" ] || { ++ if ! grep -q /etc/firewall.freifunk /etc/config/firewall; then ++ uci add firewall include >/dev/null ++ uci set firewall.@include[-1].path=/etc/firewall.freifunk ++ uci commit firewall ++ fi ++} ++endef ++ ++define Package/freifunk-firewall/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-firewall)) +diff --git a/feeds/luci/freifunk-firewall/files/.svn/all-wcprops b/feeds/luci/freifunk-firewall/files/.svn/all-wcprops +new file mode 100644 +index 0000000..3475257 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 65 ++/!svn/ver/7807/luci/trunk/contrib/package/freifunk-firewall/files ++END +diff --git a/feeds/luci/freifunk-firewall/files/.svn/entries b/feeds/luci/freifunk-firewall/files/.svn/entries +new file mode 100644 +index 0000000..fccf8e5 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-firewall/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-10-27T14:40:45.155725Z ++7807 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-firewall/files/etc/.svn/all-wcprops b/feeds/luci/freifunk-firewall/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..255bab1 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/!svn/ver/7807/luci/trunk/contrib/package/freifunk-firewall/files/etc ++END ++firewall.freifunk ++K 25 ++svn:wc:ra_dav:version-url ++V 87 ++/!svn/ver/7807/luci/trunk/contrib/package/freifunk-firewall/files/etc/firewall.freifunk ++END +diff --git a/feeds/luci/freifunk-firewall/files/etc/.svn/entries b/feeds/luci/freifunk-firewall/files/etc/.svn/entries +new file mode 100644 +index 0000000..b9d053b +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-firewall/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-10-27T14:40:45.155725Z ++7807 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++hotplug.d ++dir ++ ++firewall.freifunk ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++26304b0d27042781e0c0c2738f964681 ++2011-10-27T14:40:45.155725Z ++7807 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1297 ++ +diff --git a/feeds/luci/freifunk-firewall/files/etc/.svn/prop-base/firewall.freifunk.svn-base b/feeds/luci/freifunk-firewall/files/etc/.svn/prop-base/firewall.freifunk.svn-base +new file mode 100644 +index 0000000..92c8ad7 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/.svn/prop-base/firewall.freifunk.svn-base +@@ -0,0 +1,5 @@ ++K 12 ++svn:keywords ++V 2 ++Id ++END +diff --git a/feeds/luci/freifunk-firewall/files/etc/.svn/text-base/firewall.freifunk.svn-base b/feeds/luci/freifunk-firewall/files/etc/.svn/text-base/firewall.freifunk.svn-base +new file mode 100644 +index 0000000..4c3f3c4 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/.svn/text-base/firewall.freifunk.svn-base +@@ -0,0 +1,42 @@ ++#!/bin/sh ++# Freifunk Firewall addons ++# $Id$ ++ ++ ++# ++# Apply advanced settings ++# ++apply_advanced() { ++ local tcp_ecn ++ local tcp_window_scaling ++ local accept_redirects ++ local accept_source_route ++ ++ config_get_bool tcp_ecn $1 tcp_ecn 1 ++ config_get_bool tcp_window_scaling $1 tcp_window_scaling 1 ++ config_get_bool accept_redirects $1 accept_redirects 0 ++ config_get_bool accept_source_route $1 accept_source_route 0 ++ ++ logger -t firewall.freifunk "tcp_ecn is $tcp_ecn" ++ logger -t firewall.freifunk "tcp_window_scaling is $tcp_window_scaling" ++ logger -t firewall.freifunk "accept_redirects is $accept_redirects" ++ logger -t firewall.freifunk "accept_source_route is $accept_source_route" ++ ++ sysctl -w net.ipv4.tcp_ecn=$tcp_ecn >/dev/null ++ sysctl -w net.ipv4.tcp_window_scaling=$tcp_window_scaling >/dev/null ++ ++ for f in /proc/sys/net/ipv4/conf/*/accept_redirects; do ++ echo $accept_redirects > $f ++ done ++ ++ for f in /proc/sys/net/ipv4/conf/*/accept_source_route; do ++ echo $accept_source_route > $f ++ done ++} ++ ++config_foreach apply_advanced advanced ++ ++[ -x /etc/init.d/luci_splash ] && ( sleep 3; /etc/init.d/luci_splash restart )& ++ ++[ -x /etc/init.d/freifunk-p2pblock ] && /etc/init.d/freifunk-p2pblock enabled && \ ++ ( sleep 3; /etc/init.d/freifunk-p2pblock restart )& +diff --git a/feeds/luci/freifunk-firewall/files/etc/firewall.freifunk b/feeds/luci/freifunk-firewall/files/etc/firewall.freifunk +new file mode 100644 +index 0000000..e7cafbd +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/firewall.freifunk +@@ -0,0 +1,42 @@ ++#!/bin/sh ++# Freifunk Firewall addons ++# $Id: firewall.freifunk 7807 2011-10-27 14:40:45Z soma $ ++ ++ ++# ++# Apply advanced settings ++# ++apply_advanced() { ++ local tcp_ecn ++ local tcp_window_scaling ++ local accept_redirects ++ local accept_source_route ++ ++ config_get_bool tcp_ecn $1 tcp_ecn 1 ++ config_get_bool tcp_window_scaling $1 tcp_window_scaling 1 ++ config_get_bool accept_redirects $1 accept_redirects 0 ++ config_get_bool accept_source_route $1 accept_source_route 0 ++ ++ logger -t firewall.freifunk "tcp_ecn is $tcp_ecn" ++ logger -t firewall.freifunk "tcp_window_scaling is $tcp_window_scaling" ++ logger -t firewall.freifunk "accept_redirects is $accept_redirects" ++ logger -t firewall.freifunk "accept_source_route is $accept_source_route" ++ ++ sysctl -w net.ipv4.tcp_ecn=$tcp_ecn >/dev/null ++ sysctl -w net.ipv4.tcp_window_scaling=$tcp_window_scaling >/dev/null ++ ++ for f in /proc/sys/net/ipv4/conf/*/accept_redirects; do ++ echo $accept_redirects > $f ++ done ++ ++ for f in /proc/sys/net/ipv4/conf/*/accept_source_route; do ++ echo $accept_source_route > $f ++ done ++} ++ ++config_foreach apply_advanced advanced ++ ++[ -x /etc/init.d/luci_splash ] && ( sleep 3; /etc/init.d/luci_splash restart )& ++ ++[ -x /etc/init.d/freifunk-p2pblock ] && /etc/init.d/freifunk-p2pblock enabled && \ ++ ( sleep 3; /etc/init.d/freifunk-p2pblock restart )& +diff --git a/feeds/luci/freifunk-firewall/files/etc/hotplug.d/.svn/all-wcprops b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/.svn/all-wcprops +new file mode 100644 +index 0000000..b6a260f +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/!svn/ver/7807/luci/trunk/contrib/package/freifunk-firewall/files/etc/hotplug.d ++END +diff --git a/feeds/luci/freifunk-firewall/files/etc/hotplug.d/.svn/entries b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..0fddae2 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-firewall/files/etc/hotplug.d ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-10-27T14:40:45.155725Z ++7807 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++firewall ++dir ++ +diff --git a/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/all-wcprops b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/all-wcprops +new file mode 100644 +index 0000000..ee26931 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 88 ++/!svn/ver/7032/luci/trunk/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall ++END ++23-restricted-wan ++K 25 ++svn:wc:ra_dav:version-url ++V 106 ++/!svn/ver/7032/luci/trunk/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan ++END +diff --git a/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/entries b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/entries +new file mode 100644 +index 0000000..7ebef22 +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-05-08T21:24:24.635622Z ++7032 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++23-restricted-wan ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++3ecd56095afaf8bfb9396a8c9fb0c68d ++2011-05-08T21:24:24.635622Z ++7032 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1854 ++ +diff --git a/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/text-base/23-restricted-wan.svn-base b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/text-base/23-restricted-wan.svn-base +new file mode 100644 +index 0000000..d6f94ea +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/.svn/text-base/23-restricted-wan.svn-base +@@ -0,0 +1,72 @@ ++#!/bin/sh ++ ++clear_restricted_gw() ++{ ++ local state="$1" ++ local iface ++ local ifname ++ local ipaddr ++ local netmask ++ local gateway ++ ++ config_get iface "$state" iface ++ ++ if [ "$iface" = "$INTERFACE" ]; then ++ config_get ifname "$state" ifname ++ config_get ipaddr "$state" ipaddr ++ config_get netmask "$state" netmask ++ config_get gateway "$state" gateway ++ ++ logger -t firewall.freifunk "removing local restriction to $iface($gateway)" ++ iptables -D forwarding_rule ! -i $ifname -o $ifname -d $ipaddr/$netmask -j REJECT --reject-with icmp-host-prohibited ++ uci_revert_state firewall "$state" ++ fi ++} ++ ++get_enabled() ++{ ++ local name ++ config_get name "$1" name ++ ++ if [ "$name" = "$ZONE" ]; then ++ config_get_bool local_restrict "$1" local_restrict ++ fi ++} ++ ++if [ "$ACTION" = add ]; then ++ local enabled ++ local ipaddr ++ local netmask ++ local gateway ++ ++ include /lib/network ++ scan_interfaces ++ ++ config_get ipaddr "$INTERFACE" ipaddr ++ config_get netmask "$INTERFACE" netmask ++ config_get gateway "$INTERFACE" gateway ++ ++ if [ -n "$gateway" ] && [ "$gateway" != 0.0.0.0 ]; then ++ config_load firewall ++ ++ local_restrict=0 ++ config_foreach get_enabled zone ++ ++ if [ "$local_restrict" = 1 ]; then ++ logger -t firewall.freifunk "restricting local access to $DEVICE($gateway)" ++ iptables -I forwarding_rule ! -i $DEVICE -o $DEVICE -d $ipaddr/$netmask -j REJECT --reject-with icmp-host-prohibited ++ local state="restricted_gw_${INTERFACE}" ++ uci_set_state firewall "$state" "" restricted_gw_state ++ uci_set_state firewall "$state" iface "$INTERFACE" ++ uci_set_state firewall "$state" ifname "$DEVICE" ++ uci_set_state firewall "$state" ipaddr "$ipaddr" ++ uci_set_state firewall "$state" netmask "$netmask" ++ uci_set_state firewall "$state" gateway "$gateway" ++ fi ++ fi ++ ++elif [ "$ACTION" = remove ]; then ++ config_load firewall ++ config_foreach clear_restricted_gw restricted_gw_state ++fi ++ +diff --git a/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan +new file mode 100644 +index 0000000..d6f94ea +--- /dev/null ++++ b/feeds/luci/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan +@@ -0,0 +1,72 @@ ++#!/bin/sh ++ ++clear_restricted_gw() ++{ ++ local state="$1" ++ local iface ++ local ifname ++ local ipaddr ++ local netmask ++ local gateway ++ ++ config_get iface "$state" iface ++ ++ if [ "$iface" = "$INTERFACE" ]; then ++ config_get ifname "$state" ifname ++ config_get ipaddr "$state" ipaddr ++ config_get netmask "$state" netmask ++ config_get gateway "$state" gateway ++ ++ logger -t firewall.freifunk "removing local restriction to $iface($gateway)" ++ iptables -D forwarding_rule ! -i $ifname -o $ifname -d $ipaddr/$netmask -j REJECT --reject-with icmp-host-prohibited ++ uci_revert_state firewall "$state" ++ fi ++} ++ ++get_enabled() ++{ ++ local name ++ config_get name "$1" name ++ ++ if [ "$name" = "$ZONE" ]; then ++ config_get_bool local_restrict "$1" local_restrict ++ fi ++} ++ ++if [ "$ACTION" = add ]; then ++ local enabled ++ local ipaddr ++ local netmask ++ local gateway ++ ++ include /lib/network ++ scan_interfaces ++ ++ config_get ipaddr "$INTERFACE" ipaddr ++ config_get netmask "$INTERFACE" netmask ++ config_get gateway "$INTERFACE" gateway ++ ++ if [ -n "$gateway" ] && [ "$gateway" != 0.0.0.0 ]; then ++ config_load firewall ++ ++ local_restrict=0 ++ config_foreach get_enabled zone ++ ++ if [ "$local_restrict" = 1 ]; then ++ logger -t firewall.freifunk "restricting local access to $DEVICE($gateway)" ++ iptables -I forwarding_rule ! -i $DEVICE -o $DEVICE -d $ipaddr/$netmask -j REJECT --reject-with icmp-host-prohibited ++ local state="restricted_gw_${INTERFACE}" ++ uci_set_state firewall "$state" "" restricted_gw_state ++ uci_set_state firewall "$state" iface "$INTERFACE" ++ uci_set_state firewall "$state" ifname "$DEVICE" ++ uci_set_state firewall "$state" ipaddr "$ipaddr" ++ uci_set_state firewall "$state" netmask "$netmask" ++ uci_set_state firewall "$state" gateway "$gateway" ++ fi ++ fi ++ ++elif [ "$ACTION" = remove ]; then ++ config_load firewall ++ config_foreach clear_restricted_gw restricted_gw_state ++fi ++ +diff --git a/feeds/luci/freifunk-gwcheck/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/.svn/all-wcprops +new file mode 100644 +index 0000000..ad40a44 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 58 ++/!svn/ver/9625/luci/trunk/contrib/package/freifunk-gwcheck ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 67 ++/!svn/ver/9624/luci/trunk/contrib/package/freifunk-gwcheck/Makefile ++END +diff --git a/feeds/luci/freifunk-gwcheck/.svn/entries b/feeds/luci/freifunk-gwcheck/.svn/entries +new file mode 100644 +index 0000000..8b7c4a2 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/.svn/entries +@@ -0,0 +1,71 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-19T20:32:06.173514Z ++9625 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++root ++dir ++ ++ipkg ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++23a99f4efa04f18413e94b681bcdd7b9 ++2013-01-19T18:05:17.476324Z ++9624 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1064 ++ +diff --git a/feeds/luci/freifunk-gwcheck/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-gwcheck/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fe55e69 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-gwcheck ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-gwcheck ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk gateway check script ++ DEPENDS:=firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain ++endef ++ ++define Package/freifunk-gwcheck/description ++ This script periodically checks if internet is available via your own gateway. If it detects that it is broken, then the defaultroute is removed from the main table and temporarilly placed in table gw-check until your internet works again. Config file is /etc/config/freifunk-gwcheck. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-gwcheck/install ++ $(CP) ./files/* $(1)/ ++ $(CP) ./root/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-gwcheck)) +diff --git a/feeds/luci/freifunk-gwcheck/Makefile b/feeds/luci/freifunk-gwcheck/Makefile +new file mode 100644 +index 0000000..fe55e69 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/Makefile +@@ -0,0 +1,40 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-gwcheck ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-gwcheck ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk gateway check script ++ DEPENDS:=firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain ++endef ++ ++define Package/freifunk-gwcheck/description ++ This script periodically checks if internet is available via your own gateway. If it detects that it is broken, then the defaultroute is removed from the main table and temporarilly placed in table gw-check until your internet works again. Config file is /etc/config/freifunk-gwcheck. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-gwcheck/install ++ $(CP) ./files/* $(1)/ ++ $(CP) ./root/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-gwcheck)) +diff --git a/feeds/luci/freifunk-gwcheck/files/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/files/.svn/all-wcprops +new file mode 100644 +index 0000000..bbeb5c3 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 64 ++/!svn/ver/9625/luci/trunk/contrib/package/freifunk-gwcheck/files ++END +diff --git a/feeds/luci/freifunk-gwcheck/files/.svn/entries b/feeds/luci/freifunk-gwcheck/files/.svn/entries +new file mode 100644 +index 0000000..948cd43 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-19T20:32:06.173514Z ++9625 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++usr ++dir ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-gwcheck/files/etc/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..820e89f +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 68 ++/!svn/ver/7537/luci/trunk/contrib/package/freifunk-gwcheck/files/etc ++END +diff --git a/feeds/luci/freifunk-gwcheck/files/etc/.svn/entries b/feeds/luci/freifunk-gwcheck/files/etc/.svn/entries +new file mode 100644 +index 0000000..401fa1e +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-23T19:23:18.560536Z ++7537 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++config ++dir ++ +diff --git a/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..5ccd584 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 75 ++/!svn/ver/7537/luci/trunk/contrib/package/freifunk-gwcheck/files/etc/config ++END ++freifunk-gwcheck ++K 25 ++svn:wc:ra_dav:version-url ++V 92 ++/!svn/ver/7537/luci/trunk/contrib/package/freifunk-gwcheck/files/etc/config/freifunk-gwcheck ++END +diff --git a/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/entries b/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..b0adc95 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/files/etc/config ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-23T19:23:18.560536Z ++7537 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-gwcheck ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++49541a3240e381fdb283111328979ddf ++2011-09-23T19:23:18.560536Z ++7537 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++169 ++ +diff --git a/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/text-base/freifunk-gwcheck.svn-base b/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/text-base/freifunk-gwcheck.svn-base +new file mode 100644 +index 0000000..382747e +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/etc/config/.svn/text-base/freifunk-gwcheck.svn-base +@@ -0,0 +1,5 @@ ++config 'gwcheck' 'hosts' ++ list 'host' 'augsburg.freifunk.net' ++ list 'host' 'vpn4.leipzig.freifunk.net' ++ list 'host' 'luci.subsignal.org' ++ list 'host' 'conntest.jpod.cc' +diff --git a/feeds/luci/freifunk-gwcheck/files/etc/config/freifunk-gwcheck b/feeds/luci/freifunk-gwcheck/files/etc/config/freifunk-gwcheck +new file mode 100644 +index 0000000..382747e +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/etc/config/freifunk-gwcheck +@@ -0,0 +1,5 @@ ++config 'gwcheck' 'hosts' ++ list 'host' 'augsburg.freifunk.net' ++ list 'host' 'vpn4.leipzig.freifunk.net' ++ list 'host' 'luci.subsignal.org' ++ list 'host' 'conntest.jpod.cc' +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/files/usr/.svn/all-wcprops +new file mode 100644 +index 0000000..c3edd66 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 68 ++/!svn/ver/9625/luci/trunk/contrib/package/freifunk-gwcheck/files/usr ++END +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/.svn/entries b/feeds/luci/freifunk-gwcheck/files/usr/.svn/entries +new file mode 100644 +index 0000000..c256c87 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/files/usr ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-19T20:32:06.173514Z ++9625 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++sbin ++dir ++ +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/all-wcprops +new file mode 100644 +index 0000000..08d3d42 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 73 ++/!svn/ver/9625/luci/trunk/contrib/package/freifunk-gwcheck/files/usr/sbin ++END ++ff_olsr_test_gw.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 92 ++/!svn/ver/9625/luci/trunk/contrib/package/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh ++END +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/entries b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/entries +new file mode 100644 +index 0000000..adfcbfa +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/files/usr/sbin ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-19T20:32:06.173514Z ++9625 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++ff_olsr_test_gw.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++0ad879e03d7ce65d85b9dbb45712a768 ++2013-01-19T20:32:06.173514Z ++9625 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3428 ++ +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/prop-base/ff_olsr_test_gw.sh.svn-base b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/prop-base/ff_olsr_test_gw.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/prop-base/ff_olsr_test_gw.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/text-base/ff_olsr_test_gw.sh.svn-base b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/text-base/ff_olsr_test_gw.sh.svn-base +new file mode 100644 +index 0000000..a85ead3 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/sbin/.svn/text-base/ff_olsr_test_gw.sh.svn-base +@@ -0,0 +1,120 @@ ++#!/bin/sh ++# Copyright 2013 Manuel Munz ++# Licensed under the GNU General Public License (GPL) v3 ++# This script monitors the local internet gateway ++ ++. /lib/functions/network.sh ++ ++# exit if dyngw_plain is not installed or enabled ++dgwlib=`uci show olsrd |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}` ++if [ -n "$dgwlib" ]; then ++ if [ "$(uci -q get $dgwlib.ignore)" == 1 ]; then ++ exit 1 ++ fi ++else ++ exit 1 ++fi ++ ++#Exit if this script is already running ++pid="$(pidof ff_olsr_test_gw.sh)" ++if [ ${#pid} -gt 5 ]; then ++ logger -p debug -t gwcheck "Gateway check script is already running, exit now" ++ exit 1 ++fi ++ ++# exit if there is no defaultroute with metric=0 in main or gw-check table. ++defroutemain="$(ip r s |grep default |grep -v metric)" ++defroutegwcheck="$(ip r s t gw-check |grep default |grep -v metric)" ++if [ -z "$defroutegwcheck" -a -z "$defroutemain" ]; then ++ exit 1 ++fi ++ ++# get and shuffle list of testservers ++testserver="$(uci -q get freifunk-gwcheck.hosts.host)" ++[ -z "$testserver" ] && echo "No testservers found, exit" && exit ++ ++testserver="$(for t in $testserver; do echo $t; done | awk 'BEGIN { ++ srand(); ++} ++{ ++ l[NR] = $0; ++} ++ ++END { ++ for (i = 1; i <= NR; i++) { ++ n = int(rand() * (NR - i + 1)) + i; ++ print l[n]; ++ l[n] = l[i]; ++ } ++}')" ++ ++check_internet() { ++ for t in $testserver; do ++ local test ++ test=$(wget -q http://$t/conntest.html -O -| grep "Internet_works") ++ if [ "$test" == "Internet_works" ]; then ++ echo 0 ++ break ++ else ++ logger -p debug -t gw-check "Could not fetch http://$t/conntest.html" ++ fi ++ done ++} ++ ++resolve() { ++ echo "$(nslookup $1 2>/dev/null |grep 'Address' |grep -v '127.0.0.1' |awk '{ print $3 }')" ++} ++ ++get_dnsservers() { ++ # this gets all dns servers for the interface which has the default route ++ ++ dns="" ++ if [ ! -x /bin/ubus ]; then ++ # ubus not present (versions before Attitude): fallback to get these from /var/state/network. ++ # We always assume that wan is the default route interface here ++ dns="$(grep network.wan.resolv_dns /var/state/network | cut -d "=" -f 2)" ++ else ++ network_find_wan wan ++ network_get_dnsserver dns $wan ++ fi ++} ++ ++iw=$(check_internet) ++ ++if [ "$iw" == 0 ]; then ++ # Internet available again, restore default route and remove ip rules ++ if [ -n "$defroutegwcheck" ]; then ++ ip r a $defroutegwcheck ++ ip r d $defroutegwcheck t gw-check ++ for host in $testserver; do ++ ips="$(resolve $host)" ++ for ip in $ips; do ++ [ -n "$(ip ru s | grep "to $ip lookup gw-check")" ] && ip rule del to $ip table gw-check ++ done ++ done ++ get_dnsservers ++ for d in $dns; do ++ [ -n "$(ip ru s | grep "to $d lookup gw-check")" ] && ip rule del to $d table gw-check ++ done ++ logger -p err -t gw-check "Internet is available again, default route restored ( $defroutegwcheck)" ++ fi ++ ++else ++ # Check failed. Move default route to table gw-check and setup ip rules. ++ if [ -z "$(ip ru s | grep gw-check)" -a -n "$defroutemain" ]; then ++ ip r a $defroutemain table gw-check ++ ip r d $defroutemain ++ logger -p err -t gw-check "Internet is not available, default route deactivated ( $defroutemain)" ++ fi ++ for host in $testserver; do ++ ips="$(resolve $host)" ++ for ip in $ips; do ++ [ -z "$(ip ru s | grep "to $ip lookup gw-check")" ] && ip rule add to $ip table gw-check ++ done ++ done ++ get_dnsservers ++ for d in $dns; do ++ [ -z "$(ip ru s | grep "to $d lookup gw-check")" ] && ip rule add to $d table gw-check ++ done ++ logger -p err -t gw-check "Check your internet connection!" ++fi +diff --git a/feeds/luci/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh b/feeds/luci/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh +new file mode 100755 +index 0000000..a85ead3 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/files/usr/sbin/ff_olsr_test_gw.sh +@@ -0,0 +1,120 @@ ++#!/bin/sh ++# Copyright 2013 Manuel Munz ++# Licensed under the GNU General Public License (GPL) v3 ++# This script monitors the local internet gateway ++ ++. /lib/functions/network.sh ++ ++# exit if dyngw_plain is not installed or enabled ++dgwlib=`uci show olsrd |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}` ++if [ -n "$dgwlib" ]; then ++ if [ "$(uci -q get $dgwlib.ignore)" == 1 ]; then ++ exit 1 ++ fi ++else ++ exit 1 ++fi ++ ++#Exit if this script is already running ++pid="$(pidof ff_olsr_test_gw.sh)" ++if [ ${#pid} -gt 5 ]; then ++ logger -p debug -t gwcheck "Gateway check script is already running, exit now" ++ exit 1 ++fi ++ ++# exit if there is no defaultroute with metric=0 in main or gw-check table. ++defroutemain="$(ip r s |grep default |grep -v metric)" ++defroutegwcheck="$(ip r s t gw-check |grep default |grep -v metric)" ++if [ -z "$defroutegwcheck" -a -z "$defroutemain" ]; then ++ exit 1 ++fi ++ ++# get and shuffle list of testservers ++testserver="$(uci -q get freifunk-gwcheck.hosts.host)" ++[ -z "$testserver" ] && echo "No testservers found, exit" && exit ++ ++testserver="$(for t in $testserver; do echo $t; done | awk 'BEGIN { ++ srand(); ++} ++{ ++ l[NR] = $0; ++} ++ ++END { ++ for (i = 1; i <= NR; i++) { ++ n = int(rand() * (NR - i + 1)) + i; ++ print l[n]; ++ l[n] = l[i]; ++ } ++}')" ++ ++check_internet() { ++ for t in $testserver; do ++ local test ++ test=$(wget -q http://$t/conntest.html -O -| grep "Internet_works") ++ if [ "$test" == "Internet_works" ]; then ++ echo 0 ++ break ++ else ++ logger -p debug -t gw-check "Could not fetch http://$t/conntest.html" ++ fi ++ done ++} ++ ++resolve() { ++ echo "$(nslookup $1 2>/dev/null |grep 'Address' |grep -v '127.0.0.1' |awk '{ print $3 }')" ++} ++ ++get_dnsservers() { ++ # this gets all dns servers for the interface which has the default route ++ ++ dns="" ++ if [ ! -x /bin/ubus ]; then ++ # ubus not present (versions before Attitude): fallback to get these from /var/state/network. ++ # We always assume that wan is the default route interface here ++ dns="$(grep network.wan.resolv_dns /var/state/network | cut -d "=" -f 2)" ++ else ++ network_find_wan wan ++ network_get_dnsserver dns $wan ++ fi ++} ++ ++iw=$(check_internet) ++ ++if [ "$iw" == 0 ]; then ++ # Internet available again, restore default route and remove ip rules ++ if [ -n "$defroutegwcheck" ]; then ++ ip r a $defroutegwcheck ++ ip r d $defroutegwcheck t gw-check ++ for host in $testserver; do ++ ips="$(resolve $host)" ++ for ip in $ips; do ++ [ -n "$(ip ru s | grep "to $ip lookup gw-check")" ] && ip rule del to $ip table gw-check ++ done ++ done ++ get_dnsservers ++ for d in $dns; do ++ [ -n "$(ip ru s | grep "to $d lookup gw-check")" ] && ip rule del to $d table gw-check ++ done ++ logger -p err -t gw-check "Internet is available again, default route restored ( $defroutegwcheck)" ++ fi ++ ++else ++ # Check failed. Move default route to table gw-check and setup ip rules. ++ if [ -z "$(ip ru s | grep gw-check)" -a -n "$defroutemain" ]; then ++ ip r a $defroutemain table gw-check ++ ip r d $defroutemain ++ logger -p err -t gw-check "Internet is not available, default route deactivated ( $defroutemain)" ++ fi ++ for host in $testserver; do ++ ips="$(resolve $host)" ++ for ip in $ips; do ++ [ -z "$(ip ru s | grep "to $ip lookup gw-check")" ] && ip rule add to $ip table gw-check ++ done ++ done ++ get_dnsservers ++ for d in $dns; do ++ [ -z "$(ip ru s | grep "to $d lookup gw-check")" ] && ip rule add to $d table gw-check ++ done ++ logger -p err -t gw-check "Check your internet connection!" ++fi +diff --git a/feeds/luci/freifunk-gwcheck/ipkg/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/ipkg/.svn/all-wcprops +new file mode 100644 +index 0000000..670333e +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/ipkg/.svn/all-wcprops +@@ -0,0 +1,17 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 63 ++/!svn/ver/7537/luci/trunk/contrib/package/freifunk-gwcheck/ipkg ++END ++postinst ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/!svn/ver/7537/luci/trunk/contrib/package/freifunk-gwcheck/ipkg/postinst ++END ++postrm ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/7537/luci/trunk/contrib/package/freifunk-gwcheck/ipkg/postrm ++END +diff --git a/feeds/luci/freifunk-gwcheck/ipkg/.svn/entries b/feeds/luci/freifunk-gwcheck/ipkg/.svn/entries +new file mode 100644 +index 0000000..faf2219 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/ipkg/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/ipkg ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-23T19:23:18.560536Z ++7537 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++postinst ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++03c90caab443676bb2856fce96c8f25f ++2011-09-23T19:23:18.560536Z ++7537 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++129 ++ ++postrm ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++6dc106480ae3cf342b8c028d7297ded3 ++2011-09-23T19:23:18.560536Z ++7537 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++140 ++ +diff --git a/feeds/luci/freifunk-gwcheck/ipkg/.svn/text-base/postinst.svn-base b/feeds/luci/freifunk-gwcheck/ipkg/.svn/text-base/postinst.svn-base +new file mode 100644 +index 0000000..1c5308f +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/ipkg/.svn/text-base/postinst.svn-base +@@ -0,0 +1,4 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ ( . /etc/uci-defaults/freifunk-gwcheck ) && rm -f /etc/uci-defaults/freifunk-gwcheck ++} +diff --git a/feeds/luci/freifunk-gwcheck/ipkg/.svn/text-base/postrm.svn-base b/feeds/luci/freifunk-gwcheck/ipkg/.svn/text-base/postrm.svn-base +new file mode 100644 +index 0000000..18e4a07 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/ipkg/.svn/text-base/postrm.svn-base +@@ -0,0 +1,5 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ sed -i '/gw-check/d' /etc/iproute2/rt_tables ++ sed -i '/ff_olsr_test_gw.sh/d' /etc/crontabs/root ++} +diff --git a/feeds/luci/freifunk-gwcheck/ipkg/postinst b/feeds/luci/freifunk-gwcheck/ipkg/postinst +new file mode 100644 +index 0000000..1c5308f +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/ipkg/postinst +@@ -0,0 +1,4 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ ( . /etc/uci-defaults/freifunk-gwcheck ) && rm -f /etc/uci-defaults/freifunk-gwcheck ++} +diff --git a/feeds/luci/freifunk-gwcheck/ipkg/postrm b/feeds/luci/freifunk-gwcheck/ipkg/postrm +new file mode 100644 +index 0000000..18e4a07 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/ipkg/postrm +@@ -0,0 +1,5 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ sed -i '/gw-check/d' /etc/iproute2/rt_tables ++ sed -i '/ff_olsr_test_gw.sh/d' /etc/crontabs/root ++} +diff --git a/feeds/luci/freifunk-gwcheck/root/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/root/.svn/all-wcprops +new file mode 100644 +index 0000000..1cc83fb +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 63 ++/!svn/ver/7928/luci/trunk/contrib/package/freifunk-gwcheck/root ++END +diff --git a/feeds/luci/freifunk-gwcheck/root/.svn/entries b/feeds/luci/freifunk-gwcheck/root/.svn/entries +new file mode 100644 +index 0000000..9e4cdaa +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/root ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-11-13T13:45:17.024070Z ++7928 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-gwcheck/root/etc/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/root/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..96a15d7 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 67 ++/!svn/ver/7928/luci/trunk/contrib/package/freifunk-gwcheck/root/etc ++END +diff --git a/feeds/luci/freifunk-gwcheck/root/etc/.svn/entries b/feeds/luci/freifunk-gwcheck/root/etc/.svn/entries +new file mode 100644 +index 0000000..227aca5 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/root/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-11-13T13:45:17.024070Z ++7928 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++uci-defaults ++dir ++ +diff --git a/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/all-wcprops b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/all-wcprops +new file mode 100644 +index 0000000..d50171e +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 80 ++/!svn/ver/7928/luci/trunk/contrib/package/freifunk-gwcheck/root/etc/uci-defaults ++END ++freifunk-gwcheck ++K 25 ++svn:wc:ra_dav:version-url ++V 97 ++/!svn/ver/7928/luci/trunk/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck ++END +diff --git a/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/entries b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/entries +new file mode 100644 +index 0000000..b7438cc +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-gwcheck/root/etc/uci-defaults ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-11-13T13:45:17.024070Z ++7928 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-gwcheck ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++c879ff4188f304d5f000de852775d1c8 ++2011-11-13T13:45:17.024070Z ++7928 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++353 ++ +diff --git a/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/text-base/freifunk-gwcheck.svn-base b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/text-base/freifunk-gwcheck.svn-base +new file mode 100644 +index 0000000..33b1b99 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/.svn/text-base/freifunk-gwcheck.svn-base +@@ -0,0 +1,7 @@ ++#!/bin/sh ++tables="/etc/iproute2/rt_tables" ++test -d /etc/iproute2/ || mkdir -p /etc/iproute2/ ++grep -q "gw-check" $tables || echo "200 gw-check" >> $tables ++test -f /etc/crontabs/root || touch /etc/crontabs/root ++grep -q "ff_olsr_test_gw.sh" /etc/crontabs/root || echo "* * * * * /usr/sbin/ff_olsr_test_gw.sh" >> /etc/crontabs/root ++/etc/init.d/cron restart +diff --git a/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck +new file mode 100644 +index 0000000..33b1b99 +--- /dev/null ++++ b/feeds/luci/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck +@@ -0,0 +1,7 @@ ++#!/bin/sh ++tables="/etc/iproute2/rt_tables" ++test -d /etc/iproute2/ || mkdir -p /etc/iproute2/ ++grep -q "gw-check" $tables || echo "200 gw-check" >> $tables ++test -f /etc/crontabs/root || touch /etc/crontabs/root ++grep -q "ff_olsr_test_gw.sh" /etc/crontabs/root || echo "* * * * * /usr/sbin/ff_olsr_test_gw.sh" >> /etc/crontabs/root ++/etc/init.d/cron restart +diff --git a/feeds/luci/freifunk-mapupdate/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/.svn/all-wcprops +new file mode 100644 +index 0000000..1725f70 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/!svn/ver/7771/luci/trunk/contrib/package/freifunk-mapupdate ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/!svn/ver/7771/luci/trunk/contrib/package/freifunk-mapupdate/Makefile ++END +diff --git a/feeds/luci/freifunk-mapupdate/.svn/entries b/feeds/luci/freifunk-mapupdate/.svn/entries +new file mode 100644 +index 0000000..b270f0d +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/.svn/entries +@@ -0,0 +1,71 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++root ++dir ++ ++ipkg ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++3ff6e39cc0c811ea9cc1620713aec6bc ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++895 ++ +diff --git a/feeds/luci/freifunk-mapupdate/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-mapupdate/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a9281ca +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-mapupdate ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-mapupdate ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Update script for freifunkmap ++ DEPENDS:=+olsrd-mod-nameservice ++endef ++ ++define Package/freifunk-mapupdate/description ++ This script updates the freifunkmap (also known as the global map, see http://map.berlin.freifunk.net) every hour. Config file is /etc/config/freifunk-mapupdate. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-mapupdate/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-mapupdate)) +diff --git a/feeds/luci/freifunk-mapupdate/Makefile b/feeds/luci/freifunk-mapupdate/Makefile +new file mode 100644 +index 0000000..a9281ca +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/Makefile +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-mapupdate ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-mapupdate ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Update script for freifunkmap ++ DEPENDS:=+olsrd-mod-nameservice ++endef ++ ++define Package/freifunk-mapupdate/description ++ This script updates the freifunkmap (also known as the global map, see http://map.berlin.freifunk.net) every hour. Config file is /etc/config/freifunk-mapupdate. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-mapupdate/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-mapupdate)) +diff --git a/feeds/luci/freifunk-mapupdate/files/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/files/.svn/all-wcprops +new file mode 100644 +index 0000000..5489f01 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/!svn/ver/7556/luci/trunk/contrib/package/freifunk-mapupdate/files ++END +diff --git a/feeds/luci/freifunk-mapupdate/files/.svn/entries b/feeds/luci/freifunk-mapupdate/files/.svn/entries +new file mode 100644 +index 0000000..16b7697 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:47:47.049420Z ++7556 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++usr ++dir ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-mapupdate/files/etc/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..d811cf3 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/files/etc ++END +diff --git a/feeds/luci/freifunk-mapupdate/files/etc/.svn/entries b/feeds/luci/freifunk-mapupdate/files/etc/.svn/entries +new file mode 100644 +index 0000000..67879aa +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++config ++dir ++ +diff --git a/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..416f590 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/files/etc/config ++END ++freifunk-mapupdate ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/files/etc/config/freifunk-mapupdate ++END +diff --git a/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/entries b/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..74197c2 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/files/etc/config ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-mapupdate ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a92d2dca725ac677a85c57de3fa4cb54 ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++122 ++ +diff --git a/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/text-base/freifunk-mapupdate.svn-base b/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/text-base/freifunk-mapupdate.svn-base +new file mode 100644 +index 0000000..7e98f95 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/etc/config/.svn/text-base/freifunk-mapupdate.svn-base +@@ -0,0 +1,3 @@ ++config 'mapupdate' 'mapupdate' ++ option 'enabled' '1' ++ option 'mapserver' 'http://map.berlin.freifunk.net/freifunkmap.php' +diff --git a/feeds/luci/freifunk-mapupdate/files/etc/config/freifunk-mapupdate b/feeds/luci/freifunk-mapupdate/files/etc/config/freifunk-mapupdate +new file mode 100644 +index 0000000..7e98f95 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/etc/config/freifunk-mapupdate +@@ -0,0 +1,3 @@ ++config 'mapupdate' 'mapupdate' ++ option 'enabled' '1' ++ option 'mapserver' 'http://map.berlin.freifunk.net/freifunkmap.php' +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/files/usr/.svn/all-wcprops +new file mode 100644 +index 0000000..ffb2cdb +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/7556/luci/trunk/contrib/package/freifunk-mapupdate/files/usr ++END +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/.svn/entries b/feeds/luci/freifunk-mapupdate/files/usr/.svn/entries +new file mode 100644 +index 0000000..490a237 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/files/usr ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:47:47.049420Z ++7556 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++sbin ++dir ++ +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/all-wcprops +new file mode 100644 +index 0000000..87e052a +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 75 ++/!svn/ver/7556/luci/trunk/contrib/package/freifunk-mapupdate/files/usr/sbin ++END ++ff_mapupdate.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/!svn/ver/7556/luci/trunk/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh ++END +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/entries b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/entries +new file mode 100644 +index 0000000..dd31d3e +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/files/usr/sbin ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:47:47.049420Z ++7556 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++ff_mapupdate.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a84f701384a4b0e12ec8e3a8d8faee14 ++2011-09-24T20:47:47.049420Z ++7556 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2298 ++ +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/prop-base/ff_mapupdate.sh.svn-base b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/prop-base/ff_mapupdate.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/prop-base/ff_mapupdate.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/text-base/ff_mapupdate.sh.svn-base b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/text-base/ff_mapupdate.sh.svn-base +new file mode 100644 +index 0000000..40a077f +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/sbin/.svn/text-base/ff_mapupdate.sh.svn-base +@@ -0,0 +1,59 @@ ++#!/bin/sh ++ ++if [ ! "$(uci -q get freifunk-mapupdate.mapupdate.enabled)" == 1 ]; then ++ exit 1 ++fi ++ ++MAPSERVER="$(uci -q get freifunk-mapupdate.mapupdate.mapserver)" ++[ -z "$MAPSERVER" ] && logger -t "freifunk-mapupdate:" "No mapserver configured" && exit 1 ++ ++#check if nameservice plugin is installed and enabled, else exit ++nslib=`uci show olsrd |grep olsrd_nameservice.so |awk {' FS="."; print $1"."$2 '}` ++if [ -n "$nslib" ]; then ++ LATLONFILE="$(uci -q get $nslib.latlon_file)" ++ if [ -z "$LATLONFILE" ]; then ++ LATLONFILE="/var/run/latlon.js" ++ fi ++ if [ ! -p "$LATLONFILE" ]; then ++ logger -t "freifunk-mapupdate:" "latlon_file not found."; exit 1 ++ fi ++else ++ logger -t "freifunk-mapupdate:" "nameservice plugin not found in olsrd config." ++ exit 1 ++fi ++ ++HOSTNAME="$(uci show system |grep hostname |cut -d "=" -f 2)" ++HF_INFO="" ++ ++# Get info for myself ++SELF=$(cat $LATLONFILE |grep ^Self | sed -e 's/Self(//' -e 's/);//' -e "s/'//g") ++OLSR_IP="$(echo $SELF |awk '{ FS=",";print $1 }')" ++LOCATION="$(uci show system |grep .location |cut -d "=" -f 2)" ++[ -n "$LOCATION" ] && NOTE="$LOCATION
" ++FFNOTE="$(uci -q get freifunk.contact.note)" ++[ -n "$FFNOTE" ] && NOTE="$NOTE $FFNOTE" ++NOTE="

$HOSTNAME

$NOTE" ++NOTE=`echo -e "$NOTE" | sed -e 's/\ /%20/g' -e 's/&/%26/g' -e 's/"/%22/g'` ++ ++UPDATESTRING="$(echo $SELF |awk '{ FS=",";print $2 }'), $(echo $SELF |awk '{ FS=",";print $3 }')" ++ ++# write our coordinates to mygooglemapscoords.txt to make Freifunk Firmware happy ++echo "$UPDATESTRING" > /tmp/mygooglemapscoords.txt ++[ ! -L /www/mygooglemapscoords.txt ] && ln -s /tmp/mygooglemapscoords.txt /www/mygooglemapscoords.txt ++ ++# get neighbor Info (lat, lon, lq) ++while read line; do ++ NEIGHUPD="$(echo $line |awk '{ FS=","; print $6 }'), $(echo $line |awk '{ FS=","; print $7 }'), $(echo $line |awk '{ FS=",";print $4 }')" ++ UPDATESTRING="${UPDATESTRING}, ${NEIGHUPD}" ++done << EOF ++`grep "PLink('$OLSR_IP" $LATLONFILE | sed -e 's/PLink(//' -e 's/);//' -e "s/'//g"` ++EOF ++ ++# Send UPDATESTRING ++UPDATE=`echo -e "$UPDATESTRING" | sed s/\ /%20/g` ++result="$(wget "$MAPSERVER?update=$UPDATE&updateiv=3600&olsrip=$OLSR_IP¬e=${NOTE}${HF_INFO}" -qO -)" ++ ++if [ ! "$result" == "success update" ]; then ++ logger -t "freifunk-mapupdate:" "Update failed: $result" ++fi ++ +diff --git a/feeds/luci/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh b/feeds/luci/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh +new file mode 100755 +index 0000000..40a077f +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh +@@ -0,0 +1,59 @@ ++#!/bin/sh ++ ++if [ ! "$(uci -q get freifunk-mapupdate.mapupdate.enabled)" == 1 ]; then ++ exit 1 ++fi ++ ++MAPSERVER="$(uci -q get freifunk-mapupdate.mapupdate.mapserver)" ++[ -z "$MAPSERVER" ] && logger -t "freifunk-mapupdate:" "No mapserver configured" && exit 1 ++ ++#check if nameservice plugin is installed and enabled, else exit ++nslib=`uci show olsrd |grep olsrd_nameservice.so |awk {' FS="."; print $1"."$2 '}` ++if [ -n "$nslib" ]; then ++ LATLONFILE="$(uci -q get $nslib.latlon_file)" ++ if [ -z "$LATLONFILE" ]; then ++ LATLONFILE="/var/run/latlon.js" ++ fi ++ if [ ! -p "$LATLONFILE" ]; then ++ logger -t "freifunk-mapupdate:" "latlon_file not found."; exit 1 ++ fi ++else ++ logger -t "freifunk-mapupdate:" "nameservice plugin not found in olsrd config." ++ exit 1 ++fi ++ ++HOSTNAME="$(uci show system |grep hostname |cut -d "=" -f 2)" ++HF_INFO="" ++ ++# Get info for myself ++SELF=$(cat $LATLONFILE |grep ^Self | sed -e 's/Self(//' -e 's/);//' -e "s/'//g") ++OLSR_IP="$(echo $SELF |awk '{ FS=",";print $1 }')" ++LOCATION="$(uci show system |grep .location |cut -d "=" -f 2)" ++[ -n "$LOCATION" ] && NOTE="$LOCATION
" ++FFNOTE="$(uci -q get freifunk.contact.note)" ++[ -n "$FFNOTE" ] && NOTE="$NOTE $FFNOTE" ++NOTE="

$HOSTNAME

$NOTE" ++NOTE=`echo -e "$NOTE" | sed -e 's/\ /%20/g' -e 's/&/%26/g' -e 's/"/%22/g'` ++ ++UPDATESTRING="$(echo $SELF |awk '{ FS=",";print $2 }'), $(echo $SELF |awk '{ FS=",";print $3 }')" ++ ++# write our coordinates to mygooglemapscoords.txt to make Freifunk Firmware happy ++echo "$UPDATESTRING" > /tmp/mygooglemapscoords.txt ++[ ! -L /www/mygooglemapscoords.txt ] && ln -s /tmp/mygooglemapscoords.txt /www/mygooglemapscoords.txt ++ ++# get neighbor Info (lat, lon, lq) ++while read line; do ++ NEIGHUPD="$(echo $line |awk '{ FS=","; print $6 }'), $(echo $line |awk '{ FS=","; print $7 }'), $(echo $line |awk '{ FS=",";print $4 }')" ++ UPDATESTRING="${UPDATESTRING}, ${NEIGHUPD}" ++done << EOF ++`grep "PLink('$OLSR_IP" $LATLONFILE | sed -e 's/PLink(//' -e 's/);//' -e "s/'//g"` ++EOF ++ ++# Send UPDATESTRING ++UPDATE=`echo -e "$UPDATESTRING" | sed s/\ /%20/g` ++result="$(wget "$MAPSERVER?update=$UPDATE&updateiv=3600&olsrip=$OLSR_IP¬e=${NOTE}${HF_INFO}" -qO -)" ++ ++if [ ! "$result" == "success update" ]; then ++ logger -t "freifunk-mapupdate:" "Update failed: $result" ++fi ++ +diff --git a/feeds/luci/freifunk-mapupdate/ipkg/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/ipkg/.svn/all-wcprops +new file mode 100644 +index 0000000..5d136f2 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/ipkg/.svn/all-wcprops +@@ -0,0 +1,17 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 65 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/ipkg ++END ++postinst ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/ipkg/postinst ++END ++postrm ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/ipkg/postrm ++END +diff --git a/feeds/luci/freifunk-mapupdate/ipkg/.svn/entries b/feeds/luci/freifunk-mapupdate/ipkg/.svn/entries +new file mode 100644 +index 0000000..eeafcef +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/ipkg/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/ipkg ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++postinst ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++0164f6a394110acb60df4206cd612403 ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++133 ++ ++postrm ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++9e5f781033e3dffa85757b8c8f5c6e21 ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++117 ++ +diff --git a/feeds/luci/freifunk-mapupdate/ipkg/.svn/text-base/postinst.svn-base b/feeds/luci/freifunk-mapupdate/ipkg/.svn/text-base/postinst.svn-base +new file mode 100644 +index 0000000..2844697 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/ipkg/.svn/text-base/postinst.svn-base +@@ -0,0 +1,4 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ ( . /etc/uci-defaults/freifunk-mapupdate ) && rm -f /etc/uci-defaults/freifunk-mapupdate ++} +diff --git a/feeds/luci/freifunk-mapupdate/ipkg/.svn/text-base/postrm.svn-base b/feeds/luci/freifunk-mapupdate/ipkg/.svn/text-base/postrm.svn-base +new file mode 100644 +index 0000000..dc1a870 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/ipkg/.svn/text-base/postrm.svn-base +@@ -0,0 +1,5 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ sed -i '/ff_mapupdate.sh/d' /etc/crontabs/root ++ /etc/init.d/cron restart ++} +diff --git a/feeds/luci/freifunk-mapupdate/ipkg/postinst b/feeds/luci/freifunk-mapupdate/ipkg/postinst +new file mode 100644 +index 0000000..2844697 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/ipkg/postinst +@@ -0,0 +1,4 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ ( . /etc/uci-defaults/freifunk-mapupdate ) && rm -f /etc/uci-defaults/freifunk-mapupdate ++} +diff --git a/feeds/luci/freifunk-mapupdate/ipkg/postrm b/feeds/luci/freifunk-mapupdate/ipkg/postrm +new file mode 100644 +index 0000000..dc1a870 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/ipkg/postrm +@@ -0,0 +1,5 @@ ++#!/bin/sh ++[ -n "${IPKG_INSTROOT}" ] || { ++ sed -i '/ff_mapupdate.sh/d' /etc/crontabs/root ++ /etc/init.d/cron restart ++} +diff --git a/feeds/luci/freifunk-mapupdate/root/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/root/.svn/all-wcprops +new file mode 100644 +index 0000000..1555b40 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 65 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/root ++END +diff --git a/feeds/luci/freifunk-mapupdate/root/.svn/entries b/feeds/luci/freifunk-mapupdate/root/.svn/entries +new file mode 100644 +index 0000000..b8a5501 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/root ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-mapupdate/root/etc/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/root/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..abe1c8a +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/root/etc ++END +diff --git a/feeds/luci/freifunk-mapupdate/root/etc/.svn/entries b/feeds/luci/freifunk-mapupdate/root/etc/.svn/entries +new file mode 100644 +index 0000000..c79db16 +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/root/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++uci-defaults ++dir ++ +diff --git a/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/all-wcprops b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/all-wcprops +new file mode 100644 +index 0000000..5c8d00d +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 82 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/root/etc/uci-defaults ++END ++freifunk-mapupdate ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/!svn/ver/7553/luci/trunk/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate ++END +diff --git a/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/entries b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/entries +new file mode 100644 +index 0000000..cf3842e +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-mapupdate/root/etc/uci-defaults ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-mapupdate ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++887fdd601674b68e7b94b6de94248316 ++2011-09-24T20:15:26.401300Z ++7553 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++332 ++ +diff --git a/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/text-base/freifunk-mapupdate.svn-base b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/text-base/freifunk-mapupdate.svn-base +new file mode 100644 +index 0000000..dee7f1b +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/.svn/text-base/freifunk-mapupdate.svn-base +@@ -0,0 +1,6 @@ ++#!/bin/sh ++test -f /etc/crontabs/root || touch /etc/crontabs/root ++SEED="$( dd if=/dev/urandom bs=2 count=1 2>&- | hexdump | if read line; then echo 0x${line#* }; fi )" ++MIN="$(( $SEED % 59 ))" ++grep -q "ff_mapupdate.sh" /etc/crontabs/root || echo "$MIN * * * * /usr/sbin/ff_mapupdate.sh" >> /etc/crontabs/root ++/etc/init.d/cron restart +diff --git a/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate +new file mode 100644 +index 0000000..dee7f1b +--- /dev/null ++++ b/feeds/luci/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate +@@ -0,0 +1,6 @@ ++#!/bin/sh ++test -f /etc/crontabs/root || touch /etc/crontabs/root ++SEED="$( dd if=/dev/urandom bs=2 count=1 2>&- | hexdump | if read line; then echo 0x${line#* }; fi )" ++MIN="$(( $SEED % 59 ))" ++grep -q "ff_mapupdate.sh" /etc/crontabs/root || echo "$MIN * * * * /usr/sbin/ff_mapupdate.sh" >> /etc/crontabs/root ++/etc/init.d/cron restart +diff --git a/feeds/luci/freifunk-p2pblock/.svn/all-wcprops b/feeds/luci/freifunk-p2pblock/.svn/all-wcprops +new file mode 100644 +index 0000000..f758111 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 59 ++/!svn/ver/9531/luci/trunk/contrib/package/freifunk-p2pblock ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 68 ++/!svn/ver/9531/luci/trunk/contrib/package/freifunk-p2pblock/Makefile ++END +diff --git a/feeds/luci/freifunk-p2pblock/.svn/entries b/feeds/luci/freifunk-p2pblock/.svn/entries +new file mode 100644 +index 0000000..06f05e1 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-p2pblock ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-12-07T13:13:43.366542Z ++9531 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++e432f4ccfc4f613ed0f4789b4ee19a3f ++2012-12-07T13:13:43.366542Z ++9531 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1218 ++ +diff --git a/feeds/luci/freifunk-p2pblock/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-p2pblock/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6bf3a96 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 2009 Andreas Seidler ++# Copyright (C) 2012 Jo-Philipp Wich ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-p2pblock ++PKG_RELEASE:=3 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-p2pblock ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk p2pblock Addon ++ DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra ++endef ++ ++define Package/freifunk-p2pblock/description ++ Simple Addon for Freifunk which use iptables layer7-, ipp2p- and recent-modules ++ to block p2p/filesharing traffic ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-p2pblock/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/freifunk-p2pblock.init $(1)/etc/init.d/freifunk-p2pblock ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/freifunk-p2pblock.config $(1)/etc/config/freifunk_p2pblock ++endef ++ ++$(eval $(call BuildPackage,freifunk-p2pblock)) +diff --git a/feeds/luci/freifunk-p2pblock/Makefile b/feeds/luci/freifunk-p2pblock/Makefile +new file mode 100644 +index 0000000..6bf3a96 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/Makefile +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 2009 Andreas Seidler ++# Copyright (C) 2012 Jo-Philipp Wich ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-p2pblock ++PKG_RELEASE:=3 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-p2pblock ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk p2pblock Addon ++ DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra ++endef ++ ++define Package/freifunk-p2pblock/description ++ Simple Addon for Freifunk which use iptables layer7-, ipp2p- and recent-modules ++ to block p2p/filesharing traffic ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-p2pblock/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/freifunk-p2pblock.init $(1)/etc/init.d/freifunk-p2pblock ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/freifunk-p2pblock.config $(1)/etc/config/freifunk_p2pblock ++endef ++ ++$(eval $(call BuildPackage,freifunk-p2pblock)) +diff --git a/feeds/luci/freifunk-p2pblock/files/.svn/all-wcprops b/feeds/luci/freifunk-p2pblock/files/.svn/all-wcprops +new file mode 100644 +index 0000000..e859419 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/files/.svn/all-wcprops +@@ -0,0 +1,17 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 65 ++/!svn/ver/9531/luci/trunk/contrib/package/freifunk-p2pblock/files ++END ++freifunk-p2pblock.init ++K 25 ++svn:wc:ra_dav:version-url ++V 88 ++/!svn/ver/9531/luci/trunk/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init ++END ++freifunk-p2pblock.config ++K 25 ++svn:wc:ra_dav:version-url ++V 90 ++/!svn/ver/4802/luci/trunk/contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.config ++END +diff --git a/feeds/luci/freifunk-p2pblock/files/.svn/entries b/feeds/luci/freifunk-p2pblock/files/.svn/entries +new file mode 100644 +index 0000000..a16648c +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-p2pblock/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-12-07T13:13:43.366542Z ++9531 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-p2pblock.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++a4d64f687a9ca83005c3f61219171d9e ++2012-12-07T13:13:43.366542Z ++9531 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2801 ++ ++freifunk-p2pblock.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:58.000000Z ++fa5cd3948b28ee86ecda6a9c6ba94aec ++2009-06-07T22:08:59.260059Z ++4802 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++219 ++ +diff --git a/feeds/luci/freifunk-p2pblock/files/.svn/text-base/freifunk-p2pblock.config.svn-base b/feeds/luci/freifunk-p2pblock/files/.svn/text-base/freifunk-p2pblock.config.svn-base +new file mode 100644 +index 0000000..291260e +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/files/.svn/text-base/freifunk-p2pblock.config.svn-base +@@ -0,0 +1,6 @@ ++config 'settings' 'p2pblock' ++ option 'portrange' '1024:65535' ++ option 'layer7' 'edonkey bittorrent fasttrack' ++ option 'ipp2p' 'edk dc kazaa gnu bit ares soul winmx apple' ++ option 'blocktime' '60' ++ option 'whitelist' '' +diff --git a/feeds/luci/freifunk-p2pblock/files/.svn/text-base/freifunk-p2pblock.init.svn-base b/feeds/luci/freifunk-p2pblock/files/.svn/text-base/freifunk-p2pblock.init.svn-base +new file mode 100644 +index 0000000..5ca60c8 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/files/.svn/text-base/freifunk-p2pblock.init.svn-base +@@ -0,0 +1,95 @@ ++#!/bin/sh /etc/rc.common ++ ++START=82 ++ME="freifunk-p2pblock" ++LOCK='/var/run/p2pblock.lock' ++ ++# helper-scripts ++ipt_add() { ++ logger -t "$ME" "set 'iptables -I $1'" ++ iptables -I $1 ++ echo "iptables -D $1" >> $LOCK ++} ++ ++start() { ++ /etc/init.d/freifunk-p2pblock enabled || return ++ ++ if [ ! -s "$LOCK" ]; then ++ logger -s -t "$ME" 'starting p2pblock...' ++ ++ config_load network ++ config_get wan wan ifname ++ ++ if [ -n "$wan" ]; then ++ config_load freifunk_p2pblock ++ config_get layer7 p2pblock layer7 ++ config_get ipp2p p2pblock ipp2p ++ config_get portrange p2pblock portrange ++ config_get blocktime p2pblock blocktime ++ config_get whitelist p2pblock whitelist ++ ++ # load modules ++ insmod ipt_ipp2p 2>&- ++ insmod ipt_layer7 2>&- ++ insmod ipt_recent ip_list_tot=400 ip_pkt_list_tot=3 2>&- ++ ++ # create new p2p-chain ++ iptables -N p2pblock ++ # pipe all incoming FORWARD with source-/destination-port 1024-65535 throu p2p-chain ++ ipt_add "FORWARD -i $wan -p tcp --sport $portrange --dport $portrange -j p2pblock" ++ ipt_add "FORWARD -i $wan -p udp --sport $portrange --dport $portrange -j p2pblock" ++ ++ # if p2p-traffic blocked 3 packages to a destination ip then block all traffic within the next 180 sec (port 1024-65535) ++ ipt_add "p2pblock -m recent --rdest --rcheck --name P2PBLOCK --seconds $blocktime --hitcount 3 -j DROP" ++ ipt_add "p2pblock -m recent --rdest --rcheck --name P2PBLOCK --seconds $blocktime --hitcount 3 -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-DROP:" ++ ++ # create layer7-rules ++ for proto in $layer7; do ++ ipt_add "p2pblock -m layer7 --l7proto $proto -m recent --rdest --set --name P2PBLOCK" ++ ipt_add "p2pblock -m layer7 --l7proto $proto -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-seen-$proto:" ++ done ++ ++ # create ipp2p-rules ++ for proto in $ipp2p; do ++ ipt_add "p2pblock -m ipp2p --$proto -m recent --rdest --set --name P2PBLOCK" ++ ipt_add "p2pblock -m ipp2p --$proto -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-seen-$proto:" ++ done ++ ++ # insert whitelisted ips ++ for ip in $whitelist; do ++ ipt_add "p2pblock -d $ip -j RETURN" ++ done ++ ++ logger -s -t "$ME" 'Done.'; return 0 ++ else ++ logger -s -t "$ME" 'No wan interface present.'; return 0 ++ fi ++ else ++ logger -s -t "$ME" 'WARNING! already running - Aborting!'; return 2 ++ fi ++} ++ ++stop() { ++ if [ -s "$LOCK" ]; then ++ logger -s -t "$ME" 'stopping p2pblock...' ++ ++ # unset all rules in $LOCK-file ++ cat $LOCK | sed -ne '1!G;h;$p' | while read line; do ++ logger -t "$ME" "unset $line" ++ while eval $line 2>&-; do :; done ++ done; : > "$LOCK" ++ ++ # flush and delete the p2p-chain ++ iptables -F p2pblock ++ iptables -X p2pblock ++ logger -s -t "$ME" 'Done.'; return 0 ++ ++ else ++ logger -s -t "$ME" 'WARNING! not running - Aborting!'; return 2 ++ ++ fi ++} ++ ++restart() { ++ stop; sleep 1; start ++} +diff --git a/feeds/luci/freifunk-p2pblock/files/freifunk-p2pblock.config b/feeds/luci/freifunk-p2pblock/files/freifunk-p2pblock.config +new file mode 100644 +index 0000000..291260e +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/files/freifunk-p2pblock.config +@@ -0,0 +1,6 @@ ++config 'settings' 'p2pblock' ++ option 'portrange' '1024:65535' ++ option 'layer7' 'edonkey bittorrent fasttrack' ++ option 'ipp2p' 'edk dc kazaa gnu bit ares soul winmx apple' ++ option 'blocktime' '60' ++ option 'whitelist' '' +diff --git a/feeds/luci/freifunk-p2pblock/files/freifunk-p2pblock.init b/feeds/luci/freifunk-p2pblock/files/freifunk-p2pblock.init +new file mode 100644 +index 0000000..5ca60c8 +--- /dev/null ++++ b/feeds/luci/freifunk-p2pblock/files/freifunk-p2pblock.init +@@ -0,0 +1,95 @@ ++#!/bin/sh /etc/rc.common ++ ++START=82 ++ME="freifunk-p2pblock" ++LOCK='/var/run/p2pblock.lock' ++ ++# helper-scripts ++ipt_add() { ++ logger -t "$ME" "set 'iptables -I $1'" ++ iptables -I $1 ++ echo "iptables -D $1" >> $LOCK ++} ++ ++start() { ++ /etc/init.d/freifunk-p2pblock enabled || return ++ ++ if [ ! -s "$LOCK" ]; then ++ logger -s -t "$ME" 'starting p2pblock...' ++ ++ config_load network ++ config_get wan wan ifname ++ ++ if [ -n "$wan" ]; then ++ config_load freifunk_p2pblock ++ config_get layer7 p2pblock layer7 ++ config_get ipp2p p2pblock ipp2p ++ config_get portrange p2pblock portrange ++ config_get blocktime p2pblock blocktime ++ config_get whitelist p2pblock whitelist ++ ++ # load modules ++ insmod ipt_ipp2p 2>&- ++ insmod ipt_layer7 2>&- ++ insmod ipt_recent ip_list_tot=400 ip_pkt_list_tot=3 2>&- ++ ++ # create new p2p-chain ++ iptables -N p2pblock ++ # pipe all incoming FORWARD with source-/destination-port 1024-65535 throu p2p-chain ++ ipt_add "FORWARD -i $wan -p tcp --sport $portrange --dport $portrange -j p2pblock" ++ ipt_add "FORWARD -i $wan -p udp --sport $portrange --dport $portrange -j p2pblock" ++ ++ # if p2p-traffic blocked 3 packages to a destination ip then block all traffic within the next 180 sec (port 1024-65535) ++ ipt_add "p2pblock -m recent --rdest --rcheck --name P2PBLOCK --seconds $blocktime --hitcount 3 -j DROP" ++ ipt_add "p2pblock -m recent --rdest --rcheck --name P2PBLOCK --seconds $blocktime --hitcount 3 -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-DROP:" ++ ++ # create layer7-rules ++ for proto in $layer7; do ++ ipt_add "p2pblock -m layer7 --l7proto $proto -m recent --rdest --set --name P2PBLOCK" ++ ipt_add "p2pblock -m layer7 --l7proto $proto -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-seen-$proto:" ++ done ++ ++ # create ipp2p-rules ++ for proto in $ipp2p; do ++ ipt_add "p2pblock -m ipp2p --$proto -m recent --rdest --set --name P2PBLOCK" ++ ipt_add "p2pblock -m ipp2p --$proto -m limit --limit 1/minute -j LOG --log-prefix P2PBLOCK-seen-$proto:" ++ done ++ ++ # insert whitelisted ips ++ for ip in $whitelist; do ++ ipt_add "p2pblock -d $ip -j RETURN" ++ done ++ ++ logger -s -t "$ME" 'Done.'; return 0 ++ else ++ logger -s -t "$ME" 'No wan interface present.'; return 0 ++ fi ++ else ++ logger -s -t "$ME" 'WARNING! already running - Aborting!'; return 2 ++ fi ++} ++ ++stop() { ++ if [ -s "$LOCK" ]; then ++ logger -s -t "$ME" 'stopping p2pblock...' ++ ++ # unset all rules in $LOCK-file ++ cat $LOCK | sed -ne '1!G;h;$p' | while read line; do ++ logger -t "$ME" "unset $line" ++ while eval $line 2>&-; do :; done ++ done; : > "$LOCK" ++ ++ # flush and delete the p2p-chain ++ iptables -F p2pblock ++ iptables -X p2pblock ++ logger -s -t "$ME" 'Done.'; return 0 ++ ++ else ++ logger -s -t "$ME" 'WARNING! not running - Aborting!'; return 2 ++ ++ fi ++} ++ ++restart() { ++ stop; sleep 1; start ++} +diff --git a/feeds/luci/freifunk-policyrouting/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/.svn/all-wcprops +new file mode 100644 +index 0000000..9bbaa08 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 64 ++/!svn/ver/9652/luci/trunk/contrib/package/freifunk-policyrouting ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 73 ++/!svn/ver/7771/luci/trunk/contrib/package/freifunk-policyrouting/Makefile ++END +diff --git a/feeds/luci/freifunk-policyrouting/.svn/entries b/feeds/luci/freifunk-policyrouting/.svn/entries +new file mode 100644 +index 0000000..820d33a +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-27T00:17:48.196957Z ++9652 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++82d7ad24df9661312f4b4bf9a60c985d ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++880 ++ +diff --git a/feeds/luci/freifunk-policyrouting/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-policyrouting/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7abfedb +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-policyrouting ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-policyrouting ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk policy routing addon ++ DEPENDS:=+firewall +ip ++endef ++ ++define Package/freifunk-policyrouting/description ++ Allows you to send your own traffic via your own default gateway while sending traffic received from the mesh to a gateway in the mesh. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-policyrouting/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-policyrouting)) +diff --git a/feeds/luci/freifunk-policyrouting/Makefile b/feeds/luci/freifunk-policyrouting/Makefile +new file mode 100644 +index 0000000..7abfedb +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/Makefile +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-policyrouting ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-policyrouting ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk policy routing addon ++ DEPENDS:=+firewall +ip ++endef ++ ++define Package/freifunk-policyrouting/description ++ Allows you to send your own traffic via your own default gateway while sending traffic received from the mesh to a gateway in the mesh. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/freifunk-policyrouting/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-policyrouting)) +diff --git a/feeds/luci/freifunk-policyrouting/files/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/.svn/all-wcprops +new file mode 100644 +index 0000000..3f47a4a +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/9652/luci/trunk/contrib/package/freifunk-policyrouting/files ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/.svn/entries b/feeds/luci/freifunk-policyrouting/files/.svn/entries +new file mode 100644 +index 0000000..0c6ab32 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-27T00:17:48.196957Z ++9652 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++etc ++dir ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..7b499e5 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/!svn/ver/9652/luci/trunk/contrib/package/freifunk-policyrouting/files/etc ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/.svn/entries +new file mode 100644 +index 0000000..eb206dc +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/.svn/entries +@@ -0,0 +1,43 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-27T00:17:48.196957Z ++9652 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++hotplug.d ++dir ++ ++config ++dir ++ ++init.d ++dir ++ ++uci-defaults ++dir ++ ++rc.d ++dir ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..0f5e257 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 81 ++/!svn/ver/8846/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/config ++END ++freifunk-policyrouting ++K 25 ++svn:wc:ra_dav:version-url ++V 104 ++/!svn/ver/8846/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..ecac816 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/config ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-07-01T00:01:38.500238Z ++8846 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-policyrouting ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a0b8ab31ac55cdeaf07682451e92c1c4 ++2012-07-01T00:01:38.500238Z ++8846 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++116 ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/text-base/freifunk-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/text-base/freifunk-policyrouting.svn-base +new file mode 100644 +index 0000000..3dd2998 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/config/.svn/text-base/freifunk-policyrouting.svn-base +@@ -0,0 +1,7 @@ ++ ++config 'settings' 'pr' ++ option 'enable' '0' ++ option 'strict' '1' ++ option 'fallback' '1' ++ option 'zones' '' ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/config/freifunk-policyrouting b/feeds/luci/freifunk-policyrouting/files/etc/config/freifunk-policyrouting +new file mode 100644 +index 0000000..3dd2998 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/config/freifunk-policyrouting +@@ -0,0 +1,7 @@ ++ ++config 'settings' 'pr' ++ option 'enable' '0' ++ option 'strict' '1' ++ option 'fallback' '1' ++ option 'zones' '' ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/.svn/all-wcprops +new file mode 100644 +index 0000000..60221e6 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 84 ++/!svn/ver/9650/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..30c150c +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-26T23:11:04.177215Z ++9650 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++firewall ++dir ++ ++iface ++dir ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/all-wcprops +new file mode 100644 +index 0000000..30196f0 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 93 ++/!svn/ver/8698/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall ++END ++24-policyrouting ++K 25 ++svn:wc:ra_dav:version-url ++V 110 ++/!svn/ver/8698/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/entries +new file mode 100644 +index 0000000..1a54bbb +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-06-05T22:23:40.941148Z ++8698 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++24-policyrouting ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++4482e843db2a71e0736cc9e9250829a2 ++2012-06-05T22:23:40.941148Z ++8698 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4627 ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/text-base/24-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/text-base/24-policyrouting.svn-base +new file mode 100644 +index 0000000..786c5e4 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/.svn/text-base/24-policyrouting.svn-base +@@ -0,0 +1,116 @@ ++if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then ++ pr=`uci get freifunk-policyrouting.pr.enable` ++ strict=`uci get freifunk-policyrouting.pr.strict` ++ zones=`uci get freifunk-policyrouting.pr.zones` ++ [ -f /proc/net/ipv6_route ] && has_ipv6=1 ++ if [ $pr = "1" ]; then ++ ++ # The wan device name ++ if [ -n "`uci -p /var/state get network.wan.ifname`" ]; then ++ wandev=`uci -p /var/state get network.wan.ifname` ++ else ++ wandev=`uci -p /var/state get network.wan.device` ++ fi ++ ++ iptables -t mangle -D PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ iptables -t mangle -F prerouting_policy > /dev/null 2>&1 ++ iptables -t mangle -N prerouting_policy > /dev/null 2>&1 ++ iptables -t mangle -I PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ if [ "$has_ipv6" = 1 ]; then ++ ip6tables -t mangle -D PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ ip6tables -t mangle -F prerouting_policy > /dev/null 2>&1 ++ ip6tables -t mangle -N prerouting_policy > /dev/null 2>&1 ++ ip6tables -t mangle -I PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ fi ++ ++ # If no route is in table olsr-default, then usually the hosts local default route is used. ++ # If set to strict then we add a filter which prevents this ++ if [ "$strict" == "1" ]; then ++ ln=$(( `iptables -L FORWARD -v --line-numbers | grep -m 1 reject | awk {' print $1 '}` - 1 )) ++ if [ ! $ln -gt 0 ]; then ++ ln=1 ++ fi ++ if [ -z "`iptables -L |grep 'Chain forward_policy'`" ]; then ++ iptables -N forward_policy ++ fi ++ if [ -z "`iptables -L FORWARD -v |grep forward_policy`" ]; then ++ iptables -I FORWARD $ln -m mark --mark 1 -j forward_policy ++ fi ++ iptables -F forward_policy ++ iptables -I forward_policy -o $wandev -j REJECT --reject-with icmp-net-prohibited ++ ++ ++ if [ "$has_ipv6" = 1 ]; then ++ ln=$(( `ip6tables -L FORWARD -v --line-numbers | grep -m 1 reject | awk {' print $1 '}` - 1 )) ++ if [ ! $ln -gt 0 ]; then ++ ln=1 ++ fi ++ if [ -z "`ip6tables -L |grep 'Chain forward_policy'`" ]; then ++ ip6tables -N forward_policy ++ fi ++ if [ -z "`ip6tables -L FORWARD -v |grep forward_policy`" ]; then ++ ip6tables -I FORWARD $ln -m mark --mark 1 -j forward_policy ++ fi ++ ip6tables -F forward_policy ++ ip6tables -I forward_policy -o $wandev -j REJECT ++ fi ++ fi ++ ++ # set mark 1 for all packets coming in via enabled zones ++ for i in $zones; do ++ # find out which interfaces belong to this zone ++ zone=`uci show firewall |grep "name=$i" |awk {' FS="."; print $1"."$2 '}` ++ interfaces=`uci get $zone.network` ++ if [ "$interfaces" == "" ]; then ++ interfaces=$i ++ fi ++ for int in $interfaces; do ++ if [ "`uci -q get network.$int.type`" == "bridge" ]; then ++ dev="br-$int" ++ else ++ if [ -n "`uci -p /var/state get network.$int.ifname`" ]; then ++ dev=`uci -p /var/state get network.$int.ifname` ++ else ++ dev=`uci -p /var/state get network.$int.device` ++ fi ++ fi ++ logger -t policyrouting "Add mark 1 to packages coming in via interface $dev" ++ iptables -t mangle -I prerouting_policy -i $dev -j MARK --set-mark 1 ++ if [ "$has_ipv6" = 1 ]; then ++ ip6tables -t mangle -I prerouting_policy -i $dev -j MARK --set-mark 1 ++ fi ++ done ++ done ++ else ++ # Cleanup policy routing stuff that might be lingering around ++ if [ -n "`iptables -t mangle -L PREROUTING |grep _policy`" ]; then ++ logger -t policyrouting "Delete prerouting_policy chain in table mangle (IPv4)" ++ iptables -t mangle -D PREROUTING -j prerouting_policy ++ iptables -t mangle -F prerouting_policy ++ iptables -t mangle -X prerouting_policy ++ fi ++ if [ -n "`iptables -L FORWARD |grep forward_policy`" ]; then ++ logger -t policyrouting "Delete strict forwarding rules (IPv4)" ++ iptables -D FORWARD -m mark --mark 1 -j forward_policy ++ iptables -F forward_policy ++ iptables -X forward_policy ++ fi ++ ++ if [ "$has_ipv6" = 1 ]; then ++ if [ -n "`ip6tables -t mangle -L PREROUTING |grep _policy`" ]; then ++ logger -t policyrouting "Delete prerouting_policy chain in table mangle (IPv6)" ++ ip6tables -t mangle -D PREROUTING -j prerouting_policy ++ ip6tables -t mangle -F prerouting_policy ++ ip6tables -t mangle -X prerouting_policy ++ fi ++ if [ -n "`ip6tables -L FORWARD |grep forward_policy`" ]; then ++ logger -t policyrouting "Delete strict forwarding rules (IPv6)" ++ ip6tables -D FORWARD -m mark --mark 1 -j forward_policy ++ ip6tables -F forward_policy ++ ip6tables -X forward_policy ++ fi ++ fi ++ logger -t policyrouting "All firewall rules for policyrouting removed." ++ fi ++fi ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting +new file mode 100644 +index 0000000..786c5e4 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting +@@ -0,0 +1,116 @@ ++if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then ++ pr=`uci get freifunk-policyrouting.pr.enable` ++ strict=`uci get freifunk-policyrouting.pr.strict` ++ zones=`uci get freifunk-policyrouting.pr.zones` ++ [ -f /proc/net/ipv6_route ] && has_ipv6=1 ++ if [ $pr = "1" ]; then ++ ++ # The wan device name ++ if [ -n "`uci -p /var/state get network.wan.ifname`" ]; then ++ wandev=`uci -p /var/state get network.wan.ifname` ++ else ++ wandev=`uci -p /var/state get network.wan.device` ++ fi ++ ++ iptables -t mangle -D PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ iptables -t mangle -F prerouting_policy > /dev/null 2>&1 ++ iptables -t mangle -N prerouting_policy > /dev/null 2>&1 ++ iptables -t mangle -I PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ if [ "$has_ipv6" = 1 ]; then ++ ip6tables -t mangle -D PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ ip6tables -t mangle -F prerouting_policy > /dev/null 2>&1 ++ ip6tables -t mangle -N prerouting_policy > /dev/null 2>&1 ++ ip6tables -t mangle -I PREROUTING -j prerouting_policy > /dev/null 2>&1 ++ fi ++ ++ # If no route is in table olsr-default, then usually the hosts local default route is used. ++ # If set to strict then we add a filter which prevents this ++ if [ "$strict" == "1" ]; then ++ ln=$(( `iptables -L FORWARD -v --line-numbers | grep -m 1 reject | awk {' print $1 '}` - 1 )) ++ if [ ! $ln -gt 0 ]; then ++ ln=1 ++ fi ++ if [ -z "`iptables -L |grep 'Chain forward_policy'`" ]; then ++ iptables -N forward_policy ++ fi ++ if [ -z "`iptables -L FORWARD -v |grep forward_policy`" ]; then ++ iptables -I FORWARD $ln -m mark --mark 1 -j forward_policy ++ fi ++ iptables -F forward_policy ++ iptables -I forward_policy -o $wandev -j REJECT --reject-with icmp-net-prohibited ++ ++ ++ if [ "$has_ipv6" = 1 ]; then ++ ln=$(( `ip6tables -L FORWARD -v --line-numbers | grep -m 1 reject | awk {' print $1 '}` - 1 )) ++ if [ ! $ln -gt 0 ]; then ++ ln=1 ++ fi ++ if [ -z "`ip6tables -L |grep 'Chain forward_policy'`" ]; then ++ ip6tables -N forward_policy ++ fi ++ if [ -z "`ip6tables -L FORWARD -v |grep forward_policy`" ]; then ++ ip6tables -I FORWARD $ln -m mark --mark 1 -j forward_policy ++ fi ++ ip6tables -F forward_policy ++ ip6tables -I forward_policy -o $wandev -j REJECT ++ fi ++ fi ++ ++ # set mark 1 for all packets coming in via enabled zones ++ for i in $zones; do ++ # find out which interfaces belong to this zone ++ zone=`uci show firewall |grep "name=$i" |awk {' FS="."; print $1"."$2 '}` ++ interfaces=`uci get $zone.network` ++ if [ "$interfaces" == "" ]; then ++ interfaces=$i ++ fi ++ for int in $interfaces; do ++ if [ "`uci -q get network.$int.type`" == "bridge" ]; then ++ dev="br-$int" ++ else ++ if [ -n "`uci -p /var/state get network.$int.ifname`" ]; then ++ dev=`uci -p /var/state get network.$int.ifname` ++ else ++ dev=`uci -p /var/state get network.$int.device` ++ fi ++ fi ++ logger -t policyrouting "Add mark 1 to packages coming in via interface $dev" ++ iptables -t mangle -I prerouting_policy -i $dev -j MARK --set-mark 1 ++ if [ "$has_ipv6" = 1 ]; then ++ ip6tables -t mangle -I prerouting_policy -i $dev -j MARK --set-mark 1 ++ fi ++ done ++ done ++ else ++ # Cleanup policy routing stuff that might be lingering around ++ if [ -n "`iptables -t mangle -L PREROUTING |grep _policy`" ]; then ++ logger -t policyrouting "Delete prerouting_policy chain in table mangle (IPv4)" ++ iptables -t mangle -D PREROUTING -j prerouting_policy ++ iptables -t mangle -F prerouting_policy ++ iptables -t mangle -X prerouting_policy ++ fi ++ if [ -n "`iptables -L FORWARD |grep forward_policy`" ]; then ++ logger -t policyrouting "Delete strict forwarding rules (IPv4)" ++ iptables -D FORWARD -m mark --mark 1 -j forward_policy ++ iptables -F forward_policy ++ iptables -X forward_policy ++ fi ++ ++ if [ "$has_ipv6" = 1 ]; then ++ if [ -n "`ip6tables -t mangle -L PREROUTING |grep _policy`" ]; then ++ logger -t policyrouting "Delete prerouting_policy chain in table mangle (IPv6)" ++ ip6tables -t mangle -D PREROUTING -j prerouting_policy ++ ip6tables -t mangle -F prerouting_policy ++ ip6tables -t mangle -X prerouting_policy ++ fi ++ if [ -n "`ip6tables -L FORWARD |grep forward_policy`" ]; then ++ logger -t policyrouting "Delete strict forwarding rules (IPv6)" ++ ip6tables -D FORWARD -m mark --mark 1 -j forward_policy ++ ip6tables -F forward_policy ++ ip6tables -X forward_policy ++ fi ++ fi ++ logger -t policyrouting "All firewall rules for policyrouting removed." ++ fi ++fi ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/all-wcprops +new file mode 100644 +index 0000000..248c4f6 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 90 ++/!svn/ver/9650/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface ++END ++30-policyrouting ++K 25 ++svn:wc:ra_dav:version-url ++V 107 ++/!svn/ver/9650/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/entries +new file mode 100644 +index 0000000..775dac0 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-26T23:11:04.177215Z ++9650 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++30-policyrouting ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++ac630b86aca3e878780ed278e6419d3e ++2013-01-26T23:11:04.177215Z ++9650 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3887 ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/text-base/30-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/text-base/30-policyrouting.svn-base +new file mode 100644 +index 0000000..f8c59a6 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/.svn/text-base/30-policyrouting.svn-base +@@ -0,0 +1,109 @@ ++[ "$INTERFACE" != "wan" ] && exit 0 ++[ -f /proc/net/ipv6_route ] && has_ipv6=1 ++ ++olsrd_rmtables() { ++ # Remove custom routing tables from olsrd ++ if [ "`uci -q get olsrd.@olsrd[0].RtTable`" == "111" ] || [ "`uci -q get olsrd.@olsrd[0].RtTableDefault`" == "112" ]; then ++ uci delete olsrd.@olsrd[0].RtTable ++ uci delete olsrd.@olsrd[0].RtTableDefault ++ uci commit ++ /etc/init.d/olsrd restart ++ fi ++} ++ ++case $ACTION in ++ ifup) ++ pr="`uci get freifunk-policyrouting.pr.enable`" ++ fallback="`uci get freifunk-policyrouting.pr.fallback`" ++ # check if ipv6 is enabled: ++ ++ if [ $pr = "1" ]; then ++ logger -s -t policyrouting "Starting policy routing on $INTERFACE" ++ ++ # Setup new tables ++ tables="/etc/iproute2/rt_tables" ++ if [ -z "`grep "111" $tables`" ]; then ++ echo "111 olsr" >> $tables ++ fi ++ if [ -z "`grep "112" $tables`" ]; then ++ echo "112 olsr-default" >> $tables ++ fi ++ ++ # Make sure Rt_tables in olsrd are in place ++ if [ ! "`uci -q get olsrd.@olsrd[0].RtTable`" == "111" ] || [ ! "`uci -q get olsrd.@olsrd[0].RtTableDefault`" == "112" ]; then ++ uci set olsrd.@olsrd[0].RtTable='111' ++ uci set olsrd.@olsrd[0].RtTableDefault='112' ++ uci commit ++ /etc/init.d/olsrd restart ++ fi ++ ++ # Disable dyn_gw and dyngw_plain ++ dyngwlib=`uci show olsrd |grep dyn_gw.so |awk {' FS="."; print $1"."$2 '}` ++ if [ -n "$dyngwlib" ]; then ++ uci set $dyngwlib.ignore=1 ++ uci commit ++ fi ++ ++ dyngwplainlib=`uci show olsrd |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}` ++ if [ -n "$dyngwplainlib" ]; then ++ uci set $dyngwplainlib.ignore=1 ++ uci commit ++ fi ++ ++ gw="$(ip r |grep default | cut -d " " -f 3)" ++ # if no gateway was found stop now ++ [ -z "$gw" ] && logger -s -t policyrouting "No gateway found" && exit 1 ++ ++ device="`uci -q -p /var/state get network.wan.ifname`" ++ [ -z "$device" ] && device="`uci -q -p /var/state get network.wan.device`" ++ [ -z "$device" ] && logger -s -t policyrouting "No device found for wan." && exit 1 ++ ++ test -n "`ip r s t default`" && ip r d default t default ++ test -n "`ip r s |grep default`" && ip route del default ++ ip route add default via $gw dev $device table default ++ ++ if [ "$has_ipv6" = 1 ]; then ++ local ip6gw=$(ip -6 r |grep default |cut -d " " -f 3) ++ test -n "`ip -6 r s t default`" && ip -6 r d default t default ++ if [ -n "`ip -6 r s |grep default`" ]; then ++ ip -6 route del default ++ ip -6 r a $ip6gw via $ip6gw dev $dev table default ++ ip -6 route add default via $ip6gw dev $device table default ++ fi ++ fi ++ ++ ip rule del lookup main ++ ip rule add fwmark 1 lookup olsr-default ++ ip rule add lookup main ++ ip rule add lookup olsr ++ # Fallback via mesh if no ipv4 gateway is found in default table ++ [ "$fallback" = 1 ] && ip rule add lookup olsr-default prio 32800 ++ ++ if [ "$has_ipv6" = 1 ]; then ++ ip -6 rule del lookup main ++ ip -6 rule add lookup olsr prio 16380 ++ ip -6 rule add lookup main prio 16390 ++ ip -6 rule add fwmark 1 lookup olsr-default prio 16400 ++ ip -6 rule add lookup default prio 16410 ++ [ "$fallback" = 1 ] && ip -6 rule add lookup olsr-default prio 16420 ++ fi ++ else ++ olsrd_rmtables ++ fi ++ ;; ++ ++ ifdown) ++ logger -s -t policyrouting "Deleting ipv4 policy rules for $INTERFACE" ++ olsrd_rmtables ++ ip rule del fwmark 1 lookup olsr-default > /dev/null 2>&1 ++ ip rule del lookup olsr-default > /dev/null 2>&1 ++ ip rule del lookup olsr > /dev/null 2>&1 ++ if [ "$has_ipv6" = 1 ]; then ++ logger -s -t policyrouting "Deleting ipv4 policy rules for $INTERFACE" ++ ip -6 rule del fwmark 1 lookup olsr-default > /dev/null 2>&1 ++ ip -6 rule del lookup olsr-default > /dev/null 2>&1 ++ ip -6 rule del lookup olsr > /dev/null 2>&1 ++ ip -6 rule del lookup default > /dev/null 2>&1 ++ fi ++ ;; ++esac +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting +new file mode 100644 +index 0000000..f8c59a6 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting +@@ -0,0 +1,109 @@ ++[ "$INTERFACE" != "wan" ] && exit 0 ++[ -f /proc/net/ipv6_route ] && has_ipv6=1 ++ ++olsrd_rmtables() { ++ # Remove custom routing tables from olsrd ++ if [ "`uci -q get olsrd.@olsrd[0].RtTable`" == "111" ] || [ "`uci -q get olsrd.@olsrd[0].RtTableDefault`" == "112" ]; then ++ uci delete olsrd.@olsrd[0].RtTable ++ uci delete olsrd.@olsrd[0].RtTableDefault ++ uci commit ++ /etc/init.d/olsrd restart ++ fi ++} ++ ++case $ACTION in ++ ifup) ++ pr="`uci get freifunk-policyrouting.pr.enable`" ++ fallback="`uci get freifunk-policyrouting.pr.fallback`" ++ # check if ipv6 is enabled: ++ ++ if [ $pr = "1" ]; then ++ logger -s -t policyrouting "Starting policy routing on $INTERFACE" ++ ++ # Setup new tables ++ tables="/etc/iproute2/rt_tables" ++ if [ -z "`grep "111" $tables`" ]; then ++ echo "111 olsr" >> $tables ++ fi ++ if [ -z "`grep "112" $tables`" ]; then ++ echo "112 olsr-default" >> $tables ++ fi ++ ++ # Make sure Rt_tables in olsrd are in place ++ if [ ! "`uci -q get olsrd.@olsrd[0].RtTable`" == "111" ] || [ ! "`uci -q get olsrd.@olsrd[0].RtTableDefault`" == "112" ]; then ++ uci set olsrd.@olsrd[0].RtTable='111' ++ uci set olsrd.@olsrd[0].RtTableDefault='112' ++ uci commit ++ /etc/init.d/olsrd restart ++ fi ++ ++ # Disable dyn_gw and dyngw_plain ++ dyngwlib=`uci show olsrd |grep dyn_gw.so |awk {' FS="."; print $1"."$2 '}` ++ if [ -n "$dyngwlib" ]; then ++ uci set $dyngwlib.ignore=1 ++ uci commit ++ fi ++ ++ dyngwplainlib=`uci show olsrd |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}` ++ if [ -n "$dyngwplainlib" ]; then ++ uci set $dyngwplainlib.ignore=1 ++ uci commit ++ fi ++ ++ gw="$(ip r |grep default | cut -d " " -f 3)" ++ # if no gateway was found stop now ++ [ -z "$gw" ] && logger -s -t policyrouting "No gateway found" && exit 1 ++ ++ device="`uci -q -p /var/state get network.wan.ifname`" ++ [ -z "$device" ] && device="`uci -q -p /var/state get network.wan.device`" ++ [ -z "$device" ] && logger -s -t policyrouting "No device found for wan." && exit 1 ++ ++ test -n "`ip r s t default`" && ip r d default t default ++ test -n "`ip r s |grep default`" && ip route del default ++ ip route add default via $gw dev $device table default ++ ++ if [ "$has_ipv6" = 1 ]; then ++ local ip6gw=$(ip -6 r |grep default |cut -d " " -f 3) ++ test -n "`ip -6 r s t default`" && ip -6 r d default t default ++ if [ -n "`ip -6 r s |grep default`" ]; then ++ ip -6 route del default ++ ip -6 r a $ip6gw via $ip6gw dev $dev table default ++ ip -6 route add default via $ip6gw dev $device table default ++ fi ++ fi ++ ++ ip rule del lookup main ++ ip rule add fwmark 1 lookup olsr-default ++ ip rule add lookup main ++ ip rule add lookup olsr ++ # Fallback via mesh if no ipv4 gateway is found in default table ++ [ "$fallback" = 1 ] && ip rule add lookup olsr-default prio 32800 ++ ++ if [ "$has_ipv6" = 1 ]; then ++ ip -6 rule del lookup main ++ ip -6 rule add lookup olsr prio 16380 ++ ip -6 rule add lookup main prio 16390 ++ ip -6 rule add fwmark 1 lookup olsr-default prio 16400 ++ ip -6 rule add lookup default prio 16410 ++ [ "$fallback" = 1 ] && ip -6 rule add lookup olsr-default prio 16420 ++ fi ++ else ++ olsrd_rmtables ++ fi ++ ;; ++ ++ ifdown) ++ logger -s -t policyrouting "Deleting ipv4 policy rules for $INTERFACE" ++ olsrd_rmtables ++ ip rule del fwmark 1 lookup olsr-default > /dev/null 2>&1 ++ ip rule del lookup olsr-default > /dev/null 2>&1 ++ ip rule del lookup olsr > /dev/null 2>&1 ++ if [ "$has_ipv6" = 1 ]; then ++ logger -s -t policyrouting "Deleting ipv4 policy rules for $INTERFACE" ++ ip -6 rule del fwmark 1 lookup olsr-default > /dev/null 2>&1 ++ ip -6 rule del lookup olsr-default > /dev/null 2>&1 ++ ip -6 rule del lookup olsr > /dev/null 2>&1 ++ ip -6 rule del lookup default > /dev/null 2>&1 ++ fi ++ ;; ++esac +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/all-wcprops +new file mode 100644 +index 0000000..3d0b410 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 81 ++/!svn/ver/9652/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/init.d ++END ++freifunk-policyrouting ++K 25 ++svn:wc:ra_dav:version-url ++V 104 ++/!svn/ver/9652/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..cd904e6 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/init.d ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-01-27T00:17:48.196957Z ++9652 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-policyrouting ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++e84fd5334633b60c291fe183e34eb0bf ++2013-01-27T00:17:48.196957Z ++9652 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++297 ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/prop-base/freifunk-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/prop-base/freifunk-policyrouting.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/prop-base/freifunk-policyrouting.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/text-base/freifunk-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/text-base/freifunk-policyrouting.svn-base +new file mode 100644 +index 0000000..58faa67 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/init.d/.svn/text-base/freifunk-policyrouting.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=60 ++. /lib/functions/network.sh ++boot() ++{ ++ prenabled=$(uci get freifunk-policyrouting.pr.enable) ++ if [ ! "$prenabled" = "1" ] || ! network_is_up wan; then ++ uci -q delete olsrd.@olsrd[0].RtTable ++ uci -q delete olsrd.@olsrd[0].RtTableDefault ++ uci commit olsrd ++ fi ++} +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting b/feeds/luci/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting +new file mode 100755 +index 0000000..58faa67 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=60 ++. /lib/functions/network.sh ++boot() ++{ ++ prenabled=$(uci get freifunk-policyrouting.pr.enable) ++ if [ ! "$prenabled" = "1" ] || ! network_is_up wan; then ++ uci -q delete olsrd.@olsrd[0].RtTable ++ uci -q delete olsrd.@olsrd[0].RtTableDefault ++ uci commit olsrd ++ fi ++} +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/all-wcprops +new file mode 100644 +index 0000000..5a943e3 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/!svn/ver/8322/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/rc.d ++END ++S60-freifunk-policyrouting ++K 25 ++svn:wc:ra_dav:version-url ++V 106 ++/!svn/ver/8322/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/rc.d/S60-freifunk-policyrouting ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/entries +new file mode 100644 +index 0000000..3a17ad7 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/rc.d ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-02-24T21:08:18.692682Z ++8322 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++S60-freifunk-policyrouting ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++95123d5a47d9955efbfd43833530e383 ++2012-02-24T21:08:18.692682Z ++8322 ++soma ++has-props ++ ++ ++svn:special ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++32 ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/prop-base/S60-freifunk-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/prop-base/S60-freifunk-policyrouting.svn-base +new file mode 100644 +index 0000000..d222469 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/prop-base/S60-freifunk-policyrouting.svn-base +@@ -0,0 +1,5 @@ ++K 11 ++svn:special ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/text-base/S60-freifunk-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/text-base/S60-freifunk-policyrouting.svn-base +new file mode 100644 +index 0000000..c52ce03 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/.svn/text-base/S60-freifunk-policyrouting.svn-base +@@ -0,0 +1 @@ ++link ../init.d/freifunk-policyrouting +\ No newline at end of file +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/rc.d/S60-freifunk-policyrouting b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/S60-freifunk-policyrouting +new file mode 120000 +index 0000000..3c3dad8 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/rc.d/S60-freifunk-policyrouting +@@ -0,0 +1 @@ ++../init.d/freifunk-policyrouting +\ No newline at end of file +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/all-wcprops b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/all-wcprops +new file mode 100644 +index 0000000..a51bfd3 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 87 ++/!svn/ver/6967/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/uci-defaults ++END ++freifunk-policyrouting ++K 25 ++svn:wc:ra_dav:version-url ++V 110 ++/!svn/ver/6967/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting ++END +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/entries b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/entries +new file mode 100644 +index 0000000..680dd4e +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-policyrouting/files/etc/uci-defaults ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-03-14T19:34:23.287308Z ++6967 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-policyrouting ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++c3fd72073a2ea9bd7d3e541d7c76854f ++2011-03-14T19:34:23.287308Z ++6967 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++172 ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/text-base/freifunk-policyrouting.svn-base b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/text-base/freifunk-policyrouting.svn-base +new file mode 100644 +index 0000000..a6412d4 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/.svn/text-base/freifunk-policyrouting.svn-base +@@ -0,0 +1,7 @@ ++#!/bin/sh ++uci batch <<-EOF ++ add ucitrack freifunk-policyrouting ++ add_list ucitrack.@freifunk-policyrouting[-1].affects="network" ++ commit ucitrack ++EOF ++ +diff --git a/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting +new file mode 100644 +index 0000000..a6412d4 +--- /dev/null ++++ b/feeds/luci/freifunk-policyrouting/files/etc/uci-defaults/freifunk-policyrouting +@@ -0,0 +1,7 @@ ++#!/bin/sh ++uci batch <<-EOF ++ add ucitrack freifunk-policyrouting ++ add_list ucitrack.@freifunk-policyrouting[-1].affects="network" ++ commit ucitrack ++EOF ++ +diff --git a/feeds/luci/freifunk-watchdog/.svn/all-wcprops b/feeds/luci/freifunk-watchdog/.svn/all-wcprops +new file mode 100644 +index 0000000..e71e89c +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 59 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 68 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog/Makefile ++END +diff --git a/feeds/luci/freifunk-watchdog/.svn/dir-prop-base b/feeds/luci/freifunk-watchdog/.svn/dir-prop-base +new file mode 100644 +index 0000000..914da1e +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 62 ++/luci/branches/luci-0.8/contrib/package/freifunk-watchdog:4529 ++END +diff --git a/feeds/luci/freifunk-watchdog/.svn/entries b/feeds/luci/freifunk-watchdog/.svn/entries +new file mode 100644 +index 0000000..f18dd17 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-watchdog ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++8df204b03e45e955b6ff3037557a1020 ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1454 ++ +diff --git a/feeds/luci/freifunk-watchdog/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-watchdog/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..33ba33d +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2009-2012 Jo-Philipp Wich ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-watchdog ++PKG_RELEASE:=8 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_DEPENDS := uci ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-watchdog ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk Ad-Hoc watchdog daemon ++ DEPENDS:=libuci ++endef ++ ++define Package/freifunk-watchdog/description ++ A watchdog daemon that monitors wireless interfaces to ensure the correct bssid and channel. ++ The process will initiate a wireless restart as soon as it detects a bssid or channel mismatch. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++endef ++ ++define Package/freifunk-watchdog/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/freifunk-watchdog.init $(1)/etc/init.d/freifunk-watchdog ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/freifunk-watchdog.config $(1)/etc/config/freifunk-watchdog ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ffwatchd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-watchdog)) +diff --git a/feeds/luci/freifunk-watchdog/Makefile b/feeds/luci/freifunk-watchdog/Makefile +new file mode 100644 +index 0000000..33ba33d +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/Makefile +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2009-2012 Jo-Philipp Wich ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freifunk-watchdog ++PKG_RELEASE:=8 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_DEPENDS := uci ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freifunk-watchdog ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk Ad-Hoc watchdog daemon ++ DEPENDS:=libuci ++endef ++ ++define Package/freifunk-watchdog/description ++ A watchdog daemon that monitors wireless interfaces to ensure the correct bssid and channel. ++ The process will initiate a wireless restart as soon as it detects a bssid or channel mismatch. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++endef ++ ++define Package/freifunk-watchdog/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/freifunk-watchdog.init $(1)/etc/init.d/freifunk-watchdog ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/freifunk-watchdog.config $(1)/etc/config/freifunk-watchdog ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ffwatchd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,freifunk-watchdog)) +diff --git a/feeds/luci/freifunk-watchdog/files/.svn/all-wcprops b/feeds/luci/freifunk-watchdog/files/.svn/all-wcprops +new file mode 100644 +index 0000000..2e8c1d6 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/.svn/all-wcprops +@@ -0,0 +1,17 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 65 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog/files ++END ++freifunk-watchdog.init ++K 25 ++svn:wc:ra_dav:version-url ++V 88 ++/!svn/ver/4532/luci/trunk/contrib/package/freifunk-watchdog/files/freifunk-watchdog.init ++END ++freifunk-watchdog.config ++K 25 ++svn:wc:ra_dav:version-url ++V 90 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog/files/freifunk-watchdog.config ++END +diff --git a/feeds/luci/freifunk-watchdog/files/.svn/entries b/feeds/luci/freifunk-watchdog/files/.svn/entries +new file mode 100644 +index 0000000..a9d7bea +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-watchdog/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++freifunk-watchdog.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++6f8313c355fe21e7e532850658c2f6ea ++2009-05-16T17:30:01.719344Z ++4532 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++886 ++ ++freifunk-watchdog.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++8694a0bc2b086c964b6b7ec372652f77 ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++162 ++ +diff --git a/feeds/luci/freifunk-watchdog/files/.svn/prop-base/freifunk-watchdog.init.svn-base b/feeds/luci/freifunk-watchdog/files/.svn/prop-base/freifunk-watchdog.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/.svn/prop-base/freifunk-watchdog.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/freifunk-watchdog/files/.svn/text-base/freifunk-watchdog.config.svn-base b/feeds/luci/freifunk-watchdog/files/.svn/text-base/freifunk-watchdog.config.svn-base +new file mode 100644 +index 0000000..b6e6543 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/.svn/text-base/freifunk-watchdog.config.svn-base +@@ -0,0 +1,7 @@ ++config process ++ option process 'dropbear' ++ option initscript '/etc/init.d/dropbear' ++ ++config process ++ option process 'crond' ++ option initscript '/etc/init.d/cron' +diff --git a/feeds/luci/freifunk-watchdog/files/.svn/text-base/freifunk-watchdog.init.svn-base b/feeds/luci/freifunk-watchdog/files/.svn/text-base/freifunk-watchdog.init.svn-base +new file mode 100644 +index 0000000..d6ede09 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/.svn/text-base/freifunk-watchdog.init.svn-base +@@ -0,0 +1,39 @@ ++#!/bin/sh /etc/rc.common ++ ++START=99 ++PID=/var/run/ffwatchd.pid ++BIN=/usr/sbin/ffwatchd ++ ++boot() ++{ ++ # If watchdog service is enabled, install cronjob, create device node and start daemon ++ if /etc/init.d/freifunk-watchdog enabled 2>/dev/null; then ++ if ! grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then ++ echo "* * * * * $BIN running || /etc/init.d/freifunk-watchdog restart" >> /etc/crontabs/root ++ fi ++ ++ mknod /dev/watchdog c 10 130 ++ ++ start ++ ++ # If service is disabled, find and remove related cronjob ++ elif grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then ++ sed -i -e "\\'$BIN'd" /etc/crontabs/root ++ fi ++} ++ ++start() ++{ ++ start-stop-daemon -q -b -m -p $PID -x $BIN -S ++} ++ ++stop() ++{ ++ start-stop-daemon -q -p $PID -x $BIN -K ++ ++ if ! /etc/init.d/freifunk-watchdog enabled; then ++ if grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then ++ sed -i -e "\\'$BIN'd" /etc/crontabs/root ++ fi ++ fi ++} +diff --git a/feeds/luci/freifunk-watchdog/files/freifunk-watchdog.config b/feeds/luci/freifunk-watchdog/files/freifunk-watchdog.config +new file mode 100644 +index 0000000..b6e6543 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/freifunk-watchdog.config +@@ -0,0 +1,7 @@ ++config process ++ option process 'dropbear' ++ option initscript '/etc/init.d/dropbear' ++ ++config process ++ option process 'crond' ++ option initscript '/etc/init.d/cron' +diff --git a/feeds/luci/freifunk-watchdog/files/freifunk-watchdog.init b/feeds/luci/freifunk-watchdog/files/freifunk-watchdog.init +new file mode 100755 +index 0000000..d6ede09 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/files/freifunk-watchdog.init +@@ -0,0 +1,39 @@ ++#!/bin/sh /etc/rc.common ++ ++START=99 ++PID=/var/run/ffwatchd.pid ++BIN=/usr/sbin/ffwatchd ++ ++boot() ++{ ++ # If watchdog service is enabled, install cronjob, create device node and start daemon ++ if /etc/init.d/freifunk-watchdog enabled 2>/dev/null; then ++ if ! grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then ++ echo "* * * * * $BIN running || /etc/init.d/freifunk-watchdog restart" >> /etc/crontabs/root ++ fi ++ ++ mknod /dev/watchdog c 10 130 ++ ++ start ++ ++ # If service is disabled, find and remove related cronjob ++ elif grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then ++ sed -i -e "\\'$BIN'd" /etc/crontabs/root ++ fi ++} ++ ++start() ++{ ++ start-stop-daemon -q -b -m -p $PID -x $BIN -S ++} ++ ++stop() ++{ ++ start-stop-daemon -q -p $PID -x $BIN -K ++ ++ if ! /etc/init.d/freifunk-watchdog enabled; then ++ if grep -q "$BIN" /etc/crontabs/root 2>/dev/null; then ++ sed -i -e "\\'$BIN'd" /etc/crontabs/root ++ fi ++ fi ++} +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/all-wcprops b/feeds/luci/freifunk-watchdog/src/.svn/all-wcprops +new file mode 100644 +index 0000000..0fb9b59 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/all-wcprops +@@ -0,0 +1,41 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 63 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog/src ++END ++watchdog.c ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog/src/watchdog.c ++END ++wireless.22.h ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/!svn/ver/4467/luci/trunk/contrib/package/freifunk-watchdog/src/wireless.22.h ++END ++watchdog.h ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/!svn/ver/8885/luci/trunk/contrib/package/freifunk-watchdog/src/watchdog.h ++END ++ucix.c ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/6313/luci/trunk/contrib/package/freifunk-watchdog/src/ucix.c ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/!svn/ver/4467/luci/trunk/contrib/package/freifunk-watchdog/src/Makefile ++END ++ucix.h ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/4467/luci/trunk/contrib/package/freifunk-watchdog/src/ucix.h ++END +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/entries b/feeds/luci/freifunk-watchdog/src/.svn/entries +new file mode 100644 +index 0000000..8e78ec2 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/freifunk-watchdog/src ++http://svn.luci.subsignal.org ++ ++ ++ ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++watchdog.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b962c311612065ee97e4c0c2f9678f74 ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11292 ++ ++wireless.22.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++e2f8e64f2a6c17cdee4893021aec2cb8 ++2009-05-04T16:54:45.143254Z ++4467 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++43874 ++ ++watchdog.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++08d02fd49f0792f8ddf4eb12727a52f7 ++2012-07-15T17:25:24.100393Z ++8885 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3662 ++ ++ucix.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++82068c2fabed8401096c0fb49566f269 ++2010-10-16T19:48:11.167955Z ++6313 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2537 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++ce5de3dd03205a050d56d7b84b9de19b ++2009-05-04T16:54:45.143254Z ++4467 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++287 ++ ++ucix.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++bf616bfb7b9962d3a6647c553c89e8e1 ++2009-05-04T16:54:45.143254Z ++4467 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1138 ++ +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/text-base/Makefile.svn-base b/feeds/luci/freifunk-watchdog/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e049ebc +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,12 @@ ++WD_BINARY:=ffwatchd ++WD_CFLAGS:=$(CFLAGS) -c -DBINARY=\"$(WD_BINARY)\" ++WD_LDFLAGS:=$(LDFLAGS) -lm -luci ++ ++watchdog: ++ $(CC) $(WD_CFLAGS) -o ucix.o ucix.c ++ $(CC) $(WD_CFLAGS) -o watchdog.o watchdog.c ++ $(CC) $(WD_LDFLAGS) -o $(WD_BINARY) watchdog.o ucix.o ++ ++clean: ++ rm -f *~ $(WD_BINARY) *.o ++ +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/text-base/ucix.c.svn-base b/feeds/luci/freifunk-watchdog/src/.svn/text-base/ucix.c.svn-base +new file mode 100644 +index 0000000..44de259 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/text-base/ucix.c.svn-base +@@ -0,0 +1,102 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2008 John Crispin ++ * ++ * Changed by Jo-Philipp Wich ++ */ ++ ++#include ++#include ++ ++#include ++#include ++#include "ucix.h" ++ ++static struct uci_ptr ptr; ++ ++static inline int ucix_get_ptr(struct uci_context *ctx, const char *p, const char *s, const char *o, const char *t) ++{ ++ memset(&ptr, 0, sizeof(ptr)); ++ ptr.package = p; ++ ptr.section = s; ++ ptr.option = o; ++ ptr.value = t; ++ return uci_lookup_ptr(ctx, &ptr, NULL, true); ++} ++ ++struct uci_context* ucix_init(const char *config_file) ++{ ++ struct uci_context *ctx = uci_alloc_context(); ++#ifdef uci_to_delta ++ uci_add_delta_path(ctx, "/var/state"); ++#else ++ uci_add_history_path(ctx, "/var/state"); ++#endif ++ if(uci_load(ctx, config_file, NULL) != UCI_OK) ++ { ++ return NULL; ++ } ++ return ctx; ++} ++ ++void ucix_cleanup(struct uci_context *ctx) ++{ ++ uci_free_context(ctx); ++} ++ ++const char* ucix_get_option(struct uci_context *ctx, const char *p, const char *s, const char *o) ++{ ++ struct uci_element *e = NULL; ++ const char *value = NULL; ++ if(ucix_get_ptr(ctx, p, s, o, NULL)) ++ return NULL; ++ if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) ++ return NULL; ++ e = ptr.last; ++ switch (e->type) ++ { ++ case UCI_TYPE_SECTION: ++ value = uci_to_section(e)->type; ++ break; ++ case UCI_TYPE_OPTION: ++ switch(ptr.o->type) { ++ case UCI_TYPE_STRING: ++ value = ptr.o->v.string; ++ break; ++ default: ++ value = NULL; ++ break; ++ } ++ break; ++ default: ++ return 0; ++ } ++ ++ return value; ++} ++ ++void ucix_for_each_section_type(struct uci_context *ctx, ++ const char *p, const char *t, ++ void (*cb)(const char*, void*), void *priv) ++{ ++ struct uci_element *e; ++ if(ucix_get_ptr(ctx, p, NULL, NULL, NULL)) ++ return; ++ uci_foreach_element(&ptr.p->sections, e) ++ if (!strcmp(t, uci_to_section(e)->type)) ++ cb(e->name, priv); ++} ++ +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/text-base/ucix.h.svn-base b/feeds/luci/freifunk-watchdog/src/.svn/text-base/ucix.h.svn-base +new file mode 100644 +index 0000000..b1f5ec3 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/text-base/ucix.h.svn-base +@@ -0,0 +1,29 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2008 John Crispin ++ */ ++ ++#ifndef _UCI_H__ ++#define _UCI_H__ ++struct uci_context* ucix_init(const char *config_file); ++ ++void ucix_for_each_section_type(struct uci_context *ctx, ++ const char *p, const char *t, ++ void (*cb)(const char*, void*), void *priv); ++ ++const char* ucix_get_option(struct uci_context *ctx, ++ const char *p, const char *s, const char *o); ++#endif +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/text-base/watchdog.c.svn-base b/feeds/luci/freifunk-watchdog/src/.svn/text-base/watchdog.c.svn-base +new file mode 100644 +index 0000000..ce66ada +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/text-base/watchdog.c.svn-base +@@ -0,0 +1,527 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2009 Jo-Philipp Wich ++ */ ++ ++#include "watchdog.h" ++ ++/* Global watchdog fd, required by signal handler */ ++int wdfd = -1; ++ ++/* Handle finished childs */ ++static void sigchld_handler(int sig) ++{ ++ pid_t pid; ++ ++ while( (pid = waitpid(-1, NULL, WNOHANG)) > 0 ) ++ syslog(LOG_INFO, "Child returned (pid %d)", pid); ++} ++ ++/* Watchdog shutdown helper */ ++static void shutdown_watchdog(int sig) ++{ ++ static const char wshutdown = WATCH_SHUTDOWN; ++ ++ if( wdfd > -1 ) ++ { ++ syslog(LOG_INFO, "Stopping watchdog timer"); ++ write(wdfd, &wshutdown, 1); ++ close(wdfd); ++ wdfd = -1; ++ } ++ ++ exit(0); ++} ++ ++/* Get BSSID of given interface */ ++static int iw_get_bssid(int iwfd, const char *ifname, char *bssid) ++{ ++ struct iwreq iwrq; ++ ++ if( iw_ioctl(iwfd, ifname, SIOCGIWAP, &iwrq) >= 0 ) ++ { ++ unsigned char *addr = (unsigned char *)iwrq.u.ap_addr.sa_data; ++ ++ sprintf(bssid, "%02X:%02X:%02X:%02X:%02X:%02X", ++ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); ++ ++ return 0; ++ } ++ ++ return -1; ++} ++ ++/* Get channel of given interface */ ++static int iw_get_channel(int iwfd, const char *ifname, int *channel) ++{ ++ int i; ++ char buffer[sizeof(struct iw_range)]; ++ double cur_freq, cmp_freq; ++ struct iwreq iwrq; ++ struct iw_range *range; ++ ++ memset(buffer, 0, sizeof(buffer)); ++ ++ iwrq.u.data.pointer = (char *)buffer; ++ iwrq.u.data.length = sizeof(buffer); ++ iwrq.u.data.flags = 0; ++ ++ if( iw_ioctl(iwfd, ifname, SIOCGIWRANGE, &iwrq) < 0) ++ { ++ *channel = -1; ++ return -1; ++ } ++ ++ range = (struct iw_range *)buffer; ++ ++ if( iw_ioctl(iwfd, ifname, SIOCGIWFREQ, &iwrq) >= 0 ) ++ { ++ cur_freq = ((double)iwrq.u.freq.m) * pow(10, iwrq.u.freq.e); ++ if( cur_freq < 1000.00 ) ++ { ++ *channel = (int)cur_freq; ++ return 0; ++ } ++ ++ for(i = 0; i < range->num_frequency; i++) ++ { ++ cmp_freq = ((double)range->freq[i].m) * pow(10, range->freq[i].e); ++ if( cmp_freq == cur_freq ) ++ { ++ *channel = (int)range->freq[i].i; ++ return 0; ++ } ++ } ++ } ++ ++ *channel = -1; ++ return -1; ++} ++ ++/* Get the (first) pid of given process name */ ++static int find_process(const char *name) ++{ ++ int pid = -1; ++ int file; ++ char buffer[128]; ++ char cmpname[128]; ++ DIR *dir; ++ struct dirent *entry; ++ ++ if( (dir = opendir("/proc")) != NULL ) ++ { ++ snprintf(cmpname, sizeof(cmpname), "Name:\t%s\n", name); ++ ++ while( (entry = readdir(dir)) != NULL ) ++ { ++ if( !strcmp(entry->d_name, "..") || !isdigit(*entry->d_name) ) ++ continue; ++ ++ sprintf(buffer, "/proc/%s/status", entry->d_name); ++ if( (file = open(buffer, O_RDONLY)) > -1 ) ++ { ++ read(file, buffer, sizeof(buffer)); ++ close(file); ++ ++ if( strstr(buffer, cmpname) == buffer ) ++ { ++ pid = atoi(entry->d_name); ++ ++ /* Skip myself ... */ ++ if( pid == getpid() ) ++ pid = -1; ++ else ++ break; ++ } ++ } ++ } ++ ++ closedir(dir); ++ return pid; ++ } ++ ++ syslog(LOG_CRIT, "Unable to open /proc: %s", ++ strerror(errno)); ++ ++ return -1; ++} ++ ++/* Get the 5 minute load average */ ++static double find_loadavg(void) ++{ ++ int fd; ++ char buffer[10]; ++ double load = 0.00; ++ ++ if( (fd = open("/proc/loadavg", O_RDONLY)) > -1 ) ++ { ++ if( read(fd, buffer, sizeof(buffer)) == sizeof(buffer) ) ++ load = atof(&buffer[5]); ++ ++ close(fd); ++ } ++ ++ return load; ++} ++ ++/* Check if given uci file was updated */ ++static int check_uci_update(const char *config, time_t *mtime) ++{ ++ struct stat s; ++ char path[128]; ++ ++ snprintf(path, sizeof(path), "/var/state/%s", config); ++ if( stat(path, &s) > -1 ) ++ { ++ if( (*mtime == 0) || (s.st_mtime > *mtime) ) ++ { ++ *mtime = s.st_mtime; ++ return 1; ++ } ++ } ++ ++ return 0; ++} ++ ++/* Add tuple */ ++static void load_wifi_uci_add_iface(const char *section, struct uci_wifi_iface_itr_ctx *itr) ++{ ++ wifi_tuple_t *t; ++ const char *ucitmp; ++ int val = 0; ++ ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "mode"); ++ if( ucitmp && !strncmp(ucitmp, "adhoc", 5) ) ++ { ++ if( (t = (wifi_tuple_t *)malloc(sizeof(wifi_tuple_t))) != NULL ) ++ { ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "ifname"); ++ if(ucitmp) ++ { ++ strncpy(t->ifname, ucitmp, sizeof(t->ifname)); ++ val++; ++ } ++ ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "bssid"); ++ if(ucitmp) ++ { ++ strncpy(t->bssid, ucitmp, sizeof(t->bssid)); ++ val++; ++ } ++ ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "device"); ++ if(ucitmp) ++ { ++ ucitmp = ucix_get_option(itr->ctx, "wireless", ucitmp, "channel"); ++ if(ucitmp) ++ { ++ t->channel = atoi(ucitmp); ++ val++; ++ } ++ } ++ ++ if( val == 3 ) ++ { ++ syslog(LOG_INFO, "Monitoring %s: bssid=%s channel=%d", ++ t->ifname, t->bssid, t->channel); ++ ++ t->next = itr->list; ++ itr->list = t; ++ } ++ else ++ { ++ free(t); ++ } ++ } ++ } ++} ++ ++/* Load config */ ++static wifi_tuple_t * load_wifi_uci(wifi_tuple_t *ifs, time_t *modtime) ++{ ++ struct uci_context *ctx; ++ struct uci_wifi_iface_itr_ctx itr; ++ wifi_tuple_t *cur, *next; ++ ++ if( check_uci_update("wireless", modtime) ) ++ { ++ syslog(LOG_INFO, "Wireless config changed, reloading"); ++ ++ if( (ctx = ucix_init("wireless")) != NULL ) ++ { ++ if( ifs != NULL ) ++ { ++ for(cur = ifs; cur; cur = next) ++ { ++ next = cur->next; ++ free(cur); ++ } ++ } ++ ++ itr.list = NULL; ++ itr.ctx = ctx; ++ ++ ucix_for_each_section_type(ctx, "wireless", "wifi-iface", ++ (void *)load_wifi_uci_add_iface, &itr); ++ ++ return itr.list; ++ } ++ } ++ ++ return ifs; ++} ++ ++/* Add tuple */ ++static void load_watchdog_uci_add_process(const char *section, struct uci_process_itr_ctx *itr) ++{ ++ process_tuple_t *t; ++ const char *ucitmp; ++ int val = 0; ++ ++ if( (t = (process_tuple_t *)malloc(sizeof(process_tuple_t))) != NULL ) ++ { ++ t->restart = 0; ++ ++ ucitmp = ucix_get_option(itr->ctx, "freifunk-watchdog", section, "process"); ++ if(ucitmp) ++ { ++ strncpy(t->process, ucitmp, sizeof(t->process)); ++ val++; ++ } ++ ++ ucitmp = ucix_get_option(itr->ctx, "freifunk-watchdog", section, "initscript"); ++ if(ucitmp) ++ { ++ strncpy(t->initscript, ucitmp, sizeof(t->initscript)); ++ val++; ++ } ++ ++ if( val == 2 ) ++ { ++ syslog(LOG_INFO, "Monitoring %s: initscript=%s", ++ t->process, t->initscript); ++ ++ t->next = itr->list; ++ itr->list = t; ++ } ++ else ++ { ++ free(t); ++ } ++ } ++} ++ ++/* Load config */ ++static process_tuple_t * load_watchdog_uci(process_tuple_t *procs) ++{ ++ struct uci_context *ctx; ++ struct uci_process_itr_ctx itr; ++ process_tuple_t *cur, *next; ++ ++ syslog(LOG_INFO, "Loading watchdog config"); ++ ++ if( (ctx = ucix_init("freifunk-watchdog")) != NULL ) ++ { ++ if( procs != NULL ) ++ { ++ for(cur = procs; cur; cur = next) ++ { ++ next = cur->next; ++ free(cur); ++ } ++ } ++ ++ itr.list = NULL; ++ itr.ctx = ctx; ++ ++ ucix_for_each_section_type(ctx, "freifunk-watchdog", "process", ++ (void *)load_watchdog_uci_add_process, &itr); ++ ++ return itr.list; ++ } ++ ++ return procs; ++} ++ ++/* Daemon implementation */ ++static int do_daemon(void) ++{ ++ static int wdtrigger = 1; ++ static int wdtimeout = BASE_INTERVAL * 2; ++ static const char wdkeepalive = WATCH_KEEPALIVE; ++ ++ int iwfd; ++ int channel; ++ char bssid[18]; ++ struct sigaction sa; ++ ++ wifi_tuple_t *ifs = NULL, *curr_if; ++ process_tuple_t *procs = NULL, *curr_proc; ++ time_t wireless_modtime = 0; ++ ++ int action_intv = 0; ++ int restart_wifi = 0; ++ int loadavg_panic = 0; ++ ++ openlog(SYSLOG_IDENT, 0, LOG_DAEMON); ++ memset(&sa, 0, sizeof(sa)); ++ ++ if( (iwfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1 ) ++ { ++ syslog(LOG_ERR, "Can not open wireless control socket: %s", ++ strerror(errno)); ++ ++ return 1; ++ } ++ ++ if( (wdfd = open(WATCH_DEVICE, O_WRONLY)) > -1 ) ++ { ++ syslog(LOG_INFO, "Opened %s - polling every %i seconds", ++ WATCH_DEVICE, BASE_INTERVAL); ++ ++ /* Install signal handler to halt watchdog on shutdown */ ++ sa.sa_handler = shutdown_watchdog; ++ sa.sa_flags = SA_NOCLDWAIT | SA_RESTART; ++ sigaction(SIGHUP, &sa, NULL); ++ sigaction(SIGINT, &sa, NULL); ++ sigaction(SIGPIPE, &sa, NULL); ++ sigaction(SIGTERM, &sa, NULL); ++ sigaction(SIGUSR1, &sa, NULL); ++ sigaction(SIGUSR2, &sa, NULL); ++ ++ /* Set watchdog timeout to twice the interval */ ++ ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtimeout); ++ } ++ ++ /* Install signal handler to reap childs */ ++ sa.sa_handler = sigchld_handler; ++ sa.sa_flags = 0; ++ sigaction(SIGCHLD, &sa, NULL); ++ ++ /* Load watchdog configuration only once */ ++ procs = load_watchdog_uci(procs); ++ ++ while( 1 ) ++ { ++ /* Check/increment action interval */ ++ if( ++action_intv >= ACTION_INTERVAL ) ++ { ++ /* Reset action interval */ ++ action_intv = 0; ++ ++ /* Check average load */ ++ if( find_loadavg() >= LOAD_TRESHOLD ) ++ loadavg_panic++; ++ else ++ loadavg_panic = 0; ++ ++ /* Check wireless interfaces */ ++ ifs = load_wifi_uci(ifs, &wireless_modtime); ++ for( curr_if = ifs; curr_if; curr_if = curr_if->next ) ++ { ++ /* Get current channel and bssid */ ++ if( (iw_get_bssid(iwfd, curr_if->ifname, bssid) == 0) && ++ (iw_get_channel(iwfd, curr_if->ifname, &channel) == 0) ) ++ { ++ /* Check BSSID */ ++ if( strcasecmp(bssid, curr_if->bssid) != 0 ) ++ { ++ syslog(LOG_WARNING, "BSSID mismatch on %s: current=%s wanted=%s", ++ curr_if->ifname, bssid, curr_if->bssid); ++ ++ restart_wifi++; ++ } ++ ++ /* Check channel */ ++ else if( channel != curr_if->channel ) ++ { ++ syslog(LOG_WARNING, "Channel mismatch on %s: current=%d wanted=%d", ++ curr_if->ifname, channel, curr_if->channel); ++ ++ restart_wifi++; ++ } ++ } ++ else ++ { ++ syslog(LOG_WARNING, "Requested interface %s not present", curr_if->ifname); ++ } ++ } ++ ++ /* Check processes */ ++ for( curr_proc = procs; curr_proc; curr_proc = curr_proc->next ) ++ { ++ if( find_process(curr_proc->process) < 0 ) ++ curr_proc->restart++; ++ else ++ curr_proc->restart = 0; ++ ++ /* Process restart required? */ ++ if( curr_proc->restart >= HYSTERESIS ) ++ { ++ curr_proc->restart = 0; ++ syslog(LOG_WARNING, "The %s process died, restarting", curr_proc->process); ++ EXEC(PROC_ACTION); ++ } ++ } ++ ++ ++ /* Wifi restart required? */ ++ if( restart_wifi >= HYSTERESIS ) ++ { ++ restart_wifi = 0; ++ syslog(LOG_WARNING, "Channel or BSSID mismatch on wireless interface, restarting"); ++ EXEC(WIFI_ACTION); ++ } ++ ++ /* Is there a load problem? */ ++ if( loadavg_panic >= HYSTERESIS ) ++ { ++ syslog(LOG_EMERG, "Critical system load level, triggering reset!"); ++ ++ /* Try watchdog, fall back to reboot */ ++ if( wdfd > -1 ) ++ ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtrigger); ++ else ++ EXEC(LOAD_ACTION); ++ } ++ } ++ ++ ++ /* Reset watchdog timer */ ++ if( wdfd > -1 ) ++ write(wdfd, &wdkeepalive, 1); ++ ++ sleep(BASE_INTERVAL); ++ } ++ ++ shutdown_watchdog(0); ++ closelog(); ++ ++ return 0; ++} ++ ++ ++int main(int argc, char *argv[]) ++{ ++ /* Check if watchdog is running ... */ ++ if( (argc > 1) && (strcmp(argv[1], "running") == 0) ) ++ { ++ return (find_process(BINARY) == -1); ++ } ++ ++ /* Start daemon */ ++ return do_daemon(); ++} +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/text-base/watchdog.h.svn-base b/feeds/luci/freifunk-watchdog/src/.svn/text-base/watchdog.h.svn-base +new file mode 100644 +index 0000000..34d616c +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/text-base/watchdog.h.svn-base +@@ -0,0 +1,141 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2009 Jo-Philipp Wich ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "ucix.h" ++#include "wireless.22.h" ++ ++ ++/* Watchdog poll interval */ ++#define BASE_INTERVAL 5 ++ ++/* Action interval (N * BASE_INTERVAL) */ ++#define ACTION_INTERVAL 6 ++ ++/* Hysteresis */ ++#define HYSTERESIS 3 ++ ++/* How to call myself in the logs */ ++#define SYSLOG_IDENT "Freifunk Watchdog" ++ ++/* Process error action */ ++#define PROC_ACTION curr_proc->initscript, curr_proc->initscript, "restart" ++ ++/* Wifi error action */ ++#define WIFI_ACTION "/sbin/wifi", "/sbin/wifi" ++ ++/* Watchdog device */ ++#define WATCH_DEVICE "/dev/watchdog" ++#define WATCH_SHUTDOWN 'V' ++#define WATCH_KEEPALIVE '\0' ++ ++/* System load error action and treshold */ ++#define LOAD_TRESHOLD 15.00 ++#define LOAD_ACTION "/sbin/reboot", "/sbin/reboot" ++ ++/* Fallback binary name (passed by makefile) */ ++#ifndef BINARY ++#define BINARY "ffwatchd" ++#endif ++ ++ ++/* ifname/bssid/channel tuples */ ++struct wifi_tuple { ++ char ifname[16]; ++ char bssid[18]; ++ int channel; ++ struct wifi_tuple *next; ++}; ++ ++/* structure to hold tuple-list and uci context during iteration */ ++struct uci_wifi_iface_itr_ctx { ++ struct wifi_tuple *list; ++ struct uci_context *ctx; ++}; ++ ++typedef struct wifi_tuple wifi_tuple_t; ++ ++ ++/* process name/exec tuples */ ++struct process_tuple { ++ char process[PATH_MAX + 1]; ++ char initscript[PATH_MAX + 1]; ++ int restart; ++ struct process_tuple *next; ++}; ++ ++/* structure to hold tuple-list and uci context during iteration */ ++struct uci_process_itr_ctx { ++ struct process_tuple *list; ++ struct uci_context *ctx; ++}; ++ ++typedef struct process_tuple process_tuple_t; ++ ++ ++/* ioctl() helper (stolen from iwlib) */ ++static inline int ++iw_ioctl(int skfd, /* Socket to the kernel */ ++ const char * ifname, /* Device name */ ++ int request, /* WE ID */ ++ struct iwreq * pwrq) /* Fixed part of the request */ ++{ ++ /* Set device name */ ++ strncpy(pwrq->ifr_ifrn.ifrn_name, ifname, 16); ++ ++ /* Do the request */ ++ return(ioctl(skfd, request, pwrq)); ++} ++ ++/* fork() & execl() helper */ ++#define EXEC(x) \ ++ do { \ ++ switch(fork()) \ ++ { \ ++ case -1: \ ++ syslog(LOG_CRIT, "Unable to fork child: %s", \ ++ strerror(errno)); \ ++ break; \ ++ \ ++ case 0: \ ++ execl(x, NULL); \ ++ syslog(LOG_CRIT, "Unable to execute action: %s", \ ++ strerror(errno)); \ ++ return 1; \ ++ } \ ++ } while(0) ++ +diff --git a/feeds/luci/freifunk-watchdog/src/.svn/text-base/wireless.22.h.svn-base b/feeds/luci/freifunk-watchdog/src/.svn/text-base/wireless.22.h.svn-base +new file mode 100644 +index 0000000..1d19243 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/.svn/text-base/wireless.22.h.svn-base +@@ -0,0 +1,1139 @@ ++/* ++ * This file define a set of standard wireless extensions ++ * ++ * Version : 22 16.3.07 ++ * ++ * Authors : Jean Tourrilhes - HPL - ++ * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved. ++ */ ++ ++#ifndef _LINUX_WIRELESS_H ++#define _LINUX_WIRELESS_H ++ ++/************************** DOCUMENTATION **************************/ ++/* ++ * Initial APIs (1996 -> onward) : ++ * ----------------------------- ++ * Basically, the wireless extensions are for now a set of standard ioctl ++ * call + /proc/net/wireless ++ * ++ * The entry /proc/net/wireless give statistics and information on the ++ * driver. ++ * This is better than having each driver having its entry because ++ * its centralised and we may remove the driver module safely. ++ * ++ * Ioctl are used to configure the driver and issue commands. This is ++ * better than command line options of insmod because we may want to ++ * change dynamically (while the driver is running) some parameters. ++ * ++ * The ioctl mechanimsm are copied from standard devices ioctl. ++ * We have the list of command plus a structure descibing the ++ * data exchanged... ++ * Note that to add these ioctl, I was obliged to modify : ++ * # net/core/dev.c (two place + add include) ++ * # net/ipv4/af_inet.c (one place + add include) ++ * ++ * /proc/net/wireless is a copy of /proc/net/dev. ++ * We have a structure for data passed from the driver to /proc/net/wireless ++ * Too add this, I've modified : ++ * # net/core/dev.c (two other places) ++ * # include/linux/netdevice.h (one place) ++ * # include/linux/proc_fs.h (one place) ++ * ++ * New driver API (2002 -> onward) : ++ * ------------------------------- ++ * This file is only concerned with the user space API and common definitions. ++ * The new driver API is defined and documented in : ++ * # include/net/iw_handler.h ++ * ++ * Note as well that /proc/net/wireless implementation has now moved in : ++ * # net/core/wireless.c ++ * ++ * Wireless Events (2002 -> onward) : ++ * -------------------------------- ++ * Events are defined at the end of this file, and implemented in : ++ * # net/core/wireless.c ++ * ++ * Other comments : ++ * -------------- ++ * Do not add here things that are redundant with other mechanisms ++ * (drivers init, ifconfig, /proc/net/dev, ...) and with are not ++ * wireless specific. ++ * ++ * These wireless extensions are not magic : each driver has to provide ++ * support for them... ++ * ++ * IMPORTANT NOTE : As everything in the kernel, this is very much a ++ * work in progress. Contact me if you have ideas of improvements... ++ */ ++ ++/***************************** INCLUDES *****************************/ ++ ++/* This header is used in user-space, therefore need to be sanitised ++ * for that purpose. Those includes are usually not compatible with glibc. ++ * To know which includes to use in user-space, check iwlib.h. */ ++#ifdef __KERNEL__ ++#include /* for "caddr_t" et al */ ++#include /* for "struct sockaddr" et al */ ++#include /* for IFNAMSIZ and co... */ ++#endif /* __KERNEL__ */ ++ ++/***************************** VERSION *****************************/ ++/* ++ * This constant is used to know the availability of the wireless ++ * extensions and to know which version of wireless extensions it is ++ * (there is some stuff that will be added in the future...) ++ * I just plan to increment with each new version. ++ */ ++#define WIRELESS_EXT 22 ++ ++/* ++ * Changes : ++ * ++ * V2 to V3 ++ * -------- ++ * Alan Cox start some incompatibles changes. I've integrated a bit more. ++ * - Encryption renamed to Encode to avoid US regulation problems ++ * - Frequency changed from float to struct to avoid problems on old 386 ++ * ++ * V3 to V4 ++ * -------- ++ * - Add sensitivity ++ * ++ * V4 to V5 ++ * -------- ++ * - Missing encoding definitions in range ++ * - Access points stuff ++ * ++ * V5 to V6 ++ * -------- ++ * - 802.11 support (ESSID ioctls) ++ * ++ * V6 to V7 ++ * -------- ++ * - define IW_ESSID_MAX_SIZE and IW_MAX_AP ++ * ++ * V7 to V8 ++ * -------- ++ * - Changed my e-mail address ++ * - More 802.11 support (nickname, rate, rts, frag) ++ * - List index in frequencies ++ * ++ * V8 to V9 ++ * -------- ++ * - Support for 'mode of operation' (ad-hoc, managed...) ++ * - Support for unicast and multicast power saving ++ * - Change encoding to support larger tokens (>64 bits) ++ * - Updated iw_params (disable, flags) and use it for NWID ++ * - Extracted iw_point from iwreq for clarity ++ * ++ * V9 to V10 ++ * --------- ++ * - Add PM capability to range structure ++ * - Add PM modifier : MAX/MIN/RELATIVE ++ * - Add encoding option : IW_ENCODE_NOKEY ++ * - Add TxPower ioctls (work like TxRate) ++ * ++ * V10 to V11 ++ * ---------- ++ * - Add WE version in range (help backward/forward compatibility) ++ * - Add retry ioctls (work like PM) ++ * ++ * V11 to V12 ++ * ---------- ++ * - Add SIOCSIWSTATS to get /proc/net/wireless programatically ++ * - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space ++ * - Add new statistics (frag, retry, beacon) ++ * - Add average quality (for user space calibration) ++ * ++ * V12 to V13 ++ * ---------- ++ * - Document creation of new driver API. ++ * - Extract union iwreq_data from struct iwreq (for new driver API). ++ * - Rename SIOCSIWNAME as SIOCSIWCOMMIT ++ * ++ * V13 to V14 ++ * ---------- ++ * - Wireless Events support : define struct iw_event ++ * - Define additional specific event numbers ++ * - Add "addr" and "param" fields in union iwreq_data ++ * - AP scanning stuff (SIOCSIWSCAN and friends) ++ * ++ * V14 to V15 ++ * ---------- ++ * - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg ++ * - Make struct iw_freq signed (both m & e), add explicit padding ++ * - Add IWEVCUSTOM for driver specific event/scanning token ++ * - Add IW_MAX_GET_SPY for driver returning a lot of addresses ++ * - Add IW_TXPOW_RANGE for range of Tx Powers ++ * - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points ++ * - Add IW_MODE_MONITOR for passive monitor ++ * ++ * V15 to V16 ++ * ---------- ++ * - Increase the number of bitrates in iw_range to 32 (for 802.11g) ++ * - Increase the number of frequencies in iw_range to 32 (for 802.11b+a) ++ * - Reshuffle struct iw_range for increases, add filler ++ * - Increase IW_MAX_AP to 64 for driver returning a lot of addresses ++ * - Remove IW_MAX_GET_SPY because conflict with enhanced spy support ++ * - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy" ++ * - Add IW_ENCODE_TEMP and iw_range->encoding_login_index ++ * ++ * V16 to V17 ++ * ---------- ++ * - Add flags to frequency -> auto/fixed ++ * - Document (struct iw_quality *)->updated, add new flags (INVALID) ++ * - Wireless Event capability in struct iw_range ++ * - Add support for relative TxPower (yick !) ++ * ++ * V17 to V18 (From Jouni Malinen ) ++ * ---------- ++ * - Add support for WPA/WPA2 ++ * - Add extended encoding configuration (SIOCSIWENCODEEXT and ++ * SIOCGIWENCODEEXT) ++ * - Add SIOCSIWGENIE/SIOCGIWGENIE ++ * - Add SIOCSIWMLME ++ * - Add SIOCSIWPMKSA ++ * - Add struct iw_range bit field for supported encoding capabilities ++ * - Add optional scan request parameters for SIOCSIWSCAN ++ * - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA ++ * related parameters (extensible up to 4096 parameter values) ++ * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, ++ * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND ++ * ++ * V18 to V19 ++ * ---------- ++ * - Remove (struct iw_point *)->pointer from events and streams ++ * - Remove header includes to help user space ++ * - Increase IW_ENCODING_TOKEN_MAX from 32 to 64 ++ * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros ++ * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM ++ * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros ++ * ++ * V19 to V20 ++ * ---------- ++ * - RtNetlink requests support (SET/GET) ++ * ++ * V20 to V21 ++ * ---------- ++ * - Remove (struct net_device *)->get_wireless_stats() ++ * - Change length in ESSID and NICK to strlen() instead of strlen()+1 ++ * - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers ++ * - Power/Retry relative values no longer * 100000 ++ * - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI ++ * ++ * V21 to V22 ++ * ---------- ++ * - Prevent leaking of kernel space in stream on 64 bits. ++ */ ++ ++/**************************** CONSTANTS ****************************/ ++ ++/* -------------------------- IOCTL LIST -------------------------- */ ++ ++/* Wireless Identification */ ++#define SIOCSIWCOMMIT 0x8B00 /* Commit pending changes to driver */ ++#define SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ ++/* SIOCGIWNAME is used to verify the presence of Wireless Extensions. ++ * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"... ++ * Don't put the name of your driver there, it's useless. */ ++ ++/* Basic operations */ ++#define SIOCSIWNWID 0x8B02 /* set network id (pre-802.11) */ ++#define SIOCGIWNWID 0x8B03 /* get network id (the cell) */ ++#define SIOCSIWFREQ 0x8B04 /* set channel/frequency (Hz) */ ++#define SIOCGIWFREQ 0x8B05 /* get channel/frequency (Hz) */ ++#define SIOCSIWMODE 0x8B06 /* set operation mode */ ++#define SIOCGIWMODE 0x8B07 /* get operation mode */ ++#define SIOCSIWSENS 0x8B08 /* set sensitivity (dBm) */ ++#define SIOCGIWSENS 0x8B09 /* get sensitivity (dBm) */ ++ ++/* Informative stuff */ ++#define SIOCSIWRANGE 0x8B0A /* Unused */ ++#define SIOCGIWRANGE 0x8B0B /* Get range of parameters */ ++#define SIOCSIWPRIV 0x8B0C /* Unused */ ++#define SIOCGIWPRIV 0x8B0D /* get private ioctl interface info */ ++#define SIOCSIWSTATS 0x8B0E /* Unused */ ++#define SIOCGIWSTATS 0x8B0F /* Get /proc/net/wireless stats */ ++/* SIOCGIWSTATS is strictly used between user space and the kernel, and ++ * is never passed to the driver (i.e. the driver will never see it). */ ++ ++/* Spy support (statistics per MAC address - used for Mobile IP support) */ ++#define SIOCSIWSPY 0x8B10 /* set spy addresses */ ++#define SIOCGIWSPY 0x8B11 /* get spy info (quality of link) */ ++#define SIOCSIWTHRSPY 0x8B12 /* set spy threshold (spy event) */ ++#define SIOCGIWTHRSPY 0x8B13 /* get spy threshold */ ++ ++/* Access Point manipulation */ ++#define SIOCSIWAP 0x8B14 /* set access point MAC addresses */ ++#define SIOCGIWAP 0x8B15 /* get access point MAC addresses */ ++#define SIOCGIWAPLIST 0x8B17 /* Deprecated in favor of scanning */ ++#define SIOCSIWSCAN 0x8B18 /* trigger scanning (list cells) */ ++#define SIOCGIWSCAN 0x8B19 /* get scanning results */ ++ ++/* 802.11 specific support */ ++#define SIOCSIWESSID 0x8B1A /* set ESSID (network name) */ ++#define SIOCGIWESSID 0x8B1B /* get ESSID */ ++#define SIOCSIWNICKN 0x8B1C /* set node name/nickname */ ++#define SIOCGIWNICKN 0x8B1D /* get node name/nickname */ ++/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit ++ * within the 'iwreq' structure, so we need to use the 'data' member to ++ * point to a string in user space, like it is done for RANGE... */ ++ ++/* Other parameters useful in 802.11 and some other devices */ ++#define SIOCSIWRATE 0x8B20 /* set default bit rate (bps) */ ++#define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ ++#define SIOCSIWRTS 0x8B22 /* set RTS/CTS threshold (bytes) */ ++#define SIOCGIWRTS 0x8B23 /* get RTS/CTS threshold (bytes) */ ++#define SIOCSIWFRAG 0x8B24 /* set fragmentation thr (bytes) */ ++#define SIOCGIWFRAG 0x8B25 /* get fragmentation thr (bytes) */ ++#define SIOCSIWTXPOW 0x8B26 /* set transmit power (dBm) */ ++#define SIOCGIWTXPOW 0x8B27 /* get transmit power (dBm) */ ++#define SIOCSIWRETRY 0x8B28 /* set retry limits and lifetime */ ++#define SIOCGIWRETRY 0x8B29 /* get retry limits and lifetime */ ++ ++/* Encoding stuff (scrambling, hardware security, WEP...) */ ++#define SIOCSIWENCODE 0x8B2A /* set encoding token & mode */ ++#define SIOCGIWENCODE 0x8B2B /* get encoding token & mode */ ++/* Power saving stuff (power management, unicast and multicast) */ ++#define SIOCSIWPOWER 0x8B2C /* set Power Management settings */ ++#define SIOCGIWPOWER 0x8B2D /* get Power Management settings */ ++/* Modulation bitmask */ ++#define SIOCSIWMODUL 0x8B2E /* set Modulations settings */ ++#define SIOCGIWMODUL 0x8B2F /* get Modulations settings */ ++ ++/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM). ++ * This ioctl uses struct iw_point and data buffer that includes IE id and len ++ * fields. More than one IE may be included in the request. Setting the generic ++ * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers ++ * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers ++ * are required to report the used IE as a wireless event, e.g., when ++ * associating with an AP. */ ++#define SIOCSIWGENIE 0x8B30 /* set generic IE */ ++#define SIOCGIWGENIE 0x8B31 /* get generic IE */ ++ ++/* WPA : IEEE 802.11 MLME requests */ ++#define SIOCSIWMLME 0x8B16 /* request MLME operation; uses ++ * struct iw_mlme */ ++/* WPA : Authentication mode parameters */ ++#define SIOCSIWAUTH 0x8B32 /* set authentication mode params */ ++#define SIOCGIWAUTH 0x8B33 /* get authentication mode params */ ++ ++/* WPA : Extended version of encoding configuration */ ++#define SIOCSIWENCODEEXT 0x8B34 /* set encoding token & mode */ ++#define SIOCGIWENCODEEXT 0x8B35 /* get encoding token & mode */ ++ ++/* WPA2 : PMKSA cache management */ ++#define SIOCSIWPMKSA 0x8B36 /* PMKSA cache operation */ ++ ++/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */ ++ ++/* These 32 ioctl are wireless device private, for 16 commands. ++ * Each driver is free to use them for whatever purpose it chooses, ++ * however the driver *must* export the description of those ioctls ++ * with SIOCGIWPRIV and *must* use arguments as defined below. ++ * If you don't follow those rules, DaveM is going to hate you (reason : ++ * it make mixed 32/64bit operation impossible). ++ */ ++#define SIOCIWFIRSTPRIV 0x8BE0 ++#define SIOCIWLASTPRIV 0x8BFF ++/* Previously, we were using SIOCDEVPRIVATE, but we now have our ++ * separate range because of collisions with other tools such as ++ * 'mii-tool'. ++ * We now have 32 commands, so a bit more space ;-). ++ * Also, all 'even' commands are only usable by root and don't return the ++ * content of ifr/iwr to user (but you are not obliged to use the set/get ++ * convention, just use every other two command). More details in iwpriv.c. ++ * And I repeat : you are not forced to use them with iwpriv, but you ++ * must be compliant with it. ++ */ ++ ++/* ------------------------- IOCTL STUFF ------------------------- */ ++ ++/* The first and the last (range) */ ++#define SIOCIWFIRST 0x8B00 ++#define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ ++#define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) ++ ++/* Odd : get (world access), even : set (root access) */ ++#define IW_IS_SET(cmd) (!((cmd) & 0x1)) ++#define IW_IS_GET(cmd) ((cmd) & 0x1) ++ ++/* ----------------------- WIRELESS EVENTS ----------------------- */ ++/* Those are *NOT* ioctls, do not issue request on them !!! */ ++/* Most events use the same identifier as ioctl requests */ ++ ++#define IWEVTXDROP 0x8C00 /* Packet dropped to excessive retry */ ++#define IWEVQUAL 0x8C01 /* Quality part of statistics (scan) */ ++#define IWEVCUSTOM 0x8C02 /* Driver specific ascii string */ ++#define IWEVREGISTERED 0x8C03 /* Discovered a new node (AP mode) */ ++#define IWEVEXPIRED 0x8C04 /* Expired a node (AP mode) */ ++#define IWEVGENIE 0x8C05 /* Generic IE (WPA, RSN, WMM, ..) ++ * (scan results); This includes id and ++ * length fields. One IWEVGENIE may ++ * contain more than one IE. Scan ++ * results may contain one or more ++ * IWEVGENIE events. */ ++#define IWEVMICHAELMICFAILURE 0x8C06 /* Michael MIC failure ++ * (struct iw_michaelmicfailure) ++ */ ++#define IWEVASSOCREQIE 0x8C07 /* IEs used in (Re)Association Request. ++ * The data includes id and length ++ * fields and may contain more than one ++ * IE. This event is required in ++ * Managed mode if the driver ++ * generates its own WPA/RSN IE. This ++ * should be sent just before ++ * IWEVREGISTERED event for the ++ * association. */ ++#define IWEVASSOCRESPIE 0x8C08 /* IEs used in (Re)Association ++ * Response. The data includes id and ++ * length fields and may contain more ++ * than one IE. This may be sent ++ * between IWEVASSOCREQIE and ++ * IWEVREGISTERED events for the ++ * association. */ ++#define IWEVPMKIDCAND 0x8C09 /* PMKID candidate for RSN ++ * pre-authentication ++ * (struct iw_pmkid_cand) */ ++ ++#define IWEVFIRST 0x8C00 ++#define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) ++ ++/* ------------------------- PRIVATE INFO ------------------------- */ ++/* ++ * The following is used with SIOCGIWPRIV. It allow a driver to define ++ * the interface (name, type of data) for its private ioctl. ++ * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV ++ */ ++ ++#define IW_PRIV_TYPE_MASK 0x7000 /* Type of arguments */ ++#define IW_PRIV_TYPE_NONE 0x0000 ++#define IW_PRIV_TYPE_BYTE 0x1000 /* Char as number */ ++#define IW_PRIV_TYPE_CHAR 0x2000 /* Char as character */ ++#define IW_PRIV_TYPE_INT 0x4000 /* 32 bits int */ ++#define IW_PRIV_TYPE_FLOAT 0x5000 /* struct iw_freq */ ++#define IW_PRIV_TYPE_ADDR 0x6000 /* struct sockaddr */ ++ ++#define IW_PRIV_SIZE_FIXED 0x0800 /* Variable or fixed number of args */ ++ ++#define IW_PRIV_SIZE_MASK 0x07FF /* Max number of those args */ ++ ++/* ++ * Note : if the number of args is fixed and the size < 16 octets, ++ * instead of passing a pointer we will put args in the iwreq struct... ++ */ ++ ++/* ----------------------- OTHER CONSTANTS ----------------------- */ ++ ++/* Maximum frequencies in the range struct */ ++#define IW_MAX_FREQUENCIES 32 ++/* Note : if you have something like 80 frequencies, ++ * don't increase this constant and don't fill the frequency list. ++ * The user will be able to set by channel anyway... */ ++ ++/* Maximum bit rates in the range struct */ ++#define IW_MAX_BITRATES 32 ++ ++/* Maximum tx powers in the range struct */ ++#define IW_MAX_TXPOWER 8 ++/* Note : if you more than 8 TXPowers, just set the max and min or ++ * a few of them in the struct iw_range. */ ++ ++/* Maximum of address that you may set with SPY */ ++#define IW_MAX_SPY 8 ++ ++/* Maximum of address that you may get in the ++ list of access points in range */ ++#define IW_MAX_AP 64 ++ ++/* Maximum size of the ESSID and NICKN strings */ ++#define IW_ESSID_MAX_SIZE 32 ++ ++/* Modes of operation */ ++#define IW_MODE_AUTO 0 /* Let the driver decides */ ++#define IW_MODE_ADHOC 1 /* Single cell network */ ++#define IW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ ++#define IW_MODE_MASTER 3 /* Synchronisation master or Access Point */ ++#define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ ++#define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ ++#define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ ++ ++/* Statistics flags (bitmask in updated) */ ++#define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ ++#define IW_QUAL_LEVEL_UPDATED 0x02 ++#define IW_QUAL_NOISE_UPDATED 0x04 ++#define IW_QUAL_ALL_UPDATED 0x07 ++#define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */ ++#define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ ++#define IW_QUAL_LEVEL_INVALID 0x20 ++#define IW_QUAL_NOISE_INVALID 0x40 ++#define IW_QUAL_RCPI 0x80 /* Level + Noise are 802.11k RCPI */ ++#define IW_QUAL_ALL_INVALID 0x70 ++ ++/* Frequency flags */ ++#define IW_FREQ_AUTO 0x00 /* Let the driver decides */ ++#define IW_FREQ_FIXED 0x01 /* Force a specific value */ ++ ++/* Maximum number of size of encoding token available ++ * they are listed in the range structure */ ++#define IW_MAX_ENCODING_SIZES 8 ++ ++/* Maximum size of the encoding token in bytes */ ++#define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */ ++ ++/* Flags for encoding (along with the token) */ ++#define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ ++#define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ ++#define IW_ENCODE_MODE 0xF000 /* Modes defined below */ ++#define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ ++#define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ ++#define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ ++#define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ ++#define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ ++#define IW_ENCODE_TEMP 0x0400 /* Temporary key */ ++ ++/* Power management flags available (along with the value, if any) */ ++#define IW_POWER_ON 0x0000 /* No details... */ ++#define IW_POWER_TYPE 0xF000 /* Type of parameter */ ++#define IW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ ++#define IW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ ++#define IW_POWER_SAVING 0x4000 /* Value is relative (how aggressive)*/ ++#define IW_POWER_MODE 0x0F00 /* Power Management mode */ ++#define IW_POWER_UNICAST_R 0x0100 /* Receive only unicast messages */ ++#define IW_POWER_MULTICAST_R 0x0200 /* Receive only multicast messages */ ++#define IW_POWER_ALL_R 0x0300 /* Receive all messages though PM */ ++#define IW_POWER_FORCE_S 0x0400 /* Force PM procedure for sending unicast */ ++#define IW_POWER_REPEATER 0x0800 /* Repeat broadcast messages in PM period */ ++#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 */ ++ ++/* Transmit Power flags available */ ++#define IW_TXPOW_TYPE 0x00FF /* Type of value */ ++#define IW_TXPOW_DBM 0x0000 /* Value is in dBm */ ++#define IW_TXPOW_MWATT 0x0001 /* Value is in mW */ ++#define IW_TXPOW_RELATIVE 0x0002 /* Value is in arbitrary units */ ++#define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */ ++ ++/* Retry limits and lifetime flags available */ ++#define IW_RETRY_ON 0x0000 /* No details... */ ++#define IW_RETRY_TYPE 0xF000 /* Type of parameter */ ++#define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/ ++#define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */ ++#define IW_RETRY_MODIFIER 0x00FF /* Modify a parameter */ ++#define IW_RETRY_MIN 0x0001 /* Value is a minimum */ ++#define IW_RETRY_MAX 0x0002 /* Value is a maximum */ ++#define IW_RETRY_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ ++#define IW_RETRY_SHORT 0x0010 /* Value is for short packets */ ++#define IW_RETRY_LONG 0x0020 /* Value is for long packets */ ++ ++/* Scanning request flags */ ++#define IW_SCAN_DEFAULT 0x0000 /* Default scan of the driver */ ++#define IW_SCAN_ALL_ESSID 0x0001 /* Scan all ESSIDs */ ++#define IW_SCAN_THIS_ESSID 0x0002 /* Scan only this ESSID */ ++#define IW_SCAN_ALL_FREQ 0x0004 /* Scan all Frequencies */ ++#define IW_SCAN_THIS_FREQ 0x0008 /* Scan only this Frequency */ ++#define IW_SCAN_ALL_MODE 0x0010 /* Scan all Modes */ ++#define IW_SCAN_THIS_MODE 0x0020 /* Scan only this Mode */ ++#define IW_SCAN_ALL_RATE 0x0040 /* Scan all Bit-Rates */ ++#define IW_SCAN_THIS_RATE 0x0080 /* Scan only this Bit-Rate */ ++/* struct iw_scan_req scan_type */ ++#define IW_SCAN_TYPE_ACTIVE 0 ++#define IW_SCAN_TYPE_PASSIVE 1 ++/* Maximum size of returned data */ ++#define IW_SCAN_MAX_DATA 4096 /* In bytes */ ++ ++/* Max number of char in custom event - use multiple of them if needed */ ++#define IW_CUSTOM_MAX 256 /* In bytes */ ++ ++/* Generic information element */ ++#define IW_GENERIC_IE_MAX 1024 ++ ++/* MLME requests (SIOCSIWMLME / struct iw_mlme) */ ++#define IW_MLME_DEAUTH 0 ++#define IW_MLME_DISASSOC 1 ++#define IW_MLME_AUTH 2 ++#define IW_MLME_ASSOC 3 ++ ++/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */ ++#define IW_AUTH_INDEX 0x0FFF ++#define IW_AUTH_FLAGS 0xF000 ++/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095) ++ * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the ++ * parameter that is being set/get to; value will be read/written to ++ * struct iw_param value field) */ ++#define IW_AUTH_WPA_VERSION 0 ++#define IW_AUTH_CIPHER_PAIRWISE 1 ++#define IW_AUTH_CIPHER_GROUP 2 ++#define IW_AUTH_KEY_MGMT 3 ++#define IW_AUTH_TKIP_COUNTERMEASURES 4 ++#define IW_AUTH_DROP_UNENCRYPTED 5 ++#define IW_AUTH_80211_AUTH_ALG 6 ++#define IW_AUTH_WPA_ENABLED 7 ++#define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 ++#define IW_AUTH_ROAMING_CONTROL 9 ++#define IW_AUTH_PRIVACY_INVOKED 10 ++ ++/* IW_AUTH_WPA_VERSION values (bit field) */ ++#define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 ++#define IW_AUTH_WPA_VERSION_WPA 0x00000002 ++#define IW_AUTH_WPA_VERSION_WPA2 0x00000004 ++ ++/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */ ++#define IW_AUTH_CIPHER_NONE 0x00000001 ++#define IW_AUTH_CIPHER_WEP40 0x00000002 ++#define IW_AUTH_CIPHER_TKIP 0x00000004 ++#define IW_AUTH_CIPHER_CCMP 0x00000008 ++#define IW_AUTH_CIPHER_WEP104 0x00000010 ++ ++/* IW_AUTH_KEY_MGMT values (bit field) */ ++#define IW_AUTH_KEY_MGMT_802_1X 1 ++#define IW_AUTH_KEY_MGMT_PSK 2 ++ ++/* IW_AUTH_80211_AUTH_ALG values (bit field) */ ++#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 ++#define IW_AUTH_ALG_SHARED_KEY 0x00000002 ++#define IW_AUTH_ALG_LEAP 0x00000004 ++ ++/* IW_AUTH_ROAMING_CONTROL values */ ++#define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */ ++#define IW_AUTH_ROAMING_DISABLE 1 /* user space program used for roaming ++ * control */ ++ ++/* SIOCSIWENCODEEXT definitions */ ++#define IW_ENCODE_SEQ_MAX_SIZE 8 ++/* struct iw_encode_ext ->alg */ ++#define IW_ENCODE_ALG_NONE 0 ++#define IW_ENCODE_ALG_WEP 1 ++#define IW_ENCODE_ALG_TKIP 2 ++#define IW_ENCODE_ALG_CCMP 3 ++/* struct iw_encode_ext ->ext_flags */ ++#define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 ++#define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 ++#define IW_ENCODE_EXT_GROUP_KEY 0x00000004 ++#define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 ++ ++/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */ ++#define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */ ++#define IW_MICFAILURE_GROUP 0x00000004 ++#define IW_MICFAILURE_PAIRWISE 0x00000008 ++#define IW_MICFAILURE_STAKEY 0x00000010 ++#define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported) ++ */ ++ ++/* Bit field values for enc_capa in struct iw_range */ ++#define IW_ENC_CAPA_WPA 0x00000001 ++#define IW_ENC_CAPA_WPA2 0x00000002 ++#define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 ++#define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 ++ ++/* Event capability macros - in (struct iw_range *)->event_capa ++ * Because we have more than 32 possible events, we use an array of ++ * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */ ++#define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? \ ++ (cmd - SIOCIWFIRSTPRIV + 0x60) : \ ++ (cmd - SIOCSIWCOMMIT)) ++#define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) ++#define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) ++/* Event capability constants - event autogenerated by the kernel ++ * This list is valid for most 802.11 devices, customise as needed... */ ++#define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | \ ++ IW_EVENT_CAPA_MASK(0x8B06) | \ ++ IW_EVENT_CAPA_MASK(0x8B1A)) ++#define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) ++/* "Easy" macro to set events in iw_range (less efficient) */ ++#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) ++#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } ++ ++/* Modulations bitmasks */ ++#define IW_MODUL_ALL 0x00000000 /* Everything supported */ ++#define IW_MODUL_FH 0x00000001 /* Frequency Hopping */ ++#define IW_MODUL_DS 0x00000002 /* Original Direct Sequence */ ++#define IW_MODUL_CCK 0x00000004 /* 802.11b : 5.5 + 11 Mb/s */ ++#define IW_MODUL_11B (IW_MODUL_DS | IW_MODUL_CCK) ++#define IW_MODUL_PBCC 0x00000008 /* TI : 5.5 + 11 + 22 Mb/s */ ++#define IW_MODUL_OFDM_A 0x00000010 /* 802.11a : 54 Mb/s */ ++#define IW_MODUL_11A (IW_MODUL_OFDM_A) ++#define IW_MODUL_11AB (IW_MODUL_11B | IW_MODUL_11A) ++#define IW_MODUL_OFDM_G 0x00000020 /* 802.11g : 54 Mb/s */ ++#define IW_MODUL_11G (IW_MODUL_11B | IW_MODUL_OFDM_G) ++#define IW_MODUL_11AG (IW_MODUL_11G | IW_MODUL_11A) ++#define IW_MODUL_TURBO 0x00000040 /* ATH : bonding, 108 Mb/s */ ++/* In here we should define MIMO stuff. Later... */ ++#define IW_MODUL_CUSTOM 0x40000000 /* Driver specific */ ++ ++/* Bitrate flags available */ ++#define IW_BITRATE_TYPE 0x00FF /* Type of value */ ++#define IW_BITRATE_UNICAST 0x0001 /* Maximum/Fixed unicast bitrate */ ++#define IW_BITRATE_BROADCAST 0x0002 /* Fixed broadcast bitrate */ ++ ++/****************************** TYPES ******************************/ ++ ++/* --------------------------- SUBTYPES --------------------------- */ ++/* ++ * Generic format for most parameters that fit in an int ++ */ ++struct iw_param ++{ ++ int32_t value; /* The value of the parameter itself */ ++ uint8_t fixed; /* Hardware should not use auto select */ ++ uint8_t disabled; /* Disable the feature */ ++ uint16_t flags; /* Various specifc flags (if any) */ ++}; ++ ++/* ++ * For all data larger than 16 octets, we need to use a ++ * pointer to memory allocated in user space. ++ */ ++struct iw_point ++{ ++ void *pointer; /* Pointer to the data (in user space) */ ++ uint16_t length; /* number of fields or size in bytes */ ++ uint16_t flags; /* Optional params */ ++}; ++ ++/* ++ * A frequency ++ * For numbers lower than 10^9, we encode the number in 'm' and ++ * set 'e' to 0 ++ * For number greater than 10^9, we divide it by the lowest power ++ * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... ++ * The power of 10 is in 'e', the result of the division is in 'm'. ++ */ ++struct iw_freq ++{ ++ int32_t m; /* Mantissa */ ++ int16_t e; /* Exponent */ ++ uint8_t i; /* List index (when in range struct) */ ++ uint8_t flags; /* Flags (fixed/auto) */ ++}; ++ ++/* ++ * Quality of the link ++ */ ++struct iw_quality ++{ ++ uint8_t qual; /* link quality (%retries, SNR, ++ %missed beacons or better...) */ ++ uint8_t level; /* signal level (dBm) */ ++ uint8_t noise; /* noise level (dBm) */ ++ uint8_t updated; /* Flags to know if updated */ ++}; ++ ++/* ++ * Packet discarded in the wireless adapter due to ++ * "wireless" specific problems... ++ * Note : the list of counter and statistics in net_device_stats ++ * is already pretty exhaustive, and you should use that first. ++ * This is only additional stats... ++ */ ++struct iw_discarded ++{ ++ uint32_t nwid; /* Rx : Wrong nwid/essid */ ++ uint32_t code; /* Rx : Unable to code/decode (WEP) */ ++ uint32_t fragment; /* Rx : Can't perform MAC reassembly */ ++ uint32_t retries; /* Tx : Max MAC retries num reached */ ++ uint32_t misc; /* Others cases */ ++}; ++ ++/* ++ * Packet/Time period missed in the wireless adapter due to ++ * "wireless" specific problems... ++ */ ++struct iw_missed ++{ ++ uint32_t beacon; /* Missed beacons/superframe */ ++}; ++ ++/* ++ * Quality range (for spy threshold) ++ */ ++struct iw_thrspy ++{ ++ struct sockaddr addr; /* Source address (hw/mac) */ ++ struct iw_quality qual; /* Quality of the link */ ++ struct iw_quality low; /* Low threshold */ ++ struct iw_quality high; /* High threshold */ ++}; ++ ++/* ++ * Optional data for scan request ++ * ++ * Note: these optional parameters are controlling parameters for the ++ * scanning behavior, these do not apply to getting scan results ++ * (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and ++ * provide a merged results with all BSSes even if the previous scan ++ * request limited scanning to a subset, e.g., by specifying an SSID. ++ * Especially, scan results are required to include an entry for the ++ * current BSS if the driver is in Managed mode and associated with an AP. ++ */ ++struct iw_scan_req ++{ ++ uint8_t scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ ++ uint8_t essid_len; ++ uint8_t num_channels; /* num entries in channel_list; ++ * 0 = scan all allowed channels */ ++ uint8_t flags; /* reserved as padding; use zero, this may ++ * be used in the future for adding flags ++ * to request different scan behavior */ ++ struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or ++ * individual address of a specific BSS */ ++ ++ /* ++ * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using ++ * the current ESSID. This allows scan requests for specific ESSID ++ * without having to change the current ESSID and potentially breaking ++ * the current association. ++ */ ++ uint8_t essid[IW_ESSID_MAX_SIZE]; ++ ++ /* ++ * Optional parameters for changing the default scanning behavior. ++ * These are based on the MLME-SCAN.request from IEEE Std 802.11. ++ * TU is 1.024 ms. If these are set to 0, driver is expected to use ++ * reasonable default values. min_channel_time defines the time that ++ * will be used to wait for the first reply on each channel. If no ++ * replies are received, next channel will be scanned after this. If ++ * replies are received, total time waited on the channel is defined by ++ * max_channel_time. ++ */ ++ uint32_t min_channel_time; /* in TU */ ++ uint32_t max_channel_time; /* in TU */ ++ ++ struct iw_freq channel_list[IW_MAX_FREQUENCIES]; ++}; ++ ++/* ------------------------- WPA SUPPORT ------------------------- */ ++ ++/* ++ * Extended data structure for get/set encoding (this is used with ++ * SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_* ++ * flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and ++ * only the data contents changes (key data -> this structure, including ++ * key data). ++ * ++ * If the new key is the first group key, it will be set as the default ++ * TX key. Otherwise, default TX key index is only changed if ++ * IW_ENCODE_EXT_SET_TX_KEY flag is set. ++ * ++ * Key will be changed with SIOCSIWENCODEEXT in all cases except for ++ * special "change TX key index" operation which is indicated by setting ++ * key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY. ++ * ++ * tx_seq/rx_seq are only used when respective ++ * IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal ++ * TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start ++ * TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally ++ * used only by an Authenticator (AP or an IBSS station) to get the ++ * current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and ++ * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for ++ * debugging/testing. ++ */ ++struct iw_encode_ext ++{ ++ uint32_t ext_flags; /* IW_ENCODE_EXT_* */ ++ uint8_t tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ ++ uint8_t rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ ++ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast ++ * (group) keys or unicast address for ++ * individual keys */ ++ uint16_t alg; /* IW_ENCODE_ALG_* */ ++ uint16_t key_len; ++ uint8_t key[0]; ++}; ++ ++/* SIOCSIWMLME data */ ++struct iw_mlme ++{ ++ uint16_t cmd; /* IW_MLME_* */ ++ uint16_t reason_code; ++ struct sockaddr addr; ++}; ++ ++/* SIOCSIWPMKSA data */ ++#define IW_PMKSA_ADD 1 ++#define IW_PMKSA_REMOVE 2 ++#define IW_PMKSA_FLUSH 3 ++ ++#define IW_PMKID_LEN 16 ++ ++struct iw_pmksa ++{ ++ uint32_t cmd; /* IW_PMKSA_* */ ++ struct sockaddr bssid; ++ uint8_t pmkid[IW_PMKID_LEN]; ++}; ++ ++/* IWEVMICHAELMICFAILURE data */ ++struct iw_michaelmicfailure ++{ ++ uint32_t flags; ++ struct sockaddr src_addr; ++ uint8_t tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ ++}; ++ ++/* IWEVPMKIDCAND data */ ++#define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ ++struct iw_pmkid_cand ++{ ++ uint32_t flags; /* IW_PMKID_CAND_* */ ++ uint32_t index; /* the smaller the index, the higher the ++ * priority */ ++ struct sockaddr bssid; ++}; ++ ++/* ------------------------ WIRELESS STATS ------------------------ */ ++/* ++ * Wireless statistics (used for /proc/net/wireless) ++ */ ++struct iw_statistics ++{ ++ uint16_t status; /* Status ++ * - device dependent for now */ ++ ++ struct iw_quality qual; /* Quality of the link ++ * (instant/mean/max) */ ++ struct iw_discarded discard; /* Packet discarded counts */ ++ struct iw_missed miss; /* Packet missed counts */ ++}; ++ ++/* ------------------------ IOCTL REQUEST ------------------------ */ ++/* ++ * This structure defines the payload of an ioctl, and is used ++ * below. ++ * ++ * Note that this structure should fit on the memory footprint ++ * of iwreq (which is the same as ifreq), which mean a max size of ++ * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... ++ * You should check this when increasing the structures defined ++ * above in this file... ++ */ ++union iwreq_data ++{ ++ /* Config - generic */ ++ char name[16]; ++ /* Name : used to verify the presence of wireless extensions. ++ * Name of the protocol/provider... */ ++ ++ struct iw_point essid; /* Extended network name */ ++ struct iw_param nwid; /* network id (or domain - the cell) */ ++ struct iw_freq freq; /* frequency or channel : ++ * 0-1000 = channel ++ * > 1000 = frequency in Hz */ ++ ++ struct iw_param sens; /* signal level threshold */ ++ struct iw_param bitrate; /* default bit rate */ ++ struct iw_param txpower; /* default transmit power */ ++ struct iw_param rts; /* RTS threshold threshold */ ++ struct iw_param frag; /* Fragmentation threshold */ ++ uint32_t mode; /* Operation mode */ ++ struct iw_param retry; /* Retry limits & lifetime */ ++ ++ struct iw_point encoding; /* Encoding stuff : tokens */ ++ struct iw_param power; /* PM duration/timeout */ ++ struct iw_quality qual; /* Quality part of statistics */ ++ ++ struct sockaddr ap_addr; /* Access point address */ ++ struct sockaddr addr; /* Destination address (hw/mac) */ ++ ++ struct iw_param param; /* Other small parameters */ ++ struct iw_point data; /* Other large parameters */ ++}; ++ ++/* ++ * The structure to exchange data for ioctl. ++ * This structure is the same as 'struct ifreq', but (re)defined for ++ * convenience... ++ * Do I need to remind you about structure size (32 octets) ? ++ */ ++struct iwreq ++{ ++ union ++ { ++ char ifrn_name[16]; /* if name, e.g. "eth0" */ ++ } ifr_ifrn; ++ ++ /* Data part (defined just above) */ ++ union iwreq_data u; ++}; ++ ++/* -------------------------- IOCTL DATA -------------------------- */ ++/* ++ * For those ioctl which want to exchange mode data that what could ++ * fit in the above structure... ++ */ ++ ++/* ++ * Range of parameters ++ */ ++ ++struct iw_range ++{ ++ /* Informative stuff (to choose between different interface) */ ++ uint32_t throughput; /* To give an idea... */ ++ /* In theory this value should be the maximum benchmarked ++ * TCP/IP throughput, because with most of these devices the ++ * bit rate is meaningless (overhead an co) to estimate how ++ * fast the connection will go and pick the fastest one. ++ * I suggest people to play with Netperf or any benchmark... ++ */ ++ ++ /* NWID (or domain id) */ ++ uint32_t min_nwid; /* Minimal NWID we are able to set */ ++ uint32_t max_nwid; /* Maximal NWID we are able to set */ ++ ++ /* Old Frequency (backward compat - moved lower ) */ ++ uint16_t old_num_channels; ++ uint8_t old_num_frequency; ++ ++ /* Wireless event capability bitmasks */ ++ uint32_t event_capa[6]; ++ ++ /* signal level threshold range */ ++ int32_t sensitivity; ++ ++ /* Quality of link & SNR stuff */ ++ /* Quality range (link, level, noise) ++ * If the quality is absolute, it will be in the range [0 ; max_qual], ++ * if the quality is dBm, it will be in the range [max_qual ; 0]. ++ * Don't forget that we use 8 bit arithmetics... */ ++ struct iw_quality max_qual; /* Quality of the link */ ++ /* This should contain the average/typical values of the quality ++ * indicator. This should be the threshold between a "good" and ++ * a "bad" link (example : monitor going from green to orange). ++ * Currently, user space apps like quality monitors don't have any ++ * way to calibrate the measurement. With this, they can split ++ * the range between 0 and max_qual in different quality level ++ * (using a geometric subdivision centered on the average). ++ * I expect that people doing the user space apps will feedback ++ * us on which value we need to put in each driver... */ ++ struct iw_quality avg_qual; /* Quality of the link */ ++ ++ /* Rates */ ++ uint8_t num_bitrates; /* Number of entries in the list */ ++ int32_t bitrate[IW_MAX_BITRATES]; /* list, in bps */ ++ ++ /* RTS threshold */ ++ int32_t min_rts; /* Minimal RTS threshold */ ++ int32_t max_rts; /* Maximal RTS threshold */ ++ ++ /* Frag threshold */ ++ int32_t min_frag; /* Minimal frag threshold */ ++ int32_t max_frag; /* Maximal frag threshold */ ++ ++ /* Power Management duration & timeout */ ++ int32_t min_pmp; /* Minimal PM period */ ++ int32_t max_pmp; /* Maximal PM period */ ++ int32_t min_pmt; /* Minimal PM timeout */ ++ int32_t max_pmt; /* Maximal PM timeout */ ++ uint16_t pmp_flags; /* How to decode max/min PM period */ ++ uint16_t pmt_flags; /* How to decode max/min PM timeout */ ++ uint16_t pm_capa; /* What PM options are supported */ ++ ++ /* Encoder stuff */ ++ uint16_t encoding_size[IW_MAX_ENCODING_SIZES]; /* Different token sizes */ ++ uint8_t num_encoding_sizes; /* Number of entry in the list */ ++ uint8_t max_encoding_tokens; /* Max number of tokens */ ++ /* For drivers that need a "login/passwd" form */ ++ uint8_t encoding_login_index; /* token index for login token */ ++ ++ /* Transmit power */ ++ uint16_t txpower_capa; /* What options are supported */ ++ uint8_t num_txpower; /* Number of entries in the list */ ++ int32_t txpower[IW_MAX_TXPOWER]; /* list, in bps */ ++ ++ /* Wireless Extension version info */ ++ uint8_t we_version_compiled; /* Must be WIRELESS_EXT */ ++ uint8_t we_version_source; /* Last update of source */ ++ ++ /* Retry limits and lifetime */ ++ uint16_t retry_capa; /* What retry options are supported */ ++ uint16_t retry_flags; /* How to decode max/min retry limit */ ++ uint16_t r_time_flags; /* How to decode max/min retry life */ ++ int32_t min_retry; /* Minimal number of retries */ ++ int32_t max_retry; /* Maximal number of retries */ ++ int32_t min_r_time; /* Minimal retry lifetime */ ++ int32_t max_r_time; /* Maximal retry lifetime */ ++ ++ /* Frequency */ ++ uint16_t num_channels; /* Number of channels [0; num - 1] */ ++ uint8_t num_frequency; /* Number of entry in the list */ ++ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ ++ /* Note : this frequency list doesn't need to fit channel numbers, ++ * because each entry contain its channel index */ ++ ++ uint32_t enc_capa; /* IW_ENC_CAPA_* bit field */ ++ ++ /* More power management stuff */ ++ int32_t min_pms; /* Minimal PM saving */ ++ int32_t max_pms; /* Maximal PM saving */ ++ uint16_t pms_flags; /* How to decode max/min PM saving */ ++ ++ /* All available modulations for driver (hw may support less) */ ++ int32_t modul_capa; /* IW_MODUL_* bit field */ ++ ++ /* More bitrate stuff */ ++ uint32_t bitrate_capa; /* Types of bitrates supported */ ++}; ++ ++/* ++ * Private ioctl interface information ++ */ ++ ++struct iw_priv_args ++{ ++ uint32_t cmd; /* Number of the ioctl to issue */ ++ uint16_t set_args; /* Type and number of args */ ++ uint16_t get_args; /* Type and number of args */ ++ char name[16]; /* Name of the extension */ ++}; ++ ++/* ----------------------- WIRELESS EVENTS ----------------------- */ ++/* ++ * Wireless events are carried through the rtnetlink socket to user ++ * space. They are encapsulated in the IFLA_WIRELESS field of ++ * a RTM_NEWLINK message. ++ */ ++ ++/* ++ * A Wireless Event. Contains basically the same data as the ioctl... ++ */ ++struct iw_event ++{ ++ uint16_t len; /* Real lenght of this stuff */ ++ uint16_t cmd; /* Wireless IOCTL */ ++ union iwreq_data u; /* IOCTL fixed payload */ ++}; ++ ++/* Size of the Event prefix (including padding and alignement junk) */ ++#define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) ++/* Size of the various events */ ++#define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) ++#define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(uint32_t)) ++#define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) ++#define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) ++#define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) ++#define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) ++ ++/* iw_point events are special. First, the payload (extra data) come at ++ * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second, ++ * we omit the pointer, so start at an offset. */ ++#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \ ++ (char *) NULL) ++#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ ++ IW_EV_POINT_OFF) ++ ++/* Size of the Event prefix when packed in stream */ ++#define IW_EV_LCP_PK_LEN (4) ++/* Size of the various events when packed in stream */ ++#define IW_EV_CHAR_PK_LEN (IW_EV_LCP_PK_LEN + IFNAMSIZ) ++#define IW_EV_UINT_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(uint32_t)) ++#define IW_EV_FREQ_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_freq)) ++#define IW_EV_PARAM_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_param)) ++#define IW_EV_ADDR_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr)) ++#define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) ++#define IW_EV_POINT_PK_LEN (IW_EV_LCP_LEN + 4) ++ ++#endif /* _LINUX_WIRELESS_H */ +diff --git a/feeds/luci/freifunk-watchdog/src/Makefile b/feeds/luci/freifunk-watchdog/src/Makefile +new file mode 100644 +index 0000000..e049ebc +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/Makefile +@@ -0,0 +1,12 @@ ++WD_BINARY:=ffwatchd ++WD_CFLAGS:=$(CFLAGS) -c -DBINARY=\"$(WD_BINARY)\" ++WD_LDFLAGS:=$(LDFLAGS) -lm -luci ++ ++watchdog: ++ $(CC) $(WD_CFLAGS) -o ucix.o ucix.c ++ $(CC) $(WD_CFLAGS) -o watchdog.o watchdog.c ++ $(CC) $(WD_LDFLAGS) -o $(WD_BINARY) watchdog.o ucix.o ++ ++clean: ++ rm -f *~ $(WD_BINARY) *.o ++ +diff --git a/feeds/luci/freifunk-watchdog/src/ucix.c b/feeds/luci/freifunk-watchdog/src/ucix.c +new file mode 100644 +index 0000000..44de259 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/ucix.c +@@ -0,0 +1,102 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2008 John Crispin ++ * ++ * Changed by Jo-Philipp Wich ++ */ ++ ++#include ++#include ++ ++#include ++#include ++#include "ucix.h" ++ ++static struct uci_ptr ptr; ++ ++static inline int ucix_get_ptr(struct uci_context *ctx, const char *p, const char *s, const char *o, const char *t) ++{ ++ memset(&ptr, 0, sizeof(ptr)); ++ ptr.package = p; ++ ptr.section = s; ++ ptr.option = o; ++ ptr.value = t; ++ return uci_lookup_ptr(ctx, &ptr, NULL, true); ++} ++ ++struct uci_context* ucix_init(const char *config_file) ++{ ++ struct uci_context *ctx = uci_alloc_context(); ++#ifdef uci_to_delta ++ uci_add_delta_path(ctx, "/var/state"); ++#else ++ uci_add_history_path(ctx, "/var/state"); ++#endif ++ if(uci_load(ctx, config_file, NULL) != UCI_OK) ++ { ++ return NULL; ++ } ++ return ctx; ++} ++ ++void ucix_cleanup(struct uci_context *ctx) ++{ ++ uci_free_context(ctx); ++} ++ ++const char* ucix_get_option(struct uci_context *ctx, const char *p, const char *s, const char *o) ++{ ++ struct uci_element *e = NULL; ++ const char *value = NULL; ++ if(ucix_get_ptr(ctx, p, s, o, NULL)) ++ return NULL; ++ if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) ++ return NULL; ++ e = ptr.last; ++ switch (e->type) ++ { ++ case UCI_TYPE_SECTION: ++ value = uci_to_section(e)->type; ++ break; ++ case UCI_TYPE_OPTION: ++ switch(ptr.o->type) { ++ case UCI_TYPE_STRING: ++ value = ptr.o->v.string; ++ break; ++ default: ++ value = NULL; ++ break; ++ } ++ break; ++ default: ++ return 0; ++ } ++ ++ return value; ++} ++ ++void ucix_for_each_section_type(struct uci_context *ctx, ++ const char *p, const char *t, ++ void (*cb)(const char*, void*), void *priv) ++{ ++ struct uci_element *e; ++ if(ucix_get_ptr(ctx, p, NULL, NULL, NULL)) ++ return; ++ uci_foreach_element(&ptr.p->sections, e) ++ if (!strcmp(t, uci_to_section(e)->type)) ++ cb(e->name, priv); ++} ++ +diff --git a/feeds/luci/freifunk-watchdog/src/ucix.h b/feeds/luci/freifunk-watchdog/src/ucix.h +new file mode 100644 +index 0000000..b1f5ec3 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/ucix.h +@@ -0,0 +1,29 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2008 John Crispin ++ */ ++ ++#ifndef _UCI_H__ ++#define _UCI_H__ ++struct uci_context* ucix_init(const char *config_file); ++ ++void ucix_for_each_section_type(struct uci_context *ctx, ++ const char *p, const char *t, ++ void (*cb)(const char*, void*), void *priv); ++ ++const char* ucix_get_option(struct uci_context *ctx, ++ const char *p, const char *s, const char *o); ++#endif +diff --git a/feeds/luci/freifunk-watchdog/src/watchdog.c b/feeds/luci/freifunk-watchdog/src/watchdog.c +new file mode 100644 +index 0000000..ce66ada +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/watchdog.c +@@ -0,0 +1,527 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2009 Jo-Philipp Wich ++ */ ++ ++#include "watchdog.h" ++ ++/* Global watchdog fd, required by signal handler */ ++int wdfd = -1; ++ ++/* Handle finished childs */ ++static void sigchld_handler(int sig) ++{ ++ pid_t pid; ++ ++ while( (pid = waitpid(-1, NULL, WNOHANG)) > 0 ) ++ syslog(LOG_INFO, "Child returned (pid %d)", pid); ++} ++ ++/* Watchdog shutdown helper */ ++static void shutdown_watchdog(int sig) ++{ ++ static const char wshutdown = WATCH_SHUTDOWN; ++ ++ if( wdfd > -1 ) ++ { ++ syslog(LOG_INFO, "Stopping watchdog timer"); ++ write(wdfd, &wshutdown, 1); ++ close(wdfd); ++ wdfd = -1; ++ } ++ ++ exit(0); ++} ++ ++/* Get BSSID of given interface */ ++static int iw_get_bssid(int iwfd, const char *ifname, char *bssid) ++{ ++ struct iwreq iwrq; ++ ++ if( iw_ioctl(iwfd, ifname, SIOCGIWAP, &iwrq) >= 0 ) ++ { ++ unsigned char *addr = (unsigned char *)iwrq.u.ap_addr.sa_data; ++ ++ sprintf(bssid, "%02X:%02X:%02X:%02X:%02X:%02X", ++ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); ++ ++ return 0; ++ } ++ ++ return -1; ++} ++ ++/* Get channel of given interface */ ++static int iw_get_channel(int iwfd, const char *ifname, int *channel) ++{ ++ int i; ++ char buffer[sizeof(struct iw_range)]; ++ double cur_freq, cmp_freq; ++ struct iwreq iwrq; ++ struct iw_range *range; ++ ++ memset(buffer, 0, sizeof(buffer)); ++ ++ iwrq.u.data.pointer = (char *)buffer; ++ iwrq.u.data.length = sizeof(buffer); ++ iwrq.u.data.flags = 0; ++ ++ if( iw_ioctl(iwfd, ifname, SIOCGIWRANGE, &iwrq) < 0) ++ { ++ *channel = -1; ++ return -1; ++ } ++ ++ range = (struct iw_range *)buffer; ++ ++ if( iw_ioctl(iwfd, ifname, SIOCGIWFREQ, &iwrq) >= 0 ) ++ { ++ cur_freq = ((double)iwrq.u.freq.m) * pow(10, iwrq.u.freq.e); ++ if( cur_freq < 1000.00 ) ++ { ++ *channel = (int)cur_freq; ++ return 0; ++ } ++ ++ for(i = 0; i < range->num_frequency; i++) ++ { ++ cmp_freq = ((double)range->freq[i].m) * pow(10, range->freq[i].e); ++ if( cmp_freq == cur_freq ) ++ { ++ *channel = (int)range->freq[i].i; ++ return 0; ++ } ++ } ++ } ++ ++ *channel = -1; ++ return -1; ++} ++ ++/* Get the (first) pid of given process name */ ++static int find_process(const char *name) ++{ ++ int pid = -1; ++ int file; ++ char buffer[128]; ++ char cmpname[128]; ++ DIR *dir; ++ struct dirent *entry; ++ ++ if( (dir = opendir("/proc")) != NULL ) ++ { ++ snprintf(cmpname, sizeof(cmpname), "Name:\t%s\n", name); ++ ++ while( (entry = readdir(dir)) != NULL ) ++ { ++ if( !strcmp(entry->d_name, "..") || !isdigit(*entry->d_name) ) ++ continue; ++ ++ sprintf(buffer, "/proc/%s/status", entry->d_name); ++ if( (file = open(buffer, O_RDONLY)) > -1 ) ++ { ++ read(file, buffer, sizeof(buffer)); ++ close(file); ++ ++ if( strstr(buffer, cmpname) == buffer ) ++ { ++ pid = atoi(entry->d_name); ++ ++ /* Skip myself ... */ ++ if( pid == getpid() ) ++ pid = -1; ++ else ++ break; ++ } ++ } ++ } ++ ++ closedir(dir); ++ return pid; ++ } ++ ++ syslog(LOG_CRIT, "Unable to open /proc: %s", ++ strerror(errno)); ++ ++ return -1; ++} ++ ++/* Get the 5 minute load average */ ++static double find_loadavg(void) ++{ ++ int fd; ++ char buffer[10]; ++ double load = 0.00; ++ ++ if( (fd = open("/proc/loadavg", O_RDONLY)) > -1 ) ++ { ++ if( read(fd, buffer, sizeof(buffer)) == sizeof(buffer) ) ++ load = atof(&buffer[5]); ++ ++ close(fd); ++ } ++ ++ return load; ++} ++ ++/* Check if given uci file was updated */ ++static int check_uci_update(const char *config, time_t *mtime) ++{ ++ struct stat s; ++ char path[128]; ++ ++ snprintf(path, sizeof(path), "/var/state/%s", config); ++ if( stat(path, &s) > -1 ) ++ { ++ if( (*mtime == 0) || (s.st_mtime > *mtime) ) ++ { ++ *mtime = s.st_mtime; ++ return 1; ++ } ++ } ++ ++ return 0; ++} ++ ++/* Add tuple */ ++static void load_wifi_uci_add_iface(const char *section, struct uci_wifi_iface_itr_ctx *itr) ++{ ++ wifi_tuple_t *t; ++ const char *ucitmp; ++ int val = 0; ++ ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "mode"); ++ if( ucitmp && !strncmp(ucitmp, "adhoc", 5) ) ++ { ++ if( (t = (wifi_tuple_t *)malloc(sizeof(wifi_tuple_t))) != NULL ) ++ { ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "ifname"); ++ if(ucitmp) ++ { ++ strncpy(t->ifname, ucitmp, sizeof(t->ifname)); ++ val++; ++ } ++ ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "bssid"); ++ if(ucitmp) ++ { ++ strncpy(t->bssid, ucitmp, sizeof(t->bssid)); ++ val++; ++ } ++ ++ ucitmp = ucix_get_option(itr->ctx, "wireless", section, "device"); ++ if(ucitmp) ++ { ++ ucitmp = ucix_get_option(itr->ctx, "wireless", ucitmp, "channel"); ++ if(ucitmp) ++ { ++ t->channel = atoi(ucitmp); ++ val++; ++ } ++ } ++ ++ if( val == 3 ) ++ { ++ syslog(LOG_INFO, "Monitoring %s: bssid=%s channel=%d", ++ t->ifname, t->bssid, t->channel); ++ ++ t->next = itr->list; ++ itr->list = t; ++ } ++ else ++ { ++ free(t); ++ } ++ } ++ } ++} ++ ++/* Load config */ ++static wifi_tuple_t * load_wifi_uci(wifi_tuple_t *ifs, time_t *modtime) ++{ ++ struct uci_context *ctx; ++ struct uci_wifi_iface_itr_ctx itr; ++ wifi_tuple_t *cur, *next; ++ ++ if( check_uci_update("wireless", modtime) ) ++ { ++ syslog(LOG_INFO, "Wireless config changed, reloading"); ++ ++ if( (ctx = ucix_init("wireless")) != NULL ) ++ { ++ if( ifs != NULL ) ++ { ++ for(cur = ifs; cur; cur = next) ++ { ++ next = cur->next; ++ free(cur); ++ } ++ } ++ ++ itr.list = NULL; ++ itr.ctx = ctx; ++ ++ ucix_for_each_section_type(ctx, "wireless", "wifi-iface", ++ (void *)load_wifi_uci_add_iface, &itr); ++ ++ return itr.list; ++ } ++ } ++ ++ return ifs; ++} ++ ++/* Add tuple */ ++static void load_watchdog_uci_add_process(const char *section, struct uci_process_itr_ctx *itr) ++{ ++ process_tuple_t *t; ++ const char *ucitmp; ++ int val = 0; ++ ++ if( (t = (process_tuple_t *)malloc(sizeof(process_tuple_t))) != NULL ) ++ { ++ t->restart = 0; ++ ++ ucitmp = ucix_get_option(itr->ctx, "freifunk-watchdog", section, "process"); ++ if(ucitmp) ++ { ++ strncpy(t->process, ucitmp, sizeof(t->process)); ++ val++; ++ } ++ ++ ucitmp = ucix_get_option(itr->ctx, "freifunk-watchdog", section, "initscript"); ++ if(ucitmp) ++ { ++ strncpy(t->initscript, ucitmp, sizeof(t->initscript)); ++ val++; ++ } ++ ++ if( val == 2 ) ++ { ++ syslog(LOG_INFO, "Monitoring %s: initscript=%s", ++ t->process, t->initscript); ++ ++ t->next = itr->list; ++ itr->list = t; ++ } ++ else ++ { ++ free(t); ++ } ++ } ++} ++ ++/* Load config */ ++static process_tuple_t * load_watchdog_uci(process_tuple_t *procs) ++{ ++ struct uci_context *ctx; ++ struct uci_process_itr_ctx itr; ++ process_tuple_t *cur, *next; ++ ++ syslog(LOG_INFO, "Loading watchdog config"); ++ ++ if( (ctx = ucix_init("freifunk-watchdog")) != NULL ) ++ { ++ if( procs != NULL ) ++ { ++ for(cur = procs; cur; cur = next) ++ { ++ next = cur->next; ++ free(cur); ++ } ++ } ++ ++ itr.list = NULL; ++ itr.ctx = ctx; ++ ++ ucix_for_each_section_type(ctx, "freifunk-watchdog", "process", ++ (void *)load_watchdog_uci_add_process, &itr); ++ ++ return itr.list; ++ } ++ ++ return procs; ++} ++ ++/* Daemon implementation */ ++static int do_daemon(void) ++{ ++ static int wdtrigger = 1; ++ static int wdtimeout = BASE_INTERVAL * 2; ++ static const char wdkeepalive = WATCH_KEEPALIVE; ++ ++ int iwfd; ++ int channel; ++ char bssid[18]; ++ struct sigaction sa; ++ ++ wifi_tuple_t *ifs = NULL, *curr_if; ++ process_tuple_t *procs = NULL, *curr_proc; ++ time_t wireless_modtime = 0; ++ ++ int action_intv = 0; ++ int restart_wifi = 0; ++ int loadavg_panic = 0; ++ ++ openlog(SYSLOG_IDENT, 0, LOG_DAEMON); ++ memset(&sa, 0, sizeof(sa)); ++ ++ if( (iwfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1 ) ++ { ++ syslog(LOG_ERR, "Can not open wireless control socket: %s", ++ strerror(errno)); ++ ++ return 1; ++ } ++ ++ if( (wdfd = open(WATCH_DEVICE, O_WRONLY)) > -1 ) ++ { ++ syslog(LOG_INFO, "Opened %s - polling every %i seconds", ++ WATCH_DEVICE, BASE_INTERVAL); ++ ++ /* Install signal handler to halt watchdog on shutdown */ ++ sa.sa_handler = shutdown_watchdog; ++ sa.sa_flags = SA_NOCLDWAIT | SA_RESTART; ++ sigaction(SIGHUP, &sa, NULL); ++ sigaction(SIGINT, &sa, NULL); ++ sigaction(SIGPIPE, &sa, NULL); ++ sigaction(SIGTERM, &sa, NULL); ++ sigaction(SIGUSR1, &sa, NULL); ++ sigaction(SIGUSR2, &sa, NULL); ++ ++ /* Set watchdog timeout to twice the interval */ ++ ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtimeout); ++ } ++ ++ /* Install signal handler to reap childs */ ++ sa.sa_handler = sigchld_handler; ++ sa.sa_flags = 0; ++ sigaction(SIGCHLD, &sa, NULL); ++ ++ /* Load watchdog configuration only once */ ++ procs = load_watchdog_uci(procs); ++ ++ while( 1 ) ++ { ++ /* Check/increment action interval */ ++ if( ++action_intv >= ACTION_INTERVAL ) ++ { ++ /* Reset action interval */ ++ action_intv = 0; ++ ++ /* Check average load */ ++ if( find_loadavg() >= LOAD_TRESHOLD ) ++ loadavg_panic++; ++ else ++ loadavg_panic = 0; ++ ++ /* Check wireless interfaces */ ++ ifs = load_wifi_uci(ifs, &wireless_modtime); ++ for( curr_if = ifs; curr_if; curr_if = curr_if->next ) ++ { ++ /* Get current channel and bssid */ ++ if( (iw_get_bssid(iwfd, curr_if->ifname, bssid) == 0) && ++ (iw_get_channel(iwfd, curr_if->ifname, &channel) == 0) ) ++ { ++ /* Check BSSID */ ++ if( strcasecmp(bssid, curr_if->bssid) != 0 ) ++ { ++ syslog(LOG_WARNING, "BSSID mismatch on %s: current=%s wanted=%s", ++ curr_if->ifname, bssid, curr_if->bssid); ++ ++ restart_wifi++; ++ } ++ ++ /* Check channel */ ++ else if( channel != curr_if->channel ) ++ { ++ syslog(LOG_WARNING, "Channel mismatch on %s: current=%d wanted=%d", ++ curr_if->ifname, channel, curr_if->channel); ++ ++ restart_wifi++; ++ } ++ } ++ else ++ { ++ syslog(LOG_WARNING, "Requested interface %s not present", curr_if->ifname); ++ } ++ } ++ ++ /* Check processes */ ++ for( curr_proc = procs; curr_proc; curr_proc = curr_proc->next ) ++ { ++ if( find_process(curr_proc->process) < 0 ) ++ curr_proc->restart++; ++ else ++ curr_proc->restart = 0; ++ ++ /* Process restart required? */ ++ if( curr_proc->restart >= HYSTERESIS ) ++ { ++ curr_proc->restart = 0; ++ syslog(LOG_WARNING, "The %s process died, restarting", curr_proc->process); ++ EXEC(PROC_ACTION); ++ } ++ } ++ ++ ++ /* Wifi restart required? */ ++ if( restart_wifi >= HYSTERESIS ) ++ { ++ restart_wifi = 0; ++ syslog(LOG_WARNING, "Channel or BSSID mismatch on wireless interface, restarting"); ++ EXEC(WIFI_ACTION); ++ } ++ ++ /* Is there a load problem? */ ++ if( loadavg_panic >= HYSTERESIS ) ++ { ++ syslog(LOG_EMERG, "Critical system load level, triggering reset!"); ++ ++ /* Try watchdog, fall back to reboot */ ++ if( wdfd > -1 ) ++ ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtrigger); ++ else ++ EXEC(LOAD_ACTION); ++ } ++ } ++ ++ ++ /* Reset watchdog timer */ ++ if( wdfd > -1 ) ++ write(wdfd, &wdkeepalive, 1); ++ ++ sleep(BASE_INTERVAL); ++ } ++ ++ shutdown_watchdog(0); ++ closelog(); ++ ++ return 0; ++} ++ ++ ++int main(int argc, char *argv[]) ++{ ++ /* Check if watchdog is running ... */ ++ if( (argc > 1) && (strcmp(argv[1], "running") == 0) ) ++ { ++ return (find_process(BINARY) == -1); ++ } ++ ++ /* Start daemon */ ++ return do_daemon(); ++} +diff --git a/feeds/luci/freifunk-watchdog/src/watchdog.h b/feeds/luci/freifunk-watchdog/src/watchdog.h +new file mode 100644 +index 0000000..34d616c +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/watchdog.h +@@ -0,0 +1,141 @@ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Copyright (C) 2009 Jo-Philipp Wich ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "ucix.h" ++#include "wireless.22.h" ++ ++ ++/* Watchdog poll interval */ ++#define BASE_INTERVAL 5 ++ ++/* Action interval (N * BASE_INTERVAL) */ ++#define ACTION_INTERVAL 6 ++ ++/* Hysteresis */ ++#define HYSTERESIS 3 ++ ++/* How to call myself in the logs */ ++#define SYSLOG_IDENT "Freifunk Watchdog" ++ ++/* Process error action */ ++#define PROC_ACTION curr_proc->initscript, curr_proc->initscript, "restart" ++ ++/* Wifi error action */ ++#define WIFI_ACTION "/sbin/wifi", "/sbin/wifi" ++ ++/* Watchdog device */ ++#define WATCH_DEVICE "/dev/watchdog" ++#define WATCH_SHUTDOWN 'V' ++#define WATCH_KEEPALIVE '\0' ++ ++/* System load error action and treshold */ ++#define LOAD_TRESHOLD 15.00 ++#define LOAD_ACTION "/sbin/reboot", "/sbin/reboot" ++ ++/* Fallback binary name (passed by makefile) */ ++#ifndef BINARY ++#define BINARY "ffwatchd" ++#endif ++ ++ ++/* ifname/bssid/channel tuples */ ++struct wifi_tuple { ++ char ifname[16]; ++ char bssid[18]; ++ int channel; ++ struct wifi_tuple *next; ++}; ++ ++/* structure to hold tuple-list and uci context during iteration */ ++struct uci_wifi_iface_itr_ctx { ++ struct wifi_tuple *list; ++ struct uci_context *ctx; ++}; ++ ++typedef struct wifi_tuple wifi_tuple_t; ++ ++ ++/* process name/exec tuples */ ++struct process_tuple { ++ char process[PATH_MAX + 1]; ++ char initscript[PATH_MAX + 1]; ++ int restart; ++ struct process_tuple *next; ++}; ++ ++/* structure to hold tuple-list and uci context during iteration */ ++struct uci_process_itr_ctx { ++ struct process_tuple *list; ++ struct uci_context *ctx; ++}; ++ ++typedef struct process_tuple process_tuple_t; ++ ++ ++/* ioctl() helper (stolen from iwlib) */ ++static inline int ++iw_ioctl(int skfd, /* Socket to the kernel */ ++ const char * ifname, /* Device name */ ++ int request, /* WE ID */ ++ struct iwreq * pwrq) /* Fixed part of the request */ ++{ ++ /* Set device name */ ++ strncpy(pwrq->ifr_ifrn.ifrn_name, ifname, 16); ++ ++ /* Do the request */ ++ return(ioctl(skfd, request, pwrq)); ++} ++ ++/* fork() & execl() helper */ ++#define EXEC(x) \ ++ do { \ ++ switch(fork()) \ ++ { \ ++ case -1: \ ++ syslog(LOG_CRIT, "Unable to fork child: %s", \ ++ strerror(errno)); \ ++ break; \ ++ \ ++ case 0: \ ++ execl(x, NULL); \ ++ syslog(LOG_CRIT, "Unable to execute action: %s", \ ++ strerror(errno)); \ ++ return 1; \ ++ } \ ++ } while(0) ++ +diff --git a/feeds/luci/freifunk-watchdog/src/wireless.22.h b/feeds/luci/freifunk-watchdog/src/wireless.22.h +new file mode 100644 +index 0000000..1d19243 +--- /dev/null ++++ b/feeds/luci/freifunk-watchdog/src/wireless.22.h +@@ -0,0 +1,1139 @@ ++/* ++ * This file define a set of standard wireless extensions ++ * ++ * Version : 22 16.3.07 ++ * ++ * Authors : Jean Tourrilhes - HPL - ++ * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved. ++ */ ++ ++#ifndef _LINUX_WIRELESS_H ++#define _LINUX_WIRELESS_H ++ ++/************************** DOCUMENTATION **************************/ ++/* ++ * Initial APIs (1996 -> onward) : ++ * ----------------------------- ++ * Basically, the wireless extensions are for now a set of standard ioctl ++ * call + /proc/net/wireless ++ * ++ * The entry /proc/net/wireless give statistics and information on the ++ * driver. ++ * This is better than having each driver having its entry because ++ * its centralised and we may remove the driver module safely. ++ * ++ * Ioctl are used to configure the driver and issue commands. This is ++ * better than command line options of insmod because we may want to ++ * change dynamically (while the driver is running) some parameters. ++ * ++ * The ioctl mechanimsm are copied from standard devices ioctl. ++ * We have the list of command plus a structure descibing the ++ * data exchanged... ++ * Note that to add these ioctl, I was obliged to modify : ++ * # net/core/dev.c (two place + add include) ++ * # net/ipv4/af_inet.c (one place + add include) ++ * ++ * /proc/net/wireless is a copy of /proc/net/dev. ++ * We have a structure for data passed from the driver to /proc/net/wireless ++ * Too add this, I've modified : ++ * # net/core/dev.c (two other places) ++ * # include/linux/netdevice.h (one place) ++ * # include/linux/proc_fs.h (one place) ++ * ++ * New driver API (2002 -> onward) : ++ * ------------------------------- ++ * This file is only concerned with the user space API and common definitions. ++ * The new driver API is defined and documented in : ++ * # include/net/iw_handler.h ++ * ++ * Note as well that /proc/net/wireless implementation has now moved in : ++ * # net/core/wireless.c ++ * ++ * Wireless Events (2002 -> onward) : ++ * -------------------------------- ++ * Events are defined at the end of this file, and implemented in : ++ * # net/core/wireless.c ++ * ++ * Other comments : ++ * -------------- ++ * Do not add here things that are redundant with other mechanisms ++ * (drivers init, ifconfig, /proc/net/dev, ...) and with are not ++ * wireless specific. ++ * ++ * These wireless extensions are not magic : each driver has to provide ++ * support for them... ++ * ++ * IMPORTANT NOTE : As everything in the kernel, this is very much a ++ * work in progress. Contact me if you have ideas of improvements... ++ */ ++ ++/***************************** INCLUDES *****************************/ ++ ++/* This header is used in user-space, therefore need to be sanitised ++ * for that purpose. Those includes are usually not compatible with glibc. ++ * To know which includes to use in user-space, check iwlib.h. */ ++#ifdef __KERNEL__ ++#include /* for "caddr_t" et al */ ++#include /* for "struct sockaddr" et al */ ++#include /* for IFNAMSIZ and co... */ ++#endif /* __KERNEL__ */ ++ ++/***************************** VERSION *****************************/ ++/* ++ * This constant is used to know the availability of the wireless ++ * extensions and to know which version of wireless extensions it is ++ * (there is some stuff that will be added in the future...) ++ * I just plan to increment with each new version. ++ */ ++#define WIRELESS_EXT 22 ++ ++/* ++ * Changes : ++ * ++ * V2 to V3 ++ * -------- ++ * Alan Cox start some incompatibles changes. I've integrated a bit more. ++ * - Encryption renamed to Encode to avoid US regulation problems ++ * - Frequency changed from float to struct to avoid problems on old 386 ++ * ++ * V3 to V4 ++ * -------- ++ * - Add sensitivity ++ * ++ * V4 to V5 ++ * -------- ++ * - Missing encoding definitions in range ++ * - Access points stuff ++ * ++ * V5 to V6 ++ * -------- ++ * - 802.11 support (ESSID ioctls) ++ * ++ * V6 to V7 ++ * -------- ++ * - define IW_ESSID_MAX_SIZE and IW_MAX_AP ++ * ++ * V7 to V8 ++ * -------- ++ * - Changed my e-mail address ++ * - More 802.11 support (nickname, rate, rts, frag) ++ * - List index in frequencies ++ * ++ * V8 to V9 ++ * -------- ++ * - Support for 'mode of operation' (ad-hoc, managed...) ++ * - Support for unicast and multicast power saving ++ * - Change encoding to support larger tokens (>64 bits) ++ * - Updated iw_params (disable, flags) and use it for NWID ++ * - Extracted iw_point from iwreq for clarity ++ * ++ * V9 to V10 ++ * --------- ++ * - Add PM capability to range structure ++ * - Add PM modifier : MAX/MIN/RELATIVE ++ * - Add encoding option : IW_ENCODE_NOKEY ++ * - Add TxPower ioctls (work like TxRate) ++ * ++ * V10 to V11 ++ * ---------- ++ * - Add WE version in range (help backward/forward compatibility) ++ * - Add retry ioctls (work like PM) ++ * ++ * V11 to V12 ++ * ---------- ++ * - Add SIOCSIWSTATS to get /proc/net/wireless programatically ++ * - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space ++ * - Add new statistics (frag, retry, beacon) ++ * - Add average quality (for user space calibration) ++ * ++ * V12 to V13 ++ * ---------- ++ * - Document creation of new driver API. ++ * - Extract union iwreq_data from struct iwreq (for new driver API). ++ * - Rename SIOCSIWNAME as SIOCSIWCOMMIT ++ * ++ * V13 to V14 ++ * ---------- ++ * - Wireless Events support : define struct iw_event ++ * - Define additional specific event numbers ++ * - Add "addr" and "param" fields in union iwreq_data ++ * - AP scanning stuff (SIOCSIWSCAN and friends) ++ * ++ * V14 to V15 ++ * ---------- ++ * - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg ++ * - Make struct iw_freq signed (both m & e), add explicit padding ++ * - Add IWEVCUSTOM for driver specific event/scanning token ++ * - Add IW_MAX_GET_SPY for driver returning a lot of addresses ++ * - Add IW_TXPOW_RANGE for range of Tx Powers ++ * - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points ++ * - Add IW_MODE_MONITOR for passive monitor ++ * ++ * V15 to V16 ++ * ---------- ++ * - Increase the number of bitrates in iw_range to 32 (for 802.11g) ++ * - Increase the number of frequencies in iw_range to 32 (for 802.11b+a) ++ * - Reshuffle struct iw_range for increases, add filler ++ * - Increase IW_MAX_AP to 64 for driver returning a lot of addresses ++ * - Remove IW_MAX_GET_SPY because conflict with enhanced spy support ++ * - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy" ++ * - Add IW_ENCODE_TEMP and iw_range->encoding_login_index ++ * ++ * V16 to V17 ++ * ---------- ++ * - Add flags to frequency -> auto/fixed ++ * - Document (struct iw_quality *)->updated, add new flags (INVALID) ++ * - Wireless Event capability in struct iw_range ++ * - Add support for relative TxPower (yick !) ++ * ++ * V17 to V18 (From Jouni Malinen ) ++ * ---------- ++ * - Add support for WPA/WPA2 ++ * - Add extended encoding configuration (SIOCSIWENCODEEXT and ++ * SIOCGIWENCODEEXT) ++ * - Add SIOCSIWGENIE/SIOCGIWGENIE ++ * - Add SIOCSIWMLME ++ * - Add SIOCSIWPMKSA ++ * - Add struct iw_range bit field for supported encoding capabilities ++ * - Add optional scan request parameters for SIOCSIWSCAN ++ * - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA ++ * related parameters (extensible up to 4096 parameter values) ++ * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, ++ * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND ++ * ++ * V18 to V19 ++ * ---------- ++ * - Remove (struct iw_point *)->pointer from events and streams ++ * - Remove header includes to help user space ++ * - Increase IW_ENCODING_TOKEN_MAX from 32 to 64 ++ * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros ++ * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM ++ * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros ++ * ++ * V19 to V20 ++ * ---------- ++ * - RtNetlink requests support (SET/GET) ++ * ++ * V20 to V21 ++ * ---------- ++ * - Remove (struct net_device *)->get_wireless_stats() ++ * - Change length in ESSID and NICK to strlen() instead of strlen()+1 ++ * - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers ++ * - Power/Retry relative values no longer * 100000 ++ * - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI ++ * ++ * V21 to V22 ++ * ---------- ++ * - Prevent leaking of kernel space in stream on 64 bits. ++ */ ++ ++/**************************** CONSTANTS ****************************/ ++ ++/* -------------------------- IOCTL LIST -------------------------- */ ++ ++/* Wireless Identification */ ++#define SIOCSIWCOMMIT 0x8B00 /* Commit pending changes to driver */ ++#define SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ ++/* SIOCGIWNAME is used to verify the presence of Wireless Extensions. ++ * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"... ++ * Don't put the name of your driver there, it's useless. */ ++ ++/* Basic operations */ ++#define SIOCSIWNWID 0x8B02 /* set network id (pre-802.11) */ ++#define SIOCGIWNWID 0x8B03 /* get network id (the cell) */ ++#define SIOCSIWFREQ 0x8B04 /* set channel/frequency (Hz) */ ++#define SIOCGIWFREQ 0x8B05 /* get channel/frequency (Hz) */ ++#define SIOCSIWMODE 0x8B06 /* set operation mode */ ++#define SIOCGIWMODE 0x8B07 /* get operation mode */ ++#define SIOCSIWSENS 0x8B08 /* set sensitivity (dBm) */ ++#define SIOCGIWSENS 0x8B09 /* get sensitivity (dBm) */ ++ ++/* Informative stuff */ ++#define SIOCSIWRANGE 0x8B0A /* Unused */ ++#define SIOCGIWRANGE 0x8B0B /* Get range of parameters */ ++#define SIOCSIWPRIV 0x8B0C /* Unused */ ++#define SIOCGIWPRIV 0x8B0D /* get private ioctl interface info */ ++#define SIOCSIWSTATS 0x8B0E /* Unused */ ++#define SIOCGIWSTATS 0x8B0F /* Get /proc/net/wireless stats */ ++/* SIOCGIWSTATS is strictly used between user space and the kernel, and ++ * is never passed to the driver (i.e. the driver will never see it). */ ++ ++/* Spy support (statistics per MAC address - used for Mobile IP support) */ ++#define SIOCSIWSPY 0x8B10 /* set spy addresses */ ++#define SIOCGIWSPY 0x8B11 /* get spy info (quality of link) */ ++#define SIOCSIWTHRSPY 0x8B12 /* set spy threshold (spy event) */ ++#define SIOCGIWTHRSPY 0x8B13 /* get spy threshold */ ++ ++/* Access Point manipulation */ ++#define SIOCSIWAP 0x8B14 /* set access point MAC addresses */ ++#define SIOCGIWAP 0x8B15 /* get access point MAC addresses */ ++#define SIOCGIWAPLIST 0x8B17 /* Deprecated in favor of scanning */ ++#define SIOCSIWSCAN 0x8B18 /* trigger scanning (list cells) */ ++#define SIOCGIWSCAN 0x8B19 /* get scanning results */ ++ ++/* 802.11 specific support */ ++#define SIOCSIWESSID 0x8B1A /* set ESSID (network name) */ ++#define SIOCGIWESSID 0x8B1B /* get ESSID */ ++#define SIOCSIWNICKN 0x8B1C /* set node name/nickname */ ++#define SIOCGIWNICKN 0x8B1D /* get node name/nickname */ ++/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit ++ * within the 'iwreq' structure, so we need to use the 'data' member to ++ * point to a string in user space, like it is done for RANGE... */ ++ ++/* Other parameters useful in 802.11 and some other devices */ ++#define SIOCSIWRATE 0x8B20 /* set default bit rate (bps) */ ++#define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ ++#define SIOCSIWRTS 0x8B22 /* set RTS/CTS threshold (bytes) */ ++#define SIOCGIWRTS 0x8B23 /* get RTS/CTS threshold (bytes) */ ++#define SIOCSIWFRAG 0x8B24 /* set fragmentation thr (bytes) */ ++#define SIOCGIWFRAG 0x8B25 /* get fragmentation thr (bytes) */ ++#define SIOCSIWTXPOW 0x8B26 /* set transmit power (dBm) */ ++#define SIOCGIWTXPOW 0x8B27 /* get transmit power (dBm) */ ++#define SIOCSIWRETRY 0x8B28 /* set retry limits and lifetime */ ++#define SIOCGIWRETRY 0x8B29 /* get retry limits and lifetime */ ++ ++/* Encoding stuff (scrambling, hardware security, WEP...) */ ++#define SIOCSIWENCODE 0x8B2A /* set encoding token & mode */ ++#define SIOCGIWENCODE 0x8B2B /* get encoding token & mode */ ++/* Power saving stuff (power management, unicast and multicast) */ ++#define SIOCSIWPOWER 0x8B2C /* set Power Management settings */ ++#define SIOCGIWPOWER 0x8B2D /* get Power Management settings */ ++/* Modulation bitmask */ ++#define SIOCSIWMODUL 0x8B2E /* set Modulations settings */ ++#define SIOCGIWMODUL 0x8B2F /* get Modulations settings */ ++ ++/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM). ++ * This ioctl uses struct iw_point and data buffer that includes IE id and len ++ * fields. More than one IE may be included in the request. Setting the generic ++ * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers ++ * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers ++ * are required to report the used IE as a wireless event, e.g., when ++ * associating with an AP. */ ++#define SIOCSIWGENIE 0x8B30 /* set generic IE */ ++#define SIOCGIWGENIE 0x8B31 /* get generic IE */ ++ ++/* WPA : IEEE 802.11 MLME requests */ ++#define SIOCSIWMLME 0x8B16 /* request MLME operation; uses ++ * struct iw_mlme */ ++/* WPA : Authentication mode parameters */ ++#define SIOCSIWAUTH 0x8B32 /* set authentication mode params */ ++#define SIOCGIWAUTH 0x8B33 /* get authentication mode params */ ++ ++/* WPA : Extended version of encoding configuration */ ++#define SIOCSIWENCODEEXT 0x8B34 /* set encoding token & mode */ ++#define SIOCGIWENCODEEXT 0x8B35 /* get encoding token & mode */ ++ ++/* WPA2 : PMKSA cache management */ ++#define SIOCSIWPMKSA 0x8B36 /* PMKSA cache operation */ ++ ++/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */ ++ ++/* These 32 ioctl are wireless device private, for 16 commands. ++ * Each driver is free to use them for whatever purpose it chooses, ++ * however the driver *must* export the description of those ioctls ++ * with SIOCGIWPRIV and *must* use arguments as defined below. ++ * If you don't follow those rules, DaveM is going to hate you (reason : ++ * it make mixed 32/64bit operation impossible). ++ */ ++#define SIOCIWFIRSTPRIV 0x8BE0 ++#define SIOCIWLASTPRIV 0x8BFF ++/* Previously, we were using SIOCDEVPRIVATE, but we now have our ++ * separate range because of collisions with other tools such as ++ * 'mii-tool'. ++ * We now have 32 commands, so a bit more space ;-). ++ * Also, all 'even' commands are only usable by root and don't return the ++ * content of ifr/iwr to user (but you are not obliged to use the set/get ++ * convention, just use every other two command). More details in iwpriv.c. ++ * And I repeat : you are not forced to use them with iwpriv, but you ++ * must be compliant with it. ++ */ ++ ++/* ------------------------- IOCTL STUFF ------------------------- */ ++ ++/* The first and the last (range) */ ++#define SIOCIWFIRST 0x8B00 ++#define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ ++#define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) ++ ++/* Odd : get (world access), even : set (root access) */ ++#define IW_IS_SET(cmd) (!((cmd) & 0x1)) ++#define IW_IS_GET(cmd) ((cmd) & 0x1) ++ ++/* ----------------------- WIRELESS EVENTS ----------------------- */ ++/* Those are *NOT* ioctls, do not issue request on them !!! */ ++/* Most events use the same identifier as ioctl requests */ ++ ++#define IWEVTXDROP 0x8C00 /* Packet dropped to excessive retry */ ++#define IWEVQUAL 0x8C01 /* Quality part of statistics (scan) */ ++#define IWEVCUSTOM 0x8C02 /* Driver specific ascii string */ ++#define IWEVREGISTERED 0x8C03 /* Discovered a new node (AP mode) */ ++#define IWEVEXPIRED 0x8C04 /* Expired a node (AP mode) */ ++#define IWEVGENIE 0x8C05 /* Generic IE (WPA, RSN, WMM, ..) ++ * (scan results); This includes id and ++ * length fields. One IWEVGENIE may ++ * contain more than one IE. Scan ++ * results may contain one or more ++ * IWEVGENIE events. */ ++#define IWEVMICHAELMICFAILURE 0x8C06 /* Michael MIC failure ++ * (struct iw_michaelmicfailure) ++ */ ++#define IWEVASSOCREQIE 0x8C07 /* IEs used in (Re)Association Request. ++ * The data includes id and length ++ * fields and may contain more than one ++ * IE. This event is required in ++ * Managed mode if the driver ++ * generates its own WPA/RSN IE. This ++ * should be sent just before ++ * IWEVREGISTERED event for the ++ * association. */ ++#define IWEVASSOCRESPIE 0x8C08 /* IEs used in (Re)Association ++ * Response. The data includes id and ++ * length fields and may contain more ++ * than one IE. This may be sent ++ * between IWEVASSOCREQIE and ++ * IWEVREGISTERED events for the ++ * association. */ ++#define IWEVPMKIDCAND 0x8C09 /* PMKID candidate for RSN ++ * pre-authentication ++ * (struct iw_pmkid_cand) */ ++ ++#define IWEVFIRST 0x8C00 ++#define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) ++ ++/* ------------------------- PRIVATE INFO ------------------------- */ ++/* ++ * The following is used with SIOCGIWPRIV. It allow a driver to define ++ * the interface (name, type of data) for its private ioctl. ++ * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV ++ */ ++ ++#define IW_PRIV_TYPE_MASK 0x7000 /* Type of arguments */ ++#define IW_PRIV_TYPE_NONE 0x0000 ++#define IW_PRIV_TYPE_BYTE 0x1000 /* Char as number */ ++#define IW_PRIV_TYPE_CHAR 0x2000 /* Char as character */ ++#define IW_PRIV_TYPE_INT 0x4000 /* 32 bits int */ ++#define IW_PRIV_TYPE_FLOAT 0x5000 /* struct iw_freq */ ++#define IW_PRIV_TYPE_ADDR 0x6000 /* struct sockaddr */ ++ ++#define IW_PRIV_SIZE_FIXED 0x0800 /* Variable or fixed number of args */ ++ ++#define IW_PRIV_SIZE_MASK 0x07FF /* Max number of those args */ ++ ++/* ++ * Note : if the number of args is fixed and the size < 16 octets, ++ * instead of passing a pointer we will put args in the iwreq struct... ++ */ ++ ++/* ----------------------- OTHER CONSTANTS ----------------------- */ ++ ++/* Maximum frequencies in the range struct */ ++#define IW_MAX_FREQUENCIES 32 ++/* Note : if you have something like 80 frequencies, ++ * don't increase this constant and don't fill the frequency list. ++ * The user will be able to set by channel anyway... */ ++ ++/* Maximum bit rates in the range struct */ ++#define IW_MAX_BITRATES 32 ++ ++/* Maximum tx powers in the range struct */ ++#define IW_MAX_TXPOWER 8 ++/* Note : if you more than 8 TXPowers, just set the max and min or ++ * a few of them in the struct iw_range. */ ++ ++/* Maximum of address that you may set with SPY */ ++#define IW_MAX_SPY 8 ++ ++/* Maximum of address that you may get in the ++ list of access points in range */ ++#define IW_MAX_AP 64 ++ ++/* Maximum size of the ESSID and NICKN strings */ ++#define IW_ESSID_MAX_SIZE 32 ++ ++/* Modes of operation */ ++#define IW_MODE_AUTO 0 /* Let the driver decides */ ++#define IW_MODE_ADHOC 1 /* Single cell network */ ++#define IW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ ++#define IW_MODE_MASTER 3 /* Synchronisation master or Access Point */ ++#define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ ++#define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ ++#define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ ++ ++/* Statistics flags (bitmask in updated) */ ++#define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ ++#define IW_QUAL_LEVEL_UPDATED 0x02 ++#define IW_QUAL_NOISE_UPDATED 0x04 ++#define IW_QUAL_ALL_UPDATED 0x07 ++#define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */ ++#define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ ++#define IW_QUAL_LEVEL_INVALID 0x20 ++#define IW_QUAL_NOISE_INVALID 0x40 ++#define IW_QUAL_RCPI 0x80 /* Level + Noise are 802.11k RCPI */ ++#define IW_QUAL_ALL_INVALID 0x70 ++ ++/* Frequency flags */ ++#define IW_FREQ_AUTO 0x00 /* Let the driver decides */ ++#define IW_FREQ_FIXED 0x01 /* Force a specific value */ ++ ++/* Maximum number of size of encoding token available ++ * they are listed in the range structure */ ++#define IW_MAX_ENCODING_SIZES 8 ++ ++/* Maximum size of the encoding token in bytes */ ++#define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */ ++ ++/* Flags for encoding (along with the token) */ ++#define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ ++#define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ ++#define IW_ENCODE_MODE 0xF000 /* Modes defined below */ ++#define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ ++#define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ ++#define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ ++#define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ ++#define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ ++#define IW_ENCODE_TEMP 0x0400 /* Temporary key */ ++ ++/* Power management flags available (along with the value, if any) */ ++#define IW_POWER_ON 0x0000 /* No details... */ ++#define IW_POWER_TYPE 0xF000 /* Type of parameter */ ++#define IW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ ++#define IW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ ++#define IW_POWER_SAVING 0x4000 /* Value is relative (how aggressive)*/ ++#define IW_POWER_MODE 0x0F00 /* Power Management mode */ ++#define IW_POWER_UNICAST_R 0x0100 /* Receive only unicast messages */ ++#define IW_POWER_MULTICAST_R 0x0200 /* Receive only multicast messages */ ++#define IW_POWER_ALL_R 0x0300 /* Receive all messages though PM */ ++#define IW_POWER_FORCE_S 0x0400 /* Force PM procedure for sending unicast */ ++#define IW_POWER_REPEATER 0x0800 /* Repeat broadcast messages in PM period */ ++#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 */ ++ ++/* Transmit Power flags available */ ++#define IW_TXPOW_TYPE 0x00FF /* Type of value */ ++#define IW_TXPOW_DBM 0x0000 /* Value is in dBm */ ++#define IW_TXPOW_MWATT 0x0001 /* Value is in mW */ ++#define IW_TXPOW_RELATIVE 0x0002 /* Value is in arbitrary units */ ++#define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */ ++ ++/* Retry limits and lifetime flags available */ ++#define IW_RETRY_ON 0x0000 /* No details... */ ++#define IW_RETRY_TYPE 0xF000 /* Type of parameter */ ++#define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/ ++#define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */ ++#define IW_RETRY_MODIFIER 0x00FF /* Modify a parameter */ ++#define IW_RETRY_MIN 0x0001 /* Value is a minimum */ ++#define IW_RETRY_MAX 0x0002 /* Value is a maximum */ ++#define IW_RETRY_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ ++#define IW_RETRY_SHORT 0x0010 /* Value is for short packets */ ++#define IW_RETRY_LONG 0x0020 /* Value is for long packets */ ++ ++/* Scanning request flags */ ++#define IW_SCAN_DEFAULT 0x0000 /* Default scan of the driver */ ++#define IW_SCAN_ALL_ESSID 0x0001 /* Scan all ESSIDs */ ++#define IW_SCAN_THIS_ESSID 0x0002 /* Scan only this ESSID */ ++#define IW_SCAN_ALL_FREQ 0x0004 /* Scan all Frequencies */ ++#define IW_SCAN_THIS_FREQ 0x0008 /* Scan only this Frequency */ ++#define IW_SCAN_ALL_MODE 0x0010 /* Scan all Modes */ ++#define IW_SCAN_THIS_MODE 0x0020 /* Scan only this Mode */ ++#define IW_SCAN_ALL_RATE 0x0040 /* Scan all Bit-Rates */ ++#define IW_SCAN_THIS_RATE 0x0080 /* Scan only this Bit-Rate */ ++/* struct iw_scan_req scan_type */ ++#define IW_SCAN_TYPE_ACTIVE 0 ++#define IW_SCAN_TYPE_PASSIVE 1 ++/* Maximum size of returned data */ ++#define IW_SCAN_MAX_DATA 4096 /* In bytes */ ++ ++/* Max number of char in custom event - use multiple of them if needed */ ++#define IW_CUSTOM_MAX 256 /* In bytes */ ++ ++/* Generic information element */ ++#define IW_GENERIC_IE_MAX 1024 ++ ++/* MLME requests (SIOCSIWMLME / struct iw_mlme) */ ++#define IW_MLME_DEAUTH 0 ++#define IW_MLME_DISASSOC 1 ++#define IW_MLME_AUTH 2 ++#define IW_MLME_ASSOC 3 ++ ++/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */ ++#define IW_AUTH_INDEX 0x0FFF ++#define IW_AUTH_FLAGS 0xF000 ++/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095) ++ * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the ++ * parameter that is being set/get to; value will be read/written to ++ * struct iw_param value field) */ ++#define IW_AUTH_WPA_VERSION 0 ++#define IW_AUTH_CIPHER_PAIRWISE 1 ++#define IW_AUTH_CIPHER_GROUP 2 ++#define IW_AUTH_KEY_MGMT 3 ++#define IW_AUTH_TKIP_COUNTERMEASURES 4 ++#define IW_AUTH_DROP_UNENCRYPTED 5 ++#define IW_AUTH_80211_AUTH_ALG 6 ++#define IW_AUTH_WPA_ENABLED 7 ++#define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 ++#define IW_AUTH_ROAMING_CONTROL 9 ++#define IW_AUTH_PRIVACY_INVOKED 10 ++ ++/* IW_AUTH_WPA_VERSION values (bit field) */ ++#define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 ++#define IW_AUTH_WPA_VERSION_WPA 0x00000002 ++#define IW_AUTH_WPA_VERSION_WPA2 0x00000004 ++ ++/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */ ++#define IW_AUTH_CIPHER_NONE 0x00000001 ++#define IW_AUTH_CIPHER_WEP40 0x00000002 ++#define IW_AUTH_CIPHER_TKIP 0x00000004 ++#define IW_AUTH_CIPHER_CCMP 0x00000008 ++#define IW_AUTH_CIPHER_WEP104 0x00000010 ++ ++/* IW_AUTH_KEY_MGMT values (bit field) */ ++#define IW_AUTH_KEY_MGMT_802_1X 1 ++#define IW_AUTH_KEY_MGMT_PSK 2 ++ ++/* IW_AUTH_80211_AUTH_ALG values (bit field) */ ++#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 ++#define IW_AUTH_ALG_SHARED_KEY 0x00000002 ++#define IW_AUTH_ALG_LEAP 0x00000004 ++ ++/* IW_AUTH_ROAMING_CONTROL values */ ++#define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */ ++#define IW_AUTH_ROAMING_DISABLE 1 /* user space program used for roaming ++ * control */ ++ ++/* SIOCSIWENCODEEXT definitions */ ++#define IW_ENCODE_SEQ_MAX_SIZE 8 ++/* struct iw_encode_ext ->alg */ ++#define IW_ENCODE_ALG_NONE 0 ++#define IW_ENCODE_ALG_WEP 1 ++#define IW_ENCODE_ALG_TKIP 2 ++#define IW_ENCODE_ALG_CCMP 3 ++/* struct iw_encode_ext ->ext_flags */ ++#define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 ++#define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 ++#define IW_ENCODE_EXT_GROUP_KEY 0x00000004 ++#define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 ++ ++/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */ ++#define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */ ++#define IW_MICFAILURE_GROUP 0x00000004 ++#define IW_MICFAILURE_PAIRWISE 0x00000008 ++#define IW_MICFAILURE_STAKEY 0x00000010 ++#define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported) ++ */ ++ ++/* Bit field values for enc_capa in struct iw_range */ ++#define IW_ENC_CAPA_WPA 0x00000001 ++#define IW_ENC_CAPA_WPA2 0x00000002 ++#define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 ++#define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 ++ ++/* Event capability macros - in (struct iw_range *)->event_capa ++ * Because we have more than 32 possible events, we use an array of ++ * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */ ++#define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? \ ++ (cmd - SIOCIWFIRSTPRIV + 0x60) : \ ++ (cmd - SIOCSIWCOMMIT)) ++#define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) ++#define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) ++/* Event capability constants - event autogenerated by the kernel ++ * This list is valid for most 802.11 devices, customise as needed... */ ++#define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | \ ++ IW_EVENT_CAPA_MASK(0x8B06) | \ ++ IW_EVENT_CAPA_MASK(0x8B1A)) ++#define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) ++/* "Easy" macro to set events in iw_range (less efficient) */ ++#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) ++#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } ++ ++/* Modulations bitmasks */ ++#define IW_MODUL_ALL 0x00000000 /* Everything supported */ ++#define IW_MODUL_FH 0x00000001 /* Frequency Hopping */ ++#define IW_MODUL_DS 0x00000002 /* Original Direct Sequence */ ++#define IW_MODUL_CCK 0x00000004 /* 802.11b : 5.5 + 11 Mb/s */ ++#define IW_MODUL_11B (IW_MODUL_DS | IW_MODUL_CCK) ++#define IW_MODUL_PBCC 0x00000008 /* TI : 5.5 + 11 + 22 Mb/s */ ++#define IW_MODUL_OFDM_A 0x00000010 /* 802.11a : 54 Mb/s */ ++#define IW_MODUL_11A (IW_MODUL_OFDM_A) ++#define IW_MODUL_11AB (IW_MODUL_11B | IW_MODUL_11A) ++#define IW_MODUL_OFDM_G 0x00000020 /* 802.11g : 54 Mb/s */ ++#define IW_MODUL_11G (IW_MODUL_11B | IW_MODUL_OFDM_G) ++#define IW_MODUL_11AG (IW_MODUL_11G | IW_MODUL_11A) ++#define IW_MODUL_TURBO 0x00000040 /* ATH : bonding, 108 Mb/s */ ++/* In here we should define MIMO stuff. Later... */ ++#define IW_MODUL_CUSTOM 0x40000000 /* Driver specific */ ++ ++/* Bitrate flags available */ ++#define IW_BITRATE_TYPE 0x00FF /* Type of value */ ++#define IW_BITRATE_UNICAST 0x0001 /* Maximum/Fixed unicast bitrate */ ++#define IW_BITRATE_BROADCAST 0x0002 /* Fixed broadcast bitrate */ ++ ++/****************************** TYPES ******************************/ ++ ++/* --------------------------- SUBTYPES --------------------------- */ ++/* ++ * Generic format for most parameters that fit in an int ++ */ ++struct iw_param ++{ ++ int32_t value; /* The value of the parameter itself */ ++ uint8_t fixed; /* Hardware should not use auto select */ ++ uint8_t disabled; /* Disable the feature */ ++ uint16_t flags; /* Various specifc flags (if any) */ ++}; ++ ++/* ++ * For all data larger than 16 octets, we need to use a ++ * pointer to memory allocated in user space. ++ */ ++struct iw_point ++{ ++ void *pointer; /* Pointer to the data (in user space) */ ++ uint16_t length; /* number of fields or size in bytes */ ++ uint16_t flags; /* Optional params */ ++}; ++ ++/* ++ * A frequency ++ * For numbers lower than 10^9, we encode the number in 'm' and ++ * set 'e' to 0 ++ * For number greater than 10^9, we divide it by the lowest power ++ * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... ++ * The power of 10 is in 'e', the result of the division is in 'm'. ++ */ ++struct iw_freq ++{ ++ int32_t m; /* Mantissa */ ++ int16_t e; /* Exponent */ ++ uint8_t i; /* List index (when in range struct) */ ++ uint8_t flags; /* Flags (fixed/auto) */ ++}; ++ ++/* ++ * Quality of the link ++ */ ++struct iw_quality ++{ ++ uint8_t qual; /* link quality (%retries, SNR, ++ %missed beacons or better...) */ ++ uint8_t level; /* signal level (dBm) */ ++ uint8_t noise; /* noise level (dBm) */ ++ uint8_t updated; /* Flags to know if updated */ ++}; ++ ++/* ++ * Packet discarded in the wireless adapter due to ++ * "wireless" specific problems... ++ * Note : the list of counter and statistics in net_device_stats ++ * is already pretty exhaustive, and you should use that first. ++ * This is only additional stats... ++ */ ++struct iw_discarded ++{ ++ uint32_t nwid; /* Rx : Wrong nwid/essid */ ++ uint32_t code; /* Rx : Unable to code/decode (WEP) */ ++ uint32_t fragment; /* Rx : Can't perform MAC reassembly */ ++ uint32_t retries; /* Tx : Max MAC retries num reached */ ++ uint32_t misc; /* Others cases */ ++}; ++ ++/* ++ * Packet/Time period missed in the wireless adapter due to ++ * "wireless" specific problems... ++ */ ++struct iw_missed ++{ ++ uint32_t beacon; /* Missed beacons/superframe */ ++}; ++ ++/* ++ * Quality range (for spy threshold) ++ */ ++struct iw_thrspy ++{ ++ struct sockaddr addr; /* Source address (hw/mac) */ ++ struct iw_quality qual; /* Quality of the link */ ++ struct iw_quality low; /* Low threshold */ ++ struct iw_quality high; /* High threshold */ ++}; ++ ++/* ++ * Optional data for scan request ++ * ++ * Note: these optional parameters are controlling parameters for the ++ * scanning behavior, these do not apply to getting scan results ++ * (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and ++ * provide a merged results with all BSSes even if the previous scan ++ * request limited scanning to a subset, e.g., by specifying an SSID. ++ * Especially, scan results are required to include an entry for the ++ * current BSS if the driver is in Managed mode and associated with an AP. ++ */ ++struct iw_scan_req ++{ ++ uint8_t scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ ++ uint8_t essid_len; ++ uint8_t num_channels; /* num entries in channel_list; ++ * 0 = scan all allowed channels */ ++ uint8_t flags; /* reserved as padding; use zero, this may ++ * be used in the future for adding flags ++ * to request different scan behavior */ ++ struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or ++ * individual address of a specific BSS */ ++ ++ /* ++ * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using ++ * the current ESSID. This allows scan requests for specific ESSID ++ * without having to change the current ESSID and potentially breaking ++ * the current association. ++ */ ++ uint8_t essid[IW_ESSID_MAX_SIZE]; ++ ++ /* ++ * Optional parameters for changing the default scanning behavior. ++ * These are based on the MLME-SCAN.request from IEEE Std 802.11. ++ * TU is 1.024 ms. If these are set to 0, driver is expected to use ++ * reasonable default values. min_channel_time defines the time that ++ * will be used to wait for the first reply on each channel. If no ++ * replies are received, next channel will be scanned after this. If ++ * replies are received, total time waited on the channel is defined by ++ * max_channel_time. ++ */ ++ uint32_t min_channel_time; /* in TU */ ++ uint32_t max_channel_time; /* in TU */ ++ ++ struct iw_freq channel_list[IW_MAX_FREQUENCIES]; ++}; ++ ++/* ------------------------- WPA SUPPORT ------------------------- */ ++ ++/* ++ * Extended data structure for get/set encoding (this is used with ++ * SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_* ++ * flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and ++ * only the data contents changes (key data -> this structure, including ++ * key data). ++ * ++ * If the new key is the first group key, it will be set as the default ++ * TX key. Otherwise, default TX key index is only changed if ++ * IW_ENCODE_EXT_SET_TX_KEY flag is set. ++ * ++ * Key will be changed with SIOCSIWENCODEEXT in all cases except for ++ * special "change TX key index" operation which is indicated by setting ++ * key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY. ++ * ++ * tx_seq/rx_seq are only used when respective ++ * IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal ++ * TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start ++ * TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally ++ * used only by an Authenticator (AP or an IBSS station) to get the ++ * current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and ++ * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for ++ * debugging/testing. ++ */ ++struct iw_encode_ext ++{ ++ uint32_t ext_flags; /* IW_ENCODE_EXT_* */ ++ uint8_t tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ ++ uint8_t rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ ++ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast ++ * (group) keys or unicast address for ++ * individual keys */ ++ uint16_t alg; /* IW_ENCODE_ALG_* */ ++ uint16_t key_len; ++ uint8_t key[0]; ++}; ++ ++/* SIOCSIWMLME data */ ++struct iw_mlme ++{ ++ uint16_t cmd; /* IW_MLME_* */ ++ uint16_t reason_code; ++ struct sockaddr addr; ++}; ++ ++/* SIOCSIWPMKSA data */ ++#define IW_PMKSA_ADD 1 ++#define IW_PMKSA_REMOVE 2 ++#define IW_PMKSA_FLUSH 3 ++ ++#define IW_PMKID_LEN 16 ++ ++struct iw_pmksa ++{ ++ uint32_t cmd; /* IW_PMKSA_* */ ++ struct sockaddr bssid; ++ uint8_t pmkid[IW_PMKID_LEN]; ++}; ++ ++/* IWEVMICHAELMICFAILURE data */ ++struct iw_michaelmicfailure ++{ ++ uint32_t flags; ++ struct sockaddr src_addr; ++ uint8_t tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ ++}; ++ ++/* IWEVPMKIDCAND data */ ++#define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ ++struct iw_pmkid_cand ++{ ++ uint32_t flags; /* IW_PMKID_CAND_* */ ++ uint32_t index; /* the smaller the index, the higher the ++ * priority */ ++ struct sockaddr bssid; ++}; ++ ++/* ------------------------ WIRELESS STATS ------------------------ */ ++/* ++ * Wireless statistics (used for /proc/net/wireless) ++ */ ++struct iw_statistics ++{ ++ uint16_t status; /* Status ++ * - device dependent for now */ ++ ++ struct iw_quality qual; /* Quality of the link ++ * (instant/mean/max) */ ++ struct iw_discarded discard; /* Packet discarded counts */ ++ struct iw_missed miss; /* Packet missed counts */ ++}; ++ ++/* ------------------------ IOCTL REQUEST ------------------------ */ ++/* ++ * This structure defines the payload of an ioctl, and is used ++ * below. ++ * ++ * Note that this structure should fit on the memory footprint ++ * of iwreq (which is the same as ifreq), which mean a max size of ++ * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... ++ * You should check this when increasing the structures defined ++ * above in this file... ++ */ ++union iwreq_data ++{ ++ /* Config - generic */ ++ char name[16]; ++ /* Name : used to verify the presence of wireless extensions. ++ * Name of the protocol/provider... */ ++ ++ struct iw_point essid; /* Extended network name */ ++ struct iw_param nwid; /* network id (or domain - the cell) */ ++ struct iw_freq freq; /* frequency or channel : ++ * 0-1000 = channel ++ * > 1000 = frequency in Hz */ ++ ++ struct iw_param sens; /* signal level threshold */ ++ struct iw_param bitrate; /* default bit rate */ ++ struct iw_param txpower; /* default transmit power */ ++ struct iw_param rts; /* RTS threshold threshold */ ++ struct iw_param frag; /* Fragmentation threshold */ ++ uint32_t mode; /* Operation mode */ ++ struct iw_param retry; /* Retry limits & lifetime */ ++ ++ struct iw_point encoding; /* Encoding stuff : tokens */ ++ struct iw_param power; /* PM duration/timeout */ ++ struct iw_quality qual; /* Quality part of statistics */ ++ ++ struct sockaddr ap_addr; /* Access point address */ ++ struct sockaddr addr; /* Destination address (hw/mac) */ ++ ++ struct iw_param param; /* Other small parameters */ ++ struct iw_point data; /* Other large parameters */ ++}; ++ ++/* ++ * The structure to exchange data for ioctl. ++ * This structure is the same as 'struct ifreq', but (re)defined for ++ * convenience... ++ * Do I need to remind you about structure size (32 octets) ? ++ */ ++struct iwreq ++{ ++ union ++ { ++ char ifrn_name[16]; /* if name, e.g. "eth0" */ ++ } ifr_ifrn; ++ ++ /* Data part (defined just above) */ ++ union iwreq_data u; ++}; ++ ++/* -------------------------- IOCTL DATA -------------------------- */ ++/* ++ * For those ioctl which want to exchange mode data that what could ++ * fit in the above structure... ++ */ ++ ++/* ++ * Range of parameters ++ */ ++ ++struct iw_range ++{ ++ /* Informative stuff (to choose between different interface) */ ++ uint32_t throughput; /* To give an idea... */ ++ /* In theory this value should be the maximum benchmarked ++ * TCP/IP throughput, because with most of these devices the ++ * bit rate is meaningless (overhead an co) to estimate how ++ * fast the connection will go and pick the fastest one. ++ * I suggest people to play with Netperf or any benchmark... ++ */ ++ ++ /* NWID (or domain id) */ ++ uint32_t min_nwid; /* Minimal NWID we are able to set */ ++ uint32_t max_nwid; /* Maximal NWID we are able to set */ ++ ++ /* Old Frequency (backward compat - moved lower ) */ ++ uint16_t old_num_channels; ++ uint8_t old_num_frequency; ++ ++ /* Wireless event capability bitmasks */ ++ uint32_t event_capa[6]; ++ ++ /* signal level threshold range */ ++ int32_t sensitivity; ++ ++ /* Quality of link & SNR stuff */ ++ /* Quality range (link, level, noise) ++ * If the quality is absolute, it will be in the range [0 ; max_qual], ++ * if the quality is dBm, it will be in the range [max_qual ; 0]. ++ * Don't forget that we use 8 bit arithmetics... */ ++ struct iw_quality max_qual; /* Quality of the link */ ++ /* This should contain the average/typical values of the quality ++ * indicator. This should be the threshold between a "good" and ++ * a "bad" link (example : monitor going from green to orange). ++ * Currently, user space apps like quality monitors don't have any ++ * way to calibrate the measurement. With this, they can split ++ * the range between 0 and max_qual in different quality level ++ * (using a geometric subdivision centered on the average). ++ * I expect that people doing the user space apps will feedback ++ * us on which value we need to put in each driver... */ ++ struct iw_quality avg_qual; /* Quality of the link */ ++ ++ /* Rates */ ++ uint8_t num_bitrates; /* Number of entries in the list */ ++ int32_t bitrate[IW_MAX_BITRATES]; /* list, in bps */ ++ ++ /* RTS threshold */ ++ int32_t min_rts; /* Minimal RTS threshold */ ++ int32_t max_rts; /* Maximal RTS threshold */ ++ ++ /* Frag threshold */ ++ int32_t min_frag; /* Minimal frag threshold */ ++ int32_t max_frag; /* Maximal frag threshold */ ++ ++ /* Power Management duration & timeout */ ++ int32_t min_pmp; /* Minimal PM period */ ++ int32_t max_pmp; /* Maximal PM period */ ++ int32_t min_pmt; /* Minimal PM timeout */ ++ int32_t max_pmt; /* Maximal PM timeout */ ++ uint16_t pmp_flags; /* How to decode max/min PM period */ ++ uint16_t pmt_flags; /* How to decode max/min PM timeout */ ++ uint16_t pm_capa; /* What PM options are supported */ ++ ++ /* Encoder stuff */ ++ uint16_t encoding_size[IW_MAX_ENCODING_SIZES]; /* Different token sizes */ ++ uint8_t num_encoding_sizes; /* Number of entry in the list */ ++ uint8_t max_encoding_tokens; /* Max number of tokens */ ++ /* For drivers that need a "login/passwd" form */ ++ uint8_t encoding_login_index; /* token index for login token */ ++ ++ /* Transmit power */ ++ uint16_t txpower_capa; /* What options are supported */ ++ uint8_t num_txpower; /* Number of entries in the list */ ++ int32_t txpower[IW_MAX_TXPOWER]; /* list, in bps */ ++ ++ /* Wireless Extension version info */ ++ uint8_t we_version_compiled; /* Must be WIRELESS_EXT */ ++ uint8_t we_version_source; /* Last update of source */ ++ ++ /* Retry limits and lifetime */ ++ uint16_t retry_capa; /* What retry options are supported */ ++ uint16_t retry_flags; /* How to decode max/min retry limit */ ++ uint16_t r_time_flags; /* How to decode max/min retry life */ ++ int32_t min_retry; /* Minimal number of retries */ ++ int32_t max_retry; /* Maximal number of retries */ ++ int32_t min_r_time; /* Minimal retry lifetime */ ++ int32_t max_r_time; /* Maximal retry lifetime */ ++ ++ /* Frequency */ ++ uint16_t num_channels; /* Number of channels [0; num - 1] */ ++ uint8_t num_frequency; /* Number of entry in the list */ ++ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ ++ /* Note : this frequency list doesn't need to fit channel numbers, ++ * because each entry contain its channel index */ ++ ++ uint32_t enc_capa; /* IW_ENC_CAPA_* bit field */ ++ ++ /* More power management stuff */ ++ int32_t min_pms; /* Minimal PM saving */ ++ int32_t max_pms; /* Maximal PM saving */ ++ uint16_t pms_flags; /* How to decode max/min PM saving */ ++ ++ /* All available modulations for driver (hw may support less) */ ++ int32_t modul_capa; /* IW_MODUL_* bit field */ ++ ++ /* More bitrate stuff */ ++ uint32_t bitrate_capa; /* Types of bitrates supported */ ++}; ++ ++/* ++ * Private ioctl interface information ++ */ ++ ++struct iw_priv_args ++{ ++ uint32_t cmd; /* Number of the ioctl to issue */ ++ uint16_t set_args; /* Type and number of args */ ++ uint16_t get_args; /* Type and number of args */ ++ char name[16]; /* Name of the extension */ ++}; ++ ++/* ----------------------- WIRELESS EVENTS ----------------------- */ ++/* ++ * Wireless events are carried through the rtnetlink socket to user ++ * space. They are encapsulated in the IFLA_WIRELESS field of ++ * a RTM_NEWLINK message. ++ */ ++ ++/* ++ * A Wireless Event. Contains basically the same data as the ioctl... ++ */ ++struct iw_event ++{ ++ uint16_t len; /* Real lenght of this stuff */ ++ uint16_t cmd; /* Wireless IOCTL */ ++ union iwreq_data u; /* IOCTL fixed payload */ ++}; ++ ++/* Size of the Event prefix (including padding and alignement junk) */ ++#define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) ++/* Size of the various events */ ++#define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) ++#define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(uint32_t)) ++#define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) ++#define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) ++#define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) ++#define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) ++ ++/* iw_point events are special. First, the payload (extra data) come at ++ * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second, ++ * we omit the pointer, so start at an offset. */ ++#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \ ++ (char *) NULL) ++#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ ++ IW_EV_POINT_OFF) ++ ++/* Size of the Event prefix when packed in stream */ ++#define IW_EV_LCP_PK_LEN (4) ++/* Size of the various events when packed in stream */ ++#define IW_EV_CHAR_PK_LEN (IW_EV_LCP_PK_LEN + IFNAMSIZ) ++#define IW_EV_UINT_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(uint32_t)) ++#define IW_EV_FREQ_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_freq)) ++#define IW_EV_PARAM_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_param)) ++#define IW_EV_ADDR_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr)) ++#define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) ++#define IW_EV_POINT_PK_LEN (IW_EV_LCP_LEN + 4) ++ ++#endif /* _LINUX_WIRELESS_H */ +diff --git a/feeds/luci/luci/.svn/all-wcprops b/feeds/luci/luci/.svn/all-wcprops +new file mode 100644 +index 0000000..859f48d +--- /dev/null ++++ b/feeds/luci/luci/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 46 ++/!svn/ver/9679/luci/trunk/contrib/package/luci ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 55 ++/!svn/ver/9679/luci/trunk/contrib/package/luci/Makefile ++END +diff --git a/feeds/luci/luci/.svn/entries b/feeds/luci/luci/.svn/entries +new file mode 100644 +index 0000000..5a16b14 +--- /dev/null ++++ b/feeds/luci/luci/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/luci ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-03-09T22:52:53.779777Z ++9679 ++iordan ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++ipkg ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++4ba7a52e31ac261196ea66fbffbcbe3a ++2013-03-09T22:52:53.779777Z ++9679 ++iordan ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++20862 ++ +diff --git a/feeds/luci/luci/.svn/text-base/Makefile.svn-base b/feeds/luci/luci/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..63b1196 +--- /dev/null ++++ b/feeds/luci/luci/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,644 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_BRANCH:=trunk ++ ++ifeq ($(DUMP),) ++ USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1) ++endif ++ ++PKG_NAME:=luci ++PKG_RELEASE:=1 ++ ++PKG_BUILD_PARALLEL:=0 ++ ++ifeq ($(USELOCAL),1) ++ PKG_VERSION:=trunk+svn ++else ++ PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) ++ ifeq ($(DUMP),) ++ PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p') ++ PKG_VERSION:=trunk+svn$(PKG_REV) ++ endif ++ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++ PKG_SOURCE_PROTO:=svn ++ PKG_SOURCE_VERSION:=$(PKG_REV) ++endif ++ ++PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install ++ ++LUA_TARGET:=source ++LUCI_CFLAGS:= ++LUCI_BUILD_PACKAGES:= ++LUCI_SELECTED_MODULES:= ++ ++ifeq ($(BOARD),brcm-2.4) ++ MAKE_FLAGS += CRAP="1" ++endif ++ ++ ++### Templates ### ++define Package/luci/install/template ++ $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R ++ $(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true ++endef ++ ++ ++### Core package ### ++define Package/luci-lib-core ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=8. Libraries ++ DEPENDS:=+lua +libuci-lua +libubus-lua ++ TITLE:=LuCI core libraries ++endef ++ ++define Package/luci-lib-core/install ++ $(call Package/luci/install/template,$(1),libs/core) ++ $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \ ++ "OpenWrt Firmware" \ ++ "$(OPENWRTVERSION)" \ ++ "$(PKG_BRANCH)" \ ++ "$(PKG_VERSION)" ++endef ++ ++define Package/luci-lib-core/config ++ choice ++ prompt "Build Target" ++ default PACKAGE_luci-lib-core_source ++ ++ config PACKAGE_luci-lib-core_compile ++ bool "Precompiled" ++ ++ config PACKAGE_luci-lib-core_stripped ++ bool "Stripped" ++ ++ config PACKAGE_luci-lib-core_srcdiet ++ bool "Compressed Source" ++ ++ config PACKAGE_luci-lib-core_source ++ bool "Full Source" ++ ++ endchoice ++endef ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core_compile),) ++ LUA_TARGET:=compile ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),) ++ LUA_TARGET:=strip ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),) ++ LUA_TARGET:=diet ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core),) ++ LUCI_SELECTED_MODULES+=libs/core ++endif ++ ++LUCI_BUILD_PACKAGES += luci-lib-core ++ ++ ++### Libraries ### ++define library ++ define Package/luci-lib-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=8. Libraries ++ TITLE:=$(if $(2),$(2),LuCI $(1) library) ++ $(if $(3),DEPENDS:=+luci-lib-core $(3)) ++ endef ++ ++ define Package/luci-lib-$(1)/install ++ $(call Package/luci/install/template,$$(1),libs/$(1)) ++ $(call Package/luci-lib-$(1)/extra-install) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-lib-$(1)),) ++ LUCI_SELECTED_MODULES+=libs/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-lib-$(1) ++endef ++ ++define Package/luci-lib-web/conffiles ++/etc/config/luci ++endef ++ ++define Package/luci-lib-nixio/config ++ choice ++ prompt "TLS Provider" ++ default PACKAGE_luci-lib-nixio_notls ++ ++ config PACKAGE_luci-lib-nixio_notls ++ bool "Disabled" ++ ++ config PACKAGE_luci-lib-nixio_axtls ++ bool "Builtin (axTLS)" ++ ++ config PACKAGE_luci-lib-nixio_cyassl ++ bool "CyaSSL" ++ select PACKAGE_libcyassl ++ ++ config PACKAGE_luci-lib-nixio_openssl ++ bool "OpenSSL" ++ select PACKAGE_libopenssl ++ endchoice ++endef ++ ++ ++NIXIO_TLS:= ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_axtls),) ++ NIXIO_TLS:=axtls ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_openssl),) ++ NIXIO_TLS:=openssl ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),) ++ NIXIO_TLS:=cyassl ++ LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl ++endif ++ ++ ++$(eval $(call library,fastindex,Fastindex indexing module,+PACKAGE_luci-lib-fastindex:liblua)) ++$(eval $(call library,httpclient,HTTP(S) client library,+luci-lib-web +luci-lib-nixio)) ++$(eval $(call library,ipkg,LuCI IPKG/OPKG call abstraction library)) ++$(eval $(call library,json,LuCI JSON library)) ++$(eval $(call library,lucid,LuCId Full-Stack Webserver,+luci-lib-nixio +luci-lib-web +luci-lib-px5g)) ++$(eval $(call library,lucid-http,LuCId HTTP Backend,+luci-lib-lucid)) ++$(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid)) ++$(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl)) ++$(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio)) ++$(eval $(call library,sys,LuCI Linux/POSIX system library)) ++$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi)) ++ ++ ++### Protocols ### ++define protocol ++ define Package/luci-proto-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=6. Protocols ++ TITLE:=$(if $(2),$(2),LuCI $(1) protocol support) ++ DEPENDS:=$(3) ++ endef ++ ++ define Package/luci-proto-$(1)/install ++ $(call Package/luci/install/template,$$(1),protocols/$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-proto-$(1)),) ++ LUCI_SELECTED_MODULES+=protocols/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-proto-$(1) ++endef ++ ++$(eval $(call protocol,core,Support for static/dhcp/none)) ++$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP)) ++$(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd,+PACKAGE_luci-proto-ipv6:6in4 +PACKAGE_luci-proto-ipv6:6to4 +PACKAGE_luci-proto-ipv6:6rd +PACKAGE_luci-proto-ipv6:ipv6-support)) ++$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt)) ++$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd)) ++ ++ ++### Community Packages ### ++define Package/luci-mod-freifunk-community ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk Community Meta-Package ++ DEPENDS+= \ ++ +luci-lib-web +luci-app-splash +luci-i18n-german \ ++ +PACKAGE_luci-mod-freifunk-community:olsrd +PACKAGE_luci-mod-freifunk-community:olsrd-mod-dyn-gw-plain \ ++ +PACKAGE_luci-mod-freifunk-community:olsrd-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-mod-nameservice \ ++ +PACKAGE_luci-mod-freifunk-community:olsrd-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ ++ +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr \ ++ +luci-app-olsr-services +freifunk-gwcheck +freifunk-mapupdate ++endef ++ ++define Package/luci-mod-freifunk-community/install ++ $(call Package/luci/install/template,$(1),applications/freifunk-community) ++endef ++ ++ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk-community),) ++ LUCI_SELECTED_MODULES+=applications/freifunk-community ++endif ++ ++LUCI_BUILD_PACKAGES += luci-mod-freifunk-community ++ ++ ++### Modules ### ++define module ++ define Package/luci-mod-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=2. Modules ++ TITLE:=$(if $(2),$(2),LuCI $(1) module) ++ $(if $(3),DEPENDS+=$(3)) ++ endef ++ ++ define Package/luci-mod-$(1)/install ++ $(call Package/luci/install/template,$$(1),modules/$(1)) ++ $(call Package/luci-mod-$(1)/extra-install) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-mod-$(1)),) ++ LUCI_SELECTED_MODULES+=modules/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-mod-$(1) ++endef ++ ++ ++define Package/luci-mod-admin-core/extra-install ++ touch $(1)/etc/init.d/luci_fixtime || true ++endef ++ ++$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english)) ++$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN)) ++$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg)) ++$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-mod-admin-core)) ++$(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json)) ++$(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall +freifunk-common +community-profiles)) ++$(eval $(call module,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN)) ++ ++ ++### Applications ### ++define application ++ define Package/luci-app-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=3. Applications ++ TITLE:=$(if $(2),$(2),LuCI $(1) application) ++ DEPENDS:=$(3) ++ endef ++ ++ define Package/luci-app-$(1)/install ++ $(call Package/luci/install/template,$$(1),applications/luci-$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-app-$(1)),) ++ LUCI_SELECTED_MODULES+=applications/luci-$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-app-$(1) ++endef ++ ++define Package/luci-app-splash/conffiles ++/etc/config/luci_splash ++/usr/lib/luci-splash/splashtext.html ++endef ++ ++define Package/luci-app-statistics/conffiles ++/etc/config/luci_statistics ++endef ++ ++define Package/luci-app-diag-devinfo/conffiles ++/etc/config/luci_devinfo ++endef ++ ++ ++$(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\ ++ +PACKAGE_luci-app-siitwizard:kmod-siit)) ++ ++$(eval $(call application,firewall,Firewall and Portforwarding application,\ ++ +PACKAGE_luci-app-firewall:firewall3)) ++ ++$(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic,\ ++ +PACKAGE_luci-app-freifunk-policyrouting:freifunk-policyrouting)) ++ ++$(eval $(call application,freifunk-widgets,Widgets for the Freifunk index page,\ ++ +PACKAGE_luci-app-freifunk-widgets:luci-mod-freifunk)) ++ ++$(eval $(call application,meshwizard, Shellscript based wizard to setup mesh networks,\ ++ +PACKAGE_luci-app-freifunk-meshwizard:meshwizard)) ++ ++$(eval $(call application,olsr,OLSR configuration and status module,\ ++ +olsrd +olsrd-mod-txtinfo)) ++ ++$(eval $(call application,olsr-viz,OLSR Visualisation,\ ++ luci-app-olsr +olsrd-mod-txtinfo)) ++ ++$(eval $(call application,freifunk-diagnostics,Tools for network diagnosis like traceroute and ping)) ++ ++$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\ ++ luci-app-olsr +olsrd-mod-nameservice)) ++ ++$(eval $(call application,qos,Quality of Service configuration module,\ ++ +PACKAGE_luci-app-qos:qos-scripts)) ++ ++$(eval $(call application,splash,Freifunk DHCP-Splash application,\ ++ +luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt)) ++ ++$(eval $(call application,statistics,LuCI Statistics Application,\ ++ +PACKAGE_luci-app-statistics:collectd \ ++ +PACKAGE_luci-app-statistics:rrdtool1 \ ++ +PACKAGE_luci-app-statistics:collectd-mod-rrdtool \ ++ +PACKAGE_luci-app-statistics:collectd-mod-iwinfo \ ++ +PACKAGE_luci-app-statistics:collectd-mod-interface \ ++ +PACKAGE_luci-app-statistics:collectd-mod-load)) \ ++ +PACKAGE_luci-app-statistics:collectd-mod-network)) ++ ++ ++$(eval $(call application,diag-core,LuCI Diagnostics Tools (Core))) ++ ++$(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\ ++ +luci-app-diag-core \ ++ +PACKAGE_luci-app-diag-devinfo:smap \ ++ +PACKAGE_luci-app-diag-devinfo:netdiscover \ ++ +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \ ++ +PACKAGE_luci-app-diag-devinfo:httping \ ++ +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \ ++ +PACKAGE_luci-app-diag-devinfo:netdiscover-to-devinfo)) ++ ++$(eval $(call application,voice-core,LuCI Voice Software (Core))) ++ ++$(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),\ ++ luci-app-diag-devinfo)) ++ ++$(eval $(call application,commands,LuCI Shell Command Module)) ++ ++$(eval $(call application,upnp,Universal Plug & Play configuration module,\ ++ +PACKAGE_luci-app-upnp:miniupnpd)) ++ ++$(eval $(call application,ntpc,NTP time synchronisation configuration module,\ ++ +PACKAGE_luci-app-ntpc:ntpclient)) ++ ++$(eval $(call application,ddns,Dynamic DNS configuration module,\ ++ +PACKAGE_luci-app-ddns:ddns-scripts)) ++ ++$(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,\ ++ +PACKAGE_luci-app-samba:samba36-server)) ++ ++$(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,\ ++ +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio)) ++ ++$(eval $(call application,p910nd,p910nd - Printer server module,\ ++ +PACKAGE_luci-app-p910nd:p910nd)) ++ ++$(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,\ ++ +PACKAGE_luci-app-ushare:ushare)) ++ ++$(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,\ ++ +PACKAGE_luci-app-hd-idle:hd-idle)) ++ ++$(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,\ ++ +PACKAGE_luci-app-tinyproxy:tinyproxy)) ++ ++$(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\ ++ +PACKAGE_luci-app-polipo:polipo)) ++ ++$(eval $(call application,openvpn,LuCI Support for OpenVPN,\ ++ +PACKAGE_luci-app-openvpn:openvpn @BROKEN)) ++ ++$(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\ ++ luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock)) ++ ++$(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,\ ++ luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan)) ++ ++$(eval $(call application,wol,LuCI Support for Wake-on-LAN,\ ++ +PACKAGE_luci-app-wol:etherwake)) ++ ++$(eval $(call application,vnstat,LuCI Support for VnStat,\ ++ +PACKAGE_luci-app-vnstat:vnstat \ ++ +PACKAGE_luci-app-vnstat:vnstati)) ++ ++$(eval $(call application,radvd,LuCI Support for Radvd,\ ++ +PACKAGE_luci-app-radvd:radvd)) ++ ++$(eval $(call application,ahcp,LuCI Support for AHCPd,\ ++ +PACKAGE_luci-app-ahcp:ahcpd)) ++ ++$(eval $(call application,wshaper,LuCI Support for wshaper,\ ++ +PACKAGE_luci-app-wshaper:wshaper)) ++ ++$(eval $(call application,pbx,LuCI PBX Administration,\ ++ +PACKAGE_luci-app-pbx:asterisk18 \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-authenticate \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-disa \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-setcallerid \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-system \ ++ +PACKAGE_luci-app-pbx:asterisk18-chan-gtalk \ ++ +PACKAGE_luci-app-pbx:asterisk18-codec-a-mu \ ++ +PACKAGE_luci-app-pbx:asterisk18-codec-alaw \ ++ +PACKAGE_luci-app-pbx:asterisk18-func-cut \ ++ +PACKAGE_luci-app-pbx:asterisk18-res-clioriginate \ ++ +PACKAGE_luci-app-pbx:asterisk18-func-channel \ ++ +PACKAGE_luci-app-pbx:asterisk18-chan-local \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-record \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-senddtmf \ ++ +PACKAGE_luci-app-pbx:asterisk18-res-crypto)) ++ ++$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,\ ++ luci-app-pbx +PACKAGE_luci-app-pbx-voicemail:msmtp \ ++ +PACKAGE_luci-app-pbx-voicemail:coreutils-base64)) ++ ++$(eval $(call application,ltqtapi,Lantiq voip)) ++ ++$(eval $(call application,minidlna,LuCI Support for miniDLNA,\ ++ +PACKAGE_luci-app-minidlna:minidlna)) ++ ++$(eval $(call application,transmission,LuCI Support for Transmission,\ ++ +PACKAGE_luci-app-transmission:transmission-daemon)) ++ ++$(eval $(call application,watchcat,LuCI Support for Watchcat,\ ++ +PACKAGE_luci-app-watchcat:watchcat)) ++ ++### Server Gateway Interfaces ### ++define sgi ++ define Package/luci-sgi-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=7. Server Interfaces ++ TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface) ++ DEPENDS:=$(3) ++ endef ++ ++ define Package/luci-sgi-$(1)/install ++ $(call Package/luci/install/template,$$(1),libs/sgi-$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-sgi-$(1)),) ++ LUCI_SELECTED_MODULES+=libs/sgi-$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-sgi-$(1) ++endef ++ ++$(eval $(call sgi,cgi,CGI Gateway behind existing Webserver)) ++$(eval $(call sgi,uhttpd,Binding for the uHTTPd server,+uhttpd +uhttpd-mod-lua)) ++ ++ ++### Themes ### ++define theme ++ define Package/luci-theme-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ SUBMENU:=4. Themes ++ TITLE:=$(if $(2),$(2),LuCI $(1) theme) ++ MAINTAINER:=$(if $(3),$(3),LuCI Development Team ) ++ DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4) ++ $(if $(5),DEFAULT:=PACKAGE_luci-lib-core) ++ endef ++ ++ define Package/luci-theme-$(1)/install ++ $(call Package/luci/install/template,$$(1),themes/$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-theme-$(1)),) ++ LUCI_SELECTED_MODULES+=themes/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-theme-$(1) ++endef ++ ++$(eval $(call theme,base,Common base for all themes)) ++$(eval $(call theme,openwrt,OpenWrt.org (default),,,1)) ++$(eval $(call theme,bootstrap,Bootstrap Theme)) ++ ++$(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\ ++ Stefan Pirwitz )) ++ ++$(eval $(call theme,freifunk-generic,Freifunk Generic Theme,\ ++ Manuel Munz )) ++ ++### Translations ### ++define translation ++ define Package/luci-i18n-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=5. Translations ++ TITLE:=$(if $(2),$(2),$(1)) ++ endef ++ ++ define Package/luci-i18n-$(1)/install ++ $(call Package/luci/install/template,$$(1),i18n/$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-i18n-$(1)),) ++ LUCI_SELECTED_MODULES+=i18n/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-i18n-$(1) ++endef ++ ++$(eval $(call translation,german,German)) ++$(eval $(call translation,english,English)) ++$(eval $(call translation,french,French (by Florian Fainelli))) ++$(eval $(call translation,italian,Italian (by Matteo Croce))) ++$(eval $(call translation,russian,Russian (by Skryabin Dmitry))) ++$(eval $(call translation,portuguese-brazilian,Portuguese (Brazilian) (by Carlos Cesario))) ++$(eval $(call translation,chinese,Chinese (by Chinese Translators))) ++$(eval $(call translation,japanese,Japanese (by Tsukasa Hamano))) ++$(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis))) ++$(eval $(call translation,catalan,Catalan (by Eduard Duran))) ++$(eval $(call translation,portuguese,Portuguese (by Jose Monteiro))) ++$(eval $(call translation,spanish,Spanish (by Guillermo Javier Nardoni))) ++$(eval $(call translation,vietnamese,Vietnamese (by Hong Phuc Dang))) ++$(eval $(call translation,malay,Malay (by Teow Wai Chet))) ++$(eval $(call translation,norwegian,Norwegian (by Lars Hardy))) ++$(eval $(call translation,hebrew,Hebrew)) ++$(eval $(call translation,romanian,Romanian)) ++$(eval $(call translation,ukrainian,Ukrainian)) ++$(eval $(call translation,hungarian,Hungarian)) ++$(eval $(call translation,polish,Polish)) ++ ++ ++### Collections ### ++define collection ++ define Package/luci$(if $(1),-$(1)) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=1. Collections ++ TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection) ++ $(if $(3),DEPENDS:=$(3)) ++ endef ++ ++ define Package/luci$(if $(1),-$(1))/install ++ true ++ endef ++ ++ LUCI_BUILD_PACKAGES += luci$(if $(1),-$(1)) ++endef ++ ++$(eval $(call collection,,\ ++ Standard OpenWrt set including full admin with ppp support and the \ ++ default OpenWrt theme,\ ++ +uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-openwrt \ ++ +luci-app-firewall +luci-proto-core +luci-proto-ppp +libiwinfo-lua)) ++ ++$(eval $(call collection,ssl,\ ++ Standard OpenWrt set with HTTPS support,\ ++ +luci +libustream-cyassl +px5g)) ++ ++$(eval $(call collection,light,\ ++ Minimum package set using only admin mini and the standard theme,\ ++ +uhttpd +luci-mod-admin-mini +luci-theme-openwrt @BROKEN)) ++ ++ ++### Compile ### ++PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ifeq ($(USELOCAL),1) ++ define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(TAR) c -C ../../../ . \ ++ --exclude=.pc --exclude=.svn --exclude=.git \ ++ --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ ++ --exclude=dist | \ ++ tar x -C $(PKG_BUILD_DIR)/ ++ endef ++endif ++ ++define Build/Configure ++endef ++ ++MAKE_FLAGS += \ ++ MODULES="$(LUCI_SELECTED_MODULES)" \ ++ LUA_TARGET="$(LUA_TARGET)" \ ++ LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ ++ CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ ++ NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" ++ ++ ++$(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b)))) +diff --git a/feeds/luci/luci/Makefile b/feeds/luci/luci/Makefile +new file mode 100644 +index 0000000..63b1196 +--- /dev/null ++++ b/feeds/luci/luci/Makefile +@@ -0,0 +1,644 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_BRANCH:=trunk ++ ++ifeq ($(DUMP),) ++ USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1) ++endif ++ ++PKG_NAME:=luci ++PKG_RELEASE:=1 ++ ++PKG_BUILD_PARALLEL:=0 ++ ++ifeq ($(USELOCAL),1) ++ PKG_VERSION:=trunk+svn ++else ++ PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) ++ ifeq ($(DUMP),) ++ PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p') ++ PKG_VERSION:=trunk+svn$(PKG_REV) ++ endif ++ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++ PKG_SOURCE_PROTO:=svn ++ PKG_SOURCE_VERSION:=$(PKG_REV) ++endif ++ ++PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install ++ ++LUA_TARGET:=source ++LUCI_CFLAGS:= ++LUCI_BUILD_PACKAGES:= ++LUCI_SELECTED_MODULES:= ++ ++ifeq ($(BOARD),brcm-2.4) ++ MAKE_FLAGS += CRAP="1" ++endif ++ ++ ++### Templates ### ++define Package/luci/install/template ++ $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R ++ $(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true ++endef ++ ++ ++### Core package ### ++define Package/luci-lib-core ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=8. Libraries ++ DEPENDS:=+lua +libuci-lua +libubus-lua ++ TITLE:=LuCI core libraries ++endef ++ ++define Package/luci-lib-core/install ++ $(call Package/luci/install/template,$(1),libs/core) ++ $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \ ++ "OpenWrt Firmware" \ ++ "$(OPENWRTVERSION)" \ ++ "$(PKG_BRANCH)" \ ++ "$(PKG_VERSION)" ++endef ++ ++define Package/luci-lib-core/config ++ choice ++ prompt "Build Target" ++ default PACKAGE_luci-lib-core_source ++ ++ config PACKAGE_luci-lib-core_compile ++ bool "Precompiled" ++ ++ config PACKAGE_luci-lib-core_stripped ++ bool "Stripped" ++ ++ config PACKAGE_luci-lib-core_srcdiet ++ bool "Compressed Source" ++ ++ config PACKAGE_luci-lib-core_source ++ bool "Full Source" ++ ++ endchoice ++endef ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core_compile),) ++ LUA_TARGET:=compile ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),) ++ LUA_TARGET:=strip ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),) ++ LUA_TARGET:=diet ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-core),) ++ LUCI_SELECTED_MODULES+=libs/core ++endif ++ ++LUCI_BUILD_PACKAGES += luci-lib-core ++ ++ ++### Libraries ### ++define library ++ define Package/luci-lib-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=8. Libraries ++ TITLE:=$(if $(2),$(2),LuCI $(1) library) ++ $(if $(3),DEPENDS:=+luci-lib-core $(3)) ++ endef ++ ++ define Package/luci-lib-$(1)/install ++ $(call Package/luci/install/template,$$(1),libs/$(1)) ++ $(call Package/luci-lib-$(1)/extra-install) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-lib-$(1)),) ++ LUCI_SELECTED_MODULES+=libs/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-lib-$(1) ++endef ++ ++define Package/luci-lib-web/conffiles ++/etc/config/luci ++endef ++ ++define Package/luci-lib-nixio/config ++ choice ++ prompt "TLS Provider" ++ default PACKAGE_luci-lib-nixio_notls ++ ++ config PACKAGE_luci-lib-nixio_notls ++ bool "Disabled" ++ ++ config PACKAGE_luci-lib-nixio_axtls ++ bool "Builtin (axTLS)" ++ ++ config PACKAGE_luci-lib-nixio_cyassl ++ bool "CyaSSL" ++ select PACKAGE_libcyassl ++ ++ config PACKAGE_luci-lib-nixio_openssl ++ bool "OpenSSL" ++ select PACKAGE_libopenssl ++ endchoice ++endef ++ ++ ++NIXIO_TLS:= ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_axtls),) ++ NIXIO_TLS:=axtls ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_openssl),) ++ NIXIO_TLS:=openssl ++endif ++ ++ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),) ++ NIXIO_TLS:=cyassl ++ LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl ++endif ++ ++ ++$(eval $(call library,fastindex,Fastindex indexing module,+PACKAGE_luci-lib-fastindex:liblua)) ++$(eval $(call library,httpclient,HTTP(S) client library,+luci-lib-web +luci-lib-nixio)) ++$(eval $(call library,ipkg,LuCI IPKG/OPKG call abstraction library)) ++$(eval $(call library,json,LuCI JSON library)) ++$(eval $(call library,lucid,LuCId Full-Stack Webserver,+luci-lib-nixio +luci-lib-web +luci-lib-px5g)) ++$(eval $(call library,lucid-http,LuCId HTTP Backend,+luci-lib-lucid)) ++$(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid)) ++$(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl)) ++$(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio)) ++$(eval $(call library,sys,LuCI Linux/POSIX system library)) ++$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi)) ++ ++ ++### Protocols ### ++define protocol ++ define Package/luci-proto-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=6. Protocols ++ TITLE:=$(if $(2),$(2),LuCI $(1) protocol support) ++ DEPENDS:=$(3) ++ endef ++ ++ define Package/luci-proto-$(1)/install ++ $(call Package/luci/install/template,$$(1),protocols/$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-proto-$(1)),) ++ LUCI_SELECTED_MODULES+=protocols/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-proto-$(1) ++endef ++ ++$(eval $(call protocol,core,Support for static/dhcp/none)) ++$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP)) ++$(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd,+PACKAGE_luci-proto-ipv6:6in4 +PACKAGE_luci-proto-ipv6:6to4 +PACKAGE_luci-proto-ipv6:6rd +PACKAGE_luci-proto-ipv6:ipv6-support)) ++$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt)) ++$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd)) ++ ++ ++### Community Packages ### ++define Package/luci-mod-freifunk-community ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk Community Meta-Package ++ DEPENDS+= \ ++ +luci-lib-web +luci-app-splash +luci-i18n-german \ ++ +PACKAGE_luci-mod-freifunk-community:olsrd +PACKAGE_luci-mod-freifunk-community:olsrd-mod-dyn-gw-plain \ ++ +PACKAGE_luci-mod-freifunk-community:olsrd-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-mod-nameservice \ ++ +PACKAGE_luci-mod-freifunk-community:olsrd-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ ++ +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr \ ++ +luci-app-olsr-services +freifunk-gwcheck +freifunk-mapupdate ++endef ++ ++define Package/luci-mod-freifunk-community/install ++ $(call Package/luci/install/template,$(1),applications/freifunk-community) ++endef ++ ++ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk-community),) ++ LUCI_SELECTED_MODULES+=applications/freifunk-community ++endif ++ ++LUCI_BUILD_PACKAGES += luci-mod-freifunk-community ++ ++ ++### Modules ### ++define module ++ define Package/luci-mod-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=2. Modules ++ TITLE:=$(if $(2),$(2),LuCI $(1) module) ++ $(if $(3),DEPENDS+=$(3)) ++ endef ++ ++ define Package/luci-mod-$(1)/install ++ $(call Package/luci/install/template,$$(1),modules/$(1)) ++ $(call Package/luci-mod-$(1)/extra-install) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-mod-$(1)),) ++ LUCI_SELECTED_MODULES+=modules/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-mod-$(1) ++endef ++ ++ ++define Package/luci-mod-admin-core/extra-install ++ touch $(1)/etc/init.d/luci_fixtime || true ++endef ++ ++$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english)) ++$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN)) ++$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg)) ++$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-mod-admin-core)) ++$(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json)) ++$(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall +freifunk-common +community-profiles)) ++$(eval $(call module,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN)) ++ ++ ++### Applications ### ++define application ++ define Package/luci-app-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=3. Applications ++ TITLE:=$(if $(2),$(2),LuCI $(1) application) ++ DEPENDS:=$(3) ++ endef ++ ++ define Package/luci-app-$(1)/install ++ $(call Package/luci/install/template,$$(1),applications/luci-$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-app-$(1)),) ++ LUCI_SELECTED_MODULES+=applications/luci-$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-app-$(1) ++endef ++ ++define Package/luci-app-splash/conffiles ++/etc/config/luci_splash ++/usr/lib/luci-splash/splashtext.html ++endef ++ ++define Package/luci-app-statistics/conffiles ++/etc/config/luci_statistics ++endef ++ ++define Package/luci-app-diag-devinfo/conffiles ++/etc/config/luci_devinfo ++endef ++ ++ ++$(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\ ++ +PACKAGE_luci-app-siitwizard:kmod-siit)) ++ ++$(eval $(call application,firewall,Firewall and Portforwarding application,\ ++ +PACKAGE_luci-app-firewall:firewall3)) ++ ++$(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic,\ ++ +PACKAGE_luci-app-freifunk-policyrouting:freifunk-policyrouting)) ++ ++$(eval $(call application,freifunk-widgets,Widgets for the Freifunk index page,\ ++ +PACKAGE_luci-app-freifunk-widgets:luci-mod-freifunk)) ++ ++$(eval $(call application,meshwizard, Shellscript based wizard to setup mesh networks,\ ++ +PACKAGE_luci-app-freifunk-meshwizard:meshwizard)) ++ ++$(eval $(call application,olsr,OLSR configuration and status module,\ ++ +olsrd +olsrd-mod-txtinfo)) ++ ++$(eval $(call application,olsr-viz,OLSR Visualisation,\ ++ luci-app-olsr +olsrd-mod-txtinfo)) ++ ++$(eval $(call application,freifunk-diagnostics,Tools for network diagnosis like traceroute and ping)) ++ ++$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\ ++ luci-app-olsr +olsrd-mod-nameservice)) ++ ++$(eval $(call application,qos,Quality of Service configuration module,\ ++ +PACKAGE_luci-app-qos:qos-scripts)) ++ ++$(eval $(call application,splash,Freifunk DHCP-Splash application,\ ++ +luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt)) ++ ++$(eval $(call application,statistics,LuCI Statistics Application,\ ++ +PACKAGE_luci-app-statistics:collectd \ ++ +PACKAGE_luci-app-statistics:rrdtool1 \ ++ +PACKAGE_luci-app-statistics:collectd-mod-rrdtool \ ++ +PACKAGE_luci-app-statistics:collectd-mod-iwinfo \ ++ +PACKAGE_luci-app-statistics:collectd-mod-interface \ ++ +PACKAGE_luci-app-statistics:collectd-mod-load)) \ ++ +PACKAGE_luci-app-statistics:collectd-mod-network)) ++ ++ ++$(eval $(call application,diag-core,LuCI Diagnostics Tools (Core))) ++ ++$(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\ ++ +luci-app-diag-core \ ++ +PACKAGE_luci-app-diag-devinfo:smap \ ++ +PACKAGE_luci-app-diag-devinfo:netdiscover \ ++ +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \ ++ +PACKAGE_luci-app-diag-devinfo:httping \ ++ +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \ ++ +PACKAGE_luci-app-diag-devinfo:netdiscover-to-devinfo)) ++ ++$(eval $(call application,voice-core,LuCI Voice Software (Core))) ++ ++$(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),\ ++ luci-app-diag-devinfo)) ++ ++$(eval $(call application,commands,LuCI Shell Command Module)) ++ ++$(eval $(call application,upnp,Universal Plug & Play configuration module,\ ++ +PACKAGE_luci-app-upnp:miniupnpd)) ++ ++$(eval $(call application,ntpc,NTP time synchronisation configuration module,\ ++ +PACKAGE_luci-app-ntpc:ntpclient)) ++ ++$(eval $(call application,ddns,Dynamic DNS configuration module,\ ++ +PACKAGE_luci-app-ddns:ddns-scripts)) ++ ++$(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,\ ++ +PACKAGE_luci-app-samba:samba36-server)) ++ ++$(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,\ ++ +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio)) ++ ++$(eval $(call application,p910nd,p910nd - Printer server module,\ ++ +PACKAGE_luci-app-p910nd:p910nd)) ++ ++$(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,\ ++ +PACKAGE_luci-app-ushare:ushare)) ++ ++$(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,\ ++ +PACKAGE_luci-app-hd-idle:hd-idle)) ++ ++$(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,\ ++ +PACKAGE_luci-app-tinyproxy:tinyproxy)) ++ ++$(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\ ++ +PACKAGE_luci-app-polipo:polipo)) ++ ++$(eval $(call application,openvpn,LuCI Support for OpenVPN,\ ++ +PACKAGE_luci-app-openvpn:openvpn @BROKEN)) ++ ++$(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\ ++ luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock)) ++ ++$(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,\ ++ luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan)) ++ ++$(eval $(call application,wol,LuCI Support for Wake-on-LAN,\ ++ +PACKAGE_luci-app-wol:etherwake)) ++ ++$(eval $(call application,vnstat,LuCI Support for VnStat,\ ++ +PACKAGE_luci-app-vnstat:vnstat \ ++ +PACKAGE_luci-app-vnstat:vnstati)) ++ ++$(eval $(call application,radvd,LuCI Support for Radvd,\ ++ +PACKAGE_luci-app-radvd:radvd)) ++ ++$(eval $(call application,ahcp,LuCI Support for AHCPd,\ ++ +PACKAGE_luci-app-ahcp:ahcpd)) ++ ++$(eval $(call application,wshaper,LuCI Support for wshaper,\ ++ +PACKAGE_luci-app-wshaper:wshaper)) ++ ++$(eval $(call application,pbx,LuCI PBX Administration,\ ++ +PACKAGE_luci-app-pbx:asterisk18 \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-authenticate \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-disa \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-setcallerid \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-system \ ++ +PACKAGE_luci-app-pbx:asterisk18-chan-gtalk \ ++ +PACKAGE_luci-app-pbx:asterisk18-codec-a-mu \ ++ +PACKAGE_luci-app-pbx:asterisk18-codec-alaw \ ++ +PACKAGE_luci-app-pbx:asterisk18-func-cut \ ++ +PACKAGE_luci-app-pbx:asterisk18-res-clioriginate \ ++ +PACKAGE_luci-app-pbx:asterisk18-func-channel \ ++ +PACKAGE_luci-app-pbx:asterisk18-chan-local \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-record \ ++ +PACKAGE_luci-app-pbx:asterisk18-app-senddtmf \ ++ +PACKAGE_luci-app-pbx:asterisk18-res-crypto)) ++ ++$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,\ ++ luci-app-pbx +PACKAGE_luci-app-pbx-voicemail:msmtp \ ++ +PACKAGE_luci-app-pbx-voicemail:coreutils-base64)) ++ ++$(eval $(call application,ltqtapi,Lantiq voip)) ++ ++$(eval $(call application,minidlna,LuCI Support for miniDLNA,\ ++ +PACKAGE_luci-app-minidlna:minidlna)) ++ ++$(eval $(call application,transmission,LuCI Support for Transmission,\ ++ +PACKAGE_luci-app-transmission:transmission-daemon)) ++ ++$(eval $(call application,watchcat,LuCI Support for Watchcat,\ ++ +PACKAGE_luci-app-watchcat:watchcat)) ++ ++### Server Gateway Interfaces ### ++define sgi ++ define Package/luci-sgi-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=7. Server Interfaces ++ TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface) ++ DEPENDS:=$(3) ++ endef ++ ++ define Package/luci-sgi-$(1)/install ++ $(call Package/luci/install/template,$$(1),libs/sgi-$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-sgi-$(1)),) ++ LUCI_SELECTED_MODULES+=libs/sgi-$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-sgi-$(1) ++endef ++ ++$(eval $(call sgi,cgi,CGI Gateway behind existing Webserver)) ++$(eval $(call sgi,uhttpd,Binding for the uHTTPd server,+uhttpd +uhttpd-mod-lua)) ++ ++ ++### Themes ### ++define theme ++ define Package/luci-theme-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ SUBMENU:=4. Themes ++ TITLE:=$(if $(2),$(2),LuCI $(1) theme) ++ MAINTAINER:=$(if $(3),$(3),LuCI Development Team ) ++ DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4) ++ $(if $(5),DEFAULT:=PACKAGE_luci-lib-core) ++ endef ++ ++ define Package/luci-theme-$(1)/install ++ $(call Package/luci/install/template,$$(1),themes/$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-theme-$(1)),) ++ LUCI_SELECTED_MODULES+=themes/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-theme-$(1) ++endef ++ ++$(eval $(call theme,base,Common base for all themes)) ++$(eval $(call theme,openwrt,OpenWrt.org (default),,,1)) ++$(eval $(call theme,bootstrap,Bootstrap Theme)) ++ ++$(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\ ++ Stefan Pirwitz )) ++ ++$(eval $(call theme,freifunk-generic,Freifunk Generic Theme,\ ++ Manuel Munz )) ++ ++### Translations ### ++define translation ++ define Package/luci-i18n-$(1) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=5. Translations ++ TITLE:=$(if $(2),$(2),$(1)) ++ endef ++ ++ define Package/luci-i18n-$(1)/install ++ $(call Package/luci/install/template,$$(1),i18n/$(1)) ++ endef ++ ++ ifneq ($(CONFIG_PACKAGE_luci-i18n-$(1)),) ++ LUCI_SELECTED_MODULES+=i18n/$(1) ++ endif ++ ++ LUCI_BUILD_PACKAGES += luci-i18n-$(1) ++endef ++ ++$(eval $(call translation,german,German)) ++$(eval $(call translation,english,English)) ++$(eval $(call translation,french,French (by Florian Fainelli))) ++$(eval $(call translation,italian,Italian (by Matteo Croce))) ++$(eval $(call translation,russian,Russian (by Skryabin Dmitry))) ++$(eval $(call translation,portuguese-brazilian,Portuguese (Brazilian) (by Carlos Cesario))) ++$(eval $(call translation,chinese,Chinese (by Chinese Translators))) ++$(eval $(call translation,japanese,Japanese (by Tsukasa Hamano))) ++$(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis))) ++$(eval $(call translation,catalan,Catalan (by Eduard Duran))) ++$(eval $(call translation,portuguese,Portuguese (by Jose Monteiro))) ++$(eval $(call translation,spanish,Spanish (by Guillermo Javier Nardoni))) ++$(eval $(call translation,vietnamese,Vietnamese (by Hong Phuc Dang))) ++$(eval $(call translation,malay,Malay (by Teow Wai Chet))) ++$(eval $(call translation,norwegian,Norwegian (by Lars Hardy))) ++$(eval $(call translation,hebrew,Hebrew)) ++$(eval $(call translation,romanian,Romanian)) ++$(eval $(call translation,ukrainian,Ukrainian)) ++$(eval $(call translation,hungarian,Hungarian)) ++$(eval $(call translation,polish,Polish)) ++ ++ ++### Collections ### ++define collection ++ define Package/luci$(if $(1),-$(1)) ++ SECTION:=luci ++ CATEGORY:=LuCI ++ TITLE:=LuCI - Lua Configuration Interface ++ URL:=http://luci.subsignal.org/ ++ MAINTAINER:=LuCI Development Team ++ SUBMENU:=1. Collections ++ TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection) ++ $(if $(3),DEPENDS:=$(3)) ++ endef ++ ++ define Package/luci$(if $(1),-$(1))/install ++ true ++ endef ++ ++ LUCI_BUILD_PACKAGES += luci$(if $(1),-$(1)) ++endef ++ ++$(eval $(call collection,,\ ++ Standard OpenWrt set including full admin with ppp support and the \ ++ default OpenWrt theme,\ ++ +uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-openwrt \ ++ +luci-app-firewall +luci-proto-core +luci-proto-ppp +libiwinfo-lua)) ++ ++$(eval $(call collection,ssl,\ ++ Standard OpenWrt set with HTTPS support,\ ++ +luci +libustream-cyassl +px5g)) ++ ++$(eval $(call collection,light,\ ++ Minimum package set using only admin mini and the standard theme,\ ++ +uhttpd +luci-mod-admin-mini +luci-theme-openwrt @BROKEN)) ++ ++ ++### Compile ### ++PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ifeq ($(USELOCAL),1) ++ define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(TAR) c -C ../../../ . \ ++ --exclude=.pc --exclude=.svn --exclude=.git \ ++ --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ ++ --exclude=dist | \ ++ tar x -C $(PKG_BUILD_DIR)/ ++ endef ++endif ++ ++define Build/Configure ++endef ++ ++MAKE_FLAGS += \ ++ MODULES="$(LUCI_SELECTED_MODULES)" \ ++ LUA_TARGET="$(LUA_TARGET)" \ ++ LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ ++ CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ ++ NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" ++ ++ ++$(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b)))) +diff --git a/feeds/luci/luci/ipkg/.svn/all-wcprops b/feeds/luci/luci/ipkg/.svn/all-wcprops +new file mode 100644 +index 0000000..17fb403 +--- /dev/null ++++ b/feeds/luci/luci/ipkg/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 51 ++/!svn/ver/3591/luci/trunk/contrib/package/luci/ipkg ++END +diff --git a/feeds/luci/luci/ipkg/.svn/entries b/feeds/luci/luci/ipkg/.svn/entries +new file mode 100644 +index 0000000..58d3cbd +--- /dev/null ++++ b/feeds/luci/luci/ipkg/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/luci/ipkg ++http://svn.luci.subsignal.org ++ ++ ++ ++2008-06-09T07:56:20.225137Z ++2333 ++Cyrus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ +diff --git a/feeds/luci/meshwizard/.svn/all-wcprops b/feeds/luci/meshwizard/.svn/all-wcprops +new file mode 100644 +index 0000000..ed25bdd +--- /dev/null ++++ b/feeds/luci/meshwizard/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 52 ++/!svn/ver/9676/luci/trunk/contrib/package/meshwizard ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 61 ++/!svn/ver/9659/luci/trunk/contrib/package/meshwizard/Makefile ++END +diff --git a/feeds/luci/meshwizard/.svn/entries b/feeds/luci/meshwizard/.svn/entries +new file mode 100644 +index 0000000..343afbe +--- /dev/null ++++ b/feeds/luci/meshwizard/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:59:46.292037Z ++9676 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a40b7a22f18178073c78176ee48f1482 ++2013-01-29T22:32:03.930461Z ++9659 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++796 ++ +diff --git a/feeds/luci/meshwizard/.svn/text-base/Makefile.svn-base b/feeds/luci/meshwizard/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..91979b7 +--- /dev/null ++++ b/feeds/luci/meshwizard/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=meshwizard ++PKG_RELEASE:=0.0.9-1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/meshwizard ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Shell script based wizard for Mesh networks ++ DEPENDS:=+firewall ++endef ++ ++define Package/meshwizard/description ++ A shellscript based wizard to simplify the setup of a typical mesh node (e.g. for Freifunk.net) ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/meshwizard/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,meshwizard)) +diff --git a/feeds/luci/meshwizard/Makefile b/feeds/luci/meshwizard/Makefile +new file mode 100644 +index 0000000..91979b7 +--- /dev/null ++++ b/feeds/luci/meshwizard/Makefile +@@ -0,0 +1,39 @@ ++# Copyright (C) 2011 Manuel Munz ++# This is free software, licensed under the Apache 2.0 license. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=meshwizard ++PKG_RELEASE:=0.0.9-1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/meshwizard ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Shell script based wizard for Mesh networks ++ DEPENDS:=+firewall ++endef ++ ++define Package/meshwizard/description ++ A shellscript based wizard to simplify the setup of a typical mesh node (e.g. for Freifunk.net) ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/meshwizard/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,meshwizard)) +diff --git a/feeds/luci/meshwizard/files/.svn/all-wcprops b/feeds/luci/meshwizard/files/.svn/all-wcprops +new file mode 100644 +index 0000000..0c764ff +--- /dev/null ++++ b/feeds/luci/meshwizard/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 58 ++/!svn/ver/9676/luci/trunk/contrib/package/meshwizard/files ++END +diff --git a/feeds/luci/meshwizard/files/.svn/entries b/feeds/luci/meshwizard/files/.svn/entries +new file mode 100644 +index 0000000..7aef585 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:59:46.292037Z ++9676 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++usr ++dir ++ ++etc ++dir ++ +diff --git a/feeds/luci/meshwizard/files/etc/.svn/all-wcprops b/feeds/luci/meshwizard/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..b9fd1fb +--- /dev/null ++++ b/feeds/luci/meshwizard/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 62 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/etc ++END +diff --git a/feeds/luci/meshwizard/files/etc/.svn/entries b/feeds/luci/meshwizard/files/etc/.svn/entries +new file mode 100644 +index 0000000..3234d80 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files/etc ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++config ++dir ++ +diff --git a/feeds/luci/meshwizard/files/etc/config/.svn/all-wcprops b/feeds/luci/meshwizard/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..058c0cf +--- /dev/null ++++ b/feeds/luci/meshwizard/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/etc/config ++END ++meshwizard ++K 25 ++svn:wc:ra_dav:version-url ++V 80 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/etc/config/meshwizard ++END +diff --git a/feeds/luci/meshwizard/files/etc/config/.svn/entries b/feeds/luci/meshwizard/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..f187aaa +--- /dev/null ++++ b/feeds/luci/meshwizard/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files/etc/config ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++meshwizard ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++741df6a60029272212af71c78af88f1d ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++134 ++ +diff --git a/feeds/luci/meshwizard/files/etc/config/.svn/text-base/meshwizard.svn-base b/feeds/luci/meshwizard/files/etc/config/.svn/text-base/meshwizard.svn-base +new file mode 100644 +index 0000000..a60b0cc +--- /dev/null ++++ b/feeds/luci/meshwizard/files/etc/config/.svn/text-base/meshwizard.svn-base +@@ -0,0 +1,7 @@ ++config 'netconfig' 'netconfig' ++ ++config 'general' 'general' ++ option 'sharenet' '0' ++ option 'local_restrict' '1' ++ option 'cleanup' '1' ++ +diff --git a/feeds/luci/meshwizard/files/etc/config/meshwizard b/feeds/luci/meshwizard/files/etc/config/meshwizard +new file mode 100644 +index 0000000..a60b0cc +--- /dev/null ++++ b/feeds/luci/meshwizard/files/etc/config/meshwizard +@@ -0,0 +1,7 @@ ++config 'netconfig' 'netconfig' ++ ++config 'general' 'general' ++ option 'sharenet' '0' ++ option 'local_restrict' '1' ++ option 'cleanup' '1' ++ +diff --git a/feeds/luci/meshwizard/files/usr/.svn/all-wcprops b/feeds/luci/meshwizard/files/usr/.svn/all-wcprops +new file mode 100644 +index 0000000..761457b +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 62 ++/!svn/ver/9676/luci/trunk/contrib/package/meshwizard/files/usr ++END +diff --git a/feeds/luci/meshwizard/files/usr/.svn/entries b/feeds/luci/meshwizard/files/usr/.svn/entries +new file mode 100644 +index 0000000..6294772 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files/usr ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:59:46.292037Z ++9676 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++bin ++dir ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/.svn/all-wcprops b/feeds/luci/meshwizard/files/usr/bin/.svn/all-wcprops +new file mode 100644 +index 0000000..7d055e5 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/!svn/ver/9676/luci/trunk/contrib/package/meshwizard/files/usr/bin ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/.svn/entries b/feeds/luci/meshwizard/files/usr/bin/.svn/entries +new file mode 100644 +index 0000000..5d112f8 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files/usr/bin ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:59:46.292037Z ++9676 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++meshwizard ++dir ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/all-wcprops b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/all-wcprops +new file mode 100644 +index 0000000..4896153 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/all-wcprops +@@ -0,0 +1,17 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/!svn/ver/9676/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard ++END ++functions.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 90 ++/!svn/ver/9307/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh ++END ++wizard.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 87 ++/!svn/ver/9676/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/entries b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/entries +new file mode 100644 +index 0000000..ff89f22 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/entries +@@ -0,0 +1,99 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:59:46.292037Z ++9676 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++functions.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++0494e40daa969a828e25c319e1ad1e6d ++2012-09-19T06:28:58.770943Z ++9307 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1191 ++ ++helpers ++dir ++ ++wizard.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++8af07751cfacf24c290dbf7fc5b8a715 ++2013-02-28T19:59:46.292037Z ++9676 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3954 ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/prop-base/wizard.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/prop-base/wizard.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/prop-base/wizard.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/text-base/functions.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/text-base/functions.sh.svn-base +new file mode 100644 +index 0000000..8abdf9f +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/text-base/functions.sh.svn-base +@@ -0,0 +1,59 @@ ++uci_remove_list_element() { ++ local option="$1" ++ local value="$2" ++ local list="$(uci get $option)" ++ local elem ++ ++ uci delete $option ++ for elem in $list; do ++ if [ "$elem" != "$value" ]; then ++ uci add_list $option=$elem ++ fi ++ done ++} ++ ++# Takes 2 arguments ++# $1 = text to be displayed in the output for this section ++# $2 = section (optional) ++uci_commitverbose() { ++ echo "+ $1" ++ uci changes $2 | while read line; do ++ echo " $line" ++ done ++ uci commit $2 ++} ++ ++set_defaults() { ++ for def in $(env |grep "^$1" | sed 's/ /_/g'); do ++ option="${def/$1/}" ++ a="$(echo $option |cut -d '=' -f1)" ++ b="$(echo $option |cut -d '=' -f2-)" ++ b="${b//_/ }" ++ uci set $2.$a="$b" ++ done ++} ++ ++# 3 arguements: 1=config name 2=oldname 3=newname ++section_rename() { ++ uci -q rename $1.$2=$3 && msg_rename $1.$2 $1.$3 || msg_rename_error $1.$2 $1.$3 ++} ++ ++msg_missing_value() { ++ echo -e " \033[1mWarning:\033[0m Configuration option for $2 is missing in $1." ++} ++ ++msg_success() { ++ echo " Finished." ++} ++ ++msg_error() { ++ echo " \033[1mError: \033[0mThere was a problem." ++} ++ ++msg_rename() { ++ echo " Renamed unnamed section $1 to $2." ++} ++ ++msg_rename_error() { ++ echo " \033[1mWarning:\033[0m Could not rename $1 to $2." ++} +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/text-base/wizard.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/text-base/wizard.sh.svn-base +new file mode 100644 +index 0000000..47fc3ca +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/.svn/text-base/wizard.sh.svn-base +@@ -0,0 +1,121 @@ ++#!/bin/sh ++ ++# This collection of scripts will take settings from /etc/config/meshwizard, /etc/config/freifunk ++# and /etc/config/profile_ and setup the router to participate in wireless mesh networks ++ ++# Copyright 2011 Manuel Munz ++ ++# 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 ++ ++. /lib/functions.sh ++ ++echo " ++/* Meshwizard 0.0.9 */ ++" ++ ++# config ++export dir="/usr/bin/meshwizard" ++. $dir/functions.sh ++[ -f /proc/net/ipv6_route ] && export has_ipv6=1 ++ ++# Check which packages we have installed ++export has_luci=FALSE ++opkg list_installed |grep luci-mod-admin > /dev/null && export has_luci=TRUE ++export has_luci_splash=FALSE ++opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=TRUE ++ ++# Check whether we want to cleanup/restore uci config before setting new options ++cleanup=$(uci -q get meshwizard.general.cleanup) ++[ "$cleanup" == 1 ] && $dir/helpers/restore_default_config.sh ++ ++# Rename wifi interfaces ++$dir/helpers/rename-wifi.sh ++ ++# Get community ++community=$(uci -q get meshwizard.community.name || uci -q get freifunk.community.name) ++[ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1 ++export community="$community" ++echo $community ++ ++# Get a list of networks we need to setup ++networks=$(uci show meshwizard.netconfig | grep -v "netconfig=" | sed -e 's/meshwizard.netconfig\.\(.*\)\_.*/\1/' |sort|uniq) ++export networks ++[ -z "$networks" ] && echo "Error: No networks to setup could be found in /etc/config/meshwizard, aborting now." && exit 1 ++ ++# Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community ++# then /etc/config/meshwizard ++# last will overwrite first ++ ++$dir/helpers/read_defaults.sh $community > /tmp/meshwizard.tmp ++while read line; do ++ export "${line//\"/}" ++done < /tmp/meshwizard.tmp ++ ++# Do config ++$dir/helpers/initial_config.sh ++$dir/helpers/setup_dnsmasq.sh ++$dir/helpers/setup_system.sh ++$dir/helpers/setup_olsrd.sh ++$dir/helpers/setup_firewall.sh ++$dir/helpers/setup_ssh.sh ++$dir/helpers/setup_uhttpd.sh ++$dir/helpers/setup_widgets.sh ++ ++if [ "$wan_proto" == "static" ] && [ -n "$wan_ip4addr" ] && [ -n "$wan_netmask" ]; then ++ $dir/helpers/setup_wan_static.sh ++fi ++ ++if [ "$wan_proto" == "dhcp" ]; then ++ $dir/helpers/setup_wan_dhcp.sh ++fi ++ ++if [ "$lan_proto" == "static" ] && [ -n "$lan_ip4addr" ] && [ -n "$lan_netmask" ]; then ++ $dir/helpers/setup_lan_static.sh ++fi ++ ++if [ "$ipv6_enabled" == 1 ] && [ "$has_ipv6" = 1 ]; then ++ $dir/helpers/setup_lan_ipv6.sh ++ # Setup auto-ipv6 ++ if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then ++ $dir/helpers/setup_auto-ipv6.sh ++ fi ++fi ++ ++# Setup policyrouting if internet sharing is disabled and wan is not used for olsrd ++# Always disable it first to make sure its disabled when the user decied to share his internet ++uci set freifunk-policyrouting.pr.enable=0 ++if [ ! "$general_sharenet" == 1 ] && [ ! "$(uci -q get meshwizard.netconfig.wan_proto)" == "olsr" ]; then ++ $dir/helpers/setup_policyrouting.sh ++fi ++ ++# Configure found networks ++for net in $networks; do ++ # radioX devices need to be renamed ++ netrenamed="${net/radio/wireless}" ++ export netrenamed ++ $dir/helpers/setup_network.sh $net ++ if [ ! "$net" == "wan" ] && [ ! "$net" == "lan" ]; then ++ $dir/helpers/setup_wifi.sh $net ++ fi ++ $dir/helpers/setup_olsrd_interface.sh $net ++ ++ net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp) ++ if [ "$net_dhcp" == 1 ]; then ++ $dir/helpers/setup_dhcp.sh $net ++ fi ++ ++ $dir/helpers/setup_splash.sh $net ++ $dir/helpers/setup_firewall_interface.sh $net ++ ++ if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then ++ $dir/helpers/setup_auto-ipv6-interface.sh $net ++ fi ++done ++ ++##### Reboot the router (because simply restarting services gave errors) ++ ++echo "+ The wizard has finished and the router will reboot now." ++ ++reboot +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/functions.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/functions.sh +new file mode 100644 +index 0000000..8abdf9f +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/functions.sh +@@ -0,0 +1,59 @@ ++uci_remove_list_element() { ++ local option="$1" ++ local value="$2" ++ local list="$(uci get $option)" ++ local elem ++ ++ uci delete $option ++ for elem in $list; do ++ if [ "$elem" != "$value" ]; then ++ uci add_list $option=$elem ++ fi ++ done ++} ++ ++# Takes 2 arguments ++# $1 = text to be displayed in the output for this section ++# $2 = section (optional) ++uci_commitverbose() { ++ echo "+ $1" ++ uci changes $2 | while read line; do ++ echo " $line" ++ done ++ uci commit $2 ++} ++ ++set_defaults() { ++ for def in $(env |grep "^$1" | sed 's/ /_/g'); do ++ option="${def/$1/}" ++ a="$(echo $option |cut -d '=' -f1)" ++ b="$(echo $option |cut -d '=' -f2-)" ++ b="${b//_/ }" ++ uci set $2.$a="$b" ++ done ++} ++ ++# 3 arguements: 1=config name 2=oldname 3=newname ++section_rename() { ++ uci -q rename $1.$2=$3 && msg_rename $1.$2 $1.$3 || msg_rename_error $1.$2 $1.$3 ++} ++ ++msg_missing_value() { ++ echo -e " \033[1mWarning:\033[0m Configuration option for $2 is missing in $1." ++} ++ ++msg_success() { ++ echo " Finished." ++} ++ ++msg_error() { ++ echo " \033[1mError: \033[0mThere was a problem." ++} ++ ++msg_rename() { ++ echo " Renamed unnamed section $1 to $2." ++} ++ ++msg_rename_error() { ++ echo " \033[1mWarning:\033[0m Could not rename $1 to $2." ++} +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/all-wcprops b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/all-wcprops +new file mode 100644 +index 0000000..40edcbc +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/all-wcprops +@@ -0,0 +1,191 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 85 ++/!svn/ver/9674/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers ++END ++setup_auto-ipv6-interface.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 114 ++/!svn/ver/8895/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh ++END ++setup_splash.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/!svn/ver/8697/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh ++END ++setup_auto-ipv6.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 104 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh ++END ++setup_ssh.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 98 ++/!svn/ver/8893/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh ++END ++setup_wifi.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 99 ++/!svn/ver/9615/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh ++END ++gen_auto-ipv6-dhcpv6-ip.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 112 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh ++END ++setup_firewall.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 103 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh ++END ++gen_bssid.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 98 ++/!svn/ver/9577/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh ++END ++setup_lan_static.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 105 ++/!svn/ver/8697/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh ++END ++read_defaults.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 102 ++/!svn/ver/9320/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh ++END ++setup_wan_dhcp.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 103 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh ++END ++supports_vap.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/!svn/ver/9612/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh ++END ++check-range-in-range.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 109 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh ++END ++setup_network.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 102 ++/!svn/ver/9659/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh ++END ++ipcalc-cidr.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 100 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh ++END ++setup_wan_static.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 105 ++/!svn/ver/8884/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh ++END ++restore_default_config.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 111 ++/!svn/ver/7611/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh ++END ++initial_config.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 103 ++/!svn/ver/9674/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh ++END ++setup_olsrd_interface.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 110 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh ++END ++setup_widgets.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 102 ++/!svn/ver/9302/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh ++END ++setup_dnsmasq.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 102 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh ++END ++setup_policyrouting.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 108 ++/!svn/ver/7848/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh ++END ++setup_uhttpd.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh ++END ++setup_lan_ipv6.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 103 ++/!svn/ver/9043/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh ++END ++setup_dhcp.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 99 ++/!svn/ver/8697/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh ++END ++gen_dhcp_ip.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 100 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh ++END ++common.awk ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/!svn/ver/7208/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/common.awk ++END ++setup_olsrd.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 100 ++/!svn/ver/9673/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh ++END ++rename-wifi.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 100 ++/!svn/ver/8798/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh ++END ++setup_system.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/!svn/ver/7610/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh ++END ++setup_firewall_interface.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 113 ++/!svn/ver/9660/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/entries b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/entries +new file mode 100644 +index 0000000..13fe951 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/entries +@@ -0,0 +1,1082 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers ++http://svn.luci.subsignal.org ++ ++ ++ ++2013-02-28T19:53:34.627613Z ++9674 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++setup_auto-ipv6-interface.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b8a6afd44da9d21e29962c9b3e51b686 ++2012-08-02T14:41:30.245123Z ++8895 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++270 ++ ++setup_splash.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a2d05a04930558fce182f044d9c32f47 ++2012-06-05T15:57:22.149152Z ++8697 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1044 ++ ++setup_auto-ipv6.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++5ce0e7ee393f688db745f083697ba0d5 ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++351 ++ ++setup_ssh.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++5b27fa54ab883711de52ebc9d3bb25d1 ++2012-07-26T09:45:48.341314Z ++8893 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++520 ++ ++setup_wifi.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++6780ca8baa908911cc6efac662c9abbb ++2013-01-13T08:35:18.323005Z ++9615 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2527 ++ ++gen_auto-ipv6-dhcpv6-ip.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++9e87f5c76f6b0c3f420845412934be7d ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++442 ++ ++setup_firewall.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++2258924d1a4432b499d726700b04bfce ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4148 ++ ++gen_bssid.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++98e08d204b5891f950a4e449acd42ec3 ++2013-01-03T14:10:18.526217Z ++9577 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++667 ++ ++setup_lan_static.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++d36aae6aeb88a1a7171ebbfd3e8cf241 ++2012-06-05T15:57:22.149152Z ++8697 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++434 ++ ++read_defaults.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++a5dd36baf8bb081698dc8142a2e376f4 ++2012-09-22T23:28:18.136411Z ++9320 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1177 ++ ++setup_wan_dhcp.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++f313945f6150a570f57a3d509142faeb ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++489 ++ ++supports_vap.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++5869bcb50d525af6abd43cd29e8fdc6d ++2013-01-12T19:30:45.289256Z ++9612 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++823 ++ ++check-range-in-range.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++df6ed5e63386a8b743333341c08e68b4 ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++786 ++ ++setup_network.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++c874e8fa2d2b7bb0c18a33167a1ed9ee ++2013-01-29T22:32:03.930461Z ++9659 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2652 ++ ++ipcalc-cidr.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++3c95a2b532d85f9223974b631cbc80bd ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++895 ++ ++setup_wan_static.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++2858e672cd6d0f1b476973f0e463afb0 ++2012-07-09T17:57:24.686672Z ++8884 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++502 ++ ++restore_default_config.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++aa2297be0cb53078c4fa782765fa09aa ++2011-10-06T19:39:58.778339Z ++7611 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++401 ++ ++initial_config.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++2bd4f376af5a62f2c53ffaad2893f800 ++2013-02-28T19:53:34.627613Z ++9674 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1123 ++ ++setup_olsrd_interface.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++3042dd94280db743fea6ce964b5aa4f2 ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1862 ++ ++setup_widgets.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b384ac01880ca6af1b8e484158dc7aab ++2012-09-17T17:06:52.104378Z ++9302 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++401 ++ ++setup_dnsmasq.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++d793fb0ba838e8f144d5be7f51b59383 ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++630 ++ ++setup_policyrouting.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b63f4193d3455df7d58a47d784b1f888 ++2011-10-29T21:19:05.982887Z ++7848 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++245 ++ ++setup_uhttpd.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++46b5b056666e95c455528bdc732f3e44 ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++208 ++ ++setup_lan_ipv6.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++18ae849311305a59571fa5537fd2e965 ++2012-08-15T12:33:33.850298Z ++9043 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++487 ++ ++setup_dhcp.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++549ef183332ad853e4a95d9f8fd19ab4 ++2012-06-05T15:57:22.149152Z ++8697 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++613 ++ ++gen_dhcp_ip.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++eb3f099bf9310fee683d3a96051976b2 ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++227 ++ ++common.awk ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++b14fd006f9cec64caab353600cc0a998 ++2011-06-23T15:52:00.742323Z ++7208 ++soma ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++526 ++ ++setup_olsrd.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++08e513b38070f50e45a64da085772275 ++2013-02-28T18:58:20.894979Z ++9673 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2667 ++ ++rename-wifi.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++844bb6c58c07956a3004904338c307ba ++2012-06-27T17:50:50.020578Z ++8798 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1235 ++ ++setup_system.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++2bef9065af9522be8088d352cced7ce4 ++2011-10-06T19:38:12.534635Z ++7610 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++167 ++ ++setup_firewall_interface.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++510a1285797af3130d2d9cd607e3133b ++2013-01-29T23:34:01.279898Z ++9660 ++soma ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3064 ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/check-range-in-range.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/check-range-in-range.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/check-range-in-range.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_auto-ipv6-dhcpv6-ip.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_auto-ipv6-dhcpv6-ip.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_auto-ipv6-dhcpv6-ip.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_bssid.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_bssid.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_bssid.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_dhcp_ip.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_dhcp_ip.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/gen_dhcp_ip.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/initial_config.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/initial_config.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/initial_config.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/ipcalc-cidr.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/ipcalc-cidr.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/ipcalc-cidr.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/read_defaults.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/read_defaults.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/read_defaults.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/rename-wifi.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/rename-wifi.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/rename-wifi.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/restore_default_config.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/restore_default_config.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/restore_default_config.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_auto-ipv6-interface.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_auto-ipv6-interface.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_auto-ipv6-interface.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_auto-ipv6.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_auto-ipv6.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_auto-ipv6.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_dhcp.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_dhcp.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_dhcp.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_dnsmasq.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_dnsmasq.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_dnsmasq.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_firewall.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_firewall.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_firewall.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_firewall_interface.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_firewall_interface.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_firewall_interface.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_lan_ipv6.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_lan_ipv6.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_lan_ipv6.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_lan_static.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_lan_static.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_lan_static.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_network.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_network.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_network.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_olsrd.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_olsrd.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_olsrd.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_olsrd_interface.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_olsrd_interface.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_olsrd_interface.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_policyrouting.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_policyrouting.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_policyrouting.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_splash.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_splash.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_splash.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_ssh.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_ssh.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_ssh.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_system.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_system.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_system.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_uhttpd.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_uhttpd.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_uhttpd.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wan_dhcp.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wan_dhcp.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wan_dhcp.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wan_static.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wan_static.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wan_static.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_widgets.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_widgets.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_widgets.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wifi.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wifi.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/setup_wifi.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/supports_vap.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/supports_vap.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/prop-base/supports_vap.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/check-range-in-range.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/check-range-in-range.sh.svn-base +new file mode 100644 +index 0000000..c889c55 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/check-range-in-range.sh.svn-base +@@ -0,0 +1,31 @@ ++#!/bin/sh ++# Checks whether a netrange is inside another netrange, returns 1 if true ++# Takes two arguments: $1: net from which we want to know if it is inside $2 ++# nets need to be given in CIDR notation ++ ++dir=$(dirname $0) ++ ++awk -f $dir/common.awk -f - $* <= network2) { ++ if (network <= broadcast2) { ++ if (broadcast <= broadcast2) { ++ print "1" ++ } ++ } ++ } ++} ++EOF +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/common.awk.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/common.awk.svn-base +new file mode 100644 +index 0000000..5b03d06 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/common.awk.svn-base +@@ -0,0 +1,20 @@ ++function bitcount(c) { ++ c=and(rshift(c, 1),0x55555555)+and(c,0x55555555) ++ c=and(rshift(c, 2),0x33333333)+and(c,0x33333333) ++ c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f) ++ c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff) ++ c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff) ++ return c ++} ++ ++function ip2int(ip) { ++ for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) ++ return ret ++} ++ ++function int2ip(ip,ret,x) { ++ ret=and(ip,255) ++ ip=rshift(ip,8) ++ for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++); ++ return ret ++} +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_auto-ipv6-dhcpv6-ip.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_auto-ipv6-dhcpv6-ip.sh.svn-base +new file mode 100644 +index 0000000..ca623db +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_auto-ipv6-dhcpv6-ip.sh.svn-base +@@ -0,0 +1,16 @@ ++#!/bin/sh ++netrenamed=$1 ++ ++local PREFIX="$(echo $ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')" ++ ++# Get the devices mac address ++local device="$(uci -p/var/state -q get network.$1.ifname)" ++if [ -n "$device" ]; then ++ local MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})" ++else ++ local MAC="$(cat /sys/class/net/$1/address)" ++ local IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')" ++fi ++ ++echo "${PREFIX}${IPV6_UNIQ}:1" ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_bssid.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_bssid.sh.svn-base +new file mode 100644 +index 0000000..efe101f +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_bssid.sh.svn-base +@@ -0,0 +1,36 @@ ++#!/bin/sh ++# create essid from channel, takes two args: ++# $1 = channel (integer) ++# $2 = community (optional) ++channel=$1 ++community=$2 ++ ++. /lib/functions.sh ++ ++ ++# Try to get BSSID from profile first ++config_load profile_$community ++config_get bssid bssidscheme $channel ++if [ -z "$bssid" ]; then ++ config_get bssid bssidscheme "all" ++fi ++ ++if [ -z "$bssid" ]; then ++ case $channel in ++ [1-9]) ++ bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE" ++ ;; ++ 1[0-4]) ++ bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE" ++ ;; ++ [3-9][0-9]) ++ bssid="02:$channel:CA:FF:EE:EE" ++ ;; ++ 1[0-9][0-9]) ++ bssid="${channel/1/12:}:CA:FF:EE:EE" ++ ;; ++ *) bssid="02:CA:FF:EE:BA:BE" ++ ;; ++ esac ++fi ++echo $bssid +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_dhcp_ip.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_dhcp_ip.sh.svn-base +new file mode 100644 +index 0000000..e559166 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/gen_dhcp_ip.sh.svn-base +@@ -0,0 +1,6 @@ ++#!/bin/sh ++# generates a dhcp-ip and netrange from a given ip/subnet ++# takes 2 arguments: ++# $1: Ip Address (of the Interface for which we want to generate an ip) ++ ++echo "$1" | awk 'BEGIN { FS = "." } ; { print "6."$3"."$4".1" }' +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/initial_config.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/initial_config.sh.svn-base +new file mode 100644 +index 0000000..c1e5522 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/initial_config.sh.svn-base +@@ -0,0 +1,42 @@ ++#!/bin/sh ++# This is only run once (usually after flashing an image from the imagebuilder) ++# It sets up the initial config for this node. ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++config_load system ++ ++# Rename system config ++handle_system() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename system $1 system ++ fi ++} ++config_foreach handle_system system ++ ++if [ -n "$(uci -q get meshwizard.community)" ]; then ++ set_defaults "community_" freifunk.community ++ uci -q delete meshwizard.community ++fi ++ ++[ -n "$profile_homepage" ] && uci set freifunk.community.homepage="$profile_homepage" ++ ++[ -n "$profile_mapserver" ] && { ++ uci -q delete freifunk.community.mapserver ++ for m in $profile_mapserver; do ++ uci add_list freifunk.community.mapserver="$m" ++ done ++} ++ ++uci_commitverbose "Setup community" freifunk ++ ++if [ -n "$(uci -q get meshwizard.contact)" ]; then ++ set_defaults "contact_" freifunk.contact ++ uci -q delete meshwizard.contact && uci_commitverbose "Setup contact" freifunk ++fi ++ ++if [ "$has_luci" == TRUE ]; then ++ set_defaults "luci_main_" luci.main ++ uci -q delete meshwizard.luci_main && uci_commitverbose "Setup luci" luci ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/ipcalc-cidr.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/ipcalc-cidr.sh.svn-base +new file mode 100644 +index 0000000..39d051e +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/ipcalc-cidr.sh.svn-base +@@ -0,0 +1,41 @@ ++#!/bin/sh ++dir=$(dirname $0) ++awk -f $dir/common.awk -f - $* <limit) end=limit ++ ++ print "IP="int2ip(ipaddr) ++ print "NETMASK="int2ip(netmask) ++ print "BROADCAST="int2ip(broadcast) ++ print "NETWORK="int2ip(network) ++ print "PREFIX="32-bitcount(compl(netmask)) ++ ++ # range calculations: ++ # ipcalc ++ ++ if (ARGC > 3) { ++ print "START="int2ip(start) ++ print "END="int2ip(end) ++ } ++} ++EOF +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/read_defaults.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/read_defaults.sh.svn-base +new file mode 100644 +index 0000000..c503663 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/read_defaults.sh.svn-base +@@ -0,0 +1,35 @@ ++#!/bin/sh ++# This reads the settings we need to have to configure everything ++# Argument $1: community ++ ++. /lib/functions.sh ++community="$1" ++ ++# reads variables from uci files, parameter $1 is the section ++get_var() { ++ uci -q show $1 | cut -d "." -f 2-100 |grep "\." | sed -e 's/^\([A-Za-z0-9_]*\)\./\1_/g' -e 's/=\(.*\)$/="\1"/g' ++} ++ ++handle_widgets() { ++ widgets="$widgets $1" ++} ++config_load freifunk ++config_foreach handle_widgets widget ++config_load profile_$community ++config_foreach handle_widgets widget ++echo "widgets=$widgets" ++ ++# read default values from /etc/config/freifunk ++for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults zone_freifunk include $widgets; do ++ get_var freifunk.$v ++done ++ ++# now read all values from the selected community profile, will override some values from the defaults before ++for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults profile zone_freifunk include luci_splash ipv6 $widgets; do ++ get_var profile_$community.$v ++done ++ ++# read values from meshwizard ++for v in system luci_main contact community wan lan general ipv6; do ++ get_var meshwizard.$v ++done +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/rename-wifi.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/rename-wifi.sh.svn-base +new file mode 100644 +index 0000000..ea20055 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/rename-wifi.sh.svn-base +@@ -0,0 +1,46 @@ ++#!/bin/sh ++# This script renames IB_wifi_ interface names into real interface names used on this system. ++# E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211 ++ ++. $dir/functions.sh ++ ++posIB=-1 ++ ++IBwifis="$(uci show meshwizard.netconfig | grep 'IB_' | sed 's/meshwizard.netconfig\.\(IB_wifi.*\)_.*/\1/' |uniq)" ++[ -z "$(echo $IBwifis |grep IB_wifi)" ] && exit ++ ++for w in $IBwifis; do ++ posIB=$(( $posIB + 1 )) ++ export IB_wifi$posIB="$w" ++done ++ ++pos=0 ++syswifis="$(uci show wireless |grep wifi-device | sed 's/wireless\.\(.*\)=.*/\1/' |uniq)" ++ ++for s in $syswifis; do ++ export syswifi$pos="$s" ++ pos=$(( $pos + 1 )) ++done ++ ++for i in `seq 0 $posIB`; do ++ IBwifi=$(eval echo \$IB_wifi$i) ++ syswifi=$(eval echo \$syswifi$i) ++ ++ if [ -n "$syswifi" ]; then ++ case $IBwifi in ++ IB_wifi* ) ++ # replace IB_wifi_* with actual wifi interface names, delete old ones first ++ uci show meshwizard.netconfig | grep $IBwifi | while read line; do ++ oldline=$(echo $line | cut -d "=" -f 1) ++ uci set $oldline="" ++ newline=$(echo $line |sed "s/$IBwifi/$syswifi/g") ++ uci set $newline ++ done ++ ;; ++ esac ++ unset IBwifi ++ unset syswifi ++ fi ++done ++ ++uci_commitverbose "Renaming wifi-devices in /etc/config/meshwizard" meshwizard +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/restore_default_config.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/restore_default_config.sh.svn-base +new file mode 100644 +index 0000000..3f6ce35 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/restore_default_config.sh.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh ++# This will restore default "factory" settings before running the meshwizard ++# and is used when cleanup=1 ++# Warning: This will reset network settings for wan and lan to defaults too. ++ ++echo "+ Restore default config as requested with cleanup=1" ++cp -f /rom/etc/config/* /etc/config/ ++rm /etc/config/wireless ++wifi detect > /etc/config/wireless ++rm /etc/config/network ++/etc/init.d/defconfig start +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_auto-ipv6-interface.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_auto-ipv6-interface.sh.svn-base +new file mode 100644 +index 0000000..adf3429 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_auto-ipv6-interface.sh.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++net=$1 ++. $dir/functions.sh ++ ++ra="$(uci -q get meshwizard.netconfig.${net}_ipv6ra)" ++uci set autoipv6.${netrenamed}="interface" ++if [ -n "$ra" ]; then ++ uci set autoipv6.${netrenamed}.ra=1 ++fi ++ ++uci_commitverbose "Setup auto-ipv6 for interface $netrenamed" autoipv6 +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_auto-ipv6.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_auto-ipv6.sh.svn-base +new file mode 100644 +index 0000000..8e3f015 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_auto-ipv6.sh.svn-base +@@ -0,0 +1,17 @@ ++#!/bin/sh ++ ++. $dir/functions.sh ++ ++if [ "$ipv6_config" = "auto-ipv6-fromv4" ]; then ++ mode="fromv4" ++else ++ mode="random" ++fi ++ ++uci set autoipv6.olsr_node.enabled=1 ++uci set autoipv6.olsr_node.mode="$mode" ++uci_commitverbose "Setup auto-ipv6" autoipv6 ++ ++uci set network.wan.accept_ra=0 ++uci_commitverbose "Do not accept ra's on wan when using auto-ipv6" network ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_dhcp.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_dhcp.sh.svn-base +new file mode 100644 +index 0000000..5c8863e +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_dhcp.sh.svn-base +@@ -0,0 +1,30 @@ ++#!/bin/sh ++# Sets up the dhcp part of dnsmasq ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++net="$1" ++ ++handle_dnsmasq() { ++ config_get interface "$1" interface ++ if [ "$interface" == "${netrenamed}dhcp" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename dhcp $1 ${netrenamed}dhcp ++ fi ++ fi ++} ++config_load dhcp ++config_foreach handle_dnsmasq dhcp ++ ++[ "$net" == "lan" ] && uci -q delete dhcp.lan ++ ++uci batch << EOF ++ set dhcp.${netrenamed}dhcp="dhcp" ++ set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp" ++EOF ++ ++set_defaults "dhcp_" dhcp.${netrenamed}dhcp ++ ++uci_commitverbose "Setup DHCP for $netrenamed" dhcp ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_dnsmasq.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_dnsmasq.sh.svn-base +new file mode 100644 +index 0000000..9297f91 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_dnsmasq.sh.svn-base +@@ -0,0 +1,29 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Set dnsmasq config ++handle_dhcp() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename dhcp $1 dnsmasq ++ fi ++} ++ ++config_load dhcp ++config_foreach handle_dhcp dnsmasq ++ ++uci batch << EOF ++ set dhcp.dnsmasq.local="/$profile_suffix/" ++ set dhcp.dnsmasq.domain="$profile_suffix" ++EOF ++ ++config_get addnhosts dnsmasq addnhosts ++if [ -z "${addnhosts/\var\/etc\/hosts.olsr/}" ]; then ++ uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr" ++ if [ "$ipv6_enabled" = 1 ]; then ++ uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr.ipv6" ++ fi ++fi ++ ++uci_commitverbose "Setup dnsmasq" dhcp +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_firewall.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_firewall.sh.svn-base +new file mode 100644 +index 0000000..bf47241 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_firewall.sh.svn-base +@@ -0,0 +1,139 @@ ++#!/bin/sh ++# Add "freifunk" firewall zone ++# If wan/lan is used for olsr then remove these networks from wan/lan zones ++# Also setup rules defined in /etc/config/freifunk and /etc/config/profile_ ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config) ++lan_is_olsr=$(uci -q get meshwizard.netconfig.lan_config) ++ ++config_load firewall ++ ++# Rename firewall zone for freifunk if unnamed ++# If wan is used for olsr then set network for the firewall zone wan to ' ' to remove the wan interface from it, else add local restrict to it ++# If lan is used for olsr then set network for the firewall zone lan to ' ' to remove the lan interface from it ++ ++handle_fwzone() { ++ config_get name "$1" name ++ config_get network "$1" network ++ ++ if [ "$name" == "freifunk" ]; then ++ # rename section if unnamed ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename firewall $1 zone_freifunk ++ fi ++ fi ++ ++ if [ "$name" == "wan" ]; then ++ if [ "$wan_is_olsr" == 1 ]; then ++ uci set firewall.$1.network=' ' && uci_commitverbose "WAN is used for olsr, removed the wan interface from zone wan" firewall ++ else ++ uci set firewall.$1.local_restrict=1 && uci_commitverbose "Enable local_restrict for zone wan" firewall ++ fi ++ fi ++ ++ if [ "$name" == "lan" ] && [ "$lan_is_olsr" == 1 ]; then ++ uci set firewall.$1.network=' ' && uci_commitverbose "LAN is used for olsr, removed the lan interface from zone lan" firewall ++ fi ++} ++ ++config_foreach handle_fwzone zone ++ ++uci batch << EOF ++ set firewall.zone_freifunk="zone" ++ set firewall.zone_freifunk.name="freifunk" ++ set firewall.zone_freifunk.input="$zone_freifunk_input" ++ set firewall.zone_freifunk.forward="$zone_freifunk_forward" ++ set firewall.zone_freifunk.output="$zone_freifunk_output" ++EOF ++ ++uci_commitverbose "Setup firewall zones" firewall ++ ++# Usually we need to setup masquerading for lan, except lan is an olsr interface or has an olsr hna-entry ++ ++handle_interface() { ++ config_get interface "$1" interface ++ if [ "$interface" == "lan" ]; then ++ no_masq_lan=1 ++ fi ++} ++config_load olsrd ++config_foreach handle_interface Interface ++ ++LANIP="$(uci -q get network.lan.ipaddr)" ++if [ -n "$LANIP" ]; then ++ handle_hna() { ++ config_get netaddr "$1" netaddr ++ if [ "$LANIP" == "$netaddr" ]; then ++ no_masq_lan=1 ++ fi ++ } ++ config_foreach handle_hna Hna4 ++fi ++ ++currms=$(uci -q get firewall.zone_freifunk.masq_src) ++if [ ! "$no_masq_lan" == "1" ] && [ ! "$(uci -q get meshwizard.netconfig.lan_config)" == 1 ]; then ++ uci set firewall.zone_freifunk.masq="1" ++ [ -z "$(echo $currms |grep lan)" ] && uci add_list firewall.zone_freifunk.masq_src="lan" ++fi ++ ++ ++# Rules, Forwardings, advanced config and includes ++ ++for config in freifunk profile_$community; do ++ ++ config_load $config ++ ++ for section in advanced include fw_rule fw_forwarding; do ++ handle_firewall() { ++ local options=$(uci show $config."$1") ++ options=$(echo "$options" | sed -e "s/fw_//g" -e "s/^$config/firewall/g") ++ for o in $options; do ++ uci set $o ++ done ++ } ++ config_foreach handle_firewall $section ++ done ++done ++ ++# If we use auto-ipv6-dhcp then allow 547/udp on the freifunk zone ++if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then ++ uci batch <<- EOF ++ set firewall.dhcpv6=rule ++ set firewall.dhcpv6.src=freifunk ++ set firewall.dhcpv6.target=ACCEPT ++ set firewall.dhcpv6.dest_port=547 ++ set firewall.dhcpv6.proto=udp ++ EOF ++fi ++ ++# Firewall rules to allow incoming ssh and web if enabled ++ ++if [ "$wan_allowssh" == 1 ]; then ++ uci batch <<- EOF ++ set firewall.wanssh=rule ++ set firewall.wanssh.src=wan ++ set firewall.wanssh.target=ACCEPT ++ set firewall.wanssh.proto=tcp ++ set firewall.wanssh.dest_port=22 ++ EOF ++fi ++ ++if [ "$wan_allowweb" == 1 ]; then ++ uci batch <<- EOF ++ set firewall.wanweb=rule ++ set firewall.wanweb.src=wan ++ set firewall.wanweb.target=ACCEPT ++ set firewall.wanweb.proto=tcp ++ set firewall.wanweb.dest_port=80 ++ set firewall.wanwebhttps=rule ++ set firewall.wanwebhttps.src=wan ++ set firewall.wanwebhttps.target=ACCEPT ++ set firewall.wanwebhttps.proto=tcp ++ set firewall.wanwebhttps.dest_port=443 ++ EOF ++fi ++ ++uci_commitverbose "Setup rules, forwardings, advanced config and includes." firewall +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_firewall_interface.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_firewall_interface.sh.svn-base +new file mode 100644 +index 0000000..11c351b +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_firewall_interface.sh.svn-base +@@ -0,0 +1,90 @@ ++#!/bin/sh ++# This will add $net to the zone firewall (and remove it from other zones where it is referenced) ++# It will also setup rules defined in /etc/config/freifunk and /etc/config/profile_ ++# Arg $1 = $net ++ ++net=$1 ++. /lib/functions.sh ++. $dir/functions.sh ++config_load firewall ++ ++# Get some variables ++type="$(uci -q get wireless.$net.type)" ++vap="$(uci -q get meshwizard.netconfig.$net\_vap)" ++wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config) ++ ++# Delete old firewall zone for freifunk ++handle_fwzone() { ++ config_get name "$1" name ++ config_get network "$1" network ++ ++ if [ "$2" == "zoneconf" ]; then ++ if [ "$name" == "freifunk" ]; then ++ # rename section if unnamed ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename firewall $1 zone_freifunk ++ fi ++ else ++ if [ ! "$name" == "freifunk" ] && [ -n "$netrenamed" -a -n "$(echo $network | grep $netrenamed)" ]; then ++ echo " Removed $netrenamed from firewall zone $name." ++ network_new=$(echo $network | sed -e 's/'$netrenamed'//' -e 's/^ //' -e 's/ / /' -e 's/ $//') ++ uci set firewall.$1.network="$network_new" ++ fi ++ fi ++ fi ++} ++ ++config_foreach handle_fwzone zone zoneconf ++ ++# Add $netrenamed and if needed ${netrenamed}dhcp to the "freifunk" zone ++config_get network zone_freifunk network ++ ++# remove ${netrenamed}dhcp from networks list ++[ -n "$network" -a -n "$net" ] && network="${network/${netrenamed}dhcp/}" ++network=$(echo $network) # Removes leading and trailing whitespaces ++ ++[ -n "$netrenamed" ] && [ -z "$(echo $network | grep $netrenamed)" ] && network="$network $netrenamed" ++ ++# check if this hardware supports VAPs ++supports_vap="0" ++$dir/helpers/supports_vap.sh $net $type && supports_vap=1 ++ ++if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then ++ [ -n "$netrenamed" ] && [ "$network" == "${network/${netrenamed}dhcp/}" ] && network="$network ${netrenamed}dhcp" ++fi ++ ++uci set firewall.zone_freifunk.network="$network" ++ ++uci_commitverbose "Add '$netrenamed' to freifunk firewall zone" firewall ++ ++currms=$(uci -q get firewall.zone_freifunk.masq_src) ++ ++# If interfaces are outside of the mesh network they should be natted ++ ++# Get dhcprange and meshnet ++if_ip="$(uci -q get network.${netrenamed}dhcp.ipaddr)" ++if_mask="$(uci -q get network.${netrenamed}dhcp.netmask)" ++ ++[ -n "$if_ip" -a "$if_mask" ] && export $(ipcalc.sh $if_ip $if_mask) ++[ -n "$NETWORK" -a "$PREFIX" ] && dhcprange="$NETWORK/$PREFIX" ++ ++if [ -n "$dhcprange" ]; then ++ meshnet="$(uci get profile_$community.profile.mesh_network)" ++ # check if the dhcprange is inside meshnet ++ dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" ++ if [ "$dhcpinmesh" == 1 ]; then ++ # needed or splash will not work ++ if [ "$has_luci_splash" == TRUE ]; then ++ uci set firewall.zone_freifunk.contrack="1" ++ fi ++ else ++ uci set firewall.zone_freifunk.masq=1 ++ [ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp" ++ fi ++fi ++ ++for i in IP NETMASK BROADCAST NETWORK PREFIX; do ++ unset $i ++done ++ ++uci_commitverbose "Setup masquerading rules for '$netrenamed'" firewall +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_lan_ipv6.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_lan_ipv6.sh.svn-base +new file mode 100644 +index 0000000..2f6144b +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_lan_ipv6.sh.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++[ ! "$(uci -q get network.lan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Setup IPv6 for the lan interface ++ ++local ip6addr="" ++if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then ++ # get lan mac ++ local device="$(uci -p/var/state -q get network.lan.ifname)" ++ if [ -n "device" ]; then ++ ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $device)" ++ fi ++ uci set network.lan.ip6addr="${ip6addr}/112" ++fi ++ ++uci_commitverbose "Setup ipv6 address for lan" network +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_lan_static.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_lan_static.sh.svn-base +new file mode 100644 +index 0000000..172dcf1 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_lan_static.sh.svn-base +@@ -0,0 +1,17 @@ ++#!/bin/sh ++# Setup static interface settings for lan if lan is not an olsr interface ++ ++[ ! "$(uci -q get network.lan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++uci batch << EOF ++ set network.lan.proto='$lan_proto' ++ set network.lan.ipaddr='$lan_ip4addr' ++ set network.lan.netmask='$lan_netmask' ++EOF ++ ++uci_commitverbose "Setup static ip settings for lan" network ++ ++uci delete meshwizard.lan && uci commit meshwizard +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_network.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_network.sh.svn-base +new file mode 100644 +index 0000000..70f82fe +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_network.sh.svn-base +@@ -0,0 +1,89 @@ ++# setup entry in /etc/config/network for a interface ++# Argument $1: network interface ++ ++net="$1" ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Setup a (new) interface section for $net ++ ++ipaddr=$(uci -q get meshwizard.netconfig.$net\_ip4addr) ++ip6addr=$(uci -q get meshwizard.netconfig.$net\_ip6addr) ++[ -z "$ipaddr" ] && msg_missing_value meshwizard $net\_ip4addr ++ ++netmask=$(uci -q get meshwizard.netconfig.$net\_netmask) ++[ -z "$netmask" ] && netmask="$interface_netmask" ++[ -z "$netmask" ] && netmask="255.255.0.0" ++ ++uci set network.$netrenamed="interface" ++set_defaults "interface_" network.$netrenamed ++ ++uci batch << EOF ++ set network.$netrenamed.proto="static" ++ set network.$netrenamed.ipaddr="$ipaddr" ++ set network.$netrenamed.netmask="$netmask" ++EOF ++ ++# Setup IPv6 for the interface ++local ip6addr ++if [ "$ipv6_enabled" = 1 ]; then ++ if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then ++ ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $netrenamed)" ++ uci set network.$netrenamed.ip6addr="${ip6addr}/112" ++ fi ++ if [ "$ipv6_config" = "static" ] && [ -n "$ip6addr" ]; then ++ uci set network.$netrenamed.ip6addr="$ip6addr" ++ fi ++fi ++ ++uci_commitverbose "Setup interface $netrenamed" network ++ ++# setup dhcp alias/interface ++ ++net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp) ++if [ "$net_dhcp" == 1 ]; then ++ ++ # Load meshwizard_settings ++ dhcprange="$(uci -q get meshwizard.netconfig.${net}_dhcprange)" ++ interface_ip="$(uci -q get meshwizard.netconfig.${net}_ip4addr)" ++ vap=$(uci -q get meshwizard.netconfig.${net}_vap) ++ ++ # Rename config ++ handle_dhcpalias() { ++ config_get interface "$1" interface ++ if [ "$interface" == "$netrenamed" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename network $1 ${netrenamed}dhcp ++ fi ++ fi ++ } ++ config_load network ++ config_foreach handle_dhcpalias interface ++ ++ # Get IP/netmask and start-ip for $net dhcp ++ # If no dhcprange is given in /etc/config/meshwizard we autogenerate one ++ ++ if [ -z "$dhcprange" ]; then ++ dhcprange="$($dir/helpers/gen_dhcp_ip.sh $interface_ip)/24" ++ uci set meshwizard.netconfig.${net}_dhcprange="$dhcprange" ++ fi ++ eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange 1 0) ++ ++ # setup wifi-dhcp interface or alias (using interface notation) ++ ++ # Setup alias for $net ++ ++ if [ "$vap" == 1 ]; then ++ uci set network.${netrenamed}dhcp=interface ++ else ++ uci set network.${netrenamed}dhcp=interface ++ uci set network.${netrenamed}dhcp.ifname="@${netrenamed}" ++ fi ++ ++ uci batch <<- EOF ++ set network.${netrenamed}dhcp.proto=static ++ set network.${netrenamed}dhcp.ipaddr="$START" ++ set network.${netrenamed}dhcp.netmask="$NETMASK" ++ EOF ++ uci_commitverbose "Setup interface for ${netrenamed}dhcp" network ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_olsrd.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_olsrd.sh.svn-base +new file mode 100644 +index 0000000..5f6f550 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_olsrd.sh.svn-base +@@ -0,0 +1,102 @@ ++#!/bin/sh ++# Sets up olsrd ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Clean the config, remove interface wlan ++handle_interface() { ++ config_get interface "$1" interface ++ if [ "$interface" = "wlan" ]; then ++ uci delete olsrd.$1 ++ fi ++} ++config_load olsrd ++config_foreach handle_interface Interface ++ ++#Rename olsrd basic settings ++handle_olsrd() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename olsrd $1 olsrd ++ fi ++} ++config_foreach handle_olsrd olsrd ++ ++# Rename interface defaults ++handle_interfacedefaults() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename olsrd $1 InterfaceDefaults ++ fi ++} ++config_foreach handle_interfacedefaults InterfaceDefaults ++ ++# Set basic olsrd settings ++if [ "$ipv6_enabled" = 1 ] && [ "$has_ipv6" == "1" ]; then ++ uci set olsrd.olsrd.IpVersion="6and4" ++fi ++ ++ ++# Setup new InterfaceDefaults ++uci set olsrd.InterfaceDefaults=InterfaceDefaults ++set_defaults "olsr_interfacedefaults_" olsrd.InterfaceDefaults ++ ++# Rename nameservice, dyngw and httpinfo plugins ++ ++handle_plugin() { ++ config_get library "$1" library ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ new="$(echo $library | cut -d '.' -f 1)" ++ section_rename olsrd "$1" "$new" ++ fi ++} ++config_foreach handle_plugin LoadPlugin ++uci -q delete olsrd.olsrd_httpinfo ++uci -q delete olsrd.olsrd_dyn_gw ++ ++uci_commitverbose "Cleanup olsrd config" olsrd ++ ++ ++# Setup nameservice plugin ++if [ -n "$profile_suffix" ]; then ++ suffix=".$profile_suffix" ++else ++ suffix=".olsr" ++fi ++uci batch << EOF ++ set olsrd.olsrd_nameservice=LoadPlugin ++ set olsrd.olsrd_nameservice.library="olsrd_nameservice.so.0.3" ++ set olsrd.olsrd_nameservice.latlon_file="/var/run/latlon.js" ++ set olsrd.olsrd_nameservice.hosts_file="/var/etc/hosts.olsr" ++ set olsrd.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" ++ set olsrd.olsrd_nameservice.suffix="$suffix" ++EOF ++ ++uci_commitverbose "Setup olsr nameservice plugin" olsrd ++ ++# Setup dyngw_plain ++ ++# If Sharing of Internet is enabled then enable dyngw_plain plugin ++ ++if [ "$general_sharenet" == 1 ]; then ++ uci set olsrd.dyngw_plain=LoadPlugin ++ uci set olsrd.dyngw_plain.ignore=0 ++ uci set olsrd.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4" ++ ++ uci_commitverbose "Setup olsrd_dyngw_plain plugin" olsrd ++fi ++ ++# Setup watchdog ++uci batch << EOF ++ set olsrd.olsrd_watchdog=LoadPlugin ++ set olsrd.olsrd_watchdog.library="olsrd_watchdog.so.0.1" ++ set olsrd.olsrd_watchdog.file="/var/run/olsrd.watchdog" ++ set olsrd.olsrd_watchdog.interval=30 ++EOF ++uci_commitverbose "Setup olsr watchdog plugin" olsrd ++ ++# Setup jsoninfo ++uci batch << EOF ++ set olsrd.olsrd_jsoninfo=LoadPlugin ++ set olsrd.olsrd_jsoninfo.library="olsrd_jsoninfo.so.0.0" ++EOF ++uci_commitverbose "Setup olsr jsoninfo plugin" olsrd +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_olsrd_interface.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_olsrd_interface.sh.svn-base +new file mode 100644 +index 0000000..edb5eea +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_olsrd_interface.sh.svn-base +@@ -0,0 +1,60 @@ ++#!/bin/sh ++# Sets up olsrd interfaces ++# arg $1 = net ++ ++net=$1 ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Rename interface for $netrenamed ++handle_interface() { ++ config_get interface "$1" Interface ++ if [ "$interface" == "$netrenamed" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename olsrd $1 $netrenamed ++ fi ++ fi ++} ++ ++config_foreach handle_interface Interface ++ ++# Setup new interface for $netrenamed ++ ++uci set olsrd.$netrenamed=Interface ++set_defaults "olsr_interface_" olsrd.$net ++uci set olsrd.$netrenamed.interface="$netrenamed" ++ ++uci_commitverbose "Setup olsr interface for $netrenamed." olsrd ++ ++# If dhcp-network is inside the mesh_network then add HNA for it ++ ++dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange) ++uci -q delete olsrd.${netrenamed}clients ++ ++if [ -n "$dhcprange" ]; then ++ meshnet="$(uci get profile_$community.profile.mesh_network)" ++ dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" ++ ++ if [ "$dhcpinmesh" == 1 ] && [ -n "$meshnet" ]; then ++ uci set olsrd.${netrenamed}clients="Hna4" ++ eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange) ++ uci set olsrd.${netrenamed}clients.netaddr="$NETWORK" ++ uci set olsrd.${netrenamed}clients.netmask="$NETMASK" ++ uci_commitverbose "Setup HNA for network $dhcprange" olsrd ++ fi ++fi ++ ++# Set Hna entry for ipv6 net for static ipv6 config ++uci -q delete olsrd.${netrenamed}static ++if [ "$ipv6_enabled" = "1" ] && [ "$ipv6_config" = "static" ]; then ++ local v6range="$(uci -q get meshwizard.netconfig.$net\_ip6addr)" ++ local v6net="$(echo $v6range | cut -d '/' -f 1)" ++ local v6mask="$(echo $v6range | cut -d '/' -f 2)" ++ if [ -n "$v6net" ] && [ -n "$v6mask" ]; then ++ uci set olsrd.${netrenamed}static="Hna6" ++ uci set olsrd.${netrenamed}static.netaddr="$v6net" ++ uci set olsrd.${netrenamed}static.prefix="$v6mask" ++ uci_commitverbose "Setup HNA for network $v6range" olsrd ++ fi ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_policyrouting.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_policyrouting.sh.svn-base +new file mode 100644 +index 0000000..f898bd6 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_policyrouting.sh.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh ++ ++. $dir/functions.sh ++ ++uci batch << EOF ++ set freifunk-policyrouting.pr.enable=1 ++ set freifunk-policyrouting.pr.strict=1 ++ set freifunk-policyrouting.pr.zones="freifunk" ++EOF ++ ++uci_commitverbose "Setup policyrouting" freifunk-policyrouting +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_splash.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_splash.sh.svn-base +new file mode 100644 +index 0000000..9741111 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_splash.sh.svn-base +@@ -0,0 +1,40 @@ ++#!/bin/sh ++# Setup_splash, takes 1 argument: 1=net ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++net=$1 ++ ++if [ ! "$has_luci_splash" == TRUE ]; then ++ echo " Luci Splash is not installed, skipping setup of it." ++ exit ++fi ++ ++set_defaults "luci_splash_" luci_splash.general ++uci_commitverbose "Setup general splash settings" luci_splash ++ ++dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange) ++ ++if [ "$(uci -q get meshwizard.netconfig.$net\_dhcp)" == 1 ] && [ -n "$dhcprange" ]; then ++ handle_splash() { ++ config_get network "$1" network ++ if [ "$network" == "${netrenamed}dhcp" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename luci_splash $1 ${netrenamed}dhcp ++ fi ++ fi ++ } ++ config_load luci_splash ++ config_foreach handle_splash iface ++ ++ uci batch <<- EOF ++ set luci_splash.${netrenamed}dhcp="iface" ++ set luci_splash.${netrenamed}dhcp.network="${netrenamed}dhcp" ++ set luci_splash.${netrenamed}dhcp.zone="freifunk" ++ EOF ++ ++ uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash ++ /etc/init.d/luci_splash enable ++fi ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_ssh.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_ssh.sh.svn-base +new file mode 100644 +index 0000000..38b331e +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_ssh.sh.svn-base +@@ -0,0 +1,26 @@ ++#!/bin/sh ++# Setup ssh. At this point only used to store pubkeys. ++ ++[ ! "$(uci -q get meshwizard.ssh)" == "system" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++authorized="/etc/dropbear/authorized_keys" ++ ++ ++config_load meshwizard ++ ++i=0 ++handle_pubkeys() { ++ local k="$1" ++ ( [ -f "$authorized" ] && grep -q "$k" $authorized) || { ++ echo "$k" >> $authorized ++ i=`expr $i + 1` ++ } ++} ++ ++config_list_foreach ssh pubkey handle_pubkeys ++ ++uci delete meshwizard.ssh ++uci_commitverbose "Added $i pubkeys to authorized_keys" meshwizard ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_system.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_system.sh.svn-base +new file mode 100644 +index 0000000..e9ce953 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_system.sh.svn-base +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++. $dir/functions.sh ++ ++set_defaults "system_" system.system ++uci -q delete meshwizard.system && uci commit meshwizard ++uci_commitverbose "System config" system +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_uhttpd.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_uhttpd.sh.svn-base +new file mode 100644 +index 0000000..172e414 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_uhttpd.sh.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh ++. $dir/functions.sh ++if [ "$ipv6_enabled" = "1" ]; then ++ uci batch <<- EOF ++ set uhttpd.main.listen_http=":80" ++ set uhttpd.main.listen_https=:"443" ++ EOF ++fi ++ ++uci_commitverbose "Setup uhttpd" uhttpd ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wan_dhcp.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wan_dhcp.sh.svn-base +new file mode 100644 +index 0000000..91fc1d8 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wan_dhcp.sh.svn-base +@@ -0,0 +1,18 @@ ++#!/bin/sh ++# Setup dhcp interface settings for wan. This is the OpenWrt default, ++# so all we need to do here is to delete wan from meshwizard after setup. ++# Also disallow ra on wan if ipv6 is enabled ++ ++[ ! "$(uci -q get network.wan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++if [ "$ipv6_enabled" = "1" ]; then ++ uci set network.wan.accept_ra='0' ++ uci_commitverbose "Do not accept ra on wan interface" network ++fi ++ ++ ++uci delete meshwizard.wan && uci commit meshwizard ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wan_static.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wan_static.sh.svn-base +new file mode 100644 +index 0000000..570470a +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wan_static.sh.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh ++# Setup static interface settings for wan if wan is not an olsr interface ++ ++[ ! "$(uci -q get network.wan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++uci batch << EOF ++set network.wan.proto='$wan_proto' ++set network.wan.ipaddr='$wan_ip4addr' ++set network.wan.netmask='$wan_netmask' ++set network.wan.gateway='$wan_gateway' ++set network.wan.dns='$wan_dns' ++EOF ++ ++uci_commitverbose "Setup static ip settings for wan" network ++ ++uci delete meshwizard.wan && uci commit meshwizard ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_widgets.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_widgets.sh.svn-base +new file mode 100644 +index 0000000..288252f +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_widgets.sh.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh ++. /lib/functions.sh ++ . $dir/functions.sh ++ ++if [ -n "$widgets" ]; then ++ [ ! -f "/etc/config/freifunk-widgets" ] && touch /etc/config/freifunk-widgets ++ for w in $widgets; do ++ uci set freifunk-widgets.${w}=widget ++ set_defaults "${w}_" freifunk-widgets.${w} ++ uci delete profile_$community.${w} ++ done ++ uci commit profile_$community ++ uci_commitverbose "Added widget config." freifunk-widgets ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wifi.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wifi.sh.svn-base +new file mode 100644 +index 0000000..34bd0cb +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/setup_wifi.sh.svn-base +@@ -0,0 +1,102 @@ ++#!/bin/sh ++# sets up a wifi interface for meshing ++# Arguments: $1 = network interface ++ ++net="$1" ++. /lib/functions.sh ++. $dir/functions.sh ++ ++##### wifi-device ##### ++ ++# Get the type before we delete the wifi-device ++config_load wireless ++config_get type $net type ++ ++# Rename wifi-device for $net ++ ++handle_wifidevice() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename wireless $1 $net ++ fi ++} ++config_foreach handle_wifidevice wifi-device ++ ++# create new wifi-device for $net ++uci set wireless.${net}=wifi-device ++ ++# get and set wifi-device defaults ++set_defaults "wifi_device_" wireless.${net} ++ ++channel="$(uci -q get meshwizard.netconfig.$net\_channel)" ++vap="$(uci -q get meshwizard.netconfig.$net\_vap)" ++ ++if [ -z "$channel" -o "$channel" == "default" ]; then ++ channel=$wifi_device_channel ++fi ++ ++uci batch << EOF ++ set wireless.${net}.type="$type" ++ set wireless.${net}.channel="$channel" ++EOF ++ ++uci_commitverbose "Setup wifi device for $netrenamed" wireless ++ ++##### wifi iface ++ ++# Rename wifi-iface for $net ++handle_interface() { ++ config_get device "$1" device ++ if [ "$device" == "$net" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename wireless $1 ${net}_iface ++ fi ++ fi ++} ++config_foreach handle_interface wifi-iface ++ ++# create new wifi-device for $net ++uci set wireless.$net\_iface=wifi-iface ++ ++# create new wifi-iface for $net from defaults ++set_defaults "wifi_iface_" wireless.$net\_iface ++ ++# overwrite defaults ++bssid="$($dir/helpers/gen_bssid.sh $channel $community)" ++ ++ssid="$profile_ssid" ++if [ "$profile_ssid_scheme" == "addchannel" ]; then ++ ssid="$ssid - ch$channel" ++fi ++ ++uci batch << EOF ++ set wireless.$net\_iface.device="${net}" ++ set wireless.$net\_iface.network="$netrenamed" ++ set wireless.$net\_iface.ssid="$ssid" ++ set wireless.$net\_iface.bssid="$bssid" ++EOF ++ ++uci_commitverbose "Setup wifi interface for $netrenamed" wireless ++ ++## VAP ++ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)" ++ ++# check if this hardware supports VAPs ++# the interface needs to be up before the check can happen ++ ++/sbin/wifi ++ ++supports_vap="0" ++$dir/helpers/supports_vap.sh $net $type && supports_vap=1 ++ ++if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then ++ uci batch <<- EOF ++ set wireless.$net\_iface_dhcp="wifi-iface" ++ set wireless.$net\_iface_dhcp.device="$net" ++ set wireless.$net\_iface_dhcp.mode="ap" ++ set wireless.$net\_iface_dhcp.encryption="none" ++ set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp" ++ set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr" ++ EOF ++ uci_commitverbose "Setup VAP interface for $netrenamed" wireless ++fi ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/supports_vap.sh.svn-base b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/supports_vap.sh.svn-base +new file mode 100644 +index 0000000..045ea97 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/.svn/text-base/supports_vap.sh.svn-base +@@ -0,0 +1,35 @@ ++#!/bin/sh ++# checks if a given device can be used for a VAP interface (1 adhoc + 1 ap) ++dev="$1" ++type="$2" ++ ++ ++if [ -z "$dev" -o -z "$type" ]; then ++ exit 1 ++fi ++ ++if [ "$type" = "atheros" ]; then ++ exit 0 ++elif [ "$type" = "mac80211" ]; then ++ # not hostapd[-mini], no VAP ++ if [ ! -x /usr/sbin/hostapd ]; then ++ echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211." ++ exit 1 ++ fi ++ # get driver in use ++ netindex="$(echo $dev |sed 's/[a-zA-z]*//')" ++ if [ -d /sys/class/net/wlan${netindex}/device/driver/module ]; then ++ driver="$(basename $(ls -l /sys/class/net/wlan${netindex}/device/driver/module | sed -ne 's/.* -> //p'))" ++ if [ "$driver" = "ath9k" -o "$driver" = "ath5k" ]; then ++ exit 0 ++ else ++ exit 1 ++ fi ++ else ++ exit 1 ++ fi ++else ++ exit 1 ++fi ++ ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh +new file mode 100755 +index 0000000..c889c55 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/check-range-in-range.sh +@@ -0,0 +1,31 @@ ++#!/bin/sh ++# Checks whether a netrange is inside another netrange, returns 1 if true ++# Takes two arguments: $1: net from which we want to know if it is inside $2 ++# nets need to be given in CIDR notation ++ ++dir=$(dirname $0) ++ ++awk -f $dir/common.awk -f - $* <= network2) { ++ if (network <= broadcast2) { ++ if (broadcast <= broadcast2) { ++ print "1" ++ } ++ } ++ } ++} ++EOF +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/common.awk b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/common.awk +new file mode 100644 +index 0000000..5b03d06 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/common.awk +@@ -0,0 +1,20 @@ ++function bitcount(c) { ++ c=and(rshift(c, 1),0x55555555)+and(c,0x55555555) ++ c=and(rshift(c, 2),0x33333333)+and(c,0x33333333) ++ c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f) ++ c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff) ++ c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff) ++ return c ++} ++ ++function ip2int(ip) { ++ for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) ++ return ret ++} ++ ++function int2ip(ip,ret,x) { ++ ret=and(ip,255) ++ ip=rshift(ip,8) ++ for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++); ++ return ret ++} +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh +new file mode 100755 +index 0000000..ca623db +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_auto-ipv6-dhcpv6-ip.sh +@@ -0,0 +1,16 @@ ++#!/bin/sh ++netrenamed=$1 ++ ++local PREFIX="$(echo $ipv6_prefix| cut -d "/" -f 1| sed 's/::/:/')" ++ ++# Get the devices mac address ++local device="$(uci -p/var/state -q get network.$1.ifname)" ++if [ -n "$device" ]; then ++ local MAC="$(ifconfig $netrenamed |grep HWaddr | awk '{ print $5 '})" ++else ++ local MAC="$(cat /sys/class/net/$1/address)" ++ local IPV6_UNIQ="$(echo $MAC | awk -F: '{ print $1$2":"$3$4":"$5$6 }')" ++fi ++ ++echo "${PREFIX}${IPV6_UNIQ}:1" ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh +new file mode 100755 +index 0000000..efe101f +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh +@@ -0,0 +1,36 @@ ++#!/bin/sh ++# create essid from channel, takes two args: ++# $1 = channel (integer) ++# $2 = community (optional) ++channel=$1 ++community=$2 ++ ++. /lib/functions.sh ++ ++ ++# Try to get BSSID from profile first ++config_load profile_$community ++config_get bssid bssidscheme $channel ++if [ -z "$bssid" ]; then ++ config_get bssid bssidscheme "all" ++fi ++ ++if [ -z "$bssid" ]; then ++ case $channel in ++ [1-9]) ++ bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE" ++ ;; ++ 1[0-4]) ++ bssid="$(printf "%X\n" $channel)2:CA:FF:EE:BA:BE" ++ ;; ++ [3-9][0-9]) ++ bssid="02:$channel:CA:FF:EE:EE" ++ ;; ++ 1[0-9][0-9]) ++ bssid="${channel/1/12:}:CA:FF:EE:EE" ++ ;; ++ *) bssid="02:CA:FF:EE:BA:BE" ++ ;; ++ esac ++fi ++echo $bssid +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh +new file mode 100755 +index 0000000..e559166 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/gen_dhcp_ip.sh +@@ -0,0 +1,6 @@ ++#!/bin/sh ++# generates a dhcp-ip and netrange from a given ip/subnet ++# takes 2 arguments: ++# $1: Ip Address (of the Interface for which we want to generate an ip) ++ ++echo "$1" | awk 'BEGIN { FS = "." } ; { print "6."$3"."$4".1" }' +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh +new file mode 100755 +index 0000000..c1e5522 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh +@@ -0,0 +1,42 @@ ++#!/bin/sh ++# This is only run once (usually after flashing an image from the imagebuilder) ++# It sets up the initial config for this node. ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++config_load system ++ ++# Rename system config ++handle_system() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename system $1 system ++ fi ++} ++config_foreach handle_system system ++ ++if [ -n "$(uci -q get meshwizard.community)" ]; then ++ set_defaults "community_" freifunk.community ++ uci -q delete meshwizard.community ++fi ++ ++[ -n "$profile_homepage" ] && uci set freifunk.community.homepage="$profile_homepage" ++ ++[ -n "$profile_mapserver" ] && { ++ uci -q delete freifunk.community.mapserver ++ for m in $profile_mapserver; do ++ uci add_list freifunk.community.mapserver="$m" ++ done ++} ++ ++uci_commitverbose "Setup community" freifunk ++ ++if [ -n "$(uci -q get meshwizard.contact)" ]; then ++ set_defaults "contact_" freifunk.contact ++ uci -q delete meshwizard.contact && uci_commitverbose "Setup contact" freifunk ++fi ++ ++if [ "$has_luci" == TRUE ]; then ++ set_defaults "luci_main_" luci.main ++ uci -q delete meshwizard.luci_main && uci_commitverbose "Setup luci" luci ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh +new file mode 100755 +index 0000000..39d051e +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/ipcalc-cidr.sh +@@ -0,0 +1,41 @@ ++#!/bin/sh ++dir=$(dirname $0) ++awk -f $dir/common.awk -f - $* <limit) end=limit ++ ++ print "IP="int2ip(ipaddr) ++ print "NETMASK="int2ip(netmask) ++ print "BROADCAST="int2ip(broadcast) ++ print "NETWORK="int2ip(network) ++ print "PREFIX="32-bitcount(compl(netmask)) ++ ++ # range calculations: ++ # ipcalc ++ ++ if (ARGC > 3) { ++ print "START="int2ip(start) ++ print "END="int2ip(end) ++ } ++} ++EOF +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh +new file mode 100755 +index 0000000..c503663 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh +@@ -0,0 +1,35 @@ ++#!/bin/sh ++# This reads the settings we need to have to configure everything ++# Argument $1: community ++ ++. /lib/functions.sh ++community="$1" ++ ++# reads variables from uci files, parameter $1 is the section ++get_var() { ++ uci -q show $1 | cut -d "." -f 2-100 |grep "\." | sed -e 's/^\([A-Za-z0-9_]*\)\./\1_/g' -e 's/=\(.*\)$/="\1"/g' ++} ++ ++handle_widgets() { ++ widgets="$widgets $1" ++} ++config_load freifunk ++config_foreach handle_widgets widget ++config_load profile_$community ++config_foreach handle_widgets widget ++echo "widgets=$widgets" ++ ++# read default values from /etc/config/freifunk ++for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults zone_freifunk include $widgets; do ++ get_var freifunk.$v ++done ++ ++# now read all values from the selected community profile, will override some values from the defaults before ++for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_interfacedefaults profile zone_freifunk include luci_splash ipv6 $widgets; do ++ get_var profile_$community.$v ++done ++ ++# read values from meshwizard ++for v in system luci_main contact community wan lan general ipv6; do ++ get_var meshwizard.$v ++done +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh +new file mode 100755 +index 0000000..ea20055 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh +@@ -0,0 +1,46 @@ ++#!/bin/sh ++# This script renames IB_wifi_ interface names into real interface names used on this system. ++# E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211 ++ ++. $dir/functions.sh ++ ++posIB=-1 ++ ++IBwifis="$(uci show meshwizard.netconfig | grep 'IB_' | sed 's/meshwizard.netconfig\.\(IB_wifi.*\)_.*/\1/' |uniq)" ++[ -z "$(echo $IBwifis |grep IB_wifi)" ] && exit ++ ++for w in $IBwifis; do ++ posIB=$(( $posIB + 1 )) ++ export IB_wifi$posIB="$w" ++done ++ ++pos=0 ++syswifis="$(uci show wireless |grep wifi-device | sed 's/wireless\.\(.*\)=.*/\1/' |uniq)" ++ ++for s in $syswifis; do ++ export syswifi$pos="$s" ++ pos=$(( $pos + 1 )) ++done ++ ++for i in `seq 0 $posIB`; do ++ IBwifi=$(eval echo \$IB_wifi$i) ++ syswifi=$(eval echo \$syswifi$i) ++ ++ if [ -n "$syswifi" ]; then ++ case $IBwifi in ++ IB_wifi* ) ++ # replace IB_wifi_* with actual wifi interface names, delete old ones first ++ uci show meshwizard.netconfig | grep $IBwifi | while read line; do ++ oldline=$(echo $line | cut -d "=" -f 1) ++ uci set $oldline="" ++ newline=$(echo $line |sed "s/$IBwifi/$syswifi/g") ++ uci set $newline ++ done ++ ;; ++ esac ++ unset IBwifi ++ unset syswifi ++ fi ++done ++ ++uci_commitverbose "Renaming wifi-devices in /etc/config/meshwizard" meshwizard +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh +new file mode 100755 +index 0000000..3f6ce35 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/restore_default_config.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh ++# This will restore default "factory" settings before running the meshwizard ++# and is used when cleanup=1 ++# Warning: This will reset network settings for wan and lan to defaults too. ++ ++echo "+ Restore default config as requested with cleanup=1" ++cp -f /rom/etc/config/* /etc/config/ ++rm /etc/config/wireless ++wifi detect > /etc/config/wireless ++rm /etc/config/network ++/etc/init.d/defconfig start +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh +new file mode 100755 +index 0000000..adf3429 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++net=$1 ++. $dir/functions.sh ++ ++ra="$(uci -q get meshwizard.netconfig.${net}_ipv6ra)" ++uci set autoipv6.${netrenamed}="interface" ++if [ -n "$ra" ]; then ++ uci set autoipv6.${netrenamed}.ra=1 ++fi ++ ++uci_commitverbose "Setup auto-ipv6 for interface $netrenamed" autoipv6 +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh +new file mode 100755 +index 0000000..8e3f015 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh +@@ -0,0 +1,17 @@ ++#!/bin/sh ++ ++. $dir/functions.sh ++ ++if [ "$ipv6_config" = "auto-ipv6-fromv4" ]; then ++ mode="fromv4" ++else ++ mode="random" ++fi ++ ++uci set autoipv6.olsr_node.enabled=1 ++uci set autoipv6.olsr_node.mode="$mode" ++uci_commitverbose "Setup auto-ipv6" autoipv6 ++ ++uci set network.wan.accept_ra=0 ++uci_commitverbose "Do not accept ra's on wan when using auto-ipv6" network ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh +new file mode 100755 +index 0000000..5c8863e +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh +@@ -0,0 +1,30 @@ ++#!/bin/sh ++# Sets up the dhcp part of dnsmasq ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++net="$1" ++ ++handle_dnsmasq() { ++ config_get interface "$1" interface ++ if [ "$interface" == "${netrenamed}dhcp" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename dhcp $1 ${netrenamed}dhcp ++ fi ++ fi ++} ++config_load dhcp ++config_foreach handle_dnsmasq dhcp ++ ++[ "$net" == "lan" ] && uci -q delete dhcp.lan ++ ++uci batch << EOF ++ set dhcp.${netrenamed}dhcp="dhcp" ++ set dhcp.${netrenamed}dhcp.interface="${netrenamed}dhcp" ++EOF ++ ++set_defaults "dhcp_" dhcp.${netrenamed}dhcp ++ ++uci_commitverbose "Setup DHCP for $netrenamed" dhcp ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh +new file mode 100755 +index 0000000..9297f91 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh +@@ -0,0 +1,29 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Set dnsmasq config ++handle_dhcp() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename dhcp $1 dnsmasq ++ fi ++} ++ ++config_load dhcp ++config_foreach handle_dhcp dnsmasq ++ ++uci batch << EOF ++ set dhcp.dnsmasq.local="/$profile_suffix/" ++ set dhcp.dnsmasq.domain="$profile_suffix" ++EOF ++ ++config_get addnhosts dnsmasq addnhosts ++if [ -z "${addnhosts/\var\/etc\/hosts.olsr/}" ]; then ++ uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr" ++ if [ "$ipv6_enabled" = 1 ]; then ++ uci add_list dhcp.dnsmasq.addnhosts="/var/etc/hosts.olsr.ipv6" ++ fi ++fi ++ ++uci_commitverbose "Setup dnsmasq" dhcp +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh +new file mode 100755 +index 0000000..bf47241 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh +@@ -0,0 +1,139 @@ ++#!/bin/sh ++# Add "freifunk" firewall zone ++# If wan/lan is used for olsr then remove these networks from wan/lan zones ++# Also setup rules defined in /etc/config/freifunk and /etc/config/profile_ ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config) ++lan_is_olsr=$(uci -q get meshwizard.netconfig.lan_config) ++ ++config_load firewall ++ ++# Rename firewall zone for freifunk if unnamed ++# If wan is used for olsr then set network for the firewall zone wan to ' ' to remove the wan interface from it, else add local restrict to it ++# If lan is used for olsr then set network for the firewall zone lan to ' ' to remove the lan interface from it ++ ++handle_fwzone() { ++ config_get name "$1" name ++ config_get network "$1" network ++ ++ if [ "$name" == "freifunk" ]; then ++ # rename section if unnamed ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename firewall $1 zone_freifunk ++ fi ++ fi ++ ++ if [ "$name" == "wan" ]; then ++ if [ "$wan_is_olsr" == 1 ]; then ++ uci set firewall.$1.network=' ' && uci_commitverbose "WAN is used for olsr, removed the wan interface from zone wan" firewall ++ else ++ uci set firewall.$1.local_restrict=1 && uci_commitverbose "Enable local_restrict for zone wan" firewall ++ fi ++ fi ++ ++ if [ "$name" == "lan" ] && [ "$lan_is_olsr" == 1 ]; then ++ uci set firewall.$1.network=' ' && uci_commitverbose "LAN is used for olsr, removed the lan interface from zone lan" firewall ++ fi ++} ++ ++config_foreach handle_fwzone zone ++ ++uci batch << EOF ++ set firewall.zone_freifunk="zone" ++ set firewall.zone_freifunk.name="freifunk" ++ set firewall.zone_freifunk.input="$zone_freifunk_input" ++ set firewall.zone_freifunk.forward="$zone_freifunk_forward" ++ set firewall.zone_freifunk.output="$zone_freifunk_output" ++EOF ++ ++uci_commitverbose "Setup firewall zones" firewall ++ ++# Usually we need to setup masquerading for lan, except lan is an olsr interface or has an olsr hna-entry ++ ++handle_interface() { ++ config_get interface "$1" interface ++ if [ "$interface" == "lan" ]; then ++ no_masq_lan=1 ++ fi ++} ++config_load olsrd ++config_foreach handle_interface Interface ++ ++LANIP="$(uci -q get network.lan.ipaddr)" ++if [ -n "$LANIP" ]; then ++ handle_hna() { ++ config_get netaddr "$1" netaddr ++ if [ "$LANIP" == "$netaddr" ]; then ++ no_masq_lan=1 ++ fi ++ } ++ config_foreach handle_hna Hna4 ++fi ++ ++currms=$(uci -q get firewall.zone_freifunk.masq_src) ++if [ ! "$no_masq_lan" == "1" ] && [ ! "$(uci -q get meshwizard.netconfig.lan_config)" == 1 ]; then ++ uci set firewall.zone_freifunk.masq="1" ++ [ -z "$(echo $currms |grep lan)" ] && uci add_list firewall.zone_freifunk.masq_src="lan" ++fi ++ ++ ++# Rules, Forwardings, advanced config and includes ++ ++for config in freifunk profile_$community; do ++ ++ config_load $config ++ ++ for section in advanced include fw_rule fw_forwarding; do ++ handle_firewall() { ++ local options=$(uci show $config."$1") ++ options=$(echo "$options" | sed -e "s/fw_//g" -e "s/^$config/firewall/g") ++ for o in $options; do ++ uci set $o ++ done ++ } ++ config_foreach handle_firewall $section ++ done ++done ++ ++# If we use auto-ipv6-dhcp then allow 547/udp on the freifunk zone ++if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then ++ uci batch <<- EOF ++ set firewall.dhcpv6=rule ++ set firewall.dhcpv6.src=freifunk ++ set firewall.dhcpv6.target=ACCEPT ++ set firewall.dhcpv6.dest_port=547 ++ set firewall.dhcpv6.proto=udp ++ EOF ++fi ++ ++# Firewall rules to allow incoming ssh and web if enabled ++ ++if [ "$wan_allowssh" == 1 ]; then ++ uci batch <<- EOF ++ set firewall.wanssh=rule ++ set firewall.wanssh.src=wan ++ set firewall.wanssh.target=ACCEPT ++ set firewall.wanssh.proto=tcp ++ set firewall.wanssh.dest_port=22 ++ EOF ++fi ++ ++if [ "$wan_allowweb" == 1 ]; then ++ uci batch <<- EOF ++ set firewall.wanweb=rule ++ set firewall.wanweb.src=wan ++ set firewall.wanweb.target=ACCEPT ++ set firewall.wanweb.proto=tcp ++ set firewall.wanweb.dest_port=80 ++ set firewall.wanwebhttps=rule ++ set firewall.wanwebhttps.src=wan ++ set firewall.wanwebhttps.target=ACCEPT ++ set firewall.wanwebhttps.proto=tcp ++ set firewall.wanwebhttps.dest_port=443 ++ EOF ++fi ++ ++uci_commitverbose "Setup rules, forwardings, advanced config and includes." firewall +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh +new file mode 100755 +index 0000000..11c351b +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh +@@ -0,0 +1,90 @@ ++#!/bin/sh ++# This will add $net to the zone firewall (and remove it from other zones where it is referenced) ++# It will also setup rules defined in /etc/config/freifunk and /etc/config/profile_ ++# Arg $1 = $net ++ ++net=$1 ++. /lib/functions.sh ++. $dir/functions.sh ++config_load firewall ++ ++# Get some variables ++type="$(uci -q get wireless.$net.type)" ++vap="$(uci -q get meshwizard.netconfig.$net\_vap)" ++wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config) ++ ++# Delete old firewall zone for freifunk ++handle_fwzone() { ++ config_get name "$1" name ++ config_get network "$1" network ++ ++ if [ "$2" == "zoneconf" ]; then ++ if [ "$name" == "freifunk" ]; then ++ # rename section if unnamed ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename firewall $1 zone_freifunk ++ fi ++ else ++ if [ ! "$name" == "freifunk" ] && [ -n "$netrenamed" -a -n "$(echo $network | grep $netrenamed)" ]; then ++ echo " Removed $netrenamed from firewall zone $name." ++ network_new=$(echo $network | sed -e 's/'$netrenamed'//' -e 's/^ //' -e 's/ / /' -e 's/ $//') ++ uci set firewall.$1.network="$network_new" ++ fi ++ fi ++ fi ++} ++ ++config_foreach handle_fwzone zone zoneconf ++ ++# Add $netrenamed and if needed ${netrenamed}dhcp to the "freifunk" zone ++config_get network zone_freifunk network ++ ++# remove ${netrenamed}dhcp from networks list ++[ -n "$network" -a -n "$net" ] && network="${network/${netrenamed}dhcp/}" ++network=$(echo $network) # Removes leading and trailing whitespaces ++ ++[ -n "$netrenamed" ] && [ -z "$(echo $network | grep $netrenamed)" ] && network="$network $netrenamed" ++ ++# check if this hardware supports VAPs ++supports_vap="0" ++$dir/helpers/supports_vap.sh $net $type && supports_vap=1 ++ ++if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then ++ [ -n "$netrenamed" ] && [ "$network" == "${network/${netrenamed}dhcp/}" ] && network="$network ${netrenamed}dhcp" ++fi ++ ++uci set firewall.zone_freifunk.network="$network" ++ ++uci_commitverbose "Add '$netrenamed' to freifunk firewall zone" firewall ++ ++currms=$(uci -q get firewall.zone_freifunk.masq_src) ++ ++# If interfaces are outside of the mesh network they should be natted ++ ++# Get dhcprange and meshnet ++if_ip="$(uci -q get network.${netrenamed}dhcp.ipaddr)" ++if_mask="$(uci -q get network.${netrenamed}dhcp.netmask)" ++ ++[ -n "$if_ip" -a "$if_mask" ] && export $(ipcalc.sh $if_ip $if_mask) ++[ -n "$NETWORK" -a "$PREFIX" ] && dhcprange="$NETWORK/$PREFIX" ++ ++if [ -n "$dhcprange" ]; then ++ meshnet="$(uci get profile_$community.profile.mesh_network)" ++ # check if the dhcprange is inside meshnet ++ dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" ++ if [ "$dhcpinmesh" == 1 ]; then ++ # needed or splash will not work ++ if [ "$has_luci_splash" == TRUE ]; then ++ uci set firewall.zone_freifunk.contrack="1" ++ fi ++ else ++ uci set firewall.zone_freifunk.masq=1 ++ [ -z "$(echo $currms |grep ${netrenamed}dhcp)" ] && uci add_list firewall.zone_freifunk.masq_src="${netrenamed}dhcp" ++ fi ++fi ++ ++for i in IP NETMASK BROADCAST NETWORK PREFIX; do ++ unset $i ++done ++ ++uci_commitverbose "Setup masquerading rules for '$netrenamed'" firewall +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh +new file mode 100755 +index 0000000..2f6144b +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++[ ! "$(uci -q get network.lan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Setup IPv6 for the lan interface ++ ++local ip6addr="" ++if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then ++ # get lan mac ++ local device="$(uci -p/var/state -q get network.lan.ifname)" ++ if [ -n "device" ]; then ++ ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $device)" ++ fi ++ uci set network.lan.ip6addr="${ip6addr}/112" ++fi ++ ++uci_commitverbose "Setup ipv6 address for lan" network +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh +new file mode 100755 +index 0000000..172dcf1 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh +@@ -0,0 +1,17 @@ ++#!/bin/sh ++# Setup static interface settings for lan if lan is not an olsr interface ++ ++[ ! "$(uci -q get network.lan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++uci batch << EOF ++ set network.lan.proto='$lan_proto' ++ set network.lan.ipaddr='$lan_ip4addr' ++ set network.lan.netmask='$lan_netmask' ++EOF ++ ++uci_commitverbose "Setup static ip settings for lan" network ++ ++uci delete meshwizard.lan && uci commit meshwizard +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh +new file mode 100755 +index 0000000..70f82fe +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh +@@ -0,0 +1,89 @@ ++# setup entry in /etc/config/network for a interface ++# Argument $1: network interface ++ ++net="$1" ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Setup a (new) interface section for $net ++ ++ipaddr=$(uci -q get meshwizard.netconfig.$net\_ip4addr) ++ip6addr=$(uci -q get meshwizard.netconfig.$net\_ip6addr) ++[ -z "$ipaddr" ] && msg_missing_value meshwizard $net\_ip4addr ++ ++netmask=$(uci -q get meshwizard.netconfig.$net\_netmask) ++[ -z "$netmask" ] && netmask="$interface_netmask" ++[ -z "$netmask" ] && netmask="255.255.0.0" ++ ++uci set network.$netrenamed="interface" ++set_defaults "interface_" network.$netrenamed ++ ++uci batch << EOF ++ set network.$netrenamed.proto="static" ++ set network.$netrenamed.ipaddr="$ipaddr" ++ set network.$netrenamed.netmask="$netmask" ++EOF ++ ++# Setup IPv6 for the interface ++local ip6addr ++if [ "$ipv6_enabled" = 1 ]; then ++ if [ "$ipv6_config" = "auto-ipv6-dhcpv6" ]; then ++ ip6addr="$($dir/helpers/gen_auto-ipv6-dhcpv6-ip.sh $netrenamed)" ++ uci set network.$netrenamed.ip6addr="${ip6addr}/112" ++ fi ++ if [ "$ipv6_config" = "static" ] && [ -n "$ip6addr" ]; then ++ uci set network.$netrenamed.ip6addr="$ip6addr" ++ fi ++fi ++ ++uci_commitverbose "Setup interface $netrenamed" network ++ ++# setup dhcp alias/interface ++ ++net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp) ++if [ "$net_dhcp" == 1 ]; then ++ ++ # Load meshwizard_settings ++ dhcprange="$(uci -q get meshwizard.netconfig.${net}_dhcprange)" ++ interface_ip="$(uci -q get meshwizard.netconfig.${net}_ip4addr)" ++ vap=$(uci -q get meshwizard.netconfig.${net}_vap) ++ ++ # Rename config ++ handle_dhcpalias() { ++ config_get interface "$1" interface ++ if [ "$interface" == "$netrenamed" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename network $1 ${netrenamed}dhcp ++ fi ++ fi ++ } ++ config_load network ++ config_foreach handle_dhcpalias interface ++ ++ # Get IP/netmask and start-ip for $net dhcp ++ # If no dhcprange is given in /etc/config/meshwizard we autogenerate one ++ ++ if [ -z "$dhcprange" ]; then ++ dhcprange="$($dir/helpers/gen_dhcp_ip.sh $interface_ip)/24" ++ uci set meshwizard.netconfig.${net}_dhcprange="$dhcprange" ++ fi ++ eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange 1 0) ++ ++ # setup wifi-dhcp interface or alias (using interface notation) ++ ++ # Setup alias for $net ++ ++ if [ "$vap" == 1 ]; then ++ uci set network.${netrenamed}dhcp=interface ++ else ++ uci set network.${netrenamed}dhcp=interface ++ uci set network.${netrenamed}dhcp.ifname="@${netrenamed}" ++ fi ++ ++ uci batch <<- EOF ++ set network.${netrenamed}dhcp.proto=static ++ set network.${netrenamed}dhcp.ipaddr="$START" ++ set network.${netrenamed}dhcp.netmask="$NETMASK" ++ EOF ++ uci_commitverbose "Setup interface for ${netrenamed}dhcp" network ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh +new file mode 100755 +index 0000000..5f6f550 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh +@@ -0,0 +1,102 @@ ++#!/bin/sh ++# Sets up olsrd ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Clean the config, remove interface wlan ++handle_interface() { ++ config_get interface "$1" interface ++ if [ "$interface" = "wlan" ]; then ++ uci delete olsrd.$1 ++ fi ++} ++config_load olsrd ++config_foreach handle_interface Interface ++ ++#Rename olsrd basic settings ++handle_olsrd() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename olsrd $1 olsrd ++ fi ++} ++config_foreach handle_olsrd olsrd ++ ++# Rename interface defaults ++handle_interfacedefaults() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename olsrd $1 InterfaceDefaults ++ fi ++} ++config_foreach handle_interfacedefaults InterfaceDefaults ++ ++# Set basic olsrd settings ++if [ "$ipv6_enabled" = 1 ] && [ "$has_ipv6" == "1" ]; then ++ uci set olsrd.olsrd.IpVersion="6and4" ++fi ++ ++ ++# Setup new InterfaceDefaults ++uci set olsrd.InterfaceDefaults=InterfaceDefaults ++set_defaults "olsr_interfacedefaults_" olsrd.InterfaceDefaults ++ ++# Rename nameservice, dyngw and httpinfo plugins ++ ++handle_plugin() { ++ config_get library "$1" library ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ new="$(echo $library | cut -d '.' -f 1)" ++ section_rename olsrd "$1" "$new" ++ fi ++} ++config_foreach handle_plugin LoadPlugin ++uci -q delete olsrd.olsrd_httpinfo ++uci -q delete olsrd.olsrd_dyn_gw ++ ++uci_commitverbose "Cleanup olsrd config" olsrd ++ ++ ++# Setup nameservice plugin ++if [ -n "$profile_suffix" ]; then ++ suffix=".$profile_suffix" ++else ++ suffix=".olsr" ++fi ++uci batch << EOF ++ set olsrd.olsrd_nameservice=LoadPlugin ++ set olsrd.olsrd_nameservice.library="olsrd_nameservice.so.0.3" ++ set olsrd.olsrd_nameservice.latlon_file="/var/run/latlon.js" ++ set olsrd.olsrd_nameservice.hosts_file="/var/etc/hosts.olsr" ++ set olsrd.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" ++ set olsrd.olsrd_nameservice.suffix="$suffix" ++EOF ++ ++uci_commitverbose "Setup olsr nameservice plugin" olsrd ++ ++# Setup dyngw_plain ++ ++# If Sharing of Internet is enabled then enable dyngw_plain plugin ++ ++if [ "$general_sharenet" == 1 ]; then ++ uci set olsrd.dyngw_plain=LoadPlugin ++ uci set olsrd.dyngw_plain.ignore=0 ++ uci set olsrd.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4" ++ ++ uci_commitverbose "Setup olsrd_dyngw_plain plugin" olsrd ++fi ++ ++# Setup watchdog ++uci batch << EOF ++ set olsrd.olsrd_watchdog=LoadPlugin ++ set olsrd.olsrd_watchdog.library="olsrd_watchdog.so.0.1" ++ set olsrd.olsrd_watchdog.file="/var/run/olsrd.watchdog" ++ set olsrd.olsrd_watchdog.interval=30 ++EOF ++uci_commitverbose "Setup olsr watchdog plugin" olsrd ++ ++# Setup jsoninfo ++uci batch << EOF ++ set olsrd.olsrd_jsoninfo=LoadPlugin ++ set olsrd.olsrd_jsoninfo.library="olsrd_jsoninfo.so.0.0" ++EOF ++uci_commitverbose "Setup olsr jsoninfo plugin" olsrd +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh +new file mode 100755 +index 0000000..edb5eea +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh +@@ -0,0 +1,60 @@ ++#!/bin/sh ++# Sets up olsrd interfaces ++# arg $1 = net ++ ++net=$1 ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++# Rename interface for $netrenamed ++handle_interface() { ++ config_get interface "$1" Interface ++ if [ "$interface" == "$netrenamed" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename olsrd $1 $netrenamed ++ fi ++ fi ++} ++ ++config_foreach handle_interface Interface ++ ++# Setup new interface for $netrenamed ++ ++uci set olsrd.$netrenamed=Interface ++set_defaults "olsr_interface_" olsrd.$net ++uci set olsrd.$netrenamed.interface="$netrenamed" ++ ++uci_commitverbose "Setup olsr interface for $netrenamed." olsrd ++ ++# If dhcp-network is inside the mesh_network then add HNA for it ++ ++dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange) ++uci -q delete olsrd.${netrenamed}clients ++ ++if [ -n "$dhcprange" ]; then ++ meshnet="$(uci get profile_$community.profile.mesh_network)" ++ dhcpinmesh="$($dir/helpers/check-range-in-range.sh $dhcprange $meshnet)" ++ ++ if [ "$dhcpinmesh" == 1 ] && [ -n "$meshnet" ]; then ++ uci set olsrd.${netrenamed}clients="Hna4" ++ eval $(sh $dir/helpers/ipcalc-cidr.sh $dhcprange) ++ uci set olsrd.${netrenamed}clients.netaddr="$NETWORK" ++ uci set olsrd.${netrenamed}clients.netmask="$NETMASK" ++ uci_commitverbose "Setup HNA for network $dhcprange" olsrd ++ fi ++fi ++ ++# Set Hna entry for ipv6 net for static ipv6 config ++uci -q delete olsrd.${netrenamed}static ++if [ "$ipv6_enabled" = "1" ] && [ "$ipv6_config" = "static" ]; then ++ local v6range="$(uci -q get meshwizard.netconfig.$net\_ip6addr)" ++ local v6net="$(echo $v6range | cut -d '/' -f 1)" ++ local v6mask="$(echo $v6range | cut -d '/' -f 2)" ++ if [ -n "$v6net" ] && [ -n "$v6mask" ]; then ++ uci set olsrd.${netrenamed}static="Hna6" ++ uci set olsrd.${netrenamed}static.netaddr="$v6net" ++ uci set olsrd.${netrenamed}static.prefix="$v6mask" ++ uci_commitverbose "Setup HNA for network $v6range" olsrd ++ fi ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh +new file mode 100755 +index 0000000..f898bd6 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_policyrouting.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh ++ ++. $dir/functions.sh ++ ++uci batch << EOF ++ set freifunk-policyrouting.pr.enable=1 ++ set freifunk-policyrouting.pr.strict=1 ++ set freifunk-policyrouting.pr.zones="freifunk" ++EOF ++ ++uci_commitverbose "Setup policyrouting" freifunk-policyrouting +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh +new file mode 100755 +index 0000000..9741111 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh +@@ -0,0 +1,40 @@ ++#!/bin/sh ++# Setup_splash, takes 1 argument: 1=net ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++net=$1 ++ ++if [ ! "$has_luci_splash" == TRUE ]; then ++ echo " Luci Splash is not installed, skipping setup of it." ++ exit ++fi ++ ++set_defaults "luci_splash_" luci_splash.general ++uci_commitverbose "Setup general splash settings" luci_splash ++ ++dhcprange=$(uci -q get meshwizard.netconfig.$net\_dhcprange) ++ ++if [ "$(uci -q get meshwizard.netconfig.$net\_dhcp)" == 1 ] && [ -n "$dhcprange" ]; then ++ handle_splash() { ++ config_get network "$1" network ++ if [ "$network" == "${netrenamed}dhcp" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename luci_splash $1 ${netrenamed}dhcp ++ fi ++ fi ++ } ++ config_load luci_splash ++ config_foreach handle_splash iface ++ ++ uci batch <<- EOF ++ set luci_splash.${netrenamed}dhcp="iface" ++ set luci_splash.${netrenamed}dhcp.network="${netrenamed}dhcp" ++ set luci_splash.${netrenamed}dhcp.zone="freifunk" ++ EOF ++ ++ uci_commitverbose "Setup dhcpsplash for ${netrenamed}dhcp" luci_splash ++ /etc/init.d/luci_splash enable ++fi ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh +new file mode 100755 +index 0000000..38b331e +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_ssh.sh +@@ -0,0 +1,26 @@ ++#!/bin/sh ++# Setup ssh. At this point only used to store pubkeys. ++ ++[ ! "$(uci -q get meshwizard.ssh)" == "system" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++authorized="/etc/dropbear/authorized_keys" ++ ++ ++config_load meshwizard ++ ++i=0 ++handle_pubkeys() { ++ local k="$1" ++ ( [ -f "$authorized" ] && grep -q "$k" $authorized) || { ++ echo "$k" >> $authorized ++ i=`expr $i + 1` ++ } ++} ++ ++config_list_foreach ssh pubkey handle_pubkeys ++ ++uci delete meshwizard.ssh ++uci_commitverbose "Added $i pubkeys to authorized_keys" meshwizard ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh +new file mode 100755 +index 0000000..e9ce953 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_system.sh +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++. $dir/functions.sh ++ ++set_defaults "system_" system.system ++uci -q delete meshwizard.system && uci commit meshwizard ++uci_commitverbose "System config" system +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh +new file mode 100755 +index 0000000..172e414 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_uhttpd.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh ++. $dir/functions.sh ++if [ "$ipv6_enabled" = "1" ]; then ++ uci batch <<- EOF ++ set uhttpd.main.listen_http=":80" ++ set uhttpd.main.listen_https=:"443" ++ EOF ++fi ++ ++uci_commitverbose "Setup uhttpd" uhttpd ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh +new file mode 100755 +index 0000000..91fc1d8 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_dhcp.sh +@@ -0,0 +1,18 @@ ++#!/bin/sh ++# Setup dhcp interface settings for wan. This is the OpenWrt default, ++# so all we need to do here is to delete wan from meshwizard after setup. ++# Also disallow ra on wan if ipv6 is enabled ++ ++[ ! "$(uci -q get network.wan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++if [ "$ipv6_enabled" = "1" ]; then ++ uci set network.wan.accept_ra='0' ++ uci_commitverbose "Do not accept ra on wan interface" network ++fi ++ ++ ++uci delete meshwizard.wan && uci commit meshwizard ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh +new file mode 100755 +index 0000000..570470a +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh +@@ -0,0 +1,20 @@ ++#!/bin/sh ++# Setup static interface settings for wan if wan is not an olsr interface ++ ++[ ! "$(uci -q get network.wan)" == "interface" ] && exit ++ ++. /lib/functions.sh ++. $dir/functions.sh ++ ++uci batch << EOF ++set network.wan.proto='$wan_proto' ++set network.wan.ipaddr='$wan_ip4addr' ++set network.wan.netmask='$wan_netmask' ++set network.wan.gateway='$wan_gateway' ++set network.wan.dns='$wan_dns' ++EOF ++ ++uci_commitverbose "Setup static ip settings for wan" network ++ ++uci delete meshwizard.wan && uci commit meshwizard ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh +new file mode 100755 +index 0000000..288252f +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_widgets.sh +@@ -0,0 +1,14 @@ ++#!/bin/sh ++. /lib/functions.sh ++ . $dir/functions.sh ++ ++if [ -n "$widgets" ]; then ++ [ ! -f "/etc/config/freifunk-widgets" ] && touch /etc/config/freifunk-widgets ++ for w in $widgets; do ++ uci set freifunk-widgets.${w}=widget ++ set_defaults "${w}_" freifunk-widgets.${w} ++ uci delete profile_$community.${w} ++ done ++ uci commit profile_$community ++ uci_commitverbose "Added widget config." freifunk-widgets ++fi +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh +new file mode 100755 +index 0000000..34bd0cb +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh +@@ -0,0 +1,102 @@ ++#!/bin/sh ++# sets up a wifi interface for meshing ++# Arguments: $1 = network interface ++ ++net="$1" ++. /lib/functions.sh ++. $dir/functions.sh ++ ++##### wifi-device ##### ++ ++# Get the type before we delete the wifi-device ++config_load wireless ++config_get type $net type ++ ++# Rename wifi-device for $net ++ ++handle_wifidevice() { ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename wireless $1 $net ++ fi ++} ++config_foreach handle_wifidevice wifi-device ++ ++# create new wifi-device for $net ++uci set wireless.${net}=wifi-device ++ ++# get and set wifi-device defaults ++set_defaults "wifi_device_" wireless.${net} ++ ++channel="$(uci -q get meshwizard.netconfig.$net\_channel)" ++vap="$(uci -q get meshwizard.netconfig.$net\_vap)" ++ ++if [ -z "$channel" -o "$channel" == "default" ]; then ++ channel=$wifi_device_channel ++fi ++ ++uci batch << EOF ++ set wireless.${net}.type="$type" ++ set wireless.${net}.channel="$channel" ++EOF ++ ++uci_commitverbose "Setup wifi device for $netrenamed" wireless ++ ++##### wifi iface ++ ++# Rename wifi-iface for $net ++handle_interface() { ++ config_get device "$1" device ++ if [ "$device" == "$net" ]; then ++ if [ -z "${1/cfg[0-9a-fA-F]*/}" ]; then ++ section_rename wireless $1 ${net}_iface ++ fi ++ fi ++} ++config_foreach handle_interface wifi-iface ++ ++# create new wifi-device for $net ++uci set wireless.$net\_iface=wifi-iface ++ ++# create new wifi-iface for $net from defaults ++set_defaults "wifi_iface_" wireless.$net\_iface ++ ++# overwrite defaults ++bssid="$($dir/helpers/gen_bssid.sh $channel $community)" ++ ++ssid="$profile_ssid" ++if [ "$profile_ssid_scheme" == "addchannel" ]; then ++ ssid="$ssid - ch$channel" ++fi ++ ++uci batch << EOF ++ set wireless.$net\_iface.device="${net}" ++ set wireless.$net\_iface.network="$netrenamed" ++ set wireless.$net\_iface.ssid="$ssid" ++ set wireless.$net\_iface.bssid="$bssid" ++EOF ++ ++uci_commitverbose "Setup wifi interface for $netrenamed" wireless ++ ++## VAP ++ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)" ++ ++# check if this hardware supports VAPs ++# the interface needs to be up before the check can happen ++ ++/sbin/wifi ++ ++supports_vap="0" ++$dir/helpers/supports_vap.sh $net $type && supports_vap=1 ++ ++if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then ++ uci batch <<- EOF ++ set wireless.$net\_iface_dhcp="wifi-iface" ++ set wireless.$net\_iface_dhcp.device="$net" ++ set wireless.$net\_iface_dhcp.mode="ap" ++ set wireless.$net\_iface_dhcp.encryption="none" ++ set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp" ++ set wireless.$net\_iface_dhcp.ssid="FF-AP-$ip4addr" ++ EOF ++ uci_commitverbose "Setup VAP interface for $netrenamed" wireless ++fi ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh +new file mode 100755 +index 0000000..045ea97 +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh +@@ -0,0 +1,35 @@ ++#!/bin/sh ++# checks if a given device can be used for a VAP interface (1 adhoc + 1 ap) ++dev="$1" ++type="$2" ++ ++ ++if [ -z "$dev" -o -z "$type" ]; then ++ exit 1 ++fi ++ ++if [ "$type" = "atheros" ]; then ++ exit 0 ++elif [ "$type" = "mac80211" ]; then ++ # not hostapd[-mini], no VAP ++ if [ ! -x /usr/sbin/hostapd ]; then ++ echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211." ++ exit 1 ++ fi ++ # get driver in use ++ netindex="$(echo $dev |sed 's/[a-zA-z]*//')" ++ if [ -d /sys/class/net/wlan${netindex}/device/driver/module ]; then ++ driver="$(basename $(ls -l /sys/class/net/wlan${netindex}/device/driver/module | sed -ne 's/.* -> //p'))" ++ if [ "$driver" = "ath9k" -o "$driver" = "ath5k" ]; then ++ exit 0 ++ else ++ exit 1 ++ fi ++ else ++ exit 1 ++ fi ++else ++ exit 1 ++fi ++ ++ +diff --git a/feeds/luci/meshwizard/files/usr/bin/meshwizard/wizard.sh b/feeds/luci/meshwizard/files/usr/bin/meshwizard/wizard.sh +new file mode 100755 +index 0000000..47fc3ca +--- /dev/null ++++ b/feeds/luci/meshwizard/files/usr/bin/meshwizard/wizard.sh +@@ -0,0 +1,121 @@ ++#!/bin/sh ++ ++# This collection of scripts will take settings from /etc/config/meshwizard, /etc/config/freifunk ++# and /etc/config/profile_ and setup the router to participate in wireless mesh networks ++ ++# Copyright 2011 Manuel Munz ++ ++# 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 ++ ++. /lib/functions.sh ++ ++echo " ++/* Meshwizard 0.0.9 */ ++" ++ ++# config ++export dir="/usr/bin/meshwizard" ++. $dir/functions.sh ++[ -f /proc/net/ipv6_route ] && export has_ipv6=1 ++ ++# Check which packages we have installed ++export has_luci=FALSE ++opkg list_installed |grep luci-mod-admin > /dev/null && export has_luci=TRUE ++export has_luci_splash=FALSE ++opkg list_installed |grep luci-app-splash > /dev/null && export has_luci_splash=TRUE ++ ++# Check whether we want to cleanup/restore uci config before setting new options ++cleanup=$(uci -q get meshwizard.general.cleanup) ++[ "$cleanup" == 1 ] && $dir/helpers/restore_default_config.sh ++ ++# Rename wifi interfaces ++$dir/helpers/rename-wifi.sh ++ ++# Get community ++community=$(uci -q get meshwizard.community.name || uci -q get freifunk.community.name) ++[ -z "$community" ] && echo "Error: Community is not set in /etc/config/freifunk, aborting now." && exit 1 ++export community="$community" ++echo $community ++ ++# Get a list of networks we need to setup ++networks=$(uci show meshwizard.netconfig | grep -v "netconfig=" | sed -e 's/meshwizard.netconfig\.\(.*\)\_.*/\1/' |sort|uniq) ++export networks ++[ -z "$networks" ] && echo "Error: No networks to setup could be found in /etc/config/meshwizard, aborting now." && exit 1 ++ ++# Read default values (first from /etc/config/freifunk, then from /etc/config/profile_$community ++# then /etc/config/meshwizard ++# last will overwrite first ++ ++$dir/helpers/read_defaults.sh $community > /tmp/meshwizard.tmp ++while read line; do ++ export "${line//\"/}" ++done < /tmp/meshwizard.tmp ++ ++# Do config ++$dir/helpers/initial_config.sh ++$dir/helpers/setup_dnsmasq.sh ++$dir/helpers/setup_system.sh ++$dir/helpers/setup_olsrd.sh ++$dir/helpers/setup_firewall.sh ++$dir/helpers/setup_ssh.sh ++$dir/helpers/setup_uhttpd.sh ++$dir/helpers/setup_widgets.sh ++ ++if [ "$wan_proto" == "static" ] && [ -n "$wan_ip4addr" ] && [ -n "$wan_netmask" ]; then ++ $dir/helpers/setup_wan_static.sh ++fi ++ ++if [ "$wan_proto" == "dhcp" ]; then ++ $dir/helpers/setup_wan_dhcp.sh ++fi ++ ++if [ "$lan_proto" == "static" ] && [ -n "$lan_ip4addr" ] && [ -n "$lan_netmask" ]; then ++ $dir/helpers/setup_lan_static.sh ++fi ++ ++if [ "$ipv6_enabled" == 1 ] && [ "$has_ipv6" = 1 ]; then ++ $dir/helpers/setup_lan_ipv6.sh ++ # Setup auto-ipv6 ++ if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then ++ $dir/helpers/setup_auto-ipv6.sh ++ fi ++fi ++ ++# Setup policyrouting if internet sharing is disabled and wan is not used for olsrd ++# Always disable it first to make sure its disabled when the user decied to share his internet ++uci set freifunk-policyrouting.pr.enable=0 ++if [ ! "$general_sharenet" == 1 ] && [ ! "$(uci -q get meshwizard.netconfig.wan_proto)" == "olsr" ]; then ++ $dir/helpers/setup_policyrouting.sh ++fi ++ ++# Configure found networks ++for net in $networks; do ++ # radioX devices need to be renamed ++ netrenamed="${net/radio/wireless}" ++ export netrenamed ++ $dir/helpers/setup_network.sh $net ++ if [ ! "$net" == "wan" ] && [ ! "$net" == "lan" ]; then ++ $dir/helpers/setup_wifi.sh $net ++ fi ++ $dir/helpers/setup_olsrd_interface.sh $net ++ ++ net_dhcp=$(uci -q get meshwizard.netconfig.${net}_dhcp) ++ if [ "$net_dhcp" == 1 ]; then ++ $dir/helpers/setup_dhcp.sh $net ++ fi ++ ++ $dir/helpers/setup_splash.sh $net ++ $dir/helpers/setup_firewall_interface.sh $net ++ ++ if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then ++ $dir/helpers/setup_auto-ipv6-interface.sh $net ++ fi ++done ++ ++##### Reboot the router (because simply restarting services gave errors) ++ ++echo "+ The wizard has finished and the router will reboot now." ++ ++reboot +diff --git a/feeds/luci/remote-update/.svn/all-wcprops b/feeds/luci/remote-update/.svn/all-wcprops +new file mode 100644 +index 0000000..249e4b4 +--- /dev/null ++++ b/feeds/luci/remote-update/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 55 ++/!svn/ver/7771/luci/trunk/contrib/package/remote-update ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 64 ++/!svn/ver/7771/luci/trunk/contrib/package/remote-update/Makefile ++END +diff --git a/feeds/luci/remote-update/.svn/entries b/feeds/luci/remote-update/.svn/entries +new file mode 100644 +index 0000000..0f8e59a +--- /dev/null ++++ b/feeds/luci/remote-update/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/remote-update ++http://svn.luci.subsignal.org ++ ++ ++ ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++d28711bc0d8dbf435597c592a7c8a533 ++2011-10-23T14:20:51.856269Z ++7771 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++885 ++ +diff --git a/feeds/luci/remote-update/.svn/text-base/Makefile.svn-base b/feeds/luci/remote-update/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2bb3b24 +--- /dev/null ++++ b/feeds/luci/remote-update/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2009 Jo-Philipp Wich ++# ++# This is free software, licensed under the Apache 2.0 license. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=remote-update ++PKG_RELEASE:=4 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/remote-update ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk remote update utility. ++ DEPENDS:=@TARGET_atheros||@TARGET_ar71xx||@TARGET_brcm_2_4 ++endef ++ ++define Package/remote-update/description ++ The freifunk remote-update utility uses sysupgrade to reflash the currently ++ running firmware while keeping most of the existing configuratio. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/remote-update/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,remote-update)) +diff --git a/feeds/luci/remote-update/Makefile b/feeds/luci/remote-update/Makefile +new file mode 100644 +index 0000000..2bb3b24 +--- /dev/null ++++ b/feeds/luci/remote-update/Makefile +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2009 Jo-Philipp Wich ++# ++# This is free software, licensed under the Apache 2.0 license. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=remote-update ++PKG_RELEASE:=4 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/remote-update ++ SECTION:=luci ++ CATEGORY:=LuCI ++ SUBMENU:=9. Freifunk ++ TITLE:=Freifunk remote update utility. ++ DEPENDS:=@TARGET_atheros||@TARGET_ar71xx||@TARGET_brcm_2_4 ++endef ++ ++define Package/remote-update/description ++ The freifunk remote-update utility uses sysupgrade to reflash the currently ++ running firmware while keeping most of the existing configuratio. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/remote-update/install ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,remote-update)) +diff --git a/feeds/luci/remote-update/files/.svn/all-wcprops b/feeds/luci/remote-update/files/.svn/all-wcprops +new file mode 100644 +index 0000000..dd5e075 +--- /dev/null ++++ b/feeds/luci/remote-update/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 61 ++/!svn/ver/5572/luci/trunk/contrib/package/remote-update/files ++END +diff --git a/feeds/luci/remote-update/files/.svn/entries b/feeds/luci/remote-update/files/.svn/entries +new file mode 100644 +index 0000000..6f1065a +--- /dev/null ++++ b/feeds/luci/remote-update/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/remote-update/files ++http://svn.luci.subsignal.org ++ ++ ++ ++2009-11-22T22:25:32.577564Z ++5572 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++usr ++dir ++ +diff --git a/feeds/luci/remote-update/files/usr/.svn/all-wcprops b/feeds/luci/remote-update/files/usr/.svn/all-wcprops +new file mode 100644 +index 0000000..3236f92 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 65 ++/!svn/ver/5572/luci/trunk/contrib/package/remote-update/files/usr ++END +diff --git a/feeds/luci/remote-update/files/usr/.svn/entries b/feeds/luci/remote-update/files/usr/.svn/entries +new file mode 100644 +index 0000000..e029744 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/remote-update/files/usr ++http://svn.luci.subsignal.org ++ ++ ++ ++2009-11-22T22:25:32.577564Z ++5572 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++sbin ++dir ++ +diff --git a/feeds/luci/remote-update/files/usr/sbin/.svn/all-wcprops b/feeds/luci/remote-update/files/usr/sbin/.svn/all-wcprops +new file mode 100644 +index 0000000..586eb99 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/sbin/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/!svn/ver/5572/luci/trunk/contrib/package/remote-update/files/usr/sbin ++END ++remote-update ++K 25 ++svn:wc:ra_dav:version-url ++V 84 ++/!svn/ver/5572/luci/trunk/contrib/package/remote-update/files/usr/sbin/remote-update ++END +diff --git a/feeds/luci/remote-update/files/usr/sbin/.svn/entries b/feeds/luci/remote-update/files/usr/sbin/.svn/entries +new file mode 100644 +index 0000000..6c05518 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/sbin/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++9682 ++http://svn.luci.subsignal.org/luci/trunk/contrib/package/remote-update/files/usr/sbin ++http://svn.luci.subsignal.org ++ ++ ++ ++2009-11-22T22:25:32.577564Z ++5572 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ab181a69-ba2e-0410-a84d-ff88ab4c47bc ++ ++remote-update ++file ++ ++ ++ ++ ++2013-03-17T12:17:59.000000Z ++3ff7efd28ed4bffef1e55976c8e1e8e8 ++2009-11-22T22:25:32.577564Z ++5572 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6188 ++ +diff --git a/feeds/luci/remote-update/files/usr/sbin/.svn/prop-base/remote-update.svn-base b/feeds/luci/remote-update/files/usr/sbin/.svn/prop-base/remote-update.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/sbin/.svn/prop-base/remote-update.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/luci/remote-update/files/usr/sbin/.svn/text-base/remote-update.svn-base b/feeds/luci/remote-update/files/usr/sbin/.svn/text-base/remote-update.svn-base +new file mode 100644 +index 0000000..6e45e48 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/sbin/.svn/text-base/remote-update.svn-base +@@ -0,0 +1,306 @@ ++#!/bin/sh ++ ++local tempfile=/tmp/remote-upgrade.img ++local D2='\([0-9]\{2\}\)' ++local D4='\([0-9]\{4\}\)' ++local NL=' ++' ++ ++find_architecture() ++{ ++ local ifs="$IFS"; IFS="-" ++ set -- $(opkg list_installed kernel) ++ IFS="$ifs" ++ ++ echo "$3" ++} ++ ++find_image() ++{ ++ case "$1" in ++ atheros) ++ echo "openwrt-atheros-combined.squashfs.img" ++ ;; ++ ar71xx) ++ echo "openwrt-ar71xx-combined.squashfs.img" ++ ;; ++ brcm) ++ echo "openwrt-brcm-2.4-squashfs.trx" ++ ;; ++ esac ++} ++ ++check_image() ++{ ++ local file; for file in /lib/upgrade/*.sh; do . $file; done ++ if platform_check_image "$1" >/dev/null 2>/dev/null; then ++ return 0 ++ fi ++ return 1 ++} ++ ++find_remote_checksum() ++{ ++ wget -qO- ${1%/*}/md5sums 2>/dev/null | \ ++ sed -ne '/'$2'/ { s/ .*//p }' ++} ++ ++find_local_checksum() ++{ ++ set -- $(md5sum "$tempfile") ++ echo $1 ++} ++ ++find_remote_info() ++{ ++ wget -qO- "${1%/*}/VERSION.txt" 2>/dev/null ++} ++ ++find_remote_version() ++{ ++ find_remote_info "$1" | \ ++ sed -ne "s!.*$D4/$D2/$D2 $D2:$D2.*!\\1\\2\\3\\4\\5!p;t" ++} ++ ++find_local_version() ++{ ++ if [ -f /rom/etc/banner ]; then ++ sed -ne "s!.*$D4/$D2/$D2 $D2:$D2.*!\\1\\2\\3\\4\\5!p;t" \ ++ /rom/etc/banner ++ else ++ date +"%Y%m%d%H%M" -r /bin/sh ++ fi ++} ++ ++stop_service() ++{ ++ [ -x /etc/init.d/$1 ] && { ++ echo -n "Stopping service $1 ... " ++ /etc/init.d/$1 stop >/dev/null 2>/dev/null ++ echo "done" ++ } ++} ++ ++do_wait() ++{ ++ if [ ${1:-0} -gt 0 ]; then ++ echo -n "${2:-Waiting} " ++ for i in $(seq 1 $1); do ++ printf "%-2dseconds" $(($1-$i)) ++ sleep 1 ++ echo -en "\b\b\b\b\b\b\b\b\b" ++ done ++ echo "${NL}" ++ fi ++} ++ ++version_compare() ++{ ++ local v1="$1" ++ local v2="$2" ++ ++ while [ -n "$v1" -o -n "$v2" ]; do ++ if [ -z "${v2:0:4}" -o "${v1:0:4}" -gt "${v2:0:4}" ]; then ++ return 1 ++ elif [ -z "${v1:0:4}" -o "${v1:0:4}" -lt "${v2:0:4}" ]; then ++ return 2 ++ fi ++ ++ v1="${v1:4}" ++ v2="${v2:4}" ++ done ++ ++ return 0 ++} ++ ++usage() ++{ ++ cat <] -c ++ remote-update [-v] [-y] [-u ] -w ++ remote-update [-d] [-n] [-v] [-y] [-s ] [-u ] ++ ++Actions: ++ -h Display this help message and exit. ++ -c Check for firmware update and exit. ++ -w Fetch image and exit, do not perform flash write. ++ ++Options: ++ -d Do not detach from terminal. ++ -n Do not backup configuration. ++ -v Skip verification of downloaded image. ++ -y Assume defaults for all questions. ++ ++ -s ++ Sleep given amount of seconds before starting flash write. ++ If ommitted and '-y' is not used, 5 seconds are assumed. ++ ++ -u ++ Fetch firmware image from given url. A file "md5sums" is expected ++ in the same remote directory. If there is no such file, use -v to ++ suppress verification. ++ ++EOT ++ ++ exit 1 ++} ++ ++ ++while getopts "s:u:cdnvwyh" flag; do ++ case $flag in ++ s) sleeptime="$OPTARG";; ++ u) updateurl="$OPTARG";; ++ c) checkupdate=1;; ++ d) nodetach=1;; ++ n) nobackup=1;; ++ v) noverify=1;; ++ w) noflash=1;; ++ y) noquestions=1;; ++ *) usage;; ++ esac ++done ++ ++ ++local image_url="$updateurl" ++local image_name="${image_url##*/}" ++ ++[ -z "$image_url" ] && { ++ local arch=$(find_architecture) ++ local image=$(find_image "$arch") ++ local repo=$(uci get freifunk.upgrade.repository 2>/dev/null) ++ repo=${repo:-$(uci get system.upgrade.repository 2>/dev/null)} ++ ++ [ -z "$arch" ] && { ++ echo "Can not determine the current architecture." ++ exit 1 ++ } ++ ++ [ -z "$repo" ] && { ++ echo "No repository configured in 'system.upgrade.repository'." ++ echo "Use the '-u' flag to specify an image location." ++ exit 1 ++ } ++ ++ [ -z "$image" ] && { ++ echo "No suitable image for the '$arch' architecture." ++ echo "Your platform is not supported." ++ exit 1 ++ } ++ ++ echo "Architecture: $arch" ++ echo "Repository: $repo" ++ ++ image_name="$image" ++ image_url="${repo%/}/$arch/$image" ++} ++ ++ ++if [ "$checkupdate" = 1 ]; then ++ local v1=$(find_local_version) ++ local v2=$(find_remote_version "$image_url") ++ ++ [ -n "$v1" -a -n "$v2" ] && { ++ version_compare "$v1" "$v2" ++ [ $? == 2 ] && { ++ echo "Update available!${NL}Local: $v1${NL}Remote: $v2${NL}--" ++ find_remote_info "$image_url" ++ exit 0 ++ } || { ++ echo "Local version $v1 is up to date" ++ exit 2 ++ } ++ } || { ++ echo "No remote time stamp found." ++ exit 1 ++ } ++else ++ if [ "$noquestions" != 1 ]; then ++ echo -n "${NL}About to download $image_name. Continue? [y] " ++ read answer ++ case "$answer" in ++ [nN]) exit 1;; ++ esac ++ fi ++ ++ echo -n "Downloading $image_name ... " ++ rm -f $tempfile ++ wget -qO $tempfile "$image_url" 2>/dev/null ++ [ $? == 0 ] && echo done || { ++ echo failed ++ rm -f $tempfile ++ exit 1 ++ } ++ ++ if [ "$noverify" != 1 ]; then ++ echo -n "Verifying $image_name ... " ++ ++ local md5_remote=$(find_remote_checksum "$image_url" "$image_name") ++ local md5_local=$(find_local_checksum) ++ ++ check_image "$tempfile" ++ local image_ok=$? ++ ++ if [ $image_ok = 0 -a -n "$md5_remote" -a -n "$md5_local" -a "$md5_remote" = "$md5_local" ]; then ++ echo "done" ++ else ++ if [ $image_ok != 0 ]; then ++ echo "unsupported image type" ++ else ++ echo "checksum mismatch! (local:${md5_local:-(none)} remote:${md5_remote:-(none)})" ++ fi ++ ++ local answer=n ++ if [ "$noquestions" != 1 ]; then ++ echo -n "${NL}Verification failed. Continue anyway? [n] " ++ read answer ++ fi ++ ++ case "$answer" in ++ [yYjJ]*) : ;; ++ *) ++ echo "Aborting." ++ rm -f $tempfile ++ exit 1 ++ ;; ++ esac ++ fi ++ fi ++ ++ if [ "$noflash" != 1 ]; then ++ if [ -f "$tempfile" ]; then ++ if [ "$noquestions" == 1 ]; then ++ do_wait ${sleeptime:-5} "${NL}About to start flashing, hit to abort!${NL}${NL}Starting in" ++ else ++ if [ -z "$nobackup" ]; then ++ echo -n "${NL}Keep configuration files? [y] " ++ read answer ++ case "$answer" in ++ [nN]) nobackup=1;; ++ esac ++ fi ++ ++ echo -n "${NL}About to start flashing!${NL}Hit to continue or to abort.${NL}" ++ read answer ++ fi ++ ++ for s in lucid collectd; do stop_service $s; done ++ ++ if [ "$nodetach" != 1 ]; then ++ echo -n "Starting sysupgrade in background ... " ++ /bin/busybox start-stop-daemon -S -b -x /sbin/sysupgrade -- ${nobackup:+-n} "$tempfile" ++ echo "done" ++ else ++ echo "Executing sysupgrade ... " ++ exec /sbin/sysupgrade ${nobackup:+-n} "$tempfile" ++ fi ++ else ++ echo "No upgrade image found!" ++ exit 1 ++ fi ++ else ++ echo "Image saved in '$tempfile'" ++ fi ++fi +diff --git a/feeds/luci/remote-update/files/usr/sbin/remote-update b/feeds/luci/remote-update/files/usr/sbin/remote-update +new file mode 100755 +index 0000000..6e45e48 +--- /dev/null ++++ b/feeds/luci/remote-update/files/usr/sbin/remote-update +@@ -0,0 +1,306 @@ ++#!/bin/sh ++ ++local tempfile=/tmp/remote-upgrade.img ++local D2='\([0-9]\{2\}\)' ++local D4='\([0-9]\{4\}\)' ++local NL=' ++' ++ ++find_architecture() ++{ ++ local ifs="$IFS"; IFS="-" ++ set -- $(opkg list_installed kernel) ++ IFS="$ifs" ++ ++ echo "$3" ++} ++ ++find_image() ++{ ++ case "$1" in ++ atheros) ++ echo "openwrt-atheros-combined.squashfs.img" ++ ;; ++ ar71xx) ++ echo "openwrt-ar71xx-combined.squashfs.img" ++ ;; ++ brcm) ++ echo "openwrt-brcm-2.4-squashfs.trx" ++ ;; ++ esac ++} ++ ++check_image() ++{ ++ local file; for file in /lib/upgrade/*.sh; do . $file; done ++ if platform_check_image "$1" >/dev/null 2>/dev/null; then ++ return 0 ++ fi ++ return 1 ++} ++ ++find_remote_checksum() ++{ ++ wget -qO- ${1%/*}/md5sums 2>/dev/null | \ ++ sed -ne '/'$2'/ { s/ .*//p }' ++} ++ ++find_local_checksum() ++{ ++ set -- $(md5sum "$tempfile") ++ echo $1 ++} ++ ++find_remote_info() ++{ ++ wget -qO- "${1%/*}/VERSION.txt" 2>/dev/null ++} ++ ++find_remote_version() ++{ ++ find_remote_info "$1" | \ ++ sed -ne "s!.*$D4/$D2/$D2 $D2:$D2.*!\\1\\2\\3\\4\\5!p;t" ++} ++ ++find_local_version() ++{ ++ if [ -f /rom/etc/banner ]; then ++ sed -ne "s!.*$D4/$D2/$D2 $D2:$D2.*!\\1\\2\\3\\4\\5!p;t" \ ++ /rom/etc/banner ++ else ++ date +"%Y%m%d%H%M" -r /bin/sh ++ fi ++} ++ ++stop_service() ++{ ++ [ -x /etc/init.d/$1 ] && { ++ echo -n "Stopping service $1 ... " ++ /etc/init.d/$1 stop >/dev/null 2>/dev/null ++ echo "done" ++ } ++} ++ ++do_wait() ++{ ++ if [ ${1:-0} -gt 0 ]; then ++ echo -n "${2:-Waiting} " ++ for i in $(seq 1 $1); do ++ printf "%-2dseconds" $(($1-$i)) ++ sleep 1 ++ echo -en "\b\b\b\b\b\b\b\b\b" ++ done ++ echo "${NL}" ++ fi ++} ++ ++version_compare() ++{ ++ local v1="$1" ++ local v2="$2" ++ ++ while [ -n "$v1" -o -n "$v2" ]; do ++ if [ -z "${v2:0:4}" -o "${v1:0:4}" -gt "${v2:0:4}" ]; then ++ return 1 ++ elif [ -z "${v1:0:4}" -o "${v1:0:4}" -lt "${v2:0:4}" ]; then ++ return 2 ++ fi ++ ++ v1="${v1:4}" ++ v2="${v2:4}" ++ done ++ ++ return 0 ++} ++ ++usage() ++{ ++ cat <] -c ++ remote-update [-v] [-y] [-u ] -w ++ remote-update [-d] [-n] [-v] [-y] [-s ] [-u ] ++ ++Actions: ++ -h Display this help message and exit. ++ -c Check for firmware update and exit. ++ -w Fetch image and exit, do not perform flash write. ++ ++Options: ++ -d Do not detach from terminal. ++ -n Do not backup configuration. ++ -v Skip verification of downloaded image. ++ -y Assume defaults for all questions. ++ ++ -s ++ Sleep given amount of seconds before starting flash write. ++ If ommitted and '-y' is not used, 5 seconds are assumed. ++ ++ -u ++ Fetch firmware image from given url. A file "md5sums" is expected ++ in the same remote directory. If there is no such file, use -v to ++ suppress verification. ++ ++EOT ++ ++ exit 1 ++} ++ ++ ++while getopts "s:u:cdnvwyh" flag; do ++ case $flag in ++ s) sleeptime="$OPTARG";; ++ u) updateurl="$OPTARG";; ++ c) checkupdate=1;; ++ d) nodetach=1;; ++ n) nobackup=1;; ++ v) noverify=1;; ++ w) noflash=1;; ++ y) noquestions=1;; ++ *) usage;; ++ esac ++done ++ ++ ++local image_url="$updateurl" ++local image_name="${image_url##*/}" ++ ++[ -z "$image_url" ] && { ++ local arch=$(find_architecture) ++ local image=$(find_image "$arch") ++ local repo=$(uci get freifunk.upgrade.repository 2>/dev/null) ++ repo=${repo:-$(uci get system.upgrade.repository 2>/dev/null)} ++ ++ [ -z "$arch" ] && { ++ echo "Can not determine the current architecture." ++ exit 1 ++ } ++ ++ [ -z "$repo" ] && { ++ echo "No repository configured in 'system.upgrade.repository'." ++ echo "Use the '-u' flag to specify an image location." ++ exit 1 ++ } ++ ++ [ -z "$image" ] && { ++ echo "No suitable image for the '$arch' architecture." ++ echo "Your platform is not supported." ++ exit 1 ++ } ++ ++ echo "Architecture: $arch" ++ echo "Repository: $repo" ++ ++ image_name="$image" ++ image_url="${repo%/}/$arch/$image" ++} ++ ++ ++if [ "$checkupdate" = 1 ]; then ++ local v1=$(find_local_version) ++ local v2=$(find_remote_version "$image_url") ++ ++ [ -n "$v1" -a -n "$v2" ] && { ++ version_compare "$v1" "$v2" ++ [ $? == 2 ] && { ++ echo "Update available!${NL}Local: $v1${NL}Remote: $v2${NL}--" ++ find_remote_info "$image_url" ++ exit 0 ++ } || { ++ echo "Local version $v1 is up to date" ++ exit 2 ++ } ++ } || { ++ echo "No remote time stamp found." ++ exit 1 ++ } ++else ++ if [ "$noquestions" != 1 ]; then ++ echo -n "${NL}About to download $image_name. Continue? [y] " ++ read answer ++ case "$answer" in ++ [nN]) exit 1;; ++ esac ++ fi ++ ++ echo -n "Downloading $image_name ... " ++ rm -f $tempfile ++ wget -qO $tempfile "$image_url" 2>/dev/null ++ [ $? == 0 ] && echo done || { ++ echo failed ++ rm -f $tempfile ++ exit 1 ++ } ++ ++ if [ "$noverify" != 1 ]; then ++ echo -n "Verifying $image_name ... " ++ ++ local md5_remote=$(find_remote_checksum "$image_url" "$image_name") ++ local md5_local=$(find_local_checksum) ++ ++ check_image "$tempfile" ++ local image_ok=$? ++ ++ if [ $image_ok = 0 -a -n "$md5_remote" -a -n "$md5_local" -a "$md5_remote" = "$md5_local" ]; then ++ echo "done" ++ else ++ if [ $image_ok != 0 ]; then ++ echo "unsupported image type" ++ else ++ echo "checksum mismatch! (local:${md5_local:-(none)} remote:${md5_remote:-(none)})" ++ fi ++ ++ local answer=n ++ if [ "$noquestions" != 1 ]; then ++ echo -n "${NL}Verification failed. Continue anyway? [n] " ++ read answer ++ fi ++ ++ case "$answer" in ++ [yYjJ]*) : ;; ++ *) ++ echo "Aborting." ++ rm -f $tempfile ++ exit 1 ++ ;; ++ esac ++ fi ++ fi ++ ++ if [ "$noflash" != 1 ]; then ++ if [ -f "$tempfile" ]; then ++ if [ "$noquestions" == 1 ]; then ++ do_wait ${sleeptime:-5} "${NL}About to start flashing, hit to abort!${NL}${NL}Starting in" ++ else ++ if [ -z "$nobackup" ]; then ++ echo -n "${NL}Keep configuration files? [y] " ++ read answer ++ case "$answer" in ++ [nN]) nobackup=1;; ++ esac ++ fi ++ ++ echo -n "${NL}About to start flashing!${NL}Hit to continue or to abort.${NL}" ++ read answer ++ fi ++ ++ for s in lucid collectd; do stop_service $s; done ++ ++ if [ "$nodetach" != 1 ]; then ++ echo -n "Starting sysupgrade in background ... " ++ /bin/busybox start-stop-daemon -S -b -x /sbin/sysupgrade -- ${nobackup:+-n} "$tempfile" ++ echo "done" ++ else ++ echo "Executing sysupgrade ... " ++ exec /sbin/sysupgrade ${nobackup:+-n} "$tempfile" ++ fi ++ else ++ echo "No upgrade image found!" ++ exit 1 ++ fi ++ else ++ echo "Image saved in '$tempfile'" ++ fi ++fi +diff --git a/feeds/packages/.gitignore b/feeds/packages/.gitignore +new file mode 100644 +index 0000000..6ffab9a +--- /dev/null ++++ b/feeds/packages/.gitignore +@@ -0,0 +1,2 @@ ++*.orig ++*.rej +diff --git a/feeds/packages/.svn/entries b/feeds/packages/.svn/entries +new file mode 100644 +index 0000000..66bf96a +--- /dev/null ++++ b/feeds/packages/.svn/entries +@@ -0,0 +1,95 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-16T22:10:20.308945Z ++36058 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++devel ++dir ++ ++utils ++dir ++ ++lang ++dir ++ ++skels ++dir ++ ++mail ++dir ++ ++ipv6 ++dir ++ ++.gitignore ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++3b9719929e7fc1a6f6b6f72a809127eb ++2010-11-28T18:02:26.873529Z ++24177 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++13 ++ ++net ++dir ++ ++admin ++dir ++ ++sound ++dir ++ ++libs ++dir ++ ++multimedia ++dir ++ +diff --git a/feeds/packages/.svn/text-base/.gitignore.svn-base b/feeds/packages/.svn/text-base/.gitignore.svn-base +new file mode 100644 +index 0000000..6ffab9a +--- /dev/null ++++ b/feeds/packages/.svn/text-base/.gitignore.svn-base +@@ -0,0 +1,2 @@ ++*.orig ++*.rej +diff --git a/feeds/packages/admin/.svn/entries b/feeds/packages/admin/.svn/entries +new file mode 100644 +index 0000000..ab172a8 +--- /dev/null ++++ b/feeds/packages/admin/.svn/entries +@@ -0,0 +1,76 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T09:59:35.991724Z ++35657 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++zabbix ++dir ++ ++nagios ++dir ++ ++syslog-ng ++dir ++ ++nsca ++dir ++ ++monit ++dir ++ ++debootstrap ++dir ++ ++ostiary ++dir ++ ++nagios-plugins ++dir ++ ++gkrellmd ++dir ++ ++nrpe ++dir ++ ++muninlite ++dir ++ ++syslog-ng3 ++dir ++ ++pmacct ++dir ++ ++osiris ++dir ++ ++sudo ++dir ++ ++htop ++dir ++ +diff --git a/feeds/packages/admin/debootstrap/.svn/entries b/feeds/packages/admin/debootstrap/.svn/entries +new file mode 100644 +index 0000000..a0eda61 +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/debootstrap ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-08T16:11:00.059091Z ++32650 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3325af8c350120d46258329bd057e765 ++2012-07-08T16:11:00.059091Z ++32650 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1954 ++ +diff --git a/feeds/packages/admin/debootstrap/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/debootstrap/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..63d98fa +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2010 Gianluigi Tiesi ++# 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:=debootstrap ++PKG_VERSION:=1.0.42 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap ++PKG_MD5SUM:=749638b8afc0c3e2a06c9b31cfe40b55 ++ ++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-chroot +coreutils-sha1sum ++ MAINTAINER:=Luka Perkov ++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.123 ++ $(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_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/feeds/packages/admin/debootstrap/Makefile b/feeds/packages/admin/debootstrap/Makefile +new file mode 100644 +index 0000000..63d98fa +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/Makefile +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2010 Gianluigi Tiesi ++# 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:=debootstrap ++PKG_VERSION:=1.0.42 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap ++PKG_MD5SUM:=749638b8afc0c3e2a06c9b31cfe40b55 ++ ++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-chroot +coreutils-sha1sum ++ MAINTAINER:=Luka Perkov ++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.123 ++ $(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_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/feeds/packages/admin/debootstrap/files/.svn/entries b/feeds/packages/admin/debootstrap/files/.svn/entries +new file mode 100644 +index 0000000..01c1101 +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/debootstrap/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-28T19:19:37.028454Z ++31498 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pkgdetails.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++66b6fb6d862ba4886701c9b056088479 ++2012-04-28T19:19:37.028454Z ++31498 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9849 ++ +diff --git a/feeds/packages/admin/debootstrap/files/.svn/text-base/pkgdetails.c.svn-base b/feeds/packages/admin/debootstrap/files/.svn/text-base/pkgdetails.c.svn-base +new file mode 100644 +index 0000000..99ee190 +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/files/.svn/text-base/pkgdetails.c.svn-base +@@ -0,0 +1,347 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#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/feeds/packages/admin/debootstrap/files/pkgdetails.c b/feeds/packages/admin/debootstrap/files/pkgdetails.c +new file mode 100644 +index 0000000..99ee190 +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/files/pkgdetails.c +@@ -0,0 +1,347 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#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/feeds/packages/admin/debootstrap/patches/.svn/entries b/feeds/packages/admin/debootstrap/patches/.svn/entries +new file mode 100644 +index 0000000..c35b7bb +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/debootstrap/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-08T16:11:00.059091Z ++32650 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-busybox_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++8765c6eb984c350c841924d3db25319e ++2012-07-08T16:11:00.059091Z ++32650 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++292 ++ +diff --git a/feeds/packages/admin/debootstrap/patches/.svn/text-base/100-busybox_fix.patch.svn-base b/feeds/packages/admin/debootstrap/patches/.svn/text-base/100-busybox_fix.patch.svn-base +new file mode 100644 +index 0000000..74875a0 +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/patches/.svn/text-base/100-busybox_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/usr/share/debootstrap/functions +++++ b/usr/share/debootstrap/functions ++@@ -857,8 +857,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/feeds/packages/admin/debootstrap/patches/100-busybox_fix.patch b/feeds/packages/admin/debootstrap/patches/100-busybox_fix.patch +new file mode 100644 +index 0000000..74875a0 +--- /dev/null ++++ b/feeds/packages/admin/debootstrap/patches/100-busybox_fix.patch +@@ -0,0 +1,11 @@ ++--- a/usr/share/debootstrap/functions +++++ b/usr/share/debootstrap/functions ++@@ -857,8 +857,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/feeds/packages/admin/gkrellmd/.svn/entries b/feeds/packages/admin/gkrellmd/.svn/entries +new file mode 100644 +index 0000000..ad91b2d +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/gkrellmd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-07T07:21:10.671653Z ++24296 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++b64de8911895bbb1af851177ea7b7c57 ++2010-12-07T07:21:10.671653Z ++24296 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1639 ++ +diff --git a/feeds/packages/admin/gkrellmd/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/gkrellmd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/gkrellmd/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/gkrellmd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d60bb1a +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# Copyright (C) 2007-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:=gkrellmd ++PKG_VERSION:=2.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=gkrellm-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://members.dslextreme.com/users/billw/gkrellm/ ++PKG_MD5SUM:=009d8dddd3ce5cc83a4bb4d559ee922d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/gkrellm-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gkrellmd ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+glib1 ++ TITLE:=The GNU Krell Monitors Server ++ URL:=http://gkrellm.net/ ++endef ++ ++define Package/gkrellmd/description ++ Gkrellmd Listens for connections from gkrellm clients. When ++ a gkrellm client connects to a gkrellmd server all builtin ++ monitors collect their data from the server. ++endef ++ ++define Package/gkrellmd/conffiles ++/etc/$(PKG_NAME).conf ++endef ++ ++define Build/Compile ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(EXTRA_LDFLAGS) " \ ++ $(MAKE) -C $(PKG_BUILD_DIR)/server \ ++ CC="$(TARGET_CC)" \ ++ glib12="yes" \ ++ without-libsensors="yes" \ ++ GLIB12_LIB="$(TARGET_LDFLAGS) -lglib -lgmodule" \ ++ GLIB12_INCLUDE="-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include" ++endef ++ ++define Package/gkrellmd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/$(PKG_NAME) $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/server/$(PKG_NAME).conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,gkrellmd)) +diff --git a/feeds/packages/admin/gkrellmd/Makefile b/feeds/packages/admin/gkrellmd/Makefile +new file mode 100644 +index 0000000..d60bb1a +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/Makefile +@@ -0,0 +1,60 @@ ++# ++# Copyright (C) 2007-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:=gkrellmd ++PKG_VERSION:=2.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=gkrellm-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://members.dslextreme.com/users/billw/gkrellm/ ++PKG_MD5SUM:=009d8dddd3ce5cc83a4bb4d559ee922d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/gkrellm-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gkrellmd ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+glib1 ++ TITLE:=The GNU Krell Monitors Server ++ URL:=http://gkrellm.net/ ++endef ++ ++define Package/gkrellmd/description ++ Gkrellmd Listens for connections from gkrellm clients. When ++ a gkrellm client connects to a gkrellmd server all builtin ++ monitors collect their data from the server. ++endef ++ ++define Package/gkrellmd/conffiles ++/etc/$(PKG_NAME).conf ++endef ++ ++define Build/Compile ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(EXTRA_LDFLAGS) " \ ++ $(MAKE) -C $(PKG_BUILD_DIR)/server \ ++ CC="$(TARGET_CC)" \ ++ glib12="yes" \ ++ without-libsensors="yes" \ ++ GLIB12_LIB="$(TARGET_LDFLAGS) -lglib -lgmodule" \ ++ GLIB12_INCLUDE="-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include" ++endef ++ ++define Package/gkrellmd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/$(PKG_NAME) $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/server/$(PKG_NAME).conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,gkrellmd)) +diff --git a/feeds/packages/admin/gkrellmd/files/.svn/entries b/feeds/packages/admin/gkrellmd/files/.svn/entries +new file mode 100644 +index 0000000..5469819 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/gkrellmd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-03-09T10:07:53.423977Z ++10572 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++gkrellmd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++eb96c7b29a5adb0faf0790271285e5c2 ++2008-03-09T10:07:53.423977Z ++10572 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++212 ++ +diff --git a/feeds/packages/admin/gkrellmd/files/.svn/prop-base/gkrellmd.init.svn-base b/feeds/packages/admin/gkrellmd/files/.svn/prop-base/gkrellmd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/files/.svn/prop-base/gkrellmd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/gkrellmd/files/.svn/text-base/gkrellmd.init.svn-base b/feeds/packages/admin/gkrellmd/files/.svn/text-base/gkrellmd.init.svn-base +new file mode 100644 +index 0000000..5bd88a9 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/files/.svn/text-base/gkrellmd.init.svn-base +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007 OpenWrt.org ++ ++START=60 ++BIN=gkrellmd ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ mkdir -p $RUN_D ++ $BIN $OPTIONS ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} +diff --git a/feeds/packages/admin/gkrellmd/files/gkrellmd.init b/feeds/packages/admin/gkrellmd/files/gkrellmd.init +new file mode 100644 +index 0000000..5bd88a9 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/files/gkrellmd.init +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007 OpenWrt.org ++ ++START=60 ++BIN=gkrellmd ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ mkdir -p $RUN_D ++ $BIN $OPTIONS ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} +diff --git a/feeds/packages/admin/gkrellmd/patches/.svn/entries b/feeds/packages/admin/gkrellmd/patches/.svn/entries +new file mode 100644 +index 0000000..9706b44 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/gkrellmd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-03-09T10:07:53.423977Z ++10572 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-conf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d9200d5dd8de590487c9588a426daf51 ++2008-03-09T10:07:53.423977Z ++10572 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1252 ++ +diff --git a/feeds/packages/admin/gkrellmd/patches/.svn/prop-base/100-conf.patch.svn-base b/feeds/packages/admin/gkrellmd/patches/.svn/prop-base/100-conf.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/patches/.svn/prop-base/100-conf.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/gkrellmd/patches/.svn/text-base/100-conf.patch.svn-base b/feeds/packages/admin/gkrellmd/patches/.svn/text-base/100-conf.patch.svn-base +new file mode 100644 +index 0000000..f90ca28 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/patches/.svn/text-base/100-conf.patch.svn-base +@@ -0,0 +1,40 @@ ++Index: gkrellm-2.3.1/server/gkrellmd.conf ++=================================================================== ++--- gkrellm-2.3.1.orig/server/gkrellmd.conf 2008-03-09 10:19:26.000000000 +0100 +++++ gkrellm-2.3.1/server/gkrellmd.conf 2008-03-09 10:19:26.000000000 +0100 ++@@ -4,7 +4,7 @@ ++ # the client update frequency. Values may be from 1 to 10 and should be ++ # smaller values to reduce network traffic. ++ # ++-update-hz 3 +++update-hz 10 ++ ++ # Limit number of simultaneous clients allowed to connect. ++ # ++@@ -13,7 +13,7 @@ ++ # Specify a specific network interface to listen on for connections. ++ # By default gkrellmd listens on all available network interfaces. ++ # ++-address 127.0.0.1 +++#address 127.0.0.1 ++ ++ # Specify the port to listen on for connections. ++ # ++@@ -29,14 +29,14 @@ ++ ++ # Drop privileges after startup (you must start gkrellmd as root to do it). ++ # ++-#user nobody +++user nobody ++ #group proc ++ ++ # Create a PID file for the running gkrellmd. Default is no PID file. ++-#pidfile /var/run/gkrellmd.pid +++pidfile /var/run/gkrellmd.pid ++ ++ # Run in background and detach from the controlling terminal ++-#detach +++detach ++ ++ # Time interval between checks for various monitors. If nfs-interval ++ # is <= 0 then gkrellmd will not read data for nfs file system types. +diff --git a/feeds/packages/admin/gkrellmd/patches/100-conf.patch b/feeds/packages/admin/gkrellmd/patches/100-conf.patch +new file mode 100644 +index 0000000..f90ca28 +--- /dev/null ++++ b/feeds/packages/admin/gkrellmd/patches/100-conf.patch +@@ -0,0 +1,40 @@ ++Index: gkrellm-2.3.1/server/gkrellmd.conf ++=================================================================== ++--- gkrellm-2.3.1.orig/server/gkrellmd.conf 2008-03-09 10:19:26.000000000 +0100 +++++ gkrellm-2.3.1/server/gkrellmd.conf 2008-03-09 10:19:26.000000000 +0100 ++@@ -4,7 +4,7 @@ ++ # the client update frequency. Values may be from 1 to 10 and should be ++ # smaller values to reduce network traffic. ++ # ++-update-hz 3 +++update-hz 10 ++ ++ # Limit number of simultaneous clients allowed to connect. ++ # ++@@ -13,7 +13,7 @@ ++ # Specify a specific network interface to listen on for connections. ++ # By default gkrellmd listens on all available network interfaces. ++ # ++-address 127.0.0.1 +++#address 127.0.0.1 ++ ++ # Specify the port to listen on for connections. ++ # ++@@ -29,14 +29,14 @@ ++ ++ # Drop privileges after startup (you must start gkrellmd as root to do it). ++ # ++-#user nobody +++user nobody ++ #group proc ++ ++ # Create a PID file for the running gkrellmd. Default is no PID file. ++-#pidfile /var/run/gkrellmd.pid +++pidfile /var/run/gkrellmd.pid ++ ++ # Run in background and detach from the controlling terminal ++-#detach +++detach ++ ++ # Time interval between checks for various monitors. If nfs-interval ++ # is <= 0 then gkrellmd will not read data for nfs file system types. +diff --git a/feeds/packages/admin/htop/.svn/entries b/feeds/packages/admin/htop/.svn/entries +new file mode 100644 +index 0000000..de70086 +--- /dev/null ++++ b/feeds/packages/admin/htop/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/htop ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-02T10:48:26.392783Z ++34964 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++809a72d432129b150b3e249bfd214f77 ++2013-01-02T10:48:26.392783Z ++34964 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1215 ++ +diff --git a/feeds/packages/admin/htop/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/htop/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..fd3736b +--- /dev/null ++++ b/feeds/packages/admin/htop/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 13 ++svn:copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++K 11 ++svn:licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/admin/htop/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/htop/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6909427 +--- /dev/null ++++ b/feeds/packages/admin/htop/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2007-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:=htop ++PKG_VERSION:=1.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=0d01cca8df3349c74569cefebbd9919e ++ ++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/ ++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/feeds/packages/admin/htop/Makefile b/feeds/packages/admin/htop/Makefile +new file mode 100644 +index 0000000..6909427 +--- /dev/null ++++ b/feeds/packages/admin/htop/Makefile +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2007-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:=htop ++PKG_VERSION:=1.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=0d01cca8df3349c74569cefebbd9919e ++ ++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/ ++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/feeds/packages/admin/monit/.svn/entries b/feeds/packages/admin/monit/.svn/entries +new file mode 100644 +index 0000000..0210ea0 +--- /dev/null ++++ b/feeds/packages/admin/monit/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/monit ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++aa771e81aae94752623506615cf16713 ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2116 ++ +diff --git a/feeds/packages/admin/monit/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/monit/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/admin/monit/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/monit/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/monit/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cace2be +--- /dev/null ++++ b/feeds/packages/admin/monit/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,91 @@ ++# ++# 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:=monit ++PKG_VERSION:=5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://mmonit.com/monit/dist ++PKG_MD5SUM:=f1f391241d44059d0d3e5d26f4ec5ddf ++ ++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/ ++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/feeds/packages/admin/monit/Makefile b/feeds/packages/admin/monit/Makefile +new file mode 100644 +index 0000000..cace2be +--- /dev/null ++++ b/feeds/packages/admin/monit/Makefile +@@ -0,0 +1,91 @@ ++# ++# 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:=monit ++PKG_VERSION:=5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://mmonit.com/monit/dist ++PKG_MD5SUM:=f1f391241d44059d0d3e5d26f4ec5ddf ++ ++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/ ++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/feeds/packages/admin/monit/files/.svn/entries b/feeds/packages/admin/monit/files/.svn/entries +new file mode 100644 +index 0000000..11fbb9e +--- /dev/null ++++ b/feeds/packages/admin/monit/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/monit/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++monit.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++65b01f774c8b0d293fbbf3a1cf1c325a ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++235 ++ +diff --git a/feeds/packages/admin/monit/files/.svn/prop-base/monit.init.svn-base b/feeds/packages/admin/monit/files/.svn/prop-base/monit.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/monit/files/.svn/prop-base/monit.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/monit/files/.svn/text-base/monit.init.svn-base b/feeds/packages/admin/monit/files/.svn/text-base/monit.init.svn-base +new file mode 100644 +index 0000000..ed68700 +--- /dev/null ++++ b/feeds/packages/admin/monit/files/.svn/text-base/monit.init.svn-base +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2012 OpenWrt.org ++ ++START=60 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ -f /etc/monitrc ] || return 1 ++ #chmod 0700 /etc/monitrc ++ service_start /usr/bin/monit ++} ++ ++stop() { ++ service_stop /usr/bin/monit ++} +diff --git a/feeds/packages/admin/monit/files/monit.init b/feeds/packages/admin/monit/files/monit.init +new file mode 100644 +index 0000000..ed68700 +--- /dev/null ++++ b/feeds/packages/admin/monit/files/monit.init +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2012 OpenWrt.org ++ ++START=60 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ -f /etc/monitrc ] || return 1 ++ #chmod 0700 /etc/monitrc ++ service_start /usr/bin/monit ++} ++ ++stop() { ++ service_stop /usr/bin/monit ++} +diff --git a/feeds/packages/admin/monit/patches/.svn/entries b/feeds/packages/admin/monit/patches/.svn/entries +new file mode 100644 +index 0000000..805d4ce +--- /dev/null ++++ b/feeds/packages/admin/monit/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/monit/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_sslv2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ ++002-uclibc_loadavg.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2012-07-12T08:09:57.030680Z ++32674 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ +diff --git a/feeds/packages/admin/monit/patches/.svn/prop-base/001-no_sslv2.patch.svn-base b/feeds/packages/admin/monit/patches/.svn/prop-base/001-no_sslv2.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/monit/patches/.svn/prop-base/001-no_sslv2.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/monit/patches/.svn/text-base/001-no_sslv2.patch.svn-base b/feeds/packages/admin/monit/patches/.svn/text-base/001-no_sslv2.patch.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/admin/monit/patches/.svn/text-base/002-uclibc_loadavg.patch.svn-base b/feeds/packages/admin/monit/patches/.svn/text-base/002-uclibc_loadavg.patch.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/admin/monit/patches/001-no_sslv2.patch b/feeds/packages/admin/monit/patches/001-no_sslv2.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/admin/monit/patches/002-uclibc_loadavg.patch b/feeds/packages/admin/monit/patches/002-uclibc_loadavg.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/admin/muninlite/.svn/entries b/feeds/packages/admin/muninlite/.svn/entries +new file mode 100644 +index 0000000..e8ea735 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/muninlite ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T09:59:35.991724Z ++35657 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++10109fb9c199e34c0d5c2e0b7ebddf2a ++2013-02-18T09:59:35.991724Z ++35657 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1135 ++ +diff --git a/feeds/packages/admin/muninlite/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/muninlite/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c81766f +--- /dev/null ++++ b/feeds/packages/admin/muninlite/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=muninlite ++PKG_VERSION:=1.0.4 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=a8cc86f0cc536a6c22dc298f4ed55339 ++ ++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/ ++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/feeds/packages/admin/muninlite/Makefile b/feeds/packages/admin/muninlite/Makefile +new file mode 100644 +index 0000000..c81766f +--- /dev/null ++++ b/feeds/packages/admin/muninlite/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=muninlite ++PKG_VERSION:=1.0.4 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=a8cc86f0cc536a6c22dc298f4ed55339 ++ ++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/ ++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/feeds/packages/admin/muninlite/files/.svn/entries b/feeds/packages/admin/muninlite/files/.svn/entries +new file mode 100644 +index 0000000..25a8e3b +--- /dev/null ++++ b/feeds/packages/admin/muninlite/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/muninlite/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-12-11T02:13:23.850906Z ++13589 ++rwhitby ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/admin/muninlite/files/etc/.svn/entries b/feeds/packages/admin/muninlite/files/etc/.svn/entries +new file mode 100644 +index 0000000..d710b2c +--- /dev/null ++++ b/feeds/packages/admin/muninlite/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/muninlite/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-12-11T02:13:23.850906Z ++13589 ++rwhitby ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++xinetd.d ++dir ++ +diff --git a/feeds/packages/admin/muninlite/files/etc/xinetd.d/.svn/entries b/feeds/packages/admin/muninlite/files/etc/xinetd.d/.svn/entries +new file mode 100644 +index 0000000..04e88fe +--- /dev/null ++++ b/feeds/packages/admin/muninlite/files/etc/xinetd.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/muninlite/files/etc/xinetd.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-12-11T02:13:23.850906Z ++13589 ++rwhitby ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++munin ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9e16ad527f342eb0cf33f5a395b3d536 ++2008-12-11T02:13:23.850906Z ++13589 ++rwhitby ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++144 ++ +diff --git a/feeds/packages/admin/muninlite/files/etc/xinetd.d/.svn/text-base/munin.svn-base b/feeds/packages/admin/muninlite/files/etc/xinetd.d/.svn/text-base/munin.svn-base +new file mode 100644 +index 0000000..012d71b +--- /dev/null ++++ b/feeds/packages/admin/muninlite/files/etc/xinetd.d/.svn/text-base/munin.svn-base +@@ -0,0 +1,10 @@ ++service munin ++{ ++ socket_type = stream ++ protocol = tcp ++ wait = no ++ user = root ++ group = root ++ server = /usr/sbin/munin-node ++ disable = no ++} +diff --git a/feeds/packages/admin/muninlite/files/etc/xinetd.d/munin b/feeds/packages/admin/muninlite/files/etc/xinetd.d/munin +new file mode 100644 +index 0000000..012d71b +--- /dev/null ++++ b/feeds/packages/admin/muninlite/files/etc/xinetd.d/munin +@@ -0,0 +1,10 @@ ++service munin ++{ ++ socket_type = stream ++ protocol = tcp ++ wait = no ++ user = root ++ group = root ++ server = /usr/sbin/munin-node ++ disable = no ++} +diff --git a/feeds/packages/admin/muninlite/patches/.svn/entries b/feeds/packages/admin/muninlite/patches/.svn/entries +new file mode 100644 +index 0000000..f6435e4 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/muninlite/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T09:59:35.991724Z ++35657 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++210-add-bridge-devs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3e27e0cced24ed79f183b3df8adb6a04 ++2013-02-18T09:59:35.991724Z ++35657 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1288 ++ ++200-add-tap-dev.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++b55c28175567694cd6498ace790e4dd1 ++2011-05-23T21:06:08.761707Z ++26973 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++951 ++ ++001-no_disks.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++e4f3c6cae009ebb50bd978554541fd65 ++2011-02-19T13:04:01.055664Z ++25587 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++505 ++ ++100-fix-no-ethtool.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++c66d1cafe452cf6cd268ecf18395accf ++2011-05-23T21:06:08.761707Z ++26973 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++691 ++ ++002-hostname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3e69d29745892be29ee52ccdff2b207d ++2011-02-19T13:04:01.055664Z ++25587 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++362 ++ +diff --git a/feeds/packages/admin/muninlite/patches/.svn/text-base/001-no_disks.patch.svn-base b/feeds/packages/admin/muninlite/patches/.svn/text-base/001-no_disks.patch.svn-base +new file mode 100644 +index 0000000..bf9b2b1 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/.svn/text-base/001-no_disks.patch.svn-base +@@ -0,0 +1,12 @@ ++--- 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/feeds/packages/admin/muninlite/patches/.svn/text-base/002-hostname.patch.svn-base b/feeds/packages/admin/muninlite/patches/.svn/text-base/002-hostname.patch.svn-base +new file mode 100644 +index 0000000..5d87168 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/.svn/text-base/002-hostname.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/admin/muninlite/patches/.svn/text-base/100-fix-no-ethtool.patch.svn-base b/feeds/packages/admin/muninlite/patches/.svn/text-base/100-fix-no-ethtool.patch.svn-base +new file mode 100644 +index 0000000..88f7e30 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/.svn/text-base/100-fix-no-ethtool.patch.svn-base +@@ -0,0 +1,21 @@ ++--- 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/feeds/packages/admin/muninlite/patches/.svn/text-base/200-add-tap-dev.patch.svn-base b/feeds/packages/admin/muninlite/patches/.svn/text-base/200-add-tap-dev.patch.svn-base +new file mode 100644 +index 0000000..fa46ce6 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/.svn/text-base/200-add-tap-dev.patch.svn-base +@@ -0,0 +1,20 @@ ++--- 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/feeds/packages/admin/muninlite/patches/.svn/text-base/210-add-bridge-devs.patch.svn-base b/feeds/packages/admin/muninlite/patches/.svn/text-base/210-add-bridge-devs.patch.svn-base +new file mode 100644 +index 0000000..1a76e97 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/.svn/text-base/210-add-bridge-devs.patch.svn-base +@@ -0,0 +1,24 @@ ++--- 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/feeds/packages/admin/muninlite/patches/001-no_disks.patch b/feeds/packages/admin/muninlite/patches/001-no_disks.patch +new file mode 100644 +index 0000000..bf9b2b1 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/001-no_disks.patch +@@ -0,0 +1,12 @@ ++--- 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/feeds/packages/admin/muninlite/patches/002-hostname.patch b/feeds/packages/admin/muninlite/patches/002-hostname.patch +new file mode 100644 +index 0000000..5d87168 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/002-hostname.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/admin/muninlite/patches/100-fix-no-ethtool.patch b/feeds/packages/admin/muninlite/patches/100-fix-no-ethtool.patch +new file mode 100644 +index 0000000..88f7e30 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/100-fix-no-ethtool.patch +@@ -0,0 +1,21 @@ ++--- 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/feeds/packages/admin/muninlite/patches/200-add-tap-dev.patch b/feeds/packages/admin/muninlite/patches/200-add-tap-dev.patch +new file mode 100644 +index 0000000..fa46ce6 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/200-add-tap-dev.patch +@@ -0,0 +1,20 @@ ++--- 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/feeds/packages/admin/muninlite/patches/210-add-bridge-devs.patch b/feeds/packages/admin/muninlite/patches/210-add-bridge-devs.patch +new file mode 100644 +index 0000000..1a76e97 +--- /dev/null ++++ b/feeds/packages/admin/muninlite/patches/210-add-bridge-devs.patch +@@ -0,0 +1,24 @@ ++--- 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/feeds/packages/admin/nagios-plugins/.svn/entries b/feeds/packages/admin/nagios-plugins/.svn/entries +new file mode 100644 +index 0000000..fc69441 +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nagios-plugins ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-05T08:17:05.550992Z ++32997 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f9645aeb3aad9c80f356af8a2b11f2b0 ++2012-08-05T08:17:05.550992Z ++32997 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1431 ++ +diff --git a/feeds/packages/admin/nagios-plugins/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/nagios-plugins/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6bb7a23 +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=nagios-plugins ++PKG_VERSION:=1.4.14 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagiosplug ++PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9 ++ ++PKG_FIXUP:=patch-libtool ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++comma:= , ++ ++define Package/nagios-plugins ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=$(CXX_DEPENDS) +libpq +libopenssl +libradiusclient-ng +libopenldap ++ TITLE:=plugins for Nagios checks ++ URL:=http://nagiosplug.sourceforge.net/ ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-mysql \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-ping-command="/bin/ping -w %d -c %d %s" \ ++ --with-ping6-command="/bin/ping6 -w %d -c %d %s" \ ++ --with-ps-command="/bin/ps -Aopid" \ ++ --with-ps-cols="6" \ ++ --with-ps-format="%d %s %d %s %s %n" \ ++ --with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \ ++ --with-uptime-command="/usr/bin/uptime" \ ++ --with-ssh-command="/usr/bin/ssh" \ ++ --with-nslookup-command="/usr/bin/nslookup" ++ ++define Package/nagios-plugins/install ++ $(INSTALL_DIR) $(1)/usr/libexec/nagios ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/libexec/nagios/ ++endef ++ ++$(eval $(call BuildPackage,nagios-plugins)) +diff --git a/feeds/packages/admin/nagios-plugins/Makefile b/feeds/packages/admin/nagios-plugins/Makefile +new file mode 100644 +index 0000000..6bb7a23 +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=nagios-plugins ++PKG_VERSION:=1.4.14 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagiosplug ++PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9 ++ ++PKG_FIXUP:=patch-libtool ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++comma:= , ++ ++define Package/nagios-plugins ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=$(CXX_DEPENDS) +libpq +libopenssl +libradiusclient-ng +libopenldap ++ TITLE:=plugins for Nagios checks ++ URL:=http://nagiosplug.sourceforge.net/ ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-mysql \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-ping-command="/bin/ping -w %d -c %d %s" \ ++ --with-ping6-command="/bin/ping6 -w %d -c %d %s" \ ++ --with-ps-command="/bin/ps -Aopid" \ ++ --with-ps-cols="6" \ ++ --with-ps-format="%d %s %d %s %s %n" \ ++ --with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \ ++ --with-uptime-command="/usr/bin/uptime" \ ++ --with-ssh-command="/usr/bin/ssh" \ ++ --with-nslookup-command="/usr/bin/nslookup" ++ ++define Package/nagios-plugins/install ++ $(INSTALL_DIR) $(1)/usr/libexec/nagios ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/libexec/nagios/ ++endef ++ ++$(eval $(call BuildPackage,nagios-plugins)) +diff --git a/feeds/packages/admin/nagios-plugins/patches/.svn/entries b/feeds/packages/admin/nagios-plugins/patches/.svn/entries +new file mode 100644 +index 0000000..7d38ac0 +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nagios-plugins/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++003-pgsl-header-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2c7170fda676b1e7e5df80c1401b0e82 ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++301 ++ ++002-plugins.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++ad342bf1b4e79c6d100c72b0103ab0be ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2701 ++ +diff --git a/feeds/packages/admin/nagios-plugins/patches/.svn/text-base/002-plugins.patch.svn-base b/feeds/packages/admin/nagios-plugins/patches/.svn/text-base/002-plugins.patch.svn-base +new file mode 100644 +index 0000000..402aaba +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/patches/.svn/text-base/002-plugins.patch.svn-base +@@ -0,0 +1,74 @@ ++--- a/configure +++++ b/configure ++@@ -28209,7 +28209,7 @@ fi ++ ++ if test "$ac_cv_have_decl_swapctl" = "yes"; ++ then ++- EXTRAS="$EXTRAS check_swap" +++ EXTRAS="$EXTRAS" ++ { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5 ++ echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; } ++ if test "$ac_cv_type_swaptbl_t" = "yes" -a \ ++@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_SWAP 1 ++ _ACEOF ++ ++- EXTRAS="$EXTRAS check_swap" +++ EXTRAS="$EXTRAS" ++ fi ++ if test "x$ac_cv_swap_command" != "x" ++ then ++@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF ++ #define PROC_MEMINFO "$ac_cv_proc_meminfo" ++ _ACEOF ++ ++- EXTRAS="$EXTRAS check_swap" +++ EXTRAS="$EXTRAS" ++ fi ++ ++ # Extract the first word of "dig", so it can be a program name with args. ++--- a/plugins/Makefile.am +++++ b/plugins/Makefile.am ++@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust ++ check_tcp_programs = check_ftp check_imap check_nntp check_pop \ ++ check_udp check_clamd @check_tcp_ssl@ ++ ++-EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ ++- check_swap check_fping check_ldap check_game check_dig \ +++EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \ +++ check_fping check_ldap check_game check_dig \ ++ check_nagios check_by_ssh check_dns check_nt check_ide_smart \ ++ check_procs check_mysql_query check_apt ++ ++--- a/plugins/Makefile.in +++++ b/plugins/Makefile.in ++@@ -32,7 +32,7 @@ POST_UNINSTALL = : ++ build_triplet = @build@ ++ host_triplet = @host@ ++ libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \ ++- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \ +++ check_dummy$(EXEEXT) check_http$(EXEEXT) \ ++ check_load$(EXEEXT) check_mrtg$(EXEEXT) \ ++ check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ ++ check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \ ++@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch ++ check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \ ++ check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@ ++ EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \ ++- check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ ++- check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \ +++ check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ +++ check_fping$(EXEEXT) check_ldap$(EXEEXT) \ ++ check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \ ++ check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \ ++ check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \ ++--- a/plugins/check_pgsql.c +++++ b/plugins/check_pgsql.c ++@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li ++ #include ++ #include ++ +++#define NAMEDATALEN 64 ++ #define DEFAULT_DB "template1" ++ #define DEFAULT_HOST "127.0.0.1" ++ +diff --git a/feeds/packages/admin/nagios-plugins/patches/.svn/text-base/003-pgsl-header-fix.patch.svn-base b/feeds/packages/admin/nagios-plugins/patches/.svn/text-base/003-pgsl-header-fix.patch.svn-base +new file mode 100644 +index 0000000..8496e80 +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/patches/.svn/text-base/003-pgsl-header-fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/plugins/check_pgsql.c +++++ b/plugins/check_pgsql.c ++@@ -37,7 +37,7 @@ const char *email = "nagiosplug-devel@li ++ ++ #include "netutils.h" ++ #include ++-#include +++#include ++ ++ #define NAMEDATALEN 64 ++ #define DEFAULT_DB "template1" +diff --git a/feeds/packages/admin/nagios-plugins/patches/002-plugins.patch b/feeds/packages/admin/nagios-plugins/patches/002-plugins.patch +new file mode 100644 +index 0000000..402aaba +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/patches/002-plugins.patch +@@ -0,0 +1,74 @@ ++--- a/configure +++++ b/configure ++@@ -28209,7 +28209,7 @@ fi ++ ++ if test "$ac_cv_have_decl_swapctl" = "yes"; ++ then ++- EXTRAS="$EXTRAS check_swap" +++ EXTRAS="$EXTRAS" ++ { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5 ++ echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; } ++ if test "$ac_cv_type_swaptbl_t" = "yes" -a \ ++@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF ++ #define HAVE_SWAP 1 ++ _ACEOF ++ ++- EXTRAS="$EXTRAS check_swap" +++ EXTRAS="$EXTRAS" ++ fi ++ if test "x$ac_cv_swap_command" != "x" ++ then ++@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF ++ #define PROC_MEMINFO "$ac_cv_proc_meminfo" ++ _ACEOF ++ ++- EXTRAS="$EXTRAS check_swap" +++ EXTRAS="$EXTRAS" ++ fi ++ ++ # Extract the first word of "dig", so it can be a program name with args. ++--- a/plugins/Makefile.am +++++ b/plugins/Makefile.am ++@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust ++ check_tcp_programs = check_ftp check_imap check_nntp check_pop \ ++ check_udp check_clamd @check_tcp_ssl@ ++ ++-EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ ++- check_swap check_fping check_ldap check_game check_dig \ +++EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \ +++ check_fping check_ldap check_game check_dig \ ++ check_nagios check_by_ssh check_dns check_nt check_ide_smart \ ++ check_procs check_mysql_query check_apt ++ ++--- a/plugins/Makefile.in +++++ b/plugins/Makefile.in ++@@ -32,7 +32,7 @@ POST_UNINSTALL = : ++ build_triplet = @build@ ++ host_triplet = @host@ ++ libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \ ++- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \ +++ check_dummy$(EXEEXT) check_http$(EXEEXT) \ ++ check_load$(EXEEXT) check_mrtg$(EXEEXT) \ ++ check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ ++ check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \ ++@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch ++ check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \ ++ check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@ ++ EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \ ++- check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ ++- check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \ +++ check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ +++ check_fping$(EXEEXT) check_ldap$(EXEEXT) \ ++ check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \ ++ check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \ ++ check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \ ++--- a/plugins/check_pgsql.c +++++ b/plugins/check_pgsql.c ++@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li ++ #include ++ #include ++ +++#define NAMEDATALEN 64 ++ #define DEFAULT_DB "template1" ++ #define DEFAULT_HOST "127.0.0.1" ++ +diff --git a/feeds/packages/admin/nagios-plugins/patches/003-pgsl-header-fix.patch b/feeds/packages/admin/nagios-plugins/patches/003-pgsl-header-fix.patch +new file mode 100644 +index 0000000..8496e80 +--- /dev/null ++++ b/feeds/packages/admin/nagios-plugins/patches/003-pgsl-header-fix.patch +@@ -0,0 +1,11 @@ ++--- a/plugins/check_pgsql.c +++++ b/plugins/check_pgsql.c ++@@ -37,7 +37,7 @@ const char *email = "nagiosplug-devel@li ++ ++ #include "netutils.h" ++ #include ++-#include +++#include ++ ++ #define NAMEDATALEN 64 ++ #define DEFAULT_DB "template1" +diff --git a/feeds/packages/admin/nagios/.svn/entries b/feeds/packages/admin/nagios/.svn/entries +new file mode 100644 +index 0000000..aa3b1b0 +--- /dev/null ++++ b/feeds/packages/admin/nagios/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nagios ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T23:30:21.224629Z ++32348 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++b51636e4fd152715c64035b64779abc2 ++2012-06-13T23:30:21.224629Z ++32348 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1807 ++ +diff --git a/feeds/packages/admin/nagios/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/nagios/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b9a4159 +--- /dev/null ++++ b/feeds/packages/admin/nagios/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=nagios ++PKG_VERSION:=2.10 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagios ++PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nagios ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libpthread +microperl +libltdl ++ TITLE:=service and network monitoring program ++ URL:=http://www.nagios.org/ ++endef ++ ++define Package/nagios/description ++ service and network monitoring program ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++ ++CONFIGURE_VARS += \ ++ ac_cv_lib_gd_gdImagePng_1=no \ ++ ac_cv_lib_gd_gdImagePng_2=no \ ++ ac_cv_lib_gd_gdImagePng_3=no \ ++ ac_cv_lib_gd_gdImagePng_4=no ++ ++CONFIGURE_ARGS += \ ++ --with-nagios-user="root" \ ++ --with-nagios-group="root" \ ++ --sysconfdir="/etc/nagios" \ ++ --without-gd-lib \ ++ --without-gd-inc \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ INSTALL_OPTS="" \ ++ STRIP=: \ ++ all install install-config ++endef ++ ++define Package/nagios/install ++ $(INSTALL_DIR) $(1)/etc/nagios ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/nagios/* $(1)/etc/nagios/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{nagios,nagiostats} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(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/nagios/conffiles ++/etc/nagios/cgi.cfg ++/etc/nagios/commands.cfg ++/etc/nagios/localhost.cfg ++/etc/nagios/nagios.cfg ++/etc/nagios/resource.cfg ++endef ++ ++$(eval $(call BuildPackage,nagios)) +diff --git a/feeds/packages/admin/nagios/Makefile b/feeds/packages/admin/nagios/Makefile +new file mode 100644 +index 0000000..b9a4159 +--- /dev/null ++++ b/feeds/packages/admin/nagios/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=nagios ++PKG_VERSION:=2.10 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagios ++PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nagios ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libpthread +microperl +libltdl ++ TITLE:=service and network monitoring program ++ URL:=http://www.nagios.org/ ++endef ++ ++define Package/nagios/description ++ service and network monitoring program ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++ ++CONFIGURE_VARS += \ ++ ac_cv_lib_gd_gdImagePng_1=no \ ++ ac_cv_lib_gd_gdImagePng_2=no \ ++ ac_cv_lib_gd_gdImagePng_3=no \ ++ ac_cv_lib_gd_gdImagePng_4=no ++ ++CONFIGURE_ARGS += \ ++ --with-nagios-user="root" \ ++ --with-nagios-group="root" \ ++ --sysconfdir="/etc/nagios" \ ++ --without-gd-lib \ ++ --without-gd-inc \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ INSTALL_OPTS="" \ ++ STRIP=: \ ++ all install install-config ++endef ++ ++define Package/nagios/install ++ $(INSTALL_DIR) $(1)/etc/nagios ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/nagios/* $(1)/etc/nagios/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{nagios,nagiostats} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(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/nagios/conffiles ++/etc/nagios/cgi.cfg ++/etc/nagios/commands.cfg ++/etc/nagios/localhost.cfg ++/etc/nagios/nagios.cfg ++/etc/nagios/resource.cfg ++endef ++ ++$(eval $(call BuildPackage,nagios)) +diff --git a/feeds/packages/admin/nrpe/.svn/entries b/feeds/packages/admin/nrpe/.svn/entries +new file mode 100644 +index 0000000..c96da0d +--- /dev/null ++++ b/feeds/packages/admin/nrpe/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nrpe ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9f26729abc92d91c63b66e2039262b57 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1608 ++ +diff --git a/feeds/packages/admin/nrpe/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/nrpe/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9495885 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=nrpe ++PKG_VERSION:=2.12 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagios ++PKG_MD5SUM:=b2d75e2962f1e3151ef58794d60c9e97 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nrpe ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libopenssl +libwrap ++ TITLE:=Daemon to execute Nagios check commands on remote hosts ++ URL:=http://www.nagios.org/download ++endef ++ ++define Package/nrpe/description ++ The NRPE addon is designed to allow you to execute Nagios plugins on ++ remote Linux/Unix machines. The main reason for doing this is to allow ++ Nagios to monitor "local" resources (like CPU load, memory usage, etc.) ++ on remote machines. Since these public resources are not usually ++ exposed to external machines, an agent like NRPE must be installed on ++ the remote Linux/Unix machines. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-ssl="$(STAGING_DIR)/usr" \ ++ --with-ssl-lib="$(STAGING_DIR)/usr/lib" ++ ++define Package/nrpe/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/nrpe.cfg $(1)/etc/nrpe.cfg ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nrpe $(1)/usr/sbin ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) ++endef ++ ++define Package/nrpe/conffiles ++/etc/nrpe.cfg ++endef ++ ++$(eval $(call RequireCommand,openssl, \ ++ $(PKG_NAME) requires openssl installed on the host-system. \ ++)) ++ ++$(eval $(call BuildPackage,nrpe)) ++ +diff --git a/feeds/packages/admin/nrpe/Makefile b/feeds/packages/admin/nrpe/Makefile +new file mode 100644 +index 0000000..9495885 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=nrpe ++PKG_VERSION:=2.12 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagios ++PKG_MD5SUM:=b2d75e2962f1e3151ef58794d60c9e97 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nrpe ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libopenssl +libwrap ++ TITLE:=Daemon to execute Nagios check commands on remote hosts ++ URL:=http://www.nagios.org/download ++endef ++ ++define Package/nrpe/description ++ The NRPE addon is designed to allow you to execute Nagios plugins on ++ remote Linux/Unix machines. The main reason for doing this is to allow ++ Nagios to monitor "local" resources (like CPU load, memory usage, etc.) ++ on remote machines. Since these public resources are not usually ++ exposed to external machines, an agent like NRPE must be installed on ++ the remote Linux/Unix machines. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-ssl="$(STAGING_DIR)/usr" \ ++ --with-ssl-lib="$(STAGING_DIR)/usr/lib" ++ ++define Package/nrpe/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/nrpe.cfg $(1)/etc/nrpe.cfg ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nrpe $(1)/usr/sbin ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) ++endef ++ ++define Package/nrpe/conffiles ++/etc/nrpe.cfg ++endef ++ ++$(eval $(call RequireCommand,openssl, \ ++ $(PKG_NAME) requires openssl installed on the host-system. \ ++)) ++ ++$(eval $(call BuildPackage,nrpe)) ++ +diff --git a/feeds/packages/admin/nrpe/files/.svn/entries b/feeds/packages/admin/nrpe/files/.svn/entries +new file mode 100644 +index 0000000..cc98e2b +--- /dev/null ++++ b/feeds/packages/admin/nrpe/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nrpe/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T19:48:57.806361Z ++28888 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++nrpe.cfg ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++18a5f75b729d207886e754cafb73d2fb ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6994 ++ ++nrpe.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0d495fe6a63816e71918098e48fec4bf ++2011-11-09T19:48:57.806361Z ++28888 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++393 ++ +diff --git a/feeds/packages/admin/nrpe/files/.svn/text-base/nrpe.cfg.svn-base b/feeds/packages/admin/nrpe/files/.svn/text-base/nrpe.cfg.svn-base +new file mode 100644 +index 0000000..e84bed7 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/files/.svn/text-base/nrpe.cfg.svn-base +@@ -0,0 +1,208 @@ ++############################################################################# ++# Sample NRPE Config File ++# Written by: Ethan Galstad (nagios@nagios.org) ++# ++# Last Modified: 03-09-2007 ++# ++# NOTES: ++# This is a sample configuration file for the NRPE daemon. It needs to be ++# located on the remote host that is running the NRPE daemon, not the host ++# from which the check_nrpe client is being executed. ++############################################################################# ++ ++ ++# PID FILE ++# The name of the file in which the NRPE daemon should write it's process ID ++# number. The file is only written if the NRPE daemon is started by the root ++# user and is running in standalone mode. ++ ++pid_file=/var/run/nrpe.pid ++ ++ ++ ++# PORT NUMBER ++# Port number we should wait for connections on. ++# NOTE: This must be a non-priviledged port (i.e. > 1024). ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++server_port=5666 ++ ++ ++ ++# SERVER ADDRESS ++# Address that nrpe should bind to in case there are more than one interface ++# and you do not want nrpe to bind on all interfaces. ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++server_address=192.168.1.1 ++ ++ ++# NRPE USER ++# This determines the effective user that the NRPE daemon should run as. ++# You can either supply a username or a UID. ++# ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++nrpe_user=nagios ++ ++ ++ ++# NRPE GROUP ++# This determines the effective group that the NRPE daemon should run as. ++# You can either supply a group name or a GID. ++# ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++nrpe_group=nagios ++ ++ ++ ++# ALLOWED HOST ADDRESSES ++# This is an optional comma-delimited list of IP address or hostnames ++# that are allowed to talk to the NRPE daemon. ++# ++# Note: The daemon only does rudimentary checking of the client's IP ++# address. I would highly recommend adding entries in your /etc/hosts.allow ++# file to allow only the specified host to connect to the port ++# you are running this daemon on. ++# ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++allowed_hosts=192.168.1.2 ++ ++ ++ ++# COMMAND ARGUMENT PROCESSING ++# This option determines whether or not the NRPE daemon will allow clients ++# to specify arguments to commands that are executed. This option only works ++# if the daemon was configured with the --enable-command-args configure script ++# option. ++# ++# *** ENABLING THIS OPTION IS A SECURITY RISK! *** ++# Read the SECURITY file for information on some of the security implications ++# of enabling this variable. ++# ++# Values: 0=do not allow arguments, 1=allow command arguments ++ ++dont_blame_nrpe=0 ++ ++ ++ ++# COMMAND PREFIX ++# This option allows you to prefix all commands with a user-defined string. ++# A space is automatically added between the specified prefix string and the ++# command line from the command definition. ++# ++# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! *** ++# Usage scenario: ++# Execute restricted commmands using sudo. For this to work, you need to add ++# the nagios user to your /etc/sudoers. An example entry for alllowing ++# execution of the plugins from might be: ++# ++# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ ++# ++# This lets the nagios user run all commands in that directory (and only them) ++# without asking for a password. If you do this, make sure you don't give ++# random users write access to that directory or its contents! ++ ++# command_prefix=/usr/bin/sudo ++ ++ ++ ++# DEBUGGING OPTION ++# This option determines whether or not debugging messages are logged to the ++# syslog facility. ++# Values: 0=debugging off, 1=debugging on ++ ++debug=0 ++ ++ ++ ++# COMMAND TIMEOUT ++# This specifies the maximum number of seconds that the NRPE daemon will ++# allow plugins to finish executing before killing them off. ++ ++command_timeout=60 ++ ++ ++ ++# CONNECTION TIMEOUT ++# This specifies the maximum number of seconds that the NRPE daemon will ++# wait for a connection to be established before exiting. This is sometimes ++# seen where a network problem stops the SSL being established even though ++# all network sessions are connected. This causes the nrpe daemons to ++# accumulate, eating system resources. Do not set this too low. ++ ++connection_timeout=300 ++ ++ ++ ++# WEEK RANDOM SEED OPTION ++# This directive allows you to use SSL even if your system does not have ++# a /dev/random or /dev/urandom (on purpose or because the necessary patches ++# were not applied). The random number generator will be seeded from a file ++# which is either a file pointed to by the environment valiable $RANDFILE ++# or $HOME/.rnd. If neither exists, the pseudo random number generator will ++# be initialized and a warning will be issued. ++# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness ++ ++#allow_weak_random_seed=1 ++ ++ ++ ++# INCLUDE CONFIG FILE ++# This directive allows you to include definitions from an external config file. ++ ++#include= ++ ++ ++ ++# INCLUDE CONFIG DIRECTORY ++# This directive allows you to include definitions from config files (with a ++# .cfg extension) in one or more directories (with recursion). ++ ++#include_dir= ++#include_dir= ++ ++ ++ ++# COMMAND DEFINITIONS ++# Command definitions that this daemon will run. Definitions ++# are in the following format: ++# ++# command[]= ++# ++# When the daemon receives a request to return the results of ++# it will execute the command specified by the argument. ++# ++# Unlike Nagios, the command line cannot contain macros - it must be ++# typed exactly as it should be executed. ++# ++# Note: Any plugins that are used in the command lines must reside ++# on the machine that this daemon is running on! The examples below ++# assume that you have plugins installed in a /usr/local/nagios/libexec ++# directory. Also note that you will have to modify the definitions below ++# to match the argument format the plugins expect. Remember, these are ++# examples only! ++ ++ ++# The following examples use hardcoded command arguments... ++ ++command[check_users]=/usr/libexec/nagios/check_users -w 3 -c 5 ++command[check_load]=/usr/libexec/nagios/check_load -w 7,4,2 -c 10,5,3 ++command[check_tmp]=/usr/libexec/nagios/check_disk -w 50% -c 25% -p /tmp ++command[check_zombie_procs]=/usr/libexec/nagios/check_procs -w 1 -c 3 -s Z ++command[check_total_procs]=/usr/libexec/nagios/check_procs -w 25 -c 30 ++ ++ ++ ++# The following examples allow user-supplied arguments and can ++# only be used if the NRPE daemon was compiled with support for ++# command arguments *AND* the dont_blame_nrpe directive in this ++# config file is set to '1'. This poses a potential security risk, so ++# make sure you read the SECURITY file before doing this. ++ ++#command[check_users]=/usr/lib/check_users -w $ARG1$ -c $ARG2$ ++#command[check_load]=/usr/lib/check_load -w $ARG1$ -c $ARG2$ ++#command[check_disk]=/usr/lib/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ ++#command[check_procs]=/usr/lib/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ +diff --git a/feeds/packages/admin/nrpe/files/.svn/text-base/nrpe.init.svn-base b/feeds/packages/admin/nrpe/files/.svn/text-base/nrpe.init.svn-base +new file mode 100644 +index 0000000..4632ac1 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/files/.svn/text-base/nrpe.init.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=70 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ user_exists nagios 50 || user_add nagios 50 ++ group_exists nagios 50 || group_add nagios 50 ++ [ -d /var/run/nagios ] || { ++ mkdir -m 0755 -p /var/run/nagios ++ chown nagios:nagios /var/run/nagios ++ } ++ service_start /usr/sbin/nrpe -c /etc/nrpe.cfg -d ++} ++ ++stop() { ++ service_stop /usr/sbin/nrpe ++} +diff --git a/feeds/packages/admin/nrpe/files/nrpe.cfg b/feeds/packages/admin/nrpe/files/nrpe.cfg +new file mode 100644 +index 0000000..e84bed7 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/files/nrpe.cfg +@@ -0,0 +1,208 @@ ++############################################################################# ++# Sample NRPE Config File ++# Written by: Ethan Galstad (nagios@nagios.org) ++# ++# Last Modified: 03-09-2007 ++# ++# NOTES: ++# This is a sample configuration file for the NRPE daemon. It needs to be ++# located on the remote host that is running the NRPE daemon, not the host ++# from which the check_nrpe client is being executed. ++############################################################################# ++ ++ ++# PID FILE ++# The name of the file in which the NRPE daemon should write it's process ID ++# number. The file is only written if the NRPE daemon is started by the root ++# user and is running in standalone mode. ++ ++pid_file=/var/run/nrpe.pid ++ ++ ++ ++# PORT NUMBER ++# Port number we should wait for connections on. ++# NOTE: This must be a non-priviledged port (i.e. > 1024). ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++server_port=5666 ++ ++ ++ ++# SERVER ADDRESS ++# Address that nrpe should bind to in case there are more than one interface ++# and you do not want nrpe to bind on all interfaces. ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++server_address=192.168.1.1 ++ ++ ++# NRPE USER ++# This determines the effective user that the NRPE daemon should run as. ++# You can either supply a username or a UID. ++# ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++nrpe_user=nagios ++ ++ ++ ++# NRPE GROUP ++# This determines the effective group that the NRPE daemon should run as. ++# You can either supply a group name or a GID. ++# ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++nrpe_group=nagios ++ ++ ++ ++# ALLOWED HOST ADDRESSES ++# This is an optional comma-delimited list of IP address or hostnames ++# that are allowed to talk to the NRPE daemon. ++# ++# Note: The daemon only does rudimentary checking of the client's IP ++# address. I would highly recommend adding entries in your /etc/hosts.allow ++# file to allow only the specified host to connect to the port ++# you are running this daemon on. ++# ++# NOTE: This option is ignored if NRPE is running under either inetd or xinetd ++ ++allowed_hosts=192.168.1.2 ++ ++ ++ ++# COMMAND ARGUMENT PROCESSING ++# This option determines whether or not the NRPE daemon will allow clients ++# to specify arguments to commands that are executed. This option only works ++# if the daemon was configured with the --enable-command-args configure script ++# option. ++# ++# *** ENABLING THIS OPTION IS A SECURITY RISK! *** ++# Read the SECURITY file for information on some of the security implications ++# of enabling this variable. ++# ++# Values: 0=do not allow arguments, 1=allow command arguments ++ ++dont_blame_nrpe=0 ++ ++ ++ ++# COMMAND PREFIX ++# This option allows you to prefix all commands with a user-defined string. ++# A space is automatically added between the specified prefix string and the ++# command line from the command definition. ++# ++# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! *** ++# Usage scenario: ++# Execute restricted commmands using sudo. For this to work, you need to add ++# the nagios user to your /etc/sudoers. An example entry for alllowing ++# execution of the plugins from might be: ++# ++# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ ++# ++# This lets the nagios user run all commands in that directory (and only them) ++# without asking for a password. If you do this, make sure you don't give ++# random users write access to that directory or its contents! ++ ++# command_prefix=/usr/bin/sudo ++ ++ ++ ++# DEBUGGING OPTION ++# This option determines whether or not debugging messages are logged to the ++# syslog facility. ++# Values: 0=debugging off, 1=debugging on ++ ++debug=0 ++ ++ ++ ++# COMMAND TIMEOUT ++# This specifies the maximum number of seconds that the NRPE daemon will ++# allow plugins to finish executing before killing them off. ++ ++command_timeout=60 ++ ++ ++ ++# CONNECTION TIMEOUT ++# This specifies the maximum number of seconds that the NRPE daemon will ++# wait for a connection to be established before exiting. This is sometimes ++# seen where a network problem stops the SSL being established even though ++# all network sessions are connected. This causes the nrpe daemons to ++# accumulate, eating system resources. Do not set this too low. ++ ++connection_timeout=300 ++ ++ ++ ++# WEEK RANDOM SEED OPTION ++# This directive allows you to use SSL even if your system does not have ++# a /dev/random or /dev/urandom (on purpose or because the necessary patches ++# were not applied). The random number generator will be seeded from a file ++# which is either a file pointed to by the environment valiable $RANDFILE ++# or $HOME/.rnd. If neither exists, the pseudo random number generator will ++# be initialized and a warning will be issued. ++# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness ++ ++#allow_weak_random_seed=1 ++ ++ ++ ++# INCLUDE CONFIG FILE ++# This directive allows you to include definitions from an external config file. ++ ++#include= ++ ++ ++ ++# INCLUDE CONFIG DIRECTORY ++# This directive allows you to include definitions from config files (with a ++# .cfg extension) in one or more directories (with recursion). ++ ++#include_dir= ++#include_dir= ++ ++ ++ ++# COMMAND DEFINITIONS ++# Command definitions that this daemon will run. Definitions ++# are in the following format: ++# ++# command[]= ++# ++# When the daemon receives a request to return the results of ++# it will execute the command specified by the argument. ++# ++# Unlike Nagios, the command line cannot contain macros - it must be ++# typed exactly as it should be executed. ++# ++# Note: Any plugins that are used in the command lines must reside ++# on the machine that this daemon is running on! The examples below ++# assume that you have plugins installed in a /usr/local/nagios/libexec ++# directory. Also note that you will have to modify the definitions below ++# to match the argument format the plugins expect. Remember, these are ++# examples only! ++ ++ ++# The following examples use hardcoded command arguments... ++ ++command[check_users]=/usr/libexec/nagios/check_users -w 3 -c 5 ++command[check_load]=/usr/libexec/nagios/check_load -w 7,4,2 -c 10,5,3 ++command[check_tmp]=/usr/libexec/nagios/check_disk -w 50% -c 25% -p /tmp ++command[check_zombie_procs]=/usr/libexec/nagios/check_procs -w 1 -c 3 -s Z ++command[check_total_procs]=/usr/libexec/nagios/check_procs -w 25 -c 30 ++ ++ ++ ++# The following examples allow user-supplied arguments and can ++# only be used if the NRPE daemon was compiled with support for ++# command arguments *AND* the dont_blame_nrpe directive in this ++# config file is set to '1'. This poses a potential security risk, so ++# make sure you read the SECURITY file before doing this. ++ ++#command[check_users]=/usr/lib/check_users -w $ARG1$ -c $ARG2$ ++#command[check_load]=/usr/lib/check_load -w $ARG1$ -c $ARG2$ ++#command[check_disk]=/usr/lib/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ ++#command[check_procs]=/usr/lib/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ +diff --git a/feeds/packages/admin/nrpe/files/nrpe.init b/feeds/packages/admin/nrpe/files/nrpe.init +new file mode 100644 +index 0000000..4632ac1 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/files/nrpe.init +@@ -0,0 +1,20 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=70 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ user_exists nagios 50 || user_add nagios 50 ++ group_exists nagios 50 || group_add nagios 50 ++ [ -d /var/run/nagios ] || { ++ mkdir -m 0755 -p /var/run/nagios ++ chown nagios:nagios /var/run/nagios ++ } ++ service_start /usr/sbin/nrpe -c /etc/nrpe.cfg -d ++} ++ ++stop() { ++ service_stop /usr/sbin/nrpe ++} +diff --git a/feeds/packages/admin/nrpe/patches/.svn/entries b/feeds/packages/admin/nrpe/patches/.svn/entries +new file mode 100644 +index 0000000..0ce07bf +--- /dev/null ++++ b/feeds/packages/admin/nrpe/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nrpe/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-openssl-dh.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++7286df233ab7aadbbc9f8bef63a711c2 ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++516 ++ +diff --git a/feeds/packages/admin/nrpe/patches/.svn/text-base/100-openssl-dh.patch.svn-base b/feeds/packages/admin/nrpe/patches/.svn/text-base/100-openssl-dh.patch.svn-base +new file mode 100644 +index 0000000..0b7f8c9 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/patches/.svn/text-base/100-openssl-dh.patch.svn-base +@@ -0,0 +1,17 @@ ++--- a/configure +++++ b/configure ++@@ -6694,11 +6694,9 @@ ++ ++ echo "" ++ echo "*** Generating DH Parameters for SSL/TLS ***" ++- if test -f "$ssldir/sbin/openssl"; then ++- sslbin=$ssldir/sbin/openssl ++- else ++- sslbin=$ssldir/bin/openssl ++- fi +++ # Use host openssl as it just generates some random stuff, +++ # nothing machine-specific +++ sslbin=/usr/bin/openssl ++ # awk to strip off meta data at bottom of dhparam output ++ $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h ++ fi +diff --git a/feeds/packages/admin/nrpe/patches/100-openssl-dh.patch b/feeds/packages/admin/nrpe/patches/100-openssl-dh.patch +new file mode 100644 +index 0000000..0b7f8c9 +--- /dev/null ++++ b/feeds/packages/admin/nrpe/patches/100-openssl-dh.patch +@@ -0,0 +1,17 @@ ++--- a/configure +++++ b/configure ++@@ -6694,11 +6694,9 @@ ++ ++ echo "" ++ echo "*** Generating DH Parameters for SSL/TLS ***" ++- if test -f "$ssldir/sbin/openssl"; then ++- sslbin=$ssldir/sbin/openssl ++- else ++- sslbin=$ssldir/bin/openssl ++- fi +++ # Use host openssl as it just generates some random stuff, +++ # nothing machine-specific +++ sslbin=/usr/bin/openssl ++ # awk to strip off meta data at bottom of dhparam output ++ $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h ++ fi +diff --git a/feeds/packages/admin/nsca/.svn/entries b/feeds/packages/admin/nsca/.svn/entries +new file mode 100644 +index 0000000..ee0f726 +--- /dev/null ++++ b/feeds/packages/admin/nsca/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/nsca ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++64e71be8122681a79d833f16b0e0c1f2 ++2011-03-12T00:54:26.927378Z ++26051 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1384 ++ +diff --git a/feeds/packages/admin/nsca/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/nsca/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/admin/nsca/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/nsca/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/nsca/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..56789c7 +--- /dev/null ++++ b/feeds/packages/admin/nsca/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=nsca ++PKG_VERSION:=2.7.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagios ++PKG_MD5SUM:=33a98e7975f633a9489d7a8938ed6131 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/send-nsca ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libmcrypt ++ TITLE:=Nagios Service Check Acceptor (NSCA) client ++ URL:=http://www.nagios.org/ ++endef ++ ++define Package/send-nsca/description ++ This is the client program that is used to send service check ++ information from a remote machine to the nsca daemon on the central ++ machine that runs Nagios. ++endef ++ ++define Package/send-nsca/conffiles ++/etc/send_nsca.cfg ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-nsca-user="root" \ ++ --with-nsca-grp="root" \ ++ --with-libmcrypt-prefix="$(STAGING_DIR)/usr" \ ++ , \ ++ CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ send_nsca ++endef ++ ++define Package/send-nsca/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,send-nsca)) +diff --git a/feeds/packages/admin/nsca/Makefile b/feeds/packages/admin/nsca/Makefile +new file mode 100644 +index 0000000..56789c7 +--- /dev/null ++++ b/feeds/packages/admin/nsca/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=nsca ++PKG_VERSION:=2.7.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nagios ++PKG_MD5SUM:=33a98e7975f633a9489d7a8938ed6131 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/send-nsca ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libmcrypt ++ TITLE:=Nagios Service Check Acceptor (NSCA) client ++ URL:=http://www.nagios.org/ ++endef ++ ++define Package/send-nsca/description ++ This is the client program that is used to send service check ++ information from a remote machine to the nsca daemon on the central ++ machine that runs Nagios. ++endef ++ ++define Package/send-nsca/conffiles ++/etc/send_nsca.cfg ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-nsca-user="root" \ ++ --with-nsca-grp="root" \ ++ --with-libmcrypt-prefix="$(STAGING_DIR)/usr" \ ++ , \ ++ CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ send_nsca ++endef ++ ++define Package/send-nsca/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,send-nsca)) +diff --git a/feeds/packages/admin/osiris/.svn/entries b/feeds/packages/admin/osiris/.svn/entries +new file mode 100644 +index 0000000..c3078e4 +--- /dev/null ++++ b/feeds/packages/admin/osiris/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/osiris ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++88d6bb3ce7451191a18d0dcefc158c0f ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1190 ++ +diff --git a/feeds/packages/admin/osiris/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/osiris/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/admin/osiris/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/osiris/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d93689b +--- /dev/null ++++ b/feeds/packages/admin/osiris/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=osiris ++PKG_VERSION:=4.2.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://osiris.shmoo.com/data/ ++PKG_MD5SUM:=1951c7dc0fe729af9ffaf58910340d12 ++ ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=src/db-4.2.52/build_unix ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/osirisd ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libopenssl +libpthread ++ TITLE:=Host integrity monitoring system (scanning agent) ++ URL:=http://osiris.shmoo.com/ ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-osiris-user=root \ ++ --with-root-dir=/var/lib/osiris \ ++ --with-readline=no, \ ++ ac_cv_openssldir="$(STAGING_DIR)/usr" ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ INTERACTIVE=0 ++ ++define Package/osirisd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/osirisd.init $(1)/etc/init.d/osirisd ++endef ++ ++$(eval $(call BuildPackage,osirisd)) +diff --git a/feeds/packages/admin/osiris/Makefile b/feeds/packages/admin/osiris/Makefile +new file mode 100644 +index 0000000..d93689b +--- /dev/null ++++ b/feeds/packages/admin/osiris/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=osiris ++PKG_VERSION:=4.2.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://osiris.shmoo.com/data/ ++PKG_MD5SUM:=1951c7dc0fe729af9ffaf58910340d12 ++ ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=src/db-4.2.52/build_unix ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/osirisd ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libopenssl +libpthread ++ TITLE:=Host integrity monitoring system (scanning agent) ++ URL:=http://osiris.shmoo.com/ ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-osiris-user=root \ ++ --with-root-dir=/var/lib/osiris \ ++ --with-readline=no, \ ++ ac_cv_openssldir="$(STAGING_DIR)/usr" ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ INTERACTIVE=0 ++ ++define Package/osirisd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/osirisd.init $(1)/etc/init.d/osirisd ++endef ++ ++$(eval $(call BuildPackage,osirisd)) +diff --git a/feeds/packages/admin/osiris/files/.svn/entries b/feeds/packages/admin/osiris/files/.svn/entries +new file mode 100644 +index 0000000..55d01b8 +--- /dev/null ++++ b/feeds/packages/admin/osiris/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/osiris/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T19:48:59.631726Z ++28889 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++osirisd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9e3057fac8107efcb9189bb3c5a68522 ++2011-11-09T19:48:59.631726Z ++28889 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++214 ++ +diff --git a/feeds/packages/admin/osiris/files/.svn/prop-base/osirisd.init.svn-base b/feeds/packages/admin/osiris/files/.svn/prop-base/osirisd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/files/.svn/prop-base/osirisd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/files/.svn/text-base/osirisd.init.svn-base b/feeds/packages/admin/osiris/files/.svn/text-base/osirisd.init.svn-base +new file mode 100644 +index 0000000..1ce739b +--- /dev/null ++++ b/feeds/packages/admin/osiris/files/.svn/text-base/osirisd.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ mkdir -0755 -p /var/lib/osiris ++ service_start /usr/sbin/osirisd ++} ++ ++stop() { ++ service_stop /usr/sbin/osirisd ++} +diff --git a/feeds/packages/admin/osiris/files/osirisd.init b/feeds/packages/admin/osiris/files/osirisd.init +new file mode 100644 +index 0000000..1ce739b +--- /dev/null ++++ b/feeds/packages/admin/osiris/files/osirisd.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ mkdir -0755 -p /var/lib/osiris ++ service_start /usr/sbin/osirisd ++} ++ ++stop() { ++ service_stop /usr/sbin/osirisd ++} +diff --git a/feeds/packages/admin/osiris/patches/.svn/entries b/feeds/packages/admin/osiris/patches/.svn/entries +new file mode 100644 +index 0000000..9cb9249 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/entries +@@ -0,0 +1,266 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/osiris/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-21T20:55:00.824408Z ++19803 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-dont-add-host-include-paths.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++ffb6b7fa6cdf56b21b231b4dd1491ac5 ++2010-02-21T20:55:00.824408Z ++19803 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++343 ++ ++002-osirisd-pidfile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++17dcef9435b4041788d96c9dcdf9b387 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1468 ++ ++006-mod_nvram.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++5cddd24d4d708abbdbcc956870d4c087 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5851 ++ ++001-configure-cross.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++b9c62d696529583d512f83c9c40b62d6 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++813 ++ ++007-mod_uptime.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d3c22da6e9befa5074203b3453cde28e ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5951 ++ ++003-openssl-0.9.8+.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f6bbc7e0fb21d1c13c2bcb5ad78cd86d ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++735 ++ ++004-no_openssl_ripe.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0800e544706fcaa146a6447dacec8bda ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1851 ++ +diff --git a/feeds/packages/admin/osiris/patches/.svn/prop-base/001-configure-cross.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/prop-base/001-configure-cross.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/prop-base/001-configure-cross.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/patches/.svn/prop-base/002-osirisd-pidfile.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/prop-base/002-osirisd-pidfile.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/prop-base/002-osirisd-pidfile.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/patches/.svn/prop-base/003-openssl-0.9.8+.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/prop-base/003-openssl-0.9.8+.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/prop-base/003-openssl-0.9.8+.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/patches/.svn/prop-base/004-no_openssl_ripe.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/prop-base/004-no_openssl_ripe.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/prop-base/004-no_openssl_ripe.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/patches/.svn/prop-base/006-mod_nvram.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/prop-base/006-mod_nvram.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/prop-base/006-mod_nvram.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/patches/.svn/prop-base/007-mod_uptime.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/prop-base/007-mod_uptime.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/prop-base/007-mod_uptime.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/001-configure-cross.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/001-configure-cross.patch.svn-base +new file mode 100644 +index 0000000..025a3f8 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/001-configure-cross.patch.svn-base +@@ -0,0 +1,22 @@ ++--- osiris-4.1.8-orig/configure 2005-04-13 15:22:13.000000000 +0200 +++++ osiris-4.1.8-1/configure 2005-04-22 23:11:32.000000000 +0200 ++@@ -3606,7 +3606,7 @@ ++ esac ++ ++ ++-DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes" +++DB_CONFIG_ARGS="--target=${target_alias} --host=${host_alias} --build=${build_alias} --enable-shared=no --enable-static=yes" ++ ++ case "${OS_NAME}" in ++ MINGW32*) ++--- osiris-4.1.8-orig/configure.ac 2005-04-13 15:22:13.000000000 +0200 +++++ osiris-4.1.8-1/configure.ac 2005-04-22 23:11:32.000000000 +0200 ++@@ -270,7 +270,7 @@ ++ ++ dnl configure local copy of Berkely DB: ++ ++-DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes" +++DB_CONFIG_ARGS="--target=${target_alias} --host=${host_alias} --build=${build_alias} --enable-shared=no --enable-static=yes" ++ ++ case "${OS_NAME}" in ++ MINGW32*) +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/002-osirisd-pidfile.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/002-osirisd-pidfile.patch.svn-base +new file mode 100644 +index 0000000..80c52db +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/002-osirisd-pidfile.patch.svn-base +@@ -0,0 +1,68 @@ ++--- osiris-4.1.8-orig/src/osirisd/osirisd.c 2005-04-14 01:00:55.000000000 +0200 +++++ osiris-4.1.8-1/src/osirisd/osirisd.c 2005-04-22 23:11:32.000000000 +0200 ++@@ -218,6 +218,8 @@ ++ ++ #ifdef USE_PRIVSEP ++ rootpriv_setup_pidfile(); +++#else +++ setup_pidfile(); ++ #endif ++ ++ process(); ++--- osiris-4.1.8-orig/src/osirisd/rootpriv.c 2005-04-14 00:55:59.000000000 +0200 +++++ osiris-4.1.8-1/src/osirisd/rootpriv.c 2005-04-22 23:25:10.000000000 +0200 ++@@ -35,6 +35,10 @@ ++ #include "logging.h" ++ #include "rootpriv.h" ++ +++#ifndef WIN32 +++extern char pid_file[MAX_PATH_LENGTH]; +++#endif +++ ++ #ifdef USE_PRIVSEP ++ ++ /* this is defined in regex, and sometimes conflicts with stuff */ ++@@ -80,10 +84,6 @@ ++ extern pid_t child_pid; ++ extern int rootpriv_pipe[2]; /* socketpair used for rootpriv comm. */ ++ ++-#ifndef WIN32 ++-extern char pid_file[MAX_PATH_LENGTH]; ++-#endif ++- ++ #define INCOMING_ROOT_REQUEST() ( FD_ISSET( rootpriv_pipe[1], &root_read_set ) ) ++ ++ ++@@ -292,17 +292,6 @@ ++ #endif ++ } ++ ++-void setup_pidfile() ++-{ ++- FILE *pidfile = fopen( pid_file, "wb" ); ++- ++- if( pidfile != NULL ) ++- { ++- fprintf( pidfile, "%ld\n", (long)getpid() ); ++- fclose( pidfile ); ++- } ++-} ++- ++ void handle_signals() ++ { ++ pid_t pid; ++@@ -789,3 +778,14 @@ ++ ++ #endif /* USE_PRIVSEP */ ++ +++void setup_pidfile() +++{ +++ FILE *pidfile = fopen( pid_file, "wb" ); +++ +++ if( pidfile != NULL ) +++ { +++ fprintf( pidfile, "%ld\n", (long)getpid() ); +++ fclose( pidfile ); +++ } +++} +++ +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/003-openssl-0.9.8+.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/003-openssl-0.9.8+.patch.svn-base +new file mode 100644 +index 0000000..806cf3a +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/003-openssl-0.9.8+.patch.svn-base +@@ -0,0 +1,16 @@ ++diff -ruN osiris-4.1.9-old/src/osirismd/md_control.c osiris-4.1.9-new/src/osirismd/md_control.c ++--- osiris-4.1.9-old/src/osirismd/md_control.c 2005-03-24 16:36:07.000000000 +0100 +++++ osiris-4.1.9-new/src/osirismd/md_control.c 2006-03-28 01:32:32.000000000 +0200 ++@@ -3262,9 +3262,9 @@ ++ int index; ++ char checksum[41]; ++ ++- SHA_Init( &context ); ++- SHA_Update( &context, key, (unsigned long)keysize ); ++- SHA_Final( &( digest[0] ), &context ); +++ SHA1_Init( &context ); +++ SHA1_Update( &context, key, (unsigned long)keysize ); +++ SHA1_Final( &( digest[0] ), &context ); ++ ++ for ( index = 0; index < SHA_DIGEST_LENGTH; index++ ) ++ { +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/004-no_openssl_ripe.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/004-no_openssl_ripe.patch.svn-base +new file mode 100644 +index 0000000..75a9e9d +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/004-no_openssl_ripe.patch.svn-base +@@ -0,0 +1,59 @@ ++diff -urN osiris-4.2.1/src/libosiris/filter_ripemd.c osiris-4.2.1.new/src/libosiris/filter_ripemd.c ++--- osiris-4.2.1/src/libosiris/filter_ripemd.c 2006-07-28 03:22:37.000000000 +0200 +++++ osiris-4.2.1.new/src/libosiris/filter_ripemd.c 2006-11-29 12:16:00.000000000 +0100 ++@@ -55,9 +55,9 @@ ++ { ++ context->filter_argument += 2; ++ } ++- +++#ifndef OPENSSL_NO_RIPEMD ++ hash_file_ripemd( file_path, context->file_handle, hash, sizeof(hash) ); ++- +++#endif ++ if( strcmp( hash, context->filter_argument ) == 0 ) ++ { ++ return TRUE; ++diff -urN osiris-4.2.1/src/libosiris/ssl_utilities.c osiris-4.2.1.new/src/libosiris/ssl_utilities.c ++--- osiris-4.2.1/src/libosiris/ssl_utilities.c 2006-07-28 03:22:37.000000000 +0200 +++++ osiris-4.2.1.new/src/libosiris/ssl_utilities.c 2006-11-29 12:17:33.000000000 +0100 ++@@ -51,7 +51,9 @@ ++ #include ++ #include ++ #include +++#ifndef OPENSSL_NO_RIPEMD ++ #include +++#endif ++ ++ #ifdef WIN32 ++ #include ++@@ -348,6 +350,7 @@ ++ int hash_file_ripemd( const char *file_path, FILE *file, ++ char *buffer, int buffer_size ) ++ { +++#ifndef OPENSSL_NO_RIPEMD ++ int fno; ++ FILE *file_to_hash = file; ++ RIPEMD160_CTX context; ++@@ -430,7 +433,7 @@ ++ osi_strlcpy( buffer, file_hash, buffer_size ); ++ return 0; ++ } ++- +++#endif ++ return -1; ++ } ++ ++diff -urN osiris-4.2.1/src/libosiris/utilities.c osiris-4.2.1.new/src/libosiris/utilities.c ++--- osiris-4.2.1/src/libosiris/utilities.c 2006-07-28 03:22:37.000000000 +0200 +++++ osiris-4.2.1.new/src/libosiris/utilities.c 2006-11-29 12:16:38.000000000 +0100 ++@@ -60,8 +60,9 @@ ++ ++ #include ++ #include +++#ifndef OPENSSL_NO_RIPEMD ++ #include ++- +++#endif ++ #include "utilities.h" ++ #include "error.h" ++ +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/006-mod_nvram.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/006-mod_nvram.patch.svn-base +new file mode 100644 +index 0000000..69b6cd6 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/006-mod_nvram.patch.svn-base +@@ -0,0 +1,213 @@ ++Description: The mod_nvram module was developed specifically to monitor ++ configuration settings stored in nvram on Linksys devices. ++ In the future, this module could be used to monitor other ++ attributes of similar devices. ++Version: 0.1 ++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/Makefile 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_nvram/Makefile 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,16 @@ +++ +++include ../Makefile +++ +++SRCS=mod_nvram.c +++OBJS=$(SRCS:.c=.o) +++ +++module: ${SRCS} ${OBJS} +++ +++INCS=-I../.. -I../../../libosiris -I../../../libfileapi -I../../../.. +++ +++# meta-rule for compiling any "C" source file. +++$(OBJS): $(SRCS) +++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) ${INCLUDES} ${INCS} $(AM_CPPFLAGS) \ +++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $(SRCS) +++ cp $@ .. +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/README 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_nvram/README 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,40 @@ +++ +++Module: mod_nvram +++Author: Brian Wotring (brian@shmoo.com) +++ +++ +++ +++DESCRIPTION: +++ +++The mod_nvram module reads the key=value pairs stored in nvram. This +++is primarily for Linksys routers, but could be modified to run on +++other systems if necessary. On the routers like the WRT54G, the +++nvram settings hold sensitive information that needs to be monitored. +++The format for the record structure is as follows: +++ +++ name:value +++ +++USE: +++ +++To use this module, all that is needed is to include it in the System +++block of a scan configuration, e.g.: +++ +++ +++ ... +++ Include mod_nvram +++ ... +++ +++ +++ +++PARAMETERS: +++ +++There are no parameters for this module. +++ +++PLATFORMS: +++ +++Currently, only for the Linksys WRT54G and WRT54GS devices. +++ +++NOTES: +++ +++ +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/mod_nvram.c 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_nvram/mod_nvram.c 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,142 @@ +++ +++/****************************************************************************** +++** +++** This program is free software; you can redistribute it and/or +++** modify it, however, you cannot sell it. +++** +++** 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. +++** +++** You should have received a copy of the license attached to the +++** use of this software. If not, visit www.shmoo.com/osiris for +++** details. +++** +++******************************************************************************/ +++ +++/***************************************************************************** +++** +++** File: mod_users.c +++** Date: January 1, 2004 +++** +++** Author: Brian Wotring +++** Purpose: platform specific methods for reading user file information. +++** +++******************************************************************************/ +++ +++#include "libosiris.h" +++#include "libfileapi.h" +++#include "rootpriv.h" +++#include "common.h" +++#include "version.h" +++ +++#include "scanner.h" +++#include "logging.h" +++ +++ +++#define NVRAM_PATH "/usr/sbin/nvram" +++#define NVRAM_ARG "show" +++ +++static const char *MODULE_NAME = "mod_nvram"; +++ +++ +++void mod_nvram( SCANNER *scanner ) +++{ +++ int pid; +++ int pc[2]; +++ int cp[2]; +++ char temp_line[4096]; +++ FILE *file; +++ SCAN_RECORD_TEXT_1 record; +++ +++ if( pipe(pc) < 0) +++ { +++ log_error( "mod_nvram: error creating pipe!" ); +++ return; +++ } +++ +++ if( pipe(cp) < 0) +++ { +++ log_error( "mod_nvram: error creating pipe!" ); +++ return; +++ } +++ +++ /* Create a child to run nvram command. */ +++ +++ switch( pid = fork() ) +++ { +++ case -1: +++ log_error( "nvram: fork error!" ); +++ return; +++ +++ case 0: +++ +++ /* child */ +++ +++ close(1); +++ dup( cp[1]); +++ close(0); +++ close( pc[1]); +++ close( cp[0]); +++ execl( NVRAM_PATH, NVRAM_PATH, NVRAM_ARG, NULL ); +++ exit(0); +++ +++ default: +++ +++ /* parent */ +++ +++ close(pc[1]); +++ close(cp[1]); +++ +++ file = fdopen( cp[0], "r" ); +++ +++ for(;;) +++ { +++ char *line; +++ char *key_end; +++ +++ line = fgets( temp_line, sizeof( temp_line ), file ); +++ +++ if( line == NULL) +++ { +++ break; +++ } +++ +++ line = trim_white_space( line ); +++ +++ /* skip commented and empty lines. */ +++ +++ if( ( line == NULL ) || ( line[0] == '#' ) ) +++ { +++ continue; +++ } +++ +++ /* locate the username, this is the first item in the colon list. */ +++ +++ if( ( key_end = strchr( line, '=' ) ) == NULL ) +++ { +++ continue; +++ } +++ +++ initialize_scan_record( (SCAN_RECORD *)&record, +++ SCAN_RECORD_TYPE_TEXT_1 ); +++ +++ osi_strlcpy( record.module_name, MODULE_NAME, +++ sizeof( record.module_name ) ); +++ +++ /* user the key as a key/path for this record. */ +++ +++ (*key_end) = '\0'; +++ key_end++; +++ osi_strlcpy( record.name, "nvram:", sizeof( record.name ) ); +++ osi_strlcat( record.name, line, sizeof( record.name ) ); +++ +++ /* now copy in the value into the data portion. */ +++ /* and send this record on its way. */ +++ +++ osi_strlcpy( record.data, key_end, sizeof( record.data ) ); +++ send_scan_data( scanner, (SCAN_RECORD *)&record ); +++ } +++ } +++} +++ +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/007-mod_uptime.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/007-mod_uptime.patch.svn-base +new file mode 100644 +index 0000000..2bfeec6 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/007-mod_uptime.patch.svn-base +@@ -0,0 +1,243 @@ ++Description: The mod_uptime module obtains the system boot time value ++ for comparison with scans. ++Version: 0.2 ++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/Makefile 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_uptime/Makefile 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,16 @@ +++ +++include ../Makefile +++ +++SRCS=mod_uptime.c +++OBJS=$(SRCS:.c=.o) +++ +++module: ${SRCS} ${OBJS} +++ +++INCS=-I../.. -I../../../libosiris -I../../../libfileapi -I../../../.. +++ +++# meta-rule for compiling any "C" source file. +++$(OBJS): $(SRCS) +++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) ${INCLUDES} ${INCS} $(AM_CPPFLAGS) \ +++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $(SRCS) +++ cp $@ .. +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/README 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_uptime/README 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,36 @@ +++ +++Module: mod_uptime +++Author: Brian Wotring (brian@shmoo.com) +++ +++ +++ +++DESCRIPTION: +++ +++The mod_uptime module obtains the system boot time value for comparison +++with scans. +++ +++USE: +++ +++To use this module, all that is needed is to include it in the System +++block of a scan configuration, e.g.: +++ +++ +++ ... +++ Include mod_uptime +++ ... +++ +++ +++ +++PARAMETERS: +++ +++There are no parameters for this module. +++ +++PLATFORMS: +++ +++Currently, this module is implemented for FreeBSD, OpenBSD, +++Linux, Solaris, and Mac OS X. +++ +++NOTES: +++ +++ +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/mod_uptime.c 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_uptime/mod_uptime.c 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,178 @@ +++ +++/****************************************************************************** +++** +++** This program is free software; you can redistribute it and/or +++** modify it, however, you cannot sell it. +++** +++** 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. +++** +++** You should have received a copy of the license attached to the +++** use of this software. If not, visit www.shmoo.com/osiris for +++** details. +++** +++******************************************************************************/ +++ +++/***************************************************************************** +++** +++** File: mod_uptime.c +++** Date: March 22, 2004 +++** +++** Author: Brian Wotring +++** Purpose: platform specific methods for obtaining the system boot time. +++** +++******************************************************************************/ +++ +++#include "libosiris.h" +++#include "libfileapi.h" +++#include "rootpriv.h" +++#include "common.h" +++#include "version.h" +++ +++#include "scanner.h" +++#include "logging.h" +++#include "config.h" +++ +++#ifdef HAVE_SYS_SYSCTL_H +++#include +++#endif +++ +++#ifdef SYSTEM_SUNOS +++#include +++#endif +++ +++#ifdef SYSTEM_LINUX +++#include +++#endif +++ +++#define PROC_FILE "/proc/uptime" +++#define OSI_WTMP_FILE "/var/log/wtmp" +++ +++static const char *MODULE_NAME = "mod_uptime"; +++ +++ +++void mod_uptime( SCANNER *scanner ) +++{ +++ SCAN_RECORD_TEXT_1 record; +++ char *time = NULL; +++ char *temp; +++ +++ initialize_scan_record( (SCAN_RECORD *)&record, +++ SCAN_RECORD_TYPE_TEXT_1 ); +++ +++ osi_strlcpy( record.module_name, MODULE_NAME, +++ sizeof( record.module_name ) ); +++ +++#if defined(SYSTEM_FREEBSD) || defined(SYSTEM_OPENBSD) || defined(SYSTEM_DARWIN) +++ { +++ time_t t; +++ struct timeval result; +++ +++ int request[2] = { CTL_KERN, KERN_BOOTTIME }; +++ size_t result_len = sizeof(result); +++ +++ if( sysctl( request, 2, &result, &result_len, NULL, 0 ) < 0) +++ { +++ log_error( "unable to obtain uptime value." ); +++ return; +++ } +++ +++ t = result.tv_sec; +++ time = ctime( &t ); +++ } +++ +++#elif defined(SYSTEM_SUNOS) +++ { +++ struct utmpx * ent; +++ time_t t; +++ +++ while( ( ent = getutxent() ) ) +++ { +++ if( !strcmp( "system boot", ent->ut_line ) ) +++ { +++ t = ent->ut_tv.tv_sec; +++ time = ctime( &t ); +++ } +++ } +++ } +++ +++#elif defined(SYSTEM_LINUX) +++ { +++ FILE *fp; +++ time_t t; +++ struct utmp ut; +++ +++ char buf[40]; +++ char buf2[10]; +++ int filecount = 0; +++ +++next_file: +++ +++ osi_strlcpy( buf, OSI_WTMP_FILE, sizeof( buf ) ); +++ +++ if( filecount > 0 ) +++ { +++ osi_snprintf( buf2, sizeof(buf2), "%d", filecount ); +++ osi_strlcat( buf, buf2, sizeof(buf) ); +++ } +++ +++ fp = osi_fopen( buf, "r", 0 ); +++ +++ if( fp == NULL ) +++ { +++ log_error( "unable to obtain uptime value." ); +++ return; +++ } +++ +++ while(1) +++ { +++ int rc = fread( &ut, 1, sizeof(ut), fp ); +++ +++ /* end of file, try next. */ +++ +++ if( rc == 0 ) +++ { +++ filecount++; +++ fclose( fp ); +++ +++ goto next_file; +++ } +++ +++ /* found restart event. */ +++ +++ if( ( strcmp( ut.ut_name, "reboot" ) == 0 ) || +++ ( strcmp( ut.ut_name, "shutdown" ) == 0 ) ) +++ { +++ +++ t = ut.ut_time; +++ time = ctime( &t ); +++ +++ break; +++ } +++ } +++ +++ fclose( fp ); +++ } +++#endif +++ +++ if( time == NULL ) +++ { +++ log_error( "unable to obtain uptime value." ); +++ return; +++ } +++ +++ /* remove any trailing newline from the ctime() calls. */ +++ +++ if( ( temp = strchr( time, '\n' ) ) ) +++ { +++ (*temp) = '\0'; +++ } +++ +++ osi_strlcpy( record.name, "uptime", sizeof( record.name ) ); +++ osi_strlcpy( record.data, time, sizeof( record.data ) ); +++ +++ send_scan_data( scanner, (SCAN_RECORD *)&record ); +++} +++ +++ +diff --git a/feeds/packages/admin/osiris/patches/.svn/text-base/010-dont-add-host-include-paths.patch.svn-base b/feeds/packages/admin/osiris/patches/.svn/text-base/010-dont-add-host-include-paths.patch.svn-base +new file mode 100644 +index 0000000..84e4ab6 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/.svn/text-base/010-dont-add-host-include-paths.patch.svn-base +@@ -0,0 +1,16 @@ ++diff --git a/configure b/configure ++index f7f5ce9..322a49d 100755 ++--- a/configure +++++ b/configure ++@@ -4448,11 +4448,6 @@ cat >>confdefs.h <<_ACEOF ++ #define SYSTEM_LINUX 1 ++ _ACEOF ++ ++- ++- rc=`grep -c krb5 /usr/include/openssl/ssl.h` ++- if test $rc -ne 0; then ++- CPPFLAGS="-I/usr/kerberos/include/ ${CPPFLAGS}" ++- fi ++ ;; ++ BSD*) ++ +diff --git a/feeds/packages/admin/osiris/patches/001-configure-cross.patch b/feeds/packages/admin/osiris/patches/001-configure-cross.patch +new file mode 100644 +index 0000000..025a3f8 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/001-configure-cross.patch +@@ -0,0 +1,22 @@ ++--- osiris-4.1.8-orig/configure 2005-04-13 15:22:13.000000000 +0200 +++++ osiris-4.1.8-1/configure 2005-04-22 23:11:32.000000000 +0200 ++@@ -3606,7 +3606,7 @@ ++ esac ++ ++ ++-DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes" +++DB_CONFIG_ARGS="--target=${target_alias} --host=${host_alias} --build=${build_alias} --enable-shared=no --enable-static=yes" ++ ++ case "${OS_NAME}" in ++ MINGW32*) ++--- osiris-4.1.8-orig/configure.ac 2005-04-13 15:22:13.000000000 +0200 +++++ osiris-4.1.8-1/configure.ac 2005-04-22 23:11:32.000000000 +0200 ++@@ -270,7 +270,7 @@ ++ ++ dnl configure local copy of Berkely DB: ++ ++-DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes" +++DB_CONFIG_ARGS="--target=${target_alias} --host=${host_alias} --build=${build_alias} --enable-shared=no --enable-static=yes" ++ ++ case "${OS_NAME}" in ++ MINGW32*) +diff --git a/feeds/packages/admin/osiris/patches/002-osirisd-pidfile.patch b/feeds/packages/admin/osiris/patches/002-osirisd-pidfile.patch +new file mode 100644 +index 0000000..80c52db +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/002-osirisd-pidfile.patch +@@ -0,0 +1,68 @@ ++--- osiris-4.1.8-orig/src/osirisd/osirisd.c 2005-04-14 01:00:55.000000000 +0200 +++++ osiris-4.1.8-1/src/osirisd/osirisd.c 2005-04-22 23:11:32.000000000 +0200 ++@@ -218,6 +218,8 @@ ++ ++ #ifdef USE_PRIVSEP ++ rootpriv_setup_pidfile(); +++#else +++ setup_pidfile(); ++ #endif ++ ++ process(); ++--- osiris-4.1.8-orig/src/osirisd/rootpriv.c 2005-04-14 00:55:59.000000000 +0200 +++++ osiris-4.1.8-1/src/osirisd/rootpriv.c 2005-04-22 23:25:10.000000000 +0200 ++@@ -35,6 +35,10 @@ ++ #include "logging.h" ++ #include "rootpriv.h" ++ +++#ifndef WIN32 +++extern char pid_file[MAX_PATH_LENGTH]; +++#endif +++ ++ #ifdef USE_PRIVSEP ++ ++ /* this is defined in regex, and sometimes conflicts with stuff */ ++@@ -80,10 +84,6 @@ ++ extern pid_t child_pid; ++ extern int rootpriv_pipe[2]; /* socketpair used for rootpriv comm. */ ++ ++-#ifndef WIN32 ++-extern char pid_file[MAX_PATH_LENGTH]; ++-#endif ++- ++ #define INCOMING_ROOT_REQUEST() ( FD_ISSET( rootpriv_pipe[1], &root_read_set ) ) ++ ++ ++@@ -292,17 +292,6 @@ ++ #endif ++ } ++ ++-void setup_pidfile() ++-{ ++- FILE *pidfile = fopen( pid_file, "wb" ); ++- ++- if( pidfile != NULL ) ++- { ++- fprintf( pidfile, "%ld\n", (long)getpid() ); ++- fclose( pidfile ); ++- } ++-} ++- ++ void handle_signals() ++ { ++ pid_t pid; ++@@ -789,3 +778,14 @@ ++ ++ #endif /* USE_PRIVSEP */ ++ +++void setup_pidfile() +++{ +++ FILE *pidfile = fopen( pid_file, "wb" ); +++ +++ if( pidfile != NULL ) +++ { +++ fprintf( pidfile, "%ld\n", (long)getpid() ); +++ fclose( pidfile ); +++ } +++} +++ +diff --git a/feeds/packages/admin/osiris/patches/003-openssl-0.9.8+.patch b/feeds/packages/admin/osiris/patches/003-openssl-0.9.8+.patch +new file mode 100644 +index 0000000..806cf3a +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/003-openssl-0.9.8+.patch +@@ -0,0 +1,16 @@ ++diff -ruN osiris-4.1.9-old/src/osirismd/md_control.c osiris-4.1.9-new/src/osirismd/md_control.c ++--- osiris-4.1.9-old/src/osirismd/md_control.c 2005-03-24 16:36:07.000000000 +0100 +++++ osiris-4.1.9-new/src/osirismd/md_control.c 2006-03-28 01:32:32.000000000 +0200 ++@@ -3262,9 +3262,9 @@ ++ int index; ++ char checksum[41]; ++ ++- SHA_Init( &context ); ++- SHA_Update( &context, key, (unsigned long)keysize ); ++- SHA_Final( &( digest[0] ), &context ); +++ SHA1_Init( &context ); +++ SHA1_Update( &context, key, (unsigned long)keysize ); +++ SHA1_Final( &( digest[0] ), &context ); ++ ++ for ( index = 0; index < SHA_DIGEST_LENGTH; index++ ) ++ { +diff --git a/feeds/packages/admin/osiris/patches/004-no_openssl_ripe.patch b/feeds/packages/admin/osiris/patches/004-no_openssl_ripe.patch +new file mode 100644 +index 0000000..75a9e9d +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/004-no_openssl_ripe.patch +@@ -0,0 +1,59 @@ ++diff -urN osiris-4.2.1/src/libosiris/filter_ripemd.c osiris-4.2.1.new/src/libosiris/filter_ripemd.c ++--- osiris-4.2.1/src/libosiris/filter_ripemd.c 2006-07-28 03:22:37.000000000 +0200 +++++ osiris-4.2.1.new/src/libosiris/filter_ripemd.c 2006-11-29 12:16:00.000000000 +0100 ++@@ -55,9 +55,9 @@ ++ { ++ context->filter_argument += 2; ++ } ++- +++#ifndef OPENSSL_NO_RIPEMD ++ hash_file_ripemd( file_path, context->file_handle, hash, sizeof(hash) ); ++- +++#endif ++ if( strcmp( hash, context->filter_argument ) == 0 ) ++ { ++ return TRUE; ++diff -urN osiris-4.2.1/src/libosiris/ssl_utilities.c osiris-4.2.1.new/src/libosiris/ssl_utilities.c ++--- osiris-4.2.1/src/libosiris/ssl_utilities.c 2006-07-28 03:22:37.000000000 +0200 +++++ osiris-4.2.1.new/src/libosiris/ssl_utilities.c 2006-11-29 12:17:33.000000000 +0100 ++@@ -51,7 +51,9 @@ ++ #include ++ #include ++ #include +++#ifndef OPENSSL_NO_RIPEMD ++ #include +++#endif ++ ++ #ifdef WIN32 ++ #include ++@@ -348,6 +350,7 @@ ++ int hash_file_ripemd( const char *file_path, FILE *file, ++ char *buffer, int buffer_size ) ++ { +++#ifndef OPENSSL_NO_RIPEMD ++ int fno; ++ FILE *file_to_hash = file; ++ RIPEMD160_CTX context; ++@@ -430,7 +433,7 @@ ++ osi_strlcpy( buffer, file_hash, buffer_size ); ++ return 0; ++ } ++- +++#endif ++ return -1; ++ } ++ ++diff -urN osiris-4.2.1/src/libosiris/utilities.c osiris-4.2.1.new/src/libosiris/utilities.c ++--- osiris-4.2.1/src/libosiris/utilities.c 2006-07-28 03:22:37.000000000 +0200 +++++ osiris-4.2.1.new/src/libosiris/utilities.c 2006-11-29 12:16:38.000000000 +0100 ++@@ -60,8 +60,9 @@ ++ ++ #include ++ #include +++#ifndef OPENSSL_NO_RIPEMD ++ #include ++- +++#endif ++ #include "utilities.h" ++ #include "error.h" ++ +diff --git a/feeds/packages/admin/osiris/patches/006-mod_nvram.patch b/feeds/packages/admin/osiris/patches/006-mod_nvram.patch +new file mode 100644 +index 0000000..69b6cd6 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/006-mod_nvram.patch +@@ -0,0 +1,213 @@ ++Description: The mod_nvram module was developed specifically to monitor ++ configuration settings stored in nvram on Linksys devices. ++ In the future, this module could be used to monitor other ++ attributes of similar devices. ++Version: 0.1 ++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/Makefile 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_nvram/Makefile 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,16 @@ +++ +++include ../Makefile +++ +++SRCS=mod_nvram.c +++OBJS=$(SRCS:.c=.o) +++ +++module: ${SRCS} ${OBJS} +++ +++INCS=-I../.. -I../../../libosiris -I../../../libfileapi -I../../../.. +++ +++# meta-rule for compiling any "C" source file. +++$(OBJS): $(SRCS) +++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) ${INCLUDES} ${INCS} $(AM_CPPFLAGS) \ +++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $(SRCS) +++ cp $@ .. +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/README 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_nvram/README 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,40 @@ +++ +++Module: mod_nvram +++Author: Brian Wotring (brian@shmoo.com) +++ +++ +++ +++DESCRIPTION: +++ +++The mod_nvram module reads the key=value pairs stored in nvram. This +++is primarily for Linksys routers, but could be modified to run on +++other systems if necessary. On the routers like the WRT54G, the +++nvram settings hold sensitive information that needs to be monitored. +++The format for the record structure is as follows: +++ +++ name:value +++ +++USE: +++ +++To use this module, all that is needed is to include it in the System +++block of a scan configuration, e.g.: +++ +++ +++ ... +++ Include mod_nvram +++ ... +++ +++ +++ +++PARAMETERS: +++ +++There are no parameters for this module. +++ +++PLATFORMS: +++ +++Currently, only for the Linksys WRT54G and WRT54GS devices. +++ +++NOTES: +++ +++ +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_nvram/mod_nvram.c 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_nvram/mod_nvram.c 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,142 @@ +++ +++/****************************************************************************** +++** +++** This program is free software; you can redistribute it and/or +++** modify it, however, you cannot sell it. +++** +++** 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. +++** +++** You should have received a copy of the license attached to the +++** use of this software. If not, visit www.shmoo.com/osiris for +++** details. +++** +++******************************************************************************/ +++ +++/***************************************************************************** +++** +++** File: mod_users.c +++** Date: January 1, 2004 +++** +++** Author: Brian Wotring +++** Purpose: platform specific methods for reading user file information. +++** +++******************************************************************************/ +++ +++#include "libosiris.h" +++#include "libfileapi.h" +++#include "rootpriv.h" +++#include "common.h" +++#include "version.h" +++ +++#include "scanner.h" +++#include "logging.h" +++ +++ +++#define NVRAM_PATH "/usr/sbin/nvram" +++#define NVRAM_ARG "show" +++ +++static const char *MODULE_NAME = "mod_nvram"; +++ +++ +++void mod_nvram( SCANNER *scanner ) +++{ +++ int pid; +++ int pc[2]; +++ int cp[2]; +++ char temp_line[4096]; +++ FILE *file; +++ SCAN_RECORD_TEXT_1 record; +++ +++ if( pipe(pc) < 0) +++ { +++ log_error( "mod_nvram: error creating pipe!" ); +++ return; +++ } +++ +++ if( pipe(cp) < 0) +++ { +++ log_error( "mod_nvram: error creating pipe!" ); +++ return; +++ } +++ +++ /* Create a child to run nvram command. */ +++ +++ switch( pid = fork() ) +++ { +++ case -1: +++ log_error( "nvram: fork error!" ); +++ return; +++ +++ case 0: +++ +++ /* child */ +++ +++ close(1); +++ dup( cp[1]); +++ close(0); +++ close( pc[1]); +++ close( cp[0]); +++ execl( NVRAM_PATH, NVRAM_PATH, NVRAM_ARG, NULL ); +++ exit(0); +++ +++ default: +++ +++ /* parent */ +++ +++ close(pc[1]); +++ close(cp[1]); +++ +++ file = fdopen( cp[0], "r" ); +++ +++ for(;;) +++ { +++ char *line; +++ char *key_end; +++ +++ line = fgets( temp_line, sizeof( temp_line ), file ); +++ +++ if( line == NULL) +++ { +++ break; +++ } +++ +++ line = trim_white_space( line ); +++ +++ /* skip commented and empty lines. */ +++ +++ if( ( line == NULL ) || ( line[0] == '#' ) ) +++ { +++ continue; +++ } +++ +++ /* locate the username, this is the first item in the colon list. */ +++ +++ if( ( key_end = strchr( line, '=' ) ) == NULL ) +++ { +++ continue; +++ } +++ +++ initialize_scan_record( (SCAN_RECORD *)&record, +++ SCAN_RECORD_TYPE_TEXT_1 ); +++ +++ osi_strlcpy( record.module_name, MODULE_NAME, +++ sizeof( record.module_name ) ); +++ +++ /* user the key as a key/path for this record. */ +++ +++ (*key_end) = '\0'; +++ key_end++; +++ osi_strlcpy( record.name, "nvram:", sizeof( record.name ) ); +++ osi_strlcat( record.name, line, sizeof( record.name ) ); +++ +++ /* now copy in the value into the data portion. */ +++ /* and send this record on its way. */ +++ +++ osi_strlcpy( record.data, key_end, sizeof( record.data ) ); +++ send_scan_data( scanner, (SCAN_RECORD *)&record ); +++ } +++ } +++} +++ +diff --git a/feeds/packages/admin/osiris/patches/007-mod_uptime.patch b/feeds/packages/admin/osiris/patches/007-mod_uptime.patch +new file mode 100644 +index 0000000..2bfeec6 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/007-mod_uptime.patch +@@ -0,0 +1,243 @@ ++Description: The mod_uptime module obtains the system boot time value ++ for comparison with scans. ++Version: 0.2 ++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/Makefile 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_uptime/Makefile 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,16 @@ +++ +++include ../Makefile +++ +++SRCS=mod_uptime.c +++OBJS=$(SRCS:.c=.o) +++ +++module: ${SRCS} ${OBJS} +++ +++INCS=-I../.. -I../../../libosiris -I../../../libfileapi -I../../../.. +++ +++# meta-rule for compiling any "C" source file. +++$(OBJS): $(SRCS) +++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) ${INCLUDES} ${INCS} $(AM_CPPFLAGS) \ +++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $(SRCS) +++ cp $@ .. +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/README 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_uptime/README 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,36 @@ +++ +++Module: mod_uptime +++Author: Brian Wotring (brian@shmoo.com) +++ +++ +++ +++DESCRIPTION: +++ +++The mod_uptime module obtains the system boot time value for comparison +++with scans. +++ +++USE: +++ +++To use this module, all that is needed is to include it in the System +++block of a scan configuration, e.g.: +++ +++ +++ ... +++ Include mod_uptime +++ ... +++ +++ +++ +++PARAMETERS: +++ +++There are no parameters for this module. +++ +++PLATFORMS: +++ +++Currently, this module is implemented for FreeBSD, OpenBSD, +++Linux, Solaris, and Mac OS X. +++ +++NOTES: +++ +++ +++ ++--- osiris-4.1.8-orig/src/osirisd/modules/mod_uptime/mod_uptime.c 1970-01-01 01:00:00.000000000 +0100 +++++ osiris-4.1.8-1/src/osirisd/modules/mod_uptime/mod_uptime.c 2005-04-22 23:11:32.000000000 +0200 ++@@ -0,0 +1,178 @@ +++ +++/****************************************************************************** +++** +++** This program is free software; you can redistribute it and/or +++** modify it, however, you cannot sell it. +++** +++** 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. +++** +++** You should have received a copy of the license attached to the +++** use of this software. If not, visit www.shmoo.com/osiris for +++** details. +++** +++******************************************************************************/ +++ +++/***************************************************************************** +++** +++** File: mod_uptime.c +++** Date: March 22, 2004 +++** +++** Author: Brian Wotring +++** Purpose: platform specific methods for obtaining the system boot time. +++** +++******************************************************************************/ +++ +++#include "libosiris.h" +++#include "libfileapi.h" +++#include "rootpriv.h" +++#include "common.h" +++#include "version.h" +++ +++#include "scanner.h" +++#include "logging.h" +++#include "config.h" +++ +++#ifdef HAVE_SYS_SYSCTL_H +++#include +++#endif +++ +++#ifdef SYSTEM_SUNOS +++#include +++#endif +++ +++#ifdef SYSTEM_LINUX +++#include +++#endif +++ +++#define PROC_FILE "/proc/uptime" +++#define OSI_WTMP_FILE "/var/log/wtmp" +++ +++static const char *MODULE_NAME = "mod_uptime"; +++ +++ +++void mod_uptime( SCANNER *scanner ) +++{ +++ SCAN_RECORD_TEXT_1 record; +++ char *time = NULL; +++ char *temp; +++ +++ initialize_scan_record( (SCAN_RECORD *)&record, +++ SCAN_RECORD_TYPE_TEXT_1 ); +++ +++ osi_strlcpy( record.module_name, MODULE_NAME, +++ sizeof( record.module_name ) ); +++ +++#if defined(SYSTEM_FREEBSD) || defined(SYSTEM_OPENBSD) || defined(SYSTEM_DARWIN) +++ { +++ time_t t; +++ struct timeval result; +++ +++ int request[2] = { CTL_KERN, KERN_BOOTTIME }; +++ size_t result_len = sizeof(result); +++ +++ if( sysctl( request, 2, &result, &result_len, NULL, 0 ) < 0) +++ { +++ log_error( "unable to obtain uptime value." ); +++ return; +++ } +++ +++ t = result.tv_sec; +++ time = ctime( &t ); +++ } +++ +++#elif defined(SYSTEM_SUNOS) +++ { +++ struct utmpx * ent; +++ time_t t; +++ +++ while( ( ent = getutxent() ) ) +++ { +++ if( !strcmp( "system boot", ent->ut_line ) ) +++ { +++ t = ent->ut_tv.tv_sec; +++ time = ctime( &t ); +++ } +++ } +++ } +++ +++#elif defined(SYSTEM_LINUX) +++ { +++ FILE *fp; +++ time_t t; +++ struct utmp ut; +++ +++ char buf[40]; +++ char buf2[10]; +++ int filecount = 0; +++ +++next_file: +++ +++ osi_strlcpy( buf, OSI_WTMP_FILE, sizeof( buf ) ); +++ +++ if( filecount > 0 ) +++ { +++ osi_snprintf( buf2, sizeof(buf2), "%d", filecount ); +++ osi_strlcat( buf, buf2, sizeof(buf) ); +++ } +++ +++ fp = osi_fopen( buf, "r", 0 ); +++ +++ if( fp == NULL ) +++ { +++ log_error( "unable to obtain uptime value." ); +++ return; +++ } +++ +++ while(1) +++ { +++ int rc = fread( &ut, 1, sizeof(ut), fp ); +++ +++ /* end of file, try next. */ +++ +++ if( rc == 0 ) +++ { +++ filecount++; +++ fclose( fp ); +++ +++ goto next_file; +++ } +++ +++ /* found restart event. */ +++ +++ if( ( strcmp( ut.ut_name, "reboot" ) == 0 ) || +++ ( strcmp( ut.ut_name, "shutdown" ) == 0 ) ) +++ { +++ +++ t = ut.ut_time; +++ time = ctime( &t ); +++ +++ break; +++ } +++ } +++ +++ fclose( fp ); +++ } +++#endif +++ +++ if( time == NULL ) +++ { +++ log_error( "unable to obtain uptime value." ); +++ return; +++ } +++ +++ /* remove any trailing newline from the ctime() calls. */ +++ +++ if( ( temp = strchr( time, '\n' ) ) ) +++ { +++ (*temp) = '\0'; +++ } +++ +++ osi_strlcpy( record.name, "uptime", sizeof( record.name ) ); +++ osi_strlcpy( record.data, time, sizeof( record.data ) ); +++ +++ send_scan_data( scanner, (SCAN_RECORD *)&record ); +++} +++ +++ +diff --git a/feeds/packages/admin/osiris/patches/010-dont-add-host-include-paths.patch b/feeds/packages/admin/osiris/patches/010-dont-add-host-include-paths.patch +new file mode 100644 +index 0000000..84e4ab6 +--- /dev/null ++++ b/feeds/packages/admin/osiris/patches/010-dont-add-host-include-paths.patch +@@ -0,0 +1,16 @@ ++diff --git a/configure b/configure ++index f7f5ce9..322a49d 100755 ++--- a/configure +++++ b/configure ++@@ -4448,11 +4448,6 @@ cat >>confdefs.h <<_ACEOF ++ #define SYSTEM_LINUX 1 ++ _ACEOF ++ ++- ++- rc=`grep -c krb5 /usr/include/openssl/ssl.h` ++- if test $rc -ne 0; then ++- CPPFLAGS="-I/usr/kerberos/include/ ${CPPFLAGS}" ++- fi ++ ;; ++ BSD*) ++ +diff --git a/feeds/packages/admin/ostiary/.svn/entries b/feeds/packages/admin/ostiary/.svn/entries +new file mode 100644 +index 0000000..7405a89 +--- /dev/null ++++ b/feeds/packages/admin/ostiary/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/ostiary ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-13T14:08:37.127019Z ++33167 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++56b0f9c628e3c7f487dcb643e793347a ++2012-08-13T14:08:37.127019Z ++33167 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2251 ++ +diff --git a/feeds/packages/admin/ostiary/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/ostiary/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..757c595 +--- /dev/null ++++ b/feeds/packages/admin/ostiary/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,88 @@ ++# ++# 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:=ostiary ++PKG_VERSION:=4.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ingles.homeunix.net/software/ost/latest/ ++PKG_MD5SUM:=420d1fda246097d7e4d1277f39069578 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ostiary ++ SECTION:=admin ++ CATEGORY:=Administration ++ TITLE:=Simple, Secure Remote Script Execution ++ URL:=http://ingles.homeunix.net/software/ost/index.html ++endef ++ ++define Package/ostiary/description ++ Designed to allow you to run a fixed set of commands remotely, ++ without giving everyone else access to the same commands. ++ ++ Provides - ostiaryd daemon (~25kb) ++ - ostclient (~9kb) ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++ ++CONFIGURE_ARGS += \ ++ --prefix="/usr/bin" \ ++ --sysconfdir="/etc/ostiaryd" \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ INSTALL_OPTS="" \ ++ STRIP="" \ ++ ostiaryd ostclient ++endef ++ ++define Package/ostiary/install ++ $(INSTALL_DIR) $(1)/etc/ostiaryd ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/tests/ostiary.cfg $(1)/etc/ostiaryd/ostiary.cfg ++ $(INSTALL_DIR) $(1)/etc/ostiaryd/scripts ++ $(INSTALL_BIN) ./files/{ssh_enable,ssh_disable} $(1)/etc/ostiaryd/scripts ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/ostiaryd.init $(1)/etc/init.d/ostiaryd ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/{ostiaryd,ostclient} $(1)/usr/bin/ ++endef ++ ++ ++ ++ ++define Package/ostiary/postinst ++#!/bin/sh ++# check if we are on real system ++if [ -z "$${IPKG_INSTROOT}" ]; then ++ echo "Enabling rc.d symlink for ostiaryd" ++ /etc/init.d/ostiaryd enable ++fi ++exit 0 ++endef ++ ++define Package/ostiary/prerm ++#!/bin/sh ++# check if we are on real system ++if [ -z "$${IPKG_INSTROOT}" ]; then ++ /etc/init.d/ostiaryd stop ++ echo "Removing rc.d symlink for ostiaryd" ++ /etc/init.d/ostiaryd disable ++ echo "Any config backups and scripts you created are not removed automatically." ++ echo "To finish cleanup, backup any files you want to keep, then run rm -f /etc/ostiaryd" ++fi ++exit 0 ++endef ++ ++ ++$(eval $(call BuildPackage,ostiary)) +diff --git a/feeds/packages/admin/ostiary/Makefile b/feeds/packages/admin/ostiary/Makefile +new file mode 100644 +index 0000000..757c595 +--- /dev/null ++++ b/feeds/packages/admin/ostiary/Makefile +@@ -0,0 +1,88 @@ ++# ++# 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:=ostiary ++PKG_VERSION:=4.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ingles.homeunix.net/software/ost/latest/ ++PKG_MD5SUM:=420d1fda246097d7e4d1277f39069578 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ostiary ++ SECTION:=admin ++ CATEGORY:=Administration ++ TITLE:=Simple, Secure Remote Script Execution ++ URL:=http://ingles.homeunix.net/software/ost/index.html ++endef ++ ++define Package/ostiary/description ++ Designed to allow you to run a fixed set of commands remotely, ++ without giving everyone else access to the same commands. ++ ++ Provides - ostiaryd daemon (~25kb) ++ - ostclient (~9kb) ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++ ++CONFIGURE_ARGS += \ ++ --prefix="/usr/bin" \ ++ --sysconfdir="/etc/ostiaryd" \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ INSTALL_OPTS="" \ ++ STRIP="" \ ++ ostiaryd ostclient ++endef ++ ++define Package/ostiary/install ++ $(INSTALL_DIR) $(1)/etc/ostiaryd ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/tests/ostiary.cfg $(1)/etc/ostiaryd/ostiary.cfg ++ $(INSTALL_DIR) $(1)/etc/ostiaryd/scripts ++ $(INSTALL_BIN) ./files/{ssh_enable,ssh_disable} $(1)/etc/ostiaryd/scripts ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/ostiaryd.init $(1)/etc/init.d/ostiaryd ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/{ostiaryd,ostclient} $(1)/usr/bin/ ++endef ++ ++ ++ ++ ++define Package/ostiary/postinst ++#!/bin/sh ++# check if we are on real system ++if [ -z "$${IPKG_INSTROOT}" ]; then ++ echo "Enabling rc.d symlink for ostiaryd" ++ /etc/init.d/ostiaryd enable ++fi ++exit 0 ++endef ++ ++define Package/ostiary/prerm ++#!/bin/sh ++# check if we are on real system ++if [ -z "$${IPKG_INSTROOT}" ]; then ++ /etc/init.d/ostiaryd stop ++ echo "Removing rc.d symlink for ostiaryd" ++ /etc/init.d/ostiaryd disable ++ echo "Any config backups and scripts you created are not removed automatically." ++ echo "To finish cleanup, backup any files you want to keep, then run rm -f /etc/ostiaryd" ++fi ++exit 0 ++endef ++ ++ ++$(eval $(call BuildPackage,ostiary)) +diff --git a/feeds/packages/admin/ostiary/files/.svn/entries b/feeds/packages/admin/ostiary/files/.svn/entries +new file mode 100644 +index 0000000..1e29fa9 +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/ostiary/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-13T14:08:37.127019Z ++33167 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ostiaryd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++1cc199a890c9752bb01ff6c07f9e43a2 ++2012-08-13T14:08:37.127019Z ++33167 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++501 ++ ++ssh_disable ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++8f74b4c6185b47f55d5c285eb053ac87 ++2012-08-13T14:08:37.127019Z ++33167 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++96 ++ ++ssh_enable ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++c26a73d79576286e924b32a0d1438441 ++2012-08-13T14:08:37.127019Z ++33167 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++94 ++ +diff --git a/feeds/packages/admin/ostiary/files/.svn/text-base/ostiaryd.init.svn-base b/feeds/packages/admin/ostiary/files/.svn/text-base/ostiaryd.init.svn-base +new file mode 100644 +index 0000000..6c4ee09 +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/.svn/text-base/ostiaryd.init.svn-base +@@ -0,0 +1,27 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2012 OpenWrt.org ++ ++START=85 ++MYSERVICE=ostiaryd ++ ++ ++start() { ++ echo starting $MYSERVICE... ++ /usr/bin/$MYSERVICE ++ sleep 1 ++ echo done ++} ++ ++stop() { ++ ++ if ps ax | grep -v grep | grep -v rc.common | grep $MYSERVICE> /dev/null ++ then ++ echo "stopping $MYSERVICE..." ++ pkill -9 $MYSERVICE ++ sleep 1 ++ echo done ++ else ++ echo "$MYSERVICE is not running" ++ fi ++} ++ +diff --git a/feeds/packages/admin/ostiary/files/.svn/text-base/ssh_disable.svn-base b/feeds/packages/admin/ostiary/files/.svn/text-base/ssh_disable.svn-base +new file mode 100644 +index 0000000..1d4304f +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/.svn/text-base/ssh_disable.svn-base +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++logger Ostiary is dis-abling SSH ++iptables -D zone_wan -p tcp --dport 22001 -j ACCEPT +diff --git a/feeds/packages/admin/ostiary/files/.svn/text-base/ssh_enable.svn-base b/feeds/packages/admin/ostiary/files/.svn/text-base/ssh_enable.svn-base +new file mode 100644 +index 0000000..0987cde +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/.svn/text-base/ssh_enable.svn-base +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++logger Ostiary is enabling SSH ++iptables -I zone_wan -p tcp --dport 22001 -j ACCEPT +diff --git a/feeds/packages/admin/ostiary/files/ostiaryd.init b/feeds/packages/admin/ostiary/files/ostiaryd.init +new file mode 100644 +index 0000000..6c4ee09 +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/ostiaryd.init +@@ -0,0 +1,27 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2012 OpenWrt.org ++ ++START=85 ++MYSERVICE=ostiaryd ++ ++ ++start() { ++ echo starting $MYSERVICE... ++ /usr/bin/$MYSERVICE ++ sleep 1 ++ echo done ++} ++ ++stop() { ++ ++ if ps ax | grep -v grep | grep -v rc.common | grep $MYSERVICE> /dev/null ++ then ++ echo "stopping $MYSERVICE..." ++ pkill -9 $MYSERVICE ++ sleep 1 ++ echo done ++ else ++ echo "$MYSERVICE is not running" ++ fi ++} ++ +diff --git a/feeds/packages/admin/ostiary/files/ssh_disable b/feeds/packages/admin/ostiary/files/ssh_disable +new file mode 100644 +index 0000000..1d4304f +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/ssh_disable +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++logger Ostiary is dis-abling SSH ++iptables -D zone_wan -p tcp --dport 22001 -j ACCEPT +diff --git a/feeds/packages/admin/ostiary/files/ssh_enable b/feeds/packages/admin/ostiary/files/ssh_enable +new file mode 100644 +index 0000000..0987cde +--- /dev/null ++++ b/feeds/packages/admin/ostiary/files/ssh_enable +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++logger Ostiary is enabling SSH ++iptables -I zone_wan -p tcp --dport 22001 -j ACCEPT +diff --git a/feeds/packages/admin/pmacct/.svn/entries b/feeds/packages/admin/pmacct/.svn/entries +new file mode 100644 +index 0000000..a59470d +--- /dev/null ++++ b/feeds/packages/admin/pmacct/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/pmacct ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-17T14:41:44.267128Z ++32404 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++713329be2c2af2a02cee155a1058cd82 ++2012-06-17T14:41:44.267128Z ++32404 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4799 ++ +diff --git a/feeds/packages/admin/pmacct/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/pmacct/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/pmacct/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4299a82 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,178 @@ ++# ++# 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:=pmacct ++PKG_VERSION:=0.14.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.pmacct.net/ ++PKG_MD5SUM:=4588531f0e8033fe82ad7fb22d1bbdb7 ++ ++PKG_BUILD_DEPENDS:=libpcap ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_IPV6 \ ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pmacct/Default ++ SECTION:=admin ++ CATEGORY:=Administration ++ SUBMENU:=Pmacct suite ++ URL:=http://www.pmacct.net/ ++ DEPENDS=+libpcap ++endef ++ ++define Package/pmacct-client ++ $(call Package/pmacct/Default) ++ TITLE:=Command-line client to gather data from the IMT plugin ++ VARIANT:=basic ++endef ++ ++define Package/nfacctd/Default ++ $(call Package/pmacct/Default) ++ TITLE:=NetFlow accounting daemon ++endef ++ ++define Package/pmacctd/Default ++ $(call Package/pmacct/Default) ++ TITLE:=IP pcap-based accounting daemon ++endef ++ ++define Package/sfacctd/Default ++ $(call Package/pmacct/Default) ++ TITLE:=sFlow accounting daemon ++endef ++ ++define Package/uacctd/Default ++ $(call Package/pmacct/Default) ++ DEPENDS+= +iptables-mod-ulog ++ TITLE:=ulog accounting daemon ++endef ++ ++ ++CONFIGURE_ARGS+= \ ++ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ ++ --with-pcap-includes="$(STAGING_DIR)/usr/include" \ ++ --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ ++ --enable-ulog \ ++ ++ifeq ($(BUILD_VARIANT),basic) ++ ++ CONFIGURE_ARGS += \ ++ --disable-mysql \ ++ --disable-pgsql \ ++ --disable-sqlite3 \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),mysql) ++ ++ CONFIGURE_ARGS += \ ++ --enable-mysql \ ++ --with-mysql-includes="$(STAGING_DIR)/usr/include" \ ++ --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \ ++ --disable-pgsql \ ++ --disable-sqlite3 \ ++ ++ CONFIGURE_VARS+= \ ++ LIBS="-lz" \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),pgsql) ++ ++ CONFIGURE_ARGS += \ ++ --disable-mysql \ ++ --enable-pgsql \ ++ --with-pgsql-includes="$(STAGING_DIR)/usr/include" \ ++ --with-pgsql-libs="$(STAGING_DIR)/usr/lib" \ ++ --disable-sqlite3 \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),sqlite) ++ ++ CONFIGURE_ARGS += \ ++ --disable-mysql \ ++ --disable-pgsql \ ++ --enable-sqlite3 \ ++ --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ ++ --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \ ++ ++endif ++ ++ ++define Package/pmacct-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/ ++endef ++ ++ ++# $(1): build variant {basic,mysql,pgsql,sqlite} ++# $(2): package name prefix {nfacctd,pmacctd,sfacctd,uacctd} ++# $(3): package name suffix {,-mysql,-pgsql,-sqlite} ++# $(4): additional title (with MySQL support, ...) ++# $(5): additional dependencies (+libmysqlclient, ...) ++ ++define BuildPackage/Template ++ ++ define Package/$(2)$(3) ++ $(call Package/$(2)/Default) ++ DEPENDS+= $(5) ++ TITLE+= $(4) ++ VARIANT:=$(1) ++ endef ++ ++ define Package/$(2)$(3)/conffiles ++/etc/default/$(2) ++/etc/$(2).conf ++ endef ++ ++ define Package/$(2)$(3)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(2) $$(1)/usr/sbin/ ++ $(INSTALL_DIR) $$(1)/etc ++ $(INSTALL_DATA) ./files/$(2).conf $$(1)/etc/ ++ $(INSTALL_DIR) $$(1)/etc/default ++ $(INSTALL_DATA) ./files/$(2).default $$(1)/etc/default/$(2) ++ $(INSTALL_DIR) $$(1)/etc/init.d ++ $(INSTALL_BIN) ./files/$(2).init $$(1)/etc/init.d/$(2) ++ endef ++ ++ $$(eval $$(call BuildPackage,$(2)$(3))) ++ ++endef ++ ++$(eval $(call BuildPackage,pmacct-client)) ++ ++$(eval $(call BuildPackage/Template,basic,nfacctd,,,)) ++$(eval $(call BuildPackage/Template,basic,pmacctd,,,)) ++$(eval $(call BuildPackage/Template,basic,sfacctd,,,)) ++$(eval $(call BuildPackage/Template,basic,uacctd,,,)) ++ ++$(eval $(call BuildPackage/Template,mysql,nfacctd,-mysql,with MySQL support,+libmysqlclient)) ++$(eval $(call BuildPackage/Template,mysql,pmacctd,-mysql,with MySQL support,+libmysqlclient)) ++$(eval $(call BuildPackage/Template,mysql,sfacctd,-mysql,with MySQL support,+libmysqlclient)) ++$(eval $(call BuildPackage/Template,mysql,uacctd,-mysql,with MySQL support,+libmysqlclient)) ++ ++$(eval $(call BuildPackage/Template,pgsql,nfacctd,-pgsql,with PostgreSQL support,+libpq)) ++$(eval $(call BuildPackage/Template,pgsql,pmacctd,-pgsql,with PostgreSQL support,+libpq)) ++$(eval $(call BuildPackage/Template,pgsql,sfacctd,-pgsql,with PostgreSQL support,+libpq)) ++$(eval $(call BuildPackage/Template,pgsql,uacctd,-pgsql,with PostgreSQL support,+libpq)) ++ ++$(eval $(call BuildPackage/Template,sqlite,nfacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) ++$(eval $(call BuildPackage/Template,sqlite,pmacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) ++$(eval $(call BuildPackage/Template,sqlite,sfacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) ++$(eval $(call BuildPackage/Template,sqlite,uacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) +diff --git a/feeds/packages/admin/pmacct/Makefile b/feeds/packages/admin/pmacct/Makefile +new file mode 100644 +index 0000000..4299a82 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/Makefile +@@ -0,0 +1,178 @@ ++# ++# 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:=pmacct ++PKG_VERSION:=0.14.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.pmacct.net/ ++PKG_MD5SUM:=4588531f0e8033fe82ad7fb22d1bbdb7 ++ ++PKG_BUILD_DEPENDS:=libpcap ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_IPV6 \ ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pmacct/Default ++ SECTION:=admin ++ CATEGORY:=Administration ++ SUBMENU:=Pmacct suite ++ URL:=http://www.pmacct.net/ ++ DEPENDS=+libpcap ++endef ++ ++define Package/pmacct-client ++ $(call Package/pmacct/Default) ++ TITLE:=Command-line client to gather data from the IMT plugin ++ VARIANT:=basic ++endef ++ ++define Package/nfacctd/Default ++ $(call Package/pmacct/Default) ++ TITLE:=NetFlow accounting daemon ++endef ++ ++define Package/pmacctd/Default ++ $(call Package/pmacct/Default) ++ TITLE:=IP pcap-based accounting daemon ++endef ++ ++define Package/sfacctd/Default ++ $(call Package/pmacct/Default) ++ TITLE:=sFlow accounting daemon ++endef ++ ++define Package/uacctd/Default ++ $(call Package/pmacct/Default) ++ DEPENDS+= +iptables-mod-ulog ++ TITLE:=ulog accounting daemon ++endef ++ ++ ++CONFIGURE_ARGS+= \ ++ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ ++ --with-pcap-includes="$(STAGING_DIR)/usr/include" \ ++ --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ ++ --enable-ulog \ ++ ++ifeq ($(BUILD_VARIANT),basic) ++ ++ CONFIGURE_ARGS += \ ++ --disable-mysql \ ++ --disable-pgsql \ ++ --disable-sqlite3 \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),mysql) ++ ++ CONFIGURE_ARGS += \ ++ --enable-mysql \ ++ --with-mysql-includes="$(STAGING_DIR)/usr/include" \ ++ --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \ ++ --disable-pgsql \ ++ --disable-sqlite3 \ ++ ++ CONFIGURE_VARS+= \ ++ LIBS="-lz" \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),pgsql) ++ ++ CONFIGURE_ARGS += \ ++ --disable-mysql \ ++ --enable-pgsql \ ++ --with-pgsql-includes="$(STAGING_DIR)/usr/include" \ ++ --with-pgsql-libs="$(STAGING_DIR)/usr/lib" \ ++ --disable-sqlite3 \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),sqlite) ++ ++ CONFIGURE_ARGS += \ ++ --disable-mysql \ ++ --disable-pgsql \ ++ --enable-sqlite3 \ ++ --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ ++ --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \ ++ ++endif ++ ++ ++define Package/pmacct-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/ ++endef ++ ++ ++# $(1): build variant {basic,mysql,pgsql,sqlite} ++# $(2): package name prefix {nfacctd,pmacctd,sfacctd,uacctd} ++# $(3): package name suffix {,-mysql,-pgsql,-sqlite} ++# $(4): additional title (with MySQL support, ...) ++# $(5): additional dependencies (+libmysqlclient, ...) ++ ++define BuildPackage/Template ++ ++ define Package/$(2)$(3) ++ $(call Package/$(2)/Default) ++ DEPENDS+= $(5) ++ TITLE+= $(4) ++ VARIANT:=$(1) ++ endef ++ ++ define Package/$(2)$(3)/conffiles ++/etc/default/$(2) ++/etc/$(2).conf ++ endef ++ ++ define Package/$(2)$(3)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(2) $$(1)/usr/sbin/ ++ $(INSTALL_DIR) $$(1)/etc ++ $(INSTALL_DATA) ./files/$(2).conf $$(1)/etc/ ++ $(INSTALL_DIR) $$(1)/etc/default ++ $(INSTALL_DATA) ./files/$(2).default $$(1)/etc/default/$(2) ++ $(INSTALL_DIR) $$(1)/etc/init.d ++ $(INSTALL_BIN) ./files/$(2).init $$(1)/etc/init.d/$(2) ++ endef ++ ++ $$(eval $$(call BuildPackage,$(2)$(3))) ++ ++endef ++ ++$(eval $(call BuildPackage,pmacct-client)) ++ ++$(eval $(call BuildPackage/Template,basic,nfacctd,,,)) ++$(eval $(call BuildPackage/Template,basic,pmacctd,,,)) ++$(eval $(call BuildPackage/Template,basic,sfacctd,,,)) ++$(eval $(call BuildPackage/Template,basic,uacctd,,,)) ++ ++$(eval $(call BuildPackage/Template,mysql,nfacctd,-mysql,with MySQL support,+libmysqlclient)) ++$(eval $(call BuildPackage/Template,mysql,pmacctd,-mysql,with MySQL support,+libmysqlclient)) ++$(eval $(call BuildPackage/Template,mysql,sfacctd,-mysql,with MySQL support,+libmysqlclient)) ++$(eval $(call BuildPackage/Template,mysql,uacctd,-mysql,with MySQL support,+libmysqlclient)) ++ ++$(eval $(call BuildPackage/Template,pgsql,nfacctd,-pgsql,with PostgreSQL support,+libpq)) ++$(eval $(call BuildPackage/Template,pgsql,pmacctd,-pgsql,with PostgreSQL support,+libpq)) ++$(eval $(call BuildPackage/Template,pgsql,sfacctd,-pgsql,with PostgreSQL support,+libpq)) ++$(eval $(call BuildPackage/Template,pgsql,uacctd,-pgsql,with PostgreSQL support,+libpq)) ++ ++$(eval $(call BuildPackage/Template,sqlite,nfacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) ++$(eval $(call BuildPackage/Template,sqlite,pmacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) ++$(eval $(call BuildPackage/Template,sqlite,sfacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) ++$(eval $(call BuildPackage/Template,sqlite,uacctd,-sqlite,with SQLite support,+libsqlite3 +zlib)) +diff --git a/feeds/packages/admin/pmacct/files/.svn/entries b/feeds/packages/admin/pmacct/files/.svn/entries +new file mode 100644 +index 0000000..f86ba15 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/entries +@@ -0,0 +1,436 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/pmacct/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T19:49:01.475601Z ++28890 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pmacctd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++e2ae2261ec213404b4c13129d63b995b ++2011-03-12T08:50:00.994756Z ++26105 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++564 ++ ++nfacctd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++280956b36d3568a4e3ba0ec849ec2d5c ++2011-11-09T19:49:01.475601Z ++28890 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ ++nfacctd.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++24576b1e73f0a1c5d1c760344c310e7d ++2011-03-12T08:50:00.994756Z ++26105 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++31 ++ ++uacctd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4af875a68d787b8170b8d021c14c0638 ++2011-11-09T19:49:01.475601Z ++28890 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++274 ++ ++nfacctd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d8fbbb8c608d91ba3856a8a0b39fd523 ++2011-03-12T08:50:00.994756Z ++26105 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++654 ++ ++uacctd.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++51fb59946503f32ade877c48cea526cf ++2011-03-30T20:10:42.353707Z ++26379 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++30 ++ ++uacctd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2f6833bb5037ecc158f740a3749cbcf6 ++2011-03-30T20:10:42.353707Z ++26379 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++548 ++ ++sfacctd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++c4eddab835300abc38bfb3de5665ba83 ++2011-11-09T19:49:01.475601Z ++28890 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ ++sfacctd.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++1c96809a413f2579f2e700f7138d5ae0 ++2011-10-17T11:04:31.003047Z ++28468 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++31 ++ ++sfacctd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++353a1d677bf5e771429f4e8c8845899b ++2011-10-17T11:04:31.003047Z ++28468 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++603 ++ ++pmacctd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0cf04fa19862927debe8814a04758c09 ++2011-11-09T19:49:01.475601Z ++28890 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ ++pmacctd.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f5d18aa3a16d0bccc3ddcb3b3c92c690 ++2011-03-12T08:50:00.994756Z ++26105 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++31 ++ +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.default.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.default.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/nfacctd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.default.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.default.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/pmacctd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.default.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.default.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/prop-base/sfacctd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.conf.svn-base +new file mode 100644 +index 0000000..27b8956 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.conf.svn-base +@@ -0,0 +1,29 @@ ++! ++! nfacctd configuration example ++! ++! debug: true ++daemonize: true ++pidfile: /var/run/nfacctd.pid ++! aggregate_filter[dummy]: src net 192.168.0.0/16 ++aggregate: src_host, dst_host ++! plugin_buffer_size: 1024 ++! nfacctd_port: 5678 ++! nfacctd_time_secs: true ++! nfacctd_time_new: true ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: pmacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: pmacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.default.svn-base +new file mode 100644 +index 0000000..9315b28 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.default.svn-base +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/nfacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.init.svn-base +new file mode 100644 +index 0000000..66b9021 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/nfacctd.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="nfacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.conf.svn-base +new file mode 100644 +index 0000000..e7e4892 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.conf.svn-base +@@ -0,0 +1,27 @@ ++! ++! pmacctd configuration example ++! ++! debug: true ++interface: vlan1 ++daemonize: true ++pidfile: /var/run/pmacctd.pid ++pmacctd_id: 1 ++aggregate: src_host,dst_host ++! aggregate: src_net,dst_net ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: pmacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: pmacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.default.svn-base +new file mode 100644 +index 0000000..3c06f08 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.default.svn-base +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/pmacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.init.svn-base +new file mode 100644 +index 0000000..3d75bcf +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/pmacctd.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="pmacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.conf.svn-base +new file mode 100644 +index 0000000..3d25e54 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.conf.svn-base +@@ -0,0 +1,27 @@ ++! ++! sfacctd configuration example ++! ++! debug: true ++daemonize: true ++pidfile: /var/run/sfacctd.pid ++! aggregate_filter[dummy]: src net 192.168.0.0/16 ++aggregate: src_host, dst_host ++! plugin_buffer_size: 1024 ++! sfacctd_port: 5678 ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: pmacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: pmacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.default.svn-base +new file mode 100644 +index 0000000..abd0c34 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.default.svn-base +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/sfacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.init.svn-base +new file mode 100644 +index 0000000..16468d4 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/sfacctd.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="sfacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.conf.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.conf.svn-base +new file mode 100644 +index 0000000..c8cdd7d +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.conf.svn-base +@@ -0,0 +1,28 @@ ++! ++! uacctd configuration example ++! ++! debug: true ++ ++uacctd_group : 1 ++ ++daemonize: true ++pidfile: /var/run/uacctd.pid ++aggregate: src_host,dst_host ++! aggregate: src_net,dst_net ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: uacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: uacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.default.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.default.svn-base +new file mode 100644 +index 0000000..7b2834e +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.default.svn-base +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/uacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.init.svn-base b/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.init.svn-base +new file mode 100644 +index 0000000..39b27ba +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/.svn/text-base/uacctd.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="uacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/nfacctd.conf b/feeds/packages/admin/pmacct/files/nfacctd.conf +new file mode 100644 +index 0000000..27b8956 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/nfacctd.conf +@@ -0,0 +1,29 @@ ++! ++! nfacctd configuration example ++! ++! debug: true ++daemonize: true ++pidfile: /var/run/nfacctd.pid ++! aggregate_filter[dummy]: src net 192.168.0.0/16 ++aggregate: src_host, dst_host ++! plugin_buffer_size: 1024 ++! nfacctd_port: 5678 ++! nfacctd_time_secs: true ++! nfacctd_time_new: true ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: pmacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: pmacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/nfacctd.default b/feeds/packages/admin/pmacct/files/nfacctd.default +new file mode 100644 +index 0000000..9315b28 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/nfacctd.default +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/nfacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/nfacctd.init b/feeds/packages/admin/pmacct/files/nfacctd.init +new file mode 100644 +index 0000000..66b9021 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/nfacctd.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="nfacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/pmacctd.conf b/feeds/packages/admin/pmacct/files/pmacctd.conf +new file mode 100644 +index 0000000..e7e4892 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/pmacctd.conf +@@ -0,0 +1,27 @@ ++! ++! pmacctd configuration example ++! ++! debug: true ++interface: vlan1 ++daemonize: true ++pidfile: /var/run/pmacctd.pid ++pmacctd_id: 1 ++aggregate: src_host,dst_host ++! aggregate: src_net,dst_net ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: pmacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: pmacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/pmacctd.default b/feeds/packages/admin/pmacct/files/pmacctd.default +new file mode 100644 +index 0000000..3c06f08 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/pmacctd.default +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/pmacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/pmacctd.init b/feeds/packages/admin/pmacct/files/pmacctd.init +new file mode 100644 +index 0000000..3d75bcf +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/pmacctd.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="pmacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/sfacctd.conf b/feeds/packages/admin/pmacct/files/sfacctd.conf +new file mode 100644 +index 0000000..3d25e54 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/sfacctd.conf +@@ -0,0 +1,27 @@ ++! ++! sfacctd configuration example ++! ++! debug: true ++daemonize: true ++pidfile: /var/run/sfacctd.pid ++! aggregate_filter[dummy]: src net 192.168.0.0/16 ++aggregate: src_host, dst_host ++! plugin_buffer_size: 1024 ++! sfacctd_port: 5678 ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: pmacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: pmacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/sfacctd.default b/feeds/packages/admin/pmacct/files/sfacctd.default +new file mode 100644 +index 0000000..abd0c34 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/sfacctd.default +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/sfacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/sfacctd.init b/feeds/packages/admin/pmacct/files/sfacctd.init +new file mode 100644 +index 0000000..16468d4 +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/sfacctd.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="sfacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/pmacct/files/uacctd.conf b/feeds/packages/admin/pmacct/files/uacctd.conf +new file mode 100644 +index 0000000..c8cdd7d +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/uacctd.conf +@@ -0,0 +1,28 @@ ++! ++! uacctd configuration example ++! ++! debug: true ++ ++uacctd_group : 1 ++ ++daemonize: true ++pidfile: /var/run/uacctd.pid ++aggregate: src_host,dst_host ++! aggregate: src_net,dst_net ++plugins: memory ++imt_buckets: 65537 ++imt_mem_pools_size: 65536 ++! imt_mem_pools_number: 0 ++! plugins: mysql ++! plugins: pgsql ++! plugins: sqlite3 ++! sql_db: uacct ++! sql_table: acct ++! sql_table_version: 2 ++! sql_passwd: arealsmartpwd ++! sql_user: uacct ++! sql_refresh_time: 90 ++! sql_optimize_clauses: true ++! sql_history: 10m ++! sql_history_roundoff: mh ++! networks_file: ./networks.example +diff --git a/feeds/packages/admin/pmacct/files/uacctd.default b/feeds/packages/admin/pmacct/files/uacctd.default +new file mode 100644 +index 0000000..7b2834e +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/uacctd.default +@@ -0,0 +1 @@ ++OPTIONS="-f /etc/uacctd.conf" +diff --git a/feeds/packages/admin/pmacct/files/uacctd.init b/feeds/packages/admin/pmacct/files/uacctd.init +new file mode 100644 +index 0000000..39b27ba +--- /dev/null ++++ b/feeds/packages/admin/pmacct/files/uacctd.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++PROG="uacctd" ++DEFAULT="/etc/default/$PROG" ++COMMAND="/usr/sbin/$PROG" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ service_start $COMMAND $OPTIONS ++} ++ ++stop() { ++ service_stop $COMMAND ++} +diff --git a/feeds/packages/admin/sudo/.svn/entries b/feeds/packages/admin/sudo/.svn/entries +new file mode 100644 +index 0000000..20107ba +--- /dev/null ++++ b/feeds/packages/admin/sudo/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/sudo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-15T01:41:45.870788Z ++29143 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++c0c245b4ff28cc6c44fed67529b24295 ++2011-11-15T01:41:45.870788Z ++29143 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1815 ++ +diff --git a/feeds/packages/admin/sudo/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/sudo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9e9aa1a +--- /dev/null ++++ b/feeds/packages/admin/sudo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,76 @@ ++# ++# 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:=sudo ++PKG_VERSION:=1.7.8p1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist ++PKG_MD5SUM:=5552b9aabc43e34bbc8dc557c098a933 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sudo ++ SECTION:=admin ++ CATEGORY:=Administration ++ TITLE:=Delegate authority to run commands ++ URL:=http://www.sudo.ws/ ++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 ++ ++CONFIGURE_VARS+= \ ++ sudo_cv_uid_t_len=10 \ ++ sudo_cv_func_unsetenv_void=no ++ ++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 ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo_noexec.so $(1)/usr/lib/ ++ $(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/feeds/packages/admin/sudo/Makefile b/feeds/packages/admin/sudo/Makefile +new file mode 100644 +index 0000000..9e9aa1a +--- /dev/null ++++ b/feeds/packages/admin/sudo/Makefile +@@ -0,0 +1,76 @@ ++# ++# 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:=sudo ++PKG_VERSION:=1.7.8p1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist ++PKG_MD5SUM:=5552b9aabc43e34bbc8dc557c098a933 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sudo ++ SECTION:=admin ++ CATEGORY:=Administration ++ TITLE:=Delegate authority to run commands ++ URL:=http://www.sudo.ws/ ++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 ++ ++CONFIGURE_VARS+= \ ++ sudo_cv_uid_t_len=10 \ ++ sudo_cv_func_unsetenv_void=no ++ ++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 ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo_noexec.so $(1)/usr/lib/ ++ $(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/feeds/packages/admin/sudo/files/.svn/entries b/feeds/packages/admin/sudo/files/.svn/entries +new file mode 100644 +index 0000000..3c8cdcb +--- /dev/null ++++ b/feeds/packages/admin/sudo/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/sudo/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-15T01:41:45.870788Z ++29143 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++sudo.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++116d184bb68bf0bbbb5491e80b1f90d3 ++2011-11-15T01:41:45.870788Z ++29143 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++171 ++ +diff --git a/feeds/packages/admin/sudo/files/.svn/prop-base/sudo.init.svn-base b/feeds/packages/admin/sudo/files/.svn/prop-base/sudo.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/admin/sudo/files/.svn/prop-base/sudo.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/admin/sudo/files/.svn/text-base/sudo.init.svn-base b/feeds/packages/admin/sudo/files/.svn/text-base/sudo.init.svn-base +new file mode 100644 +index 0000000..9df2737 +--- /dev/null ++++ b/feeds/packages/admin/sudo/files/.svn/text-base/sudo.init.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 OpenWrt.org ++ ++START=99 ++ ++start() { ++ [ -d /var/lib/sudo ] || { ++ mkdir -m 0755 -p /var/lib/sudo ++ chmod 0700 /var/lib/sudo ++ } ++} +diff --git a/feeds/packages/admin/sudo/files/sudo.init b/feeds/packages/admin/sudo/files/sudo.init +new file mode 100755 +index 0000000..9df2737 +--- /dev/null ++++ b/feeds/packages/admin/sudo/files/sudo.init +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 OpenWrt.org ++ ++START=99 ++ ++start() { ++ [ -d /var/lib/sudo ] || { ++ mkdir -m 0755 -p /var/lib/sudo ++ chmod 0700 /var/lib/sudo ++ } ++} +diff --git a/feeds/packages/admin/syslog-ng/.svn/entries b/feeds/packages/admin/syslog-ng/.svn/entries +new file mode 100644 +index 0000000..4e7205b +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/syslog-ng ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-07T22:11:18.811927Z ++30367 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++678fa3880fb753d5afb49edab7e4219c ++2012-02-07T22:11:18.811927Z ++30367 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1694 ++ +diff --git a/feeds/packages/admin/syslog-ng/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/syslog-ng/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/syslog-ng/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4e5898e +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=syslog-ng ++PKG_VERSION:=1.6.12 ++PKG_RELEASE:=6 ++PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3 ++ ++PKG_SOURCE_URL:= \ ++ http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src \ ++ http://www.balabit.com/downloads/files/syslog-ng/stable/src ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/syslog-ng ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libol +librt ++ TITLE:=A powerful syslog daemon ++ URL:=http://www.balabit.com/products/syslog_ng/ ++endef ++ ++define Package/syslog-ng/description ++ syslog-ng reads and logs messages to the system console, log ++ files, other machines and/or users as specified by its ++ configuration file. ++endef ++ ++define Package/syslog-ng/conffiles ++/etc/syslog-ng/syslog-ng.conf ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-dependency-tracking \ ++ --disable-full-static \ ++ --enable-tcp-wrapper \ ++ --with-libol="$(STAGING_DIR)/host/bin" \ ++ , \ ++ CPPFLAGS="-I$(STAGING_DIR)/usr/include/libol $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib/libol $(TARGET_LDFLAGS)" \ ++ ) ++endef ++ ++define Package/syslog-ng/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng ++ $(INSTALL_DIR) $(1)/etc/syslog-ng ++ $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc/syslog-ng/ ++endef ++ ++$(eval $(call BuildPackage,syslog-ng)) +diff --git a/feeds/packages/admin/syslog-ng/Makefile b/feeds/packages/admin/syslog-ng/Makefile +new file mode 100644 +index 0000000..4e5898e +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=syslog-ng ++PKG_VERSION:=1.6.12 ++PKG_RELEASE:=6 ++PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3 ++ ++PKG_SOURCE_URL:= \ ++ http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src \ ++ http://www.balabit.com/downloads/files/syslog-ng/stable/src ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/syslog-ng ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libol +librt ++ TITLE:=A powerful syslog daemon ++ URL:=http://www.balabit.com/products/syslog_ng/ ++endef ++ ++define Package/syslog-ng/description ++ syslog-ng reads and logs messages to the system console, log ++ files, other machines and/or users as specified by its ++ configuration file. ++endef ++ ++define Package/syslog-ng/conffiles ++/etc/syslog-ng/syslog-ng.conf ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-dependency-tracking \ ++ --disable-full-static \ ++ --enable-tcp-wrapper \ ++ --with-libol="$(STAGING_DIR)/host/bin" \ ++ , \ ++ CPPFLAGS="-I$(STAGING_DIR)/usr/include/libol $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib/libol $(TARGET_LDFLAGS)" \ ++ ) ++endef ++ ++define Package/syslog-ng/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng ++ $(INSTALL_DIR) $(1)/etc/syslog-ng ++ $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc/syslog-ng/ ++endef ++ ++$(eval $(call BuildPackage,syslog-ng)) +diff --git a/feeds/packages/admin/syslog-ng/files/.svn/entries b/feeds/packages/admin/syslog-ng/files/.svn/entries +new file mode 100644 +index 0000000..03e7371 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/syslog-ng/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-07T22:11:18.811927Z ++30367 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++syslog-ng.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++cba1f2021a2b52695e61b151f9e8cba4 ++2012-02-07T22:11:18.811927Z ++30367 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++267 ++ ++syslog-ng.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++8342acd7b54226be3cd0db96aa15ef6d ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++460 ++ +diff --git a/feeds/packages/admin/syslog-ng/files/.svn/prop-base/syslog-ng.conf.svn-base b/feeds/packages/admin/syslog-ng/files/.svn/prop-base/syslog-ng.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/.svn/prop-base/syslog-ng.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng/files/.svn/prop-base/syslog-ng.init.svn-base b/feeds/packages/admin/syslog-ng/files/.svn/prop-base/syslog-ng.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/.svn/prop-base/syslog-ng.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng/files/.svn/text-base/syslog-ng.conf.svn-base b/feeds/packages/admin/syslog-ng/files/.svn/text-base/syslog-ng.conf.svn-base +new file mode 100644 +index 0000000..658abea +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/.svn/text-base/syslog-ng.conf.svn-base +@@ -0,0 +1,16 @@ ++options { ++ chain_hostnames(off); ++ sync(0); ++ ++ # The default action of syslog-ng 1.6.0 is to log a STATS line ++ # to the file every 10 minutes. That's pretty ugly after a while. ++ # Change it to every 12 hours so you get a nice daily update of ++ # how many messages syslog-ng missed (0). ++ stats(43200); ++}; ++ ++source src { unix-stream("/dev/log"); internal(); }; ++ ++destination messages { file("/var/log/messages"); }; ++ ++log { source(src); destination(messages); }; +diff --git a/feeds/packages/admin/syslog-ng/files/.svn/text-base/syslog-ng.init.svn-base b/feeds/packages/admin/syslog-ng/files/.svn/text-base/syslog-ng.init.svn-base +new file mode 100644 +index 0000000..07b8a05 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/.svn/text-base/syslog-ng.init.svn-base +@@ -0,0 +1,17 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ [ -f /etc/syslog-ng/syslog-ng.conf ] || return 1 ++ service_start /usr/sbin/syslog-ng ++} ++ ++stop() { ++ service_stop /usr/sbin/syslog-ng ++} ++ ++reload() { ++ service_reload /usr/sbin/syslog-ng ++} +diff --git a/feeds/packages/admin/syslog-ng/files/syslog-ng.conf b/feeds/packages/admin/syslog-ng/files/syslog-ng.conf +new file mode 100644 +index 0000000..658abea +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/syslog-ng.conf +@@ -0,0 +1,16 @@ ++options { ++ chain_hostnames(off); ++ sync(0); ++ ++ # The default action of syslog-ng 1.6.0 is to log a STATS line ++ # to the file every 10 minutes. That's pretty ugly after a while. ++ # Change it to every 12 hours so you get a nice daily update of ++ # how many messages syslog-ng missed (0). ++ stats(43200); ++}; ++ ++source src { unix-stream("/dev/log"); internal(); }; ++ ++destination messages { file("/var/log/messages"); }; ++ ++log { source(src); destination(messages); }; +diff --git a/feeds/packages/admin/syslog-ng/files/syslog-ng.init b/feeds/packages/admin/syslog-ng/files/syslog-ng.init +new file mode 100644 +index 0000000..07b8a05 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/files/syslog-ng.init +@@ -0,0 +1,17 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ [ -f /etc/syslog-ng/syslog-ng.conf ] || return 1 ++ service_start /usr/sbin/syslog-ng ++} ++ ++stop() { ++ service_stop /usr/sbin/syslog-ng ++} ++ ++reload() { ++ service_reload /usr/sbin/syslog-ng ++} +diff --git a/feeds/packages/admin/syslog-ng/patches/.svn/entries b/feeds/packages/admin/syslog-ng/patches/.svn/entries +new file mode 100644 +index 0000000..1705b2a +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/syslog-ng/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_lfl.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++eaed340b4ac9e2f7146b0b8f460afee3 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1216 ++ +diff --git a/feeds/packages/admin/syslog-ng/patches/.svn/prop-base/001-no_lfl.patch.svn-base b/feeds/packages/admin/syslog-ng/patches/.svn/prop-base/001-no_lfl.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/patches/.svn/prop-base/001-no_lfl.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng/patches/.svn/text-base/001-no_lfl.patch.svn-base b/feeds/packages/admin/syslog-ng/patches/.svn/text-base/001-no_lfl.patch.svn-base +new file mode 100644 +index 0000000..ce33d95 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/patches/.svn/text-base/001-no_lfl.patch.svn-base +@@ -0,0 +1,38 @@ ++diff -ubr /tmp/syslog-ng-1.6.12/configure syslog-ng-1.6.12/configure ++--- /tmp/syslog-ng-1.6.12/configure 2007-02-02 02:58:41.000000000 -0600 +++++ syslog-ng-1.6.12/configure 2007-03-03 20:39:40.000000000 -0600 ++@@ -3695,7 +3695,7 @@ ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ ac_check_lib_save_LIBS=$LIBS ++-LIBS="-lfl $LIBS" +++LIBS="$LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++diff -ubr /tmp/syslog-ng-1.6.12/Makefile.in syslog-ng-1.6.12/Makefile.in ++--- /tmp/syslog-ng-1.6.12/Makefile.in 2007-02-02 02:58:41.000000000 -0600 +++++ syslog-ng-1.6.12/Makefile.in 2007-03-03 20:38:56.000000000 -0600 ++@@ -65,7 +65,7 @@ ++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++ LDFLAGS = @LDFLAGS@ ++ LEX = @LEX@ ++-LEXLIB = @LEXLIB@ +++LEXLIB = ++ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ++ LIBOBJS = @LIBOBJS@ ++ LIBOL_DIR = @LIBOL_DIR@ ++diff -ubr /tmp/syslog-ng-1.6.12/src/cfg-lex.c syslog-ng-1.6.12/src/cfg-lex.c ++--- /tmp/syslog-ng-1.6.12/src/cfg-lex.c 2006-08-22 03:43:36.000000000 -0500 +++++ syslog-ng-1.6.12/src/cfg-lex.c 2007-03-03 20:36:52.000000000 -0600 ++@@ -668,7 +668,9 @@ ++ #ifdef __cplusplus ++ extern "C" int yywrap (void ); ++ #else ++-extern int yywrap (void ); +++int yywrap (void ) { +++ return 1; +++} ++ #endif ++ #endif ++ +diff --git a/feeds/packages/admin/syslog-ng/patches/001-no_lfl.patch b/feeds/packages/admin/syslog-ng/patches/001-no_lfl.patch +new file mode 100644 +index 0000000..ce33d95 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng/patches/001-no_lfl.patch +@@ -0,0 +1,38 @@ ++diff -ubr /tmp/syslog-ng-1.6.12/configure syslog-ng-1.6.12/configure ++--- /tmp/syslog-ng-1.6.12/configure 2007-02-02 02:58:41.000000000 -0600 +++++ syslog-ng-1.6.12/configure 2007-03-03 20:39:40.000000000 -0600 ++@@ -3695,7 +3695,7 @@ ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ ac_check_lib_save_LIBS=$LIBS ++-LIBS="-lfl $LIBS" +++LIBS="$LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++ _ACEOF ++diff -ubr /tmp/syslog-ng-1.6.12/Makefile.in syslog-ng-1.6.12/Makefile.in ++--- /tmp/syslog-ng-1.6.12/Makefile.in 2007-02-02 02:58:41.000000000 -0600 +++++ syslog-ng-1.6.12/Makefile.in 2007-03-03 20:38:56.000000000 -0600 ++@@ -65,7 +65,7 @@ ++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++ LDFLAGS = @LDFLAGS@ ++ LEX = @LEX@ ++-LEXLIB = @LEXLIB@ +++LEXLIB = ++ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ++ LIBOBJS = @LIBOBJS@ ++ LIBOL_DIR = @LIBOL_DIR@ ++diff -ubr /tmp/syslog-ng-1.6.12/src/cfg-lex.c syslog-ng-1.6.12/src/cfg-lex.c ++--- /tmp/syslog-ng-1.6.12/src/cfg-lex.c 2006-08-22 03:43:36.000000000 -0500 +++++ syslog-ng-1.6.12/src/cfg-lex.c 2007-03-03 20:36:52.000000000 -0600 ++@@ -668,7 +668,9 @@ ++ #ifdef __cplusplus ++ extern "C" int yywrap (void ); ++ #else ++-extern int yywrap (void ); +++int yywrap (void ) { +++ return 1; +++} ++ #endif ++ #endif ++ +diff --git a/feeds/packages/admin/syslog-ng3/.svn/dir-prop-base b/feeds/packages/admin/syslog-ng3/.svn/dir-prop-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/admin/syslog-ng3/.svn/entries b/feeds/packages/admin/syslog-ng3/.svn/entries +new file mode 100644 +index 0000000..7ed3832 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/syslog-ng3 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:21:59.955023Z ++32300 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0b531ded1171e497f1105e470a148d1e ++2012-06-13T00:21:59.955023Z ++32300 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1896 ++ +diff --git a/feeds/packages/admin/syslog-ng3/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/syslog-ng3/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng3/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/syslog-ng3/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a3dbe25 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,72 @@ ++# ++# 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:=syslog-ng ++PKG_VERSION:=3.0.5 ++PKG_RELEASE:=5 ++ ++PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=28f0d9ff2243b330e8cd6311ef9b2f12 ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_IPV6 \ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/syslog-ng3 ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +librt +zlib +libdbi ++ TITLE:=A powerful syslog daemon ++ URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ ++endef ++ ++define Package/syslog-ng3/description ++ syslog-ng reads and logs messages to the system console, log ++ files, other machines and/or users as specified by its ++ configuration file. ++endef ++ ++define Package/syslog-ng3/conffiles ++/etc/syslog-ng.conf ++endef ++ ++define Build/Configure ++ $(SED) 's,-I/usr/include,,' $(PKG_BUILD_DIR)/configure ++ $(Build/Configure/Default) ++endef ++ ++CONFIGURE_ARGS += \ ++ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ ++ --disable-dependency-tracking \ ++ --enable-tcp-wrapper \ ++ --disable-glibtest \ ++ --disable-spoof-source \ ++ --disable-sql \ ++ --enable-prce \ ++ --disable-linux-caps \ ++ ++TARGET_CPPFLAGS += \ ++ -I$(STAGING_DIR)/usr/include/eventlog ++ ++CONFIGURE_VARS += \ ++ LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include" ++ ++define Package/syslog-ng3/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc ++endef ++ ++$(eval $(call BuildPackage,syslog-ng3)) +diff --git a/feeds/packages/admin/syslog-ng3/Makefile b/feeds/packages/admin/syslog-ng3/Makefile +new file mode 100644 +index 0000000..a3dbe25 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/Makefile +@@ -0,0 +1,72 @@ ++# ++# 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:=syslog-ng ++PKG_VERSION:=3.0.5 ++PKG_RELEASE:=5 ++ ++PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=28f0d9ff2243b330e8cd6311ef9b2f12 ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_IPV6 \ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/syslog-ng3 ++ SECTION:=admin ++ CATEGORY:=Administration ++ DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +librt +zlib +libdbi ++ TITLE:=A powerful syslog daemon ++ URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ ++endef ++ ++define Package/syslog-ng3/description ++ syslog-ng reads and logs messages to the system console, log ++ files, other machines and/or users as specified by its ++ configuration file. ++endef ++ ++define Package/syslog-ng3/conffiles ++/etc/syslog-ng.conf ++endef ++ ++define Build/Configure ++ $(SED) 's,-I/usr/include,,' $(PKG_BUILD_DIR)/configure ++ $(Build/Configure/Default) ++endef ++ ++CONFIGURE_ARGS += \ ++ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ ++ --disable-dependency-tracking \ ++ --enable-tcp-wrapper \ ++ --disable-glibtest \ ++ --disable-spoof-source \ ++ --disable-sql \ ++ --enable-prce \ ++ --disable-linux-caps \ ++ ++TARGET_CPPFLAGS += \ ++ -I$(STAGING_DIR)/usr/include/eventlog ++ ++CONFIGURE_VARS += \ ++ LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include" ++ ++define Package/syslog-ng3/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc ++endef ++ ++$(eval $(call BuildPackage,syslog-ng3)) +diff --git a/feeds/packages/admin/syslog-ng3/files/.svn/entries b/feeds/packages/admin/syslog-ng3/files/.svn/entries +new file mode 100644 +index 0000000..f878000 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/syslog-ng3/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T19:49:03.878427Z ++28891 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++syslog-ng.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++315117b15a845bdad71715f99279bbcd ++2011-11-09T19:49:03.878427Z ++28891 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++276 ++ ++syslog-ng.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4038046bbb7ec70bc57f888eeb7af946 ++2010-03-20T10:29:33.201981Z ++20314 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++514 ++ +diff --git a/feeds/packages/admin/syslog-ng3/files/.svn/prop-base/syslog-ng.conf.svn-base b/feeds/packages/admin/syslog-ng3/files/.svn/prop-base/syslog-ng.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/.svn/prop-base/syslog-ng.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng3/files/.svn/prop-base/syslog-ng.init.svn-base b/feeds/packages/admin/syslog-ng3/files/.svn/prop-base/syslog-ng.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/.svn/prop-base/syslog-ng.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/syslog-ng3/files/.svn/text-base/syslog-ng.conf.svn-base b/feeds/packages/admin/syslog-ng3/files/.svn/text-base/syslog-ng.conf.svn-base +new file mode 100644 +index 0000000..972848c +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/.svn/text-base/syslog-ng.conf.svn-base +@@ -0,0 +1,37 @@ ++@version:3.0 ++ ++options { ++ chain_hostnames(no); ++ create_dirs(yes); ++ flush_lines(0); ++ keep_hostname(yes); ++ log_fifo_size(256); ++ log_msg_size(1024); ++ stats_freq(0); ++ flush_lines(0); ++ use_fqdn(no); ++}; ++ ++source src { ++ internal(); ++ unix-stream("/dev/log"); ++}; ++ ++source net { ++ udp(ip(0.0.0.0) port(514)); ++}; ++ ++source kernel { ++ file("/proc/kmsg" program_override("kernel")); ++}; ++ ++destination messages { ++ file("/var/log/messages"); ++}; ++ ++log { ++ source(src); ++ source(net); ++ source(kernel); ++ destination(messages); ++}; +diff --git a/feeds/packages/admin/syslog-ng3/files/.svn/text-base/syslog-ng.init.svn-base b/feeds/packages/admin/syslog-ng3/files/.svn/text-base/syslog-ng.init.svn-base +new file mode 100644 +index 0000000..a8bad3d +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/.svn/text-base/syslog-ng.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ -f /etc/syslog-ng.conf ] || return 1 ++ service_start /usr/sbin/syslog-ng ++} ++ ++stop() { ++ service_stop /usr/sbin/syslog-ng ++} ++ ++reload() { ++ service_reload /usr/sbin/syslog-ng ++} +diff --git a/feeds/packages/admin/syslog-ng3/files/syslog-ng.conf b/feeds/packages/admin/syslog-ng3/files/syslog-ng.conf +new file mode 100644 +index 0000000..972848c +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/syslog-ng.conf +@@ -0,0 +1,37 @@ ++@version:3.0 ++ ++options { ++ chain_hostnames(no); ++ create_dirs(yes); ++ flush_lines(0); ++ keep_hostname(yes); ++ log_fifo_size(256); ++ log_msg_size(1024); ++ stats_freq(0); ++ flush_lines(0); ++ use_fqdn(no); ++}; ++ ++source src { ++ internal(); ++ unix-stream("/dev/log"); ++}; ++ ++source net { ++ udp(ip(0.0.0.0) port(514)); ++}; ++ ++source kernel { ++ file("/proc/kmsg" program_override("kernel")); ++}; ++ ++destination messages { ++ file("/var/log/messages"); ++}; ++ ++log { ++ source(src); ++ source(net); ++ source(kernel); ++ destination(messages); ++}; +diff --git a/feeds/packages/admin/syslog-ng3/files/syslog-ng.init b/feeds/packages/admin/syslog-ng3/files/syslog-ng.init +new file mode 100644 +index 0000000..a8bad3d +--- /dev/null ++++ b/feeds/packages/admin/syslog-ng3/files/syslog-ng.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ -f /etc/syslog-ng.conf ] || return 1 ++ service_start /usr/sbin/syslog-ng ++} ++ ++stop() { ++ service_stop /usr/sbin/syslog-ng ++} ++ ++reload() { ++ service_reload /usr/sbin/syslog-ng ++} +diff --git a/feeds/packages/admin/zabbix/.svn/entries b/feeds/packages/admin/zabbix/.svn/entries +new file mode 100644 +index 0000000..3513a70 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/zabbix ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-17T12:13:42.041856Z ++35636 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++98b3a9dcfa05eac4429f331e4aa05be2 ++2013-02-17T12:13:42.041856Z ++35636 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3454 ++ +diff --git a/feeds/packages/admin/zabbix/.svn/prop-base/Makefile.svn-base b/feeds/packages/admin/zabbix/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/admin/zabbix/.svn/text-base/Makefile.svn-base b/feeds/packages/admin/zabbix/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b055567 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,163 @@ ++# ++# 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:=zabbix ++PKG_VERSION:=2.0.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/zabbix ++PKG_MD5SUM:=0c0721c31889b63bce9aa556bcb927e8 ++ ++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:=Mirko Vogt ++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-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-agentd/config ++ select BUSYBOX_CONFIG_HOSTNAME if !PACKAGE_net-tools-hostname ++ select BUSYBOX_CONFIG_UNAME if !PACKAGE_coreutils-uname ++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-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 ++ ++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 ++ $(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-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-sender)) ++$(eval $(call BuildPackage,zabbix-server)) ++$(eval $(call BuildPackage,zabbix-proxy)) ++$(eval $(call BuildPackage,zabbix-get)) +diff --git a/feeds/packages/admin/zabbix/Makefile b/feeds/packages/admin/zabbix/Makefile +new file mode 100644 +index 0000000..b055567 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/Makefile +@@ -0,0 +1,163 @@ ++# ++# 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:=zabbix ++PKG_VERSION:=2.0.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/zabbix ++PKG_MD5SUM:=0c0721c31889b63bce9aa556bcb927e8 ++ ++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:=Mirko Vogt ++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-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-agentd/config ++ select BUSYBOX_CONFIG_HOSTNAME if !PACKAGE_net-tools-hostname ++ select BUSYBOX_CONFIG_UNAME if !PACKAGE_coreutils-uname ++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-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 ++ ++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 ++ $(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-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-sender)) ++$(eval $(call BuildPackage,zabbix-server)) ++$(eval $(call BuildPackage,zabbix-proxy)) ++$(eval $(call BuildPackage,zabbix-get)) +diff --git a/feeds/packages/admin/zabbix/files/.svn/entries b/feeds/packages/admin/zabbix/files/.svn/entries +new file mode 100644 +index 0000000..15f03cc +--- /dev/null ++++ b/feeds/packages/admin/zabbix/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/zabbix/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:21:02.853250Z ++34492 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++zabbix_agentd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++daf2e159cdacf8bfc13f6e12a8b96678 ++2012-12-04T16:21:02.853250Z ++34492 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++825 ++ ++zabbix_agentd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2012-12-04T16:20:59.249248Z ++34491 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ +diff --git a/feeds/packages/admin/zabbix/files/.svn/text-base/zabbix_agentd.conf.svn-base b/feeds/packages/admin/zabbix/files/.svn/text-base/zabbix_agentd.conf.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/admin/zabbix/files/.svn/text-base/zabbix_agentd.init.svn-base b/feeds/packages/admin/zabbix/files/.svn/text-base/zabbix_agentd.init.svn-base +new file mode 100644 +index 0000000..ed9acab +--- /dev/null ++++ b/feeds/packages/admin/zabbix/files/.svn/text-base/zabbix_agentd.init.svn-base +@@ -0,0 +1,33 @@ ++#!/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} || { ++ user_exists zabbix 53 || user_add zabbix 53 ++ group_exists zabbix 53 || group_add zabbix 53 ++ touch ${SERVICE_PID_FILE} ++ chown zabbix:zabbix ${SERVICE_PID_FILE} ++ } ++ ++ service_start ${PROG} -c ${CONFIG} ++} ++ ++stop() { ++ service_stop ${PROG} ++} +diff --git a/feeds/packages/admin/zabbix/files/zabbix_agentd.conf b/feeds/packages/admin/zabbix/files/zabbix_agentd.conf +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/admin/zabbix/files/zabbix_agentd.init b/feeds/packages/admin/zabbix/files/zabbix_agentd.init +new file mode 100644 +index 0000000..ed9acab +--- /dev/null ++++ b/feeds/packages/admin/zabbix/files/zabbix_agentd.init +@@ -0,0 +1,33 @@ ++#!/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} || { ++ user_exists zabbix 53 || user_add zabbix 53 ++ group_exists zabbix 53 || group_add zabbix 53 ++ touch ${SERVICE_PID_FILE} ++ chown zabbix:zabbix ${SERVICE_PID_FILE} ++ } ++ ++ service_start ${PROG} -c ${CONFIG} ++} ++ ++stop() { ++ service_stop ${PROG} ++} +diff --git a/feeds/packages/admin/zabbix/patches/.svn/entries b/feeds/packages/admin/zabbix/patches/.svn/entries +new file mode 100644 +index 0000000..f6acf2d +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/admin/zabbix/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-17T12:13:42.041856Z ++35636 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-change-agentd-config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0d75b5fce0e43795ba30affae8527dcf ++2012-12-04T16:21:02.853250Z ++34492 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1213 ++ ++002-uclibc_loadavg.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d22426aa55cd01aa00f4d6ddd224258d ++2013-02-17T12:13:42.041856Z ++35636 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1023 ++ ++002-fix-res_send-on-uclibc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++113f9752257f2da29cf641021a35a07b ++2013-02-17T12:13:42.041856Z ++35636 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1592 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++91cd93e6ed55fa37b59a4d4dc5b02aef ++2013-02-17T12:13:42.041856Z ++35636 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++731 ++ +diff --git a/feeds/packages/admin/zabbix/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/admin/zabbix/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..8716e84 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,29 @@ ++--- a/configure.in 2012-06-21 21:32:23.707912790 +0000 +++++ b/configure.in 2012-06-21 21:33:36.213554564 +0000 ++@@ -802,25 +802,8 @@ ++ ++ dnl Check for %qu format (FreeBSD 4.x) ++ dnl FreeBSD 4.x does not support %llu ++-AC_MSG_CHECKING(for long long format) ++-AC_TRY_RUN( ++-[ ++-#include ++-int main() ++-{ ++- uint64_t i; ++- ++- sscanf("200000000010020", "%qu", &i); ++- ++- if (i == 200000000010020) return 0; ++- else return -1; ++-} ++-], ++-AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.]) ++-AC_MSG_RESULT(yes), ++-AC_MSG_RESULT(no)) ++- ++ dnl option -rdynamic is needed for readable backtraces +++ ++ AC_MSG_CHECKING(for -rdynamic linking option) ++ saved_LDFLAGS="$LDFLAGS" ++ LDFLAGS="-rdynamic $LDFLAGS" +diff --git a/feeds/packages/admin/zabbix/patches/.svn/text-base/002-fix-res_send-on-uclibc.patch.svn-base b/feeds/packages/admin/zabbix/patches/.svn/text-base/002-fix-res_send-on-uclibc.patch.svn-base +new file mode 100644 +index 0000000..3190659 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/.svn/text-base/002-fix-res_send-on-uclibc.patch.svn-base +@@ -0,0 +1,35 @@ ++--- a/configure.in 2013-02-14 18:29:28.145419003 +0100 +++++ b/configure.in 2013-02-14 18:28:42.873418092 +0100 ++@@ -149,6 +149,10 @@ ++ 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 2012-06-21 19:49:46.610567432 +0000 +++++ b/src/libs/zbxsysinfo/common/net.c 2012-06-21 19:50:35.816628541 +0000 ++@@ -418,6 +418,7 @@ ++ #else /* not _WINDOWS */ ++ res_init(); /* initialize always, settings might have changed */ ++ +++#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)))) ++ return SYSINFO_RET_FAIL; ++ ++@@ -436,6 +437,11 @@ ++ _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 ++ ++ hp = (HEADER *)answer.buffer; ++ +diff --git a/feeds/packages/admin/zabbix/patches/.svn/text-base/002-uclibc_loadavg.patch.svn-base b/feeds/packages/admin/zabbix/patches/.svn/text-base/002-uclibc_loadavg.patch.svn-base +new file mode 100644 +index 0000000..6effabb +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/.svn/text-base/002-uclibc_loadavg.patch.svn-base +@@ -0,0 +1,48 @@ ++--- a/src/libs/zbxsysinfo/linux/cpu.c 2013-02-12 12:27:22.000000000 +0100 +++++ b/src/libs/zbxsysinfo/linux/cpu.c 2013-02-14 18:38:02.517429349 +0100 ++@@ -21,6 +21,45 @@ ++ #include "sysinfo.h" ++ #include "stats.h" ++ +++ +++/* 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(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) ++ { ++ char tmp[16]; +diff --git a/feeds/packages/admin/zabbix/patches/.svn/text-base/010-change-agentd-config.patch.svn-base b/feeds/packages/admin/zabbix/patches/.svn/text-base/010-change-agentd-config.patch.svn-base +new file mode 100644 +index 0000000..bff3b04 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/.svn/text-base/010-change-agentd-config.patch.svn-base +@@ -0,0 +1,54 @@ ++diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf ++index ed04751..e714c4d 100644 ++--- 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. ++@@ -105,6 +99,7 @@ Server=127.0.0.1 ++ # Range: 0-100 ++ # Default: ++ # StartAgents=3 +++StartAgents=1 ++ ++ ##### Active checks related ++ ++@@ -120,8 +115,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. ++@@ -131,8 +124,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. +diff --git a/feeds/packages/admin/zabbix/patches/001-cross_compile.patch b/feeds/packages/admin/zabbix/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..8716e84 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/001-cross_compile.patch +@@ -0,0 +1,29 @@ ++--- a/configure.in 2012-06-21 21:32:23.707912790 +0000 +++++ b/configure.in 2012-06-21 21:33:36.213554564 +0000 ++@@ -802,25 +802,8 @@ ++ ++ dnl Check for %qu format (FreeBSD 4.x) ++ dnl FreeBSD 4.x does not support %llu ++-AC_MSG_CHECKING(for long long format) ++-AC_TRY_RUN( ++-[ ++-#include ++-int main() ++-{ ++- uint64_t i; ++- ++- sscanf("200000000010020", "%qu", &i); ++- ++- if (i == 200000000010020) return 0; ++- else return -1; ++-} ++-], ++-AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.]) ++-AC_MSG_RESULT(yes), ++-AC_MSG_RESULT(no)) ++- ++ dnl option -rdynamic is needed for readable backtraces +++ ++ AC_MSG_CHECKING(for -rdynamic linking option) ++ saved_LDFLAGS="$LDFLAGS" ++ LDFLAGS="-rdynamic $LDFLAGS" +diff --git a/feeds/packages/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch b/feeds/packages/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch +new file mode 100644 +index 0000000..3190659 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/002-fix-res_send-on-uclibc.patch +@@ -0,0 +1,35 @@ ++--- a/configure.in 2013-02-14 18:29:28.145419003 +0100 +++++ b/configure.in 2013-02-14 18:28:42.873418092 +0100 ++@@ -149,6 +149,10 @@ ++ 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 2012-06-21 19:49:46.610567432 +0000 +++++ b/src/libs/zbxsysinfo/common/net.c 2012-06-21 19:50:35.816628541 +0000 ++@@ -418,6 +418,7 @@ ++ #else /* not _WINDOWS */ ++ res_init(); /* initialize always, settings might have changed */ ++ +++#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)))) ++ return SYSINFO_RET_FAIL; ++ ++@@ -436,6 +437,11 @@ ++ _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 ++ ++ hp = (HEADER *)answer.buffer; ++ +diff --git a/feeds/packages/admin/zabbix/patches/002-uclibc_loadavg.patch b/feeds/packages/admin/zabbix/patches/002-uclibc_loadavg.patch +new file mode 100644 +index 0000000..6effabb +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/002-uclibc_loadavg.patch +@@ -0,0 +1,48 @@ ++--- a/src/libs/zbxsysinfo/linux/cpu.c 2013-02-12 12:27:22.000000000 +0100 +++++ b/src/libs/zbxsysinfo/linux/cpu.c 2013-02-14 18:38:02.517429349 +0100 ++@@ -21,6 +21,45 @@ ++ #include "sysinfo.h" ++ #include "stats.h" ++ +++ +++/* 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(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result) ++ { ++ char tmp[16]; +diff --git a/feeds/packages/admin/zabbix/patches/010-change-agentd-config.patch b/feeds/packages/admin/zabbix/patches/010-change-agentd-config.patch +new file mode 100644 +index 0000000..bff3b04 +--- /dev/null ++++ b/feeds/packages/admin/zabbix/patches/010-change-agentd-config.patch +@@ -0,0 +1,54 @@ ++diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf ++index ed04751..e714c4d 100644 ++--- 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. ++@@ -105,6 +99,7 @@ Server=127.0.0.1 ++ # Range: 0-100 ++ # Default: ++ # StartAgents=3 +++StartAgents=1 ++ ++ ##### Active checks related ++ ++@@ -120,8 +115,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. ++@@ -131,8 +124,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. +diff --git a/feeds/packages/devel/.svn/entries b/feeds/packages/devel/.svn/entries +new file mode 100644 +index 0000000..e42cfe7 +--- /dev/null ++++ b/feeds/packages/devel/.svn/entries +@@ -0,0 +1,61 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T16:34:36.691428Z ++35235 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patch ++dir ++ ++cppunit ++dir ++ ++build-essential ++dir ++ ++ksymoops ++dir ++ ++lttng-tools ++dir ++ ++electric-fence ++dir ++ ++diffutils ++dir ++ ++dmalloc ++dir ++ ++gcc ++dir ++ ++perf ++dir ++ ++make ++dir ++ +diff --git a/feeds/packages/devel/build-essential/.svn/entries b/feeds/packages/devel/build-essential/.svn/entries +new file mode 100644 +index 0000000..91ff50d +--- /dev/null ++++ b/feeds/packages/devel/build-essential/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/build-essential ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-24T12:07:24.826573Z ++16965 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a195ac948689a8bb7df015d53d9933e0 ++2009-07-24T12:07:24.826573Z ++16965 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++619 ++ +diff --git a/feeds/packages/devel/build-essential/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/build-essential/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f22611d +--- /dev/null ++++ b/feeds/packages/devel/build-essential/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,33 @@ ++# ++# Copyright (C) 2008 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:=build-essential ++PKG_RELEASE:=1 ++PKG_VERSION:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/build-essential ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=Build essentials ++ DEPENDS=+gcc +make +binutils +patch +diffutils @NO_STRIP ++ PKGARCH:=all ++endef ++ ++define Build/Compile ++ ++endef ++ ++define Package/build-essential/install ++ cp -r ./files/* $(1) ++endef ++ ++$(eval $(call BuildPackage,build-essential)) +diff --git a/feeds/packages/devel/build-essential/Makefile b/feeds/packages/devel/build-essential/Makefile +new file mode 100644 +index 0000000..f22611d +--- /dev/null ++++ b/feeds/packages/devel/build-essential/Makefile +@@ -0,0 +1,33 @@ ++# ++# Copyright (C) 2008 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:=build-essential ++PKG_RELEASE:=1 ++PKG_VERSION:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/build-essential ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=Build essentials ++ DEPENDS=+gcc +make +binutils +patch +diffutils @NO_STRIP ++ PKGARCH:=all ++endef ++ ++define Build/Compile ++ ++endef ++ ++define Package/build-essential/install ++ cp -r ./files/* $(1) ++endef ++ ++$(eval $(call BuildPackage,build-essential)) +diff --git a/feeds/packages/devel/build-essential/files/.svn/entries b/feeds/packages/devel/build-essential/files/.svn/entries +new file mode 100644 +index 0000000..127980f +--- /dev/null ++++ b/feeds/packages/devel/build-essential/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/build-essential/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-06-09T21:29:40.112885Z ++11421 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++usr ++dir ++ +diff --git a/feeds/packages/devel/build-essential/files/usr/.svn/entries b/feeds/packages/devel/build-essential/files/usr/.svn/entries +new file mode 100644 +index 0000000..c885f5e +--- /dev/null ++++ b/feeds/packages/devel/build-essential/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/build-essential/files/usr ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-06-09T21:29:40.112885Z ++11421 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ +diff --git a/feeds/packages/devel/build-essential/files/usr/src/.svn/entries b/feeds/packages/devel/build-essential/files/usr/src/.svn/entries +new file mode 100644 +index 0000000..757efda +--- /dev/null ++++ b/feeds/packages/devel/build-essential/files/usr/src/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/build-essential/files/usr/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-06-09T21:29:40.112885Z ++11421 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hello ++dir ++ +diff --git a/feeds/packages/devel/build-essential/files/usr/src/hello/.svn/entries b/feeds/packages/devel/build-essential/files/usr/src/hello/.svn/entries +new file mode 100644 +index 0000000..d9fcd6a +--- /dev/null ++++ b/feeds/packages/devel/build-essential/files/usr/src/hello/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/build-essential/files/usr/src/hello ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-06-09T21:29:40.112885Z ++11421 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hello.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++584b855afd84c33305d996ba645ae175 ++2008-06-09T21:29:40.112885Z ++11421 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++96 ++ +diff --git a/feeds/packages/devel/build-essential/files/usr/src/hello/.svn/text-base/hello.c.svn-base b/feeds/packages/devel/build-essential/files/usr/src/hello/.svn/text-base/hello.c.svn-base +new file mode 100644 +index 0000000..e693fd8 +--- /dev/null ++++ b/feeds/packages/devel/build-essential/files/usr/src/hello/.svn/text-base/hello.c.svn-base +@@ -0,0 +1,8 @@ ++#include ++ ++int main(int argc, char **argv) ++{ ++ printf("Hello OpenWrt\n"); ++ ++ return 0; ++} +diff --git a/feeds/packages/devel/build-essential/files/usr/src/hello/hello.c b/feeds/packages/devel/build-essential/files/usr/src/hello/hello.c +new file mode 100644 +index 0000000..e693fd8 +--- /dev/null ++++ b/feeds/packages/devel/build-essential/files/usr/src/hello/hello.c +@@ -0,0 +1,8 @@ ++#include ++ ++int main(int argc, char **argv) ++{ ++ printf("Hello OpenWrt\n"); ++ ++ return 0; ++} +diff --git a/feeds/packages/devel/cppunit/.svn/entries b/feeds/packages/devel/cppunit/.svn/entries +new file mode 100644 +index 0000000..4b3d6f6 +--- /dev/null ++++ b/feeds/packages/devel/cppunit/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/cppunit ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:30:34.122776Z ++32241 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++1842b7ad8e53ebcd5256f641bb45a18d ++2012-06-11T23:30:34.122776Z ++32241 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1157 ++ +diff --git a/feeds/packages/devel/cppunit/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/cppunit/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..91b74e6 +--- /dev/null ++++ b/feeds/packages/devel/cppunit/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=cppunit ++PKG_VERSION:=1.12.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/cppunit ++PKG_MD5SUM:=bd30e9cf5523cdfc019b94f5e1d7fd19 ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cppunit ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=Unit Testing Library for C++ ++ URL:=http://cppunit.sourceforge.net/ ++ DEPENDS:=+libstdcpp ++endef ++ ++define Package/cppunit/description ++ Unit Testing Library for C++ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/cppunit ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/cppunit $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcppunit*so* $(1)/usr/lib/ ++endef ++ ++define Package/cppunit/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcppunit*so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,cppunit)) +diff --git a/feeds/packages/devel/cppunit/Makefile b/feeds/packages/devel/cppunit/Makefile +new file mode 100644 +index 0000000..91b74e6 +--- /dev/null ++++ b/feeds/packages/devel/cppunit/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=cppunit ++PKG_VERSION:=1.12.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/cppunit ++PKG_MD5SUM:=bd30e9cf5523cdfc019b94f5e1d7fd19 ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cppunit ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=Unit Testing Library for C++ ++ URL:=http://cppunit.sourceforge.net/ ++ DEPENDS:=+libstdcpp ++endef ++ ++define Package/cppunit/description ++ Unit Testing Library for C++ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/cppunit ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/cppunit $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcppunit*so* $(1)/usr/lib/ ++endef ++ ++define Package/cppunit/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcppunit*so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,cppunit)) +diff --git a/feeds/packages/devel/diffutils/.svn/entries b/feeds/packages/devel/diffutils/.svn/entries +new file mode 100644 +index 0000000..02bf9b6 +--- /dev/null ++++ b/feeds/packages/devel/diffutils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/diffutils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-19T15:09:23.588451Z ++33467 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++b616fca9107eaa558f71b35d06a0aa38 ++2012-09-19T15:09:23.588451Z ++33467 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1315 ++ +diff --git a/feeds/packages/devel/diffutils/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/diffutils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..05cd360 +--- /dev/null ++++ b/feeds/packages/devel/diffutils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/diffutils ++PKG_MD5SUM:=684aaba1baab743a2a90e52162ff07da ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/diffutils ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:=+USE_EGLIBC: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 \ ++ ++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/feeds/packages/devel/diffutils/Makefile b/feeds/packages/devel/diffutils/Makefile +new file mode 100644 +index 0000000..05cd360 +--- /dev/null ++++ b/feeds/packages/devel/diffutils/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/diffutils ++PKG_MD5SUM:=684aaba1baab743a2a90e52162ff07da ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/diffutils ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:=+USE_EGLIBC: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 \ ++ ++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/feeds/packages/devel/dmalloc/.svn/entries b/feeds/packages/devel/dmalloc/.svn/entries +new file mode 100644 +index 0000000..b468da6 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/dmalloc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++7c94019cedf4f2f4926d5d122ecd2618 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1966 ++ +diff --git a/feeds/packages/devel/dmalloc/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/dmalloc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9e3e664 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,78 @@ ++# ++# 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:=dmalloc ++PKG_VERSION:=5.5.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://dmalloc.com/releases/ ++PKG_MD5SUM:=f92e5606c23a8092f3d5694e8d1c932e ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dmalloc/Default ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=Dmalloc ++ URL:=http://www.dmalloc.com/ ++endef ++ ++define Package/libdmalloc ++ $(call Package/dmalloc/Default) ++ TITLE+= (library) ++ DEPENDS:=@USE_EGLIBC ++endef ++ ++define Package/dmalloc-utils ++ $(call Package/dmalloc/Default) ++ DEPENDS:=+libdmalloc ++ TITLE+= (utilities) ++endef ++ ++define Package/dmalloc/description ++The debug memory allocation or dmalloc library has been designed as a drop in ++replacement for the system's malloc, realloc, calloc, free and other memory ++management routines while providing powerful debugging facilities configurable ++at runtime. These facilities include such things as memory-leak tracking, ++fence-post write detection, file/line number reporting, and general logging of ++statistics. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-cxx \ ++ --with-pagesize=12 ++ ++TARGET_CFLAGS += $(FPIC) ++ ++MAKE_INSTALL_FLAGS += installsl ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/dmalloc.h $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libdmalloc/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.so* $(1)/usr/lib/ ++endef ++ ++define Package/dmalloc-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmalloc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libdmalloc)) ++$(eval $(call BuildPackage,dmalloc-utils)) +diff --git a/feeds/packages/devel/dmalloc/Makefile b/feeds/packages/devel/dmalloc/Makefile +new file mode 100644 +index 0000000..9e3e664 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/Makefile +@@ -0,0 +1,78 @@ ++# ++# 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:=dmalloc ++PKG_VERSION:=5.5.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://dmalloc.com/releases/ ++PKG_MD5SUM:=f92e5606c23a8092f3d5694e8d1c932e ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dmalloc/Default ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=Dmalloc ++ URL:=http://www.dmalloc.com/ ++endef ++ ++define Package/libdmalloc ++ $(call Package/dmalloc/Default) ++ TITLE+= (library) ++ DEPENDS:=@USE_EGLIBC ++endef ++ ++define Package/dmalloc-utils ++ $(call Package/dmalloc/Default) ++ DEPENDS:=+libdmalloc ++ TITLE+= (utilities) ++endef ++ ++define Package/dmalloc/description ++The debug memory allocation or dmalloc library has been designed as a drop in ++replacement for the system's malloc, realloc, calloc, free and other memory ++management routines while providing powerful debugging facilities configurable ++at runtime. These facilities include such things as memory-leak tracking, ++fence-post write detection, file/line number reporting, and general logging of ++statistics. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-cxx \ ++ --with-pagesize=12 ++ ++TARGET_CFLAGS += $(FPIC) ++ ++MAKE_INSTALL_FLAGS += installsl ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/dmalloc.h $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libdmalloc/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.so* $(1)/usr/lib/ ++endef ++ ++define Package/dmalloc-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmalloc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libdmalloc)) ++$(eval $(call BuildPackage,dmalloc-utils)) +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/entries b/feeds/packages/devel/dmalloc/patches/.svn/entries +new file mode 100644 +index 0000000..b0b219f +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/entries +@@ -0,0 +1,300 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/dmalloc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-11T21:22:25.645232Z ++31253 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-configure_cxx.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++721457a477d90150c2b30b71234a72c3 ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1297 ++ ++120-makefile_shared.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++be1588996bbab3cb3601d8e5595e078b ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++12505 ++ ++100-configure_pagesize.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++41c5d733a73c03aca21ff5ffd8a910ce ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1643 ++ ++300-fix_summarize_script.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++1d5262b63f9adb72e4c16747d32e83e9 ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++186 ++ ++200-fix_return_address.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++e73f663fda059a6603489fcf37b0dad8 ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1081 ++ ++130-makefile_destdir.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d2fc4df84ff6590c2d715a28b49154f1 ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3975 ++ ++400-undef-strndup.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++09f6ee32554e60ad30fefd797a5c0f54 ++2012-04-11T21:22:25.645232Z ++31253 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++306 ++ ++210-fix_threads.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++e24a8534f601658fc43577fd26d4b18b ++2010-03-19T16:23:37.446887Z ++20300 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++165 ++ +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/100-configure_pagesize.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/100-configure_pagesize.patch.svn-base +new file mode 100644 +index 0000000..0482d7a +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/100-configure_pagesize.patch.svn-base +@@ -0,0 +1,44 @@ ++--- a/configure +++++ b/configure ++@@ -857,6 +857,11 @@ Optional Features: ++ --enable-threads build in thread support (disabled by default) ++ --enable-shlib build shared libraries (disabled by default) ++ +++Optional Packages: +++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +++ --with-pagesize=nbits log base 2 of machine page size +++ ++ Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++@@ -5307,6 +5312,14 @@ done ++ echo "$as_me:$LINENO: checking basic-block size" >&5 ++ echo $ECHO_N "checking basic-block size... $ECHO_C" >&6 ++ ac_cv_page_size=0 +++ +++# Check whether --with-pagesize or --without-pagesize was given. +++if test "${with_pagesize+set}" = set; then +++ withval="$with_pagesize" +++ case "$withval" in ?|1?) ac_cv_page_size=$withval; esac +++else +++ : # default to probing, set above +++fi; ++ if test $ac_cv_page_size = 0; then ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++--- a/configure.ac +++++ b/configure.ac ++@@ -349,6 +349,12 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) ++ AC_CHECK_FUNCS(getpagesize) ++ AC_MSG_CHECKING([basic-block size]) ++ ac_cv_page_size=0 +++AC_ARG_WITH(pagesize, +++ [ AC_HELP_STRING([--with-pagesize=nbits], +++ [log base 2 of machine page size] ) ], +++ [ case "$withval" in ?|1?) ac_cv_page_size=$withval; esac ], +++ [ : # default to probing, set above ], +++) ++ if test $ac_cv_page_size = 0; then ++ AC_RUN_IFELSE([main() { if (getpagesize()<=2048) exit(0); else exit(1); }], ++ [ ac_cv_page_size=11 ] ) +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/110-configure_cxx.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/110-configure_cxx.patch.svn-base +new file mode 100644 +index 0000000..4a2e8d7 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/110-configure_cxx.patch.svn-base +@@ -0,0 +1,38 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -56,10 +56,11 @@ AC_PROG_CC ++ AC_PROG_CXX ++ ++ # see if we actually have a CXX program ++-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then ++- AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) ++- enable_cxx=no ++-fi +++# FIXME: always returns no +++#if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then +++# AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) +++# enable_cxx=no +++#fi ++ ++ # hopefully we have a stdc c-compiler ++ if test "$ac_cv_prog_cc_stdc" = "no" ; then ++--- a/configure +++++ b/configure ++@@ -2648,11 +2648,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ # see if we actually have a CXX program ++-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then ++- { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5 ++-echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;} ++- enable_cxx=no ++-fi +++# FIXME: always returns no +++#if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then +++# { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5 +++#echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;} +++# enable_cxx=no +++#fi ++ ++ # hopefully we have a stdc c-compiler ++ if test "$ac_cv_prog_cc_stdc" = "no" ; then +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/120-makefile_shared.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/120-makefile_shared.patch.svn-base +new file mode 100644 +index 0000000..1fd6ae4 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/120-makefile_shared.patch.svn-base +@@ -0,0 +1,305 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -41,7 +41,7 @@ LIBRARY = lib$(MODULE).a ++ ++ # thread version of the library ++ LIB_TH = lib$(MODULE)th.a ++-LIB_TH_SL = lib$(MODULE)th.@shlibext@ +++LIB_TH_SL = lib$(MODULE)th.@shlibext@.5.5.2 ++ @TH_ON@BUILD_ALL_1 = threads ++ @TH_ON@INSTALL_LIB_1 = installth ++ @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL) ++@@ -50,8 +50,8 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@ ++ @TH_ON@@SL_ON@INSTALL_LIB_2 = installthsl ++ ++ # C++ version of the library ++-LIB_CXX = lib$(MODULE)xx.a ++-LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ +++LIB_CXX = lib$(MODULE)cxx.a +++LIB_CXX_SL = lib$(MODULE)cxx.@shlibext@.5.5.2 ++ @CXX_ON@BUILD_ALL_3 = $(LIB_CXX) ++ @CXX_ON@INSTALL_LIB_3 = installcxx ++ @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL) ++@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ ++ ++ # threads + C++ ++ LIB_TH_CXX = lib$(MODULE)thcxx.a ++-LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@ +++LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@.5.5.2 ++ @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX) ++ @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx ++ @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX) ++@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlib ++ @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl ++ ++ # shared versions of the libraries ++-LIB_SL = lib$(MODULE).@shlibext@ +++LIB_SL = lib$(MODULE).@shlibext@.5.5.2 ++ @SL_ON@BUILD_ALL_7 = $(LIB_SL) ++ @SL_ON@INSTALL_LIB_7 = installsl ++ @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL) ++@@ -145,9 +145,13 @@ SHELL = /bin/sh ++ ++ HFLS = dmalloc.h ++ OBJS = arg_check.o compat.o dmalloc_rand.o dmalloc_tab.o env.o heap.o +++OBJS_SL = arg_check_sl.o compat_sl.o dmalloc_rand_sl.o dmalloc_tab_sl.o env_sl.o heap_sl.o ++ NORMAL_OBJS = chunk.o error.o malloc.o +++NORMAL_OBJS_SL = chunk_sl.o error_sl.o malloc_sl.o ++ THREAD_OBJS = chunk_th.o error_th.o malloc_th.o +++THREAD_OBJS_SL = chunk_th_sl.o error_th_sl.o malloc_th_sl.o ++ CXX_OBJS = dmallocc.o +++CXX_OBJS_SL = dmallocc_sl.o ++ ++ CFLAGS = $(CCFLAGS) ++ TEST = $(MODULE)_t ++@@ -160,9 +164,9 @@ all : $(BUILD_ALL) ++ ++ clean : ++ rm -f $(A_OUT) core *.o *.t ++- rm -f $(LIBRARY) $(LIB_TH) $(LIB_CXX) $(LIB_TH_CXX) $(TEST) $(TEST_FC) ++- rm -f $(LIB_TH_SL) $(LIB_CXX_SL) $(LIB_TH_CXX_SL) $(LIB_SL) +++ rm -f $(TEST) $(TEST_FC) ++ rm -f $(UTIL) dmalloc.h +++ rm -f lib$(MODULE)*.* ++ ++ realclean : clean ++ ++@@ -181,43 +185,43 @@ installincs : $(HFLS) ++ $(INSTALL_DATA) $(HFLS) $(includedir) ++ ++ installthsl : $(LIB_TH_SL) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) +++ $(srcdir)/mkinstalldirs $(shlibdir) +++ $(INSTALL) $(LIB_TH_SL) $(shlibdir) ++ ++ installth : $(INSTALL_THREADS) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) +++ $(INSTALL) $(LIB_TH) $(libdir) ++ @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" ++ ++ installthcxxsl : $(LIB_TH_CXX_SL) ++ $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) +++ $(INSTALL) $(LIB_TH_CXX_SL) $(shlibdir) ++ ++ installthcxx : $(INSTALL_TH_CXX) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) +++ $(INSTALL) $(LIB_TH_CXX) $(libdir) ++ @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" ++ ++ installcxxsl : $(LIB_CXX_SL) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) +++ $(srcdir)/mkinstalldirs $(shlibdir) +++ $(INSTALL) $(LIB_CXX_SL) $(shlibdir) ++ ++ installcxx : $(INSTALL_CXX) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) +++ $(INSTALL) $(LIB_CXX) $(libdir) ++ @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ ++ installsl : $(LIB_SL) ++ $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) +++ $(INSTALL) $(LIB_SL) $(shlibdir) ++ @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" ++ ++ installlib : $(INSTALL_LIB) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) +++ $(INSTALL) $(LIBRARY) $(libdir) ++ @RANLIB@ $(libdir)/$(LIBRARY) ++ @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" ++ @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" ++@@ -255,10 +259,8 @@ shlib : $(BUILD_SL) ++ # NOTE: you may have to edit the configure.ac script to get this to ++ # work on your operating system. Please send feedback to the author ++ # via: http://256.com/gray/email.html ++-$(LIB_SL) : $(LIBRARY) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) ++- mv $@.t $@ +++$(LIB_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmalloc.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) ++ ++ $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) ++ ar cr $@ $? ++@@ -268,32 +270,26 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) ++ ar cr $@ $? ++ @RANLIB@ $@ ++ ++-$(LIB_TH_SL) : $(LIB_TH) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) ++- mv $@.t $@ +++$(LIB_TH_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmallocth.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) ++ ++ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++ ar cr $@ $? ++ @RANLIB@ $@ ++ ++-$(LIB_CXX_SL) : $(LIB_CXX) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++- mv $@.t $@ +++$(LIB_CXX_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmalloccxx.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) ++ ++ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++ ar cr $@ $? ++ @RANLIB@ $@ ++ ++-$(LIB_TH_CXX_SL) : $(LIB_TH_CXX) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++- mv $@.t $@ +++$(LIB_TH_CXX_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmallocthcxx.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) ++ ++-threadssl : $(LIB_TH_SL) +++threadssl : $(LIB_TH_SL)$(ver) ++ ++-threadscxxsl : $(LIB_TH_CXX_SL) +++threadscxxsl : $(LIB_TH_CXX_SL)$(ver) ++ ++ threadscxx : $(BUILD_TH_CXX) ++ @SL_OFF@ @echo "Enter 'make threadscxxsl' to build the threaded C++ shared-library" ++@@ -302,7 +298,7 @@ threads : $(BUILD_THREADS) ++ @CXX_OFF@ @echo "Enter 'make threadscxx' to build the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make threadssl' to build the threaded shared library" ++ ++-cxxsl : $(LIB_CXX_SL) +++cxxsl : $(LIB_CXX_SL)$(ver) ++ ++ cxx : $(BUILD_CXX) ++ @SL_OFF@ @echo "Enter 'make cxxsl' to build the cxx shared library" ++@@ -371,6 +367,11 @@ dmallocc.o : $(srcdir)/dmallocc.cc ++ $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ ++ -o ./$@ ++ +++dmallocc_sl.o : $(srcdir)/dmallocc.cc +++ rm -f $@ +++ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ +++ -o ./$@ +++ ++ # ++ # auto configure settings - uncomment if you are doing configure ++ # development on the library ++@@ -395,38 +396,109 @@ dmallocc.o : $(srcdir)/dmallocc.cc ++ ++ arg_check.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ ++ dmalloc_loc.h error.h arg_check.h +++arg_check_sl.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ +++ dmalloc_loc.h error.h arg_check.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ chunk.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ ++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ ++ error_val.h heap.h +++chunk_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ +++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ +++ error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h +++compat_sl.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ ++ debug_tok.h dmalloc_loc.h env.h error_val.h version.h +++dmalloc_sl.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ +++ debug_tok.h dmalloc_loc.h env.h error_val.h version.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ ++ dmalloc_argv_loc.h compat.h +++dmalloc_argv_sl.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ +++ dmalloc_argv_loc.h compat.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ ++ dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h +++dmalloc_fc_t_sl.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ +++ dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_rand.o: dmalloc_rand.c dmalloc_rand.h +++dmalloc_rand_sl.o: dmalloc_rand.c dmalloc_rand.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_t.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ ++ dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ ++ error_val.h heap.h +++dmalloc_t_sl.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ +++ dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ +++ error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_tab.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ ++ dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h +++dmalloc_tab_sl.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ +++ dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ env.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ ++ debug_tok.h env.h error.h +++env_sl.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ +++ debug_tok.h env.h error.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ error.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ ++ dmalloc_loc.h env.h error.h error_val.h version.h +++error_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ +++ dmalloc_loc.h env.h error.h error_val.h version.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ heap.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ ++ dmalloc_loc.h error.h error_val.h heap.h +++heap_sl.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ +++ dmalloc_loc.h error.h error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ malloc.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ ++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ ++ malloc_funcs.h return.h +++malloc_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ +++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ +++ malloc_funcs.h return.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ protect.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ ++ heap.h protect.h +++protect_sl.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ +++ heap.h protect.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ chunk_th.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ ++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ ++ error_val.h heap.h +++chunk_th_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ +++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ +++ error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ error_th.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ ++ dmalloc_loc.h env.h error.h error_val.h version.h +++error_th_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ +++ dmalloc_loc.h env.h error.h error_val.h version.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ malloc_th.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ ++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ ++ malloc_funcs.h return.h +++malloc_th_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ +++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ +++ malloc_funcs.h return.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/130-makefile_destdir.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/130-makefile_destdir.patch.svn-base +new file mode 100644 +index 0000000..88a2da9 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/130-makefile_destdir.patch.svn-base +@@ -0,0 +1,97 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -178,66 +178,66 @@ distclean : clean ++ # rm -f configure ++ ++ installdirs : ++- $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) ++ ++ installincs : $(HFLS) ++- $(srcdir)/mkinstalldirs $(includedir) ++- $(INSTALL_DATA) $(HFLS) $(includedir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) +++ $(INSTALL_DATA) $(HFLS) $(DESTDIR)$(includedir) ++ ++ installthsl : $(LIB_TH_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_TH_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_TH_SL) $(DESTDIR)$(shlibdir) ++ ++ installth : $(INSTALL_THREADS) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIB_TH) $(libdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIB_TH) $(DESTDIR)$(libdir) ++ @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" ++ ++ installthcxxsl : $(LIB_TH_CXX_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_TH_CXX_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_TH_CXX_SL) $(DESTDIR)$(shlibdir) ++ ++ installthcxx : $(INSTALL_TH_CXX) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIB_TH_CXX) $(libdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIB_TH_CXX) $(DESTDIR)$(libdir) ++ @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" ++ ++ installcxxsl : $(LIB_CXX_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_CXX_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_CXX_SL) $(DESTDIR)$(shlibdir) ++ ++ installcxx : $(INSTALL_CXX) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIB_CXX) $(libdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIB_CXX) $(DESTDIR)$(libdir) ++ @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ ++ installsl : $(LIB_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_SL) $(DESTDIR)$(shlibdir) ++ @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" ++ ++ installlib : $(INSTALL_LIB) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIBRARY) $(libdir) ++- @RANLIB@ $(libdir)/$(LIBRARY) ++-@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) +++ @RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY) +++@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(DESTDIR)$(shlibdir)" ++ @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" ++ @TH_OFF@ @echo "Enter 'make installth' to install thread library" ++ ++ installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \ ++ $(srcdir)/docs/$(PDFFILE) ++- $(srcdir)/mkinstalldirs $(docdir) ++- $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir) ++- $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir) ++- $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) +++ $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir) +++ $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir) +++ $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)$(docdir) ++ ++ install : installincs installlib $(UTIL) ++- $(srcdir)/mkinstalldirs $(bindir) ++- $(INSTALL_PROGRAM) $(UTIL) $(bindir) ++- @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) +++ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir) +++ @echo "Enter 'make installdocs' to install $(DOCFILES) in $(DESTDIR)$(docdir)" ++ ++ dmalloc.h.2 : $(srcdir)/configure ++ $(SHELL) $(srcdir)/configure +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/200-fix_return_address.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/200-fix_return_address.patch.svn-base +new file mode 100644 +index 0000000..0fb35e4 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/200-fix_return_address.patch.svn-base +@@ -0,0 +1,45 @@ ++--- a/configure +++++ b/configure ++@@ -7120,7 +7120,7 @@ echo "$as_me:$LINENO: checking return.h ++ echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 ++ if test "$cross_compiling" = yes; then ++ cat >>confdefs.h <<\_ACEOF ++-#define RETURN_MACROS_WORK 0 +++#define RETURN_MACROS_WORK 1 ++ _ACEOF ++ echo "$as_me:$LINENO: result: no" >&5 ++ echo "${ECHO_T}no" >&6 ++--- a/return.h +++++ b/return.h ++@@ -106,25 +106,19 @@ ++ /*************************************/ ++ ++ /* ++- * For DEC Mips machines running Ultrix +++ * For Mips machines running Linux ++ */ ++ #if __mips ++ ++ /* ++- * I have no idea how to get inline assembly with the default cc. ++- * Anyone know how? ++- */ ++- ++-#if 0 ++- ++-/* ++ * NOTE: we assume here that file is global. ++ * ++- * $31 is the frame pointer. $2 looks to be the return address but maybe ++- * not consistently. +++ * $31 is the return address. ++ */ ++-#define GET_RET_ADDR(file) asm("sw $2, file") ++- +++#if (_MIPS_SZLONG == 32) +++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) +++#else +++#define GET_RET_ADDR(file) asm("sd $31, %0" : "=m" (file)) ++ #endif ++ ++ #endif /* __mips */ +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/210-fix_threads.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/210-fix_threads.patch.svn-base +new file mode 100644 +index 0000000..c3cbd90 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/210-fix_threads.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/settings.dist +++++ b/settings.dist ++@@ -409,7 +409,7 @@ ++ */ ++ ++ #ifndef LOCK_THREADS ++-#define LOCK_THREADS 0 +++#define LOCK_THREADS 1 ++ #endif ++ ++ #if LOCK_THREADS +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/300-fix_summarize_script.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/300-fix_summarize_script.patch.svn-base +new file mode 100644 +index 0000000..d50106d +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/300-fix_summarize_script.patch.svn-base +@@ -0,0 +1,8 @@ ++--- a/contrib/dmalloc_summarize.pl +++++ b/contrib/dmalloc_summarize.pl ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/perl5 -w +++#!/usr/bin/perl -w ++ # ++ # dmalloc_summarize -- summarizes dmalloc log files ++ # +diff --git a/feeds/packages/devel/dmalloc/patches/.svn/text-base/400-undef-strndup.patch.svn-base b/feeds/packages/devel/dmalloc/patches/.svn/text-base/400-undef-strndup.patch.svn-base +new file mode 100644 +index 0000000..e7141ed +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/.svn/text-base/400-undef-strndup.patch.svn-base +@@ -0,0 +1,10 @@ ++--- dmalloc-5.5.2/dmalloc.h.3 2012-04-11 22:59:21.624323311 +0200 +++++ dmalloc-5.5.2.mod/dmalloc.h.3 2012-04-11 23:00:53.612325497 +0200 ++@@ -405,6 +405,7 @@ ++ * ++ * string -> String we are duplicating. ++ */ +++#undef strdup ++ extern ++ char *strdup(const char *string); ++ #endif /* ifndef DMALLOC_STRDUP_MACRO */ +diff --git a/feeds/packages/devel/dmalloc/patches/100-configure_pagesize.patch b/feeds/packages/devel/dmalloc/patches/100-configure_pagesize.patch +new file mode 100644 +index 0000000..0482d7a +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/100-configure_pagesize.patch +@@ -0,0 +1,44 @@ ++--- a/configure +++++ b/configure ++@@ -857,6 +857,11 @@ Optional Features: ++ --enable-threads build in thread support (disabled by default) ++ --enable-shlib build shared libraries (disabled by default) ++ +++Optional Packages: +++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +++ --with-pagesize=nbits log base 2 of machine page size +++ ++ Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++@@ -5307,6 +5312,14 @@ done ++ echo "$as_me:$LINENO: checking basic-block size" >&5 ++ echo $ECHO_N "checking basic-block size... $ECHO_C" >&6 ++ ac_cv_page_size=0 +++ +++# Check whether --with-pagesize or --without-pagesize was given. +++if test "${with_pagesize+set}" = set; then +++ withval="$with_pagesize" +++ case "$withval" in ?|1?) ac_cv_page_size=$withval; esac +++else +++ : # default to probing, set above +++fi; ++ if test $ac_cv_page_size = 0; then ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++--- a/configure.ac +++++ b/configure.ac ++@@ -349,6 +349,12 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) ++ AC_CHECK_FUNCS(getpagesize) ++ AC_MSG_CHECKING([basic-block size]) ++ ac_cv_page_size=0 +++AC_ARG_WITH(pagesize, +++ [ AC_HELP_STRING([--with-pagesize=nbits], +++ [log base 2 of machine page size] ) ], +++ [ case "$withval" in ?|1?) ac_cv_page_size=$withval; esac ], +++ [ : # default to probing, set above ], +++) ++ if test $ac_cv_page_size = 0; then ++ AC_RUN_IFELSE([main() { if (getpagesize()<=2048) exit(0); else exit(1); }], ++ [ ac_cv_page_size=11 ] ) +diff --git a/feeds/packages/devel/dmalloc/patches/110-configure_cxx.patch b/feeds/packages/devel/dmalloc/patches/110-configure_cxx.patch +new file mode 100644 +index 0000000..4a2e8d7 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/110-configure_cxx.patch +@@ -0,0 +1,38 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -56,10 +56,11 @@ AC_PROG_CC ++ AC_PROG_CXX ++ ++ # see if we actually have a CXX program ++-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then ++- AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) ++- enable_cxx=no ++-fi +++# FIXME: always returns no +++#if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then +++# AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) +++# enable_cxx=no +++#fi ++ ++ # hopefully we have a stdc c-compiler ++ if test "$ac_cv_prog_cc_stdc" = "no" ; then ++--- a/configure +++++ b/configure ++@@ -2648,11 +2648,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ # see if we actually have a CXX program ++-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then ++- { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5 ++-echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;} ++- enable_cxx=no ++-fi +++# FIXME: always returns no +++#if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then +++# { echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5 +++#echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;} +++# enable_cxx=no +++#fi ++ ++ # hopefully we have a stdc c-compiler ++ if test "$ac_cv_prog_cc_stdc" = "no" ; then +diff --git a/feeds/packages/devel/dmalloc/patches/120-makefile_shared.patch b/feeds/packages/devel/dmalloc/patches/120-makefile_shared.patch +new file mode 100644 +index 0000000..1fd6ae4 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/120-makefile_shared.patch +@@ -0,0 +1,305 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -41,7 +41,7 @@ LIBRARY = lib$(MODULE).a ++ ++ # thread version of the library ++ LIB_TH = lib$(MODULE)th.a ++-LIB_TH_SL = lib$(MODULE)th.@shlibext@ +++LIB_TH_SL = lib$(MODULE)th.@shlibext@.5.5.2 ++ @TH_ON@BUILD_ALL_1 = threads ++ @TH_ON@INSTALL_LIB_1 = installth ++ @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL) ++@@ -50,8 +50,8 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@ ++ @TH_ON@@SL_ON@INSTALL_LIB_2 = installthsl ++ ++ # C++ version of the library ++-LIB_CXX = lib$(MODULE)xx.a ++-LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ +++LIB_CXX = lib$(MODULE)cxx.a +++LIB_CXX_SL = lib$(MODULE)cxx.@shlibext@.5.5.2 ++ @CXX_ON@BUILD_ALL_3 = $(LIB_CXX) ++ @CXX_ON@INSTALL_LIB_3 = installcxx ++ @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL) ++@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@ ++ ++ # threads + C++ ++ LIB_TH_CXX = lib$(MODULE)thcxx.a ++-LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@ +++LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@.5.5.2 ++ @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX) ++ @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx ++ @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX) ++@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlib ++ @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl ++ ++ # shared versions of the libraries ++-LIB_SL = lib$(MODULE).@shlibext@ +++LIB_SL = lib$(MODULE).@shlibext@.5.5.2 ++ @SL_ON@BUILD_ALL_7 = $(LIB_SL) ++ @SL_ON@INSTALL_LIB_7 = installsl ++ @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL) ++@@ -145,9 +145,13 @@ SHELL = /bin/sh ++ ++ HFLS = dmalloc.h ++ OBJS = arg_check.o compat.o dmalloc_rand.o dmalloc_tab.o env.o heap.o +++OBJS_SL = arg_check_sl.o compat_sl.o dmalloc_rand_sl.o dmalloc_tab_sl.o env_sl.o heap_sl.o ++ NORMAL_OBJS = chunk.o error.o malloc.o +++NORMAL_OBJS_SL = chunk_sl.o error_sl.o malloc_sl.o ++ THREAD_OBJS = chunk_th.o error_th.o malloc_th.o +++THREAD_OBJS_SL = chunk_th_sl.o error_th_sl.o malloc_th_sl.o ++ CXX_OBJS = dmallocc.o +++CXX_OBJS_SL = dmallocc_sl.o ++ ++ CFLAGS = $(CCFLAGS) ++ TEST = $(MODULE)_t ++@@ -160,9 +164,9 @@ all : $(BUILD_ALL) ++ ++ clean : ++ rm -f $(A_OUT) core *.o *.t ++- rm -f $(LIBRARY) $(LIB_TH) $(LIB_CXX) $(LIB_TH_CXX) $(TEST) $(TEST_FC) ++- rm -f $(LIB_TH_SL) $(LIB_CXX_SL) $(LIB_TH_CXX_SL) $(LIB_SL) +++ rm -f $(TEST) $(TEST_FC) ++ rm -f $(UTIL) dmalloc.h +++ rm -f lib$(MODULE)*.* ++ ++ realclean : clean ++ ++@@ -181,43 +185,43 @@ installincs : $(HFLS) ++ $(INSTALL_DATA) $(HFLS) $(includedir) ++ ++ installthsl : $(LIB_TH_SL) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) +++ $(srcdir)/mkinstalldirs $(shlibdir) +++ $(INSTALL) $(LIB_TH_SL) $(shlibdir) ++ ++ installth : $(INSTALL_THREADS) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) +++ $(INSTALL) $(LIB_TH) $(libdir) ++ @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" ++ ++ installthcxxsl : $(LIB_TH_CXX_SL) ++ $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) +++ $(INSTALL) $(LIB_TH_CXX_SL) $(shlibdir) ++ ++ installthcxx : $(INSTALL_TH_CXX) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) +++ $(INSTALL) $(LIB_TH_CXX) $(libdir) ++ @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" ++ ++ installcxxsl : $(LIB_CXX_SL) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) +++ $(srcdir)/mkinstalldirs $(shlibdir) +++ $(INSTALL) $(LIB_CXX_SL) $(shlibdir) ++ ++ installcxx : $(INSTALL_CXX) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) +++ $(INSTALL) $(LIB_CXX) $(libdir) ++ @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ ++ installsl : $(LIB_SL) ++ $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) +++ $(INSTALL) $(LIB_SL) $(shlibdir) ++ @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" ++ ++ installlib : $(INSTALL_LIB) ++ $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) +++ $(INSTALL) $(LIBRARY) $(libdir) ++ @RANLIB@ $(libdir)/$(LIBRARY) ++ @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" ++ @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" ++@@ -255,10 +259,8 @@ shlib : $(BUILD_SL) ++ # NOTE: you may have to edit the configure.ac script to get this to ++ # work on your operating system. Please send feedback to the author ++ # via: http://256.com/gray/email.html ++-$(LIB_SL) : $(LIBRARY) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) ++- mv $@.t $@ +++$(LIB_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmalloc.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) ++ ++ $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) ++ ar cr $@ $? ++@@ -268,32 +270,26 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) ++ ar cr $@ $? ++ @RANLIB@ $@ ++ ++-$(LIB_TH_SL) : $(LIB_TH) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) ++- mv $@.t $@ +++$(LIB_TH_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmallocth.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) ++ ++ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++ ar cr $@ $? ++ @RANLIB@ $@ ++ ++-$(LIB_CXX_SL) : $(LIB_CXX) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++- mv $@.t $@ +++$(LIB_CXX_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmalloccxx.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL) ++ ++ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++ ar cr $@ $? ++ @RANLIB@ $@ ++ ++-$(LIB_TH_CXX_SL) : $(LIB_TH_CXX) ++- rm -f $@ $@.t ++- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++- mv $@.t $@ +++$(LIB_TH_CXX_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) +++ $(CC) -shared -Wl,-soname,libdmallocthcxx.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL) ++ ++-threadssl : $(LIB_TH_SL) +++threadssl : $(LIB_TH_SL)$(ver) ++ ++-threadscxxsl : $(LIB_TH_CXX_SL) +++threadscxxsl : $(LIB_TH_CXX_SL)$(ver) ++ ++ threadscxx : $(BUILD_TH_CXX) ++ @SL_OFF@ @echo "Enter 'make threadscxxsl' to build the threaded C++ shared-library" ++@@ -302,7 +298,7 @@ threads : $(BUILD_THREADS) ++ @CXX_OFF@ @echo "Enter 'make threadscxx' to build the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make threadssl' to build the threaded shared library" ++ ++-cxxsl : $(LIB_CXX_SL) +++cxxsl : $(LIB_CXX_SL)$(ver) ++ ++ cxx : $(BUILD_CXX) ++ @SL_OFF@ @echo "Enter 'make cxxsl' to build the cxx shared library" ++@@ -371,6 +367,11 @@ dmallocc.o : $(srcdir)/dmallocc.cc ++ $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ ++ -o ./$@ ++ +++dmallocc_sl.o : $(srcdir)/dmallocc.cc +++ rm -f $@ +++ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ +++ -o ./$@ +++ ++ # ++ # auto configure settings - uncomment if you are doing configure ++ # development on the library ++@@ -395,38 +396,109 @@ dmallocc.o : $(srcdir)/dmallocc.cc ++ ++ arg_check.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ ++ dmalloc_loc.h error.h arg_check.h +++arg_check_sl.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \ +++ dmalloc_loc.h error.h arg_check.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ chunk.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ ++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ ++ error_val.h heap.h +++chunk_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ +++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ +++ error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h +++compat_sl.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ ++ debug_tok.h dmalloc_loc.h env.h error_val.h version.h +++dmalloc_sl.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ +++ debug_tok.h dmalloc_loc.h env.h error_val.h version.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ ++ dmalloc_argv_loc.h compat.h +++dmalloc_argv_sl.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ +++ dmalloc_argv_loc.h compat.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ ++ dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h +++dmalloc_fc_t_sl.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ +++ dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_rand.o: dmalloc_rand.c dmalloc_rand.h +++dmalloc_rand_sl.o: dmalloc_rand.c dmalloc_rand.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_t.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ ++ dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ ++ error_val.h heap.h +++dmalloc_t_sl.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \ +++ dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \ +++ error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ dmalloc_tab.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ ++ dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h +++dmalloc_tab_sl.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \ +++ dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ env.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ ++ debug_tok.h env.h error.h +++env_sl.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \ +++ debug_tok.h env.h error.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ error.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ ++ dmalloc_loc.h env.h error.h error_val.h version.h +++error_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ +++ dmalloc_loc.h env.h error.h error_val.h version.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ heap.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ ++ dmalloc_loc.h error.h error_val.h heap.h +++heap_sl.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ +++ dmalloc_loc.h error.h error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ malloc.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ ++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ ++ malloc_funcs.h return.h +++malloc_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ +++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ +++ malloc_funcs.h return.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ protect.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ ++ heap.h protect.h +++protect_sl.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \ +++ heap.h protect.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ chunk_th.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ ++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ ++ error_val.h heap.h +++chunk_th_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \ +++ dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \ +++ error_val.h heap.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ error_th.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ ++ dmalloc_loc.h env.h error.h error_val.h version.h +++error_th_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \ +++ dmalloc_loc.h env.h error.h error_val.h version.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ ++ malloc_th.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ ++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ ++ malloc_funcs.h return.h +++malloc_th_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \ +++ debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \ +++ malloc_funcs.h return.h +++ rm -f $@ +++ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ +diff --git a/feeds/packages/devel/dmalloc/patches/130-makefile_destdir.patch b/feeds/packages/devel/dmalloc/patches/130-makefile_destdir.patch +new file mode 100644 +index 0000000..88a2da9 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/130-makefile_destdir.patch +@@ -0,0 +1,97 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -178,66 +178,66 @@ distclean : clean ++ # rm -f configure ++ ++ installdirs : ++- $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) ++ ++ installincs : $(HFLS) ++- $(srcdir)/mkinstalldirs $(includedir) ++- $(INSTALL_DATA) $(HFLS) $(includedir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) +++ $(INSTALL_DATA) $(HFLS) $(DESTDIR)$(includedir) ++ ++ installthsl : $(LIB_TH_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_TH_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_TH_SL) $(DESTDIR)$(shlibdir) ++ ++ installth : $(INSTALL_THREADS) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIB_TH) $(libdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIB_TH) $(DESTDIR)$(libdir) ++ @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" ++ ++ installthcxxsl : $(LIB_TH_CXX_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_TH_CXX_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_TH_CXX_SL) $(DESTDIR)$(shlibdir) ++ ++ installthcxx : $(INSTALL_TH_CXX) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIB_TH_CXX) $(libdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIB_TH_CXX) $(DESTDIR)$(libdir) ++ @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" ++ ++ installcxxsl : $(LIB_CXX_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_CXX_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_CXX_SL) $(DESTDIR)$(shlibdir) ++ ++ installcxx : $(INSTALL_CXX) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIB_CXX) $(libdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIB_CXX) $(DESTDIR)$(libdir) ++ @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" ++ @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ ++ installsl : $(LIB_SL) ++- $(srcdir)/mkinstalldirs $(shlibdir) ++- $(INSTALL) $(LIB_SL) $(shlibdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir) +++ $(INSTALL) $(LIB_SL) $(DESTDIR)$(shlibdir) ++ @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" ++ @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" ++ ++ installlib : $(INSTALL_LIB) ++- $(srcdir)/mkinstalldirs $(libdir) ++- $(INSTALL) $(LIBRARY) $(libdir) ++- @RANLIB@ $(libdir)/$(LIBRARY) ++-@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) +++ $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) +++ @RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY) +++@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(DESTDIR)$(shlibdir)" ++ @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" ++ @TH_OFF@ @echo "Enter 'make installth' to install thread library" ++ ++ installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \ ++ $(srcdir)/docs/$(PDFFILE) ++- $(srcdir)/mkinstalldirs $(docdir) ++- $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir) ++- $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir) ++- $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir) +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) +++ $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir) +++ $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir) +++ $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)$(docdir) ++ ++ install : installincs installlib $(UTIL) ++- $(srcdir)/mkinstalldirs $(bindir) ++- $(INSTALL_PROGRAM) $(UTIL) $(bindir) ++- @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" +++ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) +++ $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir) +++ @echo "Enter 'make installdocs' to install $(DOCFILES) in $(DESTDIR)$(docdir)" ++ ++ dmalloc.h.2 : $(srcdir)/configure ++ $(SHELL) $(srcdir)/configure +diff --git a/feeds/packages/devel/dmalloc/patches/200-fix_return_address.patch b/feeds/packages/devel/dmalloc/patches/200-fix_return_address.patch +new file mode 100644 +index 0000000..0fb35e4 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/200-fix_return_address.patch +@@ -0,0 +1,45 @@ ++--- a/configure +++++ b/configure ++@@ -7120,7 +7120,7 @@ echo "$as_me:$LINENO: checking return.h ++ echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 ++ if test "$cross_compiling" = yes; then ++ cat >>confdefs.h <<\_ACEOF ++-#define RETURN_MACROS_WORK 0 +++#define RETURN_MACROS_WORK 1 ++ _ACEOF ++ echo "$as_me:$LINENO: result: no" >&5 ++ echo "${ECHO_T}no" >&6 ++--- a/return.h +++++ b/return.h ++@@ -106,25 +106,19 @@ ++ /*************************************/ ++ ++ /* ++- * For DEC Mips machines running Ultrix +++ * For Mips machines running Linux ++ */ ++ #if __mips ++ ++ /* ++- * I have no idea how to get inline assembly with the default cc. ++- * Anyone know how? ++- */ ++- ++-#if 0 ++- ++-/* ++ * NOTE: we assume here that file is global. ++ * ++- * $31 is the frame pointer. $2 looks to be the return address but maybe ++- * not consistently. +++ * $31 is the return address. ++ */ ++-#define GET_RET_ADDR(file) asm("sw $2, file") ++- +++#if (_MIPS_SZLONG == 32) +++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) +++#else +++#define GET_RET_ADDR(file) asm("sd $31, %0" : "=m" (file)) ++ #endif ++ ++ #endif /* __mips */ +diff --git a/feeds/packages/devel/dmalloc/patches/210-fix_threads.patch b/feeds/packages/devel/dmalloc/patches/210-fix_threads.patch +new file mode 100644 +index 0000000..c3cbd90 +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/210-fix_threads.patch +@@ -0,0 +1,11 @@ ++--- a/settings.dist +++++ b/settings.dist ++@@ -409,7 +409,7 @@ ++ */ ++ ++ #ifndef LOCK_THREADS ++-#define LOCK_THREADS 0 +++#define LOCK_THREADS 1 ++ #endif ++ ++ #if LOCK_THREADS +diff --git a/feeds/packages/devel/dmalloc/patches/300-fix_summarize_script.patch b/feeds/packages/devel/dmalloc/patches/300-fix_summarize_script.patch +new file mode 100644 +index 0000000..d50106d +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/300-fix_summarize_script.patch +@@ -0,0 +1,8 @@ ++--- a/contrib/dmalloc_summarize.pl +++++ b/contrib/dmalloc_summarize.pl ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/perl5 -w +++#!/usr/bin/perl -w ++ # ++ # dmalloc_summarize -- summarizes dmalloc log files ++ # +diff --git a/feeds/packages/devel/dmalloc/patches/400-undef-strndup.patch b/feeds/packages/devel/dmalloc/patches/400-undef-strndup.patch +new file mode 100644 +index 0000000..e7141ed +--- /dev/null ++++ b/feeds/packages/devel/dmalloc/patches/400-undef-strndup.patch +@@ -0,0 +1,10 @@ ++--- dmalloc-5.5.2/dmalloc.h.3 2012-04-11 22:59:21.624323311 +0200 +++++ dmalloc-5.5.2.mod/dmalloc.h.3 2012-04-11 23:00:53.612325497 +0200 ++@@ -405,6 +405,7 @@ ++ * ++ * string -> String we are duplicating. ++ */ +++#undef strdup ++ extern ++ char *strdup(const char *string); ++ #endif /* ifndef DMALLOC_STRDUP_MACRO */ +diff --git a/feeds/packages/devel/electric-fence/.svn/entries b/feeds/packages/devel/electric-fence/.svn/entries +new file mode 100644 +index 0000000..8610a22 +--- /dev/null ++++ b/feeds/packages/devel/electric-fence/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/electric-fence ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-28T22:24:20.339104Z ++31505 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a9be79bed9f359488de666b8cf0f400e ++2012-04-28T22:24:20.339104Z ++31505 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1739 ++ +diff --git a/feeds/packages/devel/electric-fence/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/electric-fence/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1153350 +--- /dev/null ++++ b/feeds/packages/devel/electric-fence/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:= electric-fence ++PKG_VERSION:=2.1.13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)-0.1.tar.gz ++PKG_SOURCE_URL:=http://perens.com/FreeSoftware/ElectricFence ++PKG_MD5SUM:=59e4e7817a30aff52d8971ce00e1ad35 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/electric-fence ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=electric-fence ++ URL:=http://perens.com/FreeSoftware/ElectricFence/ ++ DEPENDS:=@USE_EGLIBC ++ MAINTAINER:=Mirko Vogt ++endef ++ ++TARGET_CFLAGS += -fPIC ++TARGET_LDFLAGS += -lpthread ++ ++define Build/Compile ++ rm -f $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/libefence.a ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/efence.c -o $(PKG_BUILD_DIR)/efence.o ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/page.c -o $(PKG_BUILD_DIR)/page.o ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/print.c -o $(PKG_BUILD_DIR)/print.o ++ $(TARGET_CC) -shared $(TARGET_LDFLAGS) -o $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o ++ $(AR) crv $(LD_FLAGS) $(PKG_BUILD_DIR)/libefence.a $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) \ ++ $(1)/usr/lib ++ ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/libefence.so \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/libefence.a \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/electric-fence/install ++ $(INSTALL_DIR) \ ++ $(1)/usr/lib ++ ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/libefence.so \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,electric-fence)) +diff --git a/feeds/packages/devel/electric-fence/Makefile b/feeds/packages/devel/electric-fence/Makefile +new file mode 100644 +index 0000000..1153350 +--- /dev/null ++++ b/feeds/packages/devel/electric-fence/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:= electric-fence ++PKG_VERSION:=2.1.13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)-0.1.tar.gz ++PKG_SOURCE_URL:=http://perens.com/FreeSoftware/ElectricFence ++PKG_MD5SUM:=59e4e7817a30aff52d8971ce00e1ad35 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/electric-fence ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=electric-fence ++ URL:=http://perens.com/FreeSoftware/ElectricFence/ ++ DEPENDS:=@USE_EGLIBC ++ MAINTAINER:=Mirko Vogt ++endef ++ ++TARGET_CFLAGS += -fPIC ++TARGET_LDFLAGS += -lpthread ++ ++define Build/Compile ++ rm -f $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/libefence.a ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/efence.c -o $(PKG_BUILD_DIR)/efence.o ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/page.c -o $(PKG_BUILD_DIR)/page.o ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/print.c -o $(PKG_BUILD_DIR)/print.o ++ $(TARGET_CC) -shared $(TARGET_LDFLAGS) -o $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o ++ $(AR) crv $(LD_FLAGS) $(PKG_BUILD_DIR)/libefence.a $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) \ ++ $(1)/usr/lib ++ ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/libefence.so \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/libefence.a \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/electric-fence/install ++ $(INSTALL_DIR) \ ++ $(1)/usr/lib ++ ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/libefence.so \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,electric-fence)) +diff --git a/feeds/packages/devel/gcc/.svn/entries b/feeds/packages/devel/gcc/.svn/entries +new file mode 100644 +index 0000000..b97817d +--- /dev/null ++++ b/feeds/packages/devel/gcc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/gcc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-09-25T15:53:19.818990Z ++12703 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a86773503d26705dff59b7c135bc6920 ++2008-09-25T15:53:19.818990Z ++12703 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2872 ++ +diff --git a/feeds/packages/devel/gcc/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/gcc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..90ef1d9 +--- /dev/null ++++ b/feeds/packages/devel/gcc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,90 @@ ++# ++# 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:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#")) ++PKG_RELEASE:=1 ++PATCH_DIR=$(TOPDIR)/toolchain/gcc/patches/$(PKG_VERSION) ++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:=354853e0b2da90c527e35aabb8d6f1e6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++SEP:=, ++TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)" ++EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc) ++ ++define Package/gcc ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=gcc ++ DEPENDS:=@TARGET_x86 @NO_STRIP ++endef ++ ++define Package/gcc/description ++ build a native toolchain for compiling on target ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c ++ $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1\2,' $(PKG_BUILD_DIR)/gcc/version.c ++ (cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;); ++ $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(PKG_BUILD_DIR)/libstdc++-v3/configure ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); rm -f config.cache; \ ++ SHELL="$(BASH)" \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ $(PKG_BUILD_DIR)/configure \ ++ $(TARGET_CONFIGURE_ARGS) \ ++ --build=$(GNU_HOST_NAME) \ ++ --host=$(REAL_GNU_TARGET_NAME) \ ++ --target=$(REAL_GNU_TARGET_NAME) \ ++ --enable-languages=$(TARGET_LANGUAGES) \ ++ --enable-shared \ ++ --disable-__cxa_atexit \ ++ --enable-target-optspace \ ++ --with-gnu-ld \ ++ --disable-nls \ ++ --disable-libmudflap \ ++ --disable-multilib \ ++ $(EXTRA_TARGET) \ ++ $(SOFT_FLOAT_CONFIG_OPTION) \ ++ $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ ++ ); ++endef ++ ++define Build/Compile ++ export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install ++ # Set up the symlinks to enable lying about target name. ++ set -e; \ ++ (cd $(TOOLCHAIN_DIR); \ ++ ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ ++ cd bin; \ ++ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ ++ ln -sf $$$${app} \ ++ $(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \ ++ done; \ ++ ); ++endef ++ ++define Package/gcc/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ cp -r $(PKG_INSTALL_DIR)/* $(1) ++ cp -r $(TOOLCHAIN_DIR)/include $(1)/usr/ ++ cp $(TOOLCHAIN_DIR)/lib/crt* $(1)/usr/lib/ ++ cp $(TOOLCHAIN_DIR)/lib/libc.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,gcc)) +diff --git a/feeds/packages/devel/gcc/Makefile b/feeds/packages/devel/gcc/Makefile +new file mode 100644 +index 0000000..90ef1d9 +--- /dev/null ++++ b/feeds/packages/devel/gcc/Makefile +@@ -0,0 +1,90 @@ ++# ++# 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:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#")) ++PKG_RELEASE:=1 ++PATCH_DIR=$(TOPDIR)/toolchain/gcc/patches/$(PKG_VERSION) ++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:=354853e0b2da90c527e35aabb8d6f1e6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++SEP:=, ++TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)" ++EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc) ++ ++define Package/gcc ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=gcc ++ DEPENDS:=@TARGET_x86 @NO_STRIP ++endef ++ ++define Package/gcc/description ++ build a native toolchain for compiling on target ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c ++ $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1\2,' $(PKG_BUILD_DIR)/gcc/version.c ++ (cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;); ++ $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(PKG_BUILD_DIR)/libstdc++-v3/configure ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); rm -f config.cache; \ ++ SHELL="$(BASH)" \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ $(PKG_BUILD_DIR)/configure \ ++ $(TARGET_CONFIGURE_ARGS) \ ++ --build=$(GNU_HOST_NAME) \ ++ --host=$(REAL_GNU_TARGET_NAME) \ ++ --target=$(REAL_GNU_TARGET_NAME) \ ++ --enable-languages=$(TARGET_LANGUAGES) \ ++ --enable-shared \ ++ --disable-__cxa_atexit \ ++ --enable-target-optspace \ ++ --with-gnu-ld \ ++ --disable-nls \ ++ --disable-libmudflap \ ++ --disable-multilib \ ++ $(EXTRA_TARGET) \ ++ $(SOFT_FLOAT_CONFIG_OPTION) \ ++ $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ ++ ); ++endef ++ ++define Build/Compile ++ export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install ++ # Set up the symlinks to enable lying about target name. ++ set -e; \ ++ (cd $(TOOLCHAIN_DIR); \ ++ ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ ++ cd bin; \ ++ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ ++ ln -sf $$$${app} \ ++ $(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \ ++ done; \ ++ ); ++endef ++ ++define Package/gcc/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ cp -r $(PKG_INSTALL_DIR)/* $(1) ++ cp -r $(TOOLCHAIN_DIR)/include $(1)/usr/ ++ cp $(TOOLCHAIN_DIR)/lib/crt* $(1)/usr/lib/ ++ cp $(TOOLCHAIN_DIR)/lib/libc.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,gcc)) +diff --git a/feeds/packages/devel/ksymoops/.svn/entries b/feeds/packages/devel/ksymoops/.svn/entries +new file mode 100644 +index 0000000..76141c4 +--- /dev/null ++++ b/feeds/packages/devel/ksymoops/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/ksymoops ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T22:46:37.156909Z ++32229 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++c2f0f95b1880204cd5eedc95a923a4de ++2012-06-11T22:46:37.156909Z ++32229 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1364 ++ +diff --git a/feeds/packages/devel/ksymoops/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/ksymoops/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..af09a4f +--- /dev/null ++++ b/feeds/packages/devel/ksymoops/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=ksymoops ++PKG_VERSION:=2.4.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/ksymoops/v2.4/ ++PKG_MD5SUM:=4a8249e182a5dbc75e566d162e9f3314 ++ ++PKG_BUILD_DEPENDS:=binutils ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ksymoops ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@mips||mipsel||m68k||i386 +zlib ++ TITLE:=Interpret oops of the kernel ++ URL:=http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/ ++ MENU:=1 ++endef ++ ++define Package/kexec-tools/description ++endef ++ ++define Build/Configure ++endef ++ ++TARGET=$(strip $(shell echo $(TARGET_CFLAGS) | cut -d- -f4 | cut -d= -f2)) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ BFD_PREFIX="$(STAGING_DIR)/usr" \ ++ DEF_TARGET='\"$(TARGET)\"' \ ++ DEF_ARCH='\"$(ARCH)\"' \ ++ DEF_MAP='\"$(LINUX_DIR)/System.map\"' \ ++ CROSS="$(TARGET_CROSS)" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ LDFLAGS="-lz" \ ++ all install ++endef ++ ++define Package/ksymoops/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(TARGET_CROSS)ksymoops $(1)/bin/ksymoops ++endef ++ ++$(eval $(call BuildPackage,ksymoops)) +diff --git a/feeds/packages/devel/ksymoops/Makefile b/feeds/packages/devel/ksymoops/Makefile +new file mode 100644 +index 0000000..af09a4f +--- /dev/null ++++ b/feeds/packages/devel/ksymoops/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=ksymoops ++PKG_VERSION:=2.4.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/ksymoops/v2.4/ ++PKG_MD5SUM:=4a8249e182a5dbc75e566d162e9f3314 ++ ++PKG_BUILD_DEPENDS:=binutils ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ksymoops ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@mips||mipsel||m68k||i386 +zlib ++ TITLE:=Interpret oops of the kernel ++ URL:=http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/ ++ MENU:=1 ++endef ++ ++define Package/kexec-tools/description ++endef ++ ++define Build/Configure ++endef ++ ++TARGET=$(strip $(shell echo $(TARGET_CFLAGS) | cut -d- -f4 | cut -d= -f2)) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ BFD_PREFIX="$(STAGING_DIR)/usr" \ ++ DEF_TARGET='\"$(TARGET)\"' \ ++ DEF_ARCH='\"$(ARCH)\"' \ ++ DEF_MAP='\"$(LINUX_DIR)/System.map\"' \ ++ CROSS="$(TARGET_CROSS)" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ LDFLAGS="-lz" \ ++ all install ++endef ++ ++define Package/ksymoops/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(TARGET_CROSS)ksymoops $(1)/bin/ksymoops ++endef ++ ++$(eval $(call BuildPackage,ksymoops)) +diff --git a/feeds/packages/devel/lttng-tools/.svn/entries b/feeds/packages/devel/lttng-tools/.svn/entries +new file mode 100644 +index 0000000..4022345 +--- /dev/null ++++ b/feeds/packages/devel/lttng-tools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/lttng-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T10:15:44.063268Z ++35165 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++815e5d4f34b0f7026adbebc77b361d9d ++2013-01-15T10:15:44.063268Z ++35165 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1019 ++ +diff --git a/feeds/packages/devel/lttng-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/lttng-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7b4ed02 +--- /dev/null ++++ b/feeds/packages/devel/lttng-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=lttng-tools ++PKG_VERSION:=2.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME) ++PKG_MD5SUM:= ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lttng-tools ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:=+lttng-ust +libpopt ++ TITLE:=LTTng tracing tools ++ URL:=https://lttng.org/ ++endef ++ ++TARGET_LDFLAGS += -lurcu-bp ++ ++define Package/lttng-tools/description ++ LTTng Userspace Tracing Library ++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/feeds/packages/devel/lttng-tools/Makefile b/feeds/packages/devel/lttng-tools/Makefile +new file mode 100644 +index 0000000..7b4ed02 +--- /dev/null ++++ b/feeds/packages/devel/lttng-tools/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=lttng-tools ++PKG_VERSION:=2.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME) ++PKG_MD5SUM:= ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lttng-tools ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:=+lttng-ust +libpopt ++ TITLE:=LTTng tracing tools ++ URL:=https://lttng.org/ ++endef ++ ++TARGET_LDFLAGS += -lurcu-bp ++ ++define Package/lttng-tools/description ++ LTTng Userspace Tracing Library ++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/feeds/packages/devel/lttng-tools/patches/.svn/entries b/feeds/packages/devel/lttng-tools/patches/.svn/entries +new file mode 100644 +index 0000000..594adb5 +--- /dev/null ++++ b/feeds/packages/devel/lttng-tools/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/lttng-tools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T10:15:44.063268Z ++35165 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-uclibc_sync_file_ranges.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++24504185a002ec31854576a5a2d2b824 ++2013-01-15T10:15:44.063268Z ++35165 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1375 ++ +diff --git a/feeds/packages/devel/lttng-tools/patches/.svn/text-base/001-uclibc_sync_file_ranges.patch.svn-base b/feeds/packages/devel/lttng-tools/patches/.svn/text-base/001-uclibc_sync_file_ranges.patch.svn-base +new file mode 100644 +index 0000000..fcaaa3e +--- /dev/null ++++ b/feeds/packages/devel/lttng-tools/patches/.svn/text-base/001-uclibc_sync_file_ranges.patch.svn-base +@@ -0,0 +1,51 @@ ++Make sync_file_range() usage optional ++ ++Under uClibc, sync_file_range() is not available under all ++architectures, so we fall back to fdatasync() in this case. ++ ++Inspired by the patch done by Thomas Petazzoni for the ++2.0-pre25 version. ++ ++Signed-off-by: Samuel Martin ++--- ++ configure.ac | 2 +- ++ src/common/compat/fcntl.h | 5 +++++ ++ 2 files changed, 6 insertions(+), 1 deletion(-) ++ ++diff --git a/configure.ac b/configure.ac ++index 5808c79..065b9cf 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ ++ ) ++ ]) ++ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes]) ++-AC_CHECK_FUNCS([sched_getcpu sysconf]) +++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) ++ ++ # check for dlopen ++ AC_CHECK_LIB([dl], [dlopen], ++@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[ ++ ]) ++ ++ AS_ECHO() ++- ++diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c ++index 5a1c757..7ff63a3 100644 ++--- a/src/common/compat/compat-fcntl.c +++++ b/src/common/compat/compat-fcntl.c ++@@ -23,7 +23,11 @@ ++ int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, ++ unsigned int flags) ++ { +++#ifdef HAVE_SYNC_FILE_RANGE ++ return sync_file_range(fd, offset, nbytes, flags); +++#else +++ return fdatasync(fd); +++#endif ++ } ++ ++ #endif /* __linux__ */ ++-- ++1.8.0.3 ++ +diff --git a/feeds/packages/devel/lttng-tools/patches/001-uclibc_sync_file_ranges.patch b/feeds/packages/devel/lttng-tools/patches/001-uclibc_sync_file_ranges.patch +new file mode 100644 +index 0000000..fcaaa3e +--- /dev/null ++++ b/feeds/packages/devel/lttng-tools/patches/001-uclibc_sync_file_ranges.patch +@@ -0,0 +1,51 @@ ++Make sync_file_range() usage optional ++ ++Under uClibc, sync_file_range() is not available under all ++architectures, so we fall back to fdatasync() in this case. ++ ++Inspired by the patch done by Thomas Petazzoni for the ++2.0-pre25 version. ++ ++Signed-off-by: Samuel Martin ++--- ++ configure.ac | 2 +- ++ src/common/compat/fcntl.h | 5 +++++ ++ 2 files changed, 6 insertions(+), 1 deletion(-) ++ ++diff --git a/configure.ac b/configure.ac ++index 5808c79..065b9cf 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ ++ ) ++ ]) ++ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes]) ++-AC_CHECK_FUNCS([sched_getcpu sysconf]) +++AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) ++ ++ # check for dlopen ++ AC_CHECK_LIB([dl], [dlopen], ++@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],[ ++ ]) ++ ++ AS_ECHO() ++- ++diff --git a/src/common/compat/compat-fcntl.c b/src/common/compat/compat-fcntl.c ++index 5a1c757..7ff63a3 100644 ++--- a/src/common/compat/compat-fcntl.c +++++ b/src/common/compat/compat-fcntl.c ++@@ -23,7 +23,11 @@ ++ int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, ++ unsigned int flags) ++ { +++#ifdef HAVE_SYNC_FILE_RANGE ++ return sync_file_range(fd, offset, nbytes, flags); +++#else +++ return fdatasync(fd); +++#endif ++ } ++ ++ #endif /* __linux__ */ ++-- ++1.8.0.3 ++ +diff --git a/feeds/packages/devel/make/.svn/entries b/feeds/packages/devel/make/.svn/entries +new file mode 100644 +index 0000000..77d737d +--- /dev/null ++++ b/feeds/packages/devel/make/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/make ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-28T09:42:41.962281Z ++34905 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++39b7b8a8c2ae5a78fd1872b56fe2d544 ++2012-12-28T09:42:41.962281Z ++34905 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++826 ++ +diff --git a/feeds/packages/devel/make/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/make/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ab18ca +--- /dev/null ++++ b/feeds/packages/devel/make/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=make ++PKG_VERSION:=3.81 ++PKG_RELEASE:=1 ++PKG_SOURCE_URL:=@GNU/make ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=354853e0b2da90c527e35aabb8d6f1e6 ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/make ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:=+libelf1 ++ TITLE:=make ++ URL:=http://www.gnu.org/software/make/ ++endef ++ ++define Package/make/description ++ The Make package contains a program for compiling packages ++endef ++ ++define Package/make/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/make $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,make)) +diff --git a/feeds/packages/devel/make/Makefile b/feeds/packages/devel/make/Makefile +new file mode 100644 +index 0000000..8ab18ca +--- /dev/null ++++ b/feeds/packages/devel/make/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=make ++PKG_VERSION:=3.81 ++PKG_RELEASE:=1 ++PKG_SOURCE_URL:=@GNU/make ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=354853e0b2da90c527e35aabb8d6f1e6 ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/make ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:=+libelf1 ++ TITLE:=make ++ URL:=http://www.gnu.org/software/make/ ++endef ++ ++define Package/make/description ++ The Make package contains a program for compiling packages ++endef ++ ++define Package/make/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/make $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,make)) +diff --git a/feeds/packages/devel/patch/.svn/entries b/feeds/packages/devel/patch/.svn/entries +new file mode 100644 +index 0000000..e5845b3 +--- /dev/null ++++ b/feeds/packages/devel/patch/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/patch ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-05T20:12:49.211743Z ++17929 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++5be6316d273aea7c2b5a5e7e420f941e ++2009-10-05T20:12:49.211743Z ++17929 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++942 ++ +diff --git a/feeds/packages/devel/patch/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/patch/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fa3f14a +--- /dev/null ++++ b/feeds/packages/devel/patch/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2008-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:=patch ++PKG_VERSION:=2.5.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/patch ++PKG_MD5SUM:=dacfb618082f8d3a2194601193cf8716 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/patch ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=patch ++ URL:=http://www.gnu.org/ ++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 ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ exec_prefix="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/patch/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/bin/patch $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,patch)) +diff --git a/feeds/packages/devel/patch/Makefile b/feeds/packages/devel/patch/Makefile +new file mode 100644 +index 0000000..fa3f14a +--- /dev/null ++++ b/feeds/packages/devel/patch/Makefile +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2008-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:=patch ++PKG_VERSION:=2.5.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/patch ++PKG_MD5SUM:=dacfb618082f8d3a2194601193cf8716 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/patch ++ SECTION:=devel ++ CATEGORY:=Development ++ TITLE:=patch ++ URL:=http://www.gnu.org/ ++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 ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ exec_prefix="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/patch/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/bin/patch $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,patch)) +diff --git a/feeds/packages/devel/patch/patches/.svn/entries b/feeds/packages/devel/patch/patches/.svn/entries +new file mode 100644 +index 0000000..7a5a571 +--- /dev/null ++++ b/feeds/packages/devel/patch/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/patch/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-06-11T08:14:28.385246Z ++11430 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-install.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++9b5b1648c206aaa79e5afb7bd9e4b786 ++2008-06-11T08:14:28.385246Z ++11430 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++537 ++ +diff --git a/feeds/packages/devel/patch/patches/.svn/text-base/100-install.patch.svn-base b/feeds/packages/devel/patch/patches/.svn/text-base/100-install.patch.svn-base +new file mode 100644 +index 0000000..8d34ba6 +--- /dev/null ++++ b/feeds/packages/devel/patch/patches/.svn/text-base/100-install.patch.svn-base +@@ -0,0 +1,18 @@ ++diff -urN patch-2.5.4.orig/Makefile.in patch-2.5.4/Makefile.in ++--- patch-2.5.4.orig/Makefile.in 2008-06-11 10:08:08.000000000 +0200 +++++ patch-2.5.4/Makefile.in 2008-06-11 10:08:26.000000000 +0200 ++@@ -42,12 +42,12 @@ ++ VERSION = @VERSION@ ++ ++ prefix = @prefix@ ++-exec_prefix = @exec_prefix@ +++exec_prefix += @exec_prefix@ ++ ++ bindir = $(exec_prefix)/bin ++ ++ # Where to put the manual pages. ++-mandir = @mandir@ +++mandir = $(exec_prefix)/@mandir@ ++ man1dir = $(mandir)/man1 ++ # Extension (including `.') for the manual page filenames. ++ man1ext = .1 +diff --git a/feeds/packages/devel/patch/patches/100-install.patch b/feeds/packages/devel/patch/patches/100-install.patch +new file mode 100644 +index 0000000..8d34ba6 +--- /dev/null ++++ b/feeds/packages/devel/patch/patches/100-install.patch +@@ -0,0 +1,18 @@ ++diff -urN patch-2.5.4.orig/Makefile.in patch-2.5.4/Makefile.in ++--- patch-2.5.4.orig/Makefile.in 2008-06-11 10:08:08.000000000 +0200 +++++ patch-2.5.4/Makefile.in 2008-06-11 10:08:26.000000000 +0200 ++@@ -42,12 +42,12 @@ ++ VERSION = @VERSION@ ++ ++ prefix = @prefix@ ++-exec_prefix = @exec_prefix@ +++exec_prefix += @exec_prefix@ ++ ++ bindir = $(exec_prefix)/bin ++ ++ # Where to put the manual pages. ++-mandir = @mandir@ +++mandir = $(exec_prefix)/@mandir@ ++ man1dir = $(mandir)/man1 ++ # Extension (including `.') for the manual page filenames. ++ man1ext = .1 +diff --git a/feeds/packages/devel/perf/.svn/entries b/feeds/packages/devel/perf/.svn/entries +new file mode 100644 +index 0000000..68fea87 +--- /dev/null ++++ b/feeds/packages/devel/perf/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/devel/perf ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T16:34:36.691428Z ++35235 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d764eb9c264d28cce2dc74ebf8dd3ecc ++2013-01-18T16:34:36.691428Z ++35235 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1498 ++ +diff --git a/feeds/packages/devel/perf/.svn/text-base/Makefile.svn-base b/feeds/packages/devel/perf/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c4dad1f +--- /dev/null ++++ b/feeds/packages/devel/perf/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# Copyright (C) 2011-2013 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:=perf ++PKG_VERSION:=$(LINUX_VERSION) ++PKG_RELEASE:=2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/perf ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:= +libelf1 +libdw +libpthread +librt +binutils ++ TITLE:=Linux performance monitoring tool ++ VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) ++ URL:=http://www.kernel.org ++endef ++ ++define Package/perf/description ++ perf is the Linux performance monitoring tool ++endef ++ ++# Perf's makefile and headers are not relocatable and must be built from the ++# Linux sources directory ++define Build/Prepare ++ $(RM) -r $(PKG_BUILD_DIR) ++ ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR) ++endef ++ ++# MAKE_FLAGS should be passed again upon cleaning because Perf's makefile ++# always performs checks before processing any rule ++define Build/Clean ++ -$(MAKE) -C $(PKG_BUILD_DIR) \ ++ NO_DWARF=1 \ ++ $(MAKE_FLAGS) \ ++ clean ++endef ++ ++MAKE_FLAGS = \ ++ ARCH="$(LINUX_KARCH)" \ ++ NO_LIBPERL=1 \ ++ NO_LIBPYTHON=1 \ ++ NO_NEWT=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ CC="$(TARGET_CC)" \ ++ LD="$(TARGET_CROSS)ld" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ V=1 \ ++ prefix=/usr ++ ++define Package/perf/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,perf)) +diff --git a/feeds/packages/devel/perf/Makefile b/feeds/packages/devel/perf/Makefile +new file mode 100644 +index 0000000..c4dad1f +--- /dev/null ++++ b/feeds/packages/devel/perf/Makefile +@@ -0,0 +1,64 @@ ++# ++# Copyright (C) 2011-2013 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:=perf ++PKG_VERSION:=$(LINUX_VERSION) ++PKG_RELEASE:=2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/perf ++ SECTION:=devel ++ CATEGORY:=Development ++ DEPENDS:= +libelf1 +libdw +libpthread +librt +binutils ++ TITLE:=Linux performance monitoring tool ++ VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) ++ URL:=http://www.kernel.org ++endef ++ ++define Package/perf/description ++ perf is the Linux performance monitoring tool ++endef ++ ++# Perf's makefile and headers are not relocatable and must be built from the ++# Linux sources directory ++define Build/Prepare ++ $(RM) -r $(PKG_BUILD_DIR) ++ ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR) ++endef ++ ++# MAKE_FLAGS should be passed again upon cleaning because Perf's makefile ++# always performs checks before processing any rule ++define Build/Clean ++ -$(MAKE) -C $(PKG_BUILD_DIR) \ ++ NO_DWARF=1 \ ++ $(MAKE_FLAGS) \ ++ clean ++endef ++ ++MAKE_FLAGS = \ ++ ARCH="$(LINUX_KARCH)" \ ++ NO_LIBPERL=1 \ ++ NO_LIBPYTHON=1 \ ++ NO_NEWT=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ CC="$(TARGET_CC)" \ ++ LD="$(TARGET_CROSS)ld" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ V=1 \ ++ prefix=/usr ++ ++define Package/perf/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,perf)) +diff --git a/feeds/packages/ipv6/.svn/entries b/feeds/packages/ipv6/.svn/entries +new file mode 100644 +index 0000000..d0bec2c +--- /dev/null ++++ b/feeds/packages/ipv6/.svn/entries +@@ -0,0 +1,88 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-24T11:41:40.945572Z ++35313 ++cyrus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++miredo ++dir ++ ++ahcpd ++dir ++ ++wide-dhcpv6 ++dir ++ ++shorewall6-lite ++dir ++ ++tunslip6 ++dir ++ ++aiccu ++dir ++ ++send ++dir ++ ++6tunnel ++dir ++ ++ptrtd ++dir ++ ++radvd ++dir ++ ++ndisc ++dir ++ ++dibbler ++dir ++ ++dhcp6 ++dir ++ ++tayga ++dir ++ ++ndppd ++dir ++ ++gw6c ++dir ++ ++ipv6calc ++dir ++ ++mrd6 ++dir ++ ++tspc ++dir ++ ++totd ++dir ++ +diff --git a/feeds/packages/ipv6/6tunnel/.svn/entries b/feeds/packages/ipv6/6tunnel/.svn/entries +new file mode 100644 +index 0000000..c5b3a27 +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/6tunnel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T16:08:49.456681Z ++29809 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++fc8ed7ef325afc014cf6b128f872a57f ++2012-01-19T16:08:49.456681Z ++29809 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++923 ++ +diff --git a/feeds/packages/ipv6/6tunnel/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/6tunnel/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/6tunnel/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/6tunnel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f864cd9 +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# Copyright (C) 2007-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:=6tunnel ++PKG_VERSION:=0.11rc2 ++PKG_RELEASE:=3 ++PKG_MD5SUM:=74e02d4f0704b3083a01feda66033449 ++ ++PKG_SOURCE_URL:=http://toxygen.net/6tunnel/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/6tunnel ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libpcap +kmod-sit ++ TITLE:=IPv4 / IPv6 tunnel proxy ++ URL:=http://toxygen.net/6tunnel/ ++endef ++ ++define Package/6tunnel/description ++IPv4 / IPv6 tunnel proxy ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME).c ++endef ++ ++define Package/6tunnel/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/6tunnel $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,6tunnel)) +diff --git a/feeds/packages/ipv6/6tunnel/Makefile b/feeds/packages/ipv6/6tunnel/Makefile +new file mode 100644 +index 0000000..f864cd9 +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/Makefile +@@ -0,0 +1,41 @@ ++# ++# Copyright (C) 2007-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:=6tunnel ++PKG_VERSION:=0.11rc2 ++PKG_RELEASE:=3 ++PKG_MD5SUM:=74e02d4f0704b3083a01feda66033449 ++ ++PKG_SOURCE_URL:=http://toxygen.net/6tunnel/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/6tunnel ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libpcap +kmod-sit ++ TITLE:=IPv4 / IPv6 tunnel proxy ++ URL:=http://toxygen.net/6tunnel/ ++endef ++ ++define Package/6tunnel/description ++IPv4 / IPv6 tunnel proxy ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME).c ++endef ++ ++define Package/6tunnel/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/6tunnel $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,6tunnel)) +diff --git a/feeds/packages/ipv6/6tunnel/patches/.svn/entries b/feeds/packages/ipv6/6tunnel/patches/.svn/entries +new file mode 100644 +index 0000000..443ceed +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/6tunnel/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T16:08:49.456681Z ++29809 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-arm-fix-optc-initialization.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++33db5e8303e05d012a77225c97ff5bd8 ++2012-01-19T16:08:49.456681Z ++29809 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++398 ++ +diff --git a/feeds/packages/ipv6/6tunnel/patches/.svn/text-base/100-arm-fix-optc-initialization.patch.svn-base b/feeds/packages/ipv6/6tunnel/patches/.svn/text-base/100-arm-fix-optc-initialization.patch.svn-base +new file mode 100644 +index 0000000..e84da61 +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/patches/.svn/text-base/100-arm-fix-optc-initialization.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/6tunnel.c +++++ b/6tunnel.c ++@@ -508,7 +508,7 @@ int main(int argc, char **argv) ++ { ++ int force = 0, lsock, csock, one = 0, jeden = 1, local_port; ++ int detach = 1, listen6 = 0, sa_len, conn_limit = 0; ++- char optc, *username = NULL, *bind_host = NULL; +++ char optc = -1, *username = NULL, *bind_host = NULL; ++ struct sockaddr *sa; ++ struct sockaddr_in laddr, caddr; ++ struct sockaddr_in6 laddr6; +diff --git a/feeds/packages/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch b/feeds/packages/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch +new file mode 100644 +index 0000000..e84da61 +--- /dev/null ++++ b/feeds/packages/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch +@@ -0,0 +1,11 @@ ++--- a/6tunnel.c +++++ b/6tunnel.c ++@@ -508,7 +508,7 @@ int main(int argc, char **argv) ++ { ++ int force = 0, lsock, csock, one = 0, jeden = 1, local_port; ++ int detach = 1, listen6 = 0, sa_len, conn_limit = 0; ++- char optc, *username = NULL, *bind_host = NULL; +++ char optc = -1, *username = NULL, *bind_host = NULL; ++ struct sockaddr *sa; ++ struct sockaddr_in laddr, caddr; ++ struct sockaddr_in6 laddr6; +diff --git a/feeds/packages/ipv6/ahcpd/.svn/entries b/feeds/packages/ipv6/ahcpd/.svn/entries +new file mode 100644 +index 0000000..fa0139f +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ahcpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-14T20:58:35.486896Z ++31728 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++aa82b5455f3c794f53d1d56083663617 ++2012-05-14T20:58:35.486896Z ++31728 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1470 ++ +diff --git a/feeds/packages/ipv6/ahcpd/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/ahcpd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/ipv6/ahcpd/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/ahcpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..41db0d8 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=ahcpd ++PKG_VERSION:=0.53 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ ++PKG_MD5SUM:=a1a610bf20965aa522cd766bf3d5829a ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ahcpd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=Ad-Hoc Configuration Protocol daemon ++ URL:=http://www.pps.jussieu.fr/~jch/software/ahcp/ ++ MAINTAINER:=Gabriel Kerneis ++ DEPENDS:=+kmod-ipv6 +ip +librt ++endef ++ ++define Package/ahcpd/description ++ Ahcpd is a daemon for configuring an IPv6 network using the Ad-Hoc ++ Configuration Protocol (AHCP). AHCP is designed for wireless mesh ++ networks, where IPv6 autoconfiguration and DHCPv6 do not work, but may ++ also be used on wired networks. ++endef ++ ++define Package/ahcpd/conffiles ++/etc/config/ahcpd ++endef ++ ++define Package/ahcpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/etc/ahcp ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-config.sh $(1)/etc/ahcp/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcpd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/ahcpd.config $(1)/etc/config/ahcpd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ahcpd.init $(1)/etc/init.d/ahcpd ++endef ++ ++$(eval $(call BuildPackage,ahcpd)) +diff --git a/feeds/packages/ipv6/ahcpd/Makefile b/feeds/packages/ipv6/ahcpd/Makefile +new file mode 100644 +index 0000000..41db0d8 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=ahcpd ++PKG_VERSION:=0.53 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ ++PKG_MD5SUM:=a1a610bf20965aa522cd766bf3d5829a ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ahcpd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=Ad-Hoc Configuration Protocol daemon ++ URL:=http://www.pps.jussieu.fr/~jch/software/ahcp/ ++ MAINTAINER:=Gabriel Kerneis ++ DEPENDS:=+kmod-ipv6 +ip +librt ++endef ++ ++define Package/ahcpd/description ++ Ahcpd is a daemon for configuring an IPv6 network using the Ad-Hoc ++ Configuration Protocol (AHCP). AHCP is designed for wireless mesh ++ networks, where IPv6 autoconfiguration and DHCPv6 do not work, but may ++ also be used on wired networks. ++endef ++ ++define Package/ahcpd/conffiles ++/etc/config/ahcpd ++endef ++ ++define Package/ahcpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/etc/ahcp ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-config.sh $(1)/etc/ahcp/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcpd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/ahcpd.config $(1)/etc/config/ahcpd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ahcpd.init $(1)/etc/init.d/ahcpd ++endef ++ ++$(eval $(call BuildPackage,ahcpd)) +diff --git a/feeds/packages/ipv6/ahcpd/files/.svn/entries b/feeds/packages/ipv6/ahcpd/files/.svn/entries +new file mode 100644 +index 0000000..a6e6cc0 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ahcpd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-14T20:58:35.486896Z ++31728 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ahcpd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e15112d87594d8c9015db1213ba928e5 ++2011-11-09T23:49:13.749929Z ++28922 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2438 ++ ++ahcpd.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++cce080e5a6def37b15c53a34f4374f23 ++2011-08-08T13:23:35.952259Z ++27932 ++kerneis ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1038 ++ +diff --git a/feeds/packages/ipv6/ahcpd/files/.svn/prop-base/ahcpd.config.svn-base b/feeds/packages/ipv6/ahcpd/files/.svn/prop-base/ahcpd.config.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/.svn/prop-base/ahcpd.config.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/ipv6/ahcpd/files/.svn/prop-base/ahcpd.init.svn-base b/feeds/packages/ipv6/ahcpd/files/.svn/prop-base/ahcpd.init.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/.svn/prop-base/ahcpd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/ipv6/ahcpd/files/.svn/text-base/ahcpd.config.svn-base b/feeds/packages/ipv6/ahcpd/files/.svn/text-base/ahcpd.config.svn-base +new file mode 100644 +index 0000000..0996251 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/.svn/text-base/ahcpd.config.svn-base +@@ -0,0 +1,32 @@ ++package ahcpd ++ ++config ahcpd ++ # Choose ahcp mode: client (default), server or forwarder ++ ## option 'mode' 'client' ++ # Uncomment the following lines to enable ahcpd on the desired ++ # interfaces. ++ ## list 'interface' 'lan' ++ ## list 'interface' 'wlan' ++ ++ # The following only makes sense in 'server' mode. ++ # Tweak to suit your needs. ++ ## list 'prefix' 'fde6:20f5:c9ac:358::/64' ++ ## list 'prefix' '192.168.4.128/25' ++ ## list 'name_server' 'fde6:20f5:c9ac:358::1' ++ ## list 'name_server' '192.168.4.1' ++ ## list 'ntp_server' '192.168.4.2' ++ ## option 'lease_dir' '/var/lib/leases' ++ ++ # option 'id_file' '/var/lib/ahcp-unique-id' ++ # option 'log_file' '/var/log/ahcpd.log' ++ # The configuration file is not necessary since you can configure ++ # everything from this file. But still, you might prefer using it. ++ ## option 'conf_file' '/etc/ahcp/ahcp.conf' ++ ++ # option 'multicast_address' 'ff02::cca6:c0f9:e182:5359' ++ # option 'port' '5359' ++ # option 'ipv4_only' 'false' ++ # option 'ipv6_only' 'false' ++ # option 'lease_time' '3666' ++ # option 'debug' '1' ++ +diff --git a/feeds/packages/ipv6/ahcpd/files/.svn/text-base/ahcpd.init.svn-base b/feeds/packages/ipv6/ahcpd/files/.svn/text-base/ahcpd.init.svn-base +new file mode 100644 +index 0000000..6654b00 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/.svn/text-base/ahcpd.init.svn-base +@@ -0,0 +1,109 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=71 ++ ++SERVICE_USE_PID=1 ++ ++EXTRA_COMMANDS="status" ++EXTRA_HELP=" status Print ahcpd's status to the log file." ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -gt 0 ] && append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++append_stmt() { ++ local name="$1" ++ local switch="$2" ++ append args "-C '$switch $name'" ++} ++ ++append_opt_stmt() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "-C '$switch $_loctmp'" ++} ++ ++ahcp_addif() { ++ local ifname=$(uci_get_state network "$1" ifname "$1") ++ append interfaces "$ifname" ++} ++ ++ahcp_server() { ++ local cfg="$1" ++ ++ append_opt_stmt "$cfg" 'mode' 'mode' ++ append_opt_stmt "$cfg" 'lease_dir' 'lease-dir' ++ config_list_foreach "$cfg" 'prefix' append_stmt 'prefix' ++ config_list_foreach "$cfg" 'name_server' append_stmt 'name-server' ++ config_list_foreach "$cfg" 'ntp_server' append_stmt 'ntp-server' ++ ++ append_parm "$cfg" 'id_file' '-i' ++ append_parm "$cfg" 'log_file' '-L' ++} ++ ++ahcp_config() { ++ local cfg="$1" ++ local interface ++ local _loctmp ++ ++ config_list_foreach "$cfg" 'interface' ahcp_addif ++ ++ # Add interfaces with "option proto ahcp" in /etc/config/network ++ # (only for client mode) ++ config_get _loctmp "$cfg" "mode" ++ if [ -z "$_loctmp" -o "$_loctmp" = "client" ]; then ++ for interface in $(uci -P /var/state show network|grep proto=ahcp|cut -d. -f2); do ++ ahcp_addif $interface ++ done ++ fi ++ ++ append_bool "$cfg" 'ipv4_only' '-4' ++ append_bool "$cfg" 'ipv6_only' '-6' ++ append_bool "$cfg" 'no_dns' '-N' ++ ++ append_parm "$cfg" 'multicast_address' '-m' ++ append_parm "$cfg" 'port' '-p' ++ append_parm "$cfg" 'lease_time' '-t' ++ append_parm "$cfg" 'debug' '-d' ++ append_parm "$cfg" 'conf_file' '-c' ++ append_parm "$cfg" 'script' '-s' ++} ++ ++start() { ++ mkdir -p /var/lib ++ config_load ahcpd ++ unset args ++ unset interfaces ++ config_foreach ahcp_config ahcpd ++ config_foreach ahcp_server ahcpd ++ [ -z "$interfaces" ] && return 0 ++ service_start /usr/sbin/ahcpd -D $args $interfaces ++} ++ ++stop() { ++ service_stop /usr/sbin/ahcpd ++} ++ ++status() { ++ SERVICE_SIG="USR1" service_signal /usr/sbin/ahcpd ++} +diff --git a/feeds/packages/ipv6/ahcpd/files/ahcpd.config b/feeds/packages/ipv6/ahcpd/files/ahcpd.config +new file mode 100644 +index 0000000..0996251 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/ahcpd.config +@@ -0,0 +1,32 @@ ++package ahcpd ++ ++config ahcpd ++ # Choose ahcp mode: client (default), server or forwarder ++ ## option 'mode' 'client' ++ # Uncomment the following lines to enable ahcpd on the desired ++ # interfaces. ++ ## list 'interface' 'lan' ++ ## list 'interface' 'wlan' ++ ++ # The following only makes sense in 'server' mode. ++ # Tweak to suit your needs. ++ ## list 'prefix' 'fde6:20f5:c9ac:358::/64' ++ ## list 'prefix' '192.168.4.128/25' ++ ## list 'name_server' 'fde6:20f5:c9ac:358::1' ++ ## list 'name_server' '192.168.4.1' ++ ## list 'ntp_server' '192.168.4.2' ++ ## option 'lease_dir' '/var/lib/leases' ++ ++ # option 'id_file' '/var/lib/ahcp-unique-id' ++ # option 'log_file' '/var/log/ahcpd.log' ++ # The configuration file is not necessary since you can configure ++ # everything from this file. But still, you might prefer using it. ++ ## option 'conf_file' '/etc/ahcp/ahcp.conf' ++ ++ # option 'multicast_address' 'ff02::cca6:c0f9:e182:5359' ++ # option 'port' '5359' ++ # option 'ipv4_only' 'false' ++ # option 'ipv6_only' 'false' ++ # option 'lease_time' '3666' ++ # option 'debug' '1' ++ +diff --git a/feeds/packages/ipv6/ahcpd/files/ahcpd.init b/feeds/packages/ipv6/ahcpd/files/ahcpd.init +new file mode 100644 +index 0000000..6654b00 +--- /dev/null ++++ b/feeds/packages/ipv6/ahcpd/files/ahcpd.init +@@ -0,0 +1,109 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=71 ++ ++SERVICE_USE_PID=1 ++ ++EXTRA_COMMANDS="status" ++EXTRA_HELP=" status Print ahcpd's status to the log file." ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -gt 0 ] && append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++append_stmt() { ++ local name="$1" ++ local switch="$2" ++ append args "-C '$switch $name'" ++} ++ ++append_opt_stmt() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "-C '$switch $_loctmp'" ++} ++ ++ahcp_addif() { ++ local ifname=$(uci_get_state network "$1" ifname "$1") ++ append interfaces "$ifname" ++} ++ ++ahcp_server() { ++ local cfg="$1" ++ ++ append_opt_stmt "$cfg" 'mode' 'mode' ++ append_opt_stmt "$cfg" 'lease_dir' 'lease-dir' ++ config_list_foreach "$cfg" 'prefix' append_stmt 'prefix' ++ config_list_foreach "$cfg" 'name_server' append_stmt 'name-server' ++ config_list_foreach "$cfg" 'ntp_server' append_stmt 'ntp-server' ++ ++ append_parm "$cfg" 'id_file' '-i' ++ append_parm "$cfg" 'log_file' '-L' ++} ++ ++ahcp_config() { ++ local cfg="$1" ++ local interface ++ local _loctmp ++ ++ config_list_foreach "$cfg" 'interface' ahcp_addif ++ ++ # Add interfaces with "option proto ahcp" in /etc/config/network ++ # (only for client mode) ++ config_get _loctmp "$cfg" "mode" ++ if [ -z "$_loctmp" -o "$_loctmp" = "client" ]; then ++ for interface in $(uci -P /var/state show network|grep proto=ahcp|cut -d. -f2); do ++ ahcp_addif $interface ++ done ++ fi ++ ++ append_bool "$cfg" 'ipv4_only' '-4' ++ append_bool "$cfg" 'ipv6_only' '-6' ++ append_bool "$cfg" 'no_dns' '-N' ++ ++ append_parm "$cfg" 'multicast_address' '-m' ++ append_parm "$cfg" 'port' '-p' ++ append_parm "$cfg" 'lease_time' '-t' ++ append_parm "$cfg" 'debug' '-d' ++ append_parm "$cfg" 'conf_file' '-c' ++ append_parm "$cfg" 'script' '-s' ++} ++ ++start() { ++ mkdir -p /var/lib ++ config_load ahcpd ++ unset args ++ unset interfaces ++ config_foreach ahcp_config ahcpd ++ config_foreach ahcp_server ahcpd ++ [ -z "$interfaces" ] && return 0 ++ service_start /usr/sbin/ahcpd -D $args $interfaces ++} ++ ++stop() { ++ service_stop /usr/sbin/ahcpd ++} ++ ++status() { ++ SERVICE_SIG="USR1" service_signal /usr/sbin/ahcpd ++} +diff --git a/feeds/packages/ipv6/aiccu/.svn/entries b/feeds/packages/ipv6/aiccu/.svn/entries +new file mode 100644 +index 0000000..b201b8b +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/aiccu ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-14T16:23:38.397599Z ++32708 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++551408ed9a38318461b52714050a468f ++2012-07-14T16:23:38.397599Z ++32708 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1225 ++ +diff --git a/feeds/packages/ipv6/aiccu/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/aiccu/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/aiccu/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/aiccu/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b6f3fa3 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=10 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix ++PKG_MD5SUM:=c9bcc83644ed788e22a7c3f3d4021350 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aiccu ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libpthread +ip +kmod-sit +kmod-tun ++ TITLE:=SixXS Automatic IPv6 Connectivity Client Utility ++ URL:=http://www.sixxs.net/tools/aiccu/ ++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 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,aiccu)) +diff --git a/feeds/packages/ipv6/aiccu/Makefile b/feeds/packages/ipv6/aiccu/Makefile +new file mode 100644 +index 0000000..b6f3fa3 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=10 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix ++PKG_MD5SUM:=c9bcc83644ed788e22a7c3f3d4021350 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aiccu ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libpthread +ip +kmod-sit +kmod-tun ++ TITLE:=SixXS Automatic IPv6 Connectivity Client Utility ++ URL:=http://www.sixxs.net/tools/aiccu/ ++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 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,aiccu)) +diff --git a/feeds/packages/ipv6/aiccu/patches/.svn/entries b/feeds/packages/ipv6/aiccu/patches/.svn/entries +new file mode 100644 +index 0000000..204b5a6 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/aiccu/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-11T12:17:46.850290Z ++32666 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++43364c4b20d8d729418877d946ef4df5 ++2008-08-10T21:06:38.693920Z ++12274 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2875 ++ ++200-add_dn_skipname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++a18242bf39b94cc7f9c228a92cdd82ba ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2736 ++ ++300-resolver-uclibc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++3480cd6a2fb3132bd88f4bf6fc2943e5 ++2008-08-10T21:07:07.035597Z ++12275 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++864 ++ +diff --git a/feeds/packages/ipv6/aiccu/patches/.svn/prop-base/100-cross_compile.patch.svn-base b/feeds/packages/ipv6/aiccu/patches/.svn/prop-base/100-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/.svn/prop-base/100-cross_compile.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/aiccu/patches/.svn/prop-base/200-add_dn_skipname.patch.svn-base b/feeds/packages/ipv6/aiccu/patches/.svn/prop-base/200-add_dn_skipname.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/.svn/prop-base/200-add_dn_skipname.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/aiccu/patches/.svn/text-base/100-cross_compile.patch.svn-base b/feeds/packages/ipv6/aiccu/patches/.svn/text-base/100-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..dbdc50a +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/.svn/text-base/100-cross_compile.patch.svn-base +@@ -0,0 +1,101 @@ ++--- 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/feeds/packages/ipv6/aiccu/patches/.svn/text-base/200-add_dn_skipname.patch.svn-base b/feeds/packages/ipv6/aiccu/patches/.svn/text-base/200-add_dn_skipname.patch.svn-base +new file mode 100644 +index 0000000..ca6afce +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/.svn/text-base/200-add_dn_skipname.patch.svn-base +@@ -0,0 +1,70 @@ ++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 +++#include +++ +++/* 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/feeds/packages/ipv6/aiccu/patches/.svn/text-base/300-resolver-uclibc.patch.svn-base b/feeds/packages/ipv6/aiccu/patches/.svn/text-base/300-resolver-uclibc.patch.svn-base +new file mode 100644 +index 0000000..fbd6a50 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/.svn/text-base/300-resolver-uclibc.patch.svn-base +@@ -0,0 +1,29 @@ ++--- 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/feeds/packages/ipv6/aiccu/patches/100-cross_compile.patch b/feeds/packages/ipv6/aiccu/patches/100-cross_compile.patch +new file mode 100644 +index 0000000..dbdc50a +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/100-cross_compile.patch +@@ -0,0 +1,101 @@ ++--- 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/feeds/packages/ipv6/aiccu/patches/200-add_dn_skipname.patch b/feeds/packages/ipv6/aiccu/patches/200-add_dn_skipname.patch +new file mode 100644 +index 0000000..ca6afce +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/200-add_dn_skipname.patch +@@ -0,0 +1,70 @@ ++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 +++#include +++ +++/* 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/feeds/packages/ipv6/aiccu/patches/300-resolver-uclibc.patch b/feeds/packages/ipv6/aiccu/patches/300-resolver-uclibc.patch +new file mode 100644 +index 0000000..fbd6a50 +--- /dev/null ++++ b/feeds/packages/ipv6/aiccu/patches/300-resolver-uclibc.patch +@@ -0,0 +1,29 @@ ++--- 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/feeds/packages/ipv6/dhcp6/.svn/entries b/feeds/packages/ipv6/dhcp6/.svn/entries +new file mode 100644 +index 0000000..775d78d +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/dhcp6 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-20T15:21:37.400235Z ++16522 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++befaad54e0baa594cbf42bd4ce08fa48 ++2009-06-20T15:21:37.400235Z ++16522 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1950 ++ +diff --git a/feeds/packages/ipv6/dhcp6/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/dhcp6/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/dhcp6/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/dhcp6/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..056814a +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,80 @@ ++# ++# Copyright (C) 2006-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:=dhcp6 ++PKG_VERSION:=1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=dhcpv6-linux-$(PKG_VERSION).zip ++PKG_SOURCE_URL:=@SF/dhcpv6-linux ++PKG_MD5SUM:=86193dfa62137db3ea459543db4f1102 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) ++ ++define Package/dhcp6/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libncurses ++ TITLE:=IPv6 DHCP ++ URL:=http://sourceforge.net/projects/dhcpv6-linux ++endef ++ ++define Package/dhcp6-client ++ $(call Package/dhcp6/Default) ++ TITLE+= client ++endef ++ ++define Package/dhcp6-client/conffiles ++/etc/dhcp6/solicit.conf ++endef ++ ++define Package/dhcp6-server ++ $(call Package/dhcp6/Default) ++ TITLE+= server ++endef ++ ++define Package/dhcp6-server/conffiles ++/etc/dhcpd6/dhcpd6.conf ++/etc/dhcpd6/leases6.conf ++/etc/dhcpd6/partial_leases6.conf ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ # prevent package from rebuilding ++ find $(PKG_BUILD_DIR) | xargs touch ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/client \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++ $(MAKE) -C $(PKG_BUILD_DIR)/server \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++endef ++ ++define Package/dhcp6-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcp6 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/cli $(1)/usr/sbin/dhcp6client ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/solicit.conf $(1)/etc/dhcp6/ ++endef ++ ++define Package/dhcp6-server/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcpd6 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/serv $(1)/usr/sbin/dhcpd6 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/*.conf $(1)/etc/dhcpd6/ ++endef ++ ++$(eval $(call BuildPackage,dhcp6-client)) ++$(eval $(call BuildPackage,dhcp6-server)) +diff --git a/feeds/packages/ipv6/dhcp6/Makefile b/feeds/packages/ipv6/dhcp6/Makefile +new file mode 100644 +index 0000000..056814a +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/Makefile +@@ -0,0 +1,80 @@ ++# ++# Copyright (C) 2006-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:=dhcp6 ++PKG_VERSION:=1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=dhcpv6-linux-$(PKG_VERSION).zip ++PKG_SOURCE_URL:=@SF/dhcpv6-linux ++PKG_MD5SUM:=86193dfa62137db3ea459543db4f1102 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) ++ ++define Package/dhcp6/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libncurses ++ TITLE:=IPv6 DHCP ++ URL:=http://sourceforge.net/projects/dhcpv6-linux ++endef ++ ++define Package/dhcp6-client ++ $(call Package/dhcp6/Default) ++ TITLE+= client ++endef ++ ++define Package/dhcp6-client/conffiles ++/etc/dhcp6/solicit.conf ++endef ++ ++define Package/dhcp6-server ++ $(call Package/dhcp6/Default) ++ TITLE+= server ++endef ++ ++define Package/dhcp6-server/conffiles ++/etc/dhcpd6/dhcpd6.conf ++/etc/dhcpd6/leases6.conf ++/etc/dhcpd6/partial_leases6.conf ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ # prevent package from rebuilding ++ find $(PKG_BUILD_DIR) | xargs touch ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/client \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++ $(MAKE) -C $(PKG_BUILD_DIR)/server \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++endef ++ ++define Package/dhcp6-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcp6 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/cli $(1)/usr/sbin/dhcp6client ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/solicit.conf $(1)/etc/dhcp6/ ++endef ++ ++define Package/dhcp6-server/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcpd6 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/serv $(1)/usr/sbin/dhcpd6 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/*.conf $(1)/etc/dhcpd6/ ++endef ++ ++$(eval $(call BuildPackage,dhcp6-client)) ++$(eval $(call BuildPackage,dhcp6-server)) +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/entries b/feeds/packages/ipv6/dhcp6/patches/.svn/entries +new file mode 100644 +index 0000000..63df162 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/dhcp6/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-gcc_lvalue.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++1de95ecdf7f1415eb302d86bb0a0e07b ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++526 ++ ++003-debug.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++4ac47d6d7ad2395b3eeb97a9f7674f87 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++593 ++ ++001-opt_flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++a8388882e3c587811f3c9b5c3f4a949c ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3258 ++ +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/001-opt_flags.patch.svn-base b/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/001-opt_flags.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/001-opt_flags.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/002-gcc_lvalue.patch.svn-base b/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/002-gcc_lvalue.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/002-gcc_lvalue.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/003-debug.patch.svn-base b/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/003-debug.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/prop-base/003-debug.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/001-opt_flags.patch.svn-base b/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/001-opt_flags.patch.svn-base +new file mode 100644 +index 0000000..326f210 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/001-opt_flags.patch.svn-base +@@ -0,0 +1,94 @@ ++diff -urN orig/dhcp6-1.0/client/Makefile dhcp6-1.0/client/Makefile ++--- orig/dhcp6-1.0/client/Makefile 2025-06-28 23:21:40.000000000 +0200 +++++ dhcp6-1.0/client/Makefile 2005-12-13 13:43:11.000000000 +0100 ++@@ -3,40 +3,40 @@ ++ STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h states.h timer_val.h constants.h macros.h status_codes.h ++ OBJECT_FILES = client.o solicit.o clilib.o parse.o request.o decline.o renew.o rebind.o release.o ++ HEADER_FILES = solicit.h clilib.h parse.h request.h decline.h renew.h rebind.h release.h ++- +++CFLAGS = -g3 ++ ++ dhcpv6_client : dhcpv6_client.c cli ++- $(CC) -g3 dhcpv6_client.c -o dhcpv6_client +++ $(CC) $(CFLAGS) $(LDFLAGS) dhcpv6_client.c -o dhcpv6_client ++ ++ cli : $(OBJECT_FILES) ++- $(CC) -g3 $(OBJECT_FILES) -o cli -lncurses +++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_FILES) -o cli -lncurses ++ ++ client.o : client.c $(STD_HEADERS) $(HEADER_FILES) ++- $(CC) -g3 -c client.c -o client.o +++ $(CC) $(CFLAGS) -c client.c -o client.o ++ ++ release.o : release.c release.h clilib.h ++- $(CC) -g3 -c release.c -o release.o +++ $(CC) $(CFLAGS) -c release.c -o release.o ++ ++ rebind.o : rebind.c rebind.h clilib.h ++- $(CC) -g3 -c rebind.c -o rebind.o +++ $(CC) $(CFLAGS) -c rebind.c -o rebind.o ++ ++ renew.o : renew.c renew.h clilib.h ++- $(CC) -g3 -c renew.c -o renew.o +++ $(CC) $(CFLAGS) -c renew.c -o renew.o ++ ++ request.o : request.c request.h clilib.h ++- $(CC) -g3 -c request.c -o request.o +++ $(CC) $(CFLAGS) -c request.c -o request.o ++ ++ decline.o : decline.c decline.h clilib.h parse.h solicit.h ++- $(CC) -g3 -c decline.c -o decline.o +++ $(CC) $(CFLAGS) -c decline.c -o decline.o ++ ++ solicit.o : solicit.c solicit.h clilib.h parse.h ++- $(CC) -g3 -c solicit.c -o solicit.o +++ $(CC) $(CFLAGS) -c solicit.c -o solicit.o ++ ++ clilib.o : clilib.c clilib.h parse.h ++- $(CC) -g3 -c clilib.c -o clilib.o +++ $(CC) $(CFLAGS) -c clilib.c -o clilib.o ++ ++ parse.o : parse.c parse.h clilib.h ++- $(CC) -g3 -c parse.c -o parse.o +++ $(CC) $(CFLAGS) -c parse.c -o parse.o ++ ++ clean : ++ rm -f *.o cli dhcpv6_client ++--- orig/dhcp6-1.0/server/Makefile 2002-06-28 14:50:04.000000000 +0200 +++++ dhcp6-1.0/server/Makefile 2005-12-13 11:35:53.000000000 +0100 ++@@ -1,27 +1,28 @@ ++ CC = gcc ++ STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h macros.h status_codes.h constants.h ++ OBJECT_FILES = server.o lib.o advertise.o parse.o leases.o reply.o +++CFLAGS = -g3 ++ ++ serv: $(OBJECT_FILES) ++- $(CC) -g3 $(OBJECT_FILES) -o serv +++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_FILES) -o serv ++ ++ lib.o: lib.c lib.h $(STD_HEADERS) ++- $(CC) -g3 -c lib.c -o lib.o +++ $(CC) $(CFLAGS) -c lib.c -o lib.o ++ ++ parse.o: parse.c parse.h $(STD_HEADERS) ++- $(CC) -g3 -c parse.c -o parse.o +++ $(CC) $(CFLAGS) -c parse.c -o parse.o ++ ++ leases.o: leases.c leases.h $(STD_HEADERS) ++- $(CC) -g3 -c leases.c -o leases.o +++ $(CC) $(CFLAGS) -c leases.c -o leases.o ++ ++ advertise.o: advertise.c advertise.h $(STD_HEADERS) ++- $(CC) -g3 -c advertise.c -o advertise.o +++ $(CC) $(CFLAGS) -c advertise.c -o advertise.o ++ ++ reply.o: reply.c reply.h $(STD_HEADERS) ++- $(CC) -g3 -c reply.c -o reply.o +++ $(CC) $(CFLAGS) -c reply.c -o reply.o ++ ++ server.o: server.c lib.h advertise.h reply.h leases.h parse.h $(STD_HEADERS) ++- $(CC) -g3 -c server.c -o server.o +++ $(CC) $(CFLAGS) -c server.c -o server.o ++ ++ clean: ++ rm -f *.o serv +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/002-gcc_lvalue.patch.svn-base b/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/002-gcc_lvalue.patch.svn-base +new file mode 100644 +index 0000000..e5deda6 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/002-gcc_lvalue.patch.svn-base +@@ -0,0 +1,11 @@ ++--- dhcp6-1.0/client/solicit.c 2025-06-28 23:21:40.000000000 -0700 +++++ dhcp6-1.0-patched/client/solicit.c 2006-04-27 15:32:52.000000000 -0700 ++@@ -18,7 +18,7 @@ ++ dhcp_message_ptr -> opt = add_client_id_option (interface_details); ++ ++ opt_ptr = (struct OPTIONS *) dhcp_message_ptr -> opt; ++- (struct OPTIONS *) ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details); +++ ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details); ++ return dhcp_message_ptr; ++ } ++ +diff --git a/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/003-debug.patch.svn-base b/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/003-debug.patch.svn-base +new file mode 100644 +index 0000000..7968df2 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/.svn/text-base/003-debug.patch.svn-base +@@ -0,0 +1,22 @@ ++diff -urN orig/dhcp6-1.0/client/clilib.c dhcp6-1.0/client/clilib.c ++--- orig/dhcp6-1.0/client/clilib.c 2025-06-28 23:21:40.000000000 +0200 +++++ dhcp6-1.0/client/clilib.c 2005-12-13 13:42:43.000000000 +0100 ++@@ -554,7 +554,7 @@ ++ ++ void generate_trans_id (u_int32_t *trans_id) ++ { ++- extern u_int32_t g_trans_id; +++ extern int g_trans_id; ++ time_t t; ++ srand (time (&t)); ++ *trans_id = 0; ++@@ -890,9 +890,7 @@ ++ break; ++ ++ default : ++-#if DEBUG == 3 ++ printf ("Unrecognized DUID type\n"); ++-#endif ++ } ++ ++ next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS)); +diff --git a/feeds/packages/ipv6/dhcp6/patches/001-opt_flags.patch b/feeds/packages/ipv6/dhcp6/patches/001-opt_flags.patch +new file mode 100644 +index 0000000..326f210 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/001-opt_flags.patch +@@ -0,0 +1,94 @@ ++diff -urN orig/dhcp6-1.0/client/Makefile dhcp6-1.0/client/Makefile ++--- orig/dhcp6-1.0/client/Makefile 2025-06-28 23:21:40.000000000 +0200 +++++ dhcp6-1.0/client/Makefile 2005-12-13 13:43:11.000000000 +0100 ++@@ -3,40 +3,40 @@ ++ STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h states.h timer_val.h constants.h macros.h status_codes.h ++ OBJECT_FILES = client.o solicit.o clilib.o parse.o request.o decline.o renew.o rebind.o release.o ++ HEADER_FILES = solicit.h clilib.h parse.h request.h decline.h renew.h rebind.h release.h ++- +++CFLAGS = -g3 ++ ++ dhcpv6_client : dhcpv6_client.c cli ++- $(CC) -g3 dhcpv6_client.c -o dhcpv6_client +++ $(CC) $(CFLAGS) $(LDFLAGS) dhcpv6_client.c -o dhcpv6_client ++ ++ cli : $(OBJECT_FILES) ++- $(CC) -g3 $(OBJECT_FILES) -o cli -lncurses +++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_FILES) -o cli -lncurses ++ ++ client.o : client.c $(STD_HEADERS) $(HEADER_FILES) ++- $(CC) -g3 -c client.c -o client.o +++ $(CC) $(CFLAGS) -c client.c -o client.o ++ ++ release.o : release.c release.h clilib.h ++- $(CC) -g3 -c release.c -o release.o +++ $(CC) $(CFLAGS) -c release.c -o release.o ++ ++ rebind.o : rebind.c rebind.h clilib.h ++- $(CC) -g3 -c rebind.c -o rebind.o +++ $(CC) $(CFLAGS) -c rebind.c -o rebind.o ++ ++ renew.o : renew.c renew.h clilib.h ++- $(CC) -g3 -c renew.c -o renew.o +++ $(CC) $(CFLAGS) -c renew.c -o renew.o ++ ++ request.o : request.c request.h clilib.h ++- $(CC) -g3 -c request.c -o request.o +++ $(CC) $(CFLAGS) -c request.c -o request.o ++ ++ decline.o : decline.c decline.h clilib.h parse.h solicit.h ++- $(CC) -g3 -c decline.c -o decline.o +++ $(CC) $(CFLAGS) -c decline.c -o decline.o ++ ++ solicit.o : solicit.c solicit.h clilib.h parse.h ++- $(CC) -g3 -c solicit.c -o solicit.o +++ $(CC) $(CFLAGS) -c solicit.c -o solicit.o ++ ++ clilib.o : clilib.c clilib.h parse.h ++- $(CC) -g3 -c clilib.c -o clilib.o +++ $(CC) $(CFLAGS) -c clilib.c -o clilib.o ++ ++ parse.o : parse.c parse.h clilib.h ++- $(CC) -g3 -c parse.c -o parse.o +++ $(CC) $(CFLAGS) -c parse.c -o parse.o ++ ++ clean : ++ rm -f *.o cli dhcpv6_client ++--- orig/dhcp6-1.0/server/Makefile 2002-06-28 14:50:04.000000000 +0200 +++++ dhcp6-1.0/server/Makefile 2005-12-13 11:35:53.000000000 +0100 ++@@ -1,27 +1,28 @@ ++ CC = gcc ++ STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h macros.h status_codes.h constants.h ++ OBJECT_FILES = server.o lib.o advertise.o parse.o leases.o reply.o +++CFLAGS = -g3 ++ ++ serv: $(OBJECT_FILES) ++- $(CC) -g3 $(OBJECT_FILES) -o serv +++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_FILES) -o serv ++ ++ lib.o: lib.c lib.h $(STD_HEADERS) ++- $(CC) -g3 -c lib.c -o lib.o +++ $(CC) $(CFLAGS) -c lib.c -o lib.o ++ ++ parse.o: parse.c parse.h $(STD_HEADERS) ++- $(CC) -g3 -c parse.c -o parse.o +++ $(CC) $(CFLAGS) -c parse.c -o parse.o ++ ++ leases.o: leases.c leases.h $(STD_HEADERS) ++- $(CC) -g3 -c leases.c -o leases.o +++ $(CC) $(CFLAGS) -c leases.c -o leases.o ++ ++ advertise.o: advertise.c advertise.h $(STD_HEADERS) ++- $(CC) -g3 -c advertise.c -o advertise.o +++ $(CC) $(CFLAGS) -c advertise.c -o advertise.o ++ ++ reply.o: reply.c reply.h $(STD_HEADERS) ++- $(CC) -g3 -c reply.c -o reply.o +++ $(CC) $(CFLAGS) -c reply.c -o reply.o ++ ++ server.o: server.c lib.h advertise.h reply.h leases.h parse.h $(STD_HEADERS) ++- $(CC) -g3 -c server.c -o server.o +++ $(CC) $(CFLAGS) -c server.c -o server.o ++ ++ clean: ++ rm -f *.o serv +diff --git a/feeds/packages/ipv6/dhcp6/patches/002-gcc_lvalue.patch b/feeds/packages/ipv6/dhcp6/patches/002-gcc_lvalue.patch +new file mode 100644 +index 0000000..e5deda6 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/002-gcc_lvalue.patch +@@ -0,0 +1,11 @@ ++--- dhcp6-1.0/client/solicit.c 2025-06-28 23:21:40.000000000 -0700 +++++ dhcp6-1.0-patched/client/solicit.c 2006-04-27 15:32:52.000000000 -0700 ++@@ -18,7 +18,7 @@ ++ dhcp_message_ptr -> opt = add_client_id_option (interface_details); ++ ++ opt_ptr = (struct OPTIONS *) dhcp_message_ptr -> opt; ++- (struct OPTIONS *) ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details); +++ ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details); ++ return dhcp_message_ptr; ++ } ++ +diff --git a/feeds/packages/ipv6/dhcp6/patches/003-debug.patch b/feeds/packages/ipv6/dhcp6/patches/003-debug.patch +new file mode 100644 +index 0000000..7968df2 +--- /dev/null ++++ b/feeds/packages/ipv6/dhcp6/patches/003-debug.patch +@@ -0,0 +1,22 @@ ++diff -urN orig/dhcp6-1.0/client/clilib.c dhcp6-1.0/client/clilib.c ++--- orig/dhcp6-1.0/client/clilib.c 2025-06-28 23:21:40.000000000 +0200 +++++ dhcp6-1.0/client/clilib.c 2005-12-13 13:42:43.000000000 +0100 ++@@ -554,7 +554,7 @@ ++ ++ void generate_trans_id (u_int32_t *trans_id) ++ { ++- extern u_int32_t g_trans_id; +++ extern int g_trans_id; ++ time_t t; ++ srand (time (&t)); ++ *trans_id = 0; ++@@ -890,9 +890,7 @@ ++ break; ++ ++ default : ++-#if DEBUG == 3 ++ printf ("Unrecognized DUID type\n"); ++-#endif ++ } ++ ++ next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS)); +diff --git a/feeds/packages/ipv6/dibbler/.svn/entries b/feeds/packages/ipv6/dibbler/.svn/entries +new file mode 100644 +index 0000000..f2827f3 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/dibbler ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-03T21:35:30.271963Z ++32961 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++190fbe55bfe323d3f4246e9b390a2110 ++2012-08-03T21:35:30.271963Z ++32961 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3424 ++ +diff --git a/feeds/packages/ipv6/dibbler/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/dibbler/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/dibbler/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/dibbler/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4b104b8 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,134 @@ ++# ++# 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:=dibbler ++PKG_VERSION:=0.8.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://klub.com.pl/dhcpv6/dibbler ++PKG_MD5SUM:=313044c95af3091607127a05c338d8ec ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dibbler/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=$(CXX_DEPENDS) +libpthread ++ TITLE:=Dibbler, a portable DHCPv6 implementation ++ URL:=http://klub.com.pl/dhcpv6/ ++endef ++ ++define Package/dibbler/Default/description ++ Dibbler is a portable DHCPv6 implementation. It supports stateful (i.e. ++ IPv6 address granting) as well as stateless (i.e. option granting) ++ autoconfiguration for IPv6. ++endef ++ ++define Package/dibbler-client ++ $(call Package/dibbler/Default) ++ TITLE+= (client) ++endef ++ ++define Package/dibbler-client/conffiles ++/etc/dibbler/client.conf ++endef ++ ++define Package/dibbler-client/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler client. ++endef ++ ++define Package/dibbler-relay ++ $(call Package/dibbler/Default) ++ TITLE+= (relay) ++endef ++ ++define Package/dibbler-relay/conffiles ++/etc/dibbler/relay.conf ++endef ++ ++define Package/dibbler-relay/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler relay. ++endef ++ ++define Package/dibbler-requestor ++ $(call Package/dibbler/Default) ++ TITLE+= (requestor) ++endef ++ ++define Package/dibbler-requestor/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler requestor. ++endef ++ ++define Package/dibbler-server ++ $(call Package/dibbler/Default) ++ TITLE+= (server) ++endef ++ ++define Package/dibbler-server/conffiles ++/etc/dibbler/server.conf ++endef ++ ++define Package/dibbler-server/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler server. ++endef ++ ++define Package/dibbler-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-client $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/dibbler ++ $(INSTALL_CONF) \ ++ $(PKG_BUILD_DIR)/doc/examples/client.conf \ ++ $(1)/etc/dibbler/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/dibbler-client.init \ ++ $(1)/etc/init.d/dibbler-client ++endef ++ ++define Package/dibbler-relay/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-relay $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/dibbler ++ $(INSTALL_CONF) \ ++ $(PKG_BUILD_DIR)/doc/examples/relay.conf \ ++ $(1)/etc/dibbler/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/dibbler-relay.init \ ++ $(1)/etc/init.d/dibbler-relay ++endef ++ ++define Package/dibbler-requestor/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-requestor $(1)/usr/sbin/ ++endef ++ ++define Package/dibbler-server/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-server $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/dibbler ++ $(INSTALL_CONF) \ ++ $(PKG_BUILD_DIR)/doc/examples/server.conf \ ++ $(1)/etc/dibbler/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/dibbler-server.init \ ++ $(1)/etc/init.d/dibbler-server ++endef ++ ++$(eval $(call BuildPackage,dibbler-client)) ++$(eval $(call BuildPackage,dibbler-relay)) ++$(eval $(call BuildPackage,dibbler-requestor)) ++$(eval $(call BuildPackage,dibbler-server)) +diff --git a/feeds/packages/ipv6/dibbler/Makefile b/feeds/packages/ipv6/dibbler/Makefile +new file mode 100644 +index 0000000..4b104b8 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/Makefile +@@ -0,0 +1,134 @@ ++# ++# 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:=dibbler ++PKG_VERSION:=0.8.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://klub.com.pl/dhcpv6/dibbler ++PKG_MD5SUM:=313044c95af3091607127a05c338d8ec ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dibbler/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=$(CXX_DEPENDS) +libpthread ++ TITLE:=Dibbler, a portable DHCPv6 implementation ++ URL:=http://klub.com.pl/dhcpv6/ ++endef ++ ++define Package/dibbler/Default/description ++ Dibbler is a portable DHCPv6 implementation. It supports stateful (i.e. ++ IPv6 address granting) as well as stateless (i.e. option granting) ++ autoconfiguration for IPv6. ++endef ++ ++define Package/dibbler-client ++ $(call Package/dibbler/Default) ++ TITLE+= (client) ++endef ++ ++define Package/dibbler-client/conffiles ++/etc/dibbler/client.conf ++endef ++ ++define Package/dibbler-client/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler client. ++endef ++ ++define Package/dibbler-relay ++ $(call Package/dibbler/Default) ++ TITLE+= (relay) ++endef ++ ++define Package/dibbler-relay/conffiles ++/etc/dibbler/relay.conf ++endef ++ ++define Package/dibbler-relay/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler relay. ++endef ++ ++define Package/dibbler-requestor ++ $(call Package/dibbler/Default) ++ TITLE+= (requestor) ++endef ++ ++define Package/dibbler-requestor/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler requestor. ++endef ++ ++define Package/dibbler-server ++ $(call Package/dibbler/Default) ++ TITLE+= (server) ++endef ++ ++define Package/dibbler-server/conffiles ++/etc/dibbler/server.conf ++endef ++ ++define Package/dibbler-server/description ++ $(call Package/dibbler/Default/description) ++ This package contains the dibbler server. ++endef ++ ++define Package/dibbler-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-client $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/dibbler ++ $(INSTALL_CONF) \ ++ $(PKG_BUILD_DIR)/doc/examples/client.conf \ ++ $(1)/etc/dibbler/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/dibbler-client.init \ ++ $(1)/etc/init.d/dibbler-client ++endef ++ ++define Package/dibbler-relay/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-relay $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/dibbler ++ $(INSTALL_CONF) \ ++ $(PKG_BUILD_DIR)/doc/examples/relay.conf \ ++ $(1)/etc/dibbler/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/dibbler-relay.init \ ++ $(1)/etc/init.d/dibbler-relay ++endef ++ ++define Package/dibbler-requestor/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-requestor $(1)/usr/sbin/ ++endef ++ ++define Package/dibbler-server/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-server $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/dibbler ++ $(INSTALL_CONF) \ ++ $(PKG_BUILD_DIR)/doc/examples/server.conf \ ++ $(1)/etc/dibbler/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/dibbler-server.init \ ++ $(1)/etc/init.d/dibbler-server ++endef ++ ++$(eval $(call BuildPackage,dibbler-client)) ++$(eval $(call BuildPackage,dibbler-relay)) ++$(eval $(call BuildPackage,dibbler-requestor)) ++$(eval $(call BuildPackage,dibbler-server)) +diff --git a/feeds/packages/ipv6/dibbler/files/.svn/entries b/feeds/packages/ipv6/dibbler/files/.svn/entries +new file mode 100644 +index 0000000..5d36bd8 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/dibbler/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-10T19:21:21.681764Z ++30425 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dibbler-relay.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++70a4b6a24151ddf8605fe71a97f46499 ++2012-02-10T19:21:21.681764Z ++30425 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++136 ++ ++dibbler-client.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++25a88e61965db328bd98dcdb4ef40164 ++2012-02-10T19:21:21.681764Z ++30425 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++138 ++ ++dibbler-server.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++39c8299f2cc6953900eb6de120497c13 ++2012-02-10T19:21:21.681764Z ++30425 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++138 ++ +diff --git a/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-client.init.svn-base b/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-client.init.svn-base +new file mode 100644 +index 0000000..04e8a4d +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-client.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=90 ++STOP=90 ++ ++start() { ++ mkdir -p /var/lib/dibbler ++ dibbler-client start ++} ++ ++stop() { ++ dibbler-client stop ++} +diff --git a/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-relay.init.svn-base b/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-relay.init.svn-base +new file mode 100644 +index 0000000..9f42e22 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-relay.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=90 ++STOP=90 ++ ++start() { ++ mkdir -p /var/lib/dibbler ++ dibbler-relay start ++} ++ ++stop() { ++ dibbler-relay stop ++} +diff --git a/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-server.init.svn-base b/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-server.init.svn-base +new file mode 100644 +index 0000000..0a93c2a +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/.svn/text-base/dibbler-server.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=90 ++STOP=90 ++ ++start() { ++ mkdir -p /var/lib/dibbler ++ dibbler-server start ++} ++ ++stop() { ++ dibbler-server stop ++} +diff --git a/feeds/packages/ipv6/dibbler/files/dibbler-client.init b/feeds/packages/ipv6/dibbler/files/dibbler-client.init +new file mode 100644 +index 0000000..04e8a4d +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/dibbler-client.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=90 ++STOP=90 ++ ++start() { ++ mkdir -p /var/lib/dibbler ++ dibbler-client start ++} ++ ++stop() { ++ dibbler-client stop ++} +diff --git a/feeds/packages/ipv6/dibbler/files/dibbler-relay.init b/feeds/packages/ipv6/dibbler/files/dibbler-relay.init +new file mode 100644 +index 0000000..9f42e22 +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/dibbler-relay.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=90 ++STOP=90 ++ ++start() { ++ mkdir -p /var/lib/dibbler ++ dibbler-relay start ++} ++ ++stop() { ++ dibbler-relay stop ++} +diff --git a/feeds/packages/ipv6/dibbler/files/dibbler-server.init b/feeds/packages/ipv6/dibbler/files/dibbler-server.init +new file mode 100644 +index 0000000..0a93c2a +--- /dev/null ++++ b/feeds/packages/ipv6/dibbler/files/dibbler-server.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=90 ++STOP=90 ++ ++start() { ++ mkdir -p /var/lib/dibbler ++ dibbler-server start ++} ++ ++stop() { ++ dibbler-server stop ++} +diff --git a/feeds/packages/ipv6/gw6c/.svn/entries b/feeds/packages/ipv6/gw6c/.svn/entries +new file mode 100644 +index 0000000..c766736 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/gw6c ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-06T15:39:51.957500Z ++33017 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6a987f9e327cd11d4980b1139c43c3bf ++2012-08-06T15:39:51.957500Z ++33017 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2331 ++ +diff --git a/feeds/packages/ipv6/gw6c/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/gw6c/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a505e40 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,80 @@ ++# ++# Copyright (C) 2008-2011 OpenWrt.org ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=gw6c ++PKG_VERSION:=5.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://openwrt.linux-appliance.net/sources ++PKG_MD5SUM:=eeac7292a622681651ec3bd9b2e5b061 ++PKG_BUILD_DIR:=$(BUILD_DIR)/gw6-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gw6c ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libpthread +ip +kmod-tun +kmod-ipv6 $(CXX_DEPENDS) +radvd ++ TITLE:=IPv6 tunnel client software ++ URL:=http://www.go6.net ++endef ++ ++define Package/gw6c/description ++ Client to configure an IPv6 tunnel to ++ Hexago/freenet6/go6.net's migration broker. ++endef ++ ++GW6C_OPTS:= \ ++ C_COMPILER="$(TARGET_CC) -c -DNO_STDLIBCXX" \ ++ COMPILER="$(TARGET_CXX) -c -DNO_STDLIBCXX" \ ++ CPP_FLAGS="$(TARGET_CFLAGS) -I. -Wall -DNDEBUG $(TARGET_CPPFLAGS)" \ ++ RANLIB="$(TARGET_CROSS)ranlib" \ ++ ARCHIVER="$(TARGET_CROSS)ar" \ ++ C_LINKER="$(TARGET_CC)" \ ++ LINKER="$(TARGET_CXX)" \ ++ exportdir=$(PKG_BUILD_DIR)/gw6c \ ++ export ++ ++define Build/Configure ++ $(INSTALL_DIR) $(PKG_BUILD_DIR)/gw6c/include ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/gw6c-config/gw6cconfig/gw6c_c_wrapper.h \ ++ $(PKG_BUILD_DIR)/gw6c/include ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/gw6c-config \ ++ $(GW6C_OPTS) ++ $(MAKE) -C $(PKG_BUILD_DIR)/gw6c-messaging \ ++ $(GW6C_OPTS) ++ $(MAKE) -C $(PKG_BUILD_DIR)/tspc-advanced \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -fno-builtin -Wall -I$(PKG_BUILD_DIR)/tspc-advanced/include \ ++ -I$(PKG_BUILD_DIR)/tspc-advanced/platform/openwrt -I$(PKG_BUILD_DIR)/tspc-advanced" \ ++ LDFLAGS="-L$(PKG_BUILD_DIR)/tspc-advanced/gw6cconfig \ ++ -L$(PKG_BUILD_DIR)/tspc-advanced/gw6cmessaging \ ++ $(TARGET_LDFLAGS) $(LIBGCC_S)" \ ++ target="openwrt" \ ++ installdir="$(PKG_INSTALL_DIR)" ++endef ++ ++define Package/gw6c/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tspc-advanced/bin/$(PKG_NAME) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/share/gw6c/template ++ $(CP) ./files/openwrt.sh $(1)/usr/share/gw6c/template ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/gw6c.init $(1)/etc/init.d/gw6c ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/gw6c.config $(1)/etc/config/gw6c ++endef ++ ++define Package/gw6c/conffiles ++/etc/config/gw6c ++endef ++ ++$(eval $(call BuildPackage,gw6c)) +diff --git a/feeds/packages/ipv6/gw6c/Makefile b/feeds/packages/ipv6/gw6c/Makefile +new file mode 100644 +index 0000000..a505e40 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/Makefile +@@ -0,0 +1,80 @@ ++# ++# Copyright (C) 2008-2011 OpenWrt.org ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=gw6c ++PKG_VERSION:=5.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://openwrt.linux-appliance.net/sources ++PKG_MD5SUM:=eeac7292a622681651ec3bd9b2e5b061 ++PKG_BUILD_DIR:=$(BUILD_DIR)/gw6-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gw6c ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+libpthread +ip +kmod-tun +kmod-ipv6 $(CXX_DEPENDS) +radvd ++ TITLE:=IPv6 tunnel client software ++ URL:=http://www.go6.net ++endef ++ ++define Package/gw6c/description ++ Client to configure an IPv6 tunnel to ++ Hexago/freenet6/go6.net's migration broker. ++endef ++ ++GW6C_OPTS:= \ ++ C_COMPILER="$(TARGET_CC) -c -DNO_STDLIBCXX" \ ++ COMPILER="$(TARGET_CXX) -c -DNO_STDLIBCXX" \ ++ CPP_FLAGS="$(TARGET_CFLAGS) -I. -Wall -DNDEBUG $(TARGET_CPPFLAGS)" \ ++ RANLIB="$(TARGET_CROSS)ranlib" \ ++ ARCHIVER="$(TARGET_CROSS)ar" \ ++ C_LINKER="$(TARGET_CC)" \ ++ LINKER="$(TARGET_CXX)" \ ++ exportdir=$(PKG_BUILD_DIR)/gw6c \ ++ export ++ ++define Build/Configure ++ $(INSTALL_DIR) $(PKG_BUILD_DIR)/gw6c/include ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/gw6c-config/gw6cconfig/gw6c_c_wrapper.h \ ++ $(PKG_BUILD_DIR)/gw6c/include ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/gw6c-config \ ++ $(GW6C_OPTS) ++ $(MAKE) -C $(PKG_BUILD_DIR)/gw6c-messaging \ ++ $(GW6C_OPTS) ++ $(MAKE) -C $(PKG_BUILD_DIR)/tspc-advanced \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -fno-builtin -Wall -I$(PKG_BUILD_DIR)/tspc-advanced/include \ ++ -I$(PKG_BUILD_DIR)/tspc-advanced/platform/openwrt -I$(PKG_BUILD_DIR)/tspc-advanced" \ ++ LDFLAGS="-L$(PKG_BUILD_DIR)/tspc-advanced/gw6cconfig \ ++ -L$(PKG_BUILD_DIR)/tspc-advanced/gw6cmessaging \ ++ $(TARGET_LDFLAGS) $(LIBGCC_S)" \ ++ target="openwrt" \ ++ installdir="$(PKG_INSTALL_DIR)" ++endef ++ ++define Package/gw6c/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tspc-advanced/bin/$(PKG_NAME) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/share/gw6c/template ++ $(CP) ./files/openwrt.sh $(1)/usr/share/gw6c/template ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/gw6c.init $(1)/etc/init.d/gw6c ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/gw6c.config $(1)/etc/config/gw6c ++endef ++ ++define Package/gw6c/conffiles ++/etc/config/gw6c ++endef ++ ++$(eval $(call BuildPackage,gw6c)) +diff --git a/feeds/packages/ipv6/gw6c/files/.svn/entries b/feeds/packages/ipv6/gw6c/files/.svn/entries +new file mode 100644 +index 0000000..cda70b0 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/gw6c/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:15.463526Z ++28923 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++openwrt.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++08b8f3451529572a86bc6aa4c00f50b7 ++2008-11-09T16:14:40.400987Z ++13148 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5387 ++ ++gw6c.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++62afda72c8c48675a028bcbe1abc23de ++2011-11-09T23:49:15.463526Z ++28923 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2876 ++ ++gw6c.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++0206be9807279988c536b8e4a7f2a2d9 ++2008-11-09T16:14:40.400987Z ++13148 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1660 ++ +diff --git a/feeds/packages/ipv6/gw6c/files/.svn/prop-base/gw6c.init.svn-base b/feeds/packages/ipv6/gw6c/files/.svn/prop-base/gw6c.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/.svn/prop-base/gw6c.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/ipv6/gw6c/files/.svn/prop-base/openwrt.sh.svn-base b/feeds/packages/ipv6/gw6c/files/.svn/prop-base/openwrt.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/.svn/prop-base/openwrt.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/ipv6/gw6c/files/.svn/text-base/gw6c.config.svn-base b/feeds/packages/ipv6/gw6c/files/.svn/text-base/gw6c.config.svn-base +new file mode 100644 +index 0000000..e634c98 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/.svn/text-base/gw6c.config.svn-base +@@ -0,0 +1,66 @@ ++config gw6c basic ++ #Comment out next line to enable gw6c ++ option disabled 1 ++ ++ #Leave empty if connecting anonymously ++ option userid ++ option passwd ++ ++ #For anonymous use anon.frenet6.net and ++ #account holders should use broker.freenet6.net ++ option server anon.freenet6.net ++ ++ #auth_method ++ #Use anonymous with anonymous access and ++ #any if you are account holder ++ option auth_method anonymous ++ ++config gw6c routing ++ #host_type ++ option host_type host ++ option prefixlen 48 ++ option ifprefix br-lan ++ ++ #DNS server list to which the reverse prefix ++ #will be delegated. Separate servers with : ++ option dns_server ++ ++config gw6c advanced ++ #Location where to store configuration file ++ option gw6c_conf /tmp/gw6c.conf ++ option gw6c_dir /usr/share/gw6c ++ option auto_retry yes ++ option retry_delay 30 ++ option keepalive yes ++ #keepalive interval ++ option interval 30 ++ #tunnel_mode ++ option if_tunnel_mode v6anyv4 ++ option if_v6v4 sit1 ++ option if_v6udpv4 tun ++ option if_v4v6 sit0 ++ option client_v4 auto ++ option client_v6 auto ++ option template openwrt ++ option proxy_client no ++ ++config gw6c broker ++ option broker_list /tmp/gw6c-broker-list.txt ++ option last_server /tmp/gw6c-last-server.txt ++ # Always use last known working server? ++ option always_same_serv no ++ ++config gw6c logging ++ option log_console 0 ++ option log_stderr 1 ++ option log_file 0 ++ option log_syslog 0 ++ ++ option log_filename /var/log/gw6c.log ++ option log_rotation yes ++ #Max size when using log file rotation ++ #possible values: 16|32|128|1024 ++ option log_maxsize 32 ++ ++ # ++ option syslog_facility USER +diff --git a/feeds/packages/ipv6/gw6c/files/.svn/text-base/gw6c.init.svn-base b/feeds/packages/ipv6/gw6c/files/.svn/text-base/gw6c.init.svn-base +new file mode 100644 +index 0000000..f311324 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/.svn/text-base/gw6c.init.svn-base +@@ -0,0 +1,111 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++# Copyright (C) 2007 RoadRunner.cx ++ ++START=52 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++genconf() { ++ ++ [ -f /etc/config/gw6c ] || { ++ echo "You are missing configuration file /etc/config/gw6c" ++ return 1 ++ } ++ ++ config_load "gw6c" ++ ++ config_get DISABLED basic disabled ++ ++ [ "$DISABLED" == "1" ] && { ++ echo "You haven't edited your configuration file. Gateway6 is disabled." ++ return 1 ++ } ++ ++ config_get USERID basic userid ++ config_get PASSWORD basic passwd ++ config_get SERVER basic server ++ config_get AUTH_METHOD basic auth_method ++ ++ config_get HOST_TYPE routing host_type ++ config_get PREFIX_LEN routing prefixlen ++ config_get IF_PREFIX routing ifprefix ++ config_get DNS_SERVER routing dns_server ++ ++ config_get GW6C_CONF advanced gw6c_conf ++ config_get GW6C_DIR advanced gw6c_dir ++ config_get AUTO_RETRY advanced auto_retry ++ config_get RETRY_DELAY advanced retry_delay ++ config_get KEEPALIVE advanced keepalive ++ config_get KEEPALIVE_INTERVAL advanced interval ++ config_get TUNNEL_MODE advanced if_tunnel_mode ++ config_get IF_V6V4 advanced if_v6v4 ++ config_get IF_V6UDPV4 advanced if_v6udpv4 ++ config_get IF_V4V6 advanced if_v4v6 ++ config_get CLIENT_V4 advanced client_v4 ++ config_get CLIENT_V6 advanced client_v6 ++ config_get TEMPLATE advanced template ++ config_get PROXY_CLIENT advanced proxy_client ++ ++ config_get BROKER_LIST broker broker_list ++ config_get LAST_SERVER broker last_server ++ config_get ALWAYS_SAMESERV broker always_same_serv ++ ++ config_get LOG_CONSOLE logging log_console ++ config_get LOG_STDERR logging log_stderr ++ config_get LOG_FILE logging log_file ++ config_get LOG_SYSLOG logging log_syslog ++ config_get LOG_FILENAME logging log_filename ++ config_get LOG_ROTATE logging log_rotation ++ config_get LOG_MAXSIZE logging log_maxsize ++ config_get SYSLOG_FACILITY logging syslog_facility ++ ++ cat >$GW6C_CONF < /proc/sys/net/ipv6/conf/all/forwarding ++ } ++} +diff --git a/feeds/packages/ipv6/gw6c/files/.svn/text-base/openwrt.sh.svn-base b/feeds/packages/ipv6/gw6c/files/.svn/text-base/openwrt.sh.svn-base +new file mode 100644 +index 0000000..75d418f +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/.svn/text-base/openwrt.sh.svn-base +@@ -0,0 +1,181 @@ ++#!/bin/sh ++# ++# openwrt.sh,v 1.1.4.1 2007/01/12 19:16:12 dgregoire Exp ++# ++# This source code copyright (c) Hexago Inc. 2002-2007. ++# ++# LICENSE NOTICE: You may use and modify this source code only if you ++# have executed a valid license agreement with Hexago Inc. granting ++# you the right to do so, the said license agreement governing such ++# use and modifications. Copyright or other intellectual property ++# notices are not to be removed from the source code. ++# ++# Note: IPV6 support and tun Support must be enabled before calling this script. ++# ++ ++ ++LANGUAGE=C ++ ++if [ -z $TSP_VERBOSE ]; then ++ TSP_VERBOSE=0 ++fi ++ ++KillProcess() ++{ ++ if [ ! -z $TSP_VERBOSE ]; then ++ if [ $TSP_VERBOSE -ge 2 ]; then ++ echo killing $* ++ fi ++ fi ++ PID=`ps axww | grep $1 | grep -v grep | awk '{ print $1;}'` ++ echo $PID ++ if [ ! -z $PID ]; then ++ kill $PID ++ fi ++} ++ ++Display() ++{ ++ if [ -z $TSP_VERBOSE ]; then ++ return; ++ fi ++ if [ $TSP_VERBOSE -lt $1 ]; then ++ return; ++ fi ++ shift ++ echo "$*" ++} ++ ++Exec() ++{ ++ if [ ! -z $TSP_VERBOSE ]; then ++ if [ $TSP_VERBOSE -ge 2 ]; then ++ echo $* ++ fi ++ fi ++ $* # Execute command ++ if [ $? -ne 0 ]; then ++ echo "Error while executing $1" ++ echo " Command: $*" ++ exit 1 ++ fi ++} ++ ++ExecNoCheck() ++{ ++ if [ ! -z $TSP_VERBOSE ]; then ++ if [ $TSP_VERBOSE -ge 2 ]; then ++ echo $* ++ fi ++ fi ++ $* # Execute command ++} ++ ++# Program localization ++ ++Display 1 "--- Start of configuration script. ---" ++Display 1 "Script: " `basename $0` ++ ++ifconfig=/sbin/ifconfig ++route=/sbin/route ++ipconfig=/usr/sbin/ip ++rtadvd=/usr/sbin/radvd ++rtadvd_pid=/var/run/radvd.pid ++sysctl=/sbin/sysctl ++rtadvdconfigfilename=gw6c-radvd.conf ++rtadvdconfigfile=/tmp/$rtadvdconfigfilename ++ ++if [ -z $TSP_HOME_DIR ]; then ++ echo "TSP_HOME_DIR variable not specified!;" ++ exit 1 ++fi ++ ++if [ ! -d $TSP_HOME_DIR ]; then ++ echo "Error : directory $TSP_HOME_DIR does not exist" ++ exit 1 ++fi ++# ++ ++if [ -z $TSP_HOST_TYPE ]; then ++ echo Error: TSP_HOST_TYPE not defined. ++ exit 1 ++fi ++ ++if [ X"${TSP_HOST_TYPE}" = X"host" ] || [ X"${TSP_HOST_TYPE}" = X"router" ]; then ++ # ++ # Configured tunnel config (IPv6) ++ Display 1 "$TSP_TUNNEL_INTERFACE setup" ++ if [ X"${TSP_TUNNEL_MODE}" = X"v6v4" ]; then ++ Display 1 "Setting up link to $TSP_SERVER_ADDRESS_IPV4" ++ ExecNoCheck $ipconfig tunnel del $TSP_TUNNEL_INTERFACE ++ ExecNoCheck sleep 1 ++ Exec $ipconfig tunnel add $TSP_TUNNEL_INTERFACE mode sit ttl 64 remote $TSP_SERVER_ADDRESS_IPV4 ++ fi ++ ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE up ++ ++ PREF=`echo $TSP_CLIENT_ADDRESS_IPV6 | sed "s/:0*/:/g" |cut -d : -f1-2` ++ OLDADDR=`$ifconfig $TSP_TUNNEL_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"` ++ if [ ! -z $OLDADDR ]; then ++ Display 1 "Removing old IPv6 address $OLDADDR" ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 del $OLDADDR ++ fi ++ Display 1 "This host is: $TSP_CLIENT_ADDRESS_IPV6/$TSP_TUNNEL_PREFIXLEN" ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE add $TSP_CLIENT_ADDRESS_IPV6/$TSP_TUNNEL_PREFIXLEN ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE mtu 1280 ++ # ++ # Default route ++ Display 1 "Adding default route" ++ ExecNoCheck $route -A inet6 del ::/0 2>/dev/null # delete old default route ++ ExecNoCheck $route -A inet6 del 2000::/3 2>/dev/null # delete old gw route ++ Exec $route -A inet6 add ::/0 dev $TSP_TUNNEL_INTERFACE ++ Exec $route -A inet6 add 2000::/3 dev $TSP_TUNNEL_INTERFACE ++fi ++ ++# Router configuration if required ++if [ X"${TSP_HOST_TYPE}" = X"router" ]; then ++ Display 1 "Router configuration" ++ Display 1 "Kernel setup" ++ if [ X"${TSP_PREFIXLEN}" != X"64" ]; then ++ #Better way on linux to avoid loop with the remaining /48? ++ $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null ++ fi ++ Display 1 "Adding prefix to $TSP_HOME_INTERFACE" ++ OLDADDR=`$ifconfig $TSP_HOME_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"` ++ if [ ! -z $OLDADDR ]; then ++ Display 1 "Removing old IPv6 address $OLDADDR" ++ Exec $ifconfig $TSP_HOME_INTERFACE del $OLDADDR ++ fi ++ Exec $ifconfig $TSP_HOME_INTERFACE add $TSP_PREFIX::1/64 ++ # Router advertisement configuration ++ Display 1 "Create new $rtadvdconfigfile" ++ echo "##### rtadvd.conf made by Gateway6 Client ####" > "$rtadvdconfigfile" ++ echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile" ++ echo "{" >> "$rtadvdconfigfile" ++ echo " AdvSendAdvert on;" >> "$rtadvdconfigfile" ++ echo " prefix $TSP_PREFIX::/64" >> "$rtadvdconfigfile" ++ echo " {" >> "$rtadvdconfigfile" ++ echo " AdvOnLink on;" >> "$rtadvdconfigfile" ++ echo " AdvAutonomous on;" >> "$rtadvdconfigfile" ++ echo " };" >> "$rtadvdconfigfile" ++ echo "};" >> "$rtadvdconfigfile" ++ echo "" >> "$rtadvdconfigfile" ++ /etc/init.d/radvd stop ++ # Then enable forwarding. Killing ++ # radvd disables forwarding and radvd ++ # does NOT start without forwarding enabled ++ Exec $sysctl -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled ++ if [ -f $rtadvdconfigfile ]; then ++ Exec $rtadvd -p $rtadvd_pid -C $rtadvdconfigfile ++ Display 1 "Starting radvd: $rtadvd -p $rtadvd_pid -C $rtadvdconfigfile" ++ else ++ echo "Error : file $rtadvdconfigfile not found" ++ exit 1 ++ fi ++fi ++ ++Display 1 "--- End of configuration script. ---" ++ ++exit 0 ++ ++#--------------------------------------------------------------------- +diff --git a/feeds/packages/ipv6/gw6c/files/gw6c.config b/feeds/packages/ipv6/gw6c/files/gw6c.config +new file mode 100644 +index 0000000..e634c98 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/gw6c.config +@@ -0,0 +1,66 @@ ++config gw6c basic ++ #Comment out next line to enable gw6c ++ option disabled 1 ++ ++ #Leave empty if connecting anonymously ++ option userid ++ option passwd ++ ++ #For anonymous use anon.frenet6.net and ++ #account holders should use broker.freenet6.net ++ option server anon.freenet6.net ++ ++ #auth_method ++ #Use anonymous with anonymous access and ++ #any if you are account holder ++ option auth_method anonymous ++ ++config gw6c routing ++ #host_type ++ option host_type host ++ option prefixlen 48 ++ option ifprefix br-lan ++ ++ #DNS server list to which the reverse prefix ++ #will be delegated. Separate servers with : ++ option dns_server ++ ++config gw6c advanced ++ #Location where to store configuration file ++ option gw6c_conf /tmp/gw6c.conf ++ option gw6c_dir /usr/share/gw6c ++ option auto_retry yes ++ option retry_delay 30 ++ option keepalive yes ++ #keepalive interval ++ option interval 30 ++ #tunnel_mode ++ option if_tunnel_mode v6anyv4 ++ option if_v6v4 sit1 ++ option if_v6udpv4 tun ++ option if_v4v6 sit0 ++ option client_v4 auto ++ option client_v6 auto ++ option template openwrt ++ option proxy_client no ++ ++config gw6c broker ++ option broker_list /tmp/gw6c-broker-list.txt ++ option last_server /tmp/gw6c-last-server.txt ++ # Always use last known working server? ++ option always_same_serv no ++ ++config gw6c logging ++ option log_console 0 ++ option log_stderr 1 ++ option log_file 0 ++ option log_syslog 0 ++ ++ option log_filename /var/log/gw6c.log ++ option log_rotation yes ++ #Max size when using log file rotation ++ #possible values: 16|32|128|1024 ++ option log_maxsize 32 ++ ++ # ++ option syslog_facility USER +diff --git a/feeds/packages/ipv6/gw6c/files/gw6c.init b/feeds/packages/ipv6/gw6c/files/gw6c.init +new file mode 100755 +index 0000000..f311324 +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/gw6c.init +@@ -0,0 +1,111 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++# Copyright (C) 2007 RoadRunner.cx ++ ++START=52 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++genconf() { ++ ++ [ -f /etc/config/gw6c ] || { ++ echo "You are missing configuration file /etc/config/gw6c" ++ return 1 ++ } ++ ++ config_load "gw6c" ++ ++ config_get DISABLED basic disabled ++ ++ [ "$DISABLED" == "1" ] && { ++ echo "You haven't edited your configuration file. Gateway6 is disabled." ++ return 1 ++ } ++ ++ config_get USERID basic userid ++ config_get PASSWORD basic passwd ++ config_get SERVER basic server ++ config_get AUTH_METHOD basic auth_method ++ ++ config_get HOST_TYPE routing host_type ++ config_get PREFIX_LEN routing prefixlen ++ config_get IF_PREFIX routing ifprefix ++ config_get DNS_SERVER routing dns_server ++ ++ config_get GW6C_CONF advanced gw6c_conf ++ config_get GW6C_DIR advanced gw6c_dir ++ config_get AUTO_RETRY advanced auto_retry ++ config_get RETRY_DELAY advanced retry_delay ++ config_get KEEPALIVE advanced keepalive ++ config_get KEEPALIVE_INTERVAL advanced interval ++ config_get TUNNEL_MODE advanced if_tunnel_mode ++ config_get IF_V6V4 advanced if_v6v4 ++ config_get IF_V6UDPV4 advanced if_v6udpv4 ++ config_get IF_V4V6 advanced if_v4v6 ++ config_get CLIENT_V4 advanced client_v4 ++ config_get CLIENT_V6 advanced client_v6 ++ config_get TEMPLATE advanced template ++ config_get PROXY_CLIENT advanced proxy_client ++ ++ config_get BROKER_LIST broker broker_list ++ config_get LAST_SERVER broker last_server ++ config_get ALWAYS_SAMESERV broker always_same_serv ++ ++ config_get LOG_CONSOLE logging log_console ++ config_get LOG_STDERR logging log_stderr ++ config_get LOG_FILE logging log_file ++ config_get LOG_SYSLOG logging log_syslog ++ config_get LOG_FILENAME logging log_filename ++ config_get LOG_ROTATE logging log_rotation ++ config_get LOG_MAXSIZE logging log_maxsize ++ config_get SYSLOG_FACILITY logging syslog_facility ++ ++ cat >$GW6C_CONF < /proc/sys/net/ipv6/conf/all/forwarding ++ } ++} +diff --git a/feeds/packages/ipv6/gw6c/files/openwrt.sh b/feeds/packages/ipv6/gw6c/files/openwrt.sh +new file mode 100755 +index 0000000..75d418f +--- /dev/null ++++ b/feeds/packages/ipv6/gw6c/files/openwrt.sh +@@ -0,0 +1,181 @@ ++#!/bin/sh ++# ++# openwrt.sh,v 1.1.4.1 2007/01/12 19:16:12 dgregoire Exp ++# ++# This source code copyright (c) Hexago Inc. 2002-2007. ++# ++# LICENSE NOTICE: You may use and modify this source code only if you ++# have executed a valid license agreement with Hexago Inc. granting ++# you the right to do so, the said license agreement governing such ++# use and modifications. Copyright or other intellectual property ++# notices are not to be removed from the source code. ++# ++# Note: IPV6 support and tun Support must be enabled before calling this script. ++# ++ ++ ++LANGUAGE=C ++ ++if [ -z $TSP_VERBOSE ]; then ++ TSP_VERBOSE=0 ++fi ++ ++KillProcess() ++{ ++ if [ ! -z $TSP_VERBOSE ]; then ++ if [ $TSP_VERBOSE -ge 2 ]; then ++ echo killing $* ++ fi ++ fi ++ PID=`ps axww | grep $1 | grep -v grep | awk '{ print $1;}'` ++ echo $PID ++ if [ ! -z $PID ]; then ++ kill $PID ++ fi ++} ++ ++Display() ++{ ++ if [ -z $TSP_VERBOSE ]; then ++ return; ++ fi ++ if [ $TSP_VERBOSE -lt $1 ]; then ++ return; ++ fi ++ shift ++ echo "$*" ++} ++ ++Exec() ++{ ++ if [ ! -z $TSP_VERBOSE ]; then ++ if [ $TSP_VERBOSE -ge 2 ]; then ++ echo $* ++ fi ++ fi ++ $* # Execute command ++ if [ $? -ne 0 ]; then ++ echo "Error while executing $1" ++ echo " Command: $*" ++ exit 1 ++ fi ++} ++ ++ExecNoCheck() ++{ ++ if [ ! -z $TSP_VERBOSE ]; then ++ if [ $TSP_VERBOSE -ge 2 ]; then ++ echo $* ++ fi ++ fi ++ $* # Execute command ++} ++ ++# Program localization ++ ++Display 1 "--- Start of configuration script. ---" ++Display 1 "Script: " `basename $0` ++ ++ifconfig=/sbin/ifconfig ++route=/sbin/route ++ipconfig=/usr/sbin/ip ++rtadvd=/usr/sbin/radvd ++rtadvd_pid=/var/run/radvd.pid ++sysctl=/sbin/sysctl ++rtadvdconfigfilename=gw6c-radvd.conf ++rtadvdconfigfile=/tmp/$rtadvdconfigfilename ++ ++if [ -z $TSP_HOME_DIR ]; then ++ echo "TSP_HOME_DIR variable not specified!;" ++ exit 1 ++fi ++ ++if [ ! -d $TSP_HOME_DIR ]; then ++ echo "Error : directory $TSP_HOME_DIR does not exist" ++ exit 1 ++fi ++# ++ ++if [ -z $TSP_HOST_TYPE ]; then ++ echo Error: TSP_HOST_TYPE not defined. ++ exit 1 ++fi ++ ++if [ X"${TSP_HOST_TYPE}" = X"host" ] || [ X"${TSP_HOST_TYPE}" = X"router" ]; then ++ # ++ # Configured tunnel config (IPv6) ++ Display 1 "$TSP_TUNNEL_INTERFACE setup" ++ if [ X"${TSP_TUNNEL_MODE}" = X"v6v4" ]; then ++ Display 1 "Setting up link to $TSP_SERVER_ADDRESS_IPV4" ++ ExecNoCheck $ipconfig tunnel del $TSP_TUNNEL_INTERFACE ++ ExecNoCheck sleep 1 ++ Exec $ipconfig tunnel add $TSP_TUNNEL_INTERFACE mode sit ttl 64 remote $TSP_SERVER_ADDRESS_IPV4 ++ fi ++ ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE up ++ ++ PREF=`echo $TSP_CLIENT_ADDRESS_IPV6 | sed "s/:0*/:/g" |cut -d : -f1-2` ++ OLDADDR=`$ifconfig $TSP_TUNNEL_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"` ++ if [ ! -z $OLDADDR ]; then ++ Display 1 "Removing old IPv6 address $OLDADDR" ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 del $OLDADDR ++ fi ++ Display 1 "This host is: $TSP_CLIENT_ADDRESS_IPV6/$TSP_TUNNEL_PREFIXLEN" ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE add $TSP_CLIENT_ADDRESS_IPV6/$TSP_TUNNEL_PREFIXLEN ++ Exec $ifconfig $TSP_TUNNEL_INTERFACE mtu 1280 ++ # ++ # Default route ++ Display 1 "Adding default route" ++ ExecNoCheck $route -A inet6 del ::/0 2>/dev/null # delete old default route ++ ExecNoCheck $route -A inet6 del 2000::/3 2>/dev/null # delete old gw route ++ Exec $route -A inet6 add ::/0 dev $TSP_TUNNEL_INTERFACE ++ Exec $route -A inet6 add 2000::/3 dev $TSP_TUNNEL_INTERFACE ++fi ++ ++# Router configuration if required ++if [ X"${TSP_HOST_TYPE}" = X"router" ]; then ++ Display 1 "Router configuration" ++ Display 1 "Kernel setup" ++ if [ X"${TSP_PREFIXLEN}" != X"64" ]; then ++ #Better way on linux to avoid loop with the remaining /48? ++ $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null ++ fi ++ Display 1 "Adding prefix to $TSP_HOME_INTERFACE" ++ OLDADDR=`$ifconfig $TSP_HOME_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"` ++ if [ ! -z $OLDADDR ]; then ++ Display 1 "Removing old IPv6 address $OLDADDR" ++ Exec $ifconfig $TSP_HOME_INTERFACE del $OLDADDR ++ fi ++ Exec $ifconfig $TSP_HOME_INTERFACE add $TSP_PREFIX::1/64 ++ # Router advertisement configuration ++ Display 1 "Create new $rtadvdconfigfile" ++ echo "##### rtadvd.conf made by Gateway6 Client ####" > "$rtadvdconfigfile" ++ echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile" ++ echo "{" >> "$rtadvdconfigfile" ++ echo " AdvSendAdvert on;" >> "$rtadvdconfigfile" ++ echo " prefix $TSP_PREFIX::/64" >> "$rtadvdconfigfile" ++ echo " {" >> "$rtadvdconfigfile" ++ echo " AdvOnLink on;" >> "$rtadvdconfigfile" ++ echo " AdvAutonomous on;" >> "$rtadvdconfigfile" ++ echo " };" >> "$rtadvdconfigfile" ++ echo "};" >> "$rtadvdconfigfile" ++ echo "" >> "$rtadvdconfigfile" ++ /etc/init.d/radvd stop ++ # Then enable forwarding. Killing ++ # radvd disables forwarding and radvd ++ # does NOT start without forwarding enabled ++ Exec $sysctl -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled ++ if [ -f $rtadvdconfigfile ]; then ++ Exec $rtadvd -p $rtadvd_pid -C $rtadvdconfigfile ++ Display 1 "Starting radvd: $rtadvd -p $rtadvd_pid -C $rtadvdconfigfile" ++ else ++ echo "Error : file $rtadvdconfigfile not found" ++ exit 1 ++ fi ++fi ++ ++Display 1 "--- End of configuration script. ---" ++ ++exit 0 ++ ++#--------------------------------------------------------------------- +diff --git a/feeds/packages/ipv6/ipv6calc/.svn/entries b/feeds/packages/ipv6/ipv6calc/.svn/entries +new file mode 100644 +index 0000000..0ac0780 +--- /dev/null ++++ b/feeds/packages/ipv6/ipv6calc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ipv6calc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-27T02:12:02.966139Z ++31868 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++9cec8162b456149c883ba3fd077b5c1f ++2012-05-27T02:12:02.966139Z ++31868 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3273 ++ +diff --git a/feeds/packages/ipv6/ipv6calc/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/ipv6calc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0397f8a +--- /dev/null ++++ b/feeds/packages/ipv6/ipv6calc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,119 @@ ++# ++# 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:=ipv6calc ++PKG_VERSION:=0.93.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc ++PKG_MD5SUM:=9a5b7fdd1a90cd621dc43623976d912a ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ipv6calc/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ URL:=http://www.deepspace6.net/projects/ipv6calc.html ++endef ++ ++define Package/ipv6calc/Default/description ++ ipv6calc is a small utility written in programming languate C to manipulate ++ (not only) IPv6 addresses. Intentions were convering a given IPv6 address ++ into compressed format, convering a given IPv6 address into the same format ++ like shown in /proc/net/if_inet6 and (because it was not difficulty) ++ migrating the Perl program ip6_int into. Now only one utiltity is needed to ++ do a lot. ++endef ++ ++define Package/ipv6calc ++ $(call Package/ipv6calc/Default) ++ TITLE:=IPv6 addresses calculations (full) ++ VARIANT:=full ++endef ++ ++define Package/ipv6calc/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains an ipv6calc with the internal databases enabled. ++endef ++ ++define Package/ipv6calc-mini ++ $(call Package/ipv6calc/Default) ++ TITLE:=IPv6 addresses calculations (mini) ++ VARIANT:=mini ++endef ++ ++define Package/ipv6calc-mini/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains an ipv6calc with the internal databases disabled. ++endef ++ ++define Package/ipv6log ++ $(call Package/ipv6calc/Default) ++ TITLE:=Webserver log helper programs (full) ++ VARIANT:=full ++endef ++ ++define Package/ipv6log/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains webserver log anonymization, conversion, and statistics ++ helper programs with the internal databases enabled. ++endef ++ ++define Package/ipv6log-mini ++ $(call Package/ipv6calc/Default) ++ TITLE:=Webserver log helper programs (mini) ++ VARIANT:=mini ++endef ++ ++define Package/ipv6log-mini/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains webserver log anonymization, conversion, and statistics ++ helper programs with the internal databases disabled. ++endef ++ ++ifeq ($(BUILD_VARIANT),full) ++ CONFIGURE_ARGS += \ ++ --enable-db-ieee \ ++ --enable-db-ipv4 \ ++ --enable-db-ipv6 ++endif ++ ++ifeq ($(BUILD_VARIANT),mini) ++ CONFIGURE_ARGS += \ ++ --disable-db-ieee \ ++ --disable-db-ipv4 \ ++ --disable-db-ipv6 ++endif ++ ++MAKE_FLAGS += \ ++ CC="$(TARGET_CC)" \ ++ COPTS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)" ++ ++define Package/ipv6calc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipv6calc $(1)/usr/bin/ ++endef ++ ++Package/ipv6calc-mini/install = $(Package/ipv6calc/install) ++ ++define Package/ipv6log/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipv6log* $(1)/usr/bin/ ++endef ++ ++Package/ipv6log-mini/install = $(Package/ipv6log/install) ++ ++$(eval $(call BuildPackage,ipv6calc)) ++$(eval $(call BuildPackage,ipv6calc-mini)) ++$(eval $(call BuildPackage,ipv6log)) ++$(eval $(call BuildPackage,ipv6log-mini)) +diff --git a/feeds/packages/ipv6/ipv6calc/Makefile b/feeds/packages/ipv6/ipv6calc/Makefile +new file mode 100644 +index 0000000..0397f8a +--- /dev/null ++++ b/feeds/packages/ipv6/ipv6calc/Makefile +@@ -0,0 +1,119 @@ ++# ++# 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:=ipv6calc ++PKG_VERSION:=0.93.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc ++PKG_MD5SUM:=9a5b7fdd1a90cd621dc43623976d912a ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ipv6calc/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ URL:=http://www.deepspace6.net/projects/ipv6calc.html ++endef ++ ++define Package/ipv6calc/Default/description ++ ipv6calc is a small utility written in programming languate C to manipulate ++ (not only) IPv6 addresses. Intentions were convering a given IPv6 address ++ into compressed format, convering a given IPv6 address into the same format ++ like shown in /proc/net/if_inet6 and (because it was not difficulty) ++ migrating the Perl program ip6_int into. Now only one utiltity is needed to ++ do a lot. ++endef ++ ++define Package/ipv6calc ++ $(call Package/ipv6calc/Default) ++ TITLE:=IPv6 addresses calculations (full) ++ VARIANT:=full ++endef ++ ++define Package/ipv6calc/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains an ipv6calc with the internal databases enabled. ++endef ++ ++define Package/ipv6calc-mini ++ $(call Package/ipv6calc/Default) ++ TITLE:=IPv6 addresses calculations (mini) ++ VARIANT:=mini ++endef ++ ++define Package/ipv6calc-mini/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains an ipv6calc with the internal databases disabled. ++endef ++ ++define Package/ipv6log ++ $(call Package/ipv6calc/Default) ++ TITLE:=Webserver log helper programs (full) ++ VARIANT:=full ++endef ++ ++define Package/ipv6log/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains webserver log anonymization, conversion, and statistics ++ helper programs with the internal databases enabled. ++endef ++ ++define Package/ipv6log-mini ++ $(call Package/ipv6calc/Default) ++ TITLE:=Webserver log helper programs (mini) ++ VARIANT:=mini ++endef ++ ++define Package/ipv6log-mini/description ++ $(call Package/ipv6calc/Default/description) ++ This package contains webserver log anonymization, conversion, and statistics ++ helper programs with the internal databases disabled. ++endef ++ ++ifeq ($(BUILD_VARIANT),full) ++ CONFIGURE_ARGS += \ ++ --enable-db-ieee \ ++ --enable-db-ipv4 \ ++ --enable-db-ipv6 ++endif ++ ++ifeq ($(BUILD_VARIANT),mini) ++ CONFIGURE_ARGS += \ ++ --disable-db-ieee \ ++ --disable-db-ipv4 \ ++ --disable-db-ipv6 ++endif ++ ++MAKE_FLAGS += \ ++ CC="$(TARGET_CC)" \ ++ COPTS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)" ++ ++define Package/ipv6calc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipv6calc $(1)/usr/bin/ ++endef ++ ++Package/ipv6calc-mini/install = $(Package/ipv6calc/install) ++ ++define Package/ipv6log/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ipv6log* $(1)/usr/bin/ ++endef ++ ++Package/ipv6log-mini/install = $(Package/ipv6log/install) ++ ++$(eval $(call BuildPackage,ipv6calc)) ++$(eval $(call BuildPackage,ipv6calc-mini)) ++$(eval $(call BuildPackage,ipv6log)) ++$(eval $(call BuildPackage,ipv6log-mini)) +diff --git a/feeds/packages/ipv6/miredo/.svn/dir-prop-base b/feeds/packages/ipv6/miredo/.svn/dir-prop-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/ipv6/miredo/.svn/entries b/feeds/packages/ipv6/miredo/.svn/entries +new file mode 100644 +index 0000000..107103c +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/miredo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-05T08:17:07.320297Z ++32998 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6a4d06216f134236eb0dba823a2f0814 ++2012-08-05T08:17:07.320297Z ++32998 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2966 ++ +diff --git a/feeds/packages/ipv6/miredo/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/miredo/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/miredo/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/miredo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7c26ed5 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,105 @@ ++# ++# 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:=miredo ++PKG_VERSION:=1.2.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_URL:=http://www.remlab.net/files/miredo ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=1281e7e75bddbde244cd778d99fa22d4 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/miredo/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ SUBMENU:=miredo: Teredo (IPv6 tunneling over UDP through NAT) ++ URL:=http://www.remlab.net/miredo/ ++endef ++ ++define Package/miredo-common ++$(call Package/miredo/Default) ++ TITLE:=Teredo (IPv6 tunneling over UDP through NAT) shared libraries ++ DEPENDS+= +ip +libpthread +librt $(CXX_DEPENDS) +kmod-ipv6 +kmod-tun ++endef ++ ++define Package/miredo-server ++$(call Package/miredo/Default) ++ TITLE:=Teredo (IPv6 tunneling over UDP through NAT) server daemon ++ DEPENDS+= +miredo-common ++endef ++ ++define Package/miredo-server/conffiles ++/etc/miredo/miredo-server.conf ++endef ++ ++define Package/miredo-client ++$(call Package/miredo/Default) ++ TITLE:=Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon ++ DEPENDS+= +miredo-common ++endef ++ ++define Package/miredo-client/conffiles ++/etc/miredo/miredo.conf ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-gnu-ld \ ++ --disable-rpath \ ++ --disable-chroot \ ++ --enable-teredo-client \ ++ --enable-miredo-user=root \ ++ --without-Judy ++ ++EXTRA_CXXFLAGS=-fno-rtti ++ ++CONFIGURE_VARS += \ ++ LIBS="-lm" \ ++ ac_cv_file__proc_self_maps=yes \ ++ ac_cv_header_sys_capability_h=no ++ ++MAKE_FLAGS := CXXLINK="$(TARGET_CXX)" ++ ++define Package/miredo-common/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{teredo,tun6}.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/miredo ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/miredo/miredo-privproc $(1)/usr/lib/miredo ++endef ++ ++define Package/miredo-server/install ++ $(INSTALL_DIR) $(1)/etc/miredo ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo-server.conf $(1)/etc/miredo/miredo-server.conf ++ $(INSTALL_BIN) ./files/client-hook $(1)/etc/miredo/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/miredo-server.init $(1)/etc/init.d/miredo-server ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/ ++endef ++ ++define Package/miredo-client/install ++ $(INSTALL_DIR) $(1)/etc/miredo ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo.conf $(1)/etc/miredo/miredo.conf ++ $(INSTALL_BIN) ./files/client-hook $(1)/etc/miredo/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/miredo.init $(1)/etc/init.d/miredo ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,miredo-common)) ++$(eval $(call BuildPackage,miredo-server)) ++$(eval $(call BuildPackage,miredo-client)) +diff --git a/feeds/packages/ipv6/miredo/Makefile b/feeds/packages/ipv6/miredo/Makefile +new file mode 100644 +index 0000000..7c26ed5 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/Makefile +@@ -0,0 +1,105 @@ ++# ++# 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:=miredo ++PKG_VERSION:=1.2.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_URL:=http://www.remlab.net/files/miredo ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=1281e7e75bddbde244cd778d99fa22d4 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/miredo/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ SUBMENU:=miredo: Teredo (IPv6 tunneling over UDP through NAT) ++ URL:=http://www.remlab.net/miredo/ ++endef ++ ++define Package/miredo-common ++$(call Package/miredo/Default) ++ TITLE:=Teredo (IPv6 tunneling over UDP through NAT) shared libraries ++ DEPENDS+= +ip +libpthread +librt $(CXX_DEPENDS) +kmod-ipv6 +kmod-tun ++endef ++ ++define Package/miredo-server ++$(call Package/miredo/Default) ++ TITLE:=Teredo (IPv6 tunneling over UDP through NAT) server daemon ++ DEPENDS+= +miredo-common ++endef ++ ++define Package/miredo-server/conffiles ++/etc/miredo/miredo-server.conf ++endef ++ ++define Package/miredo-client ++$(call Package/miredo/Default) ++ TITLE:=Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon ++ DEPENDS+= +miredo-common ++endef ++ ++define Package/miredo-client/conffiles ++/etc/miredo/miredo.conf ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-gnu-ld \ ++ --disable-rpath \ ++ --disable-chroot \ ++ --enable-teredo-client \ ++ --enable-miredo-user=root \ ++ --without-Judy ++ ++EXTRA_CXXFLAGS=-fno-rtti ++ ++CONFIGURE_VARS += \ ++ LIBS="-lm" \ ++ ac_cv_file__proc_self_maps=yes \ ++ ac_cv_header_sys_capability_h=no ++ ++MAKE_FLAGS := CXXLINK="$(TARGET_CXX)" ++ ++define Package/miredo-common/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{teredo,tun6}.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/miredo ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/miredo/miredo-privproc $(1)/usr/lib/miredo ++endef ++ ++define Package/miredo-server/install ++ $(INSTALL_DIR) $(1)/etc/miredo ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo-server.conf $(1)/etc/miredo/miredo-server.conf ++ $(INSTALL_BIN) ./files/client-hook $(1)/etc/miredo/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/miredo-server.init $(1)/etc/init.d/miredo-server ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/ ++endef ++ ++define Package/miredo-client/install ++ $(INSTALL_DIR) $(1)/etc/miredo ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo.conf $(1)/etc/miredo/miredo.conf ++ $(INSTALL_BIN) ./files/client-hook $(1)/etc/miredo/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/miredo.init $(1)/etc/init.d/miredo ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,miredo-common)) ++$(eval $(call BuildPackage,miredo-server)) ++$(eval $(call BuildPackage,miredo-client)) +diff --git a/feeds/packages/ipv6/miredo/files/.svn/entries b/feeds/packages/ipv6/miredo/files/.svn/entries +new file mode 100644 +index 0000000..621d36e +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/miredo/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:17.563315Z ++28924 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++miredo.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e8aad54a583ae4764b742e65e512547f ++2011-11-09T23:49:17.563315Z ++28924 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++247 ++ ++miredo-server.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++d394611fd97039d89eead83bd96b36dd ++2011-11-09T23:49:17.563315Z ++28924 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++194 ++ ++client-hook ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6daf289339b6559a33d272582c96b1a2 ++2010-08-22T16:36:35.381637Z ++22763 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1857 ++ +diff --git a/feeds/packages/ipv6/miredo/files/.svn/prop-base/miredo-server.init.svn-base b/feeds/packages/ipv6/miredo/files/.svn/prop-base/miredo-server.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/.svn/prop-base/miredo-server.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/miredo/files/.svn/prop-base/miredo.init.svn-base b/feeds/packages/ipv6/miredo/files/.svn/prop-base/miredo.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/.svn/prop-base/miredo.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/miredo/files/.svn/text-base/client-hook.svn-base b/feeds/packages/ipv6/miredo/files/.svn/text-base/client-hook.svn-base +new file mode 100644 +index 0000000..b4c3ce8 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/.svn/text-base/client-hook.svn-base +@@ -0,0 +1,70 @@ ++#! /bin/sh ++# ++# Miredo client hook script for Linux/iproute2 ++# Copyright © 2007 Rémi Denis-Courmont. ++# Distributed under the terms of the GNU General Public License version 2. ++ ++# Linux iproute2 path: ++IP="/usr/sbin/ip" ++ ++# Linux default route default metric is 1024 ++# (we put 1029 so that Teredo is used as a last resort): ++METRIC=1029 ++ ++# Linux routing table ID ++# (possible values: 1-252 from /etc/iproute/rt_tables): ++TABLE="teredo" ++ ++# Linux routing rule priority ++# (possible values: 1-32765, lowest number is highest priority): ++PRIO=32765 ++ ++# MTU for the tunnel interface ++# (default: specified by the Teredo server, or 1280) ++#MTU=1400 ++ ++if ! test -x "$IP"; then ++ echo "$0: iproute2 is required! Please install it." >&2 ++ exit 1 ++fi ++ ++# Nothing to do with destroy event ++if test "$STATE" = "destroy"; then exit 0; fi ++ ++# If the source routing table is not configured, ignore it. ++if ! "$IP" route show table "$TABLE" >/dev/null 2>&1; then ++ unset TABLE ++else ++ if test "$OLD_ADDRESS"; then ++ "$IP" -6 rule del from "$OLD_ADDRESS" \ ++ prio "$PRIO" table "$TABLE" 2>/dev/null ++ fi ++ "$IP" -6 route flush table "$TABLE" 2>/dev/null ++fi ++ ++"$IP" -6 route flush dev "$IFACE" 2>/dev/null ++"$IP" -6 address flush dev "$IFACE" 2>/dev/null ++ ++"$IP" -6 link set dev "$IFACE" "$STATE" ++if test "$MTU"; then ++ "$IP" link set dev "$IFACE" mtu "$MTU" ++fi ++ ++case "$STATE" in ++ up) ++ "$IP" -6 address add "${LLADDRESS}/64" dev "$IFACE" ++ "$IP" -6 address add "${ADDRESS}/32" dev "$IFACE" ++ "$IP" -6 route add default dev "$IFACE" metric "$METRIC" ++ ++ if test "$TABLE"; then ++ "$IP" -6 route add default dev "$IFACE" table "$TABLE" ++ "$IP" -6 rule add from "$ADDRESS" \ ++ prio "$PRIO" table "$TABLE" ++ fi ++esac ++ ++# This should be required when changing policy routing rules, but it ++# seems to confuse certain kernels into removing our default route! ++#"$IP" -6 route flush cache 2>/dev/null ++ ++exit 0 +diff --git a/feeds/packages/ipv6/miredo/files/.svn/text-base/miredo-server.init.svn-base b/feeds/packages/ipv6/miredo/files/.svn/text-base/miredo-server.init.svn-base +new file mode 100644 +index 0000000..e82820f +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/.svn/text-base/miredo-server.init.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/sbin/miredo-server ++} ++ ++stop() { ++ service_stop /usr/sbin/miredo-server ++} +diff --git a/feeds/packages/ipv6/miredo/files/.svn/text-base/miredo.init.svn-base b/feeds/packages/ipv6/miredo/files/.svn/text-base/miredo.init.svn-base +new file mode 100644 +index 0000000..0a83c96 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/.svn/text-base/miredo.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++# XXX: miredo create a pid file but using it doesn't seem to work ++#SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/sbin/miredo ++} ++ ++stop() { ++ service_stop /usr/sbin/miredo ++} +diff --git a/feeds/packages/ipv6/miredo/files/client-hook b/feeds/packages/ipv6/miredo/files/client-hook +new file mode 100644 +index 0000000..b4c3ce8 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/client-hook +@@ -0,0 +1,70 @@ ++#! /bin/sh ++# ++# Miredo client hook script for Linux/iproute2 ++# Copyright © 2007 Rémi Denis-Courmont. ++# Distributed under the terms of the GNU General Public License version 2. ++ ++# Linux iproute2 path: ++IP="/usr/sbin/ip" ++ ++# Linux default route default metric is 1024 ++# (we put 1029 so that Teredo is used as a last resort): ++METRIC=1029 ++ ++# Linux routing table ID ++# (possible values: 1-252 from /etc/iproute/rt_tables): ++TABLE="teredo" ++ ++# Linux routing rule priority ++# (possible values: 1-32765, lowest number is highest priority): ++PRIO=32765 ++ ++# MTU for the tunnel interface ++# (default: specified by the Teredo server, or 1280) ++#MTU=1400 ++ ++if ! test -x "$IP"; then ++ echo "$0: iproute2 is required! Please install it." >&2 ++ exit 1 ++fi ++ ++# Nothing to do with destroy event ++if test "$STATE" = "destroy"; then exit 0; fi ++ ++# If the source routing table is not configured, ignore it. ++if ! "$IP" route show table "$TABLE" >/dev/null 2>&1; then ++ unset TABLE ++else ++ if test "$OLD_ADDRESS"; then ++ "$IP" -6 rule del from "$OLD_ADDRESS" \ ++ prio "$PRIO" table "$TABLE" 2>/dev/null ++ fi ++ "$IP" -6 route flush table "$TABLE" 2>/dev/null ++fi ++ ++"$IP" -6 route flush dev "$IFACE" 2>/dev/null ++"$IP" -6 address flush dev "$IFACE" 2>/dev/null ++ ++"$IP" -6 link set dev "$IFACE" "$STATE" ++if test "$MTU"; then ++ "$IP" link set dev "$IFACE" mtu "$MTU" ++fi ++ ++case "$STATE" in ++ up) ++ "$IP" -6 address add "${LLADDRESS}/64" dev "$IFACE" ++ "$IP" -6 address add "${ADDRESS}/32" dev "$IFACE" ++ "$IP" -6 route add default dev "$IFACE" metric "$METRIC" ++ ++ if test "$TABLE"; then ++ "$IP" -6 route add default dev "$IFACE" table "$TABLE" ++ "$IP" -6 rule add from "$ADDRESS" \ ++ prio "$PRIO" table "$TABLE" ++ fi ++esac ++ ++# This should be required when changing policy routing rules, but it ++# seems to confuse certain kernels into removing our default route! ++#"$IP" -6 route flush cache 2>/dev/null ++ ++exit 0 +diff --git a/feeds/packages/ipv6/miredo/files/miredo-server.init b/feeds/packages/ipv6/miredo/files/miredo-server.init +new file mode 100644 +index 0000000..e82820f +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/miredo-server.init +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/sbin/miredo-server ++} ++ ++stop() { ++ service_stop /usr/sbin/miredo-server ++} +diff --git a/feeds/packages/ipv6/miredo/files/miredo.init b/feeds/packages/ipv6/miredo/files/miredo.init +new file mode 100644 +index 0000000..0a83c96 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/files/miredo.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++# XXX: miredo create a pid file but using it doesn't seem to work ++#SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/sbin/miredo ++} ++ ++stop() { ++ service_stop /usr/sbin/miredo ++} +diff --git a/feeds/packages/ipv6/miredo/patches/.svn/entries b/feeds/packages/ipv6/miredo/patches/.svn/entries +new file mode 100644 +index 0000000..dd1d3e4 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/miredo/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-16T22:20:47.696426Z ++31324 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-fix_compile_error.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c8345222b2dcef98a88a57e2c42ee220 ++2012-02-16T18:08:27.623272Z ++30598 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++189 ++ ++120-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++71e1f293aba55bd3c3c90afc1ce1e5cc ++2012-04-16T22:20:47.696426Z ++31324 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++760 ++ ++100-uclibc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c7e2c6fecf66b3e28e90786d424bd4d2 ++2011-02-01T21:41:45.799605Z ++25297 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++551 ++ +diff --git a/feeds/packages/ipv6/miredo/patches/.svn/text-base/100-uclibc.patch.svn-base b/feeds/packages/ipv6/miredo/patches/.svn/text-base/100-uclibc.patch.svn-base +new file mode 100644 +index 0000000..8818402 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/.svn/text-base/100-uclibc.patch.svn-base +@@ -0,0 +1,21 @@ ++--- a/libteredo/maintain.c +++++ b/libteredo/maintain.c ++@@ -59,7 +59,7 @@ ++ ++ static inline void gettime (struct timespec *now) ++ { ++-#if (_POSIX_CLOCK_SELECTION - 0 >= 0) && (_POSIX_MONOTONIC_CLOCK - 0 >= 0) +++#if (_POSIX_CLOCK_SELECTION - 0 >= 0) && (_POSIX_MONOTONIC_CLOCK - 0 >= 0) && !defined(__UCLIBC__) ++ if (clock_gettime (CLOCK_MONOTONIC, now) == 0) ++ return; ++ #else ++--- a/libteredo/tunnel.h +++++ b/libteredo/tunnel.h ++@@ -32,6 +32,7 @@ ++ # define LIBTEREDO_TUNNEL_H ++ ++ # include +++# include ++ ++ # ifdef __cplusplus ++ extern "C" { +diff --git a/feeds/packages/ipv6/miredo/patches/.svn/text-base/110-fix_compile_error.patch.svn-base b/feeds/packages/ipv6/miredo/patches/.svn/text-base/110-fix_compile_error.patch.svn-base +new file mode 100644 +index 0000000..a49b3f2 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/.svn/text-base/110-fix_compile_error.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/src/main.c +++++ b/src/main.c ++@@ -300,7 +300,9 @@ ++ if (val) ++ { ++ error_errno ("cap_set_proc"); +++#ifdef MIREDO_DEFAULT_USERNAME ++ setuid_notice (); +++#endif ++ return -1; ++ } ++ #endif +diff --git a/feeds/packages/ipv6/miredo/patches/.svn/text-base/120-automake-compat.patch.svn-base b/feeds/packages/ipv6/miredo/patches/.svn/text-base/120-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..608bba5 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/.svn/text-base/120-automake-compat.patch.svn-base +@@ -0,0 +1,23 @@ ++Index: miredo-1.2.4/src/Makefile.am ++=================================================================== ++--- miredo-1.2.4.orig/src/Makefile.am 2012-04-17 01:15:14.000000000 +0300 +++++ miredo-1.2.4/src/Makefile.am 2012-04-17 01:17:45.000000000 +0300 ++@@ -32,7 +32,8 @@ ++ -DPKGLIBDIR=\"$(pkglibdir)\" ++ ++ sbin_PROGRAMS = miredo miredo-server miredo-checkconf ++-pkglib_PROGRAMS = +++programfilesdir = $(pkglibdir) +++programfiles_PROGRAMS = ++ EXTRA_PROGRAMS = privproc ++ noinst_LTLIBRARIES = libmiredo.la ++ TESTS = ++@@ -59,7 +60,7 @@ ++ miredo_privproc_SOURCES = privproc.c privproc.h ++ miredo_privproc_LDADD = ../libteredo/libteredo.la $(LIBCAP) ++ if TEREDO_CLIENT ++-pkglib_PROGRAMS += miredo-privproc +++programfiles_PROGRAMS += miredo-privproc ++ TESTS += miredo-checkconf ++ endif ++ +diff --git a/feeds/packages/ipv6/miredo/patches/100-uclibc.patch b/feeds/packages/ipv6/miredo/patches/100-uclibc.patch +new file mode 100644 +index 0000000..8818402 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/100-uclibc.patch +@@ -0,0 +1,21 @@ ++--- a/libteredo/maintain.c +++++ b/libteredo/maintain.c ++@@ -59,7 +59,7 @@ ++ ++ static inline void gettime (struct timespec *now) ++ { ++-#if (_POSIX_CLOCK_SELECTION - 0 >= 0) && (_POSIX_MONOTONIC_CLOCK - 0 >= 0) +++#if (_POSIX_CLOCK_SELECTION - 0 >= 0) && (_POSIX_MONOTONIC_CLOCK - 0 >= 0) && !defined(__UCLIBC__) ++ if (clock_gettime (CLOCK_MONOTONIC, now) == 0) ++ return; ++ #else ++--- a/libteredo/tunnel.h +++++ b/libteredo/tunnel.h ++@@ -32,6 +32,7 @@ ++ # define LIBTEREDO_TUNNEL_H ++ ++ # include +++# include ++ ++ # ifdef __cplusplus ++ extern "C" { +diff --git a/feeds/packages/ipv6/miredo/patches/110-fix_compile_error.patch b/feeds/packages/ipv6/miredo/patches/110-fix_compile_error.patch +new file mode 100644 +index 0000000..a49b3f2 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/110-fix_compile_error.patch +@@ -0,0 +1,12 @@ ++--- a/src/main.c +++++ b/src/main.c ++@@ -300,7 +300,9 @@ ++ if (val) ++ { ++ error_errno ("cap_set_proc"); +++#ifdef MIREDO_DEFAULT_USERNAME ++ setuid_notice (); +++#endif ++ return -1; ++ } ++ #endif +diff --git a/feeds/packages/ipv6/miredo/patches/120-automake-compat.patch b/feeds/packages/ipv6/miredo/patches/120-automake-compat.patch +new file mode 100644 +index 0000000..608bba5 +--- /dev/null ++++ b/feeds/packages/ipv6/miredo/patches/120-automake-compat.patch +@@ -0,0 +1,23 @@ ++Index: miredo-1.2.4/src/Makefile.am ++=================================================================== ++--- miredo-1.2.4.orig/src/Makefile.am 2012-04-17 01:15:14.000000000 +0300 +++++ miredo-1.2.4/src/Makefile.am 2012-04-17 01:17:45.000000000 +0300 ++@@ -32,7 +32,8 @@ ++ -DPKGLIBDIR=\"$(pkglibdir)\" ++ ++ sbin_PROGRAMS = miredo miredo-server miredo-checkconf ++-pkglib_PROGRAMS = +++programfilesdir = $(pkglibdir) +++programfiles_PROGRAMS = ++ EXTRA_PROGRAMS = privproc ++ noinst_LTLIBRARIES = libmiredo.la ++ TESTS = ++@@ -59,7 +60,7 @@ ++ miredo_privproc_SOURCES = privproc.c privproc.h ++ miredo_privproc_LDADD = ../libteredo/libteredo.la $(LIBCAP) ++ if TEREDO_CLIENT ++-pkglib_PROGRAMS += miredo-privproc +++programfiles_PROGRAMS += miredo-privproc ++ TESTS += miredo-checkconf ++ endif ++ +diff --git a/feeds/packages/ipv6/mrd6/.svn/entries b/feeds/packages/ipv6/mrd6/.svn/entries +new file mode 100644 +index 0000000..0622589 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/mrd6 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++d29efb045f01686f21d05e536d81b1b1 ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2214 ++ +diff --git a/feeds/packages/ipv6/mrd6/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/mrd6/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/mrd6/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/mrd6/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b62caa4 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=mrd6 ++PKG_VERSION:=0.9.6 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mrd6/ ++PKG_MD5SUM:=a59d87857654ff92426062ad5664fcd6 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mrd6 ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=IPv6 multicast routing daemon ++ URL:=http://fivebits.net/proj/mrd6 ++ DEPENDS:=+kmod-ipv6 +libstdcpp ++endef ++ ++define Package/mrd6/description ++ Multicast is becoming a major component in next generation networks, used ++ in several scenarios, from video broadcasting to multimedia conferencing. ++ In order to be implemented, new technology needs supporting hardware and ++ software across a set of devices and systems. MRD6 is an implementation of ++ a modular IPv6 Multicast Routing Framework for the Linux operating system ++ and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support. ++endef ++ ++MRD6_MAKEFLAGS:= \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ OPTIMIZE=yes \ ++ SPACE_OPTIMIZE=yes \ ++ FULL_STATIC=no \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DNO_INET6_OPTION -fno-builtin -fno-rtti" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -ldl -lm" \ ++ MODULE_CXX="\$$$$(CC) -shared \$$$$(CXXFLAGS) \$$$$(LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ PREFIX="/usr" ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all ++endef ++ ++define Build/Install ++ $(MAKE) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) install ++endef ++ ++define Package/mrd6/conffiles ++/etc/mrd6.conf ++endef ++ ++define Package/mrd6/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_CONF) ./files/mrd6.conf $(1)/etc ++ $(INSTALL_BIN) ./files/mrd6.init $(1)/etc/init.d/mrd6 ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mrd $(1)/usr/sbin/mrd6 ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mrd6sh $(1)/usr/bin/mrd6sh ++ $(INSTALL_DIR) $(1)/usr/lib/mrd6 ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mrd6/bgp.so $(1)/usr/lib/mrd6/bgp.so ++endef ++ ++$(eval $(call BuildPackage,mrd6)) +diff --git a/feeds/packages/ipv6/mrd6/Makefile b/feeds/packages/ipv6/mrd6/Makefile +new file mode 100644 +index 0000000..b62caa4 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=mrd6 ++PKG_VERSION:=0.9.6 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mrd6/ ++PKG_MD5SUM:=a59d87857654ff92426062ad5664fcd6 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mrd6 ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=IPv6 multicast routing daemon ++ URL:=http://fivebits.net/proj/mrd6 ++ DEPENDS:=+kmod-ipv6 +libstdcpp ++endef ++ ++define Package/mrd6/description ++ Multicast is becoming a major component in next generation networks, used ++ in several scenarios, from video broadcasting to multimedia conferencing. ++ In order to be implemented, new technology needs supporting hardware and ++ software across a set of devices and systems. MRD6 is an implementation of ++ a modular IPv6 Multicast Routing Framework for the Linux operating system ++ and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support. ++endef ++ ++MRD6_MAKEFLAGS:= \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ OPTIMIZE=yes \ ++ SPACE_OPTIMIZE=yes \ ++ FULL_STATIC=no \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DNO_INET6_OPTION -fno-builtin -fno-rtti" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -ldl -lm" \ ++ MODULE_CXX="\$$$$(CC) -shared \$$$$(CXXFLAGS) \$$$$(LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ PREFIX="/usr" ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all ++endef ++ ++define Build/Install ++ $(MAKE) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) install ++endef ++ ++define Package/mrd6/conffiles ++/etc/mrd6.conf ++endef ++ ++define Package/mrd6/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_CONF) ./files/mrd6.conf $(1)/etc ++ $(INSTALL_BIN) ./files/mrd6.init $(1)/etc/init.d/mrd6 ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mrd $(1)/usr/sbin/mrd6 ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mrd6sh $(1)/usr/bin/mrd6sh ++ $(INSTALL_DIR) $(1)/usr/lib/mrd6 ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/mrd6/bgp.so $(1)/usr/lib/mrd6/bgp.so ++endef ++ ++$(eval $(call BuildPackage,mrd6)) +diff --git a/feeds/packages/ipv6/mrd6/files/.svn/entries b/feeds/packages/ipv6/mrd6/files/.svn/entries +new file mode 100644 +index 0000000..b936bf0 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/mrd6/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:19.402459Z ++28925 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mrd6.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++a09826af35a8be44e5203ec46dbf3fc8 ++2011-11-09T23:49:19.402459Z ++28925 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++179 ++ ++mrd6.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++94bbc05d3f6f6b400385841e73abdc43 ++2009-05-29T13:10:35.500066Z ++16194 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++457 ++ +diff --git a/feeds/packages/ipv6/mrd6/files/.svn/prop-base/mrd6.conf.svn-base b/feeds/packages/ipv6/mrd6/files/.svn/prop-base/mrd6.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/.svn/prop-base/mrd6.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/mrd6/files/.svn/prop-base/mrd6.init.svn-base b/feeds/packages/ipv6/mrd6/files/.svn/prop-base/mrd6.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/.svn/prop-base/mrd6.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/mrd6/files/.svn/text-base/mrd6.conf.svn-base b/feeds/packages/ipv6/mrd6/files/.svn/text-base/mrd6.conf.svn-base +new file mode 100644 +index 0000000..283ebd4 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/.svn/text-base/mrd6.conf.svn-base +@@ -0,0 +1,14 @@ ++log { ++ attach stderr normal; ++ attach default "/var/log/mrd6.log" message_err; ++} ++ ++interfaces disable br-lan; // Should be vlan0 + eth1 but Linux bridge seems broken for multicast ++interfaces disable eth0; // Interface to internal bridge ++handle-proper-bridge = true; // use ETH_P_ALL to see all packets on wrt54g ++ ++// The default configured RP is m6bone's Renater RP. ++// Change this according to your setup ++ ++groups ff00::/8 pim rp = 2001:660:3007:300:1::; ++ +diff --git a/feeds/packages/ipv6/mrd6/files/.svn/text-base/mrd6.init.svn-base b/feeds/packages/ipv6/mrd6/files/.svn/text-base/mrd6.init.svn-base +new file mode 100644 +index 0000000..2481840 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/.svn/text-base/mrd6.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ service_start /usr/sbin/mrd6 -f /etc/mrd6.conf -D ++} ++ ++stop() { ++ service_stop /usr/sbin/mrd6 ++} ++ +diff --git a/feeds/packages/ipv6/mrd6/files/mrd6.conf b/feeds/packages/ipv6/mrd6/files/mrd6.conf +new file mode 100644 +index 0000000..283ebd4 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/mrd6.conf +@@ -0,0 +1,14 @@ ++log { ++ attach stderr normal; ++ attach default "/var/log/mrd6.log" message_err; ++} ++ ++interfaces disable br-lan; // Should be vlan0 + eth1 but Linux bridge seems broken for multicast ++interfaces disable eth0; // Interface to internal bridge ++handle-proper-bridge = true; // use ETH_P_ALL to see all packets on wrt54g ++ ++// The default configured RP is m6bone's Renater RP. ++// Change this according to your setup ++ ++groups ff00::/8 pim rp = 2001:660:3007:300:1::; ++ +diff --git a/feeds/packages/ipv6/mrd6/files/mrd6.init b/feeds/packages/ipv6/mrd6/files/mrd6.init +new file mode 100644 +index 0000000..2481840 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/files/mrd6.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ service_start /usr/sbin/mrd6 -f /etc/mrd6.conf -D ++} ++ ++stop() { ++ service_stop /usr/sbin/mrd6 ++} ++ +diff --git a/feeds/packages/ipv6/mrd6/patches/.svn/entries b/feeds/packages/ipv6/mrd6/patches/.svn/entries +new file mode 100644 +index 0000000..7c12846 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/mrd6/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-16T18:08:29.264259Z ++30599 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-add_missing_include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++4bb17958223a03295a9f45901defacab ++2012-02-16T18:08:29.264259Z ++30599 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++212 ++ ++003-debian.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++733f3b2875362145a2df891b9c5ca9ba ++2009-05-29T13:10:35.500066Z ++16194 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2001 ++ ++002-missing_netlink_defs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++d9f42c9ce5e68c1b9fd80704743a8318 ++2007-09-21T11:51:00.499766Z ++8909 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1836 ++ ++004-ambiguous_call_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e9f6b97cfca2f537f6dc680b5bedadad ++2011-07-11T00:59:26.041600Z ++27587 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++568 ++ +diff --git a/feeds/packages/ipv6/mrd6/patches/.svn/prop-base/002-missing_netlink_defs.patch.svn-base b/feeds/packages/ipv6/mrd6/patches/.svn/prop-base/002-missing_netlink_defs.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/.svn/prop-base/002-missing_netlink_defs.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/mrd6/patches/.svn/text-base/001-add_missing_include.patch.svn-base b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/001-add_missing_include.patch.svn-base +new file mode 100644 +index 0000000..5501909 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/001-add_missing_include.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/include/mrd/support/ptree.h +++++ b/include/mrd/support/ptree.h ++@@ -35,6 +35,7 @@ ++ #ifndef _Ptree_h_ ++ #define _Ptree_h_ ++ +++#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/ipv6/mrd6/patches/.svn/text-base/002-missing_netlink_defs.patch.svn-base b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/002-missing_netlink_defs.patch.svn-base +new file mode 100644 +index 0000000..28ab711 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/002-missing_netlink_defs.patch.svn-base +@@ -0,0 +1,58 @@ ++Index: mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h 2007-09-21 13:19:06.000000000 +0200 ++@@ -0,0 +1,41 @@ +++#include +++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ +++#include +++#include +++#include +++ +++#ifndef IFA_RTA +++#define IFA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) +++#endif +++#ifndef IFA_PAYLOAD +++#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) +++#endif +++ +++#ifndef IFLA_RTA +++#define IFLA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) +++#endif +++#ifndef IFLA_PAYLOAD +++#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) +++#endif +++ +++#ifndef NDA_RTA +++#define NDA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg)))) +++#endif +++#ifndef NDA_PAYLOAD +++#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg)) +++#endif +++ +++#ifndef NDTA_RTA +++#define NDTA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg)))) +++#endif +++#ifndef NDTA_PAYLOAD +++#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg)) +++#endif +++ +++#endif ++Index: mrd6-0.9.5/src/linux/linux_unicast_route.cpp ++=================================================================== ++--- mrd6-0.9.5.orig/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:05.000000000 +0200 +++++ mrd6-0.9.5/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:06.000000000 +0200 ++@@ -23,6 +23,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/ipv6/mrd6/patches/.svn/text-base/003-debian.patch.svn-base b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/003-debian.patch.svn-base +new file mode 100644 +index 0000000..6b99958 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/003-debian.patch.svn-base +@@ -0,0 +1,71 @@ ++--- mrd6-0.9.6.orig/src/log.cpp +++++ mrd6-0.9.6/src/log.cpp ++@@ -667,3 +667,12 @@ ++ os.nprintf(32, "%p", val); ++ } ++ +++#ifdef __s390__ +++const char *stream_type_format_parameter(size_t) { +++ return "u"; +++} +++ +++void stream_push_formated_type(base_stream &os, size_t val) { +++ os.nprintf(32, "%z", val); +++} +++#endif ++--- mrd6-0.9.6.orig/src/mrd.cpp +++++ mrd6-0.9.6/src/mrd.cpp ++@@ -44,6 +44,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #include ++@@ -2338,7 +2339,8 @@ ++ ++ out.xprintf("Uptime: %{duration}\n", time_duration((time(0) - m_startup) * 1000)); ++ out.xprintf("Performed tasks: %u (spent %llu ms)\n", m_tasks_stat, m_tasks_time_spent); ++- out.xprintf("Registered sockets: %u reading, %u writing\n", m_read.size(), m_write.size()); +++ out.xprintf("Registered sockets: %u reading, %u writing\n", +++ (uint32_t)m_read.size(), (uint32_t)m_write.size()); ++ out.xprintf("MRIB prefix count: %u\n", mrib().registry_prefix_count()); ++ out.xprintf("Interface count: %u\n", m_intflist.size()); ++ out.xprintf("Group state count: %u\n", m_grplist.size()); ++--- mrd6-0.9.6.orig/src/bgp/bgp.cpp +++++ mrd6-0.9.6/src/bgp/bgp.cpp ++@@ -35,6 +35,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ ++--- mrd6-0.9.6.orig/src/linux/mrd_components.cpp +++++ mrd6-0.9.6/src/linux/mrd_components.cpp ++@@ -92,8 +92,6 @@ ++ #if defined(__GLIBC__) ++ #if defined(__i386__) ++ return (void *)base->uc_mcontext.gregs[REG_EIP]; ++-#elif defined(__mips__) ++- return (void *)base->uc_mcontext.gpregs[CTX_EPC]; ++ #endif ++ #endif ++ return 0; ++--- mrd6-0.9.6.orig/include/mrd/log.h +++++ mrd6-0.9.6/include/mrd/log.h ++@@ -53,6 +53,12 @@ ++ void stream_push_formated_type(base_stream &, const char *val); ++ void stream_push_formated_type(base_stream &, const void *val); ++ +++ +++#ifdef __s390__ +++const char *stream_type_format_parameter(size_t); +++void stream_push_formated_type(base_stream &, size_t val); +++#endif +++ ++ /*! ++ * base log stream ++ */ +diff --git a/feeds/packages/ipv6/mrd6/patches/.svn/text-base/004-ambiguous_call_fix.patch.svn-base b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/004-ambiguous_call_fix.patch.svn-base +new file mode 100644 +index 0000000..a72eb24 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/.svn/text-base/004-ambiguous_call_fix.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/src/mrd.cpp +++++ b/src/mrd.cpp ++@@ -2342,8 +2342,8 @@ bool mrd::show_info(base_stream &out, co ++ out.xprintf("Registered sockets: %u reading, %u writing\n", ++ (uint32_t)m_read.size(), (uint32_t)m_write.size()); ++ out.xprintf("MRIB prefix count: %u\n", mrib().registry_prefix_count()); ++- out.xprintf("Interface count: %u\n", m_intflist.size()); ++- out.xprintf("Group state count: %u\n", m_grplist.size()); +++ out.xprintf("Interface count: %u\n", (uint32_t)m_intflist.size()); +++ out.xprintf("Group state count: %u\n", (uint32_t)m_grplist.size()); ++ ++ return true; ++ } +diff --git a/feeds/packages/ipv6/mrd6/patches/001-add_missing_include.patch b/feeds/packages/ipv6/mrd6/patches/001-add_missing_include.patch +new file mode 100644 +index 0000000..5501909 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/001-add_missing_include.patch +@@ -0,0 +1,10 @@ ++--- a/include/mrd/support/ptree.h +++++ b/include/mrd/support/ptree.h ++@@ -35,6 +35,7 @@ ++ #ifndef _Ptree_h_ ++ #define _Ptree_h_ ++ +++#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/ipv6/mrd6/patches/002-missing_netlink_defs.patch b/feeds/packages/ipv6/mrd6/patches/002-missing_netlink_defs.patch +new file mode 100644 +index 0000000..28ab711 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/002-missing_netlink_defs.patch +@@ -0,0 +1,58 @@ ++Index: mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h 2007-09-21 13:19:06.000000000 +0200 ++@@ -0,0 +1,41 @@ +++#include +++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ +++#include +++#include +++#include +++ +++#ifndef IFA_RTA +++#define IFA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) +++#endif +++#ifndef IFA_PAYLOAD +++#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) +++#endif +++ +++#ifndef IFLA_RTA +++#define IFLA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) +++#endif +++#ifndef IFLA_PAYLOAD +++#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) +++#endif +++ +++#ifndef NDA_RTA +++#define NDA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg)))) +++#endif +++#ifndef NDA_PAYLOAD +++#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg)) +++#endif +++ +++#ifndef NDTA_RTA +++#define NDTA_RTA(r) \ +++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg)))) +++#endif +++#ifndef NDTA_PAYLOAD +++#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg)) +++#endif +++ +++#endif ++Index: mrd6-0.9.5/src/linux/linux_unicast_route.cpp ++=================================================================== ++--- mrd6-0.9.5.orig/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:05.000000000 +0200 +++++ mrd6-0.9.5/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:06.000000000 +0200 ++@@ -23,6 +23,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/ipv6/mrd6/patches/003-debian.patch b/feeds/packages/ipv6/mrd6/patches/003-debian.patch +new file mode 100644 +index 0000000..6b99958 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/003-debian.patch +@@ -0,0 +1,71 @@ ++--- mrd6-0.9.6.orig/src/log.cpp +++++ mrd6-0.9.6/src/log.cpp ++@@ -667,3 +667,12 @@ ++ os.nprintf(32, "%p", val); ++ } ++ +++#ifdef __s390__ +++const char *stream_type_format_parameter(size_t) { +++ return "u"; +++} +++ +++void stream_push_formated_type(base_stream &os, size_t val) { +++ os.nprintf(32, "%z", val); +++} +++#endif ++--- mrd6-0.9.6.orig/src/mrd.cpp +++++ mrd6-0.9.6/src/mrd.cpp ++@@ -44,6 +44,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #include ++@@ -2338,7 +2339,8 @@ ++ ++ out.xprintf("Uptime: %{duration}\n", time_duration((time(0) - m_startup) * 1000)); ++ out.xprintf("Performed tasks: %u (spent %llu ms)\n", m_tasks_stat, m_tasks_time_spent); ++- out.xprintf("Registered sockets: %u reading, %u writing\n", m_read.size(), m_write.size()); +++ out.xprintf("Registered sockets: %u reading, %u writing\n", +++ (uint32_t)m_read.size(), (uint32_t)m_write.size()); ++ out.xprintf("MRIB prefix count: %u\n", mrib().registry_prefix_count()); ++ out.xprintf("Interface count: %u\n", m_intflist.size()); ++ out.xprintf("Group state count: %u\n", m_grplist.size()); ++--- mrd6-0.9.6.orig/src/bgp/bgp.cpp +++++ mrd6-0.9.6/src/bgp/bgp.cpp ++@@ -35,6 +35,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ ++--- mrd6-0.9.6.orig/src/linux/mrd_components.cpp +++++ mrd6-0.9.6/src/linux/mrd_components.cpp ++@@ -92,8 +92,6 @@ ++ #if defined(__GLIBC__) ++ #if defined(__i386__) ++ return (void *)base->uc_mcontext.gregs[REG_EIP]; ++-#elif defined(__mips__) ++- return (void *)base->uc_mcontext.gpregs[CTX_EPC]; ++ #endif ++ #endif ++ return 0; ++--- mrd6-0.9.6.orig/include/mrd/log.h +++++ mrd6-0.9.6/include/mrd/log.h ++@@ -53,6 +53,12 @@ ++ void stream_push_formated_type(base_stream &, const char *val); ++ void stream_push_formated_type(base_stream &, const void *val); ++ +++ +++#ifdef __s390__ +++const char *stream_type_format_parameter(size_t); +++void stream_push_formated_type(base_stream &, size_t val); +++#endif +++ ++ /*! ++ * base log stream ++ */ +diff --git a/feeds/packages/ipv6/mrd6/patches/004-ambiguous_call_fix.patch b/feeds/packages/ipv6/mrd6/patches/004-ambiguous_call_fix.patch +new file mode 100644 +index 0000000..a72eb24 +--- /dev/null ++++ b/feeds/packages/ipv6/mrd6/patches/004-ambiguous_call_fix.patch +@@ -0,0 +1,13 @@ ++--- a/src/mrd.cpp +++++ b/src/mrd.cpp ++@@ -2342,8 +2342,8 @@ bool mrd::show_info(base_stream &out, co ++ out.xprintf("Registered sockets: %u reading, %u writing\n", ++ (uint32_t)m_read.size(), (uint32_t)m_write.size()); ++ out.xprintf("MRIB prefix count: %u\n", mrib().registry_prefix_count()); ++- out.xprintf("Interface count: %u\n", m_intflist.size()); ++- out.xprintf("Group state count: %u\n", m_grplist.size()); +++ out.xprintf("Interface count: %u\n", (uint32_t)m_intflist.size()); +++ out.xprintf("Group state count: %u\n", (uint32_t)m_grplist.size()); ++ ++ return true; ++ } +diff --git a/feeds/packages/ipv6/ndisc/.svn/entries b/feeds/packages/ipv6/ndisc/.svn/entries +new file mode 100644 +index 0000000..0e30fe4 +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ndisc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T20:41:09.767752Z ++32536 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++f20cb5a6370ccb372bc2ad2339e12866 ++2012-01-16T06:25:23.961537Z ++29759 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2244 ++ +diff --git a/feeds/packages/ipv6/ndisc/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/ndisc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/ndisc/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/ndisc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..249e96a +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,98 @@ ++# ++# 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:=ndisc6 ++PKG_VERSION:=1.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6 ++PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ndisc ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ SUBMENU:=IPv6 discovery tools ++ TITLE:=IPv6 discovery tools ++ URL:=http://www.remlab.net/ndisc6/ ++ DEPENDS:=+libpthread +librt ++endef ++ ++define Package/ndisc/description ++IPv6 discovery tools ++endef ++ ++define Package/ndisc6 ++ $(call Package/ndisc) ++ TITLE:=An ICMPv6 neighbour discovery tool ++endef ++ ++define Package/ndisc6/description ++An ICMPv6 neighbour discovery tools ++endef ++ ++define Package/rdisc6 ++ $(call Package/ndisc) ++ TITLE:=An ICMPv6 router discovery tool ++endef ++ ++define Package/rdisc6/description ++An ICMPv6 router discovery tool ++endef ++ ++define Package/traceroute6 ++ $(call Package/ndisc) ++ TITLE:=An IPv6-based traceroute implementation ++endef ++ ++define Package/traceroute6/description ++An IPv6-based traceroute implementation ++endef ++ ++define Package/rdnssd ++ $(call Package/ndisc) ++ TITLE:=DNS server discovery daemon ++endef ++ ++define Package/rdnssd/description ++A recursive DNS server discovery daemon gathering ++information through stateless IPv6 autoconfiguration (RFC5006) ++endef ++ ++TARGET_CFLAGS += -std=c99 ++ ++define Package/ndisc6/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/ ++endef ++ ++define Package/rdisc6/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/ ++endef ++ ++define Package/traceroute6/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/ ++endef ++ ++define Package/rdnssd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ndisc6)) ++$(eval $(call BuildPackage,rdisc6)) ++$(eval $(call BuildPackage,traceroute6)) ++$(eval $(call BuildPackage,rdnssd)) +diff --git a/feeds/packages/ipv6/ndisc/Makefile b/feeds/packages/ipv6/ndisc/Makefile +new file mode 100644 +index 0000000..249e96a +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/Makefile +@@ -0,0 +1,98 @@ ++# ++# 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:=ndisc6 ++PKG_VERSION:=1.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6 ++PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ndisc ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ SUBMENU:=IPv6 discovery tools ++ TITLE:=IPv6 discovery tools ++ URL:=http://www.remlab.net/ndisc6/ ++ DEPENDS:=+libpthread +librt ++endef ++ ++define Package/ndisc/description ++IPv6 discovery tools ++endef ++ ++define Package/ndisc6 ++ $(call Package/ndisc) ++ TITLE:=An ICMPv6 neighbour discovery tool ++endef ++ ++define Package/ndisc6/description ++An ICMPv6 neighbour discovery tools ++endef ++ ++define Package/rdisc6 ++ $(call Package/ndisc) ++ TITLE:=An ICMPv6 router discovery tool ++endef ++ ++define Package/rdisc6/description ++An ICMPv6 router discovery tool ++endef ++ ++define Package/traceroute6 ++ $(call Package/ndisc) ++ TITLE:=An IPv6-based traceroute implementation ++endef ++ ++define Package/traceroute6/description ++An IPv6-based traceroute implementation ++endef ++ ++define Package/rdnssd ++ $(call Package/ndisc) ++ TITLE:=DNS server discovery daemon ++endef ++ ++define Package/rdnssd/description ++A recursive DNS server discovery daemon gathering ++information through stateless IPv6 autoconfiguration (RFC5006) ++endef ++ ++TARGET_CFLAGS += -std=c99 ++ ++define Package/ndisc6/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/ ++endef ++ ++define Package/rdisc6/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/ ++endef ++ ++define Package/traceroute6/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/ ++endef ++ ++define Package/rdnssd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ndisc6)) ++$(eval $(call BuildPackage,rdisc6)) ++$(eval $(call BuildPackage,traceroute6)) ++$(eval $(call BuildPackage,rdnssd)) +diff --git a/feeds/packages/ipv6/ndisc/patches/.svn/entries b/feeds/packages/ipv6/ndisc/patches/.svn/entries +new file mode 100644 +index 0000000..85c5997 +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ndisc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T20:41:09.767752Z ++32536 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-favor_bsd.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++738c2e14d0a20e7af0f4cddda869d40e ++2010-06-13T00:17:30.323294Z ++21772 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++351 ++ ++110-strverscmp.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6b87620c306f18976fa450d21702e0ae ++2011-02-03T03:25:29.339650Z ++25336 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5471 ++ +diff --git a/feeds/packages/ipv6/ndisc/patches/.svn/text-base/100-favor_bsd.patch.svn-base b/feeds/packages/ipv6/ndisc/patches/.svn/text-base/100-favor_bsd.patch.svn-base +new file mode 100644 +index 0000000..ed6090d +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/patches/.svn/text-base/100-favor_bsd.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/src/trace-tcp.c +++++ b/src/trace-tcp.c ++@@ -24,6 +24,7 @@ ++ ++ #undef _GNU_SOURCE ++ #define _BSD_SOURCE 1 +++#define __FAVOR_BSD 1 ++ ++ #include ++ #include ++--- a/src/trace-udp.c +++++ b/src/trace-udp.c ++@@ -24,6 +24,7 @@ ++ ++ #undef _GNU_SOURCE ++ #define _BSD_SOURCE 1 +++#define __FAVOR_BSD 1 ++ ++ #include ++ #include +diff --git a/feeds/packages/ipv6/ndisc/patches/.svn/text-base/110-strverscmp.patch.svn-base b/feeds/packages/ipv6/ndisc/patches/.svn/text-base/110-strverscmp.patch.svn-base +new file mode 100644 +index 0000000..345661f +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/patches/.svn/text-base/110-strverscmp.patch.svn-base +@@ -0,0 +1,175 @@ ++--- a/rdnssd/Makefile.am +++++ b/rdnssd/Makefile.am ++@@ -30,7 +30,8 @@ conf_SCRIPTS = merge-hook ++ # rdnssd ++ rdnssd_SOURCES = rdnssd.c rdnssd.h \ ++ icmp.c \ ++- netlink.c +++ netlink.c \ +++ strverscmp.c ++ rdnssd_LDADD = $(LIBRT) \ ++ @top_builddir@/compat/libcompat.a ++ ++--- a/rdnssd/Makefile.in +++++ b/rdnssd/Makefile.in ++@@ -60,7 +60,7 @@ CONFIG_CLEAN_FILES = ++ CONFIG_CLEAN_VPATH_FILES = ++ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(confdir)" ++ PROGRAMS = $(sbin_PROGRAMS) ++-am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT) +++am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT) strverscmp.$(OBJEXT) ++ rdnssd_OBJECTS = $(am_rdnssd_OBJECTS) ++ am__DEPENDENCIES_1 = ++ rdnssd_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++@@ -251,7 +251,8 @@ conf_SCRIPTS = merge-hook ++ # rdnssd ++ rdnssd_SOURCES = rdnssd.c rdnssd.h \ ++ icmp.c \ ++- netlink.c +++ netlink.c \ +++ strverscmp.c ++ ++ rdnssd_LDADD = $(LIBRT) \ ++ @top_builddir@/compat/libcompat.a ++@@ -373,6 +374,7 @@ distclean-compile: ++ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icmp.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink.Po@am__quote@ +++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strverscmp.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdnssd.Po@am__quote@ ++ ++ .c.o: ++--- /dev/null +++++ b/rdnssd/strverscmp.c ++@@ -0,0 +1,131 @@ +++/* Compare strings while treating digits characters numerically. +++ Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc. +++ This file is part of the GNU C Library. +++ Contributed by Jean-François Bignolles , 1997. +++ +++ 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, 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. */ +++ +++#ifdef HAVE_CONFIG_H +++# include +++#endif +++ +++#include +++#include +++ +++/* states: S_N: normal, S_I: comparing integral part, S_F: comparing +++ fractional parts, S_Z: idem but with leading Zeroes only */ +++#define S_N 0x0 +++#define S_I 0x4 +++#define S_F 0x8 +++#define S_Z 0xC +++ +++/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ +++#define CMP 2 +++#define LEN 3 +++ +++ +++/* ISDIGIT differs from isdigit, as follows: +++ - Its arg may be any int or unsigned int; it need not be an unsigned char. +++ - It's guaranteed to evaluate its argument exactly once. +++ - It's typically faster. +++ POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to +++ ISDIGIT_LOCALE unless it's important to use the locale's definition +++ of `digit' even when the host does not conform to POSIX. */ +++#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) +++ +++#undef __strverscmp +++#undef strverscmp +++ +++#ifndef weak_alias +++# define __strverscmp strverscmp +++#endif +++ +++/* Compare S1 and S2 as strings holding indices/version numbers, +++ returning less than, equal to or greater than zero if S1 is less than, +++ equal to or greater than S2 (for more info, see the texinfo doc). +++*/ +++ +++int +++__strverscmp (const char *s1, const char *s2) +++{ +++ const unsigned char *p1 = (const unsigned char *) s1; +++ const unsigned char *p2 = (const unsigned char *) s2; +++ unsigned char c1, c2; +++ int state; +++ int diff; +++ +++ /* Symbol(s) 0 [1-9] others (padding) +++ Transition (10) 0 (01) d (00) x (11) - */ +++ static const unsigned int next_state[] = +++ { +++ /* state x d 0 - */ +++ /* S_N */ S_N, S_I, S_Z, S_N, +++ /* S_I */ S_N, S_I, S_I, S_I, +++ /* S_F */ S_N, S_F, S_F, S_F, +++ /* S_Z */ S_N, S_F, S_Z, S_Z +++ }; +++ +++ static const int result_type[] = +++ { +++ /* state x/x x/d x/0 x/- d/x d/d d/0 d/- +++ 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ +++ +++ /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, +++ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, +++ /* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP, +++ 1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, +++ /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, +++ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, +++ /* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP, +++ -1, CMP, CMP, CMP +++ }; +++ +++ if (p1 == p2) +++ return 0; +++ +++ c1 = *p1++; +++ c2 = *p2++; +++ /* Hint: '0' is a digit too. */ +++ state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0)); +++ +++ while ((diff = c1 - c2) == 0 && c1 != '\0') +++ { +++ state = next_state[state]; +++ c1 = *p1++; +++ c2 = *p2++; +++ state |= (c1 == '0') + (ISDIGIT (c1) != 0); +++ } +++ +++ state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))]; +++ +++ switch (state) +++ { +++ case CMP: +++ return diff; +++ +++ case LEN: +++ while (ISDIGIT (*p1++)) +++ if (!ISDIGIT (*p2++)) +++ return 1; +++ +++ return ISDIGIT (*p2) ? -1 : diff; +++ +++ default: +++ return state; +++ } +++} +++#ifdef weak_alias +++weak_alias (__strverscmp, strverscmp) +++#endif +diff --git a/feeds/packages/ipv6/ndisc/patches/100-favor_bsd.patch b/feeds/packages/ipv6/ndisc/patches/100-favor_bsd.patch +new file mode 100644 +index 0000000..ed6090d +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/patches/100-favor_bsd.patch +@@ -0,0 +1,20 @@ ++--- a/src/trace-tcp.c +++++ b/src/trace-tcp.c ++@@ -24,6 +24,7 @@ ++ ++ #undef _GNU_SOURCE ++ #define _BSD_SOURCE 1 +++#define __FAVOR_BSD 1 ++ ++ #include ++ #include ++--- a/src/trace-udp.c +++++ b/src/trace-udp.c ++@@ -24,6 +24,7 @@ ++ ++ #undef _GNU_SOURCE ++ #define _BSD_SOURCE 1 +++#define __FAVOR_BSD 1 ++ ++ #include ++ #include +diff --git a/feeds/packages/ipv6/ndisc/patches/110-strverscmp.patch b/feeds/packages/ipv6/ndisc/patches/110-strverscmp.patch +new file mode 100644 +index 0000000..345661f +--- /dev/null ++++ b/feeds/packages/ipv6/ndisc/patches/110-strverscmp.patch +@@ -0,0 +1,175 @@ ++--- a/rdnssd/Makefile.am +++++ b/rdnssd/Makefile.am ++@@ -30,7 +30,8 @@ conf_SCRIPTS = merge-hook ++ # rdnssd ++ rdnssd_SOURCES = rdnssd.c rdnssd.h \ ++ icmp.c \ ++- netlink.c +++ netlink.c \ +++ strverscmp.c ++ rdnssd_LDADD = $(LIBRT) \ ++ @top_builddir@/compat/libcompat.a ++ ++--- a/rdnssd/Makefile.in +++++ b/rdnssd/Makefile.in ++@@ -60,7 +60,7 @@ CONFIG_CLEAN_FILES = ++ CONFIG_CLEAN_VPATH_FILES = ++ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(confdir)" ++ PROGRAMS = $(sbin_PROGRAMS) ++-am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT) +++am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT) strverscmp.$(OBJEXT) ++ rdnssd_OBJECTS = $(am_rdnssd_OBJECTS) ++ am__DEPENDENCIES_1 = ++ rdnssd_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++@@ -251,7 +251,8 @@ conf_SCRIPTS = merge-hook ++ # rdnssd ++ rdnssd_SOURCES = rdnssd.c rdnssd.h \ ++ icmp.c \ ++- netlink.c +++ netlink.c \ +++ strverscmp.c ++ ++ rdnssd_LDADD = $(LIBRT) \ ++ @top_builddir@/compat/libcompat.a ++@@ -373,6 +374,7 @@ distclean-compile: ++ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icmp.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink.Po@am__quote@ +++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strverscmp.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdnssd.Po@am__quote@ ++ ++ .c.o: ++--- /dev/null +++++ b/rdnssd/strverscmp.c ++@@ -0,0 +1,131 @@ +++/* Compare strings while treating digits characters numerically. +++ Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc. +++ This file is part of the GNU C Library. +++ Contributed by Jean-François Bignolles , 1997. +++ +++ 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, 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. */ +++ +++#ifdef HAVE_CONFIG_H +++# include +++#endif +++ +++#include +++#include +++ +++/* states: S_N: normal, S_I: comparing integral part, S_F: comparing +++ fractional parts, S_Z: idem but with leading Zeroes only */ +++#define S_N 0x0 +++#define S_I 0x4 +++#define S_F 0x8 +++#define S_Z 0xC +++ +++/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ +++#define CMP 2 +++#define LEN 3 +++ +++ +++/* ISDIGIT differs from isdigit, as follows: +++ - Its arg may be any int or unsigned int; it need not be an unsigned char. +++ - It's guaranteed to evaluate its argument exactly once. +++ - It's typically faster. +++ POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to +++ ISDIGIT_LOCALE unless it's important to use the locale's definition +++ of `digit' even when the host does not conform to POSIX. */ +++#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) +++ +++#undef __strverscmp +++#undef strverscmp +++ +++#ifndef weak_alias +++# define __strverscmp strverscmp +++#endif +++ +++/* Compare S1 and S2 as strings holding indices/version numbers, +++ returning less than, equal to or greater than zero if S1 is less than, +++ equal to or greater than S2 (for more info, see the texinfo doc). +++*/ +++ +++int +++__strverscmp (const char *s1, const char *s2) +++{ +++ const unsigned char *p1 = (const unsigned char *) s1; +++ const unsigned char *p2 = (const unsigned char *) s2; +++ unsigned char c1, c2; +++ int state; +++ int diff; +++ +++ /* Symbol(s) 0 [1-9] others (padding) +++ Transition (10) 0 (01) d (00) x (11) - */ +++ static const unsigned int next_state[] = +++ { +++ /* state x d 0 - */ +++ /* S_N */ S_N, S_I, S_Z, S_N, +++ /* S_I */ S_N, S_I, S_I, S_I, +++ /* S_F */ S_N, S_F, S_F, S_F, +++ /* S_Z */ S_N, S_F, S_Z, S_Z +++ }; +++ +++ static const int result_type[] = +++ { +++ /* state x/x x/d x/0 x/- d/x d/d d/0 d/- +++ 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ +++ +++ /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, +++ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, +++ /* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP, +++ 1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, +++ /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, +++ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, +++ /* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP, +++ -1, CMP, CMP, CMP +++ }; +++ +++ if (p1 == p2) +++ return 0; +++ +++ c1 = *p1++; +++ c2 = *p2++; +++ /* Hint: '0' is a digit too. */ +++ state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0)); +++ +++ while ((diff = c1 - c2) == 0 && c1 != '\0') +++ { +++ state = next_state[state]; +++ c1 = *p1++; +++ c2 = *p2++; +++ state |= (c1 == '0') + (ISDIGIT (c1) != 0); +++ } +++ +++ state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))]; +++ +++ switch (state) +++ { +++ case CMP: +++ return diff; +++ +++ case LEN: +++ while (ISDIGIT (*p1++)) +++ if (!ISDIGIT (*p2++)) +++ return 1; +++ +++ return ISDIGIT (*p2) ? -1 : diff; +++ +++ default: +++ return state; +++ } +++} +++#ifdef weak_alias +++weak_alias (__strverscmp, strverscmp) +++#endif +diff --git a/feeds/packages/ipv6/ndppd/.svn/entries b/feeds/packages/ipv6/ndppd/.svn/entries +new file mode 100644 +index 0000000..6b0cefc +--- /dev/null ++++ b/feeds/packages/ipv6/ndppd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ndppd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-04T17:02:17.159870Z ++32985 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++942b8156eca2b431f0a45a946bdf3133 ++2012-08-04T17:02:17.159870Z ++32985 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1967 ++ +diff --git a/feeds/packages/ipv6/ndppd/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/ndppd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ffcacb +--- /dev/null ++++ b/feeds/packages/ipv6/ndppd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=ndppd ++PKG_VERSION:=0.2.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++# Latest release ++PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/ ++PKG_MD5SUM:=d90c4b65777a62274c1837dba341e5a8 ++ ++# Development snapshot ++#PKG_SOURCE_URL=git://github.com/Tuhox/ndppd.git ++#PKG_SOURCE_VERSION=master ++#PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ndppd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=NDP Proxy Daemon ++ URL:=http://www.priv.nu/projects/ndppd/ ++ MAINTAINER:=Gabriel Kerneis ++ DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS) ++endef ++ ++define Package/ndppd/description ++ ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery ++ Protocol) messages between interfaces. ndppd currently only supports Neighbor ++ Solicitation Messages and Neighbor Advertisement Messages. ++ ++ The ndp_proxy provided by Linux doesn't support listing proxies, and only hosts ++ are supported. No subnets. ndppd solves this by listening for Neighbor ++ Solicitation messages on an interface, then query the internal interfaces for ++ that target IP before finally sending a Neighbor Advertisement message. ++endef ++ ++define Package/ndppd/conffiles ++/etc/ndppd.conf ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CXX="$(TARGET_CXX)" \ ++ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++0x -fno-rtti" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ LIBS="-lc" \ ++ ndppd ++endef ++ ++define Package/ndppd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndppd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ndppd.init $(1)/etc/init.d/ndppd ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/ndppd.conf-dist $(1)/etc/ndppd.conf ++endef ++ ++$(eval $(call BuildPackage,ndppd)) +diff --git a/feeds/packages/ipv6/ndppd/Makefile b/feeds/packages/ipv6/ndppd/Makefile +new file mode 100644 +index 0000000..8ffcacb +--- /dev/null ++++ b/feeds/packages/ipv6/ndppd/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=ndppd ++PKG_VERSION:=0.2.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++# Latest release ++PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/ ++PKG_MD5SUM:=d90c4b65777a62274c1837dba341e5a8 ++ ++# Development snapshot ++#PKG_SOURCE_URL=git://github.com/Tuhox/ndppd.git ++#PKG_SOURCE_VERSION=master ++#PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ndppd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=NDP Proxy Daemon ++ URL:=http://www.priv.nu/projects/ndppd/ ++ MAINTAINER:=Gabriel Kerneis ++ DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS) ++endef ++ ++define Package/ndppd/description ++ ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery ++ Protocol) messages between interfaces. ndppd currently only supports Neighbor ++ Solicitation Messages and Neighbor Advertisement Messages. ++ ++ The ndp_proxy provided by Linux doesn't support listing proxies, and only hosts ++ are supported. No subnets. ndppd solves this by listening for Neighbor ++ Solicitation messages on an interface, then query the internal interfaces for ++ that target IP before finally sending a Neighbor Advertisement message. ++endef ++ ++define Package/ndppd/conffiles ++/etc/ndppd.conf ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CXX="$(TARGET_CXX)" \ ++ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++0x -fno-rtti" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ LIBS="-lc" \ ++ ndppd ++endef ++ ++define Package/ndppd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndppd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ndppd.init $(1)/etc/init.d/ndppd ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/ndppd.conf-dist $(1)/etc/ndppd.conf ++endef ++ ++$(eval $(call BuildPackage,ndppd)) +diff --git a/feeds/packages/ipv6/ndppd/files/.svn/entries b/feeds/packages/ipv6/ndppd/files/.svn/entries +new file mode 100644 +index 0000000..851a426 +--- /dev/null ++++ b/feeds/packages/ipv6/ndppd/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ndppd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-02T10:01:49.802333Z ++29987 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ndppd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c56bc0180d7c9cea1da1f6f4be2fec90 ++2012-02-02T10:01:49.802333Z ++29987 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++257 ++ +diff --git a/feeds/packages/ipv6/ndppd/files/.svn/text-base/ndppd.init.svn-base b/feeds/packages/ipv6/ndppd/files/.svn/text-base/ndppd.init.svn-base +new file mode 100644 +index 0000000..4cf0e8a +--- /dev/null ++++ b/feeds/packages/ipv6/ndppd/files/.svn/text-base/ndppd.init.svn-base +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=90 ++ ++SERVICE_USE_PID=1 ++SERVICE_PID_FILE=/var/run/ndppd.pid ++ ++start() { ++ mkdir -p /var/run ++ service_start /usr/sbin/ndppd -p $SERVICE_PID_FILE -d ++} ++ ++stop() { ++ service_stop /usr/sbin/ndppd ++} +diff --git a/feeds/packages/ipv6/ndppd/files/ndppd.init b/feeds/packages/ipv6/ndppd/files/ndppd.init +new file mode 100644 +index 0000000..4cf0e8a +--- /dev/null ++++ b/feeds/packages/ipv6/ndppd/files/ndppd.init +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=90 ++ ++SERVICE_USE_PID=1 ++SERVICE_PID_FILE=/var/run/ndppd.pid ++ ++start() { ++ mkdir -p /var/run ++ service_start /usr/sbin/ndppd -p $SERVICE_PID_FILE -d ++} ++ ++stop() { ++ service_stop /usr/sbin/ndppd ++} +diff --git a/feeds/packages/ipv6/ptrtd/.svn/entries b/feeds/packages/ipv6/ptrtd/.svn/entries +new file mode 100644 +index 0000000..1d17eae +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ptrtd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:21.085029Z ++28926 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c10e97e5686ec697b470bf735bb2d773 ++2011-11-09T23:49:21.085029Z ++28926 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1063 ++ +diff --git a/feeds/packages/ipv6/ptrtd/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/ptrtd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/ptrtd/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/ptrtd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4e1aa65 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=ptrtd ++PKG_VERSION:=0.5.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://v6web.litech.org/ptrtd/dist/ ++PKG_MD5SUM:=bfe026445fdc4fe509a9c70ec4551744 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ptrtd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+kmod-ipv6 +kmod-tun +ip ++ TITLE:=Portable Transport Relay Translator Daemon ++ URL:=http://v6web.litech.org/ptrtd/ ++endef ++ ++define Package/ptrtd/description ++ The Portable Transport Relay Translator Daemon (pTRTd) ++ is a method of allowing IPv6 hosts to communicate with IPv4 hosts. ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" ++ ++define Package/ptrtd/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/ptrtd.init $(1)/etc/init.d/ptrtd ++endef ++ ++$(eval $(call BuildPackage,ptrtd)) +diff --git a/feeds/packages/ipv6/ptrtd/Makefile b/feeds/packages/ipv6/ptrtd/Makefile +new file mode 100644 +index 0000000..4e1aa65 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=ptrtd ++PKG_VERSION:=0.5.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://v6web.litech.org/ptrtd/dist/ ++PKG_MD5SUM:=bfe026445fdc4fe509a9c70ec4551744 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ptrtd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+kmod-ipv6 +kmod-tun +ip ++ TITLE:=Portable Transport Relay Translator Daemon ++ URL:=http://v6web.litech.org/ptrtd/ ++endef ++ ++define Package/ptrtd/description ++ The Portable Transport Relay Translator Daemon (pTRTd) ++ is a method of allowing IPv6 hosts to communicate with IPv4 hosts. ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" ++ ++define Package/ptrtd/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/ptrtd.init $(1)/etc/init.d/ptrtd ++endef ++ ++$(eval $(call BuildPackage,ptrtd)) +diff --git a/feeds/packages/ipv6/ptrtd/files/.svn/entries b/feeds/packages/ipv6/ptrtd/files/.svn/entries +new file mode 100644 +index 0000000..7f27279 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ptrtd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:21.085029Z ++28926 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ptrtd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8409ba272951bb7efa925ca078b31428 ++2011-11-09T23:49:21.085029Z ++28926 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++217 ++ +diff --git a/feeds/packages/ipv6/ptrtd/files/.svn/prop-base/ptrtd.init.svn-base b/feeds/packages/ipv6/ptrtd/files/.svn/prop-base/ptrtd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/files/.svn/prop-base/ptrtd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/ptrtd/files/.svn/text-base/ptrtd.init.svn-base b/feeds/packages/ipv6/ptrtd/files/.svn/text-base/ptrtd.init.svn-base +new file mode 100644 +index 0000000..6d7cf68 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/files/.svn/text-base/ptrtd.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=60 ++ ++PREFIX="3ffe:abcd:1234:9876::" ++LEN=64 ++ ++start() { ++ service_start /usr/sbin/ptrtd -p $PREFIX -l $LEN ++} ++ ++stop() { ++ service_stop /usr/sbin/ptrtd ++} +diff --git a/feeds/packages/ipv6/ptrtd/files/ptrtd.init b/feeds/packages/ipv6/ptrtd/files/ptrtd.init +new file mode 100644 +index 0000000..6d7cf68 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/files/ptrtd.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=60 ++ ++PREFIX="3ffe:abcd:1234:9876::" ++LEN=64 ++ ++start() { ++ service_start /usr/sbin/ptrtd -p $PREFIX -l $LEN ++} ++ ++stop() { ++ service_stop /usr/sbin/ptrtd ++} +diff --git a/feeds/packages/ipv6/ptrtd/patches/.svn/entries b/feeds/packages/ipv6/ptrtd/patches/.svn/entries +new file mode 100644 +index 0000000..a1b1341 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/ptrtd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-ptrtd-0.5.2-openwrt.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++55b29a634d466af1a5da1d7eaebdb3ae ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1824 ++ +diff --git a/feeds/packages/ipv6/ptrtd/patches/.svn/prop-base/100-ptrtd-0.5.2-openwrt.patch.svn-base b/feeds/packages/ipv6/ptrtd/patches/.svn/prop-base/100-ptrtd-0.5.2-openwrt.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/patches/.svn/prop-base/100-ptrtd-0.5.2-openwrt.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/ptrtd/patches/.svn/text-base/100-ptrtd-0.5.2-openwrt.patch.svn-base b/feeds/packages/ipv6/ptrtd/patches/.svn/text-base/100-ptrtd-0.5.2-openwrt.patch.svn-base +new file mode 100644 +index 0000000..3a9d003 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/patches/.svn/text-base/100-ptrtd-0.5.2-openwrt.patch.svn-base +@@ -0,0 +1,41 @@ ++--- ptrtd-0.5.2/ptrtd.old 2007-02-22 16:10:57.896689015 +0100 +++++ ptrtd-0.5.2/ptrtd.c 2007-02-22 16:11:39.194388792 +0100 ++@@ -201,13 +201,13 @@ ++ if( do_config ) ++ { ++ printf( "Tunnel: %s\n", ifname ); ++- sprintf( cmd, "/sbin/ip link set %s up", ifname ); +++ sprintf( cmd, "/usr/sbin/ip link set %s up", ifname ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++- sprintf( cmd, "/sbin/ip addr add fe80::1/64 dev %s", ifname ); +++ sprintf( cmd, "/usr/sbin/ip addr add fe80::1/64 dev %s", ifname ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++- sprintf( cmd, "/sbin/ip route add %s/%d dev %s via fe80::5", +++ sprintf( cmd, "/usr/sbin/ip route add %s/%d dev %s via fe80::5", ++ prefix, plen, ifname ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++--- ptrtd-0.5.2/tap802ipd.old 2007-02-22 16:11:22.600920230 +0100 +++++ ptrtd-0.5.2/tap802ipd.c 2007-02-22 16:11:51.040581581 +0100 ++@@ -125,16 +125,16 @@ ++ ++ tap_get_name( (struct iface *)tap_iface, ifname ); ++ printf( "Tunnel: %s\n", ifname ); ++- sprintf( cmd, "/sbin/ip link set %s address %02x:%02x:%02x:%02x:%02x:%02x up\n", ifname, +++ sprintf( cmd, "/usr/sbin/ip link set %s address %02x:%02x:%02x:%02x:%02x:%02x up\n", ifname, ++ ip_iface->hwaddr[0], ip_iface->hwaddr[1], ++ ip_iface->hwaddr[2], ip_iface->hwaddr[3], ++ ip_iface->hwaddr[4], ip_iface->hwaddr[5] ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++- //sprintf( cmd, "/sbin/ip addr add fe80::1/64 dev %s", ifname ); +++ //sprintf( cmd, "/usr/sbin/ip addr add fe80::1/64 dev %s", ifname ); ++ //printf( "command: %s\n", cmd ); ++ //system( cmd ); ++- //sprintf( cmd, "/sbin/ip route add %s/%d dev %s via fe80::5", prefix, plen, ifname ); +++ //sprintf( cmd, "/usr/sbin/ip route add %s/%d dev %s via fe80::5", prefix, plen, ifname ); ++ //printf( "command: %s\n", cmd ); ++ //system( cmd ); ++ } +diff --git a/feeds/packages/ipv6/ptrtd/patches/100-ptrtd-0.5.2-openwrt.patch b/feeds/packages/ipv6/ptrtd/patches/100-ptrtd-0.5.2-openwrt.patch +new file mode 100644 +index 0000000..3a9d003 +--- /dev/null ++++ b/feeds/packages/ipv6/ptrtd/patches/100-ptrtd-0.5.2-openwrt.patch +@@ -0,0 +1,41 @@ ++--- ptrtd-0.5.2/ptrtd.old 2007-02-22 16:10:57.896689015 +0100 +++++ ptrtd-0.5.2/ptrtd.c 2007-02-22 16:11:39.194388792 +0100 ++@@ -201,13 +201,13 @@ ++ if( do_config ) ++ { ++ printf( "Tunnel: %s\n", ifname ); ++- sprintf( cmd, "/sbin/ip link set %s up", ifname ); +++ sprintf( cmd, "/usr/sbin/ip link set %s up", ifname ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++- sprintf( cmd, "/sbin/ip addr add fe80::1/64 dev %s", ifname ); +++ sprintf( cmd, "/usr/sbin/ip addr add fe80::1/64 dev %s", ifname ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++- sprintf( cmd, "/sbin/ip route add %s/%d dev %s via fe80::5", +++ sprintf( cmd, "/usr/sbin/ip route add %s/%d dev %s via fe80::5", ++ prefix, plen, ifname ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++--- ptrtd-0.5.2/tap802ipd.old 2007-02-22 16:11:22.600920230 +0100 +++++ ptrtd-0.5.2/tap802ipd.c 2007-02-22 16:11:51.040581581 +0100 ++@@ -125,16 +125,16 @@ ++ ++ tap_get_name( (struct iface *)tap_iface, ifname ); ++ printf( "Tunnel: %s\n", ifname ); ++- sprintf( cmd, "/sbin/ip link set %s address %02x:%02x:%02x:%02x:%02x:%02x up\n", ifname, +++ sprintf( cmd, "/usr/sbin/ip link set %s address %02x:%02x:%02x:%02x:%02x:%02x up\n", ifname, ++ ip_iface->hwaddr[0], ip_iface->hwaddr[1], ++ ip_iface->hwaddr[2], ip_iface->hwaddr[3], ++ ip_iface->hwaddr[4], ip_iface->hwaddr[5] ); ++ printf( "command: %s\n", cmd ); ++ system( cmd ); ++- //sprintf( cmd, "/sbin/ip addr add fe80::1/64 dev %s", ifname ); +++ //sprintf( cmd, "/usr/sbin/ip addr add fe80::1/64 dev %s", ifname ); ++ //printf( "command: %s\n", cmd ); ++ //system( cmd ); ++- //sprintf( cmd, "/sbin/ip route add %s/%d dev %s via fe80::5", prefix, plen, ifname ); +++ //sprintf( cmd, "/usr/sbin/ip route add %s/%d dev %s via fe80::5", prefix, plen, ifname ); ++ //printf( "command: %s\n", cmd ); ++ //system( cmd ); ++ } +diff --git a/feeds/packages/ipv6/radvd/.svn/entries b/feeds/packages/ipv6/radvd/.svn/entries +new file mode 100644 +index 0000000..3fdc108 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/radvd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-12T09:42:44.281470Z ++33377 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++9081398a375554bd20a551dde4f52a7b ++2012-09-12T09:42:44.281470Z ++33377 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2145 ++ +diff --git a/feeds/packages/ipv6/radvd/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/radvd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/radvd/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/radvd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..571d9de +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,79 @@ ++# ++# 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:=radvd ++PKG_VERSION:=1.9.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \ ++ http://download.sourcemage.org/mirror ++PKG_MD5SUM:=e807ad7e9a76d46b6133df391385cd31 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/radvd/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=IPv6 Routing Advertisement ++ URL:=http://v6web.litech.org/radvd/ ++ DEPENDS:=+kmod-ipv6 +libdaemon ++endef ++ ++define Package/radvd ++ $(call Package/radvd/Default) ++ TITLE+= Daemon ++endef ++ ++define Package/radvd/description ++radvd is the router advertisement daemon for IPv6. It listens to router ++solicitations and sends router advertisements as described in "Neighbor ++Discovery for IP Version 6 (IPv6)" (RFC 4861). With these advertisements hosts ++can automatically configure their addresses and some other parameters. They also ++can choose a default router based on these advertisements. ++endef ++ ++define Package/radvdump ++ $(call Package/radvd/Default) ++ TITLE+= Dumper ++endef ++ ++define Package/radvdump/description ++radvdump prints out the contents of incoming router advertisements sent by radvd ++or some other software implementing (parts of) "Neighbor Discovery for IP ++Version 6 (IPv6)" (RFC 4861). ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-configfile=/etc/radvd.conf \ ++ --with-logfile=/var/log/radvd.log \ ++ --with-pidfile=/var/run/radvd.pid ++ ++define Package/radvd/conffiles ++/etc/config/radvd ++endef ++ ++define Package/radvd/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/radvd.config $(1)/etc/config/radvd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/ ++endef ++ ++define Package/radvdump/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,radvd)) ++$(eval $(call BuildPackage,radvdump)) +diff --git a/feeds/packages/ipv6/radvd/Makefile b/feeds/packages/ipv6/radvd/Makefile +new file mode 100644 +index 0000000..571d9de +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/Makefile +@@ -0,0 +1,79 @@ ++# ++# 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:=radvd ++PKG_VERSION:=1.9.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \ ++ http://download.sourcemage.org/mirror ++PKG_MD5SUM:=e807ad7e9a76d46b6133df391385cd31 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/radvd/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=IPv6 Routing Advertisement ++ URL:=http://v6web.litech.org/radvd/ ++ DEPENDS:=+kmod-ipv6 +libdaemon ++endef ++ ++define Package/radvd ++ $(call Package/radvd/Default) ++ TITLE+= Daemon ++endef ++ ++define Package/radvd/description ++radvd is the router advertisement daemon for IPv6. It listens to router ++solicitations and sends router advertisements as described in "Neighbor ++Discovery for IP Version 6 (IPv6)" (RFC 4861). With these advertisements hosts ++can automatically configure their addresses and some other parameters. They also ++can choose a default router based on these advertisements. ++endef ++ ++define Package/radvdump ++ $(call Package/radvd/Default) ++ TITLE+= Dumper ++endef ++ ++define Package/radvdump/description ++radvdump prints out the contents of incoming router advertisements sent by radvd ++or some other software implementing (parts of) "Neighbor Discovery for IP ++Version 6 (IPv6)" (RFC 4861). ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-configfile=/etc/radvd.conf \ ++ --with-logfile=/var/log/radvd.log \ ++ --with-pidfile=/var/run/radvd.pid ++ ++define Package/radvd/conffiles ++/etc/config/radvd ++endef ++ ++define Package/radvd/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/radvd.config $(1)/etc/config/radvd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/ ++endef ++ ++define Package/radvdump/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,radvd)) ++$(eval $(call BuildPackage,radvdump)) +diff --git a/feeds/packages/ipv6/radvd/files/.svn/entries b/feeds/packages/ipv6/radvd/files/.svn/entries +new file mode 100644 +index 0000000..10188cf +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/radvd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-12T09:42:44.281470Z ++33377 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++radvd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++5c7bfa12a26dc09e2fa94acfe3002f41 ++2012-09-12T09:42:44.281470Z ++33377 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9925 ++ ++radvd.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++60c3ad8ad87d5dd14799fe7a5db73f72 ++2011-01-29T02:38:39.443751Z ++25234 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++652 ++ +diff --git a/feeds/packages/ipv6/radvd/files/.svn/prop-base/radvd.init.svn-base b/feeds/packages/ipv6/radvd/files/.svn/prop-base/radvd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/files/.svn/prop-base/radvd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/radvd/files/.svn/text-base/radvd.config.svn-base b/feeds/packages/ipv6/radvd/files/.svn/text-base/radvd.config.svn-base +new file mode 100644 +index 0000000..1616c15 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/files/.svn/text-base/radvd.config.svn-base +@@ -0,0 +1,32 @@ ++config interface ++ option interface 'lan' ++ option AdvSendAdvert 1 ++ option AdvManagedFlag 0 ++ option AdvOtherConfigFlag 0 ++ list client '' ++ option ignore 1 ++ ++config prefix ++ option interface 'lan' ++ # If not specified, a non-link-local prefix of the interface is used ++ list prefix '' ++ option AdvOnLink 1 ++ option AdvAutonomous 1 ++ option AdvRouterAddr 0 ++ option ignore 1 ++ ++config route ++ option interface 'lan' ++ list prefix '' ++ option ignore 1 ++ ++config rdnss ++ option interface 'lan' ++ # If not specified, the link-local address of the interface is used ++ list addr '' ++ option ignore 1 ++ ++config dnssl ++ option interface 'lan' ++ list suffix '' ++ option ignore 1 +diff --git a/feeds/packages/ipv6/radvd/files/.svn/text-base/radvd.init.svn-base b/feeds/packages/ipv6/radvd/files/.svn/text-base/radvd.init.svn-base +new file mode 100644 +index 0000000..8311c35 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/files/.svn/text-base/radvd.init.svn-base +@@ -0,0 +1,416 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++# Copyright (C) 2008 Alina Friedrichsen ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++RADVD_INTERFACE_STRING_OPTIONS='MaxRtrAdvInterval MinRtrAdvInterval MinDelayBetweenRAs AdvLinkMTU AdvReachableTime AdvRetransTimer AdvCurHopLimit AdvDefaultLifetime AdvDefaultPreference HomeAgentLifetime HomeAgentPreference' ++RADVD_INTERFACE_BOOLEAN_OPTIONS='IgnoreIfMissing AdvSendAdvert UnicastOnly AdvManagedFlag AdvOtherConfigFlag AdvSourceLLAddress AdvHomeAgentFlag AdvHomeAgentInfo AdvMobRtrSupportFlag AdvIntervalOpt' ++ ++RADVD_PREFIX_STRING_OPTIONS='AdvValidLifetime AdvPreferredLifetime' ++RADVD_PREFIX_BOOLEAN_OPTIONS='AdvOnLink AdvAutonomous AdvRouterAddr DeprecatePrefix DecrementLifetimes' ++ ++RADVD_ROUTE_STRING_OPTIONS='AdvRouteLifetime AdvRoutePreference' ++RADVD_ROUTE_BOOLEAN_OPTIONS='RemoveRoute' ++ ++RADVD_RDNSS_STRING_OPTIONS='AdvRDNSSLifetime FlushRDNSS' ++ ++RADVD_DNSSL_STRING_OPTIONS='AdvDNSSLLifetime FlushDNSSL' ++ ++validate_varname() { ++ local varname=$1 ++ [ -z "$varname" -o "$varname" != "${varname%%[!A-Za-z0-9_]*}" ] && return 1 ++ return 0 ++} ++ ++validate_ip6addr() { ++ local ip6addr=$1 ++ [ -z "$ip6addr" -o "$ip6addr" != "${ip6addr%%[!A-Fa-f0-9.:]*}" ] && return 1 ++ return 0 ++} ++ ++validate_ip6prefix() { ++ local ip6prefix=$1 ++ [ -z "$ip6prefix" -o "$ip6prefix" != "${ip6prefix%%[!A-Fa-f0-9./:]*}" ] && return 1 ++ return 0 ++} ++ ++validate_radvd_string() { ++ local radvd_string=$1 ++ [ -z "$radvd_string" -o "$radvd_string" != "${radvd_string%%[!A-Za-z0-9.:_-]*}" ] && return 1 ++ return 0 ++} ++ ++get_ip6addr() { ++ local ifname=$1 ++ local scope=$2 ++ local iproute2_scope ++ local ifconfig_scope ++ local ip6addr ++ ++ case "$scope" in ++ host) iproute2_scope=host ifconfig_scope=Host;; ++ link) iproute2_scope=link ifconfig_scope=Link;; ++ site) iproute2_scope=site ifconfig_scope=Site;; ++ global) iproute2_scope=global ifconfig_scope=Global;; ++ "") get_ip6addr "$ifname" global || get_ip6addr "$ifname" site; return;; ++ *) return 1;; ++ esac ++ ++ ip6addr=$(LANG=C ip -f inet6 -- addr show dev "$ifname" 2> /dev/null | sed -n -e 's/^ *inet6 \([A-Fa-f0-9.:]*[/][0-9]*\) scope '"$iproute2_scope"' $/\1/p' | head -n 1) ++ if [ -z "$ip6addr" ]; then ++ ip6addr=$(LANG=C ifconfig "$ifname" 2> /dev/null | sed -n -e 's/^ *inet6 addr: \([A-Fa-f0-9.:]*[/][0-9]*\) Scope:'"$ifconfig_scope"'$/\1/p' | tail -n 1) ++ [ -z "$ip6addr" ] && return 1 ++ fi ++ ++ printf '%s\n' "$ip6addr" ++ ++ return 0 ++} ++ ++radvd_find_config_file() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ config_get RADVD_CONFIG_FILE "$cfg" config_file ++ ++ return 0 ++} ++ ++radvd_add_interface() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local list_interface ++ local exist ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ for interface in $interfaces; do ++ validate_varname "$interface" || continue ++ exist=0 ++ for list_interface in $RADVD_INTERFACES; do ++ [ "$interface" = "$list_interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && RADVD_INTERFACES="$RADVD_INTERFACES $interface" ++ done ++ ++ return 0 ++} ++ ++radvd_write_interface() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local name ++ local value ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ for name in $RADVD_INTERFACE_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t%s %s;\n' "$name" "$value" ++ done ++ ++ for name in $RADVD_INTERFACE_BOOLEAN_OPTIONS; do ++ config_get value "$cfg" "$name" ++ [ -z "$value" ] && continue ++ config_get_bool value "$cfg" "$name" 0 ++ if [ "$value" -ne 0 ]; then ++ printf '\t%s on;\n' "$name" ++ else ++ printf '\t%s off;\n' "$name" ++ fi ++ done ++ ++ config_get clients "$cfg" client ++ if [ -n "$clients" ]; then ++ printf '\n\tclients\n\t{\n' ++ ++ for client in $clients; do ++ validate_ip6addr "$client" || continue ++ printf '\t\t%s;\n' "$client" ++ done ++ ++ printf '\t};\n' ++ fi ++ ++ return 0 ++} ++ ++radvd_write_prefix() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local device ++ local prefixes ++ local prefix ++ local name ++ local value ++ local cfgt ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get prefixes "$cfg" prefix ++ if [ -z "$prefixes" ]; then ++ prefixes=$(get_ip6addr "$IFNAME") || return 0 ++ fi ++ ++ for prefix in $prefixes; do ++ validate_ip6prefix "$prefix" || continue ++ printf '\n\tprefix %s\n\t{\n' "$prefix" ++ ++ for name in $RADVD_PREFIX_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ for name in $RADVD_PREFIX_BOOLEAN_OPTIONS; do ++ config_get value "$cfg" "$name" ++ [ -z "$value" ] && continue ++ config_get_bool value "$cfg" "$name" 0 ++ if [ "$value" -ne 0 ]; then ++ printf '\t\t%s on;\n' "$name" ++ else ++ printf '\t\t%s off;\n' "$name" ++ fi ++ done ++ ++ config_get value "$cfg" Base6Interface ++ if [ -n "$value" ]; then ++ if network_get_device device "$value"; then ++ printf '\t\t%s %s;\n' "Base6Interface" "$device" ++ fi ++ fi ++ ++ config_get value "$cfg" Base6to4Interface ++ if [ -n "$value" ]; then ++ if network_get_device device "$value"; then ++ printf '\t\t%s %s;\n' "Base6to4Interface" "$device" ++ fi ++ fi ++ ++ printf '\t};\n' ++ done ++ ++ return 0 ++} ++ ++radvd_write_route() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local prefixes ++ local prefix ++ local name ++ local value ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get prefixes "$cfg" prefix ++ for prefix in $prefixes; do ++ validate_ip6prefix "$prefix" || continue ++ printf '\n\troute %s\n\t{\n' "$prefix" ++ ++ for name in $RADVD_ROUTE_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ for name in $RADVD_ROUTE_BOOLEAN_OPTIONS; do ++ config_get value "$cfg" "$name" ++ [ -z "$value" ] && continue ++ config_get_bool value "$cfg" "$name" 0 ++ if [ "$value" -ne 0 ]; then ++ printf '\t\t%s on;\n' "$name" ++ else ++ printf '\t\t%s off;\n' "$name" ++ fi ++ done ++ ++ printf '\t};\n' ++ done ++ ++ return 0 ++} ++ ++radvd_write_rdnss() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local addrs ++ local addr ++ local addr_list ++ local name ++ local value ++ local i ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get addrs "$cfg" addr ++ i=0 ++ for addr in $addrs; do ++ [ "$i" -ge 3 ] && break ++ validate_ip6addr "$addr" || continue ++ addr_list="$addr_list $addr" ++ i=$(($i+1)) ++ done ++ ++ if [ -z "$addr_list" ]; then ++ addr=$(get_ip6addr "$IFNAME" link) || return 0 ++ addr_list=" ${addr%%[/]*}" ++ fi ++ ++ printf '\n\tRDNSS%s\n\t{\n' "$addr_list" ++ ++ for name in $RADVD_RDNSS_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ printf '\t};\n' ++ ++ return 0 ++} ++ ++radvd_write_dnssl() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local suffixes ++ local suffix ++ local suffix_list ++ local name ++ local value ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get suffixes "$cfg" suffix ++ for suffix in $suffixes; do ++ validate_radvd_string "$suffix" || continue ++ suffix_list="$suffix_list $suffix" ++ done ++ ++ printf '\n\tDNSSL%s\n\t{\n' "$suffix_list" ++ ++ for name in $RADVD_DNSSL_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ printf '\t};\n' ++ ++ return 0 ++} ++ ++radvd_write_config() { ++ . /lib/functions/network.sh ++ ++ RADVD_INTERFACES= ++ config_foreach radvd_add_interface interface ++ config_foreach radvd_add_interface prefix ++ config_foreach radvd_add_interface route ++ config_foreach radvd_add_interface RDNSS ++ config_foreach radvd_add_interface DNSSL ++ ++ for INTERFACE in $RADVD_INTERFACES; do ++ network_get_device IFNAME "$INTERFACE" || continue ++ printf 'interface %s\n{\n' "$IFNAME" ++ config_foreach radvd_write_interface interface ++ config_foreach radvd_write_prefix prefix ++ config_foreach radvd_write_route route ++ config_foreach radvd_write_rdnss rdnss ++ config_foreach radvd_write_dnssl dnssl ++ printf '};\n\n' ++ done ++ ++ return 0 ++} ++ ++start() { ++ config_load radvd ++ ++ RADVD_CONFIG_FILE= ++ config_foreach radvd_find_config_file radvd ++ ++ if [ -z "$RADVD_CONFIG_FILE" ]; then ++ mkdir -p -- /var/etc/ ++ radvd_write_config > /var/etc/radvd.conf ++ if [ -s "/var/etc/radvd.conf" ]; then ++ RADVD_CONFIG_FILE=/var/etc/radvd.conf ++ fi ++ fi ++ ++ [ -z "$RADVD_CONFIG_FILE" ] && return 1 ++ ++ sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null 2> /dev/null ++ ++ service_start /usr/sbin/radvd -C "$RADVD_CONFIG_FILE" -m stderr_syslog -p /var/run/radvd.pid ++} ++ ++stop() { ++ service_stop /usr/sbin/radvd ++} +diff --git a/feeds/packages/ipv6/radvd/files/radvd.config b/feeds/packages/ipv6/radvd/files/radvd.config +new file mode 100644 +index 0000000..1616c15 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/files/radvd.config +@@ -0,0 +1,32 @@ ++config interface ++ option interface 'lan' ++ option AdvSendAdvert 1 ++ option AdvManagedFlag 0 ++ option AdvOtherConfigFlag 0 ++ list client '' ++ option ignore 1 ++ ++config prefix ++ option interface 'lan' ++ # If not specified, a non-link-local prefix of the interface is used ++ list prefix '' ++ option AdvOnLink 1 ++ option AdvAutonomous 1 ++ option AdvRouterAddr 0 ++ option ignore 1 ++ ++config route ++ option interface 'lan' ++ list prefix '' ++ option ignore 1 ++ ++config rdnss ++ option interface 'lan' ++ # If not specified, the link-local address of the interface is used ++ list addr '' ++ option ignore 1 ++ ++config dnssl ++ option interface 'lan' ++ list suffix '' ++ option ignore 1 +diff --git a/feeds/packages/ipv6/radvd/files/radvd.init b/feeds/packages/ipv6/radvd/files/radvd.init +new file mode 100644 +index 0000000..8311c35 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/files/radvd.init +@@ -0,0 +1,416 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++# Copyright (C) 2008 Alina Friedrichsen ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++RADVD_INTERFACE_STRING_OPTIONS='MaxRtrAdvInterval MinRtrAdvInterval MinDelayBetweenRAs AdvLinkMTU AdvReachableTime AdvRetransTimer AdvCurHopLimit AdvDefaultLifetime AdvDefaultPreference HomeAgentLifetime HomeAgentPreference' ++RADVD_INTERFACE_BOOLEAN_OPTIONS='IgnoreIfMissing AdvSendAdvert UnicastOnly AdvManagedFlag AdvOtherConfigFlag AdvSourceLLAddress AdvHomeAgentFlag AdvHomeAgentInfo AdvMobRtrSupportFlag AdvIntervalOpt' ++ ++RADVD_PREFIX_STRING_OPTIONS='AdvValidLifetime AdvPreferredLifetime' ++RADVD_PREFIX_BOOLEAN_OPTIONS='AdvOnLink AdvAutonomous AdvRouterAddr DeprecatePrefix DecrementLifetimes' ++ ++RADVD_ROUTE_STRING_OPTIONS='AdvRouteLifetime AdvRoutePreference' ++RADVD_ROUTE_BOOLEAN_OPTIONS='RemoveRoute' ++ ++RADVD_RDNSS_STRING_OPTIONS='AdvRDNSSLifetime FlushRDNSS' ++ ++RADVD_DNSSL_STRING_OPTIONS='AdvDNSSLLifetime FlushDNSSL' ++ ++validate_varname() { ++ local varname=$1 ++ [ -z "$varname" -o "$varname" != "${varname%%[!A-Za-z0-9_]*}" ] && return 1 ++ return 0 ++} ++ ++validate_ip6addr() { ++ local ip6addr=$1 ++ [ -z "$ip6addr" -o "$ip6addr" != "${ip6addr%%[!A-Fa-f0-9.:]*}" ] && return 1 ++ return 0 ++} ++ ++validate_ip6prefix() { ++ local ip6prefix=$1 ++ [ -z "$ip6prefix" -o "$ip6prefix" != "${ip6prefix%%[!A-Fa-f0-9./:]*}" ] && return 1 ++ return 0 ++} ++ ++validate_radvd_string() { ++ local radvd_string=$1 ++ [ -z "$radvd_string" -o "$radvd_string" != "${radvd_string%%[!A-Za-z0-9.:_-]*}" ] && return 1 ++ return 0 ++} ++ ++get_ip6addr() { ++ local ifname=$1 ++ local scope=$2 ++ local iproute2_scope ++ local ifconfig_scope ++ local ip6addr ++ ++ case "$scope" in ++ host) iproute2_scope=host ifconfig_scope=Host;; ++ link) iproute2_scope=link ifconfig_scope=Link;; ++ site) iproute2_scope=site ifconfig_scope=Site;; ++ global) iproute2_scope=global ifconfig_scope=Global;; ++ "") get_ip6addr "$ifname" global || get_ip6addr "$ifname" site; return;; ++ *) return 1;; ++ esac ++ ++ ip6addr=$(LANG=C ip -f inet6 -- addr show dev "$ifname" 2> /dev/null | sed -n -e 's/^ *inet6 \([A-Fa-f0-9.:]*[/][0-9]*\) scope '"$iproute2_scope"' $/\1/p' | head -n 1) ++ if [ -z "$ip6addr" ]; then ++ ip6addr=$(LANG=C ifconfig "$ifname" 2> /dev/null | sed -n -e 's/^ *inet6 addr: \([A-Fa-f0-9.:]*[/][0-9]*\) Scope:'"$ifconfig_scope"'$/\1/p' | tail -n 1) ++ [ -z "$ip6addr" ] && return 1 ++ fi ++ ++ printf '%s\n' "$ip6addr" ++ ++ return 0 ++} ++ ++radvd_find_config_file() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ config_get RADVD_CONFIG_FILE "$cfg" config_file ++ ++ return 0 ++} ++ ++radvd_add_interface() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local list_interface ++ local exist ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ for interface in $interfaces; do ++ validate_varname "$interface" || continue ++ exist=0 ++ for list_interface in $RADVD_INTERFACES; do ++ [ "$interface" = "$list_interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && RADVD_INTERFACES="$RADVD_INTERFACES $interface" ++ done ++ ++ return 0 ++} ++ ++radvd_write_interface() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local name ++ local value ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ for name in $RADVD_INTERFACE_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t%s %s;\n' "$name" "$value" ++ done ++ ++ for name in $RADVD_INTERFACE_BOOLEAN_OPTIONS; do ++ config_get value "$cfg" "$name" ++ [ -z "$value" ] && continue ++ config_get_bool value "$cfg" "$name" 0 ++ if [ "$value" -ne 0 ]; then ++ printf '\t%s on;\n' "$name" ++ else ++ printf '\t%s off;\n' "$name" ++ fi ++ done ++ ++ config_get clients "$cfg" client ++ if [ -n "$clients" ]; then ++ printf '\n\tclients\n\t{\n' ++ ++ for client in $clients; do ++ validate_ip6addr "$client" || continue ++ printf '\t\t%s;\n' "$client" ++ done ++ ++ printf '\t};\n' ++ fi ++ ++ return 0 ++} ++ ++radvd_write_prefix() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local device ++ local prefixes ++ local prefix ++ local name ++ local value ++ local cfgt ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get prefixes "$cfg" prefix ++ if [ -z "$prefixes" ]; then ++ prefixes=$(get_ip6addr "$IFNAME") || return 0 ++ fi ++ ++ for prefix in $prefixes; do ++ validate_ip6prefix "$prefix" || continue ++ printf '\n\tprefix %s\n\t{\n' "$prefix" ++ ++ for name in $RADVD_PREFIX_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ for name in $RADVD_PREFIX_BOOLEAN_OPTIONS; do ++ config_get value "$cfg" "$name" ++ [ -z "$value" ] && continue ++ config_get_bool value "$cfg" "$name" 0 ++ if [ "$value" -ne 0 ]; then ++ printf '\t\t%s on;\n' "$name" ++ else ++ printf '\t\t%s off;\n' "$name" ++ fi ++ done ++ ++ config_get value "$cfg" Base6Interface ++ if [ -n "$value" ]; then ++ if network_get_device device "$value"; then ++ printf '\t\t%s %s;\n' "Base6Interface" "$device" ++ fi ++ fi ++ ++ config_get value "$cfg" Base6to4Interface ++ if [ -n "$value" ]; then ++ if network_get_device device "$value"; then ++ printf '\t\t%s %s;\n' "Base6to4Interface" "$device" ++ fi ++ fi ++ ++ printf '\t};\n' ++ done ++ ++ return 0 ++} ++ ++radvd_write_route() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local prefixes ++ local prefix ++ local name ++ local value ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get prefixes "$cfg" prefix ++ for prefix in $prefixes; do ++ validate_ip6prefix "$prefix" || continue ++ printf '\n\troute %s\n\t{\n' "$prefix" ++ ++ for name in $RADVD_ROUTE_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ for name in $RADVD_ROUTE_BOOLEAN_OPTIONS; do ++ config_get value "$cfg" "$name" ++ [ -z "$value" ] && continue ++ config_get_bool value "$cfg" "$name" 0 ++ if [ "$value" -ne 0 ]; then ++ printf '\t\t%s on;\n' "$name" ++ else ++ printf '\t\t%s off;\n' "$name" ++ fi ++ done ++ ++ printf '\t};\n' ++ done ++ ++ return 0 ++} ++ ++radvd_write_rdnss() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local addrs ++ local addr ++ local addr_list ++ local name ++ local value ++ local i ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get addrs "$cfg" addr ++ i=0 ++ for addr in $addrs; do ++ [ "$i" -ge 3 ] && break ++ validate_ip6addr "$addr" || continue ++ addr_list="$addr_list $addr" ++ i=$(($i+1)) ++ done ++ ++ if [ -z "$addr_list" ]; then ++ addr=$(get_ip6addr "$IFNAME" link) || return 0 ++ addr_list=" ${addr%%[/]*}" ++ fi ++ ++ printf '\n\tRDNSS%s\n\t{\n' "$addr_list" ++ ++ for name in $RADVD_RDNSS_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ printf '\t};\n' ++ ++ return 0 ++} ++ ++radvd_write_dnssl() { ++ local cfg=$1 ++ validate_varname "$cfg" || return 0 ++ local ignore ++ local interfaces ++ local interface ++ local suffixes ++ local suffix ++ local suffix_list ++ local name ++ local value ++ ++ config_get_bool ignore "$cfg" ignore 0 ++ [ "$ignore" -ne 0 ] && return 0 ++ ++ config_get interfaces "$cfg" interface ++ exist=0 ++ for interface in $interfaces; do ++ [ "$INTERFACE" = "$interface" ] && exist=1 ++ done ++ [ "$exist" -eq 0 ] && return 0 ++ ++ config_get suffixes "$cfg" suffix ++ for suffix in $suffixes; do ++ validate_radvd_string "$suffix" || continue ++ suffix_list="$suffix_list $suffix" ++ done ++ ++ printf '\n\tDNSSL%s\n\t{\n' "$suffix_list" ++ ++ for name in $RADVD_DNSSL_STRING_OPTIONS; do ++ config_get value "$cfg" "$name" ++ validate_radvd_string "$value" || continue ++ printf '\t\t%s %s;\n' "$name" "$value" ++ done ++ ++ printf '\t};\n' ++ ++ return 0 ++} ++ ++radvd_write_config() { ++ . /lib/functions/network.sh ++ ++ RADVD_INTERFACES= ++ config_foreach radvd_add_interface interface ++ config_foreach radvd_add_interface prefix ++ config_foreach radvd_add_interface route ++ config_foreach radvd_add_interface RDNSS ++ config_foreach radvd_add_interface DNSSL ++ ++ for INTERFACE in $RADVD_INTERFACES; do ++ network_get_device IFNAME "$INTERFACE" || continue ++ printf 'interface %s\n{\n' "$IFNAME" ++ config_foreach radvd_write_interface interface ++ config_foreach radvd_write_prefix prefix ++ config_foreach radvd_write_route route ++ config_foreach radvd_write_rdnss rdnss ++ config_foreach radvd_write_dnssl dnssl ++ printf '};\n\n' ++ done ++ ++ return 0 ++} ++ ++start() { ++ config_load radvd ++ ++ RADVD_CONFIG_FILE= ++ config_foreach radvd_find_config_file radvd ++ ++ if [ -z "$RADVD_CONFIG_FILE" ]; then ++ mkdir -p -- /var/etc/ ++ radvd_write_config > /var/etc/radvd.conf ++ if [ -s "/var/etc/radvd.conf" ]; then ++ RADVD_CONFIG_FILE=/var/etc/radvd.conf ++ fi ++ fi ++ ++ [ -z "$RADVD_CONFIG_FILE" ] && return 1 ++ ++ sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null 2> /dev/null ++ ++ service_start /usr/sbin/radvd -C "$RADVD_CONFIG_FILE" -m stderr_syslog -p /var/run/radvd.pid ++} ++ ++stop() { ++ service_stop /usr/sbin/radvd ++} +diff --git a/feeds/packages/ipv6/radvd/patches/.svn/entries b/feeds/packages/ipv6/radvd/patches/.svn/entries +new file mode 100644 +index 0000000..3324e51 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/radvd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-24T22:26:25.869896Z ++32827 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-silent-netlink-config-reload.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++04a009c8810a43c46857171a94549ffd ++2012-07-24T22:26:25.869896Z ++32827 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1446 ++ +diff --git a/feeds/packages/ipv6/radvd/patches/.svn/text-base/100-silent-netlink-config-reload.patch.svn-base b/feeds/packages/ipv6/radvd/patches/.svn/text-base/100-silent-netlink-config-reload.patch.svn-base +new file mode 100644 +index 0000000..049d654 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/patches/.svn/text-base/100-silent-netlink-config-reload.patch.svn-base +@@ -0,0 +1,67 @@ ++--- a/netlink.c +++++ b/netlink.c ++@@ -67,7 +67,7 @@ void process_netlink_msg(int sock) ++ else { ++ dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is *NOT* running", ifname, ifinfo->ifi_index); ++ } ++- reload_config(); +++ reload_config(LOG_DEBUG); ++ } ++ } ++ ++--- a/radvd.c +++++ b/radvd.c ++@@ -443,7 +443,7 @@ void main_loop(void) ++ if (sighup_received) ++ { ++ dlog(LOG_INFO, 3, "sig hup received.\n"); ++- reload_config(); +++ reload_config(LOG_INFO); ++ sighup_received = 0; ++ } ++ ++@@ -552,11 +552,11 @@ stop_adverts(void) ++ } ++ } ++ ++-void reload_config(void) +++void reload_config(int loglevel) ++ { ++ struct Interface *iface; ++ ++- flog(LOG_INFO, "attempting to reread config file"); +++ flog(loglevel, "attempting to reread config file"); ++ ++ iface=IfaceList; ++ while(iface) ++@@ -626,7 +626,7 @@ void reload_config(void) ++ config_interface(); ++ kickoff_adverts(); ++ ++- flog(LOG_INFO, "resuming normal operation"); +++ flog(loglevel, "resuming normal operation"); ++ } ++ ++ void ++--- a/radvd.h +++++ b/radvd.h ++@@ -185,7 +185,7 @@ int yylex(void); ++ ++ /* radvd.c */ ++ int check_ip6_forwarding(void); ++-void reload_config(void); +++void reload_config(int); ++ void reset_prefix_lifetimes(void); ++ ++ /* timer.c */ ++--- a/send.c +++++ b/send.c ++@@ -154,7 +154,7 @@ send_ra(struct Interface *iface, struct ++ * reload_config() will kick off new timers anyway. This avoids ++ * timer list corruption. ++ */ ++- reload_config(); +++ reload_config(LOG_INFO); ++ return -1; ++ } ++ } +diff --git a/feeds/packages/ipv6/radvd/patches/100-silent-netlink-config-reload.patch b/feeds/packages/ipv6/radvd/patches/100-silent-netlink-config-reload.patch +new file mode 100644 +index 0000000..049d654 +--- /dev/null ++++ b/feeds/packages/ipv6/radvd/patches/100-silent-netlink-config-reload.patch +@@ -0,0 +1,67 @@ ++--- a/netlink.c +++++ b/netlink.c ++@@ -67,7 +67,7 @@ void process_netlink_msg(int sock) ++ else { ++ dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is *NOT* running", ifname, ifinfo->ifi_index); ++ } ++- reload_config(); +++ reload_config(LOG_DEBUG); ++ } ++ } ++ ++--- a/radvd.c +++++ b/radvd.c ++@@ -443,7 +443,7 @@ void main_loop(void) ++ if (sighup_received) ++ { ++ dlog(LOG_INFO, 3, "sig hup received.\n"); ++- reload_config(); +++ reload_config(LOG_INFO); ++ sighup_received = 0; ++ } ++ ++@@ -552,11 +552,11 @@ stop_adverts(void) ++ } ++ } ++ ++-void reload_config(void) +++void reload_config(int loglevel) ++ { ++ struct Interface *iface; ++ ++- flog(LOG_INFO, "attempting to reread config file"); +++ flog(loglevel, "attempting to reread config file"); ++ ++ iface=IfaceList; ++ while(iface) ++@@ -626,7 +626,7 @@ void reload_config(void) ++ config_interface(); ++ kickoff_adverts(); ++ ++- flog(LOG_INFO, "resuming normal operation"); +++ flog(loglevel, "resuming normal operation"); ++ } ++ ++ void ++--- a/radvd.h +++++ b/radvd.h ++@@ -185,7 +185,7 @@ int yylex(void); ++ ++ /* radvd.c */ ++ int check_ip6_forwarding(void); ++-void reload_config(void); +++void reload_config(int); ++ void reset_prefix_lifetimes(void); ++ ++ /* timer.c */ ++--- a/send.c +++++ b/send.c ++@@ -154,7 +154,7 @@ send_ra(struct Interface *iface, struct ++ * reload_config() will kick off new timers anyway. This avoids ++ * timer list corruption. ++ */ ++- reload_config(); +++ reload_config(LOG_INFO); ++ return -1; ++ } ++ } +diff --git a/feeds/packages/ipv6/send/.svn/entries b/feeds/packages/ipv6/send/.svn/entries +new file mode 100644 +index 0000000..8f4cf34 +--- /dev/null ++++ b/feeds/packages/ipv6/send/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/send ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-03T18:05:58.549826Z ++25855 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++1de41987c1e5f6c49c719eaebedad094 ++2010-11-03T22:15:44.980889Z ++23844 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1689 ++ +diff --git a/feeds/packages/ipv6/send/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/send/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b08a109 +--- /dev/null ++++ b/feeds/packages/ipv6/send/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2008-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:=send ++PKG_VERSION:=0.2-5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)d_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://mobisend.org/debian-mobisend/pool/main/s/sendd/ ++PKG_MD5SUM:=99c18e5d965e57d580f146d00145251a ++PKG_BUILD_DIR:=$(BUILD_DIR)/sendd-0.2 ++ ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/send ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=Secure Neighbor Discovery implementation ++ URL:=http://mobisend.org/debian-mobisend.html ++ DEPENDS:=+kmod-ipv6 +ip6tables +libnetfilter-queue +libopenssl +libreadline +libncurses ++endef ++ ++define Package/send/description ++ DoCoMo's Open Source SEND project provides an implementation of RFC 3971 ++ Secure Neighbor Discovery (SEND). SEND cryptographically secures the ++ IPv6 neighbor discovery protocol, countering the threats discussed in ++ RFC 3756 (IPv6 Neighbor Discovery (ND) Trust Models and Threats). ++endef ++ ++define Package/send/conffiles ++/etc/sendd/sendd.conf ++/etc/sendd/params.conf ++endef ++ ++TARGET_CPPFLAGS+=-D_GNU_SOURCE ++ ++MAKE_FLAGS += \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnetfilter_queue $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lnfnetlink" \ ++ ++define Package/send/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sendd/sendd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/sendd/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/examples/sendd.conf $(1)/etc/sendd/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/examples/params.conf $(1)/etc/sendd/ ++endef ++ ++$(eval $(call BuildPackage,send)) +diff --git a/feeds/packages/ipv6/send/Makefile b/feeds/packages/ipv6/send/Makefile +new file mode 100644 +index 0000000..b08a109 +--- /dev/null ++++ b/feeds/packages/ipv6/send/Makefile +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2008-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:=send ++PKG_VERSION:=0.2-5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)d_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://mobisend.org/debian-mobisend/pool/main/s/sendd/ ++PKG_MD5SUM:=99c18e5d965e57d580f146d00145251a ++PKG_BUILD_DIR:=$(BUILD_DIR)/sendd-0.2 ++ ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/send ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=Secure Neighbor Discovery implementation ++ URL:=http://mobisend.org/debian-mobisend.html ++ DEPENDS:=+kmod-ipv6 +ip6tables +libnetfilter-queue +libopenssl +libreadline +libncurses ++endef ++ ++define Package/send/description ++ DoCoMo's Open Source SEND project provides an implementation of RFC 3971 ++ Secure Neighbor Discovery (SEND). SEND cryptographically secures the ++ IPv6 neighbor discovery protocol, countering the threats discussed in ++ RFC 3756 (IPv6 Neighbor Discovery (ND) Trust Models and Threats). ++endef ++ ++define Package/send/conffiles ++/etc/sendd/sendd.conf ++/etc/sendd/params.conf ++endef ++ ++TARGET_CPPFLAGS+=-D_GNU_SOURCE ++ ++MAKE_FLAGS += \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnetfilter_queue $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lnfnetlink" \ ++ ++define Package/send/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sendd/sendd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/sendd/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/examples/sendd.conf $(1)/etc/sendd/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/examples/params.conf $(1)/etc/sendd/ ++endef ++ ++$(eval $(call BuildPackage,send)) +diff --git a/feeds/packages/ipv6/send/patches/.svn/entries b/feeds/packages/ipv6/send/patches/.svn/entries +new file mode 100644 +index 0000000..519521d +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/send/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-03T18:05:58.549826Z ++25855 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++006-openssl-1.0.0-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e16cfc744907e0b052883916dd186f3c ++2011-03-03T18:05:58.549826Z ++25855 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3878 ++ ++005-use-bundled-libconfig.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8526274de86392333aae7fc1200e3eb5 ++2011-02-03T18:10:11.259153Z ++25346 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++438 ++ ++002-handle_max_bits_conf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++fc1ec64d5bc1393559dae64cf4185fe5 ++2009-01-10T23:53:44.855065Z ++13966 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1655 ++ ++001-libnetfilter_queue_update.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++590e1c94414a8ff7581458bebe7de3ab ++2009-01-11T00:05:42.699545Z ++13967 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9541 ++ ++003-keysig_8bytes_alignment.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6f0e9abe1007b6f75295397a4e5f7e4c ++2009-01-10T23:53:44.855065Z ++13966 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++590 ++ ++004-always_link_with_ncurses.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++0fbfe958f328f126c5ee24fe1bc36a62 ++2009-01-10T23:53:44.855065Z ++13966 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++589 ++ +diff --git a/feeds/packages/ipv6/send/patches/.svn/text-base/001-libnetfilter_queue_update.patch.svn-base b/feeds/packages/ipv6/send/patches/.svn/text-base/001-libnetfilter_queue_update.patch.svn-base +new file mode 100644 +index 0000000..f300d7c +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/text-base/001-libnetfilter_queue_update.patch.svn-base +@@ -0,0 +1,388 @@ ++# Update sendd to: ++# ++# - use $DESTDIR for prefix (Debian interest) ++# - use libnetfilter_queue instead of deprecated libipq ++# ++# Under GPLv2 - Copyright (C) 2008 - EADS - Arnaud Ebalard ++--- a/Makefile.config +++++ b/Makefile.config ++@@ -19,7 +19,7 @@ OS=linux ++ #CC=gcc-4.0 ++ ++ # Where to install ++-prefix=/usr +++prefix=$(DESTDIR)/usr ++ ++ # Set to "y" to build MT versions of sendd and cgatool ++ USE_THREADS=n ++--- a/README +++++ b/README ++@@ -20,7 +20,7 @@ Linux: ++ o CONFIG_NETFILTER, CONFIG_IPV6, CONFIG_IP6_NF_QUEUE, CONFIG_IP6_NF_IPTABLES, ++ CONFIG_IP6_NF_FILTER enabled in your kernel config. ++ o netfilter ip6tables command ++- o netfilter libipq development library and headers +++ o netfilter libnetfilter_queue development library and headers ++ ++ FreeBSD: ++ o NETGRAPH, NETGRAPH_BPF, NETGRAPH_ETHER, NETGRAPH_SOCKET enabled in ++--- a/cgatool/Makefile +++++ b/cgatool/Makefile ++@@ -25,7 +25,7 @@ endif ++ ++ ifeq ($(USE_CONSOLE),y) ++ ifeq ($(USE_READLINE),y) ++-LDLIBS += -lreadline -lncurses +++LDLIBS += -lreadline ++ endif ++ endif ++ ++--- a/sendd/Makefile +++++ b/sendd/Makefile ++@@ -37,7 +37,7 @@ endif ++ ++ ifeq ($(USE_CONSOLE),y) ++ ifeq ($(USE_READLINE),y) ++-LDLIBS += -lreadline -lncurses +++LDLIBS += -lreadline ++ endif ++ endif ++ ++--- a/sendd/os-linux/Makefile +++++ b/sendd/os-linux/Makefile ++@@ -1,23 +1,5 @@ ++ ++ OBJS += os/addr.o os/ipq.o os/rand.o os/snd_linux.o ++-OSLIBS= -ldl -lipq +++OSLIBS= -lnetfilter_queue ++ ++-OSEXTRA= os/sendd os/snd_upd_fw ++- ++-ETCINIT= /etc/init.d ++-EXTRAINSTALL= $(ETCINIT)/sendd $(ETCINIT)/snd_upd_fw $(ETCINIT)/snd_fw_functions.sh ++-EXTRAUNINSTALL=$(EXTRAINSTALL) ++-EXTRACLEAN= os/sendd os/snd_upd_fw os/snd_fw_functions.sh ++- ++-$(ETCINIT)/%: os/% ++- install $< $@ ++- ++-os/%: os/%.in ++- sed "s/@etcinit@/\/etc\/init.d/g" $< > $@ ++- ++-os/%: os/%.in2 ++- @./os/find_ip6tables.sh ++- ++-# Sometimes libipq.h is installed in include/libipq.h, other times it is ++-# installed in include/libipq/libipq.h. This rule helps cpp to find it. ++-os/ipq.o: CPPFLAGS += -I/usr/include/libipq -I/usr/local/include/libipq +++os/ipq.o: CPPFLAGS += -I/usr/include/libnetfilter_queue ++--- a/sendd/os-linux/ipq.c +++++ b/sendd/os-linux/ipq.c ++@@ -32,8 +32,9 @@ ++ ++ #include ++ #include +++#include ++ #include ++-#include +++#include ++ ++ #include "config.h" ++ #include ++@@ -42,122 +43,170 @@ ++ #include "../sendd_local.h" ++ #include "snd_linux.h" ++ ++-static struct ipq_handle *qh; ++- ++ extern unsigned if_nametoindex(const char *); ++ ++-static inline void ++-process_pkt(ipq_packet_msg_t *pkt, struct sbuff *b) ++-{ +++struct nfq_handle *h = NULL; +++struct nfq_q_handle *qh = NULL; +++ +++/* This is the default queue number used in our init script */ +++#define SND_DEFAULT_NFQUEUE_NUMBER 13 +++ +++/* The sbuff is must be made available to the callback function that will +++ handle the packet */ +++struct callback_data { +++ struct sbuff *b; +++}; +++ +++struct callback_data process_pkt_data; +++ +++/* nfqueue callback */ +++static int process_pkt(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg, +++ struct nfq_data *nfa, void *data) +++{ +++ struct callback_data * d = (struct callback_data *)data; +++ struct nfqnl_msg_packet_hdr *ph; +++ struct sbuff *b = d->b; +++ char *pkt_data; ++ int in, ifidx; ++ ++- b->data = pkt->payload; ++- b->len = pkt->data_len; +++ b->len = nfq_get_payload(nfa, &pkt_data); +++ if (b->len == -1) { +++ applog(LOG_ERR, "%s: nfq_get_payload() failed.", __FUNCTION__); +++ return 0; +++ } +++ b->data = (unsigned char *)pkt_data; ++ ++- if (*(pkt->indev_name)) { +++ if ((ifidx = nfq_get_indev(nfa)) && ifidx != 0) ++ in = 1; ++- ifidx = if_nametoindex(pkt->indev_name); ++- } else if (*(pkt->outdev_name)) { +++ else if ((ifidx = nfq_get_outdev(nfa)) && ifidx != 0) ++ in = 0; ++- ifidx = if_nametoindex(pkt->outdev_name); ++- } else { +++ else { ++ applog(LOG_ERR, "%s: pkt has neither indev nor outdev", ++ __FUNCTION__); ++ snd_put_buf(b); ++- return; +++ return 0; ++ } ++ ++- snd_recv_pkt(b, ifidx, in, pkt); ++-} +++ /* Grab packet header to get its id later */ +++ ph = nfq_get_msg_packet_hdr(nfa); /* FIXME Check return value */ ++ ++-static void ++-ipq_recv_pkt(void) ++-{ ++- int r; ++- struct sbuff *b = snd_get_buf(); +++ snd_recv_pkt(b, ifidx, in, (void *)ph); ++ ++- if (b == NULL) { ++- return; ++- } ++- if ((r = ipq_read(qh, b->head, b->rem, -1)) < 0) { ++- applog(LOG_ERR, "%s: ipq_read(): %s", __FUNCTION__, ++- ipq_errstr()); ++- goto fail; ++- } else if (r == 0) { ++- /* timeout */ ++- goto fail; ++- } ++- ++- switch ((r = ipq_message_type(b->head))) { ++- case NLMSG_ERROR: ++- applog(LOG_ERR, "%s: nlmsg error: %s", __FUNCTION__, ++- strerror(ipq_get_msgerr(b->head))); ++- goto fail; ++- case IPQM_PACKET: ++- process_pkt(ipq_get_packet(b->head), b); ++- return; ++- default: ++- break; ++- } ++- ++-fail: ++- snd_put_buf(b); +++ return 1; ++ } ++ ++ void ++-linux_ipq_add_fds(fd_set *fds, int *maxfd) +++linux_nfq_add_fds(fd_set *fds, int *maxfd) ++ { ++- FD_SET(qh->fd, fds); ++- *maxfd = sendd_max(*maxfd, qh->fd); +++ int fd = nfnl_fd(nfq_nfnlh(h)); +++ +++ FD_SET(fd, fds); +++ *maxfd = sendd_max(*maxfd, fd); ++ } ++ ++ void ++-linux_ipq_dispatch_fds(fd_set *fds) +++linux_nfq_dispatch_fds(fd_set *fds) ++ { ++- if (FD_ISSET(qh->fd, fds)) { ++- ipq_recv_pkt(); +++ int fd = nfnl_fd(nfq_nfnlh(h)); +++ int r; +++ +++ if (FD_ISSET(fd, fds)) { +++ struct sbuff *b = snd_get_buf(); +++ +++ if (b == NULL) { +++ return; +++ } +++ +++ if ((r = recv(fd, b->head, b->rem, 0)) && r <= 0) { +++ if (r < 0) /* not a timeout */ +++ applog(LOG_ERR, "%s: recv failed.", +++ __FUNCTION__); +++ snd_put_buf(b); +++ return; +++ } +++ +++ process_pkt_data.b = b; /* make sbuff available to +++ callback function */ +++ nfq_handle_packet(h, (char *)b->head, r); ++ } ++ } ++ ++ void ++ os_specific_deliver_pkt(void *p, struct sbuff *b, int drop, int changed) ++ { ++- ipq_packet_msg_t *pkt = p; ++- void *newpkt = NULL; +++ struct nfqnl_msg_packet_hdr *ph = (struct nfqnl_msg_packet_hdr *)p; +++ unsigned char *newpkt = NULL; ++ int plen = 0; +++ uint32_t id = 0; +++ +++ if (ph) +++ id = ntohl(ph->packet_id); ++ ++ if (changed && !drop) { ++- newpkt = sbuff_data(b); +++ newpkt = (unsigned char *)b->data; ++ plen = b->len; ++ } ++ ++- ipq_set_verdict(qh, pkt->packet_id, drop ? NF_DROP : NF_ACCEPT, ++- plen, newpkt); +++ nfq_set_verdict(qh, id, drop ? NF_DROP : NF_ACCEPT, plen, newpkt); ++ snd_put_buf(b); ++ } ++ ++ int ++-linux_ipq_init(void) +++linux_nfq_init(void) ++ { ++- if ((qh = ipq_create_handle(0, PF_INET6)) == NULL) { ++- applog(LOG_ERR, "%s: ipq_create_handle() failed: %s", ++- __FUNCTION__, ipq_errstr()); ++- return (-1); ++- } ++- if (ipq_set_mode(qh, IPQ_COPY_PACKET, SND_MAX_PKT) < 0) { ++- applog(LOG_ERR, "%s: ipq_set_mode() failed: %s", ++- __FUNCTION__, ipq_errstr()); ++- if (errno == ECONNREFUSED) { ++- applog(LOG_ERR, "%s: perhaps you need to modprobe " ++- "ip6_queue?", __FUNCTION__); ++- } ++- return (-1); +++ struct nfnl_handle *nh; +++ u_int16_t nfqueue_num = SND_DEFAULT_NFQUEUE_NUMBER; +++ +++ /* Get netfilter queue connection handle */ +++ h = nfq_open(); +++ if (!h) { +++ applog(LOG_ERR, "%s: nfq_open() failed.", __FUNCTION__); +++ return -1; +++ } +++ +++ /* Unbinding existing nfqueue handlers for AF_INET6. We ignore the +++ return value: http://www.spinics.net/lists/netfilter/msg42063.html. +++ Note that this call is required, otherwise, nfq_bind_pf() fails. */ +++ nfq_unbind_pf(h, PF_INET6); +++ +++ if (nfq_bind_pf(h, PF_INET6) < 0) { +++ applog(LOG_ERR, "%s: nfq_bind_pf failed.\n", __FUNCTION__); +++ return -1; +++ } +++ +++ /* Binding this socket to queue number nfqueue_num and installing +++ our packet handler */ +++ qh = nfq_create_queue(h, nfqueue_num, +++ (nfq_callback *) &process_pkt, +++ (void *)&process_pkt_data); +++ if (!qh) { +++ applog(LOG_ERR, "%s: nfq_create_queue() failed.\n", +++ __FUNCTION__); +++ return -1; +++ } +++ +++ /* Asking for entire copy of queued packets */ +++ if (nfq_set_mode(qh, NFQNL_COPY_PACKET, 0xffff) < 0) { /* XXX was SND_MAX_PKT */ +++ fprintf(stderr, "nfq_set_mode() failed.\n"); +++ return -1; ++ } ++- return (0); +++ +++ /* XXX - Check if we have an interest in setting queue length */ +++ +++ /* The netlink handle associated with our queue connection handle */ +++ nh = nfq_nfnlh(h); +++ +++ return 0; ++ } ++ ++ void ++-linux_ipq_fini(void) +++linux_nfq_fini(void) ++ { ++- ipq_destroy_handle(qh); +++ /* Remove the binding for our queue handler*/ +++ if (qh != NULL) +++ nfq_destroy_queue(qh); +++ +++ /* Close connection associated with our connection handler */ +++ if (h != NULL) +++ nfq_close(h); ++ } ++--- a/sendd/os-linux/snd_linux.c +++++ b/sendd/os-linux/snd_linux.c ++@@ -40,13 +40,13 @@ ++ void ++ os_specific_add_fds(fd_set *fds, int *maxfd) ++ { ++- linux_ipq_add_fds(fds, maxfd); +++ linux_nfq_add_fds(fds, maxfd); ++ } ++ ++ void ++ os_specific_dispatch_fds(fd_set *fds) ++ { ++- linux_ipq_dispatch_fds(fds); +++ linux_nfq_dispatch_fds(fds); ++ } ++ ++ int ++@@ -59,7 +59,7 @@ int ++ os_specific_init(void) ++ { ++ if (linux_rand_init() < 0 || ++- linux_ipq_init() < 0) { +++ linux_nfq_init() < 0) { ++ return (-1); ++ } ++ return (0); ++@@ -68,6 +68,6 @@ os_specific_init(void) ++ void ++ os_specific_fini(void) ++ { ++- linux_ipq_fini(); +++ linux_nfq_fini(); ++ linux_rand_fini(); ++ } ++--- a/sendd/os-linux/snd_linux.h +++++ b/sendd/os-linux/snd_linux.h ++@@ -33,10 +33,10 @@ ++ #ifndef _SEND_LINUX_H ++ #define _SEND_LINUX_H ++ ++-extern void linux_ipq_add_fds(fd_set *, int *); ++-extern void linux_ipq_dispatch_fds(fd_set *); ++-extern int linux_ipq_init(void); ++-extern void linux_ipq_fini(void); +++extern void linux_nfq_add_fds(fd_set *, int *); +++extern void linux_nfq_dispatch_fds(fd_set *); +++extern int linux_nfq_init(void); +++extern void linux_nfq_fini(void); ++ ++ extern void linux_rand_fini(void); ++ extern int linux_rand_init(void); +diff --git a/feeds/packages/ipv6/send/patches/.svn/text-base/002-handle_max_bits_conf.patch.svn-base b/feeds/packages/ipv6/send/patches/.svn/text-base/002-handle_max_bits_conf.patch.svn-base +new file mode 100644 +index 0000000..ab4008c +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/text-base/002-handle_max_bits_conf.patch.svn-base +@@ -0,0 +1,50 @@ ++This patch allows one to specify a maximum number of bits ++for the CGA and RSA key size. RFC specifies that an implementation ++may optionnaly honor this setting (5.1.3). This is particularly ++useful on embedded systems where both the entropy and the processing ++power are limited. ++ ++--- a/sendd/config.c +++++ b/sendd/config.c ++@@ -82,6 +82,7 @@ struct snd_conf snd_confs[] = { ++ SND_CFS(snd_cga_params, NULL, 1), ++ SND_CFIB(snd_full_secure, 1, 0), ++ SND_CFII(snd_min_key_bits, 1024, "bits", 0), +++ SND_CFII(snd_max_key_bits, 2048, "bits", 0), ++ SND_CFII(snd_nonce_cache_gc_intvl, 2, "seconds", 0), ++ SND_CFII(snd_pfx_cache_gc_intvl, 40, "seconds", 0), ++ SND_CFS(snd_pkixip_conf, NULL, 0), ++--- a/sendd/sig_rfc3971.c +++++ b/sendd/sig_rfc3971.c ++@@ -147,7 +147,7 @@ ver(struct iovec *iov, int iovlen, uint8 ++ EVP_MD_CTX ctx[1]; ++ EVP_PKEY *pub; ++ int rv = -1; ++- int i, real_slen, min_bits; +++ int i, real_slen, min_bits, max_bits; ++ DEFINE_TIMESTAMP_VARS(); ++ ++ DBG_HEXDUMP(&dbg_cryptox, "key: ", key, klen); ++@@ -164,6 +164,12 @@ ver(struct iovec *iov, int iovlen, uint8 ++ "minimum: %d)", EVP_PKEY_bits(pub), min_bits); ++ return (-1); ++ } +++ max_bits = snd_conf_get_int(snd_max_key_bits); +++ if (EVP_PKEY_bits(pub) > max_bits) { +++ DBG(&dbg_snd, "Peer key too strong: %d bits (configured " +++ "maximum: %d)", EVP_PKEY_bits(pub), max_bits); +++ return (-1); +++ } ++ ++ real_slen = EVP_PKEY_size(pub); ++ if (real_slen < slen) { ++--- a/sendd/snd_config.h +++++ b/sendd/snd_config.h ++@@ -42,6 +42,7 @@ enum snd_conf_syms { ++ snd_cga_params, ++ snd_full_secure, ++ snd_min_key_bits, +++ snd_max_key_bits, ++ snd_nonce_cache_gc_intvl, ++ snd_pfx_cache_gc_intvl, ++ snd_pkixip_conf, +diff --git a/feeds/packages/ipv6/send/patches/.svn/text-base/003-keysig_8bytes_alignment.patch.svn-base b/feeds/packages/ipv6/send/patches/.svn/text-base/003-keysig_8bytes_alignment.patch.svn-base +new file mode 100644 +index 0000000..561cc3e +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/text-base/003-keysig_8bytes_alignment.patch.svn-base +@@ -0,0 +1,20 @@ ++This patch aligns the structure describing the RSA signature ++option to 8 bytes. Before that, send was padding with N bytes ++(4 on 32-bits architectures) using a cast in sendd/proto_sig.c : ++ ++ so = (struct snd_opt_sig *)(nd_so); ++ ++which would align to the number of bytes representing a pointer ++on your architecture. ++ ++--- a/sendd/snd_proto.h +++++ b/sendd/snd_proto.h ++@@ -69,7 +69,7 @@ struct snd_opt_sig { ++ uint32_t reserved; /* opt hdr + reserved */ ++ uint8_t keyhash[SND_KEYHASH_LEN]; ++ uint8_t sig[0]; ++-}; +++} __attribute__((aligned(8))); ++ ++ struct snd_opt_timestamp { ++ uint8_t type; +diff --git a/feeds/packages/ipv6/send/patches/.svn/text-base/004-always_link_with_ncurses.patch.svn-base b/feeds/packages/ipv6/send/patches/.svn/text-base/004-always_link_with_ncurses.patch.svn-base +new file mode 100644 +index 0000000..367baae +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/text-base/004-always_link_with_ncurses.patch.svn-base +@@ -0,0 +1,26 @@ ++We should always link with libncurses. This is not noticeable ++when building the debian packages because we install libncurses5 ++runtime library as a dependency. ++ ++--- a/cgatool/Makefile +++++ b/cgatool/Makefile ++@@ -17,7 +17,7 @@ LDLIBS= $(DEPLIBS) ++ LDFLAGS= -L../libs/.libs ++ endif ++ ++-LDLIBS += -lcrypto +++LDLIBS += -lcrypto -lncurses ++ ++ ifeq ($(USE_THREADS),y) ++ LDLIBS += -lpthread ++--- a/sendd/Makefile +++++ b/sendd/Makefile ++@@ -28,7 +28,7 @@ LDLIBS= $(DEPLIBS) ++ LDFLAGS= -L../libs/.libs ++ endif ++ ++-LDLIBS += -lcrypto +++LDLIBS += -lcrypto -lncurses ++ LDLIBS += $(OSLIBS) ++ ++ ifeq ($(USE_THREADS),y) +diff --git a/feeds/packages/ipv6/send/patches/.svn/text-base/005-use-bundled-libconfig.patch.svn-base b/feeds/packages/ipv6/send/patches/.svn/text-base/005-use-bundled-libconfig.patch.svn-base +new file mode 100644 +index 0000000..99435f9 +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/text-base/005-use-bundled-libconfig.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/cgatool/cgatool.c +++++ b/cgatool/cgatool.c ++@@ -49,7 +49,7 @@ ++ ++ #include "config.h" ++ #include ++-#include +++#include "../libs/libconfig/libconfig.h" ++ #include ++ ++ #include ++--- a/sendd/config.c +++++ b/sendd/config.c ++@@ -38,7 +38,7 @@ ++ #include ++ ++ #include "config.h" ++-#include +++#include "../libs/libconfig/libconfig.h" ++ #include ++ ++ #include "sendd_local.h" +diff --git a/feeds/packages/ipv6/send/patches/.svn/text-base/006-openssl-1.0.0-compat.patch.svn-base b/feeds/packages/ipv6/send/patches/.svn/text-base/006-openssl-1.0.0-compat.patch.svn-base +new file mode 100644 +index 0000000..1df8a93 +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/.svn/text-base/006-openssl-1.0.0-compat.patch.svn-base +@@ -0,0 +1,143 @@ ++--- a/include/cga_keyutils.h +++++ b/include/cga_keyutils.h ++@@ -40,8 +40,8 @@ ++ ++ extern int cga_add_key(cga_ctx_t *, EVP_PKEY *, int, uint16_t); ++ extern EVP_PKEY *cga_der2key(uint8_t *, int ); ++-extern STACK *cga_der2keys(uint8_t *, int ); ++-extern void cga_free_keystack(STACK *); +++extern STACK_OF(GENERAL_NAME) *cga_der2keys(uint8_t *, int ); +++extern void cga_free_keystack(STACK_OF(GENERAL_NAME) *); ++ extern uint8_t *cga_key2der(EVP_PKEY *, int *); ++ extern int cga_load_cert(cga_ctx_t *, const char *); ++ extern int cga_load_key(cga_ctx_t *, const char *); ++--- a/libs/libcga/cga_keyutils.c +++++ b/libs/libcga/cga_keyutils.c ++@@ -215,7 +215,7 @@ cga_set_key(cga_ctx_t *cga, EVP_PKEY *k) ++ } ++ ++ void ++-cga_free_keystack(STACK *sk) +++cga_free_keystack(STACK_OF(GENERAL_NAME) *sk) ++ { ++ EVP_PKEY *k; ++ ++@@ -232,14 +232,14 @@ cga_free_keystack(STACK *sk) ++ * ++ * Returns a stack of EVP_PKEYs on success. ++ */ ++-STACK * +++STACK_OF(GENERAL_NAME) * ++ cga_der2keys(uint8_t *der, int dlen) ++ { ++ uint8_t *dk; ++ EVP_PKEY *k; ++ int klen, elen; ++ uint16_t type; ++- STACK *sk; +++ STACK_OF(GENERAL_NAME) *sk; ++ ++ if ((sk = sk_new_null()) == NULL) { ++ APPLOG_NOMEM(); ++--- a/include/pkixip_ext.h +++++ b/include/pkixip_ext.h ++@@ -54,7 +54,7 @@ extern int pkixip_add2stores_cert(X509 * ++ extern int pkixip_add2stores_file(const char *); ++ extern int pkixip_add_store(int *, int (*cmp)(X509_OBJECT **, X509_OBJECT **)); ++ extern void *pkixip_find_cert(void *, int); ++-extern STACK *pkixip_get_mychain(void); +++extern STACK_OF(GENERAL_NAME) *pkixip_get_mychain(void); ++ extern X509_STORE_CTX *pkixip_get_store_ctx(void); ++ extern int pkixip_has_ext(X509 *x); ++ extern X509 *pkixip_load_cert(const char *); ++--- a/libs/libpkixipext/x509.c +++++ b/libs/libpkixipext/x509.c ++@@ -62,14 +62,14 @@ X509V3_EXT_METHOD pkix_ip_ext_method = { ++ i2v : (X509V3_EXT_I2V)i2v_IPAddrBlocks, ++ }; ++ ++-static STACK *stores[PKIXIP_MAX_STORES]; +++static STACK_OF(GENERAL_NAME) *stores[PKIXIP_MAX_STORES]; ++ static X509_STORE_CTX *ctx_bysubj; ++ static int next_store = 1; ++ static void *(*wrap_store_cert)(X509 *x); ++ static void (*trustanchor_cb)(X509 *x); ++ pthread_mutex_t stores_lock = PTHREAD_MUTEX_INITIALIZER; ++ ++-static STACK *mychain; +++static STACK_OF(GENERAL_NAME) *mychain; ++ ++ /* Lifted from openssl x509_lu.c */ ++ static int ++@@ -243,7 +243,7 @@ pkixip_load_pkey(const char *f) ++ return (pkey); ++ } ++ ++-static STACK * +++static STACK_OF(GENERAL_NAME) * ++ pkixip_get_store(int handle) ++ { ++ if (handle >= PKIXIP_MAX_STORES || handle < 0) { ++@@ -257,7 +257,7 @@ pkixip_get_store(int handle) ++ void ++ pkixip_walk_store(int (*cb)(X509 *, void *), void *cookie, int handle) ++ { ++- STACK *objs; +++ STACK_OF(GENERAL_NAME) *objs; ++ int i; ++ X509_OBJECT *xo; ++ ++@@ -282,7 +282,7 @@ done: ++ void * ++ pkixip_find_cert(void *k, int handle) ++ { ++- STACK *store; +++ STACK_OF(GENERAL_NAME) *store; ++ int i; ++ void *r = NULL; ++ ++@@ -305,7 +305,7 @@ done: ++ /* Caller must hold stores_lock */ ++ static int ++ pkixip_do_add_store(int handle, int (*cmp)(X509_OBJECT **, X509_OBJECT **), ++- STACK *objs) +++ STACK_OF(GENERAL_NAME) *objs) ++ { ++ if (objs == NULL && (objs = sk_X509_OBJECT_new(cmp)) == NULL) { ++ applog(LOG_CRIT, "no memory"); ++@@ -538,7 +538,7 @@ done: ++ return (r); ++ } ++ ++-STACK * +++STACK_OF(GENERAL_NAME) * ++ pkixip_get_mychain(void) ++ { ++ return (mychain); ++--- a/sendd/cpa.c +++++ b/sendd/cpa.c ++@@ -183,13 +183,13 @@ next: ++ } ++ ++ static int ++-can_handle_cps(uint8_t *ops, int len, STACK *chain, X509 **x) +++can_handle_cps(uint8_t *ops, int len, STACK_OF(GENERAL_NAME) *chain, X509 **x) ++ { ++ int i, j, r = 0; ++ X509_NAME *dn; ++ X509 x509_s; ++ X509_CINF cinf_s; ++- STACK *dchain; +++ STACK_OF(GENERAL_NAME) *dchain; ++ STACK_OF(X509_NAME) *dns; ++ ++ *x = NULL; ++@@ -239,7 +239,7 @@ snd_handle_cps(struct sbuff *b, struct s ++ { ++ uint8_t *msg = sbuff_data(b); ++ int len = b->len; ++- STACK *chain; +++ STACK_OF(GENERAL_NAME) *chain; ++ X509 *x, *trx = NULL; ++ int i, tot, olen; ++ uint8_t *ops; +diff --git a/feeds/packages/ipv6/send/patches/001-libnetfilter_queue_update.patch b/feeds/packages/ipv6/send/patches/001-libnetfilter_queue_update.patch +new file mode 100644 +index 0000000..f300d7c +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/001-libnetfilter_queue_update.patch +@@ -0,0 +1,388 @@ ++# Update sendd to: ++# ++# - use $DESTDIR for prefix (Debian interest) ++# - use libnetfilter_queue instead of deprecated libipq ++# ++# Under GPLv2 - Copyright (C) 2008 - EADS - Arnaud Ebalard ++--- a/Makefile.config +++++ b/Makefile.config ++@@ -19,7 +19,7 @@ OS=linux ++ #CC=gcc-4.0 ++ ++ # Where to install ++-prefix=/usr +++prefix=$(DESTDIR)/usr ++ ++ # Set to "y" to build MT versions of sendd and cgatool ++ USE_THREADS=n ++--- a/README +++++ b/README ++@@ -20,7 +20,7 @@ Linux: ++ o CONFIG_NETFILTER, CONFIG_IPV6, CONFIG_IP6_NF_QUEUE, CONFIG_IP6_NF_IPTABLES, ++ CONFIG_IP6_NF_FILTER enabled in your kernel config. ++ o netfilter ip6tables command ++- o netfilter libipq development library and headers +++ o netfilter libnetfilter_queue development library and headers ++ ++ FreeBSD: ++ o NETGRAPH, NETGRAPH_BPF, NETGRAPH_ETHER, NETGRAPH_SOCKET enabled in ++--- a/cgatool/Makefile +++++ b/cgatool/Makefile ++@@ -25,7 +25,7 @@ endif ++ ++ ifeq ($(USE_CONSOLE),y) ++ ifeq ($(USE_READLINE),y) ++-LDLIBS += -lreadline -lncurses +++LDLIBS += -lreadline ++ endif ++ endif ++ ++--- a/sendd/Makefile +++++ b/sendd/Makefile ++@@ -37,7 +37,7 @@ endif ++ ++ ifeq ($(USE_CONSOLE),y) ++ ifeq ($(USE_READLINE),y) ++-LDLIBS += -lreadline -lncurses +++LDLIBS += -lreadline ++ endif ++ endif ++ ++--- a/sendd/os-linux/Makefile +++++ b/sendd/os-linux/Makefile ++@@ -1,23 +1,5 @@ ++ ++ OBJS += os/addr.o os/ipq.o os/rand.o os/snd_linux.o ++-OSLIBS= -ldl -lipq +++OSLIBS= -lnetfilter_queue ++ ++-OSEXTRA= os/sendd os/snd_upd_fw ++- ++-ETCINIT= /etc/init.d ++-EXTRAINSTALL= $(ETCINIT)/sendd $(ETCINIT)/snd_upd_fw $(ETCINIT)/snd_fw_functions.sh ++-EXTRAUNINSTALL=$(EXTRAINSTALL) ++-EXTRACLEAN= os/sendd os/snd_upd_fw os/snd_fw_functions.sh ++- ++-$(ETCINIT)/%: os/% ++- install $< $@ ++- ++-os/%: os/%.in ++- sed "s/@etcinit@/\/etc\/init.d/g" $< > $@ ++- ++-os/%: os/%.in2 ++- @./os/find_ip6tables.sh ++- ++-# Sometimes libipq.h is installed in include/libipq.h, other times it is ++-# installed in include/libipq/libipq.h. This rule helps cpp to find it. ++-os/ipq.o: CPPFLAGS += -I/usr/include/libipq -I/usr/local/include/libipq +++os/ipq.o: CPPFLAGS += -I/usr/include/libnetfilter_queue ++--- a/sendd/os-linux/ipq.c +++++ b/sendd/os-linux/ipq.c ++@@ -32,8 +32,9 @@ ++ ++ #include ++ #include +++#include ++ #include ++-#include +++#include ++ ++ #include "config.h" ++ #include ++@@ -42,122 +43,170 @@ ++ #include "../sendd_local.h" ++ #include "snd_linux.h" ++ ++-static struct ipq_handle *qh; ++- ++ extern unsigned if_nametoindex(const char *); ++ ++-static inline void ++-process_pkt(ipq_packet_msg_t *pkt, struct sbuff *b) ++-{ +++struct nfq_handle *h = NULL; +++struct nfq_q_handle *qh = NULL; +++ +++/* This is the default queue number used in our init script */ +++#define SND_DEFAULT_NFQUEUE_NUMBER 13 +++ +++/* The sbuff is must be made available to the callback function that will +++ handle the packet */ +++struct callback_data { +++ struct sbuff *b; +++}; +++ +++struct callback_data process_pkt_data; +++ +++/* nfqueue callback */ +++static int process_pkt(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg, +++ struct nfq_data *nfa, void *data) +++{ +++ struct callback_data * d = (struct callback_data *)data; +++ struct nfqnl_msg_packet_hdr *ph; +++ struct sbuff *b = d->b; +++ char *pkt_data; ++ int in, ifidx; ++ ++- b->data = pkt->payload; ++- b->len = pkt->data_len; +++ b->len = nfq_get_payload(nfa, &pkt_data); +++ if (b->len == -1) { +++ applog(LOG_ERR, "%s: nfq_get_payload() failed.", __FUNCTION__); +++ return 0; +++ } +++ b->data = (unsigned char *)pkt_data; ++ ++- if (*(pkt->indev_name)) { +++ if ((ifidx = nfq_get_indev(nfa)) && ifidx != 0) ++ in = 1; ++- ifidx = if_nametoindex(pkt->indev_name); ++- } else if (*(pkt->outdev_name)) { +++ else if ((ifidx = nfq_get_outdev(nfa)) && ifidx != 0) ++ in = 0; ++- ifidx = if_nametoindex(pkt->outdev_name); ++- } else { +++ else { ++ applog(LOG_ERR, "%s: pkt has neither indev nor outdev", ++ __FUNCTION__); ++ snd_put_buf(b); ++- return; +++ return 0; ++ } ++ ++- snd_recv_pkt(b, ifidx, in, pkt); ++-} +++ /* Grab packet header to get its id later */ +++ ph = nfq_get_msg_packet_hdr(nfa); /* FIXME Check return value */ ++ ++-static void ++-ipq_recv_pkt(void) ++-{ ++- int r; ++- struct sbuff *b = snd_get_buf(); +++ snd_recv_pkt(b, ifidx, in, (void *)ph); ++ ++- if (b == NULL) { ++- return; ++- } ++- if ((r = ipq_read(qh, b->head, b->rem, -1)) < 0) { ++- applog(LOG_ERR, "%s: ipq_read(): %s", __FUNCTION__, ++- ipq_errstr()); ++- goto fail; ++- } else if (r == 0) { ++- /* timeout */ ++- goto fail; ++- } ++- ++- switch ((r = ipq_message_type(b->head))) { ++- case NLMSG_ERROR: ++- applog(LOG_ERR, "%s: nlmsg error: %s", __FUNCTION__, ++- strerror(ipq_get_msgerr(b->head))); ++- goto fail; ++- case IPQM_PACKET: ++- process_pkt(ipq_get_packet(b->head), b); ++- return; ++- default: ++- break; ++- } ++- ++-fail: ++- snd_put_buf(b); +++ return 1; ++ } ++ ++ void ++-linux_ipq_add_fds(fd_set *fds, int *maxfd) +++linux_nfq_add_fds(fd_set *fds, int *maxfd) ++ { ++- FD_SET(qh->fd, fds); ++- *maxfd = sendd_max(*maxfd, qh->fd); +++ int fd = nfnl_fd(nfq_nfnlh(h)); +++ +++ FD_SET(fd, fds); +++ *maxfd = sendd_max(*maxfd, fd); ++ } ++ ++ void ++-linux_ipq_dispatch_fds(fd_set *fds) +++linux_nfq_dispatch_fds(fd_set *fds) ++ { ++- if (FD_ISSET(qh->fd, fds)) { ++- ipq_recv_pkt(); +++ int fd = nfnl_fd(nfq_nfnlh(h)); +++ int r; +++ +++ if (FD_ISSET(fd, fds)) { +++ struct sbuff *b = snd_get_buf(); +++ +++ if (b == NULL) { +++ return; +++ } +++ +++ if ((r = recv(fd, b->head, b->rem, 0)) && r <= 0) { +++ if (r < 0) /* not a timeout */ +++ applog(LOG_ERR, "%s: recv failed.", +++ __FUNCTION__); +++ snd_put_buf(b); +++ return; +++ } +++ +++ process_pkt_data.b = b; /* make sbuff available to +++ callback function */ +++ nfq_handle_packet(h, (char *)b->head, r); ++ } ++ } ++ ++ void ++ os_specific_deliver_pkt(void *p, struct sbuff *b, int drop, int changed) ++ { ++- ipq_packet_msg_t *pkt = p; ++- void *newpkt = NULL; +++ struct nfqnl_msg_packet_hdr *ph = (struct nfqnl_msg_packet_hdr *)p; +++ unsigned char *newpkt = NULL; ++ int plen = 0; +++ uint32_t id = 0; +++ +++ if (ph) +++ id = ntohl(ph->packet_id); ++ ++ if (changed && !drop) { ++- newpkt = sbuff_data(b); +++ newpkt = (unsigned char *)b->data; ++ plen = b->len; ++ } ++ ++- ipq_set_verdict(qh, pkt->packet_id, drop ? NF_DROP : NF_ACCEPT, ++- plen, newpkt); +++ nfq_set_verdict(qh, id, drop ? NF_DROP : NF_ACCEPT, plen, newpkt); ++ snd_put_buf(b); ++ } ++ ++ int ++-linux_ipq_init(void) +++linux_nfq_init(void) ++ { ++- if ((qh = ipq_create_handle(0, PF_INET6)) == NULL) { ++- applog(LOG_ERR, "%s: ipq_create_handle() failed: %s", ++- __FUNCTION__, ipq_errstr()); ++- return (-1); ++- } ++- if (ipq_set_mode(qh, IPQ_COPY_PACKET, SND_MAX_PKT) < 0) { ++- applog(LOG_ERR, "%s: ipq_set_mode() failed: %s", ++- __FUNCTION__, ipq_errstr()); ++- if (errno == ECONNREFUSED) { ++- applog(LOG_ERR, "%s: perhaps you need to modprobe " ++- "ip6_queue?", __FUNCTION__); ++- } ++- return (-1); +++ struct nfnl_handle *nh; +++ u_int16_t nfqueue_num = SND_DEFAULT_NFQUEUE_NUMBER; +++ +++ /* Get netfilter queue connection handle */ +++ h = nfq_open(); +++ if (!h) { +++ applog(LOG_ERR, "%s: nfq_open() failed.", __FUNCTION__); +++ return -1; +++ } +++ +++ /* Unbinding existing nfqueue handlers for AF_INET6. We ignore the +++ return value: http://www.spinics.net/lists/netfilter/msg42063.html. +++ Note that this call is required, otherwise, nfq_bind_pf() fails. */ +++ nfq_unbind_pf(h, PF_INET6); +++ +++ if (nfq_bind_pf(h, PF_INET6) < 0) { +++ applog(LOG_ERR, "%s: nfq_bind_pf failed.\n", __FUNCTION__); +++ return -1; +++ } +++ +++ /* Binding this socket to queue number nfqueue_num and installing +++ our packet handler */ +++ qh = nfq_create_queue(h, nfqueue_num, +++ (nfq_callback *) &process_pkt, +++ (void *)&process_pkt_data); +++ if (!qh) { +++ applog(LOG_ERR, "%s: nfq_create_queue() failed.\n", +++ __FUNCTION__); +++ return -1; +++ } +++ +++ /* Asking for entire copy of queued packets */ +++ if (nfq_set_mode(qh, NFQNL_COPY_PACKET, 0xffff) < 0) { /* XXX was SND_MAX_PKT */ +++ fprintf(stderr, "nfq_set_mode() failed.\n"); +++ return -1; ++ } ++- return (0); +++ +++ /* XXX - Check if we have an interest in setting queue length */ +++ +++ /* The netlink handle associated with our queue connection handle */ +++ nh = nfq_nfnlh(h); +++ +++ return 0; ++ } ++ ++ void ++-linux_ipq_fini(void) +++linux_nfq_fini(void) ++ { ++- ipq_destroy_handle(qh); +++ /* Remove the binding for our queue handler*/ +++ if (qh != NULL) +++ nfq_destroy_queue(qh); +++ +++ /* Close connection associated with our connection handler */ +++ if (h != NULL) +++ nfq_close(h); ++ } ++--- a/sendd/os-linux/snd_linux.c +++++ b/sendd/os-linux/snd_linux.c ++@@ -40,13 +40,13 @@ ++ void ++ os_specific_add_fds(fd_set *fds, int *maxfd) ++ { ++- linux_ipq_add_fds(fds, maxfd); +++ linux_nfq_add_fds(fds, maxfd); ++ } ++ ++ void ++ os_specific_dispatch_fds(fd_set *fds) ++ { ++- linux_ipq_dispatch_fds(fds); +++ linux_nfq_dispatch_fds(fds); ++ } ++ ++ int ++@@ -59,7 +59,7 @@ int ++ os_specific_init(void) ++ { ++ if (linux_rand_init() < 0 || ++- linux_ipq_init() < 0) { +++ linux_nfq_init() < 0) { ++ return (-1); ++ } ++ return (0); ++@@ -68,6 +68,6 @@ os_specific_init(void) ++ void ++ os_specific_fini(void) ++ { ++- linux_ipq_fini(); +++ linux_nfq_fini(); ++ linux_rand_fini(); ++ } ++--- a/sendd/os-linux/snd_linux.h +++++ b/sendd/os-linux/snd_linux.h ++@@ -33,10 +33,10 @@ ++ #ifndef _SEND_LINUX_H ++ #define _SEND_LINUX_H ++ ++-extern void linux_ipq_add_fds(fd_set *, int *); ++-extern void linux_ipq_dispatch_fds(fd_set *); ++-extern int linux_ipq_init(void); ++-extern void linux_ipq_fini(void); +++extern void linux_nfq_add_fds(fd_set *, int *); +++extern void linux_nfq_dispatch_fds(fd_set *); +++extern int linux_nfq_init(void); +++extern void linux_nfq_fini(void); ++ ++ extern void linux_rand_fini(void); ++ extern int linux_rand_init(void); +diff --git a/feeds/packages/ipv6/send/patches/002-handle_max_bits_conf.patch b/feeds/packages/ipv6/send/patches/002-handle_max_bits_conf.patch +new file mode 100644 +index 0000000..ab4008c +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/002-handle_max_bits_conf.patch +@@ -0,0 +1,50 @@ ++This patch allows one to specify a maximum number of bits ++for the CGA and RSA key size. RFC specifies that an implementation ++may optionnaly honor this setting (5.1.3). This is particularly ++useful on embedded systems where both the entropy and the processing ++power are limited. ++ ++--- a/sendd/config.c +++++ b/sendd/config.c ++@@ -82,6 +82,7 @@ struct snd_conf snd_confs[] = { ++ SND_CFS(snd_cga_params, NULL, 1), ++ SND_CFIB(snd_full_secure, 1, 0), ++ SND_CFII(snd_min_key_bits, 1024, "bits", 0), +++ SND_CFII(snd_max_key_bits, 2048, "bits", 0), ++ SND_CFII(snd_nonce_cache_gc_intvl, 2, "seconds", 0), ++ SND_CFII(snd_pfx_cache_gc_intvl, 40, "seconds", 0), ++ SND_CFS(snd_pkixip_conf, NULL, 0), ++--- a/sendd/sig_rfc3971.c +++++ b/sendd/sig_rfc3971.c ++@@ -147,7 +147,7 @@ ver(struct iovec *iov, int iovlen, uint8 ++ EVP_MD_CTX ctx[1]; ++ EVP_PKEY *pub; ++ int rv = -1; ++- int i, real_slen, min_bits; +++ int i, real_slen, min_bits, max_bits; ++ DEFINE_TIMESTAMP_VARS(); ++ ++ DBG_HEXDUMP(&dbg_cryptox, "key: ", key, klen); ++@@ -164,6 +164,12 @@ ver(struct iovec *iov, int iovlen, uint8 ++ "minimum: %d)", EVP_PKEY_bits(pub), min_bits); ++ return (-1); ++ } +++ max_bits = snd_conf_get_int(snd_max_key_bits); +++ if (EVP_PKEY_bits(pub) > max_bits) { +++ DBG(&dbg_snd, "Peer key too strong: %d bits (configured " +++ "maximum: %d)", EVP_PKEY_bits(pub), max_bits); +++ return (-1); +++ } ++ ++ real_slen = EVP_PKEY_size(pub); ++ if (real_slen < slen) { ++--- a/sendd/snd_config.h +++++ b/sendd/snd_config.h ++@@ -42,6 +42,7 @@ enum snd_conf_syms { ++ snd_cga_params, ++ snd_full_secure, ++ snd_min_key_bits, +++ snd_max_key_bits, ++ snd_nonce_cache_gc_intvl, ++ snd_pfx_cache_gc_intvl, ++ snd_pkixip_conf, +diff --git a/feeds/packages/ipv6/send/patches/003-keysig_8bytes_alignment.patch b/feeds/packages/ipv6/send/patches/003-keysig_8bytes_alignment.patch +new file mode 100644 +index 0000000..561cc3e +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/003-keysig_8bytes_alignment.patch +@@ -0,0 +1,20 @@ ++This patch aligns the structure describing the RSA signature ++option to 8 bytes. Before that, send was padding with N bytes ++(4 on 32-bits architectures) using a cast in sendd/proto_sig.c : ++ ++ so = (struct snd_opt_sig *)(nd_so); ++ ++which would align to the number of bytes representing a pointer ++on your architecture. ++ ++--- a/sendd/snd_proto.h +++++ b/sendd/snd_proto.h ++@@ -69,7 +69,7 @@ struct snd_opt_sig { ++ uint32_t reserved; /* opt hdr + reserved */ ++ uint8_t keyhash[SND_KEYHASH_LEN]; ++ uint8_t sig[0]; ++-}; +++} __attribute__((aligned(8))); ++ ++ struct snd_opt_timestamp { ++ uint8_t type; +diff --git a/feeds/packages/ipv6/send/patches/004-always_link_with_ncurses.patch b/feeds/packages/ipv6/send/patches/004-always_link_with_ncurses.patch +new file mode 100644 +index 0000000..367baae +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/004-always_link_with_ncurses.patch +@@ -0,0 +1,26 @@ ++We should always link with libncurses. This is not noticeable ++when building the debian packages because we install libncurses5 ++runtime library as a dependency. ++ ++--- a/cgatool/Makefile +++++ b/cgatool/Makefile ++@@ -17,7 +17,7 @@ LDLIBS= $(DEPLIBS) ++ LDFLAGS= -L../libs/.libs ++ endif ++ ++-LDLIBS += -lcrypto +++LDLIBS += -lcrypto -lncurses ++ ++ ifeq ($(USE_THREADS),y) ++ LDLIBS += -lpthread ++--- a/sendd/Makefile +++++ b/sendd/Makefile ++@@ -28,7 +28,7 @@ LDLIBS= $(DEPLIBS) ++ LDFLAGS= -L../libs/.libs ++ endif ++ ++-LDLIBS += -lcrypto +++LDLIBS += -lcrypto -lncurses ++ LDLIBS += $(OSLIBS) ++ ++ ifeq ($(USE_THREADS),y) +diff --git a/feeds/packages/ipv6/send/patches/005-use-bundled-libconfig.patch b/feeds/packages/ipv6/send/patches/005-use-bundled-libconfig.patch +new file mode 100644 +index 0000000..99435f9 +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/005-use-bundled-libconfig.patch +@@ -0,0 +1,22 @@ ++--- a/cgatool/cgatool.c +++++ b/cgatool/cgatool.c ++@@ -49,7 +49,7 @@ ++ ++ #include "config.h" ++ #include ++-#include +++#include "../libs/libconfig/libconfig.h" ++ #include ++ ++ #include ++--- a/sendd/config.c +++++ b/sendd/config.c ++@@ -38,7 +38,7 @@ ++ #include ++ ++ #include "config.h" ++-#include +++#include "../libs/libconfig/libconfig.h" ++ #include ++ ++ #include "sendd_local.h" +diff --git a/feeds/packages/ipv6/send/patches/006-openssl-1.0.0-compat.patch b/feeds/packages/ipv6/send/patches/006-openssl-1.0.0-compat.patch +new file mode 100644 +index 0000000..1df8a93 +--- /dev/null ++++ b/feeds/packages/ipv6/send/patches/006-openssl-1.0.0-compat.patch +@@ -0,0 +1,143 @@ ++--- a/include/cga_keyutils.h +++++ b/include/cga_keyutils.h ++@@ -40,8 +40,8 @@ ++ ++ extern int cga_add_key(cga_ctx_t *, EVP_PKEY *, int, uint16_t); ++ extern EVP_PKEY *cga_der2key(uint8_t *, int ); ++-extern STACK *cga_der2keys(uint8_t *, int ); ++-extern void cga_free_keystack(STACK *); +++extern STACK_OF(GENERAL_NAME) *cga_der2keys(uint8_t *, int ); +++extern void cga_free_keystack(STACK_OF(GENERAL_NAME) *); ++ extern uint8_t *cga_key2der(EVP_PKEY *, int *); ++ extern int cga_load_cert(cga_ctx_t *, const char *); ++ extern int cga_load_key(cga_ctx_t *, const char *); ++--- a/libs/libcga/cga_keyutils.c +++++ b/libs/libcga/cga_keyutils.c ++@@ -215,7 +215,7 @@ cga_set_key(cga_ctx_t *cga, EVP_PKEY *k) ++ } ++ ++ void ++-cga_free_keystack(STACK *sk) +++cga_free_keystack(STACK_OF(GENERAL_NAME) *sk) ++ { ++ EVP_PKEY *k; ++ ++@@ -232,14 +232,14 @@ cga_free_keystack(STACK *sk) ++ * ++ * Returns a stack of EVP_PKEYs on success. ++ */ ++-STACK * +++STACK_OF(GENERAL_NAME) * ++ cga_der2keys(uint8_t *der, int dlen) ++ { ++ uint8_t *dk; ++ EVP_PKEY *k; ++ int klen, elen; ++ uint16_t type; ++- STACK *sk; +++ STACK_OF(GENERAL_NAME) *sk; ++ ++ if ((sk = sk_new_null()) == NULL) { ++ APPLOG_NOMEM(); ++--- a/include/pkixip_ext.h +++++ b/include/pkixip_ext.h ++@@ -54,7 +54,7 @@ extern int pkixip_add2stores_cert(X509 * ++ extern int pkixip_add2stores_file(const char *); ++ extern int pkixip_add_store(int *, int (*cmp)(X509_OBJECT **, X509_OBJECT **)); ++ extern void *pkixip_find_cert(void *, int); ++-extern STACK *pkixip_get_mychain(void); +++extern STACK_OF(GENERAL_NAME) *pkixip_get_mychain(void); ++ extern X509_STORE_CTX *pkixip_get_store_ctx(void); ++ extern int pkixip_has_ext(X509 *x); ++ extern X509 *pkixip_load_cert(const char *); ++--- a/libs/libpkixipext/x509.c +++++ b/libs/libpkixipext/x509.c ++@@ -62,14 +62,14 @@ X509V3_EXT_METHOD pkix_ip_ext_method = { ++ i2v : (X509V3_EXT_I2V)i2v_IPAddrBlocks, ++ }; ++ ++-static STACK *stores[PKIXIP_MAX_STORES]; +++static STACK_OF(GENERAL_NAME) *stores[PKIXIP_MAX_STORES]; ++ static X509_STORE_CTX *ctx_bysubj; ++ static int next_store = 1; ++ static void *(*wrap_store_cert)(X509 *x); ++ static void (*trustanchor_cb)(X509 *x); ++ pthread_mutex_t stores_lock = PTHREAD_MUTEX_INITIALIZER; ++ ++-static STACK *mychain; +++static STACK_OF(GENERAL_NAME) *mychain; ++ ++ /* Lifted from openssl x509_lu.c */ ++ static int ++@@ -243,7 +243,7 @@ pkixip_load_pkey(const char *f) ++ return (pkey); ++ } ++ ++-static STACK * +++static STACK_OF(GENERAL_NAME) * ++ pkixip_get_store(int handle) ++ { ++ if (handle >= PKIXIP_MAX_STORES || handle < 0) { ++@@ -257,7 +257,7 @@ pkixip_get_store(int handle) ++ void ++ pkixip_walk_store(int (*cb)(X509 *, void *), void *cookie, int handle) ++ { ++- STACK *objs; +++ STACK_OF(GENERAL_NAME) *objs; ++ int i; ++ X509_OBJECT *xo; ++ ++@@ -282,7 +282,7 @@ done: ++ void * ++ pkixip_find_cert(void *k, int handle) ++ { ++- STACK *store; +++ STACK_OF(GENERAL_NAME) *store; ++ int i; ++ void *r = NULL; ++ ++@@ -305,7 +305,7 @@ done: ++ /* Caller must hold stores_lock */ ++ static int ++ pkixip_do_add_store(int handle, int (*cmp)(X509_OBJECT **, X509_OBJECT **), ++- STACK *objs) +++ STACK_OF(GENERAL_NAME) *objs) ++ { ++ if (objs == NULL && (objs = sk_X509_OBJECT_new(cmp)) == NULL) { ++ applog(LOG_CRIT, "no memory"); ++@@ -538,7 +538,7 @@ done: ++ return (r); ++ } ++ ++-STACK * +++STACK_OF(GENERAL_NAME) * ++ pkixip_get_mychain(void) ++ { ++ return (mychain); ++--- a/sendd/cpa.c +++++ b/sendd/cpa.c ++@@ -183,13 +183,13 @@ next: ++ } ++ ++ static int ++-can_handle_cps(uint8_t *ops, int len, STACK *chain, X509 **x) +++can_handle_cps(uint8_t *ops, int len, STACK_OF(GENERAL_NAME) *chain, X509 **x) ++ { ++ int i, j, r = 0; ++ X509_NAME *dn; ++ X509 x509_s; ++ X509_CINF cinf_s; ++- STACK *dchain; +++ STACK_OF(GENERAL_NAME) *dchain; ++ STACK_OF(X509_NAME) *dns; ++ ++ *x = NULL; ++@@ -239,7 +239,7 @@ snd_handle_cps(struct sbuff *b, struct s ++ { ++ uint8_t *msg = sbuff_data(b); ++ int len = b->len; ++- STACK *chain; +++ STACK_OF(GENERAL_NAME) *chain; ++ X509 *x, *trx = NULL; ++ int i, tot, olen; ++ uint8_t *ops; +diff --git a/feeds/packages/ipv6/shorewall6-lite/.svn/entries b/feeds/packages/ipv6/shorewall6-lite/.svn/entries +new file mode 100644 +index 0000000..fe0e2c4 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/shorewall6-lite ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-08-20T11:26:55.780999Z ++28060 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++97608ec3bd0d4b255ab13b072b9cb9d8 ++2011-08-20T11:26:55.780999Z ++28060 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2213 ++ +diff --git a/feeds/packages/ipv6/shorewall6-lite/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/shorewall6-lite/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e082b89 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,66 @@ ++# ++# 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:=shorewall6-lite ++PKG_VERSION:=4.4.22.2 ++PKG_DIRECTORY:=4.4.22 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://slovakia.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://shorewall.de/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://www.shorewall.com.au/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=3ad7ba3790388bb562d3c937ba02fa31 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shorewall6-lite ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+ip +ip6tables ++ TITLE:=Shorewall6 Lite ++ URL:=http://www.shorewall.net/ ++ SUBMENU:=Firewall ++endef ++ ++define Package/shorewall6-lite/description ++ Shoreline Firewall 6 Lite is an iptables-based firewall for Linux systems. ++endef ++ ++define Package/shorewall6-lite/conffiles ++/etc/shorewall6-lite/shorewall6-lite.conf ++/etc/shorewall6-lite/vardir ++endef ++ ++define Build/Compile ++ rm -rf $(PKG_INSTALL_DIR) ++ mkdir -p $(PKG_INSTALL_DIR) ++ PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh ++endef ++ ++define Package/shorewall6-lite/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DIR) $(1)/etc/shorewall6-lite ++ $(INSTALL_DIR) $(1)/usr/share ++ $(INSTALL_BIN) ./files/shorewall-lite.init $(1)/etc/init.d/shorewall6-lite ++ $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall6-lite $(1)/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite $(1)/usr/share ++ $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite ++ $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite $(1)/etc ++ $(CP) ./files/vardir $(1)/etc/shorewall6-lite ++endef ++ ++$(eval $(call BuildPackage,shorewall6-lite)) +diff --git a/feeds/packages/ipv6/shorewall6-lite/Makefile b/feeds/packages/ipv6/shorewall6-lite/Makefile +new file mode 100644 +index 0000000..e082b89 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/Makefile +@@ -0,0 +1,66 @@ ++# ++# 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:=shorewall6-lite ++PKG_VERSION:=4.4.22.2 ++PKG_DIRECTORY:=4.4.22 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://slovakia.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://shorewall.de/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://www.shorewall.com.au/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ ++ http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=3ad7ba3790388bb562d3c937ba02fa31 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shorewall6-lite ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+ip +ip6tables ++ TITLE:=Shorewall6 Lite ++ URL:=http://www.shorewall.net/ ++ SUBMENU:=Firewall ++endef ++ ++define Package/shorewall6-lite/description ++ Shoreline Firewall 6 Lite is an iptables-based firewall for Linux systems. ++endef ++ ++define Package/shorewall6-lite/conffiles ++/etc/shorewall6-lite/shorewall6-lite.conf ++/etc/shorewall6-lite/vardir ++endef ++ ++define Build/Compile ++ rm -rf $(PKG_INSTALL_DIR) ++ mkdir -p $(PKG_INSTALL_DIR) ++ PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh ++endef ++ ++define Package/shorewall6-lite/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DIR) $(1)/etc/shorewall6-lite ++ $(INSTALL_DIR) $(1)/usr/share ++ $(INSTALL_BIN) ./files/shorewall-lite.init $(1)/etc/init.d/shorewall6-lite ++ $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall6-lite $(1)/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite $(1)/usr/share ++ $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite ++ $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite $(1)/etc ++ $(CP) ./files/vardir $(1)/etc/shorewall6-lite ++endef ++ ++$(eval $(call BuildPackage,shorewall6-lite)) +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/.svn/entries b/feeds/packages/ipv6/shorewall6-lite/files/.svn/entries +new file mode 100644 +index 0000000..3a73975 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/shorewall6-lite/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-11T02:09:15.012350Z ++18735 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++vardir ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++98af135caafb0abb9ca145a86da62418 ++2009-12-11T02:09:15.012350Z ++18735 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++62 ++ ++hotplug_iface ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++7e3ec9fef5172acaca116c18858c413d ++2009-12-11T02:09:15.012350Z ++18735 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++237 ++ ++shorewall-lite.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++dedf9066f606242f6ab087b578dce8d0 ++2009-12-11T02:09:15.012350Z ++18735 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++329 ++ ++hostname ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++980c2adabcabad1d33e0f83a23419a6b ++2009-12-11T02:09:15.012350Z ++18735 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++40 ++ +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/hostname.svn-base b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/hostname.svn-base +new file mode 100644 +index 0000000..42e1643 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/hostname.svn-base +@@ -0,0 +1,2 @@ ++#!/bin/sh ++cat /proc/sys/kernel/hostname +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/hotplug_iface.svn-base b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/hotplug_iface.svn-base +new file mode 100644 +index 0000000..58ecbf9 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/hotplug_iface.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++# should restart shorewall when an interface comes up ++ ++[ ifup = "$ACTION" ] && { ++ /etc/init.d/shorewall6-lite restart ++} ++ ++[ ifdown = "$ACTION" ] && { ++ # might need to restore some routing ++ /etc/init.d/shorewall6-lite restart ++} +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/shorewall-lite.init.svn-base b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/shorewall-lite.init.svn-base +new file mode 100644 +index 0000000..ca24bbc +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/shorewall-lite.init.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh /etc/rc.common ++ ++START=46 ++start() { ++ touch /var/log/messages ++ mkdir -p /var/lock/subsys ++ /sbin/shorewall6-lite -qq start -f ++} ++ ++stop() { ++ /sbin/shorewall6-lite -qq stop ++} ++ ++restart() { ++ if [ -f /etc/shorewall6-lite/state/restore ] ; then ++ /sbin/shorewall6-lite -qq restore ++ else ++ /sbin/shorewall6-lite -qq restart ++ fi ++} +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/vardir.svn-base b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/vardir.svn-base +new file mode 100644 +index 0000000..e7a9030 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/.svn/text-base/vardir.svn-base +@@ -0,0 +1,2 @@ ++# move state dir out of ram ++VARDIR=/etc/shorewall6-lite/state +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/hostname b/feeds/packages/ipv6/shorewall6-lite/files/hostname +new file mode 100644 +index 0000000..42e1643 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/hostname +@@ -0,0 +1,2 @@ ++#!/bin/sh ++cat /proc/sys/kernel/hostname +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/hotplug_iface b/feeds/packages/ipv6/shorewall6-lite/files/hotplug_iface +new file mode 100644 +index 0000000..58ecbf9 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/hotplug_iface +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++# should restart shorewall when an interface comes up ++ ++[ ifup = "$ACTION" ] && { ++ /etc/init.d/shorewall6-lite restart ++} ++ ++[ ifdown = "$ACTION" ] && { ++ # might need to restore some routing ++ /etc/init.d/shorewall6-lite restart ++} +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/shorewall-lite.init b/feeds/packages/ipv6/shorewall6-lite/files/shorewall-lite.init +new file mode 100644 +index 0000000..ca24bbc +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/shorewall-lite.init +@@ -0,0 +1,20 @@ ++#!/bin/sh /etc/rc.common ++ ++START=46 ++start() { ++ touch /var/log/messages ++ mkdir -p /var/lock/subsys ++ /sbin/shorewall6-lite -qq start -f ++} ++ ++stop() { ++ /sbin/shorewall6-lite -qq stop ++} ++ ++restart() { ++ if [ -f /etc/shorewall6-lite/state/restore ] ; then ++ /sbin/shorewall6-lite -qq restore ++ else ++ /sbin/shorewall6-lite -qq restart ++ fi ++} +diff --git a/feeds/packages/ipv6/shorewall6-lite/files/vardir b/feeds/packages/ipv6/shorewall6-lite/files/vardir +new file mode 100644 +index 0000000..e7a9030 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/files/vardir +@@ -0,0 +1,2 @@ ++# move state dir out of ram ++VARDIR=/etc/shorewall6-lite/state +diff --git a/feeds/packages/ipv6/shorewall6-lite/patches/.svn/entries b/feeds/packages/ipv6/shorewall6-lite/patches/.svn/entries +new file mode 100644 +index 0000000..47e5a20 +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/shorewall6-lite/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-08-20T11:26:49.379965Z ++28058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++120-LOGFILE.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++1b14ffcfafb52450bcaf2f25d9044510 ++2011-08-20T11:26:49.379965Z ++28058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++285 ++ ++110-MODULESDIR.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++9bac0b8e3d114ead3c3718d57e7aee25 ++2011-08-20T11:26:49.379965Z ++28058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1135 ++ +diff --git a/feeds/packages/ipv6/shorewall6-lite/patches/.svn/text-base/110-MODULESDIR.patch.svn-base b/feeds/packages/ipv6/shorewall6-lite/patches/.svn/text-base/110-MODULESDIR.patch.svn-base +new file mode 100644 +index 0000000..cb01e8c +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/patches/.svn/text-base/110-MODULESDIR.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/lib.common +++++ b/lib.common ++@@ -292,7 +292,7 @@ ++ ++ [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] ++ ++- [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched +++ [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r) ++ MODULES=$(lsmod | cut -d ' ' -f1) ++ ++ for directory in $(split $MODULESDIR); do ++@@ -328,7 +328,7 @@ ++ [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] ++ ++ [ -z "$MODULESDIR" ] && \ ++- MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched +++ MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r) ++ ++ for directory in $(split $MODULESDIR); do ++ [ -d $directory ] && moduledirectories="$moduledirectories $directory" +diff --git a/feeds/packages/ipv6/shorewall6-lite/patches/.svn/text-base/120-LOGFILE.patch.svn-base b/feeds/packages/ipv6/shorewall6-lite/patches/.svn/text-base/120-LOGFILE.patch.svn-base +new file mode 100644 +index 0000000..7fc11cd +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/patches/.svn/text-base/120-LOGFILE.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/shorewall6-lite.conf 2009-12-05 22:37:43.000000000 -0500 +++++ b/shorewall6-lite.conf 2009-12-05 22:37:51.000000000 -0500 ++@@ -28,7 +28,7 @@ ++ # L O G G I N G ++ ############################################################################### ++ ++-LOGFILE= +++LOGFILE=/dev/null ++ ++ +diff --git a/feeds/packages/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch b/feeds/packages/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch +new file mode 100644 +index 0000000..cb01e8c +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch +@@ -0,0 +1,20 @@ ++--- a/lib.common +++++ b/lib.common ++@@ -292,7 +292,7 @@ ++ ++ [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] ++ ++- [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched +++ [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r) ++ MODULES=$(lsmod | cut -d ' ' -f1) ++ ++ for directory in $(split $MODULESDIR); do ++@@ -328,7 +328,7 @@ ++ [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] ++ ++ [ -z "$MODULESDIR" ] && \ ++- MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched +++ MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r) ++ ++ for directory in $(split $MODULESDIR); do ++ [ -d $directory ] && moduledirectories="$moduledirectories $directory" +diff --git a/feeds/packages/ipv6/shorewall6-lite/patches/120-LOGFILE.patch b/feeds/packages/ipv6/shorewall6-lite/patches/120-LOGFILE.patch +new file mode 100644 +index 0000000..7fc11cd +--- /dev/null ++++ b/feeds/packages/ipv6/shorewall6-lite/patches/120-LOGFILE.patch +@@ -0,0 +1,10 @@ ++--- a/shorewall6-lite.conf 2009-12-05 22:37:43.000000000 -0500 +++++ b/shorewall6-lite.conf 2009-12-05 22:37:51.000000000 -0500 ++@@ -28,7 +28,7 @@ ++ # L O G G I N G ++ ############################################################################### ++ ++-LOGFILE= +++LOGFILE=/dev/null ++ ++ +diff --git a/feeds/packages/ipv6/tayga/.svn/entries b/feeds/packages/ipv6/tayga/.svn/entries +new file mode 100644 +index 0000000..7ede685 +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/tayga ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++5f12d5a5784a892f249758c9c068d60b ++2012-05-14T23:35:46.648446Z ++31731 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1314 ++ +diff --git a/feeds/packages/ipv6/tayga/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/tayga/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5d043ae +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=tayga ++PKG_VERSION:=0.9.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.litech.org/tayga/ ++PKG_MD5SUM:=7a7b24165ce008df772f398d86fa280e ++PKG_CAT:=bzcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/tayga-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tayga ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+ip +kmod-ipv6 +kmod-tun ++ TITLE:=Out-of-kernel stateless NAT64 implementation for Linux ++ URL:=http://www.litech.org/tayga/ ++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 ++ ++# TODO: port scripts to netifd ++ifdef CONFIG_PACAKGE_netifd ++ define Package/tayga/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tayga $(1)/usr/sbin/ ++ 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/feeds/packages/ipv6/tayga/Makefile b/feeds/packages/ipv6/tayga/Makefile +new file mode 100644 +index 0000000..5d043ae +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/Makefile +@@ -0,0 +1,47 @@ ++# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=tayga ++PKG_VERSION:=0.9.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.litech.org/tayga/ ++PKG_MD5SUM:=7a7b24165ce008df772f398d86fa280e ++PKG_CAT:=bzcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/tayga-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tayga ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+ip +kmod-ipv6 +kmod-tun ++ TITLE:=Out-of-kernel stateless NAT64 implementation for Linux ++ URL:=http://www.litech.org/tayga/ ++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 ++ ++# TODO: port scripts to netifd ++ifdef CONFIG_PACAKGE_netifd ++ define Package/tayga/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tayga $(1)/usr/sbin/ ++ 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/feeds/packages/ipv6/tayga/files/.svn/entries b/feeds/packages/ipv6/tayga/files/.svn/entries +new file mode 100644 +index 0000000..e49d26c +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/tayga/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++tayga.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++412e0933f8ec63e63517d33e037ede1b ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++858 ++ ++tayga.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8b88963bc8959abbc1781c4f50a699f7 ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3740 ++ +diff --git a/feeds/packages/ipv6/tayga/files/.svn/text-base/tayga.hotplug.svn-base b/feeds/packages/ipv6/tayga/files/.svn/text-base/tayga.hotplug.svn-base +new file mode 100644 +index 0000000..fb989bd +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/files/.svn/text-base/tayga.hotplug.svn-base +@@ -0,0 +1,37 @@ ++#!/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/feeds/packages/ipv6/tayga/files/.svn/text-base/tayga.sh.svn-base b/feeds/packages/ipv6/tayga/files/.svn/text-base/tayga.sh.svn-base +new file mode 100644 +index 0000000..a9edb6d +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/files/.svn/text-base/tayga.sh.svn-base +@@ -0,0 +1,152 @@ ++# 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/feeds/packages/ipv6/tayga/files/tayga.hotplug b/feeds/packages/ipv6/tayga/files/tayga.hotplug +new file mode 100644 +index 0000000..fb989bd +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/files/tayga.hotplug +@@ -0,0 +1,37 @@ ++#!/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/feeds/packages/ipv6/tayga/files/tayga.sh b/feeds/packages/ipv6/tayga/files/tayga.sh +new file mode 100644 +index 0000000..a9edb6d +--- /dev/null ++++ b/feeds/packages/ipv6/tayga/files/tayga.sh +@@ -0,0 +1,152 @@ ++# 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/feeds/packages/ipv6/totd/.svn/entries b/feeds/packages/ipv6/totd/.svn/entries +new file mode 100644 +index 0000000..79f74d4 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/totd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++80dd0ed08f12ca185783be4617a9c5f5 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1397 ++ +diff --git a/feeds/packages/ipv6/totd/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/totd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/totd/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/totd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e67bc57 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=totd ++PKG_VERSION:=1.5.1 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.dillema.net/software/totd ++PKG_MD5SUM:=7edaedae9f6aca5912dd6c123582cf08 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/totd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+kmod-ipv6 ++ TITLE:=Small DNS proxy that supports IPv6/IPv4 record translation ++ URL:=http://www.dillema.net/software/totd.html ++endef ++ ++define Package/totd/description ++ totd is a small DNS proxy nameserver which supports IPv6 and enable IPv6 ++ only sites to access IPv4 sites by using some translation mechanism such ++ as NAT-PT, KAME faith, etc... ++endef ++ ++define Package/totd/conffiles ++/etc/totd.conf ++endef ++ ++# uses GNU configure ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ all ++endef ++ ++define Package/totd/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/ ++ $(INSTALL_CONF) ./files/totd.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/totd.init $(1)/etc/init.d/totd ++endef ++ ++define Package/totd/conffiles ++/etc/totd.conf ++endef ++ ++$(eval $(call BuildPackage,totd)) +diff --git a/feeds/packages/ipv6/totd/Makefile b/feeds/packages/ipv6/totd/Makefile +new file mode 100644 +index 0000000..e67bc57 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=totd ++PKG_VERSION:=1.5.1 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.dillema.net/software/totd ++PKG_MD5SUM:=7edaedae9f6aca5912dd6c123582cf08 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/totd ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+kmod-ipv6 ++ TITLE:=Small DNS proxy that supports IPv6/IPv4 record translation ++ URL:=http://www.dillema.net/software/totd.html ++endef ++ ++define Package/totd/description ++ totd is a small DNS proxy nameserver which supports IPv6 and enable IPv6 ++ only sites to access IPv4 sites by using some translation mechanism such ++ as NAT-PT, KAME faith, etc... ++endef ++ ++define Package/totd/conffiles ++/etc/totd.conf ++endef ++ ++# uses GNU configure ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ all ++endef ++ ++define Package/totd/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/ ++ $(INSTALL_CONF) ./files/totd.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/totd.init $(1)/etc/init.d/totd ++endef ++ ++define Package/totd/conffiles ++/etc/totd.conf ++endef ++ ++$(eval $(call BuildPackage,totd)) +diff --git a/feeds/packages/ipv6/totd/files/.svn/entries b/feeds/packages/ipv6/totd/files/.svn/entries +new file mode 100644 +index 0000000..4f6c890 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/totd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:26.182110Z ++28928 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++totd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++255bf6c403a653f79d2e28baa3ce515b ++2011-11-09T23:49:26.182110Z ++28928 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++194 ++ ++totd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++72c8541db361391c64b8923dd56ba820 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++653 ++ +diff --git a/feeds/packages/ipv6/totd/files/.svn/prop-base/totd.conf.svn-base b/feeds/packages/ipv6/totd/files/.svn/prop-base/totd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/.svn/prop-base/totd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/totd/files/.svn/prop-base/totd.init.svn-base b/feeds/packages/ipv6/totd/files/.svn/prop-base/totd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/.svn/prop-base/totd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/totd/files/.svn/text-base/totd.conf.svn-base b/feeds/packages/ipv6/totd/files/.svn/text-base/totd.conf.svn-base +new file mode 100644 +index 0000000..37e0458 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/.svn/text-base/totd.conf.svn-base +@@ -0,0 +1,17 @@ ++; Totd sample configuration file ++; you can have multiple forwarders, totd will always prefer ++; forwarders listed early and only use forwarders listed later ++; if the first ones are unresponsive. ++forwarder 192.168.1.1 port 5353 ++; you can have multiple prefixes or even no prefixes at all ++; totd uses them in round-robin fashion ++prefix 3ffe:abcd:1234:9876:: ++; the port totd listens on for incoming requests ++port 53 ++; the pidfile to use (default: /var/run/totd.pid) ++pidfile /var/run/totd.pid ++; interfaces totd listens on (UDP only for now and not on Linux) ++; If left out totd will only open wildcard sockets. ++; interfaces lo br0 ++; 6to4 reverse lookup ++; stf +diff --git a/feeds/packages/ipv6/totd/files/.svn/text-base/totd.init.svn-base b/feeds/packages/ipv6/totd/files/.svn/text-base/totd.init.svn-base +new file mode 100644 +index 0000000..9c2dd74 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/.svn/text-base/totd.init.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=60 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/sbin/totd -c /etc/totd.conf ++} ++ ++stop() { ++ service_stop /usr/sbin/totd ++} +diff --git a/feeds/packages/ipv6/totd/files/totd.conf b/feeds/packages/ipv6/totd/files/totd.conf +new file mode 100644 +index 0000000..37e0458 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/totd.conf +@@ -0,0 +1,17 @@ ++; Totd sample configuration file ++; you can have multiple forwarders, totd will always prefer ++; forwarders listed early and only use forwarders listed later ++; if the first ones are unresponsive. ++forwarder 192.168.1.1 port 5353 ++; you can have multiple prefixes or even no prefixes at all ++; totd uses them in round-robin fashion ++prefix 3ffe:abcd:1234:9876:: ++; the port totd listens on for incoming requests ++port 53 ++; the pidfile to use (default: /var/run/totd.pid) ++pidfile /var/run/totd.pid ++; interfaces totd listens on (UDP only for now and not on Linux) ++; If left out totd will only open wildcard sockets. ++; interfaces lo br0 ++; 6to4 reverse lookup ++; stf +diff --git a/feeds/packages/ipv6/totd/files/totd.init b/feeds/packages/ipv6/totd/files/totd.init +new file mode 100644 +index 0000000..9c2dd74 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/files/totd.init +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=60 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/sbin/totd -c /etc/totd.conf ++} ++ ++stop() { ++ service_stop /usr/sbin/totd ++} +diff --git a/feeds/packages/ipv6/totd/patches/.svn/entries b/feeds/packages/ipv6/totd/patches/.svn/entries +new file mode 100644 +index 0000000..c30de0c +--- /dev/null ++++ b/feeds/packages/ipv6/totd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/totd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-14T17:07:11.552943Z ++27610 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_warning_as_errors.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++49156e62703abf360a6d6bd50c1a23f2 ++2011-07-14T17:07:11.552943Z ++27610 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++471 ++ +diff --git a/feeds/packages/ipv6/totd/patches/.svn/prop-base/001-no_warning_as_errors.patch.svn-base b/feeds/packages/ipv6/totd/patches/.svn/prop-base/001-no_warning_as_errors.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/patches/.svn/prop-base/001-no_warning_as_errors.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/totd/patches/.svn/text-base/001-no_warning_as_errors.patch.svn-base b/feeds/packages/ipv6/totd/patches/.svn/text-base/001-no_warning_as_errors.patch.svn-base +new file mode 100644 +index 0000000..3f8f3b4 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/patches/.svn/text-base/001-no_warning_as_errors.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -19,7 +19,7 @@ TOT_CONFIG_FILE=@sysconfdir@/totd.conf ++ ++ INSTALL = /usr/bin/install ++ ++-CFLAGS = @CFLAGS@ @DEFS@ -Werror -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) +++CFLAGS = @CFLAGS@ @DEFS@ -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) ++ ++ # When debugging is enabled by --enable-malloc-debug flag to the configure ++ # script, the @DBMALLOC@ substitution will contain the empty string, thus +diff --git a/feeds/packages/ipv6/totd/patches/001-no_warning_as_errors.patch b/feeds/packages/ipv6/totd/patches/001-no_warning_as_errors.patch +new file mode 100644 +index 0000000..3f8f3b4 +--- /dev/null ++++ b/feeds/packages/ipv6/totd/patches/001-no_warning_as_errors.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -19,7 +19,7 @@ TOT_CONFIG_FILE=@sysconfdir@/totd.conf ++ ++ INSTALL = /usr/bin/install ++ ++-CFLAGS = @CFLAGS@ @DEFS@ -Werror -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) +++CFLAGS = @CFLAGS@ @DEFS@ -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) ++ ++ # When debugging is enabled by --enable-malloc-debug flag to the configure ++ # script, the @DBMALLOC@ substitution will contain the empty string, thus +diff --git a/feeds/packages/ipv6/tspc/.svn/entries b/feeds/packages/ipv6/tspc/.svn/entries +new file mode 100644 +index 0000000..38a5eb1 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/tspc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8d02ccfb293b0e3b807dd0b2c910db2f ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1321 ++ +diff --git a/feeds/packages/ipv6/tspc/.svn/prop-base/Makefile.svn-base b/feeds/packages/ipv6/tspc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/tspc/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/tspc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8133f27 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=tspc ++PKG_VERSION:=2.1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.fr.debian.org/debian/pool/main/t/tspc/ ++PKG_MD5SUM:=65183cae002feaacd8bc92d6a5404cc2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tspc ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=Client for Hexago's (Freenet6's) IPv6 service ++ URL:=http://www.hexago.com ++endef ++ ++define Package/tspc/description ++ Client to configure an IPv6 tunnel to ++ Hexago's (Freenet6's) migration broker. ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/include -I$(PKG_BUILD_DIR)/platform/linux" \ ++ target=linux \ ++ all ++ ++define Package/tspc/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/tspc $(1)/bin/ ++ $(INSTALL_DIR) $(1)/etc/tsp ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/bin/tspc.conf.sample $(1)/etc/tsp/tspc.conf ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/template/linux.sh $(1)/etc/tsp/setup.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/template/checktunnel.sh $(1)/etc/tsp/ ++endef ++ ++define Package/tspc/conffiles ++/etc/tsp/tspc.conf ++endef ++ ++$(eval $(call BuildPackage,tspc)) +diff --git a/feeds/packages/ipv6/tspc/Makefile b/feeds/packages/ipv6/tspc/Makefile +new file mode 100644 +index 0000000..8133f27 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=tspc ++PKG_VERSION:=2.1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.fr.debian.org/debian/pool/main/t/tspc/ ++PKG_MD5SUM:=65183cae002feaacd8bc92d6a5404cc2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tspc ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=Client for Hexago's (Freenet6's) IPv6 service ++ URL:=http://www.hexago.com ++endef ++ ++define Package/tspc/description ++ Client to configure an IPv6 tunnel to ++ Hexago's (Freenet6's) migration broker. ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/include -I$(PKG_BUILD_DIR)/platform/linux" \ ++ target=linux \ ++ all ++ ++define Package/tspc/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/tspc $(1)/bin/ ++ $(INSTALL_DIR) $(1)/etc/tsp ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/bin/tspc.conf.sample $(1)/etc/tsp/tspc.conf ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/template/linux.sh $(1)/etc/tsp/setup.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/template/checktunnel.sh $(1)/etc/tsp/ ++endef ++ ++define Package/tspc/conffiles ++/etc/tsp/tspc.conf ++endef ++ ++$(eval $(call BuildPackage,tspc)) +diff --git a/feeds/packages/ipv6/tspc/patches/.svn/entries b/feeds/packages/ipv6/tspc/patches/.svn/entries +new file mode 100644 +index 0000000..e31c7a6 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/tspc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-debian_patches.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e5554340905cadd27968db9bbc015864 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9259 ++ +diff --git a/feeds/packages/ipv6/tspc/patches/.svn/prop-base/001-debian_patches.patch.svn-base b/feeds/packages/ipv6/tspc/patches/.svn/prop-base/001-debian_patches.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/patches/.svn/prop-base/001-debian_patches.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/ipv6/tspc/patches/.svn/text-base/001-debian_patches.patch.svn-base b/feeds/packages/ipv6/tspc/patches/.svn/text-base/001-debian_patches.patch.svn-base +new file mode 100644 +index 0000000..3a958f6 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/patches/.svn/text-base/001-debian_patches.patch.svn-base +@@ -0,0 +1,228 @@ ++diff -Nur tspc2/conf/Makefile tspc2.owrt/conf/Makefile ++--- tspc2/conf/Makefile 2004-03-29 17:37:56.000000000 +0200 +++++ tspc2.owrt/conf/Makefile 2007-02-19 16:07:05.000000000 +0100 ++@@ -42,7 +42,7 @@ ++ sed -e "s+@ifname_tun@+$(ifname_tun)+" -e "s+@ifname@+$(ifname)+" -e "s+@target@+$(target)+" -e "s+@tsp_dir@+$(configdir)+" tspc.conf.in >$(BIN)/tspc.conf.sample; \ ++ fi ++ ++- chmod 700 $(BIN)/tspc.conf.sample +++ chmod 600 $(BIN)/tspc.conf.sample ++ ++ ++ clean: ++diff -Nur tspc2/conf/tspc.conf.in tspc2.owrt/conf/tspc.conf.in ++--- tspc2/conf/tspc.conf.in 2004-06-15 17:01:01.000000000 +0200 +++++ tspc2.owrt/conf/tspc.conf.in 2007-02-19 16:07:05.000000000 +0100 ++@@ -18,13 +18,6 @@ ++ # to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ # MA 02111-1307 USA ++ #------------------------------------------------------------------------------ ++-# ++-# ++-# tsp directory: ++-# the only use is for the OS scripts which will be taken ++-# from $tsp_dir/template ++-# ++-tsp_dir=@tsp_dir@ ++ ++ # ++ # authentication method: ++@@ -66,28 +59,19 @@ ++ ++ # ++ # Name of the script: ++-# template=checktunnel|freebsd|netbsd|linux|windows|darwin|cisco| ++-# solaris|openbsd +++# template=checktunnel|setup ++ # ++ # the value is the file name of the script in the tsp_dir/template directory ++ # The script will be executed after the TSP session is completed. The script ++ # is configuring the tunnel interface and routes. ++ # checktunnel is only printing information and does not configure any tunnel ++-# freebsd is for FreeBSD 4.X and above ++-# netbsd is for NetBSD 1.6 and above ++-# linux is for Linux (most distributions) ++-# windows is for WindowsXP ++-# darwin is for MacOS X 10.2 and above ++-# cisco is for Cisco IOS. This script prints the cisco configuration while ++-# not configuring the cisco itself. ++-# solaris is for Solaris 8 and above. ++-# openbsd is for OpenBSD 3.X and above +++# setup will do the actual work ++ # you could customize your own script, name it and put the filename in ++ # the template variable. ++ # on unix, '.sh' is added to the name of the script. ++ # on windows, '.bat' is added to the name of the script. ++ # ++-template=@target@ +++template=setup ++ ++ # ++ # 'server' is the tunnel broker identifier ++diff -Nur tspc2/platform/linux/tsp_local.c tspc2.owrt/platform/linux/tsp_local.c ++--- tspc2/platform/linux/tsp_local.c 2004-07-07 21:25:47.000000000 +0200 +++++ tspc2.owrt/platform/linux/tsp_local.c 2007-02-19 16:07:18.000000000 +0100 ++@@ -59,13 +59,13 @@ ++ ++ /* these globals are defined by US used by alot of things in */ ++ ++-char *FileName = "tspc.conf"; ++-char *LogFile = "tspc.log"; +++char *FileName = "/etc/tsp/tspc.conf"; +++char *LogFile = "/var/log/tspc.log"; ++ char *LogFileName = NULL; ++-char *ScriptInterpretor = "/bin/sh"; +++char *ScriptInterpretor = ""; ++ char *ScriptExtension = "sh"; ++ char *ScriptDir = NULL; ++-char *TspHomeDir = "/usr/local/etc/tsp"; +++char *TspHomeDir = "/etc/tsp"; ++ char DirSeparator = '/'; ++ ++ int Verbose = 0; ++@@ -143,7 +143,7 @@ ++ { ++ int tunfd; ++ ++- Display(0, ELInfo, "tspStartLocal", "Going daemon, check %s for tunnel creation status", LogFile); +++ Display(1, ELInfo, "tspStartLocal", "Going daemon, check %s for tunnel creation status", LogFile); ++ ++ if (daemon(0,0) == -1) { ++ Display(1, ELError, "tspStartLocal", "Unable to fork."); ++diff -Nur tspc2/src/lib/config.c tspc2.owrt/src/lib/config.c ++--- tspc2/src/lib/config.c 2004-06-29 17:06:13.000000000 +0200 +++++ tspc2.owrt/src/lib/config.c 2007-02-19 16:07:11.000000000 +0100 ++@@ -474,14 +474,17 @@ ++ if(IsPresent(Conf->dns_server)) { ++ char *Server; ++ char *dns = strdup(Conf->dns_server); +++ struct addrinfo *contact; ++ if (eq(Conf->host_type, "host")) { ++ Display(1,ELError, "tspVerifyConfig", "DNS delegation is not supported for host_type=host"); ++ status = 1; ++ } ++ for(Server = strtok(dns, ":");Server; Server = strtok(NULL, ":")) { ++- if(gethostbyname(Server) == NULL) { +++ if(getaddrinfo(Server, "domain", 0, &contact)!=0) { ++ Display(1,ELError, "tspVerifyConfig", "DNS server name %s is not resolving.", Server); ++ status = 1; +++ } else { +++ freeaddrinfo(contact); ++ } ++ } ++ free(dns); ++diff -Nur tspc2/src/tsp/tsp_client.c tspc2.owrt/src/tsp/tsp_client.c ++--- tspc2/src/tsp/tsp_client.c 2004-04-20 17:10:58.000000000 +0200 +++++ tspc2.owrt/src/tsp/tsp_client.c 2007-02-19 16:07:18.000000000 +0100 ++@@ -275,7 +275,7 @@ ++ ++ start_show: ++ ++- Display(0, ELInfo, "tspSetupTunnel", "Got tunnel parameters from server, setting up local tunnel"); +++ Display(1, ELInfo, "tspSetupTunnel", "Got tunnel parameters from server, setting up local tunnel"); ++ ++ /* and start the show */ ++ ret = tspStartLocal(socket, conf, &t, nt[conf->transport]); ++@@ -337,8 +337,8 @@ ++ LogInit("tspc", LogFile); ++ ++ Display( 1, ELInfo, "tspMain", "----- TSP Client Version %s Initializing -------------------------", TSP_CLIENT_VERSION); ++- Display( 0, ELInfo, "tspMain", IDENTIFICATION); ++- Display( 0, ELInfo, "tspMain", "Initializing (use -h for help)\n"); +++ Display( 1, ELInfo, "tspMain", IDENTIFICATION); +++ Display( 1, ELInfo, "tspMain", "Initializing (use -h for help)\n"); ++ ++ if((status = tspInitialize(argc, argv, &c)) != 0) { // *** we have no uninitialize ++ if (status == -1) { ++@@ -361,12 +361,12 @@ ++ ++ /* first try with RUDP */ ++ c.transport = NET_TOOLS_T_RUDP; ++- Display( 0, ELInfo, "tspMain", "\nConnecting to server with reliable udp"); +++ Display( 1, ELInfo, "tspMain", "\nConnecting to server with reliable udp"); ++ ++ try_server: ++ ++ if (c.transport == NET_TOOLS_T_TCP) ++- Display( 0, ELInfo, "tspMain", "\nConnecting to server with tcp"); +++ Display( 1, ELInfo, "tspMain", "\nConnecting to server with tcp"); ++ ++ Display( 1, ELInfo, "tspMain", "Using TSP protocol version %s", ++ TspProtocolVersionStrings[version_index]); ++diff -Nur tspc2/template/linux.sh tspc2.owrt/template/linux.sh ++--- tspc2/template/linux.sh 2004-06-23 23:29:20.000000000 +0200 +++++ tspc2.owrt/template/linux.sh 2007-02-19 16:08:39.000000000 +0100 ++@@ -135,9 +135,7 @@ ++ # ++ # Default route ++ Display 1 "Adding default route" ++- ExecNoCheck $route -A inet6 del ::/0 2>/dev/null # delete old default route ++ ExecNoCheck $route -A inet6 del 2000::/3 2>/dev/null # delete old gw route ++- Exec $route -A inet6 add ::/0 dev $TSP_TUNNEL_INTERFACE ++ Exec $route -A inet6 add 2000::/3 dev $TSP_TUNNEL_INTERFACE ++ fi ++ ++@@ -147,9 +145,10 @@ ++ Display 1 "Kernel setup" ++ if [ X"${TSP_PREFIXLEN}" != X"64" ]; then ++ #Better way on linux to avoid loop with the remaining /48? ++- $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null +++ ExecNoCheck $route -A inet6 del $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null +++ Exec $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE ++ fi ++- Exec $sysctl -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled +++ Exec $sysctl -q -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled ++ Display 1 "Adding prefix to $TSP_HOME_INTERFACE" ++ OLDADDR=`$ifconfig $TSP_HOME_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"` ++ if [ ! -z $OLDADDR ]; then ++@@ -157,28 +156,28 @@ ++ Exec $ifconfig $TSP_HOME_INTERFACE inet6 del $OLDADDR ++ fi ++ Exec $ifconfig $TSP_HOME_INTERFACE add $TSP_PREFIX::1/64 ++- # Router advertisement configuration ++- Display 1 "Create new $rtadvdconfigfile" ++- echo "##### rtadvd.conf made by TSP ####" > "$rtadvdconfigfile" ++- echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile" ++- echo "{" >> "$rtadvdconfigfile" ++- echo " AdvSendAdvert on;" >> "$rtadvdconfigfile" ++- echo " prefix $TSP_PREFIX::/64" >> "$rtadvdconfigfile" ++- echo " {" >> "$rtadvdconfigfile" ++- echo " AdvOnLink on;" >> "$rtadvdconfigfile" ++- echo " AdvAutonomous on;" >> "$rtadvdconfigfile" ++- echo " };" >> "$rtadvdconfigfile" ++- echo "};" >> "$rtadvdconfigfile" ++- echo "" >> "$rtadvdconfigfile" ++- /etc/init.d/radvd stop ++- if [ -f $rtadvdconfigfile ]; then ++- KillProcess $rtadvdconfigfile ++- Exec $rtadvd -u radvd -C $rtadvdconfigfile ++- Display 1 "Starting radvd: $rtadvd -u radvd -C $rtadvdconfigfile" ++- else ++- echo "Error : file $rtadvdconfigfile not found" ++- exit 1 ++- fi +++# # Router advertisement configuration +++# Display 1 "Create new $rtadvdconfigfile" +++# echo "##### rtadvd.conf made by TSP ####" > "$rtadvdconfigfile" +++# echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile" +++# echo "{" >> "$rtadvdconfigfile" +++# echo " AdvSendAdvert on;" >> "$rtadvdconfigfile" +++# echo " prefix $TSP_PREFIX::/64" >> "$rtadvdconfigfile" +++# echo " {" >> "$rtadvdconfigfile" +++# echo " AdvOnLink on;" >> "$rtadvdconfigfile" +++# echo " AdvAutonomous on;" >> "$rtadvdconfigfile" +++# echo " };" >> "$rtadvdconfigfile" +++# echo "};" >> "$rtadvdconfigfile" +++# echo "" >> "$rtadvdconfigfile" +++# /etc/init.d/radvd stop +++# if [ -f $rtadvdconfigfile ]; then +++# KillProcess $rtadvdconfigfile +++# Exec $rtadvd -u radvd -C $rtadvdconfigfile +++# Display 1 "Starting radvd: $rtadvd -u radvd -C $rtadvdconfigfile" +++# else +++# echo "Error : file $rtadvdconfigfile not found" +++# exit 1 +++# fi ++ fi ++ ++ Display 1 "--- End of configuration script. ---" +diff --git a/feeds/packages/ipv6/tspc/patches/001-debian_patches.patch b/feeds/packages/ipv6/tspc/patches/001-debian_patches.patch +new file mode 100644 +index 0000000..3a958f6 +--- /dev/null ++++ b/feeds/packages/ipv6/tspc/patches/001-debian_patches.patch +@@ -0,0 +1,228 @@ ++diff -Nur tspc2/conf/Makefile tspc2.owrt/conf/Makefile ++--- tspc2/conf/Makefile 2004-03-29 17:37:56.000000000 +0200 +++++ tspc2.owrt/conf/Makefile 2007-02-19 16:07:05.000000000 +0100 ++@@ -42,7 +42,7 @@ ++ sed -e "s+@ifname_tun@+$(ifname_tun)+" -e "s+@ifname@+$(ifname)+" -e "s+@target@+$(target)+" -e "s+@tsp_dir@+$(configdir)+" tspc.conf.in >$(BIN)/tspc.conf.sample; \ ++ fi ++ ++- chmod 700 $(BIN)/tspc.conf.sample +++ chmod 600 $(BIN)/tspc.conf.sample ++ ++ ++ clean: ++diff -Nur tspc2/conf/tspc.conf.in tspc2.owrt/conf/tspc.conf.in ++--- tspc2/conf/tspc.conf.in 2004-06-15 17:01:01.000000000 +0200 +++++ tspc2.owrt/conf/tspc.conf.in 2007-02-19 16:07:05.000000000 +0100 ++@@ -18,13 +18,6 @@ ++ # to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ # MA 02111-1307 USA ++ #------------------------------------------------------------------------------ ++-# ++-# ++-# tsp directory: ++-# the only use is for the OS scripts which will be taken ++-# from $tsp_dir/template ++-# ++-tsp_dir=@tsp_dir@ ++ ++ # ++ # authentication method: ++@@ -66,28 +59,19 @@ ++ ++ # ++ # Name of the script: ++-# template=checktunnel|freebsd|netbsd|linux|windows|darwin|cisco| ++-# solaris|openbsd +++# template=checktunnel|setup ++ # ++ # the value is the file name of the script in the tsp_dir/template directory ++ # The script will be executed after the TSP session is completed. The script ++ # is configuring the tunnel interface and routes. ++ # checktunnel is only printing information and does not configure any tunnel ++-# freebsd is for FreeBSD 4.X and above ++-# netbsd is for NetBSD 1.6 and above ++-# linux is for Linux (most distributions) ++-# windows is for WindowsXP ++-# darwin is for MacOS X 10.2 and above ++-# cisco is for Cisco IOS. This script prints the cisco configuration while ++-# not configuring the cisco itself. ++-# solaris is for Solaris 8 and above. ++-# openbsd is for OpenBSD 3.X and above +++# setup will do the actual work ++ # you could customize your own script, name it and put the filename in ++ # the template variable. ++ # on unix, '.sh' is added to the name of the script. ++ # on windows, '.bat' is added to the name of the script. ++ # ++-template=@target@ +++template=setup ++ ++ # ++ # 'server' is the tunnel broker identifier ++diff -Nur tspc2/platform/linux/tsp_local.c tspc2.owrt/platform/linux/tsp_local.c ++--- tspc2/platform/linux/tsp_local.c 2004-07-07 21:25:47.000000000 +0200 +++++ tspc2.owrt/platform/linux/tsp_local.c 2007-02-19 16:07:18.000000000 +0100 ++@@ -59,13 +59,13 @@ ++ ++ /* these globals are defined by US used by alot of things in */ ++ ++-char *FileName = "tspc.conf"; ++-char *LogFile = "tspc.log"; +++char *FileName = "/etc/tsp/tspc.conf"; +++char *LogFile = "/var/log/tspc.log"; ++ char *LogFileName = NULL; ++-char *ScriptInterpretor = "/bin/sh"; +++char *ScriptInterpretor = ""; ++ char *ScriptExtension = "sh"; ++ char *ScriptDir = NULL; ++-char *TspHomeDir = "/usr/local/etc/tsp"; +++char *TspHomeDir = "/etc/tsp"; ++ char DirSeparator = '/'; ++ ++ int Verbose = 0; ++@@ -143,7 +143,7 @@ ++ { ++ int tunfd; ++ ++- Display(0, ELInfo, "tspStartLocal", "Going daemon, check %s for tunnel creation status", LogFile); +++ Display(1, ELInfo, "tspStartLocal", "Going daemon, check %s for tunnel creation status", LogFile); ++ ++ if (daemon(0,0) == -1) { ++ Display(1, ELError, "tspStartLocal", "Unable to fork."); ++diff -Nur tspc2/src/lib/config.c tspc2.owrt/src/lib/config.c ++--- tspc2/src/lib/config.c 2004-06-29 17:06:13.000000000 +0200 +++++ tspc2.owrt/src/lib/config.c 2007-02-19 16:07:11.000000000 +0100 ++@@ -474,14 +474,17 @@ ++ if(IsPresent(Conf->dns_server)) { ++ char *Server; ++ char *dns = strdup(Conf->dns_server); +++ struct addrinfo *contact; ++ if (eq(Conf->host_type, "host")) { ++ Display(1,ELError, "tspVerifyConfig", "DNS delegation is not supported for host_type=host"); ++ status = 1; ++ } ++ for(Server = strtok(dns, ":");Server; Server = strtok(NULL, ":")) { ++- if(gethostbyname(Server) == NULL) { +++ if(getaddrinfo(Server, "domain", 0, &contact)!=0) { ++ Display(1,ELError, "tspVerifyConfig", "DNS server name %s is not resolving.", Server); ++ status = 1; +++ } else { +++ freeaddrinfo(contact); ++ } ++ } ++ free(dns); ++diff -Nur tspc2/src/tsp/tsp_client.c tspc2.owrt/src/tsp/tsp_client.c ++--- tspc2/src/tsp/tsp_client.c 2004-04-20 17:10:58.000000000 +0200 +++++ tspc2.owrt/src/tsp/tsp_client.c 2007-02-19 16:07:18.000000000 +0100 ++@@ -275,7 +275,7 @@ ++ ++ start_show: ++ ++- Display(0, ELInfo, "tspSetupTunnel", "Got tunnel parameters from server, setting up local tunnel"); +++ Display(1, ELInfo, "tspSetupTunnel", "Got tunnel parameters from server, setting up local tunnel"); ++ ++ /* and start the show */ ++ ret = tspStartLocal(socket, conf, &t, nt[conf->transport]); ++@@ -337,8 +337,8 @@ ++ LogInit("tspc", LogFile); ++ ++ Display( 1, ELInfo, "tspMain", "----- TSP Client Version %s Initializing -------------------------", TSP_CLIENT_VERSION); ++- Display( 0, ELInfo, "tspMain", IDENTIFICATION); ++- Display( 0, ELInfo, "tspMain", "Initializing (use -h for help)\n"); +++ Display( 1, ELInfo, "tspMain", IDENTIFICATION); +++ Display( 1, ELInfo, "tspMain", "Initializing (use -h for help)\n"); ++ ++ if((status = tspInitialize(argc, argv, &c)) != 0) { // *** we have no uninitialize ++ if (status == -1) { ++@@ -361,12 +361,12 @@ ++ ++ /* first try with RUDP */ ++ c.transport = NET_TOOLS_T_RUDP; ++- Display( 0, ELInfo, "tspMain", "\nConnecting to server with reliable udp"); +++ Display( 1, ELInfo, "tspMain", "\nConnecting to server with reliable udp"); ++ ++ try_server: ++ ++ if (c.transport == NET_TOOLS_T_TCP) ++- Display( 0, ELInfo, "tspMain", "\nConnecting to server with tcp"); +++ Display( 1, ELInfo, "tspMain", "\nConnecting to server with tcp"); ++ ++ Display( 1, ELInfo, "tspMain", "Using TSP protocol version %s", ++ TspProtocolVersionStrings[version_index]); ++diff -Nur tspc2/template/linux.sh tspc2.owrt/template/linux.sh ++--- tspc2/template/linux.sh 2004-06-23 23:29:20.000000000 +0200 +++++ tspc2.owrt/template/linux.sh 2007-02-19 16:08:39.000000000 +0100 ++@@ -135,9 +135,7 @@ ++ # ++ # Default route ++ Display 1 "Adding default route" ++- ExecNoCheck $route -A inet6 del ::/0 2>/dev/null # delete old default route ++ ExecNoCheck $route -A inet6 del 2000::/3 2>/dev/null # delete old gw route ++- Exec $route -A inet6 add ::/0 dev $TSP_TUNNEL_INTERFACE ++ Exec $route -A inet6 add 2000::/3 dev $TSP_TUNNEL_INTERFACE ++ fi ++ ++@@ -147,9 +145,10 @@ ++ Display 1 "Kernel setup" ++ if [ X"${TSP_PREFIXLEN}" != X"64" ]; then ++ #Better way on linux to avoid loop with the remaining /48? ++- $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null +++ ExecNoCheck $route -A inet6 del $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null +++ Exec $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE ++ fi ++- Exec $sysctl -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled +++ Exec $sysctl -q -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled ++ Display 1 "Adding prefix to $TSP_HOME_INTERFACE" ++ OLDADDR=`$ifconfig $TSP_HOME_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"` ++ if [ ! -z $OLDADDR ]; then ++@@ -157,28 +156,28 @@ ++ Exec $ifconfig $TSP_HOME_INTERFACE inet6 del $OLDADDR ++ fi ++ Exec $ifconfig $TSP_HOME_INTERFACE add $TSP_PREFIX::1/64 ++- # Router advertisement configuration ++- Display 1 "Create new $rtadvdconfigfile" ++- echo "##### rtadvd.conf made by TSP ####" > "$rtadvdconfigfile" ++- echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile" ++- echo "{" >> "$rtadvdconfigfile" ++- echo " AdvSendAdvert on;" >> "$rtadvdconfigfile" ++- echo " prefix $TSP_PREFIX::/64" >> "$rtadvdconfigfile" ++- echo " {" >> "$rtadvdconfigfile" ++- echo " AdvOnLink on;" >> "$rtadvdconfigfile" ++- echo " AdvAutonomous on;" >> "$rtadvdconfigfile" ++- echo " };" >> "$rtadvdconfigfile" ++- echo "};" >> "$rtadvdconfigfile" ++- echo "" >> "$rtadvdconfigfile" ++- /etc/init.d/radvd stop ++- if [ -f $rtadvdconfigfile ]; then ++- KillProcess $rtadvdconfigfile ++- Exec $rtadvd -u radvd -C $rtadvdconfigfile ++- Display 1 "Starting radvd: $rtadvd -u radvd -C $rtadvdconfigfile" ++- else ++- echo "Error : file $rtadvdconfigfile not found" ++- exit 1 ++- fi +++# # Router advertisement configuration +++# Display 1 "Create new $rtadvdconfigfile" +++# echo "##### rtadvd.conf made by TSP ####" > "$rtadvdconfigfile" +++# echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile" +++# echo "{" >> "$rtadvdconfigfile" +++# echo " AdvSendAdvert on;" >> "$rtadvdconfigfile" +++# echo " prefix $TSP_PREFIX::/64" >> "$rtadvdconfigfile" +++# echo " {" >> "$rtadvdconfigfile" +++# echo " AdvOnLink on;" >> "$rtadvdconfigfile" +++# echo " AdvAutonomous on;" >> "$rtadvdconfigfile" +++# echo " };" >> "$rtadvdconfigfile" +++# echo "};" >> "$rtadvdconfigfile" +++# echo "" >> "$rtadvdconfigfile" +++# /etc/init.d/radvd stop +++# if [ -f $rtadvdconfigfile ]; then +++# KillProcess $rtadvdconfigfile +++# Exec $rtadvd -u radvd -C $rtadvdconfigfile +++# Display 1 "Starting radvd: $rtadvd -u radvd -C $rtadvdconfigfile" +++# else +++# echo "Error : file $rtadvdconfigfile not found" +++# exit 1 +++# fi ++ fi ++ ++ Display 1 "--- End of configuration script. ---" +diff --git a/feeds/packages/ipv6/tunslip6/.svn/entries b/feeds/packages/ipv6/tunslip6/.svn/entries +new file mode 100644 +index 0000000..cb16186 +--- /dev/null ++++ b/feeds/packages/ipv6/tunslip6/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/tunslip6 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T16:20:06.122623Z ++31165 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++65464ff0b176d42ed0c147b394fb4670 ++2012-04-02T16:20:06.122623Z ++31165 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1254 ++ +diff --git a/feeds/packages/ipv6/tunslip6/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/tunslip6/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c8f3411 +--- /dev/null ++++ b/feeds/packages/ipv6/tunslip6/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 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:=contiki ++PKG_VERSION:=2.5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/contiki/Contiki/Contiki%20$(PKG_VERSION)/ ++PKG_MD5SUM:=e2dbc5a42a899177d20d285c13bb3702 ++ ++#PKG_BUILD_DIR:=$(BUILD_DIR)/tools ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tunslip6 ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+kmod-slip ++ TITLE:=tunslip6 from Contiki OS ++ URL:=http://www.contiki-os.org/ ++endef ++ ++define Package/tun6slip/description ++ SLIP utility tool for connecting to Contiki 6LoWPAN devices. ++endef ++ ++define Build/Compile ++ # pass CFLAGS again to override -O2 set by configure ++ $(MAKE) -C $(PKG_BUILD_DIR)/tools \ ++ CROSS_COMPILE="$(KERNEL_CROSS)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ KERNELDIR=$(LINUX_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ tunslip6 ++endef ++ ++define Package/tunslip6/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/tools/tunslip6 $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,tunslip6)) +diff --git a/feeds/packages/ipv6/tunslip6/Makefile b/feeds/packages/ipv6/tunslip6/Makefile +new file mode 100644 +index 0000000..c8f3411 +--- /dev/null ++++ b/feeds/packages/ipv6/tunslip6/Makefile +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 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:=contiki ++PKG_VERSION:=2.5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/contiki/Contiki/Contiki%20$(PKG_VERSION)/ ++PKG_MD5SUM:=e2dbc5a42a899177d20d285c13bb3702 ++ ++#PKG_BUILD_DIR:=$(BUILD_DIR)/tools ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tunslip6 ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ DEPENDS:=+kmod-slip ++ TITLE:=tunslip6 from Contiki OS ++ URL:=http://www.contiki-os.org/ ++endef ++ ++define Package/tun6slip/description ++ SLIP utility tool for connecting to Contiki 6LoWPAN devices. ++endef ++ ++define Build/Compile ++ # pass CFLAGS again to override -O2 set by configure ++ $(MAKE) -C $(PKG_BUILD_DIR)/tools \ ++ CROSS_COMPILE="$(KERNEL_CROSS)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ KERNELDIR=$(LINUX_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ tunslip6 ++endef ++ ++define Package/tunslip6/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/tools/tunslip6 $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,tunslip6)) +diff --git a/feeds/packages/ipv6/wide-dhcpv6/.svn/entries b/feeds/packages/ipv6/wide-dhcpv6/.svn/entries +new file mode 100644 +index 0000000..c8062cd +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/wide-dhcpv6 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++9232c69f6c22ec27d64e4bf2db393b9f ++2012-05-29T00:30:58.676201Z ++31961 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4573 ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/.svn/text-base/Makefile.svn-base b/feeds/packages/ipv6/wide-dhcpv6/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d44d0a8 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,145 @@ ++# ++# 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:=wide-dhcpv6 ++PKG_VERSION:=20080615 ++PKG_RELEASE:=11 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=1011e165850fe40d3e332dad2bfd30b3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wide-dhcpv6/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=WIDE-DHCPv6 ++ SUBMENU:=wide-dhcpv6 ++ DEPENDS:=+kmod-ipv6 ++ URL:=https://sourceforge.net/projects/wide-dhcpv6/ ++ MAINTAINER:=Andrew Byrne ++endef ++ ++define Package/wide-dhcpv6-client ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= client ++endef ++ ++define Package/wide-dhcpv6-client/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the client component. ++endef ++ ++define Package/wide-dhcpv6-server ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= server ++endef ++ ++define Package/wide-dhcpv6-server/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the server component. ++endef ++ ++define Package/wide-dhcpv6-relay ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= relay ++endef ++ ++define Package/wide-dhcpv6-relay/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the relay component. ++endef ++ ++define Package/wide-dhcpv6-control ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= client and server control utility ++endef ++ ++define Package/wide-dhcpv6-control/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the client and server control utility. ++endef ++ ++TARGET_CFLAGS+=-D_GNU_SOURCE ++ ++define Build/Configure ++ $(call Build/Configure/Default,--with-localdbdir=/var) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ EXTRA_CFLAGS="-include debug.h" \ ++ all ++endef ++ ++define Package/wide-dhcpv6-client/conffiles ++/etc/config/dhcp6c ++endef ++ ++define Package/wide-dhcpv6-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6c $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/dhcp6c.config $(1)/etc/config/dhcp6c ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/dhcp6c.init $(1)/etc/init.d/dhcp6c ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DATA) ./files/dhcp6c.hotplug $(1)/etc/hotplug.d/iface/40-dhcp6c ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/dhcp6c ++ $(INSTALL_DATA) ./files/dhcp6c-dnsmasq.hotplug $(1)/etc/hotplug.d/dhcp6c/10-dnsmasq ++ $(INSTALL_DATA) ./files/dhcp6c-radvd.hotplug $(1)/etc/hotplug.d/dhcp6c/20-radvd ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) ./files/dhcp6c-state $(1)/usr/bin/dhcp6c-state ++endef ++ ++define Package/wide-dhcpv6-server/conffiles ++/etc/config/dhcp6s ++endef ++ ++define Package/wide-dhcpv6-server/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6s $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/dhcp6s.conf.sample $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/dhcp6s.config $(1)/etc/config/dhcp6s ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/dhcp6s.init $(1)/etc/init.d/dhcp6s ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DATA) ./files/dhcp6s.hotplug $(1)/etc/hotplug.d/iface/50-dhcp6s ++endef ++ ++define Package/wide-dhcpv6-relay/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6relay $(1)/usr/sbin ++endef ++ ++define Package/wide-dhcpv6-control/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6ctl $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,wide-dhcpv6-client)) ++$(eval $(call BuildPackage,wide-dhcpv6-server)) ++$(eval $(call BuildPackage,wide-dhcpv6-relay)) ++$(eval $(call BuildPackage,wide-dhcpv6-control)) +diff --git a/feeds/packages/ipv6/wide-dhcpv6/Makefile b/feeds/packages/ipv6/wide-dhcpv6/Makefile +new file mode 100644 +index 0000000..d44d0a8 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/Makefile +@@ -0,0 +1,145 @@ ++# ++# 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:=wide-dhcpv6 ++PKG_VERSION:=20080615 ++PKG_RELEASE:=11 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=1011e165850fe40d3e332dad2bfd30b3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wide-dhcpv6/Default ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE:=WIDE-DHCPv6 ++ SUBMENU:=wide-dhcpv6 ++ DEPENDS:=+kmod-ipv6 ++ URL:=https://sourceforge.net/projects/wide-dhcpv6/ ++ MAINTAINER:=Andrew Byrne ++endef ++ ++define Package/wide-dhcpv6-client ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= client ++endef ++ ++define Package/wide-dhcpv6-client/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the client component. ++endef ++ ++define Package/wide-dhcpv6-server ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= server ++endef ++ ++define Package/wide-dhcpv6-server/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the server component. ++endef ++ ++define Package/wide-dhcpv6-relay ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= relay ++endef ++ ++define Package/wide-dhcpv6-relay/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the relay component. ++endef ++ ++define Package/wide-dhcpv6-control ++ $(call Package/wide-dhcpv6/Default) ++ TITLE+= client and server control utility ++endef ++ ++define Package/wide-dhcpv6-control/description ++ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol ++ for IPv6 (DHCPv6) originally developed by the KAME project. The implementation ++ mainly conforms to the following standards: RFC3315,3319,3633,3646,4075,4272,etc. ++ ++ This package installs the client and server control utility. ++endef ++ ++TARGET_CFLAGS+=-D_GNU_SOURCE ++ ++define Build/Configure ++ $(call Build/Configure/Default,--with-localdbdir=/var) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ EXTRA_CFLAGS="-include debug.h" \ ++ all ++endef ++ ++define Package/wide-dhcpv6-client/conffiles ++/etc/config/dhcp6c ++endef ++ ++define Package/wide-dhcpv6-client/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6c $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/dhcp6c.config $(1)/etc/config/dhcp6c ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/dhcp6c.init $(1)/etc/init.d/dhcp6c ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DATA) ./files/dhcp6c.hotplug $(1)/etc/hotplug.d/iface/40-dhcp6c ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/dhcp6c ++ $(INSTALL_DATA) ./files/dhcp6c-dnsmasq.hotplug $(1)/etc/hotplug.d/dhcp6c/10-dnsmasq ++ $(INSTALL_DATA) ./files/dhcp6c-radvd.hotplug $(1)/etc/hotplug.d/dhcp6c/20-radvd ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) ./files/dhcp6c-state $(1)/usr/bin/dhcp6c-state ++endef ++ ++define Package/wide-dhcpv6-server/conffiles ++/etc/config/dhcp6s ++endef ++ ++define Package/wide-dhcpv6-server/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6s $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/dhcp6s.conf.sample $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/dhcp6s.config $(1)/etc/config/dhcp6s ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/dhcp6s.init $(1)/etc/init.d/dhcp6s ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DATA) ./files/dhcp6s.hotplug $(1)/etc/hotplug.d/iface/50-dhcp6s ++endef ++ ++define Package/wide-dhcpv6-relay/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6relay $(1)/usr/sbin ++endef ++ ++define Package/wide-dhcpv6-control/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6ctl $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,wide-dhcpv6-client)) ++$(eval $(call BuildPackage,wide-dhcpv6-server)) ++$(eval $(call BuildPackage,wide-dhcpv6-relay)) ++$(eval $(call BuildPackage,wide-dhcpv6-control)) +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/entries b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/entries +new file mode 100644 +index 0000000..32c5fab +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/entries +@@ -0,0 +1,334 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/wide-dhcpv6/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dhcp6c-state ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++be9b0ffaad4d13bc5d4ca3dc8eb34d54 ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++892 ++ ++dhcp6c-radvd.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++1068a3256e20f2c05bab8fb50c7d86d2 ++2010-03-14T18:16:29.695301Z ++20212 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++65 ++ ++dhcp6c.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++fc52b2e1b0f3d0d2df03c65f9ff9a2f9 ++2010-03-14T18:16:29.695301Z ++20212 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++417 ++ ++dhcp6s.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++1efa99b40182ae194b5e41ddcfb670ee ++2010-03-14T18:16:29.695301Z ++20212 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++417 ++ ++dhcp6c.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++ed0500fa83cd2dcbdae9d1ec175222bb ++2012-05-29T00:30:58.676201Z ++31961 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4230 ++ ++dhcp6s.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e490aaf9ae6374d7debe2fa0ee0c6780 ++2012-05-29T00:30:58.676201Z ++31961 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++801 ++ ++dhcp6c.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++ff6113b8124bc04424299cb530a669de ++2011-11-17T11:48:52.273914Z ++29222 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1642 ++ ++dhcp6s.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++a40705a1635d596728e5316a7c096731 ++2011-11-17T11:48:52.273914Z ++29222 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++270 ++ ++dhcp6c-dnsmasq.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++efacf01e2bc685597259165c3f57499b ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++847 ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-dnsmasq.hotplug.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-dnsmasq.hotplug.svn-base +new file mode 100644 +index 0000000..61850cf +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-dnsmasq.hotplug.svn-base +@@ -0,0 +1,53 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++getoption() { ++ local cfg=$1 ++ config_get resolvfile "$cfg" resolvfile ++} ++ ++config_load dhcp6c ++ ++local dns ++config_get dns basic dns none ++[ $dns != "dnsmasq" ] && return 0 ++ ++if [ "$ACTION" = "start" ]; then ++ ++ local domain_name_servers ++ config_get domain_name_servers state domain_name_servers ++ ++ if [ -n "$domain_name_servers" ]; then ++ ++ config_load dhcp ++ ++ local resolvfile ++ config_foreach getoption dnsmasq ++ ++ if [ -n "$resolvfile" ]; then ++ ++ cp -pf $resolvfile "$resolvfile.dhcp6c_backup" ++ ++ for nameserver in $domain_name_servers; do ++ echo nameserver $nameserver >> $resolvfile ++ done ++ ++ fi ++ ++ fi ++ ++fi ++ ++if [ "$ACTION" = "stop" ]; then ++ ++ config_load dhcp ++ ++ local resolvfile ++ config_foreach getoption dnsmasq ++ if [ -f "$resolvfile.dhcp6c_backup" ]; then ++ mv -f "$resolvfile.dhcp6c_backup" $resolvfile ++ fi ++ ++fi ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-radvd.hotplug.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-radvd.hotplug.svn-base +new file mode 100644 +index 0000000..5c08e8c +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-radvd.hotplug.svn-base +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++[ -f /etc/config/radvd ] && /etc/init.d/radvd restart +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-state.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-state.svn-base +new file mode 100644 +index 0000000..c777724 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c-state.svn-base +@@ -0,0 +1,18 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++uci_revert_state dhcp6c state ++uci_set_state dhcp6c state "" dhcp6c_state ++uci_set_state dhcp6c state domain_name_servers "$new_domain_name_servers" ++uci_set_state dhcp6c state domain_name "$new_domain_name" ++uci_set_state dhcp6c state ntp_servers "$new_ntp_servers" ++uci_set_state dhcp6c state sip_server_address "$new_sip_servers" ++uci_set_state dhcp6c state sip_server_domain_name "$new_sip_name" ++uci_set_state dhcp6c state nis_server_address "$new_nis_servers" ++uci_set_state dhcp6c state nis_domain_name "$new_nis_name" ++uci_set_state dhcp6c state nisp_server_address "$new_nisp_servers" ++uci_set_state dhcp6c state nisp_domain_name "$new_nisp_name" ++uci_set_state dhcp6c state bcmcs_server_address "$new_bcmcs_servers" ++uci_set_state dhcp6c state bcmcs_server_domain_name "$new_bcmcs_name" ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.config.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.config.svn-base +new file mode 100644 +index 0000000..04a3ca9 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.config.svn-base +@@ -0,0 +1,42 @@ ++config 'dhcp6c' 'basic' ++ option 'enabled' '0' # 1 = enabled; 0 = disabled ++ option 'interface' 'wan' # This is the interface the DHCPv6 client will run on ++ option 'dns' 'dnsmasq' # Which DNS server you run (only dnsmasq currently supported) ++ option 'debug' '0' # 1 = enable debugging; 0 = disable debugging ++ ++ # Send options (1 = send; 0 = do not send) ++ option 'pd' '1' # Prefix Delegation ++ option 'na' '0' # Non-Temporary Address ++ option 'rapid_commit' '1' # Rapid Commit ++ ++ # Request options (1 = request; 0 = do not request) ++ option 'domain_name_servers' '1' ++ option 'domain_name' '0' ++ option 'ntp_servers' '0' ++ option 'sip_server_address' '0' ++ option 'sip_server_domain_name' '0' ++ option 'nis_server_address' '0' ++ option 'nis_domain_name' '0' ++ option 'nisp_server_address' '0' ++ option 'nisp_domain_name' '0' ++ option 'bcmcs_server_address' '0' ++ option 'bcmcs_server_domain_name' '0' ++ ++ # Override the used DUID, by default it is derived from the interface MAC ++ # The given value must be uppercase and globally unique! ++ #option 'duid' '00:03:00:06:D8:5D:4C:A5:03:F2' ++ ++ # Script to run when a reply is received ++ option 'script' '/usr/bin/dhcp6c-state' ++ ++# Define one or more interfaces on which prefixes should be assigned ++config 'interface' 'loopback' ++ option 'enabled' '1' # 1 = enabled; 0 = disabled ++ option 'sla_id' '0' # Site level aggregator identifier specified in decimal (subnet) ++ option 'sla_len' '4' # Site level aggregator length (64 - size of prefix being delegated) ++ # e.g. /60 from ISP -> 64 - 60 = 4 ++ ++config 'interface' 'lan' ++ option 'enabled' '1' ++ option 'sla_id' '1' ++ option 'sla_len' '4' +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.hotplug.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.hotplug.svn-base +new file mode 100644 +index 0000000..947c53c +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.hotplug.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++include /lib/network ++ ++config_load "dhcp6c" ++ ++local enabled ++config_get_bool enabled basic enabled 0 ++[ $enabled -eq 0 ] && return 0 ++ ++local client_interface ++config_get client_interface basic interface ++ ++if [ "$INTERFACE" = "$client_interface" ] && [ "$ACTION" = "ifup" ]; then ++ /etc/init.d/dhcp6c start ++fi ++ ++if [ "$INTERFACE" = "$client_interface" ] && [ "$ACTION" = "ifdown" ]; then ++ /etc/init.d/dhcp6c stop ++fi +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.init.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.init.svn-base +new file mode 100644 +index 0000000..6e224d6 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6c.init.svn-base +@@ -0,0 +1,172 @@ ++#!/bin/sh /etc/rc.common ++ ++DHCP6C_REQUEST_OPTIONS='domain_name_servers domain_name ntp_servers sip_server_address sip_domain_name nis_server_address nis_domain_name nisp_server_address nisp_domain_name bcmcs_server_address bcmcs_domain_name' ++ ++dhcp6c_write_duid() { ++ local mac="${1:-$(ifconfig "$client_device" | sed -ne 's/[[:space:]]*$//; s/.*HWaddr //p')}" ++ local pat="[0-9A-F][0-9A-F]" ++ ++ case "$mac" in ++ # exactly 6 octets -> assume type 3 (DUID-LL - RFC3315, 9.4) ++ $pat:$pat:$pat:$pat:$pat:$pat) ++ local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS" ++ ++ # low endian ++ if [ "$(printf \\1 | hexdump -n1 -ve '8/2 "" "%04x" ""')" = "0001" ]; then ++ printf \\x0a\\x00 ++ ++ # big endian ++ else ++ printf \\x00\\x0a ++ fi ++ ++ printf \\x00\\x03\\x00\\x06\\x$1\\x$2\\x$3\\x$4\\x$5\\x$6 ++ logger -t dhcp6c "Using MAC address DUID 00:03:00:06:$1:$2:$3:$4:$5:$6" ++ ;; ++ # at least 7 octets -> could be type 1 or type 2 ++ $pat:$pat:$pat:$pat:$pat:$pat:*) ++ local len_id=":$(echo "$mac" | sed -e 's/[^:]//g')" ++ local len_hi=$(printf "%02x" $((${#len_id} / 0xFF)) ) ++ local len_lo=$(printf "%02x" $((${#len_id} % 0xFF)) ) ++ ++ # low endian ++ if [ "$(printf \\1 | hexdump -n1 -ve '8/2 "" "%04x" ""')" = "0001" ]; then ++ printf \\x$len_lo\\x$len_hi ++ ++ # big endian ++ else ++ printf \\x$len_hi\\x$len_lo ++ fi ++ ++ printf $(echo "$mac" | sed -e 's/^/\\x/; s/:/\\x/g') ++ logger -t dhcp6c "Using user provided DUID $mac" ++ ;; ++ *) ++ logger -t dhcp6c "Unable to derive DUID from interface '$client_device' and no valid user DUID given" ++ ;; ++ esac ++} ++ ++dhcp6c_write_interface() { ++ local cfg=$1 ++ local sla_id ++ local sla_len ++ local enabled ++ local device ++ ++ config_get_bool enabled "$cfg" enabled 0 ++ ++ if [ $enabled -ne 0 ]; then ++ config_get sla_id "$cfg" sla_id ++ config_get sla_len "$cfg" sla_len ++ ++ network_get_device device "$cfg" && { ++ printf '\tprefix-interface %s {\n' "$device" ++ printf '\t\tsla-id %s;\n' "$sla_id" ++ printf '\t\tsla-len %s;\n' "$sla_len" ++ printf '\t};\n' ++ } ++ fi ++} ++ ++dhcp6c_write_request() { ++ printf '\trequest %s;\n' $1 | sed -e s/_/-/g ++} ++ ++dhcp6c_write_config() { ++ local pd ++ local na ++ config_get_bool pd basic pd 0 ++ config_get_bool na basic na 0 ++ ++ printf 'interface %s {\n' "$client_ifname" ++ ++ if [ $pd -ne 0 ]; then ++ printf '\tsend ia-pd 0;\n' ++ fi ++ ++ if [ $na -ne 0 ]; then ++ printf '\tsend ia-na 0;\n' ++ fi ++ ++ local rapid_commit ++ config_get_bool rapid_commit basic rapid_commit 0 ++ [ $rapid_commit -ne 0 ] && printf '\tsend rapid-commit;\n' ++ ++ local script ++ config_get script basic script ++ [ "$script" != "" ] && printf '\tscript "%s";\n' "$script" ++ ++ local request ++ local value ++ for request in $DHCP6C_REQUEST_OPTIONS; do ++ config_get_bool value basic "$request" 0 ++ [ $value -ne 0 ] && dhcp6c_write_request "$request" ++ done ++ ++ printf '};\n\n' ++ ++ if [ $pd -ne 0 ]; then ++ printf 'id-assoc pd 0 {\n' ++ config_foreach dhcp6c_write_interface interface ++ printf '};\n\n' ++ fi ++ ++ if [ $na -ne 0 ]; then ++ printf 'id-assoc na 0 {\n' ++ printf '};\n\n' ++ fi ++ ++ return 0 ++} ++ ++start() { ++ [ ! -e /etc/dhcp6cctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6cctlkey` ++ ++ [ -e /var/run/dhcp6c.pid ] && return 0 ++ ++ . /lib/functions/network.sh ++ ++ config_load "dhcp6c" ++ ++ local enabled ++ config_get_bool enabled basic enabled 0 ++ [ $enabled -eq 0 ] && return 0 ++ ++ local user_duid ++ config_get user_duid basic duid ++ ++ logger -t dhcp6c starting dhcp6c ++ ++ local client_interface client_ifname client_device ++ config_get client_interface basic interface ++ network_get_device client_ifname "$client_interface" ++ network_get_physdev client_device "$client_interface" || client_device="$client_ifname" ++ ++ local config_file="/var/etc/dhcp6c.conf" ++ local duid_file="/var/dhcp6c_duid" ++ mkdir -m 755 -p /var/etc ++ dhcp6c_write_config > $config_file ++ dhcp6c_write_duid "$user_duid" > $duid_file ++ ++ local debug ++ local debug_option ++ config_get_bool debug basic debug 0 ++ [ $debug -eq 1 ] && debug_option="-D" ++ /usr/sbin/dhcp6c -c $config_file $debug_option $client_ifname ++ ++ sleep 3 ++ ACTION=start /sbin/hotplug-call dhcp6c ++ ++ return 0 ++} ++ ++stop() { ++ logger -t dhcp6c stopping dhcp6c ++ service_kill dhcp6c /var/run/dhcp6c.pid ++ rm -f /var/etc/dhcp6c.conf /var/run/dhcp6c.pid ++ ACTION=stop /sbin/hotplug-call dhcp6c ++ return 0 ++} ++ ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.config.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.config.svn-base +new file mode 100644 +index 0000000..dda53d1 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.config.svn-base +@@ -0,0 +1,4 @@ ++config 'dhcp6s' 'basic' ++ option 'enabled' '0' # 1 = enabled; 0 = disabled ++ option 'interface' 'lan' # This is the interface the DHCPv6 server will run on ++ option 'config_file' '/etc/dhcp6s.conf' # Config file (as this UCI config doesn't fully support all options) +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.hotplug.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.hotplug.svn-base +new file mode 100644 +index 0000000..7260149 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.hotplug.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++include /lib/network ++ ++config_load "dhcp6s" ++ ++local enabled ++config_get_bool enabled basic enabled 0 ++[ $enabled -eq 0 ] && return 0 ++ ++local server_interface ++config_get server_interface basic interface ++ ++if [ "$INTERFACE" = "$server_interface" ] && [ "$ACTION" = "ifup" ]; then ++ /etc/init.d/dhcp6s start ++fi ++ ++if [ "$INTERFACE" = "$server_interface" ] && [ "$ACTION" = "ifdown" ]; then ++ /etc/init.d/dhcp6s stop ++fi +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.init.svn-base b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.init.svn-base +new file mode 100644 +index 0000000..6141e72 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/.svn/text-base/dhcp6s.init.svn-base +@@ -0,0 +1,37 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2012 OpenWrt.org ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ ! -e /etc/dhcp6sctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6sctlkey` ++ ++ [ -e /var/run/dhcp6s.pid ] && return 0 ++ ++ . /lib/functions/network.sh ++ ++ config_load "dhcp6s" ++ ++ local enabled ++ config_get_bool enabled basic enabled 0 ++ [ $enabled -eq 0 ] && return 0 ++ ++ logger starting dhcp6s ++ ++ local server_interface server_ifname ++ config_get server_interface basic interface ++ network_get_device server_ifname "$server_interface" || return 1 ++ ++ local config_file ++ config_get config_file basic config_file ++ ++ [ ! -e $config_file ] && return 1 ++ ++ service_start /usr/sbin/dhcp6s -c $config_file $server_ifname ++} ++ ++stop() { ++ logger stopping dhcp6s ++ service_stop /usr/sbin/dhcp6s ++} ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug +new file mode 100644 +index 0000000..61850cf +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-dnsmasq.hotplug +@@ -0,0 +1,53 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++getoption() { ++ local cfg=$1 ++ config_get resolvfile "$cfg" resolvfile ++} ++ ++config_load dhcp6c ++ ++local dns ++config_get dns basic dns none ++[ $dns != "dnsmasq" ] && return 0 ++ ++if [ "$ACTION" = "start" ]; then ++ ++ local domain_name_servers ++ config_get domain_name_servers state domain_name_servers ++ ++ if [ -n "$domain_name_servers" ]; then ++ ++ config_load dhcp ++ ++ local resolvfile ++ config_foreach getoption dnsmasq ++ ++ if [ -n "$resolvfile" ]; then ++ ++ cp -pf $resolvfile "$resolvfile.dhcp6c_backup" ++ ++ for nameserver in $domain_name_servers; do ++ echo nameserver $nameserver >> $resolvfile ++ done ++ ++ fi ++ ++ fi ++ ++fi ++ ++if [ "$ACTION" = "stop" ]; then ++ ++ config_load dhcp ++ ++ local resolvfile ++ config_foreach getoption dnsmasq ++ if [ -f "$resolvfile.dhcp6c_backup" ]; then ++ mv -f "$resolvfile.dhcp6c_backup" $resolvfile ++ fi ++ ++fi ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-radvd.hotplug b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-radvd.hotplug +new file mode 100644 +index 0000000..5c08e8c +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-radvd.hotplug +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++[ -f /etc/config/radvd ] && /etc/init.d/radvd restart +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-state b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-state +new file mode 100644 +index 0000000..c777724 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c-state +@@ -0,0 +1,18 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++uci_revert_state dhcp6c state ++uci_set_state dhcp6c state "" dhcp6c_state ++uci_set_state dhcp6c state domain_name_servers "$new_domain_name_servers" ++uci_set_state dhcp6c state domain_name "$new_domain_name" ++uci_set_state dhcp6c state ntp_servers "$new_ntp_servers" ++uci_set_state dhcp6c state sip_server_address "$new_sip_servers" ++uci_set_state dhcp6c state sip_server_domain_name "$new_sip_name" ++uci_set_state dhcp6c state nis_server_address "$new_nis_servers" ++uci_set_state dhcp6c state nis_domain_name "$new_nis_name" ++uci_set_state dhcp6c state nisp_server_address "$new_nisp_servers" ++uci_set_state dhcp6c state nisp_domain_name "$new_nisp_name" ++uci_set_state dhcp6c state bcmcs_server_address "$new_bcmcs_servers" ++uci_set_state dhcp6c state bcmcs_server_domain_name "$new_bcmcs_name" ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.config b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.config +new file mode 100644 +index 0000000..04a3ca9 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.config +@@ -0,0 +1,42 @@ ++config 'dhcp6c' 'basic' ++ option 'enabled' '0' # 1 = enabled; 0 = disabled ++ option 'interface' 'wan' # This is the interface the DHCPv6 client will run on ++ option 'dns' 'dnsmasq' # Which DNS server you run (only dnsmasq currently supported) ++ option 'debug' '0' # 1 = enable debugging; 0 = disable debugging ++ ++ # Send options (1 = send; 0 = do not send) ++ option 'pd' '1' # Prefix Delegation ++ option 'na' '0' # Non-Temporary Address ++ option 'rapid_commit' '1' # Rapid Commit ++ ++ # Request options (1 = request; 0 = do not request) ++ option 'domain_name_servers' '1' ++ option 'domain_name' '0' ++ option 'ntp_servers' '0' ++ option 'sip_server_address' '0' ++ option 'sip_server_domain_name' '0' ++ option 'nis_server_address' '0' ++ option 'nis_domain_name' '0' ++ option 'nisp_server_address' '0' ++ option 'nisp_domain_name' '0' ++ option 'bcmcs_server_address' '0' ++ option 'bcmcs_server_domain_name' '0' ++ ++ # Override the used DUID, by default it is derived from the interface MAC ++ # The given value must be uppercase and globally unique! ++ #option 'duid' '00:03:00:06:D8:5D:4C:A5:03:F2' ++ ++ # Script to run when a reply is received ++ option 'script' '/usr/bin/dhcp6c-state' ++ ++# Define one or more interfaces on which prefixes should be assigned ++config 'interface' 'loopback' ++ option 'enabled' '1' # 1 = enabled; 0 = disabled ++ option 'sla_id' '0' # Site level aggregator identifier specified in decimal (subnet) ++ option 'sla_len' '4' # Site level aggregator length (64 - size of prefix being delegated) ++ # e.g. /60 from ISP -> 64 - 60 = 4 ++ ++config 'interface' 'lan' ++ option 'enabled' '1' ++ option 'sla_id' '1' ++ option 'sla_len' '4' +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.hotplug b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.hotplug +new file mode 100644 +index 0000000..947c53c +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.hotplug +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++include /lib/network ++ ++config_load "dhcp6c" ++ ++local enabled ++config_get_bool enabled basic enabled 0 ++[ $enabled -eq 0 ] && return 0 ++ ++local client_interface ++config_get client_interface basic interface ++ ++if [ "$INTERFACE" = "$client_interface" ] && [ "$ACTION" = "ifup" ]; then ++ /etc/init.d/dhcp6c start ++fi ++ ++if [ "$INTERFACE" = "$client_interface" ] && [ "$ACTION" = "ifdown" ]; then ++ /etc/init.d/dhcp6c stop ++fi +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.init b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.init +new file mode 100644 +index 0000000..6e224d6 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6c.init +@@ -0,0 +1,172 @@ ++#!/bin/sh /etc/rc.common ++ ++DHCP6C_REQUEST_OPTIONS='domain_name_servers domain_name ntp_servers sip_server_address sip_domain_name nis_server_address nis_domain_name nisp_server_address nisp_domain_name bcmcs_server_address bcmcs_domain_name' ++ ++dhcp6c_write_duid() { ++ local mac="${1:-$(ifconfig "$client_device" | sed -ne 's/[[:space:]]*$//; s/.*HWaddr //p')}" ++ local pat="[0-9A-F][0-9A-F]" ++ ++ case "$mac" in ++ # exactly 6 octets -> assume type 3 (DUID-LL - RFC3315, 9.4) ++ $pat:$pat:$pat:$pat:$pat:$pat) ++ local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS" ++ ++ # low endian ++ if [ "$(printf \\1 | hexdump -n1 -ve '8/2 "" "%04x" ""')" = "0001" ]; then ++ printf \\x0a\\x00 ++ ++ # big endian ++ else ++ printf \\x00\\x0a ++ fi ++ ++ printf \\x00\\x03\\x00\\x06\\x$1\\x$2\\x$3\\x$4\\x$5\\x$6 ++ logger -t dhcp6c "Using MAC address DUID 00:03:00:06:$1:$2:$3:$4:$5:$6" ++ ;; ++ # at least 7 octets -> could be type 1 or type 2 ++ $pat:$pat:$pat:$pat:$pat:$pat:*) ++ local len_id=":$(echo "$mac" | sed -e 's/[^:]//g')" ++ local len_hi=$(printf "%02x" $((${#len_id} / 0xFF)) ) ++ local len_lo=$(printf "%02x" $((${#len_id} % 0xFF)) ) ++ ++ # low endian ++ if [ "$(printf \\1 | hexdump -n1 -ve '8/2 "" "%04x" ""')" = "0001" ]; then ++ printf \\x$len_lo\\x$len_hi ++ ++ # big endian ++ else ++ printf \\x$len_hi\\x$len_lo ++ fi ++ ++ printf $(echo "$mac" | sed -e 's/^/\\x/; s/:/\\x/g') ++ logger -t dhcp6c "Using user provided DUID $mac" ++ ;; ++ *) ++ logger -t dhcp6c "Unable to derive DUID from interface '$client_device' and no valid user DUID given" ++ ;; ++ esac ++} ++ ++dhcp6c_write_interface() { ++ local cfg=$1 ++ local sla_id ++ local sla_len ++ local enabled ++ local device ++ ++ config_get_bool enabled "$cfg" enabled 0 ++ ++ if [ $enabled -ne 0 ]; then ++ config_get sla_id "$cfg" sla_id ++ config_get sla_len "$cfg" sla_len ++ ++ network_get_device device "$cfg" && { ++ printf '\tprefix-interface %s {\n' "$device" ++ printf '\t\tsla-id %s;\n' "$sla_id" ++ printf '\t\tsla-len %s;\n' "$sla_len" ++ printf '\t};\n' ++ } ++ fi ++} ++ ++dhcp6c_write_request() { ++ printf '\trequest %s;\n' $1 | sed -e s/_/-/g ++} ++ ++dhcp6c_write_config() { ++ local pd ++ local na ++ config_get_bool pd basic pd 0 ++ config_get_bool na basic na 0 ++ ++ printf 'interface %s {\n' "$client_ifname" ++ ++ if [ $pd -ne 0 ]; then ++ printf '\tsend ia-pd 0;\n' ++ fi ++ ++ if [ $na -ne 0 ]; then ++ printf '\tsend ia-na 0;\n' ++ fi ++ ++ local rapid_commit ++ config_get_bool rapid_commit basic rapid_commit 0 ++ [ $rapid_commit -ne 0 ] && printf '\tsend rapid-commit;\n' ++ ++ local script ++ config_get script basic script ++ [ "$script" != "" ] && printf '\tscript "%s";\n' "$script" ++ ++ local request ++ local value ++ for request in $DHCP6C_REQUEST_OPTIONS; do ++ config_get_bool value basic "$request" 0 ++ [ $value -ne 0 ] && dhcp6c_write_request "$request" ++ done ++ ++ printf '};\n\n' ++ ++ if [ $pd -ne 0 ]; then ++ printf 'id-assoc pd 0 {\n' ++ config_foreach dhcp6c_write_interface interface ++ printf '};\n\n' ++ fi ++ ++ if [ $na -ne 0 ]; then ++ printf 'id-assoc na 0 {\n' ++ printf '};\n\n' ++ fi ++ ++ return 0 ++} ++ ++start() { ++ [ ! -e /etc/dhcp6cctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6cctlkey` ++ ++ [ -e /var/run/dhcp6c.pid ] && return 0 ++ ++ . /lib/functions/network.sh ++ ++ config_load "dhcp6c" ++ ++ local enabled ++ config_get_bool enabled basic enabled 0 ++ [ $enabled -eq 0 ] && return 0 ++ ++ local user_duid ++ config_get user_duid basic duid ++ ++ logger -t dhcp6c starting dhcp6c ++ ++ local client_interface client_ifname client_device ++ config_get client_interface basic interface ++ network_get_device client_ifname "$client_interface" ++ network_get_physdev client_device "$client_interface" || client_device="$client_ifname" ++ ++ local config_file="/var/etc/dhcp6c.conf" ++ local duid_file="/var/dhcp6c_duid" ++ mkdir -m 755 -p /var/etc ++ dhcp6c_write_config > $config_file ++ dhcp6c_write_duid "$user_duid" > $duid_file ++ ++ local debug ++ local debug_option ++ config_get_bool debug basic debug 0 ++ [ $debug -eq 1 ] && debug_option="-D" ++ /usr/sbin/dhcp6c -c $config_file $debug_option $client_ifname ++ ++ sleep 3 ++ ACTION=start /sbin/hotplug-call dhcp6c ++ ++ return 0 ++} ++ ++stop() { ++ logger -t dhcp6c stopping dhcp6c ++ service_kill dhcp6c /var/run/dhcp6c.pid ++ rm -f /var/etc/dhcp6c.conf /var/run/dhcp6c.pid ++ ACTION=stop /sbin/hotplug-call dhcp6c ++ return 0 ++} ++ ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.config b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.config +new file mode 100644 +index 0000000..dda53d1 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.config +@@ -0,0 +1,4 @@ ++config 'dhcp6s' 'basic' ++ option 'enabled' '0' # 1 = enabled; 0 = disabled ++ option 'interface' 'lan' # This is the interface the DHCPv6 server will run on ++ option 'config_file' '/etc/dhcp6s.conf' # Config file (as this UCI config doesn't fully support all options) +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.hotplug b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.hotplug +new file mode 100644 +index 0000000..7260149 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.hotplug +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++include /lib/network ++ ++config_load "dhcp6s" ++ ++local enabled ++config_get_bool enabled basic enabled 0 ++[ $enabled -eq 0 ] && return 0 ++ ++local server_interface ++config_get server_interface basic interface ++ ++if [ "$INTERFACE" = "$server_interface" ] && [ "$ACTION" = "ifup" ]; then ++ /etc/init.d/dhcp6s start ++fi ++ ++if [ "$INTERFACE" = "$server_interface" ] && [ "$ACTION" = "ifdown" ]; then ++ /etc/init.d/dhcp6s stop ++fi +diff --git a/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.init b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.init +new file mode 100644 +index 0000000..6141e72 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/files/dhcp6s.init +@@ -0,0 +1,37 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2012 OpenWrt.org ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ ! -e /etc/dhcp6sctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6sctlkey` ++ ++ [ -e /var/run/dhcp6s.pid ] && return 0 ++ ++ . /lib/functions/network.sh ++ ++ config_load "dhcp6s" ++ ++ local enabled ++ config_get_bool enabled basic enabled 0 ++ [ $enabled -eq 0 ] && return 0 ++ ++ logger starting dhcp6s ++ ++ local server_interface server_ifname ++ config_get server_interface basic interface ++ network_get_device server_ifname "$server_interface" || return 1 ++ ++ local config_file ++ config_get config_file basic config_file ++ ++ [ ! -e $config_file ] && return 1 ++ ++ service_start /usr/sbin/dhcp6s -c $config_file $server_ifname ++} ++ ++stop() { ++ logger stopping dhcp6s ++ service_stop /usr/sbin/dhcp6s ++} ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/entries b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/entries +new file mode 100644 +index 0000000..a08d3d9 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/ipv6/wide-dhcpv6/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-11-02T21:19:58.481611Z ++23802 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-fix-dprintf-clash.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++a2ab3c7ca51a8cfb1cd7ad2ccbcdb2f4 ++2010-11-02T21:19:58.481611Z ++23802 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2240 ++ ++000-cftoken-noyywrap.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6074ca425cbc8bbdd72378c4aa8ffc36 ++2010-02-26T01:13:38.792228Z ++19862 ++spudz76 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++246 ++ ++001-linux_old_compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++44cc99bdf54b2df1e8637ef5bac881a6 ++2010-03-14T18:16:29.695301Z ++20212 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1396 ++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/000-cftoken-noyywrap.patch.svn-base b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/000-cftoken-noyywrap.patch.svn-base +new file mode 100644 +index 0000000..df1361e +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/000-cftoken-noyywrap.patch.svn-base +@@ -0,0 +1,9 @@ ++--- a/cftoken.l 2007-03-21 10:52:55.000000000 +0100 +++++ b/cftoken.l 2009-06-12 15:40:03.000000000 +0200 ++@@ -1,5 +1,6 @@ ++ /* $KAME: cftoken.l,v 1.35 2005/01/12 06:06:11 suz Exp $ */ ++ +++%option noyywrap ++ %{ ++ /* ++ * Copyright (C) 2002 WIDE Project. +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/001-linux_old_compat.patch.svn-base b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/001-linux_old_compat.patch.svn-base +new file mode 100644 +index 0000000..6dca9f3 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/001-linux_old_compat.patch.svn-base +@@ -0,0 +1,37 @@ ++--- wide-dhcpv6-20080615.orig/common.h 2007-03-21 20:52:57.000000000 +1100 +++++ wide-dhcpv6-20080615/common.h 2009-11-29 16:00:02.000000000 +1100 ++@@ -187,3 +187,34 @@ ++ #ifndef HAVE_STRLCPY ++ extern size_t strlcpy __P((char *, const char *, size_t)); ++ #endif +++ +++/* +++ * compat hacks in case libc and kernel get out of sync: +++ * +++ * glibc 2.4 and uClibc 0.9.29 introduce IPV6_RECVPKTINFO etc. and change IPV6_PKTINFO +++ * This is only supported in Linux kernel >= 2.6.14 +++ * +++ * This is only an approximation because the kernel version that libc was compiled against +++ * could be older or newer than the one being run. But this should not be a problem -- +++ * we just keep using the old kernel interface. +++ * +++ * these are placed here because they're needed in all of socket.c, recv.c and send.c +++ */ +++#ifdef __linux__ +++# if defined IPV6_RECVHOPLIMIT || defined IPV6_RECVPKTINFO +++# include +++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) +++# if defined IPV6_RECVHOPLIMIT && defined IPV6_2292HOPLIMIT +++# undef IPV6_RECVHOPLIMIT +++# define IPV6_RECVHOPLIMIT IPV6_2292HOPLIMIT +++# endif +++# if defined IPV6_RECVPKTINFO && defined IPV6_2292PKTINFO +++# undef IPV6_RECVPKTINFO +++# undef IPV6_PKTINFO +++# define IPV6_RECVPKTINFO IPV6_2292PKTINFO +++# define IPV6_PKTINFO IPV6_2292PKTINFO +++# endif +++# endif +++# endif +++#endif +++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/002-fix-dprintf-clash.patch.svn-base b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/002-fix-dprintf-clash.patch.svn-base +new file mode 100644 +index 0000000..a1efcae +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/.svn/text-base/002-fix-dprintf-clash.patch.svn-base +@@ -0,0 +1,56 @@ ++Index: wide-dhcpv6-20080615/common.c ++=================================================================== ++--- wide-dhcpv6-20080615.orig/common.c 2010-11-02 22:07:03.161000001 +0100 +++++ wide-dhcpv6-20080615/common.c 2010-11-02 22:07:19.532000002 +0100 ++@@ -3207,7 +3207,7 @@ ++ } ++ ++ void ++-dprintf(int level, const char *fname, const char *fmt, ...) +++my_dprintf(int level, const char *fname, const char *fmt, ...) ++ { ++ va_list ap; ++ char logbuf[LINE_MAX]; ++Index: wide-dhcpv6-20080615/Makefile.in ++=================================================================== ++--- wide-dhcpv6-20080615.orig/Makefile.in 2010-11-02 22:07:03.151000001 +0100 +++++ wide-dhcpv6-20080615/Makefile.in 2010-11-02 22:07:19.533000002 +0100 ++@@ -37,7 +37,7 @@ ++ group= @group@ ++ ++ CFLAGS= @CFLAGS@ @DEFS@ -DSYSCONFDIR=\"${sysconfdir}\" \ ++- -DLOCALDBDIR=\"${localdbdir}\" +++ -DLOCALDBDIR=\"${localdbdir}\" $(EXTRA_CFLAGS) ++ LDFLAGS=@LDFLAGS@ ++ LIBOBJS=@LIBOBJS@ ++ LIBS= @LIBS@ @LEXLIB@ ++Index: wide-dhcpv6-20080615/common.h ++=================================================================== ++--- wide-dhcpv6-20080615.orig/common.h 2010-11-02 22:07:23.187000002 +0100 +++++ wide-dhcpv6-20080615/common.h 2010-11-02 22:08:43.646001043 +0100 ++@@ -155,7 +155,6 @@ ++ extern int in6_addrscopebyif __P((struct in6_addr *, char *)); ++ extern int in6_scope __P((struct in6_addr *)); ++ extern void setloglevel __P((int)); ++-extern void dprintf __P((int, const char *, const char *, ...)); ++ extern int get_duid __P((char *, struct duid *)); ++ extern void dhcp6_init_options __P((struct dhcp6_optinfo *)); ++ extern void dhcp6_clear_options __P((struct dhcp6_optinfo *)); ++Index: wide-dhcpv6-20080615/debug.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ wide-dhcpv6-20080615/debug.h 2010-11-02 22:14:58.354999418 +0100 ++@@ -0,0 +1,13 @@ +++#ifndef MY_DEBUG_H_ +++#define MY_DEBUG_H_ +++ +++/* First include stdio.h, which may contain the prototype for the external dprintf. +++ * We do not want that. We redefine dprintf to our local implementation. */ +++#include +++#define dprintf my_dprintf +++#ifndef __P +++# define __P(x) x +++#endif +++extern void my_dprintf __P((int, const char *, const char *, ...)); +++ +++#endif /* MY_DEBUG_H_ */ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/000-cftoken-noyywrap.patch b/feeds/packages/ipv6/wide-dhcpv6/patches/000-cftoken-noyywrap.patch +new file mode 100644 +index 0000000..df1361e +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/000-cftoken-noyywrap.patch +@@ -0,0 +1,9 @@ ++--- a/cftoken.l 2007-03-21 10:52:55.000000000 +0100 +++++ b/cftoken.l 2009-06-12 15:40:03.000000000 +0200 ++@@ -1,5 +1,6 @@ ++ /* $KAME: cftoken.l,v 1.35 2005/01/12 06:06:11 suz Exp $ */ ++ +++%option noyywrap ++ %{ ++ /* ++ * Copyright (C) 2002 WIDE Project. +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/001-linux_old_compat.patch b/feeds/packages/ipv6/wide-dhcpv6/patches/001-linux_old_compat.patch +new file mode 100644 +index 0000000..6dca9f3 +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/001-linux_old_compat.patch +@@ -0,0 +1,37 @@ ++--- wide-dhcpv6-20080615.orig/common.h 2007-03-21 20:52:57.000000000 +1100 +++++ wide-dhcpv6-20080615/common.h 2009-11-29 16:00:02.000000000 +1100 ++@@ -187,3 +187,34 @@ ++ #ifndef HAVE_STRLCPY ++ extern size_t strlcpy __P((char *, const char *, size_t)); ++ #endif +++ +++/* +++ * compat hacks in case libc and kernel get out of sync: +++ * +++ * glibc 2.4 and uClibc 0.9.29 introduce IPV6_RECVPKTINFO etc. and change IPV6_PKTINFO +++ * This is only supported in Linux kernel >= 2.6.14 +++ * +++ * This is only an approximation because the kernel version that libc was compiled against +++ * could be older or newer than the one being run. But this should not be a problem -- +++ * we just keep using the old kernel interface. +++ * +++ * these are placed here because they're needed in all of socket.c, recv.c and send.c +++ */ +++#ifdef __linux__ +++# if defined IPV6_RECVHOPLIMIT || defined IPV6_RECVPKTINFO +++# include +++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) +++# if defined IPV6_RECVHOPLIMIT && defined IPV6_2292HOPLIMIT +++# undef IPV6_RECVHOPLIMIT +++# define IPV6_RECVHOPLIMIT IPV6_2292HOPLIMIT +++# endif +++# if defined IPV6_RECVPKTINFO && defined IPV6_2292PKTINFO +++# undef IPV6_RECVPKTINFO +++# undef IPV6_PKTINFO +++# define IPV6_RECVPKTINFO IPV6_2292PKTINFO +++# define IPV6_PKTINFO IPV6_2292PKTINFO +++# endif +++# endif +++# endif +++#endif +++ +diff --git a/feeds/packages/ipv6/wide-dhcpv6/patches/002-fix-dprintf-clash.patch b/feeds/packages/ipv6/wide-dhcpv6/patches/002-fix-dprintf-clash.patch +new file mode 100644 +index 0000000..a1efcae +--- /dev/null ++++ b/feeds/packages/ipv6/wide-dhcpv6/patches/002-fix-dprintf-clash.patch +@@ -0,0 +1,56 @@ ++Index: wide-dhcpv6-20080615/common.c ++=================================================================== ++--- wide-dhcpv6-20080615.orig/common.c 2010-11-02 22:07:03.161000001 +0100 +++++ wide-dhcpv6-20080615/common.c 2010-11-02 22:07:19.532000002 +0100 ++@@ -3207,7 +3207,7 @@ ++ } ++ ++ void ++-dprintf(int level, const char *fname, const char *fmt, ...) +++my_dprintf(int level, const char *fname, const char *fmt, ...) ++ { ++ va_list ap; ++ char logbuf[LINE_MAX]; ++Index: wide-dhcpv6-20080615/Makefile.in ++=================================================================== ++--- wide-dhcpv6-20080615.orig/Makefile.in 2010-11-02 22:07:03.151000001 +0100 +++++ wide-dhcpv6-20080615/Makefile.in 2010-11-02 22:07:19.533000002 +0100 ++@@ -37,7 +37,7 @@ ++ group= @group@ ++ ++ CFLAGS= @CFLAGS@ @DEFS@ -DSYSCONFDIR=\"${sysconfdir}\" \ ++- -DLOCALDBDIR=\"${localdbdir}\" +++ -DLOCALDBDIR=\"${localdbdir}\" $(EXTRA_CFLAGS) ++ LDFLAGS=@LDFLAGS@ ++ LIBOBJS=@LIBOBJS@ ++ LIBS= @LIBS@ @LEXLIB@ ++Index: wide-dhcpv6-20080615/common.h ++=================================================================== ++--- wide-dhcpv6-20080615.orig/common.h 2010-11-02 22:07:23.187000002 +0100 +++++ wide-dhcpv6-20080615/common.h 2010-11-02 22:08:43.646001043 +0100 ++@@ -155,7 +155,6 @@ ++ extern int in6_addrscopebyif __P((struct in6_addr *, char *)); ++ extern int in6_scope __P((struct in6_addr *)); ++ extern void setloglevel __P((int)); ++-extern void dprintf __P((int, const char *, const char *, ...)); ++ extern int get_duid __P((char *, struct duid *)); ++ extern void dhcp6_init_options __P((struct dhcp6_optinfo *)); ++ extern void dhcp6_clear_options __P((struct dhcp6_optinfo *)); ++Index: wide-dhcpv6-20080615/debug.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ wide-dhcpv6-20080615/debug.h 2010-11-02 22:14:58.354999418 +0100 ++@@ -0,0 +1,13 @@ +++#ifndef MY_DEBUG_H_ +++#define MY_DEBUG_H_ +++ +++/* First include stdio.h, which may contain the prototype for the external dprintf. +++ * We do not want that. We redefine dprintf to our local implementation. */ +++#include +++#define dprintf my_dprintf +++#ifndef __P +++# define __P(x) x +++#endif +++extern void my_dprintf __P((int, const char *, const char *, ...)); +++ +++#endif /* MY_DEBUG_H_ */ +diff --git a/feeds/packages/lang/.svn/entries b/feeds/packages/lang/.svn/entries +new file mode 100644 +index 0000000..39a0c34 +--- /dev/null ++++ b/feeds/packages/lang/.svn/entries +@@ -0,0 +1,301 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-11T14:16:51.752249Z ++35955 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ruby ++dir ++ ++python ++dir ++ ++logilab-astng ++dir ++ ++python-flup ++dir ++ ++jsonpath ++dir ++ ++python-json ++dir ++ ++pybluez ++dir ++ ++pyxdg ++dir ++ ++python-pydaemon ++dir ++ ++php5-pecl-apc ++dir ++ ++perl-html-parser ++dir ++ ++4th ++dir ++ ++php-pear-db ++dir ++ ++python-crypto ++dir ++ ++perl-uri ++dir ++ ++lsqlite3 ++dir ++ ++egenix-mx ++dir ++ ++php5-pecl-libevent ++dir ++ ++luasoap ++dir ++ ++php5-pecl-bcompiler ++dir ++ ++kid ++dir ++ ++sigscheme ++dir ++ ++erlang ++dir ++ ++gst-python ++dir ++ ++distribute ++dir ++ ++telepathy-python ++dir ++ ++perl-test-harness ++dir ++ ++tcl ++dir ++ ++twisted ++dir ++ ++vala ++dir ++ ++luaprofiler ++dir ++ ++pygobject ++dir ++ ++yapsnmp ++dir ++ ++mako ++dir ++ ++pyserial ++dir ++ ++ipython ++dir ++ ++perl-dbi ++dir ++ ++perl-html-tree ++dir ++ ++python-mimms ++dir ++ ++perl ++dir ++ ++pyusb ++dir ++ ++php5-pecl-http ++dir ++ ++python-sip ++dir ++ ++luasec ++dir ++ ++python-dbus ++dir ++ ++perl-lockfile-simple ++dir ++ ++perl-compress-bzip2 ++dir ++ ++arm ++dir ++ ++perl-www ++dir ++ ++psycopg ++dir ++ ++python-curl ++dir ++ ++luafilesystem ++dir ++ ++luasocket ++dir ++ ++python-cjson ++dir ++ ++python-imaging-library ++dir ++ ++logilab-common ++dir ++ ++pyrrd ++dir ++ ++luasql ++dir ++ ++urbi ++dir ++ ++python-eeml ++dir ++ ++python-ifconfig ++dir ++ ++cython ++dir ++ ++luaposix ++dir ++ ++python-webpy ++dir ++ ++numpy ++dir ++ ++pysqlite ++dir ++ ++pyyaml ++dir ++ ++php-pear-xmlrpc ++dir ++ ++perl-net-telnet ++dir ++ ++python-django ++dir ++ ++luaexpat ++dir ++ ++simplejson ++dir ++ ++pyclips ++dir ++ ++perl-www-mechanize ++dir ++ ++perl-www-curl ++dir ++ ++eggdrop ++dir ++ ++perl-html-tagset ++dir ++ ++pyevent ++dir ++ ++pyopenssl ++dir ++ ++pypcap ++dir ++ ++python-rsfile ++dir ++ ++sqlite3-ruby ++dir ++ ++php5-pecl-dio ++dir ++ ++jamvm ++dir ++ ++python2-chardet ++dir ++ ++xapian-bindings ++dir ++ ++php4 ++dir ++ ++php5 ++dir ++ ++php-pear ++dir ++ ++python-pyosc ++dir ++ ++pymysql ++dir ++ +diff --git a/feeds/packages/lang/4th/.svn/entries b/feeds/packages/lang/4th/.svn/entries +new file mode 100644 +index 0000000..b24de8b +--- /dev/null ++++ b/feeds/packages/lang/4th/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/4th ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-29T18:00:02.993413Z ++34932 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++22e01519a41d8755cd1b689823e884af ++2012-12-29T18:00:02.993413Z ++34932 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1083 ++ +diff --git a/feeds/packages/lang/4th/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/4th/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/4th/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/4th/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/4th/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f830495 +--- /dev/null ++++ b/feeds/packages/lang/4th/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# This is free software, licensed under the GNU General Public License v2. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=4th ++PKG_VERSION:=3.62.0 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nano.tar.gz ++PKG_SOURCE_URL:=http://4th.googlecode.com/files/ ++PKG_MD5SUM:=087e3a18a278046cc02abc968515646c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/4th ++ MAINTAINER:="Xiangfu Liu" ++ TITLE:=4th ++ SECTION:=lang ++ CATEGORY:=Languages ++ URL:=http://thebeez.home.xs4all.nl/4tH/ ++endef ++ ++define Package/4th/description ++ 4th forth compiler ++endef ++ ++MAKE_VARS += \ ++ LIBRARIES="${PKG_INSTALL_DIR}/usr/lib" \ ++ BINARIES="${PKG_INSTALL_DIR}/usr/bin" ++MAKE_FLAGS += \ ++ -C $(PKG_BUILD_DIR)/sources -f Makefile.NAN ++ ++define Package/4th/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sources/4th $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sources/4tsh $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sources/pp4th $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/sources/lib4th.a $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,4th)) +diff --git a/feeds/packages/lang/4th/Makefile b/feeds/packages/lang/4th/Makefile +new file mode 100644 +index 0000000..f830495 +--- /dev/null ++++ b/feeds/packages/lang/4th/Makefile +@@ -0,0 +1,43 @@ ++# ++# This is free software, licensed under the GNU General Public License v2. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=4th ++PKG_VERSION:=3.62.0 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nano.tar.gz ++PKG_SOURCE_URL:=http://4th.googlecode.com/files/ ++PKG_MD5SUM:=087e3a18a278046cc02abc968515646c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/4th ++ MAINTAINER:="Xiangfu Liu" ++ TITLE:=4th ++ SECTION:=lang ++ CATEGORY:=Languages ++ URL:=http://thebeez.home.xs4all.nl/4tH/ ++endef ++ ++define Package/4th/description ++ 4th forth compiler ++endef ++ ++MAKE_VARS += \ ++ LIBRARIES="${PKG_INSTALL_DIR}/usr/lib" \ ++ BINARIES="${PKG_INSTALL_DIR}/usr/bin" ++MAKE_FLAGS += \ ++ -C $(PKG_BUILD_DIR)/sources -f Makefile.NAN ++ ++define Package/4th/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sources/4th $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sources/4tsh $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sources/pp4th $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/sources/lib4th.a $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,4th)) +diff --git a/feeds/packages/lang/arm/.svn/entries b/feeds/packages/lang/arm/.svn/entries +new file mode 100644 +index 0000000..c0e9434 +--- /dev/null ++++ b/feeds/packages/lang/arm/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/arm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-15T01:04:06.991495Z ++32722 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++b4122db300b7da4a814047fcea7e9911 ++2012-07-15T01:04:06.991495Z ++32722 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1479 ++ +diff --git a/feeds/packages/lang/arm/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/arm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..939edd0 +--- /dev/null ++++ b/feeds/packages/lang/arm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=arm ++PKG_VERSION:=1.4.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://archive.torproject.org/arm ++PKG_MD5SUM:=f85f306e50b90796ab7097d948e8fcf2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/arm ++ SECTION:=lang ++ CATEGORY:=Languages ++ SUBMENU:=Python ++ TITLE:=Terminal status monitor for Tor relays ++ URL:=http://www.atagar.com/arm/ ++ DEPENDS:=+python +python-ncurses +python-readline ++endef ++ ++define Package/arm/description ++ Command line application for monitoring Tor, providing real time status ++ information such as the current configuration, bandwidth usage, message log, ++ connections, etc. This uses a curses interface much like 'top' does for system ++ usage. The application is intended for command-line aficionados, ssh ++ connections, and anyone with a tty terminal for checking their relay's status. ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix="/usr" --root="$(PKG_INSTALL_DIR)") ++endef ++ ++define Package/arm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/arm $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/arm $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,arm)) +diff --git a/feeds/packages/lang/arm/Makefile b/feeds/packages/lang/arm/Makefile +new file mode 100644 +index 0000000..939edd0 +--- /dev/null ++++ b/feeds/packages/lang/arm/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=arm ++PKG_VERSION:=1.4.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://archive.torproject.org/arm ++PKG_MD5SUM:=f85f306e50b90796ab7097d948e8fcf2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/arm ++ SECTION:=lang ++ CATEGORY:=Languages ++ SUBMENU:=Python ++ TITLE:=Terminal status monitor for Tor relays ++ URL:=http://www.atagar.com/arm/ ++ DEPENDS:=+python +python-ncurses +python-readline ++endef ++ ++define Package/arm/description ++ Command line application for monitoring Tor, providing real time status ++ information such as the current configuration, bandwidth usage, message log, ++ connections, etc. This uses a curses interface much like 'top' does for system ++ usage. The application is intended for command-line aficionados, ssh ++ connections, and anyone with a tty terminal for checking their relay's status. ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix="/usr" --root="$(PKG_INSTALL_DIR)") ++endef ++ ++define Package/arm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/arm $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/arm $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,arm)) +diff --git a/feeds/packages/lang/cython/.svn/entries b/feeds/packages/lang/cython/.svn/entries +new file mode 100644 +index 0000000..a31c31d +--- /dev/null ++++ b/feeds/packages/lang/cython/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/cython ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++8380754263dc9d43faa66958c4fe42f0 ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1263 ++ +diff --git a/feeds/packages/lang/cython/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/cython/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0e02fdf +--- /dev/null ++++ b/feeds/packages/lang/cython/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=cython ++PKG_VERSION:=0.10.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Cython-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.cython.org/ ++PKG_BUILD_DIR:=$(BUILD_DIR)/Cython-$(PKG_VERSION) ++PKG_MD5SUM:=684103ed37472d9beef3a38e0d5c431d ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/cython ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=cython ++ URL:=http://www.cython.org ++ DEPENDS:=+python-mini ++endef ++ ++define Package/cython/description ++ Cython is a language that should make writing C extensions for the Python language easier ++endef ++ ++define Build/Compile ++ # <--no-cython-compile> required, otherwise setup.py calls the target-gcc to create so-files which obviously can't be used by on the host system. ++ $(call Build/Compile/PyMod,,install --no-cython-compile --prefix="$(PKG_INSTALL_DIR)/usr") ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR) ++endef ++ ++$(eval $(call BuildPackage,cython)) +diff --git a/feeds/packages/lang/cython/Makefile b/feeds/packages/lang/cython/Makefile +new file mode 100644 +index 0000000..0e02fdf +--- /dev/null ++++ b/feeds/packages/lang/cython/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=cython ++PKG_VERSION:=0.10.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Cython-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.cython.org/ ++PKG_BUILD_DIR:=$(BUILD_DIR)/Cython-$(PKG_VERSION) ++PKG_MD5SUM:=684103ed37472d9beef3a38e0d5c431d ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/cython ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=cython ++ URL:=http://www.cython.org ++ DEPENDS:=+python-mini ++endef ++ ++define Package/cython/description ++ Cython is a language that should make writing C extensions for the Python language easier ++endef ++ ++define Build/Compile ++ # <--no-cython-compile> required, otherwise setup.py calls the target-gcc to create so-files which obviously can't be used by on the host system. ++ $(call Build/Compile/PyMod,,install --no-cython-compile --prefix="$(PKG_INSTALL_DIR)/usr") ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR) ++endef ++ ++$(eval $(call BuildPackage,cython)) +diff --git a/feeds/packages/lang/distribute/.svn/entries b/feeds/packages/lang/distribute/.svn/entries +new file mode 100644 +index 0000000..544f4eb +--- /dev/null ++++ b/feeds/packages/lang/distribute/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/distribute ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-11T23:07:30.769832Z ++28424 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a0fcb901a70810977375ce683b46a512 ++2011-10-11T23:07:30.769832Z ++28424 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1731 ++ +diff --git a/feeds/packages/lang/distribute/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/distribute/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c38d277 +--- /dev/null ++++ b/feeds/packages/lang/distribute/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=distribute ++PKG_VERSION:=0.6.21 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/$(PKG_NAME)/ ++PKG_MD5SUM:=f783444754861f9b33e9f4083bd97b60 ++PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/ ++ ++HOST_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++PYTHON:=$(HOST_PYTHON_BIN) ++ ++define Package/distribute ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Distribute ++ URL:=http://pypi.python.org/pypi/distribute ++ DEPENDS:=+python ++ PROVIDES:=setuptools ++endef ++ ++define Package/distribute/description ++ Distribute (fork of Setuptools) is a collection of extensions to Distutils ++endef ++ ++define Host/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++endef ++ ++define Host/Install ++ $(INSTALL_DIR) $(STAGING_DIR)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(STAGING_DIR)$(PYTHON_PKG_DIR)/ ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++endef ++ ++define Package/distribute/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR)/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/easy_install \ ++ $(1)/usr/bin/ ++ $(SED) '1s/#\!.*/#\!\/usr\/bin\/python/' $(1)/usr/bin/easy_install ++endef ++ ++$(eval $(call HostBuild)) ++$(eval $(call BuildPackage,distribute)) +diff --git a/feeds/packages/lang/distribute/Makefile b/feeds/packages/lang/distribute/Makefile +new file mode 100644 +index 0000000..c38d277 +--- /dev/null ++++ b/feeds/packages/lang/distribute/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=distribute ++PKG_VERSION:=0.6.21 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/$(PKG_NAME)/ ++PKG_MD5SUM:=f783444754861f9b33e9f4083bd97b60 ++PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/ ++ ++HOST_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++PYTHON:=$(HOST_PYTHON_BIN) ++ ++define Package/distribute ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Distribute ++ URL:=http://pypi.python.org/pypi/distribute ++ DEPENDS:=+python ++ PROVIDES:=setuptools ++endef ++ ++define Package/distribute/description ++ Distribute (fork of Setuptools) is a collection of extensions to Distutils ++endef ++ ++define Host/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++endef ++ ++define Host/Install ++ $(INSTALL_DIR) $(STAGING_DIR)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(STAGING_DIR)$(PYTHON_PKG_DIR)/ ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++endef ++ ++define Package/distribute/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR)/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/easy_install \ ++ $(1)/usr/bin/ ++ $(SED) '1s/#\!.*/#\!\/usr\/bin\/python/' $(1)/usr/bin/easy_install ++endef ++ ++$(eval $(call HostBuild)) ++$(eval $(call BuildPackage,distribute)) +diff --git a/feeds/packages/lang/egenix-mx/.svn/entries b/feeds/packages/lang/egenix-mx/.svn/entries +new file mode 100644 +index 0000000..7e9061d +--- /dev/null ++++ b/feeds/packages/lang/egenix-mx/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/egenix-mx ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++24d708da40e65ce1fed06cd6a9f13f86 ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2954 ++ +diff --git a/feeds/packages/lang/egenix-mx/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/egenix-mx/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/lang/egenix-mx/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/lang/egenix-mx/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/egenix-mx/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..301dc0b +--- /dev/null ++++ b/feeds/packages/lang/egenix-mx/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,94 @@ ++# ++# 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:=egenix-mx ++PKG_VERSION:=2.0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-base-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.egenix.com/python/ ++PKG_MD5SUM:=66841151728a06f92d0b8dd2ed317a29 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-base-$(PKG_VERSION) ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/python-egenix-mx ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ DEPENDS:=+python-mini ++ TITLE:=Egenix mxBase ++ URL:=http://www.egenix.com/products/python/mxBase/ ++endef ++ ++define Package/python-egenix-mx/description ++ This package contains a set of base packages from Egenix required by other ++ python packages. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ build --build-lib="foo", \ ++ BASECFLAGS="$(TARGET_CFLAGS)" \ ++ OPT="" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/btr.h \ ++ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/mxBeeBase.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/DateTime/mxDateTime/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/DateTime/mxDateTime/mxDateTime.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/Proxy/mxProxy/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/Proxy/mxProxy/mxProxy.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/Queue/mxQueue/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/Queue/mxQueue/mxQueue.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxbmse.h \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxte.h \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxTextTools.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/Tools/mxTools ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/Tools/mxTools/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/Tools/mxTools/mxTools.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Tools/mxTools/ ++endef ++ ++define PyPackage/python-egenix-mx/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) $(PKG_BUILD_DIR)/foo/mx $(1)$(PYTHON_PKG_DIR)/ ++ ln -sf $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/ExitFunctions.py \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Misc/ ++ rm -rf $(1)$(PYTHON_PKG_DIR)/mx/*/Examples ++endef ++ ++$(eval $(call PyPackage,python-egenix-mx)) ++$(eval $(call BuildPackage,python-egenix-mx)) +diff --git a/feeds/packages/lang/egenix-mx/Makefile b/feeds/packages/lang/egenix-mx/Makefile +new file mode 100644 +index 0000000..301dc0b +--- /dev/null ++++ b/feeds/packages/lang/egenix-mx/Makefile +@@ -0,0 +1,94 @@ ++# ++# 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:=egenix-mx ++PKG_VERSION:=2.0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-base-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.egenix.com/python/ ++PKG_MD5SUM:=66841151728a06f92d0b8dd2ed317a29 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-base-$(PKG_VERSION) ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/python-egenix-mx ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ DEPENDS:=+python-mini ++ TITLE:=Egenix mxBase ++ URL:=http://www.egenix.com/products/python/mxBase/ ++endef ++ ++define Package/python-egenix-mx/description ++ This package contains a set of base packages from Egenix required by other ++ python packages. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ build --build-lib="foo", \ ++ BASECFLAGS="$(TARGET_CFLAGS)" \ ++ OPT="" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/btr.h \ ++ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/mxBeeBase.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/DateTime/mxDateTime/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/DateTime/mxDateTime/mxDateTime.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/Proxy/mxProxy/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/Proxy/mxProxy/mxProxy.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/Queue/mxQueue/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/Queue/mxQueue/mxQueue.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxbmse.h \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxte.h \ ++ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxTextTools.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools/ ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/mx/Tools/mxTools ++ $(CP) \ ++ $(PKG_BUILD_DIR)/mx/Tools/mxTools/mxh.h \ ++ $(PKG_BUILD_DIR)/mx/Tools/mxTools/mxTools.h \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Tools/mxTools/ ++endef ++ ++define PyPackage/python-egenix-mx/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) $(PKG_BUILD_DIR)/foo/mx $(1)$(PYTHON_PKG_DIR)/ ++ ln -sf $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/ExitFunctions.py \ ++ $(1)$(PYTHON_PKG_DIR)/mx/Misc/ ++ rm -rf $(1)$(PYTHON_PKG_DIR)/mx/*/Examples ++endef ++ ++$(eval $(call PyPackage,python-egenix-mx)) ++$(eval $(call BuildPackage,python-egenix-mx)) +diff --git a/feeds/packages/lang/eggdrop/.svn/entries b/feeds/packages/lang/eggdrop/.svn/entries +new file mode 100644 +index 0000000..7b02463 +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/eggdrop ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:36.186615Z ++32282 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a54fa8b0f15783c5eff9c3b2e7605e77 ++2012-06-12T23:47:36.186615Z ++32282 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1241 ++ +diff --git a/feeds/packages/lang/eggdrop/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/eggdrop/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fc8349d +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=eggdrop ++PKG_VERSION:=1.6.17 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=eggdrop$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.eggheads.org/pub/eggdrop/source/1.6 ++PKG_MD5SUM:=68e181201483dee398f9904e8652e6ca ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION) ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/eggdrop ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=EggDrop IRC BOT ++ DEPENDS:=+tcl +zlib ++ URL:=http://www.eggheads.org ++endef ++ ++define Package/eggdrop/description ++ EggDrop IRC BOT ++endef ++ ++CONFIGURE_ARGS+=\ ++ --prefix="$(PKG_INSTALL_DIR)/eggdrop" \ ++ --enable-threads \ ++ --with-tcllib="$(STAGING_DIR)/usr/lib/libtcl8.5.so" \ ++ --with-tclinc="$(STAGING_DIR)/usr/include/tcl.h" ++ ++define Build/Compile ++ $(MAKE) config -C $(PKG_BUILD_DIR) ++ $(call Build/Compile/Default) ++endef ++ ++define Build/Install ++ $(call Build/Install/Default) ++ rm -Rvf $(PKG_INSTALL_DIR)/eggdrop/doc ++endef ++ ++define Package/eggdrop/install ++ $(INSTALL_DIR) $(1)/eggdrop ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/eggdrop ++endef ++ ++$(eval $(call BuildPackage,eggdrop)) +diff --git a/feeds/packages/lang/eggdrop/Makefile b/feeds/packages/lang/eggdrop/Makefile +new file mode 100644 +index 0000000..fc8349d +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=eggdrop ++PKG_VERSION:=1.6.17 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=eggdrop$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.eggheads.org/pub/eggdrop/source/1.6 ++PKG_MD5SUM:=68e181201483dee398f9904e8652e6ca ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION) ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/eggdrop ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=EggDrop IRC BOT ++ DEPENDS:=+tcl +zlib ++ URL:=http://www.eggheads.org ++endef ++ ++define Package/eggdrop/description ++ EggDrop IRC BOT ++endef ++ ++CONFIGURE_ARGS+=\ ++ --prefix="$(PKG_INSTALL_DIR)/eggdrop" \ ++ --enable-threads \ ++ --with-tcllib="$(STAGING_DIR)/usr/lib/libtcl8.5.so" \ ++ --with-tclinc="$(STAGING_DIR)/usr/include/tcl.h" ++ ++define Build/Compile ++ $(MAKE) config -C $(PKG_BUILD_DIR) ++ $(call Build/Compile/Default) ++endef ++ ++define Build/Install ++ $(call Build/Install/Default) ++ rm -Rvf $(PKG_INSTALL_DIR)/eggdrop/doc ++endef ++ ++define Package/eggdrop/install ++ $(INSTALL_DIR) $(1)/eggdrop ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/eggdrop ++endef ++ ++$(eval $(call BuildPackage,eggdrop)) +diff --git a/feeds/packages/lang/eggdrop/patches/.svn/entries b/feeds/packages/lang/eggdrop/patches/.svn/entries +new file mode 100644 +index 0000000..62862ba +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/eggdrop/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-10-28T23:08:11.891028Z ++13071 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-makefile_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++eda1af618a97a5667442e1d08febb61a ++2008-10-28T23:08:11.891028Z ++13071 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++444 ++ ++003-language_c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a781dbc9911526fc54f145801ea76ebc ++2008-10-28T23:08:11.891028Z ++13071 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++866 ++ ++004-main_c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++3f26890c7060219e61d5bc9e631b218d ++2008-10-28T23:08:11.891028Z ++13071 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++496 ++ ++002-eggdrop_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++06d5869c2ab99fcfd562c47bbbc0fc63 ++2008-10-28T23:08:11.891028Z ++13071 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++324 ++ +diff --git a/feeds/packages/lang/eggdrop/patches/.svn/text-base/001-makefile_in.patch.svn-base b/feeds/packages/lang/eggdrop/patches/.svn/text-base/001-makefile_in.patch.svn-base +new file mode 100644 +index 0000000..8c09c41 +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/.svn/text-base/001-makefile_in.patch.svn-base +@@ -0,0 +1,11 @@ ++--- eggdrop/Makefile.in 2004-07-25 07:17:33.000000000 -0400 +++++ eggdrop-patched/Makefile.in 2005-05-01 04:33:56.890000000 -0400 ++@@ -71,7 +71,7 @@ ++ ++ modconf = $(top_srcdir)/misc/modconfig --top_srcdir=$(top_srcdir) ++ ++-egg_test_run = EGG_LANGDIR=$(top_srcdir)/language ./$(EGGEXEC) -v +++egg_test_run = EGG_LANGDIR=$(top_srcdir)/language #./$(EGGEXEC) -v ++ ++ post_config = echo "" && \ ++ echo "You can now compile the bot, using \"make\"." && \ +diff --git a/feeds/packages/lang/eggdrop/patches/.svn/text-base/002-eggdrop_h.patch.svn-base b/feeds/packages/lang/eggdrop/patches/.svn/text-base/002-eggdrop_h.patch.svn-base +new file mode 100644 +index 0000000..311b63c +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/.svn/text-base/002-eggdrop_h.patch.svn-base +@@ -0,0 +1,12 @@ ++--- eggdrop/src/eggdrop.h 2008-09-08 21:09:57.000000000 +0100 +++++ eggdrop-patched/src/eggdrop.h 2008-09-08 21:11:46.000000000 +0100 ++@@ -218,9 +218,6 @@ ++ # define sigemptyset(x) ((*(int *)(x))=0) ++ #endif ++ ++-#ifndef HAVE_SOCKLEN_T ++-typedef int socklen_t; ++-#endif ++ ++ /* ++ * Handy aliases for memory tracking and core dumps +diff --git a/feeds/packages/lang/eggdrop/patches/.svn/text-base/003-language_c.patch.svn-base b/feeds/packages/lang/eggdrop/patches/.svn/text-base/003-language_c.patch.svn-base +new file mode 100644 +index 0000000..d67d4fc +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/.svn/text-base/003-language_c.patch.svn-base +@@ -0,0 +1,25 @@ ++--- eggdrop/src/language.c 2004-04-06 07:56:38.000000000 +0100 +++++ eggdrop-patched/src/language.c 2008-09-08 23:24:34.000000000 +0100 ++@@ -240,8 +240,19 @@ ++ #else ++ if (sscanf(lbuf, "0x%x,%500c", &lidx, ltext) != 2) { ++ #endif ++- putlog(LOG_MISC, "*", "Malformed text line in %s at %d.", ++- langfile, lline); +++ ltexts++; +++ ctmp = strchr(ltext, '\n'); +++ *ctmp = 0; +++ while (ltext[strlen(ltext) - 1] == '\\') { +++ ltext[strlen(ltext) - 1] = 0; +++ if (fgets(lbuf, 511, FLANG)) { +++ lline++; +++ ctmp = strchr(lbuf, '\n'); +++ *ctmp = 0; +++ ltext = nrealloc(ltext, strlen(lbuf) + strlen(ltext) + 1); +++ strcpy(strchr(ltext, 0), lbuf); +++ } +++ } ++ } else { ++ ltexts++; ++ ctmp = strchr(ltext, '\n'); ++ +diff --git a/feeds/packages/lang/eggdrop/patches/.svn/text-base/004-main_c.patch.svn-base b/feeds/packages/lang/eggdrop/patches/.svn/text-base/004-main_c.patch.svn-base +new file mode 100644 +index 0000000..ad263cd +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/.svn/text-base/004-main_c.patch.svn-base +@@ -0,0 +1,14 @@ ++--- eggdrop/src/main.c 2004-07-02 22:21:08.000000000 +0100 +++++ eggdrop/src/main-patched/main.c 2008-09-08 21:37:18.000000000 +0100 ++@@ -792,8 +792,8 @@ ++ printf("\n%s\n", version); ++ ++ /* Don't allow eggdrop to run as root */ ++- if (((int) getuid() == 0) || ((int) geteuid() == 0)) ++- fatal("ERROR: Eggdrop will not run as root!", 0); +++ if (((int) getuid() == 666) || ((int) geteuid() == 666)) +++ fatal("ERROR: Eggdrop will not run the devil!", 0); ++ ++ init_dcc_max(); ++ init_userent(); ++ +diff --git a/feeds/packages/lang/eggdrop/patches/001-makefile_in.patch b/feeds/packages/lang/eggdrop/patches/001-makefile_in.patch +new file mode 100644 +index 0000000..8c09c41 +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/001-makefile_in.patch +@@ -0,0 +1,11 @@ ++--- eggdrop/Makefile.in 2004-07-25 07:17:33.000000000 -0400 +++++ eggdrop-patched/Makefile.in 2005-05-01 04:33:56.890000000 -0400 ++@@ -71,7 +71,7 @@ ++ ++ modconf = $(top_srcdir)/misc/modconfig --top_srcdir=$(top_srcdir) ++ ++-egg_test_run = EGG_LANGDIR=$(top_srcdir)/language ./$(EGGEXEC) -v +++egg_test_run = EGG_LANGDIR=$(top_srcdir)/language #./$(EGGEXEC) -v ++ ++ post_config = echo "" && \ ++ echo "You can now compile the bot, using \"make\"." && \ +diff --git a/feeds/packages/lang/eggdrop/patches/002-eggdrop_h.patch b/feeds/packages/lang/eggdrop/patches/002-eggdrop_h.patch +new file mode 100644 +index 0000000..311b63c +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/002-eggdrop_h.patch +@@ -0,0 +1,12 @@ ++--- eggdrop/src/eggdrop.h 2008-09-08 21:09:57.000000000 +0100 +++++ eggdrop-patched/src/eggdrop.h 2008-09-08 21:11:46.000000000 +0100 ++@@ -218,9 +218,6 @@ ++ # define sigemptyset(x) ((*(int *)(x))=0) ++ #endif ++ ++-#ifndef HAVE_SOCKLEN_T ++-typedef int socklen_t; ++-#endif ++ ++ /* ++ * Handy aliases for memory tracking and core dumps +diff --git a/feeds/packages/lang/eggdrop/patches/003-language_c.patch b/feeds/packages/lang/eggdrop/patches/003-language_c.patch +new file mode 100644 +index 0000000..d67d4fc +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/003-language_c.patch +@@ -0,0 +1,25 @@ ++--- eggdrop/src/language.c 2004-04-06 07:56:38.000000000 +0100 +++++ eggdrop-patched/src/language.c 2008-09-08 23:24:34.000000000 +0100 ++@@ -240,8 +240,19 @@ ++ #else ++ if (sscanf(lbuf, "0x%x,%500c", &lidx, ltext) != 2) { ++ #endif ++- putlog(LOG_MISC, "*", "Malformed text line in %s at %d.", ++- langfile, lline); +++ ltexts++; +++ ctmp = strchr(ltext, '\n'); +++ *ctmp = 0; +++ while (ltext[strlen(ltext) - 1] == '\\') { +++ ltext[strlen(ltext) - 1] = 0; +++ if (fgets(lbuf, 511, FLANG)) { +++ lline++; +++ ctmp = strchr(lbuf, '\n'); +++ *ctmp = 0; +++ ltext = nrealloc(ltext, strlen(lbuf) + strlen(ltext) + 1); +++ strcpy(strchr(ltext, 0), lbuf); +++ } +++ } ++ } else { ++ ltexts++; ++ ctmp = strchr(ltext, '\n'); ++ +diff --git a/feeds/packages/lang/eggdrop/patches/004-main_c.patch b/feeds/packages/lang/eggdrop/patches/004-main_c.patch +new file mode 100644 +index 0000000..ad263cd +--- /dev/null ++++ b/feeds/packages/lang/eggdrop/patches/004-main_c.patch +@@ -0,0 +1,14 @@ ++--- eggdrop/src/main.c 2004-07-02 22:21:08.000000000 +0100 +++++ eggdrop/src/main-patched/main.c 2008-09-08 21:37:18.000000000 +0100 ++@@ -792,8 +792,8 @@ ++ printf("\n%s\n", version); ++ ++ /* Don't allow eggdrop to run as root */ ++- if (((int) getuid() == 0) || ((int) geteuid() == 0)) ++- fatal("ERROR: Eggdrop will not run as root!", 0); +++ if (((int) getuid() == 666) || ((int) geteuid() == 666)) +++ fatal("ERROR: Eggdrop will not run the devil!", 0); ++ ++ init_dcc_max(); ++ init_userent(); ++ +diff --git a/feeds/packages/lang/erlang/.svn/entries b/feeds/packages/lang/erlang/.svn/entries +new file mode 100644 +index 0000000..a9a474f +--- /dev/null ++++ b/feeds/packages/lang/erlang/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/erlang ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-17T15:42:33.689965Z ++32765 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++b1eecb92c2ff3be16e45c0332836ea86 ++2012-07-17T11:48:23.220837Z ++32763 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8469 ++ +diff --git a/feeds/packages/lang/erlang/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/erlang/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ddba81c +--- /dev/null ++++ b/feeds/packages/lang/erlang/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,327 @@ ++# ++# 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:=erlang ++PKG_VERSION:=R15B01 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:= http://www.erlang.org/download/ \ ++ http://erlang.mirror.su.se/ ++PKG_MD5SUM:=f12d00f6e62b36ad027d6c0c08905fad ++ ++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=5.9 erlang-kernel=2.15 erlang-sasl=2.2 erlang-stdlib=1.18 ++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:=1.6.19 ++ 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:=4.8 ++ 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:=2.1 ++ 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.9 ++ 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.8 ++ 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.6 ++ 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.7 ++ 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:=4.21.4 ++ 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:=2.0.9 ++ 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:=5.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.7.2 ++ 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 \ ++ --without-ssl ++ ++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 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/feeds/packages/lang/erlang/Makefile b/feeds/packages/lang/erlang/Makefile +new file mode 100644 +index 0000000..ddba81c +--- /dev/null ++++ b/feeds/packages/lang/erlang/Makefile +@@ -0,0 +1,327 @@ ++# ++# 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:=erlang ++PKG_VERSION:=R15B01 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:= http://www.erlang.org/download/ \ ++ http://erlang.mirror.su.se/ ++PKG_MD5SUM:=f12d00f6e62b36ad027d6c0c08905fad ++ ++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=5.9 erlang-kernel=2.15 erlang-sasl=2.2 erlang-stdlib=1.18 ++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:=1.6.19 ++ 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:=4.8 ++ 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:=2.1 ++ 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.9 ++ 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.8 ++ 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.6 ++ 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.7 ++ 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:=4.21.4 ++ 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:=2.0.9 ++ 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:=5.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.7.2 ++ 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 \ ++ --without-ssl ++ ++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 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/feeds/packages/lang/erlang/patches/.svn/entries b/feeds/packages/lang/erlang/patches/.svn/entries +new file mode 100644 +index 0000000..dce3da4 +--- /dev/null ++++ b/feeds/packages/lang/erlang/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/erlang/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-17T15:42:33.689965Z ++32765 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++103-disable_emacs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++38fb31be6bca01b02743b4aab8eb4aa5 ++2012-07-14T19:56:32.838635Z ++32710 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++323 ++ ++101-emulator_includes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6657b1c949ba21feac5c88dce34206ac ++2009-04-21T18:40:30.728915Z ++15327 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ +diff --git a/feeds/packages/lang/erlang/patches/.svn/text-base/101-emulator_includes.patch.svn-base b/feeds/packages/lang/erlang/patches/.svn/text-base/101-emulator_includes.patch.svn-base +new file mode 100644 +index 0000000..933c73e +--- /dev/null ++++ b/feeds/packages/lang/erlang/patches/.svn/text-base/101-emulator_includes.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/erts/emulator/Makefile.in +++++ b/erts/emulator/Makefile.in ++@@ -591,7 +591,7 @@ endif ++ ++ ++ $(OBJDIR)/%.o: beam/%.c ++- $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ +++ $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ ++ ++ else ++ +diff --git a/feeds/packages/lang/erlang/patches/.svn/text-base/103-disable_emacs.patch.svn-base b/feeds/packages/lang/erlang/patches/.svn/text-base/103-disable_emacs.patch.svn-base +new file mode 100644 +index 0000000..9412195 +--- /dev/null ++++ b/feeds/packages/lang/erlang/patches/.svn/text-base/103-disable_emacs.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/lang/erlang/patches/101-emulator_includes.patch b/feeds/packages/lang/erlang/patches/101-emulator_includes.patch +new file mode 100644 +index 0000000..933c73e +--- /dev/null ++++ b/feeds/packages/lang/erlang/patches/101-emulator_includes.patch +@@ -0,0 +1,11 @@ ++--- a/erts/emulator/Makefile.in +++++ b/erts/emulator/Makefile.in ++@@ -591,7 +591,7 @@ endif ++ ++ ++ $(OBJDIR)/%.o: beam/%.c ++- $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ +++ $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ ++ ++ else ++ +diff --git a/feeds/packages/lang/erlang/patches/103-disable_emacs.patch b/feeds/packages/lang/erlang/patches/103-disable_emacs.patch +new file mode 100644 +index 0000000..9412195 +--- /dev/null ++++ b/feeds/packages/lang/erlang/patches/103-disable_emacs.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/lang/gst-python/.svn/entries b/feeds/packages/lang/gst-python/.svn/entries +new file mode 100644 +index 0000000..4b3d30a +--- /dev/null ++++ b/feeds/packages/lang/gst-python/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/gst-python ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++12a1bd44a0c8e2618a294dfa83f56802 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1887 ++ +diff --git a/feeds/packages/lang/gst-python/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/gst-python/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/gst-python/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/gst-python/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/gst-python/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5ae2d4d +--- /dev/null ++++ b/feeds/packages/lang/gst-python/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,71 @@ ++# ++# Copyright (C) 2008-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:=gst-python ++PKG_VERSION:=0.10.13 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-python/ ++PKG_MD5SUM:=870440c6aad304112961ef5700d7698f ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++$(call include_mk, python-package.mk) ++ ++ ++TARGET_CFLAGS += $(FPIC) ++CONFIGURE_VARS += PYTHON=$(HOST_PYTHON) ++ ++define Package/gst-python ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=python bindings for gstreamer ++ URL:=http://gstreamer.freedesktop.org/ ++ DEPENDS:=+gstreamer +gst-plugins-base +python-gobject +python-mini ++endef ++ ++define Package/gst-python/description ++ python bindings for gstreamer ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++ ++ $(SED) \ ++ "s,^defsdir=.*,defsdir=$(STAGING_DIR)/usr/share/gst-python/0.10/defs/,g" \ ++ $(1)/usr/lib/pkgconfig/gst-python-0.10.pc ++ ++ $(INSTALL_DIR) $(1)/usr/share/gst-python/0.10/defs ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/gst-python/0.10/defs/* \ ++ $(1)/usr/share/gst-python/0.10/defs/ ++endef ++ ++define Package/gst-python/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gst-0.10/gst/extend ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/{gstoption.so,pygst.pth,pygst.py} \ ++ $(1)$(PYTHON_PKG_DIR)/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gst-0.10/gst/*.{so,py} \ ++ $(1)$(PYTHON_PKG_DIR)/gst-0.10/gst/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gst-0.10/gst/extend/*.py \ ++ $(1)$(PYTHON_PKG_DIR)/gst-0.10/gst/extend/ ++endef ++ ++$(eval $(call BuildPackage,gst-python)) +diff --git a/feeds/packages/lang/gst-python/Makefile b/feeds/packages/lang/gst-python/Makefile +new file mode 100644 +index 0000000..5ae2d4d +--- /dev/null ++++ b/feeds/packages/lang/gst-python/Makefile +@@ -0,0 +1,71 @@ ++# ++# Copyright (C) 2008-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:=gst-python ++PKG_VERSION:=0.10.13 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-python/ ++PKG_MD5SUM:=870440c6aad304112961ef5700d7698f ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++$(call include_mk, python-package.mk) ++ ++ ++TARGET_CFLAGS += $(FPIC) ++CONFIGURE_VARS += PYTHON=$(HOST_PYTHON) ++ ++define Package/gst-python ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=python bindings for gstreamer ++ URL:=http://gstreamer.freedesktop.org/ ++ DEPENDS:=+gstreamer +gst-plugins-base +python-gobject +python-mini ++endef ++ ++define Package/gst-python/description ++ python bindings for gstreamer ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++ ++ $(SED) \ ++ "s,^defsdir=.*,defsdir=$(STAGING_DIR)/usr/share/gst-python/0.10/defs/,g" \ ++ $(1)/usr/lib/pkgconfig/gst-python-0.10.pc ++ ++ $(INSTALL_DIR) $(1)/usr/share/gst-python/0.10/defs ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/gst-python/0.10/defs/* \ ++ $(1)/usr/share/gst-python/0.10/defs/ ++endef ++ ++define Package/gst-python/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gst-0.10/gst/extend ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/{gstoption.so,pygst.pth,pygst.py} \ ++ $(1)$(PYTHON_PKG_DIR)/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gst-0.10/gst/*.{so,py} \ ++ $(1)$(PYTHON_PKG_DIR)/gst-0.10/gst/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gst-0.10/gst/extend/*.py \ ++ $(1)$(PYTHON_PKG_DIR)/gst-0.10/gst/extend/ ++endef ++ ++$(eval $(call BuildPackage,gst-python)) +diff --git a/feeds/packages/lang/ipython/.svn/entries b/feeds/packages/lang/ipython/.svn/entries +new file mode 100644 +index 0000000..d9a2a25 +--- /dev/null ++++ b/feeds/packages/lang/ipython/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/ipython ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++648951bb2ddab81ca9e0891726168935 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1275 ++ +diff --git a/feeds/packages/lang/ipython/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/ipython/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a240e13 +--- /dev/null ++++ b/feeds/packages/lang/ipython/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=ipython ++PKG_VERSION:=0.8.2 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ipython.scipy.org/dist/ ++PKG_FIXUP:=autoreconf ++PKG_MD5SUM:=fd5a1b6e518898a4aee8b8d8b428af70 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ipython ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=ipython ++ URL:=http://ipython.scipy.org/ ++endef ++ ++define Package/ipython/description ++ An enhanced interactive Python shell from the SciPy project ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ if [ -x $(CONFIGURE_CMD) ]; then \ ++ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ ++ $(CONFIGURE_VARS) \ ++ PYTHON=/usr/bin/python \ ++ $(CONFIGURE_CMD) \ ++ $(CONFIGURE_ARGS) ;\ ++ fi \ ++ ) ++endef ++ ++define Build/Compile ++ cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) ./setup.py install --prefix="$(PKG_INSTALL_DIR)/usr" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++define Package/ipython/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,ipython)) +diff --git a/feeds/packages/lang/ipython/Makefile b/feeds/packages/lang/ipython/Makefile +new file mode 100644 +index 0000000..a240e13 +--- /dev/null ++++ b/feeds/packages/lang/ipython/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=ipython ++PKG_VERSION:=0.8.2 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ipython.scipy.org/dist/ ++PKG_FIXUP:=autoreconf ++PKG_MD5SUM:=fd5a1b6e518898a4aee8b8d8b428af70 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ipython ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=ipython ++ URL:=http://ipython.scipy.org/ ++endef ++ ++define Package/ipython/description ++ An enhanced interactive Python shell from the SciPy project ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ if [ -x $(CONFIGURE_CMD) ]; then \ ++ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ ++ $(CONFIGURE_VARS) \ ++ PYTHON=/usr/bin/python \ ++ $(CONFIGURE_CMD) \ ++ $(CONFIGURE_ARGS) ;\ ++ fi \ ++ ) ++endef ++ ++define Build/Compile ++ cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) ./setup.py install --prefix="$(PKG_INSTALL_DIR)/usr" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++define Package/ipython/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,ipython)) +diff --git a/feeds/packages/lang/jamvm/.svn/entries b/feeds/packages/lang/jamvm/.svn/entries +new file mode 100644 +index 0000000..b2203a3 +--- /dev/null ++++ b/feeds/packages/lang/jamvm/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/jamvm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-09T21:47:49.768429Z ++35073 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++340080500de693ce6cafc6bc66cbf0dd ++2013-01-09T21:47:49.768429Z ++35073 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1761 ++ +diff --git a/feeds/packages/lang/jamvm/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/jamvm/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/lang/jamvm/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/jamvm/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/jamvm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..858a47c +--- /dev/null ++++ b/feeds/packages/lang/jamvm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# 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:=jamvm ++PKG_VERSION:=1.6.0-git ++PKG_RELEASE:=2 ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://git.berlios.de/jamvm ++PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++PKG_MIRROR_MD5SUM:=66a728a3cb8dad0e3773035c4049eb5f ++ ++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/feeds/packages/lang/jamvm/Makefile b/feeds/packages/lang/jamvm/Makefile +new file mode 100644 +index 0000000..858a47c +--- /dev/null ++++ b/feeds/packages/lang/jamvm/Makefile +@@ -0,0 +1,67 @@ ++# ++# 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:=jamvm ++PKG_VERSION:=1.6.0-git ++PKG_RELEASE:=2 ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://git.berlios.de/jamvm ++PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++PKG_MIRROR_MD5SUM:=66a728a3cb8dad0e3773035c4049eb5f ++ ++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/feeds/packages/lang/jsonpath/.svn/entries b/feeds/packages/lang/jsonpath/.svn/entries +new file mode 100644 +index 0000000..f063693 +--- /dev/null ++++ b/feeds/packages/lang/jsonpath/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/jsonpath ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-03T19:19:53.789133Z ++27415 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6be9ef484f0ae382582962d32b8cb937 ++2011-07-03T19:19:53.789133Z ++27415 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1055 ++ +diff --git a/feeds/packages/lang/jsonpath/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/jsonpath/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..25cb124 +--- /dev/null ++++ b/feeds/packages/lang/jsonpath/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=jsonpath ++PKG_VERSION:=0.52.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.ultimate.com/phil/python/download/ ++PKG_MD5SUM:=4cd0c3a70acbc67d2915d64f132cdb4f ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/jsonpath ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=JsonPath - XPath implementation ++ URL:=http://goessner.net/articles/JsonPath/ ++ DEPENDS:=+python ++endef ++ ++define Package/jsonpath/description ++ An XPath implementation for JSON ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") ++endef ++ ++define Package/jsonpath/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR) ++endef ++ ++$(eval $(call BuildPackage,jsonpath)) +diff --git a/feeds/packages/lang/jsonpath/Makefile b/feeds/packages/lang/jsonpath/Makefile +new file mode 100644 +index 0000000..25cb124 +--- /dev/null ++++ b/feeds/packages/lang/jsonpath/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=jsonpath ++PKG_VERSION:=0.52.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.ultimate.com/phil/python/download/ ++PKG_MD5SUM:=4cd0c3a70acbc67d2915d64f132cdb4f ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/jsonpath ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=JsonPath - XPath implementation ++ URL:=http://goessner.net/articles/JsonPath/ ++ DEPENDS:=+python ++endef ++ ++define Package/jsonpath/description ++ An XPath implementation for JSON ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") ++endef ++ ++define Package/jsonpath/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR) ++endef ++ ++$(eval $(call BuildPackage,jsonpath)) +diff --git a/feeds/packages/lang/kid/.svn/entries b/feeds/packages/lang/kid/.svn/entries +new file mode 100644 +index 0000000..d1f5da9 +--- /dev/null ++++ b/feeds/packages/lang/kid/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/kid ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++a7e0379cae139e012d0f742fc0758129 ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1154 ++ +diff --git a/feeds/packages/lang/kid/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/kid/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/lang/kid/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/lang/kid/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/kid/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..252c6f1 +--- /dev/null ++++ b/feeds/packages/lang/kid/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=kid ++PKG_VERSION:=0.9.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.kid-templating.org/dist/0.9.6/dist ++PKG_MD5SUM:=31e7156698a6f214b4067afb9e13728f ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/python-kid ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ DEPENDS:=+python ++ TITLE:=XML-based Templating ++ URL:=http://www.kid-templating.org/ ++endef ++ ++define Package/python-kid/description ++ Kid is a simple template language for XML based vocabularies written in ++ Python. ++endef ++ ++define PyPackage/python-kid/filespec +++|$(PYTHON_PKG_DIR)/kid ++-|$(PYTHON_PKG_DIR)/kid/test ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++$(eval $(call PyPackage,python-kid)) ++$(eval $(call BuildPackage,python-kid)) +diff --git a/feeds/packages/lang/kid/Makefile b/feeds/packages/lang/kid/Makefile +new file mode 100644 +index 0000000..252c6f1 +--- /dev/null ++++ b/feeds/packages/lang/kid/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=kid ++PKG_VERSION:=0.9.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.kid-templating.org/dist/0.9.6/dist ++PKG_MD5SUM:=31e7156698a6f214b4067afb9e13728f ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/python-kid ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ DEPENDS:=+python ++ TITLE:=XML-based Templating ++ URL:=http://www.kid-templating.org/ ++endef ++ ++define Package/python-kid/description ++ Kid is a simple template language for XML based vocabularies written in ++ Python. ++endef ++ ++define PyPackage/python-kid/filespec +++|$(PYTHON_PKG_DIR)/kid ++-|$(PYTHON_PKG_DIR)/kid/test ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++$(eval $(call PyPackage,python-kid)) ++$(eval $(call BuildPackage,python-kid)) +diff --git a/feeds/packages/lang/kid/patches/.svn/entries b/feeds/packages/lang/kid/patches/.svn/entries +new file mode 100644 +index 0000000..7cfea54 +--- /dev/null ++++ b/feeds/packages/lang/kid/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/kid/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-08-28T09:59:41.598764Z ++8515 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-setup.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++e7fdab080176687197b5590263e5d99d ++2007-08-28T09:59:41.598764Z ++8515 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++496 ++ +diff --git a/feeds/packages/lang/kid/patches/.svn/text-base/000-setup.patch.svn-base b/feeds/packages/lang/kid/patches/.svn/text-base/000-setup.patch.svn-base +new file mode 100644 +index 0000000..aeb059e +--- /dev/null ++++ b/feeds/packages/lang/kid/patches/.svn/text-base/000-setup.patch.svn-base +@@ -0,0 +1,20 @@ ++diff -urN kid-0.9.6_orig/setup.py kid-0.9.6/setup.py ++--- kid-0.9.6/setup.py 2007-07-16 13:02:49.000000000 +0200 +++++ kid-0.9.6/setup.py 2007-08-15 14:39:37.000000000 +0200 ++@@ -1,15 +1,12 @@ ++ #!/usr/bin/env python ++ ++ # bootstrap setuptools if necessary ++-from ez_setup import use_setuptools ++-use_setuptools() +++from distutils.core import setup ++ ++ import os ++ ++ execfile(os.path.join("kid", "release.py")) ++ ++-from setuptools import setup, find_packages ++- ++ setup( ++ name="kid", ++ version=version, +diff --git a/feeds/packages/lang/kid/patches/000-setup.patch b/feeds/packages/lang/kid/patches/000-setup.patch +new file mode 100644 +index 0000000..aeb059e +--- /dev/null ++++ b/feeds/packages/lang/kid/patches/000-setup.patch +@@ -0,0 +1,20 @@ ++diff -urN kid-0.9.6_orig/setup.py kid-0.9.6/setup.py ++--- kid-0.9.6/setup.py 2007-07-16 13:02:49.000000000 +0200 +++++ kid-0.9.6/setup.py 2007-08-15 14:39:37.000000000 +0200 ++@@ -1,15 +1,12 @@ ++ #!/usr/bin/env python ++ ++ # bootstrap setuptools if necessary ++-from ez_setup import use_setuptools ++-use_setuptools() +++from distutils.core import setup ++ ++ import os ++ ++ execfile(os.path.join("kid", "release.py")) ++ ++-from setuptools import setup, find_packages ++- ++ setup( ++ name="kid", ++ version=version, +diff --git a/feeds/packages/lang/logilab-astng/.svn/entries b/feeds/packages/lang/logilab-astng/.svn/entries +new file mode 100644 +index 0000000..388125b +--- /dev/null ++++ b/feeds/packages/lang/logilab-astng/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/logilab-astng ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++13907bfbc38b8e249a7df806eb0f00cc ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1142 ++ +diff --git a/feeds/packages/lang/logilab-astng/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/logilab-astng/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c25a36c +--- /dev/null ++++ b/feeds/packages/lang/logilab-astng/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=logilab-astng ++PKG_VERSION:=0.17.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.logilab.fr/pub/astng/ ++PKG_MD5SUM:=a654d65a4644fb984d840906cf8b27d5 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/logilab-astng ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=logilab-astng ++ URL:=http://www.logilab.fr ++ DEPENDS:=+python-mini ++endef ++ ++define Package/logilab-astng/description ++ The aim of this module is to provide a common base representation of python source code for projects such as pychecker, pyreverse, pylint... ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++define Package/logilab-astng/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,logilab-astng)) +diff --git a/feeds/packages/lang/logilab-astng/Makefile b/feeds/packages/lang/logilab-astng/Makefile +new file mode 100644 +index 0000000..c25a36c +--- /dev/null ++++ b/feeds/packages/lang/logilab-astng/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=logilab-astng ++PKG_VERSION:=0.17.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.logilab.fr/pub/astng/ ++PKG_MD5SUM:=a654d65a4644fb984d840906cf8b27d5 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/logilab-astng ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=logilab-astng ++ URL:=http://www.logilab.fr ++ DEPENDS:=+python-mini ++endef ++ ++define Package/logilab-astng/description ++ The aim of this module is to provide a common base representation of python source code for projects such as pychecker, pyreverse, pylint... ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++define Package/logilab-astng/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,logilab-astng)) +diff --git a/feeds/packages/lang/logilab-common/.svn/entries b/feeds/packages/lang/logilab-common/.svn/entries +new file mode 100644 +index 0000000..061572f +--- /dev/null ++++ b/feeds/packages/lang/logilab-common/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/logilab-common ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++4c2b3785973cb44a94c4f8e7ffc56188 ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1104 ++ +diff --git a/feeds/packages/lang/logilab-common/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/logilab-common/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..94b2671 +--- /dev/null ++++ b/feeds/packages/lang/logilab-common/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=logilab-common ++PKG_VERSION:=0.29.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.logilab.fr/pub/common/ ++PKG_MD5SUM:=90f679e0d4ed19e2bf083fb932cde922 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/logilab-common ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=logilab-common ++ URL:=http://www.logilab.fr ++ DEPENDS:=+python-mini ++endef ++ ++define Package/logilab-common/description ++ a bunch of modules providing low level functionnalities shared among some python projects devel ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++define Package/logilab-common/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,logilab-common)) +diff --git a/feeds/packages/lang/logilab-common/Makefile b/feeds/packages/lang/logilab-common/Makefile +new file mode 100644 +index 0000000..94b2671 +--- /dev/null ++++ b/feeds/packages/lang/logilab-common/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=logilab-common ++PKG_VERSION:=0.29.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.logilab.fr/pub/common/ ++PKG_MD5SUM:=90f679e0d4ed19e2bf083fb932cde922 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/logilab-common ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=logilab-common ++ URL:=http://www.logilab.fr ++ DEPENDS:=+python-mini ++endef ++ ++define Package/logilab-common/description ++ a bunch of modules providing low level functionnalities shared among some python projects devel ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++define Package/logilab-common/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,logilab-common)) +diff --git a/feeds/packages/lang/lsqlite3/.svn/entries b/feeds/packages/lang/lsqlite3/.svn/entries +new file mode 100644 +index 0000000..a5a0233 +--- /dev/null ++++ b/feeds/packages/lang/lsqlite3/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/lsqlite3 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-06-23T14:23:31.888829Z ++27263 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++ea5e10796246bc3aea02f5b021c6b0e0 ++2011-06-23T14:23:31.888829Z ++27263 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1170 ++ +diff --git a/feeds/packages/lang/lsqlite3/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/lsqlite3/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b5e15d3 +--- /dev/null ++++ b/feeds/packages/lang/lsqlite3/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=lsqlite3 ++PKG_VERSION:=7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4472 ++PKG_MD5SUM:=ef7afdd3ea7a29333daa951cda3175bb ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lsqlite3 ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaSQLite3 ++ URL:=http://luasqlite.luaforge.net/lsqlite3.html ++ DEPENDS:=+lua +libsqlite3 ++endef ++ ++define Package/lsqlite3/description ++ LuaSQLite 3 is a thin wrapper around the public domain SQLite3 database engine. ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) -std=c99 ++ ++TARGET_LDFLAGS += -llua -lsqlite3 ++ ++MAKE_FLAGS += \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ INCS="$(TARGET_CPPFLAGS)" \ ++ LIBS="$(TARGET_LDFLAGS)" \ ++ SHFLAGS="-shared" \ ++ UNAME="Linux" ++ ++define Package/lsqlite3/install ++ $(INSTALL_DIR) $(1)/usr/lib/lua ++ $(CP) $(PKG_BUILD_DIR)/lsqlite3.so $(1)/usr/lib/lua/ ++endef ++ ++$(eval $(call BuildPackage,lsqlite3)) +diff --git a/feeds/packages/lang/lsqlite3/Makefile b/feeds/packages/lang/lsqlite3/Makefile +new file mode 100644 +index 0000000..b5e15d3 +--- /dev/null ++++ b/feeds/packages/lang/lsqlite3/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=lsqlite3 ++PKG_VERSION:=7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4472 ++PKG_MD5SUM:=ef7afdd3ea7a29333daa951cda3175bb ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lsqlite3 ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaSQLite3 ++ URL:=http://luasqlite.luaforge.net/lsqlite3.html ++ DEPENDS:=+lua +libsqlite3 ++endef ++ ++define Package/lsqlite3/description ++ LuaSQLite 3 is a thin wrapper around the public domain SQLite3 database engine. ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) -std=c99 ++ ++TARGET_LDFLAGS += -llua -lsqlite3 ++ ++MAKE_FLAGS += \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ INCS="$(TARGET_CPPFLAGS)" \ ++ LIBS="$(TARGET_LDFLAGS)" \ ++ SHFLAGS="-shared" \ ++ UNAME="Linux" ++ ++define Package/lsqlite3/install ++ $(INSTALL_DIR) $(1)/usr/lib/lua ++ $(CP) $(PKG_BUILD_DIR)/lsqlite3.so $(1)/usr/lib/lua/ ++endef ++ ++$(eval $(call BuildPackage,lsqlite3)) +diff --git a/feeds/packages/lang/luaexpat/.svn/entries b/feeds/packages/lang/luaexpat/.svn/entries +new file mode 100644 +index 0000000..424c171 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaexpat ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-28T00:28:56.359963Z ++18194 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++7d903653d44edb5f43839c5714a427bf ++2009-10-28T00:28:56.359963Z ++18194 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1433 ++ +diff --git a/feeds/packages/lang/luaexpat/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luaexpat/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ded0229 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2469 ++PKG_MD5SUM:=6ecb895ccf5cff1e7f2facd438b1f8d0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luaexpat ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaExpat ++ URL:=http://www.keplerproject.org/luaexpat/ ++ 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="$(STAGING_DIR)/usr/include/" \ ++ LUA_INC="$(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.1.0 $(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/feeds/packages/lang/luaexpat/Makefile b/feeds/packages/lang/luaexpat/Makefile +new file mode 100644 +index 0000000..ded0229 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2469 ++PKG_MD5SUM:=6ecb895ccf5cff1e7f2facd438b1f8d0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luaexpat ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaExpat ++ URL:=http://www.keplerproject.org/luaexpat/ ++ 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="$(STAGING_DIR)/usr/include/" \ ++ LUA_INC="$(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.1.0 $(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/feeds/packages/lang/luaexpat/files/.svn/entries b/feeds/packages/lang/luaexpat/files/.svn/entries +new file mode 100644 +index 0000000..c07f260 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaexpat/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-02-15T13:50:18.062866Z ++14519 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++compat-5.1r5 ++dir ++ +diff --git a/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/entries b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/entries +new file mode 100644 +index 0000000..141b4d0 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaexpat/files/compat-5.1r5 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-02-15T13:50:18.062866Z ++14519 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++compat-5.1.lua ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++ee1b313644bfdd6b52a76c606f374f0a ++2009-02-15T13:50:18.062866Z ++14519 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6391 ++ ++compat-5.1.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++dae5066b0eadbf0cfcdda412c1337766 ++2009-02-15T13:50:18.062866Z ++14519 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3081 ++ ++compat-5.1.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++8ed34e3c36477a0b7a488384c9aa9431 ++2009-02-15T13:50:18.062866Z ++14519 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++350 ++ +diff --git a/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.c.svn-base b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.c.svn-base +new file mode 100644 +index 0000000..6fdb8b7 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.c.svn-base +@@ -0,0 +1,97 @@ ++/* ++** 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 ++#include ++#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; ifunc, nup); ++ lua_settable(L, -(nup+3)); ++ } ++ lua_pop(L, nup); /* remove upvalues */ ++} ++ +diff --git a/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.h.svn-base b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.h.svn-base +new file mode 100644 +index 0000000..97570d9 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.h.svn-base +@@ -0,0 +1,13 @@ ++/* ++** 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/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.lua.svn-base b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.lua.svn-base +new file mode 100644 +index 0000000..0938d56 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/.svn/text-base/compat-5.1.lua.svn-base +@@ -0,0 +1,267 @@ ++-- ++-- 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/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.c b/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.c +new file mode 100644 +index 0000000..6fdb8b7 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.c +@@ -0,0 +1,97 @@ ++/* ++** 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 ++#include ++#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; ifunc, nup); ++ lua_settable(L, -(nup+3)); ++ } ++ lua_pop(L, nup); /* remove upvalues */ ++} ++ +diff --git a/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.h b/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.h +new file mode 100644 +index 0000000..97570d9 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.h +@@ -0,0 +1,13 @@ ++/* ++** 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/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua b/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua +new file mode 100644 +index 0000000..0938d56 +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/files/compat-5.1r5/compat-5.1.lua +@@ -0,0 +1,267 @@ ++-- ++-- 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/feeds/packages/lang/luaexpat/patches/.svn/entries b/feeds/packages/lang/luaexpat/patches/.svn/entries +new file mode 100644 +index 0000000..6661eac +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaexpat/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-27T23:43:23.510357Z ++18192 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-compile-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++a22580a3c00b408aed6104624a0ca5df ++2009-10-27T23:43:23.510357Z ++18192 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++220 ++ +diff --git a/feeds/packages/lang/luaexpat/patches/.svn/text-base/001-compile-fix.patch.svn-base b/feeds/packages/lang/luaexpat/patches/.svn/text-base/001-compile-fix.patch.svn-base +new file mode 100644 +index 0000000..c2e863a +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/patches/.svn/text-base/001-compile-fix.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/config +++++ b/config ++@@ -31,6 +31,6 @@ ++ -Wshadow \ ++ -Wwrite-strings ++ ++-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ +++CFLAGS = $(CWARNS) -O2 -I$(LUA_INC) \ ++ -I$(COMPAT_DIR) -I$(EXPAT_INC) ++ CC = gcc +diff --git a/feeds/packages/lang/luaexpat/patches/001-compile-fix.patch b/feeds/packages/lang/luaexpat/patches/001-compile-fix.patch +new file mode 100644 +index 0000000..c2e863a +--- /dev/null ++++ b/feeds/packages/lang/luaexpat/patches/001-compile-fix.patch +@@ -0,0 +1,10 @@ ++--- a/config +++++ b/config ++@@ -31,6 +31,6 @@ ++ -Wshadow \ ++ -Wwrite-strings ++ ++-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ +++CFLAGS = $(CWARNS) -O2 -I$(LUA_INC) \ ++ -I$(COMPAT_DIR) -I$(EXPAT_INC) ++ CC = gcc +diff --git a/feeds/packages/lang/luafilesystem/.svn/entries b/feeds/packages/lang/luafilesystem/.svn/entries +new file mode 100644 +index 0000000..733d131 +--- /dev/null ++++ b/feeds/packages/lang/luafilesystem/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luafilesystem ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-08T14:25:05.311180Z ++20058 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c76242523e529ac6f5c969852d4b11ea ++2010-03-08T14:25:05.311180Z ++20058 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1696 ++ +diff --git a/feeds/packages/lang/luafilesystem/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luafilesystem/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ffdd05e +--- /dev/null ++++ b/feeds/packages/lang/luafilesystem/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://github.com/downloads/keplerproject/luafilesystem/ ++PKG_MD5SUM:=3cf4882bbce956e7a0b010f148f194a3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luafilesystem ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaFileSystem ++ URL:=http://keplerproject.github.com/luafilesystem/ ++ 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/feeds/packages/lang/luafilesystem/Makefile b/feeds/packages/lang/luafilesystem/Makefile +new file mode 100644 +index 0000000..ffdd05e +--- /dev/null ++++ b/feeds/packages/lang/luafilesystem/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://github.com/downloads/keplerproject/luafilesystem/ ++PKG_MD5SUM:=3cf4882bbce956e7a0b010f148f194a3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luafilesystem ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaFileSystem ++ URL:=http://keplerproject.github.com/luafilesystem/ ++ 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/feeds/packages/lang/luaposix/.svn/entries b/feeds/packages/lang/luaposix/.svn/entries +new file mode 100644 +index 0000000..fd3197d +--- /dev/null ++++ b/feeds/packages/lang/luaposix/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaposix ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:16.749476Z ++32311 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++e3effa06367e0e9e6892b1264cbe6692 ++2012-06-13T00:22:16.749476Z ++32311 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1149 ++ +diff --git a/feeds/packages/lang/luaposix/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luaposix/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..46cb211 +--- /dev/null ++++ b/feeds/packages/lang/luaposix/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=5.1.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4813 ++PKG_MD5SUM:=edb76911dbdabe98dec49e3d8a126227 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luaposix ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=luaposix ++ URL:=http://luaposix.luaforge.net/ ++ DEPENDS:=+lua +librt ++endef ++ ++define Package/luaposix/description ++ luaposix is a general POSIX library for Lua providing access ++ to various low level libc functions. ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99 ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++ ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) ++ TARGET_CFLAGS += -DNO_GETLOGIN ++ endif ++endif ++ ++ ++define Package/luaposix/install ++ $(INSTALL_DIR) $(1)/usr/lib/lua ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/posix.so $(1)/usr/lib/lua ++endef ++ ++$(eval $(call BuildPackage,luaposix)) +diff --git a/feeds/packages/lang/luaposix/Makefile b/feeds/packages/lang/luaposix/Makefile +new file mode 100644 +index 0000000..46cb211 +--- /dev/null ++++ b/feeds/packages/lang/luaposix/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=5.1.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4813 ++PKG_MD5SUM:=edb76911dbdabe98dec49e3d8a126227 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luaposix ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=luaposix ++ URL:=http://luaposix.luaforge.net/ ++ DEPENDS:=+lua +librt ++endef ++ ++define Package/luaposix/description ++ luaposix is a general POSIX library for Lua providing access ++ to various low level libc functions. ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99 ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++ ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) ++ TARGET_CFLAGS += -DNO_GETLOGIN ++ endif ++endif ++ ++ ++define Package/luaposix/install ++ $(INSTALL_DIR) $(1)/usr/lib/lua ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/posix.so $(1)/usr/lib/lua ++endef ++ ++$(eval $(call BuildPackage,luaposix)) +diff --git a/feeds/packages/lang/luaposix/patches/.svn/entries b/feeds/packages/lang/luaposix/patches/.svn/entries +new file mode 100644 +index 0000000..3bde242 +--- /dev/null ++++ b/feeds/packages/lang/luaposix/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaposix/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-04T14:49:58.705732Z ++26821 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-eglibc-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++eeec08c971258ba2549516d029d8c8b6 ++2011-05-04T14:49:58.705732Z ++26821 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++566 ++ +diff --git a/feeds/packages/lang/luaposix/patches/.svn/text-base/100-eglibc-compat.patch.svn-base b/feeds/packages/lang/luaposix/patches/.svn/text-base/100-eglibc-compat.patch.svn-base +new file mode 100644 +index 0000000..96a6fce +--- /dev/null ++++ b/feeds/packages/lang/luaposix/patches/.svn/text-base/100-eglibc-compat.patch.svn-base +@@ -0,0 +1,26 @@ ++--- a/lposix.c +++++ b/lposix.c ++@@ -960,11 +960,13 @@ static int Pctermid(lua_State *L) /** c ++ } ++ ++ +++#ifndef NO_GETLOGIN ++ static int Pgetlogin(lua_State *L) /** getlogin() */ ++ { ++ lua_pushstring(L, getlogin()); ++ return 1; ++ } +++#endif ++ ++ ++ static void Fgetpasswd(lua_State *L, int i, const void *data) ++@@ -1778,7 +1780,9 @@ static const luaL_reg R[] = ++ #if _POSIX_VERSION >= 200112L ++ {"getgroups", Pgetgroups}, ++ #endif +++#ifndef NO_GETLOGIN ++ {"getlogin", Pgetlogin}, +++#endif ++ {"getopt_long", Pgetopt_long}, ++ {"getpasswd", Pgetpasswd}, ++ {"getpid", Pgetpid}, +diff --git a/feeds/packages/lang/luaposix/patches/100-eglibc-compat.patch b/feeds/packages/lang/luaposix/patches/100-eglibc-compat.patch +new file mode 100644 +index 0000000..96a6fce +--- /dev/null ++++ b/feeds/packages/lang/luaposix/patches/100-eglibc-compat.patch +@@ -0,0 +1,26 @@ ++--- a/lposix.c +++++ b/lposix.c ++@@ -960,11 +960,13 @@ static int Pctermid(lua_State *L) /** c ++ } ++ ++ +++#ifndef NO_GETLOGIN ++ static int Pgetlogin(lua_State *L) /** getlogin() */ ++ { ++ lua_pushstring(L, getlogin()); ++ return 1; ++ } +++#endif ++ ++ ++ static void Fgetpasswd(lua_State *L, int i, const void *data) ++@@ -1778,7 +1780,9 @@ static const luaL_reg R[] = ++ #if _POSIX_VERSION >= 200112L ++ {"getgroups", Pgetgroups}, ++ #endif +++#ifndef NO_GETLOGIN ++ {"getlogin", Pgetlogin}, +++#endif ++ {"getopt_long", Pgetopt_long}, ++ {"getpasswd", Pgetpasswd}, ++ {"getpid", Pgetpid}, +diff --git a/feeds/packages/lang/luaprofiler/.svn/entries b/feeds/packages/lang/luaprofiler/.svn/entries +new file mode 100644 +index 0000000..5bcfdbb +--- /dev/null ++++ b/feeds/packages/lang/luaprofiler/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaprofiler ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-29T16:50:46.323419Z ++18209 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++ab18163ecf1d5cf3bdc07192e2f71aa7 ++2009-10-29T16:50:46.323419Z ++18209 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1123 ++ +diff --git a/feeds/packages/lang/luaprofiler/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luaprofiler/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1ecc694 +--- /dev/null ++++ b/feeds/packages/lang/luaprofiler/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2006-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:=luaprofiler ++PKG_VERSION:=2.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3400 ++PKG_MD5SUM:=611435c8e61e1a330ee0aa8ddc9c124a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luaprofiler ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Lua Profiler ++ URL:=http://luaprofiler.luaforge.net ++ DEPENDS:=+lua ++endef ++ ++define Package/luaprofiler/description ++ Profile any Lua application ++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)" \ ++ -f Makefile.linux ++endef ++ ++define Package/luaprofiler/install ++ $(INSTALL_DIR) $(1)/usr/lib/lua ++ $(CP) $(PKG_BUILD_DIR)/bin/profiler.so $(1)/usr/lib/lua/ ++endef ++ ++$(eval $(call BuildPackage,luaprofiler)) +diff --git a/feeds/packages/lang/luaprofiler/Makefile b/feeds/packages/lang/luaprofiler/Makefile +new file mode 100644 +index 0000000..1ecc694 +--- /dev/null ++++ b/feeds/packages/lang/luaprofiler/Makefile +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2006-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:=luaprofiler ++PKG_VERSION:=2.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3400 ++PKG_MD5SUM:=611435c8e61e1a330ee0aa8ddc9c124a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luaprofiler ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Lua Profiler ++ URL:=http://luaprofiler.luaforge.net ++ DEPENDS:=+lua ++endef ++ ++define Package/luaprofiler/description ++ Profile any Lua application ++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)" \ ++ -f Makefile.linux ++endef ++ ++define Package/luaprofiler/install ++ $(INSTALL_DIR) $(1)/usr/lib/lua ++ $(CP) $(PKG_BUILD_DIR)/bin/profiler.so $(1)/usr/lib/lua/ ++endef ++ ++$(eval $(call BuildPackage,luaprofiler)) +diff --git a/feeds/packages/lang/luaprofiler/patches/.svn/entries b/feeds/packages/lang/luaprofiler/patches/.svn/entries +new file mode 100644 +index 0000000..5b6eda0 +--- /dev/null ++++ b/feeds/packages/lang/luaprofiler/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luaprofiler/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-15T13:20:47.411337Z ++13219 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-link.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++9f53b1596d693e3a10ed42c2a1ef716e ++2008-11-15T13:20:47.411337Z ++13219 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++310 ++ +diff --git a/feeds/packages/lang/luaprofiler/patches/.svn/text-base/100-link.patch.svn-base b/feeds/packages/lang/luaprofiler/patches/.svn/text-base/100-link.patch.svn-base +new file mode 100644 +index 0000000..804e39c +--- /dev/null ++++ b/feeds/packages/lang/luaprofiler/patches/.svn/text-base/100-link.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.linux +++++ b/Makefile.linux ++@@ -4,7 +4,7 @@ OBJS= src/clocks.o src/core_profiler.o s ++ ++ ++ profiler: $(OBJS) ++- mkdir -p bin && $(LD) -Bshareable -o $(PROFILER_OUTPUT) $(OBJS) +++ mkdir -p bin && $(LD) -Bshareable -o $(PROFILER_OUTPUT) $(OBJS) $(LDFLAGS) ++ ++ clean: ++ rm -f $(PROFILER_OUTPUT) src/*.o +diff --git a/feeds/packages/lang/luaprofiler/patches/100-link.patch b/feeds/packages/lang/luaprofiler/patches/100-link.patch +new file mode 100644 +index 0000000..804e39c +--- /dev/null ++++ b/feeds/packages/lang/luaprofiler/patches/100-link.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.linux +++++ b/Makefile.linux ++@@ -4,7 +4,7 @@ OBJS= src/clocks.o src/core_profiler.o s ++ ++ ++ profiler: $(OBJS) ++- mkdir -p bin && $(LD) -Bshareable -o $(PROFILER_OUTPUT) $(OBJS) +++ mkdir -p bin && $(LD) -Bshareable -o $(PROFILER_OUTPUT) $(OBJS) $(LDFLAGS) ++ ++ clean: ++ rm -f $(PROFILER_OUTPUT) src/*.o +diff --git a/feeds/packages/lang/luasec/.svn/entries b/feeds/packages/lang/luasec/.svn/entries +new file mode 100644 +index 0000000..9227328 +--- /dev/null ++++ b/feeds/packages/lang/luasec/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luasec ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-01-18T04:17:11.851481Z ++19212 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++c9fd25e21d7852360af449d3d9487d44 ++2010-01-18T04:17:11.851481Z ++19212 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1406 ++ +diff --git a/feeds/packages/lang/luasec/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luasec/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..50d7741 +--- /dev/null ++++ b/feeds/packages/lang/luasec/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=luasec ++PKG_VERSION:=0.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4255 ++PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luasec ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaSec ++ URL:=http://luasec.luaforge.net/ ++ 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_PATH = ./src ++ ++MAKE_FLAGS += \ ++ INCDIR="$(TARGET_CPPFLAGS)" \ ++ LIBDIR="$(TARGET_LDFLAGS)" \ ++ CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \ ++ LD="$(TARGET_CROSS)ld -shared" \ ++ LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ ++ LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ ++ linux \ ++ ++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/feeds/packages/lang/luasec/Makefile b/feeds/packages/lang/luasec/Makefile +new file mode 100644 +index 0000000..50d7741 +--- /dev/null ++++ b/feeds/packages/lang/luasec/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=luasec ++PKG_VERSION:=0.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4255 ++PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luasec ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaSec ++ URL:=http://luasec.luaforge.net/ ++ 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_PATH = ./src ++ ++MAKE_FLAGS += \ ++ INCDIR="$(TARGET_CPPFLAGS)" \ ++ LIBDIR="$(TARGET_LDFLAGS)" \ ++ CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \ ++ LD="$(TARGET_CROSS)ld -shared" \ ++ LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ ++ LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ ++ linux \ ++ ++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/feeds/packages/lang/luasoap/.svn/entries b/feeds/packages/lang/luasoap/.svn/entries +new file mode 100644 +index 0000000..9be5a76 +--- /dev/null ++++ b/feeds/packages/lang/luasoap/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luasoap ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-04T14:13:49.642052Z ++31189 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++0e08b7a556391e64888fe72b8d1e5c42 ++2012-04-04T14:13:49.642052Z ++31189 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1338 ++ +diff --git a/feeds/packages/lang/luasoap/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luasoap/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d650b7 +--- /dev/null ++++ b/feeds/packages/lang/luasoap/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=2.0.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://github.com/downloads/tomasguisasola/luasoap/ ++PKG_MD5SUM:=3aafa06f3a65e65f4ee08e12b89ec583 ++ ++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/feeds/packages/lang/luasoap/Makefile b/feeds/packages/lang/luasoap/Makefile +new file mode 100644 +index 0000000..6d650b7 +--- /dev/null ++++ b/feeds/packages/lang/luasoap/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=2.0.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://github.com/downloads/tomasguisasola/luasoap/ ++PKG_MD5SUM:=3aafa06f3a65e65f4ee08e12b89ec583 ++ ++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/feeds/packages/lang/luasocket/.svn/entries b/feeds/packages/lang/luasocket/.svn/entries +new file mode 100644 +index 0000000..9002341 +--- /dev/null ++++ b/feeds/packages/lang/luasocket/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luasocket ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-01-16T07:31:48.653263Z ++19165 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++b55d5b7ed4e40bacfc351c24d0e0895d ++2010-01-16T07:31:48.653263Z ++19165 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1634 ++ +diff --git a/feeds/packages/lang/luasocket/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luasocket/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6dc88cd +--- /dev/null ++++ b/feeds/packages/lang/luasocket/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=luasocket ++PKG_VERSION:=2.0.2 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664 ++PKG_MD5SUM:=41445b138deb7bcfe97bff957503da8e ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luasocket ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaSocket ++ URL:=http://luasocket.luaforge.net/ ++ 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.2 $(1)/usr/lib/lua ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.2.0.2 $(1)/usr/lib/lua ++ $(INSTALL_DIR) $(1)/usr/lib/lua/mime ++ ln -sf ../mime.so.1.0.2 $(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}.lua $(1)/usr/lib/lua/socket ++ ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so ++endef ++ ++$(eval $(call BuildPackage,luasocket)) +diff --git a/feeds/packages/lang/luasocket/Makefile b/feeds/packages/lang/luasocket/Makefile +new file mode 100644 +index 0000000..6dc88cd +--- /dev/null ++++ b/feeds/packages/lang/luasocket/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=luasocket ++PKG_VERSION:=2.0.2 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664 ++PKG_MD5SUM:=41445b138deb7bcfe97bff957503da8e ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/luasocket ++ SUBMENU:=Lua ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=LuaSocket ++ URL:=http://luasocket.luaforge.net/ ++ 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.2 $(1)/usr/lib/lua ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.2.0.2 $(1)/usr/lib/lua ++ $(INSTALL_DIR) $(1)/usr/lib/lua/mime ++ ln -sf ../mime.so.1.0.2 $(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}.lua $(1)/usr/lib/lua/socket ++ ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so ++endef ++ ++$(eval $(call BuildPackage,luasocket)) +diff --git a/feeds/packages/lang/luasql/.svn/entries b/feeds/packages/lang/luasql/.svn/entries +new file mode 100644 +index 0000000..bcde619 +--- /dev/null ++++ b/feeds/packages/lang/luasql/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/luasql ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-05-24T10:40:32.612093Z ++21561 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++88d8c0f61c8999b1439a11f60a193e9c ++2010-05-24T10:40:32.612093Z ++21561 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2851 ++ +diff --git a/feeds/packages/lang/luasql/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/luasql/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eaf494b +--- /dev/null ++++ b/feeds/packages/lang/luasql/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,121 @@ ++# ++# 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:=luasql ++PKG_VERSION:=2.1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2686/ ++PKG_MD5SUM:=63bdd57de4b9d1be336ba112d8cb69eb ++ ++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 ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ T="$(BUILD_VARIANT)" \ ++ PREFIX="$(STAGING_DIR)/usr" \ ++ LUA_LIBDIR="$(STAGING_DIR)/usr/lib/lua" \ ++ DRIVER_INCS="$(TARGET_CPPFLAGS)" \ ++ DRIVER_LIBS="$(TARGET_LDFLAGS)" \ ++ CC="$(TARGET_CROSS)gcc" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ lib ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ T="$(BUILD_VARIANT)" \ ++ LUA_LIBDIR="$(PKG_INSTALL_DIR)/usr/lib/lua" \ ++ install ++endef ++ ++define Build/Install/Default ++ $(INSTALL_DIR) $(1)/usr/lib/lua/luasql ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/luasql/*.so $(1)/usr/lib/lua/luasql/ ++endef ++ ++Package/luasql-mysql/install = $(Build/Install/Default) ++Package/luasql-pgsql/install = $(Build/Install/Default) ++Package/luasql-sqlite3/install = $(Build/Install/Default) ++ ++$(eval $(call BuildPackage,luasql-mysql)) ++$(eval $(call BuildPackage,luasql-pgsql)) ++$(eval $(call BuildPackage,luasql-sqlite3)) +diff --git a/feeds/packages/lang/luasql/Makefile b/feeds/packages/lang/luasql/Makefile +new file mode 100644 +index 0000000..eaf494b +--- /dev/null ++++ b/feeds/packages/lang/luasql/Makefile +@@ -0,0 +1,121 @@ ++# ++# 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:=luasql ++PKG_VERSION:=2.1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2686/ ++PKG_MD5SUM:=63bdd57de4b9d1be336ba112d8cb69eb ++ ++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 ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ T="$(BUILD_VARIANT)" \ ++ PREFIX="$(STAGING_DIR)/usr" \ ++ LUA_LIBDIR="$(STAGING_DIR)/usr/lib/lua" \ ++ DRIVER_INCS="$(TARGET_CPPFLAGS)" \ ++ DRIVER_LIBS="$(TARGET_LDFLAGS)" \ ++ CC="$(TARGET_CROSS)gcc" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ lib ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ T="$(BUILD_VARIANT)" \ ++ LUA_LIBDIR="$(PKG_INSTALL_DIR)/usr/lib/lua" \ ++ install ++endef ++ ++define Build/Install/Default ++ $(INSTALL_DIR) $(1)/usr/lib/lua/luasql ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/luasql/*.so $(1)/usr/lib/lua/luasql/ ++endef ++ ++Package/luasql-mysql/install = $(Build/Install/Default) ++Package/luasql-pgsql/install = $(Build/Install/Default) ++Package/luasql-sqlite3/install = $(Build/Install/Default) ++ ++$(eval $(call BuildPackage,luasql-mysql)) ++$(eval $(call BuildPackage,luasql-pgsql)) ++$(eval $(call BuildPackage,luasql-sqlite3)) +diff --git a/feeds/packages/lang/mako/.svn/entries b/feeds/packages/lang/mako/.svn/entries +new file mode 100644 +index 0000000..4daa419 +--- /dev/null ++++ b/feeds/packages/lang/mako/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/mako ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-10T14:22:28.672756Z ++28403 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++cca1360b17c1650e460ba500d9474e8f ++2011-10-10T14:22:28.672756Z ++28403 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1616 ++ +diff --git a/feeds/packages/lang/mako/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/mako/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ad935c6 +--- /dev/null ++++ b/feeds/packages/lang/mako/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=mako ++PKG_VERSION:=0.2.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Mako-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.makotemplates.org/downloads/ ++PKG_MD5SUM:=d8ca783630dc5e93970a2075532fa643 ++ ++PKG_BUILD_DEPENDS:=distribute/host ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(subst .tar.gz,,$(PKG_SOURCE)) ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/mako ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Mako Templates for Python ++ URL:=http://www.makotemplates.org/ ++ DEPENDS:=+python ++endef ++ ++define Package/mako/description ++Mako is a template library written in Python. It provides a familiar, ++non-XML syntax which compiles into Python modules for maximum ++performance. Mako's syntax and API borrows from the best ideas of many ++others, including Django templates, Cheetah, Myghty, and ++Genshi. Conceptually, Mako is an embedded Python (i.e. Python Server ++Page) language, which refines the familiar ideas of componentized ++layout and inheritance to produce one of the most straightforward and ++flexible models available, while also maintaining close ties to Python ++calling and scoping semantics. ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++endef ++ ++define Package/mako/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR)/ ++endef ++ ++$(eval $(call BuildPackage,mako)) +diff --git a/feeds/packages/lang/mako/Makefile b/feeds/packages/lang/mako/Makefile +new file mode 100644 +index 0000000..ad935c6 +--- /dev/null ++++ b/feeds/packages/lang/mako/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=mako ++PKG_VERSION:=0.2.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Mako-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.makotemplates.org/downloads/ ++PKG_MD5SUM:=d8ca783630dc5e93970a2075532fa643 ++ ++PKG_BUILD_DEPENDS:=distribute/host ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(subst .tar.gz,,$(PKG_SOURCE)) ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/mako ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Mako Templates for Python ++ URL:=http://www.makotemplates.org/ ++ DEPENDS:=+python ++endef ++ ++define Package/mako/description ++Mako is a template library written in Python. It provides a familiar, ++non-XML syntax which compiles into Python modules for maximum ++performance. Mako's syntax and API borrows from the best ideas of many ++others, including Django templates, Cheetah, Myghty, and ++Genshi. Conceptually, Mako is an embedded Python (i.e. Python Server ++Page) language, which refines the familiar ideas of componentized ++layout and inheritance to produce one of the most straightforward and ++flexible models available, while also maintaining close ties to Python ++calling and scoping semantics. ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++endef ++ ++define Package/mako/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR)/ ++endef ++ ++$(eval $(call BuildPackage,mako)) +diff --git a/feeds/packages/lang/numpy/.svn/entries b/feeds/packages/lang/numpy/.svn/entries +new file mode 100644 +index 0000000..6c2980d +--- /dev/null ++++ b/feeds/packages/lang/numpy/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/numpy ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++9513ccc4f39fe244e43a488de705fb6a ++2010-02-24T23:13:32.482440Z ++19848 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1169 ++ +diff --git a/feeds/packages/lang/numpy/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/numpy/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e9985cc +--- /dev/null ++++ b/feeds/packages/lang/numpy/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2008-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:=numpy ++PKG_VERSION:=1.0.4 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/numpy ++PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/numpy ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=numpy ++ URL:=http://numpy.sf.net ++ DEPENDS:=+python-mini @TARGET_x86||TARGET_olpc||TARGET_uml @BROKEN ++endef ++ ++define Package/numpy/description ++ API to GTK and glade library from python ++endef ++ ++define Build/Compile ++ cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) $(MAKE_VARS) python2.5 ./setup.py install --prefix="$(PKG_INSTALL_DIR)/usr" ++endef ++ ++define Package/numpy/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++define Require/python25-dev ++[ -e /usr/include/python2.5/pyconfig.h ] ++endef ++ ++$(eval $(call Require,python25-dev, \ ++ Please install Python 2.5 (including development headers and libraries) \ ++)) ++ ++$(eval $(call BuildPackage,numpy)) ++ +diff --git a/feeds/packages/lang/numpy/Makefile b/feeds/packages/lang/numpy/Makefile +new file mode 100644 +index 0000000..e9985cc +--- /dev/null ++++ b/feeds/packages/lang/numpy/Makefile +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2008-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:=numpy ++PKG_VERSION:=1.0.4 ++PKG_RELEASE:=1 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/numpy ++PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/numpy ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=numpy ++ URL:=http://numpy.sf.net ++ DEPENDS:=+python-mini @TARGET_x86||TARGET_olpc||TARGET_uml @BROKEN ++endef ++ ++define Package/numpy/description ++ API to GTK and glade library from python ++endef ++ ++define Build/Compile ++ cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) $(MAKE_VARS) python2.5 ./setup.py install --prefix="$(PKG_INSTALL_DIR)/usr" ++endef ++ ++define Package/numpy/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++define Require/python25-dev ++[ -e /usr/include/python2.5/pyconfig.h ] ++endef ++ ++$(eval $(call Require,python25-dev, \ ++ Please install Python 2.5 (including development headers and libraries) \ ++)) ++ ++$(eval $(call BuildPackage,numpy)) ++ +diff --git a/feeds/packages/lang/numpy/patches/.svn/entries b/feeds/packages/lang/numpy/patches/.svn/entries +new file mode 100644 +index 0000000..e1ee939 +--- /dev/null ++++ b/feeds/packages/lang/numpy/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/numpy/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-10-02T15:33:26.829943Z ++12821 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++35be6f8e74f3a4a5c5d9ba113df18c8c ++2008-10-02T15:33:26.829943Z ++12821 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5482 ++ +diff --git a/feeds/packages/lang/numpy/patches/.svn/text-base/100-compile.patch.svn-base b/feeds/packages/lang/numpy/patches/.svn/text-base/100-compile.patch.svn-base +new file mode 100644 +index 0000000..632e409 +--- /dev/null ++++ b/feeds/packages/lang/numpy/patches/.svn/text-base/100-compile.patch.svn-base +@@ -0,0 +1,112 @@ ++diff -urN numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h numpy-1.0.4.patched/numpy/core/include/numpy/ufuncobject.h ++--- numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h 2007-11-07 22:05:15.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/core/include/numpy/ufuncobject.h 2008-05-25 11:07:14.000000000 +0100 ++@@ -284,7 +284,7 @@ ++ #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) ++ ++ #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) ++-#include +++#include "fenv/fenv.h" ++ #elif defined(__CYGWIN__) ++ #include "fenv/fenv.c" ++ #endif ++diff -urN numpy-1.0.4/numpy/core/setup.py numpy-1.0.4.patched/numpy/core/setup.py ++--- numpy-1.0.4/numpy/core/setup.py 2007-11-07 22:06:43.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/core/setup.py 2008-05-25 11:07:14.000000000 +0100 ++@@ -36,6 +36,7 @@ ++ ++ def generate_config_h(ext, build_dir): ++ target = join(build_dir,'config.h') +++ log.info("-----------------------abc") ++ if newer(__file__,target): ++ config_cmd = config.get_config_cmd() ++ log.info('Generating %s',target) ++@@ -73,6 +74,7 @@ ++ nosmp = 1 ++ except KeyError: ++ nosmp = 0 +++ nosmp = 1 ++ if nosmp: moredefs = [('NPY_ALLOW_THREADS', '0')] ++ else: moredefs = [] ++ # ++@@ -123,8 +125,9 @@ ++ target_f.write('#define %s\n' % (d)) ++ else: ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++- if not nosmp: # default is to use WITH_THREAD ++- target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS 1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n') +++ log.info("-----------------------abc") +++ #if not nosmp: # default is to use WITH_THREAD +++ target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS 1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n') ++ target_f.close() ++ print 'File:',target ++ target_f = open(target) ++diff -urN numpy-1.0.4/numpy/distutils/unixccompiler.py numpy-1.0.4.patched/numpy/distutils/unixccompiler.py ++--- numpy-1.0.4/numpy/distutils/unixccompiler.py 2007-11-07 22:05:15.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/distutils/unixccompiler.py 2008-05-25 11:07:14.000000000 +0100 ++@@ -9,11 +9,36 @@ ++ from numpy.distutils.ccompiler import replace_method ++ ++ import log +++def UnixCCompiler__link_executable (self, +++ objects, +++ output_progname, +++ output_dir=None, +++ libraries=None, +++ library_dirs=None, +++ runtime_library_dirs=None, +++ debug=0, +++ extra_preargs=None, +++ extra_postargs=None, +++ target_lang=None): +++ if output_progname == "_configtest": +++ self.spawn(['gcc', '-lm', '-o',output_progname]+objects, display = "") +++ else: +++ print "#### Running " + str(CCompiler.EXECUTABLE) +++ self.link(CCompiler.EXECUTABLE, objects, +++ self.executable_filename(output_progname), output_dir, +++ libraries, library_dirs, runtime_library_dirs, None, +++ debug, extra_preargs, extra_postargs+ ['-lm'], None, target_lang) +++ +++replace_method(UnixCCompiler, 'link_executable', UnixCCompiler__link_executable) ++ ++ # Note that UnixCCompiler._compile appeared in Python 2.3 ++ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): ++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]),src) ++ try: +++ if src == "_configtest.c": +++ self.spawn(['gcc', '-fwrapv', '-O2', '-Wall', '-Wstrict-prototypes', '-I/umc/blogic/olpc/staging_dir/i386/usr/include', '-I/umc/blogic/olpc/staging_dir/i386/include', '-I/umc/blogic/olpc/staging_dir/i386/usr/include/python2.5','-I/umc/blogic/olpc/staging_dir/i386/usr/include', '-I/umc/blogic/olpc/staging_dir/i386/include', '-fPIC'] + cc_args + [src, '-o', obj] + +++ extra_postargs, display = display) +++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs, display = display) ++ except DistutilsExecError, msg: ++diff -urN numpy-1.0.4/numpy/numarray/_capi.c numpy-1.0.4.patched/numpy/numarray/_capi.c ++--- numpy-1.0.4/numpy/numarray/_capi.c 2007-11-07 22:05:16.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/numarray/_capi.c 2008-05-25 11:07:14.000000000 +0100 ++@@ -5,7 +5,7 @@ ++ #include ++ ++ #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) ++-#include +++#include "numpy/fenv/fenv.h" ++ #elif defined(__CYGWIN__) ++ #include "numpy/fenv/fenv.h" ++ #include "numpy/fenv/fenv.c" ++diff -urN numpy-1.0.4.p2/numpy/core/setup.py numpy-1.0.4/numpy/core/setup.py ++--- numpy-1.0.4.p2/numpy/core/setup.py 2008-05-25 11:18:19.000000000 +0100 +++++ numpy-1.0.4/numpy/core/setup.py 2008-05-25 11:18:52.000000000 +0100 ++@@ -6,13 +6,11 @@ ++ from distutils.dep_util import newer ++ ++ FUNCTIONS_TO_CHECK = [ ++- ('expl', 'HAVE_LONGDOUBLE_FUNCS'), ++ ('expf', 'HAVE_FLOAT_FUNCS'), ++ ('log1p', 'HAVE_LOG1P'), ++ ('expm1', 'HAVE_EXPM1'), ++ ('asinh', 'HAVE_INVERSE_HYPERBOLIC'), ++ ('atanhf', 'HAVE_INVERSE_HYPERBOLIC_FLOAT'), ++- ('atanhl', 'HAVE_INVERSE_HYPERBOLIC_LONGDOUBLE'), ++ ('isnan', 'HAVE_ISNAN'), ++ ('isinf', 'HAVE_ISINF'), ++ ('rint', 'HAVE_RINT'), +diff --git a/feeds/packages/lang/numpy/patches/100-compile.patch b/feeds/packages/lang/numpy/patches/100-compile.patch +new file mode 100644 +index 0000000..632e409 +--- /dev/null ++++ b/feeds/packages/lang/numpy/patches/100-compile.patch +@@ -0,0 +1,112 @@ ++diff -urN numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h numpy-1.0.4.patched/numpy/core/include/numpy/ufuncobject.h ++--- numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h 2007-11-07 22:05:15.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/core/include/numpy/ufuncobject.h 2008-05-25 11:07:14.000000000 +0100 ++@@ -284,7 +284,7 @@ ++ #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) ++ ++ #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) ++-#include +++#include "fenv/fenv.h" ++ #elif defined(__CYGWIN__) ++ #include "fenv/fenv.c" ++ #endif ++diff -urN numpy-1.0.4/numpy/core/setup.py numpy-1.0.4.patched/numpy/core/setup.py ++--- numpy-1.0.4/numpy/core/setup.py 2007-11-07 22:06:43.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/core/setup.py 2008-05-25 11:07:14.000000000 +0100 ++@@ -36,6 +36,7 @@ ++ ++ def generate_config_h(ext, build_dir): ++ target = join(build_dir,'config.h') +++ log.info("-----------------------abc") ++ if newer(__file__,target): ++ config_cmd = config.get_config_cmd() ++ log.info('Generating %s',target) ++@@ -73,6 +74,7 @@ ++ nosmp = 1 ++ except KeyError: ++ nosmp = 0 +++ nosmp = 1 ++ if nosmp: moredefs = [('NPY_ALLOW_THREADS', '0')] ++ else: moredefs = [] ++ # ++@@ -123,8 +125,9 @@ ++ target_f.write('#define %s\n' % (d)) ++ else: ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++- if not nosmp: # default is to use WITH_THREAD ++- target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS 1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n') +++ log.info("-----------------------abc") +++ #if not nosmp: # default is to use WITH_THREAD +++ target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS 1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n') ++ target_f.close() ++ print 'File:',target ++ target_f = open(target) ++diff -urN numpy-1.0.4/numpy/distutils/unixccompiler.py numpy-1.0.4.patched/numpy/distutils/unixccompiler.py ++--- numpy-1.0.4/numpy/distutils/unixccompiler.py 2007-11-07 22:05:15.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/distutils/unixccompiler.py 2008-05-25 11:07:14.000000000 +0100 ++@@ -9,11 +9,36 @@ ++ from numpy.distutils.ccompiler import replace_method ++ ++ import log +++def UnixCCompiler__link_executable (self, +++ objects, +++ output_progname, +++ output_dir=None, +++ libraries=None, +++ library_dirs=None, +++ runtime_library_dirs=None, +++ debug=0, +++ extra_preargs=None, +++ extra_postargs=None, +++ target_lang=None): +++ if output_progname == "_configtest": +++ self.spawn(['gcc', '-lm', '-o',output_progname]+objects, display = "") +++ else: +++ print "#### Running " + str(CCompiler.EXECUTABLE) +++ self.link(CCompiler.EXECUTABLE, objects, +++ self.executable_filename(output_progname), output_dir, +++ libraries, library_dirs, runtime_library_dirs, None, +++ debug, extra_preargs, extra_postargs+ ['-lm'], None, target_lang) +++ +++replace_method(UnixCCompiler, 'link_executable', UnixCCompiler__link_executable) ++ ++ # Note that UnixCCompiler._compile appeared in Python 2.3 ++ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): ++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]),src) ++ try: +++ if src == "_configtest.c": +++ self.spawn(['gcc', '-fwrapv', '-O2', '-Wall', '-Wstrict-prototypes', '-I/umc/blogic/olpc/staging_dir/i386/usr/include', '-I/umc/blogic/olpc/staging_dir/i386/include', '-I/umc/blogic/olpc/staging_dir/i386/usr/include/python2.5','-I/umc/blogic/olpc/staging_dir/i386/usr/include', '-I/umc/blogic/olpc/staging_dir/i386/include', '-fPIC'] + cc_args + [src, '-o', obj] + +++ extra_postargs, display = display) +++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs, display = display) ++ except DistutilsExecError, msg: ++diff -urN numpy-1.0.4/numpy/numarray/_capi.c numpy-1.0.4.patched/numpy/numarray/_capi.c ++--- numpy-1.0.4/numpy/numarray/_capi.c 2007-11-07 22:05:16.000000000 +0000 +++++ numpy-1.0.4.patched/numpy/numarray/_capi.c 2008-05-25 11:07:14.000000000 +0100 ++@@ -5,7 +5,7 @@ ++ #include ++ ++ #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) ++-#include +++#include "numpy/fenv/fenv.h" ++ #elif defined(__CYGWIN__) ++ #include "numpy/fenv/fenv.h" ++ #include "numpy/fenv/fenv.c" ++diff -urN numpy-1.0.4.p2/numpy/core/setup.py numpy-1.0.4/numpy/core/setup.py ++--- numpy-1.0.4.p2/numpy/core/setup.py 2008-05-25 11:18:19.000000000 +0100 +++++ numpy-1.0.4/numpy/core/setup.py 2008-05-25 11:18:52.000000000 +0100 ++@@ -6,13 +6,11 @@ ++ from distutils.dep_util import newer ++ ++ FUNCTIONS_TO_CHECK = [ ++- ('expl', 'HAVE_LONGDOUBLE_FUNCS'), ++ ('expf', 'HAVE_FLOAT_FUNCS'), ++ ('log1p', 'HAVE_LOG1P'), ++ ('expm1', 'HAVE_EXPM1'), ++ ('asinh', 'HAVE_INVERSE_HYPERBOLIC'), ++ ('atanhf', 'HAVE_INVERSE_HYPERBOLIC_FLOAT'), ++- ('atanhl', 'HAVE_INVERSE_HYPERBOLIC_LONGDOUBLE'), ++ ('isnan', 'HAVE_ISNAN'), ++ ('isinf', 'HAVE_ISINF'), ++ ('rint', 'HAVE_RINT'), +diff --git a/feeds/packages/lang/perl-compress-bzip2/.svn/entries b/feeds/packages/lang/perl-compress-bzip2/.svn/entries +new file mode 100644 +index 0000000..2dac6f8 +--- /dev/null ++++ b/feeds/packages/lang/perl-compress-bzip2/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-compress-bzip2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-13T22:55:31.635174Z ++28235 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++cbd1bb86d257bc39c460ce257dbf48ec ++2011-09-13T22:55:31.635174Z ++28235 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++884 ++ +diff --git a/feeds/packages/lang/perl-compress-bzip2/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-compress-bzip2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..940749a +--- /dev/null ++++ b/feeds/packages/lang/perl-compress-bzip2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-compress-bzip2 ++PKG_VERSION:=2.09 ++PKG_RELEASE:=3 ++PKG_MD5SUM:=1699fde3e86f2a036f135ae606d456bf ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY ++PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-compress-bzip2/Makefile b/feeds/packages/lang/perl-compress-bzip2/Makefile +new file mode 100644 +index 0000000..940749a +--- /dev/null ++++ b/feeds/packages/lang/perl-compress-bzip2/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-compress-bzip2 ++PKG_VERSION:=2.09 ++PKG_RELEASE:=3 ++PKG_MD5SUM:=1699fde3e86f2a036f135ae606d456bf ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY ++PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-dbi/.svn/entries b/feeds/packages/lang/perl-dbi/.svn/entries +new file mode 100644 +index 0000000..1f83b20 +--- /dev/null ++++ b/feeds/packages/lang/perl-dbi/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-dbi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e482bc0851596953ffa299dae7af2da2 ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++809 ++ +diff --git a/feeds/packages/lang/perl-dbi/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-dbi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..27a13b9 +--- /dev/null ++++ b/feeds/packages/lang/perl-dbi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-dbi ++PKG_VERSION:=1.604 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=358511d60eb3daba913d49236c469802 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/ ++PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.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 Package/perl-dbi/install ++ $(call perlmod/Install,$(1),DB* auto/DBI,DBI/W32ODBC.pm auto/DBI/*.h) ++endef ++ ++ ++$(eval $(call BuildPackage,perl-dbi)) +diff --git a/feeds/packages/lang/perl-dbi/Makefile b/feeds/packages/lang/perl-dbi/Makefile +new file mode 100644 +index 0000000..27a13b9 +--- /dev/null ++++ b/feeds/packages/lang/perl-dbi/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-dbi ++PKG_VERSION:=1.604 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=358511d60eb3daba913d49236c469802 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/ ++PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.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 Package/perl-dbi/install ++ $(call perlmod/Install,$(1),DB* auto/DBI,DBI/W32ODBC.pm auto/DBI/*.h) ++endef ++ ++ ++$(eval $(call BuildPackage,perl-dbi)) +diff --git a/feeds/packages/lang/perl-html-parser/.svn/entries b/feeds/packages/lang/perl-html-parser/.svn/entries +new file mode 100644 +index 0000000..373c9ce +--- /dev/null ++++ b/feeds/packages/lang/perl-html-parser/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-html-parser ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8511adb4e5aaf45f5d26c496cca2627f ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++860 ++ +diff --git a/feeds/packages/lang/perl-html-parser/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-html-parser/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1dabc46 +--- /dev/null ++++ b/feeds/packages/lang/perl-html-parser/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-html-parser ++PKG_VERSION:=3.56 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=bddc432e5ed9df4d4153a62234f04fc2 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS ++PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-html-parser/Makefile b/feeds/packages/lang/perl-html-parser/Makefile +new file mode 100644 +index 0000000..1dabc46 +--- /dev/null ++++ b/feeds/packages/lang/perl-html-parser/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-html-parser ++PKG_VERSION:=3.56 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=bddc432e5ed9df4d4153a62234f04fc2 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS ++PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-html-tagset/.svn/entries b/feeds/packages/lang/perl-html-tagset/.svn/entries +new file mode 100644 +index 0000000..e25c837 +--- /dev/null ++++ b/feeds/packages/lang/perl-html-tagset/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-html-tagset ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++f9c747ea932fb2576f81146a184c7788 ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++802 ++ +diff --git a/feeds/packages/lang/perl-html-tagset/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-html-tagset/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..380796e +--- /dev/null ++++ b/feeds/packages/lang/perl-html-tagset/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-html-tagset ++PKG_VERSION:=3.20 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=d2bfa18fe1904df7f683e96611e87437 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE ++PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-html-tagset/Makefile b/feeds/packages/lang/perl-html-tagset/Makefile +new file mode 100644 +index 0000000..380796e +--- /dev/null ++++ b/feeds/packages/lang/perl-html-tagset/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-html-tagset ++PKG_VERSION:=3.20 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=d2bfa18fe1904df7f683e96611e87437 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE ++PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-html-tree/.svn/entries b/feeds/packages/lang/perl-html-tree/.svn/entries +new file mode 100644 +index 0000000..b53c8c1 +--- /dev/null ++++ b/feeds/packages/lang/perl-html-tree/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-html-tree ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++58773ecdd5b33e8f5e773324c78dbf3d ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++829 ++ +diff --git a/feeds/packages/lang/perl-html-tree/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-html-tree/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..04691d1 +--- /dev/null ++++ b/feeds/packages/lang/perl-html-tree/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-html-tree ++PKG_VERSION:=3.23 ++PKG_RELEASE:=2 ++PKG_MD5SUM:=6352f50be402301f79b580dd235d7762 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETEK ++PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-html-tree/Makefile b/feeds/packages/lang/perl-html-tree/Makefile +new file mode 100644 +index 0000000..04691d1 +--- /dev/null ++++ b/feeds/packages/lang/perl-html-tree/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-html-tree ++PKG_VERSION:=3.23 ++PKG_RELEASE:=2 ++PKG_MD5SUM:=6352f50be402301f79b580dd235d7762 ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETEK ++PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-lockfile-simple/.svn/entries b/feeds/packages/lang/perl-lockfile-simple/.svn/entries +new file mode 100644 +index 0000000..1f76362 +--- /dev/null ++++ b/feeds/packages/lang/perl-lockfile-simple/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-lockfile-simple ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++84d929486848763486285c161f6252db ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++841 ++ +diff --git a/feeds/packages/lang/perl-lockfile-simple/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-lockfile-simple/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..685493e +--- /dev/null ++++ b/feeds/packages/lang/perl-lockfile-simple/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-lockfile-simple ++PKG_VERSION:=0.206 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=d8966c3fb799aefcaaf80f845057a1fa ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JV/JV ++PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-lockfile-simple/Makefile b/feeds/packages/lang/perl-lockfile-simple/Makefile +new file mode 100644 +index 0000000..685493e +--- /dev/null ++++ b/feeds/packages/lang/perl-lockfile-simple/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-lockfile-simple ++PKG_VERSION:=0.206 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=d8966c3fb799aefcaaf80f845057a1fa ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JV/JV ++PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-net-telnet/.svn/entries b/feeds/packages/lang/perl-net-telnet/.svn/entries +new file mode 100644 +index 0000000..b94ab9b +--- /dev/null ++++ b/feeds/packages/lang/perl-net-telnet/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-net-telnet ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-25T20:53:19.911666Z ++28587 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2a843fad5610e445e96fb1e6208c8d67 ++2011-10-25T20:53:19.911666Z ++28587 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++944 ++ +diff --git a/feeds/packages/lang/perl-net-telnet/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-net-telnet/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9b94990 +--- /dev/null ++++ b/feeds/packages/lang/perl-net-telnet/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=perl-net-telnet ++PKG_VERSION:=3.03 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=2f7d34b09d6117baefe89d44cff9d5fc ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JR/JROGERS ++PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz ++ ++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/~jrogers/Net-Telnet-3.03/ ++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/feeds/packages/lang/perl-net-telnet/Makefile b/feeds/packages/lang/perl-net-telnet/Makefile +new file mode 100644 +index 0000000..9b94990 +--- /dev/null ++++ b/feeds/packages/lang/perl-net-telnet/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=perl-net-telnet ++PKG_VERSION:=3.03 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=2f7d34b09d6117baefe89d44cff9d5fc ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JR/JROGERS ++PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz ++ ++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/~jrogers/Net-Telnet-3.03/ ++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/feeds/packages/lang/perl-test-harness/.svn/entries b/feeds/packages/lang/perl-test-harness/.svn/entries +new file mode 100644 +index 0000000..96f322c +--- /dev/null ++++ b/feeds/packages/lang/perl-test-harness/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-test-harness ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++6b32cdee3d9bf4115d1a946a7b8b0cd3 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++875 ++ +diff --git a/feeds/packages/lang/perl-test-harness/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-test-harness/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a0d5047 +--- /dev/null ++++ b/feeds/packages/lang/perl-test-harness/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-test-harness ++PKG_VERSION:=3.25 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=69a8a019eeb952fe97e3ac0767c726da ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/O/OV/OVID ++PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz ++ ++PKG_LICENSE:=GPLv2 ARTISTIC ++PKG_LICENSE_FILES:= ++ ++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/~ovid/Test-Harness-3.25/bin/prove ++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/feeds/packages/lang/perl-test-harness/Makefile b/feeds/packages/lang/perl-test-harness/Makefile +new file mode 100644 +index 0000000..a0d5047 +--- /dev/null ++++ b/feeds/packages/lang/perl-test-harness/Makefile +@@ -0,0 +1,42 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-test-harness ++PKG_VERSION:=3.25 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=69a8a019eeb952fe97e3ac0767c726da ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/O/OV/OVID ++PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz ++ ++PKG_LICENSE:=GPLv2 ARTISTIC ++PKG_LICENSE_FILES:= ++ ++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/~ovid/Test-Harness-3.25/bin/prove ++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/feeds/packages/lang/perl-uri/.svn/entries b/feeds/packages/lang/perl-uri/.svn/entries +new file mode 100644 +index 0000000..b1f90c6 +--- /dev/null ++++ b/feeds/packages/lang/perl-uri/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-uri ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++862ce137c9b2af16eabb9e600315cb23 ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++754 ++ +diff --git a/feeds/packages/lang/perl-uri/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-uri/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d6938bf +--- /dev/null ++++ b/feeds/packages/lang/perl-uri/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-uri ++PKG_VERSION:=1.36 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=a97bbdd38b31c6b2672fdc3060fae34b ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS ++PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-uri/Makefile b/feeds/packages/lang/perl-uri/Makefile +new file mode 100644 +index 0000000..d6938bf +--- /dev/null ++++ b/feeds/packages/lang/perl-uri/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-uri ++PKG_VERSION:=1.36 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=a97bbdd38b31c6b2672fdc3060fae34b ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS ++PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-www-curl/.svn/entries b/feeds/packages/lang/perl-www-curl/.svn/entries +new file mode 100644 +index 0000000..fe56dd1 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-curl/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-www-curl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++5160a2af81b91375a44029f257c56257 ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++840 ++ +diff --git a/feeds/packages/lang/perl-www-curl/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-www-curl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4ada0f6 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-curl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-www-curl ++PKG_VERSION:=4.00 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=f34eb29f59a811869a4f77bfc0df2f5d ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT ++PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-www-curl/Makefile b/feeds/packages/lang/perl-www-curl/Makefile +new file mode 100644 +index 0000000..4ada0f6 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-curl/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-www-curl ++PKG_VERSION:=4.00 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=f34eb29f59a811869a4f77bfc0df2f5d ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT ++PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz ++ ++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/feeds/packages/lang/perl-www-curl/patches/.svn/entries b/feeds/packages/lang/perl-www-curl/patches/.svn/entries +new file mode 100644 +index 0000000..840ef47 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-curl/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-www-curl/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-03T12:31:32.543179Z ++11628 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-perl-www-curl_disable_curl-config_hack.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++5e6fb07d13e1fc7631c585a4516291dc ++2008-07-03T12:31:32.543179Z ++11628 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++521 ++ +diff --git a/feeds/packages/lang/perl-www-curl/patches/.svn/text-base/100-perl-www-curl_disable_curl-config_hack.patch.svn-base b/feeds/packages/lang/perl-www-curl/patches/.svn/text-base/100-perl-www-curl_disable_curl-config_hack.patch.svn-base +new file mode 100644 +index 0000000..2b31454 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-curl/patches/.svn/text-base/100-perl-www-curl_disable_curl-config_hack.patch.svn-base +@@ -0,0 +1,11 @@ ++--- WWW-Curl-4.00.config/Makefile.PL 2008-04-21 23:18:39.000000000 +0200 +++++ WWW-Curl-4.00/Makefile.PL 2008-04-21 23:18:52.000000000 +0200 ++@@ -11,7 +11,7 @@ ++ no_index directory => 'template'; ++ # This is a hack. If you have libcurl installed, just specify curl.h below ++ # and comment out this line. ++-requires_external_bin 'curl-config'; +++#requires_external_bin 'curl-config'; ++ ++ # This utility helper generates the constants function from curl.h ++ # It is normally only used by the maintainer, but if you're curl is older +diff --git a/feeds/packages/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch b/feeds/packages/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch +new file mode 100644 +index 0000000..2b31454 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-curl/patches/100-perl-www-curl_disable_curl-config_hack.patch +@@ -0,0 +1,11 @@ ++--- WWW-Curl-4.00.config/Makefile.PL 2008-04-21 23:18:39.000000000 +0200 +++++ WWW-Curl-4.00/Makefile.PL 2008-04-21 23:18:52.000000000 +0200 ++@@ -11,7 +11,7 @@ ++ no_index directory => 'template'; ++ # This is a hack. If you have libcurl installed, just specify curl.h below ++ # and comment out this line. ++-requires_external_bin 'curl-config'; +++#requires_external_bin 'curl-config'; ++ ++ # This utility helper generates the constants function from curl.h ++ # It is normally only used by the maintainer, but if you're curl is older +diff --git a/feeds/packages/lang/perl-www-mechanize/.svn/entries b/feeds/packages/lang/perl-www-mechanize/.svn/entries +new file mode 100644 +index 0000000..bd2cb06 +--- /dev/null ++++ b/feeds/packages/lang/perl-www-mechanize/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-www-mechanize ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-19T04:18:21.741415Z ++21016 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++987930eae849adf414a1b6ffb0ed9cf3 ++2010-04-19T04:18:21.741415Z ++21016 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1029 ++ +diff --git a/feeds/packages/lang/perl-www-mechanize/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-www-mechanize/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a1ad32f +--- /dev/null ++++ b/feeds/packages/lang/perl-www-mechanize/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=perl-www-mechanize ++PKG_VERSION:=1.58 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ ++PKG_MD5SUM:=c928d1bf3218bfe0c0d99096cf34db52 ++ ++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/feeds/packages/lang/perl-www-mechanize/Makefile b/feeds/packages/lang/perl-www-mechanize/Makefile +new file mode 100644 +index 0000000..a1ad32f +--- /dev/null ++++ b/feeds/packages/lang/perl-www-mechanize/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=perl-www-mechanize ++PKG_VERSION:=1.58 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ ++PKG_MD5SUM:=c928d1bf3218bfe0c0d99096cf34db52 ++ ++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/feeds/packages/lang/perl-www/.svn/entries b/feeds/packages/lang/perl-www/.svn/entries +new file mode 100644 +index 0000000..965fdd9 +--- /dev/null ++++ b/feeds/packages/lang/perl-www/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl-www ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-21T01:08:09.745613Z ++18867 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++a11c62b7db6b7454e76e818fcb9950c8 ++2009-12-21T01:08:09.745613Z ++18867 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++840 ++ +diff --git a/feeds/packages/lang/perl-www/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl-www/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ca8b431 +--- /dev/null ++++ b/feeds/packages/lang/perl-www/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-www ++PKG_VERSION:=5.812 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=86c6121170efe55fc0d33cdc967561bc ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS ++PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz ++ ++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-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/feeds/packages/lang/perl-www/Makefile b/feeds/packages/lang/perl-www/Makefile +new file mode 100644 +index 0000000..ca8b431 +--- /dev/null ++++ b/feeds/packages/lang/perl-www/Makefile +@@ -0,0 +1,39 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=perl-www ++PKG_VERSION:=5.812 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=86c6121170efe55fc0d33cdc967561bc ++ ++PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS ++PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz ++ ++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-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/feeds/packages/lang/perl/.svn/entries b/feeds/packages/lang/perl/.svn/entries +new file mode 100644 +index 0000000..70fb86b +--- /dev/null ++++ b/feeds/packages/lang/perl/.svn/entries +@@ -0,0 +1,136 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-17T15:20:19.889362Z ++35197 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++perlbase.mk ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++d591aa7afffb6d7f4ada8d920c87df6d ++2013-01-17T15:20:19.889362Z ++35197 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++32830 ++ ++patches ++dir ++ ++perlmod.mk ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++78d24afb811af0fcc2e4bb620603ba35 ++2008-07-03T02:32:44.836937Z ++11626 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1302 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++c31b60a772a7fa0fefa056586695765e ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5506 ++ +diff --git a/feeds/packages/lang/perl/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/perl/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/lang/perl/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/perl/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/perl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bbdc55d +--- /dev/null ++++ b/feeds/packages/lang/perl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,203 @@ ++# ++# 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:=perl ++PKG_VERSION:=5.10.0 ++PKG_RELEASE:=7 ++PKG_MD5SUM:=d2c39b002ebfd2c3c5dba589365c5a71 ++ ++PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ ++ ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \ ++ ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \ ++ ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++PKG_LICENSE:=GPLv1 ARTISTIC ++PKG_LICENSE_FILES:=Copying Artisitc README ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++EXTRA_LIBS:=bsd ++EXTRA_LIBDIRS:=$(STAGING_DIR)/lib ++endif ++ ++define Package/perl/Default ++ SUBMENU:=Perl ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=The Perl intepreter ++ URL:=http://www.perl.com/ ++ DEPENDS:=+USE_EGLIBC:libbsd ++endef ++ ++define Package/microperl ++$(call Package/perl/Default) ++ TITLE+=(minimal version) ++endef ++ ++define Package/microperl/description ++ A perl package without operating-specific functions such as readdir. ++endef ++ ++define Build/Template ++ ++$(STAMP_CONFIGURED)-$(1): $(STAMP_PREPARED) ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/$(1)/Configure) ++ touch $$@ ++ ++$(STAMP_BUILT)-$(1): $(STAMP_CONFIGURED)-$(1) ++ $(call Build/$(1)/Compile) ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(1) ++ ++endef ++ ++define Build/microperl/Configure ++endef ++ ++define Build/microperl/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.micro \ ++ CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" ++ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/microperl $(PKG_INSTALL_DIR)/usr/bin/ ++endef ++ ++define Package/microperl/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/microperl $(1)/usr/bin/ ++endef ++ ++include perlmod.mk ++ ++define Package/perl ++$(call Package/perl/Default) ++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 Build/perl/Configure ++ @echo ++ @echo "===> Stage 1: Configure host perl" ++ @echo ++ mkdir -p $(PKG_BUILD_DIR)/host-perl ++ (cd $(PKG_BUILD_DIR)/host-perl && sh ../Configure -der -Dmksymlinks -Uusedl -Dotherlibdirs=$(PERL_LIB)) ++ ++ @echo ++ @echo "===> Stage 2: Build host perl binary with static extensions" ++ @echo ++ $(MAKE) -C $(PKG_BUILD_DIR)/host-perl ++ ++ @echo ++ @echo "===> Stage 3: Configure target perl" ++ @echo ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ sed \ ++ -e 's!%%CC%%!$(TARGET_CC)!g' \ ++ -e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE $(TARGET_CPPFLAGS)!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' \ ++ files/config.sh-$(patsubst i386,i486,$(ARCH)).in \ ++ > $(PKG_BUILD_DIR)/config.sh ++ (cd $(PKG_BUILD_DIR) && ./Configure -S) ++endef ++ ++define Build/perl/Compile ++ @echo ++ @echo "===> Stage 4: Build target miniperl binary" ++ @echo ++ install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h ++ -rm -f $(PKG_BUILD_DIR)/miniperl ++ $(MAKE) -C $(PKG_BUILD_DIR) miniperl ++ mkdir -p $(PKG_BUILD_DIR)/target-bin ++ install -m 0755 $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/target-bin/ ++ ++ @echo ++ @echo "===> Stage 5: Build target perl binary" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/perl ++ install -m 0755 $(PKG_BUILD_DIR)/host-perl/miniperl $(PKG_BUILD_DIR)/ ++ touch $(PKG_BUILD_DIR)/miniperl ++ $(MAKE) -C $(PKG_BUILD_DIR) perl ++ install -m 0755 $(PKG_BUILD_DIR)/perl $(PKG_BUILD_DIR)/target-bin/ ++ ++ @echo ++ @echo "===> Stage 6: Build target extensions and utils" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/perl ++ install -m 0755 $(PKG_BUILD_DIR)/host-perl/miniperl $(PKG_BUILD_DIR)/ ++ ln -sf miniperl $(PKG_BUILD_DIR)/perl ++ touch $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/perl ++ $(MAKE) -C $(PKG_BUILD_DIR) ++ ++ @echo ++ @echo "===> Stage 7: Install Perl into staging dir" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/perl ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/host-perl/perl $(PKG_BUILD_DIR)/ ++ (cd $(PKG_BUILD_DIR) && ./perl installperl --destdir=$(STAGING_DIR)) ++ ++ @echo ++ @echo "===> Stage 8: Install Perl into a temporary root" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/perl ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/target-bin/perl $(PKG_BUILD_DIR) ++ -rm -rf $(PKG_INSTALL_DIR) ++ mkdir -p $(PKG_INSTALL_DIR) ++ (cd $(PKG_BUILD_DIR) && host-perl/miniperl installperl --destdir=$(PKG_INSTALL_DIR)) ++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 ++endef ++ ++ifneq ($(CONFIG_PACKAGE_microperl),) ++define Build/microperl ++ $(call Build/Template,microperl) ++endef ++endif ++$(eval $(Build/microperl)) ++ ++ifneq ($(CONFIG_PACKAGE_perl),) ++define Build/perl ++ $(call Build/Template,perl) ++endef ++endif ++$(eval $(Build/perl)) ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++$(eval $(call RequireCommand,rsync, \ ++ $(PKG_NAME) requires rsync installed on the host-system. \ ++)) ++ ++$(eval $(call BuildPackage,microperl)) ++$(eval $(call BuildPackage,perl)) ++ ++-include perlbase.mk +diff --git a/feeds/packages/lang/perl/.svn/text-base/perlbase.mk.svn-base b/feeds/packages/lang/perl/.svn/text-base/perlbase.mk.svn-base +new file mode 100644 +index 0000000..b6f5f78 +--- /dev/null ++++ b/feeds/packages/lang/perl/.svn/text-base/perlbase.mk.svn-base +@@ -0,0 +1,1643 @@ ++define Package/perlbase-template ++SUBMENU:=Perl ++SECTION:=lang ++CATEGORY:=Languages ++URL:=http://www.cpan.org/ ++DEPENDS:=perl ++endef ++ ++define Package/perlbase-abbrev ++$(call Package/perlbase-template) ++TITLE:=abbrev perl module ++endef ++ ++define Package/perlbase-abbrev/install ++$(call perlmod/Install,$(1),abbrev.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-abbrev)) ++ ++ ++define Package/perlbase-anydbm-file ++$(call Package/perlbase-template) ++TITLE:=AnyDBM_File perl module ++endef ++ ++define Package/perlbase-anydbm-file/install ++$(call perlmod/Install,$(1),AnyDBM_File.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-anydbm-file)) ++ ++ ++define Package/perlbase-archive ++$(call Package/perlbase-template) ++TITLE:=Archive perl module ++endef ++ ++define Package/perlbase-archive/install ++$(call perlmod/Install,$(1),Archive,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-archive)) ++ ++ ++define Package/perlbase-assert ++$(call Package/perlbase-template) ++TITLE:=assert perl module ++endef ++ ++define Package/perlbase-assert/install ++$(call perlmod/Install,$(1),assert.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-assert)) ++ ++ ++define Package/perlbase-attribute ++$(call Package/perlbase-template) ++TITLE:=Attribute perl module ++endef ++ ++define Package/perlbase-attribute/install ++$(call perlmod/Install,$(1),Attribute,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-attribute)) ++ ++ ++define Package/perlbase-attributes ++$(call Package/perlbase-template) ++TITLE:=attributes perl module ++endef ++ ++define Package/perlbase-attributes/install ++$(call perlmod/Install,$(1),attributes.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-attributes)) ++ ++ ++define Package/perlbase-attrs ++$(call Package/perlbase-template) ++TITLE:=attrs perl module ++endef ++ ++define Package/perlbase-attrs/install ++$(call perlmod/Install,$(1),attrs.pm auto/attrs,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-attrs)) ++ ++ ++define Package/perlbase-autoloader ++$(call Package/perlbase-template) ++TITLE:=AutoLoader perl module ++endef ++ ++define Package/perlbase-autoloader/install ++$(call perlmod/Install,$(1),AutoLoader.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-autoloader)) ++ ++ ++define Package/perlbase-autosplit ++$(call Package/perlbase-template) ++TITLE:=AutoSplit perl module ++endef ++ ++define Package/perlbase-autosplit/install ++$(call perlmod/Install,$(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,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-autouse)) ++ ++ ++define Package/perlbase-b ++$(call Package/perlbase-template) ++TITLE:=B perl module ++endef ++ ++define Package/perlbase-b/install ++$(call perlmod/Install,$(1),B B.pm auto/B,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-b)) ++ ++ ++define Package/perlbase-base ++$(call Package/perlbase-template) ++TITLE:=base perl module ++endef ++ ++define Package/perlbase-base/install ++$(call perlmod/Install,$(1),base.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-base)) ++ ++ ++define Package/perlbase-benchmark ++$(call Package/perlbase-template) ++TITLE:=Benchmark perl module ++endef ++ ++define Package/perlbase-benchmark/install ++$(call perlmod/Install,$(1),Benchmark.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-benchmark)) ++ ++ ++define Package/perlbase-bigfloat ++$(call Package/perlbase-template) ++TITLE:=bigfloat perl module ++endef ++ ++define Package/perlbase-bigfloat/install ++$(call perlmod/Install,$(1),bigfloat.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bigfloat)) ++ ++ ++define Package/perlbase-bigint ++$(call Package/perlbase-template) ++TITLE:=bigint perl module ++endef ++ ++define Package/perlbase-bigint/install ++$(call perlmod/Install,$(1),bigint.pl bigint.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bigint)) ++ ++ ++define Package/perlbase-bignum ++$(call Package/perlbase-template) ++TITLE:=bignum perl module ++endef ++ ++define Package/perlbase-bignum/install ++$(call perlmod/Install,$(1),bignum.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bignum)) ++ ++ ++define Package/perlbase-bigrat ++$(call Package/perlbase-template) ++TITLE:=bigrat perl module ++endef ++ ++define Package/perlbase-bigrat/install ++$(call perlmod/Install,$(1),bigrat.pl bigrat.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bigrat)) ++ ++ ++define Package/perlbase-blib ++$(call Package/perlbase-template) ++TITLE:=blib perl module ++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-cacheout ++$(call Package/perlbase-template) ++TITLE:=cacheout perl module ++endef ++ ++define Package/perlbase-cacheout/install ++$(call perlmod/Install,$(1),cacheout.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cacheout)) ++ ++ ++define Package/perlbase-cgi ++$(call Package/perlbase-template) ++TITLE:=CGI perl module ++endef ++ ++define Package/perlbase-cgi/install ++$(call perlmod/Install,$(1),CGI CGI.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cgi)) ++ ++ ++define Package/perlbase-charnames ++$(call Package/perlbase-template) ++TITLE:=charnames perl module ++endef ++ ++define Package/perlbase-charnames/install ++$(call perlmod/Install,$(1),charnames.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-charnames)) ++ ++ ++define Package/perlbase-class ++$(call Package/perlbase-template) ++TITLE:=Class perl module ++endef ++ ++define Package/perlbase-class/install ++$(call perlmod/Install,$(1),Class,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-class)) ++ ++ ++define Package/perlbase-complete ++$(call Package/perlbase-template) ++TITLE:=complete perl module ++endef ++ ++define Package/perlbase-complete/install ++$(call perlmod/Install,$(1),complete.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-complete)) ++ ++ ++define Package/perlbase-compress ++$(call Package/perlbase-template) ++TITLE:=Compress perl module ++endef ++ ++define Package/perlbase-compress/install ++$(call perlmod/Install,$(1),Compress auto/Compress,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-compress)) ++ ++ ++define Package/perlbase-config ++$(call Package/perlbase-template) ++TITLE:=Config perl module ++endef ++ ++define Package/perlbase-config/install ++$(call perlmod/Install,$(1),Config Config.pm Config_heavy.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-config)) ++ ++ ++define Package/perlbase-cpan ++$(call Package/perlbase-template) ++TITLE:=CPAN perl module ++endef ++ ++define Package/perlbase-cpan/install ++$(call perlmod/Install,$(1),CPAN CPAN.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cpan)) ++ ++ ++define Package/perlbase-cpanplus ++$(call Package/perlbase-template) ++TITLE:=CPANPLUS perl module ++endef ++ ++define Package/perlbase-cpanplus/install ++$(call perlmod/Install,$(1),CPANPLUS CPANPLUS.pm,CPANPLUS/FAQ.pod CPANPLUS/Hacking.pod CPANPLUS/Shell/Default/Plugins/HOWTO.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cpanplus)) ++ ++ ++define Package/perlbase-ctime ++$(call Package/perlbase-template) ++TITLE:=ctime perl module ++endef ++ ++define Package/perlbase-ctime/install ++$(call perlmod/Install,$(1),ctime.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-ctime)) ++ ++ ++define Package/perlbase-cwd ++$(call Package/perlbase-template) ++TITLE:=Cwd perl module ++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 ++endef ++ ++define Package/perlbase-data/install ++$(call perlmod/Install,$(1),Data auto/Data,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-data)) ++ ++ ++define Package/perlbase-db ++$(call Package/perlbase-template) ++TITLE:=DB perl module ++DEPENDS+= +libdb47 ++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 ++endef ++ ++define Package/perlbase-db-file/install ++$(call perlmod/Install,$(1),DB_File.pm auto/DB_File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-db-file)) ++ ++ ++define Package/perlbase-dbm-filter ++$(call Package/perlbase-template) ++TITLE:=DBM_Filter perl module ++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 ++endef ++ ++define Package/perlbase-devel/install ++$(call perlmod/Install,$(1),Devel auto/Devel,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-devel)) ++ ++ ++define Package/perlbase-diagnostics ++$(call Package/perlbase-template) ++TITLE:=diagnostics perl module ++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 ++endef ++ ++define Package/perlbase-digest/install ++$(call perlmod/Install,$(1),Digest Digest.pm auto/Digest,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-digest)) ++ ++ ++define Package/perlbase-dirhandle ++$(call Package/perlbase-template) ++TITLE:=DirHandle perl module ++endef ++ ++define Package/perlbase-dirhandle/install ++$(call perlmod/Install,$(1),DirHandle.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-dirhandle)) ++ ++ ++define Package/perlbase-dotsh ++$(call Package/perlbase-template) ++TITLE:=dotsh perl module ++endef ++ ++define Package/perlbase-dotsh/install ++$(call perlmod/Install,$(1),dotsh.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-dotsh)) ++ ++ ++define Package/perlbase-dumpvalue ++$(call Package/perlbase-template) ++TITLE:=Dumpvalue perl module ++endef ++ ++define Package/perlbase-dumpvalue/install ++$(call perlmod/Install,$(1),Dumpvalue.pm,) ++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 ++endef ++ ++define Package/perlbase-dynaloader/install ++$(call perlmod/Install,$(1),DynaLoader.pm auto/DynaLoader,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-dynaloader)) ++ ++ ++define Package/perlbase-encode ++$(call Package/perlbase-template) ++TITLE:=Encode perl module ++endef ++ ++define Package/perlbase-encode/install ++$(call perlmod/Install,$(1),Encode Encode.pm auto/Encode,Encode/PerlIO.pod Encode/Supported.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-encode)) ++ ++ ++define Package/perlbase-encoding ++$(call Package/perlbase-template) ++TITLE:=encoding perl module ++endef ++ ++define Package/perlbase-encoding/install ++$(call perlmod/Install,$(1),encoding encoding.pm,) ++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 ++endef ++ ++define Package/perlbase-env/install ++$(call perlmod/Install,$(1),Env.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-env)) ++ ++ ++define Package/perlbase-errno ++$(call Package/perlbase-template) ++TITLE:=Errno perl module ++endef ++ ++define Package/perlbase-errno/install ++$(call perlmod/Install,$(1),Errno.pm,) ++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 lib.pm locale.pm overload.pm strict.pm subs.pm vars.pm warnings warnings.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-essential)) ++ ++ ++define Package/perlbase-exceptions ++$(call Package/perlbase-template) ++TITLE:=exceptions perl module ++endef ++ ++define Package/perlbase-exceptions/install ++$(call perlmod/Install,$(1),exceptions.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-exceptions)) ++ ++ ++define Package/perlbase-extutils ++$(call Package/perlbase-template) ++TITLE:=ExtUtils perl module ++endef ++ ++define Package/perlbase-extutils/install ++$(call perlmod/Install,$(1),ExtUtils,ExtUtils/MakeMaker/FAQ.pod ExtUtils/MakeMaker/Tutorial.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-extutils)) ++ ++ ++define Package/perlbase-fastcwd ++$(call Package/perlbase-template) ++TITLE:=fastcwd perl module ++endef ++ ++define Package/perlbase-fastcwd/install ++$(call perlmod/Install,$(1),fastcwd.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-fastcwd)) ++ ++ ++define Package/perlbase-fatal ++$(call Package/perlbase-template) ++TITLE:=Fatal perl module ++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 ++endef ++ ++define Package/perlbase-fcntl/install ++$(call perlmod/Install,$(1),Fcntl.pm auto/Fcntl,) ++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 ++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 ++endef ++ ++define Package/perlbase-file/install ++$(call perlmod/Install,$(1),File auto/File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-file)) ++ ++ ++define Package/perlbase-filecache ++$(call Package/perlbase-template) ++TITLE:=FileCache perl module ++endef ++ ++define Package/perlbase-filecache/install ++$(call perlmod/Install,$(1),FileCache.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-filecache)) ++ ++ ++define Package/perlbase-filehandle ++$(call Package/perlbase-template) ++TITLE:=FileHandle perl module ++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 ++endef ++ ++define Package/perlbase-filter/install ++$(call perlmod/Install,$(1),Filter auto/Filter,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-filter)) ++ ++ ++define Package/perlbase-find ++$(call Package/perlbase-template) ++TITLE:=find perl module ++endef ++ ++define Package/perlbase-find/install ++$(call perlmod/Install,$(1),find.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-find)) ++ ++ ++define Package/perlbase-findbin ++$(call Package/perlbase-template) ++TITLE:=FindBin perl module ++endef ++ ++define Package/perlbase-findbin/install ++$(call perlmod/Install,$(1),FindBin.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-findbin)) ++ ++ ++define Package/perlbase-finddepth ++$(call Package/perlbase-template) ++TITLE:=finddepth perl module ++endef ++ ++define Package/perlbase-finddepth/install ++$(call perlmod/Install,$(1),finddepth.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-finddepth)) ++ ++ ++define Package/perlbase-flush ++$(call Package/perlbase-template) ++TITLE:=flush perl module ++endef ++ ++define Package/perlbase-flush/install ++$(call perlmod/Install,$(1),flush.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-flush)) ++ ++ ++define Package/perlbase-gdbm-file ++$(call Package/perlbase-template) ++TITLE:=GDBM_File perl module ++DEPENDS+= +libgdbm ++endef ++ ++define Package/perlbase-gdbm-file/install ++$(call perlmod/Install,$(1),GDBM_File.pm auto/GDBM_File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-gdbm-file)) ++ ++ ++define Package/perlbase-getcwd ++$(call Package/perlbase-template) ++TITLE:=getcwd perl module ++endef ++ ++define Package/perlbase-getcwd/install ++$(call perlmod/Install,$(1),getcwd.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-getcwd)) ++ ++ ++define Package/perlbase-getopt ++$(call Package/perlbase-template) ++TITLE:=Getopt perl module ++endef ++ ++define Package/perlbase-getopt/install ++$(call perlmod/Install,$(1),Getopt newgetopt.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-getopt)) ++ ++ ++define Package/perlbase-getoptpl ++$(call Package/perlbase-template) ++TITLE:=getoptpl perl module ++endef ++ ++define Package/perlbase-getoptpl/install ++$(call perlmod/Install,$(1),getopt.pl getopts.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-getoptpl)) ++ ++ ++define Package/perlbase-hash ++$(call Package/perlbase-template) ++TITLE:=Hash perl module ++endef ++ ++define Package/perlbase-hash/install ++$(call perlmod/Install,$(1),Hash auto/Hash,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-hash)) ++ ++ ++define Package/perlbase-hostname ++$(call Package/perlbase-template) ++TITLE:=hostname perl module ++endef ++ ++define Package/perlbase-hostname/install ++$(call perlmod/Install,$(1),hostname.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-hostname)) ++ ++ ++define Package/perlbase-i18n ++$(call Package/perlbase-template) ++TITLE:=I18N perl module ++endef ++ ++define Package/perlbase-i18n/install ++$(call perlmod/Install,$(1),I18N auto/I18N,) ++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,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-if)) ++ ++ ++define Package/perlbase-importenv ++$(call Package/perlbase-template) ++TITLE:=importenv perl module ++endef ++ ++define Package/perlbase-importenv/install ++$(call perlmod/Install,$(1),importenv.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-importenv)) ++ ++ ++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 ++endef ++ ++define Package/perlbase-io/install ++$(call perlmod/Install,$(1),IO IO.pm auto/IO,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-io)) ++ ++ ++define Package/perlbase-ipc ++$(call Package/perlbase-template) ++TITLE:=IPC perl module ++endef ++ ++define Package/perlbase-ipc/install ++$(call perlmod/Install,$(1),IPC auto/IPC,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-ipc)) ++ ++ ++define Package/perlbase-less ++$(call Package/perlbase-template) ++TITLE:=less perl module ++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 ++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 ++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) ++endef ++ ++$(eval $(call BuildPackage,perlbase-locale)) ++ ++ ++define Package/perlbase-log ++$(call Package/perlbase-template) ++TITLE:=Log perl module ++endef ++ ++define Package/perlbase-log/install ++$(call perlmod/Install,$(1),Log,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-log)) ++ ++ ++define Package/perlbase-look ++$(call Package/perlbase-template) ++TITLE:=look perl module ++endef ++ ++define Package/perlbase-look/install ++$(call perlmod/Install,$(1),look.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-look)) ++ ++ ++define Package/perlbase-math ++$(call Package/perlbase-template) ++TITLE:=Math perl module ++endef ++ ++define Package/perlbase-math/install ++$(call perlmod/Install,$(1),Math auto/Math,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-math)) ++ ++ ++define Package/perlbase-memoize ++$(call Package/perlbase-template) ++TITLE:=Memoize perl module ++endef ++ ++define Package/perlbase-memoize/install ++$(call perlmod/Install,$(1),Memoize Memoize.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-memoize)) ++ ++ ++define Package/perlbase-mime ++$(call Package/perlbase-template) ++TITLE:=MIME perl module ++endef ++ ++define Package/perlbase-mime/install ++$(call perlmod/Install,$(1),MIME auto/MIME,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-mime)) ++ ++ ++define Package/perlbase-module ++$(call Package/perlbase-template) ++TITLE:=Module perl module ++endef ++ ++define Package/perlbase-module/install ++$(call perlmod/Install,$(1),Module,Module/Build/API.pod Module/Build/Authoring.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-module)) ++ ++ ++define Package/perlbase-mro ++$(call Package/perlbase-template) ++TITLE:=mro perl module ++endef ++ ++define Package/perlbase-mro/install ++$(call perlmod/Install,$(1),mro.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-mro)) ++ ++ ++define Package/perlbase-net ++$(call Package/perlbase-template) ++TITLE:=Net perl module ++endef ++ ++define Package/perlbase-net/install ++$(call perlmod/Install,$(1),Net,Net/libnetFAQ.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-net)) ++ ++ ++define Package/perlbase-next ++$(call Package/perlbase-template) ++TITLE:=NEXT perl module ++endef ++ ++define Package/perlbase-next/install ++$(call perlmod/Install,$(1),NEXT.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-next)) ++ ++ ++define Package/perlbase-o ++$(call Package/perlbase-template) ++TITLE:=O perl module ++endef ++ ++define Package/perlbase-o/install ++$(call perlmod/Install,$(1),O.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-o)) ++ ++ ++define Package/perlbase-object ++$(call Package/perlbase-template) ++TITLE:=Object perl module ++endef ++ ++define Package/perlbase-object/install ++$(call perlmod/Install,$(1),Object,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-object)) ++ ++ ++define Package/perlbase-opcode ++$(call Package/perlbase-template) ++TITLE:=Opcode perl module ++endef ++ ++define Package/perlbase-opcode/install ++$(call perlmod/Install,$(1),Opcode.pm auto/Opcode,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-opcode)) ++ ++ ++define Package/perlbase-open ++$(call Package/perlbase-template) ++TITLE:=open perl module ++endef ++ ++define Package/perlbase-open/install ++$(call perlmod/Install,$(1),open.pm open2.pl open3.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-open)) ++ ++ ++define Package/perlbase-ops ++$(call Package/perlbase-template) ++TITLE:=ops perl module ++endef ++ ++define Package/perlbase-ops/install ++$(call perlmod/Install,$(1),ops.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-ops)) ++ ++ ++define Package/perlbase-package ++$(call Package/perlbase-template) ++TITLE:=Package perl module ++endef ++ ++define Package/perlbase-package/install ++$(call perlmod/Install,$(1),Package,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-package)) ++ ++ ++define Package/perlbase-params ++$(call Package/perlbase-template) ++TITLE:=Params perl module ++endef ++ ++define Package/perlbase-params/install ++$(call perlmod/Install,$(1),Params,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-params)) ++ ++ ++define Package/perlbase-perl5db ++$(call Package/perlbase-template) ++TITLE:=perl5db perl module ++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 ++endef ++ ++define Package/perlbase-perlio/install ++$(call perlmod/Install,$(1),PerlIO PerlIO.pm auto/PerlIO,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-perlio)) ++ ++define Package/perlbase-pod ++$(call Package/perlbase-template) ++TITLE:=Pod perl module ++endef ++ ++define Package/perlbase-pod/install ++$(call perlmod/Install,$(1),Pod,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-pod)) ++ ++ ++define Package/perlbase-posix ++$(call Package/perlbase-template) ++TITLE:=POSIX perl module ++endef ++ ++define Package/perlbase-posix/install ++$(call perlmod/Install,$(1),POSIX.pm auto/POSIX,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-posix)) ++ ++ ++define Package/perlbase-pwd ++$(call Package/perlbase-template) ++TITLE:=pwd perl module ++endef ++ ++define Package/perlbase-pwd/install ++$(call perlmod/Install,$(1),pwd.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-pwd)) ++ ++ ++define Package/perlbase-re ++$(call Package/perlbase-template) ++TITLE:=re perl module ++endef ++ ++define Package/perlbase-re/install ++$(call perlmod/Install,$(1),auto/re re.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-re)) ++ ++ ++define Package/perlbase-safe ++$(call Package/perlbase-template) ++TITLE:=Safe perl module ++endef ++ ++define Package/perlbase-safe/install ++$(call perlmod/Install,$(1),Safe.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-safe)) ++ ++ ++define Package/perlbase-scalar ++$(call Package/perlbase-template) ++TITLE:=Scalar perl module ++endef ++ ++define Package/perlbase-scalar/install ++$(call perlmod/Install,$(1),Scalar,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-scalar)) ++ ++ ++define Package/perlbase-sdbm-file ++$(call Package/perlbase-template) ++TITLE:=SDBM_File perl module ++endef ++ ++define Package/perlbase-sdbm-file/install ++$(call perlmod/Install,$(1),SDBM_File.pm auto/SDBM_File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-sdbm-file)) ++ ++ ++define Package/perlbase-search ++$(call Package/perlbase-template) ++TITLE:=Search perl module ++endef ++ ++define Package/perlbase-search/install ++$(call perlmod/Install,$(1),Search,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-search)) ++ ++ ++define Package/perlbase-selectsaver ++$(call Package/perlbase-template) ++TITLE:=SelectSaver perl module ++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 ++endef ++ ++define Package/perlbase-selfloader/install ++$(call perlmod/Install,$(1),SelfLoader.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-selfloader)) ++ ++ ++define Package/perlbase-shell ++$(call Package/perlbase-template) ++TITLE:=Shell perl module ++endef ++ ++define Package/perlbase-shell/install ++$(call perlmod/Install,$(1),Shell.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-shell)) ++ ++ ++define Package/perlbase-shellwords ++$(call Package/perlbase-template) ++TITLE:=shellwords perl module ++endef ++ ++define Package/perlbase-shellwords/install ++$(call perlmod/Install,$(1),shellwords.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-shellwords)) ++ ++ ++define Package/perlbase-sigtrap ++$(call Package/perlbase-template) ++TITLE:=sigtrap perl module ++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 ++endef ++ ++define Package/perlbase-socket/install ++$(call perlmod/Install,$(1),Socket.pm auto/Socket,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-socket)) ++ ++ ++define Package/perlbase-sort ++$(call Package/perlbase-template) ++TITLE:=sort perl module ++endef ++ ++define Package/perlbase-sort/install ++$(call perlmod/Install,$(1),sort.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-sort)) ++ ++ ++define Package/perlbase-stat ++$(call Package/perlbase-template) ++TITLE:=stat perl module ++endef ++ ++define Package/perlbase-stat/install ++$(call perlmod/Install,$(1),stat.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-stat)) ++ ++ ++define Package/perlbase-storable ++$(call Package/perlbase-template) ++TITLE:=Storable perl module ++endef ++ ++define Package/perlbase-storable/install ++$(call perlmod/Install,$(1),Storable.pm auto/Storable,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-storable)) ++ ++ ++define Package/perlbase-switch ++$(call Package/perlbase-template) ++TITLE:=Switch perl module ++endef ++ ++define Package/perlbase-switch/install ++$(call perlmod/Install,$(1),Switch.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-switch)) ++ ++ ++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 ++endef ++ ++define Package/perlbase-sys/install ++$(call perlmod/Install,$(1),Sys auto/Sys,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-sys)) ++ ++ ++define Package/perlbase-syslog ++$(call Package/perlbase-template) ++TITLE:=syslog perl module ++endef ++ ++define Package/perlbase-syslog/install ++$(call perlmod/Install,$(1),syslog.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-syslog)) ++ ++ ++define Package/perlbase-tainted ++$(call Package/perlbase-template) ++TITLE:=tainted perl module ++endef ++ ++define Package/perlbase-tainted/install ++$(call perlmod/Install,$(1),tainted.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-tainted)) ++ ++ ++define Package/perlbase-term ++$(call Package/perlbase-template) ++TITLE:=Term perl module ++endef ++ ++define Package/perlbase-term/install ++$(call perlmod/Install,$(1),Term,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-term)) ++ ++ ++define Package/perlbase-termcap ++$(call Package/perlbase-template) ++TITLE:=termcap perl module ++endef ++ ++define Package/perlbase-termcap/install ++$(call perlmod/Install,$(1),termcap.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-termcap)) ++ ++ ++define Package/perlbase-test ++$(call Package/perlbase-template) ++TITLE:=Test perl module ++endef ++ ++define Package/perlbase-test/install ++$(call perlmod/Install,$(1),Test Test.pm,Test/Harness/TAP.pod Test/Tutorial.pod) ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prove $(1)/usr/bin ++ $(call perlmod/Install,$(1),Test Test.pm,Test/Harness/TAP.pod Test/Tutorial.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-test)) ++ ++ ++define Package/perlbase-text ++$(call Package/perlbase-template) ++TITLE:=Text perl module ++endef ++ ++define Package/perlbase-text/install ++$(call perlmod/Install,$(1),Text auto/Text,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-text)) ++ ++ ++define Package/perlbase-thread ++$(call Package/perlbase-template) ++TITLE:=Thread perl module ++endef ++ ++define Package/perlbase-thread/install ++$(call perlmod/Install,$(1),Thread Thread.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-thread)) ++ ++ ++define Package/perlbase-threads ++$(call Package/perlbase-template) ++TITLE:=threads perl module ++endef ++ ++define Package/perlbase-threads/install ++$(call perlmod/Install,$(1),auto/threads threads threads.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-threads)) ++ ++ ++define Package/perlbase-tie ++$(call Package/perlbase-template) ++TITLE:=Tie perl module ++endef ++ ++define Package/perlbase-tie/install ++$(call perlmod/Install,$(1),Tie,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-tie)) ++ ++ ++define Package/perlbase-time ++$(call Package/perlbase-template) ++TITLE:=Time perl module ++endef ++ ++define Package/perlbase-time/install ++$(call perlmod/Install,$(1),Time auto/Time,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-time)) ++ ++ ++define Package/perlbase-timelocal ++$(call Package/perlbase-template) ++TITLE:=timelocal perl module ++endef ++ ++define Package/perlbase-timelocal/install ++$(call perlmod/Install,$(1),timelocal.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-timelocal)) ++ ++ ++define Package/perlbase-unicode ++$(call Package/perlbase-template) ++TITLE:=Unicode perl module ++endef ++ ++define Package/perlbase-unicode/install ++$(call perlmod/Install,$(1),Unicode auto/Unicode,) ++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 ++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 ++endef ++ ++define Package/perlbase-utf8/install ++$(call perlmod/Install,$(1),utf8.pm utf8_heavy.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-utf8)) ++ ++ ++define Package/perlbase-validate ++$(call Package/perlbase-template) ++TITLE:=validate perl module ++endef ++ ++define Package/perlbase-validate/install ++$(call perlmod/Install,$(1),validate.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-validate)) ++ ++ ++define Package/perlbase-version ++$(call Package/perlbase-template) ++TITLE:=version perl module ++endef ++ ++define Package/perlbase-version/install ++$(call perlmod/Install,$(1),version.pm,) ++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,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-xsloader)) +diff --git a/feeds/packages/lang/perl/.svn/text-base/perlmod.mk.svn-base b/feeds/packages/lang/perl/.svn/text-base/perlmod.mk.svn-base +new file mode 100644 +index 0000000..157b0f3 +--- /dev/null ++++ b/feeds/packages/lang/perl/.svn/text-base/perlmod.mk.svn-base +@@ -0,0 +1,53 @@ ++# This makefile simplifies perl module builds. ++# ++ ++# Build environment ++PERL_CMD := $(STAGING_DIR)/usr/bin/perl ++PERL_LIB := $(STAGING_DIR)/usr/lib/perl5/5.10 ++ ++# Module install prefix ++PERL_SITELIB := /usr/lib/perl5/5.10 ++ ++define perlmod/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ PERL5LIB=$(PERL_LIB) \ ++ PERL_MM_USE_DEFAULT=1 \ ++ $(2) \ ++ $(PERL_CMD) Makefile.PL \ ++ $(1) \ ++ PERL_LIB=$(PERL_LIB) \ ++ PERL_ARCHLIB=$(PERL_LIB) \ ++ INSTALLSITELIB=$(PERL_SITELIB) \ ++ INSTALLSITEARCH=$(PERL_SITELIB) \ ++ DESTDIR=$(PKG_INSTALL_DIR) \ ++ ); ++endef ++ ++define perlmod/Compile ++ PERL5LIB=$(PERL_LIB) \ ++ $(2) \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(1) \ ++ install ++endef ++ ++define perlmod/Install ++ $(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) ++ ++ @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\)/,/^=cut/d' \ ++ -e '/^=\(head\|pod\|item\|over\|back\)/,$$$$d' \ ++ -e '/^#$$$$/d' \ ++ -e '/^#[^!"'"'"']/d' ++endef +diff --git a/feeds/packages/lang/perl/Makefile b/feeds/packages/lang/perl/Makefile +new file mode 100644 +index 0000000..bbdc55d +--- /dev/null ++++ b/feeds/packages/lang/perl/Makefile +@@ -0,0 +1,203 @@ ++# ++# 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:=perl ++PKG_VERSION:=5.10.0 ++PKG_RELEASE:=7 ++PKG_MD5SUM:=d2c39b002ebfd2c3c5dba589365c5a71 ++ ++PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ ++ ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0 \ ++ ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \ ++ ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++PKG_LICENSE:=GPLv1 ARTISTIC ++PKG_LICENSE_FILES:=Copying Artisitc README ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++EXTRA_LIBS:=bsd ++EXTRA_LIBDIRS:=$(STAGING_DIR)/lib ++endif ++ ++define Package/perl/Default ++ SUBMENU:=Perl ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=The Perl intepreter ++ URL:=http://www.perl.com/ ++ DEPENDS:=+USE_EGLIBC:libbsd ++endef ++ ++define Package/microperl ++$(call Package/perl/Default) ++ TITLE+=(minimal version) ++endef ++ ++define Package/microperl/description ++ A perl package without operating-specific functions such as readdir. ++endef ++ ++define Build/Template ++ ++$(STAMP_CONFIGURED)-$(1): $(STAMP_PREPARED) ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/$(1)/Configure) ++ touch $$@ ++ ++$(STAMP_BUILT)-$(1): $(STAMP_CONFIGURED)-$(1) ++ $(call Build/$(1)/Compile) ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(1) ++ ++endef ++ ++define Build/microperl/Configure ++endef ++ ++define Build/microperl/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.micro \ ++ CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" ++ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/microperl $(PKG_INSTALL_DIR)/usr/bin/ ++endef ++ ++define Package/microperl/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/microperl $(1)/usr/bin/ ++endef ++ ++include perlmod.mk ++ ++define Package/perl ++$(call Package/perl/Default) ++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 Build/perl/Configure ++ @echo ++ @echo "===> Stage 1: Configure host perl" ++ @echo ++ mkdir -p $(PKG_BUILD_DIR)/host-perl ++ (cd $(PKG_BUILD_DIR)/host-perl && sh ../Configure -der -Dmksymlinks -Uusedl -Dotherlibdirs=$(PERL_LIB)) ++ ++ @echo ++ @echo "===> Stage 2: Build host perl binary with static extensions" ++ @echo ++ $(MAKE) -C $(PKG_BUILD_DIR)/host-perl ++ ++ @echo ++ @echo "===> Stage 3: Configure target perl" ++ @echo ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ sed \ ++ -e 's!%%CC%%!$(TARGET_CC)!g' \ ++ -e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE $(TARGET_CPPFLAGS)!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' \ ++ files/config.sh-$(patsubst i386,i486,$(ARCH)).in \ ++ > $(PKG_BUILD_DIR)/config.sh ++ (cd $(PKG_BUILD_DIR) && ./Configure -S) ++endef ++ ++define Build/perl/Compile ++ @echo ++ @echo "===> Stage 4: Build target miniperl binary" ++ @echo ++ install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h ++ -rm -f $(PKG_BUILD_DIR)/miniperl ++ $(MAKE) -C $(PKG_BUILD_DIR) miniperl ++ mkdir -p $(PKG_BUILD_DIR)/target-bin ++ install -m 0755 $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/target-bin/ ++ ++ @echo ++ @echo "===> Stage 5: Build target perl binary" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/perl ++ install -m 0755 $(PKG_BUILD_DIR)/host-perl/miniperl $(PKG_BUILD_DIR)/ ++ touch $(PKG_BUILD_DIR)/miniperl ++ $(MAKE) -C $(PKG_BUILD_DIR) perl ++ install -m 0755 $(PKG_BUILD_DIR)/perl $(PKG_BUILD_DIR)/target-bin/ ++ ++ @echo ++ @echo "===> Stage 6: Build target extensions and utils" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/perl ++ install -m 0755 $(PKG_BUILD_DIR)/host-perl/miniperl $(PKG_BUILD_DIR)/ ++ ln -sf miniperl $(PKG_BUILD_DIR)/perl ++ touch $(PKG_BUILD_DIR)/miniperl $(PKG_BUILD_DIR)/perl ++ $(MAKE) -C $(PKG_BUILD_DIR) ++ ++ @echo ++ @echo "===> Stage 7: Install Perl into staging dir" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/perl ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/host-perl/perl $(PKG_BUILD_DIR)/ ++ (cd $(PKG_BUILD_DIR) && ./perl installperl --destdir=$(STAGING_DIR)) ++ ++ @echo ++ @echo "===> Stage 8: Install Perl into a temporary root" ++ @echo ++ -rm -f $(PKG_BUILD_DIR)/perl ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/target-bin/perl $(PKG_BUILD_DIR) ++ -rm -rf $(PKG_INSTALL_DIR) ++ mkdir -p $(PKG_INSTALL_DIR) ++ (cd $(PKG_BUILD_DIR) && host-perl/miniperl installperl --destdir=$(PKG_INSTALL_DIR)) ++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 ++endef ++ ++ifneq ($(CONFIG_PACKAGE_microperl),) ++define Build/microperl ++ $(call Build/Template,microperl) ++endef ++endif ++$(eval $(Build/microperl)) ++ ++ifneq ($(CONFIG_PACKAGE_perl),) ++define Build/perl ++ $(call Build/Template,perl) ++endef ++endif ++$(eval $(Build/perl)) ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++$(eval $(call RequireCommand,rsync, \ ++ $(PKG_NAME) requires rsync installed on the host-system. \ ++)) ++ ++$(eval $(call BuildPackage,microperl)) ++$(eval $(call BuildPackage,perl)) ++ ++-include perlbase.mk +diff --git a/feeds/packages/lang/perl/files/.svn/entries b/feeds/packages/lang/perl/files/.svn/entries +new file mode 100644 +index 0000000..7091d13 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/entries +@@ -0,0 +1,371 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-07T03:08:00.865727Z ++28189 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config.sh-arm.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++988d7cc63cb1fa284009860adc21745c ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24270 ++ ++config.sh-powerpc.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++3f23230232d8da122e1a0a0b505d265c ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24381 ++ ++perlmod-deps.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++cd843ddb256b2c200394fd96cb5a548a ++2008-07-03T02:32:44.836937Z ++11626 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1869 ++ ++Module ++dir ++ ++config.sh-armeb.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++f92b6d55cda43fce9980cf9287aaf731 ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24276 ++ ++strippm.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++74a952f1277f770d9c552a46ddf0fca0 ++2008-07-03T02:32:44.836937Z ++11626 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++368 ++ ++scan-perlbase.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++419db569648c988e36fbadb99a89ba49 ++2011-09-07T03:08:00.865727Z ++28189 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4001 ++ ++config.sh-mips.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++d1278712297658dc3f76c6b28986881d ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++26043 ++ ++config.sh-mipsel.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++721d8910f1c917642d9fd2e32e2b184b ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++26048 ++ ++config.sh-i486.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++50cd8db159642259ad129b1a7ba84c4e ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24284 ++ ++config.sh-avr32.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++0e5f9dd376a32989413efc181ff87130 ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24349 ++ +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-arm.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-arm.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-arm.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-armeb.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-armeb.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-armeb.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-avr32.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-avr32.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-avr32.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-i486.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-i486.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-i486.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-mips.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-mips.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-mips.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-mipsel.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-mipsel.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-mipsel.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-powerpc.in.svn-base b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-powerpc.in.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/prop-base/config.sh-powerpc.in.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-arm.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-arm.in.svn-base +new file mode 100644 +index 0000000..a21991f +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-arm.in.svn-base +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-armeb.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-armeb.in.svn-base +new file mode 100644 +index 0000000..81bc555 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-armeb.in.svn-base +@@ -0,0 +1,1068 @@ ++#!/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' ++api_subversion='0' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-avr32.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-avr32.in.svn-base +new file mode 100644 +index 0000000..1108364 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-avr32.in.svn-base +@@ -0,0 +1,1070 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-i486.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-i486.in.svn-base +new file mode 100644 +index 0000000..d05fdd0 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-i486.in.svn-base +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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 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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-mips.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-mips.in.svn-base +new file mode 100644 +index 0000000..8058cea +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-mips.in.svn-base +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@merope.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='' ++subversion='0' ++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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-mipsel.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-mipsel.in.svn-base +new file mode 100644 +index 0000000..0c9fd2f +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-mipsel.in.svn-base +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@merope.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='' ++subversion='0' ++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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/config.sh-powerpc.in.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-powerpc.in.svn-base +new file mode 100644 +index 0000000..e626586 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/config.sh-powerpc.in.svn-base +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/perlmod-deps.sh.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/perlmod-deps.sh.svn-base +new file mode 100644 +index 0000000..d144b4d +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/perlmod-deps.sh.svn-base +@@ -0,0 +1,81 @@ ++#!/bin/sh ++# ++# Generate perl module package dependencies ++# ++# Copyright (C) 2007 Peter Colberg ++# Licensed under the terms of the GNU General Public License. ++# ++ ++if [ $# -lt 3 ]; then ++ echo >&2 "Usage: $(basename $0) STAGING-DIR PERL-BUILD-DIR [FILES...] [DIRECTORIES...]" ++ exit 1 ++fi ++ ++STAGING_DIR="$1" ++PERL_BIN="$STAGING_DIR/usr/bin/perl" ++PERL_LIB="$STAGING_DIR/usr/lib/perl5/5.10" ++INC_DIR="$(dirname $0)" ++shift ++ ++"$PERL_BIN" -I"$INC_DIR" -I"$PERL_LIB" - "$@" <<'PERL_SCRIPT' ++use strict; ++use warnings; ++ ++use Module::ScanDeps; ++use File::Find; ++use Cwd; ++ ++our $sitelib = "/usr/lib/perl5/5.10"; ++ ++sub scandeps { ++ my $builddir = Cwd::abs_path(shift); ++ my @scanpaths = @_; ++ my ($curdir, @pkgdirs, $dir, @deps, %depends, $file); ++ our ($pkg, %bundles, $path, @files); ++ ++ @pkgdirs = glob($builddir . "/*/ipkg"); ++ $curdir = getcwd(); ++ @INC = (); ++ for $dir (@pkgdirs) { ++ chdir($dir) or die "$dir: $!"; ++ for $pkg (glob("*")) { ++ chdir($dir . "/" . $pkg . $sitelib) or next; ++ push @INC, getcwd(); ++ sub wanted { ++ return unless (-f $_); ++ s/^\.\///; ++ $bundles{$_} = $pkg; ++ } ++ find({ wanted => \&wanted, no_chdir => 1 }, "."); ++ } ++ } ++ chdir($curdir) or die "$curdir: $!\n"; ++ ++ for $path (@scanpaths) { ++ sub scan_wanted { ++ return unless (-f $_ and /\.(pl|pm)$/); ++ push @files, $_; ++ } ++ if (-f $path) { ++ push @files, $path; ++ } ++ elsif (-d $path) { ++ find({ wanted => \&scan_wanted, no_chdir => 1 }, $path); ++ } ++ } ++ ++ @deps = keys %{scan_deps(files => \@files, recurse => 0)}; ++ for $file (grep { not exists $bundles{$_} } @deps) { ++ warn "could not resolve dependency: $file\n"; ++ } ++ %depends = map { $bundles{$_}, 1 } grep { exists $bundles{$_} } @deps; ++ ++ if (%depends) { ++ print join(' ', 'perl', sort keys %depends), "\n"; ++ } ++} ++ ++if (@ARGV > 1) { ++ scandeps(@ARGV); ++} ++PERL_SCRIPT +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/scan-perlbase.sh.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/scan-perlbase.sh.svn-base +new file mode 100644 +index 0000000..d9fe80a +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/scan-perlbase.sh.svn-base +@@ -0,0 +1,176 @@ ++#!/bin/sh ++# ++# Generate perl base modules package definitions ++# ++# Copyright (C) 2007 Peter Colberg ++# Licensed under the terms of the GNU General Public License. ++# ++ ++if [ $# -lt 1 ]; then ++ echo >&2 "Usage: $(basename $0) STAGING-DIR [OUTFILE]" ++ exit 1 ++fi ++ ++STAGING_DIR="$1" ++PERL_BIN="$STAGING_DIR/usr/bin/perl" ++PERL_LIB="$STAGING_DIR/usr/lib/perl5/5.10" ++INC_DIR="$(dirname $0)" ++shift ++ ++"$PERL_BIN" -I"$INC_DIR" -I"$PERL_LIB" - "$PERL_LIB" "$@" <<'PERL_SCRIPT' ++use strict; ++use warnings; ++ ++use Module::ScanDeps; ++use File::Find; ++use File::Basename; ++ ++our $skipfiles = 'CORE vmsish.pm auto/sdbm'; ++ ++our %defmodules = ( ++ 'essential' => 'lib.pm vars.pm strict.pm warnings.pm warnings Carp Carp.pm Exporter Exporter.pm locale.pm subs.pm overload.pm constant.pm', ++ 'getoptpl' => 'getopt.pl getopts.pl', ++ 'utf8' => 'utf8_heavy.pl', ++ 'Getopt' => 'newgetopt.pl', ++ 'open' => 'open2.pl open3.pl', ++ 'Config' => 'Config_heavy.pl', ++ 'bytes' => 'bytes_heavy.pl', ++); ++ ++our %defdepends = ( ++ 'DB_File' => 'libdb1-compat', ++ 'GDBM_File' => 'libgdbm', ++); ++ ++our $prefix = 'perlbase-'; ++ ++sub template ($) { ++ $_ = $_[0]; ++ return < \&wanted, no_chdir => 1}, '.'); ++ ++ for $pkg (keys %modules) { ++ $packages{$pkg} = []; ++ $excludes{$pkg} = []; ++ $depends{$pkg} = {}; ++ } ++ ++ for $file (keys %files) { ++ $mod = $files{$file}; ++ $parent = $files{dirname($file)}; ++ ++ if (defined ($mod)) { ++ if (defined ($parent) and not ($parent eq $mod)) { ++ push @{$packages{$mod}}, $file; ++ push @{$excludes{$parent}}, $file; ++ } ++ elsif (not defined ($parent)) { ++ push @{$packages{$mod}}, $file; ++ } ++ } ++ elsif (defined ($parent)) { ++ push @{$excludes{$parent}}, $file; ++ } ++ } ++ ++ for $mod (keys %defdepends) { ++ ($pkg = $prefix . $mod) =~ tr/A-Z_/a-z-/; ++ for $dep (split / /, $defdepends{$mod}) { ++ ${$depends{$pkg}}{$dep} = 1; ++ } ++ } ++ ++ @INC = ('.'); ++ for $file (grep { -f $_ and defined $files{$_} } keys %files) { ++ @deps = keys %{scan_deps(files => [ $file ], recurse => 0)}; ++ $pkg = $files{$file}; ++ ++ for $dep (grep { not defined $files{$_} } @deps) { ++ warn "$file: could not resolve dependency: $dep\n"; ++ } ++ for $dep (grep { defined $files{$_} } @deps) { ++ next if ($files{$dep} eq $pkg); ++ ${$depends{$pkg}}{$files{$dep}} = 1; ++ } ++ } ++ ++ for $pkg (sort keys %packages) { ++ push @result, template({ ++ package => $pkg, ++ module => $modules{$pkg}, ++ depends => join(' ', 'perl', sort keys %{$depends{$pkg}}), ++ files => join(' ', sort @{$packages{$pkg}}), ++ exclude => join(' ', sort @{$excludes{$pkg}}), ++ }); ++ } ++ ++ return join('', @result); ++} ++ ++ ++if (@ARGV > 1) { ++ open FILE, ">$ARGV[1]" or die "$ARGV[1]: $!\n"; ++ print FILE scandeps($ARGV[0]); ++ close FILE; ++} ++else { ++ print scandeps($ARGV[0] or '.'); ++} ++PERL_SCRIPT +diff --git a/feeds/packages/lang/perl/files/.svn/text-base/strippm.sh.svn-base b/feeds/packages/lang/perl/files/.svn/text-base/strippm.sh.svn-base +new file mode 100644 +index 0000000..b83d2b4 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/.svn/text-base/strippm.sh.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh ++# ++# Attempt to strip comments and pod docs from perl modules ++# ++ ++[ "$#" -gt 0 ] || set . ++echo "---> Stripping modules in: $@" >&2 ++find "$@" -name \*.pm -or -name \*.pl -or -name \*.pod | while read fn; do ++ echo " $fn" >&2 ++ sed -i -e '/^=\(head\|pod\|item\|over\|back\)/,/^=cut/d; /^=\(head\|pod\|item\|over\|back\)/,$d; /^#$/d; /^#[^!"'"'"']/d' "$fn" ++done +diff --git a/feeds/packages/lang/perl/files/Module/.svn/entries b/feeds/packages/lang/perl/files/Module/.svn/entries +new file mode 100644 +index 0000000..8643e91 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/Module/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl/files/Module ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-03T02:32:44.836937Z ++11626 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ScanDeps.pm ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f1bb011d4f510ecbaf8853826545f71f ++2008-07-03T02:32:44.836937Z ++11626 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++32018 ++ +diff --git a/feeds/packages/lang/perl/files/Module/.svn/text-base/ScanDeps.pm.svn-base b/feeds/packages/lang/perl/files/Module/.svn/text-base/ScanDeps.pm.svn-base +new file mode 100644 +index 0000000..4f3a7d5 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/Module/.svn/text-base/ScanDeps.pm.svn-base +@@ -0,0 +1,1083 @@ ++package Module::ScanDeps; ++ ++use 5.004; ++use strict; ++use vars qw( $VERSION @EXPORT @EXPORT_OK $CurrentPackage ); ++ ++$VERSION = '0.62'; ++@EXPORT = qw( scan_deps scan_deps_runtime ); ++@EXPORT_OK = qw( scan_line scan_chunk add_deps scan_deps_runtime ); ++ ++use Config; ++use Exporter; ++use base 'Exporter'; ++use constant dl_ext => ".$Config{dlext}"; ++use constant lib_ext => $Config{lib_ext}; ++use constant is_insensitive_fs => ( ++ -s $0 ++ and (-s lc($0) || -1) == (-s uc($0) || -1) ++ and (-s lc($0) || -1) == -s $0 ++); ++ ++use Cwd (); ++use File::Path (); ++use File::Temp (); ++use File::Basename (); ++use FileHandle; ++ ++=head1 NAME ++ ++Module::ScanDeps - Recursively scan Perl code for dependencies ++ ++=head1 VERSION ++ ++This document describes version 0.61 of Module::ScanDeps, released ++June 30, 2006. ++ ++=head1 SYNOPSIS ++ ++Via the command-line program L: ++ ++ % scandeps.pl *.pm # Print PREREQ_PM section for *.pm ++ % scandeps.pl -e "use utf8" # Read script from command line ++ % scandeps.pl -B *.pm # Include core modules ++ % scandeps.pl -V *.pm # Show autoload/shared/data files ++ ++Used in a program; ++ ++ use Module::ScanDeps; ++ ++ # standard usage ++ my $hash_ref = scan_deps( ++ files => [ 'a.pl', 'b.pl' ], ++ recurse => 1, ++ ); ++ ++ # shorthand; assume recurse == 1 ++ my $hash_ref = scan_deps( 'a.pl', 'b.pl' ); ++ ++ # App::Packer::Frontend compatible interface ++ # see App::Packer::Frontend for the structure returned by get_files ++ my $scan = Module::ScanDeps->new; ++ $scan->set_file( 'a.pl' ); ++ $scan->set_options( add_modules => [ 'Test::More' ] ); ++ $scan->calculate_info; ++ my $files = $scan->get_files; ++ ++=head1 DESCRIPTION ++ ++This module scans potential modules used by perl programs, and returns a ++hash reference; its keys are the module names as appears in C<%INC> ++(e.g. C); the values are hash references with this structure: ++ ++ { ++ file => '/usr/local/lib/perl5/5.8.0/Test/More.pm', ++ key => 'Test/More.pm', ++ type => 'module', # or 'autoload', 'data', 'shared' ++ used_by => [ 'Test/Simple.pm', ... ], ++ } ++ ++One function, C, is exported by default. Three other ++functions (C, C, C) are exported upon ++request. ++ ++Users of B may also use this module as the dependency-checking ++frontend, by tweaking their F like below: ++ ++ use Module::ScanDeps; ++ ... ++ my $packer = App::Packer->new( frontend => 'Module::ScanDeps' ); ++ ... ++ ++Please see L for detailed explanation on ++the structure returned by C. ++ ++=head2 B ++ ++ $rv_ref = scan_deps( ++ files => \@files, recurse => $recurse, ++ rv => \%rv, skip => \%skip, ++ compile => $compile, execute => $execute, ++ ); ++ $rv_ref = scan_deps(@files); # shorthand, with recurse => 1 ++ ++This function scans each file in C<@files>, registering their ++dependencies into C<%rv>, and returns a reference to the updated ++C<%rv>. The meaning of keys and values are explained above. ++ ++If C<$recurse> is true, C will call itself recursively, ++to perform a breadth-first search on text files (as defined by the ++-T operator) found in C<%rv>. ++ ++If the C<\%skip> is specified, files that exists as its keys are ++skipped. This is used internally to avoid infinite recursion. ++ ++If C<$compile> or C<$execute> is true, runs C in either ++compile-only or normal mode, then inspects their C<%INC> after ++termination to determine additional runtime dependencies. ++ ++If C<$execute> is an array reference, runs the files contained ++in it instead of C<@files>. ++ ++=head2 B ++ ++Like B, but skips the static scanning part. ++ ++=head2 B ++ ++ @modules = scan_line($line); ++ ++Splits a line into chunks (currently with the semicolon characters), and ++return the union of C calls of them. ++ ++If the line is C<__END__> or C<__DATA__>, a single C<__END__> element is ++returned to signify the end of the program. ++ ++Similarly, it returns a single C<__POD__> if the line matches C; ++the caller is responsible for skipping appropriate number of lines ++until C<=cut>, before calling C again. ++ ++=head2 B ++ ++ $module = scan_chunk($chunk); ++ @modules = scan_chunk($chunk); ++ ++Apply various heuristics to C<$chunk> to find and return the module ++name(s) it contains. In scalar context, returns only the first module ++or C. ++ ++=head2 B ++ ++ $rv_ref = add_deps( rv => \%rv, modules => \@modules ); ++ $rv_ref = add_deps( @modules ); # shorthand, without rv ++ ++Resolves a list of module names to its actual on-disk location, by ++finding in C<@INC>; modules that cannot be found are skipped. ++ ++This function populates the C<%rv> hash with module/filename pairs, and ++returns a reference to it. ++ ++=head1 CAVEATS ++ ++This module intentially ignores the B hack on FreeBSD -- the ++additional directory is removed from C<@INC> altogether. ++ ++The static-scanning heuristic is not likely to be 100% accurate, especially ++on modules that dynamically load other modules. ++ ++Chunks that span multiple lines are not handled correctly. For example, ++this one works: ++ ++ use base 'Foo::Bar'; ++ ++But this one does not: ++ ++ use base ++ 'Foo::Bar'; ++ ++=cut ++ ++my $SeenTk; ++ ++# Pre-loaded module dependencies {{{ ++my %Preload = ( ++ 'AnyDBM_File.pm' => [qw( SDBM_File.pm )], ++ 'Authen/SASL.pm' => 'sub', ++ 'Bio/AlignIO.pm' => 'sub', ++ 'Bio/Assembly/IO.pm' => 'sub', ++ 'Bio/Biblio/IO.pm' => 'sub', ++ 'Bio/ClusterIO.pm' => 'sub', ++ 'Bio/CodonUsage/IO.pm' => 'sub', ++ 'Bio/DB/Biblio.pm' => 'sub', ++ 'Bio/DB/Flat.pm' => 'sub', ++ 'Bio/DB/GFF.pm' => 'sub', ++ 'Bio/DB/Taxonomy.pm' => 'sub', ++ 'Bio/Graphics/Glyph.pm' => 'sub', ++ 'Bio/MapIO.pm' => 'sub', ++ 'Bio/Matrix/IO.pm' => 'sub', ++ 'Bio/Matrix/PSM/IO.pm' => 'sub', ++ 'Bio/OntologyIO.pm' => 'sub', ++ 'Bio/PopGen/IO.pm' => 'sub', ++ 'Bio/Restriction/IO.pm' => 'sub', ++ 'Bio/Root/IO.pm' => 'sub', ++ 'Bio/SearchIO.pm' => 'sub', ++ 'Bio/SeqIO.pm' => 'sub', ++ 'Bio/Structure/IO.pm' => 'sub', ++ 'Bio/TreeIO.pm' => 'sub', ++ 'Bio/LiveSeq/IO.pm' => 'sub', ++ 'Bio/Variation/IO.pm' => 'sub', ++ 'Crypt/Random.pm' => sub { ++ _glob_in_inc('Crypt/Random/Provider', 1); ++ }, ++ 'Crypt/Random/Generator.pm' => sub { ++ _glob_in_inc('Crypt/Random/Provider', 1); ++ }, ++ 'DBI.pm' => sub { ++ grep !/\bProxy\b/, _glob_in_inc('DBD', 1); ++ }, ++ 'DBIx/SearchBuilder.pm' => 'sub', ++ 'DBIx/ReportBuilder.pm' => 'sub', ++ 'Device/ParallelPort.pm' => 'sub', ++ 'Device/SerialPort.pm' => [ qw( ++ termios.ph asm/termios.ph sys/termiox.ph sys/termios.ph sys/ttycom.ph ++ ) ], ++ 'ExtUtils/MakeMaker.pm' => sub { ++ grep /\bMM_/, _glob_in_inc('ExtUtils', 1); ++ }, ++ 'File/Basename.pm' => [qw( re.pm )], ++ 'File/Spec.pm' => sub { ++ require File::Spec; ++ map { my $name = $_; $name =~ s!::!/!g; "$name.pm" } @File::Spec::ISA; ++ }, ++ 'HTTP/Message.pm' => [ qw( ++ URI/URL.pm URI.pm ++ ) ], ++ 'IO.pm' => [ qw( ++ IO/Handle.pm IO/Seekable.pm IO/File.pm ++ IO/Pipe.pm IO/Socket.pm IO/Dir.pm ++ ) ], ++ 'IO/Socket.pm' => [qw( IO/Socket/UNIX.pm )], ++ 'LWP/UserAgent.pm' => [ qw( ++ URI/URL.pm URI/http.pm LWP/Protocol/http.pm ++ LWP/Protocol/https.pm ++ ), _glob_in_inc("LWP/Authen", 1) ], ++ 'Locale/Maketext/Lexicon.pm' => 'sub', ++ 'Locale/Maketext/GutsLoader.pm' => [qw( Locale/Maketext/Guts.pm )], ++ 'Mail/Audit.pm' => 'sub', ++ 'Math/BigInt.pm' => 'sub', ++ 'Math/BigFloat.pm' => 'sub', ++ 'Math/Symbolic.pm' => 'sub', ++ 'Module/Build.pm' => 'sub', ++ 'Module/Pluggable.pm' => sub { ++ _glob_in_inc('$CurrentPackage/Plugin', 1); ++ }, ++ 'MIME/Decoder.pm' => 'sub', ++ 'Net/DNS/RR.pm' => 'sub', ++ 'Net/FTP.pm' => 'sub', ++ 'Net/SSH/Perl.pm' => 'sub', ++ 'PDF/API2/Resource/Font.pm' => 'sub', ++ 'PDF/API2/Basic/TTF/Font.pm' => sub { ++ _glob_in_inc('PDF/API2/Basic/TTF', 1); ++ }, ++ 'PDF/Writer.pm' => 'sub', ++ 'POE' => [ qw( ++ POE/Kernel.pm POE/Session.pm ++ ) ], ++ 'POE/Kernel.pm' => [ ++ map "POE/Resource/$_.pm", qw( ++ Aliases Events Extrefs FileHandles ++ SIDs Sessions Signals Statistics ++ ) ++ ], ++ 'Parse/AFP.pm' => 'sub', ++ 'Parse/Binary.pm' => 'sub', ++ 'Regexp/Common.pm' => 'sub', ++ 'SerialJunk.pm' => [ qw( ++ termios.ph asm/termios.ph sys/termiox.ph sys/termios.ph sys/ttycom.ph ++ ) ], ++ 'SOAP/Lite.pm' => sub { ++ (($] >= 5.008 ? ('utf8.pm') : ()), _glob_in_inc('SOAP/Transport', 1)); ++ }, ++ 'SQL/Parser.pm' => sub { ++ _glob_in_inc('SQL/Dialects', 1); ++ }, ++ 'SVK/Command.pm' => sub { ++ _glob_in_inc('SVK', 1); ++ }, ++ 'SVN/Core.pm' => sub { ++ _glob_in_inc('SVN', 1), ++ map "auto/SVN/$_->{name}", _glob_in_inc('auto/SVN'), ++ }, ++ 'Template.pm' => 'sub', ++ 'Term/ReadLine.pm' => 'sub', ++ 'Test/Deep.pm' => 'sub', ++ 'Tk.pm' => sub { ++ $SeenTk = 1; ++ qw( Tk/FileSelect.pm Encode/Unicode.pm ); ++ }, ++ 'Tk/Balloon.pm' => [qw( Tk/balArrow.xbm )], ++ 'Tk/BrowseEntry.pm' => [qw( Tk/cbxarrow.xbm Tk/arrowdownwin.xbm )], ++ 'Tk/ColorEditor.pm' => [qw( Tk/ColorEdit.xpm )], ++ 'Tk/DragDrop/Common.pm' => sub { ++ _glob_in_inc('Tk/DragDrop', 1), ++ }, ++ 'Tk/FBox.pm' => [qw( Tk/folder.xpm Tk/file.xpm )], ++ 'Tk/Getopt.pm' => [qw( Tk/openfolder.xpm Tk/win.xbm )], ++ 'Tk/Toplevel.pm' => [qw( Tk/Wm.pm )], ++ 'URI.pm' => sub { ++ grep !/.\b[_A-Z]/, _glob_in_inc('URI', 1); ++ }, ++ 'Win32/EventLog.pm' => [qw( Win32/IPC.pm )], ++ 'Win32/Exe.pm' => 'sub', ++ 'Win32/TieRegistry.pm' => [qw( Win32API/Registry.pm )], ++ 'Win32/SystemInfo.pm' => [qw( Win32/cpuspd.dll )], ++ 'XML/Parser.pm' => sub { ++ _glob_in_inc('XML/Parser/Style', 1), ++ _glob_in_inc('XML/Parser/Encodings', 1), ++ }, ++ 'XML/Parser/Expat.pm' => sub { ++ ($] >= 5.008) ? ('utf8.pm') : (); ++ }, ++ 'XML/SAX.pm' => [qw( XML/SAX/ParserDetails.ini ) ], ++ 'XMLRPC/Lite.pm' => sub { ++ _glob_in_inc('XMLRPC/Transport', 1),; ++ }, ++ 'diagnostics.pm' => sub { ++ # shamelessly taken and adapted from diagnostics.pm ++ use Config; ++ my($privlib, $archlib) = @Config{qw(privlibexp archlibexp)}; ++ if ($^O eq 'VMS') { ++ require VMS::Filespec; ++ $privlib = VMS::Filespec::unixify($privlib); ++ $archlib = VMS::Filespec::unixify($archlib); ++ } ++ ++ for ( ++ "pod/perldiag.pod", ++ "Pod/perldiag.pod", ++ "pod/perldiag-$Config{version}.pod", ++ "Pod/perldiag-$Config{version}.pod", ++ "pods/perldiag.pod", ++ "pods/perldiag-$Config{version}.pod", ++ ) { ++ return $_ if _find_in_inc($_); ++ } ++ ++ for ( ++ "$archlib/pods/perldiag.pod", ++ "$privlib/pods/perldiag-$Config{version}.pod", ++ "$privlib/pods/perldiag.pod", ++ ) { ++ return $_ if -f $_; ++ } ++ ++ return 'pod/perldiag.pod'; ++ }, ++ 'utf8.pm' => [ ++ 'utf8_heavy.pl', do { ++ my $dir = 'unicore'; ++ my @subdirs = qw( To ); ++ my @files = map "$dir/lib/$_->{name}", _glob_in_inc("$dir/lib"); ++ ++ if (@files) { ++ # 5.8.x ++ push @files, (map "$dir/$_.pl", qw( Exact Canonical )); ++ } ++ else { ++ # 5.6.x ++ $dir = 'unicode'; ++ @files = map "$dir/Is/$_->{name}", _glob_in_inc("$dir/Is") ++ or return; ++ push @subdirs, 'In'; ++ } ++ ++ foreach my $subdir (@subdirs) { ++ foreach (_glob_in_inc("$dir/$subdir")) { ++ push @files, "$dir/$subdir/$_->{name}"; ++ } ++ } ++ @files; ++ } ++ ], ++ 'charnames.pm' => [ ++ _find_in_inc('unicore/Name.pl') ? 'unicore/Name.pl' : 'unicode/Name.pl' ++ ], ++); ++ ++# }}} ++ ++my $Keys = 'files|keys|recurse|rv|skip|first|execute|compile'; ++sub scan_deps { ++ my %args = ( ++ rv => {}, ++ (@_ and $_[0] =~ /^(?:$Keys)$/o) ? @_ : (files => [@_], recurse => 1) ++ ); ++ ++ scan_deps_static(\%args); ++ ++ if ($args{execute} or $args{compile}) { ++ scan_deps_runtime( ++ rv => $args{rv}, ++ files => $args{files}, ++ execute => $args{execute}, ++ compile => $args{compile}, ++ skip => $args{skip} ++ ); ++ } ++ ++ return ($args{rv}); ++} ++ ++sub scan_deps_static { ++ my ($args) = @_; ++ my ($files, $keys, $recurse, $rv, $skip, $first, $execute, $compile) = ++ @$args{qw( files keys recurse rv skip first execute compile )}; ++ ++ $rv ||= {}; ++ $skip ||= {}; ++ ++ foreach my $file (@{$files}) { ++ my $key = shift @{$keys}; ++ next if $skip->{$file}++; ++ next if is_insensitive_fs() ++ and $file ne lc($file) and $skip->{lc($file)}++; ++ ++ local *FH; ++ open FH, $file or die "Cannot open $file: $!"; ++ ++ $SeenTk = 0; ++ ++ # Line-by-line scanning ++ LINE: ++ while () { ++ chomp(my $line = $_); ++ foreach my $pm (scan_line($line)) { ++ last LINE if $pm eq '__END__'; ++ ++ if ($pm eq '__POD__') { ++ while () { last if (/^=cut/) } ++ next LINE; ++ } ++ ++ $pm = 'CGI/Apache.pm' if /^Apache(?:\.pm)$/; ++ ++ add_deps( ++ used_by => $key, ++ rv => $rv, ++ modules => [$pm], ++ skip => $skip ++ ); ++ ++ my $preload = $Preload{$pm} or next; ++ if ($preload eq 'sub') { ++ $pm =~ s/\.p[mh]$//i; ++ $preload = [ _glob_in_inc($pm, 1) ]; ++ } ++ elsif (UNIVERSAL::isa($preload, 'CODE')) { ++ $preload = [ $preload->($pm) ]; ++ } ++ ++ add_deps( ++ used_by => $key, ++ rv => $rv, ++ modules => $preload, ++ skip => $skip ++ ); ++ } ++ } ++ close FH; ++ ++ # }}} ++ } ++ ++ # Top-level recursion handling {{{ ++ while ($recurse) { ++ my $count = keys %$rv; ++ my @files = sort grep -T $_->{file}, values %$rv; ++ scan_deps_static({ ++ files => [ map $_->{file}, @files ], ++ keys => [ map $_->{key}, @files ], ++ rv => $rv, ++ skip => $skip, ++ recurse => 0, ++ }) or ($args->{_deep} and return); ++ last if $count == keys %$rv; ++ } ++ ++ # }}} ++ ++ return $rv; ++} ++ ++sub scan_deps_runtime { ++ my %args = ( ++ perl => $^X, ++ rv => {}, ++ (@_ and $_[0] =~ /^(?:$Keys)$/o) ? @_ : (files => [@_], recurse => 1) ++ ); ++ my ($files, $rv, $execute, $compile, $skip, $perl) = ++ @args{qw( files rv execute compile skip perl )}; ++ ++ $files = (ref($files)) ? $files : [$files]; ++ ++ my ($inchash, $incarray, $dl_shared_objects) = ({}, [], []); ++ if ($compile) { ++ my $file; ++ ++ foreach $file (@$files) { ++ ($inchash, $dl_shared_objects, $incarray) = ({}, [], []); ++ _compile($perl, $file, $inchash, $dl_shared_objects, $incarray); ++ ++ my $rv_sub = _make_rv($inchash, $dl_shared_objects, $incarray); ++ _merge_rv($rv_sub, $rv); ++ } ++ } ++ elsif ($execute) { ++ my $excarray = (ref($execute)) ? $execute : [@$files]; ++ my $exc; ++ my $first_flag = 1; ++ foreach $exc (@$excarray) { ++ ($inchash, $dl_shared_objects, $incarray) = ({}, [], []); ++ _execute( ++ $perl, $exc, $inchash, $dl_shared_objects, $incarray, ++ $first_flag ++ ); ++ $first_flag = 0; ++ } ++ ++ my $rv_sub = _make_rv($inchash, $dl_shared_objects, $incarray); ++ _merge_rv($rv_sub, $rv); ++ } ++ ++ return ($rv); ++} ++ ++sub scan_line { ++ my $line = shift; ++ my %found; ++ ++ return '__END__' if $line =~ /^__(?:END|DATA)__$/; ++ return '__POD__' if $line =~ /^=\w/; ++ ++ $line =~ s/\s*#.*$//; ++ $line =~ s/[\\\/]+/\//g; ++ ++ foreach (split(/;/, $line)) { ++ if (/^\s*package\s+(\w+)/) { ++ $CurrentPackage = $1; ++ $CurrentPackage =~ s{::}{/}g; ++ return; ++ } ++ return if /^\s*(use|require)\s+[\d\._]+/; ++ if (my ($autouse) = /^\s*use\s+autouse\s+(["'].*?["']|\w+)/) ++ { ++ $autouse =~ s/["']//g; ++ $autouse =~ s{::}{/}g; ++ return ("autouse.pm", "$autouse.pm"); ++ } ++ ++ if (my ($libs) = /\b(?:use\s+lib\s+|(?:unshift|push)\W+\@INC\W+)(.+)/) ++ { ++ my $archname = ++ defined($Config{archname}) ? $Config{archname} : ''; ++ my $ver = defined($Config{version}) ? $Config{version} : ''; ++ foreach (grep(/\w/, split(/["';() ]/, $libs))) { ++ unshift(@INC, "$_/$ver") if -d "$_/$ver"; ++ unshift(@INC, "$_/$archname") if -d "$_/$archname"; ++ unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname"; ++ } ++ next; ++ } ++ ++ $found{$_}++ for scan_chunk($_); ++ } ++ ++ return sort keys %found; ++} ++ ++sub scan_chunk { ++ my $chunk = shift; ++ ++ # Module name extraction heuristics {{{ ++ my $module = eval { ++ $_ = $chunk; ++ ++ return [ 'base.pm', ++ map { s{::}{/}g; "$_.pm" } ++ grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] ++ if /^\s* use \s+ base \s+ (.*)/sx; ++ ++ return [ 'Class/Autouse.pm', ++ map { s{::}{/}g; "$_.pm" } ++ grep { length and !/^:|^q[qw]?$/ } split(/[^\w:]+/, $1) ] ++ if /^\s* use \s+ Class::Autouse \s+ (.*)/sx ++ or /^\s* Class::Autouse \s* -> \s* autouse \s* (.*)/sx; ++ ++ return [ 'POE.pm', ++ map { s{::}{/}g; "POE/$_.pm" } ++ grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] ++ if /^\s* use \s+ POE \s+ (.*)/sx; ++ ++ return [ 'encoding.pm', ++ map { _find_encoding($_) } ++ grep { length and !/^q[qw]?$/ } split(/[^\w:-]+/, $1) ] ++ if /^\s* use \s+ encoding \s+ (.*)/sx; ++ ++ return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']+)/; ++ return $1 ++ if /(?:^|\s)(?:use|no|require)\s+\(\s*([\w:\.\-\\\/\"\']+)\s*\)/; ++ ++ if ( s/(?:^|\s)eval\s+\"([^\"]+)\"/$1/ ++ or s/(?:^|\s)eval\s*\(\s*\"([^\"]+)\"\s*\)/$1/) ++ { ++ return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']*)/; ++ } ++ ++ return "File/Glob.pm" if /<[^>]*[^\$\w>][^>]*>/; ++ return "DBD/$1.pm" if /\b[Dd][Bb][Ii]:(\w+):/; ++ if (/(?:(:encoding)|\b(?:en|de)code)\(\s*['"]?([-\w]+)/) { ++ my $mod = _find_encoding($2); ++ return [ 'PerlIO.pm', $mod ] if $1 and $mod; ++ return $mod if $mod; ++ } ++ return $1 if /(?:^|\s)(?:do|require)\s+[^"]*"(.*?)"/; ++ return $1 if /(?:^|\s)(?:do|require)\s+[^']*'(.*?)'/; ++ return $1 if /[^\$]\b([\w:]+)->\w/ and $1 ne 'Tk'; ++ return $1 if /\b(\w[\w:]*)::\w+\(/; ++ ++ if ($SeenTk) { ++ my @modules; ++ while (/->\s*([A-Z]\w+)/g) { ++ push @modules, "Tk/$1.pm"; ++ } ++ while (/->\s*Scrolled\W+([A-Z]\w+)/g) { ++ push @modules, "Tk/$1.pm"; ++ push @modules, "Tk/Scrollbar.pm"; ++ } ++ return \@modules; ++ } ++ return; ++ }; ++ ++ # }}} ++ ++ return unless defined($module); ++ return wantarray ? @$module : $module->[0] if ref($module); ++ ++ $module =~ s/^['"]//; ++ return unless $module =~ /^\w/; ++ ++ $module =~ s/\W+$//; ++ $module =~ s/::/\//g; ++ return if $module =~ /^(?:[\d\._]+|'.*[^']|".*[^"])$/; ++ ++ $module .= ".pm" unless $module =~ /\./; ++ return $module; ++} ++ ++sub _find_encoding { ++ return unless $] >= 5.008 and eval { require Encode; %Encode::ExtModule }; ++ ++ my $mod = $Encode::ExtModule{ Encode::find_encoding($_[0])->name } ++ or return; ++ $mod =~ s{::}{/}g; ++ return "$mod.pm"; ++} ++ ++sub _add_info { ++ my ($rv, $module, $file, $used_by, $type) = @_; ++ return unless defined($module) and defined($file); ++ ++ $rv->{$module} ||= { ++ file => $file, ++ key => $module, ++ type => $type, ++ }; ++ ++ push @{ $rv->{$module}{used_by} }, $used_by ++ if defined($used_by) ++ and $used_by ne $module ++ and !grep { $_ eq $used_by } @{ $rv->{$module}{used_by} }; ++} ++ ++sub add_deps { ++ my %args = ++ ((@_ and $_[0] =~ /^(?:modules|rv|used_by)$/) ++ ? @_ ++ : (rv => (ref($_[0]) ? shift(@_) : undef), modules => [@_])); ++ ++ my $rv = $args{rv} || {}; ++ my $skip = $args{skip} || {}; ++ my $used_by = $args{used_by}; ++ ++ foreach my $module (@{ $args{modules} }) { ++ if (exists $rv->{$module}) { ++ _add_info($rv, undef, undef, $used_by, undef); ++ next; ++ } ++ ++ my $file = _find_in_inc($module) or next; ++ next if $skip->{$file}; ++ next if is_insensitive_fs() and $skip->{lc($file)}; ++ ++ my $type = 'module'; ++ $type = 'data' unless $file =~ /\.p[mh]$/i; ++ _add_info($rv, $module, $file, $used_by, $type); ++ ++ if ($module =~ /(.*?([^\/]*))\.p[mh]$/i) { ++ my ($path, $basename) = ($1, $2); ++ ++ foreach (_glob_in_inc("auto/$path")) { ++ next if $skip->{$_->{file}}; ++ next if is_insensitive_fs() and $skip->{lc($_->{file})}; ++ next if $_->{file} =~ m{\bauto/$path/.*/}; # weed out subdirs ++ next if $_->{name} =~ m/(?:^|\/)\.(?:exists|packlist)$/; ++ my $ext = lc($1) if $_->{name} =~ /(\.[^.]+)$/; ++ next if $ext eq lc(lib_ext()); ++ my $type = 'shared' if $ext eq lc(dl_ext()); ++ $type = 'autoload' if $ext eq '.ix' or $ext eq '.al'; ++ $type ||= 'data'; ++ ++ _add_info($rv, "auto/$path/$_->{name}", $_->{file}, $module, ++ $type); ++ } ++ } ++ } ++ ++ return $rv; ++} ++ ++sub _find_in_inc { ++ my $file = shift; ++ ++ # absolute file names ++ return $file if -f $file; ++ ++ foreach my $dir (grep !/\bBSDPAN\b/, @INC) { ++ return "$dir/$file" if -f "$dir/$file"; ++ } ++ return; ++} ++ ++sub _glob_in_inc { ++ my $subdir = shift; ++ my $pm_only = shift; ++ my @files; ++ ++ require File::Find; ++ ++ $subdir =~ s/\$CurrentPackage/$CurrentPackage/; ++ ++ foreach my $dir (map "$_/$subdir", grep !/\bBSDPAN\b/, @INC) { ++ next unless -d $dir; ++ File::Find::find( ++ sub { ++ my $name = $File::Find::name; ++ $name =~ s!^\Q$dir\E/!!; ++ return if $pm_only and lc($name) !~ /\.p[mh]$/i; ++ push @files, $pm_only ++ ? "$subdir/$name" ++ : { file => $File::Find::name, ++ name => $name, ++ } ++ if -f; ++ }, ++ $dir ++ ); ++ } ++ ++ return @files; ++} ++ ++# App::Packer compatibility functions ++ ++sub new { ++ my ($class, $self) = @_; ++ return bless($self ||= {}, $class); ++} ++ ++sub set_file { ++ my $self = shift; ++ foreach my $script (@_) { ++ my $basename = $script; ++ $basename =~ s/.*\///; ++ $self->{main} = { ++ key => $basename, ++ file => $script, ++ }; ++ } ++} ++ ++sub set_options { ++ my $self = shift; ++ my %args = @_; ++ foreach my $module (@{ $args{add_modules} }) { ++ $module =~ s/::/\//g; ++ $module .= '.pm' unless $module =~ /\.p[mh]$/i; ++ my $file = _find_in_inc($module) or next; ++ $self->{files}{$module} = $file; ++ } ++} ++ ++sub calculate_info { ++ my $self = shift; ++ my $rv = scan_deps( ++ keys => [ $self->{main}{key}, sort keys %{ $self->{files} }, ], ++ files => [ $self->{main}{file}, ++ map { $self->{files}{$_} } sort keys %{ $self->{files} }, ++ ], ++ recurse => 1, ++ ); ++ ++ my $info = { ++ main => { file => $self->{main}{file}, ++ store_as => $self->{main}{key}, ++ }, ++ }; ++ ++ my %cache = ($self->{main}{key} => $info->{main}); ++ foreach my $key (sort keys %{ $self->{files} }) { ++ my $file = $self->{files}{$key}; ++ ++ $cache{$key} = $info->{modules}{$key} = { ++ file => $file, ++ store_as => $key, ++ used_by => [ $self->{main}{key} ], ++ }; ++ } ++ ++ foreach my $key (sort keys %{$rv}) { ++ my $val = $rv->{$key}; ++ if ($cache{ $val->{key} }) { ++ push @{ $info->{ $val->{type} }->{ $val->{key} }->{used_by} }, ++ @{ $val->{used_by} }; ++ } ++ else { ++ $cache{ $val->{key} } = $info->{ $val->{type} }->{ $val->{key} } = ++ { file => $val->{file}, ++ store_as => $val->{key}, ++ used_by => $val->{used_by}, ++ }; ++ } ++ } ++ ++ $self->{info} = { main => $info->{main} }; ++ ++ foreach my $type (sort keys %{$info}) { ++ next if $type eq 'main'; ++ ++ my @val; ++ if (UNIVERSAL::isa($info->{$type}, 'HASH')) { ++ foreach my $val (sort values %{ $info->{$type} }) { ++ @{ $val->{used_by} } = map $cache{$_} || "!!$_!!", ++ @{ $val->{used_by} }; ++ push @val, $val; ++ } ++ } ++ ++ $type = 'modules' if $type eq 'module'; ++ $self->{info}{$type} = \@val; ++ } ++} ++ ++sub get_files { ++ my $self = shift; ++ return $self->{info}; ++} ++ ++# scan_deps_runtime utility functions ++ ++sub _compile { ++ my ($perl, $file, $inchash, $dl_shared_objects, $incarray) = @_; ++ ++ my ($fhout, $fname) = File::Temp::tempfile("XXXXXX"); ++ my $fhin = FileHandle->new($file) or die "Couldn't open $file\n"; ++ ++ my $line = do { local $/; <$fhin> }; ++ $line =~ s/use Module::ScanDeps::DataFeed.*?\n//sg; ++ $line =~ s/^(.*?)((?:[\r\n]+__(?:DATA|END)__[\r\n]+)|$)/ ++use Module::ScanDeps::DataFeed '$fname.out'; ++sub { ++$1 ++} ++$2/s; ++ $fhout->print($line); ++ $fhout->close; ++ $fhin->close; ++ ++ system($perl, $fname); ++ ++ _extract_info("$fname.out", $inchash, $dl_shared_objects, $incarray); ++ unlink("$fname"); ++ unlink("$fname.out"); ++} ++ ++sub _execute { ++ my ($perl, $file, $inchash, $dl_shared_objects, $incarray, $firstflag) = @_; ++ ++ $DB::single = $DB::single = 1; ++ my ($fhout, $fname) = File::Temp::tempfile("XXXXXX"); ++ $fname = _abs_path($fname); ++ my $fhin = FileHandle->new($file) or die "Couldn't open $file"; ++ ++ my $line = do { local $/; <$fhin> }; ++ $line =~ s/use Module::ScanDeps::DataFeed.*?\n//sg; ++ $line = "use Module::ScanDeps::DataFeed '$fname.out';\n" . $line; ++ $fhout->print($line); ++ $fhout->close; ++ $fhin->close; ++ ++ File::Path::rmtree( ['_Inline'], 0, 1); # XXX hack ++ system($perl, $fname) == 0 or die "SYSTEM ERROR in executing $file: $?"; ++ ++ _extract_info("$fname.out", $inchash, $dl_shared_objects, $incarray); ++ unlink("$fname"); ++ unlink("$fname.out"); ++} ++ ++sub _make_rv { ++ my ($inchash, $dl_shared_objects, $inc_array) = @_; ++ ++ my $rv = {}; ++ my @newinc = map(quotemeta($_), @$inc_array); ++ my $inc = join('|', sort { length($b) <=> length($a) } @newinc); ++ ++ require File::Spec; ++ ++ my $key; ++ foreach $key (keys(%$inchash)) { ++ my $newkey = $key; ++ $newkey =~ s"^(?:(?:$inc)/?)""sg if File::Spec->file_name_is_absolute($newkey); ++ ++ $rv->{$newkey} = { ++ 'used_by' => [], ++ 'file' => $inchash->{$key}, ++ 'type' => _gettype($inchash->{$key}), ++ 'key' => $key ++ }; ++ } ++ ++ my $dl_file; ++ foreach $dl_file (@$dl_shared_objects) { ++ my $key = $dl_file; ++ $key =~ s"^(?:(?:$inc)/?)""s; ++ ++ $rv->{$key} = { ++ 'used_by' => [], ++ 'file' => $dl_file, ++ 'type' => 'shared', ++ 'key' => $key ++ }; ++ } ++ ++ return $rv; ++} ++ ++sub _extract_info { ++ my ($fname, $inchash, $dl_shared_objects, $incarray) = @_; ++ ++ use vars qw(%inchash @dl_shared_objects @incarray); ++ my $fh = FileHandle->new($fname) or die "Couldn't open $fname"; ++ my $line = do { local $/; <$fh> }; ++ $fh->close; ++ ++ eval $line; ++ ++ $inchash->{$_} = $inchash{$_} for keys %inchash; ++ @$dl_shared_objects = @dl_shared_objects; ++ @$incarray = @incarray; ++} ++ ++sub _gettype { ++ my $name = shift; ++ my $dlext = quotemeta(dl_ext()); ++ ++ return 'autoload' if $name =~ /(?:\.ix|\.al|\.bs)$/i; ++ return 'module' if $name =~ /\.p[mh]$/i; ++ return 'shared' if $name =~ /\.$dlext$/i; ++ return 'data'; ++} ++ ++sub _merge_rv { ++ my ($rv_sub, $rv) = @_; ++ ++ my $key; ++ foreach $key (keys(%$rv_sub)) { ++ my %mark; ++ if ($rv->{$key} and _not_dup($key, $rv, $rv_sub)) { ++ warn "Different modules for file '$key' were found.\n" ++ . " -> Using '" . _abs_path($rv_sub->{$key}{file}) . "'.\n" ++ . " -> Ignoring '" . _abs_path($rv->{$key}{file}) . "'.\n"; ++ $rv->{$key}{used_by} = [ ++ grep (!$mark{$_}++, ++ @{ $rv->{$key}{used_by} }, ++ @{ $rv_sub->{$key}{used_by} }) ++ ]; ++ @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; ++ $rv->{$key}{file} = $rv_sub->{$key}{file}; ++ } ++ elsif ($rv->{$key}) { ++ $rv->{$key}{used_by} = [ ++ grep (!$mark{$_}++, ++ @{ $rv->{$key}{used_by} }, ++ @{ $rv_sub->{$key}{used_by} }) ++ ]; ++ @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; ++ } ++ else { ++ $rv->{$key} = { ++ used_by => [ @{ $rv_sub->{$key}{used_by} } ], ++ file => $rv_sub->{$key}{file}, ++ key => $rv_sub->{$key}{key}, ++ type => $rv_sub->{$key}{type} ++ }; ++ ++ @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; ++ } ++ } ++} ++ ++sub _not_dup { ++ my ($key, $rv1, $rv2) = @_; ++ (_abs_path($rv1->{$key}{file}) ne _abs_path($rv2->{$key}{file})); ++} ++ ++sub _abs_path { ++ return join( ++ '/', ++ Cwd::abs_path(File::Basename::dirname($_[0])), ++ File::Basename::basename($_[0]), ++ ); ++} ++ ++1; ++ ++__END__ ++ ++=head1 SEE ALSO ++ ++L is a bundled utility that writes C section ++for a number of files. ++ ++An application of B is to generate executables from ++scripts that contains prerequisite modules; this module supports two ++such projects, L and L. Please see their respective ++documentations on CPAN for further information. ++ ++=head1 AUTHORS ++ ++Audrey Tang Eautrijus@autrijus.orgE ++ ++Parts of heuristics were deduced from: ++ ++=over 4 ++ ++=item * ++ ++B by ActiveState Tools Corp L ++ ++=item * ++ ++B by IndigoStar, Inc L ++ ++=back ++ ++The B function is contributed by Edward S. Peschko. ++ ++L is the official website for this module. You ++can write to the mailing list at Epar@perl.orgE, or send an empty ++mail to Epar-subscribe@perl.orgE to participate in the discussion. ++ ++Please submit bug reports to Ebug-Module-ScanDeps@rt.cpan.orgE. ++ ++=head1 COPYRIGHT ++ ++Copyright 2002, 2003, 2004, 2005, 2006 by ++Audrey Tang Eautrijus@autrijus.orgE. ++ ++This program is free software; you can redistribute it and/or modify it ++under the same terms as Perl itself. ++ ++See L ++ ++=cut +diff --git a/feeds/packages/lang/perl/files/Module/ScanDeps.pm b/feeds/packages/lang/perl/files/Module/ScanDeps.pm +new file mode 100644 +index 0000000..4f3a7d5 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/Module/ScanDeps.pm +@@ -0,0 +1,1083 @@ ++package Module::ScanDeps; ++ ++use 5.004; ++use strict; ++use vars qw( $VERSION @EXPORT @EXPORT_OK $CurrentPackage ); ++ ++$VERSION = '0.62'; ++@EXPORT = qw( scan_deps scan_deps_runtime ); ++@EXPORT_OK = qw( scan_line scan_chunk add_deps scan_deps_runtime ); ++ ++use Config; ++use Exporter; ++use base 'Exporter'; ++use constant dl_ext => ".$Config{dlext}"; ++use constant lib_ext => $Config{lib_ext}; ++use constant is_insensitive_fs => ( ++ -s $0 ++ and (-s lc($0) || -1) == (-s uc($0) || -1) ++ and (-s lc($0) || -1) == -s $0 ++); ++ ++use Cwd (); ++use File::Path (); ++use File::Temp (); ++use File::Basename (); ++use FileHandle; ++ ++=head1 NAME ++ ++Module::ScanDeps - Recursively scan Perl code for dependencies ++ ++=head1 VERSION ++ ++This document describes version 0.61 of Module::ScanDeps, released ++June 30, 2006. ++ ++=head1 SYNOPSIS ++ ++Via the command-line program L: ++ ++ % scandeps.pl *.pm # Print PREREQ_PM section for *.pm ++ % scandeps.pl -e "use utf8" # Read script from command line ++ % scandeps.pl -B *.pm # Include core modules ++ % scandeps.pl -V *.pm # Show autoload/shared/data files ++ ++Used in a program; ++ ++ use Module::ScanDeps; ++ ++ # standard usage ++ my $hash_ref = scan_deps( ++ files => [ 'a.pl', 'b.pl' ], ++ recurse => 1, ++ ); ++ ++ # shorthand; assume recurse == 1 ++ my $hash_ref = scan_deps( 'a.pl', 'b.pl' ); ++ ++ # App::Packer::Frontend compatible interface ++ # see App::Packer::Frontend for the structure returned by get_files ++ my $scan = Module::ScanDeps->new; ++ $scan->set_file( 'a.pl' ); ++ $scan->set_options( add_modules => [ 'Test::More' ] ); ++ $scan->calculate_info; ++ my $files = $scan->get_files; ++ ++=head1 DESCRIPTION ++ ++This module scans potential modules used by perl programs, and returns a ++hash reference; its keys are the module names as appears in C<%INC> ++(e.g. C); the values are hash references with this structure: ++ ++ { ++ file => '/usr/local/lib/perl5/5.8.0/Test/More.pm', ++ key => 'Test/More.pm', ++ type => 'module', # or 'autoload', 'data', 'shared' ++ used_by => [ 'Test/Simple.pm', ... ], ++ } ++ ++One function, C, is exported by default. Three other ++functions (C, C, C) are exported upon ++request. ++ ++Users of B may also use this module as the dependency-checking ++frontend, by tweaking their F like below: ++ ++ use Module::ScanDeps; ++ ... ++ my $packer = App::Packer->new( frontend => 'Module::ScanDeps' ); ++ ... ++ ++Please see L for detailed explanation on ++the structure returned by C. ++ ++=head2 B ++ ++ $rv_ref = scan_deps( ++ files => \@files, recurse => $recurse, ++ rv => \%rv, skip => \%skip, ++ compile => $compile, execute => $execute, ++ ); ++ $rv_ref = scan_deps(@files); # shorthand, with recurse => 1 ++ ++This function scans each file in C<@files>, registering their ++dependencies into C<%rv>, and returns a reference to the updated ++C<%rv>. The meaning of keys and values are explained above. ++ ++If C<$recurse> is true, C will call itself recursively, ++to perform a breadth-first search on text files (as defined by the ++-T operator) found in C<%rv>. ++ ++If the C<\%skip> is specified, files that exists as its keys are ++skipped. This is used internally to avoid infinite recursion. ++ ++If C<$compile> or C<$execute> is true, runs C in either ++compile-only or normal mode, then inspects their C<%INC> after ++termination to determine additional runtime dependencies. ++ ++If C<$execute> is an array reference, runs the files contained ++in it instead of C<@files>. ++ ++=head2 B ++ ++Like B, but skips the static scanning part. ++ ++=head2 B ++ ++ @modules = scan_line($line); ++ ++Splits a line into chunks (currently with the semicolon characters), and ++return the union of C calls of them. ++ ++If the line is C<__END__> or C<__DATA__>, a single C<__END__> element is ++returned to signify the end of the program. ++ ++Similarly, it returns a single C<__POD__> if the line matches C; ++the caller is responsible for skipping appropriate number of lines ++until C<=cut>, before calling C again. ++ ++=head2 B ++ ++ $module = scan_chunk($chunk); ++ @modules = scan_chunk($chunk); ++ ++Apply various heuristics to C<$chunk> to find and return the module ++name(s) it contains. In scalar context, returns only the first module ++or C. ++ ++=head2 B ++ ++ $rv_ref = add_deps( rv => \%rv, modules => \@modules ); ++ $rv_ref = add_deps( @modules ); # shorthand, without rv ++ ++Resolves a list of module names to its actual on-disk location, by ++finding in C<@INC>; modules that cannot be found are skipped. ++ ++This function populates the C<%rv> hash with module/filename pairs, and ++returns a reference to it. ++ ++=head1 CAVEATS ++ ++This module intentially ignores the B hack on FreeBSD -- the ++additional directory is removed from C<@INC> altogether. ++ ++The static-scanning heuristic is not likely to be 100% accurate, especially ++on modules that dynamically load other modules. ++ ++Chunks that span multiple lines are not handled correctly. For example, ++this one works: ++ ++ use base 'Foo::Bar'; ++ ++But this one does not: ++ ++ use base ++ 'Foo::Bar'; ++ ++=cut ++ ++my $SeenTk; ++ ++# Pre-loaded module dependencies {{{ ++my %Preload = ( ++ 'AnyDBM_File.pm' => [qw( SDBM_File.pm )], ++ 'Authen/SASL.pm' => 'sub', ++ 'Bio/AlignIO.pm' => 'sub', ++ 'Bio/Assembly/IO.pm' => 'sub', ++ 'Bio/Biblio/IO.pm' => 'sub', ++ 'Bio/ClusterIO.pm' => 'sub', ++ 'Bio/CodonUsage/IO.pm' => 'sub', ++ 'Bio/DB/Biblio.pm' => 'sub', ++ 'Bio/DB/Flat.pm' => 'sub', ++ 'Bio/DB/GFF.pm' => 'sub', ++ 'Bio/DB/Taxonomy.pm' => 'sub', ++ 'Bio/Graphics/Glyph.pm' => 'sub', ++ 'Bio/MapIO.pm' => 'sub', ++ 'Bio/Matrix/IO.pm' => 'sub', ++ 'Bio/Matrix/PSM/IO.pm' => 'sub', ++ 'Bio/OntologyIO.pm' => 'sub', ++ 'Bio/PopGen/IO.pm' => 'sub', ++ 'Bio/Restriction/IO.pm' => 'sub', ++ 'Bio/Root/IO.pm' => 'sub', ++ 'Bio/SearchIO.pm' => 'sub', ++ 'Bio/SeqIO.pm' => 'sub', ++ 'Bio/Structure/IO.pm' => 'sub', ++ 'Bio/TreeIO.pm' => 'sub', ++ 'Bio/LiveSeq/IO.pm' => 'sub', ++ 'Bio/Variation/IO.pm' => 'sub', ++ 'Crypt/Random.pm' => sub { ++ _glob_in_inc('Crypt/Random/Provider', 1); ++ }, ++ 'Crypt/Random/Generator.pm' => sub { ++ _glob_in_inc('Crypt/Random/Provider', 1); ++ }, ++ 'DBI.pm' => sub { ++ grep !/\bProxy\b/, _glob_in_inc('DBD', 1); ++ }, ++ 'DBIx/SearchBuilder.pm' => 'sub', ++ 'DBIx/ReportBuilder.pm' => 'sub', ++ 'Device/ParallelPort.pm' => 'sub', ++ 'Device/SerialPort.pm' => [ qw( ++ termios.ph asm/termios.ph sys/termiox.ph sys/termios.ph sys/ttycom.ph ++ ) ], ++ 'ExtUtils/MakeMaker.pm' => sub { ++ grep /\bMM_/, _glob_in_inc('ExtUtils', 1); ++ }, ++ 'File/Basename.pm' => [qw( re.pm )], ++ 'File/Spec.pm' => sub { ++ require File::Spec; ++ map { my $name = $_; $name =~ s!::!/!g; "$name.pm" } @File::Spec::ISA; ++ }, ++ 'HTTP/Message.pm' => [ qw( ++ URI/URL.pm URI.pm ++ ) ], ++ 'IO.pm' => [ qw( ++ IO/Handle.pm IO/Seekable.pm IO/File.pm ++ IO/Pipe.pm IO/Socket.pm IO/Dir.pm ++ ) ], ++ 'IO/Socket.pm' => [qw( IO/Socket/UNIX.pm )], ++ 'LWP/UserAgent.pm' => [ qw( ++ URI/URL.pm URI/http.pm LWP/Protocol/http.pm ++ LWP/Protocol/https.pm ++ ), _glob_in_inc("LWP/Authen", 1) ], ++ 'Locale/Maketext/Lexicon.pm' => 'sub', ++ 'Locale/Maketext/GutsLoader.pm' => [qw( Locale/Maketext/Guts.pm )], ++ 'Mail/Audit.pm' => 'sub', ++ 'Math/BigInt.pm' => 'sub', ++ 'Math/BigFloat.pm' => 'sub', ++ 'Math/Symbolic.pm' => 'sub', ++ 'Module/Build.pm' => 'sub', ++ 'Module/Pluggable.pm' => sub { ++ _glob_in_inc('$CurrentPackage/Plugin', 1); ++ }, ++ 'MIME/Decoder.pm' => 'sub', ++ 'Net/DNS/RR.pm' => 'sub', ++ 'Net/FTP.pm' => 'sub', ++ 'Net/SSH/Perl.pm' => 'sub', ++ 'PDF/API2/Resource/Font.pm' => 'sub', ++ 'PDF/API2/Basic/TTF/Font.pm' => sub { ++ _glob_in_inc('PDF/API2/Basic/TTF', 1); ++ }, ++ 'PDF/Writer.pm' => 'sub', ++ 'POE' => [ qw( ++ POE/Kernel.pm POE/Session.pm ++ ) ], ++ 'POE/Kernel.pm' => [ ++ map "POE/Resource/$_.pm", qw( ++ Aliases Events Extrefs FileHandles ++ SIDs Sessions Signals Statistics ++ ) ++ ], ++ 'Parse/AFP.pm' => 'sub', ++ 'Parse/Binary.pm' => 'sub', ++ 'Regexp/Common.pm' => 'sub', ++ 'SerialJunk.pm' => [ qw( ++ termios.ph asm/termios.ph sys/termiox.ph sys/termios.ph sys/ttycom.ph ++ ) ], ++ 'SOAP/Lite.pm' => sub { ++ (($] >= 5.008 ? ('utf8.pm') : ()), _glob_in_inc('SOAP/Transport', 1)); ++ }, ++ 'SQL/Parser.pm' => sub { ++ _glob_in_inc('SQL/Dialects', 1); ++ }, ++ 'SVK/Command.pm' => sub { ++ _glob_in_inc('SVK', 1); ++ }, ++ 'SVN/Core.pm' => sub { ++ _glob_in_inc('SVN', 1), ++ map "auto/SVN/$_->{name}", _glob_in_inc('auto/SVN'), ++ }, ++ 'Template.pm' => 'sub', ++ 'Term/ReadLine.pm' => 'sub', ++ 'Test/Deep.pm' => 'sub', ++ 'Tk.pm' => sub { ++ $SeenTk = 1; ++ qw( Tk/FileSelect.pm Encode/Unicode.pm ); ++ }, ++ 'Tk/Balloon.pm' => [qw( Tk/balArrow.xbm )], ++ 'Tk/BrowseEntry.pm' => [qw( Tk/cbxarrow.xbm Tk/arrowdownwin.xbm )], ++ 'Tk/ColorEditor.pm' => [qw( Tk/ColorEdit.xpm )], ++ 'Tk/DragDrop/Common.pm' => sub { ++ _glob_in_inc('Tk/DragDrop', 1), ++ }, ++ 'Tk/FBox.pm' => [qw( Tk/folder.xpm Tk/file.xpm )], ++ 'Tk/Getopt.pm' => [qw( Tk/openfolder.xpm Tk/win.xbm )], ++ 'Tk/Toplevel.pm' => [qw( Tk/Wm.pm )], ++ 'URI.pm' => sub { ++ grep !/.\b[_A-Z]/, _glob_in_inc('URI', 1); ++ }, ++ 'Win32/EventLog.pm' => [qw( Win32/IPC.pm )], ++ 'Win32/Exe.pm' => 'sub', ++ 'Win32/TieRegistry.pm' => [qw( Win32API/Registry.pm )], ++ 'Win32/SystemInfo.pm' => [qw( Win32/cpuspd.dll )], ++ 'XML/Parser.pm' => sub { ++ _glob_in_inc('XML/Parser/Style', 1), ++ _glob_in_inc('XML/Parser/Encodings', 1), ++ }, ++ 'XML/Parser/Expat.pm' => sub { ++ ($] >= 5.008) ? ('utf8.pm') : (); ++ }, ++ 'XML/SAX.pm' => [qw( XML/SAX/ParserDetails.ini ) ], ++ 'XMLRPC/Lite.pm' => sub { ++ _glob_in_inc('XMLRPC/Transport', 1),; ++ }, ++ 'diagnostics.pm' => sub { ++ # shamelessly taken and adapted from diagnostics.pm ++ use Config; ++ my($privlib, $archlib) = @Config{qw(privlibexp archlibexp)}; ++ if ($^O eq 'VMS') { ++ require VMS::Filespec; ++ $privlib = VMS::Filespec::unixify($privlib); ++ $archlib = VMS::Filespec::unixify($archlib); ++ } ++ ++ for ( ++ "pod/perldiag.pod", ++ "Pod/perldiag.pod", ++ "pod/perldiag-$Config{version}.pod", ++ "Pod/perldiag-$Config{version}.pod", ++ "pods/perldiag.pod", ++ "pods/perldiag-$Config{version}.pod", ++ ) { ++ return $_ if _find_in_inc($_); ++ } ++ ++ for ( ++ "$archlib/pods/perldiag.pod", ++ "$privlib/pods/perldiag-$Config{version}.pod", ++ "$privlib/pods/perldiag.pod", ++ ) { ++ return $_ if -f $_; ++ } ++ ++ return 'pod/perldiag.pod'; ++ }, ++ 'utf8.pm' => [ ++ 'utf8_heavy.pl', do { ++ my $dir = 'unicore'; ++ my @subdirs = qw( To ); ++ my @files = map "$dir/lib/$_->{name}", _glob_in_inc("$dir/lib"); ++ ++ if (@files) { ++ # 5.8.x ++ push @files, (map "$dir/$_.pl", qw( Exact Canonical )); ++ } ++ else { ++ # 5.6.x ++ $dir = 'unicode'; ++ @files = map "$dir/Is/$_->{name}", _glob_in_inc("$dir/Is") ++ or return; ++ push @subdirs, 'In'; ++ } ++ ++ foreach my $subdir (@subdirs) { ++ foreach (_glob_in_inc("$dir/$subdir")) { ++ push @files, "$dir/$subdir/$_->{name}"; ++ } ++ } ++ @files; ++ } ++ ], ++ 'charnames.pm' => [ ++ _find_in_inc('unicore/Name.pl') ? 'unicore/Name.pl' : 'unicode/Name.pl' ++ ], ++); ++ ++# }}} ++ ++my $Keys = 'files|keys|recurse|rv|skip|first|execute|compile'; ++sub scan_deps { ++ my %args = ( ++ rv => {}, ++ (@_ and $_[0] =~ /^(?:$Keys)$/o) ? @_ : (files => [@_], recurse => 1) ++ ); ++ ++ scan_deps_static(\%args); ++ ++ if ($args{execute} or $args{compile}) { ++ scan_deps_runtime( ++ rv => $args{rv}, ++ files => $args{files}, ++ execute => $args{execute}, ++ compile => $args{compile}, ++ skip => $args{skip} ++ ); ++ } ++ ++ return ($args{rv}); ++} ++ ++sub scan_deps_static { ++ my ($args) = @_; ++ my ($files, $keys, $recurse, $rv, $skip, $first, $execute, $compile) = ++ @$args{qw( files keys recurse rv skip first execute compile )}; ++ ++ $rv ||= {}; ++ $skip ||= {}; ++ ++ foreach my $file (@{$files}) { ++ my $key = shift @{$keys}; ++ next if $skip->{$file}++; ++ next if is_insensitive_fs() ++ and $file ne lc($file) and $skip->{lc($file)}++; ++ ++ local *FH; ++ open FH, $file or die "Cannot open $file: $!"; ++ ++ $SeenTk = 0; ++ ++ # Line-by-line scanning ++ LINE: ++ while () { ++ chomp(my $line = $_); ++ foreach my $pm (scan_line($line)) { ++ last LINE if $pm eq '__END__'; ++ ++ if ($pm eq '__POD__') { ++ while () { last if (/^=cut/) } ++ next LINE; ++ } ++ ++ $pm = 'CGI/Apache.pm' if /^Apache(?:\.pm)$/; ++ ++ add_deps( ++ used_by => $key, ++ rv => $rv, ++ modules => [$pm], ++ skip => $skip ++ ); ++ ++ my $preload = $Preload{$pm} or next; ++ if ($preload eq 'sub') { ++ $pm =~ s/\.p[mh]$//i; ++ $preload = [ _glob_in_inc($pm, 1) ]; ++ } ++ elsif (UNIVERSAL::isa($preload, 'CODE')) { ++ $preload = [ $preload->($pm) ]; ++ } ++ ++ add_deps( ++ used_by => $key, ++ rv => $rv, ++ modules => $preload, ++ skip => $skip ++ ); ++ } ++ } ++ close FH; ++ ++ # }}} ++ } ++ ++ # Top-level recursion handling {{{ ++ while ($recurse) { ++ my $count = keys %$rv; ++ my @files = sort grep -T $_->{file}, values %$rv; ++ scan_deps_static({ ++ files => [ map $_->{file}, @files ], ++ keys => [ map $_->{key}, @files ], ++ rv => $rv, ++ skip => $skip, ++ recurse => 0, ++ }) or ($args->{_deep} and return); ++ last if $count == keys %$rv; ++ } ++ ++ # }}} ++ ++ return $rv; ++} ++ ++sub scan_deps_runtime { ++ my %args = ( ++ perl => $^X, ++ rv => {}, ++ (@_ and $_[0] =~ /^(?:$Keys)$/o) ? @_ : (files => [@_], recurse => 1) ++ ); ++ my ($files, $rv, $execute, $compile, $skip, $perl) = ++ @args{qw( files rv execute compile skip perl )}; ++ ++ $files = (ref($files)) ? $files : [$files]; ++ ++ my ($inchash, $incarray, $dl_shared_objects) = ({}, [], []); ++ if ($compile) { ++ my $file; ++ ++ foreach $file (@$files) { ++ ($inchash, $dl_shared_objects, $incarray) = ({}, [], []); ++ _compile($perl, $file, $inchash, $dl_shared_objects, $incarray); ++ ++ my $rv_sub = _make_rv($inchash, $dl_shared_objects, $incarray); ++ _merge_rv($rv_sub, $rv); ++ } ++ } ++ elsif ($execute) { ++ my $excarray = (ref($execute)) ? $execute : [@$files]; ++ my $exc; ++ my $first_flag = 1; ++ foreach $exc (@$excarray) { ++ ($inchash, $dl_shared_objects, $incarray) = ({}, [], []); ++ _execute( ++ $perl, $exc, $inchash, $dl_shared_objects, $incarray, ++ $first_flag ++ ); ++ $first_flag = 0; ++ } ++ ++ my $rv_sub = _make_rv($inchash, $dl_shared_objects, $incarray); ++ _merge_rv($rv_sub, $rv); ++ } ++ ++ return ($rv); ++} ++ ++sub scan_line { ++ my $line = shift; ++ my %found; ++ ++ return '__END__' if $line =~ /^__(?:END|DATA)__$/; ++ return '__POD__' if $line =~ /^=\w/; ++ ++ $line =~ s/\s*#.*$//; ++ $line =~ s/[\\\/]+/\//g; ++ ++ foreach (split(/;/, $line)) { ++ if (/^\s*package\s+(\w+)/) { ++ $CurrentPackage = $1; ++ $CurrentPackage =~ s{::}{/}g; ++ return; ++ } ++ return if /^\s*(use|require)\s+[\d\._]+/; ++ if (my ($autouse) = /^\s*use\s+autouse\s+(["'].*?["']|\w+)/) ++ { ++ $autouse =~ s/["']//g; ++ $autouse =~ s{::}{/}g; ++ return ("autouse.pm", "$autouse.pm"); ++ } ++ ++ if (my ($libs) = /\b(?:use\s+lib\s+|(?:unshift|push)\W+\@INC\W+)(.+)/) ++ { ++ my $archname = ++ defined($Config{archname}) ? $Config{archname} : ''; ++ my $ver = defined($Config{version}) ? $Config{version} : ''; ++ foreach (grep(/\w/, split(/["';() ]/, $libs))) { ++ unshift(@INC, "$_/$ver") if -d "$_/$ver"; ++ unshift(@INC, "$_/$archname") if -d "$_/$archname"; ++ unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname"; ++ } ++ next; ++ } ++ ++ $found{$_}++ for scan_chunk($_); ++ } ++ ++ return sort keys %found; ++} ++ ++sub scan_chunk { ++ my $chunk = shift; ++ ++ # Module name extraction heuristics {{{ ++ my $module = eval { ++ $_ = $chunk; ++ ++ return [ 'base.pm', ++ map { s{::}{/}g; "$_.pm" } ++ grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] ++ if /^\s* use \s+ base \s+ (.*)/sx; ++ ++ return [ 'Class/Autouse.pm', ++ map { s{::}{/}g; "$_.pm" } ++ grep { length and !/^:|^q[qw]?$/ } split(/[^\w:]+/, $1) ] ++ if /^\s* use \s+ Class::Autouse \s+ (.*)/sx ++ or /^\s* Class::Autouse \s* -> \s* autouse \s* (.*)/sx; ++ ++ return [ 'POE.pm', ++ map { s{::}{/}g; "POE/$_.pm" } ++ grep { length and !/^q[qw]?$/ } split(/[^\w:]+/, $1) ] ++ if /^\s* use \s+ POE \s+ (.*)/sx; ++ ++ return [ 'encoding.pm', ++ map { _find_encoding($_) } ++ grep { length and !/^q[qw]?$/ } split(/[^\w:-]+/, $1) ] ++ if /^\s* use \s+ encoding \s+ (.*)/sx; ++ ++ return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']+)/; ++ return $1 ++ if /(?:^|\s)(?:use|no|require)\s+\(\s*([\w:\.\-\\\/\"\']+)\s*\)/; ++ ++ if ( s/(?:^|\s)eval\s+\"([^\"]+)\"/$1/ ++ or s/(?:^|\s)eval\s*\(\s*\"([^\"]+)\"\s*\)/$1/) ++ { ++ return $1 if /(?:^|\s)(?:use|no|require)\s+([\w:\.\-\\\/\"\']*)/; ++ } ++ ++ return "File/Glob.pm" if /<[^>]*[^\$\w>][^>]*>/; ++ return "DBD/$1.pm" if /\b[Dd][Bb][Ii]:(\w+):/; ++ if (/(?:(:encoding)|\b(?:en|de)code)\(\s*['"]?([-\w]+)/) { ++ my $mod = _find_encoding($2); ++ return [ 'PerlIO.pm', $mod ] if $1 and $mod; ++ return $mod if $mod; ++ } ++ return $1 if /(?:^|\s)(?:do|require)\s+[^"]*"(.*?)"/; ++ return $1 if /(?:^|\s)(?:do|require)\s+[^']*'(.*?)'/; ++ return $1 if /[^\$]\b([\w:]+)->\w/ and $1 ne 'Tk'; ++ return $1 if /\b(\w[\w:]*)::\w+\(/; ++ ++ if ($SeenTk) { ++ my @modules; ++ while (/->\s*([A-Z]\w+)/g) { ++ push @modules, "Tk/$1.pm"; ++ } ++ while (/->\s*Scrolled\W+([A-Z]\w+)/g) { ++ push @modules, "Tk/$1.pm"; ++ push @modules, "Tk/Scrollbar.pm"; ++ } ++ return \@modules; ++ } ++ return; ++ }; ++ ++ # }}} ++ ++ return unless defined($module); ++ return wantarray ? @$module : $module->[0] if ref($module); ++ ++ $module =~ s/^['"]//; ++ return unless $module =~ /^\w/; ++ ++ $module =~ s/\W+$//; ++ $module =~ s/::/\//g; ++ return if $module =~ /^(?:[\d\._]+|'.*[^']|".*[^"])$/; ++ ++ $module .= ".pm" unless $module =~ /\./; ++ return $module; ++} ++ ++sub _find_encoding { ++ return unless $] >= 5.008 and eval { require Encode; %Encode::ExtModule }; ++ ++ my $mod = $Encode::ExtModule{ Encode::find_encoding($_[0])->name } ++ or return; ++ $mod =~ s{::}{/}g; ++ return "$mod.pm"; ++} ++ ++sub _add_info { ++ my ($rv, $module, $file, $used_by, $type) = @_; ++ return unless defined($module) and defined($file); ++ ++ $rv->{$module} ||= { ++ file => $file, ++ key => $module, ++ type => $type, ++ }; ++ ++ push @{ $rv->{$module}{used_by} }, $used_by ++ if defined($used_by) ++ and $used_by ne $module ++ and !grep { $_ eq $used_by } @{ $rv->{$module}{used_by} }; ++} ++ ++sub add_deps { ++ my %args = ++ ((@_ and $_[0] =~ /^(?:modules|rv|used_by)$/) ++ ? @_ ++ : (rv => (ref($_[0]) ? shift(@_) : undef), modules => [@_])); ++ ++ my $rv = $args{rv} || {}; ++ my $skip = $args{skip} || {}; ++ my $used_by = $args{used_by}; ++ ++ foreach my $module (@{ $args{modules} }) { ++ if (exists $rv->{$module}) { ++ _add_info($rv, undef, undef, $used_by, undef); ++ next; ++ } ++ ++ my $file = _find_in_inc($module) or next; ++ next if $skip->{$file}; ++ next if is_insensitive_fs() and $skip->{lc($file)}; ++ ++ my $type = 'module'; ++ $type = 'data' unless $file =~ /\.p[mh]$/i; ++ _add_info($rv, $module, $file, $used_by, $type); ++ ++ if ($module =~ /(.*?([^\/]*))\.p[mh]$/i) { ++ my ($path, $basename) = ($1, $2); ++ ++ foreach (_glob_in_inc("auto/$path")) { ++ next if $skip->{$_->{file}}; ++ next if is_insensitive_fs() and $skip->{lc($_->{file})}; ++ next if $_->{file} =~ m{\bauto/$path/.*/}; # weed out subdirs ++ next if $_->{name} =~ m/(?:^|\/)\.(?:exists|packlist)$/; ++ my $ext = lc($1) if $_->{name} =~ /(\.[^.]+)$/; ++ next if $ext eq lc(lib_ext()); ++ my $type = 'shared' if $ext eq lc(dl_ext()); ++ $type = 'autoload' if $ext eq '.ix' or $ext eq '.al'; ++ $type ||= 'data'; ++ ++ _add_info($rv, "auto/$path/$_->{name}", $_->{file}, $module, ++ $type); ++ } ++ } ++ } ++ ++ return $rv; ++} ++ ++sub _find_in_inc { ++ my $file = shift; ++ ++ # absolute file names ++ return $file if -f $file; ++ ++ foreach my $dir (grep !/\bBSDPAN\b/, @INC) { ++ return "$dir/$file" if -f "$dir/$file"; ++ } ++ return; ++} ++ ++sub _glob_in_inc { ++ my $subdir = shift; ++ my $pm_only = shift; ++ my @files; ++ ++ require File::Find; ++ ++ $subdir =~ s/\$CurrentPackage/$CurrentPackage/; ++ ++ foreach my $dir (map "$_/$subdir", grep !/\bBSDPAN\b/, @INC) { ++ next unless -d $dir; ++ File::Find::find( ++ sub { ++ my $name = $File::Find::name; ++ $name =~ s!^\Q$dir\E/!!; ++ return if $pm_only and lc($name) !~ /\.p[mh]$/i; ++ push @files, $pm_only ++ ? "$subdir/$name" ++ : { file => $File::Find::name, ++ name => $name, ++ } ++ if -f; ++ }, ++ $dir ++ ); ++ } ++ ++ return @files; ++} ++ ++# App::Packer compatibility functions ++ ++sub new { ++ my ($class, $self) = @_; ++ return bless($self ||= {}, $class); ++} ++ ++sub set_file { ++ my $self = shift; ++ foreach my $script (@_) { ++ my $basename = $script; ++ $basename =~ s/.*\///; ++ $self->{main} = { ++ key => $basename, ++ file => $script, ++ }; ++ } ++} ++ ++sub set_options { ++ my $self = shift; ++ my %args = @_; ++ foreach my $module (@{ $args{add_modules} }) { ++ $module =~ s/::/\//g; ++ $module .= '.pm' unless $module =~ /\.p[mh]$/i; ++ my $file = _find_in_inc($module) or next; ++ $self->{files}{$module} = $file; ++ } ++} ++ ++sub calculate_info { ++ my $self = shift; ++ my $rv = scan_deps( ++ keys => [ $self->{main}{key}, sort keys %{ $self->{files} }, ], ++ files => [ $self->{main}{file}, ++ map { $self->{files}{$_} } sort keys %{ $self->{files} }, ++ ], ++ recurse => 1, ++ ); ++ ++ my $info = { ++ main => { file => $self->{main}{file}, ++ store_as => $self->{main}{key}, ++ }, ++ }; ++ ++ my %cache = ($self->{main}{key} => $info->{main}); ++ foreach my $key (sort keys %{ $self->{files} }) { ++ my $file = $self->{files}{$key}; ++ ++ $cache{$key} = $info->{modules}{$key} = { ++ file => $file, ++ store_as => $key, ++ used_by => [ $self->{main}{key} ], ++ }; ++ } ++ ++ foreach my $key (sort keys %{$rv}) { ++ my $val = $rv->{$key}; ++ if ($cache{ $val->{key} }) { ++ push @{ $info->{ $val->{type} }->{ $val->{key} }->{used_by} }, ++ @{ $val->{used_by} }; ++ } ++ else { ++ $cache{ $val->{key} } = $info->{ $val->{type} }->{ $val->{key} } = ++ { file => $val->{file}, ++ store_as => $val->{key}, ++ used_by => $val->{used_by}, ++ }; ++ } ++ } ++ ++ $self->{info} = { main => $info->{main} }; ++ ++ foreach my $type (sort keys %{$info}) { ++ next if $type eq 'main'; ++ ++ my @val; ++ if (UNIVERSAL::isa($info->{$type}, 'HASH')) { ++ foreach my $val (sort values %{ $info->{$type} }) { ++ @{ $val->{used_by} } = map $cache{$_} || "!!$_!!", ++ @{ $val->{used_by} }; ++ push @val, $val; ++ } ++ } ++ ++ $type = 'modules' if $type eq 'module'; ++ $self->{info}{$type} = \@val; ++ } ++} ++ ++sub get_files { ++ my $self = shift; ++ return $self->{info}; ++} ++ ++# scan_deps_runtime utility functions ++ ++sub _compile { ++ my ($perl, $file, $inchash, $dl_shared_objects, $incarray) = @_; ++ ++ my ($fhout, $fname) = File::Temp::tempfile("XXXXXX"); ++ my $fhin = FileHandle->new($file) or die "Couldn't open $file\n"; ++ ++ my $line = do { local $/; <$fhin> }; ++ $line =~ s/use Module::ScanDeps::DataFeed.*?\n//sg; ++ $line =~ s/^(.*?)((?:[\r\n]+__(?:DATA|END)__[\r\n]+)|$)/ ++use Module::ScanDeps::DataFeed '$fname.out'; ++sub { ++$1 ++} ++$2/s; ++ $fhout->print($line); ++ $fhout->close; ++ $fhin->close; ++ ++ system($perl, $fname); ++ ++ _extract_info("$fname.out", $inchash, $dl_shared_objects, $incarray); ++ unlink("$fname"); ++ unlink("$fname.out"); ++} ++ ++sub _execute { ++ my ($perl, $file, $inchash, $dl_shared_objects, $incarray, $firstflag) = @_; ++ ++ $DB::single = $DB::single = 1; ++ my ($fhout, $fname) = File::Temp::tempfile("XXXXXX"); ++ $fname = _abs_path($fname); ++ my $fhin = FileHandle->new($file) or die "Couldn't open $file"; ++ ++ my $line = do { local $/; <$fhin> }; ++ $line =~ s/use Module::ScanDeps::DataFeed.*?\n//sg; ++ $line = "use Module::ScanDeps::DataFeed '$fname.out';\n" . $line; ++ $fhout->print($line); ++ $fhout->close; ++ $fhin->close; ++ ++ File::Path::rmtree( ['_Inline'], 0, 1); # XXX hack ++ system($perl, $fname) == 0 or die "SYSTEM ERROR in executing $file: $?"; ++ ++ _extract_info("$fname.out", $inchash, $dl_shared_objects, $incarray); ++ unlink("$fname"); ++ unlink("$fname.out"); ++} ++ ++sub _make_rv { ++ my ($inchash, $dl_shared_objects, $inc_array) = @_; ++ ++ my $rv = {}; ++ my @newinc = map(quotemeta($_), @$inc_array); ++ my $inc = join('|', sort { length($b) <=> length($a) } @newinc); ++ ++ require File::Spec; ++ ++ my $key; ++ foreach $key (keys(%$inchash)) { ++ my $newkey = $key; ++ $newkey =~ s"^(?:(?:$inc)/?)""sg if File::Spec->file_name_is_absolute($newkey); ++ ++ $rv->{$newkey} = { ++ 'used_by' => [], ++ 'file' => $inchash->{$key}, ++ 'type' => _gettype($inchash->{$key}), ++ 'key' => $key ++ }; ++ } ++ ++ my $dl_file; ++ foreach $dl_file (@$dl_shared_objects) { ++ my $key = $dl_file; ++ $key =~ s"^(?:(?:$inc)/?)""s; ++ ++ $rv->{$key} = { ++ 'used_by' => [], ++ 'file' => $dl_file, ++ 'type' => 'shared', ++ 'key' => $key ++ }; ++ } ++ ++ return $rv; ++} ++ ++sub _extract_info { ++ my ($fname, $inchash, $dl_shared_objects, $incarray) = @_; ++ ++ use vars qw(%inchash @dl_shared_objects @incarray); ++ my $fh = FileHandle->new($fname) or die "Couldn't open $fname"; ++ my $line = do { local $/; <$fh> }; ++ $fh->close; ++ ++ eval $line; ++ ++ $inchash->{$_} = $inchash{$_} for keys %inchash; ++ @$dl_shared_objects = @dl_shared_objects; ++ @$incarray = @incarray; ++} ++ ++sub _gettype { ++ my $name = shift; ++ my $dlext = quotemeta(dl_ext()); ++ ++ return 'autoload' if $name =~ /(?:\.ix|\.al|\.bs)$/i; ++ return 'module' if $name =~ /\.p[mh]$/i; ++ return 'shared' if $name =~ /\.$dlext$/i; ++ return 'data'; ++} ++ ++sub _merge_rv { ++ my ($rv_sub, $rv) = @_; ++ ++ my $key; ++ foreach $key (keys(%$rv_sub)) { ++ my %mark; ++ if ($rv->{$key} and _not_dup($key, $rv, $rv_sub)) { ++ warn "Different modules for file '$key' were found.\n" ++ . " -> Using '" . _abs_path($rv_sub->{$key}{file}) . "'.\n" ++ . " -> Ignoring '" . _abs_path($rv->{$key}{file}) . "'.\n"; ++ $rv->{$key}{used_by} = [ ++ grep (!$mark{$_}++, ++ @{ $rv->{$key}{used_by} }, ++ @{ $rv_sub->{$key}{used_by} }) ++ ]; ++ @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; ++ $rv->{$key}{file} = $rv_sub->{$key}{file}; ++ } ++ elsif ($rv->{$key}) { ++ $rv->{$key}{used_by} = [ ++ grep (!$mark{$_}++, ++ @{ $rv->{$key}{used_by} }, ++ @{ $rv_sub->{$key}{used_by} }) ++ ]; ++ @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; ++ } ++ else { ++ $rv->{$key} = { ++ used_by => [ @{ $rv_sub->{$key}{used_by} } ], ++ file => $rv_sub->{$key}{file}, ++ key => $rv_sub->{$key}{key}, ++ type => $rv_sub->{$key}{type} ++ }; ++ ++ @{ $rv->{$key}{used_by} } = grep length, @{ $rv->{$key}{used_by} }; ++ } ++ } ++} ++ ++sub _not_dup { ++ my ($key, $rv1, $rv2) = @_; ++ (_abs_path($rv1->{$key}{file}) ne _abs_path($rv2->{$key}{file})); ++} ++ ++sub _abs_path { ++ return join( ++ '/', ++ Cwd::abs_path(File::Basename::dirname($_[0])), ++ File::Basename::basename($_[0]), ++ ); ++} ++ ++1; ++ ++__END__ ++ ++=head1 SEE ALSO ++ ++L is a bundled utility that writes C section ++for a number of files. ++ ++An application of B is to generate executables from ++scripts that contains prerequisite modules; this module supports two ++such projects, L and L. Please see their respective ++documentations on CPAN for further information. ++ ++=head1 AUTHORS ++ ++Audrey Tang Eautrijus@autrijus.orgE ++ ++Parts of heuristics were deduced from: ++ ++=over 4 ++ ++=item * ++ ++B by ActiveState Tools Corp L ++ ++=item * ++ ++B by IndigoStar, Inc L ++ ++=back ++ ++The B function is contributed by Edward S. Peschko. ++ ++L is the official website for this module. You ++can write to the mailing list at Epar@perl.orgE, or send an empty ++mail to Epar-subscribe@perl.orgE to participate in the discussion. ++ ++Please submit bug reports to Ebug-Module-ScanDeps@rt.cpan.orgE. ++ ++=head1 COPYRIGHT ++ ++Copyright 2002, 2003, 2004, 2005, 2006 by ++Audrey Tang Eautrijus@autrijus.orgE. ++ ++This program is free software; you can redistribute it and/or modify it ++under the same terms as Perl itself. ++ ++See L ++ ++=cut +diff --git a/feeds/packages/lang/perl/files/config.sh-arm.in b/feeds/packages/lang/perl/files/config.sh-arm.in +new file mode 100644 +index 0000000..a21991f +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-arm.in +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/config.sh-armeb.in b/feeds/packages/lang/perl/files/config.sh-armeb.in +new file mode 100644 +index 0000000..81bc555 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-armeb.in +@@ -0,0 +1,1068 @@ ++#!/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' ++api_subversion='0' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/config.sh-avr32.in b/feeds/packages/lang/perl/files/config.sh-avr32.in +new file mode 100644 +index 0000000..1108364 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-avr32.in +@@ -0,0 +1,1070 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/config.sh-i486.in b/feeds/packages/lang/perl/files/config.sh-i486.in +new file mode 100644 +index 0000000..d05fdd0 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-i486.in +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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 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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/config.sh-mips.in b/feeds/packages/lang/perl/files/config.sh-mips.in +new file mode 100644 +index 0000000..8058cea +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-mips.in +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@merope.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='' ++subversion='0' ++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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/config.sh-mipsel.in b/feeds/packages/lang/perl/files/config.sh-mipsel.in +new file mode 100644 +index 0000000..0c9fd2f +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-mipsel.in +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@merope.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='' ++subversion='0' ++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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/config.sh-powerpc.in b/feeds/packages/lang/perl/files/config.sh-powerpc.in +new file mode 100644 +index 0000000..e626586 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/config.sh-powerpc.in +@@ -0,0 +1,1068 @@ ++#!/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' ++api_version='10' ++api_versionstring='5.10.0' ++ar='ar' ++archlib='' ++archlibexp='' ++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' ++ccdlflags='-Wl,-E' ++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' ++dynamic_ext='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' ++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='' ++installarchlib='/usr/lib/perl5/5.10' ++installbin='/usr/bin' ++initialinstalllocation='/usr/bin' ++installhtml1dir='' ++installhtml3dir='' ++installman1dir='' ++installman3dir='' ++installprefix='/usr' ++installprefixexp='/usr' ++installprivlib='/usr/lib/perl5/5.10' ++installscript='/usr/bin' ++installsitearch='/usr/lib/perl5/5.10' ++installsitebin='/usr/bin' ++installsitehtml1dir='' ++installsitehtml3dir='' ++installsitelib='/usr/lib/perl5/5.10' ++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.a' ++libpth='%%LIBDIRS%%' ++libs='-lgdbm -ldb -lnsl -ldl -lm -lcrypt -lutil -lc' ++libsdirs='%%LIBDIRS%%' ++libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' ++#libsfound=' /usr/lib/libnsl.so /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 nsl 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' ++nonxs_ext='Compress/Zlib Errno IO_Compress_Base IO_Compress_Zlib' ++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' ++patchlevel='10' ++path_sep=':' ++perl5='' ++perl='' ++perl_patchlevel='' ++perladmin='root@maia.dev.null' ++perllibs='-lnsl -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' ++privlib='/usr/lib/perl5/5.10' ++privlibexp='/usr/lib/perl5/5.10' ++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='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='false' ++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='' ++version='5.10.0' ++version_patchlevel_string='version 10 subversion 0' ++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_VERSION=10 ++PERL_SUBVERSION=0 ++PERL_API_REVISION=5 ++PERL_API_VERSION=10 ++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' +diff --git a/feeds/packages/lang/perl/files/perlmod-deps.sh b/feeds/packages/lang/perl/files/perlmod-deps.sh +new file mode 100644 +index 0000000..d144b4d +--- /dev/null ++++ b/feeds/packages/lang/perl/files/perlmod-deps.sh +@@ -0,0 +1,81 @@ ++#!/bin/sh ++# ++# Generate perl module package dependencies ++# ++# Copyright (C) 2007 Peter Colberg ++# Licensed under the terms of the GNU General Public License. ++# ++ ++if [ $# -lt 3 ]; then ++ echo >&2 "Usage: $(basename $0) STAGING-DIR PERL-BUILD-DIR [FILES...] [DIRECTORIES...]" ++ exit 1 ++fi ++ ++STAGING_DIR="$1" ++PERL_BIN="$STAGING_DIR/usr/bin/perl" ++PERL_LIB="$STAGING_DIR/usr/lib/perl5/5.10" ++INC_DIR="$(dirname $0)" ++shift ++ ++"$PERL_BIN" -I"$INC_DIR" -I"$PERL_LIB" - "$@" <<'PERL_SCRIPT' ++use strict; ++use warnings; ++ ++use Module::ScanDeps; ++use File::Find; ++use Cwd; ++ ++our $sitelib = "/usr/lib/perl5/5.10"; ++ ++sub scandeps { ++ my $builddir = Cwd::abs_path(shift); ++ my @scanpaths = @_; ++ my ($curdir, @pkgdirs, $dir, @deps, %depends, $file); ++ our ($pkg, %bundles, $path, @files); ++ ++ @pkgdirs = glob($builddir . "/*/ipkg"); ++ $curdir = getcwd(); ++ @INC = (); ++ for $dir (@pkgdirs) { ++ chdir($dir) or die "$dir: $!"; ++ for $pkg (glob("*")) { ++ chdir($dir . "/" . $pkg . $sitelib) or next; ++ push @INC, getcwd(); ++ sub wanted { ++ return unless (-f $_); ++ s/^\.\///; ++ $bundles{$_} = $pkg; ++ } ++ find({ wanted => \&wanted, no_chdir => 1 }, "."); ++ } ++ } ++ chdir($curdir) or die "$curdir: $!\n"; ++ ++ for $path (@scanpaths) { ++ sub scan_wanted { ++ return unless (-f $_ and /\.(pl|pm)$/); ++ push @files, $_; ++ } ++ if (-f $path) { ++ push @files, $path; ++ } ++ elsif (-d $path) { ++ find({ wanted => \&scan_wanted, no_chdir => 1 }, $path); ++ } ++ } ++ ++ @deps = keys %{scan_deps(files => \@files, recurse => 0)}; ++ for $file (grep { not exists $bundles{$_} } @deps) { ++ warn "could not resolve dependency: $file\n"; ++ } ++ %depends = map { $bundles{$_}, 1 } grep { exists $bundles{$_} } @deps; ++ ++ if (%depends) { ++ print join(' ', 'perl', sort keys %depends), "\n"; ++ } ++} ++ ++if (@ARGV > 1) { ++ scandeps(@ARGV); ++} ++PERL_SCRIPT +diff --git a/feeds/packages/lang/perl/files/scan-perlbase.sh b/feeds/packages/lang/perl/files/scan-perlbase.sh +new file mode 100644 +index 0000000..d9fe80a +--- /dev/null ++++ b/feeds/packages/lang/perl/files/scan-perlbase.sh +@@ -0,0 +1,176 @@ ++#!/bin/sh ++# ++# Generate perl base modules package definitions ++# ++# Copyright (C) 2007 Peter Colberg ++# Licensed under the terms of the GNU General Public License. ++# ++ ++if [ $# -lt 1 ]; then ++ echo >&2 "Usage: $(basename $0) STAGING-DIR [OUTFILE]" ++ exit 1 ++fi ++ ++STAGING_DIR="$1" ++PERL_BIN="$STAGING_DIR/usr/bin/perl" ++PERL_LIB="$STAGING_DIR/usr/lib/perl5/5.10" ++INC_DIR="$(dirname $0)" ++shift ++ ++"$PERL_BIN" -I"$INC_DIR" -I"$PERL_LIB" - "$PERL_LIB" "$@" <<'PERL_SCRIPT' ++use strict; ++use warnings; ++ ++use Module::ScanDeps; ++use File::Find; ++use File::Basename; ++ ++our $skipfiles = 'CORE vmsish.pm auto/sdbm'; ++ ++our %defmodules = ( ++ 'essential' => 'lib.pm vars.pm strict.pm warnings.pm warnings Carp Carp.pm Exporter Exporter.pm locale.pm subs.pm overload.pm constant.pm', ++ 'getoptpl' => 'getopt.pl getopts.pl', ++ 'utf8' => 'utf8_heavy.pl', ++ 'Getopt' => 'newgetopt.pl', ++ 'open' => 'open2.pl open3.pl', ++ 'Config' => 'Config_heavy.pl', ++ 'bytes' => 'bytes_heavy.pl', ++); ++ ++our %defdepends = ( ++ 'DB_File' => 'libdb1-compat', ++ 'GDBM_File' => 'libgdbm', ++); ++ ++our $prefix = 'perlbase-'; ++ ++sub template ($) { ++ $_ = $_[0]; ++ return < \&wanted, no_chdir => 1}, '.'); ++ ++ for $pkg (keys %modules) { ++ $packages{$pkg} = []; ++ $excludes{$pkg} = []; ++ $depends{$pkg} = {}; ++ } ++ ++ for $file (keys %files) { ++ $mod = $files{$file}; ++ $parent = $files{dirname($file)}; ++ ++ if (defined ($mod)) { ++ if (defined ($parent) and not ($parent eq $mod)) { ++ push @{$packages{$mod}}, $file; ++ push @{$excludes{$parent}}, $file; ++ } ++ elsif (not defined ($parent)) { ++ push @{$packages{$mod}}, $file; ++ } ++ } ++ elsif (defined ($parent)) { ++ push @{$excludes{$parent}}, $file; ++ } ++ } ++ ++ for $mod (keys %defdepends) { ++ ($pkg = $prefix . $mod) =~ tr/A-Z_/a-z-/; ++ for $dep (split / /, $defdepends{$mod}) { ++ ${$depends{$pkg}}{$dep} = 1; ++ } ++ } ++ ++ @INC = ('.'); ++ for $file (grep { -f $_ and defined $files{$_} } keys %files) { ++ @deps = keys %{scan_deps(files => [ $file ], recurse => 0)}; ++ $pkg = $files{$file}; ++ ++ for $dep (grep { not defined $files{$_} } @deps) { ++ warn "$file: could not resolve dependency: $dep\n"; ++ } ++ for $dep (grep { defined $files{$_} } @deps) { ++ next if ($files{$dep} eq $pkg); ++ ${$depends{$pkg}}{$files{$dep}} = 1; ++ } ++ } ++ ++ for $pkg (sort keys %packages) { ++ push @result, template({ ++ package => $pkg, ++ module => $modules{$pkg}, ++ depends => join(' ', 'perl', sort keys %{$depends{$pkg}}), ++ files => join(' ', sort @{$packages{$pkg}}), ++ exclude => join(' ', sort @{$excludes{$pkg}}), ++ }); ++ } ++ ++ return join('', @result); ++} ++ ++ ++if (@ARGV > 1) { ++ open FILE, ">$ARGV[1]" or die "$ARGV[1]: $!\n"; ++ print FILE scandeps($ARGV[0]); ++ close FILE; ++} ++else { ++ print scandeps($ARGV[0] or '.'); ++} ++PERL_SCRIPT +diff --git a/feeds/packages/lang/perl/files/strippm.sh b/feeds/packages/lang/perl/files/strippm.sh +new file mode 100644 +index 0000000..b83d2b4 +--- /dev/null ++++ b/feeds/packages/lang/perl/files/strippm.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh ++# ++# Attempt to strip comments and pod docs from perl modules ++# ++ ++[ "$#" -gt 0 ] || set . ++echo "---> Stripping modules in: $@" >&2 ++find "$@" -name \*.pm -or -name \*.pl -or -name \*.pod | while read fn; do ++ echo " $fn" >&2 ++ sed -i -e '/^=\(head\|pod\|item\|over\|back\)/,/^=cut/d; /^=\(head\|pod\|item\|over\|back\)/,$d; /^#$/d; /^#[^!"'"'"']/d' "$fn" ++done +diff --git a/feeds/packages/lang/perl/patches/.svn/entries b/feeds/packages/lang/perl/patches/.svn/entries +new file mode 100644 +index 0000000..90b8be0 +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/perl/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++101-fix-cross-compile-endianness-detection.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++a0859855d9cc31d74abbe53833a6f3da ++2010-05-16T06:58:53.125715Z ++21465 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++640 ++ ++200-host-libc-dir-moved-debian+derivatives.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++8af090de77f8c1af2ff964494a284ac3 ++2011-07-06T04:01:17.810663Z ++27468 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1094 ++ ++100-static_uudmap.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++ab4b0028b70db9fd5b1b816b7ba9cb51 ++2011-07-14T18:38:34.993675Z ++27611 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1299 ++ +diff --git a/feeds/packages/lang/perl/patches/.svn/text-base/100-static_uudmap.patch.svn-base b/feeds/packages/lang/perl/patches/.svn/text-base/100-static_uudmap.patch.svn-base +new file mode 100644 +index 0000000..e0821cc +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/.svn/text-base/100-static_uudmap.patch.svn-base +@@ -0,0 +1,49 @@ ++--- /dev/null +++++ b/generate_uudmap ++@@ -0,0 +1,7 @@ +++#!/bin/bash +++echo \{ +++for i in {0..31}; do echo -n ' 0,'; done +++echo +++for i in {0..63}; do echo -n " $i,"; done +++echo +++echo \} ++--- a/Makefile.micro +++++ b/Makefile.micro ++@@ -173,13 +173,8 @@ uperlapi$(_O): $(HE) perlapi.c perlapi.h ++ uxsutils$(_O): $(HE) xsutils.c ++ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) xsutils.c ++ ++-uudmap.h: generate_uudmap$(_X) ++- $(RUN) ./generate_uudmap$(_X) >uudmap.h ++- ++-generate_uudmap$(_O): generate_uudmap.c ++- $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c ++- ++-generate_uudmap$(_X): generate_uudmap$(_O) ++- $(LD) -o generate_uudmap $(LDFLAGS) generate_uudmap$(_O) $(LIBS) +++uudmap.h: +++ chmod a+x generate_uudmap +++ $(RUN) ./generate_uudmap >uudmap.h ++ ++ # That's it, folks! ++--- a/Makefile.SH +++++ b/Makefile.SH ++@@ -478,11 +478,13 @@ opmini\$(OBJ_EXT): opmini.c ++ ++ globals\$(OBJ_EXT): uudmap.h ++ ++-uudmap.h: generate_uudmap\$(EXE_EXT) ++- \$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h +++uudmap.h: generate_uudmap +++ chmod a+x generate_uudmap +++ \$(RUN) ./generate_uudmap >uudmap.h ++ ++-generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT) ++- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs) +++generate_uudmap: +++ cp ../generate_uudmap . +++ touch generate_uudmap ++ ++ !GROK!THIS! ++ $spitshell >>Makefile <<'!NO!SUBS!' +diff --git a/feeds/packages/lang/perl/patches/.svn/text-base/101-fix-cross-compile-endianness-detection.patch.svn-base b/feeds/packages/lang/perl/patches/.svn/text-base/101-fix-cross-compile-endianness-detection.patch.svn-base +new file mode 100644 +index 0000000..8fea9c0 +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/.svn/text-base/101-fix-cross-compile-endianness-detection.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/config_h.SH +++++ b/config_h.SH ++@@ -53,6 +53,19 @@ sed <$CONFIG_H -e 's!^#und ++ #ifndef _config_h_ ++ #define _config_h_ ++ +++#if defined(USE_CROSS_COMPILE) && !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) +++# include +++# 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/feeds/packages/lang/perl/patches/.svn/text-base/200-host-libc-dir-moved-debian+derivatives.patch.svn-base b/feeds/packages/lang/perl/patches/.svn/text-base/200-host-libc-dir-moved-debian+derivatives.patch.svn-base +new file mode 100644 +index 0000000..2a0dd6b +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/.svn/text-base/200-host-libc-dir-moved-debian+derivatives.patch.svn-base +@@ -0,0 +1,27 @@ ++--- a/hints/linux.sh +++++ b/hints/linux.sh ++@@ -133,6 +133,24 @@ case "$optimize" 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 ++ # for this test. ++ cat >try.c <<'EOM' +diff --git a/feeds/packages/lang/perl/patches/100-static_uudmap.patch b/feeds/packages/lang/perl/patches/100-static_uudmap.patch +new file mode 100644 +index 0000000..e0821cc +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/100-static_uudmap.patch +@@ -0,0 +1,49 @@ ++--- /dev/null +++++ b/generate_uudmap ++@@ -0,0 +1,7 @@ +++#!/bin/bash +++echo \{ +++for i in {0..31}; do echo -n ' 0,'; done +++echo +++for i in {0..63}; do echo -n " $i,"; done +++echo +++echo \} ++--- a/Makefile.micro +++++ b/Makefile.micro ++@@ -173,13 +173,8 @@ uperlapi$(_O): $(HE) perlapi.c perlapi.h ++ uxsutils$(_O): $(HE) xsutils.c ++ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) xsutils.c ++ ++-uudmap.h: generate_uudmap$(_X) ++- $(RUN) ./generate_uudmap$(_X) >uudmap.h ++- ++-generate_uudmap$(_O): generate_uudmap.c ++- $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c ++- ++-generate_uudmap$(_X): generate_uudmap$(_O) ++- $(LD) -o generate_uudmap $(LDFLAGS) generate_uudmap$(_O) $(LIBS) +++uudmap.h: +++ chmod a+x generate_uudmap +++ $(RUN) ./generate_uudmap >uudmap.h ++ ++ # That's it, folks! ++--- a/Makefile.SH +++++ b/Makefile.SH ++@@ -478,11 +478,13 @@ opmini\$(OBJ_EXT): opmini.c ++ ++ globals\$(OBJ_EXT): uudmap.h ++ ++-uudmap.h: generate_uudmap\$(EXE_EXT) ++- \$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h +++uudmap.h: generate_uudmap +++ chmod a+x generate_uudmap +++ \$(RUN) ./generate_uudmap >uudmap.h ++ ++-generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT) ++- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs) +++generate_uudmap: +++ cp ../generate_uudmap . +++ touch generate_uudmap ++ ++ !GROK!THIS! ++ $spitshell >>Makefile <<'!NO!SUBS!' +diff --git a/feeds/packages/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch b/feeds/packages/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch +new file mode 100644 +index 0000000..8fea9c0 +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/101-fix-cross-compile-endianness-detection.patch +@@ -0,0 +1,22 @@ ++--- a/config_h.SH +++++ b/config_h.SH ++@@ -53,6 +53,19 @@ sed <$CONFIG_H -e 's!^#und ++ #ifndef _config_h_ ++ #define _config_h_ ++ +++#if defined(USE_CROSS_COMPILE) && !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) +++# include +++# 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/feeds/packages/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch b/feeds/packages/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch +new file mode 100644 +index 0000000..2a0dd6b +--- /dev/null ++++ b/feeds/packages/lang/perl/patches/200-host-libc-dir-moved-debian+derivatives.patch +@@ -0,0 +1,27 @@ ++--- a/hints/linux.sh +++++ b/hints/linux.sh ++@@ -133,6 +133,24 @@ case "$optimize" 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 ++ # for this test. ++ cat >try.c <<'EOM' +diff --git a/feeds/packages/lang/perl/perlbase.mk b/feeds/packages/lang/perl/perlbase.mk +new file mode 100644 +index 0000000..b6f5f78 +--- /dev/null ++++ b/feeds/packages/lang/perl/perlbase.mk +@@ -0,0 +1,1643 @@ ++define Package/perlbase-template ++SUBMENU:=Perl ++SECTION:=lang ++CATEGORY:=Languages ++URL:=http://www.cpan.org/ ++DEPENDS:=perl ++endef ++ ++define Package/perlbase-abbrev ++$(call Package/perlbase-template) ++TITLE:=abbrev perl module ++endef ++ ++define Package/perlbase-abbrev/install ++$(call perlmod/Install,$(1),abbrev.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-abbrev)) ++ ++ ++define Package/perlbase-anydbm-file ++$(call Package/perlbase-template) ++TITLE:=AnyDBM_File perl module ++endef ++ ++define Package/perlbase-anydbm-file/install ++$(call perlmod/Install,$(1),AnyDBM_File.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-anydbm-file)) ++ ++ ++define Package/perlbase-archive ++$(call Package/perlbase-template) ++TITLE:=Archive perl module ++endef ++ ++define Package/perlbase-archive/install ++$(call perlmod/Install,$(1),Archive,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-archive)) ++ ++ ++define Package/perlbase-assert ++$(call Package/perlbase-template) ++TITLE:=assert perl module ++endef ++ ++define Package/perlbase-assert/install ++$(call perlmod/Install,$(1),assert.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-assert)) ++ ++ ++define Package/perlbase-attribute ++$(call Package/perlbase-template) ++TITLE:=Attribute perl module ++endef ++ ++define Package/perlbase-attribute/install ++$(call perlmod/Install,$(1),Attribute,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-attribute)) ++ ++ ++define Package/perlbase-attributes ++$(call Package/perlbase-template) ++TITLE:=attributes perl module ++endef ++ ++define Package/perlbase-attributes/install ++$(call perlmod/Install,$(1),attributes.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-attributes)) ++ ++ ++define Package/perlbase-attrs ++$(call Package/perlbase-template) ++TITLE:=attrs perl module ++endef ++ ++define Package/perlbase-attrs/install ++$(call perlmod/Install,$(1),attrs.pm auto/attrs,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-attrs)) ++ ++ ++define Package/perlbase-autoloader ++$(call Package/perlbase-template) ++TITLE:=AutoLoader perl module ++endef ++ ++define Package/perlbase-autoloader/install ++$(call perlmod/Install,$(1),AutoLoader.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-autoloader)) ++ ++ ++define Package/perlbase-autosplit ++$(call Package/perlbase-template) ++TITLE:=AutoSplit perl module ++endef ++ ++define Package/perlbase-autosplit/install ++$(call perlmod/Install,$(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,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-autouse)) ++ ++ ++define Package/perlbase-b ++$(call Package/perlbase-template) ++TITLE:=B perl module ++endef ++ ++define Package/perlbase-b/install ++$(call perlmod/Install,$(1),B B.pm auto/B,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-b)) ++ ++ ++define Package/perlbase-base ++$(call Package/perlbase-template) ++TITLE:=base perl module ++endef ++ ++define Package/perlbase-base/install ++$(call perlmod/Install,$(1),base.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-base)) ++ ++ ++define Package/perlbase-benchmark ++$(call Package/perlbase-template) ++TITLE:=Benchmark perl module ++endef ++ ++define Package/perlbase-benchmark/install ++$(call perlmod/Install,$(1),Benchmark.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-benchmark)) ++ ++ ++define Package/perlbase-bigfloat ++$(call Package/perlbase-template) ++TITLE:=bigfloat perl module ++endef ++ ++define Package/perlbase-bigfloat/install ++$(call perlmod/Install,$(1),bigfloat.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bigfloat)) ++ ++ ++define Package/perlbase-bigint ++$(call Package/perlbase-template) ++TITLE:=bigint perl module ++endef ++ ++define Package/perlbase-bigint/install ++$(call perlmod/Install,$(1),bigint.pl bigint.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bigint)) ++ ++ ++define Package/perlbase-bignum ++$(call Package/perlbase-template) ++TITLE:=bignum perl module ++endef ++ ++define Package/perlbase-bignum/install ++$(call perlmod/Install,$(1),bignum.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bignum)) ++ ++ ++define Package/perlbase-bigrat ++$(call Package/perlbase-template) ++TITLE:=bigrat perl module ++endef ++ ++define Package/perlbase-bigrat/install ++$(call perlmod/Install,$(1),bigrat.pl bigrat.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-bigrat)) ++ ++ ++define Package/perlbase-blib ++$(call Package/perlbase-template) ++TITLE:=blib perl module ++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-cacheout ++$(call Package/perlbase-template) ++TITLE:=cacheout perl module ++endef ++ ++define Package/perlbase-cacheout/install ++$(call perlmod/Install,$(1),cacheout.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cacheout)) ++ ++ ++define Package/perlbase-cgi ++$(call Package/perlbase-template) ++TITLE:=CGI perl module ++endef ++ ++define Package/perlbase-cgi/install ++$(call perlmod/Install,$(1),CGI CGI.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cgi)) ++ ++ ++define Package/perlbase-charnames ++$(call Package/perlbase-template) ++TITLE:=charnames perl module ++endef ++ ++define Package/perlbase-charnames/install ++$(call perlmod/Install,$(1),charnames.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-charnames)) ++ ++ ++define Package/perlbase-class ++$(call Package/perlbase-template) ++TITLE:=Class perl module ++endef ++ ++define Package/perlbase-class/install ++$(call perlmod/Install,$(1),Class,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-class)) ++ ++ ++define Package/perlbase-complete ++$(call Package/perlbase-template) ++TITLE:=complete perl module ++endef ++ ++define Package/perlbase-complete/install ++$(call perlmod/Install,$(1),complete.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-complete)) ++ ++ ++define Package/perlbase-compress ++$(call Package/perlbase-template) ++TITLE:=Compress perl module ++endef ++ ++define Package/perlbase-compress/install ++$(call perlmod/Install,$(1),Compress auto/Compress,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-compress)) ++ ++ ++define Package/perlbase-config ++$(call Package/perlbase-template) ++TITLE:=Config perl module ++endef ++ ++define Package/perlbase-config/install ++$(call perlmod/Install,$(1),Config Config.pm Config_heavy.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-config)) ++ ++ ++define Package/perlbase-cpan ++$(call Package/perlbase-template) ++TITLE:=CPAN perl module ++endef ++ ++define Package/perlbase-cpan/install ++$(call perlmod/Install,$(1),CPAN CPAN.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cpan)) ++ ++ ++define Package/perlbase-cpanplus ++$(call Package/perlbase-template) ++TITLE:=CPANPLUS perl module ++endef ++ ++define Package/perlbase-cpanplus/install ++$(call perlmod/Install,$(1),CPANPLUS CPANPLUS.pm,CPANPLUS/FAQ.pod CPANPLUS/Hacking.pod CPANPLUS/Shell/Default/Plugins/HOWTO.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-cpanplus)) ++ ++ ++define Package/perlbase-ctime ++$(call Package/perlbase-template) ++TITLE:=ctime perl module ++endef ++ ++define Package/perlbase-ctime/install ++$(call perlmod/Install,$(1),ctime.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-ctime)) ++ ++ ++define Package/perlbase-cwd ++$(call Package/perlbase-template) ++TITLE:=Cwd perl module ++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 ++endef ++ ++define Package/perlbase-data/install ++$(call perlmod/Install,$(1),Data auto/Data,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-data)) ++ ++ ++define Package/perlbase-db ++$(call Package/perlbase-template) ++TITLE:=DB perl module ++DEPENDS+= +libdb47 ++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 ++endef ++ ++define Package/perlbase-db-file/install ++$(call perlmod/Install,$(1),DB_File.pm auto/DB_File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-db-file)) ++ ++ ++define Package/perlbase-dbm-filter ++$(call Package/perlbase-template) ++TITLE:=DBM_Filter perl module ++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 ++endef ++ ++define Package/perlbase-devel/install ++$(call perlmod/Install,$(1),Devel auto/Devel,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-devel)) ++ ++ ++define Package/perlbase-diagnostics ++$(call Package/perlbase-template) ++TITLE:=diagnostics perl module ++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 ++endef ++ ++define Package/perlbase-digest/install ++$(call perlmod/Install,$(1),Digest Digest.pm auto/Digest,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-digest)) ++ ++ ++define Package/perlbase-dirhandle ++$(call Package/perlbase-template) ++TITLE:=DirHandle perl module ++endef ++ ++define Package/perlbase-dirhandle/install ++$(call perlmod/Install,$(1),DirHandle.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-dirhandle)) ++ ++ ++define Package/perlbase-dotsh ++$(call Package/perlbase-template) ++TITLE:=dotsh perl module ++endef ++ ++define Package/perlbase-dotsh/install ++$(call perlmod/Install,$(1),dotsh.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-dotsh)) ++ ++ ++define Package/perlbase-dumpvalue ++$(call Package/perlbase-template) ++TITLE:=Dumpvalue perl module ++endef ++ ++define Package/perlbase-dumpvalue/install ++$(call perlmod/Install,$(1),Dumpvalue.pm,) ++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 ++endef ++ ++define Package/perlbase-dynaloader/install ++$(call perlmod/Install,$(1),DynaLoader.pm auto/DynaLoader,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-dynaloader)) ++ ++ ++define Package/perlbase-encode ++$(call Package/perlbase-template) ++TITLE:=Encode perl module ++endef ++ ++define Package/perlbase-encode/install ++$(call perlmod/Install,$(1),Encode Encode.pm auto/Encode,Encode/PerlIO.pod Encode/Supported.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-encode)) ++ ++ ++define Package/perlbase-encoding ++$(call Package/perlbase-template) ++TITLE:=encoding perl module ++endef ++ ++define Package/perlbase-encoding/install ++$(call perlmod/Install,$(1),encoding encoding.pm,) ++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 ++endef ++ ++define Package/perlbase-env/install ++$(call perlmod/Install,$(1),Env.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-env)) ++ ++ ++define Package/perlbase-errno ++$(call Package/perlbase-template) ++TITLE:=Errno perl module ++endef ++ ++define Package/perlbase-errno/install ++$(call perlmod/Install,$(1),Errno.pm,) ++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 lib.pm locale.pm overload.pm strict.pm subs.pm vars.pm warnings warnings.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-essential)) ++ ++ ++define Package/perlbase-exceptions ++$(call Package/perlbase-template) ++TITLE:=exceptions perl module ++endef ++ ++define Package/perlbase-exceptions/install ++$(call perlmod/Install,$(1),exceptions.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-exceptions)) ++ ++ ++define Package/perlbase-extutils ++$(call Package/perlbase-template) ++TITLE:=ExtUtils perl module ++endef ++ ++define Package/perlbase-extutils/install ++$(call perlmod/Install,$(1),ExtUtils,ExtUtils/MakeMaker/FAQ.pod ExtUtils/MakeMaker/Tutorial.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-extutils)) ++ ++ ++define Package/perlbase-fastcwd ++$(call Package/perlbase-template) ++TITLE:=fastcwd perl module ++endef ++ ++define Package/perlbase-fastcwd/install ++$(call perlmod/Install,$(1),fastcwd.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-fastcwd)) ++ ++ ++define Package/perlbase-fatal ++$(call Package/perlbase-template) ++TITLE:=Fatal perl module ++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 ++endef ++ ++define Package/perlbase-fcntl/install ++$(call perlmod/Install,$(1),Fcntl.pm auto/Fcntl,) ++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 ++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 ++endef ++ ++define Package/perlbase-file/install ++$(call perlmod/Install,$(1),File auto/File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-file)) ++ ++ ++define Package/perlbase-filecache ++$(call Package/perlbase-template) ++TITLE:=FileCache perl module ++endef ++ ++define Package/perlbase-filecache/install ++$(call perlmod/Install,$(1),FileCache.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-filecache)) ++ ++ ++define Package/perlbase-filehandle ++$(call Package/perlbase-template) ++TITLE:=FileHandle perl module ++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 ++endef ++ ++define Package/perlbase-filter/install ++$(call perlmod/Install,$(1),Filter auto/Filter,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-filter)) ++ ++ ++define Package/perlbase-find ++$(call Package/perlbase-template) ++TITLE:=find perl module ++endef ++ ++define Package/perlbase-find/install ++$(call perlmod/Install,$(1),find.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-find)) ++ ++ ++define Package/perlbase-findbin ++$(call Package/perlbase-template) ++TITLE:=FindBin perl module ++endef ++ ++define Package/perlbase-findbin/install ++$(call perlmod/Install,$(1),FindBin.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-findbin)) ++ ++ ++define Package/perlbase-finddepth ++$(call Package/perlbase-template) ++TITLE:=finddepth perl module ++endef ++ ++define Package/perlbase-finddepth/install ++$(call perlmod/Install,$(1),finddepth.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-finddepth)) ++ ++ ++define Package/perlbase-flush ++$(call Package/perlbase-template) ++TITLE:=flush perl module ++endef ++ ++define Package/perlbase-flush/install ++$(call perlmod/Install,$(1),flush.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-flush)) ++ ++ ++define Package/perlbase-gdbm-file ++$(call Package/perlbase-template) ++TITLE:=GDBM_File perl module ++DEPENDS+= +libgdbm ++endef ++ ++define Package/perlbase-gdbm-file/install ++$(call perlmod/Install,$(1),GDBM_File.pm auto/GDBM_File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-gdbm-file)) ++ ++ ++define Package/perlbase-getcwd ++$(call Package/perlbase-template) ++TITLE:=getcwd perl module ++endef ++ ++define Package/perlbase-getcwd/install ++$(call perlmod/Install,$(1),getcwd.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-getcwd)) ++ ++ ++define Package/perlbase-getopt ++$(call Package/perlbase-template) ++TITLE:=Getopt perl module ++endef ++ ++define Package/perlbase-getopt/install ++$(call perlmod/Install,$(1),Getopt newgetopt.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-getopt)) ++ ++ ++define Package/perlbase-getoptpl ++$(call Package/perlbase-template) ++TITLE:=getoptpl perl module ++endef ++ ++define Package/perlbase-getoptpl/install ++$(call perlmod/Install,$(1),getopt.pl getopts.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-getoptpl)) ++ ++ ++define Package/perlbase-hash ++$(call Package/perlbase-template) ++TITLE:=Hash perl module ++endef ++ ++define Package/perlbase-hash/install ++$(call perlmod/Install,$(1),Hash auto/Hash,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-hash)) ++ ++ ++define Package/perlbase-hostname ++$(call Package/perlbase-template) ++TITLE:=hostname perl module ++endef ++ ++define Package/perlbase-hostname/install ++$(call perlmod/Install,$(1),hostname.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-hostname)) ++ ++ ++define Package/perlbase-i18n ++$(call Package/perlbase-template) ++TITLE:=I18N perl module ++endef ++ ++define Package/perlbase-i18n/install ++$(call perlmod/Install,$(1),I18N auto/I18N,) ++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,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-if)) ++ ++ ++define Package/perlbase-importenv ++$(call Package/perlbase-template) ++TITLE:=importenv perl module ++endef ++ ++define Package/perlbase-importenv/install ++$(call perlmod/Install,$(1),importenv.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-importenv)) ++ ++ ++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 ++endef ++ ++define Package/perlbase-io/install ++$(call perlmod/Install,$(1),IO IO.pm auto/IO,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-io)) ++ ++ ++define Package/perlbase-ipc ++$(call Package/perlbase-template) ++TITLE:=IPC perl module ++endef ++ ++define Package/perlbase-ipc/install ++$(call perlmod/Install,$(1),IPC auto/IPC,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-ipc)) ++ ++ ++define Package/perlbase-less ++$(call Package/perlbase-template) ++TITLE:=less perl module ++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 ++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 ++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) ++endef ++ ++$(eval $(call BuildPackage,perlbase-locale)) ++ ++ ++define Package/perlbase-log ++$(call Package/perlbase-template) ++TITLE:=Log perl module ++endef ++ ++define Package/perlbase-log/install ++$(call perlmod/Install,$(1),Log,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-log)) ++ ++ ++define Package/perlbase-look ++$(call Package/perlbase-template) ++TITLE:=look perl module ++endef ++ ++define Package/perlbase-look/install ++$(call perlmod/Install,$(1),look.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-look)) ++ ++ ++define Package/perlbase-math ++$(call Package/perlbase-template) ++TITLE:=Math perl module ++endef ++ ++define Package/perlbase-math/install ++$(call perlmod/Install,$(1),Math auto/Math,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-math)) ++ ++ ++define Package/perlbase-memoize ++$(call Package/perlbase-template) ++TITLE:=Memoize perl module ++endef ++ ++define Package/perlbase-memoize/install ++$(call perlmod/Install,$(1),Memoize Memoize.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-memoize)) ++ ++ ++define Package/perlbase-mime ++$(call Package/perlbase-template) ++TITLE:=MIME perl module ++endef ++ ++define Package/perlbase-mime/install ++$(call perlmod/Install,$(1),MIME auto/MIME,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-mime)) ++ ++ ++define Package/perlbase-module ++$(call Package/perlbase-template) ++TITLE:=Module perl module ++endef ++ ++define Package/perlbase-module/install ++$(call perlmod/Install,$(1),Module,Module/Build/API.pod Module/Build/Authoring.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-module)) ++ ++ ++define Package/perlbase-mro ++$(call Package/perlbase-template) ++TITLE:=mro perl module ++endef ++ ++define Package/perlbase-mro/install ++$(call perlmod/Install,$(1),mro.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-mro)) ++ ++ ++define Package/perlbase-net ++$(call Package/perlbase-template) ++TITLE:=Net perl module ++endef ++ ++define Package/perlbase-net/install ++$(call perlmod/Install,$(1),Net,Net/libnetFAQ.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-net)) ++ ++ ++define Package/perlbase-next ++$(call Package/perlbase-template) ++TITLE:=NEXT perl module ++endef ++ ++define Package/perlbase-next/install ++$(call perlmod/Install,$(1),NEXT.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-next)) ++ ++ ++define Package/perlbase-o ++$(call Package/perlbase-template) ++TITLE:=O perl module ++endef ++ ++define Package/perlbase-o/install ++$(call perlmod/Install,$(1),O.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-o)) ++ ++ ++define Package/perlbase-object ++$(call Package/perlbase-template) ++TITLE:=Object perl module ++endef ++ ++define Package/perlbase-object/install ++$(call perlmod/Install,$(1),Object,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-object)) ++ ++ ++define Package/perlbase-opcode ++$(call Package/perlbase-template) ++TITLE:=Opcode perl module ++endef ++ ++define Package/perlbase-opcode/install ++$(call perlmod/Install,$(1),Opcode.pm auto/Opcode,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-opcode)) ++ ++ ++define Package/perlbase-open ++$(call Package/perlbase-template) ++TITLE:=open perl module ++endef ++ ++define Package/perlbase-open/install ++$(call perlmod/Install,$(1),open.pm open2.pl open3.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-open)) ++ ++ ++define Package/perlbase-ops ++$(call Package/perlbase-template) ++TITLE:=ops perl module ++endef ++ ++define Package/perlbase-ops/install ++$(call perlmod/Install,$(1),ops.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-ops)) ++ ++ ++define Package/perlbase-package ++$(call Package/perlbase-template) ++TITLE:=Package perl module ++endef ++ ++define Package/perlbase-package/install ++$(call perlmod/Install,$(1),Package,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-package)) ++ ++ ++define Package/perlbase-params ++$(call Package/perlbase-template) ++TITLE:=Params perl module ++endef ++ ++define Package/perlbase-params/install ++$(call perlmod/Install,$(1),Params,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-params)) ++ ++ ++define Package/perlbase-perl5db ++$(call Package/perlbase-template) ++TITLE:=perl5db perl module ++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 ++endef ++ ++define Package/perlbase-perlio/install ++$(call perlmod/Install,$(1),PerlIO PerlIO.pm auto/PerlIO,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-perlio)) ++ ++define Package/perlbase-pod ++$(call Package/perlbase-template) ++TITLE:=Pod perl module ++endef ++ ++define Package/perlbase-pod/install ++$(call perlmod/Install,$(1),Pod,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-pod)) ++ ++ ++define Package/perlbase-posix ++$(call Package/perlbase-template) ++TITLE:=POSIX perl module ++endef ++ ++define Package/perlbase-posix/install ++$(call perlmod/Install,$(1),POSIX.pm auto/POSIX,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-posix)) ++ ++ ++define Package/perlbase-pwd ++$(call Package/perlbase-template) ++TITLE:=pwd perl module ++endef ++ ++define Package/perlbase-pwd/install ++$(call perlmod/Install,$(1),pwd.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-pwd)) ++ ++ ++define Package/perlbase-re ++$(call Package/perlbase-template) ++TITLE:=re perl module ++endef ++ ++define Package/perlbase-re/install ++$(call perlmod/Install,$(1),auto/re re.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-re)) ++ ++ ++define Package/perlbase-safe ++$(call Package/perlbase-template) ++TITLE:=Safe perl module ++endef ++ ++define Package/perlbase-safe/install ++$(call perlmod/Install,$(1),Safe.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-safe)) ++ ++ ++define Package/perlbase-scalar ++$(call Package/perlbase-template) ++TITLE:=Scalar perl module ++endef ++ ++define Package/perlbase-scalar/install ++$(call perlmod/Install,$(1),Scalar,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-scalar)) ++ ++ ++define Package/perlbase-sdbm-file ++$(call Package/perlbase-template) ++TITLE:=SDBM_File perl module ++endef ++ ++define Package/perlbase-sdbm-file/install ++$(call perlmod/Install,$(1),SDBM_File.pm auto/SDBM_File,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-sdbm-file)) ++ ++ ++define Package/perlbase-search ++$(call Package/perlbase-template) ++TITLE:=Search perl module ++endef ++ ++define Package/perlbase-search/install ++$(call perlmod/Install,$(1),Search,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-search)) ++ ++ ++define Package/perlbase-selectsaver ++$(call Package/perlbase-template) ++TITLE:=SelectSaver perl module ++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 ++endef ++ ++define Package/perlbase-selfloader/install ++$(call perlmod/Install,$(1),SelfLoader.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-selfloader)) ++ ++ ++define Package/perlbase-shell ++$(call Package/perlbase-template) ++TITLE:=Shell perl module ++endef ++ ++define Package/perlbase-shell/install ++$(call perlmod/Install,$(1),Shell.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-shell)) ++ ++ ++define Package/perlbase-shellwords ++$(call Package/perlbase-template) ++TITLE:=shellwords perl module ++endef ++ ++define Package/perlbase-shellwords/install ++$(call perlmod/Install,$(1),shellwords.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-shellwords)) ++ ++ ++define Package/perlbase-sigtrap ++$(call Package/perlbase-template) ++TITLE:=sigtrap perl module ++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 ++endef ++ ++define Package/perlbase-socket/install ++$(call perlmod/Install,$(1),Socket.pm auto/Socket,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-socket)) ++ ++ ++define Package/perlbase-sort ++$(call Package/perlbase-template) ++TITLE:=sort perl module ++endef ++ ++define Package/perlbase-sort/install ++$(call perlmod/Install,$(1),sort.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-sort)) ++ ++ ++define Package/perlbase-stat ++$(call Package/perlbase-template) ++TITLE:=stat perl module ++endef ++ ++define Package/perlbase-stat/install ++$(call perlmod/Install,$(1),stat.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-stat)) ++ ++ ++define Package/perlbase-storable ++$(call Package/perlbase-template) ++TITLE:=Storable perl module ++endef ++ ++define Package/perlbase-storable/install ++$(call perlmod/Install,$(1),Storable.pm auto/Storable,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-storable)) ++ ++ ++define Package/perlbase-switch ++$(call Package/perlbase-template) ++TITLE:=Switch perl module ++endef ++ ++define Package/perlbase-switch/install ++$(call perlmod/Install,$(1),Switch.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-switch)) ++ ++ ++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 ++endef ++ ++define Package/perlbase-sys/install ++$(call perlmod/Install,$(1),Sys auto/Sys,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-sys)) ++ ++ ++define Package/perlbase-syslog ++$(call Package/perlbase-template) ++TITLE:=syslog perl module ++endef ++ ++define Package/perlbase-syslog/install ++$(call perlmod/Install,$(1),syslog.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-syslog)) ++ ++ ++define Package/perlbase-tainted ++$(call Package/perlbase-template) ++TITLE:=tainted perl module ++endef ++ ++define Package/perlbase-tainted/install ++$(call perlmod/Install,$(1),tainted.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-tainted)) ++ ++ ++define Package/perlbase-term ++$(call Package/perlbase-template) ++TITLE:=Term perl module ++endef ++ ++define Package/perlbase-term/install ++$(call perlmod/Install,$(1),Term,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-term)) ++ ++ ++define Package/perlbase-termcap ++$(call Package/perlbase-template) ++TITLE:=termcap perl module ++endef ++ ++define Package/perlbase-termcap/install ++$(call perlmod/Install,$(1),termcap.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-termcap)) ++ ++ ++define Package/perlbase-test ++$(call Package/perlbase-template) ++TITLE:=Test perl module ++endef ++ ++define Package/perlbase-test/install ++$(call perlmod/Install,$(1),Test Test.pm,Test/Harness/TAP.pod Test/Tutorial.pod) ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prove $(1)/usr/bin ++ $(call perlmod/Install,$(1),Test Test.pm,Test/Harness/TAP.pod Test/Tutorial.pod) ++endef ++ ++$(eval $(call BuildPackage,perlbase-test)) ++ ++ ++define Package/perlbase-text ++$(call Package/perlbase-template) ++TITLE:=Text perl module ++endef ++ ++define Package/perlbase-text/install ++$(call perlmod/Install,$(1),Text auto/Text,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-text)) ++ ++ ++define Package/perlbase-thread ++$(call Package/perlbase-template) ++TITLE:=Thread perl module ++endef ++ ++define Package/perlbase-thread/install ++$(call perlmod/Install,$(1),Thread Thread.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-thread)) ++ ++ ++define Package/perlbase-threads ++$(call Package/perlbase-template) ++TITLE:=threads perl module ++endef ++ ++define Package/perlbase-threads/install ++$(call perlmod/Install,$(1),auto/threads threads threads.pm,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-threads)) ++ ++ ++define Package/perlbase-tie ++$(call Package/perlbase-template) ++TITLE:=Tie perl module ++endef ++ ++define Package/perlbase-tie/install ++$(call perlmod/Install,$(1),Tie,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-tie)) ++ ++ ++define Package/perlbase-time ++$(call Package/perlbase-template) ++TITLE:=Time perl module ++endef ++ ++define Package/perlbase-time/install ++$(call perlmod/Install,$(1),Time auto/Time,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-time)) ++ ++ ++define Package/perlbase-timelocal ++$(call Package/perlbase-template) ++TITLE:=timelocal perl module ++endef ++ ++define Package/perlbase-timelocal/install ++$(call perlmod/Install,$(1),timelocal.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-timelocal)) ++ ++ ++define Package/perlbase-unicode ++$(call Package/perlbase-template) ++TITLE:=Unicode perl module ++endef ++ ++define Package/perlbase-unicode/install ++$(call perlmod/Install,$(1),Unicode auto/Unicode,) ++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 ++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 ++endef ++ ++define Package/perlbase-utf8/install ++$(call perlmod/Install,$(1),utf8.pm utf8_heavy.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-utf8)) ++ ++ ++define Package/perlbase-validate ++$(call Package/perlbase-template) ++TITLE:=validate perl module ++endef ++ ++define Package/perlbase-validate/install ++$(call perlmod/Install,$(1),validate.pl,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-validate)) ++ ++ ++define Package/perlbase-version ++$(call Package/perlbase-template) ++TITLE:=version perl module ++endef ++ ++define Package/perlbase-version/install ++$(call perlmod/Install,$(1),version.pm,) ++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,) ++endef ++ ++$(eval $(call BuildPackage,perlbase-xsloader)) +diff --git a/feeds/packages/lang/perl/perlmod.mk b/feeds/packages/lang/perl/perlmod.mk +new file mode 100644 +index 0000000..157b0f3 +--- /dev/null ++++ b/feeds/packages/lang/perl/perlmod.mk +@@ -0,0 +1,53 @@ ++# This makefile simplifies perl module builds. ++# ++ ++# Build environment ++PERL_CMD := $(STAGING_DIR)/usr/bin/perl ++PERL_LIB := $(STAGING_DIR)/usr/lib/perl5/5.10 ++ ++# Module install prefix ++PERL_SITELIB := /usr/lib/perl5/5.10 ++ ++define perlmod/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ PERL5LIB=$(PERL_LIB) \ ++ PERL_MM_USE_DEFAULT=1 \ ++ $(2) \ ++ $(PERL_CMD) Makefile.PL \ ++ $(1) \ ++ PERL_LIB=$(PERL_LIB) \ ++ PERL_ARCHLIB=$(PERL_LIB) \ ++ INSTALLSITELIB=$(PERL_SITELIB) \ ++ INSTALLSITEARCH=$(PERL_SITELIB) \ ++ DESTDIR=$(PKG_INSTALL_DIR) \ ++ ); ++endef ++ ++define perlmod/Compile ++ PERL5LIB=$(PERL_LIB) \ ++ $(2) \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(1) \ ++ install ++endef ++ ++define perlmod/Install ++ $(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) ++ ++ @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\)/,/^=cut/d' \ ++ -e '/^=\(head\|pod\|item\|over\|back\)/,$$$$d' \ ++ -e '/^#$$$$/d' \ ++ -e '/^#[^!"'"'"']/d' ++endef +diff --git a/feeds/packages/lang/php-pear-db/.svn/entries b/feeds/packages/lang/php-pear-db/.svn/entries +new file mode 100644 +index 0000000..8ac3867 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-db/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php-pear-db ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++2b23cc201e8f0474edb08a5424c1ddf6 ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++874 ++ +diff --git a/feeds/packages/lang/php-pear-db/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php-pear-db/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e135d09 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-db/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=php-pear-db ++PKG_VERSION:=1.7.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=DB-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://download.pear.php.net/package ++PKG_MD5SUM:=a57302138757500706e075a4d3d87ef7 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/DB-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php-pear-db ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PEAR DB module ++ URL:=http://pear.php.net/package/DB ++ DEPENDS:=php-pear ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/php-pear-db/install ++ $(INSTALL_DIR) $(1)/usr/lib/php ++ $(CP) $(PKG_BUILD_DIR)/DB.php $(PKG_BUILD_DIR)/DB \ ++ $(1)/usr/lib/php/ ++endef ++ ++$(eval $(call BuildPackage,php-pear-db)) +diff --git a/feeds/packages/lang/php-pear-db/Makefile b/feeds/packages/lang/php-pear-db/Makefile +new file mode 100644 +index 0000000..e135d09 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-db/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=php-pear-db ++PKG_VERSION:=1.7.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=DB-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://download.pear.php.net/package ++PKG_MD5SUM:=a57302138757500706e075a4d3d87ef7 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/DB-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php-pear-db ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PEAR DB module ++ URL:=http://pear.php.net/package/DB ++ DEPENDS:=php-pear ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/php-pear-db/install ++ $(INSTALL_DIR) $(1)/usr/lib/php ++ $(CP) $(PKG_BUILD_DIR)/DB.php $(PKG_BUILD_DIR)/DB \ ++ $(1)/usr/lib/php/ ++endef ++ ++$(eval $(call BuildPackage,php-pear-db)) +diff --git a/feeds/packages/lang/php-pear-db/patches/.svn/entries b/feeds/packages/lang/php-pear-db/patches/.svn/entries +new file mode 100644 +index 0000000..6c4b1c9 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-db/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php-pear-db/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-09-23T18:21:44.499456Z ++8997 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-php5-deprecation-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++5ca578916f7f6b8cb10610306ab53202 ++2007-06-11T20:55:36.029651Z ++7574 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1164 ++ +diff --git a/feeds/packages/lang/php-pear-db/patches/.svn/text-base/100-php5-deprecation-fixes.patch.svn-base b/feeds/packages/lang/php-pear-db/patches/.svn/text-base/100-php5-deprecation-fixes.patch.svn-base +new file mode 100644 +index 0000000..714b678 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-db/patches/.svn/text-base/100-php5-deprecation-fixes.patch.svn-base +@@ -0,0 +1,34 @@ ++diff -ubrN DB-1.7.11-orig/DB/common.php DB-1.7.11/DB/common.php ++--- DB-1.7.11-orig/DB/common.php 2007-03-28 02:11:15.000000000 -0500 +++++ DB-1.7.11/DB/common.php 2007-06-11 14:49:37.000000000 -0500 ++@@ -1014,7 +1014,7 @@ ++ if ($result === DB_OK || DB::isError($result)) { ++ return $result; ++ } else { ++- $tmp =& new DB_result($this, $result); +++ $tmp = new DB_result($this, $result); ++ return $tmp; ++ } ++ } ++@@ -1217,7 +1217,7 @@ ++ if ($result === DB_OK || DB::isError($result)) { ++ return $result; ++ } else { ++- $tmp =& new DB_result($this, $result); +++ $tmp = new DB_result($this, $result); ++ return $tmp; ++ } ++ } ++diff -ubrN DB-1.7.11-orig/DB.php DB-1.7.11/DB.php ++--- DB-1.7.11-orig/DB.php 2007-03-28 02:11:15.000000000 -0500 +++++ DB-1.7.11/DB.php 2007-06-11 14:49:42.000000000 -0500 ++@@ -591,7 +591,8 @@ ++ */ ++ function isError($value) ++ { ++- return is_a($value, 'DB_Error'); +++ return $value instanceof DB_Error; +++ // return is_a($value, 'DB_Error'); ++ } ++ ++ // }}} +diff --git a/feeds/packages/lang/php-pear-db/patches/100-php5-deprecation-fixes.patch b/feeds/packages/lang/php-pear-db/patches/100-php5-deprecation-fixes.patch +new file mode 100644 +index 0000000..714b678 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-db/patches/100-php5-deprecation-fixes.patch +@@ -0,0 +1,34 @@ ++diff -ubrN DB-1.7.11-orig/DB/common.php DB-1.7.11/DB/common.php ++--- DB-1.7.11-orig/DB/common.php 2007-03-28 02:11:15.000000000 -0500 +++++ DB-1.7.11/DB/common.php 2007-06-11 14:49:37.000000000 -0500 ++@@ -1014,7 +1014,7 @@ ++ if ($result === DB_OK || DB::isError($result)) { ++ return $result; ++ } else { ++- $tmp =& new DB_result($this, $result); +++ $tmp = new DB_result($this, $result); ++ return $tmp; ++ } ++ } ++@@ -1217,7 +1217,7 @@ ++ if ($result === DB_OK || DB::isError($result)) { ++ return $result; ++ } else { ++- $tmp =& new DB_result($this, $result); +++ $tmp = new DB_result($this, $result); ++ return $tmp; ++ } ++ } ++diff -ubrN DB-1.7.11-orig/DB.php DB-1.7.11/DB.php ++--- DB-1.7.11-orig/DB.php 2007-03-28 02:11:15.000000000 -0500 +++++ DB-1.7.11/DB.php 2007-06-11 14:49:42.000000000 -0500 ++@@ -591,7 +591,8 @@ ++ */ ++ function isError($value) ++ { ++- return is_a($value, 'DB_Error'); +++ return $value instanceof DB_Error; +++ // return is_a($value, 'DB_Error'); ++ } ++ ++ // }}} +diff --git a/feeds/packages/lang/php-pear-xmlrpc/.svn/entries b/feeds/packages/lang/php-pear-xmlrpc/.svn/entries +new file mode 100644 +index 0000000..835a684 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-xmlrpc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php-pear-xmlrpc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ec7b6b635fd98d5ff904976aaeb332d3 ++2010-03-24T04:49:34.690667Z ++20398 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++975 ++ +diff --git a/feeds/packages/lang/php-pear-xmlrpc/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php-pear-xmlrpc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..23f7679 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-xmlrpc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=php-pear-xmlrpc ++PKG_VERSION:=1.5.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=XML_RPC-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://download.pear.php.net/package ++PKG_MD5SUM:=1b516162ad65971b5fd04a7c279627ec ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/XML_RPC-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php-pear-xmlrpc ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PEAR XML-RPC module ++ URL:=http://pear.php.net/package/XML_RPC ++ DEPENDS:=php-pear ++ PKGARCH:=all ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/php-pear-xmlrpc/install ++ $(INSTALL_DIR) $(1)/usr/lib/php/XML ++ $(CP) $(PKG_BUILD_DIR)/Dump.php \ ++ $(PKG_BUILD_DIR)/RPC.php \ ++ $(PKG_BUILD_DIR)/Server.php \ ++ $(1)/usr/lib/php/XML/ ++endef ++ ++$(eval $(call BuildPackage,php-pear-xmlrpc)) +diff --git a/feeds/packages/lang/php-pear-xmlrpc/Makefile b/feeds/packages/lang/php-pear-xmlrpc/Makefile +new file mode 100644 +index 0000000..23f7679 +--- /dev/null ++++ b/feeds/packages/lang/php-pear-xmlrpc/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=php-pear-xmlrpc ++PKG_VERSION:=1.5.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=XML_RPC-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://download.pear.php.net/package ++PKG_MD5SUM:=1b516162ad65971b5fd04a7c279627ec ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/XML_RPC-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php-pear-xmlrpc ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PEAR XML-RPC module ++ URL:=http://pear.php.net/package/XML_RPC ++ DEPENDS:=php-pear ++ PKGARCH:=all ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/php-pear-xmlrpc/install ++ $(INSTALL_DIR) $(1)/usr/lib/php/XML ++ $(CP) $(PKG_BUILD_DIR)/Dump.php \ ++ $(PKG_BUILD_DIR)/RPC.php \ ++ $(PKG_BUILD_DIR)/Server.php \ ++ $(1)/usr/lib/php/XML/ ++endef ++ ++$(eval $(call BuildPackage,php-pear-xmlrpc)) +diff --git a/feeds/packages/lang/php-pear/.svn/entries b/feeds/packages/lang/php-pear/.svn/entries +new file mode 100644 +index 0000000..2ae776a +--- /dev/null ++++ b/feeds/packages/lang/php-pear/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php-pear ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-18T22:24:43.042025Z ++21006 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++f437738d87fccc2e8791e926a8217f02 ++2010-04-18T22:24:43.042025Z ++21006 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++859 ++ +diff --git a/feeds/packages/lang/php-pear/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php-pear/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..22fe6fe +--- /dev/null ++++ b/feeds/packages/lang/php-pear/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=php-pear ++PKG_VERSION:=1.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=PEAR-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://download.pear.php.net/package ++PKG_MD5SUM:=06432c4768fdd7df2c4982c973d3f429 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/PEAR-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php-pear ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PEAR ++ URL:=http://pear.php.net/package/PEAR ++ DEPENDS:=+php5 ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/php-pear/install ++ $(INSTALL_DIR) $(1)/usr/lib/php ++ $(CP) $(PKG_BUILD_DIR)/PEAR.php $(PKG_BUILD_DIR)/PEAR \ ++ $(1)/usr/lib/php/ ++endef ++ ++$(eval $(call BuildPackage,php-pear)) ++ +diff --git a/feeds/packages/lang/php-pear/Makefile b/feeds/packages/lang/php-pear/Makefile +new file mode 100644 +index 0000000..22fe6fe +--- /dev/null ++++ b/feeds/packages/lang/php-pear/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=php-pear ++PKG_VERSION:=1.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=PEAR-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://download.pear.php.net/package ++PKG_MD5SUM:=06432c4768fdd7df2c4982c973d3f429 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/PEAR-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php-pear ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PEAR ++ URL:=http://pear.php.net/package/PEAR ++ DEPENDS:=+php5 ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/php-pear/install ++ $(INSTALL_DIR) $(1)/usr/lib/php ++ $(CP) $(PKG_BUILD_DIR)/PEAR.php $(PKG_BUILD_DIR)/PEAR \ ++ $(1)/usr/lib/php/ ++endef ++ ++$(eval $(call BuildPackage,php-pear)) ++ +diff --git a/feeds/packages/lang/php-pear/patches/.svn/entries b/feeds/packages/lang/php-pear/patches/.svn/entries +new file mode 100644 +index 0000000..507b163 +--- /dev/null ++++ b/feeds/packages/lang/php-pear/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php-pear/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-06-07T17:44:59.551988Z ++7521 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-remove_deprecation_messages.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6f285fbdf38bbe069686eb242274eb6f ++2007-06-07T17:44:59.551988Z ++7521 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2459 ++ +diff --git a/feeds/packages/lang/php-pear/patches/.svn/text-base/000-remove_deprecation_messages.patch.svn-base b/feeds/packages/lang/php-pear/patches/.svn/text-base/000-remove_deprecation_messages.patch.svn-base +new file mode 100644 +index 0000000..0f79cfc +--- /dev/null ++++ b/feeds/packages/lang/php-pear/patches/.svn/text-base/000-remove_deprecation_messages.patch.svn-base +@@ -0,0 +1,62 @@ ++--- PEAR-1.5.4/PEAR.php 2007-05-07 23:10:49.000000000 -0500 +++++ PEAR-1.5.4/PEAR.php.new 2007-05-23 16:36:05.699498250 -0500 ++@@ -278,7 +278,8 @@ ++ */ ++ function isError($data, $code = null) ++ { ++- if (is_a($data, 'PEAR_Error')) { +++ //if (is_a($data, 'PEAR_Error')) { +++ if ( $data instanceof PEAR_Error ) { ++ if (is_null($code)) { ++ return true; ++ } elseif (is_string($code)) { ++@@ -334,7 +335,8 @@ ++ ++ function setErrorHandling($mode = null, $options = null) ++ { ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if ( isset($this) && $this instanceof PEAR ) { ++ $setmode = &$this->_default_error_mode; ++ $setoptions = &$this->_default_error_options; ++ } else { ++@@ -588,7 +590,8 @@ ++ $code = null, ++ $userinfo = null) ++ { ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if ( isset($this) && $this instanceof PEAR ) { ++ $a = &$this->raiseError($message, $code, null, null, $userinfo); ++ return $a; ++ } else { ++@@ -686,7 +689,8 @@ ++ function pushErrorHandling($mode, $options = null) ++ { ++ $stack = &$GLOBALS['_PEAR_error_handler_stack']; ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if (isset($this) && $this instanceof PEAR ) { ++ $def_mode = &$this->_default_error_mode; ++ $def_options = &$this->_default_error_options; ++ } else { ++@@ -695,7 +699,8 @@ ++ } ++ $stack[] = array($def_mode, $def_options); ++ ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if (isset($this) && $this instanceof PEAR ) { ++ $this->setErrorHandling($mode, $options); ++ } else { ++ PEAR::setErrorHandling($mode, $options); ++@@ -720,7 +725,8 @@ ++ array_pop($stack); ++ list($mode, $options) = $stack[sizeof($stack) - 1]; ++ array_pop($stack); ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if (isset($this) && $this instanceof PEAR ) { ++ $this->setErrorHandling($mode, $options); ++ } else { ++ PEAR::setErrorHandling($mode, $options); +diff --git a/feeds/packages/lang/php-pear/patches/000-remove_deprecation_messages.patch b/feeds/packages/lang/php-pear/patches/000-remove_deprecation_messages.patch +new file mode 100644 +index 0000000..0f79cfc +--- /dev/null ++++ b/feeds/packages/lang/php-pear/patches/000-remove_deprecation_messages.patch +@@ -0,0 +1,62 @@ ++--- PEAR-1.5.4/PEAR.php 2007-05-07 23:10:49.000000000 -0500 +++++ PEAR-1.5.4/PEAR.php.new 2007-05-23 16:36:05.699498250 -0500 ++@@ -278,7 +278,8 @@ ++ */ ++ function isError($data, $code = null) ++ { ++- if (is_a($data, 'PEAR_Error')) { +++ //if (is_a($data, 'PEAR_Error')) { +++ if ( $data instanceof PEAR_Error ) { ++ if (is_null($code)) { ++ return true; ++ } elseif (is_string($code)) { ++@@ -334,7 +335,8 @@ ++ ++ function setErrorHandling($mode = null, $options = null) ++ { ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if ( isset($this) && $this instanceof PEAR ) { ++ $setmode = &$this->_default_error_mode; ++ $setoptions = &$this->_default_error_options; ++ } else { ++@@ -588,7 +590,8 @@ ++ $code = null, ++ $userinfo = null) ++ { ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if ( isset($this) && $this instanceof PEAR ) { ++ $a = &$this->raiseError($message, $code, null, null, $userinfo); ++ return $a; ++ } else { ++@@ -686,7 +689,8 @@ ++ function pushErrorHandling($mode, $options = null) ++ { ++ $stack = &$GLOBALS['_PEAR_error_handler_stack']; ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if (isset($this) && $this instanceof PEAR ) { ++ $def_mode = &$this->_default_error_mode; ++ $def_options = &$this->_default_error_options; ++ } else { ++@@ -695,7 +699,8 @@ ++ } ++ $stack[] = array($def_mode, $def_options); ++ ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if (isset($this) && $this instanceof PEAR ) { ++ $this->setErrorHandling($mode, $options); ++ } else { ++ PEAR::setErrorHandling($mode, $options); ++@@ -720,7 +725,8 @@ ++ array_pop($stack); ++ list($mode, $options) = $stack[sizeof($stack) - 1]; ++ array_pop($stack); ++- if (isset($this) && is_a($this, 'PEAR')) { +++ //if (isset($this) && is_a($this, 'PEAR')) { +++ if (isset($this) && $this instanceof PEAR ) { ++ $this->setErrorHandling($mode, $options); ++ } else { ++ PEAR::setErrorHandling($mode, $options); +diff --git a/feeds/packages/lang/php4/.svn/entries b/feeds/packages/lang/php4/.svn/entries +new file mode 100644 +index 0000000..5221685 +--- /dev/null ++++ b/feeds/packages/lang/php4/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php4 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-11T14:16:51.752249Z ++35955 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++d2b93104ed7e154ca7e8c0cef7a12b6b ++2013-03-11T14:16:51.752249Z ++35955 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9211 ++ +diff --git a/feeds/packages/lang/php4/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/php4/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/lang/php4/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php4/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php4/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..78c1c50 +--- /dev/null ++++ b/feeds/packages/lang/php4/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,369 @@ ++# ++# 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:=php4 ++PKG_VERSION:=4.4.9 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.php.net/distributions/ ++PKG_MD5SUM:=2e3b2a0e27f10cb84fd00e5ecd7a1880 ++PKG_BUILD_DIR:=$(BUILD_DIR)/php-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php4/Default ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PHP4 Hypertext preprocessor ++ DEPENDS:=@!TARGET_ixp4xx ++ URL:=http://www.php.net/ ++endef ++ ++define Package/php4/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/php4 ++ $(call Package/php4/Default) ++ DEPENDS:=+libopenssl +zlib ++endef ++ ++define Package/php4/description ++$(call Package/php4/Default/description) ++ This package contains only the PHP config file. You must actually choose ++ your PHP flavour (cli, cgi or fastcgi). ++endef ++ ++define Package/php4-cli ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE+= (CLI) ++endef ++ ++define Package/php4-cli/description ++$(call Package/php4/Default/description) ++ This package contains the CLI version of the PHP4 interpreter. ++endef ++ ++define Package/php4-cgi ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE+= (CGI) ++endef ++ ++define Package/php4-cgi/description ++$(call Package/php4/Default/description) ++ This package contains the CGI version of the PHP4 interpreter. ++endef ++ ++define Package/php4-fastcgi ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE+= (FastCGI) ++endef ++ ++define Package/php4-fastcgi/description ++$(call Package/php4/Default/description) ++ This package contains the FastCGI version of the PHP4 interpreter. ++endef ++ ++define Package/php4-mod-curl ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libcurl ++ TITLE:=cURL module ++endef ++ ++define Package/php4-mod-ftp ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE:=FTP module ++endef ++ ++define Package/php4-mod-gd ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libgd ++ TITLE:=GD graphics module ++endef ++ ++define Package/php4-mod-gmp ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libgmp ++ TITLE:=GMP module ++endef ++ ++define Package/php4-mod-ldap ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libopenldap ++ TITLE:=LDAP module ++endef ++ ++define Package/php4-mod-mysql ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libmysqlclient ++ TITLE:=MySQL module ++endef ++ ++define Package/php4-mod-openssl ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libopenssl ++ TITLE:=OpenSSL module ++endef ++ ++define Package/php4-mod-pcre ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libpcre ++ TITLE:=PCRE module ++endef ++ ++define Package/php4-mod-pgsql ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libpq ++ TITLE:=PostgreSQL module ++endef ++ ++define Package/php4-mod-session ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE:=Session module ++endef ++ ++define Package/php4-mod-sockets ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE:=Sockets module ++endef ++ ++define Package/php4-mod-xml ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libexpat ++ TITLE:=XML module ++endef ++ ++PKG_CONFIGURE_LIBS:= -lcrypto -lssl ++PKG_CONFIGURE_OPTS:= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --disable-debug \ ++ --without-pear \ ++ \ ++ --with-config-file-path=/etc \ ++ --enable-magic-quotes \ ++ --enable-memory-limit \ ++ --disable-overload \ ++ --disable-short-tags \ ++ \ ++ --disable-ctype \ ++ --disable-dom \ ++ --enable-ftp=shared \ ++ --without-gettext \ ++ --without-iconv \ ++ --disable-mbstring \ ++ --disable-mbregex \ ++ --with-openssl=shared,"$(STAGING_DIR)/usr" \ ++ --with-kerberos=no \ ++ --with-openssl-dir="$(STAGING_DIR)/usr" \ ++ --enable-session=shared \ ++ --enable-sockets=shared \ ++ --disable-tokenizer \ ++ --with-zlib="$(STAGING_DIR)/usr" \ ++ --with-zlib-dir="$(STAGING_DIR)/usr" \ ++ ++ifneq ($(SDK),) ++ PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libexpat ++# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK ++ CONFIG_PACKAGE_php4-cli:=m ++ CONFIG_PACKAGE_php4-cgi:=m ++ CONFIG_PACKAGE_php4-fastcgi:=m ++ CONFIG_PACKAGE_php4-mod-curl:=m ++ CONFIG_PACKAGE_php4-mod-gd:=m ++ CONFIG_PACKAGE_php4-mod-gmp:=m ++ CONFIG_PACKAGE_php4-mod-ldap:=m ++ CONFIG_PACKAGE_php4-mod-mysql:=m ++ CONFIG_PACKAGE_php4-mod-pcre:=m ++ CONFIG_PACKAGE_php4-mod-pgsql:=m ++ CONFIG_PACKAGE_php4-mod-xml:=m ++endif ++ ++ifneq ($(CONFIG_PACKAGE_php4-mod-curl),) ++ PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-curl ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-gd),) ++ PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \ ++ --without-freetype-dir \ ++ --with-jpeg-dir="$(STAGING_DIR)/usr" \ ++ --with-png-dir="$(STAGING_DIR)/usr" \ ++ --without-xpm-dir \ ++ --without-ttf \ ++ --without-t1lib \ ++ --enable-gd-native-ttf \ ++ --disable-gd-jis-conv ++else ++ PKG_CONFIGURE_OPTS+= --without-gd ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-gmp),) ++ PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-gmp ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-ldap),) ++ PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_DIR)/usr" ++ --with-ldap-sasl="$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-ldap ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-mysql),) ++ PKG_CONFIGURE_OPTS+= --with-mysql=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-mysql ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-pcre),) ++ PKG_CONFIGURE_OPTS+= --with-pcre-regex=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-pcre-regex ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-pgsql),) ++ PKG_CONFIGURE_OPTS+= --with-pgsql=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-pgsql ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-xml),) ++ PKG_CONFIGURE_OPTS+= --enable-xml=shared \ ++ --with-expat-dir="$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --disable-xml ++endif ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(if $(CONFIG_BIG_ENDIAN),-DIEEE_BIG_ENDIAN,-DIEEE_LITTLE_ENDIAN) $(FPIC) ++ ++ifneq ($(CONFIG_PACKAGE_php4-cli),) ++ define Build/Compile/php4-cli ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Configure/Default, \ ++ $(PKG_CONFIGURE_OPTS) \ ++ --enable-cli \ ++ --disable-cgi \ ++ --disable-fastcgi \ ++ --enable-force-cgi-redirect \ ++ --enable-discard-path \ ++ , \ ++ LIBS="$(PKG_CONFIGURE_LIBS)" \ ++ php_cv_cc_rpath="no" \ ++ ) ++ LD_LIBRARY_PATH="" $(MAKE) -C $(PKG_BUILD_DIR) ++ mv $(PKG_BUILD_DIR)/sapi/cli/php $(PKG_BUILD_DIR)/php-cli ++ endef ++endif ++ ++ifneq ($(CONFIG_PACKAGE_php4-cgi),) ++ define Build/Compile/php4-cgi ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Configure/Default, \ ++ $(PKG_CONFIGURE_OPTS) \ ++ --disable-cli \ ++ --enable-cgi \ ++ --disable-fastcgi \ ++ --enable-force-cgi-redirect \ ++ --enable-discard-path \ ++ , \ ++ LIBS="$(PKG_CONFIGURE_LIBS)" \ ++ php_cv_cc_rpath="no" \ ++ ) ++ LD_LIBRARY_PATH="" $(MAKE) -C $(PKG_BUILD_DIR) ++ mv $(PKG_BUILD_DIR)/sapi/cgi/php $(PKG_BUILD_DIR)/php-cgi ++ endef ++endif ++ ++ifneq ($(CONFIG_PACKAGE_php4-fastcgi),) ++ define Build/Compile/php4-fastcgi ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Configure/Default, \ ++ $(PKG_CONFIGURE_OPTS) \ ++ --disable-cli \ ++ --enable-cgi \ ++ --enable-fastcgi \ ++ --enable-force-cgi-redirect \ ++ --enable-discard-path \ ++ , \ ++ LIBS="$(PKG_CONFIGURE_LIBS)" \ ++ php_cv_cc_rpath="no" \ ++ ) ++ LD_LIBRARY_PATH="" $(MAKE) -C $(PKG_BUILD_DIR) ++ mv $(PKG_BUILD_DIR)/sapi/cgi/php $(PKG_BUILD_DIR)/php-fastcgi ++ endef ++endif ++ ++define Build/Compile ++ $(call Build/Compile/php4-cli) ++ $(call Build/Compile/php4-cgi) ++ $(call Build/Compile/php4-fastcgi) ++endef ++ ++define Package/php4/conffiles ++/etc/php.ini ++endef ++ ++define Package/php4/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/php.ini $(1)/etc/ ++endef ++ ++define Package/php4-cli/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php ++endef ++ ++define Package/php4-cgi/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php ++endef ++ ++define Package/php4-fastcgi/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php ++endef ++ ++define BuildPlugin ++ define Package/$(1)/install ++ [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/php ++ for m in $(2); do \ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$$$$$$$${m}.so $$(1)/usr/lib/php/ ; \ ++ done ++ endef ++ ++ $$(eval $$(call BuildPackage,$(1))) ++endef ++ ++$(eval $(call BuildPackage,php4)) ++$(eval $(call BuildPackage,php4-cli)) ++$(eval $(call BuildPackage,php4-cgi)) ++$(eval $(call BuildPackage,php4-fastcgi)) ++$(eval $(call BuildPlugin,php4-mod-curl,curl)) ++$(eval $(call BuildPlugin,php4-mod-ftp,ftp)) ++$(eval $(call BuildPlugin,php4-mod-gd,gd)) ++$(eval $(call BuildPlugin,php4-mod-gmp,gmp)) ++$(eval $(call BuildPlugin,php4-mod-ldap,ldap)) ++$(eval $(call BuildPlugin,php4-mod-mysql,mysql)) ++$(eval $(call BuildPlugin,php4-mod-openssl,openssl)) ++$(eval $(call BuildPlugin,php4-mod-pcre,pcre)) ++$(eval $(call BuildPlugin,php4-mod-pgsql,pgsql)) ++$(eval $(call BuildPlugin,php4-mod-session,session)) ++$(eval $(call BuildPlugin,php4-mod-sockets,sockets)) ++$(eval $(call BuildPlugin,php4-mod-xml,xml)) ++ +diff --git a/feeds/packages/lang/php4/Makefile b/feeds/packages/lang/php4/Makefile +new file mode 100644 +index 0000000..78c1c50 +--- /dev/null ++++ b/feeds/packages/lang/php4/Makefile +@@ -0,0 +1,369 @@ ++# ++# 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:=php4 ++PKG_VERSION:=4.4.9 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.php.net/distributions/ ++PKG_MD5SUM:=2e3b2a0e27f10cb84fd00e5ecd7a1880 ++PKG_BUILD_DIR:=$(BUILD_DIR)/php-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/php4/Default ++ SUBMENU:=PHP ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=PHP4 Hypertext preprocessor ++ DEPENDS:=@!TARGET_ixp4xx ++ URL:=http://www.php.net/ ++endef ++ ++define Package/php4/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/php4 ++ $(call Package/php4/Default) ++ DEPENDS:=+libopenssl +zlib ++endef ++ ++define Package/php4/description ++$(call Package/php4/Default/description) ++ This package contains only the PHP config file. You must actually choose ++ your PHP flavour (cli, cgi or fastcgi). ++endef ++ ++define Package/php4-cli ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE+= (CLI) ++endef ++ ++define Package/php4-cli/description ++$(call Package/php4/Default/description) ++ This package contains the CLI version of the PHP4 interpreter. ++endef ++ ++define Package/php4-cgi ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE+= (CGI) ++endef ++ ++define Package/php4-cgi/description ++$(call Package/php4/Default/description) ++ This package contains the CGI version of the PHP4 interpreter. ++endef ++ ++define Package/php4-fastcgi ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE+= (FastCGI) ++endef ++ ++define Package/php4-fastcgi/description ++$(call Package/php4/Default/description) ++ This package contains the FastCGI version of the PHP4 interpreter. ++endef ++ ++define Package/php4-mod-curl ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libcurl ++ TITLE:=cURL module ++endef ++ ++define Package/php4-mod-ftp ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE:=FTP module ++endef ++ ++define Package/php4-mod-gd ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libgd ++ TITLE:=GD graphics module ++endef ++ ++define Package/php4-mod-gmp ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libgmp ++ TITLE:=GMP module ++endef ++ ++define Package/php4-mod-ldap ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libopenldap ++ TITLE:=LDAP module ++endef ++ ++define Package/php4-mod-mysql ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libmysqlclient ++ TITLE:=MySQL module ++endef ++ ++define Package/php4-mod-openssl ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libopenssl ++ TITLE:=OpenSSL module ++endef ++ ++define Package/php4-mod-pcre ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libpcre ++ TITLE:=PCRE module ++endef ++ ++define Package/php4-mod-pgsql ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libpq ++ TITLE:=PostgreSQL module ++endef ++ ++define Package/php4-mod-session ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE:=Session module ++endef ++ ++define Package/php4-mod-sockets ++ $(call Package/php4/Default) ++ DEPENDS:=php4 ++ TITLE:=Sockets module ++endef ++ ++define Package/php4-mod-xml ++ $(call Package/php4/Default) ++ DEPENDS:=php4 +libexpat ++ TITLE:=XML module ++endef ++ ++PKG_CONFIGURE_LIBS:= -lcrypto -lssl ++PKG_CONFIGURE_OPTS:= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --disable-debug \ ++ --without-pear \ ++ \ ++ --with-config-file-path=/etc \ ++ --enable-magic-quotes \ ++ --enable-memory-limit \ ++ --disable-overload \ ++ --disable-short-tags \ ++ \ ++ --disable-ctype \ ++ --disable-dom \ ++ --enable-ftp=shared \ ++ --without-gettext \ ++ --without-iconv \ ++ --disable-mbstring \ ++ --disable-mbregex \ ++ --with-openssl=shared,"$(STAGING_DIR)/usr" \ ++ --with-kerberos=no \ ++ --with-openssl-dir="$(STAGING_DIR)/usr" \ ++ --enable-session=shared \ ++ --enable-sockets=shared \ ++ --disable-tokenizer \ ++ --with-zlib="$(STAGING_DIR)/usr" \ ++ --with-zlib-dir="$(STAGING_DIR)/usr" \ ++ ++ifneq ($(SDK),) ++ PKG_BUILD_DEPENDS:=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libexpat ++# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK ++ CONFIG_PACKAGE_php4-cli:=m ++ CONFIG_PACKAGE_php4-cgi:=m ++ CONFIG_PACKAGE_php4-fastcgi:=m ++ CONFIG_PACKAGE_php4-mod-curl:=m ++ CONFIG_PACKAGE_php4-mod-gd:=m ++ CONFIG_PACKAGE_php4-mod-gmp:=m ++ CONFIG_PACKAGE_php4-mod-ldap:=m ++ CONFIG_PACKAGE_php4-mod-mysql:=m ++ CONFIG_PACKAGE_php4-mod-pcre:=m ++ CONFIG_PACKAGE_php4-mod-pgsql:=m ++ CONFIG_PACKAGE_php4-mod-xml:=m ++endif ++ ++ifneq ($(CONFIG_PACKAGE_php4-mod-curl),) ++ PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-curl ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-gd),) ++ PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \ ++ --without-freetype-dir \ ++ --with-jpeg-dir="$(STAGING_DIR)/usr" \ ++ --with-png-dir="$(STAGING_DIR)/usr" \ ++ --without-xpm-dir \ ++ --without-ttf \ ++ --without-t1lib \ ++ --enable-gd-native-ttf \ ++ --disable-gd-jis-conv ++else ++ PKG_CONFIGURE_OPTS+= --without-gd ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-gmp),) ++ PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-gmp ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-ldap),) ++ PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_DIR)/usr" ++ --with-ldap-sasl="$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-ldap ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-mysql),) ++ PKG_CONFIGURE_OPTS+= --with-mysql=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-mysql ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-pcre),) ++ PKG_CONFIGURE_OPTS+= --with-pcre-regex=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-pcre-regex ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-pgsql),) ++ PKG_CONFIGURE_OPTS+= --with-pgsql=shared,"$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --without-pgsql ++endif ++ifneq ($(CONFIG_PACKAGE_php4-mod-xml),) ++ PKG_CONFIGURE_OPTS+= --enable-xml=shared \ ++ --with-expat-dir="$(STAGING_DIR)/usr" ++else ++ PKG_CONFIGURE_OPTS+= --disable-xml ++endif ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(if $(CONFIG_BIG_ENDIAN),-DIEEE_BIG_ENDIAN,-DIEEE_LITTLE_ENDIAN) $(FPIC) ++ ++ifneq ($(CONFIG_PACKAGE_php4-cli),) ++ define Build/Compile/php4-cli ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Configure/Default, \ ++ $(PKG_CONFIGURE_OPTS) \ ++ --enable-cli \ ++ --disable-cgi \ ++ --disable-fastcgi \ ++ --enable-force-cgi-redirect \ ++ --enable-discard-path \ ++ , \ ++ LIBS="$(PKG_CONFIGURE_LIBS)" \ ++ php_cv_cc_rpath="no" \ ++ ) ++ LD_LIBRARY_PATH="" $(MAKE) -C $(PKG_BUILD_DIR) ++ mv $(PKG_BUILD_DIR)/sapi/cli/php $(PKG_BUILD_DIR)/php-cli ++ endef ++endif ++ ++ifneq ($(CONFIG_PACKAGE_php4-cgi),) ++ define Build/Compile/php4-cgi ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Configure/Default, \ ++ $(PKG_CONFIGURE_OPTS) \ ++ --disable-cli \ ++ --enable-cgi \ ++ --disable-fastcgi \ ++ --enable-force-cgi-redirect \ ++ --enable-discard-path \ ++ , \ ++ LIBS="$(PKG_CONFIGURE_LIBS)" \ ++ php_cv_cc_rpath="no" \ ++ ) ++ LD_LIBRARY_PATH="" $(MAKE) -C $(PKG_BUILD_DIR) ++ mv $(PKG_BUILD_DIR)/sapi/cgi/php $(PKG_BUILD_DIR)/php-cgi ++ endef ++endif ++ ++ifneq ($(CONFIG_PACKAGE_php4-fastcgi),) ++ define Build/Compile/php4-fastcgi ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Configure/Default, \ ++ $(PKG_CONFIGURE_OPTS) \ ++ --disable-cli \ ++ --enable-cgi \ ++ --enable-fastcgi \ ++ --enable-force-cgi-redirect \ ++ --enable-discard-path \ ++ , \ ++ LIBS="$(PKG_CONFIGURE_LIBS)" \ ++ php_cv_cc_rpath="no" \ ++ ) ++ LD_LIBRARY_PATH="" $(MAKE) -C $(PKG_BUILD_DIR) ++ mv $(PKG_BUILD_DIR)/sapi/cgi/php $(PKG_BUILD_DIR)/php-fastcgi ++ endef ++endif ++ ++define Build/Compile ++ $(call Build/Compile/php4-cli) ++ $(call Build/Compile/php4-cgi) ++ $(call Build/Compile/php4-fastcgi) ++endef ++ ++define Package/php4/conffiles ++/etc/php.ini ++endef ++ ++define Package/php4/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/php.ini $(1)/etc/ ++endef ++ ++define Package/php4-cli/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/php-cli $(1)/usr/bin/php ++endef ++ ++define Package/php4-cgi/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/php-cgi $(1)/usr/bin/php ++endef ++ ++define Package/php4-fastcgi/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(1)/usr/sbin/php ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php ++endef ++ ++define BuildPlugin ++ define Package/$(1)/install ++ [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/php ++ for m in $(2); do \ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$$$$$$$${m}.so $$(1)/usr/lib/php/ ; \ ++ done ++ endef ++ ++ $$(eval $$(call BuildPackage,$(1))) ++endef ++ ++$(eval $(call BuildPackage,php4)) ++$(eval $(call BuildPackage,php4-cli)) ++$(eval $(call BuildPackage,php4-cgi)) ++$(eval $(call BuildPackage,php4-fastcgi)) ++$(eval $(call BuildPlugin,php4-mod-curl,curl)) ++$(eval $(call BuildPlugin,php4-mod-ftp,ftp)) ++$(eval $(call BuildPlugin,php4-mod-gd,gd)) ++$(eval $(call BuildPlugin,php4-mod-gmp,gmp)) ++$(eval $(call BuildPlugin,php4-mod-ldap,ldap)) ++$(eval $(call BuildPlugin,php4-mod-mysql,mysql)) ++$(eval $(call BuildPlugin,php4-mod-openssl,openssl)) ++$(eval $(call BuildPlugin,php4-mod-pcre,pcre)) ++$(eval $(call BuildPlugin,php4-mod-pgsql,pgsql)) ++$(eval $(call BuildPlugin,php4-mod-session,session)) ++$(eval $(call BuildPlugin,php4-mod-sockets,sockets)) ++$(eval $(call BuildPlugin,php4-mod-xml,xml)) ++ +diff --git a/feeds/packages/lang/php4/files/.svn/entries b/feeds/packages/lang/php4/files/.svn/entries +new file mode 100644 +index 0000000..d6d12af +--- /dev/null ++++ b/feeds/packages/lang/php4/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php4/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++php.ini ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++0efbcd76e747e372cd114abe6926aab8 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++18449 ++ ++php.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++eeb41b544fc50e301c8bd28e9c63b425 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++123 ++ +diff --git a/feeds/packages/lang/php4/files/.svn/prop-base/php.ini.svn-base b/feeds/packages/lang/php4/files/.svn/prop-base/php.ini.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php4/files/.svn/prop-base/php.ini.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php4/files/.svn/prop-base/php.init.svn-base b/feeds/packages/lang/php4/files/.svn/prop-base/php.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php4/files/.svn/prop-base/php.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php4/files/.svn/text-base/php.ini.svn-base b/feeds/packages/lang/php4/files/.svn/text-base/php.ini.svn-base +new file mode 100644 +index 0000000..ae16d0b +--- /dev/null ++++ b/feeds/packages/lang/php4/files/.svn/text-base/php.ini.svn-base +@@ -0,0 +1,561 @@ ++[PHP] ++ ++cgi.fix_pathinfo=1 ++ ++zend.ze1_compatibility_mode = Off ++ ++;short_open_tag = Off ++asp_tags = Off ++precision = 12 ++y2k_compliance = On ++output_buffering = Off ++ ++zlib.output_compression = Off ++;zlib.output_handler = ++implicit_flush = Off ++ ++unserialize_callback_func= ++serialize_precision = 100 ++ ++allow_call_time_pass_reference = On ++ ++safe_mode = Off ++ ++safe_mode_gid = Off ++ ++safe_mode_include_dir = ++ ++safe_mode_exec_dir = ++ ++safe_mode_allowed_env_vars = PHP_ ++ ++safe_mode_protected_env_vars = LD_LIBRARY_PATH ++ ++;open_basedir = ++ ++disable_functions = ++ ++disable_classes = ++ ++; Colors for Syntax Highlighting mode. Anything that's acceptable in ++; would work. ++;highlight.string = #DD0000 ++;highlight.comment = #FF9900 ++;highlight.keyword = #007700 ++;highlight.bg = #FFFFFF ++;highlight.default = #0000BB ++;highlight.html = #000000 ++ ++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 ++memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) ++ ++ ++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ++; Error handling and logging ; ++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ++ ++; error_reporting is a bit-field. Or each number up to get desired error ++; reporting level ++; E_ALL - All errors and warnings (doesn't include E_STRICT) ++; E_ERROR - 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 ++; ++; Examples: ++; ++; - Show all errors, except for notices and coding standards warnings ++; ++;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT ++; ++; - Show all errors, except for notices ++; ++;error_reporting = E_ALL & ~E_NOTICE ++; ++; - Show only errors ++; ++;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ++; ++; - Show all errors except for notices and coding standards warnings ++; ++error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT ++ ++; Print out errors (as a part of the output). For production web sites, ++; you're strongly encouraged to turn this feature off, and use error logging ++; instead (see below). Keeping display_errors enabled on a production web site ++; may reveal security information to end users, such as file paths on your Web ++; server, your database schema or other information. ++display_errors = On ++ ++; Even when display_errors is on, errors that occur during PHP's startup ++; sequence are not displayed. It's strongly recommended to keep ++; display_startup_errors off, except for when debugging. ++display_startup_errors = Off ++ ++; Log errors into a log file (server-specific log, stderr, or error_log (below)) ++; As stated above, you're strongly advised to use error logging in place of ++; error displaying on production web sites. ++log_errors = Off ++ ++; Set maximum length of log_errors. In error_log information about the source is ++; added. The default is 1024 and 0 allows to not apply any maximum length at all. ++log_errors_max_len = 1024 ++ ++; Do not log repeated messages. Repeated errors must occur in same file on same ++; line until ignore_repeated_source is set true. ++ignore_repeated_errors = Off ++ ++; Ignore source of message when ignoring repeated messages. When this setting ++; is On you will not log errors with repeated messages from different files or ++; sourcelines. ++ignore_repeated_source = Off ++ ++; If this parameter is set to Off, then memory leaks will not be shown (on ++; stdout or in the log). This has only effect in a debug compile, and if ++; error reporting includes E_WARNING in the allowed list ++report_memleaks = On ++ ++; Store the last error/warning message in $php_errormsg (boolean). ++track_errors = Off ++ ++; Disable the inclusion of HTML tags in error messages. ++; Note: Never use this feature for production boxes. ++;html_errors = Off ++ ++; If html_errors is set On PHP produces clickable error messages that direct ++; to a page describing the error or function causing the error in detail. ++; You can download a copy of the PHP manual from http://www.php.net/docs.php ++; and change docref_root to the base URL of your local copy including the ++; leading '/'. You must also specify the file extension being used including ++; the dot. ++; Note: Never use this feature for production boxes. ++;docref_root = "/phpmanual/" ++;docref_ext = .html ++ ++; String to output before an error message. ++;error_prepend_string = "" ++ ++; String to output after an error message. ++;error_append_string = "" ++ ++; Log errors to specified file. ++;error_log = filename ++ ++; Log errors to syslog (Event Log on NT, not valid in Windows 95). ++;error_log = syslog ++ ++ ++;;;;;;;;;;;;;;;;; ++; Data Handling ; ++;;;;;;;;;;;;;;;;; ++; ++; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 ++ ++; The separator used in PHP generated URLs to separate arguments. ++; Default is "&". ++;arg_separator.output = "&" ++ ++; List of separator(s) used by PHP to parse input URLs into variables. ++; Default is "&". ++; NOTE: Every character in this directive is considered as separator! ++;arg_separator.input = ";&" ++ ++; This directive describes the order in which PHP registers GET, POST, Cookie, ++; Environment and Built-in variables (G, P, C, E & S respectively, often ++; referred to as EGPCS or GPC). Registration is done from left to right, newer ++; values override older values. ++variables_order = "EGPCS" ++ ++; Whether or not to register the EGPCS variables as global variables. You may ++; want to turn this off if you don't want to clutter your scripts' global scope ++; with user data. This makes most sense when coupled with track_vars - in which ++; case you can access all of the GPC variables through the $HTTP_*_VARS[], ++; variables. ++; ++; You should do your best to write your scripts so that they do not require ++; register_globals to be on; Using form variables as globals can easily lead ++; to possible security problems, if the code is not very well thought of. ++register_globals = Off ++ ++; Whether or not to register the old-style input arrays, HTTP_GET_VARS ++; and friends. If you're not using them, it's recommended to turn them off, ++; for performance reasons. ++register_long_arrays = On ++ ++; This directive tells PHP whether to declare the argv&argc variables (that ++; would contain the GET information). If you don't use these variables, you ++; should turn it off for increased performance. ++register_argc_argv = On ++ ++; Maximum size of POST data that PHP will accept. ++post_max_size = 8M ++ ++; Magic quotes ++; ++ ++; Magic quotes for incoming GET/POST/Cookie data. ++magic_quotes_gpc = On ++ ++; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. ++magic_quotes_runtime = Off ++ ++; Use Sybase-style magic quotes (escape ' with '' instead of \'). ++magic_quotes_sybase = Off ++ ++; Automatically add files before or after any PHP document. ++auto_prepend_file = ++auto_append_file = ++ ++; As of 4.0b4, PHP always outputs a character encoding by default in ++; the Content-type: header. To disable sending of the charset, simply ++; set it to be empty. ++; ++; PHP's built-in default is text/html ++default_mimetype = "text/html" ++;default_charset = "iso-8859-1" ++ ++; Always populate the $HTTP_RAW_POST_DATA variable. ++;always_populate_raw_post_data = On ++ ++ ++;;;;;;;;;;;;;;;;;;;;;;;;; ++; Paths and Directories ; ++;;;;;;;;;;;;;;;;;;;;;;;;; ++ ++; UNIX: "/path1:/path2" ++;include_path = ".:/php/includes" ++; ++; Windows: "\path1;\path2" ++;include_path = ".;c:\php\includes" ++ ++; The root of the PHP pages, used only if nonempty. ++; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root ++; if you are running php as a CGI under any web server (other than IIS) ++; see documentation for security issues. The alternate is to use the ++; cgi.force_redirect configuration below ++doc_root = /www ++ ++; The directory under which PHP opens the script using /~username used only ++; if nonempty. ++user_dir = ++ ++; Directory in which the loadable extensions (modules) reside. ++extension_dir = "/usr/lib/php" ++ ++; Whether or not to enable the dl() function. The dl() function does NOT work ++; properly in multithreaded servers, such as IIS or Zeus, and is automatically ++; disabled on them. ++enable_dl = On ++ ++; cgi.force_redirect is necessary to provide security running PHP as a CGI under ++; most web servers. Left undefined, PHP turns this on by default. You can ++; turn it off here AT YOUR OWN RISK ++; **You CAN safely turn this off for IIS, in fact, you MUST.** ++; cgi.force_redirect = 1 ++ ++; if cgi.nph is enabled it will force cgi to always sent Status: 200 with ++; every request. ++; cgi.nph = 1 ++ ++; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape ++; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ++; will look for to know it is OK to continue execution. Setting this variable MAY ++; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ++; cgi.redirect_status_env = ; ++ ++; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate ++; security tokens of the calling client. This allows IIS to define the ++; security context that the request runs under. mod_fastcgi under Apache ++; does not currently support this feature (03/17/2002) ++; Set to 1 if running under IIS. Default is zero. ++; fastcgi.impersonate = 1; ++ ++; cgi.rfc2616_headers configuration option tells PHP what type of headers to ++; use when sending HTTP response code. If it's set 0 PHP sends Status: header that ++; is supported by Apache. When this option is set to 1 PHP will send ++; RFC2616 compliant header. ++; Default is zero. ++;cgi.rfc2616_headers = 0 ++ ++ ++;;;;;;;;;;;;;;;; ++; File Uploads ; ++;;;;;;;;;;;;;;;; ++ ++; Whether to allow HTTP file uploads. ++file_uploads = On ++ ++; Temporary directory for HTTP uploaded files (will use system default if not ++; specified). ++upload_tmp_dir = /tmp ++ ++; Maximum allowed size for uploaded files. ++upload_max_filesize = 2M ++ ++ ++;;;;;;;;;;;;;;;;;; ++; Fopen wrappers ; ++;;;;;;;;;;;;;;;;;; ++ ++; Whether to allow the treatment of URLs (like http:// or ftp://) as files. ++allow_url_fopen = On ++ ++; Define the anonymous ftp password (your email address) ++;from="john@doe.com" ++ ++; Define the User-Agent string ++; user_agent="PHP" ++ ++; Default timeout for socket based streams (seconds) ++default_socket_timeout = 60 ++ ++; If your scripts have to deal with files from Macintosh systems, ++; or you are running on a Mac and need to deal with files from ++; unix or win32 systems, setting this flag will cause PHP to ++; automatically detect the EOL character in those files so that ++; fgets() and file() will work regardless of the source of the file. ++; auto_detect_line_endings = Off ++ ++ ++;;;;;;;;;;;;;;;;;;;;;; ++; Dynamic Extensions ; ++;;;;;;;;;;;;;;;;;;;;;; ++; ++; If you wish to have an extension loaded automatically, use the following ++; syntax: ++; ++; extension=modulename.extension ++; ++; For example, on Windows: ++; ++; extension=msql.dll ++; ++; ... or under UNIX: ++; ++; extension=msql.so ++; ++; Note that it should be the name of the module only; no directory information ++; needs to go here. Specify the location of the extension with the ++; extension_dir directive above. ++ ++ ++;Windows Extensions ++;Note that ODBC support is built in, so no dll is needed for it. ++; ++ ++;extension=ftp.so ++;extension=gd.so ++;extension=mysql.so ++;extension=pcre.so ++;extension=session.so ++;extension=sockets.so ++;extension=xml.so ++ ++ ++ ++ ++;;;;;;;;;;;;;;;;;;; ++; Module Settings ; ++;;;;;;;;;;;;;;;;;;; ++ ++[SQL] ++sql.safe_mode = Off ++ ++[Session] ++; Handler used to store/retrieve data. ++session.save_handler = files ++ ++; Argument passed to save_handler. In the case of files, this is the path ++; where data files are stored. Note: Windows users have to change this ++; variable in order to use PHP's session functions. ++; ++; As of PHP 4.0.1, you can define the path as: ++; ++; session.save_path = "N;/path" ++; ++; where N is an integer. Instead of storing all the session files in ++; /path, what this will do is use subdirectories N-levels deep, and ++; store the session data in those directories. This is useful if you ++; or your OS have problems with lots of files in one directory, and is ++; a more efficient layout for servers that handle lots of sessions. ++; ++; NOTE 1: PHP will not create this directory structure automatically. ++; You can use the script in the ext/session dir for that purpose. ++; NOTE 2: See the section on garbage collection below if you choose to ++; use subdirectories for session storage ++; ++; The file storage module creates files using mode 600 by default. ++; You can change that by using ++; ++; session.save_path = "N;MODE;/path" ++; ++; where MODE is the octal representation of the mode. Note that this ++; does not overwrite the process's umask. ++session.save_path = "/tmp" ++ ++; Whether to use cookies. ++session.use_cookies = 1 ++ ++; This option enables administrators to make their users invulnerable to ++; attacks which involve passing session ids in URLs; defaults to 0. ++; session.use_only_cookies = 1 ++ ++; Name of the session (used as cookie name). ++session.name = PHPSESSID ++ ++; Initialize session on request startup. ++session.auto_start = 0 ++ ++; Lifetime in seconds of cookie or, if 0, until browser is restarted. ++session.cookie_lifetime = 0 ++ ++; The path for which the cookie is valid. ++session.cookie_path = / ++ ++; The domain for which the cookie is valid. ++session.cookie_domain = ++ ++; Handler used to serialize data. php is the standard serializer of PHP. ++session.serialize_handler = php ++ ++; Define the probability that the 'garbage collection' process is started ++; on every session initialization. ++; The probability is calculated by using gc_probability/gc_divisor, ++; e.g. 1/100 means there is a 1% chance that the GC process starts ++; on each request. ++ ++session.gc_probability = 1 ++session.gc_divisor = 100 ++ ++; After this number of seconds, stored data will be seen as 'garbage' and ++; cleaned up by the garbage collection process. ++session.gc_maxlifetime = 1440 ++ ++; NOTE: If you are using the subdirectory option for storing session files ++; (see session.save_path above), then garbage collection does *not* ++; happen automatically. You will need to do your own garbage ++; collection through a shell script, cron entry, or some other method. ++; For example, the following script would is the equivalent of ++; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): ++; cd /path/to/sessions; find -cmin +24 | xargs rm ++ ++; PHP 4.2 and less have an undocumented feature/bug that allows you to ++; to initialize a session variable in the global scope, albeit register_globals ++; is disabled. PHP 4.3 and later will warn you, if this feature is used. ++; You can disable the feature and the warning separately. At this time, ++; the warning is only displayed, if bug_compat_42 is enabled. ++ ++session.bug_compat_42 = 1 ++session.bug_compat_warn = 1 ++ ++; Check HTTP Referer to invalidate externally stored URLs containing ids. ++; HTTP_REFERER has to contain this substring for the session to be ++; considered as valid. ++session.referer_check = ++ ++; How many bytes to read from the file. ++session.entropy_length = 0 ++ ++; Specified here to create the session id. ++session.entropy_file = ++ ++;session.entropy_length = 16 ++ ++;session.entropy_file = /dev/urandom ++ ++; Set to {nocache,private,public,} to determine HTTP caching aspects ++; or leave this empty to avoid sending anti-caching headers. ++session.cache_limiter = nocache ++ ++; Document expires after n minutes. ++session.cache_expire = 180 ++ ++; trans sid support is disabled by default. ++; Use of trans sid may risk your users security. ++; Use this option with caution. ++; - User may send URL contains active session ID ++; to other person via. email/irc/etc. ++; - URL that contains active session ID may be stored ++; in publically accessible computer. ++; - User may access your site with the same session ID ++; always using URL stored in browser's history or bookmarks. ++session.use_trans_sid = 0 ++ ++; Select a hash function ++; 0: MD5 (128 bits) ++; 1: SHA-1 (160 bits) ++session.hash_function = 0 ++ ++; Define how many bits are stored in each character when converting ++; the binary hash data to something readable. ++; ++; 4 bits: 0-9, a-f ++; 5 bits: 0-9, a-v ++; 6 bits: 0-9, a-z, A-Z, "-", "," ++session.hash_bits_per_character = 4 ++ ++; The URL rewriter will look for URLs in a defined set of HTML tags. ++; form/fieldset are special; if you include them here, the rewriter will ++; add a hidden field with the info which is otherwise appended ++; to URLs. If you want XHTML conformity, remove the form entry. ++; Note that all valid entries require a "=", even if no value follows. ++url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset=" ++ ++ ++[Assertion] ++; Assert(expr); active by default. ++;assert.active = On ++ ++; Issue a PHP warning for each failed assertion. ++;assert.warning = On ++ ++; Don't bail out by default. ++;assert.bail = Off ++ ++; User-function to be called if an assertion fails. ++;assert.callback = 0 ++ ++; Eval the expression with current error_reporting(). Set to true if you want ++; error_reporting(0) around the eval(). ++;assert.quiet_eval = 0 ++ ++ ++ ++ ++ ++[exif] ++; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. ++; With mbstring support this will automatically be converted into the encoding ++; given by corresponding encode setting. When empty mbstring.internal_encoding ++; is used. For the decode settings you can distinguish between motorola and ++; intel byte order. A decode setting cannot be empty. ++;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 ++ +diff --git a/feeds/packages/lang/php4/files/.svn/text-base/php.init.svn-base b/feeds/packages/lang/php4/files/.svn/text-base/php.init.svn-base +new file mode 100644 +index 0000000..373f396 +--- /dev/null ++++ b/feeds/packages/lang/php4/files/.svn/text-base/php.init.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++start() { ++ $BIN -b $PORT & ++} ++ ++stop() { ++ killall php ++} ++ +diff --git a/feeds/packages/lang/php4/files/php.ini b/feeds/packages/lang/php4/files/php.ini +new file mode 100644 +index 0000000..ae16d0b +--- /dev/null ++++ b/feeds/packages/lang/php4/files/php.ini +@@ -0,0 +1,561 @@ ++[PHP] ++ ++cgi.fix_pathinfo=1 ++ ++zend.ze1_compatibility_mode = Off ++ ++;short_open_tag = Off ++asp_tags = Off ++precision = 12 ++y2k_compliance = On ++output_buffering = Off ++ ++zlib.output_compression = Off ++;zlib.output_handler = ++implicit_flush = Off ++ ++unserialize_callback_func= ++serialize_precision = 100 ++ ++allow_call_time_pass_reference = On ++ ++safe_mode = Off ++ ++safe_mode_gid = Off ++ ++safe_mode_include_dir = ++ ++safe_mode_exec_dir = ++ ++safe_mode_allowed_env_vars = PHP_ ++ ++safe_mode_protected_env_vars = LD_LIBRARY_PATH ++ ++;open_basedir = ++ ++disable_functions = ++ ++disable_classes = ++ ++; Colors for Syntax Highlighting mode. Anything that's acceptable in ++; would work. ++;highlight.string = #DD0000 ++;highlight.comment = #FF9900 ++;highlight.keyword = #007700 ++;highlight.bg = #FFFFFF ++;highlight.default = #0000BB ++;highlight.html = #000000 ++ ++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 ++memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) ++ ++ ++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ++; Error handling and logging ; ++;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ++ ++; error_reporting is a bit-field. Or each number up to get desired error ++; reporting level ++; E_ALL - All errors and warnings (doesn't include E_STRICT) ++; E_ERROR - 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 ++; ++; Examples: ++; ++; - Show all errors, except for notices and coding standards warnings ++; ++;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT ++; ++; - Show all errors, except for notices ++; ++;error_reporting = E_ALL & ~E_NOTICE ++; ++; - Show only errors ++; ++;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ++; ++; - Show all errors except for notices and coding standards warnings ++; ++error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT ++ ++; Print out errors (as a part of the output). For production web sites, ++; you're strongly encouraged to turn this feature off, and use error logging ++; instead (see below). Keeping display_errors enabled on a production web site ++; may reveal security information to end users, such as file paths on your Web ++; server, your database schema or other information. ++display_errors = On ++ ++; Even when display_errors is on, errors that occur during PHP's startup ++; sequence are not displayed. It's strongly recommended to keep ++; display_startup_errors off, except for when debugging. ++display_startup_errors = Off ++ ++; Log errors into a log file (server-specific log, stderr, or error_log (below)) ++; As stated above, you're strongly advised to use error logging in place of ++; error displaying on production web sites. ++log_errors = Off ++ ++; Set maximum length of log_errors. In error_log information about the source is ++; added. The default is 1024 and 0 allows to not apply any maximum length at all. ++log_errors_max_len = 1024 ++ ++; Do not log repeated messages. Repeated errors must occur in same file on same ++; line until ignore_repeated_source is set true. ++ignore_repeated_errors = Off ++ ++; Ignore source of message when ignoring repeated messages. When this setting ++; is On you will not log errors with repeated messages from different files or ++; sourcelines. ++ignore_repeated_source = Off ++ ++; If this parameter is set to Off, then memory leaks will not be shown (on ++; stdout or in the log). This has only effect in a debug compile, and if ++; error reporting includes E_WARNING in the allowed list ++report_memleaks = On ++ ++; Store the last error/warning message in $php_errormsg (boolean). ++track_errors = Off ++ ++; Disable the inclusion of HTML tags in error messages. ++; Note: Never use this feature for production boxes. ++;html_errors = Off ++ ++; If html_errors is set On PHP produces clickable error messages that direct ++; to a page describing the error or function causing the error in detail. ++; You can download a copy of the PHP manual from http://www.php.net/docs.php ++; and change docref_root to the base URL of your local copy including the ++; leading '/'. You must also specify the file extension being used including ++; the dot. ++; Note: Never use this feature for production boxes. ++;docref_root = "/phpmanual/" ++;docref_ext = .html ++ ++; String to output before an error message. ++;error_prepend_string = "" ++ ++; String to output after an error message. ++;error_append_string = "" ++ ++; Log errors to specified file. ++;error_log = filename ++ ++; Log errors to syslog (Event Log on NT, not valid in Windows 95). ++;error_log = syslog ++ ++ ++;;;;;;;;;;;;;;;;; ++; Data Handling ; ++;;;;;;;;;;;;;;;;; ++; ++; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 ++ ++; The separator used in PHP generated URLs to separate arguments. ++; Default is "&". ++;arg_separator.output = "&" ++ ++; List of separator(s) used by PHP to parse input URLs into variables. ++; Default is "&". ++; NOTE: Every character in this directive is considered as separator! ++;arg_separator.input = ";&" ++ ++; This directive describes the order in which PHP registers GET, POST, Cookie, ++; Environment and Built-in variables (G, P, C, E & S respectively, often ++; referred to as EGPCS or GPC). Registration is done from left to right, newer ++; values override older values. ++variables_order = "EGPCS" ++ ++; Whether or not to register the EGPCS variables as global variables. You may ++; want to turn this off if you don't want to clutter your scripts' global scope ++; with user data. This makes most sense when coupled with track_vars - in which ++; case you can access all of the GPC variables through the $HTTP_*_VARS[], ++; variables. ++; ++; You should do your best to write your scripts so that they do not require ++; register_globals to be on; Using form variables as globals can easily lead ++; to possible security problems, if the code is not very well thought of. ++register_globals = Off ++ ++; Whether or not to register the old-style input arrays, HTTP_GET_VARS ++; and friends. If you're not using them, it's recommended to turn them off, ++; for performance reasons. ++register_long_arrays = On ++ ++; This directive tells PHP whether to declare the argv&argc variables (that ++; would contain the GET information). If you don't use these variables, you ++; should turn it off for increased performance. ++register_argc_argv = On ++ ++; Maximum size of POST data that PHP will accept. ++post_max_size = 8M ++ ++; Magic quotes ++; ++ ++; Magic quotes for incoming GET/POST/Cookie data. ++magic_quotes_gpc = On ++ ++; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. ++magic_quotes_runtime = Off ++ ++; Use Sybase-style magic quotes (escape ' with '' instead of \'). ++magic_quotes_sybase = Off ++ ++; Automatically add files before or after any PHP document. ++auto_prepend_file = ++auto_append_file = ++ ++; As of 4.0b4, PHP always outputs a character encoding by default in ++; the Content-type: header. To disable sending of the charset, simply ++; set it to be empty. ++; ++; PHP's built-in default is text/html ++default_mimetype = "text/html" ++;default_charset = "iso-8859-1" ++ ++; Always populate the $HTTP_RAW_POST_DATA variable. ++;always_populate_raw_post_data = On ++ ++ ++;;;;;;;;;;;;;;;;;;;;;;;;; ++; Paths and Directories ; ++;;;;;;;;;;;;;;;;;;;;;;;;; ++ ++; UNIX: "/path1:/path2" ++;include_path = ".:/php/includes" ++; ++; Windows: "\path1;\path2" ++;include_path = ".;c:\php\includes" ++ ++; The root of the PHP pages, used only if nonempty. ++; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root ++; if you are running php as a CGI under any web server (other than IIS) ++; see documentation for security issues. The alternate is to use the ++; cgi.force_redirect configuration below ++doc_root = /www ++ ++; The directory under which PHP opens the script using /~username used only ++; if nonempty. ++user_dir = ++ ++; Directory in which the loadable extensions (modules) reside. ++extension_dir = "/usr/lib/php" ++ ++; Whether or not to enable the dl() function. The dl() function does NOT work ++; properly in multithreaded servers, such as IIS or Zeus, and is automatically ++; disabled on them. ++enable_dl = On ++ ++; cgi.force_redirect is necessary to provide security running PHP as a CGI under ++; most web servers. Left undefined, PHP turns this on by default. You can ++; turn it off here AT YOUR OWN RISK ++; **You CAN safely turn this off for IIS, in fact, you MUST.** ++; cgi.force_redirect = 1 ++ ++; if cgi.nph is enabled it will force cgi to always sent Status: 200 with ++; every request. ++; cgi.nph = 1 ++ ++; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape ++; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ++; will look for to know it is OK to continue execution. Setting this variable MAY ++; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ++; cgi.redirect_status_env = ; ++ ++; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate ++; security tokens of the calling client. This allows IIS to define the ++; security context that the request runs under. mod_fastcgi under Apache ++; does not currently support this feature (03/17/2002) ++; Set to 1 if running under IIS. Default is zero. ++; fastcgi.impersonate = 1; ++ ++; cgi.rfc2616_headers configuration option tells PHP what type of headers to ++; use when sending HTTP response code. If it's set 0 PHP sends Status: header that ++; is supported by Apache. When this option is set to 1 PHP will send ++; RFC2616 compliant header. ++; Default is zero. ++;cgi.rfc2616_headers = 0 ++ ++ ++;;;;;;;;;;;;;;;; ++; File Uploads ; ++;;;;;;;;;;;;;;;; ++ ++; Whether to allow HTTP file uploads. ++file_uploads = On ++ ++; Temporary directory for HTTP uploaded files (will use system default if not ++; specified). ++upload_tmp_dir = /tmp ++ ++; Maximum allowed size for uploaded files. ++upload_max_filesize = 2M ++ ++ ++;;;;;;;;;;;;;;;;;; ++; Fopen wrappers ; ++;;;;;;;;;;;;;;;;;; ++ ++; Whether to allow the treatment of URLs (like http:// or ftp://) as files. ++allow_url_fopen = On ++ ++; Define the anonymous ftp password (your email address) ++;from="john@doe.com" ++ ++; Define the User-Agent string ++; user_agent="PHP" ++ ++; Default timeout for socket based streams (seconds) ++default_socket_timeout = 60 ++ ++; If your scripts have to deal with files from Macintosh systems, ++; or you are running on a Mac and need to deal with files from ++; unix or win32 systems, setting this flag will cause PHP to ++; automatically detect the EOL character in those files so that ++; fgets() and file() will work regardless of the source of the file. ++; auto_detect_line_endings = Off ++ ++ ++;;;;;;;;;;;;;;;;;;;;;; ++; Dynamic Extensions ; ++;;;;;;;;;;;;;;;;;;;;;; ++; ++; If you wish to have an extension loaded automatically, use the following ++; syntax: ++; ++; extension=modulename.extension ++; ++; For example, on Windows: ++; ++; extension=msql.dll ++; ++; ... or under UNIX: ++; ++; extension=msql.so ++; ++; Note that it should be the name of the module only; no directory information ++; needs to go here. Specify the location of the extension with the ++; extension_dir directive above. ++ ++ ++;Windows Extensions ++;Note that ODBC support is built in, so no dll is needed for it. ++; ++ ++;extension=ftp.so ++;extension=gd.so ++;extension=mysql.so ++;extension=pcre.so ++;extension=session.so ++;extension=sockets.so ++;extension=xml.so ++ ++ ++ ++ ++;;;;;;;;;;;;;;;;;;; ++; Module Settings ; ++;;;;;;;;;;;;;;;;;;; ++ ++[SQL] ++sql.safe_mode = Off ++ ++[Session] ++; Handler used to store/retrieve data. ++session.save_handler = files ++ ++; Argument passed to save_handler. In the case of files, this is the path ++; where data files are stored. Note: Windows users have to change this ++; variable in order to use PHP's session functions. ++; ++; As of PHP 4.0.1, you can define the path as: ++; ++; session.save_path = "N;/path" ++; ++; where N is an integer. Instead of storing all the session files in ++; /path, what this will do is use subdirectories N-levels deep, and ++; store the session data in those directories. This is useful if you ++; or your OS have problems with lots of files in one directory, and is ++; a more efficient layout for servers that handle lots of sessions. ++; ++; NOTE 1: PHP will not create this directory structure automatically. ++; You can use the script in the ext/session dir for that purpose. ++; NOTE 2: See the section on garbage collection below if you choose to ++; use subdirectories for session storage ++; ++; The file storage module creates files using mode 600 by default. ++; You can change that by using ++; ++; session.save_path = "N;MODE;/path" ++; ++; where MODE is the octal representation of the mode. Note that this ++; does not overwrite the process's umask. ++session.save_path = "/tmp" ++ ++; Whether to use cookies. ++session.use_cookies = 1 ++ ++; This option enables administrators to make their users invulnerable to ++; attacks which involve passing session ids in URLs; defaults to 0. ++; session.use_only_cookies = 1 ++ ++; Name of the session (used as cookie name). ++session.name = PHPSESSID ++ ++; Initialize session on request startup. ++session.auto_start = 0 ++ ++; Lifetime in seconds of cookie or, if 0, until browser is restarted. ++session.cookie_lifetime = 0 ++ ++; The path for which the cookie is valid. ++session.cookie_path = / ++ ++; The domain for which the cookie is valid. ++session.cookie_domain = ++ ++; Handler used to serialize data. php is the standard serializer of PHP. ++session.serialize_handler = php ++ ++; Define the probability that the 'garbage collection' process is started ++; on every session initialization. ++; The probability is calculated by using gc_probability/gc_divisor, ++; e.g. 1/100 means there is a 1% chance that the GC process starts ++; on each request. ++ ++session.gc_probability = 1 ++session.gc_divisor = 100 ++ ++; After this number of seconds, stored data will be seen as 'garbage' and ++; cleaned up by the garbage collection process. ++session.gc_maxlifetime = 1440 ++ ++; NOTE: If you are using the subdirectory option for storing session files ++; (see session.save_path above), then garbage collection does *not* ++; happen automatically. You will need to do your own garbage ++; collection through a shell script, cron entry, or some other method. ++; For example, the following script would is the equivalent of ++; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): ++; cd /path/to/sessions; find -cmin +24 | xargs rm ++ ++; PHP 4.2 and less have an undocumented feature/bug that allows you to ++; to initialize a session variable in the global scope, albeit register_globals ++; is disabled. PHP 4.3 and later will warn you, if this feature is used. ++; You can disable the feature and the warning separately. At this time, ++; the warning is only displayed, if bug_compat_42 is enabled. ++ ++session.bug_compat_42 = 1 ++session.bug_compat_warn = 1 ++ ++; Check HTTP Referer to invalidate externally stored URLs containing ids. ++; HTTP_REFERER has to contain this substring for the session to be ++; considered as valid. ++session.referer_check = ++ ++; How many bytes to read from the file. ++session.entropy_length = 0 ++ ++; Specified here to create the session id. ++session.entropy_file = ++ ++;session.entropy_length = 16 ++ ++;session.entropy_file = /dev/urandom ++ ++; Set to {nocache,private,public,} to determine HTTP caching aspects ++; or leave this empty to avoid sending anti-caching headers. ++session.cache_limiter = nocache ++ ++; Document expires after n minutes. ++session.cache_expire = 180 ++ ++; trans sid support is disabled by default. ++; Use of trans sid may risk your users security. ++; Use this option with caution. ++; - User may send URL contains active session ID ++; to other person via. email/irc/etc. ++; - URL that contains active session ID may be stored ++; in publically accessible computer. ++; - User may access your site with the same session ID ++; always using URL stored in browser's history or bookmarks. ++session.use_trans_sid = 0 ++ ++; Select a hash function ++; 0: MD5 (128 bits) ++; 1: SHA-1 (160 bits) ++session.hash_function = 0 ++ ++; Define how many bits are stored in each character when converting ++; the binary hash data to something readable. ++; ++; 4 bits: 0-9, a-f ++; 5 bits: 0-9, a-v ++; 6 bits: 0-9, a-z, A-Z, "-", "," ++session.hash_bits_per_character = 4 ++ ++; The URL rewriter will look for URLs in a defined set of HTML tags. ++; form/fieldset are special; if you include them here, the rewriter will ++; add a hidden field with the info which is otherwise appended ++; to URLs. If you want XHTML conformity, remove the form entry. ++; Note that all valid entries require a "=", even if no value follows. ++url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset=" ++ ++ ++[Assertion] ++; Assert(expr); active by default. ++;assert.active = On ++ ++; Issue a PHP warning for each failed assertion. ++;assert.warning = On ++ ++; Don't bail out by default. ++;assert.bail = Off ++ ++; User-function to be called if an assertion fails. ++;assert.callback = 0 ++ ++; Eval the expression with current error_reporting(). Set to true if you want ++; error_reporting(0) around the eval(). ++;assert.quiet_eval = 0 ++ ++ ++ ++ ++ ++[exif] ++; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. ++; With mbstring support this will automatically be converted into the encoding ++; given by corresponding encode setting. When empty mbstring.internal_encoding ++; is used. For the decode settings you can distinguish between motorola and ++; intel byte order. A decode setting cannot be empty. ++;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 ++ +diff --git a/feeds/packages/lang/php4/files/php.init b/feeds/packages/lang/php4/files/php.init +new file mode 100644 +index 0000000..373f396 +--- /dev/null ++++ b/feeds/packages/lang/php4/files/php.init +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++start() { ++ $BIN -b $PORT & ++} ++ ++stop() { ++ killall php ++} ++ +diff --git a/feeds/packages/lang/php4/patches/.svn/entries b/feeds/packages/lang/php4/patches/.svn/entries +new file mode 100644 +index 0000000..eca2b0b +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php4/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-11T14:16:51.752249Z ++35955 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++004-uts_domainname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++2ab5746691c94bc13c493276e48be49c ++2010-12-22T01:50:46.003552Z ++24773 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++390 ++ ++120-gmp-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++a60a8e0b2ede9afe55b8fad183766a7f ++2013-03-11T14:16:51.752249Z ++35955 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++372 ++ ++003-dns_skipname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++b3a35e38a0f9eecc2b94141522227184 ++2010-12-22T01:50:46.003552Z ++24773 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++968 ++ ++100-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++f3c1faa6d66c2ca54ff3d39f9d768dc6 ++2010-12-22T01:50:46.003552Z ++24773 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++491 ++ ++110-openssl-1.0.0-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++367864f33953a8e2c9bdf7e05394f326 ++2011-02-21T19:44:17.531985Z ++25651 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2434 ++ ++002-configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++30602aadc5c7dda3b980f4b0eef2a713 ++2010-12-22T01:50:46.003552Z ++24773 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3339 ++ +diff --git a/feeds/packages/lang/php4/patches/.svn/prop-base/002-configure.patch.svn-base b/feeds/packages/lang/php4/patches/.svn/prop-base/002-configure.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/.svn/prop-base/002-configure.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php4/patches/.svn/prop-base/003-dns_skipname.patch.svn-base b/feeds/packages/lang/php4/patches/.svn/prop-base/003-dns_skipname.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/.svn/prop-base/003-dns_skipname.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php4/patches/.svn/prop-base/004-uts_domainname.patch.svn-base b/feeds/packages/lang/php4/patches/.svn/prop-base/004-uts_domainname.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/.svn/prop-base/004-uts_domainname.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php4/patches/.svn/text-base/002-configure.patch.svn-base b/feeds/packages/lang/php4/patches/.svn/text-base/002-configure.patch.svn-base +new file mode 100644 +index 0000000..af47d5b +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/.svn/text-base/002-configure.patch.svn-base +@@ -0,0 +1,83 @@ ++--- a/configure +++++ b/configure ++@@ -12503,7 +12503,7 @@ fi ++ ac_libs=$LIBS ++ LIBS="$LIBS -ldl" ++ if test "$cross_compiling" = yes; then ++- found=no +++ found=yes ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ if test "$cross_compiling" = yes; then ++- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&6 ++ echo "configure:43893: checking if iconv supports errno" >&5 ++ if test "$cross_compiling" = yes; then ++- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <= 0x10000000L +++#define OPENSSL_D2I_X509_CAST d2i_of_void * +++#else +++#define OPENSSL_D2I_X509_CAST char *(*)() +++#define LHASH_OF(x) LHASH +++#endif +++ ++ static unsigned char arg2_force_ref[] = ++ { 2, BYREF_NONE, BYREF_FORCE }; ++ static unsigned char arg2and3_force_ref[] = ++@@ -179,8 +186,8 @@ inline static int php_openssl_safe_mode_ ++ static char default_ssl_conf_filename[MAXPATHLEN]; ++ ++ struct php_x509_request { ++- LHASH * global_config; /* Global SSL config */ ++- LHASH * req_config; /* SSL config for this request */ +++ LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */ +++ LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this request */ ++ const EVP_MD * md_alg; ++ const EVP_MD * digest; ++ char * section_name, ++@@ -340,7 +347,7 @@ static inline int php_openssl_config_che ++ const char * section_label, ++ const char * config_filename, ++ const char * section, ++- LHASH * config TSRMLS_DC) +++ LHASH_OF(CONF_VALUE) * config TSRMLS_DC) ++ { ++ X509V3_CTX ctx; ++ ++@@ -720,7 +727,7 @@ static X509 * php_openssl_x509_from_zval ++ if (in == NULL) ++ return NULL; ++ ++- cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, +++ cert = (X509 *) PEM_ASN1_read_bio((OPENSSL_D2I_X509_CAST)d2i_X509, ++ PEM_STRING_X509, in, ++ NULL, NULL, NULL); ++ BIO_free(in); ++@@ -1859,7 +1866,7 @@ static int php_openssl_is_private_key(EV ++ case EVP_PKEY_RSA2: ++ assert(pkey->pkey.rsa != NULL); ++ ++- if (NULL == pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q) +++ if (NULL == pkey->pkey.rsa || NULL == pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q) ++ return 0; ++ break; ++ #endif ++@@ -1871,7 +1878,7 @@ static int php_openssl_is_private_key(EV ++ case EVP_PKEY_DSA4: ++ assert(pkey->pkey.dsa != NULL); ++ ++- if (NULL == pkey->pkey.dsa->p || NULL == pkey->pkey.dsa->q || NULL == pkey->pkey.dsa->priv_key) +++ if (NULL == pkey->pkey.dsa || NULL == pkey->pkey.dsa->p || NULL == pkey->pkey.dsa->q || NULL == pkey->pkey.dsa->priv_key) ++ return 0; ++ break; ++ #endif ++@@ -1879,7 +1886,7 @@ static int php_openssl_is_private_key(EV ++ case EVP_PKEY_DH: ++ assert(pkey->pkey.dh != NULL); ++ ++- if (NULL == pkey->pkey.dh->p || NULL == pkey->pkey.dh->priv_key) +++ if (NULL == pkey->pkey.dh || NULL == pkey->pkey.dh->p || NULL == pkey->pkey.dh->priv_key) ++ return 0; ++ break; ++ #endif +diff --git a/feeds/packages/lang/php4/patches/.svn/text-base/120-gmp-compat.patch.svn-base b/feeds/packages/lang/php4/patches/.svn/text-base/120-gmp-compat.patch.svn-base +new file mode 100644 +index 0000000..76672c3 +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/.svn/text-base/120-gmp-compat.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/ext/gmp/gmp.c +++++ b/ext/gmp/gmp.c ++@@ -1159,7 +1159,7 @@ ZEND_FUNCTION(gmp_random) ++ ++ GMPG(rand_initialized) = 1; ++ } ++- mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); +++ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); ++ ++ ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); ++ } +diff --git a/feeds/packages/lang/php4/patches/002-configure.patch b/feeds/packages/lang/php4/patches/002-configure.patch +new file mode 100644 +index 0000000..af47d5b +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/002-configure.patch +@@ -0,0 +1,83 @@ ++--- a/configure +++++ b/configure ++@@ -12503,7 +12503,7 @@ fi ++ ac_libs=$LIBS ++ LIBS="$LIBS -ldl" ++ if test "$cross_compiling" = yes; then ++- found=no +++ found=yes ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ if test "$cross_compiling" = yes; then ++- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&6 ++ echo "configure:43893: checking if iconv supports errno" >&5 ++ if test "$cross_compiling" = yes; then ++- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <&2; exit 1; } +++ { echo "configure: error: can not run test program while cross compiling" 1>&2; } ++ else ++ cat > conftest.$ac_ext <= 0x10000000L +++#define OPENSSL_D2I_X509_CAST d2i_of_void * +++#else +++#define OPENSSL_D2I_X509_CAST char *(*)() +++#define LHASH_OF(x) LHASH +++#endif +++ ++ static unsigned char arg2_force_ref[] = ++ { 2, BYREF_NONE, BYREF_FORCE }; ++ static unsigned char arg2and3_force_ref[] = ++@@ -179,8 +186,8 @@ inline static int php_openssl_safe_mode_ ++ static char default_ssl_conf_filename[MAXPATHLEN]; ++ ++ struct php_x509_request { ++- LHASH * global_config; /* Global SSL config */ ++- LHASH * req_config; /* SSL config for this request */ +++ LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */ +++ LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this request */ ++ const EVP_MD * md_alg; ++ const EVP_MD * digest; ++ char * section_name, ++@@ -340,7 +347,7 @@ static inline int php_openssl_config_che ++ const char * section_label, ++ const char * config_filename, ++ const char * section, ++- LHASH * config TSRMLS_DC) +++ LHASH_OF(CONF_VALUE) * config TSRMLS_DC) ++ { ++ X509V3_CTX ctx; ++ ++@@ -720,7 +727,7 @@ static X509 * php_openssl_x509_from_zval ++ if (in == NULL) ++ return NULL; ++ ++- cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, +++ cert = (X509 *) PEM_ASN1_read_bio((OPENSSL_D2I_X509_CAST)d2i_X509, ++ PEM_STRING_X509, in, ++ NULL, NULL, NULL); ++ BIO_free(in); ++@@ -1859,7 +1866,7 @@ static int php_openssl_is_private_key(EV ++ case EVP_PKEY_RSA2: ++ assert(pkey->pkey.rsa != NULL); ++ ++- if (NULL == pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q) +++ if (NULL == pkey->pkey.rsa || NULL == pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q) ++ return 0; ++ break; ++ #endif ++@@ -1871,7 +1878,7 @@ static int php_openssl_is_private_key(EV ++ case EVP_PKEY_DSA4: ++ assert(pkey->pkey.dsa != NULL); ++ ++- if (NULL == pkey->pkey.dsa->p || NULL == pkey->pkey.dsa->q || NULL == pkey->pkey.dsa->priv_key) +++ if (NULL == pkey->pkey.dsa || NULL == pkey->pkey.dsa->p || NULL == pkey->pkey.dsa->q || NULL == pkey->pkey.dsa->priv_key) ++ return 0; ++ break; ++ #endif ++@@ -1879,7 +1886,7 @@ static int php_openssl_is_private_key(EV ++ case EVP_PKEY_DH: ++ assert(pkey->pkey.dh != NULL); ++ ++- if (NULL == pkey->pkey.dh->p || NULL == pkey->pkey.dh->priv_key) +++ if (NULL == pkey->pkey.dh || NULL == pkey->pkey.dh->p || NULL == pkey->pkey.dh->priv_key) ++ return 0; ++ break; ++ #endif +diff --git a/feeds/packages/lang/php4/patches/120-gmp-compat.patch b/feeds/packages/lang/php4/patches/120-gmp-compat.patch +new file mode 100644 +index 0000000..76672c3 +--- /dev/null ++++ b/feeds/packages/lang/php4/patches/120-gmp-compat.patch +@@ -0,0 +1,11 @@ ++--- a/ext/gmp/gmp.c +++++ b/ext/gmp/gmp.c ++@@ -1159,7 +1159,7 @@ ZEND_FUNCTION(gmp_random) ++ ++ GMPG(rand_initialized) = 1; ++ } ++- mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); +++ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); ++ ++ ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); ++ } +diff --git a/feeds/packages/lang/php5-pecl-apc/.svn/entries b/feeds/packages/lang/php5-pecl-apc/.svn/entries +new file mode 100644 +index 0000000..bf4e6d1 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-apc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-apc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:51.112098Z ++35280 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++0c28f0c91c02f7e93ebd002854784ca6 ++2013-01-21T15:27:51.112098Z ++35280 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++754 ++ +diff --git a/feeds/packages/lang/php5-pecl-apc/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php5-pecl-apc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..22b9fa4 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-apc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,33 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=APC ++PECL_LONGNAME:=Alternative PHP Cache ++ ++PKG_VERSION:=3.1.13 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=c9e47002e3a67ebde3a6f81437c7b6e0 ++ ++PKG_NAME:=php5-pecl-apc ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++CONFIGURE_ARGS+= \ ++ --enable-apc=shared \ ++ --disable-apc-mmap \ ++ ++$(eval $(call PECLPackage,apc,$(PECL_LONGNAME),+librt)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-apc/Makefile b/feeds/packages/lang/php5-pecl-apc/Makefile +new file mode 100644 +index 0000000..22b9fa4 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-apc/Makefile +@@ -0,0 +1,33 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=APC ++PECL_LONGNAME:=Alternative PHP Cache ++ ++PKG_VERSION:=3.1.13 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=c9e47002e3a67ebde3a6f81437c7b6e0 ++ ++PKG_NAME:=php5-pecl-apc ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++CONFIGURE_ARGS+= \ ++ --enable-apc=shared \ ++ --disable-apc-mmap \ ++ ++$(eval $(call PECLPackage,apc,$(PECL_LONGNAME),+librt)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-bcompiler/.svn/entries b/feeds/packages/lang/php5-pecl-bcompiler/.svn/entries +new file mode 100644 +index 0000000..a052706 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-bcompiler/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-bcompiler ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:53.339996Z ++35282 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++bd9ee2a286c8f5338a51473c20135365 ++2013-01-21T15:27:53.339996Z ++35282 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++713 ++ +diff --git a/feeds/packages/lang/php5-pecl-bcompiler/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php5-pecl-bcompiler/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6bab984 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-bcompiler/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,29 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=bcompiler ++PECL_LONGNAME:=PHP bytecode Compiler ++ ++PKG_VERSION:=1.0.2 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=99f76a5ef536d43180b41036a6a13e43 ++ ++PKG_NAME:=php5-pecl-$(PECL_NAME) ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),@BROKEN)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-bcompiler/Makefile b/feeds/packages/lang/php5-pecl-bcompiler/Makefile +new file mode 100644 +index 0000000..6bab984 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-bcompiler/Makefile +@@ -0,0 +1,29 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=bcompiler ++PECL_LONGNAME:=PHP bytecode Compiler ++ ++PKG_VERSION:=1.0.2 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=99f76a5ef536d43180b41036a6a13e43 ++ ++PKG_NAME:=php5-pecl-$(PECL_NAME) ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),@BROKEN)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-dio/.svn/entries b/feeds/packages/lang/php5-pecl-dio/.svn/entries +new file mode 100644 +index 0000000..1809421 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-dio/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-dio ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:46.155656Z ++35275 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++48435a60ad5a6bfd206345e8999cb4c4 ++2013-01-21T15:27:46.155656Z ++35275 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++698 ++ +diff --git a/feeds/packages/lang/php5-pecl-dio/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php5-pecl-dio/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f9c5f50 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-dio/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,29 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=dio ++PECL_LONGNAME:=Direct I/O functions ++ ++PKG_VERSION:=0.0.6 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=95bde93a41def9c2d97532eeb0c83bd3 ++ ++PKG_NAME:=php5-pecl-$(PECL_NAME) ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-dio/Makefile b/feeds/packages/lang/php5-pecl-dio/Makefile +new file mode 100644 +index 0000000..f9c5f50 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-dio/Makefile +@@ -0,0 +1,29 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=dio ++PECL_LONGNAME:=Direct I/O functions ++ ++PKG_VERSION:=0.0.6 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=95bde93a41def9c2d97532eeb0c83bd3 ++ ++PKG_NAME:=php5-pecl-$(PECL_NAME) ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-dio/patches/.svn/entries b/feeds/packages/lang/php5-pecl-dio/patches/.svn/entries +new file mode 100644 +index 0000000..bf29ed0 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-dio/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-dio/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:46.155656Z ++35275 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-additional-baudrates.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++0235d18c8a2e643e3986edd3c25cf4b6 ++2013-01-21T15:27:46.155656Z ++35275 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++461 ++ +diff --git a/feeds/packages/lang/php5-pecl-dio/patches/.svn/text-base/010-additional-baudrates.patch.svn-base b/feeds/packages/lang/php5-pecl-dio/patches/.svn/text-base/010-additional-baudrates.patch.svn-base +new file mode 100644 +index 0000000..5032e6e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-dio/patches/.svn/text-base/010-additional-baudrates.patch.svn-base +@@ -0,0 +1,29 @@ ++--- a/dio.c +++++ b/dio.c ++@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr) ++ ++ /* assign to correct values... */ ++ switch (Baud_Rate) { +++#ifdef B460800 +++ case 460800: +++ BAUD = B460800; +++ break; +++#endif +++#ifdef B230400 +++ case 230400: +++ BAUD = B230400; +++ break; +++#endif +++#ifdef B115200 +++ case 115200: +++ BAUD = B115200; +++ break; +++#endif +++#ifdef B57600 +++ case 57600: +++ BAUD = B57600; +++ break; +++#endif ++ case 38400: ++ BAUD = B38400; ++ break; +diff --git a/feeds/packages/lang/php5-pecl-dio/patches/010-additional-baudrates.patch b/feeds/packages/lang/php5-pecl-dio/patches/010-additional-baudrates.patch +new file mode 100644 +index 0000000..5032e6e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-dio/patches/010-additional-baudrates.patch +@@ -0,0 +1,29 @@ ++--- a/dio.c +++++ b/dio.c ++@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr) ++ ++ /* assign to correct values... */ ++ switch (Baud_Rate) { +++#ifdef B460800 +++ case 460800: +++ BAUD = B460800; +++ break; +++#endif +++#ifdef B230400 +++ case 230400: +++ BAUD = B230400; +++ break; +++#endif +++#ifdef B115200 +++ case 115200: +++ BAUD = B115200; +++ break; +++#endif +++#ifdef B57600 +++ case 57600: +++ BAUD = B57600; +++ break; +++#endif ++ case 38400: ++ BAUD = B38400; ++ break; +diff --git a/feeds/packages/lang/php5-pecl-http/.svn/entries b/feeds/packages/lang/php5-pecl-http/.svn/entries +new file mode 100644 +index 0000000..de4579e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-http/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-http ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:47.247588Z ++35276 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++27b763bc6a3b61a6009255c45d142cd0 ++2013-01-21T15:27:47.247588Z ++35276 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++863 ++ +diff --git a/feeds/packages/lang/php5-pecl-http/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php5-pecl-http/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..05dbd10 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-http/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,34 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=pecl_http ++PECL_LONGNAME:=Extended HTTP Support ++ ++PKG_VERSION:=1.7.4 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=288bae57b89d8de4bdd7d7dc5954cf8c ++ ++PKG_NAME:=php5-pecl-http ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++CONFIGURE_ARGS+= \ ++ --enable-http=shared \ ++ --without-http-shared-deps \ ++ --with-http-curl-requests="$(STAGING_DIR)/usr" \ ++ ++$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+libcurl +librt +php5-mod-iconv +php5-mod-session)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-http/Makefile b/feeds/packages/lang/php5-pecl-http/Makefile +new file mode 100644 +index 0000000..05dbd10 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-http/Makefile +@@ -0,0 +1,34 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=pecl_http ++PECL_LONGNAME:=Extended HTTP Support ++ ++PKG_VERSION:=1.7.4 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=288bae57b89d8de4bdd7d7dc5954cf8c ++ ++PKG_NAME:=php5-pecl-http ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++CONFIGURE_ARGS+= \ ++ --enable-http=shared \ ++ --without-http-shared-deps \ ++ --with-http-curl-requests="$(STAGING_DIR)/usr" \ ++ ++$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+libcurl +librt +php5-mod-iconv +php5-mod-session)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-libevent/.svn/entries b/feeds/packages/lang/php5-pecl-libevent/.svn/entries +new file mode 100644 +index 0000000..99b967b +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-libevent ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:50.253202Z ++35279 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++527948dd2623adc9e69ef84800e19277 ++2013-01-21T15:27:48.193302Z ++35277 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++784 ++ +diff --git a/feeds/packages/lang/php5-pecl-libevent/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php5-pecl-libevent/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3358c9e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,31 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=libevent ++PECL_LONGNAME:=Libevent - event notification ++ ++PKG_VERSION:=0.0.5 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=5539f4e1f44879d5a9afae7d75a96112 ++ ++PKG_NAME:=php5-pecl-$(PECL_NAME) ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" ++ ++$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-libevent/Makefile b/feeds/packages/lang/php5-pecl-libevent/Makefile +new file mode 100644 +index 0000000..3358c9e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/Makefile +@@ -0,0 +1,31 @@ ++# ++# Copyright (C) 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PECL_NAME:=libevent ++PECL_LONGNAME:=Libevent - event notification ++ ++PKG_VERSION:=0.0.5 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=5539f4e1f44879d5a9afae7d75a96112 ++ ++PKG_NAME:=php5-pecl-$(PECL_NAME) ++PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://pecl.php.net/get/ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++include ../php5/pecl.mk ++ ++CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" ++ ++$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent)) ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/lang/php5-pecl-libevent/patches/.svn/entries b/feeds/packages/lang/php5-pecl-libevent/patches/.svn/entries +new file mode 100644 +index 0000000..3626374 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5-pecl-libevent/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:50.253202Z ++35279 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-openwrt-libevent-include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++0cf5409407c673b1b8ca00c191686f82 ++2013-01-21T15:27:50.253202Z ++35279 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++596 ++ ++101-openwrt-libevent-libdir.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++2f9785e57771a2493c8372c85d1a53e1 ++2013-01-21T15:27:50.253202Z ++35279 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ +diff --git a/feeds/packages/lang/php5-pecl-libevent/patches/.svn/text-base/100-openwrt-libevent-include.patch.svn-base b/feeds/packages/lang/php5-pecl-libevent/patches/.svn/text-base/100-openwrt-libevent-include.patch.svn-base +new file mode 100644 +index 0000000..aef038e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/patches/.svn/text-base/100-openwrt-libevent-include.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/config.m4 +++++ b/config.m4 ++@@ -5,7 +5,7 @@ PHP_ARG_WITH(libevent, for libevent supp ++ ++ if test "$PHP_LIBEVENT" != "no"; then ++ SEARCH_PATH="/usr /usr/local" ++- SEARCH_FOR="/include/event.h" +++ SEARCH_FOR="/include/libevent/event.h" ++ ++ if test "$PHP_LIBEVENT" = "yes"; then ++ AC_MSG_CHECKING([for libevent headers in default path]) ++@@ -28,7 +28,7 @@ if test "$PHP_LIBEVENT" != "no"; then ++ AC_MSG_ERROR([Cannot find libevent headers]) ++ fi ++ ++- PHP_ADD_INCLUDE($LIBEVENT_DIR/include) +++ PHP_ADD_INCLUDE($LIBEVENT_DIR/include/libevent) ++ ++ LIBNAME=event ++ LIBSYMBOL=event_base_new +diff --git a/feeds/packages/lang/php5-pecl-libevent/patches/.svn/text-base/101-openwrt-libevent-libdir.patch.svn-base b/feeds/packages/lang/php5-pecl-libevent/patches/.svn/text-base/101-openwrt-libevent-libdir.patch.svn-base +new file mode 100644 +index 0000000..e6c2835 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/patches/.svn/text-base/101-openwrt-libevent-libdir.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/config.m4 +++++ b/config.m4 ++@@ -33,9 +33,7 @@ if test "$PHP_LIBEVENT" != "no"; then ++ LIBNAME=event ++ LIBSYMBOL=event_base_new ++ ++- if test "x$PHP_LIBDIR" = "x"; then ++- PHP_LIBDIR=lib ++- fi +++ PHP_LIBDIR=lib/libevent ++ ++ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, ++ [ +diff --git a/feeds/packages/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch b/feeds/packages/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch +new file mode 100644 +index 0000000..aef038e +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch +@@ -0,0 +1,20 @@ ++--- a/config.m4 +++++ b/config.m4 ++@@ -5,7 +5,7 @@ PHP_ARG_WITH(libevent, for libevent supp ++ ++ if test "$PHP_LIBEVENT" != "no"; then ++ SEARCH_PATH="/usr /usr/local" ++- SEARCH_FOR="/include/event.h" +++ SEARCH_FOR="/include/libevent/event.h" ++ ++ if test "$PHP_LIBEVENT" = "yes"; then ++ AC_MSG_CHECKING([for libevent headers in default path]) ++@@ -28,7 +28,7 @@ if test "$PHP_LIBEVENT" != "no"; then ++ AC_MSG_ERROR([Cannot find libevent headers]) ++ fi ++ ++- PHP_ADD_INCLUDE($LIBEVENT_DIR/include) +++ PHP_ADD_INCLUDE($LIBEVENT_DIR/include/libevent) ++ ++ LIBNAME=event ++ LIBSYMBOL=event_base_new +diff --git a/feeds/packages/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch b/feeds/packages/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch +new file mode 100644 +index 0000000..e6c2835 +--- /dev/null ++++ b/feeds/packages/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch +@@ -0,0 +1,13 @@ ++--- a/config.m4 +++++ b/config.m4 ++@@ -33,9 +33,7 @@ if test "$PHP_LIBEVENT" != "no"; then ++ LIBNAME=event ++ LIBSYMBOL=event_base_new ++ ++- if test "x$PHP_LIBDIR" = "x"; then ++- PHP_LIBDIR=lib ++- fi +++ PHP_LIBDIR=lib/libevent ++ ++ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, ++ [ +diff --git a/feeds/packages/lang/php5/.svn/entries b/feeds/packages/lang/php5/.svn/entries +new file mode 100644 +index 0000000..beca55f +--- /dev/null ++++ b/feeds/packages/lang/php5/.svn/entries +@@ -0,0 +1,102 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:55.193058Z ++35284 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++pecl.mk ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++97b60e4963a546118d1d3e682780da5c ++2013-01-21T15:27:49.046087Z ++35278 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++979 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++d04940bbc875259a67e05ff154725841 ++2013-01-21T15:27:55.193058Z ++35284 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++16045 ++ +diff --git a/feeds/packages/lang/php5/.svn/prop-base/Makefile.svn-base b/feeds/packages/lang/php5/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/lang/php5/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php5/.svn/text-base/Makefile.svn-base b/feeds/packages/lang/php5/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a08032f +--- /dev/null ++++ b/feeds/packages/lang/php5/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,545 @@ ++# ++# 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:=php ++PKG_VERSION:=5.4.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.php.net/distributions/ ++PKG_MD5SUM:=9975e68c22b86b013b934743ad2d2276 ++ ++PKG_FIXUP:=libtool no-autoreconf ++PKG_BUILD_PARALLEL:=1 ++ ++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 sqlite sqlite3 sysvmsg sysvsem sysvshm \ ++ tokenizer \ ++ xml xmlreader xmlwriter zip \ ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_PACKAGE_php5-cgi CONFIG_PACKAGE_php5-cli \ ++ $(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 ++ 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 ++ ++CONFIGURE_ARGS+= \ ++ --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-cli),) ++ CONFIGURE_ARGS+= --enable-cli ++else ++ CONFIGURE_ARGS+= --disable-cli ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cgi),) ++ CONFIGURE_ARGS+= --enable-cgi ++else ++ CONFIGURE_ARGS+= --disable-cgi ++endif ++ ++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 ($(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-sqlite),) ++ CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= --without-sqlite ++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 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-cli)) ++$(eval $(call BuildPackage,php5-cgi)) ++$(eval $(call BuildPackage,php5-fastcgi)) ++ ++#$(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,fileinfo,Fileinfo,+PACKAGE_php5-mod-fileinfo:libmagic)) ++$(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2)) ++$(eval $(call BuildModule,exif,EXIF)) ++$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php5-mod-ftp:libopenssl)) ++$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full)) ++$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libjpeg +PACKAGE_php5-mod-gd:libpng)) ++$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) ++$(eval $(call BuildModule,hash,Hash)) ++$(eval $(call BuildModule,iconv,iConv,+PACKAGE_php5-mod-iconv:libiconv)) ++$(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:libpthread +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,sqlite,SQLite 2.x,+PACKAGE_php5-mod-sqlite:libsqlite2)) ++$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php5-mod-sqlite3:libsqlite3 +PACKAGE_php5-mod-sqlite3:libpthread)) ++$(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 +PACKAGE_php5-mod-xmlreader:libiconv)) ++$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2 +PACKAGE_php5-mod-xmlwriter:libiconv)) ++$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php5-mod-zip:zlib)) +diff --git a/feeds/packages/lang/php5/.svn/text-base/pecl.mk.svn-base b/feeds/packages/lang/php5/.svn/text-base/pecl.mk.svn-base +new file mode 100644 +index 0000000..6bf1928 +--- /dev/null ++++ b/feeds/packages/lang/php5/.svn/text-base/pecl.mk.svn-base +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2011 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 ++ 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 ++ echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini ++ endef ++ ++endef +diff --git a/feeds/packages/lang/php5/Makefile b/feeds/packages/lang/php5/Makefile +new file mode 100644 +index 0000000..a08032f +--- /dev/null ++++ b/feeds/packages/lang/php5/Makefile +@@ -0,0 +1,545 @@ ++# ++# 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:=php ++PKG_VERSION:=5.4.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.php.net/distributions/ ++PKG_MD5SUM:=9975e68c22b86b013b934743ad2d2276 ++ ++PKG_FIXUP:=libtool no-autoreconf ++PKG_BUILD_PARALLEL:=1 ++ ++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 sqlite sqlite3 sysvmsg sysvsem sysvshm \ ++ tokenizer \ ++ xml xmlreader xmlwriter zip \ ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_PACKAGE_php5-cgi CONFIG_PACKAGE_php5-cli \ ++ $(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 ++ 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 ++ ++CONFIGURE_ARGS+= \ ++ --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-cli),) ++ CONFIGURE_ARGS+= --enable-cli ++else ++ CONFIGURE_ARGS+= --disable-cli ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cgi),) ++ CONFIGURE_ARGS+= --enable-cgi ++else ++ CONFIGURE_ARGS+= --disable-cgi ++endif ++ ++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 ($(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-sqlite),) ++ CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= --without-sqlite ++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 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-cli)) ++$(eval $(call BuildPackage,php5-cgi)) ++$(eval $(call BuildPackage,php5-fastcgi)) ++ ++#$(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,fileinfo,Fileinfo,+PACKAGE_php5-mod-fileinfo:libmagic)) ++$(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2)) ++$(eval $(call BuildModule,exif,EXIF)) ++$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php5-mod-ftp:libopenssl)) ++$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full)) ++$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libjpeg +PACKAGE_php5-mod-gd:libpng)) ++$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) ++$(eval $(call BuildModule,hash,Hash)) ++$(eval $(call BuildModule,iconv,iConv,+PACKAGE_php5-mod-iconv:libiconv)) ++$(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:libpthread +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,sqlite,SQLite 2.x,+PACKAGE_php5-mod-sqlite:libsqlite2)) ++$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php5-mod-sqlite3:libsqlite3 +PACKAGE_php5-mod-sqlite3:libpthread)) ++$(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 +PACKAGE_php5-mod-xmlreader:libiconv)) ++$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2 +PACKAGE_php5-mod-xmlwriter:libiconv)) ++$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php5-mod-zip:zlib)) +diff --git a/feeds/packages/lang/php5/files/.svn/entries b/feeds/packages/lang/php5/files/.svn/entries +new file mode 100644 +index 0000000..c6ccaaa +--- /dev/null ++++ b/feeds/packages/lang/php5/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-25T20:36:22.131040Z ++32872 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++php.ini ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++3199cb05e6ee746274731c04a78df191 ++2012-07-25T20:36:22.131040Z ++32872 ++mhei ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7996 ++ ++php5-fastcgi.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++10c74c6a8b2d542bc95d4cf73cc160cf ++2011-11-19T21:08:18.552487Z ++29265 ++mhei ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++503 ++ ++php5-fastcgi.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:32.000000Z ++9014f54e70e554cf1735bc27aa9cac12 ++2011-11-19T21:08:18.552487Z ++29265 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++58 ++ +diff --git a/feeds/packages/lang/php5/files/.svn/prop-base/php.ini.svn-base b/feeds/packages/lang/php5/files/.svn/prop-base/php.ini.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php5/files/.svn/prop-base/php.ini.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php5/files/.svn/prop-base/php5-fastcgi.init.svn-base b/feeds/packages/lang/php5/files/.svn/prop-base/php5-fastcgi.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/lang/php5/files/.svn/prop-base/php5-fastcgi.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/lang/php5/files/.svn/text-base/php.ini.svn-base b/feeds/packages/lang/php5/files/.svn/text-base/php.ini.svn-base +new file mode 100644 +index 0000000..6fe2a31 +--- /dev/null ++++ b/feeds/packages/lang/php5/files/.svn/text-base/php.ini.svn-base +@@ -0,0 +1,311 @@ ++[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 ++; 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 = "" ++;error_append_string = "" ++; Log errors to specified file. ++;error_log = /var/log/php_errors.log ++; Log errors to syslog. ++;error_log = syslog ++ ++; Data Handling ++ ++;arg_separator.output = "&" ++;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/feeds/packages/lang/php5/files/.svn/text-base/php5-fastcgi.config.svn-base b/feeds/packages/lang/php5/files/.svn/text-base/php5-fastcgi.config.svn-base +new file mode 100644 +index 0000000..039d3bb +--- /dev/null ++++ b/feeds/packages/lang/php5/files/.svn/text-base/php5-fastcgi.config.svn-base +@@ -0,0 +1,3 @@ ++config php5-fastcgi ++ option enabled 1 ++ option port '1026' +diff --git a/feeds/packages/lang/php5/files/.svn/text-base/php5-fastcgi.init.svn-base b/feeds/packages/lang/php5/files/.svn/text-base/php5-fastcgi.init.svn-base +new file mode 100644 +index 0000000..0c452ad +--- /dev/null ++++ b/feeds/packages/lang/php5/files/.svn/text-base/php5-fastcgi.init.svn-base +@@ -0,0 +1,30 @@ ++#!/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/feeds/packages/lang/php5/files/php.ini b/feeds/packages/lang/php5/files/php.ini +new file mode 100644 +index 0000000..6fe2a31 +--- /dev/null ++++ b/feeds/packages/lang/php5/files/php.ini +@@ -0,0 +1,311 @@ ++[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 ++; 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 = "" ++;error_append_string = "" ++; Log errors to specified file. ++;error_log = /var/log/php_errors.log ++; Log errors to syslog. ++;error_log = syslog ++ ++; Data Handling ++ ++;arg_separator.output = "&" ++;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/feeds/packages/lang/php5/files/php5-fastcgi.config b/feeds/packages/lang/php5/files/php5-fastcgi.config +new file mode 100644 +index 0000000..039d3bb +--- /dev/null ++++ b/feeds/packages/lang/php5/files/php5-fastcgi.config +@@ -0,0 +1,3 @@ ++config php5-fastcgi ++ option enabled 1 ++ option port '1026' +diff --git a/feeds/packages/lang/php5/files/php5-fastcgi.init b/feeds/packages/lang/php5/files/php5-fastcgi.init +new file mode 100644 +index 0000000..0c452ad +--- /dev/null ++++ b/feeds/packages/lang/php5/files/php5-fastcgi.init +@@ -0,0 +1,30 @@ ++#!/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/feeds/packages/lang/php5/patches/.svn/entries b/feeds/packages/lang/php5/patches/.svn/entries +new file mode 100644 +index 0000000..34cdae8 +--- /dev/null ++++ b/feeds/packages/lang/php5/patches/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/lang/php5/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:52.012116Z ++35281 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++101-fix_membar_producer_link_error_gcc3x.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++31195fe476dc544fce8330b9ca466fc4 ++2012-01-14T23:00:00.342904Z ++29752 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++436 ++ ++090-restore-sqlite2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++fe9198900d0a7cc4331f3414ef1603d2 ++2012-07-25T20:51:49.047780Z ++32877 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1652935 ++ ++950-Fix-dl-cross-compiling-issue.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++bd1fad96fc84aa96016f411efd3448e9 ++2012-07-25T20:36:22.131040Z ++32872 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++370 ++ ++091-fix-sqlite2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++0391f4908733cbc4597b500a6f6e63f8 ++2012-07-25T20:51:49.047780Z ++32877 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3736 ++ ++102-debian_patches_use_embedded_timezonedb.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++7deb370da15a4313ca64295ba978c37b ++2013-01-21T15:27:52.012116Z ++35281 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++16506 ++ ++103-debian_patches_use_embedded_timezonedb.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++32619c4f1f6cfd1ce769b43cde5ec0d6 ++2012-07-25T20:36:22.131040Z ++32872 ++mhei ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1624 ++ +diff --git a/feeds/packages/lang/php5/patches/.svn/text-base/090-restore-sqlite2.patch.svn-base b/feeds/packages/lang/php5/patches/.svn/text-base/090-restore-sqlite2.patch.svn-base +new file mode 100644 +index 0000000..27bcec5 +--- /dev/null ++++ b/feeds/packages/lang/php5/patches/.svn/text-base/090-restore-sqlite2.patch.svn-base +@@ -0,0 +1,50845 @@ ++--- /dev/null +++++ b/ext/sqlite/config.m4 ++@@ -0,0 +1,157 @@ +++dnl $Id$ +++dnl config.m4 for extension sqlite +++dnl vim:et:ts=2:sw=2 +++ +++PHP_ARG_WITH(sqlite, for sqlite support, +++[ --without-sqlite=DIR Do not include sqlite support. DIR is the sqlite base +++ install directory [BUNDLED]], yes) +++ +++PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: ISO-8859-1), +++[ --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite], no, no) +++ +++ +++ +++dnl +++dnl PHP_PROG_LEMON +++dnl +++dnl Search for lemon binary and check its version +++dnl +++AC_DEFUN([PHP_PROG_LEMON],[ +++ # we only support certain lemon versions +++ lemon_version_list="1.0" +++ +++ AC_CHECK_PROG(LEMON, lemon, lemon) +++ if test "$LEMON"; then +++ AC_CACHE_CHECK([for lemon version], php_cv_lemon_version, [ +++ lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` +++ php_cv_lemon_version=invalid +++ for lemon_check_version in $lemon_version_list; do +++ if test "$lemon_version" = "$lemon_check_version"; then +++ php_cv_lemon_version="$lemon_check_version (ok)" +++ fi +++ done +++ ]) +++ else +++ lemon_version=none +++ fi +++ case $php_cv_lemon_version in +++ ""|invalid[)] +++ lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." +++ AC_MSG_WARN([$lemon_msg]) +++ LEMON="exit 0;" +++ ;; +++ esac +++ PHP_SUBST(LEMON) +++]) +++ +++ +++if test "$PHP_SQLITE" != "no"; then +++ if test "$PHP_PDO" != "no"; then +++ PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) +++ if test -n "$pdo_inc_path"; then +++ AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) +++ pdo_inc_path="-I$pdo_inc_path" +++ fi +++ fi +++ +++ if test "$PHP_SQLITE" != "yes"; then +++ SEARCH_PATH="/usr/local /usr" +++ SEARCH_FOR="/include/sqlite.h" +++ if test -r $PHP_SQLITE/; then # path given as parameter +++ SQLITE_DIR=$PHP_SQLITE +++ else # search default path list +++ AC_MSG_CHECKING([for sqlite files in default path]) +++ for i in $SEARCH_PATH ; do +++ if test -r $i/$SEARCH_FOR; then +++ SQLITE_DIR=$i +++ AC_MSG_RESULT(found in $i) +++ fi +++ done +++ fi +++ +++ if test -z "$SQLITE_DIR"; then +++ AC_MSG_RESULT([not found]) +++ AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org]) +++ fi +++ +++ PHP_CHECK_LIBRARY(sqlite, sqlite_open, [ +++ PHP_ADD_LIBRARY_WITH_PATH(sqlite, $SQLITE_DIR/$PHP_LIBDIR, SQLITE_SHARED_LIBADD) +++ PHP_ADD_INCLUDE($SQLITE_DIR/include) +++ ],[ +++ AC_MSG_ERROR([wrong sqlite lib version or lib not found]) +++ ],[ +++ -L$SQLITE_DIR/$PHP_LIBDIR -lm +++ ]) +++ SQLITE_MODULE_TYPE=external +++ PHP_SQLITE_CFLAGS=$pdo_inc_path +++ sqlite_extra_sources="libsqlite/src/encode.c" +++ else +++ # use bundled library +++ PHP_PROG_LEMON +++ SQLITE_MODULE_TYPE=builtin +++ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" +++ sqlite_extra_sources="libsqlite/src/opcodes.c \ +++ libsqlite/src/parse.c libsqlite/src/encode.c \ +++ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ +++ libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ +++ libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ +++ libsqlite/src/os.c libsqlite/src/pager.c \ +++ libsqlite/src/printf.c libsqlite/src/random.c \ +++ libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ +++ libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ +++ libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ +++ libsqlite/src/vacuum.c libsqlite/src/copy.c \ +++ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ +++ libsqlite/src/where.c libsqlite/src/trigger.c" +++ fi +++ dnl +++ dnl Common for both bundled/external +++ dnl +++ sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" +++ PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS) +++ PHP_ADD_EXTENSION_DEP(sqlite, spl, true) +++ PHP_ADD_EXTENSION_DEP(sqlite, pdo, true) +++ +++ PHP_ADD_MAKEFILE_FRAGMENT +++ PHP_SUBST(SQLITE_SHARED_LIBADD) +++ PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h]) +++ +++ if test "$SQLITE_MODULE_TYPE" = "builtin"; then +++ PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src, 1) +++ AC_CHECK_SIZEOF(char *, 4) +++ AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer]) +++ dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling +++ dnl in funcs.c uses assert(), which is a bit silly and something +++ dnl we want to avoid. This assert() was removed in SQLite 2.8.9. +++ if test "$PHP_SQLITE_UTF8" = "yes"; then +++ SQLITE_ENCODING="UTF8" +++ AC_DEFINE(SQLITE_UTF8, 1, [ ]) +++ else +++ SQLITE_ENCODING="ISO8859" +++ fi +++ PHP_SUBST(SQLITE_ENCODING) +++ +++ SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` +++ PHP_SUBST(SQLITE_VERSION) +++ +++ sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h +++ +++ if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then +++ echo '#include ' > $ext_builddir/libsqlite/src/config.h +++ else +++ echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h +++ fi +++ +++ cat >> $ext_builddir/libsqlite/src/config.h <explain ) return; +++ db = pParse->db; +++ if( db->file_format<4 ){ +++ sqliteErrorMsg(pParse, "cannot attach auxiliary databases to an " +++ "older format master database", 0); +++ pParse->rc = SQLITE_ERROR; +++ return; +++ } +++ if( db->nDb>=MAX_ATTACHED+2 ){ +++ sqliteErrorMsg(pParse, "too many attached databases - max %d", +++ MAX_ATTACHED); +++ pParse->rc = SQLITE_ERROR; +++ return; +++ } +++ +++ zFile = 0; +++ sqliteSetNString(&zFile, pFilename->z, pFilename->n, 0); +++ if( zFile==0 ) return; +++ sqliteDequote(zFile); +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ if( sqliteAuthCheck(pParse, SQLITE_ATTACH, zFile, 0, 0)!=SQLITE_OK ){ +++ sqliteFree(zFile); +++ return; +++ } +++#endif /* SQLITE_OMIT_AUTHORIZATION */ +++ +++ zName = 0; +++ sqliteSetNString(&zName, pDbname->z, pDbname->n, 0); +++ if( zName==0 ) return; +++ sqliteDequote(zName); +++ for(i=0; inDb; i++){ +++ if( db->aDb[i].zName && sqliteStrICmp(db->aDb[i].zName, zName)==0 ){ +++ sqliteErrorMsg(pParse, "database %z is already in use", zName); +++ pParse->rc = SQLITE_ERROR; +++ sqliteFree(zFile); +++ return; +++ } +++ } +++ +++ if( db->aDb==db->aDbStatic ){ +++ aNew = sqliteMalloc( sizeof(db->aDb[0])*3 ); +++ if( aNew==0 ) return; +++ memcpy(aNew, db->aDb, sizeof(db->aDb[0])*2); +++ }else{ +++ aNew = sqliteRealloc(db->aDb, sizeof(db->aDb[0])*(db->nDb+1) ); +++ if( aNew==0 ) return; +++ } +++ db->aDb = aNew; +++ aNew = &db->aDb[db->nDb++]; +++ memset(aNew, 0, sizeof(*aNew)); +++ sqliteHashInit(&aNew->tblHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&aNew->idxHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&aNew->trigHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&aNew->aFKey, SQLITE_HASH_STRING, 1); +++ aNew->zName = zName; +++ rc = sqliteBtreeFactory(db, zFile, 0, MAX_PAGES, &aNew->pBt); +++ if( rc ){ +++ sqliteErrorMsg(pParse, "unable to open database: %s", zFile); +++ } +++#if SQLITE_HAS_CODEC +++ { +++ extern int sqliteCodecAttach(sqlite*, int, void*, int); +++ char *zKey = 0; +++ int nKey; +++ if( pKey && pKey->z && pKey->n ){ +++ sqliteSetNString(&zKey, pKey->z, pKey->n, 0); +++ sqliteDequote(zKey); +++ nKey = strlen(zKey); +++ }else{ +++ zKey = 0; +++ nKey = 0; +++ } +++ sqliteCodecAttach(db, db->nDb-1, zKey, nKey); +++ } +++#endif +++ sqliteFree(zFile); +++ db->flags &= ~SQLITE_Initialized; +++ if( pParse->nErr ) return; +++ if( rc==SQLITE_OK ){ +++ rc = sqliteInit(pParse->db, &pParse->zErrMsg); +++ } +++ if( rc ){ +++ int i = db->nDb - 1; +++ assert( i>=2 ); +++ if( db->aDb[i].pBt ){ +++ sqliteBtreeClose(db->aDb[i].pBt); +++ db->aDb[i].pBt = 0; +++ } +++ sqliteResetInternalSchema(db, 0); +++ pParse->nErr++; +++ pParse->rc = SQLITE_ERROR; +++ } +++} +++ +++/* +++** This routine is called by the parser to process a DETACH statement: +++** +++** DETACH DATABASE dbname +++** +++** The pDbname argument is the name of the database in the DETACH statement. +++*/ +++void sqliteDetach(Parse *pParse, Token *pDbname){ +++ int i; +++ sqlite *db; +++ Vdbe *v; +++ Db *pDb; +++ +++ v = sqliteGetVdbe(pParse); +++ sqliteVdbeAddOp(v, OP_Halt, 0, 0); +++ if( pParse->explain ) return; +++ db = pParse->db; +++ for(i=0; inDb; i++){ +++ pDb = &db->aDb[i]; +++ if( pDb->pBt==0 || pDb->zName==0 ) continue; +++ if( strlen(pDb->zName)!=pDbname->n ) continue; +++ if( sqliteStrNICmp(pDb->zName, pDbname->z, pDbname->n)==0 ) break; +++ } +++ if( i>=db->nDb ){ +++ sqliteErrorMsg(pParse, "no such database: %T", pDbname); +++ return; +++ } +++ if( i<2 ){ +++ sqliteErrorMsg(pParse, "cannot detach database %T", pDbname); +++ return; +++ } +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ if( sqliteAuthCheck(pParse,SQLITE_DETACH,db->aDb[i].zName,0,0)!=SQLITE_OK ){ +++ return; +++ } +++#endif /* SQLITE_OMIT_AUTHORIZATION */ +++ sqliteBtreeClose(pDb->pBt); +++ pDb->pBt = 0; +++ sqliteFree(pDb->zName); +++ sqliteResetInternalSchema(db, i); +++ if( pDb->pAux && pDb->xFreeAux ) pDb->xFreeAux(pDb->pAux); +++ db->nDb--; +++ if( inDb ){ +++ db->aDb[i] = db->aDb[db->nDb]; +++ memset(&db->aDb[db->nDb], 0, sizeof(db->aDb[0])); +++ sqliteResetInternalSchema(db, i); +++ } +++} +++ +++/* +++** Initialize a DbFixer structure. This routine must be called prior +++** to passing the structure to one of the sqliteFixAAAA() routines below. +++** +++** The return value indicates whether or not fixation is required. TRUE +++** means we do need to fix the database references, FALSE means we do not. +++*/ +++int sqliteFixInit( +++ DbFixer *pFix, /* The fixer to be initialized */ +++ Parse *pParse, /* Error messages will be written here */ +++ int iDb, /* This is the database that must must be used */ +++ const char *zType, /* "view", "trigger", or "index" */ +++ const Token *pName /* Name of the view, trigger, or index */ +++){ +++ sqlite *db; +++ +++ if( iDb<0 || iDb==1 ) return 0; +++ db = pParse->db; +++ assert( db->nDb>iDb ); +++ pFix->pParse = pParse; +++ pFix->zDb = db->aDb[iDb].zName; +++ pFix->zType = zType; +++ pFix->pName = pName; +++ return 1; +++} +++ +++/* +++** The following set of routines walk through the parse tree and assign +++** a specific database to all table references where the database name +++** was left unspecified in the original SQL statement. The pFix structure +++** must have been initialized by a prior call to sqliteFixInit(). +++** +++** These routines are used to make sure that an index, trigger, or +++** view in one database does not refer to objects in a different database. +++** (Exception: indices, triggers, and views in the TEMP database are +++** allowed to refer to anything.) If a reference is explicitly made +++** to an object in a different database, an error message is added to +++** pParse->zErrMsg and these routines return non-zero. If everything +++** checks out, these routines return 0. +++*/ +++int sqliteFixSrcList( +++ DbFixer *pFix, /* Context of the fixation */ +++ SrcList *pList /* The Source list to check and modify */ +++){ +++ int i; +++ const char *zDb; +++ +++ if( pList==0 ) return 0; +++ zDb = pFix->zDb; +++ for(i=0; inSrc; i++){ +++ if( pList->a[i].zDatabase==0 ){ +++ pList->a[i].zDatabase = sqliteStrDup(zDb); +++ }else if( sqliteStrICmp(pList->a[i].zDatabase,zDb)!=0 ){ +++ sqliteErrorMsg(pFix->pParse, +++ "%s %z cannot reference objects in database %s", +++ pFix->zType, sqliteStrNDup(pFix->pName->z, pFix->pName->n), +++ pList->a[i].zDatabase); +++ return 1; +++ } +++ if( sqliteFixSelect(pFix, pList->a[i].pSelect) ) return 1; +++ if( sqliteFixExpr(pFix, pList->a[i].pOn) ) return 1; +++ } +++ return 0; +++} +++int sqliteFixSelect( +++ DbFixer *pFix, /* Context of the fixation */ +++ Select *pSelect /* The SELECT statement to be fixed to one database */ +++){ +++ while( pSelect ){ +++ if( sqliteFixExprList(pFix, pSelect->pEList) ){ +++ return 1; +++ } +++ if( sqliteFixSrcList(pFix, pSelect->pSrc) ){ +++ return 1; +++ } +++ if( sqliteFixExpr(pFix, pSelect->pWhere) ){ +++ return 1; +++ } +++ if( sqliteFixExpr(pFix, pSelect->pHaving) ){ +++ return 1; +++ } +++ pSelect = pSelect->pPrior; +++ } +++ return 0; +++} +++int sqliteFixExpr( +++ DbFixer *pFix, /* Context of the fixation */ +++ Expr *pExpr /* The expression to be fixed to one database */ +++){ +++ while( pExpr ){ +++ if( sqliteFixSelect(pFix, pExpr->pSelect) ){ +++ return 1; +++ } +++ if( sqliteFixExprList(pFix, pExpr->pList) ){ +++ return 1; +++ } +++ if( sqliteFixExpr(pFix, pExpr->pRight) ){ +++ return 1; +++ } +++ pExpr = pExpr->pLeft; +++ } +++ return 0; +++} +++int sqliteFixExprList( +++ DbFixer *pFix, /* Context of the fixation */ +++ ExprList *pList /* The expression to be fixed to one database */ +++){ +++ int i; +++ if( pList==0 ) return 0; +++ for(i=0; inExpr; i++){ +++ if( sqliteFixExpr(pFix, pList->a[i].pExpr) ){ +++ return 1; +++ } +++ } +++ return 0; +++} +++int sqliteFixTriggerStep( +++ DbFixer *pFix, /* Context of the fixation */ +++ TriggerStep *pStep /* The trigger step be fixed to one database */ +++){ +++ while( pStep ){ +++ if( sqliteFixSelect(pFix, pStep->pSelect) ){ +++ return 1; +++ } +++ if( sqliteFixExpr(pFix, pStep->pWhere) ){ +++ return 1; +++ } +++ if( sqliteFixExprList(pFix, pStep->pExprList) ){ +++ return 1; +++ } +++ pStep = pStep->pNext; +++ } +++ return 0; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/auth.c ++@@ -0,0 +1,219 @@ +++/* +++** 2003 January 11 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains code used to implement the sqlite_set_authorizer() +++** API. This facility is an optional feature of the library. Embedded +++** systems that do not need this facility may omit it by recompiling +++** the library with -DSQLITE_OMIT_AUTHORIZATION=1 +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++ +++/* +++** All of the code in this file may be omitted by defining a single +++** macro. +++*/ +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ +++/* +++** Set or clear the access authorization function. +++** +++** The access authorization function is be called during the compilation +++** phase to verify that the user has read and/or write access permission on +++** various fields of the database. The first argument to the auth function +++** is a copy of the 3rd argument to this routine. The second argument +++** to the auth function is one of these constants: +++** +++** SQLITE_COPY +++** SQLITE_CREATE_INDEX +++** SQLITE_CREATE_TABLE +++** SQLITE_CREATE_TEMP_INDEX +++** SQLITE_CREATE_TEMP_TABLE +++** SQLITE_CREATE_TEMP_TRIGGER +++** SQLITE_CREATE_TEMP_VIEW +++** SQLITE_CREATE_TRIGGER +++** SQLITE_CREATE_VIEW +++** SQLITE_DELETE +++** SQLITE_DROP_INDEX +++** SQLITE_DROP_TABLE +++** SQLITE_DROP_TEMP_INDEX +++** SQLITE_DROP_TEMP_TABLE +++** SQLITE_DROP_TEMP_TRIGGER +++** SQLITE_DROP_TEMP_VIEW +++** SQLITE_DROP_TRIGGER +++** SQLITE_DROP_VIEW +++** SQLITE_INSERT +++** SQLITE_PRAGMA +++** SQLITE_READ +++** SQLITE_SELECT +++** SQLITE_TRANSACTION +++** SQLITE_UPDATE +++** +++** The third and fourth arguments to the auth function are the name of +++** the table and the column that are being accessed. The auth function +++** should return either SQLITE_OK, SQLITE_DENY, or SQLITE_IGNORE. If +++** SQLITE_OK is returned, it means that access is allowed. SQLITE_DENY +++** means that the SQL statement will never-run - the sqlite_exec() call +++** will return with an error. SQLITE_IGNORE means that the SQL statement +++** should run but attempts to read the specified column will return NULL +++** and attempts to write the column will be ignored. +++** +++** Setting the auth function to NULL disables this hook. The default +++** setting of the auth function is NULL. +++*/ +++int sqlite_set_authorizer( +++ sqlite *db, +++ int (*xAuth)(void*,int,const char*,const char*,const char*,const char*), +++ void *pArg +++){ +++ db->xAuth = xAuth; +++ db->pAuthArg = pArg; +++ return SQLITE_OK; +++} +++ +++/* +++** Write an error message into pParse->zErrMsg that explains that the +++** user-supplied authorization function returned an illegal value. +++*/ +++static void sqliteAuthBadReturnCode(Parse *pParse, int rc){ +++ sqliteErrorMsg(pParse, "illegal return value (%d) from the " +++ "authorization function - should be SQLITE_OK, SQLITE_IGNORE, " +++ "or SQLITE_DENY", rc); +++ pParse->rc = SQLITE_MISUSE; +++} +++ +++/* +++** The pExpr should be a TK_COLUMN expression. The table referred to +++** is in pTabList or else it is the NEW or OLD table of a trigger. +++** Check to see if it is OK to read this particular column. +++** +++** If the auth function returns SQLITE_IGNORE, change the TK_COLUMN +++** instruction into a TK_NULL. If the auth function returns SQLITE_DENY, +++** then generate an error. +++*/ +++void sqliteAuthRead( +++ Parse *pParse, /* The parser context */ +++ Expr *pExpr, /* The expression to check authorization on */ +++ SrcList *pTabList /* All table that pExpr might refer to */ +++){ +++ sqlite *db = pParse->db; +++ int rc; +++ Table *pTab; /* The table being read */ +++ const char *zCol; /* Name of the column of the table */ +++ int iSrc; /* Index in pTabList->a[] of table being read */ +++ const char *zDBase; /* Name of database being accessed */ +++ TriggerStack *pStack; /* The stack of current triggers */ +++ +++ if( db->xAuth==0 ) return; +++ assert( pExpr->op==TK_COLUMN ); +++ for(iSrc=0; iSrcnSrc; iSrc++){ +++ if( pExpr->iTable==pTabList->a[iSrc].iCursor ) break; +++ } +++ if( iSrc>=0 && iSrcnSrc ){ +++ pTab = pTabList->a[iSrc].pTab; +++ }else if( (pStack = pParse->trigStack)!=0 ){ +++ /* This must be an attempt to read the NEW or OLD pseudo-tables +++ ** of a trigger. +++ */ +++ assert( pExpr->iTable==pStack->newIdx || pExpr->iTable==pStack->oldIdx ); +++ pTab = pStack->pTab; +++ }else{ +++ return; +++ } +++ if( pTab==0 ) return; +++ if( pExpr->iColumn>=0 ){ +++ assert( pExpr->iColumnnCol ); +++ zCol = pTab->aCol[pExpr->iColumn].zName; +++ }else if( pTab->iPKey>=0 ){ +++ assert( pTab->iPKeynCol ); +++ zCol = pTab->aCol[pTab->iPKey].zName; +++ }else{ +++ zCol = "ROWID"; +++ } +++ assert( pExpr->iDbnDb ); +++ zDBase = db->aDb[pExpr->iDb].zName; +++ rc = db->xAuth(db->pAuthArg, SQLITE_READ, pTab->zName, zCol, zDBase, +++ pParse->zAuthContext); +++ if( rc==SQLITE_IGNORE ){ +++ pExpr->op = TK_NULL; +++ }else if( rc==SQLITE_DENY ){ +++ if( db->nDb>2 || pExpr->iDb!=0 ){ +++ sqliteErrorMsg(pParse, "access to %s.%s.%s is prohibited", +++ zDBase, pTab->zName, zCol); +++ }else{ +++ sqliteErrorMsg(pParse, "access to %s.%s is prohibited", pTab->zName,zCol); +++ } +++ pParse->rc = SQLITE_AUTH; +++ }else if( rc!=SQLITE_OK ){ +++ sqliteAuthBadReturnCode(pParse, rc); +++ } +++} +++ +++/* +++** Do an authorization check using the code and arguments given. Return +++** either SQLITE_OK (zero) or SQLITE_IGNORE or SQLITE_DENY. If SQLITE_DENY +++** is returned, then the error count and error message in pParse are +++** modified appropriately. +++*/ +++int sqliteAuthCheck( +++ Parse *pParse, +++ int code, +++ const char *zArg1, +++ const char *zArg2, +++ const char *zArg3 +++){ +++ sqlite *db = pParse->db; +++ int rc; +++ +++ if( db->init.busy || db->xAuth==0 ){ +++ return SQLITE_OK; +++ } +++ rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext); +++ if( rc==SQLITE_DENY ){ +++ sqliteErrorMsg(pParse, "not authorized"); +++ pParse->rc = SQLITE_AUTH; +++ }else if( rc!=SQLITE_OK && rc!=SQLITE_IGNORE ){ +++ rc = SQLITE_DENY; +++ sqliteAuthBadReturnCode(pParse, rc); +++ } +++ return rc; +++} +++ +++/* +++** Push an authorization context. After this routine is called, the +++** zArg3 argument to authorization callbacks will be zContext until +++** popped. Or if pParse==0, this routine is a no-op. +++*/ +++void sqliteAuthContextPush( +++ Parse *pParse, +++ AuthContext *pContext, +++ const char *zContext +++){ +++ pContext->pParse = pParse; +++ if( pParse ){ +++ pContext->zAuthContext = pParse->zAuthContext; +++ pParse->zAuthContext = zContext; +++ } +++} +++ +++/* +++** Pop an authorization context that was previously pushed +++** by sqliteAuthContextPush +++*/ +++void sqliteAuthContextPop(AuthContext *pContext){ +++ if( pContext->pParse ){ +++ pContext->pParse->zAuthContext = pContext->zAuthContext; +++ pContext->pParse = 0; +++ } +++} +++ +++#endif /* SQLITE_OMIT_AUTHORIZATION */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/btree.c ++@@ -0,0 +1,3584 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** $Id$ +++** +++** This file implements a external (disk-based) database using BTrees. +++** For a detailed discussion of BTrees, refer to +++** +++** Donald E. Knuth, THE ART OF COMPUTER PROGRAMMING, Volume 3: +++** "Sorting And Searching", pages 473-480. Addison-Wesley +++** Publishing Company, Reading, Massachusetts. +++** +++** The basic idea is that each page of the file contains N database +++** entries and N+1 pointers to subpages. +++** +++** ---------------------------------------------------------------- +++** | Ptr(0) | Key(0) | Ptr(1) | Key(1) | ... | Key(N) | Ptr(N+1) | +++** ---------------------------------------------------------------- +++** +++** All of the keys on the page that Ptr(0) points to have values less +++** than Key(0). All of the keys on page Ptr(1) and its subpages have +++** values greater than Key(0) and less than Key(1). All of the keys +++** on Ptr(N+1) and its subpages have values greater than Key(N). And +++** so forth. +++** +++** Finding a particular key requires reading O(log(M)) pages from the +++** disk where M is the number of entries in the tree. +++** +++** In this implementation, a single file can hold one or more separate +++** BTrees. Each BTree is identified by the index of its root page. The +++** key and data for any entry are combined to form the "payload". Up to +++** MX_LOCAL_PAYLOAD bytes of payload can be carried directly on the +++** database page. If the payload is larger than MX_LOCAL_PAYLOAD bytes +++** then surplus bytes are stored on overflow pages. The payload for an +++** entry and the preceding pointer are combined to form a "Cell". Each +++** page has a small header which contains the Ptr(N+1) pointer. +++** +++** The first page of the file contains a magic string used to verify that +++** the file really is a valid BTree database, a pointer to a list of unused +++** pages in the file, and some meta information. The root of the first +++** BTree begins on page 2 of the file. (Pages are numbered beginning with +++** 1, not 0.) Thus a minimum database contains 2 pages. +++*/ +++#include "sqliteInt.h" +++#include "pager.h" +++#include "btree.h" +++#include +++ +++/* Forward declarations */ +++static BtOps sqliteBtreeOps; +++static BtCursorOps sqliteBtreeCursorOps; +++ +++/* +++** Macros used for byteswapping. B is a pointer to the Btree +++** structure. This is needed to access the Btree.needSwab boolean +++** in order to tell if byte swapping is needed or not. +++** X is an unsigned integer. SWAB16 byte swaps a 16-bit integer. +++** SWAB32 byteswaps a 32-bit integer. +++*/ +++#define SWAB16(B,X) ((B)->needSwab? swab16((u16)X) : ((u16)X)) +++#define SWAB32(B,X) ((B)->needSwab? swab32(X) : (X)) +++#define SWAB_ADD(B,X,A) \ +++ if((B)->needSwab){ X=swab32(swab32(X)+A); }else{ X += (A); } +++ +++/* +++** The following global variable - available only if SQLITE_TEST is +++** defined - is used to determine whether new databases are created in +++** native byte order or in non-native byte order. Non-native byte order +++** databases are created for testing purposes only. Under normal operation, +++** only native byte-order databases should be created, but we should be +++** able to read or write existing databases regardless of the byteorder. +++*/ +++#ifdef SQLITE_TEST +++int btree_native_byte_order = 1; +++#else +++# define btree_native_byte_order 1 +++#endif +++ +++/* +++** Forward declarations of structures used only in this file. +++*/ +++typedef struct PageOne PageOne; +++typedef struct MemPage MemPage; +++typedef struct PageHdr PageHdr; +++typedef struct Cell Cell; +++typedef struct CellHdr CellHdr; +++typedef struct FreeBlk FreeBlk; +++typedef struct OverflowPage OverflowPage; +++typedef struct FreelistInfo FreelistInfo; +++ +++/* +++** All structures on a database page are aligned to 4-byte boundries. +++** This routine rounds up a number of bytes to the next multiple of 4. +++** +++** This might need to change for computer architectures that require +++** and 8-byte alignment boundry for structures. +++*/ +++#define ROUNDUP(X) ((X+3) & ~3) +++ +++/* +++** This is a magic string that appears at the beginning of every +++** SQLite database in order to identify the file as a real database. +++*/ +++static const char zMagicHeader[] = +++ "** This file contains an SQLite 2.1 database **"; +++#define MAGIC_SIZE (sizeof(zMagicHeader)) +++ +++/* +++** This is a magic integer also used to test the integrity of the database +++** file. This integer is used in addition to the string above so that +++** if the file is written on a little-endian architecture and read +++** on a big-endian architectures (or vice versa) we can detect the +++** problem. +++** +++** The number used was obtained at random and has no special +++** significance other than the fact that it represents a different +++** integer on little-endian and big-endian machines. +++*/ +++#define MAGIC 0xdae37528 +++ +++/* +++** The first page of the database file contains a magic header string +++** to identify the file as an SQLite database file. It also contains +++** a pointer to the first free page of the file. Page 2 contains the +++** root of the principle BTree. The file might contain other BTrees +++** rooted on pages above 2. +++** +++** The first page also contains SQLITE_N_BTREE_META integers that +++** can be used by higher-level routines. +++** +++** Remember that pages are numbered beginning with 1. (See pager.c +++** for additional information.) Page 0 does not exist and a page +++** number of 0 is used to mean "no such page". +++*/ +++struct PageOne { +++ char zMagic[MAGIC_SIZE]; /* String that identifies the file as a database */ +++ int iMagic; /* Integer to verify correct byte order */ +++ Pgno freeList; /* First free page in a list of all free pages */ +++ int nFree; /* Number of pages on the free list */ +++ int aMeta[SQLITE_N_BTREE_META-1]; /* User defined integers */ +++}; +++ +++/* +++** Each database page has a header that is an instance of this +++** structure. +++** +++** PageHdr.firstFree is 0 if there is no free space on this page. +++** Otherwise, PageHdr.firstFree is the index in MemPage.u.aDisk[] of a +++** FreeBlk structure that describes the first block of free space. +++** All free space is defined by a linked list of FreeBlk structures. +++** +++** Data is stored in a linked list of Cell structures. PageHdr.firstCell +++** is the index into MemPage.u.aDisk[] of the first cell on the page. The +++** Cells are kept in sorted order. +++** +++** A Cell contains all information about a database entry and a pointer +++** to a child page that contains other entries less than itself. In +++** other words, the i-th Cell contains both Ptr(i) and Key(i). The +++** right-most pointer of the page is contained in PageHdr.rightChild. +++*/ +++struct PageHdr { +++ Pgno rightChild; /* Child page that comes after all cells on this page */ +++ u16 firstCell; /* Index in MemPage.u.aDisk[] of the first cell */ +++ u16 firstFree; /* Index in MemPage.u.aDisk[] of the first free block */ +++}; +++ +++/* +++** Entries on a page of the database are called "Cells". Each Cell +++** has a header and data. This structure defines the header. The +++** key and data (collectively the "payload") follow this header on +++** the database page. +++** +++** A definition of the complete Cell structure is given below. The +++** header for the cell must be defined first in order to do some +++** of the sizing #defines that follow. +++*/ +++struct CellHdr { +++ Pgno leftChild; /* Child page that comes before this cell */ +++ u16 nKey; /* Number of bytes in the key */ +++ u16 iNext; /* Index in MemPage.u.aDisk[] of next cell in sorted order */ +++ u8 nKeyHi; /* Upper 8 bits of key size for keys larger than 64K bytes */ +++ u8 nDataHi; /* Upper 8 bits of data size when the size is more than 64K */ +++ u16 nData; /* Number of bytes of data */ +++}; +++ +++/* +++** The key and data size are split into a lower 16-bit segment and an +++** upper 8-bit segment in order to pack them together into a smaller +++** space. The following macros reassembly a key or data size back +++** into an integer. +++*/ +++#define NKEY(b,h) (SWAB16(b,h.nKey) + h.nKeyHi*65536) +++#define NDATA(b,h) (SWAB16(b,h.nData) + h.nDataHi*65536) +++ +++/* +++** The minimum size of a complete Cell. The Cell must contain a header +++** and at least 4 bytes of payload. +++*/ +++#define MIN_CELL_SIZE (sizeof(CellHdr)+4) +++ +++/* +++** The maximum number of database entries that can be held in a single +++** page of the database. +++*/ +++#define MX_CELL ((SQLITE_USABLE_SIZE-sizeof(PageHdr))/MIN_CELL_SIZE) +++ +++/* +++** The amount of usable space on a single page of the BTree. This is the +++** page size minus the overhead of the page header. +++*/ +++#define USABLE_SPACE (SQLITE_USABLE_SIZE - sizeof(PageHdr)) +++ +++/* +++** The maximum amount of payload (in bytes) that can be stored locally for +++** a database entry. If the entry contains more data than this, the +++** extra goes onto overflow pages. +++** +++** This number is chosen so that at least 4 cells will fit on every page. +++*/ +++#define MX_LOCAL_PAYLOAD ((USABLE_SPACE/4-(sizeof(CellHdr)+sizeof(Pgno)))&~3) +++ +++/* +++** Data on a database page is stored as a linked list of Cell structures. +++** Both the key and the data are stored in aPayload[]. The key always comes +++** first. The aPayload[] field grows as necessary to hold the key and data, +++** up to a maximum of MX_LOCAL_PAYLOAD bytes. If the size of the key and +++** data combined exceeds MX_LOCAL_PAYLOAD bytes, then Cell.ovfl is the +++** page number of the first overflow page. +++** +++** Though this structure is fixed in size, the Cell on the database +++** page varies in size. Every cell has a CellHdr and at least 4 bytes +++** of payload space. Additional payload bytes (up to the maximum of +++** MX_LOCAL_PAYLOAD) and the Cell.ovfl value are allocated only as +++** needed. +++*/ +++struct Cell { +++ CellHdr h; /* The cell header */ +++ char aPayload[MX_LOCAL_PAYLOAD]; /* Key and data */ +++ Pgno ovfl; /* The first overflow page */ +++}; +++ +++/* +++** Free space on a page is remembered using a linked list of the FreeBlk +++** structures. Space on a database page is allocated in increments of +++** at least 4 bytes and is always aligned to a 4-byte boundry. The +++** linked list of FreeBlks is always kept in order by address. +++*/ +++struct FreeBlk { +++ u16 iSize; /* Number of bytes in this block of free space */ +++ u16 iNext; /* Index in MemPage.u.aDisk[] of the next free block */ +++}; +++ +++/* +++** The number of bytes of payload that will fit on a single overflow page. +++*/ +++#define OVERFLOW_SIZE (SQLITE_USABLE_SIZE-sizeof(Pgno)) +++ +++/* +++** When the key and data for a single entry in the BTree will not fit in +++** the MX_LOCAL_PAYLOAD bytes of space available on the database page, +++** then all extra bytes are written to a linked list of overflow pages. +++** Each overflow page is an instance of the following structure. +++** +++** Unused pages in the database are also represented by instances of +++** the OverflowPage structure. The PageOne.freeList field is the +++** page number of the first page in a linked list of unused database +++** pages. +++*/ +++struct OverflowPage { +++ Pgno iNext; +++ char aPayload[OVERFLOW_SIZE]; +++}; +++ +++/* +++** The PageOne.freeList field points to a linked list of overflow pages +++** hold information about free pages. The aPayload section of each +++** overflow page contains an instance of the following structure. The +++** aFree[] array holds the page number of nFree unused pages in the disk +++** file. +++*/ +++struct FreelistInfo { +++ int nFree; +++ Pgno aFree[(OVERFLOW_SIZE-sizeof(int))/sizeof(Pgno)]; +++}; +++ +++/* +++** For every page in the database file, an instance of the following structure +++** is stored in memory. The u.aDisk[] array contains the raw bits read from +++** the disk. The rest is auxiliary information held in memory only. The +++** auxiliary info is only valid for regular database pages - it is not +++** used for overflow pages and pages on the freelist. +++** +++** Of particular interest in the auxiliary info is the apCell[] entry. Each +++** apCell[] entry is a pointer to a Cell structure in u.aDisk[]. The cells are +++** put in this array so that they can be accessed in constant time, rather +++** than in linear time which would be needed if we had to walk the linked +++** list on every access. +++** +++** Note that apCell[] contains enough space to hold up to two more Cells +++** than can possibly fit on one page. In the steady state, every apCell[] +++** points to memory inside u.aDisk[]. But in the middle of an insert +++** operation, some apCell[] entries may temporarily point to data space +++** outside of u.aDisk[]. This is a transient situation that is quickly +++** resolved. But while it is happening, it is possible for a database +++** page to hold as many as two more cells than it might otherwise hold. +++** The extra two entries in apCell[] are an allowance for this situation. +++** +++** The pParent field points back to the parent page. This allows us to +++** walk up the BTree from any leaf to the root. Care must be taken to +++** unref() the parent page pointer when this page is no longer referenced. +++** The pageDestructor() routine handles that chore. +++*/ +++struct MemPage { +++ union u_page_data { +++ char aDisk[SQLITE_PAGE_SIZE]; /* Page data stored on disk */ +++ PageHdr hdr; /* Overlay page header */ +++ } u; +++ u8 isInit; /* True if auxiliary data is initialized */ +++ u8 idxShift; /* True if apCell[] indices have changed */ +++ u8 isOverfull; /* Some apCell[] points outside u.aDisk[] */ +++ MemPage *pParent; /* The parent of this page. NULL for root */ +++ int idxParent; /* Index in pParent->apCell[] of this node */ +++ int nFree; /* Number of free bytes in u.aDisk[] */ +++ int nCell; /* Number of entries on this page */ +++ Cell *apCell[MX_CELL+2]; /* All data entires in sorted order */ +++}; +++ +++/* +++** The in-memory image of a disk page has the auxiliary information appended +++** to the end. EXTRA_SIZE is the number of bytes of space needed to hold +++** that extra information. +++*/ +++#define EXTRA_SIZE (sizeof(MemPage)-sizeof(union u_page_data)) +++ +++/* +++** Everything we need to know about an open database +++*/ +++struct Btree { +++ BtOps *pOps; /* Function table */ +++ Pager *pPager; /* The page cache */ +++ BtCursor *pCursor; /* A list of all open cursors */ +++ PageOne *page1; /* First page of the database */ +++ u8 inTrans; /* True if a transaction is in progress */ +++ u8 inCkpt; /* True if there is a checkpoint on the transaction */ +++ u8 readOnly; /* True if the underlying file is readonly */ +++ u8 needSwab; /* Need to byte-swapping */ +++}; +++typedef Btree Bt; +++ +++/* +++** A cursor is a pointer to a particular entry in the BTree. +++** The entry is identified by its MemPage and the index in +++** MemPage.apCell[] of the entry. +++*/ +++struct BtCursor { +++ BtCursorOps *pOps; /* Function table */ +++ Btree *pBt; /* The Btree to which this cursor belongs */ +++ BtCursor *pNext, *pPrev; /* Forms a linked list of all cursors */ +++ BtCursor *pShared; /* Loop of cursors with the same root page */ +++ Pgno pgnoRoot; /* The root page of this tree */ +++ MemPage *pPage; /* Page that contains the entry */ +++ int idx; /* Index of the entry in pPage->apCell[] */ +++ u8 wrFlag; /* True if writable */ +++ u8 eSkip; /* Determines if next step operation is a no-op */ +++ u8 iMatch; /* compare result from last sqliteBtreeMoveto() */ +++}; +++ +++/* +++** Legal values for BtCursor.eSkip. +++*/ +++#define SKIP_NONE 0 /* Always step the cursor */ +++#define SKIP_NEXT 1 /* The next sqliteBtreeNext() is a no-op */ +++#define SKIP_PREV 2 /* The next sqliteBtreePrevious() is a no-op */ +++#define SKIP_INVALID 3 /* Calls to Next() and Previous() are invalid */ +++ +++/* Forward declarations */ +++static int fileBtreeCloseCursor(BtCursor *pCur); +++ +++/* +++** Routines for byte swapping. +++*/ +++u16 swab16(u16 x){ +++ return ((x & 0xff)<<8) | ((x>>8)&0xff); +++} +++u32 swab32(u32 x){ +++ return ((x & 0xff)<<24) | ((x & 0xff00)<<8) | +++ ((x>>8) & 0xff00) | ((x>>24)&0xff); +++} +++ +++/* +++** Compute the total number of bytes that a Cell needs on the main +++** database page. The number returned includes the Cell header, +++** local payload storage, and the pointer to overflow pages (if +++** applicable). Additional space allocated on overflow pages +++** is NOT included in the value returned from this routine. +++*/ +++static int cellSize(Btree *pBt, Cell *pCell){ +++ int n = NKEY(pBt, pCell->h) + NDATA(pBt, pCell->h); +++ if( n>MX_LOCAL_PAYLOAD ){ +++ n = MX_LOCAL_PAYLOAD + sizeof(Pgno); +++ }else{ +++ n = ROUNDUP(n); +++ } +++ n += sizeof(CellHdr); +++ return n; +++} +++ +++/* +++** Defragment the page given. All Cells are moved to the +++** beginning of the page and all free space is collected +++** into one big FreeBlk at the end of the page. +++*/ +++static void defragmentPage(Btree *pBt, MemPage *pPage){ +++ int pc, i, n; +++ FreeBlk *pFBlk; +++ char newPage[SQLITE_USABLE_SIZE]; +++ +++ assert( sqlitepager_iswriteable(pPage) ); +++ assert( pPage->isInit ); +++ pc = sizeof(PageHdr); +++ pPage->u.hdr.firstCell = SWAB16(pBt, pc); +++ memcpy(newPage, pPage->u.aDisk, pc); +++ for(i=0; inCell; i++){ +++ Cell *pCell = pPage->apCell[i]; +++ +++ /* This routine should never be called on an overfull page. The +++ ** following asserts verify that constraint. */ +++ assert( Addr(pCell) > Addr(pPage) ); +++ assert( Addr(pCell) < Addr(pPage) + SQLITE_USABLE_SIZE ); +++ +++ n = cellSize(pBt, pCell); +++ pCell->h.iNext = SWAB16(pBt, pc + n); +++ memcpy(&newPage[pc], pCell, n); +++ pPage->apCell[i] = (Cell*)&pPage->u.aDisk[pc]; +++ pc += n; +++ } +++ assert( pPage->nFree==SQLITE_USABLE_SIZE-pc ); +++ memcpy(pPage->u.aDisk, newPage, pc); +++ if( pPage->nCell>0 ){ +++ pPage->apCell[pPage->nCell-1]->h.iNext = 0; +++ } +++ pFBlk = (FreeBlk*)&pPage->u.aDisk[pc]; +++ pFBlk->iSize = SWAB16(pBt, SQLITE_USABLE_SIZE - pc); +++ pFBlk->iNext = 0; +++ pPage->u.hdr.firstFree = SWAB16(pBt, pc); +++ memset(&pFBlk[1], 0, SQLITE_USABLE_SIZE - pc - sizeof(FreeBlk)); +++} +++ +++/* +++** Allocate nByte bytes of space on a page. nByte must be a +++** multiple of 4. +++** +++** Return the index into pPage->u.aDisk[] of the first byte of +++** the new allocation. Or return 0 if there is not enough free +++** space on the page to satisfy the allocation request. +++** +++** If the page contains nBytes of free space but does not contain +++** nBytes of contiguous free space, then this routine automatically +++** calls defragementPage() to consolidate all free space before +++** allocating the new chunk. +++*/ +++static int allocateSpace(Btree *pBt, MemPage *pPage, int nByte){ +++ FreeBlk *p; +++ u16 *pIdx; +++ int start; +++ int iSize; +++#ifndef NDEBUG +++ int cnt = 0; +++#endif +++ +++ assert( sqlitepager_iswriteable(pPage) ); +++ assert( nByte==ROUNDUP(nByte) ); +++ assert( pPage->isInit ); +++ if( pPage->nFreeisOverfull ) return 0; +++ pIdx = &pPage->u.hdr.firstFree; +++ p = (FreeBlk*)&pPage->u.aDisk[SWAB16(pBt, *pIdx)]; +++ while( (iSize = SWAB16(pBt, p->iSize))iNext==0 ){ +++ defragmentPage(pBt, pPage); +++ pIdx = &pPage->u.hdr.firstFree; +++ }else{ +++ pIdx = &p->iNext; +++ } +++ p = (FreeBlk*)&pPage->u.aDisk[SWAB16(pBt, *pIdx)]; +++ } +++ if( iSize==nByte ){ +++ start = SWAB16(pBt, *pIdx); +++ *pIdx = p->iNext; +++ }else{ +++ FreeBlk *pNew; +++ start = SWAB16(pBt, *pIdx); +++ pNew = (FreeBlk*)&pPage->u.aDisk[start + nByte]; +++ pNew->iNext = p->iNext; +++ pNew->iSize = SWAB16(pBt, iSize - nByte); +++ *pIdx = SWAB16(pBt, start + nByte); +++ } +++ pPage->nFree -= nByte; +++ return start; +++} +++ +++/* +++** Return a section of the MemPage.u.aDisk[] to the freelist. +++** The first byte of the new free block is pPage->u.aDisk[start] +++** and the size of the block is "size" bytes. Size must be +++** a multiple of 4. +++** +++** Most of the effort here is involved in coalesing adjacent +++** free blocks into a single big free block. +++*/ +++static void freeSpace(Btree *pBt, MemPage *pPage, int start, int size){ +++ int end = start + size; +++ u16 *pIdx, idx; +++ FreeBlk *pFBlk; +++ FreeBlk *pNew; +++ FreeBlk *pNext; +++ int iSize; +++ +++ assert( sqlitepager_iswriteable(pPage) ); +++ assert( size == ROUNDUP(size) ); +++ assert( start == ROUNDUP(start) ); +++ assert( pPage->isInit ); +++ pIdx = &pPage->u.hdr.firstFree; +++ idx = SWAB16(pBt, *pIdx); +++ while( idx!=0 && idxu.aDisk[idx]; +++ iSize = SWAB16(pBt, pFBlk->iSize); +++ if( idx + iSize == start ){ +++ pFBlk->iSize = SWAB16(pBt, iSize + size); +++ if( idx + iSize + size == SWAB16(pBt, pFBlk->iNext) ){ +++ pNext = (FreeBlk*)&pPage->u.aDisk[idx + iSize + size]; +++ if( pBt->needSwab ){ +++ pFBlk->iSize = swab16((u16)swab16(pNext->iSize)+iSize+size); +++ }else{ +++ pFBlk->iSize += pNext->iSize; +++ } +++ pFBlk->iNext = pNext->iNext; +++ } +++ pPage->nFree += size; +++ return; +++ } +++ pIdx = &pFBlk->iNext; +++ idx = SWAB16(pBt, *pIdx); +++ } +++ pNew = (FreeBlk*)&pPage->u.aDisk[start]; +++ if( idx != end ){ +++ pNew->iSize = SWAB16(pBt, size); +++ pNew->iNext = SWAB16(pBt, idx); +++ }else{ +++ pNext = (FreeBlk*)&pPage->u.aDisk[idx]; +++ pNew->iSize = SWAB16(pBt, size + SWAB16(pBt, pNext->iSize)); +++ pNew->iNext = pNext->iNext; +++ } +++ *pIdx = SWAB16(pBt, start); +++ pPage->nFree += size; +++} +++ +++/* +++** Initialize the auxiliary information for a disk block. +++** +++** The pParent parameter must be a pointer to the MemPage which +++** is the parent of the page being initialized. The root of the +++** BTree (usually page 2) has no parent and so for that page, +++** pParent==NULL. +++** +++** Return SQLITE_OK on success. If we see that the page does +++** not contain a well-formed database page, then return +++** SQLITE_CORRUPT. Note that a return of SQLITE_OK does not +++** guarantee that the page is well-formed. It only shows that +++** we failed to detect any corruption. +++*/ +++static int initPage(Bt *pBt, MemPage *pPage, Pgno pgnoThis, MemPage *pParent){ +++ int idx; /* An index into pPage->u.aDisk[] */ +++ Cell *pCell; /* A pointer to a Cell in pPage->u.aDisk[] */ +++ FreeBlk *pFBlk; /* A pointer to a free block in pPage->u.aDisk[] */ +++ int sz; /* The size of a Cell in bytes */ +++ int freeSpace; /* Amount of free space on the page */ +++ +++ if( pPage->pParent ){ +++ assert( pPage->pParent==pParent ); +++ return SQLITE_OK; +++ } +++ if( pParent ){ +++ pPage->pParent = pParent; +++ sqlitepager_ref(pParent); +++ } +++ if( pPage->isInit ) return SQLITE_OK; +++ pPage->isInit = 1; +++ pPage->nCell = 0; +++ freeSpace = USABLE_SPACE; +++ idx = SWAB16(pBt, pPage->u.hdr.firstCell); +++ while( idx!=0 ){ +++ if( idx>SQLITE_USABLE_SIZE-MIN_CELL_SIZE ) goto page_format_error; +++ if( idxu.aDisk[idx]; +++ sz = cellSize(pBt, pCell); +++ if( idx+sz > SQLITE_USABLE_SIZE ) goto page_format_error; +++ freeSpace -= sz; +++ pPage->apCell[pPage->nCell++] = pCell; +++ idx = SWAB16(pBt, pCell->h.iNext); +++ } +++ pPage->nFree = 0; +++ idx = SWAB16(pBt, pPage->u.hdr.firstFree); +++ while( idx!=0 ){ +++ int iNext; +++ if( idx>SQLITE_USABLE_SIZE-sizeof(FreeBlk) ) goto page_format_error; +++ if( idxu.aDisk[idx]; +++ pPage->nFree += SWAB16(pBt, pFBlk->iSize); +++ iNext = SWAB16(pBt, pFBlk->iNext); +++ if( iNext>0 && iNext <= idx ) goto page_format_error; +++ idx = iNext; +++ } +++ if( pPage->nCell==0 && pPage->nFree==0 ){ +++ /* As a special case, an uninitialized root page appears to be +++ ** an empty database */ +++ return SQLITE_OK; +++ } +++ if( pPage->nFree!=freeSpace ) goto page_format_error; +++ return SQLITE_OK; +++ +++page_format_error: +++ return SQLITE_CORRUPT; +++} +++ +++/* +++** Set up a raw page so that it looks like a database page holding +++** no entries. +++*/ +++static void zeroPage(Btree *pBt, MemPage *pPage){ +++ PageHdr *pHdr; +++ FreeBlk *pFBlk; +++ assert( sqlitepager_iswriteable(pPage) ); +++ memset(pPage, 0, SQLITE_USABLE_SIZE); +++ pHdr = &pPage->u.hdr; +++ pHdr->firstCell = 0; +++ pHdr->firstFree = SWAB16(pBt, sizeof(*pHdr)); +++ pFBlk = (FreeBlk*)&pHdr[1]; +++ pFBlk->iNext = 0; +++ pPage->nFree = SQLITE_USABLE_SIZE - sizeof(*pHdr); +++ pFBlk->iSize = SWAB16(pBt, pPage->nFree); +++ pPage->nCell = 0; +++ pPage->isOverfull = 0; +++} +++ +++/* +++** This routine is called when the reference count for a page +++** reaches zero. We need to unref the pParent pointer when that +++** happens. +++*/ +++static void pageDestructor(void *pData){ +++ MemPage *pPage = (MemPage*)pData; +++ if( pPage->pParent ){ +++ MemPage *pParent = pPage->pParent; +++ pPage->pParent = 0; +++ sqlitepager_unref(pParent); +++ } +++} +++ +++/* +++** Open a new database. +++** +++** Actually, this routine just sets up the internal data structures +++** for accessing the database. We do not open the database file +++** until the first page is loaded. +++** +++** zFilename is the name of the database file. If zFilename is NULL +++** a new database with a random name is created. This randomly named +++** database file will be deleted when sqliteBtreeClose() is called. +++*/ +++int sqliteBtreeOpen( +++ const char *zFilename, /* Name of the file containing the BTree database */ +++ int omitJournal, /* if TRUE then do not journal this file */ +++ int nCache, /* How many pages in the page cache */ +++ Btree **ppBtree /* Pointer to new Btree object written here */ +++){ +++ Btree *pBt; +++ int rc; +++ +++ /* +++ ** The following asserts make sure that structures used by the btree are +++ ** the right size. This is to guard against size changes that result +++ ** when compiling on a different architecture. +++ */ +++ assert( sizeof(u32)==4 ); +++ assert( sizeof(u16)==2 ); +++ assert( sizeof(Pgno)==4 ); +++ assert( sizeof(PageHdr)==8 ); +++ assert( sizeof(CellHdr)==12 ); +++ assert( sizeof(FreeBlk)==4 ); +++ assert( sizeof(OverflowPage)==SQLITE_USABLE_SIZE ); +++ assert( sizeof(FreelistInfo)==OVERFLOW_SIZE ); +++ assert( sizeof(ptr)==sizeof(char*) ); +++ assert( sizeof(uptr)==sizeof(ptr) ); +++ +++ pBt = sqliteMalloc( sizeof(*pBt) ); +++ if( pBt==0 ){ +++ *ppBtree = 0; +++ return SQLITE_NOMEM; +++ } +++ if( nCache<10 ) nCache = 10; +++ rc = sqlitepager_open(&pBt->pPager, zFilename, nCache, EXTRA_SIZE, +++ !omitJournal); +++ if( rc!=SQLITE_OK ){ +++ if( pBt->pPager ) sqlitepager_close(pBt->pPager); +++ sqliteFree(pBt); +++ *ppBtree = 0; +++ return rc; +++ } +++ sqlitepager_set_destructor(pBt->pPager, pageDestructor); +++ pBt->pCursor = 0; +++ pBt->page1 = 0; +++ pBt->readOnly = sqlitepager_isreadonly(pBt->pPager); +++ pBt->pOps = &sqliteBtreeOps; +++ *ppBtree = pBt; +++ return SQLITE_OK; +++} +++ +++/* +++** Close an open database and invalidate all cursors. +++*/ +++static int fileBtreeClose(Btree *pBt){ +++ while( pBt->pCursor ){ +++ fileBtreeCloseCursor(pBt->pCursor); +++ } +++ sqlitepager_close(pBt->pPager); +++ sqliteFree(pBt); +++ return SQLITE_OK; +++} +++ +++/* +++** Change the limit on the number of pages allowed in the cache. +++** +++** The maximum number of cache pages is set to the absolute +++** value of mxPage. If mxPage is negative, the pager will +++** operate asynchronously - it will not stop to do fsync()s +++** to insure data is written to the disk surface before +++** continuing. Transactions still work if synchronous is off, +++** and the database cannot be corrupted if this program +++** crashes. But if the operating system crashes or there is +++** an abrupt power failure when synchronous is off, the database +++** could be left in an inconsistent and unrecoverable state. +++** Synchronous is on by default so database corruption is not +++** normally a worry. +++*/ +++static int fileBtreeSetCacheSize(Btree *pBt, int mxPage){ +++ sqlitepager_set_cachesize(pBt->pPager, mxPage); +++ return SQLITE_OK; +++} +++ +++/* +++** Change the way data is synced to disk in order to increase or decrease +++** how well the database resists damage due to OS crashes and power +++** failures. Level 1 is the same as asynchronous (no syncs() occur and +++** there is a high probability of damage) Level 2 is the default. There +++** is a very low but non-zero probability of damage. Level 3 reduces the +++** probability of damage to near zero but with a write performance reduction. +++*/ +++static int fileBtreeSetSafetyLevel(Btree *pBt, int level){ +++ sqlitepager_set_safety_level(pBt->pPager, level); +++ return SQLITE_OK; +++} +++ +++/* +++** Get a reference to page1 of the database file. This will +++** also acquire a readlock on that file. +++** +++** SQLITE_OK is returned on success. If the file is not a +++** well-formed database file, then SQLITE_CORRUPT is returned. +++** SQLITE_BUSY is returned if the database is locked. SQLITE_NOMEM +++** is returned if we run out of memory. SQLITE_PROTOCOL is returned +++** if there is a locking protocol violation. +++*/ +++static int lockBtree(Btree *pBt){ +++ int rc; +++ if( pBt->page1 ) return SQLITE_OK; +++ rc = sqlitepager_get(pBt->pPager, 1, (void**)&pBt->page1); +++ if( rc!=SQLITE_OK ) return rc; +++ +++ /* Do some checking to help insure the file we opened really is +++ ** a valid database file. +++ */ +++ if( sqlitepager_pagecount(pBt->pPager)>0 ){ +++ PageOne *pP1 = pBt->page1; +++ if( strcmp(pP1->zMagic,zMagicHeader)!=0 || +++ (pP1->iMagic!=MAGIC && swab32(pP1->iMagic)!=MAGIC) ){ +++ rc = SQLITE_NOTADB; +++ goto page1_init_failed; +++ } +++ pBt->needSwab = pP1->iMagic!=MAGIC; +++ } +++ return rc; +++ +++page1_init_failed: +++ sqlitepager_unref(pBt->page1); +++ pBt->page1 = 0; +++ return rc; +++} +++ +++/* +++** If there are no outstanding cursors and we are not in the middle +++** of a transaction but there is a read lock on the database, then +++** this routine unrefs the first page of the database file which +++** has the effect of releasing the read lock. +++** +++** If there are any outstanding cursors, this routine is a no-op. +++** +++** If there is a transaction in progress, this routine is a no-op. +++*/ +++static void unlockBtreeIfUnused(Btree *pBt){ +++ if( pBt->inTrans==0 && pBt->pCursor==0 && pBt->page1!=0 ){ +++ sqlitepager_unref(pBt->page1); +++ pBt->page1 = 0; +++ pBt->inTrans = 0; +++ pBt->inCkpt = 0; +++ } +++} +++ +++/* +++** Create a new database by initializing the first two pages of the +++** file. +++*/ +++static int newDatabase(Btree *pBt){ +++ MemPage *pRoot; +++ PageOne *pP1; +++ int rc; +++ if( sqlitepager_pagecount(pBt->pPager)>1 ) return SQLITE_OK; +++ pP1 = pBt->page1; +++ rc = sqlitepager_write(pBt->page1); +++ if( rc ) return rc; +++ rc = sqlitepager_get(pBt->pPager, 2, (void**)&pRoot); +++ if( rc ) return rc; +++ rc = sqlitepager_write(pRoot); +++ if( rc ){ +++ sqlitepager_unref(pRoot); +++ return rc; +++ } +++ strcpy(pP1->zMagic, zMagicHeader); +++ if( btree_native_byte_order ){ +++ pP1->iMagic = MAGIC; +++ pBt->needSwab = 0; +++ }else{ +++ pP1->iMagic = swab32(MAGIC); +++ pBt->needSwab = 1; +++ } +++ zeroPage(pBt, pRoot); +++ sqlitepager_unref(pRoot); +++ return SQLITE_OK; +++} +++ +++/* +++** Attempt to start a new transaction. +++** +++** A transaction must be started before attempting any changes +++** to the database. None of the following routines will work +++** unless a transaction is started first: +++** +++** sqliteBtreeCreateTable() +++** sqliteBtreeCreateIndex() +++** sqliteBtreeClearTable() +++** sqliteBtreeDropTable() +++** sqliteBtreeInsert() +++** sqliteBtreeDelete() +++** sqliteBtreeUpdateMeta() +++*/ +++static int fileBtreeBeginTrans(Btree *pBt){ +++ int rc; +++ if( pBt->inTrans ) return SQLITE_ERROR; +++ if( pBt->readOnly ) return SQLITE_READONLY; +++ if( pBt->page1==0 ){ +++ rc = lockBtree(pBt); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ } +++ rc = sqlitepager_begin(pBt->page1); +++ if( rc==SQLITE_OK ){ +++ rc = newDatabase(pBt); +++ } +++ if( rc==SQLITE_OK ){ +++ pBt->inTrans = 1; +++ pBt->inCkpt = 0; +++ }else{ +++ unlockBtreeIfUnused(pBt); +++ } +++ return rc; +++} +++ +++/* +++** Commit the transaction currently in progress. +++** +++** This will release the write lock on the database file. If there +++** are no active cursors, it also releases the read lock. +++*/ +++static int fileBtreeCommit(Btree *pBt){ +++ int rc; +++ rc = pBt->readOnly ? SQLITE_OK : sqlitepager_commit(pBt->pPager); +++ pBt->inTrans = 0; +++ pBt->inCkpt = 0; +++ unlockBtreeIfUnused(pBt); +++ return rc; +++} +++ +++/* +++** Rollback the transaction in progress. All cursors will be +++** invalided by this operation. Any attempt to use a cursor +++** that was open at the beginning of this operation will result +++** in an error. +++** +++** This will release the write lock on the database file. If there +++** are no active cursors, it also releases the read lock. +++*/ +++static int fileBtreeRollback(Btree *pBt){ +++ int rc; +++ BtCursor *pCur; +++ if( pBt->inTrans==0 ) return SQLITE_OK; +++ pBt->inTrans = 0; +++ pBt->inCkpt = 0; +++ rc = pBt->readOnly ? SQLITE_OK : sqlitepager_rollback(pBt->pPager); +++ for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){ +++ if( pCur->pPage && pCur->pPage->isInit==0 ){ +++ sqlitepager_unref(pCur->pPage); +++ pCur->pPage = 0; +++ } +++ } +++ unlockBtreeIfUnused(pBt); +++ return rc; +++} +++ +++/* +++** Set the checkpoint for the current transaction. The checkpoint serves +++** as a sub-transaction that can be rolled back independently of the +++** main transaction. You must start a transaction before starting a +++** checkpoint. The checkpoint is ended automatically if the transaction +++** commits or rolls back. +++** +++** Only one checkpoint may be active at a time. It is an error to try +++** to start a new checkpoint if another checkpoint is already active. +++*/ +++static int fileBtreeBeginCkpt(Btree *pBt){ +++ int rc; +++ if( !pBt->inTrans || pBt->inCkpt ){ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ rc = pBt->readOnly ? SQLITE_OK : sqlitepager_ckpt_begin(pBt->pPager); +++ pBt->inCkpt = 1; +++ return rc; +++} +++ +++ +++/* +++** Commit a checkpoint to transaction currently in progress. If no +++** checkpoint is active, this is a no-op. +++*/ +++static int fileBtreeCommitCkpt(Btree *pBt){ +++ int rc; +++ if( pBt->inCkpt && !pBt->readOnly ){ +++ rc = sqlitepager_ckpt_commit(pBt->pPager); +++ }else{ +++ rc = SQLITE_OK; +++ } +++ pBt->inCkpt = 0; +++ return rc; +++} +++ +++/* +++** Rollback the checkpoint to the current transaction. If there +++** is no active checkpoint or transaction, this routine is a no-op. +++** +++** All cursors will be invalided by this operation. Any attempt +++** to use a cursor that was open at the beginning of this operation +++** will result in an error. +++*/ +++static int fileBtreeRollbackCkpt(Btree *pBt){ +++ int rc; +++ BtCursor *pCur; +++ if( pBt->inCkpt==0 || pBt->readOnly ) return SQLITE_OK; +++ rc = sqlitepager_ckpt_rollback(pBt->pPager); +++ for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){ +++ if( pCur->pPage && pCur->pPage->isInit==0 ){ +++ sqlitepager_unref(pCur->pPage); +++ pCur->pPage = 0; +++ } +++ } +++ pBt->inCkpt = 0; +++ return rc; +++} +++ +++/* +++** Create a new cursor for the BTree whose root is on the page +++** iTable. The act of acquiring a cursor gets a read lock on +++** the database file. +++** +++** If wrFlag==0, then the cursor can only be used for reading. +++** If wrFlag==1, then the cursor can be used for reading or for +++** writing if other conditions for writing are also met. These +++** are the conditions that must be met in order for writing to +++** be allowed: +++** +++** 1: The cursor must have been opened with wrFlag==1 +++** +++** 2: No other cursors may be open with wrFlag==0 on the same table +++** +++** 3: The database must be writable (not on read-only media) +++** +++** 4: There must be an active transaction. +++** +++** Condition 2 warrants further discussion. If any cursor is opened +++** on a table with wrFlag==0, that prevents all other cursors from +++** writing to that table. This is a kind of "read-lock". When a cursor +++** is opened with wrFlag==0 it is guaranteed that the table will not +++** change as long as the cursor is open. This allows the cursor to +++** do a sequential scan of the table without having to worry about +++** entries being inserted or deleted during the scan. Cursors should +++** be opened with wrFlag==0 only if this read-lock property is needed. +++** That is to say, cursors should be opened with wrFlag==0 only if they +++** intend to use the sqliteBtreeNext() system call. All other cursors +++** should be opened with wrFlag==1 even if they never really intend +++** to write. +++** +++** No checking is done to make sure that page iTable really is the +++** root page of a b-tree. If it is not, then the cursor acquired +++** will not work correctly. +++*/ +++static +++int fileBtreeCursor(Btree *pBt, int iTable, int wrFlag, BtCursor **ppCur){ +++ int rc; +++ BtCursor *pCur, *pRing; +++ +++ if( pBt->readOnly && wrFlag ){ +++ *ppCur = 0; +++ return SQLITE_READONLY; +++ } +++ if( pBt->page1==0 ){ +++ rc = lockBtree(pBt); +++ if( rc!=SQLITE_OK ){ +++ *ppCur = 0; +++ return rc; +++ } +++ } +++ pCur = sqliteMalloc( sizeof(*pCur) ); +++ if( pCur==0 ){ +++ rc = SQLITE_NOMEM; +++ goto create_cursor_exception; +++ } +++ pCur->pgnoRoot = (Pgno)iTable; +++ rc = sqlitepager_get(pBt->pPager, pCur->pgnoRoot, (void**)&pCur->pPage); +++ if( rc!=SQLITE_OK ){ +++ goto create_cursor_exception; +++ } +++ rc = initPage(pBt, pCur->pPage, pCur->pgnoRoot, 0); +++ if( rc!=SQLITE_OK ){ +++ goto create_cursor_exception; +++ } +++ pCur->pOps = &sqliteBtreeCursorOps; +++ pCur->pBt = pBt; +++ pCur->wrFlag = wrFlag; +++ pCur->idx = 0; +++ pCur->eSkip = SKIP_INVALID; +++ pCur->pNext = pBt->pCursor; +++ if( pCur->pNext ){ +++ pCur->pNext->pPrev = pCur; +++ } +++ pCur->pPrev = 0; +++ pRing = pBt->pCursor; +++ while( pRing && pRing->pgnoRoot!=pCur->pgnoRoot ){ pRing = pRing->pNext; } +++ if( pRing ){ +++ pCur->pShared = pRing->pShared; +++ pRing->pShared = pCur; +++ }else{ +++ pCur->pShared = pCur; +++ } +++ pBt->pCursor = pCur; +++ *ppCur = pCur; +++ return SQLITE_OK; +++ +++create_cursor_exception: +++ *ppCur = 0; +++ if( pCur ){ +++ if( pCur->pPage ) sqlitepager_unref(pCur->pPage); +++ sqliteFree(pCur); +++ } +++ unlockBtreeIfUnused(pBt); +++ return rc; +++} +++ +++/* +++** Close a cursor. The read lock on the database file is released +++** when the last cursor is closed. +++*/ +++static int fileBtreeCloseCursor(BtCursor *pCur){ +++ Btree *pBt = pCur->pBt; +++ if( pCur->pPrev ){ +++ pCur->pPrev->pNext = pCur->pNext; +++ }else{ +++ pBt->pCursor = pCur->pNext; +++ } +++ if( pCur->pNext ){ +++ pCur->pNext->pPrev = pCur->pPrev; +++ } +++ if( pCur->pPage ){ +++ sqlitepager_unref(pCur->pPage); +++ } +++ if( pCur->pShared!=pCur ){ +++ BtCursor *pRing = pCur->pShared; +++ while( pRing->pShared!=pCur ){ pRing = pRing->pShared; } +++ pRing->pShared = pCur->pShared; +++ } +++ unlockBtreeIfUnused(pBt); +++ sqliteFree(pCur); +++ return SQLITE_OK; +++} +++ +++/* +++** Make a temporary cursor by filling in the fields of pTempCur. +++** The temporary cursor is not on the cursor list for the Btree. +++*/ +++static void getTempCursor(BtCursor *pCur, BtCursor *pTempCur){ +++ memcpy(pTempCur, pCur, sizeof(*pCur)); +++ pTempCur->pNext = 0; +++ pTempCur->pPrev = 0; +++ if( pTempCur->pPage ){ +++ sqlitepager_ref(pTempCur->pPage); +++ } +++} +++ +++/* +++** Delete a temporary cursor such as was made by the CreateTemporaryCursor() +++** function above. +++*/ +++static void releaseTempCursor(BtCursor *pCur){ +++ if( pCur->pPage ){ +++ sqlitepager_unref(pCur->pPage); +++ } +++} +++ +++/* +++** Set *pSize to the number of bytes of key in the entry the +++** cursor currently points to. Always return SQLITE_OK. +++** Failure is not possible. If the cursor is not currently +++** pointing to an entry (which can happen, for example, if +++** the database is empty) then *pSize is set to 0. +++*/ +++static int fileBtreeKeySize(BtCursor *pCur, int *pSize){ +++ Cell *pCell; +++ MemPage *pPage; +++ +++ pPage = pCur->pPage; +++ assert( pPage!=0 ); +++ if( pCur->idx >= pPage->nCell ){ +++ *pSize = 0; +++ }else{ +++ pCell = pPage->apCell[pCur->idx]; +++ *pSize = NKEY(pCur->pBt, pCell->h); +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Read payload information from the entry that the pCur cursor is +++** pointing to. Begin reading the payload at "offset" and read +++** a total of "amt" bytes. Put the result in zBuf. +++** +++** This routine does not make a distinction between key and data. +++** It just reads bytes from the payload area. +++*/ +++static int getPayload(BtCursor *pCur, int offset, int amt, char *zBuf){ +++ char *aPayload; +++ Pgno nextPage; +++ int rc; +++ Btree *pBt = pCur->pBt; +++ assert( pCur!=0 && pCur->pPage!=0 ); +++ assert( pCur->idx>=0 && pCur->idxpPage->nCell ); +++ aPayload = pCur->pPage->apCell[pCur->idx]->aPayload; +++ if( offsetMX_LOCAL_PAYLOAD ){ +++ a = MX_LOCAL_PAYLOAD - offset; +++ } +++ memcpy(zBuf, &aPayload[offset], a); +++ if( a==amt ){ +++ return SQLITE_OK; +++ } +++ offset = 0; +++ zBuf += a; +++ amt -= a; +++ }else{ +++ offset -= MX_LOCAL_PAYLOAD; +++ } +++ if( amt>0 ){ +++ nextPage = SWAB32(pBt, pCur->pPage->apCell[pCur->idx]->ovfl); +++ } +++ while( amt>0 && nextPage ){ +++ OverflowPage *pOvfl; +++ rc = sqlitepager_get(pBt->pPager, nextPage, (void**)&pOvfl); +++ if( rc!=0 ){ +++ return rc; +++ } +++ nextPage = SWAB32(pBt, pOvfl->iNext); +++ if( offset OVERFLOW_SIZE ){ +++ a = OVERFLOW_SIZE - offset; +++ } +++ memcpy(zBuf, &pOvfl->aPayload[offset], a); +++ offset = 0; +++ amt -= a; +++ zBuf += a; +++ }else{ +++ offset -= OVERFLOW_SIZE; +++ } +++ sqlitepager_unref(pOvfl); +++ } +++ if( amt>0 ){ +++ return SQLITE_CORRUPT; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Read part of the key associated with cursor pCur. A maximum +++** of "amt" bytes will be transfered into zBuf[]. The transfer +++** begins at "offset". The number of bytes actually read is +++** returned. +++** +++** Change: It used to be that the amount returned will be smaller +++** than the amount requested if there are not enough bytes in the key +++** to satisfy the request. But now, it must be the case that there +++** is enough data available to satisfy the request. If not, an exception +++** is raised. The change was made in an effort to boost performance +++** by eliminating unneeded tests. +++*/ +++static int fileBtreeKey(BtCursor *pCur, int offset, int amt, char *zBuf){ +++ MemPage *pPage; +++ +++ assert( amt>=0 ); +++ assert( offset>=0 ); +++ assert( pCur->pPage!=0 ); +++ pPage = pCur->pPage; +++ if( pCur->idx >= pPage->nCell ){ +++ return 0; +++ } +++ assert( amt+offset <= NKEY(pCur->pBt, pPage->apCell[pCur->idx]->h) ); +++ getPayload(pCur, offset, amt, zBuf); +++ return amt; +++} +++ +++/* +++** Set *pSize to the number of bytes of data in the entry the +++** cursor currently points to. Always return SQLITE_OK. +++** Failure is not possible. If the cursor is not currently +++** pointing to an entry (which can happen, for example, if +++** the database is empty) then *pSize is set to 0. +++*/ +++static int fileBtreeDataSize(BtCursor *pCur, int *pSize){ +++ Cell *pCell; +++ MemPage *pPage; +++ +++ pPage = pCur->pPage; +++ assert( pPage!=0 ); +++ if( pCur->idx >= pPage->nCell ){ +++ *pSize = 0; +++ }else{ +++ pCell = pPage->apCell[pCur->idx]; +++ *pSize = NDATA(pCur->pBt, pCell->h); +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Read part of the data associated with cursor pCur. A maximum +++** of "amt" bytes will be transfered into zBuf[]. The transfer +++** begins at "offset". The number of bytes actually read is +++** returned. The amount returned will be smaller than the +++** amount requested if there are not enough bytes in the data +++** to satisfy the request. +++*/ +++static int fileBtreeData(BtCursor *pCur, int offset, int amt, char *zBuf){ +++ Cell *pCell; +++ MemPage *pPage; +++ +++ assert( amt>=0 ); +++ assert( offset>=0 ); +++ assert( pCur->pPage!=0 ); +++ pPage = pCur->pPage; +++ if( pCur->idx >= pPage->nCell ){ +++ return 0; +++ } +++ pCell = pPage->apCell[pCur->idx]; +++ assert( amt+offset <= NDATA(pCur->pBt, pCell->h) ); +++ getPayload(pCur, offset + NKEY(pCur->pBt, pCell->h), amt, zBuf); +++ return amt; +++} +++ +++/* +++** Compare an external key against the key on the entry that pCur points to. +++** +++** The external key is pKey and is nKey bytes long. The last nIgnore bytes +++** of the key associated with pCur are ignored, as if they do not exist. +++** (The normal case is for nIgnore to be zero in which case the entire +++** internal key is used in the comparison.) +++** +++** The comparison result is written to *pRes as follows: +++** +++** *pRes<0 This means pCur0 This means pCur>pKey +++** +++** When one key is an exact prefix of the other, the shorter key is +++** considered less than the longer one. In order to be equal the +++** keys must be exactly the same length. (The length of the pCur key +++** is the actual key length minus nIgnore bytes.) +++*/ +++static int fileBtreeKeyCompare( +++ BtCursor *pCur, /* Pointer to entry to compare against */ +++ const void *pKey, /* Key to compare against entry that pCur points to */ +++ int nKey, /* Number of bytes in pKey */ +++ int nIgnore, /* Ignore this many bytes at the end of pCur */ +++ int *pResult /* Write the result here */ +++){ +++ Pgno nextPage; +++ int n, c, rc, nLocal; +++ Cell *pCell; +++ Btree *pBt = pCur->pBt; +++ const char *zKey = (const char*)pKey; +++ +++ assert( pCur->pPage ); +++ assert( pCur->idx>=0 && pCur->idxpPage->nCell ); +++ pCell = pCur->pPage->apCell[pCur->idx]; +++ nLocal = NKEY(pBt, pCell->h) - nIgnore; +++ if( nLocal<0 ) nLocal = 0; +++ n = nKeyMX_LOCAL_PAYLOAD ){ +++ n = MX_LOCAL_PAYLOAD; +++ } +++ c = memcmp(pCell->aPayload, zKey, n); +++ if( c!=0 ){ +++ *pResult = c; +++ return SQLITE_OK; +++ } +++ zKey += n; +++ nKey -= n; +++ nLocal -= n; +++ nextPage = SWAB32(pBt, pCell->ovfl); +++ while( nKey>0 && nLocal>0 ){ +++ OverflowPage *pOvfl; +++ if( nextPage==0 ){ +++ return SQLITE_CORRUPT; +++ } +++ rc = sqlitepager_get(pBt->pPager, nextPage, (void**)&pOvfl); +++ if( rc ){ +++ return rc; +++ } +++ nextPage = SWAB32(pBt, pOvfl->iNext); +++ n = nKeyOVERFLOW_SIZE ){ +++ n = OVERFLOW_SIZE; +++ } +++ c = memcmp(pOvfl->aPayload, zKey, n); +++ sqlitepager_unref(pOvfl); +++ if( c!=0 ){ +++ *pResult = c; +++ return SQLITE_OK; +++ } +++ nKey -= n; +++ nLocal -= n; +++ zKey += n; +++ } +++ if( c==0 ){ +++ c = nLocal - nKey; +++ } +++ *pResult = c; +++ return SQLITE_OK; +++} +++ +++/* +++** Move the cursor down to a new child page. The newPgno argument is the +++** page number of the child page in the byte order of the disk image. +++*/ +++static int moveToChild(BtCursor *pCur, int newPgno){ +++ int rc; +++ MemPage *pNewPage; +++ Btree *pBt = pCur->pBt; +++ +++ newPgno = SWAB32(pBt, newPgno); +++ rc = sqlitepager_get(pBt->pPager, newPgno, (void**)&pNewPage); +++ if( rc ) return rc; +++ rc = initPage(pBt, pNewPage, newPgno, pCur->pPage); +++ if( rc ) return rc; +++ assert( pCur->idx>=pCur->pPage->nCell +++ || pCur->pPage->apCell[pCur->idx]->h.leftChild==SWAB32(pBt,newPgno) ); +++ assert( pCur->idxpPage->nCell +++ || pCur->pPage->u.hdr.rightChild==SWAB32(pBt,newPgno) ); +++ pNewPage->idxParent = pCur->idx; +++ pCur->pPage->idxShift = 0; +++ sqlitepager_unref(pCur->pPage); +++ pCur->pPage = pNewPage; +++ pCur->idx = 0; +++ if( pNewPage->nCell<1 ){ +++ return SQLITE_CORRUPT; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Move the cursor up to the parent page. +++** +++** pCur->idx is set to the cell index that contains the pointer +++** to the page we are coming from. If we are coming from the +++** right-most child page then pCur->idx is set to one more than +++** the largest cell index. +++*/ +++static void moveToParent(BtCursor *pCur){ +++ Pgno oldPgno; +++ MemPage *pParent; +++ MemPage *pPage; +++ int idxParent; +++ pPage = pCur->pPage; +++ assert( pPage!=0 ); +++ pParent = pPage->pParent; +++ assert( pParent!=0 ); +++ idxParent = pPage->idxParent; +++ sqlitepager_ref(pParent); +++ sqlitepager_unref(pPage); +++ pCur->pPage = pParent; +++ assert( pParent->idxShift==0 ); +++ if( pParent->idxShift==0 ){ +++ pCur->idx = idxParent; +++#ifndef NDEBUG +++ /* Verify that pCur->idx is the correct index to point back to the child +++ ** page we just came from +++ */ +++ oldPgno = SWAB32(pCur->pBt, sqlitepager_pagenumber(pPage)); +++ if( pCur->idxnCell ){ +++ assert( pParent->apCell[idxParent]->h.leftChild==oldPgno ); +++ }else{ +++ assert( pParent->u.hdr.rightChild==oldPgno ); +++ } +++#endif +++ }else{ +++ /* The MemPage.idxShift flag indicates that cell indices might have +++ ** changed since idxParent was set and hence idxParent might be out +++ ** of date. So recompute the parent cell index by scanning all cells +++ ** and locating the one that points to the child we just came from. +++ */ +++ int i; +++ pCur->idx = pParent->nCell; +++ oldPgno = SWAB32(pCur->pBt, sqlitepager_pagenumber(pPage)); +++ for(i=0; inCell; i++){ +++ if( pParent->apCell[i]->h.leftChild==oldPgno ){ +++ pCur->idx = i; +++ break; +++ } +++ } +++ } +++} +++ +++/* +++** Move the cursor to the root page +++*/ +++static int moveToRoot(BtCursor *pCur){ +++ MemPage *pNew; +++ int rc; +++ Btree *pBt = pCur->pBt; +++ +++ rc = sqlitepager_get(pBt->pPager, pCur->pgnoRoot, (void**)&pNew); +++ if( rc ) return rc; +++ rc = initPage(pBt, pNew, pCur->pgnoRoot, 0); +++ if( rc ) return rc; +++ sqlitepager_unref(pCur->pPage); +++ pCur->pPage = pNew; +++ pCur->idx = 0; +++ return SQLITE_OK; +++} +++ +++/* +++** Move the cursor down to the left-most leaf entry beneath the +++** entry to which it is currently pointing. +++*/ +++static int moveToLeftmost(BtCursor *pCur){ +++ Pgno pgno; +++ int rc; +++ +++ while( (pgno = pCur->pPage->apCell[pCur->idx]->h.leftChild)!=0 ){ +++ rc = moveToChild(pCur, pgno); +++ if( rc ) return rc; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Move the cursor down to the right-most leaf entry beneath the +++** page to which it is currently pointing. Notice the difference +++** between moveToLeftmost() and moveToRightmost(). moveToLeftmost() +++** finds the left-most entry beneath the *entry* whereas moveToRightmost() +++** finds the right-most entry beneath the *page*. +++*/ +++static int moveToRightmost(BtCursor *pCur){ +++ Pgno pgno; +++ int rc; +++ +++ while( (pgno = pCur->pPage->u.hdr.rightChild)!=0 ){ +++ pCur->idx = pCur->pPage->nCell; +++ rc = moveToChild(pCur, pgno); +++ if( rc ) return rc; +++ } +++ pCur->idx = pCur->pPage->nCell - 1; +++ return SQLITE_OK; +++} +++ +++/* Move the cursor to the first entry in the table. Return SQLITE_OK +++** on success. Set *pRes to 0 if the cursor actually points to something +++** or set *pRes to 1 if the table is empty. +++*/ +++static int fileBtreeFirst(BtCursor *pCur, int *pRes){ +++ int rc; +++ if( pCur->pPage==0 ) return SQLITE_ABORT; +++ rc = moveToRoot(pCur); +++ if( rc ) return rc; +++ if( pCur->pPage->nCell==0 ){ +++ *pRes = 1; +++ return SQLITE_OK; +++ } +++ *pRes = 0; +++ rc = moveToLeftmost(pCur); +++ pCur->eSkip = SKIP_NONE; +++ return rc; +++} +++ +++/* Move the cursor to the last entry in the table. Return SQLITE_OK +++** on success. Set *pRes to 0 if the cursor actually points to something +++** or set *pRes to 1 if the table is empty. +++*/ +++static int fileBtreeLast(BtCursor *pCur, int *pRes){ +++ int rc; +++ if( pCur->pPage==0 ) return SQLITE_ABORT; +++ rc = moveToRoot(pCur); +++ if( rc ) return rc; +++ assert( pCur->pPage->isInit ); +++ if( pCur->pPage->nCell==0 ){ +++ *pRes = 1; +++ return SQLITE_OK; +++ } +++ *pRes = 0; +++ rc = moveToRightmost(pCur); +++ pCur->eSkip = SKIP_NONE; +++ return rc; +++} +++ +++/* Move the cursor so that it points to an entry near pKey. +++** Return a success code. +++** +++** If an exact match is not found, then the cursor is always +++** left pointing at a leaf page which would hold the entry if it +++** were present. The cursor might point to an entry that comes +++** before or after the key. +++** +++** The result of comparing the key with the entry to which the +++** cursor is left pointing is stored in pCur->iMatch. The same +++** value is also written to *pRes if pRes!=NULL. The meaning of +++** this value is as follows: +++** +++** *pRes<0 The cursor is left pointing at an entry that +++** is smaller than pKey or if the table is empty +++** and the cursor is therefore left point to nothing. +++** +++** *pRes==0 The cursor is left pointing at an entry that +++** exactly matches pKey. +++** +++** *pRes>0 The cursor is left pointing at an entry that +++** is larger than pKey. +++*/ +++static +++int fileBtreeMoveto(BtCursor *pCur, const void *pKey, int nKey, int *pRes){ +++ int rc; +++ if( pCur->pPage==0 ) return SQLITE_ABORT; +++ pCur->eSkip = SKIP_NONE; +++ rc = moveToRoot(pCur); +++ if( rc ) return rc; +++ for(;;){ +++ int lwr, upr; +++ Pgno chldPg; +++ MemPage *pPage = pCur->pPage; +++ int c = -1; /* pRes return if table is empty must be -1 */ +++ lwr = 0; +++ upr = pPage->nCell-1; +++ while( lwr<=upr ){ +++ pCur->idx = (lwr+upr)/2; +++ rc = fileBtreeKeyCompare(pCur, pKey, nKey, 0, &c); +++ if( rc ) return rc; +++ if( c==0 ){ +++ pCur->iMatch = c; +++ if( pRes ) *pRes = 0; +++ return SQLITE_OK; +++ } +++ if( c<0 ){ +++ lwr = pCur->idx+1; +++ }else{ +++ upr = pCur->idx-1; +++ } +++ } +++ assert( lwr==upr+1 ); +++ assert( pPage->isInit ); +++ if( lwr>=pPage->nCell ){ +++ chldPg = pPage->u.hdr.rightChild; +++ }else{ +++ chldPg = pPage->apCell[lwr]->h.leftChild; +++ } +++ if( chldPg==0 ){ +++ pCur->iMatch = c; +++ if( pRes ) *pRes = c; +++ return SQLITE_OK; +++ } +++ pCur->idx = lwr; +++ rc = moveToChild(pCur, chldPg); +++ if( rc ) return rc; +++ } +++ /* NOT REACHED */ +++} +++ +++/* +++** Advance the cursor to the next entry in the database. If +++** successful then set *pRes=0. If the cursor +++** was already pointing to the last entry in the database before +++** this routine was called, then set *pRes=1. +++*/ +++static int fileBtreeNext(BtCursor *pCur, int *pRes){ +++ int rc; +++ MemPage *pPage = pCur->pPage; +++ assert( pRes!=0 ); +++ if( pPage==0 ){ +++ *pRes = 1; +++ return SQLITE_ABORT; +++ } +++ assert( pPage->isInit ); +++ assert( pCur->eSkip!=SKIP_INVALID ); +++ if( pPage->nCell==0 ){ +++ *pRes = 1; +++ return SQLITE_OK; +++ } +++ assert( pCur->idxnCell ); +++ if( pCur->eSkip==SKIP_NEXT ){ +++ pCur->eSkip = SKIP_NONE; +++ *pRes = 0; +++ return SQLITE_OK; +++ } +++ pCur->eSkip = SKIP_NONE; +++ pCur->idx++; +++ if( pCur->idx>=pPage->nCell ){ +++ if( pPage->u.hdr.rightChild ){ +++ rc = moveToChild(pCur, pPage->u.hdr.rightChild); +++ if( rc ) return rc; +++ rc = moveToLeftmost(pCur); +++ *pRes = 0; +++ return rc; +++ } +++ do{ +++ if( pPage->pParent==0 ){ +++ *pRes = 1; +++ return SQLITE_OK; +++ } +++ moveToParent(pCur); +++ pPage = pCur->pPage; +++ }while( pCur->idx>=pPage->nCell ); +++ *pRes = 0; +++ return SQLITE_OK; +++ } +++ *pRes = 0; +++ if( pPage->u.hdr.rightChild==0 ){ +++ return SQLITE_OK; +++ } +++ rc = moveToLeftmost(pCur); +++ return rc; +++} +++ +++/* +++** Step the cursor to the back to the previous entry in the database. If +++** successful then set *pRes=0. If the cursor +++** was already pointing to the first entry in the database before +++** this routine was called, then set *pRes=1. +++*/ +++static int fileBtreePrevious(BtCursor *pCur, int *pRes){ +++ int rc; +++ Pgno pgno; +++ MemPage *pPage; +++ pPage = pCur->pPage; +++ if( pPage==0 ){ +++ *pRes = 1; +++ return SQLITE_ABORT; +++ } +++ assert( pPage->isInit ); +++ assert( pCur->eSkip!=SKIP_INVALID ); +++ if( pPage->nCell==0 ){ +++ *pRes = 1; +++ return SQLITE_OK; +++ } +++ if( pCur->eSkip==SKIP_PREV ){ +++ pCur->eSkip = SKIP_NONE; +++ *pRes = 0; +++ return SQLITE_OK; +++ } +++ pCur->eSkip = SKIP_NONE; +++ assert( pCur->idx>=0 ); +++ if( (pgno = pPage->apCell[pCur->idx]->h.leftChild)!=0 ){ +++ rc = moveToChild(pCur, pgno); +++ if( rc ) return rc; +++ rc = moveToRightmost(pCur); +++ }else{ +++ while( pCur->idx==0 ){ +++ if( pPage->pParent==0 ){ +++ if( pRes ) *pRes = 1; +++ return SQLITE_OK; +++ } +++ moveToParent(pCur); +++ pPage = pCur->pPage; +++ } +++ pCur->idx--; +++ rc = SQLITE_OK; +++ } +++ *pRes = 0; +++ return rc; +++} +++ +++/* +++** Allocate a new page from the database file. +++** +++** The new page is marked as dirty. (In other words, sqlitepager_write() +++** has already been called on the new page.) The new page has also +++** been referenced and the calling routine is responsible for calling +++** sqlitepager_unref() on the new page when it is done. +++** +++** SQLITE_OK is returned on success. Any other return value indicates +++** an error. *ppPage and *pPgno are undefined in the event of an error. +++** Do not invoke sqlitepager_unref() on *ppPage if an error is returned. +++** +++** If the "nearby" parameter is not 0, then a (feeble) effort is made to +++** locate a page close to the page number "nearby". This can be used in an +++** attempt to keep related pages close to each other in the database file, +++** which in turn can make database access faster. +++*/ +++static int allocatePage(Btree *pBt, MemPage **ppPage, Pgno *pPgno, Pgno nearby){ +++ PageOne *pPage1 = pBt->page1; +++ int rc; +++ if( pPage1->freeList ){ +++ OverflowPage *pOvfl; +++ FreelistInfo *pInfo; +++ +++ rc = sqlitepager_write(pPage1); +++ if( rc ) return rc; +++ SWAB_ADD(pBt, pPage1->nFree, -1); +++ rc = sqlitepager_get(pBt->pPager, SWAB32(pBt, pPage1->freeList), +++ (void**)&pOvfl); +++ if( rc ) return rc; +++ rc = sqlitepager_write(pOvfl); +++ if( rc ){ +++ sqlitepager_unref(pOvfl); +++ return rc; +++ } +++ pInfo = (FreelistInfo*)pOvfl->aPayload; +++ if( pInfo->nFree==0 ){ +++ *pPgno = SWAB32(pBt, pPage1->freeList); +++ pPage1->freeList = pOvfl->iNext; +++ *ppPage = (MemPage*)pOvfl; +++ }else{ +++ int closest, n; +++ n = SWAB32(pBt, pInfo->nFree); +++ if( n>1 && nearby>0 ){ +++ int i, dist; +++ closest = 0; +++ dist = SWAB32(pBt, pInfo->aFree[0]) - nearby; +++ if( dist<0 ) dist = -dist; +++ for(i=1; iaFree[i]) - nearby; +++ if( d2<0 ) d2 = -d2; +++ if( d2nFree, -1); +++ *pPgno = SWAB32(pBt, pInfo->aFree[closest]); +++ pInfo->aFree[closest] = pInfo->aFree[n-1]; +++ rc = sqlitepager_get(pBt->pPager, *pPgno, (void**)ppPage); +++ sqlitepager_unref(pOvfl); +++ if( rc==SQLITE_OK ){ +++ sqlitepager_dont_rollback(*ppPage); +++ rc = sqlitepager_write(*ppPage); +++ } +++ } +++ }else{ +++ *pPgno = sqlitepager_pagecount(pBt->pPager) + 1; +++ rc = sqlitepager_get(pBt->pPager, *pPgno, (void**)ppPage); +++ if( rc ) return rc; +++ rc = sqlitepager_write(*ppPage); +++ } +++ return rc; +++} +++ +++/* +++** Add a page of the database file to the freelist. Either pgno or +++** pPage but not both may be 0. +++** +++** sqlitepager_unref() is NOT called for pPage. +++*/ +++static int freePage(Btree *pBt, void *pPage, Pgno pgno){ +++ PageOne *pPage1 = pBt->page1; +++ OverflowPage *pOvfl = (OverflowPage*)pPage; +++ int rc; +++ int needUnref = 0; +++ MemPage *pMemPage; +++ +++ if( pgno==0 ){ +++ assert( pOvfl!=0 ); +++ pgno = sqlitepager_pagenumber(pOvfl); +++ } +++ assert( pgno>2 ); +++ assert( sqlitepager_pagenumber(pOvfl)==pgno ); +++ pMemPage = (MemPage*)pPage; +++ pMemPage->isInit = 0; +++ if( pMemPage->pParent ){ +++ sqlitepager_unref(pMemPage->pParent); +++ pMemPage->pParent = 0; +++ } +++ rc = sqlitepager_write(pPage1); +++ if( rc ){ +++ return rc; +++ } +++ SWAB_ADD(pBt, pPage1->nFree, 1); +++ if( pPage1->nFree!=0 && pPage1->freeList!=0 ){ +++ OverflowPage *pFreeIdx; +++ rc = sqlitepager_get(pBt->pPager, SWAB32(pBt, pPage1->freeList), +++ (void**)&pFreeIdx); +++ if( rc==SQLITE_OK ){ +++ FreelistInfo *pInfo = (FreelistInfo*)pFreeIdx->aPayload; +++ int n = SWAB32(pBt, pInfo->nFree); +++ if( n<(sizeof(pInfo->aFree)/sizeof(pInfo->aFree[0])) ){ +++ rc = sqlitepager_write(pFreeIdx); +++ if( rc==SQLITE_OK ){ +++ pInfo->aFree[n] = SWAB32(pBt, pgno); +++ SWAB_ADD(pBt, pInfo->nFree, 1); +++ sqlitepager_unref(pFreeIdx); +++ sqlitepager_dont_write(pBt->pPager, pgno); +++ return rc; +++ } +++ } +++ sqlitepager_unref(pFreeIdx); +++ } +++ } +++ if( pOvfl==0 ){ +++ assert( pgno>0 ); +++ rc = sqlitepager_get(pBt->pPager, pgno, (void**)&pOvfl); +++ if( rc ) return rc; +++ needUnref = 1; +++ } +++ rc = sqlitepager_write(pOvfl); +++ if( rc ){ +++ if( needUnref ) sqlitepager_unref(pOvfl); +++ return rc; +++ } +++ pOvfl->iNext = pPage1->freeList; +++ pPage1->freeList = SWAB32(pBt, pgno); +++ memset(pOvfl->aPayload, 0, OVERFLOW_SIZE); +++ if( needUnref ) rc = sqlitepager_unref(pOvfl); +++ return rc; +++} +++ +++/* +++** Erase all the data out of a cell. This involves returning overflow +++** pages back the freelist. +++*/ +++static int clearCell(Btree *pBt, Cell *pCell){ +++ Pager *pPager = pBt->pPager; +++ OverflowPage *pOvfl; +++ Pgno ovfl, nextOvfl; +++ int rc; +++ +++ if( NKEY(pBt, pCell->h) + NDATA(pBt, pCell->h) <= MX_LOCAL_PAYLOAD ){ +++ return SQLITE_OK; +++ } +++ ovfl = SWAB32(pBt, pCell->ovfl); +++ pCell->ovfl = 0; +++ while( ovfl ){ +++ rc = sqlitepager_get(pPager, ovfl, (void**)&pOvfl); +++ if( rc ) return rc; +++ nextOvfl = SWAB32(pBt, pOvfl->iNext); +++ rc = freePage(pBt, pOvfl, ovfl); +++ if( rc ) return rc; +++ sqlitepager_unref(pOvfl); +++ ovfl = nextOvfl; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Create a new cell from key and data. Overflow pages are allocated as +++** necessary and linked to this cell. +++*/ +++static int fillInCell( +++ Btree *pBt, /* The whole Btree. Needed to allocate pages */ +++ Cell *pCell, /* Populate this Cell structure */ +++ const void *pKey, int nKey, /* The key */ +++ const void *pData,int nData /* The data */ +++){ +++ OverflowPage *pOvfl, *pPrior; +++ Pgno *pNext; +++ int spaceLeft; +++ int n, rc; +++ int nPayload; +++ const char *pPayload; +++ char *pSpace; +++ Pgno nearby = 0; +++ +++ pCell->h.leftChild = 0; +++ pCell->h.nKey = SWAB16(pBt, nKey & 0xffff); +++ pCell->h.nKeyHi = nKey >> 16; +++ pCell->h.nData = SWAB16(pBt, nData & 0xffff); +++ pCell->h.nDataHi = nData >> 16; +++ pCell->h.iNext = 0; +++ +++ pNext = &pCell->ovfl; +++ pSpace = pCell->aPayload; +++ spaceLeft = MX_LOCAL_PAYLOAD; +++ pPayload = pKey; +++ pKey = 0; +++ nPayload = nKey; +++ pPrior = 0; +++ while( nPayload>0 ){ +++ if( spaceLeft==0 ){ +++ rc = allocatePage(pBt, (MemPage**)&pOvfl, pNext, nearby); +++ if( rc ){ +++ *pNext = 0; +++ }else{ +++ nearby = *pNext; +++ } +++ if( pPrior ) sqlitepager_unref(pPrior); +++ if( rc ){ +++ clearCell(pBt, pCell); +++ return rc; +++ } +++ if( pBt->needSwab ) *pNext = swab32(*pNext); +++ pPrior = pOvfl; +++ spaceLeft = OVERFLOW_SIZE; +++ pSpace = pOvfl->aPayload; +++ pNext = &pOvfl->iNext; +++ } +++ n = nPayload; +++ if( n>spaceLeft ) n = spaceLeft; +++ memcpy(pSpace, pPayload, n); +++ nPayload -= n; +++ if( nPayload==0 && pData ){ +++ pPayload = pData; +++ nPayload = nData; +++ pData = 0; +++ }else{ +++ pPayload += n; +++ } +++ spaceLeft -= n; +++ pSpace += n; +++ } +++ *pNext = 0; +++ if( pPrior ){ +++ sqlitepager_unref(pPrior); +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Change the MemPage.pParent pointer on the page whose number is +++** given in the second argument so that MemPage.pParent holds the +++** pointer in the third argument. +++*/ +++static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){ +++ MemPage *pThis; +++ +++ if( pgno==0 ) return; +++ assert( pPager!=0 ); +++ pThis = sqlitepager_lookup(pPager, pgno); +++ if( pThis && pThis->isInit ){ +++ if( pThis->pParent!=pNewParent ){ +++ if( pThis->pParent ) sqlitepager_unref(pThis->pParent); +++ pThis->pParent = pNewParent; +++ if( pNewParent ) sqlitepager_ref(pNewParent); +++ } +++ pThis->idxParent = idx; +++ sqlitepager_unref(pThis); +++ } +++} +++ +++/* +++** Reparent all children of the given page to be the given page. +++** In other words, for every child of pPage, invoke reparentPage() +++** to make sure that each child knows that pPage is its parent. +++** +++** This routine gets called after you memcpy() one page into +++** another. +++*/ +++static void reparentChildPages(Btree *pBt, MemPage *pPage){ +++ int i; +++ Pager *pPager = pBt->pPager; +++ for(i=0; inCell; i++){ +++ reparentPage(pPager, SWAB32(pBt, pPage->apCell[i]->h.leftChild), pPage, i); +++ } +++ reparentPage(pPager, SWAB32(pBt, pPage->u.hdr.rightChild), pPage, i); +++ pPage->idxShift = 0; +++} +++ +++/* +++** Remove the i-th cell from pPage. This routine effects pPage only. +++** The cell content is not freed or deallocated. It is assumed that +++** the cell content has been copied someplace else. This routine just +++** removes the reference to the cell from pPage. +++** +++** "sz" must be the number of bytes in the cell. +++** +++** Do not bother maintaining the integrity of the linked list of Cells. +++** Only the pPage->apCell[] array is important. The relinkCellList() +++** routine will be called soon after this routine in order to rebuild +++** the linked list. +++*/ +++static void dropCell(Btree *pBt, MemPage *pPage, int idx, int sz){ +++ int j; +++ assert( idx>=0 && idxnCell ); +++ assert( sz==cellSize(pBt, pPage->apCell[idx]) ); +++ assert( sqlitepager_iswriteable(pPage) ); +++ freeSpace(pBt, pPage, Addr(pPage->apCell[idx]) - Addr(pPage), sz); +++ for(j=idx; jnCell-1; j++){ +++ pPage->apCell[j] = pPage->apCell[j+1]; +++ } +++ pPage->nCell--; +++ pPage->idxShift = 1; +++} +++ +++/* +++** Insert a new cell on pPage at cell index "i". pCell points to the +++** content of the cell. +++** +++** If the cell content will fit on the page, then put it there. If it +++** will not fit, then just make pPage->apCell[i] point to the content +++** and set pPage->isOverfull. +++** +++** Do not bother maintaining the integrity of the linked list of Cells. +++** Only the pPage->apCell[] array is important. The relinkCellList() +++** routine will be called soon after this routine in order to rebuild +++** the linked list. +++*/ +++static void insertCell(Btree *pBt, MemPage *pPage, int i, Cell *pCell, int sz){ +++ int idx, j; +++ assert( i>=0 && i<=pPage->nCell ); +++ assert( sz==cellSize(pBt, pCell) ); +++ assert( sqlitepager_iswriteable(pPage) ); +++ idx = allocateSpace(pBt, pPage, sz); +++ for(j=pPage->nCell; j>i; j--){ +++ pPage->apCell[j] = pPage->apCell[j-1]; +++ } +++ pPage->nCell++; +++ if( idx<=0 ){ +++ pPage->isOverfull = 1; +++ pPage->apCell[i] = pCell; +++ }else{ +++ memcpy(&pPage->u.aDisk[idx], pCell, sz); +++ pPage->apCell[i] = (Cell*)&pPage->u.aDisk[idx]; +++ } +++ pPage->idxShift = 1; +++} +++ +++/* +++** Rebuild the linked list of cells on a page so that the cells +++** occur in the order specified by the pPage->apCell[] array. +++** Invoke this routine once to repair damage after one or more +++** invocations of either insertCell() or dropCell(). +++*/ +++static void relinkCellList(Btree *pBt, MemPage *pPage){ +++ int i; +++ u16 *pIdx; +++ assert( sqlitepager_iswriteable(pPage) ); +++ pIdx = &pPage->u.hdr.firstCell; +++ for(i=0; inCell; i++){ +++ int idx = Addr(pPage->apCell[i]) - Addr(pPage); +++ assert( idx>0 && idxapCell[i]->h.iNext; +++ } +++ *pIdx = 0; +++} +++ +++/* +++** Make a copy of the contents of pFrom into pTo. The pFrom->apCell[] +++** pointers that point into pFrom->u.aDisk[] must be adjusted to point +++** into pTo->u.aDisk[] instead. But some pFrom->apCell[] entries might +++** not point to pFrom->u.aDisk[]. Those are unchanged. +++*/ +++static void copyPage(MemPage *pTo, MemPage *pFrom){ +++ uptr from, to; +++ int i; +++ memcpy(pTo->u.aDisk, pFrom->u.aDisk, SQLITE_USABLE_SIZE); +++ pTo->pParent = 0; +++ pTo->isInit = 1; +++ pTo->nCell = pFrom->nCell; +++ pTo->nFree = pFrom->nFree; +++ pTo->isOverfull = pFrom->isOverfull; +++ to = Addr(pTo); +++ from = Addr(pFrom); +++ for(i=0; inCell; i++){ +++ uptr x = Addr(pFrom->apCell[i]); +++ if( x>from && xapCell[i]) = x + to - from; +++ }else{ +++ pTo->apCell[i] = pFrom->apCell[i]; +++ } +++ } +++} +++ +++/* +++** The following parameters determine how many adjacent pages get involved +++** in a balancing operation. NN is the number of neighbors on either side +++** of the page that participate in the balancing operation. NB is the +++** total number of pages that participate, including the target page and +++** NN neighbors on either side. +++** +++** The minimum value of NN is 1 (of course). Increasing NN above 1 +++** (to 2 or 3) gives a modest improvement in SELECT and DELETE performance +++** in exchange for a larger degradation in INSERT and UPDATE performance. +++** The value of NN appears to give the best results overall. +++*/ +++#define NN 1 /* Number of neighbors on either side of pPage */ +++#define NB (NN*2+1) /* Total pages involved in the balance */ +++ +++/* +++** This routine redistributes Cells on pPage and up to two siblings +++** of pPage so that all pages have about the same amount of free space. +++** Usually one sibling on either side of pPage is used in the balancing, +++** though both siblings might come from one side if pPage is the first +++** or last child of its parent. If pPage has fewer than two siblings +++** (something which can only happen if pPage is the root page or a +++** child of root) then all available siblings participate in the balancing. +++** +++** The number of siblings of pPage might be increased or decreased by +++** one in an effort to keep pages between 66% and 100% full. The root page +++** is special and is allowed to be less than 66% full. If pPage is +++** the root page, then the depth of the tree might be increased +++** or decreased by one, as necessary, to keep the root page from being +++** overfull or empty. +++** +++** This routine calls relinkCellList() on its input page regardless of +++** whether or not it does any real balancing. Client routines will typically +++** invoke insertCell() or dropCell() before calling this routine, so we +++** need to call relinkCellList() to clean up the mess that those other +++** routines left behind. +++** +++** pCur is left pointing to the same cell as when this routine was called +++** even if that cell gets moved to a different page. pCur may be NULL. +++** Set the pCur parameter to NULL if you do not care about keeping track +++** of a cell as that will save this routine the work of keeping track of it. +++** +++** Note that when this routine is called, some of the Cells on pPage +++** might not actually be stored in pPage->u.aDisk[]. This can happen +++** if the page is overfull. Part of the job of this routine is to +++** make sure all Cells for pPage once again fit in pPage->u.aDisk[]. +++** +++** In the course of balancing the siblings of pPage, the parent of pPage +++** might become overfull or underfull. If that happens, then this routine +++** is called recursively on the parent. +++** +++** If this routine fails for any reason, it might leave the database +++** in a corrupted state. So if this routine fails, the database should +++** be rolled back. +++*/ +++static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ +++ MemPage *pParent; /* The parent of pPage */ +++ int nCell; /* Number of cells in apCell[] */ +++ int nOld; /* Number of pages in apOld[] */ +++ int nNew; /* Number of pages in apNew[] */ +++ int nDiv; /* Number of cells in apDiv[] */ +++ int i, j, k; /* Loop counters */ +++ int idx; /* Index of pPage in pParent->apCell[] */ +++ int nxDiv; /* Next divider slot in pParent->apCell[] */ +++ int rc; /* The return code */ +++ int iCur; /* apCell[iCur] is the cell of the cursor */ +++ MemPage *pOldCurPage; /* The cursor originally points to this page */ +++ int subtotal; /* Subtotal of bytes in cells on one page */ +++ MemPage *extraUnref = 0; /* A page that needs to be unref-ed */ +++ MemPage *apOld[NB]; /* pPage and up to two siblings */ +++ Pgno pgnoOld[NB]; /* Page numbers for each page in apOld[] */ +++ MemPage *apNew[NB+1]; /* pPage and up to NB siblings after balancing */ +++ Pgno pgnoNew[NB+1]; /* Page numbers for each page in apNew[] */ +++ int idxDiv[NB]; /* Indices of divider cells in pParent */ +++ Cell *apDiv[NB]; /* Divider cells in pParent */ +++ Cell aTemp[NB]; /* Temporary holding area for apDiv[] */ +++ int cntNew[NB+1]; /* Index in apCell[] of cell after i-th page */ +++ int szNew[NB+1]; /* Combined size of cells place on i-th page */ +++ MemPage aOld[NB]; /* Temporary copies of pPage and its siblings */ +++ Cell *apCell[(MX_CELL+2)*NB]; /* All cells from pages being balanced */ +++ int szCell[(MX_CELL+2)*NB]; /* Local size of all cells */ +++ +++ /* +++ ** Return without doing any work if pPage is neither overfull nor +++ ** underfull. +++ */ +++ assert( sqlitepager_iswriteable(pPage) ); +++ if( !pPage->isOverfull && pPage->nFreenCell>=2){ +++ relinkCellList(pBt, pPage); +++ return SQLITE_OK; +++ } +++ +++ /* +++ ** Find the parent of the page to be balanceed. +++ ** If there is no parent, it means this page is the root page and +++ ** special rules apply. +++ */ +++ pParent = pPage->pParent; +++ if( pParent==0 ){ +++ Pgno pgnoChild; +++ MemPage *pChild; +++ assert( pPage->isInit ); +++ if( pPage->nCell==0 ){ +++ if( pPage->u.hdr.rightChild ){ +++ /* +++ ** The root page is empty. Copy the one child page +++ ** into the root page and return. This reduces the depth +++ ** of the BTree by one. +++ */ +++ pgnoChild = SWAB32(pBt, pPage->u.hdr.rightChild); +++ rc = sqlitepager_get(pBt->pPager, pgnoChild, (void**)&pChild); +++ if( rc ) return rc; +++ memcpy(pPage, pChild, SQLITE_USABLE_SIZE); +++ pPage->isInit = 0; +++ rc = initPage(pBt, pPage, sqlitepager_pagenumber(pPage), 0); +++ assert( rc==SQLITE_OK ); +++ reparentChildPages(pBt, pPage); +++ if( pCur && pCur->pPage==pChild ){ +++ sqlitepager_unref(pChild); +++ pCur->pPage = pPage; +++ sqlitepager_ref(pPage); +++ } +++ freePage(pBt, pChild, pgnoChild); +++ sqlitepager_unref(pChild); +++ }else{ +++ relinkCellList(pBt, pPage); +++ } +++ return SQLITE_OK; +++ } +++ if( !pPage->isOverfull ){ +++ /* It is OK for the root page to be less than half full. +++ */ +++ relinkCellList(pBt, pPage); +++ return SQLITE_OK; +++ } +++ /* +++ ** If we get to here, it means the root page is overfull. +++ ** When this happens, Create a new child page and copy the +++ ** contents of the root into the child. Then make the root +++ ** page an empty page with rightChild pointing to the new +++ ** child. Then fall thru to the code below which will cause +++ ** the overfull child page to be split. +++ */ +++ rc = sqlitepager_write(pPage); +++ if( rc ) return rc; +++ rc = allocatePage(pBt, &pChild, &pgnoChild, sqlitepager_pagenumber(pPage)); +++ if( rc ) return rc; +++ assert( sqlitepager_iswriteable(pChild) ); +++ copyPage(pChild, pPage); +++ pChild->pParent = pPage; +++ pChild->idxParent = 0; +++ sqlitepager_ref(pPage); +++ pChild->isOverfull = 1; +++ if( pCur && pCur->pPage==pPage ){ +++ sqlitepager_unref(pPage); +++ pCur->pPage = pChild; +++ }else{ +++ extraUnref = pChild; +++ } +++ zeroPage(pBt, pPage); +++ pPage->u.hdr.rightChild = SWAB32(pBt, pgnoChild); +++ pParent = pPage; +++ pPage = pChild; +++ } +++ rc = sqlitepager_write(pParent); +++ if( rc ) return rc; +++ assert( pParent->isInit ); +++ +++ /* +++ ** Find the Cell in the parent page whose h.leftChild points back +++ ** to pPage. The "idx" variable is the index of that cell. If pPage +++ ** is the rightmost child of pParent then set idx to pParent->nCell +++ */ +++ if( pParent->idxShift ){ +++ Pgno pgno, swabPgno; +++ pgno = sqlitepager_pagenumber(pPage); +++ swabPgno = SWAB32(pBt, pgno); +++ for(idx=0; idxnCell; idx++){ +++ if( pParent->apCell[idx]->h.leftChild==swabPgno ){ +++ break; +++ } +++ } +++ assert( idxnCell || pParent->u.hdr.rightChild==swabPgno ); +++ }else{ +++ idx = pPage->idxParent; +++ } +++ +++ /* +++ ** Initialize variables so that it will be safe to jump +++ ** directly to balance_cleanup at any moment. +++ */ +++ nOld = nNew = 0; +++ sqlitepager_ref(pParent); +++ +++ /* +++ ** Find sibling pages to pPage and the Cells in pParent that divide +++ ** the siblings. An attempt is made to find NN siblings on either +++ ** side of pPage. More siblings are taken from one side, however, if +++ ** pPage there are fewer than NN siblings on the other side. If pParent +++ ** has NB or fewer children then all children of pParent are taken. +++ */ +++ nxDiv = idx - NN; +++ if( nxDiv + NB > pParent->nCell ){ +++ nxDiv = pParent->nCell - NB + 1; +++ } +++ if( nxDiv<0 ){ +++ nxDiv = 0; +++ } +++ nDiv = 0; +++ for(i=0, k=nxDiv; inCell ){ +++ idxDiv[i] = k; +++ apDiv[i] = pParent->apCell[k]; +++ nDiv++; +++ pgnoOld[i] = SWAB32(pBt, apDiv[i]->h.leftChild); +++ }else if( k==pParent->nCell ){ +++ pgnoOld[i] = SWAB32(pBt, pParent->u.hdr.rightChild); +++ }else{ +++ break; +++ } +++ rc = sqlitepager_get(pBt->pPager, pgnoOld[i], (void**)&apOld[i]); +++ if( rc ) goto balance_cleanup; +++ rc = initPage(pBt, apOld[i], pgnoOld[i], pParent); +++ if( rc ) goto balance_cleanup; +++ apOld[i]->idxParent = k; +++ nOld++; +++ } +++ +++ /* +++ ** Set iCur to be the index in apCell[] of the cell that the cursor +++ ** is pointing to. We will need this later on in order to keep the +++ ** cursor pointing at the same cell. If pCur points to a page that +++ ** has no involvement with this rebalancing, then set iCur to a large +++ ** number so that the iCur==j tests always fail in the main cell +++ ** distribution loop below. +++ */ +++ if( pCur ){ +++ iCur = 0; +++ for(i=0; ipPage==apOld[i] ){ +++ iCur += pCur->idx; +++ break; +++ } +++ iCur += apOld[i]->nCell; +++ if( ipPage==pParent && pCur->idx==idxDiv[i] ){ +++ break; +++ } +++ iCur++; +++ } +++ pOldCurPage = pCur->pPage; +++ } +++ +++ /* +++ ** Make copies of the content of pPage and its siblings into aOld[]. +++ ** The rest of this function will use data from the copies rather +++ ** that the original pages since the original pages will be in the +++ ** process of being overwritten. +++ */ +++ for(i=0; inCell; j++){ +++ apCell[nCell] = pOld->apCell[j]; +++ szCell[nCell] = cellSize(pBt, apCell[nCell]); +++ nCell++; +++ } +++ if( ih.leftChild)==pgnoOld[i] ); +++ apCell[nCell]->h.leftChild = pOld->u.hdr.rightChild; +++ nCell++; +++ } +++ } +++ +++ /* +++ ** Figure out the number of pages needed to hold all nCell cells. +++ ** Store this number in "k". Also compute szNew[] which is the total +++ ** size of all cells on the i-th page and cntNew[] which is the index +++ ** in apCell[] of the cell that divides path i from path i+1. +++ ** cntNew[k] should equal nCell. +++ ** +++ ** This little patch of code is critical for keeping the tree +++ ** balanced. +++ */ +++ for(subtotal=k=i=0; i USABLE_SPACE ){ +++ szNew[k] = subtotal - szCell[i]; +++ cntNew[k] = i; +++ subtotal = 0; +++ k++; +++ } +++ } +++ szNew[k] = subtotal; +++ cntNew[k] = nCell; +++ k++; +++ for(i=k-1; i>0; i--){ +++ while( szNew[i]0 ); +++ szNew[i] += szCell[cntNew[i-1]]; +++ szNew[i-1] -= szCell[cntNew[i-1]-1]; +++ } +++ } +++ assert( cntNew[0]>0 ); +++ +++ /* +++ ** Allocate k new pages. Reuse old pages where possible. +++ */ +++ for(i=0; iisInit = 1; +++ } +++ +++ /* Free any old pages that were not reused as new pages. +++ */ +++ while( ii ){ +++ int t; +++ MemPage *pT; +++ t = pgnoNew[i]; +++ pT = apNew[i]; +++ pgnoNew[i] = pgnoNew[minI]; +++ apNew[i] = apNew[minI]; +++ pgnoNew[minI] = t; +++ apNew[minI] = pT; +++ } +++ } +++ +++ /* +++ ** Evenly distribute the data in apCell[] across the new pages. +++ ** Insert divider cells into pParent as necessary. +++ */ +++ j = 0; +++ for(i=0; inFree>=szCell[j] ); +++ if( pCur && iCur==j ){ pCur->pPage = pNew; pCur->idx = pNew->nCell; } +++ insertCell(pBt, pNew, pNew->nCell, apCell[j], szCell[j]); +++ j++; +++ } +++ assert( pNew->nCell>0 ); +++ assert( !pNew->isOverfull ); +++ relinkCellList(pBt, pNew); +++ if( iu.hdr.rightChild = apCell[j]->h.leftChild; +++ apCell[j]->h.leftChild = SWAB32(pBt, pgnoNew[i]); +++ if( pCur && iCur==j ){ pCur->pPage = pParent; pCur->idx = nxDiv; } +++ insertCell(pBt, pParent, nxDiv, apCell[j], szCell[j]); +++ j++; +++ nxDiv++; +++ } +++ } +++ assert( j==nCell ); +++ apNew[nNew-1]->u.hdr.rightChild = aOld[nOld-1].u.hdr.rightChild; +++ if( nxDiv==pParent->nCell ){ +++ pParent->u.hdr.rightChild = SWAB32(pBt, pgnoNew[nNew-1]); +++ }else{ +++ pParent->apCell[nxDiv]->h.leftChild = SWAB32(pBt, pgnoNew[nNew-1]); +++ } +++ if( pCur ){ +++ if( j<=iCur && pCur->pPage==pParent && pCur->idx>idxDiv[nOld-1] ){ +++ assert( pCur->pPage==pOldCurPage ); +++ pCur->idx += nNew - nOld; +++ }else{ +++ assert( pOldCurPage!=0 ); +++ sqlitepager_ref(pCur->pPage); +++ sqlitepager_unref(pOldCurPage); +++ } +++ } +++ +++ /* +++ ** Reparent children of all cells. +++ */ +++ for(i=0; ipPage==0 ){ +++ pCur->pPage = pParent; +++ pCur->idx = 0; +++ }else{ +++ sqlitepager_unref(pParent); +++ } +++ return rc; +++} +++ +++/* +++** This routine checks all cursors that point to the same table +++** as pCur points to. If any of those cursors were opened with +++** wrFlag==0 then this routine returns SQLITE_LOCKED. If all +++** cursors point to the same table were opened with wrFlag==1 +++** then this routine returns SQLITE_OK. +++** +++** In addition to checking for read-locks (where a read-lock +++** means a cursor opened with wrFlag==0) this routine also moves +++** all cursors other than pCur so that they are pointing to the +++** first Cell on root page. This is necessary because an insert +++** or delete might change the number of cells on a page or delete +++** a page entirely and we do not want to leave any cursors +++** pointing to non-existant pages or cells. +++*/ +++static int checkReadLocks(BtCursor *pCur){ +++ BtCursor *p; +++ assert( pCur->wrFlag ); +++ for(p=pCur->pShared; p!=pCur; p=p->pShared){ +++ assert( p ); +++ assert( p->pgnoRoot==pCur->pgnoRoot ); +++ if( p->wrFlag==0 ) return SQLITE_LOCKED; +++ if( sqlitepager_pagenumber(p->pPage)!=p->pgnoRoot ){ +++ moveToRoot(p); +++ } +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Insert a new record into the BTree. The key is given by (pKey,nKey) +++** and the data is given by (pData,nData). The cursor is used only to +++** define what database the record should be inserted into. The cursor +++** is left pointing at the new record. +++*/ +++static int fileBtreeInsert( +++ BtCursor *pCur, /* Insert data into the table of this cursor */ +++ const void *pKey, int nKey, /* The key of the new record */ +++ const void *pData, int nData /* The data of the new record */ +++){ +++ Cell newCell; +++ int rc; +++ int loc; +++ int szNew; +++ MemPage *pPage; +++ Btree *pBt = pCur->pBt; +++ +++ if( pCur->pPage==0 ){ +++ return SQLITE_ABORT; /* A rollback destroyed this cursor */ +++ } +++ if( !pBt->inTrans || nKey+nData==0 ){ +++ /* Must start a transaction before doing an insert */ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ assert( !pBt->readOnly ); +++ if( !pCur->wrFlag ){ +++ return SQLITE_PERM; /* Cursor not open for writing */ +++ } +++ if( checkReadLocks(pCur) ){ +++ return SQLITE_LOCKED; /* The table pCur points to has a read lock */ +++ } +++ rc = fileBtreeMoveto(pCur, pKey, nKey, &loc); +++ if( rc ) return rc; +++ pPage = pCur->pPage; +++ assert( pPage->isInit ); +++ rc = sqlitepager_write(pPage); +++ if( rc ) return rc; +++ rc = fillInCell(pBt, &newCell, pKey, nKey, pData, nData); +++ if( rc ) return rc; +++ szNew = cellSize(pBt, &newCell); +++ if( loc==0 ){ +++ newCell.h.leftChild = pPage->apCell[pCur->idx]->h.leftChild; +++ rc = clearCell(pBt, pPage->apCell[pCur->idx]); +++ if( rc ) return rc; +++ dropCell(pBt, pPage, pCur->idx, cellSize(pBt, pPage->apCell[pCur->idx])); +++ }else if( loc<0 && pPage->nCell>0 ){ +++ assert( pPage->u.hdr.rightChild==0 ); /* Must be a leaf page */ +++ pCur->idx++; +++ }else{ +++ assert( pPage->u.hdr.rightChild==0 ); /* Must be a leaf page */ +++ } +++ insertCell(pBt, pPage, pCur->idx, &newCell, szNew); +++ rc = balance(pCur->pBt, pPage, pCur); +++ /* sqliteBtreePageDump(pCur->pBt, pCur->pgnoRoot, 1); */ +++ /* fflush(stdout); */ +++ pCur->eSkip = SKIP_INVALID; +++ return rc; +++} +++ +++/* +++** Delete the entry that the cursor is pointing to. +++** +++** The cursor is left pointing at either the next or the previous +++** entry. If the cursor is left pointing to the next entry, then +++** the pCur->eSkip flag is set to SKIP_NEXT which forces the next call to +++** sqliteBtreeNext() to be a no-op. That way, you can always call +++** sqliteBtreeNext() after a delete and the cursor will be left +++** pointing to the first entry after the deleted entry. Similarly, +++** pCur->eSkip is set to SKIP_PREV is the cursor is left pointing to +++** the entry prior to the deleted entry so that a subsequent call to +++** sqliteBtreePrevious() will always leave the cursor pointing at the +++** entry immediately before the one that was deleted. +++*/ +++static int fileBtreeDelete(BtCursor *pCur){ +++ MemPage *pPage = pCur->pPage; +++ Cell *pCell; +++ int rc; +++ Pgno pgnoChild; +++ Btree *pBt = pCur->pBt; +++ +++ assert( pPage->isInit ); +++ if( pCur->pPage==0 ){ +++ return SQLITE_ABORT; /* A rollback destroyed this cursor */ +++ } +++ if( !pBt->inTrans ){ +++ /* Must start a transaction before doing a delete */ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ assert( !pBt->readOnly ); +++ if( pCur->idx >= pPage->nCell ){ +++ return SQLITE_ERROR; /* The cursor is not pointing to anything */ +++ } +++ if( !pCur->wrFlag ){ +++ return SQLITE_PERM; /* Did not open this cursor for writing */ +++ } +++ if( checkReadLocks(pCur) ){ +++ return SQLITE_LOCKED; /* The table pCur points to has a read lock */ +++ } +++ rc = sqlitepager_write(pPage); +++ if( rc ) return rc; +++ pCell = pPage->apCell[pCur->idx]; +++ pgnoChild = SWAB32(pBt, pCell->h.leftChild); +++ clearCell(pBt, pCell); +++ if( pgnoChild ){ +++ /* +++ ** The entry we are about to delete is not a leaf so if we do not +++ ** do something we will leave a hole on an internal page. +++ ** We have to fill the hole by moving in a cell from a leaf. The +++ ** next Cell after the one to be deleted is guaranteed to exist and +++ ** to be a leaf so we can use it. +++ */ +++ BtCursor leafCur; +++ Cell *pNext; +++ int szNext; +++ int notUsed; +++ getTempCursor(pCur, &leafCur); +++ rc = fileBtreeNext(&leafCur, ¬Used); +++ if( rc!=SQLITE_OK ){ +++ if( rc!=SQLITE_NOMEM ) rc = SQLITE_CORRUPT; +++ return rc; +++ } +++ rc = sqlitepager_write(leafCur.pPage); +++ if( rc ) return rc; +++ dropCell(pBt, pPage, pCur->idx, cellSize(pBt, pCell)); +++ pNext = leafCur.pPage->apCell[leafCur.idx]; +++ szNext = cellSize(pBt, pNext); +++ pNext->h.leftChild = SWAB32(pBt, pgnoChild); +++ insertCell(pBt, pPage, pCur->idx, pNext, szNext); +++ rc = balance(pBt, pPage, pCur); +++ if( rc ) return rc; +++ pCur->eSkip = SKIP_NEXT; +++ dropCell(pBt, leafCur.pPage, leafCur.idx, szNext); +++ rc = balance(pBt, leafCur.pPage, pCur); +++ releaseTempCursor(&leafCur); +++ }else{ +++ dropCell(pBt, pPage, pCur->idx, cellSize(pBt, pCell)); +++ if( pCur->idx>=pPage->nCell ){ +++ pCur->idx = pPage->nCell-1; +++ if( pCur->idx<0 ){ +++ pCur->idx = 0; +++ pCur->eSkip = SKIP_NEXT; +++ }else{ +++ pCur->eSkip = SKIP_PREV; +++ } +++ }else{ +++ pCur->eSkip = SKIP_NEXT; +++ } +++ rc = balance(pBt, pPage, pCur); +++ } +++ return rc; +++} +++ +++/* +++** Create a new BTree table. Write into *piTable the page +++** number for the root page of the new table. +++** +++** In the current implementation, BTree tables and BTree indices are the +++** the same. In the future, we may change this so that BTree tables +++** are restricted to having a 4-byte integer key and arbitrary data and +++** BTree indices are restricted to having an arbitrary key and no data. +++** But for now, this routine also serves to create indices. +++*/ +++static int fileBtreeCreateTable(Btree *pBt, int *piTable){ +++ MemPage *pRoot; +++ Pgno pgnoRoot; +++ int rc; +++ if( !pBt->inTrans ){ +++ /* Must start a transaction first */ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ if( pBt->readOnly ){ +++ return SQLITE_READONLY; +++ } +++ rc = allocatePage(pBt, &pRoot, &pgnoRoot, 0); +++ if( rc ) return rc; +++ assert( sqlitepager_iswriteable(pRoot) ); +++ zeroPage(pBt, pRoot); +++ sqlitepager_unref(pRoot); +++ *piTable = (int)pgnoRoot; +++ return SQLITE_OK; +++} +++ +++/* +++** Erase the given database page and all its children. Return +++** the page to the freelist. +++*/ +++static int clearDatabasePage(Btree *pBt, Pgno pgno, int freePageFlag){ +++ MemPage *pPage; +++ int rc; +++ Cell *pCell; +++ int idx; +++ +++ rc = sqlitepager_get(pBt->pPager, pgno, (void**)&pPage); +++ if( rc ) return rc; +++ rc = sqlitepager_write(pPage); +++ if( rc ) return rc; +++ rc = initPage(pBt, pPage, pgno, 0); +++ if( rc ) return rc; +++ idx = SWAB16(pBt, pPage->u.hdr.firstCell); +++ while( idx>0 ){ +++ pCell = (Cell*)&pPage->u.aDisk[idx]; +++ idx = SWAB16(pBt, pCell->h.iNext); +++ if( pCell->h.leftChild ){ +++ rc = clearDatabasePage(pBt, SWAB32(pBt, pCell->h.leftChild), 1); +++ if( rc ) return rc; +++ } +++ rc = clearCell(pBt, pCell); +++ if( rc ) return rc; +++ } +++ if( pPage->u.hdr.rightChild ){ +++ rc = clearDatabasePage(pBt, SWAB32(pBt, pPage->u.hdr.rightChild), 1); +++ if( rc ) return rc; +++ } +++ if( freePageFlag ){ +++ rc = freePage(pBt, pPage, pgno); +++ }else{ +++ zeroPage(pBt, pPage); +++ } +++ sqlitepager_unref(pPage); +++ return rc; +++} +++ +++/* +++** Delete all information from a single table in the database. +++*/ +++static int fileBtreeClearTable(Btree *pBt, int iTable){ +++ int rc; +++ BtCursor *pCur; +++ if( !pBt->inTrans ){ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){ +++ if( pCur->pgnoRoot==(Pgno)iTable ){ +++ if( pCur->wrFlag==0 ) return SQLITE_LOCKED; +++ moveToRoot(pCur); +++ } +++ } +++ rc = clearDatabasePage(pBt, (Pgno)iTable, 0); +++ if( rc ){ +++ fileBtreeRollback(pBt); +++ } +++ return rc; +++} +++ +++/* +++** Erase all information in a table and add the root of the table to +++** the freelist. Except, the root of the principle table (the one on +++** page 2) is never added to the freelist. +++*/ +++static int fileBtreeDropTable(Btree *pBt, int iTable){ +++ int rc; +++ MemPage *pPage; +++ BtCursor *pCur; +++ if( !pBt->inTrans ){ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){ +++ if( pCur->pgnoRoot==(Pgno)iTable ){ +++ return SQLITE_LOCKED; /* Cannot drop a table that has a cursor */ +++ } +++ } +++ rc = sqlitepager_get(pBt->pPager, (Pgno)iTable, (void**)&pPage); +++ if( rc ) return rc; +++ rc = fileBtreeClearTable(pBt, iTable); +++ if( rc ) return rc; +++ if( iTable>2 ){ +++ rc = freePage(pBt, pPage, iTable); +++ }else{ +++ zeroPage(pBt, pPage); +++ } +++ sqlitepager_unref(pPage); +++ return rc; +++} +++ +++#if 0 /* UNTESTED */ +++/* +++** Copy all cell data from one database file into another. +++** pages back the freelist. +++*/ +++static int copyCell(Btree *pBtFrom, BTree *pBtTo, Cell *pCell){ +++ Pager *pFromPager = pBtFrom->pPager; +++ OverflowPage *pOvfl; +++ Pgno ovfl, nextOvfl; +++ Pgno *pPrev; +++ int rc = SQLITE_OK; +++ MemPage *pNew, *pPrevPg; +++ Pgno new; +++ +++ if( NKEY(pBtTo, pCell->h) + NDATA(pBtTo, pCell->h) <= MX_LOCAL_PAYLOAD ){ +++ return SQLITE_OK; +++ } +++ pPrev = &pCell->ovfl; +++ pPrevPg = 0; +++ ovfl = SWAB32(pBtTo, pCell->ovfl); +++ while( ovfl && rc==SQLITE_OK ){ +++ rc = sqlitepager_get(pFromPager, ovfl, (void**)&pOvfl); +++ if( rc ) return rc; +++ nextOvfl = SWAB32(pBtFrom, pOvfl->iNext); +++ rc = allocatePage(pBtTo, &pNew, &new, 0); +++ if( rc==SQLITE_OK ){ +++ rc = sqlitepager_write(pNew); +++ if( rc==SQLITE_OK ){ +++ memcpy(pNew, pOvfl, SQLITE_USABLE_SIZE); +++ *pPrev = SWAB32(pBtTo, new); +++ if( pPrevPg ){ +++ sqlitepager_unref(pPrevPg); +++ } +++ pPrev = &pOvfl->iNext; +++ pPrevPg = pNew; +++ } +++ } +++ sqlitepager_unref(pOvfl); +++ ovfl = nextOvfl; +++ } +++ if( pPrevPg ){ +++ sqlitepager_unref(pPrevPg); +++ } +++ return rc; +++} +++#endif +++ +++ +++#if 0 /* UNTESTED */ +++/* +++** Copy a page of data from one database over to another. +++*/ +++static int copyDatabasePage( +++ Btree *pBtFrom, +++ Pgno pgnoFrom, +++ Btree *pBtTo, +++ Pgno *pTo +++){ +++ MemPage *pPageFrom, *pPage; +++ Pgno to; +++ int rc; +++ Cell *pCell; +++ int idx; +++ +++ rc = sqlitepager_get(pBtFrom->pPager, pgno, (void**)&pPageFrom); +++ if( rc ) return rc; +++ rc = allocatePage(pBt, &pPage, pTo, 0); +++ if( rc==SQLITE_OK ){ +++ rc = sqlitepager_write(pPage); +++ } +++ if( rc==SQLITE_OK ){ +++ memcpy(pPage, pPageFrom, SQLITE_USABLE_SIZE); +++ idx = SWAB16(pBt, pPage->u.hdr.firstCell); +++ while( idx>0 ){ +++ pCell = (Cell*)&pPage->u.aDisk[idx]; +++ idx = SWAB16(pBt, pCell->h.iNext); +++ if( pCell->h.leftChild ){ +++ Pgno newChld; +++ rc = copyDatabasePage(pBtFrom, SWAB32(pBtFrom, pCell->h.leftChild), +++ pBtTo, &newChld); +++ if( rc ) return rc; +++ pCell->h.leftChild = SWAB32(pBtFrom, newChld); +++ } +++ rc = copyCell(pBtFrom, pBtTo, pCell); +++ if( rc ) return rc; +++ } +++ if( pPage->u.hdr.rightChild ){ +++ Pgno newChld; +++ rc = copyDatabasePage(pBtFrom, SWAB32(pBtFrom, pPage->u.hdr.rightChild), +++ pBtTo, &newChld); +++ if( rc ) return rc; +++ pPage->u.hdr.rightChild = SWAB32(pBtTo, newChild); +++ } +++ } +++ sqlitepager_unref(pPage); +++ return rc; +++} +++#endif +++ +++/* +++** Read the meta-information out of a database file. +++*/ +++static int fileBtreeGetMeta(Btree *pBt, int *aMeta){ +++ PageOne *pP1; +++ int rc; +++ int i; +++ +++ rc = sqlitepager_get(pBt->pPager, 1, (void**)&pP1); +++ if( rc ) return rc; +++ aMeta[0] = SWAB32(pBt, pP1->nFree); +++ for(i=0; iaMeta)/sizeof(pP1->aMeta[0]); i++){ +++ aMeta[i+1] = SWAB32(pBt, pP1->aMeta[i]); +++ } +++ sqlitepager_unref(pP1); +++ return SQLITE_OK; +++} +++ +++/* +++** Write meta-information back into the database. +++*/ +++static int fileBtreeUpdateMeta(Btree *pBt, int *aMeta){ +++ PageOne *pP1; +++ int rc, i; +++ if( !pBt->inTrans ){ +++ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; +++ } +++ pP1 = pBt->page1; +++ rc = sqlitepager_write(pP1); +++ if( rc ) return rc; +++ for(i=0; iaMeta)/sizeof(pP1->aMeta[0]); i++){ +++ pP1->aMeta[i] = SWAB32(pBt, aMeta[i+1]); +++ } +++ return SQLITE_OK; +++} +++ +++/****************************************************************************** +++** The complete implementation of the BTree subsystem is above this line. +++** All the code the follows is for testing and troubleshooting the BTree +++** subsystem. None of the code that follows is used during normal operation. +++******************************************************************************/ +++ +++/* +++** Print a disassembly of the given page on standard output. This routine +++** is used for debugging and testing only. +++*/ +++#ifdef SQLITE_TEST +++static int fileBtreePageDump(Btree *pBt, int pgno, int recursive){ +++ int rc; +++ MemPage *pPage; +++ int i, j; +++ int nFree; +++ u16 idx; +++ char range[20]; +++ unsigned char payload[20]; +++ rc = sqlitepager_get(pBt->pPager, (Pgno)pgno, (void**)&pPage); +++ if( rc ){ +++ return rc; +++ } +++ if( recursive ) printf("PAGE %d:\n", pgno); +++ i = 0; +++ idx = SWAB16(pBt, pPage->u.hdr.firstCell); +++ while( idx>0 && idx<=SQLITE_USABLE_SIZE-MIN_CELL_SIZE ){ +++ Cell *pCell = (Cell*)&pPage->u.aDisk[idx]; +++ int sz = cellSize(pBt, pCell); +++ sprintf(range,"%d..%d", idx, idx+sz-1); +++ sz = NKEY(pBt, pCell->h) + NDATA(pBt, pCell->h); +++ if( sz>sizeof(payload)-1 ) sz = sizeof(payload)-1; +++ memcpy(payload, pCell->aPayload, sz); +++ for(j=0; j0x7f ) payload[j] = '.'; +++ } +++ payload[sz] = 0; +++ printf( +++ "cell %2d: i=%-10s chld=%-4d nk=%-4d nd=%-4d payload=%s\n", +++ i, range, (int)pCell->h.leftChild, +++ NKEY(pBt, pCell->h), NDATA(pBt, pCell->h), +++ payload +++ ); +++ if( pPage->isInit && pPage->apCell[i]!=pCell ){ +++ printf("**** apCell[%d] does not match on prior entry ****\n", i); +++ } +++ i++; +++ idx = SWAB16(pBt, pCell->h.iNext); +++ } +++ if( idx!=0 ){ +++ printf("ERROR: next cell index out of range: %d\n", idx); +++ } +++ printf("right_child: %d\n", SWAB32(pBt, pPage->u.hdr.rightChild)); +++ nFree = 0; +++ i = 0; +++ idx = SWAB16(pBt, pPage->u.hdr.firstFree); +++ while( idx>0 && idxu.aDisk[idx]; +++ sprintf(range,"%d..%d", idx, idx+p->iSize-1); +++ nFree += SWAB16(pBt, p->iSize); +++ printf("freeblock %2d: i=%-10s size=%-4d total=%d\n", +++ i, range, SWAB16(pBt, p->iSize), nFree); +++ idx = SWAB16(pBt, p->iNext); +++ i++; +++ } +++ if( idx!=0 ){ +++ printf("ERROR: next freeblock index out of range: %d\n", idx); +++ } +++ if( recursive && pPage->u.hdr.rightChild!=0 ){ +++ idx = SWAB16(pBt, pPage->u.hdr.firstCell); +++ while( idx>0 && idxu.aDisk[idx]; +++ fileBtreePageDump(pBt, SWAB32(pBt, pCell->h.leftChild), 1); +++ idx = SWAB16(pBt, pCell->h.iNext); +++ } +++ fileBtreePageDump(pBt, SWAB32(pBt, pPage->u.hdr.rightChild), 1); +++ } +++ sqlitepager_unref(pPage); +++ return SQLITE_OK; +++} +++#endif +++ +++#ifdef SQLITE_TEST +++/* +++** Fill aResult[] with information about the entry and page that the +++** cursor is pointing to. +++** +++** aResult[0] = The page number +++** aResult[1] = The entry number +++** aResult[2] = Total number of entries on this page +++** aResult[3] = Size of this entry +++** aResult[4] = Number of free bytes on this page +++** aResult[5] = Number of free blocks on the page +++** aResult[6] = Page number of the left child of this entry +++** aResult[7] = Page number of the right child for the whole page +++** +++** This routine is used for testing and debugging only. +++*/ +++static int fileBtreeCursorDump(BtCursor *pCur, int *aResult){ +++ int cnt, idx; +++ MemPage *pPage = pCur->pPage; +++ Btree *pBt = pCur->pBt; +++ aResult[0] = sqlitepager_pagenumber(pPage); +++ aResult[1] = pCur->idx; +++ aResult[2] = pPage->nCell; +++ if( pCur->idx>=0 && pCur->idxnCell ){ +++ aResult[3] = cellSize(pBt, pPage->apCell[pCur->idx]); +++ aResult[6] = SWAB32(pBt, pPage->apCell[pCur->idx]->h.leftChild); +++ }else{ +++ aResult[3] = 0; +++ aResult[6] = 0; +++ } +++ aResult[4] = pPage->nFree; +++ cnt = 0; +++ idx = SWAB16(pBt, pPage->u.hdr.firstFree); +++ while( idx>0 && idxu.aDisk[idx])->iNext); +++ } +++ aResult[5] = cnt; +++ aResult[7] = SWAB32(pBt, pPage->u.hdr.rightChild); +++ return SQLITE_OK; +++} +++#endif +++ +++/* +++** Return the pager associated with a BTree. This routine is used for +++** testing and debugging only. +++*/ +++static Pager *fileBtreePager(Btree *pBt){ +++ return pBt->pPager; +++} +++ +++/* +++** This structure is passed around through all the sanity checking routines +++** in order to keep track of some global state information. +++*/ +++typedef struct IntegrityCk IntegrityCk; +++struct IntegrityCk { +++ Btree *pBt; /* The tree being checked out */ +++ Pager *pPager; /* The associated pager. Also accessible by pBt->pPager */ +++ int nPage; /* Number of pages in the database */ +++ int *anRef; /* Number of times each page is referenced */ +++ char *zErrMsg; /* An error message. NULL of no errors seen. */ +++}; +++ +++/* +++** Append a message to the error message string. +++*/ +++static void checkAppendMsg(IntegrityCk *pCheck, char *zMsg1, char *zMsg2){ +++ if( pCheck->zErrMsg ){ +++ char *zOld = pCheck->zErrMsg; +++ pCheck->zErrMsg = 0; +++ sqliteSetString(&pCheck->zErrMsg, zOld, "\n", zMsg1, zMsg2, (char*)0); +++ sqliteFree(zOld); +++ }else{ +++ sqliteSetString(&pCheck->zErrMsg, zMsg1, zMsg2, (char*)0); +++ } +++} +++ +++/* +++** Add 1 to the reference count for page iPage. If this is the second +++** reference to the page, add an error message to pCheck->zErrMsg. +++** Return 1 if there are 2 ore more references to the page and 0 if +++** if this is the first reference to the page. +++** +++** Also check that the page number is in bounds. +++*/ +++static int checkRef(IntegrityCk *pCheck, int iPage, char *zContext){ +++ if( iPage==0 ) return 1; +++ if( iPage>pCheck->nPage || iPage<0 ){ +++ char zBuf[100]; +++ sprintf(zBuf, "invalid page number %d", iPage); +++ checkAppendMsg(pCheck, zContext, zBuf); +++ return 1; +++ } +++ if( pCheck->anRef[iPage]==1 ){ +++ char zBuf[100]; +++ sprintf(zBuf, "2nd reference to page %d", iPage); +++ checkAppendMsg(pCheck, zContext, zBuf); +++ return 1; +++ } +++ return (pCheck->anRef[iPage]++)>1; +++} +++ +++/* +++** Check the integrity of the freelist or of an overflow page list. +++** Verify that the number of pages on the list is N. +++*/ +++static void checkList( +++ IntegrityCk *pCheck, /* Integrity checking context */ +++ int isFreeList, /* True for a freelist. False for overflow page list */ +++ int iPage, /* Page number for first page in the list */ +++ int N, /* Expected number of pages in the list */ +++ char *zContext /* Context for error messages */ +++){ +++ int i; +++ char zMsg[100]; +++ while( N-- > 0 ){ +++ OverflowPage *pOvfl; +++ if( iPage<1 ){ +++ sprintf(zMsg, "%d pages missing from overflow list", N+1); +++ checkAppendMsg(pCheck, zContext, zMsg); +++ break; +++ } +++ if( checkRef(pCheck, iPage, zContext) ) break; +++ if( sqlitepager_get(pCheck->pPager, (Pgno)iPage, (void**)&pOvfl) ){ +++ sprintf(zMsg, "failed to get page %d", iPage); +++ checkAppendMsg(pCheck, zContext, zMsg); +++ break; +++ } +++ if( isFreeList ){ +++ FreelistInfo *pInfo = (FreelistInfo*)pOvfl->aPayload; +++ int n = SWAB32(pCheck->pBt, pInfo->nFree); +++ for(i=0; ipBt, pInfo->aFree[i]), zContext); +++ } +++ N -= n; +++ } +++ iPage = SWAB32(pCheck->pBt, pOvfl->iNext); +++ sqlitepager_unref(pOvfl); +++ } +++} +++ +++/* +++** Return negative if zKey1zKey2. +++*/ +++static int keyCompare( +++ const char *zKey1, int nKey1, +++ const char *zKey2, int nKey2 +++){ +++ int min = nKey1>nKey2 ? nKey2 : nKey1; +++ int c = memcmp(zKey1, zKey2, min); +++ if( c==0 ){ +++ c = nKey1 - nKey2; +++ } +++ return c; +++} +++ +++/* +++** Do various sanity checks on a single page of a tree. Return +++** the tree depth. Root pages return 0. Parents of root pages +++** return 1, and so forth. +++** +++** These checks are done: +++** +++** 1. Make sure that cells and freeblocks do not overlap +++** but combine to completely cover the page. +++** 2. Make sure cell keys are in order. +++** 3. Make sure no key is less than or equal to zLowerBound. +++** 4. Make sure no key is greater than or equal to zUpperBound. +++** 5. Check the integrity of overflow pages. +++** 6. Recursively call checkTreePage on all children. +++** 7. Verify that the depth of all children is the same. +++** 8. Make sure this page is at least 33% full or else it is +++** the root of the tree. +++*/ +++static int checkTreePage( +++ IntegrityCk *pCheck, /* Context for the sanity check */ +++ int iPage, /* Page number of the page to check */ +++ MemPage *pParent, /* Parent page */ +++ char *zParentContext, /* Parent context */ +++ char *zLowerBound, /* All keys should be greater than this, if not NULL */ +++ int nLower, /* Number of characters in zLowerBound */ +++ char *zUpperBound, /* All keys should be less than this, if not NULL */ +++ int nUpper /* Number of characters in zUpperBound */ +++){ +++ MemPage *pPage; +++ int i, rc, depth, d2, pgno; +++ char *zKey1, *zKey2; +++ int nKey1, nKey2; +++ BtCursor cur; +++ Btree *pBt; +++ char zMsg[100]; +++ char zContext[100]; +++ char hit[SQLITE_USABLE_SIZE]; +++ +++ /* Check that the page exists +++ */ +++ cur.pBt = pBt = pCheck->pBt; +++ if( iPage==0 ) return 0; +++ if( checkRef(pCheck, iPage, zParentContext) ) return 0; +++ sprintf(zContext, "On tree page %d: ", iPage); +++ if( (rc = sqlitepager_get(pCheck->pPager, (Pgno)iPage, (void**)&pPage))!=0 ){ +++ sprintf(zMsg, "unable to get the page. error code=%d", rc); +++ checkAppendMsg(pCheck, zContext, zMsg); +++ return 0; +++ } +++ if( (rc = initPage(pBt, pPage, (Pgno)iPage, pParent))!=0 ){ +++ sprintf(zMsg, "initPage() returns error code %d", rc); +++ checkAppendMsg(pCheck, zContext, zMsg); +++ sqlitepager_unref(pPage); +++ return 0; +++ } +++ +++ /* Check out all the cells. +++ */ +++ depth = 0; +++ if( zLowerBound ){ +++ zKey1 = sqliteMalloc( nLower+1 ); +++ memcpy(zKey1, zLowerBound, nLower); +++ zKey1[nLower] = 0; +++ }else{ +++ zKey1 = 0; +++ } +++ nKey1 = nLower; +++ cur.pPage = pPage; +++ for(i=0; inCell; i++){ +++ Cell *pCell = pPage->apCell[i]; +++ int sz; +++ +++ /* Check payload overflow pages +++ */ +++ nKey2 = NKEY(pBt, pCell->h); +++ sz = nKey2 + NDATA(pBt, pCell->h); +++ sprintf(zContext, "On page %d cell %d: ", iPage, i); +++ if( sz>MX_LOCAL_PAYLOAD ){ +++ int nPage = (sz - MX_LOCAL_PAYLOAD + OVERFLOW_SIZE - 1)/OVERFLOW_SIZE; +++ checkList(pCheck, 0, SWAB32(pBt, pCell->ovfl), nPage, zContext); +++ } +++ +++ /* Check that keys are in the right order +++ */ +++ cur.idx = i; +++ zKey2 = sqliteMallocRaw( nKey2+1 ); +++ getPayload(&cur, 0, nKey2, zKey2); +++ if( zKey1 && keyCompare(zKey1, nKey1, zKey2, nKey2)>=0 ){ +++ checkAppendMsg(pCheck, zContext, "Key is out of order"); +++ } +++ +++ /* Check sanity of left child page. +++ */ +++ pgno = SWAB32(pBt, pCell->h.leftChild); +++ d2 = checkTreePage(pCheck, pgno, pPage, zContext, zKey1,nKey1,zKey2,nKey2); +++ if( i>0 && d2!=depth ){ +++ checkAppendMsg(pCheck, zContext, "Child page depth differs"); +++ } +++ depth = d2; +++ sqliteFree(zKey1); +++ zKey1 = zKey2; +++ nKey1 = nKey2; +++ } +++ pgno = SWAB32(pBt, pPage->u.hdr.rightChild); +++ sprintf(zContext, "On page %d at right child: ", iPage); +++ checkTreePage(pCheck, pgno, pPage, zContext, zKey1,nKey1,zUpperBound,nUpper); +++ sqliteFree(zKey1); +++ +++ /* Check for complete coverage of the page +++ */ +++ memset(hit, 0, sizeof(hit)); +++ memset(hit, 1, sizeof(PageHdr)); +++ for(i=SWAB16(pBt, pPage->u.hdr.firstCell); i>0 && iu.aDisk[i]; +++ int j; +++ for(j=i+cellSize(pBt, pCell)-1; j>=i; j--) hit[j]++; +++ i = SWAB16(pBt, pCell->h.iNext); +++ } +++ for(i=SWAB16(pBt,pPage->u.hdr.firstFree); i>0 && iu.aDisk[i]; +++ int j; +++ for(j=i+SWAB16(pBt,pFBlk->iSize)-1; j>=i; j--) hit[j]++; +++ i = SWAB16(pBt,pFBlk->iNext); +++ } +++ for(i=0; i1 ){ +++ sprintf(zMsg, "Multiple uses for byte %d of page %d", i, iPage); +++ checkAppendMsg(pCheck, zMsg, 0); +++ break; +++ } +++ } +++ +++ /* Check that free space is kept to a minimum +++ */ +++#if 0 +++ if( pParent && pParent->nCell>2 && pPage->nFree>3*SQLITE_USABLE_SIZE/4 ){ +++ sprintf(zMsg, "free space (%d) greater than max (%d)", pPage->nFree, +++ SQLITE_USABLE_SIZE/3); +++ checkAppendMsg(pCheck, zContext, zMsg); +++ } +++#endif +++ +++ sqlitepager_unref(pPage); +++ return depth; +++} +++ +++/* +++** This routine does a complete check of the given BTree file. aRoot[] is +++** an array of pages numbers were each page number is the root page of +++** a table. nRoot is the number of entries in aRoot. +++** +++** If everything checks out, this routine returns NULL. If something is +++** amiss, an error message is written into memory obtained from malloc() +++** and a pointer to that error message is returned. The calling function +++** is responsible for freeing the error message when it is done. +++*/ +++char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){ +++ int i; +++ int nRef; +++ IntegrityCk sCheck; +++ +++ nRef = *sqlitepager_stats(pBt->pPager); +++ if( lockBtree(pBt)!=SQLITE_OK ){ +++ return sqliteStrDup("Unable to acquire a read lock on the database"); +++ } +++ sCheck.pBt = pBt; +++ sCheck.pPager = pBt->pPager; +++ sCheck.nPage = sqlitepager_pagecount(sCheck.pPager); +++ if( sCheck.nPage==0 ){ +++ unlockBtreeIfUnused(pBt); +++ return 0; +++ } +++ sCheck.anRef = sqliteMallocRaw( (sCheck.nPage+1)*sizeof(sCheck.anRef[0]) ); +++ sCheck.anRef[1] = 1; +++ for(i=2; i<=sCheck.nPage; i++){ sCheck.anRef[i] = 0; } +++ sCheck.zErrMsg = 0; +++ +++ /* Check the integrity of the freelist +++ */ +++ checkList(&sCheck, 1, SWAB32(pBt, pBt->page1->freeList), +++ SWAB32(pBt, pBt->page1->nFree), "Main freelist: "); +++ +++ /* Check all the tables. +++ */ +++ for(i=0; ipPager) ){ +++ char zBuf[100]; +++ sprintf(zBuf, +++ "Outstanding page count goes from %d to %d during this analysis", +++ nRef, *sqlitepager_stats(pBt->pPager) +++ ); +++ checkAppendMsg(&sCheck, zBuf, 0); +++ } +++ +++ /* Clean up and report errors. +++ */ +++ sqliteFree(sCheck.anRef); +++ return sCheck.zErrMsg; +++} +++ +++/* +++** Return the full pathname of the underlying database file. +++*/ +++static const char *fileBtreeGetFilename(Btree *pBt){ +++ assert( pBt->pPager!=0 ); +++ return sqlitepager_filename(pBt->pPager); +++} +++ +++/* +++** Copy the complete content of pBtFrom into pBtTo. A transaction +++** must be active for both files. +++** +++** The size of file pBtFrom may be reduced by this operation. +++** If anything goes wrong, the transaction on pBtFrom is rolled back. +++*/ +++static int fileBtreeCopyFile(Btree *pBtTo, Btree *pBtFrom){ +++ int rc = SQLITE_OK; +++ Pgno i, nPage, nToPage; +++ +++ if( !pBtTo->inTrans || !pBtFrom->inTrans ) return SQLITE_ERROR; +++ if( pBtTo->needSwab!=pBtFrom->needSwab ) return SQLITE_ERROR; +++ if( pBtTo->pCursor ) return SQLITE_BUSY; +++ memcpy(pBtTo->page1, pBtFrom->page1, SQLITE_USABLE_SIZE); +++ rc = sqlitepager_overwrite(pBtTo->pPager, 1, pBtFrom->page1); +++ nToPage = sqlitepager_pagecount(pBtTo->pPager); +++ nPage = sqlitepager_pagecount(pBtFrom->pPager); +++ for(i=2; rc==SQLITE_OK && i<=nPage; i++){ +++ void *pPage; +++ rc = sqlitepager_get(pBtFrom->pPager, i, &pPage); +++ if( rc ) break; +++ rc = sqlitepager_overwrite(pBtTo->pPager, i, pPage); +++ if( rc ) break; +++ sqlitepager_unref(pPage); +++ } +++ for(i=nPage+1; rc==SQLITE_OK && i<=nToPage; i++){ +++ void *pPage; +++ rc = sqlitepager_get(pBtTo->pPager, i, &pPage); +++ if( rc ) break; +++ rc = sqlitepager_write(pPage); +++ sqlitepager_unref(pPage); +++ sqlitepager_dont_write(pBtTo->pPager, i); +++ } +++ if( !rc && nPagepPager, nPage); +++ } +++ if( rc ){ +++ fileBtreeRollback(pBtTo); +++ } +++ return rc; +++} +++ +++/* +++** The following tables contain pointers to all of the interface +++** routines for this implementation of the B*Tree backend. To +++** substitute a different implemention of the backend, one has merely +++** to provide pointers to alternative functions in similar tables. +++*/ +++static BtOps sqliteBtreeOps = { +++ fileBtreeClose, +++ fileBtreeSetCacheSize, +++ fileBtreeSetSafetyLevel, +++ fileBtreeBeginTrans, +++ fileBtreeCommit, +++ fileBtreeRollback, +++ fileBtreeBeginCkpt, +++ fileBtreeCommitCkpt, +++ fileBtreeRollbackCkpt, +++ fileBtreeCreateTable, +++ fileBtreeCreateTable, /* Really sqliteBtreeCreateIndex() */ +++ fileBtreeDropTable, +++ fileBtreeClearTable, +++ fileBtreeCursor, +++ fileBtreeGetMeta, +++ fileBtreeUpdateMeta, +++ fileBtreeIntegrityCheck, +++ fileBtreeGetFilename, +++ fileBtreeCopyFile, +++ fileBtreePager, +++#ifdef SQLITE_TEST +++ fileBtreePageDump, +++#endif +++}; +++static BtCursorOps sqliteBtreeCursorOps = { +++ fileBtreeMoveto, +++ fileBtreeDelete, +++ fileBtreeInsert, +++ fileBtreeFirst, +++ fileBtreeLast, +++ fileBtreeNext, +++ fileBtreePrevious, +++ fileBtreeKeySize, +++ fileBtreeKey, +++ fileBtreeKeyCompare, +++ fileBtreeDataSize, +++ fileBtreeData, +++ fileBtreeCloseCursor, +++#ifdef SQLITE_TEST +++ fileBtreeCursorDump, +++#endif +++}; ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/btree.h ++@@ -0,0 +1,156 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This header file defines the interface that the sqlite B-Tree file +++** subsystem. See comments in the source code for a detailed description +++** of what each interface routine does. +++** +++** @(#) $Id$ +++*/ +++#ifndef _BTREE_H_ +++#define _BTREE_H_ +++ +++/* +++** Forward declarations of structure +++*/ +++typedef struct Btree Btree; +++typedef struct BtCursor BtCursor; +++typedef struct BtOps BtOps; +++typedef struct BtCursorOps BtCursorOps; +++ +++ +++/* +++** An instance of the following structure contains pointers to all +++** methods against an open BTree. Alternative BTree implementations +++** (examples: file based versus in-memory) can be created by substituting +++** different methods. Users of the BTree cannot tell the difference. +++** +++** In C++ we could do this by defining a virtual base class and then +++** creating subclasses for each different implementation. But this is +++** C not C++ so we have to be a little more explicit. +++*/ +++struct BtOps { +++ int (*Close)(Btree*); +++ int (*SetCacheSize)(Btree*, int); +++ int (*SetSafetyLevel)(Btree*, int); +++ int (*BeginTrans)(Btree*); +++ int (*Commit)(Btree*); +++ int (*Rollback)(Btree*); +++ int (*BeginCkpt)(Btree*); +++ int (*CommitCkpt)(Btree*); +++ int (*RollbackCkpt)(Btree*); +++ int (*CreateTable)(Btree*, int*); +++ int (*CreateIndex)(Btree*, int*); +++ int (*DropTable)(Btree*, int); +++ int (*ClearTable)(Btree*, int); +++ int (*Cursor)(Btree*, int iTable, int wrFlag, BtCursor **ppCur); +++ int (*GetMeta)(Btree*, int*); +++ int (*UpdateMeta)(Btree*, int*); +++ char *(*IntegrityCheck)(Btree*, int*, int); +++ const char *(*GetFilename)(Btree*); +++ int (*Copyfile)(Btree*,Btree*); +++ struct Pager *(*Pager)(Btree*); +++#ifdef SQLITE_TEST +++ int (*PageDump)(Btree*, int, int); +++#endif +++}; +++ +++/* +++** An instance of this structure defines all of the methods that can +++** be executed against a cursor. +++*/ +++struct BtCursorOps { +++ int (*Moveto)(BtCursor*, const void *pKey, int nKey, int *pRes); +++ int (*Delete)(BtCursor*); +++ int (*Insert)(BtCursor*, const void *pKey, int nKey, +++ const void *pData, int nData); +++ int (*First)(BtCursor*, int *pRes); +++ int (*Last)(BtCursor*, int *pRes); +++ int (*Next)(BtCursor*, int *pRes); +++ int (*Previous)(BtCursor*, int *pRes); +++ int (*KeySize)(BtCursor*, int *pSize); +++ int (*Key)(BtCursor*, int offset, int amt, char *zBuf); +++ int (*KeyCompare)(BtCursor*, const void *pKey, int nKey, +++ int nIgnore, int *pRes); +++ int (*DataSize)(BtCursor*, int *pSize); +++ int (*Data)(BtCursor*, int offset, int amt, char *zBuf); +++ int (*CloseCursor)(BtCursor*); +++#ifdef SQLITE_TEST +++ int (*CursorDump)(BtCursor*, int*); +++#endif +++}; +++ +++/* +++** The number of 4-byte "meta" values contained on the first page of each +++** database file. +++*/ +++#define SQLITE_N_BTREE_META 10 +++ +++int sqliteBtreeOpen(const char *zFilename, int mode, int nPg, Btree **ppBtree); +++int sqliteRbtreeOpen(const char *zFilename, int mode, int nPg, Btree **ppBtree); +++ +++#define btOps(pBt) (*((BtOps **)(pBt))) +++#define btCOps(pCur) (*((BtCursorOps **)(pCur))) +++ +++#define sqliteBtreeClose(pBt) (btOps(pBt)->Close(pBt)) +++#define sqliteBtreeSetCacheSize(pBt, sz) (btOps(pBt)->SetCacheSize(pBt, sz)) +++#define sqliteBtreeSetSafetyLevel(pBt, sl) (btOps(pBt)->SetSafetyLevel(pBt, sl)) +++#define sqliteBtreeBeginTrans(pBt) (btOps(pBt)->BeginTrans(pBt)) +++#define sqliteBtreeCommit(pBt) (btOps(pBt)->Commit(pBt)) +++#define sqliteBtreeRollback(pBt) (btOps(pBt)->Rollback(pBt)) +++#define sqliteBtreeBeginCkpt(pBt) (btOps(pBt)->BeginCkpt(pBt)) +++#define sqliteBtreeCommitCkpt(pBt) (btOps(pBt)->CommitCkpt(pBt)) +++#define sqliteBtreeRollbackCkpt(pBt) (btOps(pBt)->RollbackCkpt(pBt)) +++#define sqliteBtreeCreateTable(pBt,piTable)\ +++ (btOps(pBt)->CreateTable(pBt,piTable)) +++#define sqliteBtreeCreateIndex(pBt, piIndex)\ +++ (btOps(pBt)->CreateIndex(pBt, piIndex)) +++#define sqliteBtreeDropTable(pBt, iTable) (btOps(pBt)->DropTable(pBt, iTable)) +++#define sqliteBtreeClearTable(pBt, iTable)\ +++ (btOps(pBt)->ClearTable(pBt, iTable)) +++#define sqliteBtreeCursor(pBt, iTable, wrFlag, ppCur)\ +++ (btOps(pBt)->Cursor(pBt, iTable, wrFlag, ppCur)) +++#define sqliteBtreeMoveto(pCur, pKey, nKey, pRes)\ +++ (btCOps(pCur)->Moveto(pCur, pKey, nKey, pRes)) +++#define sqliteBtreeDelete(pCur) (btCOps(pCur)->Delete(pCur)) +++#define sqliteBtreeInsert(pCur, pKey, nKey, pData, nData) \ +++ (btCOps(pCur)->Insert(pCur, pKey, nKey, pData, nData)) +++#define sqliteBtreeFirst(pCur, pRes) (btCOps(pCur)->First(pCur, pRes)) +++#define sqliteBtreeLast(pCur, pRes) (btCOps(pCur)->Last(pCur, pRes)) +++#define sqliteBtreeNext(pCur, pRes) (btCOps(pCur)->Next(pCur, pRes)) +++#define sqliteBtreePrevious(pCur, pRes) (btCOps(pCur)->Previous(pCur, pRes)) +++#define sqliteBtreeKeySize(pCur, pSize) (btCOps(pCur)->KeySize(pCur, pSize) ) +++#define sqliteBtreeKey(pCur, offset, amt, zBuf)\ +++ (btCOps(pCur)->Key(pCur, offset, amt, zBuf)) +++#define sqliteBtreeKeyCompare(pCur, pKey, nKey, nIgnore, pRes)\ +++ (btCOps(pCur)->KeyCompare(pCur, pKey, nKey, nIgnore, pRes)) +++#define sqliteBtreeDataSize(pCur, pSize) (btCOps(pCur)->DataSize(pCur, pSize)) +++#define sqliteBtreeData(pCur, offset, amt, zBuf)\ +++ (btCOps(pCur)->Data(pCur, offset, amt, zBuf)) +++#define sqliteBtreeCloseCursor(pCur) (btCOps(pCur)->CloseCursor(pCur)) +++#define sqliteBtreeGetMeta(pBt, aMeta) (btOps(pBt)->GetMeta(pBt, aMeta)) +++#define sqliteBtreeUpdateMeta(pBt, aMeta) (btOps(pBt)->UpdateMeta(pBt, aMeta)) +++#define sqliteBtreeIntegrityCheck(pBt, aRoot, nRoot)\ +++ (btOps(pBt)->IntegrityCheck(pBt, aRoot, nRoot)) +++#define sqliteBtreeGetFilename(pBt) (btOps(pBt)->GetFilename(pBt)) +++#define sqliteBtreeCopyFile(pBt1, pBt2) (btOps(pBt1)->Copyfile(pBt1, pBt2)) +++#define sqliteBtreePager(pBt) (btOps(pBt)->Pager(pBt)) +++ +++#ifdef SQLITE_TEST +++#define sqliteBtreePageDump(pBt, pgno, recursive)\ +++ (btOps(pBt)->PageDump(pBt, pgno, recursive)) +++#define sqliteBtreeCursorDump(pCur, aResult)\ +++ (btCOps(pCur)->CursorDump(pCur, aResult)) +++int btree_native_byte_order; +++#endif /* SQLITE_TEST */ +++ +++ +++#endif /* _BTREE_H_ */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/btree_rb.c ++@@ -0,0 +1,1488 @@ +++/* +++** 2003 Feb 4 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** $Id$ +++** +++** This file implements an in-core database using Red-Black balanced +++** binary trees. +++** +++** It was contributed to SQLite by anonymous on 2003-Feb-04 23:24:49 UTC. +++*/ +++#include "btree.h" +++#include "sqliteInt.h" +++#include +++ +++/* +++** Omit this whole file if the SQLITE_OMIT_INMEMORYDB macro is +++** defined. This allows a lot of code to be omitted for installations +++** that do not need it. +++*/ +++#ifndef SQLITE_OMIT_INMEMORYDB +++ +++ +++typedef struct BtRbTree BtRbTree; +++typedef struct BtRbNode BtRbNode; +++typedef struct BtRollbackOp BtRollbackOp; +++typedef struct Rbtree Rbtree; +++typedef struct RbtCursor RbtCursor; +++ +++/* Forward declarations */ +++static BtOps sqliteRbtreeOps; +++static BtCursorOps sqliteRbtreeCursorOps; +++ +++/* +++ * During each transaction (or checkpoint), a linked-list of +++ * "rollback-operations" is accumulated. If the transaction is rolled back, +++ * then the list of operations must be executed (to restore the database to +++ * it's state before the transaction started). If the transaction is to be +++ * committed, just delete the list. +++ * +++ * Each operation is represented as follows, depending on the value of eOp: +++ * +++ * ROLLBACK_INSERT -> Need to insert (pKey, pData) into table iTab. +++ * ROLLBACK_DELETE -> Need to delete the record (pKey) into table iTab. +++ * ROLLBACK_CREATE -> Need to create table iTab. +++ * ROLLBACK_DROP -> Need to drop table iTab. +++ */ +++struct BtRollbackOp { +++ u8 eOp; +++ int iTab; +++ int nKey; +++ void *pKey; +++ int nData; +++ void *pData; +++ BtRollbackOp *pNext; +++}; +++ +++/* +++** Legal values for BtRollbackOp.eOp: +++*/ +++#define ROLLBACK_INSERT 1 /* Insert a record */ +++#define ROLLBACK_DELETE 2 /* Delete a record */ +++#define ROLLBACK_CREATE 3 /* Create a table */ +++#define ROLLBACK_DROP 4 /* Drop a table */ +++ +++struct Rbtree { +++ BtOps *pOps; /* Function table */ +++ int aMetaData[SQLITE_N_BTREE_META]; +++ +++ int next_idx; /* next available table index */ +++ Hash tblHash; /* All created tables, by index */ +++ u8 isAnonymous; /* True if this Rbtree is to be deleted when closed */ +++ u8 eTransState; /* State of this Rbtree wrt transactions */ +++ +++ BtRollbackOp *pTransRollback; +++ BtRollbackOp *pCheckRollback; +++ BtRollbackOp *pCheckRollbackTail; +++}; +++ +++/* +++** Legal values for Rbtree.eTransState. +++*/ +++#define TRANS_NONE 0 /* No transaction is in progress */ +++#define TRANS_INTRANSACTION 1 /* A transaction is in progress */ +++#define TRANS_INCHECKPOINT 2 /* A checkpoint is in progress */ +++#define TRANS_ROLLBACK 3 /* We are currently rolling back a checkpoint or +++ * transaction. */ +++ +++struct RbtCursor { +++ BtCursorOps *pOps; /* Function table */ +++ Rbtree *pRbtree; +++ BtRbTree *pTree; +++ int iTree; /* Index of pTree in pRbtree */ +++ BtRbNode *pNode; +++ RbtCursor *pShared; /* List of all cursors on the same Rbtree */ +++ u8 eSkip; /* Determines if next step operation is a no-op */ +++ u8 wrFlag; /* True if this cursor is open for writing */ +++}; +++ +++/* +++** Legal values for RbtCursor.eSkip. +++*/ +++#define SKIP_NONE 0 /* Always step the cursor */ +++#define SKIP_NEXT 1 /* The next sqliteRbtreeNext() is a no-op */ +++#define SKIP_PREV 2 /* The next sqliteRbtreePrevious() is a no-op */ +++#define SKIP_INVALID 3 /* Calls to Next() and Previous() are invalid */ +++ +++struct BtRbTree { +++ RbtCursor *pCursors; /* All cursors pointing to this tree */ +++ BtRbNode *pHead; /* Head of the tree, or NULL */ +++}; +++ +++struct BtRbNode { +++ int nKey; +++ void *pKey; +++ int nData; +++ void *pData; +++ u8 isBlack; /* true for a black node, 0 for a red node */ +++ BtRbNode *pParent; /* Nodes parent node, NULL for the tree head */ +++ BtRbNode *pLeft; /* Nodes left child, or NULL */ +++ BtRbNode *pRight; /* Nodes right child, or NULL */ +++ +++ int nBlackHeight; /* Only used during the red-black integrity check */ +++}; +++ +++/* Forward declarations */ +++static int memRbtreeMoveto( +++ RbtCursor* pCur, +++ const void *pKey, +++ int nKey, +++ int *pRes +++); +++static int memRbtreeClearTable(Rbtree* tree, int n); +++static int memRbtreeNext(RbtCursor* pCur, int *pRes); +++static int memRbtreeLast(RbtCursor* pCur, int *pRes); +++static int memRbtreePrevious(RbtCursor* pCur, int *pRes); +++ +++ +++/* +++** This routine checks all cursors that point to the same table +++** as pCur points to. If any of those cursors were opened with +++** wrFlag==0 then this routine returns SQLITE_LOCKED. If all +++** cursors point to the same table were opened with wrFlag==1 +++** then this routine returns SQLITE_OK. +++** +++** In addition to checking for read-locks (where a read-lock +++** means a cursor opened with wrFlag==0) this routine also NULLs +++** out the pNode field of all other cursors. +++** This is necessary because an insert +++** or delete might change erase the node out from under +++** another cursor. +++*/ +++static int checkReadLocks(RbtCursor *pCur){ +++ RbtCursor *p; +++ assert( pCur->wrFlag ); +++ for(p=pCur->pTree->pCursors; p; p=p->pShared){ +++ if( p!=pCur ){ +++ if( p->wrFlag==0 ) return SQLITE_LOCKED; +++ p->pNode = 0; +++ } +++ } +++ return SQLITE_OK; +++} +++ +++/* +++ * The key-compare function for the red-black trees. Returns as follows: +++ * +++ * (key1 < key2) -1 +++ * (key1 == key2) 0 +++ * (key1 > key2) 1 +++ * +++ * Keys are compared using memcmp(). If one key is an exact prefix of the +++ * other, then the shorter key is less than the longer key. +++ */ +++static int key_compare(void const*pKey1, int nKey1, void const*pKey2, int nKey2) +++{ +++ int mcmp = memcmp(pKey1, pKey2, (nKey1 <= nKey2)?nKey1:nKey2); +++ if( mcmp == 0){ +++ if( nKey1 == nKey2 ) return 0; +++ return ((nKey1 < nKey2)?-1:1); +++ } +++ return ((mcmp>0)?1:-1); +++} +++ +++/* +++ * Perform the LEFT-rotate transformation on node X of tree pTree. This +++ * transform is part of the red-black balancing code. +++ * +++ * | | +++ * X Y +++ * / \ / \ +++ * a Y X c +++ * / \ / \ +++ * b c a b +++ * +++ * BEFORE AFTER +++ */ +++static void leftRotate(BtRbTree *pTree, BtRbNode *pX) +++{ +++ BtRbNode *pY; +++ BtRbNode *pb; +++ pY = pX->pRight; +++ pb = pY->pLeft; +++ +++ pY->pParent = pX->pParent; +++ if( pX->pParent ){ +++ if( pX->pParent->pLeft == pX ) pX->pParent->pLeft = pY; +++ else pX->pParent->pRight = pY; +++ } +++ pY->pLeft = pX; +++ pX->pParent = pY; +++ pX->pRight = pb; +++ if( pb ) pb->pParent = pX; +++ if( pTree->pHead == pX ) pTree->pHead = pY; +++} +++ +++/* +++ * Perform the RIGHT-rotate transformation on node X of tree pTree. This +++ * transform is part of the red-black balancing code. +++ * +++ * | | +++ * X Y +++ * / \ / \ +++ * Y c a X +++ * / \ / \ +++ * a b b c +++ * +++ * BEFORE AFTER +++ */ +++static void rightRotate(BtRbTree *pTree, BtRbNode *pX) +++{ +++ BtRbNode *pY; +++ BtRbNode *pb; +++ pY = pX->pLeft; +++ pb = pY->pRight; +++ +++ pY->pParent = pX->pParent; +++ if( pX->pParent ){ +++ if( pX->pParent->pLeft == pX ) pX->pParent->pLeft = pY; +++ else pX->pParent->pRight = pY; +++ } +++ pY->pRight = pX; +++ pX->pParent = pY; +++ pX->pLeft = pb; +++ if( pb ) pb->pParent = pX; +++ if( pTree->pHead == pX ) pTree->pHead = pY; +++} +++ +++/* +++ * A string-manipulation helper function for check_redblack_tree(). If (orig == +++ * NULL) a copy of val is returned. If (orig != NULL) then a copy of the * +++ * concatenation of orig and val is returned. The original orig is deleted +++ * (using sqliteFree()). +++ */ +++static char *append_val(char * orig, char const * val){ +++ char *z; +++ if( !orig ){ +++ z = sqliteStrDup( val ); +++ } else{ +++ z = 0; +++ sqliteSetString(&z, orig, val, (char*)0); +++ sqliteFree( orig ); +++ } +++ return z; +++} +++ +++/* +++ * Append a string representation of the entire node to orig and return it. +++ * This is used to produce debugging information if check_redblack_tree() finds +++ * a problem with a red-black binary tree. +++ */ +++static char *append_node(char * orig, BtRbNode *pNode, int indent) +++{ +++ char buf[128]; +++ int i; +++ +++ for( i=0; iisBlack ){ +++ orig = append_val(orig, " B \n"); +++ }else{ +++ orig = append_val(orig, " R \n"); +++ } +++ orig = append_node( orig, pNode->pLeft, indent ); +++ orig = append_node( orig, pNode->pRight, indent ); +++ }else{ +++ orig = append_val(orig, "\n"); +++ } +++ return orig; +++} +++ +++/* +++ * Print a representation of a node to stdout. This function is only included +++ * so you can call it from within a debugger if things get really bad. It +++ * is not called from anyplace in the code. +++ */ +++static void print_node(BtRbNode *pNode) +++{ +++ char * str = append_node(0, pNode, 0); +++ printf("%s", str); +++ +++ /* Suppress a warning message about print_node() being unused */ +++ (void)print_node; +++} +++ +++/* +++ * Check the following properties of the red-black tree: +++ * (1) - If a node is red, both of it's children are black +++ * (2) - Each path from a given node to a leaf (NULL) node passes thru the +++ * same number of black nodes +++ * +++ * If there is a problem, append a description (using append_val() ) to *msg. +++ */ +++static void check_redblack_tree(BtRbTree * tree, char ** msg) +++{ +++ BtRbNode *pNode; +++ +++ /* 0 -> came from parent +++ * 1 -> came from left +++ * 2 -> came from right */ +++ int prev_step = 0; +++ +++ pNode = tree->pHead; +++ while( pNode ){ +++ switch( prev_step ){ +++ case 0: +++ if( pNode->pLeft ){ +++ pNode = pNode->pLeft; +++ }else{ +++ prev_step = 1; +++ } +++ break; +++ case 1: +++ if( pNode->pRight ){ +++ pNode = pNode->pRight; +++ prev_step = 0; +++ }else{ +++ prev_step = 2; +++ } +++ break; +++ case 2: +++ /* Check red-black property (1) */ +++ if( !pNode->isBlack && +++ ( (pNode->pLeft && !pNode->pLeft->isBlack) || +++ (pNode->pRight && !pNode->pRight->isBlack) ) +++ ){ +++ char buf[128]; +++ sprintf(buf, "Red node with red child at %p\n", pNode); +++ *msg = append_val(*msg, buf); +++ *msg = append_node(*msg, tree->pHead, 0); +++ *msg = append_val(*msg, "\n"); +++ } +++ +++ /* Check red-black property (2) */ +++ { +++ int leftHeight = 0; +++ int rightHeight = 0; +++ if( pNode->pLeft ){ +++ leftHeight += pNode->pLeft->nBlackHeight; +++ leftHeight += (pNode->pLeft->isBlack?1:0); +++ } +++ if( pNode->pRight ){ +++ rightHeight += pNode->pRight->nBlackHeight; +++ rightHeight += (pNode->pRight->isBlack?1:0); +++ } +++ if( leftHeight != rightHeight ){ +++ char buf[128]; +++ sprintf(buf, "Different black-heights at %p\n", pNode); +++ *msg = append_val(*msg, buf); +++ *msg = append_node(*msg, tree->pHead, 0); +++ *msg = append_val(*msg, "\n"); +++ } +++ pNode->nBlackHeight = leftHeight; +++ } +++ +++ if( pNode->pParent ){ +++ if( pNode == pNode->pParent->pLeft ) prev_step = 1; +++ else prev_step = 2; +++ } +++ pNode = pNode->pParent; +++ break; +++ default: assert(0); +++ } +++ } +++} +++ +++/* +++ * Node pX has just been inserted into pTree (by code in sqliteRbtreeInsert()). +++ * It is possible that pX is a red node with a red parent, which is a violation +++ * of the red-black tree properties. This function performs rotations and +++ * color changes to rebalance the tree +++ */ +++static void do_insert_balancing(BtRbTree *pTree, BtRbNode *pX) +++{ +++ /* In the first iteration of this loop, pX points to the red node just +++ * inserted in the tree. If the parent of pX exists (pX is not the root +++ * node) and is red, then the properties of the red-black tree are +++ * violated. +++ * +++ * At the start of any subsequent iterations, pX points to a red node +++ * with a red parent. In all other respects the tree is a legal red-black +++ * binary tree. */ +++ while( pX != pTree->pHead && !pX->pParent->isBlack ){ +++ BtRbNode *pUncle; +++ BtRbNode *pGrandparent; +++ +++ /* Grandparent of pX must exist and must be black. */ +++ pGrandparent = pX->pParent->pParent; +++ assert( pGrandparent ); +++ assert( pGrandparent->isBlack ); +++ +++ /* Uncle of pX may or may not exist. */ +++ if( pX->pParent == pGrandparent->pLeft ) +++ pUncle = pGrandparent->pRight; +++ else +++ pUncle = pGrandparent->pLeft; +++ +++ /* If the uncle of pX exists and is red, we do the following: +++ * | | +++ * G(b) G(r) +++ * / \ / \ +++ * U(r) P(r) U(b) P(b) +++ * \ \ +++ * X(r) X(r) +++ * +++ * BEFORE AFTER +++ * pX is then set to G. If the parent of G is red, then the while loop +++ * will run again. */ +++ if( pUncle && !pUncle->isBlack ){ +++ pGrandparent->isBlack = 0; +++ pUncle->isBlack = 1; +++ pX->pParent->isBlack = 1; +++ pX = pGrandparent; +++ }else{ +++ +++ if( pX->pParent == pGrandparent->pLeft ){ +++ if( pX == pX->pParent->pRight ){ +++ /* If pX is a right-child, do the following transform, essentially +++ * to change pX into a left-child: +++ * | | +++ * G(b) G(b) +++ * / \ / \ +++ * P(r) U(b) X(r) U(b) +++ * \ / +++ * X(r) P(r) <-- new X +++ * +++ * BEFORE AFTER +++ */ +++ pX = pX->pParent; +++ leftRotate(pTree, pX); +++ } +++ +++ /* Do the following transform, which balances the tree :) +++ * | | +++ * G(b) P(b) +++ * / \ / \ +++ * P(r) U(b) X(r) G(r) +++ * / \ +++ * X(r) U(b) +++ * +++ * BEFORE AFTER +++ */ +++ assert( pGrandparent == pX->pParent->pParent ); +++ pGrandparent->isBlack = 0; +++ pX->pParent->isBlack = 1; +++ rightRotate( pTree, pGrandparent ); +++ +++ }else{ +++ /* This code is symetric to the illustrated case above. */ +++ if( pX == pX->pParent->pLeft ){ +++ pX = pX->pParent; +++ rightRotate(pTree, pX); +++ } +++ assert( pGrandparent == pX->pParent->pParent ); +++ pGrandparent->isBlack = 0; +++ pX->pParent->isBlack = 1; +++ leftRotate( pTree, pGrandparent ); +++ } +++ } +++ } +++ pTree->pHead->isBlack = 1; +++} +++ +++/* +++ * A child of pParent, which in turn had child pX, has just been removed from +++ * pTree (the figure below depicts the operation, Z is being removed). pParent +++ * or pX, or both may be NULL. +++ * | | +++ * P P +++ * / \ / \ +++ * Z X +++ * / \ +++ * X nil +++ * +++ * This function is only called if Z was black. In this case the red-black tree +++ * properties have been violated, and pX has an "extra black". This function +++ * performs rotations and color-changes to re-balance the tree. +++ */ +++static +++void do_delete_balancing(BtRbTree *pTree, BtRbNode *pX, BtRbNode *pParent) +++{ +++ BtRbNode *pSib; +++ +++ /* TODO: Comment this code! */ +++ while( pX != pTree->pHead && (!pX || pX->isBlack) ){ +++ if( pX == pParent->pLeft ){ +++ pSib = pParent->pRight; +++ if( pSib && !(pSib->isBlack) ){ +++ pSib->isBlack = 1; +++ pParent->isBlack = 0; +++ leftRotate(pTree, pParent); +++ pSib = pParent->pRight; +++ } +++ if( !pSib ){ +++ pX = pParent; +++ }else if( +++ (!pSib->pLeft || pSib->pLeft->isBlack) && +++ (!pSib->pRight || pSib->pRight->isBlack) ) { +++ pSib->isBlack = 0; +++ pX = pParent; +++ }else{ +++ if( (!pSib->pRight || pSib->pRight->isBlack) ){ +++ if( pSib->pLeft ) pSib->pLeft->isBlack = 1; +++ pSib->isBlack = 0; +++ rightRotate( pTree, pSib ); +++ pSib = pParent->pRight; +++ } +++ pSib->isBlack = pParent->isBlack; +++ pParent->isBlack = 1; +++ if( pSib->pRight ) pSib->pRight->isBlack = 1; +++ leftRotate(pTree, pParent); +++ pX = pTree->pHead; +++ } +++ }else{ +++ pSib = pParent->pLeft; +++ if( pSib && !(pSib->isBlack) ){ +++ pSib->isBlack = 1; +++ pParent->isBlack = 0; +++ rightRotate(pTree, pParent); +++ pSib = pParent->pLeft; +++ } +++ if( !pSib ){ +++ pX = pParent; +++ }else if( +++ (!pSib->pLeft || pSib->pLeft->isBlack) && +++ (!pSib->pRight || pSib->pRight->isBlack) ){ +++ pSib->isBlack = 0; +++ pX = pParent; +++ }else{ +++ if( (!pSib->pLeft || pSib->pLeft->isBlack) ){ +++ if( pSib->pRight ) pSib->pRight->isBlack = 1; +++ pSib->isBlack = 0; +++ leftRotate( pTree, pSib ); +++ pSib = pParent->pLeft; +++ } +++ pSib->isBlack = pParent->isBlack; +++ pParent->isBlack = 1; +++ if( pSib->pLeft ) pSib->pLeft->isBlack = 1; +++ rightRotate(pTree, pParent); +++ pX = pTree->pHead; +++ } +++ } +++ pParent = pX->pParent; +++ } +++ if( pX ) pX->isBlack = 1; +++} +++ +++/* +++ * Create table n in tree pRbtree. Table n must not exist. +++ */ +++static void btreeCreateTable(Rbtree* pRbtree, int n) +++{ +++ BtRbTree *pNewTbl = sqliteMalloc(sizeof(BtRbTree)); +++ sqliteHashInsert(&pRbtree->tblHash, 0, n, pNewTbl); +++} +++ +++/* +++ * Log a single "rollback-op" for the given Rbtree. See comments for struct +++ * BtRollbackOp. +++ */ +++static void btreeLogRollbackOp(Rbtree* pRbtree, BtRollbackOp *pRollbackOp) +++{ +++ assert( pRbtree->eTransState == TRANS_INCHECKPOINT || +++ pRbtree->eTransState == TRANS_INTRANSACTION ); +++ if( pRbtree->eTransState == TRANS_INTRANSACTION ){ +++ pRollbackOp->pNext = pRbtree->pTransRollback; +++ pRbtree->pTransRollback = pRollbackOp; +++ } +++ if( pRbtree->eTransState == TRANS_INCHECKPOINT ){ +++ if( !pRbtree->pCheckRollback ){ +++ pRbtree->pCheckRollbackTail = pRollbackOp; +++ } +++ pRollbackOp->pNext = pRbtree->pCheckRollback; +++ pRbtree->pCheckRollback = pRollbackOp; +++ } +++} +++ +++int sqliteRbtreeOpen( +++ const char *zFilename, +++ int mode, +++ int nPg, +++ Btree **ppBtree +++){ +++ Rbtree **ppRbtree = (Rbtree**)ppBtree; +++ *ppRbtree = (Rbtree *)sqliteMalloc(sizeof(Rbtree)); +++ if( sqlite_malloc_failed ) goto open_no_mem; +++ sqliteHashInit(&(*ppRbtree)->tblHash, SQLITE_HASH_INT, 0); +++ +++ /* Create a binary tree for the SQLITE_MASTER table at location 2 */ +++ btreeCreateTable(*ppRbtree, 2); +++ if( sqlite_malloc_failed ) goto open_no_mem; +++ (*ppRbtree)->next_idx = 3; +++ (*ppRbtree)->pOps = &sqliteRbtreeOps; +++ /* Set file type to 4; this is so that "attach ':memory:' as ...." does not +++ ** think that the database in uninitialised and refuse to attach +++ */ +++ (*ppRbtree)->aMetaData[2] = 4; +++ +++ return SQLITE_OK; +++ +++open_no_mem: +++ *ppBtree = 0; +++ return SQLITE_NOMEM; +++} +++ +++/* +++ * Create a new table in the supplied Rbtree. Set *n to the new table number. +++ * Return SQLITE_OK if the operation is a success. +++ */ +++static int memRbtreeCreateTable(Rbtree* tree, int* n) +++{ +++ assert( tree->eTransState != TRANS_NONE ); +++ +++ *n = tree->next_idx++; +++ btreeCreateTable(tree, *n); +++ if( sqlite_malloc_failed ) return SQLITE_NOMEM; +++ +++ /* Set up the rollback structure (if we are not doing this as part of a +++ * rollback) */ +++ if( tree->eTransState != TRANS_ROLLBACK ){ +++ BtRollbackOp *pRollbackOp = sqliteMalloc(sizeof(BtRollbackOp)); +++ if( pRollbackOp==0 ) return SQLITE_NOMEM; +++ pRollbackOp->eOp = ROLLBACK_DROP; +++ pRollbackOp->iTab = *n; +++ btreeLogRollbackOp(tree, pRollbackOp); +++ } +++ +++ return SQLITE_OK; +++} +++ +++/* +++ * Delete table n from the supplied Rbtree. +++ */ +++static int memRbtreeDropTable(Rbtree* tree, int n) +++{ +++ BtRbTree *pTree; +++ assert( tree->eTransState != TRANS_NONE ); +++ +++ memRbtreeClearTable(tree, n); +++ pTree = sqliteHashInsert(&tree->tblHash, 0, n, 0); +++ assert(pTree); +++ assert( pTree->pCursors==0 ); +++ sqliteFree(pTree); +++ +++ if( tree->eTransState != TRANS_ROLLBACK ){ +++ BtRollbackOp *pRollbackOp = sqliteMalloc(sizeof(BtRollbackOp)); +++ if( pRollbackOp==0 ) return SQLITE_NOMEM; +++ pRollbackOp->eOp = ROLLBACK_CREATE; +++ pRollbackOp->iTab = n; +++ btreeLogRollbackOp(tree, pRollbackOp); +++ } +++ +++ return SQLITE_OK; +++} +++ +++static int memRbtreeKeyCompare(RbtCursor* pCur, const void *pKey, int nKey, +++ int nIgnore, int *pRes) +++{ +++ assert(pCur); +++ +++ if( !pCur->pNode ) { +++ *pRes = -1; +++ } else { +++ if( (pCur->pNode->nKey - nIgnore) < 0 ){ +++ *pRes = -1; +++ }else{ +++ *pRes = key_compare(pCur->pNode->pKey, pCur->pNode->nKey-nIgnore, +++ pKey, nKey); +++ } +++ } +++ return SQLITE_OK; +++} +++ +++/* +++ * Get a new cursor for table iTable of the supplied Rbtree. The wrFlag +++ * parameter indicates that the cursor is open for writing. +++ * +++ * Note that RbtCursor.eSkip and RbtCursor.pNode both initialize to 0. +++ */ +++static int memRbtreeCursor( +++ Rbtree* tree, +++ int iTable, +++ int wrFlag, +++ RbtCursor **ppCur +++){ +++ RbtCursor *pCur; +++ assert(tree); +++ pCur = *ppCur = sqliteMalloc(sizeof(RbtCursor)); +++ if( sqlite_malloc_failed ) return SQLITE_NOMEM; +++ pCur->pTree = sqliteHashFind(&tree->tblHash, 0, iTable); +++ assert( pCur->pTree ); +++ pCur->pRbtree = tree; +++ pCur->iTree = iTable; +++ pCur->pOps = &sqliteRbtreeCursorOps; +++ pCur->wrFlag = wrFlag; +++ pCur->pShared = pCur->pTree->pCursors; +++ pCur->pTree->pCursors = pCur; +++ +++ assert( (*ppCur)->pTree ); +++ return SQLITE_OK; +++} +++ +++/* +++ * Insert a new record into the Rbtree. The key is given by (pKey,nKey) +++ * and the data is given by (pData,nData). The cursor is used only to +++ * define what database the record should be inserted into. The cursor +++ * is left pointing at the new record. +++ * +++ * If the key exists already in the tree, just replace the data. +++ */ +++static int memRbtreeInsert( +++ RbtCursor* pCur, +++ const void *pKey, +++ int nKey, +++ const void *pDataInput, +++ int nData +++){ +++ void * pData; +++ int match; +++ +++ /* It is illegal to call sqliteRbtreeInsert() if we are +++ ** not in a transaction */ +++ assert( pCur->pRbtree->eTransState != TRANS_NONE ); +++ +++ /* Make sure some other cursor isn't trying to read this same table */ +++ if( checkReadLocks(pCur) ){ +++ return SQLITE_LOCKED; /* The table pCur points to has a read lock */ +++ } +++ +++ /* Take a copy of the input data now, in case we need it for the +++ * replace case */ +++ pData = sqliteMallocRaw(nData); +++ if( sqlite_malloc_failed ) return SQLITE_NOMEM; +++ memcpy(pData, pDataInput, nData); +++ +++ /* Move the cursor to a node near the key to be inserted. If the key already +++ * exists in the table, then (match == 0). In this case we can just replace +++ * the data associated with the entry, we don't need to manipulate the tree. +++ * +++ * If there is no exact match, then the cursor points at what would be either +++ * the predecessor (match == -1) or successor (match == 1) of the +++ * searched-for key, were it to be inserted. The new node becomes a child of +++ * this node. +++ * +++ * The new node is initially red. +++ */ +++ memRbtreeMoveto( pCur, pKey, nKey, &match); +++ if( match ){ +++ BtRbNode *pNode = sqliteMalloc(sizeof(BtRbNode)); +++ if( pNode==0 ) return SQLITE_NOMEM; +++ pNode->nKey = nKey; +++ pNode->pKey = sqliteMallocRaw(nKey); +++ if( sqlite_malloc_failed ) return SQLITE_NOMEM; +++ memcpy(pNode->pKey, pKey, nKey); +++ pNode->nData = nData; +++ pNode->pData = pData; +++ if( pCur->pNode ){ +++ switch( match ){ +++ case -1: +++ assert( !pCur->pNode->pRight ); +++ pNode->pParent = pCur->pNode; +++ pCur->pNode->pRight = pNode; +++ break; +++ case 1: +++ assert( !pCur->pNode->pLeft ); +++ pNode->pParent = pCur->pNode; +++ pCur->pNode->pLeft = pNode; +++ break; +++ default: +++ assert(0); +++ } +++ }else{ +++ pCur->pTree->pHead = pNode; +++ } +++ +++ /* Point the cursor at the node just inserted, as per SQLite requirements */ +++ pCur->pNode = pNode; +++ +++ /* A new node has just been inserted, so run the balancing code */ +++ do_insert_balancing(pCur->pTree, pNode); +++ +++ /* Set up a rollback-op in case we have to roll this operation back */ +++ if( pCur->pRbtree->eTransState != TRANS_ROLLBACK ){ +++ BtRollbackOp *pOp = sqliteMalloc( sizeof(BtRollbackOp) ); +++ if( pOp==0 ) return SQLITE_NOMEM; +++ pOp->eOp = ROLLBACK_DELETE; +++ pOp->iTab = pCur->iTree; +++ pOp->nKey = pNode->nKey; +++ pOp->pKey = sqliteMallocRaw( pOp->nKey ); +++ if( sqlite_malloc_failed ) return SQLITE_NOMEM; +++ memcpy( pOp->pKey, pNode->pKey, pOp->nKey ); +++ btreeLogRollbackOp(pCur->pRbtree, pOp); +++ } +++ +++ }else{ +++ /* No need to insert a new node in the tree, as the key already exists. +++ * Just clobber the current nodes data. */ +++ +++ /* Set up a rollback-op in case we have to roll this operation back */ +++ if( pCur->pRbtree->eTransState != TRANS_ROLLBACK ){ +++ BtRollbackOp *pOp = sqliteMalloc( sizeof(BtRollbackOp) ); +++ if( pOp==0 ) return SQLITE_NOMEM; +++ pOp->iTab = pCur->iTree; +++ pOp->nKey = pCur->pNode->nKey; +++ pOp->pKey = sqliteMallocRaw( pOp->nKey ); +++ if( sqlite_malloc_failed ) return SQLITE_NOMEM; +++ memcpy( pOp->pKey, pCur->pNode->pKey, pOp->nKey ); +++ pOp->nData = pCur->pNode->nData; +++ pOp->pData = pCur->pNode->pData; +++ pOp->eOp = ROLLBACK_INSERT; +++ btreeLogRollbackOp(pCur->pRbtree, pOp); +++ }else{ +++ sqliteFree( pCur->pNode->pData ); +++ } +++ +++ /* Actually clobber the nodes data */ +++ pCur->pNode->pData = pData; +++ pCur->pNode->nData = nData; +++ } +++ +++ return SQLITE_OK; +++} +++ +++/* Move the cursor so that it points to an entry near pKey. +++** Return a success code. +++** +++** *pRes<0 The cursor is left pointing at an entry that +++** is smaller than pKey or if the table is empty +++** and the cursor is therefore left point to nothing. +++** +++** *pRes==0 The cursor is left pointing at an entry that +++** exactly matches pKey. +++** +++** *pRes>0 The cursor is left pointing at an entry that +++** is larger than pKey. +++*/ +++static int memRbtreeMoveto( +++ RbtCursor* pCur, +++ const void *pKey, +++ int nKey, +++ int *pRes +++){ +++ BtRbNode *pTmp = 0; +++ +++ pCur->pNode = pCur->pTree->pHead; +++ *pRes = -1; +++ while( pCur->pNode && *pRes ) { +++ *pRes = key_compare(pCur->pNode->pKey, pCur->pNode->nKey, pKey, nKey); +++ pTmp = pCur->pNode; +++ switch( *pRes ){ +++ case 1: /* cursor > key */ +++ pCur->pNode = pCur->pNode->pLeft; +++ break; +++ case -1: /* cursor < key */ +++ pCur->pNode = pCur->pNode->pRight; +++ break; +++ } +++ } +++ +++ /* If (pCur->pNode == NULL), then we have failed to find a match. Set +++ * pCur->pNode to pTmp, which is either NULL (if the tree is empty) or the +++ * last node traversed in the search. In either case the relation ship +++ * between pTmp and the searched for key is already stored in *pRes. pTmp is +++ * either the successor or predecessor of the key we tried to move to. */ +++ if( !pCur->pNode ) pCur->pNode = pTmp; +++ pCur->eSkip = SKIP_NONE; +++ +++ return SQLITE_OK; +++} +++ +++ +++/* +++** Delete the entry that the cursor is pointing to. +++** +++** The cursor is left pointing at either the next or the previous +++** entry. If the cursor is left pointing to the next entry, then +++** the pCur->eSkip flag is set to SKIP_NEXT which forces the next call to +++** sqliteRbtreeNext() to be a no-op. That way, you can always call +++** sqliteRbtreeNext() after a delete and the cursor will be left +++** pointing to the first entry after the deleted entry. Similarly, +++** pCur->eSkip is set to SKIP_PREV is the cursor is left pointing to +++** the entry prior to the deleted entry so that a subsequent call to +++** sqliteRbtreePrevious() will always leave the cursor pointing at the +++** entry immediately before the one that was deleted. +++*/ +++static int memRbtreeDelete(RbtCursor* pCur) +++{ +++ BtRbNode *pZ; /* The one being deleted */ +++ BtRbNode *pChild; /* The child of the spliced out node */ +++ +++ /* It is illegal to call sqliteRbtreeDelete() if we are +++ ** not in a transaction */ +++ assert( pCur->pRbtree->eTransState != TRANS_NONE ); +++ +++ /* Make sure some other cursor isn't trying to read this same table */ +++ if( checkReadLocks(pCur) ){ +++ return SQLITE_LOCKED; /* The table pCur points to has a read lock */ +++ } +++ +++ pZ = pCur->pNode; +++ if( !pZ ){ +++ return SQLITE_OK; +++ } +++ +++ /* If we are not currently doing a rollback, set up a rollback op for this +++ * deletion */ +++ if( pCur->pRbtree->eTransState != TRANS_ROLLBACK ){ +++ BtRollbackOp *pOp = sqliteMalloc( sizeof(BtRollbackOp) ); +++ if( pOp==0 ) return SQLITE_NOMEM; +++ pOp->iTab = pCur->iTree; +++ pOp->nKey = pZ->nKey; +++ pOp->pKey = pZ->pKey; +++ pOp->nData = pZ->nData; +++ pOp->pData = pZ->pData; +++ pOp->eOp = ROLLBACK_INSERT; +++ btreeLogRollbackOp(pCur->pRbtree, pOp); +++ } +++ +++ /* First do a standard binary-tree delete (node pZ is to be deleted). How +++ * to do this depends on how many children pZ has: +++ * +++ * If pZ has no children or one child, then splice out pZ. If pZ has two +++ * children, splice out the successor of pZ and replace the key and data of +++ * pZ with the key and data of the spliced out successor. */ +++ if( pZ->pLeft && pZ->pRight ){ +++ BtRbNode *pTmp; +++ int dummy; +++ pCur->eSkip = SKIP_NONE; +++ memRbtreeNext(pCur, &dummy); +++ assert( dummy == 0 ); +++ if( pCur->pRbtree->eTransState == TRANS_ROLLBACK ){ +++ sqliteFree(pZ->pKey); +++ sqliteFree(pZ->pData); +++ } +++ pZ->pData = pCur->pNode->pData; +++ pZ->nData = pCur->pNode->nData; +++ pZ->pKey = pCur->pNode->pKey; +++ pZ->nKey = pCur->pNode->nKey; +++ pTmp = pZ; +++ pZ = pCur->pNode; +++ pCur->pNode = pTmp; +++ pCur->eSkip = SKIP_NEXT; +++ }else{ +++ int res; +++ pCur->eSkip = SKIP_NONE; +++ memRbtreeNext(pCur, &res); +++ pCur->eSkip = SKIP_NEXT; +++ if( res ){ +++ memRbtreeLast(pCur, &res); +++ memRbtreePrevious(pCur, &res); +++ pCur->eSkip = SKIP_PREV; +++ } +++ if( pCur->pRbtree->eTransState == TRANS_ROLLBACK ){ +++ sqliteFree(pZ->pKey); +++ sqliteFree(pZ->pData); +++ } +++ } +++ +++ /* pZ now points at the node to be spliced out. This block does the +++ * splicing. */ +++ { +++ BtRbNode **ppParentSlot = 0; +++ assert( !pZ->pLeft || !pZ->pRight ); /* pZ has at most one child */ +++ pChild = ((pZ->pLeft)?pZ->pLeft:pZ->pRight); +++ if( pZ->pParent ){ +++ assert( pZ == pZ->pParent->pLeft || pZ == pZ->pParent->pRight ); +++ ppParentSlot = ((pZ == pZ->pParent->pLeft) +++ ?&pZ->pParent->pLeft:&pZ->pParent->pRight); +++ *ppParentSlot = pChild; +++ }else{ +++ pCur->pTree->pHead = pChild; +++ } +++ if( pChild ) pChild->pParent = pZ->pParent; +++ } +++ +++ /* pZ now points at the spliced out node. pChild is the only child of pZ, or +++ * NULL if pZ has no children. If pZ is black, and not the tree root, then we +++ * will have violated the "same number of black nodes in every path to a +++ * leaf" property of the red-black tree. The code in do_delete_balancing() +++ * repairs this. */ +++ if( pZ->isBlack ){ +++ do_delete_balancing(pCur->pTree, pChild, pZ->pParent); +++ } +++ +++ sqliteFree(pZ); +++ return SQLITE_OK; +++} +++ +++/* +++ * Empty table n of the Rbtree. +++ */ +++static int memRbtreeClearTable(Rbtree* tree, int n) +++{ +++ BtRbTree *pTree; +++ BtRbNode *pNode; +++ +++ pTree = sqliteHashFind(&tree->tblHash, 0, n); +++ assert(pTree); +++ +++ pNode = pTree->pHead; +++ while( pNode ){ +++ if( pNode->pLeft ){ +++ pNode = pNode->pLeft; +++ } +++ else if( pNode->pRight ){ +++ pNode = pNode->pRight; +++ } +++ else { +++ BtRbNode *pTmp = pNode->pParent; +++ if( tree->eTransState == TRANS_ROLLBACK ){ +++ sqliteFree( pNode->pKey ); +++ sqliteFree( pNode->pData ); +++ }else{ +++ BtRollbackOp *pRollbackOp = sqliteMallocRaw(sizeof(BtRollbackOp)); +++ if( pRollbackOp==0 ) return SQLITE_NOMEM; +++ pRollbackOp->eOp = ROLLBACK_INSERT; +++ pRollbackOp->iTab = n; +++ pRollbackOp->nKey = pNode->nKey; +++ pRollbackOp->pKey = pNode->pKey; +++ pRollbackOp->nData = pNode->nData; +++ pRollbackOp->pData = pNode->pData; +++ btreeLogRollbackOp(tree, pRollbackOp); +++ } +++ sqliteFree( pNode ); +++ if( pTmp ){ +++ if( pTmp->pLeft == pNode ) pTmp->pLeft = 0; +++ else if( pTmp->pRight == pNode ) pTmp->pRight = 0; +++ } +++ pNode = pTmp; +++ } +++ } +++ +++ pTree->pHead = 0; +++ return SQLITE_OK; +++} +++ +++static int memRbtreeFirst(RbtCursor* pCur, int *pRes) +++{ +++ if( pCur->pTree->pHead ){ +++ pCur->pNode = pCur->pTree->pHead; +++ while( pCur->pNode->pLeft ){ +++ pCur->pNode = pCur->pNode->pLeft; +++ } +++ } +++ if( pCur->pNode ){ +++ *pRes = 0; +++ }else{ +++ *pRes = 1; +++ } +++ pCur->eSkip = SKIP_NONE; +++ return SQLITE_OK; +++} +++ +++static int memRbtreeLast(RbtCursor* pCur, int *pRes) +++{ +++ if( pCur->pTree->pHead ){ +++ pCur->pNode = pCur->pTree->pHead; +++ while( pCur->pNode->pRight ){ +++ pCur->pNode = pCur->pNode->pRight; +++ } +++ } +++ if( pCur->pNode ){ +++ *pRes = 0; +++ }else{ +++ *pRes = 1; +++ } +++ pCur->eSkip = SKIP_NONE; +++ return SQLITE_OK; +++} +++ +++/* +++** Advance the cursor to the next entry in the database. If +++** successful then set *pRes=0. If the cursor +++** was already pointing to the last entry in the database before +++** this routine was called, then set *pRes=1. +++*/ +++static int memRbtreeNext(RbtCursor* pCur, int *pRes) +++{ +++ if( pCur->pNode && pCur->eSkip != SKIP_NEXT ){ +++ if( pCur->pNode->pRight ){ +++ pCur->pNode = pCur->pNode->pRight; +++ while( pCur->pNode->pLeft ) +++ pCur->pNode = pCur->pNode->pLeft; +++ }else{ +++ BtRbNode * pX = pCur->pNode; +++ pCur->pNode = pX->pParent; +++ while( pCur->pNode && (pCur->pNode->pRight == pX) ){ +++ pX = pCur->pNode; +++ pCur->pNode = pX->pParent; +++ } +++ } +++ } +++ pCur->eSkip = SKIP_NONE; +++ +++ if( !pCur->pNode ){ +++ *pRes = 1; +++ }else{ +++ *pRes = 0; +++ } +++ +++ return SQLITE_OK; +++} +++ +++static int memRbtreePrevious(RbtCursor* pCur, int *pRes) +++{ +++ if( pCur->pNode && pCur->eSkip != SKIP_PREV ){ +++ if( pCur->pNode->pLeft ){ +++ pCur->pNode = pCur->pNode->pLeft; +++ while( pCur->pNode->pRight ) +++ pCur->pNode = pCur->pNode->pRight; +++ }else{ +++ BtRbNode * pX = pCur->pNode; +++ pCur->pNode = pX->pParent; +++ while( pCur->pNode && (pCur->pNode->pLeft == pX) ){ +++ pX = pCur->pNode; +++ pCur->pNode = pX->pParent; +++ } +++ } +++ } +++ pCur->eSkip = SKIP_NONE; +++ +++ if( !pCur->pNode ){ +++ *pRes = 1; +++ }else{ +++ *pRes = 0; +++ } +++ +++ return SQLITE_OK; +++} +++ +++static int memRbtreeKeySize(RbtCursor* pCur, int *pSize) +++{ +++ if( pCur->pNode ){ +++ *pSize = pCur->pNode->nKey; +++ }else{ +++ *pSize = 0; +++ } +++ return SQLITE_OK; +++} +++ +++static int memRbtreeKey(RbtCursor* pCur, int offset, int amt, char *zBuf) +++{ +++ if( !pCur->pNode ) return 0; +++ if( !pCur->pNode->pKey || ((amt + offset) <= pCur->pNode->nKey) ){ +++ memcpy(zBuf, ((char*)pCur->pNode->pKey)+offset, amt); +++ }else{ +++ memcpy(zBuf, ((char*)pCur->pNode->pKey)+offset, pCur->pNode->nKey-offset); +++ amt = pCur->pNode->nKey-offset; +++ } +++ return amt; +++} +++ +++static int memRbtreeDataSize(RbtCursor* pCur, int *pSize) +++{ +++ if( pCur->pNode ){ +++ *pSize = pCur->pNode->nData; +++ }else{ +++ *pSize = 0; +++ } +++ return SQLITE_OK; +++} +++ +++static int memRbtreeData(RbtCursor *pCur, int offset, int amt, char *zBuf) +++{ +++ if( !pCur->pNode ) return 0; +++ if( (amt + offset) <= pCur->pNode->nData ){ +++ memcpy(zBuf, ((char*)pCur->pNode->pData)+offset, amt); +++ }else{ +++ memcpy(zBuf, ((char*)pCur->pNode->pData)+offset ,pCur->pNode->nData-offset); +++ amt = pCur->pNode->nData-offset; +++ } +++ return amt; +++} +++ +++static int memRbtreeCloseCursor(RbtCursor* pCur) +++{ +++ if( pCur->pTree->pCursors==pCur ){ +++ pCur->pTree->pCursors = pCur->pShared; +++ }else{ +++ RbtCursor *p = pCur->pTree->pCursors; +++ while( p && p->pShared!=pCur ){ p = p->pShared; } +++ assert( p!=0 ); +++ if( p ){ +++ p->pShared = pCur->pShared; +++ } +++ } +++ sqliteFree(pCur); +++ return SQLITE_OK; +++} +++ +++static int memRbtreeGetMeta(Rbtree* tree, int* aMeta) +++{ +++ memcpy( aMeta, tree->aMetaData, sizeof(int) * SQLITE_N_BTREE_META ); +++ return SQLITE_OK; +++} +++ +++static int memRbtreeUpdateMeta(Rbtree* tree, int* aMeta) +++{ +++ memcpy( tree->aMetaData, aMeta, sizeof(int) * SQLITE_N_BTREE_META ); +++ return SQLITE_OK; +++} +++ +++/* +++ * Check that each table in the Rbtree meets the requirements for a red-black +++ * binary tree. If an error is found, return an explanation of the problem in +++ * memory obtained from sqliteMalloc(). Parameters aRoot and nRoot are ignored. +++ */ +++static char *memRbtreeIntegrityCheck(Rbtree* tree, int* aRoot, int nRoot) +++{ +++ char * msg = 0; +++ HashElem *p; +++ +++ for(p=sqliteHashFirst(&tree->tblHash); p; p=sqliteHashNext(p)){ +++ BtRbTree *pTree = sqliteHashData(p); +++ check_redblack_tree(pTree, &msg); +++ } +++ +++ return msg; +++} +++ +++static int memRbtreeSetCacheSize(Rbtree* tree, int sz) +++{ +++ return SQLITE_OK; +++} +++ +++static int memRbtreeSetSafetyLevel(Rbtree *pBt, int level){ +++ return SQLITE_OK; +++} +++ +++static int memRbtreeBeginTrans(Rbtree* tree) +++{ +++ if( tree->eTransState != TRANS_NONE ) +++ return SQLITE_ERROR; +++ +++ assert( tree->pTransRollback == 0 ); +++ tree->eTransState = TRANS_INTRANSACTION; +++ return SQLITE_OK; +++} +++ +++/* +++** Delete a linked list of BtRollbackOp structures. +++*/ +++static void deleteRollbackList(BtRollbackOp *pOp){ +++ while( pOp ){ +++ BtRollbackOp *pTmp = pOp->pNext; +++ sqliteFree(pOp->pData); +++ sqliteFree(pOp->pKey); +++ sqliteFree(pOp); +++ pOp = pTmp; +++ } +++} +++ +++static int memRbtreeCommit(Rbtree* tree){ +++ /* Just delete pTransRollback and pCheckRollback */ +++ deleteRollbackList(tree->pCheckRollback); +++ deleteRollbackList(tree->pTransRollback); +++ tree->pTransRollback = 0; +++ tree->pCheckRollback = 0; +++ tree->pCheckRollbackTail = 0; +++ tree->eTransState = TRANS_NONE; +++ return SQLITE_OK; +++} +++ +++/* +++ * Close the supplied Rbtree. Delete everything associated with it. +++ */ +++static int memRbtreeClose(Rbtree* tree) +++{ +++ HashElem *p; +++ memRbtreeCommit(tree); +++ while( (p=sqliteHashFirst(&tree->tblHash))!=0 ){ +++ tree->eTransState = TRANS_ROLLBACK; +++ memRbtreeDropTable(tree, sqliteHashKeysize(p)); +++ } +++ sqliteHashClear(&tree->tblHash); +++ sqliteFree(tree); +++ return SQLITE_OK; +++} +++ +++/* +++ * Execute and delete the supplied rollback-list on pRbtree. +++ */ +++static void execute_rollback_list(Rbtree *pRbtree, BtRollbackOp *pList) +++{ +++ BtRollbackOp *pTmp; +++ RbtCursor cur; +++ int res; +++ +++ cur.pRbtree = pRbtree; +++ cur.wrFlag = 1; +++ while( pList ){ +++ switch( pList->eOp ){ +++ case ROLLBACK_INSERT: +++ cur.pTree = sqliteHashFind( &pRbtree->tblHash, 0, pList->iTab ); +++ assert(cur.pTree); +++ cur.iTree = pList->iTab; +++ cur.eSkip = SKIP_NONE; +++ memRbtreeInsert( &cur, pList->pKey, +++ pList->nKey, pList->pData, pList->nData ); +++ break; +++ case ROLLBACK_DELETE: +++ cur.pTree = sqliteHashFind( &pRbtree->tblHash, 0, pList->iTab ); +++ assert(cur.pTree); +++ cur.iTree = pList->iTab; +++ cur.eSkip = SKIP_NONE; +++ memRbtreeMoveto(&cur, pList->pKey, pList->nKey, &res); +++ assert(res == 0); +++ memRbtreeDelete( &cur ); +++ break; +++ case ROLLBACK_CREATE: +++ btreeCreateTable(pRbtree, pList->iTab); +++ break; +++ case ROLLBACK_DROP: +++ memRbtreeDropTable(pRbtree, pList->iTab); +++ break; +++ default: +++ assert(0); +++ } +++ sqliteFree(pList->pKey); +++ sqliteFree(pList->pData); +++ pTmp = pList->pNext; +++ sqliteFree(pList); +++ pList = pTmp; +++ } +++} +++ +++static int memRbtreeRollback(Rbtree* tree) +++{ +++ tree->eTransState = TRANS_ROLLBACK; +++ execute_rollback_list(tree, tree->pCheckRollback); +++ execute_rollback_list(tree, tree->pTransRollback); +++ tree->pTransRollback = 0; +++ tree->pCheckRollback = 0; +++ tree->pCheckRollbackTail = 0; +++ tree->eTransState = TRANS_NONE; +++ return SQLITE_OK; +++} +++ +++static int memRbtreeBeginCkpt(Rbtree* tree) +++{ +++ if( tree->eTransState != TRANS_INTRANSACTION ) +++ return SQLITE_ERROR; +++ +++ assert( tree->pCheckRollback == 0 ); +++ assert( tree->pCheckRollbackTail == 0 ); +++ tree->eTransState = TRANS_INCHECKPOINT; +++ return SQLITE_OK; +++} +++ +++static int memRbtreeCommitCkpt(Rbtree* tree) +++{ +++ if( tree->eTransState == TRANS_INCHECKPOINT ){ +++ if( tree->pCheckRollback ){ +++ tree->pCheckRollbackTail->pNext = tree->pTransRollback; +++ tree->pTransRollback = tree->pCheckRollback; +++ tree->pCheckRollback = 0; +++ tree->pCheckRollbackTail = 0; +++ } +++ tree->eTransState = TRANS_INTRANSACTION; +++ } +++ return SQLITE_OK; +++} +++ +++static int memRbtreeRollbackCkpt(Rbtree* tree) +++{ +++ if( tree->eTransState != TRANS_INCHECKPOINT ) return SQLITE_OK; +++ tree->eTransState = TRANS_ROLLBACK; +++ execute_rollback_list(tree, tree->pCheckRollback); +++ tree->pCheckRollback = 0; +++ tree->pCheckRollbackTail = 0; +++ tree->eTransState = TRANS_INTRANSACTION; +++ return SQLITE_OK; +++} +++ +++#ifdef SQLITE_TEST +++static int memRbtreePageDump(Rbtree* tree, int pgno, int rec) +++{ +++ assert(!"Cannot call sqliteRbtreePageDump"); +++ return SQLITE_OK; +++} +++ +++static int memRbtreeCursorDump(RbtCursor* pCur, int* aRes) +++{ +++ assert(!"Cannot call sqliteRbtreeCursorDump"); +++ return SQLITE_OK; +++} +++#endif +++ +++static struct Pager *memRbtreePager(Rbtree* tree) +++{ +++ return 0; +++} +++ +++/* +++** Return the full pathname of the underlying database file. +++*/ +++static const char *memRbtreeGetFilename(Rbtree *pBt){ +++ return 0; /* A NULL return indicates there is no underlying file */ +++} +++ +++/* +++** The copy file function is not implemented for the in-memory database +++*/ +++static int memRbtreeCopyFile(Rbtree *pBt, Rbtree *pBt2){ +++ return SQLITE_INTERNAL; /* Not implemented */ +++} +++ +++static BtOps sqliteRbtreeOps = { +++ (int(*)(Btree*)) memRbtreeClose, +++ (int(*)(Btree*,int)) memRbtreeSetCacheSize, +++ (int(*)(Btree*,int)) memRbtreeSetSafetyLevel, +++ (int(*)(Btree*)) memRbtreeBeginTrans, +++ (int(*)(Btree*)) memRbtreeCommit, +++ (int(*)(Btree*)) memRbtreeRollback, +++ (int(*)(Btree*)) memRbtreeBeginCkpt, +++ (int(*)(Btree*)) memRbtreeCommitCkpt, +++ (int(*)(Btree*)) memRbtreeRollbackCkpt, +++ (int(*)(Btree*,int*)) memRbtreeCreateTable, +++ (int(*)(Btree*,int*)) memRbtreeCreateTable, +++ (int(*)(Btree*,int)) memRbtreeDropTable, +++ (int(*)(Btree*,int)) memRbtreeClearTable, +++ (int(*)(Btree*,int,int,BtCursor**)) memRbtreeCursor, +++ (int(*)(Btree*,int*)) memRbtreeGetMeta, +++ (int(*)(Btree*,int*)) memRbtreeUpdateMeta, +++ (char*(*)(Btree*,int*,int)) memRbtreeIntegrityCheck, +++ (const char*(*)(Btree*)) memRbtreeGetFilename, +++ (int(*)(Btree*,Btree*)) memRbtreeCopyFile, +++ (struct Pager*(*)(Btree*)) memRbtreePager, +++#ifdef SQLITE_TEST +++ (int(*)(Btree*,int,int)) memRbtreePageDump, +++#endif +++}; +++ +++static BtCursorOps sqliteRbtreeCursorOps = { +++ (int(*)(BtCursor*,const void*,int,int*)) memRbtreeMoveto, +++ (int(*)(BtCursor*)) memRbtreeDelete, +++ (int(*)(BtCursor*,const void*,int,const void*,int)) memRbtreeInsert, +++ (int(*)(BtCursor*,int*)) memRbtreeFirst, +++ (int(*)(BtCursor*,int*)) memRbtreeLast, +++ (int(*)(BtCursor*,int*)) memRbtreeNext, +++ (int(*)(BtCursor*,int*)) memRbtreePrevious, +++ (int(*)(BtCursor*,int*)) memRbtreeKeySize, +++ (int(*)(BtCursor*,int,int,char*)) memRbtreeKey, +++ (int(*)(BtCursor*,const void*,int,int,int*)) memRbtreeKeyCompare, +++ (int(*)(BtCursor*,int*)) memRbtreeDataSize, +++ (int(*)(BtCursor*,int,int,char*)) memRbtreeData, +++ (int(*)(BtCursor*)) memRbtreeCloseCursor, +++#ifdef SQLITE_TEST +++ (int(*)(BtCursor*,int*)) memRbtreeCursorDump, +++#endif +++ +++}; +++ +++#endif /* SQLITE_OMIT_INMEMORYDB */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/build.c ++@@ -0,0 +1,2156 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains C code routines that are called by the SQLite parser +++** when syntax rules are reduced. The routines in this file handle the +++** following kinds of SQL syntax: +++** +++** CREATE TABLE +++** DROP TABLE +++** CREATE INDEX +++** DROP INDEX +++** creating ID lists +++** BEGIN TRANSACTION +++** COMMIT +++** ROLLBACK +++** PRAGMA +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include +++ +++/* +++** This routine is called when a new SQL statement is beginning to +++** be parsed. Check to see if the schema for the database needs +++** to be read from the SQLITE_MASTER and SQLITE_TEMP_MASTER tables. +++** If it does, then read it. +++*/ +++void sqliteBeginParse(Parse *pParse, int explainFlag){ +++ sqlite *db = pParse->db; +++ int i; +++ pParse->explain = explainFlag; +++ if((db->flags & SQLITE_Initialized)==0 && db->init.busy==0 ){ +++ int rc = sqliteInit(db, &pParse->zErrMsg); +++ if( rc!=SQLITE_OK ){ +++ pParse->rc = rc; +++ pParse->nErr++; +++ } +++ } +++ for(i=0; inDb; i++){ +++ DbClearProperty(db, i, DB_Locked); +++ if( !db->aDb[i].inTrans ){ +++ DbClearProperty(db, i, DB_Cookie); +++ } +++ } +++ pParse->nVar = 0; +++} +++ +++/* +++** This routine is called after a single SQL statement has been +++** parsed and we want to execute the VDBE code to implement +++** that statement. Prior action routines should have already +++** constructed VDBE code to do the work of the SQL statement. +++** This routine just has to execute the VDBE code. +++** +++** Note that if an error occurred, it might be the case that +++** no VDBE code was generated. +++*/ +++void sqliteExec(Parse *pParse){ +++ sqlite *db = pParse->db; +++ Vdbe *v = pParse->pVdbe; +++ +++ if( v==0 && (v = sqliteGetVdbe(pParse))!=0 ){ +++ sqliteVdbeAddOp(v, OP_Halt, 0, 0); +++ } +++ if( sqlite_malloc_failed ) return; +++ if( v && pParse->nErr==0 ){ +++ FILE *trace = (db->flags & SQLITE_VdbeTrace)!=0 ? stdout : 0; +++ sqliteVdbeTrace(v, trace); +++ sqliteVdbeMakeReady(v, pParse->nVar, pParse->explain); +++ pParse->rc = pParse->nErr ? SQLITE_ERROR : SQLITE_DONE; +++ pParse->colNamesSet = 0; +++ }else if( pParse->rc==SQLITE_OK ){ +++ pParse->rc = SQLITE_ERROR; +++ } +++ pParse->nTab = 0; +++ pParse->nMem = 0; +++ pParse->nSet = 0; +++ pParse->nAgg = 0; +++ pParse->nVar = 0; +++} +++ +++/* +++** Locate the in-memory structure that describes +++** a particular database table given the name +++** of that table and (optionally) the name of the database +++** containing the table. Return NULL if not found. +++** +++** If zDatabase is 0, all databases are searched for the +++** table and the first matching table is returned. (No checking +++** for duplicate table names is done.) The search order is +++** TEMP first, then MAIN, then any auxiliary databases added +++** using the ATTACH command. +++** +++** See also sqliteLocateTable(). +++*/ +++Table *sqliteFindTable(sqlite *db, const char *zName, const char *zDatabase){ +++ Table *p = 0; +++ int i; +++ for(i=0; inDb; i++){ +++ int j = (i<2) ? i^1 : i; /* Search TEMP before MAIN */ +++ if( zDatabase!=0 && sqliteStrICmp(zDatabase, db->aDb[j].zName) ) continue; +++ p = sqliteHashFind(&db->aDb[j].tblHash, zName, strlen(zName)+1); +++ if( p ) break; +++ } +++ return p; +++} +++ +++/* +++** Locate the in-memory structure that describes +++** a particular database table given the name +++** of that table and (optionally) the name of the database +++** containing the table. Return NULL if not found. +++** Also leave an error message in pParse->zErrMsg. +++** +++** The difference between this routine and sqliteFindTable() +++** is that this routine leaves an error message in pParse->zErrMsg +++** where sqliteFindTable() does not. +++*/ +++Table *sqliteLocateTable(Parse *pParse, const char *zName, const char *zDbase){ +++ Table *p; +++ +++ p = sqliteFindTable(pParse->db, zName, zDbase); +++ if( p==0 ){ +++ if( zDbase ){ +++ sqliteErrorMsg(pParse, "no such table: %s.%s", zDbase, zName); +++ }else if( sqliteFindTable(pParse->db, zName, 0)!=0 ){ +++ sqliteErrorMsg(pParse, "table \"%s\" is not in database \"%s\"", +++ zName, zDbase); +++ }else{ +++ sqliteErrorMsg(pParse, "no such table: %s", zName); +++ } +++ } +++ return p; +++} +++ +++/* +++** Locate the in-memory structure that describes +++** a particular index given the name of that index +++** and the name of the database that contains the index. +++** Return NULL if not found. +++** +++** If zDatabase is 0, all databases are searched for the +++** table and the first matching index is returned. (No checking +++** for duplicate index names is done.) The search order is +++** TEMP first, then MAIN, then any auxiliary databases added +++** using the ATTACH command. +++*/ +++Index *sqliteFindIndex(sqlite *db, const char *zName, const char *zDb){ +++ Index *p = 0; +++ int i; +++ for(i=0; inDb; i++){ +++ int j = (i<2) ? i^1 : i; /* Search TEMP before MAIN */ +++ if( zDb && sqliteStrICmp(zDb, db->aDb[j].zName) ) continue; +++ p = sqliteHashFind(&db->aDb[j].idxHash, zName, strlen(zName)+1); +++ if( p ) break; +++ } +++ return p; +++} +++ +++/* +++** Remove the given index from the index hash table, and free +++** its memory structures. +++** +++** The index is removed from the database hash tables but +++** it is not unlinked from the Table that it indexes. +++** Unlinking from the Table must be done by the calling function. +++*/ +++static void sqliteDeleteIndex(sqlite *db, Index *p){ +++ Index *pOld; +++ +++ assert( db!=0 && p->zName!=0 ); +++ pOld = sqliteHashInsert(&db->aDb[p->iDb].idxHash, p->zName, +++ strlen(p->zName)+1, 0); +++ if( pOld!=0 && pOld!=p ){ +++ sqliteHashInsert(&db->aDb[p->iDb].idxHash, pOld->zName, +++ strlen(pOld->zName)+1, pOld); +++ } +++ sqliteFree(p); +++} +++ +++/* +++** Unlink the given index from its table, then remove +++** the index from the index hash table and free its memory +++** structures. +++*/ +++void sqliteUnlinkAndDeleteIndex(sqlite *db, Index *pIndex){ +++ if( pIndex->pTable->pIndex==pIndex ){ +++ pIndex->pTable->pIndex = pIndex->pNext; +++ }else{ +++ Index *p; +++ for(p=pIndex->pTable->pIndex; p && p->pNext!=pIndex; p=p->pNext){} +++ if( p && p->pNext==pIndex ){ +++ p->pNext = pIndex->pNext; +++ } +++ } +++ sqliteDeleteIndex(db, pIndex); +++} +++ +++/* +++** Erase all schema information from the in-memory hash tables of +++** database connection. This routine is called to reclaim memory +++** before the connection closes. It is also called during a rollback +++** if there were schema changes during the transaction. +++** +++** If iDb<=0 then reset the internal schema tables for all database +++** files. If iDb>=2 then reset the internal schema for only the +++** single file indicated. +++*/ +++void sqliteResetInternalSchema(sqlite *db, int iDb){ +++ HashElem *pElem; +++ Hash temp1; +++ Hash temp2; +++ int i, j; +++ +++ assert( iDb>=0 && iDbnDb ); +++ db->flags &= ~SQLITE_Initialized; +++ for(i=iDb; inDb; i++){ +++ Db *pDb = &db->aDb[i]; +++ temp1 = pDb->tblHash; +++ temp2 = pDb->trigHash; +++ sqliteHashInit(&pDb->trigHash, SQLITE_HASH_STRING, 0); +++ sqliteHashClear(&pDb->aFKey); +++ sqliteHashClear(&pDb->idxHash); +++ for(pElem=sqliteHashFirst(&temp2); pElem; pElem=sqliteHashNext(pElem)){ +++ Trigger *pTrigger = sqliteHashData(pElem); +++ sqliteDeleteTrigger(pTrigger); +++ } +++ sqliteHashClear(&temp2); +++ sqliteHashInit(&pDb->tblHash, SQLITE_HASH_STRING, 0); +++ for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){ +++ Table *pTab = sqliteHashData(pElem); +++ sqliteDeleteTable(db, pTab); +++ } +++ sqliteHashClear(&temp1); +++ DbClearProperty(db, i, DB_SchemaLoaded); +++ if( iDb>0 ) return; +++ } +++ assert( iDb==0 ); +++ db->flags &= ~SQLITE_InternChanges; +++ +++ /* If one or more of the auxiliary database files has been closed, +++ ** then remove then from the auxiliary database list. We take the +++ ** opportunity to do this here since we have just deleted all of the +++ ** schema hash tables and therefore do not have to make any changes +++ ** to any of those tables. +++ */ +++ for(i=0; inDb; i++){ +++ struct Db *pDb = &db->aDb[i]; +++ if( pDb->pBt==0 ){ +++ if( pDb->pAux && pDb->xFreeAux ) pDb->xFreeAux(pDb->pAux); +++ pDb->pAux = 0; +++ } +++ } +++ for(i=j=2; inDb; i++){ +++ struct Db *pDb = &db->aDb[i]; +++ if( pDb->pBt==0 ){ +++ sqliteFree(pDb->zName); +++ pDb->zName = 0; +++ continue; +++ } +++ if( jaDb[j] = db->aDb[i]; +++ } +++ j++; +++ } +++ memset(&db->aDb[j], 0, (db->nDb-j)*sizeof(db->aDb[j])); +++ db->nDb = j; +++ if( db->nDb<=2 && db->aDb!=db->aDbStatic ){ +++ memcpy(db->aDbStatic, db->aDb, 2*sizeof(db->aDb[0])); +++ sqliteFree(db->aDb); +++ db->aDb = db->aDbStatic; +++ } +++} +++ +++/* +++** This routine is called whenever a rollback occurs. If there were +++** schema changes during the transaction, then we have to reset the +++** internal hash tables and reload them from disk. +++*/ +++void sqliteRollbackInternalChanges(sqlite *db){ +++ if( db->flags & SQLITE_InternChanges ){ +++ sqliteResetInternalSchema(db, 0); +++ } +++} +++ +++/* +++** This routine is called when a commit occurs. +++*/ +++void sqliteCommitInternalChanges(sqlite *db){ +++ db->aDb[0].schema_cookie = db->next_cookie; +++ db->flags &= ~SQLITE_InternChanges; +++} +++ +++/* +++** Remove the memory data structures associated with the given +++** Table. No changes are made to disk by this routine. +++** +++** This routine just deletes the data structure. It does not unlink +++** the table data structure from the hash table. Nor does it remove +++** foreign keys from the sqlite.aFKey hash table. But it does destroy +++** memory structures of the indices and foreign keys associated with +++** the table. +++** +++** Indices associated with the table are unlinked from the "db" +++** data structure if db!=NULL. If db==NULL, indices attached to +++** the table are deleted, but it is assumed they have already been +++** unlinked. +++*/ +++void sqliteDeleteTable(sqlite *db, Table *pTable){ +++ int i; +++ Index *pIndex, *pNext; +++ FKey *pFKey, *pNextFKey; +++ +++ if( pTable==0 ) return; +++ +++ /* Delete all indices associated with this table +++ */ +++ for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){ +++ pNext = pIndex->pNext; +++ assert( pIndex->iDb==pTable->iDb || (pTable->iDb==0 && pIndex->iDb==1) ); +++ sqliteDeleteIndex(db, pIndex); +++ } +++ +++ /* Delete all foreign keys associated with this table. The keys +++ ** should have already been unlinked from the db->aFKey hash table +++ */ +++ for(pFKey=pTable->pFKey; pFKey; pFKey=pNextFKey){ +++ pNextFKey = pFKey->pNextFrom; +++ assert( pTable->iDbnDb ); +++ assert( sqliteHashFind(&db->aDb[pTable->iDb].aFKey, +++ pFKey->zTo, strlen(pFKey->zTo)+1)!=pFKey ); +++ sqliteFree(pFKey); +++ } +++ +++ /* Delete the Table structure itself. +++ */ +++ for(i=0; inCol; i++){ +++ sqliteFree(pTable->aCol[i].zName); +++ sqliteFree(pTable->aCol[i].zDflt); +++ sqliteFree(pTable->aCol[i].zType); +++ } +++ sqliteFree(pTable->zName); +++ sqliteFree(pTable->aCol); +++ sqliteSelectDelete(pTable->pSelect); +++ sqliteFree(pTable); +++} +++ +++/* +++** Unlink the given table from the hash tables and the delete the +++** table structure with all its indices and foreign keys. +++*/ +++static void sqliteUnlinkAndDeleteTable(sqlite *db, Table *p){ +++ Table *pOld; +++ FKey *pF1, *pF2; +++ int i = p->iDb; +++ assert( db!=0 ); +++ pOld = sqliteHashInsert(&db->aDb[i].tblHash, p->zName, strlen(p->zName)+1, 0); +++ assert( pOld==0 || pOld==p ); +++ for(pF1=p->pFKey; pF1; pF1=pF1->pNextFrom){ +++ int nTo = strlen(pF1->zTo) + 1; +++ pF2 = sqliteHashFind(&db->aDb[i].aFKey, pF1->zTo, nTo); +++ if( pF2==pF1 ){ +++ sqliteHashInsert(&db->aDb[i].aFKey, pF1->zTo, nTo, pF1->pNextTo); +++ }else{ +++ while( pF2 && pF2->pNextTo!=pF1 ){ pF2=pF2->pNextTo; } +++ if( pF2 ){ +++ pF2->pNextTo = pF1->pNextTo; +++ } +++ } +++ } +++ sqliteDeleteTable(db, p); +++} +++ +++/* +++** Construct the name of a user table or index from a token. +++** +++** Space to hold the name is obtained from sqliteMalloc() and must +++** be freed by the calling function. +++*/ +++char *sqliteTableNameFromToken(Token *pName){ +++ char *zName = sqliteStrNDup(pName->z, pName->n); +++ sqliteDequote(zName); +++ return zName; +++} +++ +++/* +++** Generate code to open the appropriate master table. The table +++** opened will be SQLITE_MASTER for persistent tables and +++** SQLITE_TEMP_MASTER for temporary tables. The table is opened +++** on cursor 0. +++*/ +++void sqliteOpenMasterTable(Vdbe *v, int isTemp){ +++ sqliteVdbeAddOp(v, OP_Integer, isTemp, 0); +++ sqliteVdbeAddOp(v, OP_OpenWrite, 0, 2); +++} +++ +++/* +++** Begin constructing a new table representation in memory. This is +++** the first of several action routines that get called in response +++** to a CREATE TABLE statement. In particular, this routine is called +++** after seeing tokens "CREATE" and "TABLE" and the table name. The +++** pStart token is the CREATE and pName is the table name. The isTemp +++** flag is true if the table should be stored in the auxiliary database +++** file instead of in the main database file. This is normally the case +++** when the "TEMP" or "TEMPORARY" keyword occurs in between +++** CREATE and TABLE. +++** +++** The new table record is initialized and put in pParse->pNewTable. +++** As more of the CREATE TABLE statement is parsed, additional action +++** routines will be called to add more information to this record. +++** At the end of the CREATE TABLE statement, the sqliteEndTable() routine +++** is called to complete the construction of the new table record. +++*/ +++void sqliteStartTable( +++ Parse *pParse, /* Parser context */ +++ Token *pStart, /* The "CREATE" token */ +++ Token *pName, /* Name of table or view to create */ +++ int isTemp, /* True if this is a TEMP table */ +++ int isView /* True if this is a VIEW */ +++){ +++ Table *pTable; +++ Index *pIdx; +++ char *zName; +++ sqlite *db = pParse->db; +++ Vdbe *v; +++ int iDb; +++ +++ pParse->sFirstToken = *pStart; +++ zName = sqliteTableNameFromToken(pName); +++ if( zName==0 ) return; +++ if( db->init.iDb==1 ) isTemp = 1; +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ assert( (isTemp & 1)==isTemp ); +++ { +++ int code; +++ char *zDb = isTemp ? "temp" : "main"; +++ if( sqliteAuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){ +++ sqliteFree(zName); +++ return; +++ } +++ if( isView ){ +++ if( isTemp ){ +++ code = SQLITE_CREATE_TEMP_VIEW; +++ }else{ +++ code = SQLITE_CREATE_VIEW; +++ } +++ }else{ +++ if( isTemp ){ +++ code = SQLITE_CREATE_TEMP_TABLE; +++ }else{ +++ code = SQLITE_CREATE_TABLE; +++ } +++ } +++ if( sqliteAuthCheck(pParse, code, zName, 0, zDb) ){ +++ sqliteFree(zName); +++ return; +++ } +++ } +++#endif +++ +++ +++ /* Before trying to create a temporary table, make sure the Btree for +++ ** holding temporary tables is open. +++ */ +++ if( isTemp && db->aDb[1].pBt==0 && !pParse->explain ){ +++ int rc = sqliteBtreeFactory(db, 0, 0, MAX_PAGES, &db->aDb[1].pBt); +++ if( rc!=SQLITE_OK ){ +++ sqliteErrorMsg(pParse, "unable to open a temporary database " +++ "file for storing temporary tables"); +++ pParse->nErr++; +++ return; +++ } +++ if( db->flags & SQLITE_InTrans ){ +++ rc = sqliteBtreeBeginTrans(db->aDb[1].pBt); +++ if( rc!=SQLITE_OK ){ +++ sqliteErrorMsg(pParse, "unable to get a write lock on " +++ "the temporary database file"); +++ return; +++ } +++ } +++ } +++ +++ /* Make sure the new table name does not collide with an existing +++ ** index or table name. Issue an error message if it does. +++ ** +++ ** If we are re-reading the sqlite_master table because of a schema +++ ** change and a new permanent table is found whose name collides with +++ ** an existing temporary table, that is not an error. +++ */ +++ pTable = sqliteFindTable(db, zName, 0); +++ iDb = isTemp ? 1 : db->init.iDb; +++ if( pTable!=0 && (pTable->iDb==iDb || !db->init.busy) ){ +++ sqliteErrorMsg(pParse, "table %T already exists", pName); +++ sqliteFree(zName); +++ return; +++ } +++ if( (pIdx = sqliteFindIndex(db, zName, 0))!=0 && +++ (pIdx->iDb==0 || !db->init.busy) ){ +++ sqliteErrorMsg(pParse, "there is already an index named %s", zName); +++ sqliteFree(zName); +++ return; +++ } +++ pTable = sqliteMalloc( sizeof(Table) ); +++ if( pTable==0 ){ +++ sqliteFree(zName); +++ return; +++ } +++ pTable->zName = zName; +++ pTable->nCol = 0; +++ pTable->aCol = 0; +++ pTable->iPKey = -1; +++ pTable->pIndex = 0; +++ pTable->iDb = iDb; +++ if( pParse->pNewTable ) sqliteDeleteTable(db, pParse->pNewTable); +++ pParse->pNewTable = pTable; +++ +++ /* Begin generating the code that will insert the table record into +++ ** the SQLITE_MASTER table. Note in particular that we must go ahead +++ ** and allocate the record number for the table entry now. Before any +++ ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause +++ ** indices to be created and the table record must come before the +++ ** indices. Hence, the record number for the table must be allocated +++ ** now. +++ */ +++ if( !db->init.busy && (v = sqliteGetVdbe(pParse))!=0 ){ +++ sqliteBeginWriteOperation(pParse, 0, isTemp); +++ if( !isTemp ){ +++ sqliteVdbeAddOp(v, OP_Integer, db->file_format, 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 1); +++ } +++ sqliteOpenMasterTable(v, isTemp); +++ sqliteVdbeAddOp(v, OP_NewRecno, 0, 0); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, 0, 0); +++ } +++} +++ +++/* +++** Add a new column to the table currently being constructed. +++** +++** The parser calls this routine once for each column declaration +++** in a CREATE TABLE statement. sqliteStartTable() gets called +++** first to get things going. Then this routine is called for each +++** column. +++*/ +++void sqliteAddColumn(Parse *pParse, Token *pName){ +++ Table *p; +++ int i; +++ char *z = 0; +++ Column *pCol; +++ if( (p = pParse->pNewTable)==0 ) return; +++ sqliteSetNString(&z, pName->z, pName->n, 0); +++ if( z==0 ) return; +++ sqliteDequote(z); +++ for(i=0; inCol; i++){ +++ if( sqliteStrICmp(z, p->aCol[i].zName)==0 ){ +++ sqliteErrorMsg(pParse, "duplicate column name: %s", z); +++ sqliteFree(z); +++ return; +++ } +++ } +++ if( (p->nCol & 0x7)==0 ){ +++ Column *aNew; +++ aNew = sqliteRealloc( p->aCol, (p->nCol+8)*sizeof(p->aCol[0])); +++ if( aNew==0 ) return; +++ p->aCol = aNew; +++ } +++ pCol = &p->aCol[p->nCol]; +++ memset(pCol, 0, sizeof(p->aCol[0])); +++ pCol->zName = z; +++ pCol->sortOrder = SQLITE_SO_NUM; +++ p->nCol++; +++} +++ +++/* +++** This routine is called by the parser while in the middle of +++** parsing a CREATE TABLE statement. A "NOT NULL" constraint has +++** been seen on a column. This routine sets the notNull flag on +++** the column currently under construction. +++*/ +++void sqliteAddNotNull(Parse *pParse, int onError){ +++ Table *p; +++ int i; +++ if( (p = pParse->pNewTable)==0 ) return; +++ i = p->nCol-1; +++ if( i>=0 ) p->aCol[i].notNull = onError; +++} +++ +++/* +++** This routine is called by the parser while in the middle of +++** parsing a CREATE TABLE statement. The pFirst token is the first +++** token in the sequence of tokens that describe the type of the +++** column currently under construction. pLast is the last token +++** in the sequence. Use this information to construct a string +++** that contains the typename of the column and store that string +++** in zType. +++*/ +++void sqliteAddColumnType(Parse *pParse, Token *pFirst, Token *pLast){ +++ Table *p; +++ int i, j; +++ int n; +++ char *z, **pz; +++ Column *pCol; +++ if( (p = pParse->pNewTable)==0 ) return; +++ i = p->nCol-1; +++ if( i<0 ) return; +++ pCol = &p->aCol[i]; +++ pz = &pCol->zType; +++ n = pLast->n + Addr(pLast->z) - Addr(pFirst->z); +++ sqliteSetNString(pz, pFirst->z, n, 0); +++ z = *pz; +++ if( z==0 ) return; +++ for(i=j=0; z[i]; i++){ +++ int c = z[i]; +++ if( isspace(c) ) continue; +++ z[j++] = c; +++ } +++ z[j] = 0; +++ if( pParse->db->file_format>=4 ){ +++ pCol->sortOrder = sqliteCollateType(z, n); +++ }else{ +++ pCol->sortOrder = SQLITE_SO_NUM; +++ } +++} +++ +++/* +++** The given token is the default value for the last column added to +++** the table currently under construction. If "minusFlag" is true, it +++** means the value token was preceded by a minus sign. +++** +++** This routine is called by the parser while in the middle of +++** parsing a CREATE TABLE statement. +++*/ +++void sqliteAddDefaultValue(Parse *pParse, Token *pVal, int minusFlag){ +++ Table *p; +++ int i; +++ char **pz; +++ if( (p = pParse->pNewTable)==0 ) return; +++ i = p->nCol-1; +++ if( i<0 ) return; +++ pz = &p->aCol[i].zDflt; +++ if( minusFlag ){ +++ sqliteSetNString(pz, "-", 1, pVal->z, pVal->n, 0); +++ }else{ +++ sqliteSetNString(pz, pVal->z, pVal->n, 0); +++ } +++ sqliteDequote(*pz); +++} +++ +++/* +++** Designate the PRIMARY KEY for the table. pList is a list of names +++** of columns that form the primary key. If pList is NULL, then the +++** most recently added column of the table is the primary key. +++** +++** A table can have at most one primary key. If the table already has +++** a primary key (and this is the second primary key) then create an +++** error. +++** +++** If the PRIMARY KEY is on a single column whose datatype is INTEGER, +++** then we will try to use that column as the row id. (Exception: +++** For backwards compatibility with older databases, do not do this +++** if the file format version number is less than 1.) Set the Table.iPKey +++** field of the table under construction to be the index of the +++** INTEGER PRIMARY KEY column. Table.iPKey is set to -1 if there is +++** no INTEGER PRIMARY KEY. +++** +++** If the key is not an INTEGER PRIMARY KEY, then create a unique +++** index for the key. No index is created for INTEGER PRIMARY KEYs. +++*/ +++void sqliteAddPrimaryKey(Parse *pParse, IdList *pList, int onError){ +++ Table *pTab = pParse->pNewTable; +++ char *zType = 0; +++ int iCol = -1, i; +++ if( pTab==0 ) goto primary_key_exit; +++ if( pTab->hasPrimKey ){ +++ sqliteErrorMsg(pParse, +++ "table \"%s\" has more than one primary key", pTab->zName); +++ goto primary_key_exit; +++ } +++ pTab->hasPrimKey = 1; +++ if( pList==0 ){ +++ iCol = pTab->nCol - 1; +++ pTab->aCol[iCol].isPrimKey = 1; +++ }else{ +++ for(i=0; inId; i++){ +++ for(iCol=0; iColnCol; iCol++){ +++ if( sqliteStrICmp(pList->a[i].zName, pTab->aCol[iCol].zName)==0 ) break; +++ } +++ if( iColnCol ) pTab->aCol[iCol].isPrimKey = 1; +++ } +++ if( pList->nId>1 ) iCol = -1; +++ } +++ if( iCol>=0 && iColnCol ){ +++ zType = pTab->aCol[iCol].zType; +++ } +++ if( pParse->db->file_format>=1 && +++ zType && sqliteStrICmp(zType, "INTEGER")==0 ){ +++ pTab->iPKey = iCol; +++ pTab->keyConf = onError; +++ }else{ +++ sqliteCreateIndex(pParse, 0, 0, pList, onError, 0, 0); +++ pList = 0; +++ } +++ +++primary_key_exit: +++ sqliteIdListDelete(pList); +++ return; +++} +++ +++/* +++** Return the appropriate collating type given a type name. +++** +++** The collation type is text (SQLITE_SO_TEXT) if the type +++** name contains the character stream "text" or "blob" or +++** "clob". Any other type name is collated as numeric +++** (SQLITE_SO_NUM). +++*/ +++int sqliteCollateType(const char *zType, int nType){ +++ int i; +++ for(i=0; ipNewTable)==0 ) return; +++ i = p->nCol-1; +++ if( i>=0 ) p->aCol[i].sortOrder = collType; +++} +++ +++/* +++** Come up with a new random value for the schema cookie. Make sure +++** the new value is different from the old. +++** +++** The schema cookie is used to determine when the schema for the +++** database changes. After each schema change, the cookie value +++** changes. When a process first reads the schema it records the +++** cookie. Thereafter, whenever it goes to access the database, +++** it checks the cookie to make sure the schema has not changed +++** since it was last read. +++** +++** This plan is not completely bullet-proof. It is possible for +++** the schema to change multiple times and for the cookie to be +++** set back to prior value. But schema changes are infrequent +++** and the probability of hitting the same cookie value is only +++** 1 chance in 2^32. So we're safe enough. +++*/ +++void sqliteChangeCookie(sqlite *db, Vdbe *v){ +++ if( db->next_cookie==db->aDb[0].schema_cookie ){ +++ unsigned char r; +++ sqliteRandomness(1, &r); +++ db->next_cookie = db->aDb[0].schema_cookie + r + 1; +++ db->flags |= SQLITE_InternChanges; +++ sqliteVdbeAddOp(v, OP_Integer, db->next_cookie, 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 0); +++ } +++} +++ +++/* +++** Measure the number of characters needed to output the given +++** identifier. The number returned includes any quotes used +++** but does not include the null terminator. +++*/ +++static int identLength(const char *z){ +++ int n; +++ int needQuote = 0; +++ for(n=0; *z; n++, z++){ +++ if( *z=='\'' ){ n++; needQuote=1; } +++ } +++ return n + needQuote*2; +++} +++ +++/* +++** Write an identifier onto the end of the given string. Add +++** quote characters as needed. +++*/ +++static void identPut(char *z, int *pIdx, char *zIdent){ +++ int i, j, needQuote; +++ i = *pIdx; +++ for(j=0; zIdent[j]; j++){ +++ if( !isalnum(zIdent[j]) && zIdent[j]!='_' ) break; +++ } +++ needQuote = zIdent[j]!=0 || isdigit(zIdent[0]) +++ || sqliteKeywordCode(zIdent, j)!=TK_ID; +++ if( needQuote ) z[i++] = '\''; +++ for(j=0; zIdent[j]; j++){ +++ z[i++] = zIdent[j]; +++ if( zIdent[j]=='\'' ) z[i++] = '\''; +++ } +++ if( needQuote ) z[i++] = '\''; +++ z[i] = 0; +++ *pIdx = i; +++} +++ +++/* +++** Generate a CREATE TABLE statement appropriate for the given +++** table. Memory to hold the text of the statement is obtained +++** from sqliteMalloc() and must be freed by the calling function. +++*/ +++static char *createTableStmt(Table *p){ +++ int i, k, n; +++ char *zStmt; +++ char *zSep, *zSep2, *zEnd; +++ n = 0; +++ for(i=0; inCol; i++){ +++ n += identLength(p->aCol[i].zName); +++ } +++ n += identLength(p->zName); +++ if( n<40 ){ +++ zSep = ""; +++ zSep2 = ","; +++ zEnd = ")"; +++ }else{ +++ zSep = "\n "; +++ zSep2 = ",\n "; +++ zEnd = "\n)"; +++ } +++ n += 35 + 6*p->nCol; +++ zStmt = sqliteMallocRaw( n ); +++ if( zStmt==0 ) return 0; +++ strcpy(zStmt, p->iDb==1 ? "CREATE TEMP TABLE " : "CREATE TABLE "); +++ k = strlen(zStmt); +++ identPut(zStmt, &k, p->zName); +++ zStmt[k++] = '('; +++ for(i=0; inCol; i++){ +++ strcpy(&zStmt[k], zSep); +++ k += strlen(&zStmt[k]); +++ zSep = zSep2; +++ identPut(zStmt, &k, p->aCol[i].zName); +++ } +++ strcpy(&zStmt[k], zEnd); +++ return zStmt; +++} +++ +++/* +++** This routine is called to report the final ")" that terminates +++** a CREATE TABLE statement. +++** +++** The table structure that other action routines have been building +++** is added to the internal hash tables, assuming no errors have +++** occurred. +++** +++** An entry for the table is made in the master table on disk, unless +++** this is a temporary table or db->init.busy==1. When db->init.busy==1 +++** it means we are reading the sqlite_master table because we just +++** connected to the database or because the sqlite_master table has +++** recently changes, so the entry for this table already exists in +++** the sqlite_master table. We do not want to create it again. +++** +++** If the pSelect argument is not NULL, it means that this routine +++** was called to create a table generated from a +++** "CREATE TABLE ... AS SELECT ..." statement. The column names of +++** the new table will match the result set of the SELECT. +++*/ +++void sqliteEndTable(Parse *pParse, Token *pEnd, Select *pSelect){ +++ Table *p; +++ sqlite *db = pParse->db; +++ +++ if( (pEnd==0 && pSelect==0) || pParse->nErr || sqlite_malloc_failed ) return; +++ p = pParse->pNewTable; +++ if( p==0 ) return; +++ +++ /* If the table is generated from a SELECT, then construct the +++ ** list of columns and the text of the table. +++ */ +++ if( pSelect ){ +++ Table *pSelTab = sqliteResultSetOfSelect(pParse, 0, pSelect); +++ if( pSelTab==0 ) return; +++ assert( p->aCol==0 ); +++ p->nCol = pSelTab->nCol; +++ p->aCol = pSelTab->aCol; +++ pSelTab->nCol = 0; +++ pSelTab->aCol = 0; +++ sqliteDeleteTable(0, pSelTab); +++ } +++ +++ /* If the db->init.busy is 1 it means we are reading the SQL off the +++ ** "sqlite_master" or "sqlite_temp_master" table on the disk. +++ ** So do not write to the disk again. Extract the root page number +++ ** for the table from the db->init.newTnum field. (The page number +++ ** should have been put there by the sqliteOpenCb routine.) +++ */ +++ if( db->init.busy ){ +++ p->tnum = db->init.newTnum; +++ } +++ +++ /* If not initializing, then create a record for the new table +++ ** in the SQLITE_MASTER table of the database. The record number +++ ** for the new table entry should already be on the stack. +++ ** +++ ** If this is a TEMPORARY table, write the entry into the auxiliary +++ ** file instead of into the main database file. +++ */ +++ if( !db->init.busy ){ +++ int n; +++ Vdbe *v; +++ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ if( p->pSelect==0 ){ +++ /* A regular table */ +++ sqliteVdbeOp3(v, OP_CreateTable, 0, p->iDb, (char*)&p->tnum, P3_POINTER); +++ }else{ +++ /* A view */ +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ } +++ p->tnum = 0; +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, p->pSelect==0?"table":"view", P3_STATIC); +++ sqliteVdbeOp3(v, OP_String, 0, 0, p->zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, p->zName, 0); +++ sqliteVdbeAddOp(v, OP_Dup, 4, 0); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ if( pSelect ){ +++ char *z = createTableStmt(p); +++ n = z ? strlen(z) : 0; +++ sqliteVdbeChangeP3(v, -1, z, n); +++ sqliteFree(z); +++ }else{ +++ assert( pEnd!=0 ); +++ n = Addr(pEnd->z) - Addr(pParse->sFirstToken.z) + 1; +++ sqliteVdbeChangeP3(v, -1, pParse->sFirstToken.z, n); +++ } +++ sqliteVdbeAddOp(v, OP_MakeRecord, 5, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, 0, 0); +++ if( !p->iDb ){ +++ sqliteChangeCookie(db, v); +++ } +++ sqliteVdbeAddOp(v, OP_Close, 0, 0); +++ if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Integer, p->iDb, 0); +++ sqliteVdbeAddOp(v, OP_OpenWrite, 1, 0); +++ pParse->nTab = 2; +++ sqliteSelect(pParse, pSelect, SRT_Table, 1, 0, 0, 0); +++ } +++ sqliteEndWriteOperation(pParse); +++ } +++ +++ /* Add the table to the in-memory representation of the database. +++ */ +++ if( pParse->explain==0 && pParse->nErr==0 ){ +++ Table *pOld; +++ FKey *pFKey; +++ pOld = sqliteHashInsert(&db->aDb[p->iDb].tblHash, +++ p->zName, strlen(p->zName)+1, p); +++ if( pOld ){ +++ assert( p==pOld ); /* Malloc must have failed inside HashInsert() */ +++ return; +++ } +++ for(pFKey=p->pFKey; pFKey; pFKey=pFKey->pNextFrom){ +++ int nTo = strlen(pFKey->zTo) + 1; +++ pFKey->pNextTo = sqliteHashFind(&db->aDb[p->iDb].aFKey, pFKey->zTo, nTo); +++ sqliteHashInsert(&db->aDb[p->iDb].aFKey, pFKey->zTo, nTo, pFKey); +++ } +++ pParse->pNewTable = 0; +++ db->nTable++; +++ db->flags |= SQLITE_InternChanges; +++ } +++} +++ +++/* +++** The parser calls this routine in order to create a new VIEW +++*/ +++void sqliteCreateView( +++ Parse *pParse, /* The parsing context */ +++ Token *pBegin, /* The CREATE token that begins the statement */ +++ Token *pName, /* The token that holds the name of the view */ +++ Select *pSelect, /* A SELECT statement that will become the new view */ +++ int isTemp /* TRUE for a TEMPORARY view */ +++){ +++ Table *p; +++ int n; +++ const char *z; +++ Token sEnd; +++ DbFixer sFix; +++ +++ sqliteStartTable(pParse, pBegin, pName, isTemp, 1); +++ p = pParse->pNewTable; +++ if( p==0 || pParse->nErr ){ +++ sqliteSelectDelete(pSelect); +++ return; +++ } +++ if( sqliteFixInit(&sFix, pParse, p->iDb, "view", pName) +++ && sqliteFixSelect(&sFix, pSelect) +++ ){ +++ sqliteSelectDelete(pSelect); +++ return; +++ } +++ +++ /* Make a copy of the entire SELECT statement that defines the view. +++ ** This will force all the Expr.token.z values to be dynamically +++ ** allocated rather than point to the input string - which means that +++ ** they will persist after the current sqlite_exec() call returns. +++ */ +++ p->pSelect = sqliteSelectDup(pSelect); +++ sqliteSelectDelete(pSelect); +++ if( !pParse->db->init.busy ){ +++ sqliteViewGetColumnNames(pParse, p); +++ } +++ +++ /* Locate the end of the CREATE VIEW statement. Make sEnd point to +++ ** the end. +++ */ +++ sEnd = pParse->sLastToken; +++ if( sEnd.z[0]!=0 && sEnd.z[0]!=';' ){ +++ sEnd.z += sEnd.n; +++ } +++ sEnd.n = 0; +++ n = sEnd.z - pBegin->z; +++ z = pBegin->z; +++ while( n>0 && (z[n-1]==';' || isspace(z[n-1])) ){ n--; } +++ sEnd.z = &z[n-1]; +++ sEnd.n = 1; +++ +++ /* Use sqliteEndTable() to add the view to the SQLITE_MASTER table */ +++ sqliteEndTable(pParse, &sEnd, 0); +++ return; +++} +++ +++/* +++** The Table structure pTable is really a VIEW. Fill in the names of +++** the columns of the view in the pTable structure. Return the number +++** of errors. If an error is seen leave an error message in pParse->zErrMsg. +++*/ +++int sqliteViewGetColumnNames(Parse *pParse, Table *pTable){ +++ ExprList *pEList; +++ Select *pSel; +++ Table *pSelTab; +++ int nErr = 0; +++ +++ assert( pTable ); +++ +++ /* A positive nCol means the columns names for this view are +++ ** already known. +++ */ +++ if( pTable->nCol>0 ) return 0; +++ +++ /* A negative nCol is a special marker meaning that we are currently +++ ** trying to compute the column names. If we enter this routine with +++ ** a negative nCol, it means two or more views form a loop, like this: +++ ** +++ ** CREATE VIEW one AS SELECT * FROM two; +++ ** CREATE VIEW two AS SELECT * FROM one; +++ ** +++ ** Actually, this error is caught previously and so the following test +++ ** should always fail. But we will leave it in place just to be safe. +++ */ +++ if( pTable->nCol<0 ){ +++ sqliteErrorMsg(pParse, "view %s is circularly defined", pTable->zName); +++ return 1; +++ } +++ +++ /* If we get this far, it means we need to compute the table names. +++ */ +++ assert( pTable->pSelect ); /* If nCol==0, then pTable must be a VIEW */ +++ pSel = pTable->pSelect; +++ +++ /* Note that the call to sqliteResultSetOfSelect() will expand any +++ ** "*" elements in this list. But we will need to restore the list +++ ** back to its original configuration afterwards, so we save a copy of +++ ** the original in pEList. +++ */ +++ pEList = pSel->pEList; +++ pSel->pEList = sqliteExprListDup(pEList); +++ if( pSel->pEList==0 ){ +++ pSel->pEList = pEList; +++ return 1; /* Malloc failed */ +++ } +++ pTable->nCol = -1; +++ pSelTab = sqliteResultSetOfSelect(pParse, 0, pSel); +++ if( pSelTab ){ +++ assert( pTable->aCol==0 ); +++ pTable->nCol = pSelTab->nCol; +++ pTable->aCol = pSelTab->aCol; +++ pSelTab->nCol = 0; +++ pSelTab->aCol = 0; +++ sqliteDeleteTable(0, pSelTab); +++ DbSetProperty(pParse->db, pTable->iDb, DB_UnresetViews); +++ }else{ +++ pTable->nCol = 0; +++ nErr++; +++ } +++ sqliteSelectUnbind(pSel); +++ sqliteExprListDelete(pSel->pEList); +++ pSel->pEList = pEList; +++ return nErr; +++} +++ +++/* +++** Clear the column names from the VIEW pTable. +++** +++** This routine is called whenever any other table or view is modified. +++** The view passed into this routine might depend directly or indirectly +++** on the modified or deleted table so we need to clear the old column +++** names so that they will be recomputed. +++*/ +++static void sqliteViewResetColumnNames(Table *pTable){ +++ int i; +++ Column *pCol; +++ assert( pTable!=0 && pTable->pSelect!=0 ); +++ for(i=0, pCol=pTable->aCol; inCol; i++, pCol++){ +++ sqliteFree(pCol->zName); +++ sqliteFree(pCol->zDflt); +++ sqliteFree(pCol->zType); +++ } +++ sqliteFree(pTable->aCol); +++ pTable->aCol = 0; +++ pTable->nCol = 0; +++} +++ +++/* +++** Clear the column names from every VIEW in database idx. +++*/ +++static void sqliteViewResetAll(sqlite *db, int idx){ +++ HashElem *i; +++ if( !DbHasProperty(db, idx, DB_UnresetViews) ) return; +++ for(i=sqliteHashFirst(&db->aDb[idx].tblHash); i; i=sqliteHashNext(i)){ +++ Table *pTab = sqliteHashData(i); +++ if( pTab->pSelect ){ +++ sqliteViewResetColumnNames(pTab); +++ } +++ } +++ DbClearProperty(db, idx, DB_UnresetViews); +++} +++ +++/* +++** Given a token, look up a table with that name. If not found, leave +++** an error for the parser to find and return NULL. +++*/ +++Table *sqliteTableFromToken(Parse *pParse, Token *pTok){ +++ char *zName; +++ Table *pTab; +++ zName = sqliteTableNameFromToken(pTok); +++ if( zName==0 ) return 0; +++ pTab = sqliteFindTable(pParse->db, zName, 0); +++ sqliteFree(zName); +++ if( pTab==0 ){ +++ sqliteErrorMsg(pParse, "no such table: %T", pTok); +++ } +++ return pTab; +++} +++ +++/* +++** This routine is called to do the work of a DROP TABLE statement. +++** pName is the name of the table to be dropped. +++*/ +++void sqliteDropTable(Parse *pParse, Token *pName, int isView){ +++ Table *pTable; +++ Vdbe *v; +++ int base; +++ sqlite *db = pParse->db; +++ int iDb; +++ +++ if( pParse->nErr || sqlite_malloc_failed ) return; +++ pTable = sqliteTableFromToken(pParse, pName); +++ if( pTable==0 ) return; +++ iDb = pTable->iDb; +++ assert( iDb>=0 && iDbnDb ); +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ { +++ int code; +++ const char *zTab = SCHEMA_TABLE(pTable->iDb); +++ const char *zDb = db->aDb[pTable->iDb].zName; +++ if( sqliteAuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb)){ +++ return; +++ } +++ if( isView ){ +++ if( iDb==1 ){ +++ code = SQLITE_DROP_TEMP_VIEW; +++ }else{ +++ code = SQLITE_DROP_VIEW; +++ } +++ }else{ +++ if( iDb==1 ){ +++ code = SQLITE_DROP_TEMP_TABLE; +++ }else{ +++ code = SQLITE_DROP_TABLE; +++ } +++ } +++ if( sqliteAuthCheck(pParse, code, pTable->zName, 0, zDb) ){ +++ return; +++ } +++ if( sqliteAuthCheck(pParse, SQLITE_DELETE, pTable->zName, 0, zDb) ){ +++ return; +++ } +++ } +++#endif +++ if( pTable->readOnly ){ +++ sqliteErrorMsg(pParse, "table %s may not be dropped", pTable->zName); +++ pParse->nErr++; +++ return; +++ } +++ if( isView && pTable->pSelect==0 ){ +++ sqliteErrorMsg(pParse, "use DROP TABLE to delete table %s", pTable->zName); +++ return; +++ } +++ if( !isView && pTable->pSelect ){ +++ sqliteErrorMsg(pParse, "use DROP VIEW to delete view %s", pTable->zName); +++ return; +++ } +++ +++ /* Generate code to remove the table from the master table +++ ** on disk. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v ){ +++ static VdbeOpList dropTable[] = { +++ { OP_Rewind, 0, ADDR(8), 0}, +++ { OP_String, 0, 0, 0}, /* 1 */ +++ { OP_MemStore, 1, 1, 0}, +++ { OP_MemLoad, 1, 0, 0}, /* 3 */ +++ { OP_Column, 0, 2, 0}, +++ { OP_Ne, 0, ADDR(7), 0}, +++ { OP_Delete, 0, 0, 0}, +++ { OP_Next, 0, ADDR(3), 0}, /* 7 */ +++ }; +++ Index *pIdx; +++ Trigger *pTrigger; +++ sqliteBeginWriteOperation(pParse, 0, pTable->iDb); +++ +++ /* Drop all triggers associated with the table being dropped */ +++ pTrigger = pTable->pTrigger; +++ while( pTrigger ){ +++ assert( pTrigger->iDb==pTable->iDb || pTrigger->iDb==1 ); +++ sqliteDropTriggerPtr(pParse, pTrigger, 1); +++ if( pParse->explain ){ +++ pTrigger = pTrigger->pNext; +++ }else{ +++ pTrigger = pTable->pTrigger; +++ } +++ } +++ +++ /* Drop all SQLITE_MASTER entries that refer to the table */ +++ sqliteOpenMasterTable(v, pTable->iDb); +++ base = sqliteVdbeAddOpList(v, ArraySize(dropTable), dropTable); +++ sqliteVdbeChangeP3(v, base+1, pTable->zName, 0); +++ +++ /* Drop all SQLITE_TEMP_MASTER entries that refer to the table */ +++ if( pTable->iDb!=1 ){ +++ sqliteOpenMasterTable(v, 1); +++ base = sqliteVdbeAddOpList(v, ArraySize(dropTable), dropTable); +++ sqliteVdbeChangeP3(v, base+1, pTable->zName, 0); +++ } +++ +++ if( pTable->iDb==0 ){ +++ sqliteChangeCookie(db, v); +++ } +++ sqliteVdbeAddOp(v, OP_Close, 0, 0); +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Destroy, pTable->tnum, pTable->iDb); +++ for(pIdx=pTable->pIndex; pIdx; pIdx=pIdx->pNext){ +++ sqliteVdbeAddOp(v, OP_Destroy, pIdx->tnum, pIdx->iDb); +++ } +++ } +++ sqliteEndWriteOperation(pParse); +++ } +++ +++ /* Delete the in-memory description of the table. +++ ** +++ ** Exception: if the SQL statement began with the EXPLAIN keyword, +++ ** then no changes should be made. +++ */ +++ if( !pParse->explain ){ +++ sqliteUnlinkAndDeleteTable(db, pTable); +++ db->flags |= SQLITE_InternChanges; +++ } +++ sqliteViewResetAll(db, iDb); +++} +++ +++/* +++** This routine constructs a P3 string suitable for an OP_MakeIdxKey +++** opcode and adds that P3 string to the most recently inserted instruction +++** in the virtual machine. The P3 string consists of a single character +++** for each column in the index pIdx of table pTab. If the column uses +++** a numeric sort order, then the P3 string character corresponding to +++** that column is 'n'. If the column uses a text sort order, then the +++** P3 string is 't'. See the OP_MakeIdxKey opcode documentation for +++** additional information. See also the sqliteAddKeyType() routine. +++*/ +++void sqliteAddIdxKeyType(Vdbe *v, Index *pIdx){ +++ char *zType; +++ Table *pTab; +++ int i, n; +++ assert( pIdx!=0 && pIdx->pTable!=0 ); +++ pTab = pIdx->pTable; +++ n = pIdx->nColumn; +++ zType = sqliteMallocRaw( n+1 ); +++ if( zType==0 ) return; +++ for(i=0; iaiColumn[i]; +++ assert( iCol>=0 && iColnCol ); +++ if( (pTab->aCol[iCol].sortOrder & SQLITE_SO_TYPEMASK)==SQLITE_SO_TEXT ){ +++ zType[i] = 't'; +++ }else{ +++ zType[i] = 'n'; +++ } +++ } +++ zType[n] = 0; +++ sqliteVdbeChangeP3(v, -1, zType, n); +++ sqliteFree(zType); +++} +++ +++/* +++** This routine is called to create a new foreign key on the table +++** currently under construction. pFromCol determines which columns +++** in the current table point to the foreign key. If pFromCol==0 then +++** connect the key to the last column inserted. pTo is the name of +++** the table referred to. pToCol is a list of tables in the other +++** pTo table that the foreign key points to. flags contains all +++** information about the conflict resolution algorithms specified +++** in the ON DELETE, ON UPDATE and ON INSERT clauses. +++** +++** An FKey structure is created and added to the table currently +++** under construction in the pParse->pNewTable field. The new FKey +++** is not linked into db->aFKey at this point - that does not happen +++** until sqliteEndTable(). +++** +++** The foreign key is set for IMMEDIATE processing. A subsequent call +++** to sqliteDeferForeignKey() might change this to DEFERRED. +++*/ +++void sqliteCreateForeignKey( +++ Parse *pParse, /* Parsing context */ +++ IdList *pFromCol, /* Columns in this table that point to other table */ +++ Token *pTo, /* Name of the other table */ +++ IdList *pToCol, /* Columns in the other table */ +++ int flags /* Conflict resolution algorithms. */ +++){ +++ Table *p = pParse->pNewTable; +++ int nByte; +++ int i; +++ int nCol; +++ char *z; +++ FKey *pFKey = 0; +++ +++ assert( pTo!=0 ); +++ if( p==0 || pParse->nErr ) goto fk_end; +++ if( pFromCol==0 ){ +++ int iCol = p->nCol-1; +++ if( iCol<0 ) goto fk_end; +++ if( pToCol && pToCol->nId!=1 ){ +++ sqliteErrorMsg(pParse, "foreign key on %s" +++ " should reference only one column of table %T", +++ p->aCol[iCol].zName, pTo); +++ goto fk_end; +++ } +++ nCol = 1; +++ }else if( pToCol && pToCol->nId!=pFromCol->nId ){ +++ sqliteErrorMsg(pParse, +++ "number of columns in foreign key does not match the number of " +++ "columns in the referenced table"); +++ goto fk_end; +++ }else{ +++ nCol = pFromCol->nId; +++ } +++ nByte = sizeof(*pFKey) + nCol*sizeof(pFKey->aCol[0]) + pTo->n + 1; +++ if( pToCol ){ +++ for(i=0; inId; i++){ +++ nByte += strlen(pToCol->a[i].zName) + 1; +++ } +++ } +++ pFKey = sqliteMalloc( nByte ); +++ if( pFKey==0 ) goto fk_end; +++ pFKey->pFrom = p; +++ pFKey->pNextFrom = p->pFKey; +++ z = (char*)&pFKey[1]; +++ pFKey->aCol = (struct sColMap*)z; +++ z += sizeof(struct sColMap)*nCol; +++ pFKey->zTo = z; +++ memcpy(z, pTo->z, pTo->n); +++ z[pTo->n] = 0; +++ z += pTo->n+1; +++ pFKey->pNextTo = 0; +++ pFKey->nCol = nCol; +++ if( pFromCol==0 ){ +++ pFKey->aCol[0].iFrom = p->nCol-1; +++ }else{ +++ for(i=0; inCol; j++){ +++ if( sqliteStrICmp(p->aCol[j].zName, pFromCol->a[i].zName)==0 ){ +++ pFKey->aCol[i].iFrom = j; +++ break; +++ } +++ } +++ if( j>=p->nCol ){ +++ sqliteErrorMsg(pParse, +++ "unknown column \"%s\" in foreign key definition", +++ pFromCol->a[i].zName); +++ goto fk_end; +++ } +++ } +++ } +++ if( pToCol ){ +++ for(i=0; ia[i].zName); +++ pFKey->aCol[i].zCol = z; +++ memcpy(z, pToCol->a[i].zName, n); +++ z[n] = 0; +++ z += n+1; +++ } +++ } +++ pFKey->isDeferred = 0; +++ pFKey->deleteConf = flags & 0xff; +++ pFKey->updateConf = (flags >> 8 ) & 0xff; +++ pFKey->insertConf = (flags >> 16 ) & 0xff; +++ +++ /* Link the foreign key to the table as the last step. +++ */ +++ p->pFKey = pFKey; +++ pFKey = 0; +++ +++fk_end: +++ sqliteFree(pFKey); +++ sqliteIdListDelete(pFromCol); +++ sqliteIdListDelete(pToCol); +++} +++ +++/* +++** This routine is called when an INITIALLY IMMEDIATE or INITIALLY DEFERRED +++** clause is seen as part of a foreign key definition. The isDeferred +++** parameter is 1 for INITIALLY DEFERRED and 0 for INITIALLY IMMEDIATE. +++** The behavior of the most recently created foreign key is adjusted +++** accordingly. +++*/ +++void sqliteDeferForeignKey(Parse *pParse, int isDeferred){ +++ Table *pTab; +++ FKey *pFKey; +++ if( (pTab = pParse->pNewTable)==0 || (pFKey = pTab->pFKey)==0 ) return; +++ pFKey->isDeferred = isDeferred; +++} +++ +++/* +++** Create a new index for an SQL table. pIndex is the name of the index +++** and pTable is the name of the table that is to be indexed. Both will +++** be NULL for a primary key or an index that is created to satisfy a +++** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +++** as the table to be indexed. pParse->pNewTable is a table that is +++** currently being constructed by a CREATE TABLE statement. +++** +++** pList is a list of columns to be indexed. pList will be NULL if this +++** is a primary key or unique-constraint on the most recent column added +++** to the table currently under construction. +++*/ +++void sqliteCreateIndex( +++ Parse *pParse, /* All information about this parse */ +++ Token *pName, /* Name of the index. May be NULL */ +++ SrcList *pTable, /* Name of the table to index. Use pParse->pNewTable if 0 */ +++ IdList *pList, /* A list of columns to be indexed */ +++ int onError, /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ +++ Token *pStart, /* The CREATE token that begins a CREATE TABLE statement */ +++ Token *pEnd /* The ")" that closes the CREATE INDEX statement */ +++){ +++ Table *pTab; /* Table to be indexed */ +++ Index *pIndex; /* The index to be created */ +++ char *zName = 0; +++ int i, j; +++ Token nullId; /* Fake token for an empty ID list */ +++ DbFixer sFix; /* For assigning database names to pTable */ +++ int isTemp; /* True for a temporary index */ +++ sqlite *db = pParse->db; +++ +++ if( pParse->nErr || sqlite_malloc_failed ) goto exit_create_index; +++ if( db->init.busy +++ && sqliteFixInit(&sFix, pParse, db->init.iDb, "index", pName) +++ && sqliteFixSrcList(&sFix, pTable) +++ ){ +++ goto exit_create_index; +++ } +++ +++ /* +++ ** Find the table that is to be indexed. Return early if not found. +++ */ +++ if( pTable!=0 ){ +++ assert( pName!=0 ); +++ assert( pTable->nSrc==1 ); +++ pTab = sqliteSrcListLookup(pParse, pTable); +++ }else{ +++ assert( pName==0 ); +++ pTab = pParse->pNewTable; +++ } +++ if( pTab==0 || pParse->nErr ) goto exit_create_index; +++ if( pTab->readOnly ){ +++ sqliteErrorMsg(pParse, "table %s may not be indexed", pTab->zName); +++ goto exit_create_index; +++ } +++ if( pTab->iDb>=2 && db->init.busy==0 ){ +++ sqliteErrorMsg(pParse, "table %s may not have indices added", pTab->zName); +++ goto exit_create_index; +++ } +++ if( pTab->pSelect ){ +++ sqliteErrorMsg(pParse, "views may not be indexed"); +++ goto exit_create_index; +++ } +++ isTemp = pTab->iDb==1; +++ +++ /* +++ ** Find the name of the index. Make sure there is not already another +++ ** index or table with the same name. +++ ** +++ ** Exception: If we are reading the names of permanent indices from the +++ ** sqlite_master table (because some other process changed the schema) and +++ ** one of the index names collides with the name of a temporary table or +++ ** index, then we will continue to process this index. +++ ** +++ ** If pName==0 it means that we are +++ ** dealing with a primary key or UNIQUE constraint. We have to invent our +++ ** own name. +++ */ +++ if( pName && !db->init.busy ){ +++ Index *pISameName; /* Another index with the same name */ +++ Table *pTSameName; /* A table with same name as the index */ +++ zName = sqliteTableNameFromToken(pName); +++ if( zName==0 ) goto exit_create_index; +++ if( (pISameName = sqliteFindIndex(db, zName, 0))!=0 ){ +++ sqliteErrorMsg(pParse, "index %s already exists", zName); +++ goto exit_create_index; +++ } +++ if( (pTSameName = sqliteFindTable(db, zName, 0))!=0 ){ +++ sqliteErrorMsg(pParse, "there is already a table named %s", zName); +++ goto exit_create_index; +++ } +++ }else if( pName==0 ){ +++ char zBuf[30]; +++ int n; +++ Index *pLoop; +++ for(pLoop=pTab->pIndex, n=1; pLoop; pLoop=pLoop->pNext, n++){} +++ sprintf(zBuf,"%d)",n); +++ zName = 0; +++ sqliteSetString(&zName, "(", pTab->zName, " autoindex ", zBuf, (char*)0); +++ if( zName==0 ) goto exit_create_index; +++ }else{ +++ zName = sqliteTableNameFromToken(pName); +++ } +++ +++ /* Check for authorization to create an index. +++ */ +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ { +++ const char *zDb = db->aDb[pTab->iDb].zName; +++ +++ assert( pTab->iDb==db->init.iDb || isTemp ); +++ if( sqliteAuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){ +++ goto exit_create_index; +++ } +++ i = SQLITE_CREATE_INDEX; +++ if( isTemp ) i = SQLITE_CREATE_TEMP_INDEX; +++ if( sqliteAuthCheck(pParse, i, zName, pTab->zName, zDb) ){ +++ goto exit_create_index; +++ } +++ } +++#endif +++ +++ /* If pList==0, it means this routine was called to make a primary +++ ** key out of the last column added to the table under construction. +++ ** So create a fake list to simulate this. +++ */ +++ if( pList==0 ){ +++ nullId.z = pTab->aCol[pTab->nCol-1].zName; +++ nullId.n = strlen(nullId.z); +++ pList = sqliteIdListAppend(0, &nullId); +++ if( pList==0 ) goto exit_create_index; +++ } +++ +++ /* +++ ** Allocate the index structure. +++ */ +++ pIndex = sqliteMalloc( sizeof(Index) + strlen(zName) + 1 + +++ sizeof(int)*pList->nId ); +++ if( pIndex==0 ) goto exit_create_index; +++ pIndex->aiColumn = (int*)&pIndex[1]; +++ pIndex->zName = (char*)&pIndex->aiColumn[pList->nId]; +++ strcpy(pIndex->zName, zName); +++ pIndex->pTable = pTab; +++ pIndex->nColumn = pList->nId; +++ pIndex->onError = onError; +++ pIndex->autoIndex = pName==0; +++ pIndex->iDb = isTemp ? 1 : db->init.iDb; +++ +++ /* Scan the names of the columns of the table to be indexed and +++ ** load the column indices into the Index structure. Report an error +++ ** if any column is not found. +++ */ +++ for(i=0; inId; i++){ +++ for(j=0; jnCol; j++){ +++ if( sqliteStrICmp(pList->a[i].zName, pTab->aCol[j].zName)==0 ) break; +++ } +++ if( j>=pTab->nCol ){ +++ sqliteErrorMsg(pParse, "table %s has no column named %s", +++ pTab->zName, pList->a[i].zName); +++ sqliteFree(pIndex); +++ goto exit_create_index; +++ } +++ pIndex->aiColumn[i] = j; +++ } +++ +++ /* Link the new Index structure to its table and to the other +++ ** in-memory database structures. +++ */ +++ if( !pParse->explain ){ +++ Index *p; +++ p = sqliteHashInsert(&db->aDb[pIndex->iDb].idxHash, +++ pIndex->zName, strlen(pIndex->zName)+1, pIndex); +++ if( p ){ +++ assert( p==pIndex ); /* Malloc must have failed */ +++ sqliteFree(pIndex); +++ goto exit_create_index; +++ } +++ db->flags |= SQLITE_InternChanges; +++ } +++ +++ /* When adding an index to the list of indices for a table, make +++ ** sure all indices labeled OE_Replace come after all those labeled +++ ** OE_Ignore. This is necessary for the correct operation of UPDATE +++ ** and INSERT. +++ */ +++ if( onError!=OE_Replace || pTab->pIndex==0 +++ || pTab->pIndex->onError==OE_Replace){ +++ pIndex->pNext = pTab->pIndex; +++ pTab->pIndex = pIndex; +++ }else{ +++ Index *pOther = pTab->pIndex; +++ while( pOther->pNext && pOther->pNext->onError!=OE_Replace ){ +++ pOther = pOther->pNext; +++ } +++ pIndex->pNext = pOther->pNext; +++ pOther->pNext = pIndex; +++ } +++ +++ /* If the db->init.busy is 1 it means we are reading the SQL off the +++ ** "sqlite_master" table on the disk. So do not write to the disk +++ ** again. Extract the table number from the db->init.newTnum field. +++ */ +++ if( db->init.busy && pTable!=0 ){ +++ pIndex->tnum = db->init.newTnum; +++ } +++ +++ /* If the db->init.busy is 0 then create the index on disk. This +++ ** involves writing the index into the master table and filling in the +++ ** index with the current table contents. +++ ** +++ ** The db->init.busy is 0 when the user first enters a CREATE INDEX +++ ** command. db->init.busy is 1 when a database is opened and +++ ** CREATE INDEX statements are read out of the master table. In +++ ** the latter case the index already exists on disk, which is why +++ ** we don't want to recreate it. +++ ** +++ ** If pTable==0 it means this index is generated as a primary key +++ ** or UNIQUE constraint of a CREATE TABLE statement. Since the table +++ ** has just been created, it contains no data and the index initialization +++ ** step can be skipped. +++ */ +++ else if( db->init.busy==0 ){ +++ int n; +++ Vdbe *v; +++ int lbl1, lbl2; +++ int i; +++ int addr; +++ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) goto exit_create_index; +++ if( pTable!=0 ){ +++ sqliteBeginWriteOperation(pParse, 0, isTemp); +++ sqliteOpenMasterTable(v, isTemp); +++ } +++ sqliteVdbeAddOp(v, OP_NewRecno, 0, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, "index", P3_STATIC); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pIndex->zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->zName, 0); +++ sqliteVdbeOp3(v, OP_CreateIndex, 0, isTemp,(char*)&pIndex->tnum,P3_POINTER); +++ pIndex->tnum = 0; +++ if( pTable ){ +++ sqliteVdbeCode(v, +++ OP_Dup, 0, 0, +++ OP_Integer, isTemp, 0, +++ OP_OpenWrite, 1, 0, +++ 0); +++ } +++ addr = sqliteVdbeAddOp(v, OP_String, 0, 0); +++ if( pStart && pEnd ){ +++ n = Addr(pEnd->z) - Addr(pStart->z) + 1; +++ sqliteVdbeChangeP3(v, addr, pStart->z, n); +++ } +++ sqliteVdbeAddOp(v, OP_MakeRecord, 5, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, 0, 0); +++ if( pTable ){ +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, 2, pTab->tnum, pTab->zName, 0); +++ lbl2 = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, 2, lbl2); +++ lbl1 = sqliteVdbeAddOp(v, OP_Recno, 2, 0); +++ for(i=0; inColumn; i++){ +++ int iCol = pIndex->aiColumn[i]; +++ if( pTab->iPKey==iCol ){ +++ sqliteVdbeAddOp(v, OP_Dup, i, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Column, 2, iCol); +++ } +++ } +++ sqliteVdbeAddOp(v, OP_MakeIdxKey, pIndex->nColumn, 0); +++ if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIndex); +++ sqliteVdbeOp3(v, OP_IdxPut, 1, pIndex->onError!=OE_None, +++ "indexed columns are not unique", P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Next, 2, lbl1); +++ sqliteVdbeResolveLabel(v, lbl2); +++ sqliteVdbeAddOp(v, OP_Close, 2, 0); +++ sqliteVdbeAddOp(v, OP_Close, 1, 0); +++ } +++ if( pTable!=0 ){ +++ if( !isTemp ){ +++ sqliteChangeCookie(db, v); +++ } +++ sqliteVdbeAddOp(v, OP_Close, 0, 0); +++ sqliteEndWriteOperation(pParse); +++ } +++ } +++ +++ /* Clean up before exiting */ +++exit_create_index: +++ sqliteIdListDelete(pList); +++ sqliteSrcListDelete(pTable); +++ sqliteFree(zName); +++ return; +++} +++ +++/* +++** This routine will drop an existing named index. This routine +++** implements the DROP INDEX statement. +++*/ +++void sqliteDropIndex(Parse *pParse, SrcList *pName){ +++ Index *pIndex; +++ Vdbe *v; +++ sqlite *db = pParse->db; +++ +++ if( pParse->nErr || sqlite_malloc_failed ) return; +++ assert( pName->nSrc==1 ); +++ pIndex = sqliteFindIndex(db, pName->a[0].zName, pName->a[0].zDatabase); +++ if( pIndex==0 ){ +++ sqliteErrorMsg(pParse, "no such index: %S", pName, 0); +++ goto exit_drop_index; +++ } +++ if( pIndex->autoIndex ){ +++ sqliteErrorMsg(pParse, "index associated with UNIQUE " +++ "or PRIMARY KEY constraint cannot be dropped", 0); +++ goto exit_drop_index; +++ } +++ if( pIndex->iDb>1 ){ +++ sqliteErrorMsg(pParse, "cannot alter schema of attached " +++ "databases", 0); +++ goto exit_drop_index; +++ } +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ { +++ int code = SQLITE_DROP_INDEX; +++ Table *pTab = pIndex->pTable; +++ const char *zDb = db->aDb[pIndex->iDb].zName; +++ const char *zTab = SCHEMA_TABLE(pIndex->iDb); +++ if( sqliteAuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){ +++ goto exit_drop_index; +++ } +++ if( pIndex->iDb ) code = SQLITE_DROP_TEMP_INDEX; +++ if( sqliteAuthCheck(pParse, code, pIndex->zName, pTab->zName, zDb) ){ +++ goto exit_drop_index; +++ } +++ } +++#endif +++ +++ /* Generate code to remove the index and from the master table */ +++ v = sqliteGetVdbe(pParse); +++ if( v ){ +++ static VdbeOpList dropIndex[] = { +++ { OP_Rewind, 0, ADDR(9), 0}, +++ { OP_String, 0, 0, 0}, /* 1 */ +++ { OP_MemStore, 1, 1, 0}, +++ { OP_MemLoad, 1, 0, 0}, /* 3 */ +++ { OP_Column, 0, 1, 0}, +++ { OP_Eq, 0, ADDR(8), 0}, +++ { OP_Next, 0, ADDR(3), 0}, +++ { OP_Goto, 0, ADDR(9), 0}, +++ { OP_Delete, 0, 0, 0}, /* 8 */ +++ }; +++ int base; +++ +++ sqliteBeginWriteOperation(pParse, 0, pIndex->iDb); +++ sqliteOpenMasterTable(v, pIndex->iDb); +++ base = sqliteVdbeAddOpList(v, ArraySize(dropIndex), dropIndex); +++ sqliteVdbeChangeP3(v, base+1, pIndex->zName, 0); +++ if( pIndex->iDb==0 ){ +++ sqliteChangeCookie(db, v); +++ } +++ sqliteVdbeAddOp(v, OP_Close, 0, 0); +++ sqliteVdbeAddOp(v, OP_Destroy, pIndex->tnum, pIndex->iDb); +++ sqliteEndWriteOperation(pParse); +++ } +++ +++ /* Delete the in-memory description of this index. +++ */ +++ if( !pParse->explain ){ +++ sqliteUnlinkAndDeleteIndex(db, pIndex); +++ db->flags |= SQLITE_InternChanges; +++ } +++ +++exit_drop_index: +++ sqliteSrcListDelete(pName); +++} +++ +++/* +++** Append a new element to the given IdList. Create a new IdList if +++** need be. +++** +++** A new IdList is returned, or NULL if malloc() fails. +++*/ +++IdList *sqliteIdListAppend(IdList *pList, Token *pToken){ +++ if( pList==0 ){ +++ pList = sqliteMalloc( sizeof(IdList) ); +++ if( pList==0 ) return 0; +++ pList->nAlloc = 0; +++ } +++ if( pList->nId>=pList->nAlloc ){ +++ struct IdList_item *a; +++ pList->nAlloc = pList->nAlloc*2 + 5; +++ a = sqliteRealloc(pList->a, pList->nAlloc*sizeof(pList->a[0]) ); +++ if( a==0 ){ +++ sqliteIdListDelete(pList); +++ return 0; +++ } +++ pList->a = a; +++ } +++ memset(&pList->a[pList->nId], 0, sizeof(pList->a[0])); +++ if( pToken ){ +++ char **pz = &pList->a[pList->nId].zName; +++ sqliteSetNString(pz, pToken->z, pToken->n, 0); +++ if( *pz==0 ){ +++ sqliteIdListDelete(pList); +++ return 0; +++ }else{ +++ sqliteDequote(*pz); +++ } +++ } +++ pList->nId++; +++ return pList; +++} +++ +++/* +++** Append a new table name to the given SrcList. Create a new SrcList if +++** need be. A new entry is created in the SrcList even if pToken is NULL. +++** +++** A new SrcList is returned, or NULL if malloc() fails. +++** +++** If pDatabase is not null, it means that the table has an optional +++** database name prefix. Like this: "database.table". The pDatabase +++** points to the table name and the pTable points to the database name. +++** The SrcList.a[].zName field is filled with the table name which might +++** come from pTable (if pDatabase is NULL) or from pDatabase. +++** SrcList.a[].zDatabase is filled with the database name from pTable, +++** or with NULL if no database is specified. +++** +++** In other words, if call like this: +++** +++** sqliteSrcListAppend(A,B,0); +++** +++** Then B is a table name and the database name is unspecified. If called +++** like this: +++** +++** sqliteSrcListAppend(A,B,C); +++** +++** Then C is the table name and B is the database name. +++*/ +++SrcList *sqliteSrcListAppend(SrcList *pList, Token *pTable, Token *pDatabase){ +++ if( pList==0 ){ +++ pList = sqliteMalloc( sizeof(SrcList) ); +++ if( pList==0 ) return 0; +++ pList->nAlloc = 1; +++ } +++ if( pList->nSrc>=pList->nAlloc ){ +++ SrcList *pNew; +++ pList->nAlloc *= 2; +++ pNew = sqliteRealloc(pList, +++ sizeof(*pList) + (pList->nAlloc-1)*sizeof(pList->a[0]) ); +++ if( pNew==0 ){ +++ sqliteSrcListDelete(pList); +++ return 0; +++ } +++ pList = pNew; +++ } +++ memset(&pList->a[pList->nSrc], 0, sizeof(pList->a[0])); +++ if( pDatabase && pDatabase->z==0 ){ +++ pDatabase = 0; +++ } +++ if( pDatabase && pTable ){ +++ Token *pTemp = pDatabase; +++ pDatabase = pTable; +++ pTable = pTemp; +++ } +++ if( pTable ){ +++ char **pz = &pList->a[pList->nSrc].zName; +++ sqliteSetNString(pz, pTable->z, pTable->n, 0); +++ if( *pz==0 ){ +++ sqliteSrcListDelete(pList); +++ return 0; +++ }else{ +++ sqliteDequote(*pz); +++ } +++ } +++ if( pDatabase ){ +++ char **pz = &pList->a[pList->nSrc].zDatabase; +++ sqliteSetNString(pz, pDatabase->z, pDatabase->n, 0); +++ if( *pz==0 ){ +++ sqliteSrcListDelete(pList); +++ return 0; +++ }else{ +++ sqliteDequote(*pz); +++ } +++ } +++ pList->a[pList->nSrc].iCursor = -1; +++ pList->nSrc++; +++ return pList; +++} +++ +++/* +++** Assign cursors to all tables in a SrcList +++*/ +++void sqliteSrcListAssignCursors(Parse *pParse, SrcList *pList){ +++ int i; +++ for(i=0; inSrc; i++){ +++ if( pList->a[i].iCursor<0 ){ +++ pList->a[i].iCursor = pParse->nTab++; +++ } +++ } +++} +++ +++/* +++** Add an alias to the last identifier on the given identifier list. +++*/ +++void sqliteSrcListAddAlias(SrcList *pList, Token *pToken){ +++ if( pList && pList->nSrc>0 ){ +++ int i = pList->nSrc - 1; +++ sqliteSetNString(&pList->a[i].zAlias, pToken->z, pToken->n, 0); +++ sqliteDequote(pList->a[i].zAlias); +++ } +++} +++ +++/* +++** Delete an IdList. +++*/ +++void sqliteIdListDelete(IdList *pList){ +++ int i; +++ if( pList==0 ) return; +++ for(i=0; inId; i++){ +++ sqliteFree(pList->a[i].zName); +++ } +++ sqliteFree(pList->a); +++ sqliteFree(pList); +++} +++ +++/* +++** Return the index in pList of the identifier named zId. Return -1 +++** if not found. +++*/ +++int sqliteIdListIndex(IdList *pList, const char *zName){ +++ int i; +++ if( pList==0 ) return -1; +++ for(i=0; inId; i++){ +++ if( sqliteStrICmp(pList->a[i].zName, zName)==0 ) return i; +++ } +++ return -1; +++} +++ +++/* +++** Delete an entire SrcList including all its substructure. +++*/ +++void sqliteSrcListDelete(SrcList *pList){ +++ int i; +++ if( pList==0 ) return; +++ for(i=0; inSrc; i++){ +++ sqliteFree(pList->a[i].zDatabase); +++ sqliteFree(pList->a[i].zName); +++ sqliteFree(pList->a[i].zAlias); +++ if( pList->a[i].pTab && pList->a[i].pTab->isTransient ){ +++ sqliteDeleteTable(0, pList->a[i].pTab); +++ } +++ sqliteSelectDelete(pList->a[i].pSelect); +++ sqliteExprDelete(pList->a[i].pOn); +++ sqliteIdListDelete(pList->a[i].pUsing); +++ } +++ sqliteFree(pList); +++} +++ +++/* +++** Begin a transaction +++*/ +++void sqliteBeginTransaction(Parse *pParse, int onError){ +++ sqlite *db; +++ +++ if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return; +++ if( pParse->nErr || sqlite_malloc_failed ) return; +++ if( sqliteAuthCheck(pParse, SQLITE_TRANSACTION, "BEGIN", 0, 0) ) return; +++ if( db->flags & SQLITE_InTrans ){ +++ sqliteErrorMsg(pParse, "cannot start a transaction within a transaction"); +++ return; +++ } +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ if( !pParse->explain ){ +++ db->flags |= SQLITE_InTrans; +++ db->onError = onError; +++ } +++} +++ +++/* +++** Commit a transaction +++*/ +++void sqliteCommitTransaction(Parse *pParse){ +++ sqlite *db; +++ +++ if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return; +++ if( pParse->nErr || sqlite_malloc_failed ) return; +++ if( sqliteAuthCheck(pParse, SQLITE_TRANSACTION, "COMMIT", 0, 0) ) return; +++ if( (db->flags & SQLITE_InTrans)==0 ){ +++ sqliteErrorMsg(pParse, "cannot commit - no transaction is active"); +++ return; +++ } +++ if( !pParse->explain ){ +++ db->flags &= ~SQLITE_InTrans; +++ } +++ sqliteEndWriteOperation(pParse); +++ if( !pParse->explain ){ +++ db->onError = OE_Default; +++ } +++} +++ +++/* +++** Rollback a transaction +++*/ +++void sqliteRollbackTransaction(Parse *pParse){ +++ sqlite *db; +++ Vdbe *v; +++ +++ if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return; +++ if( pParse->nErr || sqlite_malloc_failed ) return; +++ if( sqliteAuthCheck(pParse, SQLITE_TRANSACTION, "ROLLBACK", 0, 0) ) return; +++ if( (db->flags & SQLITE_InTrans)==0 ){ +++ sqliteErrorMsg(pParse, "cannot rollback - no transaction is active"); +++ return; +++ } +++ v = sqliteGetVdbe(pParse); +++ if( v ){ +++ sqliteVdbeAddOp(v, OP_Rollback, 0, 0); +++ } +++ if( !pParse->explain ){ +++ db->flags &= ~SQLITE_InTrans; +++ db->onError = OE_Default; +++ } +++} +++ +++/* +++** Generate VDBE code that will verify the schema cookie for all +++** named database files. +++*/ +++void sqliteCodeVerifySchema(Parse *pParse, int iDb){ +++ sqlite *db = pParse->db; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ assert( iDb>=0 && iDbnDb ); +++ assert( db->aDb[iDb].pBt!=0 ); +++ if( iDb!=1 && !DbHasProperty(db, iDb, DB_Cookie) ){ +++ sqliteVdbeAddOp(v, OP_VerifyCookie, iDb, db->aDb[iDb].schema_cookie); +++ DbSetProperty(db, iDb, DB_Cookie); +++ } +++} +++ +++/* +++** Generate VDBE code that prepares for doing an operation that +++** might change the database. +++** +++** This routine starts a new transaction if we are not already within +++** a transaction. If we are already within a transaction, then a checkpoint +++** is set if the setCheckpoint parameter is true. A checkpoint should +++** be set for operations that might fail (due to a constraint) part of +++** the way through and which will need to undo some writes without having to +++** rollback the whole transaction. For operations where all constraints +++** can be checked before any changes are made to the database, it is never +++** necessary to undo a write and the checkpoint should not be set. +++** +++** Only database iDb and the temp database are made writable by this call. +++** If iDb==0, then the main and temp databases are made writable. If +++** iDb==1 then only the temp database is made writable. If iDb>1 then the +++** specified auxiliary database and the temp database are made writable. +++*/ +++void sqliteBeginWriteOperation(Parse *pParse, int setCheckpoint, int iDb){ +++ Vdbe *v; +++ sqlite *db = pParse->db; +++ if( DbHasProperty(db, iDb, DB_Locked) ) return; +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ if( !db->aDb[iDb].inTrans ){ +++ sqliteVdbeAddOp(v, OP_Transaction, iDb, 0); +++ DbSetProperty(db, iDb, DB_Locked); +++ sqliteCodeVerifySchema(pParse, iDb); +++ if( iDb!=1 ){ +++ sqliteBeginWriteOperation(pParse, setCheckpoint, 1); +++ } +++ }else if( setCheckpoint ){ +++ sqliteVdbeAddOp(v, OP_Checkpoint, iDb, 0); +++ DbSetProperty(db, iDb, DB_Locked); +++ } +++} +++ +++/* +++** Generate code that concludes an operation that may have changed +++** the database. If a statement transaction was started, then emit +++** an OP_Commit that will cause the changes to be committed to disk. +++** +++** Note that checkpoints are automatically committed at the end of +++** a statement. Note also that there can be multiple calls to +++** sqliteBeginWriteOperation() but there should only be a single +++** call to sqliteEndWriteOperation() at the conclusion of the statement. +++*/ +++void sqliteEndWriteOperation(Parse *pParse){ +++ Vdbe *v; +++ sqlite *db = pParse->db; +++ if( pParse->trigStack ) return; /* if this is in a trigger */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ if( db->flags & SQLITE_InTrans ){ +++ /* A BEGIN has executed. Do not commit until we see an explicit +++ ** COMMIT statement. */ +++ }else{ +++ sqliteVdbeAddOp(v, OP_Commit, 0, 0); +++ } +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/config_static.w32.h ++@@ -0,0 +1 @@ +++#define SQLITE_PTR_SZ 4 ++\ No newline at end of file ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/copy.c ++@@ -0,0 +1,110 @@ +++/* +++** 2003 April 6 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains code used to implement the COPY command. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++ +++/* +++** The COPY command is for compatibility with PostgreSQL and specificially +++** for the ability to read the output of pg_dump. The format is as +++** follows: +++** +++** COPY table FROM file [USING DELIMITERS string] +++** +++** "table" is an existing table name. We will read lines of code from +++** file to fill this table with data. File might be "stdin". The optional +++** delimiter string identifies the field separators. The default is a tab. +++*/ +++void sqliteCopy( +++ Parse *pParse, /* The parser context */ +++ SrcList *pTableName, /* The name of the table into which we will insert */ +++ Token *pFilename, /* The file from which to obtain information */ +++ Token *pDelimiter, /* Use this as the field delimiter */ +++ int onError /* What to do if a constraint fails */ +++){ +++ Table *pTab; +++ int i; +++ Vdbe *v; +++ int addr, end; +++ char *zFile = 0; +++ const char *zDb; +++ sqlite *db = pParse->db; +++ +++ +++ if( sqlite_malloc_failed ) goto copy_cleanup; +++ assert( pTableName->nSrc==1 ); +++ pTab = sqliteSrcListLookup(pParse, pTableName); +++ if( pTab==0 || sqliteIsReadOnly(pParse, pTab, 0) ) goto copy_cleanup; +++ zFile = sqliteStrNDup(pFilename->z, pFilename->n); +++ sqliteDequote(zFile); +++ assert( pTab->iDbnDb ); +++ zDb = db->aDb[pTab->iDb].zName; +++ if( sqliteAuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) +++ || sqliteAuthCheck(pParse, SQLITE_COPY, pTab->zName, zFile, zDb) ){ +++ goto copy_cleanup; +++ } +++ v = sqliteGetVdbe(pParse); +++ if( v ){ +++ sqliteBeginWriteOperation(pParse, 1, pTab->iDb); +++ addr = sqliteVdbeOp3(v, OP_FileOpen, 0, 0, pFilename->z, pFilename->n); +++ sqliteVdbeDequoteP3(v, addr); +++ sqliteOpenTableAndIndices(pParse, pTab, 0); +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); /* Initialize the row count */ +++ } +++ end = sqliteVdbeMakeLabel(v); +++ addr = sqliteVdbeAddOp(v, OP_FileRead, pTab->nCol, end); +++ if( pDelimiter ){ +++ sqliteVdbeChangeP3(v, addr, pDelimiter->z, pDelimiter->n); +++ sqliteVdbeDequoteP3(v, addr); +++ }else{ +++ sqliteVdbeChangeP3(v, addr, "\t", 1); +++ } +++ if( pTab->iPKey>=0 ){ +++ sqliteVdbeAddOp(v, OP_FileColumn, pTab->iPKey, 0); +++ sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_NewRecno, 0, 0); +++ } +++ for(i=0; inCol; i++){ +++ if( i==pTab->iPKey ){ +++ /* The integer primary key column is filled with NULL since its +++ ** value is always pulled from the record number */ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_FileColumn, i, 0); +++ } +++ } +++ sqliteGenerateConstraintChecks(pParse, pTab, 0, 0, pTab->iPKey>=0, +++ 0, onError, addr); +++ sqliteCompleteInsertion(pParse, pTab, 0, 0, 0, 0, -1); +++ if( (db->flags & SQLITE_CountRows)!=0 ){ +++ sqliteVdbeAddOp(v, OP_AddImm, 1, 0); /* Increment row count */ +++ } +++ sqliteVdbeAddOp(v, OP_Goto, 0, addr); +++ sqliteVdbeResolveLabel(v, end); +++ sqliteVdbeAddOp(v, OP_Noop, 0, 0); +++ sqliteEndWriteOperation(pParse); +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeAddOp(v, OP_ColumnName, 0, 1); +++ sqliteVdbeChangeP3(v, -1, "rows inserted", P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Callback, 1, 0); +++ } +++ } +++ +++copy_cleanup: +++ sqliteSrcListDelete(pTableName); +++ sqliteFree(zFile); +++ return; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/date.c ++@@ -0,0 +1,881 @@ +++/* +++** 2003 October 31 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains the C functions that implement date and time +++** functions for SQLite. +++** +++** There is only one exported symbol in this file - the function +++** sqliteRegisterDateTimeFunctions() found at the bottom of the file. +++** All other code has file scope. +++** +++** $Id$ +++** +++** NOTES: +++** +++** SQLite processes all times and dates as Julian Day numbers. The +++** dates and times are stored as the number of days since noon +++** in Greenwich on November 24, 4714 B.C. according to the Gregorian +++** calendar system. +++** +++** 1970-01-01 00:00:00 is JD 2440587.5 +++** 2000-01-01 00:00:00 is JD 2451544.5 +++** +++** This implemention requires years to be expressed as a 4-digit number +++** which means that only dates between 0000-01-01 and 9999-12-31 can +++** be represented, even though julian day numbers allow a much wider +++** range of dates. +++** +++** The Gregorian calendar system is used for all dates and times, +++** even those that predate the Gregorian calendar. Historians usually +++** use the Julian calendar for dates prior to 1582-10-15 and for some +++** dates afterwards, depending on locale. Beware of this difference. +++** +++** The conversion algorithms are implemented based on descriptions +++** in the following text: +++** +++** Jean Meeus +++** Astronomical Algorithms, 2nd Edition, 1998 +++** ISBM 0-943396-61-1 +++** Willmann-Bell, Inc +++** Richmond, Virginia (USA) +++*/ +++#include "os.h" +++#include "sqliteInt.h" +++#include +++#include +++#include +++#include +++#ifndef PHP_WIN32 +++#include "main/php_reentrancy.h" +++#endif +++ +++#ifndef SQLITE_OMIT_DATETIME_FUNCS +++ +++/* +++** A structure for holding a single date and time. +++*/ +++typedef struct DateTime DateTime; +++struct DateTime { +++ double rJD; /* The julian day number */ +++ int Y, M, D; /* Year, month, and day */ +++ int h, m; /* Hour and minutes */ +++ int tz; /* Timezone offset in minutes */ +++ double s; /* Seconds */ +++ char validYMD; /* True if Y,M,D are valid */ +++ char validHMS; /* True if h,m,s are valid */ +++ char validJD; /* True if rJD is valid */ +++ char validTZ; /* True if tz is valid */ +++}; +++ +++ +++/* +++** Convert zDate into one or more integers. Additional arguments +++** come in groups of 5 as follows: +++** +++** N number of digits in the integer +++** min minimum allowed value of the integer +++** max maximum allowed value of the integer +++** nextC first character after the integer +++** pVal where to write the integers value. +++** +++** Conversions continue until one with nextC==0 is encountered. +++** The function returns the number of successful conversions. +++*/ +++static int getDigits(const char *zDate, ...){ +++ va_list ap; +++ int val; +++ int N; +++ int min; +++ int max; +++ int nextC; +++ int *pVal; +++ int cnt = 0; +++ va_start(ap, zDate); +++ do{ +++ N = va_arg(ap, int); +++ min = va_arg(ap, int); +++ max = va_arg(ap, int); +++ nextC = va_arg(ap, int); +++ pVal = va_arg(ap, int*); +++ val = 0; +++ while( N-- ){ +++ if( !isdigit(*zDate) ){ +++ return cnt; +++ } +++ val = val*10 + *zDate - '0'; +++ zDate++; +++ } +++ if( valmax || (nextC!=0 && nextC!=*zDate) ){ +++ return cnt; +++ } +++ *pVal = val; +++ zDate++; +++ cnt++; +++ }while( nextC ); +++ return cnt; +++} +++ +++/* +++** Read text from z[] and convert into a floating point number. Return +++** the number of digits converted. +++*/ +++static int getValue(const char *z, double *pR){ +++ const char *zEnd; +++ *pR = sqliteAtoF(z, &zEnd); +++ return zEnd - z; +++} +++ +++/* +++** Parse a timezone extension on the end of a date-time. +++** The extension is of the form: +++** +++** (+/-)HH:MM +++** +++** If the parse is successful, write the number of minutes +++** of change in *pnMin and return 0. If a parser error occurs, +++** return 0. +++** +++** A missing specifier is not considered an error. +++*/ +++static int parseTimezone(const char *zDate, DateTime *p){ +++ int sgn = 0; +++ int nHr, nMn; +++ while( isspace(*zDate) ){ zDate++; } +++ p->tz = 0; +++ if( *zDate=='-' ){ +++ sgn = -1; +++ }else if( *zDate=='+' ){ +++ sgn = +1; +++ }else{ +++ return *zDate!=0; +++ } +++ zDate++; +++ if( getDigits(zDate, 2, 0, 14, ':', &nHr, 2, 0, 59, 0, &nMn)!=2 ){ +++ return 1; +++ } +++ zDate += 5; +++ p->tz = sgn*(nMn + nHr*60); +++ while( isspace(*zDate) ){ zDate++; } +++ return *zDate!=0; +++} +++ +++/* +++** Parse times of the form HH:MM or HH:MM:SS or HH:MM:SS.FFFF. +++** The HH, MM, and SS must each be exactly 2 digits. The +++** fractional seconds FFFF can be one or more digits. +++** +++** Return 1 if there is a parsing error and 0 on success. +++*/ +++static int parseHhMmSs(const char *zDate, DateTime *p){ +++ int h, m, s; +++ double ms = 0.0; +++ if( getDigits(zDate, 2, 0, 24, ':', &h, 2, 0, 59, 0, &m)!=2 ){ +++ return 1; +++ } +++ zDate += 5; +++ if( *zDate==':' ){ +++ zDate++; +++ if( getDigits(zDate, 2, 0, 59, 0, &s)!=1 ){ +++ return 1; +++ } +++ zDate += 2; +++ if( *zDate=='.' && isdigit(zDate[1]) ){ +++ double rScale = 1.0; +++ zDate++; +++ while( isdigit(*zDate) ){ +++ ms = ms*10.0 + *zDate - '0'; +++ rScale *= 10.0; +++ zDate++; +++ } +++ ms /= rScale; +++ } +++ }else{ +++ s = 0; +++ } +++ p->validJD = 0; +++ p->validHMS = 1; +++ p->h = h; +++ p->m = m; +++ p->s = s + ms; +++ if( parseTimezone(zDate, p) ) return 1; +++ p->validTZ = p->tz!=0; +++ return 0; +++} +++ +++/* +++** Convert from YYYY-MM-DD HH:MM:SS to julian day. We always assume +++** that the YYYY-MM-DD is according to the Gregorian calendar. +++** +++** Reference: Meeus page 61 +++*/ +++static void computeJD(DateTime *p){ +++ int Y, M, D, A, B, X1, X2; +++ +++ if( p->validJD ) return; +++ if( p->validYMD ){ +++ Y = p->Y; +++ M = p->M; +++ D = p->D; +++ }else{ +++ Y = 2000; /* If no YMD specified, assume 2000-Jan-01 */ +++ M = 1; +++ D = 1; +++ } +++ if( M<=2 ){ +++ Y--; +++ M += 12; +++ } +++ A = Y/100; +++ B = 2 - A + (A/4); +++ X1 = 365.25*(Y+4716); +++ X2 = 30.6001*(M+1); +++ p->rJD = X1 + X2 + D + B - 1524.5; +++ p->validJD = 1; +++ p->validYMD = 0; +++ if( p->validHMS ){ +++ p->rJD += (p->h*3600.0 + p->m*60.0 + p->s)/86400.0; +++ if( p->validTZ ){ +++ p->rJD += p->tz*60/86400.0; +++ p->validHMS = 0; +++ p->validTZ = 0; +++ } +++ } +++} +++ +++/* +++** Parse dates of the form +++** +++** YYYY-MM-DD HH:MM:SS.FFF +++** YYYY-MM-DD HH:MM:SS +++** YYYY-MM-DD HH:MM +++** YYYY-MM-DD +++** +++** Write the result into the DateTime structure and return 0 +++** on success and 1 if the input string is not a well-formed +++** date. +++*/ +++static int parseYyyyMmDd(const char *zDate, DateTime *p){ +++ int Y, M, D, neg; +++ +++ if( zDate[0]=='-' ){ +++ zDate++; +++ neg = 1; +++ }else{ +++ neg = 0; +++ } +++ if( getDigits(zDate,4,0,9999,'-',&Y,2,1,12,'-',&M,2,1,31,0,&D)!=3 ){ +++ return 1; +++ } +++ zDate += 10; +++ while( isspace(*zDate) ){ zDate++; } +++ if( parseHhMmSs(zDate, p)==0 ){ +++ /* We got the time */ +++ }else if( *zDate==0 ){ +++ p->validHMS = 0; +++ }else{ +++ return 1; +++ } +++ p->validJD = 0; +++ p->validYMD = 1; +++ p->Y = neg ? -Y : Y; +++ p->M = M; +++ p->D = D; +++ if( p->validTZ ){ +++ computeJD(p); +++ } +++ return 0; +++} +++ +++/* +++** Attempt to parse the given string into a Julian Day Number. Return +++** the number of errors. +++** +++** The following are acceptable forms for the input string: +++** +++** YYYY-MM-DD HH:MM:SS.FFF +/-HH:MM +++** DDDD.DD +++** now +++** +++** In the first form, the +/-HH:MM is always optional. The fractional +++** seconds extension (the ".FFF") is optional. The seconds portion +++** (":SS.FFF") is option. The year and date can be omitted as long +++** as there is a time string. The time string can be omitted as long +++** as there is a year and date. +++*/ +++static int parseDateOrTime(const char *zDate, DateTime *p){ +++ memset(p, 0, sizeof(*p)); +++ if( parseYyyyMmDd(zDate,p)==0 ){ +++ return 0; +++ }else if( parseHhMmSs(zDate, p)==0 ){ +++ return 0; +++ }else if( sqliteStrICmp(zDate,"now")==0){ +++ double r; +++ if( sqliteOsCurrentTime(&r)==0 ){ +++ p->rJD = r; +++ p->validJD = 1; +++ return 0; +++ } +++ return 1; +++ }else if( sqliteIsNumber(zDate) ){ +++ p->rJD = sqliteAtoF(zDate, 0); +++ p->validJD = 1; +++ return 0; +++ } +++ return 1; +++} +++ +++/* +++** Compute the Year, Month, and Day from the julian day number. +++*/ +++static void computeYMD(DateTime *p){ +++ int Z, A, B, C, D, E, X1; +++ if( p->validYMD ) return; +++ if( !p->validJD ){ +++ p->Y = 2000; +++ p->M = 1; +++ p->D = 1; +++ }else{ +++ Z = p->rJD + 0.5; +++ A = (Z - 1867216.25)/36524.25; +++ A = Z + 1 + A - (A/4); +++ B = A + 1524; +++ C = (B - 122.1)/365.25; +++ D = 365.25*C; +++ E = (B-D)/30.6001; +++ X1 = 30.6001*E; +++ p->D = B - D - X1; +++ p->M = E<14 ? E-1 : E-13; +++ p->Y = p->M>2 ? C - 4716 : C - 4715; +++ } +++ p->validYMD = 1; +++} +++ +++/* +++** Compute the Hour, Minute, and Seconds from the julian day number. +++*/ +++static void computeHMS(DateTime *p){ +++ int Z, s; +++ if( p->validHMS ) return; +++ Z = p->rJD + 0.5; +++ s = (p->rJD + 0.5 - Z)*86400000.0 + 0.5; +++ p->s = 0.001*s; +++ s = p->s; +++ p->s -= s; +++ p->h = s/3600; +++ s -= p->h*3600; +++ p->m = s/60; +++ p->s += s - p->m*60; +++ p->validHMS = 1; +++} +++ +++/* +++** Compute both YMD and HMS +++*/ +++static void computeYMD_HMS(DateTime *p){ +++ computeYMD(p); +++ computeHMS(p); +++} +++ +++/* +++** Clear the YMD and HMS and the TZ +++*/ +++static void clearYMD_HMS_TZ(DateTime *p){ +++ p->validYMD = 0; +++ p->validHMS = 0; +++ p->validTZ = 0; +++} +++ +++/* +++** Compute the difference (in days) between localtime and UTC (a.k.a. GMT) +++** for the time value p where p is in UTC. +++*/ +++static double localtimeOffset(DateTime *p){ +++ DateTime x, y; +++ time_t t; +++ struct tm *pTm, tmbuf; +++ x = *p; +++ computeYMD_HMS(&x); +++ if( x.Y<1971 || x.Y>=2038 ){ +++ x.Y = 2000; +++ x.M = 1; +++ x.D = 1; +++ x.h = 0; +++ x.m = 0; +++ x.s = 0.0; +++ } else { +++ int s = x.s + 0.5; +++ x.s = s; +++ } +++ x.tz = 0; +++ x.validJD = 0; +++ computeJD(&x); +++ t = (x.rJD-2440587.5)*86400.0 + 0.5; +++ sqliteOsEnterMutex(); +++ pTm = php_localtime_r(&t, &tmbuf); +++ if (!pTm) { +++ return 0; +++ } +++ y.Y = pTm->tm_year + 1900; +++ y.M = pTm->tm_mon + 1; +++ y.D = pTm->tm_mday; +++ y.h = pTm->tm_hour; +++ y.m = pTm->tm_min; +++ y.s = pTm->tm_sec; +++ sqliteOsLeaveMutex(); +++ y.validYMD = 1; +++ y.validHMS = 1; +++ y.validJD = 0; +++ y.validTZ = 0; +++ computeJD(&y); +++ return y.rJD - x.rJD; +++} +++ +++/* +++** Process a modifier to a date-time stamp. The modifiers are +++** as follows: +++** +++** NNN days +++** NNN hours +++** NNN minutes +++** NNN.NNNN seconds +++** NNN months +++** NNN years +++** start of month +++** start of year +++** start of week +++** start of day +++** weekday N +++** unixepoch +++** localtime +++** utc +++** +++** Return 0 on success and 1 if there is any kind of error. +++*/ +++static int parseModifier(const char *zMod, DateTime *p){ +++ int rc = 1; +++ int n; +++ double r; +++ char *z, zBuf[30]; +++ z = zBuf; +++ for(n=0; nrJD += localtimeOffset(p); +++ clearYMD_HMS_TZ(p); +++ rc = 0; +++ } +++ break; +++ } +++ case 'u': { +++ /* +++ ** unixepoch +++ ** +++ ** Treat the current value of p->rJD as the number of +++ ** seconds since 1970. Convert to a real julian day number. +++ */ +++ if( strcmp(z, "unixepoch")==0 && p->validJD ){ +++ p->rJD = p->rJD/86400.0 + 2440587.5; +++ clearYMD_HMS_TZ(p); +++ rc = 0; +++ }else if( strcmp(z, "utc")==0 ){ +++ double c1; +++ computeJD(p); +++ c1 = localtimeOffset(p); +++ p->rJD -= c1; +++ clearYMD_HMS_TZ(p); +++ p->rJD += c1 - localtimeOffset(p); +++ rc = 0; +++ } +++ break; +++ } +++ case 'w': { +++ /* +++ ** weekday N +++ ** +++ ** Move the date to the same time on the next occurrance of +++ ** weekday N where 0==Sunday, 1==Monday, and so forth. If the +++ ** date is already on the appropriate weekday, this is a no-op. +++ */ +++ if( strncmp(z, "weekday ", 8)==0 && getValue(&z[8],&r)>0 +++ && (n=r)==r && n>=0 && r<7 ){ +++ int Z; +++ computeYMD_HMS(p); +++ p->validTZ = 0; +++ p->validJD = 0; +++ computeJD(p); +++ Z = p->rJD + 1.5; +++ Z %= 7; +++ if( Z>n ) Z -= 7; +++ p->rJD += n - Z; +++ clearYMD_HMS_TZ(p); +++ rc = 0; +++ } +++ break; +++ } +++ case 's': { +++ /* +++ ** start of TTTTT +++ ** +++ ** Move the date backwards to the beginning of the current day, +++ ** or month or year. +++ */ +++ if( strncmp(z, "start of ", 9)!=0 ) break; +++ z += 9; +++ computeYMD(p); +++ p->validHMS = 1; +++ p->h = p->m = 0; +++ p->s = 0.0; +++ p->validTZ = 0; +++ p->validJD = 0; +++ if( strcmp(z,"month")==0 ){ +++ p->D = 1; +++ rc = 0; +++ }else if( strcmp(z,"year")==0 ){ +++ computeYMD(p); +++ p->M = 1; +++ p->D = 1; +++ rc = 0; +++ }else if( strcmp(z,"day")==0 ){ +++ rc = 0; +++ } +++ break; +++ } +++ case '+': +++ case '-': +++ case '0': +++ case '1': +++ case '2': +++ case '3': +++ case '4': +++ case '5': +++ case '6': +++ case '7': +++ case '8': +++ case '9': { +++ n = getValue(z, &r); +++ if( n<=0 ) break; +++ if( z[n]==':' ){ +++ /* A modifier of the form (+|-)HH:MM:SS.FFF adds (or subtracts) the +++ ** specified number of hours, minutes, seconds, and fractional seconds +++ ** to the time. The ".FFF" may be omitted. The ":SS.FFF" may be +++ ** omitted. +++ */ +++ const char *z2 = z; +++ DateTime tx; +++ int day; +++ if( !isdigit(*z2) ) z2++; +++ memset(&tx, 0, sizeof(tx)); +++ if( parseHhMmSs(z2, &tx) ) break; +++ computeJD(&tx); +++ tx.rJD -= 0.5; +++ day = (int)tx.rJD; +++ tx.rJD -= day; +++ if( z[0]=='-' ) tx.rJD = -tx.rJD; +++ computeJD(p); +++ clearYMD_HMS_TZ(p); +++ p->rJD += tx.rJD; +++ rc = 0; +++ break; +++ } +++ z += n; +++ while( isspace(z[0]) ) z++; +++ n = strlen(z); +++ if( n>10 || n<3 ) break; +++ if( z[n-1]=='s' ){ z[n-1] = 0; n--; } +++ computeJD(p); +++ rc = 0; +++ if( n==3 && strcmp(z,"day")==0 ){ +++ p->rJD += r; +++ }else if( n==4 && strcmp(z,"hour")==0 ){ +++ p->rJD += r/24.0; +++ }else if( n==6 && strcmp(z,"minute")==0 ){ +++ p->rJD += r/(24.0*60.0); +++ }else if( n==6 && strcmp(z,"second")==0 ){ +++ p->rJD += r/(24.0*60.0*60.0); +++ }else if( n==5 && strcmp(z,"month")==0 ){ +++ int x, y; +++ computeYMD_HMS(p); +++ p->M += r; +++ x = p->M>0 ? (p->M-1)/12 : (p->M-12)/12; +++ p->Y += x; +++ p->M -= x*12; +++ p->validJD = 0; +++ computeJD(p); +++ y = r; +++ if( y!=r ){ +++ p->rJD += (r - y)*30.0; +++ } +++ }else if( n==4 && strcmp(z,"year")==0 ){ +++ computeYMD_HMS(p); +++ p->Y += r; +++ p->validJD = 0; +++ computeJD(p); +++ }else{ +++ rc = 1; +++ } +++ clearYMD_HMS_TZ(p); +++ break; +++ } +++ default: { +++ break; +++ } +++ } +++ return rc; +++} +++ +++/* +++** Process time function arguments. argv[0] is a date-time stamp. +++** argv[1] and following are modifiers. Parse them all and write +++** the resulting time into the DateTime structure p. Return 0 +++** on success and 1 if there are any errors. +++*/ +++static int isDate(int argc, const char **argv, DateTime *p){ +++ int i; +++ if( argc==0 ) return 1; +++ if( argv[0]==0 || parseDateOrTime(argv[0], p) ) return 1; +++ for(i=1; izErrMsg and return NULL. If all tables +++** are found, return a pointer to the last table. +++*/ +++Table *sqliteSrcListLookup(Parse *pParse, SrcList *pSrc){ +++ Table *pTab = 0; +++ int i; +++ for(i=0; inSrc; i++){ +++ const char *zTab = pSrc->a[i].zName; +++ const char *zDb = pSrc->a[i].zDatabase; +++ pTab = sqliteLocateTable(pParse, zTab, zDb); +++ pSrc->a[i].pTab = pTab; +++ } +++ return pTab; +++} +++ +++/* +++** Check to make sure the given table is writable. If it is not +++** writable, generate an error message and return 1. If it is +++** writable return 0; +++*/ +++int sqliteIsReadOnly(Parse *pParse, Table *pTab, int viewOk){ +++ if( pTab->readOnly ){ +++ sqliteErrorMsg(pParse, "table %s may not be modified", pTab->zName); +++ return 1; +++ } +++ if( !viewOk && pTab->pSelect ){ +++ sqliteErrorMsg(pParse, "cannot modify %s because it is a view",pTab->zName); +++ return 1; +++ } +++ return 0; +++} +++ +++/* +++** Process a DELETE FROM statement. +++*/ +++void sqliteDeleteFrom( +++ Parse *pParse, /* The parser context */ +++ SrcList *pTabList, /* The table from which we should delete things */ +++ Expr *pWhere /* The WHERE clause. May be null */ +++){ +++ Vdbe *v; /* The virtual database engine */ +++ Table *pTab; /* The table from which records will be deleted */ +++ const char *zDb; /* Name of database holding pTab */ +++ int end, addr; /* A couple addresses of generated code */ +++ int i; /* Loop counter */ +++ WhereInfo *pWInfo; /* Information about the WHERE clause */ +++ Index *pIdx; /* For looping over indices of the table */ +++ int iCur; /* VDBE Cursor number for pTab */ +++ sqlite *db; /* Main database structure */ +++ int isView; /* True if attempting to delete from a view */ +++ AuthContext sContext; /* Authorization context */ +++ +++ int row_triggers_exist = 0; /* True if any triggers exist */ +++ int before_triggers; /* True if there are BEFORE triggers */ +++ int after_triggers; /* True if there are AFTER triggers */ +++ int oldIdx = -1; /* Cursor for the OLD table of AFTER triggers */ +++ +++ sContext.pParse = 0; +++ if( pParse->nErr || sqlite_malloc_failed ){ +++ pTabList = 0; +++ goto delete_from_cleanup; +++ } +++ db = pParse->db; +++ assert( pTabList->nSrc==1 ); +++ +++ /* Locate the table which we want to delete. This table has to be +++ ** put in an SrcList structure because some of the subroutines we +++ ** will be calling are designed to work with multiple tables and expect +++ ** an SrcList* parameter instead of just a Table* parameter. +++ */ +++ pTab = sqliteSrcListLookup(pParse, pTabList); +++ if( pTab==0 ) goto delete_from_cleanup; +++ before_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, +++ TK_DELETE, TK_BEFORE, TK_ROW, 0); +++ after_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, +++ TK_DELETE, TK_AFTER, TK_ROW, 0); +++ row_triggers_exist = before_triggers || after_triggers; +++ isView = pTab->pSelect!=0; +++ if( sqliteIsReadOnly(pParse, pTab, before_triggers) ){ +++ goto delete_from_cleanup; +++ } +++ assert( pTab->iDbnDb ); +++ zDb = db->aDb[pTab->iDb].zName; +++ if( sqliteAuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0, zDb) ){ +++ goto delete_from_cleanup; +++ } +++ +++ /* If pTab is really a view, make sure it has been initialized. +++ */ +++ if( isView && sqliteViewGetColumnNames(pParse, pTab) ){ +++ goto delete_from_cleanup; +++ } +++ +++ /* Allocate a cursor used to store the old.* data for a trigger. +++ */ +++ if( row_triggers_exist ){ +++ oldIdx = pParse->nTab++; +++ } +++ +++ /* Resolve the column names in all the expressions. +++ */ +++ assert( pTabList->nSrc==1 ); +++ iCur = pTabList->a[0].iCursor = pParse->nTab++; +++ if( pWhere ){ +++ if( sqliteExprResolveIds(pParse, pTabList, 0, pWhere) ){ +++ goto delete_from_cleanup; +++ } +++ if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ +++ goto delete_from_cleanup; +++ } +++ } +++ +++ /* Start the view context +++ */ +++ if( isView ){ +++ sqliteAuthContextPush(pParse, &sContext, pTab->zName); +++ } +++ +++ /* Begin generating code. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ){ +++ goto delete_from_cleanup; +++ } +++ sqliteBeginWriteOperation(pParse, row_triggers_exist, pTab->iDb); +++ +++ /* If we are trying to delete from a view, construct that view into +++ ** a temporary table. +++ */ +++ if( isView ){ +++ Select *pView = sqliteSelectDup(pTab->pSelect); +++ sqliteSelect(pParse, pView, SRT_TempTable, iCur, 0, 0, 0); +++ sqliteSelectDelete(pView); +++ } +++ +++ /* Initialize the counter of the number of rows deleted, if +++ ** we are counting rows. +++ */ +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ } +++ +++ /* Special case: A DELETE without a WHERE clause deletes everything. +++ ** It is easier just to erase the whole table. Note, however, that +++ ** this means that the row change count will be incorrect. +++ */ +++ if( pWhere==0 && !row_triggers_exist ){ +++ if( db->flags & SQLITE_CountRows ){ +++ /* If counting rows deleted, just count the total number of +++ ** entries in the table. */ +++ int endOfLoop = sqliteVdbeMakeLabel(v); +++ int addr; +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeAddOp(v, OP_OpenRead, iCur, pTab->tnum); +++ } +++ sqliteVdbeAddOp(v, OP_Rewind, iCur, sqliteVdbeCurrentAddr(v)+2); +++ addr = sqliteVdbeAddOp(v, OP_AddImm, 1, 0); +++ sqliteVdbeAddOp(v, OP_Next, iCur, addr); +++ sqliteVdbeResolveLabel(v, endOfLoop); +++ sqliteVdbeAddOp(v, OP_Close, iCur, 0); +++ } +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Clear, pTab->tnum, pTab->iDb); +++ for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){ +++ sqliteVdbeAddOp(v, OP_Clear, pIdx->tnum, pIdx->iDb); +++ } +++ } +++ } +++ +++ /* The usual case: There is a WHERE clause so we have to scan through +++ ** the table and pick which records to delete. +++ */ +++ else{ +++ /* Begin the database scan +++ */ +++ pWInfo = sqliteWhereBegin(pParse, pTabList, pWhere, 1, 0); +++ if( pWInfo==0 ) goto delete_from_cleanup; +++ +++ /* Remember the key of every item to be deleted. +++ */ +++ sqliteVdbeAddOp(v, OP_ListWrite, 0, 0); +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeAddOp(v, OP_AddImm, 1, 0); +++ } +++ +++ /* End the database scan loop. +++ */ +++ sqliteWhereEnd(pWInfo); +++ +++ /* Open the pseudo-table used to store OLD if there are triggers. +++ */ +++ if( row_triggers_exist ){ +++ sqliteVdbeAddOp(v, OP_OpenPseudo, oldIdx, 0); +++ } +++ +++ /* Delete every item whose key was written to the list during the +++ ** database scan. We have to delete items after the scan is complete +++ ** because deleting an item can change the scan order. +++ */ +++ sqliteVdbeAddOp(v, OP_ListRewind, 0, 0); +++ end = sqliteVdbeMakeLabel(v); +++ +++ /* This is the beginning of the delete loop when there are +++ ** row triggers. +++ */ +++ if( row_triggers_exist ){ +++ addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeAddOp(v, OP_OpenRead, iCur, pTab->tnum); +++ } +++ sqliteVdbeAddOp(v, OP_MoveTo, iCur, 0); +++ +++ sqliteVdbeAddOp(v, OP_Recno, iCur, 0); +++ sqliteVdbeAddOp(v, OP_RowData, iCur, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, oldIdx, 0); +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Close, iCur, 0); +++ } +++ +++ sqliteCodeRowTrigger(pParse, TK_DELETE, 0, TK_BEFORE, pTab, -1, +++ oldIdx, (pParse->trigStack)?pParse->trigStack->orconf:OE_Default, +++ addr); +++ } +++ +++ if( !isView ){ +++ /* Open cursors for the table we are deleting from and all its +++ ** indices. If there are row triggers, this happens inside the +++ ** OP_ListRead loop because the cursor have to all be closed +++ ** before the trigger fires. If there are no row triggers, the +++ ** cursors are opened only once on the outside the loop. +++ */ +++ pParse->nTab = iCur + 1; +++ sqliteOpenTableAndIndices(pParse, pTab, iCur); +++ +++ /* This is the beginning of the delete loop when there are no +++ ** row triggers */ +++ if( !row_triggers_exist ){ +++ addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end); +++ } +++ +++ /* Delete the row */ +++ sqliteGenerateRowDelete(db, v, pTab, iCur, pParse->trigStack==0); +++ } +++ +++ /* If there are row triggers, close all cursors then invoke +++ ** the AFTER triggers +++ */ +++ if( row_triggers_exist ){ +++ if( !isView ){ +++ for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){ +++ sqliteVdbeAddOp(v, OP_Close, iCur + i, pIdx->tnum); +++ } +++ sqliteVdbeAddOp(v, OP_Close, iCur, 0); +++ } +++ sqliteCodeRowTrigger(pParse, TK_DELETE, 0, TK_AFTER, pTab, -1, +++ oldIdx, (pParse->trigStack)?pParse->trigStack->orconf:OE_Default, +++ addr); +++ } +++ +++ /* End of the delete loop */ +++ sqliteVdbeAddOp(v, OP_Goto, 0, addr); +++ sqliteVdbeResolveLabel(v, end); +++ sqliteVdbeAddOp(v, OP_ListReset, 0, 0); +++ +++ /* Close the cursors after the loop if there are no row triggers */ +++ if( !row_triggers_exist ){ +++ for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){ +++ sqliteVdbeAddOp(v, OP_Close, iCur + i, pIdx->tnum); +++ } +++ sqliteVdbeAddOp(v, OP_Close, iCur, 0); +++ pParse->nTab = iCur; +++ } +++ } +++ sqliteVdbeAddOp(v, OP_SetCounts, 0, 0); +++ sqliteEndWriteOperation(pParse); +++ +++ /* +++ ** Return the number of rows that were deleted. +++ */ +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeAddOp(v, OP_ColumnName, 0, 1); +++ sqliteVdbeChangeP3(v, -1, "rows deleted", P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Callback, 1, 0); +++ } +++ +++delete_from_cleanup: +++ sqliteAuthContextPop(&sContext); +++ sqliteSrcListDelete(pTabList); +++ sqliteExprDelete(pWhere); +++ return; +++} +++ +++/* +++** This routine generates VDBE code that causes a single row of a +++** single table to be deleted. +++** +++** The VDBE must be in a particular state when this routine is called. +++** These are the requirements: +++** +++** 1. A read/write cursor pointing to pTab, the table containing the row +++** to be deleted, must be opened as cursor number "base". +++** +++** 2. Read/write cursors for all indices of pTab must be open as +++** cursor number base+i for the i-th index. +++** +++** 3. The record number of the row to be deleted must be on the top +++** of the stack. +++** +++** This routine pops the top of the stack to remove the record number +++** and then generates code to remove both the table record and all index +++** entries that point to that record. +++*/ +++void sqliteGenerateRowDelete( +++ sqlite *db, /* The database containing the index */ +++ Vdbe *v, /* Generate code into this VDBE */ +++ Table *pTab, /* Table containing the row to be deleted */ +++ int iCur, /* Cursor number for the table */ +++ int count /* Increment the row change counter */ +++){ +++ int addr; +++ addr = sqliteVdbeAddOp(v, OP_NotExists, iCur, 0); +++ sqliteGenerateRowIndexDelete(db, v, pTab, iCur, 0); +++ sqliteVdbeAddOp(v, OP_Delete, iCur, +++ (count?OPFLAG_NCHANGE:0) | OPFLAG_CSCHANGE); +++ sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v)); +++} +++ +++/* +++** This routine generates VDBE code that causes the deletion of all +++** index entries associated with a single row of a single table. +++** +++** The VDBE must be in a particular state when this routine is called. +++** These are the requirements: +++** +++** 1. A read/write cursor pointing to pTab, the table containing the row +++** to be deleted, must be opened as cursor number "iCur". +++** +++** 2. Read/write cursors for all indices of pTab must be open as +++** cursor number iCur+i for the i-th index. +++** +++** 3. The "iCur" cursor must be pointing to the row that is to be +++** deleted. +++*/ +++void sqliteGenerateRowIndexDelete( +++ sqlite *db, /* The database containing the index */ +++ Vdbe *v, /* Generate code into this VDBE */ +++ Table *pTab, /* Table containing the row to be deleted */ +++ int iCur, /* Cursor number for the table */ +++ char *aIdxUsed /* Only delete if aIdxUsed!=0 && aIdxUsed[i]!=0 */ +++){ +++ int i; +++ Index *pIdx; +++ +++ for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){ +++ int j; +++ if( aIdxUsed!=0 && aIdxUsed[i-1]==0 ) continue; +++ sqliteVdbeAddOp(v, OP_Recno, iCur, 0); +++ for(j=0; jnColumn; j++){ +++ int idx = pIdx->aiColumn[j]; +++ if( idx==pTab->iPKey ){ +++ sqliteVdbeAddOp(v, OP_Dup, j, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Column, iCur, idx); +++ } +++ } +++ sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0); +++ if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx); +++ sqliteVdbeAddOp(v, OP_IdxDelete, iCur+i, 0); +++ } +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/encode.c ++@@ -0,0 +1,257 @@ +++/* +++** 2002 April 25 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains helper routines used to translate binary data into +++** a null-terminated string (suitable for use in SQLite) and back again. +++** These are convenience routines for use by people who want to store binary +++** data in an SQLite database. The code in this file is not used by any other +++** part of the SQLite library. +++** +++** $Id$ +++*/ +++#include +++#include +++ +++/* +++** How This Encoder Works +++** +++** The output is allowed to contain any character except 0x27 (') and +++** 0x00. This is accomplished by using an escape character to encode +++** 0x27 and 0x00 as a two-byte sequence. The escape character is always +++** 0x01. An 0x00 is encoded as the two byte sequence 0x01 0x01. The +++** 0x27 character is encoded as the two byte sequence 0x01 0x28. Finally, +++** the escape character itself is encoded as the two-character sequence +++** 0x01 0x02. +++** +++** To summarize, the encoder works by using an escape sequences as follows: +++** +++** 0x00 -> 0x01 0x01 +++** 0x01 -> 0x01 0x02 +++** 0x27 -> 0x01 0x28 +++** +++** If that were all the encoder did, it would work, but in certain cases +++** it could double the size of the encoded string. For example, to +++** encode a string of 100 0x27 characters would require 100 instances of +++** the 0x01 0x03 escape sequence resulting in a 200-character output. +++** We would prefer to keep the size of the encoded string smaller than +++** this. +++** +++** To minimize the encoding size, we first add a fixed offset value to each +++** byte in the sequence. The addition is modulo 256. (That is to say, if +++** the sum of the original character value and the offset exceeds 256, then +++** the higher order bits are truncated.) The offset is chosen to minimize +++** the number of characters in the string that need to be escaped. For +++** example, in the case above where the string was composed of 100 0x27 +++** characters, the offset might be 0x01. Each of the 0x27 characters would +++** then be converted into an 0x28 character which would not need to be +++** escaped at all and so the 100 character input string would be converted +++** into just 100 characters of output. Actually 101 characters of output - +++** we have to record the offset used as the first byte in the sequence so +++** that the string can be decoded. Since the offset value is stored as +++** part of the output string and the output string is not allowed to contain +++** characters 0x00 or 0x27, the offset cannot be 0x00 or 0x27. +++** +++** Here, then, are the encoding steps: +++** +++** (1) Choose an offset value and make it the first character of +++** output. +++** +++** (2) Copy each input character into the output buffer, one by +++** one, adding the offset value as you copy. +++** +++** (3) If the value of an input character plus offset is 0x00, replace +++** that one character by the two-character sequence 0x01 0x01. +++** If the sum is 0x01, replace it with 0x01 0x02. If the sum +++** is 0x27, replace it with 0x01 0x03. +++** +++** (4) Put a 0x00 terminator at the end of the output. +++** +++** Decoding is obvious: +++** +++** (5) Copy encoded characters except the first into the decode +++** buffer. Set the first encoded character aside for use as +++** the offset in step 7 below. +++** +++** (6) Convert each 0x01 0x01 sequence into a single character 0x00. +++** Convert 0x01 0x02 into 0x01. Convert 0x01 0x28 into 0x27. +++** +++** (7) Subtract the offset value that was the first character of +++** the encoded buffer from all characters in the output buffer. +++** +++** The only tricky part is step (1) - how to compute an offset value to +++** minimize the size of the output buffer. This is accomplished by testing +++** all offset values and picking the one that results in the fewest number +++** of escapes. To do that, we first scan the entire input and count the +++** number of occurances of each character value in the input. Suppose +++** the number of 0x00 characters is N(0), the number of occurances of 0x01 +++** is N(1), and so forth up to the number of occurances of 0xff is N(255). +++** An offset of 0 is not allowed so we don't have to test it. The number +++** of escapes required for an offset of 1 is N(1)+N(2)+N(40). The number +++** of escapes required for an offset of 2 is N(2)+N(3)+N(41). And so forth. +++** In this way we find the offset that gives the minimum number of escapes, +++** and thus minimizes the length of the output string. +++*/ +++ +++/* +++** Encode a binary buffer "in" of size n bytes so that it contains +++** no instances of characters '\'' or '\000'. The output is +++** null-terminated and can be used as a string value in an INSERT +++** or UPDATE statement. Use sqlite_decode_binary() to convert the +++** string back into its original binary. +++** +++** The result is written into a preallocated output buffer "out". +++** "out" must be able to hold at least 2 +(257*n)/254 bytes. +++** In other words, the output will be expanded by as much as 3 +++** bytes for every 254 bytes of input plus 2 bytes of fixed overhead. +++** (This is approximately 2 + 1.0118*n or about a 1.2% size increase.) +++** +++** The return value is the number of characters in the encoded +++** string, excluding the "\000" terminator. +++** +++** If out==NULL then no output is generated but the routine still returns +++** the number of characters that would have been generated if out had +++** not been NULL. +++*/ +++int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out){ +++ int i, j, e, m; +++ unsigned char x; +++ int cnt[256]; +++ if( n<=0 ){ +++ if( out ){ +++ out[0] = 'x'; +++ out[1] = 0; +++ } +++ return 1; +++ } +++ memset(cnt, 0, sizeof(cnt)); +++ for(i=n-1; i>=0; i--){ cnt[in[i]]++; } +++ m = n; +++ for(i=1; i<256; i++){ +++ int sum; +++ if( i=='\'' ) continue; +++ sum = cnt[i] + cnt[(i+1)&0xff] + cnt[(i+'\'')&0xff]; +++ if( sum +++/* +++** The subroutines above are not tested by the usual test suite. To test +++** these routines, compile just this one file with a -DENCODER_TEST=1 option +++** and run the result. +++*/ +++int main(int argc, char **argv){ +++ int i, j, n, m, nOut, nByteIn, nByteOut; +++ unsigned char in[30000]; +++ unsigned char out[33000]; +++ +++ nByteIn = nByteOut = 0; +++ for(i=0; i%d (max %d)", n, strlen(out)+1, m); +++ if( strlen(out)+1>m ){ +++ printf(" ERROR output too big\n"); +++ exit(1); +++ } +++ for(j=0; out[j]; j++){ +++ if( out[j]=='\'' ){ +++ printf(" ERROR contains (')\n"); +++ exit(1); +++ } +++ } +++ j = sqlite_decode_binary(out, out); +++ if( j!=n ){ +++ printf(" ERROR decode size %d\n", j); +++ exit(1); +++ } +++ if( memcmp(in, out, n)!=0 ){ +++ printf(" ERROR decode mismatch\n"); +++ exit(1); +++ } +++ printf(" OK\n"); +++ } +++ fprintf(stderr,"Finished. Total encoding: %d->%d bytes\n", +++ nByteIn, nByteOut); +++ fprintf(stderr,"Avg size increase: %.3f%%\n", +++ (nByteOut-nByteIn)*100.0/(double)nByteIn); +++} +++#endif /* ENCODER_TEST */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/expr.c ++@@ -0,0 +1,1662 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains routines used for analyzing expressions and +++** for generating VDBE code that evaluates expressions in SQLite. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include +++ +++/* +++** Construct a new expression node and return a pointer to it. Memory +++** for this node is obtained from sqliteMalloc(). The calling function +++** is responsible for making sure the node eventually gets freed. +++*/ +++Expr *sqliteExpr(int op, Expr *pLeft, Expr *pRight, Token *pToken){ +++ Expr *pNew; +++ pNew = sqliteMalloc( sizeof(Expr) ); +++ if( pNew==0 ){ +++ /* When malloc fails, we leak memory from pLeft and pRight */ +++ return 0; +++ } +++ pNew->op = op; +++ pNew->pLeft = pLeft; +++ pNew->pRight = pRight; +++ if( pToken ){ +++ assert( pToken->dyn==0 ); +++ pNew->token = *pToken; +++ pNew->span = *pToken; +++ }else{ +++ assert( pNew->token.dyn==0 ); +++ assert( pNew->token.z==0 ); +++ assert( pNew->token.n==0 ); +++ if( pLeft && pRight ){ +++ sqliteExprSpan(pNew, &pLeft->span, &pRight->span); +++ }else{ +++ pNew->span = pNew->token; +++ } +++ } +++ return pNew; +++} +++ +++/* +++** Set the Expr.span field of the given expression to span all +++** text between the two given tokens. +++*/ +++void sqliteExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){ +++ assert( pRight!=0 ); +++ assert( pLeft!=0 ); +++ /* Note: pExpr might be NULL due to a prior malloc failure */ +++ if( pExpr && pRight->z && pLeft->z ){ +++ if( pLeft->dyn==0 && pRight->dyn==0 ){ +++ pExpr->span.z = pLeft->z; +++ pExpr->span.n = pRight->n + Addr(pRight->z) - Addr(pLeft->z); +++ }else{ +++ pExpr->span.z = 0; +++ } +++ } +++} +++ +++/* +++** Construct a new expression node for a function with multiple +++** arguments. +++*/ +++Expr *sqliteExprFunction(ExprList *pList, Token *pToken){ +++ Expr *pNew; +++ pNew = sqliteMalloc( sizeof(Expr) ); +++ if( pNew==0 ){ +++ /* sqliteExprListDelete(pList); // Leak pList when malloc fails */ +++ return 0; +++ } +++ pNew->op = TK_FUNCTION; +++ pNew->pList = pList; +++ if( pToken ){ +++ assert( pToken->dyn==0 ); +++ pNew->token = *pToken; +++ }else{ +++ pNew->token.z = 0; +++ } +++ pNew->span = pNew->token; +++ return pNew; +++} +++ +++/* +++** Recursively delete an expression tree. +++*/ +++void sqliteExprDelete(Expr *p){ +++ if( p==0 ) return; +++ if( p->span.dyn ) sqliteFree((char*)p->span.z); +++ if( p->token.dyn ) sqliteFree((char*)p->token.z); +++ sqliteExprDelete(p->pLeft); +++ sqliteExprDelete(p->pRight); +++ sqliteExprListDelete(p->pList); +++ sqliteSelectDelete(p->pSelect); +++ sqliteFree(p); +++} +++ +++ +++/* +++** The following group of routines make deep copies of expressions, +++** expression lists, ID lists, and select statements. The copies can +++** be deleted (by being passed to their respective ...Delete() routines) +++** without effecting the originals. +++** +++** The expression list, ID, and source lists return by sqliteExprListDup(), +++** sqliteIdListDup(), and sqliteSrcListDup() can not be further expanded +++** by subsequent calls to sqlite*ListAppend() routines. +++** +++** Any tables that the SrcList might point to are not duplicated. +++*/ +++Expr *sqliteExprDup(Expr *p){ +++ Expr *pNew; +++ if( p==0 ) return 0; +++ pNew = sqliteMallocRaw( sizeof(*p) ); +++ if( pNew==0 ) return 0; +++ memcpy(pNew, p, sizeof(*pNew)); +++ if( p->token.z!=0 ){ +++ pNew->token.z = sqliteStrNDup(p->token.z, p->token.n); +++ pNew->token.dyn = 1; +++ }else{ +++ assert( pNew->token.z==0 ); +++ } +++ pNew->span.z = 0; +++ pNew->pLeft = sqliteExprDup(p->pLeft); +++ pNew->pRight = sqliteExprDup(p->pRight); +++ pNew->pList = sqliteExprListDup(p->pList); +++ pNew->pSelect = sqliteSelectDup(p->pSelect); +++ return pNew; +++} +++void sqliteTokenCopy(Token *pTo, Token *pFrom){ +++ if( pTo->dyn ) sqliteFree((char*)pTo->z); +++ if( pFrom->z ){ +++ pTo->n = pFrom->n; +++ pTo->z = sqliteStrNDup(pFrom->z, pFrom->n); +++ pTo->dyn = 1; +++ }else{ +++ pTo->z = 0; +++ } +++} +++ExprList *sqliteExprListDup(ExprList *p){ +++ ExprList *pNew; +++ struct ExprList_item *pItem; +++ int i; +++ if( p==0 ) return 0; +++ pNew = sqliteMalloc( sizeof(*pNew) ); +++ if( pNew==0 ) return 0; +++ pNew->nExpr = pNew->nAlloc = p->nExpr; +++ pNew->a = pItem = sqliteMalloc( p->nExpr*sizeof(p->a[0]) ); +++ if( pItem==0 ){ +++ sqliteFree(pNew); +++ return 0; +++ } +++ for(i=0; inExpr; i++, pItem++){ +++ Expr *pNewExpr, *pOldExpr; +++ pItem->pExpr = pNewExpr = sqliteExprDup(pOldExpr = p->a[i].pExpr); +++ if( pOldExpr->span.z!=0 && pNewExpr ){ +++ /* Always make a copy of the span for top-level expressions in the +++ ** expression list. The logic in SELECT processing that determines +++ ** the names of columns in the result set needs this information */ +++ sqliteTokenCopy(&pNewExpr->span, &pOldExpr->span); +++ } +++ assert( pNewExpr==0 || pNewExpr->span.z!=0 +++ || pOldExpr->span.z==0 || sqlite_malloc_failed ); +++ pItem->zName = sqliteStrDup(p->a[i].zName); +++ pItem->sortOrder = p->a[i].sortOrder; +++ pItem->isAgg = p->a[i].isAgg; +++ pItem->done = 0; +++ } +++ return pNew; +++} +++SrcList *sqliteSrcListDup(SrcList *p){ +++ SrcList *pNew; +++ int i; +++ int nByte; +++ if( p==0 ) return 0; +++ nByte = sizeof(*p) + (p->nSrc>0 ? sizeof(p->a[0]) * (p->nSrc-1) : 0); +++ pNew = sqliteMallocRaw( nByte ); +++ if( pNew==0 ) return 0; +++ pNew->nSrc = pNew->nAlloc = p->nSrc; +++ for(i=0; inSrc; i++){ +++ struct SrcList_item *pNewItem = &pNew->a[i]; +++ struct SrcList_item *pOldItem = &p->a[i]; +++ pNewItem->zDatabase = sqliteStrDup(pOldItem->zDatabase); +++ pNewItem->zName = sqliteStrDup(pOldItem->zName); +++ pNewItem->zAlias = sqliteStrDup(pOldItem->zAlias); +++ pNewItem->jointype = pOldItem->jointype; +++ pNewItem->iCursor = pOldItem->iCursor; +++ pNewItem->pTab = 0; +++ pNewItem->pSelect = sqliteSelectDup(pOldItem->pSelect); +++ pNewItem->pOn = sqliteExprDup(pOldItem->pOn); +++ pNewItem->pUsing = sqliteIdListDup(pOldItem->pUsing); +++ } +++ return pNew; +++} +++IdList *sqliteIdListDup(IdList *p){ +++ IdList *pNew; +++ int i; +++ if( p==0 ) return 0; +++ pNew = sqliteMallocRaw( sizeof(*pNew) ); +++ if( pNew==0 ) return 0; +++ pNew->nId = pNew->nAlloc = p->nId; +++ pNew->a = sqliteMallocRaw( p->nId*sizeof(p->a[0]) ); +++ if( pNew->a==0 ) return 0; +++ for(i=0; inId; i++){ +++ struct IdList_item *pNewItem = &pNew->a[i]; +++ struct IdList_item *pOldItem = &p->a[i]; +++ pNewItem->zName = sqliteStrDup(pOldItem->zName); +++ pNewItem->idx = pOldItem->idx; +++ } +++ return pNew; +++} +++Select *sqliteSelectDup(Select *p){ +++ Select *pNew; +++ if( p==0 ) return 0; +++ pNew = sqliteMallocRaw( sizeof(*p) ); +++ if( pNew==0 ) return 0; +++ pNew->isDistinct = p->isDistinct; +++ pNew->pEList = sqliteExprListDup(p->pEList); +++ pNew->pSrc = sqliteSrcListDup(p->pSrc); +++ pNew->pWhere = sqliteExprDup(p->pWhere); +++ pNew->pGroupBy = sqliteExprListDup(p->pGroupBy); +++ pNew->pHaving = sqliteExprDup(p->pHaving); +++ pNew->pOrderBy = sqliteExprListDup(p->pOrderBy); +++ pNew->op = p->op; +++ pNew->pPrior = sqliteSelectDup(p->pPrior); +++ pNew->nLimit = p->nLimit; +++ pNew->nOffset = p->nOffset; +++ pNew->zSelect = 0; +++ pNew->iLimit = -1; +++ pNew->iOffset = -1; +++ return pNew; +++} +++ +++ +++/* +++** Add a new element to the end of an expression list. If pList is +++** initially NULL, then create a new expression list. +++*/ +++ExprList *sqliteExprListAppend(ExprList *pList, Expr *pExpr, Token *pName){ +++ if( pList==0 ){ +++ pList = sqliteMalloc( sizeof(ExprList) ); +++ if( pList==0 ){ +++ /* sqliteExprDelete(pExpr); // Leak memory if malloc fails */ +++ return 0; +++ } +++ assert( pList->nAlloc==0 ); +++ } +++ if( pList->nAlloc<=pList->nExpr ){ +++ pList->nAlloc = pList->nAlloc*2 + 4; +++ pList->a = sqliteRealloc(pList->a, pList->nAlloc*sizeof(pList->a[0])); +++ if( pList->a==0 ){ +++ /* sqliteExprDelete(pExpr); // Leak memory if malloc fails */ +++ pList->nExpr = pList->nAlloc = 0; +++ return pList; +++ } +++ } +++ assert( pList->a!=0 ); +++ if( pExpr || pName ){ +++ struct ExprList_item *pItem = &pList->a[pList->nExpr++]; +++ memset(pItem, 0, sizeof(*pItem)); +++ pItem->pExpr = pExpr; +++ if( pName ){ +++ sqliteSetNString(&pItem->zName, pName->z, pName->n, 0); +++ sqliteDequote(pItem->zName); +++ } +++ } +++ return pList; +++} +++ +++/* +++** Delete an entire expression list. +++*/ +++void sqliteExprListDelete(ExprList *pList){ +++ int i; +++ if( pList==0 ) return; +++ assert( pList->a!=0 || (pList->nExpr==0 && pList->nAlloc==0) ); +++ assert( pList->nExpr<=pList->nAlloc ); +++ for(i=0; inExpr; i++){ +++ sqliteExprDelete(pList->a[i].pExpr); +++ sqliteFree(pList->a[i].zName); +++ } +++ sqliteFree(pList->a); +++ sqliteFree(pList); +++} +++ +++/* +++** Walk an expression tree. Return 1 if the expression is constant +++** and 0 if it involves variables. +++** +++** For the purposes of this function, a double-quoted string (ex: "abc") +++** is considered a variable but a single-quoted string (ex: 'abc') is +++** a constant. +++*/ +++int sqliteExprIsConstant(Expr *p){ +++ switch( p->op ){ +++ case TK_ID: +++ case TK_COLUMN: +++ case TK_DOT: +++ case TK_FUNCTION: +++ return 0; +++ case TK_NULL: +++ case TK_STRING: +++ case TK_INTEGER: +++ case TK_FLOAT: +++ case TK_VARIABLE: +++ return 1; +++ default: { +++ if( p->pLeft && !sqliteExprIsConstant(p->pLeft) ) return 0; +++ if( p->pRight && !sqliteExprIsConstant(p->pRight) ) return 0; +++ if( p->pList ){ +++ int i; +++ for(i=0; ipList->nExpr; i++){ +++ if( !sqliteExprIsConstant(p->pList->a[i].pExpr) ) return 0; +++ } +++ } +++ return p->pLeft!=0 || p->pRight!=0 || (p->pList && p->pList->nExpr>0); +++ } +++ } +++ return 0; +++} +++ +++/* +++** If the given expression codes a constant integer that is small enough +++** to fit in a 32-bit integer, return 1 and put the value of the integer +++** in *pValue. If the expression is not an integer or if it is too big +++** to fit in a signed 32-bit integer, return 0 and leave *pValue unchanged. +++*/ +++int sqliteExprIsInteger(Expr *p, int *pValue){ +++ switch( p->op ){ +++ case TK_INTEGER: { +++ if( sqliteFitsIn32Bits(p->token.z) ){ +++ *pValue = atoi(p->token.z); +++ return 1; +++ } +++ break; +++ } +++ case TK_STRING: { +++ const char *z = p->token.z; +++ int n = p->token.n; +++ if( n>0 && z[0]=='-' ){ z++; n--; } +++ while( n>0 && *z && isdigit(*z) ){ z++; n--; } +++ if( n==0 && sqliteFitsIn32Bits(p->token.z) ){ +++ *pValue = atoi(p->token.z); +++ return 1; +++ } +++ break; +++ } +++ case TK_UPLUS: { +++ return sqliteExprIsInteger(p->pLeft, pValue); +++ } +++ case TK_UMINUS: { +++ int v; +++ if( sqliteExprIsInteger(p->pLeft, &v) ){ +++ *pValue = -v; +++ return 1; +++ } +++ break; +++ } +++ default: break; +++ } +++ return 0; +++} +++ +++/* +++** Return TRUE if the given string is a row-id column name. +++*/ +++int sqliteIsRowid(const char *z){ +++ if( sqliteStrICmp(z, "_ROWID_")==0 ) return 1; +++ if( sqliteStrICmp(z, "ROWID")==0 ) return 1; +++ if( sqliteStrICmp(z, "OID")==0 ) return 1; +++ return 0; +++} +++ +++/* +++** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up +++** that name in the set of source tables in pSrcList and make the pExpr +++** expression node refer back to that source column. The following changes +++** are made to pExpr: +++** +++** pExpr->iDb Set the index in db->aDb[] of the database holding +++** the table. +++** pExpr->iTable Set to the cursor number for the table obtained +++** from pSrcList. +++** pExpr->iColumn Set to the column number within the table. +++** pExpr->dataType Set to the appropriate data type for the column. +++** pExpr->op Set to TK_COLUMN. +++** pExpr->pLeft Any expression this points to is deleted +++** pExpr->pRight Any expression this points to is deleted. +++** +++** The pDbToken is the name of the database (the "X"). This value may be +++** NULL meaning that name is of the form Y.Z or Z. Any available database +++** can be used. The pTableToken is the name of the table (the "Y"). This +++** value can be NULL if pDbToken is also NULL. If pTableToken is NULL it +++** means that the form of the name is Z and that columns from any table +++** can be used. +++** +++** If the name cannot be resolved unambiguously, leave an error message +++** in pParse and return non-zero. Return zero on success. +++*/ +++static int lookupName( +++ Parse *pParse, /* The parsing context */ +++ Token *pDbToken, /* Name of the database containing table, or NULL */ +++ Token *pTableToken, /* Name of table containing column, or NULL */ +++ Token *pColumnToken, /* Name of the column. */ +++ SrcList *pSrcList, /* List of tables used to resolve column names */ +++ ExprList *pEList, /* List of expressions used to resolve "AS" */ +++ Expr *pExpr /* Make this EXPR node point to the selected column */ +++){ +++ char *zDb = 0; /* Name of the database. The "X" in X.Y.Z */ +++ char *zTab = 0; /* Name of the table. The "Y" in X.Y.Z or Y.Z */ +++ char *zCol = 0; /* Name of the column. The "Z" */ +++ int i, j; /* Loop counters */ +++ int cnt = 0; /* Number of matching column names */ +++ int cntTab = 0; /* Number of matching table names */ +++ sqlite *db = pParse->db; /* The database */ +++ +++ assert( pColumnToken && pColumnToken->z ); /* The Z in X.Y.Z cannot be NULL */ +++ if( pDbToken && pDbToken->z ){ +++ zDb = sqliteStrNDup(pDbToken->z, pDbToken->n); +++ sqliteDequote(zDb); +++ }else{ +++ zDb = 0; +++ } +++ if( pTableToken && pTableToken->z ){ +++ zTab = sqliteStrNDup(pTableToken->z, pTableToken->n); +++ sqliteDequote(zTab); +++ }else{ +++ assert( zDb==0 ); +++ zTab = 0; +++ } +++ zCol = sqliteStrNDup(pColumnToken->z, pColumnToken->n); +++ sqliteDequote(zCol); +++ if( sqlite_malloc_failed ){ +++ return 1; /* Leak memory (zDb and zTab) if malloc fails */ +++ } +++ assert( zTab==0 || pEList==0 ); +++ +++ pExpr->iTable = -1; +++ for(i=0; inSrc; i++){ +++ struct SrcList_item *pItem = &pSrcList->a[i]; +++ Table *pTab = pItem->pTab; +++ Column *pCol; +++ +++ if( pTab==0 ) continue; +++ assert( pTab->nCol>0 ); +++ if( zTab ){ +++ if( pItem->zAlias ){ +++ char *zTabName = pItem->zAlias; +++ if( sqliteStrICmp(zTabName, zTab)!=0 ) continue; +++ }else{ +++ char *zTabName = pTab->zName; +++ if( zTabName==0 || sqliteStrICmp(zTabName, zTab)!=0 ) continue; +++ if( zDb!=0 && sqliteStrICmp(db->aDb[pTab->iDb].zName, zDb)!=0 ){ +++ continue; +++ } +++ } +++ } +++ if( 0==(cntTab++) ){ +++ pExpr->iTable = pItem->iCursor; +++ pExpr->iDb = pTab->iDb; +++ } +++ for(j=0, pCol=pTab->aCol; jnCol; j++, pCol++){ +++ if( sqliteStrICmp(pCol->zName, zCol)==0 ){ +++ cnt++; +++ pExpr->iTable = pItem->iCursor; +++ pExpr->iDb = pTab->iDb; +++ /* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */ +++ pExpr->iColumn = j==pTab->iPKey ? -1 : j; +++ pExpr->dataType = pCol->sortOrder & SQLITE_SO_TYPEMASK; +++ break; +++ } +++ } +++ } +++ +++ /* If we have not already resolved the name, then maybe +++ ** it is a new.* or old.* trigger argument reference +++ */ +++ if( zDb==0 && zTab!=0 && cnt==0 && pParse->trigStack!=0 ){ +++ TriggerStack *pTriggerStack = pParse->trigStack; +++ Table *pTab = 0; +++ if( pTriggerStack->newIdx != -1 && sqliteStrICmp("new", zTab) == 0 ){ +++ pExpr->iTable = pTriggerStack->newIdx; +++ assert( pTriggerStack->pTab ); +++ pTab = pTriggerStack->pTab; +++ }else if( pTriggerStack->oldIdx != -1 && sqliteStrICmp("old", zTab) == 0 ){ +++ pExpr->iTable = pTriggerStack->oldIdx; +++ assert( pTriggerStack->pTab ); +++ pTab = pTriggerStack->pTab; +++ } +++ +++ if( pTab ){ +++ int j; +++ Column *pCol = pTab->aCol; +++ +++ pExpr->iDb = pTab->iDb; +++ cntTab++; +++ for(j=0; j < pTab->nCol; j++, pCol++) { +++ if( sqliteStrICmp(pCol->zName, zCol)==0 ){ +++ cnt++; +++ pExpr->iColumn = j==pTab->iPKey ? -1 : j; +++ pExpr->dataType = pCol->sortOrder & SQLITE_SO_TYPEMASK; +++ break; +++ } +++ } +++ } +++ } +++ +++ /* +++ ** Perhaps the name is a reference to the ROWID +++ */ +++ if( cnt==0 && cntTab==1 && sqliteIsRowid(zCol) ){ +++ cnt = 1; +++ pExpr->iColumn = -1; +++ pExpr->dataType = SQLITE_SO_NUM; +++ } +++ +++ /* +++ ** If the input is of the form Z (not Y.Z or X.Y.Z) then the name Z +++ ** might refer to an result-set alias. This happens, for example, when +++ ** we are resolving names in the WHERE clause of the following command: +++ ** +++ ** SELECT a+b AS x FROM table WHERE x<10; +++ ** +++ ** In cases like this, replace pExpr with a copy of the expression that +++ ** forms the result set entry ("a+b" in the example) and return immediately. +++ ** Note that the expression in the result set should have already been +++ ** resolved by the time the WHERE clause is resolved. +++ */ +++ if( cnt==0 && pEList!=0 ){ +++ for(j=0; jnExpr; j++){ +++ char *zAs = pEList->a[j].zName; +++ if( zAs!=0 && sqliteStrICmp(zAs, zCol)==0 ){ +++ assert( pExpr->pLeft==0 && pExpr->pRight==0 ); +++ pExpr->op = TK_AS; +++ pExpr->iColumn = j; +++ pExpr->pLeft = sqliteExprDup(pEList->a[j].pExpr); +++ sqliteFree(zCol); +++ assert( zTab==0 && zDb==0 ); +++ return 0; +++ } +++ } +++ } +++ +++ /* +++ ** If X and Y are NULL (in other words if only the column name Z is +++ ** supplied) and the value of Z is enclosed in double-quotes, then +++ ** Z is a string literal if it doesn't match any column names. In that +++ ** case, we need to return right away and not make any changes to +++ ** pExpr. +++ */ +++ if( cnt==0 && zTab==0 && pColumnToken->z[0]=='"' ){ +++ sqliteFree(zCol); +++ return 0; +++ } +++ +++ /* +++ ** cnt==0 means there was not match. cnt>1 means there were two or +++ ** more matches. Either way, we have an error. +++ */ +++ if( cnt!=1 ){ +++ char *z = 0; +++ char *zErr; +++ zErr = cnt==0 ? "no such column: %s" : "ambiguous column name: %s"; +++ if( zDb ){ +++ sqliteSetString(&z, zDb, ".", zTab, ".", zCol, 0); +++ }else if( zTab ){ +++ sqliteSetString(&z, zTab, ".", zCol, 0); +++ }else{ +++ z = sqliteStrDup(zCol); +++ } +++ sqliteErrorMsg(pParse, zErr, z); +++ sqliteFree(z); +++ } +++ +++ /* Clean up and return +++ */ +++ sqliteFree(zDb); +++ sqliteFree(zTab); +++ sqliteFree(zCol); +++ sqliteExprDelete(pExpr->pLeft); +++ pExpr->pLeft = 0; +++ sqliteExprDelete(pExpr->pRight); +++ pExpr->pRight = 0; +++ pExpr->op = TK_COLUMN; +++ sqliteAuthRead(pParse, pExpr, pSrcList); +++ return cnt!=1; +++} +++ +++/* +++** This routine walks an expression tree and resolves references to +++** table columns. Nodes of the form ID.ID or ID resolve into an +++** index to the table in the table list and a column offset. The +++** Expr.opcode for such nodes is changed to TK_COLUMN. The Expr.iTable +++** value is changed to the index of the referenced table in pTabList +++** plus the "base" value. The base value will ultimately become the +++** VDBE cursor number for a cursor that is pointing into the referenced +++** table. The Expr.iColumn value is changed to the index of the column +++** of the referenced table. The Expr.iColumn value for the special +++** ROWID column is -1. Any INTEGER PRIMARY KEY column is tried as an +++** alias for ROWID. +++** +++** We also check for instances of the IN operator. IN comes in two +++** forms: +++** +++** expr IN (exprlist) +++** and +++** expr IN (SELECT ...) +++** +++** The first form is handled by creating a set holding the list +++** of allowed values. The second form causes the SELECT to generate +++** a temporary table. +++** +++** This routine also looks for scalar SELECTs that are part of an expression. +++** If it finds any, it generates code to write the value of that select +++** into a memory cell. +++** +++** Unknown columns or tables provoke an error. The function returns +++** the number of errors seen and leaves an error message on pParse->zErrMsg. +++*/ +++int sqliteExprResolveIds( +++ Parse *pParse, /* The parser context */ +++ SrcList *pSrcList, /* List of tables used to resolve column names */ +++ ExprList *pEList, /* List of expressions used to resolve "AS" */ +++ Expr *pExpr /* The expression to be analyzed. */ +++){ +++ int i; +++ +++ if( pExpr==0 || pSrcList==0 ) return 0; +++ for(i=0; inSrc; i++){ +++ assert( pSrcList->a[i].iCursor>=0 && pSrcList->a[i].iCursornTab ); +++ } +++ switch( pExpr->op ){ +++ /* Double-quoted strings (ex: "abc") are used as identifiers if +++ ** possible. Otherwise they remain as strings. Single-quoted +++ ** strings (ex: 'abc') are always string literals. +++ */ +++ case TK_STRING: { +++ if( pExpr->token.z[0]=='\'' ) break; +++ /* Fall thru into the TK_ID case if this is a double-quoted string */ +++ } +++ /* A lone identifier is the name of a columnd. +++ */ +++ case TK_ID: { +++ if( lookupName(pParse, 0, 0, &pExpr->token, pSrcList, pEList, pExpr) ){ +++ return 1; +++ } +++ break; +++ } +++ +++ /* A table name and column name: ID.ID +++ ** Or a database, table and column: ID.ID.ID +++ */ +++ case TK_DOT: { +++ Token *pColumn; +++ Token *pTable; +++ Token *pDb; +++ Expr *pRight; +++ +++ pRight = pExpr->pRight; +++ if( pRight->op==TK_ID ){ +++ pDb = 0; +++ pTable = &pExpr->pLeft->token; +++ pColumn = &pRight->token; +++ }else{ +++ assert( pRight->op==TK_DOT ); +++ pDb = &pExpr->pLeft->token; +++ pTable = &pRight->pLeft->token; +++ pColumn = &pRight->pRight->token; +++ } +++ if( lookupName(pParse, pDb, pTable, pColumn, pSrcList, 0, pExpr) ){ +++ return 1; +++ } +++ break; +++ } +++ +++ case TK_IN: { +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return 1; +++ if( sqliteExprResolveIds(pParse, pSrcList, pEList, pExpr->pLeft) ){ +++ return 1; +++ } +++ if( pExpr->pSelect ){ +++ /* Case 1: expr IN (SELECT ...) +++ ** +++ ** Generate code to write the results of the select into a temporary +++ ** table. The cursor number of the temporary table has already +++ ** been put in iTable by sqliteExprResolveInSelect(). +++ */ +++ pExpr->iTable = pParse->nTab++; +++ sqliteVdbeAddOp(v, OP_OpenTemp, pExpr->iTable, 1); +++ sqliteSelect(pParse, pExpr->pSelect, SRT_Set, pExpr->iTable, 0,0,0); +++ }else if( pExpr->pList ){ +++ /* Case 2: expr IN (exprlist) +++ ** +++ ** Create a set to put the exprlist values in. The Set id is stored +++ ** in iTable. +++ */ +++ int i, iSet; +++ for(i=0; ipList->nExpr; i++){ +++ Expr *pE2 = pExpr->pList->a[i].pExpr; +++ if( !sqliteExprIsConstant(pE2) ){ +++ sqliteErrorMsg(pParse, +++ "right-hand side of IN operator must be constant"); +++ return 1; +++ } +++ if( sqliteExprCheck(pParse, pE2, 0, 0) ){ +++ return 1; +++ } +++ } +++ iSet = pExpr->iTable = pParse->nSet++; +++ for(i=0; ipList->nExpr; i++){ +++ Expr *pE2 = pExpr->pList->a[i].pExpr; +++ switch( pE2->op ){ +++ case TK_FLOAT: +++ case TK_INTEGER: +++ case TK_STRING: { +++ int addr; +++ assert( pE2->token.z ); +++ addr = sqliteVdbeOp3(v, OP_SetInsert, iSet, 0, +++ pE2->token.z, pE2->token.n); +++ sqliteVdbeDequoteP3(v, addr); +++ break; +++ } +++ default: { +++ sqliteExprCode(pParse, pE2); +++ sqliteVdbeAddOp(v, OP_SetInsert, iSet, 0); +++ break; +++ } +++ } +++ } +++ } +++ break; +++ } +++ +++ case TK_SELECT: { +++ /* This has to be a scalar SELECT. Generate code to put the +++ ** value of this select in a memory cell and record the number +++ ** of the memory cell in iColumn. +++ */ +++ pExpr->iColumn = pParse->nMem++; +++ if( sqliteSelect(pParse, pExpr->pSelect, SRT_Mem, pExpr->iColumn,0,0,0) ){ +++ return 1; +++ } +++ break; +++ } +++ +++ /* For all else, just recursively walk the tree */ +++ default: { +++ if( pExpr->pLeft +++ && sqliteExprResolveIds(pParse, pSrcList, pEList, pExpr->pLeft) ){ +++ return 1; +++ } +++ if( pExpr->pRight +++ && sqliteExprResolveIds(pParse, pSrcList, pEList, pExpr->pRight) ){ +++ return 1; +++ } +++ if( pExpr->pList ){ +++ int i; +++ ExprList *pList = pExpr->pList; +++ for(i=0; inExpr; i++){ +++ Expr *pArg = pList->a[i].pExpr; +++ if( sqliteExprResolveIds(pParse, pSrcList, pEList, pArg) ){ +++ return 1; +++ } +++ } +++ } +++ } +++ } +++ return 0; +++} +++ +++/* +++** pExpr is a node that defines a function of some kind. It might +++** be a syntactic function like "count(x)" or it might be a function +++** that implements an operator, like "a LIKE b". +++** +++** This routine makes *pzName point to the name of the function and +++** *pnName hold the number of characters in the function name. +++*/ +++static void getFunctionName(Expr *pExpr, const char **pzName, int *pnName){ +++ switch( pExpr->op ){ +++ case TK_FUNCTION: { +++ *pzName = pExpr->token.z; +++ *pnName = pExpr->token.n; +++ break; +++ } +++ case TK_LIKE: { +++ *pzName = "like"; +++ *pnName = 4; +++ break; +++ } +++ case TK_GLOB: { +++ *pzName = "glob"; +++ *pnName = 4; +++ break; +++ } +++ default: { +++ *pzName = "can't happen"; +++ *pnName = 12; +++ break; +++ } +++ } +++} +++ +++/* +++** Error check the functions in an expression. Make sure all +++** function names are recognized and all functions have the correct +++** number of arguments. Leave an error message in pParse->zErrMsg +++** if anything is amiss. Return the number of errors. +++** +++** if pIsAgg is not null and this expression is an aggregate function +++** (like count(*) or max(value)) then write a 1 into *pIsAgg. +++*/ +++int sqliteExprCheck(Parse *pParse, Expr *pExpr, int allowAgg, int *pIsAgg){ +++ int nErr = 0; +++ if( pExpr==0 ) return 0; +++ switch( pExpr->op ){ +++ case TK_GLOB: +++ case TK_LIKE: +++ case TK_FUNCTION: { +++ int n = pExpr->pList ? pExpr->pList->nExpr : 0; /* Number of arguments */ +++ int no_such_func = 0; /* True if no such function exists */ +++ int wrong_num_args = 0; /* True if wrong number of arguments */ +++ int is_agg = 0; /* True if is an aggregate function */ +++ int i; +++ int nId; /* Number of characters in function name */ +++ const char *zId; /* The function name. */ +++ FuncDef *pDef; +++ +++ getFunctionName(pExpr, &zId, &nId); +++ pDef = sqliteFindFunction(pParse->db, zId, nId, n, 0); +++ if( pDef==0 ){ +++ pDef = sqliteFindFunction(pParse->db, zId, nId, -1, 0); +++ if( pDef==0 ){ +++ no_such_func = 1; +++ }else{ +++ wrong_num_args = 1; +++ } +++ }else{ +++ is_agg = pDef->xFunc==0; +++ } +++ if( is_agg && !allowAgg ){ +++ sqliteErrorMsg(pParse, "misuse of aggregate function %.*s()", nId, zId); +++ nErr++; +++ is_agg = 0; +++ }else if( no_such_func ){ +++ sqliteErrorMsg(pParse, "no such function: %.*s", nId, zId); +++ nErr++; +++ }else if( wrong_num_args ){ +++ sqliteErrorMsg(pParse,"wrong number of arguments to function %.*s()", +++ nId, zId); +++ nErr++; +++ } +++ if( is_agg ){ +++ pExpr->op = TK_AGG_FUNCTION; +++ if( pIsAgg ) *pIsAgg = 1; +++ } +++ for(i=0; nErr==0 && ipList->a[i].pExpr, +++ allowAgg && !is_agg, pIsAgg); +++ } +++ if( pDef==0 ){ +++ /* Already reported an error */ +++ }else if( pDef->dataType>=0 ){ +++ if( pDef->dataTypedataType = +++ sqliteExprType(pExpr->pList->a[pDef->dataType].pExpr); +++ }else{ +++ pExpr->dataType = SQLITE_SO_NUM; +++ } +++ }else if( pDef->dataType==SQLITE_ARGS ){ +++ pDef->dataType = SQLITE_SO_TEXT; +++ for(i=0; ipList->a[i].pExpr)==SQLITE_SO_NUM ){ +++ pExpr->dataType = SQLITE_SO_NUM; +++ break; +++ } +++ } +++ }else if( pDef->dataType==SQLITE_NUMERIC ){ +++ pExpr->dataType = SQLITE_SO_NUM; +++ }else{ +++ pExpr->dataType = SQLITE_SO_TEXT; +++ } +++ } +++ default: { +++ if( pExpr->pLeft ){ +++ nErr = sqliteExprCheck(pParse, pExpr->pLeft, allowAgg, pIsAgg); +++ } +++ if( nErr==0 && pExpr->pRight ){ +++ nErr = sqliteExprCheck(pParse, pExpr->pRight, allowAgg, pIsAgg); +++ } +++ if( nErr==0 && pExpr->pList ){ +++ int n = pExpr->pList->nExpr; +++ int i; +++ for(i=0; nErr==0 && ipList->a[i].pExpr; +++ nErr = sqliteExprCheck(pParse, pE2, allowAgg, pIsAgg); +++ } +++ } +++ break; +++ } +++ } +++ return nErr; +++} +++ +++/* +++** Return either SQLITE_SO_NUM or SQLITE_SO_TEXT to indicate whether the +++** given expression should sort as numeric values or as text. +++** +++** The sqliteExprResolveIds() and sqliteExprCheck() routines must have +++** both been called on the expression before it is passed to this routine. +++*/ +++int sqliteExprType(Expr *p){ +++ if( p==0 ) return SQLITE_SO_NUM; +++ while( p ) switch( p->op ){ +++ case TK_PLUS: +++ case TK_MINUS: +++ case TK_STAR: +++ case TK_SLASH: +++ case TK_AND: +++ case TK_OR: +++ case TK_ISNULL: +++ case TK_NOTNULL: +++ case TK_NOT: +++ case TK_UMINUS: +++ case TK_UPLUS: +++ case TK_BITAND: +++ case TK_BITOR: +++ case TK_BITNOT: +++ case TK_LSHIFT: +++ case TK_RSHIFT: +++ case TK_REM: +++ case TK_INTEGER: +++ case TK_FLOAT: +++ case TK_IN: +++ case TK_BETWEEN: +++ case TK_GLOB: +++ case TK_LIKE: +++ return SQLITE_SO_NUM; +++ +++ case TK_STRING: +++ case TK_NULL: +++ case TK_CONCAT: +++ case TK_VARIABLE: +++ return SQLITE_SO_TEXT; +++ +++ case TK_LT: +++ case TK_LE: +++ case TK_GT: +++ case TK_GE: +++ case TK_NE: +++ case TK_EQ: +++ if( sqliteExprType(p->pLeft)==SQLITE_SO_NUM ){ +++ return SQLITE_SO_NUM; +++ } +++ p = p->pRight; +++ break; +++ +++ case TK_AS: +++ p = p->pLeft; +++ break; +++ +++ case TK_COLUMN: +++ case TK_FUNCTION: +++ case TK_AGG_FUNCTION: +++ return p->dataType; +++ +++ case TK_SELECT: +++ assert( p->pSelect ); +++ assert( p->pSelect->pEList ); +++ assert( p->pSelect->pEList->nExpr>0 ); +++ p = p->pSelect->pEList->a[0].pExpr; +++ break; +++ +++ case TK_CASE: { +++ if( p->pRight && sqliteExprType(p->pRight)==SQLITE_SO_NUM ){ +++ return SQLITE_SO_NUM; +++ } +++ if( p->pList ){ +++ int i; +++ ExprList *pList = p->pList; +++ for(i=1; inExpr; i+=2){ +++ if( sqliteExprType(pList->a[i].pExpr)==SQLITE_SO_NUM ){ +++ return SQLITE_SO_NUM; +++ } +++ } +++ } +++ return SQLITE_SO_TEXT; +++ } +++ +++ default: +++ assert( p->op==TK_ABORT ); /* Can't Happen */ +++ break; +++ } +++ return SQLITE_SO_NUM; +++} +++ +++/* +++** Generate code into the current Vdbe to evaluate the given +++** expression and leave the result on the top of stack. +++*/ +++void sqliteExprCode(Parse *pParse, Expr *pExpr){ +++ Vdbe *v = pParse->pVdbe; +++ int op; +++ if( v==0 || pExpr==0 ) return; +++ switch( pExpr->op ){ +++ case TK_PLUS: op = OP_Add; break; +++ case TK_MINUS: op = OP_Subtract; break; +++ case TK_STAR: op = OP_Multiply; break; +++ case TK_SLASH: op = OP_Divide; break; +++ case TK_AND: op = OP_And; break; +++ case TK_OR: op = OP_Or; break; +++ case TK_LT: op = OP_Lt; break; +++ case TK_LE: op = OP_Le; break; +++ case TK_GT: op = OP_Gt; break; +++ case TK_GE: op = OP_Ge; break; +++ case TK_NE: op = OP_Ne; break; +++ case TK_EQ: op = OP_Eq; break; +++ case TK_ISNULL: op = OP_IsNull; break; +++ case TK_NOTNULL: op = OP_NotNull; break; +++ case TK_NOT: op = OP_Not; break; +++ case TK_UMINUS: op = OP_Negative; break; +++ case TK_BITAND: op = OP_BitAnd; break; +++ case TK_BITOR: op = OP_BitOr; break; +++ case TK_BITNOT: op = OP_BitNot; break; +++ case TK_LSHIFT: op = OP_ShiftLeft; break; +++ case TK_RSHIFT: op = OP_ShiftRight; break; +++ case TK_REM: op = OP_Remainder; break; +++ default: break; +++ } +++ switch( pExpr->op ){ +++ case TK_COLUMN: { +++ if( pParse->useAgg ){ +++ sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg); +++ }else if( pExpr->iColumn>=0 ){ +++ sqliteVdbeAddOp(v, OP_Column, pExpr->iTable, pExpr->iColumn); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Recno, pExpr->iTable, 0); +++ } +++ break; +++ } +++ case TK_STRING: +++ case TK_FLOAT: +++ case TK_INTEGER: { +++ if( pExpr->op==TK_INTEGER && sqliteFitsIn32Bits(pExpr->token.z) ){ +++ sqliteVdbeAddOp(v, OP_Integer, atoi(pExpr->token.z), 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ } +++ assert( pExpr->token.z ); +++ sqliteVdbeChangeP3(v, -1, pExpr->token.z, pExpr->token.n); +++ sqliteVdbeDequoteP3(v, -1); +++ break; +++ } +++ case TK_NULL: { +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ break; +++ } +++ case TK_VARIABLE: { +++ sqliteVdbeAddOp(v, OP_Variable, pExpr->iTable, 0); +++ break; +++ } +++ case TK_LT: +++ case TK_LE: +++ case TK_GT: +++ case TK_GE: +++ case TK_NE: +++ case TK_EQ: { +++ if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){ +++ op += 6; /* Convert numeric opcodes to text opcodes */ +++ } +++ /* Fall through into the next case */ +++ } +++ case TK_AND: +++ case TK_OR: +++ case TK_PLUS: +++ case TK_STAR: +++ case TK_MINUS: +++ case TK_REM: +++ case TK_BITAND: +++ case TK_BITOR: +++ case TK_SLASH: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteExprCode(pParse, pExpr->pRight); +++ sqliteVdbeAddOp(v, op, 0, 0); +++ break; +++ } +++ case TK_LSHIFT: +++ case TK_RSHIFT: { +++ sqliteExprCode(pParse, pExpr->pRight); +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, op, 0, 0); +++ break; +++ } +++ case TK_CONCAT: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteExprCode(pParse, pExpr->pRight); +++ sqliteVdbeAddOp(v, OP_Concat, 2, 0); +++ break; +++ } +++ case TK_UMINUS: { +++ assert( pExpr->pLeft ); +++ if( pExpr->pLeft->op==TK_FLOAT || pExpr->pLeft->op==TK_INTEGER ){ +++ Token *p = &pExpr->pLeft->token; +++ char *z = sqliteMalloc( p->n + 2 ); +++ sprintf(z, "-%.*s", p->n, p->z); +++ if( pExpr->pLeft->op==TK_INTEGER && sqliteFitsIn32Bits(z) ){ +++ sqliteVdbeAddOp(v, OP_Integer, atoi(z), 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ } +++ sqliteVdbeChangeP3(v, -1, z, p->n+1); +++ sqliteFree(z); +++ break; +++ } +++ /* Fall through into TK_NOT */ +++ } +++ case TK_BITNOT: +++ case TK_NOT: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, op, 0, 0); +++ break; +++ } +++ case TK_ISNULL: +++ case TK_NOTNULL: { +++ int dest; +++ sqliteVdbeAddOp(v, OP_Integer, 1, 0); +++ sqliteExprCode(pParse, pExpr->pLeft); +++ dest = sqliteVdbeCurrentAddr(v) + 2; +++ sqliteVdbeAddOp(v, op, 1, dest); +++ sqliteVdbeAddOp(v, OP_AddImm, -1, 0); +++ break; +++ } +++ case TK_AGG_FUNCTION: { +++ sqliteVdbeAddOp(v, OP_AggGet, 0, pExpr->iAgg); +++ break; +++ } +++ case TK_GLOB: +++ case TK_LIKE: +++ case TK_FUNCTION: { +++ ExprList *pList = pExpr->pList; +++ int nExpr = pList ? pList->nExpr : 0; +++ FuncDef *pDef; +++ int nId; +++ const char *zId; +++ getFunctionName(pExpr, &zId, &nId); +++ pDef = sqliteFindFunction(pParse->db, zId, nId, nExpr, 0); +++ assert( pDef!=0 ); +++ nExpr = sqliteExprCodeExprList(pParse, pList, pDef->includeTypes); +++ sqliteVdbeOp3(v, OP_Function, nExpr, 0, (char*)pDef, P3_POINTER); +++ break; +++ } +++ case TK_SELECT: { +++ sqliteVdbeAddOp(v, OP_MemLoad, pExpr->iColumn, 0); +++ break; +++ } +++ case TK_IN: { +++ int addr; +++ sqliteVdbeAddOp(v, OP_Integer, 1, 0); +++ sqliteExprCode(pParse, pExpr->pLeft); +++ addr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, addr+4); +++ sqliteVdbeAddOp(v, OP_Pop, 2, 0); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, addr+6); +++ if( pExpr->pSelect ){ +++ sqliteVdbeAddOp(v, OP_Found, pExpr->iTable, addr+6); +++ }else{ +++ sqliteVdbeAddOp(v, OP_SetFound, pExpr->iTable, addr+6); +++ } +++ sqliteVdbeAddOp(v, OP_AddImm, -1, 0); +++ break; +++ } +++ case TK_BETWEEN: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ sqliteExprCode(pParse, pExpr->pList->a[0].pExpr); +++ sqliteVdbeAddOp(v, OP_Ge, 0, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteExprCode(pParse, pExpr->pList->a[1].pExpr); +++ sqliteVdbeAddOp(v, OP_Le, 0, 0); +++ sqliteVdbeAddOp(v, OP_And, 0, 0); +++ break; +++ } +++ case TK_UPLUS: +++ case TK_AS: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ break; +++ } +++ case TK_CASE: { +++ int expr_end_label; +++ int jumpInst; +++ int addr; +++ int nExpr; +++ int i; +++ +++ assert(pExpr->pList); +++ assert((pExpr->pList->nExpr % 2) == 0); +++ assert(pExpr->pList->nExpr > 0); +++ nExpr = pExpr->pList->nExpr; +++ expr_end_label = sqliteVdbeMakeLabel(v); +++ if( pExpr->pLeft ){ +++ sqliteExprCode(pParse, pExpr->pLeft); +++ } +++ for(i=0; ipList->a[i].pExpr); +++ if( pExpr->pLeft ){ +++ sqliteVdbeAddOp(v, OP_Dup, 1, 1); +++ jumpInst = sqliteVdbeAddOp(v, OP_Ne, 1, 0); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ }else{ +++ jumpInst = sqliteVdbeAddOp(v, OP_IfNot, 1, 0); +++ } +++ sqliteExprCode(pParse, pExpr->pList->a[i+1].pExpr); +++ sqliteVdbeAddOp(v, OP_Goto, 0, expr_end_label); +++ addr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeChangeP2(v, jumpInst, addr); +++ } +++ if( pExpr->pLeft ){ +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ } +++ if( pExpr->pRight ){ +++ sqliteExprCode(pParse, pExpr->pRight); +++ }else{ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ } +++ sqliteVdbeResolveLabel(v, expr_end_label); +++ break; +++ } +++ case TK_RAISE: { +++ if( !pParse->trigStack ){ +++ sqliteErrorMsg(pParse, +++ "RAISE() may only be used within a trigger-program"); +++ pParse->nErr++; +++ return; +++ } +++ if( pExpr->iColumn == OE_Rollback || +++ pExpr->iColumn == OE_Abort || +++ pExpr->iColumn == OE_Fail ){ +++ sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn, +++ pExpr->token.z, pExpr->token.n); +++ sqliteVdbeDequoteP3(v, -1); +++ } else { +++ assert( pExpr->iColumn == OE_Ignore ); +++ sqliteVdbeOp3(v, OP_Goto, 0, pParse->trigStack->ignoreJump, +++ "(IGNORE jump)", 0); +++ } +++ } +++ break; +++ } +++} +++ +++/* +++** Generate code that pushes the value of every element of the given +++** expression list onto the stack. If the includeTypes flag is true, +++** then also push a string that is the datatype of each element onto +++** the stack after the value. +++** +++** Return the number of elements pushed onto the stack. +++*/ +++int sqliteExprCodeExprList( +++ Parse *pParse, /* Parsing context */ +++ ExprList *pList, /* The expression list to be coded */ +++ int includeTypes /* TRUE to put datatypes on the stack too */ +++){ +++ struct ExprList_item *pItem; +++ int i, n; +++ Vdbe *v; +++ if( pList==0 ) return 0; +++ v = sqliteGetVdbe(pParse); +++ n = pList->nExpr; +++ for(pItem=pList->a, i=0; ipExpr); +++ if( includeTypes ){ +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ sqliteExprType(pItem->pExpr)==SQLITE_SO_NUM ? "numeric" : "text", +++ P3_STATIC); +++ } +++ } +++ return includeTypes ? n*2 : n; +++} +++ +++/* +++** Generate code for a boolean expression such that a jump is made +++** to the label "dest" if the expression is true but execution +++** continues straight thru if the expression is false. +++** +++** If the expression evaluates to NULL (neither true nor false), then +++** take the jump if the jumpIfNull flag is true. +++*/ +++void sqliteExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ +++ Vdbe *v = pParse->pVdbe; +++ int op = 0; +++ if( v==0 || pExpr==0 ) return; +++ switch( pExpr->op ){ +++ case TK_LT: op = OP_Lt; break; +++ case TK_LE: op = OP_Le; break; +++ case TK_GT: op = OP_Gt; break; +++ case TK_GE: op = OP_Ge; break; +++ case TK_NE: op = OP_Ne; break; +++ case TK_EQ: op = OP_Eq; break; +++ case TK_ISNULL: op = OP_IsNull; break; +++ case TK_NOTNULL: op = OP_NotNull; break; +++ default: break; +++ } +++ switch( pExpr->op ){ +++ case TK_AND: { +++ int d2 = sqliteVdbeMakeLabel(v); +++ sqliteExprIfFalse(pParse, pExpr->pLeft, d2, !jumpIfNull); +++ sqliteExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull); +++ sqliteVdbeResolveLabel(v, d2); +++ break; +++ } +++ case TK_OR: { +++ sqliteExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull); +++ sqliteExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull); +++ break; +++ } +++ case TK_NOT: { +++ sqliteExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull); +++ break; +++ } +++ case TK_LT: +++ case TK_LE: +++ case TK_GT: +++ case TK_GE: +++ case TK_NE: +++ case TK_EQ: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteExprCode(pParse, pExpr->pRight); +++ if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){ +++ op += 6; /* Convert numeric opcodes to text opcodes */ +++ } +++ sqliteVdbeAddOp(v, op, jumpIfNull, dest); +++ break; +++ } +++ case TK_ISNULL: +++ case TK_NOTNULL: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, op, 1, dest); +++ break; +++ } +++ case TK_IN: { +++ int addr; +++ sqliteExprCode(pParse, pExpr->pLeft); +++ addr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, addr+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, jumpIfNull ? dest : addr+4); +++ if( pExpr->pSelect ){ +++ sqliteVdbeAddOp(v, OP_Found, pExpr->iTable, dest); +++ }else{ +++ sqliteVdbeAddOp(v, OP_SetFound, pExpr->iTable, dest); +++ } +++ break; +++ } +++ case TK_BETWEEN: { +++ int addr; +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ sqliteExprCode(pParse, pExpr->pList->a[0].pExpr); +++ addr = sqliteVdbeAddOp(v, OP_Lt, !jumpIfNull, 0); +++ sqliteExprCode(pParse, pExpr->pList->a[1].pExpr); +++ sqliteVdbeAddOp(v, OP_Le, jumpIfNull, dest); +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v)); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ break; +++ } +++ default: { +++ sqliteExprCode(pParse, pExpr); +++ sqliteVdbeAddOp(v, OP_If, jumpIfNull, dest); +++ break; +++ } +++ } +++} +++ +++/* +++** Generate code for a boolean expression such that a jump is made +++** to the label "dest" if the expression is false but execution +++** continues straight thru if the expression is true. +++** +++** If the expression evaluates to NULL (neither true nor false) then +++** jump if jumpIfNull is true or fall through if jumpIfNull is false. +++*/ +++void sqliteExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ +++ Vdbe *v = pParse->pVdbe; +++ int op = 0; +++ if( v==0 || pExpr==0 ) return; +++ switch( pExpr->op ){ +++ case TK_LT: op = OP_Ge; break; +++ case TK_LE: op = OP_Gt; break; +++ case TK_GT: op = OP_Le; break; +++ case TK_GE: op = OP_Lt; break; +++ case TK_NE: op = OP_Eq; break; +++ case TK_EQ: op = OP_Ne; break; +++ case TK_ISNULL: op = OP_NotNull; break; +++ case TK_NOTNULL: op = OP_IsNull; break; +++ default: break; +++ } +++ switch( pExpr->op ){ +++ case TK_AND: { +++ sqliteExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull); +++ sqliteExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull); +++ break; +++ } +++ case TK_OR: { +++ int d2 = sqliteVdbeMakeLabel(v); +++ sqliteExprIfTrue(pParse, pExpr->pLeft, d2, !jumpIfNull); +++ sqliteExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull); +++ sqliteVdbeResolveLabel(v, d2); +++ break; +++ } +++ case TK_NOT: { +++ sqliteExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull); +++ break; +++ } +++ case TK_LT: +++ case TK_LE: +++ case TK_GT: +++ case TK_GE: +++ case TK_NE: +++ case TK_EQ: { +++ if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){ +++ /* Convert numeric comparison opcodes into text comparison opcodes. +++ ** This step depends on the fact that the text comparision opcodes are +++ ** always 6 greater than their corresponding numeric comparison +++ ** opcodes. +++ */ +++ assert( OP_Eq+6 == OP_StrEq ); +++ op += 6; +++ } +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteExprCode(pParse, pExpr->pRight); +++ sqliteVdbeAddOp(v, op, jumpIfNull, dest); +++ break; +++ } +++ case TK_ISNULL: +++ case TK_NOTNULL: { +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, op, 1, dest); +++ break; +++ } +++ case TK_IN: { +++ int addr; +++ sqliteExprCode(pParse, pExpr->pLeft); +++ addr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, addr+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, jumpIfNull ? dest : addr+4); +++ if( pExpr->pSelect ){ +++ sqliteVdbeAddOp(v, OP_NotFound, pExpr->iTable, dest); +++ }else{ +++ sqliteVdbeAddOp(v, OP_SetNotFound, pExpr->iTable, dest); +++ } +++ break; +++ } +++ case TK_BETWEEN: { +++ int addr; +++ sqliteExprCode(pParse, pExpr->pLeft); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ sqliteExprCode(pParse, pExpr->pList->a[0].pExpr); +++ addr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeAddOp(v, OP_Ge, !jumpIfNull, addr+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, dest); +++ sqliteExprCode(pParse, pExpr->pList->a[1].pExpr); +++ sqliteVdbeAddOp(v, OP_Gt, jumpIfNull, dest); +++ break; +++ } +++ default: { +++ sqliteExprCode(pParse, pExpr); +++ sqliteVdbeAddOp(v, OP_IfNot, jumpIfNull, dest); +++ break; +++ } +++ } +++} +++ +++/* +++** Do a deep comparison of two expression trees. Return TRUE (non-zero) +++** if they are identical and return FALSE if they differ in any way. +++*/ +++int sqliteExprCompare(Expr *pA, Expr *pB){ +++ int i; +++ if( pA==0 ){ +++ return pB==0; +++ }else if( pB==0 ){ +++ return 0; +++ } +++ if( pA->op!=pB->op ) return 0; +++ if( !sqliteExprCompare(pA->pLeft, pB->pLeft) ) return 0; +++ if( !sqliteExprCompare(pA->pRight, pB->pRight) ) return 0; +++ if( pA->pList ){ +++ if( pB->pList==0 ) return 0; +++ if( pA->pList->nExpr!=pB->pList->nExpr ) return 0; +++ for(i=0; ipList->nExpr; i++){ +++ if( !sqliteExprCompare(pA->pList->a[i].pExpr, pB->pList->a[i].pExpr) ){ +++ return 0; +++ } +++ } +++ }else if( pB->pList ){ +++ return 0; +++ } +++ if( pA->pSelect || pB->pSelect ) return 0; +++ if( pA->iTable!=pB->iTable || pA->iColumn!=pB->iColumn ) return 0; +++ if( pA->token.z ){ +++ if( pB->token.z==0 ) return 0; +++ if( pB->token.n!=pA->token.n ) return 0; +++ if( sqliteStrNICmp(pA->token.z, pB->token.z, pB->token.n)!=0 ) return 0; +++ } +++ return 1; +++} +++ +++/* +++** Add a new element to the pParse->aAgg[] array and return its index. +++*/ +++static int appendAggInfo(Parse *pParse){ +++ if( (pParse->nAgg & 0x7)==0 ){ +++ int amt = pParse->nAgg + 8; +++ AggExpr *aAgg = sqliteRealloc(pParse->aAgg, amt*sizeof(pParse->aAgg[0])); +++ if( aAgg==0 ){ +++ return -1; +++ } +++ pParse->aAgg = aAgg; +++ } +++ memset(&pParse->aAgg[pParse->nAgg], 0, sizeof(pParse->aAgg[0])); +++ return pParse->nAgg++; +++} +++ +++/* +++** Analyze the given expression looking for aggregate functions and +++** for variables that need to be added to the pParse->aAgg[] array. +++** Make additional entries to the pParse->aAgg[] array as necessary. +++** +++** This routine should only be called after the expression has been +++** analyzed by sqliteExprResolveIds() and sqliteExprCheck(). +++** +++** If errors are seen, leave an error message in zErrMsg and return +++** the number of errors. +++*/ +++int sqliteExprAnalyzeAggregates(Parse *pParse, Expr *pExpr){ +++ int i; +++ AggExpr *aAgg; +++ int nErr = 0; +++ +++ if( pExpr==0 ) return 0; +++ switch( pExpr->op ){ +++ case TK_COLUMN: { +++ aAgg = pParse->aAgg; +++ for(i=0; inAgg; i++){ +++ if( aAgg[i].isAgg ) continue; +++ if( aAgg[i].pExpr->iTable==pExpr->iTable +++ && aAgg[i].pExpr->iColumn==pExpr->iColumn ){ +++ break; +++ } +++ } +++ if( i>=pParse->nAgg ){ +++ i = appendAggInfo(pParse); +++ if( i<0 ) return 1; +++ pParse->aAgg[i].isAgg = 0; +++ pParse->aAgg[i].pExpr = pExpr; +++ } +++ pExpr->iAgg = i; +++ break; +++ } +++ case TK_AGG_FUNCTION: { +++ aAgg = pParse->aAgg; +++ for(i=0; inAgg; i++){ +++ if( !aAgg[i].isAgg ) continue; +++ if( sqliteExprCompare(aAgg[i].pExpr, pExpr) ){ +++ break; +++ } +++ } +++ if( i>=pParse->nAgg ){ +++ i = appendAggInfo(pParse); +++ if( i<0 ) return 1; +++ pParse->aAgg[i].isAgg = 1; +++ pParse->aAgg[i].pExpr = pExpr; +++ pParse->aAgg[i].pFunc = sqliteFindFunction(pParse->db, +++ pExpr->token.z, pExpr->token.n, +++ pExpr->pList ? pExpr->pList->nExpr : 0, 0); +++ } +++ pExpr->iAgg = i; +++ break; +++ } +++ default: { +++ if( pExpr->pLeft ){ +++ nErr = sqliteExprAnalyzeAggregates(pParse, pExpr->pLeft); +++ } +++ if( nErr==0 && pExpr->pRight ){ +++ nErr = sqliteExprAnalyzeAggregates(pParse, pExpr->pRight); +++ } +++ if( nErr==0 && pExpr->pList ){ +++ int n = pExpr->pList->nExpr; +++ int i; +++ for(i=0; nErr==0 && ipList->a[i].pExpr); +++ } +++ } +++ break; +++ } +++ } +++ return nErr; +++} +++ +++/* +++** Locate a user function given a name and a number of arguments. +++** Return a pointer to the FuncDef structure that defines that +++** function, or return NULL if the function does not exist. +++** +++** If the createFlag argument is true, then a new (blank) FuncDef +++** structure is created and liked into the "db" structure if a +++** no matching function previously existed. When createFlag is true +++** and the nArg parameter is -1, then only a function that accepts +++** any number of arguments will be returned. +++** +++** If createFlag is false and nArg is -1, then the first valid +++** function found is returned. A function is valid if either xFunc +++** or xStep is non-zero. +++*/ +++FuncDef *sqliteFindFunction( +++ sqlite *db, /* An open database */ +++ const char *zName, /* Name of the function. Not null-terminated */ +++ int nName, /* Number of characters in the name */ +++ int nArg, /* Number of arguments. -1 means any number */ +++ int createFlag /* Create new entry if true and does not otherwise exist */ +++){ +++ FuncDef *pFirst, *p, *pMaybe; +++ pFirst = p = (FuncDef*)sqliteHashFind(&db->aFunc, zName, nName); +++ if( p && !createFlag && nArg<0 ){ +++ while( p && p->xFunc==0 && p->xStep==0 ){ p = p->pNext; } +++ return p; +++ } +++ pMaybe = 0; +++ while( p && p->nArg!=nArg ){ +++ if( p->nArg<0 && !createFlag && (p->xFunc || p->xStep) ) pMaybe = p; +++ p = p->pNext; +++ } +++ if( p && !createFlag && p->xFunc==0 && p->xStep==0 ){ +++ return 0; +++ } +++ if( p==0 && pMaybe ){ +++ assert( createFlag==0 ); +++ return pMaybe; +++ } +++ if( p==0 && createFlag && (p = sqliteMalloc(sizeof(*p)))!=0 ){ +++ p->nArg = nArg; +++ p->pNext = pFirst; +++ p->dataType = pFirst ? pFirst->dataType : SQLITE_NUMERIC; +++ sqliteHashInsert(&db->aFunc, zName, nName, (void*)p); +++ } +++ return p; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/func.c ++@@ -0,0 +1,658 @@ +++/* +++** 2002 February 23 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains the C functions that implement various SQL +++** functions of SQLite. +++** +++** There is only one exported symbol in this file - the function +++** sqliteRegisterBuildinFunctions() found at the bottom of the file. +++** All other code has file scope. +++** +++** $Id$ +++*/ +++#include +++#include +++#include +++#include +++#include "sqliteInt.h" +++#include "os.h" +++ +++/* +++** Implementation of the non-aggregate min() and max() functions +++*/ +++static void minmaxFunc(sqlite_func *context, int argc, const char **argv){ +++ const char *zBest; +++ int i; +++ int (*xCompare)(const char*, const char*); +++ int mask; /* 0 for min() or 0xffffffff for max() */ +++ +++ if( argc==0 ) return; +++ mask = (int)sqlite_user_data(context); +++ zBest = argv[0]; +++ if( zBest==0 ) return; +++ if( argv[1][0]=='n' ){ +++ xCompare = sqliteCompare; +++ }else{ +++ xCompare = strcmp; +++ } +++ for(i=2; i0 ){ +++ p1--; +++ } +++ if( p1+p2>len ){ +++ p2 = len-p1; +++ } +++#ifdef SQLITE_UTF8 +++ for(i=0; i30 ) n = 30; +++ if( n<0 ) n = 0; +++ r = sqliteAtoF(argv[0], 0); +++ sprintf(zBuf,"%.*f",n,r); +++ sqlite_set_result_string(context, zBuf, -1); +++} +++ +++/* +++** Implementation of the upper() and lower() SQL functions. +++*/ +++static void upperFunc(sqlite_func *context, int argc, const char **argv){ +++ unsigned char *z; +++ int i; +++ if( argc<1 || argv[0]==0 ) return; +++ z = (unsigned char*)sqlite_set_result_string(context, argv[0], -1); +++ if( z==0 ) return; +++ for(i=0; z[i]; i++){ +++ if( islower(z[i]) ) z[i] = toupper(z[i]); +++ } +++} +++static void lowerFunc(sqlite_func *context, int argc, const char **argv){ +++ unsigned char *z; +++ int i; +++ if( argc<1 || argv[0]==0 ) return; +++ z = (unsigned char*)sqlite_set_result_string(context, argv[0], -1); +++ if( z==0 ) return; +++ for(i=0; z[i]; i++){ +++ if( isupper(z[i]) ) z[i] = tolower(z[i]); +++ } +++} +++ +++/* +++** Implementation of the IFNULL(), NVL(), and COALESCE() functions. +++** All three do the same thing. They return the first non-NULL +++** argument. +++*/ +++static void ifnullFunc(sqlite_func *context, int argc, const char **argv){ +++ int i; +++ for(i=0; i0 ){ +++ zResult[j++] = code + '0'; +++ } +++ } +++ while( j<4 ){ +++ zResult[j++] = '0'; +++ } +++ zResult[j] = 0; +++ sqlite_set_result_string(context, zResult, 4); +++ }else{ +++ sqlite_set_result_string(context, "?000", 4); +++ } +++} +++#endif +++ +++#ifdef SQLITE_TEST +++/* +++** This function generates a string of random characters. Used for +++** generating test data. +++*/ +++static void randStr(sqlite_func *context, int argc, const char **argv){ +++ static const unsigned char zSrc[] = +++ "abcdefghijklmnopqrstuvwxyz" +++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +++ "0123456789" +++ ".-!,:*^+=_|?/<> "; +++ int iMin, iMax, n, r, i; +++ unsigned char zBuf[1000]; +++ if( argc>=1 ){ +++ iMin = atoi(argv[0]); +++ if( iMin<0 ) iMin = 0; +++ if( iMin>=sizeof(zBuf) ) iMin = sizeof(zBuf)-1; +++ }else{ +++ iMin = 1; +++ } +++ if( argc>=2 ){ +++ iMax = atoi(argv[1]); +++ if( iMax=sizeof(zBuf) ) iMax = sizeof(zBuf)-1; +++ }else{ +++ iMax = 50; +++ } +++ n = iMin; +++ if( iMax>iMin ){ +++ sqliteRandomness(sizeof(r), &r); +++ r &= 0x7fffffff; +++ n += r%(iMax + 1 - iMin); +++ } +++ assert( nsum += sqliteAtoF(argv[0], 0); +++ p->cnt++; +++ } +++} +++static void sumFinalize(sqlite_func *context){ +++ SumCtx *p; +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ sqlite_set_result_double(context, p ? p->sum : 0.0); +++} +++static void avgFinalize(sqlite_func *context){ +++ SumCtx *p; +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ if( p && p->cnt>0 ){ +++ sqlite_set_result_double(context, p->sum/(double)p->cnt); +++ } +++} +++ +++/* +++** An instance of the following structure holds the context of a +++** variance or standard deviation computation. +++*/ +++typedef struct StdDevCtx StdDevCtx; +++struct StdDevCtx { +++ double sum; /* Sum of terms */ +++ double sum2; /* Sum of the squares of terms */ +++ int cnt; /* Number of terms counted */ +++}; +++ +++#if 0 /* Omit because math library is required */ +++/* +++** Routines used to compute the standard deviation as an aggregate. +++*/ +++static void stdDevStep(sqlite_func *context, int argc, const char **argv){ +++ StdDevCtx *p; +++ double x; +++ if( argc<1 ) return; +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ if( p && argv[0] ){ +++ x = sqliteAtoF(argv[0], 0); +++ p->sum += x; +++ p->sum2 += x*x; +++ p->cnt++; +++ } +++} +++static void stdDevFinalize(sqlite_func *context){ +++ double rN = sqlite_aggregate_count(context); +++ StdDevCtx *p = sqlite_aggregate_context(context, sizeof(*p)); +++ if( p && p->cnt>1 ){ +++ double rCnt = cnt; +++ sqlite_set_result_double(context, +++ sqrt((p->sum2 - p->sum*p->sum/rCnt)/(rCnt-1.0))); +++ } +++} +++#endif +++ +++/* +++** The following structure keeps track of state information for the +++** count() aggregate function. +++*/ +++typedef struct CountCtx CountCtx; +++struct CountCtx { +++ int n; +++}; +++ +++/* +++** Routines to implement the count() aggregate function. +++*/ +++static void countStep(sqlite_func *context, int argc, const char **argv){ +++ CountCtx *p; +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ if( (argc==0 || argv[0]) && p ){ +++ p->n++; +++ } +++} +++static void countFinalize(sqlite_func *context){ +++ CountCtx *p; +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ sqlite_set_result_int(context, p ? p->n : 0); +++} +++ +++/* +++** This function tracks state information for the min() and max() +++** aggregate functions. +++*/ +++typedef struct MinMaxCtx MinMaxCtx; +++struct MinMaxCtx { +++ char *z; /* The best so far */ +++ char zBuf[28]; /* Space that can be used for storage */ +++}; +++ +++/* +++** Routines to implement min() and max() aggregate functions. +++*/ +++static void minmaxStep(sqlite_func *context, int argc, const char **argv){ +++ MinMaxCtx *p; +++ int (*xCompare)(const char*, const char*); +++ int mask; /* 0 for min() or 0xffffffff for max() */ +++ +++ assert( argc==2 ); +++ if( argv[0]==0 ) return; /* Ignore NULL values */ +++ if( argv[1][0]=='n' ){ +++ xCompare = sqliteCompare; +++ }else{ +++ xCompare = strcmp; +++ } +++ mask = (int)sqlite_user_data(context); +++ assert( mask==0 || mask==-1 ); +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ if( p==0 || argc<1 ) return; +++ if( p->z==0 || (xCompare(argv[0],p->z)^mask)<0 ){ +++ int len; +++ if( p->zBuf[0] ){ +++ sqliteFree(p->z); +++ } +++ len = strlen(argv[0]); +++ if( len < sizeof(p->zBuf)-1 ){ +++ p->z = &p->zBuf[1]; +++ p->zBuf[0] = 0; +++ }else{ +++ p->z = sqliteMalloc( len+1 ); +++ p->zBuf[0] = 1; +++ if( p->z==0 ) return; +++ } +++ strcpy(p->z, argv[0]); +++ } +++} +++static void minMaxFinalize(sqlite_func *context){ +++ MinMaxCtx *p; +++ p = sqlite_aggregate_context(context, sizeof(*p)); +++ if( p && p->z && p->zBuf[0]<2 ){ +++ sqlite_set_result_string(context, p->z, strlen(p->z)); +++ } +++ if( p && p->zBuf[0] ){ +++ sqliteFree(p->z); +++ } +++} +++ +++/* +++** This function registered all of the above C functions as SQL +++** functions. This should be the only routine in this file with +++** external linkage. +++*/ +++void sqliteRegisterBuiltinFunctions(sqlite *db){ +++ static struct { +++ char *zName; +++ signed char nArg; +++ signed char dataType; +++ u8 argType; /* 0: none. 1: db 2: (-1) */ +++ void (*xFunc)(sqlite_func*,int,const char**); +++ } aFuncs[] = { +++ { "min", -1, SQLITE_ARGS, 0, minmaxFunc }, +++ { "min", 0, 0, 0, 0 }, +++ { "max", -1, SQLITE_ARGS, 2, minmaxFunc }, +++ { "max", 0, 0, 2, 0 }, +++ { "typeof", 1, SQLITE_TEXT, 0, typeofFunc }, +++ { "length", 1, SQLITE_NUMERIC, 0, lengthFunc }, +++ { "substr", 3, SQLITE_TEXT, 0, substrFunc }, +++ { "abs", 1, SQLITE_NUMERIC, 0, absFunc }, +++ { "round", 1, SQLITE_NUMERIC, 0, roundFunc }, +++ { "round", 2, SQLITE_NUMERIC, 0, roundFunc }, +++ { "upper", 1, SQLITE_TEXT, 0, upperFunc }, +++ { "lower", 1, SQLITE_TEXT, 0, lowerFunc }, +++ { "coalesce", -1, SQLITE_ARGS, 0, ifnullFunc }, +++ { "coalesce", 0, 0, 0, 0 }, +++ { "coalesce", 1, 0, 0, 0 }, +++ { "ifnull", 2, SQLITE_ARGS, 0, ifnullFunc }, +++ { "random", -1, SQLITE_NUMERIC, 0, randomFunc }, +++ { "like", 2, SQLITE_NUMERIC, 0, likeFunc }, +++ { "glob", 2, SQLITE_NUMERIC, 0, globFunc }, +++ { "nullif", 2, SQLITE_ARGS, 0, nullifFunc }, +++ { "sqlite_version",0,SQLITE_TEXT, 0, versionFunc}, +++ { "quote", 1, SQLITE_ARGS, 0, quoteFunc }, +++ { "last_insert_rowid", 0, SQLITE_NUMERIC, 1, last_insert_rowid }, +++ { "change_count", 0, SQLITE_NUMERIC, 1, change_count }, +++ { "last_statement_change_count", +++ 0, SQLITE_NUMERIC, 1, last_statement_change_count }, +++#ifdef SQLITE_SOUNDEX +++ { "soundex", 1, SQLITE_TEXT, 0, soundexFunc}, +++#endif +++#ifdef SQLITE_TEST +++ { "randstr", 2, SQLITE_TEXT, 0, randStr }, +++#endif +++ }; +++ static struct { +++ char *zName; +++ signed char nArg; +++ signed char dataType; +++ u8 argType; +++ void (*xStep)(sqlite_func*,int,const char**); +++ void (*xFinalize)(sqlite_func*); +++ } aAggs[] = { +++ { "min", 1, 0, 0, minmaxStep, minMaxFinalize }, +++ { "max", 1, 0, 2, minmaxStep, minMaxFinalize }, +++ { "sum", 1, SQLITE_NUMERIC, 0, sumStep, sumFinalize }, +++ { "avg", 1, SQLITE_NUMERIC, 0, sumStep, avgFinalize }, +++ { "count", 0, SQLITE_NUMERIC, 0, countStep, countFinalize }, +++ { "count", 1, SQLITE_NUMERIC, 0, countStep, countFinalize }, +++#if 0 +++ { "stddev", 1, SQLITE_NUMERIC, 0, stdDevStep, stdDevFinalize }, +++#endif +++ }; +++ static const char *azTypeFuncs[] = { "min", "max", "typeof" }; +++ int i; +++ +++ for(i=0; iaFunc, azTypeFuncs[i], n); +++ while( p ){ +++ p->includeTypes = 1; +++ p = p->pNext; +++ } +++ } +++ sqliteRegisterDateTimeFunctions(db); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/hash.c ++@@ -0,0 +1,356 @@ +++/* +++** 2001 September 22 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This is the implementation of generic hash-tables +++** used in SQLite. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include +++ +++/* Turn bulk memory into a hash table object by initializing the +++** fields of the Hash structure. +++** +++** "new" is a pointer to the hash table that is to be initialized. +++** keyClass is one of the constants SQLITE_HASH_INT, SQLITE_HASH_POINTER, +++** SQLITE_HASH_BINARY, or SQLITE_HASH_STRING. The value of keyClass +++** determines what kind of key the hash table will use. "copyKey" is +++** true if the hash table should make its own private copy of keys and +++** false if it should just use the supplied pointer. CopyKey only makes +++** sense for SQLITE_HASH_STRING and SQLITE_HASH_BINARY and is ignored +++** for other key classes. +++*/ +++void sqliteHashInit(Hash *new, int keyClass, int copyKey){ +++ assert( new!=0 ); +++ assert( keyClass>=SQLITE_HASH_INT && keyClass<=SQLITE_HASH_BINARY ); +++ new->keyClass = keyClass; +++ new->copyKey = copyKey && +++ (keyClass==SQLITE_HASH_STRING || keyClass==SQLITE_HASH_BINARY); +++ new->first = 0; +++ new->count = 0; +++ new->htsize = 0; +++ new->ht = 0; +++} +++ +++/* Remove all entries from a hash table. Reclaim all memory. +++** Call this routine to delete a hash table or to reset a hash table +++** to the empty state. +++*/ +++void sqliteHashClear(Hash *pH){ +++ HashElem *elem; /* For looping over all elements of the table */ +++ +++ assert( pH!=0 ); +++ elem = pH->first; +++ pH->first = 0; +++ if( pH->ht ) sqliteFree(pH->ht); +++ pH->ht = 0; +++ pH->htsize = 0; +++ while( elem ){ +++ HashElem *next_elem = elem->next; +++ if( pH->copyKey && elem->pKey ){ +++ sqliteFree(elem->pKey); +++ } +++ sqliteFree(elem); +++ elem = next_elem; +++ } +++ pH->count = 0; +++} +++ +++/* +++** Hash and comparison functions when the mode is SQLITE_HASH_INT +++*/ +++static int intHash(const void *pKey, int nKey){ +++ return nKey ^ (nKey<<8) ^ (nKey>>8); +++} +++static int intCompare(const void *pKey1, int n1, const void *pKey2, int n2){ +++ return n2 - n1; +++} +++ +++#if 0 /* NOT USED */ +++/* +++** Hash and comparison functions when the mode is SQLITE_HASH_POINTER +++*/ +++static int ptrHash(const void *pKey, int nKey){ +++ uptr x = Addr(pKey); +++ return x ^ (x<<8) ^ (x>>8); +++} +++static int ptrCompare(const void *pKey1, int n1, const void *pKey2, int n2){ +++ if( pKey1==pKey2 ) return 0; +++ if( pKey1 0 ){ +++ h = (h<<3) ^ h ^ *(z++); +++ } +++ return h & 0x7fffffff; +++} +++static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){ +++ if( n1!=n2 ) return n2-n1; +++ return memcmp(pKey1,pKey2,n1); +++} +++ +++/* +++** Return a pointer to the appropriate hash function given the key class. +++** +++** The C syntax in this function definition may be unfamilar to some +++** programmers, so we provide the following additional explanation: +++** +++** The name of the function is "hashFunction". The function takes a +++** single parameter "keyClass". The return value of hashFunction() +++** is a pointer to another function. Specifically, the return value +++** of hashFunction() is a pointer to a function that takes two parameters +++** with types "const void*" and "int" and returns an "int". +++*/ +++static int (*hashFunction(int keyClass))(const void*,int){ +++ switch( keyClass ){ +++ case SQLITE_HASH_INT: return &intHash; +++ /* case SQLITE_HASH_POINTER: return &ptrHash; // NOT USED */ +++ case SQLITE_HASH_STRING: return &strHash; +++ case SQLITE_HASH_BINARY: return &binHash;; +++ default: break; +++ } +++ return 0; +++} +++ +++/* +++** Return a pointer to the appropriate hash function given the key class. +++** +++** For help in interpreted the obscure C code in the function definition, +++** see the header comment on the previous function. +++*/ +++static int (*compareFunction(int keyClass))(const void*,int,const void*,int){ +++ switch( keyClass ){ +++ case SQLITE_HASH_INT: return &intCompare; +++ /* case SQLITE_HASH_POINTER: return &ptrCompare; // NOT USED */ +++ case SQLITE_HASH_STRING: return &strCompare; +++ case SQLITE_HASH_BINARY: return &binCompare; +++ default: break; +++ } +++ return 0; +++} +++ +++ +++/* Resize the hash table so that it cantains "new_size" buckets. +++** "new_size" must be a power of 2. The hash table might fail +++** to resize if sqliteMalloc() fails. +++*/ +++static void rehash(Hash *pH, int new_size){ +++ struct _ht *new_ht; /* The new hash table */ +++ HashElem *elem, *next_elem; /* For looping over existing elements */ +++ HashElem *x; /* Element being copied to new hash table */ +++ int (*xHash)(const void*,int); /* The hash function */ +++ +++ assert( (new_size & (new_size-1))==0 ); +++ new_ht = (struct _ht *)sqliteMalloc( new_size*sizeof(struct _ht) ); +++ if( new_ht==0 ) return; +++ if( pH->ht ) sqliteFree(pH->ht); +++ pH->ht = new_ht; +++ pH->htsize = new_size; +++ xHash = hashFunction(pH->keyClass); +++ for(elem=pH->first, pH->first=0; elem; elem = next_elem){ +++ int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1); +++ next_elem = elem->next; +++ x = new_ht[h].chain; +++ if( x ){ +++ elem->next = x; +++ elem->prev = x->prev; +++ if( x->prev ) x->prev->next = elem; +++ else pH->first = elem; +++ x->prev = elem; +++ }else{ +++ elem->next = pH->first; +++ if( pH->first ) pH->first->prev = elem; +++ elem->prev = 0; +++ pH->first = elem; +++ } +++ new_ht[h].chain = elem; +++ new_ht[h].count++; +++ } +++} +++ +++/* This function (for internal use only) locates an element in an +++** hash table that matches the given key. The hash for this key has +++** already been computed and is passed as the 4th parameter. +++*/ +++static HashElem *findElementGivenHash( +++ const Hash *pH, /* The pH to be searched */ +++ const void *pKey, /* The key we are searching for */ +++ int nKey, +++ int h /* The hash for this key. */ +++){ +++ HashElem *elem; /* Used to loop thru the element list */ +++ int count; /* Number of elements left to test */ +++ int (*xCompare)(const void*,int,const void*,int); /* comparison function */ +++ +++ if( pH->ht ){ +++ elem = pH->ht[h].chain; +++ count = pH->ht[h].count; +++ xCompare = compareFunction(pH->keyClass); +++ while( count-- && elem ){ +++ if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){ +++ return elem; +++ } +++ elem = elem->next; +++ } +++ } +++ return 0; +++} +++ +++/* Remove a single entry from the hash table given a pointer to that +++** element and a hash on the element's key. +++*/ +++static void removeElementGivenHash( +++ Hash *pH, /* The pH containing "elem" */ +++ HashElem* elem, /* The element to be removed from the pH */ +++ int h /* Hash value for the element */ +++){ +++ if( elem->prev ){ +++ elem->prev->next = elem->next; +++ }else{ +++ pH->first = elem->next; +++ } +++ if( elem->next ){ +++ elem->next->prev = elem->prev; +++ } +++ if( pH->ht[h].chain==elem ){ +++ pH->ht[h].chain = elem->next; +++ } +++ pH->ht[h].count--; +++ if( pH->ht[h].count<=0 ){ +++ pH->ht[h].chain = 0; +++ } +++ if( pH->copyKey && elem->pKey ){ +++ sqliteFree(elem->pKey); +++ } +++ sqliteFree( elem ); +++ pH->count--; +++} +++ +++/* Attempt to locate an element of the hash table pH with a key +++** that matches pKey,nKey. Return the data for this element if it is +++** found, or NULL if there is no match. +++*/ +++void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){ +++ int h; /* A hash on key */ +++ HashElem *elem; /* The element that matches key */ +++ int (*xHash)(const void*,int); /* The hash function */ +++ +++ if( pH==0 || pH->ht==0 ) return 0; +++ xHash = hashFunction(pH->keyClass); +++ assert( xHash!=0 ); +++ h = (*xHash)(pKey,nKey); +++ assert( (pH->htsize & (pH->htsize-1))==0 ); +++ elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1)); +++ return elem ? elem->data : 0; +++} +++ +++/* Insert an element into the hash table pH. The key is pKey,nKey +++** and the data is "data". +++** +++** If no element exists with a matching key, then a new +++** element is created. A copy of the key is made if the copyKey +++** flag is set. NULL is returned. +++** +++** If another element already exists with the same key, then the +++** new data replaces the old data and the old data is returned. +++** The key is not copied in this instance. If a malloc fails, then +++** the new data is returned and the hash table is unchanged. +++** +++** If the "data" parameter to this function is NULL, then the +++** element corresponding to "key" is removed from the hash table. +++*/ +++void *sqliteHashInsert(Hash *pH, const void *pKey, int nKey, void *data){ +++ int hraw; /* Raw hash value of the key */ +++ int h; /* the hash of the key modulo hash table size */ +++ HashElem *elem; /* Used to loop thru the element list */ +++ HashElem *new_elem; /* New element added to the pH */ +++ int (*xHash)(const void*,int); /* The hash function */ +++ +++ assert( pH!=0 ); +++ xHash = hashFunction(pH->keyClass); +++ assert( xHash!=0 ); +++ hraw = (*xHash)(pKey, nKey); +++ assert( (pH->htsize & (pH->htsize-1))==0 ); +++ h = hraw & (pH->htsize-1); +++ elem = findElementGivenHash(pH,pKey,nKey,h); +++ if( elem ){ +++ void *old_data = elem->data; +++ if( data==0 ){ +++ removeElementGivenHash(pH,elem,h); +++ }else{ +++ elem->data = data; +++ } +++ return old_data; +++ } +++ if( data==0 ) return 0; +++ new_elem = (HashElem*)sqliteMalloc( sizeof(HashElem) ); +++ if( new_elem==0 ) return data; +++ if( pH->copyKey && pKey!=0 ){ +++ new_elem->pKey = sqliteMallocRaw( nKey ); +++ if( new_elem->pKey==0 ){ +++ sqliteFree(new_elem); +++ return data; +++ } +++ memcpy((void*)new_elem->pKey, pKey, nKey); +++ }else{ +++ new_elem->pKey = (void*)pKey; +++ } +++ new_elem->nKey = nKey; +++ pH->count++; +++ if( pH->htsize==0 ) rehash(pH,8); +++ if( pH->htsize==0 ){ +++ pH->count = 0; +++ sqliteFree(new_elem); +++ return data; +++ } +++ if( pH->count > pH->htsize ){ +++ rehash(pH,pH->htsize*2); +++ } +++ assert( (pH->htsize & (pH->htsize-1))==0 ); +++ h = hraw & (pH->htsize-1); +++ elem = pH->ht[h].chain; +++ if( elem ){ +++ new_elem->next = elem; +++ new_elem->prev = elem->prev; +++ if( elem->prev ){ elem->prev->next = new_elem; } +++ else { pH->first = new_elem; } +++ elem->prev = new_elem; +++ }else{ +++ new_elem->next = pH->first; +++ new_elem->prev = 0; +++ if( pH->first ){ pH->first->prev = new_elem; } +++ pH->first = new_elem; +++ } +++ pH->ht[h].count++; +++ pH->ht[h].chain = new_elem; +++ new_elem->data = data; +++ return 0; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/hash.h ++@@ -0,0 +1,109 @@ +++/* +++** 2001 September 22 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This is the header file for the generic hash-table implemenation +++** used in SQLite. +++** +++** $Id$ +++*/ +++#ifndef _SQLITE_HASH_H_ +++#define _SQLITE_HASH_H_ +++ +++/* Forward declarations of structures. */ +++typedef struct Hash Hash; +++typedef struct HashElem HashElem; +++ +++/* A complete hash table is an instance of the following structure. +++** The internals of this structure are intended to be opaque -- client +++** code should not attempt to access or modify the fields of this structure +++** directly. Change this structure only by using the routines below. +++** However, many of the "procedures" and "functions" for modifying and +++** accessing this structure are really macros, so we can't really make +++** this structure opaque. +++*/ +++struct Hash { +++ char keyClass; /* SQLITE_HASH_INT, _POINTER, _STRING, _BINARY */ +++ char copyKey; /* True if copy of key made on insert */ +++ int count; /* Number of entries in this table */ +++ HashElem *first; /* The first element of the array */ +++ int htsize; /* Number of buckets in the hash table */ +++ struct _ht { /* the hash table */ +++ int count; /* Number of entries with this hash */ +++ HashElem *chain; /* Pointer to first entry with this hash */ +++ } *ht; +++}; +++ +++/* Each element in the hash table is an instance of the following +++** structure. All elements are stored on a single doubly-linked list. +++** +++** Again, this structure is intended to be opaque, but it can't really +++** be opaque because it is used by macros. +++*/ +++struct HashElem { +++ HashElem *next, *prev; /* Next and previous elements in the table */ +++ void *data; /* Data associated with this element */ +++ void *pKey; int nKey; /* Key associated with this element */ +++}; +++ +++/* +++** There are 4 different modes of operation for a hash table: +++** +++** SQLITE_HASH_INT nKey is used as the key and pKey is ignored. +++** +++** SQLITE_HASH_POINTER pKey is used as the key and nKey is ignored. +++** +++** SQLITE_HASH_STRING pKey points to a string that is nKey bytes long +++** (including the null-terminator, if any). Case +++** is ignored in comparisons. +++** +++** SQLITE_HASH_BINARY pKey points to binary data nKey bytes long. +++** memcmp() is used to compare keys. +++** +++** A copy of the key is made for SQLITE_HASH_STRING and SQLITE_HASH_BINARY +++** if the copyKey parameter to HashInit is 1. +++*/ +++#define SQLITE_HASH_INT 1 +++/* #define SQLITE_HASH_POINTER 2 // NOT USED */ +++#define SQLITE_HASH_STRING 3 +++#define SQLITE_HASH_BINARY 4 +++ +++/* +++** Access routines. To delete, insert a NULL pointer. +++*/ +++void sqliteHashInit(Hash*, int keytype, int copyKey); +++void *sqliteHashInsert(Hash*, const void *pKey, int nKey, void *pData); +++void *sqliteHashFind(const Hash*, const void *pKey, int nKey); +++void sqliteHashClear(Hash*); +++ +++/* +++** Macros for looping over all elements of a hash table. The idiom is +++** like this: +++** +++** Hash h; +++** HashElem *p; +++** ... +++** for(p=sqliteHashFirst(&h); p; p=sqliteHashNext(p)){ +++** SomeStructure *pData = sqliteHashData(p); +++** // do something with pData +++** } +++*/ +++#define sqliteHashFirst(H) ((H)->first) +++#define sqliteHashNext(E) ((E)->next) +++#define sqliteHashData(E) ((E)->data) +++#define sqliteHashKey(E) ((E)->pKey) +++#define sqliteHashKeysize(E) ((E)->nKey) +++ +++/* +++** Number of entries in a hash table +++*/ +++#define sqliteHashCount(H) ((H)->count) +++ +++#endif /* _SQLITE_HASH_H_ */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/insert.c ++@@ -0,0 +1,919 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains C code routines that are called by the parser +++** to handle INSERT statements in SQLite. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++ +++/* +++** This routine is call to handle SQL of the following forms: +++** +++** insert into TABLE (IDLIST) values(EXPRLIST) +++** insert into TABLE (IDLIST) select +++** +++** The IDLIST following the table name is always optional. If omitted, +++** then a list of all columns for the table is substituted. The IDLIST +++** appears in the pColumn parameter. pColumn is NULL if IDLIST is omitted. +++** +++** The pList parameter holds EXPRLIST in the first form of the INSERT +++** statement above, and pSelect is NULL. For the second form, pList is +++** NULL and pSelect is a pointer to the select statement used to generate +++** data for the insert. +++** +++** The code generated follows one of three templates. For a simple +++** select with data coming from a VALUES clause, the code executes +++** once straight down through. The template looks like this: +++** +++** open write cursor to and its indices +++** puts VALUES clause expressions onto the stack +++** write the resulting record into
+++** cleanup +++** +++** If the statement is of the form +++** +++** INSERT INTO
SELECT ... +++** +++** And the SELECT clause does not read from
at any time, then +++** the generated code follows this template: +++** +++** goto B +++** A: setup for the SELECT +++** loop over the tables in the SELECT +++** gosub C +++** end loop +++** cleanup after the SELECT +++** goto D +++** B: open write cursor to
and its indices +++** goto A +++** C: insert the select result into
+++** return +++** D: cleanup +++** +++** The third template is used if the insert statement takes its +++** values from a SELECT but the data is being inserted into a table +++** that is also read as part of the SELECT. In the third form, +++** we have to use a intermediate table to store the results of +++** the select. The template is like this: +++** +++** goto B +++** A: setup for the SELECT +++** loop over the tables in the SELECT +++** gosub C +++** end loop +++** cleanup after the SELECT +++** goto D +++** C: insert the select result into the intermediate table +++** return +++** B: open a cursor to an intermediate table +++** goto A +++** D: open write cursor to
and its indices +++** loop over the intermediate table +++** transfer values form intermediate table into
+++** end the loop +++** cleanup +++*/ +++void sqliteInsert( +++ Parse *pParse, /* Parser context */ +++ SrcList *pTabList, /* Name of table into which we are inserting */ +++ ExprList *pList, /* List of values to be inserted */ +++ Select *pSelect, /* A SELECT statement to use as the data source */ +++ IdList *pColumn, /* Column names corresponding to IDLIST. */ +++ int onError /* How to handle constraint errors */ +++){ +++ Table *pTab; /* The table to insert into */ +++ char *zTab; /* Name of the table into which we are inserting */ +++ const char *zDb; /* Name of the database holding this table */ +++ int i, j, idx; /* Loop counters */ +++ Vdbe *v; /* Generate code into this virtual machine */ +++ Index *pIdx; /* For looping over indices of the table */ +++ int nColumn; /* Number of columns in the data */ +++ int base; /* VDBE Cursor number for pTab */ +++ int iCont, iBreak; /* Beginning and end of the loop over srcTab */ +++ sqlite *db; /* The main database structure */ +++ int keyColumn = -1; /* Column that is the INTEGER PRIMARY KEY */ +++ int endOfLoop; /* Label for the end of the insertion loop */ +++ int useTempTable; /* Store SELECT results in intermediate table */ +++ int srcTab; /* Data comes from this temporary cursor if >=0 */ +++ int iSelectLoop; /* Address of code that implements the SELECT */ +++ int iCleanup; /* Address of the cleanup code */ +++ int iInsertBlock; /* Address of the subroutine used to insert data */ +++ int iCntMem; /* Memory cell used for the row counter */ +++ int isView; /* True if attempting to insert into a view */ +++ +++ int row_triggers_exist = 0; /* True if there are FOR EACH ROW triggers */ +++ int before_triggers; /* True if there are BEFORE triggers */ +++ int after_triggers; /* True if there are AFTER triggers */ +++ int newIdx = -1; /* Cursor for the NEW table */ +++ +++ if( pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup; +++ db = pParse->db; +++ +++ /* Locate the table into which we will be inserting new information. +++ */ +++ assert( pTabList->nSrc==1 ); +++ zTab = pTabList->a[0].zName; +++ if( zTab==0 ) goto insert_cleanup; +++ pTab = sqliteSrcListLookup(pParse, pTabList); +++ if( pTab==0 ){ +++ goto insert_cleanup; +++ } +++ assert( pTab->iDbnDb ); +++ zDb = db->aDb[pTab->iDb].zName; +++ if( sqliteAuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) ){ +++ goto insert_cleanup; +++ } +++ +++ /* Ensure that: +++ * (a) the table is not read-only, +++ * (b) that if it is a view then ON INSERT triggers exist +++ */ +++ before_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, +++ TK_BEFORE, TK_ROW, 0); +++ after_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, +++ TK_AFTER, TK_ROW, 0); +++ row_triggers_exist = before_triggers || after_triggers; +++ isView = pTab->pSelect!=0; +++ if( sqliteIsReadOnly(pParse, pTab, before_triggers) ){ +++ goto insert_cleanup; +++ } +++ if( pTab==0 ) goto insert_cleanup; +++ +++ /* If pTab is really a view, make sure it has been initialized. +++ */ +++ if( isView && sqliteViewGetColumnNames(pParse, pTab) ){ +++ goto insert_cleanup; +++ } +++ +++ /* Allocate a VDBE +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) goto insert_cleanup; +++ sqliteBeginWriteOperation(pParse, pSelect || row_triggers_exist, pTab->iDb); +++ +++ /* if there are row triggers, allocate a temp table for new.* references. */ +++ if( row_triggers_exist ){ +++ newIdx = pParse->nTab++; +++ } +++ +++ /* Figure out how many columns of data are supplied. If the data +++ ** is coming from a SELECT statement, then this step also generates +++ ** all the code to implement the SELECT statement and invoke a subroutine +++ ** to process each row of the result. (Template 2.) If the SELECT +++ ** statement uses the the table that is being inserted into, then the +++ ** subroutine is also coded here. That subroutine stores the SELECT +++ ** results in a temporary table. (Template 3.) +++ */ +++ if( pSelect ){ +++ /* Data is coming from a SELECT. Generate code to implement that SELECT +++ */ +++ int rc, iInitCode; +++ iInitCode = sqliteVdbeAddOp(v, OP_Goto, 0, 0); +++ iSelectLoop = sqliteVdbeCurrentAddr(v); +++ iInsertBlock = sqliteVdbeMakeLabel(v); +++ rc = sqliteSelect(pParse, pSelect, SRT_Subroutine, iInsertBlock, 0,0,0); +++ if( rc || pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup; +++ iCleanup = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iCleanup); +++ assert( pSelect->pEList ); +++ nColumn = pSelect->pEList->nExpr; +++ +++ /* Set useTempTable to TRUE if the result of the SELECT statement +++ ** should be written into a temporary table. Set to FALSE if each +++ ** row of the SELECT can be written directly into the result table. +++ ** +++ ** A temp table must be used if the table being updated is also one +++ ** of the tables being read by the SELECT statement. Also use a +++ ** temp table in the case of row triggers. +++ */ +++ if( row_triggers_exist ){ +++ useTempTable = 1; +++ }else{ +++ int addr = sqliteVdbeFindOp(v, OP_OpenRead, pTab->tnum); +++ useTempTable = 0; +++ if( addr>0 ){ +++ VdbeOp *pOp = sqliteVdbeGetOp(v, addr-2); +++ if( pOp->opcode==OP_Integer && pOp->p1==pTab->iDb ){ +++ useTempTable = 1; +++ } +++ } +++ } +++ +++ if( useTempTable ){ +++ /* Generate the subroutine that SELECT calls to process each row of +++ ** the result. Store the result in a temporary table +++ */ +++ srcTab = pParse->nTab++; +++ sqliteVdbeResolveLabel(v, iInsertBlock); +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0); +++ sqliteVdbeAddOp(v, OP_NewRecno, srcTab, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, srcTab, 0); +++ sqliteVdbeAddOp(v, OP_Return, 0, 0); +++ +++ /* The following code runs first because the GOTO at the very top +++ ** of the program jumps to it. Create the temporary table, then jump +++ ** back up and execute the SELECT code above. +++ */ +++ sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v)); +++ sqliteVdbeAddOp(v, OP_OpenTemp, srcTab, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop); +++ sqliteVdbeResolveLabel(v, iCleanup); +++ }else{ +++ sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v)); +++ } +++ }else{ +++ /* This is the case if the data for the INSERT is coming from a VALUES +++ ** clause +++ */ +++ SrcList dummy; +++ assert( pList!=0 ); +++ srcTab = -1; +++ useTempTable = 0; +++ assert( pList ); +++ nColumn = pList->nExpr; +++ dummy.nSrc = 0; +++ for(i=0; ia[i].pExpr) ){ +++ goto insert_cleanup; +++ } +++ if( sqliteExprCheck(pParse, pList->a[i].pExpr, 0, 0) ){ +++ goto insert_cleanup; +++ } +++ } +++ } +++ +++ /* Make sure the number of columns in the source data matches the number +++ ** of columns to be inserted into the table. +++ */ +++ if( pColumn==0 && nColumn!=pTab->nCol ){ +++ sqliteErrorMsg(pParse, +++ "table %S has %d columns but %d values were supplied", +++ pTabList, 0, pTab->nCol, nColumn); +++ goto insert_cleanup; +++ } +++ if( pColumn!=0 && nColumn!=pColumn->nId ){ +++ sqliteErrorMsg(pParse, "%d values for %d columns", nColumn, pColumn->nId); +++ goto insert_cleanup; +++ } +++ +++ /* If the INSERT statement included an IDLIST term, then make sure +++ ** all elements of the IDLIST really are columns of the table and +++ ** remember the column indices. +++ ** +++ ** If the table has an INTEGER PRIMARY KEY column and that column +++ ** is named in the IDLIST, then record in the keyColumn variable +++ ** the index into IDLIST of the primary key column. keyColumn is +++ ** the index of the primary key as it appears in IDLIST, not as +++ ** is appears in the original table. (The index of the primary +++ ** key in the original table is pTab->iPKey.) +++ */ +++ if( pColumn ){ +++ for(i=0; inId; i++){ +++ pColumn->a[i].idx = -1; +++ } +++ for(i=0; inId; i++){ +++ for(j=0; jnCol; j++){ +++ if( sqliteStrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){ +++ pColumn->a[i].idx = j; +++ if( j==pTab->iPKey ){ +++ keyColumn = i; +++ } +++ break; +++ } +++ } +++ if( j>=pTab->nCol ){ +++ if( sqliteIsRowid(pColumn->a[i].zName) ){ +++ keyColumn = i; +++ }else{ +++ sqliteErrorMsg(pParse, "table %S has no column named %s", +++ pTabList, 0, pColumn->a[i].zName); +++ pParse->nErr++; +++ goto insert_cleanup; +++ } +++ } +++ } +++ } +++ +++ /* If there is no IDLIST term but the table has an integer primary +++ ** key, the set the keyColumn variable to the primary key column index +++ ** in the original table definition. +++ */ +++ if( pColumn==0 ){ +++ keyColumn = pTab->iPKey; +++ } +++ +++ /* Open the temp table for FOR EACH ROW triggers +++ */ +++ if( row_triggers_exist ){ +++ sqliteVdbeAddOp(v, OP_OpenPseudo, newIdx, 0); +++ } +++ +++ /* Initialize the count of rows to be inserted +++ */ +++ if( db->flags & SQLITE_CountRows ){ +++ iCntMem = pParse->nMem++; +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iCntMem, 1); +++ } +++ +++ /* Open tables and indices if there are no row triggers */ +++ if( !row_triggers_exist ){ +++ base = pParse->nTab; +++ idx = sqliteOpenTableAndIndices(pParse, pTab, base); +++ pParse->nTab += idx; +++ } +++ +++ /* If the data source is a temporary table, then we have to create +++ ** a loop because there might be multiple rows of data. If the data +++ ** source is a subroutine call from the SELECT statement, then we need +++ ** to launch the SELECT statement processing. +++ */ +++ if( useTempTable ){ +++ iBreak = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, srcTab, iBreak); +++ iCont = sqliteVdbeCurrentAddr(v); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop); +++ sqliteVdbeResolveLabel(v, iInsertBlock); +++ } +++ +++ /* Run the BEFORE and INSTEAD OF triggers, if there are any +++ */ +++ endOfLoop = sqliteVdbeMakeLabel(v); +++ if( before_triggers ){ +++ +++ /* build the NEW.* reference row. Note that if there is an INTEGER +++ ** PRIMARY KEY into which a NULL is being inserted, that NULL will be +++ ** translated into a unique ID for the row. But on a BEFORE trigger, +++ ** we do not know what the unique ID will be (because the insert has +++ ** not happened yet) so we substitute a rowid of -1 +++ */ +++ if( keyColumn<0 ){ +++ sqliteVdbeAddOp(v, OP_Integer, -1, 0); +++ }else if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[keyColumn].pExpr); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Integer, -1, 0); +++ sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0); +++ } +++ +++ /* Create the new column data +++ */ +++ for(i=0; inCol; i++){ +++ if( pColumn==0 ){ +++ j = i; +++ }else{ +++ for(j=0; jnId; j++){ +++ if( pColumn->a[j].idx==i ) break; +++ } +++ } +++ if( pColumn && j>=pColumn->nId ){ +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC); +++ }else if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, j); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, nColumn-j-1, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[j].pExpr); +++ } +++ } +++ sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0); +++ +++ /* Fire BEFORE or INSTEAD OF triggers */ +++ if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_BEFORE, pTab, +++ newIdx, -1, onError, endOfLoop) ){ +++ goto insert_cleanup; +++ } +++ } +++ +++ /* If any triggers exists, the opening of tables and indices is deferred +++ ** until now. +++ */ +++ if( row_triggers_exist && !isView ){ +++ base = pParse->nTab; +++ idx = sqliteOpenTableAndIndices(pParse, pTab, base); +++ pParse->nTab += idx; +++ } +++ +++ /* Push the record number for the new entry onto the stack. The +++ ** record number is a randomly generate integer created by NewRecno +++ ** except when the table has an INTEGER PRIMARY KEY column, in which +++ ** case the record number is the same as that column. +++ */ +++ if( !isView ){ +++ if( keyColumn>=0 ){ +++ if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[keyColumn].pExpr); +++ } +++ /* If the PRIMARY KEY expression is NULL, then use OP_NewRecno +++ ** to generate a unique primary key value. +++ */ +++ sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_NewRecno, base, 0); +++ sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_NewRecno, base, 0); +++ } +++ +++ /* Push onto the stack, data for all columns of the new entry, beginning +++ ** with the first column. +++ */ +++ for(i=0; inCol; i++){ +++ if( i==pTab->iPKey ){ +++ /* The value of the INTEGER PRIMARY KEY column is always a NULL. +++ ** Whenever this column is read, the record number will be substituted +++ ** in its place. So will fill this column with a NULL to avoid +++ ** taking up data space with information that will never be used. */ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ continue; +++ } +++ if( pColumn==0 ){ +++ j = i; +++ }else{ +++ for(j=0; jnId; j++){ +++ if( pColumn->a[j].idx==i ) break; +++ } +++ } +++ if( pColumn && j>=pColumn->nId ){ +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC); +++ }else if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, j); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, i+nColumn-j, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[j].pExpr); +++ } +++ } +++ +++ /* Generate code to check constraints and generate index keys and +++ ** do the insertion. +++ */ +++ sqliteGenerateConstraintChecks(pParse, pTab, base, 0, keyColumn>=0, +++ 0, onError, endOfLoop); +++ sqliteCompleteInsertion(pParse, pTab, base, 0,0,0, +++ after_triggers ? newIdx : -1); +++ } +++ +++ /* Update the count of rows that are inserted +++ */ +++ if( (db->flags & SQLITE_CountRows)!=0 ){ +++ sqliteVdbeAddOp(v, OP_MemIncr, iCntMem, 0); +++ } +++ +++ if( row_triggers_exist ){ +++ /* Close all tables opened */ +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Close, base, 0); +++ for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){ +++ sqliteVdbeAddOp(v, OP_Close, idx+base, 0); +++ } +++ } +++ +++ /* Code AFTER triggers */ +++ if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_AFTER, pTab, newIdx, -1, +++ onError, endOfLoop) ){ +++ goto insert_cleanup; +++ } +++ } +++ +++ /* The bottom of the loop, if the data source is a SELECT statement +++ */ +++ sqliteVdbeResolveLabel(v, endOfLoop); +++ if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Next, srcTab, iCont); +++ sqliteVdbeResolveLabel(v, iBreak); +++ sqliteVdbeAddOp(v, OP_Close, srcTab, 0); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Pop, nColumn, 0); +++ sqliteVdbeAddOp(v, OP_Return, 0, 0); +++ sqliteVdbeResolveLabel(v, iCleanup); +++ } +++ +++ if( !row_triggers_exist ){ +++ /* Close all tables opened */ +++ sqliteVdbeAddOp(v, OP_Close, base, 0); +++ for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){ +++ sqliteVdbeAddOp(v, OP_Close, idx+base, 0); +++ } +++ } +++ +++ sqliteVdbeAddOp(v, OP_SetCounts, 0, 0); +++ sqliteEndWriteOperation(pParse); +++ +++ /* +++ ** Return the number of rows inserted. +++ */ +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeOp3(v, OP_ColumnName, 0, 1, "rows inserted", P3_STATIC); +++ sqliteVdbeAddOp(v, OP_MemLoad, iCntMem, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 1, 0); +++ } +++ +++insert_cleanup: +++ sqliteSrcListDelete(pTabList); +++ if( pList ) sqliteExprListDelete(pList); +++ if( pSelect ) sqliteSelectDelete(pSelect); +++ sqliteIdListDelete(pColumn); +++} +++ +++/* +++** Generate code to do a constraint check prior to an INSERT or an UPDATE. +++** +++** When this routine is called, the stack contains (from bottom to top) +++** the following values: +++** +++** 1. The recno of the row to be updated before the update. This +++** value is omitted unless we are doing an UPDATE that involves a +++** change to the record number. +++** +++** 2. The recno of the row after the update. +++** +++** 3. The data in the first column of the entry after the update. +++** +++** i. Data from middle columns... +++** +++** N. The data in the last column of the entry after the update. +++** +++** The old recno shown as entry (1) above is omitted unless both isUpdate +++** and recnoChng are 1. isUpdate is true for UPDATEs and false for +++** INSERTs and recnoChng is true if the record number is being changed. +++** +++** The code generated by this routine pushes additional entries onto +++** the stack which are the keys for new index entries for the new record. +++** The order of index keys is the same as the order of the indices on +++** the pTable->pIndex list. A key is only created for index i if +++** aIdxUsed!=0 and aIdxUsed[i]!=0. +++** +++** This routine also generates code to check constraints. NOT NULL, +++** CHECK, and UNIQUE constraints are all checked. If a constraint fails, +++** then the appropriate action is performed. There are five possible +++** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. +++** +++** Constraint type Action What Happens +++** --------------- ---------- ---------------------------------------- +++** any ROLLBACK The current transaction is rolled back and +++** sqlite_exec() returns immediately with a +++** return code of SQLITE_CONSTRAINT. +++** +++** any ABORT Back out changes from the current command +++** only (do not do a complete rollback) then +++** cause sqlite_exec() to return immediately +++** with SQLITE_CONSTRAINT. +++** +++** any FAIL Sqlite_exec() returns immediately with a +++** return code of SQLITE_CONSTRAINT. The +++** transaction is not rolled back and any +++** prior changes are retained. +++** +++** any IGNORE The record number and data is popped from +++** the stack and there is an immediate jump +++** to label ignoreDest. +++** +++** NOT NULL REPLACE The NULL value is replace by the default +++** value for that column. If the default value +++** is NULL, the action is the same as ABORT. +++** +++** UNIQUE REPLACE The other row that conflicts with the row +++** being inserted is removed. +++** +++** CHECK REPLACE Illegal. The results in an exception. +++** +++** Which action to take is determined by the overrideError parameter. +++** Or if overrideError==OE_Default, then the pParse->onError parameter +++** is used. Or if pParse->onError==OE_Default then the onError value +++** for the constraint is used. +++** +++** The calling routine must open a read/write cursor for pTab with +++** cursor number "base". All indices of pTab must also have open +++** read/write cursors with cursor number base+i for the i-th cursor. +++** Except, if there is no possibility of a REPLACE action then +++** cursors do not need to be open for indices where aIdxUsed[i]==0. +++** +++** If the isUpdate flag is true, it means that the "base" cursor is +++** initially pointing to an entry that is being updated. The isUpdate +++** flag causes extra code to be generated so that the "base" cursor +++** is still pointing at the same entry after the routine returns. +++** Without the isUpdate flag, the "base" cursor might be moved. +++*/ +++void sqliteGenerateConstraintChecks( +++ Parse *pParse, /* The parser context */ +++ Table *pTab, /* the table into which we are inserting */ +++ int base, /* Index of a read/write cursor pointing at pTab */ +++ char *aIdxUsed, /* Which indices are used. NULL means all are used */ +++ int recnoChng, /* True if the record number will change */ +++ int isUpdate, /* True for UPDATE, False for INSERT */ +++ int overrideError, /* Override onError to this if not OE_Default */ +++ int ignoreDest /* Jump to this label on an OE_Ignore resolution */ +++){ +++ int i; +++ Vdbe *v; +++ int nCol; +++ int onError; +++ int addr; +++ int extra; +++ int iCur; +++ Index *pIdx; +++ int seenReplace = 0; +++ int jumpInst1, jumpInst2; +++ int contAddr; +++ int hasTwoRecnos = (isUpdate && recnoChng); +++ +++ v = sqliteGetVdbe(pParse); +++ assert( v!=0 ); +++ assert( pTab->pSelect==0 ); /* This table is not a VIEW */ +++ nCol = pTab->nCol; +++ +++ /* Test all NOT NULL constraints. +++ */ +++ for(i=0; iiPKey ){ +++ continue; +++ } +++ onError = pTab->aCol[i].notNull; +++ if( onError==OE_None ) continue; +++ if( overrideError!=OE_Default ){ +++ onError = overrideError; +++ }else if( pParse->db->onError!=OE_Default ){ +++ onError = pParse->db->onError; +++ }else if( onError==OE_Default ){ +++ onError = OE_Abort; +++ } +++ if( onError==OE_Replace && pTab->aCol[i].zDflt==0 ){ +++ onError = OE_Abort; +++ } +++ sqliteVdbeAddOp(v, OP_Dup, nCol-1-i, 1); +++ addr = sqliteVdbeAddOp(v, OP_NotNull, 1, 0); +++ switch( onError ){ +++ case OE_Rollback: +++ case OE_Abort: +++ case OE_Fail: { +++ char *zMsg = 0; +++ sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError); +++ sqliteSetString(&zMsg, pTab->zName, ".", pTab->aCol[i].zName, +++ " may not be NULL", (char*)0); +++ sqliteVdbeChangeP3(v, -1, zMsg, P3_DYNAMIC); +++ break; +++ } +++ case OE_Ignore: { +++ sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest); +++ break; +++ } +++ case OE_Replace: { +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Push, nCol-i, 0); +++ break; +++ } +++ default: assert(0); +++ } +++ sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v)); +++ } +++ +++ /* Test all CHECK constraints +++ */ +++ /**** TBD ****/ +++ +++ /* If we have an INTEGER PRIMARY KEY, make sure the primary key +++ ** of the new record does not previously exist. Except, if this +++ ** is an UPDATE and the primary key is not changing, that is OK. +++ */ +++ if( recnoChng ){ +++ onError = pTab->keyConf; +++ if( overrideError!=OE_Default ){ +++ onError = overrideError; +++ }else if( pParse->db->onError!=OE_Default ){ +++ onError = pParse->db->onError; +++ }else if( onError==OE_Default ){ +++ onError = OE_Abort; +++ } +++ +++ if( isUpdate ){ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); +++ sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); +++ jumpInst1 = sqliteVdbeAddOp(v, OP_Eq, 0, 0); +++ } +++ sqliteVdbeAddOp(v, OP_Dup, nCol, 1); +++ jumpInst2 = sqliteVdbeAddOp(v, OP_NotExists, base, 0); +++ switch( onError ){ +++ default: { +++ onError = OE_Abort; +++ /* Fall thru into the next case */ +++ } +++ case OE_Rollback: +++ case OE_Abort: +++ case OE_Fail: { +++ sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, +++ "PRIMARY KEY must be unique", P3_STATIC); +++ break; +++ } +++ case OE_Replace: { +++ sqliteGenerateRowIndexDelete(pParse->db, v, pTab, base, 0); +++ if( isUpdate ){ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+hasTwoRecnos, 1); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ seenReplace = 1; +++ break; +++ } +++ case OE_Ignore: { +++ assert( seenReplace==0 ); +++ sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest); +++ break; +++ } +++ } +++ contAddr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeChangeP2(v, jumpInst2, contAddr); +++ if( isUpdate ){ +++ sqliteVdbeChangeP2(v, jumpInst1, contAddr); +++ sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ } +++ +++ /* Test all UNIQUE constraints by creating entries for each UNIQUE +++ ** index and making sure that duplicate entries do not already exist. +++ ** Add the new records to the indices as we go. +++ */ +++ extra = -1; +++ for(iCur=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, iCur++){ +++ if( aIdxUsed && aIdxUsed[iCur]==0 ) continue; /* Skip unused indices */ +++ extra++; +++ +++ /* Create a key for accessing the index entry */ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+extra, 1); +++ for(i=0; inColumn; i++){ +++ int idx = pIdx->aiColumn[i]; +++ if( idx==pTab->iPKey ){ +++ sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol+1, 1); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol-idx, 1); +++ } +++ } +++ jumpInst1 = sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0); +++ if( pParse->db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx); +++ +++ /* Find out what action to take in case there is an indexing conflict */ +++ onError = pIdx->onError; +++ if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ +++ if( overrideError!=OE_Default ){ +++ onError = overrideError; +++ }else if( pParse->db->onError!=OE_Default ){ +++ onError = pParse->db->onError; +++ }else if( onError==OE_Default ){ +++ onError = OE_Abort; +++ } +++ if( seenReplace ){ +++ if( onError==OE_Ignore ) onError = OE_Replace; +++ else if( onError==OE_Fail ) onError = OE_Abort; +++ } +++ +++ +++ /* Check to see if the new index entry will be unique */ +++ sqliteVdbeAddOp(v, OP_Dup, extra+nCol+1+hasTwoRecnos, 1); +++ jumpInst2 = sqliteVdbeAddOp(v, OP_IsUnique, base+iCur+1, 0); +++ +++ /* Generate code that executes if the new index entry is not unique */ +++ switch( onError ){ +++ case OE_Rollback: +++ case OE_Abort: +++ case OE_Fail: { +++ int j, n1, n2; +++ char zErrMsg[200]; +++ strcpy(zErrMsg, pIdx->nColumn>1 ? "columns " : "column "); +++ n1 = strlen(zErrMsg); +++ for(j=0; jnColumn && n1aCol[pIdx->aiColumn[j]].zName; +++ n2 = strlen(zCol); +++ if( j>0 ){ +++ strcpy(&zErrMsg[n1], ", "); +++ n1 += 2; +++ } +++ if( n1+n2>sizeof(zErrMsg)-30 ){ +++ strcpy(&zErrMsg[n1], "..."); +++ n1 += 3; +++ break; +++ }else{ +++ strcpy(&zErrMsg[n1], zCol); +++ n1 += n2; +++ } +++ } +++ strcpy(&zErrMsg[n1], +++ pIdx->nColumn>1 ? " are not unique" : " is not unique"); +++ sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, zErrMsg, 0); +++ break; +++ } +++ case OE_Ignore: { +++ assert( seenReplace==0 ); +++ sqliteVdbeAddOp(v, OP_Pop, nCol+extra+3+hasTwoRecnos, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest); +++ break; +++ } +++ case OE_Replace: { +++ sqliteGenerateRowDelete(pParse->db, v, pTab, base, 0); +++ if( isUpdate ){ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+extra+1+hasTwoRecnos, 1); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ seenReplace = 1; +++ break; +++ } +++ default: assert(0); +++ } +++ contAddr = sqliteVdbeCurrentAddr(v); +++#if NULL_DISTINCT_FOR_UNIQUE +++ sqliteVdbeChangeP2(v, jumpInst1, contAddr); +++#endif +++ sqliteVdbeChangeP2(v, jumpInst2, contAddr); +++ } +++} +++ +++/* +++** This routine generates code to finish the INSERT or UPDATE operation +++** that was started by a prior call to sqliteGenerateConstraintChecks. +++** The stack must contain keys for all active indices followed by data +++** and the recno for the new entry. This routine creates the new +++** entries in all indices and in the main table. +++** +++** The arguments to this routine should be the same as the first six +++** arguments to sqliteGenerateConstraintChecks. +++*/ +++void sqliteCompleteInsertion( +++ Parse *pParse, /* The parser context */ +++ Table *pTab, /* the table into which we are inserting */ +++ int base, /* Index of a read/write cursor pointing at pTab */ +++ char *aIdxUsed, /* Which indices are used. NULL means all are used */ +++ int recnoChng, /* True if the record number will change */ +++ int isUpdate, /* True for UPDATE, False for INSERT */ +++ int newIdx /* Index of NEW table for triggers. -1 if none */ +++){ +++ int i; +++ Vdbe *v; +++ int nIdx; +++ Index *pIdx; +++ +++ v = sqliteGetVdbe(pParse); +++ assert( v!=0 ); +++ assert( pTab->pSelect==0 ); /* This table is not a VIEW */ +++ for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){} +++ for(i=nIdx-1; i>=0; i--){ +++ if( aIdxUsed && aIdxUsed[i]==0 ) continue; +++ sqliteVdbeAddOp(v, OP_IdxPut, base+i+1, 0); +++ } +++ sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0); +++ if( newIdx>=0 ){ +++ sqliteVdbeAddOp(v, OP_Dup, 1, 0); +++ sqliteVdbeAddOp(v, OP_Dup, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0); +++ } +++ sqliteVdbeAddOp(v, OP_PutIntKey, base, +++ (pParse->trigStack?0:OPFLAG_NCHANGE) | +++ (isUpdate?0:OPFLAG_LASTROWID) | OPFLAG_CSCHANGE); +++ if( isUpdate && recnoChng ){ +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ } +++} +++ +++/* +++** Generate code that will open write cursors for a table and for all +++** indices of that table. The "base" parameter is the cursor number used +++** for the table. Indices are opened on subsequent cursors. +++** +++** Return the total number of cursors opened. This is always at least +++** 1 (for the main table) plus more for each cursor. +++*/ +++int sqliteOpenTableAndIndices(Parse *pParse, Table *pTab, int base){ +++ int i; +++ Index *pIdx; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ assert( v!=0 ); +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenWrite, base, pTab->tnum, pTab->zName, P3_STATIC); +++ for(i=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){ +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenWrite, i+base, pIdx->tnum, pIdx->zName, P3_STATIC); +++ } +++ return i; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/libsqlite.dsp ++@@ -0,0 +1,353 @@ +++# Microsoft Developer Studio Project File - Name="libsqlite" - Package Owner=<4> +++# Microsoft Developer Studio Generated Build File, Format Version 6.00 +++# ** DO NOT EDIT ** +++ +++# TARGTYPE "Win32 (x86) Static Library" 0x0104 +++ +++CFG=libsqlite - Win32 Debug_TS +++!MESSAGE This is not a valid makefile. To build this project using NMAKE, +++!MESSAGE use the Export Makefile command and run +++!MESSAGE +++!MESSAGE NMAKE /f "libsqlite.mak". +++!MESSAGE +++!MESSAGE You can specify a configuration when running NMAKE +++!MESSAGE by defining the macro CFG on the command line. For example: +++!MESSAGE +++!MESSAGE NMAKE /f "libsqlite.mak" CFG="libsqlite - Win32 Debug_TS" +++!MESSAGE +++!MESSAGE Possible choices for configuration are: +++!MESSAGE +++!MESSAGE "libsqlite - Win32 Debug_TS" (based on "Win32 (x86) Static Library") +++!MESSAGE "libsqlite - Win32 Release_TS" (based on "Win32 (x86) Static Library") +++!MESSAGE "libsqlite - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library") +++!MESSAGE +++ +++# Begin Project +++# PROP AllowPerConfigDependencies 0 +++# PROP Scc_ProjName "" +++# PROP Scc_LocalPath "" +++CPP=cl.exe +++RSC=rc.exe +++ +++!IF "$(CFG)" == "libsqlite - Win32 Debug_TS" +++ +++# PROP BASE Use_MFC 0 +++# PROP BASE Use_Debug_Libraries 1 +++# PROP BASE Output_Dir "Debug_TS" +++# PROP BASE Intermediate_Dir "Debug_TS" +++# PROP BASE Target_Dir "" +++# PROP Use_MFC 0 +++# PROP Use_Debug_Libraries 1 +++# PROP Output_Dir "..\..\Debug_TS" +++# PROP Intermediate_Dir "..\..\Debug_TS" +++# PROP Target_Dir "" +++# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +++# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /GZ /c +++# ADD BASE RSC /l 0x406 /d "_DEBUG" +++# ADD RSC /l 0x406 /d "_DEBUG" +++BSC32=bscmake.exe +++# ADD BASE BSC32 /nologo +++# ADD BSC32 /nologo +++LIB32=link.exe -lib +++# ADD BASE LIB32 /nologo +++# ADD LIB32 /nologo +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" +++ +++# PROP BASE Use_MFC 0 +++# PROP BASE Use_Debug_Libraries 0 +++# PROP BASE Output_Dir "Release_TS" +++# PROP BASE Intermediate_Dir "Release_TS" +++# PROP BASE Target_Dir "" +++# PROP Use_MFC 0 +++# PROP Use_Debug_Libraries 0 +++# PROP Output_Dir "..\..\Release_TS" +++# PROP Intermediate_Dir "..\..\Release_TS" +++# PROP Target_Dir "" +++# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +++# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +++# ADD BASE RSC /l 0x406 /d "NDEBUG" +++# ADD RSC /l 0x406 /d "NDEBUG" +++BSC32=bscmake.exe +++# ADD BASE BSC32 /nologo +++# ADD BSC32 /nologo +++LIB32=link.exe -lib +++# ADD BASE LIB32 /nologo +++# ADD LIB32 /nologo +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" +++ +++# PROP BASE Use_MFC 0 +++# PROP BASE Use_Debug_Libraries 0 +++# PROP BASE Output_Dir "libsqlite___Win32_Release_TSDbg" +++# PROP BASE Intermediate_Dir "libsqlite___Win32_Release_TSDbg" +++# PROP BASE Target_Dir "" +++# PROP Use_MFC 0 +++# PROP Use_Debug_Libraries 0 +++# PROP Output_Dir "..\..\Release_TSDbg" +++# PROP Intermediate_Dir "..\..\Release_TSDbg" +++# PROP Target_Dir "" +++# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +++# ADD CPP /nologo /MD /W3 /GX /Zi /Od /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +++# ADD BASE RSC /l 0x406 /d "NDEBUG" +++# ADD RSC /l 0x406 /d "NDEBUG" +++BSC32=bscmake.exe +++# ADD BASE BSC32 /nologo +++# ADD BSC32 /nologo +++LIB32=link.exe -lib +++# ADD BASE LIB32 /nologo /out:"Release_TS\libsqlite.lib" +++# ADD LIB32 /nologo +++ +++!ENDIF +++ +++# Begin Target +++ +++# Name "libsqlite - Win32 Debug_TS" +++# Name "libsqlite - Win32 Release_TS" +++# Name "libsqlite - Win32 Release_TSDbg" +++# Begin Group "Source Files" +++ +++# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +++# Begin Source File +++ +++SOURCE=attach.c +++# End Source File +++# Begin Source File +++ +++SOURCE=auth.c +++# End Source File +++# Begin Source File +++ +++SOURCE=btree.c +++# End Source File +++# Begin Source File +++ +++SOURCE=btree_rb.c +++# End Source File +++# Begin Source File +++ +++SOURCE=build.c +++# End Source File +++# Begin Source File +++ +++SOURCE=copy.c +++# End Source File +++# Begin Source File +++ +++SOURCE=.\date.c +++# End Source File +++# Begin Source File +++ +++SOURCE=delete.c +++# End Source File +++# Begin Source File +++ +++SOURCE=encode.c +++# End Source File +++# Begin Source File +++ +++SOURCE=expr.c +++# End Source File +++# Begin Source File +++ +++SOURCE=func.c +++# End Source File +++# Begin Source File +++ +++SOURCE=hash.c +++# End Source File +++# Begin Source File +++ +++SOURCE=insert.c +++# End Source File +++# Begin Source File +++ +++SOURCE=main.c +++# End Source File +++# Begin Source File +++ +++SOURCE=opcodes.c +++# End Source File +++# Begin Source File +++ +++SOURCE=os.c +++# End Source File +++# Begin Source File +++ +++SOURCE=pager.c +++# End Source File +++# Begin Source File +++ +++SOURCE=parse.c +++# End Source File +++# Begin Source File +++ +++SOURCE=pragma.c +++# End Source File +++# Begin Source File +++ +++SOURCE=printf.c +++# End Source File +++# Begin Source File +++ +++SOURCE=random.c +++# End Source File +++# Begin Source File +++ +++SOURCE=select.c +++# End Source File +++# Begin Source File +++ +++SOURCE=table.c +++# End Source File +++# Begin Source File +++ +++SOURCE=tokenize.c +++# End Source File +++# Begin Source File +++ +++SOURCE=trigger.c +++# End Source File +++# Begin Source File +++ +++SOURCE=update.c +++# End Source File +++# Begin Source File +++ +++SOURCE=util.c +++# End Source File +++# Begin Source File +++ +++SOURCE=vacuum.c +++# End Source File +++# Begin Source File +++ +++SOURCE=vdbe.c +++# End Source File +++# Begin Source File +++ +++SOURCE=.\vdbeaux.c +++# End Source File +++# Begin Source File +++ +++SOURCE=where.c +++# End Source File +++# End Group +++# Begin Group "Header Files" +++ +++# PROP Default_Filter "h;hpp;hxx;hm;inl" +++# Begin Source File +++ +++SOURCE=btree.h +++# End Source File +++# Begin Source File +++ +++SOURCE=config_static.w32.h +++ +++!IF "$(CFG)" == "libsqlite - Win32 Debug_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=config_static.w32.h +++ +++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\config.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=config_static.w32.h +++ +++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\config.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=config_static.w32.h +++ +++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\config.h +++ +++# End Custom Build +++ +++!ENDIF +++ +++# End Source File +++# Begin Source File +++ +++SOURCE=hash.h +++# End Source File +++# Begin Source File +++ +++SOURCE=opcodes.h +++# End Source File +++# Begin Source File +++ +++SOURCE=os.h +++# End Source File +++# Begin Source File +++ +++SOURCE=pager.h +++# End Source File +++# Begin Source File +++ +++SOURCE=parse.h +++# End Source File +++# Begin Source File +++ +++SOURCE=sqlite.w32.h +++ +++!IF "$(CFG)" == "libsqlite - Win32 Debug_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=sqlite.w32.h +++ +++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\sqlite.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=sqlite.w32.h +++ +++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\sqlite.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=sqlite.w32.h +++ +++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\sqlite.h +++ +++# End Custom Build +++ +++!ENDIF +++ +++# End Source File +++# Begin Source File +++ +++SOURCE=sqliteInt.h +++# End Source File +++# Begin Source File +++ +++SOURCE=vdbe.h +++# End Source File +++# End Group +++# End Target +++# End Project ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/main.c ++@@ -0,0 +1,1143 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** Main file for the SQLite library. The routines in this file +++** implement the programmer interface to the library. Routines in +++** other files are for internal use by SQLite and should not be +++** accessed by users of the library. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include "os.h" +++#include +++ +++/* +++** A pointer to this structure is used to communicate information +++** from sqliteInit into the sqliteInitCallback. +++*/ +++typedef struct { +++ sqlite *db; /* The database being initialized */ +++ char **pzErrMsg; /* Error message stored here */ +++} InitData; +++ +++/* +++** Fill the InitData structure with an error message that indicates +++** that the database is corrupt. +++*/ +++static void corruptSchema(InitData *pData, const char *zExtra){ +++ sqliteSetString(pData->pzErrMsg, "malformed database schema", +++ zExtra!=0 && zExtra[0]!=0 ? " - " : (char*)0, zExtra, (char*)0); +++} +++ +++/* +++** This is the callback routine for the code that initializes the +++** database. See sqliteInit() below for additional information. +++** +++** Each callback contains the following information: +++** +++** argv[0] = "file-format" or "schema-cookie" or "table" or "index" +++** argv[1] = table or index name or meta statement type. +++** argv[2] = root page number for table or index. NULL for meta. +++** argv[3] = SQL text for a CREATE TABLE or CREATE INDEX statement. +++** argv[4] = "1" for temporary files, "0" for main database, "2" or more +++** for auxiliary database files. +++** +++*/ +++static +++int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){ +++ InitData *pData = (InitData*)pInit; +++ int nErr = 0; +++ +++ assert( argc==5 ); +++ if( argv==0 ) return 0; /* Might happen if EMPTY_RESULT_CALLBACKS are on */ +++ if( argv[0]==0 ){ +++ corruptSchema(pData, 0); +++ return 1; +++ } +++ switch( argv[0][0] ){ +++ case 'v': +++ case 'i': +++ case 't': { /* CREATE TABLE, CREATE INDEX, or CREATE VIEW statements */ +++ sqlite *db = pData->db; +++ if( argv[2]==0 || argv[4]==0 ){ +++ corruptSchema(pData, 0); +++ return 1; +++ } +++ if( argv[3] && argv[3][0] ){ +++ /* Call the parser to process a CREATE TABLE, INDEX or VIEW. +++ ** But because db->init.busy is set to 1, no VDBE code is generated +++ ** or executed. All the parser does is build the internal data +++ ** structures that describe the table, index, or view. +++ */ +++ char *zErr; +++ assert( db->init.busy ); +++ db->init.iDb = atoi(argv[4]); +++ assert( db->init.iDb>=0 && db->init.iDbnDb ); +++ db->init.newTnum = atoi(argv[2]); +++ if( sqlite_exec(db, argv[3], 0, 0, &zErr) ){ +++ corruptSchema(pData, zErr); +++ sqlite_freemem(zErr); +++ } +++ db->init.iDb = 0; +++ }else{ +++ /* If the SQL column is blank it means this is an index that +++ ** was created to be the PRIMARY KEY or to fulfill a UNIQUE +++ ** constraint for a CREATE TABLE. The index should have already +++ ** been created when we processed the CREATE TABLE. All we have +++ ** to do here is record the root page number for that index. +++ */ +++ int iDb; +++ Index *pIndex; +++ +++ iDb = atoi(argv[4]); +++ assert( iDb>=0 && iDbnDb ); +++ pIndex = sqliteFindIndex(db, argv[1], db->aDb[iDb].zName); +++ if( pIndex==0 || pIndex->tnum!=0 ){ +++ /* This can occur if there exists an index on a TEMP table which +++ ** has the same name as another index on a permanent index. Since +++ ** the permanent table is hidden by the TEMP table, we can also +++ ** safely ignore the index on the permanent table. +++ */ +++ /* Do Nothing */; +++ }else{ +++ pIndex->tnum = atoi(argv[2]); +++ } +++ } +++ break; +++ } +++ default: { +++ /* This can not happen! */ +++ nErr = 1; +++ assert( nErr==0 ); +++ } +++ } +++ return nErr; +++} +++ +++/* +++** This is a callback procedure used to reconstruct a table. The +++** name of the table to be reconstructed is passed in as argv[0]. +++** +++** This routine is used to automatically upgrade a database from +++** format version 1 or 2 to version 3. The correct operation of +++** this routine relys on the fact that no indices are used when +++** copying a table out to a temporary file. +++** +++** The change from version 2 to version 3 occurred between SQLite +++** version 2.5.6 and 2.6.0 on 2002-July-18. +++*/ +++static +++int upgrade_3_callback(void *pInit, int argc, char **argv, char **NotUsed){ +++ InitData *pData = (InitData*)pInit; +++ int rc; +++ Table *pTab; +++ Trigger *pTrig; +++ char *zErr = 0; +++ +++ pTab = sqliteFindTable(pData->db, argv[0], 0); +++ assert( pTab!=0 ); +++ assert( sqliteStrICmp(pTab->zName, argv[0])==0 ); +++ if( pTab ){ +++ pTrig = pTab->pTrigger; +++ pTab->pTrigger = 0; /* Disable all triggers before rebuilding the table */ +++ } +++ rc = sqlite_exec_printf(pData->db, +++ "CREATE TEMP TABLE sqlite_x AS SELECT * FROM '%q'; " +++ "DELETE FROM '%q'; " +++ "INSERT INTO '%q' SELECT * FROM sqlite_x; " +++ "DROP TABLE sqlite_x;", +++ 0, 0, &zErr, argv[0], argv[0], argv[0]); +++ if( zErr ){ +++ if( *pData->pzErrMsg ) sqlite_freemem(*pData->pzErrMsg); +++ *pData->pzErrMsg = zErr; +++ } +++ +++ /* If an error occurred in the SQL above, then the transaction will +++ ** rollback which will delete the internal symbol tables. This will +++ ** cause the structure that pTab points to be deleted. In case that +++ ** happened, we need to refetch pTab. +++ */ +++ pTab = sqliteFindTable(pData->db, argv[0], 0); +++ if( pTab ){ +++ assert( sqliteStrICmp(pTab->zName, argv[0])==0 ); +++ pTab->pTrigger = pTrig; /* Re-enable triggers */ +++ } +++ return rc!=SQLITE_OK; +++} +++ +++ +++ +++/* +++** Attempt to read the database schema and initialize internal +++** data structures for a single database file. The index of the +++** database file is given by iDb. iDb==0 is used for the main +++** database. iDb==1 should never be used. iDb>=2 is used for +++** auxiliary databases. Return one of the SQLITE_ error codes to +++** indicate success or failure. +++*/ +++static int sqliteInitOne(sqlite *db, int iDb, char **pzErrMsg){ +++ int rc; +++ BtCursor *curMain; +++ int size; +++ Table *pTab; +++ char const *azArg[6]; +++ char zDbNum[30]; +++ int meta[SQLITE_N_BTREE_META]; +++ InitData initData; +++ char const *zMasterSchema; +++ char const *zMasterName; +++ char *zSql = 0; +++ +++ /* +++ ** The master database table has a structure like this +++ */ +++ static char master_schema[] = +++ "CREATE TABLE sqlite_master(\n" +++ " type text,\n" +++ " name text,\n" +++ " tbl_name text,\n" +++ " rootpage integer,\n" +++ " sql text\n" +++ ")" +++ ; +++ static char temp_master_schema[] = +++ "CREATE TEMP TABLE sqlite_temp_master(\n" +++ " type text,\n" +++ " name text,\n" +++ " tbl_name text,\n" +++ " rootpage integer,\n" +++ " sql text\n" +++ ")" +++ ; +++ +++ assert( iDb>=0 && iDbnDb ); +++ +++ /* zMasterSchema and zInitScript are set to point at the master schema +++ ** and initialisation script appropriate for the database being +++ ** initialised. zMasterName is the name of the master table. +++ */ +++ if( iDb==1 ){ +++ zMasterSchema = temp_master_schema; +++ zMasterName = TEMP_MASTER_NAME; +++ }else{ +++ zMasterSchema = master_schema; +++ zMasterName = MASTER_NAME; +++ } +++ +++ /* Construct the schema table. +++ */ +++ sqliteSafetyOff(db); +++ azArg[0] = "table"; +++ azArg[1] = zMasterName; +++ azArg[2] = "2"; +++ azArg[3] = zMasterSchema; +++ sprintf(zDbNum, "%d", iDb); +++ azArg[4] = zDbNum; +++ azArg[5] = 0; +++ initData.db = db; +++ initData.pzErrMsg = pzErrMsg; +++ sqliteInitCallback(&initData, 5, (char **)azArg, 0); +++ pTab = sqliteFindTable(db, zMasterName, db->aDb[iDb].zName); +++ if( pTab ){ +++ pTab->readOnly = 1; +++ }else{ +++ return SQLITE_NOMEM; +++ } +++ sqliteSafetyOn(db); +++ +++ /* Create a cursor to hold the database open +++ */ +++ if( db->aDb[iDb].pBt==0 ) return SQLITE_OK; +++ rc = sqliteBtreeCursor(db->aDb[iDb].pBt, 2, 0, &curMain); +++ if( rc ){ +++ sqliteSetString(pzErrMsg, sqlite_error_string(rc), (char*)0); +++ return rc; +++ } +++ +++ /* Get the database meta information +++ */ +++ rc = sqliteBtreeGetMeta(db->aDb[iDb].pBt, meta); +++ if( rc ){ +++ sqliteSetString(pzErrMsg, sqlite_error_string(rc), (char*)0); +++ sqliteBtreeCloseCursor(curMain); +++ return rc; +++ } +++ db->aDb[iDb].schema_cookie = meta[1]; +++ if( iDb==0 ){ +++ db->next_cookie = meta[1]; +++ db->file_format = meta[2]; +++ size = meta[3]; +++ if( size==0 ){ size = MAX_PAGES; } +++ db->cache_size = size; +++ db->safety_level = meta[4]; +++ if( meta[6]>0 && meta[6]<=2 && db->temp_store==0 ){ +++ db->temp_store = meta[6]; +++ } +++ if( db->safety_level==0 ) db->safety_level = 2; +++ +++ /* +++ ** file_format==1 Version 2.1.0. +++ ** file_format==2 Version 2.2.0. Add support for INTEGER PRIMARY KEY. +++ ** file_format==3 Version 2.6.0. Fix empty-string index bug. +++ ** file_format==4 Version 2.7.0. Add support for separate numeric and +++ ** text datatypes. +++ */ +++ if( db->file_format==0 ){ +++ /* This happens if the database was initially empty */ +++ db->file_format = 4; +++ }else if( db->file_format>4 ){ +++ sqliteBtreeCloseCursor(curMain); +++ sqliteSetString(pzErrMsg, "unsupported file format", (char*)0); +++ return SQLITE_ERROR; +++ } +++ }else if( iDb!=1 && (db->file_format!=meta[2] || db->file_format<4) ){ +++ assert( db->file_format>=4 ); +++ if( meta[2]==0 ){ +++ sqliteSetString(pzErrMsg, "cannot attach empty database: ", +++ db->aDb[iDb].zName, (char*)0); +++ }else{ +++ sqliteSetString(pzErrMsg, "incompatible file format in auxiliary " +++ "database: ", db->aDb[iDb].zName, (char*)0); +++ } +++ sqliteBtreeClose(db->aDb[iDb].pBt); +++ db->aDb[iDb].pBt = 0; +++ return SQLITE_FORMAT; +++ } +++ sqliteBtreeSetCacheSize(db->aDb[iDb].pBt, db->cache_size); +++ sqliteBtreeSetSafetyLevel(db->aDb[iDb].pBt, meta[4]==0 ? 2 : meta[4]); +++ +++ /* Read the schema information out of the schema tables +++ */ +++ assert( db->init.busy ); +++ sqliteSafetyOff(db); +++ +++ /* The following SQL will read the schema from the master tables. +++ ** The first version works with SQLite file formats 2 or greater. +++ ** The second version is for format 1 files. +++ ** +++ ** Beginning with file format 2, the rowid for new table entries +++ ** (including entries in sqlite_master) is an increasing integer. +++ ** So for file format 2 and later, we can play back sqlite_master +++ ** and all the CREATE statements will appear in the right order. +++ ** But with file format 1, table entries were random and so we +++ ** have to make sure the CREATE TABLEs occur before their corresponding +++ ** CREATE INDEXs. (We don't have to deal with CREATE VIEW or +++ ** CREATE TRIGGER in file format 1 because those constructs did +++ ** not exist then.) +++ */ +++ if( db->file_format>=2 ){ +++ sqliteSetString(&zSql, +++ "SELECT type, name, rootpage, sql, ", zDbNum, " FROM \"", +++ db->aDb[iDb].zName, "\".", zMasterName, (char*)0); +++ }else{ +++ sqliteSetString(&zSql, +++ "SELECT type, name, rootpage, sql, ", zDbNum, " FROM \"", +++ db->aDb[iDb].zName, "\".", zMasterName, +++ " WHERE type IN ('table', 'index')" +++ " ORDER BY CASE type WHEN 'table' THEN 0 ELSE 1 END", (char*)0); +++ } +++ rc = sqlite_exec(db, zSql, sqliteInitCallback, &initData, 0); +++ +++ sqliteFree(zSql); +++ sqliteSafetyOn(db); +++ sqliteBtreeCloseCursor(curMain); +++ if( sqlite_malloc_failed ){ +++ sqliteSetString(pzErrMsg, "out of memory", (char*)0); +++ rc = SQLITE_NOMEM; +++ sqliteResetInternalSchema(db, 0); +++ } +++ if( rc==SQLITE_OK ){ +++ DbSetProperty(db, iDb, DB_SchemaLoaded); +++ }else{ +++ sqliteResetInternalSchema(db, iDb); +++ } +++ return rc; +++} +++ +++/* +++** Initialize all database files - the main database file, the file +++** used to store temporary tables, and any additional database files +++** created using ATTACH statements. Return a success code. If an +++** error occurs, write an error message into *pzErrMsg. +++** +++** After the database is initialized, the SQLITE_Initialized +++** bit is set in the flags field of the sqlite structure. An +++** attempt is made to initialize the database as soon as it +++** is opened. If that fails (perhaps because another process +++** has the sqlite_master table locked) than another attempt +++** is made the first time the database is accessed. +++*/ +++int sqliteInit(sqlite *db, char **pzErrMsg){ +++ int i, rc; +++ +++ if( db->init.busy ) return SQLITE_OK; +++ assert( (db->flags & SQLITE_Initialized)==0 ); +++ rc = SQLITE_OK; +++ db->init.busy = 1; +++ for(i=0; rc==SQLITE_OK && inDb; i++){ +++ if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue; +++ rc = sqliteInitOne(db, i, pzErrMsg); +++ if( rc ){ +++ sqliteResetInternalSchema(db, i); +++ } +++ } +++ +++ /* Once all the other databases have been initialised, load the schema +++ ** for the TEMP database. This is loaded last, as the TEMP database +++ ** schema may contain references to objects in other databases. +++ */ +++ if( rc==SQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){ +++ rc = sqliteInitOne(db, 1, pzErrMsg); +++ if( rc ){ +++ sqliteResetInternalSchema(db, 1); +++ } +++ } +++ +++ db->init.busy = 0; +++ if( rc==SQLITE_OK ){ +++ db->flags |= SQLITE_Initialized; +++ sqliteCommitInternalChanges(db); +++ } +++ +++ /* If the database is in formats 1 or 2, then upgrade it to +++ ** version 3. This will reconstruct all indices. If the +++ ** upgrade fails for any reason (ex: out of disk space, database +++ ** is read only, interrupt received, etc.) then fail the init. +++ */ +++ if( rc==SQLITE_OK && db->file_format<3 ){ +++ char *zErr = 0; +++ InitData initData; +++ int meta[SQLITE_N_BTREE_META]; +++ +++ db->magic = SQLITE_MAGIC_OPEN; +++ initData.db = db; +++ initData.pzErrMsg = &zErr; +++ db->file_format = 3; +++ rc = sqlite_exec(db, +++ "BEGIN; SELECT name FROM sqlite_master WHERE type='table';", +++ upgrade_3_callback, +++ &initData, +++ &zErr); +++ if( rc==SQLITE_OK ){ +++ sqliteBtreeGetMeta(db->aDb[0].pBt, meta); +++ meta[2] = 4; +++ sqliteBtreeUpdateMeta(db->aDb[0].pBt, meta); +++ sqlite_exec(db, "COMMIT", 0, 0, 0); +++ } +++ if( rc!=SQLITE_OK ){ +++ sqliteSetString(pzErrMsg, +++ "unable to upgrade database to the version 2.6 format", +++ zErr ? ": " : 0, zErr, (char*)0); +++ } +++ sqlite_freemem(zErr); +++ } +++ +++ if( rc!=SQLITE_OK ){ +++ db->flags &= ~SQLITE_Initialized; +++ } +++ return rc; +++} +++ +++/* +++** The version of the library +++*/ +++const char rcsid[] = "@(#) \044Id: SQLite version " SQLITE_VERSION " $"; +++const char sqlite_version[] = SQLITE_VERSION; +++ +++/* +++** Does the library expect data to be encoded as UTF-8 or iso8859? The +++** following global constant always lets us know. +++*/ +++#ifdef SQLITE_UTF8 +++const char sqlite_encoding[] = "UTF-8"; +++#else +++const char sqlite_encoding[] = "iso8859"; +++#endif +++ +++/* +++** Open a new SQLite database. Construct an "sqlite" structure to define +++** the state of this database and return a pointer to that structure. +++** +++** An attempt is made to initialize the in-memory data structures that +++** hold the database schema. But if this fails (because the schema file +++** is locked) then that step is deferred until the first call to +++** sqlite_exec(). +++*/ +++sqlite *sqlite_open(const char *zFilename, int mode, char **pzErrMsg){ +++ sqlite *db; +++ int rc, i; +++ +++ /* Allocate the sqlite data structure */ +++ db = sqliteMalloc( sizeof(sqlite) ); +++ if( pzErrMsg ) *pzErrMsg = 0; +++ if( db==0 ) goto no_mem_on_open; +++ db->onError = OE_Default; +++ db->priorNewRowid = 0; +++ db->magic = SQLITE_MAGIC_BUSY; +++ db->nDb = 2; +++ db->aDb = db->aDbStatic; +++ /* db->flags |= SQLITE_ShortColNames; */ +++ sqliteHashInit(&db->aFunc, SQLITE_HASH_STRING, 1); +++ for(i=0; inDb; i++){ +++ sqliteHashInit(&db->aDb[i].tblHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&db->aDb[i].idxHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&db->aDb[i].trigHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&db->aDb[i].aFKey, SQLITE_HASH_STRING, 1); +++ } +++ +++ /* Open the backend database driver */ +++ if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){ +++ db->temp_store = 2; +++ } +++ rc = sqliteBtreeFactory(db, zFilename, 0, MAX_PAGES, &db->aDb[0].pBt); +++ if( rc!=SQLITE_OK ){ +++ switch( rc ){ +++ default: { +++ sqliteSetString(pzErrMsg, "unable to open database: ", +++ zFilename, (char*)0); +++ } +++ } +++ sqliteFree(db); +++ sqliteStrRealloc(pzErrMsg); +++ return 0; +++ } +++ db->aDb[0].zName = "main"; +++ db->aDb[1].zName = "temp"; +++ +++ /* Attempt to read the schema */ +++ sqliteRegisterBuiltinFunctions(db); +++ rc = sqliteInit(db, pzErrMsg); +++ db->magic = SQLITE_MAGIC_OPEN; +++ if( sqlite_malloc_failed ){ +++ sqlite_close(db); +++ goto no_mem_on_open; +++ }else if( rc!=SQLITE_OK && rc!=SQLITE_BUSY ){ +++ sqlite_close(db); +++ sqliteStrRealloc(pzErrMsg); +++ return 0; +++ }else if( pzErrMsg ){ +++ sqliteFree(*pzErrMsg); +++ *pzErrMsg = 0; +++ } +++ +++ /* Return a pointer to the newly opened database structure */ +++ return db; +++ +++no_mem_on_open: +++ sqliteSetString(pzErrMsg, "out of memory", (char*)0); +++ sqliteStrRealloc(pzErrMsg); +++ return 0; +++} +++ +++/* +++** Return the ROWID of the most recent insert +++*/ +++int sqlite_last_insert_rowid(sqlite *db){ +++ return db->lastRowid; +++} +++ +++/* +++** Return the number of changes in the most recent call to sqlite_exec(). +++*/ +++int sqlite_changes(sqlite *db){ +++ return db->nChange; +++} +++ +++/* +++** Return the number of changes produced by the last INSERT, UPDATE, or +++** DELETE statement to complete execution. The count does not include +++** changes due to SQL statements executed in trigger programs that were +++** triggered by that statement +++*/ +++int sqlite_last_statement_changes(sqlite *db){ +++ return db->lsChange; +++} +++ +++/* +++** Close an existing SQLite database +++*/ +++void sqlite_close(sqlite *db){ +++ HashElem *i; +++ int j; +++ db->want_to_close = 1; +++ if( sqliteSafetyCheck(db) || sqliteSafetyOn(db) ){ +++ /* printf("DID NOT CLOSE\n"); fflush(stdout); */ +++ return; +++ } +++ db->magic = SQLITE_MAGIC_CLOSED; +++ for(j=0; jnDb; j++){ +++ struct Db *pDb = &db->aDb[j]; +++ if( pDb->pBt ){ +++ sqliteBtreeClose(pDb->pBt); +++ pDb->pBt = 0; +++ } +++ } +++ sqliteResetInternalSchema(db, 0); +++ assert( db->nDb<=2 ); +++ assert( db->aDb==db->aDbStatic ); +++ for(i=sqliteHashFirst(&db->aFunc); i; i=sqliteHashNext(i)){ +++ FuncDef *pFunc, *pNext; +++ for(pFunc = (FuncDef*)sqliteHashData(i); pFunc; pFunc=pNext){ +++ pNext = pFunc->pNext; +++ sqliteFree(pFunc); +++ } +++ } +++ sqliteHashClear(&db->aFunc); +++ sqliteFree(db); +++} +++ +++/* +++** Rollback all database files. +++*/ +++void sqliteRollbackAll(sqlite *db){ +++ int i; +++ for(i=0; inDb; i++){ +++ if( db->aDb[i].pBt ){ +++ sqliteBtreeRollback(db->aDb[i].pBt); +++ db->aDb[i].inTrans = 0; +++ } +++ } +++ sqliteResetInternalSchema(db, 0); +++ /* sqliteRollbackInternalChanges(db); */ +++} +++ +++/* +++** Execute SQL code. Return one of the SQLITE_ success/failure +++** codes. Also write an error message into memory obtained from +++** malloc() and make *pzErrMsg point to that message. +++** +++** If the SQL is a query, then for each row in the query result +++** the xCallback() function is called. pArg becomes the first +++** argument to xCallback(). If xCallback=NULL then no callback +++** is invoked, even for queries. +++*/ +++int sqlite_exec( +++ sqlite *db, /* The database on which the SQL executes */ +++ const char *zSql, /* The SQL to be executed */ +++ sqlite_callback xCallback, /* Invoke this callback routine */ +++ void *pArg, /* First argument to xCallback() */ +++ char **pzErrMsg /* Write error messages here */ +++){ +++ int rc = SQLITE_OK; +++ const char *zLeftover; +++ sqlite_vm *pVm; +++ int nRetry = 0; +++ int nChange = 0; +++ int nCallback; +++ +++ if( zSql==0 ) return SQLITE_OK; +++ while( rc==SQLITE_OK && zSql[0] ){ +++ pVm = 0; +++ rc = sqlite_compile(db, zSql, &zLeftover, &pVm, pzErrMsg); +++ if( rc!=SQLITE_OK ){ +++ assert( pVm==0 || sqlite_malloc_failed ); +++ return rc; +++ } +++ if( pVm==0 ){ +++ /* This happens if the zSql input contained only whitespace */ +++ break; +++ } +++ db->nChange += nChange; +++ nCallback = 0; +++ while(1){ +++ int nArg; +++ char **azArg, **azCol; +++ rc = sqlite_step(pVm, &nArg, (const char***)&azArg,(const char***)&azCol); +++ if( rc==SQLITE_ROW ){ +++ if( xCallback!=0 && xCallback(pArg, nArg, azArg, azCol) ){ +++ sqlite_finalize(pVm, 0); +++ return SQLITE_ABORT; +++ } +++ nCallback++; +++ }else{ +++ if( rc==SQLITE_DONE && nCallback==0 +++ && (db->flags & SQLITE_NullCallback)!=0 && xCallback!=0 ){ +++ xCallback(pArg, nArg, azArg, azCol); +++ } +++ rc = sqlite_finalize(pVm, pzErrMsg); +++ if( rc==SQLITE_SCHEMA && nRetry<2 ){ +++ nRetry++; +++ rc = SQLITE_OK; +++ break; +++ } +++ if( db->pVdbe==0 ){ +++ nChange = db->nChange; +++ } +++ nRetry = 0; +++ zSql = zLeftover; +++ while( isspace(zSql[0]) ) zSql++; +++ break; +++ } +++ } +++ } +++ return rc; +++} +++ +++ +++/* +++** Compile a single statement of SQL into a virtual machine. Return one +++** of the SQLITE_ success/failure codes. Also write an error message into +++** memory obtained from malloc() and make *pzErrMsg point to that message. +++*/ +++int sqlite_compile( +++ sqlite *db, /* The database on which the SQL executes */ +++ const char *zSql, /* The SQL to be executed */ +++ const char **pzTail, /* OUT: Next statement after the first */ +++ sqlite_vm **ppVm, /* OUT: The virtual machine */ +++ char **pzErrMsg /* OUT: Write error messages here */ +++){ +++ Parse sParse; +++ +++ if( pzErrMsg ) *pzErrMsg = 0; +++ if( sqliteSafetyOn(db) ) goto exec_misuse; +++ if( !db->init.busy ){ +++ if( (db->flags & SQLITE_Initialized)==0 ){ +++ int rc, cnt = 1; +++ while( (rc = sqliteInit(db, pzErrMsg))==SQLITE_BUSY +++ && db->xBusyCallback +++ && db->xBusyCallback(db->pBusyArg, "", cnt++)!=0 ){} +++ if( rc!=SQLITE_OK ){ +++ sqliteStrRealloc(pzErrMsg); +++ sqliteSafetyOff(db); +++ return rc; +++ } +++ if( pzErrMsg ){ +++ sqliteFree(*pzErrMsg); +++ *pzErrMsg = 0; +++ } +++ } +++ if( db->file_format<3 ){ +++ sqliteSafetyOff(db); +++ sqliteSetString(pzErrMsg, "obsolete database file format", (char*)0); +++ return SQLITE_ERROR; +++ } +++ } +++ assert( (db->flags & SQLITE_Initialized)!=0 || db->init.busy ); +++ if( db->pVdbe==0 ){ db->nChange = 0; } +++ memset(&sParse, 0, sizeof(sParse)); +++ sParse.db = db; +++ sqliteRunParser(&sParse, zSql, pzErrMsg); +++ if( db->xTrace && !db->init.busy ){ +++ /* Trace only the statment that was compiled. +++ ** Make a copy of that part of the SQL string since zSQL is const +++ ** and we must pass a zero terminated string to the trace function +++ ** The copy is unnecessary if the tail pointer is pointing at the +++ ** beginnig or end of the SQL string. +++ */ +++ if( sParse.zTail && sParse.zTail!=zSql && *sParse.zTail ){ +++ char *tmpSql = sqliteStrNDup(zSql, sParse.zTail - zSql); +++ if( tmpSql ){ +++ db->xTrace(db->pTraceArg, tmpSql); +++ free(tmpSql); +++ }else{ +++ /* If a memory error occurred during the copy, +++ ** trace entire SQL string and fall through to the +++ ** sqlite_malloc_failed test to report the error. +++ */ +++ db->xTrace(db->pTraceArg, zSql); +++ } +++ }else{ +++ db->xTrace(db->pTraceArg, zSql); +++ } +++ } +++ if( sqlite_malloc_failed ){ +++ sqliteSetString(pzErrMsg, "out of memory", (char*)0); +++ sParse.rc = SQLITE_NOMEM; +++ sqliteRollbackAll(db); +++ sqliteResetInternalSchema(db, 0); +++ db->flags &= ~SQLITE_InTrans; +++ } +++ if( sParse.rc==SQLITE_DONE ) sParse.rc = SQLITE_OK; +++ if( sParse.rc!=SQLITE_OK && pzErrMsg && *pzErrMsg==0 ){ +++ sqliteSetString(pzErrMsg, sqlite_error_string(sParse.rc), (char*)0); +++ } +++ sqliteStrRealloc(pzErrMsg); +++ if( sParse.rc==SQLITE_SCHEMA ){ +++ sqliteResetInternalSchema(db, 0); +++ } +++ assert( ppVm ); +++ *ppVm = (sqlite_vm*)sParse.pVdbe; +++ if( pzTail ) *pzTail = sParse.zTail; +++ if( sqliteSafetyOff(db) ) goto exec_misuse; +++ return sParse.rc; +++ +++exec_misuse: +++ if( pzErrMsg ){ +++ *pzErrMsg = 0; +++ sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0); +++ sqliteStrRealloc(pzErrMsg); +++ } +++ return SQLITE_MISUSE; +++} +++ +++ +++/* +++** The following routine destroys a virtual machine that is created by +++** the sqlite_compile() routine. +++** +++** The integer returned is an SQLITE_ success/failure code that describes +++** the result of executing the virtual machine. An error message is +++** written into memory obtained from malloc and *pzErrMsg is made to +++** point to that error if pzErrMsg is not NULL. The calling routine +++** should use sqlite_freemem() to delete the message when it has finished +++** with it. +++*/ +++int sqlite_finalize( +++ sqlite_vm *pVm, /* The virtual machine to be destroyed */ +++ char **pzErrMsg /* OUT: Write error messages here */ +++){ +++ int rc = sqliteVdbeFinalize((Vdbe*)pVm, pzErrMsg); +++ sqliteStrRealloc(pzErrMsg); +++ return rc; +++} +++ +++/* +++** Terminate the current execution of a virtual machine then +++** reset the virtual machine back to its starting state so that it +++** can be reused. Any error message resulting from the prior execution +++** is written into *pzErrMsg. A success code from the prior execution +++** is returned. +++*/ +++int sqlite_reset( +++ sqlite_vm *pVm, /* The virtual machine to be destroyed */ +++ char **pzErrMsg /* OUT: Write error messages here */ +++){ +++ int rc = sqliteVdbeReset((Vdbe*)pVm, pzErrMsg); +++ sqliteVdbeMakeReady((Vdbe*)pVm, -1, 0); +++ sqliteStrRealloc(pzErrMsg); +++ return rc; +++} +++ +++/* +++** Return a static string that describes the kind of error specified in the +++** argument. +++*/ +++const char *sqlite_error_string(int rc){ +++ const char *z; +++ switch( rc ){ +++ case SQLITE_OK: z = "not an error"; break; +++ case SQLITE_ERROR: z = "SQL logic error or missing database"; break; +++ case SQLITE_INTERNAL: z = "internal SQLite implementation flaw"; break; +++ case SQLITE_PERM: z = "access permission denied"; break; +++ case SQLITE_ABORT: z = "callback requested query abort"; break; +++ case SQLITE_BUSY: z = "database is locked"; break; +++ case SQLITE_LOCKED: z = "database table is locked"; break; +++ case SQLITE_NOMEM: z = "out of memory"; break; +++ case SQLITE_READONLY: z = "attempt to write a readonly database"; break; +++ case SQLITE_INTERRUPT: z = "interrupted"; break; +++ case SQLITE_IOERR: z = "disk I/O error"; break; +++ case SQLITE_CORRUPT: z = "database disk image is malformed"; break; +++ case SQLITE_NOTFOUND: z = "table or record not found"; break; +++ case SQLITE_FULL: z = "database is full"; break; +++ case SQLITE_CANTOPEN: z = "unable to open database file"; break; +++ case SQLITE_PROTOCOL: z = "database locking protocol failure"; break; +++ case SQLITE_EMPTY: z = "table contains no data"; break; +++ case SQLITE_SCHEMA: z = "database schema has changed"; break; +++ case SQLITE_TOOBIG: z = "too much data for one table row"; break; +++ case SQLITE_CONSTRAINT: z = "constraint failed"; break; +++ case SQLITE_MISMATCH: z = "datatype mismatch"; break; +++ case SQLITE_MISUSE: z = "library routine called out of sequence";break; +++ case SQLITE_NOLFS: z = "kernel lacks large file support"; break; +++ case SQLITE_AUTH: z = "authorization denied"; break; +++ case SQLITE_FORMAT: z = "auxiliary database format error"; break; +++ case SQLITE_RANGE: z = "bind index out of range"; break; +++ case SQLITE_NOTADB: z = "file is encrypted or is not a database";break; +++ default: z = "unknown error"; break; +++ } +++ return z; +++} +++ +++/* +++** This routine implements a busy callback that sleeps and tries +++** again until a timeout value is reached. The timeout value is +++** an integer number of milliseconds passed in as the first +++** argument. +++*/ +++static int sqliteDefaultBusyCallback( +++ void *Timeout, /* Maximum amount of time to wait */ +++ const char *NotUsed, /* The name of the table that is busy */ +++ int count /* Number of times table has been busy */ +++){ +++#if SQLITE_MIN_SLEEP_MS==1 +++ static const char delays[] = +++ { 1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 50, 100}; +++ static const short int totals[] = +++ { 0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228, 287}; +++# define NDELAY (sizeof(delays)/sizeof(delays[0])) +++ int timeout = (int)(long)Timeout; +++ int delay, prior; +++ +++ if( count <= NDELAY ){ +++ delay = delays[count-1]; +++ prior = totals[count-1]; +++ }else{ +++ delay = delays[NDELAY-1]; +++ prior = totals[NDELAY-1] + delay*(count-NDELAY-1); +++ } +++ if( prior + delay > timeout ){ +++ delay = timeout - prior; +++ if( delay<=0 ) return 0; +++ } +++ sqliteOsSleep(delay); +++ return 1; +++#else +++ int timeout = (int)(long)Timeout; +++ if( (count+1)*1000 > timeout ){ +++ return 0; +++ } +++ sqliteOsSleep(1000); +++ return 1; +++#endif +++} +++ +++/* +++** This routine sets the busy callback for an Sqlite database to the +++** given callback function with the given argument. +++*/ +++void sqlite_busy_handler( +++ sqlite *db, +++ int (*xBusy)(void*,const char*,int), +++ void *pArg +++){ +++ db->xBusyCallback = xBusy; +++ db->pBusyArg = pArg; +++} +++ +++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +++/* +++** This routine sets the progress callback for an Sqlite database to the +++** given callback function with the given argument. The progress callback will +++** be invoked every nOps opcodes. +++*/ +++void sqlite_progress_handler( +++ sqlite *db, +++ int nOps, +++ int (*xProgress)(void*), +++ void *pArg +++){ +++ if( nOps>0 ){ +++ db->xProgress = xProgress; +++ db->nProgressOps = nOps; +++ db->pProgressArg = pArg; +++ }else{ +++ db->xProgress = 0; +++ db->nProgressOps = 0; +++ db->pProgressArg = 0; +++ } +++} +++#endif +++ +++ +++/* +++** This routine installs a default busy handler that waits for the +++** specified number of milliseconds before returning 0. +++*/ +++void sqlite_busy_timeout(sqlite *db, int ms){ +++ if( ms>0 ){ +++ sqlite_busy_handler(db, sqliteDefaultBusyCallback, (void*)(long)ms); +++ }else{ +++ sqlite_busy_handler(db, 0, 0); +++ } +++} +++ +++/* +++** Cause any pending operation to stop at its earliest opportunity. +++*/ +++void sqlite_interrupt(sqlite *db){ +++ db->flags |= SQLITE_Interrupt; +++} +++ +++/* +++** Windows systems should call this routine to free memory that +++** is returned in the in the errmsg parameter of sqlite_open() when +++** SQLite is a DLL. For some reason, it does not work to call free() +++** directly. +++** +++** Note that we need to call free() not sqliteFree() here, since every +++** string that is exported from SQLite should have already passed through +++** sqliteStrRealloc(). +++*/ +++void sqlite_freemem(void *p){ free(p); } +++ +++/* +++** Windows systems need functions to call to return the sqlite_version +++** and sqlite_encoding strings since they are unable to access constants +++** within DLLs. +++*/ +++const char *sqlite_libversion(void){ return sqlite_version; } +++const char *sqlite_libencoding(void){ return sqlite_encoding; } +++ +++/* +++** Create new user-defined functions. The sqlite_create_function() +++** routine creates a regular function and sqlite_create_aggregate() +++** creates an aggregate function. +++** +++** Passing a NULL xFunc argument or NULL xStep and xFinalize arguments +++** disables the function. Calling sqlite_create_function() with the +++** same name and number of arguments as a prior call to +++** sqlite_create_aggregate() disables the prior call to +++** sqlite_create_aggregate(), and vice versa. +++** +++** If nArg is -1 it means that this function will accept any number +++** of arguments, including 0. The maximum allowed value of nArg is 127. +++*/ +++int sqlite_create_function( +++ sqlite *db, /* Add the function to this database connection */ +++ const char *zName, /* Name of the function to add */ +++ int nArg, /* Number of arguments */ +++ void (*xFunc)(sqlite_func*,int,const char**), /* The implementation */ +++ void *pUserData /* User data */ +++){ +++ FuncDef *p; +++ int nName; +++ if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1; +++ if( nArg<-1 || nArg>127 ) return 1; +++ nName = strlen(zName); +++ if( nName>255 ) return 1; +++ p = sqliteFindFunction(db, zName, nName, nArg, 1); +++ if( p==0 ) return 1; +++ p->xFunc = xFunc; +++ p->xStep = 0; +++ p->xFinalize = 0; +++ p->pUserData = pUserData; +++ return 0; +++} +++int sqlite_create_aggregate( +++ sqlite *db, /* Add the function to this database connection */ +++ const char *zName, /* Name of the function to add */ +++ int nArg, /* Number of arguments */ +++ void (*xStep)(sqlite_func*,int,const char**), /* The step function */ +++ void (*xFinalize)(sqlite_func*), /* The finalizer */ +++ void *pUserData /* User data */ +++){ +++ FuncDef *p; +++ int nName; +++ if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1; +++ if( nArg<-1 || nArg>127 ) return 1; +++ nName = strlen(zName); +++ if( nName>255 ) return 1; +++ p = sqliteFindFunction(db, zName, nName, nArg, 1); +++ if( p==0 ) return 1; +++ p->xFunc = 0; +++ p->xStep = xStep; +++ p->xFinalize = xFinalize; +++ p->pUserData = pUserData; +++ return 0; +++} +++ +++/* +++** Change the datatype for all functions with a given name. See the +++** header comment for the prototype of this function in sqlite.h for +++** additional information. +++*/ +++int sqlite_function_type(sqlite *db, const char *zName, int dataType){ +++ FuncDef *p = (FuncDef*)sqliteHashFind(&db->aFunc, zName, strlen(zName)); +++ while( p ){ +++ p->dataType = dataType; +++ p = p->pNext; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Register a trace function. The pArg from the previously registered trace +++** is returned. +++** +++** A NULL trace function means that no tracing is executes. A non-NULL +++** trace is a pointer to a function that is invoked at the start of each +++** sqlite_exec(). +++*/ +++void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){ +++ void *pOld = db->pTraceArg; +++ db->xTrace = xTrace; +++ db->pTraceArg = pArg; +++ return pOld; +++} +++ +++/*** EXPERIMENTAL *** +++** +++** Register a function to be invoked when a transaction comments. +++** If either function returns non-zero, then the commit becomes a +++** rollback. +++*/ +++void *sqlite_commit_hook( +++ sqlite *db, /* Attach the hook to this database */ +++ int (*xCallback)(void*), /* Function to invoke on each commit */ +++ void *pArg /* Argument to the function */ +++){ +++ void *pOld = db->pCommitArg; +++ db->xCommitCallback = xCallback; +++ db->pCommitArg = pArg; +++ return pOld; +++} +++ +++ +++/* +++** This routine is called to create a connection to a database BTree +++** driver. If zFilename is the name of a file, then that file is +++** opened and used. If zFilename is the magic name ":memory:" then +++** the database is stored in memory (and is thus forgotten as soon as +++** the connection is closed.) If zFilename is NULL then the database +++** is for temporary use only and is deleted as soon as the connection +++** is closed. +++** +++** A temporary database can be either a disk file (that is automatically +++** deleted when the file is closed) or a set of red-black trees held in memory, +++** depending on the values of the TEMP_STORE compile-time macro and the +++** db->temp_store variable, according to the following chart: +++** +++** TEMP_STORE db->temp_store Location of temporary database +++** ---------- -------------- ------------------------------ +++** 0 any file +++** 1 1 file +++** 1 2 memory +++** 1 0 file +++** 2 1 file +++** 2 2 memory +++** 2 0 memory +++** 3 any memory +++*/ +++int sqliteBtreeFactory( +++ const sqlite *db, /* Main database when opening aux otherwise 0 */ +++ const char *zFilename, /* Name of the file containing the BTree database */ +++ int omitJournal, /* if TRUE then do not journal this file */ +++ int nCache, /* How many pages in the page cache */ +++ Btree **ppBtree){ /* Pointer to new Btree object written here */ +++ +++ assert( ppBtree != 0); +++ +++#ifndef SQLITE_OMIT_INMEMORYDB +++ if( zFilename==0 ){ +++ if (TEMP_STORE == 0) { +++ /* Always use file based temporary DB */ +++ return sqliteBtreeOpen(0, omitJournal, nCache, ppBtree); +++ } else if (TEMP_STORE == 1 || TEMP_STORE == 2) { +++ /* Switch depending on compile-time and/or runtime settings. */ +++ int location = db->temp_store==0 ? TEMP_STORE : db->temp_store; +++ +++ if (location == 1) { +++ return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree); +++ } else { +++ return sqliteRbtreeOpen(0, 0, 0, ppBtree); +++ } +++ } else { +++ /* Always use in-core DB */ +++ return sqliteRbtreeOpen(0, 0, 0, ppBtree); +++ } +++ }else if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){ +++ return sqliteRbtreeOpen(0, 0, 0, ppBtree); +++ }else +++#endif +++ { +++ return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree); +++ } +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/opcodes.c ++@@ -0,0 +1,140 @@ +++/* Automatically generated file. Do not edit */ +++char *sqliteOpcodeNames[] = { "???", +++ "Goto", +++ "Gosub", +++ "Return", +++ "Halt", +++ "Integer", +++ "String", +++ "Variable", +++ "Pop", +++ "Dup", +++ "Pull", +++ "Push", +++ "ColumnName", +++ "Callback", +++ "Concat", +++ "Add", +++ "Subtract", +++ "Multiply", +++ "Divide", +++ "Remainder", +++ "Function", +++ "BitAnd", +++ "BitOr", +++ "ShiftLeft", +++ "ShiftRight", +++ "AddImm", +++ "ForceInt", +++ "MustBeInt", +++ "Eq", +++ "Ne", +++ "Lt", +++ "Le", +++ "Gt", +++ "Ge", +++ "StrEq", +++ "StrNe", +++ "StrLt", +++ "StrLe", +++ "StrGt", +++ "StrGe", +++ "And", +++ "Or", +++ "Negative", +++ "AbsValue", +++ "Not", +++ "BitNot", +++ "Noop", +++ "If", +++ "IfNot", +++ "IsNull", +++ "NotNull", +++ "MakeRecord", +++ "MakeIdxKey", +++ "MakeKey", +++ "IncrKey", +++ "Checkpoint", +++ "Transaction", +++ "Commit", +++ "Rollback", +++ "ReadCookie", +++ "SetCookie", +++ "VerifyCookie", +++ "OpenRead", +++ "OpenWrite", +++ "OpenTemp", +++ "OpenPseudo", +++ "Close", +++ "MoveLt", +++ "MoveTo", +++ "Distinct", +++ "NotFound", +++ "Found", +++ "IsUnique", +++ "NotExists", +++ "NewRecno", +++ "PutIntKey", +++ "PutStrKey", +++ "Delete", +++ "SetCounts", +++ "KeyAsData", +++ "RowKey", +++ "RowData", +++ "Column", +++ "Recno", +++ "FullKey", +++ "NullRow", +++ "Last", +++ "Rewind", +++ "Prev", +++ "Next", +++ "IdxPut", +++ "IdxDelete", +++ "IdxRecno", +++ "IdxLT", +++ "IdxGT", +++ "IdxGE", +++ "IdxIsNull", +++ "Destroy", +++ "Clear", +++ "CreateIndex", +++ "CreateTable", +++ "IntegrityCk", +++ "ListWrite", +++ "ListRewind", +++ "ListRead", +++ "ListReset", +++ "ListPush", +++ "ListPop", +++ "ContextPush", +++ "ContextPop", +++ "SortPut", +++ "SortMakeRec", +++ "SortMakeKey", +++ "Sort", +++ "SortNext", +++ "SortCallback", +++ "SortReset", +++ "FileOpen", +++ "FileRead", +++ "FileColumn", +++ "MemStore", +++ "MemLoad", +++ "MemIncr", +++ "AggReset", +++ "AggInit", +++ "AggFunc", +++ "AggFocus", +++ "AggSet", +++ "AggGet", +++ "AggNext", +++ "SetInsert", +++ "SetFound", +++ "SetNotFound", +++ "SetFirst", +++ "SetNext", +++ "Vacuum", +++ "StackDepth", +++ "StackReset", +++}; ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/opcodes.h ++@@ -0,0 +1,138 @@ +++/* Automatically generated file. Do not edit */ +++#define OP_Goto 1 +++#define OP_Gosub 2 +++#define OP_Return 3 +++#define OP_Halt 4 +++#define OP_Integer 5 +++#define OP_String 6 +++#define OP_Variable 7 +++#define OP_Pop 8 +++#define OP_Dup 9 +++#define OP_Pull 10 +++#define OP_Push 11 +++#define OP_ColumnName 12 +++#define OP_Callback 13 +++#define OP_Concat 14 +++#define OP_Add 15 +++#define OP_Subtract 16 +++#define OP_Multiply 17 +++#define OP_Divide 18 +++#define OP_Remainder 19 +++#define OP_Function 20 +++#define OP_BitAnd 21 +++#define OP_BitOr 22 +++#define OP_ShiftLeft 23 +++#define OP_ShiftRight 24 +++#define OP_AddImm 25 +++#define OP_ForceInt 26 +++#define OP_MustBeInt 27 +++#define OP_Eq 28 +++#define OP_Ne 29 +++#define OP_Lt 30 +++#define OP_Le 31 +++#define OP_Gt 32 +++#define OP_Ge 33 +++#define OP_StrEq 34 +++#define OP_StrNe 35 +++#define OP_StrLt 36 +++#define OP_StrLe 37 +++#define OP_StrGt 38 +++#define OP_StrGe 39 +++#define OP_And 40 +++#define OP_Or 41 +++#define OP_Negative 42 +++#define OP_AbsValue 43 +++#define OP_Not 44 +++#define OP_BitNot 45 +++#define OP_Noop 46 +++#define OP_If 47 +++#define OP_IfNot 48 +++#define OP_IsNull 49 +++#define OP_NotNull 50 +++#define OP_MakeRecord 51 +++#define OP_MakeIdxKey 52 +++#define OP_MakeKey 53 +++#define OP_IncrKey 54 +++#define OP_Checkpoint 55 +++#define OP_Transaction 56 +++#define OP_Commit 57 +++#define OP_Rollback 58 +++#define OP_ReadCookie 59 +++#define OP_SetCookie 60 +++#define OP_VerifyCookie 61 +++#define OP_OpenRead 62 +++#define OP_OpenWrite 63 +++#define OP_OpenTemp 64 +++#define OP_OpenPseudo 65 +++#define OP_Close 66 +++#define OP_MoveLt 67 +++#define OP_MoveTo 68 +++#define OP_Distinct 69 +++#define OP_NotFound 70 +++#define OP_Found 71 +++#define OP_IsUnique 72 +++#define OP_NotExists 73 +++#define OP_NewRecno 74 +++#define OP_PutIntKey 75 +++#define OP_PutStrKey 76 +++#define OP_Delete 77 +++#define OP_SetCounts 78 +++#define OP_KeyAsData 79 +++#define OP_RowKey 80 +++#define OP_RowData 81 +++#define OP_Column 82 +++#define OP_Recno 83 +++#define OP_FullKey 84 +++#define OP_NullRow 85 +++#define OP_Last 86 +++#define OP_Rewind 87 +++#define OP_Prev 88 +++#define OP_Next 89 +++#define OP_IdxPut 90 +++#define OP_IdxDelete 91 +++#define OP_IdxRecno 92 +++#define OP_IdxLT 93 +++#define OP_IdxGT 94 +++#define OP_IdxGE 95 +++#define OP_IdxIsNull 96 +++#define OP_Destroy 97 +++#define OP_Clear 98 +++#define OP_CreateIndex 99 +++#define OP_CreateTable 100 +++#define OP_IntegrityCk 101 +++#define OP_ListWrite 102 +++#define OP_ListRewind 103 +++#define OP_ListRead 104 +++#define OP_ListReset 105 +++#define OP_ListPush 106 +++#define OP_ListPop 107 +++#define OP_ContextPush 108 +++#define OP_ContextPop 109 +++#define OP_SortPut 110 +++#define OP_SortMakeRec 111 +++#define OP_SortMakeKey 112 +++#define OP_Sort 113 +++#define OP_SortNext 114 +++#define OP_SortCallback 115 +++#define OP_SortReset 116 +++#define OP_FileOpen 117 +++#define OP_FileRead 118 +++#define OP_FileColumn 119 +++#define OP_MemStore 120 +++#define OP_MemLoad 121 +++#define OP_MemIncr 122 +++#define OP_AggReset 123 +++#define OP_AggInit 124 +++#define OP_AggFunc 125 +++#define OP_AggFocus 126 +++#define OP_AggSet 127 +++#define OP_AggGet 128 +++#define OP_AggNext 129 +++#define OP_SetInsert 130 +++#define OP_SetFound 131 +++#define OP_SetNotFound 132 +++#define OP_SetFirst 133 +++#define OP_SetNext 134 +++#define OP_Vacuum 135 +++#define OP_StackDepth 136 +++#define OP_StackReset 137 ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/os.c ++@@ -0,0 +1,1850 @@ +++/* +++** 2001 September 16 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++****************************************************************************** +++** +++** This file contains code that is specific to particular operating +++** systems. The purpose of this file is to provide a uniform abstraction +++** on which the rest of SQLite can operate. +++*/ +++#include "os.h" /* Must be first to enable large file support */ +++#include "sqliteInt.h" +++ +++#if OS_UNIX +++# include +++# include +++# include +++# ifndef O_LARGEFILE +++# define O_LARGEFILE 0 +++# endif +++# ifdef SQLITE_DISABLE_LFS +++# undef O_LARGEFILE +++# define O_LARGEFILE 0 +++# endif +++# ifndef O_NOFOLLOW +++# define O_NOFOLLOW 0 +++# endif +++# ifndef O_BINARY +++# define O_BINARY 0 +++# endif +++#endif +++ +++ +++#if OS_WIN +++# include +++#endif +++ +++#if OS_MAC +++# include +++# include +++# include +++# include +++# include +++# include +++# include +++#endif +++ +++/* +++** The DJGPP compiler environment looks mostly like Unix, but it +++** lacks the fcntl() system call. So redefine fcntl() to be something +++** that always succeeds. This means that locking does not occur under +++** DJGPP. But its DOS - what did you expect? +++*/ +++#ifdef __DJGPP__ +++# define fcntl(A,B,C) 0 +++#endif +++ +++/* +++** Macros used to determine whether or not to use threads. The +++** SQLITE_UNIX_THREADS macro is defined if we are synchronizing for +++** Posix threads and SQLITE_W32_THREADS is defined if we are +++** synchronizing using Win32 threads. +++*/ +++#if OS_UNIX && defined(THREADSAFE) && THREADSAFE +++# include +++# define SQLITE_UNIX_THREADS 1 +++#endif +++#if OS_WIN && defined(THREADSAFE) && THREADSAFE +++# define SQLITE_W32_THREADS 1 +++#endif +++#if OS_MAC && defined(THREADSAFE) && THREADSAFE +++# include +++# define SQLITE_MACOS_MULTITASKING 1 +++#endif +++ +++/* +++** Macros for performance tracing. Normally turned off +++*/ +++#if 0 +++static int last_page = 0; +++__inline__ unsigned long long int hwtime(void){ +++ unsigned long long int x; +++ __asm__("rdtsc\n\t" +++ "mov %%edx, %%ecx\n\t" +++ :"=A" (x)); +++ return x; +++} +++static unsigned long long int g_start; +++static unsigned int elapse; +++#define TIMER_START g_start=hwtime() +++#define TIMER_END elapse=hwtime()-g_start +++#define SEEK(X) last_page=(X) +++#define TRACE1(X) fprintf(stderr,X) +++#define TRACE2(X,Y) fprintf(stderr,X,Y) +++#define TRACE3(X,Y,Z) fprintf(stderr,X,Y,Z) +++#define TRACE4(X,Y,Z,A) fprintf(stderr,X,Y,Z,A) +++#define TRACE5(X,Y,Z,A,B) fprintf(stderr,X,Y,Z,A,B) +++#else +++#define TIMER_START +++#define TIMER_END +++#define SEEK(X) +++#define TRACE1(X) +++#define TRACE2(X,Y) +++#define TRACE3(X,Y,Z) +++#define TRACE4(X,Y,Z,A) +++#define TRACE5(X,Y,Z,A,B) +++#endif +++ +++ +++#if OS_UNIX +++/* +++** Here is the dirt on POSIX advisory locks: ANSI STD 1003.1 (1996) +++** section 6.5.2.2 lines 483 through 490 specify that when a process +++** sets or clears a lock, that operation overrides any prior locks set +++** by the same process. It does not explicitly say so, but this implies +++** that it overrides locks set by the same process using a different +++** file descriptor. Consider this test case: +++** +++** int fd1 = open("./file1", O_RDWR|O_CREAT, 0644); +++** int fd2 = open("./file2", O_RDWR|O_CREAT, 0644); +++** +++** Suppose ./file1 and ./file2 are really the same file (because +++** one is a hard or symbolic link to the other) then if you set +++** an exclusive lock on fd1, then try to get an exclusive lock +++** on fd2, it works. I would have expected the second lock to +++** fail since there was already a lock on the file due to fd1. +++** But not so. Since both locks came from the same process, the +++** second overrides the first, even though they were on different +++** file descriptors opened on different file names. +++** +++** Bummer. If you ask me, this is broken. Badly broken. It means +++** that we cannot use POSIX locks to synchronize file access among +++** competing threads of the same process. POSIX locks will work fine +++** to synchronize access for threads in separate processes, but not +++** threads within the same process. +++** +++** To work around the problem, SQLite has to manage file locks internally +++** on its own. Whenever a new database is opened, we have to find the +++** specific inode of the database file (the inode is determined by the +++** st_dev and st_ino fields of the stat structure that fstat() fills in) +++** and check for locks already existing on that inode. When locks are +++** created or removed, we have to look at our own internal record of the +++** locks to see if another thread has previously set a lock on that same +++** inode. +++** +++** The OsFile structure for POSIX is no longer just an integer file +++** descriptor. It is now a structure that holds the integer file +++** descriptor and a pointer to a structure that describes the internal +++** locks on the corresponding inode. There is one locking structure +++** per inode, so if the same inode is opened twice, both OsFile structures +++** point to the same locking structure. The locking structure keeps +++** a reference count (so we will know when to delete it) and a "cnt" +++** field that tells us its internal lock status. cnt==0 means the +++** file is unlocked. cnt==-1 means the file has an exclusive lock. +++** cnt>0 means there are cnt shared locks on the file. +++** +++** Any attempt to lock or unlock a file first checks the locking +++** structure. The fcntl() system call is only invoked to set a +++** POSIX lock if the internal lock structure transitions between +++** a locked and an unlocked state. +++** +++** 2004-Jan-11: +++** More recent discoveries about POSIX advisory locks. (The more +++** I discover, the more I realize the a POSIX advisory locks are +++** an abomination.) +++** +++** If you close a file descriptor that points to a file that has locks, +++** all locks on that file that are owned by the current process are +++** released. To work around this problem, each OsFile structure contains +++** a pointer to an openCnt structure. There is one openCnt structure +++** per open inode, which means that multiple OsFiles can point to a single +++** openCnt. When an attempt is made to close an OsFile, if there are +++** other OsFiles open on the same inode that are holding locks, the call +++** to close() the file descriptor is deferred until all of the locks clear. +++** The openCnt structure keeps a list of file descriptors that need to +++** be closed and that list is walked (and cleared) when the last lock +++** clears. +++** +++** First, under Linux threads, because each thread has a separate +++** process ID, lock operations in one thread do not override locks +++** to the same file in other threads. Linux threads behave like +++** separate processes in this respect. But, if you close a file +++** descriptor in linux threads, all locks are cleared, even locks +++** on other threads and even though the other threads have different +++** process IDs. Linux threads is inconsistent in this respect. +++** (I'm beginning to think that linux threads is an abomination too.) +++** The consequence of this all is that the hash table for the lockInfo +++** structure has to include the process id as part of its key because +++** locks in different threads are treated as distinct. But the +++** openCnt structure should not include the process id in its +++** key because close() clears lock on all threads, not just the current +++** thread. Were it not for this goofiness in linux threads, we could +++** combine the lockInfo and openCnt structures into a single structure. +++*/ +++ +++/* +++** An instance of the following structure serves as the key used +++** to locate a particular lockInfo structure given its inode. Note +++** that we have to include the process ID as part of the key. On some +++** threading implementations (ex: linux), each thread has a separate +++** process ID. +++*/ +++struct lockKey { +++ dev_t dev; /* Device number */ +++ ino_t ino; /* Inode number */ +++ pid_t pid; /* Process ID */ +++}; +++ +++/* +++** An instance of the following structure is allocated for each open +++** inode on each thread with a different process ID. (Threads have +++** different process IDs on linux, but not on most other unixes.) +++** +++** A single inode can have multiple file descriptors, so each OsFile +++** structure contains a pointer to an instance of this object and this +++** object keeps a count of the number of OsFiles pointing to it. +++*/ +++struct lockInfo { +++ struct lockKey key; /* The lookup key */ +++ int cnt; /* 0: unlocked. -1: write lock. 1...: read lock. */ +++ int nRef; /* Number of pointers to this structure */ +++}; +++ +++/* +++** An instance of the following structure serves as the key used +++** to locate a particular openCnt structure given its inode. This +++** is the same as the lockKey except that the process ID is omitted. +++*/ +++struct openKey { +++ dev_t dev; /* Device number */ +++ ino_t ino; /* Inode number */ +++}; +++ +++/* +++** An instance of the following structure is allocated for each open +++** inode. This structure keeps track of the number of locks on that +++** inode. If a close is attempted against an inode that is holding +++** locks, the close is deferred until all locks clear by adding the +++** file descriptor to be closed to the pending list. +++*/ +++struct openCnt { +++ struct openKey key; /* The lookup key */ +++ int nRef; /* Number of pointers to this structure */ +++ int nLock; /* Number of outstanding locks */ +++ int nPending; /* Number of pending close() operations */ +++ int *aPending; /* Malloced space holding fd's awaiting a close() */ +++}; +++ +++/* +++** These hash table maps inodes and process IDs into lockInfo and openCnt +++** structures. Access to these hash tables must be protected by a mutex. +++*/ +++static Hash lockHash = { SQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; +++static Hash openHash = { SQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; +++ +++/* +++** Release a lockInfo structure previously allocated by findLockInfo(). +++*/ +++static void releaseLockInfo(struct lockInfo *pLock){ +++ pLock->nRef--; +++ if( pLock->nRef==0 ){ +++ sqliteHashInsert(&lockHash, &pLock->key, sizeof(pLock->key), 0); +++ sqliteFree(pLock); +++ } +++} +++ +++/* +++** Release a openCnt structure previously allocated by findLockInfo(). +++*/ +++static void releaseOpenCnt(struct openCnt *pOpen){ +++ pOpen->nRef--; +++ if( pOpen->nRef==0 ){ +++ sqliteHashInsert(&openHash, &pOpen->key, sizeof(pOpen->key), 0); +++ sqliteFree(pOpen->aPending); +++ sqliteFree(pOpen); +++ } +++} +++ +++/* +++** Given a file descriptor, locate lockInfo and openCnt structures that +++** describes that file descriptor. Create a new ones if necessary. The +++** return values might be unset if an error occurs. +++** +++** Return the number of errors. +++*/ +++int findLockInfo( +++ int fd, /* The file descriptor used in the key */ +++ struct lockInfo **ppLock, /* Return the lockInfo structure here */ +++ struct openCnt **ppOpen /* Return the openCnt structure here */ +++){ +++ int rc; +++ struct lockKey key1; +++ struct openKey key2; +++ struct stat statbuf; +++ struct lockInfo *pLock; +++ struct openCnt *pOpen; +++ rc = fstat(fd, &statbuf); +++ if( rc!=0 ) return 1; +++ memset(&key1, 0, sizeof(key1)); +++ key1.dev = statbuf.st_dev; +++ key1.ino = statbuf.st_ino; +++ key1.pid = getpid(); +++ memset(&key2, 0, sizeof(key2)); +++ key2.dev = statbuf.st_dev; +++ key2.ino = statbuf.st_ino; +++ pLock = (struct lockInfo*)sqliteHashFind(&lockHash, &key1, sizeof(key1)); +++ if( pLock==0 ){ +++ struct lockInfo *pOld; +++ pLock = sqliteMallocRaw( sizeof(*pLock) ); +++ if( pLock==0 ) return 1; +++ pLock->key = key1; +++ pLock->nRef = 1; +++ pLock->cnt = 0; +++ pOld = sqliteHashInsert(&lockHash, &pLock->key, sizeof(key1), pLock); +++ if( pOld!=0 ){ +++ assert( pOld==pLock ); +++ sqliteFree(pLock); +++ return 1; +++ } +++ }else{ +++ pLock->nRef++; +++ } +++ *ppLock = pLock; +++ pOpen = (struct openCnt*)sqliteHashFind(&openHash, &key2, sizeof(key2)); +++ if( pOpen==0 ){ +++ struct openCnt *pOld; +++ pOpen = sqliteMallocRaw( sizeof(*pOpen) ); +++ if( pOpen==0 ){ +++ releaseLockInfo(pLock); +++ return 1; +++ } +++ pOpen->key = key2; +++ pOpen->nRef = 1; +++ pOpen->nLock = 0; +++ pOpen->nPending = 0; +++ pOpen->aPending = 0; +++ pOld = sqliteHashInsert(&openHash, &pOpen->key, sizeof(key2), pOpen); +++ if( pOld!=0 ){ +++ assert( pOld==pOpen ); +++ sqliteFree(pOpen); +++ releaseLockInfo(pLock); +++ return 1; +++ } +++ }else{ +++ pOpen->nRef++; +++ } +++ *ppOpen = pOpen; +++ return 0; +++} +++ +++#endif /** POSIX advisory lock work-around **/ +++ +++/* +++** If we compile with the SQLITE_TEST macro set, then the following block +++** of code will give us the ability to simulate a disk I/O error. This +++** is used for testing the I/O recovery logic. +++*/ +++#ifdef SQLITE_TEST +++int sqlite_io_error_pending = 0; +++#define SimulateIOError(A) \ +++ if( sqlite_io_error_pending ) \ +++ if( sqlite_io_error_pending-- == 1 ){ local_ioerr(); return A; } +++static void local_ioerr(){ +++ sqlite_io_error_pending = 0; /* Really just a place to set a breakpoint */ +++} +++#else +++#define SimulateIOError(A) +++#endif +++ +++/* +++** When testing, keep a count of the number of open files. +++*/ +++#ifdef SQLITE_TEST +++int sqlite_open_file_count = 0; +++#define OpenCounter(X) sqlite_open_file_count+=(X) +++#else +++#define OpenCounter(X) +++#endif +++ +++ +++/* +++** Delete the named file +++*/ +++int sqliteOsDelete(const char *zFilename){ +++#if OS_UNIX +++ unlink(zFilename); +++#endif +++#if OS_WIN +++ DeleteFile(zFilename); +++#endif +++#if OS_MAC +++ unlink(zFilename); +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** Return TRUE if the named file exists. +++*/ +++int sqliteOsFileExists(const char *zFilename){ +++#if OS_UNIX +++ return access(zFilename, 0)==0; +++#endif +++#if OS_WIN +++ return GetFileAttributes(zFilename) != 0xffffffff; +++#endif +++#if OS_MAC +++ return access(zFilename, 0)==0; +++#endif +++} +++ +++ +++#if 0 /* NOT USED */ +++/* +++** Change the name of an existing file. +++*/ +++int sqliteOsFileRename(const char *zOldName, const char *zNewName){ +++#if OS_UNIX +++ if( link(zOldName, zNewName) ){ +++ return SQLITE_ERROR; +++ } +++ unlink(zOldName); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ if( !MoveFile(zOldName, zNewName) ){ +++ return SQLITE_ERROR; +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ /**** FIX ME ***/ +++ return SQLITE_ERROR; +++#endif +++} +++#endif /* NOT USED */ +++ +++/* +++** Attempt to open a file for both reading and writing. If that +++** fails, try opening it read-only. If the file does not exist, +++** try to create it. +++** +++** On success, a handle for the open file is written to *id +++** and *pReadonly is set to 0 if the file was opened for reading and +++** writing or 1 if the file was opened read-only. The function returns +++** SQLITE_OK. +++** +++** On failure, the function returns SQLITE_CANTOPEN and leaves +++** *id and *pReadonly unchanged. +++*/ +++int sqliteOsOpenReadWrite( +++ const char *zFilename, +++ OsFile *id, +++ int *pReadonly +++){ +++#if OS_UNIX +++ int rc; +++ id->dirfd = -1; +++ id->fd = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, 0644); +++ if( id->fd<0 ){ +++#ifdef EISDIR +++ if( errno==EISDIR ){ +++ return SQLITE_CANTOPEN; +++ } +++#endif +++ id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); +++ if( id->fd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ *pReadonly = 1; +++ }else{ +++ *pReadonly = 0; +++ } +++ sqliteOsEnterMutex(); +++ rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); +++ sqliteOsLeaveMutex(); +++ if( rc ){ +++ close(id->fd); +++ return SQLITE_NOMEM; +++ } +++ id->locked = 0; +++ TRACE3("OPEN %-3d %s\n", id->fd, zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ HANDLE h = CreateFile(zFilename, +++ GENERIC_READ | GENERIC_WRITE, +++ FILE_SHARE_READ | FILE_SHARE_WRITE, +++ NULL, +++ OPEN_ALWAYS, +++ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ h = CreateFile(zFilename, +++ GENERIC_READ, +++ FILE_SHARE_READ, +++ NULL, +++ OPEN_ALWAYS, +++ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ return SQLITE_CANTOPEN; +++ } +++ *pReadonly = 1; +++ }else{ +++ *pReadonly = 0; +++ } +++ id->h = h; +++ id->locked = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ FSSpec fsSpec; +++# ifdef _LARGE_FILE +++ HFSUniStr255 dfName; +++ FSRef fsRef; +++ if( __path2fss(zFilename, &fsSpec) != noErr ){ +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ } +++ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) +++ return SQLITE_CANTOPEN; +++ FSGetDataForkName(&dfName); +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdWrShPerm, &(id->refNum)) != noErr ){ +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdWrPerm, &(id->refNum)) != noErr ){ +++ if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++ else +++ *pReadonly = 1; +++ } else +++ *pReadonly = 0; +++ } else +++ *pReadonly = 0; +++# else +++ __path2fss(zFilename, &fsSpec); +++ if( !sqliteOsFileExists(zFilename) ){ +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ } +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNum)) != noErr ){ +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ){ +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++ else +++ *pReadonly = 1; +++ } else +++ *pReadonly = 0; +++ } else +++ *pReadonly = 0; +++# endif +++ if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){ +++ id->refNumRF = -1; +++ } +++ id->locked = 0; +++ id->delOnClose = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++} +++ +++ +++/* +++** Attempt to open a new file for exclusive access by this process. +++** The file will be opened for both reading and writing. To avoid +++** a potential security problem, we do not allow the file to have +++** previously existed. Nor do we allow the file to be a symbolic +++** link. +++** +++** If delFlag is true, then make arrangements to automatically delete +++** the file when it is closed. +++** +++** On success, write the file handle into *id and return SQLITE_OK. +++** +++** On failure, return SQLITE_CANTOPEN. +++*/ +++int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ +++#if OS_UNIX +++ int rc; +++ if( access(zFilename, 0)==0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ id->dirfd = -1; +++ id->fd = open(zFilename, +++ O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW|O_LARGEFILE|O_BINARY, 0600); +++ if( id->fd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ sqliteOsEnterMutex(); +++ rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); +++ sqliteOsLeaveMutex(); +++ if( rc ){ +++ close(id->fd); +++ unlink(zFilename); +++ return SQLITE_NOMEM; +++ } +++ id->locked = 0; +++ if( delFlag ){ +++ unlink(zFilename); +++ } +++ TRACE3("OPEN-EX %-3d %s\n", id->fd, zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ HANDLE h; +++ int fileflags; +++ if( delFlag ){ +++ fileflags = FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_RANDOM_ACCESS +++ | FILE_FLAG_DELETE_ON_CLOSE; +++ }else{ +++ fileflags = FILE_FLAG_RANDOM_ACCESS; +++ } +++ h = CreateFile(zFilename, +++ GENERIC_READ | GENERIC_WRITE, +++ 0, +++ NULL, +++ CREATE_ALWAYS, +++ fileflags, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ return SQLITE_CANTOPEN; +++ } +++ id->h = h; +++ id->locked = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ FSSpec fsSpec; +++# ifdef _LARGE_FILE +++ HFSUniStr255 dfName; +++ FSRef fsRef; +++ __path2fss(zFilename, &fsSpec); +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) +++ return SQLITE_CANTOPEN; +++ FSGetDataForkName(&dfName); +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdWrPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# else +++ __path2fss(zFilename, &fsSpec); +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# endif +++ id->refNumRF = -1; +++ id->locked = 0; +++ id->delOnClose = delFlag; +++ if (delFlag) +++ id->pathToDel = sqliteOsFullPathname(zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Attempt to open a new file for read-only access. +++** +++** On success, write the file handle into *id and return SQLITE_OK. +++** +++** On failure, return SQLITE_CANTOPEN. +++*/ +++int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ +++#if OS_UNIX +++ int rc; +++ id->dirfd = -1; +++ id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); +++ if( id->fd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ sqliteOsEnterMutex(); +++ rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); +++ sqliteOsLeaveMutex(); +++ if( rc ){ +++ close(id->fd); +++ return SQLITE_NOMEM; +++ } +++ id->locked = 0; +++ TRACE3("OPEN-RO %-3d %s\n", id->fd, zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ HANDLE h = CreateFile(zFilename, +++ GENERIC_READ, +++ 0, +++ NULL, +++ OPEN_EXISTING, +++ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ return SQLITE_CANTOPEN; +++ } +++ id->h = h; +++ id->locked = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ FSSpec fsSpec; +++# ifdef _LARGE_FILE +++ HFSUniStr255 dfName; +++ FSRef fsRef; +++ if( __path2fss(zFilename, &fsSpec) != noErr ) +++ return SQLITE_CANTOPEN; +++ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) +++ return SQLITE_CANTOPEN; +++ FSGetDataForkName(&dfName); +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# else +++ __path2fss(zFilename, &fsSpec); +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# endif +++ if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){ +++ id->refNumRF = -1; +++ } +++ id->locked = 0; +++ id->delOnClose = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Attempt to open a file descriptor for the directory that contains a +++** file. This file descriptor can be used to fsync() the directory +++** in order to make sure the creation of a new file is actually written +++** to disk. +++** +++** This routine is only meaningful for Unix. It is a no-op under +++** windows since windows does not support hard links. +++** +++** On success, a handle for a previously open file is at *id is +++** updated with the new directory file descriptor and SQLITE_OK is +++** returned. +++** +++** On failure, the function returns SQLITE_CANTOPEN and leaves +++** *id unchanged. +++*/ +++int sqliteOsOpenDirectory( +++ const char *zDirname, +++ OsFile *id +++){ +++#if OS_UNIX +++ if( id->fd<0 ){ +++ /* Do not open the directory if the corresponding file is not already +++ ** open. */ +++ return SQLITE_CANTOPEN; +++ } +++ assert( id->dirfd<0 ); +++ id->dirfd = open(zDirname, O_RDONLY|O_BINARY, 0644); +++ if( id->dirfd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ TRACE3("OPENDIR %-3d %s\n", id->dirfd, zDirname); +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** If the following global variable points to a string which is the +++** name of a directory, then that directory will be used to store +++** temporary files. +++*/ +++const char *sqlite_temp_directory = 0; +++ +++/* +++** Create a temporary file name in zBuf. zBuf must be big enough to +++** hold at least SQLITE_TEMPNAME_SIZE characters. +++*/ +++int sqliteOsTempFileName(char *zBuf){ +++#if OS_UNIX +++ static const char *azDirs[] = { +++ 0, +++ "/var/tmp", +++ "/usr/tmp", +++ "/tmp", +++ ".", +++ }; +++ static unsigned char zChars[] = +++ "abcdefghijklmnopqrstuvwxyz" +++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +++ "0123456789"; +++ int i, j; +++ struct stat buf; +++ const char *zDir = "."; +++ azDirs[0] = sqlite_temp_directory; +++ for(i=0; i0 && zTempPath[i-1]=='\\'; i--){} +++ zTempPath[i] = 0; +++ zDir = zTempPath; +++ }else{ +++ zDir = sqlite_temp_directory; +++ } +++ for(;;){ +++ sprintf(zBuf, "%s\\"TEMP_FILE_PREFIX, zDir); +++ j = strlen(zBuf); +++ sqliteRandomness(15, &zBuf[j]); +++ for(i=0; i<15; i++, j++){ +++ zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ]; +++ } +++ zBuf[j] = 0; +++ if( !sqliteOsFileExists(zBuf) ) break; +++ } +++#endif +++#if OS_MAC +++ static char zChars[] = +++ "abcdefghijklmnopqrstuvwxyz" +++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +++ "0123456789"; +++ int i, j; +++ char *zDir; +++ char zTempPath[SQLITE_TEMPNAME_SIZE]; +++ char zdirName[32]; +++ CInfoPBRec infoRec; +++ Str31 dirName; +++ memset(&infoRec, 0, sizeof(infoRec)); +++ memset(zTempPath, 0, SQLITE_TEMPNAME_SIZE); +++ if( sqlite_temp_directory!=0 ){ +++ zDir = sqlite_temp_directory; +++ }else if( FindFolder(kOnSystemDisk, kTemporaryFolderType, kCreateFolder, +++ &(infoRec.dirInfo.ioVRefNum), &(infoRec.dirInfo.ioDrParID)) == noErr ){ +++ infoRec.dirInfo.ioNamePtr = dirName; +++ do{ +++ infoRec.dirInfo.ioFDirIndex = -1; +++ infoRec.dirInfo.ioDrDirID = infoRec.dirInfo.ioDrParID; +++ if( PBGetCatInfoSync(&infoRec) == noErr ){ +++ CopyPascalStringToC(dirName, zdirName); +++ i = strlen(zdirName); +++ memmove(&(zTempPath[i+1]), zTempPath, strlen(zTempPath)); +++ strcpy(zTempPath, zdirName); +++ zTempPath[i] = ':'; +++ }else{ +++ *zTempPath = 0; +++ break; +++ } +++ } while( infoRec.dirInfo.ioDrDirID != fsRtDirID ); +++ zDir = zTempPath; +++ } +++ if( zDir[0]==0 ){ +++ getcwd(zTempPath, SQLITE_TEMPNAME_SIZE-24); +++ zDir = zTempPath; +++ } +++ for(;;){ +++ sprintf(zBuf, "%s"TEMP_FILE_PREFIX, zDir); +++ j = strlen(zBuf); +++ sqliteRandomness(15, &zBuf[j]); +++ for(i=0; i<15; i++, j++){ +++ zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ]; +++ } +++ zBuf[j] = 0; +++ if( !sqliteOsFileExists(zBuf) ) break; +++ } +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** Close a file. +++*/ +++int sqliteOsClose(OsFile *id){ +++#if OS_UNIX +++ sqliteOsUnlock(id); +++ if( id->dirfd>=0 ) close(id->dirfd); +++ id->dirfd = -1; +++ sqliteOsEnterMutex(); +++ if( id->pOpen->nLock ){ +++ /* If there are outstanding locks, do not actually close the file just +++ ** yet because that would clear those locks. Instead, add the file +++ ** descriptor to pOpen->aPending. It will be automatically closed when +++ ** the last lock is cleared. +++ */ +++ int *aNew; +++ struct openCnt *pOpen = id->pOpen; +++ pOpen->nPending++; +++ aNew = sqliteRealloc( pOpen->aPending, pOpen->nPending*sizeof(int) ); +++ if( aNew==0 ){ +++ /* If a malloc fails, just leak the file descriptor */ +++ }else{ +++ pOpen->aPending = aNew; +++ pOpen->aPending[pOpen->nPending-1] = id->fd; +++ } +++ }else{ +++ /* There are no outstanding locks so we can close the file immediately */ +++ close(id->fd); +++ } +++ releaseLockInfo(id->pLock); +++ releaseOpenCnt(id->pOpen); +++ sqliteOsLeaveMutex(); +++ TRACE2("CLOSE %-3d\n", id->fd); +++ OpenCounter(-1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ CloseHandle(id->h); +++ OpenCounter(-1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ if( id->refNumRF!=-1 ) +++ FSClose(id->refNumRF); +++# ifdef _LARGE_FILE +++ FSCloseFork(id->refNum); +++# else +++ FSClose(id->refNum); +++# endif +++ if( id->delOnClose ){ +++ unlink(id->pathToDel); +++ sqliteFree(id->pathToDel); +++ } +++ OpenCounter(-1); +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Read data from a file into a buffer. Return SQLITE_OK if all +++** bytes were read successfully and SQLITE_IOERR if anything goes +++** wrong. +++*/ +++int sqliteOsRead(OsFile *id, void *pBuf, int amt){ +++#if OS_UNIX +++ int got; +++ SimulateIOError(SQLITE_IOERR); +++ TIMER_START; +++ got = read(id->fd, pBuf, amt); +++ TIMER_END; +++ TRACE4("READ %-3d %7d %d\n", id->fd, last_page, elapse); +++ SEEK(0); +++ /* if( got<0 ) got = 0; */ +++ if( got==amt ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++#if OS_WIN +++ DWORD got; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("READ %d\n", last_page); +++ if( !ReadFile(id->h, pBuf, amt, &got, 0) ){ +++ got = 0; +++ } +++ if( got==(DWORD)amt ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++#if OS_MAC +++ int got; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("READ %d\n", last_page); +++# ifdef _LARGE_FILE +++ FSReadFork(id->refNum, fsAtMark, 0, (ByteCount)amt, pBuf, (ByteCount*)&got); +++# else +++ got = amt; +++ FSRead(id->refNum, &got, pBuf); +++# endif +++ if( got==amt ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++} +++ +++/* +++** Write data from a buffer into a file. Return SQLITE_OK on success +++** or some other error code on failure. +++*/ +++int sqliteOsWrite(OsFile *id, const void *pBuf, int amt){ +++#if OS_UNIX +++ int wrote = 0; +++ SimulateIOError(SQLITE_IOERR); +++ TIMER_START; +++ while( amt>0 && (wrote = write(id->fd, pBuf, amt))>0 ){ +++ amt -= wrote; +++ pBuf = &((char*)pBuf)[wrote]; +++ } +++ TIMER_END; +++ TRACE4("WRITE %-3d %7d %d\n", id->fd, last_page, elapse); +++ SEEK(0); +++ if( amt>0 ){ +++ return SQLITE_FULL; +++ } +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ int rc; +++ DWORD wrote; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("WRITE %d\n", last_page); +++ while( amt>0 && (rc = WriteFile(id->h, pBuf, amt, &wrote, 0))!=0 && wrote>0 ){ +++ amt -= wrote; +++ pBuf = &((char*)pBuf)[wrote]; +++ } +++ if( !rc || amt>(int)wrote ){ +++ return SQLITE_FULL; +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ OSErr oserr; +++ int wrote = 0; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("WRITE %d\n", last_page); +++ while( amt>0 ){ +++# ifdef _LARGE_FILE +++ oserr = FSWriteFork(id->refNum, fsAtMark, 0, +++ (ByteCount)amt, pBuf, (ByteCount*)&wrote); +++# else +++ wrote = amt; +++ oserr = FSWrite(id->refNum, &wrote, pBuf); +++# endif +++ if( wrote == 0 || oserr != noErr) +++ break; +++ amt -= wrote; +++ pBuf = &((char*)pBuf)[wrote]; +++ } +++ if( oserr != noErr || amt>wrote ){ +++ return SQLITE_FULL; +++ } +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Move the read/write pointer in a file. +++*/ +++int sqliteOsSeek(OsFile *id, off_t offset){ +++ SEEK(offset/1024 + 1); +++#if OS_UNIX +++ lseek(id->fd, offset, SEEK_SET); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ { +++ LONG upperBits = offset>>32; +++ LONG lowerBits = offset & 0xffffffff; +++ DWORD rc; +++ rc = SetFilePointer(id->h, lowerBits, &upperBits, FILE_BEGIN); +++ /* TRACE3("SEEK rc=0x%x upper=0x%x\n", rc, upperBits); */ +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ { +++ off_t curSize; +++ if( sqliteOsFileSize(id, &curSize) != SQLITE_OK ){ +++ return SQLITE_IOERR; +++ } +++ if( offset >= curSize ){ +++ if( sqliteOsTruncate(id, offset+1) != SQLITE_OK ){ +++ return SQLITE_IOERR; +++ } +++ } +++# ifdef _LARGE_FILE +++ if( FSSetForkPosition(id->refNum, fsFromStart, offset) != noErr ){ +++# else +++ if( SetFPos(id->refNum, fsFromStart, offset) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++ } +++#endif +++} +++ +++#ifdef SQLITE_NOSYNC +++# define fsync(X) 0 +++#endif +++ +++/* +++** Make sure all writes to a particular file are committed to disk. +++** +++** Under Unix, also make sure that the directory entry for the file +++** has been created by fsync-ing the directory that contains the file. +++** If we do not do this and we encounter a power failure, the directory +++** entry for the journal might not exist after we reboot. The next +++** SQLite to access the file will not know that the journal exists (because +++** the directory entry for the journal was never created) and the transaction +++** will not roll back - possibly leading to database corruption. +++*/ +++int sqliteOsSync(OsFile *id){ +++#if OS_UNIX +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("SYNC %-3d\n", id->fd); +++ if( fsync(id->fd) ){ +++ return SQLITE_IOERR; +++ }else{ +++ if( id->dirfd>=0 ){ +++ TRACE2("DIRSYNC %-3d\n", id->dirfd); +++ fsync(id->dirfd); +++ close(id->dirfd); /* Only need to sync once, so close the directory */ +++ id->dirfd = -1; /* when we are done. */ +++ } +++ return SQLITE_OK; +++ } +++#endif +++#if OS_WIN +++ if( FlushFileBuffers(id->h) ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++#if OS_MAC +++# ifdef _LARGE_FILE +++ if( FSFlushFork(id->refNum) != noErr ){ +++# else +++ ParamBlockRec params; +++ memset(¶ms, 0, sizeof(ParamBlockRec)); +++ params.ioParam.ioRefNum = id->refNum; +++ if( PBFlushFileSync(¶ms) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++#endif +++} +++ +++/* +++** Truncate an open file to a specified size +++*/ +++int sqliteOsTruncate(OsFile *id, off_t nByte){ +++ SimulateIOError(SQLITE_IOERR); +++#if OS_UNIX +++ return ftruncate(id->fd, nByte)==0 ? SQLITE_OK : SQLITE_IOERR; +++#endif +++#if OS_WIN +++ { +++ LONG upperBits = nByte>>32; +++ SetFilePointer(id->h, nByte, &upperBits, FILE_BEGIN); +++ SetEndOfFile(id->h); +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++# ifdef _LARGE_FILE +++ if( FSSetForkSize(id->refNum, fsFromStart, nByte) != noErr){ +++# else +++ if( SetEOF(id->refNum, nByte) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++#endif +++} +++ +++/* +++** Determine the current size of a file in bytes +++*/ +++int sqliteOsFileSize(OsFile *id, off_t *pSize){ +++#if OS_UNIX +++ struct stat buf; +++ SimulateIOError(SQLITE_IOERR); +++ if( fstat(id->fd, &buf)!=0 ){ +++ return SQLITE_IOERR; +++ } +++ *pSize = buf.st_size; +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ DWORD upperBits, lowerBits; +++ SimulateIOError(SQLITE_IOERR); +++ lowerBits = GetFileSize(id->h, &upperBits); +++ *pSize = (((off_t)upperBits)<<32) + lowerBits; +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++# ifdef _LARGE_FILE +++ if( FSGetForkSize(id->refNum, pSize) != noErr){ +++# else +++ if( GetEOF(id->refNum, pSize) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++#endif +++} +++ +++#if OS_WIN +++/* +++** Return true (non-zero) if we are running under WinNT, Win2K or WinXP. +++** Return false (zero) for Win95, Win98, or WinME. +++** +++** Here is an interesting observation: Win95, Win98, and WinME lack +++** the LockFileEx() API. But we can still statically link against that +++** API as long as we don't call it win running Win95/98/ME. A call to +++** this routine is used to determine if the host is Win95/98/ME or +++** WinNT/2K/XP so that we will know whether or not we can safely call +++** the LockFileEx() API. +++*/ +++int isNT(void){ +++ static int osType = 0; /* 0=unknown 1=win95 2=winNT */ +++ if( osType==0 ){ +++ OSVERSIONINFO sInfo; +++ sInfo.dwOSVersionInfoSize = sizeof(sInfo); +++ GetVersionEx(&sInfo); +++ osType = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1; +++ } +++ return osType==2; +++} +++#endif +++ +++/* +++** Windows file locking notes: [similar issues apply to MacOS] +++** +++** We cannot use LockFileEx() or UnlockFileEx() on Win95/98/ME because +++** those functions are not available. So we use only LockFile() and +++** UnlockFile(). +++** +++** LockFile() prevents not just writing but also reading by other processes. +++** (This is a design error on the part of Windows, but there is nothing +++** we can do about that.) So the region used for locking is at the +++** end of the file where it is unlikely to ever interfere with an +++** actual read attempt. +++** +++** A database read lock is obtained by locking a single randomly-chosen +++** byte out of a specific range of bytes. The lock byte is obtained at +++** random so two separate readers can probably access the file at the +++** same time, unless they are unlucky and choose the same lock byte. +++** A database write lock is obtained by locking all bytes in the range. +++** There can only be one writer. +++** +++** A lock is obtained on the first byte of the lock range before acquiring +++** either a read lock or a write lock. This prevents two processes from +++** attempting to get a lock at a same time. The semantics of +++** sqliteOsReadLock() require that if there is already a write lock, that +++** lock is converted into a read lock atomically. The lock on the first +++** byte allows us to drop the old write lock and get the read lock without +++** another process jumping into the middle and messing us up. The same +++** argument applies to sqliteOsWriteLock(). +++** +++** On WinNT/2K/XP systems, LockFileEx() and UnlockFileEx() are available, +++** which means we can use reader/writer locks. When reader writer locks +++** are used, the lock is placed on the same range of bytes that is used +++** for probabilistic locking in Win95/98/ME. Hence, the locking scheme +++** will support two or more Win95 readers or two or more WinNT readers. +++** But a single Win95 reader will lock out all WinNT readers and a single +++** WinNT reader will lock out all other Win95 readers. +++** +++** Note: On MacOS we use the resource fork for locking. +++** +++** The following #defines specify the range of bytes used for locking. +++** N_LOCKBYTE is the number of bytes available for doing the locking. +++** The first byte used to hold the lock while the lock is changing does +++** not count toward this number. FIRST_LOCKBYTE is the address of +++** the first byte in the range of bytes used for locking. +++*/ +++#define N_LOCKBYTE 10239 +++#if OS_MAC +++# define FIRST_LOCKBYTE (0x000fffff - N_LOCKBYTE) +++#else +++# define FIRST_LOCKBYTE (0xffffffff - N_LOCKBYTE) +++#endif +++ +++/* +++** Change the status of the lock on the file "id" to be a readlock. +++** If the file was write locked, then this reduces the lock to a read. +++** If the file was read locked, then this acquires a new read lock. +++** +++** Return SQLITE_OK on success and SQLITE_BUSY on failure. If this +++** library was compiled with large file support (LFS) but LFS is not +++** available on the host, then an SQLITE_NOLFS is returned. +++*/ +++int sqliteOsReadLock(OsFile *id){ +++#if OS_UNIX +++ int rc; +++ sqliteOsEnterMutex(); +++ if( id->pLock->cnt>0 ){ +++ if( !id->locked ){ +++ id->pLock->cnt++; +++ id->locked = 1; +++ id->pOpen->nLock++; +++ } +++ rc = SQLITE_OK; +++ }else if( id->locked || id->pLock->cnt==0 ){ +++ struct flock lock; +++ int s; +++ lock.l_type = F_RDLCK; +++ lock.l_whence = SEEK_SET; +++ lock.l_start = lock.l_len = 0L; +++ s = fcntl(id->fd, F_SETLK, &lock); +++ if( s!=0 ){ +++ rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; +++ }else{ +++ rc = SQLITE_OK; +++ if( !id->locked ){ +++ id->pOpen->nLock++; +++ id->locked = 1; +++ } +++ id->pLock->cnt = 1; +++ } +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ sqliteOsLeaveMutex(); +++ return rc; +++#endif +++#if OS_WIN +++ int rc; +++ if( id->locked>0 ){ +++ rc = SQLITE_OK; +++ }else{ +++ int lk; +++ int res; +++ int cnt = 100; +++ sqliteRandomness(sizeof(lk), &lk); +++ lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1; +++ while( cnt-->0 && (res = LockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0))==0 ){ +++ Sleep(1); +++ } +++ if( res ){ +++ UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ if( isNT() ){ +++ OVERLAPPED ovlp; +++ ovlp.Offset = FIRST_LOCKBYTE+1; +++ ovlp.OffsetHigh = 0; +++ ovlp.hEvent = 0; +++ res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, +++ 0, N_LOCKBYTE, 0, &ovlp); +++ }else{ +++ res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0); +++ } +++ UnlockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0); +++ } +++ if( res ){ +++ id->locked = lk; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++#if OS_MAC +++ int rc; +++ if( id->locked>0 || id->refNumRF == -1 ){ +++ rc = SQLITE_OK; +++ }else{ +++ int lk; +++ OSErr res; +++ int cnt = 5; +++ ParamBlockRec params; +++ sqliteRandomness(sizeof(lk), &lk); +++ lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1; +++ memset(¶ms, 0, sizeof(params)); +++ params.ioParam.ioRefNum = id->refNumRF; +++ params.ioParam.ioPosMode = fsFromStart; +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ +++ UInt32 finalTicks; +++ Delay(1, &finalTicks); /* 1/60 sec */ +++ } +++ if( res == noErr ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; +++ params.ioParam.ioReqCount = N_LOCKBYTE; +++ PBUnlockRangeSync(¶ms); +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; +++ params.ioParam.ioReqCount = 1; +++ res = PBLockRangeSync(¶ms); +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ PBUnlockRangeSync(¶ms); +++ } +++ if( res == noErr ){ +++ id->locked = lk; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++} +++ +++/* +++** Change the lock status to be an exclusive or write lock. Return +++** SQLITE_OK on success and SQLITE_BUSY on a failure. If this +++** library was compiled with large file support (LFS) but LFS is not +++** available on the host, then an SQLITE_NOLFS is returned. +++*/ +++int sqliteOsWriteLock(OsFile *id){ +++#if OS_UNIX +++ int rc; +++ sqliteOsEnterMutex(); +++ if( id->pLock->cnt==0 || (id->pLock->cnt==1 && id->locked==1) ){ +++ struct flock lock; +++ int s; +++ lock.l_type = F_WRLCK; +++ lock.l_whence = SEEK_SET; +++ lock.l_start = lock.l_len = 0L; +++ s = fcntl(id->fd, F_SETLK, &lock); +++ if( s!=0 ){ +++ rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; +++ }else{ +++ rc = SQLITE_OK; +++ if( !id->locked ){ +++ id->pOpen->nLock++; +++ id->locked = 1; +++ } +++ id->pLock->cnt = -1; +++ } +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ sqliteOsLeaveMutex(); +++ return rc; +++#endif +++#if OS_WIN +++ int rc; +++ if( id->locked<0 ){ +++ rc = SQLITE_OK; +++ }else{ +++ int res; +++ int cnt = 100; +++ while( cnt-->0 && (res = LockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0))==0 ){ +++ Sleep(1); +++ } +++ if( res ){ +++ if( id->locked>0 ){ +++ if( isNT() ){ +++ UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ }else{ +++ res = UnlockFile(id->h, FIRST_LOCKBYTE + id->locked, 0, 1, 0); +++ } +++ } +++ if( res ){ +++ res = LockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ }else{ +++ res = 0; +++ } +++ UnlockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0); +++ } +++ if( res ){ +++ id->locked = -1; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++#if OS_MAC +++ int rc; +++ if( id->locked<0 || id->refNumRF == -1 ){ +++ rc = SQLITE_OK; +++ }else{ +++ OSErr res; +++ int cnt = 5; +++ ParamBlockRec params; +++ memset(¶ms, 0, sizeof(params)); +++ params.ioParam.ioRefNum = id->refNumRF; +++ params.ioParam.ioPosMode = fsFromStart; +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ +++ UInt32 finalTicks; +++ Delay(1, &finalTicks); /* 1/60 sec */ +++ } +++ if( res == noErr ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; +++ params.ioParam.ioReqCount = 1; +++ if( id->locked==0 +++ || PBUnlockRangeSync(¶ms)==noErr ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; +++ params.ioParam.ioReqCount = N_LOCKBYTE; +++ res = PBLockRangeSync(¶ms); +++ }else{ +++ res = afpRangeNotLocked; +++ } +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ PBUnlockRangeSync(¶ms); +++ } +++ if( res == noErr ){ +++ id->locked = -1; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++} +++ +++/* +++** Unlock the given file descriptor. If the file descriptor was +++** not previously locked, then this routine is a no-op. If this +++** library was compiled with large file support (LFS) but LFS is not +++** available on the host, then an SQLITE_NOLFS is returned. +++*/ +++int sqliteOsUnlock(OsFile *id){ +++#if OS_UNIX +++ int rc; +++ if( !id->locked ) return SQLITE_OK; +++ sqliteOsEnterMutex(); +++ assert( id->pLock->cnt!=0 ); +++ if( id->pLock->cnt>1 ){ +++ id->pLock->cnt--; +++ rc = SQLITE_OK; +++ }else{ +++ struct flock lock; +++ int s; +++ lock.l_type = F_UNLCK; +++ lock.l_whence = SEEK_SET; +++ lock.l_start = lock.l_len = 0L; +++ s = fcntl(id->fd, F_SETLK, &lock); +++ if( s!=0 ){ +++ rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; +++ }else{ +++ rc = SQLITE_OK; +++ id->pLock->cnt = 0; +++ } +++ } +++ if( rc==SQLITE_OK ){ +++ /* Decrement the count of locks against this same file. When the +++ ** count reaches zero, close any other file descriptors whose close +++ ** was deferred because of outstanding locks. +++ */ +++ struct openCnt *pOpen = id->pOpen; +++ pOpen->nLock--; +++ assert( pOpen->nLock>=0 ); +++ if( pOpen->nLock==0 && pOpen->nPending>0 ){ +++ int i; +++ for(i=0; inPending; i++){ +++ close(pOpen->aPending[i]); +++ } +++ sqliteFree(pOpen->aPending); +++ pOpen->nPending = 0; +++ pOpen->aPending = 0; +++ } +++ } +++ sqliteOsLeaveMutex(); +++ id->locked = 0; +++ return rc; +++#endif +++#if OS_WIN +++ int rc; +++ if( id->locked==0 ){ +++ rc = SQLITE_OK; +++ }else if( isNT() || id->locked<0 ){ +++ UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ }else{ +++ UnlockFile(id->h, FIRST_LOCKBYTE+id->locked, 0, 1, 0); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ } +++ return rc; +++#endif +++#if OS_MAC +++ int rc; +++ ParamBlockRec params; +++ memset(¶ms, 0, sizeof(params)); +++ params.ioParam.ioRefNum = id->refNumRF; +++ params.ioParam.ioPosMode = fsFromStart; +++ if( id->locked==0 || id->refNumRF == -1 ){ +++ rc = SQLITE_OK; +++ }else if( id->locked<0 ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; +++ params.ioParam.ioReqCount = N_LOCKBYTE; +++ PBUnlockRangeSync(¶ms); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ }else{ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; +++ params.ioParam.ioReqCount = 1; +++ PBUnlockRangeSync(¶ms); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ } +++ return rc; +++#endif +++} +++ +++/* +++** Get information to seed the random number generator. The seed +++** is written into the buffer zBuf[256]. The calling function must +++** supply a sufficiently large buffer. +++*/ +++int sqliteOsRandomSeed(char *zBuf){ +++ /* We have to initialize zBuf to prevent valgrind from reporting +++ ** errors. The reports issued by valgrind are incorrect - we would +++ ** prefer that the randomness be increased by making use of the +++ ** uninitialized space in zBuf - but valgrind errors tend to worry +++ ** some users. Rather than argue, it seems easier just to initialize +++ ** the whole array and silence valgrind, even if that means less randomness +++ ** in the random seed. +++ ** +++ ** When testing, initializing zBuf[] to zero is all we do. That means +++ ** that we always use the same random number sequence.* This makes the +++ ** tests repeatable. +++ */ +++ memset(zBuf, 0, 256); +++#if OS_UNIX && !defined(SQLITE_TEST) +++ { +++ int pid; +++ time((time_t*)zBuf); +++ pid = getpid(); +++ memcpy(&zBuf[sizeof(time_t)], &pid, sizeof(pid)); +++ } +++#endif +++#if OS_WIN && !defined(SQLITE_TEST) +++ GetSystemTime((LPSYSTEMTIME)zBuf); +++#endif +++#if OS_MAC +++ { +++ int pid; +++ Microseconds((UnsignedWide*)zBuf); +++ pid = getpid(); +++ memcpy(&zBuf[sizeof(UnsignedWide)], &pid, sizeof(pid)); +++ } +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** Sleep for a little while. Return the amount of time slept. +++*/ +++int sqliteOsSleep(int ms){ +++#if OS_UNIX +++#if defined(HAVE_USLEEP) && HAVE_USLEEP +++ usleep(ms*1000); +++ return ms; +++#else +++ sleep((ms+999)/1000); +++ return 1000*((ms+999)/1000); +++#endif +++#endif +++#if OS_WIN +++ Sleep(ms); +++ return ms; +++#endif +++#if OS_MAC +++ UInt32 finalTicks; +++ UInt32 ticks = (((UInt32)ms+16)*3)/50; /* 1/60 sec per tick */ +++ Delay(ticks, &finalTicks); +++ return (int)((ticks*50)/3); +++#endif +++} +++ +++/* +++** Static variables used for thread synchronization +++*/ +++static int inMutex = 0; +++#ifdef SQLITE_UNIX_THREADS +++ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +++#endif +++#ifdef SQLITE_W32_THREADS +++ static CRITICAL_SECTION cs; +++#endif +++#ifdef SQLITE_MACOS_MULTITASKING +++ static MPCriticalRegionID criticalRegion; +++#endif +++ +++/* +++** The following pair of routine implement mutual exclusion for +++** multi-threaded processes. Only a single thread is allowed to +++** executed code that is surrounded by EnterMutex() and LeaveMutex(). +++** +++** SQLite uses only a single Mutex. There is not much critical +++** code and what little there is executes quickly and without blocking. +++*/ +++void sqliteOsEnterMutex(){ +++#ifdef SQLITE_UNIX_THREADS +++ pthread_mutex_lock(&mutex); +++#endif +++#ifdef SQLITE_W32_THREADS +++ static int isInit = 0; +++ while( !isInit ){ +++ static long lock = 0; +++ if( InterlockedIncrement(&lock)==1 ){ +++ InitializeCriticalSection(&cs); +++ isInit = 1; +++ }else{ +++ Sleep(1); +++ } +++ } +++ EnterCriticalSection(&cs); +++#endif +++#ifdef SQLITE_MACOS_MULTITASKING +++ static volatile int notInit = 1; +++ if( notInit ){ +++ if( notInit == 2 ) /* as close as you can get to thread safe init */ +++ MPYield(); +++ else{ +++ notInit = 2; +++ MPCreateCriticalRegion(&criticalRegion); +++ notInit = 0; +++ } +++ } +++ MPEnterCriticalRegion(criticalRegion, kDurationForever); +++#endif +++ assert( !inMutex ); +++ inMutex = 1; +++} +++void sqliteOsLeaveMutex(){ +++ assert( inMutex ); +++ inMutex = 0; +++#ifdef SQLITE_UNIX_THREADS +++ pthread_mutex_unlock(&mutex); +++#endif +++#ifdef SQLITE_W32_THREADS +++ LeaveCriticalSection(&cs); +++#endif +++#ifdef SQLITE_MACOS_MULTITASKING +++ MPExitCriticalRegion(criticalRegion); +++#endif +++} +++ +++/* +++** Turn a relative pathname into a full pathname. Return a pointer +++** to the full pathname stored in space obtained from sqliteMalloc(). +++** The calling function is responsible for freeing this space once it +++** is no longer needed. +++*/ +++char *sqliteOsFullPathname(const char *zRelative){ +++#if OS_UNIX +++ char *zFull = 0; +++ if( zRelative[0]=='/' ){ +++ sqliteSetString(&zFull, zRelative, (char*)0); +++ }else{ +++ char zBuf[5000]; +++ zBuf[0] = 0; +++ sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), "/", zRelative, +++ (char*)0); +++ } +++ return zFull; +++#endif +++#if OS_WIN +++ char *zNotUsed; +++ char *zFull; +++ int nByte; +++ nByte = GetFullPathName(zRelative, 0, 0, &zNotUsed) + 1; +++ zFull = sqliteMalloc( nByte ); +++ if( zFull==0 ) return 0; +++ GetFullPathName(zRelative, nByte, zFull, &zNotUsed); +++ return zFull; +++#endif +++#if OS_MAC +++ char *zFull = 0; +++ if( zRelative[0]==':' ){ +++ char zBuf[_MAX_PATH+1]; +++ sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), &(zRelative[1]), +++ (char*)0); +++ }else{ +++ if( strchr(zRelative, ':') ){ +++ sqliteSetString(&zFull, zRelative, (char*)0); +++ }else{ +++ char zBuf[_MAX_PATH+1]; +++ sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), zRelative, (char*)0); +++ } +++ } +++ return zFull; +++#endif +++} +++ +++/* +++** The following variable, if set to a non-zero value, becomes the result +++** returned from sqliteOsCurrentTime(). This is used for testing. +++*/ +++#ifdef SQLITE_TEST +++int sqlite_current_time = 0; +++#endif +++ +++/* +++** Find the current time (in Universal Coordinated Time). Write the +++** current time and date as a Julian Day number into *prNow and +++** return 0. Return 1 if the time and date cannot be found. +++*/ +++int sqliteOsCurrentTime(double *prNow){ +++#if OS_UNIX +++ time_t t; +++ time(&t); +++ *prNow = t/86400.0 + 2440587.5; +++#endif +++#if OS_WIN +++ FILETIME ft; +++ /* FILETIME structure is a 64-bit value representing the number of +++ 100-nanosecond intervals since January 1, 1601 (= JD 2305813.5). +++ */ +++ double now; +++ GetSystemTimeAsFileTime( &ft ); +++ now = ((double)ft.dwHighDateTime) * 4294967296.0; +++ *prNow = (now + ft.dwLowDateTime)/864000000000.0 + 2305813.5; +++#endif +++#ifdef SQLITE_TEST +++ if( sqlite_current_time ){ +++ *prNow = sqlite_current_time/86400.0 + 2440587.5; +++ } +++#endif +++ return 0; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/os.h ++@@ -0,0 +1,191 @@ +++/* +++** 2001 September 16 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++****************************************************************************** +++** +++** This header file (together with is companion C source-code file +++** "os.c") attempt to abstract the underlying operating system so that +++** the SQLite library will work on both POSIX and windows systems. +++*/ +++#ifndef _SQLITE_OS_H_ +++#define _SQLITE_OS_H_ +++ +++/* +++** Helpful hint: To get this to compile on HP/UX, add -D_INCLUDE_POSIX_SOURCE +++** to the compiler command line. +++*/ +++ +++/* +++** These #defines should enable >2GB file support on Posix if the +++** underlying operating system supports it. If the OS lacks +++** large file support, or if the OS is windows, these should be no-ops. +++** +++** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch +++** on the compiler command line. This is necessary if you are compiling +++** on a recent machine (ex: RedHat 7.2) but you want your code to work +++** on an older machine (ex: RedHat 6.0). If you compile on RedHat 7.2 +++** without this option, LFS is enable. But LFS does not exist in the kernel +++** in RedHat 6.0, so the code won't work. Hence, for maximum binary +++** portability you should omit LFS. +++** +++** Similar is true for MacOS. LFS is only supported on MacOS 9 and later. +++*/ +++#ifndef SQLITE_DISABLE_LFS +++# define _LARGE_FILE 1 +++# ifndef _FILE_OFFSET_BITS +++# define _FILE_OFFSET_BITS 64 +++# endif +++# define _LARGEFILE_SOURCE 1 +++#endif +++ +++/* +++** Temporary files are named starting with this prefix followed by 16 random +++** alphanumeric characters, and no file extension. They are stored in the +++** OS's standard temporary file directory, and are deleted prior to exit. +++** If sqlite is being embedded in another program, you may wish to change the +++** prefix to reflect your program's name, so that if your program exits +++** prematurely, old temporary files can be easily identified. This can be done +++** using -DTEMP_FILE_PREFIX=myprefix_ on the compiler command line. +++*/ +++#ifndef TEMP_FILE_PREFIX +++# define TEMP_FILE_PREFIX "sqlite_" +++#endif +++ +++/* +++** Figure out if we are dealing with Unix, Windows or MacOS. +++** +++** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix. +++** The MacOS build is designed to use CodeWarrior (tested with v8) +++*/ +++#ifndef OS_UNIX +++# ifndef OS_WIN +++# ifndef OS_MAC +++# if defined(__MACOS__) +++# define OS_MAC 1 +++# define OS_WIN 0 +++# define OS_UNIX 0 +++# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) +++# define OS_MAC 0 +++# define OS_WIN 1 +++# define OS_UNIX 0 +++# else +++# define OS_MAC 0 +++# define OS_WIN 0 +++# define OS_UNIX 1 +++# endif +++# else +++# define OS_WIN 0 +++# define OS_UNIX 0 +++# endif +++# else +++# define OS_MAC 0 +++# define OS_UNIX 0 +++# endif +++#else +++# define OS_MAC 0 +++# ifndef OS_WIN +++# define OS_WIN 0 +++# endif +++#endif +++ +++/* +++** A handle for an open file is stored in an OsFile object. +++*/ +++#if OS_UNIX +++# include +++# include +++# include +++# include +++ typedef struct OsFile OsFile; +++ struct OsFile { +++ struct openCnt *pOpen; /* Info about all open fd's on this inode */ +++ struct lockInfo *pLock; /* Info about locks on this inode */ +++ int fd; /* The file descriptor */ +++ int locked; /* True if this instance holds the lock */ +++ int dirfd; /* File descriptor for the directory */ +++ }; +++# define SQLITE_TEMPNAME_SIZE 200 +++# if defined(HAVE_USLEEP) && HAVE_USLEEP +++# define SQLITE_MIN_SLEEP_MS 1 +++# else +++# define SQLITE_MIN_SLEEP_MS 1000 +++# endif +++#endif +++ +++#if OS_WIN +++#include +++#include +++ typedef struct OsFile OsFile; +++ struct OsFile { +++ HANDLE h; /* Handle for accessing the file */ +++ int locked; /* 0: unlocked, <0: write lock, >0: read lock */ +++ }; +++# if defined(_MSC_VER) || defined(__BORLANDC__) +++ typedef __int64 off_t; +++# else +++# if !defined(_CYGWIN_TYPES_H) +++ typedef long long off_t; +++# if defined(__MINGW32__) +++# define _OFF_T_ +++# endif +++# endif +++# endif +++# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50) +++# define SQLITE_MIN_SLEEP_MS 1 +++#endif +++ +++#if OS_MAC +++# include +++# include +++ typedef struct OsFile OsFile; +++ struct OsFile { +++ SInt16 refNum; /* Data fork/file reference number */ +++ SInt16 refNumRF; /* Resource fork reference number (for locking) */ +++ int locked; /* 0: unlocked, <0: write lock, >0: read lock */ +++ int delOnClose; /* True if file is to be deleted on close */ +++ char *pathToDel; /* Name of file to delete on close */ +++ }; +++# ifdef _LARGE_FILE +++ typedef SInt64 off_t; +++# else +++ typedef SInt32 off_t; +++# endif +++# define SQLITE_TEMPNAME_SIZE _MAX_PATH +++# define SQLITE_MIN_SLEEP_MS 17 +++#endif +++ +++int sqliteOsDelete(const char*); +++int sqliteOsFileExists(const char*); +++int sqliteOsFileRename(const char*, const char*); +++int sqliteOsOpenReadWrite(const char*, OsFile*, int*); +++int sqliteOsOpenExclusive(const char*, OsFile*, int); +++int sqliteOsOpenReadOnly(const char*, OsFile*); +++int sqliteOsOpenDirectory(const char*, OsFile*); +++int sqliteOsTempFileName(char*); +++int sqliteOsClose(OsFile*); +++int sqliteOsRead(OsFile*, void*, int amt); +++int sqliteOsWrite(OsFile*, const void*, int amt); +++int sqliteOsSeek(OsFile*, off_t offset); +++int sqliteOsSync(OsFile*); +++int sqliteOsTruncate(OsFile*, off_t size); +++int sqliteOsFileSize(OsFile*, off_t *pSize); +++int sqliteOsReadLock(OsFile*); +++int sqliteOsWriteLock(OsFile*); +++int sqliteOsUnlock(OsFile*); +++int sqliteOsRandomSeed(char*); +++int sqliteOsSleep(int ms); +++int sqliteOsCurrentTime(double*); +++void sqliteOsEnterMutex(void); +++void sqliteOsLeaveMutex(void); +++char *sqliteOsFullPathname(const char*); +++ +++ +++ +++#endif /* _SQLITE_OS_H_ */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/pager.c ++@@ -0,0 +1,2220 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This is the implementation of the page cache subsystem or "pager". +++** +++** The pager is used to access a database disk file. It implements +++** atomic commit and rollback through the use of a journal file that +++** is separate from the database file. The pager also implements file +++** locking to prevent two processes from writing the same database +++** file simultaneously, or one process from reading the database while +++** another is writing. +++** +++** @(#) $Id$ +++*/ +++#include "os.h" /* Must be first to enable large file support */ +++#include "sqliteInt.h" +++#include "pager.h" +++#include +++#include +++ +++/* +++** Macros for troubleshooting. Normally turned off +++*/ +++#if 0 +++static Pager *mainPager = 0; +++#define SET_PAGER(X) if( mainPager==0 ) mainPager = (X) +++#define CLR_PAGER(X) if( mainPager==(X) ) mainPager = 0 +++#define TRACE1(X) if( pPager==mainPager ) fprintf(stderr,X) +++#define TRACE2(X,Y) if( pPager==mainPager ) fprintf(stderr,X,Y) +++#define TRACE3(X,Y,Z) if( pPager==mainPager ) fprintf(stderr,X,Y,Z) +++#else +++#define SET_PAGER(X) +++#define CLR_PAGER(X) +++#define TRACE1(X) +++#define TRACE2(X,Y) +++#define TRACE3(X,Y,Z) +++#endif +++ +++ +++/* +++** The page cache as a whole is always in one of the following +++** states: +++** +++** SQLITE_UNLOCK The page cache is not currently reading or +++** writing the database file. There is no +++** data held in memory. This is the initial +++** state. +++** +++** SQLITE_READLOCK The page cache is reading the database. +++** Writing is not permitted. There can be +++** multiple readers accessing the same database +++** file at the same time. +++** +++** SQLITE_WRITELOCK The page cache is writing the database. +++** Access is exclusive. No other processes or +++** threads can be reading or writing while one +++** process is writing. +++** +++** The page cache comes up in SQLITE_UNLOCK. The first time a +++** sqlite_page_get() occurs, the state transitions to SQLITE_READLOCK. +++** After all pages have been released using sqlite_page_unref(), +++** the state transitions back to SQLITE_UNLOCK. The first time +++** that sqlite_page_write() is called, the state transitions to +++** SQLITE_WRITELOCK. (Note that sqlite_page_write() can only be +++** called on an outstanding page which means that the pager must +++** be in SQLITE_READLOCK before it transitions to SQLITE_WRITELOCK.) +++** The sqlite_page_rollback() and sqlite_page_commit() functions +++** transition the state from SQLITE_WRITELOCK back to SQLITE_READLOCK. +++*/ +++#define SQLITE_UNLOCK 0 +++#define SQLITE_READLOCK 1 +++#define SQLITE_WRITELOCK 2 +++ +++ +++/* +++** Each in-memory image of a page begins with the following header. +++** This header is only visible to this pager module. The client +++** code that calls pager sees only the data that follows the header. +++** +++** Client code should call sqlitepager_write() on a page prior to making +++** any modifications to that page. The first time sqlitepager_write() +++** is called, the original page contents are written into the rollback +++** journal and PgHdr.inJournal and PgHdr.needSync are set. Later, once +++** the journal page has made it onto the disk surface, PgHdr.needSync +++** is cleared. The modified page cannot be written back into the original +++** database file until the journal pages has been synced to disk and the +++** PgHdr.needSync has been cleared. +++** +++** The PgHdr.dirty flag is set when sqlitepager_write() is called and +++** is cleared again when the page content is written back to the original +++** database file. +++*/ +++typedef struct PgHdr PgHdr; +++struct PgHdr { +++ Pager *pPager; /* The pager to which this page belongs */ +++ Pgno pgno; /* The page number for this page */ +++ PgHdr *pNextHash, *pPrevHash; /* Hash collision chain for PgHdr.pgno */ +++ int nRef; /* Number of users of this page */ +++ PgHdr *pNextFree, *pPrevFree; /* Freelist of pages where nRef==0 */ +++ PgHdr *pNextAll, *pPrevAll; /* A list of all pages */ +++ PgHdr *pNextCkpt, *pPrevCkpt; /* List of pages in the checkpoint journal */ +++ u8 inJournal; /* TRUE if has been written to journal */ +++ u8 inCkpt; /* TRUE if written to the checkpoint journal */ +++ u8 dirty; /* TRUE if we need to write back changes */ +++ u8 needSync; /* Sync journal before writing this page */ +++ u8 alwaysRollback; /* Disable dont_rollback() for this page */ +++ PgHdr *pDirty; /* Dirty pages sorted by PgHdr.pgno */ +++ /* SQLITE_PAGE_SIZE bytes of page data follow this header */ +++ /* Pager.nExtra bytes of local data follow the page data */ +++}; +++ +++ +++/* +++** A macro used for invoking the codec if there is one +++*/ +++#ifdef SQLITE_HAS_CODEC +++# define CODEC(P,D,N,X) if( P->xCodec ){ P->xCodec(P->pCodecArg,D,N,X); } +++#else +++# define CODEC(P,D,N,X) +++#endif +++ +++/* +++** Convert a pointer to a PgHdr into a pointer to its data +++** and back again. +++*/ +++#define PGHDR_TO_DATA(P) ((void*)(&(P)[1])) +++#define DATA_TO_PGHDR(D) (&((PgHdr*)(D))[-1]) +++#define PGHDR_TO_EXTRA(P) ((void*)&((char*)(&(P)[1]))[SQLITE_PAGE_SIZE]) +++ +++/* +++** How big to make the hash table used for locating in-memory pages +++** by page number. +++*/ +++#define N_PG_HASH 2048 +++ +++/* +++** Hash a page number +++*/ +++#define pager_hash(PN) ((PN)&(N_PG_HASH-1)) +++ +++/* +++** A open page cache is an instance of the following structure. +++*/ +++struct Pager { +++ char *zFilename; /* Name of the database file */ +++ char *zJournal; /* Name of the journal file */ +++ char *zDirectory; /* Directory hold database and journal files */ +++ OsFile fd, jfd; /* File descriptors for database and journal */ +++ OsFile cpfd; /* File descriptor for the checkpoint journal */ +++ int dbSize; /* Number of pages in the file */ +++ int origDbSize; /* dbSize before the current change */ +++ int ckptSize; /* Size of database (in pages) at ckpt_begin() */ +++ off_t ckptJSize; /* Size of journal at ckpt_begin() */ +++ int nRec; /* Number of pages written to the journal */ +++ u32 cksumInit; /* Quasi-random value added to every checksum */ +++ int ckptNRec; /* Number of records in the checkpoint journal */ +++ int nExtra; /* Add this many bytes to each in-memory page */ +++ void (*xDestructor)(void*); /* Call this routine when freeing pages */ +++ int nPage; /* Total number of in-memory pages */ +++ int nRef; /* Number of in-memory pages with PgHdr.nRef>0 */ +++ int mxPage; /* Maximum number of pages to hold in cache */ +++ int nHit, nMiss, nOvfl; /* Cache hits, missing, and LRU overflows */ +++ void (*xCodec)(void*,void*,Pgno,int); /* Routine for en/decoding data */ +++ void *pCodecArg; /* First argument to xCodec() */ +++ u8 journalOpen; /* True if journal file descriptors is valid */ +++ u8 journalStarted; /* True if header of journal is synced */ +++ u8 useJournal; /* Use a rollback journal on this file */ +++ u8 ckptOpen; /* True if the checkpoint journal is open */ +++ u8 ckptInUse; /* True we are in a checkpoint */ +++ u8 ckptAutoopen; /* Open ckpt journal when main journal is opened*/ +++ u8 noSync; /* Do not sync the journal if true */ +++ u8 fullSync; /* Do extra syncs of the journal for robustness */ +++ u8 state; /* SQLITE_UNLOCK, _READLOCK or _WRITELOCK */ +++ u8 errMask; /* One of several kinds of errors */ +++ u8 tempFile; /* zFilename is a temporary file */ +++ u8 readOnly; /* True for a read-only database */ +++ u8 needSync; /* True if an fsync() is needed on the journal */ +++ u8 dirtyFile; /* True if database file has changed in any way */ +++ u8 alwaysRollback; /* Disable dont_rollback() for all pages */ +++ u8 *aInJournal; /* One bit for each page in the database file */ +++ u8 *aInCkpt; /* One bit for each page in the database */ +++ PgHdr *pFirst, *pLast; /* List of free pages */ +++ PgHdr *pFirstSynced; /* First free page with PgHdr.needSync==0 */ +++ PgHdr *pAll; /* List of all pages */ +++ PgHdr *pCkpt; /* List of pages in the checkpoint journal */ +++ PgHdr *aHash[N_PG_HASH]; /* Hash table to map page number of PgHdr */ +++}; +++ +++/* +++** These are bits that can be set in Pager.errMask. +++*/ +++#define PAGER_ERR_FULL 0x01 /* a write() failed */ +++#define PAGER_ERR_MEM 0x02 /* malloc() failed */ +++#define PAGER_ERR_LOCK 0x04 /* error in the locking protocol */ +++#define PAGER_ERR_CORRUPT 0x08 /* database or journal corruption */ +++#define PAGER_ERR_DISK 0x10 /* general disk I/O error - bad hard drive? */ +++ +++/* +++** The journal file contains page records in the following +++** format. +++** +++** Actually, this structure is the complete page record for pager +++** formats less than 3. Beginning with format 3, this record is surrounded +++** by two checksums. +++*/ +++typedef struct PageRecord PageRecord; +++struct PageRecord { +++ Pgno pgno; /* The page number */ +++ char aData[SQLITE_PAGE_SIZE]; /* Original data for page pgno */ +++}; +++ +++/* +++** Journal files begin with the following magic string. The data +++** was obtained from /dev/random. It is used only as a sanity check. +++** +++** There are three journal formats (so far). The 1st journal format writes +++** 32-bit integers in the byte-order of the host machine. New +++** formats writes integers as big-endian. All new journals use the +++** new format, but we have to be able to read an older journal in order +++** to rollback journals created by older versions of the library. +++** +++** The 3rd journal format (added for 2.8.0) adds additional sanity +++** checking information to the journal. If the power fails while the +++** journal is being written, semi-random garbage data might appear in +++** the journal file after power is restored. If an attempt is then made +++** to roll the journal back, the database could be corrupted. The additional +++** sanity checking data is an attempt to discover the garbage in the +++** journal and ignore it. +++** +++** The sanity checking information for the 3rd journal format consists +++** of a 32-bit checksum on each page of data. The checksum covers both +++** the page number and the SQLITE_PAGE_SIZE bytes of data for the page. +++** This cksum is initialized to a 32-bit random value that appears in the +++** journal file right after the header. The random initializer is important, +++** because garbage data that appears at the end of a journal is likely +++** data that was once in other files that have now been deleted. If the +++** garbage data came from an obsolete journal file, the checksums might +++** be correct. But by initializing the checksum to random value which +++** is different for every journal, we minimize that risk. +++*/ +++static const unsigned char aJournalMagic1[] = { +++ 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd4, +++}; +++static const unsigned char aJournalMagic2[] = { +++ 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd5, +++}; +++static const unsigned char aJournalMagic3[] = { +++ 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd6, +++}; +++#define JOURNAL_FORMAT_1 1 +++#define JOURNAL_FORMAT_2 2 +++#define JOURNAL_FORMAT_3 3 +++ +++/* +++** The following integer determines what format to use when creating +++** new primary journal files. By default we always use format 3. +++** When testing, we can set this value to older journal formats in order to +++** make sure that newer versions of the library are able to rollback older +++** journal files. +++** +++** Note that checkpoint journals always use format 2 and omit the header. +++*/ +++#ifdef SQLITE_TEST +++int journal_format = 3; +++#else +++# define journal_format 3 +++#endif +++ +++/* +++** The size of the header and of each page in the journal varies according +++** to which journal format is being used. The following macros figure out +++** the sizes based on format numbers. +++*/ +++#define JOURNAL_HDR_SZ(X) \ +++ (sizeof(aJournalMagic1) + sizeof(Pgno) + ((X)>=3)*2*sizeof(u32)) +++#define JOURNAL_PG_SZ(X) \ +++ (SQLITE_PAGE_SIZE + sizeof(Pgno) + ((X)>=3)*sizeof(u32)) +++ +++/* +++** Enable reference count tracking here: +++*/ +++#ifdef SQLITE_TEST +++ int pager_refinfo_enable = 0; +++ static void pager_refinfo(PgHdr *p){ +++ static int cnt = 0; +++ if( !pager_refinfo_enable ) return; +++ printf( +++ "REFCNT: %4d addr=0x%08x nRef=%d\n", +++ p->pgno, (int)PGHDR_TO_DATA(p), p->nRef +++ ); +++ cnt++; /* Something to set a breakpoint on */ +++ } +++# define REFINFO(X) pager_refinfo(X) +++#else +++# define REFINFO(X) +++#endif +++ +++/* +++** Read a 32-bit integer from the given file descriptor. Store the integer +++** that is read in *pRes. Return SQLITE_OK if everything worked, or an +++** error code is something goes wrong. +++** +++** If the journal format is 2 or 3, read a big-endian integer. If the +++** journal format is 1, read an integer in the native byte-order of the +++** host machine. +++*/ +++static int read32bits(int format, OsFile *fd, u32 *pRes){ +++ u32 res; +++ int rc; +++ rc = sqliteOsRead(fd, &res, sizeof(res)); +++ if( rc==SQLITE_OK && format>JOURNAL_FORMAT_1 ){ +++ unsigned char ac[4]; +++ memcpy(ac, &res, 4); +++ res = (ac[0]<<24) | (ac[1]<<16) | (ac[2]<<8) | ac[3]; +++ } +++ *pRes = res; +++ return rc; +++} +++ +++/* +++** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK +++** on success or an error code is something goes wrong. +++** +++** If the journal format is 2 or 3, write the integer as 4 big-endian +++** bytes. If the journal format is 1, write the integer in the native +++** byte order. In normal operation, only formats 2 and 3 are used. +++** Journal format 1 is only used for testing. +++*/ +++static int write32bits(OsFile *fd, u32 val){ +++ unsigned char ac[4]; +++ if( journal_format<=1 ){ +++ return sqliteOsWrite(fd, &val, 4); +++ } +++ ac[0] = (val>>24) & 0xff; +++ ac[1] = (val>>16) & 0xff; +++ ac[2] = (val>>8) & 0xff; +++ ac[3] = val & 0xff; +++ return sqliteOsWrite(fd, ac, 4); +++} +++ +++/* +++** Write a 32-bit integer into a page header right before the +++** page data. This will overwrite the PgHdr.pDirty pointer. +++** +++** The integer is big-endian for formats 2 and 3 and native byte order +++** for journal format 1. +++*/ +++static void store32bits(u32 val, PgHdr *p, int offset){ +++ unsigned char *ac; +++ ac = &((unsigned char*)PGHDR_TO_DATA(p))[offset]; +++ if( journal_format<=1 ){ +++ memcpy(ac, &val, 4); +++ }else{ +++ ac[0] = (val>>24) & 0xff; +++ ac[1] = (val>>16) & 0xff; +++ ac[2] = (val>>8) & 0xff; +++ ac[3] = val & 0xff; +++ } +++} +++ +++ +++/* +++** Convert the bits in the pPager->errMask into an approprate +++** return code. +++*/ +++static int pager_errcode(Pager *pPager){ +++ int rc = SQLITE_OK; +++ if( pPager->errMask & PAGER_ERR_LOCK ) rc = SQLITE_PROTOCOL; +++ if( pPager->errMask & PAGER_ERR_DISK ) rc = SQLITE_IOERR; +++ if( pPager->errMask & PAGER_ERR_FULL ) rc = SQLITE_FULL; +++ if( pPager->errMask & PAGER_ERR_MEM ) rc = SQLITE_NOMEM; +++ if( pPager->errMask & PAGER_ERR_CORRUPT ) rc = SQLITE_CORRUPT; +++ return rc; +++} +++ +++/* +++** Add or remove a page from the list of all pages that are in the +++** checkpoint journal. +++** +++** The Pager keeps a separate list of pages that are currently in +++** the checkpoint journal. This helps the sqlitepager_ckpt_commit() +++** routine run MUCH faster for the common case where there are many +++** pages in memory but only a few are in the checkpoint journal. +++*/ +++static void page_add_to_ckpt_list(PgHdr *pPg){ +++ Pager *pPager = pPg->pPager; +++ if( pPg->inCkpt ) return; +++ assert( pPg->pPrevCkpt==0 && pPg->pNextCkpt==0 ); +++ pPg->pPrevCkpt = 0; +++ if( pPager->pCkpt ){ +++ pPager->pCkpt->pPrevCkpt = pPg; +++ } +++ pPg->pNextCkpt = pPager->pCkpt; +++ pPager->pCkpt = pPg; +++ pPg->inCkpt = 1; +++} +++static void page_remove_from_ckpt_list(PgHdr *pPg){ +++ if( !pPg->inCkpt ) return; +++ if( pPg->pPrevCkpt ){ +++ assert( pPg->pPrevCkpt->pNextCkpt==pPg ); +++ pPg->pPrevCkpt->pNextCkpt = pPg->pNextCkpt; +++ }else{ +++ assert( pPg->pPager->pCkpt==pPg ); +++ pPg->pPager->pCkpt = pPg->pNextCkpt; +++ } +++ if( pPg->pNextCkpt ){ +++ assert( pPg->pNextCkpt->pPrevCkpt==pPg ); +++ pPg->pNextCkpt->pPrevCkpt = pPg->pPrevCkpt; +++ } +++ pPg->pNextCkpt = 0; +++ pPg->pPrevCkpt = 0; +++ pPg->inCkpt = 0; +++} +++ +++/* +++** Find a page in the hash table given its page number. Return +++** a pointer to the page or NULL if not found. +++*/ +++static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){ +++ PgHdr *p = pPager->aHash[pager_hash(pgno)]; +++ while( p && p->pgno!=pgno ){ +++ p = p->pNextHash; +++ } +++ return p; +++} +++ +++/* +++** Unlock the database and clear the in-memory cache. This routine +++** sets the state of the pager back to what it was when it was first +++** opened. Any outstanding pages are invalidated and subsequent attempts +++** to access those pages will likely result in a coredump. +++*/ +++static void pager_reset(Pager *pPager){ +++ PgHdr *pPg, *pNext; +++ for(pPg=pPager->pAll; pPg; pPg=pNext){ +++ pNext = pPg->pNextAll; +++ sqliteFree(pPg); +++ } +++ pPager->pFirst = 0; +++ pPager->pFirstSynced = 0; +++ pPager->pLast = 0; +++ pPager->pAll = 0; +++ memset(pPager->aHash, 0, sizeof(pPager->aHash)); +++ pPager->nPage = 0; +++ if( pPager->state>=SQLITE_WRITELOCK ){ +++ sqlitepager_rollback(pPager); +++ } +++ sqliteOsUnlock(&pPager->fd); +++ pPager->state = SQLITE_UNLOCK; +++ pPager->dbSize = -1; +++ pPager->nRef = 0; +++ assert( pPager->journalOpen==0 ); +++} +++ +++/* +++** When this routine is called, the pager has the journal file open and +++** a write lock on the database. This routine releases the database +++** write lock and acquires a read lock in its place. The journal file +++** is deleted and closed. +++** +++** TODO: Consider keeping the journal file open for temporary databases. +++** This might give a performance improvement on windows where opening +++** a file is an expensive operation. +++*/ +++static int pager_unwritelock(Pager *pPager){ +++ int rc; +++ PgHdr *pPg; +++ if( pPager->stateckptOpen ){ +++ sqliteOsClose(&pPager->cpfd); +++ pPager->ckptOpen = 0; +++ } +++ if( pPager->journalOpen ){ +++ sqliteOsClose(&pPager->jfd); +++ pPager->journalOpen = 0; +++ sqliteOsDelete(pPager->zJournal); +++ sqliteFree( pPager->aInJournal ); +++ pPager->aInJournal = 0; +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ pPg->inJournal = 0; +++ pPg->dirty = 0; +++ pPg->needSync = 0; +++ } +++ }else{ +++ assert( pPager->dirtyFile==0 || pPager->useJournal==0 ); +++ } +++ rc = sqliteOsReadLock(&pPager->fd); +++ if( rc==SQLITE_OK ){ +++ pPager->state = SQLITE_READLOCK; +++ }else{ +++ /* This can only happen if a process does a BEGIN, then forks and the +++ ** child process does the COMMIT. Because of the semantics of unix +++ ** file locking, the unlock will fail. +++ */ +++ pPager->state = SQLITE_UNLOCK; +++ } +++ return rc; +++} +++ +++/* +++** Compute and return a checksum for the page of data. +++** +++** This is not a real checksum. It is really just the sum of the +++** random initial value and the page number. We considered do a checksum +++** of the database, but that was found to be too slow. +++*/ +++static u32 pager_cksum(Pager *pPager, Pgno pgno, const char *aData){ +++ u32 cksum = pPager->cksumInit + pgno; +++ return cksum; +++} +++ +++/* +++** Read a single page from the journal file opened on file descriptor +++** jfd. Playback this one page. +++** +++** There are three different journal formats. The format parameter determines +++** which format is used by the journal that is played back. +++*/ +++static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){ +++ int rc; +++ PgHdr *pPg; /* An existing page in the cache */ +++ PageRecord pgRec; +++ u32 cksum; +++ +++ rc = read32bits(format, jfd, &pgRec.pgno); +++ if( rc!=SQLITE_OK ) return rc; +++ rc = sqliteOsRead(jfd, &pgRec.aData, sizeof(pgRec.aData)); +++ if( rc!=SQLITE_OK ) return rc; +++ +++ /* Sanity checking on the page. This is more important that I originally +++ ** thought. If a power failure occurs while the journal is being written, +++ ** it could cause invalid data to be written into the journal. We need to +++ ** detect this invalid data (with high probability) and ignore it. +++ */ +++ if( pgRec.pgno==0 ){ +++ return SQLITE_DONE; +++ } +++ if( pgRec.pgno>(unsigned)pPager->dbSize ){ +++ return SQLITE_OK; +++ } +++ if( format>=JOURNAL_FORMAT_3 ){ +++ rc = read32bits(format, jfd, &cksum); +++ if( rc ) return rc; +++ if( pager_cksum(pPager, pgRec.pgno, pgRec.aData)!=cksum ){ +++ return SQLITE_DONE; +++ } +++ } +++ +++ /* Playback the page. Update the in-memory copy of the page +++ ** at the same time, if there is one. +++ */ +++ pPg = pager_lookup(pPager, pgRec.pgno); +++ TRACE2("PLAYBACK %d\n", pgRec.pgno); +++ sqliteOsSeek(&pPager->fd, (pgRec.pgno-1)*(off_t)SQLITE_PAGE_SIZE); +++ rc = sqliteOsWrite(&pPager->fd, pgRec.aData, SQLITE_PAGE_SIZE); +++ if( pPg ){ +++ /* No page should ever be rolled back that is in use, except for page +++ ** 1 which is held in use in order to keep the lock on the database +++ ** active. +++ */ +++ assert( pPg->nRef==0 || pPg->pgno==1 ); +++ memcpy(PGHDR_TO_DATA(pPg), pgRec.aData, SQLITE_PAGE_SIZE); +++ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); +++ pPg->dirty = 0; +++ pPg->needSync = 0; +++ CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3); +++ } +++ return rc; +++} +++ +++/* +++** Playback the journal and thus restore the database file to +++** the state it was in before we started making changes. +++** +++** The journal file format is as follows: +++** +++** * 8 byte prefix. One of the aJournalMagic123 vectors defined +++** above. The format of the journal file is determined by which +++** of the three prefix vectors is seen. +++** * 4 byte big-endian integer which is the number of valid page records +++** in the journal. If this value is 0xffffffff, then compute the +++** number of page records from the journal size. This field appears +++** in format 3 only. +++** * 4 byte big-endian integer which is the initial value for the +++** sanity checksum. This field appears in format 3 only. +++** * 4 byte integer which is the number of pages to truncate the +++** database to during a rollback. +++** * Zero or more pages instances, each as follows: +++** + 4 byte page number. +++** + SQLITE_PAGE_SIZE bytes of data. +++** + 4 byte checksum (format 3 only) +++** +++** When we speak of the journal header, we mean the first 4 bullets above. +++** Each entry in the journal is an instance of the 5th bullet. Note that +++** bullets 2 and 3 only appear in format-3 journals. +++** +++** Call the value from the second bullet "nRec". nRec is the number of +++** valid page entries in the journal. In most cases, you can compute the +++** value of nRec from the size of the journal file. But if a power +++** failure occurred while the journal was being written, it could be the +++** case that the size of the journal file had already been increased but +++** the extra entries had not yet made it safely to disk. In such a case, +++** the value of nRec computed from the file size would be too large. For +++** that reason, we always use the nRec value in the header. +++** +++** If the nRec value is 0xffffffff it means that nRec should be computed +++** from the file size. This value is used when the user selects the +++** no-sync option for the journal. A power failure could lead to corruption +++** in this case. But for things like temporary table (which will be +++** deleted when the power is restored) we don't care. +++** +++** Journal formats 1 and 2 do not have an nRec value in the header so we +++** have to compute nRec from the file size. This has risks (as described +++** above) which is why all persistent tables have been changed to use +++** format 3. +++** +++** If the file opened as the journal file is not a well-formed +++** journal file then the database will likely already be +++** corrupted, so the PAGER_ERR_CORRUPT bit is set in pPager->errMask +++** and SQLITE_CORRUPT is returned. If it all works, then this routine +++** returns SQLITE_OK. +++*/ +++static int pager_playback(Pager *pPager, int useJournalSize){ +++ off_t szJ; /* Size of the journal file in bytes */ +++ int nRec; /* Number of Records in the journal */ +++ int i; /* Loop counter */ +++ Pgno mxPg = 0; /* Size of the original file in pages */ +++ int format; /* Format of the journal file. */ +++ unsigned char aMagic[sizeof(aJournalMagic1)]; +++ int rc; +++ +++ /* Figure out how many records are in the journal. Abort early if +++ ** the journal is empty. +++ */ +++ assert( pPager->journalOpen ); +++ sqliteOsSeek(&pPager->jfd, 0); +++ rc = sqliteOsFileSize(&pPager->jfd, &szJ); +++ if( rc!=SQLITE_OK ){ +++ goto end_playback; +++ } +++ +++ /* If the journal file is too small to contain a complete header, +++ ** it must mean that the process that created the journal was just +++ ** beginning to write the journal file when it died. In that case, +++ ** the database file should have still been completely unchanged. +++ ** Nothing needs to be rolled back. We can safely ignore this journal. +++ */ +++ if( szJ < sizeof(aMagic)+sizeof(Pgno) ){ +++ goto end_playback; +++ } +++ +++ /* Read the beginning of the journal and truncate the +++ ** database file back to its original size. +++ */ +++ rc = sqliteOsRead(&pPager->jfd, aMagic, sizeof(aMagic)); +++ if( rc!=SQLITE_OK ){ +++ rc = SQLITE_PROTOCOL; +++ goto end_playback; +++ } +++ if( memcmp(aMagic, aJournalMagic3, sizeof(aMagic))==0 ){ +++ format = JOURNAL_FORMAT_3; +++ }else if( memcmp(aMagic, aJournalMagic2, sizeof(aMagic))==0 ){ +++ format = JOURNAL_FORMAT_2; +++ }else if( memcmp(aMagic, aJournalMagic1, sizeof(aMagic))==0 ){ +++ format = JOURNAL_FORMAT_1; +++ }else{ +++ rc = SQLITE_PROTOCOL; +++ goto end_playback; +++ } +++ if( format>=JOURNAL_FORMAT_3 ){ +++ if( szJ < sizeof(aMagic) + 3*sizeof(u32) ){ +++ /* Ignore the journal if it is too small to contain a complete +++ ** header. We already did this test once above, but at the prior +++ ** test, we did not know the journal format and so we had to assume +++ ** the smallest possible header. Now we know the header is bigger +++ ** than the minimum so we test again. +++ */ +++ goto end_playback; +++ } +++ rc = read32bits(format, &pPager->jfd, (u32*)&nRec); +++ if( rc ) goto end_playback; +++ rc = read32bits(format, &pPager->jfd, &pPager->cksumInit); +++ if( rc ) goto end_playback; +++ if( nRec==0xffffffff || useJournalSize ){ +++ nRec = (szJ - JOURNAL_HDR_SZ(3))/JOURNAL_PG_SZ(3); +++ } +++ }else{ +++ nRec = (szJ - JOURNAL_HDR_SZ(2))/JOURNAL_PG_SZ(2); +++ assert( nRec*JOURNAL_PG_SZ(2)+JOURNAL_HDR_SZ(2)==szJ ); +++ } +++ rc = read32bits(format, &pPager->jfd, &mxPg); +++ if( rc!=SQLITE_OK ){ +++ goto end_playback; +++ } +++ assert( pPager->origDbSize==0 || pPager->origDbSize==mxPg ); +++ rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)mxPg); +++ if( rc!=SQLITE_OK ){ +++ goto end_playback; +++ } +++ pPager->dbSize = mxPg; +++ +++ /* Copy original pages out of the journal and back into the database file. +++ */ +++ for(i=0; ijfd, format); +++ if( rc!=SQLITE_OK ){ +++ if( rc==SQLITE_DONE ){ +++ rc = SQLITE_OK; +++ } +++ break; +++ } +++ } +++ +++ /* Pages that have been written to the journal but never synced +++ ** where not restored by the loop above. We have to restore those +++ ** pages by reading them back from the original database. +++ */ +++ if( rc==SQLITE_OK ){ +++ PgHdr *pPg; +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ char zBuf[SQLITE_PAGE_SIZE]; +++ if( !pPg->dirty ) continue; +++ if( (int)pPg->pgno <= pPager->origDbSize ){ +++ sqliteOsSeek(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)(pPg->pgno-1)); +++ rc = sqliteOsRead(&pPager->fd, zBuf, SQLITE_PAGE_SIZE); +++ TRACE2("REFETCH %d\n", pPg->pgno); +++ CODEC(pPager, zBuf, pPg->pgno, 2); +++ if( rc ) break; +++ }else{ +++ memset(zBuf, 0, SQLITE_PAGE_SIZE); +++ } +++ if( pPg->nRef==0 || memcmp(zBuf, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE) ){ +++ memcpy(PGHDR_TO_DATA(pPg), zBuf, SQLITE_PAGE_SIZE); +++ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); +++ } +++ pPg->needSync = 0; +++ pPg->dirty = 0; +++ } +++ } +++ +++end_playback: +++ if( rc!=SQLITE_OK ){ +++ pager_unwritelock(pPager); +++ pPager->errMask |= PAGER_ERR_CORRUPT; +++ rc = SQLITE_CORRUPT; +++ }else{ +++ rc = pager_unwritelock(pPager); +++ } +++ return rc; +++} +++ +++/* +++** Playback the checkpoint journal. +++** +++** This is similar to playing back the transaction journal but with +++** a few extra twists. +++** +++** (1) The number of pages in the database file at the start of +++** the checkpoint is stored in pPager->ckptSize, not in the +++** journal file itself. +++** +++** (2) In addition to playing back the checkpoint journal, also +++** playback all pages of the transaction journal beginning +++** at offset pPager->ckptJSize. +++*/ +++static int pager_ckpt_playback(Pager *pPager){ +++ off_t szJ; /* Size of the full journal */ +++ int nRec; /* Number of Records */ +++ int i; /* Loop counter */ +++ int rc; +++ +++ /* Truncate the database back to its original size. +++ */ +++ rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)pPager->ckptSize); +++ pPager->dbSize = pPager->ckptSize; +++ +++ /* Figure out how many records are in the checkpoint journal. +++ */ +++ assert( pPager->ckptInUse && pPager->journalOpen ); +++ sqliteOsSeek(&pPager->cpfd, 0); +++ nRec = pPager->ckptNRec; +++ +++ /* Copy original pages out of the checkpoint journal and back into the +++ ** database file. Note that the checkpoint journal always uses format +++ ** 2 instead of format 3 since it does not need to be concerned with +++ ** power failures corrupting the journal and can thus omit the checksums. +++ */ +++ for(i=nRec-1; i>=0; i--){ +++ rc = pager_playback_one_page(pPager, &pPager->cpfd, 2); +++ assert( rc!=SQLITE_DONE ); +++ if( rc!=SQLITE_OK ) goto end_ckpt_playback; +++ } +++ +++ /* Figure out how many pages need to be copied out of the transaction +++ ** journal. +++ */ +++ rc = sqliteOsSeek(&pPager->jfd, pPager->ckptJSize); +++ if( rc!=SQLITE_OK ){ +++ goto end_ckpt_playback; +++ } +++ rc = sqliteOsFileSize(&pPager->jfd, &szJ); +++ if( rc!=SQLITE_OK ){ +++ goto end_ckpt_playback; +++ } +++ nRec = (szJ - pPager->ckptJSize)/JOURNAL_PG_SZ(journal_format); +++ for(i=nRec-1; i>=0; i--){ +++ rc = pager_playback_one_page(pPager, &pPager->jfd, journal_format); +++ if( rc!=SQLITE_OK ){ +++ assert( rc!=SQLITE_DONE ); +++ goto end_ckpt_playback; +++ } +++ } +++ +++end_ckpt_playback: +++ if( rc!=SQLITE_OK ){ +++ pPager->errMask |= PAGER_ERR_CORRUPT; +++ rc = SQLITE_CORRUPT; +++ } +++ return rc; +++} +++ +++/* +++** Change the maximum number of in-memory pages that are allowed. +++** +++** The maximum number is the absolute value of the mxPage parameter. +++** If mxPage is negative, the noSync flag is also set. noSync bypasses +++** calls to sqliteOsSync(). The pager runs much faster with noSync on, +++** but if the operating system crashes or there is an abrupt power +++** failure, the database file might be left in an inconsistent and +++** unrepairable state. +++*/ +++void sqlitepager_set_cachesize(Pager *pPager, int mxPage){ +++ if( mxPage>=0 ){ +++ pPager->noSync = pPager->tempFile; +++ if( pPager->noSync==0 ) pPager->needSync = 0; +++ }else{ +++ pPager->noSync = 1; +++ mxPage = -mxPage; +++ } +++ if( mxPage>10 ){ +++ pPager->mxPage = mxPage; +++ } +++} +++ +++/* +++** Adjust the robustness of the database to damage due to OS crashes +++** or power failures by changing the number of syncs()s when writing +++** the rollback journal. There are three levels: +++** +++** OFF sqliteOsSync() is never called. This is the default +++** for temporary and transient files. +++** +++** NORMAL The journal is synced once before writes begin on the +++** database. This is normally adequate protection, but +++** it is theoretically possible, though very unlikely, +++** that an inopertune power failure could leave the journal +++** in a state which would cause damage to the database +++** when it is rolled back. +++** +++** FULL The journal is synced twice before writes begin on the +++** database (with some additional information - the nRec field +++** of the journal header - being written in between the two +++** syncs). If we assume that writing a +++** single disk sector is atomic, then this mode provides +++** assurance that the journal will not be corrupted to the +++** point of causing damage to the database during rollback. +++** +++** Numeric values associated with these states are OFF==1, NORMAL=2, +++** and FULL=3. +++*/ +++void sqlitepager_set_safety_level(Pager *pPager, int level){ +++ pPager->noSync = level==1 || pPager->tempFile; +++ pPager->fullSync = level==3 && !pPager->tempFile; +++ if( pPager->noSync==0 ) pPager->needSync = 0; +++} +++ +++/* +++** Open a temporary file. Write the name of the file into zName +++** (zName must be at least SQLITE_TEMPNAME_SIZE bytes long.) Write +++** the file descriptor into *fd. Return SQLITE_OK on success or some +++** other error code if we fail. +++** +++** The OS will automatically delete the temporary file when it is +++** closed. +++*/ +++static int sqlitepager_opentemp(char *zFile, OsFile *fd){ +++ int cnt = 8; +++ int rc; +++ do{ +++ cnt--; +++ sqliteOsTempFileName(zFile); +++ rc = sqliteOsOpenExclusive(zFile, fd, 1); +++ }while( cnt>0 && rc!=SQLITE_OK ); +++ return rc; +++} +++ +++/* +++** Create a new page cache and put a pointer to the page cache in *ppPager. +++** The file to be cached need not exist. The file is not locked until +++** the first call to sqlitepager_get() and is only held open until the +++** last page is released using sqlitepager_unref(). +++** +++** If zFilename is NULL then a randomly-named temporary file is created +++** and used as the file to be cached. The file will be deleted +++** automatically when it is closed. +++*/ +++int sqlitepager_open( +++ Pager **ppPager, /* Return the Pager structure here */ +++ const char *zFilename, /* Name of the database file to open */ +++ int mxPage, /* Max number of in-memory cache pages */ +++ int nExtra, /* Extra bytes append to each in-memory page */ +++ int useJournal /* TRUE to use a rollback journal on this file */ +++){ +++ Pager *pPager; +++ char *zFullPathname; +++ int nameLen; +++ OsFile fd; +++ int rc, i; +++ int tempFile; +++ int readOnly = 0; +++ char zTemp[SQLITE_TEMPNAME_SIZE]; +++ +++ *ppPager = 0; +++ if( sqlite_malloc_failed ){ +++ return SQLITE_NOMEM; +++ } +++ if( zFilename && zFilename[0] ){ +++ zFullPathname = sqliteOsFullPathname(zFilename); +++ rc = sqliteOsOpenReadWrite(zFullPathname, &fd, &readOnly); +++ tempFile = 0; +++ }else{ +++ rc = sqlitepager_opentemp(zTemp, &fd); +++ zFilename = zTemp; +++ zFullPathname = sqliteOsFullPathname(zFilename); +++ tempFile = 1; +++ } +++ if( sqlite_malloc_failed ){ +++ return SQLITE_NOMEM; +++ } +++ if( rc!=SQLITE_OK ){ +++ sqliteFree(zFullPathname); +++ return SQLITE_CANTOPEN; +++ } +++ nameLen = strlen(zFullPathname); +++ pPager = sqliteMalloc( sizeof(*pPager) + nameLen*3 + 30 ); +++ if( pPager==0 ){ +++ sqliteOsClose(&fd); +++ sqliteFree(zFullPathname); +++ return SQLITE_NOMEM; +++ } +++ SET_PAGER(pPager); +++ pPager->zFilename = (char*)&pPager[1]; +++ pPager->zDirectory = &pPager->zFilename[nameLen+1]; +++ pPager->zJournal = &pPager->zDirectory[nameLen+1]; +++ strcpy(pPager->zFilename, zFullPathname); +++ strcpy(pPager->zDirectory, zFullPathname); +++ for(i=nameLen; i>0 && pPager->zDirectory[i-1]!='/'; i--){} +++ if( i>0 ) pPager->zDirectory[i-1] = 0; +++ strcpy(pPager->zJournal, zFullPathname); +++ sqliteFree(zFullPathname); +++ strcpy(&pPager->zJournal[nameLen], "-journal"); +++ pPager->fd = fd; +++ pPager->journalOpen = 0; +++ pPager->useJournal = useJournal; +++ pPager->ckptOpen = 0; +++ pPager->ckptInUse = 0; +++ pPager->nRef = 0; +++ pPager->dbSize = -1; +++ pPager->ckptSize = 0; +++ pPager->ckptJSize = 0; +++ pPager->nPage = 0; +++ pPager->mxPage = mxPage>5 ? mxPage : 10; +++ pPager->state = SQLITE_UNLOCK; +++ pPager->errMask = 0; +++ pPager->tempFile = tempFile; +++ pPager->readOnly = readOnly; +++ pPager->needSync = 0; +++ pPager->noSync = pPager->tempFile || !useJournal; +++ pPager->pFirst = 0; +++ pPager->pFirstSynced = 0; +++ pPager->pLast = 0; +++ pPager->nExtra = nExtra; +++ memset(pPager->aHash, 0, sizeof(pPager->aHash)); +++ *ppPager = pPager; +++ return SQLITE_OK; +++} +++ +++/* +++** Set the destructor for this pager. If not NULL, the destructor is called +++** when the reference count on each page reaches zero. The destructor can +++** be used to clean up information in the extra segment appended to each page. +++** +++** The destructor is not called as a result sqlitepager_close(). +++** Destructors are only called by sqlitepager_unref(). +++*/ +++void sqlitepager_set_destructor(Pager *pPager, void (*xDesc)(void*)){ +++ pPager->xDestructor = xDesc; +++} +++ +++/* +++** Return the total number of pages in the disk file associated with +++** pPager. +++*/ +++int sqlitepager_pagecount(Pager *pPager){ +++ off_t n; +++ assert( pPager!=0 ); +++ if( pPager->dbSize>=0 ){ +++ return pPager->dbSize; +++ } +++ if( sqliteOsFileSize(&pPager->fd, &n)!=SQLITE_OK ){ +++ pPager->errMask |= PAGER_ERR_DISK; +++ return 0; +++ } +++ n /= SQLITE_PAGE_SIZE; +++ if( pPager->state!=SQLITE_UNLOCK ){ +++ pPager->dbSize = n; +++ } +++ return n; +++} +++ +++/* +++** Forward declaration +++*/ +++static int syncJournal(Pager*); +++ +++/* +++** Truncate the file to the number of pages specified. +++*/ +++int sqlitepager_truncate(Pager *pPager, Pgno nPage){ +++ int rc; +++ if( pPager->dbSize<0 ){ +++ sqlitepager_pagecount(pPager); +++ } +++ if( pPager->errMask!=0 ){ +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ if( nPage>=(unsigned)pPager->dbSize ){ +++ return SQLITE_OK; +++ } +++ syncJournal(pPager); +++ rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)nPage); +++ if( rc==SQLITE_OK ){ +++ pPager->dbSize = nPage; +++ } +++ return rc; +++} +++ +++/* +++** Shutdown the page cache. Free all memory and close all files. +++** +++** If a transaction was in progress when this routine is called, that +++** transaction is rolled back. All outstanding pages are invalidated +++** and their memory is freed. Any attempt to use a page associated +++** with this page cache after this function returns will likely +++** result in a coredump. +++*/ +++int sqlitepager_close(Pager *pPager){ +++ PgHdr *pPg, *pNext; +++ switch( pPager->state ){ +++ case SQLITE_WRITELOCK: { +++ sqlitepager_rollback(pPager); +++ sqliteOsUnlock(&pPager->fd); +++ assert( pPager->journalOpen==0 ); +++ break; +++ } +++ case SQLITE_READLOCK: { +++ sqliteOsUnlock(&pPager->fd); +++ break; +++ } +++ default: { +++ /* Do nothing */ +++ break; +++ } +++ } +++ for(pPg=pPager->pAll; pPg; pPg=pNext){ +++ pNext = pPg->pNextAll; +++ sqliteFree(pPg); +++ } +++ sqliteOsClose(&pPager->fd); +++ assert( pPager->journalOpen==0 ); +++ /* Temp files are automatically deleted by the OS +++ ** if( pPager->tempFile ){ +++ ** sqliteOsDelete(pPager->zFilename); +++ ** } +++ */ +++ CLR_PAGER(pPager); +++ if( pPager->zFilename!=(char*)&pPager[1] ){ +++ assert( 0 ); /* Cannot happen */ +++ sqliteFree(pPager->zFilename); +++ sqliteFree(pPager->zJournal); +++ sqliteFree(pPager->zDirectory); +++ } +++ sqliteFree(pPager); +++ return SQLITE_OK; +++} +++ +++/* +++** Return the page number for the given page data. +++*/ +++Pgno sqlitepager_pagenumber(void *pData){ +++ PgHdr *p = DATA_TO_PGHDR(pData); +++ return p->pgno; +++} +++ +++/* +++** Increment the reference count for a page. If the page is +++** currently on the freelist (the reference count is zero) then +++** remove it from the freelist. +++*/ +++#define page_ref(P) ((P)->nRef==0?_page_ref(P):(void)(P)->nRef++) +++static void _page_ref(PgHdr *pPg){ +++ if( pPg->nRef==0 ){ +++ /* The page is currently on the freelist. Remove it. */ +++ if( pPg==pPg->pPager->pFirstSynced ){ +++ PgHdr *p = pPg->pNextFree; +++ while( p && p->needSync ){ p = p->pNextFree; } +++ pPg->pPager->pFirstSynced = p; +++ } +++ if( pPg->pPrevFree ){ +++ pPg->pPrevFree->pNextFree = pPg->pNextFree; +++ }else{ +++ pPg->pPager->pFirst = pPg->pNextFree; +++ } +++ if( pPg->pNextFree ){ +++ pPg->pNextFree->pPrevFree = pPg->pPrevFree; +++ }else{ +++ pPg->pPager->pLast = pPg->pPrevFree; +++ } +++ pPg->pPager->nRef++; +++ } +++ pPg->nRef++; +++ REFINFO(pPg); +++} +++ +++/* +++** Increment the reference count for a page. The input pointer is +++** a reference to the page data. +++*/ +++int sqlitepager_ref(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ page_ref(pPg); +++ return SQLITE_OK; +++} +++ +++/* +++** Sync the journal. In other words, make sure all the pages that have +++** been written to the journal have actually reached the surface of the +++** disk. It is not safe to modify the original database file until after +++** the journal has been synced. If the original database is modified before +++** the journal is synced and a power failure occurs, the unsynced journal +++** data would be lost and we would be unable to completely rollback the +++** database changes. Database corruption would occur. +++** +++** This routine also updates the nRec field in the header of the journal. +++** (See comments on the pager_playback() routine for additional information.) +++** If the sync mode is FULL, two syncs will occur. First the whole journal +++** is synced, then the nRec field is updated, then a second sync occurs. +++** +++** For temporary databases, we do not care if we are able to rollback +++** after a power failure, so sync occurs. +++** +++** This routine clears the needSync field of every page current held in +++** memory. +++*/ +++static int syncJournal(Pager *pPager){ +++ PgHdr *pPg; +++ int rc = SQLITE_OK; +++ +++ /* Sync the journal before modifying the main database +++ ** (assuming there is a journal and it needs to be synced.) +++ */ +++ if( pPager->needSync ){ +++ if( !pPager->tempFile ){ +++ assert( pPager->journalOpen ); +++ /* assert( !pPager->noSync ); // noSync might be set if synchronous +++ ** was turned off after the transaction was started. Ticket #615 */ +++#ifndef NDEBUG +++ { +++ /* Make sure the pPager->nRec counter we are keeping agrees +++ ** with the nRec computed from the size of the journal file. +++ */ +++ off_t hdrSz, pgSz, jSz; +++ hdrSz = JOURNAL_HDR_SZ(journal_format); +++ pgSz = JOURNAL_PG_SZ(journal_format); +++ rc = sqliteOsFileSize(&pPager->jfd, &jSz); +++ if( rc!=0 ) return rc; +++ assert( pPager->nRec*pgSz+hdrSz==jSz ); +++ } +++#endif +++ if( journal_format>=3 ){ +++ /* Write the nRec value into the journal file header */ +++ off_t szJ; +++ if( pPager->fullSync ){ +++ TRACE1("SYNC\n"); +++ rc = sqliteOsSync(&pPager->jfd); +++ if( rc!=0 ) return rc; +++ } +++ sqliteOsSeek(&pPager->jfd, sizeof(aJournalMagic1)); +++ rc = write32bits(&pPager->jfd, pPager->nRec); +++ if( rc ) return rc; +++ szJ = JOURNAL_HDR_SZ(journal_format) + +++ pPager->nRec*JOURNAL_PG_SZ(journal_format); +++ sqliteOsSeek(&pPager->jfd, szJ); +++ } +++ TRACE1("SYNC\n"); +++ rc = sqliteOsSync(&pPager->jfd); +++ if( rc!=0 ) return rc; +++ pPager->journalStarted = 1; +++ } +++ pPager->needSync = 0; +++ +++ /* Erase the needSync flag from every page. +++ */ +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ pPg->needSync = 0; +++ } +++ pPager->pFirstSynced = pPager->pFirst; +++ } +++ +++#ifndef NDEBUG +++ /* If the Pager.needSync flag is clear then the PgHdr.needSync +++ ** flag must also be clear for all pages. Verify that this +++ ** invariant is true. +++ */ +++ else{ +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ assert( pPg->needSync==0 ); +++ } +++ assert( pPager->pFirstSynced==pPager->pFirst ); +++ } +++#endif +++ +++ return rc; +++} +++ +++/* +++** Given a list of pages (connected by the PgHdr.pDirty pointer) write +++** every one of those pages out to the database file and mark them all +++** as clean. +++*/ +++static int pager_write_pagelist(PgHdr *pList){ +++ Pager *pPager; +++ int rc; +++ +++ if( pList==0 ) return SQLITE_OK; +++ pPager = pList->pPager; +++ while( pList ){ +++ assert( pList->dirty ); +++ sqliteOsSeek(&pPager->fd, (pList->pgno-1)*(off_t)SQLITE_PAGE_SIZE); +++ CODEC(pPager, PGHDR_TO_DATA(pList), pList->pgno, 6); +++ TRACE2("STORE %d\n", pList->pgno); +++ rc = sqliteOsWrite(&pPager->fd, PGHDR_TO_DATA(pList), SQLITE_PAGE_SIZE); +++ CODEC(pPager, PGHDR_TO_DATA(pList), pList->pgno, 0); +++ if( rc ) return rc; +++ pList->dirty = 0; +++ pList = pList->pDirty; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Collect every dirty page into a dirty list and +++** return a pointer to the head of that list. All pages are +++** collected even if they are still in use. +++*/ +++static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ +++ PgHdr *p, *pList; +++ pList = 0; +++ for(p=pPager->pAll; p; p=p->pNextAll){ +++ if( p->dirty ){ +++ p->pDirty = pList; +++ pList = p; +++ } +++ } +++ return pList; +++} +++ +++/* +++** Acquire a page. +++** +++** A read lock on the disk file is obtained when the first page is acquired. +++** This read lock is dropped when the last page is released. +++** +++** A _get works for any page number greater than 0. If the database +++** file is smaller than the requested page, then no actual disk +++** read occurs and the memory image of the page is initialized to +++** all zeros. The extra data appended to a page is always initialized +++** to zeros the first time a page is loaded into memory. +++** +++** The acquisition might fail for several reasons. In all cases, +++** an appropriate error code is returned and *ppPage is set to NULL. +++** +++** See also sqlitepager_lookup(). Both this routine and _lookup() attempt +++** to find a page in the in-memory cache first. If the page is not already +++** in memory, this routine goes to disk to read it in whereas _lookup() +++** just returns 0. This routine acquires a read-lock the first time it +++** has to go to disk, and could also playback an old journal if necessary. +++** Since _lookup() never goes to disk, it never has to deal with locks +++** or journal files. +++*/ +++int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ +++ PgHdr *pPg; +++ int rc; +++ +++ /* Make sure we have not hit any critical errors. +++ */ +++ assert( pPager!=0 ); +++ assert( pgno!=0 ); +++ *ppPage = 0; +++ if( pPager->errMask & ~(PAGER_ERR_FULL) ){ +++ return pager_errcode(pPager); +++ } +++ +++ /* If this is the first page accessed, then get a read lock +++ ** on the database file. +++ */ +++ if( pPager->nRef==0 ){ +++ rc = sqliteOsReadLock(&pPager->fd); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ pPager->state = SQLITE_READLOCK; +++ +++ /* If a journal file exists, try to play it back. +++ */ +++ if( pPager->useJournal && sqliteOsFileExists(pPager->zJournal) ){ +++ int rc; +++ +++ /* Get a write lock on the database +++ */ +++ rc = sqliteOsWriteLock(&pPager->fd); +++ if( rc!=SQLITE_OK ){ +++ if( sqliteOsUnlock(&pPager->fd)!=SQLITE_OK ){ +++ /* This should never happen! */ +++ rc = SQLITE_INTERNAL; +++ } +++ return rc; +++ } +++ pPager->state = SQLITE_WRITELOCK; +++ +++ /* Open the journal for reading only. Return SQLITE_BUSY if +++ ** we are unable to open the journal file. +++ ** +++ ** The journal file does not need to be locked itself. The +++ ** journal file is never open unless the main database file holds +++ ** a write lock, so there is never any chance of two or more +++ ** processes opening the journal at the same time. +++ */ +++ rc = sqliteOsOpenReadOnly(pPager->zJournal, &pPager->jfd); +++ if( rc!=SQLITE_OK ){ +++ rc = sqliteOsUnlock(&pPager->fd); +++ assert( rc==SQLITE_OK ); +++ return SQLITE_BUSY; +++ } +++ pPager->journalOpen = 1; +++ pPager->journalStarted = 0; +++ +++ /* Playback and delete the journal. Drop the database write +++ ** lock and reacquire the read lock. +++ */ +++ rc = pager_playback(pPager, 0); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ } +++ pPg = 0; +++ }else{ +++ /* Search for page in cache */ +++ pPg = pager_lookup(pPager, pgno); +++ } +++ if( pPg==0 ){ +++ /* The requested page is not in the page cache. */ +++ int h; +++ pPager->nMiss++; +++ if( pPager->nPagemxPage || pPager->pFirst==0 ){ +++ /* Create a new page */ +++ pPg = sqliteMallocRaw( sizeof(*pPg) + SQLITE_PAGE_SIZE +++ + sizeof(u32) + pPager->nExtra ); +++ if( pPg==0 ){ +++ pager_unwritelock(pPager); +++ pPager->errMask |= PAGER_ERR_MEM; +++ return SQLITE_NOMEM; +++ } +++ memset(pPg, 0, sizeof(*pPg)); +++ pPg->pPager = pPager; +++ pPg->pNextAll = pPager->pAll; +++ if( pPager->pAll ){ +++ pPager->pAll->pPrevAll = pPg; +++ } +++ pPg->pPrevAll = 0; +++ pPager->pAll = pPg; +++ pPager->nPage++; +++ }else{ +++ /* Find a page to recycle. Try to locate a page that does not +++ ** require us to do an fsync() on the journal. +++ */ +++ pPg = pPager->pFirstSynced; +++ +++ /* If we could not find a page that does not require an fsync() +++ ** on the journal file then fsync the journal file. This is a +++ ** very slow operation, so we work hard to avoid it. But sometimes +++ ** it can't be helped. +++ */ +++ if( pPg==0 ){ +++ int rc = syncJournal(pPager); +++ if( rc!=0 ){ +++ sqlitepager_rollback(pPager); +++ return SQLITE_IOERR; +++ } +++ pPg = pPager->pFirst; +++ } +++ assert( pPg->nRef==0 ); +++ +++ /* Write the page to the database file if it is dirty. +++ */ +++ if( pPg->dirty ){ +++ assert( pPg->needSync==0 ); +++ pPg->pDirty = 0; +++ rc = pager_write_pagelist( pPg ); +++ if( rc!=SQLITE_OK ){ +++ sqlitepager_rollback(pPager); +++ return SQLITE_IOERR; +++ } +++ } +++ assert( pPg->dirty==0 ); +++ +++ /* If the page we are recycling is marked as alwaysRollback, then +++ ** set the global alwaysRollback flag, thus disabling the +++ ** sqlite_dont_rollback() optimization for the rest of this transaction. +++ ** It is necessary to do this because the page marked alwaysRollback +++ ** might be reloaded at a later time but at that point we won't remember +++ ** that is was marked alwaysRollback. This means that all pages must +++ ** be marked as alwaysRollback from here on out. +++ */ +++ if( pPg->alwaysRollback ){ +++ pPager->alwaysRollback = 1; +++ } +++ +++ /* Unlink the old page from the free list and the hash table +++ */ +++ if( pPg==pPager->pFirstSynced ){ +++ PgHdr *p = pPg->pNextFree; +++ while( p && p->needSync ){ p = p->pNextFree; } +++ pPager->pFirstSynced = p; +++ } +++ if( pPg->pPrevFree ){ +++ pPg->pPrevFree->pNextFree = pPg->pNextFree; +++ }else{ +++ assert( pPager->pFirst==pPg ); +++ pPager->pFirst = pPg->pNextFree; +++ } +++ if( pPg->pNextFree ){ +++ pPg->pNextFree->pPrevFree = pPg->pPrevFree; +++ }else{ +++ assert( pPager->pLast==pPg ); +++ pPager->pLast = pPg->pPrevFree; +++ } +++ pPg->pNextFree = pPg->pPrevFree = 0; +++ if( pPg->pNextHash ){ +++ pPg->pNextHash->pPrevHash = pPg->pPrevHash; +++ } +++ if( pPg->pPrevHash ){ +++ pPg->pPrevHash->pNextHash = pPg->pNextHash; +++ }else{ +++ h = pager_hash(pPg->pgno); +++ assert( pPager->aHash[h]==pPg ); +++ pPager->aHash[h] = pPg->pNextHash; +++ } +++ pPg->pNextHash = pPg->pPrevHash = 0; +++ pPager->nOvfl++; +++ } +++ pPg->pgno = pgno; +++ if( pPager->aInJournal && (int)pgno<=pPager->origDbSize ){ +++ sqliteCheckMemory(pPager->aInJournal, pgno/8); +++ assert( pPager->journalOpen ); +++ pPg->inJournal = (pPager->aInJournal[pgno/8] & (1<<(pgno&7)))!=0; +++ pPg->needSync = 0; +++ }else{ +++ pPg->inJournal = 0; +++ pPg->needSync = 0; +++ } +++ if( pPager->aInCkpt && (int)pgno<=pPager->ckptSize +++ && (pPager->aInCkpt[pgno/8] & (1<<(pgno&7)))!=0 ){ +++ page_add_to_ckpt_list(pPg); +++ }else{ +++ page_remove_from_ckpt_list(pPg); +++ } +++ pPg->dirty = 0; +++ pPg->nRef = 1; +++ REFINFO(pPg); +++ pPager->nRef++; +++ h = pager_hash(pgno); +++ pPg->pNextHash = pPager->aHash[h]; +++ pPager->aHash[h] = pPg; +++ if( pPg->pNextHash ){ +++ assert( pPg->pNextHash->pPrevHash==0 ); +++ pPg->pNextHash->pPrevHash = pPg; +++ } +++ if( pPager->nExtra>0 ){ +++ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); +++ } +++ if( pPager->dbSize<0 ) sqlitepager_pagecount(pPager); +++ if( pPager->errMask!=0 ){ +++ sqlitepager_unref(PGHDR_TO_DATA(pPg)); +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ if( pPager->dbSize<(int)pgno ){ +++ memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); +++ }else{ +++ int rc; +++ sqliteOsSeek(&pPager->fd, (pgno-1)*(off_t)SQLITE_PAGE_SIZE); +++ rc = sqliteOsRead(&pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE); +++ TRACE2("FETCH %d\n", pPg->pgno); +++ CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3); +++ if( rc!=SQLITE_OK ){ +++ off_t fileSize; +++ if( sqliteOsFileSize(&pPager->fd,&fileSize)!=SQLITE_OK +++ || fileSize>=pgno*SQLITE_PAGE_SIZE ){ +++ sqlitepager_unref(PGHDR_TO_DATA(pPg)); +++ return rc; +++ }else{ +++ memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); +++ } +++ } +++ } +++ }else{ +++ /* The requested page is in the page cache. */ +++ pPager->nHit++; +++ page_ref(pPg); +++ } +++ *ppPage = PGHDR_TO_DATA(pPg); +++ return SQLITE_OK; +++} +++ +++/* +++** Acquire a page if it is already in the in-memory cache. Do +++** not read the page from disk. Return a pointer to the page, +++** or 0 if the page is not in cache. +++** +++** See also sqlitepager_get(). The difference between this routine +++** and sqlitepager_get() is that _get() will go to the disk and read +++** in the page if the page is not already in cache. This routine +++** returns NULL if the page is not in cache or if a disk I/O error +++** has ever happened. +++*/ +++void *sqlitepager_lookup(Pager *pPager, Pgno pgno){ +++ PgHdr *pPg; +++ +++ assert( pPager!=0 ); +++ assert( pgno!=0 ); +++ if( pPager->errMask & ~(PAGER_ERR_FULL) ){ +++ return 0; +++ } +++ /* if( pPager->nRef==0 ){ +++ ** return 0; +++ ** } +++ */ +++ pPg = pager_lookup(pPager, pgno); +++ if( pPg==0 ) return 0; +++ page_ref(pPg); +++ return PGHDR_TO_DATA(pPg); +++} +++ +++/* +++** Release a page. +++** +++** If the number of references to the page drop to zero, then the +++** page is added to the LRU list. When all references to all pages +++** are released, a rollback occurs and the lock on the database is +++** removed. +++*/ +++int sqlitepager_unref(void *pData){ +++ PgHdr *pPg; +++ +++ /* Decrement the reference count for this page +++ */ +++ pPg = DATA_TO_PGHDR(pData); +++ assert( pPg->nRef>0 ); +++ pPg->nRef--; +++ REFINFO(pPg); +++ +++ /* When the number of references to a page reach 0, call the +++ ** destructor and add the page to the freelist. +++ */ +++ if( pPg->nRef==0 ){ +++ Pager *pPager; +++ pPager = pPg->pPager; +++ pPg->pNextFree = 0; +++ pPg->pPrevFree = pPager->pLast; +++ pPager->pLast = pPg; +++ if( pPg->pPrevFree ){ +++ pPg->pPrevFree->pNextFree = pPg; +++ }else{ +++ pPager->pFirst = pPg; +++ } +++ if( pPg->needSync==0 && pPager->pFirstSynced==0 ){ +++ pPager->pFirstSynced = pPg; +++ } +++ if( pPager->xDestructor ){ +++ pPager->xDestructor(pData); +++ } +++ +++ /* When all pages reach the freelist, drop the read lock from +++ ** the database file. +++ */ +++ pPager->nRef--; +++ assert( pPager->nRef>=0 ); +++ if( pPager->nRef==0 ){ +++ pager_reset(pPager); +++ } +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Create a journal file for pPager. There should already be a write +++** lock on the database file when this routine is called. +++** +++** Return SQLITE_OK if everything. Return an error code and release the +++** write lock if anything goes wrong. +++*/ +++static int pager_open_journal(Pager *pPager){ +++ int rc; +++ assert( pPager->state==SQLITE_WRITELOCK ); +++ assert( pPager->journalOpen==0 ); +++ assert( pPager->useJournal ); +++ sqlitepager_pagecount(pPager); +++ pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 ); +++ if( pPager->aInJournal==0 ){ +++ sqliteOsReadLock(&pPager->fd); +++ pPager->state = SQLITE_READLOCK; +++ return SQLITE_NOMEM; +++ } +++ rc = sqliteOsOpenExclusive(pPager->zJournal, &pPager->jfd,pPager->tempFile); +++ if( rc!=SQLITE_OK ){ +++ sqliteFree(pPager->aInJournal); +++ pPager->aInJournal = 0; +++ sqliteOsReadLock(&pPager->fd); +++ pPager->state = SQLITE_READLOCK; +++ return SQLITE_CANTOPEN; +++ } +++ sqliteOsOpenDirectory(pPager->zDirectory, &pPager->jfd); +++ pPager->journalOpen = 1; +++ pPager->journalStarted = 0; +++ pPager->needSync = 0; +++ pPager->alwaysRollback = 0; +++ pPager->nRec = 0; +++ if( pPager->errMask!=0 ){ +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ pPager->origDbSize = pPager->dbSize; +++ if( journal_format==JOURNAL_FORMAT_3 ){ +++ rc = sqliteOsWrite(&pPager->jfd, aJournalMagic3, sizeof(aJournalMagic3)); +++ if( rc==SQLITE_OK ){ +++ rc = write32bits(&pPager->jfd, pPager->noSync ? 0xffffffff : 0); +++ } +++ if( rc==SQLITE_OK ){ +++ sqliteRandomness(sizeof(pPager->cksumInit), &pPager->cksumInit); +++ rc = write32bits(&pPager->jfd, pPager->cksumInit); +++ } +++ }else if( journal_format==JOURNAL_FORMAT_2 ){ +++ rc = sqliteOsWrite(&pPager->jfd, aJournalMagic2, sizeof(aJournalMagic2)); +++ }else{ +++ assert( journal_format==JOURNAL_FORMAT_1 ); +++ rc = sqliteOsWrite(&pPager->jfd, aJournalMagic1, sizeof(aJournalMagic1)); +++ } +++ if( rc==SQLITE_OK ){ +++ rc = write32bits(&pPager->jfd, pPager->dbSize); +++ } +++ if( pPager->ckptAutoopen && rc==SQLITE_OK ){ +++ rc = sqlitepager_ckpt_begin(pPager); +++ } +++ if( rc!=SQLITE_OK ){ +++ rc = pager_unwritelock(pPager); +++ if( rc==SQLITE_OK ){ +++ rc = SQLITE_FULL; +++ } +++ } +++ return rc; +++} +++ +++/* +++** Acquire a write-lock on the database. The lock is removed when +++** the any of the following happen: +++** +++** * sqlitepager_commit() is called. +++** * sqlitepager_rollback() is called. +++** * sqlitepager_close() is called. +++** * sqlitepager_unref() is called to on every outstanding page. +++** +++** The parameter to this routine is a pointer to any open page of the +++** database file. Nothing changes about the page - it is used merely +++** to acquire a pointer to the Pager structure and as proof that there +++** is already a read-lock on the database. +++** +++** A journal file is opened if this is not a temporary file. For +++** temporary files, the opening of the journal file is deferred until +++** there is an actual need to write to the journal. +++** +++** If the database is already write-locked, this routine is a no-op. +++*/ +++int sqlitepager_begin(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ Pager *pPager = pPg->pPager; +++ int rc = SQLITE_OK; +++ assert( pPg->nRef>0 ); +++ assert( pPager->state!=SQLITE_UNLOCK ); +++ if( pPager->state==SQLITE_READLOCK ){ +++ assert( pPager->aInJournal==0 ); +++ rc = sqliteOsWriteLock(&pPager->fd); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ pPager->state = SQLITE_WRITELOCK; +++ pPager->dirtyFile = 0; +++ TRACE1("TRANSACTION\n"); +++ if( pPager->useJournal && !pPager->tempFile ){ +++ rc = pager_open_journal(pPager); +++ } +++ } +++ return rc; +++} +++ +++/* +++** Mark a data page as writeable. The page is written into the journal +++** if it is not there already. This routine must be called before making +++** changes to a page. +++** +++** The first time this routine is called, the pager creates a new +++** journal and acquires a write lock on the database. If the write +++** lock could not be acquired, this routine returns SQLITE_BUSY. The +++** calling routine must check for that return value and be careful not to +++** change any page data until this routine returns SQLITE_OK. +++** +++** If the journal file could not be written because the disk is full, +++** then this routine returns SQLITE_FULL and does an immediate rollback. +++** All subsequent write attempts also return SQLITE_FULL until there +++** is a call to sqlitepager_commit() or sqlitepager_rollback() to +++** reset. +++*/ +++int sqlitepager_write(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ Pager *pPager = pPg->pPager; +++ int rc = SQLITE_OK; +++ +++ /* Check for errors +++ */ +++ if( pPager->errMask ){ +++ return pager_errcode(pPager); +++ } +++ if( pPager->readOnly ){ +++ return SQLITE_PERM; +++ } +++ +++ /* Mark the page as dirty. If the page has already been written +++ ** to the journal then we can return right away. +++ */ +++ pPg->dirty = 1; +++ if( pPg->inJournal && (pPg->inCkpt || pPager->ckptInUse==0) ){ +++ pPager->dirtyFile = 1; +++ return SQLITE_OK; +++ } +++ +++ /* If we get this far, it means that the page needs to be +++ ** written to the transaction journal or the ckeckpoint journal +++ ** or both. +++ ** +++ ** First check to see that the transaction journal exists and +++ ** create it if it does not. +++ */ +++ assert( pPager->state!=SQLITE_UNLOCK ); +++ rc = sqlitepager_begin(pData); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ assert( pPager->state==SQLITE_WRITELOCK ); +++ if( !pPager->journalOpen && pPager->useJournal ){ +++ rc = pager_open_journal(pPager); +++ if( rc!=SQLITE_OK ) return rc; +++ } +++ assert( pPager->journalOpen || !pPager->useJournal ); +++ pPager->dirtyFile = 1; +++ +++ /* The transaction journal now exists and we have a write lock on the +++ ** main database file. Write the current page to the transaction +++ ** journal if it is not there already. +++ */ +++ if( !pPg->inJournal && pPager->useJournal ){ +++ if( (int)pPg->pgno <= pPager->origDbSize ){ +++ int szPg; +++ u32 saved; +++ if( journal_format>=JOURNAL_FORMAT_3 ){ +++ u32 cksum = pager_cksum(pPager, pPg->pgno, pData); +++ saved = *(u32*)PGHDR_TO_EXTRA(pPg); +++ store32bits(cksum, pPg, SQLITE_PAGE_SIZE); +++ szPg = SQLITE_PAGE_SIZE+8; +++ }else{ +++ szPg = SQLITE_PAGE_SIZE+4; +++ } +++ store32bits(pPg->pgno, pPg, -4); +++ CODEC(pPager, pData, pPg->pgno, 7); +++ rc = sqliteOsWrite(&pPager->jfd, &((char*)pData)[-4], szPg); +++ TRACE3("JOURNAL %d %d\n", pPg->pgno, pPg->needSync); +++ CODEC(pPager, pData, pPg->pgno, 0); +++ if( journal_format>=JOURNAL_FORMAT_3 ){ +++ *(u32*)PGHDR_TO_EXTRA(pPg) = saved; +++ } +++ if( rc!=SQLITE_OK ){ +++ sqlitepager_rollback(pPager); +++ pPager->errMask |= PAGER_ERR_FULL; +++ return rc; +++ } +++ pPager->nRec++; +++ assert( pPager->aInJournal!=0 ); +++ pPager->aInJournal[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ pPg->needSync = !pPager->noSync; +++ pPg->inJournal = 1; +++ if( pPager->ckptInUse ){ +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++ }else{ +++ pPg->needSync = !pPager->journalStarted && !pPager->noSync; +++ TRACE3("APPEND %d %d\n", pPg->pgno, pPg->needSync); +++ } +++ if( pPg->needSync ){ +++ pPager->needSync = 1; +++ } +++ } +++ +++ /* If the checkpoint journal is open and the page is not in it, +++ ** then write the current page to the checkpoint journal. Note that +++ ** the checkpoint journal always uses the simplier format 2 that lacks +++ ** checksums. The header is also omitted from the checkpoint journal. +++ */ +++ if( pPager->ckptInUse && !pPg->inCkpt && (int)pPg->pgno<=pPager->ckptSize ){ +++ assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ); +++ store32bits(pPg->pgno, pPg, -4); +++ CODEC(pPager, pData, pPg->pgno, 7); +++ rc = sqliteOsWrite(&pPager->cpfd, &((char*)pData)[-4], SQLITE_PAGE_SIZE+4); +++ TRACE2("CKPT-JOURNAL %d\n", pPg->pgno); +++ CODEC(pPager, pData, pPg->pgno, 0); +++ if( rc!=SQLITE_OK ){ +++ sqlitepager_rollback(pPager); +++ pPager->errMask |= PAGER_ERR_FULL; +++ return rc; +++ } +++ pPager->ckptNRec++; +++ assert( pPager->aInCkpt!=0 ); +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++ +++ /* Update the database size and return. +++ */ +++ if( pPager->dbSize<(int)pPg->pgno ){ +++ pPager->dbSize = pPg->pgno; +++ } +++ return rc; +++} +++ +++/* +++** Return TRUE if the page given in the argument was previously passed +++** to sqlitepager_write(). In other words, return TRUE if it is ok +++** to change the content of the page. +++*/ +++int sqlitepager_iswriteable(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ return pPg->dirty; +++} +++ +++/* +++** Replace the content of a single page with the information in the third +++** argument. +++*/ +++int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){ +++ void *pPage; +++ int rc; +++ +++ rc = sqlitepager_get(pPager, pgno, &pPage); +++ if( rc==SQLITE_OK ){ +++ rc = sqlitepager_write(pPage); +++ if( rc==SQLITE_OK ){ +++ memcpy(pPage, pData, SQLITE_PAGE_SIZE); +++ } +++ sqlitepager_unref(pPage); +++ } +++ return rc; +++} +++ +++/* +++** A call to this routine tells the pager that it is not necessary to +++** write the information on page "pgno" back to the disk, even though +++** that page might be marked as dirty. +++** +++** The overlying software layer calls this routine when all of the data +++** on the given page is unused. The pager marks the page as clean so +++** that it does not get written to disk. +++** +++** Tests show that this optimization, together with the +++** sqlitepager_dont_rollback() below, more than double the speed +++** of large INSERT operations and quadruple the speed of large DELETEs. +++** +++** When this routine is called, set the alwaysRollback flag to true. +++** Subsequent calls to sqlitepager_dont_rollback() for the same page +++** will thereafter be ignored. This is necessary to avoid a problem +++** where a page with data is added to the freelist during one part of +++** a transaction then removed from the freelist during a later part +++** of the same transaction and reused for some other purpose. When it +++** is first added to the freelist, this routine is called. When reused, +++** the dont_rollback() routine is called. But because the page contains +++** critical data, we still need to be sure it gets rolled back in spite +++** of the dont_rollback() call. +++*/ +++void sqlitepager_dont_write(Pager *pPager, Pgno pgno){ +++ PgHdr *pPg; +++ +++ pPg = pager_lookup(pPager, pgno); +++ pPg->alwaysRollback = 1; +++ if( pPg && pPg->dirty && !pPager->ckptInUse ){ +++ if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSizedbSize ){ +++ /* If this pages is the last page in the file and the file has grown +++ ** during the current transaction, then do NOT mark the page as clean. +++ ** When the database file grows, we must make sure that the last page +++ ** gets written at least once so that the disk file will be the correct +++ ** size. If you do not write this page and the size of the file +++ ** on the disk ends up being too small, that can lead to database +++ ** corruption during the next transaction. +++ */ +++ }else{ +++ TRACE2("DONT_WRITE %d\n", pgno); +++ pPg->dirty = 0; +++ } +++ } +++} +++ +++/* +++** A call to this routine tells the pager that if a rollback occurs, +++** it is not necessary to restore the data on the given page. This +++** means that the pager does not have to record the given page in the +++** rollback journal. +++*/ +++void sqlitepager_dont_rollback(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ Pager *pPager = pPg->pPager; +++ +++ if( pPager->state!=SQLITE_WRITELOCK || pPager->journalOpen==0 ) return; +++ if( pPg->alwaysRollback || pPager->alwaysRollback ) return; +++ if( !pPg->inJournal && (int)pPg->pgno <= pPager->origDbSize ){ +++ assert( pPager->aInJournal!=0 ); +++ pPager->aInJournal[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ pPg->inJournal = 1; +++ if( pPager->ckptInUse ){ +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++ TRACE2("DONT_ROLLBACK %d\n", pPg->pgno); +++ } +++ if( pPager->ckptInUse && !pPg->inCkpt && (int)pPg->pgno<=pPager->ckptSize ){ +++ assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ); +++ assert( pPager->aInCkpt!=0 ); +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++} +++ +++/* +++** Commit all changes to the database and release the write lock. +++** +++** If the commit fails for any reason, a rollback attempt is made +++** and an error code is returned. If the commit worked, SQLITE_OK +++** is returned. +++*/ +++int sqlitepager_commit(Pager *pPager){ +++ int rc; +++ PgHdr *pPg; +++ +++ if( pPager->errMask==PAGER_ERR_FULL ){ +++ rc = sqlitepager_rollback(pPager); +++ if( rc==SQLITE_OK ){ +++ rc = SQLITE_FULL; +++ } +++ return rc; +++ } +++ if( pPager->errMask!=0 ){ +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ if( pPager->state!=SQLITE_WRITELOCK ){ +++ return SQLITE_ERROR; +++ } +++ TRACE1("COMMIT\n"); +++ if( pPager->dirtyFile==0 ){ +++ /* Exit early (without doing the time-consuming sqliteOsSync() calls) +++ ** if there have been no changes to the database file. */ +++ assert( pPager->needSync==0 ); +++ rc = pager_unwritelock(pPager); +++ pPager->dbSize = -1; +++ return rc; +++ } +++ assert( pPager->journalOpen ); +++ rc = syncJournal(pPager); +++ if( rc!=SQLITE_OK ){ +++ goto commit_abort; +++ } +++ pPg = pager_get_all_dirty_pages(pPager); +++ if( pPg ){ +++ rc = pager_write_pagelist(pPg); +++ if( rc || (!pPager->noSync && sqliteOsSync(&pPager->fd)!=SQLITE_OK) ){ +++ goto commit_abort; +++ } +++ } +++ rc = pager_unwritelock(pPager); +++ pPager->dbSize = -1; +++ return rc; +++ +++ /* Jump here if anything goes wrong during the commit process. +++ */ +++commit_abort: +++ rc = sqlitepager_rollback(pPager); +++ if( rc==SQLITE_OK ){ +++ rc = SQLITE_FULL; +++ } +++ return rc; +++} +++ +++/* +++** Rollback all changes. The database falls back to read-only mode. +++** All in-memory cache pages revert to their original data contents. +++** The journal is deleted. +++** +++** This routine cannot fail unless some other process is not following +++** the correct locking protocol (SQLITE_PROTOCOL) or unless some other +++** process is writing trash into the journal file (SQLITE_CORRUPT) or +++** unless a prior malloc() failed (SQLITE_NOMEM). Appropriate error +++** codes are returned for all these occasions. Otherwise, +++** SQLITE_OK is returned. +++*/ +++int sqlitepager_rollback(Pager *pPager){ +++ int rc; +++ TRACE1("ROLLBACK\n"); +++ if( !pPager->dirtyFile || !pPager->journalOpen ){ +++ rc = pager_unwritelock(pPager); +++ pPager->dbSize = -1; +++ return rc; +++ } +++ +++ if( pPager->errMask!=0 && pPager->errMask!=PAGER_ERR_FULL ){ +++ if( pPager->state>=SQLITE_WRITELOCK ){ +++ pager_playback(pPager, 1); +++ } +++ return pager_errcode(pPager); +++ } +++ if( pPager->state!=SQLITE_WRITELOCK ){ +++ return SQLITE_OK; +++ } +++ rc = pager_playback(pPager, 1); +++ if( rc!=SQLITE_OK ){ +++ rc = SQLITE_CORRUPT; +++ pPager->errMask |= PAGER_ERR_CORRUPT; +++ } +++ pPager->dbSize = -1; +++ return rc; +++} +++ +++/* +++** Return TRUE if the database file is opened read-only. Return FALSE +++** if the database is (in theory) writable. +++*/ +++int sqlitepager_isreadonly(Pager *pPager){ +++ return pPager->readOnly; +++} +++ +++/* +++** This routine is used for testing and analysis only. +++*/ +++int *sqlitepager_stats(Pager *pPager){ +++ static int a[9]; +++ a[0] = pPager->nRef; +++ a[1] = pPager->nPage; +++ a[2] = pPager->mxPage; +++ a[3] = pPager->dbSize; +++ a[4] = pPager->state; +++ a[5] = pPager->errMask; +++ a[6] = pPager->nHit; +++ a[7] = pPager->nMiss; +++ a[8] = pPager->nOvfl; +++ return a; +++} +++ +++/* +++** Set the checkpoint. +++** +++** This routine should be called with the transaction journal already +++** open. A new checkpoint journal is created that can be used to rollback +++** changes of a single SQL command within a larger transaction. +++*/ +++int sqlitepager_ckpt_begin(Pager *pPager){ +++ int rc; +++ char zTemp[SQLITE_TEMPNAME_SIZE]; +++ if( !pPager->journalOpen ){ +++ pPager->ckptAutoopen = 1; +++ return SQLITE_OK; +++ } +++ assert( pPager->journalOpen ); +++ assert( !pPager->ckptInUse ); +++ pPager->aInCkpt = sqliteMalloc( pPager->dbSize/8 + 1 ); +++ if( pPager->aInCkpt==0 ){ +++ sqliteOsReadLock(&pPager->fd); +++ return SQLITE_NOMEM; +++ } +++#ifndef NDEBUG +++ rc = sqliteOsFileSize(&pPager->jfd, &pPager->ckptJSize); +++ if( rc ) goto ckpt_begin_failed; +++ assert( pPager->ckptJSize == +++ pPager->nRec*JOURNAL_PG_SZ(journal_format)+JOURNAL_HDR_SZ(journal_format) ); +++#endif +++ pPager->ckptJSize = pPager->nRec*JOURNAL_PG_SZ(journal_format) +++ + JOURNAL_HDR_SZ(journal_format); +++ pPager->ckptSize = pPager->dbSize; +++ if( !pPager->ckptOpen ){ +++ rc = sqlitepager_opentemp(zTemp, &pPager->cpfd); +++ if( rc ) goto ckpt_begin_failed; +++ pPager->ckptOpen = 1; +++ pPager->ckptNRec = 0; +++ } +++ pPager->ckptInUse = 1; +++ return SQLITE_OK; +++ +++ckpt_begin_failed: +++ if( pPager->aInCkpt ){ +++ sqliteFree(pPager->aInCkpt); +++ pPager->aInCkpt = 0; +++ } +++ return rc; +++} +++ +++/* +++** Commit a checkpoint. +++*/ +++int sqlitepager_ckpt_commit(Pager *pPager){ +++ if( pPager->ckptInUse ){ +++ PgHdr *pPg, *pNext; +++ sqliteOsSeek(&pPager->cpfd, 0); +++ /* sqliteOsTruncate(&pPager->cpfd, 0); */ +++ pPager->ckptNRec = 0; +++ pPager->ckptInUse = 0; +++ sqliteFree( pPager->aInCkpt ); +++ pPager->aInCkpt = 0; +++ for(pPg=pPager->pCkpt; pPg; pPg=pNext){ +++ pNext = pPg->pNextCkpt; +++ assert( pPg->inCkpt ); +++ pPg->inCkpt = 0; +++ pPg->pPrevCkpt = pPg->pNextCkpt = 0; +++ } +++ pPager->pCkpt = 0; +++ } +++ pPager->ckptAutoopen = 0; +++ return SQLITE_OK; +++} +++ +++/* +++** Rollback a checkpoint. +++*/ +++int sqlitepager_ckpt_rollback(Pager *pPager){ +++ int rc; +++ if( pPager->ckptInUse ){ +++ rc = pager_ckpt_playback(pPager); +++ sqlitepager_ckpt_commit(pPager); +++ }else{ +++ rc = SQLITE_OK; +++ } +++ pPager->ckptAutoopen = 0; +++ return rc; +++} +++ +++/* +++** Return the full pathname of the database file. +++*/ +++const char *sqlitepager_filename(Pager *pPager){ +++ return pPager->zFilename; +++} +++ +++/* +++** Set the codec for this pager +++*/ +++void sqlitepager_set_codec( +++ Pager *pPager, +++ void (*xCodec)(void*,void*,Pgno,int), +++ void *pCodecArg +++){ +++ pPager->xCodec = xCodec; +++ pPager->pCodecArg = pCodecArg; +++} +++ +++#ifdef SQLITE_TEST +++/* +++** Print a listing of all referenced pages and their ref count. +++*/ +++void sqlitepager_refdump(Pager *pPager){ +++ PgHdr *pPg; +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ if( pPg->nRef<=0 ) continue; +++ printf("PAGE %3d addr=0x%08x nRef=%d\n", +++ pPg->pgno, (int)PGHDR_TO_DATA(pPg), pPg->nRef); +++ } +++} +++#endif ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/pager.h ++@@ -0,0 +1,107 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This header file defines the interface that the sqlite page cache +++** subsystem. The page cache subsystem reads and writes a file a page +++** at a time and provides a journal for rollback. +++** +++** @(#) $Id$ +++*/ +++ +++/* +++** The size of one page +++** +++** You can change this value to another (reasonable) value you want. +++** It need not be a power of two, though the interface to the disk +++** will likely be faster if it is. +++** +++** Experiments show that a page size of 1024 gives the best speed +++** for common usages. The speed differences for different sizes +++** such as 512, 2048, 4096, an so forth, is minimal. Note, however, +++** that changing the page size results in a completely imcompatible +++** file format. +++*/ +++#ifndef SQLITE_PAGE_SIZE +++#define SQLITE_PAGE_SIZE 1024 +++#endif +++ +++/* +++** Number of extra bytes of data allocated at the end of each page and +++** stored on disk but not used by the higher level btree layer. Changing +++** this value results in a completely incompatible file format. +++*/ +++#ifndef SQLITE_PAGE_RESERVE +++#define SQLITE_PAGE_RESERVE 0 +++#endif +++ +++/* +++** The total number of usable bytes stored on disk for each page. +++** The usable bytes come at the beginning of the page and the reserve +++** bytes come at the end. +++*/ +++#define SQLITE_USABLE_SIZE (SQLITE_PAGE_SIZE-SQLITE_PAGE_RESERVE) +++ +++/* +++** Maximum number of pages in one database. (This is a limitation of +++** imposed by 4GB files size limits.) +++*/ +++#define SQLITE_MAX_PAGE 1073741823 +++ +++/* +++** The type used to represent a page number. The first page in a file +++** is called page 1. 0 is used to represent "not a page". +++*/ +++typedef unsigned int Pgno; +++ +++/* +++** Each open file is managed by a separate instance of the "Pager" structure. +++*/ +++typedef struct Pager Pager; +++ +++/* +++** See source code comments for a detailed description of the following +++** routines: +++*/ +++int sqlitepager_open(Pager **ppPager, const char *zFilename, +++ int nPage, int nExtra, int useJournal); +++void sqlitepager_set_destructor(Pager*, void(*)(void*)); +++void sqlitepager_set_cachesize(Pager*, int); +++int sqlitepager_close(Pager *pPager); +++int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage); +++void *sqlitepager_lookup(Pager *pPager, Pgno pgno); +++int sqlitepager_ref(void*); +++int sqlitepager_unref(void*); +++Pgno sqlitepager_pagenumber(void*); +++int sqlitepager_write(void*); +++int sqlitepager_iswriteable(void*); +++int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void*); +++int sqlitepager_pagecount(Pager*); +++int sqlitepager_truncate(Pager*,Pgno); +++int sqlitepager_begin(void*); +++int sqlitepager_commit(Pager*); +++int sqlitepager_rollback(Pager*); +++int sqlitepager_isreadonly(Pager*); +++int sqlitepager_ckpt_begin(Pager*); +++int sqlitepager_ckpt_commit(Pager*); +++int sqlitepager_ckpt_rollback(Pager*); +++void sqlitepager_dont_rollback(void*); +++void sqlitepager_dont_write(Pager*, Pgno); +++int *sqlitepager_stats(Pager*); +++void sqlitepager_set_safety_level(Pager*,int); +++const char *sqlitepager_filename(Pager*); +++int sqlitepager_rename(Pager*, const char *zNewName); +++void sqlitepager_set_codec(Pager*,void(*)(void*,void*,Pgno,int),void*); +++ +++#ifdef SQLITE_TEST +++void sqlitepager_refdump(Pager*); +++int pager_refinfo_enable; +++int journal_format; +++#endif ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/parse.c ++@@ -0,0 +1,3355 @@ +++/* Driver template for the LEMON parser generator. +++** The author disclaims copyright to this source code. +++*/ +++/* First off, code is included that follows the "include" declaration +++** in the input grammar file. */ +++#include +++#line 33 "ext/sqlite/libsqlite/src/parse.y" +++ +++#include "sqliteInt.h" +++#include "parse.h" +++ +++/* +++** An instance of this structure holds information about the +++** LIMIT clause of a SELECT statement. +++*/ +++struct LimitVal { +++ int limit; /* The LIMIT value. -1 if there is no limit */ +++ int offset; /* The OFFSET. 0 if there is none */ +++}; +++ +++/* +++** An instance of the following structure describes the event of a +++** TRIGGER. "a" is the event type, one of TK_UPDATE, TK_INSERT, +++** TK_DELETE, or TK_INSTEAD. If the event is of the form +++** +++** UPDATE ON (a,b,c) +++** +++** Then the "b" IdList records the list "a,b,c". +++*/ +++struct TrigEvent { int a; IdList * b; }; +++ +++#line 33 "ext/sqlite/libsqlite/src/parse.c" +++/* Next is all token values, in a form suitable for use by makeheaders. +++** This section will be null unless lemon is run with the -m switch. +++*/ +++/* +++** These constants (all generated automatically by the parser generator) +++** specify the various kinds of tokens (terminals) that the parser +++** understands. +++** +++** Each symbol here is a terminal symbol in the grammar. +++*/ +++/* Make sure the INTERFACE macro is defined. +++*/ +++#ifndef INTERFACE +++# define INTERFACE 1 +++#endif +++/* The next thing included is series of defines which control +++** various aspects of the generated parser. +++** YYCODETYPE is the data type used for storing terminal +++** and nonterminal numbers. "unsigned char" is +++** used if there are fewer than 250 terminals +++** and nonterminals. "int" is used otherwise. +++** YYNOCODE is a number of type YYCODETYPE which corresponds +++** to no legal terminal or nonterminal number. This +++** number is used to fill in empty slots of the hash +++** table. +++** YYFALLBACK If defined, this indicates that one or more tokens +++** have fall-back values which should be used if the +++** original value of the token will not parse. +++** YYACTIONTYPE is the data type used for storing terminal +++** and nonterminal numbers. "unsigned char" is +++** used if there are fewer than 250 rules and +++** states combined. "int" is used otherwise. +++** sqliteParserTOKENTYPE is the data type used for minor tokens given +++** directly to the parser from the tokenizer. +++** YYMINORTYPE is the data type used for all minor tokens. +++** This is typically a union of many types, one of +++** which is sqliteParserTOKENTYPE. The entry in the union +++** for base tokens is called "yy0". +++** YYSTACKDEPTH is the maximum depth of the parser's stack. If +++** zero the stack is dynamically sized using realloc() +++** sqliteParserARG_SDECL A static variable declaration for the %extra_argument +++** sqliteParserARG_PDECL A parameter declaration for the %extra_argument +++** sqliteParserARG_STORE Code to store %extra_argument into yypParser +++** sqliteParserARG_FETCH Code to extract %extra_argument from yypParser +++** YYNSTATE the combined number of states. +++** YYNRULE the number of rules in the grammar +++** YYERRORSYMBOL is the code number of the error symbol. If not +++** defined, then do no error processing. +++*/ +++#define YYCODETYPE unsigned char +++#define YYNOCODE 221 +++#define YYACTIONTYPE unsigned short int +++#define sqliteParserTOKENTYPE Token +++typedef union { +++ int yyinit; +++ sqliteParserTOKENTYPE yy0; +++ TriggerStep * yy19; +++ struct LimitVal yy124; +++ Select* yy179; +++ Expr * yy182; +++ Expr* yy242; +++ struct TrigEvent yy290; +++ SrcList* yy307; +++ IdList* yy320; +++ ExprList* yy322; +++ int yy372; +++ struct {int value; int mask;} yy407; +++} YYMINORTYPE; +++#ifndef YYSTACKDEPTH +++#define YYSTACKDEPTH 100 +++#endif +++#define sqliteParserARG_SDECL Parse *pParse; +++#define sqliteParserARG_PDECL ,Parse *pParse +++#define sqliteParserARG_FETCH Parse *pParse = yypParser->pParse +++#define sqliteParserARG_STORE yypParser->pParse = pParse +++#define YYNSTATE 563 +++#define YYNRULE 293 +++#define YYFALLBACK 1 +++#define YY_NO_ACTION (YYNSTATE+YYNRULE+2) +++#define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) +++#define YY_ERROR_ACTION (YYNSTATE+YYNRULE) +++ +++/* The yyzerominor constant is used to initialize instances of +++** YYMINORTYPE objects to zero. */ +++static const YYMINORTYPE yyzerominor = { 0 }; +++ +++/* Define the yytestcase() macro to be a no-op if is not already defined +++** otherwise. +++** +++** Applications can choose to define yytestcase() in the %include section +++** to a macro that can assist in verifying code coverage. For production +++** code the yytestcase() macro should be turned off. But it is useful +++** for testing. +++*/ +++#ifndef yytestcase +++# define yytestcase(X) +++#endif +++ +++ +++/* Next are the tables used to determine what action to take based on the +++** current state and lookahead token. These tables are used to implement +++** functions that take a state number and lookahead value and return an +++** action integer. +++** +++** Suppose the action integer is N. Then the action is determined as +++** follows +++** +++** 0 <= N < YYNSTATE Shift N. That is, push the lookahead +++** token onto the stack and goto state N. +++** +++** YYNSTATE <= N < YYNSTATE+YYNRULE Reduce by rule N-YYNSTATE. +++** +++** N == YYNSTATE+YYNRULE A syntax error has occurred. +++** +++** N == YYNSTATE+YYNRULE+1 The parser accepts its input. +++** +++** N == YYNSTATE+YYNRULE+2 No such action. Denotes unused +++** slots in the yy_action[] table. +++** +++** The action table is constructed as a single large table named yy_action[]. +++** Given state S and lookahead X, the action is computed as +++** +++** yy_action[ yy_shift_ofst[S] + X ] +++** +++** If the index value yy_shift_ofst[S]+X is out of range or if the value +++** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S] +++** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table +++** and that yy_default[S] should be used instead. +++** +++** The formula above is for computing the action when the lookahead is +++** a terminal symbol. If the lookahead is a non-terminal (as occurs after +++** a reduce action) then the yy_reduce_ofst[] array is used in place of +++** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of +++** YY_SHIFT_USE_DFLT. +++** +++** The following are the tables generated in this section: +++** +++** yy_action[] A single table containing all actions. +++** yy_lookahead[] A table containing the lookahead for each entry in +++** yy_action. Used to detect hash collisions. +++** yy_shift_ofst[] For each state, the offset into yy_action for +++** shifting terminals. +++** yy_reduce_ofst[] For each state, the offset into yy_action for +++** shifting non-terminals after a reduce. +++** yy_default[] Default action for each state. +++*/ +++#define YY_ACTTAB_COUNT (1090) +++static const YYACTIONTYPE yy_action[] = { +++ /* 0 */ 186, 561, 483, 69, 67, 70, 68, 64, 63, 62, +++ /* 10 */ 61, 58, 57, 56, 55, 54, 53, 181, 180, 179, +++ /* 20 */ 514, 421, 334, 420, 468, 515, 64, 63, 62, 61, +++ /* 30 */ 58, 57, 56, 55, 54, 53, 9, 423, 422, 71, +++ /* 40 */ 72, 129, 65, 66, 513, 510, 305, 52, 138, 69, +++ /* 50 */ 67, 70, 68, 64, 63, 62, 61, 58, 57, 56, +++ /* 60 */ 55, 54, 53, 448, 469, 175, 482, 514, 470, 344, +++ /* 70 */ 342, 36, 515, 58, 57, 56, 55, 54, 53, 8, +++ /* 80 */ 341, 281, 285, 307, 437, 178, 71, 72, 129, 65, +++ /* 90 */ 66, 513, 510, 305, 52, 138, 69, 67, 70, 68, +++ /* 100 */ 64, 63, 62, 61, 58, 57, 56, 55, 54, 53, +++ /* 110 */ 130, 362, 360, 508, 507, 267, 551, 436, 298, 297, +++ /* 120 */ 369, 368, 50, 128, 543, 29, 266, 449, 537, 447, +++ /* 130 */ 591, 528, 442, 441, 187, 132, 514, 536, 47, 48, +++ /* 140 */ 472, 515, 122, 427, 331, 409, 49, 371, 370, 518, +++ /* 150 */ 328, 363, 517, 520, 45, 71, 72, 129, 65, 66, +++ /* 160 */ 513, 510, 305, 52, 138, 69, 67, 70, 68, 64, +++ /* 170 */ 63, 62, 61, 58, 57, 56, 55, 54, 53, 185, +++ /* 180 */ 550, 549, 512, 175, 467, 516, 18, 344, 342, 36, +++ /* 190 */ 544, 175, 320, 230, 231, 344, 342, 36, 341, 56, +++ /* 200 */ 55, 54, 53, 212, 531, 514, 341, 551, 3, 213, +++ /* 210 */ 515, 2, 551, 73, 7, 551, 184, 132, 551, 172, +++ /* 220 */ 551, 309, 348, 42, 71, 72, 129, 65, 66, 513, +++ /* 230 */ 510, 305, 52, 138, 69, 67, 70, 68, 64, 63, +++ /* 240 */ 62, 61, 58, 57, 56, 55, 54, 53, 243, 197, +++ /* 250 */ 282, 358, 268, 373, 264, 372, 183, 241, 436, 169, +++ /* 260 */ 356, 171, 269, 240, 471, 426, 29, 446, 506, 514, +++ /* 270 */ 445, 550, 549, 494, 515, 354, 550, 549, 359, 550, +++ /* 280 */ 549, 144, 550, 549, 550, 549, 592, 309, 71, 72, +++ /* 290 */ 129, 65, 66, 513, 510, 305, 52, 138, 69, 67, +++ /* 300 */ 70, 68, 64, 63, 62, 61, 58, 57, 56, 55, +++ /* 310 */ 54, 53, 514, 857, 82, 377, 1, 515, 268, 373, +++ /* 320 */ 264, 372, 183, 241, 362, 12, 508, 507, 500, 240, +++ /* 330 */ 17, 71, 72, 129, 65, 66, 513, 510, 305, 52, +++ /* 340 */ 138, 69, 67, 70, 68, 64, 63, 62, 61, 58, +++ /* 350 */ 57, 56, 55, 54, 53, 362, 182, 508, 507, 514, +++ /* 360 */ 362, 527, 508, 507, 515, 563, 429, 463, 182, 444, +++ /* 370 */ 375, 338, 443, 430, 379, 378, 593, 156, 71, 72, +++ /* 380 */ 129, 65, 66, 513, 510, 305, 52, 138, 69, 67, +++ /* 390 */ 70, 68, 64, 63, 62, 61, 58, 57, 56, 55, +++ /* 400 */ 54, 53, 514, 526, 542, 450, 534, 515, 286, 493, +++ /* 410 */ 453, 17, 478, 240, 80, 11, 533, 153, 194, 155, +++ /* 420 */ 286, 71, 51, 129, 65, 66, 513, 510, 305, 52, +++ /* 430 */ 138, 69, 67, 70, 68, 64, 63, 62, 61, 58, +++ /* 440 */ 57, 56, 55, 54, 53, 514, 195, 466, 160, 17, +++ /* 450 */ 515, 454, 490, 80, 459, 440, 460, 176, 239, 238, +++ /* 460 */ 80, 80, 562, 1, 71, 40, 129, 65, 66, 513, +++ /* 470 */ 510, 305, 52, 138, 69, 67, 70, 68, 64, 63, +++ /* 480 */ 62, 61, 58, 57, 56, 55, 54, 53, 514, 365, +++ /* 490 */ 154, 19, 339, 515, 80, 232, 405, 80, 165, 404, +++ /* 500 */ 193, 32, 396, 13, 32, 86, 414, 108, 72, 129, +++ /* 510 */ 65, 66, 513, 510, 305, 52, 138, 69, 67, 70, +++ /* 520 */ 68, 64, 63, 62, 61, 58, 57, 56, 55, 54, +++ /* 530 */ 53, 514, 551, 365, 483, 192, 515, 488, 323, 207, +++ /* 540 */ 366, 249, 177, 186, 87, 483, 483, 46, 38, 44, +++ /* 550 */ 458, 108, 129, 65, 66, 513, 510, 305, 52, 138, +++ /* 560 */ 69, 67, 70, 68, 64, 63, 62, 61, 58, 57, +++ /* 570 */ 56, 55, 54, 53, 274, 457, 272, 271, 270, 23, +++ /* 580 */ 8, 551, 211, 412, 307, 257, 365, 385, 201, 31, +++ /* 590 */ 217, 388, 141, 205, 387, 219, 550, 549, 482, 511, +++ /* 600 */ 215, 376, 560, 134, 90, 477, 214, 514, 392, 482, +++ /* 610 */ 482, 152, 515, 360, 203, 212, 409, 531, 800, 284, +++ /* 620 */ 365, 145, 505, 50, 300, 365, 365, 173, 321, 212, +++ /* 630 */ 487, 137, 135, 8, 41, 136, 531, 307, 93, 47, +++ /* 640 */ 48, 346, 316, 106, 106, 550, 549, 49, 371, 370, +++ /* 650 */ 518, 509, 531, 517, 520, 504, 531, 531, 162, 495, +++ /* 660 */ 170, 317, 503, 319, 223, 231, 360, 551, 502, 283, +++ /* 670 */ 162, 207, 557, 486, 212, 191, 50, 10, 289, 304, +++ /* 680 */ 303, 556, 207, 531, 8, 531, 516, 18, 307, 498, +++ /* 690 */ 498, 189, 47, 48, 393, 531, 555, 28, 302, 554, +++ /* 700 */ 49, 371, 370, 518, 484, 480, 517, 520, 322, 299, +++ /* 710 */ 553, 418, 365, 323, 17, 365, 365, 360, 416, 207, +++ /* 720 */ 322, 417, 207, 418, 327, 212, 480, 50, 207, 326, +++ /* 730 */ 106, 550, 549, 106, 105, 247, 407, 475, 332, 516, +++ /* 740 */ 18, 326, 365, 47, 48, 207, 295, 365, 475, 294, +++ /* 750 */ 158, 49, 371, 370, 518, 293, 473, 517, 520, 485, +++ /* 760 */ 106, 391, 390, 202, 148, 93, 351, 480, 204, 301, +++ /* 770 */ 333, 190, 291, 541, 60, 531, 498, 252, 453, 498, +++ /* 780 */ 365, 365, 290, 365, 501, 475, 365, 79, 475, 531, +++ /* 790 */ 516, 18, 379, 378, 475, 365, 465, 245, 89, 112, +++ /* 800 */ 365, 109, 365, 131, 121, 288, 499, 365, 365, 439, +++ /* 810 */ 365, 475, 365, 120, 365, 365, 343, 365, 119, 365, +++ /* 820 */ 118, 365, 365, 365, 365, 117, 116, 365, 126, 365, +++ /* 830 */ 125, 365, 124, 123, 365, 115, 365, 114, 431, 140, +++ /* 840 */ 139, 255, 254, 365, 365, 253, 365, 280, 365, 107, +++ /* 850 */ 365, 365, 113, 365, 111, 26, 365, 365, 365, 365, +++ /* 860 */ 365, 279, 278, 365, 277, 365, 92, 365, 104, 103, +++ /* 870 */ 365, 91, 365, 365, 102, 101, 110, 100, 99, 347, +++ /* 880 */ 25, 98, 340, 30, 24, 97, 266, 174, 96, 85, +++ /* 890 */ 95, 94, 166, 292, 78, 165, 415, 14, 163, 60, +++ /* 900 */ 164, 22, 6, 408, 5, 77, 34, 33, 159, 16, +++ /* 910 */ 157, 151, 75, 149, 15, 146, 313, 312, 395, 384, +++ /* 920 */ 143, 20, 60, 206, 21, 273, 198, 559, 375, 548, +++ /* 930 */ 547, 546, 374, 4, 540, 539, 538, 308, 535, 532, +++ /* 940 */ 530, 212, 261, 38, 260, 352, 259, 39, 258, 367, +++ /* 950 */ 529, 196, 210, 256, 521, 522, 53, 53, 209, 43, +++ /* 960 */ 496, 188, 492, 208, 256, 81, 246, 37, 479, 349, +++ /* 970 */ 244, 37, 474, 464, 276, 27, 452, 451, 433, 432, +++ /* 980 */ 275, 235, 234, 335, 424, 35, 329, 413, 410, 127, +++ /* 990 */ 161, 84, 76, 403, 38, 400, 188, 399, 224, 398, +++ /* 1000 */ 38, 150, 318, 220, 83, 147, 315, 200, 381, 383, +++ /* 1010 */ 199, 142, 545, 265, 88, 262, 523, 361, 491, 476, +++ /* 1020 */ 463, 406, 397, 287, 389, 386, 310, 382, 552, 74, +++ /* 1030 */ 306, 525, 524, 364, 519, 357, 355, 353, 497, 489, +++ /* 1040 */ 481, 263, 242, 462, 461, 456, 455, 438, 296, 345, +++ /* 1050 */ 434, 237, 425, 337, 168, 167, 336, 236, 419, 330, +++ /* 1060 */ 233, 325, 324, 229, 228, 402, 401, 227, 226, 225, +++ /* 1070 */ 222, 221, 218, 314, 394, 311, 216, 380, 251, 250, +++ /* 1080 */ 133, 350, 248, 364, 558, 59, 435, 411, 428, 212, +++}; +++static const YYCODETYPE yy_lookahead[] = { +++ /* 0 */ 21, 9, 23, 70, 71, 72, 73, 74, 75, 76, +++ /* 10 */ 77, 78, 79, 80, 81, 82, 83, 100, 101, 102, +++ /* 20 */ 41, 100, 101, 102, 20, 46, 74, 75, 76, 77, +++ /* 30 */ 78, 79, 80, 81, 82, 83, 19, 55, 56, 60, +++ /* 40 */ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +++ /* 50 */ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +++ /* 60 */ 81, 82, 83, 23, 108, 90, 87, 41, 112, 94, +++ /* 70 */ 95, 96, 46, 78, 79, 80, 81, 82, 83, 19, +++ /* 80 */ 105, 149, 143, 23, 152, 153, 60, 61, 62, 63, +++ /* 90 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, +++ /* 100 */ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, +++ /* 110 */ 31, 107, 52, 109, 110, 93, 23, 140, 78, 79, +++ /* 120 */ 78, 79, 62, 22, 147, 148, 104, 87, 34, 89, +++ /* 130 */ 113, 89, 92, 93, 183, 184, 41, 43, 78, 79, +++ /* 140 */ 80, 46, 165, 166, 205, 53, 86, 87, 88, 89, +++ /* 150 */ 211, 62, 92, 93, 128, 60, 61, 62, 63, 64, +++ /* 160 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +++ /* 170 */ 75, 76, 77, 78, 79, 80, 81, 82, 83, 146, +++ /* 180 */ 87, 88, 93, 90, 20, 125, 126, 94, 95, 96, +++ /* 190 */ 20, 90, 100, 101, 102, 94, 95, 96, 105, 80, +++ /* 200 */ 81, 82, 83, 111, 171, 41, 105, 23, 19, 48, +++ /* 210 */ 46, 19, 23, 19, 19, 23, 183, 184, 23, 17, +++ /* 220 */ 23, 62, 189, 128, 60, 61, 62, 63, 64, 65, +++ /* 230 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +++ /* 240 */ 76, 77, 78, 79, 80, 81, 82, 83, 20, 90, +++ /* 250 */ 91, 15, 93, 94, 95, 96, 97, 98, 140, 57, +++ /* 260 */ 24, 59, 144, 104, 80, 147, 148, 89, 20, 41, +++ /* 270 */ 92, 87, 88, 20, 46, 39, 87, 88, 42, 87, +++ /* 280 */ 88, 19, 87, 88, 87, 88, 113, 62, 60, 61, +++ /* 290 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +++ /* 300 */ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +++ /* 310 */ 82, 83, 41, 132, 133, 134, 135, 46, 93, 94, +++ /* 320 */ 95, 96, 97, 98, 107, 63, 109, 110, 20, 104, +++ /* 330 */ 22, 60, 61, 62, 63, 64, 65, 66, 67, 68, +++ /* 340 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, +++ /* 350 */ 79, 80, 81, 82, 83, 107, 47, 109, 110, 41, +++ /* 360 */ 107, 89, 109, 110, 46, 0, 161, 162, 47, 89, +++ /* 370 */ 99, 62, 92, 168, 9, 10, 113, 17, 60, 61, +++ /* 380 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +++ /* 390 */ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +++ /* 400 */ 82, 83, 41, 89, 155, 156, 26, 46, 99, 20, +++ /* 410 */ 161, 22, 20, 104, 22, 118, 36, 57, 22, 59, +++ /* 420 */ 99, 60, 61, 62, 63, 64, 65, 66, 67, 68, +++ /* 430 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, +++ /* 440 */ 79, 80, 81, 82, 83, 41, 50, 20, 22, 22, +++ /* 450 */ 46, 20, 22, 22, 91, 20, 93, 22, 20, 20, +++ /* 460 */ 22, 22, 134, 135, 60, 61, 62, 63, 64, 65, +++ /* 470 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +++ /* 480 */ 76, 77, 78, 79, 80, 81, 82, 83, 41, 140, +++ /* 490 */ 130, 22, 20, 46, 22, 20, 20, 22, 22, 20, +++ /* 500 */ 113, 22, 20, 19, 22, 21, 18, 158, 61, 62, +++ /* 510 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, +++ /* 520 */ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, +++ /* 530 */ 83, 41, 23, 140, 23, 113, 46, 22, 140, 140, +++ /* 540 */ 191, 192, 19, 21, 114, 23, 23, 127, 122, 129, +++ /* 550 */ 29, 158, 62, 63, 64, 65, 66, 67, 68, 69, +++ /* 560 */ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +++ /* 570 */ 80, 81, 82, 83, 11, 54, 13, 14, 15, 16, +++ /* 580 */ 19, 23, 174, 95, 23, 192, 140, 78, 79, 181, +++ /* 590 */ 27, 89, 146, 195, 92, 32, 87, 88, 87, 93, +++ /* 600 */ 37, 136, 137, 88, 158, 206, 141, 41, 99, 87, +++ /* 610 */ 87, 146, 46, 52, 51, 111, 53, 171, 130, 19, +++ /* 620 */ 140, 58, 14, 62, 103, 140, 140, 146, 124, 111, +++ /* 630 */ 115, 146, 146, 19, 68, 69, 171, 23, 158, 78, +++ /* 640 */ 79, 80, 124, 158, 158, 87, 88, 86, 87, 88, +++ /* 650 */ 89, 108, 171, 92, 93, 20, 171, 171, 146, 93, +++ /* 660 */ 146, 196, 20, 100, 101, 102, 52, 23, 20, 106, +++ /* 670 */ 146, 140, 15, 115, 111, 22, 62, 118, 198, 194, +++ /* 680 */ 194, 24, 140, 171, 19, 171, 125, 126, 23, 204, +++ /* 690 */ 204, 22, 78, 79, 140, 171, 39, 19, 167, 42, +++ /* 700 */ 86, 87, 88, 89, 115, 152, 92, 93, 196, 167, +++ /* 710 */ 53, 140, 140, 140, 22, 140, 140, 52, 25, 140, +++ /* 720 */ 196, 28, 140, 140, 212, 111, 152, 62, 140, 217, +++ /* 730 */ 158, 87, 88, 158, 158, 182, 212, 206, 45, 125, +++ /* 740 */ 126, 217, 140, 78, 79, 140, 167, 140, 206, 167, +++ /* 750 */ 146, 86, 87, 88, 89, 167, 182, 92, 93, 115, +++ /* 760 */ 158, 207, 208, 209, 146, 158, 194, 152, 195, 194, +++ /* 770 */ 199, 22, 167, 156, 200, 171, 204, 201, 161, 204, +++ /* 780 */ 140, 140, 199, 140, 20, 206, 140, 20, 206, 171, +++ /* 790 */ 125, 126, 9, 10, 206, 140, 20, 182, 158, 158, +++ /* 800 */ 140, 158, 140, 113, 158, 198, 204, 140, 140, 20, +++ /* 810 */ 140, 206, 140, 158, 140, 140, 48, 140, 158, 140, +++ /* 820 */ 158, 140, 140, 140, 140, 158, 158, 140, 158, 140, +++ /* 830 */ 158, 140, 158, 158, 140, 158, 140, 158, 139, 158, +++ /* 840 */ 158, 158, 158, 140, 140, 158, 140, 158, 140, 158, +++ /* 850 */ 140, 140, 158, 140, 158, 19, 140, 140, 140, 140, +++ /* 860 */ 140, 158, 158, 140, 158, 140, 158, 140, 158, 158, +++ /* 870 */ 140, 158, 140, 140, 158, 158, 158, 158, 158, 140, +++ /* 880 */ 19, 158, 48, 158, 19, 158, 104, 97, 158, 21, +++ /* 890 */ 158, 158, 99, 38, 49, 22, 49, 158, 99, 200, +++ /* 900 */ 130, 19, 11, 14, 9, 103, 63, 63, 123, 19, +++ /* 910 */ 114, 114, 103, 123, 19, 114, 116, 35, 87, 20, +++ /* 920 */ 21, 150, 200, 160, 160, 138, 12, 139, 99, 138, +++ /* 930 */ 138, 138, 145, 22, 139, 139, 164, 44, 139, 139, +++ /* 940 */ 171, 111, 176, 122, 177, 119, 178, 120, 179, 117, +++ /* 950 */ 180, 121, 193, 98, 151, 23, 83, 83, 202, 127, +++ /* 960 */ 186, 113, 186, 193, 98, 186, 187, 99, 188, 116, +++ /* 970 */ 187, 99, 188, 139, 159, 19, 151, 164, 139, 139, +++ /* 980 */ 159, 186, 215, 40, 216, 127, 186, 139, 169, 60, +++ /* 990 */ 169, 197, 19, 176, 122, 186, 113, 186, 186, 176, +++ /* 1000 */ 122, 169, 186, 186, 197, 169, 186, 218, 33, 219, +++ /* 1010 */ 116, 218, 142, 157, 173, 175, 157, 203, 157, 157, +++ /* 1020 */ 162, 176, 176, 152, 210, 210, 152, 152, 140, 140, +++ /* 1030 */ 154, 154, 154, 140, 140, 140, 140, 140, 140, 185, +++ /* 1040 */ 140, 172, 140, 140, 163, 163, 163, 152, 154, 154, +++ /* 1050 */ 140, 140, 140, 140, 140, 213, 214, 140, 140, 140, +++ /* 1060 */ 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, +++ /* 1070 */ 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, +++ /* 1080 */ 140, 140, 140, 140, 170, 200, 166, 170, 166, 111, +++}; +++#define YY_SHIFT_USE_DFLT (-84) +++#define YY_SHIFT_COUNT (376) +++#define YY_SHIFT_MIN (-83) +++#define YY_SHIFT_MAX (978) +++static const short yy_shift_ofst[] = { +++ /* 0 */ 783, 563, 614, 614, 93, 92, 92, 978, 614, 561, +++ /* 10 */ 665, 665, 509, 197, -21, 665, 665, 665, 665, 665, +++ /* 20 */ 159, 309, 197, 488, 197, 197, 197, 197, 197, 511, +++ /* 30 */ 271, 60, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 40 */ 665, 665, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 50 */ 665, 665, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 60 */ 665, 665, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 70 */ 665, 665, 665, 665, 225, 197, 197, 197, 197, 522, +++ /* 80 */ 197, 522, 365, 518, 504, 978, 978, -84, -84, 228, +++ /* 90 */ 164, 95, 26, 318, 318, 318, 318, 318, 318, 318, +++ /* 100 */ 318, 404, 318, 318, 318, 318, 318, 361, 318, 447, +++ /* 110 */ 490, 490, 490, -67, -67, -67, -67, -67, -48, -48, +++ /* 120 */ -48, -48, 101, -5, -5, -5, -5, 657, -25, 566, +++ /* 130 */ 657, 184, 195, 644, 558, 253, 192, 248, 189, 119, +++ /* 140 */ 119, 4, 197, 197, 197, 197, 197, 197, 217, 197, +++ /* 150 */ 197, 197, 217, 197, 197, 197, 197, 197, 217, 197, +++ /* 160 */ 197, 197, 217, 197, 197, 197, 197, -79, 693, 197, +++ /* 170 */ 217, 197, 197, 217, 197, 197, 42, 42, 523, 521, +++ /* 180 */ 521, 521, 197, 197, 515, 217, 197, 515, 197, 197, +++ /* 190 */ 197, 197, 197, 197, 42, 42, 42, 197, 197, 511, +++ /* 200 */ 511, 502, 502, 511, 426, 426, 321, 380, 380, 420, +++ /* 210 */ 380, 430, -44, 380, 484, 975, 894, 975, 883, 929, +++ /* 220 */ 973, 883, 883, 929, 878, 883, 883, 883, 872, 973, +++ /* 230 */ 929, 929, 829, 848, 858, 943, 848, 956, 829, 829, +++ /* 240 */ 893, 932, 956, 829, 853, 872, 853, 868, 848, 866, +++ /* 250 */ 848, 848, 832, 874, 874, 873, 932, 855, 830, 832, +++ /* 260 */ 827, 826, 821, 830, 829, 829, 893, 829, 829, 911, +++ /* 270 */ 914, 914, 914, 829, 914, -84, -84, -84, -84, -84, +++ /* 280 */ -84, -84, 40, 360, 236, 202, -83, 262, 482, 479, +++ /* 290 */ 476, 475, -18, 472, 439, 438, 435, 280, 178, 431, +++ /* 300 */ 363, 427, 392, 389, 308, 89, 396, 17, 94, 22, +++ /* 310 */ 899, 899, 831, 882, 800, 801, 895, 790, 809, 797, +++ /* 320 */ 796, 890, 785, 844, 843, 802, 895, 889, 891, 882, +++ /* 330 */ 799, 770, 847, 873, 845, 855, 793, 868, 782, 790, +++ /* 340 */ 865, 834, 861, 836, 768, 789, 776, 690, 767, 678, +++ /* 350 */ 589, 692, 559, 764, 669, 648, 749, 642, 653, 635, +++ /* 360 */ 600, 608, 543, 506, 422, 387, 469, 297, 314, 272, +++ /* 370 */ 263, 173, 194, 161, 170, 79, -8, +++}; +++#define YY_REDUCE_USE_DFLT (-69) +++#define YY_REDUCE_COUNT (281) +++#define YY_REDUCE_MIN (-68) +++#define YY_REDUCE_MAX (943) +++static const short yy_reduce_ofst[] = { +++ /* 0 */ 181, 465, 486, 485, -23, 524, 512, 33, 446, 575, +++ /* 10 */ 572, 349, 554, 118, 574, 607, 480, 602, 576, 393, +++ /* 20 */ 249, 205, 605, -61, 588, 582, 579, 542, 531, -68, +++ /* 30 */ 699, 739, 733, 732, 730, 727, 725, 723, 720, 719, +++ /* 40 */ 718, 717, 716, 713, 711, 710, 708, 706, 704, 703, +++ /* 50 */ 696, 694, 691, 689, 687, 684, 683, 682, 681, 679, +++ /* 60 */ 677, 675, 674, 672, 670, 668, 667, 662, 660, 655, +++ /* 70 */ 646, 643, 641, 640, 617, 573, 583, 398, 571, 615, +++ /* 80 */ 399, 553, 328, 618, 604, 514, 481, -49, 408, 722, +++ /* 90 */ 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, +++ /* 100 */ 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, +++ /* 110 */ 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, +++ /* 120 */ 722, 722, 922, 722, 722, 722, 722, 917, 920, 885, +++ /* 130 */ 914, 943, 942, 941, 940, 869, 939, 869, 938, 722, +++ /* 140 */ 722, 869, 937, 936, 935, 934, 933, 932, 869, 931, +++ /* 150 */ 930, 929, 869, 928, 927, 926, 925, 924, 869, 923, +++ /* 160 */ 922, 921, 869, 920, 919, 918, 917, 842, 842, 914, +++ /* 170 */ 869, 913, 912, 869, 911, 910, 895, 894, 895, 883, +++ /* 180 */ 882, 881, 903, 902, 854, 869, 900, 854, 898, 897, +++ /* 190 */ 896, 895, 894, 893, 878, 877, 876, 889, 888, 875, +++ /* 200 */ 874, 815, 814, 871, 846, 845, 858, 862, 861, 814, +++ /* 210 */ 859, 840, 841, 856, 870, 793, 790, 789, 820, 836, +++ /* 220 */ 807, 817, 816, 832, 823, 812, 811, 809, 817, 794, +++ /* 230 */ 821, 819, 848, 800, 768, 767, 795, 821, 840, 839, +++ /* 240 */ 813, 825, 815, 834, 784, 783, 780, 779, 779, 770, +++ /* 250 */ 776, 774, 756, 722, 722, 722, 803, 759, 770, 769, +++ /* 260 */ 768, 767, 766, 769, 800, 799, 772, 796, 795, 787, +++ /* 270 */ 793, 792, 791, 788, 787, 764, 763, 722, 722, 722, +++ /* 280 */ 722, 771, +++}; +++static const YYACTIONTYPE yy_default[] = { +++ /* 0 */ 570, 856, 797, 797, 856, 839, 839, 685, 856, 797, +++ /* 10 */ 797, 856, 822, 856, 681, 856, 856, 797, 793, 856, +++ /* 20 */ 586, 649, 856, 581, 856, 856, 856, 856, 856, 594, +++ /* 30 */ 651, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 40 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 50 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 60 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 70 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 681, +++ /* 80 */ 856, 681, 570, 856, 856, 856, 856, 685, 675, 856, +++ /* 90 */ 856, 856, 856, 730, 729, 724, 723, 837, 697, 721, +++ /* 100 */ 714, 856, 789, 790, 788, 792, 796, 856, 705, 748, +++ /* 110 */ 780, 774, 747, 779, 760, 759, 754, 753, 752, 751, +++ /* 120 */ 750, 749, 640, 758, 757, 756, 755, 856, 856, 856, +++ /* 130 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 764, +++ /* 140 */ 763, 856, 856, 856, 856, 809, 856, 856, 726, 856, +++ /* 150 */ 856, 856, 663, 856, 856, 856, 856, 856, 842, 856, +++ /* 160 */ 856, 856, 844, 856, 856, 856, 856, 856, 828, 856, +++ /* 170 */ 661, 856, 856, 583, 856, 856, 856, 856, 595, 856, +++ /* 180 */ 856, 856, 856, 856, 689, 688, 856, 683, 856, 856, +++ /* 190 */ 856, 856, 856, 856, 856, 856, 856, 856, 573, 856, +++ /* 200 */ 856, 856, 856, 856, 720, 720, 621, 708, 708, 791, +++ /* 210 */ 708, 682, 673, 708, 856, 854, 852, 854, 690, 653, +++ /* 220 */ 731, 690, 690, 653, 720, 690, 690, 690, 720, 731, +++ /* 230 */ 653, 653, 651, 690, 836, 833, 690, 801, 651, 651, +++ /* 240 */ 636, 856, 801, 651, 700, 698, 700, 698, 690, 709, +++ /* 250 */ 690, 690, 856, 767, 766, 765, 856, 709, 715, 701, +++ /* 260 */ 713, 711, 720, 856, 651, 651, 636, 651, 651, 639, +++ /* 270 */ 572, 572, 572, 651, 572, 624, 624, 777, 776, 775, +++ /* 280 */ 768, 604, 856, 856, 856, 856, 856, 816, 856, 856, +++ /* 290 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 300 */ 856, 856, 856, 856, 856, 856, 716, 737, 856, 856, +++ /* 310 */ 856, 856, 856, 856, 808, 856, 856, 856, 856, 856, +++ /* 320 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 330 */ 856, 856, 856, 832, 831, 856, 856, 856, 856, 856, +++ /* 340 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 350 */ 856, 712, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 360 */ 856, 856, 666, 856, 739, 856, 702, 856, 856, 856, +++ /* 370 */ 738, 743, 856, 856, 856, 856, 856, 565, 569, 567, +++ /* 380 */ 855, 853, 851, 850, 815, 821, 818, 820, 819, 817, +++ /* 390 */ 814, 813, 812, 811, 810, 807, 725, 722, 719, 849, +++ /* 400 */ 806, 662, 660, 843, 841, 732, 840, 838, 823, 728, +++ /* 410 */ 727, 654, 799, 798, 580, 827, 826, 825, 734, 733, +++ /* 420 */ 830, 829, 835, 834, 824, 579, 585, 643, 642, 650, +++ /* 430 */ 648, 647, 646, 645, 644, 641, 587, 598, 599, 597, +++ /* 440 */ 596, 615, 612, 614, 611, 613, 610, 609, 608, 607, +++ /* 450 */ 606, 635, 623, 622, 802, 629, 628, 633, 632, 631, +++ /* 460 */ 630, 627, 626, 625, 620, 746, 745, 735, 778, 672, +++ /* 470 */ 671, 678, 677, 676, 687, 804, 805, 803, 699, 686, +++ /* 480 */ 680, 679, 590, 589, 696, 695, 694, 693, 692, 684, +++ /* 490 */ 674, 704, 786, 783, 784, 772, 785, 691, 795, 794, +++ /* 500 */ 781, 848, 847, 846, 845, 787, 782, 669, 668, 667, +++ /* 510 */ 771, 773, 770, 769, 762, 761, 744, 742, 741, 740, +++ /* 520 */ 736, 710, 588, 703, 718, 717, 602, 601, 600, 670, +++ /* 530 */ 665, 664, 619, 707, 706, 618, 638, 637, 634, 617, +++ /* 540 */ 616, 605, 603, 584, 582, 578, 577, 576, 575, 593, +++ /* 550 */ 592, 591, 574, 659, 658, 657, 656, 655, 652, 571, +++ /* 560 */ 568, 566, 564, +++}; +++ +++/* The next table maps tokens into fallback tokens. If a construct +++** like the following: +++** +++** %fallback ID X Y Z. +++** +++** appears in the grammar, then ID becomes a fallback token for X, Y, +++** and Z. Whenever one of the tokens X, Y, or Z is input to the parser +++** but it does not parse, the type of the token is changed to ID and +++** the parse is retried before an error is thrown. +++*/ +++#ifdef YYFALLBACK +++static const YYCODETYPE yyFallback[] = { +++ 0, /* $ => nothing */ +++ 0, /* END_OF_FILE => nothing */ +++ 0, /* ILLEGAL => nothing */ +++ 0, /* SPACE => nothing */ +++ 0, /* UNCLOSED_STRING => nothing */ +++ 0, /* COMMENT => nothing */ +++ 0, /* FUNCTION => nothing */ +++ 0, /* COLUMN => nothing */ +++ 0, /* AGG_FUNCTION => nothing */ +++ 0, /* SEMI => nothing */ +++ 23, /* EXPLAIN => ID */ +++ 23, /* BEGIN => ID */ +++ 0, /* TRANSACTION => nothing */ +++ 0, /* COMMIT => nothing */ +++ 23, /* END => ID */ +++ 0, /* ROLLBACK => nothing */ +++ 0, /* CREATE => nothing */ +++ 0, /* TABLE => nothing */ +++ 23, /* TEMP => ID */ +++ 0, /* LP => nothing */ +++ 0, /* RP => nothing */ +++ 0, /* AS => nothing */ +++ 0, /* COMMA => nothing */ +++ 0, /* ID => nothing */ +++ 23, /* ABORT => ID */ +++ 23, /* AFTER => ID */ +++ 23, /* ASC => ID */ +++ 23, /* ATTACH => ID */ +++ 23, /* BEFORE => ID */ +++ 23, /* CASCADE => ID */ +++ 23, /* CLUSTER => ID */ +++ 23, /* CONFLICT => ID */ +++ 23, /* COPY => ID */ +++ 23, /* DATABASE => ID */ +++ 23, /* DEFERRED => ID */ +++ 23, /* DELIMITERS => ID */ +++ 23, /* DESC => ID */ +++ 23, /* DETACH => ID */ +++ 23, /* EACH => ID */ +++ 23, /* FAIL => ID */ +++ 23, /* FOR => ID */ +++ 23, /* GLOB => ID */ +++ 23, /* IGNORE => ID */ +++ 23, /* IMMEDIATE => ID */ +++ 23, /* INITIALLY => ID */ +++ 23, /* INSTEAD => ID */ +++ 23, /* LIKE => ID */ +++ 23, /* MATCH => ID */ +++ 23, /* KEY => ID */ +++ 23, /* OF => ID */ +++ 23, /* OFFSET => ID */ +++ 23, /* PRAGMA => ID */ +++ 23, /* RAISE => ID */ +++ 23, /* REPLACE => ID */ +++ 23, /* RESTRICT => ID */ +++ 23, /* ROW => ID */ +++ 23, /* STATEMENT => ID */ +++ 23, /* TRIGGER => ID */ +++ 23, /* VACUUM => ID */ +++ 23, /* VIEW => ID */ +++}; +++#endif /* YYFALLBACK */ +++ +++/* The following structure represents a single element of the +++** parser's stack. Information stored includes: +++** +++** + The state number for the parser at this level of the stack. +++** +++** + The value of the token stored at this level of the stack. +++** (In other words, the "major" token.) +++** +++** + The semantic value stored at this level of the stack. This is +++** the information used by the action routines in the grammar. +++** It is sometimes called the "minor" token. +++*/ +++struct yyStackEntry { +++ YYACTIONTYPE stateno; /* The state-number */ +++ YYCODETYPE major; /* The major token value. This is the code +++ ** number for the token at this stack level */ +++ YYMINORTYPE minor; /* The user-supplied minor token value. This +++ ** is the value of the token */ +++}; +++typedef struct yyStackEntry yyStackEntry; +++ +++/* The state of the parser is completely contained in an instance of +++** the following structure */ +++struct yyParser { +++ int yyidx; /* Index of top element in stack */ +++#ifdef YYTRACKMAXSTACKDEPTH +++ int yyidxMax; /* Maximum value of yyidx */ +++#endif +++ int yyerrcnt; /* Shifts left before out of the error */ +++ sqliteParserARG_SDECL /* A place to hold %extra_argument */ +++#if YYSTACKDEPTH<=0 +++ int yystksz; /* Current side of the stack */ +++ yyStackEntry *yystack; /* The parser's stack */ +++#else +++ yyStackEntry yystack[YYSTACKDEPTH]; /* The parser's stack */ +++#endif +++}; +++typedef struct yyParser yyParser; +++ +++#ifndef NDEBUG +++#include +++static FILE *yyTraceFILE = 0; +++static char *yyTracePrompt = 0; +++#endif /* NDEBUG */ +++ +++#ifndef NDEBUG +++/* +++** Turn parser tracing on by giving a stream to which to write the trace +++** and a prompt to preface each trace message. Tracing is turned off +++** by making either argument NULL +++** +++** Inputs: +++**
    +++**
  • A FILE* to which trace output should be written. +++** If NULL, then tracing is turned off. +++**
  • A prefix string written at the beginning of every +++** line of trace output. If NULL, then tracing is +++** turned off. +++**
+++** +++** Outputs: +++** None. +++*/ +++void sqliteParserTrace(FILE *TraceFILE, char *zTracePrompt){ +++ yyTraceFILE = TraceFILE; +++ yyTracePrompt = zTracePrompt; +++ if( yyTraceFILE==0 ) yyTracePrompt = 0; +++ else if( yyTracePrompt==0 ) yyTraceFILE = 0; +++} +++#endif /* NDEBUG */ +++ +++#ifndef NDEBUG +++/* For tracing shifts, the names of all terminals and nonterminals +++** are required. The following table supplies these names */ +++static const char *const yyTokenName[] = { +++ "$", "END_OF_FILE", "ILLEGAL", "SPACE", +++ "UNCLOSED_STRING", "COMMENT", "FUNCTION", "COLUMN", +++ "AGG_FUNCTION", "SEMI", "EXPLAIN", "BEGIN", +++ "TRANSACTION", "COMMIT", "END", "ROLLBACK", +++ "CREATE", "TABLE", "TEMP", "LP", +++ "RP", "AS", "COMMA", "ID", +++ "ABORT", "AFTER", "ASC", "ATTACH", +++ "BEFORE", "CASCADE", "CLUSTER", "CONFLICT", +++ "COPY", "DATABASE", "DEFERRED", "DELIMITERS", +++ "DESC", "DETACH", "EACH", "FAIL", +++ "FOR", "GLOB", "IGNORE", "IMMEDIATE", +++ "INITIALLY", "INSTEAD", "LIKE", "MATCH", +++ "KEY", "OF", "OFFSET", "PRAGMA", +++ "RAISE", "REPLACE", "RESTRICT", "ROW", +++ "STATEMENT", "TRIGGER", "VACUUM", "VIEW", +++ "OR", "AND", "NOT", "EQ", +++ "NE", "ISNULL", "NOTNULL", "IS", +++ "BETWEEN", "IN", "GT", "GE", +++ "LT", "LE", "BITAND", "BITOR", +++ "LSHIFT", "RSHIFT", "PLUS", "MINUS", +++ "STAR", "SLASH", "REM", "CONCAT", +++ "UMINUS", "UPLUS", "BITNOT", "STRING", +++ "JOIN_KW", "INTEGER", "CONSTRAINT", "DEFAULT", +++ "FLOAT", "NULL", "PRIMARY", "UNIQUE", +++ "CHECK", "REFERENCES", "COLLATE", "ON", +++ "DELETE", "UPDATE", "INSERT", "SET", +++ "DEFERRABLE", "FOREIGN", "DROP", "UNION", +++ "ALL", "INTERSECT", "EXCEPT", "SELECT", +++ "DISTINCT", "DOT", "FROM", "JOIN", +++ "USING", "ORDER", "BY", "GROUP", +++ "HAVING", "LIMIT", "WHERE", "INTO", +++ "VALUES", "VARIABLE", "CASE", "WHEN", +++ "THEN", "ELSE", "INDEX", "error", +++ "input", "cmdlist", "ecmd", "explain", +++ "cmdx", "cmd", "trans_opt", "onconf", +++ "nm", "create_table", "create_table_args", "temp", +++ "columnlist", "conslist_opt", "select", "column", +++ "columnid", "type", "carglist", "id", +++ "ids", "typename", "signed", "carg", +++ "ccons", "sortorder", "expr", "idxlist_opt", +++ "refargs", "defer_subclause", "refarg", "refact", +++ "init_deferred_pred_opt", "conslist", "tcons", "idxlist", +++ "defer_subclause_opt", "orconf", "resolvetype", "oneselect", +++ "multiselect_op", "distinct", "selcollist", "from", +++ "where_opt", "groupby_opt", "having_opt", "orderby_opt", +++ "limit_opt", "sclp", "as", "seltablist", +++ "stl_prefix", "joinop", "dbnm", "on_opt", +++ "using_opt", "seltablist_paren", "joinop2", "sortlist", +++ "sortitem", "collate", "exprlist", "setlist", +++ "insert_cmd", "inscollist_opt", "itemlist", "inscollist", +++ "likeop", "case_operand", "case_exprlist", "case_else", +++ "expritem", "uniqueflag", "idxitem", "plus_num", +++ "minus_num", "plus_opt", "number", "trigger_decl", +++ "trigger_cmd_list", "trigger_time", "trigger_event", "foreach_clause", +++ "when_clause", "trigger_cmd", "database_kw_opt", "key_opt", +++}; +++#endif /* NDEBUG */ +++ +++#ifndef NDEBUG +++/* For tracing reduce actions, the names of all rules are required. +++*/ +++static const char *const yyRuleName[] = { +++ /* 0 */ "input ::= cmdlist", +++ /* 1 */ "cmdlist ::= cmdlist ecmd", +++ /* 2 */ "cmdlist ::= ecmd", +++ /* 3 */ "ecmd ::= explain cmdx SEMI", +++ /* 4 */ "ecmd ::= SEMI", +++ /* 5 */ "cmdx ::= cmd", +++ /* 6 */ "explain ::= EXPLAIN", +++ /* 7 */ "explain ::=", +++ /* 8 */ "cmd ::= BEGIN trans_opt onconf", +++ /* 9 */ "trans_opt ::=", +++ /* 10 */ "trans_opt ::= TRANSACTION", +++ /* 11 */ "trans_opt ::= TRANSACTION nm", +++ /* 12 */ "cmd ::= COMMIT trans_opt", +++ /* 13 */ "cmd ::= END trans_opt", +++ /* 14 */ "cmd ::= ROLLBACK trans_opt", +++ /* 15 */ "cmd ::= create_table create_table_args", +++ /* 16 */ "create_table ::= CREATE temp TABLE nm", +++ /* 17 */ "temp ::= TEMP", +++ /* 18 */ "temp ::=", +++ /* 19 */ "create_table_args ::= LP columnlist conslist_opt RP", +++ /* 20 */ "create_table_args ::= AS select", +++ /* 21 */ "columnlist ::= columnlist COMMA column", +++ /* 22 */ "columnlist ::= column", +++ /* 23 */ "column ::= columnid type carglist", +++ /* 24 */ "columnid ::= nm", +++ /* 25 */ "id ::= ID", +++ /* 26 */ "ids ::= ID", +++ /* 27 */ "ids ::= STRING", +++ /* 28 */ "nm ::= ID", +++ /* 29 */ "nm ::= STRING", +++ /* 30 */ "nm ::= JOIN_KW", +++ /* 31 */ "type ::=", +++ /* 32 */ "type ::= typename", +++ /* 33 */ "type ::= typename LP signed RP", +++ /* 34 */ "type ::= typename LP signed COMMA signed RP", +++ /* 35 */ "typename ::= ids", +++ /* 36 */ "typename ::= typename ids", +++ /* 37 */ "signed ::= INTEGER", +++ /* 38 */ "signed ::= PLUS INTEGER", +++ /* 39 */ "signed ::= MINUS INTEGER", +++ /* 40 */ "carglist ::= carglist carg", +++ /* 41 */ "carglist ::=", +++ /* 42 */ "carg ::= CONSTRAINT nm ccons", +++ /* 43 */ "carg ::= ccons", +++ /* 44 */ "carg ::= DEFAULT STRING", +++ /* 45 */ "carg ::= DEFAULT ID", +++ /* 46 */ "carg ::= DEFAULT INTEGER", +++ /* 47 */ "carg ::= DEFAULT PLUS INTEGER", +++ /* 48 */ "carg ::= DEFAULT MINUS INTEGER", +++ /* 49 */ "carg ::= DEFAULT FLOAT", +++ /* 50 */ "carg ::= DEFAULT PLUS FLOAT", +++ /* 51 */ "carg ::= DEFAULT MINUS FLOAT", +++ /* 52 */ "carg ::= DEFAULT NULL", +++ /* 53 */ "ccons ::= NULL onconf", +++ /* 54 */ "ccons ::= NOT NULL onconf", +++ /* 55 */ "ccons ::= PRIMARY KEY sortorder onconf", +++ /* 56 */ "ccons ::= UNIQUE onconf", +++ /* 57 */ "ccons ::= CHECK LP expr RP onconf", +++ /* 58 */ "ccons ::= REFERENCES nm idxlist_opt refargs", +++ /* 59 */ "ccons ::= defer_subclause", +++ /* 60 */ "ccons ::= COLLATE id", +++ /* 61 */ "refargs ::=", +++ /* 62 */ "refargs ::= refargs refarg", +++ /* 63 */ "refarg ::= MATCH nm", +++ /* 64 */ "refarg ::= ON DELETE refact", +++ /* 65 */ "refarg ::= ON UPDATE refact", +++ /* 66 */ "refarg ::= ON INSERT refact", +++ /* 67 */ "refact ::= SET NULL", +++ /* 68 */ "refact ::= SET DEFAULT", +++ /* 69 */ "refact ::= CASCADE", +++ /* 70 */ "refact ::= RESTRICT", +++ /* 71 */ "defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt", +++ /* 72 */ "defer_subclause ::= DEFERRABLE init_deferred_pred_opt", +++ /* 73 */ "init_deferred_pred_opt ::=", +++ /* 74 */ "init_deferred_pred_opt ::= INITIALLY DEFERRED", +++ /* 75 */ "init_deferred_pred_opt ::= INITIALLY IMMEDIATE", +++ /* 76 */ "conslist_opt ::=", +++ /* 77 */ "conslist_opt ::= COMMA conslist", +++ /* 78 */ "conslist ::= conslist COMMA tcons", +++ /* 79 */ "conslist ::= conslist tcons", +++ /* 80 */ "conslist ::= tcons", +++ /* 81 */ "tcons ::= CONSTRAINT nm", +++ /* 82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf", +++ /* 83 */ "tcons ::= UNIQUE LP idxlist RP onconf", +++ /* 84 */ "tcons ::= CHECK expr onconf", +++ /* 85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", +++ /* 86 */ "defer_subclause_opt ::=", +++ /* 87 */ "defer_subclause_opt ::= defer_subclause", +++ /* 88 */ "onconf ::=", +++ /* 89 */ "onconf ::= ON CONFLICT resolvetype", +++ /* 90 */ "orconf ::=", +++ /* 91 */ "orconf ::= OR resolvetype", +++ /* 92 */ "resolvetype ::= ROLLBACK", +++ /* 93 */ "resolvetype ::= ABORT", +++ /* 94 */ "resolvetype ::= FAIL", +++ /* 95 */ "resolvetype ::= IGNORE", +++ /* 96 */ "resolvetype ::= REPLACE", +++ /* 97 */ "cmd ::= DROP TABLE nm", +++ /* 98 */ "cmd ::= CREATE temp VIEW nm AS select", +++ /* 99 */ "cmd ::= DROP VIEW nm", +++ /* 100 */ "cmd ::= select", +++ /* 101 */ "select ::= oneselect", +++ /* 102 */ "select ::= select multiselect_op oneselect", +++ /* 103 */ "multiselect_op ::= UNION", +++ /* 104 */ "multiselect_op ::= UNION ALL", +++ /* 105 */ "multiselect_op ::= INTERSECT", +++ /* 106 */ "multiselect_op ::= EXCEPT", +++ /* 107 */ "oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt", +++ /* 108 */ "distinct ::= DISTINCT", +++ /* 109 */ "distinct ::= ALL", +++ /* 110 */ "distinct ::=", +++ /* 111 */ "sclp ::= selcollist COMMA", +++ /* 112 */ "sclp ::=", +++ /* 113 */ "selcollist ::= sclp expr as", +++ /* 114 */ "selcollist ::= sclp STAR", +++ /* 115 */ "selcollist ::= sclp nm DOT STAR", +++ /* 116 */ "as ::= AS nm", +++ /* 117 */ "as ::= ids", +++ /* 118 */ "as ::=", +++ /* 119 */ "from ::=", +++ /* 120 */ "from ::= FROM seltablist", +++ /* 121 */ "stl_prefix ::= seltablist joinop", +++ /* 122 */ "stl_prefix ::=", +++ /* 123 */ "seltablist ::= stl_prefix nm dbnm as on_opt using_opt", +++ /* 124 */ "seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt", +++ /* 125 */ "seltablist_paren ::= select", +++ /* 126 */ "seltablist_paren ::= seltablist", +++ /* 127 */ "dbnm ::=", +++ /* 128 */ "dbnm ::= DOT nm", +++ /* 129 */ "joinop ::= COMMA", +++ /* 130 */ "joinop ::= JOIN", +++ /* 131 */ "joinop ::= JOIN_KW JOIN", +++ /* 132 */ "joinop ::= JOIN_KW nm JOIN", +++ /* 133 */ "joinop ::= JOIN_KW nm nm JOIN", +++ /* 134 */ "on_opt ::= ON expr", +++ /* 135 */ "on_opt ::=", +++ /* 136 */ "using_opt ::= USING LP idxlist RP", +++ /* 137 */ "using_opt ::=", +++ /* 138 */ "orderby_opt ::=", +++ /* 139 */ "orderby_opt ::= ORDER BY sortlist", +++ /* 140 */ "sortlist ::= sortlist COMMA sortitem collate sortorder", +++ /* 141 */ "sortlist ::= sortitem collate sortorder", +++ /* 142 */ "sortitem ::= expr", +++ /* 143 */ "sortorder ::= ASC", +++ /* 144 */ "sortorder ::= DESC", +++ /* 145 */ "sortorder ::=", +++ /* 146 */ "collate ::=", +++ /* 147 */ "collate ::= COLLATE id", +++ /* 148 */ "groupby_opt ::=", +++ /* 149 */ "groupby_opt ::= GROUP BY exprlist", +++ /* 150 */ "having_opt ::=", +++ /* 151 */ "having_opt ::= HAVING expr", +++ /* 152 */ "limit_opt ::=", +++ /* 153 */ "limit_opt ::= LIMIT signed", +++ /* 154 */ "limit_opt ::= LIMIT signed OFFSET signed", +++ /* 155 */ "limit_opt ::= LIMIT signed COMMA signed", +++ /* 156 */ "cmd ::= DELETE FROM nm dbnm where_opt", +++ /* 157 */ "where_opt ::=", +++ /* 158 */ "where_opt ::= WHERE expr", +++ /* 159 */ "cmd ::= UPDATE orconf nm dbnm SET setlist where_opt", +++ /* 160 */ "setlist ::= setlist COMMA nm EQ expr", +++ /* 161 */ "setlist ::= nm EQ expr", +++ /* 162 */ "cmd ::= insert_cmd INTO nm dbnm inscollist_opt VALUES LP itemlist RP", +++ /* 163 */ "cmd ::= insert_cmd INTO nm dbnm inscollist_opt select", +++ /* 164 */ "insert_cmd ::= INSERT orconf", +++ /* 165 */ "insert_cmd ::= REPLACE", +++ /* 166 */ "itemlist ::= itemlist COMMA expr", +++ /* 167 */ "itemlist ::= expr", +++ /* 168 */ "inscollist_opt ::=", +++ /* 169 */ "inscollist_opt ::= LP inscollist RP", +++ /* 170 */ "inscollist ::= inscollist COMMA nm", +++ /* 171 */ "inscollist ::= nm", +++ /* 172 */ "expr ::= LP expr RP", +++ /* 173 */ "expr ::= NULL", +++ /* 174 */ "expr ::= ID", +++ /* 175 */ "expr ::= JOIN_KW", +++ /* 176 */ "expr ::= nm DOT nm", +++ /* 177 */ "expr ::= nm DOT nm DOT nm", +++ /* 178 */ "expr ::= INTEGER", +++ /* 179 */ "expr ::= FLOAT", +++ /* 180 */ "expr ::= STRING", +++ /* 181 */ "expr ::= VARIABLE", +++ /* 182 */ "expr ::= ID LP exprlist RP", +++ /* 183 */ "expr ::= ID LP STAR RP", +++ /* 184 */ "expr ::= expr AND expr", +++ /* 185 */ "expr ::= expr OR expr", +++ /* 186 */ "expr ::= expr LT expr", +++ /* 187 */ "expr ::= expr GT expr", +++ /* 188 */ "expr ::= expr LE expr", +++ /* 189 */ "expr ::= expr GE expr", +++ /* 190 */ "expr ::= expr NE expr", +++ /* 191 */ "expr ::= expr EQ expr", +++ /* 192 */ "expr ::= expr BITAND expr", +++ /* 193 */ "expr ::= expr BITOR expr", +++ /* 194 */ "expr ::= expr LSHIFT expr", +++ /* 195 */ "expr ::= expr RSHIFT expr", +++ /* 196 */ "expr ::= expr likeop expr", +++ /* 197 */ "expr ::= expr NOT likeop expr", +++ /* 198 */ "likeop ::= LIKE", +++ /* 199 */ "likeop ::= GLOB", +++ /* 200 */ "expr ::= expr PLUS expr", +++ /* 201 */ "expr ::= expr MINUS expr", +++ /* 202 */ "expr ::= expr STAR expr", +++ /* 203 */ "expr ::= expr SLASH expr", +++ /* 204 */ "expr ::= expr REM expr", +++ /* 205 */ "expr ::= expr CONCAT expr", +++ /* 206 */ "expr ::= expr ISNULL", +++ /* 207 */ "expr ::= expr IS NULL", +++ /* 208 */ "expr ::= expr NOTNULL", +++ /* 209 */ "expr ::= expr NOT NULL", +++ /* 210 */ "expr ::= expr IS NOT NULL", +++ /* 211 */ "expr ::= NOT expr", +++ /* 212 */ "expr ::= BITNOT expr", +++ /* 213 */ "expr ::= MINUS expr", +++ /* 214 */ "expr ::= PLUS expr", +++ /* 215 */ "expr ::= LP select RP", +++ /* 216 */ "expr ::= expr BETWEEN expr AND expr", +++ /* 217 */ "expr ::= expr NOT BETWEEN expr AND expr", +++ /* 218 */ "expr ::= expr IN LP exprlist RP", +++ /* 219 */ "expr ::= expr IN LP select RP", +++ /* 220 */ "expr ::= expr NOT IN LP exprlist RP", +++ /* 221 */ "expr ::= expr NOT IN LP select RP", +++ /* 222 */ "expr ::= expr IN nm dbnm", +++ /* 223 */ "expr ::= expr NOT IN nm dbnm", +++ /* 224 */ "expr ::= CASE case_operand case_exprlist case_else END", +++ /* 225 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr", +++ /* 226 */ "case_exprlist ::= WHEN expr THEN expr", +++ /* 227 */ "case_else ::= ELSE expr", +++ /* 228 */ "case_else ::=", +++ /* 229 */ "case_operand ::= expr", +++ /* 230 */ "case_operand ::=", +++ /* 231 */ "exprlist ::= exprlist COMMA expritem", +++ /* 232 */ "exprlist ::= expritem", +++ /* 233 */ "expritem ::= expr", +++ /* 234 */ "expritem ::=", +++ /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf", +++ /* 236 */ "uniqueflag ::= UNIQUE", +++ /* 237 */ "uniqueflag ::=", +++ /* 238 */ "idxlist_opt ::=", +++ /* 239 */ "idxlist_opt ::= LP idxlist RP", +++ /* 240 */ "idxlist ::= idxlist COMMA idxitem", +++ /* 241 */ "idxlist ::= idxitem", +++ /* 242 */ "idxitem ::= nm sortorder", +++ /* 243 */ "cmd ::= DROP INDEX nm dbnm", +++ /* 244 */ "cmd ::= COPY orconf nm dbnm FROM nm USING DELIMITERS STRING", +++ /* 245 */ "cmd ::= COPY orconf nm dbnm FROM nm", +++ /* 246 */ "cmd ::= VACUUM", +++ /* 247 */ "cmd ::= VACUUM nm", +++ /* 248 */ "cmd ::= PRAGMA ids EQ nm", +++ /* 249 */ "cmd ::= PRAGMA ids EQ ON", +++ /* 250 */ "cmd ::= PRAGMA ids EQ plus_num", +++ /* 251 */ "cmd ::= PRAGMA ids EQ minus_num", +++ /* 252 */ "cmd ::= PRAGMA ids LP nm RP", +++ /* 253 */ "cmd ::= PRAGMA ids", +++ /* 254 */ "plus_num ::= plus_opt number", +++ /* 255 */ "minus_num ::= MINUS number", +++ /* 256 */ "number ::= INTEGER", +++ /* 257 */ "number ::= FLOAT", +++ /* 258 */ "plus_opt ::= PLUS", +++ /* 259 */ "plus_opt ::=", +++ /* 260 */ "cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END", +++ /* 261 */ "trigger_decl ::= temp TRIGGER nm trigger_time trigger_event ON nm dbnm foreach_clause when_clause", +++ /* 262 */ "trigger_time ::= BEFORE", +++ /* 263 */ "trigger_time ::= AFTER", +++ /* 264 */ "trigger_time ::= INSTEAD OF", +++ /* 265 */ "trigger_time ::=", +++ /* 266 */ "trigger_event ::= DELETE", +++ /* 267 */ "trigger_event ::= INSERT", +++ /* 268 */ "trigger_event ::= UPDATE", +++ /* 269 */ "trigger_event ::= UPDATE OF inscollist", +++ /* 270 */ "foreach_clause ::=", +++ /* 271 */ "foreach_clause ::= FOR EACH ROW", +++ /* 272 */ "foreach_clause ::= FOR EACH STATEMENT", +++ /* 273 */ "when_clause ::=", +++ /* 274 */ "when_clause ::= WHEN expr", +++ /* 275 */ "trigger_cmd_list ::= trigger_cmd SEMI trigger_cmd_list", +++ /* 276 */ "trigger_cmd_list ::=", +++ /* 277 */ "trigger_cmd ::= UPDATE orconf nm SET setlist where_opt", +++ /* 278 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP", +++ /* 279 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt select", +++ /* 280 */ "trigger_cmd ::= DELETE FROM nm where_opt", +++ /* 281 */ "trigger_cmd ::= select", +++ /* 282 */ "expr ::= RAISE LP IGNORE RP", +++ /* 283 */ "expr ::= RAISE LP ROLLBACK COMMA nm RP", +++ /* 284 */ "expr ::= RAISE LP ABORT COMMA nm RP", +++ /* 285 */ "expr ::= RAISE LP FAIL COMMA nm RP", +++ /* 286 */ "cmd ::= DROP TRIGGER nm dbnm", +++ /* 287 */ "cmd ::= ATTACH database_kw_opt ids AS nm key_opt", +++ /* 288 */ "key_opt ::= USING ids", +++ /* 289 */ "key_opt ::=", +++ /* 290 */ "database_kw_opt ::= DATABASE", +++ /* 291 */ "database_kw_opt ::=", +++ /* 292 */ "cmd ::= DETACH database_kw_opt nm", +++}; +++#endif /* NDEBUG */ +++ +++ +++#if YYSTACKDEPTH<=0 +++/* +++** Try to increase the size of the parser stack. +++*/ +++static void yyGrowStack(yyParser *p){ +++ int newSize; +++ yyStackEntry *pNew; +++ +++ newSize = p->yystksz*2 + 100; +++ pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); +++ if( pNew ){ +++ p->yystack = pNew; +++ p->yystksz = newSize; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sStack grows to %d entries!\n", +++ yyTracePrompt, p->yystksz); +++ } +++#endif +++ } +++} +++#endif +++ +++/* +++** This function allocates a new parser. +++** The only argument is a pointer to a function which works like +++** malloc. +++** +++** Inputs: +++** A pointer to the function used to allocate memory. +++** +++** Outputs: +++** A pointer to a parser. This pointer is used in subsequent calls +++** to sqliteParser and sqliteParserFree. +++*/ +++void *sqliteParserAlloc(void *(*mallocProc)(size_t)){ +++ yyParser *pParser; +++ pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); +++ if( pParser ){ +++ pParser->yyidx = -1; +++#ifdef YYTRACKMAXSTACKDEPTH +++ pParser->yyidxMax = 0; +++#endif +++#if YYSTACKDEPTH<=0 +++ pParser->yystack = NULL; +++ pParser->yystksz = 0; +++ yyGrowStack(pParser); +++#endif +++ } +++ return pParser; +++} +++ +++/* The following function deletes the value associated with a +++** symbol. The symbol can be either a terminal or nonterminal. +++** "yymajor" is the symbol code, and "yypminor" is a pointer to +++** the value. +++*/ +++static void yy_destructor( +++ yyParser *yypParser, /* The parser */ +++ YYCODETYPE yymajor, /* Type code for object to destroy */ +++ YYMINORTYPE *yypminor /* The object to be destroyed */ +++){ +++ sqliteParserARG_FETCH; +++ switch( yymajor ){ +++ /* Here is inserted the actions which take place when a +++ ** terminal or non-terminal is destroyed. This can happen +++ ** when the symbol is popped from the stack during a +++ ** reduce or during error processing or when a parser is +++ ** being destroyed before it is finished parsing. +++ ** +++ ** Note: during a reduce, the only symbols destroyed are those +++ ** which appear on the RHS of the rule, but which are not used +++ ** inside the C code. +++ */ +++ case 146: /* select */ +++ case 171: /* oneselect */ +++ case 189: /* seltablist_paren */ +++{ +++#line 286 "ext/sqlite/libsqlite/src/parse.y" +++sqliteSelectDelete((yypminor->yy179)); +++#line 1131 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 158: /* expr */ +++ case 176: /* where_opt */ +++ case 178: /* having_opt */ +++ case 187: /* on_opt */ +++ case 192: /* sortitem */ +++ case 204: /* expritem */ +++{ +++#line 533 "ext/sqlite/libsqlite/src/parse.y" +++sqliteExprDelete((yypminor->yy242)); +++#line 1143 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 159: /* idxlist_opt */ +++ case 167: /* idxlist */ +++ case 188: /* using_opt */ +++ case 197: /* inscollist_opt */ +++ case 199: /* inscollist */ +++{ +++#line 746 "ext/sqlite/libsqlite/src/parse.y" +++sqliteIdListDelete((yypminor->yy320)); +++#line 1154 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 174: /* selcollist */ +++ case 177: /* groupby_opt */ +++ case 179: /* orderby_opt */ +++ case 181: /* sclp */ +++ case 191: /* sortlist */ +++ case 194: /* exprlist */ +++ case 195: /* setlist */ +++ case 198: /* itemlist */ +++ case 202: /* case_exprlist */ +++{ +++#line 322 "ext/sqlite/libsqlite/src/parse.y" +++sqliteExprListDelete((yypminor->yy322)); +++#line 1169 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 175: /* from */ +++ case 183: /* seltablist */ +++ case 184: /* stl_prefix */ +++{ +++#line 353 "ext/sqlite/libsqlite/src/parse.y" +++sqliteSrcListDelete((yypminor->yy307)); +++#line 1178 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 212: /* trigger_cmd_list */ +++ case 217: /* trigger_cmd */ +++{ +++#line 828 "ext/sqlite/libsqlite/src/parse.y" +++sqliteDeleteTriggerStep((yypminor->yy19)); +++#line 1186 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 214: /* trigger_event */ +++{ +++#line 812 "ext/sqlite/libsqlite/src/parse.y" +++sqliteIdListDelete((yypminor->yy290).b); +++#line 1193 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ default: break; /* If no destructor action specified: do nothing */ +++ } +++} +++ +++/* +++** Pop the parser's stack once. +++** +++** If there is a destructor routine associated with the token which +++** is popped from the stack, then call it. +++** +++** Return the major token number for the symbol popped. +++*/ +++static int yy_pop_parser_stack(yyParser *pParser){ +++ YYCODETYPE yymajor; +++ yyStackEntry *yytos = &pParser->yystack[pParser->yyidx]; +++ +++ if( pParser->yyidx<0 ) return 0; +++#ifndef NDEBUG +++ if( yyTraceFILE && pParser->yyidx>=0 ){ +++ fprintf(yyTraceFILE,"%sPopping %s\n", +++ yyTracePrompt, +++ yyTokenName[yytos->major]); +++ } +++#endif +++ yymajor = yytos->major; +++ yy_destructor(pParser, yymajor, &yytos->minor); +++ pParser->yyidx--; +++ return yymajor; +++} +++ +++/* +++** Deallocate and destroy a parser. Destructors are all called for +++** all stack elements before shutting the parser down. +++** +++** Inputs: +++**
    +++**
  • A pointer to the parser. This should be a pointer +++** obtained from sqliteParserAlloc. +++**
  • A pointer to a function used to reclaim memory obtained +++** from malloc. +++**
+++*/ +++void sqliteParserFree( +++ void *p, /* The parser to be deleted */ +++ void (*freeProc)(void*) /* Function used to reclaim memory */ +++){ +++ yyParser *pParser = (yyParser*)p; +++ if( pParser==0 ) return; +++ while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser); +++#if YYSTACKDEPTH<=0 +++ free(pParser->yystack); +++#endif +++ (*freeProc)((void*)pParser); +++} +++ +++/* +++** Return the peak depth of the stack for a parser. +++*/ +++#ifdef YYTRACKMAXSTACKDEPTH +++int sqliteParserStackPeak(void *p){ +++ yyParser *pParser = (yyParser*)p; +++ return pParser->yyidxMax; +++} +++#endif +++ +++/* +++** Find the appropriate action for a parser given the terminal +++** look-ahead token iLookAhead. +++** +++** If the look-ahead token is YYNOCODE, then check to see if the action is +++** independent of the look-ahead. If it is, return the action, otherwise +++** return YY_NO_ACTION. +++*/ +++static int yy_find_shift_action( +++ yyParser *pParser, /* The parser */ +++ YYCODETYPE iLookAhead /* The look-ahead token */ +++){ +++ int i; +++ int stateno = pParser->yystack[pParser->yyidx].stateno; +++ +++ if( stateno>YY_SHIFT_COUNT +++ || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){ +++ return yy_default[stateno]; +++ } +++ assert( iLookAhead!=YYNOCODE ); +++ i += iLookAhead; +++ if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ +++ if( iLookAhead>0 ){ +++#ifdef YYFALLBACK +++ YYCODETYPE iFallback; /* Fallback token */ +++ if( iLookAhead %s\n", +++ yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]); +++ } +++#endif +++ return yy_find_shift_action(pParser, iFallback); +++ } +++#endif +++#ifdef YYWILDCARD +++ { +++ int j = i - iLookAhead + YYWILDCARD; +++ if( +++#if YY_SHIFT_MIN+YYWILDCARD<0 +++ j>=0 && +++#endif +++#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT +++ j %s\n", +++ yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]); +++ } +++#endif /* NDEBUG */ +++ return yy_action[j]; +++ } +++ } +++#endif /* YYWILDCARD */ +++ } +++ return yy_default[stateno]; +++ }else{ +++ return yy_action[i]; +++ } +++} +++ +++/* +++** Find the appropriate action for a parser given the non-terminal +++** look-ahead token iLookAhead. +++** +++** If the look-ahead token is YYNOCODE, then check to see if the action is +++** independent of the look-ahead. If it is, return the action, otherwise +++** return YY_NO_ACTION. +++*/ +++static int yy_find_reduce_action( +++ int stateno, /* Current state number */ +++ YYCODETYPE iLookAhead /* The look-ahead token */ +++){ +++ int i; +++#ifdef YYERRORSYMBOL +++ if( stateno>YY_REDUCE_COUNT ){ +++ return yy_default[stateno]; +++ } +++#else +++ assert( stateno<=YY_REDUCE_COUNT ); +++#endif +++ i = yy_reduce_ofst[stateno]; +++ assert( i!=YY_REDUCE_USE_DFLT ); +++ assert( iLookAhead!=YYNOCODE ); +++ i += iLookAhead; +++#ifdef YYERRORSYMBOL +++ if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ +++ return yy_default[stateno]; +++ } +++#else +++ assert( i>=0 && iyyidx--; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); +++ } +++#endif +++ while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +++ /* Here code is inserted which will execute if the parser +++ ** stack every overflows */ +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument var */ +++} +++ +++/* +++** Perform a shift action. +++*/ +++static void yy_shift( +++ yyParser *yypParser, /* The parser to be shifted */ +++ int yyNewState, /* The new state to shift in */ +++ int yyMajor, /* The major token to shift in */ +++ YYMINORTYPE *yypMinor /* Pointer to the minor token to shift in */ +++){ +++ yyStackEntry *yytos; +++ yypParser->yyidx++; +++#ifdef YYTRACKMAXSTACKDEPTH +++ if( yypParser->yyidx>yypParser->yyidxMax ){ +++ yypParser->yyidxMax = yypParser->yyidx; +++ } +++#endif +++#if YYSTACKDEPTH>0 +++ if( yypParser->yyidx>=YYSTACKDEPTH ){ +++ yyStackOverflow(yypParser, yypMinor); +++ return; +++ } +++#else +++ if( yypParser->yyidx>=yypParser->yystksz ){ +++ yyGrowStack(yypParser); +++ if( yypParser->yyidx>=yypParser->yystksz ){ +++ yyStackOverflow(yypParser, yypMinor); +++ return; +++ } +++ } +++#endif +++ yytos = &yypParser->yystack[yypParser->yyidx]; +++ yytos->stateno = (YYACTIONTYPE)yyNewState; +++ yytos->major = (YYCODETYPE)yyMajor; +++ yytos->minor = *yypMinor; +++#ifndef NDEBUG +++ if( yyTraceFILE && yypParser->yyidx>0 ){ +++ int i; +++ fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState); +++ fprintf(yyTraceFILE,"%sStack:",yyTracePrompt); +++ for(i=1; i<=yypParser->yyidx; i++) +++ fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]); +++ fprintf(yyTraceFILE,"\n"); +++ } +++#endif +++} +++ +++/* The following table contains information about every rule that +++** is used during the reduce. +++*/ +++static const struct { +++ YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ +++ unsigned char nrhs; /* Number of right-hand side symbols in the rule */ +++} yyRuleInfo[] = { +++ { 132, 1 }, +++ { 133, 2 }, +++ { 133, 1 }, +++ { 134, 3 }, +++ { 134, 1 }, +++ { 136, 1 }, +++ { 135, 1 }, +++ { 135, 0 }, +++ { 137, 3 }, +++ { 138, 0 }, +++ { 138, 1 }, +++ { 138, 2 }, +++ { 137, 2 }, +++ { 137, 2 }, +++ { 137, 2 }, +++ { 137, 2 }, +++ { 141, 4 }, +++ { 143, 1 }, +++ { 143, 0 }, +++ { 142, 4 }, +++ { 142, 2 }, +++ { 144, 3 }, +++ { 144, 1 }, +++ { 147, 3 }, +++ { 148, 1 }, +++ { 151, 1 }, +++ { 152, 1 }, +++ { 152, 1 }, +++ { 140, 1 }, +++ { 140, 1 }, +++ { 140, 1 }, +++ { 149, 0 }, +++ { 149, 1 }, +++ { 149, 4 }, +++ { 149, 6 }, +++ { 153, 1 }, +++ { 153, 2 }, +++ { 154, 1 }, +++ { 154, 2 }, +++ { 154, 2 }, +++ { 150, 2 }, +++ { 150, 0 }, +++ { 155, 3 }, +++ { 155, 1 }, +++ { 155, 2 }, +++ { 155, 2 }, +++ { 155, 2 }, +++ { 155, 3 }, +++ { 155, 3 }, +++ { 155, 2 }, +++ { 155, 3 }, +++ { 155, 3 }, +++ { 155, 2 }, +++ { 156, 2 }, +++ { 156, 3 }, +++ { 156, 4 }, +++ { 156, 2 }, +++ { 156, 5 }, +++ { 156, 4 }, +++ { 156, 1 }, +++ { 156, 2 }, +++ { 160, 0 }, +++ { 160, 2 }, +++ { 162, 2 }, +++ { 162, 3 }, +++ { 162, 3 }, +++ { 162, 3 }, +++ { 163, 2 }, +++ { 163, 2 }, +++ { 163, 1 }, +++ { 163, 1 }, +++ { 161, 3 }, +++ { 161, 2 }, +++ { 164, 0 }, +++ { 164, 2 }, +++ { 164, 2 }, +++ { 145, 0 }, +++ { 145, 2 }, +++ { 165, 3 }, +++ { 165, 2 }, +++ { 165, 1 }, +++ { 166, 2 }, +++ { 166, 6 }, +++ { 166, 5 }, +++ { 166, 3 }, +++ { 166, 10 }, +++ { 168, 0 }, +++ { 168, 1 }, +++ { 139, 0 }, +++ { 139, 3 }, +++ { 169, 0 }, +++ { 169, 2 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 137, 3 }, +++ { 137, 6 }, +++ { 137, 3 }, +++ { 137, 1 }, +++ { 146, 1 }, +++ { 146, 3 }, +++ { 172, 1 }, +++ { 172, 2 }, +++ { 172, 1 }, +++ { 172, 1 }, +++ { 171, 9 }, +++ { 173, 1 }, +++ { 173, 1 }, +++ { 173, 0 }, +++ { 181, 2 }, +++ { 181, 0 }, +++ { 174, 3 }, +++ { 174, 2 }, +++ { 174, 4 }, +++ { 182, 2 }, +++ { 182, 1 }, +++ { 182, 0 }, +++ { 175, 0 }, +++ { 175, 2 }, +++ { 184, 2 }, +++ { 184, 0 }, +++ { 183, 6 }, +++ { 183, 7 }, +++ { 189, 1 }, +++ { 189, 1 }, +++ { 186, 0 }, +++ { 186, 2 }, +++ { 185, 1 }, +++ { 185, 1 }, +++ { 185, 2 }, +++ { 185, 3 }, +++ { 185, 4 }, +++ { 187, 2 }, +++ { 187, 0 }, +++ { 188, 4 }, +++ { 188, 0 }, +++ { 179, 0 }, +++ { 179, 3 }, +++ { 191, 5 }, +++ { 191, 3 }, +++ { 192, 1 }, +++ { 157, 1 }, +++ { 157, 1 }, +++ { 157, 0 }, +++ { 193, 0 }, +++ { 193, 2 }, +++ { 177, 0 }, +++ { 177, 3 }, +++ { 178, 0 }, +++ { 178, 2 }, +++ { 180, 0 }, +++ { 180, 2 }, +++ { 180, 4 }, +++ { 180, 4 }, +++ { 137, 5 }, +++ { 176, 0 }, +++ { 176, 2 }, +++ { 137, 7 }, +++ { 195, 5 }, +++ { 195, 3 }, +++ { 137, 9 }, +++ { 137, 6 }, +++ { 196, 2 }, +++ { 196, 1 }, +++ { 198, 3 }, +++ { 198, 1 }, +++ { 197, 0 }, +++ { 197, 3 }, +++ { 199, 3 }, +++ { 199, 1 }, +++ { 158, 3 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 3 }, +++ { 158, 5 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 4 }, +++ { 158, 4 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 4 }, +++ { 200, 1 }, +++ { 200, 1 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 2 }, +++ { 158, 3 }, +++ { 158, 2 }, +++ { 158, 3 }, +++ { 158, 4 }, +++ { 158, 2 }, +++ { 158, 2 }, +++ { 158, 2 }, +++ { 158, 2 }, +++ { 158, 3 }, +++ { 158, 5 }, +++ { 158, 6 }, +++ { 158, 5 }, +++ { 158, 5 }, +++ { 158, 6 }, +++ { 158, 6 }, +++ { 158, 4 }, +++ { 158, 5 }, +++ { 158, 5 }, +++ { 202, 5 }, +++ { 202, 4 }, +++ { 203, 2 }, +++ { 203, 0 }, +++ { 201, 1 }, +++ { 201, 0 }, +++ { 194, 3 }, +++ { 194, 1 }, +++ { 204, 1 }, +++ { 204, 0 }, +++ { 137, 11 }, +++ { 205, 1 }, +++ { 205, 0 }, +++ { 159, 0 }, +++ { 159, 3 }, +++ { 167, 3 }, +++ { 167, 1 }, +++ { 206, 2 }, +++ { 137, 4 }, +++ { 137, 9 }, +++ { 137, 6 }, +++ { 137, 1 }, +++ { 137, 2 }, +++ { 137, 4 }, +++ { 137, 4 }, +++ { 137, 4 }, +++ { 137, 4 }, +++ { 137, 5 }, +++ { 137, 2 }, +++ { 207, 2 }, +++ { 208, 2 }, +++ { 210, 1 }, +++ { 210, 1 }, +++ { 209, 1 }, +++ { 209, 0 }, +++ { 137, 5 }, +++ { 211, 10 }, +++ { 213, 1 }, +++ { 213, 1 }, +++ { 213, 2 }, +++ { 213, 0 }, +++ { 214, 1 }, +++ { 214, 1 }, +++ { 214, 1 }, +++ { 214, 3 }, +++ { 215, 0 }, +++ { 215, 3 }, +++ { 215, 3 }, +++ { 216, 0 }, +++ { 216, 2 }, +++ { 212, 3 }, +++ { 212, 0 }, +++ { 217, 6 }, +++ { 217, 8 }, +++ { 217, 5 }, +++ { 217, 4 }, +++ { 217, 1 }, +++ { 158, 4 }, +++ { 158, 6 }, +++ { 158, 6 }, +++ { 158, 6 }, +++ { 137, 4 }, +++ { 137, 6 }, +++ { 219, 2 }, +++ { 219, 0 }, +++ { 218, 1 }, +++ { 218, 0 }, +++ { 137, 3 }, +++}; +++ +++static void yy_accept(yyParser*); /* Forward Declaration */ +++ +++/* +++** Perform a reduce action and the shift that must immediately +++** follow the reduce. +++*/ +++static void yy_reduce( +++ yyParser *yypParser, /* The parser */ +++ int yyruleno /* Number of the rule by which to reduce */ +++){ +++ int yygoto; /* The next state */ +++ int yyact; /* The next action */ +++ YYMINORTYPE yygotominor; /* The LHS of the rule reduced */ +++ yyStackEntry *yymsp; /* The top of the parser's stack */ +++ int yysize; /* Amount to pop the stack */ +++ sqliteParserARG_FETCH; +++ yymsp = &yypParser->yystack[yypParser->yyidx]; +++#ifndef NDEBUG +++ if( yyTraceFILE && yyruleno>=0 +++ && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ +++ fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, +++ yyRuleName[yyruleno]); +++ } +++#endif /* NDEBUG */ +++ +++ /* Silence complaints from purify about yygotominor being uninitialized +++ ** in some cases when it is copied into the stack after the following +++ ** switch. yygotominor is uninitialized when a rule reduces that does +++ ** not set the value of its left-hand side nonterminal. Leaving the +++ ** value of the nonterminal uninitialized is utterly harmless as long +++ ** as the value is never used. So really the only thing this code +++ ** accomplishes is to quieten purify. +++ ** +++ ** 2007-01-16: The wireshark project (www.wireshark.org) reports that +++ ** without this code, their parser segfaults. I'm not sure what there +++ ** parser is doing to make this happen. This is the second bug report +++ ** from wireshark this week. Clearly they are stressing Lemon in ways +++ ** that it has not been previously stressed... (SQLite ticket #2172) +++ */ +++ /*memset(&yygotominor, 0, sizeof(yygotominor));*/ +++ yygotominor = yyzerominor; +++ +++ +++ switch( yyruleno ){ +++ /* Beginning here are the reduction cases. A typical example +++ ** follows: +++ ** case 0: +++ ** #line +++ ** { ... } // User supplied code +++ ** #line +++ ** break; +++ */ +++ case 5: /* cmdx ::= cmd */ +++#line 72 "ext/sqlite/libsqlite/src/parse.y" +++{ sqliteExec(pParse); } +++#line 1781 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 6: /* explain ::= EXPLAIN */ +++#line 73 "ext/sqlite/libsqlite/src/parse.y" +++{ sqliteBeginParse(pParse, 1); } +++#line 1786 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 7: /* explain ::= */ +++#line 74 "ext/sqlite/libsqlite/src/parse.y" +++{ sqliteBeginParse(pParse, 0); } +++#line 1791 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 8: /* cmd ::= BEGIN trans_opt onconf */ +++#line 79 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteBeginTransaction(pParse,yymsp[0].minor.yy372);} +++#line 1796 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 12: /* cmd ::= COMMIT trans_opt */ +++ case 13: /* cmd ::= END trans_opt */ yytestcase(yyruleno==13); +++#line 83 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCommitTransaction(pParse);} +++#line 1802 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 14: /* cmd ::= ROLLBACK trans_opt */ +++#line 85 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteRollbackTransaction(pParse);} +++#line 1807 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 16: /* create_table ::= CREATE temp TABLE nm */ +++#line 90 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteStartTable(pParse,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0,yymsp[-2].minor.yy372,0); +++} +++#line 1814 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 17: /* temp ::= TEMP */ +++ case 74: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */ yytestcase(yyruleno==74); +++ case 108: /* distinct ::= DISTINCT */ yytestcase(yyruleno==108); +++#line 94 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = 1;} +++#line 1821 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 18: /* temp ::= */ +++ case 73: /* init_deferred_pred_opt ::= */ yytestcase(yyruleno==73); +++ case 75: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */ yytestcase(yyruleno==75); +++ case 86: /* defer_subclause_opt ::= */ yytestcase(yyruleno==86); +++ case 109: /* distinct ::= ALL */ yytestcase(yyruleno==109); +++ case 110: /* distinct ::= */ yytestcase(yyruleno==110); +++#line 95 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = 0;} +++#line 1831 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 19: /* create_table_args ::= LP columnlist conslist_opt RP */ +++#line 96 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteEndTable(pParse,&yymsp[0].minor.yy0,0); +++} +++#line 1838 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 20: /* create_table_args ::= AS select */ +++#line 99 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteEndTable(pParse,0,yymsp[0].minor.yy179); +++ sqliteSelectDelete(yymsp[0].minor.yy179); +++} +++#line 1846 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 24: /* columnid ::= nm */ +++#line 111 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumn(pParse,&yymsp[0].minor.yy0);} +++#line 1851 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 25: /* id ::= ID */ +++ case 26: /* ids ::= ID */ yytestcase(yyruleno==26); +++ case 27: /* ids ::= STRING */ yytestcase(yyruleno==27); +++ case 28: /* nm ::= ID */ yytestcase(yyruleno==28); +++ case 29: /* nm ::= STRING */ yytestcase(yyruleno==29); +++ case 30: /* nm ::= JOIN_KW */ yytestcase(yyruleno==30); +++ case 35: /* typename ::= ids */ yytestcase(yyruleno==35); +++ case 128: /* dbnm ::= DOT nm */ yytestcase(yyruleno==128); +++ case 254: /* plus_num ::= plus_opt number */ yytestcase(yyruleno==254); +++ case 255: /* minus_num ::= MINUS number */ yytestcase(yyruleno==255); +++ case 256: /* number ::= INTEGER */ yytestcase(yyruleno==256); +++ case 257: /* number ::= FLOAT */ yytestcase(yyruleno==257); +++#line 117 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy0 = yymsp[0].minor.yy0;} +++#line 1867 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 32: /* type ::= typename */ +++#line 160 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumnType(pParse,&yymsp[0].minor.yy0,&yymsp[0].minor.yy0);} +++#line 1872 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 33: /* type ::= typename LP signed RP */ +++#line 161 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumnType(pParse,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);} +++#line 1877 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 34: /* type ::= typename LP signed COMMA signed RP */ +++#line 163 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumnType(pParse,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);} +++#line 1882 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 36: /* typename ::= typename ids */ +++ case 242: /* idxitem ::= nm sortorder */ yytestcase(yyruleno==242); +++#line 166 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy0 = yymsp[-1].minor.yy0;} +++#line 1888 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 37: /* signed ::= INTEGER */ +++ case 38: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==38); +++#line 168 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = atoi(yymsp[0].minor.yy0.z); } +++#line 1894 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 39: /* signed ::= MINUS INTEGER */ +++#line 170 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = -atoi(yymsp[0].minor.yy0.z); } +++#line 1899 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 44: /* carg ::= DEFAULT STRING */ +++ case 45: /* carg ::= DEFAULT ID */ yytestcase(yyruleno==45); +++ case 46: /* carg ::= DEFAULT INTEGER */ yytestcase(yyruleno==46); +++ case 47: /* carg ::= DEFAULT PLUS INTEGER */ yytestcase(yyruleno==47); +++ case 49: /* carg ::= DEFAULT FLOAT */ yytestcase(yyruleno==49); +++ case 50: /* carg ::= DEFAULT PLUS FLOAT */ yytestcase(yyruleno==50); +++#line 175 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddDefaultValue(pParse,&yymsp[0].minor.yy0,0);} +++#line 1909 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 48: /* carg ::= DEFAULT MINUS INTEGER */ +++ case 51: /* carg ::= DEFAULT MINUS FLOAT */ yytestcase(yyruleno==51); +++#line 179 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddDefaultValue(pParse,&yymsp[0].minor.yy0,1);} +++#line 1915 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 54: /* ccons ::= NOT NULL onconf */ +++#line 189 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddNotNull(pParse, yymsp[0].minor.yy372);} +++#line 1920 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 55: /* ccons ::= PRIMARY KEY sortorder onconf */ +++#line 190 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddPrimaryKey(pParse,0,yymsp[0].minor.yy372);} +++#line 1925 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 56: /* ccons ::= UNIQUE onconf */ +++#line 191 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);} +++#line 1930 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 57: /* ccons ::= CHECK LP expr RP onconf */ +++#line 192 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yy_destructor(yypParser,158,&yymsp[-2].minor); +++} +++#line 1937 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 58: /* ccons ::= REFERENCES nm idxlist_opt refargs */ +++#line 194 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCreateForeignKey(pParse,0,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy320,yymsp[0].minor.yy372);} +++#line 1942 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 59: /* ccons ::= defer_subclause */ +++#line 195 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteDeferForeignKey(pParse,yymsp[0].minor.yy372);} +++#line 1947 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 60: /* ccons ::= COLLATE id */ +++#line 196 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteAddCollateType(pParse, sqliteCollateType(yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n)); +++} +++#line 1954 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 61: /* refargs ::= */ +++#line 206 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Restrict * 0x010101; } +++#line 1959 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 62: /* refargs ::= refargs refarg */ +++#line 207 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.mask) | yymsp[0].minor.yy407.value; } +++#line 1964 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 63: /* refarg ::= MATCH nm */ +++#line 209 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = 0; yygotominor.yy407.mask = 0x000000; } +++#line 1969 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 64: /* refarg ::= ON DELETE refact */ +++#line 210 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = yymsp[0].minor.yy372; yygotominor.yy407.mask = 0x0000ff; } +++#line 1974 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 65: /* refarg ::= ON UPDATE refact */ +++#line 211 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8; yygotominor.yy407.mask = 0x00ff00; } +++#line 1979 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 66: /* refarg ::= ON INSERT refact */ +++#line 212 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.mask = 0xff0000; } +++#line 1984 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 67: /* refact ::= SET NULL */ +++#line 214 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_SetNull; } +++#line 1989 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 68: /* refact ::= SET DEFAULT */ +++#line 215 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_SetDflt; } +++#line 1994 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 69: /* refact ::= CASCADE */ +++#line 216 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Cascade; } +++#line 1999 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 70: /* refact ::= RESTRICT */ +++#line 217 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Restrict; } +++#line 2004 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 71: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */ +++ case 72: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */ yytestcase(yyruleno==72); +++ case 87: /* defer_subclause_opt ::= defer_subclause */ yytestcase(yyruleno==87); +++ case 164: /* insert_cmd ::= INSERT orconf */ yytestcase(yyruleno==164); +++#line 219 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = yymsp[0].minor.yy372;} +++#line 2012 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 82: /* tcons ::= PRIMARY KEY LP idxlist RP onconf */ +++#line 236 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddPrimaryKey(pParse,yymsp[-2].minor.yy320,yymsp[0].minor.yy372);} +++#line 2017 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 83: /* tcons ::= UNIQUE LP idxlist RP onconf */ +++#line 238 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);} +++#line 2022 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 84: /* tcons ::= CHECK expr onconf */ +++#line 239 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yy_destructor(yypParser,158,&yymsp[-1].minor); +++} +++#line 2029 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 85: /* tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt */ +++#line 241 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteCreateForeignKey(pParse, yymsp[-6].minor.yy320, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy320, yymsp[-1].minor.yy372); +++ sqliteDeferForeignKey(pParse, yymsp[0].minor.yy372); +++} +++#line 2037 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 88: /* onconf ::= */ +++ case 90: /* orconf ::= */ yytestcase(yyruleno==90); +++#line 255 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Default; } +++#line 2043 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 89: /* onconf ::= ON CONFLICT resolvetype */ +++ case 91: /* orconf ::= OR resolvetype */ yytestcase(yyruleno==91); +++#line 256 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = yymsp[0].minor.yy372; } +++#line 2049 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 92: /* resolvetype ::= ROLLBACK */ +++#line 259 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Rollback; } +++#line 2054 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 93: /* resolvetype ::= ABORT */ +++ case 236: /* uniqueflag ::= UNIQUE */ yytestcase(yyruleno==236); +++#line 260 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Abort; } +++#line 2060 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 94: /* resolvetype ::= FAIL */ +++#line 261 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Fail; } +++#line 2065 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 95: /* resolvetype ::= IGNORE */ +++#line 262 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Ignore; } +++#line 2070 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 96: /* resolvetype ::= REPLACE */ +++#line 263 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Replace; } +++#line 2075 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 97: /* cmd ::= DROP TABLE nm */ +++#line 267 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteDropTable(pParse,&yymsp[0].minor.yy0,0);} +++#line 2080 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 98: /* cmd ::= CREATE temp VIEW nm AS select */ +++#line 271 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteCreateView(pParse, &yymsp[-5].minor.yy0, &yymsp[-2].minor.yy0, yymsp[0].minor.yy179, yymsp[-4].minor.yy372); +++} +++#line 2087 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 99: /* cmd ::= DROP VIEW nm */ +++#line 274 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDropTable(pParse, &yymsp[0].minor.yy0, 1); +++} +++#line 2094 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 100: /* cmd ::= select */ +++#line 280 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteSelect(pParse, yymsp[0].minor.yy179, SRT_Callback, 0, 0, 0, 0); +++ sqliteSelectDelete(yymsp[0].minor.yy179); +++} +++#line 2102 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 101: /* select ::= oneselect */ +++ case 125: /* seltablist_paren ::= select */ yytestcase(yyruleno==125); +++#line 290 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy179 = yymsp[0].minor.yy179;} +++#line 2108 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 102: /* select ::= select multiselect_op oneselect */ +++#line 291 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ if( yymsp[0].minor.yy179 ){ +++ yymsp[0].minor.yy179->op = yymsp[-1].minor.yy372; +++ yymsp[0].minor.yy179->pPrior = yymsp[-2].minor.yy179; +++ } +++ yygotominor.yy179 = yymsp[0].minor.yy179; +++} +++#line 2119 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 103: /* multiselect_op ::= UNION */ +++#line 299 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_UNION;} +++#line 2124 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 104: /* multiselect_op ::= UNION ALL */ +++#line 300 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_ALL;} +++#line 2129 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 105: /* multiselect_op ::= INTERSECT */ +++#line 301 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_INTERSECT;} +++#line 2134 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 106: /* multiselect_op ::= EXCEPT */ +++#line 302 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_EXCEPT;} +++#line 2139 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 107: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */ +++#line 304 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy179 = sqliteSelectNew(yymsp[-6].minor.yy322,yymsp[-5].minor.yy307,yymsp[-4].minor.yy242,yymsp[-3].minor.yy322,yymsp[-2].minor.yy242,yymsp[-1].minor.yy322,yymsp[-7].minor.yy372,yymsp[0].minor.yy124.limit,yymsp[0].minor.yy124.offset); +++} +++#line 2146 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 111: /* sclp ::= selcollist COMMA */ +++#line 325 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = yymsp[-1].minor.yy322;} +++#line 2151 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 112: /* sclp ::= */ +++ case 138: /* orderby_opt ::= */ yytestcase(yyruleno==138); +++ case 148: /* groupby_opt ::= */ yytestcase(yyruleno==148); +++#line 326 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = 0;} +++#line 2158 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 113: /* selcollist ::= sclp expr as */ +++#line 327 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-2].minor.yy322,yymsp[-1].minor.yy242,yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); +++} +++#line 2165 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 114: /* selcollist ::= sclp STAR */ +++#line 330 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-1].minor.yy322, sqliteExpr(TK_ALL, 0, 0, 0), 0); +++} +++#line 2172 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 115: /* selcollist ::= sclp nm DOT STAR */ +++#line 333 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0); +++ Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0); +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-3].minor.yy322, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0); +++} +++#line 2181 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 116: /* as ::= AS nm */ +++ case 117: /* as ::= ids */ yytestcase(yyruleno==117); +++ case 288: /* key_opt ::= USING ids */ yytestcase(yyruleno==288); +++#line 343 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy0 = yymsp[0].minor.yy0; } +++#line 2188 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 118: /* as ::= */ +++#line 345 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy0.n = 0; } +++#line 2193 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 119: /* from ::= */ +++#line 357 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy307 = sqliteMalloc(sizeof(*yygotominor.yy307));} +++#line 2198 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 120: /* from ::= FROM seltablist */ +++#line 358 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy307 = yymsp[0].minor.yy307;} +++#line 2203 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 121: /* stl_prefix ::= seltablist joinop */ +++#line 363 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy307 = yymsp[-1].minor.yy307; +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>0 ) yygotominor.yy307->a[yygotominor.yy307->nSrc-1].jointype = yymsp[0].minor.yy372; +++} +++#line 2211 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 122: /* stl_prefix ::= */ +++#line 367 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy307 = 0;} +++#line 2216 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 123: /* seltablist ::= stl_prefix nm dbnm as on_opt using_opt */ +++#line 368 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy307 = sqliteSrcListAppend(yymsp[-5].minor.yy307,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0); +++ if( yymsp[-2].minor.yy0.n ) sqliteSrcListAddAlias(yygotominor.yy307,&yymsp[-2].minor.yy0); +++ if( yymsp[-1].minor.yy242 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pOn = yymsp[-1].minor.yy242; } +++ else { sqliteExprDelete(yymsp[-1].minor.yy242); } +++ } +++ if( yymsp[0].minor.yy320 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pUsing = yymsp[0].minor.yy320; } +++ else { sqliteIdListDelete(yymsp[0].minor.yy320); } +++ } +++} +++#line 2232 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 124: /* seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt */ +++#line 381 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy307 = sqliteSrcListAppend(yymsp[-6].minor.yy307,0,0); +++ yygotominor.yy307->a[yygotominor.yy307->nSrc-1].pSelect = yymsp[-4].minor.yy179; +++ if( yymsp[-2].minor.yy0.n ) sqliteSrcListAddAlias(yygotominor.yy307,&yymsp[-2].minor.yy0); +++ if( yymsp[-1].minor.yy242 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pOn = yymsp[-1].minor.yy242; } +++ else { sqliteExprDelete(yymsp[-1].minor.yy242); } +++ } +++ if( yymsp[0].minor.yy320 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pUsing = yymsp[0].minor.yy320; } +++ else { sqliteIdListDelete(yymsp[0].minor.yy320); } +++ } +++} +++#line 2249 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 126: /* seltablist_paren ::= seltablist */ +++#line 402 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy179 = sqliteSelectNew(0,yymsp[0].minor.yy307,0,0,0,0,0,-1,0); +++} +++#line 2256 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 127: /* dbnm ::= */ +++#line 407 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy0.z=0; yygotominor.yy0.n=0;} +++#line 2261 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 129: /* joinop ::= COMMA */ +++ case 130: /* joinop ::= JOIN */ yytestcase(yyruleno==130); +++#line 412 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = JT_INNER; } +++#line 2267 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 131: /* joinop ::= JOIN_KW JOIN */ +++#line 414 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-1].minor.yy0,0,0); } +++#line 2272 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 132: /* joinop ::= JOIN_KW nm JOIN */ +++#line 415 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,0); } +++#line 2277 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 133: /* joinop ::= JOIN_KW nm nm JOIN */ +++#line 417 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0); } +++#line 2282 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 134: /* on_opt ::= ON expr */ +++ case 142: /* sortitem ::= expr */ yytestcase(yyruleno==142); +++ case 151: /* having_opt ::= HAVING expr */ yytestcase(yyruleno==151); +++ case 158: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==158); +++ case 227: /* case_else ::= ELSE expr */ yytestcase(yyruleno==227); +++ case 229: /* case_operand ::= expr */ yytestcase(yyruleno==229); +++ case 233: /* expritem ::= expr */ yytestcase(yyruleno==233); +++#line 421 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = yymsp[0].minor.yy242;} +++#line 2293 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 135: /* on_opt ::= */ +++ case 150: /* having_opt ::= */ yytestcase(yyruleno==150); +++ case 157: /* where_opt ::= */ yytestcase(yyruleno==157); +++ case 228: /* case_else ::= */ yytestcase(yyruleno==228); +++ case 230: /* case_operand ::= */ yytestcase(yyruleno==230); +++ case 234: /* expritem ::= */ yytestcase(yyruleno==234); +++#line 422 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = 0;} +++#line 2303 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 136: /* using_opt ::= USING LP idxlist RP */ +++ case 169: /* inscollist_opt ::= LP inscollist RP */ yytestcase(yyruleno==169); +++ case 239: /* idxlist_opt ::= LP idxlist RP */ yytestcase(yyruleno==239); +++#line 426 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = yymsp[-1].minor.yy320;} +++#line 2310 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 137: /* using_opt ::= */ +++ case 168: /* inscollist_opt ::= */ yytestcase(yyruleno==168); +++ case 238: /* idxlist_opt ::= */ yytestcase(yyruleno==238); +++#line 427 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = 0;} +++#line 2317 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 139: /* orderby_opt ::= ORDER BY sortlist */ +++ case 149: /* groupby_opt ::= GROUP BY exprlist */ yytestcase(yyruleno==149); +++#line 438 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = yymsp[0].minor.yy322;} +++#line 2323 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 140: /* sortlist ::= sortlist COMMA sortitem collate sortorder */ +++#line 439 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322,yymsp[-2].minor.yy242,0); +++ if( yygotominor.yy322 ) yygotominor.yy322->a[yygotominor.yy322->nExpr-1].sortOrder = yymsp[-1].minor.yy372+yymsp[0].minor.yy372; +++} +++#line 2331 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 141: /* sortlist ::= sortitem collate sortorder */ +++#line 443 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(0,yymsp[-2].minor.yy242,0); +++ if( yygotominor.yy322 ) yygotominor.yy322->a[0].sortOrder = yymsp[-1].minor.yy372+yymsp[0].minor.yy372; +++} +++#line 2339 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 143: /* sortorder ::= ASC */ +++ case 145: /* sortorder ::= */ yytestcase(yyruleno==145); +++#line 452 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = SQLITE_SO_ASC;} +++#line 2345 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 144: /* sortorder ::= DESC */ +++#line 453 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = SQLITE_SO_DESC;} +++#line 2350 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 146: /* collate ::= */ +++#line 455 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = SQLITE_SO_UNK;} +++#line 2355 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 147: /* collate ::= COLLATE id */ +++#line 456 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = sqliteCollateType(yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n);} +++#line 2360 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 152: /* limit_opt ::= */ +++#line 469 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = -1; yygotominor.yy124.offset = 0;} +++#line 2365 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 153: /* limit_opt ::= LIMIT signed */ +++#line 470 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = yymsp[0].minor.yy372; yygotominor.yy124.offset = 0;} +++#line 2370 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 154: /* limit_opt ::= LIMIT signed OFFSET signed */ +++#line 472 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = yymsp[-2].minor.yy372; yygotominor.yy124.offset = yymsp[0].minor.yy372;} +++#line 2375 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 155: /* limit_opt ::= LIMIT signed COMMA signed */ +++#line 474 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = yymsp[0].minor.yy372; yygotominor.yy124.offset = yymsp[-2].minor.yy372;} +++#line 2380 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 156: /* cmd ::= DELETE FROM nm dbnm where_opt */ +++#line 478 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDeleteFrom(pParse, sqliteSrcListAppend(0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0), yymsp[0].minor.yy242); +++} +++#line 2387 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 159: /* cmd ::= UPDATE orconf nm dbnm SET setlist where_opt */ +++#line 494 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteUpdate(pParse,sqliteSrcListAppend(0,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0),yymsp[-1].minor.yy322,yymsp[0].minor.yy242,yymsp[-5].minor.yy372);} +++#line 2392 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 160: /* setlist ::= setlist COMMA nm EQ expr */ +++#line 497 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322,yymsp[0].minor.yy242,&yymsp[-2].minor.yy0);} +++#line 2397 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 161: /* setlist ::= nm EQ expr */ +++#line 498 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(0,yymsp[0].minor.yy242,&yymsp[-2].minor.yy0);} +++#line 2402 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 162: /* cmd ::= insert_cmd INTO nm dbnm inscollist_opt VALUES LP itemlist RP */ +++#line 504 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteInsert(pParse, sqliteSrcListAppend(0,&yymsp[-6].minor.yy0,&yymsp[-5].minor.yy0), yymsp[-1].minor.yy322, 0, yymsp[-4].minor.yy320, yymsp[-8].minor.yy372);} +++#line 2407 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 163: /* cmd ::= insert_cmd INTO nm dbnm inscollist_opt select */ +++#line 506 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteInsert(pParse, sqliteSrcListAppend(0,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0), 0, yymsp[0].minor.yy179, yymsp[-1].minor.yy320, yymsp[-5].minor.yy372);} +++#line 2412 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 165: /* insert_cmd ::= REPLACE */ +++#line 510 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = OE_Replace;} +++#line 2417 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 166: /* itemlist ::= itemlist COMMA expr */ +++ case 231: /* exprlist ::= exprlist COMMA expritem */ yytestcase(yyruleno==231); +++#line 516 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(yymsp[-2].minor.yy322,yymsp[0].minor.yy242,0);} +++#line 2423 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 167: /* itemlist ::= expr */ +++ case 232: /* exprlist ::= expritem */ yytestcase(yyruleno==232); +++#line 517 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(0,yymsp[0].minor.yy242,0);} +++#line 2429 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 170: /* inscollist ::= inscollist COMMA nm */ +++ case 240: /* idxlist ::= idxlist COMMA idxitem */ yytestcase(yyruleno==240); +++#line 526 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = sqliteIdListAppend(yymsp[-2].minor.yy320,&yymsp[0].minor.yy0);} +++#line 2435 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 171: /* inscollist ::= nm */ +++ case 241: /* idxlist ::= idxitem */ yytestcase(yyruleno==241); +++#line 527 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = sqliteIdListAppend(0,&yymsp[0].minor.yy0);} +++#line 2441 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 172: /* expr ::= LP expr RP */ +++#line 535 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = yymsp[-1].minor.yy242; sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); } +++#line 2446 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 173: /* expr ::= NULL */ +++#line 536 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_NULL, 0, 0, &yymsp[0].minor.yy0);} +++#line 2451 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 174: /* expr ::= ID */ +++ case 175: /* expr ::= JOIN_KW */ yytestcase(yyruleno==175); +++#line 537 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0);} +++#line 2457 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 176: /* expr ::= nm DOT nm */ +++#line 539 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0); +++ yygotominor.yy242 = sqliteExpr(TK_DOT, temp1, temp2, 0); +++} +++#line 2466 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 177: /* expr ::= nm DOT nm DOT nm */ +++#line 544 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &yymsp[-4].minor.yy0); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0); +++ Expr *temp3 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0); +++ Expr *temp4 = sqliteExpr(TK_DOT, temp2, temp3, 0); +++ yygotominor.yy242 = sqliteExpr(TK_DOT, temp1, temp4, 0); +++} +++#line 2477 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 178: /* expr ::= INTEGER */ +++#line 551 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_INTEGER, 0, 0, &yymsp[0].minor.yy0);} +++#line 2482 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 179: /* expr ::= FLOAT */ +++#line 552 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_FLOAT, 0, 0, &yymsp[0].minor.yy0);} +++#line 2487 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 180: /* expr ::= STRING */ +++#line 553 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_STRING, 0, 0, &yymsp[0].minor.yy0);} +++#line 2492 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 181: /* expr ::= VARIABLE */ +++#line 554 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_VARIABLE, 0, 0, &yymsp[0].minor.yy0); +++ if( yygotominor.yy242 ) yygotominor.yy242->iTable = ++pParse->nVar; +++} +++#line 2500 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 182: /* expr ::= ID LP exprlist RP */ +++#line 558 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExprFunction(yymsp[-1].minor.yy322, &yymsp[-3].minor.yy0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0); +++} +++#line 2508 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 183: /* expr ::= ID LP STAR RP */ +++#line 562 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExprFunction(0, &yymsp[-3].minor.yy0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0); +++} +++#line 2516 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 184: /* expr ::= expr AND expr */ +++#line 566 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_AND, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2521 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 185: /* expr ::= expr OR expr */ +++#line 567 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_OR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2526 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 186: /* expr ::= expr LT expr */ +++#line 568 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_LT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2531 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 187: /* expr ::= expr GT expr */ +++#line 569 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_GT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2536 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 188: /* expr ::= expr LE expr */ +++#line 570 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_LE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2541 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 189: /* expr ::= expr GE expr */ +++#line 571 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_GE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2546 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 190: /* expr ::= expr NE expr */ +++#line 572 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_NE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2551 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 191: /* expr ::= expr EQ expr */ +++#line 573 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_EQ, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2556 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 192: /* expr ::= expr BITAND expr */ +++#line 574 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_BITAND, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2561 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 193: /* expr ::= expr BITOR expr */ +++#line 575 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_BITOR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2566 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 194: /* expr ::= expr LSHIFT expr */ +++#line 576 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_LSHIFT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2571 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 195: /* expr ::= expr RSHIFT expr */ +++#line 577 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_RSHIFT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2576 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 196: /* expr ::= expr likeop expr */ +++#line 578 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[0].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[-2].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExprFunction(pList, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->op = yymsp[-1].minor.yy372; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-2].minor.yy242->span, &yymsp[0].minor.yy242->span); +++} +++#line 2587 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 197: /* expr ::= expr NOT likeop expr */ +++#line 585 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[0].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[-3].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExprFunction(pList, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->op = yymsp[-1].minor.yy372; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,&yymsp[0].minor.yy242->span); +++} +++#line 2599 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 198: /* likeop ::= LIKE */ +++#line 594 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_LIKE;} +++#line 2604 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 199: /* likeop ::= GLOB */ +++#line 595 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_GLOB;} +++#line 2609 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 200: /* expr ::= expr PLUS expr */ +++#line 596 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_PLUS, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2614 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 201: /* expr ::= expr MINUS expr */ +++#line 597 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_MINUS, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2619 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 202: /* expr ::= expr STAR expr */ +++#line 598 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_STAR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2624 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 203: /* expr ::= expr SLASH expr */ +++#line 599 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_SLASH, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2629 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 204: /* expr ::= expr REM expr */ +++#line 600 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_REM, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2634 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 205: /* expr ::= expr CONCAT expr */ +++#line 601 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_CONCAT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2639 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 206: /* expr ::= expr ISNULL */ +++#line 602 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_ISNULL, yymsp[-1].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2647 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 207: /* expr ::= expr IS NULL */ +++#line 606 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_ISNULL, yymsp[-2].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2655 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 208: /* expr ::= expr NOTNULL */ +++#line 610 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-1].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2663 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 209: /* expr ::= expr NOT NULL */ +++#line 614 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-2].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2671 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 210: /* expr ::= expr IS NOT NULL */ +++#line 618 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-3].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2679 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 211: /* expr ::= NOT expr */ +++#line 622 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2687 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 212: /* expr ::= BITNOT expr */ +++#line 626 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_BITNOT, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2695 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 213: /* expr ::= MINUS expr */ +++#line 630 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_UMINUS, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2703 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 214: /* expr ::= PLUS expr */ +++#line 634 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_UPLUS, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2711 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 215: /* expr ::= LP select RP */ +++#line 638 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_SELECT, 0, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); +++} +++#line 2720 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 216: /* expr ::= expr BETWEEN expr AND expr */ +++#line 643 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[0].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExpr(TK_BETWEEN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = pList; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy242->span); +++} +++#line 2731 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 217: /* expr ::= expr NOT BETWEEN expr AND expr */ +++#line 650 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[0].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExpr(TK_BETWEEN, yymsp[-5].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = pList; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy242->span); +++} +++#line 2743 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 218: /* expr ::= expr IN LP exprlist RP */ +++#line 658 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-1].minor.yy322; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2752 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 219: /* expr ::= expr IN LP select RP */ +++#line 663 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2761 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 220: /* expr ::= expr NOT IN LP exprlist RP */ +++#line 668 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-5].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-1].minor.yy322; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2771 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 221: /* expr ::= expr NOT IN LP select RP */ +++#line 674 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-5].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2781 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 222: /* expr ::= expr IN nm dbnm */ +++#line 680 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-3].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,yymsp[0].minor.yy0.z?&yymsp[0].minor.yy0:&yymsp[-1].minor.yy0); +++} +++#line 2791 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 223: /* expr ::= expr NOT IN nm dbnm */ +++#line 686 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,yymsp[0].minor.yy0.z?&yymsp[0].minor.yy0:&yymsp[-1].minor.yy0); +++} +++#line 2802 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 224: /* expr ::= CASE case_operand case_exprlist case_else END */ +++#line 696 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_CASE, yymsp[-3].minor.yy242, yymsp[-1].minor.yy242, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-2].minor.yy322; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 2811 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 225: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */ +++#line 703 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322, yymsp[-2].minor.yy242, 0); +++ yygotominor.yy322 = sqliteExprListAppend(yygotominor.yy322, yymsp[0].minor.yy242, 0); +++} +++#line 2819 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 226: /* case_exprlist ::= WHEN expr THEN expr */ +++#line 707 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0); +++ yygotominor.yy322 = sqliteExprListAppend(yygotominor.yy322, yymsp[0].minor.yy242, 0); +++} +++#line 2827 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 235: /* cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf */ +++#line 732 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-5].minor.yy0, &yymsp[-4].minor.yy0); +++ if( yymsp[-9].minor.yy372!=OE_None ) yymsp[-9].minor.yy372 = yymsp[0].minor.yy372; +++ if( yymsp[-9].minor.yy372==OE_Default) yymsp[-9].minor.yy372 = OE_Abort; +++ sqliteCreateIndex(pParse, &yymsp[-7].minor.yy0, pSrc, yymsp[-2].minor.yy320, yymsp[-9].minor.yy372, &yymsp[-10].minor.yy0, &yymsp[-1].minor.yy0); +++} +++#line 2837 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 237: /* uniqueflag ::= */ +++#line 741 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_None; } +++#line 2842 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 243: /* cmd ::= DROP INDEX nm dbnm */ +++#line 758 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDropIndex(pParse, sqliteSrcListAppend(0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0)); +++} +++#line 2849 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 244: /* cmd ::= COPY orconf nm dbnm FROM nm USING DELIMITERS STRING */ +++#line 766 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCopy(pParse,sqliteSrcListAppend(0,&yymsp[-6].minor.yy0,&yymsp[-5].minor.yy0),&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0,yymsp[-7].minor.yy372);} +++#line 2854 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 245: /* cmd ::= COPY orconf nm dbnm FROM nm */ +++#line 768 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCopy(pParse,sqliteSrcListAppend(0,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0),&yymsp[0].minor.yy0,0,yymsp[-4].minor.yy372);} +++#line 2859 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 246: /* cmd ::= VACUUM */ +++#line 772 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteVacuum(pParse,0);} +++#line 2864 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 247: /* cmd ::= VACUUM nm */ +++#line 773 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteVacuum(pParse,&yymsp[0].minor.yy0);} +++#line 2869 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 248: /* cmd ::= PRAGMA ids EQ nm */ +++ case 249: /* cmd ::= PRAGMA ids EQ ON */ yytestcase(yyruleno==249); +++ case 250: /* cmd ::= PRAGMA ids EQ plus_num */ yytestcase(yyruleno==250); +++#line 777 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,0);} +++#line 2876 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 251: /* cmd ::= PRAGMA ids EQ minus_num */ +++#line 780 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,1);} +++#line 2881 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 252: /* cmd ::= PRAGMA ids LP nm RP */ +++#line 781 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[-3].minor.yy0,&yymsp[-1].minor.yy0,0);} +++#line 2886 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 253: /* cmd ::= PRAGMA ids */ +++#line 782 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[0].minor.yy0,&yymsp[0].minor.yy0,0);} +++#line 2891 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 260: /* cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END */ +++#line 792 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Token all; +++ all.z = yymsp[-4].minor.yy0.z; +++ all.n = (yymsp[0].minor.yy0.z - yymsp[-4].minor.yy0.z) + yymsp[0].minor.yy0.n; +++ sqliteFinishTrigger(pParse, yymsp[-1].minor.yy19, &all); +++} +++#line 2901 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 261: /* trigger_decl ::= temp TRIGGER nm trigger_time trigger_event ON nm dbnm foreach_clause when_clause */ +++#line 800 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pTab = sqliteSrcListAppend(0, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0); +++ sqliteBeginTrigger(pParse, &yymsp[-7].minor.yy0, yymsp[-6].minor.yy372, yymsp[-5].minor.yy290.a, yymsp[-5].minor.yy290.b, pTab, yymsp[-1].minor.yy372, yymsp[0].minor.yy182, yymsp[-9].minor.yy372); +++} +++#line 2909 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 262: /* trigger_time ::= BEFORE */ +++ case 265: /* trigger_time ::= */ yytestcase(yyruleno==265); +++#line 806 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_BEFORE; } +++#line 2915 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 263: /* trigger_time ::= AFTER */ +++#line 807 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_AFTER; } +++#line 2920 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 264: /* trigger_time ::= INSTEAD OF */ +++#line 808 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_INSTEAD;} +++#line 2925 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 266: /* trigger_event ::= DELETE */ +++#line 813 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy290.a = TK_DELETE; yygotominor.yy290.b = 0; } +++#line 2930 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 267: /* trigger_event ::= INSERT */ +++#line 814 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy290.a = TK_INSERT; yygotominor.yy290.b = 0; } +++#line 2935 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 268: /* trigger_event ::= UPDATE */ +++#line 815 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy290.a = TK_UPDATE; yygotominor.yy290.b = 0;} +++#line 2940 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 269: /* trigger_event ::= UPDATE OF inscollist */ +++#line 816 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy290.a = TK_UPDATE; yygotominor.yy290.b = yymsp[0].minor.yy320; } +++#line 2945 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 270: /* foreach_clause ::= */ +++ case 271: /* foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==271); +++#line 819 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_ROW; } +++#line 2951 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 272: /* foreach_clause ::= FOR EACH STATEMENT */ +++#line 821 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_STATEMENT; } +++#line 2956 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 273: /* when_clause ::= */ +++#line 824 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy182 = 0; } +++#line 2961 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 274: /* when_clause ::= WHEN expr */ +++#line 825 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy182 = yymsp[0].minor.yy242; } +++#line 2966 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 275: /* trigger_cmd_list ::= trigger_cmd SEMI trigger_cmd_list */ +++#line 829 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yymsp[-2].minor.yy19->pNext = yymsp[0].minor.yy19; +++ yygotominor.yy19 = yymsp[-2].minor.yy19; +++} +++#line 2974 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 276: /* trigger_cmd_list ::= */ +++#line 833 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy19 = 0; } +++#line 2979 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 277: /* trigger_cmd ::= UPDATE orconf nm SET setlist where_opt */ +++#line 839 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy19 = sqliteTriggerUpdateStep(&yymsp[-3].minor.yy0, yymsp[-1].minor.yy322, yymsp[0].minor.yy242, yymsp[-4].minor.yy372); } +++#line 2984 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 278: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP */ +++#line 844 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerInsertStep(&yymsp[-5].minor.yy0, yymsp[-4].minor.yy320, yymsp[-1].minor.yy322, 0, yymsp[-7].minor.yy372);} +++#line 2989 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 279: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt select */ +++#line 847 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerInsertStep(&yymsp[-2].minor.yy0, yymsp[-1].minor.yy320, 0, yymsp[0].minor.yy179, yymsp[-4].minor.yy372);} +++#line 2994 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 280: /* trigger_cmd ::= DELETE FROM nm where_opt */ +++#line 851 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerDeleteStep(&yymsp[-1].minor.yy0, yymsp[0].minor.yy242);} +++#line 2999 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 281: /* trigger_cmd ::= select */ +++#line 854 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerSelectStep(yymsp[0].minor.yy179); } +++#line 3004 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 282: /* expr ::= RAISE LP IGNORE RP */ +++#line 857 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, 0); +++ yygotominor.yy242->iColumn = OE_Ignore; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3013 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 283: /* expr ::= RAISE LP ROLLBACK COMMA nm RP */ +++#line 862 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); +++ yygotominor.yy242->iColumn = OE_Rollback; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3022 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 284: /* expr ::= RAISE LP ABORT COMMA nm RP */ +++#line 867 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); +++ yygotominor.yy242->iColumn = OE_Abort; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3031 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 285: /* expr ::= RAISE LP FAIL COMMA nm RP */ +++#line 872 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); +++ yygotominor.yy242->iColumn = OE_Fail; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3040 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 286: /* cmd ::= DROP TRIGGER nm dbnm */ +++#line 879 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDropTrigger(pParse,sqliteSrcListAppend(0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0)); +++} +++#line 3047 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 287: /* cmd ::= ATTACH database_kw_opt ids AS nm key_opt */ +++#line 884 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteAttach(pParse, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3054 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 289: /* key_opt ::= */ +++#line 889 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy0.z = 0; yygotominor.yy0.n = 0; } +++#line 3059 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 292: /* cmd ::= DETACH database_kw_opt nm */ +++#line 895 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDetach(pParse, &yymsp[0].minor.yy0); +++} +++#line 3066 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ default: +++ /* (0) input ::= cmdlist */ yytestcase(yyruleno==0); +++ /* (1) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==1); +++ /* (2) cmdlist ::= ecmd */ yytestcase(yyruleno==2); +++ /* (3) ecmd ::= explain cmdx SEMI */ yytestcase(yyruleno==3); +++ /* (4) ecmd ::= SEMI */ yytestcase(yyruleno==4); +++ /* (9) trans_opt ::= */ yytestcase(yyruleno==9); +++ /* (10) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==10); +++ /* (11) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==11); +++ /* (15) cmd ::= create_table create_table_args */ yytestcase(yyruleno==15); +++ /* (21) columnlist ::= columnlist COMMA column */ yytestcase(yyruleno==21); +++ /* (22) columnlist ::= column */ yytestcase(yyruleno==22); +++ /* (23) column ::= columnid type carglist */ yytestcase(yyruleno==23); +++ /* (31) type ::= */ yytestcase(yyruleno==31); +++ /* (40) carglist ::= carglist carg */ yytestcase(yyruleno==40); +++ /* (41) carglist ::= */ yytestcase(yyruleno==41); +++ /* (42) carg ::= CONSTRAINT nm ccons */ yytestcase(yyruleno==42); +++ /* (43) carg ::= ccons */ yytestcase(yyruleno==43); +++ /* (52) carg ::= DEFAULT NULL */ yytestcase(yyruleno==52); +++ /* (53) ccons ::= NULL onconf */ yytestcase(yyruleno==53); +++ /* (76) conslist_opt ::= */ yytestcase(yyruleno==76); +++ /* (77) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==77); +++ /* (78) conslist ::= conslist COMMA tcons */ yytestcase(yyruleno==78); +++ /* (79) conslist ::= conslist tcons */ yytestcase(yyruleno==79); +++ /* (80) conslist ::= tcons */ yytestcase(yyruleno==80); +++ /* (81) tcons ::= CONSTRAINT nm */ yytestcase(yyruleno==81); +++ /* (258) plus_opt ::= PLUS */ yytestcase(yyruleno==258); +++ /* (259) plus_opt ::= */ yytestcase(yyruleno==259); +++ /* (290) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==290); +++ /* (291) database_kw_opt ::= */ yytestcase(yyruleno==291); +++ break; +++ }; +++ yygoto = yyRuleInfo[yyruleno].lhs; +++ yysize = yyRuleInfo[yyruleno].nrhs; +++ yypParser->yyidx -= yysize; +++ yyact = yy_find_reduce_action(yymsp[-yysize].stateno,(YYCODETYPE)yygoto); +++ if( yyact < YYNSTATE ){ +++#ifdef NDEBUG +++ /* If we are not debugging and the reduce action popped at least +++ ** one element off the stack, then we can push the new element back +++ ** onto the stack here, and skip the stack overflow test in yy_shift(). +++ ** That gives a significant speed improvement. */ +++ if( yysize ){ +++ yypParser->yyidx++; +++ yymsp -= yysize-1; +++ yymsp->stateno = (YYACTIONTYPE)yyact; +++ yymsp->major = (YYCODETYPE)yygoto; +++ yymsp->minor = yygotominor; +++ }else +++#endif +++ { +++ yy_shift(yypParser,yyact,yygoto,&yygotominor); +++ } +++ }else{ +++ assert( yyact == YYNSTATE + YYNRULE + 1 ); +++ yy_accept(yypParser); +++ } +++} +++ +++/* +++** The following code executes when the parse fails +++*/ +++#ifndef YYNOERRORRECOVERY +++static void yy_parse_failed( +++ yyParser *yypParser /* The parser */ +++){ +++ sqliteParserARG_FETCH; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); +++ } +++#endif +++ while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +++ /* Here code is inserted which will be executed whenever the +++ ** parser fails */ +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */ +++} +++#endif /* YYNOERRORRECOVERY */ +++ +++/* +++** The following code executes when a syntax error first occurs. +++*/ +++static void yy_syntax_error( +++ yyParser *yypParser, /* The parser */ +++ int yymajor, /* The major type of the error token */ +++ YYMINORTYPE yyminor /* The minor type of the error token */ +++){ +++ sqliteParserARG_FETCH; +++#define TOKEN (yyminor.yy0) +++#line 23 "ext/sqlite/libsqlite/src/parse.y" +++ +++ if( pParse->zErrMsg==0 ){ +++ if( TOKEN.z[0] ){ +++ sqliteErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN); +++ }else{ +++ sqliteErrorMsg(pParse, "incomplete SQL statement"); +++ } +++ } +++#line 3166 "ext/sqlite/libsqlite/src/parse.c" +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */ +++} +++ +++/* +++** The following is executed when the parser accepts +++*/ +++static void yy_accept( +++ yyParser *yypParser /* The parser */ +++){ +++ sqliteParserARG_FETCH; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); +++ } +++#endif +++ while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +++ /* Here code is inserted which will be executed whenever the +++ ** parser accepts */ +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */ +++} +++ +++/* The main parser program. +++** The first argument is a pointer to a structure obtained from +++** "sqliteParserAlloc" which describes the current state of the parser. +++** The second argument is the major token number. The third is +++** the minor token. The fourth optional argument is whatever the +++** user wants (and specified in the grammar) and is available for +++** use by the action routines. +++** +++** Inputs: +++**
    +++**
  • A pointer to the parser (an opaque structure.) +++**
  • The major token number. +++**
  • The minor token number. +++**
  • An option argument of a grammar-specified type. +++**
+++** +++** Outputs: +++** None. +++*/ +++void sqliteParser( +++ void *yyp, /* The parser */ +++ int yymajor, /* The major token code number */ +++ sqliteParserTOKENTYPE yyminor /* The value for the token */ +++ sqliteParserARG_PDECL /* Optional %extra_argument parameter */ +++){ +++ YYMINORTYPE yyminorunion; +++ int yyact; /* The parser action. */ +++ int yyendofinput; /* True if we are at the end of input */ +++#ifdef YYERRORSYMBOL +++ int yyerrorhit = 0; /* True if yymajor has invoked an error */ +++#endif +++ yyParser *yypParser; /* The parser */ +++ +++ /* (re)initialize the parser, if necessary */ +++ yypParser = (yyParser*)yyp; +++ if( yypParser->yyidx<0 ){ +++#if YYSTACKDEPTH<=0 +++ if( yypParser->yystksz <=0 ){ +++ /*memset(&yyminorunion, 0, sizeof(yyminorunion));*/ +++ yyminorunion = yyzerominor; +++ yyStackOverflow(yypParser, &yyminorunion); +++ return; +++ } +++#endif +++ yypParser->yyidx = 0; +++ yypParser->yyerrcnt = -1; +++ yypParser->yystack[0].stateno = 0; +++ yypParser->yystack[0].major = 0; +++ } +++ yyminorunion.yy0 = yyminor; +++ yyendofinput = (yymajor==0); +++ sqliteParserARG_STORE; +++ +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]); +++ } +++#endif +++ +++ do{ +++ yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); +++ if( yyactyyerrcnt--; +++ yymajor = YYNOCODE; +++ }else if( yyact < YYNSTATE + YYNRULE ){ +++ yy_reduce(yypParser,yyact-YYNSTATE); +++ }else{ +++ assert( yyact == YY_ERROR_ACTION ); +++#ifdef YYERRORSYMBOL +++ int yymx; +++#endif +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sSyntax Error!\n",yyTracePrompt); +++ } +++#endif +++#ifdef YYERRORSYMBOL +++ /* A syntax error has occurred. +++ ** The response to an error depends upon whether or not the +++ ** grammar defines an error token "ERROR". +++ ** +++ ** This is what we do if the grammar does define ERROR: +++ ** +++ ** * Call the %syntax_error function. +++ ** +++ ** * Begin popping the stack until we enter a state where +++ ** it is legal to shift the error symbol, then shift +++ ** the error symbol. +++ ** +++ ** * Set the error count to three. +++ ** +++ ** * Begin accepting and shifting new tokens. No new error +++ ** processing will occur until three tokens have been +++ ** shifted successfully. +++ ** +++ */ +++ if( yypParser->yyerrcnt<0 ){ +++ yy_syntax_error(yypParser,yymajor,yyminorunion); +++ } +++ yymx = yypParser->yystack[yypParser->yyidx].major; +++ if( yymx==YYERRORSYMBOL || yyerrorhit ){ +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sDiscard input token %s\n", +++ yyTracePrompt,yyTokenName[yymajor]); +++ } +++#endif +++ yy_destructor(yypParser, (YYCODETYPE)yymajor,&yyminorunion); +++ yymajor = YYNOCODE; +++ }else{ +++ while( +++ yypParser->yyidx >= 0 && +++ yymx != YYERRORSYMBOL && +++ (yyact = yy_find_reduce_action( +++ yypParser->yystack[yypParser->yyidx].stateno, +++ YYERRORSYMBOL)) >= YYNSTATE +++ ){ +++ yy_pop_parser_stack(yypParser); +++ } +++ if( yypParser->yyidx < 0 || yymajor==0 ){ +++ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); +++ yy_parse_failed(yypParser); +++ yymajor = YYNOCODE; +++ }else if( yymx!=YYERRORSYMBOL ){ +++ YYMINORTYPE u2; +++ u2.YYERRSYMDT = 0; +++ yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2); +++ } +++ } +++ yypParser->yyerrcnt = 3; +++ yyerrorhit = 1; +++#elif defined(YYNOERRORRECOVERY) +++ /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to +++ ** do any kind of error recovery. Instead, simply invoke the syntax +++ ** error routine and continue going as if nothing had happened. +++ ** +++ ** Applications can set this macro (for example inside %include) if +++ ** they intend to abandon the parse upon the first syntax error seen. +++ */ +++ yy_syntax_error(yypParser,yymajor,yyminorunion); +++ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); +++ yymajor = YYNOCODE; +++ +++#else /* YYERRORSYMBOL is not defined */ +++ /* This is what we do if the grammar does not define ERROR: +++ ** +++ ** * Report an error message, and throw away the input token. +++ ** +++ ** * If the input token is $, then fail the parse. +++ ** +++ ** As before, subsequent error messages are suppressed until +++ ** three input tokens have been successfully shifted. +++ */ +++ if( yypParser->yyerrcnt<=0 ){ +++ yy_syntax_error(yypParser,yymajor,yyminorunion); +++ } +++ yypParser->yyerrcnt = 3; +++ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); +++ if( yyendofinput ){ +++ yy_parse_failed(yypParser); +++ } +++ yymajor = YYNOCODE; +++#endif +++ } +++ }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 ); +++ return; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/parse.h ++@@ -0,0 +1,130 @@ +++#define TK_END_OF_FILE 1 +++#define TK_ILLEGAL 2 +++#define TK_SPACE 3 +++#define TK_UNCLOSED_STRING 4 +++#define TK_COMMENT 5 +++#define TK_FUNCTION 6 +++#define TK_COLUMN 7 +++#define TK_AGG_FUNCTION 8 +++#define TK_SEMI 9 +++#define TK_EXPLAIN 10 +++#define TK_BEGIN 11 +++#define TK_TRANSACTION 12 +++#define TK_COMMIT 13 +++#define TK_END 14 +++#define TK_ROLLBACK 15 +++#define TK_CREATE 16 +++#define TK_TABLE 17 +++#define TK_TEMP 18 +++#define TK_LP 19 +++#define TK_RP 20 +++#define TK_AS 21 +++#define TK_COMMA 22 +++#define TK_ID 23 +++#define TK_ABORT 24 +++#define TK_AFTER 25 +++#define TK_ASC 26 +++#define TK_ATTACH 27 +++#define TK_BEFORE 28 +++#define TK_CASCADE 29 +++#define TK_CLUSTER 30 +++#define TK_CONFLICT 31 +++#define TK_COPY 32 +++#define TK_DATABASE 33 +++#define TK_DEFERRED 34 +++#define TK_DELIMITERS 35 +++#define TK_DESC 36 +++#define TK_DETACH 37 +++#define TK_EACH 38 +++#define TK_FAIL 39 +++#define TK_FOR 40 +++#define TK_GLOB 41 +++#define TK_IGNORE 42 +++#define TK_IMMEDIATE 43 +++#define TK_INITIALLY 44 +++#define TK_INSTEAD 45 +++#define TK_LIKE 46 +++#define TK_MATCH 47 +++#define TK_KEY 48 +++#define TK_OF 49 +++#define TK_OFFSET 50 +++#define TK_PRAGMA 51 +++#define TK_RAISE 52 +++#define TK_REPLACE 53 +++#define TK_RESTRICT 54 +++#define TK_ROW 55 +++#define TK_STATEMENT 56 +++#define TK_TRIGGER 57 +++#define TK_VACUUM 58 +++#define TK_VIEW 59 +++#define TK_OR 60 +++#define TK_AND 61 +++#define TK_NOT 62 +++#define TK_EQ 63 +++#define TK_NE 64 +++#define TK_ISNULL 65 +++#define TK_NOTNULL 66 +++#define TK_IS 67 +++#define TK_BETWEEN 68 +++#define TK_IN 69 +++#define TK_GT 70 +++#define TK_GE 71 +++#define TK_LT 72 +++#define TK_LE 73 +++#define TK_BITAND 74 +++#define TK_BITOR 75 +++#define TK_LSHIFT 76 +++#define TK_RSHIFT 77 +++#define TK_PLUS 78 +++#define TK_MINUS 79 +++#define TK_STAR 80 +++#define TK_SLASH 81 +++#define TK_REM 82 +++#define TK_CONCAT 83 +++#define TK_UMINUS 84 +++#define TK_UPLUS 85 +++#define TK_BITNOT 86 +++#define TK_STRING 87 +++#define TK_JOIN_KW 88 +++#define TK_INTEGER 89 +++#define TK_CONSTRAINT 90 +++#define TK_DEFAULT 91 +++#define TK_FLOAT 92 +++#define TK_NULL 93 +++#define TK_PRIMARY 94 +++#define TK_UNIQUE 95 +++#define TK_CHECK 96 +++#define TK_REFERENCES 97 +++#define TK_COLLATE 98 +++#define TK_ON 99 +++#define TK_DELETE 100 +++#define TK_UPDATE 101 +++#define TK_INSERT 102 +++#define TK_SET 103 +++#define TK_DEFERRABLE 104 +++#define TK_FOREIGN 105 +++#define TK_DROP 106 +++#define TK_UNION 107 +++#define TK_ALL 108 +++#define TK_INTERSECT 109 +++#define TK_EXCEPT 110 +++#define TK_SELECT 111 +++#define TK_DISTINCT 112 +++#define TK_DOT 113 +++#define TK_FROM 114 +++#define TK_JOIN 115 +++#define TK_USING 116 +++#define TK_ORDER 117 +++#define TK_BY 118 +++#define TK_GROUP 119 +++#define TK_HAVING 120 +++#define TK_LIMIT 121 +++#define TK_WHERE 122 +++#define TK_INTO 123 +++#define TK_VALUES 124 +++#define TK_VARIABLE 125 +++#define TK_CASE 126 +++#define TK_WHEN 127 +++#define TK_THEN 128 +++#define TK_ELSE 129 +++#define TK_INDEX 130 ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/parse.y ++@@ -0,0 +1,897 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains SQLite's grammar for SQL. Process this file +++** using the lemon parser generator to generate C code that runs +++** the parser. Lemon will also generate a header file containing +++** numeric codes for all of the tokens. +++** +++** @(#) $Id$ +++*/ +++%token_prefix TK_ +++%token_type {Token} +++%default_type {Token} +++%extra_argument {Parse *pParse} +++%syntax_error { +++ if( pParse->zErrMsg==0 ){ +++ if( TOKEN.z[0] ){ +++ sqliteErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN); +++ }else{ +++ sqliteErrorMsg(pParse, "incomplete SQL statement"); +++ } +++ } +++} +++%name sqliteParser +++%include { +++#include "sqliteInt.h" +++#include "parse.h" +++ +++/* +++** An instance of this structure holds information about the +++** LIMIT clause of a SELECT statement. +++*/ +++struct LimitVal { +++ int limit; /* The LIMIT value. -1 if there is no limit */ +++ int offset; /* The OFFSET. 0 if there is none */ +++}; +++ +++/* +++** An instance of the following structure describes the event of a +++** TRIGGER. "a" is the event type, one of TK_UPDATE, TK_INSERT, +++** TK_DELETE, or TK_INSTEAD. If the event is of the form +++** +++** UPDATE ON (a,b,c) +++** +++** Then the "b" IdList records the list "a,b,c". +++*/ +++struct TrigEvent { int a; IdList * b; }; +++ +++} // end %include +++ +++// These are extra tokens used by the lexer but never seen by the +++// parser. We put them in a rule so that the parser generator will +++// add them to the parse.h output file. +++// +++%nonassoc END_OF_FILE ILLEGAL SPACE UNCLOSED_STRING COMMENT FUNCTION +++ COLUMN AGG_FUNCTION. +++ +++// Input is a single SQL command +++input ::= cmdlist. +++cmdlist ::= cmdlist ecmd. +++cmdlist ::= ecmd. +++ecmd ::= explain cmdx SEMI. +++ecmd ::= SEMI. +++cmdx ::= cmd. { sqliteExec(pParse); } +++explain ::= EXPLAIN. { sqliteBeginParse(pParse, 1); } +++explain ::= . { sqliteBeginParse(pParse, 0); } +++ +++///////////////////// Begin and end transactions. //////////////////////////// +++// +++ +++cmd ::= BEGIN trans_opt onconf(R). {sqliteBeginTransaction(pParse,R);} +++trans_opt ::= . +++trans_opt ::= TRANSACTION. +++trans_opt ::= TRANSACTION nm. +++cmd ::= COMMIT trans_opt. {sqliteCommitTransaction(pParse);} +++cmd ::= END trans_opt. {sqliteCommitTransaction(pParse);} +++cmd ::= ROLLBACK trans_opt. {sqliteRollbackTransaction(pParse);} +++ +++///////////////////// The CREATE TABLE statement //////////////////////////// +++// +++cmd ::= create_table create_table_args. +++create_table ::= CREATE(X) temp(T) TABLE nm(Y). { +++ sqliteStartTable(pParse,&X,&Y,T,0); +++} +++%type temp {int} +++temp(A) ::= TEMP. {A = 1;} +++temp(A) ::= . {A = 0;} +++create_table_args ::= LP columnlist conslist_opt RP(X). { +++ sqliteEndTable(pParse,&X,0); +++} +++create_table_args ::= AS select(S). { +++ sqliteEndTable(pParse,0,S); +++ sqliteSelectDelete(S); +++} +++columnlist ::= columnlist COMMA column. +++columnlist ::= column. +++ +++// About the only information used for a column is the name of the +++// column. The type is always just "text". But the code will accept +++// an elaborate typename. Perhaps someday we'll do something with it. +++// +++column ::= columnid type carglist. +++columnid ::= nm(X). {sqliteAddColumn(pParse,&X);} +++ +++// An IDENTIFIER can be a generic identifier, or one of several +++// keywords. Any non-standard keyword can also be an identifier. +++// +++%type id {Token} +++id(A) ::= ID(X). {A = X;} +++ +++// The following directive causes tokens ABORT, AFTER, ASC, etc. to +++// fallback to ID if they will not parse as their original value. +++// This obviates the need for the "id" nonterminal. +++// +++%fallback ID +++ ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT +++ COPY DATABASE DEFERRED DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR +++ GLOB IGNORE IMMEDIATE INITIALLY INSTEAD LIKE MATCH KEY +++ OF OFFSET PRAGMA RAISE REPLACE RESTRICT ROW STATEMENT +++ TEMP TRIGGER VACUUM VIEW. +++ +++// Define operator precedence early so that this is the first occurance +++// of the operator tokens in the grammer. Keeping the operators together +++// causes them to be assigned integer values that are close together, +++// which keeps parser tables smaller. +++// +++%left OR. +++%left AND. +++%right NOT. +++%left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN. +++%left GT GE LT LE. +++%left BITAND BITOR LSHIFT RSHIFT. +++%left PLUS MINUS. +++%left STAR SLASH REM. +++%left CONCAT. +++%right UMINUS UPLUS BITNOT. +++ +++// And "ids" is an identifer-or-string. +++// +++%type ids {Token} +++ids(A) ::= ID(X). {A = X;} +++ids(A) ::= STRING(X). {A = X;} +++ +++// The name of a column or table can be any of the following: +++// +++%type nm {Token} +++nm(A) ::= ID(X). {A = X;} +++nm(A) ::= STRING(X). {A = X;} +++nm(A) ::= JOIN_KW(X). {A = X;} +++ +++type ::= . +++type ::= typename(X). {sqliteAddColumnType(pParse,&X,&X);} +++type ::= typename(X) LP signed RP(Y). {sqliteAddColumnType(pParse,&X,&Y);} +++type ::= typename(X) LP signed COMMA signed RP(Y). +++ {sqliteAddColumnType(pParse,&X,&Y);} +++%type typename {Token} +++typename(A) ::= ids(X). {A = X;} +++typename(A) ::= typename(X) ids. {A = X;} +++%type signed {int} +++signed(A) ::= INTEGER(X). { A = atoi(X.z); } +++signed(A) ::= PLUS INTEGER(X). { A = atoi(X.z); } +++signed(A) ::= MINUS INTEGER(X). { A = -atoi(X.z); } +++carglist ::= carglist carg. +++carglist ::= . +++carg ::= CONSTRAINT nm ccons. +++carg ::= ccons. +++carg ::= DEFAULT STRING(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT ID(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT INTEGER(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT PLUS INTEGER(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT MINUS INTEGER(X). {sqliteAddDefaultValue(pParse,&X,1);} +++carg ::= DEFAULT FLOAT(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT PLUS FLOAT(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT MINUS FLOAT(X). {sqliteAddDefaultValue(pParse,&X,1);} +++carg ::= DEFAULT NULL. +++ +++// In addition to the type name, we also care about the primary key and +++// UNIQUE constraints. +++// +++ccons ::= NULL onconf. +++ccons ::= NOT NULL onconf(R). {sqliteAddNotNull(pParse, R);} +++ccons ::= PRIMARY KEY sortorder onconf(R). {sqliteAddPrimaryKey(pParse,0,R);} +++ccons ::= UNIQUE onconf(R). {sqliteCreateIndex(pParse,0,0,0,R,0,0);} +++ccons ::= CHECK LP expr RP onconf. +++ccons ::= REFERENCES nm(T) idxlist_opt(TA) refargs(R). +++ {sqliteCreateForeignKey(pParse,0,&T,TA,R);} +++ccons ::= defer_subclause(D). {sqliteDeferForeignKey(pParse,D);} +++ccons ::= COLLATE id(C). { +++ sqliteAddCollateType(pParse, sqliteCollateType(C.z, C.n)); +++} +++ +++// The next group of rules parses the arguments to a REFERENCES clause +++// that determine if the referential integrity checking is deferred or +++// or immediate and which determine what action to take if a ref-integ +++// check fails. +++// +++%type refargs {int} +++refargs(A) ::= . { A = OE_Restrict * 0x010101; } +++refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; } +++%type refarg {struct {int value; int mask;}} +++refarg(A) ::= MATCH nm. { A.value = 0; A.mask = 0x000000; } +++refarg(A) ::= ON DELETE refact(X). { A.value = X; A.mask = 0x0000ff; } +++refarg(A) ::= ON UPDATE refact(X). { A.value = X<<8; A.mask = 0x00ff00; } +++refarg(A) ::= ON INSERT refact(X). { A.value = X<<16; A.mask = 0xff0000; } +++%type refact {int} +++refact(A) ::= SET NULL. { A = OE_SetNull; } +++refact(A) ::= SET DEFAULT. { A = OE_SetDflt; } +++refact(A) ::= CASCADE. { A = OE_Cascade; } +++refact(A) ::= RESTRICT. { A = OE_Restrict; } +++%type defer_subclause {int} +++defer_subclause(A) ::= NOT DEFERRABLE init_deferred_pred_opt(X). {A = X;} +++defer_subclause(A) ::= DEFERRABLE init_deferred_pred_opt(X). {A = X;} +++%type init_deferred_pred_opt {int} +++init_deferred_pred_opt(A) ::= . {A = 0;} +++init_deferred_pred_opt(A) ::= INITIALLY DEFERRED. {A = 1;} +++init_deferred_pred_opt(A) ::= INITIALLY IMMEDIATE. {A = 0;} +++ +++// For the time being, the only constraint we care about is the primary +++// key and UNIQUE. Both create indices. +++// +++conslist_opt ::= . +++conslist_opt ::= COMMA conslist. +++conslist ::= conslist COMMA tcons. +++conslist ::= conslist tcons. +++conslist ::= tcons. +++tcons ::= CONSTRAINT nm. +++tcons ::= PRIMARY KEY LP idxlist(X) RP onconf(R). +++ {sqliteAddPrimaryKey(pParse,X,R);} +++tcons ::= UNIQUE LP idxlist(X) RP onconf(R). +++ {sqliteCreateIndex(pParse,0,0,X,R,0,0);} +++tcons ::= CHECK expr onconf. +++tcons ::= FOREIGN KEY LP idxlist(FA) RP +++ REFERENCES nm(T) idxlist_opt(TA) refargs(R) defer_subclause_opt(D). { +++ sqliteCreateForeignKey(pParse, FA, &T, TA, R); +++ sqliteDeferForeignKey(pParse, D); +++} +++%type defer_subclause_opt {int} +++defer_subclause_opt(A) ::= . {A = 0;} +++defer_subclause_opt(A) ::= defer_subclause(X). {A = X;} +++ +++// The following is a non-standard extension that allows us to declare the +++// default behavior when there is a constraint conflict. +++// +++%type onconf {int} +++%type orconf {int} +++%type resolvetype {int} +++onconf(A) ::= . { A = OE_Default; } +++onconf(A) ::= ON CONFLICT resolvetype(X). { A = X; } +++orconf(A) ::= . { A = OE_Default; } +++orconf(A) ::= OR resolvetype(X). { A = X; } +++resolvetype(A) ::= ROLLBACK. { A = OE_Rollback; } +++resolvetype(A) ::= ABORT. { A = OE_Abort; } +++resolvetype(A) ::= FAIL. { A = OE_Fail; } +++resolvetype(A) ::= IGNORE. { A = OE_Ignore; } +++resolvetype(A) ::= REPLACE. { A = OE_Replace; } +++ +++////////////////////////// The DROP TABLE ///////////////////////////////////// +++// +++cmd ::= DROP TABLE nm(X). {sqliteDropTable(pParse,&X,0);} +++ +++///////////////////// The CREATE VIEW statement ///////////////////////////// +++// +++cmd ::= CREATE(X) temp(T) VIEW nm(Y) AS select(S). { +++ sqliteCreateView(pParse, &X, &Y, S, T); +++} +++cmd ::= DROP VIEW nm(X). { +++ sqliteDropTable(pParse, &X, 1); +++} +++ +++//////////////////////// The SELECT statement ///////////////////////////////// +++// +++cmd ::= select(X). { +++ sqliteSelect(pParse, X, SRT_Callback, 0, 0, 0, 0); +++ sqliteSelectDelete(X); +++} +++ +++%type select {Select*} +++%destructor select {sqliteSelectDelete($$);} +++%type oneselect {Select*} +++%destructor oneselect {sqliteSelectDelete($$);} +++ +++select(A) ::= oneselect(X). {A = X;} +++select(A) ::= select(X) multiselect_op(Y) oneselect(Z). { +++ if( Z ){ +++ Z->op = Y; +++ Z->pPrior = X; +++ } +++ A = Z; +++} +++%type multiselect_op {int} +++multiselect_op(A) ::= UNION. {A = TK_UNION;} +++multiselect_op(A) ::= UNION ALL. {A = TK_ALL;} +++multiselect_op(A) ::= INTERSECT. {A = TK_INTERSECT;} +++multiselect_op(A) ::= EXCEPT. {A = TK_EXCEPT;} +++oneselect(A) ::= SELECT distinct(D) selcollist(W) from(X) where_opt(Y) +++ groupby_opt(P) having_opt(Q) orderby_opt(Z) limit_opt(L). { +++ A = sqliteSelectNew(W,X,Y,P,Q,Z,D,L.limit,L.offset); +++} +++ +++// The "distinct" nonterminal is true (1) if the DISTINCT keyword is +++// present and false (0) if it is not. +++// +++%type distinct {int} +++distinct(A) ::= DISTINCT. {A = 1;} +++distinct(A) ::= ALL. {A = 0;} +++distinct(A) ::= . {A = 0;} +++ +++// selcollist is a list of expressions that are to become the return +++// values of the SELECT statement. The "*" in statements like +++// "SELECT * FROM ..." is encoded as a special expression with an +++// opcode of TK_ALL. +++// +++%type selcollist {ExprList*} +++%destructor selcollist {sqliteExprListDelete($$);} +++%type sclp {ExprList*} +++%destructor sclp {sqliteExprListDelete($$);} +++sclp(A) ::= selcollist(X) COMMA. {A = X;} +++sclp(A) ::= . {A = 0;} +++selcollist(A) ::= sclp(P) expr(X) as(Y). { +++ A = sqliteExprListAppend(P,X,Y.n?&Y:0); +++} +++selcollist(A) ::= sclp(P) STAR. { +++ A = sqliteExprListAppend(P, sqliteExpr(TK_ALL, 0, 0, 0), 0); +++} +++selcollist(A) ::= sclp(P) nm(X) DOT STAR. { +++ Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0); +++ Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &X); +++ A = sqliteExprListAppend(P, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0); +++} +++ +++// An option "AS " phrase that can follow one of the expressions that +++// define the result set, or one of the tables in the FROM clause. +++// +++%type as {Token} +++as(X) ::= AS nm(Y). { X = Y; } +++as(X) ::= ids(Y). { X = Y; } +++as(X) ::= . { X.n = 0; } +++ +++ +++%type seltablist {SrcList*} +++%destructor seltablist {sqliteSrcListDelete($$);} +++%type stl_prefix {SrcList*} +++%destructor stl_prefix {sqliteSrcListDelete($$);} +++%type from {SrcList*} +++%destructor from {sqliteSrcListDelete($$);} +++ +++// A complete FROM clause. +++// +++from(A) ::= . {A = sqliteMalloc(sizeof(*A));} +++from(A) ::= FROM seltablist(X). {A = X;} +++ +++// "seltablist" is a "Select Table List" - the content of the FROM clause +++// in a SELECT statement. "stl_prefix" is a prefix of this list. +++// +++stl_prefix(A) ::= seltablist(X) joinop(Y). { +++ A = X; +++ if( A && A->nSrc>0 ) A->a[A->nSrc-1].jointype = Y; +++} +++stl_prefix(A) ::= . {A = 0;} +++seltablist(A) ::= stl_prefix(X) nm(Y) dbnm(D) as(Z) on_opt(N) using_opt(U). { +++ A = sqliteSrcListAppend(X,&Y,&D); +++ if( Z.n ) sqliteSrcListAddAlias(A,&Z); +++ if( N ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; } +++ else { sqliteExprDelete(N); } +++ } +++ if( U ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; } +++ else { sqliteIdListDelete(U); } +++ } +++} +++seltablist(A) ::= stl_prefix(X) LP seltablist_paren(S) RP +++ as(Z) on_opt(N) using_opt(U). { +++ A = sqliteSrcListAppend(X,0,0); +++ A->a[A->nSrc-1].pSelect = S; +++ if( Z.n ) sqliteSrcListAddAlias(A,&Z); +++ if( N ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; } +++ else { sqliteExprDelete(N); } +++ } +++ if( U ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; } +++ else { sqliteIdListDelete(U); } +++ } +++} +++ +++// A seltablist_paren nonterminal represents anything in a FROM that +++// is contained inside parentheses. This can be either a subquery or +++// a grouping of table and subqueries. +++// +++%type seltablist_paren {Select*} +++%destructor seltablist_paren {sqliteSelectDelete($$);} +++seltablist_paren(A) ::= select(S). {A = S;} +++seltablist_paren(A) ::= seltablist(F). { +++ A = sqliteSelectNew(0,F,0,0,0,0,0,-1,0); +++} +++ +++%type dbnm {Token} +++dbnm(A) ::= . {A.z=0; A.n=0;} +++dbnm(A) ::= DOT nm(X). {A = X;} +++ +++%type joinop {int} +++%type joinop2 {int} +++joinop(X) ::= COMMA. { X = JT_INNER; } +++joinop(X) ::= JOIN. { X = JT_INNER; } +++joinop(X) ::= JOIN_KW(A) JOIN. { X = sqliteJoinType(pParse,&A,0,0); } +++joinop(X) ::= JOIN_KW(A) nm(B) JOIN. { X = sqliteJoinType(pParse,&A,&B,0); } +++joinop(X) ::= JOIN_KW(A) nm(B) nm(C) JOIN. +++ { X = sqliteJoinType(pParse,&A,&B,&C); } +++ +++%type on_opt {Expr*} +++%destructor on_opt {sqliteExprDelete($$);} +++on_opt(N) ::= ON expr(E). {N = E;} +++on_opt(N) ::= . {N = 0;} +++ +++%type using_opt {IdList*} +++%destructor using_opt {sqliteIdListDelete($$);} +++using_opt(U) ::= USING LP idxlist(L) RP. {U = L;} +++using_opt(U) ::= . {U = 0;} +++ +++ +++%type orderby_opt {ExprList*} +++%destructor orderby_opt {sqliteExprListDelete($$);} +++%type sortlist {ExprList*} +++%destructor sortlist {sqliteExprListDelete($$);} +++%type sortitem {Expr*} +++%destructor sortitem {sqliteExprDelete($$);} +++ +++orderby_opt(A) ::= . {A = 0;} +++orderby_opt(A) ::= ORDER BY sortlist(X). {A = X;} +++sortlist(A) ::= sortlist(X) COMMA sortitem(Y) collate(C) sortorder(Z). { +++ A = sqliteExprListAppend(X,Y,0); +++ if( A ) A->a[A->nExpr-1].sortOrder = C+Z; +++} +++sortlist(A) ::= sortitem(Y) collate(C) sortorder(Z). { +++ A = sqliteExprListAppend(0,Y,0); +++ if( A ) A->a[0].sortOrder = C+Z; +++} +++sortitem(A) ::= expr(X). {A = X;} +++ +++%type sortorder {int} +++%type collate {int} +++ +++sortorder(A) ::= ASC. {A = SQLITE_SO_ASC;} +++sortorder(A) ::= DESC. {A = SQLITE_SO_DESC;} +++sortorder(A) ::= . {A = SQLITE_SO_ASC;} +++collate(C) ::= . {C = SQLITE_SO_UNK;} +++collate(C) ::= COLLATE id(X). {C = sqliteCollateType(X.z, X.n);} +++ +++%type groupby_opt {ExprList*} +++%destructor groupby_opt {sqliteExprListDelete($$);} +++groupby_opt(A) ::= . {A = 0;} +++groupby_opt(A) ::= GROUP BY exprlist(X). {A = X;} +++ +++%type having_opt {Expr*} +++%destructor having_opt {sqliteExprDelete($$);} +++having_opt(A) ::= . {A = 0;} +++having_opt(A) ::= HAVING expr(X). {A = X;} +++ +++%type limit_opt {struct LimitVal} +++limit_opt(A) ::= . {A.limit = -1; A.offset = 0;} +++limit_opt(A) ::= LIMIT signed(X). {A.limit = X; A.offset = 0;} +++limit_opt(A) ::= LIMIT signed(X) OFFSET signed(Y). +++ {A.limit = X; A.offset = Y;} +++limit_opt(A) ::= LIMIT signed(X) COMMA signed(Y). +++ {A.limit = Y; A.offset = X;} +++ +++/////////////////////////// The DELETE statement ///////////////////////////// +++// +++cmd ::= DELETE FROM nm(X) dbnm(D) where_opt(Y). { +++ sqliteDeleteFrom(pParse, sqliteSrcListAppend(0,&X,&D), Y); +++} +++ +++%type where_opt {Expr*} +++%destructor where_opt {sqliteExprDelete($$);} +++ +++where_opt(A) ::= . {A = 0;} +++where_opt(A) ::= WHERE expr(X). {A = X;} +++ +++%type setlist {ExprList*} +++%destructor setlist {sqliteExprListDelete($$);} +++ +++////////////////////////// The UPDATE command //////////////////////////////// +++// +++cmd ::= UPDATE orconf(R) nm(X) dbnm(D) SET setlist(Y) where_opt(Z). +++ {sqliteUpdate(pParse,sqliteSrcListAppend(0,&X,&D),Y,Z,R);} +++ +++setlist(A) ::= setlist(Z) COMMA nm(X) EQ expr(Y). +++ {A = sqliteExprListAppend(Z,Y,&X);} +++setlist(A) ::= nm(X) EQ expr(Y). {A = sqliteExprListAppend(0,Y,&X);} +++ +++////////////////////////// The INSERT command ///////////////////////////////// +++// +++cmd ::= insert_cmd(R) INTO nm(X) dbnm(D) inscollist_opt(F) +++ VALUES LP itemlist(Y) RP. +++ {sqliteInsert(pParse, sqliteSrcListAppend(0,&X,&D), Y, 0, F, R);} +++cmd ::= insert_cmd(R) INTO nm(X) dbnm(D) inscollist_opt(F) select(S). +++ {sqliteInsert(pParse, sqliteSrcListAppend(0,&X,&D), 0, S, F, R);} +++ +++%type insert_cmd {int} +++insert_cmd(A) ::= INSERT orconf(R). {A = R;} +++insert_cmd(A) ::= REPLACE. {A = OE_Replace;} +++ +++ +++%type itemlist {ExprList*} +++%destructor itemlist {sqliteExprListDelete($$);} +++ +++itemlist(A) ::= itemlist(X) COMMA expr(Y). {A = sqliteExprListAppend(X,Y,0);} +++itemlist(A) ::= expr(X). {A = sqliteExprListAppend(0,X,0);} +++ +++%type inscollist_opt {IdList*} +++%destructor inscollist_opt {sqliteIdListDelete($$);} +++%type inscollist {IdList*} +++%destructor inscollist {sqliteIdListDelete($$);} +++ +++inscollist_opt(A) ::= . {A = 0;} +++inscollist_opt(A) ::= LP inscollist(X) RP. {A = X;} +++inscollist(A) ::= inscollist(X) COMMA nm(Y). {A = sqliteIdListAppend(X,&Y);} +++inscollist(A) ::= nm(Y). {A = sqliteIdListAppend(0,&Y);} +++ +++/////////////////////////// Expression Processing ///////////////////////////// +++// +++ +++%type expr {Expr*} +++%destructor expr {sqliteExprDelete($$);} +++ +++expr(A) ::= LP(B) expr(X) RP(E). {A = X; sqliteExprSpan(A,&B,&E); } +++expr(A) ::= NULL(X). {A = sqliteExpr(TK_NULL, 0, 0, &X);} +++expr(A) ::= ID(X). {A = sqliteExpr(TK_ID, 0, 0, &X);} +++expr(A) ::= JOIN_KW(X). {A = sqliteExpr(TK_ID, 0, 0, &X);} +++expr(A) ::= nm(X) DOT nm(Y). { +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y); +++ A = sqliteExpr(TK_DOT, temp1, temp2, 0); +++} +++expr(A) ::= nm(X) DOT nm(Y) DOT nm(Z). { +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y); +++ Expr *temp3 = sqliteExpr(TK_ID, 0, 0, &Z); +++ Expr *temp4 = sqliteExpr(TK_DOT, temp2, temp3, 0); +++ A = sqliteExpr(TK_DOT, temp1, temp4, 0); +++} +++expr(A) ::= INTEGER(X). {A = sqliteExpr(TK_INTEGER, 0, 0, &X);} +++expr(A) ::= FLOAT(X). {A = sqliteExpr(TK_FLOAT, 0, 0, &X);} +++expr(A) ::= STRING(X). {A = sqliteExpr(TK_STRING, 0, 0, &X);} +++expr(A) ::= VARIABLE(X). { +++ A = sqliteExpr(TK_VARIABLE, 0, 0, &X); +++ if( A ) A->iTable = ++pParse->nVar; +++} +++expr(A) ::= ID(X) LP exprlist(Y) RP(E). { +++ A = sqliteExprFunction(Y, &X); +++ sqliteExprSpan(A,&X,&E); +++} +++expr(A) ::= ID(X) LP STAR RP(E). { +++ A = sqliteExprFunction(0, &X); +++ sqliteExprSpan(A,&X,&E); +++} +++expr(A) ::= expr(X) AND expr(Y). {A = sqliteExpr(TK_AND, X, Y, 0);} +++expr(A) ::= expr(X) OR expr(Y). {A = sqliteExpr(TK_OR, X, Y, 0);} +++expr(A) ::= expr(X) LT expr(Y). {A = sqliteExpr(TK_LT, X, Y, 0);} +++expr(A) ::= expr(X) GT expr(Y). {A = sqliteExpr(TK_GT, X, Y, 0);} +++expr(A) ::= expr(X) LE expr(Y). {A = sqliteExpr(TK_LE, X, Y, 0);} +++expr(A) ::= expr(X) GE expr(Y). {A = sqliteExpr(TK_GE, X, Y, 0);} +++expr(A) ::= expr(X) NE expr(Y). {A = sqliteExpr(TK_NE, X, Y, 0);} +++expr(A) ::= expr(X) EQ expr(Y). {A = sqliteExpr(TK_EQ, X, Y, 0);} +++expr(A) ::= expr(X) BITAND expr(Y). {A = sqliteExpr(TK_BITAND, X, Y, 0);} +++expr(A) ::= expr(X) BITOR expr(Y). {A = sqliteExpr(TK_BITOR, X, Y, 0);} +++expr(A) ::= expr(X) LSHIFT expr(Y). {A = sqliteExpr(TK_LSHIFT, X, Y, 0);} +++expr(A) ::= expr(X) RSHIFT expr(Y). {A = sqliteExpr(TK_RSHIFT, X, Y, 0);} +++expr(A) ::= expr(X) likeop(OP) expr(Y). [LIKE] { +++ ExprList *pList = sqliteExprListAppend(0, Y, 0); +++ pList = sqliteExprListAppend(pList, X, 0); +++ A = sqliteExprFunction(pList, 0); +++ if( A ) A->op = OP; +++ sqliteExprSpan(A, &X->span, &Y->span); +++} +++expr(A) ::= expr(X) NOT likeop(OP) expr(Y). [LIKE] { +++ ExprList *pList = sqliteExprListAppend(0, Y, 0); +++ pList = sqliteExprListAppend(pList, X, 0); +++ A = sqliteExprFunction(pList, 0); +++ if( A ) A->op = OP; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,&Y->span); +++} +++%type likeop {int} +++likeop(A) ::= LIKE. {A = TK_LIKE;} +++likeop(A) ::= GLOB. {A = TK_GLOB;} +++expr(A) ::= expr(X) PLUS expr(Y). {A = sqliteExpr(TK_PLUS, X, Y, 0);} +++expr(A) ::= expr(X) MINUS expr(Y). {A = sqliteExpr(TK_MINUS, X, Y, 0);} +++expr(A) ::= expr(X) STAR expr(Y). {A = sqliteExpr(TK_STAR, X, Y, 0);} +++expr(A) ::= expr(X) SLASH expr(Y). {A = sqliteExpr(TK_SLASH, X, Y, 0);} +++expr(A) ::= expr(X) REM expr(Y). {A = sqliteExpr(TK_REM, X, Y, 0);} +++expr(A) ::= expr(X) CONCAT expr(Y). {A = sqliteExpr(TK_CONCAT, X, Y, 0);} +++expr(A) ::= expr(X) ISNULL(E). { +++ A = sqliteExpr(TK_ISNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IS NULL(E). { +++ A = sqliteExpr(TK_ISNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOTNULL(E). { +++ A = sqliteExpr(TK_NOTNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOT NULL(E). { +++ A = sqliteExpr(TK_NOTNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IS NOT NULL(E). { +++ A = sqliteExpr(TK_NOTNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= NOT(B) expr(X). { +++ A = sqliteExpr(TK_NOT, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= BITNOT(B) expr(X). { +++ A = sqliteExpr(TK_BITNOT, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= MINUS(B) expr(X). [UMINUS] { +++ A = sqliteExpr(TK_UMINUS, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= PLUS(B) expr(X). [UPLUS] { +++ A = sqliteExpr(TK_UPLUS, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= LP(B) select(X) RP(E). { +++ A = sqliteExpr(TK_SELECT, 0, 0, 0); +++ if( A ) A->pSelect = X; +++ sqliteExprSpan(A,&B,&E); +++} +++expr(A) ::= expr(W) BETWEEN expr(X) AND expr(Y). { +++ ExprList *pList = sqliteExprListAppend(0, X, 0); +++ pList = sqliteExprListAppend(pList, Y, 0); +++ A = sqliteExpr(TK_BETWEEN, W, 0, 0); +++ if( A ) A->pList = pList; +++ sqliteExprSpan(A,&W->span,&Y->span); +++} +++expr(A) ::= expr(W) NOT BETWEEN expr(X) AND expr(Y). { +++ ExprList *pList = sqliteExprListAppend(0, X, 0); +++ pList = sqliteExprListAppend(pList, Y, 0); +++ A = sqliteExpr(TK_BETWEEN, W, 0, 0); +++ if( A ) A->pList = pList; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&W->span,&Y->span); +++} +++expr(A) ::= expr(X) IN LP exprlist(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pList = Y; +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IN LP select(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = Y; +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOT IN LP exprlist(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pList = Y; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOT IN LP select(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = Y; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IN nm(Y) dbnm(D). { +++ SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D); +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ sqliteExprSpan(A,&X->span,D.z?&D:&Y); +++} +++expr(A) ::= expr(X) NOT IN nm(Y) dbnm(D). { +++ SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D); +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,D.z?&D:&Y); +++} +++ +++ +++/* CASE expressions */ +++expr(A) ::= CASE(C) case_operand(X) case_exprlist(Y) case_else(Z) END(E). { +++ A = sqliteExpr(TK_CASE, X, Z, 0); +++ if( A ) A->pList = Y; +++ sqliteExprSpan(A, &C, &E); +++} +++%type case_exprlist {ExprList*} +++%destructor case_exprlist {sqliteExprListDelete($$);} +++case_exprlist(A) ::= case_exprlist(X) WHEN expr(Y) THEN expr(Z). { +++ A = sqliteExprListAppend(X, Y, 0); +++ A = sqliteExprListAppend(A, Z, 0); +++} +++case_exprlist(A) ::= WHEN expr(Y) THEN expr(Z). { +++ A = sqliteExprListAppend(0, Y, 0); +++ A = sqliteExprListAppend(A, Z, 0); +++} +++%type case_else {Expr*} +++case_else(A) ::= ELSE expr(X). {A = X;} +++case_else(A) ::= . {A = 0;} +++%type case_operand {Expr*} +++case_operand(A) ::= expr(X). {A = X;} +++case_operand(A) ::= . {A = 0;} +++ +++%type exprlist {ExprList*} +++%destructor exprlist {sqliteExprListDelete($$);} +++%type expritem {Expr*} +++%destructor expritem {sqliteExprDelete($$);} +++ +++exprlist(A) ::= exprlist(X) COMMA expritem(Y). +++ {A = sqliteExprListAppend(X,Y,0);} +++exprlist(A) ::= expritem(X). {A = sqliteExprListAppend(0,X,0);} +++expritem(A) ::= expr(X). {A = X;} +++expritem(A) ::= . {A = 0;} +++ +++///////////////////////////// The CREATE INDEX command /////////////////////// +++// +++cmd ::= CREATE(S) uniqueflag(U) INDEX nm(X) +++ ON nm(Y) dbnm(D) LP idxlist(Z) RP(E) onconf(R). { +++ SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D); +++ if( U!=OE_None ) U = R; +++ if( U==OE_Default) U = OE_Abort; +++ sqliteCreateIndex(pParse, &X, pSrc, Z, U, &S, &E); +++} +++ +++%type uniqueflag {int} +++uniqueflag(A) ::= UNIQUE. { A = OE_Abort; } +++uniqueflag(A) ::= . { A = OE_None; } +++ +++%type idxlist {IdList*} +++%destructor idxlist {sqliteIdListDelete($$);} +++%type idxlist_opt {IdList*} +++%destructor idxlist_opt {sqliteIdListDelete($$);} +++%type idxitem {Token} +++ +++idxlist_opt(A) ::= . {A = 0;} +++idxlist_opt(A) ::= LP idxlist(X) RP. {A = X;} +++idxlist(A) ::= idxlist(X) COMMA idxitem(Y). {A = sqliteIdListAppend(X,&Y);} +++idxlist(A) ::= idxitem(Y). {A = sqliteIdListAppend(0,&Y);} +++idxitem(A) ::= nm(X) sortorder. {A = X;} +++ +++///////////////////////////// The DROP INDEX command ///////////////////////// +++// +++ +++cmd ::= DROP INDEX nm(X) dbnm(Y). { +++ sqliteDropIndex(pParse, sqliteSrcListAppend(0,&X,&Y)); +++} +++ +++ +++///////////////////////////// The COPY command /////////////////////////////// +++// +++cmd ::= COPY orconf(R) nm(X) dbnm(D) FROM nm(Y) USING DELIMITERS STRING(Z). +++ {sqliteCopy(pParse,sqliteSrcListAppend(0,&X,&D),&Y,&Z,R);} +++cmd ::= COPY orconf(R) nm(X) dbnm(D) FROM nm(Y). +++ {sqliteCopy(pParse,sqliteSrcListAppend(0,&X,&D),&Y,0,R);} +++ +++///////////////////////////// The VACUUM command ///////////////////////////// +++// +++cmd ::= VACUUM. {sqliteVacuum(pParse,0);} +++cmd ::= VACUUM nm(X). {sqliteVacuum(pParse,&X);} +++ +++///////////////////////////// The PRAGMA command ///////////////////////////// +++// +++cmd ::= PRAGMA ids(X) EQ nm(Y). {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X) EQ ON(Y). {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X) EQ plus_num(Y). {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X) EQ minus_num(Y). {sqlitePragma(pParse,&X,&Y,1);} +++cmd ::= PRAGMA ids(X) LP nm(Y) RP. {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X). {sqlitePragma(pParse,&X,&X,0);} +++plus_num(A) ::= plus_opt number(X). {A = X;} +++minus_num(A) ::= MINUS number(X). {A = X;} +++number(A) ::= INTEGER(X). {A = X;} +++number(A) ::= FLOAT(X). {A = X;} +++plus_opt ::= PLUS. +++plus_opt ::= . +++ +++//////////////////////////// The CREATE TRIGGER command ///////////////////// +++ +++cmd ::= CREATE(A) trigger_decl BEGIN trigger_cmd_list(S) END(Z). { +++ Token all; +++ all.z = A.z; +++ all.n = (Z.z - A.z) + Z.n; +++ sqliteFinishTrigger(pParse, S, &all); +++} +++ +++trigger_decl ::= temp(T) TRIGGER nm(B) trigger_time(C) trigger_event(D) +++ ON nm(E) dbnm(DB) foreach_clause(F) when_clause(G). { +++ SrcList *pTab = sqliteSrcListAppend(0, &E, &DB); +++ sqliteBeginTrigger(pParse, &B, C, D.a, D.b, pTab, F, G, T); +++} +++ +++%type trigger_time {int} +++trigger_time(A) ::= BEFORE. { A = TK_BEFORE; } +++trigger_time(A) ::= AFTER. { A = TK_AFTER; } +++trigger_time(A) ::= INSTEAD OF. { A = TK_INSTEAD;} +++trigger_time(A) ::= . { A = TK_BEFORE; } +++ +++%type trigger_event {struct TrigEvent} +++%destructor trigger_event {sqliteIdListDelete($$.b);} +++trigger_event(A) ::= DELETE. { A.a = TK_DELETE; A.b = 0; } +++trigger_event(A) ::= INSERT. { A.a = TK_INSERT; A.b = 0; } +++trigger_event(A) ::= UPDATE. { A.a = TK_UPDATE; A.b = 0;} +++trigger_event(A) ::= UPDATE OF inscollist(X). {A.a = TK_UPDATE; A.b = X; } +++ +++%type foreach_clause {int} +++foreach_clause(A) ::= . { A = TK_ROW; } +++foreach_clause(A) ::= FOR EACH ROW. { A = TK_ROW; } +++foreach_clause(A) ::= FOR EACH STATEMENT. { A = TK_STATEMENT; } +++ +++%type when_clause {Expr *} +++when_clause(A) ::= . { A = 0; } +++when_clause(A) ::= WHEN expr(X). { A = X; } +++ +++%type trigger_cmd_list {TriggerStep *} +++%destructor trigger_cmd_list {sqliteDeleteTriggerStep($$);} +++trigger_cmd_list(A) ::= trigger_cmd(X) SEMI trigger_cmd_list(Y). { +++ X->pNext = Y; +++ A = X; +++} +++trigger_cmd_list(A) ::= . { A = 0; } +++ +++%type trigger_cmd {TriggerStep *} +++%destructor trigger_cmd {sqliteDeleteTriggerStep($$);} +++// UPDATE +++trigger_cmd(A) ::= UPDATE orconf(R) nm(X) SET setlist(Y) where_opt(Z). +++ { A = sqliteTriggerUpdateStep(&X, Y, Z, R); } +++ +++// INSERT +++trigger_cmd(A) ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) +++ VALUES LP itemlist(Y) RP. +++{A = sqliteTriggerInsertStep(&X, F, Y, 0, R);} +++ +++trigger_cmd(A) ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) select(S). +++ {A = sqliteTriggerInsertStep(&X, F, 0, S, R);} +++ +++// DELETE +++trigger_cmd(A) ::= DELETE FROM nm(X) where_opt(Y). +++ {A = sqliteTriggerDeleteStep(&X, Y);} +++ +++// SELECT +++trigger_cmd(A) ::= select(X). {A = sqliteTriggerSelectStep(X); } +++ +++// The special RAISE expression that may occur in trigger programs +++expr(A) ::= RAISE(X) LP IGNORE RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, 0); +++ A->iColumn = OE_Ignore; +++ sqliteExprSpan(A, &X, &Y); +++} +++expr(A) ::= RAISE(X) LP ROLLBACK COMMA nm(Z) RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, &Z); +++ A->iColumn = OE_Rollback; +++ sqliteExprSpan(A, &X, &Y); +++} +++expr(A) ::= RAISE(X) LP ABORT COMMA nm(Z) RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, &Z); +++ A->iColumn = OE_Abort; +++ sqliteExprSpan(A, &X, &Y); +++} +++expr(A) ::= RAISE(X) LP FAIL COMMA nm(Z) RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, &Z); +++ A->iColumn = OE_Fail; +++ sqliteExprSpan(A, &X, &Y); +++} +++ +++//////////////////////// DROP TRIGGER statement ////////////////////////////// +++cmd ::= DROP TRIGGER nm(X) dbnm(D). { +++ sqliteDropTrigger(pParse,sqliteSrcListAppend(0,&X,&D)); +++} +++ +++//////////////////////// ATTACH DATABASE file AS name ///////////////////////// +++cmd ::= ATTACH database_kw_opt ids(F) AS nm(D) key_opt(K). { +++ sqliteAttach(pParse, &F, &D, &K); +++} +++%type key_opt {Token} +++key_opt(A) ::= USING ids(X). { A = X; } +++key_opt(A) ::= . { A.z = 0; A.n = 0; } +++ +++database_kw_opt ::= DATABASE. +++database_kw_opt ::= . +++ +++//////////////////////// DETACH DATABASE name ///////////////////////////////// +++cmd ::= DETACH database_kw_opt nm(D). { +++ sqliteDetach(pParse, &D); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/pragma.c ++@@ -0,0 +1,712 @@ +++/* +++** 2003 April 6 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains code used to implement the PRAGMA command. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include +++ +++/* +++** Interpret the given string as a boolean value. +++*/ +++static int getBoolean(const char *z){ +++ static char *azTrue[] = { "yes", "on", "true" }; +++ int i; +++ if( z[0]==0 ) return 0; +++ if( isdigit(z[0]) || (z[0]=='-' && isdigit(z[1])) ){ +++ return atoi(z); +++ } +++ for(i=0; i='0' && z[0]<='2' ){ +++ return z[0] - '0'; +++ }else if( sqliteStrICmp(z, "file")==0 ){ +++ return 1; +++ }else if( sqliteStrICmp(z, "memory")==0 ){ +++ return 2; +++ }else{ +++ return 0; +++ } +++} +++ +++/* +++** If the TEMP database is open, close it and mark the database schema +++** as needing reloading. This must be done when using the TEMP_STORE +++** or DEFAULT_TEMP_STORE pragmas. +++*/ +++static int changeTempStorage(Parse *pParse, const char *zStorageType){ +++ int ts = getTempStore(zStorageType); +++ sqlite *db = pParse->db; +++ if( db->temp_store==ts ) return SQLITE_OK; +++ if( db->aDb[1].pBt!=0 ){ +++ if( db->flags & SQLITE_InTrans ){ +++ sqliteErrorMsg(pParse, "temporary storage cannot be changed " +++ "from within a transaction"); +++ return SQLITE_ERROR; +++ } +++ sqliteBtreeClose(db->aDb[1].pBt); +++ db->aDb[1].pBt = 0; +++ sqliteResetInternalSchema(db, 0); +++ } +++ db->temp_store = ts; +++ return SQLITE_OK; +++} +++ +++/* +++** Check to see if zRight and zLeft refer to a pragma that queries +++** or changes one of the flags in db->flags. Return 1 if so and 0 if not. +++** Also, implement the pragma. +++*/ +++static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ +++ static const struct { +++ const char *zName; /* Name of the pragma */ +++ int mask; /* Mask for the db->flags value */ +++ } aPragma[] = { +++ { "vdbe_trace", SQLITE_VdbeTrace }, +++ { "full_column_names", SQLITE_FullColNames }, +++ { "short_column_names", SQLITE_ShortColNames }, +++ { "show_datatypes", SQLITE_ReportTypes }, +++ { "count_changes", SQLITE_CountRows }, +++ { "empty_result_callbacks", SQLITE_NullCallback }, +++ }; +++ int i; +++ for(i=0; idb; +++ Vdbe *v; +++ if( strcmp(zLeft,zRight)==0 && (v = sqliteGetVdbe(pParse))!=0 ){ +++ sqliteVdbeOp3(v, OP_ColumnName, 0, 1, aPragma[i].zName, P3_STATIC); +++ sqliteVdbeOp3(v, OP_ColumnName, 1, 0, "boolean", P3_STATIC); +++ sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].mask)!=0, 0, +++ OP_Callback, 1, 0, +++ 0); +++ }else if( getBoolean(zRight) ){ +++ db->flags |= aPragma[i].mask; +++ }else{ +++ db->flags &= ~aPragma[i].mask; +++ } +++ return 1; +++ } +++ } +++ return 0; +++} +++ +++/* +++** Process a pragma statement. +++** +++** Pragmas are of this form: +++** +++** PRAGMA id = value +++** +++** The identifier might also be a string. The value is a string, and +++** identifier, or a number. If minusFlag is true, then the value is +++** a number that was preceded by a minus sign. +++*/ +++void sqlitePragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){ +++ char *zLeft = 0; +++ char *zRight = 0; +++ sqlite *db = pParse->db; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ +++ zLeft = sqliteStrNDup(pLeft->z, pLeft->n); +++ sqliteDequote(zLeft); +++ if( minusFlag ){ +++ zRight = 0; +++ sqliteSetNString(&zRight, "-", 1, pRight->z, pRight->n, 0); +++ }else{ +++ zRight = sqliteStrNDup(pRight->z, pRight->n); +++ sqliteDequote(zRight); +++ } +++ if( sqliteAuthCheck(pParse, SQLITE_PRAGMA, zLeft, zRight, 0) ){ +++ sqliteFree(zLeft); +++ sqliteFree(zRight); +++ return; +++ } +++ +++ /* +++ ** PRAGMA default_cache_size +++ ** PRAGMA default_cache_size=N +++ ** +++ ** The first form reports the current persistent setting for the +++ ** page cache size. The value returned is the maximum number of +++ ** pages in the page cache. The second form sets both the current +++ ** page cache size value and the persistent page cache size value +++ ** stored in the database file. +++ ** +++ ** The default cache size is stored in meta-value 2 of page 1 of the +++ ** database file. The cache size is actually the absolute value of +++ ** this memory location. The sign of meta-value 2 determines the +++ ** synchronous setting. A negative value means synchronous is off +++ ** and a positive value means synchronous is on. +++ */ +++ if( sqliteStrICmp(zLeft,"default_cache_size")==0 ){ +++ static VdbeOpList getCacheSize[] = { +++ { OP_ReadCookie, 0, 2, 0}, +++ { OP_AbsValue, 0, 0, 0}, +++ { OP_Dup, 0, 0, 0}, +++ { OP_Integer, 0, 0, 0}, +++ { OP_Ne, 0, 6, 0}, +++ { OP_Integer, 0, 0, 0}, /* 5 */ +++ { OP_ColumnName, 0, 1, "cache_size"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ int addr; +++ if( pRight->z==pLeft->z ){ +++ addr = sqliteVdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize); +++ sqliteVdbeChangeP1(v, addr+5, MAX_PAGES); +++ }else{ +++ int size = atoi(zRight); +++ if( size<0 ) size = -size; +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ sqliteVdbeAddOp(v, OP_Integer, size, 0); +++ sqliteVdbeAddOp(v, OP_ReadCookie, 0, 2); +++ addr = sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_Ge, 0, addr+3); +++ sqliteVdbeAddOp(v, OP_Negative, 0, 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 2); +++ sqliteEndWriteOperation(pParse); +++ db->cache_size = db->cache_size<0 ? -size : size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ } +++ }else +++ +++ /* +++ ** PRAGMA cache_size +++ ** PRAGMA cache_size=N +++ ** +++ ** The first form reports the current local setting for the +++ ** page cache size. The local setting can be different from +++ ** the persistent cache size value that is stored in the database +++ ** file itself. The value returned is the maximum number of +++ ** pages in the page cache. The second form sets the local +++ ** page cache size value. It does not change the persistent +++ ** cache size stored on the disk so the cache size will revert +++ ** to its default value when the database is closed and reopened. +++ ** N should be a positive integer. +++ */ +++ if( sqliteStrICmp(zLeft,"cache_size")==0 ){ +++ static VdbeOpList getCacheSize[] = { +++ { OP_ColumnName, 0, 1, "cache_size"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pRight->z==pLeft->z ){ +++ int size = db->cache_size;; +++ if( size<0 ) size = -size; +++ sqliteVdbeAddOp(v, OP_Integer, size, 0); +++ sqliteVdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize); +++ }else{ +++ int size = atoi(zRight); +++ if( size<0 ) size = -size; +++ if( db->cache_size<0 ) size = -size; +++ db->cache_size = size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ } +++ }else +++ +++ /* +++ ** PRAGMA default_synchronous +++ ** PRAGMA default_synchronous=ON|OFF|NORMAL|FULL +++ ** +++ ** The first form returns the persistent value of the "synchronous" setting +++ ** that is stored in the database. This is the synchronous setting that +++ ** is used whenever the database is opened unless overridden by a separate +++ ** "synchronous" pragma. The second form changes the persistent and the +++ ** local synchronous setting to the value given. +++ ** +++ ** If synchronous is OFF, SQLite does not attempt any fsync() systems calls +++ ** to make sure data is committed to disk. Write operations are very fast, +++ ** but a power failure can leave the database in an inconsistent state. +++ ** If synchronous is ON or NORMAL, SQLite will do an fsync() system call to +++ ** make sure data is being written to disk. The risk of corruption due to +++ ** a power loss in this mode is negligible but non-zero. If synchronous +++ ** is FULL, extra fsync()s occur to reduce the risk of corruption to near +++ ** zero, but with a write performance penalty. The default mode is NORMAL. +++ */ +++ if( sqliteStrICmp(zLeft,"default_synchronous")==0 ){ +++ static VdbeOpList getSync[] = { +++ { OP_ColumnName, 0, 1, "synchronous"}, +++ { OP_ReadCookie, 0, 3, 0}, +++ { OP_Dup, 0, 0, 0}, +++ { OP_If, 0, 0, 0}, /* 3 */ +++ { OP_ReadCookie, 0, 2, 0}, +++ { OP_Integer, 0, 0, 0}, +++ { OP_Lt, 0, 5, 0}, +++ { OP_AddImm, 1, 0, 0}, +++ { OP_Callback, 1, 0, 0}, +++ { OP_Halt, 0, 0, 0}, +++ { OP_AddImm, -1, 0, 0}, /* 10 */ +++ { OP_Callback, 1, 0, 0} +++ }; +++ if( pRight->z==pLeft->z ){ +++ int addr = sqliteVdbeAddOpList(v, ArraySize(getSync), getSync); +++ sqliteVdbeChangeP2(v, addr+3, addr+10); +++ }else{ +++ int addr; +++ int size = db->cache_size; +++ if( size<0 ) size = -size; +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ sqliteVdbeAddOp(v, OP_ReadCookie, 0, 2); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ addr = sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_Ne, 0, addr+3); +++ sqliteVdbeAddOp(v, OP_AddImm, MAX_PAGES, 0); +++ sqliteVdbeAddOp(v, OP_AbsValue, 0, 0); +++ db->safety_level = getSafetyLevel(zRight)+1; +++ if( db->safety_level==1 ){ +++ sqliteVdbeAddOp(v, OP_Negative, 0, 0); +++ size = -size; +++ } +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 2); +++ sqliteVdbeAddOp(v, OP_Integer, db->safety_level, 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 3); +++ sqliteEndWriteOperation(pParse); +++ db->cache_size = size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ sqliteBtreeSetSafetyLevel(db->aDb[0].pBt, db->safety_level); +++ } +++ }else +++ +++ /* +++ ** PRAGMA synchronous +++ ** PRAGMA synchronous=OFF|ON|NORMAL|FULL +++ ** +++ ** Return or set the local value of the synchronous flag. Changing +++ ** the local value does not make changes to the disk file and the +++ ** default value will be restored the next time the database is +++ ** opened. +++ */ +++ if( sqliteStrICmp(zLeft,"synchronous")==0 ){ +++ static VdbeOpList getSync[] = { +++ { OP_ColumnName, 0, 1, "synchronous"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pRight->z==pLeft->z ){ +++ sqliteVdbeAddOp(v, OP_Integer, db->safety_level-1, 0); +++ sqliteVdbeAddOpList(v, ArraySize(getSync), getSync); +++ }else{ +++ int size = db->cache_size; +++ if( size<0 ) size = -size; +++ db->safety_level = getSafetyLevel(zRight)+1; +++ if( db->safety_level==1 ) size = -size; +++ db->cache_size = size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ sqliteBtreeSetSafetyLevel(db->aDb[0].pBt, db->safety_level); +++ } +++ }else +++ +++#ifndef NDEBUG +++ if( sqliteStrICmp(zLeft, "trigger_overhead_test")==0 ){ +++ if( getBoolean(zRight) ){ +++ always_code_trigger_setup = 1; +++ }else{ +++ always_code_trigger_setup = 0; +++ } +++ }else +++#endif +++ +++ if( flagPragma(pParse, zLeft, zRight) ){ +++ /* The flagPragma() call also generates any necessary code */ +++ }else +++ +++ if( sqliteStrICmp(zLeft, "table_info")==0 ){ +++ Table *pTab; +++ pTab = sqliteFindTable(db, zRight, 0); +++ if( pTab ){ +++ static VdbeOpList tableInfoPreface[] = { +++ { OP_ColumnName, 0, 0, "cid"}, +++ { OP_ColumnName, 1, 0, "name"}, +++ { OP_ColumnName, 2, 0, "type"}, +++ { OP_ColumnName, 3, 0, "notnull"}, +++ { OP_ColumnName, 4, 0, "dflt_value"}, +++ { OP_ColumnName, 5, 1, "pk"}, +++ }; +++ int i; +++ sqliteVdbeAddOpList(v, ArraySize(tableInfoPreface), tableInfoPreface); +++ sqliteViewGetColumnNames(pParse, pTab); +++ for(i=0; inCol; i++){ +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ pTab->aCol[i].zType ? pTab->aCol[i].zType : "numeric", 0); +++ sqliteVdbeAddOp(v, OP_Integer, pTab->aCol[i].notNull, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ pTab->aCol[i].zDflt, P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Integer, pTab->aCol[i].isPrimKey, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 6, 0); +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "index_info")==0 ){ +++ Index *pIdx; +++ Table *pTab; +++ pIdx = sqliteFindIndex(db, zRight, 0); +++ if( pIdx ){ +++ static VdbeOpList tableInfoPreface[] = { +++ { OP_ColumnName, 0, 0, "seqno"}, +++ { OP_ColumnName, 1, 0, "cid"}, +++ { OP_ColumnName, 2, 1, "name"}, +++ }; +++ int i; +++ pTab = pIdx->pTable; +++ sqliteVdbeAddOpList(v, ArraySize(tableInfoPreface), tableInfoPreface); +++ for(i=0; inColumn; i++){ +++ int cnum = pIdx->aiColumn[i]; +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeAddOp(v, OP_Integer, cnum, 0); +++ assert( pTab->nCol>cnum ); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[cnum].zName, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 3, 0); +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "index_list")==0 ){ +++ Index *pIdx; +++ Table *pTab; +++ pTab = sqliteFindTable(db, zRight, 0); +++ if( pTab ){ +++ v = sqliteGetVdbe(pParse); +++ pIdx = pTab->pIndex; +++ } +++ if( pTab && pIdx ){ +++ int i = 0; +++ static VdbeOpList indexListPreface[] = { +++ { OP_ColumnName, 0, 0, "seq"}, +++ { OP_ColumnName, 1, 0, "name"}, +++ { OP_ColumnName, 2, 1, "unique"}, +++ }; +++ +++ sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface); +++ while(pIdx){ +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pIdx->zName, 0); +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->onError!=OE_None, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 3, 0); +++ ++i; +++ pIdx = pIdx->pNext; +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "foreign_key_list")==0 ){ +++ FKey *pFK; +++ Table *pTab; +++ pTab = sqliteFindTable(db, zRight, 0); +++ if( pTab ){ +++ v = sqliteGetVdbe(pParse); +++ pFK = pTab->pFKey; +++ } +++ if( pTab && pFK ){ +++ int i = 0; +++ static VdbeOpList indexListPreface[] = { +++ { OP_ColumnName, 0, 0, "id"}, +++ { OP_ColumnName, 1, 0, "seq"}, +++ { OP_ColumnName, 2, 0, "table"}, +++ { OP_ColumnName, 3, 0, "from"}, +++ { OP_ColumnName, 4, 1, "to"}, +++ }; +++ +++ sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface); +++ while(pFK){ +++ int j; +++ for(j=0; jnCol; j++){ +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeAddOp(v, OP_Integer, j, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pFK->zTo, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ pTab->aCol[pFK->aCol[j].iFrom].zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pFK->aCol[j].zCol, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 5, 0); +++ } +++ ++i; +++ pFK = pFK->pNextFrom; +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "database_list")==0 ){ +++ int i; +++ static VdbeOpList indexListPreface[] = { +++ { OP_ColumnName, 0, 0, "seq"}, +++ { OP_ColumnName, 1, 0, "name"}, +++ { OP_ColumnName, 2, 1, "file"}, +++ }; +++ +++ sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface); +++ for(i=0; inDb; i++){ +++ if( db->aDb[i].pBt==0 ) continue; +++ assert( db->aDb[i].zName!=0 ); +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, db->aDb[i].zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ sqliteBtreeGetFilename(db->aDb[i].pBt), 0); +++ sqliteVdbeAddOp(v, OP_Callback, 3, 0); +++ } +++ }else +++ +++ +++ /* +++ ** PRAGMA temp_store +++ ** PRAGMA temp_store = "default"|"memory"|"file" +++ ** +++ ** Return or set the local value of the temp_store flag. Changing +++ ** the local value does not make changes to the disk file and the default +++ ** value will be restored the next time the database is opened. +++ ** +++ ** Note that it is possible for the library compile-time options to +++ ** override this setting +++ */ +++ if( sqliteStrICmp(zLeft, "temp_store")==0 ){ +++ static VdbeOpList getTmpDbLoc[] = { +++ { OP_ColumnName, 0, 1, "temp_store"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pRight->z==pLeft->z ){ +++ sqliteVdbeAddOp(v, OP_Integer, db->temp_store, 0); +++ sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc); +++ }else{ +++ changeTempStorage(pParse, zRight); +++ } +++ }else +++ +++ /* +++ ** PRAGMA default_temp_store +++ ** PRAGMA default_temp_store = "default"|"memory"|"file" +++ ** +++ ** Return or set the value of the persistent temp_store flag. Any +++ ** change does not take effect until the next time the database is +++ ** opened. +++ ** +++ ** Note that it is possible for the library compile-time options to +++ ** override this setting +++ */ +++ if( sqliteStrICmp(zLeft, "default_temp_store")==0 ){ +++ static VdbeOpList getTmpDbLoc[] = { +++ { OP_ColumnName, 0, 1, "temp_store"}, +++ { OP_ReadCookie, 0, 5, 0}, +++ { OP_Callback, 1, 0, 0}}; +++ if( pRight->z==pLeft->z ){ +++ sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc); +++ }else{ +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ sqliteVdbeAddOp(v, OP_Integer, getTempStore(zRight), 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 5); +++ sqliteEndWriteOperation(pParse); +++ } +++ }else +++ +++#ifndef NDEBUG +++ if( sqliteStrICmp(zLeft, "parser_trace")==0 ){ +++ extern void sqliteParserTrace(FILE*, char *); +++ if( getBoolean(zRight) ){ +++ sqliteParserTrace(stdout, "parser: "); +++ }else{ +++ sqliteParserTrace(0, 0); +++ } +++ }else +++#endif +++ +++ if( sqliteStrICmp(zLeft, "integrity_check")==0 ){ +++ int i, j, addr; +++ +++ /* Code that initializes the integrity check program. Set the +++ ** error count 0 +++ */ +++ static VdbeOpList initCode[] = { +++ { OP_Integer, 0, 0, 0}, +++ { OP_MemStore, 0, 1, 0}, +++ { OP_ColumnName, 0, 1, "integrity_check"}, +++ }; +++ +++ /* Code to do an BTree integrity check on a single database file. +++ */ +++ static VdbeOpList checkDb[] = { +++ { OP_SetInsert, 0, 0, "2"}, +++ { OP_Integer, 0, 0, 0}, /* 1 */ +++ { OP_OpenRead, 0, 2, 0}, +++ { OP_Rewind, 0, 7, 0}, /* 3 */ +++ { OP_Column, 0, 3, 0}, /* 4 */ +++ { OP_SetInsert, 0, 0, 0}, +++ { OP_Next, 0, 4, 0}, /* 6 */ +++ { OP_IntegrityCk, 0, 0, 0}, /* 7 */ +++ { OP_Dup, 0, 1, 0}, +++ { OP_String, 0, 0, "ok"}, +++ { OP_StrEq, 0, 12, 0}, /* 10 */ +++ { OP_MemIncr, 0, 0, 0}, +++ { OP_String, 0, 0, "*** in database "}, +++ { OP_String, 0, 0, 0}, /* 13 */ +++ { OP_String, 0, 0, " ***\n"}, +++ { OP_Pull, 3, 0, 0}, +++ { OP_Concat, 4, 1, 0}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ +++ /* Code that appears at the end of the integrity check. If no error +++ ** messages have been generated, output OK. Otherwise output the +++ ** error message +++ */ +++ static VdbeOpList endCode[] = { +++ { OP_MemLoad, 0, 0, 0}, +++ { OP_Integer, 0, 0, 0}, +++ { OP_Ne, 0, 0, 0}, /* 2 */ +++ { OP_String, 0, 0, "ok"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ +++ /* Initialize the VDBE program */ +++ sqliteVdbeAddOpList(v, ArraySize(initCode), initCode); +++ +++ /* Do an integrity check on each database file */ +++ for(i=0; inDb; i++){ +++ HashElem *x; +++ +++ /* Do an integrity check of the B-Tree +++ */ +++ addr = sqliteVdbeAddOpList(v, ArraySize(checkDb), checkDb); +++ sqliteVdbeChangeP1(v, addr+1, i); +++ sqliteVdbeChangeP2(v, addr+3, addr+7); +++ sqliteVdbeChangeP2(v, addr+6, addr+4); +++ sqliteVdbeChangeP2(v, addr+7, i); +++ sqliteVdbeChangeP2(v, addr+10, addr+ArraySize(checkDb)); +++ sqliteVdbeChangeP3(v, addr+13, db->aDb[i].zName, P3_STATIC); +++ +++ /* Make sure all the indices are constructed correctly. +++ */ +++ sqliteCodeVerifySchema(pParse, i); +++ for(x=sqliteHashFirst(&db->aDb[i].tblHash); x; x=sqliteHashNext(x)){ +++ Table *pTab = sqliteHashData(x); +++ Index *pIdx; +++ int loopTop; +++ +++ if( pTab->pIndex==0 ) continue; +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, 1, pTab->tnum, pTab->zName, 0); +++ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ +++ if( pIdx->tnum==0 ) continue; +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, j+2, pIdx->tnum, pIdx->zName, 0); +++ } +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, 1, 1); +++ loopTop = sqliteVdbeAddOp(v, OP_Rewind, 1, 0); +++ sqliteVdbeAddOp(v, OP_MemIncr, 1, 0); +++ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ +++ int k, jmp2; +++ static VdbeOpList idxErr[] = { +++ { OP_MemIncr, 0, 0, 0}, +++ { OP_String, 0, 0, "rowid "}, +++ { OP_Recno, 1, 0, 0}, +++ { OP_String, 0, 0, " missing from index "}, +++ { OP_String, 0, 0, 0}, /* 4 */ +++ { OP_Concat, 4, 0, 0}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ sqliteVdbeAddOp(v, OP_Recno, 1, 0); +++ for(k=0; knColumn; k++){ +++ int idx = pIdx->aiColumn[k]; +++ if( idx==pTab->iPKey ){ +++ sqliteVdbeAddOp(v, OP_Recno, 1, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Column, 1, idx); +++ } +++ } +++ sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0); +++ if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx); +++ jmp2 = sqliteVdbeAddOp(v, OP_Found, j+2, 0); +++ addr = sqliteVdbeAddOpList(v, ArraySize(idxErr), idxErr); +++ sqliteVdbeChangeP3(v, addr+4, pIdx->zName, P3_STATIC); +++ sqliteVdbeChangeP2(v, jmp2, sqliteVdbeCurrentAddr(v)); +++ } +++ sqliteVdbeAddOp(v, OP_Next, 1, loopTop+1); +++ sqliteVdbeChangeP2(v, loopTop, sqliteVdbeCurrentAddr(v)); +++ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ +++ static VdbeOpList cntIdx[] = { +++ { OP_Integer, 0, 0, 0}, +++ { OP_MemStore, 2, 1, 0}, +++ { OP_Rewind, 0, 0, 0}, /* 2 */ +++ { OP_MemIncr, 2, 0, 0}, +++ { OP_Next, 0, 0, 0}, /* 4 */ +++ { OP_MemLoad, 1, 0, 0}, +++ { OP_MemLoad, 2, 0, 0}, +++ { OP_Eq, 0, 0, 0}, /* 7 */ +++ { OP_MemIncr, 0, 0, 0}, +++ { OP_String, 0, 0, "wrong # of entries in index "}, +++ { OP_String, 0, 0, 0}, /* 10 */ +++ { OP_Concat, 2, 0, 0}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pIdx->tnum==0 ) continue; +++ addr = sqliteVdbeAddOpList(v, ArraySize(cntIdx), cntIdx); +++ sqliteVdbeChangeP1(v, addr+2, j+2); +++ sqliteVdbeChangeP2(v, addr+2, addr+5); +++ sqliteVdbeChangeP1(v, addr+4, j+2); +++ sqliteVdbeChangeP2(v, addr+4, addr+3); +++ sqliteVdbeChangeP2(v, addr+7, addr+ArraySize(cntIdx)); +++ sqliteVdbeChangeP3(v, addr+10, pIdx->zName, P3_STATIC); +++ } +++ } +++ } +++ addr = sqliteVdbeAddOpList(v, ArraySize(endCode), endCode); +++ sqliteVdbeChangeP2(v, addr+2, addr+ArraySize(endCode)); +++ }else +++ +++ {} +++ sqliteFree(zLeft); +++ sqliteFree(zRight); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/printf.c ++@@ -0,0 +1,858 @@ +++/* +++** The "printf" code that follows dates from the 1980's. It is in +++** the public domain. The original comments are included here for +++** completeness. They are very out-of-date but might be useful as +++** an historical reference. Most of the "enhancements" have been backed +++** out so that the functionality is now the same as standard printf(). +++** +++************************************************************************** +++** +++** The following modules is an enhanced replacement for the "printf" subroutines +++** found in the standard C library. The following enhancements are +++** supported: +++** +++** + Additional functions. The standard set of "printf" functions +++** includes printf, fprintf, sprintf, vprintf, vfprintf, and +++** vsprintf. This module adds the following: +++** +++** * snprintf -- Works like sprintf, but has an extra argument +++** which is the size of the buffer written to. +++** +++** * mprintf -- Similar to sprintf. Writes output to memory +++** obtained from malloc. +++** +++** * xprintf -- Calls a function to dispose of output. +++** +++** * nprintf -- No output, but returns the number of characters +++** that would have been output by printf. +++** +++** * A v- version (ex: vsnprintf) of every function is also +++** supplied. +++** +++** + A few extensions to the formatting notation are supported: +++** +++** * The "=" flag (similar to "-") causes the output to be +++** be centered in the appropriately sized field. +++** +++** * The %b field outputs an integer in binary notation. +++** +++** * The %c field now accepts a precision. The character output +++** is repeated by the number of times the precision specifies. +++** +++** * The %' field works like %c, but takes as its character the +++** next character of the format string, instead of the next +++** argument. For example, printf("%.78'-") prints 78 minus +++** signs, the same as printf("%.78c",'-'). +++** +++** + When compiled using GCC on a SPARC, this version of printf is +++** faster than the library printf for SUN OS 4.1. +++** +++** + All functions are fully reentrant. +++** +++*/ +++#include "sqliteInt.h" +++ +++/* +++** Conversion types fall into various categories as defined by the +++** following enumeration. +++*/ +++#define etRADIX 1 /* Integer types. %d, %x, %o, and so forth */ +++#define etFLOAT 2 /* Floating point. %f */ +++#define etEXP 3 /* Exponentional notation. %e and %E */ +++#define etGENERIC 4 /* Floating or exponential, depending on exponent. %g */ +++#define etSIZE 5 /* Return number of characters processed so far. %n */ +++#define etSTRING 6 /* Strings. %s */ +++#define etDYNSTRING 7 /* Dynamically allocated strings. %z */ +++#define etPERCENT 8 /* Percent symbol. %% */ +++#define etCHARX 9 /* Characters. %c */ +++#define etERROR 10 /* Used to indicate no such conversion type */ +++/* The rest are extensions, not normally found in printf() */ +++#define etCHARLIT 11 /* Literal characters. %' */ +++#define etSQLESCAPE 12 /* Strings with '\'' doubled. %q */ +++#define etSQLESCAPE2 13 /* Strings with '\'' doubled and enclosed in '', +++ NULL pointers replaced by SQL NULL. %Q */ +++#define etTOKEN 14 /* a pointer to a Token structure */ +++#define etSRCLIST 15 /* a pointer to a SrcList */ +++ +++ +++/* +++** An "etByte" is an 8-bit unsigned value. +++*/ +++typedef unsigned char etByte; +++ +++/* +++** Each builtin conversion character (ex: the 'd' in "%d") is described +++** by an instance of the following structure +++*/ +++typedef struct et_info { /* Information about each format field */ +++ char fmttype; /* The format field code letter */ +++ etByte base; /* The base for radix conversion */ +++ etByte flags; /* One or more of FLAG_ constants below */ +++ etByte type; /* Conversion paradigm */ +++ char *charset; /* The character set for conversion */ +++ char *prefix; /* Prefix on non-zero values in alt format */ +++} et_info; +++ +++/* +++** Allowed values for et_info.flags +++*/ +++#define FLAG_SIGNED 1 /* True if the value to convert is signed */ +++#define FLAG_INTERN 2 /* True if for internal use only */ +++ +++ +++/* +++** The following table is searched linearly, so it is good to put the +++** most frequently used conversion types first. +++*/ +++static et_info fmtinfo[] = { +++ { 'd', 10, 1, etRADIX, "0123456789", 0 }, +++ { 's', 0, 0, etSTRING, 0, 0 }, +++ { 'z', 0, 2, etDYNSTRING, 0, 0 }, +++ { 'q', 0, 0, etSQLESCAPE, 0, 0 }, +++ { 'Q', 0, 0, etSQLESCAPE2, 0, 0 }, +++ { 'c', 0, 0, etCHARX, 0, 0 }, +++ { 'o', 8, 0, etRADIX, "01234567", "0" }, +++ { 'u', 10, 0, etRADIX, "0123456789", 0 }, +++ { 'x', 16, 0, etRADIX, "0123456789abcdef", "x0" }, +++ { 'X', 16, 0, etRADIX, "0123456789ABCDEF", "X0" }, +++ { 'f', 0, 1, etFLOAT, 0, 0 }, +++ { 'e', 0, 1, etEXP, "e", 0 }, +++ { 'E', 0, 1, etEXP, "E", 0 }, +++ { 'g', 0, 1, etGENERIC, "e", 0 }, +++ { 'G', 0, 1, etGENERIC, "E", 0 }, +++ { 'i', 10, 1, etRADIX, "0123456789", 0 }, +++ { 'n', 0, 0, etSIZE, 0, 0 }, +++ { '%', 0, 0, etPERCENT, 0, 0 }, +++ { 'p', 10, 0, etRADIX, "0123456789", 0 }, +++ { 'T', 0, 2, etTOKEN, 0, 0 }, +++ { 'S', 0, 2, etSRCLIST, 0, 0 }, +++}; +++#define etNINFO (sizeof(fmtinfo)/sizeof(fmtinfo[0])) +++ +++/* +++** If NOFLOATINGPOINT is defined, then none of the floating point +++** conversions will work. +++*/ +++#ifndef etNOFLOATINGPOINT +++/* +++** "*val" is a double such that 0.1 <= *val < 10.0 +++** Return the ascii code for the leading digit of *val, then +++** multiply "*val" by 10.0 to renormalize. +++** +++** Example: +++** input: *val = 3.14159 +++** output: *val = 1.4159 function return = '3' +++** +++** The counter *cnt is incremented each time. After counter exceeds +++** 16 (the number of significant digits in a 64-bit float) '0' is +++** always returned. +++*/ +++static int et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){ +++ int digit; +++ LONGDOUBLE_TYPE d; +++ if( (*cnt)++ >= 16 ) return '0'; +++ digit = (int)*val; +++ d = digit; +++ digit += '0'; +++ *val = (*val - d)*10.0; +++ return digit; +++} +++#endif +++ +++#define etBUFSIZE 1000 /* Size of the output buffer */ +++ +++/* +++** The root program. All variations call this core. +++** +++** INPUTS: +++** func This is a pointer to a function taking three arguments +++** 1. A pointer to anything. Same as the "arg" parameter. +++** 2. A pointer to the list of characters to be output +++** (Note, this list is NOT null terminated.) +++** 3. An integer number of characters to be output. +++** (Note: This number might be zero.) +++** +++** arg This is the pointer to anything which will be passed as the +++** first argument to "func". Use it for whatever you like. +++** +++** fmt This is the format string, as in the usual print. +++** +++** ap This is a pointer to a list of arguments. Same as in +++** vfprint. +++** +++** OUTPUTS: +++** The return value is the total number of characters sent to +++** the function "func". Returns -1 on a error. +++** +++** Note that the order in which automatic variables are declared below +++** seems to make a big difference in determining how fast this beast +++** will run. +++*/ +++static int vxprintf( +++ void (*func)(void*,const char*,int), /* Consumer of text */ +++ void *arg, /* First argument to the consumer */ +++ int useExtended, /* Allow extended %-conversions */ +++ const char *fmt, /* Format string */ +++ va_list ap /* arguments */ +++){ +++ int c; /* Next character in the format string */ +++ char *bufpt; /* Pointer to the conversion buffer */ +++ int precision; /* Precision of the current field */ +++ int length; /* Length of the field */ +++ int idx; /* A general purpose loop counter */ +++ int count; /* Total number of characters output */ +++ int width; /* Width of the current field */ +++ etByte flag_leftjustify; /* True if "-" flag is present */ +++ etByte flag_plussign; /* True if "+" flag is present */ +++ etByte flag_blanksign; /* True if " " flag is present */ +++ etByte flag_alternateform; /* True if "#" flag is present */ +++ etByte flag_zeropad; /* True if field width constant starts with zero */ +++ etByte flag_long; /* True if "l" flag is present */ +++ unsigned long longvalue; /* Value for integer types */ +++ LONGDOUBLE_TYPE realvalue; /* Value for real types */ +++ et_info *infop; /* Pointer to the appropriate info structure */ +++ char buf[etBUFSIZE]; /* Conversion buffer */ +++ char prefix; /* Prefix character. "+" or "-" or " " or '\0'. */ +++ etByte errorflag = 0; /* True if an error is encountered */ +++ etByte xtype; /* Conversion paradigm */ +++ char *zExtra; /* Extra memory used for etTCLESCAPE conversions */ +++ static char spaces[] = " "; +++#define etSPACESIZE (sizeof(spaces)-1) +++#ifndef etNOFLOATINGPOINT +++ int exp; /* exponent of real numbers */ +++ double rounder; /* Used for rounding floating point values */ +++ etByte flag_dp; /* True if decimal point should be shown */ +++ etByte flag_rtz; /* True if trailing zeros should be removed */ +++ etByte flag_exp; /* True to force display of the exponent */ +++ int nsd; /* Number of significant digits returned */ +++#endif +++ +++ func(arg,"",0); +++ count = length = 0; +++ bufpt = 0; +++ for(; (c=(*fmt))!=0; ++fmt){ +++ if( c!='%' ){ +++ int amt; +++ bufpt = (char *)fmt; +++ amt = 1; +++ while( (c=(*++fmt))!='%' && c!=0 ) amt++; +++ (*func)(arg,bufpt,amt); +++ count += amt; +++ if( c==0 ) break; +++ } +++ if( (c=(*++fmt))==0 ){ +++ errorflag = 1; +++ (*func)(arg,"%",1); +++ count++; +++ break; +++ } +++ /* Find out what flags are present */ +++ flag_leftjustify = flag_plussign = flag_blanksign = +++ flag_alternateform = flag_zeropad = 0; +++ do{ +++ switch( c ){ +++ case '-': flag_leftjustify = 1; c = 0; break; +++ case '+': flag_plussign = 1; c = 0; break; +++ case ' ': flag_blanksign = 1; c = 0; break; +++ case '#': flag_alternateform = 1; c = 0; break; +++ case '0': flag_zeropad = 1; c = 0; break; +++ default: break; +++ } +++ }while( c==0 && (c=(*++fmt))!=0 ); +++ /* Get the field width */ +++ width = 0; +++ if( c=='*' ){ +++ width = va_arg(ap,int); +++ if( width<0 ){ +++ flag_leftjustify = 1; +++ width = -width; +++ } +++ c = *++fmt; +++ }else{ +++ while( c>='0' && c<='9' ){ +++ width = width*10 + c - '0'; +++ c = *++fmt; +++ } +++ } +++ if( width > etBUFSIZE-10 ){ +++ width = etBUFSIZE-10; +++ } +++ /* Get the precision */ +++ if( c=='.' ){ +++ precision = 0; +++ c = *++fmt; +++ if( c=='*' ){ +++ precision = va_arg(ap,int); +++ if( precision<0 ) precision = -precision; +++ c = *++fmt; +++ }else{ +++ while( c>='0' && c<='9' ){ +++ precision = precision*10 + c - '0'; +++ c = *++fmt; +++ } +++ } +++ /* Limit the precision to prevent overflowing buf[] during conversion */ +++ if( precision>etBUFSIZE-40 ) precision = etBUFSIZE-40; +++ }else{ +++ precision = -1; +++ } +++ /* Get the conversion type modifier */ +++ if( c=='l' ){ +++ flag_long = 1; +++ c = *++fmt; +++ }else{ +++ flag_long = 0; +++ } +++ /* Fetch the info entry for the field */ +++ infop = 0; +++ xtype = etERROR; +++ for(idx=0; idxflags & FLAG_INTERN)==0 ){ +++ xtype = infop->type; +++ } +++ break; +++ } +++ } +++ zExtra = 0; +++ +++ /* +++ ** At this point, variables are initialized as follows: +++ ** +++ ** flag_alternateform TRUE if a '#' is present. +++ ** flag_plussign TRUE if a '+' is present. +++ ** flag_leftjustify TRUE if a '-' is present or if the +++ ** field width was negative. +++ ** flag_zeropad TRUE if the width began with 0. +++ ** flag_long TRUE if the letter 'l' (ell) prefixed +++ ** the conversion character. +++ ** flag_blanksign TRUE if a ' ' is present. +++ ** width The specified field width. This is +++ ** always non-negative. Zero is the default. +++ ** precision The specified precision. The default +++ ** is -1. +++ ** xtype The class of the conversion. +++ ** infop Pointer to the appropriate info struct. +++ */ +++ switch( xtype ){ +++ case etRADIX: +++ if( flag_long ) longvalue = va_arg(ap,long); +++ else longvalue = va_arg(ap,int); +++#if 1 +++ /* For the format %#x, the value zero is printed "0" not "0x0". +++ ** I think this is stupid. */ +++ if( longvalue==0 ) flag_alternateform = 0; +++#else +++ /* More sensible: turn off the prefix for octal (to prevent "00"), +++ ** but leave the prefix for hex. */ +++ if( longvalue==0 && infop->base==8 ) flag_alternateform = 0; +++#endif +++ if( infop->flags & FLAG_SIGNED ){ +++ if( *(long*)&longvalue<0 ){ +++ longvalue = -*(long*)&longvalue; +++ prefix = '-'; +++ }else if( flag_plussign ) prefix = '+'; +++ else if( flag_blanksign ) prefix = ' '; +++ else prefix = 0; +++ }else prefix = 0; +++ if( flag_zeropad && precisioncharset; +++ base = infop->base; +++ do{ /* Convert to ascii */ +++ *(--bufpt) = cset[longvalue%base]; +++ longvalue = longvalue/base; +++ }while( longvalue>0 ); +++ } +++ length = &buf[etBUFSIZE-1]-bufpt; +++ for(idx=precision-length; idx>0; idx--){ +++ *(--bufpt) = '0'; /* Zero pad */ +++ } +++ if( prefix ) *(--bufpt) = prefix; /* Add sign */ +++ if( flag_alternateform && infop->prefix ){ /* Add "0" or "0x" */ +++ char *pre, x; +++ pre = infop->prefix; +++ if( *bufpt!=pre[0] ){ +++ for(pre=infop->prefix; (x=(*pre))!=0; pre++) *(--bufpt) = x; +++ } +++ } +++ length = &buf[etBUFSIZE-1]-bufpt; +++ break; +++ case etFLOAT: +++ case etEXP: +++ case etGENERIC: +++ realvalue = va_arg(ap,double); +++#ifndef etNOFLOATINGPOINT +++ if( precision<0 ) precision = 6; /* Set default precision */ +++ if( precision>etBUFSIZE-10 ) precision = etBUFSIZE-10; +++ if( realvalue<0.0 ){ +++ realvalue = -realvalue; +++ prefix = '-'; +++ }else{ +++ if( flag_plussign ) prefix = '+'; +++ else if( flag_blanksign ) prefix = ' '; +++ else prefix = 0; +++ } +++ if( infop->type==etGENERIC && precision>0 ) precision--; +++ rounder = 0.0; +++#if 0 +++ /* Rounding works like BSD when the constant 0.4999 is used. Wierd! */ +++ for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1); +++#else +++ /* It makes more sense to use 0.5 */ +++ for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1); +++#endif +++ if( infop->type==etFLOAT ) realvalue += rounder; +++ /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */ +++ exp = 0; +++ if( realvalue>0.0 ){ +++ while( realvalue>=1e8 && exp<=350 ){ realvalue *= 1e-8; exp+=8; } +++ while( realvalue>=10.0 && exp<=350 ){ realvalue *= 0.1; exp++; } +++ while( realvalue<1e-8 && exp>=-350 ){ realvalue *= 1e8; exp-=8; } +++ while( realvalue<1.0 && exp>=-350 ){ realvalue *= 10.0; exp--; } +++ if( exp>350 || exp<-350 ){ +++ bufpt = "NaN"; +++ length = 3; +++ break; +++ } +++ } +++ bufpt = buf; +++ /* +++ ** If the field type is etGENERIC, then convert to either etEXP +++ ** or etFLOAT, as appropriate. +++ */ +++ flag_exp = xtype==etEXP; +++ if( xtype!=etFLOAT ){ +++ realvalue += rounder; +++ if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; } +++ } +++ if( xtype==etGENERIC ){ +++ flag_rtz = !flag_alternateform; +++ if( exp<-4 || exp>precision ){ +++ xtype = etEXP; +++ }else{ +++ precision = precision - exp; +++ xtype = etFLOAT; +++ } +++ }else{ +++ flag_rtz = 0; +++ } +++ /* +++ ** The "exp+precision" test causes output to be of type etEXP if +++ ** the precision is too large to fit in buf[]. +++ */ +++ nsd = 0; +++ if( xtype==etFLOAT && exp+precision0 || flag_alternateform); +++ if( prefix ) *(bufpt++) = prefix; /* Sign */ +++ if( exp<0 ) *(bufpt++) = '0'; /* Digits before "." */ +++ else for(; exp>=0; exp--) *(bufpt++) = et_getdigit(&realvalue,&nsd); +++ if( flag_dp ) *(bufpt++) = '.'; /* The decimal point */ +++ for(exp++; exp<0 && precision>0; precision--, exp++){ +++ *(bufpt++) = '0'; +++ } +++ while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd); +++ *(bufpt--) = 0; /* Null terminate */ +++ if( flag_rtz && flag_dp ){ /* Remove trailing zeros and "." */ +++ while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0; +++ if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0; +++ } +++ bufpt++; /* point to next free slot */ +++ }else{ /* etEXP or etGENERIC */ +++ flag_dp = (precision>0 || flag_alternateform); +++ if( prefix ) *(bufpt++) = prefix; /* Sign */ +++ *(bufpt++) = et_getdigit(&realvalue,&nsd); /* First digit */ +++ if( flag_dp ) *(bufpt++) = '.'; /* Decimal point */ +++ while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd); +++ bufpt--; /* point to last digit */ +++ if( flag_rtz && flag_dp ){ /* Remove tail zeros */ +++ while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0; +++ if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0; +++ } +++ bufpt++; /* point to next free slot */ +++ if( exp || flag_exp ){ +++ *(bufpt++) = infop->charset[0]; +++ if( exp<0 ){ *(bufpt++) = '-'; exp = -exp; } /* sign of exp */ +++ else { *(bufpt++) = '+'; } +++ if( exp>=100 ){ +++ *(bufpt++) = (exp/100)+'0'; /* 100's digit */ +++ exp %= 100; +++ } +++ *(bufpt++) = exp/10+'0'; /* 10's digit */ +++ *(bufpt++) = exp%10+'0'; /* 1's digit */ +++ } +++ } +++ /* The converted number is in buf[] and zero terminated. Output it. +++ ** Note that the number is in the usual order, not reversed as with +++ ** integer conversions. */ +++ length = bufpt-buf; +++ bufpt = buf; +++ +++ /* Special case: Add leading zeros if the flag_zeropad flag is +++ ** set and we are not left justified */ +++ if( flag_zeropad && !flag_leftjustify && length < width){ +++ int i; +++ int nPad = width - length; +++ for(i=width; i>=nPad; i--){ +++ bufpt[i] = bufpt[i-nPad]; +++ } +++ i = prefix!=0; +++ while( nPad-- ) bufpt[i++] = '0'; +++ length = width; +++ } +++#endif +++ break; +++ case etSIZE: +++ *(va_arg(ap,int*)) = count; +++ length = width = 0; +++ break; +++ case etPERCENT: +++ buf[0] = '%'; +++ bufpt = buf; +++ length = 1; +++ break; +++ case etCHARLIT: +++ case etCHARX: +++ c = buf[0] = (xtype==etCHARX ? va_arg(ap,int) : *++fmt); +++ if( precision>=0 ){ +++ for(idx=1; idx=0 && precisionetBUFSIZE ){ +++ bufpt = zExtra = sqliteMalloc( n ); +++ if( bufpt==0 ) return -1; +++ }else{ +++ bufpt = buf; +++ } +++ j = 0; +++ if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\''; +++ for(i=0; (c=arg[i])!=0; i++){ +++ bufpt[j++] = c; +++ if( c=='\'' ) bufpt[j++] = c; +++ } +++ if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\''; +++ bufpt[j] = 0; +++ length = j; +++ if( precision>=0 && precisionz, pToken->n); +++ length = width = 0; +++ break; +++ } +++ case etSRCLIST: { +++ SrcList *pSrc = va_arg(ap, SrcList*); +++ int k = va_arg(ap, int); +++ struct SrcList_item *pItem = &pSrc->a[k]; +++ assert( k>=0 && knSrc ); +++ if( pItem->zDatabase && pItem->zDatabase[0] ){ +++ (*func)(arg, pItem->zDatabase, strlen(pItem->zDatabase)); +++ (*func)(arg, ".", 1); +++ } +++ (*func)(arg, pItem->zName, strlen(pItem->zName)); +++ length = width = 0; +++ break; +++ } +++ case etERROR: +++ buf[0] = '%'; +++ buf[1] = c; +++ errorflag = 0; +++ idx = 1+(c!=0); +++ (*func)(arg,"%",idx); +++ count += idx; +++ if( c==0 ) fmt--; +++ break; +++ }/* End switch over the format type */ +++ /* +++ ** The text of the conversion is pointed to by "bufpt" and is +++ ** "length" characters long. The field width is "width". Do +++ ** the output. +++ */ +++ if( !flag_leftjustify ){ +++ register int nspace; +++ nspace = width-length; +++ if( nspace>0 ){ +++ count += nspace; +++ while( nspace>=etSPACESIZE ){ +++ (*func)(arg,spaces,etSPACESIZE); +++ nspace -= etSPACESIZE; +++ } +++ if( nspace>0 ) (*func)(arg,spaces,nspace); +++ } +++ } +++ if( length>0 ){ +++ (*func)(arg,bufpt,length); +++ count += length; +++ } +++ if( flag_leftjustify ){ +++ register int nspace; +++ nspace = width-length; +++ if( nspace>0 ){ +++ count += nspace; +++ while( nspace>=etSPACESIZE ){ +++ (*func)(arg,spaces,etSPACESIZE); +++ nspace -= etSPACESIZE; +++ } +++ if( nspace>0 ) (*func)(arg,spaces,nspace); +++ } +++ } +++ if( zExtra ){ +++ sqliteFree(zExtra); +++ } +++ }/* End for loop over the format string */ +++ return errorflag ? -1 : count; +++} /* End of function */ +++ +++ +++/* This structure is used to store state information about the +++** write to memory that is currently in progress. +++*/ +++struct sgMprintf { +++ char *zBase; /* A base allocation */ +++ char *zText; /* The string collected so far */ +++ int nChar; /* Length of the string so far */ +++ int nTotal; /* Output size if unconstrained */ +++ int nAlloc; /* Amount of space allocated in zText */ +++ void *(*xRealloc)(void*,int); /* Function used to realloc memory */ +++}; +++ +++/* +++** This function implements the callback from vxprintf. +++** +++** This routine add nNewChar characters of text in zNewText to +++** the sgMprintf structure pointed to by "arg". +++*/ +++static void mout(void *arg, const char *zNewText, int nNewChar){ +++ struct sgMprintf *pM = (struct sgMprintf*)arg; +++ pM->nTotal += nNewChar; +++ if( pM->nChar + nNewChar + 1 > pM->nAlloc ){ +++ if( pM->xRealloc==0 ){ +++ nNewChar = pM->nAlloc - pM->nChar - 1; +++ }else{ +++ pM->nAlloc = pM->nChar + nNewChar*2 + 1; +++ if( pM->zText==pM->zBase ){ +++ pM->zText = pM->xRealloc(0, pM->nAlloc); +++ if( pM->zText && pM->nChar ){ +++ memcpy(pM->zText, pM->zBase, pM->nChar); +++ } +++ }else{ +++ pM->zText = pM->xRealloc(pM->zText, pM->nAlloc); +++ } +++ } +++ } +++ if( pM->zText ){ +++ if( nNewChar>0 ){ +++ memcpy(&pM->zText[pM->nChar], zNewText, nNewChar); +++ pM->nChar += nNewChar; +++ } +++ pM->zText[pM->nChar] = 0; +++ } +++} +++ +++/* +++** This routine is a wrapper around xprintf() that invokes mout() as +++** the consumer. +++*/ +++static char *base_vprintf( +++ void *(*xRealloc)(void*,int), /* Routine to realloc memory. May be NULL */ +++ int useInternal, /* Use internal %-conversions if true */ +++ char *zInitBuf, /* Initially write here, before mallocing */ +++ int nInitBuf, /* Size of zInitBuf[] */ +++ const char *zFormat, /* format string */ +++ va_list ap /* arguments */ +++){ +++ struct sgMprintf sM; +++ sM.zBase = sM.zText = zInitBuf; +++ sM.nChar = sM.nTotal = 0; +++ sM.nAlloc = nInitBuf; +++ sM.xRealloc = xRealloc; +++ vxprintf(mout, &sM, useInternal, zFormat, ap); +++ if( xRealloc ){ +++ if( sM.zText==sM.zBase ){ +++ sM.zText = xRealloc(0, sM.nChar+1); +++ memcpy(sM.zText, sM.zBase, sM.nChar+1); +++ }else if( sM.nAlloc>sM.nChar+10 ){ +++ sM.zText = xRealloc(sM.zText, sM.nChar+1); +++ } +++ } +++ return sM.zText; +++} +++ +++/* +++** Realloc that is a real function, not a macro. +++*/ +++static void *printf_realloc(void *old, int size){ +++ return sqliteRealloc(old,size); +++} +++ +++/* +++** Print into memory obtained from sqliteMalloc(). Use the internal +++** %-conversion extensions. +++*/ +++char *sqliteVMPrintf(const char *zFormat, va_list ap){ +++ char zBase[1000]; +++ return base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap); +++} +++ +++/* +++** Print into memory obtained from sqliteMalloc(). Use the internal +++** %-conversion extensions. +++*/ +++char *sqliteMPrintf(const char *zFormat, ...){ +++ va_list ap; +++ char *z; +++ char zBase[1000]; +++ va_start(ap, zFormat); +++ z = base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap); +++ va_end(ap); +++ return z; +++} +++ +++/* +++** Print into memory obtained from malloc(). Do not use the internal +++** %-conversion extensions. This routine is for use by external users. +++*/ +++char *sqlite_mprintf(const char *zFormat, ...){ +++ va_list ap; +++ char *z; +++ char zBuf[200]; +++ +++ va_start(ap,zFormat); +++ z = base_vprintf((void*(*)(void*,int))realloc, 0, +++ zBuf, sizeof(zBuf), zFormat, ap); +++ va_end(ap); +++ return z; +++} +++ +++/* This is the varargs version of sqlite_mprintf. +++*/ +++char *sqlite_vmprintf(const char *zFormat, va_list ap){ +++ char zBuf[200]; +++ return base_vprintf((void*(*)(void*,int))realloc, 0, +++ zBuf, sizeof(zBuf), zFormat, ap); +++} +++ +++/* +++** sqlite_snprintf() works like snprintf() except that it ignores the +++** current locale settings. This is important for SQLite because we +++** are not able to use a "," as the decimal point in place of "." as +++** specified by some locales. +++*/ +++char *sqlite_snprintf(int n, char *zBuf, const char *zFormat, ...){ +++ char *z; +++ va_list ap; +++ +++ va_start(ap,zFormat); +++ z = base_vprintf(0, 0, zBuf, n, zFormat, ap); +++ va_end(ap); +++ return z; +++} +++ +++/* +++** The following four routines implement the varargs versions of the +++** sqlite_exec() and sqlite_get_table() interfaces. See the sqlite.h +++** header files for a more detailed description of how these interfaces +++** work. +++** +++** These routines are all just simple wrappers. +++*/ +++int sqlite_exec_printf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback xCallback, /* Callback function */ +++ void *pArg, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string. */ +++){ +++ va_list ap; +++ int rc; +++ +++ va_start(ap, errmsg); +++ rc = sqlite_exec_vprintf(db, sqlFormat, xCallback, pArg, errmsg, ap); +++ va_end(ap); +++ return rc; +++} +++int sqlite_exec_vprintf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback xCallback, /* Callback function */ +++ void *pArg, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string. */ +++){ +++ char *zSql; +++ int rc; +++ +++ zSql = sqlite_vmprintf(sqlFormat, ap); +++ rc = sqlite_exec(db, zSql, xCallback, pArg, errmsg); +++ free(zSql); +++ return rc; +++} +++int sqlite_get_table_printf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncol, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string */ +++){ +++ va_list ap; +++ int rc; +++ +++ va_start(ap, errmsg); +++ rc = sqlite_get_table_vprintf(db, sqlFormat, resultp, nrow, ncol, errmsg, ap); +++ va_end(ap); +++ return rc; +++} +++int sqlite_get_table_vprintf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string */ +++){ +++ char *zSql; +++ int rc; +++ +++ zSql = sqlite_vmprintf(sqlFormat, ap); +++ rc = sqlite_get_table(db, zSql, resultp, nrow, ncolumn, errmsg); +++ free(zSql); +++ return rc; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/random.c ++@@ -0,0 +1,97 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains code to implement a pseudo-random number +++** generator (PRNG) for SQLite. +++** +++** Random numbers are used by some of the database backends in order +++** to generate random integer keys for tables or random filenames. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include "os.h" +++ +++ +++/* +++** Get a single 8-bit random value from the RC4 PRNG. The Mutex +++** must be held while executing this routine. +++** +++** Why not just use a library random generator like lrand48() for this? +++** Because the OP_NewRecno opcode in the VDBE depends on having a very +++** good source of random numbers. The lrand48() library function may +++** well be good enough. But maybe not. Or maybe lrand48() has some +++** subtle problems on some systems that could cause problems. It is hard +++** to know. To minimize the risk of problems due to bad lrand48() +++** implementations, SQLite uses this random number generator based +++** on RC4, which we know works very well. +++*/ +++static int randomByte(){ +++ unsigned char t; +++ +++ /* All threads share a single random number generator. +++ ** This structure is the current state of the generator. +++ */ +++ static struct { +++ unsigned char isInit; /* True if initialized */ +++ unsigned char i, j; /* State variables */ +++ unsigned char s[256]; /* State variables */ +++ } prng; +++ +++ /* Initialize the state of the random number generator once, +++ ** the first time this routine is called. The seed value does +++ ** not need to contain a lot of randomness since we are not +++ ** trying to do secure encryption or anything like that... +++ ** +++ ** Nothing in this file or anywhere else in SQLite does any kind of +++ ** encryption. The RC4 algorithm is being used as a PRNG (pseudo-random +++ ** number generator) not as an encryption device. +++ */ +++ if( !prng.isInit ){ +++ int i; +++ char k[256]; +++ prng.j = 0; +++ prng.i = 0; +++ sqliteOsRandomSeed(k); +++ for(i=0; i<256; i++){ +++ prng.s[i] = i; +++ } +++ for(i=0; i<256; i++){ +++ prng.j += prng.s[i] + k[i]; +++ t = prng.s[prng.j]; +++ prng.s[prng.j] = prng.s[i]; +++ prng.s[i] = t; +++ } +++ prng.isInit = 1; +++ } +++ +++ /* Generate and return single random byte +++ */ +++ prng.i++; +++ t = prng.s[prng.i]; +++ prng.j += t; +++ prng.s[prng.i] = prng.s[prng.j]; +++ prng.s[prng.j] = t; +++ t += prng.s[prng.i]; +++ return prng.s[t]; +++} +++ +++/* +++** Return N random bytes. +++*/ +++void sqliteRandomness(int N, void *pBuf){ +++ unsigned char *zBuf = pBuf; +++ sqliteOsEnterMutex(); +++ while( N-- ){ +++ *(zBuf++) = randomByte(); +++ } +++ sqliteOsLeaveMutex(); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/select.c ++@@ -0,0 +1,2434 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains C code routines that are called by the parser +++** to handle SELECT statements in SQLite. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++ +++ +++/* +++** Allocate a new Select structure and return a pointer to that +++** structure. +++*/ +++Select *sqliteSelectNew( +++ ExprList *pEList, /* which columns to include in the result */ +++ SrcList *pSrc, /* the FROM clause -- which tables to scan */ +++ Expr *pWhere, /* the WHERE clause */ +++ ExprList *pGroupBy, /* the GROUP BY clause */ +++ Expr *pHaving, /* the HAVING clause */ +++ ExprList *pOrderBy, /* the ORDER BY clause */ +++ int isDistinct, /* true if the DISTINCT keyword is present */ +++ int nLimit, /* LIMIT value. -1 means not used */ +++ int nOffset /* OFFSET value. 0 means no offset */ +++){ +++ Select *pNew; +++ pNew = sqliteMalloc( sizeof(*pNew) ); +++ if( pNew==0 ){ +++ sqliteExprListDelete(pEList); +++ sqliteSrcListDelete(pSrc); +++ sqliteExprDelete(pWhere); +++ sqliteExprListDelete(pGroupBy); +++ sqliteExprDelete(pHaving); +++ sqliteExprListDelete(pOrderBy); +++ }else{ +++ if( pEList==0 ){ +++ pEList = sqliteExprListAppend(0, sqliteExpr(TK_ALL,0,0,0), 0); +++ } +++ pNew->pEList = pEList; +++ pNew->pSrc = pSrc; +++ pNew->pWhere = pWhere; +++ pNew->pGroupBy = pGroupBy; +++ pNew->pHaving = pHaving; +++ pNew->pOrderBy = pOrderBy; +++ pNew->isDistinct = isDistinct; +++ pNew->op = TK_SELECT; +++ pNew->nLimit = nLimit; +++ pNew->nOffset = nOffset; +++ pNew->iLimit = -1; +++ pNew->iOffset = -1; +++ } +++ return pNew; +++} +++ +++/* +++** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the +++** type of join. Return an integer constant that expresses that type +++** in terms of the following bit values: +++** +++** JT_INNER +++** JT_OUTER +++** JT_NATURAL +++** JT_LEFT +++** JT_RIGHT +++** +++** A full outer join is the combination of JT_LEFT and JT_RIGHT. +++** +++** If an illegal or unsupported join type is seen, then still return +++** a join type, but put an error in the pParse structure. +++*/ +++int sqliteJoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ +++ int jointype = 0; +++ Token *apAll[3]; +++ Token *p; +++ static struct { +++ const char *zKeyword; +++ int nChar; +++ int code; +++ } keywords[] = { +++ { "natural", 7, JT_NATURAL }, +++ { "left", 4, JT_LEFT|JT_OUTER }, +++ { "right", 5, JT_RIGHT|JT_OUTER }, +++ { "full", 4, JT_LEFT|JT_RIGHT|JT_OUTER }, +++ { "outer", 5, JT_OUTER }, +++ { "inner", 5, JT_INNER }, +++ { "cross", 5, JT_INNER }, +++ }; +++ int i, j; +++ apAll[0] = pA; +++ apAll[1] = pB; +++ apAll[2] = pC; +++ for(i=0; i<3 && apAll[i]; i++){ +++ p = apAll[i]; +++ for(j=0; jn==keywords[j].nChar +++ && sqliteStrNICmp(p->z, keywords[j].zKeyword, p->n)==0 ){ +++ jointype |= keywords[j].code; +++ break; +++ } +++ } +++ if( j>=sizeof(keywords)/sizeof(keywords[0]) ){ +++ jointype |= JT_ERROR; +++ break; +++ } +++ } +++ if( +++ (jointype & (JT_INNER|JT_OUTER))==(JT_INNER|JT_OUTER) || +++ (jointype & JT_ERROR)!=0 +++ ){ +++ static Token dummy = { 0, 0 }; +++ char *zSp1 = " ", *zSp2 = " "; +++ if( pB==0 ){ pB = &dummy; zSp1 = 0; } +++ if( pC==0 ){ pC = &dummy; zSp2 = 0; } +++ sqliteSetNString(&pParse->zErrMsg, "unknown or unsupported join type: ", 0, +++ pA->z, pA->n, zSp1, 1, pB->z, pB->n, zSp2, 1, pC->z, pC->n, 0); +++ pParse->nErr++; +++ jointype = JT_INNER; +++ }else if( jointype & JT_RIGHT ){ +++ sqliteErrorMsg(pParse, +++ "RIGHT and FULL OUTER JOINs are not currently supported"); +++ jointype = JT_INNER; +++ } +++ return jointype; +++} +++ +++/* +++** Return the index of a column in a table. Return -1 if the column +++** is not contained in the table. +++*/ +++static int columnIndex(Table *pTab, const char *zCol){ +++ int i; +++ for(i=0; inCol; i++){ +++ if( sqliteStrICmp(pTab->aCol[i].zName, zCol)==0 ) return i; +++ } +++ return -1; +++} +++ +++/* +++** Add a term to the WHERE expression in *ppExpr that requires the +++** zCol column to be equal in the two tables pTab1 and pTab2. +++*/ +++static void addWhereTerm( +++ const char *zCol, /* Name of the column */ +++ const Table *pTab1, /* First table */ +++ const Table *pTab2, /* Second table */ +++ Expr **ppExpr /* Add the equality term to this expression */ +++){ +++ Token dummy; +++ Expr *pE1a, *pE1b, *pE1c; +++ Expr *pE2a, *pE2b, *pE2c; +++ Expr *pE; +++ +++ dummy.z = zCol; +++ dummy.n = strlen(zCol); +++ dummy.dyn = 0; +++ pE1a = sqliteExpr(TK_ID, 0, 0, &dummy); +++ pE2a = sqliteExpr(TK_ID, 0, 0, &dummy); +++ dummy.z = pTab1->zName; +++ dummy.n = strlen(dummy.z); +++ pE1b = sqliteExpr(TK_ID, 0, 0, &dummy); +++ dummy.z = pTab2->zName; +++ dummy.n = strlen(dummy.z); +++ pE2b = sqliteExpr(TK_ID, 0, 0, &dummy); +++ pE1c = sqliteExpr(TK_DOT, pE1b, pE1a, 0); +++ pE2c = sqliteExpr(TK_DOT, pE2b, pE2a, 0); +++ pE = sqliteExpr(TK_EQ, pE1c, pE2c, 0); +++ ExprSetProperty(pE, EP_FromJoin); +++ if( *ppExpr ){ +++ *ppExpr = sqliteExpr(TK_AND, *ppExpr, pE, 0); +++ }else{ +++ *ppExpr = pE; +++ } +++} +++ +++/* +++** Set the EP_FromJoin property on all terms of the given expression. +++** +++** The EP_FromJoin property is used on terms of an expression to tell +++** the LEFT OUTER JOIN processing logic that this term is part of the +++** join restriction specified in the ON or USING clause and not a part +++** of the more general WHERE clause. These terms are moved over to the +++** WHERE clause during join processing but we need to remember that they +++** originated in the ON or USING clause. +++*/ +++static void setJoinExpr(Expr *p){ +++ while( p ){ +++ ExprSetProperty(p, EP_FromJoin); +++ setJoinExpr(p->pLeft); +++ p = p->pRight; +++ } +++} +++ +++/* +++** This routine processes the join information for a SELECT statement. +++** ON and USING clauses are converted into extra terms of the WHERE clause. +++** NATURAL joins also create extra WHERE clause terms. +++** +++** This routine returns the number of errors encountered. +++*/ +++static int sqliteProcessJoin(Parse *pParse, Select *p){ +++ SrcList *pSrc; +++ int i, j; +++ pSrc = p->pSrc; +++ for(i=0; inSrc-1; i++){ +++ struct SrcList_item *pTerm = &pSrc->a[i]; +++ struct SrcList_item *pOther = &pSrc->a[i+1]; +++ +++ if( pTerm->pTab==0 || pOther->pTab==0 ) continue; +++ +++ /* When the NATURAL keyword is present, add WHERE clause terms for +++ ** every column that the two tables have in common. +++ */ +++ if( pTerm->jointype & JT_NATURAL ){ +++ Table *pTab; +++ if( pTerm->pOn || pTerm->pUsing ){ +++ sqliteErrorMsg(pParse, "a NATURAL join may not have " +++ "an ON or USING clause", 0); +++ return 1; +++ } +++ pTab = pTerm->pTab; +++ for(j=0; jnCol; j++){ +++ if( columnIndex(pOther->pTab, pTab->aCol[j].zName)>=0 ){ +++ addWhereTerm(pTab->aCol[j].zName, pTab, pOther->pTab, &p->pWhere); +++ } +++ } +++ } +++ +++ /* Disallow both ON and USING clauses in the same join +++ */ +++ if( pTerm->pOn && pTerm->pUsing ){ +++ sqliteErrorMsg(pParse, "cannot have both ON and USING " +++ "clauses in the same join"); +++ return 1; +++ } +++ +++ /* Add the ON clause to the end of the WHERE clause, connected by +++ ** and AND operator. +++ */ +++ if( pTerm->pOn ){ +++ setJoinExpr(pTerm->pOn); +++ if( p->pWhere==0 ){ +++ p->pWhere = pTerm->pOn; +++ }else{ +++ p->pWhere = sqliteExpr(TK_AND, p->pWhere, pTerm->pOn, 0); +++ } +++ pTerm->pOn = 0; +++ } +++ +++ /* Create extra terms on the WHERE clause for each column named +++ ** in the USING clause. Example: If the two tables to be joined are +++ ** A and B and the USING clause names X, Y, and Z, then add this +++ ** to the WHERE clause: A.X=B.X AND A.Y=B.Y AND A.Z=B.Z +++ ** Report an error if any column mentioned in the USING clause is +++ ** not contained in both tables to be joined. +++ */ +++ if( pTerm->pUsing ){ +++ IdList *pList; +++ int j; +++ assert( inSrc-1 ); +++ pList = pTerm->pUsing; +++ for(j=0; jnId; j++){ +++ if( columnIndex(pTerm->pTab, pList->a[j].zName)<0 || +++ columnIndex(pOther->pTab, pList->a[j].zName)<0 ){ +++ sqliteErrorMsg(pParse, "cannot join using column %s - column " +++ "not present in both tables", pList->a[j].zName); +++ return 1; +++ } +++ addWhereTerm(pList->a[j].zName, pTerm->pTab, pOther->pTab, &p->pWhere); +++ } +++ } +++ } +++ return 0; +++} +++ +++/* +++** Delete the given Select structure and all of its substructures. +++*/ +++void sqliteSelectDelete(Select *p){ +++ if( p==0 ) return; +++ sqliteExprListDelete(p->pEList); +++ sqliteSrcListDelete(p->pSrc); +++ sqliteExprDelete(p->pWhere); +++ sqliteExprListDelete(p->pGroupBy); +++ sqliteExprDelete(p->pHaving); +++ sqliteExprListDelete(p->pOrderBy); +++ sqliteSelectDelete(p->pPrior); +++ sqliteFree(p->zSelect); +++ sqliteFree(p); +++} +++ +++/* +++** Delete the aggregate information from the parse structure. +++*/ +++static void sqliteAggregateInfoReset(Parse *pParse){ +++ sqliteFree(pParse->aAgg); +++ pParse->aAgg = 0; +++ pParse->nAgg = 0; +++ pParse->useAgg = 0; +++} +++ +++/* +++** Insert code into "v" that will push the record on the top of the +++** stack into the sorter. +++*/ +++static void pushOntoSorter(Parse *pParse, Vdbe *v, ExprList *pOrderBy){ +++ char *zSortOrder; +++ int i; +++ zSortOrder = sqliteMalloc( pOrderBy->nExpr + 1 ); +++ if( zSortOrder==0 ) return; +++ for(i=0; inExpr; i++){ +++ int order = pOrderBy->a[i].sortOrder; +++ int type; +++ int c; +++ if( (order & SQLITE_SO_TYPEMASK)==SQLITE_SO_TEXT ){ +++ type = SQLITE_SO_TEXT; +++ }else if( (order & SQLITE_SO_TYPEMASK)==SQLITE_SO_NUM ){ +++ type = SQLITE_SO_NUM; +++ }else if( pParse->db->file_format>=4 ){ +++ type = sqliteExprType(pOrderBy->a[i].pExpr); +++ }else{ +++ type = SQLITE_SO_NUM; +++ } +++ if( (order & SQLITE_SO_DIRMASK)==SQLITE_SO_ASC ){ +++ c = type==SQLITE_SO_TEXT ? 'A' : '+'; +++ }else{ +++ c = type==SQLITE_SO_TEXT ? 'D' : '-'; +++ } +++ zSortOrder[i] = c; +++ sqliteExprCode(pParse, pOrderBy->a[i].pExpr); +++ } +++ zSortOrder[pOrderBy->nExpr] = 0; +++ sqliteVdbeOp3(v, OP_SortMakeKey, pOrderBy->nExpr, 0, zSortOrder, P3_DYNAMIC); +++ sqliteVdbeAddOp(v, OP_SortPut, 0, 0); +++} +++ +++/* +++** This routine adds a P3 argument to the last VDBE opcode that was +++** inserted. The P3 argument added is a string suitable for the +++** OP_MakeKey or OP_MakeIdxKey opcodes. The string consists of +++** characters 't' or 'n' depending on whether or not the various +++** fields of the key to be generated should be treated as numeric +++** or as text. See the OP_MakeKey and OP_MakeIdxKey opcode +++** documentation for additional information about the P3 string. +++** See also the sqliteAddIdxKeyType() routine. +++*/ +++void sqliteAddKeyType(Vdbe *v, ExprList *pEList){ +++ int nColumn = pEList->nExpr; +++ char *zType = sqliteMalloc( nColumn+1 ); +++ int i; +++ if( zType==0 ) return; +++ for(i=0; ia[i].pExpr)==SQLITE_SO_NUM ? 'n' : 't'; +++ } +++ zType[i] = 0; +++ sqliteVdbeChangeP3(v, -1, zType, P3_DYNAMIC); +++} +++ +++/* +++** Add code to implement the OFFSET and LIMIT +++*/ +++static void codeLimiter( +++ Vdbe *v, /* Generate code into this VM */ +++ Select *p, /* The SELECT statement being coded */ +++ int iContinue, /* Jump here to skip the current record */ +++ int iBreak, /* Jump here to end the loop */ +++ int nPop /* Number of times to pop stack when jumping */ +++){ +++ if( p->iOffset>=0 ){ +++ int addr = sqliteVdbeCurrentAddr(v) + 2; +++ if( nPop>0 ) addr++; +++ sqliteVdbeAddOp(v, OP_MemIncr, p->iOffset, addr); +++ if( nPop>0 ){ +++ sqliteVdbeAddOp(v, OP_Pop, nPop, 0); +++ } +++ sqliteVdbeAddOp(v, OP_Goto, 0, iContinue); +++ } +++ if( p->iLimit>=0 ){ +++ sqliteVdbeAddOp(v, OP_MemIncr, p->iLimit, iBreak); +++ } +++} +++ +++/* +++** This routine generates the code for the inside of the inner loop +++** of a SELECT. +++** +++** If srcTab and nColumn are both zero, then the pEList expressions +++** are evaluated in order to get the data for this row. If nColumn>0 +++** then data is pulled from srcTab and pEList is used only to get the +++** datatypes for each column. +++*/ +++static int selectInnerLoop( +++ Parse *pParse, /* The parser context */ +++ Select *p, /* The complete select statement being coded */ +++ ExprList *pEList, /* List of values being extracted */ +++ int srcTab, /* Pull data from this table */ +++ int nColumn, /* Number of columns in the source table */ +++ ExprList *pOrderBy, /* If not NULL, sort results using this key */ +++ int distinct, /* If >=0, make sure results are distinct */ +++ int eDest, /* How to dispose of the results */ +++ int iParm, /* An argument to the disposal method */ +++ int iContinue, /* Jump here to continue with next row */ +++ int iBreak /* Jump here to break out of the inner loop */ +++){ +++ Vdbe *v = pParse->pVdbe; +++ int i; +++ int hasDistinct; /* True if the DISTINCT keyword is present */ +++ +++ if( v==0 ) return 0; +++ assert( pEList!=0 ); +++ +++ /* If there was a LIMIT clause on the SELECT statement, then do the check +++ ** to see if this row should be output. +++ */ +++ hasDistinct = distinct>=0 && pEList && pEList->nExpr>0; +++ if( pOrderBy==0 && !hasDistinct ){ +++ codeLimiter(v, p, iContinue, iBreak, 0); +++ } +++ +++ /* Pull the requested columns. +++ */ +++ if( nColumn>0 ){ +++ for(i=0; inExpr; +++ for(i=0; inExpr; i++){ +++ sqliteExprCode(pParse, pEList->a[i].pExpr); +++ } +++ } +++ +++ /* If the DISTINCT keyword was present on the SELECT statement +++ ** and this row has been seen before, then do not make this row +++ ** part of the result. +++ */ +++ if( hasDistinct ){ +++#if NULL_ALWAYS_DISTINCT +++ sqliteVdbeAddOp(v, OP_IsNull, -pEList->nExpr, sqliteVdbeCurrentAddr(v)+7); +++#endif +++ sqliteVdbeAddOp(v, OP_MakeKey, pEList->nExpr, 1); +++ if( pParse->db->file_format>=4 ) sqliteAddKeyType(v, pEList); +++ sqliteVdbeAddOp(v, OP_Distinct, distinct, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, pEList->nExpr+1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iContinue); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, distinct, 0); +++ if( pOrderBy==0 ){ +++ codeLimiter(v, p, iContinue, iBreak, nColumn); +++ } +++ } +++ +++ switch( eDest ){ +++ /* In this mode, write each query result to the key of the temporary +++ ** table iParm. +++ */ +++ case SRT_Union: { +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0); +++ break; +++ } +++ +++ /* Store the result as data using a unique key. +++ */ +++ case SRT_Table: +++ case SRT_TempTable: { +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0); +++ if( pOrderBy ){ +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_NewRecno, iParm, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, iParm, 0); +++ } +++ break; +++ } +++ +++ /* Construct a record from the query result, but instead of +++ ** saving that record, use it as a key to delete elements from +++ ** the temporary table iParm. +++ */ +++ case SRT_Except: { +++ int addr; +++ addr = sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT); +++ sqliteVdbeAddOp(v, OP_NotFound, iParm, addr+3); +++ sqliteVdbeAddOp(v, OP_Delete, iParm, 0); +++ break; +++ } +++ +++ /* If we are creating a set for an "expr IN (SELECT ...)" construct, +++ ** then there should be a single item on the stack. Write this +++ ** item into the set table with bogus data. +++ */ +++ case SRT_Set: { +++ int addr1 = sqliteVdbeCurrentAddr(v); +++ int addr2; +++ assert( nColumn==1 ); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, addr1+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ addr2 = sqliteVdbeAddOp(v, OP_Goto, 0, 0); +++ if( pOrderBy ){ +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0); +++ } +++ sqliteVdbeChangeP2(v, addr2, sqliteVdbeCurrentAddr(v)); +++ break; +++ } +++ +++ /* If this is a scalar select that is part of an expression, then +++ ** store the results in the appropriate memory cell and break out +++ ** of the scan loop. +++ */ +++ case SRT_Mem: { +++ assert( nColumn==1 ); +++ if( pOrderBy ){ +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_MemStore, iParm, 1); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iBreak); +++ } +++ break; +++ } +++ +++ /* Send the data to the callback function. +++ */ +++ case SRT_Callback: +++ case SRT_Sorter: { +++ if( pOrderBy ){ +++ sqliteVdbeAddOp(v, OP_SortMakeRec, nColumn, 0); +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ assert( eDest==SRT_Callback ); +++ sqliteVdbeAddOp(v, OP_Callback, nColumn, 0); +++ } +++ break; +++ } +++ +++ /* Invoke a subroutine to handle the results. The subroutine itself +++ ** is responsible for popping the results off of the stack. +++ */ +++ case SRT_Subroutine: { +++ if( pOrderBy ){ +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0); +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Gosub, 0, iParm); +++ } +++ break; +++ } +++ +++ /* Discard the results. This is used for SELECT statements inside +++ ** the body of a TRIGGER. The purpose of such selects is to call +++ ** user-defined functions that have side effects. We do not care +++ ** about the actual results of the select. +++ */ +++ default: { +++ assert( eDest==SRT_Discard ); +++ sqliteVdbeAddOp(v, OP_Pop, nColumn, 0); +++ break; +++ } +++ } +++ return 0; +++} +++ +++/* +++** If the inner loop was generated using a non-null pOrderBy argument, +++** then the results were placed in a sorter. After the loop is terminated +++** we need to run the sorter and output the results. The following +++** routine generates the code needed to do that. +++*/ +++static void generateSortTail( +++ Select *p, /* The SELECT statement */ +++ Vdbe *v, /* Generate code into this VDBE */ +++ int nColumn, /* Number of columns of data */ +++ int eDest, /* Write the sorted results here */ +++ int iParm /* Optional parameter associated with eDest */ +++){ +++ int end1 = sqliteVdbeMakeLabel(v); +++ int end2 = sqliteVdbeMakeLabel(v); +++ int addr; +++ if( eDest==SRT_Sorter ) return; +++ sqliteVdbeAddOp(v, OP_Sort, 0, 0); +++ addr = sqliteVdbeAddOp(v, OP_SortNext, 0, end1); +++ codeLimiter(v, p, addr, end2, 1); +++ switch( eDest ){ +++ case SRT_Callback: { +++ sqliteVdbeAddOp(v, OP_SortCallback, nColumn, 0); +++ break; +++ } +++ case SRT_Table: +++ case SRT_TempTable: { +++ sqliteVdbeAddOp(v, OP_NewRecno, iParm, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, iParm, 0); +++ break; +++ } +++ case SRT_Set: { +++ assert( nColumn==1 ); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0); +++ break; +++ } +++ case SRT_Mem: { +++ assert( nColumn==1 ); +++ sqliteVdbeAddOp(v, OP_MemStore, iParm, 1); +++ sqliteVdbeAddOp(v, OP_Goto, 0, end1); +++ break; +++ } +++ case SRT_Subroutine: { +++ int i; +++ for(i=0; ipVdbe; +++ int i, j; +++ for(i=0; inExpr; i++){ +++ Expr *p = pEList->a[i].pExpr; +++ char *zType = 0; +++ if( p==0 ) continue; +++ if( p->op==TK_COLUMN && pTabList ){ +++ Table *pTab; +++ int iCol = p->iColumn; +++ for(j=0; jnSrc && pTabList->a[j].iCursor!=p->iTable; j++){} +++ assert( jnSrc ); +++ pTab = pTabList->a[j].pTab; +++ if( iCol<0 ) iCol = pTab->iPKey; +++ assert( iCol==-1 || (iCol>=0 && iColnCol) ); +++ if( iCol<0 ){ +++ zType = "INTEGER"; +++ }else{ +++ zType = pTab->aCol[iCol].zType; +++ } +++ }else{ +++ if( sqliteExprType(p)==SQLITE_SO_TEXT ){ +++ zType = "TEXT"; +++ }else{ +++ zType = "NUMERIC"; +++ } +++ } +++ sqliteVdbeOp3(v, OP_ColumnName, i + pEList->nExpr, 0, zType, 0); +++ } +++} +++ +++/* +++** Generate code that will tell the VDBE the names of columns +++** in the result set. This information is used to provide the +++** azCol[] values in the callback. +++*/ +++static void generateColumnNames( +++ Parse *pParse, /* Parser context */ +++ SrcList *pTabList, /* List of tables */ +++ ExprList *pEList /* Expressions defining the result set */ +++){ +++ Vdbe *v = pParse->pVdbe; +++ int i, j; +++ sqlite *db = pParse->db; +++ int fullNames, shortNames; +++ +++ assert( v!=0 ); +++ if( pParse->colNamesSet || v==0 || sqlite_malloc_failed ) return; +++ pParse->colNamesSet = 1; +++ fullNames = (db->flags & SQLITE_FullColNames)!=0; +++ shortNames = (db->flags & SQLITE_ShortColNames)!=0; +++ for(i=0; inExpr; i++){ +++ Expr *p; +++ int p2 = i==pEList->nExpr-1; +++ p = pEList->a[i].pExpr; +++ if( p==0 ) continue; +++ if( pEList->a[i].zName ){ +++ char *zName = pEList->a[i].zName; +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, 0); +++ continue; +++ } +++ if( p->op==TK_COLUMN && pTabList ){ +++ Table *pTab; +++ char *zCol; +++ int iCol = p->iColumn; +++ for(j=0; jnSrc && pTabList->a[j].iCursor!=p->iTable; j++){} +++ assert( jnSrc ); +++ pTab = pTabList->a[j].pTab; +++ if( iCol<0 ) iCol = pTab->iPKey; +++ assert( iCol==-1 || (iCol>=0 && iColnCol) ); +++ if( iCol<0 ){ +++ zCol = "_ROWID_"; +++ }else{ +++ zCol = pTab->aCol[iCol].zName; +++ } +++ if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){ +++ int addr = sqliteVdbeOp3(v,OP_ColumnName, i, p2, p->span.z, p->span.n); +++ sqliteVdbeCompressSpace(v, addr); +++ }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){ +++ char *zName = 0; +++ char *zTab; +++ +++ zTab = pTabList->a[j].zAlias; +++ if( fullNames || zTab==0 ) zTab = pTab->zName; +++ sqliteSetString(&zName, zTab, ".", zCol, 0); +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, P3_DYNAMIC); +++ }else{ +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zCol, 0); +++ } +++ }else if( p->span.z && p->span.z[0] ){ +++ int addr = sqliteVdbeOp3(v,OP_ColumnName, i, p2, p->span.z, p->span.n); +++ sqliteVdbeCompressSpace(v, addr); +++ }else{ +++ char zName[30]; +++ assert( p->op!=TK_COLUMN || pTabList==0 ); +++ sprintf(zName, "column%d", i+1); +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, 0); +++ } +++ } +++} +++ +++/* +++** Name of the connection operator, used for error messages. +++*/ +++static const char *selectOpName(int id){ +++ char *z; +++ switch( id ){ +++ case TK_ALL: z = "UNION ALL"; break; +++ case TK_INTERSECT: z = "INTERSECT"; break; +++ case TK_EXCEPT: z = "EXCEPT"; break; +++ default: z = "UNION"; break; +++ } +++ return z; +++} +++ +++/* +++** Forward declaration +++*/ +++static int fillInColumnList(Parse*, Select*); +++ +++/* +++** Given a SELECT statement, generate a Table structure that describes +++** the result set of that SELECT. +++*/ +++Table *sqliteResultSetOfSelect(Parse *pParse, char *zTabName, Select *pSelect){ +++ Table *pTab; +++ int i, j; +++ ExprList *pEList; +++ Column *aCol; +++ +++ if( fillInColumnList(pParse, pSelect) ){ +++ return 0; +++ } +++ pTab = sqliteMalloc( sizeof(Table) ); +++ if( pTab==0 ){ +++ return 0; +++ } +++ pTab->zName = zTabName ? sqliteStrDup(zTabName) : 0; +++ pEList = pSelect->pEList; +++ pTab->nCol = pEList->nExpr; +++ assert( pTab->nCol>0 ); +++ pTab->aCol = aCol = sqliteMalloc( sizeof(pTab->aCol[0])*pTab->nCol ); +++ for(i=0; inCol; i++){ +++ Expr *p, *pR; +++ if( pEList->a[i].zName ){ +++ aCol[i].zName = sqliteStrDup(pEList->a[i].zName); +++ }else if( (p=pEList->a[i].pExpr)->op==TK_DOT +++ && (pR=p->pRight)!=0 && pR->token.z && pR->token.z[0] ){ +++ int cnt; +++ sqliteSetNString(&aCol[i].zName, pR->token.z, pR->token.n, 0); +++ for(j=cnt=0; jtoken.z, pR->token.n, zBuf, n,0); +++ j = -1; +++ } +++ } +++ }else if( p->span.z && p->span.z[0] ){ +++ sqliteSetNString(&pTab->aCol[i].zName, p->span.z, p->span.n, 0); +++ }else{ +++ char zBuf[30]; +++ sprintf(zBuf, "column%d", i+1); +++ aCol[i].zName = sqliteStrDup(zBuf); +++ } +++ sqliteDequote(aCol[i].zName); +++ } +++ pTab->iPKey = -1; +++ return pTab; +++} +++ +++/* +++** For the given SELECT statement, do three things. +++** +++** (1) Fill in the pTabList->a[].pTab fields in the SrcList that +++** defines the set of tables that should be scanned. For views, +++** fill pTabList->a[].pSelect with a copy of the SELECT statement +++** that implements the view. A copy is made of the view's SELECT +++** statement so that we can freely modify or delete that statement +++** without worrying about messing up the presistent representation +++** of the view. +++** +++** (2) Add terms to the WHERE clause to accomodate the NATURAL keyword +++** on joins and the ON and USING clause of joins. +++** +++** (3) Scan the list of columns in the result set (pEList) looking +++** for instances of the "*" operator or the TABLE.* operator. +++** If found, expand each "*" to be every column in every table +++** and TABLE.* to be every column in TABLE. +++** +++** Return 0 on success. If there are problems, leave an error message +++** in pParse and return non-zero. +++*/ +++static int fillInColumnList(Parse *pParse, Select *p){ +++ int i, j, k, rc; +++ SrcList *pTabList; +++ ExprList *pEList; +++ Table *pTab; +++ +++ if( p==0 || p->pSrc==0 ) return 1; +++ pTabList = p->pSrc; +++ pEList = p->pEList; +++ +++ /* Look up every table in the table list. +++ */ +++ for(i=0; inSrc; i++){ +++ if( pTabList->a[i].pTab ){ +++ /* This routine has run before! No need to continue */ +++ return 0; +++ } +++ if( pTabList->a[i].zName==0 ){ +++ /* A sub-query in the FROM clause of a SELECT */ +++ assert( pTabList->a[i].pSelect!=0 ); +++ if( pTabList->a[i].zAlias==0 ){ +++ char zFakeName[60]; +++ sprintf(zFakeName, "sqlite_subquery_%p_", +++ (void*)pTabList->a[i].pSelect); +++ sqliteSetString(&pTabList->a[i].zAlias, zFakeName, 0); +++ } +++ pTabList->a[i].pTab = pTab = +++ sqliteResultSetOfSelect(pParse, pTabList->a[i].zAlias, +++ pTabList->a[i].pSelect); +++ if( pTab==0 ){ +++ return 1; +++ } +++ /* The isTransient flag indicates that the Table structure has been +++ ** dynamically allocated and may be freed at any time. In other words, +++ ** pTab is not pointing to a persistent table structure that defines +++ ** part of the schema. */ +++ pTab->isTransient = 1; +++ }else{ +++ /* An ordinary table or view name in the FROM clause */ +++ pTabList->a[i].pTab = pTab = +++ sqliteLocateTable(pParse,pTabList->a[i].zName,pTabList->a[i].zDatabase); +++ if( pTab==0 ){ +++ return 1; +++ } +++ if( pTab->pSelect ){ +++ /* We reach here if the named table is a really a view */ +++ if( sqliteViewGetColumnNames(pParse, pTab) ){ +++ return 1; +++ } +++ /* If pTabList->a[i].pSelect!=0 it means we are dealing with a +++ ** view within a view. The SELECT structure has already been +++ ** copied by the outer view so we can skip the copy step here +++ ** in the inner view. +++ */ +++ if( pTabList->a[i].pSelect==0 ){ +++ pTabList->a[i].pSelect = sqliteSelectDup(pTab->pSelect); +++ } +++ } +++ } +++ } +++ +++ /* Process NATURAL keywords, and ON and USING clauses of joins. +++ */ +++ if( sqliteProcessJoin(pParse, p) ) return 1; +++ +++ /* For every "*" that occurs in the column list, insert the names of +++ ** all columns in all tables. And for every TABLE.* insert the names +++ ** of all columns in TABLE. The parser inserted a special expression +++ ** with the TK_ALL operator for each "*" that it found in the column list. +++ ** The following code just has to locate the TK_ALL expressions and expand +++ ** each one to the list of all columns in all tables. +++ ** +++ ** The first loop just checks to see if there are any "*" operators +++ ** that need expanding. +++ */ +++ for(k=0; knExpr; k++){ +++ Expr *pE = pEList->a[k].pExpr; +++ if( pE->op==TK_ALL ) break; +++ if( pE->op==TK_DOT && pE->pRight && pE->pRight->op==TK_ALL +++ && pE->pLeft && pE->pLeft->op==TK_ID ) break; +++ } +++ rc = 0; +++ if( knExpr ){ +++ /* +++ ** If we get here it means the result set contains one or more "*" +++ ** operators that need to be expanded. Loop through each expression +++ ** in the result set and expand them one by one. +++ */ +++ struct ExprList_item *a = pEList->a; +++ ExprList *pNew = 0; +++ for(k=0; knExpr; k++){ +++ Expr *pE = a[k].pExpr; +++ if( pE->op!=TK_ALL && +++ (pE->op!=TK_DOT || pE->pRight==0 || pE->pRight->op!=TK_ALL) ){ +++ /* This particular expression does not need to be expanded. +++ */ +++ pNew = sqliteExprListAppend(pNew, a[k].pExpr, 0); +++ pNew->a[pNew->nExpr-1].zName = a[k].zName; +++ a[k].pExpr = 0; +++ a[k].zName = 0; +++ }else{ +++ /* This expression is a "*" or a "TABLE.*" and needs to be +++ ** expanded. */ +++ int tableSeen = 0; /* Set to 1 when TABLE matches */ +++ char *zTName; /* text of name of TABLE */ +++ if( pE->op==TK_DOT && pE->pLeft ){ +++ zTName = sqliteTableNameFromToken(&pE->pLeft->token); +++ }else{ +++ zTName = 0; +++ } +++ for(i=0; inSrc; i++){ +++ Table *pTab = pTabList->a[i].pTab; +++ char *zTabName = pTabList->a[i].zAlias; +++ if( zTabName==0 || zTabName[0]==0 ){ +++ zTabName = pTab->zName; +++ } +++ if( zTName && (zTabName==0 || zTabName[0]==0 || +++ sqliteStrICmp(zTName, zTabName)!=0) ){ +++ continue; +++ } +++ tableSeen = 1; +++ for(j=0; jnCol; j++){ +++ Expr *pExpr, *pLeft, *pRight; +++ char *zName = pTab->aCol[j].zName; +++ +++ if( i>0 && (pTabList->a[i-1].jointype & JT_NATURAL)!=0 && +++ columnIndex(pTabList->a[i-1].pTab, zName)>=0 ){ +++ /* In a NATURAL join, omit the join columns from the +++ ** table on the right */ +++ continue; +++ } +++ if( i>0 && sqliteIdListIndex(pTabList->a[i-1].pUsing, zName)>=0 ){ +++ /* In a join with a USING clause, omit columns in the +++ ** using clause from the table on the right. */ +++ continue; +++ } +++ pRight = sqliteExpr(TK_ID, 0, 0, 0); +++ if( pRight==0 ) break; +++ pRight->token.z = zName; +++ pRight->token.n = strlen(zName); +++ pRight->token.dyn = 0; +++ if( zTabName && pTabList->nSrc>1 ){ +++ pLeft = sqliteExpr(TK_ID, 0, 0, 0); +++ pExpr = sqliteExpr(TK_DOT, pLeft, pRight, 0); +++ if( pExpr==0 ) break; +++ pLeft->token.z = zTabName; +++ pLeft->token.n = strlen(zTabName); +++ pLeft->token.dyn = 0; +++ sqliteSetString((char**)&pExpr->span.z, zTabName, ".", zName, 0); +++ pExpr->span.n = strlen(pExpr->span.z); +++ pExpr->span.dyn = 1; +++ pExpr->token.z = 0; +++ pExpr->token.n = 0; +++ pExpr->token.dyn = 0; +++ }else{ +++ pExpr = pRight; +++ pExpr->span = pExpr->token; +++ } +++ pNew = sqliteExprListAppend(pNew, pExpr, 0); +++ } +++ } +++ if( !tableSeen ){ +++ if( zTName ){ +++ sqliteErrorMsg(pParse, "no such table: %s", zTName); +++ }else{ +++ sqliteErrorMsg(pParse, "no tables specified"); +++ } +++ rc = 1; +++ } +++ sqliteFree(zTName); +++ } +++ } +++ sqliteExprListDelete(pEList); +++ p->pEList = pNew; +++ } +++ return rc; +++} +++ +++/* +++** This routine recursively unlinks the Select.pSrc.a[].pTab pointers +++** in a select structure. It just sets the pointers to NULL. This +++** routine is recursive in the sense that if the Select.pSrc.a[].pSelect +++** pointer is not NULL, this routine is called recursively on that pointer. +++** +++** This routine is called on the Select structure that defines a +++** VIEW in order to undo any bindings to tables. This is necessary +++** because those tables might be DROPed by a subsequent SQL command. +++** If the bindings are not removed, then the Select.pSrc->a[].pTab field +++** will be left pointing to a deallocated Table structure after the +++** DROP and a coredump will occur the next time the VIEW is used. +++*/ +++void sqliteSelectUnbind(Select *p){ +++ int i; +++ SrcList *pSrc = p->pSrc; +++ Table *pTab; +++ if( p==0 ) return; +++ for(i=0; inSrc; i++){ +++ if( (pTab = pSrc->a[i].pTab)!=0 ){ +++ if( pTab->isTransient ){ +++ sqliteDeleteTable(0, pTab); +++ } +++ pSrc->a[i].pTab = 0; +++ if( pSrc->a[i].pSelect ){ +++ sqliteSelectUnbind(pSrc->a[i].pSelect); +++ } +++ } +++ } +++} +++ +++/* +++** This routine associates entries in an ORDER BY expression list with +++** columns in a result. For each ORDER BY expression, the opcode of +++** the top-level node is changed to TK_COLUMN and the iColumn value of +++** the top-level node is filled in with column number and the iTable +++** value of the top-level node is filled with iTable parameter. +++** +++** If there are prior SELECT clauses, they are processed first. A match +++** in an earlier SELECT takes precedence over a later SELECT. +++** +++** Any entry that does not match is flagged as an error. The number +++** of errors is returned. +++** +++** This routine does NOT correctly initialize the Expr.dataType field +++** of the ORDER BY expressions. The multiSelectSortOrder() routine +++** must be called to do that after the individual select statements +++** have all been analyzed. This routine is unable to compute Expr.dataType +++** because it must be called before the individual select statements +++** have been analyzed. +++*/ +++static int matchOrderbyToColumn( +++ Parse *pParse, /* A place to leave error messages */ +++ Select *pSelect, /* Match to result columns of this SELECT */ +++ ExprList *pOrderBy, /* The ORDER BY values to match against columns */ +++ int iTable, /* Insert this value in iTable */ +++ int mustComplete /* If TRUE all ORDER BYs must match */ +++){ +++ int nErr = 0; +++ int i, j; +++ ExprList *pEList; +++ +++ if( pSelect==0 || pOrderBy==0 ) return 1; +++ if( mustComplete ){ +++ for(i=0; inExpr; i++){ pOrderBy->a[i].done = 0; } +++ } +++ if( fillInColumnList(pParse, pSelect) ){ +++ return 1; +++ } +++ if( pSelect->pPrior ){ +++ if( matchOrderbyToColumn(pParse, pSelect->pPrior, pOrderBy, iTable, 0) ){ +++ return 1; +++ } +++ } +++ pEList = pSelect->pEList; +++ for(i=0; inExpr; i++){ +++ Expr *pE = pOrderBy->a[i].pExpr; +++ int iCol = -1; +++ if( pOrderBy->a[i].done ) continue; +++ if( sqliteExprIsInteger(pE, &iCol) ){ +++ if( iCol<=0 || iCol>pEList->nExpr ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY position %d should be between 1 and %d", +++ iCol, pEList->nExpr); +++ nErr++; +++ break; +++ } +++ if( !mustComplete ) continue; +++ iCol--; +++ } +++ for(j=0; iCol<0 && jnExpr; j++){ +++ if( pEList->a[j].zName && (pE->op==TK_ID || pE->op==TK_STRING) ){ +++ char *zName, *zLabel; +++ zName = pEList->a[j].zName; +++ assert( pE->token.z ); +++ zLabel = sqliteStrNDup(pE->token.z, pE->token.n); +++ sqliteDequote(zLabel); +++ if( sqliteStrICmp(zName, zLabel)==0 ){ +++ iCol = j; +++ } +++ sqliteFree(zLabel); +++ } +++ if( iCol<0 && sqliteExprCompare(pE, pEList->a[j].pExpr) ){ +++ iCol = j; +++ } +++ } +++ if( iCol>=0 ){ +++ pE->op = TK_COLUMN; +++ pE->iColumn = iCol; +++ pE->iTable = iTable; +++ pOrderBy->a[i].done = 1; +++ } +++ if( iCol<0 && mustComplete ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY term number %d does not match any result column", i+1); +++ nErr++; +++ break; +++ } +++ } +++ return nErr; +++} +++ +++/* +++** Get a VDBE for the given parser context. Create a new one if necessary. +++** If an error occurs, return NULL and leave a message in pParse. +++*/ +++Vdbe *sqliteGetVdbe(Parse *pParse){ +++ Vdbe *v = pParse->pVdbe; +++ if( v==0 ){ +++ v = pParse->pVdbe = sqliteVdbeCreate(pParse->db); +++ } +++ return v; +++} +++ +++/* +++** This routine sets the Expr.dataType field on all elements of +++** the pOrderBy expression list. The pOrderBy list will have been +++** set up by matchOrderbyToColumn(). Hence each expression has +++** a TK_COLUMN as its root node. The Expr.iColumn refers to a +++** column in the result set. The datatype is set to SQLITE_SO_TEXT +++** if the corresponding column in p and every SELECT to the left of +++** p has a datatype of SQLITE_SO_TEXT. If the cooressponding column +++** in p or any of the left SELECTs is SQLITE_SO_NUM, then the datatype +++** of the order-by expression is set to SQLITE_SO_NUM. +++** +++** Examples: +++** +++** CREATE TABLE one(a INTEGER, b TEXT); +++** CREATE TABLE two(c VARCHAR(5), d FLOAT); +++** +++** SELECT b, b FROM one UNION SELECT d, c FROM two ORDER BY 1, 2; +++** +++** The primary sort key will use SQLITE_SO_NUM because the "d" in +++** the second SELECT is numeric. The 1st column of the first SELECT +++** is text but that does not matter because a numeric always overrides +++** a text. +++** +++** The secondary key will use the SQLITE_SO_TEXT sort order because +++** both the (second) "b" in the first SELECT and the "c" in the second +++** SELECT have a datatype of text. +++*/ +++static void multiSelectSortOrder(Select *p, ExprList *pOrderBy){ +++ int i; +++ ExprList *pEList; +++ if( pOrderBy==0 ) return; +++ if( p==0 ){ +++ for(i=0; inExpr; i++){ +++ pOrderBy->a[i].pExpr->dataType = SQLITE_SO_TEXT; +++ } +++ return; +++ } +++ multiSelectSortOrder(p->pPrior, pOrderBy); +++ pEList = p->pEList; +++ for(i=0; inExpr; i++){ +++ Expr *pE = pOrderBy->a[i].pExpr; +++ if( pE->dataType==SQLITE_SO_NUM ) continue; +++ assert( pE->iColumn>=0 ); +++ if( pEList->nExpr>pE->iColumn ){ +++ pE->dataType = sqliteExprType(pEList->a[pE->iColumn].pExpr); +++ } +++ } +++} +++ +++/* +++** Compute the iLimit and iOffset fields of the SELECT based on the +++** nLimit and nOffset fields. nLimit and nOffset hold the integers +++** that appear in the original SQL statement after the LIMIT and OFFSET +++** keywords. Or that hold -1 and 0 if those keywords are omitted. +++** iLimit and iOffset are the integer memory register numbers for +++** counters used to compute the limit and offset. If there is no +++** limit and/or offset, then iLimit and iOffset are negative. +++** +++** This routine changes the values if iLimit and iOffset only if +++** a limit or offset is defined by nLimit and nOffset. iLimit and +++** iOffset should have been preset to appropriate default values +++** (usually but not always -1) prior to calling this routine. +++** Only if nLimit>=0 or nOffset>0 do the limit registers get +++** redefined. The UNION ALL operator uses this property to force +++** the reuse of the same limit and offset registers across multiple +++** SELECT statements. +++*/ +++static void computeLimitRegisters(Parse *pParse, Select *p){ +++ /* +++ ** If the comparison is p->nLimit>0 then "LIMIT 0" shows +++ ** all rows. It is the same as no limit. If the comparision is +++ ** p->nLimit>=0 then "LIMIT 0" show no rows at all. +++ ** "LIMIT -1" always shows all rows. There is some +++ ** contraversy about what the correct behavior should be. +++ ** The current implementation interprets "LIMIT 0" to mean +++ ** no rows. +++ */ +++ if( p->nLimit>=0 ){ +++ int iMem = pParse->nMem++; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ sqliteVdbeAddOp(v, OP_Integer, -p->nLimit, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iMem, 1); +++ p->iLimit = iMem; +++ } +++ if( p->nOffset>0 ){ +++ int iMem = pParse->nMem++; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ sqliteVdbeAddOp(v, OP_Integer, -p->nOffset, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iMem, 1); +++ p->iOffset = iMem; +++ } +++} +++ +++/* +++** This routine is called to process a query that is really the union +++** or intersection of two or more separate queries. +++** +++** "p" points to the right-most of the two queries. the query on the +++** left is p->pPrior. The left query could also be a compound query +++** in which case this routine will be called recursively. +++** +++** The results of the total query are to be written into a destination +++** of type eDest with parameter iParm. +++** +++** Example 1: Consider a three-way compound SQL statement. +++** +++** SELECT a FROM t1 UNION SELECT b FROM t2 UNION SELECT c FROM t3 +++** +++** This statement is parsed up as follows: +++** +++** SELECT c FROM t3 +++** | +++** `-----> SELECT b FROM t2 +++** | +++** `------> SELECT a FROM t1 +++** +++** The arrows in the diagram above represent the Select.pPrior pointer. +++** So if this routine is called with p equal to the t3 query, then +++** pPrior will be the t2 query. p->op will be TK_UNION in this case. +++** +++** Notice that because of the way SQLite parses compound SELECTs, the +++** individual selects always group from left to right. +++*/ +++static int multiSelect(Parse *pParse, Select *p, int eDest, int iParm){ +++ int rc; /* Success code from a subroutine */ +++ Select *pPrior; /* Another SELECT immediately to our left */ +++ Vdbe *v; /* Generate code to this VDBE */ +++ +++ /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs. Only +++ ** the last SELECT in the series may have an ORDER BY or LIMIT. +++ */ +++ if( p==0 || p->pPrior==0 ) return 1; +++ pPrior = p->pPrior; +++ if( pPrior->pOrderBy ){ +++ sqliteErrorMsg(pParse,"ORDER BY clause should come after %s not before", +++ selectOpName(p->op)); +++ return 1; +++ } +++ if( pPrior->nLimit>=0 || pPrior->nOffset>0 ){ +++ sqliteErrorMsg(pParse,"LIMIT clause should come after %s not before", +++ selectOpName(p->op)); +++ return 1; +++ } +++ +++ /* Make sure we have a valid query engine. If not, create a new one. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return 1; +++ +++ /* Create the destination temporary table if necessary +++ */ +++ if( eDest==SRT_TempTable ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); +++ eDest = SRT_Table; +++ } +++ +++ /* Generate code for the left and right SELECT statements. +++ */ +++ switch( p->op ){ +++ case TK_ALL: { +++ if( p->pOrderBy==0 ){ +++ pPrior->nLimit = p->nLimit; +++ pPrior->nOffset = p->nOffset; +++ rc = sqliteSelect(pParse, pPrior, eDest, iParm, 0, 0, 0); +++ if( rc ) return rc; +++ p->pPrior = 0; +++ p->iLimit = pPrior->iLimit; +++ p->iOffset = pPrior->iOffset; +++ p->nLimit = -1; +++ p->nOffset = 0; +++ rc = sqliteSelect(pParse, p, eDest, iParm, 0, 0, 0); +++ p->pPrior = pPrior; +++ if( rc ) return rc; +++ break; +++ } +++ /* For UNION ALL ... ORDER BY fall through to the next case */ +++ } +++ case TK_EXCEPT: +++ case TK_UNION: { +++ int unionTab; /* Cursor number of the temporary table holding result */ +++ int op; /* One of the SRT_ operations to apply to self */ +++ int priorOp; /* The SRT_ operation to apply to prior selects */ +++ int nLimit, nOffset; /* Saved values of p->nLimit and p->nOffset */ +++ ExprList *pOrderBy; /* The ORDER BY clause for the right SELECT */ +++ +++ priorOp = p->op==TK_ALL ? SRT_Table : SRT_Union; +++ if( eDest==priorOp && p->pOrderBy==0 && p->nLimit<0 && p->nOffset==0 ){ +++ /* We can reuse a temporary table generated by a SELECT to our +++ ** right. +++ */ +++ unionTab = iParm; +++ }else{ +++ /* We will need to create our own temporary table to hold the +++ ** intermediate results. +++ */ +++ unionTab = pParse->nTab++; +++ if( p->pOrderBy +++ && matchOrderbyToColumn(pParse, p, p->pOrderBy, unionTab, 1) ){ +++ return 1; +++ } +++ if( p->op!=TK_ALL ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, unionTab, 1); +++ sqliteVdbeAddOp(v, OP_KeyAsData, unionTab, 1); +++ }else{ +++ sqliteVdbeAddOp(v, OP_OpenTemp, unionTab, 0); +++ } +++ } +++ +++ /* Code the SELECT statements to our left +++ */ +++ rc = sqliteSelect(pParse, pPrior, priorOp, unionTab, 0, 0, 0); +++ if( rc ) return rc; +++ +++ /* Code the current SELECT statement +++ */ +++ switch( p->op ){ +++ case TK_EXCEPT: op = SRT_Except; break; +++ case TK_UNION: op = SRT_Union; break; +++ case TK_ALL: op = SRT_Table; break; +++ } +++ p->pPrior = 0; +++ pOrderBy = p->pOrderBy; +++ p->pOrderBy = 0; +++ nLimit = p->nLimit; +++ p->nLimit = -1; +++ nOffset = p->nOffset; +++ p->nOffset = 0; +++ rc = sqliteSelect(pParse, p, op, unionTab, 0, 0, 0); +++ p->pPrior = pPrior; +++ p->pOrderBy = pOrderBy; +++ p->nLimit = nLimit; +++ p->nOffset = nOffset; +++ if( rc ) return rc; +++ +++ /* Convert the data in the temporary table into whatever form +++ ** it is that we currently need. +++ */ +++ if( eDest!=priorOp || unionTab!=iParm ){ +++ int iCont, iBreak, iStart; +++ assert( p->pEList ); +++ if( eDest==SRT_Callback ){ +++ generateColumnNames(pParse, 0, p->pEList); +++ generateColumnTypes(pParse, p->pSrc, p->pEList); +++ } +++ iBreak = sqliteVdbeMakeLabel(v); +++ iCont = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, unionTab, iBreak); +++ computeLimitRegisters(pParse, p); +++ iStart = sqliteVdbeCurrentAddr(v); +++ multiSelectSortOrder(p, p->pOrderBy); +++ rc = selectInnerLoop(pParse, p, p->pEList, unionTab, p->pEList->nExpr, +++ p->pOrderBy, -1, eDest, iParm, +++ iCont, iBreak); +++ if( rc ) return 1; +++ sqliteVdbeResolveLabel(v, iCont); +++ sqliteVdbeAddOp(v, OP_Next, unionTab, iStart); +++ sqliteVdbeResolveLabel(v, iBreak); +++ sqliteVdbeAddOp(v, OP_Close, unionTab, 0); +++ if( p->pOrderBy ){ +++ generateSortTail(p, v, p->pEList->nExpr, eDest, iParm); +++ } +++ } +++ break; +++ } +++ case TK_INTERSECT: { +++ int tab1, tab2; +++ int iCont, iBreak, iStart; +++ int nLimit, nOffset; +++ +++ /* INTERSECT is different from the others since it requires +++ ** two temporary tables. Hence it has its own case. Begin +++ ** by allocating the tables we will need. +++ */ +++ tab1 = pParse->nTab++; +++ tab2 = pParse->nTab++; +++ if( p->pOrderBy && matchOrderbyToColumn(pParse,p,p->pOrderBy,tab1,1) ){ +++ return 1; +++ } +++ sqliteVdbeAddOp(v, OP_OpenTemp, tab1, 1); +++ sqliteVdbeAddOp(v, OP_KeyAsData, tab1, 1); +++ +++ /* Code the SELECTs to our left into temporary table "tab1". +++ */ +++ rc = sqliteSelect(pParse, pPrior, SRT_Union, tab1, 0, 0, 0); +++ if( rc ) return rc; +++ +++ /* Code the current SELECT into temporary table "tab2" +++ */ +++ sqliteVdbeAddOp(v, OP_OpenTemp, tab2, 1); +++ sqliteVdbeAddOp(v, OP_KeyAsData, tab2, 1); +++ p->pPrior = 0; +++ nLimit = p->nLimit; +++ p->nLimit = -1; +++ nOffset = p->nOffset; +++ p->nOffset = 0; +++ rc = sqliteSelect(pParse, p, SRT_Union, tab2, 0, 0, 0); +++ p->pPrior = pPrior; +++ p->nLimit = nLimit; +++ p->nOffset = nOffset; +++ if( rc ) return rc; +++ +++ /* Generate code to take the intersection of the two temporary +++ ** tables. +++ */ +++ assert( p->pEList ); +++ if( eDest==SRT_Callback ){ +++ generateColumnNames(pParse, 0, p->pEList); +++ generateColumnTypes(pParse, p->pSrc, p->pEList); +++ } +++ iBreak = sqliteVdbeMakeLabel(v); +++ iCont = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, tab1, iBreak); +++ computeLimitRegisters(pParse, p); +++ iStart = sqliteVdbeAddOp(v, OP_FullKey, tab1, 0); +++ sqliteVdbeAddOp(v, OP_NotFound, tab2, iCont); +++ multiSelectSortOrder(p, p->pOrderBy); +++ rc = selectInnerLoop(pParse, p, p->pEList, tab1, p->pEList->nExpr, +++ p->pOrderBy, -1, eDest, iParm, +++ iCont, iBreak); +++ if( rc ) return 1; +++ sqliteVdbeResolveLabel(v, iCont); +++ sqliteVdbeAddOp(v, OP_Next, tab1, iStart); +++ sqliteVdbeResolveLabel(v, iBreak); +++ sqliteVdbeAddOp(v, OP_Close, tab2, 0); +++ sqliteVdbeAddOp(v, OP_Close, tab1, 0); +++ if( p->pOrderBy ){ +++ generateSortTail(p, v, p->pEList->nExpr, eDest, iParm); +++ } +++ break; +++ } +++ } +++ assert( p->pEList && pPrior->pEList ); +++ if( p->pEList->nExpr!=pPrior->pEList->nExpr ){ +++ sqliteErrorMsg(pParse, "SELECTs to the left and right of %s" +++ " do not have the same number of result columns", selectOpName(p->op)); +++ return 1; +++ } +++ return 0; +++} +++ +++/* +++** Scan through the expression pExpr. Replace every reference to +++** a column in table number iTable with a copy of the iColumn-th +++** entry in pEList. (But leave references to the ROWID column +++** unchanged.) +++** +++** This routine is part of the flattening procedure. A subquery +++** whose result set is defined by pEList appears as entry in the +++** FROM clause of a SELECT such that the VDBE cursor assigned to that +++** FORM clause entry is iTable. This routine make the necessary +++** changes to pExpr so that it refers directly to the source table +++** of the subquery rather the result set of the subquery. +++*/ +++static void substExprList(ExprList*,int,ExprList*); /* Forward Decl */ +++static void substExpr(Expr *pExpr, int iTable, ExprList *pEList){ +++ if( pExpr==0 ) return; +++ if( pExpr->op==TK_COLUMN && pExpr->iTable==iTable ){ +++ if( pExpr->iColumn<0 ){ +++ pExpr->op = TK_NULL; +++ }else{ +++ Expr *pNew; +++ assert( pEList!=0 && pExpr->iColumnnExpr ); +++ assert( pExpr->pLeft==0 && pExpr->pRight==0 && pExpr->pList==0 ); +++ pNew = pEList->a[pExpr->iColumn].pExpr; +++ assert( pNew!=0 ); +++ pExpr->op = pNew->op; +++ pExpr->dataType = pNew->dataType; +++ assert( pExpr->pLeft==0 ); +++ pExpr->pLeft = sqliteExprDup(pNew->pLeft); +++ assert( pExpr->pRight==0 ); +++ pExpr->pRight = sqliteExprDup(pNew->pRight); +++ assert( pExpr->pList==0 ); +++ pExpr->pList = sqliteExprListDup(pNew->pList); +++ pExpr->iTable = pNew->iTable; +++ pExpr->iColumn = pNew->iColumn; +++ pExpr->iAgg = pNew->iAgg; +++ sqliteTokenCopy(&pExpr->token, &pNew->token); +++ sqliteTokenCopy(&pExpr->span, &pNew->span); +++ } +++ }else{ +++ substExpr(pExpr->pLeft, iTable, pEList); +++ substExpr(pExpr->pRight, iTable, pEList); +++ substExprList(pExpr->pList, iTable, pEList); +++ } +++} +++static void +++substExprList(ExprList *pList, int iTable, ExprList *pEList){ +++ int i; +++ if( pList==0 ) return; +++ for(i=0; inExpr; i++){ +++ substExpr(pList->a[i].pExpr, iTable, pEList); +++ } +++} +++ +++/* +++** This routine attempts to flatten subqueries in order to speed +++** execution. It returns 1 if it makes changes and 0 if no flattening +++** occurs. +++** +++** To understand the concept of flattening, consider the following +++** query: +++** +++** SELECT a FROM (SELECT x+y AS a FROM t1 WHERE z<100) WHERE a>5 +++** +++** The default way of implementing this query is to execute the +++** subquery first and store the results in a temporary table, then +++** run the outer query on that temporary table. This requires two +++** passes over the data. Furthermore, because the temporary table +++** has no indices, the WHERE clause on the outer query cannot be +++** optimized. +++** +++** This routine attempts to rewrite queries such as the above into +++** a single flat select, like this: +++** +++** SELECT x+y AS a FROM t1 WHERE z<100 AND a>5 +++** +++** The code generated for this simpification gives the same result +++** but only has to scan the data once. And because indices might +++** exist on the table t1, a complete scan of the data might be +++** avoided. +++** +++** Flattening is only attempted if all of the following are true: +++** +++** (1) The subquery and the outer query do not both use aggregates. +++** +++** (2) The subquery is not an aggregate or the outer query is not a join. +++** +++** (3) The subquery is not the right operand of a left outer join, or +++** the subquery is not itself a join. (Ticket #306) +++** +++** (4) The subquery is not DISTINCT or the outer query is not a join. +++** +++** (5) The subquery is not DISTINCT or the outer query does not use +++** aggregates. +++** +++** (6) The subquery does not use aggregates or the outer query is not +++** DISTINCT. +++** +++** (7) The subquery has a FROM clause. +++** +++** (8) The subquery does not use LIMIT or the outer query is not a join. +++** +++** (9) The subquery does not use LIMIT or the outer query does not use +++** aggregates. +++** +++** (10) The subquery does not use aggregates or the outer query does not +++** use LIMIT. +++** +++** (11) The subquery and the outer query do not both have ORDER BY clauses. +++** +++** (12) The subquery is not the right term of a LEFT OUTER JOIN or the +++** subquery has no WHERE clause. (added by ticket #350) +++** +++** In this routine, the "p" parameter is a pointer to the outer query. +++** The subquery is p->pSrc->a[iFrom]. isAgg is true if the outer query +++** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates. +++** +++** If flattening is not attempted, this routine is a no-op and returns 0. +++** If flattening is attempted this routine returns 1. +++** +++** All of the expression analysis must occur on both the outer query and +++** the subquery before this routine runs. +++*/ +++static int flattenSubquery( +++ Parse *pParse, /* The parsing context */ +++ Select *p, /* The parent or outer SELECT statement */ +++ int iFrom, /* Index in p->pSrc->a[] of the inner subquery */ +++ int isAgg, /* True if outer SELECT uses aggregate functions */ +++ int subqueryIsAgg /* True if the subquery uses aggregate functions */ +++){ +++ Select *pSub; /* The inner query or "subquery" */ +++ SrcList *pSrc; /* The FROM clause of the outer query */ +++ SrcList *pSubSrc; /* The FROM clause of the subquery */ +++ ExprList *pList; /* The result set of the outer query */ +++ int iParent; /* VDBE cursor number of the pSub result set temp table */ +++ int i; +++ Expr *pWhere; +++ +++ /* Check to see if flattening is permitted. Return 0 if not. +++ */ +++ if( p==0 ) return 0; +++ pSrc = p->pSrc; +++ assert( pSrc && iFrom>=0 && iFromnSrc ); +++ pSub = pSrc->a[iFrom].pSelect; +++ assert( pSub!=0 ); +++ if( isAgg && subqueryIsAgg ) return 0; +++ if( subqueryIsAgg && pSrc->nSrc>1 ) return 0; +++ pSubSrc = pSub->pSrc; +++ assert( pSubSrc ); +++ if( pSubSrc->nSrc==0 ) return 0; +++ if( (pSub->isDistinct || pSub->nLimit>=0) && (pSrc->nSrc>1 || isAgg) ){ +++ return 0; +++ } +++ if( (p->isDistinct || p->nLimit>=0) && subqueryIsAgg ) return 0; +++ if( p->pOrderBy && pSub->pOrderBy ) return 0; +++ +++ /* Restriction 3: If the subquery is a join, make sure the subquery is +++ ** not used as the right operand of an outer join. Examples of why this +++ ** is not allowed: +++ ** +++ ** t1 LEFT OUTER JOIN (t2 JOIN t3) +++ ** +++ ** If we flatten the above, we would get +++ ** +++ ** (t1 LEFT OUTER JOIN t2) JOIN t3 +++ ** +++ ** which is not at all the same thing. +++ */ +++ if( pSubSrc->nSrc>1 && iFrom>0 && (pSrc->a[iFrom-1].jointype & JT_OUTER)!=0 ){ +++ return 0; +++ } +++ +++ /* Restriction 12: If the subquery is the right operand of a left outer +++ ** join, make sure the subquery has no WHERE clause. +++ ** An examples of why this is not allowed: +++ ** +++ ** t1 LEFT OUTER JOIN (SELECT * FROM t2 WHERE t2.x>0) +++ ** +++ ** If we flatten the above, we would get +++ ** +++ ** (t1 LEFT OUTER JOIN t2) WHERE t2.x>0 +++ ** +++ ** But the t2.x>0 test will always fail on a NULL row of t2, which +++ ** effectively converts the OUTER JOIN into an INNER JOIN. +++ */ +++ if( iFrom>0 && (pSrc->a[iFrom-1].jointype & JT_OUTER)!=0 +++ && pSub->pWhere!=0 ){ +++ return 0; +++ } +++ +++ /* If we reach this point, it means flattening is permitted for the +++ ** iFrom-th entry of the FROM clause in the outer query. +++ */ +++ +++ /* Move all of the FROM elements of the subquery into the +++ ** the FROM clause of the outer query. Before doing this, remember +++ ** the cursor number for the original outer query FROM element in +++ ** iParent. The iParent cursor will never be used. Subsequent code +++ ** will scan expressions looking for iParent references and replace +++ ** those references with expressions that resolve to the subquery FROM +++ ** elements we are now copying in. +++ */ +++ iParent = pSrc->a[iFrom].iCursor; +++ { +++ int nSubSrc = pSubSrc->nSrc; +++ int jointype = pSrc->a[iFrom].jointype; +++ +++ if( pSrc->a[iFrom].pTab && pSrc->a[iFrom].pTab->isTransient ){ +++ sqliteDeleteTable(0, pSrc->a[iFrom].pTab); +++ } +++ sqliteFree(pSrc->a[iFrom].zDatabase); +++ sqliteFree(pSrc->a[iFrom].zName); +++ sqliteFree(pSrc->a[iFrom].zAlias); +++ if( nSubSrc>1 ){ +++ int extra = nSubSrc - 1; +++ for(i=1; ipSrc = pSrc; +++ for(i=pSrc->nSrc-1; i-extra>=iFrom; i--){ +++ pSrc->a[i] = pSrc->a[i-extra]; +++ } +++ } +++ for(i=0; ia[i+iFrom] = pSubSrc->a[i]; +++ memset(&pSubSrc->a[i], 0, sizeof(pSubSrc->a[i])); +++ } +++ pSrc->a[iFrom+nSubSrc-1].jointype = jointype; +++ } +++ +++ /* Now begin substituting subquery result set expressions for +++ ** references to the iParent in the outer query. +++ ** +++ ** Example: +++ ** +++ ** SELECT a+5, b*10 FROM (SELECT x*3 AS a, y+10 AS b FROM t1) WHERE a>b; +++ ** \ \_____________ subquery __________/ / +++ ** \_____________________ outer query ______________________________/ +++ ** +++ ** We look at every expression in the outer query and every place we see +++ ** "a" we substitute "x*3" and every place we see "b" we substitute "y+10". +++ */ +++ substExprList(p->pEList, iParent, pSub->pEList); +++ pList = p->pEList; +++ for(i=0; inExpr; i++){ +++ Expr *pExpr; +++ if( pList->a[i].zName==0 && (pExpr = pList->a[i].pExpr)->span.z!=0 ){ +++ pList->a[i].zName = sqliteStrNDup(pExpr->span.z, pExpr->span.n); +++ } +++ } +++ if( isAgg ){ +++ substExprList(p->pGroupBy, iParent, pSub->pEList); +++ substExpr(p->pHaving, iParent, pSub->pEList); +++ } +++ if( pSub->pOrderBy ){ +++ assert( p->pOrderBy==0 ); +++ p->pOrderBy = pSub->pOrderBy; +++ pSub->pOrderBy = 0; +++ }else if( p->pOrderBy ){ +++ substExprList(p->pOrderBy, iParent, pSub->pEList); +++ } +++ if( pSub->pWhere ){ +++ pWhere = sqliteExprDup(pSub->pWhere); +++ }else{ +++ pWhere = 0; +++ } +++ if( subqueryIsAgg ){ +++ assert( p->pHaving==0 ); +++ p->pHaving = p->pWhere; +++ p->pWhere = pWhere; +++ substExpr(p->pHaving, iParent, pSub->pEList); +++ if( pSub->pHaving ){ +++ Expr *pHaving = sqliteExprDup(pSub->pHaving); +++ if( p->pHaving ){ +++ p->pHaving = sqliteExpr(TK_AND, p->pHaving, pHaving, 0); +++ }else{ +++ p->pHaving = pHaving; +++ } +++ } +++ assert( p->pGroupBy==0 ); +++ p->pGroupBy = sqliteExprListDup(pSub->pGroupBy); +++ }else if( p->pWhere==0 ){ +++ p->pWhere = pWhere; +++ }else{ +++ substExpr(p->pWhere, iParent, pSub->pEList); +++ if( pWhere ){ +++ p->pWhere = sqliteExpr(TK_AND, p->pWhere, pWhere, 0); +++ } +++ } +++ +++ /* The flattened query is distinct if either the inner or the +++ ** outer query is distinct. +++ */ +++ p->isDistinct = p->isDistinct || pSub->isDistinct; +++ +++ /* Transfer the limit expression from the subquery to the outer +++ ** query. +++ */ +++ if( pSub->nLimit>=0 ){ +++ if( p->nLimit<0 ){ +++ p->nLimit = pSub->nLimit; +++ }else if( p->nLimit+p->nOffset > pSub->nLimit+pSub->nOffset ){ +++ p->nLimit = pSub->nLimit + pSub->nOffset - p->nOffset; +++ } +++ } +++ p->nOffset += pSub->nOffset; +++ +++ /* Finially, delete what is left of the subquery and return +++ ** success. +++ */ +++ sqliteSelectDelete(pSub); +++ return 1; +++} +++ +++/* +++** Analyze the SELECT statement passed in as an argument to see if it +++** is a simple min() or max() query. If it is and this query can be +++** satisfied using a single seek to the beginning or end of an index, +++** then generate the code for this SELECT and return 1. If this is not a +++** simple min() or max() query, then return 0; +++** +++** A simply min() or max() query looks like this: +++** +++** SELECT min(a) FROM table; +++** SELECT max(a) FROM table; +++** +++** The query may have only a single table in its FROM argument. There +++** can be no GROUP BY or HAVING or WHERE clauses. The result set must +++** be the min() or max() of a single column of the table. The column +++** in the min() or max() function must be indexed. +++** +++** The parameters to this routine are the same as for sqliteSelect(). +++** See the header comment on that routine for additional information. +++*/ +++static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ +++ Expr *pExpr; +++ int iCol; +++ Table *pTab; +++ Index *pIdx; +++ int base; +++ Vdbe *v; +++ int seekOp; +++ int cont; +++ ExprList *pEList, *pList, eList; +++ struct ExprList_item eListItem; +++ SrcList *pSrc; +++ +++ +++ /* Check to see if this query is a simple min() or max() query. Return +++ ** zero if it is not. +++ */ +++ if( p->pGroupBy || p->pHaving || p->pWhere ) return 0; +++ pSrc = p->pSrc; +++ if( pSrc->nSrc!=1 ) return 0; +++ pEList = p->pEList; +++ if( pEList->nExpr!=1 ) return 0; +++ pExpr = pEList->a[0].pExpr; +++ if( pExpr->op!=TK_AGG_FUNCTION ) return 0; +++ pList = pExpr->pList; +++ if( pList==0 || pList->nExpr!=1 ) return 0; +++ if( pExpr->token.n!=3 ) return 0; +++ if( sqliteStrNICmp(pExpr->token.z,"min",3)==0 ){ +++ seekOp = OP_Rewind; +++ }else if( sqliteStrNICmp(pExpr->token.z,"max",3)==0 ){ +++ seekOp = OP_Last; +++ }else{ +++ return 0; +++ } +++ pExpr = pList->a[0].pExpr; +++ if( pExpr->op!=TK_COLUMN ) return 0; +++ iCol = pExpr->iColumn; +++ pTab = pSrc->a[0].pTab; +++ +++ /* If we get to here, it means the query is of the correct form. +++ ** Check to make sure we have an index and make pIdx point to the +++ ** appropriate index. If the min() or max() is on an INTEGER PRIMARY +++ ** key column, no index is necessary so set pIdx to NULL. If no +++ ** usable index is found, return 0. +++ */ +++ if( iCol<0 ){ +++ pIdx = 0; +++ }else{ +++ for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){ +++ assert( pIdx->nColumn>=1 ); +++ if( pIdx->aiColumn[0]==iCol ) break; +++ } +++ if( pIdx==0 ) return 0; +++ } +++ +++ /* Identify column types if we will be using the callback. This +++ ** step is skipped if the output is going to a table or a memory cell. +++ ** The column names have already been generated in the calling function. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return 0; +++ if( eDest==SRT_Callback ){ +++ generateColumnTypes(pParse, p->pSrc, p->pEList); +++ } +++ +++ /* If the output is destined for a temporary table, open that table. +++ */ +++ if( eDest==SRT_TempTable ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); +++ } +++ +++ /* Generating code to find the min or the max. Basically all we have +++ ** to do is find the first or the last entry in the chosen index. If +++ ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first +++ ** or last entry in the main table. +++ */ +++ sqliteCodeVerifySchema(pParse, pTab->iDb); +++ base = pSrc->a[0].iCursor; +++ computeLimitRegisters(pParse, p); +++ if( pSrc->a[0].pSelect==0 ){ +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, base, pTab->tnum, pTab->zName, 0); +++ } +++ cont = sqliteVdbeMakeLabel(v); +++ if( pIdx==0 ){ +++ sqliteVdbeAddOp(v, seekOp, base, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, base+1, pIdx->tnum, pIdx->zName, P3_STATIC); +++ if( seekOp==OP_Rewind ){ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_MakeKey, 1, 0); +++ sqliteVdbeAddOp(v, OP_IncrKey, 0, 0); +++ seekOp = OP_MoveTo; +++ } +++ sqliteVdbeAddOp(v, seekOp, base+1, 0); +++ sqliteVdbeAddOp(v, OP_IdxRecno, base+1, 0); +++ sqliteVdbeAddOp(v, OP_Close, base+1, 0); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ eList.nExpr = 1; +++ memset(&eListItem, 0, sizeof(eListItem)); +++ eList.a = &eListItem; +++ eList.a[0].pExpr = pExpr; +++ selectInnerLoop(pParse, p, &eList, 0, 0, 0, -1, eDest, iParm, cont, cont); +++ sqliteVdbeResolveLabel(v, cont); +++ sqliteVdbeAddOp(v, OP_Close, base, 0); +++ +++ return 1; +++} +++ +++/* +++** Generate code for the given SELECT statement. +++** +++** The results are distributed in various ways depending on the +++** value of eDest and iParm. +++** +++** eDest Value Result +++** ------------ ------------------------------------------- +++** SRT_Callback Invoke the callback for each row of the result. +++** +++** SRT_Mem Store first result in memory cell iParm +++** +++** SRT_Set Store results as keys of a table with cursor iParm +++** +++** SRT_Union Store results as a key in a temporary table iParm +++** +++** SRT_Except Remove results from the temporary table iParm. +++** +++** SRT_Table Store results in temporary table iParm +++** +++** The table above is incomplete. Additional eDist value have be added +++** since this comment was written. See the selectInnerLoop() function for +++** a complete listing of the allowed values of eDest and their meanings. +++** +++** This routine returns the number of errors. If any errors are +++** encountered, then an appropriate error message is left in +++** pParse->zErrMsg. +++** +++** This routine does NOT free the Select structure passed in. The +++** calling function needs to do that. +++** +++** The pParent, parentTab, and *pParentAgg fields are filled in if this +++** SELECT is a subquery. This routine may try to combine this SELECT +++** with its parent to form a single flat query. In so doing, it might +++** change the parent query from a non-aggregate to an aggregate query. +++** For that reason, the pParentAgg flag is passed as a pointer, so it +++** can be changed. +++** +++** Example 1: The meaning of the pParent parameter. +++** +++** SELECT * FROM t1 JOIN (SELECT x, count(*) FROM t2) JOIN t3; +++** \ \_______ subquery _______/ / +++** \ / +++** \____________________ outer query ___________________/ +++** +++** This routine is called for the outer query first. For that call, +++** pParent will be NULL. During the processing of the outer query, this +++** routine is called recursively to handle the subquery. For the recursive +++** call, pParent will point to the outer query. Because the subquery is +++** the second element in a three-way join, the parentTab parameter will +++** be 1 (the 2nd value of a 0-indexed array.) +++*/ +++int sqliteSelect( +++ Parse *pParse, /* The parser context */ +++ Select *p, /* The SELECT statement being coded. */ +++ int eDest, /* How to dispose of the results */ +++ int iParm, /* A parameter used by the eDest disposal method */ +++ Select *pParent, /* Another SELECT for which this is a sub-query */ +++ int parentTab, /* Index in pParent->pSrc of this query */ +++ int *pParentAgg /* True if pParent uses aggregate functions */ +++){ +++ int i; +++ WhereInfo *pWInfo; +++ Vdbe *v; +++ int isAgg = 0; /* True for select lists like "count(*)" */ +++ ExprList *pEList; /* List of columns to extract. */ +++ SrcList *pTabList; /* List of tables to select from */ +++ Expr *pWhere; /* The WHERE clause. May be NULL */ +++ ExprList *pOrderBy; /* The ORDER BY clause. May be NULL */ +++ ExprList *pGroupBy; /* The GROUP BY clause. May be NULL */ +++ Expr *pHaving; /* The HAVING clause. May be NULL */ +++ int isDistinct; /* True if the DISTINCT keyword is present */ +++ int distinct; /* Table to use for the distinct set */ +++ int rc = 1; /* Value to return from this function */ +++ +++ if( sqlite_malloc_failed || pParse->nErr || p==0 ) return 1; +++ if( sqliteAuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1; +++ +++ /* If there is are a sequence of queries, do the earlier ones first. +++ */ +++ if( p->pPrior ){ +++ return multiSelect(pParse, p, eDest, iParm); +++ } +++ +++ /* Make local copies of the parameters for this query. +++ */ +++ pTabList = p->pSrc; +++ pWhere = p->pWhere; +++ pOrderBy = p->pOrderBy; +++ pGroupBy = p->pGroupBy; +++ pHaving = p->pHaving; +++ isDistinct = p->isDistinct; +++ +++ /* Allocate VDBE cursors for each table in the FROM clause +++ */ +++ sqliteSrcListAssignCursors(pParse, pTabList); +++ +++ /* +++ ** Do not even attempt to generate any code if we have already seen +++ ** errors before this routine starts. +++ */ +++ if( pParse->nErr>0 ) goto select_end; +++ +++ /* Expand any "*" terms in the result set. (For example the "*" in +++ ** "SELECT * FROM t1") The fillInColumnlist() routine also does some +++ ** other housekeeping - see the header comment for details. +++ */ +++ if( fillInColumnList(pParse, p) ){ +++ goto select_end; +++ } +++ pWhere = p->pWhere; +++ pEList = p->pEList; +++ if( pEList==0 ) goto select_end; +++ +++ /* If writing to memory or generating a set +++ ** only a single column may be output. +++ */ +++ if( (eDest==SRT_Mem || eDest==SRT_Set) && pEList->nExpr>1 ){ +++ sqliteErrorMsg(pParse, "only a single result allowed for " +++ "a SELECT that is part of an expression"); +++ goto select_end; +++ } +++ +++ /* ORDER BY is ignored for some destinations. +++ */ +++ switch( eDest ){ +++ case SRT_Union: +++ case SRT_Except: +++ case SRT_Discard: +++ pOrderBy = 0; +++ break; +++ default: +++ break; +++ } +++ +++ /* At this point, we should have allocated all the cursors that we +++ ** need to handle subquerys and temporary tables. +++ ** +++ ** Resolve the column names and do a semantics check on all the expressions. +++ */ +++ for(i=0; inExpr; i++){ +++ if( sqliteExprResolveIds(pParse, pTabList, 0, pEList->a[i].pExpr) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pEList->a[i].pExpr, 1, &isAgg) ){ +++ goto select_end; +++ } +++ } +++ if( pWhere ){ +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pWhere) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ +++ goto select_end; +++ } +++ } +++ if( pHaving ){ +++ if( pGroupBy==0 ){ +++ sqliteErrorMsg(pParse, "a GROUP BY clause is required before HAVING"); +++ goto select_end; +++ } +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pHaving) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pHaving, 1, &isAgg) ){ +++ goto select_end; +++ } +++ } +++ if( pOrderBy ){ +++ for(i=0; inExpr; i++){ +++ int iCol; +++ Expr *pE = pOrderBy->a[i].pExpr; +++ if( sqliteExprIsInteger(pE, &iCol) && iCol>0 && iCol<=pEList->nExpr ){ +++ sqliteExprDelete(pE); +++ pE = pOrderBy->a[i].pExpr = sqliteExprDup(pEList->a[iCol-1].pExpr); +++ } +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pE) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pE, isAgg, 0) ){ +++ goto select_end; +++ } +++ if( sqliteExprIsConstant(pE) ){ +++ if( sqliteExprIsInteger(pE, &iCol)==0 ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY terms must not be non-integer constants"); +++ goto select_end; +++ }else if( iCol<=0 || iCol>pEList->nExpr ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY column number %d out of range - should be " +++ "between 1 and %d", iCol, pEList->nExpr); +++ goto select_end; +++ } +++ } +++ } +++ } +++ if( pGroupBy ){ +++ for(i=0; inExpr; i++){ +++ int iCol; +++ Expr *pE = pGroupBy->a[i].pExpr; +++ if( sqliteExprIsInteger(pE, &iCol) && iCol>0 && iCol<=pEList->nExpr ){ +++ sqliteExprDelete(pE); +++ pE = pGroupBy->a[i].pExpr = sqliteExprDup(pEList->a[iCol-1].pExpr); +++ } +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pE) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pE, isAgg, 0) ){ +++ goto select_end; +++ } +++ if( sqliteExprIsConstant(pE) ){ +++ if( sqliteExprIsInteger(pE, &iCol)==0 ){ +++ sqliteErrorMsg(pParse, +++ "GROUP BY terms must not be non-integer constants"); +++ goto select_end; +++ }else if( iCol<=0 || iCol>pEList->nExpr ){ +++ sqliteErrorMsg(pParse, +++ "GROUP BY column number %d out of range - should be " +++ "between 1 and %d", iCol, pEList->nExpr); +++ goto select_end; +++ } +++ } +++ } +++ } +++ +++ /* Begin generating code. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) goto select_end; +++ +++ /* Identify column names if we will be using them in a callback. This +++ ** step is skipped if the output is going to some other destination. +++ */ +++ if( eDest==SRT_Callback ){ +++ generateColumnNames(pParse, pTabList, pEList); +++ } +++ +++ /* Generate code for all sub-queries in the FROM clause +++ */ +++ for(i=0; inSrc; i++){ +++ const char *zSavedAuthContext; +++ int needRestoreContext; +++ +++ if( pTabList->a[i].pSelect==0 ) continue; +++ if( pTabList->a[i].zName!=0 ){ +++ zSavedAuthContext = pParse->zAuthContext; +++ pParse->zAuthContext = pTabList->a[i].zName; +++ needRestoreContext = 1; +++ }else{ +++ needRestoreContext = 0; +++ } +++ sqliteSelect(pParse, pTabList->a[i].pSelect, SRT_TempTable, +++ pTabList->a[i].iCursor, p, i, &isAgg); +++ if( needRestoreContext ){ +++ pParse->zAuthContext = zSavedAuthContext; +++ } +++ pTabList = p->pSrc; +++ pWhere = p->pWhere; +++ if( eDest!=SRT_Union && eDest!=SRT_Except && eDest!=SRT_Discard ){ +++ pOrderBy = p->pOrderBy; +++ } +++ pGroupBy = p->pGroupBy; +++ pHaving = p->pHaving; +++ isDistinct = p->isDistinct; +++ } +++ +++ /* Check for the special case of a min() or max() function by itself +++ ** in the result set. +++ */ +++ if( simpleMinMaxQuery(pParse, p, eDest, iParm) ){ +++ rc = 0; +++ goto select_end; +++ } +++ +++ /* Check to see if this is a subquery that can be "flattened" into its parent. +++ ** If flattening is a possiblity, do so and return immediately. +++ */ +++ if( pParent && pParentAgg && +++ flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){ +++ if( isAgg ) *pParentAgg = 1; +++ return rc; +++ } +++ +++ /* Set the limiter. +++ */ +++ computeLimitRegisters(pParse, p); +++ +++ /* Identify column types if we will be using a callback. This +++ ** step is skipped if the output is going to a destination other +++ ** than a callback. +++ ** +++ ** We have to do this separately from the creation of column names +++ ** above because if the pTabList contains views then they will not +++ ** have been resolved and we will not know the column types until +++ ** now. +++ */ +++ if( eDest==SRT_Callback ){ +++ generateColumnTypes(pParse, pTabList, pEList); +++ } +++ +++ /* If the output is destined for a temporary table, open that table. +++ */ +++ if( eDest==SRT_TempTable ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); +++ } +++ +++ /* Do an analysis of aggregate expressions. +++ */ +++ sqliteAggregateInfoReset(pParse); +++ if( isAgg || pGroupBy ){ +++ assert( pParse->nAgg==0 ); +++ isAgg = 1; +++ for(i=0; inExpr; i++){ +++ if( sqliteExprAnalyzeAggregates(pParse, pEList->a[i].pExpr) ){ +++ goto select_end; +++ } +++ } +++ if( pGroupBy ){ +++ for(i=0; inExpr; i++){ +++ if( sqliteExprAnalyzeAggregates(pParse, pGroupBy->a[i].pExpr) ){ +++ goto select_end; +++ } +++ } +++ } +++ if( pHaving && sqliteExprAnalyzeAggregates(pParse, pHaving) ){ +++ goto select_end; +++ } +++ if( pOrderBy ){ +++ for(i=0; inExpr; i++){ +++ if( sqliteExprAnalyzeAggregates(pParse, pOrderBy->a[i].pExpr) ){ +++ goto select_end; +++ } +++ } +++ } +++ } +++ +++ /* Reset the aggregator +++ */ +++ if( isAgg ){ +++ sqliteVdbeAddOp(v, OP_AggReset, 0, pParse->nAgg); +++ for(i=0; inAgg; i++){ +++ FuncDef *pFunc; +++ if( (pFunc = pParse->aAgg[i].pFunc)!=0 && pFunc->xFinalize!=0 ){ +++ sqliteVdbeOp3(v, OP_AggInit, 0, i, (char*)pFunc, P3_POINTER); +++ } +++ } +++ if( pGroupBy==0 ){ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_AggFocus, 0, 0); +++ } +++ } +++ +++ /* Initialize the memory cell to NULL +++ */ +++ if( eDest==SRT_Mem ){ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iParm, 1); +++ } +++ +++ /* Open a temporary table to use for the distinct set. +++ */ +++ if( isDistinct ){ +++ distinct = pParse->nTab++; +++ sqliteVdbeAddOp(v, OP_OpenTemp, distinct, 1); +++ }else{ +++ distinct = -1; +++ } +++ +++ /* Begin the database scan +++ */ +++ pWInfo = sqliteWhereBegin(pParse, pTabList, pWhere, 0, +++ pGroupBy ? 0 : &pOrderBy); +++ if( pWInfo==0 ) goto select_end; +++ +++ /* Use the standard inner loop if we are not dealing with +++ ** aggregates +++ */ +++ if( !isAgg ){ +++ if( selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, eDest, +++ iParm, pWInfo->iContinue, pWInfo->iBreak) ){ +++ goto select_end; +++ } +++ } +++ +++ /* If we are dealing with aggregates, then do the special aggregate +++ ** processing. +++ */ +++ else{ +++ AggExpr *pAgg; +++ if( pGroupBy ){ +++ int lbl1; +++ for(i=0; inExpr; i++){ +++ sqliteExprCode(pParse, pGroupBy->a[i].pExpr); +++ } +++ sqliteVdbeAddOp(v, OP_MakeKey, pGroupBy->nExpr, 0); +++ if( pParse->db->file_format>=4 ) sqliteAddKeyType(v, pGroupBy); +++ lbl1 = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_AggFocus, 0, lbl1); +++ for(i=0, pAgg=pParse->aAgg; inAgg; i++, pAgg++){ +++ if( pAgg->isAgg ) continue; +++ sqliteExprCode(pParse, pAgg->pExpr); +++ sqliteVdbeAddOp(v, OP_AggSet, 0, i); +++ } +++ sqliteVdbeResolveLabel(v, lbl1); +++ } +++ for(i=0, pAgg=pParse->aAgg; inAgg; i++, pAgg++){ +++ Expr *pE; +++ int nExpr; +++ FuncDef *pDef; +++ if( !pAgg->isAgg ) continue; +++ assert( pAgg->pFunc!=0 ); +++ assert( pAgg->pFunc->xStep!=0 ); +++ pDef = pAgg->pFunc; +++ pE = pAgg->pExpr; +++ assert( pE!=0 ); +++ assert( pE->op==TK_AGG_FUNCTION ); +++ nExpr = sqliteExprCodeExprList(pParse, pE->pList, pDef->includeTypes); +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_AggFunc, 0, nExpr, (char*)pDef, P3_POINTER); +++ } +++ } +++ +++ /* End the database scan loop. +++ */ +++ sqliteWhereEnd(pWInfo); +++ +++ /* If we are processing aggregates, we need to set up a second loop +++ ** over all of the aggregate values and process them. +++ */ +++ if( isAgg ){ +++ int endagg = sqliteVdbeMakeLabel(v); +++ int startagg; +++ startagg = sqliteVdbeAddOp(v, OP_AggNext, 0, endagg); +++ pParse->useAgg = 1; +++ if( pHaving ){ +++ sqliteExprIfFalse(pParse, pHaving, startagg, 1); +++ } +++ if( selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, eDest, +++ iParm, startagg, endagg) ){ +++ goto select_end; +++ } +++ sqliteVdbeAddOp(v, OP_Goto, 0, startagg); +++ sqliteVdbeResolveLabel(v, endagg); +++ sqliteVdbeAddOp(v, OP_Noop, 0, 0); +++ pParse->useAgg = 0; +++ } +++ +++ /* If there is an ORDER BY clause, then we need to sort the results +++ ** and send them to the callback one by one. +++ */ +++ if( pOrderBy ){ +++ generateSortTail(p, v, pEList->nExpr, eDest, iParm); +++ } +++ +++ /* If this was a subquery, we have now converted the subquery into a +++ ** temporary table. So delete the subquery structure from the parent +++ ** to prevent this subquery from being evaluated again and to force the +++ ** the use of the temporary table. +++ */ +++ if( pParent ){ +++ assert( pParent->pSrc->nSrc>parentTab ); +++ assert( pParent->pSrc->a[parentTab].pSelect==p ); +++ sqliteSelectDelete(p); +++ pParent->pSrc->a[parentTab].pSelect = 0; +++ } +++ +++ /* The SELECT was successfully coded. Set the return code to 0 +++ ** to indicate no errors. +++ */ +++ rc = 0; +++ +++ /* Control jumps to here if an error is encountered above, or upon +++ ** successful coding of the SELECT. +++ */ +++select_end: +++ sqliteAggregateInfoReset(pParse); +++ return rc; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/sqlite_config.w32.h ++@@ -0,0 +1,8 @@ +++#include "config.w32.h" +++#if ZTS +++# define THREADSAFE 1 +++#endif +++#if !ZEND_DEBUG && !defined(NDEBUG) +++# define NDEBUG +++#endif +++#define SQLITE_PTR_SZ 4 ++\ No newline at end of file ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/sqlite.h.in ++@@ -0,0 +1,886 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This header file defines the interface that the SQLite library +++** presents to client programs. +++** +++** @(#) $Id$ +++*/ +++#ifndef _SQLITE_H_ +++#define _SQLITE_H_ +++#include /* Needed for the definition of va_list */ +++ +++/* +++** Make sure we can call this stuff from C++. +++*/ +++#ifdef __cplusplus +++extern "C" { +++#endif +++ +++/* +++** The version of the SQLite library. +++*/ +++#ifdef SQLITE_VERSION +++# undef SQLITE_VERSION +++#else +++# define SQLITE_VERSION "--VERS--" +++#endif +++ +++/* +++** The version string is also compiled into the library so that a program +++** can check to make sure that the lib*.a file and the *.h file are from +++** the same version. +++*/ +++extern const char sqlite_version[]; +++ +++/* +++** The SQLITE_UTF8 macro is defined if the library expects to see +++** UTF-8 encoded data. The SQLITE_ISO8859 macro is defined if the +++** iso8859 encoded should be used. +++*/ +++#define SQLITE_--ENCODING-- 1 +++ +++/* +++** The following constant holds one of two strings, "UTF-8" or "iso8859", +++** depending on which character encoding the SQLite library expects to +++** see. The character encoding makes a difference for the LIKE and GLOB +++** operators and for the LENGTH() and SUBSTR() functions. +++*/ +++extern const char sqlite_encoding[]; +++ +++/* +++** Each open sqlite database is represented by an instance of the +++** following opaque structure. +++*/ +++typedef struct sqlite sqlite; +++ +++/* +++** A function to open a new sqlite database. +++** +++** If the database does not exist and mode indicates write +++** permission, then a new database is created. If the database +++** does not exist and mode does not indicate write permission, +++** then the open fails, an error message generated (if errmsg!=0) +++** and the function returns 0. +++** +++** If mode does not indicates user write permission, then the +++** database is opened read-only. +++** +++** The Truth: As currently implemented, all databases are opened +++** for writing all the time. Maybe someday we will provide the +++** ability to open a database readonly. The mode parameters is +++** provided in anticipation of that enhancement. +++*/ +++sqlite *sqlite_open(const char *filename, int mode, char **errmsg); +++ +++/* +++** A function to close the database. +++** +++** Call this function with a pointer to a structure that was previously +++** returned from sqlite_open() and the corresponding database will by closed. +++*/ +++void sqlite_close(sqlite *); +++ +++/* +++** The type for a callback function. +++*/ +++typedef int (*sqlite_callback)(void*,int,char**, char**); +++ +++/* +++** A function to executes one or more statements of SQL. +++** +++** If one or more of the SQL statements are queries, then +++** the callback function specified by the 3rd parameter is +++** invoked once for each row of the query result. This callback +++** should normally return 0. If the callback returns a non-zero +++** value then the query is aborted, all subsequent SQL statements +++** are skipped and the sqlite_exec() function returns the SQLITE_ABORT. +++** +++** The 4th parameter is an arbitrary pointer that is passed +++** to the callback function as its first parameter. +++** +++** The 2nd parameter to the callback function is the number of +++** columns in the query result. The 3rd parameter to the callback +++** is an array of strings holding the values for each column. +++** The 4th parameter to the callback is an array of strings holding +++** the names of each column. +++** +++** The callback function may be NULL, even for queries. A NULL +++** callback is not an error. It just means that no callback +++** will be invoked. +++** +++** If an error occurs while parsing or evaluating the SQL (but +++** not while executing the callback) then an appropriate error +++** message is written into memory obtained from malloc() and +++** *errmsg is made to point to that message. The calling function +++** is responsible for freeing the memory that holds the error +++** message. Use sqlite_freemem() for this. If errmsg==NULL, +++** then no error message is ever written. +++** +++** The return value is is SQLITE_OK if there are no errors and +++** some other return code if there is an error. The particular +++** return value depends on the type of error. +++** +++** If the query could not be executed because a database file is +++** locked or busy, then this function returns SQLITE_BUSY. (This +++** behavior can be modified somewhat using the sqlite_busy_handler() +++** and sqlite_busy_timeout() functions below.) +++*/ +++int sqlite_exec( +++ sqlite*, /* An open database */ +++ const char *sql, /* SQL to be executed */ +++ sqlite_callback, /* Callback function */ +++ void *, /* 1st argument to callback function */ +++ char **errmsg /* Error msg written here */ +++); +++ +++/* +++** Return values for sqlite_exec() and sqlite_step() +++*/ +++#define SQLITE_OK 0 /* Successful result */ +++#define SQLITE_ERROR 1 /* SQL error or missing database */ +++#define SQLITE_INTERNAL 2 /* An internal logic error in SQLite */ +++#define SQLITE_PERM 3 /* Access permission denied */ +++#define SQLITE_ABORT 4 /* Callback routine requested an abort */ +++#define SQLITE_BUSY 5 /* The database file is locked */ +++#define SQLITE_LOCKED 6 /* A table in the database is locked */ +++#define SQLITE_NOMEM 7 /* A malloc() failed */ +++#define SQLITE_READONLY 8 /* Attempt to write a readonly database */ +++#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite_interrupt() */ +++#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ +++#define SQLITE_CORRUPT 11 /* The database disk image is malformed */ +++#define SQLITE_NOTFOUND 12 /* (Internal Only) Table or record not found */ +++#define SQLITE_FULL 13 /* Insertion failed because database is full */ +++#define SQLITE_CANTOPEN 14 /* Unable to open the database file */ +++#define SQLITE_PROTOCOL 15 /* Database lock protocol error */ +++#define SQLITE_EMPTY 16 /* (Internal Only) Database table is empty */ +++#define SQLITE_SCHEMA 17 /* The database schema changed */ +++#define SQLITE_TOOBIG 18 /* Too much data for one row of a table */ +++#define SQLITE_CONSTRAINT 19 /* Abort due to contraint violation */ +++#define SQLITE_MISMATCH 20 /* Data type mismatch */ +++#define SQLITE_MISUSE 21 /* Library used incorrectly */ +++#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ +++#define SQLITE_AUTH 23 /* Authorization denied */ +++#define SQLITE_FORMAT 24 /* Auxiliary database format error */ +++#define SQLITE_RANGE 25 /* 2nd parameter to sqlite_bind out of range */ +++#define SQLITE_NOTADB 26 /* File opened that is not a database file */ +++#define SQLITE_ROW 100 /* sqlite_step() has another row ready */ +++#define SQLITE_DONE 101 /* sqlite_step() has finished executing */ +++ +++/* +++** Each entry in an SQLite table has a unique integer key. (The key is +++** the value of the INTEGER PRIMARY KEY column if there is such a column, +++** otherwise the key is generated at random. The unique key is always +++** available as the ROWID, OID, or _ROWID_ column.) The following routine +++** returns the integer key of the most recent insert in the database. +++** +++** This function is similar to the mysql_insert_id() function from MySQL. +++*/ +++int sqlite_last_insert_rowid(sqlite*); +++ +++/* +++** This function returns the number of database rows that were changed +++** (or inserted or deleted) by the most recent called sqlite_exec(). +++** +++** All changes are counted, even if they were later undone by a +++** ROLLBACK or ABORT. Except, changes associated with creating and +++** dropping tables are not counted. +++** +++** If a callback invokes sqlite_exec() recursively, then the changes +++** in the inner, recursive call are counted together with the changes +++** in the outer call. +++** +++** SQLite implements the command "DELETE FROM table" without a WHERE clause +++** by dropping and recreating the table. (This is much faster than going +++** through and deleting individual elements form the table.) Because of +++** this optimization, the change count for "DELETE FROM table" will be +++** zero regardless of the number of elements that were originally in the +++** table. To get an accurate count of the number of rows deleted, use +++** "DELETE FROM table WHERE 1" instead. +++*/ +++int sqlite_changes(sqlite*); +++ +++/* +++** This function returns the number of database rows that were changed +++** by the last INSERT, UPDATE, or DELETE statment executed by sqlite_exec(), +++** or by the last VM to run to completion. The change count is not updated +++** by SQL statements other than INSERT, UPDATE or DELETE. +++** +++** Changes are counted, even if they are later undone by a ROLLBACK or +++** ABORT. Changes associated with trigger programs that execute as a +++** result of the INSERT, UPDATE, or DELETE statement are not counted. +++** +++** If a callback invokes sqlite_exec() recursively, then the changes +++** in the inner, recursive call are counted together with the changes +++** in the outer call. +++** +++** SQLite implements the command "DELETE FROM table" without a WHERE clause +++** by dropping and recreating the table. (This is much faster than going +++** through and deleting individual elements form the table.) Because of +++** this optimization, the change count for "DELETE FROM table" will be +++** zero regardless of the number of elements that were originally in the +++** table. To get an accurate count of the number of rows deleted, use +++** "DELETE FROM table WHERE 1" instead. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++int sqlite_last_statement_changes(sqlite*); +++ +++/* If the parameter to this routine is one of the return value constants +++** defined above, then this routine returns a constant text string which +++** descripts (in English) the meaning of the return value. +++*/ +++const char *sqlite_error_string(int); +++#define sqliteErrStr sqlite_error_string /* Legacy. Do not use in new code. */ +++ +++/* This function causes any pending database operation to abort and +++** return at its earliest opportunity. This routine is typically +++** called in response to a user action such as pressing "Cancel" +++** or Ctrl-C where the user wants a long query operation to halt +++** immediately. +++*/ +++void sqlite_interrupt(sqlite*); +++ +++ +++/* This function returns true if the given input string comprises +++** one or more complete SQL statements. +++** +++** The algorithm is simple. If the last token other than spaces +++** and comments is a semicolon, then return true. otherwise return +++** false. +++*/ +++int sqlite_complete(const char *sql); +++ +++/* +++** This routine identifies a callback function that is invoked +++** whenever an attempt is made to open a database table that is +++** currently locked by another process or thread. If the busy callback +++** is NULL, then sqlite_exec() returns SQLITE_BUSY immediately if +++** it finds a locked table. If the busy callback is not NULL, then +++** sqlite_exec() invokes the callback with three arguments. The +++** second argument is the name of the locked table and the third +++** argument is the number of times the table has been busy. If the +++** busy callback returns 0, then sqlite_exec() immediately returns +++** SQLITE_BUSY. If the callback returns non-zero, then sqlite_exec() +++** tries to open the table again and the cycle repeats. +++** +++** The default busy callback is NULL. +++** +++** Sqlite is re-entrant, so the busy handler may start a new query. +++** (It is not clear why anyone would every want to do this, but it +++** is allowed, in theory.) But the busy handler may not close the +++** database. Closing the database from a busy handler will delete +++** data structures out from under the executing query and will +++** probably result in a coredump. +++*/ +++void sqlite_busy_handler(sqlite*, int(*)(void*,const char*,int), void*); +++ +++/* +++** This routine sets a busy handler that sleeps for a while when a +++** table is locked. The handler will sleep multiple times until +++** at least "ms" milleseconds of sleeping have been done. After +++** "ms" milleseconds of sleeping, the handler returns 0 which +++** causes sqlite_exec() to return SQLITE_BUSY. +++** +++** Calling this routine with an argument less than or equal to zero +++** turns off all busy handlers. +++*/ +++void sqlite_busy_timeout(sqlite*, int ms); +++ +++/* +++** This next routine is really just a wrapper around sqlite_exec(). +++** Instead of invoking a user-supplied callback for each row of the +++** result, this routine remembers each row of the result in memory +++** obtained from malloc(), then returns all of the result after the +++** query has finished. +++** +++** As an example, suppose the query result where this table: +++** +++** Name | Age +++** ----------------------- +++** Alice | 43 +++** Bob | 28 +++** Cindy | 21 +++** +++** If the 3rd argument were &azResult then after the function returns +++** azResult will contain the following data: +++** +++** azResult[0] = "Name"; +++** azResult[1] = "Age"; +++** azResult[2] = "Alice"; +++** azResult[3] = "43"; +++** azResult[4] = "Bob"; +++** azResult[5] = "28"; +++** azResult[6] = "Cindy"; +++** azResult[7] = "21"; +++** +++** Notice that there is an extra row of data containing the column +++** headers. But the *nrow return value is still 3. *ncolumn is +++** set to 2. In general, the number of values inserted into azResult +++** will be ((*nrow) + 1)*(*ncolumn). +++** +++** After the calling function has finished using the result, it should +++** pass the result data pointer to sqlite_free_table() in order to +++** release the memory that was malloc-ed. Because of the way the +++** malloc() happens, the calling function must not try to call +++** malloc() directly. Only sqlite_free_table() is able to release +++** the memory properly and safely. +++** +++** The return value of this routine is the same as from sqlite_exec(). +++*/ +++int sqlite_get_table( +++ sqlite*, /* An open database */ +++ const char *sql, /* SQL to be executed */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg /* Error msg written here */ +++); +++ +++/* +++** Call this routine to free the memory that sqlite_get_table() allocated. +++*/ +++void sqlite_free_table(char **result); +++ +++/* +++** The following routines are wrappers around sqlite_exec() and +++** sqlite_get_table(). The only difference between the routines that +++** follow and the originals is that the second argument to the +++** routines that follow is really a printf()-style format +++** string describing the SQL to be executed. Arguments to the format +++** string appear at the end of the argument list. +++** +++** All of the usual printf formatting options apply. In addition, there +++** is a "%q" option. %q works like %s in that it substitutes a null-terminated +++** string from the argument list. But %q also doubles every '\'' character. +++** %q is designed for use inside a string literal. By doubling each '\'' +++** character it escapes that character and allows it to be inserted into +++** the string. +++** +++** For example, so some string variable contains text as follows: +++** +++** char *zText = "It's a happy day!"; +++** +++** We can use this text in an SQL statement as follows: +++** +++** sqlite_exec_printf(db, "INSERT INTO table VALUES('%q')", +++** callback1, 0, 0, zText); +++** +++** Because the %q format string is used, the '\'' character in zText +++** is escaped and the SQL generated is as follows: +++** +++** INSERT INTO table1 VALUES('It''s a happy day!') +++** +++** This is correct. Had we used %s instead of %q, the generated SQL +++** would have looked like this: +++** +++** INSERT INTO table1 VALUES('It's a happy day!'); +++** +++** This second example is an SQL syntax error. As a general rule you +++** should always use %q instead of %s when inserting text into a string +++** literal. +++*/ +++int sqlite_exec_printf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback, /* Callback function */ +++ void *, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string. */ +++); +++int sqlite_exec_vprintf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback, /* Callback function */ +++ void *, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string. */ +++); +++int sqlite_get_table_printf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string */ +++); +++int sqlite_get_table_vprintf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string */ +++); +++char *sqlite_mprintf(const char*,...); +++char *sqlite_vmprintf(const char*, va_list); +++ +++/* +++** Windows systems should call this routine to free memory that +++** is returned in the in the errmsg parameter of sqlite_open() when +++** SQLite is a DLL. For some reason, it does not work to call free() +++** directly. +++*/ +++void sqlite_freemem(void *p); +++ +++/* +++** Windows systems need functions to call to return the sqlite_version +++** and sqlite_encoding strings. +++*/ +++const char *sqlite_libversion(void); +++const char *sqlite_libencoding(void); +++ +++/* +++** A pointer to the following structure is used to communicate with +++** the implementations of user-defined functions. +++*/ +++typedef struct sqlite_func sqlite_func; +++ +++/* +++** Use the following routines to create new user-defined functions. See +++** the documentation for details. +++*/ +++int sqlite_create_function( +++ sqlite*, /* Database where the new function is registered */ +++ const char *zName, /* Name of the new function */ +++ int nArg, /* Number of arguments. -1 means any number */ +++ void (*xFunc)(sqlite_func*,int,const char**), /* C code to implement */ +++ void *pUserData /* Available via the sqlite_user_data() call */ +++); +++int sqlite_create_aggregate( +++ sqlite*, /* Database where the new function is registered */ +++ const char *zName, /* Name of the function */ +++ int nArg, /* Number of arguments */ +++ void (*xStep)(sqlite_func*,int,const char**), /* Called for each row */ +++ void (*xFinalize)(sqlite_func*), /* Called once to get final result */ +++ void *pUserData /* Available via the sqlite_user_data() call */ +++); +++ +++/* +++** Use the following routine to define the datatype returned by a +++** user-defined function. The second argument can be one of the +++** constants SQLITE_NUMERIC, SQLITE_TEXT, or SQLITE_ARGS or it +++** can be an integer greater than or equal to zero. When the datatype +++** parameter is non-negative, the type of the result will be the +++** same as the datatype-th argument. If datatype==SQLITE_NUMERIC +++** then the result is always numeric. If datatype==SQLITE_TEXT then +++** the result is always text. If datatype==SQLITE_ARGS then the result +++** is numeric if any argument is numeric and is text otherwise. +++*/ +++int sqlite_function_type( +++ sqlite *db, /* The database there the function is registered */ +++ const char *zName, /* Name of the function */ +++ int datatype /* The datatype for this function */ +++); +++#define SQLITE_NUMERIC (-1) +++/* #define SQLITE_TEXT (-2) // See below */ +++#define SQLITE_ARGS (-3) +++ +++/* +++** SQLite version 3 defines SQLITE_TEXT differently. To allow both +++** version 2 and version 3 to be included, undefine them both if a +++** conflict is seen. Define SQLITE2_TEXT to be the version 2 value. +++*/ +++#ifdef SQLITE_TEXT +++# undef SQLITE_TEXT +++#else +++# define SQLITE_TEXT (-2) +++#endif +++#define SQLITE2_TEXT (-2) +++ +++ +++ +++/* +++** The user function implementations call one of the following four routines +++** in order to return their results. The first parameter to each of these +++** routines is a copy of the first argument to xFunc() or xFinialize(). +++** The second parameter to these routines is the result to be returned. +++** A NULL can be passed as the second parameter to sqlite_set_result_string() +++** in order to return a NULL result. +++** +++** The 3rd argument to _string and _error is the number of characters to +++** take from the string. If this argument is negative, then all characters +++** up to and including the first '\000' are used. +++** +++** The sqlite_set_result_string() function allocates a buffer to hold the +++** result and returns a pointer to this buffer. The calling routine +++** (that is, the implmentation of a user function) can alter the content +++** of this buffer if desired. +++*/ +++char *sqlite_set_result_string(sqlite_func*,const char*,int); +++void sqlite_set_result_int(sqlite_func*,int); +++void sqlite_set_result_double(sqlite_func*,double); +++void sqlite_set_result_error(sqlite_func*,const char*,int); +++ +++/* +++** The pUserData parameter to the sqlite_create_function() and +++** sqlite_create_aggregate() routines used to register user functions +++** is available to the implementation of the function using this +++** call. +++*/ +++void *sqlite_user_data(sqlite_func*); +++ +++/* +++** Aggregate functions use the following routine to allocate +++** a structure for storing their state. The first time this routine +++** is called for a particular aggregate, a new structure of size nBytes +++** is allocated, zeroed, and returned. On subsequent calls (for the +++** same aggregate instance) the same buffer is returned. The implementation +++** of the aggregate can use the returned buffer to accumulate data. +++** +++** The buffer allocated is freed automatically be SQLite. +++*/ +++void *sqlite_aggregate_context(sqlite_func*, int nBytes); +++ +++/* +++** The next routine returns the number of calls to xStep for a particular +++** aggregate function instance. The current call to xStep counts so this +++** routine always returns at least 1. +++*/ +++int sqlite_aggregate_count(sqlite_func*); +++ +++/* +++** This routine registers a callback with the SQLite library. The +++** callback is invoked (at compile-time, not at run-time) for each +++** attempt to access a column of a table in the database. The callback +++** returns SQLITE_OK if access is allowed, SQLITE_DENY if the entire +++** SQL statement should be aborted with an error and SQLITE_IGNORE +++** if the column should be treated as a NULL value. +++*/ +++int sqlite_set_authorizer( +++ sqlite*, +++ int (*xAuth)(void*,int,const char*,const char*,const char*,const char*), +++ void *pUserData +++); +++ +++/* +++** The second parameter to the access authorization function above will +++** be one of the values below. These values signify what kind of operation +++** is to be authorized. The 3rd and 4th parameters to the authorization +++** function will be parameters or NULL depending on which of the following +++** codes is used as the second parameter. The 5th parameter is the name +++** of the database ("main", "temp", etc.) if applicable. The 6th parameter +++** is the name of the inner-most trigger or view that is responsible for +++** the access attempt or NULL if this access attempt is directly from +++** input SQL code. +++** +++** Arg-3 Arg-4 +++*/ +++#define SQLITE_COPY 0 /* Table Name File Name */ +++#define SQLITE_CREATE_INDEX 1 /* Index Name Table Name */ +++#define SQLITE_CREATE_TABLE 2 /* Table Name NULL */ +++#define SQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ +++#define SQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ +++#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ +++#define SQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ +++#define SQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ +++#define SQLITE_CREATE_VIEW 8 /* View Name NULL */ +++#define SQLITE_DELETE 9 /* Table Name NULL */ +++#define SQLITE_DROP_INDEX 10 /* Index Name Table Name */ +++#define SQLITE_DROP_TABLE 11 /* Table Name NULL */ +++#define SQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ +++#define SQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ +++#define SQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ +++#define SQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ +++#define SQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ +++#define SQLITE_DROP_VIEW 17 /* View Name NULL */ +++#define SQLITE_INSERT 18 /* Table Name NULL */ +++#define SQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ +++#define SQLITE_READ 20 /* Table Name Column Name */ +++#define SQLITE_SELECT 21 /* NULL NULL */ +++#define SQLITE_TRANSACTION 22 /* NULL NULL */ +++#define SQLITE_UPDATE 23 /* Table Name Column Name */ +++#define SQLITE_ATTACH 24 /* Filename NULL */ +++#define SQLITE_DETACH 25 /* Database Name NULL */ +++ +++ +++/* +++** The return value of the authorization function should be one of the +++** following constants: +++*/ +++/* #define SQLITE_OK 0 // Allow access (This is actually defined above) */ +++#define SQLITE_DENY 1 /* Abort the SQL statement with an error */ +++#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ +++ +++/* +++** Register a function that is called at every invocation of sqlite_exec() +++** or sqlite_compile(). This function can be used (for example) to generate +++** a log file of all SQL executed against a database. +++*/ +++void *sqlite_trace(sqlite*, void(*xTrace)(void*,const char*), void*); +++ +++/*** The Callback-Free API +++** +++** The following routines implement a new way to access SQLite that does not +++** involve the use of callbacks. +++** +++** An sqlite_vm is an opaque object that represents a single SQL statement +++** that is ready to be executed. +++*/ +++typedef struct sqlite_vm sqlite_vm; +++ +++/* +++** To execute an SQLite query without the use of callbacks, you first have +++** to compile the SQL using this routine. The 1st parameter "db" is a pointer +++** to an sqlite object obtained from sqlite_open(). The 2nd parameter +++** "zSql" is the text of the SQL to be compiled. The remaining parameters +++** are all outputs. +++** +++** *pzTail is made to point to the first character past the end of the first +++** SQL statement in zSql. This routine only compiles the first statement +++** in zSql, so *pzTail is left pointing to what remains uncompiled. +++** +++** *ppVm is left pointing to a "virtual machine" that can be used to execute +++** the compiled statement. Or if there is an error, *ppVm may be set to NULL. +++** If the input text contained no SQL (if the input is and empty string or +++** a comment) then *ppVm is set to NULL. +++** +++** If any errors are detected during compilation, an error message is written +++** into space obtained from malloc() and *pzErrMsg is made to point to that +++** error message. The calling routine is responsible for freeing the text +++** of this message when it has finished with it. Use sqlite_freemem() to +++** free the message. pzErrMsg may be NULL in which case no error message +++** will be generated. +++** +++** On success, SQLITE_OK is returned. Otherwise and error code is returned. +++*/ +++int sqlite_compile( +++ sqlite *db, /* The open database */ +++ const char *zSql, /* SQL statement to be compiled */ +++ const char **pzTail, /* OUT: uncompiled tail of zSql */ +++ sqlite_vm **ppVm, /* OUT: the virtual machine to execute zSql */ +++ char **pzErrmsg /* OUT: Error message. */ +++); +++ +++/* +++** After an SQL statement has been compiled, it is handed to this routine +++** to be executed. This routine executes the statement as far as it can +++** go then returns. The return value will be one of SQLITE_DONE, +++** SQLITE_ERROR, SQLITE_BUSY, SQLITE_ROW, or SQLITE_MISUSE. +++** +++** SQLITE_DONE means that the execute of the SQL statement is complete +++** an no errors have occurred. sqlite_step() should not be called again +++** for the same virtual machine. *pN is set to the number of columns in +++** the result set and *pazColName is set to an array of strings that +++** describe the column names and datatypes. The name of the i-th column +++** is (*pazColName)[i] and the datatype of the i-th column is +++** (*pazColName)[i+*pN]. *pazValue is set to NULL. +++** +++** SQLITE_ERROR means that the virtual machine encountered a run-time +++** error. sqlite_step() should not be called again for the same +++** virtual machine. *pN is set to 0 and *pazColName and *pazValue are set +++** to NULL. Use sqlite_finalize() to obtain the specific error code +++** and the error message text for the error. +++** +++** SQLITE_BUSY means that an attempt to open the database failed because +++** another thread or process is holding a lock. The calling routine +++** can try again to open the database by calling sqlite_step() again. +++** The return code will only be SQLITE_BUSY if no busy handler is registered +++** using the sqlite_busy_handler() or sqlite_busy_timeout() routines. If +++** a busy handler callback has been registered but returns 0, then this +++** routine will return SQLITE_ERROR and sqltie_finalize() will return +++** SQLITE_BUSY when it is called. +++** +++** SQLITE_ROW means that a single row of the result is now available. +++** The data is contained in *pazValue. The value of the i-th column is +++** (*azValue)[i]. *pN and *pazColName are set as described in SQLITE_DONE. +++** Invoke sqlite_step() again to advance to the next row. +++** +++** SQLITE_MISUSE is returned if sqlite_step() is called incorrectly. +++** For example, if you call sqlite_step() after the virtual machine +++** has halted (after a prior call to sqlite_step() has returned SQLITE_DONE) +++** or if you call sqlite_step() with an incorrectly initialized virtual +++** machine or a virtual machine that has been deleted or that is associated +++** with an sqlite structure that has been closed. +++*/ +++int sqlite_step( +++ sqlite_vm *pVm, /* The virtual machine to execute */ +++ int *pN, /* OUT: Number of columns in result */ +++ const char ***pazValue, /* OUT: Column data */ +++ const char ***pazColName /* OUT: Column names and datatypes */ +++); +++ +++/* +++** This routine is called to delete a virtual machine after it has finished +++** executing. The return value is the result code. SQLITE_OK is returned +++** if the statement executed successfully and some other value is returned if +++** there was any kind of error. If an error occurred and pzErrMsg is not +++** NULL, then an error message is written into memory obtained from malloc() +++** and *pzErrMsg is made to point to that error message. The calling routine +++** should use sqlite_freemem() to delete this message when it has finished +++** with it. +++** +++** This routine can be called at any point during the execution of the +++** virtual machine. If the virtual machine has not completed execution +++** when this routine is called, that is like encountering an error or +++** an interrupt. (See sqlite_interrupt().) Incomplete updates may be +++** rolled back and transactions cancelled, depending on the circumstances, +++** and the result code returned will be SQLITE_ABORT. +++*/ +++int sqlite_finalize(sqlite_vm*, char **pzErrMsg); +++ +++/* +++** This routine deletes the virtual machine, writes any error message to +++** *pzErrMsg and returns an SQLite return code in the same way as the +++** sqlite_finalize() function. +++** +++** Additionally, if ppVm is not NULL, *ppVm is left pointing to a new virtual +++** machine loaded with the compiled version of the original query ready for +++** execution. +++** +++** If sqlite_reset() returns SQLITE_SCHEMA, then *ppVm is set to NULL. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++int sqlite_reset(sqlite_vm*, char **pzErrMsg); +++ +++/* +++** If the SQL that was handed to sqlite_compile contains variables that +++** are represeted in the SQL text by a question mark ('?'). This routine +++** is used to assign values to those variables. +++** +++** The first parameter is a virtual machine obtained from sqlite_compile(). +++** The 2nd "idx" parameter determines which variable in the SQL statement +++** to bind the value to. The left most '?' is 1. The 3rd parameter is +++** the value to assign to that variable. The 4th parameter is the number +++** of bytes in the value, including the terminating \000 for strings. +++** Finally, the 5th "copy" parameter is TRUE if SQLite should make its +++** own private copy of this value, or false if the space that the 3rd +++** parameter points to will be unchanging and can be used directly by +++** SQLite. +++** +++** Unbound variables are treated as having a value of NULL. To explicitly +++** set a variable to NULL, call this routine with the 3rd parameter as a +++** NULL pointer. +++** +++** If the 4th "len" parameter is -1, then strlen() is used to find the +++** length. +++** +++** This routine can only be called immediately after sqlite_compile() +++** or sqlite_reset() and before any calls to sqlite_step(). +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++int sqlite_bind(sqlite_vm*, int idx, const char *value, int len, int copy); +++ +++/* +++** This routine configures a callback function - the progress callback - that +++** is invoked periodically during long running calls to sqlite_exec(), +++** sqlite_step() and sqlite_get_table(). An example use for this API is to keep +++** a GUI updated during a large query. +++** +++** The progress callback is invoked once for every N virtual machine opcodes, +++** where N is the second argument to this function. The progress callback +++** itself is identified by the third argument to this function. The fourth +++** argument to this function is a void pointer passed to the progress callback +++** function each time it is invoked. +++** +++** If a call to sqlite_exec(), sqlite_step() or sqlite_get_table() results +++** in less than N opcodes being executed, then the progress callback is not +++** invoked. +++** +++** Calling this routine overwrites any previously installed progress callback. +++** To remove the progress callback altogether, pass NULL as the third +++** argument to this function. +++** +++** If the progress callback returns a result other than 0, then the current +++** query is immediately terminated and any database changes rolled back. If the +++** query was part of a larger transaction, then the transaction is not rolled +++** back and remains active. The sqlite_exec() call returns SQLITE_ABORT. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++void sqlite_progress_handler(sqlite*, int, int(*)(void*), void*); +++ +++/* +++** Register a callback function to be invoked whenever a new transaction +++** is committed. The pArg argument is passed through to the callback. +++** callback. If the callback function returns non-zero, then the commit +++** is converted into a rollback. +++** +++** If another function was previously registered, its pArg value is returned. +++** Otherwise NULL is returned. +++** +++** Registering a NULL function disables the callback. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++void *sqlite_commit_hook(sqlite*, int(*)(void*), void*); +++ +++/* +++** Open an encrypted SQLite database. If pKey==0 or nKey==0, this routine +++** is the same as sqlite_open(). +++** +++** The code to implement this API is not available in the public release +++** of SQLite. +++*/ +++sqlite *sqlite_open_encrypted( +++ const char *zFilename, /* Name of the encrypted database */ +++ const void *pKey, /* Pointer to the key */ +++ int nKey, /* Number of bytes in the key */ +++ int *pErrcode, /* Write error code here */ +++ char **pzErrmsg /* Write error message here */ +++); +++ +++/* +++** Change the key on an open database. If the current database is not +++** encrypted, this routine will encrypt it. If pNew==0 or nNew==0, the +++** database is decrypted. +++** +++** The code to implement this API is not available in the public release +++** of SQLite. +++*/ +++int sqlite_rekey( +++ sqlite *db, /* Database to be rekeyed */ +++ const void *pKey, int nKey /* The new key */ +++); +++ +++/* +++** Encode a binary buffer "in" of size n bytes so that it contains +++** no instances of characters '\'' or '\000'. The output is +++** null-terminated and can be used as a string value in an INSERT +++** or UPDATE statement. Use sqlite_decode_binary() to convert the +++** string back into its original binary. +++** +++** The result is written into a preallocated output buffer "out". +++** "out" must be able to hold at least 2 +(257*n)/254 bytes. +++** In other words, the output will be expanded by as much as 3 +++** bytes for every 254 bytes of input plus 2 bytes of fixed overhead. +++** (This is approximately 2 + 1.0118*n or about a 1.2% size increase.) +++** +++** The return value is the number of characters in the encoded +++** string, excluding the "\000" terminator. +++** +++** If out==NULL then no output is generated but the routine still returns +++** the number of characters that would have been generated if out had +++** not been NULL. +++*/ +++int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out); +++ +++/* +++** Decode the string "in" into binary data and write it into "out". +++** This routine reverses the encoding created by sqlite_encode_binary(). +++** The output will always be a few bytes less than the input. The number +++** of bytes of output is returned. If the input is not a well-formed +++** encoding, -1 is returned. +++** +++** The "in" and "out" parameters may point to the same buffer in order +++** to decode a string in place. +++*/ +++int sqlite_decode_binary(const unsigned char *in, unsigned char *out); +++ +++#ifdef __cplusplus +++} /* End of the 'extern "C"' block */ +++#endif +++ +++#endif /* _SQLITE_H_ */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/sqliteInt.h ++@@ -0,0 +1,1270 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** Internal interface definitions for SQLite. +++** +++** @(#) $Id$ +++*/ +++#include "config.h" +++#include "sqlite.h" +++#include "hash.h" +++#include "parse.h" +++#include "btree.h" +++#include +++#include +++#include +++#include +++ +++/* +++** The maximum number of in-memory pages to use for the main database +++** table and for temporary tables. +++*/ +++#define MAX_PAGES 2000 +++#define TEMP_PAGES 500 +++ +++/* +++** If the following macro is set to 1, then NULL values are considered +++** distinct for the SELECT DISTINCT statement and for UNION or EXCEPT +++** compound queries. No other SQL database engine (among those tested) +++** works this way except for OCELOT. But the SQL92 spec implies that +++** this is how things should work. +++** +++** If the following macro is set to 0, then NULLs are indistinct for +++** SELECT DISTINCT and for UNION. +++*/ +++#define NULL_ALWAYS_DISTINCT 0 +++ +++/* +++** If the following macro is set to 1, then NULL values are considered +++** distinct when determining whether or not two entries are the same +++** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +++** OCELOT, and Firebird all work. The SQL92 spec explicitly says this +++** is the way things are suppose to work. +++** +++** If the following macro is set to 0, the NULLs are indistinct for +++** a UNIQUE index. In this mode, you can only have a single NULL entry +++** for a column declared UNIQUE. This is the way Informix and SQL Server +++** work. +++*/ +++#define NULL_DISTINCT_FOR_UNIQUE 1 +++ +++/* +++** The maximum number of attached databases. This must be at least 2 +++** in order to support the main database file (0) and the file used to +++** hold temporary tables (1). And it must be less than 256 because +++** an unsigned character is used to stored the database index. +++*/ +++#define MAX_ATTACHED 10 +++ +++/* +++** The next macro is used to determine where TEMP tables and indices +++** are stored. Possible values: +++** +++** 0 Always use a temporary files +++** 1 Use a file unless overridden by "PRAGMA temp_store" +++** 2 Use memory unless overridden by "PRAGMA temp_store" +++** 3 Always use memory +++*/ +++#ifndef TEMP_STORE +++# define TEMP_STORE 1 +++#endif +++ +++/* +++** When building SQLite for embedded systems where memory is scarce, +++** you can define one or more of the following macros to omit extra +++** features of the library and thus keep the size of the library to +++** a minimum. +++*/ +++/* #define SQLITE_OMIT_AUTHORIZATION 1 */ +++/* #define SQLITE_OMIT_INMEMORYDB 1 */ +++/* #define SQLITE_OMIT_VACUUM 1 */ +++/* #define SQLITE_OMIT_DATETIME_FUNCS 1 */ +++/* #define SQLITE_OMIT_PROGRESS_CALLBACK 1 */ +++ +++/* +++** Integers of known sizes. These typedefs might change for architectures +++** where the sizes very. Preprocessor macros are available so that the +++** types can be conveniently redefined at compile-type. Like this: +++** +++** cc '-DUINTPTR_TYPE=long long int' ... +++*/ +++#ifndef UINT32_TYPE +++# define UINT32_TYPE unsigned int +++#endif +++#ifndef UINT16_TYPE +++# define UINT16_TYPE unsigned short int +++#endif +++#ifndef INT16_TYPE +++# define INT16_TYPE short int +++#endif +++#ifndef UINT8_TYPE +++# define UINT8_TYPE unsigned char +++#endif +++#ifndef INT8_TYPE +++# define INT8_TYPE signed char +++#endif +++#ifndef INTPTR_TYPE +++# if SQLITE_PTR_SZ==4 +++# define INTPTR_TYPE int +++# else +++# define INTPTR_TYPE long long +++# endif +++#endif +++typedef UINT32_TYPE u32; /* 4-byte unsigned integer */ +++typedef UINT16_TYPE u16; /* 2-byte unsigned integer */ +++typedef INT16_TYPE i16; /* 2-byte signed integer */ +++typedef UINT8_TYPE u8; /* 1-byte unsigned integer */ +++typedef UINT8_TYPE i8; /* 1-byte signed integer */ +++typedef INTPTR_TYPE ptr; /* Big enough to hold a pointer */ +++typedef unsigned INTPTR_TYPE uptr; /* Big enough to hold a pointer */ +++ +++/* +++** Defer sourcing vdbe.h until after the "u8" typedef is defined. +++*/ +++#include "vdbe.h" +++ +++/* +++** Most C compilers these days recognize "long double", don't they? +++** Just in case we encounter one that does not, we will create a macro +++** for long double so that it can be easily changed to just "double". +++*/ +++#ifndef LONGDOUBLE_TYPE +++# define LONGDOUBLE_TYPE long double +++#endif +++ +++/* +++** This macro casts a pointer to an integer. Useful for doing +++** pointer arithmetic. +++*/ +++#define Addr(X) ((uptr)X) +++ +++/* +++** The maximum number of bytes of data that can be put into a single +++** row of a single table. The upper bound on this limit is 16777215 +++** bytes (or 16MB-1). We have arbitrarily set the limit to just 1MB +++** here because the overflow page chain is inefficient for really big +++** records and we want to discourage people from thinking that +++** multi-megabyte records are OK. If your needs are different, you can +++** change this define and recompile to increase or decrease the record +++** size. +++** +++** The 16777198 is computed as follows: 238 bytes of payload on the +++** original pages plus 16448 overflow pages each holding 1020 bytes of +++** data. +++*/ +++#define MAX_BYTES_PER_ROW 1048576 +++/* #define MAX_BYTES_PER_ROW 16777198 */ +++ +++/* +++** If memory allocation problems are found, recompile with +++** +++** -DMEMORY_DEBUG=1 +++** +++** to enable some sanity checking on malloc() and free(). To +++** check for memory leaks, recompile with +++** +++** -DMEMORY_DEBUG=2 +++** +++** and a line of text will be written to standard error for +++** each malloc() and free(). This output can be analyzed +++** by an AWK script to determine if there are any leaks. +++*/ +++#ifdef MEMORY_DEBUG +++# define sqliteMalloc(X) sqliteMalloc_(X,1,__FILE__,__LINE__) +++# define sqliteMallocRaw(X) sqliteMalloc_(X,0,__FILE__,__LINE__) +++# define sqliteFree(X) sqliteFree_(X,__FILE__,__LINE__) +++# define sqliteRealloc(X,Y) sqliteRealloc_(X,Y,__FILE__,__LINE__) +++# define sqliteStrDup(X) sqliteStrDup_(X,__FILE__,__LINE__) +++# define sqliteStrNDup(X,Y) sqliteStrNDup_(X,Y,__FILE__,__LINE__) +++ void sqliteStrRealloc(char**); +++#else +++# define sqliteRealloc_(X,Y) sqliteRealloc(X,Y) +++# define sqliteStrRealloc(X) +++#endif +++ +++/* +++** This variable gets set if malloc() ever fails. After it gets set, +++** the SQLite library shuts down permanently. +++*/ +++extern int sqlite_malloc_failed; +++ +++/* +++** The following global variables are used for testing and debugging +++** only. They only work if MEMORY_DEBUG is defined. +++*/ +++#ifdef MEMORY_DEBUG +++extern int sqlite_nMalloc; /* Number of sqliteMalloc() calls */ +++extern int sqlite_nFree; /* Number of sqliteFree() calls */ +++extern int sqlite_iMallocFail; /* Fail sqliteMalloc() after this many calls */ +++#endif +++ +++/* +++** Name of the master database table. The master database table +++** is a special table that holds the names and attributes of all +++** user tables and indices. +++*/ +++#define MASTER_NAME "sqlite_master" +++#define TEMP_MASTER_NAME "sqlite_temp_master" +++ +++/* +++** The name of the schema table. +++*/ +++#define SCHEMA_TABLE(x) (x?TEMP_MASTER_NAME:MASTER_NAME) +++ +++/* +++** A convenience macro that returns the number of elements in +++** an array. +++*/ +++#define ArraySize(X) (sizeof(X)/sizeof(X[0])) +++ +++/* +++** Forward references to structures +++*/ +++typedef struct Column Column; +++typedef struct Table Table; +++typedef struct Index Index; +++typedef struct Instruction Instruction; +++typedef struct Expr Expr; +++typedef struct ExprList ExprList; +++typedef struct Parse Parse; +++typedef struct Token Token; +++typedef struct IdList IdList; +++typedef struct SrcList SrcList; +++typedef struct WhereInfo WhereInfo; +++typedef struct WhereLevel WhereLevel; +++typedef struct Select Select; +++typedef struct AggExpr AggExpr; +++typedef struct FuncDef FuncDef; +++typedef struct Trigger Trigger; +++typedef struct TriggerStep TriggerStep; +++typedef struct TriggerStack TriggerStack; +++typedef struct FKey FKey; +++typedef struct Db Db; +++typedef struct AuthContext AuthContext; +++ +++/* +++** Each database file to be accessed by the system is an instance +++** of the following structure. There are normally two of these structures +++** in the sqlite.aDb[] array. aDb[0] is the main database file and +++** aDb[1] is the database file used to hold temporary tables. Additional +++** databases may be attached. +++*/ +++struct Db { +++ char *zName; /* Name of this database */ +++ Btree *pBt; /* The B*Tree structure for this database file */ +++ int schema_cookie; /* Database schema version number for this file */ +++ Hash tblHash; /* All tables indexed by name */ +++ Hash idxHash; /* All (named) indices indexed by name */ +++ Hash trigHash; /* All triggers indexed by name */ +++ Hash aFKey; /* Foreign keys indexed by to-table */ +++ u8 inTrans; /* 0: not writable. 1: Transaction. 2: Checkpoint */ +++ u16 flags; /* Flags associated with this database */ +++ void *pAux; /* Auxiliary data. Usually NULL */ +++ void (*xFreeAux)(void*); /* Routine to free pAux */ +++}; +++ +++/* +++** These macros can be used to test, set, or clear bits in the +++** Db.flags field. +++*/ +++#define DbHasProperty(D,I,P) (((D)->aDb[I].flags&(P))==(P)) +++#define DbHasAnyProperty(D,I,P) (((D)->aDb[I].flags&(P))!=0) +++#define DbSetProperty(D,I,P) (D)->aDb[I].flags|=(P) +++#define DbClearProperty(D,I,P) (D)->aDb[I].flags&=~(P) +++ +++/* +++** Allowed values for the DB.flags field. +++** +++** The DB_Locked flag is set when the first OP_Transaction or OP_Checkpoint +++** opcode is emitted for a database. This prevents multiple occurances +++** of those opcodes for the same database in the same program. Similarly, +++** the DB_Cookie flag is set when the OP_VerifyCookie opcode is emitted, +++** and prevents duplicate OP_VerifyCookies from taking up space and slowing +++** down execution. +++** +++** The DB_SchemaLoaded flag is set after the database schema has been +++** read into internal hash tables. +++** +++** DB_UnresetViews means that one or more views have column names that +++** have been filled out. If the schema changes, these column names might +++** changes and so the view will need to be reset. +++*/ +++#define DB_Locked 0x0001 /* OP_Transaction opcode has been emitted */ +++#define DB_Cookie 0x0002 /* OP_VerifyCookie opcode has been emiited */ +++#define DB_SchemaLoaded 0x0004 /* The schema has been loaded */ +++#define DB_UnresetViews 0x0008 /* Some views have defined column names */ +++ +++ +++/* +++** Each database is an instance of the following structure. +++** +++** The sqlite.file_format is initialized by the database file +++** and helps determines how the data in the database file is +++** represented. This field allows newer versions of the library +++** to read and write older databases. The various file formats +++** are as follows: +++** +++** file_format==1 Version 2.1.0. +++** file_format==2 Version 2.2.0. Add support for INTEGER PRIMARY KEY. +++** file_format==3 Version 2.6.0. Fix empty-string index bug. +++** file_format==4 Version 2.7.0. Add support for separate numeric and +++** text datatypes. +++** +++** The sqlite.temp_store determines where temporary database files +++** are stored. If 1, then a file is created to hold those tables. If +++** 2, then they are held in memory. 0 means use the default value in +++** the TEMP_STORE macro. +++** +++** The sqlite.lastRowid records the last insert rowid generated by an +++** insert statement. Inserts on views do not affect its value. Each +++** trigger has its own context, so that lastRowid can be updated inside +++** triggers as usual. The previous value will be restored once the trigger +++** exits. Upon entering a before or instead of trigger, lastRowid is no +++** longer (since after version 2.8.12) reset to -1. +++** +++** The sqlite.nChange does not count changes within triggers and keeps no +++** context. It is reset at start of sqlite_exec. +++** The sqlite.lsChange represents the number of changes made by the last +++** insert, update, or delete statement. It remains constant throughout the +++** length of a statement and is then updated by OP_SetCounts. It keeps a +++** context stack just like lastRowid so that the count of changes +++** within a trigger is not seen outside the trigger. Changes to views do not +++** affect the value of lsChange. +++** The sqlite.csChange keeps track of the number of current changes (since +++** the last statement) and is used to update sqlite_lsChange. +++*/ +++struct sqlite { +++ int nDb; /* Number of backends currently in use */ +++ Db *aDb; /* All backends */ +++ Db aDbStatic[2]; /* Static space for the 2 default backends */ +++ int flags; /* Miscellanous flags. See below */ +++ u8 file_format; /* What file format version is this database? */ +++ u8 safety_level; /* How aggressive at synching data to disk */ +++ u8 want_to_close; /* Close after all VDBEs are deallocated */ +++ u8 temp_store; /* 1=file, 2=memory, 0=compile-time default */ +++ u8 onError; /* Default conflict algorithm */ +++ int next_cookie; /* Next value of aDb[0].schema_cookie */ +++ int cache_size; /* Number of pages to use in the cache */ +++ int nTable; /* Number of tables in the database */ +++ void *pBusyArg; /* 1st Argument to the busy callback */ +++ int (*xBusyCallback)(void *,const char*,int); /* The busy callback */ +++ void *pCommitArg; /* Argument to xCommitCallback() */ +++ int (*xCommitCallback)(void*);/* Invoked at every commit. */ +++ Hash aFunc; /* All functions that can be in SQL exprs */ +++ int lastRowid; /* ROWID of most recent insert (see above) */ +++ int priorNewRowid; /* Last randomly generated ROWID */ +++ int magic; /* Magic number for detect library misuse */ +++ int nChange; /* Number of rows changed (see above) */ +++ int lsChange; /* Last statement change count (see above) */ +++ int csChange; /* Current statement change count (see above) */ +++ struct sqliteInitInfo { /* Information used during initialization */ +++ int iDb; /* When back is being initialized */ +++ int newTnum; /* Rootpage of table being initialized */ +++ u8 busy; /* TRUE if currently initializing */ +++ } init; +++ struct Vdbe *pVdbe; /* List of active virtual machines */ +++ void (*xTrace)(void*,const char*); /* Trace function */ +++ void *pTraceArg; /* Argument to the trace function */ +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ int (*xAuth)(void*,int,const char*,const char*,const char*,const char*); +++ /* Access authorization function */ +++ void *pAuthArg; /* 1st argument to the access auth function */ +++#endif +++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +++ int (*xProgress)(void *); /* The progress callback */ +++ void *pProgressArg; /* Argument to the progress callback */ +++ int nProgressOps; /* Number of opcodes for progress callback */ +++#endif +++}; +++ +++/* +++** Possible values for the sqlite.flags and or Db.flags fields. +++** +++** On sqlite.flags, the SQLITE_InTrans value means that we have +++** executed a BEGIN. On Db.flags, SQLITE_InTrans means a statement +++** transaction is active on that particular database file. +++*/ +++#define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ +++#define SQLITE_Initialized 0x00000002 /* True after initialization */ +++#define SQLITE_Interrupt 0x00000004 /* Cancel current operation */ +++#define SQLITE_InTrans 0x00000008 /* True if in a transaction */ +++#define SQLITE_InternChanges 0x00000010 /* Uncommitted Hash table changes */ +++#define SQLITE_FullColNames 0x00000020 /* Show full column names on SELECT */ +++#define SQLITE_ShortColNames 0x00000040 /* Show short columns names */ +++#define SQLITE_CountRows 0x00000080 /* Count rows changed by INSERT, */ +++ /* DELETE, or UPDATE and return */ +++ /* the count using a callback. */ +++#define SQLITE_NullCallback 0x00000100 /* Invoke the callback once if the */ +++ /* result set is empty */ +++#define SQLITE_ReportTypes 0x00000200 /* Include information on datatypes */ +++ /* in 4th argument of callback */ +++ +++/* +++** Possible values for the sqlite.magic field. +++** The numbers are obtained at random and have no special meaning, other +++** than being distinct from one another. +++*/ +++#define SQLITE_MAGIC_OPEN 0xa029a697 /* Database is open */ +++#define SQLITE_MAGIC_CLOSED 0x9f3c2d33 /* Database is closed */ +++#define SQLITE_MAGIC_BUSY 0xf03b7906 /* Database currently in use */ +++#define SQLITE_MAGIC_ERROR 0xb5357930 /* An SQLITE_MISUSE error occurred */ +++ +++/* +++** Each SQL function is defined by an instance of the following +++** structure. A pointer to this structure is stored in the sqlite.aFunc +++** hash table. When multiple functions have the same name, the hash table +++** points to a linked list of these structures. +++*/ +++struct FuncDef { +++ void (*xFunc)(sqlite_func*,int,const char**); /* Regular function */ +++ void (*xStep)(sqlite_func*,int,const char**); /* Aggregate function step */ +++ void (*xFinalize)(sqlite_func*); /* Aggregate function finializer */ +++ signed char nArg; /* Number of arguments. -1 means unlimited */ +++ signed char dataType; /* Arg that determines datatype. -1=NUMERIC, */ +++ /* -2=TEXT. -3=SQLITE_ARGS */ +++ u8 includeTypes; /* Add datatypes to args of xFunc and xStep */ +++ void *pUserData; /* User data parameter */ +++ FuncDef *pNext; /* Next function with same name */ +++}; +++ +++/* +++** information about each column of an SQL table is held in an instance +++** of this structure. +++*/ +++struct Column { +++ char *zName; /* Name of this column */ +++ char *zDflt; /* Default value of this column */ +++ char *zType; /* Data type for this column */ +++ u8 notNull; /* True if there is a NOT NULL constraint */ +++ u8 isPrimKey; /* True if this column is part of the PRIMARY KEY */ +++ u8 sortOrder; /* Some combination of SQLITE_SO_... values */ +++ u8 dottedName; /* True if zName contains a "." character */ +++}; +++ +++/* +++** The allowed sort orders. +++** +++** The TEXT and NUM values use bits that do not overlap with DESC and ASC. +++** That way the two can be combined into a single number. +++*/ +++#define SQLITE_SO_UNK 0 /* Use the default collating type. (SCT_NUM) */ +++#define SQLITE_SO_TEXT 2 /* Sort using memcmp() */ +++#define SQLITE_SO_NUM 4 /* Sort using sqliteCompare() */ +++#define SQLITE_SO_TYPEMASK 6 /* Mask to extract the collating sequence */ +++#define SQLITE_SO_ASC 0 /* Sort in ascending order */ +++#define SQLITE_SO_DESC 1 /* Sort in descending order */ +++#define SQLITE_SO_DIRMASK 1 /* Mask to extract the sort direction */ +++ +++/* +++** Each SQL table is represented in memory by an instance of the +++** following structure. +++** +++** Table.zName is the name of the table. The case of the original +++** CREATE TABLE statement is stored, but case is not significant for +++** comparisons. +++** +++** Table.nCol is the number of columns in this table. Table.aCol is a +++** pointer to an array of Column structures, one for each column. +++** +++** If the table has an INTEGER PRIMARY KEY, then Table.iPKey is the index of +++** the column that is that key. Otherwise Table.iPKey is negative. Note +++** that the datatype of the PRIMARY KEY must be INTEGER for this field to +++** be set. An INTEGER PRIMARY KEY is used as the rowid for each row of +++** the table. If a table has no INTEGER PRIMARY KEY, then a random rowid +++** is generated for each row of the table. Table.hasPrimKey is true if +++** the table has any PRIMARY KEY, INTEGER or otherwise. +++** +++** Table.tnum is the page number for the root BTree page of the table in the +++** database file. If Table.iDb is the index of the database table backend +++** in sqlite.aDb[]. 0 is for the main database and 1 is for the file that +++** holds temporary tables and indices. If Table.isTransient +++** is true, then the table is stored in a file that is automatically deleted +++** when the VDBE cursor to the table is closed. In this case Table.tnum +++** refers VDBE cursor number that holds the table open, not to the root +++** page number. Transient tables are used to hold the results of a +++** sub-query that appears instead of a real table name in the FROM clause +++** of a SELECT statement. +++*/ +++struct Table { +++ char *zName; /* Name of the table */ +++ int nCol; /* Number of columns in this table */ +++ Column *aCol; /* Information about each column */ +++ int iPKey; /* If not less then 0, use aCol[iPKey] as the primary key */ +++ Index *pIndex; /* List of SQL indexes on this table. */ +++ int tnum; /* Root BTree node for this table (see note above) */ +++ Select *pSelect; /* NULL for tables. Points to definition if a view. */ +++ u8 readOnly; /* True if this table should not be written by the user */ +++ u8 iDb; /* Index into sqlite.aDb[] of the backend for this table */ +++ u8 isTransient; /* True if automatically deleted when VDBE finishes */ +++ u8 hasPrimKey; /* True if there exists a primary key */ +++ u8 keyConf; /* What to do in case of uniqueness conflict on iPKey */ +++ Trigger *pTrigger; /* List of SQL triggers on this table */ +++ FKey *pFKey; /* Linked list of all foreign keys in this table */ +++}; +++ +++/* +++** Each foreign key constraint is an instance of the following structure. +++** +++** A foreign key is associated with two tables. The "from" table is +++** the table that contains the REFERENCES clause that creates the foreign +++** key. The "to" table is the table that is named in the REFERENCES clause. +++** Consider this example: +++** +++** CREATE TABLE ex1( +++** a INTEGER PRIMARY KEY, +++** b INTEGER CONSTRAINT fk1 REFERENCES ex2(x) +++** ); +++** +++** For foreign key "fk1", the from-table is "ex1" and the to-table is "ex2". +++** +++** Each REFERENCES clause generates an instance of the following structure +++** which is attached to the from-table. The to-table need not exist when +++** the from-table is created. The existance of the to-table is not checked +++** until an attempt is made to insert data into the from-table. +++** +++** The sqlite.aFKey hash table stores pointers to this structure +++** given the name of a to-table. For each to-table, all foreign keys +++** associated with that table are on a linked list using the FKey.pNextTo +++** field. +++*/ +++struct FKey { +++ Table *pFrom; /* The table that constains the REFERENCES clause */ +++ FKey *pNextFrom; /* Next foreign key in pFrom */ +++ char *zTo; /* Name of table that the key points to */ +++ FKey *pNextTo; /* Next foreign key that points to zTo */ +++ int nCol; /* Number of columns in this key */ +++ struct sColMap { /* Mapping of columns in pFrom to columns in zTo */ +++ int iFrom; /* Index of column in pFrom */ +++ char *zCol; /* Name of column in zTo. If 0 use PRIMARY KEY */ +++ } *aCol; /* One entry for each of nCol column s */ +++ u8 isDeferred; /* True if constraint checking is deferred till COMMIT */ +++ u8 updateConf; /* How to resolve conflicts that occur on UPDATE */ +++ u8 deleteConf; /* How to resolve conflicts that occur on DELETE */ +++ u8 insertConf; /* How to resolve conflicts that occur on INSERT */ +++}; +++ +++/* +++** SQLite supports many different ways to resolve a contraint +++** error. ROLLBACK processing means that a constraint violation +++** causes the operation in process to fail and for the current transaction +++** to be rolled back. ABORT processing means the operation in process +++** fails and any prior changes from that one operation are backed out, +++** but the transaction is not rolled back. FAIL processing means that +++** the operation in progress stops and returns an error code. But prior +++** changes due to the same operation are not backed out and no rollback +++** occurs. IGNORE means that the particular row that caused the constraint +++** error is not inserted or updated. Processing continues and no error +++** is returned. REPLACE means that preexisting database rows that caused +++** a UNIQUE constraint violation are removed so that the new insert or +++** update can proceed. Processing continues and no error is reported. +++** +++** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. +++** RESTRICT is the same as ABORT for IMMEDIATE foreign keys and the +++** same as ROLLBACK for DEFERRED keys. SETNULL means that the foreign +++** key is set to NULL. CASCADE means that a DELETE or UPDATE of the +++** referenced table row is propagated into the row that holds the +++** foreign key. +++** +++** The following symbolic values are used to record which type +++** of action to take. +++*/ +++#define OE_None 0 /* There is no constraint to check */ +++#define OE_Rollback 1 /* Fail the operation and rollback the transaction */ +++#define OE_Abort 2 /* Back out changes but do no rollback transaction */ +++#define OE_Fail 3 /* Stop the operation but leave all prior changes */ +++#define OE_Ignore 4 /* Ignore the error. Do not do the INSERT or UPDATE */ +++#define OE_Replace 5 /* Delete existing record, then do INSERT or UPDATE */ +++ +++#define OE_Restrict 6 /* OE_Abort for IMMEDIATE, OE_Rollback for DEFERRED */ +++#define OE_SetNull 7 /* Set the foreign key value to NULL */ +++#define OE_SetDflt 8 /* Set the foreign key value to its default */ +++#define OE_Cascade 9 /* Cascade the changes */ +++ +++#define OE_Default 99 /* Do whatever the default action is */ +++ +++/* +++** Each SQL index is represented in memory by an +++** instance of the following structure. +++** +++** The columns of the table that are to be indexed are described +++** by the aiColumn[] field of this structure. For example, suppose +++** we have the following table and index: +++** +++** CREATE TABLE Ex1(c1 int, c2 int, c3 text); +++** CREATE INDEX Ex2 ON Ex1(c3,c1); +++** +++** In the Table structure describing Ex1, nCol==3 because there are +++** three columns in the table. In the Index structure describing +++** Ex2, nColumn==2 since 2 of the 3 columns of Ex1 are indexed. +++** The value of aiColumn is {2, 0}. aiColumn[0]==2 because the +++** first column to be indexed (c3) has an index of 2 in Ex1.aCol[]. +++** The second column to be indexed (c1) has an index of 0 in +++** Ex1.aCol[], hence Ex2.aiColumn[1]==0. +++** +++** The Index.onError field determines whether or not the indexed columns +++** must be unique and what to do if they are not. When Index.onError=OE_None, +++** it means this is not a unique index. Otherwise it is a unique index +++** and the value of Index.onError indicate the which conflict resolution +++** algorithm to employ whenever an attempt is made to insert a non-unique +++** element. +++*/ +++struct Index { +++ char *zName; /* Name of this index */ +++ int nColumn; /* Number of columns in the table used by this index */ +++ int *aiColumn; /* Which columns are used by this index. 1st is 0 */ +++ Table *pTable; /* The SQL table being indexed */ +++ int tnum; /* Page containing root of this index in database file */ +++ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ +++ u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ +++ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ +++ Index *pNext; /* The next index associated with the same table */ +++}; +++ +++/* +++** Each token coming out of the lexer is an instance of +++** this structure. Tokens are also used as part of an expression. +++** +++** Note if Token.z==0 then Token.dyn and Token.n are undefined and +++** may contain random values. Do not make any assuptions about Token.dyn +++** and Token.n when Token.z==0. +++*/ +++struct Token { +++ const char *z; /* Text of the token. Not NULL-terminated! */ +++ unsigned dyn : 1; /* True for malloced memory, false for static */ +++ unsigned n : 31; /* Number of characters in this token */ +++}; +++ +++/* +++** Each node of an expression in the parse tree is an instance +++** of this structure. +++** +++** Expr.op is the opcode. The integer parser token codes are reused +++** as opcodes here. For example, the parser defines TK_GE to be an integer +++** code representing the ">=" operator. This same integer code is reused +++** to represent the greater-than-or-equal-to operator in the expression +++** tree. +++** +++** Expr.pRight and Expr.pLeft are subexpressions. Expr.pList is a list +++** of argument if the expression is a function. +++** +++** Expr.token is the operator token for this node. For some expressions +++** that have subexpressions, Expr.token can be the complete text that gave +++** rise to the Expr. In the latter case, the token is marked as being +++** a compound token. +++** +++** An expression of the form ID or ID.ID refers to a column in a table. +++** For such expressions, Expr.op is set to TK_COLUMN and Expr.iTable is +++** the integer cursor number of a VDBE cursor pointing to that table and +++** Expr.iColumn is the column number for the specific column. If the +++** expression is used as a result in an aggregate SELECT, then the +++** value is also stored in the Expr.iAgg column in the aggregate so that +++** it can be accessed after all aggregates are computed. +++** +++** If the expression is a function, the Expr.iTable is an integer code +++** representing which function. If the expression is an unbound variable +++** marker (a question mark character '?' in the original SQL) then the +++** Expr.iTable holds the index number for that variable. +++** +++** The Expr.pSelect field points to a SELECT statement. The SELECT might +++** be the right operand of an IN operator. Or, if a scalar SELECT appears +++** in an expression the opcode is TK_SELECT and Expr.pSelect is the only +++** operand. +++*/ +++struct Expr { +++ u8 op; /* Operation performed by this node */ +++ u8 dataType; /* Either SQLITE_SO_TEXT or SQLITE_SO_NUM */ +++ u8 iDb; /* Database referenced by this expression */ +++ u8 flags; /* Various flags. See below */ +++ Expr *pLeft, *pRight; /* Left and right subnodes */ +++ ExprList *pList; /* A list of expressions used as function arguments +++ ** or in " IN (useAgg==TRUE, pull +++ ** result from the iAgg-th element of the aggregator */ +++ Select *pSelect; /* When the expression is a sub-select. Also the +++ ** right side of " IN (
and its indices +++** puts VALUES clause expressions onto the stack +++** write the resulting record into
+++** cleanup +++** +++** If the statement is of the form +++** +++** INSERT INTO
SELECT ... +++** +++** And the SELECT clause does not read from
at any time, then +++** the generated code follows this template: +++** +++** goto B +++** A: setup for the SELECT +++** loop over the tables in the SELECT +++** gosub C +++** end loop +++** cleanup after the SELECT +++** goto D +++** B: open write cursor to
and its indices +++** goto A +++** C: insert the select result into
+++** return +++** D: cleanup +++** +++** The third template is used if the insert statement takes its +++** values from a SELECT but the data is being inserted into a table +++** that is also read as part of the SELECT. In the third form, +++** we have to use a intermediate table to store the results of +++** the select. The template is like this: +++** +++** goto B +++** A: setup for the SELECT +++** loop over the tables in the SELECT +++** gosub C +++** end loop +++** cleanup after the SELECT +++** goto D +++** C: insert the select result into the intermediate table +++** return +++** B: open a cursor to an intermediate table +++** goto A +++** D: open write cursor to
and its indices +++** loop over the intermediate table +++** transfer values form intermediate table into
+++** end the loop +++** cleanup +++*/ +++void sqliteInsert( +++ Parse *pParse, /* Parser context */ +++ SrcList *pTabList, /* Name of table into which we are inserting */ +++ ExprList *pList, /* List of values to be inserted */ +++ Select *pSelect, /* A SELECT statement to use as the data source */ +++ IdList *pColumn, /* Column names corresponding to IDLIST. */ +++ int onError /* How to handle constraint errors */ +++){ +++ Table *pTab; /* The table to insert into */ +++ char *zTab; /* Name of the table into which we are inserting */ +++ const char *zDb; /* Name of the database holding this table */ +++ int i, j, idx; /* Loop counters */ +++ Vdbe *v; /* Generate code into this virtual machine */ +++ Index *pIdx; /* For looping over indices of the table */ +++ int nColumn; /* Number of columns in the data */ +++ int base; /* VDBE Cursor number for pTab */ +++ int iCont, iBreak; /* Beginning and end of the loop over srcTab */ +++ sqlite *db; /* The main database structure */ +++ int keyColumn = -1; /* Column that is the INTEGER PRIMARY KEY */ +++ int endOfLoop; /* Label for the end of the insertion loop */ +++ int useTempTable; /* Store SELECT results in intermediate table */ +++ int srcTab; /* Data comes from this temporary cursor if >=0 */ +++ int iSelectLoop; /* Address of code that implements the SELECT */ +++ int iCleanup; /* Address of the cleanup code */ +++ int iInsertBlock; /* Address of the subroutine used to insert data */ +++ int iCntMem; /* Memory cell used for the row counter */ +++ int isView; /* True if attempting to insert into a view */ +++ +++ int row_triggers_exist = 0; /* True if there are FOR EACH ROW triggers */ +++ int before_triggers; /* True if there are BEFORE triggers */ +++ int after_triggers; /* True if there are AFTER triggers */ +++ int newIdx = -1; /* Cursor for the NEW table */ +++ +++ if( pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup; +++ db = pParse->db; +++ +++ /* Locate the table into which we will be inserting new information. +++ */ +++ assert( pTabList->nSrc==1 ); +++ zTab = pTabList->a[0].zName; +++ if( zTab==0 ) goto insert_cleanup; +++ pTab = sqliteSrcListLookup(pParse, pTabList); +++ if( pTab==0 ){ +++ goto insert_cleanup; +++ } +++ assert( pTab->iDbnDb ); +++ zDb = db->aDb[pTab->iDb].zName; +++ if( sqliteAuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) ){ +++ goto insert_cleanup; +++ } +++ +++ /* Ensure that: +++ * (a) the table is not read-only, +++ * (b) that if it is a view then ON INSERT triggers exist +++ */ +++ before_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, +++ TK_BEFORE, TK_ROW, 0); +++ after_triggers = sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, +++ TK_AFTER, TK_ROW, 0); +++ row_triggers_exist = before_triggers || after_triggers; +++ isView = pTab->pSelect!=0; +++ if( sqliteIsReadOnly(pParse, pTab, before_triggers) ){ +++ goto insert_cleanup; +++ } +++ if( pTab==0 ) goto insert_cleanup; +++ +++ /* If pTab is really a view, make sure it has been initialized. +++ */ +++ if( isView && sqliteViewGetColumnNames(pParse, pTab) ){ +++ goto insert_cleanup; +++ } +++ +++ /* Allocate a VDBE +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) goto insert_cleanup; +++ sqliteBeginWriteOperation(pParse, pSelect || row_triggers_exist, pTab->iDb); +++ +++ /* if there are row triggers, allocate a temp table for new.* references. */ +++ if( row_triggers_exist ){ +++ newIdx = pParse->nTab++; +++ } +++ +++ /* Figure out how many columns of data are supplied. If the data +++ ** is coming from a SELECT statement, then this step also generates +++ ** all the code to implement the SELECT statement and invoke a subroutine +++ ** to process each row of the result. (Template 2.) If the SELECT +++ ** statement uses the the table that is being inserted into, then the +++ ** subroutine is also coded here. That subroutine stores the SELECT +++ ** results in a temporary table. (Template 3.) +++ */ +++ if( pSelect ){ +++ /* Data is coming from a SELECT. Generate code to implement that SELECT +++ */ +++ int rc, iInitCode; +++ iInitCode = sqliteVdbeAddOp(v, OP_Goto, 0, 0); +++ iSelectLoop = sqliteVdbeCurrentAddr(v); +++ iInsertBlock = sqliteVdbeMakeLabel(v); +++ rc = sqliteSelect(pParse, pSelect, SRT_Subroutine, iInsertBlock, 0,0,0); +++ if( rc || pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup; +++ iCleanup = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iCleanup); +++ assert( pSelect->pEList ); +++ nColumn = pSelect->pEList->nExpr; +++ +++ /* Set useTempTable to TRUE if the result of the SELECT statement +++ ** should be written into a temporary table. Set to FALSE if each +++ ** row of the SELECT can be written directly into the result table. +++ ** +++ ** A temp table must be used if the table being updated is also one +++ ** of the tables being read by the SELECT statement. Also use a +++ ** temp table in the case of row triggers. +++ */ +++ if( row_triggers_exist ){ +++ useTempTable = 1; +++ }else{ +++ int addr = sqliteVdbeFindOp(v, OP_OpenRead, pTab->tnum); +++ useTempTable = 0; +++ if( addr>0 ){ +++ VdbeOp *pOp = sqliteVdbeGetOp(v, addr-2); +++ if( pOp->opcode==OP_Integer && pOp->p1==pTab->iDb ){ +++ useTempTable = 1; +++ } +++ } +++ } +++ +++ if( useTempTable ){ +++ /* Generate the subroutine that SELECT calls to process each row of +++ ** the result. Store the result in a temporary table +++ */ +++ srcTab = pParse->nTab++; +++ sqliteVdbeResolveLabel(v, iInsertBlock); +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0); +++ sqliteVdbeAddOp(v, OP_NewRecno, srcTab, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, srcTab, 0); +++ sqliteVdbeAddOp(v, OP_Return, 0, 0); +++ +++ /* The following code runs first because the GOTO at the very top +++ ** of the program jumps to it. Create the temporary table, then jump +++ ** back up and execute the SELECT code above. +++ */ +++ sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v)); +++ sqliteVdbeAddOp(v, OP_OpenTemp, srcTab, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop); +++ sqliteVdbeResolveLabel(v, iCleanup); +++ }else{ +++ sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v)); +++ } +++ }else{ +++ /* This is the case if the data for the INSERT is coming from a VALUES +++ ** clause +++ */ +++ SrcList dummy; +++ assert( pList!=0 ); +++ srcTab = -1; +++ useTempTable = 0; +++ assert( pList ); +++ nColumn = pList->nExpr; +++ dummy.nSrc = 0; +++ for(i=0; ia[i].pExpr) ){ +++ goto insert_cleanup; +++ } +++ if( sqliteExprCheck(pParse, pList->a[i].pExpr, 0, 0) ){ +++ goto insert_cleanup; +++ } +++ } +++ } +++ +++ /* Make sure the number of columns in the source data matches the number +++ ** of columns to be inserted into the table. +++ */ +++ if( pColumn==0 && nColumn!=pTab->nCol ){ +++ sqliteErrorMsg(pParse, +++ "table %S has %d columns but %d values were supplied", +++ pTabList, 0, pTab->nCol, nColumn); +++ goto insert_cleanup; +++ } +++ if( pColumn!=0 && nColumn!=pColumn->nId ){ +++ sqliteErrorMsg(pParse, "%d values for %d columns", nColumn, pColumn->nId); +++ goto insert_cleanup; +++ } +++ +++ /* If the INSERT statement included an IDLIST term, then make sure +++ ** all elements of the IDLIST really are columns of the table and +++ ** remember the column indices. +++ ** +++ ** If the table has an INTEGER PRIMARY KEY column and that column +++ ** is named in the IDLIST, then record in the keyColumn variable +++ ** the index into IDLIST of the primary key column. keyColumn is +++ ** the index of the primary key as it appears in IDLIST, not as +++ ** is appears in the original table. (The index of the primary +++ ** key in the original table is pTab->iPKey.) +++ */ +++ if( pColumn ){ +++ for(i=0; inId; i++){ +++ pColumn->a[i].idx = -1; +++ } +++ for(i=0; inId; i++){ +++ for(j=0; jnCol; j++){ +++ if( sqliteStrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){ +++ pColumn->a[i].idx = j; +++ if( j==pTab->iPKey ){ +++ keyColumn = i; +++ } +++ break; +++ } +++ } +++ if( j>=pTab->nCol ){ +++ if( sqliteIsRowid(pColumn->a[i].zName) ){ +++ keyColumn = i; +++ }else{ +++ sqliteErrorMsg(pParse, "table %S has no column named %s", +++ pTabList, 0, pColumn->a[i].zName); +++ pParse->nErr++; +++ goto insert_cleanup; +++ } +++ } +++ } +++ } +++ +++ /* If there is no IDLIST term but the table has an integer primary +++ ** key, the set the keyColumn variable to the primary key column index +++ ** in the original table definition. +++ */ +++ if( pColumn==0 ){ +++ keyColumn = pTab->iPKey; +++ } +++ +++ /* Open the temp table for FOR EACH ROW triggers +++ */ +++ if( row_triggers_exist ){ +++ sqliteVdbeAddOp(v, OP_OpenPseudo, newIdx, 0); +++ } +++ +++ /* Initialize the count of rows to be inserted +++ */ +++ if( db->flags & SQLITE_CountRows ){ +++ iCntMem = pParse->nMem++; +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iCntMem, 1); +++ } +++ +++ /* Open tables and indices if there are no row triggers */ +++ if( !row_triggers_exist ){ +++ base = pParse->nTab; +++ idx = sqliteOpenTableAndIndices(pParse, pTab, base); +++ pParse->nTab += idx; +++ } +++ +++ /* If the data source is a temporary table, then we have to create +++ ** a loop because there might be multiple rows of data. If the data +++ ** source is a subroutine call from the SELECT statement, then we need +++ ** to launch the SELECT statement processing. +++ */ +++ if( useTempTable ){ +++ iBreak = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, srcTab, iBreak); +++ iCont = sqliteVdbeCurrentAddr(v); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop); +++ sqliteVdbeResolveLabel(v, iInsertBlock); +++ } +++ +++ /* Run the BEFORE and INSTEAD OF triggers, if there are any +++ */ +++ endOfLoop = sqliteVdbeMakeLabel(v); +++ if( before_triggers ){ +++ +++ /* build the NEW.* reference row. Note that if there is an INTEGER +++ ** PRIMARY KEY into which a NULL is being inserted, that NULL will be +++ ** translated into a unique ID for the row. But on a BEFORE trigger, +++ ** we do not know what the unique ID will be (because the insert has +++ ** not happened yet) so we substitute a rowid of -1 +++ */ +++ if( keyColumn<0 ){ +++ sqliteVdbeAddOp(v, OP_Integer, -1, 0); +++ }else if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[keyColumn].pExpr); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Integer, -1, 0); +++ sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0); +++ } +++ +++ /* Create the new column data +++ */ +++ for(i=0; inCol; i++){ +++ if( pColumn==0 ){ +++ j = i; +++ }else{ +++ for(j=0; jnId; j++){ +++ if( pColumn->a[j].idx==i ) break; +++ } +++ } +++ if( pColumn && j>=pColumn->nId ){ +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC); +++ }else if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, j); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, nColumn-j-1, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[j].pExpr); +++ } +++ } +++ sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0); +++ +++ /* Fire BEFORE or INSTEAD OF triggers */ +++ if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_BEFORE, pTab, +++ newIdx, -1, onError, endOfLoop) ){ +++ goto insert_cleanup; +++ } +++ } +++ +++ /* If any triggers exists, the opening of tables and indices is deferred +++ ** until now. +++ */ +++ if( row_triggers_exist && !isView ){ +++ base = pParse->nTab; +++ idx = sqliteOpenTableAndIndices(pParse, pTab, base); +++ pParse->nTab += idx; +++ } +++ +++ /* Push the record number for the new entry onto the stack. The +++ ** record number is a randomly generate integer created by NewRecno +++ ** except when the table has an INTEGER PRIMARY KEY column, in which +++ ** case the record number is the same as that column. +++ */ +++ if( !isView ){ +++ if( keyColumn>=0 ){ +++ if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[keyColumn].pExpr); +++ } +++ /* If the PRIMARY KEY expression is NULL, then use OP_NewRecno +++ ** to generate a unique primary key value. +++ */ +++ sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_NewRecno, base, 0); +++ sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_NewRecno, base, 0); +++ } +++ +++ /* Push onto the stack, data for all columns of the new entry, beginning +++ ** with the first column. +++ */ +++ for(i=0; inCol; i++){ +++ if( i==pTab->iPKey ){ +++ /* The value of the INTEGER PRIMARY KEY column is always a NULL. +++ ** Whenever this column is read, the record number will be substituted +++ ** in its place. So will fill this column with a NULL to avoid +++ ** taking up data space with information that will never be used. */ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ continue; +++ } +++ if( pColumn==0 ){ +++ j = i; +++ }else{ +++ for(j=0; jnId; j++){ +++ if( pColumn->a[j].idx==i ) break; +++ } +++ } +++ if( pColumn && j>=pColumn->nId ){ +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC); +++ }else if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Column, srcTab, j); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Dup, i+nColumn-j, 1); +++ }else{ +++ sqliteExprCode(pParse, pList->a[j].pExpr); +++ } +++ } +++ +++ /* Generate code to check constraints and generate index keys and +++ ** do the insertion. +++ */ +++ sqliteGenerateConstraintChecks(pParse, pTab, base, 0, keyColumn>=0, +++ 0, onError, endOfLoop); +++ sqliteCompleteInsertion(pParse, pTab, base, 0,0,0, +++ after_triggers ? newIdx : -1); +++ } +++ +++ /* Update the count of rows that are inserted +++ */ +++ if( (db->flags & SQLITE_CountRows)!=0 ){ +++ sqliteVdbeAddOp(v, OP_MemIncr, iCntMem, 0); +++ } +++ +++ if( row_triggers_exist ){ +++ /* Close all tables opened */ +++ if( !isView ){ +++ sqliteVdbeAddOp(v, OP_Close, base, 0); +++ for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){ +++ sqliteVdbeAddOp(v, OP_Close, idx+base, 0); +++ } +++ } +++ +++ /* Code AFTER triggers */ +++ if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_AFTER, pTab, newIdx, -1, +++ onError, endOfLoop) ){ +++ goto insert_cleanup; +++ } +++ } +++ +++ /* The bottom of the loop, if the data source is a SELECT statement +++ */ +++ sqliteVdbeResolveLabel(v, endOfLoop); +++ if( useTempTable ){ +++ sqliteVdbeAddOp(v, OP_Next, srcTab, iCont); +++ sqliteVdbeResolveLabel(v, iBreak); +++ sqliteVdbeAddOp(v, OP_Close, srcTab, 0); +++ }else if( pSelect ){ +++ sqliteVdbeAddOp(v, OP_Pop, nColumn, 0); +++ sqliteVdbeAddOp(v, OP_Return, 0, 0); +++ sqliteVdbeResolveLabel(v, iCleanup); +++ } +++ +++ if( !row_triggers_exist ){ +++ /* Close all tables opened */ +++ sqliteVdbeAddOp(v, OP_Close, base, 0); +++ for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){ +++ sqliteVdbeAddOp(v, OP_Close, idx+base, 0); +++ } +++ } +++ +++ sqliteVdbeAddOp(v, OP_SetCounts, 0, 0); +++ sqliteEndWriteOperation(pParse); +++ +++ /* +++ ** Return the number of rows inserted. +++ */ +++ if( db->flags & SQLITE_CountRows ){ +++ sqliteVdbeOp3(v, OP_ColumnName, 0, 1, "rows inserted", P3_STATIC); +++ sqliteVdbeAddOp(v, OP_MemLoad, iCntMem, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 1, 0); +++ } +++ +++insert_cleanup: +++ sqliteSrcListDelete(pTabList); +++ if( pList ) sqliteExprListDelete(pList); +++ if( pSelect ) sqliteSelectDelete(pSelect); +++ sqliteIdListDelete(pColumn); +++} +++ +++/* +++** Generate code to do a constraint check prior to an INSERT or an UPDATE. +++** +++** When this routine is called, the stack contains (from bottom to top) +++** the following values: +++** +++** 1. The recno of the row to be updated before the update. This +++** value is omitted unless we are doing an UPDATE that involves a +++** change to the record number. +++** +++** 2. The recno of the row after the update. +++** +++** 3. The data in the first column of the entry after the update. +++** +++** i. Data from middle columns... +++** +++** N. The data in the last column of the entry after the update. +++** +++** The old recno shown as entry (1) above is omitted unless both isUpdate +++** and recnoChng are 1. isUpdate is true for UPDATEs and false for +++** INSERTs and recnoChng is true if the record number is being changed. +++** +++** The code generated by this routine pushes additional entries onto +++** the stack which are the keys for new index entries for the new record. +++** The order of index keys is the same as the order of the indices on +++** the pTable->pIndex list. A key is only created for index i if +++** aIdxUsed!=0 and aIdxUsed[i]!=0. +++** +++** This routine also generates code to check constraints. NOT NULL, +++** CHECK, and UNIQUE constraints are all checked. If a constraint fails, +++** then the appropriate action is performed. There are five possible +++** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. +++** +++** Constraint type Action What Happens +++** --------------- ---------- ---------------------------------------- +++** any ROLLBACK The current transaction is rolled back and +++** sqlite_exec() returns immediately with a +++** return code of SQLITE_CONSTRAINT. +++** +++** any ABORT Back out changes from the current command +++** only (do not do a complete rollback) then +++** cause sqlite_exec() to return immediately +++** with SQLITE_CONSTRAINT. +++** +++** any FAIL Sqlite_exec() returns immediately with a +++** return code of SQLITE_CONSTRAINT. The +++** transaction is not rolled back and any +++** prior changes are retained. +++** +++** any IGNORE The record number and data is popped from +++** the stack and there is an immediate jump +++** to label ignoreDest. +++** +++** NOT NULL REPLACE The NULL value is replace by the default +++** value for that column. If the default value +++** is NULL, the action is the same as ABORT. +++** +++** UNIQUE REPLACE The other row that conflicts with the row +++** being inserted is removed. +++** +++** CHECK REPLACE Illegal. The results in an exception. +++** +++** Which action to take is determined by the overrideError parameter. +++** Or if overrideError==OE_Default, then the pParse->onError parameter +++** is used. Or if pParse->onError==OE_Default then the onError value +++** for the constraint is used. +++** +++** The calling routine must open a read/write cursor for pTab with +++** cursor number "base". All indices of pTab must also have open +++** read/write cursors with cursor number base+i for the i-th cursor. +++** Except, if there is no possibility of a REPLACE action then +++** cursors do not need to be open for indices where aIdxUsed[i]==0. +++** +++** If the isUpdate flag is true, it means that the "base" cursor is +++** initially pointing to an entry that is being updated. The isUpdate +++** flag causes extra code to be generated so that the "base" cursor +++** is still pointing at the same entry after the routine returns. +++** Without the isUpdate flag, the "base" cursor might be moved. +++*/ +++void sqliteGenerateConstraintChecks( +++ Parse *pParse, /* The parser context */ +++ Table *pTab, /* the table into which we are inserting */ +++ int base, /* Index of a read/write cursor pointing at pTab */ +++ char *aIdxUsed, /* Which indices are used. NULL means all are used */ +++ int recnoChng, /* True if the record number will change */ +++ int isUpdate, /* True for UPDATE, False for INSERT */ +++ int overrideError, /* Override onError to this if not OE_Default */ +++ int ignoreDest /* Jump to this label on an OE_Ignore resolution */ +++){ +++ int i; +++ Vdbe *v; +++ int nCol; +++ int onError; +++ int addr; +++ int extra; +++ int iCur; +++ Index *pIdx; +++ int seenReplace = 0; +++ int jumpInst1, jumpInst2; +++ int contAddr; +++ int hasTwoRecnos = (isUpdate && recnoChng); +++ +++ v = sqliteGetVdbe(pParse); +++ assert( v!=0 ); +++ assert( pTab->pSelect==0 ); /* This table is not a VIEW */ +++ nCol = pTab->nCol; +++ +++ /* Test all NOT NULL constraints. +++ */ +++ for(i=0; iiPKey ){ +++ continue; +++ } +++ onError = pTab->aCol[i].notNull; +++ if( onError==OE_None ) continue; +++ if( overrideError!=OE_Default ){ +++ onError = overrideError; +++ }else if( pParse->db->onError!=OE_Default ){ +++ onError = pParse->db->onError; +++ }else if( onError==OE_Default ){ +++ onError = OE_Abort; +++ } +++ if( onError==OE_Replace && pTab->aCol[i].zDflt==0 ){ +++ onError = OE_Abort; +++ } +++ sqliteVdbeAddOp(v, OP_Dup, nCol-1-i, 1); +++ addr = sqliteVdbeAddOp(v, OP_NotNull, 1, 0); +++ switch( onError ){ +++ case OE_Rollback: +++ case OE_Abort: +++ case OE_Fail: { +++ char *zMsg = 0; +++ sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError); +++ sqliteSetString(&zMsg, pTab->zName, ".", pTab->aCol[i].zName, +++ " may not be NULL", (char*)0); +++ sqliteVdbeChangeP3(v, -1, zMsg, P3_DYNAMIC); +++ break; +++ } +++ case OE_Ignore: { +++ sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest); +++ break; +++ } +++ case OE_Replace: { +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zDflt, P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Push, nCol-i, 0); +++ break; +++ } +++ default: assert(0); +++ } +++ sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v)); +++ } +++ +++ /* Test all CHECK constraints +++ */ +++ /**** TBD ****/ +++ +++ /* If we have an INTEGER PRIMARY KEY, make sure the primary key +++ ** of the new record does not previously exist. Except, if this +++ ** is an UPDATE and the primary key is not changing, that is OK. +++ */ +++ if( recnoChng ){ +++ onError = pTab->keyConf; +++ if( overrideError!=OE_Default ){ +++ onError = overrideError; +++ }else if( pParse->db->onError!=OE_Default ){ +++ onError = pParse->db->onError; +++ }else if( onError==OE_Default ){ +++ onError = OE_Abort; +++ } +++ +++ if( isUpdate ){ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); +++ sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); +++ jumpInst1 = sqliteVdbeAddOp(v, OP_Eq, 0, 0); +++ } +++ sqliteVdbeAddOp(v, OP_Dup, nCol, 1); +++ jumpInst2 = sqliteVdbeAddOp(v, OP_NotExists, base, 0); +++ switch( onError ){ +++ default: { +++ onError = OE_Abort; +++ /* Fall thru into the next case */ +++ } +++ case OE_Rollback: +++ case OE_Abort: +++ case OE_Fail: { +++ sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, +++ "PRIMARY KEY must be unique", P3_STATIC); +++ break; +++ } +++ case OE_Replace: { +++ sqliteGenerateRowIndexDelete(pParse->db, v, pTab, base, 0); +++ if( isUpdate ){ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+hasTwoRecnos, 1); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ seenReplace = 1; +++ break; +++ } +++ case OE_Ignore: { +++ assert( seenReplace==0 ); +++ sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest); +++ break; +++ } +++ } +++ contAddr = sqliteVdbeCurrentAddr(v); +++ sqliteVdbeChangeP2(v, jumpInst2, contAddr); +++ if( isUpdate ){ +++ sqliteVdbeChangeP2(v, jumpInst1, contAddr); +++ sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ } +++ +++ /* Test all UNIQUE constraints by creating entries for each UNIQUE +++ ** index and making sure that duplicate entries do not already exist. +++ ** Add the new records to the indices as we go. +++ */ +++ extra = -1; +++ for(iCur=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, iCur++){ +++ if( aIdxUsed && aIdxUsed[iCur]==0 ) continue; /* Skip unused indices */ +++ extra++; +++ +++ /* Create a key for accessing the index entry */ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+extra, 1); +++ for(i=0; inColumn; i++){ +++ int idx = pIdx->aiColumn[i]; +++ if( idx==pTab->iPKey ){ +++ sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol+1, 1); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol-idx, 1); +++ } +++ } +++ jumpInst1 = sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0); +++ if( pParse->db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx); +++ +++ /* Find out what action to take in case there is an indexing conflict */ +++ onError = pIdx->onError; +++ if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ +++ if( overrideError!=OE_Default ){ +++ onError = overrideError; +++ }else if( pParse->db->onError!=OE_Default ){ +++ onError = pParse->db->onError; +++ }else if( onError==OE_Default ){ +++ onError = OE_Abort; +++ } +++ if( seenReplace ){ +++ if( onError==OE_Ignore ) onError = OE_Replace; +++ else if( onError==OE_Fail ) onError = OE_Abort; +++ } +++ +++ +++ /* Check to see if the new index entry will be unique */ +++ sqliteVdbeAddOp(v, OP_Dup, extra+nCol+1+hasTwoRecnos, 1); +++ jumpInst2 = sqliteVdbeAddOp(v, OP_IsUnique, base+iCur+1, 0); +++ +++ /* Generate code that executes if the new index entry is not unique */ +++ switch( onError ){ +++ case OE_Rollback: +++ case OE_Abort: +++ case OE_Fail: { +++ int j, n1, n2; +++ char zErrMsg[200]; +++ strcpy(zErrMsg, pIdx->nColumn>1 ? "columns " : "column "); +++ n1 = strlen(zErrMsg); +++ for(j=0; jnColumn && n1aCol[pIdx->aiColumn[j]].zName; +++ n2 = strlen(zCol); +++ if( j>0 ){ +++ strcpy(&zErrMsg[n1], ", "); +++ n1 += 2; +++ } +++ if( n1+n2>sizeof(zErrMsg)-30 ){ +++ strcpy(&zErrMsg[n1], "..."); +++ n1 += 3; +++ break; +++ }else{ +++ strcpy(&zErrMsg[n1], zCol); +++ n1 += n2; +++ } +++ } +++ strcpy(&zErrMsg[n1], +++ pIdx->nColumn>1 ? " are not unique" : " is not unique"); +++ sqliteVdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, zErrMsg, 0); +++ break; +++ } +++ case OE_Ignore: { +++ assert( seenReplace==0 ); +++ sqliteVdbeAddOp(v, OP_Pop, nCol+extra+3+hasTwoRecnos, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest); +++ break; +++ } +++ case OE_Replace: { +++ sqliteGenerateRowDelete(pParse->db, v, pTab, base, 0); +++ if( isUpdate ){ +++ sqliteVdbeAddOp(v, OP_Dup, nCol+extra+1+hasTwoRecnos, 1); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ seenReplace = 1; +++ break; +++ } +++ default: assert(0); +++ } +++ contAddr = sqliteVdbeCurrentAddr(v); +++#if NULL_DISTINCT_FOR_UNIQUE +++ sqliteVdbeChangeP2(v, jumpInst1, contAddr); +++#endif +++ sqliteVdbeChangeP2(v, jumpInst2, contAddr); +++ } +++} +++ +++/* +++** This routine generates code to finish the INSERT or UPDATE operation +++** that was started by a prior call to sqliteGenerateConstraintChecks. +++** The stack must contain keys for all active indices followed by data +++** and the recno for the new entry. This routine creates the new +++** entries in all indices and in the main table. +++** +++** The arguments to this routine should be the same as the first six +++** arguments to sqliteGenerateConstraintChecks. +++*/ +++void sqliteCompleteInsertion( +++ Parse *pParse, /* The parser context */ +++ Table *pTab, /* the table into which we are inserting */ +++ int base, /* Index of a read/write cursor pointing at pTab */ +++ char *aIdxUsed, /* Which indices are used. NULL means all are used */ +++ int recnoChng, /* True if the record number will change */ +++ int isUpdate, /* True for UPDATE, False for INSERT */ +++ int newIdx /* Index of NEW table for triggers. -1 if none */ +++){ +++ int i; +++ Vdbe *v; +++ int nIdx; +++ Index *pIdx; +++ +++ v = sqliteGetVdbe(pParse); +++ assert( v!=0 ); +++ assert( pTab->pSelect==0 ); /* This table is not a VIEW */ +++ for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){} +++ for(i=nIdx-1; i>=0; i--){ +++ if( aIdxUsed && aIdxUsed[i]==0 ) continue; +++ sqliteVdbeAddOp(v, OP_IdxPut, base+i+1, 0); +++ } +++ sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0); +++ if( newIdx>=0 ){ +++ sqliteVdbeAddOp(v, OP_Dup, 1, 0); +++ sqliteVdbeAddOp(v, OP_Dup, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0); +++ } +++ sqliteVdbeAddOp(v, OP_PutIntKey, base, +++ (pParse->trigStack?0:OPFLAG_NCHANGE) | +++ (isUpdate?0:OPFLAG_LASTROWID) | OPFLAG_CSCHANGE); +++ if( isUpdate && recnoChng ){ +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ } +++} +++ +++/* +++** Generate code that will open write cursors for a table and for all +++** indices of that table. The "base" parameter is the cursor number used +++** for the table. Indices are opened on subsequent cursors. +++** +++** Return the total number of cursors opened. This is always at least +++** 1 (for the main table) plus more for each cursor. +++*/ +++int sqliteOpenTableAndIndices(Parse *pParse, Table *pTab, int base){ +++ int i; +++ Index *pIdx; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ assert( v!=0 ); +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenWrite, base, pTab->tnum, pTab->zName, P3_STATIC); +++ for(i=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){ +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenWrite, i+base, pIdx->tnum, pIdx->zName, P3_STATIC); +++ } +++ return i; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/libsqlite.dsp ++@@ -0,0 +1,353 @@ +++# Microsoft Developer Studio Project File - Name="libsqlite" - Package Owner=<4> +++# Microsoft Developer Studio Generated Build File, Format Version 6.00 +++# ** DO NOT EDIT ** +++ +++# TARGTYPE "Win32 (x86) Static Library" 0x0104 +++ +++CFG=libsqlite - Win32 Debug_TS +++!MESSAGE This is not a valid makefile. To build this project using NMAKE, +++!MESSAGE use the Export Makefile command and run +++!MESSAGE +++!MESSAGE NMAKE /f "libsqlite.mak". +++!MESSAGE +++!MESSAGE You can specify a configuration when running NMAKE +++!MESSAGE by defining the macro CFG on the command line. For example: +++!MESSAGE +++!MESSAGE NMAKE /f "libsqlite.mak" CFG="libsqlite - Win32 Debug_TS" +++!MESSAGE +++!MESSAGE Possible choices for configuration are: +++!MESSAGE +++!MESSAGE "libsqlite - Win32 Debug_TS" (based on "Win32 (x86) Static Library") +++!MESSAGE "libsqlite - Win32 Release_TS" (based on "Win32 (x86) Static Library") +++!MESSAGE "libsqlite - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library") +++!MESSAGE +++ +++# Begin Project +++# PROP AllowPerConfigDependencies 0 +++# PROP Scc_ProjName "" +++# PROP Scc_LocalPath "" +++CPP=cl.exe +++RSC=rc.exe +++ +++!IF "$(CFG)" == "libsqlite - Win32 Debug_TS" +++ +++# PROP BASE Use_MFC 0 +++# PROP BASE Use_Debug_Libraries 1 +++# PROP BASE Output_Dir "Debug_TS" +++# PROP BASE Intermediate_Dir "Debug_TS" +++# PROP BASE Target_Dir "" +++# PROP Use_MFC 0 +++# PROP Use_Debug_Libraries 1 +++# PROP Output_Dir "..\..\Debug_TS" +++# PROP Intermediate_Dir "..\..\Debug_TS" +++# PROP Target_Dir "" +++# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +++# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /GZ /c +++# ADD BASE RSC /l 0x406 /d "_DEBUG" +++# ADD RSC /l 0x406 /d "_DEBUG" +++BSC32=bscmake.exe +++# ADD BASE BSC32 /nologo +++# ADD BSC32 /nologo +++LIB32=link.exe -lib +++# ADD BASE LIB32 /nologo +++# ADD LIB32 /nologo +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" +++ +++# PROP BASE Use_MFC 0 +++# PROP BASE Use_Debug_Libraries 0 +++# PROP BASE Output_Dir "Release_TS" +++# PROP BASE Intermediate_Dir "Release_TS" +++# PROP BASE Target_Dir "" +++# PROP Use_MFC 0 +++# PROP Use_Debug_Libraries 0 +++# PROP Output_Dir "..\..\Release_TS" +++# PROP Intermediate_Dir "..\..\Release_TS" +++# PROP Target_Dir "" +++# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +++# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +++# ADD BASE RSC /l 0x406 /d "NDEBUG" +++# ADD RSC /l 0x406 /d "NDEBUG" +++BSC32=bscmake.exe +++# ADD BASE BSC32 /nologo +++# ADD BSC32 /nologo +++LIB32=link.exe -lib +++# ADD BASE LIB32 /nologo +++# ADD LIB32 /nologo +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" +++ +++# PROP BASE Use_MFC 0 +++# PROP BASE Use_Debug_Libraries 0 +++# PROP BASE Output_Dir "libsqlite___Win32_Release_TSDbg" +++# PROP BASE Intermediate_Dir "libsqlite___Win32_Release_TSDbg" +++# PROP BASE Target_Dir "" +++# PROP Use_MFC 0 +++# PROP Use_Debug_Libraries 0 +++# PROP Output_Dir "..\..\Release_TSDbg" +++# PROP Intermediate_Dir "..\..\Release_TSDbg" +++# PROP Target_Dir "" +++# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +++# ADD CPP /nologo /MD /W3 /GX /Zi /Od /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +++# ADD BASE RSC /l 0x406 /d "NDEBUG" +++# ADD RSC /l 0x406 /d "NDEBUG" +++BSC32=bscmake.exe +++# ADD BASE BSC32 /nologo +++# ADD BSC32 /nologo +++LIB32=link.exe -lib +++# ADD BASE LIB32 /nologo /out:"Release_TS\libsqlite.lib" +++# ADD LIB32 /nologo +++ +++!ENDIF +++ +++# Begin Target +++ +++# Name "libsqlite - Win32 Debug_TS" +++# Name "libsqlite - Win32 Release_TS" +++# Name "libsqlite - Win32 Release_TSDbg" +++# Begin Group "Source Files" +++ +++# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +++# Begin Source File +++ +++SOURCE=attach.c +++# End Source File +++# Begin Source File +++ +++SOURCE=auth.c +++# End Source File +++# Begin Source File +++ +++SOURCE=btree.c +++# End Source File +++# Begin Source File +++ +++SOURCE=btree_rb.c +++# End Source File +++# Begin Source File +++ +++SOURCE=build.c +++# End Source File +++# Begin Source File +++ +++SOURCE=copy.c +++# End Source File +++# Begin Source File +++ +++SOURCE=.\date.c +++# End Source File +++# Begin Source File +++ +++SOURCE=delete.c +++# End Source File +++# Begin Source File +++ +++SOURCE=encode.c +++# End Source File +++# Begin Source File +++ +++SOURCE=expr.c +++# End Source File +++# Begin Source File +++ +++SOURCE=func.c +++# End Source File +++# Begin Source File +++ +++SOURCE=hash.c +++# End Source File +++# Begin Source File +++ +++SOURCE=insert.c +++# End Source File +++# Begin Source File +++ +++SOURCE=main.c +++# End Source File +++# Begin Source File +++ +++SOURCE=opcodes.c +++# End Source File +++# Begin Source File +++ +++SOURCE=os.c +++# End Source File +++# Begin Source File +++ +++SOURCE=pager.c +++# End Source File +++# Begin Source File +++ +++SOURCE=parse.c +++# End Source File +++# Begin Source File +++ +++SOURCE=pragma.c +++# End Source File +++# Begin Source File +++ +++SOURCE=printf.c +++# End Source File +++# Begin Source File +++ +++SOURCE=random.c +++# End Source File +++# Begin Source File +++ +++SOURCE=select.c +++# End Source File +++# Begin Source File +++ +++SOURCE=table.c +++# End Source File +++# Begin Source File +++ +++SOURCE=tokenize.c +++# End Source File +++# Begin Source File +++ +++SOURCE=trigger.c +++# End Source File +++# Begin Source File +++ +++SOURCE=update.c +++# End Source File +++# Begin Source File +++ +++SOURCE=util.c +++# End Source File +++# Begin Source File +++ +++SOURCE=vacuum.c +++# End Source File +++# Begin Source File +++ +++SOURCE=vdbe.c +++# End Source File +++# Begin Source File +++ +++SOURCE=.\vdbeaux.c +++# End Source File +++# Begin Source File +++ +++SOURCE=where.c +++# End Source File +++# End Group +++# Begin Group "Header Files" +++ +++# PROP Default_Filter "h;hpp;hxx;hm;inl" +++# Begin Source File +++ +++SOURCE=btree.h +++# End Source File +++# Begin Source File +++ +++SOURCE=config_static.w32.h +++ +++!IF "$(CFG)" == "libsqlite - Win32 Debug_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=config_static.w32.h +++ +++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\config.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=config_static.w32.h +++ +++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\config.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=config_static.w32.h +++ +++"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\config.h +++ +++# End Custom Build +++ +++!ENDIF +++ +++# End Source File +++# Begin Source File +++ +++SOURCE=hash.h +++# End Source File +++# Begin Source File +++ +++SOURCE=opcodes.h +++# End Source File +++# Begin Source File +++ +++SOURCE=os.h +++# End Source File +++# Begin Source File +++ +++SOURCE=pager.h +++# End Source File +++# Begin Source File +++ +++SOURCE=parse.h +++# End Source File +++# Begin Source File +++ +++SOURCE=sqlite.w32.h +++ +++!IF "$(CFG)" == "libsqlite - Win32 Debug_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=sqlite.w32.h +++ +++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\sqlite.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=sqlite.w32.h +++ +++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\sqlite.h +++ +++# End Custom Build +++ +++!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" +++ +++# Begin Custom Build +++InputDir=. +++InputPath=sqlite.w32.h +++ +++"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +++ copy $(InputPath) $(InputDir)\sqlite.h +++ +++# End Custom Build +++ +++!ENDIF +++ +++# End Source File +++# Begin Source File +++ +++SOURCE=sqliteInt.h +++# End Source File +++# Begin Source File +++ +++SOURCE=vdbe.h +++# End Source File +++# End Group +++# End Target +++# End Project ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/main.c ++@@ -0,0 +1,1143 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** Main file for the SQLite library. The routines in this file +++** implement the programmer interface to the library. Routines in +++** other files are for internal use by SQLite and should not be +++** accessed by users of the library. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include "os.h" +++#include +++ +++/* +++** A pointer to this structure is used to communicate information +++** from sqliteInit into the sqliteInitCallback. +++*/ +++typedef struct { +++ sqlite *db; /* The database being initialized */ +++ char **pzErrMsg; /* Error message stored here */ +++} InitData; +++ +++/* +++** Fill the InitData structure with an error message that indicates +++** that the database is corrupt. +++*/ +++static void corruptSchema(InitData *pData, const char *zExtra){ +++ sqliteSetString(pData->pzErrMsg, "malformed database schema", +++ zExtra!=0 && zExtra[0]!=0 ? " - " : (char*)0, zExtra, (char*)0); +++} +++ +++/* +++** This is the callback routine for the code that initializes the +++** database. See sqliteInit() below for additional information. +++** +++** Each callback contains the following information: +++** +++** argv[0] = "file-format" or "schema-cookie" or "table" or "index" +++** argv[1] = table or index name or meta statement type. +++** argv[2] = root page number for table or index. NULL for meta. +++** argv[3] = SQL text for a CREATE TABLE or CREATE INDEX statement. +++** argv[4] = "1" for temporary files, "0" for main database, "2" or more +++** for auxiliary database files. +++** +++*/ +++static +++int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){ +++ InitData *pData = (InitData*)pInit; +++ int nErr = 0; +++ +++ assert( argc==5 ); +++ if( argv==0 ) return 0; /* Might happen if EMPTY_RESULT_CALLBACKS are on */ +++ if( argv[0]==0 ){ +++ corruptSchema(pData, 0); +++ return 1; +++ } +++ switch( argv[0][0] ){ +++ case 'v': +++ case 'i': +++ case 't': { /* CREATE TABLE, CREATE INDEX, or CREATE VIEW statements */ +++ sqlite *db = pData->db; +++ if( argv[2]==0 || argv[4]==0 ){ +++ corruptSchema(pData, 0); +++ return 1; +++ } +++ if( argv[3] && argv[3][0] ){ +++ /* Call the parser to process a CREATE TABLE, INDEX or VIEW. +++ ** But because db->init.busy is set to 1, no VDBE code is generated +++ ** or executed. All the parser does is build the internal data +++ ** structures that describe the table, index, or view. +++ */ +++ char *zErr; +++ assert( db->init.busy ); +++ db->init.iDb = atoi(argv[4]); +++ assert( db->init.iDb>=0 && db->init.iDbnDb ); +++ db->init.newTnum = atoi(argv[2]); +++ if( sqlite_exec(db, argv[3], 0, 0, &zErr) ){ +++ corruptSchema(pData, zErr); +++ sqlite_freemem(zErr); +++ } +++ db->init.iDb = 0; +++ }else{ +++ /* If the SQL column is blank it means this is an index that +++ ** was created to be the PRIMARY KEY or to fulfill a UNIQUE +++ ** constraint for a CREATE TABLE. The index should have already +++ ** been created when we processed the CREATE TABLE. All we have +++ ** to do here is record the root page number for that index. +++ */ +++ int iDb; +++ Index *pIndex; +++ +++ iDb = atoi(argv[4]); +++ assert( iDb>=0 && iDbnDb ); +++ pIndex = sqliteFindIndex(db, argv[1], db->aDb[iDb].zName); +++ if( pIndex==0 || pIndex->tnum!=0 ){ +++ /* This can occur if there exists an index on a TEMP table which +++ ** has the same name as another index on a permanent index. Since +++ ** the permanent table is hidden by the TEMP table, we can also +++ ** safely ignore the index on the permanent table. +++ */ +++ /* Do Nothing */; +++ }else{ +++ pIndex->tnum = atoi(argv[2]); +++ } +++ } +++ break; +++ } +++ default: { +++ /* This can not happen! */ +++ nErr = 1; +++ assert( nErr==0 ); +++ } +++ } +++ return nErr; +++} +++ +++/* +++** This is a callback procedure used to reconstruct a table. The +++** name of the table to be reconstructed is passed in as argv[0]. +++** +++** This routine is used to automatically upgrade a database from +++** format version 1 or 2 to version 3. The correct operation of +++** this routine relys on the fact that no indices are used when +++** copying a table out to a temporary file. +++** +++** The change from version 2 to version 3 occurred between SQLite +++** version 2.5.6 and 2.6.0 on 2002-July-18. +++*/ +++static +++int upgrade_3_callback(void *pInit, int argc, char **argv, char **NotUsed){ +++ InitData *pData = (InitData*)pInit; +++ int rc; +++ Table *pTab; +++ Trigger *pTrig; +++ char *zErr = 0; +++ +++ pTab = sqliteFindTable(pData->db, argv[0], 0); +++ assert( pTab!=0 ); +++ assert( sqliteStrICmp(pTab->zName, argv[0])==0 ); +++ if( pTab ){ +++ pTrig = pTab->pTrigger; +++ pTab->pTrigger = 0; /* Disable all triggers before rebuilding the table */ +++ } +++ rc = sqlite_exec_printf(pData->db, +++ "CREATE TEMP TABLE sqlite_x AS SELECT * FROM '%q'; " +++ "DELETE FROM '%q'; " +++ "INSERT INTO '%q' SELECT * FROM sqlite_x; " +++ "DROP TABLE sqlite_x;", +++ 0, 0, &zErr, argv[0], argv[0], argv[0]); +++ if( zErr ){ +++ if( *pData->pzErrMsg ) sqlite_freemem(*pData->pzErrMsg); +++ *pData->pzErrMsg = zErr; +++ } +++ +++ /* If an error occurred in the SQL above, then the transaction will +++ ** rollback which will delete the internal symbol tables. This will +++ ** cause the structure that pTab points to be deleted. In case that +++ ** happened, we need to refetch pTab. +++ */ +++ pTab = sqliteFindTable(pData->db, argv[0], 0); +++ if( pTab ){ +++ assert( sqliteStrICmp(pTab->zName, argv[0])==0 ); +++ pTab->pTrigger = pTrig; /* Re-enable triggers */ +++ } +++ return rc!=SQLITE_OK; +++} +++ +++ +++ +++/* +++** Attempt to read the database schema and initialize internal +++** data structures for a single database file. The index of the +++** database file is given by iDb. iDb==0 is used for the main +++** database. iDb==1 should never be used. iDb>=2 is used for +++** auxiliary databases. Return one of the SQLITE_ error codes to +++** indicate success or failure. +++*/ +++static int sqliteInitOne(sqlite *db, int iDb, char **pzErrMsg){ +++ int rc; +++ BtCursor *curMain; +++ int size; +++ Table *pTab; +++ char const *azArg[6]; +++ char zDbNum[30]; +++ int meta[SQLITE_N_BTREE_META]; +++ InitData initData; +++ char const *zMasterSchema; +++ char const *zMasterName; +++ char *zSql = 0; +++ +++ /* +++ ** The master database table has a structure like this +++ */ +++ static char master_schema[] = +++ "CREATE TABLE sqlite_master(\n" +++ " type text,\n" +++ " name text,\n" +++ " tbl_name text,\n" +++ " rootpage integer,\n" +++ " sql text\n" +++ ")" +++ ; +++ static char temp_master_schema[] = +++ "CREATE TEMP TABLE sqlite_temp_master(\n" +++ " type text,\n" +++ " name text,\n" +++ " tbl_name text,\n" +++ " rootpage integer,\n" +++ " sql text\n" +++ ")" +++ ; +++ +++ assert( iDb>=0 && iDbnDb ); +++ +++ /* zMasterSchema and zInitScript are set to point at the master schema +++ ** and initialisation script appropriate for the database being +++ ** initialised. zMasterName is the name of the master table. +++ */ +++ if( iDb==1 ){ +++ zMasterSchema = temp_master_schema; +++ zMasterName = TEMP_MASTER_NAME; +++ }else{ +++ zMasterSchema = master_schema; +++ zMasterName = MASTER_NAME; +++ } +++ +++ /* Construct the schema table. +++ */ +++ sqliteSafetyOff(db); +++ azArg[0] = "table"; +++ azArg[1] = zMasterName; +++ azArg[2] = "2"; +++ azArg[3] = zMasterSchema; +++ sprintf(zDbNum, "%d", iDb); +++ azArg[4] = zDbNum; +++ azArg[5] = 0; +++ initData.db = db; +++ initData.pzErrMsg = pzErrMsg; +++ sqliteInitCallback(&initData, 5, (char **)azArg, 0); +++ pTab = sqliteFindTable(db, zMasterName, db->aDb[iDb].zName); +++ if( pTab ){ +++ pTab->readOnly = 1; +++ }else{ +++ return SQLITE_NOMEM; +++ } +++ sqliteSafetyOn(db); +++ +++ /* Create a cursor to hold the database open +++ */ +++ if( db->aDb[iDb].pBt==0 ) return SQLITE_OK; +++ rc = sqliteBtreeCursor(db->aDb[iDb].pBt, 2, 0, &curMain); +++ if( rc ){ +++ sqliteSetString(pzErrMsg, sqlite_error_string(rc), (char*)0); +++ return rc; +++ } +++ +++ /* Get the database meta information +++ */ +++ rc = sqliteBtreeGetMeta(db->aDb[iDb].pBt, meta); +++ if( rc ){ +++ sqliteSetString(pzErrMsg, sqlite_error_string(rc), (char*)0); +++ sqliteBtreeCloseCursor(curMain); +++ return rc; +++ } +++ db->aDb[iDb].schema_cookie = meta[1]; +++ if( iDb==0 ){ +++ db->next_cookie = meta[1]; +++ db->file_format = meta[2]; +++ size = meta[3]; +++ if( size==0 ){ size = MAX_PAGES; } +++ db->cache_size = size; +++ db->safety_level = meta[4]; +++ if( meta[6]>0 && meta[6]<=2 && db->temp_store==0 ){ +++ db->temp_store = meta[6]; +++ } +++ if( db->safety_level==0 ) db->safety_level = 2; +++ +++ /* +++ ** file_format==1 Version 2.1.0. +++ ** file_format==2 Version 2.2.0. Add support for INTEGER PRIMARY KEY. +++ ** file_format==3 Version 2.6.0. Fix empty-string index bug. +++ ** file_format==4 Version 2.7.0. Add support for separate numeric and +++ ** text datatypes. +++ */ +++ if( db->file_format==0 ){ +++ /* This happens if the database was initially empty */ +++ db->file_format = 4; +++ }else if( db->file_format>4 ){ +++ sqliteBtreeCloseCursor(curMain); +++ sqliteSetString(pzErrMsg, "unsupported file format", (char*)0); +++ return SQLITE_ERROR; +++ } +++ }else if( iDb!=1 && (db->file_format!=meta[2] || db->file_format<4) ){ +++ assert( db->file_format>=4 ); +++ if( meta[2]==0 ){ +++ sqliteSetString(pzErrMsg, "cannot attach empty database: ", +++ db->aDb[iDb].zName, (char*)0); +++ }else{ +++ sqliteSetString(pzErrMsg, "incompatible file format in auxiliary " +++ "database: ", db->aDb[iDb].zName, (char*)0); +++ } +++ sqliteBtreeClose(db->aDb[iDb].pBt); +++ db->aDb[iDb].pBt = 0; +++ return SQLITE_FORMAT; +++ } +++ sqliteBtreeSetCacheSize(db->aDb[iDb].pBt, db->cache_size); +++ sqliteBtreeSetSafetyLevel(db->aDb[iDb].pBt, meta[4]==0 ? 2 : meta[4]); +++ +++ /* Read the schema information out of the schema tables +++ */ +++ assert( db->init.busy ); +++ sqliteSafetyOff(db); +++ +++ /* The following SQL will read the schema from the master tables. +++ ** The first version works with SQLite file formats 2 or greater. +++ ** The second version is for format 1 files. +++ ** +++ ** Beginning with file format 2, the rowid for new table entries +++ ** (including entries in sqlite_master) is an increasing integer. +++ ** So for file format 2 and later, we can play back sqlite_master +++ ** and all the CREATE statements will appear in the right order. +++ ** But with file format 1, table entries were random and so we +++ ** have to make sure the CREATE TABLEs occur before their corresponding +++ ** CREATE INDEXs. (We don't have to deal with CREATE VIEW or +++ ** CREATE TRIGGER in file format 1 because those constructs did +++ ** not exist then.) +++ */ +++ if( db->file_format>=2 ){ +++ sqliteSetString(&zSql, +++ "SELECT type, name, rootpage, sql, ", zDbNum, " FROM \"", +++ db->aDb[iDb].zName, "\".", zMasterName, (char*)0); +++ }else{ +++ sqliteSetString(&zSql, +++ "SELECT type, name, rootpage, sql, ", zDbNum, " FROM \"", +++ db->aDb[iDb].zName, "\".", zMasterName, +++ " WHERE type IN ('table', 'index')" +++ " ORDER BY CASE type WHEN 'table' THEN 0 ELSE 1 END", (char*)0); +++ } +++ rc = sqlite_exec(db, zSql, sqliteInitCallback, &initData, 0); +++ +++ sqliteFree(zSql); +++ sqliteSafetyOn(db); +++ sqliteBtreeCloseCursor(curMain); +++ if( sqlite_malloc_failed ){ +++ sqliteSetString(pzErrMsg, "out of memory", (char*)0); +++ rc = SQLITE_NOMEM; +++ sqliteResetInternalSchema(db, 0); +++ } +++ if( rc==SQLITE_OK ){ +++ DbSetProperty(db, iDb, DB_SchemaLoaded); +++ }else{ +++ sqliteResetInternalSchema(db, iDb); +++ } +++ return rc; +++} +++ +++/* +++** Initialize all database files - the main database file, the file +++** used to store temporary tables, and any additional database files +++** created using ATTACH statements. Return a success code. If an +++** error occurs, write an error message into *pzErrMsg. +++** +++** After the database is initialized, the SQLITE_Initialized +++** bit is set in the flags field of the sqlite structure. An +++** attempt is made to initialize the database as soon as it +++** is opened. If that fails (perhaps because another process +++** has the sqlite_master table locked) than another attempt +++** is made the first time the database is accessed. +++*/ +++int sqliteInit(sqlite *db, char **pzErrMsg){ +++ int i, rc; +++ +++ if( db->init.busy ) return SQLITE_OK; +++ assert( (db->flags & SQLITE_Initialized)==0 ); +++ rc = SQLITE_OK; +++ db->init.busy = 1; +++ for(i=0; rc==SQLITE_OK && inDb; i++){ +++ if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue; +++ rc = sqliteInitOne(db, i, pzErrMsg); +++ if( rc ){ +++ sqliteResetInternalSchema(db, i); +++ } +++ } +++ +++ /* Once all the other databases have been initialised, load the schema +++ ** for the TEMP database. This is loaded last, as the TEMP database +++ ** schema may contain references to objects in other databases. +++ */ +++ if( rc==SQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){ +++ rc = sqliteInitOne(db, 1, pzErrMsg); +++ if( rc ){ +++ sqliteResetInternalSchema(db, 1); +++ } +++ } +++ +++ db->init.busy = 0; +++ if( rc==SQLITE_OK ){ +++ db->flags |= SQLITE_Initialized; +++ sqliteCommitInternalChanges(db); +++ } +++ +++ /* If the database is in formats 1 or 2, then upgrade it to +++ ** version 3. This will reconstruct all indices. If the +++ ** upgrade fails for any reason (ex: out of disk space, database +++ ** is read only, interrupt received, etc.) then fail the init. +++ */ +++ if( rc==SQLITE_OK && db->file_format<3 ){ +++ char *zErr = 0; +++ InitData initData; +++ int meta[SQLITE_N_BTREE_META]; +++ +++ db->magic = SQLITE_MAGIC_OPEN; +++ initData.db = db; +++ initData.pzErrMsg = &zErr; +++ db->file_format = 3; +++ rc = sqlite_exec(db, +++ "BEGIN; SELECT name FROM sqlite_master WHERE type='table';", +++ upgrade_3_callback, +++ &initData, +++ &zErr); +++ if( rc==SQLITE_OK ){ +++ sqliteBtreeGetMeta(db->aDb[0].pBt, meta); +++ meta[2] = 4; +++ sqliteBtreeUpdateMeta(db->aDb[0].pBt, meta); +++ sqlite_exec(db, "COMMIT", 0, 0, 0); +++ } +++ if( rc!=SQLITE_OK ){ +++ sqliteSetString(pzErrMsg, +++ "unable to upgrade database to the version 2.6 format", +++ zErr ? ": " : 0, zErr, (char*)0); +++ } +++ sqlite_freemem(zErr); +++ } +++ +++ if( rc!=SQLITE_OK ){ +++ db->flags &= ~SQLITE_Initialized; +++ } +++ return rc; +++} +++ +++/* +++** The version of the library +++*/ +++const char rcsid[] = "@(#) \044Id: SQLite version " SQLITE_VERSION " $"; +++const char sqlite_version[] = SQLITE_VERSION; +++ +++/* +++** Does the library expect data to be encoded as UTF-8 or iso8859? The +++** following global constant always lets us know. +++*/ +++#ifdef SQLITE_UTF8 +++const char sqlite_encoding[] = "UTF-8"; +++#else +++const char sqlite_encoding[] = "iso8859"; +++#endif +++ +++/* +++** Open a new SQLite database. Construct an "sqlite" structure to define +++** the state of this database and return a pointer to that structure. +++** +++** An attempt is made to initialize the in-memory data structures that +++** hold the database schema. But if this fails (because the schema file +++** is locked) then that step is deferred until the first call to +++** sqlite_exec(). +++*/ +++sqlite *sqlite_open(const char *zFilename, int mode, char **pzErrMsg){ +++ sqlite *db; +++ int rc, i; +++ +++ /* Allocate the sqlite data structure */ +++ db = sqliteMalloc( sizeof(sqlite) ); +++ if( pzErrMsg ) *pzErrMsg = 0; +++ if( db==0 ) goto no_mem_on_open; +++ db->onError = OE_Default; +++ db->priorNewRowid = 0; +++ db->magic = SQLITE_MAGIC_BUSY; +++ db->nDb = 2; +++ db->aDb = db->aDbStatic; +++ /* db->flags |= SQLITE_ShortColNames; */ +++ sqliteHashInit(&db->aFunc, SQLITE_HASH_STRING, 1); +++ for(i=0; inDb; i++){ +++ sqliteHashInit(&db->aDb[i].tblHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&db->aDb[i].idxHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&db->aDb[i].trigHash, SQLITE_HASH_STRING, 0); +++ sqliteHashInit(&db->aDb[i].aFKey, SQLITE_HASH_STRING, 1); +++ } +++ +++ /* Open the backend database driver */ +++ if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){ +++ db->temp_store = 2; +++ } +++ rc = sqliteBtreeFactory(db, zFilename, 0, MAX_PAGES, &db->aDb[0].pBt); +++ if( rc!=SQLITE_OK ){ +++ switch( rc ){ +++ default: { +++ sqliteSetString(pzErrMsg, "unable to open database: ", +++ zFilename, (char*)0); +++ } +++ } +++ sqliteFree(db); +++ sqliteStrRealloc(pzErrMsg); +++ return 0; +++ } +++ db->aDb[0].zName = "main"; +++ db->aDb[1].zName = "temp"; +++ +++ /* Attempt to read the schema */ +++ sqliteRegisterBuiltinFunctions(db); +++ rc = sqliteInit(db, pzErrMsg); +++ db->magic = SQLITE_MAGIC_OPEN; +++ if( sqlite_malloc_failed ){ +++ sqlite_close(db); +++ goto no_mem_on_open; +++ }else if( rc!=SQLITE_OK && rc!=SQLITE_BUSY ){ +++ sqlite_close(db); +++ sqliteStrRealloc(pzErrMsg); +++ return 0; +++ }else if( pzErrMsg ){ +++ sqliteFree(*pzErrMsg); +++ *pzErrMsg = 0; +++ } +++ +++ /* Return a pointer to the newly opened database structure */ +++ return db; +++ +++no_mem_on_open: +++ sqliteSetString(pzErrMsg, "out of memory", (char*)0); +++ sqliteStrRealloc(pzErrMsg); +++ return 0; +++} +++ +++/* +++** Return the ROWID of the most recent insert +++*/ +++int sqlite_last_insert_rowid(sqlite *db){ +++ return db->lastRowid; +++} +++ +++/* +++** Return the number of changes in the most recent call to sqlite_exec(). +++*/ +++int sqlite_changes(sqlite *db){ +++ return db->nChange; +++} +++ +++/* +++** Return the number of changes produced by the last INSERT, UPDATE, or +++** DELETE statement to complete execution. The count does not include +++** changes due to SQL statements executed in trigger programs that were +++** triggered by that statement +++*/ +++int sqlite_last_statement_changes(sqlite *db){ +++ return db->lsChange; +++} +++ +++/* +++** Close an existing SQLite database +++*/ +++void sqlite_close(sqlite *db){ +++ HashElem *i; +++ int j; +++ db->want_to_close = 1; +++ if( sqliteSafetyCheck(db) || sqliteSafetyOn(db) ){ +++ /* printf("DID NOT CLOSE\n"); fflush(stdout); */ +++ return; +++ } +++ db->magic = SQLITE_MAGIC_CLOSED; +++ for(j=0; jnDb; j++){ +++ struct Db *pDb = &db->aDb[j]; +++ if( pDb->pBt ){ +++ sqliteBtreeClose(pDb->pBt); +++ pDb->pBt = 0; +++ } +++ } +++ sqliteResetInternalSchema(db, 0); +++ assert( db->nDb<=2 ); +++ assert( db->aDb==db->aDbStatic ); +++ for(i=sqliteHashFirst(&db->aFunc); i; i=sqliteHashNext(i)){ +++ FuncDef *pFunc, *pNext; +++ for(pFunc = (FuncDef*)sqliteHashData(i); pFunc; pFunc=pNext){ +++ pNext = pFunc->pNext; +++ sqliteFree(pFunc); +++ } +++ } +++ sqliteHashClear(&db->aFunc); +++ sqliteFree(db); +++} +++ +++/* +++** Rollback all database files. +++*/ +++void sqliteRollbackAll(sqlite *db){ +++ int i; +++ for(i=0; inDb; i++){ +++ if( db->aDb[i].pBt ){ +++ sqliteBtreeRollback(db->aDb[i].pBt); +++ db->aDb[i].inTrans = 0; +++ } +++ } +++ sqliteResetInternalSchema(db, 0); +++ /* sqliteRollbackInternalChanges(db); */ +++} +++ +++/* +++** Execute SQL code. Return one of the SQLITE_ success/failure +++** codes. Also write an error message into memory obtained from +++** malloc() and make *pzErrMsg point to that message. +++** +++** If the SQL is a query, then for each row in the query result +++** the xCallback() function is called. pArg becomes the first +++** argument to xCallback(). If xCallback=NULL then no callback +++** is invoked, even for queries. +++*/ +++int sqlite_exec( +++ sqlite *db, /* The database on which the SQL executes */ +++ const char *zSql, /* The SQL to be executed */ +++ sqlite_callback xCallback, /* Invoke this callback routine */ +++ void *pArg, /* First argument to xCallback() */ +++ char **pzErrMsg /* Write error messages here */ +++){ +++ int rc = SQLITE_OK; +++ const char *zLeftover; +++ sqlite_vm *pVm; +++ int nRetry = 0; +++ int nChange = 0; +++ int nCallback; +++ +++ if( zSql==0 ) return SQLITE_OK; +++ while( rc==SQLITE_OK && zSql[0] ){ +++ pVm = 0; +++ rc = sqlite_compile(db, zSql, &zLeftover, &pVm, pzErrMsg); +++ if( rc!=SQLITE_OK ){ +++ assert( pVm==0 || sqlite_malloc_failed ); +++ return rc; +++ } +++ if( pVm==0 ){ +++ /* This happens if the zSql input contained only whitespace */ +++ break; +++ } +++ db->nChange += nChange; +++ nCallback = 0; +++ while(1){ +++ int nArg; +++ char **azArg, **azCol; +++ rc = sqlite_step(pVm, &nArg, (const char***)&azArg,(const char***)&azCol); +++ if( rc==SQLITE_ROW ){ +++ if( xCallback!=0 && xCallback(pArg, nArg, azArg, azCol) ){ +++ sqlite_finalize(pVm, 0); +++ return SQLITE_ABORT; +++ } +++ nCallback++; +++ }else{ +++ if( rc==SQLITE_DONE && nCallback==0 +++ && (db->flags & SQLITE_NullCallback)!=0 && xCallback!=0 ){ +++ xCallback(pArg, nArg, azArg, azCol); +++ } +++ rc = sqlite_finalize(pVm, pzErrMsg); +++ if( rc==SQLITE_SCHEMA && nRetry<2 ){ +++ nRetry++; +++ rc = SQLITE_OK; +++ break; +++ } +++ if( db->pVdbe==0 ){ +++ nChange = db->nChange; +++ } +++ nRetry = 0; +++ zSql = zLeftover; +++ while( isspace(zSql[0]) ) zSql++; +++ break; +++ } +++ } +++ } +++ return rc; +++} +++ +++ +++/* +++** Compile a single statement of SQL into a virtual machine. Return one +++** of the SQLITE_ success/failure codes. Also write an error message into +++** memory obtained from malloc() and make *pzErrMsg point to that message. +++*/ +++int sqlite_compile( +++ sqlite *db, /* The database on which the SQL executes */ +++ const char *zSql, /* The SQL to be executed */ +++ const char **pzTail, /* OUT: Next statement after the first */ +++ sqlite_vm **ppVm, /* OUT: The virtual machine */ +++ char **pzErrMsg /* OUT: Write error messages here */ +++){ +++ Parse sParse; +++ +++ if( pzErrMsg ) *pzErrMsg = 0; +++ if( sqliteSafetyOn(db) ) goto exec_misuse; +++ if( !db->init.busy ){ +++ if( (db->flags & SQLITE_Initialized)==0 ){ +++ int rc, cnt = 1; +++ while( (rc = sqliteInit(db, pzErrMsg))==SQLITE_BUSY +++ && db->xBusyCallback +++ && db->xBusyCallback(db->pBusyArg, "", cnt++)!=0 ){} +++ if( rc!=SQLITE_OK ){ +++ sqliteStrRealloc(pzErrMsg); +++ sqliteSafetyOff(db); +++ return rc; +++ } +++ if( pzErrMsg ){ +++ sqliteFree(*pzErrMsg); +++ *pzErrMsg = 0; +++ } +++ } +++ if( db->file_format<3 ){ +++ sqliteSafetyOff(db); +++ sqliteSetString(pzErrMsg, "obsolete database file format", (char*)0); +++ return SQLITE_ERROR; +++ } +++ } +++ assert( (db->flags & SQLITE_Initialized)!=0 || db->init.busy ); +++ if( db->pVdbe==0 ){ db->nChange = 0; } +++ memset(&sParse, 0, sizeof(sParse)); +++ sParse.db = db; +++ sqliteRunParser(&sParse, zSql, pzErrMsg); +++ if( db->xTrace && !db->init.busy ){ +++ /* Trace only the statment that was compiled. +++ ** Make a copy of that part of the SQL string since zSQL is const +++ ** and we must pass a zero terminated string to the trace function +++ ** The copy is unnecessary if the tail pointer is pointing at the +++ ** beginnig or end of the SQL string. +++ */ +++ if( sParse.zTail && sParse.zTail!=zSql && *sParse.zTail ){ +++ char *tmpSql = sqliteStrNDup(zSql, sParse.zTail - zSql); +++ if( tmpSql ){ +++ db->xTrace(db->pTraceArg, tmpSql); +++ free(tmpSql); +++ }else{ +++ /* If a memory error occurred during the copy, +++ ** trace entire SQL string and fall through to the +++ ** sqlite_malloc_failed test to report the error. +++ */ +++ db->xTrace(db->pTraceArg, zSql); +++ } +++ }else{ +++ db->xTrace(db->pTraceArg, zSql); +++ } +++ } +++ if( sqlite_malloc_failed ){ +++ sqliteSetString(pzErrMsg, "out of memory", (char*)0); +++ sParse.rc = SQLITE_NOMEM; +++ sqliteRollbackAll(db); +++ sqliteResetInternalSchema(db, 0); +++ db->flags &= ~SQLITE_InTrans; +++ } +++ if( sParse.rc==SQLITE_DONE ) sParse.rc = SQLITE_OK; +++ if( sParse.rc!=SQLITE_OK && pzErrMsg && *pzErrMsg==0 ){ +++ sqliteSetString(pzErrMsg, sqlite_error_string(sParse.rc), (char*)0); +++ } +++ sqliteStrRealloc(pzErrMsg); +++ if( sParse.rc==SQLITE_SCHEMA ){ +++ sqliteResetInternalSchema(db, 0); +++ } +++ assert( ppVm ); +++ *ppVm = (sqlite_vm*)sParse.pVdbe; +++ if( pzTail ) *pzTail = sParse.zTail; +++ if( sqliteSafetyOff(db) ) goto exec_misuse; +++ return sParse.rc; +++ +++exec_misuse: +++ if( pzErrMsg ){ +++ *pzErrMsg = 0; +++ sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0); +++ sqliteStrRealloc(pzErrMsg); +++ } +++ return SQLITE_MISUSE; +++} +++ +++ +++/* +++** The following routine destroys a virtual machine that is created by +++** the sqlite_compile() routine. +++** +++** The integer returned is an SQLITE_ success/failure code that describes +++** the result of executing the virtual machine. An error message is +++** written into memory obtained from malloc and *pzErrMsg is made to +++** point to that error if pzErrMsg is not NULL. The calling routine +++** should use sqlite_freemem() to delete the message when it has finished +++** with it. +++*/ +++int sqlite_finalize( +++ sqlite_vm *pVm, /* The virtual machine to be destroyed */ +++ char **pzErrMsg /* OUT: Write error messages here */ +++){ +++ int rc = sqliteVdbeFinalize((Vdbe*)pVm, pzErrMsg); +++ sqliteStrRealloc(pzErrMsg); +++ return rc; +++} +++ +++/* +++** Terminate the current execution of a virtual machine then +++** reset the virtual machine back to its starting state so that it +++** can be reused. Any error message resulting from the prior execution +++** is written into *pzErrMsg. A success code from the prior execution +++** is returned. +++*/ +++int sqlite_reset( +++ sqlite_vm *pVm, /* The virtual machine to be destroyed */ +++ char **pzErrMsg /* OUT: Write error messages here */ +++){ +++ int rc = sqliteVdbeReset((Vdbe*)pVm, pzErrMsg); +++ sqliteVdbeMakeReady((Vdbe*)pVm, -1, 0); +++ sqliteStrRealloc(pzErrMsg); +++ return rc; +++} +++ +++/* +++** Return a static string that describes the kind of error specified in the +++** argument. +++*/ +++const char *sqlite_error_string(int rc){ +++ const char *z; +++ switch( rc ){ +++ case SQLITE_OK: z = "not an error"; break; +++ case SQLITE_ERROR: z = "SQL logic error or missing database"; break; +++ case SQLITE_INTERNAL: z = "internal SQLite implementation flaw"; break; +++ case SQLITE_PERM: z = "access permission denied"; break; +++ case SQLITE_ABORT: z = "callback requested query abort"; break; +++ case SQLITE_BUSY: z = "database is locked"; break; +++ case SQLITE_LOCKED: z = "database table is locked"; break; +++ case SQLITE_NOMEM: z = "out of memory"; break; +++ case SQLITE_READONLY: z = "attempt to write a readonly database"; break; +++ case SQLITE_INTERRUPT: z = "interrupted"; break; +++ case SQLITE_IOERR: z = "disk I/O error"; break; +++ case SQLITE_CORRUPT: z = "database disk image is malformed"; break; +++ case SQLITE_NOTFOUND: z = "table or record not found"; break; +++ case SQLITE_FULL: z = "database is full"; break; +++ case SQLITE_CANTOPEN: z = "unable to open database file"; break; +++ case SQLITE_PROTOCOL: z = "database locking protocol failure"; break; +++ case SQLITE_EMPTY: z = "table contains no data"; break; +++ case SQLITE_SCHEMA: z = "database schema has changed"; break; +++ case SQLITE_TOOBIG: z = "too much data for one table row"; break; +++ case SQLITE_CONSTRAINT: z = "constraint failed"; break; +++ case SQLITE_MISMATCH: z = "datatype mismatch"; break; +++ case SQLITE_MISUSE: z = "library routine called out of sequence";break; +++ case SQLITE_NOLFS: z = "kernel lacks large file support"; break; +++ case SQLITE_AUTH: z = "authorization denied"; break; +++ case SQLITE_FORMAT: z = "auxiliary database format error"; break; +++ case SQLITE_RANGE: z = "bind index out of range"; break; +++ case SQLITE_NOTADB: z = "file is encrypted or is not a database";break; +++ default: z = "unknown error"; break; +++ } +++ return z; +++} +++ +++/* +++** This routine implements a busy callback that sleeps and tries +++** again until a timeout value is reached. The timeout value is +++** an integer number of milliseconds passed in as the first +++** argument. +++*/ +++static int sqliteDefaultBusyCallback( +++ void *Timeout, /* Maximum amount of time to wait */ +++ const char *NotUsed, /* The name of the table that is busy */ +++ int count /* Number of times table has been busy */ +++){ +++#if SQLITE_MIN_SLEEP_MS==1 +++ static const char delays[] = +++ { 1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 50, 100}; +++ static const short int totals[] = +++ { 0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228, 287}; +++# define NDELAY (sizeof(delays)/sizeof(delays[0])) +++ int timeout = (int)(long)Timeout; +++ int delay, prior; +++ +++ if( count <= NDELAY ){ +++ delay = delays[count-1]; +++ prior = totals[count-1]; +++ }else{ +++ delay = delays[NDELAY-1]; +++ prior = totals[NDELAY-1] + delay*(count-NDELAY-1); +++ } +++ if( prior + delay > timeout ){ +++ delay = timeout - prior; +++ if( delay<=0 ) return 0; +++ } +++ sqliteOsSleep(delay); +++ return 1; +++#else +++ int timeout = (int)(long)Timeout; +++ if( (count+1)*1000 > timeout ){ +++ return 0; +++ } +++ sqliteOsSleep(1000); +++ return 1; +++#endif +++} +++ +++/* +++** This routine sets the busy callback for an Sqlite database to the +++** given callback function with the given argument. +++*/ +++void sqlite_busy_handler( +++ sqlite *db, +++ int (*xBusy)(void*,const char*,int), +++ void *pArg +++){ +++ db->xBusyCallback = xBusy; +++ db->pBusyArg = pArg; +++} +++ +++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +++/* +++** This routine sets the progress callback for an Sqlite database to the +++** given callback function with the given argument. The progress callback will +++** be invoked every nOps opcodes. +++*/ +++void sqlite_progress_handler( +++ sqlite *db, +++ int nOps, +++ int (*xProgress)(void*), +++ void *pArg +++){ +++ if( nOps>0 ){ +++ db->xProgress = xProgress; +++ db->nProgressOps = nOps; +++ db->pProgressArg = pArg; +++ }else{ +++ db->xProgress = 0; +++ db->nProgressOps = 0; +++ db->pProgressArg = 0; +++ } +++} +++#endif +++ +++ +++/* +++** This routine installs a default busy handler that waits for the +++** specified number of milliseconds before returning 0. +++*/ +++void sqlite_busy_timeout(sqlite *db, int ms){ +++ if( ms>0 ){ +++ sqlite_busy_handler(db, sqliteDefaultBusyCallback, (void*)(long)ms); +++ }else{ +++ sqlite_busy_handler(db, 0, 0); +++ } +++} +++ +++/* +++** Cause any pending operation to stop at its earliest opportunity. +++*/ +++void sqlite_interrupt(sqlite *db){ +++ db->flags |= SQLITE_Interrupt; +++} +++ +++/* +++** Windows systems should call this routine to free memory that +++** is returned in the in the errmsg parameter of sqlite_open() when +++** SQLite is a DLL. For some reason, it does not work to call free() +++** directly. +++** +++** Note that we need to call free() not sqliteFree() here, since every +++** string that is exported from SQLite should have already passed through +++** sqliteStrRealloc(). +++*/ +++void sqlite_freemem(void *p){ free(p); } +++ +++/* +++** Windows systems need functions to call to return the sqlite_version +++** and sqlite_encoding strings since they are unable to access constants +++** within DLLs. +++*/ +++const char *sqlite_libversion(void){ return sqlite_version; } +++const char *sqlite_libencoding(void){ return sqlite_encoding; } +++ +++/* +++** Create new user-defined functions. The sqlite_create_function() +++** routine creates a regular function and sqlite_create_aggregate() +++** creates an aggregate function. +++** +++** Passing a NULL xFunc argument or NULL xStep and xFinalize arguments +++** disables the function. Calling sqlite_create_function() with the +++** same name and number of arguments as a prior call to +++** sqlite_create_aggregate() disables the prior call to +++** sqlite_create_aggregate(), and vice versa. +++** +++** If nArg is -1 it means that this function will accept any number +++** of arguments, including 0. The maximum allowed value of nArg is 127. +++*/ +++int sqlite_create_function( +++ sqlite *db, /* Add the function to this database connection */ +++ const char *zName, /* Name of the function to add */ +++ int nArg, /* Number of arguments */ +++ void (*xFunc)(sqlite_func*,int,const char**), /* The implementation */ +++ void *pUserData /* User data */ +++){ +++ FuncDef *p; +++ int nName; +++ if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1; +++ if( nArg<-1 || nArg>127 ) return 1; +++ nName = strlen(zName); +++ if( nName>255 ) return 1; +++ p = sqliteFindFunction(db, zName, nName, nArg, 1); +++ if( p==0 ) return 1; +++ p->xFunc = xFunc; +++ p->xStep = 0; +++ p->xFinalize = 0; +++ p->pUserData = pUserData; +++ return 0; +++} +++int sqlite_create_aggregate( +++ sqlite *db, /* Add the function to this database connection */ +++ const char *zName, /* Name of the function to add */ +++ int nArg, /* Number of arguments */ +++ void (*xStep)(sqlite_func*,int,const char**), /* The step function */ +++ void (*xFinalize)(sqlite_func*), /* The finalizer */ +++ void *pUserData /* User data */ +++){ +++ FuncDef *p; +++ int nName; +++ if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1; +++ if( nArg<-1 || nArg>127 ) return 1; +++ nName = strlen(zName); +++ if( nName>255 ) return 1; +++ p = sqliteFindFunction(db, zName, nName, nArg, 1); +++ if( p==0 ) return 1; +++ p->xFunc = 0; +++ p->xStep = xStep; +++ p->xFinalize = xFinalize; +++ p->pUserData = pUserData; +++ return 0; +++} +++ +++/* +++** Change the datatype for all functions with a given name. See the +++** header comment for the prototype of this function in sqlite.h for +++** additional information. +++*/ +++int sqlite_function_type(sqlite *db, const char *zName, int dataType){ +++ FuncDef *p = (FuncDef*)sqliteHashFind(&db->aFunc, zName, strlen(zName)); +++ while( p ){ +++ p->dataType = dataType; +++ p = p->pNext; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Register a trace function. The pArg from the previously registered trace +++** is returned. +++** +++** A NULL trace function means that no tracing is executes. A non-NULL +++** trace is a pointer to a function that is invoked at the start of each +++** sqlite_exec(). +++*/ +++void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){ +++ void *pOld = db->pTraceArg; +++ db->xTrace = xTrace; +++ db->pTraceArg = pArg; +++ return pOld; +++} +++ +++/*** EXPERIMENTAL *** +++** +++** Register a function to be invoked when a transaction comments. +++** If either function returns non-zero, then the commit becomes a +++** rollback. +++*/ +++void *sqlite_commit_hook( +++ sqlite *db, /* Attach the hook to this database */ +++ int (*xCallback)(void*), /* Function to invoke on each commit */ +++ void *pArg /* Argument to the function */ +++){ +++ void *pOld = db->pCommitArg; +++ db->xCommitCallback = xCallback; +++ db->pCommitArg = pArg; +++ return pOld; +++} +++ +++ +++/* +++** This routine is called to create a connection to a database BTree +++** driver. If zFilename is the name of a file, then that file is +++** opened and used. If zFilename is the magic name ":memory:" then +++** the database is stored in memory (and is thus forgotten as soon as +++** the connection is closed.) If zFilename is NULL then the database +++** is for temporary use only and is deleted as soon as the connection +++** is closed. +++** +++** A temporary database can be either a disk file (that is automatically +++** deleted when the file is closed) or a set of red-black trees held in memory, +++** depending on the values of the TEMP_STORE compile-time macro and the +++** db->temp_store variable, according to the following chart: +++** +++** TEMP_STORE db->temp_store Location of temporary database +++** ---------- -------------- ------------------------------ +++** 0 any file +++** 1 1 file +++** 1 2 memory +++** 1 0 file +++** 2 1 file +++** 2 2 memory +++** 2 0 memory +++** 3 any memory +++*/ +++int sqliteBtreeFactory( +++ const sqlite *db, /* Main database when opening aux otherwise 0 */ +++ const char *zFilename, /* Name of the file containing the BTree database */ +++ int omitJournal, /* if TRUE then do not journal this file */ +++ int nCache, /* How many pages in the page cache */ +++ Btree **ppBtree){ /* Pointer to new Btree object written here */ +++ +++ assert( ppBtree != 0); +++ +++#ifndef SQLITE_OMIT_INMEMORYDB +++ if( zFilename==0 ){ +++ if (TEMP_STORE == 0) { +++ /* Always use file based temporary DB */ +++ return sqliteBtreeOpen(0, omitJournal, nCache, ppBtree); +++ } else if (TEMP_STORE == 1 || TEMP_STORE == 2) { +++ /* Switch depending on compile-time and/or runtime settings. */ +++ int location = db->temp_store==0 ? TEMP_STORE : db->temp_store; +++ +++ if (location == 1) { +++ return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree); +++ } else { +++ return sqliteRbtreeOpen(0, 0, 0, ppBtree); +++ } +++ } else { +++ /* Always use in-core DB */ +++ return sqliteRbtreeOpen(0, 0, 0, ppBtree); +++ } +++ }else if( zFilename[0]==':' && strcmp(zFilename,":memory:")==0 ){ +++ return sqliteRbtreeOpen(0, 0, 0, ppBtree); +++ }else +++#endif +++ { +++ return sqliteBtreeOpen(zFilename, omitJournal, nCache, ppBtree); +++ } +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/opcodes.c ++@@ -0,0 +1,140 @@ +++/* Automatically generated file. Do not edit */ +++char *sqliteOpcodeNames[] = { "???", +++ "Goto", +++ "Gosub", +++ "Return", +++ "Halt", +++ "Integer", +++ "String", +++ "Variable", +++ "Pop", +++ "Dup", +++ "Pull", +++ "Push", +++ "ColumnName", +++ "Callback", +++ "Concat", +++ "Add", +++ "Subtract", +++ "Multiply", +++ "Divide", +++ "Remainder", +++ "Function", +++ "BitAnd", +++ "BitOr", +++ "ShiftLeft", +++ "ShiftRight", +++ "AddImm", +++ "ForceInt", +++ "MustBeInt", +++ "Eq", +++ "Ne", +++ "Lt", +++ "Le", +++ "Gt", +++ "Ge", +++ "StrEq", +++ "StrNe", +++ "StrLt", +++ "StrLe", +++ "StrGt", +++ "StrGe", +++ "And", +++ "Or", +++ "Negative", +++ "AbsValue", +++ "Not", +++ "BitNot", +++ "Noop", +++ "If", +++ "IfNot", +++ "IsNull", +++ "NotNull", +++ "MakeRecord", +++ "MakeIdxKey", +++ "MakeKey", +++ "IncrKey", +++ "Checkpoint", +++ "Transaction", +++ "Commit", +++ "Rollback", +++ "ReadCookie", +++ "SetCookie", +++ "VerifyCookie", +++ "OpenRead", +++ "OpenWrite", +++ "OpenTemp", +++ "OpenPseudo", +++ "Close", +++ "MoveLt", +++ "MoveTo", +++ "Distinct", +++ "NotFound", +++ "Found", +++ "IsUnique", +++ "NotExists", +++ "NewRecno", +++ "PutIntKey", +++ "PutStrKey", +++ "Delete", +++ "SetCounts", +++ "KeyAsData", +++ "RowKey", +++ "RowData", +++ "Column", +++ "Recno", +++ "FullKey", +++ "NullRow", +++ "Last", +++ "Rewind", +++ "Prev", +++ "Next", +++ "IdxPut", +++ "IdxDelete", +++ "IdxRecno", +++ "IdxLT", +++ "IdxGT", +++ "IdxGE", +++ "IdxIsNull", +++ "Destroy", +++ "Clear", +++ "CreateIndex", +++ "CreateTable", +++ "IntegrityCk", +++ "ListWrite", +++ "ListRewind", +++ "ListRead", +++ "ListReset", +++ "ListPush", +++ "ListPop", +++ "ContextPush", +++ "ContextPop", +++ "SortPut", +++ "SortMakeRec", +++ "SortMakeKey", +++ "Sort", +++ "SortNext", +++ "SortCallback", +++ "SortReset", +++ "FileOpen", +++ "FileRead", +++ "FileColumn", +++ "MemStore", +++ "MemLoad", +++ "MemIncr", +++ "AggReset", +++ "AggInit", +++ "AggFunc", +++ "AggFocus", +++ "AggSet", +++ "AggGet", +++ "AggNext", +++ "SetInsert", +++ "SetFound", +++ "SetNotFound", +++ "SetFirst", +++ "SetNext", +++ "Vacuum", +++ "StackDepth", +++ "StackReset", +++}; ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/opcodes.h ++@@ -0,0 +1,138 @@ +++/* Automatically generated file. Do not edit */ +++#define OP_Goto 1 +++#define OP_Gosub 2 +++#define OP_Return 3 +++#define OP_Halt 4 +++#define OP_Integer 5 +++#define OP_String 6 +++#define OP_Variable 7 +++#define OP_Pop 8 +++#define OP_Dup 9 +++#define OP_Pull 10 +++#define OP_Push 11 +++#define OP_ColumnName 12 +++#define OP_Callback 13 +++#define OP_Concat 14 +++#define OP_Add 15 +++#define OP_Subtract 16 +++#define OP_Multiply 17 +++#define OP_Divide 18 +++#define OP_Remainder 19 +++#define OP_Function 20 +++#define OP_BitAnd 21 +++#define OP_BitOr 22 +++#define OP_ShiftLeft 23 +++#define OP_ShiftRight 24 +++#define OP_AddImm 25 +++#define OP_ForceInt 26 +++#define OP_MustBeInt 27 +++#define OP_Eq 28 +++#define OP_Ne 29 +++#define OP_Lt 30 +++#define OP_Le 31 +++#define OP_Gt 32 +++#define OP_Ge 33 +++#define OP_StrEq 34 +++#define OP_StrNe 35 +++#define OP_StrLt 36 +++#define OP_StrLe 37 +++#define OP_StrGt 38 +++#define OP_StrGe 39 +++#define OP_And 40 +++#define OP_Or 41 +++#define OP_Negative 42 +++#define OP_AbsValue 43 +++#define OP_Not 44 +++#define OP_BitNot 45 +++#define OP_Noop 46 +++#define OP_If 47 +++#define OP_IfNot 48 +++#define OP_IsNull 49 +++#define OP_NotNull 50 +++#define OP_MakeRecord 51 +++#define OP_MakeIdxKey 52 +++#define OP_MakeKey 53 +++#define OP_IncrKey 54 +++#define OP_Checkpoint 55 +++#define OP_Transaction 56 +++#define OP_Commit 57 +++#define OP_Rollback 58 +++#define OP_ReadCookie 59 +++#define OP_SetCookie 60 +++#define OP_VerifyCookie 61 +++#define OP_OpenRead 62 +++#define OP_OpenWrite 63 +++#define OP_OpenTemp 64 +++#define OP_OpenPseudo 65 +++#define OP_Close 66 +++#define OP_MoveLt 67 +++#define OP_MoveTo 68 +++#define OP_Distinct 69 +++#define OP_NotFound 70 +++#define OP_Found 71 +++#define OP_IsUnique 72 +++#define OP_NotExists 73 +++#define OP_NewRecno 74 +++#define OP_PutIntKey 75 +++#define OP_PutStrKey 76 +++#define OP_Delete 77 +++#define OP_SetCounts 78 +++#define OP_KeyAsData 79 +++#define OP_RowKey 80 +++#define OP_RowData 81 +++#define OP_Column 82 +++#define OP_Recno 83 +++#define OP_FullKey 84 +++#define OP_NullRow 85 +++#define OP_Last 86 +++#define OP_Rewind 87 +++#define OP_Prev 88 +++#define OP_Next 89 +++#define OP_IdxPut 90 +++#define OP_IdxDelete 91 +++#define OP_IdxRecno 92 +++#define OP_IdxLT 93 +++#define OP_IdxGT 94 +++#define OP_IdxGE 95 +++#define OP_IdxIsNull 96 +++#define OP_Destroy 97 +++#define OP_Clear 98 +++#define OP_CreateIndex 99 +++#define OP_CreateTable 100 +++#define OP_IntegrityCk 101 +++#define OP_ListWrite 102 +++#define OP_ListRewind 103 +++#define OP_ListRead 104 +++#define OP_ListReset 105 +++#define OP_ListPush 106 +++#define OP_ListPop 107 +++#define OP_ContextPush 108 +++#define OP_ContextPop 109 +++#define OP_SortPut 110 +++#define OP_SortMakeRec 111 +++#define OP_SortMakeKey 112 +++#define OP_Sort 113 +++#define OP_SortNext 114 +++#define OP_SortCallback 115 +++#define OP_SortReset 116 +++#define OP_FileOpen 117 +++#define OP_FileRead 118 +++#define OP_FileColumn 119 +++#define OP_MemStore 120 +++#define OP_MemLoad 121 +++#define OP_MemIncr 122 +++#define OP_AggReset 123 +++#define OP_AggInit 124 +++#define OP_AggFunc 125 +++#define OP_AggFocus 126 +++#define OP_AggSet 127 +++#define OP_AggGet 128 +++#define OP_AggNext 129 +++#define OP_SetInsert 130 +++#define OP_SetFound 131 +++#define OP_SetNotFound 132 +++#define OP_SetFirst 133 +++#define OP_SetNext 134 +++#define OP_Vacuum 135 +++#define OP_StackDepth 136 +++#define OP_StackReset 137 ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/os.c ++@@ -0,0 +1,1850 @@ +++/* +++** 2001 September 16 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++****************************************************************************** +++** +++** This file contains code that is specific to particular operating +++** systems. The purpose of this file is to provide a uniform abstraction +++** on which the rest of SQLite can operate. +++*/ +++#include "os.h" /* Must be first to enable large file support */ +++#include "sqliteInt.h" +++ +++#if OS_UNIX +++# include +++# include +++# include +++# ifndef O_LARGEFILE +++# define O_LARGEFILE 0 +++# endif +++# ifdef SQLITE_DISABLE_LFS +++# undef O_LARGEFILE +++# define O_LARGEFILE 0 +++# endif +++# ifndef O_NOFOLLOW +++# define O_NOFOLLOW 0 +++# endif +++# ifndef O_BINARY +++# define O_BINARY 0 +++# endif +++#endif +++ +++ +++#if OS_WIN +++# include +++#endif +++ +++#if OS_MAC +++# include +++# include +++# include +++# include +++# include +++# include +++# include +++#endif +++ +++/* +++** The DJGPP compiler environment looks mostly like Unix, but it +++** lacks the fcntl() system call. So redefine fcntl() to be something +++** that always succeeds. This means that locking does not occur under +++** DJGPP. But its DOS - what did you expect? +++*/ +++#ifdef __DJGPP__ +++# define fcntl(A,B,C) 0 +++#endif +++ +++/* +++** Macros used to determine whether or not to use threads. The +++** SQLITE_UNIX_THREADS macro is defined if we are synchronizing for +++** Posix threads and SQLITE_W32_THREADS is defined if we are +++** synchronizing using Win32 threads. +++*/ +++#if OS_UNIX && defined(THREADSAFE) && THREADSAFE +++# include +++# define SQLITE_UNIX_THREADS 1 +++#endif +++#if OS_WIN && defined(THREADSAFE) && THREADSAFE +++# define SQLITE_W32_THREADS 1 +++#endif +++#if OS_MAC && defined(THREADSAFE) && THREADSAFE +++# include +++# define SQLITE_MACOS_MULTITASKING 1 +++#endif +++ +++/* +++** Macros for performance tracing. Normally turned off +++*/ +++#if 0 +++static int last_page = 0; +++__inline__ unsigned long long int hwtime(void){ +++ unsigned long long int x; +++ __asm__("rdtsc\n\t" +++ "mov %%edx, %%ecx\n\t" +++ :"=A" (x)); +++ return x; +++} +++static unsigned long long int g_start; +++static unsigned int elapse; +++#define TIMER_START g_start=hwtime() +++#define TIMER_END elapse=hwtime()-g_start +++#define SEEK(X) last_page=(X) +++#define TRACE1(X) fprintf(stderr,X) +++#define TRACE2(X,Y) fprintf(stderr,X,Y) +++#define TRACE3(X,Y,Z) fprintf(stderr,X,Y,Z) +++#define TRACE4(X,Y,Z,A) fprintf(stderr,X,Y,Z,A) +++#define TRACE5(X,Y,Z,A,B) fprintf(stderr,X,Y,Z,A,B) +++#else +++#define TIMER_START +++#define TIMER_END +++#define SEEK(X) +++#define TRACE1(X) +++#define TRACE2(X,Y) +++#define TRACE3(X,Y,Z) +++#define TRACE4(X,Y,Z,A) +++#define TRACE5(X,Y,Z,A,B) +++#endif +++ +++ +++#if OS_UNIX +++/* +++** Here is the dirt on POSIX advisory locks: ANSI STD 1003.1 (1996) +++** section 6.5.2.2 lines 483 through 490 specify that when a process +++** sets or clears a lock, that operation overrides any prior locks set +++** by the same process. It does not explicitly say so, but this implies +++** that it overrides locks set by the same process using a different +++** file descriptor. Consider this test case: +++** +++** int fd1 = open("./file1", O_RDWR|O_CREAT, 0644); +++** int fd2 = open("./file2", O_RDWR|O_CREAT, 0644); +++** +++** Suppose ./file1 and ./file2 are really the same file (because +++** one is a hard or symbolic link to the other) then if you set +++** an exclusive lock on fd1, then try to get an exclusive lock +++** on fd2, it works. I would have expected the second lock to +++** fail since there was already a lock on the file due to fd1. +++** But not so. Since both locks came from the same process, the +++** second overrides the first, even though they were on different +++** file descriptors opened on different file names. +++** +++** Bummer. If you ask me, this is broken. Badly broken. It means +++** that we cannot use POSIX locks to synchronize file access among +++** competing threads of the same process. POSIX locks will work fine +++** to synchronize access for threads in separate processes, but not +++** threads within the same process. +++** +++** To work around the problem, SQLite has to manage file locks internally +++** on its own. Whenever a new database is opened, we have to find the +++** specific inode of the database file (the inode is determined by the +++** st_dev and st_ino fields of the stat structure that fstat() fills in) +++** and check for locks already existing on that inode. When locks are +++** created or removed, we have to look at our own internal record of the +++** locks to see if another thread has previously set a lock on that same +++** inode. +++** +++** The OsFile structure for POSIX is no longer just an integer file +++** descriptor. It is now a structure that holds the integer file +++** descriptor and a pointer to a structure that describes the internal +++** locks on the corresponding inode. There is one locking structure +++** per inode, so if the same inode is opened twice, both OsFile structures +++** point to the same locking structure. The locking structure keeps +++** a reference count (so we will know when to delete it) and a "cnt" +++** field that tells us its internal lock status. cnt==0 means the +++** file is unlocked. cnt==-1 means the file has an exclusive lock. +++** cnt>0 means there are cnt shared locks on the file. +++** +++** Any attempt to lock or unlock a file first checks the locking +++** structure. The fcntl() system call is only invoked to set a +++** POSIX lock if the internal lock structure transitions between +++** a locked and an unlocked state. +++** +++** 2004-Jan-11: +++** More recent discoveries about POSIX advisory locks. (The more +++** I discover, the more I realize the a POSIX advisory locks are +++** an abomination.) +++** +++** If you close a file descriptor that points to a file that has locks, +++** all locks on that file that are owned by the current process are +++** released. To work around this problem, each OsFile structure contains +++** a pointer to an openCnt structure. There is one openCnt structure +++** per open inode, which means that multiple OsFiles can point to a single +++** openCnt. When an attempt is made to close an OsFile, if there are +++** other OsFiles open on the same inode that are holding locks, the call +++** to close() the file descriptor is deferred until all of the locks clear. +++** The openCnt structure keeps a list of file descriptors that need to +++** be closed and that list is walked (and cleared) when the last lock +++** clears. +++** +++** First, under Linux threads, because each thread has a separate +++** process ID, lock operations in one thread do not override locks +++** to the same file in other threads. Linux threads behave like +++** separate processes in this respect. But, if you close a file +++** descriptor in linux threads, all locks are cleared, even locks +++** on other threads and even though the other threads have different +++** process IDs. Linux threads is inconsistent in this respect. +++** (I'm beginning to think that linux threads is an abomination too.) +++** The consequence of this all is that the hash table for the lockInfo +++** structure has to include the process id as part of its key because +++** locks in different threads are treated as distinct. But the +++** openCnt structure should not include the process id in its +++** key because close() clears lock on all threads, not just the current +++** thread. Were it not for this goofiness in linux threads, we could +++** combine the lockInfo and openCnt structures into a single structure. +++*/ +++ +++/* +++** An instance of the following structure serves as the key used +++** to locate a particular lockInfo structure given its inode. Note +++** that we have to include the process ID as part of the key. On some +++** threading implementations (ex: linux), each thread has a separate +++** process ID. +++*/ +++struct lockKey { +++ dev_t dev; /* Device number */ +++ ino_t ino; /* Inode number */ +++ pid_t pid; /* Process ID */ +++}; +++ +++/* +++** An instance of the following structure is allocated for each open +++** inode on each thread with a different process ID. (Threads have +++** different process IDs on linux, but not on most other unixes.) +++** +++** A single inode can have multiple file descriptors, so each OsFile +++** structure contains a pointer to an instance of this object and this +++** object keeps a count of the number of OsFiles pointing to it. +++*/ +++struct lockInfo { +++ struct lockKey key; /* The lookup key */ +++ int cnt; /* 0: unlocked. -1: write lock. 1...: read lock. */ +++ int nRef; /* Number of pointers to this structure */ +++}; +++ +++/* +++** An instance of the following structure serves as the key used +++** to locate a particular openCnt structure given its inode. This +++** is the same as the lockKey except that the process ID is omitted. +++*/ +++struct openKey { +++ dev_t dev; /* Device number */ +++ ino_t ino; /* Inode number */ +++}; +++ +++/* +++** An instance of the following structure is allocated for each open +++** inode. This structure keeps track of the number of locks on that +++** inode. If a close is attempted against an inode that is holding +++** locks, the close is deferred until all locks clear by adding the +++** file descriptor to be closed to the pending list. +++*/ +++struct openCnt { +++ struct openKey key; /* The lookup key */ +++ int nRef; /* Number of pointers to this structure */ +++ int nLock; /* Number of outstanding locks */ +++ int nPending; /* Number of pending close() operations */ +++ int *aPending; /* Malloced space holding fd's awaiting a close() */ +++}; +++ +++/* +++** These hash table maps inodes and process IDs into lockInfo and openCnt +++** structures. Access to these hash tables must be protected by a mutex. +++*/ +++static Hash lockHash = { SQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; +++static Hash openHash = { SQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; +++ +++/* +++** Release a lockInfo structure previously allocated by findLockInfo(). +++*/ +++static void releaseLockInfo(struct lockInfo *pLock){ +++ pLock->nRef--; +++ if( pLock->nRef==0 ){ +++ sqliteHashInsert(&lockHash, &pLock->key, sizeof(pLock->key), 0); +++ sqliteFree(pLock); +++ } +++} +++ +++/* +++** Release a openCnt structure previously allocated by findLockInfo(). +++*/ +++static void releaseOpenCnt(struct openCnt *pOpen){ +++ pOpen->nRef--; +++ if( pOpen->nRef==0 ){ +++ sqliteHashInsert(&openHash, &pOpen->key, sizeof(pOpen->key), 0); +++ sqliteFree(pOpen->aPending); +++ sqliteFree(pOpen); +++ } +++} +++ +++/* +++** Given a file descriptor, locate lockInfo and openCnt structures that +++** describes that file descriptor. Create a new ones if necessary. The +++** return values might be unset if an error occurs. +++** +++** Return the number of errors. +++*/ +++int findLockInfo( +++ int fd, /* The file descriptor used in the key */ +++ struct lockInfo **ppLock, /* Return the lockInfo structure here */ +++ struct openCnt **ppOpen /* Return the openCnt structure here */ +++){ +++ int rc; +++ struct lockKey key1; +++ struct openKey key2; +++ struct stat statbuf; +++ struct lockInfo *pLock; +++ struct openCnt *pOpen; +++ rc = fstat(fd, &statbuf); +++ if( rc!=0 ) return 1; +++ memset(&key1, 0, sizeof(key1)); +++ key1.dev = statbuf.st_dev; +++ key1.ino = statbuf.st_ino; +++ key1.pid = getpid(); +++ memset(&key2, 0, sizeof(key2)); +++ key2.dev = statbuf.st_dev; +++ key2.ino = statbuf.st_ino; +++ pLock = (struct lockInfo*)sqliteHashFind(&lockHash, &key1, sizeof(key1)); +++ if( pLock==0 ){ +++ struct lockInfo *pOld; +++ pLock = sqliteMallocRaw( sizeof(*pLock) ); +++ if( pLock==0 ) return 1; +++ pLock->key = key1; +++ pLock->nRef = 1; +++ pLock->cnt = 0; +++ pOld = sqliteHashInsert(&lockHash, &pLock->key, sizeof(key1), pLock); +++ if( pOld!=0 ){ +++ assert( pOld==pLock ); +++ sqliteFree(pLock); +++ return 1; +++ } +++ }else{ +++ pLock->nRef++; +++ } +++ *ppLock = pLock; +++ pOpen = (struct openCnt*)sqliteHashFind(&openHash, &key2, sizeof(key2)); +++ if( pOpen==0 ){ +++ struct openCnt *pOld; +++ pOpen = sqliteMallocRaw( sizeof(*pOpen) ); +++ if( pOpen==0 ){ +++ releaseLockInfo(pLock); +++ return 1; +++ } +++ pOpen->key = key2; +++ pOpen->nRef = 1; +++ pOpen->nLock = 0; +++ pOpen->nPending = 0; +++ pOpen->aPending = 0; +++ pOld = sqliteHashInsert(&openHash, &pOpen->key, sizeof(key2), pOpen); +++ if( pOld!=0 ){ +++ assert( pOld==pOpen ); +++ sqliteFree(pOpen); +++ releaseLockInfo(pLock); +++ return 1; +++ } +++ }else{ +++ pOpen->nRef++; +++ } +++ *ppOpen = pOpen; +++ return 0; +++} +++ +++#endif /** POSIX advisory lock work-around **/ +++ +++/* +++** If we compile with the SQLITE_TEST macro set, then the following block +++** of code will give us the ability to simulate a disk I/O error. This +++** is used for testing the I/O recovery logic. +++*/ +++#ifdef SQLITE_TEST +++int sqlite_io_error_pending = 0; +++#define SimulateIOError(A) \ +++ if( sqlite_io_error_pending ) \ +++ if( sqlite_io_error_pending-- == 1 ){ local_ioerr(); return A; } +++static void local_ioerr(){ +++ sqlite_io_error_pending = 0; /* Really just a place to set a breakpoint */ +++} +++#else +++#define SimulateIOError(A) +++#endif +++ +++/* +++** When testing, keep a count of the number of open files. +++*/ +++#ifdef SQLITE_TEST +++int sqlite_open_file_count = 0; +++#define OpenCounter(X) sqlite_open_file_count+=(X) +++#else +++#define OpenCounter(X) +++#endif +++ +++ +++/* +++** Delete the named file +++*/ +++int sqliteOsDelete(const char *zFilename){ +++#if OS_UNIX +++ unlink(zFilename); +++#endif +++#if OS_WIN +++ DeleteFile(zFilename); +++#endif +++#if OS_MAC +++ unlink(zFilename); +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** Return TRUE if the named file exists. +++*/ +++int sqliteOsFileExists(const char *zFilename){ +++#if OS_UNIX +++ return access(zFilename, 0)==0; +++#endif +++#if OS_WIN +++ return GetFileAttributes(zFilename) != 0xffffffff; +++#endif +++#if OS_MAC +++ return access(zFilename, 0)==0; +++#endif +++} +++ +++ +++#if 0 /* NOT USED */ +++/* +++** Change the name of an existing file. +++*/ +++int sqliteOsFileRename(const char *zOldName, const char *zNewName){ +++#if OS_UNIX +++ if( link(zOldName, zNewName) ){ +++ return SQLITE_ERROR; +++ } +++ unlink(zOldName); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ if( !MoveFile(zOldName, zNewName) ){ +++ return SQLITE_ERROR; +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ /**** FIX ME ***/ +++ return SQLITE_ERROR; +++#endif +++} +++#endif /* NOT USED */ +++ +++/* +++** Attempt to open a file for both reading and writing. If that +++** fails, try opening it read-only. If the file does not exist, +++** try to create it. +++** +++** On success, a handle for the open file is written to *id +++** and *pReadonly is set to 0 if the file was opened for reading and +++** writing or 1 if the file was opened read-only. The function returns +++** SQLITE_OK. +++** +++** On failure, the function returns SQLITE_CANTOPEN and leaves +++** *id and *pReadonly unchanged. +++*/ +++int sqliteOsOpenReadWrite( +++ const char *zFilename, +++ OsFile *id, +++ int *pReadonly +++){ +++#if OS_UNIX +++ int rc; +++ id->dirfd = -1; +++ id->fd = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, 0644); +++ if( id->fd<0 ){ +++#ifdef EISDIR +++ if( errno==EISDIR ){ +++ return SQLITE_CANTOPEN; +++ } +++#endif +++ id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); +++ if( id->fd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ *pReadonly = 1; +++ }else{ +++ *pReadonly = 0; +++ } +++ sqliteOsEnterMutex(); +++ rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); +++ sqliteOsLeaveMutex(); +++ if( rc ){ +++ close(id->fd); +++ return SQLITE_NOMEM; +++ } +++ id->locked = 0; +++ TRACE3("OPEN %-3d %s\n", id->fd, zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ HANDLE h = CreateFile(zFilename, +++ GENERIC_READ | GENERIC_WRITE, +++ FILE_SHARE_READ | FILE_SHARE_WRITE, +++ NULL, +++ OPEN_ALWAYS, +++ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ h = CreateFile(zFilename, +++ GENERIC_READ, +++ FILE_SHARE_READ, +++ NULL, +++ OPEN_ALWAYS, +++ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ return SQLITE_CANTOPEN; +++ } +++ *pReadonly = 1; +++ }else{ +++ *pReadonly = 0; +++ } +++ id->h = h; +++ id->locked = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ FSSpec fsSpec; +++# ifdef _LARGE_FILE +++ HFSUniStr255 dfName; +++ FSRef fsRef; +++ if( __path2fss(zFilename, &fsSpec) != noErr ){ +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ } +++ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) +++ return SQLITE_CANTOPEN; +++ FSGetDataForkName(&dfName); +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdWrShPerm, &(id->refNum)) != noErr ){ +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdWrPerm, &(id->refNum)) != noErr ){ +++ if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++ else +++ *pReadonly = 1; +++ } else +++ *pReadonly = 0; +++ } else +++ *pReadonly = 0; +++# else +++ __path2fss(zFilename, &fsSpec); +++ if( !sqliteOsFileExists(zFilename) ){ +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ } +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNum)) != noErr ){ +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ){ +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++ else +++ *pReadonly = 1; +++ } else +++ *pReadonly = 0; +++ } else +++ *pReadonly = 0; +++# endif +++ if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){ +++ id->refNumRF = -1; +++ } +++ id->locked = 0; +++ id->delOnClose = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++} +++ +++ +++/* +++** Attempt to open a new file for exclusive access by this process. +++** The file will be opened for both reading and writing. To avoid +++** a potential security problem, we do not allow the file to have +++** previously existed. Nor do we allow the file to be a symbolic +++** link. +++** +++** If delFlag is true, then make arrangements to automatically delete +++** the file when it is closed. +++** +++** On success, write the file handle into *id and return SQLITE_OK. +++** +++** On failure, return SQLITE_CANTOPEN. +++*/ +++int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ +++#if OS_UNIX +++ int rc; +++ if( access(zFilename, 0)==0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ id->dirfd = -1; +++ id->fd = open(zFilename, +++ O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW|O_LARGEFILE|O_BINARY, 0600); +++ if( id->fd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ sqliteOsEnterMutex(); +++ rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); +++ sqliteOsLeaveMutex(); +++ if( rc ){ +++ close(id->fd); +++ unlink(zFilename); +++ return SQLITE_NOMEM; +++ } +++ id->locked = 0; +++ if( delFlag ){ +++ unlink(zFilename); +++ } +++ TRACE3("OPEN-EX %-3d %s\n", id->fd, zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ HANDLE h; +++ int fileflags; +++ if( delFlag ){ +++ fileflags = FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_RANDOM_ACCESS +++ | FILE_FLAG_DELETE_ON_CLOSE; +++ }else{ +++ fileflags = FILE_FLAG_RANDOM_ACCESS; +++ } +++ h = CreateFile(zFilename, +++ GENERIC_READ | GENERIC_WRITE, +++ 0, +++ NULL, +++ CREATE_ALWAYS, +++ fileflags, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ return SQLITE_CANTOPEN; +++ } +++ id->h = h; +++ id->locked = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ FSSpec fsSpec; +++# ifdef _LARGE_FILE +++ HFSUniStr255 dfName; +++ FSRef fsRef; +++ __path2fss(zFilename, &fsSpec); +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) +++ return SQLITE_CANTOPEN; +++ FSGetDataForkName(&dfName); +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdWrPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# else +++ __path2fss(zFilename, &fsSpec); +++ if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) +++ return SQLITE_CANTOPEN; +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# endif +++ id->refNumRF = -1; +++ id->locked = 0; +++ id->delOnClose = delFlag; +++ if (delFlag) +++ id->pathToDel = sqliteOsFullPathname(zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Attempt to open a new file for read-only access. +++** +++** On success, write the file handle into *id and return SQLITE_OK. +++** +++** On failure, return SQLITE_CANTOPEN. +++*/ +++int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ +++#if OS_UNIX +++ int rc; +++ id->dirfd = -1; +++ id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); +++ if( id->fd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ sqliteOsEnterMutex(); +++ rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); +++ sqliteOsLeaveMutex(); +++ if( rc ){ +++ close(id->fd); +++ return SQLITE_NOMEM; +++ } +++ id->locked = 0; +++ TRACE3("OPEN-RO %-3d %s\n", id->fd, zFilename); +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ HANDLE h = CreateFile(zFilename, +++ GENERIC_READ, +++ 0, +++ NULL, +++ OPEN_EXISTING, +++ FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, +++ NULL +++ ); +++ if( h==INVALID_HANDLE_VALUE ){ +++ return SQLITE_CANTOPEN; +++ } +++ id->h = h; +++ id->locked = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ FSSpec fsSpec; +++# ifdef _LARGE_FILE +++ HFSUniStr255 dfName; +++ FSRef fsRef; +++ if( __path2fss(zFilename, &fsSpec) != noErr ) +++ return SQLITE_CANTOPEN; +++ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) +++ return SQLITE_CANTOPEN; +++ FSGetDataForkName(&dfName); +++ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, +++ fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# else +++ __path2fss(zFilename, &fsSpec); +++ if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr ) +++ return SQLITE_CANTOPEN; +++# endif +++ if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){ +++ id->refNumRF = -1; +++ } +++ id->locked = 0; +++ id->delOnClose = 0; +++ OpenCounter(+1); +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Attempt to open a file descriptor for the directory that contains a +++** file. This file descriptor can be used to fsync() the directory +++** in order to make sure the creation of a new file is actually written +++** to disk. +++** +++** This routine is only meaningful for Unix. It is a no-op under +++** windows since windows does not support hard links. +++** +++** On success, a handle for a previously open file is at *id is +++** updated with the new directory file descriptor and SQLITE_OK is +++** returned. +++** +++** On failure, the function returns SQLITE_CANTOPEN and leaves +++** *id unchanged. +++*/ +++int sqliteOsOpenDirectory( +++ const char *zDirname, +++ OsFile *id +++){ +++#if OS_UNIX +++ if( id->fd<0 ){ +++ /* Do not open the directory if the corresponding file is not already +++ ** open. */ +++ return SQLITE_CANTOPEN; +++ } +++ assert( id->dirfd<0 ); +++ id->dirfd = open(zDirname, O_RDONLY|O_BINARY, 0644); +++ if( id->dirfd<0 ){ +++ return SQLITE_CANTOPEN; +++ } +++ TRACE3("OPENDIR %-3d %s\n", id->dirfd, zDirname); +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** If the following global variable points to a string which is the +++** name of a directory, then that directory will be used to store +++** temporary files. +++*/ +++const char *sqlite_temp_directory = 0; +++ +++/* +++** Create a temporary file name in zBuf. zBuf must be big enough to +++** hold at least SQLITE_TEMPNAME_SIZE characters. +++*/ +++int sqliteOsTempFileName(char *zBuf){ +++#if OS_UNIX +++ static const char *azDirs[] = { +++ 0, +++ "/var/tmp", +++ "/usr/tmp", +++ "/tmp", +++ ".", +++ }; +++ static unsigned char zChars[] = +++ "abcdefghijklmnopqrstuvwxyz" +++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +++ "0123456789"; +++ int i, j; +++ struct stat buf; +++ const char *zDir = "."; +++ azDirs[0] = sqlite_temp_directory; +++ for(i=0; i0 && zTempPath[i-1]=='\\'; i--){} +++ zTempPath[i] = 0; +++ zDir = zTempPath; +++ }else{ +++ zDir = sqlite_temp_directory; +++ } +++ for(;;){ +++ sprintf(zBuf, "%s\\"TEMP_FILE_PREFIX, zDir); +++ j = strlen(zBuf); +++ sqliteRandomness(15, &zBuf[j]); +++ for(i=0; i<15; i++, j++){ +++ zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ]; +++ } +++ zBuf[j] = 0; +++ if( !sqliteOsFileExists(zBuf) ) break; +++ } +++#endif +++#if OS_MAC +++ static char zChars[] = +++ "abcdefghijklmnopqrstuvwxyz" +++ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +++ "0123456789"; +++ int i, j; +++ char *zDir; +++ char zTempPath[SQLITE_TEMPNAME_SIZE]; +++ char zdirName[32]; +++ CInfoPBRec infoRec; +++ Str31 dirName; +++ memset(&infoRec, 0, sizeof(infoRec)); +++ memset(zTempPath, 0, SQLITE_TEMPNAME_SIZE); +++ if( sqlite_temp_directory!=0 ){ +++ zDir = sqlite_temp_directory; +++ }else if( FindFolder(kOnSystemDisk, kTemporaryFolderType, kCreateFolder, +++ &(infoRec.dirInfo.ioVRefNum), &(infoRec.dirInfo.ioDrParID)) == noErr ){ +++ infoRec.dirInfo.ioNamePtr = dirName; +++ do{ +++ infoRec.dirInfo.ioFDirIndex = -1; +++ infoRec.dirInfo.ioDrDirID = infoRec.dirInfo.ioDrParID; +++ if( PBGetCatInfoSync(&infoRec) == noErr ){ +++ CopyPascalStringToC(dirName, zdirName); +++ i = strlen(zdirName); +++ memmove(&(zTempPath[i+1]), zTempPath, strlen(zTempPath)); +++ strcpy(zTempPath, zdirName); +++ zTempPath[i] = ':'; +++ }else{ +++ *zTempPath = 0; +++ break; +++ } +++ } while( infoRec.dirInfo.ioDrDirID != fsRtDirID ); +++ zDir = zTempPath; +++ } +++ if( zDir[0]==0 ){ +++ getcwd(zTempPath, SQLITE_TEMPNAME_SIZE-24); +++ zDir = zTempPath; +++ } +++ for(;;){ +++ sprintf(zBuf, "%s"TEMP_FILE_PREFIX, zDir); +++ j = strlen(zBuf); +++ sqliteRandomness(15, &zBuf[j]); +++ for(i=0; i<15; i++, j++){ +++ zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ]; +++ } +++ zBuf[j] = 0; +++ if( !sqliteOsFileExists(zBuf) ) break; +++ } +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** Close a file. +++*/ +++int sqliteOsClose(OsFile *id){ +++#if OS_UNIX +++ sqliteOsUnlock(id); +++ if( id->dirfd>=0 ) close(id->dirfd); +++ id->dirfd = -1; +++ sqliteOsEnterMutex(); +++ if( id->pOpen->nLock ){ +++ /* If there are outstanding locks, do not actually close the file just +++ ** yet because that would clear those locks. Instead, add the file +++ ** descriptor to pOpen->aPending. It will be automatically closed when +++ ** the last lock is cleared. +++ */ +++ int *aNew; +++ struct openCnt *pOpen = id->pOpen; +++ pOpen->nPending++; +++ aNew = sqliteRealloc( pOpen->aPending, pOpen->nPending*sizeof(int) ); +++ if( aNew==0 ){ +++ /* If a malloc fails, just leak the file descriptor */ +++ }else{ +++ pOpen->aPending = aNew; +++ pOpen->aPending[pOpen->nPending-1] = id->fd; +++ } +++ }else{ +++ /* There are no outstanding locks so we can close the file immediately */ +++ close(id->fd); +++ } +++ releaseLockInfo(id->pLock); +++ releaseOpenCnt(id->pOpen); +++ sqliteOsLeaveMutex(); +++ TRACE2("CLOSE %-3d\n", id->fd); +++ OpenCounter(-1); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ CloseHandle(id->h); +++ OpenCounter(-1); +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ if( id->refNumRF!=-1 ) +++ FSClose(id->refNumRF); +++# ifdef _LARGE_FILE +++ FSCloseFork(id->refNum); +++# else +++ FSClose(id->refNum); +++# endif +++ if( id->delOnClose ){ +++ unlink(id->pathToDel); +++ sqliteFree(id->pathToDel); +++ } +++ OpenCounter(-1); +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Read data from a file into a buffer. Return SQLITE_OK if all +++** bytes were read successfully and SQLITE_IOERR if anything goes +++** wrong. +++*/ +++int sqliteOsRead(OsFile *id, void *pBuf, int amt){ +++#if OS_UNIX +++ int got; +++ SimulateIOError(SQLITE_IOERR); +++ TIMER_START; +++ got = read(id->fd, pBuf, amt); +++ TIMER_END; +++ TRACE4("READ %-3d %7d %d\n", id->fd, last_page, elapse); +++ SEEK(0); +++ /* if( got<0 ) got = 0; */ +++ if( got==amt ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++#if OS_WIN +++ DWORD got; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("READ %d\n", last_page); +++ if( !ReadFile(id->h, pBuf, amt, &got, 0) ){ +++ got = 0; +++ } +++ if( got==(DWORD)amt ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++#if OS_MAC +++ int got; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("READ %d\n", last_page); +++# ifdef _LARGE_FILE +++ FSReadFork(id->refNum, fsAtMark, 0, (ByteCount)amt, pBuf, (ByteCount*)&got); +++# else +++ got = amt; +++ FSRead(id->refNum, &got, pBuf); +++# endif +++ if( got==amt ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++} +++ +++/* +++** Write data from a buffer into a file. Return SQLITE_OK on success +++** or some other error code on failure. +++*/ +++int sqliteOsWrite(OsFile *id, const void *pBuf, int amt){ +++#if OS_UNIX +++ int wrote = 0; +++ SimulateIOError(SQLITE_IOERR); +++ TIMER_START; +++ while( amt>0 && (wrote = write(id->fd, pBuf, amt))>0 ){ +++ amt -= wrote; +++ pBuf = &((char*)pBuf)[wrote]; +++ } +++ TIMER_END; +++ TRACE4("WRITE %-3d %7d %d\n", id->fd, last_page, elapse); +++ SEEK(0); +++ if( amt>0 ){ +++ return SQLITE_FULL; +++ } +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ int rc; +++ DWORD wrote; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("WRITE %d\n", last_page); +++ while( amt>0 && (rc = WriteFile(id->h, pBuf, amt, &wrote, 0))!=0 && wrote>0 ){ +++ amt -= wrote; +++ pBuf = &((char*)pBuf)[wrote]; +++ } +++ if( !rc || amt>(int)wrote ){ +++ return SQLITE_FULL; +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ OSErr oserr; +++ int wrote = 0; +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("WRITE %d\n", last_page); +++ while( amt>0 ){ +++# ifdef _LARGE_FILE +++ oserr = FSWriteFork(id->refNum, fsAtMark, 0, +++ (ByteCount)amt, pBuf, (ByteCount*)&wrote); +++# else +++ wrote = amt; +++ oserr = FSWrite(id->refNum, &wrote, pBuf); +++# endif +++ if( wrote == 0 || oserr != noErr) +++ break; +++ amt -= wrote; +++ pBuf = &((char*)pBuf)[wrote]; +++ } +++ if( oserr != noErr || amt>wrote ){ +++ return SQLITE_FULL; +++ } +++ return SQLITE_OK; +++#endif +++} +++ +++/* +++** Move the read/write pointer in a file. +++*/ +++int sqliteOsSeek(OsFile *id, off_t offset){ +++ SEEK(offset/1024 + 1); +++#if OS_UNIX +++ lseek(id->fd, offset, SEEK_SET); +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ { +++ LONG upperBits = offset>>32; +++ LONG lowerBits = offset & 0xffffffff; +++ DWORD rc; +++ rc = SetFilePointer(id->h, lowerBits, &upperBits, FILE_BEGIN); +++ /* TRACE3("SEEK rc=0x%x upper=0x%x\n", rc, upperBits); */ +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++ { +++ off_t curSize; +++ if( sqliteOsFileSize(id, &curSize) != SQLITE_OK ){ +++ return SQLITE_IOERR; +++ } +++ if( offset >= curSize ){ +++ if( sqliteOsTruncate(id, offset+1) != SQLITE_OK ){ +++ return SQLITE_IOERR; +++ } +++ } +++# ifdef _LARGE_FILE +++ if( FSSetForkPosition(id->refNum, fsFromStart, offset) != noErr ){ +++# else +++ if( SetFPos(id->refNum, fsFromStart, offset) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++ } +++#endif +++} +++ +++#ifdef SQLITE_NOSYNC +++# define fsync(X) 0 +++#endif +++ +++/* +++** Make sure all writes to a particular file are committed to disk. +++** +++** Under Unix, also make sure that the directory entry for the file +++** has been created by fsync-ing the directory that contains the file. +++** If we do not do this and we encounter a power failure, the directory +++** entry for the journal might not exist after we reboot. The next +++** SQLite to access the file will not know that the journal exists (because +++** the directory entry for the journal was never created) and the transaction +++** will not roll back - possibly leading to database corruption. +++*/ +++int sqliteOsSync(OsFile *id){ +++#if OS_UNIX +++ SimulateIOError(SQLITE_IOERR); +++ TRACE2("SYNC %-3d\n", id->fd); +++ if( fsync(id->fd) ){ +++ return SQLITE_IOERR; +++ }else{ +++ if( id->dirfd>=0 ){ +++ TRACE2("DIRSYNC %-3d\n", id->dirfd); +++ fsync(id->dirfd); +++ close(id->dirfd); /* Only need to sync once, so close the directory */ +++ id->dirfd = -1; /* when we are done. */ +++ } +++ return SQLITE_OK; +++ } +++#endif +++#if OS_WIN +++ if( FlushFileBuffers(id->h) ){ +++ return SQLITE_OK; +++ }else{ +++ return SQLITE_IOERR; +++ } +++#endif +++#if OS_MAC +++# ifdef _LARGE_FILE +++ if( FSFlushFork(id->refNum) != noErr ){ +++# else +++ ParamBlockRec params; +++ memset(¶ms, 0, sizeof(ParamBlockRec)); +++ params.ioParam.ioRefNum = id->refNum; +++ if( PBFlushFileSync(¶ms) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++#endif +++} +++ +++/* +++** Truncate an open file to a specified size +++*/ +++int sqliteOsTruncate(OsFile *id, off_t nByte){ +++ SimulateIOError(SQLITE_IOERR); +++#if OS_UNIX +++ return ftruncate(id->fd, nByte)==0 ? SQLITE_OK : SQLITE_IOERR; +++#endif +++#if OS_WIN +++ { +++ LONG upperBits = nByte>>32; +++ SetFilePointer(id->h, nByte, &upperBits, FILE_BEGIN); +++ SetEndOfFile(id->h); +++ } +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++# ifdef _LARGE_FILE +++ if( FSSetForkSize(id->refNum, fsFromStart, nByte) != noErr){ +++# else +++ if( SetEOF(id->refNum, nByte) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++#endif +++} +++ +++/* +++** Determine the current size of a file in bytes +++*/ +++int sqliteOsFileSize(OsFile *id, off_t *pSize){ +++#if OS_UNIX +++ struct stat buf; +++ SimulateIOError(SQLITE_IOERR); +++ if( fstat(id->fd, &buf)!=0 ){ +++ return SQLITE_IOERR; +++ } +++ *pSize = buf.st_size; +++ return SQLITE_OK; +++#endif +++#if OS_WIN +++ DWORD upperBits, lowerBits; +++ SimulateIOError(SQLITE_IOERR); +++ lowerBits = GetFileSize(id->h, &upperBits); +++ *pSize = (((off_t)upperBits)<<32) + lowerBits; +++ return SQLITE_OK; +++#endif +++#if OS_MAC +++# ifdef _LARGE_FILE +++ if( FSGetForkSize(id->refNum, pSize) != noErr){ +++# else +++ if( GetEOF(id->refNum, pSize) != noErr ){ +++# endif +++ return SQLITE_IOERR; +++ }else{ +++ return SQLITE_OK; +++ } +++#endif +++} +++ +++#if OS_WIN +++/* +++** Return true (non-zero) if we are running under WinNT, Win2K or WinXP. +++** Return false (zero) for Win95, Win98, or WinME. +++** +++** Here is an interesting observation: Win95, Win98, and WinME lack +++** the LockFileEx() API. But we can still statically link against that +++** API as long as we don't call it win running Win95/98/ME. A call to +++** this routine is used to determine if the host is Win95/98/ME or +++** WinNT/2K/XP so that we will know whether or not we can safely call +++** the LockFileEx() API. +++*/ +++int isNT(void){ +++ static int osType = 0; /* 0=unknown 1=win95 2=winNT */ +++ if( osType==0 ){ +++ OSVERSIONINFO sInfo; +++ sInfo.dwOSVersionInfoSize = sizeof(sInfo); +++ GetVersionEx(&sInfo); +++ osType = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1; +++ } +++ return osType==2; +++} +++#endif +++ +++/* +++** Windows file locking notes: [similar issues apply to MacOS] +++** +++** We cannot use LockFileEx() or UnlockFileEx() on Win95/98/ME because +++** those functions are not available. So we use only LockFile() and +++** UnlockFile(). +++** +++** LockFile() prevents not just writing but also reading by other processes. +++** (This is a design error on the part of Windows, but there is nothing +++** we can do about that.) So the region used for locking is at the +++** end of the file where it is unlikely to ever interfere with an +++** actual read attempt. +++** +++** A database read lock is obtained by locking a single randomly-chosen +++** byte out of a specific range of bytes. The lock byte is obtained at +++** random so two separate readers can probably access the file at the +++** same time, unless they are unlucky and choose the same lock byte. +++** A database write lock is obtained by locking all bytes in the range. +++** There can only be one writer. +++** +++** A lock is obtained on the first byte of the lock range before acquiring +++** either a read lock or a write lock. This prevents two processes from +++** attempting to get a lock at a same time. The semantics of +++** sqliteOsReadLock() require that if there is already a write lock, that +++** lock is converted into a read lock atomically. The lock on the first +++** byte allows us to drop the old write lock and get the read lock without +++** another process jumping into the middle and messing us up. The same +++** argument applies to sqliteOsWriteLock(). +++** +++** On WinNT/2K/XP systems, LockFileEx() and UnlockFileEx() are available, +++** which means we can use reader/writer locks. When reader writer locks +++** are used, the lock is placed on the same range of bytes that is used +++** for probabilistic locking in Win95/98/ME. Hence, the locking scheme +++** will support two or more Win95 readers or two or more WinNT readers. +++** But a single Win95 reader will lock out all WinNT readers and a single +++** WinNT reader will lock out all other Win95 readers. +++** +++** Note: On MacOS we use the resource fork for locking. +++** +++** The following #defines specify the range of bytes used for locking. +++** N_LOCKBYTE is the number of bytes available for doing the locking. +++** The first byte used to hold the lock while the lock is changing does +++** not count toward this number. FIRST_LOCKBYTE is the address of +++** the first byte in the range of bytes used for locking. +++*/ +++#define N_LOCKBYTE 10239 +++#if OS_MAC +++# define FIRST_LOCKBYTE (0x000fffff - N_LOCKBYTE) +++#else +++# define FIRST_LOCKBYTE (0xffffffff - N_LOCKBYTE) +++#endif +++ +++/* +++** Change the status of the lock on the file "id" to be a readlock. +++** If the file was write locked, then this reduces the lock to a read. +++** If the file was read locked, then this acquires a new read lock. +++** +++** Return SQLITE_OK on success and SQLITE_BUSY on failure. If this +++** library was compiled with large file support (LFS) but LFS is not +++** available on the host, then an SQLITE_NOLFS is returned. +++*/ +++int sqliteOsReadLock(OsFile *id){ +++#if OS_UNIX +++ int rc; +++ sqliteOsEnterMutex(); +++ if( id->pLock->cnt>0 ){ +++ if( !id->locked ){ +++ id->pLock->cnt++; +++ id->locked = 1; +++ id->pOpen->nLock++; +++ } +++ rc = SQLITE_OK; +++ }else if( id->locked || id->pLock->cnt==0 ){ +++ struct flock lock; +++ int s; +++ lock.l_type = F_RDLCK; +++ lock.l_whence = SEEK_SET; +++ lock.l_start = lock.l_len = 0L; +++ s = fcntl(id->fd, F_SETLK, &lock); +++ if( s!=0 ){ +++ rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; +++ }else{ +++ rc = SQLITE_OK; +++ if( !id->locked ){ +++ id->pOpen->nLock++; +++ id->locked = 1; +++ } +++ id->pLock->cnt = 1; +++ } +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ sqliteOsLeaveMutex(); +++ return rc; +++#endif +++#if OS_WIN +++ int rc; +++ if( id->locked>0 ){ +++ rc = SQLITE_OK; +++ }else{ +++ int lk; +++ int res; +++ int cnt = 100; +++ sqliteRandomness(sizeof(lk), &lk); +++ lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1; +++ while( cnt-->0 && (res = LockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0))==0 ){ +++ Sleep(1); +++ } +++ if( res ){ +++ UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ if( isNT() ){ +++ OVERLAPPED ovlp; +++ ovlp.Offset = FIRST_LOCKBYTE+1; +++ ovlp.OffsetHigh = 0; +++ ovlp.hEvent = 0; +++ res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, +++ 0, N_LOCKBYTE, 0, &ovlp); +++ }else{ +++ res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0); +++ } +++ UnlockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0); +++ } +++ if( res ){ +++ id->locked = lk; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++#if OS_MAC +++ int rc; +++ if( id->locked>0 || id->refNumRF == -1 ){ +++ rc = SQLITE_OK; +++ }else{ +++ int lk; +++ OSErr res; +++ int cnt = 5; +++ ParamBlockRec params; +++ sqliteRandomness(sizeof(lk), &lk); +++ lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1; +++ memset(¶ms, 0, sizeof(params)); +++ params.ioParam.ioRefNum = id->refNumRF; +++ params.ioParam.ioPosMode = fsFromStart; +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ +++ UInt32 finalTicks; +++ Delay(1, &finalTicks); /* 1/60 sec */ +++ } +++ if( res == noErr ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; +++ params.ioParam.ioReqCount = N_LOCKBYTE; +++ PBUnlockRangeSync(¶ms); +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; +++ params.ioParam.ioReqCount = 1; +++ res = PBLockRangeSync(¶ms); +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ PBUnlockRangeSync(¶ms); +++ } +++ if( res == noErr ){ +++ id->locked = lk; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++} +++ +++/* +++** Change the lock status to be an exclusive or write lock. Return +++** SQLITE_OK on success and SQLITE_BUSY on a failure. If this +++** library was compiled with large file support (LFS) but LFS is not +++** available on the host, then an SQLITE_NOLFS is returned. +++*/ +++int sqliteOsWriteLock(OsFile *id){ +++#if OS_UNIX +++ int rc; +++ sqliteOsEnterMutex(); +++ if( id->pLock->cnt==0 || (id->pLock->cnt==1 && id->locked==1) ){ +++ struct flock lock; +++ int s; +++ lock.l_type = F_WRLCK; +++ lock.l_whence = SEEK_SET; +++ lock.l_start = lock.l_len = 0L; +++ s = fcntl(id->fd, F_SETLK, &lock); +++ if( s!=0 ){ +++ rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; +++ }else{ +++ rc = SQLITE_OK; +++ if( !id->locked ){ +++ id->pOpen->nLock++; +++ id->locked = 1; +++ } +++ id->pLock->cnt = -1; +++ } +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ sqliteOsLeaveMutex(); +++ return rc; +++#endif +++#if OS_WIN +++ int rc; +++ if( id->locked<0 ){ +++ rc = SQLITE_OK; +++ }else{ +++ int res; +++ int cnt = 100; +++ while( cnt-->0 && (res = LockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0))==0 ){ +++ Sleep(1); +++ } +++ if( res ){ +++ if( id->locked>0 ){ +++ if( isNT() ){ +++ UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ }else{ +++ res = UnlockFile(id->h, FIRST_LOCKBYTE + id->locked, 0, 1, 0); +++ } +++ } +++ if( res ){ +++ res = LockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ }else{ +++ res = 0; +++ } +++ UnlockFile(id->h, FIRST_LOCKBYTE, 0, 1, 0); +++ } +++ if( res ){ +++ id->locked = -1; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++#if OS_MAC +++ int rc; +++ if( id->locked<0 || id->refNumRF == -1 ){ +++ rc = SQLITE_OK; +++ }else{ +++ OSErr res; +++ int cnt = 5; +++ ParamBlockRec params; +++ memset(¶ms, 0, sizeof(params)); +++ params.ioParam.ioRefNum = id->refNumRF; +++ params.ioParam.ioPosMode = fsFromStart; +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ +++ UInt32 finalTicks; +++ Delay(1, &finalTicks); /* 1/60 sec */ +++ } +++ if( res == noErr ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; +++ params.ioParam.ioReqCount = 1; +++ if( id->locked==0 +++ || PBUnlockRangeSync(¶ms)==noErr ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; +++ params.ioParam.ioReqCount = N_LOCKBYTE; +++ res = PBLockRangeSync(¶ms); +++ }else{ +++ res = afpRangeNotLocked; +++ } +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE; +++ params.ioParam.ioReqCount = 1; +++ PBUnlockRangeSync(¶ms); +++ } +++ if( res == noErr ){ +++ id->locked = -1; +++ rc = SQLITE_OK; +++ }else{ +++ rc = SQLITE_BUSY; +++ } +++ } +++ return rc; +++#endif +++} +++ +++/* +++** Unlock the given file descriptor. If the file descriptor was +++** not previously locked, then this routine is a no-op. If this +++** library was compiled with large file support (LFS) but LFS is not +++** available on the host, then an SQLITE_NOLFS is returned. +++*/ +++int sqliteOsUnlock(OsFile *id){ +++#if OS_UNIX +++ int rc; +++ if( !id->locked ) return SQLITE_OK; +++ sqliteOsEnterMutex(); +++ assert( id->pLock->cnt!=0 ); +++ if( id->pLock->cnt>1 ){ +++ id->pLock->cnt--; +++ rc = SQLITE_OK; +++ }else{ +++ struct flock lock; +++ int s; +++ lock.l_type = F_UNLCK; +++ lock.l_whence = SEEK_SET; +++ lock.l_start = lock.l_len = 0L; +++ s = fcntl(id->fd, F_SETLK, &lock); +++ if( s!=0 ){ +++ rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; +++ }else{ +++ rc = SQLITE_OK; +++ id->pLock->cnt = 0; +++ } +++ } +++ if( rc==SQLITE_OK ){ +++ /* Decrement the count of locks against this same file. When the +++ ** count reaches zero, close any other file descriptors whose close +++ ** was deferred because of outstanding locks. +++ */ +++ struct openCnt *pOpen = id->pOpen; +++ pOpen->nLock--; +++ assert( pOpen->nLock>=0 ); +++ if( pOpen->nLock==0 && pOpen->nPending>0 ){ +++ int i; +++ for(i=0; inPending; i++){ +++ close(pOpen->aPending[i]); +++ } +++ sqliteFree(pOpen->aPending); +++ pOpen->nPending = 0; +++ pOpen->aPending = 0; +++ } +++ } +++ sqliteOsLeaveMutex(); +++ id->locked = 0; +++ return rc; +++#endif +++#if OS_WIN +++ int rc; +++ if( id->locked==0 ){ +++ rc = SQLITE_OK; +++ }else if( isNT() || id->locked<0 ){ +++ UnlockFile(id->h, FIRST_LOCKBYTE+1, 0, N_LOCKBYTE, 0); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ }else{ +++ UnlockFile(id->h, FIRST_LOCKBYTE+id->locked, 0, 1, 0); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ } +++ return rc; +++#endif +++#if OS_MAC +++ int rc; +++ ParamBlockRec params; +++ memset(¶ms, 0, sizeof(params)); +++ params.ioParam.ioRefNum = id->refNumRF; +++ params.ioParam.ioPosMode = fsFromStart; +++ if( id->locked==0 || id->refNumRF == -1 ){ +++ rc = SQLITE_OK; +++ }else if( id->locked<0 ){ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; +++ params.ioParam.ioReqCount = N_LOCKBYTE; +++ PBUnlockRangeSync(¶ms); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ }else{ +++ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; +++ params.ioParam.ioReqCount = 1; +++ PBUnlockRangeSync(¶ms); +++ rc = SQLITE_OK; +++ id->locked = 0; +++ } +++ return rc; +++#endif +++} +++ +++/* +++** Get information to seed the random number generator. The seed +++** is written into the buffer zBuf[256]. The calling function must +++** supply a sufficiently large buffer. +++*/ +++int sqliteOsRandomSeed(char *zBuf){ +++ /* We have to initialize zBuf to prevent valgrind from reporting +++ ** errors. The reports issued by valgrind are incorrect - we would +++ ** prefer that the randomness be increased by making use of the +++ ** uninitialized space in zBuf - but valgrind errors tend to worry +++ ** some users. Rather than argue, it seems easier just to initialize +++ ** the whole array and silence valgrind, even if that means less randomness +++ ** in the random seed. +++ ** +++ ** When testing, initializing zBuf[] to zero is all we do. That means +++ ** that we always use the same random number sequence.* This makes the +++ ** tests repeatable. +++ */ +++ memset(zBuf, 0, 256); +++#if OS_UNIX && !defined(SQLITE_TEST) +++ { +++ int pid; +++ time((time_t*)zBuf); +++ pid = getpid(); +++ memcpy(&zBuf[sizeof(time_t)], &pid, sizeof(pid)); +++ } +++#endif +++#if OS_WIN && !defined(SQLITE_TEST) +++ GetSystemTime((LPSYSTEMTIME)zBuf); +++#endif +++#if OS_MAC +++ { +++ int pid; +++ Microseconds((UnsignedWide*)zBuf); +++ pid = getpid(); +++ memcpy(&zBuf[sizeof(UnsignedWide)], &pid, sizeof(pid)); +++ } +++#endif +++ return SQLITE_OK; +++} +++ +++/* +++** Sleep for a little while. Return the amount of time slept. +++*/ +++int sqliteOsSleep(int ms){ +++#if OS_UNIX +++#if defined(HAVE_USLEEP) && HAVE_USLEEP +++ usleep(ms*1000); +++ return ms; +++#else +++ sleep((ms+999)/1000); +++ return 1000*((ms+999)/1000); +++#endif +++#endif +++#if OS_WIN +++ Sleep(ms); +++ return ms; +++#endif +++#if OS_MAC +++ UInt32 finalTicks; +++ UInt32 ticks = (((UInt32)ms+16)*3)/50; /* 1/60 sec per tick */ +++ Delay(ticks, &finalTicks); +++ return (int)((ticks*50)/3); +++#endif +++} +++ +++/* +++** Static variables used for thread synchronization +++*/ +++static int inMutex = 0; +++#ifdef SQLITE_UNIX_THREADS +++ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +++#endif +++#ifdef SQLITE_W32_THREADS +++ static CRITICAL_SECTION cs; +++#endif +++#ifdef SQLITE_MACOS_MULTITASKING +++ static MPCriticalRegionID criticalRegion; +++#endif +++ +++/* +++** The following pair of routine implement mutual exclusion for +++** multi-threaded processes. Only a single thread is allowed to +++** executed code that is surrounded by EnterMutex() and LeaveMutex(). +++** +++** SQLite uses only a single Mutex. There is not much critical +++** code and what little there is executes quickly and without blocking. +++*/ +++void sqliteOsEnterMutex(){ +++#ifdef SQLITE_UNIX_THREADS +++ pthread_mutex_lock(&mutex); +++#endif +++#ifdef SQLITE_W32_THREADS +++ static int isInit = 0; +++ while( !isInit ){ +++ static long lock = 0; +++ if( InterlockedIncrement(&lock)==1 ){ +++ InitializeCriticalSection(&cs); +++ isInit = 1; +++ }else{ +++ Sleep(1); +++ } +++ } +++ EnterCriticalSection(&cs); +++#endif +++#ifdef SQLITE_MACOS_MULTITASKING +++ static volatile int notInit = 1; +++ if( notInit ){ +++ if( notInit == 2 ) /* as close as you can get to thread safe init */ +++ MPYield(); +++ else{ +++ notInit = 2; +++ MPCreateCriticalRegion(&criticalRegion); +++ notInit = 0; +++ } +++ } +++ MPEnterCriticalRegion(criticalRegion, kDurationForever); +++#endif +++ assert( !inMutex ); +++ inMutex = 1; +++} +++void sqliteOsLeaveMutex(){ +++ assert( inMutex ); +++ inMutex = 0; +++#ifdef SQLITE_UNIX_THREADS +++ pthread_mutex_unlock(&mutex); +++#endif +++#ifdef SQLITE_W32_THREADS +++ LeaveCriticalSection(&cs); +++#endif +++#ifdef SQLITE_MACOS_MULTITASKING +++ MPExitCriticalRegion(criticalRegion); +++#endif +++} +++ +++/* +++** Turn a relative pathname into a full pathname. Return a pointer +++** to the full pathname stored in space obtained from sqliteMalloc(). +++** The calling function is responsible for freeing this space once it +++** is no longer needed. +++*/ +++char *sqliteOsFullPathname(const char *zRelative){ +++#if OS_UNIX +++ char *zFull = 0; +++ if( zRelative[0]=='/' ){ +++ sqliteSetString(&zFull, zRelative, (char*)0); +++ }else{ +++ char zBuf[5000]; +++ zBuf[0] = 0; +++ sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), "/", zRelative, +++ (char*)0); +++ } +++ return zFull; +++#endif +++#if OS_WIN +++ char *zNotUsed; +++ char *zFull; +++ int nByte; +++ nByte = GetFullPathName(zRelative, 0, 0, &zNotUsed) + 1; +++ zFull = sqliteMalloc( nByte ); +++ if( zFull==0 ) return 0; +++ GetFullPathName(zRelative, nByte, zFull, &zNotUsed); +++ return zFull; +++#endif +++#if OS_MAC +++ char *zFull = 0; +++ if( zRelative[0]==':' ){ +++ char zBuf[_MAX_PATH+1]; +++ sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), &(zRelative[1]), +++ (char*)0); +++ }else{ +++ if( strchr(zRelative, ':') ){ +++ sqliteSetString(&zFull, zRelative, (char*)0); +++ }else{ +++ char zBuf[_MAX_PATH+1]; +++ sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), zRelative, (char*)0); +++ } +++ } +++ return zFull; +++#endif +++} +++ +++/* +++** The following variable, if set to a non-zero value, becomes the result +++** returned from sqliteOsCurrentTime(). This is used for testing. +++*/ +++#ifdef SQLITE_TEST +++int sqlite_current_time = 0; +++#endif +++ +++/* +++** Find the current time (in Universal Coordinated Time). Write the +++** current time and date as a Julian Day number into *prNow and +++** return 0. Return 1 if the time and date cannot be found. +++*/ +++int sqliteOsCurrentTime(double *prNow){ +++#if OS_UNIX +++ time_t t; +++ time(&t); +++ *prNow = t/86400.0 + 2440587.5; +++#endif +++#if OS_WIN +++ FILETIME ft; +++ /* FILETIME structure is a 64-bit value representing the number of +++ 100-nanosecond intervals since January 1, 1601 (= JD 2305813.5). +++ */ +++ double now; +++ GetSystemTimeAsFileTime( &ft ); +++ now = ((double)ft.dwHighDateTime) * 4294967296.0; +++ *prNow = (now + ft.dwLowDateTime)/864000000000.0 + 2305813.5; +++#endif +++#ifdef SQLITE_TEST +++ if( sqlite_current_time ){ +++ *prNow = sqlite_current_time/86400.0 + 2440587.5; +++ } +++#endif +++ return 0; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/os.h ++@@ -0,0 +1,191 @@ +++/* +++** 2001 September 16 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++****************************************************************************** +++** +++** This header file (together with is companion C source-code file +++** "os.c") attempt to abstract the underlying operating system so that +++** the SQLite library will work on both POSIX and windows systems. +++*/ +++#ifndef _SQLITE_OS_H_ +++#define _SQLITE_OS_H_ +++ +++/* +++** Helpful hint: To get this to compile on HP/UX, add -D_INCLUDE_POSIX_SOURCE +++** to the compiler command line. +++*/ +++ +++/* +++** These #defines should enable >2GB file support on Posix if the +++** underlying operating system supports it. If the OS lacks +++** large file support, or if the OS is windows, these should be no-ops. +++** +++** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch +++** on the compiler command line. This is necessary if you are compiling +++** on a recent machine (ex: RedHat 7.2) but you want your code to work +++** on an older machine (ex: RedHat 6.0). If you compile on RedHat 7.2 +++** without this option, LFS is enable. But LFS does not exist in the kernel +++** in RedHat 6.0, so the code won't work. Hence, for maximum binary +++** portability you should omit LFS. +++** +++** Similar is true for MacOS. LFS is only supported on MacOS 9 and later. +++*/ +++#ifndef SQLITE_DISABLE_LFS +++# define _LARGE_FILE 1 +++# ifndef _FILE_OFFSET_BITS +++# define _FILE_OFFSET_BITS 64 +++# endif +++# define _LARGEFILE_SOURCE 1 +++#endif +++ +++/* +++** Temporary files are named starting with this prefix followed by 16 random +++** alphanumeric characters, and no file extension. They are stored in the +++** OS's standard temporary file directory, and are deleted prior to exit. +++** If sqlite is being embedded in another program, you may wish to change the +++** prefix to reflect your program's name, so that if your program exits +++** prematurely, old temporary files can be easily identified. This can be done +++** using -DTEMP_FILE_PREFIX=myprefix_ on the compiler command line. +++*/ +++#ifndef TEMP_FILE_PREFIX +++# define TEMP_FILE_PREFIX "sqlite_" +++#endif +++ +++/* +++** Figure out if we are dealing with Unix, Windows or MacOS. +++** +++** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix. +++** The MacOS build is designed to use CodeWarrior (tested with v8) +++*/ +++#ifndef OS_UNIX +++# ifndef OS_WIN +++# ifndef OS_MAC +++# if defined(__MACOS__) +++# define OS_MAC 1 +++# define OS_WIN 0 +++# define OS_UNIX 0 +++# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) +++# define OS_MAC 0 +++# define OS_WIN 1 +++# define OS_UNIX 0 +++# else +++# define OS_MAC 0 +++# define OS_WIN 0 +++# define OS_UNIX 1 +++# endif +++# else +++# define OS_WIN 0 +++# define OS_UNIX 0 +++# endif +++# else +++# define OS_MAC 0 +++# define OS_UNIX 0 +++# endif +++#else +++# define OS_MAC 0 +++# ifndef OS_WIN +++# define OS_WIN 0 +++# endif +++#endif +++ +++/* +++** A handle for an open file is stored in an OsFile object. +++*/ +++#if OS_UNIX +++# include +++# include +++# include +++# include +++ typedef struct OsFile OsFile; +++ struct OsFile { +++ struct openCnt *pOpen; /* Info about all open fd's on this inode */ +++ struct lockInfo *pLock; /* Info about locks on this inode */ +++ int fd; /* The file descriptor */ +++ int locked; /* True if this instance holds the lock */ +++ int dirfd; /* File descriptor for the directory */ +++ }; +++# define SQLITE_TEMPNAME_SIZE 200 +++# if defined(HAVE_USLEEP) && HAVE_USLEEP +++# define SQLITE_MIN_SLEEP_MS 1 +++# else +++# define SQLITE_MIN_SLEEP_MS 1000 +++# endif +++#endif +++ +++#if OS_WIN +++#include +++#include +++ typedef struct OsFile OsFile; +++ struct OsFile { +++ HANDLE h; /* Handle for accessing the file */ +++ int locked; /* 0: unlocked, <0: write lock, >0: read lock */ +++ }; +++# if defined(_MSC_VER) || defined(__BORLANDC__) +++ typedef __int64 off_t; +++# else +++# if !defined(_CYGWIN_TYPES_H) +++ typedef long long off_t; +++# if defined(__MINGW32__) +++# define _OFF_T_ +++# endif +++# endif +++# endif +++# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50) +++# define SQLITE_MIN_SLEEP_MS 1 +++#endif +++ +++#if OS_MAC +++# include +++# include +++ typedef struct OsFile OsFile; +++ struct OsFile { +++ SInt16 refNum; /* Data fork/file reference number */ +++ SInt16 refNumRF; /* Resource fork reference number (for locking) */ +++ int locked; /* 0: unlocked, <0: write lock, >0: read lock */ +++ int delOnClose; /* True if file is to be deleted on close */ +++ char *pathToDel; /* Name of file to delete on close */ +++ }; +++# ifdef _LARGE_FILE +++ typedef SInt64 off_t; +++# else +++ typedef SInt32 off_t; +++# endif +++# define SQLITE_TEMPNAME_SIZE _MAX_PATH +++# define SQLITE_MIN_SLEEP_MS 17 +++#endif +++ +++int sqliteOsDelete(const char*); +++int sqliteOsFileExists(const char*); +++int sqliteOsFileRename(const char*, const char*); +++int sqliteOsOpenReadWrite(const char*, OsFile*, int*); +++int sqliteOsOpenExclusive(const char*, OsFile*, int); +++int sqliteOsOpenReadOnly(const char*, OsFile*); +++int sqliteOsOpenDirectory(const char*, OsFile*); +++int sqliteOsTempFileName(char*); +++int sqliteOsClose(OsFile*); +++int sqliteOsRead(OsFile*, void*, int amt); +++int sqliteOsWrite(OsFile*, const void*, int amt); +++int sqliteOsSeek(OsFile*, off_t offset); +++int sqliteOsSync(OsFile*); +++int sqliteOsTruncate(OsFile*, off_t size); +++int sqliteOsFileSize(OsFile*, off_t *pSize); +++int sqliteOsReadLock(OsFile*); +++int sqliteOsWriteLock(OsFile*); +++int sqliteOsUnlock(OsFile*); +++int sqliteOsRandomSeed(char*); +++int sqliteOsSleep(int ms); +++int sqliteOsCurrentTime(double*); +++void sqliteOsEnterMutex(void); +++void sqliteOsLeaveMutex(void); +++char *sqliteOsFullPathname(const char*); +++ +++ +++ +++#endif /* _SQLITE_OS_H_ */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/pager.c ++@@ -0,0 +1,2220 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This is the implementation of the page cache subsystem or "pager". +++** +++** The pager is used to access a database disk file. It implements +++** atomic commit and rollback through the use of a journal file that +++** is separate from the database file. The pager also implements file +++** locking to prevent two processes from writing the same database +++** file simultaneously, or one process from reading the database while +++** another is writing. +++** +++** @(#) $Id$ +++*/ +++#include "os.h" /* Must be first to enable large file support */ +++#include "sqliteInt.h" +++#include "pager.h" +++#include +++#include +++ +++/* +++** Macros for troubleshooting. Normally turned off +++*/ +++#if 0 +++static Pager *mainPager = 0; +++#define SET_PAGER(X) if( mainPager==0 ) mainPager = (X) +++#define CLR_PAGER(X) if( mainPager==(X) ) mainPager = 0 +++#define TRACE1(X) if( pPager==mainPager ) fprintf(stderr,X) +++#define TRACE2(X,Y) if( pPager==mainPager ) fprintf(stderr,X,Y) +++#define TRACE3(X,Y,Z) if( pPager==mainPager ) fprintf(stderr,X,Y,Z) +++#else +++#define SET_PAGER(X) +++#define CLR_PAGER(X) +++#define TRACE1(X) +++#define TRACE2(X,Y) +++#define TRACE3(X,Y,Z) +++#endif +++ +++ +++/* +++** The page cache as a whole is always in one of the following +++** states: +++** +++** SQLITE_UNLOCK The page cache is not currently reading or +++** writing the database file. There is no +++** data held in memory. This is the initial +++** state. +++** +++** SQLITE_READLOCK The page cache is reading the database. +++** Writing is not permitted. There can be +++** multiple readers accessing the same database +++** file at the same time. +++** +++** SQLITE_WRITELOCK The page cache is writing the database. +++** Access is exclusive. No other processes or +++** threads can be reading or writing while one +++** process is writing. +++** +++** The page cache comes up in SQLITE_UNLOCK. The first time a +++** sqlite_page_get() occurs, the state transitions to SQLITE_READLOCK. +++** After all pages have been released using sqlite_page_unref(), +++** the state transitions back to SQLITE_UNLOCK. The first time +++** that sqlite_page_write() is called, the state transitions to +++** SQLITE_WRITELOCK. (Note that sqlite_page_write() can only be +++** called on an outstanding page which means that the pager must +++** be in SQLITE_READLOCK before it transitions to SQLITE_WRITELOCK.) +++** The sqlite_page_rollback() and sqlite_page_commit() functions +++** transition the state from SQLITE_WRITELOCK back to SQLITE_READLOCK. +++*/ +++#define SQLITE_UNLOCK 0 +++#define SQLITE_READLOCK 1 +++#define SQLITE_WRITELOCK 2 +++ +++ +++/* +++** Each in-memory image of a page begins with the following header. +++** This header is only visible to this pager module. The client +++** code that calls pager sees only the data that follows the header. +++** +++** Client code should call sqlitepager_write() on a page prior to making +++** any modifications to that page. The first time sqlitepager_write() +++** is called, the original page contents are written into the rollback +++** journal and PgHdr.inJournal and PgHdr.needSync are set. Later, once +++** the journal page has made it onto the disk surface, PgHdr.needSync +++** is cleared. The modified page cannot be written back into the original +++** database file until the journal pages has been synced to disk and the +++** PgHdr.needSync has been cleared. +++** +++** The PgHdr.dirty flag is set when sqlitepager_write() is called and +++** is cleared again when the page content is written back to the original +++** database file. +++*/ +++typedef struct PgHdr PgHdr; +++struct PgHdr { +++ Pager *pPager; /* The pager to which this page belongs */ +++ Pgno pgno; /* The page number for this page */ +++ PgHdr *pNextHash, *pPrevHash; /* Hash collision chain for PgHdr.pgno */ +++ int nRef; /* Number of users of this page */ +++ PgHdr *pNextFree, *pPrevFree; /* Freelist of pages where nRef==0 */ +++ PgHdr *pNextAll, *pPrevAll; /* A list of all pages */ +++ PgHdr *pNextCkpt, *pPrevCkpt; /* List of pages in the checkpoint journal */ +++ u8 inJournal; /* TRUE if has been written to journal */ +++ u8 inCkpt; /* TRUE if written to the checkpoint journal */ +++ u8 dirty; /* TRUE if we need to write back changes */ +++ u8 needSync; /* Sync journal before writing this page */ +++ u8 alwaysRollback; /* Disable dont_rollback() for this page */ +++ PgHdr *pDirty; /* Dirty pages sorted by PgHdr.pgno */ +++ /* SQLITE_PAGE_SIZE bytes of page data follow this header */ +++ /* Pager.nExtra bytes of local data follow the page data */ +++}; +++ +++ +++/* +++** A macro used for invoking the codec if there is one +++*/ +++#ifdef SQLITE_HAS_CODEC +++# define CODEC(P,D,N,X) if( P->xCodec ){ P->xCodec(P->pCodecArg,D,N,X); } +++#else +++# define CODEC(P,D,N,X) +++#endif +++ +++/* +++** Convert a pointer to a PgHdr into a pointer to its data +++** and back again. +++*/ +++#define PGHDR_TO_DATA(P) ((void*)(&(P)[1])) +++#define DATA_TO_PGHDR(D) (&((PgHdr*)(D))[-1]) +++#define PGHDR_TO_EXTRA(P) ((void*)&((char*)(&(P)[1]))[SQLITE_PAGE_SIZE]) +++ +++/* +++** How big to make the hash table used for locating in-memory pages +++** by page number. +++*/ +++#define N_PG_HASH 2048 +++ +++/* +++** Hash a page number +++*/ +++#define pager_hash(PN) ((PN)&(N_PG_HASH-1)) +++ +++/* +++** A open page cache is an instance of the following structure. +++*/ +++struct Pager { +++ char *zFilename; /* Name of the database file */ +++ char *zJournal; /* Name of the journal file */ +++ char *zDirectory; /* Directory hold database and journal files */ +++ OsFile fd, jfd; /* File descriptors for database and journal */ +++ OsFile cpfd; /* File descriptor for the checkpoint journal */ +++ int dbSize; /* Number of pages in the file */ +++ int origDbSize; /* dbSize before the current change */ +++ int ckptSize; /* Size of database (in pages) at ckpt_begin() */ +++ off_t ckptJSize; /* Size of journal at ckpt_begin() */ +++ int nRec; /* Number of pages written to the journal */ +++ u32 cksumInit; /* Quasi-random value added to every checksum */ +++ int ckptNRec; /* Number of records in the checkpoint journal */ +++ int nExtra; /* Add this many bytes to each in-memory page */ +++ void (*xDestructor)(void*); /* Call this routine when freeing pages */ +++ int nPage; /* Total number of in-memory pages */ +++ int nRef; /* Number of in-memory pages with PgHdr.nRef>0 */ +++ int mxPage; /* Maximum number of pages to hold in cache */ +++ int nHit, nMiss, nOvfl; /* Cache hits, missing, and LRU overflows */ +++ void (*xCodec)(void*,void*,Pgno,int); /* Routine for en/decoding data */ +++ void *pCodecArg; /* First argument to xCodec() */ +++ u8 journalOpen; /* True if journal file descriptors is valid */ +++ u8 journalStarted; /* True if header of journal is synced */ +++ u8 useJournal; /* Use a rollback journal on this file */ +++ u8 ckptOpen; /* True if the checkpoint journal is open */ +++ u8 ckptInUse; /* True we are in a checkpoint */ +++ u8 ckptAutoopen; /* Open ckpt journal when main journal is opened*/ +++ u8 noSync; /* Do not sync the journal if true */ +++ u8 fullSync; /* Do extra syncs of the journal for robustness */ +++ u8 state; /* SQLITE_UNLOCK, _READLOCK or _WRITELOCK */ +++ u8 errMask; /* One of several kinds of errors */ +++ u8 tempFile; /* zFilename is a temporary file */ +++ u8 readOnly; /* True for a read-only database */ +++ u8 needSync; /* True if an fsync() is needed on the journal */ +++ u8 dirtyFile; /* True if database file has changed in any way */ +++ u8 alwaysRollback; /* Disable dont_rollback() for all pages */ +++ u8 *aInJournal; /* One bit for each page in the database file */ +++ u8 *aInCkpt; /* One bit for each page in the database */ +++ PgHdr *pFirst, *pLast; /* List of free pages */ +++ PgHdr *pFirstSynced; /* First free page with PgHdr.needSync==0 */ +++ PgHdr *pAll; /* List of all pages */ +++ PgHdr *pCkpt; /* List of pages in the checkpoint journal */ +++ PgHdr *aHash[N_PG_HASH]; /* Hash table to map page number of PgHdr */ +++}; +++ +++/* +++** These are bits that can be set in Pager.errMask. +++*/ +++#define PAGER_ERR_FULL 0x01 /* a write() failed */ +++#define PAGER_ERR_MEM 0x02 /* malloc() failed */ +++#define PAGER_ERR_LOCK 0x04 /* error in the locking protocol */ +++#define PAGER_ERR_CORRUPT 0x08 /* database or journal corruption */ +++#define PAGER_ERR_DISK 0x10 /* general disk I/O error - bad hard drive? */ +++ +++/* +++** The journal file contains page records in the following +++** format. +++** +++** Actually, this structure is the complete page record for pager +++** formats less than 3. Beginning with format 3, this record is surrounded +++** by two checksums. +++*/ +++typedef struct PageRecord PageRecord; +++struct PageRecord { +++ Pgno pgno; /* The page number */ +++ char aData[SQLITE_PAGE_SIZE]; /* Original data for page pgno */ +++}; +++ +++/* +++** Journal files begin with the following magic string. The data +++** was obtained from /dev/random. It is used only as a sanity check. +++** +++** There are three journal formats (so far). The 1st journal format writes +++** 32-bit integers in the byte-order of the host machine. New +++** formats writes integers as big-endian. All new journals use the +++** new format, but we have to be able to read an older journal in order +++** to rollback journals created by older versions of the library. +++** +++** The 3rd journal format (added for 2.8.0) adds additional sanity +++** checking information to the journal. If the power fails while the +++** journal is being written, semi-random garbage data might appear in +++** the journal file after power is restored. If an attempt is then made +++** to roll the journal back, the database could be corrupted. The additional +++** sanity checking data is an attempt to discover the garbage in the +++** journal and ignore it. +++** +++** The sanity checking information for the 3rd journal format consists +++** of a 32-bit checksum on each page of data. The checksum covers both +++** the page number and the SQLITE_PAGE_SIZE bytes of data for the page. +++** This cksum is initialized to a 32-bit random value that appears in the +++** journal file right after the header. The random initializer is important, +++** because garbage data that appears at the end of a journal is likely +++** data that was once in other files that have now been deleted. If the +++** garbage data came from an obsolete journal file, the checksums might +++** be correct. But by initializing the checksum to random value which +++** is different for every journal, we minimize that risk. +++*/ +++static const unsigned char aJournalMagic1[] = { +++ 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd4, +++}; +++static const unsigned char aJournalMagic2[] = { +++ 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd5, +++}; +++static const unsigned char aJournalMagic3[] = { +++ 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd6, +++}; +++#define JOURNAL_FORMAT_1 1 +++#define JOURNAL_FORMAT_2 2 +++#define JOURNAL_FORMAT_3 3 +++ +++/* +++** The following integer determines what format to use when creating +++** new primary journal files. By default we always use format 3. +++** When testing, we can set this value to older journal formats in order to +++** make sure that newer versions of the library are able to rollback older +++** journal files. +++** +++** Note that checkpoint journals always use format 2 and omit the header. +++*/ +++#ifdef SQLITE_TEST +++int journal_format = 3; +++#else +++# define journal_format 3 +++#endif +++ +++/* +++** The size of the header and of each page in the journal varies according +++** to which journal format is being used. The following macros figure out +++** the sizes based on format numbers. +++*/ +++#define JOURNAL_HDR_SZ(X) \ +++ (sizeof(aJournalMagic1) + sizeof(Pgno) + ((X)>=3)*2*sizeof(u32)) +++#define JOURNAL_PG_SZ(X) \ +++ (SQLITE_PAGE_SIZE + sizeof(Pgno) + ((X)>=3)*sizeof(u32)) +++ +++/* +++** Enable reference count tracking here: +++*/ +++#ifdef SQLITE_TEST +++ int pager_refinfo_enable = 0; +++ static void pager_refinfo(PgHdr *p){ +++ static int cnt = 0; +++ if( !pager_refinfo_enable ) return; +++ printf( +++ "REFCNT: %4d addr=0x%08x nRef=%d\n", +++ p->pgno, (int)PGHDR_TO_DATA(p), p->nRef +++ ); +++ cnt++; /* Something to set a breakpoint on */ +++ } +++# define REFINFO(X) pager_refinfo(X) +++#else +++# define REFINFO(X) +++#endif +++ +++/* +++** Read a 32-bit integer from the given file descriptor. Store the integer +++** that is read in *pRes. Return SQLITE_OK if everything worked, or an +++** error code is something goes wrong. +++** +++** If the journal format is 2 or 3, read a big-endian integer. If the +++** journal format is 1, read an integer in the native byte-order of the +++** host machine. +++*/ +++static int read32bits(int format, OsFile *fd, u32 *pRes){ +++ u32 res; +++ int rc; +++ rc = sqliteOsRead(fd, &res, sizeof(res)); +++ if( rc==SQLITE_OK && format>JOURNAL_FORMAT_1 ){ +++ unsigned char ac[4]; +++ memcpy(ac, &res, 4); +++ res = (ac[0]<<24) | (ac[1]<<16) | (ac[2]<<8) | ac[3]; +++ } +++ *pRes = res; +++ return rc; +++} +++ +++/* +++** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK +++** on success or an error code is something goes wrong. +++** +++** If the journal format is 2 or 3, write the integer as 4 big-endian +++** bytes. If the journal format is 1, write the integer in the native +++** byte order. In normal operation, only formats 2 and 3 are used. +++** Journal format 1 is only used for testing. +++*/ +++static int write32bits(OsFile *fd, u32 val){ +++ unsigned char ac[4]; +++ if( journal_format<=1 ){ +++ return sqliteOsWrite(fd, &val, 4); +++ } +++ ac[0] = (val>>24) & 0xff; +++ ac[1] = (val>>16) & 0xff; +++ ac[2] = (val>>8) & 0xff; +++ ac[3] = val & 0xff; +++ return sqliteOsWrite(fd, ac, 4); +++} +++ +++/* +++** Write a 32-bit integer into a page header right before the +++** page data. This will overwrite the PgHdr.pDirty pointer. +++** +++** The integer is big-endian for formats 2 and 3 and native byte order +++** for journal format 1. +++*/ +++static void store32bits(u32 val, PgHdr *p, int offset){ +++ unsigned char *ac; +++ ac = &((unsigned char*)PGHDR_TO_DATA(p))[offset]; +++ if( journal_format<=1 ){ +++ memcpy(ac, &val, 4); +++ }else{ +++ ac[0] = (val>>24) & 0xff; +++ ac[1] = (val>>16) & 0xff; +++ ac[2] = (val>>8) & 0xff; +++ ac[3] = val & 0xff; +++ } +++} +++ +++ +++/* +++** Convert the bits in the pPager->errMask into an approprate +++** return code. +++*/ +++static int pager_errcode(Pager *pPager){ +++ int rc = SQLITE_OK; +++ if( pPager->errMask & PAGER_ERR_LOCK ) rc = SQLITE_PROTOCOL; +++ if( pPager->errMask & PAGER_ERR_DISK ) rc = SQLITE_IOERR; +++ if( pPager->errMask & PAGER_ERR_FULL ) rc = SQLITE_FULL; +++ if( pPager->errMask & PAGER_ERR_MEM ) rc = SQLITE_NOMEM; +++ if( pPager->errMask & PAGER_ERR_CORRUPT ) rc = SQLITE_CORRUPT; +++ return rc; +++} +++ +++/* +++** Add or remove a page from the list of all pages that are in the +++** checkpoint journal. +++** +++** The Pager keeps a separate list of pages that are currently in +++** the checkpoint journal. This helps the sqlitepager_ckpt_commit() +++** routine run MUCH faster for the common case where there are many +++** pages in memory but only a few are in the checkpoint journal. +++*/ +++static void page_add_to_ckpt_list(PgHdr *pPg){ +++ Pager *pPager = pPg->pPager; +++ if( pPg->inCkpt ) return; +++ assert( pPg->pPrevCkpt==0 && pPg->pNextCkpt==0 ); +++ pPg->pPrevCkpt = 0; +++ if( pPager->pCkpt ){ +++ pPager->pCkpt->pPrevCkpt = pPg; +++ } +++ pPg->pNextCkpt = pPager->pCkpt; +++ pPager->pCkpt = pPg; +++ pPg->inCkpt = 1; +++} +++static void page_remove_from_ckpt_list(PgHdr *pPg){ +++ if( !pPg->inCkpt ) return; +++ if( pPg->pPrevCkpt ){ +++ assert( pPg->pPrevCkpt->pNextCkpt==pPg ); +++ pPg->pPrevCkpt->pNextCkpt = pPg->pNextCkpt; +++ }else{ +++ assert( pPg->pPager->pCkpt==pPg ); +++ pPg->pPager->pCkpt = pPg->pNextCkpt; +++ } +++ if( pPg->pNextCkpt ){ +++ assert( pPg->pNextCkpt->pPrevCkpt==pPg ); +++ pPg->pNextCkpt->pPrevCkpt = pPg->pPrevCkpt; +++ } +++ pPg->pNextCkpt = 0; +++ pPg->pPrevCkpt = 0; +++ pPg->inCkpt = 0; +++} +++ +++/* +++** Find a page in the hash table given its page number. Return +++** a pointer to the page or NULL if not found. +++*/ +++static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){ +++ PgHdr *p = pPager->aHash[pager_hash(pgno)]; +++ while( p && p->pgno!=pgno ){ +++ p = p->pNextHash; +++ } +++ return p; +++} +++ +++/* +++** Unlock the database and clear the in-memory cache. This routine +++** sets the state of the pager back to what it was when it was first +++** opened. Any outstanding pages are invalidated and subsequent attempts +++** to access those pages will likely result in a coredump. +++*/ +++static void pager_reset(Pager *pPager){ +++ PgHdr *pPg, *pNext; +++ for(pPg=pPager->pAll; pPg; pPg=pNext){ +++ pNext = pPg->pNextAll; +++ sqliteFree(pPg); +++ } +++ pPager->pFirst = 0; +++ pPager->pFirstSynced = 0; +++ pPager->pLast = 0; +++ pPager->pAll = 0; +++ memset(pPager->aHash, 0, sizeof(pPager->aHash)); +++ pPager->nPage = 0; +++ if( pPager->state>=SQLITE_WRITELOCK ){ +++ sqlitepager_rollback(pPager); +++ } +++ sqliteOsUnlock(&pPager->fd); +++ pPager->state = SQLITE_UNLOCK; +++ pPager->dbSize = -1; +++ pPager->nRef = 0; +++ assert( pPager->journalOpen==0 ); +++} +++ +++/* +++** When this routine is called, the pager has the journal file open and +++** a write lock on the database. This routine releases the database +++** write lock and acquires a read lock in its place. The journal file +++** is deleted and closed. +++** +++** TODO: Consider keeping the journal file open for temporary databases. +++** This might give a performance improvement on windows where opening +++** a file is an expensive operation. +++*/ +++static int pager_unwritelock(Pager *pPager){ +++ int rc; +++ PgHdr *pPg; +++ if( pPager->stateckptOpen ){ +++ sqliteOsClose(&pPager->cpfd); +++ pPager->ckptOpen = 0; +++ } +++ if( pPager->journalOpen ){ +++ sqliteOsClose(&pPager->jfd); +++ pPager->journalOpen = 0; +++ sqliteOsDelete(pPager->zJournal); +++ sqliteFree( pPager->aInJournal ); +++ pPager->aInJournal = 0; +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ pPg->inJournal = 0; +++ pPg->dirty = 0; +++ pPg->needSync = 0; +++ } +++ }else{ +++ assert( pPager->dirtyFile==0 || pPager->useJournal==0 ); +++ } +++ rc = sqliteOsReadLock(&pPager->fd); +++ if( rc==SQLITE_OK ){ +++ pPager->state = SQLITE_READLOCK; +++ }else{ +++ /* This can only happen if a process does a BEGIN, then forks and the +++ ** child process does the COMMIT. Because of the semantics of unix +++ ** file locking, the unlock will fail. +++ */ +++ pPager->state = SQLITE_UNLOCK; +++ } +++ return rc; +++} +++ +++/* +++** Compute and return a checksum for the page of data. +++** +++** This is not a real checksum. It is really just the sum of the +++** random initial value and the page number. We considered do a checksum +++** of the database, but that was found to be too slow. +++*/ +++static u32 pager_cksum(Pager *pPager, Pgno pgno, const char *aData){ +++ u32 cksum = pPager->cksumInit + pgno; +++ return cksum; +++} +++ +++/* +++** Read a single page from the journal file opened on file descriptor +++** jfd. Playback this one page. +++** +++** There are three different journal formats. The format parameter determines +++** which format is used by the journal that is played back. +++*/ +++static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){ +++ int rc; +++ PgHdr *pPg; /* An existing page in the cache */ +++ PageRecord pgRec; +++ u32 cksum; +++ +++ rc = read32bits(format, jfd, &pgRec.pgno); +++ if( rc!=SQLITE_OK ) return rc; +++ rc = sqliteOsRead(jfd, &pgRec.aData, sizeof(pgRec.aData)); +++ if( rc!=SQLITE_OK ) return rc; +++ +++ /* Sanity checking on the page. This is more important that I originally +++ ** thought. If a power failure occurs while the journal is being written, +++ ** it could cause invalid data to be written into the journal. We need to +++ ** detect this invalid data (with high probability) and ignore it. +++ */ +++ if( pgRec.pgno==0 ){ +++ return SQLITE_DONE; +++ } +++ if( pgRec.pgno>(unsigned)pPager->dbSize ){ +++ return SQLITE_OK; +++ } +++ if( format>=JOURNAL_FORMAT_3 ){ +++ rc = read32bits(format, jfd, &cksum); +++ if( rc ) return rc; +++ if( pager_cksum(pPager, pgRec.pgno, pgRec.aData)!=cksum ){ +++ return SQLITE_DONE; +++ } +++ } +++ +++ /* Playback the page. Update the in-memory copy of the page +++ ** at the same time, if there is one. +++ */ +++ pPg = pager_lookup(pPager, pgRec.pgno); +++ TRACE2("PLAYBACK %d\n", pgRec.pgno); +++ sqliteOsSeek(&pPager->fd, (pgRec.pgno-1)*(off_t)SQLITE_PAGE_SIZE); +++ rc = sqliteOsWrite(&pPager->fd, pgRec.aData, SQLITE_PAGE_SIZE); +++ if( pPg ){ +++ /* No page should ever be rolled back that is in use, except for page +++ ** 1 which is held in use in order to keep the lock on the database +++ ** active. +++ */ +++ assert( pPg->nRef==0 || pPg->pgno==1 ); +++ memcpy(PGHDR_TO_DATA(pPg), pgRec.aData, SQLITE_PAGE_SIZE); +++ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); +++ pPg->dirty = 0; +++ pPg->needSync = 0; +++ CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3); +++ } +++ return rc; +++} +++ +++/* +++** Playback the journal and thus restore the database file to +++** the state it was in before we started making changes. +++** +++** The journal file format is as follows: +++** +++** * 8 byte prefix. One of the aJournalMagic123 vectors defined +++** above. The format of the journal file is determined by which +++** of the three prefix vectors is seen. +++** * 4 byte big-endian integer which is the number of valid page records +++** in the journal. If this value is 0xffffffff, then compute the +++** number of page records from the journal size. This field appears +++** in format 3 only. +++** * 4 byte big-endian integer which is the initial value for the +++** sanity checksum. This field appears in format 3 only. +++** * 4 byte integer which is the number of pages to truncate the +++** database to during a rollback. +++** * Zero or more pages instances, each as follows: +++** + 4 byte page number. +++** + SQLITE_PAGE_SIZE bytes of data. +++** + 4 byte checksum (format 3 only) +++** +++** When we speak of the journal header, we mean the first 4 bullets above. +++** Each entry in the journal is an instance of the 5th bullet. Note that +++** bullets 2 and 3 only appear in format-3 journals. +++** +++** Call the value from the second bullet "nRec". nRec is the number of +++** valid page entries in the journal. In most cases, you can compute the +++** value of nRec from the size of the journal file. But if a power +++** failure occurred while the journal was being written, it could be the +++** case that the size of the journal file had already been increased but +++** the extra entries had not yet made it safely to disk. In such a case, +++** the value of nRec computed from the file size would be too large. For +++** that reason, we always use the nRec value in the header. +++** +++** If the nRec value is 0xffffffff it means that nRec should be computed +++** from the file size. This value is used when the user selects the +++** no-sync option for the journal. A power failure could lead to corruption +++** in this case. But for things like temporary table (which will be +++** deleted when the power is restored) we don't care. +++** +++** Journal formats 1 and 2 do not have an nRec value in the header so we +++** have to compute nRec from the file size. This has risks (as described +++** above) which is why all persistent tables have been changed to use +++** format 3. +++** +++** If the file opened as the journal file is not a well-formed +++** journal file then the database will likely already be +++** corrupted, so the PAGER_ERR_CORRUPT bit is set in pPager->errMask +++** and SQLITE_CORRUPT is returned. If it all works, then this routine +++** returns SQLITE_OK. +++*/ +++static int pager_playback(Pager *pPager, int useJournalSize){ +++ off_t szJ; /* Size of the journal file in bytes */ +++ int nRec; /* Number of Records in the journal */ +++ int i; /* Loop counter */ +++ Pgno mxPg = 0; /* Size of the original file in pages */ +++ int format; /* Format of the journal file. */ +++ unsigned char aMagic[sizeof(aJournalMagic1)]; +++ int rc; +++ +++ /* Figure out how many records are in the journal. Abort early if +++ ** the journal is empty. +++ */ +++ assert( pPager->journalOpen ); +++ sqliteOsSeek(&pPager->jfd, 0); +++ rc = sqliteOsFileSize(&pPager->jfd, &szJ); +++ if( rc!=SQLITE_OK ){ +++ goto end_playback; +++ } +++ +++ /* If the journal file is too small to contain a complete header, +++ ** it must mean that the process that created the journal was just +++ ** beginning to write the journal file when it died. In that case, +++ ** the database file should have still been completely unchanged. +++ ** Nothing needs to be rolled back. We can safely ignore this journal. +++ */ +++ if( szJ < sizeof(aMagic)+sizeof(Pgno) ){ +++ goto end_playback; +++ } +++ +++ /* Read the beginning of the journal and truncate the +++ ** database file back to its original size. +++ */ +++ rc = sqliteOsRead(&pPager->jfd, aMagic, sizeof(aMagic)); +++ if( rc!=SQLITE_OK ){ +++ rc = SQLITE_PROTOCOL; +++ goto end_playback; +++ } +++ if( memcmp(aMagic, aJournalMagic3, sizeof(aMagic))==0 ){ +++ format = JOURNAL_FORMAT_3; +++ }else if( memcmp(aMagic, aJournalMagic2, sizeof(aMagic))==0 ){ +++ format = JOURNAL_FORMAT_2; +++ }else if( memcmp(aMagic, aJournalMagic1, sizeof(aMagic))==0 ){ +++ format = JOURNAL_FORMAT_1; +++ }else{ +++ rc = SQLITE_PROTOCOL; +++ goto end_playback; +++ } +++ if( format>=JOURNAL_FORMAT_3 ){ +++ if( szJ < sizeof(aMagic) + 3*sizeof(u32) ){ +++ /* Ignore the journal if it is too small to contain a complete +++ ** header. We already did this test once above, but at the prior +++ ** test, we did not know the journal format and so we had to assume +++ ** the smallest possible header. Now we know the header is bigger +++ ** than the minimum so we test again. +++ */ +++ goto end_playback; +++ } +++ rc = read32bits(format, &pPager->jfd, (u32*)&nRec); +++ if( rc ) goto end_playback; +++ rc = read32bits(format, &pPager->jfd, &pPager->cksumInit); +++ if( rc ) goto end_playback; +++ if( nRec==0xffffffff || useJournalSize ){ +++ nRec = (szJ - JOURNAL_HDR_SZ(3))/JOURNAL_PG_SZ(3); +++ } +++ }else{ +++ nRec = (szJ - JOURNAL_HDR_SZ(2))/JOURNAL_PG_SZ(2); +++ assert( nRec*JOURNAL_PG_SZ(2)+JOURNAL_HDR_SZ(2)==szJ ); +++ } +++ rc = read32bits(format, &pPager->jfd, &mxPg); +++ if( rc!=SQLITE_OK ){ +++ goto end_playback; +++ } +++ assert( pPager->origDbSize==0 || pPager->origDbSize==mxPg ); +++ rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)mxPg); +++ if( rc!=SQLITE_OK ){ +++ goto end_playback; +++ } +++ pPager->dbSize = mxPg; +++ +++ /* Copy original pages out of the journal and back into the database file. +++ */ +++ for(i=0; ijfd, format); +++ if( rc!=SQLITE_OK ){ +++ if( rc==SQLITE_DONE ){ +++ rc = SQLITE_OK; +++ } +++ break; +++ } +++ } +++ +++ /* Pages that have been written to the journal but never synced +++ ** where not restored by the loop above. We have to restore those +++ ** pages by reading them back from the original database. +++ */ +++ if( rc==SQLITE_OK ){ +++ PgHdr *pPg; +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ char zBuf[SQLITE_PAGE_SIZE]; +++ if( !pPg->dirty ) continue; +++ if( (int)pPg->pgno <= pPager->origDbSize ){ +++ sqliteOsSeek(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)(pPg->pgno-1)); +++ rc = sqliteOsRead(&pPager->fd, zBuf, SQLITE_PAGE_SIZE); +++ TRACE2("REFETCH %d\n", pPg->pgno); +++ CODEC(pPager, zBuf, pPg->pgno, 2); +++ if( rc ) break; +++ }else{ +++ memset(zBuf, 0, SQLITE_PAGE_SIZE); +++ } +++ if( pPg->nRef==0 || memcmp(zBuf, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE) ){ +++ memcpy(PGHDR_TO_DATA(pPg), zBuf, SQLITE_PAGE_SIZE); +++ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); +++ } +++ pPg->needSync = 0; +++ pPg->dirty = 0; +++ } +++ } +++ +++end_playback: +++ if( rc!=SQLITE_OK ){ +++ pager_unwritelock(pPager); +++ pPager->errMask |= PAGER_ERR_CORRUPT; +++ rc = SQLITE_CORRUPT; +++ }else{ +++ rc = pager_unwritelock(pPager); +++ } +++ return rc; +++} +++ +++/* +++** Playback the checkpoint journal. +++** +++** This is similar to playing back the transaction journal but with +++** a few extra twists. +++** +++** (1) The number of pages in the database file at the start of +++** the checkpoint is stored in pPager->ckptSize, not in the +++** journal file itself. +++** +++** (2) In addition to playing back the checkpoint journal, also +++** playback all pages of the transaction journal beginning +++** at offset pPager->ckptJSize. +++*/ +++static int pager_ckpt_playback(Pager *pPager){ +++ off_t szJ; /* Size of the full journal */ +++ int nRec; /* Number of Records */ +++ int i; /* Loop counter */ +++ int rc; +++ +++ /* Truncate the database back to its original size. +++ */ +++ rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)pPager->ckptSize); +++ pPager->dbSize = pPager->ckptSize; +++ +++ /* Figure out how many records are in the checkpoint journal. +++ */ +++ assert( pPager->ckptInUse && pPager->journalOpen ); +++ sqliteOsSeek(&pPager->cpfd, 0); +++ nRec = pPager->ckptNRec; +++ +++ /* Copy original pages out of the checkpoint journal and back into the +++ ** database file. Note that the checkpoint journal always uses format +++ ** 2 instead of format 3 since it does not need to be concerned with +++ ** power failures corrupting the journal and can thus omit the checksums. +++ */ +++ for(i=nRec-1; i>=0; i--){ +++ rc = pager_playback_one_page(pPager, &pPager->cpfd, 2); +++ assert( rc!=SQLITE_DONE ); +++ if( rc!=SQLITE_OK ) goto end_ckpt_playback; +++ } +++ +++ /* Figure out how many pages need to be copied out of the transaction +++ ** journal. +++ */ +++ rc = sqliteOsSeek(&pPager->jfd, pPager->ckptJSize); +++ if( rc!=SQLITE_OK ){ +++ goto end_ckpt_playback; +++ } +++ rc = sqliteOsFileSize(&pPager->jfd, &szJ); +++ if( rc!=SQLITE_OK ){ +++ goto end_ckpt_playback; +++ } +++ nRec = (szJ - pPager->ckptJSize)/JOURNAL_PG_SZ(journal_format); +++ for(i=nRec-1; i>=0; i--){ +++ rc = pager_playback_one_page(pPager, &pPager->jfd, journal_format); +++ if( rc!=SQLITE_OK ){ +++ assert( rc!=SQLITE_DONE ); +++ goto end_ckpt_playback; +++ } +++ } +++ +++end_ckpt_playback: +++ if( rc!=SQLITE_OK ){ +++ pPager->errMask |= PAGER_ERR_CORRUPT; +++ rc = SQLITE_CORRUPT; +++ } +++ return rc; +++} +++ +++/* +++** Change the maximum number of in-memory pages that are allowed. +++** +++** The maximum number is the absolute value of the mxPage parameter. +++** If mxPage is negative, the noSync flag is also set. noSync bypasses +++** calls to sqliteOsSync(). The pager runs much faster with noSync on, +++** but if the operating system crashes or there is an abrupt power +++** failure, the database file might be left in an inconsistent and +++** unrepairable state. +++*/ +++void sqlitepager_set_cachesize(Pager *pPager, int mxPage){ +++ if( mxPage>=0 ){ +++ pPager->noSync = pPager->tempFile; +++ if( pPager->noSync==0 ) pPager->needSync = 0; +++ }else{ +++ pPager->noSync = 1; +++ mxPage = -mxPage; +++ } +++ if( mxPage>10 ){ +++ pPager->mxPage = mxPage; +++ } +++} +++ +++/* +++** Adjust the robustness of the database to damage due to OS crashes +++** or power failures by changing the number of syncs()s when writing +++** the rollback journal. There are three levels: +++** +++** OFF sqliteOsSync() is never called. This is the default +++** for temporary and transient files. +++** +++** NORMAL The journal is synced once before writes begin on the +++** database. This is normally adequate protection, but +++** it is theoretically possible, though very unlikely, +++** that an inopertune power failure could leave the journal +++** in a state which would cause damage to the database +++** when it is rolled back. +++** +++** FULL The journal is synced twice before writes begin on the +++** database (with some additional information - the nRec field +++** of the journal header - being written in between the two +++** syncs). If we assume that writing a +++** single disk sector is atomic, then this mode provides +++** assurance that the journal will not be corrupted to the +++** point of causing damage to the database during rollback. +++** +++** Numeric values associated with these states are OFF==1, NORMAL=2, +++** and FULL=3. +++*/ +++void sqlitepager_set_safety_level(Pager *pPager, int level){ +++ pPager->noSync = level==1 || pPager->tempFile; +++ pPager->fullSync = level==3 && !pPager->tempFile; +++ if( pPager->noSync==0 ) pPager->needSync = 0; +++} +++ +++/* +++** Open a temporary file. Write the name of the file into zName +++** (zName must be at least SQLITE_TEMPNAME_SIZE bytes long.) Write +++** the file descriptor into *fd. Return SQLITE_OK on success or some +++** other error code if we fail. +++** +++** The OS will automatically delete the temporary file when it is +++** closed. +++*/ +++static int sqlitepager_opentemp(char *zFile, OsFile *fd){ +++ int cnt = 8; +++ int rc; +++ do{ +++ cnt--; +++ sqliteOsTempFileName(zFile); +++ rc = sqliteOsOpenExclusive(zFile, fd, 1); +++ }while( cnt>0 && rc!=SQLITE_OK ); +++ return rc; +++} +++ +++/* +++** Create a new page cache and put a pointer to the page cache in *ppPager. +++** The file to be cached need not exist. The file is not locked until +++** the first call to sqlitepager_get() and is only held open until the +++** last page is released using sqlitepager_unref(). +++** +++** If zFilename is NULL then a randomly-named temporary file is created +++** and used as the file to be cached. The file will be deleted +++** automatically when it is closed. +++*/ +++int sqlitepager_open( +++ Pager **ppPager, /* Return the Pager structure here */ +++ const char *zFilename, /* Name of the database file to open */ +++ int mxPage, /* Max number of in-memory cache pages */ +++ int nExtra, /* Extra bytes append to each in-memory page */ +++ int useJournal /* TRUE to use a rollback journal on this file */ +++){ +++ Pager *pPager; +++ char *zFullPathname; +++ int nameLen; +++ OsFile fd; +++ int rc, i; +++ int tempFile; +++ int readOnly = 0; +++ char zTemp[SQLITE_TEMPNAME_SIZE]; +++ +++ *ppPager = 0; +++ if( sqlite_malloc_failed ){ +++ return SQLITE_NOMEM; +++ } +++ if( zFilename && zFilename[0] ){ +++ zFullPathname = sqliteOsFullPathname(zFilename); +++ rc = sqliteOsOpenReadWrite(zFullPathname, &fd, &readOnly); +++ tempFile = 0; +++ }else{ +++ rc = sqlitepager_opentemp(zTemp, &fd); +++ zFilename = zTemp; +++ zFullPathname = sqliteOsFullPathname(zFilename); +++ tempFile = 1; +++ } +++ if( sqlite_malloc_failed ){ +++ return SQLITE_NOMEM; +++ } +++ if( rc!=SQLITE_OK ){ +++ sqliteFree(zFullPathname); +++ return SQLITE_CANTOPEN; +++ } +++ nameLen = strlen(zFullPathname); +++ pPager = sqliteMalloc( sizeof(*pPager) + nameLen*3 + 30 ); +++ if( pPager==0 ){ +++ sqliteOsClose(&fd); +++ sqliteFree(zFullPathname); +++ return SQLITE_NOMEM; +++ } +++ SET_PAGER(pPager); +++ pPager->zFilename = (char*)&pPager[1]; +++ pPager->zDirectory = &pPager->zFilename[nameLen+1]; +++ pPager->zJournal = &pPager->zDirectory[nameLen+1]; +++ strcpy(pPager->zFilename, zFullPathname); +++ strcpy(pPager->zDirectory, zFullPathname); +++ for(i=nameLen; i>0 && pPager->zDirectory[i-1]!='/'; i--){} +++ if( i>0 ) pPager->zDirectory[i-1] = 0; +++ strcpy(pPager->zJournal, zFullPathname); +++ sqliteFree(zFullPathname); +++ strcpy(&pPager->zJournal[nameLen], "-journal"); +++ pPager->fd = fd; +++ pPager->journalOpen = 0; +++ pPager->useJournal = useJournal; +++ pPager->ckptOpen = 0; +++ pPager->ckptInUse = 0; +++ pPager->nRef = 0; +++ pPager->dbSize = -1; +++ pPager->ckptSize = 0; +++ pPager->ckptJSize = 0; +++ pPager->nPage = 0; +++ pPager->mxPage = mxPage>5 ? mxPage : 10; +++ pPager->state = SQLITE_UNLOCK; +++ pPager->errMask = 0; +++ pPager->tempFile = tempFile; +++ pPager->readOnly = readOnly; +++ pPager->needSync = 0; +++ pPager->noSync = pPager->tempFile || !useJournal; +++ pPager->pFirst = 0; +++ pPager->pFirstSynced = 0; +++ pPager->pLast = 0; +++ pPager->nExtra = nExtra; +++ memset(pPager->aHash, 0, sizeof(pPager->aHash)); +++ *ppPager = pPager; +++ return SQLITE_OK; +++} +++ +++/* +++** Set the destructor for this pager. If not NULL, the destructor is called +++** when the reference count on each page reaches zero. The destructor can +++** be used to clean up information in the extra segment appended to each page. +++** +++** The destructor is not called as a result sqlitepager_close(). +++** Destructors are only called by sqlitepager_unref(). +++*/ +++void sqlitepager_set_destructor(Pager *pPager, void (*xDesc)(void*)){ +++ pPager->xDestructor = xDesc; +++} +++ +++/* +++** Return the total number of pages in the disk file associated with +++** pPager. +++*/ +++int sqlitepager_pagecount(Pager *pPager){ +++ off_t n; +++ assert( pPager!=0 ); +++ if( pPager->dbSize>=0 ){ +++ return pPager->dbSize; +++ } +++ if( sqliteOsFileSize(&pPager->fd, &n)!=SQLITE_OK ){ +++ pPager->errMask |= PAGER_ERR_DISK; +++ return 0; +++ } +++ n /= SQLITE_PAGE_SIZE; +++ if( pPager->state!=SQLITE_UNLOCK ){ +++ pPager->dbSize = n; +++ } +++ return n; +++} +++ +++/* +++** Forward declaration +++*/ +++static int syncJournal(Pager*); +++ +++/* +++** Truncate the file to the number of pages specified. +++*/ +++int sqlitepager_truncate(Pager *pPager, Pgno nPage){ +++ int rc; +++ if( pPager->dbSize<0 ){ +++ sqlitepager_pagecount(pPager); +++ } +++ if( pPager->errMask!=0 ){ +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ if( nPage>=(unsigned)pPager->dbSize ){ +++ return SQLITE_OK; +++ } +++ syncJournal(pPager); +++ rc = sqliteOsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)nPage); +++ if( rc==SQLITE_OK ){ +++ pPager->dbSize = nPage; +++ } +++ return rc; +++} +++ +++/* +++** Shutdown the page cache. Free all memory and close all files. +++** +++** If a transaction was in progress when this routine is called, that +++** transaction is rolled back. All outstanding pages are invalidated +++** and their memory is freed. Any attempt to use a page associated +++** with this page cache after this function returns will likely +++** result in a coredump. +++*/ +++int sqlitepager_close(Pager *pPager){ +++ PgHdr *pPg, *pNext; +++ switch( pPager->state ){ +++ case SQLITE_WRITELOCK: { +++ sqlitepager_rollback(pPager); +++ sqliteOsUnlock(&pPager->fd); +++ assert( pPager->journalOpen==0 ); +++ break; +++ } +++ case SQLITE_READLOCK: { +++ sqliteOsUnlock(&pPager->fd); +++ break; +++ } +++ default: { +++ /* Do nothing */ +++ break; +++ } +++ } +++ for(pPg=pPager->pAll; pPg; pPg=pNext){ +++ pNext = pPg->pNextAll; +++ sqliteFree(pPg); +++ } +++ sqliteOsClose(&pPager->fd); +++ assert( pPager->journalOpen==0 ); +++ /* Temp files are automatically deleted by the OS +++ ** if( pPager->tempFile ){ +++ ** sqliteOsDelete(pPager->zFilename); +++ ** } +++ */ +++ CLR_PAGER(pPager); +++ if( pPager->zFilename!=(char*)&pPager[1] ){ +++ assert( 0 ); /* Cannot happen */ +++ sqliteFree(pPager->zFilename); +++ sqliteFree(pPager->zJournal); +++ sqliteFree(pPager->zDirectory); +++ } +++ sqliteFree(pPager); +++ return SQLITE_OK; +++} +++ +++/* +++** Return the page number for the given page data. +++*/ +++Pgno sqlitepager_pagenumber(void *pData){ +++ PgHdr *p = DATA_TO_PGHDR(pData); +++ return p->pgno; +++} +++ +++/* +++** Increment the reference count for a page. If the page is +++** currently on the freelist (the reference count is zero) then +++** remove it from the freelist. +++*/ +++#define page_ref(P) ((P)->nRef==0?_page_ref(P):(void)(P)->nRef++) +++static void _page_ref(PgHdr *pPg){ +++ if( pPg->nRef==0 ){ +++ /* The page is currently on the freelist. Remove it. */ +++ if( pPg==pPg->pPager->pFirstSynced ){ +++ PgHdr *p = pPg->pNextFree; +++ while( p && p->needSync ){ p = p->pNextFree; } +++ pPg->pPager->pFirstSynced = p; +++ } +++ if( pPg->pPrevFree ){ +++ pPg->pPrevFree->pNextFree = pPg->pNextFree; +++ }else{ +++ pPg->pPager->pFirst = pPg->pNextFree; +++ } +++ if( pPg->pNextFree ){ +++ pPg->pNextFree->pPrevFree = pPg->pPrevFree; +++ }else{ +++ pPg->pPager->pLast = pPg->pPrevFree; +++ } +++ pPg->pPager->nRef++; +++ } +++ pPg->nRef++; +++ REFINFO(pPg); +++} +++ +++/* +++** Increment the reference count for a page. The input pointer is +++** a reference to the page data. +++*/ +++int sqlitepager_ref(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ page_ref(pPg); +++ return SQLITE_OK; +++} +++ +++/* +++** Sync the journal. In other words, make sure all the pages that have +++** been written to the journal have actually reached the surface of the +++** disk. It is not safe to modify the original database file until after +++** the journal has been synced. If the original database is modified before +++** the journal is synced and a power failure occurs, the unsynced journal +++** data would be lost and we would be unable to completely rollback the +++** database changes. Database corruption would occur. +++** +++** This routine also updates the nRec field in the header of the journal. +++** (See comments on the pager_playback() routine for additional information.) +++** If the sync mode is FULL, two syncs will occur. First the whole journal +++** is synced, then the nRec field is updated, then a second sync occurs. +++** +++** For temporary databases, we do not care if we are able to rollback +++** after a power failure, so sync occurs. +++** +++** This routine clears the needSync field of every page current held in +++** memory. +++*/ +++static int syncJournal(Pager *pPager){ +++ PgHdr *pPg; +++ int rc = SQLITE_OK; +++ +++ /* Sync the journal before modifying the main database +++ ** (assuming there is a journal and it needs to be synced.) +++ */ +++ if( pPager->needSync ){ +++ if( !pPager->tempFile ){ +++ assert( pPager->journalOpen ); +++ /* assert( !pPager->noSync ); // noSync might be set if synchronous +++ ** was turned off after the transaction was started. Ticket #615 */ +++#ifndef NDEBUG +++ { +++ /* Make sure the pPager->nRec counter we are keeping agrees +++ ** with the nRec computed from the size of the journal file. +++ */ +++ off_t hdrSz, pgSz, jSz; +++ hdrSz = JOURNAL_HDR_SZ(journal_format); +++ pgSz = JOURNAL_PG_SZ(journal_format); +++ rc = sqliteOsFileSize(&pPager->jfd, &jSz); +++ if( rc!=0 ) return rc; +++ assert( pPager->nRec*pgSz+hdrSz==jSz ); +++ } +++#endif +++ if( journal_format>=3 ){ +++ /* Write the nRec value into the journal file header */ +++ off_t szJ; +++ if( pPager->fullSync ){ +++ TRACE1("SYNC\n"); +++ rc = sqliteOsSync(&pPager->jfd); +++ if( rc!=0 ) return rc; +++ } +++ sqliteOsSeek(&pPager->jfd, sizeof(aJournalMagic1)); +++ rc = write32bits(&pPager->jfd, pPager->nRec); +++ if( rc ) return rc; +++ szJ = JOURNAL_HDR_SZ(journal_format) + +++ pPager->nRec*JOURNAL_PG_SZ(journal_format); +++ sqliteOsSeek(&pPager->jfd, szJ); +++ } +++ TRACE1("SYNC\n"); +++ rc = sqliteOsSync(&pPager->jfd); +++ if( rc!=0 ) return rc; +++ pPager->journalStarted = 1; +++ } +++ pPager->needSync = 0; +++ +++ /* Erase the needSync flag from every page. +++ */ +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ pPg->needSync = 0; +++ } +++ pPager->pFirstSynced = pPager->pFirst; +++ } +++ +++#ifndef NDEBUG +++ /* If the Pager.needSync flag is clear then the PgHdr.needSync +++ ** flag must also be clear for all pages. Verify that this +++ ** invariant is true. +++ */ +++ else{ +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ assert( pPg->needSync==0 ); +++ } +++ assert( pPager->pFirstSynced==pPager->pFirst ); +++ } +++#endif +++ +++ return rc; +++} +++ +++/* +++** Given a list of pages (connected by the PgHdr.pDirty pointer) write +++** every one of those pages out to the database file and mark them all +++** as clean. +++*/ +++static int pager_write_pagelist(PgHdr *pList){ +++ Pager *pPager; +++ int rc; +++ +++ if( pList==0 ) return SQLITE_OK; +++ pPager = pList->pPager; +++ while( pList ){ +++ assert( pList->dirty ); +++ sqliteOsSeek(&pPager->fd, (pList->pgno-1)*(off_t)SQLITE_PAGE_SIZE); +++ CODEC(pPager, PGHDR_TO_DATA(pList), pList->pgno, 6); +++ TRACE2("STORE %d\n", pList->pgno); +++ rc = sqliteOsWrite(&pPager->fd, PGHDR_TO_DATA(pList), SQLITE_PAGE_SIZE); +++ CODEC(pPager, PGHDR_TO_DATA(pList), pList->pgno, 0); +++ if( rc ) return rc; +++ pList->dirty = 0; +++ pList = pList->pDirty; +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Collect every dirty page into a dirty list and +++** return a pointer to the head of that list. All pages are +++** collected even if they are still in use. +++*/ +++static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ +++ PgHdr *p, *pList; +++ pList = 0; +++ for(p=pPager->pAll; p; p=p->pNextAll){ +++ if( p->dirty ){ +++ p->pDirty = pList; +++ pList = p; +++ } +++ } +++ return pList; +++} +++ +++/* +++** Acquire a page. +++** +++** A read lock on the disk file is obtained when the first page is acquired. +++** This read lock is dropped when the last page is released. +++** +++** A _get works for any page number greater than 0. If the database +++** file is smaller than the requested page, then no actual disk +++** read occurs and the memory image of the page is initialized to +++** all zeros. The extra data appended to a page is always initialized +++** to zeros the first time a page is loaded into memory. +++** +++** The acquisition might fail for several reasons. In all cases, +++** an appropriate error code is returned and *ppPage is set to NULL. +++** +++** See also sqlitepager_lookup(). Both this routine and _lookup() attempt +++** to find a page in the in-memory cache first. If the page is not already +++** in memory, this routine goes to disk to read it in whereas _lookup() +++** just returns 0. This routine acquires a read-lock the first time it +++** has to go to disk, and could also playback an old journal if necessary. +++** Since _lookup() never goes to disk, it never has to deal with locks +++** or journal files. +++*/ +++int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ +++ PgHdr *pPg; +++ int rc; +++ +++ /* Make sure we have not hit any critical errors. +++ */ +++ assert( pPager!=0 ); +++ assert( pgno!=0 ); +++ *ppPage = 0; +++ if( pPager->errMask & ~(PAGER_ERR_FULL) ){ +++ return pager_errcode(pPager); +++ } +++ +++ /* If this is the first page accessed, then get a read lock +++ ** on the database file. +++ */ +++ if( pPager->nRef==0 ){ +++ rc = sqliteOsReadLock(&pPager->fd); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ pPager->state = SQLITE_READLOCK; +++ +++ /* If a journal file exists, try to play it back. +++ */ +++ if( pPager->useJournal && sqliteOsFileExists(pPager->zJournal) ){ +++ int rc; +++ +++ /* Get a write lock on the database +++ */ +++ rc = sqliteOsWriteLock(&pPager->fd); +++ if( rc!=SQLITE_OK ){ +++ if( sqliteOsUnlock(&pPager->fd)!=SQLITE_OK ){ +++ /* This should never happen! */ +++ rc = SQLITE_INTERNAL; +++ } +++ return rc; +++ } +++ pPager->state = SQLITE_WRITELOCK; +++ +++ /* Open the journal for reading only. Return SQLITE_BUSY if +++ ** we are unable to open the journal file. +++ ** +++ ** The journal file does not need to be locked itself. The +++ ** journal file is never open unless the main database file holds +++ ** a write lock, so there is never any chance of two or more +++ ** processes opening the journal at the same time. +++ */ +++ rc = sqliteOsOpenReadOnly(pPager->zJournal, &pPager->jfd); +++ if( rc!=SQLITE_OK ){ +++ rc = sqliteOsUnlock(&pPager->fd); +++ assert( rc==SQLITE_OK ); +++ return SQLITE_BUSY; +++ } +++ pPager->journalOpen = 1; +++ pPager->journalStarted = 0; +++ +++ /* Playback and delete the journal. Drop the database write +++ ** lock and reacquire the read lock. +++ */ +++ rc = pager_playback(pPager, 0); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ } +++ pPg = 0; +++ }else{ +++ /* Search for page in cache */ +++ pPg = pager_lookup(pPager, pgno); +++ } +++ if( pPg==0 ){ +++ /* The requested page is not in the page cache. */ +++ int h; +++ pPager->nMiss++; +++ if( pPager->nPagemxPage || pPager->pFirst==0 ){ +++ /* Create a new page */ +++ pPg = sqliteMallocRaw( sizeof(*pPg) + SQLITE_PAGE_SIZE +++ + sizeof(u32) + pPager->nExtra ); +++ if( pPg==0 ){ +++ pager_unwritelock(pPager); +++ pPager->errMask |= PAGER_ERR_MEM; +++ return SQLITE_NOMEM; +++ } +++ memset(pPg, 0, sizeof(*pPg)); +++ pPg->pPager = pPager; +++ pPg->pNextAll = pPager->pAll; +++ if( pPager->pAll ){ +++ pPager->pAll->pPrevAll = pPg; +++ } +++ pPg->pPrevAll = 0; +++ pPager->pAll = pPg; +++ pPager->nPage++; +++ }else{ +++ /* Find a page to recycle. Try to locate a page that does not +++ ** require us to do an fsync() on the journal. +++ */ +++ pPg = pPager->pFirstSynced; +++ +++ /* If we could not find a page that does not require an fsync() +++ ** on the journal file then fsync the journal file. This is a +++ ** very slow operation, so we work hard to avoid it. But sometimes +++ ** it can't be helped. +++ */ +++ if( pPg==0 ){ +++ int rc = syncJournal(pPager); +++ if( rc!=0 ){ +++ sqlitepager_rollback(pPager); +++ return SQLITE_IOERR; +++ } +++ pPg = pPager->pFirst; +++ } +++ assert( pPg->nRef==0 ); +++ +++ /* Write the page to the database file if it is dirty. +++ */ +++ if( pPg->dirty ){ +++ assert( pPg->needSync==0 ); +++ pPg->pDirty = 0; +++ rc = pager_write_pagelist( pPg ); +++ if( rc!=SQLITE_OK ){ +++ sqlitepager_rollback(pPager); +++ return SQLITE_IOERR; +++ } +++ } +++ assert( pPg->dirty==0 ); +++ +++ /* If the page we are recycling is marked as alwaysRollback, then +++ ** set the global alwaysRollback flag, thus disabling the +++ ** sqlite_dont_rollback() optimization for the rest of this transaction. +++ ** It is necessary to do this because the page marked alwaysRollback +++ ** might be reloaded at a later time but at that point we won't remember +++ ** that is was marked alwaysRollback. This means that all pages must +++ ** be marked as alwaysRollback from here on out. +++ */ +++ if( pPg->alwaysRollback ){ +++ pPager->alwaysRollback = 1; +++ } +++ +++ /* Unlink the old page from the free list and the hash table +++ */ +++ if( pPg==pPager->pFirstSynced ){ +++ PgHdr *p = pPg->pNextFree; +++ while( p && p->needSync ){ p = p->pNextFree; } +++ pPager->pFirstSynced = p; +++ } +++ if( pPg->pPrevFree ){ +++ pPg->pPrevFree->pNextFree = pPg->pNextFree; +++ }else{ +++ assert( pPager->pFirst==pPg ); +++ pPager->pFirst = pPg->pNextFree; +++ } +++ if( pPg->pNextFree ){ +++ pPg->pNextFree->pPrevFree = pPg->pPrevFree; +++ }else{ +++ assert( pPager->pLast==pPg ); +++ pPager->pLast = pPg->pPrevFree; +++ } +++ pPg->pNextFree = pPg->pPrevFree = 0; +++ if( pPg->pNextHash ){ +++ pPg->pNextHash->pPrevHash = pPg->pPrevHash; +++ } +++ if( pPg->pPrevHash ){ +++ pPg->pPrevHash->pNextHash = pPg->pNextHash; +++ }else{ +++ h = pager_hash(pPg->pgno); +++ assert( pPager->aHash[h]==pPg ); +++ pPager->aHash[h] = pPg->pNextHash; +++ } +++ pPg->pNextHash = pPg->pPrevHash = 0; +++ pPager->nOvfl++; +++ } +++ pPg->pgno = pgno; +++ if( pPager->aInJournal && (int)pgno<=pPager->origDbSize ){ +++ sqliteCheckMemory(pPager->aInJournal, pgno/8); +++ assert( pPager->journalOpen ); +++ pPg->inJournal = (pPager->aInJournal[pgno/8] & (1<<(pgno&7)))!=0; +++ pPg->needSync = 0; +++ }else{ +++ pPg->inJournal = 0; +++ pPg->needSync = 0; +++ } +++ if( pPager->aInCkpt && (int)pgno<=pPager->ckptSize +++ && (pPager->aInCkpt[pgno/8] & (1<<(pgno&7)))!=0 ){ +++ page_add_to_ckpt_list(pPg); +++ }else{ +++ page_remove_from_ckpt_list(pPg); +++ } +++ pPg->dirty = 0; +++ pPg->nRef = 1; +++ REFINFO(pPg); +++ pPager->nRef++; +++ h = pager_hash(pgno); +++ pPg->pNextHash = pPager->aHash[h]; +++ pPager->aHash[h] = pPg; +++ if( pPg->pNextHash ){ +++ assert( pPg->pNextHash->pPrevHash==0 ); +++ pPg->pNextHash->pPrevHash = pPg; +++ } +++ if( pPager->nExtra>0 ){ +++ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); +++ } +++ if( pPager->dbSize<0 ) sqlitepager_pagecount(pPager); +++ if( pPager->errMask!=0 ){ +++ sqlitepager_unref(PGHDR_TO_DATA(pPg)); +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ if( pPager->dbSize<(int)pgno ){ +++ memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); +++ }else{ +++ int rc; +++ sqliteOsSeek(&pPager->fd, (pgno-1)*(off_t)SQLITE_PAGE_SIZE); +++ rc = sqliteOsRead(&pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE); +++ TRACE2("FETCH %d\n", pPg->pgno); +++ CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3); +++ if( rc!=SQLITE_OK ){ +++ off_t fileSize; +++ if( sqliteOsFileSize(&pPager->fd,&fileSize)!=SQLITE_OK +++ || fileSize>=pgno*SQLITE_PAGE_SIZE ){ +++ sqlitepager_unref(PGHDR_TO_DATA(pPg)); +++ return rc; +++ }else{ +++ memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); +++ } +++ } +++ } +++ }else{ +++ /* The requested page is in the page cache. */ +++ pPager->nHit++; +++ page_ref(pPg); +++ } +++ *ppPage = PGHDR_TO_DATA(pPg); +++ return SQLITE_OK; +++} +++ +++/* +++** Acquire a page if it is already in the in-memory cache. Do +++** not read the page from disk. Return a pointer to the page, +++** or 0 if the page is not in cache. +++** +++** See also sqlitepager_get(). The difference between this routine +++** and sqlitepager_get() is that _get() will go to the disk and read +++** in the page if the page is not already in cache. This routine +++** returns NULL if the page is not in cache or if a disk I/O error +++** has ever happened. +++*/ +++void *sqlitepager_lookup(Pager *pPager, Pgno pgno){ +++ PgHdr *pPg; +++ +++ assert( pPager!=0 ); +++ assert( pgno!=0 ); +++ if( pPager->errMask & ~(PAGER_ERR_FULL) ){ +++ return 0; +++ } +++ /* if( pPager->nRef==0 ){ +++ ** return 0; +++ ** } +++ */ +++ pPg = pager_lookup(pPager, pgno); +++ if( pPg==0 ) return 0; +++ page_ref(pPg); +++ return PGHDR_TO_DATA(pPg); +++} +++ +++/* +++** Release a page. +++** +++** If the number of references to the page drop to zero, then the +++** page is added to the LRU list. When all references to all pages +++** are released, a rollback occurs and the lock on the database is +++** removed. +++*/ +++int sqlitepager_unref(void *pData){ +++ PgHdr *pPg; +++ +++ /* Decrement the reference count for this page +++ */ +++ pPg = DATA_TO_PGHDR(pData); +++ assert( pPg->nRef>0 ); +++ pPg->nRef--; +++ REFINFO(pPg); +++ +++ /* When the number of references to a page reach 0, call the +++ ** destructor and add the page to the freelist. +++ */ +++ if( pPg->nRef==0 ){ +++ Pager *pPager; +++ pPager = pPg->pPager; +++ pPg->pNextFree = 0; +++ pPg->pPrevFree = pPager->pLast; +++ pPager->pLast = pPg; +++ if( pPg->pPrevFree ){ +++ pPg->pPrevFree->pNextFree = pPg; +++ }else{ +++ pPager->pFirst = pPg; +++ } +++ if( pPg->needSync==0 && pPager->pFirstSynced==0 ){ +++ pPager->pFirstSynced = pPg; +++ } +++ if( pPager->xDestructor ){ +++ pPager->xDestructor(pData); +++ } +++ +++ /* When all pages reach the freelist, drop the read lock from +++ ** the database file. +++ */ +++ pPager->nRef--; +++ assert( pPager->nRef>=0 ); +++ if( pPager->nRef==0 ){ +++ pager_reset(pPager); +++ } +++ } +++ return SQLITE_OK; +++} +++ +++/* +++** Create a journal file for pPager. There should already be a write +++** lock on the database file when this routine is called. +++** +++** Return SQLITE_OK if everything. Return an error code and release the +++** write lock if anything goes wrong. +++*/ +++static int pager_open_journal(Pager *pPager){ +++ int rc; +++ assert( pPager->state==SQLITE_WRITELOCK ); +++ assert( pPager->journalOpen==0 ); +++ assert( pPager->useJournal ); +++ sqlitepager_pagecount(pPager); +++ pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 ); +++ if( pPager->aInJournal==0 ){ +++ sqliteOsReadLock(&pPager->fd); +++ pPager->state = SQLITE_READLOCK; +++ return SQLITE_NOMEM; +++ } +++ rc = sqliteOsOpenExclusive(pPager->zJournal, &pPager->jfd,pPager->tempFile); +++ if( rc!=SQLITE_OK ){ +++ sqliteFree(pPager->aInJournal); +++ pPager->aInJournal = 0; +++ sqliteOsReadLock(&pPager->fd); +++ pPager->state = SQLITE_READLOCK; +++ return SQLITE_CANTOPEN; +++ } +++ sqliteOsOpenDirectory(pPager->zDirectory, &pPager->jfd); +++ pPager->journalOpen = 1; +++ pPager->journalStarted = 0; +++ pPager->needSync = 0; +++ pPager->alwaysRollback = 0; +++ pPager->nRec = 0; +++ if( pPager->errMask!=0 ){ +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ pPager->origDbSize = pPager->dbSize; +++ if( journal_format==JOURNAL_FORMAT_3 ){ +++ rc = sqliteOsWrite(&pPager->jfd, aJournalMagic3, sizeof(aJournalMagic3)); +++ if( rc==SQLITE_OK ){ +++ rc = write32bits(&pPager->jfd, pPager->noSync ? 0xffffffff : 0); +++ } +++ if( rc==SQLITE_OK ){ +++ sqliteRandomness(sizeof(pPager->cksumInit), &pPager->cksumInit); +++ rc = write32bits(&pPager->jfd, pPager->cksumInit); +++ } +++ }else if( journal_format==JOURNAL_FORMAT_2 ){ +++ rc = sqliteOsWrite(&pPager->jfd, aJournalMagic2, sizeof(aJournalMagic2)); +++ }else{ +++ assert( journal_format==JOURNAL_FORMAT_1 ); +++ rc = sqliteOsWrite(&pPager->jfd, aJournalMagic1, sizeof(aJournalMagic1)); +++ } +++ if( rc==SQLITE_OK ){ +++ rc = write32bits(&pPager->jfd, pPager->dbSize); +++ } +++ if( pPager->ckptAutoopen && rc==SQLITE_OK ){ +++ rc = sqlitepager_ckpt_begin(pPager); +++ } +++ if( rc!=SQLITE_OK ){ +++ rc = pager_unwritelock(pPager); +++ if( rc==SQLITE_OK ){ +++ rc = SQLITE_FULL; +++ } +++ } +++ return rc; +++} +++ +++/* +++** Acquire a write-lock on the database. The lock is removed when +++** the any of the following happen: +++** +++** * sqlitepager_commit() is called. +++** * sqlitepager_rollback() is called. +++** * sqlitepager_close() is called. +++** * sqlitepager_unref() is called to on every outstanding page. +++** +++** The parameter to this routine is a pointer to any open page of the +++** database file. Nothing changes about the page - it is used merely +++** to acquire a pointer to the Pager structure and as proof that there +++** is already a read-lock on the database. +++** +++** A journal file is opened if this is not a temporary file. For +++** temporary files, the opening of the journal file is deferred until +++** there is an actual need to write to the journal. +++** +++** If the database is already write-locked, this routine is a no-op. +++*/ +++int sqlitepager_begin(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ Pager *pPager = pPg->pPager; +++ int rc = SQLITE_OK; +++ assert( pPg->nRef>0 ); +++ assert( pPager->state!=SQLITE_UNLOCK ); +++ if( pPager->state==SQLITE_READLOCK ){ +++ assert( pPager->aInJournal==0 ); +++ rc = sqliteOsWriteLock(&pPager->fd); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ pPager->state = SQLITE_WRITELOCK; +++ pPager->dirtyFile = 0; +++ TRACE1("TRANSACTION\n"); +++ if( pPager->useJournal && !pPager->tempFile ){ +++ rc = pager_open_journal(pPager); +++ } +++ } +++ return rc; +++} +++ +++/* +++** Mark a data page as writeable. The page is written into the journal +++** if it is not there already. This routine must be called before making +++** changes to a page. +++** +++** The first time this routine is called, the pager creates a new +++** journal and acquires a write lock on the database. If the write +++** lock could not be acquired, this routine returns SQLITE_BUSY. The +++** calling routine must check for that return value and be careful not to +++** change any page data until this routine returns SQLITE_OK. +++** +++** If the journal file could not be written because the disk is full, +++** then this routine returns SQLITE_FULL and does an immediate rollback. +++** All subsequent write attempts also return SQLITE_FULL until there +++** is a call to sqlitepager_commit() or sqlitepager_rollback() to +++** reset. +++*/ +++int sqlitepager_write(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ Pager *pPager = pPg->pPager; +++ int rc = SQLITE_OK; +++ +++ /* Check for errors +++ */ +++ if( pPager->errMask ){ +++ return pager_errcode(pPager); +++ } +++ if( pPager->readOnly ){ +++ return SQLITE_PERM; +++ } +++ +++ /* Mark the page as dirty. If the page has already been written +++ ** to the journal then we can return right away. +++ */ +++ pPg->dirty = 1; +++ if( pPg->inJournal && (pPg->inCkpt || pPager->ckptInUse==0) ){ +++ pPager->dirtyFile = 1; +++ return SQLITE_OK; +++ } +++ +++ /* If we get this far, it means that the page needs to be +++ ** written to the transaction journal or the ckeckpoint journal +++ ** or both. +++ ** +++ ** First check to see that the transaction journal exists and +++ ** create it if it does not. +++ */ +++ assert( pPager->state!=SQLITE_UNLOCK ); +++ rc = sqlitepager_begin(pData); +++ if( rc!=SQLITE_OK ){ +++ return rc; +++ } +++ assert( pPager->state==SQLITE_WRITELOCK ); +++ if( !pPager->journalOpen && pPager->useJournal ){ +++ rc = pager_open_journal(pPager); +++ if( rc!=SQLITE_OK ) return rc; +++ } +++ assert( pPager->journalOpen || !pPager->useJournal ); +++ pPager->dirtyFile = 1; +++ +++ /* The transaction journal now exists and we have a write lock on the +++ ** main database file. Write the current page to the transaction +++ ** journal if it is not there already. +++ */ +++ if( !pPg->inJournal && pPager->useJournal ){ +++ if( (int)pPg->pgno <= pPager->origDbSize ){ +++ int szPg; +++ u32 saved; +++ if( journal_format>=JOURNAL_FORMAT_3 ){ +++ u32 cksum = pager_cksum(pPager, pPg->pgno, pData); +++ saved = *(u32*)PGHDR_TO_EXTRA(pPg); +++ store32bits(cksum, pPg, SQLITE_PAGE_SIZE); +++ szPg = SQLITE_PAGE_SIZE+8; +++ }else{ +++ szPg = SQLITE_PAGE_SIZE+4; +++ } +++ store32bits(pPg->pgno, pPg, -4); +++ CODEC(pPager, pData, pPg->pgno, 7); +++ rc = sqliteOsWrite(&pPager->jfd, &((char*)pData)[-4], szPg); +++ TRACE3("JOURNAL %d %d\n", pPg->pgno, pPg->needSync); +++ CODEC(pPager, pData, pPg->pgno, 0); +++ if( journal_format>=JOURNAL_FORMAT_3 ){ +++ *(u32*)PGHDR_TO_EXTRA(pPg) = saved; +++ } +++ if( rc!=SQLITE_OK ){ +++ sqlitepager_rollback(pPager); +++ pPager->errMask |= PAGER_ERR_FULL; +++ return rc; +++ } +++ pPager->nRec++; +++ assert( pPager->aInJournal!=0 ); +++ pPager->aInJournal[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ pPg->needSync = !pPager->noSync; +++ pPg->inJournal = 1; +++ if( pPager->ckptInUse ){ +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++ }else{ +++ pPg->needSync = !pPager->journalStarted && !pPager->noSync; +++ TRACE3("APPEND %d %d\n", pPg->pgno, pPg->needSync); +++ } +++ if( pPg->needSync ){ +++ pPager->needSync = 1; +++ } +++ } +++ +++ /* If the checkpoint journal is open and the page is not in it, +++ ** then write the current page to the checkpoint journal. Note that +++ ** the checkpoint journal always uses the simplier format 2 that lacks +++ ** checksums. The header is also omitted from the checkpoint journal. +++ */ +++ if( pPager->ckptInUse && !pPg->inCkpt && (int)pPg->pgno<=pPager->ckptSize ){ +++ assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ); +++ store32bits(pPg->pgno, pPg, -4); +++ CODEC(pPager, pData, pPg->pgno, 7); +++ rc = sqliteOsWrite(&pPager->cpfd, &((char*)pData)[-4], SQLITE_PAGE_SIZE+4); +++ TRACE2("CKPT-JOURNAL %d\n", pPg->pgno); +++ CODEC(pPager, pData, pPg->pgno, 0); +++ if( rc!=SQLITE_OK ){ +++ sqlitepager_rollback(pPager); +++ pPager->errMask |= PAGER_ERR_FULL; +++ return rc; +++ } +++ pPager->ckptNRec++; +++ assert( pPager->aInCkpt!=0 ); +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++ +++ /* Update the database size and return. +++ */ +++ if( pPager->dbSize<(int)pPg->pgno ){ +++ pPager->dbSize = pPg->pgno; +++ } +++ return rc; +++} +++ +++/* +++** Return TRUE if the page given in the argument was previously passed +++** to sqlitepager_write(). In other words, return TRUE if it is ok +++** to change the content of the page. +++*/ +++int sqlitepager_iswriteable(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ return pPg->dirty; +++} +++ +++/* +++** Replace the content of a single page with the information in the third +++** argument. +++*/ +++int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){ +++ void *pPage; +++ int rc; +++ +++ rc = sqlitepager_get(pPager, pgno, &pPage); +++ if( rc==SQLITE_OK ){ +++ rc = sqlitepager_write(pPage); +++ if( rc==SQLITE_OK ){ +++ memcpy(pPage, pData, SQLITE_PAGE_SIZE); +++ } +++ sqlitepager_unref(pPage); +++ } +++ return rc; +++} +++ +++/* +++** A call to this routine tells the pager that it is not necessary to +++** write the information on page "pgno" back to the disk, even though +++** that page might be marked as dirty. +++** +++** The overlying software layer calls this routine when all of the data +++** on the given page is unused. The pager marks the page as clean so +++** that it does not get written to disk. +++** +++** Tests show that this optimization, together with the +++** sqlitepager_dont_rollback() below, more than double the speed +++** of large INSERT operations and quadruple the speed of large DELETEs. +++** +++** When this routine is called, set the alwaysRollback flag to true. +++** Subsequent calls to sqlitepager_dont_rollback() for the same page +++** will thereafter be ignored. This is necessary to avoid a problem +++** where a page with data is added to the freelist during one part of +++** a transaction then removed from the freelist during a later part +++** of the same transaction and reused for some other purpose. When it +++** is first added to the freelist, this routine is called. When reused, +++** the dont_rollback() routine is called. But because the page contains +++** critical data, we still need to be sure it gets rolled back in spite +++** of the dont_rollback() call. +++*/ +++void sqlitepager_dont_write(Pager *pPager, Pgno pgno){ +++ PgHdr *pPg; +++ +++ pPg = pager_lookup(pPager, pgno); +++ pPg->alwaysRollback = 1; +++ if( pPg && pPg->dirty && !pPager->ckptInUse ){ +++ if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSizedbSize ){ +++ /* If this pages is the last page in the file and the file has grown +++ ** during the current transaction, then do NOT mark the page as clean. +++ ** When the database file grows, we must make sure that the last page +++ ** gets written at least once so that the disk file will be the correct +++ ** size. If you do not write this page and the size of the file +++ ** on the disk ends up being too small, that can lead to database +++ ** corruption during the next transaction. +++ */ +++ }else{ +++ TRACE2("DONT_WRITE %d\n", pgno); +++ pPg->dirty = 0; +++ } +++ } +++} +++ +++/* +++** A call to this routine tells the pager that if a rollback occurs, +++** it is not necessary to restore the data on the given page. This +++** means that the pager does not have to record the given page in the +++** rollback journal. +++*/ +++void sqlitepager_dont_rollback(void *pData){ +++ PgHdr *pPg = DATA_TO_PGHDR(pData); +++ Pager *pPager = pPg->pPager; +++ +++ if( pPager->state!=SQLITE_WRITELOCK || pPager->journalOpen==0 ) return; +++ if( pPg->alwaysRollback || pPager->alwaysRollback ) return; +++ if( !pPg->inJournal && (int)pPg->pgno <= pPager->origDbSize ){ +++ assert( pPager->aInJournal!=0 ); +++ pPager->aInJournal[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ pPg->inJournal = 1; +++ if( pPager->ckptInUse ){ +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++ TRACE2("DONT_ROLLBACK %d\n", pPg->pgno); +++ } +++ if( pPager->ckptInUse && !pPg->inCkpt && (int)pPg->pgno<=pPager->ckptSize ){ +++ assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ); +++ assert( pPager->aInCkpt!=0 ); +++ pPager->aInCkpt[pPg->pgno/8] |= 1<<(pPg->pgno&7); +++ page_add_to_ckpt_list(pPg); +++ } +++} +++ +++/* +++** Commit all changes to the database and release the write lock. +++** +++** If the commit fails for any reason, a rollback attempt is made +++** and an error code is returned. If the commit worked, SQLITE_OK +++** is returned. +++*/ +++int sqlitepager_commit(Pager *pPager){ +++ int rc; +++ PgHdr *pPg; +++ +++ if( pPager->errMask==PAGER_ERR_FULL ){ +++ rc = sqlitepager_rollback(pPager); +++ if( rc==SQLITE_OK ){ +++ rc = SQLITE_FULL; +++ } +++ return rc; +++ } +++ if( pPager->errMask!=0 ){ +++ rc = pager_errcode(pPager); +++ return rc; +++ } +++ if( pPager->state!=SQLITE_WRITELOCK ){ +++ return SQLITE_ERROR; +++ } +++ TRACE1("COMMIT\n"); +++ if( pPager->dirtyFile==0 ){ +++ /* Exit early (without doing the time-consuming sqliteOsSync() calls) +++ ** if there have been no changes to the database file. */ +++ assert( pPager->needSync==0 ); +++ rc = pager_unwritelock(pPager); +++ pPager->dbSize = -1; +++ return rc; +++ } +++ assert( pPager->journalOpen ); +++ rc = syncJournal(pPager); +++ if( rc!=SQLITE_OK ){ +++ goto commit_abort; +++ } +++ pPg = pager_get_all_dirty_pages(pPager); +++ if( pPg ){ +++ rc = pager_write_pagelist(pPg); +++ if( rc || (!pPager->noSync && sqliteOsSync(&pPager->fd)!=SQLITE_OK) ){ +++ goto commit_abort; +++ } +++ } +++ rc = pager_unwritelock(pPager); +++ pPager->dbSize = -1; +++ return rc; +++ +++ /* Jump here if anything goes wrong during the commit process. +++ */ +++commit_abort: +++ rc = sqlitepager_rollback(pPager); +++ if( rc==SQLITE_OK ){ +++ rc = SQLITE_FULL; +++ } +++ return rc; +++} +++ +++/* +++** Rollback all changes. The database falls back to read-only mode. +++** All in-memory cache pages revert to their original data contents. +++** The journal is deleted. +++** +++** This routine cannot fail unless some other process is not following +++** the correct locking protocol (SQLITE_PROTOCOL) or unless some other +++** process is writing trash into the journal file (SQLITE_CORRUPT) or +++** unless a prior malloc() failed (SQLITE_NOMEM). Appropriate error +++** codes are returned for all these occasions. Otherwise, +++** SQLITE_OK is returned. +++*/ +++int sqlitepager_rollback(Pager *pPager){ +++ int rc; +++ TRACE1("ROLLBACK\n"); +++ if( !pPager->dirtyFile || !pPager->journalOpen ){ +++ rc = pager_unwritelock(pPager); +++ pPager->dbSize = -1; +++ return rc; +++ } +++ +++ if( pPager->errMask!=0 && pPager->errMask!=PAGER_ERR_FULL ){ +++ if( pPager->state>=SQLITE_WRITELOCK ){ +++ pager_playback(pPager, 1); +++ } +++ return pager_errcode(pPager); +++ } +++ if( pPager->state!=SQLITE_WRITELOCK ){ +++ return SQLITE_OK; +++ } +++ rc = pager_playback(pPager, 1); +++ if( rc!=SQLITE_OK ){ +++ rc = SQLITE_CORRUPT; +++ pPager->errMask |= PAGER_ERR_CORRUPT; +++ } +++ pPager->dbSize = -1; +++ return rc; +++} +++ +++/* +++** Return TRUE if the database file is opened read-only. Return FALSE +++** if the database is (in theory) writable. +++*/ +++int sqlitepager_isreadonly(Pager *pPager){ +++ return pPager->readOnly; +++} +++ +++/* +++** This routine is used for testing and analysis only. +++*/ +++int *sqlitepager_stats(Pager *pPager){ +++ static int a[9]; +++ a[0] = pPager->nRef; +++ a[1] = pPager->nPage; +++ a[2] = pPager->mxPage; +++ a[3] = pPager->dbSize; +++ a[4] = pPager->state; +++ a[5] = pPager->errMask; +++ a[6] = pPager->nHit; +++ a[7] = pPager->nMiss; +++ a[8] = pPager->nOvfl; +++ return a; +++} +++ +++/* +++** Set the checkpoint. +++** +++** This routine should be called with the transaction journal already +++** open. A new checkpoint journal is created that can be used to rollback +++** changes of a single SQL command within a larger transaction. +++*/ +++int sqlitepager_ckpt_begin(Pager *pPager){ +++ int rc; +++ char zTemp[SQLITE_TEMPNAME_SIZE]; +++ if( !pPager->journalOpen ){ +++ pPager->ckptAutoopen = 1; +++ return SQLITE_OK; +++ } +++ assert( pPager->journalOpen ); +++ assert( !pPager->ckptInUse ); +++ pPager->aInCkpt = sqliteMalloc( pPager->dbSize/8 + 1 ); +++ if( pPager->aInCkpt==0 ){ +++ sqliteOsReadLock(&pPager->fd); +++ return SQLITE_NOMEM; +++ } +++#ifndef NDEBUG +++ rc = sqliteOsFileSize(&pPager->jfd, &pPager->ckptJSize); +++ if( rc ) goto ckpt_begin_failed; +++ assert( pPager->ckptJSize == +++ pPager->nRec*JOURNAL_PG_SZ(journal_format)+JOURNAL_HDR_SZ(journal_format) ); +++#endif +++ pPager->ckptJSize = pPager->nRec*JOURNAL_PG_SZ(journal_format) +++ + JOURNAL_HDR_SZ(journal_format); +++ pPager->ckptSize = pPager->dbSize; +++ if( !pPager->ckptOpen ){ +++ rc = sqlitepager_opentemp(zTemp, &pPager->cpfd); +++ if( rc ) goto ckpt_begin_failed; +++ pPager->ckptOpen = 1; +++ pPager->ckptNRec = 0; +++ } +++ pPager->ckptInUse = 1; +++ return SQLITE_OK; +++ +++ckpt_begin_failed: +++ if( pPager->aInCkpt ){ +++ sqliteFree(pPager->aInCkpt); +++ pPager->aInCkpt = 0; +++ } +++ return rc; +++} +++ +++/* +++** Commit a checkpoint. +++*/ +++int sqlitepager_ckpt_commit(Pager *pPager){ +++ if( pPager->ckptInUse ){ +++ PgHdr *pPg, *pNext; +++ sqliteOsSeek(&pPager->cpfd, 0); +++ /* sqliteOsTruncate(&pPager->cpfd, 0); */ +++ pPager->ckptNRec = 0; +++ pPager->ckptInUse = 0; +++ sqliteFree( pPager->aInCkpt ); +++ pPager->aInCkpt = 0; +++ for(pPg=pPager->pCkpt; pPg; pPg=pNext){ +++ pNext = pPg->pNextCkpt; +++ assert( pPg->inCkpt ); +++ pPg->inCkpt = 0; +++ pPg->pPrevCkpt = pPg->pNextCkpt = 0; +++ } +++ pPager->pCkpt = 0; +++ } +++ pPager->ckptAutoopen = 0; +++ return SQLITE_OK; +++} +++ +++/* +++** Rollback a checkpoint. +++*/ +++int sqlitepager_ckpt_rollback(Pager *pPager){ +++ int rc; +++ if( pPager->ckptInUse ){ +++ rc = pager_ckpt_playback(pPager); +++ sqlitepager_ckpt_commit(pPager); +++ }else{ +++ rc = SQLITE_OK; +++ } +++ pPager->ckptAutoopen = 0; +++ return rc; +++} +++ +++/* +++** Return the full pathname of the database file. +++*/ +++const char *sqlitepager_filename(Pager *pPager){ +++ return pPager->zFilename; +++} +++ +++/* +++** Set the codec for this pager +++*/ +++void sqlitepager_set_codec( +++ Pager *pPager, +++ void (*xCodec)(void*,void*,Pgno,int), +++ void *pCodecArg +++){ +++ pPager->xCodec = xCodec; +++ pPager->pCodecArg = pCodecArg; +++} +++ +++#ifdef SQLITE_TEST +++/* +++** Print a listing of all referenced pages and their ref count. +++*/ +++void sqlitepager_refdump(Pager *pPager){ +++ PgHdr *pPg; +++ for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ +++ if( pPg->nRef<=0 ) continue; +++ printf("PAGE %3d addr=0x%08x nRef=%d\n", +++ pPg->pgno, (int)PGHDR_TO_DATA(pPg), pPg->nRef); +++ } +++} +++#endif ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/pager.h ++@@ -0,0 +1,107 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This header file defines the interface that the sqlite page cache +++** subsystem. The page cache subsystem reads and writes a file a page +++** at a time and provides a journal for rollback. +++** +++** @(#) $Id$ +++*/ +++ +++/* +++** The size of one page +++** +++** You can change this value to another (reasonable) value you want. +++** It need not be a power of two, though the interface to the disk +++** will likely be faster if it is. +++** +++** Experiments show that a page size of 1024 gives the best speed +++** for common usages. The speed differences for different sizes +++** such as 512, 2048, 4096, an so forth, is minimal. Note, however, +++** that changing the page size results in a completely imcompatible +++** file format. +++*/ +++#ifndef SQLITE_PAGE_SIZE +++#define SQLITE_PAGE_SIZE 1024 +++#endif +++ +++/* +++** Number of extra bytes of data allocated at the end of each page and +++** stored on disk but not used by the higher level btree layer. Changing +++** this value results in a completely incompatible file format. +++*/ +++#ifndef SQLITE_PAGE_RESERVE +++#define SQLITE_PAGE_RESERVE 0 +++#endif +++ +++/* +++** The total number of usable bytes stored on disk for each page. +++** The usable bytes come at the beginning of the page and the reserve +++** bytes come at the end. +++*/ +++#define SQLITE_USABLE_SIZE (SQLITE_PAGE_SIZE-SQLITE_PAGE_RESERVE) +++ +++/* +++** Maximum number of pages in one database. (This is a limitation of +++** imposed by 4GB files size limits.) +++*/ +++#define SQLITE_MAX_PAGE 1073741823 +++ +++/* +++** The type used to represent a page number. The first page in a file +++** is called page 1. 0 is used to represent "not a page". +++*/ +++typedef unsigned int Pgno; +++ +++/* +++** Each open file is managed by a separate instance of the "Pager" structure. +++*/ +++typedef struct Pager Pager; +++ +++/* +++** See source code comments for a detailed description of the following +++** routines: +++*/ +++int sqlitepager_open(Pager **ppPager, const char *zFilename, +++ int nPage, int nExtra, int useJournal); +++void sqlitepager_set_destructor(Pager*, void(*)(void*)); +++void sqlitepager_set_cachesize(Pager*, int); +++int sqlitepager_close(Pager *pPager); +++int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage); +++void *sqlitepager_lookup(Pager *pPager, Pgno pgno); +++int sqlitepager_ref(void*); +++int sqlitepager_unref(void*); +++Pgno sqlitepager_pagenumber(void*); +++int sqlitepager_write(void*); +++int sqlitepager_iswriteable(void*); +++int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void*); +++int sqlitepager_pagecount(Pager*); +++int sqlitepager_truncate(Pager*,Pgno); +++int sqlitepager_begin(void*); +++int sqlitepager_commit(Pager*); +++int sqlitepager_rollback(Pager*); +++int sqlitepager_isreadonly(Pager*); +++int sqlitepager_ckpt_begin(Pager*); +++int sqlitepager_ckpt_commit(Pager*); +++int sqlitepager_ckpt_rollback(Pager*); +++void sqlitepager_dont_rollback(void*); +++void sqlitepager_dont_write(Pager*, Pgno); +++int *sqlitepager_stats(Pager*); +++void sqlitepager_set_safety_level(Pager*,int); +++const char *sqlitepager_filename(Pager*); +++int sqlitepager_rename(Pager*, const char *zNewName); +++void sqlitepager_set_codec(Pager*,void(*)(void*,void*,Pgno,int),void*); +++ +++#ifdef SQLITE_TEST +++void sqlitepager_refdump(Pager*); +++int pager_refinfo_enable; +++int journal_format; +++#endif ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/parse.c ++@@ -0,0 +1,3355 @@ +++/* Driver template for the LEMON parser generator. +++** The author disclaims copyright to this source code. +++*/ +++/* First off, code is included that follows the "include" declaration +++** in the input grammar file. */ +++#include +++#line 33 "ext/sqlite/libsqlite/src/parse.y" +++ +++#include "sqliteInt.h" +++#include "parse.h" +++ +++/* +++** An instance of this structure holds information about the +++** LIMIT clause of a SELECT statement. +++*/ +++struct LimitVal { +++ int limit; /* The LIMIT value. -1 if there is no limit */ +++ int offset; /* The OFFSET. 0 if there is none */ +++}; +++ +++/* +++** An instance of the following structure describes the event of a +++** TRIGGER. "a" is the event type, one of TK_UPDATE, TK_INSERT, +++** TK_DELETE, or TK_INSTEAD. If the event is of the form +++** +++** UPDATE ON (a,b,c) +++** +++** Then the "b" IdList records the list "a,b,c". +++*/ +++struct TrigEvent { int a; IdList * b; }; +++ +++#line 33 "ext/sqlite/libsqlite/src/parse.c" +++/* Next is all token values, in a form suitable for use by makeheaders. +++** This section will be null unless lemon is run with the -m switch. +++*/ +++/* +++** These constants (all generated automatically by the parser generator) +++** specify the various kinds of tokens (terminals) that the parser +++** understands. +++** +++** Each symbol here is a terminal symbol in the grammar. +++*/ +++/* Make sure the INTERFACE macro is defined. +++*/ +++#ifndef INTERFACE +++# define INTERFACE 1 +++#endif +++/* The next thing included is series of defines which control +++** various aspects of the generated parser. +++** YYCODETYPE is the data type used for storing terminal +++** and nonterminal numbers. "unsigned char" is +++** used if there are fewer than 250 terminals +++** and nonterminals. "int" is used otherwise. +++** YYNOCODE is a number of type YYCODETYPE which corresponds +++** to no legal terminal or nonterminal number. This +++** number is used to fill in empty slots of the hash +++** table. +++** YYFALLBACK If defined, this indicates that one or more tokens +++** have fall-back values which should be used if the +++** original value of the token will not parse. +++** YYACTIONTYPE is the data type used for storing terminal +++** and nonterminal numbers. "unsigned char" is +++** used if there are fewer than 250 rules and +++** states combined. "int" is used otherwise. +++** sqliteParserTOKENTYPE is the data type used for minor tokens given +++** directly to the parser from the tokenizer. +++** YYMINORTYPE is the data type used for all minor tokens. +++** This is typically a union of many types, one of +++** which is sqliteParserTOKENTYPE. The entry in the union +++** for base tokens is called "yy0". +++** YYSTACKDEPTH is the maximum depth of the parser's stack. If +++** zero the stack is dynamically sized using realloc() +++** sqliteParserARG_SDECL A static variable declaration for the %extra_argument +++** sqliteParserARG_PDECL A parameter declaration for the %extra_argument +++** sqliteParserARG_STORE Code to store %extra_argument into yypParser +++** sqliteParserARG_FETCH Code to extract %extra_argument from yypParser +++** YYNSTATE the combined number of states. +++** YYNRULE the number of rules in the grammar +++** YYERRORSYMBOL is the code number of the error symbol. If not +++** defined, then do no error processing. +++*/ +++#define YYCODETYPE unsigned char +++#define YYNOCODE 221 +++#define YYACTIONTYPE unsigned short int +++#define sqliteParserTOKENTYPE Token +++typedef union { +++ int yyinit; +++ sqliteParserTOKENTYPE yy0; +++ TriggerStep * yy19; +++ struct LimitVal yy124; +++ Select* yy179; +++ Expr * yy182; +++ Expr* yy242; +++ struct TrigEvent yy290; +++ SrcList* yy307; +++ IdList* yy320; +++ ExprList* yy322; +++ int yy372; +++ struct {int value; int mask;} yy407; +++} YYMINORTYPE; +++#ifndef YYSTACKDEPTH +++#define YYSTACKDEPTH 100 +++#endif +++#define sqliteParserARG_SDECL Parse *pParse; +++#define sqliteParserARG_PDECL ,Parse *pParse +++#define sqliteParserARG_FETCH Parse *pParse = yypParser->pParse +++#define sqliteParserARG_STORE yypParser->pParse = pParse +++#define YYNSTATE 563 +++#define YYNRULE 293 +++#define YYFALLBACK 1 +++#define YY_NO_ACTION (YYNSTATE+YYNRULE+2) +++#define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) +++#define YY_ERROR_ACTION (YYNSTATE+YYNRULE) +++ +++/* The yyzerominor constant is used to initialize instances of +++** YYMINORTYPE objects to zero. */ +++static const YYMINORTYPE yyzerominor = { 0 }; +++ +++/* Define the yytestcase() macro to be a no-op if is not already defined +++** otherwise. +++** +++** Applications can choose to define yytestcase() in the %include section +++** to a macro that can assist in verifying code coverage. For production +++** code the yytestcase() macro should be turned off. But it is useful +++** for testing. +++*/ +++#ifndef yytestcase +++# define yytestcase(X) +++#endif +++ +++ +++/* Next are the tables used to determine what action to take based on the +++** current state and lookahead token. These tables are used to implement +++** functions that take a state number and lookahead value and return an +++** action integer. +++** +++** Suppose the action integer is N. Then the action is determined as +++** follows +++** +++** 0 <= N < YYNSTATE Shift N. That is, push the lookahead +++** token onto the stack and goto state N. +++** +++** YYNSTATE <= N < YYNSTATE+YYNRULE Reduce by rule N-YYNSTATE. +++** +++** N == YYNSTATE+YYNRULE A syntax error has occurred. +++** +++** N == YYNSTATE+YYNRULE+1 The parser accepts its input. +++** +++** N == YYNSTATE+YYNRULE+2 No such action. Denotes unused +++** slots in the yy_action[] table. +++** +++** The action table is constructed as a single large table named yy_action[]. +++** Given state S and lookahead X, the action is computed as +++** +++** yy_action[ yy_shift_ofst[S] + X ] +++** +++** If the index value yy_shift_ofst[S]+X is out of range or if the value +++** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S] +++** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table +++** and that yy_default[S] should be used instead. +++** +++** The formula above is for computing the action when the lookahead is +++** a terminal symbol. If the lookahead is a non-terminal (as occurs after +++** a reduce action) then the yy_reduce_ofst[] array is used in place of +++** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of +++** YY_SHIFT_USE_DFLT. +++** +++** The following are the tables generated in this section: +++** +++** yy_action[] A single table containing all actions. +++** yy_lookahead[] A table containing the lookahead for each entry in +++** yy_action. Used to detect hash collisions. +++** yy_shift_ofst[] For each state, the offset into yy_action for +++** shifting terminals. +++** yy_reduce_ofst[] For each state, the offset into yy_action for +++** shifting non-terminals after a reduce. +++** yy_default[] Default action for each state. +++*/ +++#define YY_ACTTAB_COUNT (1090) +++static const YYACTIONTYPE yy_action[] = { +++ /* 0 */ 186, 561, 483, 69, 67, 70, 68, 64, 63, 62, +++ /* 10 */ 61, 58, 57, 56, 55, 54, 53, 181, 180, 179, +++ /* 20 */ 514, 421, 334, 420, 468, 515, 64, 63, 62, 61, +++ /* 30 */ 58, 57, 56, 55, 54, 53, 9, 423, 422, 71, +++ /* 40 */ 72, 129, 65, 66, 513, 510, 305, 52, 138, 69, +++ /* 50 */ 67, 70, 68, 64, 63, 62, 61, 58, 57, 56, +++ /* 60 */ 55, 54, 53, 448, 469, 175, 482, 514, 470, 344, +++ /* 70 */ 342, 36, 515, 58, 57, 56, 55, 54, 53, 8, +++ /* 80 */ 341, 281, 285, 307, 437, 178, 71, 72, 129, 65, +++ /* 90 */ 66, 513, 510, 305, 52, 138, 69, 67, 70, 68, +++ /* 100 */ 64, 63, 62, 61, 58, 57, 56, 55, 54, 53, +++ /* 110 */ 130, 362, 360, 508, 507, 267, 551, 436, 298, 297, +++ /* 120 */ 369, 368, 50, 128, 543, 29, 266, 449, 537, 447, +++ /* 130 */ 591, 528, 442, 441, 187, 132, 514, 536, 47, 48, +++ /* 140 */ 472, 515, 122, 427, 331, 409, 49, 371, 370, 518, +++ /* 150 */ 328, 363, 517, 520, 45, 71, 72, 129, 65, 66, +++ /* 160 */ 513, 510, 305, 52, 138, 69, 67, 70, 68, 64, +++ /* 170 */ 63, 62, 61, 58, 57, 56, 55, 54, 53, 185, +++ /* 180 */ 550, 549, 512, 175, 467, 516, 18, 344, 342, 36, +++ /* 190 */ 544, 175, 320, 230, 231, 344, 342, 36, 341, 56, +++ /* 200 */ 55, 54, 53, 212, 531, 514, 341, 551, 3, 213, +++ /* 210 */ 515, 2, 551, 73, 7, 551, 184, 132, 551, 172, +++ /* 220 */ 551, 309, 348, 42, 71, 72, 129, 65, 66, 513, +++ /* 230 */ 510, 305, 52, 138, 69, 67, 70, 68, 64, 63, +++ /* 240 */ 62, 61, 58, 57, 56, 55, 54, 53, 243, 197, +++ /* 250 */ 282, 358, 268, 373, 264, 372, 183, 241, 436, 169, +++ /* 260 */ 356, 171, 269, 240, 471, 426, 29, 446, 506, 514, +++ /* 270 */ 445, 550, 549, 494, 515, 354, 550, 549, 359, 550, +++ /* 280 */ 549, 144, 550, 549, 550, 549, 592, 309, 71, 72, +++ /* 290 */ 129, 65, 66, 513, 510, 305, 52, 138, 69, 67, +++ /* 300 */ 70, 68, 64, 63, 62, 61, 58, 57, 56, 55, +++ /* 310 */ 54, 53, 514, 857, 82, 377, 1, 515, 268, 373, +++ /* 320 */ 264, 372, 183, 241, 362, 12, 508, 507, 500, 240, +++ /* 330 */ 17, 71, 72, 129, 65, 66, 513, 510, 305, 52, +++ /* 340 */ 138, 69, 67, 70, 68, 64, 63, 62, 61, 58, +++ /* 350 */ 57, 56, 55, 54, 53, 362, 182, 508, 507, 514, +++ /* 360 */ 362, 527, 508, 507, 515, 563, 429, 463, 182, 444, +++ /* 370 */ 375, 338, 443, 430, 379, 378, 593, 156, 71, 72, +++ /* 380 */ 129, 65, 66, 513, 510, 305, 52, 138, 69, 67, +++ /* 390 */ 70, 68, 64, 63, 62, 61, 58, 57, 56, 55, +++ /* 400 */ 54, 53, 514, 526, 542, 450, 534, 515, 286, 493, +++ /* 410 */ 453, 17, 478, 240, 80, 11, 533, 153, 194, 155, +++ /* 420 */ 286, 71, 51, 129, 65, 66, 513, 510, 305, 52, +++ /* 430 */ 138, 69, 67, 70, 68, 64, 63, 62, 61, 58, +++ /* 440 */ 57, 56, 55, 54, 53, 514, 195, 466, 160, 17, +++ /* 450 */ 515, 454, 490, 80, 459, 440, 460, 176, 239, 238, +++ /* 460 */ 80, 80, 562, 1, 71, 40, 129, 65, 66, 513, +++ /* 470 */ 510, 305, 52, 138, 69, 67, 70, 68, 64, 63, +++ /* 480 */ 62, 61, 58, 57, 56, 55, 54, 53, 514, 365, +++ /* 490 */ 154, 19, 339, 515, 80, 232, 405, 80, 165, 404, +++ /* 500 */ 193, 32, 396, 13, 32, 86, 414, 108, 72, 129, +++ /* 510 */ 65, 66, 513, 510, 305, 52, 138, 69, 67, 70, +++ /* 520 */ 68, 64, 63, 62, 61, 58, 57, 56, 55, 54, +++ /* 530 */ 53, 514, 551, 365, 483, 192, 515, 488, 323, 207, +++ /* 540 */ 366, 249, 177, 186, 87, 483, 483, 46, 38, 44, +++ /* 550 */ 458, 108, 129, 65, 66, 513, 510, 305, 52, 138, +++ /* 560 */ 69, 67, 70, 68, 64, 63, 62, 61, 58, 57, +++ /* 570 */ 56, 55, 54, 53, 274, 457, 272, 271, 270, 23, +++ /* 580 */ 8, 551, 211, 412, 307, 257, 365, 385, 201, 31, +++ /* 590 */ 217, 388, 141, 205, 387, 219, 550, 549, 482, 511, +++ /* 600 */ 215, 376, 560, 134, 90, 477, 214, 514, 392, 482, +++ /* 610 */ 482, 152, 515, 360, 203, 212, 409, 531, 800, 284, +++ /* 620 */ 365, 145, 505, 50, 300, 365, 365, 173, 321, 212, +++ /* 630 */ 487, 137, 135, 8, 41, 136, 531, 307, 93, 47, +++ /* 640 */ 48, 346, 316, 106, 106, 550, 549, 49, 371, 370, +++ /* 650 */ 518, 509, 531, 517, 520, 504, 531, 531, 162, 495, +++ /* 660 */ 170, 317, 503, 319, 223, 231, 360, 551, 502, 283, +++ /* 670 */ 162, 207, 557, 486, 212, 191, 50, 10, 289, 304, +++ /* 680 */ 303, 556, 207, 531, 8, 531, 516, 18, 307, 498, +++ /* 690 */ 498, 189, 47, 48, 393, 531, 555, 28, 302, 554, +++ /* 700 */ 49, 371, 370, 518, 484, 480, 517, 520, 322, 299, +++ /* 710 */ 553, 418, 365, 323, 17, 365, 365, 360, 416, 207, +++ /* 720 */ 322, 417, 207, 418, 327, 212, 480, 50, 207, 326, +++ /* 730 */ 106, 550, 549, 106, 105, 247, 407, 475, 332, 516, +++ /* 740 */ 18, 326, 365, 47, 48, 207, 295, 365, 475, 294, +++ /* 750 */ 158, 49, 371, 370, 518, 293, 473, 517, 520, 485, +++ /* 760 */ 106, 391, 390, 202, 148, 93, 351, 480, 204, 301, +++ /* 770 */ 333, 190, 291, 541, 60, 531, 498, 252, 453, 498, +++ /* 780 */ 365, 365, 290, 365, 501, 475, 365, 79, 475, 531, +++ /* 790 */ 516, 18, 379, 378, 475, 365, 465, 245, 89, 112, +++ /* 800 */ 365, 109, 365, 131, 121, 288, 499, 365, 365, 439, +++ /* 810 */ 365, 475, 365, 120, 365, 365, 343, 365, 119, 365, +++ /* 820 */ 118, 365, 365, 365, 365, 117, 116, 365, 126, 365, +++ /* 830 */ 125, 365, 124, 123, 365, 115, 365, 114, 431, 140, +++ /* 840 */ 139, 255, 254, 365, 365, 253, 365, 280, 365, 107, +++ /* 850 */ 365, 365, 113, 365, 111, 26, 365, 365, 365, 365, +++ /* 860 */ 365, 279, 278, 365, 277, 365, 92, 365, 104, 103, +++ /* 870 */ 365, 91, 365, 365, 102, 101, 110, 100, 99, 347, +++ /* 880 */ 25, 98, 340, 30, 24, 97, 266, 174, 96, 85, +++ /* 890 */ 95, 94, 166, 292, 78, 165, 415, 14, 163, 60, +++ /* 900 */ 164, 22, 6, 408, 5, 77, 34, 33, 159, 16, +++ /* 910 */ 157, 151, 75, 149, 15, 146, 313, 312, 395, 384, +++ /* 920 */ 143, 20, 60, 206, 21, 273, 198, 559, 375, 548, +++ /* 930 */ 547, 546, 374, 4, 540, 539, 538, 308, 535, 532, +++ /* 940 */ 530, 212, 261, 38, 260, 352, 259, 39, 258, 367, +++ /* 950 */ 529, 196, 210, 256, 521, 522, 53, 53, 209, 43, +++ /* 960 */ 496, 188, 492, 208, 256, 81, 246, 37, 479, 349, +++ /* 970 */ 244, 37, 474, 464, 276, 27, 452, 451, 433, 432, +++ /* 980 */ 275, 235, 234, 335, 424, 35, 329, 413, 410, 127, +++ /* 990 */ 161, 84, 76, 403, 38, 400, 188, 399, 224, 398, +++ /* 1000 */ 38, 150, 318, 220, 83, 147, 315, 200, 381, 383, +++ /* 1010 */ 199, 142, 545, 265, 88, 262, 523, 361, 491, 476, +++ /* 1020 */ 463, 406, 397, 287, 389, 386, 310, 382, 552, 74, +++ /* 1030 */ 306, 525, 524, 364, 519, 357, 355, 353, 497, 489, +++ /* 1040 */ 481, 263, 242, 462, 461, 456, 455, 438, 296, 345, +++ /* 1050 */ 434, 237, 425, 337, 168, 167, 336, 236, 419, 330, +++ /* 1060 */ 233, 325, 324, 229, 228, 402, 401, 227, 226, 225, +++ /* 1070 */ 222, 221, 218, 314, 394, 311, 216, 380, 251, 250, +++ /* 1080 */ 133, 350, 248, 364, 558, 59, 435, 411, 428, 212, +++}; +++static const YYCODETYPE yy_lookahead[] = { +++ /* 0 */ 21, 9, 23, 70, 71, 72, 73, 74, 75, 76, +++ /* 10 */ 77, 78, 79, 80, 81, 82, 83, 100, 101, 102, +++ /* 20 */ 41, 100, 101, 102, 20, 46, 74, 75, 76, 77, +++ /* 30 */ 78, 79, 80, 81, 82, 83, 19, 55, 56, 60, +++ /* 40 */ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, +++ /* 50 */ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +++ /* 60 */ 81, 82, 83, 23, 108, 90, 87, 41, 112, 94, +++ /* 70 */ 95, 96, 46, 78, 79, 80, 81, 82, 83, 19, +++ /* 80 */ 105, 149, 143, 23, 152, 153, 60, 61, 62, 63, +++ /* 90 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, +++ /* 100 */ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, +++ /* 110 */ 31, 107, 52, 109, 110, 93, 23, 140, 78, 79, +++ /* 120 */ 78, 79, 62, 22, 147, 148, 104, 87, 34, 89, +++ /* 130 */ 113, 89, 92, 93, 183, 184, 41, 43, 78, 79, +++ /* 140 */ 80, 46, 165, 166, 205, 53, 86, 87, 88, 89, +++ /* 150 */ 211, 62, 92, 93, 128, 60, 61, 62, 63, 64, +++ /* 160 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +++ /* 170 */ 75, 76, 77, 78, 79, 80, 81, 82, 83, 146, +++ /* 180 */ 87, 88, 93, 90, 20, 125, 126, 94, 95, 96, +++ /* 190 */ 20, 90, 100, 101, 102, 94, 95, 96, 105, 80, +++ /* 200 */ 81, 82, 83, 111, 171, 41, 105, 23, 19, 48, +++ /* 210 */ 46, 19, 23, 19, 19, 23, 183, 184, 23, 17, +++ /* 220 */ 23, 62, 189, 128, 60, 61, 62, 63, 64, 65, +++ /* 230 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +++ /* 240 */ 76, 77, 78, 79, 80, 81, 82, 83, 20, 90, +++ /* 250 */ 91, 15, 93, 94, 95, 96, 97, 98, 140, 57, +++ /* 260 */ 24, 59, 144, 104, 80, 147, 148, 89, 20, 41, +++ /* 270 */ 92, 87, 88, 20, 46, 39, 87, 88, 42, 87, +++ /* 280 */ 88, 19, 87, 88, 87, 88, 113, 62, 60, 61, +++ /* 290 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +++ /* 300 */ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +++ /* 310 */ 82, 83, 41, 132, 133, 134, 135, 46, 93, 94, +++ /* 320 */ 95, 96, 97, 98, 107, 63, 109, 110, 20, 104, +++ /* 330 */ 22, 60, 61, 62, 63, 64, 65, 66, 67, 68, +++ /* 340 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, +++ /* 350 */ 79, 80, 81, 82, 83, 107, 47, 109, 110, 41, +++ /* 360 */ 107, 89, 109, 110, 46, 0, 161, 162, 47, 89, +++ /* 370 */ 99, 62, 92, 168, 9, 10, 113, 17, 60, 61, +++ /* 380 */ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, +++ /* 390 */ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, +++ /* 400 */ 82, 83, 41, 89, 155, 156, 26, 46, 99, 20, +++ /* 410 */ 161, 22, 20, 104, 22, 118, 36, 57, 22, 59, +++ /* 420 */ 99, 60, 61, 62, 63, 64, 65, 66, 67, 68, +++ /* 430 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, +++ /* 440 */ 79, 80, 81, 82, 83, 41, 50, 20, 22, 22, +++ /* 450 */ 46, 20, 22, 22, 91, 20, 93, 22, 20, 20, +++ /* 460 */ 22, 22, 134, 135, 60, 61, 62, 63, 64, 65, +++ /* 470 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, +++ /* 480 */ 76, 77, 78, 79, 80, 81, 82, 83, 41, 140, +++ /* 490 */ 130, 22, 20, 46, 22, 20, 20, 22, 22, 20, +++ /* 500 */ 113, 22, 20, 19, 22, 21, 18, 158, 61, 62, +++ /* 510 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, +++ /* 520 */ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, +++ /* 530 */ 83, 41, 23, 140, 23, 113, 46, 22, 140, 140, +++ /* 540 */ 191, 192, 19, 21, 114, 23, 23, 127, 122, 129, +++ /* 550 */ 29, 158, 62, 63, 64, 65, 66, 67, 68, 69, +++ /* 560 */ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +++ /* 570 */ 80, 81, 82, 83, 11, 54, 13, 14, 15, 16, +++ /* 580 */ 19, 23, 174, 95, 23, 192, 140, 78, 79, 181, +++ /* 590 */ 27, 89, 146, 195, 92, 32, 87, 88, 87, 93, +++ /* 600 */ 37, 136, 137, 88, 158, 206, 141, 41, 99, 87, +++ /* 610 */ 87, 146, 46, 52, 51, 111, 53, 171, 130, 19, +++ /* 620 */ 140, 58, 14, 62, 103, 140, 140, 146, 124, 111, +++ /* 630 */ 115, 146, 146, 19, 68, 69, 171, 23, 158, 78, +++ /* 640 */ 79, 80, 124, 158, 158, 87, 88, 86, 87, 88, +++ /* 650 */ 89, 108, 171, 92, 93, 20, 171, 171, 146, 93, +++ /* 660 */ 146, 196, 20, 100, 101, 102, 52, 23, 20, 106, +++ /* 670 */ 146, 140, 15, 115, 111, 22, 62, 118, 198, 194, +++ /* 680 */ 194, 24, 140, 171, 19, 171, 125, 126, 23, 204, +++ /* 690 */ 204, 22, 78, 79, 140, 171, 39, 19, 167, 42, +++ /* 700 */ 86, 87, 88, 89, 115, 152, 92, 93, 196, 167, +++ /* 710 */ 53, 140, 140, 140, 22, 140, 140, 52, 25, 140, +++ /* 720 */ 196, 28, 140, 140, 212, 111, 152, 62, 140, 217, +++ /* 730 */ 158, 87, 88, 158, 158, 182, 212, 206, 45, 125, +++ /* 740 */ 126, 217, 140, 78, 79, 140, 167, 140, 206, 167, +++ /* 750 */ 146, 86, 87, 88, 89, 167, 182, 92, 93, 115, +++ /* 760 */ 158, 207, 208, 209, 146, 158, 194, 152, 195, 194, +++ /* 770 */ 199, 22, 167, 156, 200, 171, 204, 201, 161, 204, +++ /* 780 */ 140, 140, 199, 140, 20, 206, 140, 20, 206, 171, +++ /* 790 */ 125, 126, 9, 10, 206, 140, 20, 182, 158, 158, +++ /* 800 */ 140, 158, 140, 113, 158, 198, 204, 140, 140, 20, +++ /* 810 */ 140, 206, 140, 158, 140, 140, 48, 140, 158, 140, +++ /* 820 */ 158, 140, 140, 140, 140, 158, 158, 140, 158, 140, +++ /* 830 */ 158, 140, 158, 158, 140, 158, 140, 158, 139, 158, +++ /* 840 */ 158, 158, 158, 140, 140, 158, 140, 158, 140, 158, +++ /* 850 */ 140, 140, 158, 140, 158, 19, 140, 140, 140, 140, +++ /* 860 */ 140, 158, 158, 140, 158, 140, 158, 140, 158, 158, +++ /* 870 */ 140, 158, 140, 140, 158, 158, 158, 158, 158, 140, +++ /* 880 */ 19, 158, 48, 158, 19, 158, 104, 97, 158, 21, +++ /* 890 */ 158, 158, 99, 38, 49, 22, 49, 158, 99, 200, +++ /* 900 */ 130, 19, 11, 14, 9, 103, 63, 63, 123, 19, +++ /* 910 */ 114, 114, 103, 123, 19, 114, 116, 35, 87, 20, +++ /* 920 */ 21, 150, 200, 160, 160, 138, 12, 139, 99, 138, +++ /* 930 */ 138, 138, 145, 22, 139, 139, 164, 44, 139, 139, +++ /* 940 */ 171, 111, 176, 122, 177, 119, 178, 120, 179, 117, +++ /* 950 */ 180, 121, 193, 98, 151, 23, 83, 83, 202, 127, +++ /* 960 */ 186, 113, 186, 193, 98, 186, 187, 99, 188, 116, +++ /* 970 */ 187, 99, 188, 139, 159, 19, 151, 164, 139, 139, +++ /* 980 */ 159, 186, 215, 40, 216, 127, 186, 139, 169, 60, +++ /* 990 */ 169, 197, 19, 176, 122, 186, 113, 186, 186, 176, +++ /* 1000 */ 122, 169, 186, 186, 197, 169, 186, 218, 33, 219, +++ /* 1010 */ 116, 218, 142, 157, 173, 175, 157, 203, 157, 157, +++ /* 1020 */ 162, 176, 176, 152, 210, 210, 152, 152, 140, 140, +++ /* 1030 */ 154, 154, 154, 140, 140, 140, 140, 140, 140, 185, +++ /* 1040 */ 140, 172, 140, 140, 163, 163, 163, 152, 154, 154, +++ /* 1050 */ 140, 140, 140, 140, 140, 213, 214, 140, 140, 140, +++ /* 1060 */ 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, +++ /* 1070 */ 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, +++ /* 1080 */ 140, 140, 140, 140, 170, 200, 166, 170, 166, 111, +++}; +++#define YY_SHIFT_USE_DFLT (-84) +++#define YY_SHIFT_COUNT (376) +++#define YY_SHIFT_MIN (-83) +++#define YY_SHIFT_MAX (978) +++static const short yy_shift_ofst[] = { +++ /* 0 */ 783, 563, 614, 614, 93, 92, 92, 978, 614, 561, +++ /* 10 */ 665, 665, 509, 197, -21, 665, 665, 665, 665, 665, +++ /* 20 */ 159, 309, 197, 488, 197, 197, 197, 197, 197, 511, +++ /* 30 */ 271, 60, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 40 */ 665, 665, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 50 */ 665, 665, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 60 */ 665, 665, 665, 665, 665, 665, 665, 665, 665, 665, +++ /* 70 */ 665, 665, 665, 665, 225, 197, 197, 197, 197, 522, +++ /* 80 */ 197, 522, 365, 518, 504, 978, 978, -84, -84, 228, +++ /* 90 */ 164, 95, 26, 318, 318, 318, 318, 318, 318, 318, +++ /* 100 */ 318, 404, 318, 318, 318, 318, 318, 361, 318, 447, +++ /* 110 */ 490, 490, 490, -67, -67, -67, -67, -67, -48, -48, +++ /* 120 */ -48, -48, 101, -5, -5, -5, -5, 657, -25, 566, +++ /* 130 */ 657, 184, 195, 644, 558, 253, 192, 248, 189, 119, +++ /* 140 */ 119, 4, 197, 197, 197, 197, 197, 197, 217, 197, +++ /* 150 */ 197, 197, 217, 197, 197, 197, 197, 197, 217, 197, +++ /* 160 */ 197, 197, 217, 197, 197, 197, 197, -79, 693, 197, +++ /* 170 */ 217, 197, 197, 217, 197, 197, 42, 42, 523, 521, +++ /* 180 */ 521, 521, 197, 197, 515, 217, 197, 515, 197, 197, +++ /* 190 */ 197, 197, 197, 197, 42, 42, 42, 197, 197, 511, +++ /* 200 */ 511, 502, 502, 511, 426, 426, 321, 380, 380, 420, +++ /* 210 */ 380, 430, -44, 380, 484, 975, 894, 975, 883, 929, +++ /* 220 */ 973, 883, 883, 929, 878, 883, 883, 883, 872, 973, +++ /* 230 */ 929, 929, 829, 848, 858, 943, 848, 956, 829, 829, +++ /* 240 */ 893, 932, 956, 829, 853, 872, 853, 868, 848, 866, +++ /* 250 */ 848, 848, 832, 874, 874, 873, 932, 855, 830, 832, +++ /* 260 */ 827, 826, 821, 830, 829, 829, 893, 829, 829, 911, +++ /* 270 */ 914, 914, 914, 829, 914, -84, -84, -84, -84, -84, +++ /* 280 */ -84, -84, 40, 360, 236, 202, -83, 262, 482, 479, +++ /* 290 */ 476, 475, -18, 472, 439, 438, 435, 280, 178, 431, +++ /* 300 */ 363, 427, 392, 389, 308, 89, 396, 17, 94, 22, +++ /* 310 */ 899, 899, 831, 882, 800, 801, 895, 790, 809, 797, +++ /* 320 */ 796, 890, 785, 844, 843, 802, 895, 889, 891, 882, +++ /* 330 */ 799, 770, 847, 873, 845, 855, 793, 868, 782, 790, +++ /* 340 */ 865, 834, 861, 836, 768, 789, 776, 690, 767, 678, +++ /* 350 */ 589, 692, 559, 764, 669, 648, 749, 642, 653, 635, +++ /* 360 */ 600, 608, 543, 506, 422, 387, 469, 297, 314, 272, +++ /* 370 */ 263, 173, 194, 161, 170, 79, -8, +++}; +++#define YY_REDUCE_USE_DFLT (-69) +++#define YY_REDUCE_COUNT (281) +++#define YY_REDUCE_MIN (-68) +++#define YY_REDUCE_MAX (943) +++static const short yy_reduce_ofst[] = { +++ /* 0 */ 181, 465, 486, 485, -23, 524, 512, 33, 446, 575, +++ /* 10 */ 572, 349, 554, 118, 574, 607, 480, 602, 576, 393, +++ /* 20 */ 249, 205, 605, -61, 588, 582, 579, 542, 531, -68, +++ /* 30 */ 699, 739, 733, 732, 730, 727, 725, 723, 720, 719, +++ /* 40 */ 718, 717, 716, 713, 711, 710, 708, 706, 704, 703, +++ /* 50 */ 696, 694, 691, 689, 687, 684, 683, 682, 681, 679, +++ /* 60 */ 677, 675, 674, 672, 670, 668, 667, 662, 660, 655, +++ /* 70 */ 646, 643, 641, 640, 617, 573, 583, 398, 571, 615, +++ /* 80 */ 399, 553, 328, 618, 604, 514, 481, -49, 408, 722, +++ /* 90 */ 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, +++ /* 100 */ 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, +++ /* 110 */ 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, +++ /* 120 */ 722, 722, 922, 722, 722, 722, 722, 917, 920, 885, +++ /* 130 */ 914, 943, 942, 941, 940, 869, 939, 869, 938, 722, +++ /* 140 */ 722, 869, 937, 936, 935, 934, 933, 932, 869, 931, +++ /* 150 */ 930, 929, 869, 928, 927, 926, 925, 924, 869, 923, +++ /* 160 */ 922, 921, 869, 920, 919, 918, 917, 842, 842, 914, +++ /* 170 */ 869, 913, 912, 869, 911, 910, 895, 894, 895, 883, +++ /* 180 */ 882, 881, 903, 902, 854, 869, 900, 854, 898, 897, +++ /* 190 */ 896, 895, 894, 893, 878, 877, 876, 889, 888, 875, +++ /* 200 */ 874, 815, 814, 871, 846, 845, 858, 862, 861, 814, +++ /* 210 */ 859, 840, 841, 856, 870, 793, 790, 789, 820, 836, +++ /* 220 */ 807, 817, 816, 832, 823, 812, 811, 809, 817, 794, +++ /* 230 */ 821, 819, 848, 800, 768, 767, 795, 821, 840, 839, +++ /* 240 */ 813, 825, 815, 834, 784, 783, 780, 779, 779, 770, +++ /* 250 */ 776, 774, 756, 722, 722, 722, 803, 759, 770, 769, +++ /* 260 */ 768, 767, 766, 769, 800, 799, 772, 796, 795, 787, +++ /* 270 */ 793, 792, 791, 788, 787, 764, 763, 722, 722, 722, +++ /* 280 */ 722, 771, +++}; +++static const YYACTIONTYPE yy_default[] = { +++ /* 0 */ 570, 856, 797, 797, 856, 839, 839, 685, 856, 797, +++ /* 10 */ 797, 856, 822, 856, 681, 856, 856, 797, 793, 856, +++ /* 20 */ 586, 649, 856, 581, 856, 856, 856, 856, 856, 594, +++ /* 30 */ 651, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 40 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 50 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 60 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 70 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 681, +++ /* 80 */ 856, 681, 570, 856, 856, 856, 856, 685, 675, 856, +++ /* 90 */ 856, 856, 856, 730, 729, 724, 723, 837, 697, 721, +++ /* 100 */ 714, 856, 789, 790, 788, 792, 796, 856, 705, 748, +++ /* 110 */ 780, 774, 747, 779, 760, 759, 754, 753, 752, 751, +++ /* 120 */ 750, 749, 640, 758, 757, 756, 755, 856, 856, 856, +++ /* 130 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 764, +++ /* 140 */ 763, 856, 856, 856, 856, 809, 856, 856, 726, 856, +++ /* 150 */ 856, 856, 663, 856, 856, 856, 856, 856, 842, 856, +++ /* 160 */ 856, 856, 844, 856, 856, 856, 856, 856, 828, 856, +++ /* 170 */ 661, 856, 856, 583, 856, 856, 856, 856, 595, 856, +++ /* 180 */ 856, 856, 856, 856, 689, 688, 856, 683, 856, 856, +++ /* 190 */ 856, 856, 856, 856, 856, 856, 856, 856, 573, 856, +++ /* 200 */ 856, 856, 856, 856, 720, 720, 621, 708, 708, 791, +++ /* 210 */ 708, 682, 673, 708, 856, 854, 852, 854, 690, 653, +++ /* 220 */ 731, 690, 690, 653, 720, 690, 690, 690, 720, 731, +++ /* 230 */ 653, 653, 651, 690, 836, 833, 690, 801, 651, 651, +++ /* 240 */ 636, 856, 801, 651, 700, 698, 700, 698, 690, 709, +++ /* 250 */ 690, 690, 856, 767, 766, 765, 856, 709, 715, 701, +++ /* 260 */ 713, 711, 720, 856, 651, 651, 636, 651, 651, 639, +++ /* 270 */ 572, 572, 572, 651, 572, 624, 624, 777, 776, 775, +++ /* 280 */ 768, 604, 856, 856, 856, 856, 856, 816, 856, 856, +++ /* 290 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 300 */ 856, 856, 856, 856, 856, 856, 716, 737, 856, 856, +++ /* 310 */ 856, 856, 856, 856, 808, 856, 856, 856, 856, 856, +++ /* 320 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 330 */ 856, 856, 856, 832, 831, 856, 856, 856, 856, 856, +++ /* 340 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 350 */ 856, 712, 856, 856, 856, 856, 856, 856, 856, 856, +++ /* 360 */ 856, 856, 666, 856, 739, 856, 702, 856, 856, 856, +++ /* 370 */ 738, 743, 856, 856, 856, 856, 856, 565, 569, 567, +++ /* 380 */ 855, 853, 851, 850, 815, 821, 818, 820, 819, 817, +++ /* 390 */ 814, 813, 812, 811, 810, 807, 725, 722, 719, 849, +++ /* 400 */ 806, 662, 660, 843, 841, 732, 840, 838, 823, 728, +++ /* 410 */ 727, 654, 799, 798, 580, 827, 826, 825, 734, 733, +++ /* 420 */ 830, 829, 835, 834, 824, 579, 585, 643, 642, 650, +++ /* 430 */ 648, 647, 646, 645, 644, 641, 587, 598, 599, 597, +++ /* 440 */ 596, 615, 612, 614, 611, 613, 610, 609, 608, 607, +++ /* 450 */ 606, 635, 623, 622, 802, 629, 628, 633, 632, 631, +++ /* 460 */ 630, 627, 626, 625, 620, 746, 745, 735, 778, 672, +++ /* 470 */ 671, 678, 677, 676, 687, 804, 805, 803, 699, 686, +++ /* 480 */ 680, 679, 590, 589, 696, 695, 694, 693, 692, 684, +++ /* 490 */ 674, 704, 786, 783, 784, 772, 785, 691, 795, 794, +++ /* 500 */ 781, 848, 847, 846, 845, 787, 782, 669, 668, 667, +++ /* 510 */ 771, 773, 770, 769, 762, 761, 744, 742, 741, 740, +++ /* 520 */ 736, 710, 588, 703, 718, 717, 602, 601, 600, 670, +++ /* 530 */ 665, 664, 619, 707, 706, 618, 638, 637, 634, 617, +++ /* 540 */ 616, 605, 603, 584, 582, 578, 577, 576, 575, 593, +++ /* 550 */ 592, 591, 574, 659, 658, 657, 656, 655, 652, 571, +++ /* 560 */ 568, 566, 564, +++}; +++ +++/* The next table maps tokens into fallback tokens. If a construct +++** like the following: +++** +++** %fallback ID X Y Z. +++** +++** appears in the grammar, then ID becomes a fallback token for X, Y, +++** and Z. Whenever one of the tokens X, Y, or Z is input to the parser +++** but it does not parse, the type of the token is changed to ID and +++** the parse is retried before an error is thrown. +++*/ +++#ifdef YYFALLBACK +++static const YYCODETYPE yyFallback[] = { +++ 0, /* $ => nothing */ +++ 0, /* END_OF_FILE => nothing */ +++ 0, /* ILLEGAL => nothing */ +++ 0, /* SPACE => nothing */ +++ 0, /* UNCLOSED_STRING => nothing */ +++ 0, /* COMMENT => nothing */ +++ 0, /* FUNCTION => nothing */ +++ 0, /* COLUMN => nothing */ +++ 0, /* AGG_FUNCTION => nothing */ +++ 0, /* SEMI => nothing */ +++ 23, /* EXPLAIN => ID */ +++ 23, /* BEGIN => ID */ +++ 0, /* TRANSACTION => nothing */ +++ 0, /* COMMIT => nothing */ +++ 23, /* END => ID */ +++ 0, /* ROLLBACK => nothing */ +++ 0, /* CREATE => nothing */ +++ 0, /* TABLE => nothing */ +++ 23, /* TEMP => ID */ +++ 0, /* LP => nothing */ +++ 0, /* RP => nothing */ +++ 0, /* AS => nothing */ +++ 0, /* COMMA => nothing */ +++ 0, /* ID => nothing */ +++ 23, /* ABORT => ID */ +++ 23, /* AFTER => ID */ +++ 23, /* ASC => ID */ +++ 23, /* ATTACH => ID */ +++ 23, /* BEFORE => ID */ +++ 23, /* CASCADE => ID */ +++ 23, /* CLUSTER => ID */ +++ 23, /* CONFLICT => ID */ +++ 23, /* COPY => ID */ +++ 23, /* DATABASE => ID */ +++ 23, /* DEFERRED => ID */ +++ 23, /* DELIMITERS => ID */ +++ 23, /* DESC => ID */ +++ 23, /* DETACH => ID */ +++ 23, /* EACH => ID */ +++ 23, /* FAIL => ID */ +++ 23, /* FOR => ID */ +++ 23, /* GLOB => ID */ +++ 23, /* IGNORE => ID */ +++ 23, /* IMMEDIATE => ID */ +++ 23, /* INITIALLY => ID */ +++ 23, /* INSTEAD => ID */ +++ 23, /* LIKE => ID */ +++ 23, /* MATCH => ID */ +++ 23, /* KEY => ID */ +++ 23, /* OF => ID */ +++ 23, /* OFFSET => ID */ +++ 23, /* PRAGMA => ID */ +++ 23, /* RAISE => ID */ +++ 23, /* REPLACE => ID */ +++ 23, /* RESTRICT => ID */ +++ 23, /* ROW => ID */ +++ 23, /* STATEMENT => ID */ +++ 23, /* TRIGGER => ID */ +++ 23, /* VACUUM => ID */ +++ 23, /* VIEW => ID */ +++}; +++#endif /* YYFALLBACK */ +++ +++/* The following structure represents a single element of the +++** parser's stack. Information stored includes: +++** +++** + The state number for the parser at this level of the stack. +++** +++** + The value of the token stored at this level of the stack. +++** (In other words, the "major" token.) +++** +++** + The semantic value stored at this level of the stack. This is +++** the information used by the action routines in the grammar. +++** It is sometimes called the "minor" token. +++*/ +++struct yyStackEntry { +++ YYACTIONTYPE stateno; /* The state-number */ +++ YYCODETYPE major; /* The major token value. This is the code +++ ** number for the token at this stack level */ +++ YYMINORTYPE minor; /* The user-supplied minor token value. This +++ ** is the value of the token */ +++}; +++typedef struct yyStackEntry yyStackEntry; +++ +++/* The state of the parser is completely contained in an instance of +++** the following structure */ +++struct yyParser { +++ int yyidx; /* Index of top element in stack */ +++#ifdef YYTRACKMAXSTACKDEPTH +++ int yyidxMax; /* Maximum value of yyidx */ +++#endif +++ int yyerrcnt; /* Shifts left before out of the error */ +++ sqliteParserARG_SDECL /* A place to hold %extra_argument */ +++#if YYSTACKDEPTH<=0 +++ int yystksz; /* Current side of the stack */ +++ yyStackEntry *yystack; /* The parser's stack */ +++#else +++ yyStackEntry yystack[YYSTACKDEPTH]; /* The parser's stack */ +++#endif +++}; +++typedef struct yyParser yyParser; +++ +++#ifndef NDEBUG +++#include +++static FILE *yyTraceFILE = 0; +++static char *yyTracePrompt = 0; +++#endif /* NDEBUG */ +++ +++#ifndef NDEBUG +++/* +++** Turn parser tracing on by giving a stream to which to write the trace +++** and a prompt to preface each trace message. Tracing is turned off +++** by making either argument NULL +++** +++** Inputs: +++**
    +++**
  • A FILE* to which trace output should be written. +++** If NULL, then tracing is turned off. +++**
  • A prefix string written at the beginning of every +++** line of trace output. If NULL, then tracing is +++** turned off. +++**
+++** +++** Outputs: +++** None. +++*/ +++void sqliteParserTrace(FILE *TraceFILE, char *zTracePrompt){ +++ yyTraceFILE = TraceFILE; +++ yyTracePrompt = zTracePrompt; +++ if( yyTraceFILE==0 ) yyTracePrompt = 0; +++ else if( yyTracePrompt==0 ) yyTraceFILE = 0; +++} +++#endif /* NDEBUG */ +++ +++#ifndef NDEBUG +++/* For tracing shifts, the names of all terminals and nonterminals +++** are required. The following table supplies these names */ +++static const char *const yyTokenName[] = { +++ "$", "END_OF_FILE", "ILLEGAL", "SPACE", +++ "UNCLOSED_STRING", "COMMENT", "FUNCTION", "COLUMN", +++ "AGG_FUNCTION", "SEMI", "EXPLAIN", "BEGIN", +++ "TRANSACTION", "COMMIT", "END", "ROLLBACK", +++ "CREATE", "TABLE", "TEMP", "LP", +++ "RP", "AS", "COMMA", "ID", +++ "ABORT", "AFTER", "ASC", "ATTACH", +++ "BEFORE", "CASCADE", "CLUSTER", "CONFLICT", +++ "COPY", "DATABASE", "DEFERRED", "DELIMITERS", +++ "DESC", "DETACH", "EACH", "FAIL", +++ "FOR", "GLOB", "IGNORE", "IMMEDIATE", +++ "INITIALLY", "INSTEAD", "LIKE", "MATCH", +++ "KEY", "OF", "OFFSET", "PRAGMA", +++ "RAISE", "REPLACE", "RESTRICT", "ROW", +++ "STATEMENT", "TRIGGER", "VACUUM", "VIEW", +++ "OR", "AND", "NOT", "EQ", +++ "NE", "ISNULL", "NOTNULL", "IS", +++ "BETWEEN", "IN", "GT", "GE", +++ "LT", "LE", "BITAND", "BITOR", +++ "LSHIFT", "RSHIFT", "PLUS", "MINUS", +++ "STAR", "SLASH", "REM", "CONCAT", +++ "UMINUS", "UPLUS", "BITNOT", "STRING", +++ "JOIN_KW", "INTEGER", "CONSTRAINT", "DEFAULT", +++ "FLOAT", "NULL", "PRIMARY", "UNIQUE", +++ "CHECK", "REFERENCES", "COLLATE", "ON", +++ "DELETE", "UPDATE", "INSERT", "SET", +++ "DEFERRABLE", "FOREIGN", "DROP", "UNION", +++ "ALL", "INTERSECT", "EXCEPT", "SELECT", +++ "DISTINCT", "DOT", "FROM", "JOIN", +++ "USING", "ORDER", "BY", "GROUP", +++ "HAVING", "LIMIT", "WHERE", "INTO", +++ "VALUES", "VARIABLE", "CASE", "WHEN", +++ "THEN", "ELSE", "INDEX", "error", +++ "input", "cmdlist", "ecmd", "explain", +++ "cmdx", "cmd", "trans_opt", "onconf", +++ "nm", "create_table", "create_table_args", "temp", +++ "columnlist", "conslist_opt", "select", "column", +++ "columnid", "type", "carglist", "id", +++ "ids", "typename", "signed", "carg", +++ "ccons", "sortorder", "expr", "idxlist_opt", +++ "refargs", "defer_subclause", "refarg", "refact", +++ "init_deferred_pred_opt", "conslist", "tcons", "idxlist", +++ "defer_subclause_opt", "orconf", "resolvetype", "oneselect", +++ "multiselect_op", "distinct", "selcollist", "from", +++ "where_opt", "groupby_opt", "having_opt", "orderby_opt", +++ "limit_opt", "sclp", "as", "seltablist", +++ "stl_prefix", "joinop", "dbnm", "on_opt", +++ "using_opt", "seltablist_paren", "joinop2", "sortlist", +++ "sortitem", "collate", "exprlist", "setlist", +++ "insert_cmd", "inscollist_opt", "itemlist", "inscollist", +++ "likeop", "case_operand", "case_exprlist", "case_else", +++ "expritem", "uniqueflag", "idxitem", "plus_num", +++ "minus_num", "plus_opt", "number", "trigger_decl", +++ "trigger_cmd_list", "trigger_time", "trigger_event", "foreach_clause", +++ "when_clause", "trigger_cmd", "database_kw_opt", "key_opt", +++}; +++#endif /* NDEBUG */ +++ +++#ifndef NDEBUG +++/* For tracing reduce actions, the names of all rules are required. +++*/ +++static const char *const yyRuleName[] = { +++ /* 0 */ "input ::= cmdlist", +++ /* 1 */ "cmdlist ::= cmdlist ecmd", +++ /* 2 */ "cmdlist ::= ecmd", +++ /* 3 */ "ecmd ::= explain cmdx SEMI", +++ /* 4 */ "ecmd ::= SEMI", +++ /* 5 */ "cmdx ::= cmd", +++ /* 6 */ "explain ::= EXPLAIN", +++ /* 7 */ "explain ::=", +++ /* 8 */ "cmd ::= BEGIN trans_opt onconf", +++ /* 9 */ "trans_opt ::=", +++ /* 10 */ "trans_opt ::= TRANSACTION", +++ /* 11 */ "trans_opt ::= TRANSACTION nm", +++ /* 12 */ "cmd ::= COMMIT trans_opt", +++ /* 13 */ "cmd ::= END trans_opt", +++ /* 14 */ "cmd ::= ROLLBACK trans_opt", +++ /* 15 */ "cmd ::= create_table create_table_args", +++ /* 16 */ "create_table ::= CREATE temp TABLE nm", +++ /* 17 */ "temp ::= TEMP", +++ /* 18 */ "temp ::=", +++ /* 19 */ "create_table_args ::= LP columnlist conslist_opt RP", +++ /* 20 */ "create_table_args ::= AS select", +++ /* 21 */ "columnlist ::= columnlist COMMA column", +++ /* 22 */ "columnlist ::= column", +++ /* 23 */ "column ::= columnid type carglist", +++ /* 24 */ "columnid ::= nm", +++ /* 25 */ "id ::= ID", +++ /* 26 */ "ids ::= ID", +++ /* 27 */ "ids ::= STRING", +++ /* 28 */ "nm ::= ID", +++ /* 29 */ "nm ::= STRING", +++ /* 30 */ "nm ::= JOIN_KW", +++ /* 31 */ "type ::=", +++ /* 32 */ "type ::= typename", +++ /* 33 */ "type ::= typename LP signed RP", +++ /* 34 */ "type ::= typename LP signed COMMA signed RP", +++ /* 35 */ "typename ::= ids", +++ /* 36 */ "typename ::= typename ids", +++ /* 37 */ "signed ::= INTEGER", +++ /* 38 */ "signed ::= PLUS INTEGER", +++ /* 39 */ "signed ::= MINUS INTEGER", +++ /* 40 */ "carglist ::= carglist carg", +++ /* 41 */ "carglist ::=", +++ /* 42 */ "carg ::= CONSTRAINT nm ccons", +++ /* 43 */ "carg ::= ccons", +++ /* 44 */ "carg ::= DEFAULT STRING", +++ /* 45 */ "carg ::= DEFAULT ID", +++ /* 46 */ "carg ::= DEFAULT INTEGER", +++ /* 47 */ "carg ::= DEFAULT PLUS INTEGER", +++ /* 48 */ "carg ::= DEFAULT MINUS INTEGER", +++ /* 49 */ "carg ::= DEFAULT FLOAT", +++ /* 50 */ "carg ::= DEFAULT PLUS FLOAT", +++ /* 51 */ "carg ::= DEFAULT MINUS FLOAT", +++ /* 52 */ "carg ::= DEFAULT NULL", +++ /* 53 */ "ccons ::= NULL onconf", +++ /* 54 */ "ccons ::= NOT NULL onconf", +++ /* 55 */ "ccons ::= PRIMARY KEY sortorder onconf", +++ /* 56 */ "ccons ::= UNIQUE onconf", +++ /* 57 */ "ccons ::= CHECK LP expr RP onconf", +++ /* 58 */ "ccons ::= REFERENCES nm idxlist_opt refargs", +++ /* 59 */ "ccons ::= defer_subclause", +++ /* 60 */ "ccons ::= COLLATE id", +++ /* 61 */ "refargs ::=", +++ /* 62 */ "refargs ::= refargs refarg", +++ /* 63 */ "refarg ::= MATCH nm", +++ /* 64 */ "refarg ::= ON DELETE refact", +++ /* 65 */ "refarg ::= ON UPDATE refact", +++ /* 66 */ "refarg ::= ON INSERT refact", +++ /* 67 */ "refact ::= SET NULL", +++ /* 68 */ "refact ::= SET DEFAULT", +++ /* 69 */ "refact ::= CASCADE", +++ /* 70 */ "refact ::= RESTRICT", +++ /* 71 */ "defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt", +++ /* 72 */ "defer_subclause ::= DEFERRABLE init_deferred_pred_opt", +++ /* 73 */ "init_deferred_pred_opt ::=", +++ /* 74 */ "init_deferred_pred_opt ::= INITIALLY DEFERRED", +++ /* 75 */ "init_deferred_pred_opt ::= INITIALLY IMMEDIATE", +++ /* 76 */ "conslist_opt ::=", +++ /* 77 */ "conslist_opt ::= COMMA conslist", +++ /* 78 */ "conslist ::= conslist COMMA tcons", +++ /* 79 */ "conslist ::= conslist tcons", +++ /* 80 */ "conslist ::= tcons", +++ /* 81 */ "tcons ::= CONSTRAINT nm", +++ /* 82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf", +++ /* 83 */ "tcons ::= UNIQUE LP idxlist RP onconf", +++ /* 84 */ "tcons ::= CHECK expr onconf", +++ /* 85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", +++ /* 86 */ "defer_subclause_opt ::=", +++ /* 87 */ "defer_subclause_opt ::= defer_subclause", +++ /* 88 */ "onconf ::=", +++ /* 89 */ "onconf ::= ON CONFLICT resolvetype", +++ /* 90 */ "orconf ::=", +++ /* 91 */ "orconf ::= OR resolvetype", +++ /* 92 */ "resolvetype ::= ROLLBACK", +++ /* 93 */ "resolvetype ::= ABORT", +++ /* 94 */ "resolvetype ::= FAIL", +++ /* 95 */ "resolvetype ::= IGNORE", +++ /* 96 */ "resolvetype ::= REPLACE", +++ /* 97 */ "cmd ::= DROP TABLE nm", +++ /* 98 */ "cmd ::= CREATE temp VIEW nm AS select", +++ /* 99 */ "cmd ::= DROP VIEW nm", +++ /* 100 */ "cmd ::= select", +++ /* 101 */ "select ::= oneselect", +++ /* 102 */ "select ::= select multiselect_op oneselect", +++ /* 103 */ "multiselect_op ::= UNION", +++ /* 104 */ "multiselect_op ::= UNION ALL", +++ /* 105 */ "multiselect_op ::= INTERSECT", +++ /* 106 */ "multiselect_op ::= EXCEPT", +++ /* 107 */ "oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt", +++ /* 108 */ "distinct ::= DISTINCT", +++ /* 109 */ "distinct ::= ALL", +++ /* 110 */ "distinct ::=", +++ /* 111 */ "sclp ::= selcollist COMMA", +++ /* 112 */ "sclp ::=", +++ /* 113 */ "selcollist ::= sclp expr as", +++ /* 114 */ "selcollist ::= sclp STAR", +++ /* 115 */ "selcollist ::= sclp nm DOT STAR", +++ /* 116 */ "as ::= AS nm", +++ /* 117 */ "as ::= ids", +++ /* 118 */ "as ::=", +++ /* 119 */ "from ::=", +++ /* 120 */ "from ::= FROM seltablist", +++ /* 121 */ "stl_prefix ::= seltablist joinop", +++ /* 122 */ "stl_prefix ::=", +++ /* 123 */ "seltablist ::= stl_prefix nm dbnm as on_opt using_opt", +++ /* 124 */ "seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt", +++ /* 125 */ "seltablist_paren ::= select", +++ /* 126 */ "seltablist_paren ::= seltablist", +++ /* 127 */ "dbnm ::=", +++ /* 128 */ "dbnm ::= DOT nm", +++ /* 129 */ "joinop ::= COMMA", +++ /* 130 */ "joinop ::= JOIN", +++ /* 131 */ "joinop ::= JOIN_KW JOIN", +++ /* 132 */ "joinop ::= JOIN_KW nm JOIN", +++ /* 133 */ "joinop ::= JOIN_KW nm nm JOIN", +++ /* 134 */ "on_opt ::= ON expr", +++ /* 135 */ "on_opt ::=", +++ /* 136 */ "using_opt ::= USING LP idxlist RP", +++ /* 137 */ "using_opt ::=", +++ /* 138 */ "orderby_opt ::=", +++ /* 139 */ "orderby_opt ::= ORDER BY sortlist", +++ /* 140 */ "sortlist ::= sortlist COMMA sortitem collate sortorder", +++ /* 141 */ "sortlist ::= sortitem collate sortorder", +++ /* 142 */ "sortitem ::= expr", +++ /* 143 */ "sortorder ::= ASC", +++ /* 144 */ "sortorder ::= DESC", +++ /* 145 */ "sortorder ::=", +++ /* 146 */ "collate ::=", +++ /* 147 */ "collate ::= COLLATE id", +++ /* 148 */ "groupby_opt ::=", +++ /* 149 */ "groupby_opt ::= GROUP BY exprlist", +++ /* 150 */ "having_opt ::=", +++ /* 151 */ "having_opt ::= HAVING expr", +++ /* 152 */ "limit_opt ::=", +++ /* 153 */ "limit_opt ::= LIMIT signed", +++ /* 154 */ "limit_opt ::= LIMIT signed OFFSET signed", +++ /* 155 */ "limit_opt ::= LIMIT signed COMMA signed", +++ /* 156 */ "cmd ::= DELETE FROM nm dbnm where_opt", +++ /* 157 */ "where_opt ::=", +++ /* 158 */ "where_opt ::= WHERE expr", +++ /* 159 */ "cmd ::= UPDATE orconf nm dbnm SET setlist where_opt", +++ /* 160 */ "setlist ::= setlist COMMA nm EQ expr", +++ /* 161 */ "setlist ::= nm EQ expr", +++ /* 162 */ "cmd ::= insert_cmd INTO nm dbnm inscollist_opt VALUES LP itemlist RP", +++ /* 163 */ "cmd ::= insert_cmd INTO nm dbnm inscollist_opt select", +++ /* 164 */ "insert_cmd ::= INSERT orconf", +++ /* 165 */ "insert_cmd ::= REPLACE", +++ /* 166 */ "itemlist ::= itemlist COMMA expr", +++ /* 167 */ "itemlist ::= expr", +++ /* 168 */ "inscollist_opt ::=", +++ /* 169 */ "inscollist_opt ::= LP inscollist RP", +++ /* 170 */ "inscollist ::= inscollist COMMA nm", +++ /* 171 */ "inscollist ::= nm", +++ /* 172 */ "expr ::= LP expr RP", +++ /* 173 */ "expr ::= NULL", +++ /* 174 */ "expr ::= ID", +++ /* 175 */ "expr ::= JOIN_KW", +++ /* 176 */ "expr ::= nm DOT nm", +++ /* 177 */ "expr ::= nm DOT nm DOT nm", +++ /* 178 */ "expr ::= INTEGER", +++ /* 179 */ "expr ::= FLOAT", +++ /* 180 */ "expr ::= STRING", +++ /* 181 */ "expr ::= VARIABLE", +++ /* 182 */ "expr ::= ID LP exprlist RP", +++ /* 183 */ "expr ::= ID LP STAR RP", +++ /* 184 */ "expr ::= expr AND expr", +++ /* 185 */ "expr ::= expr OR expr", +++ /* 186 */ "expr ::= expr LT expr", +++ /* 187 */ "expr ::= expr GT expr", +++ /* 188 */ "expr ::= expr LE expr", +++ /* 189 */ "expr ::= expr GE expr", +++ /* 190 */ "expr ::= expr NE expr", +++ /* 191 */ "expr ::= expr EQ expr", +++ /* 192 */ "expr ::= expr BITAND expr", +++ /* 193 */ "expr ::= expr BITOR expr", +++ /* 194 */ "expr ::= expr LSHIFT expr", +++ /* 195 */ "expr ::= expr RSHIFT expr", +++ /* 196 */ "expr ::= expr likeop expr", +++ /* 197 */ "expr ::= expr NOT likeop expr", +++ /* 198 */ "likeop ::= LIKE", +++ /* 199 */ "likeop ::= GLOB", +++ /* 200 */ "expr ::= expr PLUS expr", +++ /* 201 */ "expr ::= expr MINUS expr", +++ /* 202 */ "expr ::= expr STAR expr", +++ /* 203 */ "expr ::= expr SLASH expr", +++ /* 204 */ "expr ::= expr REM expr", +++ /* 205 */ "expr ::= expr CONCAT expr", +++ /* 206 */ "expr ::= expr ISNULL", +++ /* 207 */ "expr ::= expr IS NULL", +++ /* 208 */ "expr ::= expr NOTNULL", +++ /* 209 */ "expr ::= expr NOT NULL", +++ /* 210 */ "expr ::= expr IS NOT NULL", +++ /* 211 */ "expr ::= NOT expr", +++ /* 212 */ "expr ::= BITNOT expr", +++ /* 213 */ "expr ::= MINUS expr", +++ /* 214 */ "expr ::= PLUS expr", +++ /* 215 */ "expr ::= LP select RP", +++ /* 216 */ "expr ::= expr BETWEEN expr AND expr", +++ /* 217 */ "expr ::= expr NOT BETWEEN expr AND expr", +++ /* 218 */ "expr ::= expr IN LP exprlist RP", +++ /* 219 */ "expr ::= expr IN LP select RP", +++ /* 220 */ "expr ::= expr NOT IN LP exprlist RP", +++ /* 221 */ "expr ::= expr NOT IN LP select RP", +++ /* 222 */ "expr ::= expr IN nm dbnm", +++ /* 223 */ "expr ::= expr NOT IN nm dbnm", +++ /* 224 */ "expr ::= CASE case_operand case_exprlist case_else END", +++ /* 225 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr", +++ /* 226 */ "case_exprlist ::= WHEN expr THEN expr", +++ /* 227 */ "case_else ::= ELSE expr", +++ /* 228 */ "case_else ::=", +++ /* 229 */ "case_operand ::= expr", +++ /* 230 */ "case_operand ::=", +++ /* 231 */ "exprlist ::= exprlist COMMA expritem", +++ /* 232 */ "exprlist ::= expritem", +++ /* 233 */ "expritem ::= expr", +++ /* 234 */ "expritem ::=", +++ /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf", +++ /* 236 */ "uniqueflag ::= UNIQUE", +++ /* 237 */ "uniqueflag ::=", +++ /* 238 */ "idxlist_opt ::=", +++ /* 239 */ "idxlist_opt ::= LP idxlist RP", +++ /* 240 */ "idxlist ::= idxlist COMMA idxitem", +++ /* 241 */ "idxlist ::= idxitem", +++ /* 242 */ "idxitem ::= nm sortorder", +++ /* 243 */ "cmd ::= DROP INDEX nm dbnm", +++ /* 244 */ "cmd ::= COPY orconf nm dbnm FROM nm USING DELIMITERS STRING", +++ /* 245 */ "cmd ::= COPY orconf nm dbnm FROM nm", +++ /* 246 */ "cmd ::= VACUUM", +++ /* 247 */ "cmd ::= VACUUM nm", +++ /* 248 */ "cmd ::= PRAGMA ids EQ nm", +++ /* 249 */ "cmd ::= PRAGMA ids EQ ON", +++ /* 250 */ "cmd ::= PRAGMA ids EQ plus_num", +++ /* 251 */ "cmd ::= PRAGMA ids EQ minus_num", +++ /* 252 */ "cmd ::= PRAGMA ids LP nm RP", +++ /* 253 */ "cmd ::= PRAGMA ids", +++ /* 254 */ "plus_num ::= plus_opt number", +++ /* 255 */ "minus_num ::= MINUS number", +++ /* 256 */ "number ::= INTEGER", +++ /* 257 */ "number ::= FLOAT", +++ /* 258 */ "plus_opt ::= PLUS", +++ /* 259 */ "plus_opt ::=", +++ /* 260 */ "cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END", +++ /* 261 */ "trigger_decl ::= temp TRIGGER nm trigger_time trigger_event ON nm dbnm foreach_clause when_clause", +++ /* 262 */ "trigger_time ::= BEFORE", +++ /* 263 */ "trigger_time ::= AFTER", +++ /* 264 */ "trigger_time ::= INSTEAD OF", +++ /* 265 */ "trigger_time ::=", +++ /* 266 */ "trigger_event ::= DELETE", +++ /* 267 */ "trigger_event ::= INSERT", +++ /* 268 */ "trigger_event ::= UPDATE", +++ /* 269 */ "trigger_event ::= UPDATE OF inscollist", +++ /* 270 */ "foreach_clause ::=", +++ /* 271 */ "foreach_clause ::= FOR EACH ROW", +++ /* 272 */ "foreach_clause ::= FOR EACH STATEMENT", +++ /* 273 */ "when_clause ::=", +++ /* 274 */ "when_clause ::= WHEN expr", +++ /* 275 */ "trigger_cmd_list ::= trigger_cmd SEMI trigger_cmd_list", +++ /* 276 */ "trigger_cmd_list ::=", +++ /* 277 */ "trigger_cmd ::= UPDATE orconf nm SET setlist where_opt", +++ /* 278 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP", +++ /* 279 */ "trigger_cmd ::= insert_cmd INTO nm inscollist_opt select", +++ /* 280 */ "trigger_cmd ::= DELETE FROM nm where_opt", +++ /* 281 */ "trigger_cmd ::= select", +++ /* 282 */ "expr ::= RAISE LP IGNORE RP", +++ /* 283 */ "expr ::= RAISE LP ROLLBACK COMMA nm RP", +++ /* 284 */ "expr ::= RAISE LP ABORT COMMA nm RP", +++ /* 285 */ "expr ::= RAISE LP FAIL COMMA nm RP", +++ /* 286 */ "cmd ::= DROP TRIGGER nm dbnm", +++ /* 287 */ "cmd ::= ATTACH database_kw_opt ids AS nm key_opt", +++ /* 288 */ "key_opt ::= USING ids", +++ /* 289 */ "key_opt ::=", +++ /* 290 */ "database_kw_opt ::= DATABASE", +++ /* 291 */ "database_kw_opt ::=", +++ /* 292 */ "cmd ::= DETACH database_kw_opt nm", +++}; +++#endif /* NDEBUG */ +++ +++ +++#if YYSTACKDEPTH<=0 +++/* +++** Try to increase the size of the parser stack. +++*/ +++static void yyGrowStack(yyParser *p){ +++ int newSize; +++ yyStackEntry *pNew; +++ +++ newSize = p->yystksz*2 + 100; +++ pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); +++ if( pNew ){ +++ p->yystack = pNew; +++ p->yystksz = newSize; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sStack grows to %d entries!\n", +++ yyTracePrompt, p->yystksz); +++ } +++#endif +++ } +++} +++#endif +++ +++/* +++** This function allocates a new parser. +++** The only argument is a pointer to a function which works like +++** malloc. +++** +++** Inputs: +++** A pointer to the function used to allocate memory. +++** +++** Outputs: +++** A pointer to a parser. This pointer is used in subsequent calls +++** to sqliteParser and sqliteParserFree. +++*/ +++void *sqliteParserAlloc(void *(*mallocProc)(size_t)){ +++ yyParser *pParser; +++ pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); +++ if( pParser ){ +++ pParser->yyidx = -1; +++#ifdef YYTRACKMAXSTACKDEPTH +++ pParser->yyidxMax = 0; +++#endif +++#if YYSTACKDEPTH<=0 +++ pParser->yystack = NULL; +++ pParser->yystksz = 0; +++ yyGrowStack(pParser); +++#endif +++ } +++ return pParser; +++} +++ +++/* The following function deletes the value associated with a +++** symbol. The symbol can be either a terminal or nonterminal. +++** "yymajor" is the symbol code, and "yypminor" is a pointer to +++** the value. +++*/ +++static void yy_destructor( +++ yyParser *yypParser, /* The parser */ +++ YYCODETYPE yymajor, /* Type code for object to destroy */ +++ YYMINORTYPE *yypminor /* The object to be destroyed */ +++){ +++ sqliteParserARG_FETCH; +++ switch( yymajor ){ +++ /* Here is inserted the actions which take place when a +++ ** terminal or non-terminal is destroyed. This can happen +++ ** when the symbol is popped from the stack during a +++ ** reduce or during error processing or when a parser is +++ ** being destroyed before it is finished parsing. +++ ** +++ ** Note: during a reduce, the only symbols destroyed are those +++ ** which appear on the RHS of the rule, but which are not used +++ ** inside the C code. +++ */ +++ case 146: /* select */ +++ case 171: /* oneselect */ +++ case 189: /* seltablist_paren */ +++{ +++#line 286 "ext/sqlite/libsqlite/src/parse.y" +++sqliteSelectDelete((yypminor->yy179)); +++#line 1131 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 158: /* expr */ +++ case 176: /* where_opt */ +++ case 178: /* having_opt */ +++ case 187: /* on_opt */ +++ case 192: /* sortitem */ +++ case 204: /* expritem */ +++{ +++#line 533 "ext/sqlite/libsqlite/src/parse.y" +++sqliteExprDelete((yypminor->yy242)); +++#line 1143 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 159: /* idxlist_opt */ +++ case 167: /* idxlist */ +++ case 188: /* using_opt */ +++ case 197: /* inscollist_opt */ +++ case 199: /* inscollist */ +++{ +++#line 746 "ext/sqlite/libsqlite/src/parse.y" +++sqliteIdListDelete((yypminor->yy320)); +++#line 1154 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 174: /* selcollist */ +++ case 177: /* groupby_opt */ +++ case 179: /* orderby_opt */ +++ case 181: /* sclp */ +++ case 191: /* sortlist */ +++ case 194: /* exprlist */ +++ case 195: /* setlist */ +++ case 198: /* itemlist */ +++ case 202: /* case_exprlist */ +++{ +++#line 322 "ext/sqlite/libsqlite/src/parse.y" +++sqliteExprListDelete((yypminor->yy322)); +++#line 1169 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 175: /* from */ +++ case 183: /* seltablist */ +++ case 184: /* stl_prefix */ +++{ +++#line 353 "ext/sqlite/libsqlite/src/parse.y" +++sqliteSrcListDelete((yypminor->yy307)); +++#line 1178 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 212: /* trigger_cmd_list */ +++ case 217: /* trigger_cmd */ +++{ +++#line 828 "ext/sqlite/libsqlite/src/parse.y" +++sqliteDeleteTriggerStep((yypminor->yy19)); +++#line 1186 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ case 214: /* trigger_event */ +++{ +++#line 812 "ext/sqlite/libsqlite/src/parse.y" +++sqliteIdListDelete((yypminor->yy290).b); +++#line 1193 "ext/sqlite/libsqlite/src/parse.c" +++} +++ break; +++ default: break; /* If no destructor action specified: do nothing */ +++ } +++} +++ +++/* +++** Pop the parser's stack once. +++** +++** If there is a destructor routine associated with the token which +++** is popped from the stack, then call it. +++** +++** Return the major token number for the symbol popped. +++*/ +++static int yy_pop_parser_stack(yyParser *pParser){ +++ YYCODETYPE yymajor; +++ yyStackEntry *yytos = &pParser->yystack[pParser->yyidx]; +++ +++ if( pParser->yyidx<0 ) return 0; +++#ifndef NDEBUG +++ if( yyTraceFILE && pParser->yyidx>=0 ){ +++ fprintf(yyTraceFILE,"%sPopping %s\n", +++ yyTracePrompt, +++ yyTokenName[yytos->major]); +++ } +++#endif +++ yymajor = yytos->major; +++ yy_destructor(pParser, yymajor, &yytos->minor); +++ pParser->yyidx--; +++ return yymajor; +++} +++ +++/* +++** Deallocate and destroy a parser. Destructors are all called for +++** all stack elements before shutting the parser down. +++** +++** Inputs: +++**
    +++**
  • A pointer to the parser. This should be a pointer +++** obtained from sqliteParserAlloc. +++**
  • A pointer to a function used to reclaim memory obtained +++** from malloc. +++**
+++*/ +++void sqliteParserFree( +++ void *p, /* The parser to be deleted */ +++ void (*freeProc)(void*) /* Function used to reclaim memory */ +++){ +++ yyParser *pParser = (yyParser*)p; +++ if( pParser==0 ) return; +++ while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser); +++#if YYSTACKDEPTH<=0 +++ free(pParser->yystack); +++#endif +++ (*freeProc)((void*)pParser); +++} +++ +++/* +++** Return the peak depth of the stack for a parser. +++*/ +++#ifdef YYTRACKMAXSTACKDEPTH +++int sqliteParserStackPeak(void *p){ +++ yyParser *pParser = (yyParser*)p; +++ return pParser->yyidxMax; +++} +++#endif +++ +++/* +++** Find the appropriate action for a parser given the terminal +++** look-ahead token iLookAhead. +++** +++** If the look-ahead token is YYNOCODE, then check to see if the action is +++** independent of the look-ahead. If it is, return the action, otherwise +++** return YY_NO_ACTION. +++*/ +++static int yy_find_shift_action( +++ yyParser *pParser, /* The parser */ +++ YYCODETYPE iLookAhead /* The look-ahead token */ +++){ +++ int i; +++ int stateno = pParser->yystack[pParser->yyidx].stateno; +++ +++ if( stateno>YY_SHIFT_COUNT +++ || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){ +++ return yy_default[stateno]; +++ } +++ assert( iLookAhead!=YYNOCODE ); +++ i += iLookAhead; +++ if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ +++ if( iLookAhead>0 ){ +++#ifdef YYFALLBACK +++ YYCODETYPE iFallback; /* Fallback token */ +++ if( iLookAhead %s\n", +++ yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]); +++ } +++#endif +++ return yy_find_shift_action(pParser, iFallback); +++ } +++#endif +++#ifdef YYWILDCARD +++ { +++ int j = i - iLookAhead + YYWILDCARD; +++ if( +++#if YY_SHIFT_MIN+YYWILDCARD<0 +++ j>=0 && +++#endif +++#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT +++ j %s\n", +++ yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]); +++ } +++#endif /* NDEBUG */ +++ return yy_action[j]; +++ } +++ } +++#endif /* YYWILDCARD */ +++ } +++ return yy_default[stateno]; +++ }else{ +++ return yy_action[i]; +++ } +++} +++ +++/* +++** Find the appropriate action for a parser given the non-terminal +++** look-ahead token iLookAhead. +++** +++** If the look-ahead token is YYNOCODE, then check to see if the action is +++** independent of the look-ahead. If it is, return the action, otherwise +++** return YY_NO_ACTION. +++*/ +++static int yy_find_reduce_action( +++ int stateno, /* Current state number */ +++ YYCODETYPE iLookAhead /* The look-ahead token */ +++){ +++ int i; +++#ifdef YYERRORSYMBOL +++ if( stateno>YY_REDUCE_COUNT ){ +++ return yy_default[stateno]; +++ } +++#else +++ assert( stateno<=YY_REDUCE_COUNT ); +++#endif +++ i = yy_reduce_ofst[stateno]; +++ assert( i!=YY_REDUCE_USE_DFLT ); +++ assert( iLookAhead!=YYNOCODE ); +++ i += iLookAhead; +++#ifdef YYERRORSYMBOL +++ if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ +++ return yy_default[stateno]; +++ } +++#else +++ assert( i>=0 && iyyidx--; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); +++ } +++#endif +++ while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +++ /* Here code is inserted which will execute if the parser +++ ** stack every overflows */ +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument var */ +++} +++ +++/* +++** Perform a shift action. +++*/ +++static void yy_shift( +++ yyParser *yypParser, /* The parser to be shifted */ +++ int yyNewState, /* The new state to shift in */ +++ int yyMajor, /* The major token to shift in */ +++ YYMINORTYPE *yypMinor /* Pointer to the minor token to shift in */ +++){ +++ yyStackEntry *yytos; +++ yypParser->yyidx++; +++#ifdef YYTRACKMAXSTACKDEPTH +++ if( yypParser->yyidx>yypParser->yyidxMax ){ +++ yypParser->yyidxMax = yypParser->yyidx; +++ } +++#endif +++#if YYSTACKDEPTH>0 +++ if( yypParser->yyidx>=YYSTACKDEPTH ){ +++ yyStackOverflow(yypParser, yypMinor); +++ return; +++ } +++#else +++ if( yypParser->yyidx>=yypParser->yystksz ){ +++ yyGrowStack(yypParser); +++ if( yypParser->yyidx>=yypParser->yystksz ){ +++ yyStackOverflow(yypParser, yypMinor); +++ return; +++ } +++ } +++#endif +++ yytos = &yypParser->yystack[yypParser->yyidx]; +++ yytos->stateno = (YYACTIONTYPE)yyNewState; +++ yytos->major = (YYCODETYPE)yyMajor; +++ yytos->minor = *yypMinor; +++#ifndef NDEBUG +++ if( yyTraceFILE && yypParser->yyidx>0 ){ +++ int i; +++ fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState); +++ fprintf(yyTraceFILE,"%sStack:",yyTracePrompt); +++ for(i=1; i<=yypParser->yyidx; i++) +++ fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]); +++ fprintf(yyTraceFILE,"\n"); +++ } +++#endif +++} +++ +++/* The following table contains information about every rule that +++** is used during the reduce. +++*/ +++static const struct { +++ YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ +++ unsigned char nrhs; /* Number of right-hand side symbols in the rule */ +++} yyRuleInfo[] = { +++ { 132, 1 }, +++ { 133, 2 }, +++ { 133, 1 }, +++ { 134, 3 }, +++ { 134, 1 }, +++ { 136, 1 }, +++ { 135, 1 }, +++ { 135, 0 }, +++ { 137, 3 }, +++ { 138, 0 }, +++ { 138, 1 }, +++ { 138, 2 }, +++ { 137, 2 }, +++ { 137, 2 }, +++ { 137, 2 }, +++ { 137, 2 }, +++ { 141, 4 }, +++ { 143, 1 }, +++ { 143, 0 }, +++ { 142, 4 }, +++ { 142, 2 }, +++ { 144, 3 }, +++ { 144, 1 }, +++ { 147, 3 }, +++ { 148, 1 }, +++ { 151, 1 }, +++ { 152, 1 }, +++ { 152, 1 }, +++ { 140, 1 }, +++ { 140, 1 }, +++ { 140, 1 }, +++ { 149, 0 }, +++ { 149, 1 }, +++ { 149, 4 }, +++ { 149, 6 }, +++ { 153, 1 }, +++ { 153, 2 }, +++ { 154, 1 }, +++ { 154, 2 }, +++ { 154, 2 }, +++ { 150, 2 }, +++ { 150, 0 }, +++ { 155, 3 }, +++ { 155, 1 }, +++ { 155, 2 }, +++ { 155, 2 }, +++ { 155, 2 }, +++ { 155, 3 }, +++ { 155, 3 }, +++ { 155, 2 }, +++ { 155, 3 }, +++ { 155, 3 }, +++ { 155, 2 }, +++ { 156, 2 }, +++ { 156, 3 }, +++ { 156, 4 }, +++ { 156, 2 }, +++ { 156, 5 }, +++ { 156, 4 }, +++ { 156, 1 }, +++ { 156, 2 }, +++ { 160, 0 }, +++ { 160, 2 }, +++ { 162, 2 }, +++ { 162, 3 }, +++ { 162, 3 }, +++ { 162, 3 }, +++ { 163, 2 }, +++ { 163, 2 }, +++ { 163, 1 }, +++ { 163, 1 }, +++ { 161, 3 }, +++ { 161, 2 }, +++ { 164, 0 }, +++ { 164, 2 }, +++ { 164, 2 }, +++ { 145, 0 }, +++ { 145, 2 }, +++ { 165, 3 }, +++ { 165, 2 }, +++ { 165, 1 }, +++ { 166, 2 }, +++ { 166, 6 }, +++ { 166, 5 }, +++ { 166, 3 }, +++ { 166, 10 }, +++ { 168, 0 }, +++ { 168, 1 }, +++ { 139, 0 }, +++ { 139, 3 }, +++ { 169, 0 }, +++ { 169, 2 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 170, 1 }, +++ { 137, 3 }, +++ { 137, 6 }, +++ { 137, 3 }, +++ { 137, 1 }, +++ { 146, 1 }, +++ { 146, 3 }, +++ { 172, 1 }, +++ { 172, 2 }, +++ { 172, 1 }, +++ { 172, 1 }, +++ { 171, 9 }, +++ { 173, 1 }, +++ { 173, 1 }, +++ { 173, 0 }, +++ { 181, 2 }, +++ { 181, 0 }, +++ { 174, 3 }, +++ { 174, 2 }, +++ { 174, 4 }, +++ { 182, 2 }, +++ { 182, 1 }, +++ { 182, 0 }, +++ { 175, 0 }, +++ { 175, 2 }, +++ { 184, 2 }, +++ { 184, 0 }, +++ { 183, 6 }, +++ { 183, 7 }, +++ { 189, 1 }, +++ { 189, 1 }, +++ { 186, 0 }, +++ { 186, 2 }, +++ { 185, 1 }, +++ { 185, 1 }, +++ { 185, 2 }, +++ { 185, 3 }, +++ { 185, 4 }, +++ { 187, 2 }, +++ { 187, 0 }, +++ { 188, 4 }, +++ { 188, 0 }, +++ { 179, 0 }, +++ { 179, 3 }, +++ { 191, 5 }, +++ { 191, 3 }, +++ { 192, 1 }, +++ { 157, 1 }, +++ { 157, 1 }, +++ { 157, 0 }, +++ { 193, 0 }, +++ { 193, 2 }, +++ { 177, 0 }, +++ { 177, 3 }, +++ { 178, 0 }, +++ { 178, 2 }, +++ { 180, 0 }, +++ { 180, 2 }, +++ { 180, 4 }, +++ { 180, 4 }, +++ { 137, 5 }, +++ { 176, 0 }, +++ { 176, 2 }, +++ { 137, 7 }, +++ { 195, 5 }, +++ { 195, 3 }, +++ { 137, 9 }, +++ { 137, 6 }, +++ { 196, 2 }, +++ { 196, 1 }, +++ { 198, 3 }, +++ { 198, 1 }, +++ { 197, 0 }, +++ { 197, 3 }, +++ { 199, 3 }, +++ { 199, 1 }, +++ { 158, 3 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 3 }, +++ { 158, 5 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 1 }, +++ { 158, 4 }, +++ { 158, 4 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 4 }, +++ { 200, 1 }, +++ { 200, 1 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 3 }, +++ { 158, 2 }, +++ { 158, 3 }, +++ { 158, 2 }, +++ { 158, 3 }, +++ { 158, 4 }, +++ { 158, 2 }, +++ { 158, 2 }, +++ { 158, 2 }, +++ { 158, 2 }, +++ { 158, 3 }, +++ { 158, 5 }, +++ { 158, 6 }, +++ { 158, 5 }, +++ { 158, 5 }, +++ { 158, 6 }, +++ { 158, 6 }, +++ { 158, 4 }, +++ { 158, 5 }, +++ { 158, 5 }, +++ { 202, 5 }, +++ { 202, 4 }, +++ { 203, 2 }, +++ { 203, 0 }, +++ { 201, 1 }, +++ { 201, 0 }, +++ { 194, 3 }, +++ { 194, 1 }, +++ { 204, 1 }, +++ { 204, 0 }, +++ { 137, 11 }, +++ { 205, 1 }, +++ { 205, 0 }, +++ { 159, 0 }, +++ { 159, 3 }, +++ { 167, 3 }, +++ { 167, 1 }, +++ { 206, 2 }, +++ { 137, 4 }, +++ { 137, 9 }, +++ { 137, 6 }, +++ { 137, 1 }, +++ { 137, 2 }, +++ { 137, 4 }, +++ { 137, 4 }, +++ { 137, 4 }, +++ { 137, 4 }, +++ { 137, 5 }, +++ { 137, 2 }, +++ { 207, 2 }, +++ { 208, 2 }, +++ { 210, 1 }, +++ { 210, 1 }, +++ { 209, 1 }, +++ { 209, 0 }, +++ { 137, 5 }, +++ { 211, 10 }, +++ { 213, 1 }, +++ { 213, 1 }, +++ { 213, 2 }, +++ { 213, 0 }, +++ { 214, 1 }, +++ { 214, 1 }, +++ { 214, 1 }, +++ { 214, 3 }, +++ { 215, 0 }, +++ { 215, 3 }, +++ { 215, 3 }, +++ { 216, 0 }, +++ { 216, 2 }, +++ { 212, 3 }, +++ { 212, 0 }, +++ { 217, 6 }, +++ { 217, 8 }, +++ { 217, 5 }, +++ { 217, 4 }, +++ { 217, 1 }, +++ { 158, 4 }, +++ { 158, 6 }, +++ { 158, 6 }, +++ { 158, 6 }, +++ { 137, 4 }, +++ { 137, 6 }, +++ { 219, 2 }, +++ { 219, 0 }, +++ { 218, 1 }, +++ { 218, 0 }, +++ { 137, 3 }, +++}; +++ +++static void yy_accept(yyParser*); /* Forward Declaration */ +++ +++/* +++** Perform a reduce action and the shift that must immediately +++** follow the reduce. +++*/ +++static void yy_reduce( +++ yyParser *yypParser, /* The parser */ +++ int yyruleno /* Number of the rule by which to reduce */ +++){ +++ int yygoto; /* The next state */ +++ int yyact; /* The next action */ +++ YYMINORTYPE yygotominor; /* The LHS of the rule reduced */ +++ yyStackEntry *yymsp; /* The top of the parser's stack */ +++ int yysize; /* Amount to pop the stack */ +++ sqliteParserARG_FETCH; +++ yymsp = &yypParser->yystack[yypParser->yyidx]; +++#ifndef NDEBUG +++ if( yyTraceFILE && yyruleno>=0 +++ && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ +++ fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, +++ yyRuleName[yyruleno]); +++ } +++#endif /* NDEBUG */ +++ +++ /* Silence complaints from purify about yygotominor being uninitialized +++ ** in some cases when it is copied into the stack after the following +++ ** switch. yygotominor is uninitialized when a rule reduces that does +++ ** not set the value of its left-hand side nonterminal. Leaving the +++ ** value of the nonterminal uninitialized is utterly harmless as long +++ ** as the value is never used. So really the only thing this code +++ ** accomplishes is to quieten purify. +++ ** +++ ** 2007-01-16: The wireshark project (www.wireshark.org) reports that +++ ** without this code, their parser segfaults. I'm not sure what there +++ ** parser is doing to make this happen. This is the second bug report +++ ** from wireshark this week. Clearly they are stressing Lemon in ways +++ ** that it has not been previously stressed... (SQLite ticket #2172) +++ */ +++ /*memset(&yygotominor, 0, sizeof(yygotominor));*/ +++ yygotominor = yyzerominor; +++ +++ +++ switch( yyruleno ){ +++ /* Beginning here are the reduction cases. A typical example +++ ** follows: +++ ** case 0: +++ ** #line +++ ** { ... } // User supplied code +++ ** #line +++ ** break; +++ */ +++ case 5: /* cmdx ::= cmd */ +++#line 72 "ext/sqlite/libsqlite/src/parse.y" +++{ sqliteExec(pParse); } +++#line 1781 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 6: /* explain ::= EXPLAIN */ +++#line 73 "ext/sqlite/libsqlite/src/parse.y" +++{ sqliteBeginParse(pParse, 1); } +++#line 1786 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 7: /* explain ::= */ +++#line 74 "ext/sqlite/libsqlite/src/parse.y" +++{ sqliteBeginParse(pParse, 0); } +++#line 1791 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 8: /* cmd ::= BEGIN trans_opt onconf */ +++#line 79 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteBeginTransaction(pParse,yymsp[0].minor.yy372);} +++#line 1796 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 12: /* cmd ::= COMMIT trans_opt */ +++ case 13: /* cmd ::= END trans_opt */ yytestcase(yyruleno==13); +++#line 83 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCommitTransaction(pParse);} +++#line 1802 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 14: /* cmd ::= ROLLBACK trans_opt */ +++#line 85 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteRollbackTransaction(pParse);} +++#line 1807 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 16: /* create_table ::= CREATE temp TABLE nm */ +++#line 90 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteStartTable(pParse,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0,yymsp[-2].minor.yy372,0); +++} +++#line 1814 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 17: /* temp ::= TEMP */ +++ case 74: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */ yytestcase(yyruleno==74); +++ case 108: /* distinct ::= DISTINCT */ yytestcase(yyruleno==108); +++#line 94 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = 1;} +++#line 1821 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 18: /* temp ::= */ +++ case 73: /* init_deferred_pred_opt ::= */ yytestcase(yyruleno==73); +++ case 75: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */ yytestcase(yyruleno==75); +++ case 86: /* defer_subclause_opt ::= */ yytestcase(yyruleno==86); +++ case 109: /* distinct ::= ALL */ yytestcase(yyruleno==109); +++ case 110: /* distinct ::= */ yytestcase(yyruleno==110); +++#line 95 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = 0;} +++#line 1831 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 19: /* create_table_args ::= LP columnlist conslist_opt RP */ +++#line 96 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteEndTable(pParse,&yymsp[0].minor.yy0,0); +++} +++#line 1838 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 20: /* create_table_args ::= AS select */ +++#line 99 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteEndTable(pParse,0,yymsp[0].minor.yy179); +++ sqliteSelectDelete(yymsp[0].minor.yy179); +++} +++#line 1846 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 24: /* columnid ::= nm */ +++#line 111 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumn(pParse,&yymsp[0].minor.yy0);} +++#line 1851 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 25: /* id ::= ID */ +++ case 26: /* ids ::= ID */ yytestcase(yyruleno==26); +++ case 27: /* ids ::= STRING */ yytestcase(yyruleno==27); +++ case 28: /* nm ::= ID */ yytestcase(yyruleno==28); +++ case 29: /* nm ::= STRING */ yytestcase(yyruleno==29); +++ case 30: /* nm ::= JOIN_KW */ yytestcase(yyruleno==30); +++ case 35: /* typename ::= ids */ yytestcase(yyruleno==35); +++ case 128: /* dbnm ::= DOT nm */ yytestcase(yyruleno==128); +++ case 254: /* plus_num ::= plus_opt number */ yytestcase(yyruleno==254); +++ case 255: /* minus_num ::= MINUS number */ yytestcase(yyruleno==255); +++ case 256: /* number ::= INTEGER */ yytestcase(yyruleno==256); +++ case 257: /* number ::= FLOAT */ yytestcase(yyruleno==257); +++#line 117 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy0 = yymsp[0].minor.yy0;} +++#line 1867 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 32: /* type ::= typename */ +++#line 160 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumnType(pParse,&yymsp[0].minor.yy0,&yymsp[0].minor.yy0);} +++#line 1872 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 33: /* type ::= typename LP signed RP */ +++#line 161 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumnType(pParse,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);} +++#line 1877 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 34: /* type ::= typename LP signed COMMA signed RP */ +++#line 163 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddColumnType(pParse,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);} +++#line 1882 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 36: /* typename ::= typename ids */ +++ case 242: /* idxitem ::= nm sortorder */ yytestcase(yyruleno==242); +++#line 166 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy0 = yymsp[-1].minor.yy0;} +++#line 1888 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 37: /* signed ::= INTEGER */ +++ case 38: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==38); +++#line 168 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = atoi(yymsp[0].minor.yy0.z); } +++#line 1894 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 39: /* signed ::= MINUS INTEGER */ +++#line 170 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = -atoi(yymsp[0].minor.yy0.z); } +++#line 1899 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 44: /* carg ::= DEFAULT STRING */ +++ case 45: /* carg ::= DEFAULT ID */ yytestcase(yyruleno==45); +++ case 46: /* carg ::= DEFAULT INTEGER */ yytestcase(yyruleno==46); +++ case 47: /* carg ::= DEFAULT PLUS INTEGER */ yytestcase(yyruleno==47); +++ case 49: /* carg ::= DEFAULT FLOAT */ yytestcase(yyruleno==49); +++ case 50: /* carg ::= DEFAULT PLUS FLOAT */ yytestcase(yyruleno==50); +++#line 175 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddDefaultValue(pParse,&yymsp[0].minor.yy0,0);} +++#line 1909 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 48: /* carg ::= DEFAULT MINUS INTEGER */ +++ case 51: /* carg ::= DEFAULT MINUS FLOAT */ yytestcase(yyruleno==51); +++#line 179 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddDefaultValue(pParse,&yymsp[0].minor.yy0,1);} +++#line 1915 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 54: /* ccons ::= NOT NULL onconf */ +++#line 189 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddNotNull(pParse, yymsp[0].minor.yy372);} +++#line 1920 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 55: /* ccons ::= PRIMARY KEY sortorder onconf */ +++#line 190 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddPrimaryKey(pParse,0,yymsp[0].minor.yy372);} +++#line 1925 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 56: /* ccons ::= UNIQUE onconf */ +++#line 191 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);} +++#line 1930 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 57: /* ccons ::= CHECK LP expr RP onconf */ +++#line 192 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yy_destructor(yypParser,158,&yymsp[-2].minor); +++} +++#line 1937 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 58: /* ccons ::= REFERENCES nm idxlist_opt refargs */ +++#line 194 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCreateForeignKey(pParse,0,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy320,yymsp[0].minor.yy372);} +++#line 1942 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 59: /* ccons ::= defer_subclause */ +++#line 195 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteDeferForeignKey(pParse,yymsp[0].minor.yy372);} +++#line 1947 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 60: /* ccons ::= COLLATE id */ +++#line 196 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteAddCollateType(pParse, sqliteCollateType(yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n)); +++} +++#line 1954 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 61: /* refargs ::= */ +++#line 206 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Restrict * 0x010101; } +++#line 1959 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 62: /* refargs ::= refargs refarg */ +++#line 207 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = (yymsp[-1].minor.yy372 & yymsp[0].minor.yy407.mask) | yymsp[0].minor.yy407.value; } +++#line 1964 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 63: /* refarg ::= MATCH nm */ +++#line 209 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = 0; yygotominor.yy407.mask = 0x000000; } +++#line 1969 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 64: /* refarg ::= ON DELETE refact */ +++#line 210 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = yymsp[0].minor.yy372; yygotominor.yy407.mask = 0x0000ff; } +++#line 1974 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 65: /* refarg ::= ON UPDATE refact */ +++#line 211 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = yymsp[0].minor.yy372<<8; yygotominor.yy407.mask = 0x00ff00; } +++#line 1979 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 66: /* refarg ::= ON INSERT refact */ +++#line 212 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy407.value = yymsp[0].minor.yy372<<16; yygotominor.yy407.mask = 0xff0000; } +++#line 1984 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 67: /* refact ::= SET NULL */ +++#line 214 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_SetNull; } +++#line 1989 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 68: /* refact ::= SET DEFAULT */ +++#line 215 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_SetDflt; } +++#line 1994 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 69: /* refact ::= CASCADE */ +++#line 216 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Cascade; } +++#line 1999 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 70: /* refact ::= RESTRICT */ +++#line 217 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Restrict; } +++#line 2004 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 71: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */ +++ case 72: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */ yytestcase(yyruleno==72); +++ case 87: /* defer_subclause_opt ::= defer_subclause */ yytestcase(yyruleno==87); +++ case 164: /* insert_cmd ::= INSERT orconf */ yytestcase(yyruleno==164); +++#line 219 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = yymsp[0].minor.yy372;} +++#line 2012 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 82: /* tcons ::= PRIMARY KEY LP idxlist RP onconf */ +++#line 236 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteAddPrimaryKey(pParse,yymsp[-2].minor.yy320,yymsp[0].minor.yy372);} +++#line 2017 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 83: /* tcons ::= UNIQUE LP idxlist RP onconf */ +++#line 238 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);} +++#line 2022 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 84: /* tcons ::= CHECK expr onconf */ +++#line 239 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yy_destructor(yypParser,158,&yymsp[-1].minor); +++} +++#line 2029 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 85: /* tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt */ +++#line 241 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteCreateForeignKey(pParse, yymsp[-6].minor.yy320, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy320, yymsp[-1].minor.yy372); +++ sqliteDeferForeignKey(pParse, yymsp[0].minor.yy372); +++} +++#line 2037 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 88: /* onconf ::= */ +++ case 90: /* orconf ::= */ yytestcase(yyruleno==90); +++#line 255 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Default; } +++#line 2043 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 89: /* onconf ::= ON CONFLICT resolvetype */ +++ case 91: /* orconf ::= OR resolvetype */ yytestcase(yyruleno==91); +++#line 256 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = yymsp[0].minor.yy372; } +++#line 2049 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 92: /* resolvetype ::= ROLLBACK */ +++#line 259 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Rollback; } +++#line 2054 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 93: /* resolvetype ::= ABORT */ +++ case 236: /* uniqueflag ::= UNIQUE */ yytestcase(yyruleno==236); +++#line 260 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Abort; } +++#line 2060 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 94: /* resolvetype ::= FAIL */ +++#line 261 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Fail; } +++#line 2065 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 95: /* resolvetype ::= IGNORE */ +++#line 262 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Ignore; } +++#line 2070 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 96: /* resolvetype ::= REPLACE */ +++#line 263 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_Replace; } +++#line 2075 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 97: /* cmd ::= DROP TABLE nm */ +++#line 267 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteDropTable(pParse,&yymsp[0].minor.yy0,0);} +++#line 2080 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 98: /* cmd ::= CREATE temp VIEW nm AS select */ +++#line 271 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteCreateView(pParse, &yymsp[-5].minor.yy0, &yymsp[-2].minor.yy0, yymsp[0].minor.yy179, yymsp[-4].minor.yy372); +++} +++#line 2087 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 99: /* cmd ::= DROP VIEW nm */ +++#line 274 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDropTable(pParse, &yymsp[0].minor.yy0, 1); +++} +++#line 2094 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 100: /* cmd ::= select */ +++#line 280 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteSelect(pParse, yymsp[0].minor.yy179, SRT_Callback, 0, 0, 0, 0); +++ sqliteSelectDelete(yymsp[0].minor.yy179); +++} +++#line 2102 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 101: /* select ::= oneselect */ +++ case 125: /* seltablist_paren ::= select */ yytestcase(yyruleno==125); +++#line 290 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy179 = yymsp[0].minor.yy179;} +++#line 2108 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 102: /* select ::= select multiselect_op oneselect */ +++#line 291 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ if( yymsp[0].minor.yy179 ){ +++ yymsp[0].minor.yy179->op = yymsp[-1].minor.yy372; +++ yymsp[0].minor.yy179->pPrior = yymsp[-2].minor.yy179; +++ } +++ yygotominor.yy179 = yymsp[0].minor.yy179; +++} +++#line 2119 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 103: /* multiselect_op ::= UNION */ +++#line 299 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_UNION;} +++#line 2124 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 104: /* multiselect_op ::= UNION ALL */ +++#line 300 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_ALL;} +++#line 2129 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 105: /* multiselect_op ::= INTERSECT */ +++#line 301 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_INTERSECT;} +++#line 2134 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 106: /* multiselect_op ::= EXCEPT */ +++#line 302 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_EXCEPT;} +++#line 2139 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 107: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */ +++#line 304 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy179 = sqliteSelectNew(yymsp[-6].minor.yy322,yymsp[-5].minor.yy307,yymsp[-4].minor.yy242,yymsp[-3].minor.yy322,yymsp[-2].minor.yy242,yymsp[-1].minor.yy322,yymsp[-7].minor.yy372,yymsp[0].minor.yy124.limit,yymsp[0].minor.yy124.offset); +++} +++#line 2146 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 111: /* sclp ::= selcollist COMMA */ +++#line 325 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = yymsp[-1].minor.yy322;} +++#line 2151 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 112: /* sclp ::= */ +++ case 138: /* orderby_opt ::= */ yytestcase(yyruleno==138); +++ case 148: /* groupby_opt ::= */ yytestcase(yyruleno==148); +++#line 326 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = 0;} +++#line 2158 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 113: /* selcollist ::= sclp expr as */ +++#line 327 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-2].minor.yy322,yymsp[-1].minor.yy242,yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); +++} +++#line 2165 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 114: /* selcollist ::= sclp STAR */ +++#line 330 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-1].minor.yy322, sqliteExpr(TK_ALL, 0, 0, 0), 0); +++} +++#line 2172 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 115: /* selcollist ::= sclp nm DOT STAR */ +++#line 333 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0); +++ Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0); +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-3].minor.yy322, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0); +++} +++#line 2181 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 116: /* as ::= AS nm */ +++ case 117: /* as ::= ids */ yytestcase(yyruleno==117); +++ case 288: /* key_opt ::= USING ids */ yytestcase(yyruleno==288); +++#line 343 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy0 = yymsp[0].minor.yy0; } +++#line 2188 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 118: /* as ::= */ +++#line 345 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy0.n = 0; } +++#line 2193 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 119: /* from ::= */ +++#line 357 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy307 = sqliteMalloc(sizeof(*yygotominor.yy307));} +++#line 2198 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 120: /* from ::= FROM seltablist */ +++#line 358 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy307 = yymsp[0].minor.yy307;} +++#line 2203 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 121: /* stl_prefix ::= seltablist joinop */ +++#line 363 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy307 = yymsp[-1].minor.yy307; +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>0 ) yygotominor.yy307->a[yygotominor.yy307->nSrc-1].jointype = yymsp[0].minor.yy372; +++} +++#line 2211 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 122: /* stl_prefix ::= */ +++#line 367 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy307 = 0;} +++#line 2216 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 123: /* seltablist ::= stl_prefix nm dbnm as on_opt using_opt */ +++#line 368 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy307 = sqliteSrcListAppend(yymsp[-5].minor.yy307,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0); +++ if( yymsp[-2].minor.yy0.n ) sqliteSrcListAddAlias(yygotominor.yy307,&yymsp[-2].minor.yy0); +++ if( yymsp[-1].minor.yy242 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pOn = yymsp[-1].minor.yy242; } +++ else { sqliteExprDelete(yymsp[-1].minor.yy242); } +++ } +++ if( yymsp[0].minor.yy320 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pUsing = yymsp[0].minor.yy320; } +++ else { sqliteIdListDelete(yymsp[0].minor.yy320); } +++ } +++} +++#line 2232 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 124: /* seltablist ::= stl_prefix LP seltablist_paren RP as on_opt using_opt */ +++#line 381 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy307 = sqliteSrcListAppend(yymsp[-6].minor.yy307,0,0); +++ yygotominor.yy307->a[yygotominor.yy307->nSrc-1].pSelect = yymsp[-4].minor.yy179; +++ if( yymsp[-2].minor.yy0.n ) sqliteSrcListAddAlias(yygotominor.yy307,&yymsp[-2].minor.yy0); +++ if( yymsp[-1].minor.yy242 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pOn = yymsp[-1].minor.yy242; } +++ else { sqliteExprDelete(yymsp[-1].minor.yy242); } +++ } +++ if( yymsp[0].minor.yy320 ){ +++ if( yygotominor.yy307 && yygotominor.yy307->nSrc>1 ){ yygotominor.yy307->a[yygotominor.yy307->nSrc-2].pUsing = yymsp[0].minor.yy320; } +++ else { sqliteIdListDelete(yymsp[0].minor.yy320); } +++ } +++} +++#line 2249 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 126: /* seltablist_paren ::= seltablist */ +++#line 402 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy179 = sqliteSelectNew(0,yymsp[0].minor.yy307,0,0,0,0,0,-1,0); +++} +++#line 2256 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 127: /* dbnm ::= */ +++#line 407 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy0.z=0; yygotominor.yy0.n=0;} +++#line 2261 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 129: /* joinop ::= COMMA */ +++ case 130: /* joinop ::= JOIN */ yytestcase(yyruleno==130); +++#line 412 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = JT_INNER; } +++#line 2267 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 131: /* joinop ::= JOIN_KW JOIN */ +++#line 414 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-1].minor.yy0,0,0); } +++#line 2272 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 132: /* joinop ::= JOIN_KW nm JOIN */ +++#line 415 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,0); } +++#line 2277 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 133: /* joinop ::= JOIN_KW nm nm JOIN */ +++#line 417 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = sqliteJoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0); } +++#line 2282 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 134: /* on_opt ::= ON expr */ +++ case 142: /* sortitem ::= expr */ yytestcase(yyruleno==142); +++ case 151: /* having_opt ::= HAVING expr */ yytestcase(yyruleno==151); +++ case 158: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==158); +++ case 227: /* case_else ::= ELSE expr */ yytestcase(yyruleno==227); +++ case 229: /* case_operand ::= expr */ yytestcase(yyruleno==229); +++ case 233: /* expritem ::= expr */ yytestcase(yyruleno==233); +++#line 421 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = yymsp[0].minor.yy242;} +++#line 2293 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 135: /* on_opt ::= */ +++ case 150: /* having_opt ::= */ yytestcase(yyruleno==150); +++ case 157: /* where_opt ::= */ yytestcase(yyruleno==157); +++ case 228: /* case_else ::= */ yytestcase(yyruleno==228); +++ case 230: /* case_operand ::= */ yytestcase(yyruleno==230); +++ case 234: /* expritem ::= */ yytestcase(yyruleno==234); +++#line 422 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = 0;} +++#line 2303 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 136: /* using_opt ::= USING LP idxlist RP */ +++ case 169: /* inscollist_opt ::= LP inscollist RP */ yytestcase(yyruleno==169); +++ case 239: /* idxlist_opt ::= LP idxlist RP */ yytestcase(yyruleno==239); +++#line 426 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = yymsp[-1].minor.yy320;} +++#line 2310 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 137: /* using_opt ::= */ +++ case 168: /* inscollist_opt ::= */ yytestcase(yyruleno==168); +++ case 238: /* idxlist_opt ::= */ yytestcase(yyruleno==238); +++#line 427 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = 0;} +++#line 2317 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 139: /* orderby_opt ::= ORDER BY sortlist */ +++ case 149: /* groupby_opt ::= GROUP BY exprlist */ yytestcase(yyruleno==149); +++#line 438 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = yymsp[0].minor.yy322;} +++#line 2323 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 140: /* sortlist ::= sortlist COMMA sortitem collate sortorder */ +++#line 439 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322,yymsp[-2].minor.yy242,0); +++ if( yygotominor.yy322 ) yygotominor.yy322->a[yygotominor.yy322->nExpr-1].sortOrder = yymsp[-1].minor.yy372+yymsp[0].minor.yy372; +++} +++#line 2331 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 141: /* sortlist ::= sortitem collate sortorder */ +++#line 443 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(0,yymsp[-2].minor.yy242,0); +++ if( yygotominor.yy322 ) yygotominor.yy322->a[0].sortOrder = yymsp[-1].minor.yy372+yymsp[0].minor.yy372; +++} +++#line 2339 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 143: /* sortorder ::= ASC */ +++ case 145: /* sortorder ::= */ yytestcase(yyruleno==145); +++#line 452 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = SQLITE_SO_ASC;} +++#line 2345 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 144: /* sortorder ::= DESC */ +++#line 453 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = SQLITE_SO_DESC;} +++#line 2350 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 146: /* collate ::= */ +++#line 455 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = SQLITE_SO_UNK;} +++#line 2355 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 147: /* collate ::= COLLATE id */ +++#line 456 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = sqliteCollateType(yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n);} +++#line 2360 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 152: /* limit_opt ::= */ +++#line 469 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = -1; yygotominor.yy124.offset = 0;} +++#line 2365 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 153: /* limit_opt ::= LIMIT signed */ +++#line 470 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = yymsp[0].minor.yy372; yygotominor.yy124.offset = 0;} +++#line 2370 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 154: /* limit_opt ::= LIMIT signed OFFSET signed */ +++#line 472 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = yymsp[-2].minor.yy372; yygotominor.yy124.offset = yymsp[0].minor.yy372;} +++#line 2375 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 155: /* limit_opt ::= LIMIT signed COMMA signed */ +++#line 474 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy124.limit = yymsp[0].minor.yy372; yygotominor.yy124.offset = yymsp[-2].minor.yy372;} +++#line 2380 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 156: /* cmd ::= DELETE FROM nm dbnm where_opt */ +++#line 478 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDeleteFrom(pParse, sqliteSrcListAppend(0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0), yymsp[0].minor.yy242); +++} +++#line 2387 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 159: /* cmd ::= UPDATE orconf nm dbnm SET setlist where_opt */ +++#line 494 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteUpdate(pParse,sqliteSrcListAppend(0,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0),yymsp[-1].minor.yy322,yymsp[0].minor.yy242,yymsp[-5].minor.yy372);} +++#line 2392 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 160: /* setlist ::= setlist COMMA nm EQ expr */ +++#line 497 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322,yymsp[0].minor.yy242,&yymsp[-2].minor.yy0);} +++#line 2397 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 161: /* setlist ::= nm EQ expr */ +++#line 498 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(0,yymsp[0].minor.yy242,&yymsp[-2].minor.yy0);} +++#line 2402 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 162: /* cmd ::= insert_cmd INTO nm dbnm inscollist_opt VALUES LP itemlist RP */ +++#line 504 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteInsert(pParse, sqliteSrcListAppend(0,&yymsp[-6].minor.yy0,&yymsp[-5].minor.yy0), yymsp[-1].minor.yy322, 0, yymsp[-4].minor.yy320, yymsp[-8].minor.yy372);} +++#line 2407 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 163: /* cmd ::= insert_cmd INTO nm dbnm inscollist_opt select */ +++#line 506 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteInsert(pParse, sqliteSrcListAppend(0,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0), 0, yymsp[0].minor.yy179, yymsp[-1].minor.yy320, yymsp[-5].minor.yy372);} +++#line 2412 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 165: /* insert_cmd ::= REPLACE */ +++#line 510 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = OE_Replace;} +++#line 2417 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 166: /* itemlist ::= itemlist COMMA expr */ +++ case 231: /* exprlist ::= exprlist COMMA expritem */ yytestcase(yyruleno==231); +++#line 516 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(yymsp[-2].minor.yy322,yymsp[0].minor.yy242,0);} +++#line 2423 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 167: /* itemlist ::= expr */ +++ case 232: /* exprlist ::= expritem */ yytestcase(yyruleno==232); +++#line 517 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy322 = sqliteExprListAppend(0,yymsp[0].minor.yy242,0);} +++#line 2429 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 170: /* inscollist ::= inscollist COMMA nm */ +++ case 240: /* idxlist ::= idxlist COMMA idxitem */ yytestcase(yyruleno==240); +++#line 526 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = sqliteIdListAppend(yymsp[-2].minor.yy320,&yymsp[0].minor.yy0);} +++#line 2435 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 171: /* inscollist ::= nm */ +++ case 241: /* idxlist ::= idxitem */ yytestcase(yyruleno==241); +++#line 527 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy320 = sqliteIdListAppend(0,&yymsp[0].minor.yy0);} +++#line 2441 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 172: /* expr ::= LP expr RP */ +++#line 535 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = yymsp[-1].minor.yy242; sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); } +++#line 2446 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 173: /* expr ::= NULL */ +++#line 536 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_NULL, 0, 0, &yymsp[0].minor.yy0);} +++#line 2451 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 174: /* expr ::= ID */ +++ case 175: /* expr ::= JOIN_KW */ yytestcase(yyruleno==175); +++#line 537 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0);} +++#line 2457 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 176: /* expr ::= nm DOT nm */ +++#line 539 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0); +++ yygotominor.yy242 = sqliteExpr(TK_DOT, temp1, temp2, 0); +++} +++#line 2466 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 177: /* expr ::= nm DOT nm DOT nm */ +++#line 544 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &yymsp[-4].minor.yy0); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &yymsp[-2].minor.yy0); +++ Expr *temp3 = sqliteExpr(TK_ID, 0, 0, &yymsp[0].minor.yy0); +++ Expr *temp4 = sqliteExpr(TK_DOT, temp2, temp3, 0); +++ yygotominor.yy242 = sqliteExpr(TK_DOT, temp1, temp4, 0); +++} +++#line 2477 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 178: /* expr ::= INTEGER */ +++#line 551 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_INTEGER, 0, 0, &yymsp[0].minor.yy0);} +++#line 2482 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 179: /* expr ::= FLOAT */ +++#line 552 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_FLOAT, 0, 0, &yymsp[0].minor.yy0);} +++#line 2487 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 180: /* expr ::= STRING */ +++#line 553 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_STRING, 0, 0, &yymsp[0].minor.yy0);} +++#line 2492 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 181: /* expr ::= VARIABLE */ +++#line 554 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_VARIABLE, 0, 0, &yymsp[0].minor.yy0); +++ if( yygotominor.yy242 ) yygotominor.yy242->iTable = ++pParse->nVar; +++} +++#line 2500 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 182: /* expr ::= ID LP exprlist RP */ +++#line 558 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExprFunction(yymsp[-1].minor.yy322, &yymsp[-3].minor.yy0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0); +++} +++#line 2508 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 183: /* expr ::= ID LP STAR RP */ +++#line 562 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExprFunction(0, &yymsp[-3].minor.yy0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0); +++} +++#line 2516 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 184: /* expr ::= expr AND expr */ +++#line 566 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_AND, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2521 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 185: /* expr ::= expr OR expr */ +++#line 567 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_OR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2526 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 186: /* expr ::= expr LT expr */ +++#line 568 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_LT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2531 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 187: /* expr ::= expr GT expr */ +++#line 569 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_GT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2536 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 188: /* expr ::= expr LE expr */ +++#line 570 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_LE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2541 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 189: /* expr ::= expr GE expr */ +++#line 571 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_GE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2546 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 190: /* expr ::= expr NE expr */ +++#line 572 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_NE, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2551 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 191: /* expr ::= expr EQ expr */ +++#line 573 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_EQ, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2556 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 192: /* expr ::= expr BITAND expr */ +++#line 574 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_BITAND, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2561 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 193: /* expr ::= expr BITOR expr */ +++#line 575 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_BITOR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2566 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 194: /* expr ::= expr LSHIFT expr */ +++#line 576 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_LSHIFT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2571 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 195: /* expr ::= expr RSHIFT expr */ +++#line 577 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_RSHIFT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2576 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 196: /* expr ::= expr likeop expr */ +++#line 578 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[0].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[-2].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExprFunction(pList, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->op = yymsp[-1].minor.yy372; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-2].minor.yy242->span, &yymsp[0].minor.yy242->span); +++} +++#line 2587 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 197: /* expr ::= expr NOT likeop expr */ +++#line 585 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[0].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[-3].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExprFunction(pList, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->op = yymsp[-1].minor.yy372; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,&yymsp[0].minor.yy242->span); +++} +++#line 2599 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 198: /* likeop ::= LIKE */ +++#line 594 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_LIKE;} +++#line 2604 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 199: /* likeop ::= GLOB */ +++#line 595 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy372 = TK_GLOB;} +++#line 2609 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 200: /* expr ::= expr PLUS expr */ +++#line 596 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_PLUS, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2614 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 201: /* expr ::= expr MINUS expr */ +++#line 597 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_MINUS, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2619 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 202: /* expr ::= expr STAR expr */ +++#line 598 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_STAR, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2624 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 203: /* expr ::= expr SLASH expr */ +++#line 599 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_SLASH, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2629 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 204: /* expr ::= expr REM expr */ +++#line 600 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_REM, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2634 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 205: /* expr ::= expr CONCAT expr */ +++#line 601 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy242 = sqliteExpr(TK_CONCAT, yymsp[-2].minor.yy242, yymsp[0].minor.yy242, 0);} +++#line 2639 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 206: /* expr ::= expr ISNULL */ +++#line 602 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_ISNULL, yymsp[-1].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2647 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 207: /* expr ::= expr IS NULL */ +++#line 606 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_ISNULL, yymsp[-2].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2655 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 208: /* expr ::= expr NOTNULL */ +++#line 610 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-1].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2663 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 209: /* expr ::= expr NOT NULL */ +++#line 614 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-2].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2671 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 210: /* expr ::= expr IS NOT NULL */ +++#line 618 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOTNULL, yymsp[-3].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2679 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 211: /* expr ::= NOT expr */ +++#line 622 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2687 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 212: /* expr ::= BITNOT expr */ +++#line 626 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_BITNOT, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2695 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 213: /* expr ::= MINUS expr */ +++#line 630 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_UMINUS, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2703 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 214: /* expr ::= PLUS expr */ +++#line 634 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_UPLUS, yymsp[0].minor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy242->span); +++} +++#line 2711 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 215: /* expr ::= LP select RP */ +++#line 638 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_SELECT, 0, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); +++} +++#line 2720 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 216: /* expr ::= expr BETWEEN expr AND expr */ +++#line 643 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[0].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExpr(TK_BETWEEN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = pList; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy242->span); +++} +++#line 2731 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 217: /* expr ::= expr NOT BETWEEN expr AND expr */ +++#line 650 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ ExprList *pList = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0); +++ pList = sqliteExprListAppend(pList, yymsp[0].minor.yy242, 0); +++ yygotominor.yy242 = sqliteExpr(TK_BETWEEN, yymsp[-5].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = pList; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy242->span); +++} +++#line 2743 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 218: /* expr ::= expr IN LP exprlist RP */ +++#line 658 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-1].minor.yy322; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2752 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 219: /* expr ::= expr IN LP select RP */ +++#line 663 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179; +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2761 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 220: /* expr ::= expr NOT IN LP exprlist RP */ +++#line 668 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-5].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-1].minor.yy322; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2771 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 221: /* expr ::= expr NOT IN LP select RP */ +++#line 674 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-5].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = yymsp[-1].minor.yy179; +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-5].minor.yy242->span,&yymsp[0].minor.yy0); +++} +++#line 2781 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 222: /* expr ::= expr IN nm dbnm */ +++#line 680 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-3].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-3].minor.yy242->span,yymsp[0].minor.yy0.z?&yymsp[0].minor.yy0:&yymsp[-1].minor.yy0); +++} +++#line 2791 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 223: /* expr ::= expr NOT IN nm dbnm */ +++#line 686 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); +++ yygotominor.yy242 = sqliteExpr(TK_IN, yymsp[-4].minor.yy242, 0, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ yygotominor.yy242 = sqliteExpr(TK_NOT, yygotominor.yy242, 0, 0); +++ sqliteExprSpan(yygotominor.yy242,&yymsp[-4].minor.yy242->span,yymsp[0].minor.yy0.z?&yymsp[0].minor.yy0:&yymsp[-1].minor.yy0); +++} +++#line 2802 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 224: /* expr ::= CASE case_operand case_exprlist case_else END */ +++#line 696 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_CASE, yymsp[-3].minor.yy242, yymsp[-1].minor.yy242, 0); +++ if( yygotominor.yy242 ) yygotominor.yy242->pList = yymsp[-2].minor.yy322; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 2811 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 225: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */ +++#line 703 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(yymsp[-4].minor.yy322, yymsp[-2].minor.yy242, 0); +++ yygotominor.yy322 = sqliteExprListAppend(yygotominor.yy322, yymsp[0].minor.yy242, 0); +++} +++#line 2819 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 226: /* case_exprlist ::= WHEN expr THEN expr */ +++#line 707 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy322 = sqliteExprListAppend(0, yymsp[-2].minor.yy242, 0); +++ yygotominor.yy322 = sqliteExprListAppend(yygotominor.yy322, yymsp[0].minor.yy242, 0); +++} +++#line 2827 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 235: /* cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf */ +++#line 732 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pSrc = sqliteSrcListAppend(0, &yymsp[-5].minor.yy0, &yymsp[-4].minor.yy0); +++ if( yymsp[-9].minor.yy372!=OE_None ) yymsp[-9].minor.yy372 = yymsp[0].minor.yy372; +++ if( yymsp[-9].minor.yy372==OE_Default) yymsp[-9].minor.yy372 = OE_Abort; +++ sqliteCreateIndex(pParse, &yymsp[-7].minor.yy0, pSrc, yymsp[-2].minor.yy320, yymsp[-9].minor.yy372, &yymsp[-10].minor.yy0, &yymsp[-1].minor.yy0); +++} +++#line 2837 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 237: /* uniqueflag ::= */ +++#line 741 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = OE_None; } +++#line 2842 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 243: /* cmd ::= DROP INDEX nm dbnm */ +++#line 758 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDropIndex(pParse, sqliteSrcListAppend(0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0)); +++} +++#line 2849 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 244: /* cmd ::= COPY orconf nm dbnm FROM nm USING DELIMITERS STRING */ +++#line 766 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCopy(pParse,sqliteSrcListAppend(0,&yymsp[-6].minor.yy0,&yymsp[-5].minor.yy0),&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0,yymsp[-7].minor.yy372);} +++#line 2854 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 245: /* cmd ::= COPY orconf nm dbnm FROM nm */ +++#line 768 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteCopy(pParse,sqliteSrcListAppend(0,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0),&yymsp[0].minor.yy0,0,yymsp[-4].minor.yy372);} +++#line 2859 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 246: /* cmd ::= VACUUM */ +++#line 772 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteVacuum(pParse,0);} +++#line 2864 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 247: /* cmd ::= VACUUM nm */ +++#line 773 "ext/sqlite/libsqlite/src/parse.y" +++{sqliteVacuum(pParse,&yymsp[0].minor.yy0);} +++#line 2869 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 248: /* cmd ::= PRAGMA ids EQ nm */ +++ case 249: /* cmd ::= PRAGMA ids EQ ON */ yytestcase(yyruleno==249); +++ case 250: /* cmd ::= PRAGMA ids EQ plus_num */ yytestcase(yyruleno==250); +++#line 777 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,0);} +++#line 2876 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 251: /* cmd ::= PRAGMA ids EQ minus_num */ +++#line 780 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,1);} +++#line 2881 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 252: /* cmd ::= PRAGMA ids LP nm RP */ +++#line 781 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[-3].minor.yy0,&yymsp[-1].minor.yy0,0);} +++#line 2886 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 253: /* cmd ::= PRAGMA ids */ +++#line 782 "ext/sqlite/libsqlite/src/parse.y" +++{sqlitePragma(pParse,&yymsp[0].minor.yy0,&yymsp[0].minor.yy0,0);} +++#line 2891 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 260: /* cmd ::= CREATE trigger_decl BEGIN trigger_cmd_list END */ +++#line 792 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ Token all; +++ all.z = yymsp[-4].minor.yy0.z; +++ all.n = (yymsp[0].minor.yy0.z - yymsp[-4].minor.yy0.z) + yymsp[0].minor.yy0.n; +++ sqliteFinishTrigger(pParse, yymsp[-1].minor.yy19, &all); +++} +++#line 2901 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 261: /* trigger_decl ::= temp TRIGGER nm trigger_time trigger_event ON nm dbnm foreach_clause when_clause */ +++#line 800 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ SrcList *pTab = sqliteSrcListAppend(0, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0); +++ sqliteBeginTrigger(pParse, &yymsp[-7].minor.yy0, yymsp[-6].minor.yy372, yymsp[-5].minor.yy290.a, yymsp[-5].minor.yy290.b, pTab, yymsp[-1].minor.yy372, yymsp[0].minor.yy182, yymsp[-9].minor.yy372); +++} +++#line 2909 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 262: /* trigger_time ::= BEFORE */ +++ case 265: /* trigger_time ::= */ yytestcase(yyruleno==265); +++#line 806 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_BEFORE; } +++#line 2915 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 263: /* trigger_time ::= AFTER */ +++#line 807 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_AFTER; } +++#line 2920 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 264: /* trigger_time ::= INSTEAD OF */ +++#line 808 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_INSTEAD;} +++#line 2925 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 266: /* trigger_event ::= DELETE */ +++#line 813 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy290.a = TK_DELETE; yygotominor.yy290.b = 0; } +++#line 2930 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 267: /* trigger_event ::= INSERT */ +++#line 814 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy290.a = TK_INSERT; yygotominor.yy290.b = 0; } +++#line 2935 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 268: /* trigger_event ::= UPDATE */ +++#line 815 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy290.a = TK_UPDATE; yygotominor.yy290.b = 0;} +++#line 2940 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 269: /* trigger_event ::= UPDATE OF inscollist */ +++#line 816 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy290.a = TK_UPDATE; yygotominor.yy290.b = yymsp[0].minor.yy320; } +++#line 2945 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 270: /* foreach_clause ::= */ +++ case 271: /* foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==271); +++#line 819 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_ROW; } +++#line 2951 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 272: /* foreach_clause ::= FOR EACH STATEMENT */ +++#line 821 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy372 = TK_STATEMENT; } +++#line 2956 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 273: /* when_clause ::= */ +++#line 824 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy182 = 0; } +++#line 2961 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 274: /* when_clause ::= WHEN expr */ +++#line 825 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy182 = yymsp[0].minor.yy242; } +++#line 2966 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 275: /* trigger_cmd_list ::= trigger_cmd SEMI trigger_cmd_list */ +++#line 829 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yymsp[-2].minor.yy19->pNext = yymsp[0].minor.yy19; +++ yygotominor.yy19 = yymsp[-2].minor.yy19; +++} +++#line 2974 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 276: /* trigger_cmd_list ::= */ +++#line 833 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy19 = 0; } +++#line 2979 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 277: /* trigger_cmd ::= UPDATE orconf nm SET setlist where_opt */ +++#line 839 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy19 = sqliteTriggerUpdateStep(&yymsp[-3].minor.yy0, yymsp[-1].minor.yy322, yymsp[0].minor.yy242, yymsp[-4].minor.yy372); } +++#line 2984 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 278: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt VALUES LP itemlist RP */ +++#line 844 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerInsertStep(&yymsp[-5].minor.yy0, yymsp[-4].minor.yy320, yymsp[-1].minor.yy322, 0, yymsp[-7].minor.yy372);} +++#line 2989 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 279: /* trigger_cmd ::= insert_cmd INTO nm inscollist_opt select */ +++#line 847 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerInsertStep(&yymsp[-2].minor.yy0, yymsp[-1].minor.yy320, 0, yymsp[0].minor.yy179, yymsp[-4].minor.yy372);} +++#line 2994 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 280: /* trigger_cmd ::= DELETE FROM nm where_opt */ +++#line 851 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerDeleteStep(&yymsp[-1].minor.yy0, yymsp[0].minor.yy242);} +++#line 2999 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 281: /* trigger_cmd ::= select */ +++#line 854 "ext/sqlite/libsqlite/src/parse.y" +++{yygotominor.yy19 = sqliteTriggerSelectStep(yymsp[0].minor.yy179); } +++#line 3004 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 282: /* expr ::= RAISE LP IGNORE RP */ +++#line 857 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, 0); +++ yygotominor.yy242->iColumn = OE_Ignore; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3013 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 283: /* expr ::= RAISE LP ROLLBACK COMMA nm RP */ +++#line 862 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); +++ yygotominor.yy242->iColumn = OE_Rollback; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3022 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 284: /* expr ::= RAISE LP ABORT COMMA nm RP */ +++#line 867 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); +++ yygotominor.yy242->iColumn = OE_Abort; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3031 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 285: /* expr ::= RAISE LP FAIL COMMA nm RP */ +++#line 872 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ yygotominor.yy242 = sqliteExpr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); +++ yygotominor.yy242->iColumn = OE_Fail; +++ sqliteExprSpan(yygotominor.yy242, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3040 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 286: /* cmd ::= DROP TRIGGER nm dbnm */ +++#line 879 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDropTrigger(pParse,sqliteSrcListAppend(0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0)); +++} +++#line 3047 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 287: /* cmd ::= ATTACH database_kw_opt ids AS nm key_opt */ +++#line 884 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteAttach(pParse, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); +++} +++#line 3054 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 289: /* key_opt ::= */ +++#line 889 "ext/sqlite/libsqlite/src/parse.y" +++{ yygotominor.yy0.z = 0; yygotominor.yy0.n = 0; } +++#line 3059 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ case 292: /* cmd ::= DETACH database_kw_opt nm */ +++#line 895 "ext/sqlite/libsqlite/src/parse.y" +++{ +++ sqliteDetach(pParse, &yymsp[0].minor.yy0); +++} +++#line 3066 "ext/sqlite/libsqlite/src/parse.c" +++ break; +++ default: +++ /* (0) input ::= cmdlist */ yytestcase(yyruleno==0); +++ /* (1) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==1); +++ /* (2) cmdlist ::= ecmd */ yytestcase(yyruleno==2); +++ /* (3) ecmd ::= explain cmdx SEMI */ yytestcase(yyruleno==3); +++ /* (4) ecmd ::= SEMI */ yytestcase(yyruleno==4); +++ /* (9) trans_opt ::= */ yytestcase(yyruleno==9); +++ /* (10) trans_opt ::= TRANSACTION */ yytestcase(yyruleno==10); +++ /* (11) trans_opt ::= TRANSACTION nm */ yytestcase(yyruleno==11); +++ /* (15) cmd ::= create_table create_table_args */ yytestcase(yyruleno==15); +++ /* (21) columnlist ::= columnlist COMMA column */ yytestcase(yyruleno==21); +++ /* (22) columnlist ::= column */ yytestcase(yyruleno==22); +++ /* (23) column ::= columnid type carglist */ yytestcase(yyruleno==23); +++ /* (31) type ::= */ yytestcase(yyruleno==31); +++ /* (40) carglist ::= carglist carg */ yytestcase(yyruleno==40); +++ /* (41) carglist ::= */ yytestcase(yyruleno==41); +++ /* (42) carg ::= CONSTRAINT nm ccons */ yytestcase(yyruleno==42); +++ /* (43) carg ::= ccons */ yytestcase(yyruleno==43); +++ /* (52) carg ::= DEFAULT NULL */ yytestcase(yyruleno==52); +++ /* (53) ccons ::= NULL onconf */ yytestcase(yyruleno==53); +++ /* (76) conslist_opt ::= */ yytestcase(yyruleno==76); +++ /* (77) conslist_opt ::= COMMA conslist */ yytestcase(yyruleno==77); +++ /* (78) conslist ::= conslist COMMA tcons */ yytestcase(yyruleno==78); +++ /* (79) conslist ::= conslist tcons */ yytestcase(yyruleno==79); +++ /* (80) conslist ::= tcons */ yytestcase(yyruleno==80); +++ /* (81) tcons ::= CONSTRAINT nm */ yytestcase(yyruleno==81); +++ /* (258) plus_opt ::= PLUS */ yytestcase(yyruleno==258); +++ /* (259) plus_opt ::= */ yytestcase(yyruleno==259); +++ /* (290) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==290); +++ /* (291) database_kw_opt ::= */ yytestcase(yyruleno==291); +++ break; +++ }; +++ yygoto = yyRuleInfo[yyruleno].lhs; +++ yysize = yyRuleInfo[yyruleno].nrhs; +++ yypParser->yyidx -= yysize; +++ yyact = yy_find_reduce_action(yymsp[-yysize].stateno,(YYCODETYPE)yygoto); +++ if( yyact < YYNSTATE ){ +++#ifdef NDEBUG +++ /* If we are not debugging and the reduce action popped at least +++ ** one element off the stack, then we can push the new element back +++ ** onto the stack here, and skip the stack overflow test in yy_shift(). +++ ** That gives a significant speed improvement. */ +++ if( yysize ){ +++ yypParser->yyidx++; +++ yymsp -= yysize-1; +++ yymsp->stateno = (YYACTIONTYPE)yyact; +++ yymsp->major = (YYCODETYPE)yygoto; +++ yymsp->minor = yygotominor; +++ }else +++#endif +++ { +++ yy_shift(yypParser,yyact,yygoto,&yygotominor); +++ } +++ }else{ +++ assert( yyact == YYNSTATE + YYNRULE + 1 ); +++ yy_accept(yypParser); +++ } +++} +++ +++/* +++** The following code executes when the parse fails +++*/ +++#ifndef YYNOERRORRECOVERY +++static void yy_parse_failed( +++ yyParser *yypParser /* The parser */ +++){ +++ sqliteParserARG_FETCH; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); +++ } +++#endif +++ while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +++ /* Here code is inserted which will be executed whenever the +++ ** parser fails */ +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */ +++} +++#endif /* YYNOERRORRECOVERY */ +++ +++/* +++** The following code executes when a syntax error first occurs. +++*/ +++static void yy_syntax_error( +++ yyParser *yypParser, /* The parser */ +++ int yymajor, /* The major type of the error token */ +++ YYMINORTYPE yyminor /* The minor type of the error token */ +++){ +++ sqliteParserARG_FETCH; +++#define TOKEN (yyminor.yy0) +++#line 23 "ext/sqlite/libsqlite/src/parse.y" +++ +++ if( pParse->zErrMsg==0 ){ +++ if( TOKEN.z[0] ){ +++ sqliteErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN); +++ }else{ +++ sqliteErrorMsg(pParse, "incomplete SQL statement"); +++ } +++ } +++#line 3166 "ext/sqlite/libsqlite/src/parse.c" +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */ +++} +++ +++/* +++** The following is executed when the parser accepts +++*/ +++static void yy_accept( +++ yyParser *yypParser /* The parser */ +++){ +++ sqliteParserARG_FETCH; +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); +++ } +++#endif +++ while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +++ /* Here code is inserted which will be executed whenever the +++ ** parser accepts */ +++ sqliteParserARG_STORE; /* Suppress warning about unused %extra_argument variable */ +++} +++ +++/* The main parser program. +++** The first argument is a pointer to a structure obtained from +++** "sqliteParserAlloc" which describes the current state of the parser. +++** The second argument is the major token number. The third is +++** the minor token. The fourth optional argument is whatever the +++** user wants (and specified in the grammar) and is available for +++** use by the action routines. +++** +++** Inputs: +++**
    +++**
  • A pointer to the parser (an opaque structure.) +++**
  • The major token number. +++**
  • The minor token number. +++**
  • An option argument of a grammar-specified type. +++**
+++** +++** Outputs: +++** None. +++*/ +++void sqliteParser( +++ void *yyp, /* The parser */ +++ int yymajor, /* The major token code number */ +++ sqliteParserTOKENTYPE yyminor /* The value for the token */ +++ sqliteParserARG_PDECL /* Optional %extra_argument parameter */ +++){ +++ YYMINORTYPE yyminorunion; +++ int yyact; /* The parser action. */ +++ int yyendofinput; /* True if we are at the end of input */ +++#ifdef YYERRORSYMBOL +++ int yyerrorhit = 0; /* True if yymajor has invoked an error */ +++#endif +++ yyParser *yypParser; /* The parser */ +++ +++ /* (re)initialize the parser, if necessary */ +++ yypParser = (yyParser*)yyp; +++ if( yypParser->yyidx<0 ){ +++#if YYSTACKDEPTH<=0 +++ if( yypParser->yystksz <=0 ){ +++ /*memset(&yyminorunion, 0, sizeof(yyminorunion));*/ +++ yyminorunion = yyzerominor; +++ yyStackOverflow(yypParser, &yyminorunion); +++ return; +++ } +++#endif +++ yypParser->yyidx = 0; +++ yypParser->yyerrcnt = -1; +++ yypParser->yystack[0].stateno = 0; +++ yypParser->yystack[0].major = 0; +++ } +++ yyminorunion.yy0 = yyminor; +++ yyendofinput = (yymajor==0); +++ sqliteParserARG_STORE; +++ +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]); +++ } +++#endif +++ +++ do{ +++ yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); +++ if( yyactyyerrcnt--; +++ yymajor = YYNOCODE; +++ }else if( yyact < YYNSTATE + YYNRULE ){ +++ yy_reduce(yypParser,yyact-YYNSTATE); +++ }else{ +++ assert( yyact == YY_ERROR_ACTION ); +++#ifdef YYERRORSYMBOL +++ int yymx; +++#endif +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sSyntax Error!\n",yyTracePrompt); +++ } +++#endif +++#ifdef YYERRORSYMBOL +++ /* A syntax error has occurred. +++ ** The response to an error depends upon whether or not the +++ ** grammar defines an error token "ERROR". +++ ** +++ ** This is what we do if the grammar does define ERROR: +++ ** +++ ** * Call the %syntax_error function. +++ ** +++ ** * Begin popping the stack until we enter a state where +++ ** it is legal to shift the error symbol, then shift +++ ** the error symbol. +++ ** +++ ** * Set the error count to three. +++ ** +++ ** * Begin accepting and shifting new tokens. No new error +++ ** processing will occur until three tokens have been +++ ** shifted successfully. +++ ** +++ */ +++ if( yypParser->yyerrcnt<0 ){ +++ yy_syntax_error(yypParser,yymajor,yyminorunion); +++ } +++ yymx = yypParser->yystack[yypParser->yyidx].major; +++ if( yymx==YYERRORSYMBOL || yyerrorhit ){ +++#ifndef NDEBUG +++ if( yyTraceFILE ){ +++ fprintf(yyTraceFILE,"%sDiscard input token %s\n", +++ yyTracePrompt,yyTokenName[yymajor]); +++ } +++#endif +++ yy_destructor(yypParser, (YYCODETYPE)yymajor,&yyminorunion); +++ yymajor = YYNOCODE; +++ }else{ +++ while( +++ yypParser->yyidx >= 0 && +++ yymx != YYERRORSYMBOL && +++ (yyact = yy_find_reduce_action( +++ yypParser->yystack[yypParser->yyidx].stateno, +++ YYERRORSYMBOL)) >= YYNSTATE +++ ){ +++ yy_pop_parser_stack(yypParser); +++ } +++ if( yypParser->yyidx < 0 || yymajor==0 ){ +++ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); +++ yy_parse_failed(yypParser); +++ yymajor = YYNOCODE; +++ }else if( yymx!=YYERRORSYMBOL ){ +++ YYMINORTYPE u2; +++ u2.YYERRSYMDT = 0; +++ yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2); +++ } +++ } +++ yypParser->yyerrcnt = 3; +++ yyerrorhit = 1; +++#elif defined(YYNOERRORRECOVERY) +++ /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to +++ ** do any kind of error recovery. Instead, simply invoke the syntax +++ ** error routine and continue going as if nothing had happened. +++ ** +++ ** Applications can set this macro (for example inside %include) if +++ ** they intend to abandon the parse upon the first syntax error seen. +++ */ +++ yy_syntax_error(yypParser,yymajor,yyminorunion); +++ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); +++ yymajor = YYNOCODE; +++ +++#else /* YYERRORSYMBOL is not defined */ +++ /* This is what we do if the grammar does not define ERROR: +++ ** +++ ** * Report an error message, and throw away the input token. +++ ** +++ ** * If the input token is $, then fail the parse. +++ ** +++ ** As before, subsequent error messages are suppressed until +++ ** three input tokens have been successfully shifted. +++ */ +++ if( yypParser->yyerrcnt<=0 ){ +++ yy_syntax_error(yypParser,yymajor,yyminorunion); +++ } +++ yypParser->yyerrcnt = 3; +++ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); +++ if( yyendofinput ){ +++ yy_parse_failed(yypParser); +++ } +++ yymajor = YYNOCODE; +++#endif +++ } +++ }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 ); +++ return; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/parse.h ++@@ -0,0 +1,130 @@ +++#define TK_END_OF_FILE 1 +++#define TK_ILLEGAL 2 +++#define TK_SPACE 3 +++#define TK_UNCLOSED_STRING 4 +++#define TK_COMMENT 5 +++#define TK_FUNCTION 6 +++#define TK_COLUMN 7 +++#define TK_AGG_FUNCTION 8 +++#define TK_SEMI 9 +++#define TK_EXPLAIN 10 +++#define TK_BEGIN 11 +++#define TK_TRANSACTION 12 +++#define TK_COMMIT 13 +++#define TK_END 14 +++#define TK_ROLLBACK 15 +++#define TK_CREATE 16 +++#define TK_TABLE 17 +++#define TK_TEMP 18 +++#define TK_LP 19 +++#define TK_RP 20 +++#define TK_AS 21 +++#define TK_COMMA 22 +++#define TK_ID 23 +++#define TK_ABORT 24 +++#define TK_AFTER 25 +++#define TK_ASC 26 +++#define TK_ATTACH 27 +++#define TK_BEFORE 28 +++#define TK_CASCADE 29 +++#define TK_CLUSTER 30 +++#define TK_CONFLICT 31 +++#define TK_COPY 32 +++#define TK_DATABASE 33 +++#define TK_DEFERRED 34 +++#define TK_DELIMITERS 35 +++#define TK_DESC 36 +++#define TK_DETACH 37 +++#define TK_EACH 38 +++#define TK_FAIL 39 +++#define TK_FOR 40 +++#define TK_GLOB 41 +++#define TK_IGNORE 42 +++#define TK_IMMEDIATE 43 +++#define TK_INITIALLY 44 +++#define TK_INSTEAD 45 +++#define TK_LIKE 46 +++#define TK_MATCH 47 +++#define TK_KEY 48 +++#define TK_OF 49 +++#define TK_OFFSET 50 +++#define TK_PRAGMA 51 +++#define TK_RAISE 52 +++#define TK_REPLACE 53 +++#define TK_RESTRICT 54 +++#define TK_ROW 55 +++#define TK_STATEMENT 56 +++#define TK_TRIGGER 57 +++#define TK_VACUUM 58 +++#define TK_VIEW 59 +++#define TK_OR 60 +++#define TK_AND 61 +++#define TK_NOT 62 +++#define TK_EQ 63 +++#define TK_NE 64 +++#define TK_ISNULL 65 +++#define TK_NOTNULL 66 +++#define TK_IS 67 +++#define TK_BETWEEN 68 +++#define TK_IN 69 +++#define TK_GT 70 +++#define TK_GE 71 +++#define TK_LT 72 +++#define TK_LE 73 +++#define TK_BITAND 74 +++#define TK_BITOR 75 +++#define TK_LSHIFT 76 +++#define TK_RSHIFT 77 +++#define TK_PLUS 78 +++#define TK_MINUS 79 +++#define TK_STAR 80 +++#define TK_SLASH 81 +++#define TK_REM 82 +++#define TK_CONCAT 83 +++#define TK_UMINUS 84 +++#define TK_UPLUS 85 +++#define TK_BITNOT 86 +++#define TK_STRING 87 +++#define TK_JOIN_KW 88 +++#define TK_INTEGER 89 +++#define TK_CONSTRAINT 90 +++#define TK_DEFAULT 91 +++#define TK_FLOAT 92 +++#define TK_NULL 93 +++#define TK_PRIMARY 94 +++#define TK_UNIQUE 95 +++#define TK_CHECK 96 +++#define TK_REFERENCES 97 +++#define TK_COLLATE 98 +++#define TK_ON 99 +++#define TK_DELETE 100 +++#define TK_UPDATE 101 +++#define TK_INSERT 102 +++#define TK_SET 103 +++#define TK_DEFERRABLE 104 +++#define TK_FOREIGN 105 +++#define TK_DROP 106 +++#define TK_UNION 107 +++#define TK_ALL 108 +++#define TK_INTERSECT 109 +++#define TK_EXCEPT 110 +++#define TK_SELECT 111 +++#define TK_DISTINCT 112 +++#define TK_DOT 113 +++#define TK_FROM 114 +++#define TK_JOIN 115 +++#define TK_USING 116 +++#define TK_ORDER 117 +++#define TK_BY 118 +++#define TK_GROUP 119 +++#define TK_HAVING 120 +++#define TK_LIMIT 121 +++#define TK_WHERE 122 +++#define TK_INTO 123 +++#define TK_VALUES 124 +++#define TK_VARIABLE 125 +++#define TK_CASE 126 +++#define TK_WHEN 127 +++#define TK_THEN 128 +++#define TK_ELSE 129 +++#define TK_INDEX 130 ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/parse.y ++@@ -0,0 +1,897 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains SQLite's grammar for SQL. Process this file +++** using the lemon parser generator to generate C code that runs +++** the parser. Lemon will also generate a header file containing +++** numeric codes for all of the tokens. +++** +++** @(#) $Id$ +++*/ +++%token_prefix TK_ +++%token_type {Token} +++%default_type {Token} +++%extra_argument {Parse *pParse} +++%syntax_error { +++ if( pParse->zErrMsg==0 ){ +++ if( TOKEN.z[0] ){ +++ sqliteErrorMsg(pParse, "near \"%T\": syntax error", &TOKEN); +++ }else{ +++ sqliteErrorMsg(pParse, "incomplete SQL statement"); +++ } +++ } +++} +++%name sqliteParser +++%include { +++#include "sqliteInt.h" +++#include "parse.h" +++ +++/* +++** An instance of this structure holds information about the +++** LIMIT clause of a SELECT statement. +++*/ +++struct LimitVal { +++ int limit; /* The LIMIT value. -1 if there is no limit */ +++ int offset; /* The OFFSET. 0 if there is none */ +++}; +++ +++/* +++** An instance of the following structure describes the event of a +++** TRIGGER. "a" is the event type, one of TK_UPDATE, TK_INSERT, +++** TK_DELETE, or TK_INSTEAD. If the event is of the form +++** +++** UPDATE ON (a,b,c) +++** +++** Then the "b" IdList records the list "a,b,c". +++*/ +++struct TrigEvent { int a; IdList * b; }; +++ +++} // end %include +++ +++// These are extra tokens used by the lexer but never seen by the +++// parser. We put them in a rule so that the parser generator will +++// add them to the parse.h output file. +++// +++%nonassoc END_OF_FILE ILLEGAL SPACE UNCLOSED_STRING COMMENT FUNCTION +++ COLUMN AGG_FUNCTION. +++ +++// Input is a single SQL command +++input ::= cmdlist. +++cmdlist ::= cmdlist ecmd. +++cmdlist ::= ecmd. +++ecmd ::= explain cmdx SEMI. +++ecmd ::= SEMI. +++cmdx ::= cmd. { sqliteExec(pParse); } +++explain ::= EXPLAIN. { sqliteBeginParse(pParse, 1); } +++explain ::= . { sqliteBeginParse(pParse, 0); } +++ +++///////////////////// Begin and end transactions. //////////////////////////// +++// +++ +++cmd ::= BEGIN trans_opt onconf(R). {sqliteBeginTransaction(pParse,R);} +++trans_opt ::= . +++trans_opt ::= TRANSACTION. +++trans_opt ::= TRANSACTION nm. +++cmd ::= COMMIT trans_opt. {sqliteCommitTransaction(pParse);} +++cmd ::= END trans_opt. {sqliteCommitTransaction(pParse);} +++cmd ::= ROLLBACK trans_opt. {sqliteRollbackTransaction(pParse);} +++ +++///////////////////// The CREATE TABLE statement //////////////////////////// +++// +++cmd ::= create_table create_table_args. +++create_table ::= CREATE(X) temp(T) TABLE nm(Y). { +++ sqliteStartTable(pParse,&X,&Y,T,0); +++} +++%type temp {int} +++temp(A) ::= TEMP. {A = 1;} +++temp(A) ::= . {A = 0;} +++create_table_args ::= LP columnlist conslist_opt RP(X). { +++ sqliteEndTable(pParse,&X,0); +++} +++create_table_args ::= AS select(S). { +++ sqliteEndTable(pParse,0,S); +++ sqliteSelectDelete(S); +++} +++columnlist ::= columnlist COMMA column. +++columnlist ::= column. +++ +++// About the only information used for a column is the name of the +++// column. The type is always just "text". But the code will accept +++// an elaborate typename. Perhaps someday we'll do something with it. +++// +++column ::= columnid type carglist. +++columnid ::= nm(X). {sqliteAddColumn(pParse,&X);} +++ +++// An IDENTIFIER can be a generic identifier, or one of several +++// keywords. Any non-standard keyword can also be an identifier. +++// +++%type id {Token} +++id(A) ::= ID(X). {A = X;} +++ +++// The following directive causes tokens ABORT, AFTER, ASC, etc. to +++// fallback to ID if they will not parse as their original value. +++// This obviates the need for the "id" nonterminal. +++// +++%fallback ID +++ ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT +++ COPY DATABASE DEFERRED DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR +++ GLOB IGNORE IMMEDIATE INITIALLY INSTEAD LIKE MATCH KEY +++ OF OFFSET PRAGMA RAISE REPLACE RESTRICT ROW STATEMENT +++ TEMP TRIGGER VACUUM VIEW. +++ +++// Define operator precedence early so that this is the first occurance +++// of the operator tokens in the grammer. Keeping the operators together +++// causes them to be assigned integer values that are close together, +++// which keeps parser tables smaller. +++// +++%left OR. +++%left AND. +++%right NOT. +++%left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN. +++%left GT GE LT LE. +++%left BITAND BITOR LSHIFT RSHIFT. +++%left PLUS MINUS. +++%left STAR SLASH REM. +++%left CONCAT. +++%right UMINUS UPLUS BITNOT. +++ +++// And "ids" is an identifer-or-string. +++// +++%type ids {Token} +++ids(A) ::= ID(X). {A = X;} +++ids(A) ::= STRING(X). {A = X;} +++ +++// The name of a column or table can be any of the following: +++// +++%type nm {Token} +++nm(A) ::= ID(X). {A = X;} +++nm(A) ::= STRING(X). {A = X;} +++nm(A) ::= JOIN_KW(X). {A = X;} +++ +++type ::= . +++type ::= typename(X). {sqliteAddColumnType(pParse,&X,&X);} +++type ::= typename(X) LP signed RP(Y). {sqliteAddColumnType(pParse,&X,&Y);} +++type ::= typename(X) LP signed COMMA signed RP(Y). +++ {sqliteAddColumnType(pParse,&X,&Y);} +++%type typename {Token} +++typename(A) ::= ids(X). {A = X;} +++typename(A) ::= typename(X) ids. {A = X;} +++%type signed {int} +++signed(A) ::= INTEGER(X). { A = atoi(X.z); } +++signed(A) ::= PLUS INTEGER(X). { A = atoi(X.z); } +++signed(A) ::= MINUS INTEGER(X). { A = -atoi(X.z); } +++carglist ::= carglist carg. +++carglist ::= . +++carg ::= CONSTRAINT nm ccons. +++carg ::= ccons. +++carg ::= DEFAULT STRING(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT ID(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT INTEGER(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT PLUS INTEGER(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT MINUS INTEGER(X). {sqliteAddDefaultValue(pParse,&X,1);} +++carg ::= DEFAULT FLOAT(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT PLUS FLOAT(X). {sqliteAddDefaultValue(pParse,&X,0);} +++carg ::= DEFAULT MINUS FLOAT(X). {sqliteAddDefaultValue(pParse,&X,1);} +++carg ::= DEFAULT NULL. +++ +++// In addition to the type name, we also care about the primary key and +++// UNIQUE constraints. +++// +++ccons ::= NULL onconf. +++ccons ::= NOT NULL onconf(R). {sqliteAddNotNull(pParse, R);} +++ccons ::= PRIMARY KEY sortorder onconf(R). {sqliteAddPrimaryKey(pParse,0,R);} +++ccons ::= UNIQUE onconf(R). {sqliteCreateIndex(pParse,0,0,0,R,0,0);} +++ccons ::= CHECK LP expr RP onconf. +++ccons ::= REFERENCES nm(T) idxlist_opt(TA) refargs(R). +++ {sqliteCreateForeignKey(pParse,0,&T,TA,R);} +++ccons ::= defer_subclause(D). {sqliteDeferForeignKey(pParse,D);} +++ccons ::= COLLATE id(C). { +++ sqliteAddCollateType(pParse, sqliteCollateType(C.z, C.n)); +++} +++ +++// The next group of rules parses the arguments to a REFERENCES clause +++// that determine if the referential integrity checking is deferred or +++// or immediate and which determine what action to take if a ref-integ +++// check fails. +++// +++%type refargs {int} +++refargs(A) ::= . { A = OE_Restrict * 0x010101; } +++refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; } +++%type refarg {struct {int value; int mask;}} +++refarg(A) ::= MATCH nm. { A.value = 0; A.mask = 0x000000; } +++refarg(A) ::= ON DELETE refact(X). { A.value = X; A.mask = 0x0000ff; } +++refarg(A) ::= ON UPDATE refact(X). { A.value = X<<8; A.mask = 0x00ff00; } +++refarg(A) ::= ON INSERT refact(X). { A.value = X<<16; A.mask = 0xff0000; } +++%type refact {int} +++refact(A) ::= SET NULL. { A = OE_SetNull; } +++refact(A) ::= SET DEFAULT. { A = OE_SetDflt; } +++refact(A) ::= CASCADE. { A = OE_Cascade; } +++refact(A) ::= RESTRICT. { A = OE_Restrict; } +++%type defer_subclause {int} +++defer_subclause(A) ::= NOT DEFERRABLE init_deferred_pred_opt(X). {A = X;} +++defer_subclause(A) ::= DEFERRABLE init_deferred_pred_opt(X). {A = X;} +++%type init_deferred_pred_opt {int} +++init_deferred_pred_opt(A) ::= . {A = 0;} +++init_deferred_pred_opt(A) ::= INITIALLY DEFERRED. {A = 1;} +++init_deferred_pred_opt(A) ::= INITIALLY IMMEDIATE. {A = 0;} +++ +++// For the time being, the only constraint we care about is the primary +++// key and UNIQUE. Both create indices. +++// +++conslist_opt ::= . +++conslist_opt ::= COMMA conslist. +++conslist ::= conslist COMMA tcons. +++conslist ::= conslist tcons. +++conslist ::= tcons. +++tcons ::= CONSTRAINT nm. +++tcons ::= PRIMARY KEY LP idxlist(X) RP onconf(R). +++ {sqliteAddPrimaryKey(pParse,X,R);} +++tcons ::= UNIQUE LP idxlist(X) RP onconf(R). +++ {sqliteCreateIndex(pParse,0,0,X,R,0,0);} +++tcons ::= CHECK expr onconf. +++tcons ::= FOREIGN KEY LP idxlist(FA) RP +++ REFERENCES nm(T) idxlist_opt(TA) refargs(R) defer_subclause_opt(D). { +++ sqliteCreateForeignKey(pParse, FA, &T, TA, R); +++ sqliteDeferForeignKey(pParse, D); +++} +++%type defer_subclause_opt {int} +++defer_subclause_opt(A) ::= . {A = 0;} +++defer_subclause_opt(A) ::= defer_subclause(X). {A = X;} +++ +++// The following is a non-standard extension that allows us to declare the +++// default behavior when there is a constraint conflict. +++// +++%type onconf {int} +++%type orconf {int} +++%type resolvetype {int} +++onconf(A) ::= . { A = OE_Default; } +++onconf(A) ::= ON CONFLICT resolvetype(X). { A = X; } +++orconf(A) ::= . { A = OE_Default; } +++orconf(A) ::= OR resolvetype(X). { A = X; } +++resolvetype(A) ::= ROLLBACK. { A = OE_Rollback; } +++resolvetype(A) ::= ABORT. { A = OE_Abort; } +++resolvetype(A) ::= FAIL. { A = OE_Fail; } +++resolvetype(A) ::= IGNORE. { A = OE_Ignore; } +++resolvetype(A) ::= REPLACE. { A = OE_Replace; } +++ +++////////////////////////// The DROP TABLE ///////////////////////////////////// +++// +++cmd ::= DROP TABLE nm(X). {sqliteDropTable(pParse,&X,0);} +++ +++///////////////////// The CREATE VIEW statement ///////////////////////////// +++// +++cmd ::= CREATE(X) temp(T) VIEW nm(Y) AS select(S). { +++ sqliteCreateView(pParse, &X, &Y, S, T); +++} +++cmd ::= DROP VIEW nm(X). { +++ sqliteDropTable(pParse, &X, 1); +++} +++ +++//////////////////////// The SELECT statement ///////////////////////////////// +++// +++cmd ::= select(X). { +++ sqliteSelect(pParse, X, SRT_Callback, 0, 0, 0, 0); +++ sqliteSelectDelete(X); +++} +++ +++%type select {Select*} +++%destructor select {sqliteSelectDelete($$);} +++%type oneselect {Select*} +++%destructor oneselect {sqliteSelectDelete($$);} +++ +++select(A) ::= oneselect(X). {A = X;} +++select(A) ::= select(X) multiselect_op(Y) oneselect(Z). { +++ if( Z ){ +++ Z->op = Y; +++ Z->pPrior = X; +++ } +++ A = Z; +++} +++%type multiselect_op {int} +++multiselect_op(A) ::= UNION. {A = TK_UNION;} +++multiselect_op(A) ::= UNION ALL. {A = TK_ALL;} +++multiselect_op(A) ::= INTERSECT. {A = TK_INTERSECT;} +++multiselect_op(A) ::= EXCEPT. {A = TK_EXCEPT;} +++oneselect(A) ::= SELECT distinct(D) selcollist(W) from(X) where_opt(Y) +++ groupby_opt(P) having_opt(Q) orderby_opt(Z) limit_opt(L). { +++ A = sqliteSelectNew(W,X,Y,P,Q,Z,D,L.limit,L.offset); +++} +++ +++// The "distinct" nonterminal is true (1) if the DISTINCT keyword is +++// present and false (0) if it is not. +++// +++%type distinct {int} +++distinct(A) ::= DISTINCT. {A = 1;} +++distinct(A) ::= ALL. {A = 0;} +++distinct(A) ::= . {A = 0;} +++ +++// selcollist is a list of expressions that are to become the return +++// values of the SELECT statement. The "*" in statements like +++// "SELECT * FROM ..." is encoded as a special expression with an +++// opcode of TK_ALL. +++// +++%type selcollist {ExprList*} +++%destructor selcollist {sqliteExprListDelete($$);} +++%type sclp {ExprList*} +++%destructor sclp {sqliteExprListDelete($$);} +++sclp(A) ::= selcollist(X) COMMA. {A = X;} +++sclp(A) ::= . {A = 0;} +++selcollist(A) ::= sclp(P) expr(X) as(Y). { +++ A = sqliteExprListAppend(P,X,Y.n?&Y:0); +++} +++selcollist(A) ::= sclp(P) STAR. { +++ A = sqliteExprListAppend(P, sqliteExpr(TK_ALL, 0, 0, 0), 0); +++} +++selcollist(A) ::= sclp(P) nm(X) DOT STAR. { +++ Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0); +++ Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &X); +++ A = sqliteExprListAppend(P, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0); +++} +++ +++// An option "AS " phrase that can follow one of the expressions that +++// define the result set, or one of the tables in the FROM clause. +++// +++%type as {Token} +++as(X) ::= AS nm(Y). { X = Y; } +++as(X) ::= ids(Y). { X = Y; } +++as(X) ::= . { X.n = 0; } +++ +++ +++%type seltablist {SrcList*} +++%destructor seltablist {sqliteSrcListDelete($$);} +++%type stl_prefix {SrcList*} +++%destructor stl_prefix {sqliteSrcListDelete($$);} +++%type from {SrcList*} +++%destructor from {sqliteSrcListDelete($$);} +++ +++// A complete FROM clause. +++// +++from(A) ::= . {A = sqliteMalloc(sizeof(*A));} +++from(A) ::= FROM seltablist(X). {A = X;} +++ +++// "seltablist" is a "Select Table List" - the content of the FROM clause +++// in a SELECT statement. "stl_prefix" is a prefix of this list. +++// +++stl_prefix(A) ::= seltablist(X) joinop(Y). { +++ A = X; +++ if( A && A->nSrc>0 ) A->a[A->nSrc-1].jointype = Y; +++} +++stl_prefix(A) ::= . {A = 0;} +++seltablist(A) ::= stl_prefix(X) nm(Y) dbnm(D) as(Z) on_opt(N) using_opt(U). { +++ A = sqliteSrcListAppend(X,&Y,&D); +++ if( Z.n ) sqliteSrcListAddAlias(A,&Z); +++ if( N ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; } +++ else { sqliteExprDelete(N); } +++ } +++ if( U ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; } +++ else { sqliteIdListDelete(U); } +++ } +++} +++seltablist(A) ::= stl_prefix(X) LP seltablist_paren(S) RP +++ as(Z) on_opt(N) using_opt(U). { +++ A = sqliteSrcListAppend(X,0,0); +++ A->a[A->nSrc-1].pSelect = S; +++ if( Z.n ) sqliteSrcListAddAlias(A,&Z); +++ if( N ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; } +++ else { sqliteExprDelete(N); } +++ } +++ if( U ){ +++ if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; } +++ else { sqliteIdListDelete(U); } +++ } +++} +++ +++// A seltablist_paren nonterminal represents anything in a FROM that +++// is contained inside parentheses. This can be either a subquery or +++// a grouping of table and subqueries. +++// +++%type seltablist_paren {Select*} +++%destructor seltablist_paren {sqliteSelectDelete($$);} +++seltablist_paren(A) ::= select(S). {A = S;} +++seltablist_paren(A) ::= seltablist(F). { +++ A = sqliteSelectNew(0,F,0,0,0,0,0,-1,0); +++} +++ +++%type dbnm {Token} +++dbnm(A) ::= . {A.z=0; A.n=0;} +++dbnm(A) ::= DOT nm(X). {A = X;} +++ +++%type joinop {int} +++%type joinop2 {int} +++joinop(X) ::= COMMA. { X = JT_INNER; } +++joinop(X) ::= JOIN. { X = JT_INNER; } +++joinop(X) ::= JOIN_KW(A) JOIN. { X = sqliteJoinType(pParse,&A,0,0); } +++joinop(X) ::= JOIN_KW(A) nm(B) JOIN. { X = sqliteJoinType(pParse,&A,&B,0); } +++joinop(X) ::= JOIN_KW(A) nm(B) nm(C) JOIN. +++ { X = sqliteJoinType(pParse,&A,&B,&C); } +++ +++%type on_opt {Expr*} +++%destructor on_opt {sqliteExprDelete($$);} +++on_opt(N) ::= ON expr(E). {N = E;} +++on_opt(N) ::= . {N = 0;} +++ +++%type using_opt {IdList*} +++%destructor using_opt {sqliteIdListDelete($$);} +++using_opt(U) ::= USING LP idxlist(L) RP. {U = L;} +++using_opt(U) ::= . {U = 0;} +++ +++ +++%type orderby_opt {ExprList*} +++%destructor orderby_opt {sqliteExprListDelete($$);} +++%type sortlist {ExprList*} +++%destructor sortlist {sqliteExprListDelete($$);} +++%type sortitem {Expr*} +++%destructor sortitem {sqliteExprDelete($$);} +++ +++orderby_opt(A) ::= . {A = 0;} +++orderby_opt(A) ::= ORDER BY sortlist(X). {A = X;} +++sortlist(A) ::= sortlist(X) COMMA sortitem(Y) collate(C) sortorder(Z). { +++ A = sqliteExprListAppend(X,Y,0); +++ if( A ) A->a[A->nExpr-1].sortOrder = C+Z; +++} +++sortlist(A) ::= sortitem(Y) collate(C) sortorder(Z). { +++ A = sqliteExprListAppend(0,Y,0); +++ if( A ) A->a[0].sortOrder = C+Z; +++} +++sortitem(A) ::= expr(X). {A = X;} +++ +++%type sortorder {int} +++%type collate {int} +++ +++sortorder(A) ::= ASC. {A = SQLITE_SO_ASC;} +++sortorder(A) ::= DESC. {A = SQLITE_SO_DESC;} +++sortorder(A) ::= . {A = SQLITE_SO_ASC;} +++collate(C) ::= . {C = SQLITE_SO_UNK;} +++collate(C) ::= COLLATE id(X). {C = sqliteCollateType(X.z, X.n);} +++ +++%type groupby_opt {ExprList*} +++%destructor groupby_opt {sqliteExprListDelete($$);} +++groupby_opt(A) ::= . {A = 0;} +++groupby_opt(A) ::= GROUP BY exprlist(X). {A = X;} +++ +++%type having_opt {Expr*} +++%destructor having_opt {sqliteExprDelete($$);} +++having_opt(A) ::= . {A = 0;} +++having_opt(A) ::= HAVING expr(X). {A = X;} +++ +++%type limit_opt {struct LimitVal} +++limit_opt(A) ::= . {A.limit = -1; A.offset = 0;} +++limit_opt(A) ::= LIMIT signed(X). {A.limit = X; A.offset = 0;} +++limit_opt(A) ::= LIMIT signed(X) OFFSET signed(Y). +++ {A.limit = X; A.offset = Y;} +++limit_opt(A) ::= LIMIT signed(X) COMMA signed(Y). +++ {A.limit = Y; A.offset = X;} +++ +++/////////////////////////// The DELETE statement ///////////////////////////// +++// +++cmd ::= DELETE FROM nm(X) dbnm(D) where_opt(Y). { +++ sqliteDeleteFrom(pParse, sqliteSrcListAppend(0,&X,&D), Y); +++} +++ +++%type where_opt {Expr*} +++%destructor where_opt {sqliteExprDelete($$);} +++ +++where_opt(A) ::= . {A = 0;} +++where_opt(A) ::= WHERE expr(X). {A = X;} +++ +++%type setlist {ExprList*} +++%destructor setlist {sqliteExprListDelete($$);} +++ +++////////////////////////// The UPDATE command //////////////////////////////// +++// +++cmd ::= UPDATE orconf(R) nm(X) dbnm(D) SET setlist(Y) where_opt(Z). +++ {sqliteUpdate(pParse,sqliteSrcListAppend(0,&X,&D),Y,Z,R);} +++ +++setlist(A) ::= setlist(Z) COMMA nm(X) EQ expr(Y). +++ {A = sqliteExprListAppend(Z,Y,&X);} +++setlist(A) ::= nm(X) EQ expr(Y). {A = sqliteExprListAppend(0,Y,&X);} +++ +++////////////////////////// The INSERT command ///////////////////////////////// +++// +++cmd ::= insert_cmd(R) INTO nm(X) dbnm(D) inscollist_opt(F) +++ VALUES LP itemlist(Y) RP. +++ {sqliteInsert(pParse, sqliteSrcListAppend(0,&X,&D), Y, 0, F, R);} +++cmd ::= insert_cmd(R) INTO nm(X) dbnm(D) inscollist_opt(F) select(S). +++ {sqliteInsert(pParse, sqliteSrcListAppend(0,&X,&D), 0, S, F, R);} +++ +++%type insert_cmd {int} +++insert_cmd(A) ::= INSERT orconf(R). {A = R;} +++insert_cmd(A) ::= REPLACE. {A = OE_Replace;} +++ +++ +++%type itemlist {ExprList*} +++%destructor itemlist {sqliteExprListDelete($$);} +++ +++itemlist(A) ::= itemlist(X) COMMA expr(Y). {A = sqliteExprListAppend(X,Y,0);} +++itemlist(A) ::= expr(X). {A = sqliteExprListAppend(0,X,0);} +++ +++%type inscollist_opt {IdList*} +++%destructor inscollist_opt {sqliteIdListDelete($$);} +++%type inscollist {IdList*} +++%destructor inscollist {sqliteIdListDelete($$);} +++ +++inscollist_opt(A) ::= . {A = 0;} +++inscollist_opt(A) ::= LP inscollist(X) RP. {A = X;} +++inscollist(A) ::= inscollist(X) COMMA nm(Y). {A = sqliteIdListAppend(X,&Y);} +++inscollist(A) ::= nm(Y). {A = sqliteIdListAppend(0,&Y);} +++ +++/////////////////////////// Expression Processing ///////////////////////////// +++// +++ +++%type expr {Expr*} +++%destructor expr {sqliteExprDelete($$);} +++ +++expr(A) ::= LP(B) expr(X) RP(E). {A = X; sqliteExprSpan(A,&B,&E); } +++expr(A) ::= NULL(X). {A = sqliteExpr(TK_NULL, 0, 0, &X);} +++expr(A) ::= ID(X). {A = sqliteExpr(TK_ID, 0, 0, &X);} +++expr(A) ::= JOIN_KW(X). {A = sqliteExpr(TK_ID, 0, 0, &X);} +++expr(A) ::= nm(X) DOT nm(Y). { +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y); +++ A = sqliteExpr(TK_DOT, temp1, temp2, 0); +++} +++expr(A) ::= nm(X) DOT nm(Y) DOT nm(Z). { +++ Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X); +++ Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y); +++ Expr *temp3 = sqliteExpr(TK_ID, 0, 0, &Z); +++ Expr *temp4 = sqliteExpr(TK_DOT, temp2, temp3, 0); +++ A = sqliteExpr(TK_DOT, temp1, temp4, 0); +++} +++expr(A) ::= INTEGER(X). {A = sqliteExpr(TK_INTEGER, 0, 0, &X);} +++expr(A) ::= FLOAT(X). {A = sqliteExpr(TK_FLOAT, 0, 0, &X);} +++expr(A) ::= STRING(X). {A = sqliteExpr(TK_STRING, 0, 0, &X);} +++expr(A) ::= VARIABLE(X). { +++ A = sqliteExpr(TK_VARIABLE, 0, 0, &X); +++ if( A ) A->iTable = ++pParse->nVar; +++} +++expr(A) ::= ID(X) LP exprlist(Y) RP(E). { +++ A = sqliteExprFunction(Y, &X); +++ sqliteExprSpan(A,&X,&E); +++} +++expr(A) ::= ID(X) LP STAR RP(E). { +++ A = sqliteExprFunction(0, &X); +++ sqliteExprSpan(A,&X,&E); +++} +++expr(A) ::= expr(X) AND expr(Y). {A = sqliteExpr(TK_AND, X, Y, 0);} +++expr(A) ::= expr(X) OR expr(Y). {A = sqliteExpr(TK_OR, X, Y, 0);} +++expr(A) ::= expr(X) LT expr(Y). {A = sqliteExpr(TK_LT, X, Y, 0);} +++expr(A) ::= expr(X) GT expr(Y). {A = sqliteExpr(TK_GT, X, Y, 0);} +++expr(A) ::= expr(X) LE expr(Y). {A = sqliteExpr(TK_LE, X, Y, 0);} +++expr(A) ::= expr(X) GE expr(Y). {A = sqliteExpr(TK_GE, X, Y, 0);} +++expr(A) ::= expr(X) NE expr(Y). {A = sqliteExpr(TK_NE, X, Y, 0);} +++expr(A) ::= expr(X) EQ expr(Y). {A = sqliteExpr(TK_EQ, X, Y, 0);} +++expr(A) ::= expr(X) BITAND expr(Y). {A = sqliteExpr(TK_BITAND, X, Y, 0);} +++expr(A) ::= expr(X) BITOR expr(Y). {A = sqliteExpr(TK_BITOR, X, Y, 0);} +++expr(A) ::= expr(X) LSHIFT expr(Y). {A = sqliteExpr(TK_LSHIFT, X, Y, 0);} +++expr(A) ::= expr(X) RSHIFT expr(Y). {A = sqliteExpr(TK_RSHIFT, X, Y, 0);} +++expr(A) ::= expr(X) likeop(OP) expr(Y). [LIKE] { +++ ExprList *pList = sqliteExprListAppend(0, Y, 0); +++ pList = sqliteExprListAppend(pList, X, 0); +++ A = sqliteExprFunction(pList, 0); +++ if( A ) A->op = OP; +++ sqliteExprSpan(A, &X->span, &Y->span); +++} +++expr(A) ::= expr(X) NOT likeop(OP) expr(Y). [LIKE] { +++ ExprList *pList = sqliteExprListAppend(0, Y, 0); +++ pList = sqliteExprListAppend(pList, X, 0); +++ A = sqliteExprFunction(pList, 0); +++ if( A ) A->op = OP; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,&Y->span); +++} +++%type likeop {int} +++likeop(A) ::= LIKE. {A = TK_LIKE;} +++likeop(A) ::= GLOB. {A = TK_GLOB;} +++expr(A) ::= expr(X) PLUS expr(Y). {A = sqliteExpr(TK_PLUS, X, Y, 0);} +++expr(A) ::= expr(X) MINUS expr(Y). {A = sqliteExpr(TK_MINUS, X, Y, 0);} +++expr(A) ::= expr(X) STAR expr(Y). {A = sqliteExpr(TK_STAR, X, Y, 0);} +++expr(A) ::= expr(X) SLASH expr(Y). {A = sqliteExpr(TK_SLASH, X, Y, 0);} +++expr(A) ::= expr(X) REM expr(Y). {A = sqliteExpr(TK_REM, X, Y, 0);} +++expr(A) ::= expr(X) CONCAT expr(Y). {A = sqliteExpr(TK_CONCAT, X, Y, 0);} +++expr(A) ::= expr(X) ISNULL(E). { +++ A = sqliteExpr(TK_ISNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IS NULL(E). { +++ A = sqliteExpr(TK_ISNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOTNULL(E). { +++ A = sqliteExpr(TK_NOTNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOT NULL(E). { +++ A = sqliteExpr(TK_NOTNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IS NOT NULL(E). { +++ A = sqliteExpr(TK_NOTNULL, X, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= NOT(B) expr(X). { +++ A = sqliteExpr(TK_NOT, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= BITNOT(B) expr(X). { +++ A = sqliteExpr(TK_BITNOT, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= MINUS(B) expr(X). [UMINUS] { +++ A = sqliteExpr(TK_UMINUS, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= PLUS(B) expr(X). [UPLUS] { +++ A = sqliteExpr(TK_UPLUS, X, 0, 0); +++ sqliteExprSpan(A,&B,&X->span); +++} +++expr(A) ::= LP(B) select(X) RP(E). { +++ A = sqliteExpr(TK_SELECT, 0, 0, 0); +++ if( A ) A->pSelect = X; +++ sqliteExprSpan(A,&B,&E); +++} +++expr(A) ::= expr(W) BETWEEN expr(X) AND expr(Y). { +++ ExprList *pList = sqliteExprListAppend(0, X, 0); +++ pList = sqliteExprListAppend(pList, Y, 0); +++ A = sqliteExpr(TK_BETWEEN, W, 0, 0); +++ if( A ) A->pList = pList; +++ sqliteExprSpan(A,&W->span,&Y->span); +++} +++expr(A) ::= expr(W) NOT BETWEEN expr(X) AND expr(Y). { +++ ExprList *pList = sqliteExprListAppend(0, X, 0); +++ pList = sqliteExprListAppend(pList, Y, 0); +++ A = sqliteExpr(TK_BETWEEN, W, 0, 0); +++ if( A ) A->pList = pList; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&W->span,&Y->span); +++} +++expr(A) ::= expr(X) IN LP exprlist(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pList = Y; +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IN LP select(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = Y; +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOT IN LP exprlist(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pList = Y; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) NOT IN LP select(Y) RP(E). { +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = Y; +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,&E); +++} +++expr(A) ::= expr(X) IN nm(Y) dbnm(D). { +++ SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D); +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ sqliteExprSpan(A,&X->span,D.z?&D:&Y); +++} +++expr(A) ::= expr(X) NOT IN nm(Y) dbnm(D). { +++ SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D); +++ A = sqliteExpr(TK_IN, X, 0, 0); +++ if( A ) A->pSelect = sqliteSelectNew(0,pSrc,0,0,0,0,0,-1,0); +++ A = sqliteExpr(TK_NOT, A, 0, 0); +++ sqliteExprSpan(A,&X->span,D.z?&D:&Y); +++} +++ +++ +++/* CASE expressions */ +++expr(A) ::= CASE(C) case_operand(X) case_exprlist(Y) case_else(Z) END(E). { +++ A = sqliteExpr(TK_CASE, X, Z, 0); +++ if( A ) A->pList = Y; +++ sqliteExprSpan(A, &C, &E); +++} +++%type case_exprlist {ExprList*} +++%destructor case_exprlist {sqliteExprListDelete($$);} +++case_exprlist(A) ::= case_exprlist(X) WHEN expr(Y) THEN expr(Z). { +++ A = sqliteExprListAppend(X, Y, 0); +++ A = sqliteExprListAppend(A, Z, 0); +++} +++case_exprlist(A) ::= WHEN expr(Y) THEN expr(Z). { +++ A = sqliteExprListAppend(0, Y, 0); +++ A = sqliteExprListAppend(A, Z, 0); +++} +++%type case_else {Expr*} +++case_else(A) ::= ELSE expr(X). {A = X;} +++case_else(A) ::= . {A = 0;} +++%type case_operand {Expr*} +++case_operand(A) ::= expr(X). {A = X;} +++case_operand(A) ::= . {A = 0;} +++ +++%type exprlist {ExprList*} +++%destructor exprlist {sqliteExprListDelete($$);} +++%type expritem {Expr*} +++%destructor expritem {sqliteExprDelete($$);} +++ +++exprlist(A) ::= exprlist(X) COMMA expritem(Y). +++ {A = sqliteExprListAppend(X,Y,0);} +++exprlist(A) ::= expritem(X). {A = sqliteExprListAppend(0,X,0);} +++expritem(A) ::= expr(X). {A = X;} +++expritem(A) ::= . {A = 0;} +++ +++///////////////////////////// The CREATE INDEX command /////////////////////// +++// +++cmd ::= CREATE(S) uniqueflag(U) INDEX nm(X) +++ ON nm(Y) dbnm(D) LP idxlist(Z) RP(E) onconf(R). { +++ SrcList *pSrc = sqliteSrcListAppend(0, &Y, &D); +++ if( U!=OE_None ) U = R; +++ if( U==OE_Default) U = OE_Abort; +++ sqliteCreateIndex(pParse, &X, pSrc, Z, U, &S, &E); +++} +++ +++%type uniqueflag {int} +++uniqueflag(A) ::= UNIQUE. { A = OE_Abort; } +++uniqueflag(A) ::= . { A = OE_None; } +++ +++%type idxlist {IdList*} +++%destructor idxlist {sqliteIdListDelete($$);} +++%type idxlist_opt {IdList*} +++%destructor idxlist_opt {sqliteIdListDelete($$);} +++%type idxitem {Token} +++ +++idxlist_opt(A) ::= . {A = 0;} +++idxlist_opt(A) ::= LP idxlist(X) RP. {A = X;} +++idxlist(A) ::= idxlist(X) COMMA idxitem(Y). {A = sqliteIdListAppend(X,&Y);} +++idxlist(A) ::= idxitem(Y). {A = sqliteIdListAppend(0,&Y);} +++idxitem(A) ::= nm(X) sortorder. {A = X;} +++ +++///////////////////////////// The DROP INDEX command ///////////////////////// +++// +++ +++cmd ::= DROP INDEX nm(X) dbnm(Y). { +++ sqliteDropIndex(pParse, sqliteSrcListAppend(0,&X,&Y)); +++} +++ +++ +++///////////////////////////// The COPY command /////////////////////////////// +++// +++cmd ::= COPY orconf(R) nm(X) dbnm(D) FROM nm(Y) USING DELIMITERS STRING(Z). +++ {sqliteCopy(pParse,sqliteSrcListAppend(0,&X,&D),&Y,&Z,R);} +++cmd ::= COPY orconf(R) nm(X) dbnm(D) FROM nm(Y). +++ {sqliteCopy(pParse,sqliteSrcListAppend(0,&X,&D),&Y,0,R);} +++ +++///////////////////////////// The VACUUM command ///////////////////////////// +++// +++cmd ::= VACUUM. {sqliteVacuum(pParse,0);} +++cmd ::= VACUUM nm(X). {sqliteVacuum(pParse,&X);} +++ +++///////////////////////////// The PRAGMA command ///////////////////////////// +++// +++cmd ::= PRAGMA ids(X) EQ nm(Y). {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X) EQ ON(Y). {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X) EQ plus_num(Y). {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X) EQ minus_num(Y). {sqlitePragma(pParse,&X,&Y,1);} +++cmd ::= PRAGMA ids(X) LP nm(Y) RP. {sqlitePragma(pParse,&X,&Y,0);} +++cmd ::= PRAGMA ids(X). {sqlitePragma(pParse,&X,&X,0);} +++plus_num(A) ::= plus_opt number(X). {A = X;} +++minus_num(A) ::= MINUS number(X). {A = X;} +++number(A) ::= INTEGER(X). {A = X;} +++number(A) ::= FLOAT(X). {A = X;} +++plus_opt ::= PLUS. +++plus_opt ::= . +++ +++//////////////////////////// The CREATE TRIGGER command ///////////////////// +++ +++cmd ::= CREATE(A) trigger_decl BEGIN trigger_cmd_list(S) END(Z). { +++ Token all; +++ all.z = A.z; +++ all.n = (Z.z - A.z) + Z.n; +++ sqliteFinishTrigger(pParse, S, &all); +++} +++ +++trigger_decl ::= temp(T) TRIGGER nm(B) trigger_time(C) trigger_event(D) +++ ON nm(E) dbnm(DB) foreach_clause(F) when_clause(G). { +++ SrcList *pTab = sqliteSrcListAppend(0, &E, &DB); +++ sqliteBeginTrigger(pParse, &B, C, D.a, D.b, pTab, F, G, T); +++} +++ +++%type trigger_time {int} +++trigger_time(A) ::= BEFORE. { A = TK_BEFORE; } +++trigger_time(A) ::= AFTER. { A = TK_AFTER; } +++trigger_time(A) ::= INSTEAD OF. { A = TK_INSTEAD;} +++trigger_time(A) ::= . { A = TK_BEFORE; } +++ +++%type trigger_event {struct TrigEvent} +++%destructor trigger_event {sqliteIdListDelete($$.b);} +++trigger_event(A) ::= DELETE. { A.a = TK_DELETE; A.b = 0; } +++trigger_event(A) ::= INSERT. { A.a = TK_INSERT; A.b = 0; } +++trigger_event(A) ::= UPDATE. { A.a = TK_UPDATE; A.b = 0;} +++trigger_event(A) ::= UPDATE OF inscollist(X). {A.a = TK_UPDATE; A.b = X; } +++ +++%type foreach_clause {int} +++foreach_clause(A) ::= . { A = TK_ROW; } +++foreach_clause(A) ::= FOR EACH ROW. { A = TK_ROW; } +++foreach_clause(A) ::= FOR EACH STATEMENT. { A = TK_STATEMENT; } +++ +++%type when_clause {Expr *} +++when_clause(A) ::= . { A = 0; } +++when_clause(A) ::= WHEN expr(X). { A = X; } +++ +++%type trigger_cmd_list {TriggerStep *} +++%destructor trigger_cmd_list {sqliteDeleteTriggerStep($$);} +++trigger_cmd_list(A) ::= trigger_cmd(X) SEMI trigger_cmd_list(Y). { +++ X->pNext = Y; +++ A = X; +++} +++trigger_cmd_list(A) ::= . { A = 0; } +++ +++%type trigger_cmd {TriggerStep *} +++%destructor trigger_cmd {sqliteDeleteTriggerStep($$);} +++// UPDATE +++trigger_cmd(A) ::= UPDATE orconf(R) nm(X) SET setlist(Y) where_opt(Z). +++ { A = sqliteTriggerUpdateStep(&X, Y, Z, R); } +++ +++// INSERT +++trigger_cmd(A) ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) +++ VALUES LP itemlist(Y) RP. +++{A = sqliteTriggerInsertStep(&X, F, Y, 0, R);} +++ +++trigger_cmd(A) ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) select(S). +++ {A = sqliteTriggerInsertStep(&X, F, 0, S, R);} +++ +++// DELETE +++trigger_cmd(A) ::= DELETE FROM nm(X) where_opt(Y). +++ {A = sqliteTriggerDeleteStep(&X, Y);} +++ +++// SELECT +++trigger_cmd(A) ::= select(X). {A = sqliteTriggerSelectStep(X); } +++ +++// The special RAISE expression that may occur in trigger programs +++expr(A) ::= RAISE(X) LP IGNORE RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, 0); +++ A->iColumn = OE_Ignore; +++ sqliteExprSpan(A, &X, &Y); +++} +++expr(A) ::= RAISE(X) LP ROLLBACK COMMA nm(Z) RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, &Z); +++ A->iColumn = OE_Rollback; +++ sqliteExprSpan(A, &X, &Y); +++} +++expr(A) ::= RAISE(X) LP ABORT COMMA nm(Z) RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, &Z); +++ A->iColumn = OE_Abort; +++ sqliteExprSpan(A, &X, &Y); +++} +++expr(A) ::= RAISE(X) LP FAIL COMMA nm(Z) RP(Y). { +++ A = sqliteExpr(TK_RAISE, 0, 0, &Z); +++ A->iColumn = OE_Fail; +++ sqliteExprSpan(A, &X, &Y); +++} +++ +++//////////////////////// DROP TRIGGER statement ////////////////////////////// +++cmd ::= DROP TRIGGER nm(X) dbnm(D). { +++ sqliteDropTrigger(pParse,sqliteSrcListAppend(0,&X,&D)); +++} +++ +++//////////////////////// ATTACH DATABASE file AS name ///////////////////////// +++cmd ::= ATTACH database_kw_opt ids(F) AS nm(D) key_opt(K). { +++ sqliteAttach(pParse, &F, &D, &K); +++} +++%type key_opt {Token} +++key_opt(A) ::= USING ids(X). { A = X; } +++key_opt(A) ::= . { A.z = 0; A.n = 0; } +++ +++database_kw_opt ::= DATABASE. +++database_kw_opt ::= . +++ +++//////////////////////// DETACH DATABASE name ///////////////////////////////// +++cmd ::= DETACH database_kw_opt nm(D). { +++ sqliteDetach(pParse, &D); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/pragma.c ++@@ -0,0 +1,712 @@ +++/* +++** 2003 April 6 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains code used to implement the PRAGMA command. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include +++ +++/* +++** Interpret the given string as a boolean value. +++*/ +++static int getBoolean(const char *z){ +++ static char *azTrue[] = { "yes", "on", "true" }; +++ int i; +++ if( z[0]==0 ) return 0; +++ if( isdigit(z[0]) || (z[0]=='-' && isdigit(z[1])) ){ +++ return atoi(z); +++ } +++ for(i=0; i='0' && z[0]<='2' ){ +++ return z[0] - '0'; +++ }else if( sqliteStrICmp(z, "file")==0 ){ +++ return 1; +++ }else if( sqliteStrICmp(z, "memory")==0 ){ +++ return 2; +++ }else{ +++ return 0; +++ } +++} +++ +++/* +++** If the TEMP database is open, close it and mark the database schema +++** as needing reloading. This must be done when using the TEMP_STORE +++** or DEFAULT_TEMP_STORE pragmas. +++*/ +++static int changeTempStorage(Parse *pParse, const char *zStorageType){ +++ int ts = getTempStore(zStorageType); +++ sqlite *db = pParse->db; +++ if( db->temp_store==ts ) return SQLITE_OK; +++ if( db->aDb[1].pBt!=0 ){ +++ if( db->flags & SQLITE_InTrans ){ +++ sqliteErrorMsg(pParse, "temporary storage cannot be changed " +++ "from within a transaction"); +++ return SQLITE_ERROR; +++ } +++ sqliteBtreeClose(db->aDb[1].pBt); +++ db->aDb[1].pBt = 0; +++ sqliteResetInternalSchema(db, 0); +++ } +++ db->temp_store = ts; +++ return SQLITE_OK; +++} +++ +++/* +++** Check to see if zRight and zLeft refer to a pragma that queries +++** or changes one of the flags in db->flags. Return 1 if so and 0 if not. +++** Also, implement the pragma. +++*/ +++static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ +++ static const struct { +++ const char *zName; /* Name of the pragma */ +++ int mask; /* Mask for the db->flags value */ +++ } aPragma[] = { +++ { "vdbe_trace", SQLITE_VdbeTrace }, +++ { "full_column_names", SQLITE_FullColNames }, +++ { "short_column_names", SQLITE_ShortColNames }, +++ { "show_datatypes", SQLITE_ReportTypes }, +++ { "count_changes", SQLITE_CountRows }, +++ { "empty_result_callbacks", SQLITE_NullCallback }, +++ }; +++ int i; +++ for(i=0; idb; +++ Vdbe *v; +++ if( strcmp(zLeft,zRight)==0 && (v = sqliteGetVdbe(pParse))!=0 ){ +++ sqliteVdbeOp3(v, OP_ColumnName, 0, 1, aPragma[i].zName, P3_STATIC); +++ sqliteVdbeOp3(v, OP_ColumnName, 1, 0, "boolean", P3_STATIC); +++ sqliteVdbeCode(v, OP_Integer, (db->flags & aPragma[i].mask)!=0, 0, +++ OP_Callback, 1, 0, +++ 0); +++ }else if( getBoolean(zRight) ){ +++ db->flags |= aPragma[i].mask; +++ }else{ +++ db->flags &= ~aPragma[i].mask; +++ } +++ return 1; +++ } +++ } +++ return 0; +++} +++ +++/* +++** Process a pragma statement. +++** +++** Pragmas are of this form: +++** +++** PRAGMA id = value +++** +++** The identifier might also be a string. The value is a string, and +++** identifier, or a number. If minusFlag is true, then the value is +++** a number that was preceded by a minus sign. +++*/ +++void sqlitePragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){ +++ char *zLeft = 0; +++ char *zRight = 0; +++ sqlite *db = pParse->db; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ +++ zLeft = sqliteStrNDup(pLeft->z, pLeft->n); +++ sqliteDequote(zLeft); +++ if( minusFlag ){ +++ zRight = 0; +++ sqliteSetNString(&zRight, "-", 1, pRight->z, pRight->n, 0); +++ }else{ +++ zRight = sqliteStrNDup(pRight->z, pRight->n); +++ sqliteDequote(zRight); +++ } +++ if( sqliteAuthCheck(pParse, SQLITE_PRAGMA, zLeft, zRight, 0) ){ +++ sqliteFree(zLeft); +++ sqliteFree(zRight); +++ return; +++ } +++ +++ /* +++ ** PRAGMA default_cache_size +++ ** PRAGMA default_cache_size=N +++ ** +++ ** The first form reports the current persistent setting for the +++ ** page cache size. The value returned is the maximum number of +++ ** pages in the page cache. The second form sets both the current +++ ** page cache size value and the persistent page cache size value +++ ** stored in the database file. +++ ** +++ ** The default cache size is stored in meta-value 2 of page 1 of the +++ ** database file. The cache size is actually the absolute value of +++ ** this memory location. The sign of meta-value 2 determines the +++ ** synchronous setting. A negative value means synchronous is off +++ ** and a positive value means synchronous is on. +++ */ +++ if( sqliteStrICmp(zLeft,"default_cache_size")==0 ){ +++ static VdbeOpList getCacheSize[] = { +++ { OP_ReadCookie, 0, 2, 0}, +++ { OP_AbsValue, 0, 0, 0}, +++ { OP_Dup, 0, 0, 0}, +++ { OP_Integer, 0, 0, 0}, +++ { OP_Ne, 0, 6, 0}, +++ { OP_Integer, 0, 0, 0}, /* 5 */ +++ { OP_ColumnName, 0, 1, "cache_size"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ int addr; +++ if( pRight->z==pLeft->z ){ +++ addr = sqliteVdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize); +++ sqliteVdbeChangeP1(v, addr+5, MAX_PAGES); +++ }else{ +++ int size = atoi(zRight); +++ if( size<0 ) size = -size; +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ sqliteVdbeAddOp(v, OP_Integer, size, 0); +++ sqliteVdbeAddOp(v, OP_ReadCookie, 0, 2); +++ addr = sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_Ge, 0, addr+3); +++ sqliteVdbeAddOp(v, OP_Negative, 0, 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 2); +++ sqliteEndWriteOperation(pParse); +++ db->cache_size = db->cache_size<0 ? -size : size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ } +++ }else +++ +++ /* +++ ** PRAGMA cache_size +++ ** PRAGMA cache_size=N +++ ** +++ ** The first form reports the current local setting for the +++ ** page cache size. The local setting can be different from +++ ** the persistent cache size value that is stored in the database +++ ** file itself. The value returned is the maximum number of +++ ** pages in the page cache. The second form sets the local +++ ** page cache size value. It does not change the persistent +++ ** cache size stored on the disk so the cache size will revert +++ ** to its default value when the database is closed and reopened. +++ ** N should be a positive integer. +++ */ +++ if( sqliteStrICmp(zLeft,"cache_size")==0 ){ +++ static VdbeOpList getCacheSize[] = { +++ { OP_ColumnName, 0, 1, "cache_size"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pRight->z==pLeft->z ){ +++ int size = db->cache_size;; +++ if( size<0 ) size = -size; +++ sqliteVdbeAddOp(v, OP_Integer, size, 0); +++ sqliteVdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize); +++ }else{ +++ int size = atoi(zRight); +++ if( size<0 ) size = -size; +++ if( db->cache_size<0 ) size = -size; +++ db->cache_size = size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ } +++ }else +++ +++ /* +++ ** PRAGMA default_synchronous +++ ** PRAGMA default_synchronous=ON|OFF|NORMAL|FULL +++ ** +++ ** The first form returns the persistent value of the "synchronous" setting +++ ** that is stored in the database. This is the synchronous setting that +++ ** is used whenever the database is opened unless overridden by a separate +++ ** "synchronous" pragma. The second form changes the persistent and the +++ ** local synchronous setting to the value given. +++ ** +++ ** If synchronous is OFF, SQLite does not attempt any fsync() systems calls +++ ** to make sure data is committed to disk. Write operations are very fast, +++ ** but a power failure can leave the database in an inconsistent state. +++ ** If synchronous is ON or NORMAL, SQLite will do an fsync() system call to +++ ** make sure data is being written to disk. The risk of corruption due to +++ ** a power loss in this mode is negligible but non-zero. If synchronous +++ ** is FULL, extra fsync()s occur to reduce the risk of corruption to near +++ ** zero, but with a write performance penalty. The default mode is NORMAL. +++ */ +++ if( sqliteStrICmp(zLeft,"default_synchronous")==0 ){ +++ static VdbeOpList getSync[] = { +++ { OP_ColumnName, 0, 1, "synchronous"}, +++ { OP_ReadCookie, 0, 3, 0}, +++ { OP_Dup, 0, 0, 0}, +++ { OP_If, 0, 0, 0}, /* 3 */ +++ { OP_ReadCookie, 0, 2, 0}, +++ { OP_Integer, 0, 0, 0}, +++ { OP_Lt, 0, 5, 0}, +++ { OP_AddImm, 1, 0, 0}, +++ { OP_Callback, 1, 0, 0}, +++ { OP_Halt, 0, 0, 0}, +++ { OP_AddImm, -1, 0, 0}, /* 10 */ +++ { OP_Callback, 1, 0, 0} +++ }; +++ if( pRight->z==pLeft->z ){ +++ int addr = sqliteVdbeAddOpList(v, ArraySize(getSync), getSync); +++ sqliteVdbeChangeP2(v, addr+3, addr+10); +++ }else{ +++ int addr; +++ int size = db->cache_size; +++ if( size<0 ) size = -size; +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ sqliteVdbeAddOp(v, OP_ReadCookie, 0, 2); +++ sqliteVdbeAddOp(v, OP_Dup, 0, 0); +++ addr = sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_Ne, 0, addr+3); +++ sqliteVdbeAddOp(v, OP_AddImm, MAX_PAGES, 0); +++ sqliteVdbeAddOp(v, OP_AbsValue, 0, 0); +++ db->safety_level = getSafetyLevel(zRight)+1; +++ if( db->safety_level==1 ){ +++ sqliteVdbeAddOp(v, OP_Negative, 0, 0); +++ size = -size; +++ } +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 2); +++ sqliteVdbeAddOp(v, OP_Integer, db->safety_level, 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 3); +++ sqliteEndWriteOperation(pParse); +++ db->cache_size = size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ sqliteBtreeSetSafetyLevel(db->aDb[0].pBt, db->safety_level); +++ } +++ }else +++ +++ /* +++ ** PRAGMA synchronous +++ ** PRAGMA synchronous=OFF|ON|NORMAL|FULL +++ ** +++ ** Return or set the local value of the synchronous flag. Changing +++ ** the local value does not make changes to the disk file and the +++ ** default value will be restored the next time the database is +++ ** opened. +++ */ +++ if( sqliteStrICmp(zLeft,"synchronous")==0 ){ +++ static VdbeOpList getSync[] = { +++ { OP_ColumnName, 0, 1, "synchronous"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pRight->z==pLeft->z ){ +++ sqliteVdbeAddOp(v, OP_Integer, db->safety_level-1, 0); +++ sqliteVdbeAddOpList(v, ArraySize(getSync), getSync); +++ }else{ +++ int size = db->cache_size; +++ if( size<0 ) size = -size; +++ db->safety_level = getSafetyLevel(zRight)+1; +++ if( db->safety_level==1 ) size = -size; +++ db->cache_size = size; +++ sqliteBtreeSetCacheSize(db->aDb[0].pBt, db->cache_size); +++ sqliteBtreeSetSafetyLevel(db->aDb[0].pBt, db->safety_level); +++ } +++ }else +++ +++#ifndef NDEBUG +++ if( sqliteStrICmp(zLeft, "trigger_overhead_test")==0 ){ +++ if( getBoolean(zRight) ){ +++ always_code_trigger_setup = 1; +++ }else{ +++ always_code_trigger_setup = 0; +++ } +++ }else +++#endif +++ +++ if( flagPragma(pParse, zLeft, zRight) ){ +++ /* The flagPragma() call also generates any necessary code */ +++ }else +++ +++ if( sqliteStrICmp(zLeft, "table_info")==0 ){ +++ Table *pTab; +++ pTab = sqliteFindTable(db, zRight, 0); +++ if( pTab ){ +++ static VdbeOpList tableInfoPreface[] = { +++ { OP_ColumnName, 0, 0, "cid"}, +++ { OP_ColumnName, 1, 0, "name"}, +++ { OP_ColumnName, 2, 0, "type"}, +++ { OP_ColumnName, 3, 0, "notnull"}, +++ { OP_ColumnName, 4, 0, "dflt_value"}, +++ { OP_ColumnName, 5, 1, "pk"}, +++ }; +++ int i; +++ sqliteVdbeAddOpList(v, ArraySize(tableInfoPreface), tableInfoPreface); +++ sqliteViewGetColumnNames(pParse, pTab); +++ for(i=0; inCol; i++){ +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[i].zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ pTab->aCol[i].zType ? pTab->aCol[i].zType : "numeric", 0); +++ sqliteVdbeAddOp(v, OP_Integer, pTab->aCol[i].notNull, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ pTab->aCol[i].zDflt, P3_STATIC); +++ sqliteVdbeAddOp(v, OP_Integer, pTab->aCol[i].isPrimKey, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 6, 0); +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "index_info")==0 ){ +++ Index *pIdx; +++ Table *pTab; +++ pIdx = sqliteFindIndex(db, zRight, 0); +++ if( pIdx ){ +++ static VdbeOpList tableInfoPreface[] = { +++ { OP_ColumnName, 0, 0, "seqno"}, +++ { OP_ColumnName, 1, 0, "cid"}, +++ { OP_ColumnName, 2, 1, "name"}, +++ }; +++ int i; +++ pTab = pIdx->pTable; +++ sqliteVdbeAddOpList(v, ArraySize(tableInfoPreface), tableInfoPreface); +++ for(i=0; inColumn; i++){ +++ int cnum = pIdx->aiColumn[i]; +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeAddOp(v, OP_Integer, cnum, 0); +++ assert( pTab->nCol>cnum ); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pTab->aCol[cnum].zName, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 3, 0); +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "index_list")==0 ){ +++ Index *pIdx; +++ Table *pTab; +++ pTab = sqliteFindTable(db, zRight, 0); +++ if( pTab ){ +++ v = sqliteGetVdbe(pParse); +++ pIdx = pTab->pIndex; +++ } +++ if( pTab && pIdx ){ +++ int i = 0; +++ static VdbeOpList indexListPreface[] = { +++ { OP_ColumnName, 0, 0, "seq"}, +++ { OP_ColumnName, 1, 0, "name"}, +++ { OP_ColumnName, 2, 1, "unique"}, +++ }; +++ +++ sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface); +++ while(pIdx){ +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pIdx->zName, 0); +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->onError!=OE_None, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 3, 0); +++ ++i; +++ pIdx = pIdx->pNext; +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "foreign_key_list")==0 ){ +++ FKey *pFK; +++ Table *pTab; +++ pTab = sqliteFindTable(db, zRight, 0); +++ if( pTab ){ +++ v = sqliteGetVdbe(pParse); +++ pFK = pTab->pFKey; +++ } +++ if( pTab && pFK ){ +++ int i = 0; +++ static VdbeOpList indexListPreface[] = { +++ { OP_ColumnName, 0, 0, "id"}, +++ { OP_ColumnName, 1, 0, "seq"}, +++ { OP_ColumnName, 2, 0, "table"}, +++ { OP_ColumnName, 3, 0, "from"}, +++ { OP_ColumnName, 4, 1, "to"}, +++ }; +++ +++ sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface); +++ while(pFK){ +++ int j; +++ for(j=0; jnCol; j++){ +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeAddOp(v, OP_Integer, j, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pFK->zTo, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ pTab->aCol[pFK->aCol[j].iFrom].zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, pFK->aCol[j].zCol, 0); +++ sqliteVdbeAddOp(v, OP_Callback, 5, 0); +++ } +++ ++i; +++ pFK = pFK->pNextFrom; +++ } +++ } +++ }else +++ +++ if( sqliteStrICmp(zLeft, "database_list")==0 ){ +++ int i; +++ static VdbeOpList indexListPreface[] = { +++ { OP_ColumnName, 0, 0, "seq"}, +++ { OP_ColumnName, 1, 0, "name"}, +++ { OP_ColumnName, 2, 1, "file"}, +++ }; +++ +++ sqliteVdbeAddOpList(v, ArraySize(indexListPreface), indexListPreface); +++ for(i=0; inDb; i++){ +++ if( db->aDb[i].pBt==0 ) continue; +++ assert( db->aDb[i].zName!=0 ); +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, db->aDb[i].zName, 0); +++ sqliteVdbeOp3(v, OP_String, 0, 0, +++ sqliteBtreeGetFilename(db->aDb[i].pBt), 0); +++ sqliteVdbeAddOp(v, OP_Callback, 3, 0); +++ } +++ }else +++ +++ +++ /* +++ ** PRAGMA temp_store +++ ** PRAGMA temp_store = "default"|"memory"|"file" +++ ** +++ ** Return or set the local value of the temp_store flag. Changing +++ ** the local value does not make changes to the disk file and the default +++ ** value will be restored the next time the database is opened. +++ ** +++ ** Note that it is possible for the library compile-time options to +++ ** override this setting +++ */ +++ if( sqliteStrICmp(zLeft, "temp_store")==0 ){ +++ static VdbeOpList getTmpDbLoc[] = { +++ { OP_ColumnName, 0, 1, "temp_store"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pRight->z==pLeft->z ){ +++ sqliteVdbeAddOp(v, OP_Integer, db->temp_store, 0); +++ sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc); +++ }else{ +++ changeTempStorage(pParse, zRight); +++ } +++ }else +++ +++ /* +++ ** PRAGMA default_temp_store +++ ** PRAGMA default_temp_store = "default"|"memory"|"file" +++ ** +++ ** Return or set the value of the persistent temp_store flag. Any +++ ** change does not take effect until the next time the database is +++ ** opened. +++ ** +++ ** Note that it is possible for the library compile-time options to +++ ** override this setting +++ */ +++ if( sqliteStrICmp(zLeft, "default_temp_store")==0 ){ +++ static VdbeOpList getTmpDbLoc[] = { +++ { OP_ColumnName, 0, 1, "temp_store"}, +++ { OP_ReadCookie, 0, 5, 0}, +++ { OP_Callback, 1, 0, 0}}; +++ if( pRight->z==pLeft->z ){ +++ sqliteVdbeAddOpList(v, ArraySize(getTmpDbLoc), getTmpDbLoc); +++ }else{ +++ sqliteBeginWriteOperation(pParse, 0, 0); +++ sqliteVdbeAddOp(v, OP_Integer, getTempStore(zRight), 0); +++ sqliteVdbeAddOp(v, OP_SetCookie, 0, 5); +++ sqliteEndWriteOperation(pParse); +++ } +++ }else +++ +++#ifndef NDEBUG +++ if( sqliteStrICmp(zLeft, "parser_trace")==0 ){ +++ extern void sqliteParserTrace(FILE*, char *); +++ if( getBoolean(zRight) ){ +++ sqliteParserTrace(stdout, "parser: "); +++ }else{ +++ sqliteParserTrace(0, 0); +++ } +++ }else +++#endif +++ +++ if( sqliteStrICmp(zLeft, "integrity_check")==0 ){ +++ int i, j, addr; +++ +++ /* Code that initializes the integrity check program. Set the +++ ** error count 0 +++ */ +++ static VdbeOpList initCode[] = { +++ { OP_Integer, 0, 0, 0}, +++ { OP_MemStore, 0, 1, 0}, +++ { OP_ColumnName, 0, 1, "integrity_check"}, +++ }; +++ +++ /* Code to do an BTree integrity check on a single database file. +++ */ +++ static VdbeOpList checkDb[] = { +++ { OP_SetInsert, 0, 0, "2"}, +++ { OP_Integer, 0, 0, 0}, /* 1 */ +++ { OP_OpenRead, 0, 2, 0}, +++ { OP_Rewind, 0, 7, 0}, /* 3 */ +++ { OP_Column, 0, 3, 0}, /* 4 */ +++ { OP_SetInsert, 0, 0, 0}, +++ { OP_Next, 0, 4, 0}, /* 6 */ +++ { OP_IntegrityCk, 0, 0, 0}, /* 7 */ +++ { OP_Dup, 0, 1, 0}, +++ { OP_String, 0, 0, "ok"}, +++ { OP_StrEq, 0, 12, 0}, /* 10 */ +++ { OP_MemIncr, 0, 0, 0}, +++ { OP_String, 0, 0, "*** in database "}, +++ { OP_String, 0, 0, 0}, /* 13 */ +++ { OP_String, 0, 0, " ***\n"}, +++ { OP_Pull, 3, 0, 0}, +++ { OP_Concat, 4, 1, 0}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ +++ /* Code that appears at the end of the integrity check. If no error +++ ** messages have been generated, output OK. Otherwise output the +++ ** error message +++ */ +++ static VdbeOpList endCode[] = { +++ { OP_MemLoad, 0, 0, 0}, +++ { OP_Integer, 0, 0, 0}, +++ { OP_Ne, 0, 0, 0}, /* 2 */ +++ { OP_String, 0, 0, "ok"}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ +++ /* Initialize the VDBE program */ +++ sqliteVdbeAddOpList(v, ArraySize(initCode), initCode); +++ +++ /* Do an integrity check on each database file */ +++ for(i=0; inDb; i++){ +++ HashElem *x; +++ +++ /* Do an integrity check of the B-Tree +++ */ +++ addr = sqliteVdbeAddOpList(v, ArraySize(checkDb), checkDb); +++ sqliteVdbeChangeP1(v, addr+1, i); +++ sqliteVdbeChangeP2(v, addr+3, addr+7); +++ sqliteVdbeChangeP2(v, addr+6, addr+4); +++ sqliteVdbeChangeP2(v, addr+7, i); +++ sqliteVdbeChangeP2(v, addr+10, addr+ArraySize(checkDb)); +++ sqliteVdbeChangeP3(v, addr+13, db->aDb[i].zName, P3_STATIC); +++ +++ /* Make sure all the indices are constructed correctly. +++ */ +++ sqliteCodeVerifySchema(pParse, i); +++ for(x=sqliteHashFirst(&db->aDb[i].tblHash); x; x=sqliteHashNext(x)){ +++ Table *pTab = sqliteHashData(x); +++ Index *pIdx; +++ int loopTop; +++ +++ if( pTab->pIndex==0 ) continue; +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, 1, pTab->tnum, pTab->zName, 0); +++ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ +++ if( pIdx->tnum==0 ) continue; +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, j+2, pIdx->tnum, pIdx->zName, 0); +++ } +++ sqliteVdbeAddOp(v, OP_Integer, 0, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, 1, 1); +++ loopTop = sqliteVdbeAddOp(v, OP_Rewind, 1, 0); +++ sqliteVdbeAddOp(v, OP_MemIncr, 1, 0); +++ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ +++ int k, jmp2; +++ static VdbeOpList idxErr[] = { +++ { OP_MemIncr, 0, 0, 0}, +++ { OP_String, 0, 0, "rowid "}, +++ { OP_Recno, 1, 0, 0}, +++ { OP_String, 0, 0, " missing from index "}, +++ { OP_String, 0, 0, 0}, /* 4 */ +++ { OP_Concat, 4, 0, 0}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ sqliteVdbeAddOp(v, OP_Recno, 1, 0); +++ for(k=0; knColumn; k++){ +++ int idx = pIdx->aiColumn[k]; +++ if( idx==pTab->iPKey ){ +++ sqliteVdbeAddOp(v, OP_Recno, 1, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Column, 1, idx); +++ } +++ } +++ sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0); +++ if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx); +++ jmp2 = sqliteVdbeAddOp(v, OP_Found, j+2, 0); +++ addr = sqliteVdbeAddOpList(v, ArraySize(idxErr), idxErr); +++ sqliteVdbeChangeP3(v, addr+4, pIdx->zName, P3_STATIC); +++ sqliteVdbeChangeP2(v, jmp2, sqliteVdbeCurrentAddr(v)); +++ } +++ sqliteVdbeAddOp(v, OP_Next, 1, loopTop+1); +++ sqliteVdbeChangeP2(v, loopTop, sqliteVdbeCurrentAddr(v)); +++ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ +++ static VdbeOpList cntIdx[] = { +++ { OP_Integer, 0, 0, 0}, +++ { OP_MemStore, 2, 1, 0}, +++ { OP_Rewind, 0, 0, 0}, /* 2 */ +++ { OP_MemIncr, 2, 0, 0}, +++ { OP_Next, 0, 0, 0}, /* 4 */ +++ { OP_MemLoad, 1, 0, 0}, +++ { OP_MemLoad, 2, 0, 0}, +++ { OP_Eq, 0, 0, 0}, /* 7 */ +++ { OP_MemIncr, 0, 0, 0}, +++ { OP_String, 0, 0, "wrong # of entries in index "}, +++ { OP_String, 0, 0, 0}, /* 10 */ +++ { OP_Concat, 2, 0, 0}, +++ { OP_Callback, 1, 0, 0}, +++ }; +++ if( pIdx->tnum==0 ) continue; +++ addr = sqliteVdbeAddOpList(v, ArraySize(cntIdx), cntIdx); +++ sqliteVdbeChangeP1(v, addr+2, j+2); +++ sqliteVdbeChangeP2(v, addr+2, addr+5); +++ sqliteVdbeChangeP1(v, addr+4, j+2); +++ sqliteVdbeChangeP2(v, addr+4, addr+3); +++ sqliteVdbeChangeP2(v, addr+7, addr+ArraySize(cntIdx)); +++ sqliteVdbeChangeP3(v, addr+10, pIdx->zName, P3_STATIC); +++ } +++ } +++ } +++ addr = sqliteVdbeAddOpList(v, ArraySize(endCode), endCode); +++ sqliteVdbeChangeP2(v, addr+2, addr+ArraySize(endCode)); +++ }else +++ +++ {} +++ sqliteFree(zLeft); +++ sqliteFree(zRight); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/printf.c ++@@ -0,0 +1,858 @@ +++/* +++** The "printf" code that follows dates from the 1980's. It is in +++** the public domain. The original comments are included here for +++** completeness. They are very out-of-date but might be useful as +++** an historical reference. Most of the "enhancements" have been backed +++** out so that the functionality is now the same as standard printf(). +++** +++************************************************************************** +++** +++** The following modules is an enhanced replacement for the "printf" subroutines +++** found in the standard C library. The following enhancements are +++** supported: +++** +++** + Additional functions. The standard set of "printf" functions +++** includes printf, fprintf, sprintf, vprintf, vfprintf, and +++** vsprintf. This module adds the following: +++** +++** * snprintf -- Works like sprintf, but has an extra argument +++** which is the size of the buffer written to. +++** +++** * mprintf -- Similar to sprintf. Writes output to memory +++** obtained from malloc. +++** +++** * xprintf -- Calls a function to dispose of output. +++** +++** * nprintf -- No output, but returns the number of characters +++** that would have been output by printf. +++** +++** * A v- version (ex: vsnprintf) of every function is also +++** supplied. +++** +++** + A few extensions to the formatting notation are supported: +++** +++** * The "=" flag (similar to "-") causes the output to be +++** be centered in the appropriately sized field. +++** +++** * The %b field outputs an integer in binary notation. +++** +++** * The %c field now accepts a precision. The character output +++** is repeated by the number of times the precision specifies. +++** +++** * The %' field works like %c, but takes as its character the +++** next character of the format string, instead of the next +++** argument. For example, printf("%.78'-") prints 78 minus +++** signs, the same as printf("%.78c",'-'). +++** +++** + When compiled using GCC on a SPARC, this version of printf is +++** faster than the library printf for SUN OS 4.1. +++** +++** + All functions are fully reentrant. +++** +++*/ +++#include "sqliteInt.h" +++ +++/* +++** Conversion types fall into various categories as defined by the +++** following enumeration. +++*/ +++#define etRADIX 1 /* Integer types. %d, %x, %o, and so forth */ +++#define etFLOAT 2 /* Floating point. %f */ +++#define etEXP 3 /* Exponentional notation. %e and %E */ +++#define etGENERIC 4 /* Floating or exponential, depending on exponent. %g */ +++#define etSIZE 5 /* Return number of characters processed so far. %n */ +++#define etSTRING 6 /* Strings. %s */ +++#define etDYNSTRING 7 /* Dynamically allocated strings. %z */ +++#define etPERCENT 8 /* Percent symbol. %% */ +++#define etCHARX 9 /* Characters. %c */ +++#define etERROR 10 /* Used to indicate no such conversion type */ +++/* The rest are extensions, not normally found in printf() */ +++#define etCHARLIT 11 /* Literal characters. %' */ +++#define etSQLESCAPE 12 /* Strings with '\'' doubled. %q */ +++#define etSQLESCAPE2 13 /* Strings with '\'' doubled and enclosed in '', +++ NULL pointers replaced by SQL NULL. %Q */ +++#define etTOKEN 14 /* a pointer to a Token structure */ +++#define etSRCLIST 15 /* a pointer to a SrcList */ +++ +++ +++/* +++** An "etByte" is an 8-bit unsigned value. +++*/ +++typedef unsigned char etByte; +++ +++/* +++** Each builtin conversion character (ex: the 'd' in "%d") is described +++** by an instance of the following structure +++*/ +++typedef struct et_info { /* Information about each format field */ +++ char fmttype; /* The format field code letter */ +++ etByte base; /* The base for radix conversion */ +++ etByte flags; /* One or more of FLAG_ constants below */ +++ etByte type; /* Conversion paradigm */ +++ char *charset; /* The character set for conversion */ +++ char *prefix; /* Prefix on non-zero values in alt format */ +++} et_info; +++ +++/* +++** Allowed values for et_info.flags +++*/ +++#define FLAG_SIGNED 1 /* True if the value to convert is signed */ +++#define FLAG_INTERN 2 /* True if for internal use only */ +++ +++ +++/* +++** The following table is searched linearly, so it is good to put the +++** most frequently used conversion types first. +++*/ +++static et_info fmtinfo[] = { +++ { 'd', 10, 1, etRADIX, "0123456789", 0 }, +++ { 's', 0, 0, etSTRING, 0, 0 }, +++ { 'z', 0, 2, etDYNSTRING, 0, 0 }, +++ { 'q', 0, 0, etSQLESCAPE, 0, 0 }, +++ { 'Q', 0, 0, etSQLESCAPE2, 0, 0 }, +++ { 'c', 0, 0, etCHARX, 0, 0 }, +++ { 'o', 8, 0, etRADIX, "01234567", "0" }, +++ { 'u', 10, 0, etRADIX, "0123456789", 0 }, +++ { 'x', 16, 0, etRADIX, "0123456789abcdef", "x0" }, +++ { 'X', 16, 0, etRADIX, "0123456789ABCDEF", "X0" }, +++ { 'f', 0, 1, etFLOAT, 0, 0 }, +++ { 'e', 0, 1, etEXP, "e", 0 }, +++ { 'E', 0, 1, etEXP, "E", 0 }, +++ { 'g', 0, 1, etGENERIC, "e", 0 }, +++ { 'G', 0, 1, etGENERIC, "E", 0 }, +++ { 'i', 10, 1, etRADIX, "0123456789", 0 }, +++ { 'n', 0, 0, etSIZE, 0, 0 }, +++ { '%', 0, 0, etPERCENT, 0, 0 }, +++ { 'p', 10, 0, etRADIX, "0123456789", 0 }, +++ { 'T', 0, 2, etTOKEN, 0, 0 }, +++ { 'S', 0, 2, etSRCLIST, 0, 0 }, +++}; +++#define etNINFO (sizeof(fmtinfo)/sizeof(fmtinfo[0])) +++ +++/* +++** If NOFLOATINGPOINT is defined, then none of the floating point +++** conversions will work. +++*/ +++#ifndef etNOFLOATINGPOINT +++/* +++** "*val" is a double such that 0.1 <= *val < 10.0 +++** Return the ascii code for the leading digit of *val, then +++** multiply "*val" by 10.0 to renormalize. +++** +++** Example: +++** input: *val = 3.14159 +++** output: *val = 1.4159 function return = '3' +++** +++** The counter *cnt is incremented each time. After counter exceeds +++** 16 (the number of significant digits in a 64-bit float) '0' is +++** always returned. +++*/ +++static int et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){ +++ int digit; +++ LONGDOUBLE_TYPE d; +++ if( (*cnt)++ >= 16 ) return '0'; +++ digit = (int)*val; +++ d = digit; +++ digit += '0'; +++ *val = (*val - d)*10.0; +++ return digit; +++} +++#endif +++ +++#define etBUFSIZE 1000 /* Size of the output buffer */ +++ +++/* +++** The root program. All variations call this core. +++** +++** INPUTS: +++** func This is a pointer to a function taking three arguments +++** 1. A pointer to anything. Same as the "arg" parameter. +++** 2. A pointer to the list of characters to be output +++** (Note, this list is NOT null terminated.) +++** 3. An integer number of characters to be output. +++** (Note: This number might be zero.) +++** +++** arg This is the pointer to anything which will be passed as the +++** first argument to "func". Use it for whatever you like. +++** +++** fmt This is the format string, as in the usual print. +++** +++** ap This is a pointer to a list of arguments. Same as in +++** vfprint. +++** +++** OUTPUTS: +++** The return value is the total number of characters sent to +++** the function "func". Returns -1 on a error. +++** +++** Note that the order in which automatic variables are declared below +++** seems to make a big difference in determining how fast this beast +++** will run. +++*/ +++static int vxprintf( +++ void (*func)(void*,const char*,int), /* Consumer of text */ +++ void *arg, /* First argument to the consumer */ +++ int useExtended, /* Allow extended %-conversions */ +++ const char *fmt, /* Format string */ +++ va_list ap /* arguments */ +++){ +++ int c; /* Next character in the format string */ +++ char *bufpt; /* Pointer to the conversion buffer */ +++ int precision; /* Precision of the current field */ +++ int length; /* Length of the field */ +++ int idx; /* A general purpose loop counter */ +++ int count; /* Total number of characters output */ +++ int width; /* Width of the current field */ +++ etByte flag_leftjustify; /* True if "-" flag is present */ +++ etByte flag_plussign; /* True if "+" flag is present */ +++ etByte flag_blanksign; /* True if " " flag is present */ +++ etByte flag_alternateform; /* True if "#" flag is present */ +++ etByte flag_zeropad; /* True if field width constant starts with zero */ +++ etByte flag_long; /* True if "l" flag is present */ +++ unsigned long longvalue; /* Value for integer types */ +++ LONGDOUBLE_TYPE realvalue; /* Value for real types */ +++ et_info *infop; /* Pointer to the appropriate info structure */ +++ char buf[etBUFSIZE]; /* Conversion buffer */ +++ char prefix; /* Prefix character. "+" or "-" or " " or '\0'. */ +++ etByte errorflag = 0; /* True if an error is encountered */ +++ etByte xtype; /* Conversion paradigm */ +++ char *zExtra; /* Extra memory used for etTCLESCAPE conversions */ +++ static char spaces[] = " "; +++#define etSPACESIZE (sizeof(spaces)-1) +++#ifndef etNOFLOATINGPOINT +++ int exp; /* exponent of real numbers */ +++ double rounder; /* Used for rounding floating point values */ +++ etByte flag_dp; /* True if decimal point should be shown */ +++ etByte flag_rtz; /* True if trailing zeros should be removed */ +++ etByte flag_exp; /* True to force display of the exponent */ +++ int nsd; /* Number of significant digits returned */ +++#endif +++ +++ func(arg,"",0); +++ count = length = 0; +++ bufpt = 0; +++ for(; (c=(*fmt))!=0; ++fmt){ +++ if( c!='%' ){ +++ int amt; +++ bufpt = (char *)fmt; +++ amt = 1; +++ while( (c=(*++fmt))!='%' && c!=0 ) amt++; +++ (*func)(arg,bufpt,amt); +++ count += amt; +++ if( c==0 ) break; +++ } +++ if( (c=(*++fmt))==0 ){ +++ errorflag = 1; +++ (*func)(arg,"%",1); +++ count++; +++ break; +++ } +++ /* Find out what flags are present */ +++ flag_leftjustify = flag_plussign = flag_blanksign = +++ flag_alternateform = flag_zeropad = 0; +++ do{ +++ switch( c ){ +++ case '-': flag_leftjustify = 1; c = 0; break; +++ case '+': flag_plussign = 1; c = 0; break; +++ case ' ': flag_blanksign = 1; c = 0; break; +++ case '#': flag_alternateform = 1; c = 0; break; +++ case '0': flag_zeropad = 1; c = 0; break; +++ default: break; +++ } +++ }while( c==0 && (c=(*++fmt))!=0 ); +++ /* Get the field width */ +++ width = 0; +++ if( c=='*' ){ +++ width = va_arg(ap,int); +++ if( width<0 ){ +++ flag_leftjustify = 1; +++ width = -width; +++ } +++ c = *++fmt; +++ }else{ +++ while( c>='0' && c<='9' ){ +++ width = width*10 + c - '0'; +++ c = *++fmt; +++ } +++ } +++ if( width > etBUFSIZE-10 ){ +++ width = etBUFSIZE-10; +++ } +++ /* Get the precision */ +++ if( c=='.' ){ +++ precision = 0; +++ c = *++fmt; +++ if( c=='*' ){ +++ precision = va_arg(ap,int); +++ if( precision<0 ) precision = -precision; +++ c = *++fmt; +++ }else{ +++ while( c>='0' && c<='9' ){ +++ precision = precision*10 + c - '0'; +++ c = *++fmt; +++ } +++ } +++ /* Limit the precision to prevent overflowing buf[] during conversion */ +++ if( precision>etBUFSIZE-40 ) precision = etBUFSIZE-40; +++ }else{ +++ precision = -1; +++ } +++ /* Get the conversion type modifier */ +++ if( c=='l' ){ +++ flag_long = 1; +++ c = *++fmt; +++ }else{ +++ flag_long = 0; +++ } +++ /* Fetch the info entry for the field */ +++ infop = 0; +++ xtype = etERROR; +++ for(idx=0; idxflags & FLAG_INTERN)==0 ){ +++ xtype = infop->type; +++ } +++ break; +++ } +++ } +++ zExtra = 0; +++ +++ /* +++ ** At this point, variables are initialized as follows: +++ ** +++ ** flag_alternateform TRUE if a '#' is present. +++ ** flag_plussign TRUE if a '+' is present. +++ ** flag_leftjustify TRUE if a '-' is present or if the +++ ** field width was negative. +++ ** flag_zeropad TRUE if the width began with 0. +++ ** flag_long TRUE if the letter 'l' (ell) prefixed +++ ** the conversion character. +++ ** flag_blanksign TRUE if a ' ' is present. +++ ** width The specified field width. This is +++ ** always non-negative. Zero is the default. +++ ** precision The specified precision. The default +++ ** is -1. +++ ** xtype The class of the conversion. +++ ** infop Pointer to the appropriate info struct. +++ */ +++ switch( xtype ){ +++ case etRADIX: +++ if( flag_long ) longvalue = va_arg(ap,long); +++ else longvalue = va_arg(ap,int); +++#if 1 +++ /* For the format %#x, the value zero is printed "0" not "0x0". +++ ** I think this is stupid. */ +++ if( longvalue==0 ) flag_alternateform = 0; +++#else +++ /* More sensible: turn off the prefix for octal (to prevent "00"), +++ ** but leave the prefix for hex. */ +++ if( longvalue==0 && infop->base==8 ) flag_alternateform = 0; +++#endif +++ if( infop->flags & FLAG_SIGNED ){ +++ if( *(long*)&longvalue<0 ){ +++ longvalue = -*(long*)&longvalue; +++ prefix = '-'; +++ }else if( flag_plussign ) prefix = '+'; +++ else if( flag_blanksign ) prefix = ' '; +++ else prefix = 0; +++ }else prefix = 0; +++ if( flag_zeropad && precisioncharset; +++ base = infop->base; +++ do{ /* Convert to ascii */ +++ *(--bufpt) = cset[longvalue%base]; +++ longvalue = longvalue/base; +++ }while( longvalue>0 ); +++ } +++ length = &buf[etBUFSIZE-1]-bufpt; +++ for(idx=precision-length; idx>0; idx--){ +++ *(--bufpt) = '0'; /* Zero pad */ +++ } +++ if( prefix ) *(--bufpt) = prefix; /* Add sign */ +++ if( flag_alternateform && infop->prefix ){ /* Add "0" or "0x" */ +++ char *pre, x; +++ pre = infop->prefix; +++ if( *bufpt!=pre[0] ){ +++ for(pre=infop->prefix; (x=(*pre))!=0; pre++) *(--bufpt) = x; +++ } +++ } +++ length = &buf[etBUFSIZE-1]-bufpt; +++ break; +++ case etFLOAT: +++ case etEXP: +++ case etGENERIC: +++ realvalue = va_arg(ap,double); +++#ifndef etNOFLOATINGPOINT +++ if( precision<0 ) precision = 6; /* Set default precision */ +++ if( precision>etBUFSIZE-10 ) precision = etBUFSIZE-10; +++ if( realvalue<0.0 ){ +++ realvalue = -realvalue; +++ prefix = '-'; +++ }else{ +++ if( flag_plussign ) prefix = '+'; +++ else if( flag_blanksign ) prefix = ' '; +++ else prefix = 0; +++ } +++ if( infop->type==etGENERIC && precision>0 ) precision--; +++ rounder = 0.0; +++#if 0 +++ /* Rounding works like BSD when the constant 0.4999 is used. Wierd! */ +++ for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1); +++#else +++ /* It makes more sense to use 0.5 */ +++ for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1); +++#endif +++ if( infop->type==etFLOAT ) realvalue += rounder; +++ /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */ +++ exp = 0; +++ if( realvalue>0.0 ){ +++ while( realvalue>=1e8 && exp<=350 ){ realvalue *= 1e-8; exp+=8; } +++ while( realvalue>=10.0 && exp<=350 ){ realvalue *= 0.1; exp++; } +++ while( realvalue<1e-8 && exp>=-350 ){ realvalue *= 1e8; exp-=8; } +++ while( realvalue<1.0 && exp>=-350 ){ realvalue *= 10.0; exp--; } +++ if( exp>350 || exp<-350 ){ +++ bufpt = "NaN"; +++ length = 3; +++ break; +++ } +++ } +++ bufpt = buf; +++ /* +++ ** If the field type is etGENERIC, then convert to either etEXP +++ ** or etFLOAT, as appropriate. +++ */ +++ flag_exp = xtype==etEXP; +++ if( xtype!=etFLOAT ){ +++ realvalue += rounder; +++ if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; } +++ } +++ if( xtype==etGENERIC ){ +++ flag_rtz = !flag_alternateform; +++ if( exp<-4 || exp>precision ){ +++ xtype = etEXP; +++ }else{ +++ precision = precision - exp; +++ xtype = etFLOAT; +++ } +++ }else{ +++ flag_rtz = 0; +++ } +++ /* +++ ** The "exp+precision" test causes output to be of type etEXP if +++ ** the precision is too large to fit in buf[]. +++ */ +++ nsd = 0; +++ if( xtype==etFLOAT && exp+precision0 || flag_alternateform); +++ if( prefix ) *(bufpt++) = prefix; /* Sign */ +++ if( exp<0 ) *(bufpt++) = '0'; /* Digits before "." */ +++ else for(; exp>=0; exp--) *(bufpt++) = et_getdigit(&realvalue,&nsd); +++ if( flag_dp ) *(bufpt++) = '.'; /* The decimal point */ +++ for(exp++; exp<0 && precision>0; precision--, exp++){ +++ *(bufpt++) = '0'; +++ } +++ while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd); +++ *(bufpt--) = 0; /* Null terminate */ +++ if( flag_rtz && flag_dp ){ /* Remove trailing zeros and "." */ +++ while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0; +++ if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0; +++ } +++ bufpt++; /* point to next free slot */ +++ }else{ /* etEXP or etGENERIC */ +++ flag_dp = (precision>0 || flag_alternateform); +++ if( prefix ) *(bufpt++) = prefix; /* Sign */ +++ *(bufpt++) = et_getdigit(&realvalue,&nsd); /* First digit */ +++ if( flag_dp ) *(bufpt++) = '.'; /* Decimal point */ +++ while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd); +++ bufpt--; /* point to last digit */ +++ if( flag_rtz && flag_dp ){ /* Remove tail zeros */ +++ while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0; +++ if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0; +++ } +++ bufpt++; /* point to next free slot */ +++ if( exp || flag_exp ){ +++ *(bufpt++) = infop->charset[0]; +++ if( exp<0 ){ *(bufpt++) = '-'; exp = -exp; } /* sign of exp */ +++ else { *(bufpt++) = '+'; } +++ if( exp>=100 ){ +++ *(bufpt++) = (exp/100)+'0'; /* 100's digit */ +++ exp %= 100; +++ } +++ *(bufpt++) = exp/10+'0'; /* 10's digit */ +++ *(bufpt++) = exp%10+'0'; /* 1's digit */ +++ } +++ } +++ /* The converted number is in buf[] and zero terminated. Output it. +++ ** Note that the number is in the usual order, not reversed as with +++ ** integer conversions. */ +++ length = bufpt-buf; +++ bufpt = buf; +++ +++ /* Special case: Add leading zeros if the flag_zeropad flag is +++ ** set and we are not left justified */ +++ if( flag_zeropad && !flag_leftjustify && length < width){ +++ int i; +++ int nPad = width - length; +++ for(i=width; i>=nPad; i--){ +++ bufpt[i] = bufpt[i-nPad]; +++ } +++ i = prefix!=0; +++ while( nPad-- ) bufpt[i++] = '0'; +++ length = width; +++ } +++#endif +++ break; +++ case etSIZE: +++ *(va_arg(ap,int*)) = count; +++ length = width = 0; +++ break; +++ case etPERCENT: +++ buf[0] = '%'; +++ bufpt = buf; +++ length = 1; +++ break; +++ case etCHARLIT: +++ case etCHARX: +++ c = buf[0] = (xtype==etCHARX ? va_arg(ap,int) : *++fmt); +++ if( precision>=0 ){ +++ for(idx=1; idx=0 && precisionetBUFSIZE ){ +++ bufpt = zExtra = sqliteMalloc( n ); +++ if( bufpt==0 ) return -1; +++ }else{ +++ bufpt = buf; +++ } +++ j = 0; +++ if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\''; +++ for(i=0; (c=arg[i])!=0; i++){ +++ bufpt[j++] = c; +++ if( c=='\'' ) bufpt[j++] = c; +++ } +++ if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\''; +++ bufpt[j] = 0; +++ length = j; +++ if( precision>=0 && precisionz, pToken->n); +++ length = width = 0; +++ break; +++ } +++ case etSRCLIST: { +++ SrcList *pSrc = va_arg(ap, SrcList*); +++ int k = va_arg(ap, int); +++ struct SrcList_item *pItem = &pSrc->a[k]; +++ assert( k>=0 && knSrc ); +++ if( pItem->zDatabase && pItem->zDatabase[0] ){ +++ (*func)(arg, pItem->zDatabase, strlen(pItem->zDatabase)); +++ (*func)(arg, ".", 1); +++ } +++ (*func)(arg, pItem->zName, strlen(pItem->zName)); +++ length = width = 0; +++ break; +++ } +++ case etERROR: +++ buf[0] = '%'; +++ buf[1] = c; +++ errorflag = 0; +++ idx = 1+(c!=0); +++ (*func)(arg,"%",idx); +++ count += idx; +++ if( c==0 ) fmt--; +++ break; +++ }/* End switch over the format type */ +++ /* +++ ** The text of the conversion is pointed to by "bufpt" and is +++ ** "length" characters long. The field width is "width". Do +++ ** the output. +++ */ +++ if( !flag_leftjustify ){ +++ register int nspace; +++ nspace = width-length; +++ if( nspace>0 ){ +++ count += nspace; +++ while( nspace>=etSPACESIZE ){ +++ (*func)(arg,spaces,etSPACESIZE); +++ nspace -= etSPACESIZE; +++ } +++ if( nspace>0 ) (*func)(arg,spaces,nspace); +++ } +++ } +++ if( length>0 ){ +++ (*func)(arg,bufpt,length); +++ count += length; +++ } +++ if( flag_leftjustify ){ +++ register int nspace; +++ nspace = width-length; +++ if( nspace>0 ){ +++ count += nspace; +++ while( nspace>=etSPACESIZE ){ +++ (*func)(arg,spaces,etSPACESIZE); +++ nspace -= etSPACESIZE; +++ } +++ if( nspace>0 ) (*func)(arg,spaces,nspace); +++ } +++ } +++ if( zExtra ){ +++ sqliteFree(zExtra); +++ } +++ }/* End for loop over the format string */ +++ return errorflag ? -1 : count; +++} /* End of function */ +++ +++ +++/* This structure is used to store state information about the +++** write to memory that is currently in progress. +++*/ +++struct sgMprintf { +++ char *zBase; /* A base allocation */ +++ char *zText; /* The string collected so far */ +++ int nChar; /* Length of the string so far */ +++ int nTotal; /* Output size if unconstrained */ +++ int nAlloc; /* Amount of space allocated in zText */ +++ void *(*xRealloc)(void*,int); /* Function used to realloc memory */ +++}; +++ +++/* +++** This function implements the callback from vxprintf. +++** +++** This routine add nNewChar characters of text in zNewText to +++** the sgMprintf structure pointed to by "arg". +++*/ +++static void mout(void *arg, const char *zNewText, int nNewChar){ +++ struct sgMprintf *pM = (struct sgMprintf*)arg; +++ pM->nTotal += nNewChar; +++ if( pM->nChar + nNewChar + 1 > pM->nAlloc ){ +++ if( pM->xRealloc==0 ){ +++ nNewChar = pM->nAlloc - pM->nChar - 1; +++ }else{ +++ pM->nAlloc = pM->nChar + nNewChar*2 + 1; +++ if( pM->zText==pM->zBase ){ +++ pM->zText = pM->xRealloc(0, pM->nAlloc); +++ if( pM->zText && pM->nChar ){ +++ memcpy(pM->zText, pM->zBase, pM->nChar); +++ } +++ }else{ +++ pM->zText = pM->xRealloc(pM->zText, pM->nAlloc); +++ } +++ } +++ } +++ if( pM->zText ){ +++ if( nNewChar>0 ){ +++ memcpy(&pM->zText[pM->nChar], zNewText, nNewChar); +++ pM->nChar += nNewChar; +++ } +++ pM->zText[pM->nChar] = 0; +++ } +++} +++ +++/* +++** This routine is a wrapper around xprintf() that invokes mout() as +++** the consumer. +++*/ +++static char *base_vprintf( +++ void *(*xRealloc)(void*,int), /* Routine to realloc memory. May be NULL */ +++ int useInternal, /* Use internal %-conversions if true */ +++ char *zInitBuf, /* Initially write here, before mallocing */ +++ int nInitBuf, /* Size of zInitBuf[] */ +++ const char *zFormat, /* format string */ +++ va_list ap /* arguments */ +++){ +++ struct sgMprintf sM; +++ sM.zBase = sM.zText = zInitBuf; +++ sM.nChar = sM.nTotal = 0; +++ sM.nAlloc = nInitBuf; +++ sM.xRealloc = xRealloc; +++ vxprintf(mout, &sM, useInternal, zFormat, ap); +++ if( xRealloc ){ +++ if( sM.zText==sM.zBase ){ +++ sM.zText = xRealloc(0, sM.nChar+1); +++ memcpy(sM.zText, sM.zBase, sM.nChar+1); +++ }else if( sM.nAlloc>sM.nChar+10 ){ +++ sM.zText = xRealloc(sM.zText, sM.nChar+1); +++ } +++ } +++ return sM.zText; +++} +++ +++/* +++** Realloc that is a real function, not a macro. +++*/ +++static void *printf_realloc(void *old, int size){ +++ return sqliteRealloc(old,size); +++} +++ +++/* +++** Print into memory obtained from sqliteMalloc(). Use the internal +++** %-conversion extensions. +++*/ +++char *sqliteVMPrintf(const char *zFormat, va_list ap){ +++ char zBase[1000]; +++ return base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap); +++} +++ +++/* +++** Print into memory obtained from sqliteMalloc(). Use the internal +++** %-conversion extensions. +++*/ +++char *sqliteMPrintf(const char *zFormat, ...){ +++ va_list ap; +++ char *z; +++ char zBase[1000]; +++ va_start(ap, zFormat); +++ z = base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap); +++ va_end(ap); +++ return z; +++} +++ +++/* +++** Print into memory obtained from malloc(). Do not use the internal +++** %-conversion extensions. This routine is for use by external users. +++*/ +++char *sqlite_mprintf(const char *zFormat, ...){ +++ va_list ap; +++ char *z; +++ char zBuf[200]; +++ +++ va_start(ap,zFormat); +++ z = base_vprintf((void*(*)(void*,int))realloc, 0, +++ zBuf, sizeof(zBuf), zFormat, ap); +++ va_end(ap); +++ return z; +++} +++ +++/* This is the varargs version of sqlite_mprintf. +++*/ +++char *sqlite_vmprintf(const char *zFormat, va_list ap){ +++ char zBuf[200]; +++ return base_vprintf((void*(*)(void*,int))realloc, 0, +++ zBuf, sizeof(zBuf), zFormat, ap); +++} +++ +++/* +++** sqlite_snprintf() works like snprintf() except that it ignores the +++** current locale settings. This is important for SQLite because we +++** are not able to use a "," as the decimal point in place of "." as +++** specified by some locales. +++*/ +++char *sqlite_snprintf(int n, char *zBuf, const char *zFormat, ...){ +++ char *z; +++ va_list ap; +++ +++ va_start(ap,zFormat); +++ z = base_vprintf(0, 0, zBuf, n, zFormat, ap); +++ va_end(ap); +++ return z; +++} +++ +++/* +++** The following four routines implement the varargs versions of the +++** sqlite_exec() and sqlite_get_table() interfaces. See the sqlite.h +++** header files for a more detailed description of how these interfaces +++** work. +++** +++** These routines are all just simple wrappers. +++*/ +++int sqlite_exec_printf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback xCallback, /* Callback function */ +++ void *pArg, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string. */ +++){ +++ va_list ap; +++ int rc; +++ +++ va_start(ap, errmsg); +++ rc = sqlite_exec_vprintf(db, sqlFormat, xCallback, pArg, errmsg, ap); +++ va_end(ap); +++ return rc; +++} +++int sqlite_exec_vprintf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback xCallback, /* Callback function */ +++ void *pArg, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string. */ +++){ +++ char *zSql; +++ int rc; +++ +++ zSql = sqlite_vmprintf(sqlFormat, ap); +++ rc = sqlite_exec(db, zSql, xCallback, pArg, errmsg); +++ free(zSql); +++ return rc; +++} +++int sqlite_get_table_printf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncol, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string */ +++){ +++ va_list ap; +++ int rc; +++ +++ va_start(ap, errmsg); +++ rc = sqlite_get_table_vprintf(db, sqlFormat, resultp, nrow, ncol, errmsg, ap); +++ va_end(ap); +++ return rc; +++} +++int sqlite_get_table_vprintf( +++ sqlite *db, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string */ +++){ +++ char *zSql; +++ int rc; +++ +++ zSql = sqlite_vmprintf(sqlFormat, ap); +++ rc = sqlite_get_table(db, zSql, resultp, nrow, ncolumn, errmsg); +++ free(zSql); +++ return rc; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/random.c ++@@ -0,0 +1,97 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains code to implement a pseudo-random number +++** generator (PRNG) for SQLite. +++** +++** Random numbers are used by some of the database backends in order +++** to generate random integer keys for tables or random filenames. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++#include "os.h" +++ +++ +++/* +++** Get a single 8-bit random value from the RC4 PRNG. The Mutex +++** must be held while executing this routine. +++** +++** Why not just use a library random generator like lrand48() for this? +++** Because the OP_NewRecno opcode in the VDBE depends on having a very +++** good source of random numbers. The lrand48() library function may +++** well be good enough. But maybe not. Or maybe lrand48() has some +++** subtle problems on some systems that could cause problems. It is hard +++** to know. To minimize the risk of problems due to bad lrand48() +++** implementations, SQLite uses this random number generator based +++** on RC4, which we know works very well. +++*/ +++static int randomByte(){ +++ unsigned char t; +++ +++ /* All threads share a single random number generator. +++ ** This structure is the current state of the generator. +++ */ +++ static struct { +++ unsigned char isInit; /* True if initialized */ +++ unsigned char i, j; /* State variables */ +++ unsigned char s[256]; /* State variables */ +++ } prng; +++ +++ /* Initialize the state of the random number generator once, +++ ** the first time this routine is called. The seed value does +++ ** not need to contain a lot of randomness since we are not +++ ** trying to do secure encryption or anything like that... +++ ** +++ ** Nothing in this file or anywhere else in SQLite does any kind of +++ ** encryption. The RC4 algorithm is being used as a PRNG (pseudo-random +++ ** number generator) not as an encryption device. +++ */ +++ if( !prng.isInit ){ +++ int i; +++ char k[256]; +++ prng.j = 0; +++ prng.i = 0; +++ sqliteOsRandomSeed(k); +++ for(i=0; i<256; i++){ +++ prng.s[i] = i; +++ } +++ for(i=0; i<256; i++){ +++ prng.j += prng.s[i] + k[i]; +++ t = prng.s[prng.j]; +++ prng.s[prng.j] = prng.s[i]; +++ prng.s[i] = t; +++ } +++ prng.isInit = 1; +++ } +++ +++ /* Generate and return single random byte +++ */ +++ prng.i++; +++ t = prng.s[prng.i]; +++ prng.j += t; +++ prng.s[prng.i] = prng.s[prng.j]; +++ prng.s[prng.j] = t; +++ t += prng.s[prng.i]; +++ return prng.s[t]; +++} +++ +++/* +++** Return N random bytes. +++*/ +++void sqliteRandomness(int N, void *pBuf){ +++ unsigned char *zBuf = pBuf; +++ sqliteOsEnterMutex(); +++ while( N-- ){ +++ *(zBuf++) = randomByte(); +++ } +++ sqliteOsLeaveMutex(); +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/select.c ++@@ -0,0 +1,2434 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This file contains C code routines that are called by the parser +++** to handle SELECT statements in SQLite. +++** +++** $Id$ +++*/ +++#include "sqliteInt.h" +++ +++ +++/* +++** Allocate a new Select structure and return a pointer to that +++** structure. +++*/ +++Select *sqliteSelectNew( +++ ExprList *pEList, /* which columns to include in the result */ +++ SrcList *pSrc, /* the FROM clause -- which tables to scan */ +++ Expr *pWhere, /* the WHERE clause */ +++ ExprList *pGroupBy, /* the GROUP BY clause */ +++ Expr *pHaving, /* the HAVING clause */ +++ ExprList *pOrderBy, /* the ORDER BY clause */ +++ int isDistinct, /* true if the DISTINCT keyword is present */ +++ int nLimit, /* LIMIT value. -1 means not used */ +++ int nOffset /* OFFSET value. 0 means no offset */ +++){ +++ Select *pNew; +++ pNew = sqliteMalloc( sizeof(*pNew) ); +++ if( pNew==0 ){ +++ sqliteExprListDelete(pEList); +++ sqliteSrcListDelete(pSrc); +++ sqliteExprDelete(pWhere); +++ sqliteExprListDelete(pGroupBy); +++ sqliteExprDelete(pHaving); +++ sqliteExprListDelete(pOrderBy); +++ }else{ +++ if( pEList==0 ){ +++ pEList = sqliteExprListAppend(0, sqliteExpr(TK_ALL,0,0,0), 0); +++ } +++ pNew->pEList = pEList; +++ pNew->pSrc = pSrc; +++ pNew->pWhere = pWhere; +++ pNew->pGroupBy = pGroupBy; +++ pNew->pHaving = pHaving; +++ pNew->pOrderBy = pOrderBy; +++ pNew->isDistinct = isDistinct; +++ pNew->op = TK_SELECT; +++ pNew->nLimit = nLimit; +++ pNew->nOffset = nOffset; +++ pNew->iLimit = -1; +++ pNew->iOffset = -1; +++ } +++ return pNew; +++} +++ +++/* +++** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the +++** type of join. Return an integer constant that expresses that type +++** in terms of the following bit values: +++** +++** JT_INNER +++** JT_OUTER +++** JT_NATURAL +++** JT_LEFT +++** JT_RIGHT +++** +++** A full outer join is the combination of JT_LEFT and JT_RIGHT. +++** +++** If an illegal or unsupported join type is seen, then still return +++** a join type, but put an error in the pParse structure. +++*/ +++int sqliteJoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ +++ int jointype = 0; +++ Token *apAll[3]; +++ Token *p; +++ static struct { +++ const char *zKeyword; +++ int nChar; +++ int code; +++ } keywords[] = { +++ { "natural", 7, JT_NATURAL }, +++ { "left", 4, JT_LEFT|JT_OUTER }, +++ { "right", 5, JT_RIGHT|JT_OUTER }, +++ { "full", 4, JT_LEFT|JT_RIGHT|JT_OUTER }, +++ { "outer", 5, JT_OUTER }, +++ { "inner", 5, JT_INNER }, +++ { "cross", 5, JT_INNER }, +++ }; +++ int i, j; +++ apAll[0] = pA; +++ apAll[1] = pB; +++ apAll[2] = pC; +++ for(i=0; i<3 && apAll[i]; i++){ +++ p = apAll[i]; +++ for(j=0; jn==keywords[j].nChar +++ && sqliteStrNICmp(p->z, keywords[j].zKeyword, p->n)==0 ){ +++ jointype |= keywords[j].code; +++ break; +++ } +++ } +++ if( j>=sizeof(keywords)/sizeof(keywords[0]) ){ +++ jointype |= JT_ERROR; +++ break; +++ } +++ } +++ if( +++ (jointype & (JT_INNER|JT_OUTER))==(JT_INNER|JT_OUTER) || +++ (jointype & JT_ERROR)!=0 +++ ){ +++ static Token dummy = { 0, 0 }; +++ char *zSp1 = " ", *zSp2 = " "; +++ if( pB==0 ){ pB = &dummy; zSp1 = 0; } +++ if( pC==0 ){ pC = &dummy; zSp2 = 0; } +++ sqliteSetNString(&pParse->zErrMsg, "unknown or unsupported join type: ", 0, +++ pA->z, pA->n, zSp1, 1, pB->z, pB->n, zSp2, 1, pC->z, pC->n, 0); +++ pParse->nErr++; +++ jointype = JT_INNER; +++ }else if( jointype & JT_RIGHT ){ +++ sqliteErrorMsg(pParse, +++ "RIGHT and FULL OUTER JOINs are not currently supported"); +++ jointype = JT_INNER; +++ } +++ return jointype; +++} +++ +++/* +++** Return the index of a column in a table. Return -1 if the column +++** is not contained in the table. +++*/ +++static int columnIndex(Table *pTab, const char *zCol){ +++ int i; +++ for(i=0; inCol; i++){ +++ if( sqliteStrICmp(pTab->aCol[i].zName, zCol)==0 ) return i; +++ } +++ return -1; +++} +++ +++/* +++** Add a term to the WHERE expression in *ppExpr that requires the +++** zCol column to be equal in the two tables pTab1 and pTab2. +++*/ +++static void addWhereTerm( +++ const char *zCol, /* Name of the column */ +++ const Table *pTab1, /* First table */ +++ const Table *pTab2, /* Second table */ +++ Expr **ppExpr /* Add the equality term to this expression */ +++){ +++ Token dummy; +++ Expr *pE1a, *pE1b, *pE1c; +++ Expr *pE2a, *pE2b, *pE2c; +++ Expr *pE; +++ +++ dummy.z = zCol; +++ dummy.n = strlen(zCol); +++ dummy.dyn = 0; +++ pE1a = sqliteExpr(TK_ID, 0, 0, &dummy); +++ pE2a = sqliteExpr(TK_ID, 0, 0, &dummy); +++ dummy.z = pTab1->zName; +++ dummy.n = strlen(dummy.z); +++ pE1b = sqliteExpr(TK_ID, 0, 0, &dummy); +++ dummy.z = pTab2->zName; +++ dummy.n = strlen(dummy.z); +++ pE2b = sqliteExpr(TK_ID, 0, 0, &dummy); +++ pE1c = sqliteExpr(TK_DOT, pE1b, pE1a, 0); +++ pE2c = sqliteExpr(TK_DOT, pE2b, pE2a, 0); +++ pE = sqliteExpr(TK_EQ, pE1c, pE2c, 0); +++ ExprSetProperty(pE, EP_FromJoin); +++ if( *ppExpr ){ +++ *ppExpr = sqliteExpr(TK_AND, *ppExpr, pE, 0); +++ }else{ +++ *ppExpr = pE; +++ } +++} +++ +++/* +++** Set the EP_FromJoin property on all terms of the given expression. +++** +++** The EP_FromJoin property is used on terms of an expression to tell +++** the LEFT OUTER JOIN processing logic that this term is part of the +++** join restriction specified in the ON or USING clause and not a part +++** of the more general WHERE clause. These terms are moved over to the +++** WHERE clause during join processing but we need to remember that they +++** originated in the ON or USING clause. +++*/ +++static void setJoinExpr(Expr *p){ +++ while( p ){ +++ ExprSetProperty(p, EP_FromJoin); +++ setJoinExpr(p->pLeft); +++ p = p->pRight; +++ } +++} +++ +++/* +++** This routine processes the join information for a SELECT statement. +++** ON and USING clauses are converted into extra terms of the WHERE clause. +++** NATURAL joins also create extra WHERE clause terms. +++** +++** This routine returns the number of errors encountered. +++*/ +++static int sqliteProcessJoin(Parse *pParse, Select *p){ +++ SrcList *pSrc; +++ int i, j; +++ pSrc = p->pSrc; +++ for(i=0; inSrc-1; i++){ +++ struct SrcList_item *pTerm = &pSrc->a[i]; +++ struct SrcList_item *pOther = &pSrc->a[i+1]; +++ +++ if( pTerm->pTab==0 || pOther->pTab==0 ) continue; +++ +++ /* When the NATURAL keyword is present, add WHERE clause terms for +++ ** every column that the two tables have in common. +++ */ +++ if( pTerm->jointype & JT_NATURAL ){ +++ Table *pTab; +++ if( pTerm->pOn || pTerm->pUsing ){ +++ sqliteErrorMsg(pParse, "a NATURAL join may not have " +++ "an ON or USING clause", 0); +++ return 1; +++ } +++ pTab = pTerm->pTab; +++ for(j=0; jnCol; j++){ +++ if( columnIndex(pOther->pTab, pTab->aCol[j].zName)>=0 ){ +++ addWhereTerm(pTab->aCol[j].zName, pTab, pOther->pTab, &p->pWhere); +++ } +++ } +++ } +++ +++ /* Disallow both ON and USING clauses in the same join +++ */ +++ if( pTerm->pOn && pTerm->pUsing ){ +++ sqliteErrorMsg(pParse, "cannot have both ON and USING " +++ "clauses in the same join"); +++ return 1; +++ } +++ +++ /* Add the ON clause to the end of the WHERE clause, connected by +++ ** and AND operator. +++ */ +++ if( pTerm->pOn ){ +++ setJoinExpr(pTerm->pOn); +++ if( p->pWhere==0 ){ +++ p->pWhere = pTerm->pOn; +++ }else{ +++ p->pWhere = sqliteExpr(TK_AND, p->pWhere, pTerm->pOn, 0); +++ } +++ pTerm->pOn = 0; +++ } +++ +++ /* Create extra terms on the WHERE clause for each column named +++ ** in the USING clause. Example: If the two tables to be joined are +++ ** A and B and the USING clause names X, Y, and Z, then add this +++ ** to the WHERE clause: A.X=B.X AND A.Y=B.Y AND A.Z=B.Z +++ ** Report an error if any column mentioned in the USING clause is +++ ** not contained in both tables to be joined. +++ */ +++ if( pTerm->pUsing ){ +++ IdList *pList; +++ int j; +++ assert( inSrc-1 ); +++ pList = pTerm->pUsing; +++ for(j=0; jnId; j++){ +++ if( columnIndex(pTerm->pTab, pList->a[j].zName)<0 || +++ columnIndex(pOther->pTab, pList->a[j].zName)<0 ){ +++ sqliteErrorMsg(pParse, "cannot join using column %s - column " +++ "not present in both tables", pList->a[j].zName); +++ return 1; +++ } +++ addWhereTerm(pList->a[j].zName, pTerm->pTab, pOther->pTab, &p->pWhere); +++ } +++ } +++ } +++ return 0; +++} +++ +++/* +++** Delete the given Select structure and all of its substructures. +++*/ +++void sqliteSelectDelete(Select *p){ +++ if( p==0 ) return; +++ sqliteExprListDelete(p->pEList); +++ sqliteSrcListDelete(p->pSrc); +++ sqliteExprDelete(p->pWhere); +++ sqliteExprListDelete(p->pGroupBy); +++ sqliteExprDelete(p->pHaving); +++ sqliteExprListDelete(p->pOrderBy); +++ sqliteSelectDelete(p->pPrior); +++ sqliteFree(p->zSelect); +++ sqliteFree(p); +++} +++ +++/* +++** Delete the aggregate information from the parse structure. +++*/ +++static void sqliteAggregateInfoReset(Parse *pParse){ +++ sqliteFree(pParse->aAgg); +++ pParse->aAgg = 0; +++ pParse->nAgg = 0; +++ pParse->useAgg = 0; +++} +++ +++/* +++** Insert code into "v" that will push the record on the top of the +++** stack into the sorter. +++*/ +++static void pushOntoSorter(Parse *pParse, Vdbe *v, ExprList *pOrderBy){ +++ char *zSortOrder; +++ int i; +++ zSortOrder = sqliteMalloc( pOrderBy->nExpr + 1 ); +++ if( zSortOrder==0 ) return; +++ for(i=0; inExpr; i++){ +++ int order = pOrderBy->a[i].sortOrder; +++ int type; +++ int c; +++ if( (order & SQLITE_SO_TYPEMASK)==SQLITE_SO_TEXT ){ +++ type = SQLITE_SO_TEXT; +++ }else if( (order & SQLITE_SO_TYPEMASK)==SQLITE_SO_NUM ){ +++ type = SQLITE_SO_NUM; +++ }else if( pParse->db->file_format>=4 ){ +++ type = sqliteExprType(pOrderBy->a[i].pExpr); +++ }else{ +++ type = SQLITE_SO_NUM; +++ } +++ if( (order & SQLITE_SO_DIRMASK)==SQLITE_SO_ASC ){ +++ c = type==SQLITE_SO_TEXT ? 'A' : '+'; +++ }else{ +++ c = type==SQLITE_SO_TEXT ? 'D' : '-'; +++ } +++ zSortOrder[i] = c; +++ sqliteExprCode(pParse, pOrderBy->a[i].pExpr); +++ } +++ zSortOrder[pOrderBy->nExpr] = 0; +++ sqliteVdbeOp3(v, OP_SortMakeKey, pOrderBy->nExpr, 0, zSortOrder, P3_DYNAMIC); +++ sqliteVdbeAddOp(v, OP_SortPut, 0, 0); +++} +++ +++/* +++** This routine adds a P3 argument to the last VDBE opcode that was +++** inserted. The P3 argument added is a string suitable for the +++** OP_MakeKey or OP_MakeIdxKey opcodes. The string consists of +++** characters 't' or 'n' depending on whether or not the various +++** fields of the key to be generated should be treated as numeric +++** or as text. See the OP_MakeKey and OP_MakeIdxKey opcode +++** documentation for additional information about the P3 string. +++** See also the sqliteAddIdxKeyType() routine. +++*/ +++void sqliteAddKeyType(Vdbe *v, ExprList *pEList){ +++ int nColumn = pEList->nExpr; +++ char *zType = sqliteMalloc( nColumn+1 ); +++ int i; +++ if( zType==0 ) return; +++ for(i=0; ia[i].pExpr)==SQLITE_SO_NUM ? 'n' : 't'; +++ } +++ zType[i] = 0; +++ sqliteVdbeChangeP3(v, -1, zType, P3_DYNAMIC); +++} +++ +++/* +++** Add code to implement the OFFSET and LIMIT +++*/ +++static void codeLimiter( +++ Vdbe *v, /* Generate code into this VM */ +++ Select *p, /* The SELECT statement being coded */ +++ int iContinue, /* Jump here to skip the current record */ +++ int iBreak, /* Jump here to end the loop */ +++ int nPop /* Number of times to pop stack when jumping */ +++){ +++ if( p->iOffset>=0 ){ +++ int addr = sqliteVdbeCurrentAddr(v) + 2; +++ if( nPop>0 ) addr++; +++ sqliteVdbeAddOp(v, OP_MemIncr, p->iOffset, addr); +++ if( nPop>0 ){ +++ sqliteVdbeAddOp(v, OP_Pop, nPop, 0); +++ } +++ sqliteVdbeAddOp(v, OP_Goto, 0, iContinue); +++ } +++ if( p->iLimit>=0 ){ +++ sqliteVdbeAddOp(v, OP_MemIncr, p->iLimit, iBreak); +++ } +++} +++ +++/* +++** This routine generates the code for the inside of the inner loop +++** of a SELECT. +++** +++** If srcTab and nColumn are both zero, then the pEList expressions +++** are evaluated in order to get the data for this row. If nColumn>0 +++** then data is pulled from srcTab and pEList is used only to get the +++** datatypes for each column. +++*/ +++static int selectInnerLoop( +++ Parse *pParse, /* The parser context */ +++ Select *p, /* The complete select statement being coded */ +++ ExprList *pEList, /* List of values being extracted */ +++ int srcTab, /* Pull data from this table */ +++ int nColumn, /* Number of columns in the source table */ +++ ExprList *pOrderBy, /* If not NULL, sort results using this key */ +++ int distinct, /* If >=0, make sure results are distinct */ +++ int eDest, /* How to dispose of the results */ +++ int iParm, /* An argument to the disposal method */ +++ int iContinue, /* Jump here to continue with next row */ +++ int iBreak /* Jump here to break out of the inner loop */ +++){ +++ Vdbe *v = pParse->pVdbe; +++ int i; +++ int hasDistinct; /* True if the DISTINCT keyword is present */ +++ +++ if( v==0 ) return 0; +++ assert( pEList!=0 ); +++ +++ /* If there was a LIMIT clause on the SELECT statement, then do the check +++ ** to see if this row should be output. +++ */ +++ hasDistinct = distinct>=0 && pEList && pEList->nExpr>0; +++ if( pOrderBy==0 && !hasDistinct ){ +++ codeLimiter(v, p, iContinue, iBreak, 0); +++ } +++ +++ /* Pull the requested columns. +++ */ +++ if( nColumn>0 ){ +++ for(i=0; inExpr; +++ for(i=0; inExpr; i++){ +++ sqliteExprCode(pParse, pEList->a[i].pExpr); +++ } +++ } +++ +++ /* If the DISTINCT keyword was present on the SELECT statement +++ ** and this row has been seen before, then do not make this row +++ ** part of the result. +++ */ +++ if( hasDistinct ){ +++#if NULL_ALWAYS_DISTINCT +++ sqliteVdbeAddOp(v, OP_IsNull, -pEList->nExpr, sqliteVdbeCurrentAddr(v)+7); +++#endif +++ sqliteVdbeAddOp(v, OP_MakeKey, pEList->nExpr, 1); +++ if( pParse->db->file_format>=4 ) sqliteAddKeyType(v, pEList); +++ sqliteVdbeAddOp(v, OP_Distinct, distinct, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, pEList->nExpr+1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iContinue); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, distinct, 0); +++ if( pOrderBy==0 ){ +++ codeLimiter(v, p, iContinue, iBreak, nColumn); +++ } +++ } +++ +++ switch( eDest ){ +++ /* In this mode, write each query result to the key of the temporary +++ ** table iParm. +++ */ +++ case SRT_Union: { +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0); +++ break; +++ } +++ +++ /* Store the result as data using a unique key. +++ */ +++ case SRT_Table: +++ case SRT_TempTable: { +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0); +++ if( pOrderBy ){ +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_NewRecno, iParm, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, iParm, 0); +++ } +++ break; +++ } +++ +++ /* Construct a record from the query result, but instead of +++ ** saving that record, use it as a key to delete elements from +++ ** the temporary table iParm. +++ */ +++ case SRT_Except: { +++ int addr; +++ addr = sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT); +++ sqliteVdbeAddOp(v, OP_NotFound, iParm, addr+3); +++ sqliteVdbeAddOp(v, OP_Delete, iParm, 0); +++ break; +++ } +++ +++ /* If we are creating a set for an "expr IN (SELECT ...)" construct, +++ ** then there should be a single item on the stack. Write this +++ ** item into the set table with bogus data. +++ */ +++ case SRT_Set: { +++ int addr1 = sqliteVdbeCurrentAddr(v); +++ int addr2; +++ assert( nColumn==1 ); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, addr1+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ addr2 = sqliteVdbeAddOp(v, OP_Goto, 0, 0); +++ if( pOrderBy ){ +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0); +++ } +++ sqliteVdbeChangeP2(v, addr2, sqliteVdbeCurrentAddr(v)); +++ break; +++ } +++ +++ /* If this is a scalar select that is part of an expression, then +++ ** store the results in the appropriate memory cell and break out +++ ** of the scan loop. +++ */ +++ case SRT_Mem: { +++ assert( nColumn==1 ); +++ if( pOrderBy ){ +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_MemStore, iParm, 1); +++ sqliteVdbeAddOp(v, OP_Goto, 0, iBreak); +++ } +++ break; +++ } +++ +++ /* Send the data to the callback function. +++ */ +++ case SRT_Callback: +++ case SRT_Sorter: { +++ if( pOrderBy ){ +++ sqliteVdbeAddOp(v, OP_SortMakeRec, nColumn, 0); +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ assert( eDest==SRT_Callback ); +++ sqliteVdbeAddOp(v, OP_Callback, nColumn, 0); +++ } +++ break; +++ } +++ +++ /* Invoke a subroutine to handle the results. The subroutine itself +++ ** is responsible for popping the results off of the stack. +++ */ +++ case SRT_Subroutine: { +++ if( pOrderBy ){ +++ sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0); +++ pushOntoSorter(pParse, v, pOrderBy); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Gosub, 0, iParm); +++ } +++ break; +++ } +++ +++ /* Discard the results. This is used for SELECT statements inside +++ ** the body of a TRIGGER. The purpose of such selects is to call +++ ** user-defined functions that have side effects. We do not care +++ ** about the actual results of the select. +++ */ +++ default: { +++ assert( eDest==SRT_Discard ); +++ sqliteVdbeAddOp(v, OP_Pop, nColumn, 0); +++ break; +++ } +++ } +++ return 0; +++} +++ +++/* +++** If the inner loop was generated using a non-null pOrderBy argument, +++** then the results were placed in a sorter. After the loop is terminated +++** we need to run the sorter and output the results. The following +++** routine generates the code needed to do that. +++*/ +++static void generateSortTail( +++ Select *p, /* The SELECT statement */ +++ Vdbe *v, /* Generate code into this VDBE */ +++ int nColumn, /* Number of columns of data */ +++ int eDest, /* Write the sorted results here */ +++ int iParm /* Optional parameter associated with eDest */ +++){ +++ int end1 = sqliteVdbeMakeLabel(v); +++ int end2 = sqliteVdbeMakeLabel(v); +++ int addr; +++ if( eDest==SRT_Sorter ) return; +++ sqliteVdbeAddOp(v, OP_Sort, 0, 0); +++ addr = sqliteVdbeAddOp(v, OP_SortNext, 0, end1); +++ codeLimiter(v, p, addr, end2, 1); +++ switch( eDest ){ +++ case SRT_Callback: { +++ sqliteVdbeAddOp(v, OP_SortCallback, nColumn, 0); +++ break; +++ } +++ case SRT_Table: +++ case SRT_TempTable: { +++ sqliteVdbeAddOp(v, OP_NewRecno, iParm, 0); +++ sqliteVdbeAddOp(v, OP_Pull, 1, 0); +++ sqliteVdbeAddOp(v, OP_PutIntKey, iParm, 0); +++ break; +++ } +++ case SRT_Set: { +++ assert( nColumn==1 ); +++ sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_Pop, 1, 0); +++ sqliteVdbeAddOp(v, OP_Goto, 0, sqliteVdbeCurrentAddr(v)+3); +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_PutStrKey, iParm, 0); +++ break; +++ } +++ case SRT_Mem: { +++ assert( nColumn==1 ); +++ sqliteVdbeAddOp(v, OP_MemStore, iParm, 1); +++ sqliteVdbeAddOp(v, OP_Goto, 0, end1); +++ break; +++ } +++ case SRT_Subroutine: { +++ int i; +++ for(i=0; ipVdbe; +++ int i, j; +++ for(i=0; inExpr; i++){ +++ Expr *p = pEList->a[i].pExpr; +++ char *zType = 0; +++ if( p==0 ) continue; +++ if( p->op==TK_COLUMN && pTabList ){ +++ Table *pTab; +++ int iCol = p->iColumn; +++ for(j=0; jnSrc && pTabList->a[j].iCursor!=p->iTable; j++){} +++ assert( jnSrc ); +++ pTab = pTabList->a[j].pTab; +++ if( iCol<0 ) iCol = pTab->iPKey; +++ assert( iCol==-1 || (iCol>=0 && iColnCol) ); +++ if( iCol<0 ){ +++ zType = "INTEGER"; +++ }else{ +++ zType = pTab->aCol[iCol].zType; +++ } +++ }else{ +++ if( sqliteExprType(p)==SQLITE_SO_TEXT ){ +++ zType = "TEXT"; +++ }else{ +++ zType = "NUMERIC"; +++ } +++ } +++ sqliteVdbeOp3(v, OP_ColumnName, i + pEList->nExpr, 0, zType, 0); +++ } +++} +++ +++/* +++** Generate code that will tell the VDBE the names of columns +++** in the result set. This information is used to provide the +++** azCol[] values in the callback. +++*/ +++static void generateColumnNames( +++ Parse *pParse, /* Parser context */ +++ SrcList *pTabList, /* List of tables */ +++ ExprList *pEList /* Expressions defining the result set */ +++){ +++ Vdbe *v = pParse->pVdbe; +++ int i, j; +++ sqlite *db = pParse->db; +++ int fullNames, shortNames; +++ +++ assert( v!=0 ); +++ if( pParse->colNamesSet || v==0 || sqlite_malloc_failed ) return; +++ pParse->colNamesSet = 1; +++ fullNames = (db->flags & SQLITE_FullColNames)!=0; +++ shortNames = (db->flags & SQLITE_ShortColNames)!=0; +++ for(i=0; inExpr; i++){ +++ Expr *p; +++ int p2 = i==pEList->nExpr-1; +++ p = pEList->a[i].pExpr; +++ if( p==0 ) continue; +++ if( pEList->a[i].zName ){ +++ char *zName = pEList->a[i].zName; +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, 0); +++ continue; +++ } +++ if( p->op==TK_COLUMN && pTabList ){ +++ Table *pTab; +++ char *zCol; +++ int iCol = p->iColumn; +++ for(j=0; jnSrc && pTabList->a[j].iCursor!=p->iTable; j++){} +++ assert( jnSrc ); +++ pTab = pTabList->a[j].pTab; +++ if( iCol<0 ) iCol = pTab->iPKey; +++ assert( iCol==-1 || (iCol>=0 && iColnCol) ); +++ if( iCol<0 ){ +++ zCol = "_ROWID_"; +++ }else{ +++ zCol = pTab->aCol[iCol].zName; +++ } +++ if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){ +++ int addr = sqliteVdbeOp3(v,OP_ColumnName, i, p2, p->span.z, p->span.n); +++ sqliteVdbeCompressSpace(v, addr); +++ }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){ +++ char *zName = 0; +++ char *zTab; +++ +++ zTab = pTabList->a[j].zAlias; +++ if( fullNames || zTab==0 ) zTab = pTab->zName; +++ sqliteSetString(&zName, zTab, ".", zCol, 0); +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, P3_DYNAMIC); +++ }else{ +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zCol, 0); +++ } +++ }else if( p->span.z && p->span.z[0] ){ +++ int addr = sqliteVdbeOp3(v,OP_ColumnName, i, p2, p->span.z, p->span.n); +++ sqliteVdbeCompressSpace(v, addr); +++ }else{ +++ char zName[30]; +++ assert( p->op!=TK_COLUMN || pTabList==0 ); +++ sprintf(zName, "column%d", i+1); +++ sqliteVdbeOp3(v, OP_ColumnName, i, p2, zName, 0); +++ } +++ } +++} +++ +++/* +++** Name of the connection operator, used for error messages. +++*/ +++static const char *selectOpName(int id){ +++ char *z; +++ switch( id ){ +++ case TK_ALL: z = "UNION ALL"; break; +++ case TK_INTERSECT: z = "INTERSECT"; break; +++ case TK_EXCEPT: z = "EXCEPT"; break; +++ default: z = "UNION"; break; +++ } +++ return z; +++} +++ +++/* +++** Forward declaration +++*/ +++static int fillInColumnList(Parse*, Select*); +++ +++/* +++** Given a SELECT statement, generate a Table structure that describes +++** the result set of that SELECT. +++*/ +++Table *sqliteResultSetOfSelect(Parse *pParse, char *zTabName, Select *pSelect){ +++ Table *pTab; +++ int i, j; +++ ExprList *pEList; +++ Column *aCol; +++ +++ if( fillInColumnList(pParse, pSelect) ){ +++ return 0; +++ } +++ pTab = sqliteMalloc( sizeof(Table) ); +++ if( pTab==0 ){ +++ return 0; +++ } +++ pTab->zName = zTabName ? sqliteStrDup(zTabName) : 0; +++ pEList = pSelect->pEList; +++ pTab->nCol = pEList->nExpr; +++ assert( pTab->nCol>0 ); +++ pTab->aCol = aCol = sqliteMalloc( sizeof(pTab->aCol[0])*pTab->nCol ); +++ for(i=0; inCol; i++){ +++ Expr *p, *pR; +++ if( pEList->a[i].zName ){ +++ aCol[i].zName = sqliteStrDup(pEList->a[i].zName); +++ }else if( (p=pEList->a[i].pExpr)->op==TK_DOT +++ && (pR=p->pRight)!=0 && pR->token.z && pR->token.z[0] ){ +++ int cnt; +++ sqliteSetNString(&aCol[i].zName, pR->token.z, pR->token.n, 0); +++ for(j=cnt=0; jtoken.z, pR->token.n, zBuf, n,0); +++ j = -1; +++ } +++ } +++ }else if( p->span.z && p->span.z[0] ){ +++ sqliteSetNString(&pTab->aCol[i].zName, p->span.z, p->span.n, 0); +++ }else{ +++ char zBuf[30]; +++ sprintf(zBuf, "column%d", i+1); +++ aCol[i].zName = sqliteStrDup(zBuf); +++ } +++ sqliteDequote(aCol[i].zName); +++ } +++ pTab->iPKey = -1; +++ return pTab; +++} +++ +++/* +++** For the given SELECT statement, do three things. +++** +++** (1) Fill in the pTabList->a[].pTab fields in the SrcList that +++** defines the set of tables that should be scanned. For views, +++** fill pTabList->a[].pSelect with a copy of the SELECT statement +++** that implements the view. A copy is made of the view's SELECT +++** statement so that we can freely modify or delete that statement +++** without worrying about messing up the presistent representation +++** of the view. +++** +++** (2) Add terms to the WHERE clause to accomodate the NATURAL keyword +++** on joins and the ON and USING clause of joins. +++** +++** (3) Scan the list of columns in the result set (pEList) looking +++** for instances of the "*" operator or the TABLE.* operator. +++** If found, expand each "*" to be every column in every table +++** and TABLE.* to be every column in TABLE. +++** +++** Return 0 on success. If there are problems, leave an error message +++** in pParse and return non-zero. +++*/ +++static int fillInColumnList(Parse *pParse, Select *p){ +++ int i, j, k, rc; +++ SrcList *pTabList; +++ ExprList *pEList; +++ Table *pTab; +++ +++ if( p==0 || p->pSrc==0 ) return 1; +++ pTabList = p->pSrc; +++ pEList = p->pEList; +++ +++ /* Look up every table in the table list. +++ */ +++ for(i=0; inSrc; i++){ +++ if( pTabList->a[i].pTab ){ +++ /* This routine has run before! No need to continue */ +++ return 0; +++ } +++ if( pTabList->a[i].zName==0 ){ +++ /* A sub-query in the FROM clause of a SELECT */ +++ assert( pTabList->a[i].pSelect!=0 ); +++ if( pTabList->a[i].zAlias==0 ){ +++ char zFakeName[60]; +++ sprintf(zFakeName, "sqlite_subquery_%p_", +++ (void*)pTabList->a[i].pSelect); +++ sqliteSetString(&pTabList->a[i].zAlias, zFakeName, 0); +++ } +++ pTabList->a[i].pTab = pTab = +++ sqliteResultSetOfSelect(pParse, pTabList->a[i].zAlias, +++ pTabList->a[i].pSelect); +++ if( pTab==0 ){ +++ return 1; +++ } +++ /* The isTransient flag indicates that the Table structure has been +++ ** dynamically allocated and may be freed at any time. In other words, +++ ** pTab is not pointing to a persistent table structure that defines +++ ** part of the schema. */ +++ pTab->isTransient = 1; +++ }else{ +++ /* An ordinary table or view name in the FROM clause */ +++ pTabList->a[i].pTab = pTab = +++ sqliteLocateTable(pParse,pTabList->a[i].zName,pTabList->a[i].zDatabase); +++ if( pTab==0 ){ +++ return 1; +++ } +++ if( pTab->pSelect ){ +++ /* We reach here if the named table is a really a view */ +++ if( sqliteViewGetColumnNames(pParse, pTab) ){ +++ return 1; +++ } +++ /* If pTabList->a[i].pSelect!=0 it means we are dealing with a +++ ** view within a view. The SELECT structure has already been +++ ** copied by the outer view so we can skip the copy step here +++ ** in the inner view. +++ */ +++ if( pTabList->a[i].pSelect==0 ){ +++ pTabList->a[i].pSelect = sqliteSelectDup(pTab->pSelect); +++ } +++ } +++ } +++ } +++ +++ /* Process NATURAL keywords, and ON and USING clauses of joins. +++ */ +++ if( sqliteProcessJoin(pParse, p) ) return 1; +++ +++ /* For every "*" that occurs in the column list, insert the names of +++ ** all columns in all tables. And for every TABLE.* insert the names +++ ** of all columns in TABLE. The parser inserted a special expression +++ ** with the TK_ALL operator for each "*" that it found in the column list. +++ ** The following code just has to locate the TK_ALL expressions and expand +++ ** each one to the list of all columns in all tables. +++ ** +++ ** The first loop just checks to see if there are any "*" operators +++ ** that need expanding. +++ */ +++ for(k=0; knExpr; k++){ +++ Expr *pE = pEList->a[k].pExpr; +++ if( pE->op==TK_ALL ) break; +++ if( pE->op==TK_DOT && pE->pRight && pE->pRight->op==TK_ALL +++ && pE->pLeft && pE->pLeft->op==TK_ID ) break; +++ } +++ rc = 0; +++ if( knExpr ){ +++ /* +++ ** If we get here it means the result set contains one or more "*" +++ ** operators that need to be expanded. Loop through each expression +++ ** in the result set and expand them one by one. +++ */ +++ struct ExprList_item *a = pEList->a; +++ ExprList *pNew = 0; +++ for(k=0; knExpr; k++){ +++ Expr *pE = a[k].pExpr; +++ if( pE->op!=TK_ALL && +++ (pE->op!=TK_DOT || pE->pRight==0 || pE->pRight->op!=TK_ALL) ){ +++ /* This particular expression does not need to be expanded. +++ */ +++ pNew = sqliteExprListAppend(pNew, a[k].pExpr, 0); +++ pNew->a[pNew->nExpr-1].zName = a[k].zName; +++ a[k].pExpr = 0; +++ a[k].zName = 0; +++ }else{ +++ /* This expression is a "*" or a "TABLE.*" and needs to be +++ ** expanded. */ +++ int tableSeen = 0; /* Set to 1 when TABLE matches */ +++ char *zTName; /* text of name of TABLE */ +++ if( pE->op==TK_DOT && pE->pLeft ){ +++ zTName = sqliteTableNameFromToken(&pE->pLeft->token); +++ }else{ +++ zTName = 0; +++ } +++ for(i=0; inSrc; i++){ +++ Table *pTab = pTabList->a[i].pTab; +++ char *zTabName = pTabList->a[i].zAlias; +++ if( zTabName==0 || zTabName[0]==0 ){ +++ zTabName = pTab->zName; +++ } +++ if( zTName && (zTabName==0 || zTabName[0]==0 || +++ sqliteStrICmp(zTName, zTabName)!=0) ){ +++ continue; +++ } +++ tableSeen = 1; +++ for(j=0; jnCol; j++){ +++ Expr *pExpr, *pLeft, *pRight; +++ char *zName = pTab->aCol[j].zName; +++ +++ if( i>0 && (pTabList->a[i-1].jointype & JT_NATURAL)!=0 && +++ columnIndex(pTabList->a[i-1].pTab, zName)>=0 ){ +++ /* In a NATURAL join, omit the join columns from the +++ ** table on the right */ +++ continue; +++ } +++ if( i>0 && sqliteIdListIndex(pTabList->a[i-1].pUsing, zName)>=0 ){ +++ /* In a join with a USING clause, omit columns in the +++ ** using clause from the table on the right. */ +++ continue; +++ } +++ pRight = sqliteExpr(TK_ID, 0, 0, 0); +++ if( pRight==0 ) break; +++ pRight->token.z = zName; +++ pRight->token.n = strlen(zName); +++ pRight->token.dyn = 0; +++ if( zTabName && pTabList->nSrc>1 ){ +++ pLeft = sqliteExpr(TK_ID, 0, 0, 0); +++ pExpr = sqliteExpr(TK_DOT, pLeft, pRight, 0); +++ if( pExpr==0 ) break; +++ pLeft->token.z = zTabName; +++ pLeft->token.n = strlen(zTabName); +++ pLeft->token.dyn = 0; +++ sqliteSetString((char**)&pExpr->span.z, zTabName, ".", zName, 0); +++ pExpr->span.n = strlen(pExpr->span.z); +++ pExpr->span.dyn = 1; +++ pExpr->token.z = 0; +++ pExpr->token.n = 0; +++ pExpr->token.dyn = 0; +++ }else{ +++ pExpr = pRight; +++ pExpr->span = pExpr->token; +++ } +++ pNew = sqliteExprListAppend(pNew, pExpr, 0); +++ } +++ } +++ if( !tableSeen ){ +++ if( zTName ){ +++ sqliteErrorMsg(pParse, "no such table: %s", zTName); +++ }else{ +++ sqliteErrorMsg(pParse, "no tables specified"); +++ } +++ rc = 1; +++ } +++ sqliteFree(zTName); +++ } +++ } +++ sqliteExprListDelete(pEList); +++ p->pEList = pNew; +++ } +++ return rc; +++} +++ +++/* +++** This routine recursively unlinks the Select.pSrc.a[].pTab pointers +++** in a select structure. It just sets the pointers to NULL. This +++** routine is recursive in the sense that if the Select.pSrc.a[].pSelect +++** pointer is not NULL, this routine is called recursively on that pointer. +++** +++** This routine is called on the Select structure that defines a +++** VIEW in order to undo any bindings to tables. This is necessary +++** because those tables might be DROPed by a subsequent SQL command. +++** If the bindings are not removed, then the Select.pSrc->a[].pTab field +++** will be left pointing to a deallocated Table structure after the +++** DROP and a coredump will occur the next time the VIEW is used. +++*/ +++void sqliteSelectUnbind(Select *p){ +++ int i; +++ SrcList *pSrc = p->pSrc; +++ Table *pTab; +++ if( p==0 ) return; +++ for(i=0; inSrc; i++){ +++ if( (pTab = pSrc->a[i].pTab)!=0 ){ +++ if( pTab->isTransient ){ +++ sqliteDeleteTable(0, pTab); +++ } +++ pSrc->a[i].pTab = 0; +++ if( pSrc->a[i].pSelect ){ +++ sqliteSelectUnbind(pSrc->a[i].pSelect); +++ } +++ } +++ } +++} +++ +++/* +++** This routine associates entries in an ORDER BY expression list with +++** columns in a result. For each ORDER BY expression, the opcode of +++** the top-level node is changed to TK_COLUMN and the iColumn value of +++** the top-level node is filled in with column number and the iTable +++** value of the top-level node is filled with iTable parameter. +++** +++** If there are prior SELECT clauses, they are processed first. A match +++** in an earlier SELECT takes precedence over a later SELECT. +++** +++** Any entry that does not match is flagged as an error. The number +++** of errors is returned. +++** +++** This routine does NOT correctly initialize the Expr.dataType field +++** of the ORDER BY expressions. The multiSelectSortOrder() routine +++** must be called to do that after the individual select statements +++** have all been analyzed. This routine is unable to compute Expr.dataType +++** because it must be called before the individual select statements +++** have been analyzed. +++*/ +++static int matchOrderbyToColumn( +++ Parse *pParse, /* A place to leave error messages */ +++ Select *pSelect, /* Match to result columns of this SELECT */ +++ ExprList *pOrderBy, /* The ORDER BY values to match against columns */ +++ int iTable, /* Insert this value in iTable */ +++ int mustComplete /* If TRUE all ORDER BYs must match */ +++){ +++ int nErr = 0; +++ int i, j; +++ ExprList *pEList; +++ +++ if( pSelect==0 || pOrderBy==0 ) return 1; +++ if( mustComplete ){ +++ for(i=0; inExpr; i++){ pOrderBy->a[i].done = 0; } +++ } +++ if( fillInColumnList(pParse, pSelect) ){ +++ return 1; +++ } +++ if( pSelect->pPrior ){ +++ if( matchOrderbyToColumn(pParse, pSelect->pPrior, pOrderBy, iTable, 0) ){ +++ return 1; +++ } +++ } +++ pEList = pSelect->pEList; +++ for(i=0; inExpr; i++){ +++ Expr *pE = pOrderBy->a[i].pExpr; +++ int iCol = -1; +++ if( pOrderBy->a[i].done ) continue; +++ if( sqliteExprIsInteger(pE, &iCol) ){ +++ if( iCol<=0 || iCol>pEList->nExpr ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY position %d should be between 1 and %d", +++ iCol, pEList->nExpr); +++ nErr++; +++ break; +++ } +++ if( !mustComplete ) continue; +++ iCol--; +++ } +++ for(j=0; iCol<0 && jnExpr; j++){ +++ if( pEList->a[j].zName && (pE->op==TK_ID || pE->op==TK_STRING) ){ +++ char *zName, *zLabel; +++ zName = pEList->a[j].zName; +++ assert( pE->token.z ); +++ zLabel = sqliteStrNDup(pE->token.z, pE->token.n); +++ sqliteDequote(zLabel); +++ if( sqliteStrICmp(zName, zLabel)==0 ){ +++ iCol = j; +++ } +++ sqliteFree(zLabel); +++ } +++ if( iCol<0 && sqliteExprCompare(pE, pEList->a[j].pExpr) ){ +++ iCol = j; +++ } +++ } +++ if( iCol>=0 ){ +++ pE->op = TK_COLUMN; +++ pE->iColumn = iCol; +++ pE->iTable = iTable; +++ pOrderBy->a[i].done = 1; +++ } +++ if( iCol<0 && mustComplete ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY term number %d does not match any result column", i+1); +++ nErr++; +++ break; +++ } +++ } +++ return nErr; +++} +++ +++/* +++** Get a VDBE for the given parser context. Create a new one if necessary. +++** If an error occurs, return NULL and leave a message in pParse. +++*/ +++Vdbe *sqliteGetVdbe(Parse *pParse){ +++ Vdbe *v = pParse->pVdbe; +++ if( v==0 ){ +++ v = pParse->pVdbe = sqliteVdbeCreate(pParse->db); +++ } +++ return v; +++} +++ +++/* +++** This routine sets the Expr.dataType field on all elements of +++** the pOrderBy expression list. The pOrderBy list will have been +++** set up by matchOrderbyToColumn(). Hence each expression has +++** a TK_COLUMN as its root node. The Expr.iColumn refers to a +++** column in the result set. The datatype is set to SQLITE_SO_TEXT +++** if the corresponding column in p and every SELECT to the left of +++** p has a datatype of SQLITE_SO_TEXT. If the cooressponding column +++** in p or any of the left SELECTs is SQLITE_SO_NUM, then the datatype +++** of the order-by expression is set to SQLITE_SO_NUM. +++** +++** Examples: +++** +++** CREATE TABLE one(a INTEGER, b TEXT); +++** CREATE TABLE two(c VARCHAR(5), d FLOAT); +++** +++** SELECT b, b FROM one UNION SELECT d, c FROM two ORDER BY 1, 2; +++** +++** The primary sort key will use SQLITE_SO_NUM because the "d" in +++** the second SELECT is numeric. The 1st column of the first SELECT +++** is text but that does not matter because a numeric always overrides +++** a text. +++** +++** The secondary key will use the SQLITE_SO_TEXT sort order because +++** both the (second) "b" in the first SELECT and the "c" in the second +++** SELECT have a datatype of text. +++*/ +++static void multiSelectSortOrder(Select *p, ExprList *pOrderBy){ +++ int i; +++ ExprList *pEList; +++ if( pOrderBy==0 ) return; +++ if( p==0 ){ +++ for(i=0; inExpr; i++){ +++ pOrderBy->a[i].pExpr->dataType = SQLITE_SO_TEXT; +++ } +++ return; +++ } +++ multiSelectSortOrder(p->pPrior, pOrderBy); +++ pEList = p->pEList; +++ for(i=0; inExpr; i++){ +++ Expr *pE = pOrderBy->a[i].pExpr; +++ if( pE->dataType==SQLITE_SO_NUM ) continue; +++ assert( pE->iColumn>=0 ); +++ if( pEList->nExpr>pE->iColumn ){ +++ pE->dataType = sqliteExprType(pEList->a[pE->iColumn].pExpr); +++ } +++ } +++} +++ +++/* +++** Compute the iLimit and iOffset fields of the SELECT based on the +++** nLimit and nOffset fields. nLimit and nOffset hold the integers +++** that appear in the original SQL statement after the LIMIT and OFFSET +++** keywords. Or that hold -1 and 0 if those keywords are omitted. +++** iLimit and iOffset are the integer memory register numbers for +++** counters used to compute the limit and offset. If there is no +++** limit and/or offset, then iLimit and iOffset are negative. +++** +++** This routine changes the values if iLimit and iOffset only if +++** a limit or offset is defined by nLimit and nOffset. iLimit and +++** iOffset should have been preset to appropriate default values +++** (usually but not always -1) prior to calling this routine. +++** Only if nLimit>=0 or nOffset>0 do the limit registers get +++** redefined. The UNION ALL operator uses this property to force +++** the reuse of the same limit and offset registers across multiple +++** SELECT statements. +++*/ +++static void computeLimitRegisters(Parse *pParse, Select *p){ +++ /* +++ ** If the comparison is p->nLimit>0 then "LIMIT 0" shows +++ ** all rows. It is the same as no limit. If the comparision is +++ ** p->nLimit>=0 then "LIMIT 0" show no rows at all. +++ ** "LIMIT -1" always shows all rows. There is some +++ ** contraversy about what the correct behavior should be. +++ ** The current implementation interprets "LIMIT 0" to mean +++ ** no rows. +++ */ +++ if( p->nLimit>=0 ){ +++ int iMem = pParse->nMem++; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ sqliteVdbeAddOp(v, OP_Integer, -p->nLimit, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iMem, 1); +++ p->iLimit = iMem; +++ } +++ if( p->nOffset>0 ){ +++ int iMem = pParse->nMem++; +++ Vdbe *v = sqliteGetVdbe(pParse); +++ if( v==0 ) return; +++ sqliteVdbeAddOp(v, OP_Integer, -p->nOffset, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iMem, 1); +++ p->iOffset = iMem; +++ } +++} +++ +++/* +++** This routine is called to process a query that is really the union +++** or intersection of two or more separate queries. +++** +++** "p" points to the right-most of the two queries. the query on the +++** left is p->pPrior. The left query could also be a compound query +++** in which case this routine will be called recursively. +++** +++** The results of the total query are to be written into a destination +++** of type eDest with parameter iParm. +++** +++** Example 1: Consider a three-way compound SQL statement. +++** +++** SELECT a FROM t1 UNION SELECT b FROM t2 UNION SELECT c FROM t3 +++** +++** This statement is parsed up as follows: +++** +++** SELECT c FROM t3 +++** | +++** `-----> SELECT b FROM t2 +++** | +++** `------> SELECT a FROM t1 +++** +++** The arrows in the diagram above represent the Select.pPrior pointer. +++** So if this routine is called with p equal to the t3 query, then +++** pPrior will be the t2 query. p->op will be TK_UNION in this case. +++** +++** Notice that because of the way SQLite parses compound SELECTs, the +++** individual selects always group from left to right. +++*/ +++static int multiSelect(Parse *pParse, Select *p, int eDest, int iParm){ +++ int rc; /* Success code from a subroutine */ +++ Select *pPrior; /* Another SELECT immediately to our left */ +++ Vdbe *v; /* Generate code to this VDBE */ +++ +++ /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs. Only +++ ** the last SELECT in the series may have an ORDER BY or LIMIT. +++ */ +++ if( p==0 || p->pPrior==0 ) return 1; +++ pPrior = p->pPrior; +++ if( pPrior->pOrderBy ){ +++ sqliteErrorMsg(pParse,"ORDER BY clause should come after %s not before", +++ selectOpName(p->op)); +++ return 1; +++ } +++ if( pPrior->nLimit>=0 || pPrior->nOffset>0 ){ +++ sqliteErrorMsg(pParse,"LIMIT clause should come after %s not before", +++ selectOpName(p->op)); +++ return 1; +++ } +++ +++ /* Make sure we have a valid query engine. If not, create a new one. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return 1; +++ +++ /* Create the destination temporary table if necessary +++ */ +++ if( eDest==SRT_TempTable ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); +++ eDest = SRT_Table; +++ } +++ +++ /* Generate code for the left and right SELECT statements. +++ */ +++ switch( p->op ){ +++ case TK_ALL: { +++ if( p->pOrderBy==0 ){ +++ pPrior->nLimit = p->nLimit; +++ pPrior->nOffset = p->nOffset; +++ rc = sqliteSelect(pParse, pPrior, eDest, iParm, 0, 0, 0); +++ if( rc ) return rc; +++ p->pPrior = 0; +++ p->iLimit = pPrior->iLimit; +++ p->iOffset = pPrior->iOffset; +++ p->nLimit = -1; +++ p->nOffset = 0; +++ rc = sqliteSelect(pParse, p, eDest, iParm, 0, 0, 0); +++ p->pPrior = pPrior; +++ if( rc ) return rc; +++ break; +++ } +++ /* For UNION ALL ... ORDER BY fall through to the next case */ +++ } +++ case TK_EXCEPT: +++ case TK_UNION: { +++ int unionTab; /* Cursor number of the temporary table holding result */ +++ int op; /* One of the SRT_ operations to apply to self */ +++ int priorOp; /* The SRT_ operation to apply to prior selects */ +++ int nLimit, nOffset; /* Saved values of p->nLimit and p->nOffset */ +++ ExprList *pOrderBy; /* The ORDER BY clause for the right SELECT */ +++ +++ priorOp = p->op==TK_ALL ? SRT_Table : SRT_Union; +++ if( eDest==priorOp && p->pOrderBy==0 && p->nLimit<0 && p->nOffset==0 ){ +++ /* We can reuse a temporary table generated by a SELECT to our +++ ** right. +++ */ +++ unionTab = iParm; +++ }else{ +++ /* We will need to create our own temporary table to hold the +++ ** intermediate results. +++ */ +++ unionTab = pParse->nTab++; +++ if( p->pOrderBy +++ && matchOrderbyToColumn(pParse, p, p->pOrderBy, unionTab, 1) ){ +++ return 1; +++ } +++ if( p->op!=TK_ALL ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, unionTab, 1); +++ sqliteVdbeAddOp(v, OP_KeyAsData, unionTab, 1); +++ }else{ +++ sqliteVdbeAddOp(v, OP_OpenTemp, unionTab, 0); +++ } +++ } +++ +++ /* Code the SELECT statements to our left +++ */ +++ rc = sqliteSelect(pParse, pPrior, priorOp, unionTab, 0, 0, 0); +++ if( rc ) return rc; +++ +++ /* Code the current SELECT statement +++ */ +++ switch( p->op ){ +++ case TK_EXCEPT: op = SRT_Except; break; +++ case TK_UNION: op = SRT_Union; break; +++ case TK_ALL: op = SRT_Table; break; +++ } +++ p->pPrior = 0; +++ pOrderBy = p->pOrderBy; +++ p->pOrderBy = 0; +++ nLimit = p->nLimit; +++ p->nLimit = -1; +++ nOffset = p->nOffset; +++ p->nOffset = 0; +++ rc = sqliteSelect(pParse, p, op, unionTab, 0, 0, 0); +++ p->pPrior = pPrior; +++ p->pOrderBy = pOrderBy; +++ p->nLimit = nLimit; +++ p->nOffset = nOffset; +++ if( rc ) return rc; +++ +++ /* Convert the data in the temporary table into whatever form +++ ** it is that we currently need. +++ */ +++ if( eDest!=priorOp || unionTab!=iParm ){ +++ int iCont, iBreak, iStart; +++ assert( p->pEList ); +++ if( eDest==SRT_Callback ){ +++ generateColumnNames(pParse, 0, p->pEList); +++ generateColumnTypes(pParse, p->pSrc, p->pEList); +++ } +++ iBreak = sqliteVdbeMakeLabel(v); +++ iCont = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, unionTab, iBreak); +++ computeLimitRegisters(pParse, p); +++ iStart = sqliteVdbeCurrentAddr(v); +++ multiSelectSortOrder(p, p->pOrderBy); +++ rc = selectInnerLoop(pParse, p, p->pEList, unionTab, p->pEList->nExpr, +++ p->pOrderBy, -1, eDest, iParm, +++ iCont, iBreak); +++ if( rc ) return 1; +++ sqliteVdbeResolveLabel(v, iCont); +++ sqliteVdbeAddOp(v, OP_Next, unionTab, iStart); +++ sqliteVdbeResolveLabel(v, iBreak); +++ sqliteVdbeAddOp(v, OP_Close, unionTab, 0); +++ if( p->pOrderBy ){ +++ generateSortTail(p, v, p->pEList->nExpr, eDest, iParm); +++ } +++ } +++ break; +++ } +++ case TK_INTERSECT: { +++ int tab1, tab2; +++ int iCont, iBreak, iStart; +++ int nLimit, nOffset; +++ +++ /* INTERSECT is different from the others since it requires +++ ** two temporary tables. Hence it has its own case. Begin +++ ** by allocating the tables we will need. +++ */ +++ tab1 = pParse->nTab++; +++ tab2 = pParse->nTab++; +++ if( p->pOrderBy && matchOrderbyToColumn(pParse,p,p->pOrderBy,tab1,1) ){ +++ return 1; +++ } +++ sqliteVdbeAddOp(v, OP_OpenTemp, tab1, 1); +++ sqliteVdbeAddOp(v, OP_KeyAsData, tab1, 1); +++ +++ /* Code the SELECTs to our left into temporary table "tab1". +++ */ +++ rc = sqliteSelect(pParse, pPrior, SRT_Union, tab1, 0, 0, 0); +++ if( rc ) return rc; +++ +++ /* Code the current SELECT into temporary table "tab2" +++ */ +++ sqliteVdbeAddOp(v, OP_OpenTemp, tab2, 1); +++ sqliteVdbeAddOp(v, OP_KeyAsData, tab2, 1); +++ p->pPrior = 0; +++ nLimit = p->nLimit; +++ p->nLimit = -1; +++ nOffset = p->nOffset; +++ p->nOffset = 0; +++ rc = sqliteSelect(pParse, p, SRT_Union, tab2, 0, 0, 0); +++ p->pPrior = pPrior; +++ p->nLimit = nLimit; +++ p->nOffset = nOffset; +++ if( rc ) return rc; +++ +++ /* Generate code to take the intersection of the two temporary +++ ** tables. +++ */ +++ assert( p->pEList ); +++ if( eDest==SRT_Callback ){ +++ generateColumnNames(pParse, 0, p->pEList); +++ generateColumnTypes(pParse, p->pSrc, p->pEList); +++ } +++ iBreak = sqliteVdbeMakeLabel(v); +++ iCont = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_Rewind, tab1, iBreak); +++ computeLimitRegisters(pParse, p); +++ iStart = sqliteVdbeAddOp(v, OP_FullKey, tab1, 0); +++ sqliteVdbeAddOp(v, OP_NotFound, tab2, iCont); +++ multiSelectSortOrder(p, p->pOrderBy); +++ rc = selectInnerLoop(pParse, p, p->pEList, tab1, p->pEList->nExpr, +++ p->pOrderBy, -1, eDest, iParm, +++ iCont, iBreak); +++ if( rc ) return 1; +++ sqliteVdbeResolveLabel(v, iCont); +++ sqliteVdbeAddOp(v, OP_Next, tab1, iStart); +++ sqliteVdbeResolveLabel(v, iBreak); +++ sqliteVdbeAddOp(v, OP_Close, tab2, 0); +++ sqliteVdbeAddOp(v, OP_Close, tab1, 0); +++ if( p->pOrderBy ){ +++ generateSortTail(p, v, p->pEList->nExpr, eDest, iParm); +++ } +++ break; +++ } +++ } +++ assert( p->pEList && pPrior->pEList ); +++ if( p->pEList->nExpr!=pPrior->pEList->nExpr ){ +++ sqliteErrorMsg(pParse, "SELECTs to the left and right of %s" +++ " do not have the same number of result columns", selectOpName(p->op)); +++ return 1; +++ } +++ return 0; +++} +++ +++/* +++** Scan through the expression pExpr. Replace every reference to +++** a column in table number iTable with a copy of the iColumn-th +++** entry in pEList. (But leave references to the ROWID column +++** unchanged.) +++** +++** This routine is part of the flattening procedure. A subquery +++** whose result set is defined by pEList appears as entry in the +++** FROM clause of a SELECT such that the VDBE cursor assigned to that +++** FORM clause entry is iTable. This routine make the necessary +++** changes to pExpr so that it refers directly to the source table +++** of the subquery rather the result set of the subquery. +++*/ +++static void substExprList(ExprList*,int,ExprList*); /* Forward Decl */ +++static void substExpr(Expr *pExpr, int iTable, ExprList *pEList){ +++ if( pExpr==0 ) return; +++ if( pExpr->op==TK_COLUMN && pExpr->iTable==iTable ){ +++ if( pExpr->iColumn<0 ){ +++ pExpr->op = TK_NULL; +++ }else{ +++ Expr *pNew; +++ assert( pEList!=0 && pExpr->iColumnnExpr ); +++ assert( pExpr->pLeft==0 && pExpr->pRight==0 && pExpr->pList==0 ); +++ pNew = pEList->a[pExpr->iColumn].pExpr; +++ assert( pNew!=0 ); +++ pExpr->op = pNew->op; +++ pExpr->dataType = pNew->dataType; +++ assert( pExpr->pLeft==0 ); +++ pExpr->pLeft = sqliteExprDup(pNew->pLeft); +++ assert( pExpr->pRight==0 ); +++ pExpr->pRight = sqliteExprDup(pNew->pRight); +++ assert( pExpr->pList==0 ); +++ pExpr->pList = sqliteExprListDup(pNew->pList); +++ pExpr->iTable = pNew->iTable; +++ pExpr->iColumn = pNew->iColumn; +++ pExpr->iAgg = pNew->iAgg; +++ sqliteTokenCopy(&pExpr->token, &pNew->token); +++ sqliteTokenCopy(&pExpr->span, &pNew->span); +++ } +++ }else{ +++ substExpr(pExpr->pLeft, iTable, pEList); +++ substExpr(pExpr->pRight, iTable, pEList); +++ substExprList(pExpr->pList, iTable, pEList); +++ } +++} +++static void +++substExprList(ExprList *pList, int iTable, ExprList *pEList){ +++ int i; +++ if( pList==0 ) return; +++ for(i=0; inExpr; i++){ +++ substExpr(pList->a[i].pExpr, iTable, pEList); +++ } +++} +++ +++/* +++** This routine attempts to flatten subqueries in order to speed +++** execution. It returns 1 if it makes changes and 0 if no flattening +++** occurs. +++** +++** To understand the concept of flattening, consider the following +++** query: +++** +++** SELECT a FROM (SELECT x+y AS a FROM t1 WHERE z<100) WHERE a>5 +++** +++** The default way of implementing this query is to execute the +++** subquery first and store the results in a temporary table, then +++** run the outer query on that temporary table. This requires two +++** passes over the data. Furthermore, because the temporary table +++** has no indices, the WHERE clause on the outer query cannot be +++** optimized. +++** +++** This routine attempts to rewrite queries such as the above into +++** a single flat select, like this: +++** +++** SELECT x+y AS a FROM t1 WHERE z<100 AND a>5 +++** +++** The code generated for this simpification gives the same result +++** but only has to scan the data once. And because indices might +++** exist on the table t1, a complete scan of the data might be +++** avoided. +++** +++** Flattening is only attempted if all of the following are true: +++** +++** (1) The subquery and the outer query do not both use aggregates. +++** +++** (2) The subquery is not an aggregate or the outer query is not a join. +++** +++** (3) The subquery is not the right operand of a left outer join, or +++** the subquery is not itself a join. (Ticket #306) +++** +++** (4) The subquery is not DISTINCT or the outer query is not a join. +++** +++** (5) The subquery is not DISTINCT or the outer query does not use +++** aggregates. +++** +++** (6) The subquery does not use aggregates or the outer query is not +++** DISTINCT. +++** +++** (7) The subquery has a FROM clause. +++** +++** (8) The subquery does not use LIMIT or the outer query is not a join. +++** +++** (9) The subquery does not use LIMIT or the outer query does not use +++** aggregates. +++** +++** (10) The subquery does not use aggregates or the outer query does not +++** use LIMIT. +++** +++** (11) The subquery and the outer query do not both have ORDER BY clauses. +++** +++** (12) The subquery is not the right term of a LEFT OUTER JOIN or the +++** subquery has no WHERE clause. (added by ticket #350) +++** +++** In this routine, the "p" parameter is a pointer to the outer query. +++** The subquery is p->pSrc->a[iFrom]. isAgg is true if the outer query +++** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates. +++** +++** If flattening is not attempted, this routine is a no-op and returns 0. +++** If flattening is attempted this routine returns 1. +++** +++** All of the expression analysis must occur on both the outer query and +++** the subquery before this routine runs. +++*/ +++static int flattenSubquery( +++ Parse *pParse, /* The parsing context */ +++ Select *p, /* The parent or outer SELECT statement */ +++ int iFrom, /* Index in p->pSrc->a[] of the inner subquery */ +++ int isAgg, /* True if outer SELECT uses aggregate functions */ +++ int subqueryIsAgg /* True if the subquery uses aggregate functions */ +++){ +++ Select *pSub; /* The inner query or "subquery" */ +++ SrcList *pSrc; /* The FROM clause of the outer query */ +++ SrcList *pSubSrc; /* The FROM clause of the subquery */ +++ ExprList *pList; /* The result set of the outer query */ +++ int iParent; /* VDBE cursor number of the pSub result set temp table */ +++ int i; +++ Expr *pWhere; +++ +++ /* Check to see if flattening is permitted. Return 0 if not. +++ */ +++ if( p==0 ) return 0; +++ pSrc = p->pSrc; +++ assert( pSrc && iFrom>=0 && iFromnSrc ); +++ pSub = pSrc->a[iFrom].pSelect; +++ assert( pSub!=0 ); +++ if( isAgg && subqueryIsAgg ) return 0; +++ if( subqueryIsAgg && pSrc->nSrc>1 ) return 0; +++ pSubSrc = pSub->pSrc; +++ assert( pSubSrc ); +++ if( pSubSrc->nSrc==0 ) return 0; +++ if( (pSub->isDistinct || pSub->nLimit>=0) && (pSrc->nSrc>1 || isAgg) ){ +++ return 0; +++ } +++ if( (p->isDistinct || p->nLimit>=0) && subqueryIsAgg ) return 0; +++ if( p->pOrderBy && pSub->pOrderBy ) return 0; +++ +++ /* Restriction 3: If the subquery is a join, make sure the subquery is +++ ** not used as the right operand of an outer join. Examples of why this +++ ** is not allowed: +++ ** +++ ** t1 LEFT OUTER JOIN (t2 JOIN t3) +++ ** +++ ** If we flatten the above, we would get +++ ** +++ ** (t1 LEFT OUTER JOIN t2) JOIN t3 +++ ** +++ ** which is not at all the same thing. +++ */ +++ if( pSubSrc->nSrc>1 && iFrom>0 && (pSrc->a[iFrom-1].jointype & JT_OUTER)!=0 ){ +++ return 0; +++ } +++ +++ /* Restriction 12: If the subquery is the right operand of a left outer +++ ** join, make sure the subquery has no WHERE clause. +++ ** An examples of why this is not allowed: +++ ** +++ ** t1 LEFT OUTER JOIN (SELECT * FROM t2 WHERE t2.x>0) +++ ** +++ ** If we flatten the above, we would get +++ ** +++ ** (t1 LEFT OUTER JOIN t2) WHERE t2.x>0 +++ ** +++ ** But the t2.x>0 test will always fail on a NULL row of t2, which +++ ** effectively converts the OUTER JOIN into an INNER JOIN. +++ */ +++ if( iFrom>0 && (pSrc->a[iFrom-1].jointype & JT_OUTER)!=0 +++ && pSub->pWhere!=0 ){ +++ return 0; +++ } +++ +++ /* If we reach this point, it means flattening is permitted for the +++ ** iFrom-th entry of the FROM clause in the outer query. +++ */ +++ +++ /* Move all of the FROM elements of the subquery into the +++ ** the FROM clause of the outer query. Before doing this, remember +++ ** the cursor number for the original outer query FROM element in +++ ** iParent. The iParent cursor will never be used. Subsequent code +++ ** will scan expressions looking for iParent references and replace +++ ** those references with expressions that resolve to the subquery FROM +++ ** elements we are now copying in. +++ */ +++ iParent = pSrc->a[iFrom].iCursor; +++ { +++ int nSubSrc = pSubSrc->nSrc; +++ int jointype = pSrc->a[iFrom].jointype; +++ +++ if( pSrc->a[iFrom].pTab && pSrc->a[iFrom].pTab->isTransient ){ +++ sqliteDeleteTable(0, pSrc->a[iFrom].pTab); +++ } +++ sqliteFree(pSrc->a[iFrom].zDatabase); +++ sqliteFree(pSrc->a[iFrom].zName); +++ sqliteFree(pSrc->a[iFrom].zAlias); +++ if( nSubSrc>1 ){ +++ int extra = nSubSrc - 1; +++ for(i=1; ipSrc = pSrc; +++ for(i=pSrc->nSrc-1; i-extra>=iFrom; i--){ +++ pSrc->a[i] = pSrc->a[i-extra]; +++ } +++ } +++ for(i=0; ia[i+iFrom] = pSubSrc->a[i]; +++ memset(&pSubSrc->a[i], 0, sizeof(pSubSrc->a[i])); +++ } +++ pSrc->a[iFrom+nSubSrc-1].jointype = jointype; +++ } +++ +++ /* Now begin substituting subquery result set expressions for +++ ** references to the iParent in the outer query. +++ ** +++ ** Example: +++ ** +++ ** SELECT a+5, b*10 FROM (SELECT x*3 AS a, y+10 AS b FROM t1) WHERE a>b; +++ ** \ \_____________ subquery __________/ / +++ ** \_____________________ outer query ______________________________/ +++ ** +++ ** We look at every expression in the outer query and every place we see +++ ** "a" we substitute "x*3" and every place we see "b" we substitute "y+10". +++ */ +++ substExprList(p->pEList, iParent, pSub->pEList); +++ pList = p->pEList; +++ for(i=0; inExpr; i++){ +++ Expr *pExpr; +++ if( pList->a[i].zName==0 && (pExpr = pList->a[i].pExpr)->span.z!=0 ){ +++ pList->a[i].zName = sqliteStrNDup(pExpr->span.z, pExpr->span.n); +++ } +++ } +++ if( isAgg ){ +++ substExprList(p->pGroupBy, iParent, pSub->pEList); +++ substExpr(p->pHaving, iParent, pSub->pEList); +++ } +++ if( pSub->pOrderBy ){ +++ assert( p->pOrderBy==0 ); +++ p->pOrderBy = pSub->pOrderBy; +++ pSub->pOrderBy = 0; +++ }else if( p->pOrderBy ){ +++ substExprList(p->pOrderBy, iParent, pSub->pEList); +++ } +++ if( pSub->pWhere ){ +++ pWhere = sqliteExprDup(pSub->pWhere); +++ }else{ +++ pWhere = 0; +++ } +++ if( subqueryIsAgg ){ +++ assert( p->pHaving==0 ); +++ p->pHaving = p->pWhere; +++ p->pWhere = pWhere; +++ substExpr(p->pHaving, iParent, pSub->pEList); +++ if( pSub->pHaving ){ +++ Expr *pHaving = sqliteExprDup(pSub->pHaving); +++ if( p->pHaving ){ +++ p->pHaving = sqliteExpr(TK_AND, p->pHaving, pHaving, 0); +++ }else{ +++ p->pHaving = pHaving; +++ } +++ } +++ assert( p->pGroupBy==0 ); +++ p->pGroupBy = sqliteExprListDup(pSub->pGroupBy); +++ }else if( p->pWhere==0 ){ +++ p->pWhere = pWhere; +++ }else{ +++ substExpr(p->pWhere, iParent, pSub->pEList); +++ if( pWhere ){ +++ p->pWhere = sqliteExpr(TK_AND, p->pWhere, pWhere, 0); +++ } +++ } +++ +++ /* The flattened query is distinct if either the inner or the +++ ** outer query is distinct. +++ */ +++ p->isDistinct = p->isDistinct || pSub->isDistinct; +++ +++ /* Transfer the limit expression from the subquery to the outer +++ ** query. +++ */ +++ if( pSub->nLimit>=0 ){ +++ if( p->nLimit<0 ){ +++ p->nLimit = pSub->nLimit; +++ }else if( p->nLimit+p->nOffset > pSub->nLimit+pSub->nOffset ){ +++ p->nLimit = pSub->nLimit + pSub->nOffset - p->nOffset; +++ } +++ } +++ p->nOffset += pSub->nOffset; +++ +++ /* Finially, delete what is left of the subquery and return +++ ** success. +++ */ +++ sqliteSelectDelete(pSub); +++ return 1; +++} +++ +++/* +++** Analyze the SELECT statement passed in as an argument to see if it +++** is a simple min() or max() query. If it is and this query can be +++** satisfied using a single seek to the beginning or end of an index, +++** then generate the code for this SELECT and return 1. If this is not a +++** simple min() or max() query, then return 0; +++** +++** A simply min() or max() query looks like this: +++** +++** SELECT min(a) FROM table; +++** SELECT max(a) FROM table; +++** +++** The query may have only a single table in its FROM argument. There +++** can be no GROUP BY or HAVING or WHERE clauses. The result set must +++** be the min() or max() of a single column of the table. The column +++** in the min() or max() function must be indexed. +++** +++** The parameters to this routine are the same as for sqliteSelect(). +++** See the header comment on that routine for additional information. +++*/ +++static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ +++ Expr *pExpr; +++ int iCol; +++ Table *pTab; +++ Index *pIdx; +++ int base; +++ Vdbe *v; +++ int seekOp; +++ int cont; +++ ExprList *pEList, *pList, eList; +++ struct ExprList_item eListItem; +++ SrcList *pSrc; +++ +++ +++ /* Check to see if this query is a simple min() or max() query. Return +++ ** zero if it is not. +++ */ +++ if( p->pGroupBy || p->pHaving || p->pWhere ) return 0; +++ pSrc = p->pSrc; +++ if( pSrc->nSrc!=1 ) return 0; +++ pEList = p->pEList; +++ if( pEList->nExpr!=1 ) return 0; +++ pExpr = pEList->a[0].pExpr; +++ if( pExpr->op!=TK_AGG_FUNCTION ) return 0; +++ pList = pExpr->pList; +++ if( pList==0 || pList->nExpr!=1 ) return 0; +++ if( pExpr->token.n!=3 ) return 0; +++ if( sqliteStrNICmp(pExpr->token.z,"min",3)==0 ){ +++ seekOp = OP_Rewind; +++ }else if( sqliteStrNICmp(pExpr->token.z,"max",3)==0 ){ +++ seekOp = OP_Last; +++ }else{ +++ return 0; +++ } +++ pExpr = pList->a[0].pExpr; +++ if( pExpr->op!=TK_COLUMN ) return 0; +++ iCol = pExpr->iColumn; +++ pTab = pSrc->a[0].pTab; +++ +++ /* If we get to here, it means the query is of the correct form. +++ ** Check to make sure we have an index and make pIdx point to the +++ ** appropriate index. If the min() or max() is on an INTEGER PRIMARY +++ ** key column, no index is necessary so set pIdx to NULL. If no +++ ** usable index is found, return 0. +++ */ +++ if( iCol<0 ){ +++ pIdx = 0; +++ }else{ +++ for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){ +++ assert( pIdx->nColumn>=1 ); +++ if( pIdx->aiColumn[0]==iCol ) break; +++ } +++ if( pIdx==0 ) return 0; +++ } +++ +++ /* Identify column types if we will be using the callback. This +++ ** step is skipped if the output is going to a table or a memory cell. +++ ** The column names have already been generated in the calling function. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) return 0; +++ if( eDest==SRT_Callback ){ +++ generateColumnTypes(pParse, p->pSrc, p->pEList); +++ } +++ +++ /* If the output is destined for a temporary table, open that table. +++ */ +++ if( eDest==SRT_TempTable ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); +++ } +++ +++ /* Generating code to find the min or the max. Basically all we have +++ ** to do is find the first or the last entry in the chosen index. If +++ ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first +++ ** or last entry in the main table. +++ */ +++ sqliteCodeVerifySchema(pParse, pTab->iDb); +++ base = pSrc->a[0].iCursor; +++ computeLimitRegisters(pParse, p); +++ if( pSrc->a[0].pSelect==0 ){ +++ sqliteVdbeAddOp(v, OP_Integer, pTab->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, base, pTab->tnum, pTab->zName, 0); +++ } +++ cont = sqliteVdbeMakeLabel(v); +++ if( pIdx==0 ){ +++ sqliteVdbeAddOp(v, seekOp, base, 0); +++ }else{ +++ sqliteVdbeAddOp(v, OP_Integer, pIdx->iDb, 0); +++ sqliteVdbeOp3(v, OP_OpenRead, base+1, pIdx->tnum, pIdx->zName, P3_STATIC); +++ if( seekOp==OP_Rewind ){ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_MakeKey, 1, 0); +++ sqliteVdbeAddOp(v, OP_IncrKey, 0, 0); +++ seekOp = OP_MoveTo; +++ } +++ sqliteVdbeAddOp(v, seekOp, base+1, 0); +++ sqliteVdbeAddOp(v, OP_IdxRecno, base+1, 0); +++ sqliteVdbeAddOp(v, OP_Close, base+1, 0); +++ sqliteVdbeAddOp(v, OP_MoveTo, base, 0); +++ } +++ eList.nExpr = 1; +++ memset(&eListItem, 0, sizeof(eListItem)); +++ eList.a = &eListItem; +++ eList.a[0].pExpr = pExpr; +++ selectInnerLoop(pParse, p, &eList, 0, 0, 0, -1, eDest, iParm, cont, cont); +++ sqliteVdbeResolveLabel(v, cont); +++ sqliteVdbeAddOp(v, OP_Close, base, 0); +++ +++ return 1; +++} +++ +++/* +++** Generate code for the given SELECT statement. +++** +++** The results are distributed in various ways depending on the +++** value of eDest and iParm. +++** +++** eDest Value Result +++** ------------ ------------------------------------------- +++** SRT_Callback Invoke the callback for each row of the result. +++** +++** SRT_Mem Store first result in memory cell iParm +++** +++** SRT_Set Store results as keys of a table with cursor iParm +++** +++** SRT_Union Store results as a key in a temporary table iParm +++** +++** SRT_Except Remove results from the temporary table iParm. +++** +++** SRT_Table Store results in temporary table iParm +++** +++** The table above is incomplete. Additional eDist value have be added +++** since this comment was written. See the selectInnerLoop() function for +++** a complete listing of the allowed values of eDest and their meanings. +++** +++** This routine returns the number of errors. If any errors are +++** encountered, then an appropriate error message is left in +++** pParse->zErrMsg. +++** +++** This routine does NOT free the Select structure passed in. The +++** calling function needs to do that. +++** +++** The pParent, parentTab, and *pParentAgg fields are filled in if this +++** SELECT is a subquery. This routine may try to combine this SELECT +++** with its parent to form a single flat query. In so doing, it might +++** change the parent query from a non-aggregate to an aggregate query. +++** For that reason, the pParentAgg flag is passed as a pointer, so it +++** can be changed. +++** +++** Example 1: The meaning of the pParent parameter. +++** +++** SELECT * FROM t1 JOIN (SELECT x, count(*) FROM t2) JOIN t3; +++** \ \_______ subquery _______/ / +++** \ / +++** \____________________ outer query ___________________/ +++** +++** This routine is called for the outer query first. For that call, +++** pParent will be NULL. During the processing of the outer query, this +++** routine is called recursively to handle the subquery. For the recursive +++** call, pParent will point to the outer query. Because the subquery is +++** the second element in a three-way join, the parentTab parameter will +++** be 1 (the 2nd value of a 0-indexed array.) +++*/ +++int sqliteSelect( +++ Parse *pParse, /* The parser context */ +++ Select *p, /* The SELECT statement being coded. */ +++ int eDest, /* How to dispose of the results */ +++ int iParm, /* A parameter used by the eDest disposal method */ +++ Select *pParent, /* Another SELECT for which this is a sub-query */ +++ int parentTab, /* Index in pParent->pSrc of this query */ +++ int *pParentAgg /* True if pParent uses aggregate functions */ +++){ +++ int i; +++ WhereInfo *pWInfo; +++ Vdbe *v; +++ int isAgg = 0; /* True for select lists like "count(*)" */ +++ ExprList *pEList; /* List of columns to extract. */ +++ SrcList *pTabList; /* List of tables to select from */ +++ Expr *pWhere; /* The WHERE clause. May be NULL */ +++ ExprList *pOrderBy; /* The ORDER BY clause. May be NULL */ +++ ExprList *pGroupBy; /* The GROUP BY clause. May be NULL */ +++ Expr *pHaving; /* The HAVING clause. May be NULL */ +++ int isDistinct; /* True if the DISTINCT keyword is present */ +++ int distinct; /* Table to use for the distinct set */ +++ int rc = 1; /* Value to return from this function */ +++ +++ if( sqlite_malloc_failed || pParse->nErr || p==0 ) return 1; +++ if( sqliteAuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1; +++ +++ /* If there is are a sequence of queries, do the earlier ones first. +++ */ +++ if( p->pPrior ){ +++ return multiSelect(pParse, p, eDest, iParm); +++ } +++ +++ /* Make local copies of the parameters for this query. +++ */ +++ pTabList = p->pSrc; +++ pWhere = p->pWhere; +++ pOrderBy = p->pOrderBy; +++ pGroupBy = p->pGroupBy; +++ pHaving = p->pHaving; +++ isDistinct = p->isDistinct; +++ +++ /* Allocate VDBE cursors for each table in the FROM clause +++ */ +++ sqliteSrcListAssignCursors(pParse, pTabList); +++ +++ /* +++ ** Do not even attempt to generate any code if we have already seen +++ ** errors before this routine starts. +++ */ +++ if( pParse->nErr>0 ) goto select_end; +++ +++ /* Expand any "*" terms in the result set. (For example the "*" in +++ ** "SELECT * FROM t1") The fillInColumnlist() routine also does some +++ ** other housekeeping - see the header comment for details. +++ */ +++ if( fillInColumnList(pParse, p) ){ +++ goto select_end; +++ } +++ pWhere = p->pWhere; +++ pEList = p->pEList; +++ if( pEList==0 ) goto select_end; +++ +++ /* If writing to memory or generating a set +++ ** only a single column may be output. +++ */ +++ if( (eDest==SRT_Mem || eDest==SRT_Set) && pEList->nExpr>1 ){ +++ sqliteErrorMsg(pParse, "only a single result allowed for " +++ "a SELECT that is part of an expression"); +++ goto select_end; +++ } +++ +++ /* ORDER BY is ignored for some destinations. +++ */ +++ switch( eDest ){ +++ case SRT_Union: +++ case SRT_Except: +++ case SRT_Discard: +++ pOrderBy = 0; +++ break; +++ default: +++ break; +++ } +++ +++ /* At this point, we should have allocated all the cursors that we +++ ** need to handle subquerys and temporary tables. +++ ** +++ ** Resolve the column names and do a semantics check on all the expressions. +++ */ +++ for(i=0; inExpr; i++){ +++ if( sqliteExprResolveIds(pParse, pTabList, 0, pEList->a[i].pExpr) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pEList->a[i].pExpr, 1, &isAgg) ){ +++ goto select_end; +++ } +++ } +++ if( pWhere ){ +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pWhere) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pWhere, 0, 0) ){ +++ goto select_end; +++ } +++ } +++ if( pHaving ){ +++ if( pGroupBy==0 ){ +++ sqliteErrorMsg(pParse, "a GROUP BY clause is required before HAVING"); +++ goto select_end; +++ } +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pHaving) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pHaving, 1, &isAgg) ){ +++ goto select_end; +++ } +++ } +++ if( pOrderBy ){ +++ for(i=0; inExpr; i++){ +++ int iCol; +++ Expr *pE = pOrderBy->a[i].pExpr; +++ if( sqliteExprIsInteger(pE, &iCol) && iCol>0 && iCol<=pEList->nExpr ){ +++ sqliteExprDelete(pE); +++ pE = pOrderBy->a[i].pExpr = sqliteExprDup(pEList->a[iCol-1].pExpr); +++ } +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pE) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pE, isAgg, 0) ){ +++ goto select_end; +++ } +++ if( sqliteExprIsConstant(pE) ){ +++ if( sqliteExprIsInteger(pE, &iCol)==0 ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY terms must not be non-integer constants"); +++ goto select_end; +++ }else if( iCol<=0 || iCol>pEList->nExpr ){ +++ sqliteErrorMsg(pParse, +++ "ORDER BY column number %d out of range - should be " +++ "between 1 and %d", iCol, pEList->nExpr); +++ goto select_end; +++ } +++ } +++ } +++ } +++ if( pGroupBy ){ +++ for(i=0; inExpr; i++){ +++ int iCol; +++ Expr *pE = pGroupBy->a[i].pExpr; +++ if( sqliteExprIsInteger(pE, &iCol) && iCol>0 && iCol<=pEList->nExpr ){ +++ sqliteExprDelete(pE); +++ pE = pGroupBy->a[i].pExpr = sqliteExprDup(pEList->a[iCol-1].pExpr); +++ } +++ if( sqliteExprResolveIds(pParse, pTabList, pEList, pE) ){ +++ goto select_end; +++ } +++ if( sqliteExprCheck(pParse, pE, isAgg, 0) ){ +++ goto select_end; +++ } +++ if( sqliteExprIsConstant(pE) ){ +++ if( sqliteExprIsInteger(pE, &iCol)==0 ){ +++ sqliteErrorMsg(pParse, +++ "GROUP BY terms must not be non-integer constants"); +++ goto select_end; +++ }else if( iCol<=0 || iCol>pEList->nExpr ){ +++ sqliteErrorMsg(pParse, +++ "GROUP BY column number %d out of range - should be " +++ "between 1 and %d", iCol, pEList->nExpr); +++ goto select_end; +++ } +++ } +++ } +++ } +++ +++ /* Begin generating code. +++ */ +++ v = sqliteGetVdbe(pParse); +++ if( v==0 ) goto select_end; +++ +++ /* Identify column names if we will be using them in a callback. This +++ ** step is skipped if the output is going to some other destination. +++ */ +++ if( eDest==SRT_Callback ){ +++ generateColumnNames(pParse, pTabList, pEList); +++ } +++ +++ /* Generate code for all sub-queries in the FROM clause +++ */ +++ for(i=0; inSrc; i++){ +++ const char *zSavedAuthContext; +++ int needRestoreContext; +++ +++ if( pTabList->a[i].pSelect==0 ) continue; +++ if( pTabList->a[i].zName!=0 ){ +++ zSavedAuthContext = pParse->zAuthContext; +++ pParse->zAuthContext = pTabList->a[i].zName; +++ needRestoreContext = 1; +++ }else{ +++ needRestoreContext = 0; +++ } +++ sqliteSelect(pParse, pTabList->a[i].pSelect, SRT_TempTable, +++ pTabList->a[i].iCursor, p, i, &isAgg); +++ if( needRestoreContext ){ +++ pParse->zAuthContext = zSavedAuthContext; +++ } +++ pTabList = p->pSrc; +++ pWhere = p->pWhere; +++ if( eDest!=SRT_Union && eDest!=SRT_Except && eDest!=SRT_Discard ){ +++ pOrderBy = p->pOrderBy; +++ } +++ pGroupBy = p->pGroupBy; +++ pHaving = p->pHaving; +++ isDistinct = p->isDistinct; +++ } +++ +++ /* Check for the special case of a min() or max() function by itself +++ ** in the result set. +++ */ +++ if( simpleMinMaxQuery(pParse, p, eDest, iParm) ){ +++ rc = 0; +++ goto select_end; +++ } +++ +++ /* Check to see if this is a subquery that can be "flattened" into its parent. +++ ** If flattening is a possiblity, do so and return immediately. +++ */ +++ if( pParent && pParentAgg && +++ flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){ +++ if( isAgg ) *pParentAgg = 1; +++ return rc; +++ } +++ +++ /* Set the limiter. +++ */ +++ computeLimitRegisters(pParse, p); +++ +++ /* Identify column types if we will be using a callback. This +++ ** step is skipped if the output is going to a destination other +++ ** than a callback. +++ ** +++ ** We have to do this separately from the creation of column names +++ ** above because if the pTabList contains views then they will not +++ ** have been resolved and we will not know the column types until +++ ** now. +++ */ +++ if( eDest==SRT_Callback ){ +++ generateColumnTypes(pParse, pTabList, pEList); +++ } +++ +++ /* If the output is destined for a temporary table, open that table. +++ */ +++ if( eDest==SRT_TempTable ){ +++ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); +++ } +++ +++ /* Do an analysis of aggregate expressions. +++ */ +++ sqliteAggregateInfoReset(pParse); +++ if( isAgg || pGroupBy ){ +++ assert( pParse->nAgg==0 ); +++ isAgg = 1; +++ for(i=0; inExpr; i++){ +++ if( sqliteExprAnalyzeAggregates(pParse, pEList->a[i].pExpr) ){ +++ goto select_end; +++ } +++ } +++ if( pGroupBy ){ +++ for(i=0; inExpr; i++){ +++ if( sqliteExprAnalyzeAggregates(pParse, pGroupBy->a[i].pExpr) ){ +++ goto select_end; +++ } +++ } +++ } +++ if( pHaving && sqliteExprAnalyzeAggregates(pParse, pHaving) ){ +++ goto select_end; +++ } +++ if( pOrderBy ){ +++ for(i=0; inExpr; i++){ +++ if( sqliteExprAnalyzeAggregates(pParse, pOrderBy->a[i].pExpr) ){ +++ goto select_end; +++ } +++ } +++ } +++ } +++ +++ /* Reset the aggregator +++ */ +++ if( isAgg ){ +++ sqliteVdbeAddOp(v, OP_AggReset, 0, pParse->nAgg); +++ for(i=0; inAgg; i++){ +++ FuncDef *pFunc; +++ if( (pFunc = pParse->aAgg[i].pFunc)!=0 && pFunc->xFinalize!=0 ){ +++ sqliteVdbeOp3(v, OP_AggInit, 0, i, (char*)pFunc, P3_POINTER); +++ } +++ } +++ if( pGroupBy==0 ){ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_AggFocus, 0, 0); +++ } +++ } +++ +++ /* Initialize the memory cell to NULL +++ */ +++ if( eDest==SRT_Mem ){ +++ sqliteVdbeAddOp(v, OP_String, 0, 0); +++ sqliteVdbeAddOp(v, OP_MemStore, iParm, 1); +++ } +++ +++ /* Open a temporary table to use for the distinct set. +++ */ +++ if( isDistinct ){ +++ distinct = pParse->nTab++; +++ sqliteVdbeAddOp(v, OP_OpenTemp, distinct, 1); +++ }else{ +++ distinct = -1; +++ } +++ +++ /* Begin the database scan +++ */ +++ pWInfo = sqliteWhereBegin(pParse, pTabList, pWhere, 0, +++ pGroupBy ? 0 : &pOrderBy); +++ if( pWInfo==0 ) goto select_end; +++ +++ /* Use the standard inner loop if we are not dealing with +++ ** aggregates +++ */ +++ if( !isAgg ){ +++ if( selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, eDest, +++ iParm, pWInfo->iContinue, pWInfo->iBreak) ){ +++ goto select_end; +++ } +++ } +++ +++ /* If we are dealing with aggregates, then do the special aggregate +++ ** processing. +++ */ +++ else{ +++ AggExpr *pAgg; +++ if( pGroupBy ){ +++ int lbl1; +++ for(i=0; inExpr; i++){ +++ sqliteExprCode(pParse, pGroupBy->a[i].pExpr); +++ } +++ sqliteVdbeAddOp(v, OP_MakeKey, pGroupBy->nExpr, 0); +++ if( pParse->db->file_format>=4 ) sqliteAddKeyType(v, pGroupBy); +++ lbl1 = sqliteVdbeMakeLabel(v); +++ sqliteVdbeAddOp(v, OP_AggFocus, 0, lbl1); +++ for(i=0, pAgg=pParse->aAgg; inAgg; i++, pAgg++){ +++ if( pAgg->isAgg ) continue; +++ sqliteExprCode(pParse, pAgg->pExpr); +++ sqliteVdbeAddOp(v, OP_AggSet, 0, i); +++ } +++ sqliteVdbeResolveLabel(v, lbl1); +++ } +++ for(i=0, pAgg=pParse->aAgg; inAgg; i++, pAgg++){ +++ Expr *pE; +++ int nExpr; +++ FuncDef *pDef; +++ if( !pAgg->isAgg ) continue; +++ assert( pAgg->pFunc!=0 ); +++ assert( pAgg->pFunc->xStep!=0 ); +++ pDef = pAgg->pFunc; +++ pE = pAgg->pExpr; +++ assert( pE!=0 ); +++ assert( pE->op==TK_AGG_FUNCTION ); +++ nExpr = sqliteExprCodeExprList(pParse, pE->pList, pDef->includeTypes); +++ sqliteVdbeAddOp(v, OP_Integer, i, 0); +++ sqliteVdbeOp3(v, OP_AggFunc, 0, nExpr, (char*)pDef, P3_POINTER); +++ } +++ } +++ +++ /* End the database scan loop. +++ */ +++ sqliteWhereEnd(pWInfo); +++ +++ /* If we are processing aggregates, we need to set up a second loop +++ ** over all of the aggregate values and process them. +++ */ +++ if( isAgg ){ +++ int endagg = sqliteVdbeMakeLabel(v); +++ int startagg; +++ startagg = sqliteVdbeAddOp(v, OP_AggNext, 0, endagg); +++ pParse->useAgg = 1; +++ if( pHaving ){ +++ sqliteExprIfFalse(pParse, pHaving, startagg, 1); +++ } +++ if( selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, distinct, eDest, +++ iParm, startagg, endagg) ){ +++ goto select_end; +++ } +++ sqliteVdbeAddOp(v, OP_Goto, 0, startagg); +++ sqliteVdbeResolveLabel(v, endagg); +++ sqliteVdbeAddOp(v, OP_Noop, 0, 0); +++ pParse->useAgg = 0; +++ } +++ +++ /* If there is an ORDER BY clause, then we need to sort the results +++ ** and send them to the callback one by one. +++ */ +++ if( pOrderBy ){ +++ generateSortTail(p, v, pEList->nExpr, eDest, iParm); +++ } +++ +++ /* If this was a subquery, we have now converted the subquery into a +++ ** temporary table. So delete the subquery structure from the parent +++ ** to prevent this subquery from being evaluated again and to force the +++ ** the use of the temporary table. +++ */ +++ if( pParent ){ +++ assert( pParent->pSrc->nSrc>parentTab ); +++ assert( pParent->pSrc->a[parentTab].pSelect==p ); +++ sqliteSelectDelete(p); +++ pParent->pSrc->a[parentTab].pSelect = 0; +++ } +++ +++ /* The SELECT was successfully coded. Set the return code to 0 +++ ** to indicate no errors. +++ */ +++ rc = 0; +++ +++ /* Control jumps to here if an error is encountered above, or upon +++ ** successful coding of the SELECT. +++ */ +++select_end: +++ sqliteAggregateInfoReset(pParse); +++ return rc; +++} ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/sqlite_config.w32.h ++@@ -0,0 +1,8 @@ +++#include "config.w32.h" +++#if ZTS +++# define THREADSAFE 1 +++#endif +++#if !ZEND_DEBUG && !defined(NDEBUG) +++# define NDEBUG +++#endif +++#define SQLITE_PTR_SZ 4 ++\ No newline at end of file ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/sqlite.h.in ++@@ -0,0 +1,886 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** This header file defines the interface that the SQLite library +++** presents to client programs. +++** +++** @(#) $Id$ +++*/ +++#ifndef _SQLITE_H_ +++#define _SQLITE_H_ +++#include /* Needed for the definition of va_list */ +++ +++/* +++** Make sure we can call this stuff from C++. +++*/ +++#ifdef __cplusplus +++extern "C" { +++#endif +++ +++/* +++** The version of the SQLite library. +++*/ +++#ifdef SQLITE_VERSION +++# undef SQLITE_VERSION +++#else +++# define SQLITE_VERSION "--VERS--" +++#endif +++ +++/* +++** The version string is also compiled into the library so that a program +++** can check to make sure that the lib*.a file and the *.h file are from +++** the same version. +++*/ +++extern const char sqlite_version[]; +++ +++/* +++** The SQLITE_UTF8 macro is defined if the library expects to see +++** UTF-8 encoded data. The SQLITE_ISO8859 macro is defined if the +++** iso8859 encoded should be used. +++*/ +++#define SQLITE_--ENCODING-- 1 +++ +++/* +++** The following constant holds one of two strings, "UTF-8" or "iso8859", +++** depending on which character encoding the SQLite library expects to +++** see. The character encoding makes a difference for the LIKE and GLOB +++** operators and for the LENGTH() and SUBSTR() functions. +++*/ +++extern const char sqlite_encoding[]; +++ +++/* +++** Each open sqlite database is represented by an instance of the +++** following opaque structure. +++*/ +++typedef struct sqlite sqlite; +++ +++/* +++** A function to open a new sqlite database. +++** +++** If the database does not exist and mode indicates write +++** permission, then a new database is created. If the database +++** does not exist and mode does not indicate write permission, +++** then the open fails, an error message generated (if errmsg!=0) +++** and the function returns 0. +++** +++** If mode does not indicates user write permission, then the +++** database is opened read-only. +++** +++** The Truth: As currently implemented, all databases are opened +++** for writing all the time. Maybe someday we will provide the +++** ability to open a database readonly. The mode parameters is +++** provided in anticipation of that enhancement. +++*/ +++sqlite *sqlite_open(const char *filename, int mode, char **errmsg); +++ +++/* +++** A function to close the database. +++** +++** Call this function with a pointer to a structure that was previously +++** returned from sqlite_open() and the corresponding database will by closed. +++*/ +++void sqlite_close(sqlite *); +++ +++/* +++** The type for a callback function. +++*/ +++typedef int (*sqlite_callback)(void*,int,char**, char**); +++ +++/* +++** A function to executes one or more statements of SQL. +++** +++** If one or more of the SQL statements are queries, then +++** the callback function specified by the 3rd parameter is +++** invoked once for each row of the query result. This callback +++** should normally return 0. If the callback returns a non-zero +++** value then the query is aborted, all subsequent SQL statements +++** are skipped and the sqlite_exec() function returns the SQLITE_ABORT. +++** +++** The 4th parameter is an arbitrary pointer that is passed +++** to the callback function as its first parameter. +++** +++** The 2nd parameter to the callback function is the number of +++** columns in the query result. The 3rd parameter to the callback +++** is an array of strings holding the values for each column. +++** The 4th parameter to the callback is an array of strings holding +++** the names of each column. +++** +++** The callback function may be NULL, even for queries. A NULL +++** callback is not an error. It just means that no callback +++** will be invoked. +++** +++** If an error occurs while parsing or evaluating the SQL (but +++** not while executing the callback) then an appropriate error +++** message is written into memory obtained from malloc() and +++** *errmsg is made to point to that message. The calling function +++** is responsible for freeing the memory that holds the error +++** message. Use sqlite_freemem() for this. If errmsg==NULL, +++** then no error message is ever written. +++** +++** The return value is is SQLITE_OK if there are no errors and +++** some other return code if there is an error. The particular +++** return value depends on the type of error. +++** +++** If the query could not be executed because a database file is +++** locked or busy, then this function returns SQLITE_BUSY. (This +++** behavior can be modified somewhat using the sqlite_busy_handler() +++** and sqlite_busy_timeout() functions below.) +++*/ +++int sqlite_exec( +++ sqlite*, /* An open database */ +++ const char *sql, /* SQL to be executed */ +++ sqlite_callback, /* Callback function */ +++ void *, /* 1st argument to callback function */ +++ char **errmsg /* Error msg written here */ +++); +++ +++/* +++** Return values for sqlite_exec() and sqlite_step() +++*/ +++#define SQLITE_OK 0 /* Successful result */ +++#define SQLITE_ERROR 1 /* SQL error or missing database */ +++#define SQLITE_INTERNAL 2 /* An internal logic error in SQLite */ +++#define SQLITE_PERM 3 /* Access permission denied */ +++#define SQLITE_ABORT 4 /* Callback routine requested an abort */ +++#define SQLITE_BUSY 5 /* The database file is locked */ +++#define SQLITE_LOCKED 6 /* A table in the database is locked */ +++#define SQLITE_NOMEM 7 /* A malloc() failed */ +++#define SQLITE_READONLY 8 /* Attempt to write a readonly database */ +++#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite_interrupt() */ +++#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ +++#define SQLITE_CORRUPT 11 /* The database disk image is malformed */ +++#define SQLITE_NOTFOUND 12 /* (Internal Only) Table or record not found */ +++#define SQLITE_FULL 13 /* Insertion failed because database is full */ +++#define SQLITE_CANTOPEN 14 /* Unable to open the database file */ +++#define SQLITE_PROTOCOL 15 /* Database lock protocol error */ +++#define SQLITE_EMPTY 16 /* (Internal Only) Database table is empty */ +++#define SQLITE_SCHEMA 17 /* The database schema changed */ +++#define SQLITE_TOOBIG 18 /* Too much data for one row of a table */ +++#define SQLITE_CONSTRAINT 19 /* Abort due to contraint violation */ +++#define SQLITE_MISMATCH 20 /* Data type mismatch */ +++#define SQLITE_MISUSE 21 /* Library used incorrectly */ +++#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ +++#define SQLITE_AUTH 23 /* Authorization denied */ +++#define SQLITE_FORMAT 24 /* Auxiliary database format error */ +++#define SQLITE_RANGE 25 /* 2nd parameter to sqlite_bind out of range */ +++#define SQLITE_NOTADB 26 /* File opened that is not a database file */ +++#define SQLITE_ROW 100 /* sqlite_step() has another row ready */ +++#define SQLITE_DONE 101 /* sqlite_step() has finished executing */ +++ +++/* +++** Each entry in an SQLite table has a unique integer key. (The key is +++** the value of the INTEGER PRIMARY KEY column if there is such a column, +++** otherwise the key is generated at random. The unique key is always +++** available as the ROWID, OID, or _ROWID_ column.) The following routine +++** returns the integer key of the most recent insert in the database. +++** +++** This function is similar to the mysql_insert_id() function from MySQL. +++*/ +++int sqlite_last_insert_rowid(sqlite*); +++ +++/* +++** This function returns the number of database rows that were changed +++** (or inserted or deleted) by the most recent called sqlite_exec(). +++** +++** All changes are counted, even if they were later undone by a +++** ROLLBACK or ABORT. Except, changes associated with creating and +++** dropping tables are not counted. +++** +++** If a callback invokes sqlite_exec() recursively, then the changes +++** in the inner, recursive call are counted together with the changes +++** in the outer call. +++** +++** SQLite implements the command "DELETE FROM table" without a WHERE clause +++** by dropping and recreating the table. (This is much faster than going +++** through and deleting individual elements form the table.) Because of +++** this optimization, the change count for "DELETE FROM table" will be +++** zero regardless of the number of elements that were originally in the +++** table. To get an accurate count of the number of rows deleted, use +++** "DELETE FROM table WHERE 1" instead. +++*/ +++int sqlite_changes(sqlite*); +++ +++/* +++** This function returns the number of database rows that were changed +++** by the last INSERT, UPDATE, or DELETE statment executed by sqlite_exec(), +++** or by the last VM to run to completion. The change count is not updated +++** by SQL statements other than INSERT, UPDATE or DELETE. +++** +++** Changes are counted, even if they are later undone by a ROLLBACK or +++** ABORT. Changes associated with trigger programs that execute as a +++** result of the INSERT, UPDATE, or DELETE statement are not counted. +++** +++** If a callback invokes sqlite_exec() recursively, then the changes +++** in the inner, recursive call are counted together with the changes +++** in the outer call. +++** +++** SQLite implements the command "DELETE FROM table" without a WHERE clause +++** by dropping and recreating the table. (This is much faster than going +++** through and deleting individual elements form the table.) Because of +++** this optimization, the change count for "DELETE FROM table" will be +++** zero regardless of the number of elements that were originally in the +++** table. To get an accurate count of the number of rows deleted, use +++** "DELETE FROM table WHERE 1" instead. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++int sqlite_last_statement_changes(sqlite*); +++ +++/* If the parameter to this routine is one of the return value constants +++** defined above, then this routine returns a constant text string which +++** descripts (in English) the meaning of the return value. +++*/ +++const char *sqlite_error_string(int); +++#define sqliteErrStr sqlite_error_string /* Legacy. Do not use in new code. */ +++ +++/* This function causes any pending database operation to abort and +++** return at its earliest opportunity. This routine is typically +++** called in response to a user action such as pressing "Cancel" +++** or Ctrl-C where the user wants a long query operation to halt +++** immediately. +++*/ +++void sqlite_interrupt(sqlite*); +++ +++ +++/* This function returns true if the given input string comprises +++** one or more complete SQL statements. +++** +++** The algorithm is simple. If the last token other than spaces +++** and comments is a semicolon, then return true. otherwise return +++** false. +++*/ +++int sqlite_complete(const char *sql); +++ +++/* +++** This routine identifies a callback function that is invoked +++** whenever an attempt is made to open a database table that is +++** currently locked by another process or thread. If the busy callback +++** is NULL, then sqlite_exec() returns SQLITE_BUSY immediately if +++** it finds a locked table. If the busy callback is not NULL, then +++** sqlite_exec() invokes the callback with three arguments. The +++** second argument is the name of the locked table and the third +++** argument is the number of times the table has been busy. If the +++** busy callback returns 0, then sqlite_exec() immediately returns +++** SQLITE_BUSY. If the callback returns non-zero, then sqlite_exec() +++** tries to open the table again and the cycle repeats. +++** +++** The default busy callback is NULL. +++** +++** Sqlite is re-entrant, so the busy handler may start a new query. +++** (It is not clear why anyone would every want to do this, but it +++** is allowed, in theory.) But the busy handler may not close the +++** database. Closing the database from a busy handler will delete +++** data structures out from under the executing query and will +++** probably result in a coredump. +++*/ +++void sqlite_busy_handler(sqlite*, int(*)(void*,const char*,int), void*); +++ +++/* +++** This routine sets a busy handler that sleeps for a while when a +++** table is locked. The handler will sleep multiple times until +++** at least "ms" milleseconds of sleeping have been done. After +++** "ms" milleseconds of sleeping, the handler returns 0 which +++** causes sqlite_exec() to return SQLITE_BUSY. +++** +++** Calling this routine with an argument less than or equal to zero +++** turns off all busy handlers. +++*/ +++void sqlite_busy_timeout(sqlite*, int ms); +++ +++/* +++** This next routine is really just a wrapper around sqlite_exec(). +++** Instead of invoking a user-supplied callback for each row of the +++** result, this routine remembers each row of the result in memory +++** obtained from malloc(), then returns all of the result after the +++** query has finished. +++** +++** As an example, suppose the query result where this table: +++** +++** Name | Age +++** ----------------------- +++** Alice | 43 +++** Bob | 28 +++** Cindy | 21 +++** +++** If the 3rd argument were &azResult then after the function returns +++** azResult will contain the following data: +++** +++** azResult[0] = "Name"; +++** azResult[1] = "Age"; +++** azResult[2] = "Alice"; +++** azResult[3] = "43"; +++** azResult[4] = "Bob"; +++** azResult[5] = "28"; +++** azResult[6] = "Cindy"; +++** azResult[7] = "21"; +++** +++** Notice that there is an extra row of data containing the column +++** headers. But the *nrow return value is still 3. *ncolumn is +++** set to 2. In general, the number of values inserted into azResult +++** will be ((*nrow) + 1)*(*ncolumn). +++** +++** After the calling function has finished using the result, it should +++** pass the result data pointer to sqlite_free_table() in order to +++** release the memory that was malloc-ed. Because of the way the +++** malloc() happens, the calling function must not try to call +++** malloc() directly. Only sqlite_free_table() is able to release +++** the memory properly and safely. +++** +++** The return value of this routine is the same as from sqlite_exec(). +++*/ +++int sqlite_get_table( +++ sqlite*, /* An open database */ +++ const char *sql, /* SQL to be executed */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg /* Error msg written here */ +++); +++ +++/* +++** Call this routine to free the memory that sqlite_get_table() allocated. +++*/ +++void sqlite_free_table(char **result); +++ +++/* +++** The following routines are wrappers around sqlite_exec() and +++** sqlite_get_table(). The only difference between the routines that +++** follow and the originals is that the second argument to the +++** routines that follow is really a printf()-style format +++** string describing the SQL to be executed. Arguments to the format +++** string appear at the end of the argument list. +++** +++** All of the usual printf formatting options apply. In addition, there +++** is a "%q" option. %q works like %s in that it substitutes a null-terminated +++** string from the argument list. But %q also doubles every '\'' character. +++** %q is designed for use inside a string literal. By doubling each '\'' +++** character it escapes that character and allows it to be inserted into +++** the string. +++** +++** For example, so some string variable contains text as follows: +++** +++** char *zText = "It's a happy day!"; +++** +++** We can use this text in an SQL statement as follows: +++** +++** sqlite_exec_printf(db, "INSERT INTO table VALUES('%q')", +++** callback1, 0, 0, zText); +++** +++** Because the %q format string is used, the '\'' character in zText +++** is escaped and the SQL generated is as follows: +++** +++** INSERT INTO table1 VALUES('It''s a happy day!') +++** +++** This is correct. Had we used %s instead of %q, the generated SQL +++** would have looked like this: +++** +++** INSERT INTO table1 VALUES('It's a happy day!'); +++** +++** This second example is an SQL syntax error. As a general rule you +++** should always use %q instead of %s when inserting text into a string +++** literal. +++*/ +++int sqlite_exec_printf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback, /* Callback function */ +++ void *, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string. */ +++); +++int sqlite_exec_vprintf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ sqlite_callback, /* Callback function */ +++ void *, /* 1st argument to callback function */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string. */ +++); +++int sqlite_get_table_printf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ ... /* Arguments to the format string */ +++); +++int sqlite_get_table_vprintf( +++ sqlite*, /* An open database */ +++ const char *sqlFormat, /* printf-style format string for the SQL */ +++ char ***resultp, /* Result written to a char *[] that this points to */ +++ int *nrow, /* Number of result rows written here */ +++ int *ncolumn, /* Number of result columns written here */ +++ char **errmsg, /* Error msg written here */ +++ va_list ap /* Arguments to the format string */ +++); +++char *sqlite_mprintf(const char*,...); +++char *sqlite_vmprintf(const char*, va_list); +++ +++/* +++** Windows systems should call this routine to free memory that +++** is returned in the in the errmsg parameter of sqlite_open() when +++** SQLite is a DLL. For some reason, it does not work to call free() +++** directly. +++*/ +++void sqlite_freemem(void *p); +++ +++/* +++** Windows systems need functions to call to return the sqlite_version +++** and sqlite_encoding strings. +++*/ +++const char *sqlite_libversion(void); +++const char *sqlite_libencoding(void); +++ +++/* +++** A pointer to the following structure is used to communicate with +++** the implementations of user-defined functions. +++*/ +++typedef struct sqlite_func sqlite_func; +++ +++/* +++** Use the following routines to create new user-defined functions. See +++** the documentation for details. +++*/ +++int sqlite_create_function( +++ sqlite*, /* Database where the new function is registered */ +++ const char *zName, /* Name of the new function */ +++ int nArg, /* Number of arguments. -1 means any number */ +++ void (*xFunc)(sqlite_func*,int,const char**), /* C code to implement */ +++ void *pUserData /* Available via the sqlite_user_data() call */ +++); +++int sqlite_create_aggregate( +++ sqlite*, /* Database where the new function is registered */ +++ const char *zName, /* Name of the function */ +++ int nArg, /* Number of arguments */ +++ void (*xStep)(sqlite_func*,int,const char**), /* Called for each row */ +++ void (*xFinalize)(sqlite_func*), /* Called once to get final result */ +++ void *pUserData /* Available via the sqlite_user_data() call */ +++); +++ +++/* +++** Use the following routine to define the datatype returned by a +++** user-defined function. The second argument can be one of the +++** constants SQLITE_NUMERIC, SQLITE_TEXT, or SQLITE_ARGS or it +++** can be an integer greater than or equal to zero. When the datatype +++** parameter is non-negative, the type of the result will be the +++** same as the datatype-th argument. If datatype==SQLITE_NUMERIC +++** then the result is always numeric. If datatype==SQLITE_TEXT then +++** the result is always text. If datatype==SQLITE_ARGS then the result +++** is numeric if any argument is numeric and is text otherwise. +++*/ +++int sqlite_function_type( +++ sqlite *db, /* The database there the function is registered */ +++ const char *zName, /* Name of the function */ +++ int datatype /* The datatype for this function */ +++); +++#define SQLITE_NUMERIC (-1) +++/* #define SQLITE_TEXT (-2) // See below */ +++#define SQLITE_ARGS (-3) +++ +++/* +++** SQLite version 3 defines SQLITE_TEXT differently. To allow both +++** version 2 and version 3 to be included, undefine them both if a +++** conflict is seen. Define SQLITE2_TEXT to be the version 2 value. +++*/ +++#ifdef SQLITE_TEXT +++# undef SQLITE_TEXT +++#else +++# define SQLITE_TEXT (-2) +++#endif +++#define SQLITE2_TEXT (-2) +++ +++ +++ +++/* +++** The user function implementations call one of the following four routines +++** in order to return their results. The first parameter to each of these +++** routines is a copy of the first argument to xFunc() or xFinialize(). +++** The second parameter to these routines is the result to be returned. +++** A NULL can be passed as the second parameter to sqlite_set_result_string() +++** in order to return a NULL result. +++** +++** The 3rd argument to _string and _error is the number of characters to +++** take from the string. If this argument is negative, then all characters +++** up to and including the first '\000' are used. +++** +++** The sqlite_set_result_string() function allocates a buffer to hold the +++** result and returns a pointer to this buffer. The calling routine +++** (that is, the implmentation of a user function) can alter the content +++** of this buffer if desired. +++*/ +++char *sqlite_set_result_string(sqlite_func*,const char*,int); +++void sqlite_set_result_int(sqlite_func*,int); +++void sqlite_set_result_double(sqlite_func*,double); +++void sqlite_set_result_error(sqlite_func*,const char*,int); +++ +++/* +++** The pUserData parameter to the sqlite_create_function() and +++** sqlite_create_aggregate() routines used to register user functions +++** is available to the implementation of the function using this +++** call. +++*/ +++void *sqlite_user_data(sqlite_func*); +++ +++/* +++** Aggregate functions use the following routine to allocate +++** a structure for storing their state. The first time this routine +++** is called for a particular aggregate, a new structure of size nBytes +++** is allocated, zeroed, and returned. On subsequent calls (for the +++** same aggregate instance) the same buffer is returned. The implementation +++** of the aggregate can use the returned buffer to accumulate data. +++** +++** The buffer allocated is freed automatically be SQLite. +++*/ +++void *sqlite_aggregate_context(sqlite_func*, int nBytes); +++ +++/* +++** The next routine returns the number of calls to xStep for a particular +++** aggregate function instance. The current call to xStep counts so this +++** routine always returns at least 1. +++*/ +++int sqlite_aggregate_count(sqlite_func*); +++ +++/* +++** This routine registers a callback with the SQLite library. The +++** callback is invoked (at compile-time, not at run-time) for each +++** attempt to access a column of a table in the database. The callback +++** returns SQLITE_OK if access is allowed, SQLITE_DENY if the entire +++** SQL statement should be aborted with an error and SQLITE_IGNORE +++** if the column should be treated as a NULL value. +++*/ +++int sqlite_set_authorizer( +++ sqlite*, +++ int (*xAuth)(void*,int,const char*,const char*,const char*,const char*), +++ void *pUserData +++); +++ +++/* +++** The second parameter to the access authorization function above will +++** be one of the values below. These values signify what kind of operation +++** is to be authorized. The 3rd and 4th parameters to the authorization +++** function will be parameters or NULL depending on which of the following +++** codes is used as the second parameter. The 5th parameter is the name +++** of the database ("main", "temp", etc.) if applicable. The 6th parameter +++** is the name of the inner-most trigger or view that is responsible for +++** the access attempt or NULL if this access attempt is directly from +++** input SQL code. +++** +++** Arg-3 Arg-4 +++*/ +++#define SQLITE_COPY 0 /* Table Name File Name */ +++#define SQLITE_CREATE_INDEX 1 /* Index Name Table Name */ +++#define SQLITE_CREATE_TABLE 2 /* Table Name NULL */ +++#define SQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ +++#define SQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ +++#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ +++#define SQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ +++#define SQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ +++#define SQLITE_CREATE_VIEW 8 /* View Name NULL */ +++#define SQLITE_DELETE 9 /* Table Name NULL */ +++#define SQLITE_DROP_INDEX 10 /* Index Name Table Name */ +++#define SQLITE_DROP_TABLE 11 /* Table Name NULL */ +++#define SQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ +++#define SQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ +++#define SQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ +++#define SQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ +++#define SQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ +++#define SQLITE_DROP_VIEW 17 /* View Name NULL */ +++#define SQLITE_INSERT 18 /* Table Name NULL */ +++#define SQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ +++#define SQLITE_READ 20 /* Table Name Column Name */ +++#define SQLITE_SELECT 21 /* NULL NULL */ +++#define SQLITE_TRANSACTION 22 /* NULL NULL */ +++#define SQLITE_UPDATE 23 /* Table Name Column Name */ +++#define SQLITE_ATTACH 24 /* Filename NULL */ +++#define SQLITE_DETACH 25 /* Database Name NULL */ +++ +++ +++/* +++** The return value of the authorization function should be one of the +++** following constants: +++*/ +++/* #define SQLITE_OK 0 // Allow access (This is actually defined above) */ +++#define SQLITE_DENY 1 /* Abort the SQL statement with an error */ +++#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ +++ +++/* +++** Register a function that is called at every invocation of sqlite_exec() +++** or sqlite_compile(). This function can be used (for example) to generate +++** a log file of all SQL executed against a database. +++*/ +++void *sqlite_trace(sqlite*, void(*xTrace)(void*,const char*), void*); +++ +++/*** The Callback-Free API +++** +++** The following routines implement a new way to access SQLite that does not +++** involve the use of callbacks. +++** +++** An sqlite_vm is an opaque object that represents a single SQL statement +++** that is ready to be executed. +++*/ +++typedef struct sqlite_vm sqlite_vm; +++ +++/* +++** To execute an SQLite query without the use of callbacks, you first have +++** to compile the SQL using this routine. The 1st parameter "db" is a pointer +++** to an sqlite object obtained from sqlite_open(). The 2nd parameter +++** "zSql" is the text of the SQL to be compiled. The remaining parameters +++** are all outputs. +++** +++** *pzTail is made to point to the first character past the end of the first +++** SQL statement in zSql. This routine only compiles the first statement +++** in zSql, so *pzTail is left pointing to what remains uncompiled. +++** +++** *ppVm is left pointing to a "virtual machine" that can be used to execute +++** the compiled statement. Or if there is an error, *ppVm may be set to NULL. +++** If the input text contained no SQL (if the input is and empty string or +++** a comment) then *ppVm is set to NULL. +++** +++** If any errors are detected during compilation, an error message is written +++** into space obtained from malloc() and *pzErrMsg is made to point to that +++** error message. The calling routine is responsible for freeing the text +++** of this message when it has finished with it. Use sqlite_freemem() to +++** free the message. pzErrMsg may be NULL in which case no error message +++** will be generated. +++** +++** On success, SQLITE_OK is returned. Otherwise and error code is returned. +++*/ +++int sqlite_compile( +++ sqlite *db, /* The open database */ +++ const char *zSql, /* SQL statement to be compiled */ +++ const char **pzTail, /* OUT: uncompiled tail of zSql */ +++ sqlite_vm **ppVm, /* OUT: the virtual machine to execute zSql */ +++ char **pzErrmsg /* OUT: Error message. */ +++); +++ +++/* +++** After an SQL statement has been compiled, it is handed to this routine +++** to be executed. This routine executes the statement as far as it can +++** go then returns. The return value will be one of SQLITE_DONE, +++** SQLITE_ERROR, SQLITE_BUSY, SQLITE_ROW, or SQLITE_MISUSE. +++** +++** SQLITE_DONE means that the execute of the SQL statement is complete +++** an no errors have occurred. sqlite_step() should not be called again +++** for the same virtual machine. *pN is set to the number of columns in +++** the result set and *pazColName is set to an array of strings that +++** describe the column names and datatypes. The name of the i-th column +++** is (*pazColName)[i] and the datatype of the i-th column is +++** (*pazColName)[i+*pN]. *pazValue is set to NULL. +++** +++** SQLITE_ERROR means that the virtual machine encountered a run-time +++** error. sqlite_step() should not be called again for the same +++** virtual machine. *pN is set to 0 and *pazColName and *pazValue are set +++** to NULL. Use sqlite_finalize() to obtain the specific error code +++** and the error message text for the error. +++** +++** SQLITE_BUSY means that an attempt to open the database failed because +++** another thread or process is holding a lock. The calling routine +++** can try again to open the database by calling sqlite_step() again. +++** The return code will only be SQLITE_BUSY if no busy handler is registered +++** using the sqlite_busy_handler() or sqlite_busy_timeout() routines. If +++** a busy handler callback has been registered but returns 0, then this +++** routine will return SQLITE_ERROR and sqltie_finalize() will return +++** SQLITE_BUSY when it is called. +++** +++** SQLITE_ROW means that a single row of the result is now available. +++** The data is contained in *pazValue. The value of the i-th column is +++** (*azValue)[i]. *pN and *pazColName are set as described in SQLITE_DONE. +++** Invoke sqlite_step() again to advance to the next row. +++** +++** SQLITE_MISUSE is returned if sqlite_step() is called incorrectly. +++** For example, if you call sqlite_step() after the virtual machine +++** has halted (after a prior call to sqlite_step() has returned SQLITE_DONE) +++** or if you call sqlite_step() with an incorrectly initialized virtual +++** machine or a virtual machine that has been deleted or that is associated +++** with an sqlite structure that has been closed. +++*/ +++int sqlite_step( +++ sqlite_vm *pVm, /* The virtual machine to execute */ +++ int *pN, /* OUT: Number of columns in result */ +++ const char ***pazValue, /* OUT: Column data */ +++ const char ***pazColName /* OUT: Column names and datatypes */ +++); +++ +++/* +++** This routine is called to delete a virtual machine after it has finished +++** executing. The return value is the result code. SQLITE_OK is returned +++** if the statement executed successfully and some other value is returned if +++** there was any kind of error. If an error occurred and pzErrMsg is not +++** NULL, then an error message is written into memory obtained from malloc() +++** and *pzErrMsg is made to point to that error message. The calling routine +++** should use sqlite_freemem() to delete this message when it has finished +++** with it. +++** +++** This routine can be called at any point during the execution of the +++** virtual machine. If the virtual machine has not completed execution +++** when this routine is called, that is like encountering an error or +++** an interrupt. (See sqlite_interrupt().) Incomplete updates may be +++** rolled back and transactions cancelled, depending on the circumstances, +++** and the result code returned will be SQLITE_ABORT. +++*/ +++int sqlite_finalize(sqlite_vm*, char **pzErrMsg); +++ +++/* +++** This routine deletes the virtual machine, writes any error message to +++** *pzErrMsg and returns an SQLite return code in the same way as the +++** sqlite_finalize() function. +++** +++** Additionally, if ppVm is not NULL, *ppVm is left pointing to a new virtual +++** machine loaded with the compiled version of the original query ready for +++** execution. +++** +++** If sqlite_reset() returns SQLITE_SCHEMA, then *ppVm is set to NULL. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++int sqlite_reset(sqlite_vm*, char **pzErrMsg); +++ +++/* +++** If the SQL that was handed to sqlite_compile contains variables that +++** are represeted in the SQL text by a question mark ('?'). This routine +++** is used to assign values to those variables. +++** +++** The first parameter is a virtual machine obtained from sqlite_compile(). +++** The 2nd "idx" parameter determines which variable in the SQL statement +++** to bind the value to. The left most '?' is 1. The 3rd parameter is +++** the value to assign to that variable. The 4th parameter is the number +++** of bytes in the value, including the terminating \000 for strings. +++** Finally, the 5th "copy" parameter is TRUE if SQLite should make its +++** own private copy of this value, or false if the space that the 3rd +++** parameter points to will be unchanging and can be used directly by +++** SQLite. +++** +++** Unbound variables are treated as having a value of NULL. To explicitly +++** set a variable to NULL, call this routine with the 3rd parameter as a +++** NULL pointer. +++** +++** If the 4th "len" parameter is -1, then strlen() is used to find the +++** length. +++** +++** This routine can only be called immediately after sqlite_compile() +++** or sqlite_reset() and before any calls to sqlite_step(). +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++int sqlite_bind(sqlite_vm*, int idx, const char *value, int len, int copy); +++ +++/* +++** This routine configures a callback function - the progress callback - that +++** is invoked periodically during long running calls to sqlite_exec(), +++** sqlite_step() and sqlite_get_table(). An example use for this API is to keep +++** a GUI updated during a large query. +++** +++** The progress callback is invoked once for every N virtual machine opcodes, +++** where N is the second argument to this function. The progress callback +++** itself is identified by the third argument to this function. The fourth +++** argument to this function is a void pointer passed to the progress callback +++** function each time it is invoked. +++** +++** If a call to sqlite_exec(), sqlite_step() or sqlite_get_table() results +++** in less than N opcodes being executed, then the progress callback is not +++** invoked. +++** +++** Calling this routine overwrites any previously installed progress callback. +++** To remove the progress callback altogether, pass NULL as the third +++** argument to this function. +++** +++** If the progress callback returns a result other than 0, then the current +++** query is immediately terminated and any database changes rolled back. If the +++** query was part of a larger transaction, then the transaction is not rolled +++** back and remains active. The sqlite_exec() call returns SQLITE_ABORT. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++void sqlite_progress_handler(sqlite*, int, int(*)(void*), void*); +++ +++/* +++** Register a callback function to be invoked whenever a new transaction +++** is committed. The pArg argument is passed through to the callback. +++** callback. If the callback function returns non-zero, then the commit +++** is converted into a rollback. +++** +++** If another function was previously registered, its pArg value is returned. +++** Otherwise NULL is returned. +++** +++** Registering a NULL function disables the callback. +++** +++******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** +++*/ +++void *sqlite_commit_hook(sqlite*, int(*)(void*), void*); +++ +++/* +++** Open an encrypted SQLite database. If pKey==0 or nKey==0, this routine +++** is the same as sqlite_open(). +++** +++** The code to implement this API is not available in the public release +++** of SQLite. +++*/ +++sqlite *sqlite_open_encrypted( +++ const char *zFilename, /* Name of the encrypted database */ +++ const void *pKey, /* Pointer to the key */ +++ int nKey, /* Number of bytes in the key */ +++ int *pErrcode, /* Write error code here */ +++ char **pzErrmsg /* Write error message here */ +++); +++ +++/* +++** Change the key on an open database. If the current database is not +++** encrypted, this routine will encrypt it. If pNew==0 or nNew==0, the +++** database is decrypted. +++** +++** The code to implement this API is not available in the public release +++** of SQLite. +++*/ +++int sqlite_rekey( +++ sqlite *db, /* Database to be rekeyed */ +++ const void *pKey, int nKey /* The new key */ +++); +++ +++/* +++** Encode a binary buffer "in" of size n bytes so that it contains +++** no instances of characters '\'' or '\000'. The output is +++** null-terminated and can be used as a string value in an INSERT +++** or UPDATE statement. Use sqlite_decode_binary() to convert the +++** string back into its original binary. +++** +++** The result is written into a preallocated output buffer "out". +++** "out" must be able to hold at least 2 +(257*n)/254 bytes. +++** In other words, the output will be expanded by as much as 3 +++** bytes for every 254 bytes of input plus 2 bytes of fixed overhead. +++** (This is approximately 2 + 1.0118*n or about a 1.2% size increase.) +++** +++** The return value is the number of characters in the encoded +++** string, excluding the "\000" terminator. +++** +++** If out==NULL then no output is generated but the routine still returns +++** the number of characters that would have been generated if out had +++** not been NULL. +++*/ +++int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out); +++ +++/* +++** Decode the string "in" into binary data and write it into "out". +++** This routine reverses the encoding created by sqlite_encode_binary(). +++** The output will always be a few bytes less than the input. The number +++** of bytes of output is returned. If the input is not a well-formed +++** encoding, -1 is returned. +++** +++** The "in" and "out" parameters may point to the same buffer in order +++** to decode a string in place. +++*/ +++int sqlite_decode_binary(const unsigned char *in, unsigned char *out); +++ +++#ifdef __cplusplus +++} /* End of the 'extern "C"' block */ +++#endif +++ +++#endif /* _SQLITE_H_ */ ++--- /dev/null +++++ b/ext/sqlite/libsqlite/src/sqliteInt.h ++@@ -0,0 +1,1270 @@ +++/* +++** 2001 September 15 +++** +++** The author disclaims copyright to this source code. In place of +++** a legal notice, here is a blessing: +++** +++** May you do good and not evil. +++** May you find forgiveness for yourself and forgive others. +++** May you share freely, never taking more than you give. +++** +++************************************************************************* +++** Internal interface definitions for SQLite. +++** +++** @(#) $Id$ +++*/ +++#include "config.h" +++#include "sqlite.h" +++#include "hash.h" +++#include "parse.h" +++#include "btree.h" +++#include +++#include +++#include +++#include +++ +++/* +++** The maximum number of in-memory pages to use for the main database +++** table and for temporary tables. +++*/ +++#define MAX_PAGES 2000 +++#define TEMP_PAGES 500 +++ +++/* +++** If the following macro is set to 1, then NULL values are considered +++** distinct for the SELECT DISTINCT statement and for UNION or EXCEPT +++** compound queries. No other SQL database engine (among those tested) +++** works this way except for OCELOT. But the SQL92 spec implies that +++** this is how things should work. +++** +++** If the following macro is set to 0, then NULLs are indistinct for +++** SELECT DISTINCT and for UNION. +++*/ +++#define NULL_ALWAYS_DISTINCT 0 +++ +++/* +++** If the following macro is set to 1, then NULL values are considered +++** distinct when determining whether or not two entries are the same +++** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +++** OCELOT, and Firebird all work. The SQL92 spec explicitly says this +++** is the way things are suppose to work. +++** +++** If the following macro is set to 0, the NULLs are indistinct for +++** a UNIQUE index. In this mode, you can only have a single NULL entry +++** for a column declared UNIQUE. This is the way Informix and SQL Server +++** work. +++*/ +++#define NULL_DISTINCT_FOR_UNIQUE 1 +++ +++/* +++** The maximum number of attached databases. This must be at least 2 +++** in order to support the main database file (0) and the file used to +++** hold temporary tables (1). And it must be less than 256 because +++** an unsigned character is used to stored the database index. +++*/ +++#define MAX_ATTACHED 10 +++ +++/* +++** The next macro is used to determine where TEMP tables and indices +++** are stored. Possible values: +++** +++** 0 Always use a temporary files +++** 1 Use a file unless overridden by "PRAGMA temp_store" +++** 2 Use memory unless overridden by "PRAGMA temp_store" +++** 3 Always use memory +++*/ +++#ifndef TEMP_STORE +++# define TEMP_STORE 1 +++#endif +++ +++/* +++** When building SQLite for embedded systems where memory is scarce, +++** you can define one or more of the following macros to omit extra +++** features of the library and thus keep the size of the library to +++** a minimum. +++*/ +++/* #define SQLITE_OMIT_AUTHORIZATION 1 */ +++/* #define SQLITE_OMIT_INMEMORYDB 1 */ +++/* #define SQLITE_OMIT_VACUUM 1 */ +++/* #define SQLITE_OMIT_DATETIME_FUNCS 1 */ +++/* #define SQLITE_OMIT_PROGRESS_CALLBACK 1 */ +++ +++/* +++** Integers of known sizes. These typedefs might change for architectures +++** where the sizes very. Preprocessor macros are available so that the +++** types can be conveniently redefined at compile-type. Like this: +++** +++** cc '-DUINTPTR_TYPE=long long int' ... +++*/ +++#ifndef UINT32_TYPE +++# define UINT32_TYPE unsigned int +++#endif +++#ifndef UINT16_TYPE +++# define UINT16_TYPE unsigned short int +++#endif +++#ifndef INT16_TYPE +++# define INT16_TYPE short int +++#endif +++#ifndef UINT8_TYPE +++# define UINT8_TYPE unsigned char +++#endif +++#ifndef INT8_TYPE +++# define INT8_TYPE signed char +++#endif +++#ifndef INTPTR_TYPE +++# if SQLITE_PTR_SZ==4 +++# define INTPTR_TYPE int +++# else +++# define INTPTR_TYPE long long +++# endif +++#endif +++typedef UINT32_TYPE u32; /* 4-byte unsigned integer */ +++typedef UINT16_TYPE u16; /* 2-byte unsigned integer */ +++typedef INT16_TYPE i16; /* 2-byte signed integer */ +++typedef UINT8_TYPE u8; /* 1-byte unsigned integer */ +++typedef UINT8_TYPE i8; /* 1-byte signed integer */ +++typedef INTPTR_TYPE ptr; /* Big enough to hold a pointer */ +++typedef unsigned INTPTR_TYPE uptr; /* Big enough to hold a pointer */ +++ +++/* +++** Defer sourcing vdbe.h until after the "u8" typedef is defined. +++*/ +++#include "vdbe.h" +++ +++/* +++** Most C compilers these days recognize "long double", don't they? +++** Just in case we encounter one that does not, we will create a macro +++** for long double so that it can be easily changed to just "double". +++*/ +++#ifndef LONGDOUBLE_TYPE +++# define LONGDOUBLE_TYPE long double +++#endif +++ +++/* +++** This macro casts a pointer to an integer. Useful for doing +++** pointer arithmetic. +++*/ +++#define Addr(X) ((uptr)X) +++ +++/* +++** The maximum number of bytes of data that can be put into a single +++** row of a single table. The upper bound on this limit is 16777215 +++** bytes (or 16MB-1). We have arbitrarily set the limit to just 1MB +++** here because the overflow page chain is inefficient for really big +++** records and we want to discourage people from thinking that +++** multi-megabyte records are OK. If your needs are different, you can +++** change this define and recompile to increase or decrease the record +++** size. +++** +++** The 16777198 is computed as follows: 238 bytes of payload on the +++** original pages plus 16448 overflow pages each holding 1020 bytes of +++** data. +++*/ +++#define MAX_BYTES_PER_ROW 1048576 +++/* #define MAX_BYTES_PER_ROW 16777198 */ +++ +++/* +++** If memory allocation problems are found, recompile with +++** +++** -DMEMORY_DEBUG=1 +++** +++** to enable some sanity checking on malloc() and free(). To +++** check for memory leaks, recompile with +++** +++** -DMEMORY_DEBUG=2 +++** +++** and a line of text will be written to standard error for +++** each malloc() and free(). This output can be analyzed +++** by an AWK script to determine if there are any leaks. +++*/ +++#ifdef MEMORY_DEBUG +++# define sqliteMalloc(X) sqliteMalloc_(X,1,__FILE__,__LINE__) +++# define sqliteMallocRaw(X) sqliteMalloc_(X,0,__FILE__,__LINE__) +++# define sqliteFree(X) sqliteFree_(X,__FILE__,__LINE__) +++# define sqliteRealloc(X,Y) sqliteRealloc_(X,Y,__FILE__,__LINE__) +++# define sqliteStrDup(X) sqliteStrDup_(X,__FILE__,__LINE__) +++# define sqliteStrNDup(X,Y) sqliteStrNDup_(X,Y,__FILE__,__LINE__) +++ void sqliteStrRealloc(char**); +++#else +++# define sqliteRealloc_(X,Y) sqliteRealloc(X,Y) +++# define sqliteStrRealloc(X) +++#endif +++ +++/* +++** This variable gets set if malloc() ever fails. After it gets set, +++** the SQLite library shuts down permanently. +++*/ +++extern int sqlite_malloc_failed; +++ +++/* +++** The following global variables are used for testing and debugging +++** only. They only work if MEMORY_DEBUG is defined. +++*/ +++#ifdef MEMORY_DEBUG +++extern int sqlite_nMalloc; /* Number of sqliteMalloc() calls */ +++extern int sqlite_nFree; /* Number of sqliteFree() calls */ +++extern int sqlite_iMallocFail; /* Fail sqliteMalloc() after this many calls */ +++#endif +++ +++/* +++** Name of the master database table. The master database table +++** is a special table that holds the names and attributes of all +++** user tables and indices. +++*/ +++#define MASTER_NAME "sqlite_master" +++#define TEMP_MASTER_NAME "sqlite_temp_master" +++ +++/* +++** The name of the schema table. +++*/ +++#define SCHEMA_TABLE(x) (x?TEMP_MASTER_NAME:MASTER_NAME) +++ +++/* +++** A convenience macro that returns the number of elements in +++** an array. +++*/ +++#define ArraySize(X) (sizeof(X)/sizeof(X[0])) +++ +++/* +++** Forward references to structures +++*/ +++typedef struct Column Column; +++typedef struct Table Table; +++typedef struct Index Index; +++typedef struct Instruction Instruction; +++typedef struct Expr Expr; +++typedef struct ExprList ExprList; +++typedef struct Parse Parse; +++typedef struct Token Token; +++typedef struct IdList IdList; +++typedef struct SrcList SrcList; +++typedef struct WhereInfo WhereInfo; +++typedef struct WhereLevel WhereLevel; +++typedef struct Select Select; +++typedef struct AggExpr AggExpr; +++typedef struct FuncDef FuncDef; +++typedef struct Trigger Trigger; +++typedef struct TriggerStep TriggerStep; +++typedef struct TriggerStack TriggerStack; +++typedef struct FKey FKey; +++typedef struct Db Db; +++typedef struct AuthContext AuthContext; +++ +++/* +++** Each database file to be accessed by the system is an instance +++** of the following structure. There are normally two of these structures +++** in the sqlite.aDb[] array. aDb[0] is the main database file and +++** aDb[1] is the database file used to hold temporary tables. Additional +++** databases may be attached. +++*/ +++struct Db { +++ char *zName; /* Name of this database */ +++ Btree *pBt; /* The B*Tree structure for this database file */ +++ int schema_cookie; /* Database schema version number for this file */ +++ Hash tblHash; /* All tables indexed by name */ +++ Hash idxHash; /* All (named) indices indexed by name */ +++ Hash trigHash; /* All triggers indexed by name */ +++ Hash aFKey; /* Foreign keys indexed by to-table */ +++ u8 inTrans; /* 0: not writable. 1: Transaction. 2: Checkpoint */ +++ u16 flags; /* Flags associated with this database */ +++ void *pAux; /* Auxiliary data. Usually NULL */ +++ void (*xFreeAux)(void*); /* Routine to free pAux */ +++}; +++ +++/* +++** These macros can be used to test, set, or clear bits in the +++** Db.flags field. +++*/ +++#define DbHasProperty(D,I,P) (((D)->aDb[I].flags&(P))==(P)) +++#define DbHasAnyProperty(D,I,P) (((D)->aDb[I].flags&(P))!=0) +++#define DbSetProperty(D,I,P) (D)->aDb[I].flags|=(P) +++#define DbClearProperty(D,I,P) (D)->aDb[I].flags&=~(P) +++ +++/* +++** Allowed values for the DB.flags field. +++** +++** The DB_Locked flag is set when the first OP_Transaction or OP_Checkpoint +++** opcode is emitted for a database. This prevents multiple occurances +++** of those opcodes for the same database in the same program. Similarly, +++** the DB_Cookie flag is set when the OP_VerifyCookie opcode is emitted, +++** and prevents duplicate OP_VerifyCookies from taking up space and slowing +++** down execution. +++** +++** The DB_SchemaLoaded flag is set after the database schema has been +++** read into internal hash tables. +++** +++** DB_UnresetViews means that one or more views have column names that +++** have been filled out. If the schema changes, these column names might +++** changes and so the view will need to be reset. +++*/ +++#define DB_Locked 0x0001 /* OP_Transaction opcode has been emitted */ +++#define DB_Cookie 0x0002 /* OP_VerifyCookie opcode has been emiited */ +++#define DB_SchemaLoaded 0x0004 /* The schema has been loaded */ +++#define DB_UnresetViews 0x0008 /* Some views have defined column names */ +++ +++ +++/* +++** Each database is an instance of the following structure. +++** +++** The sqlite.file_format is initialized by the database file +++** and helps determines how the data in the database file is +++** represented. This field allows newer versions of the library +++** to read and write older databases. The various file formats +++** are as follows: +++** +++** file_format==1 Version 2.1.0. +++** file_format==2 Version 2.2.0. Add support for INTEGER PRIMARY KEY. +++** file_format==3 Version 2.6.0. Fix empty-string index bug. +++** file_format==4 Version 2.7.0. Add support for separate numeric and +++** text datatypes. +++** +++** The sqlite.temp_store determines where temporary database files +++** are stored. If 1, then a file is created to hold those tables. If +++** 2, then they are held in memory. 0 means use the default value in +++** the TEMP_STORE macro. +++** +++** The sqlite.lastRowid records the last insert rowid generated by an +++** insert statement. Inserts on views do not affect its value. Each +++** trigger has its own context, so that lastRowid can be updated inside +++** triggers as usual. The previous value will be restored once the trigger +++** exits. Upon entering a before or instead of trigger, lastRowid is no +++** longer (since after version 2.8.12) reset to -1. +++** +++** The sqlite.nChange does not count changes within triggers and keeps no +++** context. It is reset at start of sqlite_exec. +++** The sqlite.lsChange represents the number of changes made by the last +++** insert, update, or delete statement. It remains constant throughout the +++** length of a statement and is then updated by OP_SetCounts. It keeps a +++** context stack just like lastRowid so that the count of changes +++** within a trigger is not seen outside the trigger. Changes to views do not +++** affect the value of lsChange. +++** The sqlite.csChange keeps track of the number of current changes (since +++** the last statement) and is used to update sqlite_lsChange. +++*/ +++struct sqlite { +++ int nDb; /* Number of backends currently in use */ +++ Db *aDb; /* All backends */ +++ Db aDbStatic[2]; /* Static space for the 2 default backends */ +++ int flags; /* Miscellanous flags. See below */ +++ u8 file_format; /* What file format version is this database? */ +++ u8 safety_level; /* How aggressive at synching data to disk */ +++ u8 want_to_close; /* Close after all VDBEs are deallocated */ +++ u8 temp_store; /* 1=file, 2=memory, 0=compile-time default */ +++ u8 onError; /* Default conflict algorithm */ +++ int next_cookie; /* Next value of aDb[0].schema_cookie */ +++ int cache_size; /* Number of pages to use in the cache */ +++ int nTable; /* Number of tables in the database */ +++ void *pBusyArg; /* 1st Argument to the busy callback */ +++ int (*xBusyCallback)(void *,const char*,int); /* The busy callback */ +++ void *pCommitArg; /* Argument to xCommitCallback() */ +++ int (*xCommitCallback)(void*);/* Invoked at every commit. */ +++ Hash aFunc; /* All functions that can be in SQL exprs */ +++ int lastRowid; /* ROWID of most recent insert (see above) */ +++ int priorNewRowid; /* Last randomly generated ROWID */ +++ int magic; /* Magic number for detect library misuse */ +++ int nChange; /* Number of rows changed (see above) */ +++ int lsChange; /* Last statement change count (see above) */ +++ int csChange; /* Current statement change count (see above) */ +++ struct sqliteInitInfo { /* Information used during initialization */ +++ int iDb; /* When back is being initialized */ +++ int newTnum; /* Rootpage of table being initialized */ +++ u8 busy; /* TRUE if currently initializing */ +++ } init; +++ struct Vdbe *pVdbe; /* List of active virtual machines */ +++ void (*xTrace)(void*,const char*); /* Trace function */ +++ void *pTraceArg; /* Argument to the trace function */ +++#ifndef SQLITE_OMIT_AUTHORIZATION +++ int (*xAuth)(void*,int,const char*,const char*,const char*,const char*); +++ /* Access authorization function */ +++ void *pAuthArg; /* 1st argument to the access auth function */ +++#endif +++#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +++ int (*xProgress)(void *); /* The progress callback */ +++ void *pProgressArg; /* Argument to the progress callback */ +++ int nProgressOps; /* Number of opcodes for progress callback */ +++#endif +++}; +++ +++/* +++** Possible values for the sqlite.flags and or Db.flags fields. +++** +++** On sqlite.flags, the SQLITE_InTrans value means that we have +++** executed a BEGIN. On Db.flags, SQLITE_InTrans means a statement +++** transaction is active on that particular database file. +++*/ +++#define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ +++#define SQLITE_Initialized 0x00000002 /* True after initialization */ +++#define SQLITE_Interrupt 0x00000004 /* Cancel current operation */ +++#define SQLITE_InTrans 0x00000008 /* True if in a transaction */ +++#define SQLITE_InternChanges 0x00000010 /* Uncommitted Hash table changes */ +++#define SQLITE_FullColNames 0x00000020 /* Show full column names on SELECT */ +++#define SQLITE_ShortColNames 0x00000040 /* Show short columns names */ +++#define SQLITE_CountRows 0x00000080 /* Count rows changed by INSERT, */ +++ /* DELETE, or UPDATE and return */ +++ /* the count using a callback. */ +++#define SQLITE_NullCallback 0x00000100 /* Invoke the callback once if the */ +++ /* result set is empty */ +++#define SQLITE_ReportTypes 0x00000200 /* Include information on datatypes */ +++ /* in 4th argument of callback */ +++ +++/* +++** Possible values for the sqlite.magic field. +++** The numbers are obtained at random and have no special meaning, other +++** than being distinct from one another. +++*/ +++#define SQLITE_MAGIC_OPEN 0xa029a697 /* Database is open */ +++#define SQLITE_MAGIC_CLOSED 0x9f3c2d33 /* Database is closed */ +++#define SQLITE_MAGIC_BUSY 0xf03b7906 /* Database currently in use */ +++#define SQLITE_MAGIC_ERROR 0xb5357930 /* An SQLITE_MISUSE error occurred */ +++ +++/* +++** Each SQL function is defined by an instance of the following +++** structure. A pointer to this structure is stored in the sqlite.aFunc +++** hash table. When multiple functions have the same name, the hash table +++** points to a linked list of these structures. +++*/ +++struct FuncDef { +++ void (*xFunc)(sqlite_func*,int,const char**); /* Regular function */ +++ void (*xStep)(sqlite_func*,int,const char**); /* Aggregate function step */ +++ void (*xFinalize)(sqlite_func*); /* Aggregate function finializer */ +++ signed char nArg; /* Number of arguments. -1 means unlimited */ +++ signed char dataType; /* Arg that determines datatype. -1=NUMERIC, */ +++ /* -2=TEXT. -3=SQLITE_ARGS */ +++ u8 includeTypes; /* Add datatypes to args of xFunc and xStep */ +++ void *pUserData; /* User data parameter */ +++ FuncDef *pNext; /* Next function with same name */ +++}; +++ +++/* +++** information about each column of an SQL table is held in an instance +++** of this structure. +++*/ +++struct Column { +++ char *zName; /* Name of this column */ +++ char *zDflt; /* Default value of this column */ +++ char *zType; /* Data type for this column */ +++ u8 notNull; /* True if there is a NOT NULL constraint */ +++ u8 isPrimKey; /* True if this column is part of the PRIMARY KEY */ +++ u8 sortOrder; /* Some combination of SQLITE_SO_... values */ +++ u8 dottedName; /* True if zName contains a "." character */ +++}; +++ +++/* +++** The allowed sort orders. +++** +++** The TEXT and NUM values use bits that do not overlap with DESC and ASC. +++** That way the two can be combined into a single number. +++*/ +++#define SQLITE_SO_UNK 0 /* Use the default collating type. (SCT_NUM) */ +++#define SQLITE_SO_TEXT 2 /* Sort using memcmp() */ +++#define SQLITE_SO_NUM 4 /* Sort using sqliteCompare() */ +++#define SQLITE_SO_TYPEMASK 6 /* Mask to extract the collating sequence */ +++#define SQLITE_SO_ASC 0 /* Sort in ascending order */ +++#define SQLITE_SO_DESC 1 /* Sort in descending order */ +++#define SQLITE_SO_DIRMASK 1 /* Mask to extract the sort direction */ +++ +++/* +++** Each SQL table is represented in memory by an instance of the +++** following structure. +++** +++** Table.zName is the name of the table. The case of the original +++** CREATE TABLE statement is stored, but case is not significant for +++** comparisons. +++** +++** Table.nCol is the number of columns in this table. Table.aCol is a +++** pointer to an array of Column structures, one for each column. +++** +++** If the table has an INTEGER PRIMARY KEY, then Table.iPKey is the index of +++** the column that is that key. Otherwise Table.iPKey is negative. Note +++** that the datatype of the PRIMARY KEY must be INTEGER for this field to +++** be set. An INTEGER PRIMARY KEY is used as the rowid for each row of +++** the table. If a table has no INTEGER PRIMARY KEY, then a random rowid +++** is generated for each row of the table. Table.hasPrimKey is true if +++** the table has any PRIMARY KEY, INTEGER or otherwise. +++** +++** Table.tnum is the page number for the root BTree page of the table in the +++** database file. If Table.iDb is the index of the database table backend +++** in sqlite.aDb[]. 0 is for the main database and 1 is for the file that +++** holds temporary tables and indices. If Table.isTransient +++** is true, then the table is stored in a file that is automatically deleted +++** when the VDBE cursor to the table is closed. In this case Table.tnum +++** refers VDBE cursor number that holds the table open, not to the root +++** page number. Transient tables are used to hold the results of a +++** sub-query that appears instead of a real table name in the FROM clause +++** of a SELECT statement. +++*/ +++struct Table { +++ char *zName; /* Name of the table */ +++ int nCol; /* Number of columns in this table */ +++ Column *aCol; /* Information about each column */ +++ int iPKey; /* If not less then 0, use aCol[iPKey] as the primary key */ +++ Index *pIndex; /* List of SQL indexes on this table. */ +++ int tnum; /* Root BTree node for this table (see note above) */ +++ Select *pSelect; /* NULL for tables. Points to definition if a view. */ +++ u8 readOnly; /* True if this table should not be written by the user */ +++ u8 iDb; /* Index into sqlite.aDb[] of the backend for this table */ +++ u8 isTransient; /* True if automatically deleted when VDBE finishes */ +++ u8 hasPrimKey; /* True if there exists a primary key */ +++ u8 keyConf; /* What to do in case of uniqueness conflict on iPKey */ +++ Trigger *pTrigger; /* List of SQL triggers on this table */ +++ FKey *pFKey; /* Linked list of all foreign keys in this table */ +++}; +++ +++/* +++** Each foreign key constraint is an instance of the following structure. +++** +++** A foreign key is associated with two tables. The "from" table is +++** the table that contains the REFERENCES clause that creates the foreign +++** key. The "to" table is the table that is named in the REFERENCES clause. +++** Consider this example: +++** +++** CREATE TABLE ex1( +++** a INTEGER PRIMARY KEY, +++** b INTEGER CONSTRAINT fk1 REFERENCES ex2(x) +++** ); +++** +++** For foreign key "fk1", the from-table is "ex1" and the to-table is "ex2". +++** +++** Each REFERENCES clause generates an instance of the following structure +++** which is attached to the from-table. The to-table need not exist when +++** the from-table is created. The existance of the to-table is not checked +++** until an attempt is made to insert data into the from-table. +++** +++** The sqlite.aFKey hash table stores pointers to this structure +++** given the name of a to-table. For each to-table, all foreign keys +++** associated with that table are on a linked list using the FKey.pNextTo +++** field. +++*/ +++struct FKey { +++ Table *pFrom; /* The table that constains the REFERENCES clause */ +++ FKey *pNextFrom; /* Next foreign key in pFrom */ +++ char *zTo; /* Name of table that the key points to */ +++ FKey *pNextTo; /* Next foreign key that points to zTo */ +++ int nCol; /* Number of columns in this key */ +++ struct sColMap { /* Mapping of columns in pFrom to columns in zTo */ +++ int iFrom; /* Index of column in pFrom */ +++ char *zCol; /* Name of column in zTo. If 0 use PRIMARY KEY */ +++ } *aCol; /* One entry for each of nCol column s */ +++ u8 isDeferred; /* True if constraint checking is deferred till COMMIT */ +++ u8 updateConf; /* How to resolve conflicts that occur on UPDATE */ +++ u8 deleteConf; /* How to resolve conflicts that occur on DELETE */ +++ u8 insertConf; /* How to resolve conflicts that occur on INSERT */ +++}; +++ +++/* +++** SQLite supports many different ways to resolve a contraint +++** error. ROLLBACK processing means that a constraint violation +++** causes the operation in process to fail and for the current transaction +++** to be rolled back. ABORT processing means the operation in process +++** fails and any prior changes from that one operation are backed out, +++** but the transaction is not rolled back. FAIL processing means that +++** the operation in progress stops and returns an error code. But prior +++** changes due to the same operation are not backed out and no rollback +++** occurs. IGNORE means that the particular row that caused the constraint +++** error is not inserted or updated. Processing continues and no error +++** is returned. REPLACE means that preexisting database rows that caused +++** a UNIQUE constraint violation are removed so that the new insert or +++** update can proceed. Processing continues and no error is reported. +++** +++** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. +++** RESTRICT is the same as ABORT for IMMEDIATE foreign keys and the +++** same as ROLLBACK for DEFERRED keys. SETNULL means that the foreign +++** key is set to NULL. CASCADE means that a DELETE or UPDATE of the +++** referenced table row is propagated into the row that holds the +++** foreign key. +++** +++** The following symbolic values are used to record which type +++** of action to take. +++*/ +++#define OE_None 0 /* There is no constraint to check */ +++#define OE_Rollback 1 /* Fail the operation and rollback the transaction */ +++#define OE_Abort 2 /* Back out changes but do no rollback transaction */ +++#define OE_Fail 3 /* Stop the operation but leave all prior changes */ +++#define OE_Ignore 4 /* Ignore the error. Do not do the INSERT or UPDATE */ +++#define OE_Replace 5 /* Delete existing record, then do INSERT or UPDATE */ +++ +++#define OE_Restrict 6 /* OE_Abort for IMMEDIATE, OE_Rollback for DEFERRED */ +++#define OE_SetNull 7 /* Set the foreign key value to NULL */ +++#define OE_SetDflt 8 /* Set the foreign key value to its default */ +++#define OE_Cascade 9 /* Cascade the changes */ +++ +++#define OE_Default 99 /* Do whatever the default action is */ +++ +++/* +++** Each SQL index is represented in memory by an +++** instance of the following structure. +++** +++** The columns of the table that are to be indexed are described +++** by the aiColumn[] field of this structure. For example, suppose +++** we have the following table and index: +++** +++** CREATE TABLE Ex1(c1 int, c2 int, c3 text); +++** CREATE INDEX Ex2 ON Ex1(c3,c1); +++** +++** In the Table structure describing Ex1, nCol==3 because there are +++** three columns in the table. In the Index structure describing +++** Ex2, nColumn==2 since 2 of the 3 columns of Ex1 are indexed. +++** The value of aiColumn is {2, 0}. aiColumn[0]==2 because the +++** first column to be indexed (c3) has an index of 2 in Ex1.aCol[]. +++** The second column to be indexed (c1) has an index of 0 in +++** Ex1.aCol[], hence Ex2.aiColumn[1]==0. +++** +++** The Index.onError field determines whether or not the indexed columns +++** must be unique and what to do if they are not. When Index.onError=OE_None, +++** it means this is not a unique index. Otherwise it is a unique index +++** and the value of Index.onError indicate the which conflict resolution +++** algorithm to employ whenever an attempt is made to insert a non-unique +++** element. +++*/ +++struct Index { +++ char *zName; /* Name of this index */ +++ int nColumn; /* Number of columns in the table used by this index */ +++ int *aiColumn; /* Which columns are used by this index. 1st is 0 */ +++ Table *pTable; /* The SQL table being indexed */ +++ int tnum; /* Page containing root of this index in database file */ +++ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ +++ u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ +++ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ +++ Index *pNext; /* The next index associated with the same table */ +++}; +++ +++/* +++** Each token coming out of the lexer is an instance of +++** this structure. Tokens are also used as part of an expression. +++** +++** Note if Token.z==0 then Token.dyn and Token.n are undefined and +++** may contain random values. Do not make any assuptions about Token.dyn +++** and Token.n when Token.z==0. +++*/ +++struct Token { +++ const char *z; /* Text of the token. Not NULL-terminated! */ +++ unsigned dyn : 1; /* True for malloced memory, false for static */ +++ unsigned n : 31; /* Number of characters in this token */ +++}; +++ +++/* +++** Each node of an expression in the parse tree is an instance +++** of this structure. +++** +++** Expr.op is the opcode. The integer parser token codes are reused +++** as opcodes here. For example, the parser defines TK_GE to be an integer +++** code representing the ">=" operator. This same integer code is reused +++** to represent the greater-than-or-equal-to operator in the expression +++** tree. +++** +++** Expr.pRight and Expr.pLeft are subexpressions. Expr.pList is a list +++** of argument if the expression is a function. +++** +++** Expr.token is the operator token for this node. For some expressions +++** that have subexpressions, Expr.token can be the complete text that gave +++** rise to the Expr. In the latter case, the token is marked as being +++** a compound token. +++** +++** An expression of the form ID or ID.ID refers to a column in a table. +++** For such expressions, Expr.op is set to TK_COLUMN and Expr.iTable is +++** the integer cursor number of a VDBE cursor pointing to that table and +++** Expr.iColumn is the column number for the specific column. If the +++** expression is used as a result in an aggregate SELECT, then the +++** value is also stored in the Expr.iAgg column in the aggregate so that +++** it can be accessed after all aggregates are computed. +++** +++** If the expression is a function, the Expr.iTable is an integer code +++** representing which function. If the expression is an unbound variable +++** marker (a question mark character '?' in the original SQL) then the +++** Expr.iTable holds the index number for that variable. +++** +++** The Expr.pSelect field points to a SELECT statement. The SELECT might +++** be the right operand of an IN operator. Or, if a scalar SELECT appears +++** in an expression the opcode is TK_SELECT and Expr.pSelect is the only +++** operand. +++*/ +++struct Expr { +++ u8 op; /* Operation performed by this node */ +++ u8 dataType; /* Either SQLITE_SO_TEXT or SQLITE_SO_NUM */ +++ u8 iDb; /* Database referenced by this expression */ +++ u8 flags; /* Various flags. See below */ +++ Expr *pLeft, *pRight; /* Left and right subnodes */ +++ ExprList *pList; /* A list of expressions used as function arguments +++ ** or in " IN (useAgg==TRUE, pull +++ ** result from the iAgg-th element of the aggregator */ +++ Select *pSelect; /* When the expression is a sub-select. Also the +++ ** right side of " IN ("; ++- BenchMarkCrypto > >("TestData/rsa1024.dat", "RSA 1024", t); ++- BenchMarkCrypto > >("TestData/luc1024.dat", "LUC 1024", t); ++- BenchMarkCrypto >("TestData/dlie1024.dat", "DLIES 1024", t); ++- BenchMarkCrypto >("TestData/lucc512.dat", "LUCELG 512", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/dlie1024.dat", "DLIES 1024", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/lucc512.dat", "LUCELG 512", t); ++ ++ cout << "\n"; ++- BenchMarkCrypto > >("TestData/rsa2048.dat", "RSA 2048", t); ++- BenchMarkCrypto > >("TestData/luc2048.dat", "LUC 2048", t); ++- BenchMarkCrypto >("TestData/dlie2048.dat", "DLIES 2048", t); ++- BenchMarkCrypto >("TestData/lucc1024.dat", "LUCELG 1024", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/dlie2048.dat", "DLIES 2048", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/lucc1024.dat", "LUCELG 1024", t); ++ ++ cout << "\n"; ++- BenchMarkSignature >("TestData/rsa1024.dat", "RSA 1024", t); ++- BenchMarkSignature >("TestData/rw1024.dat", "RW 1024", t); ++- BenchMarkSignature >("TestData/luc1024.dat", "LUC 1024", t); ++- BenchMarkSignature >("TestData/nr1024.dat", "NR 1024", t); ++- BenchMarkSignature("TestData/dsa1024.dat", "DSA 1024", t); ++- BenchMarkSignature >("TestData/lucs512.dat", "LUC-HMP 512", t); ++- BenchMarkSignature >("TestData/esig1023.dat", "ESIGN 1023", t); ++- BenchMarkSignature >("TestData/esig1536.dat", "ESIGN 1536", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rw1024.dat", "RW 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/nr1024.dat", "NR 1024", t); +++ BenchMarkSignature(PACKAGE_DATA_DIR "TestData/dsa1024.dat", "DSA 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/lucs512.dat", "LUC-HMP 512", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/esig1023.dat", "ESIGN 1023", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/esig1536.dat", "ESIGN 1536", t); ++ ++ cout << "\n"; ++- BenchMarkSignature >("TestData/rsa2048.dat", "RSA 2048", t); ++- BenchMarkSignature >("TestData/rw2048.dat", "RW 2048", t); ++- BenchMarkSignature >("TestData/luc2048.dat", "LUC 2048", t); ++- BenchMarkSignature >("TestData/nr2048.dat", "NR 2048", t); ++- BenchMarkSignature >("TestData/lucs1024.dat", "LUC-HMP 1024", t); ++- BenchMarkSignature >("TestData/esig2046.dat", "ESIGN 2046", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rw2048.dat", "RW 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/nr2048.dat", "NR 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/lucs1024.dat", "LUC-HMP 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/esig2046.dat", "ESIGN 2046", t); ++ ++ cout << "\n"; ++- BenchMarkKeyAgreement("TestData/xtrdh171.dat", "XTR-DH 171", t); ++- BenchMarkKeyAgreement("TestData/xtrdh342.dat", "XTR-DH 342", t); ++- BenchMarkKeyAgreement("TestData/dh1024.dat", "DH 1024", t); ++- BenchMarkKeyAgreement("TestData/dh2048.dat", "DH 2048", t); ++- BenchMarkKeyAgreement("TestData/lucd512.dat", "LUCDIF 512", t); ++- BenchMarkKeyAgreement("TestData/lucd1024.dat", "LUCDIF 1024", t); ++- BenchMarkKeyAgreement("TestData/mqv1024.dat", "MQV 1024", t); ++- BenchMarkKeyAgreement("TestData/mqv2048.dat", "MQV 2048", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", "XTR-DH 171", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/xtrdh342.dat", "XTR-DH 342", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/dh1024.dat", "DH 1024", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/dh2048.dat", "DH 2048", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/lucd512.dat", "LUCDIF 512", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/lucd1024.dat", "LUCDIF 1024", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/mqv1024.dat", "MQV 1024", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/mqv2048.dat", "MQV 2048", t); ++ ++ cout << "\n"; ++ { ++Index: libcrypto++/test.cpp ++=================================================================== ++--- libcrypto++.orig/test.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/test.cpp 2009-04-07 03:24:04.000000000 +0200 ++@@ -337,7 +337,7 @@ ++ AES_CTR_Encrypt(argv[2], argv[3], argv[4], argv[5]); ++ else if (command == "h") ++ { ++- FileSource usage("TestData/usage.dat", true, new FileSink(cout)); +++ FileSource usage(PACKAGE_DATA_DIR "TestData/usage.dat", true, new FileSink(cout)); ++ return 1; ++ } ++ else if (command == "V") ++Index: libcrypto++/validat1.cpp ++=================================================================== ++--- libcrypto++.orig/validat1.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/validat1.cpp 2009-04-07 03:25:57.000000000 +0200 ++@@ -508,12 +508,12 @@ ++ { ++ cout << "\nDES validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/descert.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/descert.dat", true, new HexDecoder); ++ bool pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ ++ cout << "\nTesting EDE2, EDE3, and XEX3 variants...\n\n"; ++ ++- FileSource valdata1("TestData/3desval.dat", true, new HexDecoder); +++ FileSource valdata1(PACKAGE_DATA_DIR "TestData/3desval.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; ++@@ -855,7 +855,7 @@ ++ { ++ cout << "\nIDEA validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/ideaval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/ideaval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -863,7 +863,7 @@ ++ { ++ cout << "\nSAFER validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/saferval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/saferval.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(VariableRoundsCipherFactory(8,6), valdata, 4) && pass; ++ pass = BlockTransformationTest(VariableRoundsCipherFactory(16,12), valdata, 4) && pass; ++@@ -876,7 +876,7 @@ ++ { ++ cout << "\nRC2 validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rc2val.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc2val.dat", true, new HexDecoder); ++ HexEncoder output(new FileSink(cout)); ++ SecByteBlock plain(RC2Encryption::BLOCKSIZE), cipher(RC2Encryption::BLOCKSIZE), out(RC2Encryption::BLOCKSIZE), outplain(RC2Encryption::BLOCKSIZE); ++ SecByteBlock key(128); ++@@ -1086,7 +1086,7 @@ ++ { ++ cout << "\nRC5 validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rc5val.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc5val.dat", true, new HexDecoder); ++ return BlockTransformationTest(VariableRoundsCipherFactory(16, 12), valdata); ++ } ++ ++@@ -1094,7 +1094,7 @@ ++ { ++ cout << "\nRC6 validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rc6val.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc6val.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 2) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 2) && pass; ++@@ -1106,7 +1106,7 @@ ++ { ++ cout << "\nMARS validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/marsval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/marsval.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1118,7 +1118,7 @@ ++ { ++ cout << "\nRijndael (AES) validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rijndael.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rijndael.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1131,7 +1131,7 @@ ++ { ++ cout << "\nTwofish validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/twofishv.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/twofishv.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1143,7 +1143,7 @@ ++ { ++ cout << "\nSerpent validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/serpentv.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/serpentv.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1189,7 +1189,7 @@ ++ { ++ cout << "\n3-WAY validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/3wayval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/3wayval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1197,7 +1197,7 @@ ++ { ++ cout << "\nGOST validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/gostval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/gostval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1205,7 +1205,7 @@ ++ { ++ cout << "\nSHARK validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/sharkval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/sharkval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1215,14 +1215,14 @@ ++ ++ cout << "\nCAST-128 validation suite running...\n\n"; ++ ++- FileSource val128("TestData/cast128v.dat", true, new HexDecoder); +++ FileSource val128(PACKAGE_DATA_DIR "TestData/cast128v.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), val128, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(10), val128, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(5), val128, 1) && pass; ++ ++ cout << "\nCAST-256 validation suite running...\n\n"; ++ ++- FileSource val256("TestData/cast256v.dat", true, new HexDecoder); +++ FileSource val256(PACKAGE_DATA_DIR "TestData/cast256v.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), val256, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), val256, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(32), val256, 1) && pass; ++@@ -1234,7 +1234,7 @@ ++ { ++ cout << "\nSquare validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/squareva.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/squareva.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1242,7 +1242,7 @@ ++ { ++ cout << "\nSKIPJACK validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/skipjack.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/skipjack.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1346,7 +1346,7 @@ ++ cout << "\nSHACAL-2 validation suite running...\n\n"; ++ ++ bool pass = true; ++- FileSource valdata("TestData/shacal2v.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/shacal2v.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(64), valdata, 10) && pass; ++ return pass; ++@@ -1357,7 +1357,7 @@ ++ cout << "\nCamellia validation suite running...\n\n"; ++ ++ bool pass = true; ++- FileSource valdata("TestData/camellia.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/camellia.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 15) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 15) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 15) && pass; ++@@ -1368,19 +1368,19 @@ ++ { ++ cout << "\nSalsa validation suite running...\n"; ++ ++- return RunTestDataFile("TestVectors/salsa.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/salsa.txt"); ++ } ++ ++ bool ValidateSosemanuk() ++ { ++ cout << "\nSosemanuk validation suite running...\n"; ++- return RunTestDataFile("TestVectors/sosemanuk.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sosemanuk.txt"); ++ } ++ ++ bool ValidateVMAC() ++ { ++ cout << "\nVMAC validation suite running...\n"; ++- return RunTestDataFile("TestVectors/vmac.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/vmac.txt"); ++ } ++ ++ bool ValidateCCM() ++Index: libcrypto++/validat2.cpp ++=================================================================== ++--- libcrypto++.orig/validat2.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/validat2.cpp 2009-04-07 03:28:02.000000000 +0200 ++@@ -268,7 +268,7 @@ ++ "\x69\x94\xac\x04\xf3\x41\xb5\x7d\x05\x20\x2d\x42\x8f\xb2\xa2\x7b" ++ "\x5c\x77\xdf\xd9\xb1\x5b\xfc\x3d\x55\x93\x53\x50\x34\x10\xc1\xe1"; ++ ++- FileSource keys("TestData/rsa512a.dat", true, new HexDecoder); +++ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa512a.dat", true, new HexDecoder); ++ Weak::RSASSA_PKCS1v15_MD2_Signer rsaPriv(keys); ++ Weak::RSASSA_PKCS1v15_MD2_Verifier rsaPub(rsaPriv); ++ ++@@ -293,7 +293,7 @@ ++ cout << "invalid signature verification\n"; ++ } ++ { ++- FileSource keys("TestData/rsa1024.dat", true, new HexDecoder); +++ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa1024.dat", true, new HexDecoder); ++ RSAES_PKCS1v15_Decryptor rsaPriv(keys); ++ RSAES_PKCS1v15_Encryptor rsaPub(rsaPriv); ++ ++@@ -320,8 +320,8 @@ ++ bq.Put(oaepSeed, 20); ++ FixedRNG rng(bq); ++ ++- FileSource privFile("TestData/rsa400pv.dat", true, new HexDecoder); ++- FileSource pubFile("TestData/rsa400pb.dat", true, new HexDecoder); +++ FileSource privFile(PACKAGE_DATA_DIR "TestData/rsa400pv.dat", true, new HexDecoder); +++ FileSource pubFile(PACKAGE_DATA_DIR "TestData/rsa400pb.dat", true, new HexDecoder); ++ RSAES_OAEP_SHA_Decryptor rsaPriv; ++ rsaPriv.AccessKey().BERDecodePrivateKey(privFile, false, 0); ++ RSAES_OAEP_SHA_Encryptor rsaPub(pubFile); ++@@ -344,7 +344,7 @@ ++ { ++ cout << "\nDH validation suite running...\n\n"; ++ ++- FileSource f("TestData/dh1024.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/dh1024.dat", true, new HexDecoder()); ++ DH dh(f); ++ return SimpleKeyAgreementValidate(dh); ++ } ++@@ -353,7 +353,7 @@ ++ { ++ cout << "\nMQV validation suite running...\n\n"; ++ ++- FileSource f("TestData/mqv1024.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/mqv1024.dat", true, new HexDecoder()); ++ MQV mqv(f); ++ return AuthenticatedKeyAgreementValidate(mqv); ++ } ++@@ -362,7 +362,7 @@ ++ { ++ cout << "\nLUC-DH validation suite running...\n\n"; ++ ++- FileSource f("TestData/lucd512.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/lucd512.dat", true, new HexDecoder()); ++ LUC_DH dh(f); ++ return SimpleKeyAgreementValidate(dh); ++ } ++@@ -371,7 +371,7 @@ ++ { ++ cout << "\nXTR-DH validation suite running...\n\n"; ++ ++- FileSource f("TestData/xtrdh171.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", true, new HexDecoder()); ++ XTR_DH dh(f); ++ return SimpleKeyAgreementValidate(dh); ++ } ++@@ -381,7 +381,7 @@ ++ cout << "\nElGamal validation suite running...\n\n"; ++ bool pass = true; ++ { ++- FileSource fc("TestData/elgc1024.dat", true, new HexDecoder); +++ FileSource fc(PACKAGE_DATA_DIR "TestData/elgc1024.dat", true, new HexDecoder); ++ ElGamalDecryptor privC(fc); ++ ElGamalEncryptor pubC(privC); ++ privC.AccessKey().Precompute(); ++@@ -399,7 +399,7 @@ ++ cout << "\nDLIES validation suite running...\n\n"; ++ bool pass = true; ++ { ++- FileSource fc("TestData/dlie1024.dat", true, new HexDecoder); +++ FileSource fc(PACKAGE_DATA_DIR "TestData/dlie1024.dat", true, new HexDecoder); ++ DLIES<>::Decryptor privC(fc); ++ DLIES<>::Encryptor pubC(privC); ++ pass = CryptoSystemValidate(privC, pubC) && pass; ++@@ -422,7 +422,7 @@ ++ cout << "\nNR validation suite running...\n\n"; ++ bool pass = true; ++ { ++- FileSource f("TestData/nr2048.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/nr2048.dat", true, new HexDecoder); ++ NR::Signer privS(f); ++ privS.AccessKey().Precompute(); ++ NR::Verifier pubS(privS); ++@@ -445,7 +445,7 @@ ++ ++ bool pass = true, fail; ++ { ++- FileSource fs("TestData/dsa512.dat", true, new HexDecoder()); +++ FileSource fs(PACKAGE_DATA_DIR "TestData/dsa512.dat", true, new HexDecoder()); ++ GDSA::Signer priv(fs); ++ priv.AccessKey().Precompute(16); ++ GDSA::Verifier pub(priv); ++@@ -487,10 +487,10 @@ ++ fail = pub.VerifyMessage((byte *)"xyz", 3, sig, sizeof(sig)); ++ pass = pass && !fail; ++ } ++- FileSource fs1("TestData/dsa1024.dat", true, new HexDecoder()); +++ FileSource fs1(PACKAGE_DATA_DIR "TestData/dsa1024.dat", true, new HexDecoder()); ++ DSA::Signer priv(fs1); ++ DSA::Verifier pub(priv); ++- FileSource fs2("TestData/dsa1024b.dat", true, new HexDecoder()); +++ FileSource fs2(PACKAGE_DATA_DIR "TestData/dsa1024b.dat", true, new HexDecoder()); ++ DSA::Verifier pub1(fs2); ++ assert(pub.GetKey() == pub1.GetKey()); ++ pass = SignatureValidate(priv, pub, thorough) && pass; ++@@ -503,7 +503,7 @@ ++ bool pass=true; ++ ++ { ++- FileSource f("TestData/luc1024.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/luc1024.dat", true, new HexDecoder); ++ LUCSSA_PKCS1v15_SHA_Signer priv(f); ++ LUCSSA_PKCS1v15_SHA_Verifier pub(priv); ++ pass = SignatureValidate(priv, pub) && pass; ++@@ -520,14 +520,14 @@ ++ { ++ cout << "\nLUC-HMP validation suite running...\n\n"; ++ ++- FileSource f("TestData/lucs512.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/lucs512.dat", true, new HexDecoder); ++ LUC_HMP::Signer privS(f); ++ LUC_HMP::Verifier pubS(privS); ++ bool pass = SignatureValidate(privS, pubS); ++ ++ cout << "\nLUC-IES validation suite running...\n\n"; ++ ++- FileSource fc("TestData/lucc512.dat", true, new HexDecoder); +++ FileSource fc(PACKAGE_DATA_DIR "TestData/lucc512.dat", true, new HexDecoder); ++ LUC_IES<>::Decryptor privC(fc); ++ LUC_IES<>::Encryptor pubC(privC); ++ pass = CryptoSystemValidate(privC, pubC) && pass; ++@@ -541,7 +541,7 @@ ++ bool pass=true; ++ ++ { ++- FileSource f("TestData/rabi1024.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/rabi1024.dat", true, new HexDecoder); ++ RabinSS::Signer priv(f); ++ RabinSS::Verifier pub(priv); ++ pass = SignatureValidate(priv, pub) && pass; ++@@ -558,7 +558,7 @@ ++ { ++ cout << "\nRW validation suite running...\n\n"; ++ ++- FileSource f("TestData/rw1024.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/rw1024.dat", true, new HexDecoder); ++ RWSS::Signer priv(f); ++ RWSS::Verifier pub(priv); ++ ++@@ -570,7 +570,7 @@ ++ { ++ cout << "\nBlumGoldwasser validation suite running...\n\n"; ++ ++- FileSource f("TestData/blum512.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/blum512.dat", true, new HexDecoder); ++ BlumGoldwasserPrivateKey priv(f); ++ BlumGoldwasserPublicKey pub(priv); ++ ++@@ -740,7 +740,7 @@ ++ "\x74\x02\x37\x0E\xED\x0A\x06\xAD\xF4\x15\x65\xB8\xE1\xD1\x45\xAE\x39\x19\xB4\xFF\x5D\xF1\x45\x7B\xE0\xFE\x72\xED\x11\x92\x8F\x61\x41\x4F\x02\x00\xF2\x76\x6F\x7C" ++ "\x79\xA2\xE5\x52\x20\x5D\x97\x5E\xFE\x39\xAE\x21\x10\xFB\x35\xF4\x80\x81\x41\x13\xDD\xE8\x5F\xCA\x1E\x4F\xF8\x9B\xB2\x68\xFB\x28"; ++ ++- FileSource keys("TestData/esig1536.dat", true, new HexDecoder); +++ FileSource keys(PACKAGE_DATA_DIR "TestData/esig1536.dat", true, new HexDecoder); ++ ESIGN::Signer signer(keys); ++ ESIGN::Verifier verifier(signer); ++ ++Index: libcrypto++/validat3.cpp ++=================================================================== ++--- libcrypto++.orig/validat3.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/validat3.cpp 2009-04-07 03:29:42.000000000 +0200 ++@@ -365,14 +365,14 @@ ++ { ++ cout << "\nPanama validation suite running...\n"; ++ ++- return RunTestDataFile("TestVectors/panama.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/panama.txt"); ++ } ++ ++ bool ValidateWhirlpool() ++ { ++ cout << "\nWhirlpool Hash Function validation suite running...\n"; ++ ++- return RunTestDataFile("TestVectors/whrlpool.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/whrlpool.txt"); ++ } ++ ++ #ifdef CRYPTOPP_REMOVED +diff --git a/feeds/packages/libs/libcrypto++/patches/.svn/text-base/003-autoconf_files.patch.svn-base b/feeds/packages/libs/libcrypto++/patches/.svn/text-base/003-autoconf_files.patch.svn-base +new file mode 100644 +index 0000000..16ea3ff +--- /dev/null ++++ b/feeds/packages/libs/libcrypto++/patches/.svn/text-base/003-autoconf_files.patch.svn-base +@@ -0,0 +1,822 @@ ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/configure.ac 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,43 @@ +++# -*- autoconf -*- +++# Process this file with autoconf to produce a configure script. +++# Written by Jens Peter Secher . +++ +++AC_INIT([Crypto++], [5.6.0], [libcrypto++@bugs.debian.org]) +++AC_CONFIG_SRCDIR([cryptlib.h]) +++AC_CONFIG_HEADERS([cryptopp_config.h]) +++AC_CONFIG_HEADERS([config.h]) +++AM_INIT_AUTOMAKE([foreign]) +++AM_MAINTAINER_MODE +++ +++# Checks for programs. +++AC_PROG_CXX +++AC_PROG_CC +++AC_PROG_LN_S +++AC_PROG_LIBTOOL +++ +++# Checks for header files. +++AC_HEADER_STDC +++AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h]) +++ +++# Checks for typedefs, structures, and compiler characteristics. +++AC_HEADER_STDBOOL +++AC_C_CONST +++AC_C_INLINE +++AC_TYPE_SIZE_T +++AC_HEADER_TIME +++AC_CHECK_TYPES([ptrdiff_t]) +++AC_C_BIGENDIAN( +++ AC_DEFINE(IS_BIG_ENDIAN, [], [Big-endian architecture]), +++ AC_DEFINE(IS_LITTLE_ENDIAN, [], [Little-endian architecture]), +++ AC_MSG_ERROR([Can't tell endianess of platform])) +++ +++# Checks for library functions. +++AC_PROG_GCC_TRADITIONAL +++AC_FUNC_MALLOC +++AC_FUNC_MEMCMP +++AC_FUNC_SELECT_ARGTYPES +++AC_TYPE_SIGNAL +++AC_CHECK_FUNCS([gethostbyname gettimeofday memmove memset pow select socket]) +++ +++AC_CONFIG_FILES([Makefile libcrypto++.pc]) +++AC_OUTPUT ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/Makefile.am 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,303 @@ +++## Process this file with automake to produce Makefile.in +++# Written by Jens Peter Secher . +++ +++# Build two versions of cryptest, one that uses data files from the +++# current working directory, and one that uses data files from +++# /usr/share/crypto++. The former is for running the test suite at +++# build time, the latter is included in the package. +++ +++# To test against newest GCC, uncomment the following two lines. +++#CXX = /usr/lib/gcc-snapshot/bin/g++ +++#CXXCPP = /usr/lib/gcc-snapshot/bin/g++ +++ +++bin_PROGRAMS = cryptest cryptestcwd +++cryptest_CXXFLAGS = -DPACKAGE_DATA_DIR='"/usr/share/crypto++/"' +++cryptest_SOURCES = \ +++ bench.cpp \ +++ bench2.cpp \ +++ datatest.cpp \ +++ dlltest.cpp \ +++ fipsalgt.cpp \ +++ regtest.cpp \ +++ test.cpp \ +++ validat1.cpp \ +++ validat2.cpp \ +++ validat3.cpp +++cryptest_LDADD = libcrypto++.la +++cryptestcwd_CXXFLAGS = -DPACKAGE_DATA_DIR='""' +++cryptestcwd_SOURCES = \ +++ bench.cpp \ +++ bench2.cpp \ +++ datatest.cpp \ +++ dlltest.cpp \ +++ fipsalgt.cpp \ +++ regtest.cpp \ +++ test.cpp \ +++ validat1.cpp \ +++ validat2.cpp \ +++ validat3.cpp +++cryptestcwd_LDADD = libcrypto++.la +++ +++lib_LTLIBRARIES = libcrypto++.la +++libcrypto___la_LDFLAGS = -version-info 8:0:0 +++libcrypto___la_SOURCES = \ +++ 3way.cpp \ +++ adler32.cpp \ +++ algebra.cpp \ +++ algparam.cpp \ +++ arc4.cpp \ +++ asn.cpp \ +++ authenc.cpp \ +++ base32.cpp \ +++ base64.cpp \ +++ basecode.cpp \ +++ bfinit.cpp \ +++ blowfish.cpp \ +++ blumshub.cpp \ +++ camellia.cpp \ +++ cast.cpp \ +++ casts.cpp \ +++ cbcmac.cpp \ +++ ccm.cpp \ +++ channels.cpp \ +++ cmac.cpp \ +++ cpu.cpp \ +++ crc.cpp \ +++ cryptlib.cpp \ +++ default.cpp \ +++ des.cpp \ +++ dessp.cpp \ +++ dh2.cpp \ +++ dh.cpp \ +++ dll.cpp \ +++ dsa.cpp \ +++ eax.cpp \ +++ ec2n.cpp \ +++ eccrypto.cpp \ +++ ecp.cpp \ +++ elgamal.cpp \ +++ emsa2.cpp \ +++ eprecomp.cpp \ +++ esign.cpp \ +++ files.cpp \ +++ filters.cpp \ +++ fips140.cpp \ +++ fipstest.cpp \ +++ gcm.cpp \ +++ gf2_32.cpp \ +++ gf256.cpp \ +++ gf2n.cpp \ +++ gfpcrypt.cpp \ +++ gost.cpp \ +++ gzip.cpp \ +++ hex.cpp \ +++ hmac.cpp \ +++ hrtimer.cpp \ +++ ida.cpp \ +++ idea.cpp \ +++ integer.cpp \ +++ iterhash.cpp \ +++ luc.cpp \ +++ mars.cpp \ +++ marss.cpp \ +++ md2.cpp \ +++ md4.cpp \ +++ md5.cpp \ +++ misc.cpp \ +++ modes.cpp \ +++ mqueue.cpp \ +++ mqv.cpp \ +++ nbtheory.cpp \ +++ network.cpp \ +++ oaep.cpp \ +++ osrng.cpp \ +++ panama.cpp \ +++ pch.cpp \ +++ pkcspad.cpp \ +++ polynomi.cpp \ +++ pssr.cpp \ +++ pubkey.cpp \ +++ queue.cpp \ +++ rabin.cpp \ +++ randpool.cpp \ +++ rc2.cpp \ +++ rc5.cpp \ +++ rc6.cpp \ +++ rdtables.cpp \ +++ rijndael.cpp \ +++ ripemd.cpp \ +++ rng.cpp \ +++ rsa.cpp \ +++ rw.cpp \ +++ safer.cpp \ +++ salsa.cpp \ +++ seal.cpp \ +++ seed.cpp \ +++ serpent.cpp \ +++ shacal2.cpp \ +++ sha.cpp \ +++ sharkbox.cpp \ +++ shark.cpp \ +++ simple.cpp \ +++ skipjack.cpp \ +++ socketft.cpp \ +++ sosemanuk.cpp \ +++ square.cpp \ +++ squaretb.cpp \ +++ strciphr.cpp \ +++ tea.cpp \ +++ tftables.cpp \ +++ tiger.cpp \ +++ tigertab.cpp \ +++ trdlocal.cpp \ +++ ttmac.cpp \ +++ twofish.cpp \ +++ vmac.cpp \ +++ wait.cpp \ +++ wake.cpp \ +++ whrlpool.cpp \ +++ winpipes.cpp \ +++ xtr.cpp \ +++ xtrcrypt.cpp \ +++ zdeflate.cpp \ +++ zinflate.cpp \ +++ zlib.cpp +++ +++pkginclude_HEADERS = \ +++ 3way.h \ +++ adler32.h \ +++ aes.h \ +++ algebra.h \ +++ algparam.h \ +++ arc4.h \ +++ argnames.h \ +++ asn.h \ +++ authenc.h \ +++ base32.h \ +++ base64.h \ +++ basecode.h \ +++ bench.h \ +++ blowfish.h \ +++ blumshub.h \ +++ camellia.h \ +++ cast.h \ +++ cbcmac.h \ +++ ccm.h \ +++ channels.h \ +++ cmac.h \ +++ config.h \ +++ cpu.h \ +++ crc.h \ +++ cryptlib.h \ +++ default.h \ +++ des.h \ +++ dh2.h \ +++ dh.h \ +++ dll.h \ +++ dmac.h \ +++ dsa.h \ +++ eax.h \ +++ ec2n.h \ +++ eccrypto.h \ +++ ecp.h \ +++ elgamal.h \ +++ emsa2.h \ +++ eprecomp.h \ +++ esign.h \ +++ factory.h \ +++ files.h \ +++ filters.h \ +++ fips140.h \ +++ fltrimpl.h \ +++ gcm.h \ +++ gf2_32.h \ +++ gf256.h \ +++ gf2n.h \ +++ gfpcrypt.h \ +++ gost.h \ +++ gzip.h \ +++ hex.h \ +++ hmac.h \ +++ hrtimer.h \ +++ ida.h \ +++ idea.h \ +++ integer.h \ +++ iterhash.h \ +++ lubyrack.h \ +++ luc.h \ +++ mars.h \ +++ md2.h \ +++ md4.h \ +++ md5.h \ +++ mdc.h \ +++ misc.h \ +++ modarith.h \ +++ modes.h \ +++ modexppc.h \ +++ mqueue.h \ +++ mqv.h \ +++ nbtheory.h \ +++ network.h \ +++ nr.h \ +++ oaep.h \ +++ oids.h \ +++ osrng.h \ +++ panama.h \ +++ pch.h \ +++ pkcspad.h \ +++ polynomi.h \ +++ pssr.h \ +++ pubkey.h \ +++ pwdbased.h \ +++ queue.h \ +++ rabin.h \ +++ randpool.h \ +++ rc2.h \ +++ rc5.h \ +++ rc6.h \ +++ rijndael.h \ +++ ripemd.h \ +++ rng.h \ +++ rsa.h \ +++ rw.h \ +++ safer.h \ +++ salsa.h \ +++ seal.h \ +++ secblock.h \ +++ seckey.h \ +++ seed.h \ +++ serpent.h \ +++ serpentp.h \ +++ shacal2.h \ +++ sha.h \ +++ shark.h \ +++ simple.h \ +++ skipjack.h \ +++ smartptr.h \ +++ socketft.h \ +++ sosemanuk.h \ +++ square.h \ +++ stdcpp.h \ +++ strciphr.h \ +++ tea.h \ +++ tiger.h \ +++ trdlocal.h \ +++ trunhash.h \ +++ ttmac.h \ +++ twofish.h \ +++ vmac.h \ +++ wait.h \ +++ wake.h \ +++ whrlpool.h \ +++ winpipes.h \ +++ words.h \ +++ xtr.h \ +++ xtrcrypt.h \ +++ zdeflate.h \ +++ zinflate.h \ +++ zlib.h +++ +++htmldir = $(datadir)/html +++ +++html: $(libcrypto___la_SOURCES) +++ doxygen ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/config.h.in 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,452 @@ +++// Debian note: This is a copy of the original config.h file except for the two +++// endianness undefs below; they are substituted by the autoconf process +++// according to the build architecture. +++ +++#ifndef CRYPTOPP_CONFIG_H +++#define CRYPTOPP_CONFIG_H +++ +++// ***************** Important Settings ******************** +++ +++// Endianness +++#undef IS_BIG_ENDIAN +++#undef IS_LITTLE_ENDIAN +++ +++// define this if you want to disable all OS-dependent features, +++// such as sockets and OS-provided random number generators +++// #define NO_OS_DEPENDENCE +++ +++// Define this to use features provided by Microsoft's CryptoAPI. +++// Currently the only feature used is random number generation. +++// This macro will be ignored if NO_OS_DEPENDENCE is defined. +++#define USE_MS_CRYPTOAPI +++ +++// Define this to 1 to enforce the requirement in FIPS 186-2 Change Notice 1 that only 1024 bit moduli be used +++#ifndef DSA_1024_BIT_MODULUS_ONLY +++# define DSA_1024_BIT_MODULUS_ONLY 1 +++#endif +++ +++// ***************** Less Important Settings *************** +++ +++// define this to retain (as much as possible) old deprecated function and class names +++// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY +++ +++#define GZIP_OS_CODE 0 +++ +++// Try this if your CPU has 256K internal cache or a slow multiply instruction +++// and you want a (possibly) faster IDEA implementation using log tables +++// #define IDEA_LARGECACHE +++ +++// Define this if, for the linear congruential RNG, you want to use +++// the original constants as specified in S.K. Park and K.W. Miller's +++// CACM paper. +++// #define LCRNG_ORIGINAL_NUMBERS +++ +++// choose which style of sockets to wrap (mostly useful for cygwin which has both) +++#define PREFER_BERKELEY_STYLE_SOCKETS +++// #define PREFER_WINDOWS_STYLE_SOCKETS +++ +++// set the name of Rijndael cipher, was "Rijndael" before version 5.3 +++#define CRYPTOPP_RIJNDAEL_NAME "AES" +++ +++// ***************** Important Settings Again ******************** +++// But the defaults should be ok. +++ +++// namespace support is now required +++#ifdef NO_NAMESPACE +++# error namespace support is now required +++#endif +++ +++// Define this to workaround a Microsoft CryptoAPI bug where +++// each call to CryptAcquireContext causes a 100 KB memory leak. +++// Defining this will cause Crypto++ to make only one call to CryptAcquireContext. +++#define WORKAROUND_MS_BUG_Q258000 +++ +++#ifdef CRYPTOPP_DOXYGEN_PROCESSING +++// Avoid putting "CryptoPP::" in front of everything in Doxygen output +++# define CryptoPP +++# define NAMESPACE_BEGIN(x) +++# define NAMESPACE_END +++// Get Doxygen to generate better documentation for these typedefs +++# define DOCUMENTED_TYPEDEF(x, y) class y : public x {}; +++#else +++# define NAMESPACE_BEGIN(x) namespace x { +++# define NAMESPACE_END } +++# define DOCUMENTED_TYPEDEF(x, y) typedef x y; +++#endif +++#define ANONYMOUS_NAMESPACE_BEGIN namespace { +++#define USING_NAMESPACE(x) using namespace x; +++#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x { +++#define DOCUMENTED_NAMESPACE_END } +++ +++// What is the type of the third parameter to bind? +++// For Unix, the new standard is ::socklen_t (typically unsigned int), and the old standard is int. +++// Unfortunately there is no way to tell whether or not socklen_t is defined. +++// To work around this, TYPE_OF_SOCKLEN_T is a macro so that you can change it from the makefile. +++#ifndef TYPE_OF_SOCKLEN_T +++# if defined(_WIN32) || defined(__CYGWIN__) +++# define TYPE_OF_SOCKLEN_T int +++# else +++# define TYPE_OF_SOCKLEN_T ::socklen_t +++# endif +++#endif +++ +++#if defined(__CYGWIN__) && defined(PREFER_WINDOWS_STYLE_SOCKETS) +++# define __USE_W32_SOCKETS +++#endif +++ +++typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs +++ +++NAMESPACE_BEGIN(CryptoPP) +++ +++typedef unsigned short word16; +++typedef unsigned int word32; +++ +++#if defined(_MSC_VER) || defined(__BORLANDC__) +++ typedef unsigned __int64 word64; +++ #define W64LIT(x) x##ui64 +++#else +++ typedef unsigned long long word64; +++ #define W64LIT(x) x##ULL +++#endif +++ +++// define large word type, used for file offsets and such +++typedef word64 lword; +++const lword LWORD_MAX = W64LIT(0xffffffffffffffff); +++ +++#ifdef __GNUC__ +++ #define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) +++#endif +++ +++// define hword, word, and dword. these are used for multiprecision integer arithmetic +++// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx +++#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__)) +++ typedef word32 hword; +++ typedef word64 word; +++#else +++ #define CRYPTOPP_NATIVE_DWORD_AVAILABLE +++ #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) +++ #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 +++ // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 +++ // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 +++ typedef word32 hword; +++ typedef word64 word; +++ typedef __uint128_t dword; +++ typedef __uint128_t word128; +++ #define CRYPTOPP_WORD128_AVAILABLE +++ #else +++ // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results +++ typedef word16 hword; +++ typedef word32 word; +++ typedef word64 dword; +++ #endif +++ #else +++ // being here means the native register size is probably 32 bits or less +++ #define CRYPTOPP_BOOL_SLOW_WORD64 1 +++ typedef word16 hword; +++ typedef word32 word; +++ typedef word64 dword; +++ #endif +++#endif +++#ifndef CRYPTOPP_BOOL_SLOW_WORD64 +++ #define CRYPTOPP_BOOL_SLOW_WORD64 0 +++#endif +++ +++const unsigned int WORD_SIZE = sizeof(word); +++const unsigned int WORD_BITS = WORD_SIZE * 8; +++ +++NAMESPACE_END +++ +++#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE +++ // This should be a lower bound on the L1 cache line size. It's used for defense against timing attacks. +++ #if defined(_M_X64) || defined(__x86_64__) +++ #define CRYPTOPP_L1_CACHE_LINE_SIZE 64 +++ #else +++ // L1 cache line size is 32 on Pentium III and earlier +++ #define CRYPTOPP_L1_CACHE_LINE_SIZE 32 +++ #endif +++#endif +++ +++#if defined(_MSC_VER) +++ #if _MSC_VER == 1200 +++ #include +++ #endif +++ #if _MSC_VER > 1200 || defined(_mm_free) +++ #define CRYPTOPP_MSVC6PP_OR_LATER // VC 6 processor pack or later +++ #else +++ #define CRYPTOPP_MSVC6_NO_PP // VC 6 without processor pack +++ #endif +++#endif +++ +++#ifndef CRYPTOPP_ALIGN_DATA +++ #if defined(CRYPTOPP_MSVC6PP_OR_LATER) +++ #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x)) +++ #elif defined(__GNUC__) +++ #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x))) +++ #else +++ #define CRYPTOPP_ALIGN_DATA(x) +++ #endif +++#endif +++ +++#ifndef CRYPTOPP_SECTION_ALIGN16 +++ #if defined(__GNUC__) && !defined(__APPLE__) +++ // the alignment attribute doesn't seem to work without this section attribute when -fdata-sections is turned on +++ #define CRYPTOPP_SECTION_ALIGN16 __attribute__((section ("CryptoPP_Align16"))) +++ #else +++ #define CRYPTOPP_SECTION_ALIGN16 +++ #endif +++#endif +++ +++#if defined(_MSC_VER) || defined(__fastcall) +++ #define CRYPTOPP_FASTCALL __fastcall +++#else +++ #define CRYPTOPP_FASTCALL +++#endif +++ +++// VC60 workaround: it doesn't allow typename in some places +++#if defined(_MSC_VER) && (_MSC_VER < 1300) +++#define CPP_TYPENAME +++#else +++#define CPP_TYPENAME typename +++#endif +++ +++// VC60 workaround: can't cast unsigned __int64 to float or double +++#if defined(_MSC_VER) && !defined(CRYPTOPP_MSVC6PP_OR_LATER) +++#define CRYPTOPP_VC6_INT64 (__int64) +++#else +++#define CRYPTOPP_VC6_INT64 +++#endif +++ +++#ifdef _MSC_VER +++#define CRYPTOPP_NO_VTABLE __declspec(novtable) +++#else +++#define CRYPTOPP_NO_VTABLE +++#endif +++ +++#ifdef _MSC_VER +++ // 4231: nonstandard extension used : 'extern' before template explicit instantiation +++ // 4250: dominance +++ // 4251: member needs to have dll-interface +++ // 4275: base needs to have dll-interface +++ // 4660: explicitly instantiating a class that's already implicitly instantiated +++ // 4661: no suitable definition provided for explicit template instantiation request +++ // 4786: identifer was truncated in debug information +++ // 4355: 'this' : used in base member initializer list +++ // 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation +++# pragma warning(disable: 4231 4250 4251 4275 4660 4661 4786 4355 4910) +++#endif +++ +++#ifdef __BORLANDC__ +++// 8037: non-const function called for const object. needed to work around BCB2006 bug +++# pragma warn -8037 +++#endif +++ +++#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) +++#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION +++#endif +++ +++#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION +++#define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE +++#endif +++ +++#ifdef CRYPTOPP_DISABLE_X86ASM // for backwards compatibility: this macro had both meanings +++#define CRYPTOPP_DISABLE_ASM +++#define CRYPTOPP_DISABLE_SSE2 +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) +++ #define CRYPTOPP_X86_ASM_AVAILABLE +++ +++ #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || CRYPTOPP_GCC_VERSION >= 30300) +++ #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1 +++ #else +++ #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0 +++ #endif +++ +++ // SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed. +++ // GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version. +++ #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102) +++ #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1 +++ #else +++ #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0 +++ #endif +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64) +++ #define CRYPTOPP_X64_MASM_AVAILABLE +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__) +++ #define CRYPTOPP_X64_ASM_AVAILABLE +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) +++ #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1 +++#else +++ #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0 +++#endif +++ +++#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) +++ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 +++#else +++ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 +++#endif +++ +++// how to allocate 16-byte aligned memory (for SSE2) +++#if defined(CRYPTOPP_MSVC6PP_OR_LATER) +++ #define CRYPTOPP_MM_MALLOC_AVAILABLE +++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +++ #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16 +++#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__) +++ #define CRYPTOPP_MEMALIGN_AVAILABLE +++#else +++ #define CRYPTOPP_NO_ALIGNED_ALLOC +++#endif +++ +++// how to disable inlining +++#if defined(_MSC_VER) && _MSC_VER >= 1300 +++# define CRYPTOPP_NOINLINE_DOTDOTDOT +++# define CRYPTOPP_NOINLINE __declspec(noinline) +++#elif defined(__GNUC__) +++# define CRYPTOPP_NOINLINE_DOTDOTDOT +++# define CRYPTOPP_NOINLINE __attribute__((noinline)) +++#else +++# define CRYPTOPP_NOINLINE_DOTDOTDOT ... +++# define CRYPTOPP_NOINLINE +++#endif +++ +++// how to declare class constants +++#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) +++# define CRYPTOPP_CONSTANT(x) enum {x}; +++#else +++# define CRYPTOPP_CONSTANT(x) static const int x; +++#endif +++ +++#if defined(_M_X64) || defined(__x86_64__) +++ #define CRYPTOPP_BOOL_X64 1 +++#else +++ #define CRYPTOPP_BOOL_X64 0 +++#endif +++ +++// see http://predef.sourceforge.net/prearch.html +++#if defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) +++ #define CRYPTOPP_BOOL_X86 1 +++#else +++ #define CRYPTOPP_BOOL_X86 0 +++#endif +++ +++#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || defined(__powerpc__) +++ #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS +++#endif +++ +++#define CRYPTOPP_VERSION 560 +++ +++// ***************** determine availability of OS features ******************** +++ +++#ifndef NO_OS_DEPENDENCE +++ +++#if defined(_WIN32) || defined(__CYGWIN__) +++#define CRYPTOPP_WIN32_AVAILABLE +++#endif +++ +++#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) +++#define CRYPTOPP_UNIX_AVAILABLE +++#endif +++ +++#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) +++# define HIGHRES_TIMER_AVAILABLE +++#endif +++ +++#ifdef CRYPTOPP_UNIX_AVAILABLE +++# define HAS_BERKELEY_STYLE_SOCKETS +++#endif +++ +++#ifdef CRYPTOPP_WIN32_AVAILABLE +++# define HAS_WINDOWS_STYLE_SOCKETS +++#endif +++ +++#if defined(HIGHRES_TIMER_AVAILABLE) && (defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(HAS_WINDOWS_STYLE_SOCKETS)) +++# define SOCKETS_AVAILABLE +++#endif +++ +++#if defined(HAS_WINDOWS_STYLE_SOCKETS) && (!defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(PREFER_WINDOWS_STYLE_SOCKETS)) +++# define USE_WINDOWS_STYLE_SOCKETS +++#else +++# define USE_BERKELEY_STYLE_SOCKETS +++#endif +++ +++#if defined(HIGHRES_TIMER_AVAILABLE) && defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_BERKELEY_STYLE_SOCKETS) +++# define WINDOWS_PIPES_AVAILABLE +++#endif +++ +++#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(USE_MS_CRYPTOAPI) +++# define NONBLOCKING_RNG_AVAILABLE +++# define OS_RNG_AVAILABLE +++#endif +++ +++#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING) +++# define NONBLOCKING_RNG_AVAILABLE +++# define BLOCKING_RNG_AVAILABLE +++# define OS_RNG_AVAILABLE +++# define HAS_PTHREADS +++# define THREADS_AVAILABLE +++#endif +++ +++#ifdef CRYPTOPP_WIN32_AVAILABLE +++# define HAS_WINTHREADS +++# define THREADS_AVAILABLE +++#endif +++ +++#endif // NO_OS_DEPENDENCE +++ +++// ***************** DLL related ******************** +++ +++#ifdef CRYPTOPP_WIN32_AVAILABLE +++ +++#ifdef CRYPTOPP_EXPORTS +++#define CRYPTOPP_IS_DLL +++#define CRYPTOPP_DLL __declspec(dllexport) +++#elif defined(CRYPTOPP_IMPORTS) +++#define CRYPTOPP_IS_DLL +++#define CRYPTOPP_DLL __declspec(dllimport) +++#else +++#define CRYPTOPP_DLL +++#endif +++ +++#define CRYPTOPP_API __cdecl +++ +++#else // CRYPTOPP_WIN32_AVAILABLE +++ +++#define CRYPTOPP_DLL +++#define CRYPTOPP_API +++ +++#endif // CRYPTOPP_WIN32_AVAILABLE +++ +++#if defined(__MWERKS__) +++#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL +++#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) +++#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL +++#else +++#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL +++#endif +++ +++#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS) +++#define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL +++#else +++#define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS +++#endif +++ +++#if defined(__MWERKS__) +++#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class +++#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) +++#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class +++#else +++#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class +++#endif +++ +++#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS) +++#define CRYPTOPP_STATIC_TEMPLATE_CLASS template class +++#else +++#define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS +++#endif +++ +++#endif ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/libcrypto++.pc.in 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,12 @@ +++prefix=@prefix@ +++exec_prefix=@exec_prefix@ +++libdir=@libdir@ +++includedir=@includedir@ +++ +++Name: libcrypto++ +++Description: General purpose cryptographic shared library +++URL: http://www.cryptopp.com +++Version: @VERSION@ +++Requires: +++Libs: -lcrypto++ +++Cflags: +diff --git a/feeds/packages/libs/libcrypto++/patches/.svn/text-base/004-gcc4.7.0.patch.svn-base b/feeds/packages/libs/libcrypto++/patches/.svn/text-base/004-gcc4.7.0.patch.svn-base +new file mode 100644 +index 0000000..a2ef66a +--- /dev/null ++++ b/feeds/packages/libs/libcrypto++/patches/.svn/text-base/004-gcc4.7.0.patch.svn-base +@@ -0,0 +1,102 @@ ++diff -rupN libcrypto++-5.6.0.orig/algebra.cpp libcrypto++-5.6.0/algebra.cpp ++--- libcrypto++-5.6.0.orig/algebra.cpp Sun Mar 1 20:44:04 2009 +++++ libcrypto++-5.6.0/algebra.cpp Fri Oct 12 20:18:44 2012 ++@@ -58,7 +58,7 @@ template const T& AbstractEucl ++ Element g[3]={b, a}; ++ unsigned int i0=0, i1=1, i2=2; ++ ++- while (!Equal(g[i1], this->Identity())) +++ while (!this->Equal(g[i1], this->Identity())) ++ { ++ g[i2] = Mod(g[i0], g[i1]); ++ unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; ++diff -rupN libcrypto++-5.6.0.orig/eccrypto.cpp libcrypto++-5.6.0/eccrypto.cpp ++--- libcrypto++-5.6.0.orig/eccrypto.cpp Sun Mar 15 03:48:02 2009 +++++ libcrypto++-5.6.0/eccrypto.cpp Fri Oct 12 20:17:08 2012 ++@@ -435,7 +435,7 @@ template void DL_GroupParamet ++ StringSource ssG(param.g, true, new HexDecoder); ++ Element G; ++ bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); ++- SetSubgroupGenerator(G); +++ this->SetSubgroupGenerator(G); ++ assert(result); ++ ++ StringSource ssN(param.n, true, new HexDecoder); ++@@ -591,7 +591,7 @@ bool DL_GroupParameters_EC::Validate ++ if (level >= 2 && pass) ++ { ++ const Integer &q = GetSubgroupOrder(); ++- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); +++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); ++ pass = pass && IsIdentity(gq); ++ } ++ return pass; ++@@ -629,7 +629,7 @@ void DL_PublicKey_EC::BERDecodePubli ++ typename EC::Point P; ++ if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) ++ BERDecodeError(); ++- SetPublicElement(P); +++ this->SetPublicElement(P); ++ } ++ ++ template ++diff -rupN libcrypto++-5.6.0.orig/eccrypto.h libcrypto++-5.6.0/eccrypto.h ++--- libcrypto++-5.6.0.orig/eccrypto.h Sun Mar 1 20:44:02 2009 +++++ libcrypto++-5.6.0/eccrypto.h Fri Oct 12 20:17:30 2012 ++@@ -43,7 +43,7 @@ public: ++ void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) ++ { ++ this->m_groupPrecomputation.SetCurve(ec); ++- SetSubgroupGenerator(G); +++ this->SetSubgroupGenerator(G); ++ m_n = n; ++ m_k = k; ++ } ++@@ -145,9 +145,9 @@ public: ++ typedef typename EC::Point Element; ++ ++ void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) ++- {this->AccessGroupParameters() = params; SetPublicElement(Q);} +++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} ++ void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) ++- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} +++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} ++ ++ // X509PublicKey ++ void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); ++@@ -166,9 +166,9 @@ public: ++ void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) ++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} ++ void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC ¶ms) ++- {GenerateRandom(rng, params);} +++ {this->GenerateRandom(rng, params);} ++ void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) ++- {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} +++ {this->GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} ++ ++ // PKCS8PrivateKey ++ void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); ++diff -rupN libcrypto++-5.6.0.orig/panama.cpp libcrypto++-5.6.0/panama.cpp ++--- libcrypto++-5.6.0.orig/panama.cpp Sun Mar 1 20:44:00 2009 +++++ libcrypto++-5.6.0/panama.cpp Fri Oct 12 20:19:27 2012 ++@@ -420,7 +420,7 @@ void PanamaHash::TruncatedFinal(byte ++ { ++ this->ThrowIfInvalidTruncatedSize(size); ++ ++- PadLastBlock(this->BLOCKSIZE, 0x01); +++ this->PadLastBlock(this->BLOCKSIZE, 0x01); ++ ++ HashEndianCorrectedBlock(this->m_data); ++ ++diff -rupN libcrypto++-5.6.0.orig/secblock.h libcrypto++-5.6.0/secblock.h ++--- libcrypto++-5.6.0.orig/secblock.h Sun Mar 15 03:48:02 2009 +++++ libcrypto++-5.6.0/secblock.h Fri Oct 12 20:13:31 2012 ++@@ -94,7 +94,7 @@ public: ++ ++ pointer allocate(size_type n, const void * = NULL) ++ { ++- CheckSize(n); +++ this->CheckSize(n); ++ if (n == 0) ++ return NULL; ++ +diff --git a/feeds/packages/libs/libcrypto++/patches/001-strict_gcc43_include.patch b/feeds/packages/libs/libcrypto++/patches/001-strict_gcc43_include.patch +new file mode 100644 +index 0000000..f8c38eb +--- /dev/null ++++ b/feeds/packages/libs/libcrypto++/patches/001-strict_gcc43_include.patch +@@ -0,0 +1,16 @@ ++## strict-gcc43-include.diff by Jens Peter Secher ++## ++## Explicitly include cstring to allow compilation with GCC 4.3. ++ ++Index: libcrypto++/misc.h ++=================================================================== ++--- libcrypto++.orig/misc.h 2009-04-07 02:48:55.000000000 +0200 +++++ libcrypto++/misc.h 2009-04-07 02:50:56.000000000 +0200 ++@@ -40,6 +40,7 @@ ++ #if defined(__GNUC__) && defined(__linux__) ++ #define CRYPTOPP_BYTESWAP_AVAILABLE ++ #include +++#include ++ #endif ++ ++ NAMESPACE_BEGIN(CryptoPP) +diff --git a/feeds/packages/libs/libcrypto++/patches/002-cryptest_data_files_location.patch b/feeds/packages/libs/libcrypto++/patches/002-cryptest_data_files_location.patch +new file mode 100644 +index 0000000..2dbb696 +--- /dev/null ++++ b/feeds/packages/libs/libcrypto++/patches/002-cryptest_data_files_location.patch +@@ -0,0 +1,500 @@ ++## cryptest-data-files-location.diff by Jens Peter Secher ++## ++## Prefix data file names by PACKAGE_DATA_DIR which is set during build. ++ ++Index: libcrypto++/bench2.cpp ++=================================================================== ++--- libcrypto++.orig/bench2.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/bench2.cpp 2009-04-07 03:23:43.000000000 +0200 ++@@ -245,44 +245,44 @@ ++ cout << ""; ++- BenchMarkCrypto > >("TestData/rsa1024.dat", "RSA 1024", t); ++- BenchMarkCrypto > >("TestData/luc1024.dat", "LUC 1024", t); ++- BenchMarkCrypto >("TestData/dlie1024.dat", "DLIES 1024", t); ++- BenchMarkCrypto >("TestData/lucc512.dat", "LUCELG 512", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/dlie1024.dat", "DLIES 1024", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/lucc512.dat", "LUCELG 512", t); ++ ++ cout << "\n"; ++- BenchMarkCrypto > >("TestData/rsa2048.dat", "RSA 2048", t); ++- BenchMarkCrypto > >("TestData/luc2048.dat", "LUC 2048", t); ++- BenchMarkCrypto >("TestData/dlie2048.dat", "DLIES 2048", t); ++- BenchMarkCrypto >("TestData/lucc1024.dat", "LUCELG 1024", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t); +++ BenchMarkCrypto > >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/dlie2048.dat", "DLIES 2048", t); +++ BenchMarkCrypto >(PACKAGE_DATA_DIR "TestData/lucc1024.dat", "LUCELG 1024", t); ++ ++ cout << "\n"; ++- BenchMarkSignature >("TestData/rsa1024.dat", "RSA 1024", t); ++- BenchMarkSignature >("TestData/rw1024.dat", "RW 1024", t); ++- BenchMarkSignature >("TestData/luc1024.dat", "LUC 1024", t); ++- BenchMarkSignature >("TestData/nr1024.dat", "NR 1024", t); ++- BenchMarkSignature("TestData/dsa1024.dat", "DSA 1024", t); ++- BenchMarkSignature >("TestData/lucs512.dat", "LUC-HMP 512", t); ++- BenchMarkSignature >("TestData/esig1023.dat", "ESIGN 1023", t); ++- BenchMarkSignature >("TestData/esig1536.dat", "ESIGN 1536", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rw1024.dat", "RW 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/nr1024.dat", "NR 1024", t); +++ BenchMarkSignature(PACKAGE_DATA_DIR "TestData/dsa1024.dat", "DSA 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/lucs512.dat", "LUC-HMP 512", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/esig1023.dat", "ESIGN 1023", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/esig1536.dat", "ESIGN 1536", t); ++ ++ cout << "\n"; ++- BenchMarkSignature >("TestData/rsa2048.dat", "RSA 2048", t); ++- BenchMarkSignature >("TestData/rw2048.dat", "RW 2048", t); ++- BenchMarkSignature >("TestData/luc2048.dat", "LUC 2048", t); ++- BenchMarkSignature >("TestData/nr2048.dat", "NR 2048", t); ++- BenchMarkSignature >("TestData/lucs1024.dat", "LUC-HMP 1024", t); ++- BenchMarkSignature >("TestData/esig2046.dat", "ESIGN 2046", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/rw2048.dat", "RW 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/nr2048.dat", "NR 2048", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/lucs1024.dat", "LUC-HMP 1024", t); +++ BenchMarkSignature >(PACKAGE_DATA_DIR "TestData/esig2046.dat", "ESIGN 2046", t); ++ ++ cout << "\n"; ++- BenchMarkKeyAgreement("TestData/xtrdh171.dat", "XTR-DH 171", t); ++- BenchMarkKeyAgreement("TestData/xtrdh342.dat", "XTR-DH 342", t); ++- BenchMarkKeyAgreement("TestData/dh1024.dat", "DH 1024", t); ++- BenchMarkKeyAgreement("TestData/dh2048.dat", "DH 2048", t); ++- BenchMarkKeyAgreement("TestData/lucd512.dat", "LUCDIF 512", t); ++- BenchMarkKeyAgreement("TestData/lucd1024.dat", "LUCDIF 1024", t); ++- BenchMarkKeyAgreement("TestData/mqv1024.dat", "MQV 1024", t); ++- BenchMarkKeyAgreement("TestData/mqv2048.dat", "MQV 2048", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", "XTR-DH 171", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/xtrdh342.dat", "XTR-DH 342", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/dh1024.dat", "DH 1024", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/dh2048.dat", "DH 2048", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/lucd512.dat", "LUCDIF 512", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/lucd1024.dat", "LUCDIF 1024", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/mqv1024.dat", "MQV 1024", t); +++ BenchMarkKeyAgreement(PACKAGE_DATA_DIR "TestData/mqv2048.dat", "MQV 2048", t); ++ ++ cout << "\n"; ++ { ++Index: libcrypto++/test.cpp ++=================================================================== ++--- libcrypto++.orig/test.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/test.cpp 2009-04-07 03:24:04.000000000 +0200 ++@@ -337,7 +337,7 @@ ++ AES_CTR_Encrypt(argv[2], argv[3], argv[4], argv[5]); ++ else if (command == "h") ++ { ++- FileSource usage("TestData/usage.dat", true, new FileSink(cout)); +++ FileSource usage(PACKAGE_DATA_DIR "TestData/usage.dat", true, new FileSink(cout)); ++ return 1; ++ } ++ else if (command == "V") ++Index: libcrypto++/validat1.cpp ++=================================================================== ++--- libcrypto++.orig/validat1.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/validat1.cpp 2009-04-07 03:25:57.000000000 +0200 ++@@ -508,12 +508,12 @@ ++ { ++ cout << "\nDES validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/descert.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/descert.dat", true, new HexDecoder); ++ bool pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ ++ cout << "\nTesting EDE2, EDE3, and XEX3 variants...\n\n"; ++ ++- FileSource valdata1("TestData/3desval.dat", true, new HexDecoder); +++ FileSource valdata1(PACKAGE_DATA_DIR "TestData/3desval.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(), valdata1, 1) && pass; ++@@ -855,7 +855,7 @@ ++ { ++ cout << "\nIDEA validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/ideaval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/ideaval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -863,7 +863,7 @@ ++ { ++ cout << "\nSAFER validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/saferval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/saferval.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(VariableRoundsCipherFactory(8,6), valdata, 4) && pass; ++ pass = BlockTransformationTest(VariableRoundsCipherFactory(16,12), valdata, 4) && pass; ++@@ -876,7 +876,7 @@ ++ { ++ cout << "\nRC2 validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rc2val.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc2val.dat", true, new HexDecoder); ++ HexEncoder output(new FileSink(cout)); ++ SecByteBlock plain(RC2Encryption::BLOCKSIZE), cipher(RC2Encryption::BLOCKSIZE), out(RC2Encryption::BLOCKSIZE), outplain(RC2Encryption::BLOCKSIZE); ++ SecByteBlock key(128); ++@@ -1086,7 +1086,7 @@ ++ { ++ cout << "\nRC5 validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rc5val.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc5val.dat", true, new HexDecoder); ++ return BlockTransformationTest(VariableRoundsCipherFactory(16, 12), valdata); ++ } ++ ++@@ -1094,7 +1094,7 @@ ++ { ++ cout << "\nRC6 validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rc6val.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc6val.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 2) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 2) && pass; ++@@ -1106,7 +1106,7 @@ ++ { ++ cout << "\nMARS validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/marsval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/marsval.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1118,7 +1118,7 @@ ++ { ++ cout << "\nRijndael (AES) validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/rijndael.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/rijndael.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1131,7 +1131,7 @@ ++ { ++ cout << "\nTwofish validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/twofishv.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/twofishv.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1143,7 +1143,7 @@ ++ { ++ cout << "\nSerpent validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/serpentv.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/serpentv.dat", true, new HexDecoder); ++ bool pass = true; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; ++@@ -1189,7 +1189,7 @@ ++ { ++ cout << "\n3-WAY validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/3wayval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/3wayval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1197,7 +1197,7 @@ ++ { ++ cout << "\nGOST validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/gostval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/gostval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1205,7 +1205,7 @@ ++ { ++ cout << "\nSHARK validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/sharkval.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/sharkval.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1215,14 +1215,14 @@ ++ ++ cout << "\nCAST-128 validation suite running...\n\n"; ++ ++- FileSource val128("TestData/cast128v.dat", true, new HexDecoder); +++ FileSource val128(PACKAGE_DATA_DIR "TestData/cast128v.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), val128, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(10), val128, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(5), val128, 1) && pass; ++ ++ cout << "\nCAST-256 validation suite running...\n\n"; ++ ++- FileSource val256("TestData/cast256v.dat", true, new HexDecoder); +++ FileSource val256(PACKAGE_DATA_DIR "TestData/cast256v.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), val256, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), val256, 1) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(32), val256, 1) && pass; ++@@ -1234,7 +1234,7 @@ ++ { ++ cout << "\nSquare validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/squareva.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/squareva.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1242,7 +1242,7 @@ ++ { ++ cout << "\nSKIPJACK validation suite running...\n\n"; ++ ++- FileSource valdata("TestData/skipjack.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/skipjack.dat", true, new HexDecoder); ++ return BlockTransformationTest(FixedRoundsCipherFactory(), valdata); ++ } ++ ++@@ -1346,7 +1346,7 @@ ++ cout << "\nSHACAL-2 validation suite running...\n\n"; ++ ++ bool pass = true; ++- FileSource valdata("TestData/shacal2v.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/shacal2v.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(64), valdata, 10) && pass; ++ return pass; ++@@ -1357,7 +1357,7 @@ ++ cout << "\nCamellia validation suite running...\n\n"; ++ ++ bool pass = true; ++- FileSource valdata("TestData/camellia.dat", true, new HexDecoder); +++ FileSource valdata(PACKAGE_DATA_DIR "TestData/camellia.dat", true, new HexDecoder); ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 15) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 15) && pass; ++ pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 15) && pass; ++@@ -1368,19 +1368,19 @@ ++ { ++ cout << "\nSalsa validation suite running...\n"; ++ ++- return RunTestDataFile("TestVectors/salsa.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/salsa.txt"); ++ } ++ ++ bool ValidateSosemanuk() ++ { ++ cout << "\nSosemanuk validation suite running...\n"; ++- return RunTestDataFile("TestVectors/sosemanuk.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sosemanuk.txt"); ++ } ++ ++ bool ValidateVMAC() ++ { ++ cout << "\nVMAC validation suite running...\n"; ++- return RunTestDataFile("TestVectors/vmac.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/vmac.txt"); ++ } ++ ++ bool ValidateCCM() ++Index: libcrypto++/validat2.cpp ++=================================================================== ++--- libcrypto++.orig/validat2.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/validat2.cpp 2009-04-07 03:28:02.000000000 +0200 ++@@ -268,7 +268,7 @@ ++ "\x69\x94\xac\x04\xf3\x41\xb5\x7d\x05\x20\x2d\x42\x8f\xb2\xa2\x7b" ++ "\x5c\x77\xdf\xd9\xb1\x5b\xfc\x3d\x55\x93\x53\x50\x34\x10\xc1\xe1"; ++ ++- FileSource keys("TestData/rsa512a.dat", true, new HexDecoder); +++ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa512a.dat", true, new HexDecoder); ++ Weak::RSASSA_PKCS1v15_MD2_Signer rsaPriv(keys); ++ Weak::RSASSA_PKCS1v15_MD2_Verifier rsaPub(rsaPriv); ++ ++@@ -293,7 +293,7 @@ ++ cout << "invalid signature verification\n"; ++ } ++ { ++- FileSource keys("TestData/rsa1024.dat", true, new HexDecoder); +++ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa1024.dat", true, new HexDecoder); ++ RSAES_PKCS1v15_Decryptor rsaPriv(keys); ++ RSAES_PKCS1v15_Encryptor rsaPub(rsaPriv); ++ ++@@ -320,8 +320,8 @@ ++ bq.Put(oaepSeed, 20); ++ FixedRNG rng(bq); ++ ++- FileSource privFile("TestData/rsa400pv.dat", true, new HexDecoder); ++- FileSource pubFile("TestData/rsa400pb.dat", true, new HexDecoder); +++ FileSource privFile(PACKAGE_DATA_DIR "TestData/rsa400pv.dat", true, new HexDecoder); +++ FileSource pubFile(PACKAGE_DATA_DIR "TestData/rsa400pb.dat", true, new HexDecoder); ++ RSAES_OAEP_SHA_Decryptor rsaPriv; ++ rsaPriv.AccessKey().BERDecodePrivateKey(privFile, false, 0); ++ RSAES_OAEP_SHA_Encryptor rsaPub(pubFile); ++@@ -344,7 +344,7 @@ ++ { ++ cout << "\nDH validation suite running...\n\n"; ++ ++- FileSource f("TestData/dh1024.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/dh1024.dat", true, new HexDecoder()); ++ DH dh(f); ++ return SimpleKeyAgreementValidate(dh); ++ } ++@@ -353,7 +353,7 @@ ++ { ++ cout << "\nMQV validation suite running...\n\n"; ++ ++- FileSource f("TestData/mqv1024.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/mqv1024.dat", true, new HexDecoder()); ++ MQV mqv(f); ++ return AuthenticatedKeyAgreementValidate(mqv); ++ } ++@@ -362,7 +362,7 @@ ++ { ++ cout << "\nLUC-DH validation suite running...\n\n"; ++ ++- FileSource f("TestData/lucd512.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/lucd512.dat", true, new HexDecoder()); ++ LUC_DH dh(f); ++ return SimpleKeyAgreementValidate(dh); ++ } ++@@ -371,7 +371,7 @@ ++ { ++ cout << "\nXTR-DH validation suite running...\n\n"; ++ ++- FileSource f("TestData/xtrdh171.dat", true, new HexDecoder()); +++ FileSource f(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", true, new HexDecoder()); ++ XTR_DH dh(f); ++ return SimpleKeyAgreementValidate(dh); ++ } ++@@ -381,7 +381,7 @@ ++ cout << "\nElGamal validation suite running...\n\n"; ++ bool pass = true; ++ { ++- FileSource fc("TestData/elgc1024.dat", true, new HexDecoder); +++ FileSource fc(PACKAGE_DATA_DIR "TestData/elgc1024.dat", true, new HexDecoder); ++ ElGamalDecryptor privC(fc); ++ ElGamalEncryptor pubC(privC); ++ privC.AccessKey().Precompute(); ++@@ -399,7 +399,7 @@ ++ cout << "\nDLIES validation suite running...\n\n"; ++ bool pass = true; ++ { ++- FileSource fc("TestData/dlie1024.dat", true, new HexDecoder); +++ FileSource fc(PACKAGE_DATA_DIR "TestData/dlie1024.dat", true, new HexDecoder); ++ DLIES<>::Decryptor privC(fc); ++ DLIES<>::Encryptor pubC(privC); ++ pass = CryptoSystemValidate(privC, pubC) && pass; ++@@ -422,7 +422,7 @@ ++ cout << "\nNR validation suite running...\n\n"; ++ bool pass = true; ++ { ++- FileSource f("TestData/nr2048.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/nr2048.dat", true, new HexDecoder); ++ NR::Signer privS(f); ++ privS.AccessKey().Precompute(); ++ NR::Verifier pubS(privS); ++@@ -445,7 +445,7 @@ ++ ++ bool pass = true, fail; ++ { ++- FileSource fs("TestData/dsa512.dat", true, new HexDecoder()); +++ FileSource fs(PACKAGE_DATA_DIR "TestData/dsa512.dat", true, new HexDecoder()); ++ GDSA::Signer priv(fs); ++ priv.AccessKey().Precompute(16); ++ GDSA::Verifier pub(priv); ++@@ -487,10 +487,10 @@ ++ fail = pub.VerifyMessage((byte *)"xyz", 3, sig, sizeof(sig)); ++ pass = pass && !fail; ++ } ++- FileSource fs1("TestData/dsa1024.dat", true, new HexDecoder()); +++ FileSource fs1(PACKAGE_DATA_DIR "TestData/dsa1024.dat", true, new HexDecoder()); ++ DSA::Signer priv(fs1); ++ DSA::Verifier pub(priv); ++- FileSource fs2("TestData/dsa1024b.dat", true, new HexDecoder()); +++ FileSource fs2(PACKAGE_DATA_DIR "TestData/dsa1024b.dat", true, new HexDecoder()); ++ DSA::Verifier pub1(fs2); ++ assert(pub.GetKey() == pub1.GetKey()); ++ pass = SignatureValidate(priv, pub, thorough) && pass; ++@@ -503,7 +503,7 @@ ++ bool pass=true; ++ ++ { ++- FileSource f("TestData/luc1024.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/luc1024.dat", true, new HexDecoder); ++ LUCSSA_PKCS1v15_SHA_Signer priv(f); ++ LUCSSA_PKCS1v15_SHA_Verifier pub(priv); ++ pass = SignatureValidate(priv, pub) && pass; ++@@ -520,14 +520,14 @@ ++ { ++ cout << "\nLUC-HMP validation suite running...\n\n"; ++ ++- FileSource f("TestData/lucs512.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/lucs512.dat", true, new HexDecoder); ++ LUC_HMP::Signer privS(f); ++ LUC_HMP::Verifier pubS(privS); ++ bool pass = SignatureValidate(privS, pubS); ++ ++ cout << "\nLUC-IES validation suite running...\n\n"; ++ ++- FileSource fc("TestData/lucc512.dat", true, new HexDecoder); +++ FileSource fc(PACKAGE_DATA_DIR "TestData/lucc512.dat", true, new HexDecoder); ++ LUC_IES<>::Decryptor privC(fc); ++ LUC_IES<>::Encryptor pubC(privC); ++ pass = CryptoSystemValidate(privC, pubC) && pass; ++@@ -541,7 +541,7 @@ ++ bool pass=true; ++ ++ { ++- FileSource f("TestData/rabi1024.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/rabi1024.dat", true, new HexDecoder); ++ RabinSS::Signer priv(f); ++ RabinSS::Verifier pub(priv); ++ pass = SignatureValidate(priv, pub) && pass; ++@@ -558,7 +558,7 @@ ++ { ++ cout << "\nRW validation suite running...\n\n"; ++ ++- FileSource f("TestData/rw1024.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/rw1024.dat", true, new HexDecoder); ++ RWSS::Signer priv(f); ++ RWSS::Verifier pub(priv); ++ ++@@ -570,7 +570,7 @@ ++ { ++ cout << "\nBlumGoldwasser validation suite running...\n\n"; ++ ++- FileSource f("TestData/blum512.dat", true, new HexDecoder); +++ FileSource f(PACKAGE_DATA_DIR "TestData/blum512.dat", true, new HexDecoder); ++ BlumGoldwasserPrivateKey priv(f); ++ BlumGoldwasserPublicKey pub(priv); ++ ++@@ -740,7 +740,7 @@ ++ "\x74\x02\x37\x0E\xED\x0A\x06\xAD\xF4\x15\x65\xB8\xE1\xD1\x45\xAE\x39\x19\xB4\xFF\x5D\xF1\x45\x7B\xE0\xFE\x72\xED\x11\x92\x8F\x61\x41\x4F\x02\x00\xF2\x76\x6F\x7C" ++ "\x79\xA2\xE5\x52\x20\x5D\x97\x5E\xFE\x39\xAE\x21\x10\xFB\x35\xF4\x80\x81\x41\x13\xDD\xE8\x5F\xCA\x1E\x4F\xF8\x9B\xB2\x68\xFB\x28"; ++ ++- FileSource keys("TestData/esig1536.dat", true, new HexDecoder); +++ FileSource keys(PACKAGE_DATA_DIR "TestData/esig1536.dat", true, new HexDecoder); ++ ESIGN::Signer signer(keys); ++ ESIGN::Verifier verifier(signer); ++ ++Index: libcrypto++/validat3.cpp ++=================================================================== ++--- libcrypto++.orig/validat3.cpp 2009-04-07 03:08:36.000000000 +0200 +++++ libcrypto++/validat3.cpp 2009-04-07 03:29:42.000000000 +0200 ++@@ -365,14 +365,14 @@ ++ { ++ cout << "\nPanama validation suite running...\n"; ++ ++- return RunTestDataFile("TestVectors/panama.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/panama.txt"); ++ } ++ ++ bool ValidateWhirlpool() ++ { ++ cout << "\nWhirlpool Hash Function validation suite running...\n"; ++ ++- return RunTestDataFile("TestVectors/whrlpool.txt"); +++ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/whrlpool.txt"); ++ } ++ ++ #ifdef CRYPTOPP_REMOVED +diff --git a/feeds/packages/libs/libcrypto++/patches/003-autoconf_files.patch b/feeds/packages/libs/libcrypto++/patches/003-autoconf_files.patch +new file mode 100644 +index 0000000..16ea3ff +--- /dev/null ++++ b/feeds/packages/libs/libcrypto++/patches/003-autoconf_files.patch +@@ -0,0 +1,822 @@ ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/configure.ac 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,43 @@ +++# -*- autoconf -*- +++# Process this file with autoconf to produce a configure script. +++# Written by Jens Peter Secher . +++ +++AC_INIT([Crypto++], [5.6.0], [libcrypto++@bugs.debian.org]) +++AC_CONFIG_SRCDIR([cryptlib.h]) +++AC_CONFIG_HEADERS([cryptopp_config.h]) +++AC_CONFIG_HEADERS([config.h]) +++AM_INIT_AUTOMAKE([foreign]) +++AM_MAINTAINER_MODE +++ +++# Checks for programs. +++AC_PROG_CXX +++AC_PROG_CC +++AC_PROG_LN_S +++AC_PROG_LIBTOOL +++ +++# Checks for header files. +++AC_HEADER_STDC +++AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h]) +++ +++# Checks for typedefs, structures, and compiler characteristics. +++AC_HEADER_STDBOOL +++AC_C_CONST +++AC_C_INLINE +++AC_TYPE_SIZE_T +++AC_HEADER_TIME +++AC_CHECK_TYPES([ptrdiff_t]) +++AC_C_BIGENDIAN( +++ AC_DEFINE(IS_BIG_ENDIAN, [], [Big-endian architecture]), +++ AC_DEFINE(IS_LITTLE_ENDIAN, [], [Little-endian architecture]), +++ AC_MSG_ERROR([Can't tell endianess of platform])) +++ +++# Checks for library functions. +++AC_PROG_GCC_TRADITIONAL +++AC_FUNC_MALLOC +++AC_FUNC_MEMCMP +++AC_FUNC_SELECT_ARGTYPES +++AC_TYPE_SIGNAL +++AC_CHECK_FUNCS([gethostbyname gettimeofday memmove memset pow select socket]) +++ +++AC_CONFIG_FILES([Makefile libcrypto++.pc]) +++AC_OUTPUT ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/Makefile.am 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,303 @@ +++## Process this file with automake to produce Makefile.in +++# Written by Jens Peter Secher . +++ +++# Build two versions of cryptest, one that uses data files from the +++# current working directory, and one that uses data files from +++# /usr/share/crypto++. The former is for running the test suite at +++# build time, the latter is included in the package. +++ +++# To test against newest GCC, uncomment the following two lines. +++#CXX = /usr/lib/gcc-snapshot/bin/g++ +++#CXXCPP = /usr/lib/gcc-snapshot/bin/g++ +++ +++bin_PROGRAMS = cryptest cryptestcwd +++cryptest_CXXFLAGS = -DPACKAGE_DATA_DIR='"/usr/share/crypto++/"' +++cryptest_SOURCES = \ +++ bench.cpp \ +++ bench2.cpp \ +++ datatest.cpp \ +++ dlltest.cpp \ +++ fipsalgt.cpp \ +++ regtest.cpp \ +++ test.cpp \ +++ validat1.cpp \ +++ validat2.cpp \ +++ validat3.cpp +++cryptest_LDADD = libcrypto++.la +++cryptestcwd_CXXFLAGS = -DPACKAGE_DATA_DIR='""' +++cryptestcwd_SOURCES = \ +++ bench.cpp \ +++ bench2.cpp \ +++ datatest.cpp \ +++ dlltest.cpp \ +++ fipsalgt.cpp \ +++ regtest.cpp \ +++ test.cpp \ +++ validat1.cpp \ +++ validat2.cpp \ +++ validat3.cpp +++cryptestcwd_LDADD = libcrypto++.la +++ +++lib_LTLIBRARIES = libcrypto++.la +++libcrypto___la_LDFLAGS = -version-info 8:0:0 +++libcrypto___la_SOURCES = \ +++ 3way.cpp \ +++ adler32.cpp \ +++ algebra.cpp \ +++ algparam.cpp \ +++ arc4.cpp \ +++ asn.cpp \ +++ authenc.cpp \ +++ base32.cpp \ +++ base64.cpp \ +++ basecode.cpp \ +++ bfinit.cpp \ +++ blowfish.cpp \ +++ blumshub.cpp \ +++ camellia.cpp \ +++ cast.cpp \ +++ casts.cpp \ +++ cbcmac.cpp \ +++ ccm.cpp \ +++ channels.cpp \ +++ cmac.cpp \ +++ cpu.cpp \ +++ crc.cpp \ +++ cryptlib.cpp \ +++ default.cpp \ +++ des.cpp \ +++ dessp.cpp \ +++ dh2.cpp \ +++ dh.cpp \ +++ dll.cpp \ +++ dsa.cpp \ +++ eax.cpp \ +++ ec2n.cpp \ +++ eccrypto.cpp \ +++ ecp.cpp \ +++ elgamal.cpp \ +++ emsa2.cpp \ +++ eprecomp.cpp \ +++ esign.cpp \ +++ files.cpp \ +++ filters.cpp \ +++ fips140.cpp \ +++ fipstest.cpp \ +++ gcm.cpp \ +++ gf2_32.cpp \ +++ gf256.cpp \ +++ gf2n.cpp \ +++ gfpcrypt.cpp \ +++ gost.cpp \ +++ gzip.cpp \ +++ hex.cpp \ +++ hmac.cpp \ +++ hrtimer.cpp \ +++ ida.cpp \ +++ idea.cpp \ +++ integer.cpp \ +++ iterhash.cpp \ +++ luc.cpp \ +++ mars.cpp \ +++ marss.cpp \ +++ md2.cpp \ +++ md4.cpp \ +++ md5.cpp \ +++ misc.cpp \ +++ modes.cpp \ +++ mqueue.cpp \ +++ mqv.cpp \ +++ nbtheory.cpp \ +++ network.cpp \ +++ oaep.cpp \ +++ osrng.cpp \ +++ panama.cpp \ +++ pch.cpp \ +++ pkcspad.cpp \ +++ polynomi.cpp \ +++ pssr.cpp \ +++ pubkey.cpp \ +++ queue.cpp \ +++ rabin.cpp \ +++ randpool.cpp \ +++ rc2.cpp \ +++ rc5.cpp \ +++ rc6.cpp \ +++ rdtables.cpp \ +++ rijndael.cpp \ +++ ripemd.cpp \ +++ rng.cpp \ +++ rsa.cpp \ +++ rw.cpp \ +++ safer.cpp \ +++ salsa.cpp \ +++ seal.cpp \ +++ seed.cpp \ +++ serpent.cpp \ +++ shacal2.cpp \ +++ sha.cpp \ +++ sharkbox.cpp \ +++ shark.cpp \ +++ simple.cpp \ +++ skipjack.cpp \ +++ socketft.cpp \ +++ sosemanuk.cpp \ +++ square.cpp \ +++ squaretb.cpp \ +++ strciphr.cpp \ +++ tea.cpp \ +++ tftables.cpp \ +++ tiger.cpp \ +++ tigertab.cpp \ +++ trdlocal.cpp \ +++ ttmac.cpp \ +++ twofish.cpp \ +++ vmac.cpp \ +++ wait.cpp \ +++ wake.cpp \ +++ whrlpool.cpp \ +++ winpipes.cpp \ +++ xtr.cpp \ +++ xtrcrypt.cpp \ +++ zdeflate.cpp \ +++ zinflate.cpp \ +++ zlib.cpp +++ +++pkginclude_HEADERS = \ +++ 3way.h \ +++ adler32.h \ +++ aes.h \ +++ algebra.h \ +++ algparam.h \ +++ arc4.h \ +++ argnames.h \ +++ asn.h \ +++ authenc.h \ +++ base32.h \ +++ base64.h \ +++ basecode.h \ +++ bench.h \ +++ blowfish.h \ +++ blumshub.h \ +++ camellia.h \ +++ cast.h \ +++ cbcmac.h \ +++ ccm.h \ +++ channels.h \ +++ cmac.h \ +++ config.h \ +++ cpu.h \ +++ crc.h \ +++ cryptlib.h \ +++ default.h \ +++ des.h \ +++ dh2.h \ +++ dh.h \ +++ dll.h \ +++ dmac.h \ +++ dsa.h \ +++ eax.h \ +++ ec2n.h \ +++ eccrypto.h \ +++ ecp.h \ +++ elgamal.h \ +++ emsa2.h \ +++ eprecomp.h \ +++ esign.h \ +++ factory.h \ +++ files.h \ +++ filters.h \ +++ fips140.h \ +++ fltrimpl.h \ +++ gcm.h \ +++ gf2_32.h \ +++ gf256.h \ +++ gf2n.h \ +++ gfpcrypt.h \ +++ gost.h \ +++ gzip.h \ +++ hex.h \ +++ hmac.h \ +++ hrtimer.h \ +++ ida.h \ +++ idea.h \ +++ integer.h \ +++ iterhash.h \ +++ lubyrack.h \ +++ luc.h \ +++ mars.h \ +++ md2.h \ +++ md4.h \ +++ md5.h \ +++ mdc.h \ +++ misc.h \ +++ modarith.h \ +++ modes.h \ +++ modexppc.h \ +++ mqueue.h \ +++ mqv.h \ +++ nbtheory.h \ +++ network.h \ +++ nr.h \ +++ oaep.h \ +++ oids.h \ +++ osrng.h \ +++ panama.h \ +++ pch.h \ +++ pkcspad.h \ +++ polynomi.h \ +++ pssr.h \ +++ pubkey.h \ +++ pwdbased.h \ +++ queue.h \ +++ rabin.h \ +++ randpool.h \ +++ rc2.h \ +++ rc5.h \ +++ rc6.h \ +++ rijndael.h \ +++ ripemd.h \ +++ rng.h \ +++ rsa.h \ +++ rw.h \ +++ safer.h \ +++ salsa.h \ +++ seal.h \ +++ secblock.h \ +++ seckey.h \ +++ seed.h \ +++ serpent.h \ +++ serpentp.h \ +++ shacal2.h \ +++ sha.h \ +++ shark.h \ +++ simple.h \ +++ skipjack.h \ +++ smartptr.h \ +++ socketft.h \ +++ sosemanuk.h \ +++ square.h \ +++ stdcpp.h \ +++ strciphr.h \ +++ tea.h \ +++ tiger.h \ +++ trdlocal.h \ +++ trunhash.h \ +++ ttmac.h \ +++ twofish.h \ +++ vmac.h \ +++ wait.h \ +++ wake.h \ +++ whrlpool.h \ +++ winpipes.h \ +++ words.h \ +++ xtr.h \ +++ xtrcrypt.h \ +++ zdeflate.h \ +++ zinflate.h \ +++ zlib.h +++ +++htmldir = $(datadir)/html +++ +++html: $(libcrypto___la_SOURCES) +++ doxygen ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/config.h.in 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,452 @@ +++// Debian note: This is a copy of the original config.h file except for the two +++// endianness undefs below; they are substituted by the autoconf process +++// according to the build architecture. +++ +++#ifndef CRYPTOPP_CONFIG_H +++#define CRYPTOPP_CONFIG_H +++ +++// ***************** Important Settings ******************** +++ +++// Endianness +++#undef IS_BIG_ENDIAN +++#undef IS_LITTLE_ENDIAN +++ +++// define this if you want to disable all OS-dependent features, +++// such as sockets and OS-provided random number generators +++// #define NO_OS_DEPENDENCE +++ +++// Define this to use features provided by Microsoft's CryptoAPI. +++// Currently the only feature used is random number generation. +++// This macro will be ignored if NO_OS_DEPENDENCE is defined. +++#define USE_MS_CRYPTOAPI +++ +++// Define this to 1 to enforce the requirement in FIPS 186-2 Change Notice 1 that only 1024 bit moduli be used +++#ifndef DSA_1024_BIT_MODULUS_ONLY +++# define DSA_1024_BIT_MODULUS_ONLY 1 +++#endif +++ +++// ***************** Less Important Settings *************** +++ +++// define this to retain (as much as possible) old deprecated function and class names +++// #define CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY +++ +++#define GZIP_OS_CODE 0 +++ +++// Try this if your CPU has 256K internal cache or a slow multiply instruction +++// and you want a (possibly) faster IDEA implementation using log tables +++// #define IDEA_LARGECACHE +++ +++// Define this if, for the linear congruential RNG, you want to use +++// the original constants as specified in S.K. Park and K.W. Miller's +++// CACM paper. +++// #define LCRNG_ORIGINAL_NUMBERS +++ +++// choose which style of sockets to wrap (mostly useful for cygwin which has both) +++#define PREFER_BERKELEY_STYLE_SOCKETS +++// #define PREFER_WINDOWS_STYLE_SOCKETS +++ +++// set the name of Rijndael cipher, was "Rijndael" before version 5.3 +++#define CRYPTOPP_RIJNDAEL_NAME "AES" +++ +++// ***************** Important Settings Again ******************** +++// But the defaults should be ok. +++ +++// namespace support is now required +++#ifdef NO_NAMESPACE +++# error namespace support is now required +++#endif +++ +++// Define this to workaround a Microsoft CryptoAPI bug where +++// each call to CryptAcquireContext causes a 100 KB memory leak. +++// Defining this will cause Crypto++ to make only one call to CryptAcquireContext. +++#define WORKAROUND_MS_BUG_Q258000 +++ +++#ifdef CRYPTOPP_DOXYGEN_PROCESSING +++// Avoid putting "CryptoPP::" in front of everything in Doxygen output +++# define CryptoPP +++# define NAMESPACE_BEGIN(x) +++# define NAMESPACE_END +++// Get Doxygen to generate better documentation for these typedefs +++# define DOCUMENTED_TYPEDEF(x, y) class y : public x {}; +++#else +++# define NAMESPACE_BEGIN(x) namespace x { +++# define NAMESPACE_END } +++# define DOCUMENTED_TYPEDEF(x, y) typedef x y; +++#endif +++#define ANONYMOUS_NAMESPACE_BEGIN namespace { +++#define USING_NAMESPACE(x) using namespace x; +++#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x { +++#define DOCUMENTED_NAMESPACE_END } +++ +++// What is the type of the third parameter to bind? +++// For Unix, the new standard is ::socklen_t (typically unsigned int), and the old standard is int. +++// Unfortunately there is no way to tell whether or not socklen_t is defined. +++// To work around this, TYPE_OF_SOCKLEN_T is a macro so that you can change it from the makefile. +++#ifndef TYPE_OF_SOCKLEN_T +++# if defined(_WIN32) || defined(__CYGWIN__) +++# define TYPE_OF_SOCKLEN_T int +++# else +++# define TYPE_OF_SOCKLEN_T ::socklen_t +++# endif +++#endif +++ +++#if defined(__CYGWIN__) && defined(PREFER_WINDOWS_STYLE_SOCKETS) +++# define __USE_W32_SOCKETS +++#endif +++ +++typedef unsigned char byte; // put in global namespace to avoid ambiguity with other byte typedefs +++ +++NAMESPACE_BEGIN(CryptoPP) +++ +++typedef unsigned short word16; +++typedef unsigned int word32; +++ +++#if defined(_MSC_VER) || defined(__BORLANDC__) +++ typedef unsigned __int64 word64; +++ #define W64LIT(x) x##ui64 +++#else +++ typedef unsigned long long word64; +++ #define W64LIT(x) x##ULL +++#endif +++ +++// define large word type, used for file offsets and such +++typedef word64 lword; +++const lword LWORD_MAX = W64LIT(0xffffffffffffffff); +++ +++#ifdef __GNUC__ +++ #define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) +++#endif +++ +++// define hword, word, and dword. these are used for multiprecision integer arithmetic +++// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx +++#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__)) +++ typedef word32 hword; +++ typedef word64 word; +++#else +++ #define CRYPTOPP_NATIVE_DWORD_AVAILABLE +++ #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__) +++ #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !(CRYPTOPP_GCC_VERSION == 40001 && defined(__APPLE__)) && CRYPTOPP_GCC_VERSION >= 30400 +++ // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3 +++ // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4 +++ typedef word32 hword; +++ typedef word64 word; +++ typedef __uint128_t dword; +++ typedef __uint128_t word128; +++ #define CRYPTOPP_WORD128_AVAILABLE +++ #else +++ // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results +++ typedef word16 hword; +++ typedef word32 word; +++ typedef word64 dword; +++ #endif +++ #else +++ // being here means the native register size is probably 32 bits or less +++ #define CRYPTOPP_BOOL_SLOW_WORD64 1 +++ typedef word16 hword; +++ typedef word32 word; +++ typedef word64 dword; +++ #endif +++#endif +++#ifndef CRYPTOPP_BOOL_SLOW_WORD64 +++ #define CRYPTOPP_BOOL_SLOW_WORD64 0 +++#endif +++ +++const unsigned int WORD_SIZE = sizeof(word); +++const unsigned int WORD_BITS = WORD_SIZE * 8; +++ +++NAMESPACE_END +++ +++#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE +++ // This should be a lower bound on the L1 cache line size. It's used for defense against timing attacks. +++ #if defined(_M_X64) || defined(__x86_64__) +++ #define CRYPTOPP_L1_CACHE_LINE_SIZE 64 +++ #else +++ // L1 cache line size is 32 on Pentium III and earlier +++ #define CRYPTOPP_L1_CACHE_LINE_SIZE 32 +++ #endif +++#endif +++ +++#if defined(_MSC_VER) +++ #if _MSC_VER == 1200 +++ #include +++ #endif +++ #if _MSC_VER > 1200 || defined(_mm_free) +++ #define CRYPTOPP_MSVC6PP_OR_LATER // VC 6 processor pack or later +++ #else +++ #define CRYPTOPP_MSVC6_NO_PP // VC 6 without processor pack +++ #endif +++#endif +++ +++#ifndef CRYPTOPP_ALIGN_DATA +++ #if defined(CRYPTOPP_MSVC6PP_OR_LATER) +++ #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x)) +++ #elif defined(__GNUC__) +++ #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x))) +++ #else +++ #define CRYPTOPP_ALIGN_DATA(x) +++ #endif +++#endif +++ +++#ifndef CRYPTOPP_SECTION_ALIGN16 +++ #if defined(__GNUC__) && !defined(__APPLE__) +++ // the alignment attribute doesn't seem to work without this section attribute when -fdata-sections is turned on +++ #define CRYPTOPP_SECTION_ALIGN16 __attribute__((section ("CryptoPP_Align16"))) +++ #else +++ #define CRYPTOPP_SECTION_ALIGN16 +++ #endif +++#endif +++ +++#if defined(_MSC_VER) || defined(__fastcall) +++ #define CRYPTOPP_FASTCALL __fastcall +++#else +++ #define CRYPTOPP_FASTCALL +++#endif +++ +++// VC60 workaround: it doesn't allow typename in some places +++#if defined(_MSC_VER) && (_MSC_VER < 1300) +++#define CPP_TYPENAME +++#else +++#define CPP_TYPENAME typename +++#endif +++ +++// VC60 workaround: can't cast unsigned __int64 to float or double +++#if defined(_MSC_VER) && !defined(CRYPTOPP_MSVC6PP_OR_LATER) +++#define CRYPTOPP_VC6_INT64 (__int64) +++#else +++#define CRYPTOPP_VC6_INT64 +++#endif +++ +++#ifdef _MSC_VER +++#define CRYPTOPP_NO_VTABLE __declspec(novtable) +++#else +++#define CRYPTOPP_NO_VTABLE +++#endif +++ +++#ifdef _MSC_VER +++ // 4231: nonstandard extension used : 'extern' before template explicit instantiation +++ // 4250: dominance +++ // 4251: member needs to have dll-interface +++ // 4275: base needs to have dll-interface +++ // 4660: explicitly instantiating a class that's already implicitly instantiated +++ // 4661: no suitable definition provided for explicit template instantiation request +++ // 4786: identifer was truncated in debug information +++ // 4355: 'this' : used in base member initializer list +++ // 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation +++# pragma warning(disable: 4231 4250 4251 4275 4660 4661 4786 4355 4910) +++#endif +++ +++#ifdef __BORLANDC__ +++// 8037: non-const function called for const object. needed to work around BCB2006 bug +++# pragma warn -8037 +++#endif +++ +++#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) +++#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION +++#endif +++ +++#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION +++#define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE +++#endif +++ +++#ifdef CRYPTOPP_DISABLE_X86ASM // for backwards compatibility: this macro had both meanings +++#define CRYPTOPP_DISABLE_ASM +++#define CRYPTOPP_DISABLE_SSE2 +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) +++ #define CRYPTOPP_X86_ASM_AVAILABLE +++ +++ #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || CRYPTOPP_GCC_VERSION >= 30300) +++ #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 1 +++ #else +++ #define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0 +++ #endif +++ +++ // SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed. +++ // GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version. +++ #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102) +++ #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1 +++ #else +++ #define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0 +++ #endif +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64) +++ #define CRYPTOPP_X64_MASM_AVAILABLE +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__) +++ #define CRYPTOPP_X64_ASM_AVAILABLE +++#endif +++ +++#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) +++ #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1 +++#else +++ #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0 +++#endif +++ +++#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) +++ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 +++#else +++ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 +++#endif +++ +++// how to allocate 16-byte aligned memory (for SSE2) +++#if defined(CRYPTOPP_MSVC6PP_OR_LATER) +++ #define CRYPTOPP_MM_MALLOC_AVAILABLE +++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +++ #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16 +++#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__) +++ #define CRYPTOPP_MEMALIGN_AVAILABLE +++#else +++ #define CRYPTOPP_NO_ALIGNED_ALLOC +++#endif +++ +++// how to disable inlining +++#if defined(_MSC_VER) && _MSC_VER >= 1300 +++# define CRYPTOPP_NOINLINE_DOTDOTDOT +++# define CRYPTOPP_NOINLINE __declspec(noinline) +++#elif defined(__GNUC__) +++# define CRYPTOPP_NOINLINE_DOTDOTDOT +++# define CRYPTOPP_NOINLINE __attribute__((noinline)) +++#else +++# define CRYPTOPP_NOINLINE_DOTDOTDOT ... +++# define CRYPTOPP_NOINLINE +++#endif +++ +++// how to declare class constants +++#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__INTEL_COMPILER) +++# define CRYPTOPP_CONSTANT(x) enum {x}; +++#else +++# define CRYPTOPP_CONSTANT(x) static const int x; +++#endif +++ +++#if defined(_M_X64) || defined(__x86_64__) +++ #define CRYPTOPP_BOOL_X64 1 +++#else +++ #define CRYPTOPP_BOOL_X64 0 +++#endif +++ +++// see http://predef.sourceforge.net/prearch.html +++#if defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) +++ #define CRYPTOPP_BOOL_X86 1 +++#else +++ #define CRYPTOPP_BOOL_X86 0 +++#endif +++ +++#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || defined(__powerpc__) +++ #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS +++#endif +++ +++#define CRYPTOPP_VERSION 560 +++ +++// ***************** determine availability of OS features ******************** +++ +++#ifndef NO_OS_DEPENDENCE +++ +++#if defined(_WIN32) || defined(__CYGWIN__) +++#define CRYPTOPP_WIN32_AVAILABLE +++#endif +++ +++#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) +++#define CRYPTOPP_UNIX_AVAILABLE +++#endif +++ +++#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) +++# define HIGHRES_TIMER_AVAILABLE +++#endif +++ +++#ifdef CRYPTOPP_UNIX_AVAILABLE +++# define HAS_BERKELEY_STYLE_SOCKETS +++#endif +++ +++#ifdef CRYPTOPP_WIN32_AVAILABLE +++# define HAS_WINDOWS_STYLE_SOCKETS +++#endif +++ +++#if defined(HIGHRES_TIMER_AVAILABLE) && (defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(HAS_WINDOWS_STYLE_SOCKETS)) +++# define SOCKETS_AVAILABLE +++#endif +++ +++#if defined(HAS_WINDOWS_STYLE_SOCKETS) && (!defined(HAS_BERKELEY_STYLE_SOCKETS) || defined(PREFER_WINDOWS_STYLE_SOCKETS)) +++# define USE_WINDOWS_STYLE_SOCKETS +++#else +++# define USE_BERKELEY_STYLE_SOCKETS +++#endif +++ +++#if defined(HIGHRES_TIMER_AVAILABLE) && defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(USE_BERKELEY_STYLE_SOCKETS) +++# define WINDOWS_PIPES_AVAILABLE +++#endif +++ +++#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(USE_MS_CRYPTOAPI) +++# define NONBLOCKING_RNG_AVAILABLE +++# define OS_RNG_AVAILABLE +++#endif +++ +++#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING) +++# define NONBLOCKING_RNG_AVAILABLE +++# define BLOCKING_RNG_AVAILABLE +++# define OS_RNG_AVAILABLE +++# define HAS_PTHREADS +++# define THREADS_AVAILABLE +++#endif +++ +++#ifdef CRYPTOPP_WIN32_AVAILABLE +++# define HAS_WINTHREADS +++# define THREADS_AVAILABLE +++#endif +++ +++#endif // NO_OS_DEPENDENCE +++ +++// ***************** DLL related ******************** +++ +++#ifdef CRYPTOPP_WIN32_AVAILABLE +++ +++#ifdef CRYPTOPP_EXPORTS +++#define CRYPTOPP_IS_DLL +++#define CRYPTOPP_DLL __declspec(dllexport) +++#elif defined(CRYPTOPP_IMPORTS) +++#define CRYPTOPP_IS_DLL +++#define CRYPTOPP_DLL __declspec(dllimport) +++#else +++#define CRYPTOPP_DLL +++#endif +++ +++#define CRYPTOPP_API __cdecl +++ +++#else // CRYPTOPP_WIN32_AVAILABLE +++ +++#define CRYPTOPP_DLL +++#define CRYPTOPP_API +++ +++#endif // CRYPTOPP_WIN32_AVAILABLE +++ +++#if defined(__MWERKS__) +++#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL +++#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) +++#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL +++#else +++#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL +++#endif +++ +++#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS) +++#define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL +++#else +++#define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS +++#endif +++ +++#if defined(__MWERKS__) +++#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class +++#elif defined(__BORLANDC__) || defined(__SUNPRO_CC) +++#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class +++#else +++#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class +++#endif +++ +++#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS) +++#define CRYPTOPP_STATIC_TEMPLATE_CLASS template class +++#else +++#define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS +++#endif +++ +++#endif ++--- /dev/null 2009-09-20 12:09:29.503935207 +0200 +++++ debian/libcrypto++.pc.in 2009-09-20 18:51:50.000000000 +0200 ++@@ -0,0 +1,12 @@ +++prefix=@prefix@ +++exec_prefix=@exec_prefix@ +++libdir=@libdir@ +++includedir=@includedir@ +++ +++Name: libcrypto++ +++Description: General purpose cryptographic shared library +++URL: http://www.cryptopp.com +++Version: @VERSION@ +++Requires: +++Libs: -lcrypto++ +++Cflags: +diff --git a/feeds/packages/libs/libcrypto++/patches/004-gcc4.7.0.patch b/feeds/packages/libs/libcrypto++/patches/004-gcc4.7.0.patch +new file mode 100644 +index 0000000..a2ef66a +--- /dev/null ++++ b/feeds/packages/libs/libcrypto++/patches/004-gcc4.7.0.patch +@@ -0,0 +1,102 @@ ++diff -rupN libcrypto++-5.6.0.orig/algebra.cpp libcrypto++-5.6.0/algebra.cpp ++--- libcrypto++-5.6.0.orig/algebra.cpp Sun Mar 1 20:44:04 2009 +++++ libcrypto++-5.6.0/algebra.cpp Fri Oct 12 20:18:44 2012 ++@@ -58,7 +58,7 @@ template const T& AbstractEucl ++ Element g[3]={b, a}; ++ unsigned int i0=0, i1=1, i2=2; ++ ++- while (!Equal(g[i1], this->Identity())) +++ while (!this->Equal(g[i1], this->Identity())) ++ { ++ g[i2] = Mod(g[i0], g[i1]); ++ unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; ++diff -rupN libcrypto++-5.6.0.orig/eccrypto.cpp libcrypto++-5.6.0/eccrypto.cpp ++--- libcrypto++-5.6.0.orig/eccrypto.cpp Sun Mar 15 03:48:02 2009 +++++ libcrypto++-5.6.0/eccrypto.cpp Fri Oct 12 20:17:08 2012 ++@@ -435,7 +435,7 @@ template void DL_GroupParamet ++ StringSource ssG(param.g, true, new HexDecoder); ++ Element G; ++ bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); ++- SetSubgroupGenerator(G); +++ this->SetSubgroupGenerator(G); ++ assert(result); ++ ++ StringSource ssN(param.n, true, new HexDecoder); ++@@ -591,7 +591,7 @@ bool DL_GroupParameters_EC::Validate ++ if (level >= 2 && pass) ++ { ++ const Integer &q = GetSubgroupOrder(); ++- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); +++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); ++ pass = pass && IsIdentity(gq); ++ } ++ return pass; ++@@ -629,7 +629,7 @@ void DL_PublicKey_EC::BERDecodePubli ++ typename EC::Point P; ++ if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) ++ BERDecodeError(); ++- SetPublicElement(P); +++ this->SetPublicElement(P); ++ } ++ ++ template ++diff -rupN libcrypto++-5.6.0.orig/eccrypto.h libcrypto++-5.6.0/eccrypto.h ++--- libcrypto++-5.6.0.orig/eccrypto.h Sun Mar 1 20:44:02 2009 +++++ libcrypto++-5.6.0/eccrypto.h Fri Oct 12 20:17:30 2012 ++@@ -43,7 +43,7 @@ public: ++ void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) ++ { ++ this->m_groupPrecomputation.SetCurve(ec); ++- SetSubgroupGenerator(G); +++ this->SetSubgroupGenerator(G); ++ m_n = n; ++ m_k = k; ++ } ++@@ -145,9 +145,9 @@ public: ++ typedef typename EC::Point Element; ++ ++ void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) ++- {this->AccessGroupParameters() = params; SetPublicElement(Q);} +++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} ++ void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) ++- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} +++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} ++ ++ // X509PublicKey ++ void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); ++@@ -166,9 +166,9 @@ public: ++ void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) ++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} ++ void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC ¶ms) ++- {GenerateRandom(rng, params);} +++ {this->GenerateRandom(rng, params);} ++ void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) ++- {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} +++ {this->GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} ++ ++ // PKCS8PrivateKey ++ void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); ++diff -rupN libcrypto++-5.6.0.orig/panama.cpp libcrypto++-5.6.0/panama.cpp ++--- libcrypto++-5.6.0.orig/panama.cpp Sun Mar 1 20:44:00 2009 +++++ libcrypto++-5.6.0/panama.cpp Fri Oct 12 20:19:27 2012 ++@@ -420,7 +420,7 @@ void PanamaHash::TruncatedFinal(byte ++ { ++ this->ThrowIfInvalidTruncatedSize(size); ++ ++- PadLastBlock(this->BLOCKSIZE, 0x01); +++ this->PadLastBlock(this->BLOCKSIZE, 0x01); ++ ++ HashEndianCorrectedBlock(this->m_data); ++ ++diff -rupN libcrypto++-5.6.0.orig/secblock.h libcrypto++-5.6.0/secblock.h ++--- libcrypto++-5.6.0.orig/secblock.h Sun Mar 15 03:48:02 2009 +++++ libcrypto++-5.6.0/secblock.h Fri Oct 12 20:13:31 2012 ++@@ -94,7 +94,7 @@ public: ++ ++ pointer allocate(size_type n, const void * = NULL) ++ { ++- CheckSize(n); +++ this->CheckSize(n); ++ if (n == 0) ++ return NULL; ++ +diff --git a/feeds/packages/libs/libcunit/.svn/entries b/feeds/packages/libs/libcunit/.svn/entries +new file mode 100644 +index 0000000..a144510 +--- /dev/null ++++ b/feeds/packages/libs/libcunit/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libcunit ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-04-29T15:33:07.379628Z ++26790 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2e29d4b7ab6239c58c0edc040b2b8387 ++2011-04-29T15:33:07.379628Z ++26790 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1614 ++ +diff --git a/feeds/packages/libs/libcunit/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libcunit/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7cec339 +--- /dev/null ++++ b/feeds/packages/libs/libcunit/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,71 @@ ++# ++# 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:=libcunit ++PKG_VERSION:=2.1-0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=CUnit-$(PKG_VERSION)-src.tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/cunit/CUnit/$(PKG_VERSION) ++PKG_MD5SUM:=f4f53d2c41e9315a91b4f14a1706fe4f ++PKG_BUILD_DIR:=$(BUILD_DIR)/CUnit-$(PKG_VERSION) ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libcunit ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Unit testing framework for C ++ URL:=http://cunit.sourceforge.net/ ++endef ++ ++define Package/libcunit/description ++ CUnit, lightweight unit testing for C ++ CUnit is a lightweight system for writing, administering, and running unit ++ tests in C. It provides C programmers a basic testing functionality with a ++ flexible variety of user interfaces. ++endef ++ ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ , \ ++ BUILD_CC="$(TARGET_CC)" \ ++ HOSTCC="$(HOSTCC)" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install ++endef ++ ++ ++define Build/InstallDev ++ mkdir -p $(1)/usr/include/CUnit ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/CUnit/* \ ++ $(1)/usr/include/CUnit ++ ++ mkdir -p $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcunit.* \ ++ $(1)/usr/lib ++endef ++ ++ ++define Package/libcunit/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcunit.* $(1)/usr/lib ++endef ++ ++ ++$(eval $(call BuildPackage,libcunit)) +diff --git a/feeds/packages/libs/libcunit/Makefile b/feeds/packages/libs/libcunit/Makefile +new file mode 100644 +index 0000000..7cec339 +--- /dev/null ++++ b/feeds/packages/libs/libcunit/Makefile +@@ -0,0 +1,71 @@ ++# ++# 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:=libcunit ++PKG_VERSION:=2.1-0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=CUnit-$(PKG_VERSION)-src.tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/cunit/CUnit/$(PKG_VERSION) ++PKG_MD5SUM:=f4f53d2c41e9315a91b4f14a1706fe4f ++PKG_BUILD_DIR:=$(BUILD_DIR)/CUnit-$(PKG_VERSION) ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libcunit ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Unit testing framework for C ++ URL:=http://cunit.sourceforge.net/ ++endef ++ ++define Package/libcunit/description ++ CUnit, lightweight unit testing for C ++ CUnit is a lightweight system for writing, administering, and running unit ++ tests in C. It provides C programmers a basic testing functionality with a ++ flexible variety of user interfaces. ++endef ++ ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ , \ ++ BUILD_CC="$(TARGET_CC)" \ ++ HOSTCC="$(HOSTCC)" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install ++endef ++ ++ ++define Build/InstallDev ++ mkdir -p $(1)/usr/include/CUnit ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/CUnit/* \ ++ $(1)/usr/include/CUnit ++ ++ mkdir -p $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcunit.* \ ++ $(1)/usr/lib ++endef ++ ++ ++define Package/libcunit/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcunit.* $(1)/usr/lib ++endef ++ ++ ++$(eval $(call BuildPackage,libcunit)) +diff --git a/feeds/packages/libs/libdaemon/.svn/entries b/feeds/packages/libs/libdaemon/.svn/entries +new file mode 100644 +index 0000000..bc505ec +--- /dev/null ++++ b/feeds/packages/libs/libdaemon/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdaemon ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-09T09:49:26.752394Z ++25967 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++88aade88738a4bcea2a17556df247de8 ++2011-03-09T09:49:26.752394Z ++25967 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2092 ++ +diff --git a/feeds/packages/libs/libdaemon/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libdaemon/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libdaemon/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libdaemon/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdaemon/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..68e3e36 +--- /dev/null ++++ b/feeds/packages/libs/libdaemon/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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:=libdaemon ++PKG_VERSION:=0.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/ ++PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563 ++ ++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 \ ++ , \ ++ 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/feeds/packages/libs/libdaemon/Makefile b/feeds/packages/libs/libdaemon/Makefile +new file mode 100644 +index 0000000..68e3e36 +--- /dev/null ++++ b/feeds/packages/libs/libdaemon/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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:=libdaemon ++PKG_VERSION:=0.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/ ++PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563 ++ ++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 \ ++ , \ ++ 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/feeds/packages/libs/libdaq/.svn/entries b/feeds/packages/libs/libdaq/.svn/entries +new file mode 100644 +index 0000000..a5a5493 +--- /dev/null ++++ b/feeds/packages/libs/libdaq/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdaq ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:39.846460Z ++34478 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++0d01f5b13515008047b28dd9285a2627 ++2012-12-04T16:20:39.846460Z ++34478 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1999 ++ +diff --git a/feeds/packages/libs/libdaq/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdaq/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0fe3426 +--- /dev/null ++++ b/feeds/packages/libs/libdaq/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# Copyright (C) 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:=libdaq ++PKG_VERSION:=1.1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://www.snort.org/dl/snort-current/ ++PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=bc204ea09165b4ecbb1bb49c7c1a2ad4 ++PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION) ++ ++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/feeds/packages/libs/libdaq/Makefile b/feeds/packages/libs/libdaq/Makefile +new file mode 100644 +index 0000000..0fe3426 +--- /dev/null ++++ b/feeds/packages/libs/libdaq/Makefile +@@ -0,0 +1,70 @@ ++# ++# Copyright (C) 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:=libdaq ++PKG_VERSION:=1.1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://www.snort.org/dl/snort-current/ ++PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=bc204ea09165b4ecbb1bb49c7c1a2ad4 ++PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION) ++ ++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/feeds/packages/libs/libdaq/patches/.svn/entries b/feeds/packages/libs/libdaq/patches/.svn/entries +new file mode 100644 +index 0000000..70fdf00 +--- /dev/null ++++ b/feeds/packages/libs/libdaq/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdaq/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-13T14:08:38.800853Z ++33168 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross-compile-test.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++3178a9162fed7a78996ccb7582d317e2 ++2012-08-13T14:08:38.800853Z ++33168 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++948 ++ +diff --git a/feeds/packages/libs/libdaq/patches/.svn/text-base/001-cross-compile-test.patch.svn-base b/feeds/packages/libs/libdaq/patches/.svn/text-base/001-cross-compile-test.patch.svn-base +new file mode 100644 +index 0000000..6eadb9e +--- /dev/null ++++ b/feeds/packages/libs/libdaq/patches/.svn/text-base/001-cross-compile-test.patch.svn-base +@@ -0,0 +1,18 @@ ++--- 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/feeds/packages/libs/libdaq/patches/001-cross-compile-test.patch b/feeds/packages/libs/libdaq/patches/001-cross-compile-test.patch +new file mode 100644 +index 0000000..6eadb9e +--- /dev/null ++++ b/feeds/packages/libs/libdaq/patches/001-cross-compile-test.patch +@@ -0,0 +1,18 @@ ++--- 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/feeds/packages/libs/libdbi-drivers/.svn/entries b/feeds/packages/libs/libdbi-drivers/.svn/entries +new file mode 100644 +index 0000000..6009e23 +--- /dev/null ++++ b/feeds/packages/libs/libdbi-drivers/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdbi-drivers ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-08T17:06:10.104472Z ++34583 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a0e5fc6a9b5790a20ec5aed05c6633c3 ++2012-12-08T17:06:10.104472Z ++34583 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3729 ++ +diff --git a/feeds/packages/libs/libdbi-drivers/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdbi-drivers/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8b5304f +--- /dev/null ++++ b/feeds/packages/libs/libdbi-drivers/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,137 @@ ++# ++# 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:=libdbi-drivers ++PKG_VERSION:=0.8.3-1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libdbi-drivers ++PKG_MD5SUM:=4de79b323162a5a7652b65b608eca6cd ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdbi-drivers/default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libdbi-drivers ++ URL:=http://libdbi-drivers.sourceforge.net/ ++endef ++ ++define Package/libdbi-drivers/default/description ++ libdbi-drivers project provides the database-specific drivers ++for the libdbi framework ++endef ++ ++define Package/libdbi-drivers-mysql ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libmysqlclient ++ TITLE:= libdbi-drivers-mysql ++endef ++ ++define Package/libdbi-drivers-mysql2/description ++ libdbi-driver for mysql ++endef ++ ++define Package/libdbi-drivers-pgsql ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libpq ++ TITLE:= libdbi-drivers-pgsql ++endef ++ ++define Package/libdbi-drivers-pgsql/description ++ libdbi-driver for pgsql ++endef ++ ++define Package/libdbi-drivers-sqlite2 ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libsqlite2 ++ TITLE:= libdbi-drivers-sqlite2 ++endef ++ ++define Package/libdbi-drivers-sqlite2/description ++ libdbi-driver for sqlite2 ++endef ++ ++define Package/libdbi-drivers-sqlite3 ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libsqlite3 ++ TITLE:= libdbi-drivers-sqlite3 ++endef ++ ++define Package/libdbi-drivers-sqlite3/description ++ libdbi-driver for sqlite3 ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --disable-docs \ ++ --with-dbi-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-dbi-libdir=$(STAGING_DIR_HOST)/usr/lib ++ ++ifneq ($(CONFIG_PACKAGE_libdbi-drivers-mysql),) ++CONFIGURE_ARGS += \ ++ --with-mysql \ ++ --with-mysql-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-mysql-libdir=$(STAGING_DIR_HOST)/usr/lib/mysql ++TARGET_LDFLAGS += \ ++ -L$(STAGING_DIR)/usr/lib/mysql/ ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-pgsql),) ++CONFIGURE_ARGS += \ ++ --with-pgsql \ ++ --with-pgsql-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-pgsql-libdir=$(STAGING_DIR_HOST)/usr/lib ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite2),) ++CONFIGURE_ARGS += \ ++ --with-sqlite \ ++ --with-sqlite-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-sqlite-libdir=$(STAGING_DIR_HOST)/usr/lib ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite3),) ++CONFIGURE_ARGS += \ ++ --with-sqlite3 \ ++ --with-sqlite3-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-sqlite3-libdir=$(STAGING_DIR_HOST)/usr/lib ++endif ++ ++define Package/libdbi-drivers-mysql/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/mysql/.libs/libdbdmysql.so $(1)/usr/lib/dbd ++endef ++ ++define Package/libdbi-drivers-pgsql/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/pgsql/.libs/libdbdpgsql.so $(1)/usr/lib/dbd ++endef ++ ++define Package/libdbi-drivers-sqlite2/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/sqlite/.libs/libdbdsqlite.so $(1)/usr/lib/dbd ++endef ++ ++define Package/libdbi-drivers-sqlite3/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/sqlite3/.libs/libdbdsqlite3.so $(1)/usr/lib/dbd ++endef ++ ++ ++#$(eval $(call BuildPackage,libdbi-drivers)) ++$(eval $(call BuildPackage,libdbi-drivers-mysql)) ++$(eval $(call BuildPackage,libdbi-drivers-pgsql)) ++$(eval $(call BuildPackage,libdbi-drivers-sqlite2)) ++$(eval $(call BuildPackage,libdbi-drivers-sqlite3)) +diff --git a/feeds/packages/libs/libdbi-drivers/Makefile b/feeds/packages/libs/libdbi-drivers/Makefile +new file mode 100644 +index 0000000..8b5304f +--- /dev/null ++++ b/feeds/packages/libs/libdbi-drivers/Makefile +@@ -0,0 +1,137 @@ ++# ++# 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:=libdbi-drivers ++PKG_VERSION:=0.8.3-1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libdbi-drivers ++PKG_MD5SUM:=4de79b323162a5a7652b65b608eca6cd ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdbi-drivers/default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libdbi-drivers ++ URL:=http://libdbi-drivers.sourceforge.net/ ++endef ++ ++define Package/libdbi-drivers/default/description ++ libdbi-drivers project provides the database-specific drivers ++for the libdbi framework ++endef ++ ++define Package/libdbi-drivers-mysql ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libmysqlclient ++ TITLE:= libdbi-drivers-mysql ++endef ++ ++define Package/libdbi-drivers-mysql2/description ++ libdbi-driver for mysql ++endef ++ ++define Package/libdbi-drivers-pgsql ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libpq ++ TITLE:= libdbi-drivers-pgsql ++endef ++ ++define Package/libdbi-drivers-pgsql/description ++ libdbi-driver for pgsql ++endef ++ ++define Package/libdbi-drivers-sqlite2 ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libsqlite2 ++ TITLE:= libdbi-drivers-sqlite2 ++endef ++ ++define Package/libdbi-drivers-sqlite2/description ++ libdbi-driver for sqlite2 ++endef ++ ++define Package/libdbi-drivers-sqlite3 ++$(call Package/libdbi-drivers/default) ++ DEPENDS:=libdbi +libsqlite3 ++ TITLE:= libdbi-drivers-sqlite3 ++endef ++ ++define Package/libdbi-drivers-sqlite3/description ++ libdbi-driver for sqlite3 ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --disable-docs \ ++ --with-dbi-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-dbi-libdir=$(STAGING_DIR_HOST)/usr/lib ++ ++ifneq ($(CONFIG_PACKAGE_libdbi-drivers-mysql),) ++CONFIGURE_ARGS += \ ++ --with-mysql \ ++ --with-mysql-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-mysql-libdir=$(STAGING_DIR_HOST)/usr/lib/mysql ++TARGET_LDFLAGS += \ ++ -L$(STAGING_DIR)/usr/lib/mysql/ ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-pgsql),) ++CONFIGURE_ARGS += \ ++ --with-pgsql \ ++ --with-pgsql-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-pgsql-libdir=$(STAGING_DIR_HOST)/usr/lib ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite2),) ++CONFIGURE_ARGS += \ ++ --with-sqlite \ ++ --with-sqlite-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-sqlite-libdir=$(STAGING_DIR_HOST)/usr/lib ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite3),) ++CONFIGURE_ARGS += \ ++ --with-sqlite3 \ ++ --with-sqlite3-incdir=$(STAGING_DIR_HOST)/usr/include \ ++ --with-sqlite3-libdir=$(STAGING_DIR_HOST)/usr/lib ++endif ++ ++define Package/libdbi-drivers-mysql/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/mysql/.libs/libdbdmysql.so $(1)/usr/lib/dbd ++endef ++ ++define Package/libdbi-drivers-pgsql/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/pgsql/.libs/libdbdpgsql.so $(1)/usr/lib/dbd ++endef ++ ++define Package/libdbi-drivers-sqlite2/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/sqlite/.libs/libdbdsqlite.so $(1)/usr/lib/dbd ++endef ++ ++define Package/libdbi-drivers-sqlite3/install ++ $(INSTALL_DIR) $(1)/usr/lib/dbd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/drivers/sqlite3/.libs/libdbdsqlite3.so $(1)/usr/lib/dbd ++endef ++ ++ ++#$(eval $(call BuildPackage,libdbi-drivers)) ++$(eval $(call BuildPackage,libdbi-drivers-mysql)) ++$(eval $(call BuildPackage,libdbi-drivers-pgsql)) ++$(eval $(call BuildPackage,libdbi-drivers-sqlite2)) ++$(eval $(call BuildPackage,libdbi-drivers-sqlite3)) +diff --git a/feeds/packages/libs/libdbi/.svn/entries b/feeds/packages/libs/libdbi/.svn/entries +new file mode 100644 +index 0000000..666be90 +--- /dev/null ++++ b/feeds/packages/libs/libdbi/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdbi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++6ac644c3b534559c33c3bdcc6d0eeafe ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1060 ++ +diff --git a/feeds/packages/libs/libdbi/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdbi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..398df7e +--- /dev/null ++++ b/feeds/packages/libs/libdbi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=libdbi ++PKG_VERSION:=0.8.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libdbi ++PKG_MD5SUM:=ca66db78d479cbfa727cf3245b5864ae ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdbi ++ NAME:=libdbi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++ URL:=http://libdbi.sourceforge.net/ ++endef ++ ++define Package/libdbi/description ++ libdbi implements a database-independent abstraction layer in C. ++endef ++ ++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/ ++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/feeds/packages/libs/libdbi/Makefile b/feeds/packages/libs/libdbi/Makefile +new file mode 100644 +index 0000000..398df7e +--- /dev/null ++++ b/feeds/packages/libs/libdbi/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=libdbi ++PKG_VERSION:=0.8.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libdbi ++PKG_MD5SUM:=ca66db78d479cbfa727cf3245b5864ae ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdbi ++ NAME:=libdbi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++ URL:=http://libdbi.sourceforge.net/ ++endef ++ ++define Package/libdbi/description ++ libdbi implements a database-independent abstraction layer in C. ++endef ++ ++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/ ++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/feeds/packages/libs/libdbi/patches/.svn/entries b/feeds/packages/libs/libdbi/patches/.svn/entries +new file mode 100644 +index 0000000..15b7087 +--- /dev/null ++++ b/feeds/packages/libs/libdbi/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdbi/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-01-08T23:06:25.493129Z ++13943 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++6c0c7132412888235ff9d1a0653868a1 ++2009-01-08T23:06:25.493129Z ++13943 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1461 ++ +diff --git a/feeds/packages/libs/libdbi/patches/.svn/text-base/001-no_docs.patch.svn-base b/feeds/packages/libs/libdbi/patches/.svn/text-base/001-no_docs.patch.svn-base +new file mode 100644 +index 0000000..f290db1 +--- /dev/null ++++ b/feeds/packages/libs/libdbi/patches/.svn/text-base/001-no_docs.patch.svn-base +@@ -0,0 +1,24 @@ ++diff -urN libdbi-0.8.3/Makefile.am libdbi-0.8.3.new/Makefile.am ++--- libdbi-0.8.3/Makefile.am 2006-05-18 22:27:50.000000000 +0200 +++++ libdbi-0.8.3.new/Makefile.am 2009-01-09 00:06:34.000000000 +0100 ++@@ -2,7 +2,7 @@ ++ ++ AUTOMAKE_OPTIONS = foreign dist-zip ++ ++-SUBDIRS = src include @docs_subdirs@ +++SUBDIRS = src include ++ ++ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml ++ ++diff -urN libdbi-0.8.3/Makefile.in libdbi-0.8.3.new/Makefile.in ++--- libdbi-0.8.3/Makefile.in 2008-02-06 20:40:10.000000000 +0100 +++++ libdbi-0.8.3.new/Makefile.in 2009-01-09 00:06:28.000000000 +0100 ++@@ -180,7 +180,7 @@ ++ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++ AUTOMAKE_OPTIONS = foreign dist-zip ++-SUBDIRS = src include @docs_subdirs@ +++SUBDIRS = src include ++ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml ++ all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive +diff --git a/feeds/packages/libs/libdbi/patches/001-no_docs.patch b/feeds/packages/libs/libdbi/patches/001-no_docs.patch +new file mode 100644 +index 0000000..f290db1 +--- /dev/null ++++ b/feeds/packages/libs/libdbi/patches/001-no_docs.patch +@@ -0,0 +1,24 @@ ++diff -urN libdbi-0.8.3/Makefile.am libdbi-0.8.3.new/Makefile.am ++--- libdbi-0.8.3/Makefile.am 2006-05-18 22:27:50.000000000 +0200 +++++ libdbi-0.8.3.new/Makefile.am 2009-01-09 00:06:34.000000000 +0100 ++@@ -2,7 +2,7 @@ ++ ++ AUTOMAKE_OPTIONS = foreign dist-zip ++ ++-SUBDIRS = src include @docs_subdirs@ +++SUBDIRS = src include ++ ++ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml ++ ++diff -urN libdbi-0.8.3/Makefile.in libdbi-0.8.3.new/Makefile.in ++--- libdbi-0.8.3/Makefile.in 2008-02-06 20:40:10.000000000 +0100 +++++ libdbi-0.8.3.new/Makefile.in 2009-01-09 00:06:28.000000000 +0100 ++@@ -180,7 +180,7 @@ ++ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++ AUTOMAKE_OPTIONS = foreign dist-zip ++-SUBDIRS = src include @docs_subdirs@ +++SUBDIRS = src include ++ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml ++ all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive +diff --git a/feeds/packages/libs/libdirectfb/.svn/entries b/feeds/packages/libs/libdirectfb/.svn/entries +new file mode 100644 +index 0000000..5adfec7 +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdirectfb ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T15:26:42.364009Z ++35386 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0d4872a86c7d7e85b4ecf49345a8bbce ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3495 ++ +diff --git a/feeds/packages/libs/libdirectfb/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdirectfb/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..13b02e4 +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,121 @@ ++# ++# 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:=DirectFB ++PKG_VERSION:=1.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.directfb.org/downloads/Core/DirectFB-1.4 ++PKG_MD5SUM:=e4376c6c5b8e27d735edb7f62a7a8e86 ++ ++PKG_LICENSE:=LGPLv2.1 ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/directfb ++ TITLE:=DirectFB ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=http://directfb.org ++ DEPENDS:=+libpng +libjpeg +libpthread +libfreetype +libsysfs ++endef ++ ++define Package/directfb/description ++ DirectFB is a thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system with support for translucent windows and multiple display layers, not only on top of the Linux Framebuffer Device. It is a complete hardware abstraction layer with software fallbacks for every graphics operation that is not supported by the underlying hardware. ++endef ++ ++TARGET_LDFLAGS+="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" ++CONFIGURE_CMD=./autogen.sh ++ ++define Feature/DirectFB ++ TARGET_NAME:=drawing-backend ++ TARGET_TITLE:=Drawing Backend ++ NAME:=DirectFB ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-osx \ ++ --disable-x11 \ ++ --enable-debug-support \ ++ --disable-network \ ++ --disable-mmx \ ++ --disable-sse \ ++ --enable-fbdev \ ++ --disable-sdl \ ++ --disable-vnc \ ++ --enable-sysfs \ ++ --with-inputdrivers=linuxinput \ ++ --with-gfxdrivers=none \ ++ ) ++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/directfb/install ++ $(INSTALL_DIR) \ ++ $(1)/usr/bin \ ++ $(1)/usr/lib \ ++ $(1)/usr/share/directfb-1.4.2 \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider \ ++ $(1)/usr/lib/directfb-1.4-0/wm \ ++ $(1)/usr/lib/directfb-1.4-0/systems \ ++ $(1)/usr/lib/directfb-1.4-0/inputdrivers ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/share/directfb-1.4.2/* \ ++ $(1)/usr/share/directfb-1.4.2/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/lib{direct,fusion}*.so* \ ++ $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/wm/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/wm/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/systems/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/systems/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/inputdrivers/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/inputdrivers/ ++endef ++ ++$(eval $(call Feature,DirectFB)) ++$(eval $(call BuildPackage,directfb)) +diff --git a/feeds/packages/libs/libdirectfb/Makefile b/feeds/packages/libs/libdirectfb/Makefile +new file mode 100644 +index 0000000..13b02e4 +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/Makefile +@@ -0,0 +1,121 @@ ++# ++# 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:=DirectFB ++PKG_VERSION:=1.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.directfb.org/downloads/Core/DirectFB-1.4 ++PKG_MD5SUM:=e4376c6c5b8e27d735edb7f62a7a8e86 ++ ++PKG_LICENSE:=LGPLv2.1 ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/directfb ++ TITLE:=DirectFB ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=http://directfb.org ++ DEPENDS:=+libpng +libjpeg +libpthread +libfreetype +libsysfs ++endef ++ ++define Package/directfb/description ++ DirectFB is a thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system with support for translucent windows and multiple display layers, not only on top of the Linux Framebuffer Device. It is a complete hardware abstraction layer with software fallbacks for every graphics operation that is not supported by the underlying hardware. ++endef ++ ++TARGET_LDFLAGS+="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" ++CONFIGURE_CMD=./autogen.sh ++ ++define Feature/DirectFB ++ TARGET_NAME:=drawing-backend ++ TARGET_TITLE:=Drawing Backend ++ NAME:=DirectFB ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-osx \ ++ --disable-x11 \ ++ --enable-debug-support \ ++ --disable-network \ ++ --disable-mmx \ ++ --disable-sse \ ++ --enable-fbdev \ ++ --disable-sdl \ ++ --disable-vnc \ ++ --enable-sysfs \ ++ --with-inputdrivers=linuxinput \ ++ --with-gfxdrivers=none \ ++ ) ++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/directfb/install ++ $(INSTALL_DIR) \ ++ $(1)/usr/bin \ ++ $(1)/usr/lib \ ++ $(1)/usr/share/directfb-1.4.2 \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider \ ++ $(1)/usr/lib/directfb-1.4-0/wm \ ++ $(1)/usr/lib/directfb-1.4-0/systems \ ++ $(1)/usr/lib/directfb-1.4-0/inputdrivers ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/share/directfb-1.4.2/* \ ++ $(1)/usr/share/directfb-1.4.2/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/lib{direct,fusion}*.so* \ ++ $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/wm/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/wm/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/systems/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/systems/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/directfb-1.4-0/inputdrivers/*.so* \ ++ $(1)/usr/lib/directfb-1.4-0/inputdrivers/ ++endef ++ ++$(eval $(call Feature,DirectFB)) ++$(eval $(call BuildPackage,directfb)) +diff --git a/feeds/packages/libs/libdirectfb/patches/.svn/entries b/feeds/packages/libs/libdirectfb/patches/.svn/entries +new file mode 100644 +index 0000000..b29d49e +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdirectfb/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T15:26:42.364009Z ++35386 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-use-volatile-keyword.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f7644285580f96848b4c23d668ffc07f ++2013-01-29T15:26:42.364009Z ++35386 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1294 ++ ++001-disable-asm.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++20128c4fed08c7ad84bc50dcfdd267ba ++2013-01-29T15:26:42.364009Z ++35386 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++314 ++ +diff --git a/feeds/packages/libs/libdirectfb/patches/.svn/text-base/001-disable-asm.patch.svn-base b/feeds/packages/libs/libdirectfb/patches/.svn/text-base/001-disable-asm.patch.svn-base +new file mode 100644 +index 0000000..c38498a +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/patches/.svn/text-base/001-disable-asm.patch.svn-base +@@ -0,0 +1,13 @@ ++--- DirectFB-1.4.2/configure.in.orig 2009-10-14 17:19:38.000000000 +0200 +++++ DirectFB-1.4.2/configure.in 2009-10-14 17:19:55.000000000 +0200 ++@@ -221,8 +221,8 @@ ++ have_kos=no ++ need_libc_r=no ++ need_libdl=yes +++want_ppcasm=no +++want_armasm=no ++-want_ppcasm=yes ++-want_armasm=yes ++ ++ case "$target_or_host" in ++ *-linux*) +diff --git a/feeds/packages/libs/libdirectfb/patches/.svn/text-base/002-use-volatile-keyword.patch.svn-base b/feeds/packages/libs/libdirectfb/patches/.svn/text-base/002-use-volatile-keyword.patch.svn-base +new file mode 100644 +index 0000000..7904110 +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/patches/.svn/text-base/002-use-volatile-keyword.patch.svn-base +@@ -0,0 +1,30 @@ ++diff -burN DirectFB-1.4.2.orig/lib/direct/interface.c DirectFB-1.4.2/lib/direct/interface.c ++--- DirectFB-1.4.2.orig/lib/direct/interface.c 2013-01-29 13:57:25.000000000 +0100 +++++ DirectFB-1.4.2/lib/direct/interface.c 2013-01-29 13:59:37.000000000 +0100 ++@@ -74,7 +74,7 @@ ++ } DirectInterfaceImplementation; ++ ++ static pthread_mutex_t implementations_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++-static DirectLink *implementations = NULL; +++static DirectLink * volatile implementations = NULL; ++ ++ /**************************************************************************************************/ ++ ++@@ -96,7 +96,7 @@ ++ D_DEBUG_AT( Direct_Interface, " -> %s | %s\n", impl->type, impl->implementation ); ++ ++ pthread_mutex_lock( &implementations_mutex ); ++- direct_list_prepend( &implementations, &impl->link ); +++ direct_list_prepend( (DirectLink**)&implementations, &impl->link ); ++ pthread_mutex_unlock( &implementations_mutex ); ++ } ++ ++@@ -111,7 +111,7 @@ ++ D_MAGIC_ASSERT( impl, DirectInterfaceImplementation ); ++ ++ if (impl->funcs == funcs) { ++- direct_list_remove( &implementations, &impl->link ); +++ direct_list_remove( (DirectLink**)&implementations, &impl->link ); ++ ++ break; ++ } +diff --git a/feeds/packages/libs/libdirectfb/patches/001-disable-asm.patch b/feeds/packages/libs/libdirectfb/patches/001-disable-asm.patch +new file mode 100644 +index 0000000..c38498a +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/patches/001-disable-asm.patch +@@ -0,0 +1,13 @@ ++--- DirectFB-1.4.2/configure.in.orig 2009-10-14 17:19:38.000000000 +0200 +++++ DirectFB-1.4.2/configure.in 2009-10-14 17:19:55.000000000 +0200 ++@@ -221,8 +221,8 @@ ++ have_kos=no ++ need_libc_r=no ++ need_libdl=yes +++want_ppcasm=no +++want_armasm=no ++-want_ppcasm=yes ++-want_armasm=yes ++ ++ case "$target_or_host" in ++ *-linux*) +diff --git a/feeds/packages/libs/libdirectfb/patches/002-use-volatile-keyword.patch b/feeds/packages/libs/libdirectfb/patches/002-use-volatile-keyword.patch +new file mode 100644 +index 0000000..7904110 +--- /dev/null ++++ b/feeds/packages/libs/libdirectfb/patches/002-use-volatile-keyword.patch +@@ -0,0 +1,30 @@ ++diff -burN DirectFB-1.4.2.orig/lib/direct/interface.c DirectFB-1.4.2/lib/direct/interface.c ++--- DirectFB-1.4.2.orig/lib/direct/interface.c 2013-01-29 13:57:25.000000000 +0100 +++++ DirectFB-1.4.2/lib/direct/interface.c 2013-01-29 13:59:37.000000000 +0100 ++@@ -74,7 +74,7 @@ ++ } DirectInterfaceImplementation; ++ ++ static pthread_mutex_t implementations_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++-static DirectLink *implementations = NULL; +++static DirectLink * volatile implementations = NULL; ++ ++ /**************************************************************************************************/ ++ ++@@ -96,7 +96,7 @@ ++ D_DEBUG_AT( Direct_Interface, " -> %s | %s\n", impl->type, impl->implementation ); ++ ++ pthread_mutex_lock( &implementations_mutex ); ++- direct_list_prepend( &implementations, &impl->link ); +++ direct_list_prepend( (DirectLink**)&implementations, &impl->link ); ++ pthread_mutex_unlock( &implementations_mutex ); ++ } ++ ++@@ -111,7 +111,7 @@ ++ D_MAGIC_ASSERT( impl, DirectInterfaceImplementation ); ++ ++ if (impl->funcs == funcs) { ++- direct_list_remove( &implementations, &impl->link ); +++ direct_list_remove( (DirectLink**)&implementations, &impl->link ); ++ ++ break; ++ } +diff --git a/feeds/packages/libs/libdlna/.svn/entries b/feeds/packages/libs/libdlna/.svn/entries +new file mode 100644 +index 0000000..eb8eb32 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdlna ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:09.778590Z ++35796 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++dbae4c10e1b65d744ef32289829f52cb ++2013-02-25T21:04:09.778590Z ++35796 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2130 ++ +diff --git a/feeds/packages/libs/libdlna/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libdlna/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..323a7d8 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/libs/libdlna/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdlna/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6734d03 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,81 @@ ++# ++# 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:=libdlna ++PKG_VERSION:=0.2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://libdlna.geexbox.org/releases/ ++PKG_MD5SUM:=64d7de57aff5a729f2434fc5e69b4ffc ++ ++PKG_LICENSE:=LGPLv2.1+ ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdlna ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:= Reference DLNA implementation ++ URL:=http://libdlna.geexbox.org/ ++ DEPENDS:=+libffmpeg ++endef ++ ++define Package/libdlna/description ++ libdlna aims at being the reference open-source implementation of DLNA ++ (Digital Living Network Alliance) standards. Its primary goal is to ++ provide DLNA support to uShare, an embedded DLNA & UPnP A/V Media Server, ++ but it will be used to build both DLNA servers and players in the long ++ term. ++endef ++ ++define Build/Configure ++ # this is *NOT* GNU configure ++ ( cd $(PKG_BUILD_DIR); \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lpthread" \ ++ HOST_CC="$(HOSTCC)" \ ++ ./configure \ ++ --cross-compile \ ++ --cross-prefix=$(TARGET_CROSS) \ ++ --prefix=/usr \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-debug \ ++ --disable-optimize \ ++ --disable-strip \ ++ ) ++endef ++ ++# XXX: fix build on systems where install is not at its usual location ++# INSTALL defaults to /usr/bin/install ++MAKE_INSTALL_FLAGS += \ ++ INSTALL="install" \ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/dlna.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdlna.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdlna.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libdlna/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdlna.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libdlna)) +diff --git a/feeds/packages/libs/libdlna/Makefile b/feeds/packages/libs/libdlna/Makefile +new file mode 100644 +index 0000000..6734d03 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/Makefile +@@ -0,0 +1,81 @@ ++# ++# 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:=libdlna ++PKG_VERSION:=0.2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://libdlna.geexbox.org/releases/ ++PKG_MD5SUM:=64d7de57aff5a729f2434fc5e69b4ffc ++ ++PKG_LICENSE:=LGPLv2.1+ ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdlna ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:= Reference DLNA implementation ++ URL:=http://libdlna.geexbox.org/ ++ DEPENDS:=+libffmpeg ++endef ++ ++define Package/libdlna/description ++ libdlna aims at being the reference open-source implementation of DLNA ++ (Digital Living Network Alliance) standards. Its primary goal is to ++ provide DLNA support to uShare, an embedded DLNA & UPnP A/V Media Server, ++ but it will be used to build both DLNA servers and players in the long ++ term. ++endef ++ ++define Build/Configure ++ # this is *NOT* GNU configure ++ ( cd $(PKG_BUILD_DIR); \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lpthread" \ ++ HOST_CC="$(HOSTCC)" \ ++ ./configure \ ++ --cross-compile \ ++ --cross-prefix=$(TARGET_CROSS) \ ++ --prefix=/usr \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-debug \ ++ --disable-optimize \ ++ --disable-strip \ ++ ) ++endef ++ ++# XXX: fix build on systems where install is not at its usual location ++# INSTALL defaults to /usr/bin/install ++MAKE_INSTALL_FLAGS += \ ++ INSTALL="install" \ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/dlna.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdlna.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdlna.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libdlna/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdlna.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libdlna)) +diff --git a/feeds/packages/libs/libdlna/patches/.svn/entries b/feeds/packages/libs/libdlna/patches/.svn/entries +new file mode 100644 +index 0000000..8566d84 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdlna/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:09.778590Z ++35796 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-configure_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2013-02-25T21:04:09.778590Z ++35796 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ ++300-ffmpeg_compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++592cd2c16057caedbdf1adcd057534a8 ++2013-02-25T21:04:09.778590Z ++35796 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1078 ++ ++200-parallel-build.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c54d6ddbe8737eb02a8528becf3bb26e ++2010-10-08T17:57:18.383089Z ++23330 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++364 ++ ++010-configure-crosscompile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++50c8f71e260cda49dbdc96f564e93835 ++2013-02-25T21:04:09.778590Z ++35796 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1436 ++ +diff --git a/feeds/packages/libs/libdlna/patches/.svn/text-base/010-configure-crosscompile.patch.svn-base b/feeds/packages/libs/libdlna/patches/.svn/text-base/010-configure-crosscompile.patch.svn-base +new file mode 100644 +index 0000000..00ca9a4 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/.svn/text-base/010-configure-crosscompile.patch.svn-base +@@ -0,0 +1,59 @@ ++--- a/configure +++++ b/configure ++@@ -184,6 +184,19 @@ check_ld(){ ++ check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs ++ } ++ +++check_host_cc(){ +++ log check_host_cc "$@" +++ cat >$TMPC +++ log_file $TMPC +++ check_cmd $host_cc $host_cflags "$@" -c -o $TMPO $TMPC +++} +++ +++check_host_ld(){ +++ log check_host_ld "$@" +++ check_host_cc || return +++ check_cmd $host_cc $host_cflags $host_ldflags "$@" -o $TMPE $TMPO +++} +++ ++ check_exec(){ ++ check_ld "$@" && { enabled cross_compile || $TMPE >>$logfile 2>&1; } ++ } ++@@ -318,6 +331,7 @@ includedir='$(PREFIX)/include' ++ static="yes" ++ shared="yes" ++ cc="gcc" +++host_cc="gcc" ++ ar="ar" ++ ranlib="ranlib" ++ make="make" ++@@ -465,6 +479,10 @@ else ++ [ -n "$STRIP" ] && strip="$STRIP" ++ fi ++ [ -n "$MAKE" ] && make="$MAKE" +++[ -n "$HOST_CC" ] && host_cc="$HOST_CC" +++[ -n "$HOST_CFLAGS" ] && host_cflags="$HOST_CFLAGS" +++[ -n "$HOST_LDFLAGS" ] && host_ldflags="$HOST_LDFLAGS" +++host_cflags="-Isrc $host_cflags" ++ ++ ################################################# ++ # create logging file ++@@ -649,8 +667,7 @@ check_lib libavcodec/avcodec.h avcodec_r ++ ################################################# ++ # version ++ ################################################# ++-temp_cflags "-Isrc" ++-check_ld < ++ #include ++ int main(){ ++@@ -660,7 +677,6 @@ int main(){ ++ } ++ EOF ++ VERSION=`$TMPE` ++-restore_flags ++ ++ ++ ################################################# +diff --git a/feeds/packages/libs/libdlna/patches/.svn/text-base/100-configure_fix.patch.svn-base b/feeds/packages/libs/libdlna/patches/.svn/text-base/100-configure_fix.patch.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/libs/libdlna/patches/.svn/text-base/200-parallel-build.patch.svn-base b/feeds/packages/libs/libdlna/patches/.svn/text-base/200-parallel-build.patch.svn-base +new file mode 100644 +index 0000000..7f9934b +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/.svn/text-base/200-parallel-build.patch.svn-base +@@ -0,0 +1,17 @@ ++--- ++ Makefile | 4 ++-- ++ 1 file changed, 2 insertions(+), 2 deletions(-) ++ ++--- libdlna-0.2.3.orig/Makefile +++++ libdlna-0.2.3/Makefile ++@@ -32,8 +32,8 @@ lib: ++ ++ test: $(LIBTEST) ++ ++-$(LIBTEST): $(SRCS) ++- $(CC) $? $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +++$(LIBTEST): lib $(SRCS) +++ $(CC) $(SRCS) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ++ ++ clean: ++ $(MAKE) -C src clean +diff --git a/feeds/packages/libs/libdlna/patches/.svn/text-base/300-ffmpeg_compat.patch.svn-base b/feeds/packages/libs/libdlna/patches/.svn/text-base/300-ffmpeg_compat.patch.svn-base +new file mode 100644 +index 0000000..8fb9b39 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/.svn/text-base/300-ffmpeg_compat.patch.svn-base +@@ -0,0 +1,35 @@ ++--- a/src/profiles.c +++++ b/src/profiles.c ++@@ -205,13 +205,13 @@ av_profile_get_codecs (AVFormatContext * ++ for (i = 0; i < ctx->nb_streams; i++) ++ { ++ if (audio_stream == -1 && ++- ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) +++ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_AUDIO) ++ { ++ audio_stream = i; ++ continue; ++ } ++ else if (video_stream == -1 && ++- ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) +++ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_VIDEO) ++ { ++ video_stream = i; ++ continue; ++--- a/src/profiles.h +++++ b/src/profiles.h ++@@ -25,6 +25,14 @@ ++ #include ++ #include ++ +++#if (LIBAVCODEC_VERSION_MAJOR > 52) +++# define LIBDLNA_CODEC_TYPE_AUDIO (AVMEDIA_TYPE_AUDIO) +++# define LIBDLNA_CODEC_TYPE_VIDEO (AVMEDIA_TYPE_VIDEO) +++#else +++# define LIBDLNA_CODEC_TYPE_AUDIO (CODEC_TYPE_AUDIO) +++# define LIBDLNA_CODEC_TYPE_VIDEO (CODEC_TYPE_VIDEO) +++#endif +++ ++ #include "dlna_internals.h" ++ #include "containers.h" ++ +diff --git a/feeds/packages/libs/libdlna/patches/010-configure-crosscompile.patch b/feeds/packages/libs/libdlna/patches/010-configure-crosscompile.patch +new file mode 100644 +index 0000000..00ca9a4 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/010-configure-crosscompile.patch +@@ -0,0 +1,59 @@ ++--- a/configure +++++ b/configure ++@@ -184,6 +184,19 @@ check_ld(){ ++ check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs ++ } ++ +++check_host_cc(){ +++ log check_host_cc "$@" +++ cat >$TMPC +++ log_file $TMPC +++ check_cmd $host_cc $host_cflags "$@" -c -o $TMPO $TMPC +++} +++ +++check_host_ld(){ +++ log check_host_ld "$@" +++ check_host_cc || return +++ check_cmd $host_cc $host_cflags $host_ldflags "$@" -o $TMPE $TMPO +++} +++ ++ check_exec(){ ++ check_ld "$@" && { enabled cross_compile || $TMPE >>$logfile 2>&1; } ++ } ++@@ -318,6 +331,7 @@ includedir='$(PREFIX)/include' ++ static="yes" ++ shared="yes" ++ cc="gcc" +++host_cc="gcc" ++ ar="ar" ++ ranlib="ranlib" ++ make="make" ++@@ -465,6 +479,10 @@ else ++ [ -n "$STRIP" ] && strip="$STRIP" ++ fi ++ [ -n "$MAKE" ] && make="$MAKE" +++[ -n "$HOST_CC" ] && host_cc="$HOST_CC" +++[ -n "$HOST_CFLAGS" ] && host_cflags="$HOST_CFLAGS" +++[ -n "$HOST_LDFLAGS" ] && host_ldflags="$HOST_LDFLAGS" +++host_cflags="-Isrc $host_cflags" ++ ++ ################################################# ++ # create logging file ++@@ -649,8 +667,7 @@ check_lib libavcodec/avcodec.h avcodec_r ++ ################################################# ++ # version ++ ################################################# ++-temp_cflags "-Isrc" ++-check_ld < ++ #include ++ int main(){ ++@@ -660,7 +677,6 @@ int main(){ ++ } ++ EOF ++ VERSION=`$TMPE` ++-restore_flags ++ ++ ++ ################################################# +diff --git a/feeds/packages/libs/libdlna/patches/100-configure_fix.patch b/feeds/packages/libs/libdlna/patches/100-configure_fix.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/libs/libdlna/patches/200-parallel-build.patch b/feeds/packages/libs/libdlna/patches/200-parallel-build.patch +new file mode 100644 +index 0000000..7f9934b +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/200-parallel-build.patch +@@ -0,0 +1,17 @@ ++--- ++ Makefile | 4 ++-- ++ 1 file changed, 2 insertions(+), 2 deletions(-) ++ ++--- libdlna-0.2.3.orig/Makefile +++++ libdlna-0.2.3/Makefile ++@@ -32,8 +32,8 @@ lib: ++ ++ test: $(LIBTEST) ++ ++-$(LIBTEST): $(SRCS) ++- $(CC) $? $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +++$(LIBTEST): lib $(SRCS) +++ $(CC) $(SRCS) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ++ ++ clean: ++ $(MAKE) -C src clean +diff --git a/feeds/packages/libs/libdlna/patches/300-ffmpeg_compat.patch b/feeds/packages/libs/libdlna/patches/300-ffmpeg_compat.patch +new file mode 100644 +index 0000000..8fb9b39 +--- /dev/null ++++ b/feeds/packages/libs/libdlna/patches/300-ffmpeg_compat.patch +@@ -0,0 +1,35 @@ ++--- a/src/profiles.c +++++ b/src/profiles.c ++@@ -205,13 +205,13 @@ av_profile_get_codecs (AVFormatContext * ++ for (i = 0; i < ctx->nb_streams; i++) ++ { ++ if (audio_stream == -1 && ++- ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) +++ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_AUDIO) ++ { ++ audio_stream = i; ++ continue; ++ } ++ else if (video_stream == -1 && ++- ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) +++ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_VIDEO) ++ { ++ video_stream = i; ++ continue; ++--- a/src/profiles.h +++++ b/src/profiles.h ++@@ -25,6 +25,14 @@ ++ #include ++ #include ++ +++#if (LIBAVCODEC_VERSION_MAJOR > 52) +++# define LIBDLNA_CODEC_TYPE_AUDIO (AVMEDIA_TYPE_AUDIO) +++# define LIBDLNA_CODEC_TYPE_VIDEO (AVMEDIA_TYPE_VIDEO) +++#else +++# define LIBDLNA_CODEC_TYPE_AUDIO (CODEC_TYPE_AUDIO) +++# define LIBDLNA_CODEC_TYPE_VIDEO (CODEC_TYPE_VIDEO) +++#endif +++ ++ #include "dlna_internals.h" ++ #include "containers.h" ++ +diff --git a/feeds/packages/libs/libdmapsharing/.svn/entries b/feeds/packages/libs/libdmapsharing/.svn/entries +new file mode 100644 +index 0000000..b0e597c +--- /dev/null ++++ b/feeds/packages/libs/libdmapsharing/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdmapsharing ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-14T19:09:19.370103Z ++33191 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++ac44339728ae2e3c88da48772a68c02b ++2012-07-16T12:22:49.702278Z ++32743 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1587 ++ +diff --git a/feeds/packages/libs/libdmapsharing/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdmapsharing/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..55cadfd +--- /dev/null ++++ b/feeds/packages/libs/libdmapsharing/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,66 @@ ++# ++# 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.15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.flyn.org/projects/libdmapsharing/ ++PKG_MD5SUM:=52c9e4d3de931d9013eeaccf7371bb2d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION) ++ ++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 +gstreamer +gst-plugins-base +libgstapp ++ TITLE:=libdmapsharing ++ URL:=http://www.flyn.org/projects/libdmapsharing/ ++ MAINTAINER:=W. Michael Petullo ++endef ++ ++define Package/libdmapsharing/decription ++ Libdmapsharing is a DMAP library implementation in C ++endef ++ ++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/feeds/packages/libs/libdmapsharing/Makefile b/feeds/packages/libs/libdmapsharing/Makefile +new file mode 100644 +index 0000000..55cadfd +--- /dev/null ++++ b/feeds/packages/libs/libdmapsharing/Makefile +@@ -0,0 +1,66 @@ ++# ++# 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.15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.flyn.org/projects/libdmapsharing/ ++PKG_MD5SUM:=52c9e4d3de931d9013eeaccf7371bb2d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION) ++ ++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 +gstreamer +gst-plugins-base +libgstapp ++ TITLE:=libdmapsharing ++ URL:=http://www.flyn.org/projects/libdmapsharing/ ++ MAINTAINER:=W. Michael Petullo ++endef ++ ++define Package/libdmapsharing/decription ++ Libdmapsharing is a DMAP library implementation in C ++endef ++ ++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/feeds/packages/libs/libdmapsharing/patches/.svn/entries b/feeds/packages/libs/libdmapsharing/patches/.svn/entries +new file mode 100644 +index 0000000..6d4f4f9 +--- /dev/null ++++ b/feeds/packages/libs/libdmapsharing/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdmapsharing/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-14T19:09:19.370103Z ++33191 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-diable_pixbuf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f8e3e468208e9b716252794deec213fd ++2012-08-14T19:09:19.370103Z ++33191 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++847 ++ +diff --git a/feeds/packages/libs/libdmapsharing/patches/.svn/text-base/001-diable_pixbuf.patch.svn-base b/feeds/packages/libs/libdmapsharing/patches/.svn/text-base/001-diable_pixbuf.patch.svn-base +new file mode 100644 +index 0000000..663dd49 +--- /dev/null ++++ b/feeds/packages/libs/libdmapsharing/patches/.svn/text-base/001-diable_pixbuf.patch.svn-base +@@ -0,0 +1,24 @@ ++Index: libdmapsharing-2.9.15/configure.ac ++=================================================================== ++--- libdmapsharing-2.9.15.orig/configure.ac 2012-08-14 21:02:31.861158482 +0200 +++++ libdmapsharing-2.9.15/configure.ac 2012-08-14 21:03:42.448658906 +0200 ++@@ -112,18 +112,7 @@ ++ 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/feeds/packages/libs/libdmapsharing/patches/001-diable_pixbuf.patch b/feeds/packages/libs/libdmapsharing/patches/001-diable_pixbuf.patch +new file mode 100644 +index 0000000..663dd49 +--- /dev/null ++++ b/feeds/packages/libs/libdmapsharing/patches/001-diable_pixbuf.patch +@@ -0,0 +1,24 @@ ++Index: libdmapsharing-2.9.15/configure.ac ++=================================================================== ++--- libdmapsharing-2.9.15.orig/configure.ac 2012-08-14 21:02:31.861158482 +0200 +++++ libdmapsharing-2.9.15/configure.ac 2012-08-14 21:03:42.448658906 +0200 ++@@ -112,18 +112,7 @@ ++ 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/feeds/packages/libs/libdnet/.svn/entries b/feeds/packages/libs/libdnet/.svn/entries +new file mode 100644 +index 0000000..2a4643e +--- /dev/null ++++ b/feeds/packages/libs/libdnet/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdnet ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d6cfab57e5ca8bb251279ab5a2f1041a ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2976 ++ +diff --git a/feeds/packages/libs/libdnet/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libdnet/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libdnet/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdnet/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d1e7f63 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,144 @@ ++# ++# 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:=libdnet ++PKG_VERSION:=1.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_CONFIG_DEPENDS:=\ ++ CONFIG_PACKAGE_libdnet \ ++ CONFIG_PACKAGE_pydnet ++ ++PKG_BUILD_DEPENDS:=PACKAGE_pydnet:python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/libdnet/Default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Low-level network library ++ URL:=http://sourceforge.net/projects/libdnet/ ++endef ++ ++define Package/libdnet/Default/description ++ libdnet is a library of simplified, portable interface to several ++ low-level networking routines. ++endef ++ ++define Package/libdnet ++ $(call Package/libdnet/Default) ++endef ++ ++define Package/libdnet/description ++ $(call Package/libdnet/Default/description) ++endef ++ ++define Package/pydnet ++ $(call Package/libdnet/Default) ++ DEPENDS:=libdnet +python-mini ++endef ++ ++define Package/pydnet/description ++ $(call Package/libdnet/Default/description) ++ This package contains the python dnet library. ++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/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ ln -sf config/acinclude.m4 . ; \ ++ autoreconf -v --install || exit 1 \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ $(if $(CONFIG_PACKAGE_pydnet), \ ++ $(call Build/Compile/PyMod, \ ++ python/, \ ++ build \ ++ ) \ ++ ) ++endef ++ ++define Build/Install ++ $(call Build/Install/Default) ++ $(if $(CONFIG_PACKAGE_pydnet), \ ++ $(call Build/Compile/PyMod, \ ++ python/, \ ++ install --no-compile --prefix $(PKG_INSTALL_DIR)/usr \ ++ ) \ ++ ) ++endef ++ ++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 ++ ++define Package/pydnet/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/ ++endef ++ ++ ++$(eval $(call BuildPackage,libdnet)) ++$(eval $(call BuildPackage,pydnet)) +diff --git a/feeds/packages/libs/libdnet/Makefile b/feeds/packages/libs/libdnet/Makefile +new file mode 100644 +index 0000000..d1e7f63 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/Makefile +@@ -0,0 +1,144 @@ ++# ++# 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:=libdnet ++PKG_VERSION:=1.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_CONFIG_DEPENDS:=\ ++ CONFIG_PACKAGE_libdnet \ ++ CONFIG_PACKAGE_pydnet ++ ++PKG_BUILD_DEPENDS:=PACKAGE_pydnet:python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/libdnet/Default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Low-level network library ++ URL:=http://sourceforge.net/projects/libdnet/ ++endef ++ ++define Package/libdnet/Default/description ++ libdnet is a library of simplified, portable interface to several ++ low-level networking routines. ++endef ++ ++define Package/libdnet ++ $(call Package/libdnet/Default) ++endef ++ ++define Package/libdnet/description ++ $(call Package/libdnet/Default/description) ++endef ++ ++define Package/pydnet ++ $(call Package/libdnet/Default) ++ DEPENDS:=libdnet +python-mini ++endef ++ ++define Package/pydnet/description ++ $(call Package/libdnet/Default/description) ++ This package contains the python dnet library. ++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/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ ln -sf config/acinclude.m4 . ; \ ++ autoreconf -v --install || exit 1 \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ $(if $(CONFIG_PACKAGE_pydnet), \ ++ $(call Build/Compile/PyMod, \ ++ python/, \ ++ build \ ++ ) \ ++ ) ++endef ++ ++define Build/Install ++ $(call Build/Install/Default) ++ $(if $(CONFIG_PACKAGE_pydnet), \ ++ $(call Build/Compile/PyMod, \ ++ python/, \ ++ install --no-compile --prefix $(PKG_INSTALL_DIR)/usr \ ++ ) \ ++ ) ++endef ++ ++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 ++ ++define Package/pydnet/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/ ++endef ++ ++ ++$(eval $(call BuildPackage,libdnet)) ++$(eval $(call BuildPackage,pydnet)) +diff --git a/feeds/packages/libs/libdnet/patches/.svn/entries b/feeds/packages/libs/libdnet/patches/.svn/entries +new file mode 100644 +index 0000000..2f1b9d5 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdnet/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-22T00:53:05.723353Z ++24760 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-fix_avr32_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++20e576c17b1d5d42cf6ac89d1c8976a4 ++2009-06-21T11:19:59.829378Z ++16529 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++811 ++ ++001-dnet_config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f0813527509e8c0b596a4e8e9a5a877e ++2009-06-21T11:19:59.829378Z ++16529 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++524 ++ ++010-gcc4.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++2faeb898712f6519e4089f3422a7eeaa ++2009-06-21T11:19:59.829378Z ++16529 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++966 ++ +diff --git a/feeds/packages/libs/libdnet/patches/.svn/prop-base/001-dnet_config.patch.svn-base b/feeds/packages/libs/libdnet/patches/.svn/prop-base/001-dnet_config.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/.svn/prop-base/001-dnet_config.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libdnet/patches/.svn/text-base/001-dnet_config.patch.svn-base b/feeds/packages/libs/libdnet/patches/.svn/text-base/001-dnet_config.patch.svn-base +new file mode 100644 +index 0000000..cde376a +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/.svn/text-base/001-dnet_config.patch.svn-base +@@ -0,0 +1,23 @@ ++--- 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/feeds/packages/libs/libdnet/patches/.svn/text-base/002-fix_avr32_compile.patch.svn-base b/feeds/packages/libs/libdnet/patches/.svn/text-base/002-fix_avr32_compile.patch.svn-base +new file mode 100644 +index 0000000..54223c9 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/.svn/text-base/002-fix_avr32_compile.patch.svn-base +@@ -0,0 +1,20 @@ ++--- 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/feeds/packages/libs/libdnet/patches/.svn/text-base/010-gcc4.patch.svn-base b/feeds/packages/libs/libdnet/patches/.svn/text-base/010-gcc4.patch.svn-base +new file mode 100644 +index 0000000..bfbf822 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/.svn/text-base/010-gcc4.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/python/dnet.c +++++ b/python/dnet.c ++@@ -2726,7 +2726,7 @@ static PyObject *__pyx_f_4dnet_15__addr_ ++ PyObject *__pyx_3 = 0; ++ unsigned short __pyx_4; ++ Py_INCREF(__pyx_v_self); ++- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); +++ __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); ++ ++ /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ ++ __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); ++@@ -2738,7 +2738,7 @@ static PyObject *__pyx_f_4dnet_15__addr_ ++ Py_DECREF(__pyx_2); __pyx_2 = 0; ++ if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} ++ Py_DECREF(((PyObject *)__pyx_v_next)); ++- ((PyObject *)__pyx_v_next) = __pyx_3; +++ __pyx_v_next = __pyx_3; ++ __pyx_3 = 0; ++ ++ /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ +diff --git a/feeds/packages/libs/libdnet/patches/001-dnet_config.patch b/feeds/packages/libs/libdnet/patches/001-dnet_config.patch +new file mode 100644 +index 0000000..cde376a +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/001-dnet_config.patch +@@ -0,0 +1,23 @@ ++--- 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/feeds/packages/libs/libdnet/patches/002-fix_avr32_compile.patch b/feeds/packages/libs/libdnet/patches/002-fix_avr32_compile.patch +new file mode 100644 +index 0000000..54223c9 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/002-fix_avr32_compile.patch +@@ -0,0 +1,20 @@ ++--- 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/feeds/packages/libs/libdnet/patches/010-gcc4.patch b/feeds/packages/libs/libdnet/patches/010-gcc4.patch +new file mode 100644 +index 0000000..bfbf822 +--- /dev/null ++++ b/feeds/packages/libs/libdnet/patches/010-gcc4.patch +@@ -0,0 +1,20 @@ ++--- a/python/dnet.c +++++ b/python/dnet.c ++@@ -2726,7 +2726,7 @@ static PyObject *__pyx_f_4dnet_15__addr_ ++ PyObject *__pyx_3 = 0; ++ unsigned short __pyx_4; ++ Py_INCREF(__pyx_v_self); ++- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); +++ __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); ++ ++ /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ ++ __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); ++@@ -2738,7 +2738,7 @@ static PyObject *__pyx_f_4dnet_15__addr_ ++ Py_DECREF(__pyx_2); __pyx_2 = 0; ++ if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} ++ Py_DECREF(((PyObject *)__pyx_v_next)); ++- ((PyObject *)__pyx_v_next) = __pyx_3; +++ __pyx_v_next = __pyx_3; ++ __pyx_3 = 0; ++ ++ /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ +diff --git a/feeds/packages/libs/libdvbpsi/.svn/dir-prop-base b/feeds/packages/libs/libdvbpsi/.svn/dir-prop-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/libs/libdvbpsi/.svn/entries b/feeds/packages/libs/libdvbpsi/.svn/entries +new file mode 100644 +index 0000000..37e9943 +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdvbpsi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++0e18848b9e40de028222c9bb6e8053de ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1283 ++ +diff --git a/feeds/packages/libs/libdvbpsi/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libdvbpsi/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libdvbpsi/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdvbpsi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2dd1d23 +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=libdvbpsi5 ++PKG_VERSION:=0.1.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/ ++PKG_MD5SUM:=bd2d9861be3311e1e03c91cd9345f542 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libdvbpsi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=MPEG TS and DVB PSI tables decoding and generating ++ URL:=http://www.videolan.org/developers/libdvbpsi.html ++endef ++ ++define Package/libdvbpsi/description ++ libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables ++ decoding and generating. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/dvbpsi ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/dvbpsi/*.h \ ++ $(1)/usr/include/dvbpsi/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,a,la} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libdvbpsi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libdvbpsi)) +diff --git a/feeds/packages/libs/libdvbpsi/Makefile b/feeds/packages/libs/libdvbpsi/Makefile +new file mode 100644 +index 0000000..2dd1d23 +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=libdvbpsi5 ++PKG_VERSION:=0.1.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/ ++PKG_MD5SUM:=bd2d9861be3311e1e03c91cd9345f542 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libdvbpsi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=MPEG TS and DVB PSI tables decoding and generating ++ URL:=http://www.videolan.org/developers/libdvbpsi.html ++endef ++ ++define Package/libdvbpsi/description ++ libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables ++ decoding and generating. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/dvbpsi ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/dvbpsi/*.h \ ++ $(1)/usr/include/dvbpsi/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,a,la} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libdvbpsi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libdvbpsi)) +diff --git a/feeds/packages/libs/libdvbpsi/patches/.svn/entries b/feeds/packages/libs/libdvbpsi/patches/.svn/entries +new file mode 100644 +index 0000000..dc840a5 +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdvbpsi/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-21T14:31:10.156982Z ++16533 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_doc_examples.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++19ec8c746685c3ed860f56d2e1072e31 ++2009-06-21T14:31:10.156982Z ++16533 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++691 ++ +diff --git a/feeds/packages/libs/libdvbpsi/patches/.svn/text-base/001-no_doc_examples.patch.svn-base b/feeds/packages/libs/libdvbpsi/patches/.svn/text-base/001-no_doc_examples.patch.svn-base +new file mode 100644 +index 0000000..a32f5da +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/patches/.svn/text-base/001-no_doc_examples.patch.svn-base +@@ -0,0 +1,25 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ ## Process this file with automake to produce Makefile.in ++ ++-SUBDIRS = src examples misc ++-DIST_SUBDIRS = $(SUBDIRS) doc debian wince +++SUBDIRS = src +++DIST_SUBDIRS = $(SUBDIRS) debian wince ++ ++ EXTRA_DIST = libdvbpsi.spec bootstrap ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -179,8 +179,8 @@ target_alias = @target_alias@ ++ target_cpu = @target_cpu@ ++ target_os = @target_os@ ++ target_vendor = @target_vendor@ ++-SUBDIRS = src examples misc ++-DIST_SUBDIRS = $(SUBDIRS) doc debian wince +++SUBDIRS = src +++DIST_SUBDIRS = $(SUBDIRS) debian wince ++ EXTRA_DIST = libdvbpsi.spec bootstrap ++ AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects ++ all: config.h +diff --git a/feeds/packages/libs/libdvbpsi/patches/001-no_doc_examples.patch b/feeds/packages/libs/libdvbpsi/patches/001-no_doc_examples.patch +new file mode 100644 +index 0000000..a32f5da +--- /dev/null ++++ b/feeds/packages/libs/libdvbpsi/patches/001-no_doc_examples.patch +@@ -0,0 +1,25 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ ## Process this file with automake to produce Makefile.in ++ ++-SUBDIRS = src examples misc ++-DIST_SUBDIRS = $(SUBDIRS) doc debian wince +++SUBDIRS = src +++DIST_SUBDIRS = $(SUBDIRS) debian wince ++ ++ EXTRA_DIST = libdvbpsi.spec bootstrap ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -179,8 +179,8 @@ target_alias = @target_alias@ ++ target_cpu = @target_cpu@ ++ target_os = @target_os@ ++ target_vendor = @target_vendor@ ++-SUBDIRS = src examples misc ++-DIST_SUBDIRS = $(SUBDIRS) doc debian wince +++SUBDIRS = src +++DIST_SUBDIRS = $(SUBDIRS) debian wince ++ EXTRA_DIST = libdvbpsi.spec bootstrap ++ AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects ++ all: config.h +diff --git a/feeds/packages/libs/libdvdread/.svn/entries b/feeds/packages/libs/libdvdread/.svn/entries +new file mode 100644 +index 0000000..f3b9373 +--- /dev/null ++++ b/feeds/packages/libs/libdvdread/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libdvdread ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5a48a45a14108cfa4dd5d7a403a7572c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1637 ++ +diff --git a/feeds/packages/libs/libdvdread/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libdvdread/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..70f29e1 +--- /dev/null ++++ b/feeds/packages/libs/libdvdread/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# 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:=libdvdread ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.dtek.chalmers.se/~dvd/dist ++PKG_MD5SUM:=078788c9241ae16763529e1235502337 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdvdread ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=simple foundation for reading DVD video disks. ++ URL:=http://www.dtek.chalmers.se/~dvd/downloads.shtml ++endef ++ ++define Package/libdvdread/description ++ libdvdread provides a simple foundation for reading DVD video disks. ++ It provides the functionality that is required to access many DVDs. ++ It parses IFO files, reads NAV-blocks, and performs CSS ++ authentication and descrambling. ++endef ++ ++TARGET_CFLAGS += \ ++ -ffunction-sections -fdata-sections ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static ++# --with-build-cc="$(HOSTCC)" ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/dvdread ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/dvdread/*.h \ ++ $(1)/usr/include/dvdread ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvdread.{a,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libdvdread/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvdread.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libdvdread)) +diff --git a/feeds/packages/libs/libdvdread/Makefile b/feeds/packages/libs/libdvdread/Makefile +new file mode 100644 +index 0000000..70f29e1 +--- /dev/null ++++ b/feeds/packages/libs/libdvdread/Makefile +@@ -0,0 +1,65 @@ ++# ++# 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:=libdvdread ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.dtek.chalmers.se/~dvd/dist ++PKG_MD5SUM:=078788c9241ae16763529e1235502337 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libdvdread ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=simple foundation for reading DVD video disks. ++ URL:=http://www.dtek.chalmers.se/~dvd/downloads.shtml ++endef ++ ++define Package/libdvdread/description ++ libdvdread provides a simple foundation for reading DVD video disks. ++ It provides the functionality that is required to access many DVDs. ++ It parses IFO files, reads NAV-blocks, and performs CSS ++ authentication and descrambling. ++endef ++ ++TARGET_CFLAGS += \ ++ -ffunction-sections -fdata-sections ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static ++# --with-build-cc="$(HOSTCC)" ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/dvdread ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/dvdread/*.h \ ++ $(1)/usr/include/dvdread ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvdread.{a,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libdvdread/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvdread.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libdvdread)) +diff --git a/feeds/packages/libs/libevent/.svn/entries b/feeds/packages/libs/libevent/.svn/entries +new file mode 100644 +index 0000000..ed6c914 +--- /dev/null ++++ b/feeds/packages/libs/libevent/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libevent ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-30T15:40:18.472794Z ++32918 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++e4b947ba43275852082ac91b8cfdba45 ++2012-07-30T15:40:18.472794Z ++32918 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1756 ++ +diff --git a/feeds/packages/libs/libevent/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libevent/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libevent/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libevent/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libevent/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..781b87c +--- /dev/null ++++ b/feeds/packages/libs/libevent/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,66 @@ ++# ++# 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:=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:=http://www.monkey.org/~provos/ ++PKG_MD5SUM:=a00e037e4d3f9e4fe9893e8a2d27918c ++ ++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 ++ DEPENDS:=+librt ++ URL:=http://www.monkey.org/~provos/libevent/ ++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/feeds/packages/libs/libevent/Makefile b/feeds/packages/libs/libevent/Makefile +new file mode 100644 +index 0000000..781b87c +--- /dev/null ++++ b/feeds/packages/libs/libevent/Makefile +@@ -0,0 +1,66 @@ ++# ++# 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:=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:=http://www.monkey.org/~provos/ ++PKG_MD5SUM:=a00e037e4d3f9e4fe9893e8a2d27918c ++ ++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 ++ DEPENDS:=+librt ++ URL:=http://www.monkey.org/~provos/libevent/ ++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/feeds/packages/libs/libexif/.svn/entries b/feeds/packages/libs/libexif/.svn/entries +new file mode 100644 +index 0000000..927ae4a +--- /dev/null ++++ b/feeds/packages/libs/libexif/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libexif ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++116e31e493a452b28940a0485c38bcc2 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1476 ++ +diff --git a/feeds/packages/libs/libexif/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libexif/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libexif/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libexif/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libexif/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a040f70 +--- /dev/null ++++ b/feeds/packages/libs/libexif/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=libexif ++PKG_VERSION:=0.6.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/libexif ++PKG_MD5SUM:=56144a030a4c875c600b1ccf713f69f7 ++ ++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/ ++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/feeds/packages/libs/libexif/Makefile b/feeds/packages/libs/libexif/Makefile +new file mode 100644 +index 0000000..a040f70 +--- /dev/null ++++ b/feeds/packages/libs/libexif/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=libexif ++PKG_VERSION:=0.6.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/libexif ++PKG_MD5SUM:=56144a030a4c875c600b1ccf713f69f7 ++ ++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/ ++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/feeds/packages/libs/libexif/patches/.svn/entries b/feeds/packages/libs/libexif/patches/.svn/entries +new file mode 100644 +index 0000000..c3b21f8 +--- /dev/null ++++ b/feeds/packages/libs/libexif/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libexif/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-19T07:28:33.922906Z ++21021 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-no_doc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2223824f72471f9b4f3c8ade57a8703b ++2010-04-19T07:28:33.922906Z ++21021 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++437 ++ +diff --git a/feeds/packages/libs/libexif/patches/.svn/prop-base/100-no_doc.patch.svn-base b/feeds/packages/libs/libexif/patches/.svn/prop-base/100-no_doc.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libexif/patches/.svn/prop-base/100-no_doc.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libexif/patches/.svn/text-base/100-no_doc.patch.svn-base b/feeds/packages/libs/libexif/patches/.svn/text-base/100-no_doc.patch.svn-base +new file mode 100644 +index 0000000..5ca00ce +--- /dev/null ++++ b/feeds/packages/libs/libexif/patches/.svn/text-base/100-no_doc.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -280,7 +280,7 @@ target_alias = @target_alias@ ++ 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 ++ @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt ++ EXTRA_DIST = @PACKAGE_TARNAME@.spec $(README_W32_XDIST) libexif.pc.in \ ++ libexif-uninstalled.pc.in +diff --git a/feeds/packages/libs/libexif/patches/100-no_doc.patch b/feeds/packages/libs/libexif/patches/100-no_doc.patch +new file mode 100644 +index 0000000..5ca00ce +--- /dev/null ++++ b/feeds/packages/libs/libexif/patches/100-no_doc.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -280,7 +280,7 @@ target_alias = @target_alias@ ++ 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 ++ @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt ++ EXTRA_DIST = @PACKAGE_TARNAME@.spec $(README_W32_XDIST) libexif.pc.in \ ++ libexif-uninstalled.pc.in +diff --git a/feeds/packages/libs/libffi/.svn/entries b/feeds/packages/libs/libffi/.svn/entries +new file mode 100644 +index 0000000..cdaa01e +--- /dev/null ++++ b/feeds/packages/libs/libffi/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libffi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:57.093540Z ++34489 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++c870598abc2fc2f285110a3a3ef592ba ++2012-12-04T16:20:57.093540Z ++34489 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2068 ++ +diff --git a/feeds/packages/libs/libffi/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libffi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e3b2839 +--- /dev/null ++++ b/feeds/packages/libs/libffi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,79 @@ ++# ++# 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.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/ ++PKG_MD5SUM:=f69b9693227d976835b4857b1ba7d0e3 ++ ++PKG_LICENSE:=MIT ++PKG_LICENSE_FILES:=LICENSE ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++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/ ++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/feeds/packages/libs/libffi/Makefile b/feeds/packages/libs/libffi/Makefile +new file mode 100644 +index 0000000..e3b2839 +--- /dev/null ++++ b/feeds/packages/libs/libffi/Makefile +@@ -0,0 +1,79 @@ ++# ++# 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.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/ ++PKG_MD5SUM:=f69b9693227d976835b4857b1ba7d0e3 ++ ++PKG_LICENSE:=MIT ++PKG_LICENSE_FILES:=LICENSE ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++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/ ++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/feeds/packages/libs/libfreecwmp/.svn/entries b/feeds/packages/libs/libfreecwmp/.svn/entries +new file mode 100644 +index 0000000..ad5ffd2 +--- /dev/null ++++ b/feeds/packages/libs/libfreecwmp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libfreecwmp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T16:22:01.626269Z ++35667 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++52453f2ca9780af4e386ece1b2903605 ++2013-02-18T16:22:01.626269Z ++35667 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1121 ++ +diff --git a/feeds/packages/libs/libfreecwmp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libfreecwmp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..626121b +--- /dev/null ++++ b/feeds/packages/libs/libfreecwmp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=libfreecwmp ++PKG_VERSION:=2013-02-18 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.libfreecwmp.org/libfreecwmp ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=2131f1eaf6fe0a0de57fe45d343903227333d89d ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libfreecwmp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=CWMP library ++ URL:=http://libfreecwmp.org/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libfreecwmp.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreecwmp.{a,so*} $(1)/usr/lib ++endef ++ ++define Package/libfreecwmp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreecwmp.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,libfreecwmp)) +diff --git a/feeds/packages/libs/libfreecwmp/Makefile b/feeds/packages/libs/libfreecwmp/Makefile +new file mode 100644 +index 0000000..626121b +--- /dev/null ++++ b/feeds/packages/libs/libfreecwmp/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=libfreecwmp ++PKG_VERSION:=2013-02-18 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.libfreecwmp.org/libfreecwmp ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=2131f1eaf6fe0a0de57fe45d343903227333d89d ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libfreecwmp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=CWMP library ++ URL:=http://libfreecwmp.org/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libfreecwmp.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreecwmp.{a,so*} $(1)/usr/lib ++endef ++ ++define Package/libfreecwmp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreecwmp.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,libfreecwmp)) +diff --git a/feeds/packages/libs/libfreefare/.svn/entries b/feeds/packages/libs/libfreefare/.svn/entries +new file mode 100644 +index 0000000..1fa9997 +--- /dev/null ++++ b/feeds/packages/libs/libfreefare/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libfreefare ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++20ee2a39ba5ec3b1b7af253dafd10ce6 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2163 ++ +diff --git a/feeds/packages/libs/libfreefare/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libfreefare/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d5bcf2a +--- /dev/null ++++ b/feeds/packages/libs/libfreefare/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,79 @@ ++# ++# 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:=libfreefare ++PKG_VERSION:=0.2.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://nfc-tools.googlecode.com/files ++PKG_MD5SUM:=10af7796c16ec738c1b01501a7f68fae ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libfreefare/Default ++ TITLE:=Library for high level manipulation of MIFARE cards ++ URL:=http://code.google.com/p/nfc-tools/wiki/libfreefare ++endef ++ ++define Package/libfreefare ++$(call Package/libfreefare/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnfc +libopenssl ++endef ++ ++define Package/libfreefare/description ++ The libfreefare project aims to provide a convenient API for MIFARE card ++ manipulations. ++endef ++ ++define Package/libfreefare-examples ++$(call Package/libfreefare/Default) ++ TITLE+= (examples) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libfreefare ++endef ++ ++define Package/libfreefare-examples/description ++ libfreefare is provided with some examples: ++ * mifare-classic-format, mifare-desfire-format: attempt to format Mifare ++ cards; ++ * mifare-classic-write-ndef, mifare-desfire-write-ndef: write NDEF file to ++ Mifare cards; ++ * some mifare-desfire-* examples to made various access to Mifare DESFire. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/freefare.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreefare.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libfreefare.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libfreefare/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreefare.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libfreefare-examples/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/mifare-* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libfreefare)) ++$(eval $(call BuildPackage,libfreefare-examples)) +diff --git a/feeds/packages/libs/libfreefare/Makefile b/feeds/packages/libs/libfreefare/Makefile +new file mode 100644 +index 0000000..d5bcf2a +--- /dev/null ++++ b/feeds/packages/libs/libfreefare/Makefile +@@ -0,0 +1,79 @@ ++# ++# 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:=libfreefare ++PKG_VERSION:=0.2.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://nfc-tools.googlecode.com/files ++PKG_MD5SUM:=10af7796c16ec738c1b01501a7f68fae ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libfreefare/Default ++ TITLE:=Library for high level manipulation of MIFARE cards ++ URL:=http://code.google.com/p/nfc-tools/wiki/libfreefare ++endef ++ ++define Package/libfreefare ++$(call Package/libfreefare/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnfc +libopenssl ++endef ++ ++define Package/libfreefare/description ++ The libfreefare project aims to provide a convenient API for MIFARE card ++ manipulations. ++endef ++ ++define Package/libfreefare-examples ++$(call Package/libfreefare/Default) ++ TITLE+= (examples) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libfreefare ++endef ++ ++define Package/libfreefare-examples/description ++ libfreefare is provided with some examples: ++ * mifare-classic-format, mifare-desfire-format: attempt to format Mifare ++ cards; ++ * mifare-classic-write-ndef, mifare-desfire-write-ndef: write NDEF file to ++ Mifare cards; ++ * some mifare-desfire-* examples to made various access to Mifare DESFire. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/freefare.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreefare.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libfreefare.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libfreefare/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreefare.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libfreefare-examples/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/mifare-* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libfreefare)) ++$(eval $(call BuildPackage,libfreefare-examples)) +diff --git a/feeds/packages/libs/libfreenect/.svn/entries b/feeds/packages/libs/libfreenect/.svn/entries +new file mode 100644 +index 0000000..f67f940 +--- /dev/null ++++ b/feeds/packages/libs/libfreenect/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libfreenect ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-16T18:08:19.551511Z ++30593 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++1ace6e13addc3649ad7fceb08ce19e4c ++2012-02-16T18:08:19.551511Z ++30593 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1125 ++ +diff --git a/feeds/packages/libs/libfreenect/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libfreenect/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f5b6bc +--- /dev/null ++++ b/feeds/packages/libs/libfreenect/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# Copyright (C) 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:=libfreenect ++PKG_VERSION:=2012-01-29 ++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/OpenKinect/libfreenect.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=bbc109a589a1dd2c229f8bc98536dbc184dd73f9 ++PKG_MIRROR_MD5SUM:=08f8cb77dd8b9bce21fc7440f62110e7 ++CMAKE_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++define Package/libfreenect ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Xbox Kinect library ++ DEPENDS:=+libusb-1.0 ++endef ++ ++CMAKE_OPTIONS += -DBUILD_EXAMPLES="OFF" ++TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include ++ ++define Package/libfreenect/description ++ Drivers and libraries for the Xbox Kinect device ++endef ++ ++define Package/libfreenect/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreenect.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libfreenect)) +diff --git a/feeds/packages/libs/libfreenect/Makefile b/feeds/packages/libs/libfreenect/Makefile +new file mode 100644 +index 0000000..0f5b6bc +--- /dev/null ++++ b/feeds/packages/libs/libfreenect/Makefile +@@ -0,0 +1,44 @@ ++# ++# Copyright (C) 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:=libfreenect ++PKG_VERSION:=2012-01-29 ++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/OpenKinect/libfreenect.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=bbc109a589a1dd2c229f8bc98536dbc184dd73f9 ++PKG_MIRROR_MD5SUM:=08f8cb77dd8b9bce21fc7440f62110e7 ++CMAKE_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++define Package/libfreenect ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Xbox Kinect library ++ DEPENDS:=+libusb-1.0 ++endef ++ ++CMAKE_OPTIONS += -DBUILD_EXAMPLES="OFF" ++TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include ++ ++define Package/libfreenect/description ++ Drivers and libraries for the Xbox Kinect device ++endef ++ ++define Package/libfreenect/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreenect.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libfreenect)) +diff --git a/feeds/packages/libs/libftdi/.svn/entries b/feeds/packages/libs/libftdi/.svn/entries +new file mode 100644 +index 0000000..04c2463 +--- /dev/null ++++ b/feeds/packages/libs/libftdi/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libftdi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++b622068e365c19c39834c7610b973644 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1411 ++ +diff --git a/feeds/packages/libs/libftdi/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libftdi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7b9d0fb +--- /dev/null ++++ b/feeds/packages/libs/libftdi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=libftdi ++PKG_VERSION:=0.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ ++PKG_MD5SUM:=e6e25f33b4327b1b7aa1156947da45f3 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.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/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi.so* $(1)/usr/lib/ ++endef ++ ++define Package/libftdi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libftdi)) +diff --git a/feeds/packages/libs/libftdi/Makefile b/feeds/packages/libs/libftdi/Makefile +new file mode 100644 +index 0000000..7b9d0fb +--- /dev/null ++++ b/feeds/packages/libs/libftdi/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=libftdi ++PKG_VERSION:=0.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ ++PKG_MD5SUM:=e6e25f33b4327b1b7aa1156947da45f3 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.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/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi.so* $(1)/usr/lib/ ++endef ++ ++define Package/libftdi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libftdi.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libftdi)) +diff --git a/feeds/packages/libs/libgcrypt/.svn/entries b/feeds/packages/libs/libgcrypt/.svn/entries +new file mode 100644 +index 0000000..d54851a +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgcrypt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:58:11.905254Z ++32215 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++ea34c32c3619161a19b4b7bdc8576690 ++2012-06-11T21:58:11.905254Z ++32215 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2411 ++ +diff --git a/feeds/packages/libs/libgcrypt/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libgcrypt/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d93d84 +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2005-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libgcrypt/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libgcrypt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..181cb92 +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt ++PKG_MD5SUM:=693f9c64d50c908bc4d6e01da3ff76d8 ++ ++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 ++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" \ ++ --enable-digests="md5 rmd160 sha1 sha256 sha512" \ ++ --enable-ciphers="arcfour des aes cast5" \ ++ --enable-pubkey-ciphers="rsa dsa" ++ ++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/feeds/packages/libs/libgcrypt/Makefile b/feeds/packages/libs/libgcrypt/Makefile +new file mode 100644 +index 0000000..181cb92 +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt ++PKG_MD5SUM:=693f9c64d50c908bc4d6e01da3ff76d8 ++ ++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 ++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" \ ++ --enable-digests="md5 rmd160 sha1 sha256 sha512" \ ++ --enable-ciphers="arcfour des aes cast5" \ ++ --enable-pubkey-ciphers="rsa dsa" ++ ++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/feeds/packages/libs/libgcrypt/patches/.svn/entries b/feeds/packages/libs/libgcrypt/patches/.svn/entries +new file mode 100644 +index 0000000..53f7ac9 +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgcrypt/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-17T18:06:47.820266Z ++27659 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++6413cc4307ba20a5cbb36fe928e7836e ++2011-07-17T18:06:47.820266Z ++27659 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++994 ++ +diff --git a/feeds/packages/libs/libgcrypt/patches/.svn/text-base/001-no_docs_tests.patch.svn-base b/feeds/packages/libs/libgcrypt/patches/.svn/text-base/001-no_docs_tests.patch.svn-base +new file mode 100644 +index 0000000..cc184e4 +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/patches/.svn/text-base/001-no_docs_tests.patch.svn-base +@@ -0,0 +1,26 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 ++ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ ++ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia ++ ++-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 README.SVN ++ DISTCLEANFILES = ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -281,8 +281,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 ++ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ ++ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia ++ ++-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 README.SVN ++ DISTCLEANFILES = ++ all: config.h +diff --git a/feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch b/feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch +new file mode 100644 +index 0000000..cc184e4 +--- /dev/null ++++ b/feeds/packages/libs/libgcrypt/patches/001-no_docs_tests.patch +@@ -0,0 +1,26 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 ++ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ ++ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia ++ ++-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 README.SVN ++ DISTCLEANFILES = ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -281,8 +281,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 ++ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ ++ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia ++ ++-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 README.SVN ++ DISTCLEANFILES = ++ all: config.h +diff --git a/feeds/packages/libs/libgee/.svn/entries b/feeds/packages/libs/libgee/.svn/entries +new file mode 100644 +index 0000000..92fd92b +--- /dev/null ++++ b/feeds/packages/libs/libgee/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgee ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:21.513614Z ++34515 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++e15e10a6b3b6940e5ce628fad0dfb74d ++2012-12-05T17:31:21.513614Z ++34515 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1611 ++ +diff --git a/feeds/packages/libs/libgee/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libgee/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..afcd249 +--- /dev/null ++++ b/feeds/packages/libs/libgee/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,74 @@ ++# ++# 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:=libgee ++PKG_VERSION:=0.6.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/libgee/0.6/ ++PKG_MD5SUM:=a32bf498cf33d5e3417823a7b252ad22 ++ ++PKG_BUILD_DEPENDS:=vala/host glib2 ++ ++TARGET_LDFLAGS+=\ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libgee ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=GObject based collection library ++ URL:=http://live.gnome.org/Libgee ++ DEPENDS:=+glib2 ++endef ++ ++define Package/libgee/description ++libgee is a collection library providing GObject-based interfaces and classes ++for commonly used data structures. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/gee-1.0} ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libgee.{so*,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ ++ $(1)/usr/lib/pkgconfig/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/gee-1.0/gee.h \ ++ $(1)/usr/include/gee-1.0/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/vala/vapi ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/vala/vapi/gee-1.0.vapi \ ++ $(1)/usr/share/vala/vapi ++endef ++ ++define Package/libgee/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libgee.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libgee)) +diff --git a/feeds/packages/libs/libgee/Makefile b/feeds/packages/libs/libgee/Makefile +new file mode 100644 +index 0000000..afcd249 +--- /dev/null ++++ b/feeds/packages/libs/libgee/Makefile +@@ -0,0 +1,74 @@ ++# ++# 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:=libgee ++PKG_VERSION:=0.6.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/libgee/0.6/ ++PKG_MD5SUM:=a32bf498cf33d5e3417823a7b252ad22 ++ ++PKG_BUILD_DEPENDS:=vala/host glib2 ++ ++TARGET_LDFLAGS+=\ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libgee ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=GObject based collection library ++ URL:=http://live.gnome.org/Libgee ++ DEPENDS:=+glib2 ++endef ++ ++define Package/libgee/description ++libgee is a collection library providing GObject-based interfaces and classes ++for commonly used data structures. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/gee-1.0} ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libgee.{so*,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ ++ $(1)/usr/lib/pkgconfig/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/gee-1.0/gee.h \ ++ $(1)/usr/include/gee-1.0/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/vala/vapi ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/vala/vapi/gee-1.0.vapi \ ++ $(1)/usr/share/vala/vapi ++endef ++ ++define Package/libgee/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libgee.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libgee)) +diff --git a/feeds/packages/libs/libgpg-error/.svn/entries b/feeds/packages/libs/libgpg-error/.svn/entries +new file mode 100644 +index 0000000..5651e8c +--- /dev/null ++++ b/feeds/packages/libs/libgpg-error/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgpg-error ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++a454e7603e13e500deed92ab5bc39440 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1968 ++ +diff --git a/feeds/packages/libs/libgpg-error/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libgpg-error/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d93d84 +--- /dev/null ++++ b/feeds/packages/libs/libgpg-error/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2005-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libgpg-error/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libgpg-error/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1d10430 +--- /dev/null ++++ b/feeds/packages/libs/libgpg-error/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,79 @@ ++# ++# 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.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error ++PKG_MD5SUM:=521b98aa9395e7eaf0ef2236233a0796 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_FIXUP:=autoreconf ++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/ ++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/feeds/packages/libs/libgpg-error/Makefile b/feeds/packages/libs/libgpg-error/Makefile +new file mode 100644 +index 0000000..1d10430 +--- /dev/null ++++ b/feeds/packages/libs/libgpg-error/Makefile +@@ -0,0 +1,79 @@ ++# ++# 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.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error ++PKG_MD5SUM:=521b98aa9395e7eaf0ef2236233a0796 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_FIXUP:=autoreconf ++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/ ++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/feeds/packages/libs/libgphoto2/.svn/entries b/feeds/packages/libs/libgphoto2/.svn/entries +new file mode 100644 +index 0000000..7434bc1 +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgphoto2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T01:57:13.444878Z ++32261 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++45eb0f11eedeff9d48045698d95a355a ++2012-06-12T01:57:13.444878Z ++32261 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2968 ++ +diff --git a/feeds/packages/libs/libgphoto2/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libgphoto2/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libgphoto2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libgphoto2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cc45ece +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,103 @@ ++# ++# 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:=libgphoto2 ++PKG_VERSION:=2.4.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/gphoto ++PKG_MD5SUM:=735c50ebb15cb8be61bac400ee4afb1e ++ ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=. libgphoto2_port ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libgphoto2/Default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=http://www.gphoto.org/ ++endef ++ ++define Package/libgphoto2 ++ $(call Package/libgphoto2/Default) ++ DEPENDS:=+libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS) ++ TITLE:=The basic library of the gphoto2 program. ++ MENU:=1 ++endef ++ ++define Package/libgphoto2-drivers ++ $(call Package/libgphoto2/Default) ++ DEPENDS:=libgphoto2 +libusb-1.0 +libgd ++ TITLE:=Gphoto2 drivers for various cameras ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-rpath \ ++ --with-drivers=all \ ++ --without-included-ltdl \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++CONFIGURE_VARS += \ ++ CPPFLAGS="$$$$CPPFLAGS $(ICONV_CFLAGS)" \ ++ LDFLAGS="$$$$LDFLAGS $(ICONV_LDFLAGS)" \ ++ LIBEXIF_CFLAGS="$$$$CPPFLAGS" \ ++ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ ++ LIBUSB_CFLAGS="$$$$CPPFLAGS" \ ++ LIBUSB_LIBS="$$$$LDFLAGS -lusb" \ ++ LIBS="-lltdl" \ ++ ++# If OpenWrt is using the iconv stub, we disable iconv support ++# in libgphoto2 entirely since the stub lacks some essential ++# conversions like UCS-2 to UTF-8 which will let certain drivers ++# fail with "Failed to create iconv converter" . ++ifneq ($(ICONV_FULL),1) ++ CONFIGURE_VARS += am_cv_func_iconv=no am_cv_lib_iconv=no ++endif ++ ++MAKE_FLAGS += \ ++ LIBLTDL="" \ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gphoto2{,-port}-config $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gphoto2 $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgphoto2.pc $(1)/usr/lib/pkgconfig/ ++ $(SED) 's,-I$$$${prefix}/include/gphoto2,,g' $(1)/usr/bin/gphoto2{,-port}-config ++ $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/gphoto2{,-port}-config ++ # remove annoying recursive symlink ++ rm -f $(1)/usr/include/gphoto2/gphoto2 ++endef ++ ++define Package/libgphoto2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libgphoto2-drivers/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port} $(1)/usr/lib/ ++ rm -rf $(1)/usr/lib/libgphoto2{,_port}/*/*.{,l}a ++ rm -f $(1)/usr/lib/libgphoto2_port/*/usb.so ++endef ++ ++$(eval $(call BuildPackage,libgphoto2)) ++$(eval $(call BuildPackage,libgphoto2-drivers)) +diff --git a/feeds/packages/libs/libgphoto2/Makefile b/feeds/packages/libs/libgphoto2/Makefile +new file mode 100644 +index 0000000..cc45ece +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/Makefile +@@ -0,0 +1,103 @@ ++# ++# 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:=libgphoto2 ++PKG_VERSION:=2.4.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/gphoto ++PKG_MD5SUM:=735c50ebb15cb8be61bac400ee4afb1e ++ ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=. libgphoto2_port ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libgphoto2/Default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=http://www.gphoto.org/ ++endef ++ ++define Package/libgphoto2 ++ $(call Package/libgphoto2/Default) ++ DEPENDS:=+libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS) ++ TITLE:=The basic library of the gphoto2 program. ++ MENU:=1 ++endef ++ ++define Package/libgphoto2-drivers ++ $(call Package/libgphoto2/Default) ++ DEPENDS:=libgphoto2 +libusb-1.0 +libgd ++ TITLE:=Gphoto2 drivers for various cameras ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-rpath \ ++ --with-drivers=all \ ++ --without-included-ltdl \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++CONFIGURE_VARS += \ ++ CPPFLAGS="$$$$CPPFLAGS $(ICONV_CFLAGS)" \ ++ LDFLAGS="$$$$LDFLAGS $(ICONV_LDFLAGS)" \ ++ LIBEXIF_CFLAGS="$$$$CPPFLAGS" \ ++ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ ++ LIBUSB_CFLAGS="$$$$CPPFLAGS" \ ++ LIBUSB_LIBS="$$$$LDFLAGS -lusb" \ ++ LIBS="-lltdl" \ ++ ++# If OpenWrt is using the iconv stub, we disable iconv support ++# in libgphoto2 entirely since the stub lacks some essential ++# conversions like UCS-2 to UTF-8 which will let certain drivers ++# fail with "Failed to create iconv converter" . ++ifneq ($(ICONV_FULL),1) ++ CONFIGURE_VARS += am_cv_func_iconv=no am_cv_lib_iconv=no ++endif ++ ++MAKE_FLAGS += \ ++ LIBLTDL="" \ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gphoto2{,-port}-config $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gphoto2 $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgphoto2.pc $(1)/usr/lib/pkgconfig/ ++ $(SED) 's,-I$$$${prefix}/include/gphoto2,,g' $(1)/usr/bin/gphoto2{,-port}-config ++ $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/gphoto2{,-port}-config ++ # remove annoying recursive symlink ++ rm -f $(1)/usr/include/gphoto2/gphoto2 ++endef ++ ++define Package/libgphoto2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libgphoto2-drivers/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port} $(1)/usr/lib/ ++ rm -rf $(1)/usr/lib/libgphoto2{,_port}/*/*.{,l}a ++ rm -f $(1)/usr/lib/libgphoto2_port/*/usb.so ++endef ++ ++$(eval $(call BuildPackage,libgphoto2)) ++$(eval $(call BuildPackage,libgphoto2-drivers)) +diff --git a/feeds/packages/libs/libgphoto2/patches/.svn/entries b/feeds/packages/libs/libgphoto2/patches/.svn/entries +new file mode 100644 +index 0000000..2729f09 +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgphoto2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-05T21:15:58.390780Z ++30323 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++bc19d3b1550ac2f2ef34b5fcc565b198 ++2012-02-05T21:15:58.390780Z ++30323 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1313 ++ ++002-no-tests-docs-examples-translations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++aea9f66e9163865368cb4ca1d53f159a ++2012-02-05T21:15:58.390780Z ++30323 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2805 ++ +diff --git a/feeds/packages/libs/libgphoto2/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libgphoto2/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..60e47c8 +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,53 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl ++ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}]) ++ AM_GNU_GETTEXT_VERSION([0.14.1]) ++ AM_GNU_GETTEXT([external]) ++-AM_PO_SUBDIRS() ++ AM_ICONV() ++ GP_GETTEXT_FLAGS() ++ ++--- a/libgphoto2_port/configure.ac +++++ b/libgphoto2_port/configure.ac ++@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2 ++ ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW" ++ AM_GNU_GETTEXT_VERSION([0.14.1]) ++ AM_GNU_GETTEXT([external]) ++-AM_PO_SUBDIRS() ++ AM_ICONV() ++ GP_GETTEXT_FLAGS() ++ ++--- a/libgphoto2_port/libgphoto2_port/Makefile.in +++++ b/libgphoto2_port/libgphoto2_port/Makefile.in ++@@ -15,6 +15,8 @@ ++ ++ @SET_MAKE@ ++ +++SHELL = @SHELL@ +++ ++ VPATH = @srcdir@ ++ pkgdatadir = $(datadir)/@PACKAGE@ ++ pkgincludedir = $(includedir)/@PACKAGE@ ++--- a/libgphoto2_port/Makefile.in +++++ b/libgphoto2_port/Makefile.in ++@@ -15,7 +15,7 @@ ++ ++ @SET_MAKE@ ++ ++- +++SHELL = @SHELL@ ++ ++ VPATH = @srcdir@ ++ pkgdatadir = $(datadir)/@PACKAGE@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -20,7 +20,7 @@ ++ ######################################################################## ++ # put file lists and special compile rules here ++ ++- +++SHELL = @SHELL@ ++ ++ VPATH = @srcdir@ ++ pkgdatadir = $(datadir)/@PACKAGE@ +diff --git a/feeds/packages/libs/libgphoto2/patches/.svn/text-base/002-no-tests-docs-examples-translations.patch.svn-base b/feeds/packages/libs/libgphoto2/patches/.svn/text-base/002-no-tests-docs-examples-translations.patch.svn-base +new file mode 100644 +index 0000000..702e4cf +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/patches/.svn/text-base/002-no-tests-docs-examples-translations.patch.svn-base +@@ -0,0 +1,86 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -637,20 +637,11 @@ camlibs/konica/localization/Makefile ++ libgphoto2/Makefile ++ libgphoto2.pc ++ libgphoto2-uninstalled.pc ++-examples/Makefile ++-tests/Makefile ++-tests/check-camera-list.sh ++-tests/ddb/Makefile ++-tests/ddb/check-ddb.sh ++ packaging/Makefile ++ packaging/linux-hotplug/Makefile ++ packaging/generic/Makefile ++ packaging/rpm/Makefile ++ packaging/rpm/package.spec ++-po/Makefile.in ++-doc/Makefile ++-doc/Doxyfile ++-doc/api/Makefile ++ ],[ ++ dnl This relies on this code being called for each of the above files ++ dnl with ac_file set to the filename. ++--- a/libgphoto2_port/configure.ac +++++ b/libgphoto2_port/configure.ac ++@@ -485,7 +485,6 @@ AC_SUBST([AM_LDFLAGS]) ++ # --------------------------------------------------------------------------- ++ AC_CONFIG_FILES([ ++ Makefile ++-po/Makefile.in ++ libgphoto2_port/Makefile ++ libgphoto2_port.pc ++ libgphoto2_port-uninstalled.pc ++@@ -497,8 +496,6 @@ usbscsi/Makefile ++ disk/Makefile ++ ptpip/Makefile ++ gphoto2-port-config ++-test/Makefile ++-doc/Makefile ++ m4/Makefile ++ ]) ++ AC_OUTPUT ++--- a/libgphoto2_port/Makefile.am +++++ b/libgphoto2_port/Makefile.am ++@@ -10,7 +10,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L ++ bin_SCRIPTS = gphoto2-port-config ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 +++SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 ++ ++ EXTRA_DIST = \ ++ AUTHORS \ ++--- a/libgphoto2_port/Makefile.in +++++ b/libgphoto2_port/Makefile.in ++@@ -325,7 +325,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L ++ bin_SCRIPTS = gphoto2-port-config ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 +++SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 ++ EXTRA_DIST = AUTHORS ChangeLog COPYING.LIB NEWS README iolib.sym \ ++ gphoto2-port-config.in libgphoto2_port.pc.in \ ++ libgphoto2_port-uninstalled.pc.in \ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config ++ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk README.packaging ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc +++SUBDIRS = @subdirs@ libgphoto2 camlibs packaging ++ ++ EXTRA_DIST += libgphoto2.pc.in ++ pkgconfig_DATA = libgphoto2.pc ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -357,7 +357,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS ++ ChangeLog INSTALL README.in README README.packaging ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc +++SUBDIRS = @subdirs@ libgphoto2 camlibs packaging ++ pkgconfig_DATA = libgphoto2.pc ++ noinst_DATA = libgphoto2-uninstalled.pc ++ doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ +diff --git a/feeds/packages/libs/libgphoto2/patches/001-automake-compat.patch b/feeds/packages/libs/libgphoto2/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..60e47c8 +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/patches/001-automake-compat.patch +@@ -0,0 +1,53 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl ++ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}]) ++ AM_GNU_GETTEXT_VERSION([0.14.1]) ++ AM_GNU_GETTEXT([external]) ++-AM_PO_SUBDIRS() ++ AM_ICONV() ++ GP_GETTEXT_FLAGS() ++ ++--- a/libgphoto2_port/configure.ac +++++ b/libgphoto2_port/configure.ac ++@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2 ++ ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW" ++ AM_GNU_GETTEXT_VERSION([0.14.1]) ++ AM_GNU_GETTEXT([external]) ++-AM_PO_SUBDIRS() ++ AM_ICONV() ++ GP_GETTEXT_FLAGS() ++ ++--- a/libgphoto2_port/libgphoto2_port/Makefile.in +++++ b/libgphoto2_port/libgphoto2_port/Makefile.in ++@@ -15,6 +15,8 @@ ++ ++ @SET_MAKE@ ++ +++SHELL = @SHELL@ +++ ++ VPATH = @srcdir@ ++ pkgdatadir = $(datadir)/@PACKAGE@ ++ pkgincludedir = $(includedir)/@PACKAGE@ ++--- a/libgphoto2_port/Makefile.in +++++ b/libgphoto2_port/Makefile.in ++@@ -15,7 +15,7 @@ ++ ++ @SET_MAKE@ ++ ++- +++SHELL = @SHELL@ ++ ++ VPATH = @srcdir@ ++ pkgdatadir = $(datadir)/@PACKAGE@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -20,7 +20,7 @@ ++ ######################################################################## ++ # put file lists and special compile rules here ++ ++- +++SHELL = @SHELL@ ++ ++ VPATH = @srcdir@ ++ pkgdatadir = $(datadir)/@PACKAGE@ +diff --git a/feeds/packages/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch b/feeds/packages/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch +new file mode 100644 +index 0000000..702e4cf +--- /dev/null ++++ b/feeds/packages/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch +@@ -0,0 +1,86 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -637,20 +637,11 @@ camlibs/konica/localization/Makefile ++ libgphoto2/Makefile ++ libgphoto2.pc ++ libgphoto2-uninstalled.pc ++-examples/Makefile ++-tests/Makefile ++-tests/check-camera-list.sh ++-tests/ddb/Makefile ++-tests/ddb/check-ddb.sh ++ packaging/Makefile ++ packaging/linux-hotplug/Makefile ++ packaging/generic/Makefile ++ packaging/rpm/Makefile ++ packaging/rpm/package.spec ++-po/Makefile.in ++-doc/Makefile ++-doc/Doxyfile ++-doc/api/Makefile ++ ],[ ++ dnl This relies on this code being called for each of the above files ++ dnl with ac_file set to the filename. ++--- a/libgphoto2_port/configure.ac +++++ b/libgphoto2_port/configure.ac ++@@ -485,7 +485,6 @@ AC_SUBST([AM_LDFLAGS]) ++ # --------------------------------------------------------------------------- ++ AC_CONFIG_FILES([ ++ Makefile ++-po/Makefile.in ++ libgphoto2_port/Makefile ++ libgphoto2_port.pc ++ libgphoto2_port-uninstalled.pc ++@@ -497,8 +496,6 @@ usbscsi/Makefile ++ disk/Makefile ++ ptpip/Makefile ++ gphoto2-port-config ++-test/Makefile ++-doc/Makefile ++ m4/Makefile ++ ]) ++ AC_OUTPUT ++--- a/libgphoto2_port/Makefile.am +++++ b/libgphoto2_port/Makefile.am ++@@ -10,7 +10,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L ++ bin_SCRIPTS = gphoto2-port-config ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 +++SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 ++ ++ EXTRA_DIST = \ ++ AUTHORS \ ++--- a/libgphoto2_port/Makefile.in +++++ b/libgphoto2_port/Makefile.in ++@@ -325,7 +325,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L ++ bin_SCRIPTS = gphoto2-port-config ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 +++SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 ++ EXTRA_DIST = AUTHORS ChangeLog COPYING.LIB NEWS README iolib.sym \ ++ gphoto2-port-config.in libgphoto2_port.pc.in \ ++ libgphoto2_port-uninstalled.pc.in \ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config ++ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk README.packaging ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc +++SUBDIRS = @subdirs@ libgphoto2 camlibs packaging ++ ++ EXTRA_DIST += libgphoto2.pc.in ++ pkgconfig_DATA = libgphoto2.pc ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -357,7 +357,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS ++ ChangeLog INSTALL README.in README README.packaging ++ ++ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() ++-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc +++SUBDIRS = @subdirs@ libgphoto2 camlibs packaging ++ pkgconfig_DATA = libgphoto2.pc ++ noinst_DATA = libgphoto2-uninstalled.pc ++ doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ +diff --git a/feeds/packages/libs/libgssapi/.svn/entries b/feeds/packages/libs/libgssapi/.svn/entries +new file mode 100644 +index 0000000..929f412 +--- /dev/null ++++ b/feeds/packages/libs/libgssapi/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libgssapi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2a0b40006c0e2f747f9f684287b88c56 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1350 ++ +diff --git a/feeds/packages/libs/libgssapi/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libgssapi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..01de32d +--- /dev/null ++++ b/feeds/packages/libs/libgssapi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=libgssapi ++PKG_VERSION:=0.11 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/ ++PKG_MD5SUM:=0e5b4c7267724f8ddf64bc35514c272e ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libgssapi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=required libraries for the nfs-utils ++ URL:=http://www.citi.umich.edu/projects/nfsv4/linux ++endef ++ ++define Package/libgssapi/description ++ Support libraries - for newer nfs mount command (nfs4) ++endef ++ ++TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib $(FPIC) ++ ++MAKE_FLAGS += \ ++ OPT="$(TARGET_CFLAGS)" \ ++ INSTALLSUID="install -m 4755" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/gssglue/gssapi ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gssglue/gssapi/gssapi.h $(1)/usr/include/gssglue/gssapi ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgssapi.{a,so*} $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgssapi.pc $(1)/usr/lib/pkgconfig ++endef ++ ++$(eval $(call BuildPackage,libgssapi)) +diff --git a/feeds/packages/libs/libgssapi/Makefile b/feeds/packages/libs/libgssapi/Makefile +new file mode 100644 +index 0000000..01de32d +--- /dev/null ++++ b/feeds/packages/libs/libgssapi/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=libgssapi ++PKG_VERSION:=0.11 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/ ++PKG_MD5SUM:=0e5b4c7267724f8ddf64bc35514c272e ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libgssapi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=required libraries for the nfs-utils ++ URL:=http://www.citi.umich.edu/projects/nfsv4/linux ++endef ++ ++define Package/libgssapi/description ++ Support libraries - for newer nfs mount command (nfs4) ++endef ++ ++TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib $(FPIC) ++ ++MAKE_FLAGS += \ ++ OPT="$(TARGET_CFLAGS)" \ ++ INSTALLSUID="install -m 4755" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/gssglue/gssapi ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gssglue/gssapi/gssapi.h $(1)/usr/include/gssglue/gssapi ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgssapi.{a,so*} $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgssapi.pc $(1)/usr/lib/pkgconfig ++endef ++ ++$(eval $(call BuildPackage,libgssapi)) +diff --git a/feeds/packages/libs/libid3tag/.svn/entries b/feeds/packages/libs/libid3tag/.svn/entries +new file mode 100644 +index 0000000..b44c962 +--- /dev/null ++++ b/feeds/packages/libs/libid3tag/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libid3tag ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-19T17:21:57.840294Z ++35681 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++6704c3cd07839a430983f5183129b8ac ++2013-02-19T17:21:57.840294Z ++35681 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1431 ++ +diff --git a/feeds/packages/libs/libid3tag/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libid3tag/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libid3tag/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libid3tag/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libid3tag/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..df98c31 +--- /dev/null ++++ b/feeds/packages/libs/libid3tag/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# 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:=libid3tag ++PKG_VERSION:=0.15.1b ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/mad ++PKG_MD5SUM:=e5808ad997ba32c498803822078748c3 ++ ++PKG_LICENSE:=GPLv2 ++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/feeds/packages/libs/libid3tag/Makefile b/feeds/packages/libs/libid3tag/Makefile +new file mode 100644 +index 0000000..df98c31 +--- /dev/null ++++ b/feeds/packages/libs/libid3tag/Makefile +@@ -0,0 +1,64 @@ ++# ++# 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:=libid3tag ++PKG_VERSION:=0.15.1b ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/mad ++PKG_MD5SUM:=e5808ad997ba32c498803822078748c3 ++ ++PKG_LICENSE:=GPLv2 ++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/feeds/packages/libs/libidn/.svn/entries b/feeds/packages/libs/libidn/.svn/entries +new file mode 100644 +index 0000000..9a82832 +--- /dev/null ++++ b/feeds/packages/libs/libidn/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libidn ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e4512e7726363ee723a0c59cee5335da ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1357 ++ +diff --git a/feeds/packages/libs/libidn/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libidn/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c23ce70 +--- /dev/null ++++ b/feeds/packages/libs/libidn/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=libidn ++PKG_VERSION:=1.18 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/libidn ++PKG_MD5SUM:=66f115347439f56386f37a3ad92c1da2 ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libidn ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Stringprep, Punycode and IDNA implementation ++ URL:=http://www.gnu.org/software/libidn/ ++endef ++ ++define Package/libidn/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 ++ ++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/libidn/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libidn.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libidn)) +diff --git a/feeds/packages/libs/libidn/Makefile b/feeds/packages/libs/libidn/Makefile +new file mode 100644 +index 0000000..c23ce70 +--- /dev/null ++++ b/feeds/packages/libs/libidn/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=libidn ++PKG_VERSION:=1.18 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/libidn ++PKG_MD5SUM:=66f115347439f56386f37a3ad92c1da2 ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libidn ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Stringprep, Punycode and IDNA implementation ++ URL:=http://www.gnu.org/software/libidn/ ++endef ++ ++define Package/libidn/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 ++ ++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/libidn/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libidn.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libidn)) +diff --git a/feeds/packages/libs/libidn/patches/.svn/entries b/feeds/packages/libs/libidn/patches/.svn/entries +new file mode 100644 +index 0000000..a190204 +--- /dev/null ++++ b/feeds/packages/libs/libidn/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libidn/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-08T21:00:50.735297Z ++24369 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-remove-libtool.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++8967e17f1d4dea15a515ba98c293ba2a ++2010-12-08T21:00:50.735297Z ++24369 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++296 ++ ++002-disable-po-docs-examples.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++c31a10a58be46cb03e1342577dca7d6e ++2010-12-08T21:00:50.735297Z ++24369 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++620 ++ +diff --git a/feeds/packages/libs/libidn/patches/.svn/text-base/001-remove-libtool.patch.svn-base b/feeds/packages/libs/libidn/patches/.svn/text-base/001-remove-libtool.patch.svn-base +new file mode 100644 +index 0000000..942094d +--- /dev/null ++++ b/feeds/packages/libs/libidn/patches/.svn/text-base/001-remove-libtool.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/aclocal.m4 +++++ b/aclocal.m4 ++@@ -1080,7 +1080,6 @@ m4_include([m4/intlmacosx.m4]) ++ m4_include([m4/lib-ld.m4]) ++ m4_include([m4/lib-link.m4]) ++ m4_include([m4/lib-prefix.m4]) ++-m4_include([m4/libtool.m4]) ++ m4_include([m4/longlong.m4]) ++ m4_include([m4/ltoptions.m4]) ++ m4_include([m4/ltsugar.m4]) +diff --git a/feeds/packages/libs/libidn/patches/.svn/text-base/002-disable-po-docs-examples.patch.svn-base b/feeds/packages/libs/libidn/patches/.svn/text-base/002-disable-po-docs-examples.patch.svn-base +new file mode 100644 +index 0000000..817749e +--- /dev/null ++++ b/feeds/packages/libs/libidn/patches/.svn/text-base/002-disable-po-docs-examples.patch.svn-base +@@ -0,0 +1,22 @@ ++--- 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 . ++ ++-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 ++@@ -46,8 +46,6 @@ gl_EARLY ++ AC_PROG_LIBTOOL ++ AM_MISSING_PROG(PERL, perl, $missing_dir) ++ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) ++-AM_GNU_GETTEXT(external) ++-AM_GNU_GETTEXT_VERSION(0.17) ++ AM_ICONV ++ AM_PATH_LISPDIR ++ +diff --git a/feeds/packages/libs/libidn/patches/001-remove-libtool.patch b/feeds/packages/libs/libidn/patches/001-remove-libtool.patch +new file mode 100644 +index 0000000..942094d +--- /dev/null ++++ b/feeds/packages/libs/libidn/patches/001-remove-libtool.patch +@@ -0,0 +1,10 @@ ++--- a/aclocal.m4 +++++ b/aclocal.m4 ++@@ -1080,7 +1080,6 @@ m4_include([m4/intlmacosx.m4]) ++ m4_include([m4/lib-ld.m4]) ++ m4_include([m4/lib-link.m4]) ++ m4_include([m4/lib-prefix.m4]) ++-m4_include([m4/libtool.m4]) ++ m4_include([m4/longlong.m4]) ++ m4_include([m4/ltoptions.m4]) ++ m4_include([m4/ltsugar.m4]) +diff --git a/feeds/packages/libs/libidn/patches/002-disable-po-docs-examples.patch b/feeds/packages/libs/libidn/patches/002-disable-po-docs-examples.patch +new file mode 100644 +index 0000000..817749e +--- /dev/null ++++ b/feeds/packages/libs/libidn/patches/002-disable-po-docs-examples.patch +@@ -0,0 +1,22 @@ ++--- 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 . ++ ++-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 ++@@ -46,8 +46,6 @@ gl_EARLY ++ AC_PROG_LIBTOOL ++ AM_MISSING_PROG(PERL, perl, $missing_dir) ++ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) ++-AM_GNU_GETTEXT(external) ++-AM_GNU_GETTEXT_VERSION(0.17) ++ AM_ICONV ++ AM_PATH_LISPDIR ++ +diff --git a/feeds/packages/libs/libimobiledevice/.svn/entries b/feeds/packages/libs/libimobiledevice/.svn/entries +new file mode 100644 +index 0000000..1f0fa42 +--- /dev/null ++++ b/feeds/packages/libs/libimobiledevice/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libimobiledevice ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:29.261344Z ++33086 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d4b335eb9ef3b6062bb222eff74fa23a ++2012-08-10T15:49:29.261344Z ++33086 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2612 ++ +diff --git a/feeds/packages/libs/libimobiledevice/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libimobiledevice/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9c2e536 +--- /dev/null ++++ b/feeds/packages/libs/libimobiledevice/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,91 @@ ++# ++# Copyright (C) 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:=libimobiledevice ++PKG_REV:=c182599c8c18ed729726ea7cbbd0a3b89790d2db ++PKG_VERSION:=20120112 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=git://git.sukimashita.com/libimobiledevice.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++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:=+glib2 +libgcrypt +libgnutls $(ICONV_DEPENDS) +libplist +libtasn1 +libusbmuxd ++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" ++ ++CONFIGURE_ARGS += \ ++ --without-swig \ ++ --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/feeds/packages/libs/libimobiledevice/Makefile b/feeds/packages/libs/libimobiledevice/Makefile +new file mode 100644 +index 0000000..9c2e536 +--- /dev/null ++++ b/feeds/packages/libs/libimobiledevice/Makefile +@@ -0,0 +1,91 @@ ++# ++# Copyright (C) 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:=libimobiledevice ++PKG_REV:=c182599c8c18ed729726ea7cbbd0a3b89790d2db ++PKG_VERSION:=20120112 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=git://git.sukimashita.com/libimobiledevice.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++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:=+glib2 +libgcrypt +libgnutls $(ICONV_DEPENDS) +libplist +libtasn1 +libusbmuxd ++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" ++ ++CONFIGURE_ARGS += \ ++ --without-swig \ ++ --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/feeds/packages/libs/libinklevel/.svn/entries b/feeds/packages/libs/libinklevel/.svn/entries +new file mode 100644 +index 0000000..1502c2a +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libinklevel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++0d2e32b29e2e0e2d76bddec269a0be8c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1328 ++ +diff --git a/feeds/packages/libs/libinklevel/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libinklevel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c3012a9 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=libinklevel ++PKG_VERSION:=0.8.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libinklevel ++PKG_MD5SUM:=83464cb23fe46a1d1adbe10f08b247be ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libinklevel ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=$(if $(WITH_PARPORT), +libieee1284) ++ TITLE:=Printers Ink Level Library ++ URL:=http://libinklevel.sourceforge.net/ ++endef ++ ++define Package/libinklevel/description ++ Libinklevel is a library for checking the ink level of your printer on a system which runs Linux. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++TARGET_LIBS += $(if $(WITH_PARPORT), -lieee1284) ++MAKE_ARGS += LIBS="$(TARGET_LIBS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/inklevel.h \ ++ $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libinklevel.so* \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libinklevel/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libinklevel.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libinklevel)) +diff --git a/feeds/packages/libs/libinklevel/Makefile b/feeds/packages/libs/libinklevel/Makefile +new file mode 100644 +index 0000000..c3012a9 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=libinklevel ++PKG_VERSION:=0.8.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libinklevel ++PKG_MD5SUM:=83464cb23fe46a1d1adbe10f08b247be ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libinklevel ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=$(if $(WITH_PARPORT), +libieee1284) ++ TITLE:=Printers Ink Level Library ++ URL:=http://libinklevel.sourceforge.net/ ++endef ++ ++define Package/libinklevel/description ++ Libinklevel is a library for checking the ink level of your printer on a system which runs Linux. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++TARGET_LIBS += $(if $(WITH_PARPORT), -lieee1284) ++MAKE_ARGS += LIBS="$(TARGET_LIBS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/inklevel.h \ ++ $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libinklevel.so* \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libinklevel/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libinklevel.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libinklevel)) +diff --git a/feeds/packages/libs/libinklevel/patches/.svn/entries b/feeds/packages/libs/libinklevel/patches/.svn/entries +new file mode 100644 +index 0000000..a552cb4 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libinklevel/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T04:19:20.425308Z ++24584 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++003-fix_usb_device_location.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++0ec7c9446383628c50c2553d5f15b55d ++2009-05-07T15:10:01.008490Z ++15692 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++710 ++ ++002-disable_parport.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++45f4a92f8ccb5f936671c8ef533ad2ae ++2009-05-07T15:10:01.008490Z ++15692 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1501 ++ ++001-configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a312dfc2b4a03b8235b85be12d1fdab6 ++2010-12-15T04:19:20.425308Z ++24584 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9037 ++ +diff --git a/feeds/packages/libs/libinklevel/patches/.svn/text-base/001-configure.patch.svn-base b/feeds/packages/libs/libinklevel/patches/.svn/text-base/001-configure.patch.svn-base +new file mode 100644 +index 0000000..8fda561 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/.svn/text-base/001-configure.patch.svn-base +@@ -0,0 +1,275 @@ ++--- a/configure +++++ b/configure ++@@ -12070,7 +12070,7 @@ fi ++ ## Check for optional header files ++ ++ ++-for ac_header in ifaddrs.h ieee1284.h +++for ac_header in ifaddrs.h ++ do ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++@@ -13690,235 +13690,6 @@ case $host in ++ cat >>confdefs.h <<_ACEOF ++ #define HOST_OS LINUX ++ _ACEOF ++- ++- ++-for ac_header in ieee1284.h ++-do ++-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++-$as_echo_n "checking for $ac_header... " >&6; } ++-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++- $as_echo_n "(cached) " >&6 ++-fi ++-ac_res=`eval 'as_val=${'$as_ac_Header'} ++- $as_echo "$as_val"'` ++- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++-$as_echo "$ac_res" >&6; } ++-else ++- # Is the header compilable? ++-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++-$as_echo_n "checking $ac_header usability... " >&6; } ++-cat >conftest.$ac_ext <<_ACEOF ++-/* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++-$ac_includes_default ++-#include <$ac_header> ++-_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 ++- ac_header_compiler=yes ++-else ++- $as_echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++- ac_header_compiler=no ++-fi ++- ++-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++-$as_echo "$ac_header_compiler" >&6; } ++- ++-# Is the header present? ++-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++-$as_echo_n "checking $ac_header presence... " >&6; } ++-cat >conftest.$ac_ext <<_ACEOF ++-/* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++-#include <$ac_header> ++-_ACEOF ++-if { (ac_try="$ac_cpp conftest.$ac_ext" ++-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_cpp conftest.$ac_ext") 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); } >/dev/null && { ++- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++- test ! -s conftest.err ++- }; then ++- ac_header_preproc=yes ++-else ++- $as_echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++- ac_header_preproc=no ++-fi ++- ++-rm -f conftest.err conftest.$ac_ext ++-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++-$as_echo "$ac_header_preproc" >&6; } ++- ++-# So? What about this header? ++-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++- yes:no: ) ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++- ac_header_preproc=yes ++- ;; ++- no:yes:* ) ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++- ++- ;; ++-esac ++-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++-$as_echo_n "checking for $ac_header... " >&6; } ++-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++- $as_echo_n "(cached) " >&6 ++-else ++- eval "$as_ac_Header=\$ac_header_preproc" ++-fi ++-ac_res=`eval 'as_val=${'$as_ac_Header'} ++- $as_echo "$as_val"'` ++- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++-$as_echo "$ac_res" >&6; } ++- ++-fi ++-as_val=`eval 'as_val=${'$as_ac_Header'} ++- $as_echo "$as_val"'` ++- if test "x$as_val" = x""yes; then ++- cat >>confdefs.h <<_ACEOF ++-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++-_ACEOF ++- ++-else ++- { { $as_echo "$as_me:$LINENO: error: ( required header file ieee1284.h missing)" >&5 ++-$as_echo "$as_me: error: ( required header file ieee1284.h missing)" >&2;} ++- { (exit 1); exit 1; }; } ++-fi ++- ++-done ++- ++- ++-{ $as_echo "$as_me:$LINENO: checking for ieee1284_open in -lieee1284" >&5 ++-$as_echo_n "checking for ieee1284_open in -lieee1284... " >&6; } ++-if test "${ac_cv_lib_ieee1284_ieee1284_open+set}" = set; then ++- $as_echo_n "(cached) " >&6 ++-else ++- ac_check_lib_save_LIBS=$LIBS ++-LIBS="-lieee1284 $LIBS" ++-cat >conftest.$ac_ext <<_ACEOF ++-/* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++- ++-/* Override any GCC internal prototype to avoid an error. ++- Use char because int might match the return type of a GCC ++- builtin and then its argument prototype would still apply. */ ++-#ifdef __cplusplus ++-extern "C" ++-#endif ++-char ieee1284_open (); ++-int ++-main () ++-{ ++-return ieee1284_open (); ++- ; ++- 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 ++- ac_cv_lib_ieee1284_ieee1284_open=yes ++-else ++- $as_echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++- ac_cv_lib_ieee1284_ieee1284_open=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 ++-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ieee1284_ieee1284_open" >&5 ++-$as_echo "$ac_cv_lib_ieee1284_ieee1284_open" >&6; } ++-if test "x$ac_cv_lib_ieee1284_ieee1284_open" = x""yes; then ++- cat >>confdefs.h <<_ACEOF ++-#define HAVE_LIBIEEE1284 1 ++-_ACEOF ++- ++- LIBS="-lieee1284 $LIBS" ++- ++-else ++- { { $as_echo "$as_me:$LINENO: error: Library not found" >&5 ++-$as_echo "$as_me: error: Library not found" >&2;} ++- { (exit 1); exit 1; }; } ++-fi ++ ;; ++ ++ *-*-solaris2.*) ++--- a/configure.in +++++ b/configure.in ++@@ -60,7 +60,7 @@ fi ++ ++ ++ ## Check for optional header files ++-AC_CHECK_HEADERS([ifaddrs.h ieee1284.h]) +++AC_CHECK_HEADERS([ifaddrs.h]) ++ ++ ## Check for mandatory header files ++ ++@@ -95,15 +95,7 @@ AC_TYPE_UINT32_T ++ AC_TYPE_UINT8_T ++ AC_DEFINE_UNQUOTED(LINUX,1,[Define value for Linux OS]) ++ AC_DEFINE_UNQUOTED(OPENSOLARIS,2,[Define value for OpenSolaris OS]) ++-case $host in ++- *-*-linux*) AC_DEFINE_UNQUOTED(HOST_OS,LINUX,[Host OS]) ++- AC_CHECK_HEADERS([ieee1284.h],, ++- AC_MSG_ERROR(( required header file ieee1284.h missing))) ++- AC_CHECK_LIB([ieee1284],ieee1284_open,, AC_MSG_ERROR(Library not found),);; ++- ++- *-*-solaris2.*) AC_DEFINE(HOST_OS,OPENSOLARIS,[HOST OS]);; ++- *-*-*) AC_MSG_ERROR( Host OS not (yet) supported) ;; ++-esac +++AC_DEFINE_UNQUOTED(HOST_OS,LINUX,[Host OS]) ++ ++ ## Variables to be exported ++ +diff --git a/feeds/packages/libs/libinklevel/patches/.svn/text-base/002-disable_parport.patch.svn-base b/feeds/packages/libs/libinklevel/patches/.svn/text-base/002-disable_parport.patch.svn-base +new file mode 100644 +index 0000000..72d0338 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/.svn/text-base/002-disable_parport.patch.svn-base +@@ -0,0 +1,55 @@ ++--- a/linux.c +++++ b/linux.c ++@@ -16,10 +16,11 @@ ++ #include ++ #include ++ +++#ifdef WITH_PARPORT ++ /* ieee1284.h uses HAVE_IEEE1284_H, so we undefine it */ ++ #undef HAVE_IEEE1284_H ++ #include ++- +++#endif ++ #include "internal.h" ++ #include "inklevel.h" ++ #include "platform_specific.h" ++@@ -32,7 +33,9 @@ ++ ++ int get_device_id(const int port, const char *device_file, ++ const int portnumber, char *device_id) { +++#ifdef WITH_PARPORT ++ struct parport_list parports; +++#endif ++ char tmp[BUFLEN]; ++ char device_file1[256]; ++ char device_file2[256]; ++@@ -41,6 +44,7 @@ int get_device_id(const int port, const ++ char *c; ++ int realsize; ++ +++#ifdef WITH_PARPORT ++ if (port == PARPORT ) { ++ /* check if we have appropiate permissions */ ++ ++@@ -73,7 +77,9 @@ int get_device_id(const int port, const ++ ++ return COULD_NOT_GET_DEVICE_ID; ++ ++- } else if (port == USB || port == CUSTOM_USB) { +++ } else +++#endif +++ if (port == USB || port == CUSTOM_USB) { ++ ++ if (port == USB) { ++ sprintf(device_file1, "/dev/usb/lp%d", portnumber); ++@@ -138,8 +144,10 @@ int open_printer_device(const int port, ++ if (port == USB) { ++ sprintf(device_file1, "/dev/usb/lp%d", portnumber); ++ sprintf(device_file2, "/dev/usblp%d", portnumber); +++#ifdef WITH_PARPORT ++ } else if (port == PARPORT) { ++ sprintf(device_file1, "/dev/lp%d", portnumber); +++#endif ++ } else if (port == CUSTOM_USB) { ++ strncpy(device_file1, device_file, 255); ++ device_file1[255] = '\0'; +diff --git a/feeds/packages/libs/libinklevel/patches/.svn/text-base/003-fix_usb_device_location.patch.svn-base b/feeds/packages/libs/libinklevel/patches/.svn/text-base/003-fix_usb_device_location.patch.svn-base +new file mode 100644 +index 0000000..7bf78c3 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/.svn/text-base/003-fix_usb_device_location.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/linux.c +++++ b/linux.c ++@@ -82,7 +82,7 @@ int get_device_id(const int port, const ++ if (port == USB || port == CUSTOM_USB) { ++ ++ if (port == USB) { ++- sprintf(device_file1, "/dev/usb/lp%d", portnumber); +++ sprintf(device_file1, "/dev/lp%d", portnumber); ++ sprintf(device_file2, "/dev/usblp%d", portnumber); ++ fd = open(device_file1, O_RDONLY); ++ if (fd == -1) { ++@@ -142,7 +142,7 @@ int open_printer_device(const int port, ++ int fd; ++ ++ if (port == USB) { ++- sprintf(device_file1, "/dev/usb/lp%d", portnumber); +++ sprintf(device_file1, "/dev/lp%d", portnumber); ++ sprintf(device_file2, "/dev/usblp%d", portnumber); ++ #ifdef WITH_PARPORT ++ } else if (port == PARPORT) { +diff --git a/feeds/packages/libs/libinklevel/patches/001-configure.patch b/feeds/packages/libs/libinklevel/patches/001-configure.patch +new file mode 100644 +index 0000000..8fda561 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/001-configure.patch +@@ -0,0 +1,275 @@ ++--- a/configure +++++ b/configure ++@@ -12070,7 +12070,7 @@ fi ++ ## Check for optional header files ++ ++ ++-for ac_header in ifaddrs.h ieee1284.h +++for ac_header in ifaddrs.h ++ do ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++@@ -13690,235 +13690,6 @@ case $host in ++ cat >>confdefs.h <<_ACEOF ++ #define HOST_OS LINUX ++ _ACEOF ++- ++- ++-for ac_header in ieee1284.h ++-do ++-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++-$as_echo_n "checking for $ac_header... " >&6; } ++-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++- $as_echo_n "(cached) " >&6 ++-fi ++-ac_res=`eval 'as_val=${'$as_ac_Header'} ++- $as_echo "$as_val"'` ++- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++-$as_echo "$ac_res" >&6; } ++-else ++- # Is the header compilable? ++-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++-$as_echo_n "checking $ac_header usability... " >&6; } ++-cat >conftest.$ac_ext <<_ACEOF ++-/* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++-$ac_includes_default ++-#include <$ac_header> ++-_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 ++- ac_header_compiler=yes ++-else ++- $as_echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++- ac_header_compiler=no ++-fi ++- ++-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++-$as_echo "$ac_header_compiler" >&6; } ++- ++-# Is the header present? ++-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++-$as_echo_n "checking $ac_header presence... " >&6; } ++-cat >conftest.$ac_ext <<_ACEOF ++-/* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++-#include <$ac_header> ++-_ACEOF ++-if { (ac_try="$ac_cpp conftest.$ac_ext" ++-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_cpp conftest.$ac_ext") 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); } >/dev/null && { ++- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++- test ! -s conftest.err ++- }; then ++- ac_header_preproc=yes ++-else ++- $as_echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++- ac_header_preproc=no ++-fi ++- ++-rm -f conftest.err conftest.$ac_ext ++-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++-$as_echo "$ac_header_preproc" >&6; } ++- ++-# So? What about this header? ++-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++- yes:no: ) ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++- ac_header_preproc=yes ++- ;; ++- no:yes:* ) ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++- ++- ;; ++-esac ++-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++-$as_echo_n "checking for $ac_header... " >&6; } ++-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++- $as_echo_n "(cached) " >&6 ++-else ++- eval "$as_ac_Header=\$ac_header_preproc" ++-fi ++-ac_res=`eval 'as_val=${'$as_ac_Header'} ++- $as_echo "$as_val"'` ++- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++-$as_echo "$ac_res" >&6; } ++- ++-fi ++-as_val=`eval 'as_val=${'$as_ac_Header'} ++- $as_echo "$as_val"'` ++- if test "x$as_val" = x""yes; then ++- cat >>confdefs.h <<_ACEOF ++-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++-_ACEOF ++- ++-else ++- { { $as_echo "$as_me:$LINENO: error: ( required header file ieee1284.h missing)" >&5 ++-$as_echo "$as_me: error: ( required header file ieee1284.h missing)" >&2;} ++- { (exit 1); exit 1; }; } ++-fi ++- ++-done ++- ++- ++-{ $as_echo "$as_me:$LINENO: checking for ieee1284_open in -lieee1284" >&5 ++-$as_echo_n "checking for ieee1284_open in -lieee1284... " >&6; } ++-if test "${ac_cv_lib_ieee1284_ieee1284_open+set}" = set; then ++- $as_echo_n "(cached) " >&6 ++-else ++- ac_check_lib_save_LIBS=$LIBS ++-LIBS="-lieee1284 $LIBS" ++-cat >conftest.$ac_ext <<_ACEOF ++-/* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++- ++-/* Override any GCC internal prototype to avoid an error. ++- Use char because int might match the return type of a GCC ++- builtin and then its argument prototype would still apply. */ ++-#ifdef __cplusplus ++-extern "C" ++-#endif ++-char ieee1284_open (); ++-int ++-main () ++-{ ++-return ieee1284_open (); ++- ; ++- 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 ++- ac_cv_lib_ieee1284_ieee1284_open=yes ++-else ++- $as_echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++- ac_cv_lib_ieee1284_ieee1284_open=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 ++-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ieee1284_ieee1284_open" >&5 ++-$as_echo "$ac_cv_lib_ieee1284_ieee1284_open" >&6; } ++-if test "x$ac_cv_lib_ieee1284_ieee1284_open" = x""yes; then ++- cat >>confdefs.h <<_ACEOF ++-#define HAVE_LIBIEEE1284 1 ++-_ACEOF ++- ++- LIBS="-lieee1284 $LIBS" ++- ++-else ++- { { $as_echo "$as_me:$LINENO: error: Library not found" >&5 ++-$as_echo "$as_me: error: Library not found" >&2;} ++- { (exit 1); exit 1; }; } ++-fi ++ ;; ++ ++ *-*-solaris2.*) ++--- a/configure.in +++++ b/configure.in ++@@ -60,7 +60,7 @@ fi ++ ++ ++ ## Check for optional header files ++-AC_CHECK_HEADERS([ifaddrs.h ieee1284.h]) +++AC_CHECK_HEADERS([ifaddrs.h]) ++ ++ ## Check for mandatory header files ++ ++@@ -95,15 +95,7 @@ AC_TYPE_UINT32_T ++ AC_TYPE_UINT8_T ++ AC_DEFINE_UNQUOTED(LINUX,1,[Define value for Linux OS]) ++ AC_DEFINE_UNQUOTED(OPENSOLARIS,2,[Define value for OpenSolaris OS]) ++-case $host in ++- *-*-linux*) AC_DEFINE_UNQUOTED(HOST_OS,LINUX,[Host OS]) ++- AC_CHECK_HEADERS([ieee1284.h],, ++- AC_MSG_ERROR(( required header file ieee1284.h missing))) ++- AC_CHECK_LIB([ieee1284],ieee1284_open,, AC_MSG_ERROR(Library not found),);; ++- ++- *-*-solaris2.*) AC_DEFINE(HOST_OS,OPENSOLARIS,[HOST OS]);; ++- *-*-*) AC_MSG_ERROR( Host OS not (yet) supported) ;; ++-esac +++AC_DEFINE_UNQUOTED(HOST_OS,LINUX,[Host OS]) ++ ++ ## Variables to be exported ++ +diff --git a/feeds/packages/libs/libinklevel/patches/002-disable_parport.patch b/feeds/packages/libs/libinklevel/patches/002-disable_parport.patch +new file mode 100644 +index 0000000..72d0338 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/002-disable_parport.patch +@@ -0,0 +1,55 @@ ++--- a/linux.c +++++ b/linux.c ++@@ -16,10 +16,11 @@ ++ #include ++ #include ++ +++#ifdef WITH_PARPORT ++ /* ieee1284.h uses HAVE_IEEE1284_H, so we undefine it */ ++ #undef HAVE_IEEE1284_H ++ #include ++- +++#endif ++ #include "internal.h" ++ #include "inklevel.h" ++ #include "platform_specific.h" ++@@ -32,7 +33,9 @@ ++ ++ int get_device_id(const int port, const char *device_file, ++ const int portnumber, char *device_id) { +++#ifdef WITH_PARPORT ++ struct parport_list parports; +++#endif ++ char tmp[BUFLEN]; ++ char device_file1[256]; ++ char device_file2[256]; ++@@ -41,6 +44,7 @@ int get_device_id(const int port, const ++ char *c; ++ int realsize; ++ +++#ifdef WITH_PARPORT ++ if (port == PARPORT ) { ++ /* check if we have appropiate permissions */ ++ ++@@ -73,7 +77,9 @@ int get_device_id(const int port, const ++ ++ return COULD_NOT_GET_DEVICE_ID; ++ ++- } else if (port == USB || port == CUSTOM_USB) { +++ } else +++#endif +++ if (port == USB || port == CUSTOM_USB) { ++ ++ if (port == USB) { ++ sprintf(device_file1, "/dev/usb/lp%d", portnumber); ++@@ -138,8 +144,10 @@ int open_printer_device(const int port, ++ if (port == USB) { ++ sprintf(device_file1, "/dev/usb/lp%d", portnumber); ++ sprintf(device_file2, "/dev/usblp%d", portnumber); +++#ifdef WITH_PARPORT ++ } else if (port == PARPORT) { ++ sprintf(device_file1, "/dev/lp%d", portnumber); +++#endif ++ } else if (port == CUSTOM_USB) { ++ strncpy(device_file1, device_file, 255); ++ device_file1[255] = '\0'; +diff --git a/feeds/packages/libs/libinklevel/patches/003-fix_usb_device_location.patch b/feeds/packages/libs/libinklevel/patches/003-fix_usb_device_location.patch +new file mode 100644 +index 0000000..7bf78c3 +--- /dev/null ++++ b/feeds/packages/libs/libinklevel/patches/003-fix_usb_device_location.patch +@@ -0,0 +1,20 @@ ++--- a/linux.c +++++ b/linux.c ++@@ -82,7 +82,7 @@ int get_device_id(const int port, const ++ if (port == USB || port == CUSTOM_USB) { ++ ++ if (port == USB) { ++- sprintf(device_file1, "/dev/usb/lp%d", portnumber); +++ sprintf(device_file1, "/dev/lp%d", portnumber); ++ sprintf(device_file2, "/dev/usblp%d", portnumber); ++ fd = open(device_file1, O_RDONLY); ++ if (fd == -1) { ++@@ -142,7 +142,7 @@ int open_printer_device(const int port, ++ int fd; ++ ++ if (port == USB) { ++- sprintf(device_file1, "/dev/usb/lp%d", portnumber); +++ sprintf(device_file1, "/dev/lp%d", portnumber); ++ sprintf(device_file2, "/dev/usblp%d", portnumber); ++ #ifdef WITH_PARPORT ++ } else if (port == PARPORT) { +diff --git a/feeds/packages/libs/libipfix/.svn/entries b/feeds/packages/libs/libipfix/.svn/entries +new file mode 100644 +index 0000000..0ec5f7b +--- /dev/null ++++ b/feeds/packages/libs/libipfix/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libipfix ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-07T12:50:15.917460Z ++33634 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++extra ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++04b21a2e5da50b1ed376bdfb696f5cbd ++2012-06-05T17:49:57.200644Z ++32066 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1188 ++ +diff --git a/feeds/packages/libs/libipfix/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libipfix/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e4c9315 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=libipfix ++PKG_VERSION:=r51 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources ++PKG_MD5SUM:=0e5b2871ea20ac48eda3f6006c5dba28 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libipfix ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=IP Flow Information Export Library ++ URL:=http://www.fokus.fraunhofer.de/de/net/more_about/download/ipfixlib.html ++ BUILDONLY:=1 ++endef ++ ++TARGET_CFLAGS += \ ++ -ffunction-sections -fdata-sections ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ exec_prefix="$(PKG_INSTALL_DIR)/usr" \ ++ all install ++ $(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfix.a ++ $(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfixmisc.a ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,libipfix)) +diff --git a/feeds/packages/libs/libipfix/Makefile b/feeds/packages/libs/libipfix/Makefile +new file mode 100644 +index 0000000..e4c9315 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=libipfix ++PKG_VERSION:=r51 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources ++PKG_MD5SUM:=0e5b2871ea20ac48eda3f6006c5dba28 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libipfix ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=IP Flow Information Export Library ++ URL:=http://www.fokus.fraunhofer.de/de/net/more_about/download/ipfixlib.html ++ BUILDONLY:=1 ++endef ++ ++TARGET_CFLAGS += \ ++ -ffunction-sections -fdata-sections ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ exec_prefix="$(PKG_INSTALL_DIR)/usr" \ ++ all install ++ $(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfix.a ++ $(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfixmisc.a ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,libipfix)) +diff --git a/feeds/packages/libs/libipfix/extra/.svn/entries b/feeds/packages/libs/libipfix/extra/.svn/entries +new file mode 100644 +index 0000000..ee218e3 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/extra/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libipfix/extra ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-19T22:19:34.414035Z ++18855 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wprobe-ie.txt ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++de8e988ad44e9a68b155e5c25b3c6c71 ++2009-03-29T02:12:21.697481Z ++15061 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1020 ++ ++append-wprobe-ie.pl ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++cdb4f04d611c07b9437fb0ef0e113aca ++2009-12-19T22:19:34.414035Z ++18855 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++890 ++ +diff --git a/feeds/packages/libs/libipfix/extra/.svn/text-base/append-wprobe-ie.pl.svn-base b/feeds/packages/libs/libipfix/extra/.svn/text-base/append-wprobe-ie.pl.svn-base +new file mode 100644 +index 0000000..8bb658b +--- /dev/null ++++ b/feeds/packages/libs/libipfix/extra/.svn/text-base/append-wprobe-ie.pl.svn-base +@@ -0,0 +1,38 @@ ++use strict; ++ ++my @fields = ( ++ [ "_n", "UINT", " - Number of samples", 4 ], ++ [ "_s", "UINT", " - Sum of samples", 8 ], ++ [ "_ss", "UINT", " - Sum of squared samples", 8 ], ++); ++ ++my $file = $ARGV[0] or die "Syntax: $0 \n"; ++-f $file or die "File not found\n"; ++my $start = $ARGV[1]; ++$start =~ /^\d+$/ or die "Invalid start number"; ++open FILE, "<$file" or die "Can't open file"; ++while () { ++ /^(%?)(\w+),\s*(\w+),\s*(.+)$/ and do { ++ my $counter = $1; ++ my $rfield = $2; ++ my $nfield = $3; ++ my $descr = $4; ++ my @f; ++ if ($counter) { ++ @f = [ "", "UINT", "", 4]; ++ } else { ++ @f = @fields; ++ } ++ foreach my $f (@f) { ++ my $nr = $start++; ++ my $n = $f->[0]; ++ my $N = uc $n; ++ my $ftype = $f->[1]; ++ my $fdesc = $f->[2]; ++ my $size = $f->[3]; ++ print "$nr, IPFIX_FT_WPROBE_$rfield$N, $size, IPFIX_CODING_$ftype, \"$nfield$n\", \"$descr$fdesc\"\n"; ++ } ++ }; ++} ++close FILE; ++ +diff --git a/feeds/packages/libs/libipfix/extra/.svn/text-base/wprobe-ie.txt.svn-base b/feeds/packages/libs/libipfix/extra/.svn/text-base/wprobe-ie.txt.svn-base +new file mode 100644 +index 0000000..26d64d2 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/extra/.svn/text-base/wprobe-ie.txt.svn-base +@@ -0,0 +1,14 @@ ++NOISE, global_noise, wprobe global noice floor ++PHY_BUSY, global_phy_busy, wprobe global airtime total ++PHY_RX, global_phy_rx, wprobe global airtime total from rx-frame ++PHY_TX, global_phy_tx, wprobe global airtime total from tx-frame ++RSSI, link_rssi, wprobe link received signal strength indication ++SIGNAL, link_signal, wprobe link signal strength in dB ++IEEE_RX_RATE, link_ieee_rx_rate, wprobe link IEEE 802.11 RX data rate ++IEEE_TX_RATE, link_ieee_tx_rate, wprobe link IEEE 802.11 TX data rate ++RETRANSMIT_200, link_retransmit_200, wprobe link total retransmissions per packet - <200 bytes ++RETRANSMIT_400, link_retransmit_400, wprobe link total retransmissions per packet - <400 bytes ++RETRANSMIT_800, link_retransmit_800, wprobe link total retransmissions per packet - <800 bytes ++RETRANSMIT_1600, link_retransmit_1600, wprobe link total retransmissions per packet - >800 bytes ++%FRAMES, global_frames, wprobe global number of 802.11 frames seen ++%PROBEREQ, global_probereq, wprobe global number of 802.11 probe requests seen +diff --git a/feeds/packages/libs/libipfix/extra/append-wprobe-ie.pl b/feeds/packages/libs/libipfix/extra/append-wprobe-ie.pl +new file mode 100644 +index 0000000..8bb658b +--- /dev/null ++++ b/feeds/packages/libs/libipfix/extra/append-wprobe-ie.pl +@@ -0,0 +1,38 @@ ++use strict; ++ ++my @fields = ( ++ [ "_n", "UINT", " - Number of samples", 4 ], ++ [ "_s", "UINT", " - Sum of samples", 8 ], ++ [ "_ss", "UINT", " - Sum of squared samples", 8 ], ++); ++ ++my $file = $ARGV[0] or die "Syntax: $0 \n"; ++-f $file or die "File not found\n"; ++my $start = $ARGV[1]; ++$start =~ /^\d+$/ or die "Invalid start number"; ++open FILE, "<$file" or die "Can't open file"; ++while () { ++ /^(%?)(\w+),\s*(\w+),\s*(.+)$/ and do { ++ my $counter = $1; ++ my $rfield = $2; ++ my $nfield = $3; ++ my $descr = $4; ++ my @f; ++ if ($counter) { ++ @f = [ "", "UINT", "", 4]; ++ } else { ++ @f = @fields; ++ } ++ foreach my $f (@f) { ++ my $nr = $start++; ++ my $n = $f->[0]; ++ my $N = uc $n; ++ my $ftype = $f->[1]; ++ my $fdesc = $f->[2]; ++ my $size = $f->[3]; ++ print "$nr, IPFIX_FT_WPROBE_$rfield$N, $size, IPFIX_CODING_$ftype, \"$nfield$n\", \"$descr$fdesc\"\n"; ++ } ++ }; ++} ++close FILE; ++ +diff --git a/feeds/packages/libs/libipfix/extra/wprobe-ie.txt b/feeds/packages/libs/libipfix/extra/wprobe-ie.txt +new file mode 100644 +index 0000000..26d64d2 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/extra/wprobe-ie.txt +@@ -0,0 +1,14 @@ ++NOISE, global_noise, wprobe global noice floor ++PHY_BUSY, global_phy_busy, wprobe global airtime total ++PHY_RX, global_phy_rx, wprobe global airtime total from rx-frame ++PHY_TX, global_phy_tx, wprobe global airtime total from tx-frame ++RSSI, link_rssi, wprobe link received signal strength indication ++SIGNAL, link_signal, wprobe link signal strength in dB ++IEEE_RX_RATE, link_ieee_rx_rate, wprobe link IEEE 802.11 RX data rate ++IEEE_TX_RATE, link_ieee_tx_rate, wprobe link IEEE 802.11 TX data rate ++RETRANSMIT_200, link_retransmit_200, wprobe link total retransmissions per packet - <200 bytes ++RETRANSMIT_400, link_retransmit_400, wprobe link total retransmissions per packet - <400 bytes ++RETRANSMIT_800, link_retransmit_800, wprobe link total retransmissions per packet - <800 bytes ++RETRANSMIT_1600, link_retransmit_1600, wprobe link total retransmissions per packet - >800 bytes ++%FRAMES, global_frames, wprobe global number of 802.11 frames seen ++%PROBEREQ, global_probereq, wprobe global number of 802.11 probe requests seen +diff --git a/feeds/packages/libs/libipfix/patches/.svn/entries b/feeds/packages/libs/libipfix/patches/.svn/entries +new file mode 100644 +index 0000000..52e9ebd +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libipfix/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T17:49:57.200644Z ++32066 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-openimp_sync.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++b3034dbc4060d93f28b8b005511ad592 ++2009-12-19T22:19:42.357329Z ++18856 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++17860 ++ ++110-wprobe_ie.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++25745fc037b7a60dcb8a246ceca6b7fa ++2009-12-19T22:19:42.357329Z ++18856 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5847 ++ ++120-ipfixmisc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7ba38f730816fa4e971722e9936c5030 ++2012-06-05T17:49:57.200644Z ++32066 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1058 ++ +diff --git a/feeds/packages/libs/libipfix/patches/.svn/text-base/100-openimp_sync.patch.svn-base b/feeds/packages/libs/libipfix/patches/.svn/text-base/100-openimp_sync.patch.svn-base +new file mode 100644 +index 0000000..5b6e2e3 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/.svn/text-base/100-openimp_sync.patch.svn-base +@@ -0,0 +1,474 @@ ++--- a/lib/ipfix.c +++++ b/lib/ipfix.c ++@@ -37,6 +37,9 @@ $$LIC$$ ++ #ifdef SCTPSUPPORT ++ #include ++ #endif +++#ifndef NOTHREADS +++#include +++#endif ++ #include ++ #include ++ ++@@ -123,6 +126,18 @@ static uint16_t g_lasttid; ++ static ipfix_datarecord_t g_data = { NULL, NULL, 0 }; /* ipfix_export */ ++ ++ static ipfix_field_t *g_ipfix_fields; +++#ifndef NOTHREADS +++static pthread_mutex_t g_mutex; +++#define mod_lock() { \ +++ if ( pthread_mutex_lock( &g_mutex ) !=0 ) \ +++ mlogf( 0, "[ipfix] mutex_lock() failed: %s\n", \ +++ strerror( errno ) ); \ +++ } +++#define mod_unlock() { pthread_mutex_unlock( &g_mutex ); } +++#else +++#define mod_lock() +++#define mod_unlock() +++#endif ++ ++ /*----- prototypes -------------------------------------------------------*/ ++ ++@@ -133,6 +148,7 @@ int _ipfix_send_message( ipfix_t *ifh, ++ ipfix_message_t *message ); ++ int _ipfix_write_msghdr( ipfix_t *ifh, ipfix_message_t *msg, iobuf_t *buf ); ++ void _ipfix_disconnect( ipfix_collector_t *col ); +++int _ipfix_export_flush( ipfix_t *ifh ); ++ ++ ++ /* name : do_writeselect ++@@ -576,16 +592,18 @@ int ipfix_decode_float( void *in, void * ++ ++ int ipfix_snprint_float( char *str, size_t size, void *data, size_t len ) ++ { ++- float tmp32; ++- double tmp64; +++ uint32_t tmp32; +++ uint64_t tmp64; ++ ++ switch ( len ) { ++ case 4: ++- ipfix_decode_float( data, &tmp32, 4); ++- return snprintf( str, size, "%f", tmp32 ); +++ memcpy( &tmp32, data, len ); +++ tmp32 = htonl( tmp32 ); +++ return snprintf( str, size, "%f", (float)tmp32 ); ++ case 8: ++- ipfix_decode_float( data, &tmp64, 8); ++- return snprintf( str, size, "%lf", tmp64); +++ memcpy( &tmp64, data, len ); +++ tmp64 = HTONLL( tmp64 ); +++ return snprintf( str, size, "%lf", (double)tmp64 ); ++ default: ++ break; ++ } ++@@ -682,12 +700,19 @@ int ipfix_get_eno_ieid( char *field, int ++ * parameters: ++ * remarks: init module, read field type info. ++ */ ++-int ipfix_init ( void ) +++int ipfix_init( void ) ++ { ++ if ( g_tstart ) { ++ ipfix_cleanup(); ++ } ++ +++#ifndef NOTHREADS +++ if ( pthread_mutex_init( &g_mutex, NULL ) !=0 ) { +++ mlogf( 0, "[ipfix] pthread_mutex_init() failed: %s\n", +++ strerror(errno) ); +++ return -1; +++ } +++#endif ++ g_tstart = time(NULL); ++ signal( SIGPIPE, SIG_IGN ); ++ g_lasttid = 255; ++@@ -806,6 +831,9 @@ void ipfix_cleanup ( void ) ++ g_data.maxfields = 0; ++ g_data.lens = NULL; ++ g_data.addrs = NULL; +++#ifndef NOTHREADS +++ (void)pthread_mutex_destroy( &g_mutex ); +++#endif ++ } ++ ++ int _ipfix_connect ( ipfix_collector_t *col ) ++@@ -1465,7 +1493,7 @@ int _ipfix_write_template( ipfix_t ++ default: ++ /* check space */ ++ if ( tsize+ifh->offset > IPFIX_DEFAULT_BUFLEN ) { ++- if ( ipfix_export_flush( ifh ) < 0 ) +++ if ( _ipfix_export_flush( ifh ) < 0 ) ++ return -1; ++ if ( tsize+ifh->offset > IPFIX_DEFAULT_BUFLEN ) ++ return -1; ++@@ -1474,6 +1502,8 @@ int _ipfix_write_template( ipfix_t ++ /* write template prior to data */ ++ if ( ifh->offset > 0 ) { ++ memmove( ifh->buffer + tsize, ifh->buffer, ifh->offset ); +++ if ( ifh->cs_tid ) +++ ifh->cs_header += tsize; ++ } ++ ++ buf = ifh->buffer; ++@@ -1615,8 +1645,11 @@ int ipfix_open( ipfix_t **ipfixh, int so ++ return -1; ++ } ++ node->ifh = i; +++ +++ mod_lock(); ++ node->next = g_ipfixlist; ++ g_ipfixlist = node; +++ mod_unlock(); ++ ++ *ipfixh = i; ++ return 0; ++@@ -1633,7 +1666,8 @@ void ipfix_close( ipfix_t *h ) ++ { ++ ipfix_node_t *l, *n; ++ ++- ipfix_export_flush( h ); +++ mod_lock(); +++ _ipfix_export_flush( h ); ++ ++ while( h->collectors ) ++ _ipfix_drop_collector( (ipfix_collector_t**)&h->collectors ); ++@@ -1659,6 +1693,7 @@ void ipfix_close( ipfix_t *h ) ++ #endif ++ free(h->buffer); ++ free(h); +++ mod_unlock(); ++ } ++ } ++ ++@@ -2156,6 +2191,22 @@ void ipfix_release_template( ipfix_t *if ++ ipfix_delete_template( ifh, templ ); ++ } ++ +++static void _finish_cs( ipfix_t *ifh ) +++{ +++ size_t buflen; +++ uint8_t *buf; +++ +++ /* finish current dataset */ +++ if ( (buf=ifh->cs_header) ==NULL ) +++ return; +++ buflen = 0; +++ INSERTU16( buf+buflen, buflen, ifh->cs_tid ); +++ INSERTU16( buf+buflen, buflen, ifh->cs_bytes ); +++ ifh->cs_bytes = 0; +++ ifh->cs_header = NULL; +++ ifh->cs_tid = 0; +++} +++ ++ int ipfix_export( ipfix_t *ifh, ipfix_template_t *templ, ... ) ++ { ++ int i; ++@@ -2199,13 +2250,14 @@ int ipfix_export( ipfix_t *ifh, ipfix_te ++ g_data.addrs, g_data.lens ); ++ } ++ ++-int ipfix_export_array( ipfix_t *ifh, ++- ipfix_template_t *templ, ++- int nfields, ++- void **fields, ++- uint16_t *lengths ) +++static int +++_ipfix_export_array( ipfix_t *ifh, +++ ipfix_template_t *templ, +++ int nfields, +++ void **fields, +++ uint16_t *lengths ) ++ { ++- int i; +++ int i, newset_f=0; ++ size_t buflen, datasetlen; ++ uint8_t *p, *buf; ++ ++@@ -2249,7 +2301,19 @@ int ipfix_export_array( ipfix_t ++ ++ /** get size of data set, check space ++ */ ++- for ( i=0, datasetlen=4; itid == ifh->cs_tid ) { +++ newset_f = 0; +++ datasetlen = 0; +++ } +++ else { +++ if ( ifh->cs_tid > 0 ) { +++ _finish_cs( ifh ); +++ } +++ newset_f = 1; +++ datasetlen = 4; +++ } +++ +++ for ( i=0; ifields[i].flength == IPFIX_FT_VARLEN ) { ++ if ( lengths[i]>254 ) ++ datasetlen += 3; ++@@ -2263,21 +2327,29 @@ int ipfix_export_array( ipfix_t ++ } ++ datasetlen += lengths[i]; ++ } ++- if ( ((ifh->offset + datasetlen) > IPFIX_DEFAULT_BUFLEN ) ++- && (ipfix_export_flush( ifh ) <0) ) { ++- return -1; +++ +++ if ( (ifh->offset + datasetlen) > IPFIX_DEFAULT_BUFLEN ) { +++ if ( ifh->cs_tid ) +++ _finish_cs( ifh ); +++ newset_f = 1; +++ +++ if ( _ipfix_export_flush( ifh ) <0 ) +++ return -1; ++ } ++ ++- /* fill buffer ++- */ +++ /* fill buffer */ ++ buf = (uint8_t*)(ifh->buffer) + ifh->offset; ++ buflen = 0; ++ ++- /* insert data set ++- */ ++- ifh->nrecords ++; ++- INSERTU16( buf+buflen, buflen, templ->tid ); ++- INSERTU16( buf+buflen, buflen, datasetlen ); +++ if ( newset_f ) { +++ /* insert data set +++ */ +++ ifh->cs_bytes = 0; +++ ifh->cs_header = buf; +++ ifh->cs_tid = templ->tid; +++ INSERTU16( buf+buflen, buflen, templ->tid ); +++ INSERTU16( buf+buflen, buflen, 4 ); +++ } ++ ++ /* insert data record ++ */ ++@@ -2303,7 +2375,9 @@ int ipfix_export_array( ipfix_t ++ buflen += lengths[i]; ++ } ++ +++ ifh->nrecords ++; ++ ifh->offset += buflen; +++ ifh->cs_bytes += buflen; ++ if ( ifh->version == IPFIX_VERSION ) ++ ifh->seqno ++; ++ return 0; ++@@ -2313,7 +2387,7 @@ int ipfix_export_array( ipfix_t ++ * parameters: ++ * remarks: rewrite this func! ++ */ ++-int ipfix_export_flush( ipfix_t *ifh ) +++int _ipfix_export_flush( ipfix_t *ifh ) ++ { ++ iobuf_t *buf; ++ ipfix_collector_t *col; ++@@ -2322,8 +2396,14 @@ int ipfix_export_flush( ipfix_t *ifh ) ++ if ( (ifh==NULL) || (ifh->offset==0) ) ++ return 0; ++ ++- if ( (buf=_ipfix_getbuf()) ==NULL ) +++ if ( ifh->cs_tid > 0 ) { +++ /* finish current dataset */ +++ _finish_cs( ifh ); +++ } +++ +++ if ( (buf=_ipfix_getbuf()) ==NULL ) { ++ return -1; +++ } ++ ++ #ifdef DEBUG ++ mlogf( 0, "[ipfix_export_flush] msg has %d records, %d bytes\n", ++@@ -2350,3 +2430,30 @@ int ipfix_export_flush( ipfix_t *ifh ) ++ _ipfix_freebuf( buf ); ++ return ret; ++ } +++ +++int ipfix_export_array( ipfix_t *ifh, +++ ipfix_template_t *templ, +++ int nfields, +++ void **fields, +++ uint16_t *lengths ) +++{ +++ int ret; +++ +++ mod_lock(); +++ ret = _ipfix_export_array( ifh, templ, nfields, fields, lengths ); +++ mod_unlock(); +++ +++ return ret; +++} +++ +++int ipfix_export_flush( ipfix_t *ifh ) +++{ +++ int ret; +++ +++ mod_lock(); +++ ret = _ipfix_export_flush( ifh ); +++ mod_unlock(); +++ +++ return ret; +++} +++ ++--- a/lib/ipfix.h +++++ b/lib/ipfix.h ++@@ -142,6 +142,12 @@ typedef struct ++ int nrecords; /* no. of records in buffer */ ++ size_t offset; /* output buffer fill level */ ++ uint32_t seqno; /* sequence no. of next message */ +++ +++ /* experimental */ +++ int cs_tid; /* template id of current dataset */ +++ int cs_bytes; /* size of current set */ +++ uint8_t *cs_header; /* start of current set */ +++ ++ } ipfix_t; ++ ++ /** exporter funcs ++--- a/lib/ipfix_col.c +++++ b/lib/ipfix_col.c ++@@ -897,6 +897,8 @@ int ipfix_decode_datarecord( ipfixt_node ++ return -1; ++ } ++ +++ n->ipfixt->fields[i].elem->decode(p,p,len); +++ ++ data->lens[i] = len; ++ data->addrs[i] = p; ++ ++@@ -907,7 +909,7 @@ int ipfix_decode_datarecord( ipfixt_node ++ return 0; ++ } ++ ++-static void do_free_datarecord( ipfix_datarecord_t *data ) +++void ipfix_free_datarecord( ipfix_datarecord_t *data ) ++ { ++ if ( data ) { ++ if ( data->addrs ) ++@@ -925,6 +927,7 @@ int ipfix_parse_msg( ipfix_input_t *inpu ++ ipfix_hdr_t hdr; /* ipfix packet header */ ++ ipfixs_node_t *s; ++ ipfix_datarecord_t data = { NULL, NULL, 0 }; +++ ipfixe_node_t *e; ++ uint8_t *buf; /* ipfix payload */ ++ uint16_t setid, setlen; /* set id, set lenght */ ++ int i, nread, offset; /* counter */ ++@@ -1042,6 +1045,12 @@ int ipfix_parse_msg( ipfix_input_t *inpu ++ err_flag = 1; ++ } ++ else { +++ for ( e=g_exporter; e!=NULL; e=e->next ) { +++ if ( e->elem->export_dset ) +++ (void) e->elem->export_dset( t, buf+nread, setlen, +++ e->elem->data ); +++ } +++ ++ /** read data records ++ */ ++ for ( offset=nread, bytesleft=setlen; bytesleft>4; ) { ++@@ -1076,11 +1085,11 @@ int ipfix_parse_msg( ipfix_input_t *inpu ++ goto errend; ++ ++ end: ++- do_free_datarecord( &data ); +++ ipfix_free_datarecord( &data ); ++ return nread; ++ ++ errend: ++- do_free_datarecord( &data ); +++ ipfix_free_datarecord( &data ); ++ return -1; ++ } ++ ++@@ -1093,7 +1102,7 @@ void process_client_tcp( int fd, int mas ++ tcp_conn_t *tcon = (tcp_conn_t*)data; ++ char *func = "process_client_tcp"; ++ ++- mlogf( 3, "[%s] fd %d mask %d called.\n", func, fd, mask ); +++ mlogf( 4, "[%s] fd %d mask %d called.\n", func, fd, mask ); ++ ++ /** read ipfix header ++ */ ++--- a/lib/ipfix_col.h +++++ b/lib/ipfix_col.h ++@@ -88,6 +88,7 @@ typedef struct ipfix_col_info ++ int (*export_newsource)(ipfixs_node_t*,void*); ++ int (*export_newmsg)(ipfixs_node_t*,ipfix_hdr_t*,void*); ++ int (*export_trecord)(ipfixs_node_t*,ipfixt_node_t*,void*); +++ int (*export_dset)(ipfixt_node_t*,uint8_t*,size_t,void*); ++ int (*export_drecord)(ipfixs_node_t*,ipfixt_node_t*, ++ ipfix_datarecord_t*,void*); ++ void (*export_cleanup)(void*); ++--- a/lib/ipfix_col_files.c +++++ b/lib/ipfix_col_files.c ++@@ -68,7 +68,7 @@ static int export_newsource_file( ipfixs ++ return -1; ++ } ++ snprintf( s->fname+strlen(s->fname), PATH_MAX-strlen(s->fname), ++- "/%u", s->odid ); +++ "/%u", (unsigned int)s->odid ); ++ if ( (access( s->fname, R_OK ) <0 ) ++ && (mkdir( s->fname, S_IRWXU ) <0) ) { ++ mlogf( 0, "[%s] cannot access dir '%s': %s\n", ++--- a/lib/ipfix_FOKUS_IEs.txt +++++ b/lib/ipfix_FOKUS_IEs.txt ++@@ -24,6 +24,8 @@ ++ 196, IPFIX_FT_PKTID, 4, IPFIX_CODING_UINT, "pktId", "FOKUS packet id" ++ 197, IPFIX_FT_STARTTIME, 4, IPFIX_CODING_INT, "startTime", "FOKUS interval start" ++ 198, IPFIX_FT_ENDTIME, 4, IPFIX_CODING_INT, "endTime", "FOKUS interval end" +++199, IPFIX_FT_RTT_USEC, 8, IPFIX_CODING_UINT, "rtt_usec", "FOKUS rtt in us" +++ ++ 300, IPFIX_FT_FLOWCREATIONTIMEUSEC, 4, IPFIX_CODING_INT, "flowCreationTimeUsec", "FOKUS flow start usec fraction" ++ 301, IPFIX_FT_FLOWENDTIMEUSEC, 4, IPFIX_CODING_INT, "flowEndTimeUsec", "FOKUS flow end usec fraction" ++ 303, IPFIX_FT_TC_PACKETS, 4, IPFIX_CODING_UINT, "tcPackets", "DAIDALOS Packets seen" ++@@ -39,3 +41,48 @@ ++ 313, IPFIX_FT_OWDVARMIN_NSEC, 4, IPFIX_CODING_INT, "owdvarmin_nsec", "FOKUS minimum owd variance in ns" ++ 314, IPFIX_FT_OWDVARMAX_NSEC, 4, IPFIX_CODING_INT, "owdvarmax_nsec", "FOKUS maximum ow variance in ns" ++ +++# Project INTERSECTION +++315, IPFIX_FT_SOURCEIPV4FANOUT, 4, IPFIX_CODING_UINT,"sourceIPv4FanOut", "FOKUS IPv4 fanout" +++316, IPFIX_FT_DESTINATIONIPV4FANIN, 4, IPFIX_CODING_UINT,"destinationIPv4FanIn", "FOKUS IPv4 fanin" +++ +++# Project PRISM +++ +++330, IPFIX_FT_PR_SESSIONID, 4, IPFIX_CODING_UINT, "sessionId", "PRISM Session ID" +++331, IPFIX_FT_PR_TRANSACTIONID, 4, IPFIX_CODING_UINT, "transactionId", "PRISM Transaction ID" +++332, IPFIX_FT_PR_ENCRYPTEDDATA, 65535, IPFIX_CODING_STRING, "encryptedData", "PRISM encrypted data" +++333, IPFIX_FT_PR_DECRYPTIONKEY, 65535, IPFIX_CODING_STRING, "decryptionKey", "PRISM decryption key" +++334, IPFIX_FT_PR_KEYSHARE, 65535, IPFIX_CODING_STRING, "keyShare", "PRISM key share" +++335, IPFIX_FT_PR_KEYSHAREADP, 65535, IPFIX_CODING_STRING, "keyShareAdp", "PRISM key share ADP" +++336, IPFIX_FT_PR_INITVECTOR, 65535, IPFIX_CODING_STRING, "cryptoInitVector", "PRISM crypto init vector" +++ +++ +++# these information elements have been defined by FOKUS for the Oracle project +++ +++402, IPFIX_FT_ORsignalBandwidth, 4, IPFIX_CODING_UINT, "ORsignalBandwidth", "signal bandwidth" +++403, IPFIX_FT_ORsignalPower, 2, IPFIX_CODING_UINT, "ORsignalPower", "ERIP" +++404, IPFIX_FT_ORmodulationType, 2, IPFIX_CODING_UINT, "ORmodulationType", "AM/FM,.." +++405, IPFIX_FT_ORsymbolRate, 2, IPFIX_CODING_UINT, "ORsymbolRate", "symbol rate" +++406, IPFIX_FT_ORmodulationOrder, 1, IPFIX_CODING_UINT, "ORmodulationOrder", "number of levels" +++407, IPFIX_FT_ORrolloffFactor, 2, IPFIX_CODING_UINT, "ORrolloffFactor", "roll of factor" +++408, IPFIX_FT_ORgeopositionLon, 4, IPFIX_CODING_UINT, "ORgeopositionLon", "GPS coordinate, resolution 1 cm" +++409, IPFIX_FT_ORgeopositionLat, 4, IPFIX_CODING_UINT, "ORgeopositionLat", "GPS coordinate, resolution 1 cm" +++410, IPFIX_FT_ORgeopositionElev, 4, IPFIX_CODING_UINT, "ORgeopositionElev", "GPS coordinate, resolution 1 cm" +++411, IPFIX_FT_ORpolicyRecord, 65535, IPFIX_CODING_STRING, "ORpolicyRecord", "policy record has variable length, First 8 bits in data describe the length (in bytes) of the field" +++420, IPFIX_FT_channel_status, 1, IPFIX_CODING_UINT, "channel_status", vacancy of the scanned channel (1: channel busy, 0: channel idle)" +++421, IPFIX_FT_sensing_value, 2, IPFIX_CODING_UINT, "sensing_value", "Cost function output" +++422, IPFIX_FT_sensing_threshold, 2, IPFIX_CODING_UINT, "sensing_threshold", "Decision threshold" +++423, IPFIX_FT_OR_terminal_id, 1, IPFIX_CODING_UINT, "OR_terminal_id", "terminal identifier" +++424, IPFIX_FT_OR_terminal_id_list, 65535, IPFIX_CODING_STRING, "OR_terminal_id_list", "terminal identifier list" +++425, IPFIX_FT_Infrastructure_network_id, 1, IPFIX_CODING_UINT, "Infrastructure_network_id", "network identifier" +++426, IPFIX_FT_Infrastructure_network_type, 1, IPFIX_CODING_UINT, "Infrastructure_network_type", "network type (GSM - 1, UMTS - 2, WiMAX - 3, WiFi - 4)" +++427, IPFIX_FT_Battery_lifetime_min, 1, IPFIX_CODING_UINT, "Battery_lifetime_min", "expected battery lifetime to provide requested services or functionalities, in minutes" +++428, IPFIX_FT_Battery_lifetime_h, 1, IPFIX_CODING_UINT, "Battery_lifetime_h", "expected battery lifetime to provide requested services or functionalities, in hours" +++429, IPFIX_FT_Battery_status, 1, IPFIX_CODING_UINT, "Battery_status", "expected battery lifetime to provide requested services or functionalities, 1 bit status flag, values 1 or 0" +++430, IPFIX_FT_Cell_id_number, 4, IPFIX_CODING_UINT, "Cell_id_number", "16-32 bit cell id number, identifier" +++431, IPFIX_FT_Spectral_allocation_vector, 1, IPFIX_CODING_UINT, "Spectral_allocation_vector", "binary vector to indicate whether a band is free 1 bit 0 or not 1 bit 1" +++432, IPFIX_FT_Spectral_allocation_profile, 2, IPFIX_CODING_UINT, "Spectral_allocation_profile", "received power spectral density vs. frequency to indicate spectral activity in the band of interest (8-16 bits per discrete frequency value)" +++433, IPFIX_FT_Center_frequency, 2, IPFIX_CODING_UINT, "Center_frequency", "Center frequency of the sensed band" +++434, IPFIX_FT_Bandwidth_of_CAP, 2, IPFIX_CODING_UINT, "Bandwidth_of_CAP", "Bandwidth of the spectral allocation profile" +++435, IPFIX_FT_ORmodulation, 1, IPFIX_CODING_UINT, "ORmodulation", "CREST factor" +++436, IPFIX_FT_ORprofileRecord, 65535, IPFIX_CODING_STRING, "ORprofileRecord", "profile record has variable length, First 8 bits in data describe the length (in bytes) of the field" +++ +diff --git a/feeds/packages/libs/libipfix/patches/.svn/text-base/110-wprobe_ie.patch.svn-base b/feeds/packages/libs/libipfix/patches/.svn/text-base/110-wprobe_ie.patch.svn-base +new file mode 100644 +index 0000000..5e37280 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/.svn/text-base/110-wprobe_ie.patch.svn-base +@@ -0,0 +1,44 @@ ++--- a/lib/ipfix_FOKUS_IEs.txt +++++ b/lib/ipfix_FOKUS_IEs.txt ++@@ -86,3 +86,41 @@ ++ 435, IPFIX_FT_ORmodulation, 1, IPFIX_CODING_UINT, "ORmodulation", "CREST factor" ++ 436, IPFIX_FT_ORprofileRecord, 65535, IPFIX_CODING_STRING, "ORprofileRecord", "profile record has variable length, First 8 bits in data describe the length (in bytes) of the field" ++ +++500, IPFIX_FT_WPROBE_NOISE_N, 4, IPFIX_CODING_UINT, "global_noise_n", "wprobe global noice floor - Number of samples" +++501, IPFIX_FT_WPROBE_NOISE_S, 8, IPFIX_CODING_UINT, "global_noise_s", "wprobe global noice floor - Sum of samples" +++502, IPFIX_FT_WPROBE_NOISE_SS, 8, IPFIX_CODING_UINT, "global_noise_ss", "wprobe global noice floor - Sum of squared samples" +++503, IPFIX_FT_WPROBE_PHY_BUSY_N, 4, IPFIX_CODING_UINT, "global_phy_busy_n", "wprobe global airtime total - Number of samples" +++504, IPFIX_FT_WPROBE_PHY_BUSY_S, 8, IPFIX_CODING_UINT, "global_phy_busy_s", "wprobe global airtime total - Sum of samples" +++505, IPFIX_FT_WPROBE_PHY_BUSY_SS, 8, IPFIX_CODING_UINT, "global_phy_busy_ss", "wprobe global airtime total - Sum of squared samples" +++506, IPFIX_FT_WPROBE_PHY_RX_N, 4, IPFIX_CODING_UINT, "global_phy_rx_n", "wprobe global airtime total from rx-frame - Number of samples" +++507, IPFIX_FT_WPROBE_PHY_RX_S, 8, IPFIX_CODING_UINT, "global_phy_rx_s", "wprobe global airtime total from rx-frame - Sum of samples" +++508, IPFIX_FT_WPROBE_PHY_RX_SS, 8, IPFIX_CODING_UINT, "global_phy_rx_ss", "wprobe global airtime total from rx-frame - Sum of squared samples" +++509, IPFIX_FT_WPROBE_PHY_TX_N, 4, IPFIX_CODING_UINT, "global_phy_tx_n", "wprobe global airtime total from tx-frame - Number of samples" +++510, IPFIX_FT_WPROBE_PHY_TX_S, 8, IPFIX_CODING_UINT, "global_phy_tx_s", "wprobe global airtime total from tx-frame - Sum of samples" +++511, IPFIX_FT_WPROBE_PHY_TX_SS, 8, IPFIX_CODING_UINT, "global_phy_tx_ss", "wprobe global airtime total from tx-frame - Sum of squared samples" +++512, IPFIX_FT_WPROBE_RSSI_N, 4, IPFIX_CODING_UINT, "link_rssi_n", "wprobe link received signal strength indication - Number of samples" +++513, IPFIX_FT_WPROBE_RSSI_S, 8, IPFIX_CODING_UINT, "link_rssi_s", "wprobe link received signal strength indication - Sum of samples" +++514, IPFIX_FT_WPROBE_RSSI_SS, 8, IPFIX_CODING_UINT, "link_rssi_ss", "wprobe link received signal strength indication - Sum of squared samples" +++515, IPFIX_FT_WPROBE_SIGNAL_N, 4, IPFIX_CODING_UINT, "link_signal_n", "wprobe link signal strength in dB - Number of samples" +++516, IPFIX_FT_WPROBE_SIGNAL_S, 8, IPFIX_CODING_UINT, "link_signal_s", "wprobe link signal strength in dB - Sum of samples" +++517, IPFIX_FT_WPROBE_SIGNAL_SS, 8, IPFIX_CODING_UINT, "link_signal_ss", "wprobe link signal strength in dB - Sum of squared samples" +++518, IPFIX_FT_WPROBE_IEEE_RX_RATE_N, 4, IPFIX_CODING_UINT, "link_ieee_rx_rate_n", "wprobe link IEEE 802.11 RX data rate - Number of samples" +++519, IPFIX_FT_WPROBE_IEEE_RX_RATE_S, 8, IPFIX_CODING_UINT, "link_ieee_rx_rate_s", "wprobe link IEEE 802.11 RX data rate - Sum of samples" +++520, IPFIX_FT_WPROBE_IEEE_RX_RATE_SS, 8, IPFIX_CODING_UINT, "link_ieee_rx_rate_ss", "wprobe link IEEE 802.11 RX data rate - Sum of squared samples" +++521, IPFIX_FT_WPROBE_IEEE_TX_RATE_N, 4, IPFIX_CODING_UINT, "link_ieee_tx_rate_n", "wprobe link IEEE 802.11 TX data rate - Number of samples" +++522, IPFIX_FT_WPROBE_IEEE_TX_RATE_S, 8, IPFIX_CODING_UINT, "link_ieee_tx_rate_s", "wprobe link IEEE 802.11 TX data rate - Sum of samples" +++523, IPFIX_FT_WPROBE_IEEE_TX_RATE_SS, 8, IPFIX_CODING_UINT, "link_ieee_tx_rate_ss", "wprobe link IEEE 802.11 TX data rate - Sum of squared samples" +++524, IPFIX_FT_WPROBE_RETRANSMIT_200_N, 4, IPFIX_CODING_UINT, "link_retransmit_200_n", "wprobe link total retransmissions per packet - <200 bytes - Number of samples" +++525, IPFIX_FT_WPROBE_RETRANSMIT_200_S, 8, IPFIX_CODING_UINT, "link_retransmit_200_s", "wprobe link total retransmissions per packet - <200 bytes - Sum of samples" +++526, IPFIX_FT_WPROBE_RETRANSMIT_200_SS, 8, IPFIX_CODING_UINT, "link_retransmit_200_ss", "wprobe link total retransmissions per packet - <200 bytes - Sum of squared samples" +++527, IPFIX_FT_WPROBE_RETRANSMIT_400_N, 4, IPFIX_CODING_UINT, "link_retransmit_400_n", "wprobe link total retransmissions per packet - <400 bytes - Number of samples" +++528, IPFIX_FT_WPROBE_RETRANSMIT_400_S, 8, IPFIX_CODING_UINT, "link_retransmit_400_s", "wprobe link total retransmissions per packet - <400 bytes - Sum of samples" +++529, IPFIX_FT_WPROBE_RETRANSMIT_400_SS, 8, IPFIX_CODING_UINT, "link_retransmit_400_ss", "wprobe link total retransmissions per packet - <400 bytes - Sum of squared samples" +++530, IPFIX_FT_WPROBE_RETRANSMIT_800_N, 4, IPFIX_CODING_UINT, "link_retransmit_800_n", "wprobe link total retransmissions per packet - <800 bytes - Number of samples" +++531, IPFIX_FT_WPROBE_RETRANSMIT_800_S, 8, IPFIX_CODING_UINT, "link_retransmit_800_s", "wprobe link total retransmissions per packet - <800 bytes - Sum of samples" +++532, IPFIX_FT_WPROBE_RETRANSMIT_800_SS, 8, IPFIX_CODING_UINT, "link_retransmit_800_ss", "wprobe link total retransmissions per packet - <800 bytes - Sum of squared samples" +++533, IPFIX_FT_WPROBE_RETRANSMIT_1600_N, 4, IPFIX_CODING_UINT, "link_retransmit_1600_n", "wprobe link total retransmissions per packet - >800 bytes - Number of samples" +++534, IPFIX_FT_WPROBE_RETRANSMIT_1600_S, 8, IPFIX_CODING_UINT, "link_retransmit_1600_s", "wprobe link total retransmissions per packet - >800 bytes - Sum of samples" +++535, IPFIX_FT_WPROBE_RETRANSMIT_1600_SS, 8, IPFIX_CODING_UINT, "link_retransmit_1600_ss", "wprobe link total retransmissions per packet - >800 bytes - Sum of squared samples" +++536, IPFIX_FT_WPROBE_FRAMES, 4, IPFIX_CODING_UINT, "global_frames", "wprobe global number of 802.11 frames seen" +++537, IPFIX_FT_WPROBE_PROBEREQ, 4, IPFIX_CODING_UINT, "global_probereq", "wprobe global number of 802.11 probe requests seen" +diff --git a/feeds/packages/libs/libipfix/patches/.svn/text-base/120-ipfixmisc.patch.svn-base b/feeds/packages/libs/libipfix/patches/.svn/text-base/120-ipfixmisc.patch.svn-base +new file mode 100644 +index 0000000..e3f5a05 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/.svn/text-base/120-ipfixmisc.patch.svn-base +@@ -0,0 +1,27 @@ ++Index: libipfix.r51/lib/Makefile.in ++=================================================================== ++--- libipfix.r51.orig/lib/Makefile.in 2008-08-05 15:15:23.000000000 +0200 +++++ libipfix.r51/lib/Makefile.in 2012-06-05 19:26:34.061692890 +0200 ++@@ -41,7 +41,7 @@ ++ INCLS = -I. -I.. ++ CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++ ++-TARGETS = libmisc.a libipfix.a +++TARGETS = libipfixmisc.a libipfix.a ++ OBJS = ipfix.o ipfix_col.o ipfix_print.o \ ++ ipfix_col_files.o ipfix_col_db.o @IPFIX_DB_OBJ@ @IPFIX_SSL_OBJ@ ++ DEPHDR = ipfix.h ipfix_def.h ipfix_fields.h ipfix_def_fokus.h ipfix_fields_fokus.h ++@@ -60,11 +60,11 @@ ++ install: ++ @[ -d ${libdir} ] || (mkdir -p ${libdir}; chmod 755 ${libdir}) ++ $(INSTALL_DATA) libipfix.a ${libdir}/ ++- $(INSTALL_DATA) libmisc.a ${libdir}/ +++ $(INSTALL_DATA) libipfixmisc.a ${libdir}/ ++ @[ -d ${includedir} ] || (mkdir -p ${includedir}; chmod 755 ${includedir}) ++ $(INSTALL_HEADER) ipfix*.h mlog.h mpoll.h ${includedir}/ ++ ++-libmisc.a: $(MISCOBJS) Makefile +++libipfixmisc.a: $(MISCOBJS) Makefile ++ @rm -f $@ ++ $(AR) rc $@ $(MISCOBJS) ++ +diff --git a/feeds/packages/libs/libipfix/patches/100-openimp_sync.patch b/feeds/packages/libs/libipfix/patches/100-openimp_sync.patch +new file mode 100644 +index 0000000..5b6e2e3 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/100-openimp_sync.patch +@@ -0,0 +1,474 @@ ++--- a/lib/ipfix.c +++++ b/lib/ipfix.c ++@@ -37,6 +37,9 @@ $$LIC$$ ++ #ifdef SCTPSUPPORT ++ #include ++ #endif +++#ifndef NOTHREADS +++#include +++#endif ++ #include ++ #include ++ ++@@ -123,6 +126,18 @@ static uint16_t g_lasttid; ++ static ipfix_datarecord_t g_data = { NULL, NULL, 0 }; /* ipfix_export */ ++ ++ static ipfix_field_t *g_ipfix_fields; +++#ifndef NOTHREADS +++static pthread_mutex_t g_mutex; +++#define mod_lock() { \ +++ if ( pthread_mutex_lock( &g_mutex ) !=0 ) \ +++ mlogf( 0, "[ipfix] mutex_lock() failed: %s\n", \ +++ strerror( errno ) ); \ +++ } +++#define mod_unlock() { pthread_mutex_unlock( &g_mutex ); } +++#else +++#define mod_lock() +++#define mod_unlock() +++#endif ++ ++ /*----- prototypes -------------------------------------------------------*/ ++ ++@@ -133,6 +148,7 @@ int _ipfix_send_message( ipfix_t *ifh, ++ ipfix_message_t *message ); ++ int _ipfix_write_msghdr( ipfix_t *ifh, ipfix_message_t *msg, iobuf_t *buf ); ++ void _ipfix_disconnect( ipfix_collector_t *col ); +++int _ipfix_export_flush( ipfix_t *ifh ); ++ ++ ++ /* name : do_writeselect ++@@ -576,16 +592,18 @@ int ipfix_decode_float( void *in, void * ++ ++ int ipfix_snprint_float( char *str, size_t size, void *data, size_t len ) ++ { ++- float tmp32; ++- double tmp64; +++ uint32_t tmp32; +++ uint64_t tmp64; ++ ++ switch ( len ) { ++ case 4: ++- ipfix_decode_float( data, &tmp32, 4); ++- return snprintf( str, size, "%f", tmp32 ); +++ memcpy( &tmp32, data, len ); +++ tmp32 = htonl( tmp32 ); +++ return snprintf( str, size, "%f", (float)tmp32 ); ++ case 8: ++- ipfix_decode_float( data, &tmp64, 8); ++- return snprintf( str, size, "%lf", tmp64); +++ memcpy( &tmp64, data, len ); +++ tmp64 = HTONLL( tmp64 ); +++ return snprintf( str, size, "%lf", (double)tmp64 ); ++ default: ++ break; ++ } ++@@ -682,12 +700,19 @@ int ipfix_get_eno_ieid( char *field, int ++ * parameters: ++ * remarks: init module, read field type info. ++ */ ++-int ipfix_init ( void ) +++int ipfix_init( void ) ++ { ++ if ( g_tstart ) { ++ ipfix_cleanup(); ++ } ++ +++#ifndef NOTHREADS +++ if ( pthread_mutex_init( &g_mutex, NULL ) !=0 ) { +++ mlogf( 0, "[ipfix] pthread_mutex_init() failed: %s\n", +++ strerror(errno) ); +++ return -1; +++ } +++#endif ++ g_tstart = time(NULL); ++ signal( SIGPIPE, SIG_IGN ); ++ g_lasttid = 255; ++@@ -806,6 +831,9 @@ void ipfix_cleanup ( void ) ++ g_data.maxfields = 0; ++ g_data.lens = NULL; ++ g_data.addrs = NULL; +++#ifndef NOTHREADS +++ (void)pthread_mutex_destroy( &g_mutex ); +++#endif ++ } ++ ++ int _ipfix_connect ( ipfix_collector_t *col ) ++@@ -1465,7 +1493,7 @@ int _ipfix_write_template( ipfix_t ++ default: ++ /* check space */ ++ if ( tsize+ifh->offset > IPFIX_DEFAULT_BUFLEN ) { ++- if ( ipfix_export_flush( ifh ) < 0 ) +++ if ( _ipfix_export_flush( ifh ) < 0 ) ++ return -1; ++ if ( tsize+ifh->offset > IPFIX_DEFAULT_BUFLEN ) ++ return -1; ++@@ -1474,6 +1502,8 @@ int _ipfix_write_template( ipfix_t ++ /* write template prior to data */ ++ if ( ifh->offset > 0 ) { ++ memmove( ifh->buffer + tsize, ifh->buffer, ifh->offset ); +++ if ( ifh->cs_tid ) +++ ifh->cs_header += tsize; ++ } ++ ++ buf = ifh->buffer; ++@@ -1615,8 +1645,11 @@ int ipfix_open( ipfix_t **ipfixh, int so ++ return -1; ++ } ++ node->ifh = i; +++ +++ mod_lock(); ++ node->next = g_ipfixlist; ++ g_ipfixlist = node; +++ mod_unlock(); ++ ++ *ipfixh = i; ++ return 0; ++@@ -1633,7 +1666,8 @@ void ipfix_close( ipfix_t *h ) ++ { ++ ipfix_node_t *l, *n; ++ ++- ipfix_export_flush( h ); +++ mod_lock(); +++ _ipfix_export_flush( h ); ++ ++ while( h->collectors ) ++ _ipfix_drop_collector( (ipfix_collector_t**)&h->collectors ); ++@@ -1659,6 +1693,7 @@ void ipfix_close( ipfix_t *h ) ++ #endif ++ free(h->buffer); ++ free(h); +++ mod_unlock(); ++ } ++ } ++ ++@@ -2156,6 +2191,22 @@ void ipfix_release_template( ipfix_t *if ++ ipfix_delete_template( ifh, templ ); ++ } ++ +++static void _finish_cs( ipfix_t *ifh ) +++{ +++ size_t buflen; +++ uint8_t *buf; +++ +++ /* finish current dataset */ +++ if ( (buf=ifh->cs_header) ==NULL ) +++ return; +++ buflen = 0; +++ INSERTU16( buf+buflen, buflen, ifh->cs_tid ); +++ INSERTU16( buf+buflen, buflen, ifh->cs_bytes ); +++ ifh->cs_bytes = 0; +++ ifh->cs_header = NULL; +++ ifh->cs_tid = 0; +++} +++ ++ int ipfix_export( ipfix_t *ifh, ipfix_template_t *templ, ... ) ++ { ++ int i; ++@@ -2199,13 +2250,14 @@ int ipfix_export( ipfix_t *ifh, ipfix_te ++ g_data.addrs, g_data.lens ); ++ } ++ ++-int ipfix_export_array( ipfix_t *ifh, ++- ipfix_template_t *templ, ++- int nfields, ++- void **fields, ++- uint16_t *lengths ) +++static int +++_ipfix_export_array( ipfix_t *ifh, +++ ipfix_template_t *templ, +++ int nfields, +++ void **fields, +++ uint16_t *lengths ) ++ { ++- int i; +++ int i, newset_f=0; ++ size_t buflen, datasetlen; ++ uint8_t *p, *buf; ++ ++@@ -2249,7 +2301,19 @@ int ipfix_export_array( ipfix_t ++ ++ /** get size of data set, check space ++ */ ++- for ( i=0, datasetlen=4; itid == ifh->cs_tid ) { +++ newset_f = 0; +++ datasetlen = 0; +++ } +++ else { +++ if ( ifh->cs_tid > 0 ) { +++ _finish_cs( ifh ); +++ } +++ newset_f = 1; +++ datasetlen = 4; +++ } +++ +++ for ( i=0; ifields[i].flength == IPFIX_FT_VARLEN ) { ++ if ( lengths[i]>254 ) ++ datasetlen += 3; ++@@ -2263,21 +2327,29 @@ int ipfix_export_array( ipfix_t ++ } ++ datasetlen += lengths[i]; ++ } ++- if ( ((ifh->offset + datasetlen) > IPFIX_DEFAULT_BUFLEN ) ++- && (ipfix_export_flush( ifh ) <0) ) { ++- return -1; +++ +++ if ( (ifh->offset + datasetlen) > IPFIX_DEFAULT_BUFLEN ) { +++ if ( ifh->cs_tid ) +++ _finish_cs( ifh ); +++ newset_f = 1; +++ +++ if ( _ipfix_export_flush( ifh ) <0 ) +++ return -1; ++ } ++ ++- /* fill buffer ++- */ +++ /* fill buffer */ ++ buf = (uint8_t*)(ifh->buffer) + ifh->offset; ++ buflen = 0; ++ ++- /* insert data set ++- */ ++- ifh->nrecords ++; ++- INSERTU16( buf+buflen, buflen, templ->tid ); ++- INSERTU16( buf+buflen, buflen, datasetlen ); +++ if ( newset_f ) { +++ /* insert data set +++ */ +++ ifh->cs_bytes = 0; +++ ifh->cs_header = buf; +++ ifh->cs_tid = templ->tid; +++ INSERTU16( buf+buflen, buflen, templ->tid ); +++ INSERTU16( buf+buflen, buflen, 4 ); +++ } ++ ++ /* insert data record ++ */ ++@@ -2303,7 +2375,9 @@ int ipfix_export_array( ipfix_t ++ buflen += lengths[i]; ++ } ++ +++ ifh->nrecords ++; ++ ifh->offset += buflen; +++ ifh->cs_bytes += buflen; ++ if ( ifh->version == IPFIX_VERSION ) ++ ifh->seqno ++; ++ return 0; ++@@ -2313,7 +2387,7 @@ int ipfix_export_array( ipfix_t ++ * parameters: ++ * remarks: rewrite this func! ++ */ ++-int ipfix_export_flush( ipfix_t *ifh ) +++int _ipfix_export_flush( ipfix_t *ifh ) ++ { ++ iobuf_t *buf; ++ ipfix_collector_t *col; ++@@ -2322,8 +2396,14 @@ int ipfix_export_flush( ipfix_t *ifh ) ++ if ( (ifh==NULL) || (ifh->offset==0) ) ++ return 0; ++ ++- if ( (buf=_ipfix_getbuf()) ==NULL ) +++ if ( ifh->cs_tid > 0 ) { +++ /* finish current dataset */ +++ _finish_cs( ifh ); +++ } +++ +++ if ( (buf=_ipfix_getbuf()) ==NULL ) { ++ return -1; +++ } ++ ++ #ifdef DEBUG ++ mlogf( 0, "[ipfix_export_flush] msg has %d records, %d bytes\n", ++@@ -2350,3 +2430,30 @@ int ipfix_export_flush( ipfix_t *ifh ) ++ _ipfix_freebuf( buf ); ++ return ret; ++ } +++ +++int ipfix_export_array( ipfix_t *ifh, +++ ipfix_template_t *templ, +++ int nfields, +++ void **fields, +++ uint16_t *lengths ) +++{ +++ int ret; +++ +++ mod_lock(); +++ ret = _ipfix_export_array( ifh, templ, nfields, fields, lengths ); +++ mod_unlock(); +++ +++ return ret; +++} +++ +++int ipfix_export_flush( ipfix_t *ifh ) +++{ +++ int ret; +++ +++ mod_lock(); +++ ret = _ipfix_export_flush( ifh ); +++ mod_unlock(); +++ +++ return ret; +++} +++ ++--- a/lib/ipfix.h +++++ b/lib/ipfix.h ++@@ -142,6 +142,12 @@ typedef struct ++ int nrecords; /* no. of records in buffer */ ++ size_t offset; /* output buffer fill level */ ++ uint32_t seqno; /* sequence no. of next message */ +++ +++ /* experimental */ +++ int cs_tid; /* template id of current dataset */ +++ int cs_bytes; /* size of current set */ +++ uint8_t *cs_header; /* start of current set */ +++ ++ } ipfix_t; ++ ++ /** exporter funcs ++--- a/lib/ipfix_col.c +++++ b/lib/ipfix_col.c ++@@ -897,6 +897,8 @@ int ipfix_decode_datarecord( ipfixt_node ++ return -1; ++ } ++ +++ n->ipfixt->fields[i].elem->decode(p,p,len); +++ ++ data->lens[i] = len; ++ data->addrs[i] = p; ++ ++@@ -907,7 +909,7 @@ int ipfix_decode_datarecord( ipfixt_node ++ return 0; ++ } ++ ++-static void do_free_datarecord( ipfix_datarecord_t *data ) +++void ipfix_free_datarecord( ipfix_datarecord_t *data ) ++ { ++ if ( data ) { ++ if ( data->addrs ) ++@@ -925,6 +927,7 @@ int ipfix_parse_msg( ipfix_input_t *inpu ++ ipfix_hdr_t hdr; /* ipfix packet header */ ++ ipfixs_node_t *s; ++ ipfix_datarecord_t data = { NULL, NULL, 0 }; +++ ipfixe_node_t *e; ++ uint8_t *buf; /* ipfix payload */ ++ uint16_t setid, setlen; /* set id, set lenght */ ++ int i, nread, offset; /* counter */ ++@@ -1042,6 +1045,12 @@ int ipfix_parse_msg( ipfix_input_t *inpu ++ err_flag = 1; ++ } ++ else { +++ for ( e=g_exporter; e!=NULL; e=e->next ) { +++ if ( e->elem->export_dset ) +++ (void) e->elem->export_dset( t, buf+nread, setlen, +++ e->elem->data ); +++ } +++ ++ /** read data records ++ */ ++ for ( offset=nread, bytesleft=setlen; bytesleft>4; ) { ++@@ -1076,11 +1085,11 @@ int ipfix_parse_msg( ipfix_input_t *inpu ++ goto errend; ++ ++ end: ++- do_free_datarecord( &data ); +++ ipfix_free_datarecord( &data ); ++ return nread; ++ ++ errend: ++- do_free_datarecord( &data ); +++ ipfix_free_datarecord( &data ); ++ return -1; ++ } ++ ++@@ -1093,7 +1102,7 @@ void process_client_tcp( int fd, int mas ++ tcp_conn_t *tcon = (tcp_conn_t*)data; ++ char *func = "process_client_tcp"; ++ ++- mlogf( 3, "[%s] fd %d mask %d called.\n", func, fd, mask ); +++ mlogf( 4, "[%s] fd %d mask %d called.\n", func, fd, mask ); ++ ++ /** read ipfix header ++ */ ++--- a/lib/ipfix_col.h +++++ b/lib/ipfix_col.h ++@@ -88,6 +88,7 @@ typedef struct ipfix_col_info ++ int (*export_newsource)(ipfixs_node_t*,void*); ++ int (*export_newmsg)(ipfixs_node_t*,ipfix_hdr_t*,void*); ++ int (*export_trecord)(ipfixs_node_t*,ipfixt_node_t*,void*); +++ int (*export_dset)(ipfixt_node_t*,uint8_t*,size_t,void*); ++ int (*export_drecord)(ipfixs_node_t*,ipfixt_node_t*, ++ ipfix_datarecord_t*,void*); ++ void (*export_cleanup)(void*); ++--- a/lib/ipfix_col_files.c +++++ b/lib/ipfix_col_files.c ++@@ -68,7 +68,7 @@ static int export_newsource_file( ipfixs ++ return -1; ++ } ++ snprintf( s->fname+strlen(s->fname), PATH_MAX-strlen(s->fname), ++- "/%u", s->odid ); +++ "/%u", (unsigned int)s->odid ); ++ if ( (access( s->fname, R_OK ) <0 ) ++ && (mkdir( s->fname, S_IRWXU ) <0) ) { ++ mlogf( 0, "[%s] cannot access dir '%s': %s\n", ++--- a/lib/ipfix_FOKUS_IEs.txt +++++ b/lib/ipfix_FOKUS_IEs.txt ++@@ -24,6 +24,8 @@ ++ 196, IPFIX_FT_PKTID, 4, IPFIX_CODING_UINT, "pktId", "FOKUS packet id" ++ 197, IPFIX_FT_STARTTIME, 4, IPFIX_CODING_INT, "startTime", "FOKUS interval start" ++ 198, IPFIX_FT_ENDTIME, 4, IPFIX_CODING_INT, "endTime", "FOKUS interval end" +++199, IPFIX_FT_RTT_USEC, 8, IPFIX_CODING_UINT, "rtt_usec", "FOKUS rtt in us" +++ ++ 300, IPFIX_FT_FLOWCREATIONTIMEUSEC, 4, IPFIX_CODING_INT, "flowCreationTimeUsec", "FOKUS flow start usec fraction" ++ 301, IPFIX_FT_FLOWENDTIMEUSEC, 4, IPFIX_CODING_INT, "flowEndTimeUsec", "FOKUS flow end usec fraction" ++ 303, IPFIX_FT_TC_PACKETS, 4, IPFIX_CODING_UINT, "tcPackets", "DAIDALOS Packets seen" ++@@ -39,3 +41,48 @@ ++ 313, IPFIX_FT_OWDVARMIN_NSEC, 4, IPFIX_CODING_INT, "owdvarmin_nsec", "FOKUS minimum owd variance in ns" ++ 314, IPFIX_FT_OWDVARMAX_NSEC, 4, IPFIX_CODING_INT, "owdvarmax_nsec", "FOKUS maximum ow variance in ns" ++ +++# Project INTERSECTION +++315, IPFIX_FT_SOURCEIPV4FANOUT, 4, IPFIX_CODING_UINT,"sourceIPv4FanOut", "FOKUS IPv4 fanout" +++316, IPFIX_FT_DESTINATIONIPV4FANIN, 4, IPFIX_CODING_UINT,"destinationIPv4FanIn", "FOKUS IPv4 fanin" +++ +++# Project PRISM +++ +++330, IPFIX_FT_PR_SESSIONID, 4, IPFIX_CODING_UINT, "sessionId", "PRISM Session ID" +++331, IPFIX_FT_PR_TRANSACTIONID, 4, IPFIX_CODING_UINT, "transactionId", "PRISM Transaction ID" +++332, IPFIX_FT_PR_ENCRYPTEDDATA, 65535, IPFIX_CODING_STRING, "encryptedData", "PRISM encrypted data" +++333, IPFIX_FT_PR_DECRYPTIONKEY, 65535, IPFIX_CODING_STRING, "decryptionKey", "PRISM decryption key" +++334, IPFIX_FT_PR_KEYSHARE, 65535, IPFIX_CODING_STRING, "keyShare", "PRISM key share" +++335, IPFIX_FT_PR_KEYSHAREADP, 65535, IPFIX_CODING_STRING, "keyShareAdp", "PRISM key share ADP" +++336, IPFIX_FT_PR_INITVECTOR, 65535, IPFIX_CODING_STRING, "cryptoInitVector", "PRISM crypto init vector" +++ +++ +++# these information elements have been defined by FOKUS for the Oracle project +++ +++402, IPFIX_FT_ORsignalBandwidth, 4, IPFIX_CODING_UINT, "ORsignalBandwidth", "signal bandwidth" +++403, IPFIX_FT_ORsignalPower, 2, IPFIX_CODING_UINT, "ORsignalPower", "ERIP" +++404, IPFIX_FT_ORmodulationType, 2, IPFIX_CODING_UINT, "ORmodulationType", "AM/FM,.." +++405, IPFIX_FT_ORsymbolRate, 2, IPFIX_CODING_UINT, "ORsymbolRate", "symbol rate" +++406, IPFIX_FT_ORmodulationOrder, 1, IPFIX_CODING_UINT, "ORmodulationOrder", "number of levels" +++407, IPFIX_FT_ORrolloffFactor, 2, IPFIX_CODING_UINT, "ORrolloffFactor", "roll of factor" +++408, IPFIX_FT_ORgeopositionLon, 4, IPFIX_CODING_UINT, "ORgeopositionLon", "GPS coordinate, resolution 1 cm" +++409, IPFIX_FT_ORgeopositionLat, 4, IPFIX_CODING_UINT, "ORgeopositionLat", "GPS coordinate, resolution 1 cm" +++410, IPFIX_FT_ORgeopositionElev, 4, IPFIX_CODING_UINT, "ORgeopositionElev", "GPS coordinate, resolution 1 cm" +++411, IPFIX_FT_ORpolicyRecord, 65535, IPFIX_CODING_STRING, "ORpolicyRecord", "policy record has variable length, First 8 bits in data describe the length (in bytes) of the field" +++420, IPFIX_FT_channel_status, 1, IPFIX_CODING_UINT, "channel_status", vacancy of the scanned channel (1: channel busy, 0: channel idle)" +++421, IPFIX_FT_sensing_value, 2, IPFIX_CODING_UINT, "sensing_value", "Cost function output" +++422, IPFIX_FT_sensing_threshold, 2, IPFIX_CODING_UINT, "sensing_threshold", "Decision threshold" +++423, IPFIX_FT_OR_terminal_id, 1, IPFIX_CODING_UINT, "OR_terminal_id", "terminal identifier" +++424, IPFIX_FT_OR_terminal_id_list, 65535, IPFIX_CODING_STRING, "OR_terminal_id_list", "terminal identifier list" +++425, IPFIX_FT_Infrastructure_network_id, 1, IPFIX_CODING_UINT, "Infrastructure_network_id", "network identifier" +++426, IPFIX_FT_Infrastructure_network_type, 1, IPFIX_CODING_UINT, "Infrastructure_network_type", "network type (GSM - 1, UMTS - 2, WiMAX - 3, WiFi - 4)" +++427, IPFIX_FT_Battery_lifetime_min, 1, IPFIX_CODING_UINT, "Battery_lifetime_min", "expected battery lifetime to provide requested services or functionalities, in minutes" +++428, IPFIX_FT_Battery_lifetime_h, 1, IPFIX_CODING_UINT, "Battery_lifetime_h", "expected battery lifetime to provide requested services or functionalities, in hours" +++429, IPFIX_FT_Battery_status, 1, IPFIX_CODING_UINT, "Battery_status", "expected battery lifetime to provide requested services or functionalities, 1 bit status flag, values 1 or 0" +++430, IPFIX_FT_Cell_id_number, 4, IPFIX_CODING_UINT, "Cell_id_number", "16-32 bit cell id number, identifier" +++431, IPFIX_FT_Spectral_allocation_vector, 1, IPFIX_CODING_UINT, "Spectral_allocation_vector", "binary vector to indicate whether a band is free 1 bit 0 or not 1 bit 1" +++432, IPFIX_FT_Spectral_allocation_profile, 2, IPFIX_CODING_UINT, "Spectral_allocation_profile", "received power spectral density vs. frequency to indicate spectral activity in the band of interest (8-16 bits per discrete frequency value)" +++433, IPFIX_FT_Center_frequency, 2, IPFIX_CODING_UINT, "Center_frequency", "Center frequency of the sensed band" +++434, IPFIX_FT_Bandwidth_of_CAP, 2, IPFIX_CODING_UINT, "Bandwidth_of_CAP", "Bandwidth of the spectral allocation profile" +++435, IPFIX_FT_ORmodulation, 1, IPFIX_CODING_UINT, "ORmodulation", "CREST factor" +++436, IPFIX_FT_ORprofileRecord, 65535, IPFIX_CODING_STRING, "ORprofileRecord", "profile record has variable length, First 8 bits in data describe the length (in bytes) of the field" +++ +diff --git a/feeds/packages/libs/libipfix/patches/110-wprobe_ie.patch b/feeds/packages/libs/libipfix/patches/110-wprobe_ie.patch +new file mode 100644 +index 0000000..5e37280 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/110-wprobe_ie.patch +@@ -0,0 +1,44 @@ ++--- a/lib/ipfix_FOKUS_IEs.txt +++++ b/lib/ipfix_FOKUS_IEs.txt ++@@ -86,3 +86,41 @@ ++ 435, IPFIX_FT_ORmodulation, 1, IPFIX_CODING_UINT, "ORmodulation", "CREST factor" ++ 436, IPFIX_FT_ORprofileRecord, 65535, IPFIX_CODING_STRING, "ORprofileRecord", "profile record has variable length, First 8 bits in data describe the length (in bytes) of the field" ++ +++500, IPFIX_FT_WPROBE_NOISE_N, 4, IPFIX_CODING_UINT, "global_noise_n", "wprobe global noice floor - Number of samples" +++501, IPFIX_FT_WPROBE_NOISE_S, 8, IPFIX_CODING_UINT, "global_noise_s", "wprobe global noice floor - Sum of samples" +++502, IPFIX_FT_WPROBE_NOISE_SS, 8, IPFIX_CODING_UINT, "global_noise_ss", "wprobe global noice floor - Sum of squared samples" +++503, IPFIX_FT_WPROBE_PHY_BUSY_N, 4, IPFIX_CODING_UINT, "global_phy_busy_n", "wprobe global airtime total - Number of samples" +++504, IPFIX_FT_WPROBE_PHY_BUSY_S, 8, IPFIX_CODING_UINT, "global_phy_busy_s", "wprobe global airtime total - Sum of samples" +++505, IPFIX_FT_WPROBE_PHY_BUSY_SS, 8, IPFIX_CODING_UINT, "global_phy_busy_ss", "wprobe global airtime total - Sum of squared samples" +++506, IPFIX_FT_WPROBE_PHY_RX_N, 4, IPFIX_CODING_UINT, "global_phy_rx_n", "wprobe global airtime total from rx-frame - Number of samples" +++507, IPFIX_FT_WPROBE_PHY_RX_S, 8, IPFIX_CODING_UINT, "global_phy_rx_s", "wprobe global airtime total from rx-frame - Sum of samples" +++508, IPFIX_FT_WPROBE_PHY_RX_SS, 8, IPFIX_CODING_UINT, "global_phy_rx_ss", "wprobe global airtime total from rx-frame - Sum of squared samples" +++509, IPFIX_FT_WPROBE_PHY_TX_N, 4, IPFIX_CODING_UINT, "global_phy_tx_n", "wprobe global airtime total from tx-frame - Number of samples" +++510, IPFIX_FT_WPROBE_PHY_TX_S, 8, IPFIX_CODING_UINT, "global_phy_tx_s", "wprobe global airtime total from tx-frame - Sum of samples" +++511, IPFIX_FT_WPROBE_PHY_TX_SS, 8, IPFIX_CODING_UINT, "global_phy_tx_ss", "wprobe global airtime total from tx-frame - Sum of squared samples" +++512, IPFIX_FT_WPROBE_RSSI_N, 4, IPFIX_CODING_UINT, "link_rssi_n", "wprobe link received signal strength indication - Number of samples" +++513, IPFIX_FT_WPROBE_RSSI_S, 8, IPFIX_CODING_UINT, "link_rssi_s", "wprobe link received signal strength indication - Sum of samples" +++514, IPFIX_FT_WPROBE_RSSI_SS, 8, IPFIX_CODING_UINT, "link_rssi_ss", "wprobe link received signal strength indication - Sum of squared samples" +++515, IPFIX_FT_WPROBE_SIGNAL_N, 4, IPFIX_CODING_UINT, "link_signal_n", "wprobe link signal strength in dB - Number of samples" +++516, IPFIX_FT_WPROBE_SIGNAL_S, 8, IPFIX_CODING_UINT, "link_signal_s", "wprobe link signal strength in dB - Sum of samples" +++517, IPFIX_FT_WPROBE_SIGNAL_SS, 8, IPFIX_CODING_UINT, "link_signal_ss", "wprobe link signal strength in dB - Sum of squared samples" +++518, IPFIX_FT_WPROBE_IEEE_RX_RATE_N, 4, IPFIX_CODING_UINT, "link_ieee_rx_rate_n", "wprobe link IEEE 802.11 RX data rate - Number of samples" +++519, IPFIX_FT_WPROBE_IEEE_RX_RATE_S, 8, IPFIX_CODING_UINT, "link_ieee_rx_rate_s", "wprobe link IEEE 802.11 RX data rate - Sum of samples" +++520, IPFIX_FT_WPROBE_IEEE_RX_RATE_SS, 8, IPFIX_CODING_UINT, "link_ieee_rx_rate_ss", "wprobe link IEEE 802.11 RX data rate - Sum of squared samples" +++521, IPFIX_FT_WPROBE_IEEE_TX_RATE_N, 4, IPFIX_CODING_UINT, "link_ieee_tx_rate_n", "wprobe link IEEE 802.11 TX data rate - Number of samples" +++522, IPFIX_FT_WPROBE_IEEE_TX_RATE_S, 8, IPFIX_CODING_UINT, "link_ieee_tx_rate_s", "wprobe link IEEE 802.11 TX data rate - Sum of samples" +++523, IPFIX_FT_WPROBE_IEEE_TX_RATE_SS, 8, IPFIX_CODING_UINT, "link_ieee_tx_rate_ss", "wprobe link IEEE 802.11 TX data rate - Sum of squared samples" +++524, IPFIX_FT_WPROBE_RETRANSMIT_200_N, 4, IPFIX_CODING_UINT, "link_retransmit_200_n", "wprobe link total retransmissions per packet - <200 bytes - Number of samples" +++525, IPFIX_FT_WPROBE_RETRANSMIT_200_S, 8, IPFIX_CODING_UINT, "link_retransmit_200_s", "wprobe link total retransmissions per packet - <200 bytes - Sum of samples" +++526, IPFIX_FT_WPROBE_RETRANSMIT_200_SS, 8, IPFIX_CODING_UINT, "link_retransmit_200_ss", "wprobe link total retransmissions per packet - <200 bytes - Sum of squared samples" +++527, IPFIX_FT_WPROBE_RETRANSMIT_400_N, 4, IPFIX_CODING_UINT, "link_retransmit_400_n", "wprobe link total retransmissions per packet - <400 bytes - Number of samples" +++528, IPFIX_FT_WPROBE_RETRANSMIT_400_S, 8, IPFIX_CODING_UINT, "link_retransmit_400_s", "wprobe link total retransmissions per packet - <400 bytes - Sum of samples" +++529, IPFIX_FT_WPROBE_RETRANSMIT_400_SS, 8, IPFIX_CODING_UINT, "link_retransmit_400_ss", "wprobe link total retransmissions per packet - <400 bytes - Sum of squared samples" +++530, IPFIX_FT_WPROBE_RETRANSMIT_800_N, 4, IPFIX_CODING_UINT, "link_retransmit_800_n", "wprobe link total retransmissions per packet - <800 bytes - Number of samples" +++531, IPFIX_FT_WPROBE_RETRANSMIT_800_S, 8, IPFIX_CODING_UINT, "link_retransmit_800_s", "wprobe link total retransmissions per packet - <800 bytes - Sum of samples" +++532, IPFIX_FT_WPROBE_RETRANSMIT_800_SS, 8, IPFIX_CODING_UINT, "link_retransmit_800_ss", "wprobe link total retransmissions per packet - <800 bytes - Sum of squared samples" +++533, IPFIX_FT_WPROBE_RETRANSMIT_1600_N, 4, IPFIX_CODING_UINT, "link_retransmit_1600_n", "wprobe link total retransmissions per packet - >800 bytes - Number of samples" +++534, IPFIX_FT_WPROBE_RETRANSMIT_1600_S, 8, IPFIX_CODING_UINT, "link_retransmit_1600_s", "wprobe link total retransmissions per packet - >800 bytes - Sum of samples" +++535, IPFIX_FT_WPROBE_RETRANSMIT_1600_SS, 8, IPFIX_CODING_UINT, "link_retransmit_1600_ss", "wprobe link total retransmissions per packet - >800 bytes - Sum of squared samples" +++536, IPFIX_FT_WPROBE_FRAMES, 4, IPFIX_CODING_UINT, "global_frames", "wprobe global number of 802.11 frames seen" +++537, IPFIX_FT_WPROBE_PROBEREQ, 4, IPFIX_CODING_UINT, "global_probereq", "wprobe global number of 802.11 probe requests seen" +diff --git a/feeds/packages/libs/libipfix/patches/120-ipfixmisc.patch b/feeds/packages/libs/libipfix/patches/120-ipfixmisc.patch +new file mode 100644 +index 0000000..e3f5a05 +--- /dev/null ++++ b/feeds/packages/libs/libipfix/patches/120-ipfixmisc.patch +@@ -0,0 +1,27 @@ ++Index: libipfix.r51/lib/Makefile.in ++=================================================================== ++--- libipfix.r51.orig/lib/Makefile.in 2008-08-05 15:15:23.000000000 +0200 +++++ libipfix.r51/lib/Makefile.in 2012-06-05 19:26:34.061692890 +0200 ++@@ -41,7 +41,7 @@ ++ INCLS = -I. -I.. ++ CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++ ++-TARGETS = libmisc.a libipfix.a +++TARGETS = libipfixmisc.a libipfix.a ++ OBJS = ipfix.o ipfix_col.o ipfix_print.o \ ++ ipfix_col_files.o ipfix_col_db.o @IPFIX_DB_OBJ@ @IPFIX_SSL_OBJ@ ++ DEPHDR = ipfix.h ipfix_def.h ipfix_fields.h ipfix_def_fokus.h ipfix_fields_fokus.h ++@@ -60,11 +60,11 @@ ++ install: ++ @[ -d ${libdir} ] || (mkdir -p ${libdir}; chmod 755 ${libdir}) ++ $(INSTALL_DATA) libipfix.a ${libdir}/ ++- $(INSTALL_DATA) libmisc.a ${libdir}/ +++ $(INSTALL_DATA) libipfixmisc.a ${libdir}/ ++ @[ -d ${includedir} ] || (mkdir -p ${includedir}; chmod 755 ${includedir}) ++ $(INSTALL_HEADER) ipfix*.h mlog.h mpoll.h ${includedir}/ ++ ++-libmisc.a: $(MISCOBJS) Makefile +++libipfixmisc.a: $(MISCOBJS) Makefile ++ @rm -f $@ ++ $(AR) rc $@ $(MISCOBJS) ++ +diff --git a/feeds/packages/libs/libjpeg-turbo/.svn/entries b/feeds/packages/libs/libjpeg-turbo/.svn/entries +new file mode 100644 +index 0000000..503c347 +--- /dev/null ++++ b/feeds/packages/libs/libjpeg-turbo/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libjpeg-turbo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T09:59:34.230489Z ++35655 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c8553da01b8f44dfc1f93f8d4253ab09 ++2013-02-18T09:59:34.230489Z ++35655 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2681 ++ +diff --git a/feeds/packages/libs/libjpeg-turbo/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libjpeg-turbo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..546bf9b +--- /dev/null ++++ b/feeds/packages/libs/libjpeg-turbo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,101 @@ ++# ++# Copyright (C) 2011-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:=libjpeg-turbo ++PKG_VERSION:=1.2.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libjpeg-turbo ++PKG_MD5SUM:=f61e60ff01381ece4d2fe65eeb52669e ++ ++PKG_LICENSE:=BSD-3c ++PKG_LICENSE_FILES:=README-turbo.txt ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libjpeg-turbo/Default ++ TITLE:=Fork of libjpeg with performance improvements ++ URL:=http://libjpeg-turbo.virtualgl.org/ ++endef ++ ++define Package/libjpeg-turbo ++ $(call Package/libjpeg-turbo/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= runtime library ++endef ++ ++define Package/jpeg-tools ++ $(call Package/libjpeg-turbo/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libjpeg-turbo ++ TITLE+= manipulation tools ++endef ++ ++define Package/libjpeg-turbo-tests ++ $(call Package/libjpeg-turbo/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libjpeg-turbo ++ TITLE+= testing utilities ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-jpeg8 \ ++ --without-simd \ ++ ++# ++# libjpegturbo.{a,so} provides the TurboJPEG/OSS interface. ++# No known use in OpenWRT at this time. 14/11/11 ++# ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/jpeglib.h $(1)/usr/include/ ++ $(CP) $(PKG_BUILD_DIR)/jpegint.h $(1)/usr/include/ ++ $(CP) $(PKG_BUILD_DIR)/j{config,error,morecfg}.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libjpeg.{a,so*} $(1)/usr/lib/ ++# $(CP) $(PKG_BUILD_DIR)/.libs/libturbojpeg.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libjpeg-turbo/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libjpeg.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/jpeg-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{c,d}jpeg $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jpegtran $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{rd,wr}jpgcom $(1)/usr/bin/ ++endef ++ ++define Package/libjpeg-turbo-tests/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/tjbench $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/tjunittest $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jcstest $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libturbojpeg.{a,so*} $(1)/usr/lib/ ++endef ++ ++$(eval $(call HostBuild)) ++$(eval $(call BuildPackage,libjpeg-turbo)) ++$(eval $(call BuildPackage,jpeg-tools)) ++$(eval $(call BuildPackage,libjpeg-turbo-tests)) +diff --git a/feeds/packages/libs/libjpeg-turbo/Makefile b/feeds/packages/libs/libjpeg-turbo/Makefile +new file mode 100644 +index 0000000..546bf9b +--- /dev/null ++++ b/feeds/packages/libs/libjpeg-turbo/Makefile +@@ -0,0 +1,101 @@ ++# ++# Copyright (C) 2011-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:=libjpeg-turbo ++PKG_VERSION:=1.2.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libjpeg-turbo ++PKG_MD5SUM:=f61e60ff01381ece4d2fe65eeb52669e ++ ++PKG_LICENSE:=BSD-3c ++PKG_LICENSE_FILES:=README-turbo.txt ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libjpeg-turbo/Default ++ TITLE:=Fork of libjpeg with performance improvements ++ URL:=http://libjpeg-turbo.virtualgl.org/ ++endef ++ ++define Package/libjpeg-turbo ++ $(call Package/libjpeg-turbo/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= runtime library ++endef ++ ++define Package/jpeg-tools ++ $(call Package/libjpeg-turbo/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libjpeg-turbo ++ TITLE+= manipulation tools ++endef ++ ++define Package/libjpeg-turbo-tests ++ $(call Package/libjpeg-turbo/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libjpeg-turbo ++ TITLE+= testing utilities ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-jpeg8 \ ++ --without-simd \ ++ ++# ++# libjpegturbo.{a,so} provides the TurboJPEG/OSS interface. ++# No known use in OpenWRT at this time. 14/11/11 ++# ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/jpeglib.h $(1)/usr/include/ ++ $(CP) $(PKG_BUILD_DIR)/jpegint.h $(1)/usr/include/ ++ $(CP) $(PKG_BUILD_DIR)/j{config,error,morecfg}.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libjpeg.{a,so*} $(1)/usr/lib/ ++# $(CP) $(PKG_BUILD_DIR)/.libs/libturbojpeg.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libjpeg-turbo/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libjpeg.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/jpeg-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{c,d}jpeg $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jpegtran $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{rd,wr}jpgcom $(1)/usr/bin/ ++endef ++ ++define Package/libjpeg-turbo-tests/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/tjbench $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/tjunittest $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jcstest $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libturbojpeg.{a,so*} $(1)/usr/lib/ ++endef ++ ++$(eval $(call HostBuild)) ++$(eval $(call BuildPackage,libjpeg-turbo)) ++$(eval $(call BuildPackage,jpeg-tools)) ++$(eval $(call BuildPackage,libjpeg-turbo-tests)) +diff --git a/feeds/packages/libs/liblo/.svn/entries b/feeds/packages/libs/liblo/.svn/entries +new file mode 100644 +index 0000000..8d743dd +--- /dev/null ++++ b/feeds/packages/libs/liblo/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/liblo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++a11992c4c1d1dc51af978588b9fce601 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1659 ++ +diff --git a/feeds/packages/libs/liblo/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/liblo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8cd04bb +--- /dev/null ++++ b/feeds/packages/libs/liblo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,83 @@ ++# ++# 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:=liblo ++PKG_VERSION:=0.26 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/liblo ++PKG_MD5SUM:=5351de14262560e15e7f23865293b16f ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=autogen.sh aclocal.m4 ++ ++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 ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/include/lo \ ++ $(1)/usr/include/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/liblo.so* \ ++ $(1)/usr/lib/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/pkgconfig/liblo.pc \ ++ $(1)/usr/lib/pkgconfig/ \ ++ ) ++endef ++ ++define Package/liblo/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/liblo.so.* \ ++ $(1)/usr/lib/ \ ++ ) ++endef ++ ++define Package/liblo-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/bin/oscdump \ ++ ./usr/bin/oscsend \ ++ $(1)/usr/bin/ \ ++ ) ++endef ++ ++$(eval $(call BuildPackage,liblo)) ++$(eval $(call BuildPackage,liblo-utils)) +diff --git a/feeds/packages/libs/liblo/Makefile b/feeds/packages/libs/liblo/Makefile +new file mode 100644 +index 0000000..8cd04bb +--- /dev/null ++++ b/feeds/packages/libs/liblo/Makefile +@@ -0,0 +1,83 @@ ++# ++# 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:=liblo ++PKG_VERSION:=0.26 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/liblo ++PKG_MD5SUM:=5351de14262560e15e7f23865293b16f ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=autogen.sh aclocal.m4 ++ ++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 ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/include/lo \ ++ $(1)/usr/include/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/liblo.so* \ ++ $(1)/usr/lib/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/pkgconfig/liblo.pc \ ++ $(1)/usr/lib/pkgconfig/ \ ++ ) ++endef ++ ++define Package/liblo/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/liblo.so.* \ ++ $(1)/usr/lib/ \ ++ ) ++endef ++ ++define Package/liblo-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/bin/oscdump \ ++ ./usr/bin/oscsend \ ++ $(1)/usr/bin/ \ ++ ) ++endef ++ ++$(eval $(call BuildPackage,liblo)) ++$(eval $(call BuildPackage,liblo-utils)) +diff --git a/feeds/packages/libs/libmad/.svn/entries b/feeds/packages/libs/libmad/.svn/entries +new file mode 100644 +index 0000000..5b6a897 +--- /dev/null ++++ b/feeds/packages/libs/libmad/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmad ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-19T17:21:58.952988Z ++35682 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4f5e686692c230ec742515f6ec593e4f ++2013-02-19T17:21:58.952988Z ++35682 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1716 ++ +diff --git a/feeds/packages/libs/libmad/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libmad/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libmad/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libmad/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmad/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ae31a47 +--- /dev/null ++++ b/feeds/packages/libs/libmad/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,78 @@ ++# ++# 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:=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_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/feeds/packages/libs/libmad/Makefile b/feeds/packages/libs/libmad/Makefile +new file mode 100644 +index 0000000..ae31a47 +--- /dev/null ++++ b/feeds/packages/libs/libmad/Makefile +@@ -0,0 +1,78 @@ ++# ++# 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:=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_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/feeds/packages/libs/libmad/patches/.svn/entries b/feeds/packages/libs/libmad/patches/.svn/entries +new file mode 100644 +index 0000000..73a6ca8 +--- /dev/null ++++ b/feeds/packages/libs/libmad/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmad/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-11-26T18:31:40.703305Z ++18548 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-mips_removal_h_constraint.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++5f2b4f66421fc5f23878a0b0bb522774 ++2009-11-26T18:31:40.703305Z ++18548 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2220 ++ +diff --git a/feeds/packages/libs/libmad/patches/.svn/text-base/001-mips_removal_h_constraint.patch.svn-base b/feeds/packages/libs/libmad/patches/.svn/text-base/001-mips_removal_h_constraint.patch.svn-base +new file mode 100644 +index 0000000..b65555e +--- /dev/null ++++ b/feeds/packages/libs/libmad/patches/.svn/text-base/001-mips_removal_h_constraint.patch.svn-base +@@ -0,0 +1,70 @@ ++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/feeds/packages/libs/libmad/patches/001-mips_removal_h_constraint.patch b/feeds/packages/libs/libmad/patches/001-mips_removal_h_constraint.patch +new file mode 100644 +index 0000000..b65555e +--- /dev/null ++++ b/feeds/packages/libs/libmad/patches/001-mips_removal_h_constraint.patch +@@ -0,0 +1,70 @@ ++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/feeds/packages/libs/libmbus/.svn/entries b/feeds/packages/libs/libmbus/.svn/entries +new file mode 100644 +index 0000000..b3044f5 +--- /dev/null ++++ b/feeds/packages/libs/libmbus/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmbus ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++676e77a6117041770c5e34176e8e2542 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2689 ++ +diff --git a/feeds/packages/libs/libmbus/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmbus/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..08468e8 +--- /dev/null ++++ b/feeds/packages/libs/libmbus/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,105 @@ ++# ++# 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:=libmbus ++PKG_VERSION:=0.7.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.freescada.com/public-dist/ ++PKG_MD5SUM:=2f1a7ba0ccd683e6708364a13310a6d1 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmbus/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.freescada.com/libmbus/ ++ TITLE:=mbus-tools ++endef ++ ++define Package/libmbus/Default/description ++ libmbus is an open source M-bus (Meter-Bus) library. ++ The Meter-Bus is a standard for reading out meter data from ++ electricity meters, heat meters, gas meters, etc. ++endef ++ ++define Package/libmbus ++ $(call Package/libmbus/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libmbus ++endef ++ ++define Package/libmbus/description ++ $(call Package/libmbus/Default/description) ++ ++ This package contains the M-bus shared library, used by other programs. ++endef ++ ++define Package/mbus-serial ++ $(call Package/libmbus/Default) ++ DEPENDS+=+libmbus ++ TITLE+= (serial) ++endef ++ ++define Package/mbus-serial/description ++ $(call Package/libmbus/Default/description) ++ ++ This package contains command line tools for scanning the M-bus ++ and retrieving data from meters which are connected through a ++ serial (e.g. RS232) interface. ++endef ++ ++define Package/mbus-tcp ++ $(call Package/libmbus/Default) ++ DEPENDS+=+libmbus ++ TITLE+= (tcp) ++endef ++ ++define Package/mbus-tcp/description ++ $(call Package/libmbus/Default/description) ++ ++ This package contains command line tools for scanning the M-bus ++ and retrieving data from meters which are accessible through ++ M-bus gateways via TCP. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/mbus $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.{so*,la} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmbus.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libmbus/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.so* $(1)/usr/lib/ ++endef ++ ++define Package/mbus-serial/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-serial-* $(1)/usr/bin/ ++endef ++ ++define Package/mbus-tcp/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-tcp-* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libmbus)) ++$(eval $(call BuildPackage,mbus-serial)) ++$(eval $(call BuildPackage,mbus-tcp)) +diff --git a/feeds/packages/libs/libmbus/Makefile b/feeds/packages/libs/libmbus/Makefile +new file mode 100644 +index 0000000..08468e8 +--- /dev/null ++++ b/feeds/packages/libs/libmbus/Makefile +@@ -0,0 +1,105 @@ ++# ++# 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:=libmbus ++PKG_VERSION:=0.7.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.freescada.com/public-dist/ ++PKG_MD5SUM:=2f1a7ba0ccd683e6708364a13310a6d1 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmbus/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.freescada.com/libmbus/ ++ TITLE:=mbus-tools ++endef ++ ++define Package/libmbus/Default/description ++ libmbus is an open source M-bus (Meter-Bus) library. ++ The Meter-Bus is a standard for reading out meter data from ++ electricity meters, heat meters, gas meters, etc. ++endef ++ ++define Package/libmbus ++ $(call Package/libmbus/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libmbus ++endef ++ ++define Package/libmbus/description ++ $(call Package/libmbus/Default/description) ++ ++ This package contains the M-bus shared library, used by other programs. ++endef ++ ++define Package/mbus-serial ++ $(call Package/libmbus/Default) ++ DEPENDS+=+libmbus ++ TITLE+= (serial) ++endef ++ ++define Package/mbus-serial/description ++ $(call Package/libmbus/Default/description) ++ ++ This package contains command line tools for scanning the M-bus ++ and retrieving data from meters which are connected through a ++ serial (e.g. RS232) interface. ++endef ++ ++define Package/mbus-tcp ++ $(call Package/libmbus/Default) ++ DEPENDS+=+libmbus ++ TITLE+= (tcp) ++endef ++ ++define Package/mbus-tcp/description ++ $(call Package/libmbus/Default/description) ++ ++ This package contains command line tools for scanning the M-bus ++ and retrieving data from meters which are accessible through ++ M-bus gateways via TCP. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/mbus $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.{so*,la} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmbus.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libmbus/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.so* $(1)/usr/lib/ ++endef ++ ++define Package/mbus-serial/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-serial-* $(1)/usr/bin/ ++endef ++ ++define Package/mbus-tcp/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-tcp-* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libmbus)) ++$(eval $(call BuildPackage,mbus-serial)) ++$(eval $(call BuildPackage,mbus-tcp)) +diff --git a/feeds/packages/libs/libmcrypt/.svn/entries b/feeds/packages/libs/libmcrypt/.svn/entries +new file mode 100644 +index 0000000..5d30ebb +--- /dev/null ++++ b/feeds/packages/libs/libmcrypt/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmcrypt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++74a1e6b63fd1d3056b24a3f425adce82 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1492 ++ +diff --git a/feeds/packages/libs/libmcrypt/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libmcrypt/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libmcrypt/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libmcrypt/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmcrypt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e676daf +--- /dev/null ++++ b/feeds/packages/libs/libmcrypt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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_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/feeds/packages/libs/libmcrypt/Makefile b/feeds/packages/libs/libmcrypt/Makefile +new file mode 100644 +index 0000000..e676daf +--- /dev/null ++++ b/feeds/packages/libs/libmcrypt/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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_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/feeds/packages/libs/libmicrohttpd/.svn/entries b/feeds/packages/libs/libmicrohttpd/.svn/entries +new file mode 100644 +index 0000000..bc16585 +--- /dev/null ++++ b/feeds/packages/libs/libmicrohttpd/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmicrohttpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4acfaabd18eb4db12fe3b9eb635faf05 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1383 ++ +diff --git a/feeds/packages/libs/libmicrohttpd/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmicrohttpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ee1f546 +--- /dev/null ++++ b/feeds/packages/libs/libmicrohttpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=libmicrohttpd ++PKG_VERSION:=0.9.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/libmicrohttpd ++PKG_MD5SUM:=0f4c55ba224ce75b3b993b558e072a6b ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmicrohttpd ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Microhttpd ++ URL:=http://www.gnu.org/software/libmicrohttpd ++ DEPENDS:=+libpthread ++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 ++ ++CONFIGURE_ARGS+= \ ++ --disable-curl \ ++ --disable-https \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/microhttpd.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libmicrohttpd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmicrohttpd)) +diff --git a/feeds/packages/libs/libmicrohttpd/Makefile b/feeds/packages/libs/libmicrohttpd/Makefile +new file mode 100644 +index 0000000..ee1f546 +--- /dev/null ++++ b/feeds/packages/libs/libmicrohttpd/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=libmicrohttpd ++PKG_VERSION:=0.9.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/libmicrohttpd ++PKG_MD5SUM:=0f4c55ba224ce75b3b993b558e072a6b ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmicrohttpd ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Microhttpd ++ URL:=http://www.gnu.org/software/libmicrohttpd ++ DEPENDS:=+libpthread ++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 ++ ++CONFIGURE_ARGS+= \ ++ --disable-curl \ ++ --disable-https \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/microhttpd.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libmicrohttpd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmicrohttpd)) +diff --git a/feeds/packages/libs/libmicroxml/.svn/entries b/feeds/packages/libs/libmicroxml/.svn/entries +new file mode 100644 +index 0000000..41232b6 +--- /dev/null ++++ b/feeds/packages/libs/libmicroxml/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmicroxml ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-10T23:36:15.578923Z ++32179 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++51ef9a71bcd4b65e073b77425386c9fe ++2012-06-10T23:36:15.578923Z ++32179 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1270 ++ +diff --git a/feeds/packages/libs/libmicroxml/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmicroxml/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..559cc75 +--- /dev/null ++++ b/feeds/packages/libs/libmicroxml/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 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:=libmicroxml ++PKG_VERSION:=2012-06-11 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmicroxml ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=XML library ++endef ++ ++define Package/libmicroxml/description ++ A micro sized XML library ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-threads \ ++ --enable-static \ ++ --enable-shared ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig ++endef ++ ++define Package/libmicroxml/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,libmicroxml)) +diff --git a/feeds/packages/libs/libmicroxml/Makefile b/feeds/packages/libs/libmicroxml/Makefile +new file mode 100644 +index 0000000..559cc75 +--- /dev/null ++++ b/feeds/packages/libs/libmicroxml/Makefile +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 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:=libmicroxml ++PKG_VERSION:=2012-06-11 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmicroxml ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=XML library ++endef ++ ++define Package/libmicroxml/description ++ A micro sized XML library ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-threads \ ++ --enable-static \ ++ --enable-shared ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig ++endef ++ ++define Package/libmicroxml/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,libmicroxml)) +diff --git a/feeds/packages/libs/libmikmod/.svn/entries b/feeds/packages/libs/libmikmod/.svn/entries +new file mode 100644 +index 0000000..f23b568 +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmikmod ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++31ea8e28670068f6b2ebb912bca5cbf9 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1720 ++ +diff --git a/feeds/packages/libs/libmikmod/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmikmod/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..50d7a3c +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,77 @@ ++# ++# Copyright (C) 2010-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:=libmikmod ++PKG_VERSION:=3.1.12 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/mikmod ++PKG_MD5SUM:=9f3c740298260d5f88981fc0d51f6f16 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmikmod ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Mikmod sound library ++ URL:=http://mikmod.raphnet.net/ ++ DEPENDS:=+alsa-lib +libpthread ++endef ++ ++define Package/libmikmod/description ++ Mikmod is a library supporting many formats, including mod, s3m, it, and xm. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-af \ ++ --enable-alsa \ ++ --disable-oss \ ++ --disable-esd \ ++ --disable-sam9407 \ ++ --disable-ultra \ ++ --enable-dl \ ++ --disable-debug \ ++ --enable-threads \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/mikmod.h \ ++ $(1)/usr/include/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libmikmod.{a,la,so*} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/libmikmod-config \ ++ $(2)/bin ++ ++ $(SED) 's,^\(exec_prefix\|prefix\)=.*,\1=\"$(STAGING_DIR)/usr/\",g' \ ++ $(2)/bin/libmikmod-config ++ ++ $(INSTALL_DIR) $(1)/usr/share/aclocal ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ ++ $(1)/usr/share/aclocal/ ++endef ++ ++define Package/libmikmod/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmikmod.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmikmod)) +diff --git a/feeds/packages/libs/libmikmod/Makefile b/feeds/packages/libs/libmikmod/Makefile +new file mode 100644 +index 0000000..50d7a3c +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/Makefile +@@ -0,0 +1,77 @@ ++# ++# Copyright (C) 2010-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:=libmikmod ++PKG_VERSION:=3.1.12 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/mikmod ++PKG_MD5SUM:=9f3c740298260d5f88981fc0d51f6f16 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmikmod ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Mikmod sound library ++ URL:=http://mikmod.raphnet.net/ ++ DEPENDS:=+alsa-lib +libpthread ++endef ++ ++define Package/libmikmod/description ++ Mikmod is a library supporting many formats, including mod, s3m, it, and xm. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-af \ ++ --enable-alsa \ ++ --disable-oss \ ++ --disable-esd \ ++ --disable-sam9407 \ ++ --disable-ultra \ ++ --enable-dl \ ++ --disable-debug \ ++ --enable-threads \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/mikmod.h \ ++ $(1)/usr/include/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libmikmod.{a,la,so*} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/libmikmod-config \ ++ $(2)/bin ++ ++ $(SED) 's,^\(exec_prefix\|prefix\)=.*,\1=\"$(STAGING_DIR)/usr/\",g' \ ++ $(2)/bin/libmikmod-config ++ ++ $(INSTALL_DIR) $(1)/usr/share/aclocal ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ ++ $(1)/usr/share/aclocal/ ++endef ++ ++define Package/libmikmod/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmikmod.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmikmod)) +diff --git a/feeds/packages/libs/libmikmod/patches/.svn/entries b/feeds/packages/libs/libmikmod/patches/.svn/entries +new file mode 100644 +index 0000000..c1f9c20 +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmikmod/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-22T01:33:40.710112Z ++24766 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-disable-doc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++bbf04f43bbd9612a5e116f858f3044f3 ++2010-07-04T00:48:11.231808Z ++22053 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++824 ++ ++003-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++23257ce35613fcd6c9aec11a6498460d ++2010-12-12T19:37:38.611634Z ++24522 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ +diff --git a/feeds/packages/libs/libmikmod/patches/.svn/text-base/001-disable-doc.patch.svn-base b/feeds/packages/libs/libmikmod/patches/.svn/text-base/001-disable-doc.patch.svn-base +new file mode 100644 +index 0000000..723102b +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/patches/.svn/text-base/001-disable-doc.patch.svn-base +@@ -0,0 +1,21 @@ ++--- libmikmod-3.1.12/Makefile.am 2004-01-21 17:43:53.000000000 +0000 +++++ libmikmod-3.1.12/Makefile.am.new 2010-07-03 12:12:51.946725127 +0000 ++@@ -1,6 +1,6 @@ ++ AUTOMAKE_OPTIONS = foreign ++ SUBDIRS = drivers include libmikmod loaders mmio playercode \ ++- docs dlapi macintosh posix os2 win32 +++ dlapi macintosh posix os2 win32 ++ ++ bin_SCRIPTS = libmikmod-config ++ ++--- libmikmod-3.1.12/Makefile.in 2004-01-21 17:43:53.000000000 +0000 +++++ libmikmod-3.1.12/Makefile.in.new 2010-07-03 12:12:39.626725146 +0000 ++@@ -86,7 +86,7 @@ ++ VERSION = @VERSION@ ++ ++ AUTOMAKE_OPTIONS = foreign ++-SUBDIRS = drivers include libmikmod loaders mmio playercode docs dlapi macintosh posix os2 win32 +++SUBDIRS = drivers include libmikmod loaders mmio playercode dlapi macintosh posix os2 win32 ++ ++ ++ bin_SCRIPTS = libmikmod-config +diff --git a/feeds/packages/libs/libmikmod/patches/.svn/text-base/003-automake-compat.patch.svn-base b/feeds/packages/libs/libmikmod/patches/.svn/text-base/003-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..bf94fca +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/patches/.svn/text-base/003-automake-compat.patch.svn-base +@@ -0,0 +1,16 @@ ++--- a/libmikmod-config.in +++++ b/libmikmod-config.in ++@@ -1,4 +1,4 @@ ++-#! /bin/sh +++#! @SHELL@ ++ ++ prefix=@prefix@ ++ exec_prefix=@exec_prefix@ ++--- a/libmikmod/Makefile.in +++++ b/libmikmod/Makefile.in ++@@ -1,3 +1,5 @@ +++SHELL = @SHELL@ +++ ++ exec_prefix=@exec_prefix@ ++ prefix=@prefix@ ++ +diff --git a/feeds/packages/libs/libmikmod/patches/001-disable-doc.patch b/feeds/packages/libs/libmikmod/patches/001-disable-doc.patch +new file mode 100644 +index 0000000..723102b +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/patches/001-disable-doc.patch +@@ -0,0 +1,21 @@ ++--- libmikmod-3.1.12/Makefile.am 2004-01-21 17:43:53.000000000 +0000 +++++ libmikmod-3.1.12/Makefile.am.new 2010-07-03 12:12:51.946725127 +0000 ++@@ -1,6 +1,6 @@ ++ AUTOMAKE_OPTIONS = foreign ++ SUBDIRS = drivers include libmikmod loaders mmio playercode \ ++- docs dlapi macintosh posix os2 win32 +++ dlapi macintosh posix os2 win32 ++ ++ bin_SCRIPTS = libmikmod-config ++ ++--- libmikmod-3.1.12/Makefile.in 2004-01-21 17:43:53.000000000 +0000 +++++ libmikmod-3.1.12/Makefile.in.new 2010-07-03 12:12:39.626725146 +0000 ++@@ -86,7 +86,7 @@ ++ VERSION = @VERSION@ ++ ++ AUTOMAKE_OPTIONS = foreign ++-SUBDIRS = drivers include libmikmod loaders mmio playercode docs dlapi macintosh posix os2 win32 +++SUBDIRS = drivers include libmikmod loaders mmio playercode dlapi macintosh posix os2 win32 ++ ++ ++ bin_SCRIPTS = libmikmod-config +diff --git a/feeds/packages/libs/libmikmod/patches/003-automake-compat.patch b/feeds/packages/libs/libmikmod/patches/003-automake-compat.patch +new file mode 100644 +index 0000000..bf94fca +--- /dev/null ++++ b/feeds/packages/libs/libmikmod/patches/003-automake-compat.patch +@@ -0,0 +1,16 @@ ++--- a/libmikmod-config.in +++++ b/libmikmod-config.in ++@@ -1,4 +1,4 @@ ++-#! /bin/sh +++#! @SHELL@ ++ ++ prefix=@prefix@ ++ exec_prefix=@exec_prefix@ ++--- a/libmikmod/Makefile.in +++++ b/libmikmod/Makefile.in ++@@ -1,3 +1,5 @@ +++SHELL = @SHELL@ +++ ++ exec_prefix=@exec_prefix@ ++ prefix=@prefix@ ++ +diff --git a/feeds/packages/libs/libmms/.svn/entries b/feeds/packages/libs/libmms/.svn/entries +new file mode 100644 +index 0000000..caa45ec +--- /dev/null ++++ b/feeds/packages/libs/libmms/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmms ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:10:03.633963Z ++35222 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2d04629a115011ff81aba80a07a5dfa0 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1591 ++ +diff --git a/feeds/packages/libs/libmms/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmms/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..28998a2 +--- /dev/null ++++ b/feeds/packages/libs/libmms/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# Copyright (C) 2010-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:=libmms ++PKG_VERSION:=0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libmms ++PKG_MD5SUM:=650ad04a4c8bd79246390b81b29680b6 ++ ++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 ++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) ++ ++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/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/feeds/packages/libs/libmms/Makefile b/feeds/packages/libs/libmms/Makefile +new file mode 100644 +index 0000000..28998a2 +--- /dev/null ++++ b/feeds/packages/libs/libmms/Makefile +@@ -0,0 +1,65 @@ ++# ++# Copyright (C) 2010-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:=libmms ++PKG_VERSION:=0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libmms ++PKG_MD5SUM:=650ad04a4c8bd79246390b81b29680b6 ++ ++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 ++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) ++ ++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/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/feeds/packages/libs/libmms/patches/.svn/entries b/feeds/packages/libs/libmms/patches/.svn/entries +new file mode 100644 +index 0000000..34aa3b9 +--- /dev/null ++++ b/feeds/packages/libs/libmms/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmms/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:10:03.633963Z ++35222 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++00-remove_iconv_dependency.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++92ed2afb399ecda1bc57cce864d0c309 ++2013-01-18T13:10:03.633963Z ++35222 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3144 ++ +diff --git a/feeds/packages/libs/libmms/patches/.svn/text-base/00-remove_iconv_dependency.patch.svn-base b/feeds/packages/libs/libmms/patches/.svn/text-base/00-remove_iconv_dependency.patch.svn-base +new file mode 100644 +index 0000000..7564d56 +--- /dev/null ++++ b/feeds/packages/libs/libmms/patches/.svn/text-base/00-remove_iconv_dependency.patch.svn-base +@@ -0,0 +1,101 @@ ++diff -burN libmms-0.6.original/src/mms.c libmms-0.6.modified/src/mms.c ++--- libmms-0.6.original/src/mms.c 2010-05-31 12:13:04.000000000 +0200 +++++ libmms-0.6.modified/src/mms.c 2012-06-25 12:44:06.000000000 +0200 ++@@ -40,7 +40,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ /********** logging **********/ ++ #define lprintf(...) if (getenv("LIBMMS_DEBUG")) fprintf(stderr, __VA_ARGS__) ++@@ -447,17 +446,21 @@ ++ return 1; ++ } ++ ++-static int string_utf16(iconv_t url_conv, char *dest, char *src, int dest_len) +++static int string_utf16(char *dest, char *src, int dest_len) ++ { ++ char *ip = src, *op = dest; ++ size_t ip_len = strlen(src); ++- size_t op_len = dest_len - 2; /* reserve 2 bytes for 0 termination */ ++ ++- if (iconv(url_conv, &ip, &ip_len, &op, &op_len) == (size_t)-1) { +++ if (2 * ip_len + 2 > dest_len) { ++ lprintf("mms: Error converting uri to unicode: %s\n", strerror(errno)); ++ return 0; ++ } ++ +++ while (ip_len--) { +++ *op++ = *ip++; +++ *op++ = 0x00; +++ } +++ ++ /* 0 terminate the string */ ++ *op++ = 0; ++ *op++ = 0; ++@@ -1012,7 +1015,6 @@ ++ */ ++ /* FIXME: got somewhat broken during xine_stream_t->(void*) conversion */ ++ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) { ++- iconv_t url_conv = (iconv_t)-1; ++ mms_t *this; ++ int res; ++ uint32_t openid; ++@@ -1071,12 +1073,6 @@ ++ goto fail; ++ } ++ ++- url_conv = iconv_open("UTF-16LE", "UTF-8"); ++- if (url_conv == (iconv_t)-1) { ++- lprintf("mms: could not get iconv handle to convert url to unicode\n"); ++- goto fail; ++- } ++- ++ /* ++ * let the negotiations begin... ++ */ ++@@ -1088,7 +1084,7 @@ ++ mms_gen_guid(this->guid); ++ sprintf(this->str, "NSPlayer/7.0.0.1956; {%s}; Host: %s", this->guid, ++ this->host); ++- res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, this->str, +++ res = string_utf16(this->scmd_body + command_buffer.pos, this->str, ++ CMD_BODY_LEN - command_buffer.pos); ++ if(!res) ++ goto fail; ++@@ -1117,7 +1113,7 @@ ++ mms_buffer_put_32 (&command_buffer, 0x00000000); ++ mms_buffer_put_32 (&command_buffer, 0x00989680); ++ mms_buffer_put_32 (&command_buffer, 0x00000002); ++- res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, +++ res = string_utf16(this->scmd_body + command_buffer.pos, ++ "\\\\192.168.0.129\\TCP\\1037", ++ CMD_BODY_LEN - command_buffer.pos); ++ if(!res) ++@@ -1156,7 +1152,7 @@ ++ mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */ ++ mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */ ++ ++- res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, +++ res = string_utf16(this->scmd_body + command_buffer.pos, ++ this->uri, CMD_BODY_LEN - command_buffer.pos); ++ if(!res) ++ goto fail; ++@@ -1266,7 +1262,6 @@ ++ } ++ } ++ ++- iconv_close(url_conv); ++ lprintf("mms: connect: passed\n"); ++ ++ return this; ++@@ -1280,8 +1275,6 @@ ++ gnet_uri_delete(this->guri); ++ if (this->uri) ++ free(this->uri); ++- if (url_conv != (iconv_t)-1) ++- iconv_close(url_conv); ++ ++ free (this); ++ return NULL; +diff --git a/feeds/packages/libs/libmms/patches/00-remove_iconv_dependency.patch b/feeds/packages/libs/libmms/patches/00-remove_iconv_dependency.patch +new file mode 100644 +index 0000000..7564d56 +--- /dev/null ++++ b/feeds/packages/libs/libmms/patches/00-remove_iconv_dependency.patch +@@ -0,0 +1,101 @@ ++diff -burN libmms-0.6.original/src/mms.c libmms-0.6.modified/src/mms.c ++--- libmms-0.6.original/src/mms.c 2010-05-31 12:13:04.000000000 +0200 +++++ libmms-0.6.modified/src/mms.c 2012-06-25 12:44:06.000000000 +0200 ++@@ -40,7 +40,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ /********** logging **********/ ++ #define lprintf(...) if (getenv("LIBMMS_DEBUG")) fprintf(stderr, __VA_ARGS__) ++@@ -447,17 +446,21 @@ ++ return 1; ++ } ++ ++-static int string_utf16(iconv_t url_conv, char *dest, char *src, int dest_len) +++static int string_utf16(char *dest, char *src, int dest_len) ++ { ++ char *ip = src, *op = dest; ++ size_t ip_len = strlen(src); ++- size_t op_len = dest_len - 2; /* reserve 2 bytes for 0 termination */ ++ ++- if (iconv(url_conv, &ip, &ip_len, &op, &op_len) == (size_t)-1) { +++ if (2 * ip_len + 2 > dest_len) { ++ lprintf("mms: Error converting uri to unicode: %s\n", strerror(errno)); ++ return 0; ++ } ++ +++ while (ip_len--) { +++ *op++ = *ip++; +++ *op++ = 0x00; +++ } +++ ++ /* 0 terminate the string */ ++ *op++ = 0; ++ *op++ = 0; ++@@ -1012,7 +1015,6 @@ ++ */ ++ /* FIXME: got somewhat broken during xine_stream_t->(void*) conversion */ ++ mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) { ++- iconv_t url_conv = (iconv_t)-1; ++ mms_t *this; ++ int res; ++ uint32_t openid; ++@@ -1071,12 +1073,6 @@ ++ goto fail; ++ } ++ ++- url_conv = iconv_open("UTF-16LE", "UTF-8"); ++- if (url_conv == (iconv_t)-1) { ++- lprintf("mms: could not get iconv handle to convert url to unicode\n"); ++- goto fail; ++- } ++- ++ /* ++ * let the negotiations begin... ++ */ ++@@ -1088,7 +1084,7 @@ ++ mms_gen_guid(this->guid); ++ sprintf(this->str, "NSPlayer/7.0.0.1956; {%s}; Host: %s", this->guid, ++ this->host); ++- res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, this->str, +++ res = string_utf16(this->scmd_body + command_buffer.pos, this->str, ++ CMD_BODY_LEN - command_buffer.pos); ++ if(!res) ++ goto fail; ++@@ -1117,7 +1113,7 @@ ++ mms_buffer_put_32 (&command_buffer, 0x00000000); ++ mms_buffer_put_32 (&command_buffer, 0x00989680); ++ mms_buffer_put_32 (&command_buffer, 0x00000002); ++- res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, +++ res = string_utf16(this->scmd_body + command_buffer.pos, ++ "\\\\192.168.0.129\\TCP\\1037", ++ CMD_BODY_LEN - command_buffer.pos); ++ if(!res) ++@@ -1156,7 +1152,7 @@ ++ mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */ ++ mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */ ++ ++- res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, +++ res = string_utf16(this->scmd_body + command_buffer.pos, ++ this->uri, CMD_BODY_LEN - command_buffer.pos); ++ if(!res) ++ goto fail; ++@@ -1266,7 +1262,6 @@ ++ } ++ } ++ ++- iconv_close(url_conv); ++ lprintf("mms: connect: passed\n"); ++ ++ return this; ++@@ -1280,8 +1275,6 @@ ++ gnet_uri_delete(this->guri); ++ if (this->uri) ++ free(this->uri); ++- if (url_conv != (iconv_t)-1) ++- iconv_close(url_conv); ++ ++ free (this); ++ return NULL; +diff --git a/feeds/packages/libs/libmodbus/.svn/entries b/feeds/packages/libs/libmodbus/.svn/entries +new file mode 100644 +index 0000000..b28df0a +--- /dev/null ++++ b/feeds/packages/libs/libmodbus/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmodbus ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:40.779096Z ++34479 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++800a658c854b88eed801deea68dceda6 ++2012-12-04T16:20:40.779096Z ++34479 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1235 ++ +diff --git a/feeds/packages/libs/libmodbus/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmodbus/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ec2cfac +--- /dev/null ++++ b/feeds/packages/libs/libmodbus/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=libmodbus ++PKG_VERSION:=3.0.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://github.com/downloads/stephane/libmodbus/ ++PKG_MD5SUM:=b5042d833c6c132e6fb2551af133a342 ++ ++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 ++ ++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/feeds/packages/libs/libmodbus/Makefile b/feeds/packages/libs/libmodbus/Makefile +new file mode 100644 +index 0000000..ec2cfac +--- /dev/null ++++ b/feeds/packages/libs/libmodbus/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=libmodbus ++PKG_VERSION:=3.0.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://github.com/downloads/stephane/libmodbus/ ++PKG_MD5SUM:=b5042d833c6c132e6fb2551af133a342 ++ ++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 ++ ++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/feeds/packages/libs/libmpcdec/.svn/entries b/feeds/packages/libs/libmpcdec/.svn/entries +new file mode 100644 +index 0000000..0ba0949 +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmpcdec ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++310f3677ddb25dd1cc0bc09a422ecf63 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1127 ++ +diff --git a/feeds/packages/libs/libmpcdec/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libmpcdec/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libmpcdec/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmpcdec/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b63b0f0 +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2007-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:=libmpcdec ++PKG_VERSION:=1.2.6 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://files.musepack.net/source/ ++PKG_MD5SUM:=7f7a060e83b4278acf4b77d7a7b9d2c0 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libmpcdec ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Musepack decoder library ++ URL:=http://www.musepack.net ++endef ++ ++define Package/libmpcdec/description ++ Musepack decoder library ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/mpcdec/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/mpcdec/*.h \ ++ $(1)/usr/include/mpcdec/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libmpcdec/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libmpcdec.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmpcdec)) +diff --git a/feeds/packages/libs/libmpcdec/Makefile b/feeds/packages/libs/libmpcdec/Makefile +new file mode 100644 +index 0000000..b63b0f0 +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/Makefile +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2007-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:=libmpcdec ++PKG_VERSION:=1.2.6 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://files.musepack.net/source/ ++PKG_MD5SUM:=7f7a060e83b4278acf4b77d7a7b9d2c0 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libmpcdec ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Musepack decoder library ++ URL:=http://www.musepack.net ++endef ++ ++define Package/libmpcdec/description ++ Musepack decoder library ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/mpcdec/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/mpcdec/*.h \ ++ $(1)/usr/include/mpcdec/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libmpcdec/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libmpcdec.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmpcdec)) +diff --git a/feeds/packages/libs/libmpcdec/patches/.svn/entries b/feeds/packages/libs/libmpcdec/patches/.svn/entries +new file mode 100644 +index 0000000..c600938 +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmpcdec/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-12T19:51:37.444170Z ++24523 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++af28edb6cb721fe526b9389dfef063ee ++2010-12-12T19:51:37.444170Z ++24523 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++234 ++ ++100-fixed_point.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++fdf40bef1823c056f7a5e780287919e5 ++2009-05-31T23:02:15.818098Z ++16239 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++216 ++ +diff --git a/feeds/packages/libs/libmpcdec/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libmpcdec/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..4cb4c5a +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR(config) ++ AM_INIT_AUTOMAKE(libmpcdec,1.2.6) ++ AM_CONFIG_HEADER(include/config.h) ++ +++AC_PROG_CXX ++ AM_PROG_LIBTOOL ++ ++ CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fPIC" +diff --git a/feeds/packages/libs/libmpcdec/patches/.svn/text-base/100-fixed_point.patch.svn-base b/feeds/packages/libs/libmpcdec/patches/.svn/text-base/100-fixed_point.patch.svn-base +new file mode 100644 +index 0000000..0f7752f +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/patches/.svn/text-base/100-fixed_point.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/include/mpcdec/math.h +++++ b/include/mpcdec/math.h ++@@ -38,7 +38,7 @@ ++ #ifndef _mpcdec_math_h_ ++ #define _mpcdec_math_h_ ++ ++-//#define MPC_FIXED_POINT +++#define MPC_FIXED_POINT ++ ++ #define MPC_FIXED_POINT_SHIFT 16 ++ +diff --git a/feeds/packages/libs/libmpcdec/patches/001-automake-compat.patch b/feeds/packages/libs/libmpcdec/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..4cb4c5a +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/patches/001-automake-compat.patch +@@ -0,0 +1,10 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR(config) ++ AM_INIT_AUTOMAKE(libmpcdec,1.2.6) ++ AM_CONFIG_HEADER(include/config.h) ++ +++AC_PROG_CXX ++ AM_PROG_LIBTOOL ++ ++ CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fPIC" +diff --git a/feeds/packages/libs/libmpcdec/patches/100-fixed_point.patch b/feeds/packages/libs/libmpcdec/patches/100-fixed_point.patch +new file mode 100644 +index 0000000..0f7752f +--- /dev/null ++++ b/feeds/packages/libs/libmpcdec/patches/100-fixed_point.patch +@@ -0,0 +1,11 @@ ++--- a/include/mpcdec/math.h +++++ b/include/mpcdec/math.h ++@@ -38,7 +38,7 @@ ++ #ifndef _mpcdec_math_h_ ++ #define _mpcdec_math_h_ ++ ++-//#define MPC_FIXED_POINT +++#define MPC_FIXED_POINT ++ ++ #define MPC_FIXED_POINT_SHIFT 16 ++ +diff --git a/feeds/packages/libs/libmpd/.svn/entries b/feeds/packages/libs/libmpd/.svn/entries +new file mode 100644 +index 0000000..8f2e05d +--- /dev/null ++++ b/feeds/packages/libs/libmpd/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++af34698102d198ad8866b951912e1123 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1361 ++ +diff --git a/feeds/packages/libs/libmpd/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..627db34 +--- /dev/null ++++ b/feeds/packages/libs/libmpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=libmpd ++PKG_VERSION:=0.20.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.sarine.nl/Programs/gmpc/$(PKG_VERSION)/ ++PKG_MD5SUM:=2f1c99e12c69f7d95cfd1e27368056ed ++ ++PKG_FIXUP:=autoreconf ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/libmpd ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+glib2 ++ TITLE:=Libmpd is an a library to easily connect to a mpd server ++ URL:=http://gmpc.wikia.com/wiki/LIBMPD_RELEASES ++endef ++ ++define Package/libmpd/description ++It's wraps around libmpdclient and provides a higher level api. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libmpd-1.0 $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpd.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libmpd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmpd)) +diff --git a/feeds/packages/libs/libmpd/Makefile b/feeds/packages/libs/libmpd/Makefile +new file mode 100644 +index 0000000..627db34 +--- /dev/null ++++ b/feeds/packages/libs/libmpd/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=libmpd ++PKG_VERSION:=0.20.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.sarine.nl/Programs/gmpc/$(PKG_VERSION)/ ++PKG_MD5SUM:=2f1c99e12c69f7d95cfd1e27368056ed ++ ++PKG_FIXUP:=autoreconf ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/libmpd ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+glib2 ++ TITLE:=Libmpd is an a library to easily connect to a mpd server ++ URL:=http://gmpc.wikia.com/wiki/LIBMPD_RELEASES ++endef ++ ++define Package/libmpd/description ++It's wraps around libmpdclient and provides a higher level api. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libmpd-1.0 $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpd.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libmpd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmpd)) +diff --git a/feeds/packages/libs/libmpdclient/.svn/entries b/feeds/packages/libs/libmpdclient/.svn/entries +new file mode 100644 +index 0000000..3dd48ab +--- /dev/null ++++ b/feeds/packages/libs/libmpdclient/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmpdclient ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-11T11:30:19.050899Z ++26031 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c88c7035752c7d4496bb6cf9247283d1 ++2011-03-11T11:30:19.050899Z ++26031 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1478 ++ +diff --git a/feeds/packages/libs/libmpdclient/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmpdclient/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2e6ec93 +--- /dev/null ++++ b/feeds/packages/libs/libmpdclient/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# 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:=libmpdclient ++PKG_VERSION:=2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://sourceforge.net/projects/musicpd/files/libmpdclient/$(PKG_VERSION)/ ++#PKG_SOURCE_URL:=@SF/musicpd/files/libmpdclient/$(PKG_VERSION) ++PKG_MD5SUM:=8c166c5212dd95d538d3a35bb9ad4634 ++ ++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 ++ DEPENDS:= ++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" ++ ++#TARGET_LDFLAGS+=-lpthread ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++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/feeds/packages/libs/libmpdclient/Makefile b/feeds/packages/libs/libmpdclient/Makefile +new file mode 100644 +index 0000000..2e6ec93 +--- /dev/null ++++ b/feeds/packages/libs/libmpdclient/Makefile +@@ -0,0 +1,67 @@ ++# ++# 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:=libmpdclient ++PKG_VERSION:=2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://sourceforge.net/projects/musicpd/files/libmpdclient/$(PKG_VERSION)/ ++#PKG_SOURCE_URL:=@SF/musicpd/files/libmpdclient/$(PKG_VERSION) ++PKG_MD5SUM:=8c166c5212dd95d538d3a35bb9ad4634 ++ ++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 ++ DEPENDS:= ++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" ++ ++#TARGET_LDFLAGS+=-lpthread ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++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/feeds/packages/libs/libmpeg2/.svn/entries b/feeds/packages/libs/libmpeg2/.svn/entries +new file mode 100644 +index 0000000..e439b1e +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmpeg2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-30T15:40:12.618272Z ++32915 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0f02cef4ae0ddb069274ca710b03eecc ++2011-10-23T10:26:52.234570Z ++28534 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1371 ++ +diff --git a/feeds/packages/libs/libmpeg2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libmpeg2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9d3c052 +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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 ++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/feeds/packages/libs/libmpeg2/Makefile b/feeds/packages/libs/libmpeg2/Makefile +new file mode 100644 +index 0000000..9d3c052 +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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 ++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/feeds/packages/libs/libmpeg2/patches/.svn/entries b/feeds/packages/libs/libmpeg2/patches/.svn/entries +new file mode 100644 +index 0000000..9673a22 +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libmpeg2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-30T15:40:12.618272Z ++32915 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++101-ppc_no_altivec.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++ae463024f3677b937c33e546d176dafc ++2011-10-23T10:26:52.234570Z ++28534 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1422 ++ ++102-arm_data_preload_check.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0b005e9e2de2173b6b19a36de8dd19ea ++2012-07-30T15:40:12.618272Z ++32915 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++768 ++ +diff --git a/feeds/packages/libs/libmpeg2/patches/.svn/text-base/101-ppc_no_altivec.patch.svn-base b/feeds/packages/libs/libmpeg2/patches/.svn/text-base/101-ppc_no_altivec.patch.svn-base +new file mode 100644 +index 0000000..49251a0 +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/patches/.svn/text-base/101-ppc_no_altivec.patch.svn-base +@@ -0,0 +1,66 @@ ++--- 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 ++ #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 ++ #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/feeds/packages/libs/libmpeg2/patches/.svn/text-base/102-arm_data_preload_check.patch.svn-base b/feeds/packages/libs/libmpeg2/patches/.svn/text-base/102-arm_data_preload_check.patch.svn-base +new file mode 100644 +index 0000000..86793fc +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/patches/.svn/text-base/102-arm_data_preload_check.patch.svn-base +@@ -0,0 +1,19 @@ ++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/feeds/packages/libs/libmpeg2/patches/101-ppc_no_altivec.patch b/feeds/packages/libs/libmpeg2/patches/101-ppc_no_altivec.patch +new file mode 100644 +index 0000000..49251a0 +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/patches/101-ppc_no_altivec.patch +@@ -0,0 +1,66 @@ ++--- 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 ++ #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 ++ #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/feeds/packages/libs/libmpeg2/patches/102-arm_data_preload_check.patch b/feeds/packages/libs/libmpeg2/patches/102-arm_data_preload_check.patch +new file mode 100644 +index 0000000..86793fc +--- /dev/null ++++ b/feeds/packages/libs/libmpeg2/patches/102-arm_data_preload_check.patch +@@ -0,0 +1,19 @@ ++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/feeds/packages/libs/libnatpmp/.svn/entries b/feeds/packages/libs/libnatpmp/.svn/entries +new file mode 100644 +index 0000000..6674d2e +--- /dev/null ++++ b/feeds/packages/libs/libnatpmp/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnatpmp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-16T03:51:39.022469Z ++29757 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0f4bbde409f9464d33fd1226531171db ++2012-01-16T03:51:39.022469Z ++29757 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2114 ++ +diff --git a/feeds/packages/libs/libnatpmp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnatpmp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..40d7b75 +--- /dev/null ++++ b/feeds/packages/libs/libnatpmp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,83 @@ ++# ++# 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:=20110808 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://miniupnp.free.fr/files ++PKG_MD5SUM:=22a1225b890471a7750a9bf26eb863f7 ++ ++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/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/feeds/packages/libs/libnatpmp/Makefile b/feeds/packages/libs/libnatpmp/Makefile +new file mode 100644 +index 0000000..40d7b75 +--- /dev/null ++++ b/feeds/packages/libs/libnatpmp/Makefile +@@ -0,0 +1,83 @@ ++# ++# 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:=20110808 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://miniupnp.free.fr/files ++PKG_MD5SUM:=22a1225b890471a7750a9bf26eb863f7 ++ ++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/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/feeds/packages/libs/libnatpmp/patches/.svn/entries b/feeds/packages/libs/libnatpmp/patches/.svn/entries +new file mode 100644 +index 0000000..c1f011d +--- /dev/null ++++ b/feeds/packages/libs/libnatpmp/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnatpmp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-19T14:42:00.852943Z ++27692 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d0eec42887bea5de5892e37a412179d2 ++2011-07-19T14:42:00.852943Z ++27692 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++294 ++ +diff --git a/feeds/packages/libs/libnatpmp/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/libs/libnatpmp/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..1136f93 +--- /dev/null ++++ b/feeds/packages/libs/libnatpmp/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -11,7 +11,8 @@ INSTALL = install ++ # APIVERSION is used in soname ++ APIVERSION = 1 ++ #LDFLAGS = -Wl,--no-undefined ++-CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR +++COPTS = -O +++CFLAGS = $(COPTS) -fPIC -Wall -DENABLE_STRNATPMPERR ++ ++ LIBOBJS = natpmp.o getgateway.o ++ +diff --git a/feeds/packages/libs/libnatpmp/patches/001-cross_compile.patch b/feeds/packages/libs/libnatpmp/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..1136f93 +--- /dev/null ++++ b/feeds/packages/libs/libnatpmp/patches/001-cross_compile.patch +@@ -0,0 +1,12 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -11,7 +11,8 @@ INSTALL = install ++ # APIVERSION is used in soname ++ APIVERSION = 1 ++ #LDFLAGS = -Wl,--no-undefined ++-CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR +++COPTS = -O +++CFLAGS = $(COPTS) -fPIC -Wall -DENABLE_STRNATPMPERR ++ ++ LIBOBJS = natpmp.o getgateway.o ++ +diff --git a/feeds/packages/libs/libnet-1.0.x/.svn/entries b/feeds/packages/libs/libnet-1.0.x/.svn/entries +new file mode 100644 +index 0000000..ee8087f +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.0.x/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnet-1.0.x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++de02c6b3784cdc7ce6b3286767569f85 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1756 ++ +diff --git a/feeds/packages/libs/libnet-1.0.x/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libnet-1.0.x/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.0.x/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libnet-1.0.x/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnet-1.0.x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e21b796 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.0.x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,74 @@ ++# ++# 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:=libnet0 ++PKG_VERSION:=1.0.2a ++PKG_RELEASE:=8 ++ ++PKG_SOURCE:=libnet-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/ ++PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION) ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnet0 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpcap ++ TITLE:=Low-level packet creation library (v1.0.x) ++ URL:=http://www.packetfactory.net/libnet/ ++endef ++ ++ENDIANESS:=lil ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ ENDIANESS:=big ++endif ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-pf_packet=yes ++ ++CONFIGURE_VARS += \ ++ ac_cv_libnet_endianess=$(ENDIANESS) \ ++ ac_libnet_have_pf_packet=yes \ ++ LL_INT_TYPE=sockpacket ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure.in \ ++ include.m4 \ ++ aclocal.m4 \ ++ Makefile.in \ ++ configure \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.0.x/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.0.x/lib/ ++endef ++ ++define Package/libnet0/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnet0)) +diff --git a/feeds/packages/libs/libnet-1.0.x/Makefile b/feeds/packages/libs/libnet-1.0.x/Makefile +new file mode 100644 +index 0000000..e21b796 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.0.x/Makefile +@@ -0,0 +1,74 @@ ++# ++# 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:=libnet0 ++PKG_VERSION:=1.0.2a ++PKG_RELEASE:=8 ++ ++PKG_SOURCE:=libnet-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/ ++PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION) ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnet0 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpcap ++ TITLE:=Low-level packet creation library (v1.0.x) ++ URL:=http://www.packetfactory.net/libnet/ ++endef ++ ++ENDIANESS:=lil ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ ENDIANESS:=big ++endif ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-pf_packet=yes ++ ++CONFIGURE_VARS += \ ++ ac_cv_libnet_endianess=$(ENDIANESS) \ ++ ac_libnet_have_pf_packet=yes \ ++ LL_INT_TYPE=sockpacket ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure.in \ ++ include.m4 \ ++ aclocal.m4 \ ++ Makefile.in \ ++ configure \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.0.x/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.0.x/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.0.x/lib/ ++endef ++ ++define Package/libnet0/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnet0)) +diff --git a/feeds/packages/libs/libnet-1.0.x/patches/.svn/entries b/feeds/packages/libs/libnet-1.0.x/patches/.svn/entries +new file mode 100644 +index 0000000..6869340 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.0.x/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnet-1.0.x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-04-01T15:43:37.817826Z ++6798 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-debian_subset.patch.gz ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++6f20e9cb1bf495cdb29c69b006b727b7 ++2007-04-01T15:43:37.817826Z ++6798 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++208420 ++ ++150-portability.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++9167d61e105b6498f52d38479a08905e ++2007-04-01T15:43:37.817826Z ++6798 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1097 ++ +diff --git a/feeds/packages/libs/libnet-1.0.x/patches/.svn/prop-base/100-debian_subset.patch.gz.svn-base b/feeds/packages/libs/libnet-1.0.x/patches/.svn/prop-base/100-debian_subset.patch.gz.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.0.x/patches/.svn/prop-base/100-debian_subset.patch.gz.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/packages/libs/libnet-1.0.x/patches/.svn/text-base/100-debian_subset.patch.gz.svn-base b/feeds/packages/libs/libnet-1.0.x/patches/.svn/text-base/100-debian_subset.patch.gz.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..0c1d676ca4b443b9be68ba77cd310f115ec80a91 +GIT binary patch +literal 208420 +zcmV(vKzB?ue-h07nzP8EpP9IA%d#F| +z-#UEp?7%uWgn#VduyJqz|7r*Fk5vy24-U4g)#`oCY#kjOJhcv%sSYI+Ts4;0c*9kt3l|_SDw$xyJ@tvli2lwxMIq!xzS<~h1=Eb>gf9AX>T}U +zO$KyKa3Z4n(|FjnPkW;=;EH)~g3umyhP|sX@{4}BQ8)>vh`#mXB#6S=tigWl4oAH~ +zf4jPs_#U%-wv*Ird-bn9kQ(|D%}U>t>O1T^R{oBC&&sWB?~y|#bh^)!QtgKaPEh_G +z<0nOZ<}f~?QEXq22bb+1y7u5|48}ndPomflrXdR>%k!6h==q@=_z4;t2dZiJACotIkQmKA!C=pJD;7_*vOrMi5E`DzFPpO6@-&0^gpZ;9Qf}!^SytZq{Y|F +zD)#LlT&_~+6-RVK=VtCh$KdaDwOA(1^KVwuX%J2sw#A&#W3bF_qQqx@97i#M}%`Pwokh+ug^i>WekS- +zz_o9p?i>Ir`yYJQ7HGm406=p$WH537U|#n6_SFy?{YhZJuOOzrZT0${EJ`>ifxhUy +z%%Wk23DjjfCsYH-yujM;j)W8W;y}Zi>Rca2knIZ5Z +z*C2R8-MP3v?J5G%8-r-3h^$weh;+%C`Hlx()?_<-1lwd4x;R5JjH5>|CTYBKQ<$h3 +z&dWz|E*v+GGF?#msXAvD?eme@2m!G9t1E@$7y$s>;N?HNo$*L(eubz246JJ?@);TQDmW);l6LQOdal-Yz@c^gqqyb1LbP%RBZriMZsU8~DT+S+Qx +z3uaA7+s8!Jij{}f&>D7!_I}yRE!U$yo>2UQB&#%-8zfA)9!`o#O)BitC?pj~O)aq6 +z!e9^O8u_q{##k)x@(7~Bo;`hfADNB?9wgOKMMZ52pTYAGsg5)rB-NphCN&*@MNgf= +zo&tlI1;u!(@OXwI6da2Uq$k)^zk(#@fb1(ndU*sSC +zMgGgb$lv~p{DUv#hk3ej;ubRSh-%{u#&wPVxpUtM(eVZo?lLX@t0k7A(kgsR7koyES-M$sgF?|{9}qE+b8VS1nSLYIs-o&`z9>`yj)NOaRs<<2`#wl# +z3^4c|tx~p#ykHWzBsPQvCrR>fs^*m(sa+b??;z406D_*riZ +z@!E);4Th|Z0*3X4)TJJ_M%}TE3A7g0MEaqr^A1&=97V9M0qV!A +z_V`tXc=>J$aDAG=ZE%rmy_`P15xl|oh)7p6gs2OJ%$yFo<1B0& +z7DSVEPEoaHsa*c^=g})$#B|l#r}8c$>`@oY(H;+ml@cx+*W0cNH;&yAMamIV0A?pM +za_>SL38QG(TCi`Ak29oK!@>EmeOW-AA>&EmLMpkZyy~`3yF(($Y%|b#82kj2ScDW4 +z)K*YCbQV64^#{YtHlE;Q=Nj8p*obm~!DyU?2)66~8e<-WtT~uC-NEr^4iPTclK^1N +zS(KzE9P2oaPCWH92o7oSe68IXTwX#z-eg0t#$^|}OXIAZvga?8igEHcZzsS3ZWUl) +zJOjmxA$V#%hVLCm*=IO!-!Wxv2ms}jUro}r! +z0`e1BnX4N$&D))eK?jEC@|XtS)WdP-k?YKBi(|eTMBQE-lbH(W#o_{vf_|%RVUD}H +zZg!Ga(2kCSAfC5RyI0-*X}90$;R%wrqWe(cf;qXZGW51g(MzMHPP$SibR8Fbp{UHG +zDN1Ep+c})ZMg}JDk~MjwP{lc&*bC<)>{tLD +z4X%eB)KRQFqdx3*uEB}^*tN&);dz(j9>a%oVGGG!u +zQ{^iHH;o*lL}9MHfFmc!p`vm`l@!Ajo!Q>oel&`@)Qk(vY#kXaBCU4q}V&)OHGE)nReLXL;m1`cb4f)&c4V@$kPMQtcmLa6`Uj{OS5pAfH9&Pb2*R8`6hX<$!D*L6L(D|@Sic$dqKXqZ<5rj%D4COk8adfSvqdXB>w#>SL*5PC;2Qr9MFxkpN +zOp-AGilk)_z;JP@>@A82q#TLdruCQ=!Pm&;9nu=TK&&yyWw8$Bq=T3Llz1$1poEC( +zcrdsS5G-<_F&4UpD1FUAIOEnMgS4+ZIXpm+geD7KX+hEEn!qS_2Kje*4lCL3IO-6QqA`5^#t? +z0tgBhnWAwVLo9Gm*Cu_}+R2sDne6wVP03kbkDP5><6;Z^IR +zb#PqUO>OS9WLbfA>t~yp{F95F*OZUDGZOO2aKVcFyqAHNE +zO?hyTu)Qdi1O`YD{l1D)#ZQ$M1)AcxFWwl4Go5*s6PI!Gz)2LCR~6D-t~3fN3K1DB +zk*2@(LobRoiq`?HQwl9n1Yq_dMfMp5oivRTCLKJLuDT{sLQ`3m;7F54idJiBRP}Q* +zp{MZz15uMm!Ks)@EpWK30ZQdZ@JOQNS&qUKjJb7J2!dy$18$;SkbOcJeXDua;8 +z9EhZX8g#R+(PH3rO`{@{Ei!oY1jqnB^DSD@OSDbT3?F=Cc<&QKxmY5k4Tmjq-?OM31)BoC8ko#|2Sb@L`NvbTqp6_ +zP9fV46Db-z80?kH0Nkr60As#8i`WjMJ3OHho*&A)a(LhvV##sYIWagN$3hHSfc8HG +zDLXI)5ajSgg8amBdD)9XpO;MS45QuCoHVCUwTP29_W(bPIRp}&-r#!FFo3euC>q-! +zTuX9f(lI!MVyOOMjLTkz$QT{bdzEgfWyKkzv57<(cU`Koj8c|cwO9}C{t<>TC~U4qikA@l4=|D!qrU&R^9lTbXwcRi?n!Ipe_{@ +zXJqn}kbF9@SPEyX=%U@ern +z+mq}vEOA3+6O|S457f>M`t-H#*URO}PRU&R1rkbJLaESzC_xFJ&Np;_(fQ)c*NHh} +zTr&fyE;1@#G$3DMHeob=fBmp=INbv#kR4t?fI9z3`6_&cl}6DV`)kR|@_B?*#rSx_ +zY5+@^jh{%Ta$g0q1jMv4Wk#Jv!?;ETHGMaY;*UECnZgqDLE3}SC4rjyr;e;M_vA5ZMZJ&hX +zp(qCbcHhqecgC-dU1ybW?NoDkO?>0C*w-%?-s5UT+h`k9PDrbx3XAZ$#QPxe_u0}( +z5)$V530T`xUFLVmqT3jxp+WI>q=qhiE!kh8b%K4Hgi#C*wTxi~`RWtqEGErz`AE*a +z)J}XqY=#jB@E}>N4A>$0vPkMW9Ie;IYLE*~X1~Q^6IWkFD~_)ouoR9@xh&2BM9H~I +zd6!pG7`$kym2#d>ssGVWv_s;XndnJLwga;}>vQfWSG3v>@8aGh^x>NlkKSNIytI{t +zE7)&CqzZgsW1-*+nt(AVVZZm95ErR1bnhM1CQdM??wl|aR}`EYMv{ggGlfysPMh@1 +zmm(N&X(^g3bw7T^@n80g| +zf?eg@HLr5usA7hzYtx&VfgzP*|F*gF@U(wmGB-}L^AV*gQjiAqwaKU_fuM#jRx5q> +z8qRADV*V@F>;L|hiLI|M8@xBn&h^iCp6m9lq2iD2I;v1H0}l6pfKu+7R@>FyDMs)7 +zMvJaSjT_U8-sp;MPJx?W&{s^gHKD;?z$4C#5dHkV@|$n5k3nJg@=<#rCp2GLem7Wl#5Y)3nri(S$X3RP(zN7orb&~l0o8Om(IE9X|w!zcO3;Bs!EOmNmaCc`+12Qf-ziEO~ +zF58uI87*GV@ZYmr+_zNzZ>$xiB%S(cV%iWjk1E{4asd@@&YUyE?g=s+D`A^*Sxuu8 +z)d4Z{MM3>Q2i#y5U?`#w)^f~w11OaJr3c^Hr^YUK5gqO$I^0FL{|!Fk|0ks}BRd;s +zq>xPcsg9gho&2=Q0y+iLDnGAqe>kVnS7Re`i=KR8m&wK9zzJdW7&n*TR+uTZVg-Od +zH`L%BE1ROAnW*y<(lUhjgBMKBYZ%Y;rMKz`#B!PKN65-{zJ8Za1DoP?*qlpn +zQg2|AbBHG(DqC7p=~C6r%u)^FVh!n+g!}bheyjg$uUy{W*Ev1&7>)b&S53_;qj?jz +zo`rxmOLb0RTF*=(%bAs>%0vSwW@jhAcN^A0TX^-1J=VOOm+@j`OW6ltM*R)5WkkSq +zS~6=nTo;hjKA$O|6m+1=QjF5|VFBw=5&is6Ek_|oQs8+F8!2w1fI8b+Hq-oX3G!fE +zN*N6$pP?joP7jjhO`kt&>G9lj>N0jHX1pYAmTI*+U$RnzQie85caN3^vDw-~17SV* +z{`A?iXPNh>PBni20bij0dV)W4=2E{}=Q}<=W)}WHK4FJ>0gqwNJ$rp57dA><#(VYk +zpQ8w2TpkL;*-gz@LqeL{6_%{&AHlLA4NO}Yy&Z+)^emb%%e3Gf!^gDXD&?En3PWye +z`ul>Hx0^Oj(eMqh9zD8cqGr~MqQ-9iIC`)(p!@mJjp0lA7=N@;(AdupHifTO%%-sZ +z1!hFH$JjA9ewO^Xvl0XZ0H+q>-*bq3_;OD})CT|2|G#&(h#Mr4FkFRD5EmP$6?td8 +z!ASXK663#2lULdN|L2E+2%mmf2p(g)a`4x4KHje2FZZM<`e`5j!jP_V<`cY0rc^Ke +zC~v_Nmrh7mEGP=}5SL37d*UTKH_f)lBg>Sqe4wtMuk49#tA`Bhrdox>>HQ?*|Seph&cRY +z0?OZh`K|Hmul0X5e!eRw1O&1@U+kIX@}J{Ne9&&y)5Y>r-C0AHVsZd87n~8SzV4o3G--zuxs18zL8#P`9AnWSTESuOCJazoBy7616EpvnK$7$Pm0;|N +z&7NFqO?0hvDck1nfjyn1&4gQZL$jw37QSZ|oehCfK$54+Y+#HF(*)JVFJ+}_(8swy +zY~7Gk{xI;{_axNVhvvG_a;S41YR*0ugp!&yqdG&ry`mLkiYP9BzS)TDwfbiLdSkG0 +zxA9P-$3Ou2SC%&yUH@w0mtJI^DJ98XW){=#UD%~t;H|rt@P7atzg&J=d7h=+lar&9 +zbymoUZqOMCzcUJk26NX7V#7f|En)Xg(^m$u12!u1N22s*7eu=K^oKZM4WwldO^2y6nKBoKH~`%b|GKCuU`-(#b6zbBupCmo2%a-GWQ*#xmy +z+h1CayX)CryiOT5MVn)iMM{`VL(Jq&G+(+CfliunT6#BDH|S_x8UDYv2eT>Q`ZJqS +z=;dNcxen2mjorG)^ffkc>`6v5$B8Tt_XeY!*zICf4Nxvrwkx%1mXx*YbhKo*m~dl6 +zJJn2IM6E7L2iKTX$9;}%ZhEnVbg7mV^>g?h2$pp_%G)E+Ka^HBsW3j+G&KvCI)IyF +z#zcmCVQbx(SK3d^Eroe%MD}#Z06dI6>q5tM9bp4w9pB7-NA^`oYbC4IUwFJETPrI- +z_zD%!0JBY}wW&{*h+|+ZO-2E +zXleyHH|t4TFEeY1zfPZpV}L5`IcG$*!ZKx8jM?*?A9JE&iWxTv1I=^__DX6kttYCN +zL?N7;DeCE`aNUiOAfGCuS&WvjF5H+2ycavsdLnp&damjwwy^U|ZgWFlj5V}fOf{1g +z=fE!4!zgA65}}$*qTYJibna`{hIn5mk_krgS{ns?9%n6Ks%@MEdtKALlZ%=#Q(PCB +zHj7DPMg*Th6-0(vHdY<9JL|#;Iw7B`*&M(@H;5CjWA)Y?1=wzut$Q+T1@9R5;d*Xt +z3vwDeetUHI8(xm4Erj{nU*52yq{dwlmUEdUtSdC(oiuTiXIOpCkx@a)w7}6&3Zq~a +zTFI^VA}MHv)(Q)yMHO0&XD}nNf%7+dj*V(!^CvlA6;&fc(pMS~rV2z0m>|$8-HC); +zM=fL<6kyYoG!EF5A$ig}oPYx$$r{MU9b^&~MQ|z;JK!o-62!vh-|VWAaZByX+>J_= +z^J$E|^)k06RZnlv?EQ|LRq+0VeJN-w@|8WVasoGv2E*Q{%IIXay-I=bcaL6wkE9W( +zQ4gRu5>hPAR%=gRR#$7!Rx9ZA@aFIxoA|(q-H$M!FA6HOv9*^3xl|k}ZvznA;`?|M +zU`mi4@C9XL9vb)YuL3v%n7MdVA;#be1KzcQpiMFMYKKR=A21rh`s73mR!FU6f&}v_ +zFAak!ff*E*yyX@6Pb|M&UtL~beK}JW1{cJvNf@3|zLDpYf}!2-a{dJa>M`jTpgO~l +z2^jFab1pb6xPr4XU}-D(VR +zdmpiAFpS#c7NUvMO$leQzVHpRvnUqu|JmmT3xD&}Adt+NQQi5rc>xG@*z;n347_+p +z$WSP+8o(00Z5}l;UNm3*cDmbayx%(3FL(Bj_nJGqzsevYuw$J{ueTbf%?~f0HA#!F +z-@e^~lf7}Yzjd-_+M$OC3SqiW8%NuJ+1lATX*RZ+`@4sUDp(vh#L8+FHpI$PPTiu) +zG@%o}9-UzSQ$qpvfwpM?q{2r0IJ$o?b-9T}0IdW#j5Q@bQFBZ)UWM!hnvtT&vC!aw%n3=>w-Dp2q +z`aZ79%nI&{PT7`f +zdxu9S_;fkZF`m{s|4H||u5%A?Pp~W4jr|qe-$;!>_{Hr!kET5KRCdGu_|BTltXFyo +ztVaE~S4RVpIPqLp%IsJ +zaDoF>XP}{PDL30>& +zO_!1Fd|>wOj2d0@WEyQgoP$4zuRu53I}w*zIYya{}S9KvUA4L@Y?+bI`XH_^wS +zU8roBSEOw%?|#@r;=Z^4?qpZJeLzx)UwT0=hW`9H_N!v4D&p|(LDVV7ex+gt+Zx=L +zVe~clp8~g31&>b^!TyC&Yt)5a!g%(Mw%_c%-aFjc{ZJKuhDsISHJ2(}_B(W(dga&R +zZnxR-dtvt;rgclr=Z5n>M5C_&!_=t$%O`Fzh3il*xdt1_iRulli4x`BP|s9vSnCa~ +zCfz4A6DYS>^5)DQ?v3kc;RZTc&n+LlGuYj?CyLVj0 +zJ0V2B3ii^>CXLkU?<~u4-p2*eQ5Ug0M7t3ScaL{Z4l3s5XDd1*(~vQ6Kc!f_+uK2- +z&?O?ab`jMUO#Bsy5BE-6xd@<3JeaQvQa>uF?UGwxSO^52y!Y>GLfnER2<#Uc0+GgZ +zByOYO$G`tTWY2ElK8OiNiE1+hy^D#2rMsi(R$jRtn<;RzkeBqJ=XRhOTM +z#TP5pm1TXjtDCK&-)gE%FaD>XsgHNSBVIDT-ZFEr1xHxpP4i^80hm=LAS!q{SE$u$ +z!jI!|4-J|6kt8iaca|o}Cz{&xtoAsBUzu1v`;^G;62PdK?q&u9+$7FxV*C6*2-aC^Vj?>W<_0?LCPTXb*nWA-*7w^#1o@TNixUtmsQwb +zE6-M{FKB-~kucsJmf?#;G!`XT2&(e1&g4wev%SMN<(?1HAn-T1z5PCjb+Sz;x4i|W +zn!j%CmofI=Cp9WvvT6o!<}&Q+me;WALZw4Y^VB2?tghgAR+pbwpF5&}T1vB=<_6g; +zqiljg&dX+5ST?I0khT2t}Jd>vH#t21^`?eCGZ!?T9*4Ou$~ +z$hYV1ATZySxr6m376^%`nI3V6a!tuQBc%Qwpo6lmR#!<%K}8{I +z`NE`zWV~?`;9Xg37!F2A)ye4rRvm38)}CQ!(fFh(gIVLto!|=2SW!F)KCO%8r4`hJ +zW59XI-JB(=T)?8^vyDbUcevUp`B%2XE!M@=&kOpe;*@M5sil;y6x*3(_qNN#!kp#JU(UF5)HKR +z?p5QoEGwDb9}f{LfnLDUVNMymyz=`oQ6yGUWlWAZLnf9PS!WL2Ig*oje6kDkSYD|u +zuX4MIiQPTidbPjXY`on%+1Arc;B +zP$30}gfcW$lAA!WTNNcsoK2L-Kh-J`63xH<3 +z3p@q|%S%2&t;S?n@AnQ@R{$a%OtSKA*oSBBZr1^6o)T0V#n#CiNgm7cNbrEU`$&@Z +znGhZ(XvE5%{T4RDrzmV=7%*ZL%01%Lu7-jCQ4IVc2wXvz?V#fd9tFHecSYF|39E_q +z$#ws(AK~p$#%mk^pGJ+S7l=+5Z9?$0l+hf4bsPBCB=1RX3w`VW8HUIup=U9CLj=5z +zqPE3WD3kG;!a3q25XTmPYY2zo-7`ipVC>QP8Tn=oF9}Q-Dn5}#A7h3wykM50lh5Wa +zF!rNpHY5DoY>I+*3oDdtH3gpRz!pjz-ok7IzcqK2=7UF2v9Xpqd08LF!}?X&uagwv +zK#Q*a3IH!@2t;pISG=omw4gPJ`#Zo;eBR&jy6p$yt*#W*iw&tAUI0AGE8fp4|7>ki +z3(wY4HF$ri9Vg8XwR%PELSBNn6|L4*K0Q^daMTx#?IUpno1%d{{7^it;yMs6cvnHU +zg9w0Lt-zOeJ$a)Eymr|4(VLZ)se$|^=T?EP@)zo5;u!;^H~Ms;{a!u;b`7Z^q1v`V +zHta^s)nHq9N2tSTwVL#}iBF~Oia4RILpYhCD{_9+qiypW(P4k@5Zb$_;(r+cacAVb +z=|>lp1niUD#_7???uA1(?+V3?>bxUKXK!QRJWC8LE|F4ET(??crS_r*a&d6oia{1! +z!d=%7ZiC?loQS+Qxcg{g7>=H5YcUEg9exbOJ40k?-CqN7!c`+#VYN%M +zp*sGp3ZREb5UQf%!_k;ga;t$da{hbZe|Fv-0R4w8h)Lv4Nygk^&_XVn`$!ih)Ilk< +z#6*c;GJQBd##dse+dTkAUlJR{GQ1FCNaW-Ls6PzbaG0Xp3F3d$MFSWG40Z&vCM4%E +zT=J<%<8jzAq!5JAZd;XC9q5evEz}TbbjHQR(*xxY3!80JRU7^cMc!ebZi|~ue|g +z=GTkc+mdKnm{bSU21M#d>cJO-SQWJ&VCEA`sf_gt9<*A(MZgmXmKLzBic8u>+sR>| +za01pQR?tk{9#-bZxdbbNWLedci+vN_>drt{Vw*&@(I4bC9JOxDv?i8S(Ek}VHmOmY +z3fb@QRYg&v%xy1EhV<yO!{tw~m@+b^KFQW)GWDXFs3!RoY}|ZHd1%5IF23VTFiR +z6Yh)mVINWKm*r=IWpIjKEY5CuYf0d)P<8cHvEF&-rsC*7vzPO3G9SjXkPcnO>|%U +z!M--tS1!yIVgGf+O0i-hRvK=I`gOLva&b{xsEC{a0O`=I3X5#&TV4h1uw6qfJbw5% +zOR_%~QaBKbCC&kj({bmFSRXnv1Yenp*KR5(7a>1E1g5Mm3g8-?wrIQR|7GGk&j}h%VKB{I}!;QFy +zOocKv2jbWXZt0|x)R%5D&H%_gjyd4|zw5#Ye^(RYJpySFI|0HOvnBwzFH8LV!w+Jk +za={(hz5z+Gg}$+^E>iM#fLhxt6ewYwJPI{St*A{bJp9D3o29d}SKB+gZ%$zGE=mmV +zB)AUl1~^+iAE>mfDhDQ&uzm{-i38=H3+xW{f15!M{LyCVynJ@n-17d%_x^ryp}#J9 +zFE1_@&MUI5Q=K*(7uvsyC_e +z8GsH(!-`mXs6vlbt)fH^r?T~(;S^xzZ5Zc&K3^d)a^O2`f64gn>1!(6UBjGknBRu(=q@*vUtL;c&EoV%Qw3+7{G%v)4F%Z`HjSi~&AyF?*v}X*KYw3IL767rsFw95q0=Lj9;8k0P4=^y(V= +z!r__BtS&mXy+r{G$53Do2&TORNwO8#w8H+aI=*R3F$SJo>y}DFiumAh;d| +z15qjilrMC<{p$5j1r=WLOO*}i1{u3O@z8qTlh*rQhV?!hME;Ad_h(jb&x=D;QNT{L8EAQk +zNlCmUtgoW9_n$-sw?HbJ&BU;+xxRvGPC+q +ziu})IRKiU(r54jLB3PNXHdATXqOxB9!&Btn(o=+}CayCR9%VFY;h%CI#gJK_KoC_| +zCE0v*0e!*^Mx}A4WZ9(u8#t%Tjsr6}dpQ0ZU*YVL*l{^qj+L`ODay@e<8%iNA=u}T +ze;_X>nE~eO=_UbPh}q~N^_u6@dfq~2-<;ry`7xd+i{xgF&VD_AFhH7r6^w3!pl=Jq +zu_X=1HFD!2`05ZP&mVrm9l=T)QeMLDNx_I5U65Y{&a@lB3bZBi#b;+17XrBW&+G?7 +z{Vjgp-u7Cp2XqW@O-zKkC`ehJBvSn7n1KaLpt1$48p~9*Y2s92%AT;6{XBQw0sfLB +z?g5jvp*GXJIEn^;7i+au@v5-{40sUtOCxy$b`!$1iw3Z-z`8pAAU_E2PSom&`ANEf +zRHctd9X)lpT$l-cqgQu +zrf-Yp$Uz7mWkBQCi8{r8M5cnk-ZatTf(xZNIUJ9}E~z2#>IDGbI#M0sfy_GQSWB+^ +zSJcBwbjunTzL6}D3NzO7`*_(yLF(;8p2A})^!qdP{q;_BdmE$Ig$ZUV9}aLBd0-5~ +zr6Ennoy#QJUFz!trxO^)aU#Q-?hB8KM`Yj?(YP5&%R1%BL(_3-?R@LU>uD%0f0P#8 +ze){uM*KWi0iXp68P!i=1M>$87wJ?)U6NM7`fw|C`zkt +zb7(RY#4mctZdYQ@Zh`#Sol@4UoJS4!6HmtBl#FEy?SwWSl7$b%$ +zQ!h1(Qp(2*M>y2_$p4UX)!7j-dTqd9$y)&sRGLT7Pme4fe_?7WuekCo^KyKuaDsYF*KansIcwBxP_{4 +zoF%IWS-`S^3#QZv`(ui51QQr`Mo2F+TX1H`Ze@!^q_9uddF`k*?x9%{=7Fo?@hszv +zQDkE@Ji|)sZY!7NB3}@kk4hDXmXHzl2Y75Z_**y_1OS{X(JB9fhRU=a7ms&YKAxap +zhWUF4K|}#ppx{hX@$>Q`KK`ZfpfvrDn;CM~0sK$}XzN-tZ3(PT7K;m#-IoI6l6AWP +zy?=Y`z55_O#y7NX$48C54?Gf?aggKzPRU}zMx#o8)RyjH(D&^fIyNYw$|yno`JJTt +zHqn>0HZk`VN1o#c8^WCvI@bx!)g0L1ap=qrqltU}I{SE;msC!0A@VE4LE)D{6vyEe +zx&S!dhJl<0yq#~Mo1MI7A+8OrDthFFSHiV;y7V`>&?SDbl6KKG*%cryX>*~;)$EdGwG_!Jl+8QivC}4lu@%^wi&i{6v&YGOGQ-|hz0^H`*41!S +z^}>|?T`C}{Q5s-*12tRLp&+>H8hp!I6v){hujwLpo@+Fs +zDlE(}rjxT9MQmead@~82bWfG>VsKa2SOnX9jWY9R{3GTbV2Vh54m-&7!$Ww0uZqbt +zTL>$vJG~X;Z!m6MnJt6puJZt*Um|ryXN9yL8XZ8zMrDIqy7mm{CGt^BgP9r4#J8fF +z>J7}NYQ5lYEs@+>YE{%y6lRZ6GFym}Sz^?%M)Ui}sL@5fLmV3G+@X2J4F`j +z6t|IWmS@gYFhWZ*ELjDn-P$x=yp{pB?^6&PlC80j4`6TjZAhr0{A+PgIvDdA%HG>j +zZ6|b(i2p_zgSm`h*!oy=aJZz3mZaLKYwvO5y^(XVwzzth+~IS2L^k`*e1fWz8~~Yx +zu)-GJR!L2&!~`Q#`PbwUp=~g@_R-1So4rGj_3h^Jg$FriW`i>8sxl5d)$;^^ta{9O +z+Ha<^raa?Hm8Gth*+z!%NU~O|BmNYh_e<8z=p#?;x$kgb&wUF5&tcdN^tzGbAxQup +zuN%!QUfpJQGIR0FR69I<##G4OPu+m_bmbmDkLt^;6Z=iHVb0wSIha0|iN|wXso?Hl +zQ(9N%)6W?*4mmmE!Ys@AZ?KC0K8yDiGfP((^C+xesmRD8?x7RzP|9K?t;`LE!KY11 +zaxiBLS4J{QOHJ8gRq}x)nlYz1XEBPoQcJFk#A$=fwULxo%xw`3q<}RGI%^QydZ;S| +zC_v{oNlst2Dc{xYWgTgH51TeQ*beoBi#(QM?@m@IU +z4KOK8_nvr~zmDnl7*23rW$ai@k7bh;6xQXIx|-rA_^o<$p}A*IWAy2h8@# +zQKR8)9~~U;?e87Fsmyef@ikW+iJ?igv)XkSy(yOFeR7v;F+$M6epXz&a4vPUV@-ya +z5eF2ZYlL=p-2d2*Zu^@{8~nQ;HODd9=WZ^mC+O@cpRLGxoJNkW6EukF7OH3S`Cj~1 +z5NLYZ4mxp7#^ecgpmykf^Q|2(S~^GlWUK?SqkU_mf|Jwz9eI^SXdx|BV3v0F`SIMG +zTSnQq2nMjTZ&%L-;Fi$x|7q8DRFs8KiYs`BOzueN`H8nM1E3e^k5W_d$2pLFq8V!nXnycj#;B|saw2s> +zYaaAeT2LmyaSK{-oF1u8P6n1L>VUJl=7P%ym@1k8m|t_rt|Zq#{mXn$;m8zoNxFkz +zLo1L4(7wu4rFWfvG;EhE;xidAhns6FX!xw`rA4`dHc)^>Z108n#)0&302Oi@xA6E& +za&+uyj<96T$xY#qiw)MPvDsd?Bb`@2TcTIF-Hq>i{JL78z7{IVbuaYF}6-j4x>KD +z@o?;C+}J|af#|$wA`(r0OKTLiOd)lq^ToXmUX*-<`bM;G(PjpY^AWK6L8KkT9Z&@{ +zeMG~NX4EgF-z&JO=dp~G!ml>uZl36hmuz_-THX(@hW_w=a?1+30;BmESi$Y`S$u;b +zjr_I=UxA-9w=q?yaN$H_U^svQ<+FCTjraN4(DLDBbQ+^na6@xviN10%dX))QVwfzD +z>LEECCqd)^$?RFT-7V<43Hb3Ro`Q@P9@ho}D%gX}oN4$&6fx0IMpImF!ct+QUQoH^vuWUxoB*zL))iomjFR<`=}6RZy5?0L4|PJ@86p8wXKeG}#$ley#H +zN9H_`YiDg{hmI&b-*Mi$8#rw&E+nnw3r-nk#ipBSibf-pWDTb1OFyb)aX}e%WXz(> +z;*uXq(e0e})K6&!(Hoo1i;D^&sYtA4XTG@sz5>nh<-IZ6tb9#|WnvjQo}gB_gAJP;`?K8eYOv +zOdE>&Qjiqe(HLV{lCrZcb>ny|{2>n7nH7C3P&2Ax(d;yC`2#FXH^sUS7>lw5N1==vifH}#k%^dI=79U +zO@1F^euJE}Ss*eYBW%3k*e*Jv#yZ85Mr)jAgqq|{oz58uDhI7@VxnPKBpnVEqq;Lb +zb2yCHisyA%^GkpOts7i=)L_d^qWo{lm^gJX5(mX!w>d&S>7_Y_W2pwMm(U6n{(_*p +z>7(}*g^tvt5wC +zQcgaM5Tis;9~?YRa|Am|Pq&Q6N;ZF6CunFUwoW$vq5HfkL$uLb{sAY!*eN7mH#U6- +zC`R)_hHZPZ)v}+=L11fNMu!&CO=DCdINH690O&QeDF2(_YsT6<3OEvSFq5;!e`sThgj#pSf +z|Jsaf%e%V*iN!JyXOT95b;AL*2tPPf#b)s{$crh#)-hJ@n@wouCQF@!JkV9#RtlNSUVs3|u!J`f +z=dvUJC}x!{*h2Y?Kpz27sUlNTT_`3W{UZgxVD|SGhM5EED??-(p^w~s*g#--O{V@7 +zQw`0|$GzS?27*K0 +zj2C((+x*t7B17Gzr?x@wK?D7d%*~KbV?@HvzShL{T?N<5Ow5O(Y$+xoHW?zTZF9Pn +z5Yf3NiJLlBIwpE44?t=Iz8AxzV`Cot7S2ZoGNI%g7!&_^Z@b=)`X2nn{s8%jLF(f} +zdJ{`sMWdSwWTpXBvxnh|IR51)zgwsZ{ZLk^*e8m5Ne4=@BqPN8fbBp7^6W5CegOKI +z86=A}X|ou{u+`J}1~4b%`E56=Fw0))7skap<7JBNEhe8N)PYt6Rr|C^b+CkyYfD)# +zWk*XMe<>+JJ&UXYZ=u57;b&gF3UD`$2)jZwLxp`a!W&@@Ed}cXtI!9I10y=Ryg2Pv +zRQFmIkmeXgXjehY$2|hG-tG#ioU^qr1Oj)Epk&p6l?E0(*%oEw4YoN|9jfsw$`U2I +z`h=`8fHGcqbSF=iQCvDymj?_EX8VdFpVw4&AM6_?Rj1e#I(iL_OAeOO7S!w!hB40$ +z(Xm);8xI5~+V;>23Jht*rDLc9g43xu!X}PVfzl0TuCybM=*Ob?If*n6UUxec +z${*I?+K*xz3107gIM`j+G5K`}(PuA~R+h96B_}^(BsMdg7?j^`E90R{uSWn%G>HfS +znYaO`CW;vxM`5}r*9vI~UbWZkqXM(GRLYr@0pUJ3CA?t}Q@FO(72yHSVx}d0Hj0LU +z=dYELlR>vuz|>;Uz^CfVGdFx7{D|Vts{Feq|30-R5Ko7Y?X;D1ip+8a7<=_=kIab`M`I)BU8WE%9R6N%(P{#)MsVk&0bXSy&g_6B+uZ$dd~|Y}8Zkv~TsSyR$Gis4hn#Er +z#_Mw~1HAVal)PY}@Rx#-jx259XD$gKLaJ-_y|=pc#xWf1T2YM=gE-}iO1H*QQFY#n +z+LS|r@E!iH$-htYdYU+!NT7oSLc&dy0~QuKQ%g=G3(C#bV2r0<=s#Pt49v0eQ^4d~ +z6Wx4o>)9I8M~niD-sE#Rhu|xH3UYhWMl+}MRUdHFyV_gFv}$#jB0Qer8emi@d(HSe +z26cUj6N6utm-M$~dn@e4@?6zEE}3LoM{l;I-K#Oi0d0dM@biq5o^w!S90`8bK_MlS +z!USYo{GU>KA|}zzS@9)jX#kMqm@Ldfv@Y`j{TKLNNl?jJx`+R_NEd(a2e)w)KbuHe +z{$i7s8TXQDVcLO+6yT`wy1txA1HKzVm=3u~hjIr!utt;9OuL^~f~1EMCB(_he5$sPDU?fC+Q}VT@&J0 +zS$C=Sf&z*lt!LkD1(mNPTO*F~^AYGO2Ycz`Z<(_ji>UG#7t4=pkIlO)f5@ON6O-@C +z^v6#8=bjaqH6TS230%70CRA5S|AO(kwfaTzj3T`v4C6xQ(8^cFaQrW28bRA3JGLFZ +zN@haJXxQ6+o&radk<|s)W#rmkSIsyb$#3&S4Ney`G4<$B8 +z(M5 +zlaq|rSO)^xs7mr7DIn(lOl}Rir7PmxQP+J)qo|2^_rbN}%T`IwNQjeB@@z1LjE$la +z@xj!zZv6grKsEv8AAhWhpME0C4P^#*c7|azJ7jo$v)O>Mqp`&TqV9u)I +z!T^y|YHQrHU@6U9aEHOU^QtB(y1Zn8pPz!5rs0;O8r?@@#Ww3ahU9w^j&y(oJCb8F +zL02~~rP)aK$iE1RHeGNJmcn^DIq(8^N@(aW7jM}AqrKC=lDcyhB3_}!+0fs2(WE5T?3Y>)@s}+8ejy296 +z2YQz}{rB7LNqweE>21unDf<%iKN-^=Ja>kHzP4B7a3-Q*yhJCT^pc_~IS^$yXaaYExCh@_@Rh5Vj{&hUlpfyy{cRk?7<1-vOzhrqbGz~GU?TTQ +z70K?qaeDG@`&3mDWsWSfBU@cmOl<0|gHJk1gLqG=v=me!PT!8)@E!YYH}&ck1Fj~` +zh;y!2(BjLDt(+=o-WM|L-;$-11qu_n8aYu8OXF^EmH1;o;RSs-M%5BuRCE=GeKtph +zO2yJ_zH00=8%OU>ws$k$X1+AOu=jBt1NT!-l#KT}-F<&*0gN9y>P;(#S?@2bp!#R- +zNogh|9BjC+psJi3*pW-tO9!008G(A(;rA0Um0WzTOn}pm6d08{)Jfz6TbGq9F$RLi +z!@z6t^?KNY-Q@QJzV_7O0A6Y;!akMmD{VT!^f-#S6;V8o+^gzMD2OEX$zqW*fNRks +z%XUP)gPqW}e(-@zPMc9L(59)h428^$9SlxJQ`~B`qG4NxG&luXbqWM4xUY&mzc2Rv +zek%~C{(Tq78=UMsJyHihw3B|vY{`I%cQlre5*um{B4TFfu1vc#9ZI1;?YS-sb+o;5**_o$1cR%b_*%}<{ +zp)D!?MfOWw%u1P2N0B1|5w#waZxZ8&kfAn_7c%%Gb1m;ypwUpaIG##M9N~zxL+FYd +zdEQ0|I@AHpK8rFr=*UR9l7Cs(&iL!%oUABi-Sa|4EdTW9ryH`G^$NXC?Z#QOeX#vn +z^ZI570zGA)bw+*4z^z4j%7by;kEG5-sxx5_6u}+1uj_vJcXl1cn0~;q++$XBExjW; +zDZ$;A4--AJWpcyBr6w;e?KwrH2N*JT#;j^fne8wUDImvmZD7_}(Ty@xfXP!LYIfx@ +zk-{u|Wy=6rTEP?{qUJUFb~%0$RhJgn1&1^V%Qjn&Go?1nK7kxn)%PMGGm;R8h~yEF +zNi*t(qsuC%y{Y-4fY;K@mfYmlOit3lA#HJ>CwC}5%+ffxh+^FfqzA?NEQcx1*jbX- +zI!ofSv&o&^Z5U#M#_Yt}z3Mh~r6wK47AHsAC4MAV0j{dyNUoc6U^Km#zEXU3RnM+`lR9d#EWNDnFh|rDz^@kMTjYTEYJuqfUjYx+q#F4MXf)q3* +z-Yfvmi(Nz=rU?U?l2lmnEngb%S#p-^I~hEr-!2mBPaSqG+c +zA$gLG93u^hEC|g|nVYpnBpGE#uqAP(Z_wU1U#}8*B5Y91n~$P#>&B`(1=ydTV$|*w +zl&@|+$%2~#`ld`7oxQC?-c~bc#<o<=%9b}LYlakrx;En=(C|s +zFcNklB&Zl`$k-a%(O&r?!-GnyJSCMP{}bsIhl$AW*hOwp`!K^`Y;S4vGq@YX_dWI0 +z_Mt{qY_lKS=Dy>qv3j2u84Oef>h-YNM~Z^yD{- +z%uaDlIWN-lfLd`MsaOGr2N-JW3PS_n!Poy3^h1n(Bff}?e4;8q#CfR{*J}%+UdONa +z6q$oBaQ=sXgY&NFwpC&eWl|!k1yr_Psw# +zt+*8B5}kvWl_K*;nB=gBk&;}sf6qr2=JvMw(DFITNE +zwS{(Vp~P*;=B>fTP)as<)hbcA96ts=7=tUtY|F)yLN}q>YT&Ysu9k`E*es}sP)Dy{ +zH-LJbZoS&yZ5B9c0dDK-8tvSyoX0WMWqk*U94;eT88d-!&Znc=sIpw8^!t%Q5bQMcp36i +z;RMbIV;Der<#B0chR4*3rPwh)q$`zv@F^H-Ehu%HMx^q->xrf)J~X={411LzRx(s! +zBE~tYbA_YN%}}>yy@Fj!?=0&?8F<;&q9!z6utAd=hzy+=>`ioA%24!>YPWTEhH3et +zPMHc;QVOOAXvfiNbJH~pm%Mbhw7j&EwAjEX&ID3Om|}BNtW>7<6e|MYmN+|GLTxiL +z4j>}QN6Y*u2`2{@ev~@w)p@^=rRd7g(q*eJa^R=?yOQqj^5eDOs^9xL{m$uo;!)yf +zdSn?rP%ZzQ(Q*RbFc^(NRw$!VwApw^w>x%~qz3V^n!`t^2){x#I9Vn56{wG9e1etmjLJP`w>K}H)bUX2GPU`5X1P3yA+IuRnJ0AmD!fkOP6pWh$AayK-DxQK +zn3=>+Crs8(e$qD9G?_D~2=k2Ki`gBlIK(@l2uzfP>4Q0*rUpz3Qs0mQFa@h%W90PS +z!qUywTO-nadv6V_LV6X+=p^MpG%@734xT~zbQ-@>6c0QbZ+xN`S3%GhtQ=(z;BEvT +zG~EhS)Ux*|b0GuBx#O-|ttu%i+3XCs4BH_{=Hs?empH(PJPHH%1vN +z%6>@2n6YCV8vAkf|8wGRr3>1j$;g70WDHW9nr5wP8G5?Cj6v+Su?K<=~L==I;0Anb9g3|#RMCm7O +z=2dB`blz$-;99|vFDxvG_pB3JPjs$o%mv2-JaT{;4RGKqwU@Q!D)wF3NHQFjp~e)+ +zQkD;i%a!Jl$*Ghhs&Va8)X~9d7F2brDQKY`#?p*2Ra-6*28ZpS%7MW^Q|PkTLL{fN +zF%@nGwG*gJzV-WL^Vo~pVdown4=I%{!%_bGKKbFfOV)|T{kDpM1$z(U!}!Ay<=~Z> +zHH-&sB3w=)kRH(dA{%}-Ip$d1UkUG|PfV@tkNkhg#Ei;_8e{yCK#lSQs(v3?AL!W0 +z*2!x`7El#et_35FJY-#?XOoAMUjPOaiXrZCL>Ubrg)N +z0NC9SBL;RdcYj2xP%XDt)g9Z|1g3!!yx_L!YJ1g}^2cZBC*JZa*|wWC&P-MXe> +z8?1P}wjeMbgU!ji`u|LIsiQgLa`WQ9qBt1bh*vl6!{3R@vK7A`Ks_$fSge8pgvyP;ot@8GU)`^+22>;vmUY8XIu4bU8qGDGW9eizI5s& +zNnY3+Tn8wpfBC{*!}yV*$qV)0=f!#bd_i!jb0|jZ8FOUE^M&(zy_zTlWde-zYD$RD +z8036j)ax7cccBR1#9%`_6tESva4MEcOX*`p0sM#R*W@t-cL9zfn-uG@S!o>J9yNgJ +zW;U~MSCEXoP|p$f7_=GMh5*d_jZfD1Y};^b?C +zk_vbY+t`mci(4Q;cz3-Ju`0Mt{f +zBQ%-gGt@Dn(5-_YRjwE-Eh|vz(+sjzd)A$Hc%= +za#&k?&nj36E8U=X-LVgG0EYHp-tIUI +zR1B!v&erJ`aJkofb$*4hS#Mz{$gB&B0%YCUqNlN%!GaDBWgTf|X6Oge4^Q10mWmlv +zrDP7XDTiLEs28-9d2g&~r$YVZYMmq5HR^3b*+N_wzu^6c_wwRmp{kt{;7@@~|i8cXt +zA3U*qshU}^n#t@iw>o3DkIBMOL7(`H&R0NrZ5(%D}kaDO+j$r$b3{p0MJD-`bO=aWt +zgya>Y3DFc179_7Ay!yx2PIx}ZKi1+a*J84WCY7``K5<$tbEyZTcypGJW-W +zN35LJUQAGsrj>tFZ<^4~TWdg9YAq +zUM#%_`Eqz2(3KG;bs1a_{WkTH;ar9N@hD{LJ?C}|gKZGI4M4W~tmal0>#@0XVkr9N +z32PbacNqYKBcj>ir29T4Hq`e~3^U)foY(|^0Ml{09f +zAIAZRcZ2aT@J1*b+f-7vJdIk)p4l`qX(Fs$_;XBxlUFPMyla&|5N9glWaj@a>N*)| +ze{3V}{hj8?yTc~mX*)}vzW(6hctg51p&#ybNUjyUswpL6S)epY89U`Fh#dH&n5%9U +z@g8P~Nk!Y3cni($J(c7$07C6|b!hl}n|yws&YLk0M6(s5a4l^=+F={pG#7Cb8=SN; +z`jJ~Vb34rCb-7Taja(=tdf*t*m#k8$<`TmAw7E%V7qKFETcLwwvXBm1jdNClfOA7i +zn|3wI)_E#JdbPWr+TW*7msf=Mmj1mu +zSZ|!{W|}KxwpdbXA2R#VaTjsU)P|KgDr97^kVA{@@4X_XLHV~SFsK^pM^0%9ci0Kp +zi@@7Y-iA8%3=*ePE|MmA7DaDQ=1zBsI}9cWiRZh~v+VQYu5Il#wP284^=|3#O~5 +zI63V6jCchAW$ZjuT&6~jTrZ`1GXN+zD9JXtuKEK;{Yn +zWfbGdl0DUsjIiO75?bln+1bkK#l;uvdu`#1TKhRleaKV=YbXnErA<_6+jR+gxIq1; +z`V(f5Bbj4?D`4L~(s!xMV|q%OHNB43&0lI&uO_Z4rXPw}7m&W^AgjQAem5mbDmE1I|v{;z(*Vng)gsM85E(u>MZXi3pL}al%qJ*MkiKlSESGGd>B66s+ +zkxDO3ocIC-pA)A?+jMo;0is{PByhs(0a*$Gm%LHb0t8TCwm*EJm8wfCeO$=v#l<@1 +zI~fkb0V)af-~C)Eu;P+@UyU^W4lPOc^C@$I&^%>bdlXX@ep!PPQcb?3j1$%`IMd +zT5dL{0hS%!B>7YWCY!=0cF0_!+Xkw^nv4R>rCsO +zjeKI&nBy(esaLV`YQiJ{Q^szi*rou9`o2}0gEmv+v7As^a2!}@vZuGT{R3@&hnEjxAoPek6t&t)!f0YnH=jbjq@x!h%O +zyFPJ^s2ex4FWIEI|CZSqW|H)fmeXaPC1)064fP0R7YqesuSzg5LYPt9lIvNW~N`t +zt0lamNYmk!0wN8ql@x(A8h4wt)MRq%w<*(XEpuD59em=#D9N-)CPb3Fg3zX<9C}4~ +z-ByutG>Tuy^jC#mPK5ONgxQF=tyXEzv`GzP5byjSv=QaEHZz;Lll{pj84I%al)ANU8SixNG_snNQXyJkFW +z;Ru?DMVqBd*c*gT-Yra|d{?+km{a5@YL~&FrBGkc_anL-)ZyC8O1RgT7CDTwen9$E +z3^S9;{=HCvDcm8jV!5^|qW%<^@MlEwJjKotv$SDy_vzI-3A&^@1R^wu;_&WX6w4Jm +zi-lG)bs}xhEk8&fV$Vtt#w^4bQ=E>*eUPcTyyS$_$j-(x1Y`oxJ=zEcBUDKLJ-(sh +zC6v5-5hjoTf$SW*-tsY~wGdlfkmax#&`%^S5*8`;#3h{Hl-Vwp=se)iGCkA=;6BB) +zj&a1A-yd>!=}>qdgJ94c48u<_42-WA3^DE=I%^?9(nkIaUmm=kAH&O9WcIYQlP;Et +zgRd2Pz_3wVy_(e5(|mZG3>%1)qO5!{&mr7+qwgwo)Ss!J9Y+YKT*& +zg88%-7l)%ISU`A&5sxs)KnwG%V}c{zZu6Ge%j@w71GGsWQrb&&E9DS&-h&w3N=8W1 +ztuQzp+l`dq`l5qPRPe481%T^**a2|FCzPdmODkgK2&zd&qprMjBu6?9-^H2DcxRKgs`O#e>j9Ia7hc7>)p2D+C-8CkoJsnw +zQ#A7^Q=IC|<5$C5C2YASo39}!paTX|n{V*7P-ch*Ir5x=+eUi%gU&RQ{1@WE#GJ#L +zgGkv|aJ9;GVNcTFe-IvAiA9(MMXGrmUw=*h502fEU3Zgb91f)3r%CWjHq(-Uy3pkt +zZ6lo1`&sZggKwFpxWU%aRxohZ--NacG4)MMe@D9H`!!Lb2HX^{V^bLC6-PQNA^r9J;KQ2vXSj|Ed +zG|wUHnRueIvMzcli;M?tWW0vKbr_>-tkeuTNcm8YF{2DmY}zDws**3?sw&@r8Sy)R +zmRySzH9a%Uj5{gTd}K_;cbWw?0nXT!rfTY*Nkt;no92JVVtr<+g0?sun{xKGo*g)| +z$}o`0)A>(4oShCY99=Hk(tZFb^3dDu>5tFNC$JJI*$YzTWDfSE(B~Hy8IRap;(PJMlP-Lc+fU&Xe>3)||Ex9o>Q%D4X*i_hO+yr~q_)JjXtigw +z|8%E{m74OBLElq|y~DlJy~D=o*5USU#-)XE)CxN4x?pFwv3;_4e2O;(=LJ>bypZW+ +znXXU%yEBz6h{oRGoBdsJcy!o!yLGa=Gh-9lt9EkXpm#?;Yzj}N!A5NRAM``_{--q@ +z(U)0KZ4%(pR2?sLH0%wsL=FWeeG8Uuz@TGi^${#;rs`9&h%kLX*x{`-aBB1O^M#aU +zL2AS1T^#-=Fuo2$lRbYKQ)e!`6ZgS3XSk0r}7;8g^8+u{&acX!5XRXa^FX0uGxz5k~x3ACGKD_X6s +z7`Ntsl2n>4(#__4XP464?leirb?-0tj0ySFnCJ>SR`E>bP4>DFTdh_!Y)hA!)37Ig_50#2UFRq`KaRp) +z?UUcH-O%G-2C%21pf2PvVF*eF0{c}MCG@IH?AaYg8SUFdSv +z`be{b5zpu@PAY}diJwZSl|cK<$N48*(iyMO&q^wIX^H7)XO^47r%_Kb`c&>xX0Bzv_0eSmcc`YlTEqR=Qa*nksffMKDJ +zrfWa}ySggl*|GJEiswt`h6+8v)-v38hGee01Yp!HVz7yAO}-6maitP+kqHkWt*)tu +zhkj@_-X!cw-(WO#grOYQdVZe`uYkW~Am^7%df3H;XNBCM$`tYDR;+mppD+u8Wh!r{+#O|w4q?*pxXnAu +z9a5hD_PZN_V05Cjw4DQ^fW=P4{V-p3{*C;8&Imb(BN^MsbQ5Tw`t#2}XKBpiFz5yS +z*y`i_ynue8mp{>HL@u=HJ>K6s*x!5Qlmqmk=)S7V8?=NxATzt#v_U_5q?~LnVV7?+es#}k3CFhXNuHNr_99Uflizyhm4PJpD%C@<-1#;&(9~2b!J)r +z&aA6N-@nP+PqD%FZOwP&g%iy7x3r@0lTG;*gMn?jSsl+ztT%N1$%_95OwOPG +zjQX!8DL7uYhdiXwx +zLYpReA6-o3lB|NsaAQhaQ>|^5un75sV6+9@E6m6i+=UnqZe+)~N@OieY(sLwr|FXD +zqocV~#Qh!|uzo*`d!%?Gmcp7gR1VrpY{e)t@tin>N0rsUw;{+Zw}I$|*Eb{MXpNe- +zWXO?w4T-dMw}F+kP=(WxO5ginSK>d(8r^^Ke-lIoeJGdHiR0;#ZshwMM+{eqHpiPw%(+Ecrj!>;{ +z;%z^|mmJ~66?yk}l#r`U>@sCv(^q+jG+Rh!n?0EPs7?LOdZDug6J?e`6kp3AiWD=k +z+pfhCWk84Z4~B?ZtvF+uO*TFbl~>LF^u;+w>;;FI5lU+#Hm|5gclV#UmuX_0FF=IDM9Z1#z)DLIu#x~c6x +zd8%OXfv=%}Q|&H0NRV%?jGu{aT-u+@Dm$g5{DP8}teBP6*TkxHx(yv2-{I4Y6)2HE +zB|dm4ewLvf9$*-BK|k(bEHY#3MjVDajWXh+IuXI~DUsz)qVtegZB>$THV@h%iY?woaaq~p~Tr`KJny?k1` +ztLl(u;+A*-r7EF}c4%6GIuQi|uXFWKhqF26ELqg*eka)5x5b{dwsE+IRK!xB|gF!0XV`#ttZiMcnrX +zzyXc)z3*U%Nkn0eR%=VOluFpT9^oLLG7EE!Ey3MieD4hC^qDPXO7rl&*@W|L8$CkA +z3gx8I4>mX93D9%-;9&3Y=mg7cikHtTB^l;XLZT?CiD&beu)I^+5D#e9&tdp1!+xxh +z6%ts8bvt@lCVNj|%jVKLO5OxzSdC-!09dF@ArdB12XiaDlDfiC^JQ$BND|nh${;1fEljfl1uDo0G@_WS4?LDF#7=>2>jJ)3N*G +zK!)eFqQL^KM2~8Yl$zzr`dIR15va)oE=9iF5P$Dwim4$;H!v(fA`DN^r}HB#wKiR; +zVO&iZ2~42@giJe4rj~EyB#3sDwGfXVwVymVi5NfbOfy1%&Z(;klYUb=aq8S6wNls+Ur~$VVcdlyvCMXz7GGo1Nl!*VwQ;60 +zsTnBca0Rm2xE-!d<)d7V>0dz?9=VTfv7m$_#CUA@cfB58Ve-swn{%5uww_ZtrwPnE +z)lIPPAC{NR548RohFAO`lfyUgGX;sP7ToH&_iElyKI46Dxok6f)NnF@XTp=1jnv|F +zr-6cUbv3q=XY{V@g%{q7%=fam*%V45%wj)TFl0qf?$wC`Zj_&~suW +zFb83wSUb9nb5J&08eo17EzJ^49bVSTrj-_T5=o_8TZ$XE5%*GB|10#h0$#=S-@6#_ +zV&9ay#YD&T1DIb+3M1x-5Ry`{@B&m2IYk=Tf^%QtsuIAK$Q2#cL4}t;w|0 +zpOHU*2sfzV^J1HFpAiAo2IcK8l-w+W)I7o}m+%kqVOScWUnbIWx9JVWK)@giA1N5Z +zKs_^N>Z+r-*c6}($TK&u%BtVi=n{GW7$1y2dw4i7X)m8QE}9#f2Wqj~)$i!sPy@8C +z1Q{iqjLws(;5V*lF5zKwSGIWMmmaDgwa)B!%^9s1oJ(Hog-K4jQ5W@V`J=j7uhy&A +zh0Elq?a+H!gPxA$gWIV%UYk50+?#*y)SEM?tKB~AtCG~2TY4Y%S67gtf>a_|C>eQ- +z0z+9!bs0#brgCK&O|?wzs-zmEsZ4|1!^u6h^WwYZG6n7XE^93vn#o`ur7ijT*lOP? +zvf9_gReKE6;$X#;C}(hdssLv&!4%po6C&{`-vsT^b!TIuzPf7(_9?AjmBNXO#5=!b +z@K}t|ZUC|b9y983!H+7)l6T!7e-{Pdzacw2oiUv-_0!avNhc+LVr9cg*wwgI(9}5N9%;D)jNA@#r$OXtEivs4E!u%r2;PZmL4i?U*12 +z-*q7~G!>cHqaUYG&72>mzu(+h(<$>byL*;RihGJpMXoG0XELbU40}I$YEQ@6Nm!d4 +z1>@(xCk>EPRivf%?@b4$sfDIQbDI}$FuR|Wxiq@Zmi6G +zg*%w>$jO>OJ?p8Uc)0ta^-V@{`kFfU)?1UFfNiqvk&*nMBk^w2xyDv*uu?!UI%`Zr_;{>2(@um4CT_f!;BNmY7-Zb$)^MaKu4B+m)u +zNem@GdT*icH{H*2%?3KUand!WFjpLCTZY;ue`CZX8zR@dBFAQSc|s#NsK{q=+qH8` +zus&S*J>B3^8zie>6BJ>Y_20{+h+#kJ%*5^tMTWC8K70osCB~yco=K;c0-%E7NG9v> +zop8;kFku_{MUIqhg3NbA6-h&)<6Fd4hSI|r)v`w(;k3Al?o94@rwN&w2fEy5y9lYv +zmlwo1pVDN)^W-#0i|MMgtwjBmFBK{(%loYykWQ~be$92BlZ1g7DY9@8viQD|sg@Ku +z?ZBGf$O(RHRL*ZD16fkqBldAG5tt-7hljxkW%e=!{H$0LX|B}&rQAzO+WCs>@SHKC +zjSY#1L{`%FnRFg$4^FciX8^#c{rw5gSCgHoxF-=yMdIu__P)y4HxI2c2dc2& +zxs&m;tR6~7jkH}qE4BL4rlHgarspsoKrf##oke9r?_XcG(F +zCF>Tc0CP28=Gt|V>TB^Xsrj-4hGZY2|55^udoLKZzS_uX`aBz}SCmhhAZ9na?F>`b +zY<%Q1E$ebZPAB@q;w`=Li`BnY)z^u}{{KIscYb^kJG#hhyh{EB)YKS%Kx3{0cpcyO +z^gYrP7ih)cB%_Q>zXnT%T(r3|MVdA^n0&bs$ZCLF+j4gyM35*<9? +z|KJg0(H|X?AR{7y*f1n6dzPkfvT;<)zQnENn#H?AP1Tsy_lIdOk8_HCl`%f)9qJah +zJi^@`=1H$sVvrYp&mFBGRD? +zTMjk}l0?;h#KCV#DVZGY5xI3#Gp^kFZ7Zyde5gF0V!VYV6vCu)Ro2_h6SLx@?i9K( +z;YTF&B&Lo9;^w8xL!;bvzL_cuT8~)>5d4s3DyZ+)qC1BlZJ&hH_ot#>&hDi72#22gfn2@aD>c0^k!=3#cPZlD%aRo +zu`$up#>tx@+p+chG|vD|H#gyQH-nPrbl%AA5CRkW24o!s0vQJ(vu|+3q0FG%wt>K6 +zoL407{wEAs5)GR?7n=p7wxZ||W8uV>u;(-@hRG!0#r&7(sMy^7u)EznKG}V}_d#qQ +z9USlN@179-7xrOLP~(90hv%n9NBhm4{iEaE!)AjLI@w*!+a(i5!0fC|4?1` +zeunJhM{RiBmW)anaUezoNQdI}x)@m&T^Px05NNWzjDo5)bmqg?es>u7ZH!YAqXi7S +zQgF~2uU+LlymX_EEoulDyO&GmQVZ#%OAoyt*=3#-b?3?R0*06_ECt^M*@7wF_C +zC*5?D`M1_ZmCK)@fjdfxxReW0QAu8-in3sMlX0(izflrD>5{dg-@-(}DjGYW3bcF* +zxV4K7!%I2m71#5TxtL7_Mm>golJyKj9c(&HVo0_-T|`CjRKIV#n?)WnIukTot>$f4 +zy>lb%YM2R@E|VsF%rUws+Uc`A_G6 +zUKZz4!+u^Mtbsr0<}ynb(&Co%^vy>TTXJMa;0a|dowxF0%o$HHcXA{KI=Qw+2JPSw +zz$o2M`DG`x(B2JMl#loon{=3jAC`5Xv^Zh(#7QybGCU?3zidN&b!FcLKohwF&El;fLlAiATTANFhU4b~^B +zMZr3NEBxqRGh;~A=t>>aD=SskDAta@L-Kh=0Kf|k$6Yq!QBL)yiJBFdrGv4a=!M1h +zt=n;HIDXME;DeMn7xMML4=|=U-t~7WO1aMwY_VOT9k(TnOV(4>kmii>3VIk&(2^2I +zG$P+zy1ZuVf6Dm4zNz|7T}uY7VK|`S_Sw##IuED#rt|~h2aXfSISjg3uZ8`3>C$0( +z&FGuX1PJ|J4;M~D8lRpn#WC_JJ9$D8K`{DM57T^oj>s45^c)JXb7(;cK8cc(uNkK#_MjWAm=jJfF(-4i_9U19MY@NV=O@0i8_ICt1=^h@4 +z#@pTfeZc{KWMMlHj}@f{&KXrgr^2JC(tKp{gMLH;BCH1g&QrW8NTVC%9)P3kSi!FI +zf?zwhY6?PH<6tWdR4FNJ**VZ?Ou0$X=uJ{;Q_$2q*B{T33bO)~rldeUpJ`Y!l((!N +z=k(TjYjsY=Zqh-VC=f}LjQp^$aO0pl^|Rt9Wu9m0*o6v&rKPvs;$>J?*=lnT4uZs^ +zQPga;gO*0L^jlizCUBEOyvUHna--elXRi^eZl02K!gZahs+lX`(993aq{OI>uOmj@o^Wjq{u*<)Iu{JU&W*If_ewVvR|}=u7BTD +zM~He0?Ln)BV|(e!H_&sDA^%yFl^G`Js9T*~rxMJ&I3`OI5cT3Qn5 +zdL|lCXN1vV#p?(NtMm%p>$hkmM^FtF#@zWg(GaE^7_rgc!|RU$@Jl~l!=qoW`{SA) +z)_NfTia>S0NDb}rPgQC{woT@%GP(frt?11Jhb6bUL5wt7L=FSZp;NjB;8W^AFnduu +z?A#-qa3qsEu!-cbr#Kuk@#GorietcUkfirvDf$?E2b#tw@eQoS6~Vz8dE?$tDnOmm +zNVOpWqKP#EDZ?z2P{0XkDi}UehP;tgYdOO=qojOT2>T`)1k4_WBfX*=1Bu*o5zPC& +z)3-Ukp~}{)z5Tt@ +z-%zLddhhgbx6u%cXE8x*hMSZK%1Ewq)tt7hgNBbQ7(Y3 +z?Z#^0zrn&vIgM0JAZ7$1CM`5Mxh5|jDc`%1iiJ9|CUOJC2H=Z9=oyBiKzU0!%Zk;L +z7+n=lUy9QJbA^fHu8(On(;Q|PS#b{a)cv9nZ4Q{BjZAJfM0OdL&cT$ZDJG8kk~tMg)h +zeqOxVeY1Bcq;6PjA058ld&6({r4WYp;A-(H2C%@Z8F5+0Kjc981p|HK7Z2!>73WEw +zZOebVT$dA1BbWKHNOKbQKSgA=&XdAug*%x}OkOr~cD|RIQp}mfvT61m9@OW1J1I!A +zk&vt4o&qs(VWS~N4Ap{0CG(&uJuo7(Ik~5GSF5Symptf*kUiiIv@eBo=>cG!yNzPT +zg@?gZT2$7BLq)oM1J1*Tftv69oS(=YD8+GyaOk}V7#<7>IZ=K**mgMCF{$VPq5J%fuB!TMN+f;gco6GIR?hSz=nWoOqPZrt8 +zsRgtCM%6o&dE}sq@+)EVu$OM1smuP3yGpn0@j@aQE*UZ&d>?^z4x2n4{Gw>ttHurm +z$biK||CD~uqIQP|RQ&Kj6FyESYr-$fvaoYdxxqUJzj1|kviq2?5<_sBOK94L332%< +zxJJ5PAP)7(;=$INz3t}q0Sr`swZH;J;IK*SVrPF}s;4kQi0(Z+M)CrbQhqCBSC_e1 +z+T-4UmhtG-f9IcEv5z<>syLB7N(ck+ +z4c86k~O%6*KpfX7=QDpYuMAhzP2zPfgi6L$nyF85hg +zB5UrNur@hOQ{~_;;L7|(R^Br4IrVPkM8ysTmBNsmZ=7nSqoWy6Klm}aI&T)$H*RMK +zNtDSY9O4b6-w&d3Y+SrBycC|=UZhTbpc1wcgzurO2Qm|aPmw2?K~#B(Imu+L8wnc- +zDoMroL2Oul`@Fo-EQ_2 +z*+fYyg^lNBlO(E`{cc**tg-h{V{cKLOg%m|llew7)I_wbFvVz3SWASXcVgdg&DR`G +zhok=z3_8ms=# +zKT(TQJ@XZ$KC8lhTU%coZXN8_GSdaf4ksR)^BWb~ZRZr1rAfAJhn-G9xpxU0^a#ju +z(oHyk4OzeS(xcT$oZ#?~@Jk*UNt=pi*O{H5_`BJTr*0c1(R+?w` +z#V#@X(x#hEt)IJgS(*6kQr7c~1Q*1eq!u`5adQ_|jf)foLo^()GL +zyFouDj)O11kh7&^PRcMz#r+>8JZW6AjOSohE)r}f>xDBGM=6kbCAYb0Nhv7WIwA|T +z;y#k3llf&|W;xG@hC}qp%9Jj1B_g^6d~708WE!~OvS*sNxGe)~)Zz#Vsb=^T&VZYG +znuF4O55)N`Np4XmglqnYmKk=QB-^owr%wNtsv0D>KCJUq^eNz2jXv7XT_Z=&%D>Lg +zzosk-JXP|(2uqR~=uLFnuesS;td{V%B=KlDKt~8E?2sUU=!-Z3>{ff+;^dv2bP3)K +z{ad|8SZG@wWlt8<*R9lG`mtz>bgWAFWdm&AzDesy#)YvTBia`0&<-dTyt5i +zozYKa%v8i96$m6SVWUkeGPEjI`FV2ApGoG$j+|{0a%B#QVpYRgYUQFxr=?4pPN!5t +z`d%VG?VU}_Gh7{u>1Q^*vBq&O9Rg+7#Z}m+bZO%ui_l8GumkK+#1^{L0oF8;+9$aRjlLicQKwpoM+GMn@tsF92*Kd{bp9mJ(His%d +z$IjjfI)f358b^s4vhvSCIi5^u;s-knEtjDT&#m1znUOP@8!*2Ui0R%wHbE2cT{@w% +zf2Q*8<#&TZ-r+q#^VhADO>AsxPt>)}q@EUR+BqBpQ7gh#G(==FLzG!n +z?xcHXgOeDK+?}#=E+(Hi0;)%}nzi&c4Rp0H6Y`G{)0gv7I&6*mk8LHx!{2Tv{aO;N +z@J=2ec=e-Z9jHz`Y?0c{X5aRwP4)JMg*DJXtQw9!WNxejz7KF~7*R +z$_psA8oj8e(bclAv+ +z$6#B7?l{K(@hN8N8umqDyC6P0Rm3aYi(AKgyN9PIzloi0_W+I0%WwA%8>d@`+q>ds +z4^GIc*m-|+vZMFK{_(Fzd-#*mfwe0e`At9MchQ*;J%5agb^g=DMdbP4+1=jXI@wjV +zcJ}wny1%jmdQ_(S&E^dh!ZG;$R?xfxIhw?5*g0unf3%Mp-SwjH#7 +z9rQEz9lRB3Tf>(#+8WaAoob7y&{#yFk$~j#+=Ac1tnj{q2O(leb~&+!S2G@Ad9t5xuVWGU2+V3$f#`> +z#oNGgr7D2)4?f}-ycEl**=hAhUAy8@^JM4faR0X|e0#NbxCIACvJM-h+m+x+dpuC! +zB|Xsf!<2VPSp;<998eM=#`6F7mf-_o`_}0$J&X8wg +z*&klFs;CwF%H#F!iqQoJ30@~hglCj2{`Hb4N`0HKPmwJ`TM1VX0`YmM`qL7?5(4DVl+!=+qZQ1u6#7JEDwr +zeiX~JGIMg#mlHsnvPlKh=@AgAa=5v)q2Hc`7jQN#E;2}L!+L|4W2Jft4RMoC&(BLD +z>-l<#A?0)ikT4XBPM4ENfrzd5e;Xr$FWs%S%sd#B;gW9UMX?6|uPo`}7FMMpTd)?z +zOD0|ReA|_A-thqFM-uU3Nz5}B!rH}f!- +z0h}BV^kYdZNHUTr{0T3y(i5y;K=tq(ZSxI +z#oJu>abl&>UT0&|{r$fvm*`WY4FxlJg*N-;F2>QWYgszU=Q( +zj0BK&M=^sy`HP^}q|i&flS)|G7tEHxI%|pva))UXP`JIlxhLH@#u@G8|L=XO$| +zaaBaN_!MqDPOwELK1y*!hPTqLmO@tT?7n_? +zSUyYDzo-g)_-Yr#{N3_dap|IJ7XsSw?)aj@Va=T8SBjr!S$=whR +zm9Hg6?=+2Jrp{O@PQPr*9$es+2L_ZW7vZ$*NBlp)u2kCnE`i@Vc_ZtVWmb|Wi!Jg% +zCb#VJk3UvndvNg|e-z0XI@>({%bUi9$Z-l2XL4wpKmC;7Nw>wbs<`0x&IX&s&(dew +zlYky%C`M`Pjb7(SU2sf^_>g!DiNvrUCEsAc!VMLrGaXbCDa^ift{#z#6k9>y-O+V4 +z;@B%lHdV|Q)R{(oz8KV&5A40a_ZnSeKI0!aqk)L{ExO@uh8>LR2+!e}DfF;jEvU#V +zgOAs!*fRs=FbgUM +z-=PQ8bRIpRmtRQ_Xv{Oy11g=Q2g&fO+4LaM$?r`MbWF|^Jy1bNGw6XGpY%V99#|1d +zzl9z!n7l>Irw3}IrRag#VF`L5J$SO|fkFPq(*vq&=z&WSUT-x{n{;tVoJ$T}K)+s3 +z8MfzA2OHM^3XQNkkV7f#B40-@?75hgYS?u&?U?LholQfsyZ@ajiR0RxK~EAPchgiQ +z6_fWri?$@^=bI>u18nj_=Te)*CQi~EhtAljm_uz++vw3W$A*yLL{!D&z3qdeo!tzY +zgEyDnAd?MAR6Z-?zb=I#px;1VuA%mnf5QEVsn* +zmp#%(2%pUd)V(;{K(Hx5E4uE7ane>k(f=e|H2^nSFm93JvW$Rlq5#W?xM*Riee|(D +zlM($$sz2&7ZC6Gm*bw@A0V#sSQ`q=Jp)BaFY>{lIjWB9z^9b?t`gd=k9mUC3xCym= +zv*9O+kq{H9(K=KBj1Wi^C?K+O-iZfYKuGdI=~E7akq>(TyX>Ljfb0{D-CJK#Y0tyTe^{=rvGPDS4 +zq{qW>bT821wI*kX#J!moWQ7jL(_{=)54-;hhEOyj)v2ubdYy3k1&|Ox75=6q+OBiC%R5)x>$`2*t`z +z!iuOv5a5ub@XyYi&8Q&Qnu*oG_yDtCq=M_p7valfD`$P0hUe^aa +zs#TSt`#5HmXge5TWQnAPrOF@@tjO`mGzaX*k +z29SXQh-P8K3MzxKoerTRCjL>9xyrRqS{(x!cGg4CaL)Gj6PKQ>0>|TDwJn0b*@-`mCqQk2vL%4rE#9Ji$~a +z{K@WrzuQ9|1&?$*=^Zve^KD56pb+jTp3wma!3M{k<@J8H%WwbA{=3U)^^u=*a`XJW8{4IPk^1`41vX)&$pgYJ^U!?xBCNc5 +zD1ua-2ZV5m#iwp>Z<{4|Fk|cR=x}d)YrpySsBt>2%&T{MF#dEQbxotV;NKd&j*Z>p +zt&^?OqZ3&NmL73@v)i7Q#$;Y>le>7x88SS&Z}hOTM>!KC)jrXNGc_NHixCsBmQ+1{roi3nM%V|0<5UXh5u3 +zOMH8Fc79&JxIhnzv$HMle|+!n7Z>a5sg8m>WS2w0(o+5G?00y_|1Q+eYv;AP&U{A! +zi=sY8y1{c)?>0OV+p3Tr9*5VLKXvTdbNKwJ{-tdAcKD({q5X`u^6-8F|@!3kPs +zR&#DrdxiK<1_HEN(2c4?$mLY`cZf^fmxm7mO2qUn6f`b@=m`=hvKMic!zg0>Iz0Su +zDX{|DlCq;DplHoqdo^7yW+<3+QH*M%Pl1FiUF(#aTZclibjgGox1@w_(~NQdV?Vm> +zr*GHod`gqDb!P56rfL`IqtPv<2`&{ys+}i+?vv>0oI3mV88fqXsOXZW3=xGRT7I2) +zVk8cQ7CKRR)?3boL&3^&#hHCuj!7b$B9s`mBM7J`H-T+O&$EjPkWyO=ebSAf!p-xf +zKR{4lzWI +zms%ck7zo^2-Y43);zwIdkpfByV@-b{Zur&fok}TFI>|!YA5>yNi_z55OHKuuuF9#Q +zIM(S*szUwbV(vd)3&I&|_7m*ueu{71pTMy0&%mjsNSrLUdvbDgQa*zTWE3Dv3s}?+ +z`V8Q%;T*zJha_30CIwrzbb!`#;bpT|_)f7{ObCc#P!dNg4it^X;P*vUO)}Ujc9$qsf!1E+ys#UvTZpb921mIWuNGtFo{b3sY#2(uaK +zu+tK#9r02xY`1NPxx8ECwebOb&+cVxl;T^V-cKbCk`?#)7u7hD~T1m^Hte#{} +zy6l?~EHeTzVMU&@ERB_!`b4;-l97l@3P6_jX>$_v&64CtN;pA>0s9K7i;V#~Mv+od +zyY^#(C=7iKToA^>QGVvi;%lA*24}4Rc`23PfC@^u5cVrK=_D1rRQ+c%U2tLkEySI4tE1gLn|h_yM>UNmZjf +zuTU)OOJYb(QdjmUU_3jwU3O>$=ri@VaflI~(2b|>=$B+xveGb+OTjK`Dtg$ZnMKli +zEwHoy0;#_^Ry-=M06~;e3w2#TB||2LsB-_%5XE0p +zEpCTvQ|sBQxV!%vR&vREiGmmXS@5oa<2pM#*uS`Fyb@(6e%cp{h*V0Zo#e(<+Lbz~ +zp}hU&hV%u%E*S>_g$H_StRrqyj17{4I4zKaHjDzo3I0#P3ReEMDP+> +zDge}*3}JvTCiIqX4aQn25-z-WCaj!AhmzJfNni))IZsJmJK_jv^{d7XTc)F&;{&S4 +zn5fPYh=8#N=27yEc&#k`cY6W@qji}W(REuuSTi2z$}=Kj8J%~bA75mDD)sQ}Y!&GN +zjHgTi-+_Uu{M-)cu4Uj~XX9w*x*?uAXqsCxg>Kd|BW0*9Xf;YQ(UH;K&PX!t+}^vNfYqR`>$ +ziYoDJ4GTP5bKXB&vw&F7`*`u>0bOt1xEuaat7u1-yTXVA{qY^1iyZiBeCK@~a`c1I +z_oFtGP>RNn(mRDX!IeZ6>Ur(rV(}cd%(=p#Mf0s#nt8`e1J9uBz0?QlA3yufT!;y1 +zI3o-4wY#9-jU5gI-97X=esfC`shX{dyqpbRE{!r!pZ1Z8oqq1*5itK=iLw_4TPuuL(6ko@z%bpJgu^ +zMMD@)#NojvK`?sf?|ga2TfNna5v}>hxOFA)*Q4&$M!i9^-`mueUrE!HelK;6)H5ozc;Qt+gxCFue8yDC)8Y8p8pxQ?N$gga^G%`R(cDO2 +z3^q!J=XXO#r*2)mmDO~4uM&6WDu*nLM|uV?Rjf-6UHHqMY=HC`7^aCE!bBr@H5VQMgt +zQ35CyM_N&ghF&91(MWVkr#+Dh=orzDGgdwR3Q}ZSX~FKt?dFaHw-etr(V*PonvlsG +z!!w{DSk$@>;mZdgh)8nH?MDx3ZnoK)sgY^6mSvoTg*R;-E-^-E!9!YDKmh!1G?Dnr +zC?P2nZma_lvvQua(kP~?a|%S?*3eUoSw&u#>duyXw^h;X-4f!{IJ;Fr{VI6f-fbbH +zLX{#csZvFrqi&Cj8aJ9rm7L<{BsJa@`=>km&F!PZUw04pb`Q6A&&ohFD;Mk+5(`;E +zsqZPav`&MDP-GSyjO@rE3;H3cz0`F81w#M`dxzT^ii)6?3y34cP+h;>j*Vv&zV+;8 +zO!RS`8C1IqVcdnoXe9TA8i~^(pRWq!bTr<*YMi302gZd2N{AE7Aq3#f&fZBwp!zmw +zvttMa9gkJ@0cXl)KM|y&WV_dvDJd@H$k3-mbwtG?1AZR_^og0~OewT)yHTDm((ZJ5f;w%urxiM#;Mrwlv~Y-XDXi +zir#AXQw2LWUBEl?VKf+q{wP2@5B4%R001g4VbX0TiH(nOol)YC^pwKsZrZ5Aq7XW! +zxz-76=`3dfudHJVpy;470=uXfBQ25Bi1F_tV=Rr6O~A>R$*lV6pI>m!_j@M#%_4fB=#PtnCw6ylM+cUFmwz17D}XCBgx+6pGS$5kE?{HmlmNs +zo(g4yD~ +zI7Ct61(~YdNn5py_h?hjK$N7E2M56PBS$=v6!!hr2@F!99w%a!ILQVOjtjH&Ic>{} +zN~2rM?46>t%*|dX9sIP87NDM^9Q_(HtpGBFZ=}qUFn=3qHk0)Yy0EKo>v +z&?syFSw{i}siJgR&TctycG5)^`gE4qUQ#7uY9s;#aSb>4N%5CTZZ#Q7!L7zI60)i# +zL$Zi;oR-P;RD0=o4w?0|dx?-A+vg;+Fe;@|g;^@o_hj(jU-7C8l^Ym`6H}kHx)G2y +zOv5&2wGmT3PRfA<7d*pVGO^BlxwGlxf~yX*2&j^JP#i>rXbZe6j*HHm?AK*yXp +z4tfI!M<#G+Y`Fyl9Xc`)hRQ$M_nEavIto~Dd#V4Ng!6(~V2=?Ku>2~iul`9wKKQ`Ha +ztISf2hVT|6$`RKATug9l?EYek(;me!Y7C)=$7DuL^T%=Qm=kagCAW|H&fh+Ppg!ol +zT&gqD!*Y^>5@55j?S2%Y^21~jM}=gGovdk|iKbJ0ZOPnR$I`y;6jvITLHcEKYFT(& +zqJc*;a-IetyT>8qeaxq$t{j_#&4SeZ73dYILr8lG|K#W~X%=Efi}_@cRh3lU0^=%G +zxDqQbW23y3T2bkOL&L?P8uh0vfZfLAIasJv5>iR2MuLej*l*iZq_eS@7_sh1(zAeo +zCwvQpXvUO+JH}k;`n#A2BB^>(N+~4>!a^Ni2&MvAimlpFUZ9NF<&ulkB(RoNSt5K*64Ww@C{F49&Pd;_swT=Np5&!SxzlixH`a$;|+1pET+~z>O9Mm^O;0 +zPWg+eLqZagf*eM{@{E}5dXw#O!^FWo6E-Dm^)}_;tz7zGZ33IX;UqevO#HH@fN`Iz +z^*#yrMb_*K4pEv7yx-NOXkC8#Df69LdM^;Axb7G0AoTv|g0cGu2uFq=&dov#NkA+T +zrCb=vI`d*}3A4{2Pe7+)*vHrhaexWKdYsx6(~0)+{8g0*V~dP*!n=k|xRi2fk|@cM +zDpc7;v8>JalsIO?DdHARoh-PmWhwJCi5Jb-+-7ATC_<5SMcytdP6jdnLsDcb?7W!U^g&vnz2onjVk_ZuVoRLQ;Yq(#LMd;g; +z2z_%7p~s~V!W!QtfzUVR5Blo#K~i;m(A;`=dUUY$7mzP@Pa1nihh_P;DRy(nmf`2p$xo7?YBPIeDZQ}w3}T*;ZJy3S}GubBbMafe?8 +zJSj@rLRuhYQF%couU;uu0{q-N+%x@2j&o9=~!i>hhl5rx3?pBr-`s15fvRafA +z!lC0ZpQ<7(U2?IY)+JsrLfZF`Ac4D}=zf?y!t~uM9JUgPd4tkzuP2wCyQ=)f#_?RGi8Bk<-!iD=i#tod%14l)0R^sp;feM)1E_%IcobV +zSm)IP?n)NeES(q2rsYb##PV#x0)o*N3yO@@7dX};2K$+3^)${8^orY%x6Q?ay+&j2 +z@C}d=Zc_f|64d&yB2^yzFiDi9(%ap124DsS;^)Ya6cs+Jc)jr*|c +zN8>)hAa?I5Nz> +z&*3iT?T%4SU796Ba{0zyUa}Mjy$j9?N*vnibL)g*ba+x59FQX<$|RGwQ{2*a@>uh! +zGa5rFt`Q#(?V*2*H<)@mN&^BX5?=Gn9rR9cT`Unt&MQm +za?Ahu&th=fzO>AA4v?kT**gWMd~5$(6&q=mefj0f=ftuvRsUe$|6t$$@38N200gxw +zo@H&b^5NFOZdK5U;pyj7bsLVLzr#loSv9spzDQ2W=2nyH##a&+perlV)<{QfUPcuK +zrgvAC5wEvSp|5AfrFHE*pc`AKFySQN%bKsZ_8Ys>$YF+>+9igpvqQsry<<*J>Zjn;jx9TkTVF<=f=P@pxP%1~P6~FPGCCBA +za?j`JGb43=nWD~86;1!H(eC(zSpPw+|AUFO6ze2E?31w#FiRNZ-pBlbS3#F!W%-no +zyBlz{{Yw*4w*+O#3U-KAPJLp#F{DS80(sqV5NAYGZNEzL*H8*NMh{(OTUttig2vDx +z-RYt6`U0TNLRHBolF#Onu%9UcH@bR_N+gx6?qNdQtndXuegOxHsOFBQc>gInlZ +z40{x_&IVHW-rg3$s8vf^&Q@ip^H^Fm^@W)VL~$|(R5RN|OSs+R-NT*T!|lD@1|5DA +z&N`AUgMeeFahQ0Hk*t%1#3oYKJ$o0ik;uG2(6}87+uMaI{QKbp{&}8{Xt($)Mw=qt%Gy!8v0cO&DWxd>jxeT4j|7!7a;^LQLu*;Zhf?Ln)xStw%AY0@4jOk;bf3mpzs +z$Z8)xRPAbjT(eX|oU58@go5d6rR!E}6=O}8QUCyb?RF8HGuq7rV1G0KWJR(%UXjAA +z6D82vY4Pa3OQDa71Sz8#yx?kmY65Fyhq5#6peyJ_DtPbK0k7A)U5m$}2)R9kgS8zO +z=l20=Q?*`?(7YXKC+C<6B+$Df{Bn!24W)A>Mp_;Z7>taScNJZaV|lr!{4hK%p>ml0iod}egU7cwnOC>_z;;&O-L +z^eOG$rFQ@im~3ATq}49lF{$o|of28~uss*Df8_d2dPg!4!h>2)ERi^#Mb$!NPueZb +z1UaL!>CkOZ8U_qUYE+D})Trpmackf%VX7ysc1Gvk%R^0SA+PxQgI3s%jz~&eN3E;% +zV>AgPaT9b0b~=%;?_(mJ7Ae~;tj5GlF|VgyN(MsOS><01D~Fxf+cqaFtOUZBX-Ayy +z`J`<}AThe%2b>cGb5YY)kjx8mfC!KVtkyCyOol?o$#_WdR?U#vWQuy|!04&-nx~IJ +zxQoNM0TalknltR%&Azn8F`>YdB!t4&xE7`x0sT_)*mA5_K+(YXYTm4hFbroI@x9-`I{J6EPYO5KUNvPW)yM8G3t= +zTCvIje-*G;0U>25tnw||jKUFn?H~^}8FS92?zq<%FP21^+BvUO*&T_Y80&M=@ZLlb +zCGt?4kcPu-VrV5Kzhbdan&{0dVDH(ZQ3h{iOUx1ZGBXv!ISPPNp=GKH8G>80Q9b`& +zLBjYD%xlx&Rct!qO|f#Q*!1WsM$1<#WlulQ{bFJ02DTS4_?X@g&G1Jie(l!Y2P@Tu +zthFwFLiDR^3eYmf&>=1@+TpH>HSttDvkd~t7_T(1eEbSjKOU8eVX1agC}D#0EU?(k +zcSNr)otEQKF|6H`q(Q5cwyn3zwHtXqq@YL}Q}F_b!e=xOtv;}A=#7pAF^VuZPofRi +zv`rh;eny)RIhqH-Kgmh%!5PMJWWU112KcJi;q9xuWX;atr~L@Y4^tm2wjsN)5w|z; +zud8sHVD88;23cEqEduIcRgdddIY>cpUs4fW2zzj@Sf*_=&HzIR6gI^0*+Y!QgV%{k +zyTQVpa^o`lsEPI{cmR?&mz7dL$4Su3&rujMqp+LMf=H?=Y}c3yHz;=y2PGgJz4Th_ +z;CSgpC7mxJMixVgvxT-F-}K^98!a;x5S(eer~{Ha9`?zY*s$4+asPN2iS5Njv+=Y) +zg;Mn^NNA+jrK4Ry514JgHJe->U=}HWxs*%2sn`5mb7M^JHr;I?&jR;p@iTCvyB|)y +z=)tNF5Ge>y0s+yKJoD8lyfd|nq}4RUTXKuSga0Ct+kB$82A;6Oc8HaqbeUi{lm_wi +zA**C-%RQ^zh~xm0*+BB^Pwd?kNX5@6pm@llKA>H%*O7ZQBO8eud?tixLL@IfnhrhI_yb23*&f<;YTU0T5Ro2;#B?N$5@m}jYOF4y@y$ghUk6Ex3@g%Q5z?d +zC3#?of*6x+8dw~G1TW!y9g7ATT^Wmpvn9DfvQ<@b+F}XRJ2~ +z>ab5QYD-hv=Gk1gT0Abf!?p-rnQi0~-7EP5o+e1!jMUJSFxMM +zYu$3POqgr}Mkkdr85WyTACsf4+27sT**kpG+&MZ;-P5R=;!H9x(psb0jz$mA*SK(D +zCn=WW*BY7R@RKgHT61INR+Cw`%|v)=sZ^>pmDxC>2%LulvT_1h0Fcfbg*|CagR84u +zrZa0QYx-e8k*s1=16#`x++k77O6|BL%z|5n^cx9z(>700$0xBHq#=0)v(nh#YP{Vn +zotNYtRs!Lv94^i59dWmx+mP-1pqvh1&$k21dcm3w1sZ*3zt82H>v~YX*o+B8Ldb}TpDXXO^(@S=r)&@P} +zMDD?(f|rEn%lZ>IAb48_#mbU_)}#}R}IwiL1x +zk(CP$o!wo4lqhy#VyK>MdBnmICR>!Hjl#F}x)h?^YitOQNPvq%adr@f6T^-w +zw}Rn_by}#CgKoVVj}(7{sy&$w&KFnVHLM_+ZDvYG&#KaV8vcDzohUE;VW#(ou=F1< +zEGYxm9+1JkLoy-GsB(66jM|gN#q8GC$#aH7 +zL-It)9uNbsJg;@oP{meZ96U0nA+HmxTOJGp?Hl5u(?_LhE`&K0+u(+Rn*qjQ$S-b3 +zc`IorZ*|FhOYu25g(NJHbmFG6Y{9|~MrsSTWWdwp^e9s~W%58K5mcD^AM4vPIFb4> +z@#1J^*ck;n=xQHBT4|9^#%Qw~R*~G$E4nJ?ezJd@nl)6y`zB^$X|rfvWBhQh8~J_w7QJuiexNYJc2NPZ#dEvUNR;% +z#<-o3Y&ynp0t0;*-C}4)*byFE_OX%Mt^7qU*^G=~2c$U=6;^0NSPxcF*W8qt$AlCU +zgL~}Wpq)H~>AR#`SP#8GlCP~;8PFQJmn7gf%9#}{xFy7E{@Fa;A`z%Gu_e2Ld|c9f +zf3k?}@4e0#UR9C@K3|&e4*&bz(dq7vIfV*E`L%!tkyMt+6(LD0qq07^3Pt%9E2}(9 +z{c-OK^SW4IbU)`gS2z04$A;jNhj%SaDz<>o{l-R~*`xt4UXVPTY#pcq2Tkd!N-xS= +z+xth`Tl-aIzV7jTkQLzMp^{Mx2onk$Rej#&6hi7%)w-$Kfxq3|+SxtfnjGmnqaXs` +zJA8dqrL!mOccLt42Y^3SG4dq@n_4y-Z!?~qp6nf`=9-E~fm;(t^1!4v;EjqcqvQANDyH2jLB<@@9bJmx8g(n1TuKe>PeHEC!Bg~Dc +z-WSlquX{VYP;_^{VKutFoo%6{R5v;5L>yZ_DoH +zVdeqkLCqNf6wew0HdwJPV9g~g=_H*4SL@f&y@Yp470*M8*fAcoeHFTWNjnX8m +zkU=5o&CyCMR+u^|;_2@TPR+A#-9hcrl^oq&vB +znYof;fMF#uiU`KJ<%>~NXfQQszCAknizt)QM*7}WWTz1V>IIP_7zT+MQd$}k6siAl +zRbGZ5`>6(iFeqiYH2}6jcW-2JI(ES!bGM`3fZ{AHmvBbg!5v-AaF3d@d4SjiLP#yi +zSbfVJvlbuA%m(RdXePoMN46An3NzXjF^y7jd40j8L3S?yjOCCFKfQc;FRZ<5VsTJ`dWpZXs< +zmH#6;m2@b1vyZZ@gA(B__@FV{X|wp*{O}5PEEM_Ni*E`KmNa9ESH3aK=8Sw>V%H_;j^iheL0Ug?j&FarcmtzU+03?=X4HQUE{pQ)8hRqe`;h20GHA9INu~m`nR~N*3*R +zt$-=#z@i)wQYXueY_l+5;0NR_w#gDBi0b3+NE+V5;*zNvhCo0ZqUq#zB#@dC(^R8! +zf^63_(qfTa7Y^fcw-5W5P6(v|kZx7`f&a;Uj&-Gv`g}@MI^L+Z0&`YfAw><{!(I>C;;=p2jRRp#26cZ1DIAg69*h;U)2uvW8Urr +zTLRS_uS`Uil7%h8@&TM-9hbAaen;YI6t)I!*cBfOG;`#^~BQir%z#D +z!4@o8SztKXr3sWz96nwAk(5PTyh>_Z;t+uxllnFqQa(|?jV9hzUgWT&mPDmR9_rXA +z>K+qColmHM!wXbEHj)elC*vyzwd)$D%A_Hdp%`iE +ztayAfO`+dv1%naod>uT{R}Mpr7A0POjO%^f5C0BRaS4RCrp;;GdNGU;&B9?ltT-?g +z9X4fjgV^B3ekWK*OrW^pAgm%9bd}N~E3Z{bV6J0`!b-JJK^PRN}7{mmdZ4lWIjzW@QcnE1?x(&m{ATHP} +zpc9)^@=^;*^3nao1JUwznO&X`rb!_v119iZiaV;~Au`-g8A>#B*7-+R*6a?*` +z{{yLp>$<2NG43xxFi<_atd&fd2r{pXMX^jxH3t=m@f^~|_8L=FC^bVnz~lH<<~+cA +zY!wA;IL5nw+(2AS*szPVJupl^zhsL8^Hc_ZG7)~QIKf!He5rDOmQ1A*&Ol}(#6I{$ +z`lXxU9a16OrzYM$r_+QZ0+VEsClYGeWI~8|eC5GG-0jw=$FhyhlC?0RW<^|{7e{?@ +z7~G8-qhLVzbp$Qqk1Ef-+;S?6l!}NW9rM&4qz%h>!vS^(H$zk}VU87Y0g>TQC=-Jn +z-b`*T#&XMG*uNtCWfesak$}xe)zoNTD~h>*CqE$5z`-bXXR`gVfFEt+{PUGUv27fl +z5GbyS#ih~uDz+XoYpIipP~B$dtlsE*kB*bQqV801G$eYJlFcVfO|5d)B`l1olx=n@ +z%bUxPw?TJ+c~4~SFg6C4+g*7hWjf`2)#b<^tm_}F>wh@wnhpkVuyy!me^*&rP6?cx +za{qT~)1k^y0qA%0qPNz(8u%k1^6{u#gxz*__PY+o*t{UyZnN7HX5Q2KVoA3RAlZ^E +zU@cBqA2VMeW2AQPWk^%@>87xvovwc^O=Hpfav<}qxI;8OQnu;RurfV+WKdQW%Q+)z +zl;z(U9f7cvtik7OJb*>_;sDt_+<+=^y(aVW$eJ()?TrZ=XLoD+t&HM8^`yys+Th+4 +zskp0UOmz7V;OT1*Dgp@ja(Hy=k>&4f!*#~JOZnyl2@f|6w;&V9Q9}~GqndEXt@~%( +z3ZQcS%8>(tK(7NeOy_E_XSq?!cnusxHt2r}hf$vxKJ1|1m!Z2eb?@5g@(&5j-fcILOx>kx=wmyTNJ{2jXDbzF?#5(t^j{R(uuu1_PZr}Yh;L}iM7NB_Z1^V= +ze-7=Hq)y=yXh=!NhbHMoT5R(*ajP3$UCE85LMl@!PMo0K4gp0D#`22X+n1qTWS`tD +zklJ;er2Y852aNB>4Zc%m!>SnFG*E~Rhi!3b4(xdv6XJ}lOC2c(*R=;cMJ7as8-+{~#{AF^p-H@WUHR^LIU??tQF#gIhdX +zxS$)_4~1kHOPH;8*v7d=AAKDS(rS8Y%a{6+R&cPvPI9f&eW4Wa(*PGt><$yy&#LZ@ +zKLt#W)r@uzHmjtg6od#h1Ik5Jre~mxi+$0Jb?^tjFLi +z=TCeid>M(o4-Hbd6$3#x1C%B7V-p9*+GnZ`LXuPkbz$edIYu9cmgB-4yqBUJJafqp@9~0^YyBa!nGG)rk|b1Jq)0C}iN9r$|QfrNd*aR}HvuYBgWl!an%4c?+# +zsPKm4L(vVd`oYLst}WG8d@q6}R52#5$CxAAegE8f`2+--X#nO>Dc~(V^;Vt&`C4Cj +zvA*`Qwxm8{aS7f(SzKJ4*boAF>MgB$OE1LI>iW~w^_6E1kYxb!%P+!Pu09uw%hly2 +z@yjny#QYCJCYpfnVrw+QID&{PJTxCkVAKy=K<6bNg7&DjCm!BHrPLg7&c0lQ|JUIE +zr=;?DHjTOP=J^6R3l{vlO8>6WzY=0b{3-_VjX{6447gds8s5@#Z~0{j-U!<{`72o; +z48VxljlP-n5szhkR2vc?azca$E6Y_lRu@;+s;es!7qkS*6iAvRIZ-{;4NH}VjTiRH +zJXbMxs)y2TTh0i=<00$Abu76MB8vg5HR+`$OajsDz07_HjUU6fUPYrD=#TjEiog8Q +zy1(v^;~J2fp9n2aQJnQ-i=|`0)&fdJ-s{F|B)#<;kg4m}?K;4z!xp2X^9XP;eLu}y?uy-RCvw`+d +zxK^Fk1E;Eo@q5~0o6-#IN60sfF!hp{*ElNI%;$|9Pu@Qzd( +z1-4ok?xSkirjJYr2@coW7o5k0^Aqva=Sb=!mh7Bq1jTx}Y&C;FQI8Y!9fDp1+$ +zudMJqa-=cxlz>gR@~nzcteS5!$EdzyFnv)*PN~k(FsSzxB0?TAiCvYuQE6C+2fo6H +zHh#O!>>l-tvqBAIEU0#y71A+6DI?#H`W-0y5p_&7S)<_?1Y=YjU=*Q>qI>yWW@VPu +zaiUSZK*vE|a>5{2YYX*i6{8?OSsbGW1e}qW2N=Gsi{g@y5y>v_{SjLgjBbL&hPOj6 +z%a+eCi@kvE{E_RC;?dC{kTodJ86~;!ZmPobFh82UktJl|`NHQ?gMo`r6-HPAiLS?* +zH&uZ`L_jaPXo1ApD_fFOy8u2_EgKH2#ZOLL8>iNj#gl+zj*YK50o*K`w15>QRGL?$ +z*A5F%F6z^RFyI!VVBGHw*{Vo@3K!Ampg$ +zMpfBhJknaYWch`3&w7DL%r2WRE*Eh`1@Y6LS4?s2`EphS5T_A4xQ7ufU>QM_STd4? +z)i?!MMU9Tux4W%#!zyMQ#k(!>vl3;7TYf4PWpr2CeD!W`e+MU4C)=_U=*a`9CJuG# +zV<{ve@$%WmPS(RL&mk#}Bw1ziI-DWaEwx~~`ItJ0EvIBaU^Z-ngFG7g!+RA1hHS}{ +zIuTHv%&im?iu;!`OIKyYZR!XHWuYv?l=#b+VI}E01F0d&haDdfL+iiZ!T|?@3Ld=o +zRdH$0NJ(oxu5>!lw?~ar%vfEcxQ-(kXPAtl)GN*}Ms`YUL&*JW2ZJHVl$_y-wz2Ba +z2)3aK`@=z_al-oXfPy7UJ%P6Q83iQFK0)7rW~v{$;4|?Vr)KlA%%;6d&!1zDdLI!{(0I)I8*B%zRBv5>piiMZyW +zI*>TvL_nz|X$~~f(8jl0v}lDi=9Px4zO~H^&SAtO?w^9BNSC0Mpb+Jo*tQDm>=%samZVN{dX+-3B_%>NWt*939rA +zOlnb5;MR+mqV@8nJn-f?$YfC^%}e&GmC6MsbizcU&2|rAbghCuL#RY2q%TOX>5C%R +zcLir`t{tK;w(!dyqnbY#%l5SP6(MuvGrz1?spT;!)1pkn;77|M&2he$=WB +z$D?Zusui@y;zfOBt^RVYMwbmaWsu$TmR@)(Yn3OoM#?s`UIRG}wKLSI-1QN27`bz^ +zi2tsuI)tpm>f+-kc)bO~euuVF&4aD&w|j@XNJ40|UN1o&zI;iPl=%V`fRo+*-K~ZN +zV3-F$l~e#ce%$!2ak_h8>c@HYWkFSaaklEY_2p9;1k(Wcl-Is0sR2Ckm~UVzueP7s +zOY~Qf3C&b^h;PUytjm!5$UTJDeUfZoFMBMDAsx5^Mw;XiW&9u9wYp<8uSRtUmnjrK +zJFD}st{(7c&2KsT=7Ai}LqT)B3+so$2(Wp5VSNFR6qrE%Ez13?xLuK9BV%RI!P|1&&b#}s?PeClEsY=!x`E8~5@EVFsKr@KSv|yJg}TK7 +z_W2XVA|wY1cn6{m*FiD`htE~m#lX0%tD!sW81wj;?6)McaGTOuAg@V$&I>@8B9}p> +z?li#(@G@BkcIGP;y3V4yxZ}0Ti`g@d7A>!G@PZ{I1#dy3G+wmN0bAM{bvFzA7mxaz +z+gcA;Mqt;P{;+ieGS-}fbj>Xg?qCDeVTS<%`=xQEW=*?}32Cl;i0O?C(qip*sq +zI<+Zrm*D!tUT}pNNFCjzpPtHXy0KwOEjWeJMdF*)pliy+H{I+qS9Y0n5v!TZuDdl@ +zz?oy+m(-~MiZob6V7)3O`jogrXi}BFx@c>mu$_P~#_R1sH{R04fl#3{M*UOmF>|}{ +zC0u>+>`U+2i;rLW@#@OQFE9rSUt++;)|XHI9ny?$e}o? +zB#;bjXsAf@^k^rz3Vphtu1m5Y(JWThKqiPO-coj1EbL3nxEaS)85o!}@_<^Xq6~pD +z1ErI9mR0tIlgTNuG*$i>4Ew;ZDvgGvccFV?a`vMchc&~y`L>Mg#pHM#N?8swf~$D0 +zD)LM>?2qp})Uu_J(mkhW)_4wR66fUHY?iQgDLu=&04qzA$Ke-~VCl?jUep%q=QYY8 +zmt2ZQhzPcQ{H}TW+wrb#3V1zseJDe9Ui>m=O}(CewO2ZK(d`s +z6#2dOv$b_}p|VbWf^+xcS@YSNqETK1MF2sQla~cCy!JC8BIWoBc*9mUv~U0i>Eq$G +z{85|<&^iichjueqU0V8%qwN9<`r^gM1Vnrzp}zPUsDKd9Qb50@n*eYy$X=HL5Rl=Z +z^%XEb^@8u*OMsZ3%x{`VfcV`9KIr*(-xbB<>o6bQ)mOk9_gBB;vfN$|!}$Ad>V-^b +zNy+GI;07N*Ml-|3!jIWM2jMUqi!3zig~J)UngK1hr!zn$&cyEyZh)FMUN0-Ste|r0 +z@v*$HR$HRuHlY!QiU~B*Q?N(E<6!tW#k<&!VRGG{T{mvot2?fM?xwdd# +zQ8!4@5cBMwFJsQiFQz+|tmZaoac+g(U)Mx=WqIk@TBTs&i&8EXsJ(&_qp(8l>Eo*G +zZ*R#)p4IW+7c)0S4J}V>DERa=QK$Ay*4mm}?O9&EKhJ9~Wv$6=Jy&fRY9@~RwZ4(V(4vP8723vhT~NVaQw60skSckaU$PSh +zT^SrKQRzdn5+)qh^)MX7Fr?TfU34yi=bwTu*Illy2nq~SfNuqou$BI}_QaDsIZl8F +zBD)vGoow;VN&o%(*{`P`E;s>r&I$M!V8;>~JRS{2Y3tSY&hG0sZ}-!JC{ZC1h{HsGtma@7x*pwBEvjox`F1KJ2%n +z+qijns#UHaf}`LKWF60H5UNYD*rULwcVg&|Zj`485_&Sn3tQs&sIm8fywT`z`I!Y) +z*3x1o5i$~U)%dg?l-Q26pKJyMXU5o$F-mZh5fB+BL1WZ;vi9lztfePfDd1Z|?kOyB +zf|VfpZH;&R>C*aY<%vkH^ljMhk5+3>(-5{$v|Lz!cewYV$$GKouj{~d;KX?rN7}mT +zVYu;6Yngm1zfr&ewr9jvTl?)X|KWmVHBE|dQe}02Etn2xnh7+I9Zf-%jNaLne}SOS +zj-rdRMtm_F%SXM5;w;Yb?4WlM4F@-m1K7hV*#M6k_0^Y44w!KD`H~mP(FSZglwEag +zX~~j%^>iuuieSWRXa$|(R)@XylfB0F!uoRUY-xGr0>FI1hbVA_ch*ybcOdoqz#8^F +zE|Xe>B%;WBKEDfm1*hMe1#$?3U|%CCQhc?!_72 +z?)syVxtWwA4)@w3Et +z#dmTs@Zo~}ROEEz({RlJNws%Q8b3e7Rf9p^5xIG0){L~@UfAk-{kvyrbk=p5W+Am& +zSy+E=1Sw|3^{uY(2A76aCg2s3YUsH(I$1J&fi11CyoxSn9Ud)lj +zR;Fu2f3ICEsPoj_Y}n3%-433TetQsgg9W#FVK)!ezNUG5S;%o==|y$r86eAxmFgNJ +zi&9mn*6p^5)>6~seiY|!a(faHUtqb2bmJ5zFT1gq%YPH~VAQJjqER~`hf>UwVYvvn +zTwSd^l-#WW@OT5I2o8BX-;qs?+v2Jgt}Y2-@FMQg60C6Od-wj8jE?ah!ADc{rCvOPoMp%K7H#eWc +zp^P1I9Q;Q6*nU# +zk;EaguF}=KfFmoA>zXK_Su_1sP^1fK7a0ZGDM~IW^k7F8L>W7WCeHK|+j`Ar*&0Bi +z>B8wzqafM=jFd7M%6EDObXW#!DzHZY`4uqJY8imx?W3uHHWOe6JOEDm8@3;%2~t4N +zmNLR=f}%ZXbt`A}ECBWlAw#xFZkm7p+a0 +z>i)tET~F=R%s!hDCiu#Z--S)!wrw6-t(%A6dD`+x56#=eO^#kUiO#D>cGuOjNj;}B +zkDI(3za7MG>*|r+x_UOLbt?17rE}NJZF6#KM%(>}_ORwU639`|&%ixeEctrk+7oOk +zw7BrZoFmXo21(4$8ZpLet1qg{FEp?7>(&PlhWAfT_C72)fIs_VO$N@hdK==I6seAsCR9noyI23=rQ;D3B3of>~cZ-}UN^OF$u1v+Sn)$5c= +zFFuM$>%LHjR!o0YAFHyD*u}Gp3U+c{nv2XfIIg(C75nY5gVLO_qGwOGCQdCGN9)Hp +z=ew^e$9tNlQs_4sR)FPEA@+EAO@x +zi>z-dU@6bbXG`A8i-q$Fnr`5g#HE2W?73E%Msk7@8CILH90{`|WfEq9efY${UIlLb9`(DU!oBCCdl($DJp@%{@h +z4F@n1`ZfW|A-b|P--19y8{O&`YC-P%Ktb-O_I6S$BGC%LYND8(Nn>qLD95Me$>%St +z%TED=U#{9TcI($LJUU!&Uytu3T=kh3J8$amKIp(%T#~2)+MuCy7UF#zg{0QCcqNZd +zj<$CjjiZyz4EbNF{m4T9OkK6=Dj**AS}$HKFD(&n=Db~A5*JGE;>|Ij&!<}_Z+1_c +zul5eNPJV0d9iHxk3+p>kcK{Nd+u1X=7q#W}l?rVccqCS8E45{m6Zyw7`~dmqJGJGMhl02cF)}$ZF^@6=QD4d^VX&BOzBej +z3|y895@-qgRpJQ@e}3@{$6;}p;e!20DCIURh3spZJcs_XH46&w6Yoywy&uJNFJ|wh +zxxH5hu$sSG6hfA|H29+nB`qau8OXj +z@;D@uRF^zb(mh4fBEx}Y@_G|(h_kC|?hQ7g#jD-Nb(Ys#oonFP&|zY34*9Hdh0%9q +zt@;A6_vupgxl}gOpoyu$ADUyCz_M7($~0~xhuxUYZx~L)W)f$c5F+RZVUi~w~a1uS_37#hGpx+9NY5Wv@TZ$5hyMT +zwkpc*Fre#a)8>QfcZqvm%AaYhM6MG&d$e?XqUbl0gW4^` +zHt3l`Ygx485rjsqIujZ-j4T?HWWiRR^5~wc(Gl&u>J3N0iLR0AlLc~)G- +zZ77?@ItH_l3B)}kq@@<0N7BBYZ0ElLjDnHT+mr9u@ +z>$)N80032_{MAuI9!50p&z>X8yZ97X-xp8y%(H2;nt4(TyaXJrpRKN4!08U)p!@49 +z&J_>qcm}!4pa497fgs)hjORS;V);yaQP^O()@;-A(ADRlzDvF$+9X_Bj-kllS81v*l;cUtT~(RY6|+ChENS +zIj1*Ve90IRad&XeNW!Fl=sG7w8?J*9`Nm%uE&~C?t!8U5ZmN(bm#OlNZK7;)&nND& +zvM>-JvZqKBlRafaWRD5p%TF6KKvYZU_SN!SOn;uPteQzK$Z11ED#5-L$6HO*KP@+x +z@*%uPL0Ha$u$&8Fb)}O1#(}Vs-v?*t)}&4xI)1Qar|&DZrG7#4q}iWmYw1e2()bLK +zrBq74FEBNl7qnl+@=|SO!f2eU>a3Sfw67H5FAQ8Z$Ty>fB=+WWi}+S?jBY#Gy1!(f +z=2=-LnnZgVNAFIycT;6--5`bw14c8q$haRuDJqgIWORU)0UZopK%)PhJIV;(rzgu;Lm1ka)o2rsKH`zVSsR8MtvE;Udl-0ogo7lSd3 +zq^vh|MFt*7jUc1;a-#O~BWlAQUH_Jqn6t-^tC22|F$3HU5FhQ1)27VtIoDZTN!IC4 +zssqFD$K6q~&ZH_2Id4d>O)Byq@+OD0MM5vR#HE7Bp&tGYL{F9|*rjnaOdXjQA!_M;181Z(cACN> +zfi+Y=p^TdcIVlP;quLlnC8WD!o#`-(0GknEtQa@!2YPwu5pJw!yoL9VpRJL*aNcz9 +z3a=uxo3JeI_z6=-;*yK>%Jx{!C`|8UxF_(4J3B2Eef7R)R636Ni=@6d1e5T}Bd(+Ky +zSM&(Q%U53WWUF25*aVKH=54T&zW!D0zmk?LF$yFBkOS-&a&DGatIMlm@%hrz>hd!! +zjVYnPs-UGVN#>;BmBzk>mp}i!uzqm7TMyM0?*hnnOZKyb6)FMi4T3P^*5zh^BT_zL +zXbdorgVE0tU0X(IQQS#S5LW%!@-It|C|S+uWi78XdbZ#^OXx<}W$ZpyCP9{dgm(XA +zf5Eu3-214MCA3OwATzJLgk@S=(IIp3v%R*kz8&>H1$V4hhv{k2PxBOun4z}TJTAa% +z=bS-iz}qKVzb$<54#;BIG9bAF0lzi$@1d(dhJ8KlwNV_$=R0oKNoBuZcRmM{wFng4z=uN5pHeayevVVSMZj#WUjKX*nK_U +zg`=MDz){yXO5Xs(x|f=Lo=zKy^%}ignq|GF6q|9qH0F6LiEbe5m1&4ak6y28>u2S$ +zVLL)Vfp`A}9N{}OMA%ffF#~qEp`{dOzW4VFx5srp2+cID?y3&j?kK^hr*kAuhVKK+)AmuL-W#}vHvqo>$r;JuTiSsoIa^x3NUsV2dHpP@U}@SH9XJAmF^XZ%-?=f+;~ +zvo(kZ^9$fT6cYAn1@jtb^kGIIdFKPH>GGs)Mr}f8mvuYiyTK*yEm)5FD*RQJm-ySUy(9+AEu|l6W@ur3D{g`GelB)sZ)Dx}(DK22p +zLe?mp!D$1>nCO`8exTU7OlTS8I0H~Fi#QdgV3;!B-sBN0plGWOfMmG< +z``5RtD;c}N8LDSlfau|^uIRRor#3XeR#ND92Rlc4{VuHIZIk6n`IOs|uC^0Ke_kWB +zNJ9sJPcNVa<&OLEDecbG;}@Ba(Hh(ICUf#WX847M33q3Jd>r&g;kftD^@H9U0Y4Z= +zJBSwI$^xLity=PXBx=-oe_|jQ2Fbc)aU0K0vJaIcM22=jYuFJ7}ET +zKSWvvSy(BJ2fBgYHwHf^m&j;f7!0x<`_eGJ(ZNsB$~TAa9Aa>pIVA>KwO(5&V%`hg +zkL&(;S{HPsCmbD*^Y1YFs7adI@R?V?_{O$Vrw_*W)3U}q=M>SgV+ethEX2*Dol2h-6Ag3IqOwW6!^Xe_g8@GdgoTHN&XA_&1MDf43dxChZ)c0BY+AmZ<;2gwm+k(SJ_Ry +z%4q6Ux~W%oQ&vOxh<@_DmHxulNi?gMse6sA`y+MJ@jF7)Zp3#WPQrr+%B**1g5&ek +z^imfrowf|7E|)un(%*Z*pRFZ-{|gpfHS#Z6b{^sXPYaK+=+YD;8PIS7p#T7xv`~Vu +z;)qTF!m;KYARHq>dC}B=N3#QpJ5vYD10F<%C6kfJeiU`I>#Rd53~8n#DeV6G6s>UF +z;7UqEs0^u~(6dTjp=YYp@%9!L%P2)ry6j@lrx)A(^;vGm>_X4;I`-_jRqDk;W{Vi< +z%CWeSRyNVqUjfYq!t(~h@RL6ZJdERpMvF2Bq{6svyB0^aW%o|iB=`Io?Q)jnb&A;E +zd$qk;K(1t&QW~Kt06)W@6Kv2^2vYov^|In+`V>D>BMRL>4HB3$FZQG8Be~a}wlu9mq+i8P;ArD`53YY)pdLx(b$m48}~W?i;apZbARW%HM!lW+>|mrbVGd1?a&CL`gy%$3bV@m9(fP#G6)2-1>b^ +zgv+T9uE!xTI#Zvk#BK;`H|83`1U4{s!l_$bt*xOK|`~I=_$G$s@#GJQN~;#n2{kBxxHD@1)g|1 +zyucIBi7)WP`~1YyQ4lEU2A-`tIKZD`r~7VH0I10enqL8@FPj9~RmuC@^d&%xBA9DP{^(vfO2)}+b2(lJh*s>mrrD7!EmVkMQMV&IQ% +zC?St%1S7G(-Q3#W-`vJVf_{vN<^We%2^@=F5MxSCOqeNl``4JN8><3k(3`#~GZt-L +zLjUU<2B3Rx$^Qm}q2#%>;tqo48~%9H~^+ +z3X2E5hI7qyXx4);4X422dB1{4akX4Zm7q~G_L7N4vYR?O@K+L#Z&CJW!_Q9OQ^*7I +za+pgH66~CM@&=_l`3yI=ejxlMrl-3O+7KirD3ZO`KGP5>}i>~W*oiKEMJAl +zvVHZW1-S==adaovYD?-7O}t|c0<4-b$f>3 +zFcBFNK){yqfD>xVq-6c59mvZu&Yl+E$L!k(h1AQMWo@9_Twk*_k&o1s(IPm?GSVre +zwPksmO;@nhW*V5La2XKocUd|&64uhA{Dw7QR8K6+Bi4lKXRnJL<{%FKHim;W5l7jz +z6u;QW~9HTR-Wv4SQ-u1&f%302V#ep`*H+axT9ntvpWKCxd +zzM(|PaFpNbSmZVsPW=wYC>`+e2$SbwAVZwTm0GQ4m)#S7j|lW2io+2SX`g;)e?i +z82N~iPVJP1rvHz$XYFbmN%nL26}p63z*t5P+ZfMeW(Xk(cfw;a$z~2=64@3;gDrU^ +z+2B3d|GxF;R<|BDu)|5LR;#P}T~*y(U6r9I-ppRIJ#g0Bb<`f&@eLlY-;)zZVU>{l +zp0ZlhW}Wx+j!r&PSLEFsGBqa$7<~X<(787WPb&)?C64J&Do?+mc%LtOrc3spdzWYD +zk8h|XX*6Ae3N-|x1z|}RV=@i!=vk#qxNKWy5u)z5Bd3KH=b}~W>vB90 +z0Xj1anl5WkZBEy!=Cm@9yIP%+6y#3MH^iyG +zv{Z2#%~7n+S*k#>s%WS}bCNABiY)6}n7w0~AXOF(o&)qB%}&C~nfUaK$^goALM1_U +z8%~~d*1E0k)n4aXHzutalKL!};QAjYZ0&VjGc8?fcG|UV)<@5u83gb}T`sQ)1)b`o +zty0q3_u8Qk!etZ|&mw}hOe{C9S5NGU)-32OJdxsMO{dJ3o5G4mG^MSV-9f*BjixMS +zXhT_E812L^t(^peZjsr +zG=+>t?G@g5-o}mC7nLwU$HHDO+)^x$i=_xQds^wM~_u*#3T2lGXwxX6)NlU(-TArnQ@lAHY-YlqNCYw(nWHAh$2vCJ +zv61F|q=T&K*jpHhcjFuVh2bU147EFnr8aW>wZI6oBh$QU8fqbqyVxmRw`2wkQNS0s +zWZ$OQ*+VO?wzcP?sX@B;_>yc>2RAXaz`ABd#j-8F78Z}BtX<{|C#dOD>t48@u3GKA +zYb9Dw$lx#;Lu6Xn0vgz|CwWu0Mf_z`kWh|atnM2V5w#j_(H8D7@cQPkQbj9Yw2pMS +z!PGZ4@Fw1;b|+geZL(=%X`K>_vzd2tKoxd{?U@?6VQ?F0Axgy6Yq{8Fr)8-K(JU_M +zu~x$$JOQbQ-7RFr{z{hRjrJ~oJ7^YS-t?S&#QS%Jh`p9&*YqkFFV1>IJvTS?mPGdh +zjTkt|kjND@nn>2rSl87b#&yl$Utx)qev~y*RGv_%zR`efSytU?;)vaM>W;F>l<$UG +zMSJOnGIQ1~t5)eb3XYXfe{y^v5jVp@%*&mMk-|%3q&nN?-tjeui2z^CW_*7U_l}^?kUsqA{_D-%|A6@sd{fk^*qv_t^(63$* +zl&W-b0(254ofoEv&CK5~BxFe#D2G=0f*^G7Sc5Yv;flPd@)luVDB2k +z&i}mxCJjh_x(M)8YS=hwy!K*Xw!aPrCtfga9O8*f(s+0FNwc$~wCiV72H93ixOd5e +zSgrf^^0UyFc#Cc(-ubaN9vbicdmqYji;rLN!pX#o@BFj@lFZNS!w#<~kN~1wt_L1% +zF3BUsB#pgvmgMaL|6-WKKPTJ~F8i^uZ5MBpx20G> +zlnb;&(5=b7s0r1Yi>A89_q&{4RG-klPio!Mqkr{Gs8_o@RibcVVxlOi@W*t4eCnw= +zVr)%!-juT|AWnZne~?+EGG63HB$WrgFQo%4YL{VFt%1daEDvo{pO=T{(plC2G&!?N +zu77ie<}b^ZXK2Nxaq6bm{_E(W``TBgi7}ix%!L&=W=%W86K_Z|{cFE&oSz?(C)`Gn +zy7ztfSLLbhwGTr4%8cMUo{!;UFpk1ix$v-GmJzU^Rr%18!T{9DM~qsTh>JtjsC%Ey +zX1Dk8{OCe6FT-s9p~>TKHud9**;s|DwG373*{IsfP_>_jia0p%$XjokM8id;jxx7> +zERsCsa%UyF(t`K-c;9&OeULd0;eELZ-)^-|rbeu+!K*zoOd{%5P9{Dq-%ZPs$_fmr +zP){j7uAIX(l4P;g{pacDE_zLbr4uaV_OElBy_z9=Wxrlm4lX2P=VnTOFWVK;+Q8+F +zko-Qz6zf>l9@Z*a>N==}`B(Ua@x^rnQKqoh4#NuI%jr*h7v?YB)3Z}Nq7Y`ya-%3r +zVl(x^p+7Ohq-1oWssN`^*h`~najFnEAcF9h8Ac%*5#JZx^N_hcQX_885X9rWivx3^MmP( +zT&jo*l?{W32Aw+b<^^f9aCeD4CV^$J&~<$t1RTh4F^gy75U-INtRg=eq^>?lu?~fO +zH7<%~$3OpFA*&p>rS0x1wog^V!4T`2cHWihbU3xu(g_AdVq2B4N2f=hS3&xrUoo71 +z>p^~$uVV=^@Y{z{6nc+o>T!ik&;bz^&8aBb=ifeT1?Fe6!{Atk>VFP>upk71fXO>+-WyJiv1oe!)hnavN-9}Z +z_-4Z`7Kh-uPcWpRviJ8btNjSN*bk#hlv+POtsw=JY#TjTF=QS=l)s#8R&uM2Zz4%Mm`3Aq +zlw?Y5!X>Ma6Di6M=Rq8WAn~RRIrTan+U{&xPQ9tTdoicL{S+Mi%q>2KQWI)4^OHo+ +zKr#lV%>QsC0pGB?$WWGnp(*T3^6^S{1nR~ZJ>pIx=)?f}Xd?|KAb)z3X`K|=ZoFX3 +zVr|Bg)^^CwNI`lv7SW8<`-ErThesZ?K2&v7V5?BTYmvMD;ShnI`e#@$Vf7Tcg|5 +z=mR{o4m1v)xdZB-xJ>4hwdj5oMgAGbNE8oIC7S%}&V!-P%8xuE_Yp=6zfYx?OF6#)s6kC)U^Lj4$M__tv5oB#A6F2gI2q`};$tS=u=;uLlpGt7D0=QLg +zn0Go{;ZtRn^sQ9N?9w%+1*;THy)()U+E`!|}{025KlsL^A6azV2zC)=bk}4gA8fEZejk +z)7mpEt7|vAj@7W_pRr@v7A$Iac2;D9C|aiFnpVfK+-}S5I_(k)@_|V_GFuJ&pELx3 +zs{MzAZWc3Tg#HMI9E1#FSV!S)6UpBs^|u>#17Qt-o-Sgd)LVz!D8SiuW8Z=QF8pu8 +z|5hDi+XkA)GkVcYN}Ky{qglw=)Q#hC(7={|dO;d2u9fn3C@+_OoAfJkr{6vL?a=Rj +zol)Q>S{;9F`gQ2nrQhbGMF!@rMjk?#R@-!%oAAZJ``N%2>E1Oww}3mLI5-G^DQ?qx +zmD$k2hYxI)N@UYuP*imCfo~3cuT7K9|;WHuT>_6bV_y|a^}94f>#@IuMy +zD3QR^Fi@t*t}F$U>3C5p3IaET|1KOq&c5&q_fiNGva7gL*ixH^8+Uy`HcKN+RVR)< +z@fO(%0|)}zh>6#PMpuFy0`F|bL4U^F*^ehlCg#wNA#MTEZ9v@5BZL7W4?C*EgFRZkUwa^i0 +zeNQZF(eBMx+|n~o4o*M5J)o8Hg~^-c=Gpnt#lhwA={vzIs7zF#`xw2;;LS?fJp!?h +zcW|jD(4(TJ1F9c(sY$1?4;!{{=V}T)S%S~EI0+e(AYo~lBzci;{UcVjYiw9(EW|u{ +zdjUm+qOIpsL95^&q&oO;d{Fp$Pl}H8fh1jRN2#g@GgxMQChieW{8!SKw3T^}COdHr +zGRXFg)+xqYx)VF~Q1rZoF*LfRh8h#&lq7(+fpEhKchYU#nloS2C=F>Ai7iH(g7Ur? +zUQU8k_#OAtX4opP*1rHJ&)Vne?EDgV_jSIZvK>%81+@jzzr$7InJ*YYsxw~RKonZ| +zNk~J~ysgVCvGR|HDUmmf7gtoU3IvcMfMVJi08K6!K-$`CAjotc!5k4t4yNTOqxdpW +z4r*=Zf*kG{{n;qtD^^dSEb9m;H`cI`k*aD^!tHOUehMPlcS5n +z_Xnq!2d|Gm9AEy9+q7?wFHetpJ>%`!g>hhAAbCBaABN(yf{DW9dRS#ICur2 +z%XndY`L=;e2^uq-gmw~P&T3i5Fu(~sTp!3i;W11aDA_G?OgawQcxjj;+F1q;h$BOr +zNi^DX!|c0w#ghy(HPn%Sn9o^PDvJ%-M!Xts-*GWkf)!sYA!%x0=C_pdZ5f&-@p=WQ +za4!gqB#ov9-(!%9)6jnzp5!*TNreL?1#X}c1KnXuhahg?1-x*I77`>_A$_e}vI$TW +z!GL7;8}hO?w$wR{0 +z)+;9XOvZP)UIuL+sfrO&dz+EhatP8Wg2F>RB!*-u3U%UP^nBcvO?_qJ2kn9yBfO3X +zR4gL0jrW}oPJbs#b=JdqCi!v?L{JoL7TY8zyvIokqQL~OG-mva{M*wm4|Sb_g}DR^ +z1~z8`@Br07D!(Ak_5H6=BCmtl>H^pwY`4w)vUT-`d0jK<_sjOi?iYt{g>l151jM`y +zWr~A)U!3pbxL04Y7kTqKie|gK;{!Gs9@^Nv&vT5;LnDNAVZ7CbTK +z5GFyht@ykPXXz~$%v+$|-V11VeB|32h=3u?PnbzSSq%cngQ{{D;N#vO&?5-@z|+VQ +z1ftrhK(&*h8h~)Wt={kBL;{-ghx;fd1KBGOzzB$E2@IwTOvbE&GbCUW1*`TtmGu +zr`-J_3w%=*n4nCG69S%m;95}~b?ZQO6DF56P+a4UPpdf~=RkM){?)*bQ}o!T^NRv~ +zXCj@;kzFdkG%hk;fqa6JkQqke!nA%wooUi+0uCo_3;_Fz(DVQ>od}lPxRfTbvF{H& +zT;2n&1>dZvWgv2Q-$Mn;1d@!Sdo<6Kdbbgh0X+EPyB>G^z^yI_bm*Ow+~MiP6QUz8 +zDCl2}`{-#1L8wApU~fSTtbT~)8b(_tSn?_$WaXfqVIjq +zH%#m{K7sE{VcCNS-93a$ZY79R^82pLt3%k{YgveBm`v^V!vofcEY6C6KhD61Q`^oy +z6G`P@6tkqMy(uWV7$Qv@j{P(X2C1(s9^y!o1;OUPyN9BEL{L;$*dM)Wnw@L)+G?wC +z8*ebnSG0|K)!w_-u~5}SsDKG06fS(rVQV*w_$IFV6%GE2SE?zF0Q$Y^kFR|rHx3{; +zze2^w>;=Q}<2)9K2F(YpD>-gxTXXCtmmlK?thSnhPLcF&BmY{FCf>8}jABGCUHahe8!D*2g|_8z +zGeF2y116b5n~4`m&X}xn9O}%VDO!|;V`wIhCEYqhk*DdO^doaC5j|?3EKEaFCx_GN +zpf3lQqT2XI=8KbC6j+-i#7rImGQsSo-MJmeknLnKjrgU;A3Ty1$6*U6uq|JdEc=9PisLLsV6u +zBKhNAv|cv8O$VDf7c<{P88#`Elt;E;<&H-To64dt2s60PG#=x+-LK;kn?SalZ4!k* +z@E@Y~GhtgdpxuYGONje^h_dgG0=^T1>vpoP8z9$dU$YH6v}j>`7dC;n>Gsgdwwn$p +z4GF9-jWag$3rl?36r-x4X*yjHqayOQzP)GF9T$&u?0TmyFA4I7wUpSOBI^|dJ@W-> +zI^j}~1~-MWO7a_CY!g>??_>ZK*=vFoK|ne76my6^^6f0 +z;zvO{xKJ>o7!U*+3dB%+4)CSbnxsO7V&KT6k1dfkyU8RA+{oOyZu_Ec4+80eo;n_~ +z`Yr8tqZ?cmwz*`aRf{2-;GEZD7<-}(fEpK2PPt0qlo33j%D5;a%PkZpc4}s}t&wUK +z@gUvi6t}7!rUN}Z_7#eDllzQVXcqLxX1ODf{b`9+S#qqN`xYG;(t?LuS_z=)C2JyG +z2-PE6ZT*cz$2_zsa9;S#N9i~+0W^jp3DU(hh%!9V?%i%lDLVjO{<~0R0 +zkF&72@F8E-hRwj`?!FrQnO^UUu5a=*9JI1PO9a{v3Wqj8gey{gyeWB?qEX`Iz*wR1 +z#}7%6z1^_?QSQk-F$_^07J<1we>K@yOr(}pzrsw(&`KNoS{Nne?47z+NW--v(aC0L +z@L%@6w6TdJY524G6&;~n`H206K$K@xU7o5P30EPFN=aOr+FV%u}_ +zA)lVg$*jAV7ddv5i`jRZ-i_=+WUk%3nhi_u3wrCY8>uk!GQkcL&lKNm2mRmVhcQm} +z8@o$7+`YS3$dEc5e$GxpT)u^3_G*65?#`NNmwk%4di{c@0R2qo0C{n0!1I7t*1Y1G +zKpv&#d?v6(4JYDmfBIx#U*K%uyy$(_K)8HlQ!gL8&(d6dO5nFk*^;k+G+-=iMJEUQ +zJ<>Y?oh0o=MItHI|a*GNh^Qj5r{k}U(#!F=ha2jxmX#n(RDK*bK_*>3mK`o*kQSVFp>Ki|8z;3&dOn-L`K2s2!O*2l$%_ +zPJ`Ac$ty?+ZtuCKc6=JH%lRwYexNUu!?|7<8Nv08m^uiTkkd0_9we7^jt(@BACi=P +z_0e*5RXlLz^^=a6%FdG+o^G3^pQ%EE&}5|Sd)>#ke2eaV1Aq)J +zIys$19+(r&B?)_O(dD9Z62{_hjg^0Lt_fPF-Q1~opE~Q;7+^b2#zEpsqMFW1BLa_c +zq8mcx$Je*uz%W-I(jP>A26g>K9nzzX>WexAg)|MYx2R?pT@#MqqnsxE^4f<=-Ep9zt%4sQlrAt$@)_YNl +zuN|qSeDzyvE$6hiwJbNo?((7LuC1X9v4yp@mFn6`ZhKp+k8%oYtiuK=qWn1%j{5<% +zxaPIE=9FE@DaPk>>8e!lTkeqjriVm%73jvjZ4G~WCt339(WPst0p;^l-W2dbD?1Bl +zSfVFyu)N;NEeqe%s|X$ZYZRB8`cV(pU_Q!W7KOeANHR(WDbmZU +zjJ$b;Ei)RJmn?ynNk;-+;UTA!#tdF}(HQEd;H+pkE7QYSS+b)Qc7{mbSLH@SJ5fx( +zbG~EaafnM8r;F4C$YDMd4ZKe0W&L;ssnCO^2ZjoTJ-Q?U{NhpXc7r_1#?*;3o3Ra( +zS6e$wG2?ya?*+#)biyeYWeDNb$Knf +z;;BykA`w +z5JfyXH_1R)eY;|-9oGrkbg;z3RGsPf$L}A}%R_pT=Q-;2S%0rSX#@W>Xvub%I`dAYrz1|i+5XvrQIp9=IN6tynP0GLPkzVvowjcarsG5^Cy +z?;cBj^9bJ`uky#ot9REl8u8`T^@q}T@5?w6;A76C)Korlr;--Q+7j_!4<4->{)?oi +z=-|NU7-^3QtIq1^1M{7CBJ{h&6!*;OU4IZyRSNRCn?GtVV9ZbwwZcyx(UvTlo$6ki +z)4_eUQ{ng>6qt*yctN^_WJ7SuQ8-rXD?hq-ZI?{FQ8-MG(<*kQ +zl+6sGS~08ER>A(JsEW0`Zr-knwVWCZ{4a){1)jtmGerFSB~<`F0knO^pdId$2&QNY +z#TSi0`q>n$T_(g4;m?%P7|d!>kojHwS!)-ugvmK=o~#7NI?A-pV0|q=RtxKE533KB +z$DGSX!|;7B=YXEcucl!hB%^7zaU@>6-&j3hQ{8-4lMvqKUq*XJ`u8*S3ukbgR_AkB +z_%Y%SMiVN#$Z~yGLzH3O0mQ5dL)?pivn}f8AjTivPmB|1aIPB<`WLzKjFfv}GfG^* +z0!Z@3A?XQE+HRrC{31dd7c6bm^U-S!(A{btMHTrxc!>itAv}(rDIE$DfCEG{C1v=IL>6e`v3&?}GV9LMCaa1Xjfr`5Wo>mGg9kiZ +zU9GO=x0(^LjOGQ{KRJzk-eGg? +z!D{sZoV*@BTCP48d3yi!vy1GjpJ@!_~$+SvrYu%8umuy9HOALnzvLQ7=ldWE|37B5Ez13XEnQEc+p|4ae8Rx +z;T3v&%>fqS<&HeB*vH8Ip4&D7ml_e>w!A@E&kjo7^+xnC7cz^|9>}bvzR|ey4`2H6 +z*zye_j&APE()dn)HInTr*T3$y$^9%dL=QYQ`R!Q$taiL-)FVB@HiZYY)(U4)OG)Tl +zx?$XW`K*$tzduknA-g=KxPcgbSdq5@iS$!|%6Jo}rQ0yFVQ>11_ZZ1Pt6H8!7gu>? +z1zX*h$WL3%C9Ss{=hRBczhEP5z3toq-O3aG_IutA1(=2;eJ+(t6c3op=jLEN2+Uxr +z>$h?VgZbFSy@`lK$YD{W(O1Fam=B_>q +z^0pmXz*OR*{ +zTv)fid+sNB=X>J)EmA|H3eK$$vS)<8J-IH-@Y(9tCoeTK=)Ogry4)iGG4bs9+MxSj +zNX7;DlZ$zzOXT(_S$#}O7psq#a)*@?gugQduBF6vVUcUUOtA8JC71OZqjfQpoGuse +z<3`0SjWncXHla}1$rcNvBF-O@%xMR`9h;evYv&@Yac-sM%H_e*Lp+u}diW59`FRJN +zw;K)zH&dWr +zRw-h*nn#Sa)_8HXP%>9{U^q^l0t%7#onkfYJc1$WdE-u?thT3EgS!aEgNZQ6b_xD1 +zfUrIR!1e0m0y;qos_9k8imGEuTO7!`x%rY>p +ztDkr6;gN5usc-iqpwB?DbATH{t}G#^C9_U(xX>Y9fiQ{{(r!kUgmkUPg3CwCEC_4i +zQ=UW$KD#0*$9PJi8BX5KfcPQygwxd4hZ4VXY1NqIk1cs=$g@80U-tX+A1|-r|D=ef +z{68NU8F`$Iev5|5D3g_Y??KD--2-6y%#@oXVfi97B=gEA^XxBug^1ho(()rzA}pM% +zobvkgaGk5Xbe*rfv@mnE{vfYk@VR!?_NO!@R=FnATvo0{2v?6DzaJ|d6W_4*lfv|a-*~PKQ6BwbMyQ|bm +z&*T_-X}!9FZn2lv)~ajl7u)rGW4t1U=u{%Ej3&RZ;-PY3KgnD*qYEKwUz)A*!<`-R-% +z56Q^{2NUbvaG0-zWFybEw{(1(K%xhS!=lZ{->MWcm~ovW +zZWnbCk_$FVb_|+56J|1Y$URyDFP&kEZ_7Zd@dnMgtSnkbSnkfyD>5d-%H<(blC90~ +zUsz3M;K(dR+}p3Nle?Iu$2Pb!B`+^M$b%!TXT47l!BoY}mRW|DEhPz2^D`ZF@!yb%S|)vZX`*j`&ye +zeJ&oKl$Vby8>TqCdo4Y#q++5-{1RjROC!Gih}ePURp9zXqeNfi8-E_UY5itkpoSSRlk0#$o~#!PaOk%)>IL-BK9?*q6a0MB_3dwsqCR&i +z(NBEwDOKPu&CQF?93PC%b!(75Cpc6^&@(|(9hb5oUSqhivtcb +zYQ@R5z+x>ddTCutWkEb*?`^=DrN%0+LGPUwb)&(!c6zYF_wQo^!)<}xH|J23B=@Nqz;_PlSM%&4eEty%+pbp +zgpj?DhJpZ^toC&WjD|r9LdplDXx#H7#=0{fS>+yMyQSNZa1ECNp&xX*noO{hNNxbU +zgrm$Dvs#akZi;Ry^U-~89@rD4pm94&(m;qw=muP}t-Id4Ugw{O1UzJXHi6(Ic=bWp +z4cR+!7$DowfvG`%ZI_{X`TFokZSOr(J9}!r>aZ3m$HsNL?V@u{+HngUy+I0{HMRXb +z8PZb$2EcJn`2!ughH;tCd6F)nOQkyP&vVZEWcK|0-5hd!l!70fI~eWBk?je*J>i +zz+j~tUXm2$+8GD{GGQPf$49El8wTGOs$rk}&z6UphJPB%J3U-tr;RI1mJ4U*Wqkrz +z&h$~Zl+}-}vqqs7ruqC%zNK|n^+AFaY@Do~z70-i%V8tw)pj44r$L;AmJgK=ZU>jw +zIfmQH%EPLT)?N!*k>jW_aQ!r*6Cu}$C%-$0deiA(pc9w3+z=rPq?fFyIp^NiRRv!$awhkK08ZXpxbR{QX7|-A3`{Y&483qrOk&87 +zKXT0v>VzKrIM3&}hbxa6gC0E4LPpL}a5^v(KkT2`wzx9c8t~#nU<|$TtL~hxv0QWI +z;kpjXHzR>L$nkNDoKl_vEmc%@u*U6%M`L%6Sek?`-Z}FpR46AAzz~CJ+D2~{X1;Q6 +zO>5`YQrfvG4O~ROfroqp7xmr;ZW_Kh7@-Ae`anqo^^mN*7M53+A6Hl8WHb-h9}jw_ +z2h18S*R3u$I$&ZAPoDsp+9*R3b|YsAjf~Jk&#?HKnBzHjd>5=;o39#q`CdYQp;lyO +z^fWwUCs?7HM{$e^)-fagEi5*lz@9a?c6z=A$}j_Ct}?fed{&Z+LqzuKU(H6tE+$n +z4_!aTu8ICU8mnv1%C6D8eRmAt0maTub$Gt#ihzotfzR^V%A@M)W4$=Xn)jHsHP32J +zbJSCL%r?}?ZscZM#CcVAld=tFGtZnv2V`;{F)(_NoG3oY$;xUSl3l;#Y!6tsb{TFd +z)No|PQSKcPg44dKDN&J`nadEE+Cf94=9(LyVeXarb)APja7dMqg(OZs +z7`8;SQ24OugJEkg2TYU&V^up$R~|0`P9wMVU};_7&R}ttwE5*(%SWaan{lc8!eStM +z>hzl?H@UX`nu9DFDrx~rC;TjqN`Y-eR!}8PGTcgWJMx8G`q1cCE_aT$eL-e?jS~r5 +z10IP|^JHyv-3is_mR1Hoj40b?za`INL1{Z8X9zO&Il3ykv+TzF7Un>uWKksUi)9A8 +zSTY)s+9`TYaXP$8tfc?IP=$EokRL=4QpN`=gbWg=aJjbpP^~O)Jb1jZx_XN^g#uy9 +zFoml~6RK;E9%KR);)UxAipmP}FcM$(>}CNNGg$v^3=nIkjKi%BLX4P#_bxb13B@dY +zVZzh}qhXAZgIZ+dJL0G=61UErY*y;atBT_!W}`H@Q4XhyarnZGk%wWSbeue>=fPtP +z&BBoo-KsF0(i&I7e7TlfK%3!=k2hT$w@K;5;*vNlPeb)I9u2fx+hIg! +z>FA8ZI@NlrRQ~XPhd=2kqzg$n{8Yj))3afB)Im&0F6NXI19#gdDrLaF?>(x)mrAY%YL +zIY8uq#fEXju)`F<2|E8QN;t$cMRo*~9bp_uC`EqERP9_<49p4;4*0DAz3TWqf4Z65 +zb$G&%-2FI#!)S5m-E8+3FlODe*PFXrn}^$tWehPzMh5zmVpnP}|9(h=g>!Q#b_k;$ +zLb}2bY5*(2DXP;P&8pd#n>)LW^`$40318n_4=2cJ@r1hfL4_?1hu{QGc||)d9``;)4hdPhs%vh +zSyk|9rBV5TpVk_c1$@F<_I3|dZv=DKYf%6y@-CM&fdpZF6l!R9bMFQH^Lq2ew%Xll +zZa#ZE +zdUyz63E0d1z3rpTga5^6jKoX7uU~E->}=uVtIb#22L{g3_U`tppP&T2?7ZB@xL25l +z(}csZaQ#Fu>mRCgGK)K(Ds$HwTLv5C%N$MD3C6V7Gp5w|BDC6M7L~Ho;3VT@>R?Inxf3P;SPd%>W$z`faGn@oaEBR~d^+n7M)fc!)$_Jv_p((AB8L40__) +zq9H21IkDMfC{zPJFP6M|b*6@X@ai|I8C>2&z!JkfybfEVVZdt&N?};ZvQt{ZOMYb3 +zreT3*;5QhX`urlsm|A>?|IHuIEzXxK>i8qewBP7lZ;odd7mw$PlDw2U9olHv>p1Lw +zcyZ_-a$3@Wk3838iLm%Q%rUfP@qYq=NHj$?>pUI-2Z)$3`dt&*Ej#D=)Akz +zM@K-p8^0PMn3Ia1viNz&ZKTPUf6qZh?49)U6q&*F9EXr;HS4PfX@Khq`a@VPO2PVpq|zU2t1b$m%2613z5I)Zvw +zXE?;b3IeQ4)J$a6&_R3(H2wyM_6ijk2O|o@c>*lx*8aJQSq`;=yXqX>>eJ9rurm=otwq@w6(wYeCI{;@TYBH +ztQfT_l{wR$+v5+CsZ^H5Q8LK+{NyhacqPfqdyrNq_UUBcg96d&6+1`U@de8hQ$F +zK1>gs56MN%MtY8PCMoIWwMk(MDt41f% +z>pbohS)Pvi$a&gzUWLtU=iC1T7YCAl2!R4lC=QP^@TZBF6Ns +z03%od6b8;>2z45~OA6R&igcyKYK(u4gzDHMW3mr#easv!e)835NA$m~JzTc8fqPr(2~GXfzPodbV~A{pYM8x?NN +zt6SgO?a1nEuZp@ab7aMxGyrEIJ};fML0zz6&~YsPfyTcU6V4t4M|kTyBE21Qstc +z6P*w}aS~3Exl1(Y$)OU|`l2^N40s#+jlOzE30ukpLw)Y;1bnrR@!Sanj?uk^Pt0x8 +z`r%uF5|U^bg5ws(MaM78)s^b%NtKgpJtY~uRN)rpTl3Xg54g?kt)KRrdky~GY5;~; +z`1z<&nW+drhq>pKGPwb^_6e0jmJoEGMkgm)7Py#@C+Np!Y84 +zs@EAxn4rgejCq0!!STF80qC&;!&!EEO*mq=`l{AX9UV;~jbBA`tR%UGPt%U42Gi+z +zGwj!kfTx;an$YfhWFc#PSd2wgQkG^P54^fk9=6EbuuElPHPwbf3i^_mJmzxY9kiw +z?33B^-js3spsv4}uhn4DbxwoU`x?^lIVPP4VK+wM3viaC#e+NQ@1s~e>d&(D;0l7a@43#9x^PW +z)ZtC7){AR{5GjPagFK6pRxn_Ebh4tK0q +z)FZ~b9k)hZyh29ihs<@m!3|1LI^h{CvdfUJB{uvzPG-wAHkIR{e@>-4fXW;A>{j@{ +zXqpJXxe#r7-x;V$sHcpS1;${990Y#I=J4DWz&|GCqJtiZZT)+pNf%qh6gmKvo +z)%V|T?>|S-^uzoZ>P~QdEH(b=Rqgc~l3>s&#j?FXz)+6_dj=gvMMKy$pnoy5x5=;_ +zGf9DVGlfE00|X*POE^tvh)Y7GRAa*&$N9q(<&OsmWC*GC2)N*}<4t^PGV#wRR`;1b +zHai3iT?adb5BdVMN?&76r4uX-1DqM~j2-gHAR1~pP^(KqJ3O_i2TQ-x1XuWV#eZE+ +zrJ6UwFKl~-MMuotz+k{IjjqyNse7uO8#^N~(u(`xxTotJh?2jG1V&FJ!NFQ-Y5j>G%<5g58(N}U>+*&Gs +zz#ld935JN|uF+WnU*Th^K-9}i&Alm5B-|afPVJIGbk|3QGRo|zDOwWfek=zqWO7j@ +z*F|NETBh_A=%tEL%z&91&D58onr;n@r>?y;VQJ}E(Nj_4sdA_*K|!MJ??3i>1kYPS +zSx6WJe~X9)10ijnxb)n?DkQVFXvwsL`b9Kh#$N^n7(SDKg~WwY*GD$DDav4H0 +z-QUtQ6ZtQnzdy^g-Fi&vI`BRoJx@b@V~}(qGi-nioOtn>{vf5XNH_b1@Ju?MMF{`LDc963GF(-w|An` +zArNPEHi)}qR&Zf;<59Ah48x$UB}7yPy_(5=k0>+aQJiE1s49(ON0Jbgx%m!*$FibE +znq$breur-$V5#*&LZ;kBBQiG9&VR-SoMhu(4Okc8n);2j_T&Z33hD9T1K)u4*oPaN +z5hQB%@aKco`bt&pq800$8id2qphvt{d_GE8%)wVwRRjdn%CgDxaF~#q4va5~Vxa|6 +z2T&tZ-N%oTz1H)O$$UOq{+%=v2{G4y`0FywG|7fNZFyvM@845UhaBpffbeJ0b%V|? +z9kg7*0olZm)@`<>PiV?5(^Zdp8`Mhv(gehaPk+C5N4n=cOWVe{|X`gx+f5}jXNN8M4^u@pzKTS9m7qajkSKy$lz`>4fnbrvT@i50ge +zA32%FnGxjpr8+l +zixx>-0MQ8tY|lgbZ%9HCUPV!_)fu(JM0cxEItC!}Rehff+fiJ<_yND2sh>7~hLQZ= +z!zQZHA2xp?5u(X@lPt0iN6L;Gyl1Imhew-7Ii+yDX9^u2J=<#jw7vO^lx^J-!#2ze +z=l8xs4+IMB7$n`~s*j%S?mXp+3*hLAGp#1Hkv5;H@7z}5{TyX_x&3ng;D6KbyRbS2 +zH!1jT^~7uBj}_IL8DJ_=FuXf^M|qP1M+A3HvI7Id3r4+dSG-TmSol=J*#qKT1#E +z=GN~1*5wc>^_PpqbHk+W>}{vN=49NWtzT_zDS6s` +zCSP8?;s+iB$gurpd;86i+JE{#`15T0)w7)g>Z)Fu_{=Qq=1WL!9v!^imdEFtyNB}p +z6ej9$ck}Qks1#mb?my!J!~Lfn_P4gUod1c-@9s4jRi#lfAgE2SjjIy-cC^30i@(rJ +z=**EkRU86ACZvr@h5ZN{rYvM0(psM4&H5=Y2z|}1(MA>xHCL)%#llpSB}9&I!I0pL +zZi|oR@aog|~;qyVUR1Xt_1^_V>2$)mj1U)67TI#YDGG +z-|$k|B-w+UORfY2E=_(^y|~FbZ;gBCtpFNk69!>x#67&H-13InxgR-_EjgiCd-O=V +zH%Oo@yGCuYP{+N9t`AZoM8I3;TR<88hP6RjH&*@OdPLQz67_Ik9Njr +zE)u@2r~BVg56+Spdx3P`@D?JW`@0fek?8gB4b|dV923Vw8l#Xn^k$c2w+NmTmlB?| +zQ?_hF#U>XPLIH%*3=`==p^ItK#o#%oHor#8xIxguI~#kL>q9L)42O&Afq3^=MdMXC +z&xONQ9a;wc30keNPdBpN`aRio8kO<~rwyNwn+McS3Q`kJwp&ytha^=bNCtUgeXzVF +zzMy0S!cw{begcrZCAkUkrNXDa^dcl@+jf)z_07ShCI=VgoLg$+&n>ktIJMNWXNct$ +zv|7@Sirc(0s9=RFdfJMv<( +z2bOyD>6+zBC?7FNjpMSZzQhi4A6FkdhFMuz!e5*g{L_jS_gEUC&|eGbpOl>PsD%RG +zYx4~>*P+kQOrtvDWHgt7Z)?q<_K(fl|B=gx28Jb4>XtLjtd*LB+*{L0^d-T +z>$kr)030h6qq8|4)J=oqbelOC2EC!$x;gKST&sCQSramQ!X@60g7Y4%P;>!Levk_L +zuXU2_XL1ye_1A=j`v|9|^rLyw5Ar+5!>?ycilHkD1FtdfKy+W6XZvWL8ahOS6x1Do +zQ7swmC`q$PR5e#lydA;vp7ewKN+qTPlvjiIz6wjJ`$pTb)_aX`q+GeQ}=c +zqj}N~W}qELA$PQ$bbqkv8n{;D^=8LsYc5mH0=KzC;Mz4&69qR-_&qx5Hi;C +zD&5U{b6=ci`{)jOJ1_&LVdajNPRzs0HoJzXNd@}Nt}JmEp}pc5%Jb2N$F9xmavb?B +zQ!<~7+G3WJ@>S+R_#3LDF-vL~8MGl_#aP}DJ@r`Jirp(s+@frgr76zNU^a&4yT!%x +z%8A~_#8sHK!Z3u}7-Bf!Hh}tagX9CXq(mO?9Wx7t2^(ASkfz<Wn&ZxCC#iVUM(% +zNp>jNKQ(%>on>c~B^`&kRG)wQYt2^-E~#7%sshWCygquvFr6jk_@1jw*B7!~cK}Go +z8HYJtP*}g*5`(1}Ah3LD)aP%B%>n`~iyH6#Xnb}!oj*H17qNEuN8H_iGDhd{ZwpS> +zix^v?=f($FWwCNBf0fGOdFh1r7lPu#xCu4OBkb)YdQ!2~RUFDvv`i@W!l +zuc=)AtM}%`r_K#+La46MRYx*?AW-#wVvFHVIN1DT=6pFV5 +z8XD`2LQ-%Zk_lfNv)VI@HjIw6=yGl@zJ8-t>&ptAF$w8G)pCVO<+axcWy3j|y_MFy +zQ*TiK_3mD6pFeDJK%W9N3rhObogUTw<_m$N}5<+9YzcXqdBsWR(H +z)O`>p8aig+QZ%laKdswtM}l+r;+hzTx_|9hIcB5rXox}uk~4Ct-$xM!^RCrc5ayTS +zs*X?S-i9H8^}ww$@&e8+XWRAJk+Ah+(EnzyH@nq;u3 +z((hI)Cu9_7JAdRY#~Qp*6`19%)Pv$B0g&WEU~L2yw7XGnETF_fa^!9fFcGwl1tKK{ +zjy{X{Ey4g*HNHPDnnyZpG3>Deshf_MReBW69hO_ItrKYsFmBq_r&E&w7Y=m?{97;$ +zkQ@{;_jXr3XvJMU_U=ua>4H<`6deHO(#~WKQpKmlqPF5Tx$Eat@a_i08n=R)Xfwt_?&kax +z>1o{bLm~bwd3*YLXZM*?jUB@?edjAKGCAj4`f2>Me|RKgOE*jS?lsqkL&Mg>Y +zaU}%~!*jAtdEehQpds&62GCphjI5k=jhH>Tq}D}flQB2fIR$`|&}IBqyXBk~yOr4X +zUf0ZRnzL-)m=-e)z_YR?n^?+Tx!GcGglyg9lrkumzQ8~hD|J%lW0xLFnl)~|VODKy +z!wmz&KNGXHqVVTq8D$DDG-pne_7<1eS_eR5FmGTu&-PKCE(Y^?;N+_GGW1|34ov%O +zALZ#H$%UC*pzfrP)A}*!HI&WawNAqOPNR*y?II>`K +z&qj`l%13Wo^IyF;_r)IL_=9~kPx>Jx8+NLa{yN*?e5y6+52<(m)jeGDCpX=BwvT2Y +zohoyO(@D=CPFC~zXg6i&**=;l{g4?PE^9`H_xE`hu=nP^IM4Rc=^>Xc=pHBL^-WZq +zJ{lg%KANXgHzc3*LO8E^2Za0LJe$T!uH3dtT0v8_BG*TcdG}wvH}}Qj4}Y+a<|*4# +zU4`wfJ~7OvT9N*cdiP&lZ01jHy7TM~ny#p5;BfA!wn +z7ZG1!gs|nuYGHkK34cX==DmwNYKvmo4b=h;4*Cp$@A%k$^S +z%aS)$qD}bG@bC7~Jn0Ad<)0MxN@2lVISR}>aNQT@**=;l{a`vO0CIaMX?b1ioiVRq +zf5(dJkRdzky8^qjJ}_DiJR=_>Xt{6hi}Q?ONtJy!Ps9{tKjTAB8f(?JjOrcfCd)tYQ?sh4lyPI+`BF@beCpJQb6^Wk0zHZa=5|jftaf9uPV7xk0 +zNtvE_>4hnpsy=#*G3VAFuT=H5Sx$*mulZ}*6Jz{$1Xi`{F#i +zAN@SuoBQHCr=XY=JLvuuLjKtMd2**9(xc@(r066iX)KED5O|NaVfZ<} +zIhc~$h=Dm)rXS6devsdE69?|8QKabe4n+6GdA5({$#!H=eEO5L+|F2ICjwaT>bhZo2bqAI*~;R$F)e(AxC8;T20O +z1e$&{Px?WA`6nell)`BNqGvoN!zXh4d8bnM#d)@m=1D)8{tJNIzPq*O_Wlxqi6sfa +z%|6>l^CSqOEl@lS41KvSc~j5!(L8B|5?>XJec|euak=s7N_leaTUU<{Kc^(g+D2)^ +z4iw!L@X+(4GyQyjGG3LB3Kc8zSr|o%d<5W+P~(%P+?5)ifU^p2@?nA+Us~5rO5Lrl +zo!b@)aQUpLx#24`u2Wia`lm)+<)RGR#IMtch+>O|aaoeKod;6+-k}$h +z9IBz&T=v`x@8gWfYva&?f`p@wbFofG3R+@>9PH$LCs}lx2cGaPwR@AauQOgeyEJnHLgvKZ!mLS|4 +zn6iYf-Fj_|IuP~xqal7+nQ3SPP>blYz{kWd$^}12&rz*u50dqc3?4>On*evLCnHGdt +z(01bUdo}A;k;UKWnePTiNKdOcowIH~YUGW{rl31IO-4~5FmYxvdjVC?!<0Ol4fa5IBU88|czR4sYqm;aUGs +zIPLlS9)2nnWslhy4W(ehOyB@F +zN~iUkLKj=uhgwaVv!Rl0P1vsxPCQ^+qEP{-kC~ZnI1E}kgmc1vJIt&$u}lL<63-93ea3Wti4(759Rc!- +z+#;C_!^og;{6Ucl_b_6EJ@tkDnZWfBeJokMEdy%i;u$qW?`*WMo;kW89cb +zQPNC_EQY&T=6{Bzon|j!S?=u~s@^C{f?kV6M)%b|S^0!yl9tfA+Ct(QbkGKfQaGF^ +zq;=7YE-v)bkV=et7~ztfoT4`*gr*%GQIJiHgedzldBma}UWN7Zy4u~`d(qfZvyhKm +zh8}M1&()bjxJLT0yVZQTeR#O}V*8L>@xVrv=r9`?pqE^#(zP`@l7a%b-eFuuY(;Vc +z&8vJz9gcgoEd;kkp4%h~c|>NPy~z0So?myj>JQjLi8_Okacz7XZu%2@?7$CCgokzk +zY&AD`cTI#G2LL4?2n~QfJjnr|#~>eyPW3_QuX*rj5KOPq@Fq_X)-+2PRdEs)B4*|O&M7UX)W>~iH2d2I}A=b&bR@nOw6 +zPIfXmjmSjxPJ8wxH{)Z^N;_wCT)GN+Lmnzwrux)GhnA|uM-=G^yIDq{P&(jBEu#vH +zryUNN=FqHr>1Z|=vWGM6lGo4~C-7FPn;c}?8J=;S2ENzvs7)kEpDOAXD!`aviP}HZ +z@kTi;FEGvLLyQ&NjfNr`A^(?n1`e-VA-WE(;b~=XmUCLEUl2dC^G3D$ee@0v>mN`Q +z%Xa%iHi;pZQ)FdL%moH_HEb&yTw@5-00RMHd+NgH{@_-Djs?-bx7H2=j57y07j-c7 +zxS!KWt|3O|ofWWH=9ECAw@K}%or1j->u|4HVqFEa?ogN(PH{IF97;U}%t>Qt!JhUu +zE&pt@9} +zyyP$?c$@DY#p3gid=UG~;@e*r-{F7r<-h!eZ!%2KbyKz^A=kO6Mh*?QE{8r-(QI3S +z2cskWloRuh99oiOC2z=4{su;Cm_;$k;=ALy#l?BkqQ&`gMIC=+2G`BJxOhB=If_$@ +z3SyXColsXSHK{=D_&wcD8ZR#GhO%D#)oJeW;<3|UcrGt~PzkhPdGU$*T_lUZol_yq +z%nh&4Ps}y}&|DFSWD!#8_>J%B990>apnHyF?>h_;B>1^l_E&}L6i}el`Ictw;ac^< +z^151h^yp#r;nE6S(;%I^9ay{P=d6c}^kI^e5mz8Bd&f%G={1|@=86@y6yvjMkhPr$ +z7x^0ePXD?=!yyPdK--%k$kQm?&?}{X|KxxBh +z7~@4iOJZqDa?CzmJu0OASMD5bJF+@wyJSM2FXMFzH%gL|4fM5Wh1Aq^3NS?OcM;Bx +zkBjaN?Q9Bb<_e~Bn!67>zkV-*w5N!?4rMcarM_uInx;p%)(E>;h=9#thkyvk>EshR +z)Ehh)$YRq4yt@PLKqn^O(xfgZJB{+oaPE2ptOrp{uW_$w791C>%>Y +zeqt6Z&?&eudN?ulRXE-mjyr~yn&$c^wM6w?cncH{%s{^B+^m=B0$=4c9Zs{EAph=4 +z;^`oho0X1vsWSoM_~mVY=HxDbi`gs}Cot^?znxA-0q34mY`s$f%;wF9iJ9D^kAQSP +z`K|Oa3rzp)WNV)qa9;i**qCu^OTcYy`K^NlDYv!dLe4E<)BG~@k(?3hLiCcVi8JVu +z^yWbw2f)vhg@K9Ux?Ld1o8JbVMF7aFTf+n(sa!d5sF~tCUUx=bQ{$mC>E6h@*WXEi +z()sdWNd^le(+;Ot3Tj>Bd1oKjpyGi#H3rOz|S5inREp%nJceo6QzHVluMCrmhA( +zqr)S3j%jhsG7d}dz2g?(6@6K*u2fg&U@Jc#gniX=uHNm+!MmhjKpvic26P$(>hR}- +zH7?P?5XP#8vX|f{QRf%IKcc_2f~a2~jE3iU9~8Dnb>XtO5w)I@W~AGI>_oCy>n&dQ +z7Il-Zd%10*Gj*>)7}0<+s*pgYQJJauXBNs;W6WuA9?gmAOfI0~Rz+vR1uP!)%1i3) +z{woam@ec2j-~POL(D-?C_w_cuqTbL^to_IXb&3XYk0hWrRKYBY%d2W@t137R<>sm) +z5+Qj;SK*Fn0K@6~Fbo0FJMk5VS$2Hz(UOU6R5n-&XQPhmvmctIqq(un$40#1hzVL2 +z<9hp}<@fXULE{7$w*+%J(bvITKDg)Py#v!f3bwRVsWFV5$%l +z)-ZAF&N;+mBoc&_lLQO9!W*vo-*`llA0cDFpcyABPY0x^!!EYvCd9&zPm`@Pvk-W%5);wR2&foNIA3b=!+ehbbY7dYe +zxO@+g>Q;^(VFV6&jZ;WQO+-?T9VfbUG=3Qu^87gxw_nqDy?9uoOJr#Y9saP%0FJ#p +z5>SDa_VHNI6syYTI(=ksj|Ktg;&&mf>S_*K*1GW%Ikh8ZLfu>_t*nScZl-S|F +z`a7HwWvcm;LzHx6*PAd^7FTe~FH4`MD2ws`YJ%tj0e93c#tB2L!1UDinTDjtQDSBz +zv3{>uI{dl7g +zwRuy~ea95gCC+=J8cdc$(~<-zGO;XMRu5!^N)RvhUaL;qjD9b6;Phdty}uz|o>TBW +zHamE=v$cr33;fE4XE6dZodWAdWQ}D`XPps-Zid;&J?7HXY;D=@w@ +zCpf1;&_WUXL(z&(tFqErZTEXL)q<_-2b3wGZVl;>dOn>4eX`Jh&`YD5ZdC^iBx;uy +z%V4_}w-y#?YvMC)oNB|)_nL^L+mWtV$7ZHDcLl9*VM$AzF?3sjlku84+{BB8=pYm+ +z#9hP@o|(E(IcjIS@;TN4p$OCqtXNM+EjxbX$5-zsD7*4o(=7RHJ+ +z%}LvnYjU){K`7B2Dcm4xylBBGYW3=qJRjM$Rz*MV)6G=>s!fWWa^=Sgyowbq1z4yp63% +zYoKQVE~fI~Xqi!4Fbd{w!BpS8g+w<6?w3#XR8MnqWcuubOjSQ|2&QR}J0N3gTPy@{ +z`;l^xl^@eXV-hkW;uO8rSmajecD?}cV!FiV;YDhB7WUdE=HkNV_I_*=(kL))B+@0l +z(NLmYY&Kbbzpu8CQKsDv&%$01ohK|!yowU^>SMysCc_)HQsZ3dedEkQkwu#eiu$_; +z?gjd}OreYm3uZ45^j0&W*3YW(vumqkwA7Dm12r~Z)Em>Vz_GWHmSi{90{!=1to&;t +z_XZ?N91g~@*40jX05{l#miRnUCSwIE7C#io9$3*DJvk9qW)kHN#&$F#!P<)ZHv>A7 +z&Th@Am8GRs^?VS9>M%YVULnu&JRSiXjBT%~ogUgX&_%i(9nlFx!$~ZdNI|Nz5Z1kg +zbC^;zup#w$lq`h?7zO%<<_hJ)yIBxZah=e(iF)rJ9Arr$V%V&CalcP?O$ +zfB5SI=Vs(fj64^<+{hDVac4+M;yPd!)Wb+*G}!TK)N|p5hu%$Xt-ex!@EDlNo!+HZ +zIrr=iuryJcGT!5s|K{8iEqves!NE9uy|?*t8<>^*fZ+0{?%$^muYmVLoUQ8*eh#)& +zA)W4qI+-;uaAX+KL#>z6<0IyB`FCI|B}11=>X)?EA1|#@?|m=6>e)gAx6ok9LWx@_ +znX=HOTj+99p?eD?sKyxZQlwAiGhZhGax=4xm%zAReGvGU+a4@}mka*c+(5&mEF|-n +z(=y!^0$O|T0!$_4!7Ts?=zJMoFT%c-+$1E#Hvlt9lg19QkU(U+tdqv{xM(u;O-jxf +zN>UNfF=H4fo$xa3xByd0Q;s1cMucQO%xR%cDrjN`AQ1|o3#^$GjINt>?5+8N27PSO +zO8xb^^9cXXXd0jCJ#SHDsI}xGrQD+H(!7!WE(My&1s_!;p94tMTB3zaa#dD{DXzMH +zS5?<@tHzB8HA;iau(|X6uu+D8o+x^HwR!YY^Kkps=E3IC{()G1CuUGFS=;SXeg_PG +zb7TSu^ABixLyvs$XO0BHY$%;a>}YFgnS%6XDnA{bxq~zA`pTMzVhX${@ZDk9ttQ9iLb;EQ`E20UTdn| +zuqj}olo6bmr(LAWlkj#lK!Y_(tV+!R+k663*wd_-#RIBtt*(y5O%Sx6uX_Y?s$mbN +zXxMNJC^k=3dbmkJNZh7S`?d3{kaZ=JQNQ0I$iy_NvNZ|@2&A5ZRl%Z)duXYH9={-o +z&$yTu_$<*Z$0yxxSfgl$1E1#cKVYixSAUXM{fYe-jCE>uXTF%IDn9OiLS7s9kqp~S +zqxaI-s)~^&-rU-S%O*@JuHzI0 +z4eR&e=2Ix`BnI=s>B|rS8mPqHftO0CFG&zZ1+bQG!h^>THdHYH#SUN`mfN!BTj;R} +ziFlG_%sCgd)Aj6x&w^OKJ+DTlIpgEQMKh&L8g1bY$df5%hnDDxoeP9A<$O?4>)PrG +z-7=8_2Ti*GBMY5@SsxniAV|kJ4bjxWSBsoPe5dIh;+`{>Co(nxuYgROb%dppu2cH9E#R7?w&jGMX06e`{Dz9<40Q-e9+z$WOm)9Nq +z&jCRz0Nr_cp2+ykAhVk|B|4}4dHcZ$8EyO=V-UwQZ+et*VV{`ZIcQ@XsNVu{1d5M3 +zw*$1|0~qL6Wd81|2e}78t8O@WAa68mU9~YQ{efvc-dtM7(vjZAld#VZ +z$R0G`!}vFQX#R5+kceL771%^Pm@caoeX@2vv!Qfd1n=geYH)5mWaYRvBiF;^hb-4G +z8PEZ(HDO$7eO?qID*ExZafsw>E4!gKwh2$m#COdBE=P +z&KYS<*h!~s8a3y$C`X@6s1v7bCaQ=2m=l?R9d^%&Z$hidke=a^9uoY^o4yiYvYA1^ +zX_Z=VGZy9OQNGpWvNtt*IJum~VyV51o6?J4nW<40uK+7xTnFeZoOgsyD9#l6R{4k3 +zT7a0r3e{iIONXxj`CpXl0SU(wd3N|del&j5vZ>-h?K|?HhFL%4Ej;6tEt^KZ5ysTN +zJhuMjY3g4dQ$HQ`NI&Nn@^pkI!Glqs9Gnd3G+1d@6?yX=^`RYI0Ar%Zvy2Px^U!n{ +zf!JF@*3c3^YPf5Y-#)#q!sd7-=5e%JCSoEyAShQPKjfUS_rcohCfFQuKQ%h<+|ZV3 +zE{C-vP~6rOp-;oed)3;;JlGq7(N? +z3%!L^sKMwG85+Qzk#U5Ys1Q8@2K7hQv^zu@7K~)<42QP3wzt;gyo@!M$u=5Yt7I%c_X9!JEn?Acjs4J%$(uTRW@X47zH7&LnblGQn%E|aL4q<$M +zyP`FVLYQD6Mw)G-4Kl&Ess_y475VzdQ5Kh{^jy*)dlWPUs9Scuq%BLhJw&@wDxVX^ +zDm6|7A%BcA4`;qfLca=l)ZjCU$H4&r&u^IW9E;o_}o +zNqdLCueRCZMC?Ha3Hbw}y}5MWYL&>FVnlLzb_n4bJF!|g?n3o@HC*uRQMY@epxhJe +zI09;vR|XpRR)x0Q%E_@f +zVNH7nk%rC^ZEVk_nkDW6JjC4Ea$tCMH7F4%@vgZ0q`MGLNuNAESipG235){%sF_bC +z8c4eCjLwkHg6}21H!W?Hq&gaPNW&{m_AupNOY1E9{#p5Vp61T9C3mKNlnr}RtOwkW +zYmw?NB8^Vs+h2bnCyuAhTdZKcRBhoRY5$nDOQ*8MU(1VtGmfj$oYkddb=8E;G!x^@ +zhAbldk0#n1h>~-+oIw#^yn_hhBbS$sA)+{0bKs6c!05b(4y1v5Tq+Eb0c;rZD4bV0 +z#VomX+=$`zLD^x7C>P&g!2`vS;E)j#D}rk+^w`Qz5rbg*Sh4k07^EPTb +zi!9Xgs#<>VMD`-);!GY6DZ|geh2(lOt2l$84-gi>lIKY1AL+RpOEEu_V15;P`S=^X +zETETE7aL%PZM2p9Gmz1=-O!?)F4)aU6>8KvU2L^dp^S2RgtnKp8Dpm;8Fg5o%!p?Q +zwi88Y9Px7nL|y~ZUP!!EnktD$w`2xHbW9qQ;*>a$sLeuIqza0Xy0}NWqgYpAS-eGdUpT%jbhU +zJUZCfd*MLj51$Y4>FXB<+pqQyjvScgTMDct`s7xXke{9PQcR5w`MMiwnFYIYJwt54 +zn;pDxsS6r>kw4%Cf9ucs174WMA26{nci<1$T2_1=x4g>nllzDBvQv5HU6{f%FAY%2 +zA#Qnh2QMu*)MQ`1%-s5X@KmMNpNP;#U+pe_REw2#BQ@`w=MH#*ayUGgsh`img1wpUW~oSTOx2-7tEiX1yP4|e>q--)t8(ljXFFQGS@~b#I4~7cZxY$ +zE5N|9^OAPVLiB)xv^WD=(4xsCD(g~q9BInUZAcQ|sMKD!Le53YM&aa*8GO^LUqW61!JAclj0b**8d +zLE2jr@;CB6><`VE0722EiKuc=O&Cyx?&DHQ7$QMF@$XgSl2_k2;HDC=m*nHww;brb +zxm0_MN<-usxjv8DOa01;-Ym7$IqtM6!?CP31VQ(YQ12&9aWeyNZ8ML}iC|HnUCM_` +zy)UIf+X6+o&HcYLyIQubGMJ0s&6P|M(unRXyBLI8Dr8ki(UxNQDt)M!Q|KVPr0E`v +zdbyZ&2QXLkx@3x)!i)`b8B|4V_`E)n0zVDcm-K1^l&SkMm%T-E*k(IoI_Q)|6+<#- +zrtd$V%v%>h?;L#xN9Zgv-S~|u$6!iGG!BIgq&>PDN*KEhrMwR3v}00%N!4j%5h?DD +zW`1?!3vhLL6Ku6X+<2q7S-wK`r5ws>Z_!!2>+O~$XPtX7@lv``(l&c_d`FsF`u@$) +z;4;H7g%+2%KyU!LjV;jiD*2Z59J#XO?9VA>9<*9Pw=&FijQUAkDfIpX9F3?)guR3u +ztp_cb)}VD$ced|LRa1oARHoI2xAP7q$W9iUE%ah+2<(gGe6!UO(H{_$W9DHqmI@++ +z7bE=?&RKkzKn{4-YGo16IT@aAP}nz!yO9XkM5(rzCVVD1A&?&?wHA$R#7Qq&^wZ5q +z1=VpD$(Qk<>oPEufNuK+LpoiIYxfre)+Byx)aWAHpR0>d{QP=O>Sh6Ltm}L6?KVfD +zXOd}7hYue)r^C;wL)71KIox?*0V($%9avz&>k16?biJS&7HlW5pwoWS{Lg5;0j&|B +zdEOi8#`|9pTS;h{h4uaSN*m&lwEN+s#}4Ab+4R14%U7}j&l2YE22pQz?!zD)jt0Hi +zr8!tNH3WsHSzJ1}0}viNX#98$cnzYzI3CBPIhunfl3RbL)4&6?Av8gulH57Zl}fbe +z6#qWqYanr~$CiZ^w(UcW{OA%LIEt{RN~hWZ>*`SqU-reFjyY-~IB=|ZYz~tK&z3%A +zMxI6`xp4D>Gi35e+uZ;Sne7G-@s9UhU|xmCtFbOY9x@h<6}Aa0qxP +z(%zc~Q|y0_R+c_{|I4e9m%_ODp#r)&x0>*x@evZklm%V)Y)#ei2RR+j0d*@O@p-Ft +zCsN|np3;Kdgm!@Y5pEQ!*@U)jHJg|fFT^1s?6spacb~w)AKbXBb=v_b8Z0?m$)i=X +zl|cEtodiCcjRg0Sk18Z>Tns^+YayPZjW9?|hMfpGZki^U4l|gCOQ;WKOxN-jI{LIv +zDGa>W+VZQ$54t9-0$@laHWa2iq1sB6PI70H&JU0xUnbzGnF&6`BtX@tLDUDUIf$AE +z>sFWwtLywuP?f>c5%LVUmQNKAaealS6N`-JxcN8;P72)lw;|ZnLWH42Z)s>oGyjMdTYNY8{7%e}cD{oicJ>fyoU)1#z +z0(Us-?H{VO`f`1_02~&Ovh(_<)qf%h^YeWMw70!QQP%29^_6k0ONN6{YpD7$Htz%e +zb6r(8Pd+`lC+`21mxF8kM>s&&Vjq^OOP{zpRMUC03p~YgeQ5>iT=MH81l$?g$gv&h +zGWw!OMyGtojJoO!{LMVqrIo9K9>@QQNcSfgbO{)S)9S%us9~&gwt@xPiE3K#t&c(p +z;k5$>izd8IRvJk&0cswXZ;2xomT)Xv=yC3^=W0RCo~s|#IjqtR1t&G?>`$*=zfljN +zkKT}mNmwVi3ky6U2x1n&&!ZJ9&r!>KOwHk(!t@UcabRm-t=3mA*9xXgNt=gH%(DPN +zmUju7%M}33C1|x*8+>|#{1!kOE-YYnc>Sa+j=LdwsJVb+0PCwAV)T+xzYhc3?%dQi +z_YQX~+ejCp5{|-aAED9PcZeb@52|YU;U{h?wE+|7(FHUN@b%lJca*fS0AJjuK)r`s +zfK1A-(j5*}t5I-bvi(9oLZ|ViOo38*)j4%W{o#Nr!w1!u&STwur{?jPj8O^!N8}>A +z^uCU2yF^7+>MIX7)bfL+_1e@oz{N%4f^rGY5(ipql29{wbd2%GltuoJqRz=<2iMi!X=GK +zrWT%&WyS}fZBG=-Clr|}PLfYNUR%;krOZ_xV<|}vbEzqMS_{xJ0kRwT{K1`_=qJ}( +z#CnWjJfvvB8C6nKr&HF9bCoK;|NfXaDN&5$QalsNY~Rzf#u!>-|JBi9qXMh}^kvi= +z#2t*P62s(f`ATwu(eFRYezH`kLP{#;#!h@emK-nPc|IXaZV_|}Ii>*mck?}pjLD6>^)zlGi;0RK +z2+5}`skCwA#m_nwjq!`Pgl00`-rae+w|&%nzIk}md;=i1e%jvpyIN*KzA%LozlE|l +zA-SIV$VdD1IG*RHZz9s>7n+QPDX3OSYl6!uE>_;&`f0zpH_pcuolGekN%Pj-P&yxY +zQ=~FEQ@x-Mle!jrob&)X;cPTC&l48EXovDbgZ!K&v0KZ6I4P$V>B&@prk!kd0?4B_ +z&I{l~1ehMsWTbF<<@KK&bY;4HGA({jge08exZd6d#x&SZp7e7Y%>k7+yej;beIP76 +z`jpNAD9K~zCdfC}mzk4#E01Oic^=I^1K5fK%=$I^3_#@FY+(vwQs4o!fR?0lPeDqs +z$emG=w0F@WI^w!)bIFKXK7*%vm5DFTT(ovPZ+_Vtb6og+?h?xdai=Scop6p>U^>G( +zJHT%^pZQC6aoyTI=|YZs(%XYtv7pim>(;JHr&(7;o<)mRRyO|>Yl{or+3L!3dFrh& +z)*emeB(vFTf1UY|(&(xen(<+pi{75c(l1+VE~w95ZUsQ@birw-rDK+y%>wf$Bj_dR +zui2&d87^KIa$UTB4!9K;TzUz9hPzjm>5x&u7kWisDE5l(L_Eqk{am;Mr=N5@&pQ2F +znC$dZkp!mOYzF;E2U=>Bmg|p7_u$m{JR%eD^Efu=W(|?OjrG}hGoW~gwu}T3CMYc&YkuY5k%4+uyJZ-{z17KH5)8!!c#&VCRimOwdEE^A%;!i|#ix +zfbK@;0Ycf*Uv*d`c?FIhZdg>)3} +zZG`C#g!4f>>f_Z+aCSy!=lh3?E0sj=D=AQ@f*%;Kbe$W=Vm}GHL2nqfusQW~6U2rQ +z$z?B$M+tiIx6!0XBbM%>>W(C=KIZB)P)`q^DF{8M6_0xCRJb3;fVy~-snFRNkXX{2Qb{LBE?A`;i$h~V@~T*O?R&NC +z)mry1eyrpF7e5mHng2*jkf@G4%V+nKUE}frm+btU_}(U~9AhE8fB1Zv^uY1Xa{t+p +zTCFd!b=#1lF2`3r*|*Ld5vMKxjQlH;zYar|c%=bkF`|ivmeM6d*n*H`4}j!ZFtA3& +zT;0Id{)%BQz(G6Ln?}-#qn-^tZ|A`^GfJ7ZA`mAG^S>q*(U;rr^vKg0wf6q3M| +z8>CZnCWJ9_7N3oA3wMEU3t4PixGk>vz5r2kl&&M8ScRQSS!Gg82z$h5aM2kub4lDR +zeS^#K=7XTa79$#52+h?cE{i}Xwlzd*B7o^R?ch*d(d5Z_c +zbdC~cCw_V*)zxZkjgNJKvOyi-t!Bniad);b6JXj-2?b4?F*jrAn|(~-;vVu1n*(T- +znuE8aGx!hxX=8o-)0+ZEVkk1?#~snS?BpjK)0n^E0f6hc?FP8bH>o#$>t27O?3Uh__`391r)Yyg1Ers&Xp86si+MMy+Siay=UsNqvO^Z%#M2; +zImHkX93}X}WiY4#7y7AAN3fx*=*0d_$kj6!QDLvmN!lP)k-OGtI1);e;dYy^4)$Lh +zY`&zuJM|6qwB^&MiiySHl|I}$*m-s273NP)Sq%9j`7Omj_*Nm;QsK}tWdcvfhCU;WRB +zm|8k@-djjI7^`PlsvwLT2Hn1^cFitRDD>wEt{26dAdpkuNMjpo2Pp9AsaPm!PXm;z +zk{|>f{RVYSUy=_**z0P$+Djt0$%()iStmTOFQd!^N?gHd&-% +zZ`28#JZif`qw!G$R +zzsh8$(=9C%j0n5C!4N60geJWb2Rwlm@OBWJ +zNG}QHfEPi(?~Yh>R<&nII3QM)8)XbJjJ!kPnUs!>P$9az3@ijwjgq?-?K9L_Z@L9^ +z&Jm2Y5V%cY8*&{|%nB|4Y!TH)<&0C-5RKa5fP7Ej(l^sP@tTPz9%~5(B#XuSAY5Zc +zISB_cv`Y2dr+W+BBUpGh7(~PA(75}kuT$IPiz`7}dJqI#!F7^F-#K8f^t!pP_GO`L +z*bBzVLyBHUtr(ddX(cM|w28U_qM?t4L3BFO$;o&37Fh3%dZ%X?1^eR$^RDZePOWe} +zJ5PII9w#pe>-zpRb=5?x9j}g3mqz|oQ=^nrf32p9R-Y7IOd+{_&Hj7i5%Te6<25!q +z@5Si;1ib~PTg10r)3@ljTuqf7-=t^U7>pHnjAyfQU3dfz3_~i|(6u4OzY@6~-R(U! +z@+VSrJfUm0N>vBkiO5^<2%VEAEcX-V_~ft79t +zwFdD?%g+xxM*pf!nhZ3J*T@;~93JlMy)Y7kYYCGi-_ftw2cqE^A<}?egtH@_t_|7{ +zvk2|ct)wEfXEPgF7I>;wLk&p`f#vMF09XJvA+?dtU2;?w{G8+5)|l`|$0t&x;@oTw +z;~1Ae;*{=79{KnjAVeFOghKzj?{VmBedvo^h^l%F(#)fY`x*WV&Wd(;Ar +zlX}H)c^n5ZQRP{xs@b2zi8u{elqOe|3_=${X<@G&(!IEQ28ua)3x{^^MDIf`rd-(N +zS*j!*zVETy=O76JY2i9YaDY@rH{KyD=!Hn8u;18EFk7|MGu +zvE3b#GEmeijyH)y42~2Ti`O0Eplie&*Qv!)N2B6QjH*{Gios6SQ+wg{@NkI1l>nRf +zp+Ypj=FEhC=Z*YCmvzrnYM +zm~!FIcX7cT`w(7UdbD;YPJ|CO_jY%le$oB)6xaEF+s0kr>zq^Q-ckEEfBE|zT#-?HlwK*+2{CMUicT?Z-3T}D2>zj +zD^VP=yerX#)Zj6?n2}@mi@8gYof3|%!#Zv^7jmw#n!fSU7bot-`IDJ;ah+LA{+)|n +zModYtOJ%={j-gz3@l3d)p{102JtHaWlUz4XtOIlA)xh7^^_G_z4@4$o6zF%)CJEMO +z3&WW}&%ob^eb3oegTcMpSJ*FWf5`5(y!`l1cDK!guer00yX%?7Pjl1BvWv@ScfrrN +zHmYvmy-~G^7e`f80ZtFzvA3h1dlbP! +zVxu*d(U(?m+dyW@gfF{&EHoRZEiXQs#Hm3S8Hp8E^}?{t0qZumcK5e7cY!F#Qw`7h +zo|O4hfY&}jr$z~`>CLCoCvN8E>!W?V@I)~3mPM%3Dy6!z4>hW +zKtSO{l(VjM +z;7L=KFO=kx7-0Aj}s^JaYA4w`y{+jY8kEIm3P2DJ2YU8cD`~q3wO%6s);fcUB +ztbEN+r$M<~^KIyX#ep&W +z^4Fma=%&0;wms3n^TNNUI4&Jz^y^9r?~2d(Q&F97Y{s9Cy5zDM-?)r_HJ9<3%l}Wc +z+Q0D_|29;>4%#;s<6p>PWN3-k)&F>c@n>calvdMia(tt(jf!XgRrJCMY&dTDH&n^^ +zRs*c`T?1rC5%nE)B04XKdLvP^(Z>JjiTlGyRNAkXX|xygh*st=q0}3w)A&3_7h=W- +zQq>p&>-ZZzQk)=l2-b=9^|M_z2+}U1v!RRG<@>0ru;dObHK0X-=>o?asR?Lid;vh? +zM(DpaG|uWojiZW`1Kk3UI|(Ehr$G`T<)G$ESqy)NdKjlto2gzrV^AP(?9A2{Dq;La +zzB4W?tS839)fsAGkr_FDm)4lBW*2LEIzKEgR8-|t`EMmx1M5GLpZtuYX3DCd)xnS2 +zW^tlzfdljQrUnZ>D(ArZw&8r^L?@g_3y|>JnRIH_Q~3?`ESI>WChheCWPsFC86Q5TI8_@%XYKOxh>Lg>MC*FBQ)5JQtuU-w}OI*RE1%s;M +zgDxwX1g97(0T;GzNxgs$TIXgyopbsin(xy8!0JpiPS`tJ*?xN>ByHv7-hvmAH#0?E +zOx}UxspWfXasd?{mr8Sb8D--278m14zCsn*My65zu^6F`%Rd5bE}P6HTPKdXO_-y> +zzg^cZZ`r4G{y$Y`e!gXA()qt~XT*FZqYPwiSQh7dAIb2QpanL65!=}fZW+Yc(J +zQ`D3?Y)a}BpUHpJ(cs2}TR1s;??#9H4k`WF}=HsRS +zl4bD%R#0n731fsU-%B>E5)R(HMv}L`s(15?i(-;J&2n>V$zNb@j<33;T#*$8JHlOs +zhpNi{o@hw5w5W^0p3sd|=SF*uOkm(~eFO+#OHql`3EoMmac- +zF#%Ak-2#M5)ND|npHp!U{iJH==VWF?{?F^Y5k5tK<8bmDk;56fIr+#-bN2 +z#GbkiyT(}EK+v@G$WNCI-xEDvU$X0@Zd@a=t3-g<#KndSmzS?0I{XO%>QC@GZ`0?w +zI?auHexTT+>BoTZ=3$@w@*3!@PA*@!|AE~ +zoYQa2|DOJazAI-qY=+8eYht1VVU9$k$Y!K6qNe2A;Pf5!ol6)oDi+a8*;2ErIvov# +zyfiB0*{n-36QO7;9H8S{z$~&m!%B!D)iuq-Kw>4{WS)fA{ee4_8>;g5*ZRBp_bpI#GB@LR=_{&cs}JM2vQ$QxslQsUWsD8j808a-Pbja1@%G +zkmwB3D+xLDgEjUHeW3-to6{J5k^unRVX$8s?2o`D1@9v?Wt+)qL8jN#XXld}3?cVe +zATj#P3H>TaHiV|=D07P+)nX-A?-v*FL`L4B))Mkpb}l>7$rm&6cUnoBfq(c=bMOxz +z`lic)R&LhEK0Pgy&vT4`MaMavy3RC`J*&EB0-Uh+2>tgtJ#>P7qYu3^q}Wx({))*m +z(*=OK__WoIZzkq$J7b^ +zE`cd%VmC#BAH(?&+d~85L4f8|xl4+JWY}ow0qi&!@@;BsQtyt4m<1GU4sIHi`l6mw +zGA^Hni-2a!q5OIIDog$9f$vX3$k@{eiZ?pVvGb^1x0E?9|#yb6_!Ik8~~p?8`Z-) +zI^@QXw0MZ|z|ZNBy~KV}D251~r`%U3gKi~zKJm^Y<|JZIAzDKJr#XKpkF!^w!Pl!i +z9-h9Zd1y6(gPwM$!X=5G#&eg8mn$Nt?QMk!e^(pRSFU|p_ddR(u3PiTCi9rP4>!wt +zwoWSm`~Ms%Yigcj=kfHnsrMgQ +z0%N7&f6y+JqS7a`&c=}H-V^1f&Cj_`u1+-h{#wM@A;+2)GkWIIVj#hFj!R!TG1`BB +zE-6JJ&2$%OnrMDKN_{7_ejbIcm)-fyA)=EH6dr`JblYYD`n3P_e;n$}Nkp9mwaT2~ +zwhX+DYl+@Nt-#?{oO}_GDd@IusQ%wYzwbw9J;eD$U`1!Q +zCG};47I#kOEo(ej&LjBb2DWyoD!;1v1&8E7cI6fxP-pyR3rIZ+I;U>W9qc6%gV+k6 +zd{d?76_K9iStmFz&CJXoH%~dfQ?fEVK~wD|e$laeN;WId&KFx-jT58Z?`B}_e$+`KaPWLW +z9l*>@c3ILWf8Ylq-jqt(aXOWM?=8rCsdhenj7{{H!um&vs!b_f^2(~>>{eRzf$t=+q^A?FL=^A<`dx-0iAqfuV4I-`WVIO +zZ#T)}@TMOoIp2|Z&}XRcC8~spJM*&`11Hik7~01UrjudZ345$UcCdA*9@HOJ5_FwU +zKJM#@ZelVVj9No=I>LPw_GxvEgz4VG^PSyoHLqsp2dyOThrKy9>tvlrEj4<>0JlI$ +zzc%436rFp5;DTY)0(1-pYCcr6eMp&;vn79=?~8njYKxu_KVTSv{@dss^8y|u^dnCX +z(4g}<{UX&?4dki<6rB@@{4t^0E`w$#f&shKZyZx`_OjZaqfZH-={YqQ5@Dt=31QFa +z0yw|3mvb)Dl5j(5I`$8rtF`))+5*-h_+7PH6j7amj^o7!OjOW86{#Anq*D{ql_M%% +zaNI<7HtMysKf_^6Xh7osWH>rIW2Gw;H&u?WfBLDSF2ZZ-WY8LhM6B@wO9B;&P6kI= +z2WXdgs7H-dWC+vuC4Qob`|a?*|4sA;t|8bt9Zff}J(OG}mS8c-FC +z)>Uvr7qlGBlk~DUGIzjKGZ+kl8)z;Ds2r+J7$iKHfaSdqok0eyje9kShM~Z2G?t__ +z9H!=i!n321)xwG?g +zlNT)gYt}BcVQ}7pM*#+JmrruocUb_iDlw=hWU8vAIn=bl=eJAm6mptg^0G~)F&fMM +zW3*(%TVTP^U7M-}y(D_VdO(;TFyf429;0fiwOzucLRz6Hzt*ddoSY`OSTI(ATFtJ>=~YI&)?vc#8ius#Me +zwaw5bavW~4o=6}qP_<{xpI*Iw(>&aNeXzAnaU6a=Si`E{v@o%`{pM(U551`#q7+W< +z8IT0Qc$Z4bZ=tL$s8p4*&`a@_-qZZ)dJ=XRiO^GZ*oevL5a& +zhzZ@-Ie|@o+R|5V`M2izCB)cImbf+bqYKB9C!D +zmP=(=mrKd{si5aJaf%b8&bTgTCpPuZ2Z!z9%S{tmrys_sR5~Kx9a{?vR&Nb81VtHR +z3)q1}vUj-RtS5+Ol`293dX2@d!~r*yYKN^3GF1@=D(6dI+?Q~8ptR%VLsy1?a1S7b +zC!;y0wrIymfv0Fpq^s+;7AlR}p;o@*Ca?h`DVjt>Yq3#Dta(X0Bq!BSmlMjRKKX2A +zFOpjQ&M3kEnEOs&BYhL@ecNdMD>oV)_|aL3XuC{Qs#4Jp$j1UJT-qwB%Q(U_UwdPN +zKqG%Y2haxb6)@mWC?Szl!Q@d@c6bsyKhqwZ*>?Df&irzEPcTRA(xx^CvmD=g^zHll*+v +z|B$or(_V-waMVhjv?^XqS$n;fVmIk8H)n-UXBFlC`8ip9@FyJ6;6FWZ(zESX&vp(P +z9F*1#n*FIA_Bq~{oiu`pddCO^kMi1WiT@GK`F*yBVE<1T?lyQIda=Z1@1i~c7YtjL +zs%-B)t59yJKN`a3KJzz11xD-otDpAw{&z#^^m_}CUo3mC^feUO+LN0SW~@1sb#xh4 +z*+D5b5xu2aFH7wyi~`AWV|ddcUlJNLd7?N)-*w!*DU3fRfyi-O0-crIjne%RfB1bA +z55orR!0^HXtwxWA2pxT(Q$D=ZKuu+KL`$^_5Yt!P1R4L5Ohxxh;=9pailcP0-GieT +zcEN-N7qhtCFu3%;W7#fVi=Cs@=0()HAj8eL)fx>@L*e8KgZKi1jQV&yMQk8UX1_E& +z)kmi!tr5@^JENUAevh|rC%A@Dn|OxWNgb>7K!c +zq^t*}kCr|02knI1C?k%${_Wg}mtXT;&p*66C;;QZ#O}V@gVQwPz|+HL`8ePxyx4lE +z9rxWvF!`=)Tq$W}sW{l;nt@L-4*9)Jb-3>K*z0r&_J94=={t0kFSniO>=OjQwse8u +z*Uzx-ZX!sqbpNd(vsTco)xsW{+0}py0=9>})=drFW)dBUF})ong&AOfQ|CaidfqgB +zV318)qNz(1sK8Ku;E#Yp7nd#Z2KmIP>UvyuykNa{182h+K|b74cqh<7%H<=?)#gjs +zWS(wr{rzxv^YEue<+x%e=`*V(kj3RXgs|c_|)L?0AwN +zM@~3nGNPwE%mE^{qfj3>N6OCf#bvu&DlGe +zcG$t2#QPplJocT4HL%Zh_6EYH*9^zlU!$EgtTQ0U@c?}~5j0?8`Gy@^hdKe&J@S>7 +z)0jY9*BY;5up>UJz~VL=)Jg3nd_V^fi8|>E!@&-?baT|R3aQd`-{asIehywZ$5z}& +zH69vRyp54j)HTHJpj}x8C=&PVl|jgGSSTAnhdTjsLw5V2>RWw(3NtNfwR0NxODGQF +zM^UFOMr*7~`dTGH#VBmV4zSe8s82@UFcS!09L0IfL*HZ!Btegy;n^8BAwHAKE;`(>S`-4L +z4(qv0b(5hGS2-GxPk!5FHqWOPdN8^=cmNL{gYYMZaRUaBdGRS$y>NqG6o(W!qg~kF +zfio2E1i4c^sHzNQ}3H +zeVj6KGMt9~#PLyo7!H9U47A@c(u;zF#Emz=RfF}!)fw+=8VI_sV_mGEuR0in*hL+z +z5@R7ixz4EDQ;(L^EY)*7S7n_ZhJqmt*qspBTwcTyW)O +zdEIywyGib`ilMPhwp|(gwHG7tVcIiiyAYfW$x{~k)eFw6u$Qzhf?kw#S^pMM^z?@4 +zR*lQ*_#HQuPRD|wu{xFGCgDtYjr27_9n3-a`v@8?T9__3Kb|E6j?7UppK1BwT(ny! +zx;&8)!W0eWBg4jP7;pj=NB}dO%Trq*i6J#(%OS#kzl8bIKY_q#m +z1|mwJJ4UgONN>P2{BYEJHHcH%4d|E;2Uoja(U4&9+a2226|{i;qk5_sw0$|G0LD_L +zx?$#AyKPoN?;8Fxke$H)TK>S+&$alIQ(nX@jT8c^VYi=~bOdR(beZD3TjDJ&Ck1+s +zRbln1)>?Qp4!^KJ{u(OPM$c6UAupyx!JG9l4;3-Oy5o{g70Hez%&e|kCH5j~4P@En1 +zL@W3gx(t{@O`sT2jC(z7<6yFa@{N|XSXhMA3FGP#@NpX>D`@;#E+Odc&4fn0Et}(#?jWySc$N)3KLZQ>neI +zJRzs+gYyvy;*k6RyVJG+QU6uAc~0V2Jh))mnWSseS=eGTq?v^ZKX7 +zHdmej7J%E^-Xdd!`ci#md{f1Cq#t8j$t>l%s&2>@MJch=^73%a{|JG7Yp4%P)um6m +zQas4K*@d&ra(!t9YF_ed6zT~Kq2cs8Fa+qX6Zi*?aD>{kT)~@pu1|;73wnH`5SfE> +z54N)|*PK~6JBLHs(wy!*+G^0=?F}@XI_m;`VL?w80wO!N`T03zX0T;Gr{;K0 +zagGm!CtLe!wZ3w>Ryd&=8HP`sHvxsVaA?saR(5mnvfhA7)EZ4o0@JZq1)Sch)63Bs%rV+C+qGUxi?6jKZ_C3 +z{(Aj(>767lEWo#Pqo4(cTYz}VuiPCXk`juc9kx0+B|)Wbj9#=(-BEuykV^59W^T!} +zqMvHRc>G5eQ5&V`y2!>-Krh&H +zqcd{MuR7#n-!@$vfQg~!Z%^D#1pT+G@7VOy%R7JiM4i@t_zn8>Ak~xCyGI8*Z)&S6 +z>gQD;NV5mwrFuN4E>k#XG0xP+v$bq+=9{OXZ`w@Xw3&)bl!PJs`c5HqMSq-22&r+R +z*C5H`u&aI|1q{*S=5mI@K7RlGv9VWyPmyLIENyZ5^PD=;UWq*S4O{!Kjt(1@+WrcR +z*Qhs$JDpl5j{7LKh`Z6Sb_SCY)-5IG7{DvLq&!H)#!kzaYE%grVX67<0S;=qX;XlHCPG +zdgg#p@qjJU5QBkBN47v)CvTAD+fDMbS`3G+MQK@8QPA)NrSbBK^3lnIlAO$>8U#Fm +z%H&5bXEFV)8=VITWy@A3_ci>QsM9zeo_1o4903gXStst}9cz@d5)E{X8{vRHP1+ic +zmiv)^ZXIzeP{4%aUPmCFOD}@67--|*6Ge=8i53=EY%!D5&%<(BMM3u3nPeE+1Wch+T7hW +zH=$W)GXbn)fpr(oX8tu1S^+6rt$5Vqs6}Fh3Wrm^h8_fL0Gf1ycuy^%FUZe@;}>^VxauEaeTZOCoAx;3_m@-KAXP+; +zuwSFtzAgYZ*xi3;>NfYUP^$K2ZI(^7mh{6G9FAMc&Li!pT2J7oS5jTA*4FrxZaCeX +zl4L1Ef*NBRscNl~6y-bBReD2qZ^mA}+N*8*WNp>;B?5Dat`5o66cOf(7p94a>=YrA +zY3@N_vUO}g2@F^@8(Y$euM`j@GlmCgK}uYFLyQ&8vELfMj5r38@}T +z7q!Q1T=}OOCsl%oy-q^2P3Qq2hHDLm*kwpg2SJPXfbxgSU{C{g_LGhq>Im96`g^Ox +zfkUAPD|Qbl>LN#NL}6+&jD{mwoS9v>`RZW*#lhxF+OAUH8kO<~`Shvc2a(n}54R3> +zULARb`O_3-pKTs(dL{9LTTa!wYJF|3GQ~}bam?!8C&PkB;8Z?~pXR1?>{?hp%fz6_ +zp7jsiQcsX#kg0_ZaJphbo8DA6>Wd4tYO~qwH>(oTltd0C8lL0QvFBh9!8GX$fo>*p +zqC1x5p0*tNybBv*7M-&XtOINJQIX1lbw%}J8Ow_6#K~GYps%e6w{FqiFX896%kMUn +zHei5JENK>&gEWc)7p!q)PjM_xe5C+KGC{RCQ5Lj9KQ-Zgb#rqm&vXmNxacNVGMfmxz|-6=G}jue|U +z2zs69RP)sL)%G=C`&iNj=R30YDCv#1M9NjsP#=E+bC4zj5z^bh6I|U}ol=-qCW35~ +zSElo?Dfy>xrYSk6^_+RIxwpIX^e#2S5#t$ZDJ@rYYHXNHFy6Z%k2S2m0ckf5BDoJG +z?A4Y0i;hd5#bDEbjOVa%nsPa8huQN6Orsv>$VVFvqC2)4EezId;fiK7nAy`TpJqLz +z`f{d4DJqwl^9ekQp8i~x#U`%b8EN39ud+?X2^U2g?tC`K$B#-+!{5+nV=0G<1cU!d +z3bJ`{*VJS4AfIwQ15Wsw)BtNJrUsY_)BuOsQiCyuz{y1*`q$R>SH6um_vK7eTljKzn(;mygI;ZJ +z{eAPrc1;A%pR^d?lq5kuoX+Ny2LKPDBoXYz>6Bhf2`o}iCo$>U6@z_JY|?7psKOqL +z0FS(1!U0-qKgK;W&w}3d(V0j*U=2N7c`y?Aqh>yph~m*IjLy*Q1bi<&aWZ|{sFw8F +z>%S+0Y&&YD=VpxGlpzBC2<^tabaGMp5-vkZN!<3yiL9i?M}u9er%! +zZxgVEGEI*yl>JMvg#hGY3#a5_i%$BF!xl3dcY!Squ<_V}m-sb(+2G-fmogr6NKs+@ +zEoT;g+(KV~MJ|{;T=LTMFe;VdKMk+a<8uetl?5p{MrtHHA_KhM;Co;*BrtNX#e)iI +zUBdrQHY#KtO&<0C=f$g6>~r|!Nrf$PpY0#I821J-#AUt&+rDe4Hy*yd-rIbMqCEPo +zos5Vlc7xo0Vqr4O;+ryMvH@;uQ0biN43P^-ZW6wJGM#8tplwb7Tl_1|yP@-HvqZo7 +zjdD@ZiCR|Yy-}^x_SKQ(+c-5O$kOZ-ummafBhFefoDF}53?nonfQ0`1aSuclh7@;&J`BzF5(D00Dwt+>2U4 +z2g9eBt57%rcZ>y|>6Gy(hp%#BmHg!x{{FJ~mvb98n%yXPx%E9vscf26$}!+16^L>5 +zm6E?$2vBRuRBCU@-J{>`GddycKFb`nw0U!>WH4yw3=jIKL7Pd&|yuCy`>!*s5e1#%JwgVu#Hk7nsZr>(Vm1iHJv#d6iHMsFK-mAe!rz1pW( +zxp-06nL_%&`LZi@{7KIP0ccm7wmO?PTcuo{Y3j>_o{0SJv%7Yz1K4E2OwDs-1R2&5 +zxFgE2Y=@_#Zv+=DE4Xl4b!KuIRg;p@;?GO9J_}QPj5lzNEL4YN(4K*QZo<$gP>4_r +z5M3q;2B^|ju*u?Pifml1Ci|E{AF@t`}8X%Y) +zooO#YLyr5sXmQ1OA7ZUq10cd-@w!_=3l1_o|K9Tj7qS`gEWrCnlD? +z^48yXw0~Oxg)oe)IaE+U;@nQOAI|3{HP)sl6T3J`94E3&z0+GKZ3Mv|ue7-6*)7CH +z&x*uF&+cAal-USA!2j~$k|oRrS-lg=vEfu(gm37kpO&d#sTf_{qU_2OVu{K01Z_T+ +z=bo^4{AD)zm?$Qe1&0nvVHRhhV{>-ZjVGmJi;fi}%j~19a2#iQE6RGmkU%K(HdehQ +zaX_)`?lZfPr&!0!Fj%(nnLhfgb~ah-bWEWKmML7Y26FSkn7MpFHq+FWlil)8d +zK$hIXCFLbgIkhRh`d)YPRA!1yLjrIE*n4@`cS(CMJ%@x7?~S}2ZtrD-AXwOU%$l*f +zdaFgc??!i>tXgixwGF%dX0O{YtQFqR4db}eL@QNkrt((=uRePHDC?v;K=#T8T +zOLNY~U^0K)kqXFRB%p#+gvQ>;`DGcuG$NW7l+up1=$vMo*uPB^ZPr^fp`X(P;ywKW +zskLnYls>`Kybn=((wtDc!LW59qD13OOx_92mYd%XTuzpYrH=VUChiOfHg_N3g!O41xX{G1KDu^gF&vC~Ep#==-Y%yx +zotg+_TKavseHSNVlHMb34C2xGg`wB5j7fxq20TYn?}F@vYs;lq^GQ+p1OT+l!P>v{?)1kTE_&ti(R$5!)NLm2wnS3iy$R`O=t=` +z3oVt+vlSv%GvgoE%!M-2wz@Zsns1!Y)-@1Jy&QOkUG)D4pNYU$xaY+(02 +z4h)KnYrn(1aiK++g*Wt9n)B{U#PglyjE3mw*En%*%NJ<3as~=&bpV&kHPnxMw*L|n +z)2%_AM;LPm!+_9-Vm!?P0VlVrV-vBNKBZ(cEssU{foBIn)T5rPA-BJp!ty?{SHmUO`=m-s%PXsE57r+(dMrs> +zl+;4cq&Xlpho>d6nz|-oha58xMJyI2JZx5ISdwm(oWu5bxmUipDt*WA8G@lWtH;0YrScQ>dO2BEMgkYkcgFhq}$ +ziFbNqCnCdez+>ine<#+yg03zo#DeE}Kkd`@zBGEao4N>#x?oC1Q}sH>pIuKDnsRyQH#Nk5|*bC87~x?V%=1o(Zxx8Y+jRM(B! +zo{+Dc(=bjxr&!XC)+Uy7XK{P?xq6Gi66l}#+9~i&Z(r`dJA4X90Z|Ah5zxo>O)uy| +z34k|ODPFS1DGf=GYPp{MV`{vF%Fh=KLz^;SjQ(3q16%R#$G-Icfr~ +zVOT%?Fq*GLtB=-a>+`635TO@zK!Od0ALo7?)1~tM)Bkz)`sFL&gDbXy?O-4c99#tb +zByQi_s%*;vp@g#a(XI;&XK5MVqvw)X(&n#h=Bm(&D_NL8TWMmaL{(EUhJi{z|AdYPr6u +z;@-r@aGwQXq~i7sJXf-MA$p?D24M&bgJ%crjIlq>CSZQE2`wW{rEOKyDmpr)fbDmd +zdaFM&%1Y7vqjlv3Mc5M>V+f3FHc5yMSmHBuSlL5CAl~)S1%8134TczB&qCP^hbR!@ +zYd#7eql0Py!x?pqeq*Z>63&eJrtp+#IQtw%2ioyb+B3HpydMH|$GlOi-BqLR*&l}b}9e=?(>6nsGG6T+-ao!t!29dq!kFJ-O +z>MKk0AL()VR_lH?vE-Ki`S@zHcCd4}MK5*wcW!DLkQv``l-3_rr$^BMcPUr^_^^%- +zJ@g3}L+`k6jP$$DjP~K`%E$QgzSl`S +zE+Yo2XJ+n;YZ^av*~y=L|vI_^pbR_c#x{rD;z^joEAacR=r?7qag +z@tD9{Ad~}LwwC&Q9$9m-Do)N;k@~>zn*4qa^PIF|^!fc+MOnJ~IVEqB%Lk*Yw+|nY +zRx-Y>&5y1oGpzZb)-;Uz3IZ{2tNQVQOPL8J;FQ#kwa52vJd6j>nYk~=gNdgB_0lP$ +zg!^MSm1)__)S8+17{y*|Fu5P@IO>84hK=eCi{HAgrrglqY0-ppu{$YOj=9CWhW^QCz2k1P1CX +zyi#$eEm9vAbiD;2H`qn-_{t$k(7^73T+gGEEno(r7@gCCp5*xPyYJMKxp#UR1N4;u +zIa-~7Zf?=t-zg3r3>EiY&sU2=fFdF9;$x%o_UYEM?H31!NAD^O?EvLi6fBh(FDWS9 +z(ykWZ*hjKEzIMb*Ky3XM0|r*DQ8}J{+Z6K`{UCuarJkcf&`VGPqD%w_6ko;|Wz}L{ +zKyH~ex-tCgvq2XsSXRd?$E)giH3JZ@Uf6#Go(UNcMQ0HB9F`8CwnG@P0VywNIjxT@ +z!?@YPOpTJn^5mPQU+W53hU3{fbf>(C$^pQcQt*xAGCsnz0Ejooq1{rwsnP@l1MVk;9=#_J0sE>D{-@hHlfsuox`JF +zY{?5cD56F)tV~g_ZbuaGa}<%Y-gYny7=5Ydg6@_xnhqh3iV +z0V%f*fG>%9j9m&9KXEP)HRC?a!Jv_cwT_Xa{cpDr}N?Z7dS+YgNk@ +zDL2uLK|kB59SJ?HE!y^8!wxIPY2-Z_gIx`w<-wqxrt7GZ1Vq2~vsPT3-cY7+CGjmF +zlCvAfVLNNas!zjv&0GpSl@m13&rHs+y>IV +zEfwL#A5e{uEXc=g;~AF$35k(i!pUy_T*6iGePx&yNs6H6+2V<>4W(QoO5>%e}u%58B?(EVWn#)KS +z1rj0LWo)0X7`nwuAW#&3r4?cg+bbJ@NUM9KoM$G=(F32@U08;BkywsDs`5CbR>wc6 +zGF6*1N?#1~s}8Q!hC_WCs;`vRfJY*NZmN;8;d&qSqTff+*^Sn1ca*|ppfR@r2NVrU +zkU|%KIWo%D-AlHsl<($A!x9y1UXCW4PSrk)xS21>C+=tvnk(+47o6iAgZ6o$`C^G* +z?6z2FuDdYH72AazJ@K4ExZEa`Vmd-ZBZr#YhK|Tep3#fqJnV%73Ab*JdayR@>|veU +z;g-koM{W9MkX +z)5#n$&-pG7fy-7SdlI# +z34P!jjPYBHk6}o5kssIVes~od72X+AAuJ4Il?=OHTsa&ZR0-eRd5UHU_*1f9ZS*F3 +z;1tf91C5hYWy-y{c{++ZK(w^w*UZ#g9(FQ+zr&P2j2`RJw8lwZ00xI?A=^qF^*|3* +z*^F>%gq$(P6cc=bn=cB>WNqRSHq!Iec!(Wv!Yc@fVgNu+Gv$31MmJ8h2WK$qjo&F9 +za16|Xk_kbjBV5hn0=n^Sd^YNuPG!(3zEC6gyyiQf#iS3U!#U(^>!PY34Mi!@z084@ +znmNrloN#o2(|0BXthR2p>#y+MLLN^(etc8$gU05y?JYQj=O_8cW2?wlbdn#xkxf%a +zF$gbT$@hst1CZ@@IkzD>Uwzm>f~Qj~WwgzgP204o)l1{|`Jni_Q6l99&}eZS!+yU} +zDQ~@crSKmj9u-dDBLF6Dsai`30k+w4mlT&paw-Mm9CDWftGxTH04QxD7PK2%P`l^! +zzfP?s3j_!kGe(gMfpVZ6H6Bc-9-CVuKU2GY5jJT +zMqrMJ`iXbiCH8U}_T6AAQif1UTs~bVfpD?_=;g#(nCX%4`cF3J0 +zj7c=JXBq1m;^34!F18cX3TFEK3>7Sp(&Xg)4+zJcJzhI{F@D75wA1K*zX@M?U&vB` +z{Cxb(MVwI2K11dd((IRsgJ_e)|740L+YAnA-uPOviP`rPMl)qt0C5?xH0V4h52#U4>^F54k0SBq8N1=%V5 +znTdp1^}y`eFr~Emzb)`@3p}&H?J7)0bVrYCMtkPSuEeiL3|`?rm9Szs=0V25XPtl+ +z$r}MVW^HznD?u9;`0g#Udbg2kS{DyALpm{D^xYvt?z%y1;vyu@kkG4veP@tHf@MI +z%6vDTNhyDzKB`%!+1siz8+<&StIRo6l9V5rOp#Jzx+#r{6t39&;+#zMQ?a+fQyjz6 +zKnl)edD$?W#`X&!0*y@a)RVWlcen$K$T^=);W#*_&=eEP*9X5i$hEm*%xGf@@Z7blM^)RI4@knolDSc`g_ +zeGb{{{9$#Rv_Qp}$5)0Tmrjr4Rl>g^w@wfeQvl*9Uw +zWecTHb;Is_6>A!jx1wQ8RQuoL1n3Y%@9Z}#ilhYxw~`L*guN`&)~HG_5UqPz(%rT2#HyrHD=-+124miNW;h6C}Zm^HFoZjlD!&LFz3 +zt-%aFQ0EwQ3?(qc47JdyxatNdpVmrtY>ZP2dP$Vhvm+_C?4pn-qinbF@5JU%*M)b1 +znVzkviu$Wsx?Xzzd`>kQ__VS#=V(vw9PaM_vVAbynp3ltprXESD183wU+D+lD*vds +z`H%Krzj`J4ow7fw%4S6^K#lNHQvhjBZ6JubtRlBl>{vv|vjufW6`KeB@X8wt^SKurY%QRU(EL6-;9+i6q{>)2?1y? +zj0_`N&)qUyvnthS^iDRJ>ceh2U#Fk*ZrnpRz3TLoesW|f)A4EgP(Ss--f7?1lYJ`R +z`t)0rOT>lJfB*flURs)N(9PRV+ndj}4-VC`U3%77b04<1gPk|(L4CD~X0wY(*V$|Z +zs0O_NXk<~arcTrvva9#(|Kx&L!~^I3&@)aVK58b&aIwIvp^~Zog87BUI!%CL +z5ncemYTTYUZV-by{UH|^O%SJG#@C`{*++VOAkY*MhS#1lIyGyn^XRY2H>}FrI#ry~Cg8yQ?b7Eq$3Yg3=Z!_rA=EsQ~ +zhaEdLN`lj<6Af?1k9b~*?707XF$Uk*f^TfWH@3jLe#(cpqPg0)`P3v=7x?#~xD#mWH$A&=dUiQd?w|@o@f&LeONy&N_g$|1_O2_?8g{qq5y9a2MkISqSyS)~ +zPv8Ej!I{<;tOHCE-_G#{PTBltO_*#{6fa4fkDQtowQtj}NpL=I_{l|y@&DV661v`m +z+6EY?C_%S;qJ#e9^o_kG(9df*d*KV!=4cory)faZ$dBvvjhzhV^G7y;6@!i*k4vv) +z{+`18ZSnj)4b_&+AMCET8r<8#y}O0!uK7D!oP{7iuhkJ-ZJmuUa#Gb>{v0+7_ot>)(8)BQKF>)cnhssGgd`&8l}#29V7KS^LR)EnR2`upaK +z?dIO*%WaC+jOHa$;+A#j)?tI^Sbu}Dj$Mx}X2uEs7Hyna$C2rOiulQ}ML9y%;~ci) +zUoNon*}y-mxKz8K-|uy9R6iUTN8on*Kt<##vESx1JF-`_n+!01-%#^sc@FQ1?Xq6; +zO$;1S+wuMBBYL<&9bNu@8eB%LXmlLhWWTtd5c(8oomXtyVDYB0ccOodqi7%s$GYf- +z2=VJ|lx*%2#{)Bg=2d(N%zV`5{gqlSX1@r7w5OQE`f=mVYiP$wx)!biPkQL9E+0PT +z!1(eo!uSJ|{s}0BE)$)hk1t3lan$^K0%N2=!zDlhbgp`SAo7T$~-_oIY!Kt2Tx +zMDl*!C~>Ic<5DglAlfLKZ~(EB%j41syCHP@m)C9MsgWfYsVJVuxjj@XKe!>c#X%yw +zXZ6N}dQi%9rA;L^*bkz1i0HaHU8W85-opI+y!r)Bi9ilEG-E-*E?^|c3;75Q(O|1* +z(@#H0Q4}Us29fGl75T09sAWQ|vyHxnsa+v*wB3K8tvLcgkEgsrQFwQ^L^rr0L4Xsa +z_a9-VF$@N+)J83oOHnv8VvvHfGi*I|5JT4^2OFOm@CE|a%3wH9ELqK_`%Fh65lAFD +zG9{}oLB$#>gR!8gArzGZrY#t>NvD%S7D6jAerhM|qFFA+a)X9qGR0P9I5+|vTNOt@ +zxUf){!>?{YSD3=!9EcRmfbi?Z=3qJP5nQ7Q+F@QY+pC@ +zMVZcIBYEm5JJap(_tiE>?P3XFG)TzPb{lc5lsQNZf*uAhB=1*|jg@9D&nUhZ?^lC! +z3c?0k8|@BRIRL|=tq3b@lvkz}sbT)<1ZtRbS`+?*&Ar{7r*~t+Z%3Y?`j?Y_jSZ7& +zA}>(amB0wm+Q3zW+c)ptv`04&w_j}@Y#!|&h{|4KwrWh)j?O5*0|vi28+T$i?!<1~ +zvh`!cV7dZj_i193AVGvNA?#5Mdd(7$myX2E(>HZ2>S-!FfJ^DS=k$OTAm%up^(-C% +zWgc6rzBw1NrB?LHVxr|bhR6S;HRVhLQ;RQy0u$(s#)e#CV-xS1(&XN)d;Lmb@lel4 +zS$BH^J^2Fi@u#B}?f~31&2VAoQx0$VQw6?JkqK19AG|-5bg2C0<QL^;M +zUxNijvW!3;YE5ApX4_Y273OBSdp^kRsO_Du#9IqK)yl|6?vNuwyRZJ;Fhm6EPekDk +zj}CV3BBFse>;yEQrcqKuXZc3OCQvawT=^LJ$8tj4mU6mvsU?@5`w2ux@F17kn6y8V +z3ChFWq0B>BIy`}Xd_KAOvrz}9^IwPk8AB=Df%mh2qZ(83J~DKFB&it7`N-tuF+S4N +zEZ>u*InMW7uIHBY$7|Xcp69F4BBh)@nvUrzT=e${lr9cgdxR?OPTUWBq?9aQuA<)R +z3ViR-N7Pc;@*MTnYMfEa{c4>UQe#YLM@cpXJ$If*mtn8&kqfC!vNkbm0j;2nmjQ+< +z%PCZ1%8c>92=aAqCUoa<-HQ>6a*|o~m6f4^$fDA6Lcx?ImJ$qLKR6GD{J~R!gMLd~ +zbzHsYaok2QS`3_w`Y2efy8*Q6CSkrdU&Dyu>wHafUp>bVf2e+abrH2L)aKJ246PdI +zFxYj2IFPWk)b{clhC}uNkW@n>Lr*;+wsGQkW +zFj{moK-hAK8fw|_pPBHU46sx@kA@Y{6kteU*vt~(sACLeEGsd&{1lhKtyYr?G%^1d +za~CG)aqyq-|5oV>yFa4|*B!bA{kp!F{>^Q?zM0SFhXek%=#M3FIkfO=+Og$TcT4-( +zW4%F6a#tmc%YO$=p2GE3&e#_mISO*FyNBrOQhqk%k4xy5#bw0qvnqjT69C(MgYk{j +zO8rrNsj9;BR-%^cOUMKFLZBQ^;PApc3i86Vp)(xAaX36l$-kMVBZ=Hj0~-!7lF?~0 +zjD{mptsvcvi?Gv2Pn2-(RnQ)cFN8r*kv)bJ_fVY%t@lYMNG_r?(%ra^8uI~0pbuKZ +za3C5W$WsGg)Zu6i;aoy874%p_VO47sR<&(>cHLWe152b)!F5uDf{VYtSzN5px@l6@ +zCbbhXEFRCkJw7fSAD@(u;qTq?+#>ueFP>MVPbj~EvrupvUxuvl(dH1>1V>#0>xL&2 +zMWLV2lm=_(Ruxv2UsGoEP}`;x+;C9XM08bx9x$n`ppUs>XgjtAFd6~5dCXK^F++oG +zLzqon%4wbbD=+F_-MFo|hq0%I$p(^+Mv2HriPK(CkZ02l%p(3XnlYXN8b%SO74#@3 +zeY?rJH1-6y2_1Rgi?4ceE=#n%gbLJ2J*dF^w=Qtn5l4}_MlH&T3@VUaGy_#H%Rg^b +z5f~rFm_e=7q4vrg^c#MWE(J&zkzwJ3b}+goK?r}VCl}BuZZ#@`IlX}Ih;m2*nw_>) +zO~F$-e}f!YC!I}`F~{B*`oFb>ocvZv-ZK0?BgBxy??^im>O2l}46Dfuw;Z8~8`wM` +zk;~>mBN+JKn+%y#`K8esjJ!;eeAoy)pwLYG4oz;g-0#nJcaQe>cPUYx8|_Yqr`l%Q +zeMULp=+$X^-}jnaAwD!pogQrQB{zekgaf&(rVP%8n{V$WW!QV!=yl!i`%nMp+3S}q +zgp%h5Y-{aNx9?_i?&##kX~Rvnf-Dx#c!_4C)RHcKYsBv56cBHeAPBWC(*p3NppLM= +zQT~9Ln?WZEl20|yZr;siohBX)fH;sT5-f<(^*quIJf6~94N!Bwil0QNp#a~M5kRP< +zHHi8YEXImDnsGvBbPHgPh&_X!Qqr7MSw=9&D~pvA +zyI*8045I5*eVE?ddE-O^zX*(KTw<*;Uu@xdw9^S&!xhaX!JhIQNdy#SK!Y$y;vU&# +z!C5>JQS#RQ?(X*15!oLe!rA6B8pJ)cqc!WQ>gv@=OsmVF7bO=&XjOl7c82sg>BjFv +z-?{Re@&^yToOfaR-*_ipx=GqM~L3?9}FgGITr3IltP*3Y0}o>oZMEFjs=#g0rx5m`DZyVuLyr!#p{Vc +zZvjz@k}^YGDyKjFGXuY5*Eej9@fA>Ck!luPEs+s;>N5$@)0#CY)R14ryjr$?-1%OTrM5E*cU6pFJDI +zVt9)M=b%(OY5~d9dfWFY5tFn~RzgP{)M`gFIj_9~&T +znRU^1SFd)qrnsCP4`3R*8atSGa9x|7p@x-M=ItdX4WSDn1fwCUs|^kO;$0Oia{ +z%p4KQ=`So|w8QZN`O}m|cuoT=wO=~bN?xKgv{K`Tik7sZQs)+;OEn<(7TS@c$`8;^CF&lGdb^|AH$d6| +z&pUvquCW2d{KH_yxLzzQ__C#Dk&oJ1SP=Vzo4Kl-j^fixJVpR0B%!^^P)EE)n;F-X +z!h(a*J|$5?oh>T3ZKIxqF;>Y<_cZPZeRSE{BPq@!jsTyo{W1+;J0Bs2y4Mw +zB|R9YA&dkZ0Pt4yfqq!WhaO4{;yxZoKB_o5Tb18609Qb$zxjRO4j@oGw)HWGT_Te3 +z4j8t77}^Qd6}N-IRn$XRgNvY_#O<32@JJkmGBMa(@U&zzZvpF!<~@SGhMVA}@bahT +zv;RfbjAG1<8^W_*jA6k6R%V!5H|Nq?VAjvC@S%UTy23-T;M2uTTF +zs|L^+l>KNThnpd9{CVl<9GDlU%ONzkFr;=J0rQN!$xt)=Di4zV>%KrNTtvn}%VnkjxeD +z+}J4rM94HvGv?L`2M`AO@N!%DGaLZKAl4`lMARl#df%>3*dz$w;df1b9~8ATwKvh> +z7bXY^H&G6lSY!y&!^lE~W~)EK-7gB(*UV`0>G=U*@|8aJCu(PNeN7qXMUbmt6MSlR +zL9S2C1`BeZ_5ep~r#l;qK+qOph;VyK>VQ#|{5j+23!n>+abWOadC5F2yGwzcXp#t! +zDO)Zz=M}>7s*Pme6m})NI@#L#amqn2*eG(ggdlIDkkedg3^FeKUnM&bU~pbLaPLH^D*o12Mpv}j_-$1`PMWE&IZ&hFq+yx@Pl^}ERJ?l_M`H7o(5o62Qa7owPz@P(!A+^yw=#aI1Aqt#r_lHEbw3c;c~+9 +zX@)eBe|lAW{ie#Y!L2Qlq@(mGM%R_-|n27&L0&pyD$Dk$VBRHkRAz8X?yNZ}l@dECy3t+H+@&W1FH}q-8RL +z`|ph2nt5N(@(x}Jn_1tuel36Vxoniv$1jX|;q4vH{!+4hiMPeQ$!;u7*<>5)O)oAM +zwCj6=DY+%P?`6T1@;DRAPTiiZX=eC@am9Pft$YZPJ?V$72<7^&NcToZSt15s +zi@&|g?wn(h!}v|~AbosN-rA~IhqCaV1F=#pavtwS`cA-$FKP65#kH`~lPX(vCxza3 +z*_l->RHe6S=3QPz_`Q?~a-lXn^qDwjLAyP!Bcu|tg}1QMwy<|;73+|AqPHn+wKI13 +z?z$%9m3yiMWgQ6JhPig`YSQaQl5WdlPYLlB*PLAJ4ms^&@G_P}C`EC&QPL{JM1nG3 +z^E+A6?B0Jk7yiw5;~Pu<-(kCvOD?{m3CCA7)vz?oC3GH3Na_tkH4od;yn@}m#XcbM +zenNF`)Nl}^Nqz#o>~wGoXvbGQtsk3VBHbYqJ`y#G3Y11}#oYOzr{M3>1xSjeMO7L7 +z0A@Ue+vB}liwvkhlGP}&}zPA2IJm9LPr=|<#MY4#7RER&znrk8T`>(jZ@8A`rl +z8qRGP;!e);=>!dIkSD3NSa&Mw!te*ZkTpllArAFI^wxh%&O={MLJd$CxfFJ_s;6f- +z#sZqgLRH)NK$$x*P%V?~uvvI{dXPE|=B@3#@bJOjOiIkgPy<@C^rVz)FV5iN5ox|{ +zwp#Ikbx2}$6nE9p0KnW-)lSe;yFsrNs-xhh0}Lp;4@K*EzGWS__Pq&f(c#r9D(ZJ6x3?6bw8$ySfX^jR0)SZTAgsou=$)0Odt&k@^U`;M^%{oe|C^E(dZ~gKN)wSC- +zmQql?q+`UvV`y~llU5Z_)hfFLz;b9=fxmbx)2cTjh_HS`Q0jmdHL>ak1E5!72Z7OI +zAoX`rUanm!RH4n6z-BD4W9-qQo{tq5ajoJl;uA5HX@1CX`5O<`A1!6%lym5t_ra5V +zDWzL4i%M|kHBywKX1Ol0j$D5Tcq?l~L%8Cj^Ij|>e7UQF_IuuX+YILrXhv{@He^N` +zgqWlSL9SdO)v|O%!t6RMkP>)VB>tHjVh|QVpPcsMA)VN(#Cm|hL9cgW_RWBNU%E*& +z?smt|vR{Pe6LVs=xx;_Lsb0mf8=&w+x8xa~zy9-;5VU$|3r;;F8DOqb(k=Povh +z42~gO_w+fHBZ!u328&~1iiXQ1FGTZ(IM3Cv}vw_ +zg#?ml&8x|p(!Gefug&t&KcH|J#sVqk7I0C-jmxNQV*}&yU^*^Dddv>eP>IrZd?Euf +zrfeSX;f$2vy~j@y@6fX-7}&>Cmu1Akb3pM@8^#!(!j_!??5_`y(r2K2cJ&hw*yb<5 +zUOz*MQ*#r244M9B%@`GGo9W{dVzMga<@5N2G@NR`RVWz8DVo3}!P$gsp)Uq)?tvU1 +z14w|=haV@|F5dChQe(tFXwxtl4kLbIM+=lf;-Gx_&*$>`;4;&L1I +zyl@C%;?s~z9tFlyOg&o^%U8@K+ATmQzb{{h_k1WM$y?1h>C9r*SF-h6s)JJsn) +zjCW4<^|WDgaps1~IQ>fB6IFP-k#EJjP{kLpjt5iG%!WP^95TCrSSkK=%?@nLQ`71} +zlMU=$kD~&1w!Hgn&H^8&(KOzJ>2&b2T*AEtvI%V(b7vkOx}eK`BOWX|)y{fGJ@RcO +z32;C`gC_eGJywN14BSTE3EWJ`ll9`Nqf{RaEfdMNBQ+?b^CK`eTNGpJ@QlMvqJ^|^ +z69S!a9g^7B@VcMeboE!)O$oYOX!gRZ!Za?L=yW#BYKqM|4NMbnP$B8+BJPB?u#+;p +z!0VqTvb^4RWa`llstF85OpZH<0-4WfA0G|!i%41$;ZXi~7_6}eZ|{?K$FuiRl>q{J-$63d +zy9|2~x|hR{_2=YqO-eNTQ9sl^n2swzD(mxVaSZH3<5BKAD`T*$VBUCv#;!XT`lxbew8JgdTS`qqGF^&=2s5KrT3L_5Eae#~)ISeSm7=(~t8|n)% +zZgMoNIPNTw*b-&L7?~R7xY^VrfD;F8gQtorqm75-c%+F{o-?u{yI1Y`on1a)uU{Vi +zOui>@rCkK%OXD;Qdy1u7Y`5Bp;SaB)Bkh;$7bN+Jf8;41-D;4taJfo{PP&@&u2Xp~ +z{xWI};v@#@{&SR!fNg~)_+H5PsQ+EYGm7iQ&?=3x)tcvFE1S`EK1MnuMB<3Qv(-Aq +zawH8qXUg4s6p+tE?LMp0P;70%7{Fq0IYcPz_J=pr983Vh_~EMasiLjUgaLW6_Zn>} +zi}!Ori)F1T#u@699mVF(8}V#-Uv|y_&fATbP1d<;-^^m+HuuP_7u^2ZG}~<0x{}ykXU>R)k^(weYuKl*Loie +zhe`N|d{s*Rh!&Zse58j`dQ>;DdSQLT$)swcCqNAxQ6i7|GqDvEVuFck3ss?MU<;9) +zJbY%Hq#$$T#=h;w?da@=gWYln7lfm&&I2-7@u!RepJ<;_u=dcaNkCB^B=W6m_nC6? +zl5&*?2aPf-vozVw*J7{|U5oyIy&VjLf0miYz0aJXLN9)_pCdU#nbIxG@9sQ3*gW{( +z=FT&<48?C<{^#w3!=3#-Rqh7A#e>g*aIpRJ4ucqkml5v6(?Rjw3PPG;YyPR7-rOyeng}}&+dcKd;SaKa5)H%pIS9Leol%RzISc2TS~!SS`-k2lHDF?; +znf^6erznoab)aw{0V8q$K>fQ2IFWSNX${19z(~+Jpx=fYv;Wfms{KAO{{v+-jMMNU +zxQx)h-&yYJkLfUF*oLaU+89}PDv+aFNYC^dBi})DMjQbrGF7Xgw`i2SEF0sH%7!Co +zh7}9EN3sDdE_xBj3wh4ch}_ef$GB_3%m2i{*IuZnK)7M^3t%k1|7~!(`nOXQ5de+; +z0i`JkUuX$2r3pT7wJZ=V&ac%>l{)ZvJ4`Sdh(L&dkxzzz1$g>KXQjwTm`3|#1|6LD +zVxm&cSwKz}j_iRCe6%svl9=2=majTxd91}$xRP_pnwc7H0I#QLEE9zNE?kJjerl8N +zZW!QR#i7gt?banSE2xJT57>EyM=9C?p6%{xr%$(7?9OWDRN?1!D(Xl!mUQv2EA;2+pK?Y8%(O#Fz*9)(BEo#)~6-HbMEiv?PgI;tl +zVOpazIynsi9fq*~_2UTrzLEDEpn=XY*x5ql{8-nYv}-!zipWo%_`<|Rh9?(skOb8> +zshUQ!$!%(yPk&opaWcsPRWF-ooz6=*ze1jBUP1E_7_yw?e`*#t&(N7^j^h=FM~FM1 +zzd8+e%waLuW;aPW77^k^iXr_aC&4?c>hLPoXIPx_`q!F<>H2TGItW{cml@<`A8E|x;}I5!-RM*a +zaPd6ps$9?tz`G6!>d3MN;~b3p?xB=Jy6<&-9eWx-W;ac5>l-J +zoSvDg-A?BVw+J1}#jj%SpLx888TFizbgzpTN!$RevLM9u7l|mzAu!<4Nv+18YrqLq +z(5o5gAXOc{6c2u|d4z*NRD^UUWxNV!E2!#|r2|M`c(utX8Qs=#iKGCCp~+7}I_aK` +zI@&6M!gf-zXPZZxz~!E^34((K643(=377Fkxx +zIaH-$H?s+wUZrd%w2~{fHndZt{&IDZ{jVJ^wh3iR$)ft3db?D6{BC}6(R`YJQb%^D +zga}<+f1YSt5BCn!Qt7^N6^BzEbnwFAhGnI7g9)?C$&f_98U&;NHPhEJZuPfm{AP-Om$Jy_d!rj~T6g +zI^USVvtBOPkp`Xn1>#t?3JT6NfzZM!dDvLSHxyN+EB=Udp916rS|H0YaA%bDRexNT +z6#Puwz;XFLF#srkp@=XcMHwOKpPxJ6#UQ`U#b?gN_#>GJW$VbR1m3j$sivahOJ;iE&s-AA1cxD0YFG4|nU=e0U#MwcpIS_MnG%sc +zef~_X9M>O>5r}4meG_k%P$kVsJTZLWygrvYH!FO5Yp#tL#F)FIL++YB+mVzseTT$A +zroBk|1c=R +z!ctaIPmFlk+mq|`xED~ELUaGbQ1HTh(j63x4bdLp%$+R8nf5L@lLdE{#lUBpH>-0u7|}Rm#`9M)`&~6A{Oi16nl*Qzj=k +zjjJ=Z`>c8JdaucM*xr<9uRFLqwE^9d(2IZlQK)pMOUfBoGE~M1UngAskj0f8Z1qhd +z-n$GiOlTW}S)rC+O^59aflvn>)6(?7wy43M|(%58UV7Pv!tq%kVX>o>1YV12daXs7&T^I6Oy=DqMNbbqd+HBSJ#`=rGey<@}21ojIpr&B;37%nTvs-SWx=L +zp&i=@OX35{^bQ)?1eUG|&=I)6b~tQ6LBu~%rmsC^lr&4e7xO7md^?qLPE5r$*rp!g +z;ING;;uQcC|34_I%=8?&UJ6KN0Z_D63Kc4u>L}2xoeqW_4(8DfulUZsr~QVphhGhV +z;$HD!NlOhRd)V+v3C(o1X?f1TsjVn{S6zq +z&@`3Ej!YfxZ_zc~84&yuc{#0hfh0wMN3~(xg2~rlw%)v=;_Z2z#X2jJ}?tYYrs9U957|C}%l6jn27djgxf~U#N(m_W9WYZ8B>s +zP}!&y)7q4+R6cqyEw5<&#>YCLrlyj(u{2J~AGWqWsak&!^@cT^fEs<*nNC~}*=J-I +zWJ{MsGXpS}1H31h3?cx68I3!a)W;@mp{`${8RKc2f_V~74MKE}7q$&er}W&BwJx}A +zagH-RrlhwMP|=+snSmud?Z8EvsKMUJpNwVX##|>01Y(TE#W-HMSvv$dJ)sI*IHVPl +z-dF_$Qcc@34&a!Oc!O4r-xY69o|#%zDJQ3EpE6@vJfHS3UC^Y(i{<0)8TWm?a)$?= +zu#3)k74VtiMVddgVDhPJYIV${nr)$4tjWp1{8_~t4E^L1(H#m7+m(R7M2-XU8%K^Q +zU`+(Qb5eLDr}VJV>v&TXP|Ol7b0zE;y|^|eBx{B5P%tD>lCch03<@rDi)|pt;5X*nt9V|qK5a#W9};q-eASV +z6FCdzBtW)n}>1qGh4 +z>e>b>shz;#?wE6Xd%u#8F2AsGoVk^CP(O$Jn_|gM9RCAVH1IRI6I_C$1Bt{jocT=Q +zwD?UQJ4e)vi|MCq+}MA~XqQryY%=QhVnJRtB`(iQxsX+MC0D8R9W37bY1Lhl#XBSM +z`bhKP6a#BBspJ|W(p8Jl?hdHmMSMk!C*){HC_W&iUUr>HkXX4bYjbla*fRyX+&!jL +z6p03EtwAT-GPyA<%Vk167%wyMH!l4BW@Yl$%IC_1#k!MQNr*m=Ga(C1q4b*}_}Z +zI;}F>c%Q&C?h~kv@lVs5hLKkuSwR?WD#2(NcTuiqi8wi8m0=JulKu`8A-yPe22dFe +zMpizm$A=9#JK@l}U}gd5jXsZQVM9&@3>Wh(?!P|Tz^F0sfiE!o5`Ss +zJ!m2pH7X~tHVB_;S1^#0Rys+kQ51&}r}KPCALvWwUc}^sGF*C@kM`!OqJV8SA4rOd +zw(Ob6)bn#NfX@i1TCT6ExHkbN{0!+dPX_vGnmY7lfiqVJVTS~UK!W;l5?$Y@^6Z@J +zf7^(c&SImsEq_QIlA06ph#80xhTj~HdT^rZ@PrdaBQu+br@j=R8`K31hbV^rM{+^g +zD|qhi#^{s>j$_Br^j6RhQHr(Mfs-6&1L}Eh!m{5dk)Aq%-TU`ZJY?5{fXsciU+nAW4oe7 +z8@fD8{CmCJ1$K@6U)4oQPvcSJK-H*G&F^wE2TpaLXI>qT96!>P0t^A@|glQ{>`o5Qe8o+k`1E-kD)>LEfi_&(unNg$V>N +z;sj_R4w?2^&{|j+43}U6;TyVDKvx1Si~&9v;l&WcvdS*cM?>@iBbK7Hmgp|ZBkQ~d +z(S?S%VKB8YIO9Nu#NXz6gB4Toh7{TV^ImiY;D}3@6{VI|%%Tw#k_?9(xoISGIrb64 +zQMYB7pyy*$DQ>Sgq4a5MQFmtwM(v=0QTt3yi~H)eOWLYpsbb~>2FFaic1g-NNjOVq +zVSv-;4bq(s(bT=n@TpVxUw3bnu;rXIy#~0!C&*qJr47Ce%5}sbJum3EtD0Bb>0IT= +zKM)VbhTt^(Lq@BDi_J|w>In`0C*i@VT7W^&q?-Hj`IqDWq%EPKY=cJ}Hl*(5IQSKp +zX~{udX!3>83@&K>H29puw@eb-U~O65m|}tZ#%HVqc$9oS6g@msjf_7i&UoYu#T|`;9ssZJT23`_&1Br2nML!j(NmwAs-OlAJHVQL +zuBQjitTJ?D{BVB7?FkO&Nt~<~vlcH@&C=()W-e~M*rq4WW^yu_$nOqTcxRqv5rl5YnEu*S*iLHGW~YsxqvN@nV5-z +zbI`jwZdGP1-Y(T1zRP@IHHo|8h{s*@q!*sXCVsN|r(bJ!K6`%LW?J4TeZvqZE1AXc +zCDQCE^*#NeVqvCSE|~iXwX?T#w6k}3w7IvnopV`X4YR^CeNFIe`*7=E=hYG35FD3u +zj^k3UQDwF~S?Ercv!o7p_Fn96tG)fb!=E+}wx3N|g|V9*pE>Malg*mOlS!}<+x`#j +z%xnMG8Vu=ST2vbcxH3_;3k{9B{k+4529v%0%2r^}@oe=L%xSLBQBToaQULh7p9-4Dmw!M$8&CLU +z94=b*FX4#gm~r51ZU^NgXBoaB&Ne6>D=NOWRY9ziVD92Og|A%bq6#@1qL_7B>?G33 +z1A^pME<3GO*e^H*tV#Fu<*s!4_*kT?CKfxr8Gqu!PgwE)NAf}$W63cDcpd@VHrWN$ +z^|iH9HAYel*~|@fZ~k=gfHA9VMvtm%){Oa2;zzTYx!H{E+){?xoyG(C<{U}mZKH%i +zV)2UJ`0v%D>WWe8GRDbbN3AWV!){x<2Db_fDI;iYbzO$9-^ZOHYb2bbrhUNX&V+;5 +z^&|#j=5|OGjf@M-tDV+=C534!P8#}ErS?p3q$J{a`4nSVdJoL%wb2OqY?n!?BV;G) +z)THQAOFJ;r!411xmsZfxzY59AvN!1)dL|nKnDs|tC_On%#TeO4&xszdW9_e0-muqI +zB1Cqlr+y6j>J>fY=ytvzb$ZqJLBD!Q$9*9Ad(mwKa +zLksdc8Vv9yj?VF-GT}GS#H#s@RtG(r(JP#YgVS*(N+^#&z0BL$B%IM5Z@|xq&UWT7 +z=)YLwgvm|;jvN=L(60)EVYfrUHDD2SCkWva9RqmaJ&T`!vOY258=yZT1xU7I0qg*~ +z5cZqoJzfJ*rfUJus{pr!7MZ@{1f1!zc&lTb8SSl?ZVl~dfOTYe?A(%l=28GpR|vn> +zb2V8su%4BU_Cbm}1hS^4nI2l5xlohPCVh#%(yq9(U>b1Iu9& +zMmh-QJ*9I`={U|~ZXqejI87P?$D@fZvOdRIxy3~{`DnK;tTxn_K2}0QORo=;)K;a% +zim&~!IaL?tlTh}QaZVAXO%tZM+R|P~*fc6$8(&RQi@oh-Iy+IMr#fXNCQo$YDtTyp +zeD%!|2WPy#0{r~V1hmd1>%W=zmAi)%y_?E{?iA`S-#o)cZ-tDz%MT(;0l= +z=<;5g=oU(>0&37( +zlY(x(LP?cYcs^#o9kvCpc5cmaAD_*_)(k=BZ^E4GMKYdR7@gcuKgw>0)1T_F?!Me% +zZ(BPHNVwmB{*RT;8#&xLNEoSivfU-v}ugQzQH8p +z+Da#)h%>%S{0iR(UHIh_JMM2CS1Hz%s$Fh*ziEta24THVmxC5U@Vx6rk(ajsAQgyK +z@*mdfvc(ITT8kT0w97LFdQRCXCFKLzXsMVLjM=&z^@a@t9baQ=#txLoKo%1|7XJ`W +z9UoyDq<1lHqgy$v!bs$!zl`FzQxg~H|Ku`2t4Tcs@&~CO3)zDth8!o^2>HJ-Ph|4W +zMqN=y4g};5lbWD$G1Z#(i)`{`#5}J8T>80e26`BT3v320%xS%!B@5 +zh_PQ`jUH83swsKD^X|pIS|xZknmGUJezP(GfYKj)E0yNqyU~D)cni&Y)Eb2mGYR!N +zq`(~^39one500>0U48e>VoAJpN=xMEHjy?Di_&SAHq=M7(O{2?j+F-1$nxr})Vk}4 +zE|Uu*4|H>B;WHnA1=xv0H0M}aoPr>%(-o!>bt@i0*^GwdidXn#)`KzLL96O;7@bpi +zZodt*#ZPyOyQm?YhM+Z119mPIyG@*vmkta{1~+eeZ0wZp?9mR`Ce~F*d7xd8sOXQY +zYe+YD(Smr9Q~>~ZzsHIH0LR?6gm)oEk75lWDL|@5=wDzp?==&CAr8gEvg6Pf +z@FbeYv$NYQyX4!VE(bYHMs6w8<$G)VN#cSHfj@+40T7|Di9X#OS<%qxtrXp(!c1TZ +zZ9~ZR&|(@6Q5He9qO6U${j7uJrAdhRcK4Z;=H%SCxSywj +z@U}=i10b)ruB)Gizg3rNrwhOQR{M47bn(=-SbTW8`j8v|ZSd*D_W(1-TK0T4(C-=? +zlLGp|GKGn6+S_kv&smvO7YiHe4zR#{Qkp=fOU@5$h&kIhu_Gy|YKdO*63 +zTb;*KDJY*-`YW))El-il5R`C+=vWW`uGivojCR^>ac~+>d3P$!G=XfVx(UMl?dq!i +zfeL-Y&N(M!()PCfOco-m2fupmb7^HLX?&_3>w5-|DlP_4OLz~n-eH^`G~iFJuIG02 +zl+qXUZ}#s+VkfwKY^g!5{){3s; +z9FWcC1DKLS<-r6whi~xGwHA&~LZ}ohP1E5n;GT&&hX!BAb6H&bt&6@}ZZ2x2GhI#t +zw^#0$>aVp*?V@y6{KK54kJzX5m|~hstuAr5XXinD$&#N+lMrZCqJ;l}bos~526cN{ +zY*FYsLZ8Mypw)$v^&)V~Bdl@;{}2s^rLpz1L=^QF<)AYQ^p^3Cyjl!&nzcI61I4W- +zKWl)TxqDq!|8{1V;QwKMF#GK3;l#xJA#Yx^Hna}ZW4CMa=+@8^bl!OxAiMzFlX2iD +z?Po61Vclg`VCBpTif)Zq?>9petrxs^dnd!jlHI7O+J*cm*K6fk`J!-^oU`jcF>A`x +z0eo;Z4Zf=rSA)m$XD++Fd%DJc$9?%q-L<8kI{im$h)IDL5yDBF$B}O@=P^Qjp;UE{ +zGb`bjD7>1NL0rnX$G?>P+d9udUoJ7wy6Lh|)x(wC%&p`jcXyBXnVjR@#Wmh-h!qbi +zrZ}pDYg7BEg9Rq;VId?4QbIfJ%hi1vNRCE%Dr +zj|;xjezGbT{qbiJ`F(+8>~w;3!qQI@WG1oL%l$Vs?Y@kt!cuBmc%7s3f3-10&ZsUH +zeb-Fv0byM;c?dHZsTzEOXgoSgZJKmbDVhqFEOQGQDVwekcH7n)#b@2f4EaPR^qAxn +zsM-6&j`x!XYX@ahvxn!X82Pu@RN%@IY$pBk&2aXUclLCcodmVXSulKlnK(eOs!DU~ +zpBoQM69!Fj$TzQEVpzaH3sy05mHHLkn%lvj`hnMbD +zc0Onh}c80B~uJ*DYNSs3cPMZwZFv$Gp6~!JC_+WPMxZM%_Q>cR(ubiv}G^?KS +zYlx>GdapB((`ObM=0?%Bqi;nq)!t(<>THotlsIFAk{raHPPp3JmVK!_TKlk6fPYnC +zF{@up>jf8`X8qAx<-9X88(Qge&Awk1e%Z?V$W!V1@WWPq`WWjzee70+U$!dzFg2e( +z_IjQ&&OVx@R)FwmUZ&r)X1hO&f0%|p-hxn@AX^lXAAt)stCBxGS)k3BE>xV>bitl; +zbn59~4)ctL^8G!$X;B-fivhfWwkvZW@OHb3${vu3WIE*|%$gJ|>Lp;6skFaDXX&A_ +z(RnDH@9e#B`}zXOfxlR?UFqLaxIGm_byS?*pxYrI*{U4?PLg{<8-+s&;NF{P#80oX +zT=N+17CCAjW0-UHl`h`W$#fhc$!(Eqo|BC_Td<+>AXMbLxaI2yCP*Ky{1d&~QXj;t +zU>D>ho8{iCB#2>?_b|)So?8)*gw`bU^*e!hRAjXA@KOzEuSP;-?Y~K=PhrG8GIJei +zZ3GEeL={OwVjPvkWp1U1ZpLLq6@qDX9$kkf{;b!9#8!eKw^$QGWcczdjO!^%5|xT9 +zgDAk4MJE;ISAhsrFqO4OxfK&1g-q0Iye0_+F%o3qCS=ilC0i}Ya=N}zKamprRL82H +ziUzW{v|F6xUc$pnat-&x5%TN{X(h-H>+qA^ejN +zn{Y|f_$Sw6>}OT7yWLgs8D`4!@m#@v`sw=X{lVrrQ?;H_zx~eloC?3IR_rp15W)>T +zGfTacq{Y&T_9V{G0E6}CM>=;#IaA?IfJ(bl?Rwh1TD3P1q%tR}A>VtC39>XDN(aX^ +z@9`y9Z$^(2-3@+7xFSrQ14zz+_v~4G3GC#p(Zytz!%;YBHe*jQxz+?4a2P{+o$FmoXns-)gn!e6f&lP!-2C&$TZYx8%H5(rJPRn|jkmW?v +zW_+KwCeG&9BmFs1wg2x3-ubR#Tt_jp(JJ|mPg5N=0*<)|Av?b5nKz^<*6fOlI +zZCDhSy-HIk**L0ZKj2n#72*ABG2}=Q%~T$`C)rqSmjSV^EteWG(!Yc~i~& +zk3u%sxD4?Q47wBpklds-XEF5ew2i8%vBye^>LwdK&eB5K^l{2MCa0UTl3B&bHhD%1 +zJ#8|Tc}S|Pec8@dW{|zV~ji+cBr;Da&ms)t{95MZwPNqT4&Uh^46K?AfNZZ;;24X$xu0L52G=GcIwK^{>X`@@Bb?wRp258k7QPy +z6?aXu+z(A^yqKSfW~hyww>w*n!=s%SyKmLj!Ry1_y`3Yv@0EM`7xX+F*Q7G-Ru?6s +zge0!LQF-~+AU=`NKp)kUb2ZqSLRtpe1^o10cOZ15lf*1Mzu#pkK3K!3L{kNFxDd2j +z4FKA7zHT>_PE$$wcAaQxlI(d8dfsE=Z*tE`A4^k^8QV8<^VfWBIbNeV~y6g>t0fPx3?rdotf(6j6J-#0e5$QN~O +z2}!m#`e(0RR$>0N2g^DS>)K59L#iDvl1}&AN4xJ-ACSIHp2E!HDE1xR>Gz}NI2y-% +z4AI?gr_b>AeYex=jG&DlR4Z%(Zyd&UX=&SDSbzOx(Y9J$?PONG2uFC;M(tK`BV(Fx +zB}Qb%Vs-?91crW0-rdz@7_|6Gl9~-TTjO)p3-E!M!%_pBwa4h(wH;oe%Ka!p=7gV& +zl|0PjV=t~yx6>TS12bSyJC23L4LDuh=t?YK4}sf*ew}H-5WZ*sz4(hv){jrN(Lx;^ +z$FobeGCOYOCY-wD1(;!?6_>bhSY)~^AvkiNyLeU^B>O*(4*CUh0 +z*f1nSNggE@(C#|tYB?=naik+o3x!3#Qk2xtIg4t|;@WVyiX|Wm@AGk7FOuVEdd;o8 +zSEb+7(sD_;#g$u`Onwq`kR~~unIxeFj6SU&qrXy>*c%hET(hhw^pd@xkb&#T$;nmx3{%aYZJYri +ze~bB88YF{Q5jH5xr59lzIN)M7jA~2k(if_Lp#@^?gQ}HOijbf(z)xp%hXg7T(J2@n +zW**8@EkRDNeX84;+}CA{DTlAiDd~`ZSw)guiBH&?hNgK@%OpgRq^h9K=j^nrsWJl* +z%g@QJ&q>E(!{mRBUJiisLSgE0y@>xlSf=j+4G#mR!LNeQre7fG`{$E5Upjr0x_|xb +z`)l|9+P%Ma^RL|`dj0cn-c*l&>gCIrJsacS;%ZI~dgASzRXBY?CrizEM`s9~3YAv( +zmY27d3{JbTx!kO>CNBMdLej)jy_=j#7WFeqnPfCp#>5GKsf0 +z^Zy0e63;eAvLu<)Xvmg?=RQ;%k}tz^xHRbZw +zZRP7_uzA+3f0LdG@XImna=T&6E+b6GI_6TuM&dGCgei^Nx +zqPT(WJ-2#x1AZCPKz893E+oncW)@6a_5uv!{yuaxhp6)2=KucOI5=wTAN+)j15%g( +z2R(|wh=pLu*o7#%b7(0HP~X8Yj3L|Ul9Sj@pY%4=pc{-Z7DQFkzNBiC?8aFFS|7~H +zn3YpQ7Sa@S*1;^L)5?T){DMw9-iY)dCpVTV>NV#K&2KKh!Bo*igZVXA+)A?l>0kCc +z1tXLB6h*8Jkvt2)5iD-FRVlCCkA|&bVd +zVfSsuIs$(mFf2m40{ZF5a4pK$Df&Ke!f6TdZ>F1SN)vd7lDE|Rk|jH*5ZkGSbLi~M +za!)m!=1{RxFzKU!sIVl#hb~h3@5Ji>^Rni!%}R=KWl|p`-$boXC(drseJ+YF?T_vA +z5_XflicKp1lt*lZn2vPMlNo9W+qReMOY}tiW`uKvY`JJ!Vo9U20lh!;qs1(zRvC44 +z;H(Kgux9PwxPY5748588Ele0x!u6InHZ4)M6knc~KgrH=UB;7h{Ta%HmP-Gxq?`7tJP&jzXI?k!q2MLr}G>H?G0@SqH>VK&Bh1EmOm8R6Zph{6vmEX&H`o*K=U_T8 +zw7P?o%nFsv0RftF-0R(Jlrji@hi{zaA`}?Oz6&MuPkzR8c~|!9Ti27)$=%L*R$6ra +zuehG^tfq^!!hz%3PN}P|#u~_JHk!@GRo6bi@nIqUIIdUT+kVg$Zz>rb7LSGiSEh9! +z_Xpz<4x!Z<)~n7qGv`ETnxcC($VL+Fs=>!G`_0=I%u?cVp!&8zDf3 +zX2YsX%u*?nP-KE4$r|`Xnk28n(=_3LL(yw73IA1Kp+4$Jgdt!-m|jaYyQE(uSeHV> +zwL5SNT%qXXJc>qel!C!PLb73H?Nhqd!BciVMk24w;c~A!(9}&dMlGxhV5>(Md$BVB +zvJd&EYJ7?H>4t+sL%5fk?}7_Kn=VL +zsb7k#O942fjWd?oRE3DIRE8nlY$Yr?42R>sM6<&|v0-`>F6L2agX|eU-OXWVK+|P= +zdLDeE)30-oDwz$2mVoQ95~4Q5DNMRpt9JUe(wXpC$=Nr&1yCm6Ocy98nx9!Nml~h8 +zpa>w44tFEqus2`vx~&EfkMxH{#K$|^S{Y^Y2>!pp$xvu-TkY*Pj@ABab^K~)Z%-Yc9PJ+J +z!T`GHTNcrq{-)dDs;f&3MCPoLLTFf_hUn1o?>xN&-O}h1Da}S4v_mKJ>M{ZvUE?B~ +z-gQE4=@!yq2;4{lx|BE;$JOy}I5z>Ebe&U>CP9FN$F{8<@7T6&bH}!g9qib)ZQHhO +zd;T$R?k?iu9_}J4`k}ijqMy2=vogOd0iEus=afV|YG=)2zxHa=n|On)6!2a+XzYAq +zS_g@T>{Bcs;VgJ`%<3Z!6y=gkL*&7N|MwR0_pw{x2vB;lf(avy7C)OJusGg{;n09e +zRq~e4oagnxu84`bb;@%pRTCv>hD07OrdSZ}%jYb7rn7GL;Keg|DyB5aad%89fG|kv +zv~LeI;tggdzA_b&$wVBIQf+xEO{8=cQ#uz#8YZ#m9m*{!zqi=C +zvOrD^!bM8oxvGxywU3gwxe^pDRV#nvXvA(&!K3@-RKmlL; +zY7YI)#RD1m4}7Y?_7%GYIiv#oK;P}IzL>CvEzzLZ_q9$ZY=GX|7f5`z?!(AZuJV0%?gC;#{yIL<=ON +zYNKDUwc~?mBA}Hm5@Ha#s}9Od>C8Ud6Un}B!aedb1g>JH;sH~@`!$uhq-=nN>#>R; +zb_z?UZ?ngRV`K#k3Vu5zr@)w?!#L=S{nkBNZ~zX(Co%)*!_$N3iTMS(%9?j~M~l}z +zbI62yomYL2lXs;a9#B#-0(*>{Ys>Z}@R;k%@#*cZJEZP+F!^;O`1vAAi$#h7wzj~G +zYkOVx%S>%ue@UDM%4#H1EIl4{A(vgT9RVAP^RFvO^Fx|Lhn|6Y&h&~5t%?Nfy{$xgjrgVWS}~L@QqA952u6M +z84NHXwtBI*z#@Z+#+@5u_hu2#-@wk41^Rq+x;3KFT_Tc3>btDFQDWR@0^m6-sb_$d0x=R0Vt$!eigqcQsO9dB6<$XxSp%!wAVi)IsMFO6c7H}5 +zsH<(K6h{b>0jW{$3kq2g$FJpO`9!XXYkk_-(5f;hg1lV6()E_SMD%~Y*7l#OjVKnN +z1Sd-jM1C`Xzz0$xTC$bEV+e#zm?pH|S!NUc_Q#JHh#P1*(0zh5!^ykS{?(LZ`S=K* +zXG3Zzylr{B^n*(D>;^cx5$@>9As{?0F86&!Y^7v&P{?3Ggt5P2P`)W(H3(8)BCEtZF^;J+En!9R890ROd5K&_K^>|A(#UKvOtheBS}BQdmoKNLHoSxRW_eeCpTu4o|=Q@gZ4&->Ot^EcgK(P>Z2t?%Og(()Rkk +zV@KV0It$bGh4VcB&l?^tkXOD*>)r$#BUAE-huLV}+PB!o)J<$R_eiS~JBSX(?U0-=R1v>SKU>^JKFQ!sDw4kx}YFv +z*0G`+BF&qBprw##;l6N9m(VBC+GH`rqF)nL-T$gjdE<%_CL8zX=22%|@aIr$!T=k_ +zN|YQFsD55uyA`B5Qy`(FZdkeq1$RS5kc+cfJP5jDWqh?kiYRH00lLILIJq#G2p(<& +z?F;btds0|8AO*S;#sWuyB*U^+CO?TOd{k%78mscjb`pg&{=$3HiY39_Jcd|Dt+TE1 +zk=*q&(i(QUrsTOfm{Y<`xI}La`g8hgGhD^QGve!AE0Z$EmCYm< +zkBNxu{0{>VFb1WZ@5=HkyT9UUs1cs2MVw)Gpk>QTB#herc`Wkmw^^+#8tEr3+xNA +z;{%BAm44xOt4acibD4H8rnz#Yr7lpXX^LMpGd{8*sOIejKco|n$WK@#9~St(tZ&`o +zFoMm*S3h;SFFJ3X7#~0UA*gb$6y>{ml2QDS?^9a!h$hOa`{TOZSgrX-UogBY$cE|Y +zWl`2Nnz$6&VvI4jq(4ItYRZE#G~$}R`V~Zxf>99XZZ2!sEFQTIo_uoF5Y_o)Qq&?- +z?gp~gvgZ_zSh!=@#1}T!ZV_^N&R(CgVzw|sK~yjwLxn*;_PF}|L0e4O%n$I0fXIq1 +zrU{WL(frH~)2O{oOIH-$V&k%YWgkWnn%g(&-%rJ_;W|K*0AZM@kxIL)@DCM@fW$X1 +zZcY?5_A|-dd4W}gnq?}6W|7*j-z7a(L)nxmE~2Qv?>v7DPJ1&2+zb7KCJj4*LbD(x +zp#U*COS#&cmlc(MxvFd3EF +zt%>te3$J1I2I?0ET1+~q^WWHB1Z0rfZYWd%+os{ESaQsSVbDYPpx+JR8s^f~^^g;1 +zCu-*mSu~#rLB5eszt5&E+H&1?h4Or&2L)i$E=BlvO`QuHOfMqM@*ae5hy>J}#+~ft +zO7yUOB3%FYD081xJ$oy}S|rG++L^w}+LbL^ILRfAQW5L|v0Oalh>`zTj&pQ`N1mF*d8)nmcVy`Zdd%_{~ +z9!fzAlPr3n9w-q)xvL8yK>CbrZJUE9caz3r)zZ!F`^RGkVBnku8??(Kx1*AUO>fB6 +zVZWgb^9Xok93piquC@wr63J0mqfvevW3UW6cBbaaE>^8vVubjmk3}-XLNRAN>-~G-tzRSwJJ2+Ov=g#0l`K)BNAcba$&6+NFn=6e3 +zo`GNiu1MpAxj|#azbozrR4Y899C3Vj`#%R(!dY|oPfO%){vLE$8mrr(2sWdC0jlgM +zNf4gez--(FIr=B!606QCE6i%w2`XpJqvWPF*O4l7hqVZ^XPG?T!7-cC4J0%<2Wgm3 +zPm$ooh4XB;A+6OkctMdx3svDniwVW|d8!IoiHev(%DG7IA03AJvK3;i>{P2eRw#sF +z-Ei1Pd=u-7AJP-Er_dbMJ;1;MuMZ8iw8|W>JH3dqFOgr^UI&7#UNf5XxAkldK0*t* +zN+jRsnk6P>VqQGHdI7uMJpDzqUKIgv-$&)azq<0c*S}~fJk2v*Z$2p{c@7qzARNTm +z)+}r$^V8WYoaH^bt)VCD?jIF3XY~?Bm#OIbk3CR_fBv6v<&YB$>mnjQsf*po5;@=2 +zpITxLJjOJ%K21pft065}A{F|UTgkEwaFHIUb-m^vjv?0B` +zxV0(ZI|HLtSN(Rd#e7JrAKNG=+MQBX=imJ${K(ZtuGq$CyyiM)y-4W3_L^uBhxFU% +zhd6v{kTi`>#f{j5(6fdVSZC;F^bLIrG?fU^ba*kc&LG)q+^DJ?eIXMB7t_fr7pBHC=1AGLs(97O)aZ;})p^}XwKG7eH8mOt{T9O&2QVRl=&uLy|fxxLWh(Ku;GtAaO}hWvm{!D^`s9AEZ=YT~Nx +z@VT&ajVMYL6eQ{y`WNg)82${sy%R;6&cCL6CFK}OxRexcEL;8Z%5;So>z4I27TvO_I3c)<7ab$^t#SyX>6r>jbtFGDXqks$3(q5oaD=!1**J47#@(|Rq?69Ua4X0 +zn*@Mp8!uL^9!YjI?R_3I;ZD;UtQ)uN^i+OQvznJ}B~P5Yo1NrD9b_elI`JF0JJUGm +zsaZvQRXKc3jMrFd(q?|wzx|v=`gNGw#+IRaHYRiC4SJhq{G?LkPVN%VZl7_yYxt4~ +zV|GW@4>T!o203Q>%+1{*w>AWnz9N&S_oA1{_+0Fnu%7Br;po#%6908QtKt2`KLALz +zlk`39Mu++K${F#di^0hT?fYHoHN2b9DYPHhDXM;(R=rJ;U_iBuoU%|}+}?zVQ5Lc% +zJN6quAjaUqOzF%0^9tR%`NqPeQz53cMwF>^LkYn&0->{OC`fXGf530GMqG(7$z?$t +zWy|Vl;mror=CrE5&X0xQM~Na$H|E^WgN8vOFlNWx6x4s}B`nO2jTh8Wqu2_iw@TSb +z1e9R$ohyo+{LVgL+y?HM*u#A|IA1u_%99k3+0#5dwUji^F34=D%ou=z@tZE;Iib;@ +zR*ye~QB9g0KT9oE`U2rn9)8nTjNJA#p(}3&lsiwzX-}MUi|Jl_b|g7$-GQ8ngSgib +z0Vbnr?YXK}N?a`w1mw$_+Ux&RV9&BA-O}YstzGQkI#mRsA#HY}o{2$dh&w#FEbFLVb +zaYS4afOeW=A-yc8+)r4=WDQi_6jcVsc%uy^HfT{^cJlIYaB=coVPZ5Ou0A`Dm}FL7 +zO3z*3`qF18(z+!Z*E$tHFU$>S@G2t)IIZ~;Cnl*ERjL7>Z8)@LoD5pk{Q)0{d3XG4 +z{hI5k&=(FN>!>3f!~O}Gr1p>-h%=zpzeVoTSYa-aE?AfniEdEq5L`)GzkHGhm=$V4 +z@4-NrlW7WEjmm_j()9rC7$UzIYJx;}MFOV!6yYe$Pozd0^+NGPq|W6|C{Y^m#Mjl= +z^||Lj_8VIycOyghb|PX{K^e%#Sfv*&)1dxT+<$>O>@~CN5kXm-Un^_XnMe3Vy?%lc +zv*@XFKl~Sgi#nPfmQr(b!)^Wctz5Y{UEPbs6(YpD^r4}3l=wDag{AWyWa;d?m*2h` +zwlV$?zjz^<7<8UE3Z@FPkXy@Zbbwt%D#7O@#Tq@n4dX!>- +z`sNNTeGj1|TiZlzs+_~BBl@8NSM@KREXX^u@y+J%lcPOit^mUen)pRx(0^6Evl`F! +zD{Uc%RR!zYu(*APR5Fi=F@sKV=$H6|;f%q~i>__rxH( +zO#j-T6Xg{yRFPrkP7mXRhEYJDcG>ao(?CK0xa3z%;CgBc_0S`qQCf1Mvf;)tlQBin +zed*O-tDw|?O03frW)_*JP)B^w%z5REx>f#&kzE#|jzC};L6=goN$2s~jOi)029~eu +zXg>Y|5T!GqXqEH^qrE35{jo^f*-;?}wY^^-ctyBdjN@epy^l$>RWvcIQD)+%L&*x-&645D5aJ|2BVVyF|TAo4f%T7fP<55G8>xJ +zXw9?o!QkPY8*ur{t5Z|$`#cJ;*B!gF#~*|*jX6i-c@P>do$CR5+r)v#y*tv()}Mu* +zV4?EOrAs^8*wo%w*e4Wa*3lY0WZGUH+D*X$Mw)NYNeU{LG2QdSVBUk$KcUXSQmDHh3qY~p%fX_mi_c`=;bg9g +zub&uf0_tftbjzFyZQCFl*yx$#;9J|aWI1&RIodRNN*tHvaFHycH;v;+cYq&2(#O(X +z9)+VbLEWC`sdap(NlKJuw&AOtzF~G%;YJO$QuKloSKp7FuGxhkUCJSp1;jw=8wkj{ +z9h|9TV>y{r(T#iIMBqZQd@Y;mf+!1o?pA1y-js;E#;;-M0!}T`f#GYv?`B3Mpz^JB +zHlVtRLB!d}57-ZDwKgHTl62zXJA7-4T!H3|$Nx?7MA;x&L#0In!0rTxcsgkq)EGI; +zktK7CO$SW*{jXM<4$_5hY`G$;=_wLJB^gB8=z;o#V*%zR{Uk*{z-qfv3<)gq@Tn!|fW<&ILky;L^INW4`;GWfq2rt+KmZgjq5Bo3S +z`0h}8P+yuBYnbejQvpIT?O8}F*x}g!_g4oF4129xxEIBCQE<}Qoh>)tBOGlSW6=->y-ZL; +z_Oi3N{GwIpwYO>5!C13MNmd@N-IEczwC;FhSioq`Ggy>P=iECS(VQTU%sttEC7*po +zdd**RJSbu28m+QrcW@mCnFv8j+aoLX1kdzKZl$aj6q>t#K%HyR&V<}>YCRz-Etplm +zyfY9hl0Ru=e(@1=FznqRbW)hCFH$XD)OH4!NB0x)4gwnPK4%{xeqi(j@vyetti_)@ +z@Gr$q#H#Dq*`X`D(Q=hbIUzki?C+f3xWVFLj=V~tXX{yBT;~}GlR80EDkucU`;%Ic +z1nyx88b2Jb!A2=IcxL6!mT;pP=vtRHIm0G+5B^pLy>ZqhMw(aa#5_xmDoVF~Lgtvvy&Z-m%9*lXfARXQHV +z$SFM>x`#C{VWWDYHA=woww{sOccH^QU{4O8Dedcixg$yp3g*5NW}s1kUoMHJ6i^>t +z?H0-z9m+~vWA$mTg4;O9Jz;WPN&)xwWR%Twn2DV5TSvg$<5wgxvs+}U$A+R~)`!FS +zN4OR4&R}D=f@}ZzPlgmsE3VEaO2P_u( +z>4Lgh7L=eyUU8{RP}{~hwso7kh2(vu7nffS@y&@k +zhT@IiJ)4lWH}2W^#zOpFx5O$hevm<$D>M>F{H6hXJ^=TXV62khYA|n35ne1aS7yin +zD1Io*rz9J`{Y&EIW+ws!h7Yt3Ig?#BeqPWta#SL}bl)PMQ=Lf2uQZd*%iz`B7*^7k +zNog`H;`wKZJoEPu3MHU5+P!9h+y&a(K-Zi_59F+I$()8<%B9sf=p#kKqbE*`0q^#= +zPx4ZmBxrkcj!ckaZF0ECf(5@O&TSUoyq*|0SUce~0W}3BOmWqxzm5Pv)@XE{@OgS5 +z4?~cO+3ZnRwq0c38v_}qtcqNBUORjlHnP)CRl +zI5-v7VmGRq8+Zrw&RjHx?%ll9YD44OxchkSTw!7)1t*FVH&wtaaqH$cCVX((hRfy`?65~E~ +zX=ksk%<$x8@BBcZ<_KL;5Qx!N`uKzMHm5A~2azovb_tgYwg|&hxIwAQu!-Hd{b6Jm +zog~db_bwK(2~o&8TA|gc)#<@=&h*QW9~?M;NPtSs&b39+!RYU7jkd`1 +zU#{IgkLTfw-2LZG19(nDSXl1jjK2z*tWxlvPc=@ijU) +zHD~=hZzh@0{Xl)~h3)du#22uWL%=ZSJZ#7Se`*rEX}*+U&d{4MEk`CuL{Y +z_KqI|=v{=n`wBt$t>pZ~J`29jz?zDpe&T4YSO5~#NM#fJ5BcroM4R|%r|_9Xq6F_b +znSJYvsZ@38r5|A5DE)&JN7lU_5{5H%9Fr&p4I% +z5l${KB|m`}vVCJ)orJA$3C-~KO6Z0Q1^qlX +zI1u}~5LQ{Xt`j#+$i$UXng6)@fys +zD)j1^f3U7(J(;IxXtpz^SR-@x7>pMO6!Lg|M~BB6ms~XnZ|CkZ1P+mYbNkDC#9qzM +zywC5ZBMPMk=%HHif5Nd}RM|aQ)b{#lSqk#FR9UVV5ex&)))t0`EjN=aEDE#AG{&4k_H#hq)xaGRp|60wy>3xcashg?V+hfM5&%CDGmDwwti5KC$B +zf`op|3ATpKTbp;XerP%s_)HZh)#A>A8ha)TqqEMndEEFeIp#cpa`z9L1b%=;WhBXp +zHta{F`HX?;kbyVN>}Dj-uXh9IaG0Jo!Fs06(*uh-`(z+<+eP5fM;drwntXk(FBR5S +zQi-y0bF9-|S9FcH{!0d+=g|~I&>i0P(10<9*_ie@(Zab28SQW5qq~%zM|m~%?$Ij9 +zV-;_>Fh(cHPm)$UF2rQ*IJSI0Q4?=&&$|>=7Fkl8GeFd4TU)s6^@7cfQ{)phfYE8|(UBwVhSV!HOdfaO!P${TvE5D&;>vnWeURtCC>{`|UGVG4=#?o(eI~ +ztsWH{KN_l45?hHw<7cY5>FZGJ#VE67T8w*2Z7&t38`jA036@BFfmdyrQDsJq!?N!+5Uwl|@Ft%Cf +z0j9B5oU1Gahkn48O@(E=#UWr1btUh^eXv4k6bA;#JuC_WzYWnF#_!x`wPQ%_&#jN~9p#MZxrOrsa@4PTy~*bU9tK<6IJU*( +z34E9ci8{u)fvm+=6GBgCj$P45!5DnW5fGG;GMD~uOBTZj4o;{8zi{(c{xNac{OVC? +zwSLqT9{fyGB<@K(vb2it!pTf=mbH=)nfyXCA9g!sf$E<+DPm9)j(l%7)k`^}mSXvNhFGzfNG;AgI^I=EH(bCQ0eajB7=I@#+ +zoQqJNS?Dn3Z|7UdikxflU#)cecR)4Hi!#;DJC7QfsEGMtvky?9Ee(#l9oYzxo-pn@ +z;z(d5{;*bzv6hI6idL>s%ko&m_izKF?L=P>bfWLw8|q1|vcSI;gXnvNZ|sGYzo*RJ +z8}QhHpQ$)95H=T<>?UHCZ+m?JjUT6Voc8tWr>RFbZJT}&t{FDE-wz$vPDH<*6o7R< +zDQXiJzVCCQvQ4ihMx-Hu-dcL4?WMT<28{0i{wbn}8L!x>E4#ly+Ez +z56OA~(6;7AbWIg(bq+ldy3JDcy|!*eXwBw6jRxZVDvvNZPn0ds`x3Sjme1jPb=(fQ +zX1)CXMz_r38~Z|ShUCKOSrz>07mRE{$qvu!%{+_aBQSJ@Z~giX=G*nNrd^R2S=IkJ +zda|7787`jB75wCXDzA}Wx=H_*9nruSZ=Rs+Pu$Xq@vKkZ+ulz}F<}^#qfZIVJPgMw +zd-ZF|ElZ4C^?t|eZPfOQK!!laW`4D@eLA?en@yVZRAB3!H@o>x!XgNOGSLMqp>|ej +zFQnl~?)z0u*Xl7u=twx{yvjkURt^-W_1ZovqI|yFXyj%f-!fguw+nUNuL+z0>qS%) +z?xRlvxqI}U^lh8{?ZLy62_zCC2q5Y)5>8+k5+Wxp&U1hW`-oI1^NDKaR<0#_Cp}rs +z{NP0us3zNqVO}@Xl!}cE8E-2RlPvc}c2F?OZ@WL{INL3}n8f-_gq_IwcHdM^8@?jR +z@dcQZGf&e$ZS8&=A1XsD#iHM-m~C;*pRvaf?uc`_gx(#AaxGaysZ?K#deU`cu;@Z7 +z+I~*h2_EfaBz^0ad9S=QEtl#hD&!#H_I+e%@zp3zn5kH{94Hy&hQNF{uj;!R@KZol +zWOxvIKk7Lg@V%TL?p6>016G1{A3Huez;qtPvcADm)Va7v%hfLt>M?yFbE&&d7ILsM +z!89pV^2R;0T{yGG3D16~Oh0n9uO$zUR&j7y*VH=!;G?ta+xznLzedq* +zF@(Q~1$x>~Bf%gK2IEFeYUujsOweMc?Pe93oq#`Exltn?W#dm~EPjVh1=8%+eQ@~^ +zs#(qJP}FI!J(?P~{M+z8ThFq +zz}5ABgFj7(Z?EZSh^2X%US?x=m<^LN8&S<4*BFk@Z++>e)-R5hFqx*Y)~7Y7%*h+f +zKE*uWw=#FK^C4P=(E31h)2vO36w~Osi$zZk4iC3VnHg#AjNe8cQ1AK4m&ah*0j7B; +z04zEMp&c9RiH&uSmSz_@BX)Z1**zX<0F9{cvsz#Ia{1)$T;e*`>z0_6AGeUw#18M< +zv4e+;3#~hS@<+D +zE*-2x$c+B5sx!;<-habnxhxFp#P_g<70e`o-6aR#nL7feJx5B0dZ0nJVFqZwYCv>^ +zGn_{}v)uL?%dg+ws6RDl7 +zG#6TyJ+JhZA56y6ne5Ox;23f2CLII3Th4Qpb&*%ZIhtok5T!`gt-}>e%e>NNyJSxF +z$XP_m6UjxsNXit%M*MKw6g)2%$b{Ei9F2v~`X$e1(ax7eN7{lb(WK@pPwN&^kv;-L +zTV$Q{N_ke?jh6&I)0M8CY%?agswgAhi;%~y_Z5{cHq1Ig_ul1LqK{yJ{y^tqSBKf2 +z_+X(SIo`$uUQQ+}2A(=Q1pb?7kQoWx-aX-WDU5`C-hlYtx|~Z +zN|(YJj_JaGa3%M$uXF#jzOKjCTdFTqpL;IzRywk(^_TfKl`Ui5Z{Frq_Y0f2%g)2U +zy(w3KQa|Ks*=||k&T`7-7Eow$THM;}N30(Ij+WY~k>;$d9&&T3zLfn&mDgX;^8hLa +zOp6v*EjUYd)3R!&*XUYZcUxax+TGY5do&Gw+g{M{ExGoIMlF~j+P|($`r5hO$Y*rf +zbnFJSiZy7iq9&VeBDQBm@Wu9?f|Ew?;fP6jkh8p1MTk)}7J(yzg)fMdoot0zlmsk& +z>)3Qz3``H4ygr(WUY3RXmSd@&i4W{kV(9@zvO^mAvXV}AHQ%3h+#ig{1H16+{`_Y7 +z+;6oI+?)3K2vMS;`x)>z^o7HhB +zfhlzWVV@1xceQ;&^;!^io5zC^MHp6FlLk0-Hykkc$d7a1UjkK=tP(Xs6o{Zp!@*nm +zxTzK%46HS3*a!U)dtsRUj&d+{QsV|9oT0FHe*)-NZgyxv1;Zt`jmmM+M5=S6EJSm7 +zs)t)))abCoDuG*F4wP`Nl(++W#;Q#PLY*s~hic3dInFQRM6urRz9Ynx-VO%5L@IpR +zfe=G_PeN*eRO5mrY}L5FF+%yYQlbQiXL}YRkOGq5dU<38YQ=~;viNMx%z)7)p6WpW +zE*U+XiP^1@_d>NLrI`klyV)ybpdj`IdnhrI^9voHkRswo1WpJGq7tKuAf{BK0{@p8 +z7Od@!=!wti4P~?TUQ?;T#3N>h7q@4X0iC%UN-U#R7(~!C78}+*7bBaK3)Kggd?1A5 +zkkp4l(MD93OqWG3H;F{lOjE+HT-XNrtb~DiiEJ&P9zbw%5w#*^ua$*G*z~6y=xE%z +zr@0?+Hw3Q6{42NFI6yNPf_uA5F=!V;z=9>vWBl?{bwqVow@B4kSkSsmDPRxP&L9OI +zE68Ez%Hh@NA*|{)WNP*o2)2>6%dnf_k3+>=Tv4(MF$7<)9GnObiDhpvxInb{4G2=i +z`Up&g@QS2)E((OiNgM|~=_ry$af@sV+9h`b+Fzc;2408Syb#}|V-B4P6>`e~3d?Y< +ziwJ4%uUy`54nF_k>X0mCx2hEgEQZGMLF|Wt--#F`9Fhel)=+KZ6$*K8IBatcuT9oi4-slDeCtYUmFp5{m_1D=veZ03n1!Hd{BCy~)*O47w2WsC<9 +zy@8%&5w8E41X0>c(A+gd(4v)tG_Vpi(kO$$3<@HQ;VNJRskKFvwfo}&^PN|x4W@6R +z8InAfkU2!HPD04;b2Sz6u?8fnU!GK(q*UgrC~^Gh>e+r9ae!b3-M1{w!K+&-oJZ}u +zC?~HTK=1|nEs$YV6w?&YY7LnUq)uLk!=%{&6V@fGa|gh6akuY$PfjjIpDSNOzb_fg +z_VUf((!lzSfG*aq73$D$zG4tb<`y~HW_}+}6gqlrYUghUDk?>sKa5ekc-O9wX3kNR +z2q`-;`MrgcU8)C?A1v}tnpz*#+Up`+>ZlN^L($8wE*AzSgQ+V%--~;`ZhueS7K=P`#CY +zUcptEN{lhf;p*u&fxXq%MWwEqnehuolb!SWpelr2U+v;w&ik#O+Mix4n^v~*TKZp4 +zpKGe%`byHOZ=#o&K#DnS^jE_}^}dLc>u@2xhPuBlb#4eRZ+1QHQMzi>YF0S@+#$9{`KY}Ii= +z#7B9Cz>z@J)!mIM9A8Z%aZ%vF7qteTr7L3EuiI~;TWY?*nu6Fzycw>-Xs53U;mEFv +zRa1ct5@G2k$C>x;r(4Z=qa&iUVK(y+!k5`4I}9tv;2Yb2tLG62IRJAQ5*cDltcu+s +zem%z7Uon5($uxy3%CCpsIZ`9kD9{Qx39!PWT{6X`17|yFgc;7BF##hU#8d^;I!83L +zwMT{(U89aoPUVEkVp&x7ZyPuV!S~^_;v`t1Vlg}4^O1u3Odgll!aPtjdehqg)A1mN +zGH$}CrMz`xw^q>Vi@O#H_#kXolb&h|XLA!9D%)R#PbA4m2<>a4j^vSJO-t4}9pAFv1+{8llghK)-kM(GHQs9p5kL +zKjZo&wD3u(f~vV_6@Hh1tKb8X!r(RhnWMb^$Vf$o_hJjw{*BQhG-W7)4z=O-c2nSH +zIAPP`#XL8*rq3Q&mc1}vPT~jFC02k>6vMr`KCb84Gg@LBu(Iyw{QK))++;HuVzQY? +zG6Jh;^VK6*coGdMiG4;a$Ev^0JsUlwjWOL#aJ{?(FjPsQ!atAf7b)}@{j1BXy}x#G +zFuBOKIfcyP2i-|Vb+?h8=pF~|qxo`u+z*y=hiKt@vJ%YeOhK7iqnUN5)Z}+Gv0A59 +z$Qni;1JjHAly|hN;M&acsjw4{kR_u +z*@Is_SbIk`FSJj45Acn>yDNc=>xOIOn^GKap4>#lV9!LfFX44iV*z;;@!` +zkH^<~pJ(GCX#F`6?xV<5@>n=TB;^Vvepk|+l9))Q*3m()R5;zrB%L7x0w+iuN#j3k +zVb7oFRktUmzS^9psFnivJO8}>DPdtbAq^ox4T#@Ako19rCeJg-FHaqM+5^m|`W`np +zJj6@g9!U^Vu29DIfBj#he&gH6U(#i; +z68pWzoXj|LTo*JbCJk~59r;d*ozKefmybRQ@63*+W|>M{tju1RS*eirB?4zkMYP;5d&VP5p!yGo-a +zmj<46+Ow(JeXM|8dJJ9Z8Iv{a^s(l!gzbqEs`F>0S9Ex6$XCWCvIBoPM~nor&@{kG +zg|JfAEze^qeER)`s4toPkIdyQ0Brxfith2rIZusScXHz1v7AIS#H41w-Ya+$lGw}y +z=w3|d()X(6e7=l7RT)e63K4xpg0H|Ab7a+ta?LlwWY2H)wUH@;VPcZR0p77ZHDn)5 +zPYb0!cadIATb!offNP6X2?ygBjD3QRCWukc7p}rRxBo$h3pQNPG1P3I;%rauMIa$k +z`<{6)HBXUuR%tw4M~jmq$g@{hVhyp$gj9!UO-BAoEZxSrj;(ayBAPTo@EIoOEcDc);oQS~h|Ci22G5qjCL0eAI_h3EnK>XZ +z$rVjwqC}&TNmuN(yw|+~sP{f7XQ%U0l(tuPTzbgq-_{Cj6Q3sp1PWf*P84+}pRz3o +zbbccLlcz<&VL^$=SNpJBwL?OrSdJFgJSF>;c+^rmgP-rcmg{{1SFScsi)aaW6C7T( +zSGxp}>7YwMaqoFP=ATj-MSPat4i%EjES?hm1WA15z3O)iE5u_wF3s?AEo?`bEZ +z;)I2^EzFTel8=VG(}^7%;gUEa{8AV4XMdnT)6&j`NKMq{t2`+YHGo-{B`ln50L~vK +zx`I#(CWcSE(@3|cZKdNV1wAMaNne-%7uz~NU!6Y&Sh-ctFaKtR`LI`4oqF#`Gkah( +zqhLMGnGIB$5%hYtH+SfuPv*?{g4GjS!q@*=-SZgVd|&&j>Kbuudt^g~d+|DPnEj&Z +zy(m9iuijO0tB_04siWhb%DS)%n@8v>2V+be%1O&FY`WPsEa +z&F5rx8xy*ThVk`@>yLI}= +z?J(%mU#BjWN+4|gZg#IebSd0(lY0fDa@ZafvV`@XiV{wDn?PP?8M+ABU7`Zh7+Xe# +zH)}a#J!v@%H05m*Z;xGco>-^ZErB5j#!L-n5rU>$zqXF84;?mqAgrKgt~OGk-F{Yl +z`RnQV3DGmMbd)tawz>tm3^3QV(9uJSOyO#4nu_WW=kqJ-LGoSzrUk|cWGsSXx!9&i4JNHS=L?8vA&u$j6Mr +zNN}<1F;^R2Wgwu~1v~Q9msA>Y)3yxrzl)p7K+zF};K=(+F<_jB@QspiH926u&`WSC8itMn2tPd%b#;(iM8{Vr%qX(gx1klz0^)f7VEkAbw +zxY$D%3~B>M^eT*hkiJvbBQpkbq1u;{iqeMysb7eyAur6Wm=T7J_PQY2o*2Z6lx7OV +z2Etb#WEWBx5N62_6gsSgx(;(RYXC-|!pw0(L7iCC;QB{Z)oL5ZVSt;%PLWQWnTscu +zMBog9kO#VYD6U(W>Gif7;)_XB+C +z4E8rqXK9j73NiMM;Y7)_$NTc(Xvtyc>>2&0ib_xb%f~M&uZ{Lx@3V)klf?f3k3ew02!ABSQ73~8 +z=a=N0tVAlgF=)WV`!QZr4Fpjtm6aj2fc8ekp@&8Okkr^D$6h*I-Z&i2vOgrZ6^sJT +zk}uubO-y=y+@SfPbII5U0VtFbUV`p9Y6e}WkoVh;&Wy~a3W>ov_J`y~-IiCt`)yii +zN4h$FNjjb-O6Cu}pL;;$oiy;>qw!`7ch*Ztm-35Ps1U!}3>)%8a(DN)Y_9zwxxgpe +zT>C?EpYJ-k_J`yiZSF&Fki#F6x_JaCn@4(V`#7e3owvQci%&Y6dkq2QM2ekJ+L0E_9(=kvK;XBcq0Z!AZhmAM +zjdY9bGZd2f!%H>eaDVzGcr5mZpKHeB{r1a5P6uXG6hi=!0{(T=%#fU4UOo@Ve0zCj +zIPOocL}Z&bW7)zpw6$d*pSUIf+Jl!zo39D{y_7_`qz +zI0ndhz4=c(r25m|6?{#=Z@5JH4iaBku`!Otiwf@2(<=U*7G +zs$3AAZEYNgcV8`&-zq5Zv9+PthgHAz@%KW4baP3$qO22{Dw((n)ZFbGVE@~W%r?#_ +z=nmUo6b3`eNVsvz8D`R3mR`?9lnQU9$tWkQY5gMZ1efqCx*g~M?-Sb5zQ{Eko{8|0 +zf1=>=%oIQvEb?NTGz2$W2mSXgt0efHx&E$-Mg1@Y)S>=l>lH$AKX^&7bltw*AW7BD +zWQZx{6`@H1!2UHxp2oQ3+5VrGhld*^ykRdQxFx|NNlIdMzKARl?lNm7bmUEf>@dab +zbr@2Ju=jASwE#B&A4hHKFsLXs=wV#0SS@hIT6N{|qW897pT%JI?&E;wK=BbDX3Q@| +z8^|KEY3U`~B9IxvyVywCyZuI7FEt0MGDy76nM_*0lGxj@3RSm1^LpxLx_u8H`~CVJ +z%_i(HZD{Wuiqk6tU{mwDq#}(0zA5TXdHGtv*+R{)zlNiSt>CXj9Zyk!t`4mm0GS2Z +zg@UMXg)O?B!Z;Qq>0U5E6ixAKV2?3Qqii@_*N@C|naFuO +zA4VTpl17Bt*H5tC*0JcaT0bGEn@n~pEm!+l6gV;W!Lp~H^>Y7>l|rpmpL~ZtFZ%C+ +z(IyG6rlW|kpxQV^Z=n^wHx=C^r^u_F&22a&ZV^dx3hnLg|1;4JB{@apA^6xSqLZ*x +zk<{Uykyim(6sE*s3b)e3cBPf{W%Y%TO6!IqVDo)C;G*|}7Li`ngd%UkdrZpRz2|J^ +zG*zDbo+Y%D9i6SLe#CK3UQgQB&S^%SJM>03S6*L~>GwoQcj!kTF}Ew7@AsxtCv`YY +z5nSt;i+cO%gXPmRK2{~R`s$B50orS`aReDUj>6ucONl|V3HX%USVSxh&apFCMne(S +zoL^DD92}xB<@i_i3m&Oo0dMfpt6Y|~iX{Ix7-CRf@$lIll-Wd*1-(%G$FhUSOmUsS +z3{A4m?^x&eaR(zk^V25@y16O|7SZoS5B`DS64g>^VHHx?H?O5Y-e^NjSd57D#l^ma +z%UA_m_>b(1^&0>preUbphg{w8qAsR{`JA~96jgT?GZP3 +z&XP02#ERSwpMg8IBwo0=tq03nscvGRd5Z42P8X9S=oFNcbWsh}PFbCVg~h8LDU1Wq +zeGeZMt%v*UqCc)i!;2rPg&B+?bOAm90yS_1;0$;eQ2!i@gM#8pSxvrX=%tDtck~r} +zs$IA_=U3}Bo470Vd{8Kyo}CuW148Kxl6a8@H~em~um$*iW#y52F$_a>9JNPRs4MgW +zHH2sh%W%mxt8#Jr$Xs4j@j}JQu~g;<+PwDQR;93t<35QRP(Be3$z3SZeE8s8Mo&dR +z^_`=B4qmFgsMTrTpzSpbKcPIZoS`#t8{-u;0q;i);y6@#Txxgh^EGNY%E5Px!Qphj +z$2T7v0)y!#d|SQotj5v74xnnrd8D_M*+rFr2Wx2qe3U;dv%G=D3iGG{vZ57#SUYD` +zq+ylHQeFGUFv|SGnij5$tE8!WZQVbx@vJTjppz=g*3bMV>y(Z!JM9r`J8Cx-$Zm9W^x%}07@ +zDz)6iIyovU%XXPfby@Ct^-2g~{e&o|v+4&0m;`#C(a1uttYi7Lt~V!Tys(5{KWf*; +z4kj^(%d-*?l&>udgk48G3rjvSZt&!;#p9}Ph#6nYgWfqHFbu%TYY6u`Y|#naf8J!X#T0~PJ27IYvY??TxKq9+WdklGbw@E_5 +z`oJIZm;dMrMSZgPr^{#53m)5{!5I!o!GKQgQP8_7Q$*@rf9a3OLl8d34np%fw;RUq +z*c%gD9}L;0zx0Rv9Zm=O +zaUbcni$00yKQG*WhNh>1zF7j)!8SYuzmxf%KqXD#t)eSwbwLIdRuxP|Z^)1myMkUo +zuA1R61Q4k;5E)b#{;25goWl>X$i=X=Btpw+DM4h}90N?^_?Lt0O;)y>ay2+HU9>%x +zpz|azr%mZtYXcdfLY9@=Y3|?)lg#RLgh*N^+r_Oq$ZuXhVR;zJn(xu?%Kr%k&%(zk +z8k+QmsLj2_S*}7a*zQ`9lNMKdziHiGU01aOp4oYrd7_H|qfy-bkSqj~-5=oBsp +z@ugI7JsVG}?3a}WlHQP~HIgo$Xei-DdDiw))udS;UZ*scC@f91!U0S4Y;6r#wgCfb +zwsc}*Rtb7>DrJ$bV_1x-H*=@YZwwkl*3&RI>Gqwm`fS7{-;~zgmEDyw8>DT8$o&}l +zK-M5lZd8fIWbU$q9-1-H5zUmvQ!Y!3!v1@pX-A%08}$a{NgKVFjXFK@HjUkBJz;_xF*wMa +z7I%AzCWSb`4*FzA@o3Q1j(m-`7JN|?2I_-6F0ri$o+KNcZbJveD&pYCBO%6za|)Hz +zimjY^B*moS5n5F&f0SoEJ&T1HX`66SVf+66UvbXeK!8d+#Et*L74-GnAq*{`K?_kclK&Q6dVzGiMjN1pVF)uk5 +zd|AdO7Rhm`Zb4&BazW(jqh~`WQYtn+Namu-O3qA~2yNousy=Blul6G&d()Ct7Kv-G +z>e}TaqcN|wDw{Ur69E}`u-X*kP1aj?ya9dVF%UyZ_QD$qDI# +z&)>W}+BrNpI&sRHG+W$NS1-Hj>b8iadp`9d@UHuf|?ZsIfbv@HE-Wz9zdjSTj&B!%xd?CJp9B8~!e*-@aj1w7s6vZvc@3z7Lmnan3_ +zBI~I_GJhm8_I1X7BI877I5119-RYY%W{H=47_$HkUo!=47GBu3D5> +zGFhy|I&!D_Gm&Y!bbcj@L}nAB)DD=nPi+nNYJa2(n4Z1gsbZ0{zi$6Y9qw{chdW(V +z)VRwDHSTml(&R3Cn%uU~*3T~qFaHE3%y$a!S!`#sEP73$)y=KFgRM=x6XeUudUJAs +zmn7!Nr=Llh<(!G1ekRl4lFdJC0W7|||Kb3$^`}$&HQW7y=uGEV#y(+k#>RT-4x(X|KEyQq<;>xyf8q>&`lmBIt&3kay79{MiWeeCJ?oRI80``Y3;27+b +z9fKWPKx}r(Vzc9{ApwB{0ec9+doJ)MjCaaO;~j6N8TLEnZ2O(OY8LM%67wpE6;HAX +zCp#w_w{gqaI#VxMQk&tGwHcmMM_d1ujrCvh5Kuq*)46Bf?(Dp!dxk!2#=-Od;SBz8 +zFSx_)-6Oi<@WY2=xvm9<<(FTCLOe(T`gTvh7FQAq&_9v|$nmZzLBA43o&y#<-rGEW +zrAwIvci|!Z^}+TIt-pNxL-pMO%b5Mdyb5}Z8L2K%H)uQIkAL&ay`S7eb6nh?9uzPD +zIE^9Ai>={b4^mGK4)z#0@yp9X7uB4FUryGElX>E2YbMaLgE|o3q(}Bow3MM1KFwB! +zUzfB=09#Q!{#KGPsXYuXCYr!38v}%?Mlj39E}@w0bap$K<)qQax-(jOea$0mgf)y`&>wP^Elg@8>>h0}9uA^7 +zv^M7FAse+z!Z|Q+6o<_!>XBV~WSfZxD9IQP#OFmzN!(nlw2%~JoINXv;Y67;Y&$IF +z(_)eHVRRL`Hb?I5{tMd{C6hQwN-pVgJdsZnrX9f3DcQWnWczG_%uqeM>6T*i# +z)UTawT{J^u8qWM9Z!L#(5?dVEqOQ%6O`T?SM8J9GLO4Gm%&=O{5bZlVx6w1#ux7kFeY?>%go#f2-B%ufG<``W=GxV@V5E +z*Qj>-g{pOgYde&nZtJYzfN4N!xPdCD*aw!sJ*4m@>klPVt==ZFD9f(0UR}cS)(@-G +z4P!C<^$`c?#3(~|NI3J&7MXVi){h>mL!zC?prOAJ*$9upx0)A9vZ@=C$Q^Vc#9ed* +zMjmc3zBNAgh|hLZzf@{J8nOEi4*bc6S>o`cDoPso{A=R?<23Z7YsR%_Q7@MD7Rfc) +zhnL+5<4@Jiuezp#5)@H_zp{;~o#;)~zT+c$Z#gX)X}3u-hJDCy#p5={EGpFOWFT43 +z<+syn4JT31qu5l1YPD9Nl_sx3o-DlRHCnYDMWeXxbs$B&HCuWJO+UQgC9}ql{yb=NiDg)JP4_ +zUkU8oHlHyUek?Vbnu1wK7YnfT(z^V+j;LT*4L~g_sqMvR4s$W(4%qr6b|%Aqg{w;l{HKex+LFN>N&m!&D(Iyc%S|gYxe+we +zznwc{cO&>36`#h=G|*YGoycV0#^Tu+OXm45c8X1DXh!$P_)OOkXKyTVa>)W?xN5QG +za>C@+oKKyrQ<-7VEQ5!O*+Zq}8*CMwseMq!1;2z3U);_V@Dg{Jw}39MMmBJzicDY(xCP(?wfr>!<7&E=~Qi-gv_CZ@ +z-0>Yl{H?k!u``I6<>WnHb5J{PyTJe0U98t3kY$bsR&QE>a!zP+zG?I;$zearlY3O=?B#*~n*H)v_j<{O}le +zO{};>DEO?q9--fW%eN;=SVG2a)mfUN-UlUQ4Sb5v>JRE4>&AUG?vv|pI5nAK7TL35 +zN;zZF3(3x-$zQN)q4wUec*H95_Iovcdj=7Yw>o-|*WZm^apM{$PDsu@byt(cgbcUFntbW=W7 +z6En>yk(#sLWTN}2OEAlT+y$A~TP?SN+pm-Zto)f=8k3P)5vS^{)*`b@ck($6*OE2v +z1{aCrnLBHnnF$Mbo&CfiBtc-(N+fIgtKr)BX(nl5N$M_wTxZ6^v_A(9`i)Uq#_$KGuGG;8HS40OGa7m<`W +zYhV5YRkR!cs6vu^d2ve%6GU)YC0&~u^)NDUVYPF5N^t-a!zy?JH7T8%yB!u(iR;;e +zt-xsFhrc~cUV*iT1<6}~sM47i1rpNe7K&yVNtnqDSZ$YA_7Z +zj|wRs$8bmM36;c|is$=bp;Ha3W%hf(O^svi&S0^u24OTn?=0lP>KtDthJ#@z=7$Rm +zAS}`O6bg`x?j;b8UMNdnQ4*k`<_f>B9U!Z#>xxSzCZXJCaZ_i&$WoLlXgPVhSPDq( +zV6zVk#Xz2$V|V;QZNkAJsZQeHh}cHn1hv*Q>HV{ui*&P73gKlH;TzFaha*5(cj3b( +z#(QGg@t%ST0IcB-EG{vl&v-U|b3=;SkFUz?qd$Lso4c +z99QDeO&7J&V+wk)PKC8wu|lz3xDBgFKBw&ptt+fQTR@R?t?6F2=k%c31v_bvddD)3 +zn=~rvM4y;f&mCocOfd~o>s_y|;G$F;$I*D$4AYI+^4ypX6EUx>Ji=D`V%M1CQHWI9 +z#H2txcE+%gse_(}8oo;6hUvk3P2GuMd!15GWmf4MSCGk!7Nh$0JJ3$Pm#vfUnIGox +zp?1=h%^TS2{+DG84{bEUOl*~6eMRaLh*1>q5?5`HnxdmINEx7h5M>7 +z&kb^))L?;KeEGP +z*&88`WNZe0y2zvDwsEA(dL1ZC$ehwG;+L!gd`gBChvqP$x>PL7+?QqUNFG1C4v#3KDOHxey$;tm*iXTScpSTZWU$N +zA%_BA%QAdgaAjRPRNxm${vhh}yV;FeSGBdx#sF1$#(*A2?BSbqS=$RkfLE*@SuFa-Z@X-88 +zJ}DZ>~WqM%2^Xb=vyKV53Y2rfE(@g~_Ti;f2`vBVk%m=U_`~e(D1Fs^r#O~-G5+Z4Bemq^}ujl4# +z>*MJfe{Fw!crn0s@dy4hw!g>tPe{Lca0t?UZ$dbBXYYSVPBk%qD1I-9`CABL=s}U7 +z94eLh^o8#c%3*5!ddRm7p9`2_31foYOK`qi367)0N^0tw7$#Tlo}oOE;l*05l)iuH +zIN&MqeOc$<1gH&f?}E6@l5fHWjLG5>@{QPt%^~_aE|pW4Mb1q@E;puL7B;9R`Dcf^ +zXM#f~qY>L{^w`r5#!j{np#7F2@s806sv^rc +z3;P)8lzr;p4hHX|PKzPH*$axU;fOTU0{Zqx{cCc^zfwW}8W@Iw1QhWi#vtu>IJ!=s +zGFfs#i_y{ENHMSi9}DAFSg(S3U4{$ftl15NVW}$O8G-aQbO9tj9`upmYrL$l@nxWL +z=^8I%D*OhT2%CDayskem1Sg)l`AiOe;g{d$)WWa)FU0_blts9JP8X#BUiigw){U=k +zdbsl+={vs+cRCD$>?LOCnK~xP$+XVWl27rgj +zEe_l6a0E +zsFEL(P_m(mB~<%gQkz>9Hcpio@t09Qf&&2%G46MMcX6MXy%=iA1(Y9>ClWS+5ic$o +z{xhy!l+x$+ht$Ef2i$32%l=>m+;buUhhrt85t3o)GfLP|dngE?zcXi*Pi7Ky{8V8kOFX|3Iv +z)ZltnX5#K10kNk2oYQow8Ti3*)!LG9zCR5+BeQK`i)?rkxBN($9BBqo2uJso;aT~S +zQvv`I0V!+bY)s51nd=g|0mh2-4|95b45OkcFD=+N9oEwOM8=QV9sLvy-@!JZ=X`1# +zP}W5_s*KQ+YK$M3VWr&-F3?||(+OU{!|XQ295cTF&Yo^JG$h2OWJ|)2zh~@7Zu{i(%DN5@#79+W{zP>jxdOBa>Ro6UG>z7l{B;c?L{gPG*e^)DFCwGoJ +zw;|yLXT?>XjJ9gzx*Aa>WVjYhCEho*_Suw^OqYMU@@;V|Z_@HKFt^8I{+f0{KT>2#~&A~A$Ik$CxFvb6w3gWJmslTu=sQmcI6V8 +z>W7>)?O|`qqsOH=S_L2<9TmPjjaEOCM4JJ@et2K@{4H;@&V_0l&Q{>%p7@+#;X%uF%*#{WLu@OxI%@0pFi6I6?X +zx&AXmi^dJpXco;hPdZe(OeV#mGiM1}^WUrcYfwT)d(O$HowZ(HU8ShWNM)wRM1wdO +zS(r-~N)oHgauJPK<4@*8t_c0p{WxWyPmNYt$t|^|zDEAiRe>*$hdn@vL +zEAo3Q^4#h(Tai0DwT=d^tDS35w<$o`I;ef3az&~-6y_AwUiZrJE*+C0y%}?%W$Qph +zw_QTQtQB69jzZH5n1I3Zf*$(d?+qGFV9ZAKRaT|LWC=T#uBO)YIcMbtuP~3*Ts9xf +zC+cnK1tj*|XgxR?$>E5Xtwb_;>GFK1@Z=dR=miH0lbFF#FS3Y6Cr-jMW(u>SnM8#Q +zER#`UQUkZgF?QMio+ze9`&PM3Zul*g*wqYLte%>CcA%wPol;$VMx|0#AZkIm>Dq@< +zI3_id8Fd@;s5R_yI<-cnZbz-TRr08{WSPm0+>u)2HvXo-j!E~F+C8OqPpRGe`?>e` +z^X2>dS)xr)y;Glz +zRrnlEeR9c%>##XCRzFC+8~fpGdSP;TkzAXlqXJq4p#z!15@^x98!8v2^97=UC<-^5 +za3mdJ^PPV@8g>Ti^$Qh8sE38mE#rY$>f+Nl62#)jo!%ViA*gL``d(XK@0Ac$F@e)V +z4R|3awlKUjYAd4N7qnplns3q*=)2HF(QBFTw+cqg0YK?pJv55VyIP0$YiVDFY)~Wm()yir6!!HPUZQdh?$gL< +z!c%Ai(Z~+_(fHzW-Ro=+#iNS&)8|Hro^poCuc9sZpX!HK+#p5C9N=3e>NOkFnj5JWLE~BoqFB4;*3S_}c3bsuBpz@z%0QLvLaOCkru*;Kq +zAq0cj`5;?5lLzv%bF1Ek_aSio`|>@WvmhgX;a5G`c#0@P!7G>Q3TC6`VR65glj`m} +zAP2XRd9{N+J(?pOTvycm5gKiqWV?g~%xM)Pac)9Kjz1$%Baq}EJM}Zs>jo6@8z-r{ +zs?`Q&Y&1VheRG*YQq%+p0X3k;Yvm +zSsLdXZ!~Z62ZAC6ISw^5BEwpy^9;)B^xsGC*oDOCs?!XOP948wv-TV+hohVQ0pJNd +z?jym-^m<9x!UDIuNb!|NfH<3@anQ9MA1J&s&MaoJo*3+jNY6}?A*SYl2JnkZ7@o6O +zQ-5fFCH4!{YC2;b(Bl9OSzO~PkTHk9(QHhT)Vbn9TthxSW_4UkcVyRI(Qy|3$zCd_ +zW+iGR0~#e%_SgAuFyjrSomuJ6JjX1K#}Z=1va>|U$5lsyK!$NmN5O;IW=mxzpS^H6g*Abt;Zh+~4Ei~R{C>nL8cHZgN;>(Xo!4;I` +zwIshaPUH1NXN@>OBX3sCw}xFnEL;scwAR+KLpQoGwzhq;|BDlfX({tqSZ}oX1sWo{ +z>Z36#0R&JDWks>bTd5wXjW>NDC`RKx%)NV4rZ{v5$IQpIgHAUlGkseJhs&CK@4~@I +zMT3wGbzRl8GO}L&(5@n}{ztP`9K;nVh!f4Tfnz2k1JS6wl`1Aku;0D7|i +zCcw_PiHxQRq$e5;JgP=8yx{9fnu`J6`Xdd?Uw>`nwHejK!)!8LRVu%aJK=~Q?Qq?n +zxK>n3agg@pX~<~|4v9Yx6ZuY>{=x1PlgMv?l>YFcOzij9Uze@fGafcvd&8%6#A37f +z518+&SX*)W<)>=-+w$sT_3Rl=baSh* +zyT5y~5D%L*?tmq1jn1IjT!a$Kt$vsOQQP4t9QIJ~fpM}&H-nI{S{yPDI*cM-cGM7W +zS+#3!0Q%Y5+&|dg-P+u19RGZLvh$h}IYKW6!`*zdcd}3$$HPU$s++HATn!!Yd4UI4 +zRy=(yqkh~0Minm{i8Osi(|LXTvT?L?jIBKnfiWWvHxPSwTrW0t7ikZ%V6w6pvASBV +z;;eD0)}EACVX+=P(yIlHAHR8ie6o-Z%Db4G%TaZ)%?d6=z@<``*>mV2rjN62A>*^!^Kqg-hNqi`!-wP +z>VS3zgUx0PM0S0Mo)X&Qep5Uom;tS>u9Uw~%d4y3!XF$G{s+ynUHrnU%^!Cf+k1z* +z(4FI~WvFoZYT5%`7dX-DS{yasg{WZXF1HgQyN(400TyDlJRgSJWTSL^fYaUF`sdDx +z=%;0sq7Gpz(NYTy-4?ks6MYp?Yh%!EaBs@JoRs+w8rBfZi~K@5HVTEbK##wn1$y$t +zS)j}S*Y!eWyYc*ZTP)}m{7U|OvH9b{5hfPQLUZ5ZFmC})XN`o?eO$>ha4%-KIelga +z+lJm~>o8~MK9X?bd~>p3 +zM1=@5HUHPi)?p%LM|Q;~pV}CUwKvvLf8s+YH1+YGWUqs+`}3-sA%TiaXEdU|bF +zzN6Kh_ujKIpPPWX`nLLn$#Hktv2x1WH#5Im(cp$%KP_x6s@3nldtAnUpU}Tg>ECbY +z-*4&P@5%~>ze4}6(!XoO@WIC;`uSL?7sD_FCb2!bLUo`Qc(n!0{OavH)W*b;o)7qezHK#D9z$viWGgBzsDYCtCd>pB{C&QbNGGorx~ivl^? +z<1V0*PP@~jwwcN9Mo4tV%$ES$gO3XAGbRp)@5w&e%mXOViy@q5__STM^n<}AFtlun +z2`maZjyb0{*7le=WhktE+C6y%NK0+*|Ezx6JUZIkKlz!sEPipow^5$oNcOuMTy5B= +zAYixOhuj-7>m4Wq3pNb;BMJ)sdgo~C6*Rf|e0Oj6}?*Y!#78V2gf@!!)M2Ezasfgz#^IibrVnY!Lp-ZQ1^n1K3M+oaP#DqS9tL5 +z0`@Q9!o>yoUaUPs`egIv4i|wFq)YH;vVa^ZUC93Q3VLc^byY?G&b>yX*@7Qi+c-A3 +zo{N9{@A0dKupi6SkHrPdXdLgrdTgE?94+#rMC-w_4*XNM0aFoQ5slx7FB{vNCz~=H +zowkS$3o1SJ^zmb_D3Z2Eo3ArUd&Q2oj&=`EGE2z_v`2L;qLXkOa0`x%r#s9P2yK|u +z21>o5*#5!M>&?A}o!t6^WuRRW2?xg~eu`9kv!AM%Ov0*(G-gjx4WdglEW7fD)kI#( +zO~>E3kpY_ayBVAUS=+nEC!|1su!**)PrK6CSQ*A4 +zqd-z*?*N&+*Nqy;zrC}+wYvjr$GzA&0J!wt2_&L?o!TV1(_&(P@|pOFL)N-Cjb3mAs1s6|^PsW>0nYEEovk-;n1Mw&**to=bAmJk +z45R`)_;?tjqGc2LN9T9zeaHEQlfE4F+zOq3JMwjY`(<2a1>l1z{t-g|KvS3>!Z||PKtpKo(0wT)vldupefxXz=JKmuJ_NU224KbUCzbFg9 +zlT+aX6ZjW>zBxI-gFy-MEy?BxJ+r?g3omJ%As6=MPyeKppZ*CyELVzY_7`MrZDG>Z +z7Jb4XUmtAmaEkoE43dITDt%$n;UWD#Jmep?gnVQ2&oAjh{fW}`55(L%FQ_d3rJtgr +z@{GSAX=m%z0Vd#I`Ptag35_kCv~QC3b<&ARI>DruM>{l7`oM&@JFxqdLSN7DKHYK_ +z$NqX|uUfg^pSi!CY8avc +z#F8p68L0~TSfo?A=)v><(fRnvi8@7oqIgeI@RJjry|BM9%L?5n&;Il?8*jD}`H+G| +z2w3*^>9fHjfxr0k#2xR69WfpyL>ic`zbV;0P4*XLK}7*C{(>YSN-@pSr}EW!{s!Ul +z;ONB3wuw$b3jE=e!QW0c0?7VLw*aR&MF7<#8<8ZZkPyReAxWY_E_KXh+!QDR%nK|Z +zX7Lv!X(j>_9fpG6tS}8fFacql67U0A2s;)#27Cw_H5h5>ZP@d}b>e+ARJJ*_N?;CZCXqgiwP; +zpqSzO6ms7o^NIR5W3|6@mW)(?>*UB5k4#xRO6RAQPsup#FUo31CY?S#{*Kf2FUT@n +z>NEc0B%Gm5mS32KL^r;{>b|`MD8Q0v%;7IgVr42y<4;J8(6Y*%gqMK)u~}`i(AnG{ +z7s<+jDzOEx*uYnO84SagI}1Mri`>Md-yzxNmto^P_DwiDv+3?{n=Kn}f7z_atrj_T +zEC6^34z1KUI7Cto5k5>j>|FF!KdQj#MRkLIvl9y8NxX?BF_->dmfUiJ)N&c%W!+(T +zfT6<9kpkU(O?Z%B7gd4|f3RFVe)9q@l$~SXm@|3Rb(O>2PUBRC6Z9EG4Eyj5AJyOo +zSugy9?9oZfjBO%Hnbk^4_+yleFBOZBxU^^zplVCTqeU@`C{W2=g4Lesmf2KTK&U{O^ndhb&hnTul1}=Bte9?Xf;pq1@}t!4K0{i<1Ogb3nw!qk1Xb +zB_J!jEcvP|Vkzgk^kV-M2cm1ETJ;T5d54dJ1&sm%um<#Yy&!h$#er+)_u;qdQtiWs +z(pkY=dZZX^7b78rTZF5j*n(C{cyDLUuU0I!O9gwx@){~|LxtRh!iEa=0>({u_tV=w +zZ>!9^z~Y^k`qm4^fH&Kk=rGPRPg~vtjm8%`*0df>(Xbt#G5LIvA1x*}VL~_2n3Q3g +zEsl}HPk%iQOfl|@ftPu&yolI5a)_3Y{6=Yr2O37iR!yOeSR3O@pfvM77ZRtepV4ZrydIy2|#gf +z?S3=_tXnjf+Xh^2?Rv4ernh|5h{Ld7??;@#e1>*A@l1d*u34(SRy*UO8q&2GTOeHC +zkFvm=ffrVai~x$lN>NF!Wnk87{OKH&;a3aZEsN#=GJH}X)2V#>%S;NoA3(?U6e0ea +zT-=nkXl(&6Fd5Gz@&V@UG-*gqw47vL4#fbC)?nUCb)ZNMAF%WeexW8YO=m;7d0E_n +zvq*X&XqozvzfO7M^p?ij9B|_}ZF}<+aae`qwd%Y^C4SrM(tEAJa8e`qUpTBJa_apquqb1Q&?9GyY8C|Fo7Mu46tQtwKf^h8GN+d$ +zf;$?Zg;?vz(dD0p7^Vyhodg#jti0u?e=cG;3bdUgis6@HaphN7IyC%n&oBpoK^O@O_hM&>K05n&^>S6V~wieKWNki +z5x)^SotWB|KAj&eSatP!@ +zUrvY|{RC$qW?E+ZxdRQQg3#C17N7YoKJv}~?3up@G6%>U2;0hqFlm{DJ6jq|wvu4t +zCv0VaNfJ)*7I;Z8VYW#Gcr7io^8|$CrH&gT)zO6L&g5KBFO?4DzjTJd$jFzR5qw&) +z8R0j$v#6SSdBlH?e|`=BlFluwO>qm*>AL7bnS0-neiav_&|(cWWamU#7qyrN#_5#a +zcOmK}5zb-p>>20D@AgiJFG?O}uZFT@{y +zD;Ay6);@eFoEi2-CB(2ZwB=8}_8}=~cAK{(uXplfHaZSjr6nmwa9A~xLo-e906MNf +zy%CZutX$)GJ>>8*gYRgWa6Q%yODZodK|qVa8kcZa&y}lc(DF-p*Ecp(DkU#lXLWEb +zS~YJyQn;(-;U-#3JqM_a<9C+LYXZP&pelo-bOVXeC%JsKq;sCEq!}~T=?$dG7z71- +z9;F>!0(q?gIa0~$Bcrt6n@h+1MN}F2XK_cU>p6qeuAQb7OD=tqPqO=&$1yqg4my2n +zNPl(oz{^KgkD%a{^~+5drBm4LZOTTlo^Q}wCk=q0Cn@VmHD%HypmN3>ErTL3uO^6& +z*0Ys{y)yjNLedP`_uS`@B=gFAIxRu+LB%=lJWJ`(j3{F?q%>^{_$t)46zUe)Qoath +z^X{;&GS!=HJMN0(lSDSqc%wlJAGcquY8sSX%huku-O?Sg{vcluB%wTtFGZOepax3Q +zb|sVQ`03bZy%I}HXL?%^Enxm)$>pN>eo2h4v9teUoeE<@-PSCe>5=)8Pm=9-n(Oun +z(M_==k4@E7k9mA|tObymsW{Z3udu^UeY$ock3_Ob0jJaJGoCL!=;((73QIR)ewOu6%0@K6347Jz#nk_DBN-Y9_vYLpxa79 +z*?L;AK5-jTrExm$-lW@;jY&K^tgFm7h~(o0HlJ~1Rfb*wRvon3>&i1ikyJhZ0o+7` +zIFTLeT#Ki%-@J$8q$vx7w4b=1Ywtq(bce4F_J2lJDE;cktiSM6=(B@|!*{UKo5_zR +zIQ@wyFZIGhd>++Jh!o5oe)5sZdOxCWg&^Su-ggwAE;>_uu;@~2M@m-JcrCG;!eSoh +zI3;gE@0LtmnQraGp1PZ*65H$5gVUwF8`QgJRpQXORguQ=$e@hV!jj;eBQ)Wxay@$} +zW<4~?dam_WtF8Ftz==_GNQjwF3ZO;0BYWi@q5Ko%)p1YJygCV?6%ixH>X%2=C*PGH +zRi8duM74mI`)|Z^RwO?82hotj$QnHYQaU)$@9`M8l>*F4{PG37E01sDAJOMC%s3t` +z8vn7^%`j|{IdygaVCOBGJgm=V>+edz@{I1CGSh7RouX);zfxIwQdxVVR@T@NzPvXL36z|c4L;q^F1E$APpkxc+$ +zY9v;US-%YDP~1zg^F8f(*_i^a-(VQE#!UoxZ-~@N4LyU%x`~C<^J5@FUo{SnGcp>_ +ze?Hl19RIX=Xfn}1QDb}ON3kt}Gv-x#v3Y#bc>C>B_8nt#$v@8V!QST4uI-2Y9YIsr +zrk{$Qi8i;lj~d6DjlG?Hv)2>aNwwj)81ibL9KG2(X#l6Ob^PWvyT1Vlf25YzzA1l8 +zfSz0kpzn9~w|6)9lR104dnU()VgO!L5TZ!d^bc&fv&$GFShm@uMn9|YY;9Ibe$DXZF6`31P#}YXKMDWA9qW} +zAJ#&p3%?iBZQ@cM?@eC6?|oNIiBalPJ8>}VFv}YcCuI)_0T3W(hQ;fJJ@lhCZRuX` +zygoSkdA9wSI9oi!Zo|IUsVVD-KAg_S?OxQn(<*+Cgj+vzO#Vqf*+wJBnI;QO!k*01 +zB${2$1bF(mm7MdIZciV#S%x_5^e?6#54LTb?Q}?^GqyQnlli-wgqq`@j~mb5ym)=E +zJrm5dx`R$5yuRDno7_Uy$mo*Uc{>|CYoBCy9a&EOtZ^Y$*gcpwD!_ATw3ov7g7;<{ +z;wYHm(BS}2Hm5EcqrFT-m^Da^31=DSY_|vwboOiHd*BZMM@((?&HgUn2-D=g#H>ND +zguzAV78eWRRNvTJ&}t2l!n(o-Pjx=N04fYw3wG&AbeC>1z9iqV=NRGvaAHOe)?zxd +zuQn>h*w{L@>CCp!B6>PPZH*SAM>yK?ZSuwR-8M +zSf8w3vW^w*CH8{mFiNCF@u2OeusdjACgWMX0VY>!f}kK>^tLu?Y$;ibbqto#_m|^_EmtIz=ZVdqXwn(mgyypSv89{Kb;*|A*ay?SvfXy^ +zKZj$sNlTRBn{Db6+&f75(;TGatm|Lr6XE~HcKp|R+qj3Hdq*1oMUFJ?eQDhL(zy4f +z@qfgZ#uOJ0m@vV2gYUB8LB21B1ZVVF-7(-8C-`A-vojnpV0NbG1|4F5>@tBD=TZ2m2cF_ +z%KGYe>uXQ$UF84UtCVFmQu;d8 +zT4FCgsLZoTb>aMG6sl;5wm+8v+u@vtzyi?i+U|s{GMWpOfDozlVMlPY^>D%tZfx3` +z8+FW6T~?Jk4$0!^L8TQn$Gs3v1vvv4h8MxG#nCT9y@veQqv9qUz!Bc)w;nIlDSW08 +zV^en+vziB5r_-k0p)aLsORCY3o?fAK(-epnG?WF)Ix8QFbqNcrYnKAAdU| +z{JKrd1i6nNm%mZV^e;lL(a<;#;t-WI>V<-n+6aahl!84qd-#0Q9H4eb;X$Q&*^63| +zhM$U23&PKd#Btj<5Qmub8;#b68TOt;QDfF?VA +zazJx_qh124h3$VGjQ-uZcnA1XeSZN-&o27oYS5{|EnW><;~&^wOvaV8i%Qsb>A*1#-&2Ro+es>AVl7bvAYSm{2J7|=DQ#Fu0& +zh3!l-Cfm?=f(G<8-G?+-hP#2n69I_=BOfaEFu#cVq`JY#R;}ht|CVN9XcLCbWSNB- +zv#*IZUt}ye#q2A~=F8l7xW3p(&Jq*v9t|-x6A-rDSWo^ChOv1*bF=G(XA0% +z|jEqUNx2*)<35YJMC*J`X3yT!0!*0+F;Se8> +zv4uyE;8;8d`WlPA-c&1VtE;P()kiCEe%>5!>Pc6S@G+1R9aMPHZaE- +z_FZ}l$!>=~cLswH8s|#5H1SuaRfKdbbOcQ!2v{uFjD{Fl4kihl7f+r9@@(=XjUm1u +zM_$+pEme_q(hJ3vg13alKUSA99Ms1L%N$bkHfuJ^)akDe~7?eM%4^ovK~`*pSY_=zggAb`CH#@$f^2U&lx +z44XHo7fyyZ>h#Qv7B&XcOBQ{0$lU>*Yvgcx!9}N8FFbts@b%`)-7UjJLqb8+s_O;% +zgFoNH_j^@o!}qXPFObAc7UUQsT#e7;QD-EF91kjX9>b>MBf~H{9|IJiQa*aoQEC^s +zDA?k-8{p=W7V*650eWv<2E(8^A`vaNg109$j54R@2>li!riNRs6#@1OE2QS%QrhLu +zgXOmXM6hMFp@kB@xUI&u-`>`0r3cH9#dZM=8g0E4*G?CHIXyi)JuMVZ;lE!`7i;im +zwRS-P2MKa_o^Nf#;=mei9&hdLs=NLNOa#7^^1I;Xhp440*C=%Vga*~pFI&xDSCKhtL+cOKso2S!{4) +zWLGmZg6%MO3eHC%a2Yq+wycE?pruHnk+6KajyruJ{w@Sm`T_>BHp8zlZ^ +z?^yN6ojB-gj^>~bECPlp+}qrLNmte0Rs$_&fi~Jg>L=(9!=OcF#P350C$5K>hs8Ej +zd)$ZX9pjWn!gPcjNR(J2z%#t@F<+91=qa9RSOv6&9oM(i0u%*Ad83ZE4i>4WpODlM +z|29$A#15r5A|UvXbR8pxqT3V6GDO@i$x{4-=K?rt^bs#g_-pS*Y`eh)0Jrf+VMC^0 +z-`dckP)^{R&}|xqJ*i=w6*LQfuu+<$ZE_P`4(Y2EUq}Ge!+dsM9FsgOKzB-U2Sd8b +zrSxEV9WGSJhx={r!7|bU?r7K^N-jrIH71RQ8(1!@=pgn~T+kG-JMM9*;ZZzBOs=Is+VMc4u4YArinnx#W@$MZI&MT?V`Qx +zM(2Sqqo#Yi=-%QFmitj3SiL%#CcT$GoB+&t9nFfOE7&F+bb)_0=-y}ZF#xJYt4lAJ +zb+n^ei|Pfq-cGCC=(Jd?7XOIO{}o=3KGvXawAR(RCLIfPqnh04hrtj|1ahBlz*}KO +zF(z&kNKIf2DR^-A24-}1i981Dc+9KH1yN)zBHu{n2IQYZ$}usAibIg8I<%)13i}9M +zV0lfSy~P4VqP;Z=G__wUjiB=H&C36-RKELlsSbDh8K5+5!!{rZh?=;&d9};zAg*gC +z0=k4}qfllGaNNgn5}A%JSz@#>>5PctHF_j*>cLvrrt}zb?$z&9qK(MwU8aukrLlZ{9p+K+ejS$|_mIrQsQU!#!tkGCpKXoMdB+|Ui +zNU|&Fk!0^@yVLKW_Z!001^!iV@-cnUoT~yS6!^^Hr<_PmN5sYr6&XFbEom=LmDYGr +zVV^1R)kOzUY?kI&l6m8d*&o|^2>6Cx6SRy8C3l2>kN_bQb9|}tRt=T1 +z4DvSXCbwt5Eixm393hj0igm8Yf6MA-T#>w+=8{}$HUWf}mY3n*i)Ispg)dd)<6?Ok +z|6F&Q_U@ze14#6pPCzOQ_DBCjT4T|qRz1Amopj^`9uOi +zpO%vLBdSM2ex<35t59pR@%uGvHAhM2gqySHDS;tKG1;H69m4-0(}i3W0*uhPS%BkS +z1!>@!^UgB^kj>0G&sV_^R_J0KAAFD}=n&NU9rFQ!BhL*QG&RRp$lcr3ZzbppsDc&* +zre%HC*jpz_vbmHPF}m(%Ao_qkkFJ=tp`8^JPEzYQO{ZpUmRz`eQvpjQW!$4WD}I;W +zZ;9gV6zN@(p#zJnUKq#d&lP4D(3C3zpH1{_OVbk-B_=GT7fknrpL*Ovkm~!F((@&u +zJSGtrK*^ZIj(~|-?*q^^FBQ(cjrT*?ZvrxnSVRevxIxNH!M)LZN8FIcdAxZd-!=+x +zjE5AneMsR9tI07vIgJw5^{(v?`uimkKk?G!0 +z?GC=c0U-j!1JDToaaS61-{3n^91a3}mLs5>Tl(enm(%}uI)D1x>DQ-ArwgZxr+=J& +zJpFLGar*t~52yb)EuE^)&c+uQ$nA9H6Qu +z?F-#Z7jb)#SSZR~6vry#n!t^HB#K%-3z~rn{T&YIY2T;q~ +z;(wKB(V1JJ=)gN0628&+!z*Z@(jHL7G95Jre=K1 +z%eRt8)Z{_vC1OqEbVkgV8`Ce(ZD9&0+M=Acig^;5Hq#LXNY +zyh*1yuKk8(Yc)K^a~7M;k&v^~MtRHbi(}X(luee(B{7uYjiwEcH<*l6R0QyY)TAq7 +zj^2*%jta2)ryv8Ye=Bs5gk<&~a~B+ui6sP2=yNt_ZxC~!wLD8l3{I_T2A0-GJGr-t +zH`YT)8V|*PCq%@X;+$s(&EU!AJC7c*;TO5~@5HRE00aluK%A053YkZiTfHIK&>THe +zTtrMc@ck{(u)Kz1^el@Wl%n&08Q%L=7?voLF+gsAWUq=K&Y?-uPxG=!nDidKvoen4a<-n5(gP1|3kDMuxnsL>tY9e?Q-J^_W<+0Tx}+%u!GiajrP +zz-9*6PR(&=j5YzRZ$bZXof&XXF6NOjF#4Gh`EVW0TWV?8WNZVgZ)65~?)}ISBWNbW +z>e7TJ3=O^-HAfaU8CzJ;)CbvrxpCBM{C=(UBAareH(U)OfyRQQv`18w%WnEI#q6gM +zRD}|z7S`cCsnelSaY#6e)aBxFyWP1CHRzk?BV0-&Jc$t}6E2HLud9P$00*e{*W%Gp +zURQXZYh*g>rC*v`FOJ*2IQq5Z?h&t{m5)_}R+>GmMlW~3RWVF9q(HZdRW<*1i0c2R#Hl@Id6Oy#S +zX|+i0$P?z75BsTg?M91gdb34*LoJ-m1fqffTOn#UB1@rsb%O5?TnU!Y~ZF +z1$DT)MdCTR;%Ea{E#W-EkRS{c6otzLSnaP>Lu`}UM}auN*2NWm46Yun;om4;vv6sc +zFr$c(1xo(%>pHmbFmNj*YyldB4QY_wVFRdv%cw=1?jVTc22eBp9?jExF;2M2BCpi@ +zpW@Ia+E^iMO&+!jS6e~1IY!lY4xoi^Ue1*yl&q{~r>%u$Lkjey+i>aR;hy#1`!g}FbY<~t#DZ5LHcEo6eW{h^!+a4@7D +zQ|mS$ojgpa7}3BMV<)X-6(frv)a3EWxHznq<-0D7v7ytEf*bwhuskg(Q+^HxT-UGfMaIxQTYYWqb?;_J;JB@M(-A)M0qQ +z(Fmnc1Z-$80hliAGS-gO0zqZvUyE#4gKx0VK9U}2wWE+G4NMby9{j*CmwoNb`M17( +z9bzwEf?CuME)*nBp7-tpG;2d@H3q@xGC>-U29f5fPt(OuQ?1K$l&I6uon}$(6*Ixc +z5>0Ql!TLG({Z!o(zzy=4M$60!S*)Dp@jw^IVxrr*4hP=mRXmSdjZ0vvfmcIEE9c{j +zx<@Zr<}T|d{L01qC~X3ESnqR8U|-pWWhjdsI+9bs8Oj+U6NWhKog)M{`I&Q0=&KY1 +zr?;0nCrW`@PBMYWw)ab#cF>pX^mbE>;mm~BTsLYM36Pb!^6zNv{6~c)0GUiR6!gYS;;-)dOE0f +z;x5(5sorz3)FE35Rg_WcIyRLO+2wJ)_>Tv!U#+5eR;~c^uwuxtugI4c)N}?YYC=B2Vu^`qqaAaSJK`x-j92CbV>IC8RTw0<+)$cnhNN +zjqNF=9y-RC9`9*{FNj94*CZ+0U|Hsc%+1V%w&?a;L`ny$E6 +zHYo3Xf&nquL!Y*sBKFi-JW5*k8Z+jsg+_l=Hih==y7)R!`hJ!5AnRavz51{=B(@{S +zVQo)Wn7d%*F1o3L@ei4x9fXZtbdUD5>lWpa#M9!SfbU~Tk(j#i#fRI+_m1nS(yXL& +z5z(S?QFj?Rg;&YjKM{}>vo_Aj`r*S1sJRrH` +zGx2G$;zJ@C_%S&thm`sWi6PomQ2BYa535TC@)u%vkE=+CP7_v$(W0J3kNPQ2c4h&c +z)#8}x%Aqh^x>vm`i|%gGrB<4yR>@hfdG)5>Wwt%c_X02nKB?qXQueNdd-Lnn(iA3X5XEF) +zX5!?Ge4dHRp`q9`Mrop8G>3Wd5z8mC4u%E!&v8K$>Ddf2Gl!&P?3O`;X2H*~fPkem +zM9e5muUHzkI+`cWf}_+xiV4Un{FMalJ>7awxBgw|)|qJ1nF!Kp)aYM8if*CA8YxRy +zSvaX33pLKPBSpwm>l9z1*AN5{+f2}GcJL}8g%^~HlSsW!8q?OpMe^w8o7*Orjt=Cg +z(?cI2y@C3{CFUJ8lPY#AQIjF4ryZbM +zN2l1fL=20@&XKvg>@+X6CkK&LGwRasI7Y`G89*Re@RR~yJPd3jM3G=w)DyWes|{y4 +zdgtHw^K7KiK+gf_{;@^xW;XZ5?%UTp>i|U1+GyM-6{j-48`IF>6vILRbtT@YAoU#2 +z%@sm6Urx3${YECsNi#)*eA7A1yLTRS<1$W?^J#-Uq(W}J0^daP1~(4z#t1H-7clXD +zbXCUX)7~vbiNLmk9)N7WQD3VHS+FEUYnlhNgSubm@FyJN_Bm6cdzoA?(8yVb4n`KU +zof2Kx#1J{UXXER~}f3frf1jY&xxIbj?jw_?N6eO`7Oz1(&Fotf`9 +zFvO>rdZLz_s0+rIFrKW!$qb;2V5d7F5CxKgoJBfSp8cINeu|;H$?Qm5j=&Blk^m;- +zFc>y3oiRW&4Njz|CJw73Sh63FB;suY*>$}jM5;8zWZb+$TR#WPaaoBB}((K5h +z(YgVA*J&n`1=Q+UiH%`+5nfA{@qlJ$1J{mOf|0XGfLzDj(Dc-g8e+6(lAM~XOy6KY +zW|e(i3bMLU&~ksf2L0Ap2g-$TwDm7%&9B`bgK*gMzz7LjKj9MjnnoP7?eO2Du~gmO +zfj?P9@D4D8Ha#Fl@Iq7u*-NCOV~lr==5Z(51trWb*eN!h@ei(%gCh+h4OkQgIfY%B +z&e-CQ%+VeQ#*nNn6#Cz49JS4Wo +zYY@~IogY%ewrVINPm|0_G|e)6#y(lzmRfnX6v?zz$v6?5p>1}Pnz{@}R_Aq|{IwISBt$!%_psG0lEF(#c1h<{^_ej5J{Sd@GaE>;9JLpLNj-8wqZe==mS|INkIPMtz +zU9PM6U1tEOB1UC)@%%>F-VQD;D(Z~}owc#4E7$$0ioYif1MceOg|4AoPcL%`t3{C` +zv3X4T-cO{cX9sUi4&R(S(-P1WA&^W;)bK6xl4Ftk@PoYx7ZaFIZW3RmZH^aAYq#^I +z=RJvN{VUu#8JL(d%{1xbpI>9}mS@^tXr_55E9py+QGh{@DbuEe$Mp&H{iKBCtHI7V{(5)@{^_MoTr73=q5`V<;N4kyPHWA7?fhDiE;X0qCB +z)J(%p!kdCSV5W4lhAlL(Gx$l(Idr_Bpafw*V>?37avPeuEmUT#j07#Z51|ik!;-Cd +z1)RrG7kw*WevYN&FQ=!qUs1I2%Vy<&gUY{uUFVd=6pUs#mBF_l)5&n$uV6>a&Walc +zhu-tHEDcxbBS6#g;DttCDDuP$j(psob?-Ve +zujWjX^J=8$C!p_nqbr=cw!srojzikDJ8IsLT-1^!R6b^g)k{^M +zeHpW=W?2clvxu&&B#n)BMQX@WYi1qAsH7L79A5kQZ;wYDt6?sUkxtK&ZI>ugKnRQ6 +zWVi0(1(ntG9j`qGQ{@gCWi*akzd2uMGuf4ZaZkqn0F3jo2^FAVqK>}9CsgB0ts+#( +zBHw&zI%P_AEtmX|OsSarGvS2Cy-KadP(~)-vy**DxUM2XJ%q4TvEouOOBGWaeb+oN +z&m6{`M5g@2pOZTl@eoI}!UIQ+;HL8orhzyT1QjL-Dj0-RXK+&vxnMF}Zgz7>4yc<+r>1)bQgFO}hA_xNOeiJn<2d;16LOSYXjD$C=39BPJvQ7?+B +z;p%RWIcy5@MMHjwrNCnNYPx6Uw}XMj +zeqrgO(51}5#1@XPBTuZ3`}w~yfK!ZK$JsbDUYrbI!8!g +z?mc-W&Iy$z5_e5z0f|-FqqQg`CagvCwh9+42;t$2+evcbrZ}4FsZls^c>5ld3<`<5tf!yJbIGuCAhWxaD=+Rg9VJdLqc{Cv`b*-j!g(0Q +z=7efr5!$PGi`21#=4eds_!7#5;tTX}PxKSqLJ*@u$E7{#nT&FBH|!3~-gRD=*$W0| +zDt|0^F#~Yx(O@7Z{AowD&7m80ycp=ZsaoTZb#8D-Vnx)%KxECvuzI(#XbACwwzzd0 +z!-+e5*SR!?f*SB)mvrO?{G>uxNp<30x@b0ivUB{f7%=aRKEVH|ulPgd9e;hO{8N7n +z5+AX1HQk{%df~#QkhiYM`QcOXmDn4LM0FIajm_^H!xMOU#jU=#;*^db~eYE6VbJDx`jh6FXqo~t=T +zoq0V18r@En$n(xcKN?ExYWC!8ZX1^AT!Gq81FK8Yiya=JfsJJ}vcshMSETNV +z&Y1x}ybsU`H)(!d4I>@iNQ&T-B@RLd9H#2qor?|zop{slToW_0x%;*{VZ|6_SMXUL +zm(6{ppNx2g38x^;2E6G(e?p~M9qy&x01eoa8$JU3*?l9k4 +z;WF3Z-}yD>)iK%`v9`NWKo@#c8pYdYd5KZ-n?9=b^d0Alu=V7yCM7Ij4->w?0dF~K +zhaF=CX+M2d*f>JZ$%yMwl#I?|FuZAX`if@xxJ$b2{S%zwddrFr&Gg<}WM3}4c$?PY +z(NK~22_sD!Z)tP0JZMTpR}R*TJel^?E?#R`X3F&BZIqkrn=jiOB<*I16`1&tn)@8; +zJQa}!hOgkxB*?gLT>pp}rlV3Sul!ZFBTumFXcOfuW5)CNygKA|*~p*^SLo=b8#?=u +z{~kP1`-OdjJ#e2o%o1d2CIDTl^#!#pZS22^EiEd^PUpFtp$~%CmW92()@8z(j@m|ZG=3yC~;>bm&k8SyX&0TB8qIs^77(=SjeZdn!wiSv|DIHX}Bx^t5w;MPJ5QvVq)rH|WB6(OpufrmBAwGk^W=2kg13pw*1>2<%=M!7aaP0xFs>$#522(=|l +zXB69a1yK_xF^Cti_^nv4P4=uRS4;z`RD0tTG9km53N&ET6KgteG`jW3(32mUPBCNd +zSN3*-a=ZtK)3Z~a#A)H}Y4H!g?#I)DI{lzd&74kwRavj8+65eanU(9DF5SFcc{_%i +zxRDwK%s8FwL5Ekj)y=8xWtjTz#x>ZuZR*~6jt;!z@wVu-q@5mcD|xO76V8;9E0-$h +z{;v7;^lBO-M#oswz-q#Dot+kWttRk}?=H!op(*70PV$Nv2(XTne1ts7mr~}i=6sJz +zKBn~@oa&cATnBXAiAR~+$4Yy!at +zX-<&@ALEof|Cd`VaI(A>oOCoqMeSRpMsLu-^MYVcn`a}5kuX+u9o&kibl>F2`J7iT +zNVeYXvIlkRUO^LB7~_mir8e+04i6>cS3ki +z`g0ZYT~}vb{60Rl9K+93Cnv-ldqP(30p+ZTwE(>1CFrt+ETt+(b6yw@Ti!L7pf7K+ +z`{9*d)aFgY&&Wo&WY)@NruBYAMweu`4%}U7Xw}E@J;Ver3#|!sVt>$+1nPk3QL*RN +z%FOj>U{HxA-?Z1_5@5D=w99A)XLEv~6bW3=sRgVk+RbUhS(cD>*s#ZPCN9$<0y7bg +zaZ$|~2D2!Xnn9B3q>aACBLCD>*14BibxcLBrH?Zn&qardwE$wtRVNLWQ~#o;9fTlb +zpU1x(`#gUMDGGqZF*EFzSy%_ZD7TuMXW<^Vfh>4&8@PDZ>9l)WrAkd2*b5VH@I|0ea##;9dM1(NJ^Mu0}FVcBF~JssGhd#E7{{7Enj1G-)v`kZ3PdI +zwYT!SQxCUy4)=DSA3r1{;2!RY*du}REWSg3NCXb(1UsY0l6*St$`b{{A>TXv +zM5>DE%Sfe_n=+_;;aA)wgPqxI5YrRZ>m(tPA_({>&yc~Ol1lLpoX|(WInKJ*$0$(C-D_uO$d#fpJYSSGjlR>x@vJOyT +z`jOl-N79fGnpp6z*gSMG(_SWKZT2GBI?@ieZ~aeN4G&=dnloY+W;*%k-Vb|sydNBr +zkzCF&tY=+ycs%y-cpN3~JJ~s`>|Z0Ej3jTpkDT?!FjVg_Mvp|`5*-xnHH_(EU^jjr +zdy*@ofH%pU$y0Qp#EHr-wEYQlrYV4!VNoO8^|`51&>7AX&!2T8PsLx3Y3!_FK?JaI +zQ@tOsv`b6sCk>G&#^oBhiJ_Ml>(fQUrk+K$kkQsItMQPGJ{Sb&oo;7zA6k8KOOw?wN@l1Gy#UyUs;W}Y$0O*sNkRi?sU-zEZE?1SYDHO1iZcRH +z%Si;)DhuC%O|bJXg$jwmP{(}EYSDR|Q4;)N6!x+8SZUbdemahU2rf;mdLbG^cf#zJ +zY30})=wB$G3K9+zxWKL!?ci`p9}C?XRWon$X~3{2vI5fOa>K{m7?E0Vf#;h<(wXb) +z`!O;M3ERWqn?P{h4ZpHgr=FK=T409z@2d<%H$#8_$(tl!FFA?w3CkPY#0V^<4UtAy +zmdCfglao3LOx`*LvK1RrZVcG(!!YE{)=~xSUNK6_qZm>U50p(4`T7XH7=tJV_X*gD +z*8X~K)DgGHurkJ!%aa<(fIO&LS&n8;vh6qNS<7<#5A1tCb1BN-!~`egd+E!yyCFSl +z2R};Wv{GJ-twP$*=sE)@?qxBj{La;LDE^bS1RBxN$jR!{k^A!TqA=GqNX;W#FH +z(ALsvs%S%TkQoIxRuF%ltu8U?543=bzvS#vaP`hPyXl&fy=jnxCrl8JIG9+c9oh9G +zN202Q6~oenkJl*NAfnJMar1B$%G3aQRm3=|xJ+;-kXkUT*02+>J0)q0_EG=P{&>i< +zy6FF)gAj4DZ6X7T=)FcZ0;i`y>Qy;it2tLywPq8H3zmu8GZbg$84ds+(~KgbXDc$xYP}c#vv2+A+4+gOv7G +z4iziTw28zd4#ja(mm?!3?2@=kJ%c|6SYMjq6>z{dDf5_&plql|a&yQ)j-yUvE4trZ +zIlQ@fwYyAtw-T-+)ZrRAF +zH_%T;JiXMLnJb`hByW@HBIW&et7kS{NfH~hQ +z=<2tGq3RNtIDkc{*j_INVst$?*N$R#;=ogp$p-azJjZFO;}&|1X_^>wGW-?h;;r0y +zNH5u&yPk=V(!1<+&xAnXuOQd4qw)-tyJ^9p;3rV-xfhc;ce4=F6DVo#DDcouHS8+VsnWzcSrcz4Pmm%SiyqH99lOo1?cAJ`xs +zcG?mGfQ~)3@2U8|EgEtZkHB01)h6Ksj1PLv;4P~H*>*RrmW9|R?p}ga)kU(<+!h;+#aK^WP@(9@0ipXh8yuOYcPI3()rdw4vX^Xw6U5pmGP8B +z(D}0csr;$%p|)%aAvs7-!cZXS(Gyjl0;5r^)k<1&4YOs@^{iKgqj#PwLHS%4h8DE_5>xkN2MMAnX(eHKS#w=EVrADtBSl}O*eWmLg?8;pQ7;lxwgI;o3r79GAiX#o +zsn)pHOG| +zjjHg!QjFnm+T@xIlA{*N8k0m-E(fP%di8?GsHM0+F6CRN8kBI}4KLwxwqC>xiu0Tc +z67CY0W{3*sdcnV45^TE}hmKwLqrg>-YfM=?yBTE{(|4H8PnEl-0DlT@==wRfB>voy4Ox +z237;Qhs}z~{#8d3XR}D8>H5)C5}Z(UmoTs7!Bl`)aFroai>_lb^6HTpop}4zp#X3Y +z97*x?Oj<43i!9rt&;Kj=P=K4k=F;g+I<<|_8*Gmaelbh$CW<2z56W2*Z}?bBJFbM~cg^$MH^cyk|`n5eTXzAIJvq}5M0lv=)dRE9_$zB5+^UA=OJM!^Exq#h|2dUkwoAXhmSC9l`ua702uNF-y8Yco&X@i`3s#( +zCt7v*r#Z94bB5kvH#eUI7pYbIGXZ01QF(=v9AM(AVTamWIwyou#>sz+^GPf>poMx?zgg@FE?;EB$bwIWt#MCM)umD +ztA6iJzY1u`%~zN9TFP%Fw*`-q$R1Y4aAp`rqWe^h2}tWJ<3s1vGO}4nXZD{g~#=9h8)VWnt9YBWw@j2c8Hd4oSJ0~ycr(W;=v7d6sXWsDc{eJt~ebOP! +zUf7KL=}ve(qv&Wu*be;sajFxp&}B4}#m{tt^w`B3TSQxZdZnkQ1| +z6)GBDiCb?m3qg@h)K&@1i|U3+^eK&q=Bz`jRTXRV!2h%H2KxDi1!Rwm+FGvPk_P1I +z%eW)2CU!6DB6oW8mM~ithAcUZZfu5zc8=nN)Va0NgsC@GVItMB;0hhuX7-+w6|=ie +zoSq5r>%CX*lWKJGjndnt+gZROs3T4vv7IYFl_%fT&9lEUPV4RKp>|2HUm3NB2T_lu +z>&F!SAEYz}!%iO?6BR&GQVd$YDHS@+_aEF{p?o1pUdXgOx!{shg``fwrsaJ*dV5cN4(*5 +z1OP6$z8!%a3f3ElNBFOZwX;lY4Ulp(WnO790=|ld@37Zygm5Qu1W9X-0CB*28yN3C +zqh(ra0x(j9#JXCeojl6J6oz3Ob>Hh))iFj@7>@h++FnhwMx>o^(T&c7u0+{u3_1hn +zWoJ&nbk2_9Rdf};N9AMMS&rdAn@uz8SkKm|xk>hCqe#DT$fyc_izug$Sx|3W-<3sC +z^7O3VE8&%6!$@!pimtH&f&nBNG!_dOtI2Vvr_^yICb!G)f7J_S)o*UoSxtLuG3aR+3xGq_yzeb}acsA2X|-x_UxcdS5OvxFJ7mKyi)!Lw>`^{R!Zo+ILXAyBdsEwJO +zJTT{=-*}v*azs45fq2wr9*E=r%Zvzxo3XeEBy%u#5W3sM;?kmWUh*x7g)_NwSAA7# +zM3F*i{xxYDPHM2nTrv-xnOn|~PHFVy5>}R8(uUh9?QG-vH04M(*CNZYp~>{_3QOKb +zr_&ta!$o|FZe8!O2IEas>bGv4T}Q4d$3zL6V?UFe^0JgNaoc6za;er+?i{S%YLaZ2 +z&0$-T08t3jAZ=V4IP6ILsXs?ZpHGv{`j2HHdfI4Ic6JX_O3G8#sXr+oHQw3u8*(X6JXJg?=hXNfrMwhIX+VzM_=?FT={rKukx +z!;U>MuA#3eGr3DD{HZ-&->S=_PwkE(zRud48#DHkSC(CR&Ahf;{8M|C=uaXfwlJ2F +z*%*cw;q|QJym6&@>DDO(T)c$6UHhU_S6|9?{B`|0j9cS#_UGJVXF*-hM+jz +zEt$csZsk>BPBVAfqM_?qhdgit!BLl4FDahbA~OJo>p~qFDIRHwWA~hg7x*%7CWT?rwgq#kYB8fM= +z1jCy}luUD6KaniS^bl!~ZC39o%4Ayqd9=y&t_8Od4j}Q+VK5XYGg>JCCpGM`5}*_5 +zH779pI+_?cM}bySt>FJbM#`usIrVQRPa3vX^)Ou5AQ(cz2!@DEe{u_MdBedUFc{Y=biKB%N-mjwEM-( +z)Ld^kS-jvh5KcVEiHTg0P7hk;2CQ~$4+`FudwWyfzfm1Cs+}*Z7*XZj9QIUKu@> +z;C;~PinnR0Yx}1a_4p|6bhi5VH +z0^TIAa0_t%($ +zM6{6b8D)euN6p;DrWK0j$f|K+_2Q>?r3^JvQ}mo~lGMqD{hTvk0LGbb;7D{M|K*j0 +zYqL0yv`o{6p4TgNclUC+qTL!r_a2fM7mdE01W3z+?D8J%I(sS7vs+=fF}y@1@*(DT-~)r&dUqG@c(+=XWC +zfTeC{qBEmNUWQev&%=-b)6yd&?LdZ;urm@0EbXk2B^s2vb;7*1G}A?WF^I>>BC!qq +zTOggW@zf8b#V{Sf}*6p +zPv!2aJEk4q1JSW}o8NzG85icQi%lg=RqU#vNKq=YjKoOtI7QDA*xgj7C$YFSIYTIx +zu(!0V1C-c8@`W-9+0^Fm2Hg&+TpfEIeCG~RJZ|TiM6k}zYyxn`v)^=CVpcZ_GVdoR +zg-M^2sAw#itnLrF*BiWVnnHQSQ(@62+UaBYBDbX}Dwf=!Sn|RSQjUf~(JDO6sH}iAzwa@Za$Ba +zP@X(pq1U4GZOZReIQDS1Zde53FwDW4ucIXv)gQdS%F3V{^5 +z`&=oncIaxX1gy`K0aZCXcyfAt9*6HH3_+JLpv2`knP@>M-!HKz&B$!&I1JZI$u +zBR5gu-MtAGHpzg|a*p}_t;A?VVvtF|Fmc4Y!IgJi4;Cc_iuGvV4~7SJ3zt0ag4&7a +zY(67sW;|f#^8CRvgCjXezH(pp5$BjFa8NL*SMw%_aVqQHVru|PK(xOmkEp?+Y)g_@ +zi2Pr8mYdE^PBWJt%Q2ndFYc~UgDa<|tfw)E^-^W=4_PW%D7#AVZzMaHHGy&y5c&A) +zL&Ee}3=DtD(F`gvo1x;lYY}hy?(C;ddP)kHSyR8umD)6;pjf0vjF}~Y8ZmtwJONF; +zdan<|_fMbb??GmMUZfag%ka>wtrPhQ2aoJWdpsdmRrV=OoJ$UYKZ)}GrQY_gqt>Tpy>x56)EB6v_e$eGnYUS;)Yo>_Q3E6rW +zKtCN{WF2R&%v{+_ztB=ULH|uwAGGQiOtjajgEY}a+tm-L$>ZZRi@Orrm1&CN&+CSG +zM-X&-lTOOLhy*jq5T@*kebHXUznY`458INMzP80*nr1Fe{%pOi>jtRPPupphIZn`q +zB>I@g1|H}USGrBJFg{ZR(!F*rGM`U^Z5k@WZD?guN3*xGydg5@`*XwEGh2-#XA2L& +zyUnr$bTwul^irM{@dA%{IC(Emi;j+7zL@7lQRK^eRiwcITDhSWBLW3r!{;$xSExON +zriN?}Mk5O03L^bJ-37j-2K2kgV#Fj*hKkg+Ub581f39wZ-&RFd<()?QkMV#Sq11XD +zl;wT5onjXXF7EcPcG4_&Ig(^aC&xe8R9-D`JEOsHn0CDe&vX@bs4{87NbJxJa6PGor{ +z6zK=@W`+^Ka*0R$SVCY7^lD^~T|Q0z1ONGk)E~OKl7kf&8GZCHR)N%@I7xWtO%tGV +z7~QLTPy^@`4&WliZ41H>&&&a@LeXkzaMLx#5WeaHf^!-GVr5yH84D^gW}{G+>`Dy> +z1Kxdix>pqcr#sg4G{`iA90sT9Er2rxIU%`#F}|g2Fa%EN)^+vPjKf`>t!u@jyAr31 +zRX*IB$hkceci;>eN7mI8t@bDa01n>m7 +z&GD@&uQ3Q86Cx!1ATD?Y8WH(`ZQdLe4?Uwt$C~4*)tf)Iwa7)yo7NasKZ{ne0e9Sr +zj*W=lM%e0RnLNLA9tn6WBWkzP;h5YkU7NXXy%aX}U?D@iRv#c@h}Yg+0YmnIB=)*Mg51y{ +z*kG=?i?rRs!04^SC5#~HcgTSU9dyg0HEf5bd-j8NEI3gl6g{S6krnk8EW_{XcpoKusQFI@?e=8EWRXmjDeRhn0M_Rq +z#lY|qA0=z`-sydmaOO$Y1x_5V1vZi$L)xG{H)g8nZkyL=DQ=-HCyiKE}LkVgy7FCdUJNu=Ec +zgxoPQ=@QBZC6&Jyv3z)P`EU`IA`N~S$)qs@O^P&3Y+i(J`XmzpFq>?uoA&*W)USX5 +z8WbQKF2;+CTW?{=Hfo<(a)KU5J<1&kj2GRpu0OQ?3&5PNolF=a4frP}(^wqEnZZr| +z+|u3&Hr=s+i{$SM$9zMJY1S)@S#+Cg>~hklnCz_{ignz%SZqmS;=|4&lw9aBho6qe +z>F9xvDmOzdYO{b~Ty@)`dB{;FUqqA!v=X~8Z7NBMJ466+DnCj1bdiK9Wa8fRV{8Ox +zly^dzveAR;i_WRLpHd9hJDe3(G1*m@e&3T@^HupTuX|Cya%yfk7^BGAlAFf!9xl4M +z33^?xy;)A4d~c#wXxJdWPocU^1-;*t+X)339?*4UHn`-?#Yvsa0pCL%(E$eku&tKd +zo;kepLh?x>Y$Ubs;V=8$9#0ESm`xXV%}~xH%po*Y>2^d4Cq1xKc%)-jrj+n!prw5YyYn|c#%SGzaB +zyE8U5dXIi<1Xk*D#jS+&4wXbec>ZeN18{p3SJQ#A{puJn)vkFd!e!89UEpt&kLjEi +zuaii5FG)>(85c?ePKnOQ))oKqDM4f05lbbBF1294+UrIgvgfX~!hvsAR$!|~+EEvE +z27-_`i<<0z?a(UBY=U6{xTQt`nhFfo*M76_QpVkKNcc+e$S}opS?L%p-hw`{+HPTi +z^f}3s82)>yQ@jU1{JysDuzit}IUjrQC!4aHcnTsxhIJ$E2UTc9`t^#14{z-rOLv6JzuWGJD^qe$M58~z +z*+b_*ATdbz2-j)S@6?l}dcBTaQip`S)J-*vQ&iA6s!{tAv6xrW^n$8lGAdKFxIxYo +z+RpJnnw;B?p`IMHvN69PaHX9MB{3ntV}1tl((#Ikr33FE)WNTP1*A# +zQH_T^x)dz7wb+rxAj%(G`d*K&2=*16UUTmrDjA$%_{uxR_z3&=@%8WH>r0O>!r4SH +z_>VimykY#WJ;VqcpN!G_CpA29d*sGpRh3J(;ogF<3TP)l@i7`^=;q7ogOfL}e@)&j +zudZHc0FBql!W()tVS9;6)njrYLCl79cVn7H4^51SiL(ojod~fYmyw!oW1|w&8(Fpr +z(A-#EiMF6A6l_#@cRBCZ3oil(M6?+ma+Vji@oievcCW?v3sXDblrBO>O{00T>MMps +zxUyCTW#6=7QB4lY)~sUDnkbZA1C2#v$FXS-d4A6?oi~e*bNK=1v@d#;9QCb%5#Un~ +z-AZx4d&WkEmPQWhpIeN#Z(~TGtmci85)EMz_oD@7&w_rMeS2}J{plGFdT#u7Mq)Ue +zvddc`1u?A2XAbbt2E9oN;*(y@>Ud{1JFRj_GJNki&gndE$3a}F;nG5k|LHSHSvFg=hhzpwde +z(AGT}jAHF{*~|-sWS}Em%*&2Jt6-W6x>|owGee3F#Upw|0wi;ZA#@IF&JYb`o>}=S +z?t=RN;N%v@Wo>~B1cm!0MuSgFv=KIDa`q67+sbc?53e9cO&l58j{D7$ALxiu9Hw#$ +zP&Mu%J@?9e)3qd*FPqkKoLCQc6lb_5WFWVKS`eaNxJ_Y)plcnWmPus;2!u`+=)w6V +z=H4-vg?y}~A2kc0YY$1$?5TihgJC0qR{`QpvQss1 +z9P#}|0`Wc=CpoH-wkJG$r`8e+n1LI6+&kMtaCkAwbFeBo4lIr=Dfz5g?e^rx1_%*9 +z1*t1{ML`1YaG1IA6c;sFJeH?STgE#DE;f;}=JT*`BJ-brd~@Yo_Q?vVvdBxZF$DoA +zqThnWSkj29?~nR329(HVSYw}wN#EoGjVHAjrlXtCBMJY+y^`olHL;a8y%s``BpOjJ +zxkbmix1UZfvT=7j5lm80bQGCv^p=t4XqbB=IGJ<`iwD;JJ&hNaE2iMZg|jO%bM?%e +z3s=SWEw`}r2S&H9YD+I(m`*FI9C0X{ACKL(>lwW15;6g!Osy&jTXiJO*&Fm`g=;j* +z?%T?G03=WV2YXm}XDUitRPxtyMH{w}8aUwF^Ko +z&j1+jn*$m@KkuUBEAm3u6?L*GI?&MR&<^yNxZD~F)H&G;tm_uN&~#o2(oMAZ(3c=^ +z*>(4F{4Ak=@{#JYfw_#x!GpiyD4bG$R8lE|F%-C01;BzmsF(*~wBV6RdlI?jBG37G +zt*xw9M`dM03cS%}-y*~N7XrvV4bLs;Vy;GaU_^HlG# +z!^%=xzp5v#?uV+eq>!5<*bx+)pjLxA$h_5<9hMP87kZb24#sAae(+P_z_;mna6DDu +z2b&BBD|!UwgUyNK32gkHtGYY)0_FmZOdrdy_2pGF5cZ;WDo7JvC2@}ShyGPkyG&>Z +zl&1~q_#q3}<9?~#;X;Th<&Ou4&C}0`c9KZNs?sxZohLM{%vZ63-mw&Jr2JP42nSg( +zo(rsDzXJz=K@pDdaLc|cw7QP+zuT5@43rd>qrJ}QTOM&Dr$HQ#@VHYJ7Q;nQ|X59lZKRg}7xp=IdIKSeaf&$*Ya|fm5AS`al!uQ|D +zM;IHC6FVce(W%V)>jCgW8eOPB{8V;>h!)z5^)yIzLG?!NXaNE+9t`vQ_@fP7^7%u_ +zCmI^;gzNg-oIjPqZ(Q-_E#;z))Z;HM1JtpF&ia6B$1E +ziQghv;HBq{axvQ{$p?4@a95*e1eR_D#T!!IJ336|UM{M9>6|VP7$7PaA1cpcdSs5)3mKD-Dy)2dMepDc +zGV+V}HRM3eBz6a0{B4aU214x(aHC%6u-T`Q(rrFwhzrWCgK|ufvVnN#q{nk|C@rc= +z6e-yhk~WU#6ef?Ksm6US=jxP}oQ#wu%5KcDpRw0X*z4BK?^!=%Z@xZP@iSe8pmVrP +z+lC7^BM?tvK?~W>7=xH&JEyapGW=M`dW?XUjR&K&aMz&H0-O4M_RHDS{bIg4%7s_9 +zXkMP9-)rv1+Toijaz98^?U-6MOWjc~Nb;P-Y81>W*r}U=XmU_48WoSGfWY*JFHl@{ +zA)p@%CEYJ+bEXiyf0@+evK#=T>6p}?4lff;_^lPAxMa0XJ;V}g*Wu(K6XGQ;#!_w^ +zar76q7P1Dq5(kEYd}XYI>2}aUwcYA5lhjeY7ps?a=hoJ7b@-*}+wRue!)0%~BUm3MdE3lR-7H~F +zhA?CZ-E>_h4V0J2>`v*O=-A-#%#+=zFk2Thw{Etzg+N;=KH+iQV~~$bT9ZcHMvF3I +z0aun{cwH97dL2g`bC`Idyrg909^Cpzs$|BgM^o64by*i9(`1ty8xigiy4qd!Qbn}F +z%0H=P3Dqs}(b>0Vx@6g3)XJ8Qa+_jgut3E*F~>q;vcuok0lP1xGZX$2=QR$Ux` +zn?C>^4uF5haWzR8(GQ{#unlNQjBpG91D5PyS0Z5cZYicQ02xDuku!D|z|ubg-q3iOwofBYe9;2AcY!`d#S>F +z?T3)aDT=Up)gND={K)OWlD7jNKo26qQcK38w;|6CijayT&_s$ +zVSEkm3PTZ>l5z;8Qu650BU;*Q(jCK*oxSZ2lRg^(O1OFP%QBW^96N@FUoz*TEB-ok +zy{1_6!DQ0pfErOuko!D?pFJV!qfr8@Oz{WA1mY1cvX7 +zF^VLiaN<-SiCdfM?gZH+E+gAn8qN%WtZq;Xg=yRKpH2591cjL* +zF+sFe#q30C7hlvH%wI29zT3PCY%0u>Pcf^A8&!mR+q0@LJX~N=K__6|nj$_5hdsEf +zIYsn79is)ZXPBqW7oBuYf`jr;r2>SvG+7zItvUrORaSM|8! +zfb=Tm`a$Sd>gk8Hyt48vTPf4;mCAV%%6^fVKAd8}20r~qY6j--6-XOXjUpRv)IOmm +zsVRO3oP>n6bk-wY%aEGNEx +zS@z>8bC#E0>%VU`Nbd>-1mlptJC7eH?4pJ`j%+-dU}6jwEp*~?k~&77@&@+z``+i; +z1@QdM*0@QiEAppI%vKFw71ni~LW@*GbBrupHH&O>3@x`X({!>Am@6aZnVOETu#lb`6=RPB2D`c^1MZoV5kDIyL*P*)hi?? +zp-i`kpWz$gFlGwE`8-5C3i@D9B0_>6z)!?8fWa3J<{~oHHNthBoZm;p;$*3ua}SYx +zTJyMtOmPV*+=BDEf;gEGqQ2~RNZV1hgWUk$pvOUNu-6Sc+zlDPhCf`dIAt$!tLvb{ +z9CrmNO%&zt?!^+J&odoa=5b<~>cGO9X>nZ1Z#xgCEOGQtF%Qk0qvn1j@!vG?-!$-_ +zlLi{hyc02u)Y^=i&B^zFBg&+Z!Sg~9;Ocr(hE9_uFb{M@;$4q_XYwn^y#QO +z5|{GfRtpn+ncI6~A;;U>Hp5SIH)=s@9lFtYd@~Bd``C_n4II7B3clXI(Q7}|m7xZc+b(~ke?Om^UuUig9txJY +zBswx^S?BkeHvK3$ZjCY~D0I_B&5KSw8%##+R4+E{K-!uFDjdJSPTICdD-4RTgclZF +z7vdF@Qe*M)>aqcMO}&ID=K6$!+EChW^%%17sxWFLDV?@xd5|oxQe!X7Me@aMQa(O8 +zdU3M-5}L*+Ehh1F`R{utr~5~T<+J^ld#7jHFORAE;^Rl%%T9WkG@I>VZ<67Ei;poM +z_o$yVN;^Q{K0=wa-|1drY3S}4W6}5J<{4G{Z}El^kbuL9aAY3D5ZGBT}wM^w@V?}o0Q{BUP-5WG$OMP+`clCx=6^>2>Ssz>oU2@I@Q62ah2wB +z-x9+eds$tC0F{koOV(j4sSrLevYMJ4`;D^fzVDkDE=r>1lyioloD`PioP?f_qHmlu +zH+fcOwKck82WoBIGdtGnCb4+|*a%J9@u?C(2pTe;ZT>~b;mZWSV)uChirzjI29c?5 +z>@RZ!Ed5aEW90X$o>}jJsaXoERm&wyL+lEjRbmaX$*q(yzg&;0_(13IQ@fKN*+UO^ +zZr{qBFj4GZNi6LQuSR}!of>DlHTviz*BE`i|Nqt5Z)yfm$yR@@FG~pB@@iv!by!JC +zmG68g7Wlw)~hrg~StNObP|ErWL$#)Sig~&H1mssSot9}8kkf^}S6~TvGzU07!$lWzmX+vTem)LR8 +zpT!r@A%_Zi=#TV1h+ScG-KtkT28vBFNGRqFpa{#B)6m1?(ykP+r5mxc;x5GRJ`~Sl +zMHCleRO1ZfiEKdeU&+dw#QyH(ttQSCT(lD~!-B2qp(lm`MTQ$&OKNYEr^$CV%&`;k +z_{sPGvF--*G36J%*gf?6F$EyL>~iBcHfOr00mL?9TfT6(PCHYG|7Brsf`vZnjR(y( +zGBiRYq$Xo>oR5ssDP}!@SvovA+yfSL +zc6XZ1D)L790A&(~2ON(QO5m}Kd?w8&{M-f+n?CD%x)=-C(lfex84eKzFVgXQ46r8* +z6vx6qJe6@WBTB6#e8YxZZo=(KcUXxoyJQfpP6so1!mH1Vk7JX6{U!ks^rORgPFZe> +zOwyD#eGHqnW_MbuB>A|uk}UD~tH~OS`|~pcEec^ddW(T#G1xL&7=h$*gT(#$C{2Gj +z-PIV-#J01X@cd+N556>iIy(8=_Q}z!!`;Ql67!Cs$7|^WC>>9Rn7|XqBsn}|5M45~PO{?$nl4w5?X+bHLpo$1zl&S?|0cx8btfYaK0n^3g +zDv<=o6U^~yQfgst+fggKW>?Ev55qJ{Z3)&WX`t{Xl2bcd11O0Nj`8R;V&Wvzm{N9N +z*s>;j<@kjrKQHbHT~*1UYo@Pbe^P%^{}XKv&3)}6z|;CVQ*kHd^^@gK&ePNSn)eI> +z7QWJC)}m<)Z-bpET+1aLu^)pAuU(=mT1t!+T2k9Zc-40EXj$@%m7P4^*Tcz&f9UW^ +zd9!H~8d$GmHP;&{QpB-LP%@{TC~$bge2MLHf6zn~A)L%Kf^u|>7(Ie1MWa*=jn;}B +z>h99M(J}=#R5IfoV2k>gDI2G2?cg2#k*g7klDNAlii&9Dyc#5{Q*|f>(FmiEmQ>w| +z`uycBBBpCojg+2!y>YjiBL2&En)!Ff@v#qZy +z#$&DW^%V(*IO<{pB;PVcoxOh&Q4OXV^YwP4Hu=TC}YAsx}hG&AWsLO +z9_1dRYi@`OeV(ii_JXwTX=07EriF_%SD>bWlN5FF@3?^tvK(uX8zBxO?T>9vX0O#o +zS<0-&+V||Y7VJ!&+rk;p&WC=C1d_BDKsnnzKjdR$z6Qf^ka#y5Zsz=js5kCuql}md +z=7u@npmOvwYW6B4$Ch)Kx9-c?*X_RlL^Ss4T#-+mxTiCto)#go3Ebh%&kuXrD8=HQ +z0^p2ce|*gzerA!T?=nSix$Zc};tf_p7FbS-{Pp`!;?83-4jUJa_an^0G)l7es5>Op +zSiyM(1DSbt-Q}qDx^aCmobzb@LpJXNZu_n;x~?evfvOx(<}31>PTLa}5u7k8cRoJv +z>bd0Daj@5RBvcDX#4TbeX=P1*5ib+a7cLt27_)Q6>LFRmhihM)>ha*ED6$z5D0HjK +z+eq>-<1}yh@O;}&uma6<&2xbIoe5>zb>ZbZR0!j4*WeQ1Yj@69K@N#&pa~%x3uIr^ +zPyVhqScW|7IeRgS_Dh4VQ1M`IP{vr=TOE8LbBNVGRc!eEWG=c?xF76=w)En2FueRd?>gMz}lf?O^ +z`)%uSojX*#E<-aG&+YgBn+&88k@r;hg(q-!-6c(W+{Dhu9G9Cv9;G0Lzhix-&EP@0 +zQB11Qy1Ya!i5hAEK>_KjI~WOf4>joEH#I3USch~=O0I4EDFT~b$zkY;k67_B?559+ +z(zG34`dC;E!9MBZhQycn^pSpT+Sums^ep*I{|_M{TV2NnC1Ef1Cg~>d8C1<)AewK} +zM;hz9pjSg+Y`1nh+3tLs5cttVe|KP+(fHD&UX6~U;S3ugJbP45B(2=(hiXO&FOjQT +zjU1MCDnUOp=My7QjQrf>RD6g2u#ot|p8mLZaFCSOl3MK&Xg5Y!tkLJdm~M?l(BhyQ +zzhNzaYH@?CR|^UfxK@jbi`>XnEWCc>3Css3L8GvZyENfLnw-CZ>6(!GjFX%8ugC`+ +zt)GzmDd8b*t6#(G-guY+@6!Dduq6GbPna>mMw!E8N{DT>Fhv>p7-9~lxuQ1-{laqrqsVz6KxYsH;b7ls2)aKs1l12HMB +zZr+jlF-zXB4tRKIf!9aJ*=#ZINdm(#e!fr`%5G96YoaZ0z3zRcd<-Xtr!aaZT3BG> +zk|)Xfw+_4cy@3K=D?a)vVRWP`I`gTPpr&HLfknMziDq2RAD~$Kp0FmoSNm5R +zIt{*+nvhB&b);yfFz)tT!)VlHVnc=*=A#PWz?#2|Qeb27I%S{hrfa-F_2(&KF2|pO +z0o)AW@IqWs6IqT3#^V~0ZiqY+F~~zkKA?omID8KAXYLhxw{?d0DKhYCCQsI)lu|D3 +z4Ks`w1^a6>xIopo1Tm>6$^Mu^!DhV{rn~53Osz-BO*(GjJvZ!3O!Ppl;5?yW7y$}N +z@Aw83u(UInU@8aN>>b)Fuz_JbNDDT_B&tN#PV3p~uRpJ@Ru&%z)B)3m_-`saA6&s7 +zk87`fPTpqMBoiJVo$mh(piE&L9F7JdH*SqE8kPZFLN@F$GBg9g9lo=BynXhgaMLh2 +zB^-3X^G7}6H?auQ5vjJhVGc8X@l2>#a0oR*-ltL0X;|QgnrFnNrE@9BuxHEYlF~{v>t3GP4~jGm8i>=goPZA^T?zEi?@0h$@o?l!qRYe +ziqejm;#cuGvQZ1dolYe6sK8z+*w~uBam}x2Aaq|Z$A}%k&yDgr0rck@X89YXI1aZv +zHFZbV2!y3mj9he9XtJ2Nu-l*5XgHEchEGtpyYnRhOr*BEuM`xQ7NK)$=Zo!rjM6c}R63M6?H#2h9{{M4~3&1YmKq +zw1l|)$g0C&qQOiW#EZxpd@#y(*-0Nv1L)Qv9n{SbY4gZEUbiiAa{1tRpHfIZH)yWZ +zuQLP?E6?E=uK|@u7@2`ud(}#|T3@bxpRBG9Wt{J?>Ed6cD_f049RzR(zTFK94F!Yl +z4)%XX+eFMw>%bpHG2qWJuPmVl918ub)SH*PfdF_i8r`%X?08)yCY}W+V~gAH5x@q= +zSYu(1&7ym?-RPBG5xq)@7q(Z)mM@isnhi{`I&GYL^_&H^eb2SjYE7yplz>TBq7!fF +zRg_&Cu_Z|G8!vy`>yYGLda9I}{nR4i +zLJ2F_5Osu?5DCj!6`FLwVtJz>Yx>b$i1p66u#)?}UiUsZgxIdx`fm*oMomA7b85)) +z62|`=?Tr)y46xvkYLshEIsNQRyW@^D+(>1PUg(v`p8&|n`(WS^>rm8~rHD35TvC*x +z934HzD@)sHmH|`mk6Q37W8QAT5rqF +zu~*%z{{k#>44@0AforSQ7kkWeBV+8{(n^FlvdjRIS@$TFEs6e!qb^YWrd;Ah({T8v +z2SJJsbGe?6=$r#w=(XiWO+iv#4lEaFwQ_gVw#)q8wB3uRgPT;NyQ@gs2H}A%Jllib +zpkHIbf+NUAx@O@jOMzMKa1GXqAiF0vzvRwA)~mqU|BxP?CMVwrF^mu2J2P`P>;CDv +zy0HO#2uOpL4~eFS^f2oYnxKkdU#c8fE_OOsQ}HUnCb1(?97m??CD`qX8ilK_ms4d4kd?%0Z=w9!XVbif4Lf +zJrR>SY>**BxAMIn)#(iem{(@Za>-&WunEO7sZIyKh#C&TiRIK7z844}~}f`Q(CxVh$-4 +z{IZb+WJfX5MFu`~tVT0fJko|eb=OQ_`)TdFL$il1AGMZYd8DT4)BxU9qs;`FsLR~_ +zj)Be(MjKINF&EubyW!qJn>NlI`4WDS?WncLAhT3$ukN)V^-ojY5Jn@}8MJ9zhF*dHliZWqr;h76p>tI#g{K{KoQSt??opUlFLyvop7ymiHFl|b*PI?KL$N~ +z$Tz;(9~9aV#D~JURUE=!JdPwO=+LrGw(=a&s=47gLRMGGbB3%|ODhX89Dxrtiz?Ae +zTB&M}!nrdO&K0@T4VzySXTKoIz8iY|o)Pwgpz8#yIb!Sckq_8@lipmQ-aD6vLbeFm +z+1ea|WH +za$$r*8tN*2yx7@=Z92!j`f1F_FWx2Ytev{K!#gR)J?~I;Jj(46=3A@XvL2h7#0&7W +zPgh%}JZCX{l!(6;k!uWA0)rV$uC8-=$w?bJY-O-zzLE_uF`(r{9Jp!9{mk8woZVp_ +zb1E?_m3d(@bFLlu4|^HS1OMM#R&ys4MI^I%baa8A{XD_A2TytfV>dE2ZFw#pH`SPx +zvwTWOZr{RW8q)f>YWb^w*7OXvKu+)GoNl42(52%}Dc`s)_!{cKayDi{Bm(X+nmr3B +zUCYEKml$QZZH=+~v>;}<=x&{o$$egC_Nf%ibEdk_P(qCkVz_Hnl5<2181$9xMf#5YBQZnQbA(N&gg(H%R*O8L+P;P-@+4lLG#lypW($o%2t1s4}QcWX_cynIeWY% +zh&u41w=UJMs4qk-@iW`VsbHK4TyI{M%N8QQES2*wHCpIuSre7|u~}n_5^qNV84tkf +zXE>hOT**NRj&SIrg297cK5kmDyt4!}8sR?2#B$|B{e5P!c%m^BnLms_K|r#qA};g4j;aK2Bvz#H6?>YjNWSEivgt&|tmdyP%e_{21x}om{$ORf-s$zK +zrki?w^`hHf)w-ejBx>23IHyWd;|yrdxxw+fzT9l}nDWvjyGP04(HRgSaZ922E4}n9 +zvI-?dwYhvxG$Xf$tLd3!-D*WiV^*OXBW`krm!+pwC?qhclm$9seR)WMk;pg|db4fH +zFA7qGhJxO6CFoOZTScO_Qi99NSIW+lG;rYC+|m#LEsf>vWJq2@A&sttXRb8&cS#KE +z=-}D#Sfz-?$L+}obBt}4<;UXV))n9*{DqdD@48rjv#h_k+5L=1*6JI(#$1>H5b4aj +zO^d(Wz;oJ#W6ij;YGU`|s^GskBPM$ld?jD$t?opb;%>xhPBBx=KL==c>~d`zw3B9^Xsim;Y%i)Rw&MMP6V`wKLHosiPZ +zwsWwHX^~F0Pkw2VnXp7%a<1GcNt9#c%{6DIt#=59NhAiOC*mij`Rk?Sxf0mlvGrKO +zGXKtqemQqanpfXi;hA3xWP(H-L5cea7@4a4H +zubPYLMAq>lz3TSSi`Aq$Hpb0Ox`bXz$$5}`NMK+8#235C;aN4XP(<(SKJ-RPG?vfY +zc;EIT9S+&GvD%?Nx5@TXqRAj(LwcTFBU~y5JycvYNRk*vLz`D#;}ZuGYtgNi!tjF6ml-K7g0Q&V;>8cgNu)mVabNW2sSX +zd~AGfd}=&veAoEC@z+MBku(uBdE*vjiF1~0lS(HgcM7HQx_S02 +zrmY>D*MwhJrk&SUovAVIWp{)ZyNX=mj&b1x|CY1LbMp4@+-IzXzY-d$bmlVT7vYXe +z-~hr|hoT)GEQI?=W45sS$zB?_+U;~Wc7m3Qn+%45Q`Dz4Spo{Qw%xR*jv9X-)<}QC +z@%3)gAJO=BnCdICO4WN_^1!;$ZxUx#^`Oyv4(#6z55gR*Fun8Vy}vQ{j=IE~47hK+XzlS~LOtu^I6GrL60zA67PVR;a)1R8MFG_s^t)8_*?Nt{8_ +z*g<4bAKf1^A0Zo4x@5JrSB@nutKQS&xww=g9(R(WRLn=&N$3F +zRH&IBib0z|Kd~T4Ltvy6xoz-JplC?Aa3IlQ*@_~Y#7WCsbbFw2{dXceJ#TSr3-|;g +zmUDyS5|BnO8>1;D4%?&$jE1wAXEogB@<~STH}yx!Dfy`4b;fwq;=rY32FFGWWXEW` +zb!oJ#Va&$4`$)Np)NXdJQ@&Bn($sR=E`Yk82Z{8=VDBi{kzF;EGi1@|L!c|>xvQs3 +zNeQ@pO?xty(gBayo9uz>Fqj +z87I|1N!X2=;Rq#oCDfVR+}tL-2SVg8KZ1j3oIII=`lQ#*#*X&Mj4l@r#>LPn7W9_j +z3g`^cEw+A9T535QJoqKDrp!(hd)%~qTEx^ey+L(G_(_>1%DTKmSr{pBwQ=H6MyEbK +zOrJEm|f|awiiOm(?~H94sckT-JMD=3sUQu3E`n++eCX +z3LEB(zf`sl+^(L~wsF35iPN`krtv+Aw&icUktteo5)wT5ts>+9Bq8@pzXn>t`m!nl +zOVxNFdkQ^2B_|Z1FLp7vig-5OibcAw-diM-P3NjU487qnluV#7eRQD%A;v%ypN-s} +zT_pqYMgz8fT|Q`_i+WODb>5f&$<|7rF_2=a`8X*79why)e+ars?R`q0zk<|Q&_V07 +z6XJz?B;Q6sB0RJBbVj7^G|5eqcci?kyMy%i>O4vN{LP(fVM?k#6r;QomNr=N3A?(8 +zQ7Z-J2Hsd{m5REoEN|sL;ojWQ|}zPL6Lg4(OY&OHdS>jI(ZsbP+h7 +z^aC95#tuhY=?yqcR&uf0W&$)fguWR_G#&2q5TN@N{;x`j497g!T +z1`+gO(kn~}J;<%&+UfGThmyu7j>Lz8m2xfRqWfJkv^b`Yg}5en6b8qPkw@!dVC`mA +z`!6U-C^vQn>@j+z#4yfj>Il-e7iVc;qDriZ<-8D;hMiy8N#_BHm +z-KvN7pMI2S)|drOp7a)N0Ad;c%-6!P`lFpzJZ78f4N@etwIFj;5SUP*EU`w|maCt> +zCj+IrX9dxJYp&80*8sv2axFuygwE&{El4E;@)q_TB;+g8#v(zI?F^mLd7*Mp^#H%rt*3Q# +z)V{4ca-^j5kr6+q9KRG6%+;!q?1PhB5qai)D`QSlqA59gpoQE;h`*;G;Nx!EnY8oQZ|=0wLoplQ_SA>Urp_?Bq(JGz+mV(jqTb96UVQ7^ +zbS3pN`|9MHDtXgzChAl!QZ`v9{oCBqBeN^Ys2q267gbYklLy^Uz>VJ~&`klF(9|M% +zBmCV*01rS>yjO$LKHZ9vCW^jmMhx(~==tNFmFAoe%_wda;*&14@6s{_U8VrYw4^`v +zx^W7e8cwZ-TP+VT6VZGjaRZ!m*P&S879M_alrc&THPA*KB1e=>`;ICNmYqwGDW!`&4zBbEK1iH& +z!m;rF|2#X@8WnDOn=l_J&M_378XVpiOBF)7h)vPt%1JW58Irzu6@FM5(e`@w@_2Xu +zgjZdP>bqPUW&W`$M4?tL+cKz-Vh8pbhDYX-)GWv9_|LU9``Xh_(H@XI#Iuy4>Yrr- +zCfjueoZ{9kPPv9Zfov>M=I(I#;vZ*m4KT`<)nl46cYYbJa35E;XetLkcY|)zDLO=5 +zwmJ2PbFI@uC=wS;-~>UJxt7ucgC0j-Hu_?UCD;`V-lI*@otKWpWz8jIy741m_t*{` +zS)*Pz9U1M@46G||<4sH^fl +z#j8b{g$axM1HKlA7SLLv)xUk;y0!7rUG96u;ReG-msd8!)`EuZHLc?Jpo-tN<*u1SHN%;QOLdN9FW6H=qEW?ZO!O-fXd0%HM1gJ; +z$$*aL#iBO5_~$lA%(~7sn)3_~tghynVsbxjedxpFl1OCTu@*+EXA=v0?z>yGCA1$f23$nt&N(NRnJT;XT|TEJKnoiAk&bl(_>=mHt>0 +zPnfM-BKVSp#|9y*ZZX+>M4xI8@~7lBY5hN~(#P{$R9BxVs4X;s+CvzL@b402E#P(y +zQZ`y`Q=XPL`o%xiRQ?q2NxZNSd>8EG#3M`&Zh^^Jt{2_`KT3WANz~pZ=YnxEr|XF} +z78tDHnR>e-s@0a}siw5jq-h1FhC{p6I=4`-+pa{NOBe5Gn7&wKmu}3`>%I*-?$VCU +zg0UKblCff6wPx(oFjkg=Ldc>?2!~^l+a&T-!f52@Zi|&7L@h8z`acxjyc1^HLf`>U +zs}W={D6QH?JUkThmJ5ZrfUC`DN&C2a)gK^|AyLJ2puJq^HatBfnyi6L)HgcxIDQf4 +zT2cnvx*Bt)B}}wbD(lS;2K&n^Ke(uwvw0C_YtAnO5>}Tft~=)g%Y<%7$S})>MLxAi +z4Kj>0aNtgO071rSr8gqoxMv8RACA7^?#^t{{3Ptxb_a(xFFQugp-m4i03-2mm!3O$ +zCfQG78M84?W8m4Qlb(8Hs`I^r=J&T+i5ZK0>G}El-YVNO$X+SC?>x(ovr(&`AuEi~ +zCUKiq!Z3mh<^oJ}JZMUW(qcg@0o`UC&eJaR61v-H{8!E->gPMH)-86=xX3DwEw7;{-WdB+4cf&Q|1JPwdV46qm{$ +zNl|vN)7(Bdpa`{IB2^d$e^QMaKiL?q{2UUMNC(@8FXGL^2h%wGcAAE#_&kyR0wN62 +z35p_|NE&KNVB!cP_9{Y^(?A#DA6i@$n!J3QyWMQqYuzUA>7rEQ%yf9~%)hX_bWX05 +zfIP>@vYw=~7o30T!5hqHUR8R#m!i*fzheWc8qtuyeX?Js35oPmIv?HS1NztyGNT)y +z6K&(|55sIq3W2rzpFqF2J9R9ge1Z@C$iaB&DZGNQm3rsyBP0@Micxeb)>a?&H>_ig}^ +zac45@q3up2YJ`k{_OyWxyBnhiPu|a1I`{pIWlc+3LqU~~m=InZQwAtBzmaWTFpvTj}05iTzF`3{IABI>1(RXsQtiWWrjD>0&cKe!Dn_79rUNZ=flM7Gk5 +z79@tF=3>If&n8=IxHk=Th(}n@D`9e$!c*)sEa~y@dI?iQ4>?oVz4paFQ?GuN%15q$ +zBQ_eLkw(r+W6_CeUj8dOINCfy&W`%Z-%<-cOJM_*%Q<61BNtsr8=LS*<{ia`c_FX% +zE^|XaSK(iE1;qO9`Tox@_cqjjV3fM9fEPFpI2c9k6;odtOT?%$ZGML&PN(BW>12P! +z0!Oq6MNoo*8Fr#$nyp?a(kn!%5<~F!Q8~nn+eKlZ=I?hSiKjNfRv5N8lDT|-i}d1Q +z^u{$OWV(+gvMn8E#uzByB-)a1=;wY>>oR8pSiCp#4QmR;HWsm&AOJ)AoGJ0>I9X5M +zlY)nmY2hK-Vd=nf)@nb&d|B*Ts-{ZM&|Z+LsPz%k0Q)M$f@yj~HmP%_?hBozlE{y9 +zUGKd-+TC-d46Q_&jk@h-D22E(2rr`54|`IPDgiv%sMxni?urL}5_?g1kN;NgH#ANU +znmlrbgKN-~>&nH)-hmStDG_JVZD{4kNl2vk|MS|`Os*Y*$l +zog%w?G00R;h$$T@i(IY0f^}d_i0=AFVWnp@U00zk08AaQl8tO`-K|%vU8XHG(agd& +zE?QZ)9Sqv_&_^Z#m(8@phIn?~2x*Xl8t0OIhznG-JgukmNBgD2f=06_n6op<@P0EkL7evJtjwS#iRDLOFiA0f$1%1!W1j*?!vb$ +zP?*a4+yYT+0?d(WJSZHJ@6PQiCGoaO|FkCK0nUU2=b~;)Z+lS-D4Kl4+Lp2bmL~fs +zgo7~>mlqTpz>$-{%y}Ukmj2OaE2<$8F&WcMJ+iBF{)iV;%M2eiXnm)qR +z0TM|HM*$o)S29$WG^~8Y5hl?YHz)Cwz8M2gUM8 +zdsI)3Pz(INo24rpag{q8XKC*e`&2e+f+oH=rjoOcyov9#lCu4Gj$R%^e>JgD!V;%P +zuTFOM7^aJlcjloJX5-iZBcv8563y}4GoP&C4PRFXs4R$3y4oONU%VOtBH=i*q4ytW +znemEJWegyej%t7ivPZ|vzM2F5cz?&FfJJb-weXssYlgM(OSGm0d9i<5J#_vuX=5Ab +z^+81(7AIYzCY;_+gTs*RCIQ-C2}U;+(it~V&qx`LG~pz+4=wdOtx>1q2ATi{OSc}| +z1lvWG)ro+UkWHc(l8{C8P3<%ym$kIN7a!ZUHHbT2P_(OYE{pd8f)Cv~s4Jt0yyM};w!+Jfz6vnTKI}pmXedpus3lUwc`4r8Q>9#Ud%tZgQ +z1M|lK!_IO=q87zC+`)*jn=Dk-_61N!k}DADb1WF>AYrJU`4f^JMlYIWe*QJu_*QfpR;A8U`kd{{mfo6 +zyLqk%X9N%#<;f8+qu`T{C}t?|ukV0Hpeb;YyuwQ;vG-T0#01*!vO5FacB&HtYKHvF +zX@$EBU-#PfZU9z}Z2$1|Z2REAImifs<*UO5ChW%Hz$U1wT#2_XdO@E!7R8nhnhY;M +zoVsF5gdmb8#Fnl-tOS$;^TnY5!=)MlaC@0VO9fgCClen2E?zQ*(~|Syu*9d)52w2| +zYyt*+(X*k*l-SNeUx;oF7)vfx(Dcqk3QHx{96F@1AOlsMn1@4_*W^zXppcS +z4m(hLZYARZa5uu2yR5heK(}xIykusHj~j{H4UJnygVu`{B3GJ9GwQeTr@|K=s7j)OyTNBwwzH_ouFqDK+u% +zXc;k6&RE!yL%wB8<3|qBeM$9J5!SQ7R2K&UyM5ff(YB0;|HmSex46G?z|0%EfA7COaml +zBL|BHwz-D7@0t;gJKcj!GVm%*{xq~A#|i9sdYPuo4( +zXE-oBPQ0v7I0VHd6Pok`5K~J0=HOgT(h!Q{zBPQb30$T^05t))OgS`9_73*8PoWXj +z3lCfEx2V(70-oLnD-vVoEIyq8LN0V36lQ|LZL_^tkW(?Sj#{;o*U1|XmGXXOvU!;$ +z1Zt(`MeO_IVN_16nNFUHv@}YlYB>93=hex{-r?Enjg!5O{ +zW*BNno0HLDLV{*1&@NIaU+@CBvB<@}RW*B}!GGq>0fdCYXe*CtHkm}Nz(%9&ZSS#j +zM@|Ly6wtVvVo()(?@9A0m_tjrraC&-nAsTUlDdF|RMGcjAnUGXa++^DP98BUK4d3SsS#Hqlj1lD{XxZ#lqnJ4w3S%V +zq7L|vl7j&(Q}TDc%-X +z`%3e-;w(X`zd_b}Jh@;i+~hKSpXkgmg{wJn-(PpFhz4KlTz_~Ale!)!OFPwM{V#v{ +z(+d9mpY-=%RuUNG8vXr*{(hP~AAxXvI=CFaM}&Qj*@nfxcfa4JCXb*!jBtm%10XJt +z!Jq!nq}yjCQ6WzV +zc@B(WWMhuj+r$EasCnF|m$Y~ImJjwctGWBH)lPWu_%&JFPm +zpc(2Uu^p^YH1%g1;Xs*(Cq(;~Sn^Zepo+~PBSS{2TDD-ic2>q%>KgVf^PK3Ch)f!5 +zXD=tc6>I_uCqM0<{Rn4DvVHhV^3(Ro$@bydFVD<9Ei!e?k>7Au7?=mF&iIxx4?jv? +z?w#!X2vxR!*gx1m`vvFleE;ll@ANczesq#-C&$|-XZt&^4z^E{<5wrgN2hpmBxxZi +zGkh^f4GG|jqfF-g3#_9X{S@ea+C|x_#lfU!t`z~bH&7;P?7;CEN|nGst|aeA-EpcM +zske%hq&&dkmE_yMBxfmV%aUUX16WH=F&1a?^eOCx9|qYNi@w~(%4<*7*Vk+7PuF0_ +zygJ>MX>F6kD9hi%ogiMw2#RO3BI+z`!$EAC73s_oGg~9l-dNp%uZwG8W&dVfBEDX^ +z#!RSr#!?ceqlKy6+r3FAHCsl}o-VA-XlNd^kBn+#BI`T$bW5$Vr#EraK%~FfG!WwC +zkEe_|K-Q+793}TOVw(<-GB!6D^!tqBXtSYqL9BIbjmM-bJ{RIh4wq~xjtX|(WptQ~ +z+GyG%!K3Sr*~z7WYg%u$?F`J@W~;sF7J=hTJZB1upgjpsL2_HIvz2)bb)0mLTVtq6 +z-v&5$F8+Y$B;_YTg!L%Eu(Z=uqKqMI@L!X3x>VlsLf!ZWIyuaB$5xyr<8vZtm$-3t +zC`&_QN!`b5oem+EP_-&iBvnk@OpxTUQMEr!lGm<3)%d@Z{_64HLotV9&H~s_zzUb| +zJU%&kakBlAu2WvU1QAd5+!D8-aULzfC`FQjen;eBl%QFT((z=37AOD{vdCv^EiueD +zeuQuPgZF(PTF@Dy5Vk4}(kPD1wF}O0#WP9C8>6^JD7AMho0^Iv|jol$u$En>$kV{_KZfzND|lh$&J|2@VJA!Wh~`( +zbH9ENHl(TE)lUXD2P+g$b$PCJkcHD#t +zT+y6)0i6ZD@o@j}#fCt@Qb$x~IKhX2^>es45>m;klE{haF=6%s`Elepkw^%ifn-AB +zJ$!Ue$IlgM`G&+2ywh`91Cr(%xi`+YWqDQma-5EO71e~|?cs}2>jKN(h~#Y`ATkr|`P&;kj<#XC`7c#nh?1XSmo+ACElCA#wI(f6a{d(u+o952Z;q(0$ +z%^&x+clS<~FsybJ!)jOS%d3s`RiL}UjKs0jE--r|;1Y|kgF?i`ou=!6O`f=MH(bp> +zTXJ0sH&Bbqjn&nPyx4&0tya!Gf9K*Z +z%9p_Ql!|?y?G|yX<#!2E(SN}M$?%S?o65?Z2b9y=RPs0bd~#Zf)4qZ&18vol+W2+| +z+!$;d6w#fDpmiY{fPZ37A4D}ks|I{2uL80FqRAK538J8zTq33mq9D3HbI`{_lW$Bs +zynk*i!Nu2`BV2R2PR!DjZVjYU65(zYm7L}9kcwBBsu1>p)8nQa2)dAA-qUO9Dl(l3yfy-vHXZUC*}N> +zFD1>Zc&jNVPEU65p3R`MDfmfA=xuqmy=qcT&@c#jrDn;FWx>q2J#-7md_rH|xw^i7 +zh_0{wu7l7NPITJW9II1mInC1$zxNiTs9HO$RzZK{rE2m~^=xa;lFt=wtsUPoz4XH; +z)WZBh8>TmH!#sy^{l5E!dzf>(sJiI)*eAXD_et-I_lcdzov>A_&5L(Fyh6lN#ohl3 +ze&=3jzYyX(JBX$I_AOsBIboS28vq+W19&TC=$3e_51$dSNI!7%=CYSeKcp73!v(*w_h!H}oF?b8_fsMUAZznP7&xVsx +zcQDDEX4+)3O43HFmyx9ro9Xv6y!%5_HfV{>ep&#?t1DDQvw*p@z5nxy)7I{*m1O^9 +z|L5u~EgiIQrZd$YJaAPZTz#z)K_=F;>$@Gj-?#T%wpZJWt*85_01$GDab +zVfELoEFG(<$uI||CtTxHprZu|S#Jg(K +z4J};|AFixLl}{R&taqjnqXaZX8AG$x!Ro4VNjxN5Bpja2ZYSC73i`jkOaIsR?|&{b +zy^kk)#cEwHFamWiwQ0QwpG}HMzNWVBaG|2Db(^DKNNjNEXsv{%J;Tjp|;-}j<`mVvF|vF +z8#}G3BZ_npAD@COTr7;paM>S>I*G7Q8z!tV%ME;iyU|!(eYE-vf34y_@R+P#;qxQ> +z{Y(TISzP>yZcOOMOP9_Rq7HxPRkQh8D(la(=F8(%)z?8n22-)VYKtg_yD34ObWDhc +zS~i;bjDcy(*yvFF#i@?Eie3xYn9*o6ma(_Ey9G<@%hG}wg=~cdrOE=@>a@0p@$4Dh{^HnACzdCmfBGaHm9rk4|er(a*_fX+;l(TLcYOON=M| +z)Y1ZpET|pL@SRC!IL{>3dnU&VkdGP~!A@t6vQc~0y^Riemf(94gA^3IH;WXub4MoW +zTlTwA^Z4=-9A-^660f@L*4yNZ!@&(Mng?eG`#+p)pX~3QCYv&*daos);i1`UH93q8 +z7Qmp}@?IRw>uvXCHfXTKe@B(I2Ocj&)`K~NaFWjQOMD)gM;S&;aT(Sm*c&yV1zB4OYCrjr$8z&pvmE|Ja;)Twd0feO)BD#`0V|hBqSORFUt6E!~{#VRc0;p`i +z*mFAiW_m|5+dFlI^MX!vN)C?gK0nxgfke*t%?AR$v4)we3VrlVke(Vqv{kzv4Blc= +z#9kjSRB9@B*IPi8clS=ucK1)J<)t2FiLI`}zeM8dtp(4!*)+p9rqiq5;h^jGr=L8) +zsm*iHb^8x<&_O$QJ?Pe+ur?rZ=j3^f84ry0`k(9HO2|{^2*k=;)>y9FA5O+XPja57 +z-;l%Sw=1F7>7R4Hr|aT@ip`)CDm{La%;AelewFTQ@~))QJUg)oR7qk$g?_xBH7QMW`4 +zR|0f`<~Nr0?zP?<|50pYnhWVn|4~x$Huv0M>tNuO7$VhQol +zgJX+-ZJ{H+a%K41KEbEIA8()i=oKEmy+Vq@h09CwySln10p7U?lLH+_q=4{*TF5?n +z1#v8Ns&hGXQ)}Hco9zxf?Cj#$fWa?+{QpmXZ2o=k1PS2d`seZzerTTV0mQb?j!vqi +zi*I*K=rEj*{M<5hvYA~scel^BWjOk-n$+4T4gcwzZ@i-F-jy%y6+7KI**`vumXZ;O +zg*Fw@S2&I;MkUeQclc3oxM|)}vJNPAcy#h|8#zXu98l=vlfB@@(dn80MykC!%vB6u +zVb$QBaF)QD_2BFRc+v}i=Jg;OyYKNC7qT_FO1%&K20rcXL-QDg3(j<$XGA`Ty~TJR +z7*>9!Op#3l6`|1Lq*>as>I +zU_vGwMr8}ayS<$=D@ht5u{Y2+A|dt$Q4!IWWBJfNt8nO7G}56h=!k~7mn0YZEwEr{ +zOGczZzk(wc+FC{?3}2x@=-0OrVOSQ$!B|-%59azqVK7#Mq`|N>ih|)gk^^Hcj3RR( +zDKLCVBB0*_$$++;5dfX#5a};~tP%fu0~h@)R?#NTeE?kD-Fv?M>Hw+k&cUl)!qVD) +z9sV=ajDANq-r{2*1*C$MO$Lv2ec8Ne-2!*AX(ABQ2zGX=#Em~cm4CgCtF+1N@9me( +zo#SJYER>|!XZ~y+I}OJjicq`gaCUYMc6I6;S~5B= +z3RH)M4t9&CX1ft-3%{A4wLwzen$1_yAvUYf-Wkhs>6n~=cjU3nkJyCJRRo|t6|4HF +zEy45I-p~7o&yVQ$-p^+z+f6J{HRl^rMEMD$-`?HbNB4g?GXOwDE`wKC=p~TU=JV}? +z(>*F+AI-MNc4=Ph{@h^OJd`!>B$NXSR +z$Zvf8%M0Qwf1>yLutocv%HqHDc#Ki}=mq|QS9?1@9^ni8S00-?`l7j`uMW+tLw$8- +zUY+5q7bkl(Q2K!{e%^!Cr#JL#3)#vY2RQa=%W|B;=5D#q&S%ToZUwKLLWZ&3^53{c +z&frC?HSYsduv(5S`H3(0e>mJbQ#VGtX0i9V;;=S;nhdF(7&UWu(^VLr99o}FOLY9L=`q|`>z`t9<`1tBFON>noX_^9Q;;H{I%V+L`HTp1 +z_`)r~Z=51PYQje3l~YJ$Lbs5-qC&2a$YtC&Pz0oW03UwhUw9CRw2dzv$(wj?dWS#o +z1>!ipz#k|{+p*X&wA#(~xXDCIf1B5~clX(RHa$3x%=h*F~KXL^7S7i0lUQY8J_68X}VD}@{Fbz7Nv +z&5!0|dpNP5;K6(tI8_F={JXT@8I0^FeumFhzp*7hw>XUf21CX;&G5l_6sgydc1Z{} +zW3^BENk*!__4U9OADFUsl+L5QRFiSqC;D_bFz@N7r{>`I`m{w{trX{9{0e7iU&|AI +zLSYr}OSNzB1r$JgApXL?@D<*6H;43&f5OWFChKq~;k`gLk%6`WbX*C-MPgr|N@me3 +zGx)_h9o<>@Z?MR1hSINoHcv*I;b}2M!C@BNeYT%v;q8 +z05!~*xA?ez`sz8b&wHmE?(YOp9aT$p{Qt#&Ek2H_v^SDM1^9F|x2TeR4Kq43Y>|ar +zI;5~Hf2BYb4YKzlW4KDRS|t(XIznx^T!xp+Rr3O>c0zqIUa*vx@GKH73;q-hO6#Up +zgX0^{i)(6Q!8k@dbJ`T^S$%~Dcl;YowfGl%quSn8iAH_vS%{h+Jp>c?R=2{9#APc6EalKQCqhcOJY>^SgOrz>5?u;DsX;Q@BY*m}zP$SB +zQ{}w$%-6pGe;-aaH+cC|)f7EualBg2 +z&CZPWS=6X9MzF=q%^(~1Zh2+po{N^0r?*@$FR^x%3Zr>ZaZ!oX0(?ZfKG@)!H@;OP +zJCpKv`t9Ps@?X#4QLi14ihPHz5mdY_8<%Dv9}Ubgg&E)9#YN`p9s<2{sdcb_dQ6vFuvBbfP$l7zvEM1^ +zRFBjV<^%fwZIW)DlTT#vDPR4Tu%!8s;#(37|0+!E^^SJjvf9Im^*a{+zqGdE14Zd%3?0L*hxHZs-bl +z8=N#Hxr2Y{;E%yofs?l+S@6K7z{Il}THoZ((Pd%teE7a2gPFD({~F8TMO0X#JKZK` +zBdwOp2sd3L9sGuj+M%)(vp|a>i51wC%jwN@WiD{2PD%f%xMf&rTuoNXx_^?{pBV6 +zO~$8e9lSzLKi)I6;tIoRoMmA#ynMvA*olP@MZvz6q866=puPe&DuB<53ZSOw& +zY65NMzST>CJV?y)DwlAf=gOvvT7D^qwsSKTqx-N^avYbT_NoVu9PR3Ow25G;bAZY? +zeg|w`6BG!pHay8U5R9JVVzIlr5sAC@w>D$OI=cZ64h9wMew22!1k|Ta;(bI)`@Q+{ +zDcvw3gK4y|^kyT`52T}|0;-n7qsEi693xgFPNX&MQk0*lTEf}FmYy?$g-Q(vU3j?C +z)rLm;paJS{yl1sv@X7m(_tEwhpC@Q-pG=zi8+rbt70Z0cF32;OHVHey*RE8Mlee0 +zOu=X(G#=QiG%Q9j{jF~`$W~0dl6ZnB3rx-`aDxWg8;J!x?F0e2Rpz_j?WmHRT%Y7t +zkhgd!8Ye#IL!)`ug>k&=>fq=XVa4_M2DUK%Z8qEGU?UL$T3=}CU~~G)I7byXYqJ{< +zLAOz%0G8PJV0Vk^AU$c{EdVIB5t0s_M2MLiNe)-z3l%BmuWr5}S*SoE0zKvs#((3N +zPy~o<_8j^dZOG!|Vdruqfxn~&{zV`df+#l3^nIqUT}tlKbpdcvq?ElY8u;#=q*6Nm +z@#ydukq?D4M^z|~MM8t=D)Jsl@^F}Aw~`!c7cJO9#XBv(%lw+ASvuLZleMZ&|-J1pG>a;K;CC9j{> +zzx~U~)B2yDR?!wk1ApR~$0-5P$b~kOCP&XW^{dT0Ez#@}a+^(-@c2Ew&Hj#NCTP(x +zHaWgAJthW`g9hq{M|(e`k?oAcy?C1)SYX9mq5UG$oUi?o=r_GyTYFMl`!;#9w(;ai +z%x}8L|2p5)TrSv8*H-?NJchsjj4s$ovW)+&!e0PZHCX))C;>EIzy2Q9I(dX)FMr(r +z`<_XXQ^l83wp6d@+}}#@9W%#YPKPe?XRCW+zBM(DOJT_(SQl2fx66BRi+6Q?zjKh6 +z{s1?da@J^b(;5wvF-U}H-`2coWp5L*p6ql+7-Vh;<>_FuMmn%a@PCUoXtFqaZT5Fw +z9?xEvu+-Ew2@8MOdgNOB1J;7pfH-^lHR+Ei1w1{ByEjaA>?2Ukn_-f5dq4xngZ|Yd +zO@?UnJ-BRk($@I;LDp@aRlCEQJ>-gg$$H&wwPwRzzzH+BnFF3!Z8lKDQd1!t7XC8u=34s$=mlB_ +zH!(8WfPeO~7XOf(%MU>Sc*SNfMZVnB#mE=`vgL@h_XjKpaZng*p~XpwzZCeelV(Fc +zC^Qx9LD?^ZdDz$=0PyU#U%TuL1|8yI;6HL9GCv-7hl8QF4IbZjDS)8OUW%a5)TIc@ +ze%Vrljr{>jG3gBPKZ5%g;=cN$T<0chz7&Dh6u37$Z439{C?0hHR{b&5 ++ echo $ECHO_N "checking low-level packet interface type... $ECHO_C" >&6 ++ ++-if test -r /dev/bpf0 ; then +++if [ -n "$LL_INT_TYPE" ]; then +++ echo "$as_me:$LINENO: result: found $LL_INT_TYPE (cached)" >&5 +++elif test -r /dev/bpf0 ; then ++ LL_INT_TYPE=bpf ++ echo "$as_me:$LINENO: result: found bpf" >&5 ++ echo "${ECHO_T}found bpf" >&6 ++diff -ur libnet.old/configure.in libnet.dev/configure.in ++--- libnet.old/configure.in 2007-04-01 17:36:55.000000000 +0200 +++++ libnet.dev/configure.in 2007-04-01 17:41:08.000000000 +0200 ++@@ -97,7 +97,9 @@ ++ dnl ++ AC_MSG_CHECKING(low-level packet interface type) ++ ++-if test -r /dev/bpf0 ; then +++if [ -n "$LL_INT_TYPE" ]; then +++ AC_MSG_RESULT(found $LL_INT_TYPE (cached)) +++elif test -r /dev/bpf0 ; then ++ LL_INT_TYPE=bpf ++ AC_MSG_RESULT(found bpf) ++ elif test -r /usr/include/net/pfilt.h ; then +diff --git a/feeds/packages/libs/libnet-1.0.x/patches/100-debian_subset.patch.gz b/feeds/packages/libs/libnet-1.0.x/patches/100-debian_subset.patch.gz +new file mode 100644 +index 0000000000000000000000000000000000000000..0c1d676ca4b443b9be68ba77cd310f115ec80a91 +GIT binary patch +literal 208420 +zcmV(vKzB?ue-h07nzP8EpP9IA%d#F| +z-#UEp?7%uWgn#VduyJqz|7r*Fk5vy24-U4g)#`oCY#kjOJhcv%sSYI+Ts4;0c*9kt3l|_SDw$xyJ@tvli2lwxMIq!xzS<~h1=Eb>gf9AX>T}U +zO$KyKa3Z4n(|FjnPkW;=;EH)~g3umyhP|sX@{4}BQ8)>vh`#mXB#6S=tigWl4oAH~ +zf4jPs_#U%-wv*Ird-bn9kQ(|D%}U>t>O1T^R{oBC&&sWB?~y|#bh^)!QtgKaPEh_G +z<0nOZ<}f~?QEXq22bb+1y7u5|48}ndPomflrXdR>%k!6h==q@=_z4;t2dZiJACotIkQmKA!C=pJD;7_*vOrMi5E`DzFPpO6@-&0^gpZ;9Qf}!^SytZq{Y|F +zD)#LlT&_~+6-RVK=VtCh$KdaDwOA(1^KVwuX%J2sw#A&#W3bF_qQqx@97i#M}%`Pwokh+ug^i>WekS- +zz_o9p?i>Ir`yYJQ7HGm406=p$WH537U|#n6_SFy?{YhZJuOOzrZT0${EJ`>ifxhUy +z%%Wk23DjjfCsYH-yujM;j)W8W;y}Zi>Rca2knIZ5Z +z*C2R8-MP3v?J5G%8-r-3h^$weh;+%C`Hlx()?_<-1lwd4x;R5JjH5>|CTYBKQ<$h3 +z&dWz|E*v+GGF?#msXAvD?eme@2m!G9t1E@$7y$s>;N?HNo$*L(eubz246JJ?@);TQDmW);l6LQOdal-Yz@c^gqqyb1LbP%RBZriMZsU8~DT+S+Qx +z3uaA7+s8!Jij{}f&>D7!_I}yRE!U$yo>2UQB&#%-8zfA)9!`o#O)BitC?pj~O)aq6 +z!e9^O8u_q{##k)x@(7~Bo;`hfADNB?9wgOKMMZ52pTYAGsg5)rB-NphCN&*@MNgf= +zo&tlI1;u!(@OXwI6da2Uq$k)^zk(#@fb1(ndU*sSC +zMgGgb$lv~p{DUv#hk3ej;ubRSh-%{u#&wPVxpUtM(eVZo?lLX@t0k7A(kgsR7koyES-M$sgF?|{9}qE+b8VS1nSLYIs-o&`z9>`yj)NOaRs<<2`#wl# +z3^4c|tx~p#ykHWzBsPQvCrR>fs^*m(sa+b??;z406D_*riZ +z@!E);4Th|Z0*3X4)TJJ_M%}TE3A7g0MEaqr^A1&=97V9M0qV!A +z_V`tXc=>J$aDAG=ZE%rmy_`P15xl|oh)7p6gs2OJ%$yFo<1B0& +z7DSVEPEoaHsa*c^=g})$#B|l#r}8c$>`@oY(H;+ml@cx+*W0cNH;&yAMamIV0A?pM +za_>SL38QG(TCi`Ak29oK!@>EmeOW-AA>&EmLMpkZyy~`3yF(($Y%|b#82kj2ScDW4 +z)K*YCbQV64^#{YtHlE;Q=Nj8p*obm~!DyU?2)66~8e<-WtT~uC-NEr^4iPTclK^1N +zS(KzE9P2oaPCWH92o7oSe68IXTwX#z-eg0t#$^|}OXIAZvga?8igEHcZzsS3ZWUl) +zJOjmxA$V#%hVLCm*=IO!-!Wxv2ms}jUro}r! +z0`e1BnX4N$&D))eK?jEC@|XtS)WdP-k?YKBi(|eTMBQE-lbH(W#o_{vf_|%RVUD}H +zZg!Ga(2kCSAfC5RyI0-*X}90$;R%wrqWe(cf;qXZGW51g(MzMHPP$SibR8Fbp{UHG +zDN1Ep+c})ZMg}JDk~MjwP{lc&*bC<)>{tLD +z4X%eB)KRQFqdx3*uEB}^*tN&);dz(j9>a%oVGGG!u +zQ{^iHH;o*lL}9MHfFmc!p`vm`l@!Ajo!Q>oel&`@)Qk(vY#kXaBCU4q}V&)OHGE)nReLXL;m1`cb4f)&c4V@$kPMQtcmLa6`Uj{OS5pAfH9&Pb2*R8`6hX<$!D*L6L(D|@Sic$dqKXqZ<5rj%D4COk8adfSvqdXB>w#>SL*5PC;2Qr9MFxkpN +zOp-AGilk)_z;JP@>@A82q#TLdruCQ=!Pm&;9nu=TK&&yyWw8$Bq=T3Llz1$1poEC( +zcrdsS5G-<_F&4UpD1FUAIOEnMgS4+ZIXpm+geD7KX+hEEn!qS_2Kje*4lCL3IO-6QqA`5^#t? +z0tgBhnWAwVLo9Gm*Cu_}+R2sDne6wVP03kbkDP5><6;Z^IR +zb#PqUO>OS9WLbfA>t~yp{F95F*OZUDGZOO2aKVcFyqAHNE +zO?hyTu)Qdi1O`YD{l1D)#ZQ$M1)AcxFWwl4Go5*s6PI!Gz)2LCR~6D-t~3fN3K1DB +zk*2@(LobRoiq`?HQwl9n1Yq_dMfMp5oivRTCLKJLuDT{sLQ`3m;7F54idJiBRP}Q* +zp{MZz15uMm!Ks)@EpWK30ZQdZ@JOQNS&qUKjJb7J2!dy$18$;SkbOcJeXDua;8 +z9EhZX8g#R+(PH3rO`{@{Ei!oY1jqnB^DSD@OSDbT3?F=Cc<&QKxmY5k4Tmjq-?OM31)BoC8ko#|2Sb@L`NvbTqp6_ +zP9fV46Db-z80?kH0Nkr60As#8i`WjMJ3OHho*&A)a(LhvV##sYIWagN$3hHSfc8HG +zDLXI)5ajSgg8amBdD)9XpO;MS45QuCoHVCUwTP29_W(bPIRp}&-r#!FFo3euC>q-! +zTuX9f(lI!MVyOOMjLTkz$QT{bdzEgfWyKkzv57<(cU`Koj8c|cwO9}C{t<>TC~U4qikA@l4=|D!qrU&R^9lTbXwcRi?n!Ipe_{@ +zXJqn}kbF9@SPEyX=%U@ern +z+mq}vEOA3+6O|S457f>M`t-H#*URO}PRU&R1rkbJLaESzC_xFJ&Np;_(fQ)c*NHh} +zTr&fyE;1@#G$3DMHeob=fBmp=INbv#kR4t?fI9z3`6_&cl}6DV`)kR|@_B?*#rSx_ +zY5+@^jh{%Ta$g0q1jMv4Wk#Jv!?;ETHGMaY;*UECnZgqDLE3}SC4rjyr;e;M_vA5ZMZJ&hX +zp(qCbcHhqecgC-dU1ybW?NoDkO?>0C*w-%?-s5UT+h`k9PDrbx3XAZ$#QPxe_u0}( +z5)$V530T`xUFLVmqT3jxp+WI>q=qhiE!kh8b%K4Hgi#C*wTxi~`RWtqEGErz`AE*a +z)J}XqY=#jB@E}>N4A>$0vPkMW9Ie;IYLE*~X1~Q^6IWkFD~_)ouoR9@xh&2BM9H~I +zd6!pG7`$kym2#d>ssGVWv_s;XndnJLwga;}>vQfWSG3v>@8aGh^x>NlkKSNIytI{t +zE7)&CqzZgsW1-*+nt(AVVZZm95ErR1bnhM1CQdM??wl|aR}`EYMv{ggGlfysPMh@1 +zmm(N&X(^g3bw7T^@n80g| +zf?eg@HLr5usA7hzYtx&VfgzP*|F*gF@U(wmGB-}L^AV*gQjiAqwaKU_fuM#jRx5q> +z8qRADV*V@F>;L|hiLI|M8@xBn&h^iCp6m9lq2iD2I;v1H0}l6pfKu+7R@>FyDMs)7 +zMvJaSjT_U8-sp;MPJx?W&{s^gHKD;?z$4C#5dHkV@|$n5k3nJg@=<#rCp2GLem7Wl#5Y)3nri(S$X3RP(zN7orb&~l0o8Om(IE9X|w!zcO3;Bs!EOmNmaCc`+12Qf-ziEO~ +zF58uI87*GV@ZYmr+_zNzZ>$xiB%S(cV%iWjk1E{4asd@@&YUyE?g=s+D`A^*Sxuu8 +z)d4Z{MM3>Q2i#y5U?`#w)^f~w11OaJr3c^Hr^YUK5gqO$I^0FL{|!Fk|0ks}BRd;s +zq>xPcsg9gho&2=Q0y+iLDnGAqe>kVnS7Re`i=KR8m&wK9zzJdW7&n*TR+uTZVg-Od +zH`L%BE1ROAnW*y<(lUhjgBMKBYZ%Y;rMKz`#B!PKN65-{zJ8Za1DoP?*qlpn +zQg2|AbBHG(DqC7p=~C6r%u)^FVh!n+g!}bheyjg$uUy{W*Ev1&7>)b&S53_;qj?jz +zo`rxmOLb0RTF*=(%bAs>%0vSwW@jhAcN^A0TX^-1J=VOOm+@j`OW6ltM*R)5WkkSq +zS~6=nTo;hjKA$O|6m+1=QjF5|VFBw=5&is6Ek_|oQs8+F8!2w1fI8b+Hq-oX3G!fE +zN*N6$pP?joP7jjhO`kt&>G9lj>N0jHX1pYAmTI*+U$RnzQie85caN3^vDw-~17SV* +z{`A?iXPNh>PBni20bij0dV)W4=2E{}=Q}<=W)}WHK4FJ>0gqwNJ$rp57dA><#(VYk +zpQ8w2TpkL;*-gz@LqeL{6_%{&AHlLA4NO}Yy&Z+)^emb%%e3Gf!^gDXD&?En3PWye +z`ul>Hx0^Oj(eMqh9zD8cqGr~MqQ-9iIC`)(p!@mJjp0lA7=N@;(AdupHifTO%%-sZ +z1!hFH$JjA9ewO^Xvl0XZ0H+q>-*bq3_;OD})CT|2|G#&(h#Mr4FkFRD5EmP$6?td8 +z!ASXK663#2lULdN|L2E+2%mmf2p(g)a`4x4KHje2FZZM<`e`5j!jP_V<`cY0rc^Ke +zC~v_Nmrh7mEGP=}5SL37d*UTKH_f)lBg>Sqe4wtMuk49#tA`Bhrdox>>HQ?*|Seph&cRY +z0?OZh`K|Hmul0X5e!eRw1O&1@U+kIX@}J{Ne9&&y)5Y>r-C0AHVsZd87n~8SzV4o3G--zuxs18zL8#P`9AnWSTESuOCJazoBy7616EpvnK$7$Pm0;|N +z&7NFqO?0hvDck1nfjyn1&4gQZL$jw37QSZ|oehCfK$54+Y+#HF(*)JVFJ+}_(8swy +zY~7Gk{xI;{_axNVhvvG_a;S41YR*0ugp!&yqdG&ry`mLkiYP9BzS)TDwfbiLdSkG0 +zxA9P-$3Ou2SC%&yUH@w0mtJI^DJ98XW){=#UD%~t;H|rt@P7atzg&J=d7h=+lar&9 +zbymoUZqOMCzcUJk26NX7V#7f|En)Xg(^m$u12!u1N22s*7eu=K^oKZM4WwldO^2y6nKBoKH~`%b|GKCuU`-(#b6zbBupCmo2%a-GWQ*#xmy +z+h1CayX)CryiOT5MVn)iMM{`VL(Jq&G+(+CfliunT6#BDH|S_x8UDYv2eT>Q`ZJqS +z=;dNcxen2mjorG)^ffkc>`6v5$B8Tt_XeY!*zICf4Nxvrwkx%1mXx*YbhKo*m~dl6 +zJJn2IM6E7L2iKTX$9;}%ZhEnVbg7mV^>g?h2$pp_%G)E+Ka^HBsW3j+G&KvCI)IyF +z#zcmCVQbx(SK3d^Eroe%MD}#Z06dI6>q5tM9bp4w9pB7-NA^`oYbC4IUwFJETPrI- +z_zD%!0JBY}wW&{*h+|+ZO-2E +zXleyHH|t4TFEeY1zfPZpV}L5`IcG$*!ZKx8jM?*?A9JE&iWxTv1I=^__DX6kttYCN +zL?N7;DeCE`aNUiOAfGCuS&WvjF5H+2ycavsdLnp&damjwwy^U|ZgWFlj5V}fOf{1g +z=fE!4!zgA65}}$*qTYJibna`{hIn5mk_krgS{ns?9%n6Ks%@MEdtKALlZ%=#Q(PCB +zHj7DPMg*Th6-0(vHdY<9JL|#;Iw7B`*&M(@H;5CjWA)Y?1=wzut$Q+T1@9R5;d*Xt +z3vwDeetUHI8(xm4Erj{nU*52yq{dwlmUEdUtSdC(oiuTiXIOpCkx@a)w7}6&3Zq~a +zTFI^VA}MHv)(Q)yMHO0&XD}nNf%7+dj*V(!^CvlA6;&fc(pMS~rV2z0m>|$8-HC); +zM=fL<6kyYoG!EF5A$ig}oPYx$$r{MU9b^&~MQ|z;JK!o-62!vh-|VWAaZByX+>J_= +z^J$E|^)k06RZnlv?EQ|LRq+0VeJN-w@|8WVasoGv2E*Q{%IIXay-I=bcaL6wkE9W( +zQ4gRu5>hPAR%=gRR#$7!Rx9ZA@aFIxoA|(q-H$M!FA6HOv9*^3xl|k}ZvznA;`?|M +zU`mi4@C9XL9vb)YuL3v%n7MdVA;#be1KzcQpiMFMYKKR=A21rh`s73mR!FU6f&}v_ +zFAak!ff*E*yyX@6Pb|M&UtL~beK}JW1{cJvNf@3|zLDpYf}!2-a{dJa>M`jTpgO~l +z2^jFab1pb6xPr4XU}-D(VR +zdmpiAFpS#c7NUvMO$leQzVHpRvnUqu|JmmT3xD&}Adt+NQQi5rc>xG@*z;n347_+p +z$WSP+8o(00Z5}l;UNm3*cDmbayx%(3FL(Bj_nJGqzsevYuw$J{ueTbf%?~f0HA#!F +z-@e^~lf7}Yzjd-_+M$OC3SqiW8%NuJ+1lATX*RZ+`@4sUDp(vh#L8+FHpI$PPTiu) +zG@%o}9-UzSQ$qpvfwpM?q{2r0IJ$o?b-9T}0IdW#j5Q@bQFBZ)UWM!hnvtT&vC!aw%n3=>w-Dp2q +z`aZ79%nI&{PT7`f +zdxu9S_;fkZF`m{s|4H||u5%A?Pp~W4jr|qe-$;!>_{Hr!kET5KRCdGu_|BTltXFyo +ztVaE~S4RVpIPqLp%IsJ +zaDoF>XP}{PDL30>& +zO_!1Fd|>wOj2d0@WEyQgoP$4zuRu53I}w*zIYya{}S9KvUA4L@Y?+bI`XH_^wS +zU8roBSEOw%?|#@r;=Z^4?qpZJeLzx)UwT0=hW`9H_N!v4D&p|(LDVV7ex+gt+Zx=L +zVe~clp8~g31&>b^!TyC&Yt)5a!g%(Mw%_c%-aFjc{ZJKuhDsISHJ2(}_B(W(dga&R +zZnxR-dtvt;rgclr=Z5n>M5C_&!_=t$%O`Fzh3il*xdt1_iRulli4x`BP|s9vSnCa~ +zCfz4A6DYS>^5)DQ?v3kc;RZTc&n+LlGuYj?CyLVj0 +zJ0V2B3ii^>CXLkU?<~u4-p2*eQ5Ug0M7t3ScaL{Z4l3s5XDd1*(~vQ6Kc!f_+uK2- +z&?O?ab`jMUO#Bsy5BE-6xd@<3JeaQvQa>uF?UGwxSO^52y!Y>GLfnER2<#Uc0+GgZ +zByOYO$G`tTWY2ElK8OiNiE1+hy^D#2rMsi(R$jRtn<;RzkeBqJ=XRhOTM +z#TP5pm1TXjtDCK&-)gE%FaD>XsgHNSBVIDT-ZFEr1xHxpP4i^80hm=LAS!q{SE$u$ +z!jI!|4-J|6kt8iaca|o}Cz{&xtoAsBUzu1v`;^G;62PdK?q&u9+$7FxV*C6*2-aC^Vj?>W<_0?LCPTXb*nWA-*7w^#1o@TNixUtmsQwb +zE6-M{FKB-~kucsJmf?#;G!`XT2&(e1&g4wev%SMN<(?1HAn-T1z5PCjb+Sz;x4i|W +zn!j%CmofI=Cp9WvvT6o!<}&Q+me;WALZw4Y^VB2?tghgAR+pbwpF5&}T1vB=<_6g; +zqiljg&dX+5ST?I0khT2t}Jd>vH#t21^`?eCGZ!?T9*4Ou$~ +z$hYV1ATZySxr6m376^%`nI3V6a!tuQBc%Qwpo6lmR#!<%K}8{I +z`NE`zWV~?`;9Xg37!F2A)ye4rRvm38)}CQ!(fFh(gIVLto!|=2SW!F)KCO%8r4`hJ +zW59XI-JB(=T)?8^vyDbUcevUp`B%2XE!M@=&kOpe;*@M5sil;y6x*3(_qNN#!kp#JU(UF5)HKR +z?p5QoEGwDb9}f{LfnLDUVNMymyz=`oQ6yGUWlWAZLnf9PS!WL2Ig*oje6kDkSYD|u +zuX4MIiQPTidbPjXY`on%+1Arc;B +zP$30}gfcW$lAA!WTNNcsoK2L-Kh-J`63xH<3 +z3p@q|%S%2&t;S?n@AnQ@R{$a%OtSKA*oSBBZr1^6o)T0V#n#CiNgm7cNbrEU`$&@Z +znGhZ(XvE5%{T4RDrzmV=7%*ZL%01%Lu7-jCQ4IVc2wXvz?V#fd9tFHecSYF|39E_q +z$#ws(AK~p$#%mk^pGJ+S7l=+5Z9?$0l+hf4bsPBCB=1RX3w`VW8HUIup=U9CLj=5z +zqPE3WD3kG;!a3q25XTmPYY2zo-7`ipVC>QP8Tn=oF9}Q-Dn5}#A7h3wykM50lh5Wa +zF!rNpHY5DoY>I+*3oDdtH3gpRz!pjz-ok7IzcqK2=7UF2v9Xpqd08LF!}?X&uagwv +zK#Q*a3IH!@2t;pISG=omw4gPJ`#Zo;eBR&jy6p$yt*#W*iw&tAUI0AGE8fp4|7>ki +z3(wY4HF$ri9Vg8XwR%PELSBNn6|L4*K0Q^daMTx#?IUpno1%d{{7^it;yMs6cvnHU +zg9w0Lt-zOeJ$a)Eymr|4(VLZ)se$|^=T?EP@)zo5;u!;^H~Ms;{a!u;b`7Z^q1v`V +zHta^s)nHq9N2tSTwVL#}iBF~Oia4RILpYhCD{_9+qiypW(P4k@5Zb$_;(r+cacAVb +z=|>lp1niUD#_7???uA1(?+V3?>bxUKXK!QRJWC8LE|F4ET(??crS_r*a&d6oia{1! +z!d=%7ZiC?loQS+Qxcg{g7>=H5YcUEg9exbOJ40k?-CqN7!c`+#VYN%M +zp*sGp3ZREb5UQf%!_k;ga;t$da{hbZe|Fv-0R4w8h)Lv4Nygk^&_XVn`$!ih)Ilk< +z#6*c;GJQBd##dse+dTkAUlJR{GQ1FCNaW-Ls6PzbaG0Xp3F3d$MFSWG40Z&vCM4%E +zT=J<%<8jzAq!5JAZd;XC9q5evEz}TbbjHQR(*xxY3!80JRU7^cMc!ebZi|~ue|g +z=GTkc+mdKnm{bSU21M#d>cJO-SQWJ&VCEA`sf_gt9<*A(MZgmXmKLzBic8u>+sR>| +za01pQR?tk{9#-bZxdbbNWLedci+vN_>drt{Vw*&@(I4bC9JOxDv?i8S(Ek}VHmOmY +z3fb@QRYg&v%xy1EhV<yO!{tw~m@+b^KFQW)GWDXFs3!RoY}|ZHd1%5IF23VTFiR +z6Yh)mVINWKm*r=IWpIjKEY5CuYf0d)P<8cHvEF&-rsC*7vzPO3G9SjXkPcnO>|%U +z!M--tS1!yIVgGf+O0i-hRvK=I`gOLva&b{xsEC{a0O`=I3X5#&TV4h1uw6qfJbw5% +zOR_%~QaBKbCC&kj({bmFSRXnv1Yenp*KR5(7a>1E1g5Mm3g8-?wrIQR|7GGk&j}h%VKB{I}!;QFy +zOocKv2jbWXZt0|x)R%5D&H%_gjyd4|zw5#Ye^(RYJpySFI|0HOvnBwzFH8LV!w+Jk +za={(hz5z+Gg}$+^E>iM#fLhxt6ewYwJPI{St*A{bJp9D3o29d}SKB+gZ%$zGE=mmV +zB)AUl1~^+iAE>mfDhDQ&uzm{-i38=H3+xW{f15!M{LyCVynJ@n-17d%_x^ryp}#J9 +zFE1_@&MUI5Q=K*(7uvsyC_e +z8GsH(!-`mXs6vlbt)fH^r?T~(;S^xzZ5Zc&K3^d)a^O2`f64gn>1!(6UBjGknBRu(=q@*vUtL;c&EoV%Qw3+7{G%v)4F%Z`HjSi~&AyF?*v}X*KYw3IL767rsFw95q0=Lj9;8k0P4=^y(V= +z!r__BtS&mXy+r{G$53Do2&TORNwO8#w8H+aI=*R3F$SJo>y}DFiumAh;d| +z15qjilrMC<{p$5j1r=WLOO*}i1{u3O@z8qTlh*rQhV?!hME;Ad_h(jb&x=D;QNT{L8EAQk +zNlCmUtgoW9_n$-sw?HbJ&BU;+xxRvGPC+q +ziu})IRKiU(r54jLB3PNXHdATXqOxB9!&Btn(o=+}CayCR9%VFY;h%CI#gJK_KoC_| +zCE0v*0e!*^Mx}A4WZ9(u8#t%Tjsr6}dpQ0ZU*YVL*l{^qj+L`ODay@e<8%iNA=u}T +ze;_X>nE~eO=_UbPh}q~N^_u6@dfq~2-<;ry`7xd+i{xgF&VD_AFhH7r6^w3!pl=Jq +zu_X=1HFD!2`05ZP&mVrm9l=T)QeMLDNx_I5U65Y{&a@lB3bZBi#b;+17XrBW&+G?7 +z{Vjgp-u7Cp2XqW@O-zKkC`ehJBvSn7n1KaLpt1$48p~9*Y2s92%AT;6{XBQw0sfLB +z?g5jvp*GXJIEn^;7i+au@v5-{40sUtOCxy$b`!$1iw3Z-z`8pAAU_E2PSom&`ANEf +zRHctd9X)lpT$l-cqgQu +zrf-Yp$Uz7mWkBQCi8{r8M5cnk-ZatTf(xZNIUJ9}E~z2#>IDGbI#M0sfy_GQSWB+^ +zSJcBwbjunTzL6}D3NzO7`*_(yLF(;8p2A})^!qdP{q;_BdmE$Ig$ZUV9}aLBd0-5~ +zr6Ennoy#QJUFz!trxO^)aU#Q-?hB8KM`Yj?(YP5&%R1%BL(_3-?R@LU>uD%0f0P#8 +ze){uM*KWi0iXp68P!i=1M>$87wJ?)U6NM7`fw|C`zkt +zb7(RY#4mctZdYQ@Zh`#Sol@4UoJS4!6HmtBl#FEy?SwWSl7$b%$ +zQ!h1(Qp(2*M>y2_$p4UX)!7j-dTqd9$y)&sRGLT7Pme4fe_?7WuekCo^KyKuaDsYF*KansIcwBxP_{4 +zoF%IWS-`S^3#QZv`(ui51QQr`Mo2F+TX1H`Ze@!^q_9uddF`k*?x9%{=7Fo?@hszv +zQDkE@Ji|)sZY!7NB3}@kk4hDXmXHzl2Y75Z_**y_1OS{X(JB9fhRU=a7ms&YKAxap +zhWUF4K|}#ppx{hX@$>Q`KK`ZfpfvrDn;CM~0sK$}XzN-tZ3(PT7K;m#-IoI6l6AWP +zy?=Y`z55_O#y7NX$48C54?Gf?aggKzPRU}zMx#o8)RyjH(D&^fIyNYw$|yno`JJTt +zHqn>0HZk`VN1o#c8^WCvI@bx!)g0L1ap=qrqltU}I{SE;msC!0A@VE4LE)D{6vyEe +zx&S!dhJl<0yq#~Mo1MI7A+8OrDthFFSHiV;y7V`>&?SDbl6KKG*%cryX>*~;)$EdGwG_!Jl+8QivC}4lu@%^wi&i{6v&YGOGQ-|hz0^H`*41!S +z^}>|?T`C}{Q5s-*12tRLp&+>H8hp!I6v){hujwLpo@+Fs +zDlE(}rjxT9MQmead@~82bWfG>VsKa2SOnX9jWY9R{3GTbV2Vh54m-&7!$Ww0uZqbt +zTL>$vJG~X;Z!m6MnJt6puJZt*Um|ryXN9yL8XZ8zMrDIqy7mm{CGt^BgP9r4#J8fF +z>J7}NYQ5lYEs@+>YE{%y6lRZ6GFym}Sz^?%M)Ui}sL@5fLmV3G+@X2J4F`j +z6t|IWmS@gYFhWZ*ELjDn-P$x=yp{pB?^6&PlC80j4`6TjZAhr0{A+PgIvDdA%HG>j +zZ6|b(i2p_zgSm`h*!oy=aJZz3mZaLKYwvO5y^(XVwzzth+~IS2L^k`*e1fWz8~~Yx +zu)-GJR!L2&!~`Q#`PbwUp=~g@_R-1So4rGj_3h^Jg$FriW`i>8sxl5d)$;^^ta{9O +z+Ha<^raa?Hm8Gth*+z!%NU~O|BmNYh_e<8z=p#?;x$kgb&wUF5&tcdN^tzGbAxQup +zuN%!QUfpJQGIR0FR69I<##G4OPu+m_bmbmDkLt^;6Z=iHVb0wSIha0|iN|wXso?Hl +zQ(9N%)6W?*4mmmE!Ys@AZ?KC0K8yDiGfP((^C+xesmRD8?x7RzP|9K?t;`LE!KY11 +zaxiBLS4J{QOHJ8gRq}x)nlYz1XEBPoQcJFk#A$=fwULxo%xw`3q<}RGI%^QydZ;S| +zC_v{oNlst2Dc{xYWgTgH51TeQ*beoBi#(QM?@m@IU +z4KOK8_nvr~zmDnl7*23rW$ai@k7bh;6xQXIx|-rA_^o<$p}A*IWAy2h8@# +zQKR8)9~~U;?e87Fsmyef@ikW+iJ?igv)XkSy(yOFeR7v;F+$M6epXz&a4vPUV@-ya +z5eF2ZYlL=p-2d2*Zu^@{8~nQ;HODd9=WZ^mC+O@cpRLGxoJNkW6EukF7OH3S`Cj~1 +z5NLYZ4mxp7#^ecgpmykf^Q|2(S~^GlWUK?SqkU_mf|Jwz9eI^SXdx|BV3v0F`SIMG +zTSnQq2nMjTZ&%L-;Fi$x|7q8DRFs8KiYs`BOzueN`H8nM1E3e^k5W_d$2pLFq8V!nXnycj#;B|saw2s> +zYaaAeT2LmyaSK{-oF1u8P6n1L>VUJl=7P%ym@1k8m|t_rt|Zq#{mXn$;m8zoNxFkz +zLo1L4(7wu4rFWfvG;EhE;xidAhns6FX!xw`rA4`dHc)^>Z108n#)0&302Oi@xA6E& +za&+uyj<96T$xY#qiw)MPvDsd?Bb`@2TcTIF-Hq>i{JL78z7{IVbuaYF}6-j4x>KD +z@o?;C+}J|af#|$wA`(r0OKTLiOd)lq^ToXmUX*-<`bM;G(PjpY^AWK6L8KkT9Z&@{ +zeMG~NX4EgF-z&JO=dp~G!ml>uZl36hmuz_-THX(@hW_w=a?1+30;BmESi$Y`S$u;b +zjr_I=UxA-9w=q?yaN$H_U^svQ<+FCTjraN4(DLDBbQ+^na6@xviN10%dX))QVwfzD +z>LEECCqd)^$?RFT-7V<43Hb3Ro`Q@P9@ho}D%gX}oN4$&6fx0IMpImF!ct+QUQoH^vuWUxoB*zL))iomjFR<`=}6RZy5?0L4|PJ@86p8wXKeG}#$ley#H +zN9H_`YiDg{hmI&b-*Mi$8#rw&E+nnw3r-nk#ipBSibf-pWDTb1OFyb)aX}e%WXz(> +z;*uXq(e0e})K6&!(Hoo1i;D^&sYtA4XTG@sz5>nh<-IZ6tb9#|WnvjQo}gB_gAJP;`?K8eYOv +zOdE>&Qjiqe(HLV{lCrZcb>ny|{2>n7nH7C3P&2Ax(d;yC`2#FXH^sUS7>lw5N1==vifH}#k%^dI=79U +zO@1F^euJE}Ss*eYBW%3k*e*Jv#yZ85Mr)jAgqq|{oz58uDhI7@VxnPKBpnVEqq;Lb +zb2yCHisyA%^GkpOts7i=)L_d^qWo{lm^gJX5(mX!w>d&S>7_Y_W2pwMm(U6n{(_*p +z>7(}*g^tvt5wC +zQcgaM5Tis;9~?YRa|Am|Pq&Q6N;ZF6CunFUwoW$vq5HfkL$uLb{sAY!*eN7mH#U6- +zC`R)_hHZPZ)v}+=L11fNMu!&CO=DCdINH690O&QeDF2(_YsT6<3OEvSFq5;!e`sThgj#pSf +z|Jsaf%e%V*iN!JyXOT95b;AL*2tPPf#b)s{$crh#)-hJ@n@wouCQF@!JkV9#RtlNSUVs3|u!J`f +z=dvUJC}x!{*h2Y?Kpz27sUlNTT_`3W{UZgxVD|SGhM5EED??-(p^w~s*g#--O{V@7 +zQw`0|$GzS?27*K0 +zj2C((+x*t7B17Gzr?x@wK?D7d%*~KbV?@HvzShL{T?N<5Ow5O(Y$+xoHW?zTZF9Pn +z5Yf3NiJLlBIwpE44?t=Iz8AxzV`Cot7S2ZoGNI%g7!&_^Z@b=)`X2nn{s8%jLF(f} +zdJ{`sMWdSwWTpXBvxnh|IR51)zgwsZ{ZLk^*e8m5Ne4=@BqPN8fbBp7^6W5CegOKI +z86=A}X|ou{u+`J}1~4b%`E56=Fw0))7skap<7JBNEhe8N)PYt6Rr|C^b+CkyYfD)# +zWk*XMe<>+JJ&UXYZ=u57;b&gF3UD`$2)jZwLxp`a!W&@@Ed}cXtI!9I10y=Ryg2Pv +zRQFmIkmeXgXjehY$2|hG-tG#ioU^qr1Oj)Epk&p6l?E0(*%oEw4YoN|9jfsw$`U2I +z`h=`8fHGcqbSF=iQCvDymj?_EX8VdFpVw4&AM6_?Rj1e#I(iL_OAeOO7S!w!hB40$ +z(Xm);8xI5~+V;>23Jht*rDLc9g43xu!X}PVfzl0TuCybM=*Ob?If*n6UUxec +z${*I?+K*xz3107gIM`j+G5K`}(PuA~R+h96B_}^(BsMdg7?j^`E90R{uSWn%G>HfS +znYaO`CW;vxM`5}r*9vI~UbWZkqXM(GRLYr@0pUJ3CA?t}Q@FO(72yHSVx}d0Hj0LU +z=dYELlR>vuz|>;Uz^CfVGdFx7{D|Vts{Feq|30-R5Ko7Y?X;D1ip+8a7<=_=kIab`M`I)BU8WE%9R6N%(P{#)MsVk&0bXSy&g_6B+uZ$dd~|Y}8Zkv~TsSyR$Gis4hn#Er +z#_Mw~1HAVal)PY}@Rx#-jx259XD$gKLaJ-_y|=pc#xWf1T2YM=gE-}iO1H*QQFY#n +z+LS|r@E!iH$-htYdYU+!NT7oSLc&dy0~QuKQ%g=G3(C#bV2r0<=s#Pt49v0eQ^4d~ +z6Wx4o>)9I8M~niD-sE#Rhu|xH3UYhWMl+}MRUdHFyV_gFv}$#jB0Qer8emi@d(HSe +z26cUj6N6utm-M$~dn@e4@?6zEE}3LoM{l;I-K#Oi0d0dM@biq5o^w!S90`8bK_MlS +z!USYo{GU>KA|}zzS@9)jX#kMqm@Ldfv@Y`j{TKLNNl?jJx`+R_NEd(a2e)w)KbuHe +z{$i7s8TXQDVcLO+6yT`wy1txA1HKzVm=3u~hjIr!utt;9OuL^~f~1EMCB(_he5$sPDU?fC+Q}VT@&J0 +zS$C=Sf&z*lt!LkD1(mNPTO*F~^AYGO2Ycz`Z<(_ji>UG#7t4=pkIlO)f5@ON6O-@C +z^v6#8=bjaqH6TS230%70CRA5S|AO(kwfaTzj3T`v4C6xQ(8^cFaQrW28bRA3JGLFZ +zN@haJXxQ6+o&radk<|s)W#rmkSIsyb$#3&S4Ney`G4<$B8 +z(M5 +zlaq|rSO)^xs7mr7DIn(lOl}Rir7PmxQP+J)qo|2^_rbN}%T`IwNQjeB@@z1LjE$la +z@xj!zZv6grKsEv8AAhWhpME0C4P^#*c7|azJ7jo$v)O>Mqp`&TqV9u)I +z!T^y|YHQrHU@6U9aEHOU^QtB(y1Zn8pPz!5rs0;O8r?@@#Ww3ahU9w^j&y(oJCb8F +zL02~~rP)aK$iE1RHeGNJmcn^DIq(8^N@(aW7jM}AqrKC=lDcyhB3_}!+0fs2(WE5T?3Y>)@s}+8ejy296 +z2YQz}{rB7LNqweE>21unDf<%iKN-^=Ja>kHzP4B7a3-Q*yhJCT^pc_~IS^$yXaaYExCh@_@Rh5Vj{&hUlpfyy{cRk?7<1-vOzhrqbGz~GU?TTQ +z70K?qaeDG@`&3mDWsWSfBU@cmOl<0|gHJk1gLqG=v=me!PT!8)@E!YYH}&ck1Fj~` +zh;y!2(BjLDt(+=o-WM|L-;$-11qu_n8aYu8OXF^EmH1;o;RSs-M%5BuRCE=GeKtph +zO2yJ_zH00=8%OU>ws$k$X1+AOu=jBt1NT!-l#KT}-F<&*0gN9y>P;(#S?@2bp!#R- +zNogh|9BjC+psJi3*pW-tO9!008G(A(;rA0Um0WzTOn}pm6d08{)Jfz6TbGq9F$RLi +z!@z6t^?KNY-Q@QJzV_7O0A6Y;!akMmD{VT!^f-#S6;V8o+^gzMD2OEX$zqW*fNRks +z%XUP)gPqW}e(-@zPMc9L(59)h428^$9SlxJQ`~B`qG4NxG&luXbqWM4xUY&mzc2Rv +zek%~C{(Tq78=UMsJyHihw3B|vY{`I%cQlre5*um{B4TFfu1vc#9ZI1;?YS-sb+o;5**_o$1cR%b_*%}<{ +zp)D!?MfOWw%u1P2N0B1|5w#waZxZ8&kfAn_7c%%Gb1m;ypwUpaIG##M9N~zxL+FYd +zdEQ0|I@AHpK8rFr=*UR9l7Cs(&iL!%oUABi-Sa|4EdTW9ryH`G^$NXC?Z#QOeX#vn +z^ZI570zGA)bw+*4z^z4j%7by;kEG5-sxx5_6u}+1uj_vJcXl1cn0~;q++$XBExjW; +zDZ$;A4--AJWpcyBr6w;e?KwrH2N*JT#;j^fne8wUDImvmZD7_}(Ty@xfXP!LYIfx@ +zk-{u|Wy=6rTEP?{qUJUFb~%0$RhJgn1&1^V%Qjn&Go?1nK7kxn)%PMGGm;R8h~yEF +zNi*t(qsuC%y{Y-4fY;K@mfYmlOit3lA#HJ>CwC}5%+ffxh+^FfqzA?NEQcx1*jbX- +zI!ofSv&o&^Z5U#M#_Yt}z3Mh~r6wK47AHsAC4MAV0j{dyNUoc6U^Km#zEXU3RnM+`lR9d#EWNDnFh|rDz^@kMTjYTEYJuqfUjYx+q#F4MXf)q3* +z-Yfvmi(Nz=rU?U?l2lmnEngb%S#p-^I~hEr-!2mBPaSqG+c +zA$gLG93u^hEC|g|nVYpnBpGE#uqAP(Z_wU1U#}8*B5Y91n~$P#>&B`(1=ydTV$|*w +zl&@|+$%2~#`ld`7oxQC?-c~bc#<o<=%9b}LYlakrx;En=(C|s +zFcNklB&Zl`$k-a%(O&r?!-GnyJSCMP{}bsIhl$AW*hOwp`!K^`Y;S4vGq@YX_dWI0 +z_Mt{qY_lKS=Dy>qv3j2u84Oef>h-YNM~Z^yD{- +z%uaDlIWN-lfLd`MsaOGr2N-JW3PS_n!Poy3^h1n(Bff}?e4;8q#CfR{*J}%+UdONa +z6q$oBaQ=sXgY&NFwpC&eWl|!k1yr_Psw# +zt+*8B5}kvWl_K*;nB=gBk&;}sf6qr2=JvMw(DFITNE +zwS{(Vp~P*;=B>fTP)as<)hbcA96ts=7=tUtY|F)yLN}q>YT&Ysu9k`E*es}sP)Dy{ +zH-LJbZoS&yZ5B9c0dDK-8tvSyoX0WMWqk*U94;eT88d-!&Znc=sIpw8^!t%Q5bQMcp36i +z;RMbIV;Der<#B0chR4*3rPwh)q$`zv@F^H-Ehu%HMx^q->xrf)J~X={411LzRx(s! +zBE~tYbA_YN%}}>yy@Fj!?=0&?8F<;&q9!z6utAd=hzy+=>`ioA%24!>YPWTEhH3et +zPMHc;QVOOAXvfiNbJH~pm%Mbhw7j&EwAjEX&ID3Om|}BNtW>7<6e|MYmN+|GLTxiL +z4j>}QN6Y*u2`2{@ev~@w)p@^=rRd7g(q*eJa^R=?yOQqj^5eDOs^9xL{m$uo;!)yf +zdSn?rP%ZzQ(Q*RbFc^(NRw$!VwApw^w>x%~qz3V^n!`t^2){x#I9Vn56{wG9e1etmjLJP`w>K}H)bUX2GPU`5X1P3yA+IuRnJ0AmD!fkOP6pWh$AayK-DxQK +zn3=>+Crs8(e$qD9G?_D~2=k2Ki`gBlIK(@l2uzfP>4Q0*rUpz3Qs0mQFa@h%W90PS +z!qUywTO-nadv6V_LV6X+=p^MpG%@734xT~zbQ-@>6c0QbZ+xN`S3%GhtQ=(z;BEvT +zG~EhS)Ux*|b0GuBx#O-|ttu%i+3XCs4BH_{=Hs?empH(PJPHH%1vN +z%6>@2n6YCV8vAkf|8wGRr3>1j$;g70WDHW9nr5wP8G5?Cj6v+Su?K<=~L==I;0Anb9g3|#RMCm7O +z=2dB`blz$-;99|vFDxvG_pB3JPjs$o%mv2-JaT{;4RGKqwU@Q!D)wF3NHQFjp~e)+ +zQkD;i%a!Jl$*Ghhs&Va8)X~9d7F2brDQKY`#?p*2Ra-6*28ZpS%7MW^Q|PkTLL{fN +zF%@nGwG*gJzV-WL^Vo~pVdown4=I%{!%_bGKKbFfOV)|T{kDpM1$z(U!}!Ay<=~Z> +zHH-&sB3w=)kRH(dA{%}-Ip$d1UkUG|PfV@tkNkhg#Ei;_8e{yCK#lSQs(v3?AL!W0 +z*2!x`7El#et_35FJY-#?XOoAMUjPOaiXrZCL>Ubrg)N +z0NC9SBL;RdcYj2xP%XDt)g9Z|1g3!!yx_L!YJ1g}^2cZBC*JZa*|wWC&P-MXe> +z8?1P}wjeMbgU!ji`u|LIsiQgLa`WQ9qBt1bh*vl6!{3R@vK7A`Ks_$fSge8pgvyP;ot@8GU)`^+22>;vmUY8XIu4bU8qGDGW9eizI5s& +zNnY3+Tn8wpfBC{*!}yV*$qV)0=f!#bd_i!jb0|jZ8FOUE^M&(zy_zTlWde-zYD$RD +z8036j)ax7cccBR1#9%`_6tESva4MEcOX*`p0sM#R*W@t-cL9zfn-uG@S!o>J9yNgJ +zW;U~MSCEXoP|p$f7_=GMh5*d_jZfD1Y};^b?C +zk_vbY+t`mci(4Q;cz3-Ju`0Mt{f +zBQ%-gGt@Dn(5-_YRjwE-Eh|vz(+sjzd)A$Hc%= +za#&k?&nj36E8U=X-LVgG0EYHp-tIUI +zR1B!v&erJ`aJkofb$*4hS#Mz{$gB&B0%YCUqNlN%!GaDBWgTf|X6Oge4^Q10mWmlv +zrDP7XDTiLEs28-9d2g&~r$YVZYMmq5HR^3b*+N_wzu^6c_wwRmp{kt{;7@@~|i8cXt +zA3U*qshU}^n#t@iw>o3DkIBMOL7(`H&R0NrZ5(%D}kaDO+j$r$b3{p0MJD-`bO=aWt +zgya>Y3DFc179_7Ay!yx2PIx}ZKi1+a*J84WCY7``K5<$tbEyZTcypGJW-W +zN35LJUQAGsrj>tFZ<^4~TWdg9YAq +zUM#%_`Eqz2(3KG;bs1a_{WkTH;ar9N@hD{LJ?C}|gKZGI4M4W~tmal0>#@0XVkr9N +z32PbacNqYKBcj>ir29T4Hq`e~3^U)foY(|^0Ml{09f +zAIAZRcZ2aT@J1*b+f-7vJdIk)p4l`qX(Fs$_;XBxlUFPMyla&|5N9glWaj@a>N*)| +ze{3V}{hj8?yTc~mX*)}vzW(6hctg51p&#ybNUjyUswpL6S)epY89U`Fh#dH&n5%9U +z@g8P~Nk!Y3cni($J(c7$07C6|b!hl}n|yws&YLk0M6(s5a4l^=+F={pG#7Cb8=SN; +z`jJ~Vb34rCb-7Taja(=tdf*t*m#k8$<`TmAw7E%V7qKFETcLwwvXBm1jdNClfOA7i +zn|3wI)_E#JdbPWr+TW*7msf=Mmj1mu +zSZ|!{W|}KxwpdbXA2R#VaTjsU)P|KgDr97^kVA{@@4X_XLHV~SFsK^pM^0%9ci0Kp +zi@@7Y-iA8%3=*ePE|MmA7DaDQ=1zBsI}9cWiRZh~v+VQYu5Il#wP284^=|3#O~5 +zI63V6jCchAW$ZjuT&6~jTrZ`1GXN+zD9JXtuKEK;{Yn +zWfbGdl0DUsjIiO75?bln+1bkK#l;uvdu`#1TKhRleaKV=YbXnErA<_6+jR+gxIq1; +z`V(f5Bbj4?D`4L~(s!xMV|q%OHNB43&0lI&uO_Z4rXPw}7m&W^AgjQAem5mbDmE1I|v{;z(*Vng)gsM85E(u>MZXi3pL}al%qJ*MkiKlSESGGd>B66s+ +zkxDO3ocIC-pA)A?+jMo;0is{PByhs(0a*$Gm%LHb0t8TCwm*EJm8wfCeO$=v#l<@1 +zI~fkb0V)af-~C)Eu;P+@UyU^W4lPOc^C@$I&^%>bdlXX@ep!PPQcb?3j1$%`IMd +zT5dL{0hS%!B>7YWCY!=0cF0_!+Xkw^nv4R>rCsO +zjeKI&nBy(esaLV`YQiJ{Q^szi*rou9`o2}0gEmv+v7As^a2!}@vZuGT{R3@&hnEjxAoPek6t&t)!f0YnH=jbjq@x!h%O +zyFPJ^s2ex4FWIEI|CZSqW|H)fmeXaPC1)064fP0R7YqesuSzg5LYPt9lIvNW~N`t +zt0lamNYmk!0wN8ql@x(A8h4wt)MRq%w<*(XEpuD59em=#D9N-)CPb3Fg3zX<9C}4~ +z-ByutG>Tuy^jC#mPK5ONgxQF=tyXEzv`GzP5byjSv=QaEHZz;Lll{pj84I%al)ANU8SixNG_snNQXyJkFW +z;Ru?DMVqBd*c*gT-Yra|d{?+km{a5@YL~&FrBGkc_anL-)ZyC8O1RgT7CDTwen9$E +z3^S9;{=HCvDcm8jV!5^|qW%<^@MlEwJjKotv$SDy_vzI-3A&^@1R^wu;_&WX6w4Jm +zi-lG)bs}xhEk8&fV$Vtt#w^4bQ=E>*eUPcTyyS$_$j-(x1Y`oxJ=zEcBUDKLJ-(sh +zC6v5-5hjoTf$SW*-tsY~wGdlfkmax#&`%^S5*8`;#3h{Hl-Vwp=se)iGCkA=;6BB) +zj&a1A-yd>!=}>qdgJ94c48u<_42-WA3^DE=I%^?9(nkIaUmm=kAH&O9WcIYQlP;Et +zgRd2Pz_3wVy_(e5(|mZG3>%1)qO5!{&mr7+qwgwo)Ss!J9Y+YKT*& +zg88%-7l)%ISU`A&5sxs)KnwG%V}c{zZu6Ge%j@w71GGsWQrb&&E9DS&-h&w3N=8W1 +ztuQzp+l`dq`l5qPRPe481%T^**a2|FCzPdmODkgK2&zd&qprMjBu6?9-^H2DcxRKgs`O#e>j9Ia7hc7>)p2D+C-8CkoJsnw +zQ#A7^Q=IC|<5$C5C2YASo39}!paTX|n{V*7P-ch*Ir5x=+eUi%gU&RQ{1@WE#GJ#L +zgGkv|aJ9;GVNcTFe-IvAiA9(MMXGrmUw=*h502fEU3Zgb91f)3r%CWjHq(-Uy3pkt +zZ6lo1`&sZggKwFpxWU%aRxohZ--NacG4)MMe@D9H`!!Lb2HX^{V^bLC6-PQNA^r9J;KQ2vXSj|Ed +zG|wUHnRueIvMzcli;M?tWW0vKbr_>-tkeuTNcm8YF{2DmY}zDws**3?sw&@r8Sy)R +zmRySzH9a%Uj5{gTd}K_;cbWw?0nXT!rfTY*Nkt;no92JVVtr<+g0?sun{xKGo*g)| +z$}o`0)A>(4oShCY99=Hk(tZFb^3dDu>5tFNC$JJI*$YzTWDfSE(B~Hy8IRap;(PJMlP-Lc+fU&Xe>3)||Ex9o>Q%D4X*i_hO+yr~q_)JjXtigw +z|8%E{m74OBLElq|y~DlJy~D=o*5USU#-)XE)CxN4x?pFwv3;_4e2O;(=LJ>bypZW+ +znXXU%yEBz6h{oRGoBdsJcy!o!yLGa=Gh-9lt9EkXpm#?;Yzj}N!A5NRAM``_{--q@ +z(U)0KZ4%(pR2?sLH0%wsL=FWeeG8Uuz@TGi^${#;rs`9&h%kLX*x{`-aBB1O^M#aU +zL2AS1T^#-=Fuo2$lRbYKQ)e!`6ZgS3XSk0r}7;8g^8+u{&acX!5XRXa^FX0uGxz5k~x3ACGKD_X6s +z7`Ntsl2n>4(#__4XP464?leirb?-0tj0ySFnCJ>SR`E>bP4>DFTdh_!Y)hA!)37Ig_50#2UFRq`KaRp) +z?UUcH-O%G-2C%21pf2PvVF*eF0{c}MCG@IH?AaYg8SUFdSv +z`be{b5zpu@PAY}diJwZSl|cK<$N48*(iyMO&q^wIX^H7)XO^47r%_Kb`c&>xX0Bzv_0eSmcc`YlTEqR=Qa*nksffMKDJ +zrfWa}ySggl*|GJEiswt`h6+8v)-v38hGee01Yp!HVz7yAO}-6maitP+kqHkWt*)tu +zhkj@_-X!cw-(WO#grOYQdVZe`uYkW~Am^7%df3H;XNBCM$`tYDR;+mppD+u8Wh!r{+#O|w4q?*pxXnAu +z9a5hD_PZN_V05Cjw4DQ^fW=P4{V-p3{*C;8&Imb(BN^MsbQ5Tw`t#2}XKBpiFz5yS +z*y`i_ynue8mp{>HL@u=HJ>K6s*x!5Qlmqmk=)S7V8?=NxATzt#v_U_5q?~LnVV7?+es#}k3CFhXNuHNr_99Uflizyhm4PJpD%C@<-1#;&(9~2b!J)r +z&aA6N-@nP+PqD%FZOwP&g%iy7x3r@0lTG;*gMn?jSsl+ztT%N1$%_95OwOPG +zjQX!8DL7uYhdiXwx +zLYpReA6-o3lB|NsaAQhaQ>|^5un75sV6+9@E6m6i+=UnqZe+)~N@OieY(sLwr|FXD +zqocV~#Qh!|uzo*`d!%?Gmcp7gR1VrpY{e)t@tin>N0rsUw;{+Zw}I$|*Eb{MXpNe- +zWXO?w4T-dMw}F+kP=(WxO5ginSK>d(8r^^Ke-lIoeJGdHiR0;#ZshwMM+{eqHpiPw%(+Ecrj!>;{ +z;%z^|mmJ~66?yk}l#r`U>@sCv(^q+jG+Rh!n?0EPs7?LOdZDug6J?e`6kp3AiWD=k +z+pfhCWk84Z4~B?ZtvF+uO*TFbl~>LF^u;+w>;;FI5lU+#Hm|5gclV#UmuX_0FF=IDM9Z1#z)DLIu#x~c6x +zd8%OXfv=%}Q|&H0NRV%?jGu{aT-u+@Dm$g5{DP8}teBP6*TkxHx(yv2-{I4Y6)2HE +zB|dm4ewLvf9$*-BK|k(bEHY#3MjVDajWXh+IuXI~DUsz)qVtegZB>$THV@h%iY?woaaq~p~Tr`KJny?k1` +ztLl(u;+A*-r7EF}c4%6GIuQi|uXFWKhqF26ELqg*eka)5x5b{dwsE+IRK!xB|gF!0XV`#ttZiMcnrX +zzyXc)z3*U%Nkn0eR%=VOluFpT9^oLLG7EE!Ey3MieD4hC^qDPXO7rl&*@W|L8$CkA +z3gx8I4>mX93D9%-;9&3Y=mg7cikHtTB^l;XLZT?CiD&beu)I^+5D#e9&tdp1!+xxh +z6%ts8bvt@lCVNj|%jVKLO5OxzSdC-!09dF@ArdB12XiaDlDfiC^JQ$BND|nh${;1fEljfl1uDo0G@_WS4?LDF#7=>2>jJ)3N*G +zK!)eFqQL^KM2~8Yl$zzr`dIR15va)oE=9iF5P$Dwim4$;H!v(fA`DN^r}HB#wKiR; +zVO&iZ2~42@giJe4rj~EyB#3sDwGfXVwVymVi5NfbOfy1%&Z(;klYUb=aq8S6wNls+Ur~$VVcdlyvCMXz7GGo1Nl!*VwQ;60 +zsTnBca0Rm2xE-!d<)d7V>0dz?9=VTfv7m$_#CUA@cfB58Ve-swn{%5uww_ZtrwPnE +z)lIPPAC{NR548RohFAO`lfyUgGX;sP7ToH&_iElyKI46Dxok6f)NnF@XTp=1jnv|F +zr-6cUbv3q=XY{V@g%{q7%=fam*%V45%wj)TFl0qf?$wC`Zj_&~suW +zFb83wSUb9nb5J&08eo17EzJ^49bVSTrj-_T5=o_8TZ$XE5%*GB|10#h0$#=S-@6#_ +zV&9ay#YD&T1DIb+3M1x-5Ry`{@B&m2IYk=Tf^%QtsuIAK$Q2#cL4}t;w|0 +zpOHU*2sfzV^J1HFpAiAo2IcK8l-w+W)I7o}m+%kqVOScWUnbIWx9JVWK)@giA1N5Z +zKs_^N>Z+r-*c6}($TK&u%BtVi=n{GW7$1y2dw4i7X)m8QE}9#f2Wqj~)$i!sPy@8C +z1Q{iqjLws(;5V*lF5zKwSGIWMmmaDgwa)B!%^9s1oJ(Hog-K4jQ5W@V`J=j7uhy&A +zh0Elq?a+H!gPxA$gWIV%UYk50+?#*y)SEM?tKB~AtCG~2TY4Y%S67gtf>a_|C>eQ- +z0z+9!bs0#brgCK&O|?wzs-zmEsZ4|1!^u6h^WwYZG6n7XE^93vn#o`ur7ijT*lOP? +zvf9_gReKE6;$X#;C}(hdssLv&!4%po6C&{`-vsT^b!TIuzPf7(_9?AjmBNXO#5=!b +z@K}t|ZUC|b9y983!H+7)l6T!7e-{Pdzacw2oiUv-_0!avNhc+LVr9cg*wwgI(9}5N9%;D)jNA@#r$OXtEivs4E!u%r2;PZmL4i?U*12 +z-*q7~G!>cHqaUYG&72>mzu(+h(<$>byL*;RihGJpMXoG0XELbU40}I$YEQ@6Nm!d4 +z1>@(xCk>EPRivf%?@b4$sfDIQbDI}$FuR|Wxiq@Zmi6G +zg*%w>$jO>OJ?p8Uc)0ta^-V@{`kFfU)?1UFfNiqvk&*nMBk^w2xyDv*uu?!UI%`Zr_;{>2(@um4CT_f!;BNmY7-Zb$)^MaKu4B+m)u +zNem@GdT*icH{H*2%?3KUand!WFjpLCTZY;ue`CZX8zR@dBFAQSc|s#NsK{q=+qH8` +zus&S*J>B3^8zie>6BJ>Y_20{+h+#kJ%*5^tMTWC8K70osCB~yco=K;c0-%E7NG9v> +zop8;kFku_{MUIqhg3NbA6-h&)<6Fd4hSI|r)v`w(;k3Al?o94@rwN&w2fEy5y9lYv +zmlwo1pVDN)^W-#0i|MMgtwjBmFBK{(%loYykWQ~be$92BlZ1g7DY9@8viQD|sg@Ku +z?ZBGf$O(RHRL*ZD16fkqBldAG5tt-7hljxkW%e=!{H$0LX|B}&rQAzO+WCs>@SHKC +zjSY#1L{`%FnRFg$4^FciX8^#c{rw5gSCgHoxF-=yMdIu__P)y4HxI2c2dc2& +zxs&m;tR6~7jkH}qE4BL4rlHgarspsoKrf##oke9r?_XcG(F +zCF>Tc0CP28=Gt|V>TB^Xsrj-4hGZY2|55^udoLKZzS_uX`aBz}SCmhhAZ9na?F>`b +zY<%Q1E$ebZPAB@q;w`=Li`BnY)z^u}{{KIscYb^kJG#hhyh{EB)YKS%Kx3{0cpcyO +z^gYrP7ih)cB%_Q>zXnT%T(r3|MVdA^n0&bs$ZCLF+j4gyM35*<9? +z|KJg0(H|X?AR{7y*f1n6dzPkfvT;<)zQnENn#H?AP1Tsy_lIdOk8_HCl`%f)9qJah +zJi^@`=1H$sVvrYp&mFBGRD? +zTMjk}l0?;h#KCV#DVZGY5xI3#Gp^kFZ7Zyde5gF0V!VYV6vCu)Ro2_h6SLx@?i9K( +z;YTF&B&Lo9;^w8xL!;bvzL_cuT8~)>5d4s3DyZ+)qC1BlZJ&hH_ot#>&hDi72#22gfn2@aD>c0^k!=3#cPZlD%aRo +zu`$up#>tx@+p+chG|vD|H#gyQH-nPrbl%AA5CRkW24o!s0vQJ(vu|+3q0FG%wt>K6 +zoL407{wEAs5)GR?7n=p7wxZ||W8uV>u;(-@hRG!0#r&7(sMy^7u)EznKG}V}_d#qQ +z9USlN@179-7xrOLP~(90hv%n9NBhm4{iEaE!)AjLI@w*!+a(i5!0fC|4?1` +zeunJhM{RiBmW)anaUezoNQdI}x)@m&T^Px05NNWzjDo5)bmqg?es>u7ZH!YAqXi7S +zQgF~2uU+LlymX_EEoulDyO&GmQVZ#%OAoyt*=3#-b?3?R0*06_ECt^M*@7wF_C +zC*5?D`M1_ZmCK)@fjdfxxReW0QAu8-in3sMlX0(izflrD>5{dg-@-(}DjGYW3bcF* +zxV4K7!%I2m71#5TxtL7_Mm>golJyKj9c(&HVo0_-T|`CjRKIV#n?)WnIukTot>$f4 +zy>lb%YM2R@E|VsF%rUws+Uc`A_G6 +zUKZz4!+u^Mtbsr0<}ynb(&Co%^vy>TTXJMa;0a|dowxF0%o$HHcXA{KI=Qw+2JPSw +zz$o2M`DG`x(B2JMl#loon{=3jAC`5Xv^Zh(#7QybGCU?3zidN&b!FcLKohwF&El;fLlAiATTANFhU4b~^B +zMZr3NEBxqRGh;~A=t>>aD=SskDAta@L-Kh=0Kf|k$6Yq!QBL)yiJBFdrGv4a=!M1h +zt=n;HIDXME;DeMn7xMML4=|=U-t~7WO1aMwY_VOT9k(TnOV(4>kmii>3VIk&(2^2I +zG$P+zy1ZuVf6Dm4zNz|7T}uY7VK|`S_Sw##IuED#rt|~h2aXfSISjg3uZ8`3>C$0( +z&FGuX1PJ|J4;M~D8lRpn#WC_JJ9$D8K`{DM57T^oj>s45^c)JXb7(;cK8cc(uNkK#_MjWAm=jJfF(-4i_9U19MY@NV=O@0i8_ICt1=^h@4 +z#@pTfeZc{KWMMlHj}@f{&KXrgr^2JC(tKp{gMLH;BCH1g&QrW8NTVC%9)P3kSi!FI +zf?zwhY6?PH<6tWdR4FNJ**VZ?Ou0$X=uJ{;Q_$2q*B{T33bO)~rldeUpJ`Y!l((!N +z=k(TjYjsY=Zqh-VC=f}LjQp^$aO0pl^|Rt9Wu9m0*o6v&rKPvs;$>J?*=lnT4uZs^ +zQPga;gO*0L^jlizCUBEOyvUHna--elXRi^eZl02K!gZahs+lX`(993aq{OI>uOmj@o^Wjq{u*<)Iu{JU&W*If_ewVvR|}=u7BTD +zM~He0?Ln)BV|(e!H_&sDA^%yFl^G`Js9T*~rxMJ&I3`OI5cT3Qn5 +zdL|lCXN1vV#p?(NtMm%p>$hkmM^FtF#@zWg(GaE^7_rgc!|RU$@Jl~l!=qoW`{SA) +z)_NfTia>S0NDb}rPgQC{woT@%GP(frt?11Jhb6bUL5wt7L=FSZp;NjB;8W^AFnduu +z?A#-qa3qsEu!-cbr#Kuk@#GorietcUkfirvDf$?E2b#tw@eQoS6~Vz8dE?$tDnOmm +zNVOpWqKP#EDZ?z2P{0XkDi}UehP;tgYdOO=qojOT2>T`)1k4_WBfX*=1Bu*o5zPC& +z)3-Ukp~}{)z5Tt@ +z-%zLddhhgbx6u%cXE8x*hMSZK%1Ewq)tt7hgNBbQ7(Y3 +z?Z#^0zrn&vIgM0JAZ7$1CM`5Mxh5|jDc`%1iiJ9|CUOJC2H=Z9=oyBiKzU0!%Zk;L +z7+n=lUy9QJbA^fHu8(On(;Q|PS#b{a)cv9nZ4Q{BjZAJfM0OdL&cT$ZDJG8kk~tMg)h +zeqOxVeY1Bcq;6PjA058ld&6({r4WYp;A-(H2C%@Z8F5+0Kjc981p|HK7Z2!>73WEw +zZOebVT$dA1BbWKHNOKbQKSgA=&XdAug*%x}OkOr~cD|RIQp}mfvT61m9@OW1J1I!A +zk&vt4o&qs(VWS~N4Ap{0CG(&uJuo7(Ik~5GSF5Symptf*kUiiIv@eBo=>cG!yNzPT +zg@?gZT2$7BLq)oM1J1*Tftv69oS(=YD8+GyaOk}V7#<7>IZ=K**mgMCF{$VPq5J%fuB!TMN+f;gco6GIR?hSz=nWoOqPZrt8 +zsRgtCM%6o&dE}sq@+)EVu$OM1smuP3yGpn0@j@aQE*UZ&d>?^z4x2n4{Gw>ttHurm +z$biK||CD~uqIQP|RQ&Kj6FyESYr-$fvaoYdxxqUJzj1|kviq2?5<_sBOK94L332%< +zxJJ5PAP)7(;=$INz3t}q0Sr`swZH;J;IK*SVrPF}s;4kQi0(Z+M)CrbQhqCBSC_e1 +z+T-4UmhtG-f9IcEv5z<>syLB7N(ck+ +z4c86k~O%6*KpfX7=QDpYuMAhzP2zPfgi6L$nyF85hg +zB5UrNur@hOQ{~_;;L7|(R^Br4IrVPkM8ysTmBNsmZ=7nSqoWy6Klm}aI&T)$H*RMK +zNtDSY9O4b6-w&d3Y+SrBycC|=UZhTbpc1wcgzurO2Qm|aPmw2?K~#B(Imu+L8wnc- +zDoMroL2Oul`@Fo-EQ_2 +z*+fYyg^lNBlO(E`{cc**tg-h{V{cKLOg%m|llew7)I_wbFvVz3SWASXcVgdg&DR`G +zhok=z3_8ms=# +zKT(TQJ@XZ$KC8lhTU%coZXN8_GSdaf4ksR)^BWb~ZRZr1rAfAJhn-G9xpxU0^a#ju +z(oHyk4OzeS(xcT$oZ#?~@Jk*UNt=pi*O{H5_`BJTr*0c1(R+?w` +z#V#@X(x#hEt)IJgS(*6kQr7c~1Q*1eq!u`5adQ_|jf)foLo^()GL +zyFouDj)O11kh7&^PRcMz#r+>8JZW6AjOSohE)r}f>xDBGM=6kbCAYb0Nhv7WIwA|T +z;y#k3llf&|W;xG@hC}qp%9Jj1B_g^6d~708WE!~OvS*sNxGe)~)Zz#Vsb=^T&VZYG +znuF4O55)N`Np4XmglqnYmKk=QB-^owr%wNtsv0D>KCJUq^eNz2jXv7XT_Z=&%D>Lg +zzosk-JXP|(2uqR~=uLFnuesS;td{V%B=KlDKt~8E?2sUU=!-Z3>{ff+;^dv2bP3)K +z{ad|8SZG@wWlt8<*R9lG`mtz>bgWAFWdm&AzDesy#)YvTBia`0&<-dTyt5i +zozYKa%v8i96$m6SVWUkeGPEjI`FV2ApGoG$j+|{0a%B#QVpYRgYUQFxr=?4pPN!5t +z`d%VG?VU}_Gh7{u>1Q^*vBq&O9Rg+7#Z}m+bZO%ui_l8GumkK+#1^{L0oF8;+9$aRjlLicQKwpoM+GMn@tsF92*Kd{bp9mJ(His%d +z$IjjfI)f358b^s4vhvSCIi5^u;s-knEtjDT&#m1znUOP@8!*2Ui0R%wHbE2cT{@w% +zf2Q*8<#&TZ-r+q#^VhADO>AsxPt>)}q@EUR+BqBpQ7gh#G(==FLzG!n +z?xcHXgOeDK+?}#=E+(Hi0;)%}nzi&c4Rp0H6Y`G{)0gv7I&6*mk8LHx!{2Tv{aO;N +z@J=2ec=e-Z9jHz`Y?0c{X5aRwP4)JMg*DJXtQw9!WNxejz7KF~7*R +z$_psA8oj8e(bclAv+ +z$6#B7?l{K(@hN8N8umqDyC6P0Rm3aYi(AKgyN9PIzloi0_W+I0%WwA%8>d@`+q>ds +z4^GIc*m-|+vZMFK{_(Fzd-#*mfwe0e`At9MchQ*;J%5agb^g=DMdbP4+1=jXI@wjV +zcJ}wny1%jmdQ_(S&E^dh!ZG;$R?xfxIhw?5*g0unf3%Mp-SwjH#7 +z9rQEz9lRB3Tf>(#+8WaAoob7y&{#yFk$~j#+=Ac1tnj{q2O(leb~&+!S2G@Ad9t5xuVWGU2+V3$f#`> +z#oNGgr7D2)4?f}-ycEl**=hAhUAy8@^JM4faR0X|e0#NbxCIACvJM-h+m+x+dpuC! +zB|Xsf!<2VPSp;<998eM=#`6F7mf-_o`_}0$J&X8wg +z*&klFs;CwF%H#F!iqQoJ30@~hglCj2{`Hb4N`0HKPmwJ`TM1VX0`YmM`qL7?5(4DVl+!=+qZQ1u6#7JEDwr +zeiX~JGIMg#mlHsnvPlKh=@AgAa=5v)q2Hc`7jQN#E;2}L!+L|4W2Jft4RMoC&(BLD +z>-l<#A?0)ikT4XBPM4ENfrzd5e;Xr$FWs%S%sd#B;gW9UMX?6|uPo`}7FMMpTd)?z +zOD0|ReA|_A-thqFM-uU3Nz5}B!rH}f!- +z0h}BV^kYdZNHUTr{0T3y(i5y;K=tq(ZSxI +z#oJu>abl&>UT0&|{r$fvm*`WY4FxlJg*N-;F2>QWYgszU=Q( +zj0BK&M=^sy`HP^}q|i&flS)|G7tEHxI%|pva))UXP`JIlxhLH@#u@G8|L=XO$| +zaaBaN_!MqDPOwELK1y*!hPTqLmO@tT?7n_? +zSUyYDzo-g)_-Yr#{N3_dap|IJ7XsSw?)aj@Va=T8SBjr!S$=whR +zm9Hg6?=+2Jrp{O@PQPr*9$es+2L_ZW7vZ$*NBlp)u2kCnE`i@Vc_ZtVWmb|Wi!Jg% +zCb#VJk3UvndvNg|e-z0XI@>({%bUi9$Z-l2XL4wpKmC;7Nw>wbs<`0x&IX&s&(dew +zlYky%C`M`Pjb7(SU2sf^_>g!DiNvrUCEsAc!VMLrGaXbCDa^ift{#z#6k9>y-O+V4 +z;@B%lHdV|Q)R{(oz8KV&5A40a_ZnSeKI0!aqk)L{ExO@uh8>LR2+!e}DfF;jEvU#V +zgOAs!*fRs=FbgUM +z-=PQ8bRIpRmtRQ_Xv{Oy11g=Q2g&fO+4LaM$?r`MbWF|^Jy1bNGw6XGpY%V99#|1d +zzl9z!n7l>Irw3}IrRag#VF`L5J$SO|fkFPq(*vq&=z&WSUT-x{n{;tVoJ$T}K)+s3 +z8MfzA2OHM^3XQNkkV7f#B40-@?75hgYS?u&?U?LholQfsyZ@ajiR0RxK~EAPchgiQ +z6_fWri?$@^=bI>u18nj_=Te)*CQi~EhtAljm_uz++vw3W$A*yLL{!D&z3qdeo!tzY +zgEyDnAd?MAR6Z-?zb=I#px;1VuA%mnf5QEVsn* +zmp#%(2%pUd)V(;{K(Hx5E4uE7ane>k(f=e|H2^nSFm93JvW$Rlq5#W?xM*Riee|(D +zlM($$sz2&7ZC6Gm*bw@A0V#sSQ`q=Jp)BaFY>{lIjWB9z^9b?t`gd=k9mUC3xCym= +zv*9O+kq{H9(K=KBj1Wi^C?K+O-iZfYKuGdI=~E7akq>(TyX>Ljfb0{D-CJK#Y0tyTe^{=rvGPDS4 +zq{qW>bT821wI*kX#J!moWQ7jL(_{=)54-;hhEOyj)v2ubdYy3k1&|Ox75=6q+OBiC%R5)x>$`2*t`z +z!iuOv5a5ub@XyYi&8Q&Qnu*oG_yDtCq=M_p7valfD`$P0hUe^aa +zs#TSt`#5HmXge5TWQnAPrOF@@tjO`mGzaX*k +z29SXQh-P8K3MzxKoerTRCjL>9xyrRqS{(x!cGg4CaL)Gj6PKQ>0>|TDwJn0b*@-`mCqQk2vL%4rE#9Ji$~a +z{K@WrzuQ9|1&?$*=^Zve^KD56pb+jTp3wma!3M{k<@J8H%WwbA{=3U)^^u=*a`XJW8{4IPk^1`41vX)&$pgYJ^U!?xBCNc5 +zD1ua-2ZV5m#iwp>Z<{4|Fk|cR=x}d)YrpySsBt>2%&T{MF#dEQbxotV;NKd&j*Z>p +zt&^?OqZ3&NmL73@v)i7Q#$;Y>le>7x88SS&Z}hOTM>!KC)jrXNGc_NHixCsBmQ+1{roi3nM%V|0<5UXh5u3 +zOMH8Fc79&JxIhnzv$HMle|+!n7Z>a5sg8m>WS2w0(o+5G?00y_|1Q+eYv;AP&U{A! +zi=sY8y1{c)?>0OV+p3Tr9*5VLKXvTdbNKwJ{-tdAcKD({q5X`u^6-8F|@!3kPs +zR&#DrdxiK<1_HEN(2c4?$mLY`cZf^fmxm7mO2qUn6f`b@=m`=hvKMic!zg0>Iz0Su +zDX{|DlCq;DplHoqdo^7yW+<3+QH*M%Pl1FiUF(#aTZclibjgGox1@w_(~NQdV?Vm> +zr*GHod`gqDb!P56rfL`IqtPv<2`&{ys+}i+?vv>0oI3mV88fqXsOXZW3=xGRT7I2) +zVk8cQ7CKRR)?3boL&3^&#hHCuj!7b$B9s`mBM7J`H-T+O&$EjPkWyO=ebSAf!p-xf +zKR{4lzWI +zms%ck7zo^2-Y43);zwIdkpfByV@-b{Zur&fok}TFI>|!YA5>yNi_z55OHKuuuF9#Q +zIM(S*szUwbV(vd)3&I&|_7m*ueu{71pTMy0&%mjsNSrLUdvbDgQa*zTWE3Dv3s}?+ +z`V8Q%;T*zJha_30CIwrzbb!`#;bpT|_)f7{ObCc#P!dNg4it^X;P*vUO)}Ujc9$qsf!1E+ys#UvTZpb921mIWuNGtFo{b3sY#2(uaK +zu+tK#9r02xY`1NPxx8ECwebOb&+cVxl;T^V-cKbCk`?#)7u7hD~T1m^Hte#{} +zy6l?~EHeTzVMU&@ERB_!`b4;-l97l@3P6_jX>$_v&64CtN;pA>0s9K7i;V#~Mv+od +zyY^#(C=7iKToA^>QGVvi;%lA*24}4Rc`23PfC@^u5cVrK=_D1rRQ+c%U2tLkEySI4tE1gLn|h_yM>UNmZjf +zuTU)OOJYb(QdjmUU_3jwU3O>$=ri@VaflI~(2b|>=$B+xveGb+OTjK`Dtg$ZnMKli +zEwHoy0;#_^Ry-=M06~;e3w2#TB||2LsB-_%5XE0p +zEpCTvQ|sBQxV!%vR&vREiGmmXS@5oa<2pM#*uS`Fyb@(6e%cp{h*V0Zo#e(<+Lbz~ +zp}hU&hV%u%E*S>_g$H_StRrqyj17{4I4zKaHjDzo3I0#P3ReEMDP+> +zDge}*3}JvTCiIqX4aQn25-z-WCaj!AhmzJfNni))IZsJmJK_jv^{d7XTc)F&;{&S4 +zn5fPYh=8#N=27yEc&#k`cY6W@qji}W(REuuSTi2z$}=Kj8J%~bA75mDD)sQ}Y!&GN +zjHgTi-+_Uu{M-)cu4Uj~XX9w*x*?uAXqsCxg>Kd|BW0*9Xf;YQ(UH;K&PX!t+}^vNfYqR`>$ +ziYoDJ4GTP5bKXB&vw&F7`*`u>0bOt1xEuaat7u1-yTXVA{qY^1iyZiBeCK@~a`c1I +z_oFtGP>RNn(mRDX!IeZ6>Ur(rV(}cd%(=p#Mf0s#nt8`e1J9uBz0?QlA3yufT!;y1 +zI3o-4wY#9-jU5gI-97X=esfC`shX{dyqpbRE{!r!pZ1Z8oqq1*5itK=iLw_4TPuuL(6ko@z%bpJgu^ +zMMD@)#NojvK`?sf?|ga2TfNna5v}>hxOFA)*Q4&$M!i9^-`mueUrE!HelK;6)H5ozc;Qt+gxCFue8yDC)8Y8p8pxQ?N$gga^G%`R(cDO2 +z3^q!J=XXO#r*2)mmDO~4uM&6WDu*nLM|uV?Rjf-6UHHqMY=HC`7^aCE!bBr@H5VQMgt +zQ35CyM_N&ghF&91(MWVkr#+Dh=orzDGgdwR3Q}ZSX~FKt?dFaHw-etr(V*PonvlsG +z!!w{DSk$@>;mZdgh)8nH?MDx3ZnoK)sgY^6mSvoTg*R;-E-^-E!9!YDKmh!1G?Dnr +zC?P2nZma_lvvQua(kP~?a|%S?*3eUoSw&u#>duyXw^h;X-4f!{IJ;Fr{VI6f-fbbH +zLX{#csZvFrqi&Cj8aJ9rm7L<{BsJa@`=>km&F!PZUw04pb`Q6A&&ohFD;Mk+5(`;E +zsqZPav`&MDP-GSyjO@rE3;H3cz0`F81w#M`dxzT^ii)6?3y34cP+h;>j*Vv&zV+;8 +zO!RS`8C1IqVcdnoXe9TA8i~^(pRWq!bTr<*YMi302gZd2N{AE7Aq3#f&fZBwp!zmw +zvttMa9gkJ@0cXl)KM|y&WV_dvDJd@H$k3-mbwtG?1AZR_^og0~OewT)yHTDm((ZJ5f;w%urxiM#;Mrwlv~Y-XDXi +zir#AXQw2LWUBEl?VKf+q{wP2@5B4%R001g4VbX0TiH(nOol)YC^pwKsZrZ5Aq7XW! +zxz-76=`3dfudHJVpy;470=uXfBQ25Bi1F_tV=Rr6O~A>R$*lV6pI>m!_j@M#%_4fB=#PtnCw6ylM+cUFmwz17D}XCBgx+6pGS$5kE?{HmlmNs +zo(g4yD~ +zI7Ct61(~YdNn5py_h?hjK$N7E2M56PBS$=v6!!hr2@F!99w%a!ILQVOjtjH&Ic>{} +zN~2rM?46>t%*|dX9sIP87NDM^9Q_(HtpGBFZ=}qUFn=3qHk0)Yy0EKo>v +z&?syFSw{i}siJgR&TctycG5)^`gE4qUQ#7uY9s;#aSb>4N%5CTZZ#Q7!L7zI60)i# +zL$Zi;oR-P;RD0=o4w?0|dx?-A+vg;+Fe;@|g;^@o_hj(jU-7C8l^Ym`6H}kHx)G2y +zOv5&2wGmT3PRfA<7d*pVGO^BlxwGlxf~yX*2&j^JP#i>rXbZe6j*HHm?AK*yXp +z4tfI!M<#G+Y`Fyl9Xc`)hRQ$M_nEavIto~Dd#V4Ng!6(~V2=?Ku>2~iul`9wKKQ`Ha +ztISf2hVT|6$`RKATug9l?EYek(;me!Y7C)=$7DuL^T%=Qm=kagCAW|H&fh+Ppg!ol +zT&gqD!*Y^>5@55j?S2%Y^21~jM}=gGovdk|iKbJ0ZOPnR$I`y;6jvITLHcEKYFT(& +zqJc*;a-IetyT>8qeaxq$t{j_#&4SeZ73dYILr8lG|K#W~X%=Efi}_@cRh3lU0^=%G +zxDqQbW23y3T2bkOL&L?P8uh0vfZfLAIasJv5>iR2MuLej*l*iZq_eS@7_sh1(zAeo +zCwvQpXvUO+JH}k;`n#A2BB^>(N+~4>!a^Ni2&MvAimlpFUZ9NF<&ulkB(RoNSt5K*64Ww@C{F49&Pd;_swT=Np5&!SxzlixH`a$;|+1pET+~z>O9Mm^O;0 +zPWg+eLqZagf*eM{@{E}5dXw#O!^FWo6E-Dm^)}_;tz7zGZ33IX;UqevO#HH@fN`Iz +z^*#yrMb_*K4pEv7yx-NOXkC8#Df69LdM^;Axb7G0AoTv|g0cGu2uFq=&dov#NkA+T +zrCb=vI`d*}3A4{2Pe7+)*vHrhaexWKdYsx6(~0)+{8g0*V~dP*!n=k|xRi2fk|@cM +zDpc7;v8>JalsIO?DdHARoh-PmWhwJCi5Jb-+-7ATC_<5SMcytdP6jdnLsDcb?7W!U^g&vnz2onjVk_ZuVoRLQ;Yq(#LMd;g; +z2z_%7p~s~V!W!QtfzUVR5Blo#K~i;m(A;`=dUUY$7mzP@Pa1nihh_P;DRy(nmf`2p$xo7?YBPIeDZQ}w3}T*;ZJy3S}GubBbMafe?8 +zJSj@rLRuhYQF%couU;uu0{q-N+%x@2j&o9=~!i>hhl5rx3?pBr-`s15fvRafA +z!lC0ZpQ<7(U2?IY)+JsrLfZF`Ac4D}=zf?y!t~uM9JUgPd4tkzuP2wCyQ=)f#_?RGi8Bk<-!iD=i#tod%14l)0R^sp;feM)1E_%IcobV +zSm)IP?n)NeES(q2rsYb##PV#x0)o*N3yO@@7dX};2K$+3^)${8^orY%x6Q?ay+&j2 +z@C}d=Zc_f|64d&yB2^yzFiDi9(%ap124DsS;^)Ya6cs+Jc)jr*|c +zN8>)hAa?I5Nz> +z&*3iT?T%4SU796Ba{0zyUa}Mjy$j9?N*vnibL)g*ba+x59FQX<$|RGwQ{2*a@>uh! +zGa5rFt`Q#(?V*2*H<)@mN&^BX5?=Gn9rR9cT`Unt&MQm +za?Ahu&th=fzO>AA4v?kT**gWMd~5$(6&q=mefj0f=ftuvRsUe$|6t$$@38N200gxw +zo@H&b^5NFOZdK5U;pyj7bsLVLzr#loSv9spzDQ2W=2nyH##a&+perlV)<{QfUPcuK +zrgvAC5wEvSp|5AfrFHE*pc`AKFySQN%bKsZ_8Ys>$YF+>+9igpvqQsry<<*J>Zjn;jx9TkTVF<=f=P@pxP%1~P6~FPGCCBA +za?j`JGb43=nWD~86;1!H(eC(zSpPw+|AUFO6ze2E?31w#FiRNZ-pBlbS3#F!W%-no +zyBlz{{Yw*4w*+O#3U-KAPJLp#F{DS80(sqV5NAYGZNEzL*H8*NMh{(OTUttig2vDx +z-RYt6`U0TNLRHBolF#Onu%9UcH@bR_N+gx6?qNdQtndXuegOxHsOFBQc>gInlZ +z40{x_&IVHW-rg3$s8vf^&Q@ip^H^Fm^@W)VL~$|(R5RN|OSs+R-NT*T!|lD@1|5DA +z&N`AUgMeeFahQ0Hk*t%1#3oYKJ$o0ik;uG2(6}87+uMaI{QKbp{&}8{Xt($)Mw=qt%Gy!8v0cO&DWxd>jxeT4j|7!7a;^LQLu*;Zhf?Ln)xStw%AY0@4jOk;bf3mpzs +z$Z8)xRPAbjT(eX|oU58@go5d6rR!E}6=O}8QUCyb?RF8HGuq7rV1G0KWJR(%UXjAA +z6D82vY4Pa3OQDa71Sz8#yx?kmY65Fyhq5#6peyJ_DtPbK0k7A)U5m$}2)R9kgS8zO +z=l20=Q?*`?(7YXKC+C<6B+$Df{Bn!24W)A>Mp_;Z7>taScNJZaV|lr!{4hK%p>ml0iod}egU7cwnOC>_z;;&O-L +z^eOG$rFQ@im~3ATq}49lF{$o|of28~uss*Df8_d2dPg!4!h>2)ERi^#Mb$!NPueZb +z1UaL!>CkOZ8U_qUYE+D})Trpmackf%VX7ysc1Gvk%R^0SA+PxQgI3s%jz~&eN3E;% +zV>AgPaT9b0b~=%;?_(mJ7Ae~;tj5GlF|VgyN(MsOS><01D~Fxf+cqaFtOUZBX-Ayy +z`J`<}AThe%2b>cGb5YY)kjx8mfC!KVtkyCyOol?o$#_WdR?U#vWQuy|!04&-nx~IJ +zxQoNM0TalknltR%&Azn8F`>YdB!t4&xE7`x0sT_)*mA5_K+(YXYTm4hFbroI@x9-`I{J6EPYO5KUNvPW)yM8G3t= +zTCvIje-*G;0U>25tnw||jKUFn?H~^}8FS92?zq<%FP21^+BvUO*&T_Y80&M=@ZLlb +zCGt?4kcPu-VrV5Kzhbdan&{0dVDH(ZQ3h{iOUx1ZGBXv!ISPPNp=GKH8G>80Q9b`& +zLBjYD%xlx&Rct!qO|f#Q*!1WsM$1<#WlulQ{bFJ02DTS4_?X@g&G1Jie(l!Y2P@Tu +zthFwFLiDR^3eYmf&>=1@+TpH>HSttDvkd~t7_T(1eEbSjKOU8eVX1agC}D#0EU?(k +zcSNr)otEQKF|6H`q(Q5cwyn3zwHtXqq@YL}Q}F_b!e=xOtv;}A=#7pAF^VuZPofRi +zv`rh;eny)RIhqH-Kgmh%!5PMJWWU112KcJi;q9xuWX;atr~L@Y4^tm2wjsN)5w|z; +zud8sHVD88;23cEqEduIcRgdddIY>cpUs4fW2zzj@Sf*_=&HzIR6gI^0*+Y!QgV%{k +zyTQVpa^o`lsEPI{cmR?&mz7dL$4Su3&rujMqp+LMf=H?=Y}c3yHz;=y2PGgJz4Th_ +z;CSgpC7mxJMixVgvxT-F-}K^98!a;x5S(eer~{Ha9`?zY*s$4+asPN2iS5Njv+=Y) +zg;Mn^NNA+jrK4Ry514JgHJe->U=}HWxs*%2sn`5mb7M^JHr;I?&jR;p@iTCvyB|)y +z=)tNF5Ge>y0s+yKJoD8lyfd|nq}4RUTXKuSga0Ct+kB$82A;6Oc8HaqbeUi{lm_wi +zA**C-%RQ^zh~xm0*+BB^Pwd?kNX5@6pm@llKA>H%*O7ZQBO8eud?tixLL@IfnhrhI_yb23*&f<;YTU0T5Ro2;#B?N$5@m}jYOF4y@y$ghUk6Ex3@g%Q5z?d +zC3#?of*6x+8dw~G1TW!y9g7ATT^Wmpvn9DfvQ<@b+F}XRJ2~ +z>ab5QYD-hv=Gk1gT0Abf!?p-rnQi0~-7EP5o+e1!jMUJSFxMM +zYu$3POqgr}Mkkdr85WyTACsf4+27sT**kpG+&MZ;-P5R=;!H9x(psb0jz$mA*SK(D +zCn=WW*BY7R@RKgHT61INR+Cw`%|v)=sZ^>pmDxC>2%LulvT_1h0Fcfbg*|CagR84u +zrZa0QYx-e8k*s1=16#`x++k77O6|BL%z|5n^cx9z(>700$0xBHq#=0)v(nh#YP{Vn +zotNYtRs!Lv94^i59dWmx+mP-1pqvh1&$k21dcm3w1sZ*3zt82H>v~YX*o+B8Ldb}TpDXXO^(@S=r)&@P} +zMDD?(f|rEn%lZ>IAb48_#mbU_)}#}R}IwiL1x +zk(CP$o!wo4lqhy#VyK>MdBnmICR>!Hjl#F}x)h?^YitOQNPvq%adr@f6T^-w +zw}Rn_by}#CgKoVVj}(7{sy&$w&KFnVHLM_+ZDvYG&#KaV8vcDzohUE;VW#(ou=F1< +zEGYxm9+1JkLoy-GsB(66jM|gN#q8GC$#aH7 +zL-It)9uNbsJg;@oP{meZ96U0nA+HmxTOJGp?Hl5u(?_LhE`&K0+u(+Rn*qjQ$S-b3 +zc`IorZ*|FhOYu25g(NJHbmFG6Y{9|~MrsSTWWdwp^e9s~W%58K5mcD^AM4vPIFb4> +z@#1J^*ck;n=xQHBT4|9^#%Qw~R*~G$E4nJ?ezJd@nl)6y`zB^$X|rfvWBhQh8~J_w7QJuiexNYJc2NPZ#dEvUNR;% +z#<-o3Y&ynp0t0;*-C}4)*byFE_OX%Mt^7qU*^G=~2c$U=6;^0NSPxcF*W8qt$AlCU +zgL~}Wpq)H~>AR#`SP#8GlCP~;8PFQJmn7gf%9#}{xFy7E{@Fa;A`z%Gu_e2Ld|c9f +zf3k?}@4e0#UR9C@K3|&e4*&bz(dq7vIfV*E`L%!tkyMt+6(LD0qq07^3Pt%9E2}(9 +z{c-OK^SW4IbU)`gS2z04$A;jNhj%SaDz<>o{l-R~*`xt4UXVPTY#pcq2Tkd!N-xS= +z+xth`Tl-aIzV7jTkQLzMp^{Mx2onk$Rej#&6hi7%)w-$Kfxq3|+SxtfnjGmnqaXs` +zJA8dqrL!mOccLt42Y^3SG4dq@n_4y-Z!?~qp6nf`=9-E~fm;(t^1!4v;EjqcqvQANDyH2jLB<@@9bJmx8g(n1TuKe>PeHEC!Bg~Dc +z-WSlquX{VYP;_^{VKutFoo%6{R5v;5L>yZ_DoH +zVdeqkLCqNf6wew0HdwJPV9g~g=_H*4SL@f&y@Yp470*M8*fAcoeHFTWNjnX8m +zkU=5o&CyCMR+u^|;_2@TPR+A#-9hcrl^oq&vB +znYof;fMF#uiU`KJ<%>~NXfQQszCAknizt)QM*7}WWTz1V>IIP_7zT+MQd$}k6siAl +zRbGZ5`>6(iFeqiYH2}6jcW-2JI(ES!bGM`3fZ{AHmvBbg!5v-AaF3d@d4SjiLP#yi +zSbfVJvlbuA%m(RdXePoMN46An3NzXjF^y7jd40j8L3S?yjOCCFKfQc;FRZ<5VsTJ`dWpZXs< +zmH#6;m2@b1vyZZ@gA(B__@FV{X|wp*{O}5PEEM_Ni*E`KmNa9ESH3aK=8Sw>V%H_;j^iheL0Ug?j&FarcmtzU+03?=X4HQUE{pQ)8hRqe`;h20GHA9INu~m`nR~N*3*R +zt$-=#z@i)wQYXueY_l+5;0NR_w#gDBi0b3+NE+V5;*zNvhCo0ZqUq#zB#@dC(^R8! +zf^63_(qfTa7Y^fcw-5W5P6(v|kZx7`f&a;Uj&-Gv`g}@MI^L+Z0&`YfAw><{!(I>C;;=p2jRRp#26cZ1DIAg69*h;U)2uvW8Urr +zTLRS_uS`Uil7%h8@&TM-9hbAaen;YI6t)I!*cBfOG;`#^~BQir%z#D +z!4@o8SztKXr3sWz96nwAk(5PTyh>_Z;t+uxllnFqQa(|?jV9hzUgWT&mPDmR9_rXA +z>K+qColmHM!wXbEHj)elC*vyzwd)$D%A_Hdp%`iE +ztayAfO`+dv1%naod>uT{R}Mpr7A0POjO%^f5C0BRaS4RCrp;;GdNGU;&B9?ltT-?g +z9X4fjgV^B3ekWK*OrW^pAgm%9bd}N~E3Z{bV6J0`!b-JJK^PRN}7{mmdZ4lWIjzW@QcnE1?x(&m{ATHP} +zpc9)^@=^;*^3nao1JUwznO&X`rb!_v119iZiaV;~Au`-g8A>#B*7-+R*6a?*` +z{{yLp>$<2NG43xxFi<_atd&fd2r{pXMX^jxH3t=m@f^~|_8L=FC^bVnz~lH<<~+cA +zY!wA;IL5nw+(2AS*szPVJupl^zhsL8^Hc_ZG7)~QIKf!He5rDOmQ1A*&Ol}(#6I{$ +z`lXxU9a16OrzYM$r_+QZ0+VEsClYGeWI~8|eC5GG-0jw=$FhyhlC?0RW<^|{7e{?@ +z7~G8-qhLVzbp$Qqk1Ef-+;S?6l!}NW9rM&4qz%h>!vS^(H$zk}VU87Y0g>TQC=-Jn +z-b`*T#&XMG*uNtCWfesak$}xe)zoNTD~h>*CqE$5z`-bXXR`gVfFEt+{PUGUv27fl +z5GbyS#ih~uDz+XoYpIipP~B$dtlsE*kB*bQqV801G$eYJlFcVfO|5d)B`l1olx=n@ +z%bUxPw?TJ+c~4~SFg6C4+g*7hWjf`2)#b<^tm_}F>wh@wnhpkVuyy!me^*&rP6?cx +za{qT~)1k^y0qA%0qPNz(8u%k1^6{u#gxz*__PY+o*t{UyZnN7HX5Q2KVoA3RAlZ^E +zU@cBqA2VMeW2AQPWk^%@>87xvovwc^O=Hpfav<}qxI;8OQnu;RurfV+WKdQW%Q+)z +zl;z(U9f7cvtik7OJb*>_;sDt_+<+=^y(aVW$eJ()?TrZ=XLoD+t&HM8^`yys+Th+4 +zskp0UOmz7V;OT1*Dgp@ja(Hy=k>&4f!*#~JOZnyl2@f|6w;&V9Q9}~GqndEXt@~%( +z3ZQcS%8>(tK(7NeOy_E_XSq?!cnusxHt2r}hf$vxKJ1|1m!Z2eb?@5g@(&5j-fcILOx>kx=wmyTNJ{2jXDbzF?#5(t^j{R(uuu1_PZr}Yh;L}iM7NB_Z1^V= +ze-7=Hq)y=yXh=!NhbHMoT5R(*ajP3$UCE85LMl@!PMo0K4gp0D#`22X+n1qTWS`tD +zklJ;er2Y852aNB>4Zc%m!>SnFG*E~Rhi!3b4(xdv6XJ}lOC2c(*R=;cMJ7as8-+{~#{AF^p-H@WUHR^LIU??tQF#gIhdX +zxS$)_4~1kHOPH;8*v7d=AAKDS(rS8Y%a{6+R&cPvPI9f&eW4Wa(*PGt><$yy&#LZ@ +zKLt#W)r@uzHmjtg6od#h1Ik5Jre~mxi+$0Jb?^tjFLi +z=TCeid>M(o4-Hbd6$3#x1C%B7V-p9*+GnZ`LXuPkbz$edIYu9cmgB-4yqBUJJafqp@9~0^YyBa!nGG)rk|b1Jq)0C}iN9r$|QfrNd*aR}HvuYBgWl!an%4c?+# +zsPKm4L(vVd`oYLst}WG8d@q6}R52#5$CxAAegE8f`2+--X#nO>Dc~(V^;Vt&`C4Cj +zvA*`Qwxm8{aS7f(SzKJ4*boAF>MgB$OE1LI>iW~w^_6E1kYxb!%P+!Pu09uw%hly2 +z@yjny#QYCJCYpfnVrw+QID&{PJTxCkVAKy=K<6bNg7&DjCm!BHrPLg7&c0lQ|JUIE +zr=;?DHjTOP=J^6R3l{vlO8>6WzY=0b{3-_VjX{6447gds8s5@#Z~0{j-U!<{`72o; +z48VxljlP-n5szhkR2vc?azca$E6Y_lRu@;+s;es!7qkS*6iAvRIZ-{;4NH}VjTiRH +zJXbMxs)y2TTh0i=<00$Abu76MB8vg5HR+`$OajsDz07_HjUU6fUPYrD=#TjEiog8Q +zy1(v^;~J2fp9n2aQJnQ-i=|`0)&fdJ-s{F|B)#<;kg4m}?K;4z!xp2X^9XP;eLu}y?uy-RCvw`+d +zxK^Fk1E;Eo@q5~0o6-#IN60sfF!hp{*ElNI%;$|9Pu@Qzd( +z1-4ok?xSkirjJYr2@coW7o5k0^Aqva=Sb=!mh7Bq1jTx}Y&C;FQI8Y!9fDp1+$ +zudMJqa-=cxlz>gR@~nzcteS5!$EdzyFnv)*PN~k(FsSzxB0?TAiCvYuQE6C+2fo6H +zHh#O!>>l-tvqBAIEU0#y71A+6DI?#H`W-0y5p_&7S)<_?1Y=YjU=*Q>qI>yWW@VPu +zaiUSZK*vE|a>5{2YYX*i6{8?OSsbGW1e}qW2N=Gsi{g@y5y>v_{SjLgjBbL&hPOj6 +z%a+eCi@kvE{E_RC;?dC{kTodJ86~;!ZmPobFh82UktJl|`NHQ?gMo`r6-HPAiLS?* +zH&uZ`L_jaPXo1ApD_fFOy8u2_EgKH2#ZOLL8>iNj#gl+zj*YK50o*K`w15>QRGL?$ +z*A5F%F6z^RFyI!VVBGHw*{Vo@3K!Ampg$ +zMpfBhJknaYWch`3&w7DL%r2WRE*Eh`1@Y6LS4?s2`EphS5T_A4xQ7ufU>QM_STd4? +z)i?!MMU9Tux4W%#!zyMQ#k(!>vl3;7TYf4PWpr2CeD!W`e+MU4C)=_U=*a`9CJuG# +zV<{ve@$%WmPS(RL&mk#}Bw1ziI-DWaEwx~~`ItJ0EvIBaU^Z-ngFG7g!+RA1hHS}{ +zIuTHv%&im?iu;!`OIKyYZR!XHWuYv?l=#b+VI}E01F0d&haDdfL+iiZ!T|?@3Ld=o +zRdH$0NJ(oxu5>!lw?~ar%vfEcxQ-(kXPAtl)GN*}Ms`YUL&*JW2ZJHVl$_y-wz2Ba +z2)3aK`@=z_al-oXfPy7UJ%P6Q83iQFK0)7rW~v{$;4|?Vr)KlA%%;6d&!1zDdLI!{(0I)I8*B%zRBv5>piiMZyW +zI*>TvL_nz|X$~~f(8jl0v}lDi=9Px4zO~H^&SAtO?w^9BNSC0Mpb+Jo*tQDm>=%samZVN{dX+-3B_%>NWt*939rA +zOlnb5;MR+mqV@8nJn-f?$YfC^%}e&GmC6MsbizcU&2|rAbghCuL#RY2q%TOX>5C%R +zcLir`t{tK;w(!dyqnbY#%l5SP6(MuvGrz1?spT;!)1pkn;77|M&2he$=WB +z$D?Zusui@y;zfOBt^RVYMwbmaWsu$TmR@)(Yn3OoM#?s`UIRG}wKLSI-1QN27`bz^ +zi2tsuI)tpm>f+-kc)bO~euuVF&4aD&w|j@XNJ40|UN1o&zI;iPl=%V`fRo+*-K~ZN +zV3-F$l~e#ce%$!2ak_h8>c@HYWkFSaaklEY_2p9;1k(Wcl-Is0sR2Ckm~UVzueP7s +zOY~Qf3C&b^h;PUytjm!5$UTJDeUfZoFMBMDAsx5^Mw;XiW&9u9wYp<8uSRtUmnjrK +zJFD}st{(7c&2KsT=7Ai}LqT)B3+so$2(Wp5VSNFR6qrE%Ez13?xLuK9BV%RI!P|1&&b#}s?PeClEsY=!x`E8~5@EVFsKr@KSv|yJg}TK7 +z_W2XVA|wY1cn6{m*FiD`htE~m#lX0%tD!sW81wj;?6)McaGTOuAg@V$&I>@8B9}p> +z?li#(@G@BkcIGP;y3V4yxZ}0Ti`g@d7A>!G@PZ{I1#dy3G+wmN0bAM{bvFzA7mxaz +z+gcA;Mqt;P{;+ieGS-}fbj>Xg?qCDeVTS<%`=xQEW=*?}32Cl;i0O?C(qip*sq +zI<+Zrm*D!tUT}pNNFCjzpPtHXy0KwOEjWeJMdF*)pliy+H{I+qS9Y0n5v!TZuDdl@ +zz?oy+m(-~MiZob6V7)3O`jogrXi}BFx@c>mu$_P~#_R1sH{R04fl#3{M*UOmF>|}{ +zC0u>+>`U+2i;rLW@#@OQFE9rSUt++;)|XHI9ny?$e}o? +zB#;bjXsAf@^k^rz3Vphtu1m5Y(JWThKqiPO-coj1EbL3nxEaS)85o!}@_<^Xq6~pD +z1ErI9mR0tIlgTNuG*$i>4Ew;ZDvgGvccFV?a`vMchc&~y`L>Mg#pHM#N?8swf~$D0 +zD)LM>?2qp})Uu_J(mkhW)_4wR66fUHY?iQgDLu=&04qzA$Ke-~VCl?jUep%q=QYY8 +zmt2ZQhzPcQ{H}TW+wrb#3V1zseJDe9Ui>m=O}(CewO2ZK(d`s +z6#2dOv$b_}p|VbWf^+xcS@YSNqETK1MF2sQla~cCy!JC8BIWoBc*9mUv~U0i>Eq$G +z{85|<&^iichjueqU0V8%qwN9<`r^gM1Vnrzp}zPUsDKd9Qb50@n*eYy$X=HL5Rl=Z +z^%XEb^@8u*OMsZ3%x{`VfcV`9KIr*(-xbB<>o6bQ)mOk9_gBB;vfN$|!}$Ad>V-^b +zNy+GI;07N*Ml-|3!jIWM2jMUqi!3zig~J)UngK1hr!zn$&cyEyZh)FMUN0-Ste|r0 +z@v*$HR$HRuHlY!QiU~B*Q?N(E<6!tW#k<&!VRGG{T{mvot2?fM?xwdd# +zQ8!4@5cBMwFJsQiFQz+|tmZaoac+g(U)Mx=WqIk@TBTs&i&8EXsJ(&_qp(8l>Eo*G +zZ*R#)p4IW+7c)0S4J}V>DERa=QK$Ay*4mm}?O9&EKhJ9~Wv$6=Jy&fRY9@~RwZ4(V(4vP8723vhT~NVaQw60skSckaU$PSh +zT^SrKQRzdn5+)qh^)MX7Fr?TfU34yi=bwTu*Illy2nq~SfNuqou$BI}_QaDsIZl8F +zBD)vGoow;VN&o%(*{`P`E;s>r&I$M!V8;>~JRS{2Y3tSY&hG0sZ}-!JC{ZC1h{HsGtma@7x*pwBEvjox`F1KJ2%n +z+qijns#UHaf}`LKWF60H5UNYD*rULwcVg&|Zj`485_&Sn3tQs&sIm8fywT`z`I!Y) +z*3x1o5i$~U)%dg?l-Q26pKJyMXU5o$F-mZh5fB+BL1WZ;vi9lztfePfDd1Z|?kOyB +zf|VfpZH;&R>C*aY<%vkH^ljMhk5+3>(-5{$v|Lz!cewYV$$GKouj{~d;KX?rN7}mT +zVYu;6Yngm1zfr&ewr9jvTl?)X|KWmVHBE|dQe}02Etn2xnh7+I9Zf-%jNaLne}SOS +zj-rdRMtm_F%SXM5;w;Yb?4WlM4F@-m1K7hV*#M6k_0^Y44w!KD`H~mP(FSZglwEag +zX~~j%^>iuuieSWRXa$|(R)@XylfB0F!uoRUY-xGr0>FI1hbVA_ch*ybcOdoqz#8^F +zE|Xe>B%;WBKEDfm1*hMe1#$?3U|%CCQhc?!_72 +z?)syVxtWwA4)@w3Et +z#dmTs@Zo~}ROEEz({RlJNws%Q8b3e7Rf9p^5xIG0){L~@UfAk-{kvyrbk=p5W+Am& +zSy+E=1Sw|3^{uY(2A76aCg2s3YUsH(I$1J&fi11CyoxSn9Ud)lj +zR;Fu2f3ICEsPoj_Y}n3%-433TetQsgg9W#FVK)!ezNUG5S;%o==|y$r86eAxmFgNJ +zi&9mn*6p^5)>6~seiY|!a(faHUtqb2bmJ5zFT1gq%YPH~VAQJjqER~`hf>UwVYvvn +zTwSd^l-#WW@OT5I2o8BX-;qs?+v2Jgt}Y2-@FMQg60C6Od-wj8jE?ah!ADc{rCvOPoMp%K7H#eWc +zp^P1I9Q;Q6*nU# +zk;EaguF}=KfFmoA>zXK_Su_1sP^1fK7a0ZGDM~IW^k7F8L>W7WCeHK|+j`Ar*&0Bi +z>B8wzqafM=jFd7M%6EDObXW#!DzHZY`4uqJY8imx?W3uHHWOe6JOEDm8@3;%2~t4N +zmNLR=f}%ZXbt`A}ECBWlAw#xFZkm7p+a0 +z>i)tET~F=R%s!hDCiu#Z--S)!wrw6-t(%A6dD`+x56#=eO^#kUiO#D>cGuOjNj;}B +zkDI(3za7MG>*|r+x_UOLbt?17rE}NJZF6#KM%(>}_ORwU639`|&%ixeEctrk+7oOk +zw7BrZoFmXo21(4$8ZpLet1qg{FEp?7>(&PlhWAfT_C72)fIs_VO$N@hdK==I6seAsCR9noyI23=rQ;D3B3of>~cZ-}UN^OF$u1v+Sn)$5c= +zFFuM$>%LHjR!o0YAFHyD*u}Gp3U+c{nv2XfIIg(C75nY5gVLO_qGwOGCQdCGN9)Hp +z=ew^e$9tNlQs_4sR)FPEA@+EAO@x +zi>z-dU@6bbXG`A8i-q$Fnr`5g#HE2W?73E%Msk7@8CILH90{`|WfEq9efY${UIlLb9`(DU!oBCCdl($DJp@%{@h +z4F@n1`ZfW|A-b|P--19y8{O&`YC-P%Ktb-O_I6S$BGC%LYND8(Nn>qLD95Me$>%St +z%TED=U#{9TcI($LJUU!&Uytu3T=kh3J8$amKIp(%T#~2)+MuCy7UF#zg{0QCcqNZd +zj<$CjjiZyz4EbNF{m4T9OkK6=Dj**AS}$HKFD(&n=Db~A5*JGE;>|Ij&!<}_Z+1_c +zul5eNPJV0d9iHxk3+p>kcK{Nd+u1X=7q#W}l?rVccqCS8E45{m6Zyw7`~dmqJGJGMhl02cF)}$ZF^@6=QD4d^VX&BOzBej +z3|y895@-qgRpJQ@e}3@{$6;}p;e!20DCIURh3spZJcs_XH46&w6Yoywy&uJNFJ|wh +zxxH5hu$sSG6hfA|H29+nB`qau8OXj +z@;D@uRF^zb(mh4fBEx}Y@_G|(h_kC|?hQ7g#jD-Nb(Ys#oonFP&|zY34*9Hdh0%9q +zt@;A6_vupgxl}gOpoyu$ADUyCz_M7($~0~xhuxUYZx~L)W)f$c5F+RZVUi~w~a1uS_37#hGpx+9NY5Wv@TZ$5hyMT +zwkpc*Fre#a)8>QfcZqvm%AaYhM6MG&d$e?XqUbl0gW4^` +zHt3l`Ygx485rjsqIujZ-j4T?HWWiRR^5~wc(Gl&u>J3N0iLR0AlLc~)G- +zZ77?@ItH_l3B)}kq@@<0N7BBYZ0ElLjDnHT+mr9u@ +z>$)N80032_{MAuI9!50p&z>X8yZ97X-xp8y%(H2;nt4(TyaXJrpRKN4!08U)p!@49 +z&J_>qcm}!4pa497fgs)hjORS;V);yaQP^O()@;-A(ADRlzDvF$+9X_Bj-kllS81v*l;cUtT~(RY6|+ChENS +zIj1*Ve90IRad&XeNW!Fl=sG7w8?J*9`Nm%uE&~C?t!8U5ZmN(bm#OlNZK7;)&nND& +zvM>-JvZqKBlRafaWRD5p%TF6KKvYZU_SN!SOn;uPteQzK$Z11ED#5-L$6HO*KP@+x +z@*%uPL0Ha$u$&8Fb)}O1#(}Vs-v?*t)}&4xI)1Qar|&DZrG7#4q}iWmYw1e2()bLK +zrBq74FEBNl7qnl+@=|SO!f2eU>a3Sfw67H5FAQ8Z$Ty>fB=+WWi}+S?jBY#Gy1!(f +z=2=-LnnZgVNAFIycT;6--5`bw14c8q$haRuDJqgIWORU)0UZopK%)PhJIV;(rzgu;Lm1ka)o2rsKH`zVSsR8MtvE;Udl-0ogo7lSd3 +zq^vh|MFt*7jUc1;a-#O~BWlAQUH_Jqn6t-^tC22|F$3HU5FhQ1)27VtIoDZTN!IC4 +zssqFD$K6q~&ZH_2Id4d>O)Byq@+OD0MM5vR#HE7Bp&tGYL{F9|*rjnaOdXjQA!_M;181Z(cACN> +zfi+Y=p^TdcIVlP;quLlnC8WD!o#`-(0GknEtQa@!2YPwu5pJw!yoL9VpRJL*aNcz9 +z3a=uxo3JeI_z6=-;*yK>%Jx{!C`|8UxF_(4J3B2Eef7R)R636Ni=@6d1e5T}Bd(+Ky +zSM&(Q%U53WWUF25*aVKH=54T&zW!D0zmk?LF$yFBkOS-&a&DGatIMlm@%hrz>hd!! +zjVYnPs-UGVN#>;BmBzk>mp}i!uzqm7TMyM0?*hnnOZKyb6)FMi4T3P^*5zh^BT_zL +zXbdorgVE0tU0X(IQQS#S5LW%!@-It|C|S+uWi78XdbZ#^OXx<}W$ZpyCP9{dgm(XA +zf5Eu3-214MCA3OwATzJLgk@S=(IIp3v%R*kz8&>H1$V4hhv{k2PxBOun4z}TJTAa% +z=bS-iz}qKVzb$<54#;BIG9bAF0lzi$@1d(dhJ8KlwNV_$=R0oKNoBuZcRmM{wFng4z=uN5pHeayevVVSMZj#WUjKX*nK_U +zg`=MDz){yXO5Xs(x|f=Lo=zKy^%}ignq|GF6q|9qH0F6LiEbe5m1&4ak6y28>u2S$ +zVLL)Vfp`A}9N{}OMA%ffF#~qEp`{dOzW4VFx5srp2+cID?y3&j?kK^hr*kAuhVKK+)AmuL-W#}vHvqo>$r;JuTiSsoIa^x3NUsV2dHpP@U}@SH9XJAmF^XZ%-?=f+;~ +zvo(kZ^9$fT6cYAn1@jtb^kGIIdFKPH>GGs)Mr}f8mvuYiyTK*yEm)5FD*RQJm-ySUy(9+AEu|l6W@ur3D{g`GelB)sZ)Dx}(DK22p +zLe?mp!D$1>nCO`8exTU7OlTS8I0H~Fi#QdgV3;!B-sBN0plGWOfMmG< +z``5RtD;c}N8LDSlfau|^uIRRor#3XeR#ND92Rlc4{VuHIZIk6n`IOs|uC^0Ke_kWB +zNJ9sJPcNVa<&OLEDecbG;}@Ba(Hh(ICUf#WX847M33q3Jd>r&g;kftD^@H9U0Y4Z= +zJBSwI$^xLity=PXBx=-oe_|jQ2Fbc)aU0K0vJaIcM22=jYuFJ7}ET +zKSWvvSy(BJ2fBgYHwHf^m&j;f7!0x<`_eGJ(ZNsB$~TAa9Aa>pIVA>KwO(5&V%`hg +zkL&(;S{HPsCmbD*^Y1YFs7adI@R?V?_{O$Vrw_*W)3U}q=M>SgV+ethEX2*Dol2h-6Ag3IqOwW6!^Xe_g8@GdgoTHN&XA_&1MDf43dxChZ)c0BY+AmZ<;2gwm+k(SJ_Ry +z%4q6Ux~W%oQ&vOxh<@_DmHxulNi?gMse6sA`y+MJ@jF7)Zp3#WPQrr+%B**1g5&ek +z^imfrowf|7E|)un(%*Z*pRFZ-{|gpfHS#Z6b{^sXPYaK+=+YD;8PIS7p#T7xv`~Vu +z;)qTF!m;KYARHq>dC}B=N3#QpJ5vYD10F<%C6kfJeiU`I>#Rd53~8n#DeV6G6s>UF +z;7UqEs0^u~(6dTjp=YYp@%9!L%P2)ry6j@lrx)A(^;vGm>_X4;I`-_jRqDk;W{Vi< +z%CWeSRyNVqUjfYq!t(~h@RL6ZJdERpMvF2Bq{6svyB0^aW%o|iB=`Io?Q)jnb&A;E +zd$qk;K(1t&QW~Kt06)W@6Kv2^2vYov^|In+`V>D>BMRL>4HB3$FZQG8Be~a}wlu9mq+i8P;ArD`53YY)pdLx(b$m48}~W?i;apZbARW%HM!lW+>|mrbVGd1?a&CL`gy%$3bV@m9(fP#G6)2-1>b^ +zgv+T9uE!xTI#Zvk#BK;`H|83`1U4{s!l_$bt*xOK|`~I=_$G$s@#GJQN~;#n2{kBxxHD@1)g|1 +zyucIBi7)WP`~1YyQ4lEU2A-`tIKZD`r~7VH0I10enqL8@FPj9~RmuC@^d&%xBA9DP{^(vfO2)}+b2(lJh*s>mrrD7!EmVkMQMV&IQ% +zC?St%1S7G(-Q3#W-`vJVf_{vN<^We%2^@=F5MxSCOqeNl``4JN8><3k(3`#~GZt-L +zLjUU<2B3Rx$^Qm}q2#%>;tqo48~%9H~^+ +z3X2E5hI7qyXx4);4X422dB1{4akX4Zm7q~G_L7N4vYR?O@K+L#Z&CJW!_Q9OQ^*7I +za+pgH66~CM@&=_l`3yI=ejxlMrl-3O+7KirD3ZO`KGP5>}i>~W*oiKEMJAl +zvVHZW1-S==adaovYD?-7O}t|c0<4-b$f>3 +zFcBFNK){yqfD>xVq-6c59mvZu&Yl+E$L!k(h1AQMWo@9_Twk*_k&o1s(IPm?GSVre +zwPksmO;@nhW*V5La2XKocUd|&64uhA{Dw7QR8K6+Bi4lKXRnJL<{%FKHim;W5l7jz +z6u;QW~9HTR-Wv4SQ-u1&f%302V#ep`*H+axT9ntvpWKCxd +zzM(|PaFpNbSmZVsPW=wYC>`+e2$SbwAVZwTm0GQ4m)#S7j|lW2io+2SX`g;)e?i +z82N~iPVJP1rvHz$XYFbmN%nL26}p63z*t5P+ZfMeW(Xk(cfw;a$z~2=64@3;gDrU^ +z+2B3d|GxF;R<|BDu)|5LR;#P}T~*y(U6r9I-ppRIJ#g0Bb<`f&@eLlY-;)zZVU>{l +zp0ZlhW}Wx+j!r&PSLEFsGBqa$7<~X<(787WPb&)?C64J&Do?+mc%LtOrc3spdzWYD +zk8h|XX*6Ae3N-|x1z|}RV=@i!=vk#qxNKWy5u)z5Bd3KH=b}~W>vB90 +z0Xj1anl5WkZBEy!=Cm@9yIP%+6y#3MH^iyG +zv{Z2#%~7n+S*k#>s%WS}bCNABiY)6}n7w0~AXOF(o&)qB%}&C~nfUaK$^goALM1_U +z8%~~d*1E0k)n4aXHzutalKL!};QAjYZ0&VjGc8?fcG|UV)<@5u83gb}T`sQ)1)b`o +zty0q3_u8Qk!etZ|&mw}hOe{C9S5NGU)-32OJdxsMO{dJ3o5G4mG^MSV-9f*BjixMS +zXhT_E812L^t(^peZjsr +zG=+>t?G@g5-o}mC7nLwU$HHDO+)^x$i=_xQds^wM~_u*#3T2lGXwxX6)NlU(-TArnQ@lAHY-YlqNCYw(nWHAh$2vCJ +zv61F|q=T&K*jpHhcjFuVh2bU147EFnr8aW>wZI6oBh$QU8fqbqyVxmRw`2wkQNS0s +zWZ$OQ*+VO?wzcP?sX@B;_>yc>2RAXaz`ABd#j-8F78Z}BtX<{|C#dOD>t48@u3GKA +zYb9Dw$lx#;Lu6Xn0vgz|CwWu0Mf_z`kWh|atnM2V5w#j_(H8D7@cQPkQbj9Yw2pMS +z!PGZ4@Fw1;b|+geZL(=%X`K>_vzd2tKoxd{?U@?6VQ?F0Axgy6Yq{8Fr)8-K(JU_M +zu~x$$JOQbQ-7RFr{z{hRjrJ~oJ7^YS-t?S&#QS%Jh`p9&*YqkFFV1>IJvTS?mPGdh +zjTkt|kjND@nn>2rSl87b#&yl$Utx)qev~y*RGv_%zR`efSytU?;)vaM>W;F>l<$UG +zMSJOnGIQ1~t5)eb3XYXfe{y^v5jVp@%*&mMk-|%3q&nN?-tjeui2z^CW_*7U_l}^?kUsqA{_D-%|A6@sd{fk^*qv_t^(63$* +zl&W-b0(254ofoEv&CK5~BxFe#D2G=0f*^G7Sc5Yv;flPd@)luVDB2k +z&i}mxCJjh_x(M)8YS=hwy!K*Xw!aPrCtfga9O8*f(s+0FNwc$~wCiV72H93ixOd5e +zSgrf^^0UyFc#Cc(-ubaN9vbicdmqYji;rLN!pX#o@BFj@lFZNS!w#<~kN~1wt_L1% +zF3BUsB#pgvmgMaL|6-WKKPTJ~F8i^uZ5MBpx20G> +zlnb;&(5=b7s0r1Yi>A89_q&{4RG-klPio!Mqkr{Gs8_o@RibcVVxlOi@W*t4eCnw= +zVr)%!-juT|AWnZne~?+EGG63HB$WrgFQo%4YL{VFt%1daEDvo{pO=T{(plC2G&!?N +zu77ie<}b^ZXK2Nxaq6bm{_E(W``TBgi7}ix%!L&=W=%W86K_Z|{cFE&oSz?(C)`Gn +zy7ztfSLLbhwGTr4%8cMUo{!;UFpk1ix$v-GmJzU^Rr%18!T{9DM~qsTh>JtjsC%Ey +zX1Dk8{OCe6FT-s9p~>TKHud9**;s|DwG373*{IsfP_>_jia0p%$XjokM8id;jxx7> +zERsCsa%UyF(t`K-c;9&OeULd0;eELZ-)^-|rbeu+!K*zoOd{%5P9{Dq-%ZPs$_fmr +zP){j7uAIX(l4P;g{pacDE_zLbr4uaV_OElBy_z9=Wxrlm4lX2P=VnTOFWVK;+Q8+F +zko-Qz6zf>l9@Z*a>N==}`B(Ua@x^rnQKqoh4#NuI%jr*h7v?YB)3Z}Nq7Y`ya-%3r +zVl(x^p+7Ohq-1oWssN`^*h`~najFnEAcF9h8Ac%*5#JZx^N_hcQX_885X9rWivx3^MmP( +zT&jo*l?{W32Aw+b<^^f9aCeD4CV^$J&~<$t1RTh4F^gy75U-INtRg=eq^>?lu?~fO +zH7<%~$3OpFA*&p>rS0x1wog^V!4T`2cHWihbU3xu(g_AdVq2B4N2f=hS3&xrUoo71 +z>p^~$uVV=^@Y{z{6nc+o>T!ik&;bz^&8aBb=ifeT1?Fe6!{Atk>VFP>upk71fXO>+-WyJiv1oe!)hnavN-9}Z +z_-4Z`7Kh-uPcWpRviJ8btNjSN*bk#hlv+POtsw=JY#TjTF=QS=l)s#8R&uM2Zz4%Mm`3Aq +zlw?Y5!X>Ma6Di6M=Rq8WAn~RRIrTan+U{&xPQ9tTdoicL{S+Mi%q>2KQWI)4^OHo+ +zKr#lV%>QsC0pGB?$WWGnp(*T3^6^S{1nR~ZJ>pIx=)?f}Xd?|KAb)z3X`K|=ZoFX3 +zVr|Bg)^^CwNI`lv7SW8<`-ErThesZ?K2&v7V5?BTYmvMD;ShnI`e#@$Vf7Tcg|5 +z=mR{o4m1v)xdZB-xJ>4hwdj5oMgAGbNE8oIC7S%}&V!-P%8xuE_Yp=6zfYx?OF6#)s6kC)U^Lj4$M__tv5oB#A6F2gI2q`};$tS=u=;uLlpGt7D0=QLg +zn0Go{;ZtRn^sQ9N?9w%+1*;THy)()U+E`!|}{025KlsL^A6azV2zC)=bk}4gA8fEZejk +z)7mpEt7|vAj@7W_pRr@v7A$Iac2;D9C|aiFnpVfK+-}S5I_(k)@_|V_GFuJ&pELx3 +zs{MzAZWc3Tg#HMI9E1#FSV!S)6UpBs^|u>#17Qt-o-Sgd)LVz!D8SiuW8Z=QF8pu8 +z|5hDi+XkA)GkVcYN}Ky{qglw=)Q#hC(7={|dO;d2u9fn3C@+_OoAfJkr{6vL?a=Rj +zol)Q>S{;9F`gQ2nrQhbGMF!@rMjk?#R@-!%oAAZJ``N%2>E1Oww}3mLI5-G^DQ?qx +zmD$k2hYxI)N@UYuP*imCfo~3cuT7K9|;WHuT>_6bV_y|a^}94f>#@IuMy +zD3QR^Fi@t*t}F$U>3C5p3IaET|1KOq&c5&q_fiNGva7gL*ixH^8+Uy`HcKN+RVR)< +z@fO(%0|)}zh>6#PMpuFy0`F|bL4U^F*^ehlCg#wNA#MTEZ9v@5BZL7W4?C*EgFRZkUwa^i0 +zeNQZF(eBMx+|n~o4o*M5J)o8Hg~^-c=Gpnt#lhwA={vzIs7zF#`xw2;;LS?fJp!?h +zcW|jD(4(TJ1F9c(sY$1?4;!{{=V}T)S%S~EI0+e(AYo~lBzci;{UcVjYiw9(EW|u{ +zdjUm+qOIpsL95^&q&oO;d{Fp$Pl}H8fh1jRN2#g@GgxMQChieW{8!SKw3T^}COdHr +zGRXFg)+xqYx)VF~Q1rZoF*LfRh8h#&lq7(+fpEhKchYU#nloS2C=F>Ai7iH(g7Ur? +zUQU8k_#OAtX4opP*1rHJ&)Vne?EDgV_jSIZvK>%81+@jzzr$7InJ*YYsxw~RKonZ| +zNk~J~ysgVCvGR|HDUmmf7gtoU3IvcMfMVJi08K6!K-$`CAjotc!5k4t4yNTOqxdpW +z4r*=Zf*kG{{n;qtD^^dSEb9m;H`cI`k*aD^!tHOUehMPlcS5n +z_Xnq!2d|Gm9AEy9+q7?wFHetpJ>%`!g>hhAAbCBaABN(yf{DW9dRS#ICur2 +z%XndY`L=;e2^uq-gmw~P&T3i5Fu(~sTp!3i;W11aDA_G?OgawQcxjj;+F1q;h$BOr +zNi^DX!|c0w#ghy(HPn%Sn9o^PDvJ%-M!Xts-*GWkf)!sYA!%x0=C_pdZ5f&-@p=WQ +za4!gqB#ov9-(!%9)6jnzp5!*TNreL?1#X}c1KnXuhahg?1-x*I77`>_A$_e}vI$TW +z!GL7;8}hO?w$wR{0 +z)+;9XOvZP)UIuL+sfrO&dz+EhatP8Wg2F>RB!*-u3U%UP^nBcvO?_qJ2kn9yBfO3X +zR4gL0jrW}oPJbs#b=JdqCi!v?L{JoL7TY8zyvIokqQL~OG-mva{M*wm4|Sb_g}DR^ +z1~z8`@Br07D!(Ak_5H6=BCmtl>H^pwY`4w)vUT-`d0jK<_sjOi?iYt{g>l151jM`y +zWr~A)U!3pbxL04Y7kTqKie|gK;{!Gs9@^Nv&vT5;LnDNAVZ7CbTK +z5GFyht@ykPXXz~$%v+$|-V11VeB|32h=3u?PnbzSSq%cngQ{{D;N#vO&?5-@z|+VQ +z1ftrhK(&*h8h~)Wt={kBL;{-ghx;fd1KBGOzzB$E2@IwTOvbE&GbCUW1*`TtmGu +zr`-J_3w%=*n4nCG69S%m;95}~b?ZQO6DF56P+a4UPpdf~=RkM){?)*bQ}o!T^NRv~ +zXCj@;kzFdkG%hk;fqa6JkQqke!nA%wooUi+0uCo_3;_Fz(DVQ>od}lPxRfTbvF{H& +zT;2n&1>dZvWgv2Q-$Mn;1d@!Sdo<6Kdbbgh0X+EPyB>G^z^yI_bm*Ow+~MiP6QUz8 +zDCl2}`{-#1L8wApU~fSTtbT~)8b(_tSn?_$WaXfqVIjq +zH%#m{K7sE{VcCNS-93a$ZY79R^82pLt3%k{YgveBm`v^V!vofcEY6C6KhD61Q`^oy +z6G`P@6tkqMy(uWV7$Qv@j{P(X2C1(s9^y!o1;OUPyN9BEL{L;$*dM)Wnw@L)+G?wC +z8*ebnSG0|K)!w_-u~5}SsDKG06fS(rVQV*w_$IFV6%GE2SE?zF0Q$Y^kFR|rHx3{; +zze2^w>;=Q}<2)9K2F(YpD>-gxTXXCtmmlK?thSnhPLcF&BmY{FCf>8}jABGCUHahe8!D*2g|_8z +zGeF2y116b5n~4`m&X}xn9O}%VDO!|;V`wIhCEYqhk*DdO^doaC5j|?3EKEaFCx_GN +zpf3lQqT2XI=8KbC6j+-i#7rImGQsSo-MJmeknLnKjrgU;A3Ty1$6*U6uq|JdEc=9PisLLsV6u +zBKhNAv|cv8O$VDf7c<{P88#`Elt;E;<&H-To64dt2s60PG#=x+-LK;kn?SalZ4!k* +z@E@Y~GhtgdpxuYGONje^h_dgG0=^T1>vpoP8z9$dU$YH6v}j>`7dC;n>Gsgdwwn$p +z4GF9-jWag$3rl?36r-x4X*yjHqayOQzP)GF9T$&u?0TmyFA4I7wUpSOBI^|dJ@W-> +zI^j}~1~-MWO7a_CY!g>??_>ZK*=vFoK|ne76my6^^6f0 +z;zvO{xKJ>o7!U*+3dB%+4)CSbnxsO7V&KT6k1dfkyU8RA+{oOyZu_Ec4+80eo;n_~ +z`Yr8tqZ?cmwz*`aRf{2-;GEZD7<-}(fEpK2PPt0qlo33j%D5;a%PkZpc4}s}t&wUK +z@gUvi6t}7!rUN}Z_7#eDllzQVXcqLxX1ODf{b`9+S#qqN`xYG;(t?LuS_z=)C2JyG +z2-PE6ZT*cz$2_zsa9;S#N9i~+0W^jp3DU(hh%!9V?%i%lDLVjO{<~0R0 +zkF&72@F8E-hRwj`?!FrQnO^UUu5a=*9JI1PO9a{v3Wqj8gey{gyeWB?qEX`Iz*wR1 +z#}7%6z1^_?QSQk-F$_^07J<1we>K@yOr(}pzrsw(&`KNoS{Nne?47z+NW--v(aC0L +z@L%@6w6TdJY524G6&;~n`H206K$K@xU7o5P30EPFN=aOr+FV%u}_ +zA)lVg$*jAV7ddv5i`jRZ-i_=+WUk%3nhi_u3wrCY8>uk!GQkcL&lKNm2mRmVhcQm} +z8@o$7+`YS3$dEc5e$GxpT)u^3_G*65?#`NNmwk%4di{c@0R2qo0C{n0!1I7t*1Y1G +zKpv&#d?v6(4JYDmfBIx#U*K%uyy$(_K)8HlQ!gL8&(d6dO5nFk*^;k+G+-=iMJEUQ +zJ<>Y?oh0o=MItHI|a*GNh^Qj5r{k}U(#!F=ha2jxmX#n(RDK*bK_*>3mK`o*kQSVFp>Ki|8z;3&dOn-L`K2s2!O*2l$%_ +zPJ`Ac$ty?+ZtuCKc6=JH%lRwYexNUu!?|7<8Nv08m^uiTkkd0_9we7^jt(@BACi=P +z_0e*5RXlLz^^=a6%FdG+o^G3^pQ%EE&}5|Sd)>#ke2eaV1Aq)J +zIys$19+(r&B?)_O(dD9Z62{_hjg^0Lt_fPF-Q1~opE~Q;7+^b2#zEpsqMFW1BLa_c +zq8mcx$Je*uz%W-I(jP>A26g>K9nzzX>WexAg)|MYx2R?pT@#MqqnsxE^4f<=-Ep9zt%4sQlrAt$@)_YNl +zuN|qSeDzyvE$6hiwJbNo?((7LuC1X9v4yp@mFn6`ZhKp+k8%oYtiuK=qWn1%j{5<% +zxaPIE=9FE@DaPk>>8e!lTkeqjriVm%73jvjZ4G~WCt339(WPst0p;^l-W2dbD?1Bl +zSfVFyu)N;NEeqe%s|X$ZYZRB8`cV(pU_Q!W7KOeANHR(WDbmZU +zjJ$b;Ei)RJmn?ynNk;-+;UTA!#tdF}(HQEd;H+pkE7QYSS+b)Qc7{mbSLH@SJ5fx( +zbG~EaafnM8r;F4C$YDMd4ZKe0W&L;ssnCO^2ZjoTJ-Q?U{NhpXc7r_1#?*;3o3Ra( +zS6e$wG2?ya?*+#)biyeYWeDNb$Knf +z;;BykA`w +z5JfyXH_1R)eY;|-9oGrkbg;z3RGsPf$L}A}%R_pT=Q-;2S%0rSX#@W>Xvub%I`dAYrz1|i+5XvrQIp9=IN6tynP0GLPkzVvowjcarsG5^Cy +z?;cBj^9bJ`uky#ot9REl8u8`T^@q}T@5?w6;A76C)Korlr;--Q+7j_!4<4->{)?oi +z=-|NU7-^3QtIq1^1M{7CBJ{h&6!*;OU4IZyRSNRCn?GtVV9ZbwwZcyx(UvTlo$6ki +z)4_eUQ{ng>6qt*yctN^_WJ7SuQ8-rXD?hq-ZI?{FQ8-MG(<*kQ +zl+6sGS~08ER>A(JsEW0`Zr-knwVWCZ{4a){1)jtmGerFSB~<`F0knO^pdId$2&QNY +z#TSi0`q>n$T_(g4;m?%P7|d!>kojHwS!)-ugvmK=o~#7NI?A-pV0|q=RtxKE533KB +z$DGSX!|;7B=YXEcucl!hB%^7zaU@>6-&j3hQ{8-4lMvqKUq*XJ`u8*S3ukbgR_AkB +z_%Y%SMiVN#$Z~yGLzH3O0mQ5dL)?pivn}f8AjTivPmB|1aIPB<`WLzKjFfv}GfG^* +z0!Z@3A?XQE+HRrC{31dd7c6bm^U-S!(A{btMHTrxc!>itAv}(rDIE$DfCEG{C1v=IL>6e`v3&?}GV9LMCaa1Xjfr`5Wo>mGg9kiZ +zU9GO=x0(^LjOGQ{KRJzk-eGg? +z!D{sZoV*@BTCP48d3yi!vy1GjpJ@!_~$+SvrYu%8umuy9HOALnzvLQ7=ldWE|37B5Ez13XEnQEc+p|4ae8Rx +z;T3v&%>fqS<&HeB*vH8Ip4&D7ml_e>w!A@E&kjo7^+xnC7cz^|9>}bvzR|ey4`2H6 +z*zye_j&APE()dn)HInTr*T3$y$^9%dL=QYQ`R!Q$taiL-)FVB@HiZYY)(U4)OG)Tl +zx?$XW`K*$tzduknA-g=KxPcgbSdq5@iS$!|%6Jo}rQ0yFVQ>11_ZZ1Pt6H8!7gu>? +z1zX*h$WL3%C9Ss{=hRBczhEP5z3toq-O3aG_IutA1(=2;eJ+(t6c3op=jLEN2+Uxr +z>$h?VgZbFSy@`lK$YD{W(O1Fam=B_>q +z^0pmXz*OR*{ +zTv)fid+sNB=X>J)EmA|H3eK$$vS)<8J-IH-@Y(9tCoeTK=)Ogry4)iGG4bs9+MxSj +zNX7;DlZ$zzOXT(_S$#}O7psq#a)*@?gugQduBF6vVUcUUOtA8JC71OZqjfQpoGuse +z<3`0SjWncXHla}1$rcNvBF-O@%xMR`9h;evYv&@Yac-sM%H_e*Lp+u}diW59`FRJN +zw;K)zH&dWr +zRw-h*nn#Sa)_8HXP%>9{U^q^l0t%7#onkfYJc1$WdE-u?thT3EgS!aEgNZQ6b_xD1 +zfUrIR!1e0m0y;qos_9k8imGEuTO7!`x%rY>p +ztDkr6;gN5usc-iqpwB?DbATH{t}G#^C9_U(xX>Y9fiQ{{(r!kUgmkUPg3CwCEC_4i +zQ=UW$KD#0*$9PJi8BX5KfcPQygwxd4hZ4VXY1NqIk1cs=$g@80U-tX+A1|-r|D=ef +z{68NU8F`$Iev5|5D3g_Y??KD--2-6y%#@oXVfi97B=gEA^XxBug^1ho(()rzA}pM% +zobvkgaGk5Xbe*rfv@mnE{vfYk@VR!?_NO!@R=FnATvo0{2v?6DzaJ|d6W_4*lfv|a-*~PKQ6BwbMyQ|bm +z&*T_-X}!9FZn2lv)~ajl7u)rGW4t1U=u{%Ej3&RZ;-PY3KgnD*qYEKwUz)A*!<`-R-% +z56Q^{2NUbvaG0-zWFybEw{(1(K%xhS!=lZ{->MWcm~ovW +zZWnbCk_$FVb_|+56J|1Y$URyDFP&kEZ_7Zd@dnMgtSnkbSnkfyD>5d-%H<(blC90~ +zUsz3M;K(dR+}p3Nle?Iu$2Pb!B`+^M$b%!TXT47l!BoY}mRW|DEhPz2^D`ZF@!yb%S|)vZX`*j`&ye +zeJ&oKl$Vby8>TqCdo4Y#q++5-{1RjROC!Gih}ePURp9zXqeNfi8-E_UY5itkpoSSRlk0#$o~#!PaOk%)>IL-BK9?*q6a0MB_3dwsqCR&i +z(NBEwDOKPu&CQF?93PC%b!(75Cpc6^&@(|(9hb5oUSqhivtcb +zYQ@R5z+x>ddTCutWkEb*?`^=DrN%0+LGPUwb)&(!c6zYF_wQo^!)<}xH|J23B=@Nqz;_PlSM%&4eEty%+pbp +zgpj?DhJpZ^toC&WjD|r9LdplDXx#H7#=0{fS>+yMyQSNZa1ECNp&xX*noO{hNNxbU +zgrm$Dvs#akZi;Ry^U-~89@rD4pm94&(m;qw=muP}t-Id4Ugw{O1UzJXHi6(Ic=bWp +z4cR+!7$DowfvG`%ZI_{X`TFokZSOr(J9}!r>aZ3m$HsNL?V@u{+HngUy+I0{HMRXb +z8PZb$2EcJn`2!ughH;tCd6F)nOQkyP&vVZEWcK|0-5hd!l!70fI~eWBk?je*J>i +zz+j~tUXm2$+8GD{GGQPf$49El8wTGOs$rk}&z6UphJPB%J3U-tr;RI1mJ4U*Wqkrz +z&h$~Zl+}-}vqqs7ruqC%zNK|n^+AFaY@Do~z70-i%V8tw)pj44r$L;AmJgK=ZU>jw +zIfmQH%EPLT)?N!*k>jW_aQ!r*6Cu}$C%-$0deiA(pc9w3+z=rPq?fFyIp^NiRRv!$awhkK08ZXpxbR{QX7|-A3`{Y&483qrOk&87 +zKXT0v>VzKrIM3&}hbxa6gC0E4LPpL}a5^v(KkT2`wzx9c8t~#nU<|$TtL~hxv0QWI +z;kpjXHzR>L$nkNDoKl_vEmc%@u*U6%M`L%6Sek?`-Z}FpR46AAzz~CJ+D2~{X1;Q6 +zO>5`YQrfvG4O~ROfroqp7xmr;ZW_Kh7@-Ae`anqo^^mN*7M53+A6Hl8WHb-h9}jw_ +z2h18S*R3u$I$&ZAPoDsp+9*R3b|YsAjf~Jk&#?HKnBzHjd>5=;o39#q`CdYQp;lyO +z^fWwUCs?7HM{$e^)-fagEi5*lz@9a?c6z=A$}j_Ct}?fed{&Z+LqzuKU(H6tE+$n +z4_!aTu8ICU8mnv1%C6D8eRmAt0maTub$Gt#ihzotfzR^V%A@M)W4$=Xn)jHsHP32J +zbJSCL%r?}?ZscZM#CcVAld=tFGtZnv2V`;{F)(_NoG3oY$;xUSl3l;#Y!6tsb{TFd +z)No|PQSKcPg44dKDN&J`nadEE+Cf94=9(LyVeXarb)APja7dMqg(OZs +z7`8;SQ24OugJEkg2TYU&V^up$R~|0`P9wMVU};_7&R}ttwE5*(%SWaan{lc8!eStM +z>hzl?H@UX`nu9DFDrx~rC;TjqN`Y-eR!}8PGTcgWJMx8G`q1cCE_aT$eL-e?jS~r5 +z10IP|^JHyv-3is_mR1Hoj40b?za`INL1{Z8X9zO&Il3ykv+TzF7Un>uWKksUi)9A8 +zSTY)s+9`TYaXP$8tfc?IP=$EokRL=4QpN`=gbWg=aJjbpP^~O)Jb1jZx_XN^g#uy9 +zFoml~6RK;E9%KR);)UxAipmP}FcM$(>}CNNGg$v^3=nIkjKi%BLX4P#_bxb13B@dY +zVZzh}qhXAZgIZ+dJL0G=61UErY*y;atBT_!W}`H@Q4XhyarnZGk%wWSbeue>=fPtP +z&BBoo-KsF0(i&I7e7TlfK%3!=k2hT$w@K;5;*vNlPeb)I9u2fx+hIg! +z>FA8ZI@NlrRQ~XPhd=2kqzg$n{8Yj))3afB)Im&0F6NXI19#gdDrLaF?>(x)mrAY%YL +zIY8uq#fEXju)`F<2|E8QN;t$cMRo*~9bp_uC`EqERP9_<49p4;4*0DAz3TWqf4Z65 +zb$G&%-2FI#!)S5m-E8+3FlODe*PFXrn}^$tWehPzMh5zmVpnP}|9(h=g>!Q#b_k;$ +zLb}2bY5*(2DXP;P&8pd#n>)LW^`$40318n_4=2cJ@r1hfL4_?1hu{QGc||)d9``;)4hdPhs%vh +zSyk|9rBV5TpVk_c1$@F<_I3|dZv=DKYf%6y@-CM&fdpZF6l!R9bMFQH^Lq2ew%Xll +zZa#ZE +zdUyz63E0d1z3rpTga5^6jKoX7uU~E->}=uVtIb#22L{g3_U`tppP&T2?7ZB@xL25l +z(}csZaQ#Fu>mRCgGK)K(Ds$HwTLv5C%N$MD3C6V7Gp5w|BDC6M7L~Ho;3VT@>R?Inxf3P;SPd%>W$z`faGn@oaEBR~d^+n7M)fc!)$_Jv_p((AB8L40__) +zq9H21IkDMfC{zPJFP6M|b*6@X@ai|I8C>2&z!JkfybfEVVZdt&N?};ZvQt{ZOMYb3 +zreT3*;5QhX`urlsm|A>?|IHuIEzXxK>i8qewBP7lZ;odd7mw$PlDw2U9olHv>p1Lw +zcyZ_-a$3@Wk3838iLm%Q%rUfP@qYq=NHj$?>pUI-2Z)$3`dt&*Ej#D=)Akz +zM@K-p8^0PMn3Ia1viNz&ZKTPUf6qZh?49)U6q&*F9EXr;HS4PfX@Khq`a@VPO2PVpq|zU2t1b$m%2613z5I)Zvw +zXE?;b3IeQ4)J$a6&_R3(H2wyM_6ijk2O|o@c>*lx*8aJQSq`;=yXqX>>eJ9rurm=otwq@w6(wYeCI{;@TYBH +ztQfT_l{wR$+v5+CsZ^H5Q8LK+{NyhacqPfqdyrNq_UUBcg96d&6+1`U@de8hQ$F +zK1>gs56MN%MtY8PCMoIWwMk(MDt41f% +z>pbohS)Pvi$a&gzUWLtU=iC1T7YCAl2!R4lC=QP^@TZBF6Ns +z03%od6b8;>2z45~OA6R&igcyKYK(u4gzDHMW3mr#easv!e)835NA$m~JzTc8fqPr(2~GXfzPodbV~A{pYM8x?NN +zt6SgO?a1nEuZp@ab7aMxGyrEIJ};fML0zz6&~YsPfyTcU6V4t4M|kTyBE21Qstc +z6P*w}aS~3Exl1(Y$)OU|`l2^N40s#+jlOzE30ukpLw)Y;1bnrR@!Sanj?uk^Pt0x8 +z`r%uF5|U^bg5ws(MaM78)s^b%NtKgpJtY~uRN)rpTl3Xg54g?kt)KRrdky~GY5;~; +z`1z<&nW+drhq>pKGPwb^_6e0jmJoEGMkgm)7Py#@C+Np!Y84 +zs@EAxn4rgejCq0!!STF80qC&;!&!EEO*mq=`l{AX9UV;~jbBA`tR%UGPt%U42Gi+z +zGwj!kfTx;an$YfhWFc#PSd2wgQkG^P54^fk9=6EbuuElPHPwbf3i^_mJmzxY9kiw +z?33B^-js3spsv4}uhn4DbxwoU`x?^lIVPP4VK+wM3viaC#e+NQ@1s~e>d&(D;0l7a@43#9x^PW +z)ZtC7){AR{5GjPagFK6pRxn_Ebh4tK0q +z)FZ~b9k)hZyh29ihs<@m!3|1LI^h{CvdfUJB{uvzPG-wAHkIR{e@>-4fXW;A>{j@{ +zXqpJXxe#r7-x;V$sHcpS1;${990Y#I=J4DWz&|GCqJtiZZT)+pNf%qh6gmKvo +z)%V|T?>|S-^uzoZ>P~QdEH(b=Rqgc~l3>s&#j?FXz)+6_dj=gvMMKy$pnoy5x5=;_ +zGf9DVGlfE00|X*POE^tvh)Y7GRAa*&$N9q(<&OsmWC*GC2)N*}<4t^PGV#wRR`;1b +zHai3iT?adb5BdVMN?&76r4uX-1DqM~j2-gHAR1~pP^(KqJ3O_i2TQ-x1XuWV#eZE+ +zrJ6UwFKl~-MMuotz+k{IjjqyNse7uO8#^N~(u(`xxTotJh?2jG1V&FJ!NFQ-Y5j>G%<5g58(N}U>+*&Gs +zz#ld935JN|uF+WnU*Th^K-9}i&Alm5B-|afPVJIGbk|3QGRo|zDOwWfek=zqWO7j@ +z*F|NETBh_A=%tEL%z&91&D58onr;n@r>?y;VQJ}E(Nj_4sdA_*K|!MJ??3i>1kYPS +zSx6WJe~X9)10ijnxb)n?DkQVFXvwsL`b9Kh#$N^n7(SDKg~WwY*GD$DDav4H0 +z-QUtQ6ZtQnzdy^g-Fi&vI`BRoJx@b@V~}(qGi-nioOtn>{vf5XNH_b1@Ju?MMF{`LDc963GF(-w|An` +zArNPEHi)}qR&Zf;<59Ah48x$UB}7yPy_(5=k0>+aQJiE1s49(ON0Jbgx%m!*$FibE +znq$breur-$V5#*&LZ;kBBQiG9&VR-SoMhu(4Okc8n);2j_T&Z33hD9T1K)u4*oPaN +z5hQB%@aKco`bt&pq800$8id2qphvt{d_GE8%)wVwRRjdn%CgDxaF~#q4va5~Vxa|6 +z2T&tZ-N%oTz1H)O$$UOq{+%=v2{G4y`0FywG|7fNZFyvM@845UhaBpffbeJ0b%V|? +z9kg7*0olZm)@`<>PiV?5(^Zdp8`Mhv(gehaPk+C5N4n=cOWVe{|X`gx+f5}jXNN8M4^u@pzKTS9m7qajkSKy$lz`>4fnbrvT@i50ge +zA32%FnGxjpr8+l +zixx>-0MQ8tY|lgbZ%9HCUPV!_)fu(JM0cxEItC!}Rehff+fiJ<_yND2sh>7~hLQZ= +z!zQZHA2xp?5u(X@lPt0iN6L;Gyl1Imhew-7Ii+yDX9^u2J=<#jw7vO^lx^J-!#2ze +z=l8xs4+IMB7$n`~s*j%S?mXp+3*hLAGp#1Hkv5;H@7z}5{TyX_x&3ng;D6KbyRbS2 +zH!1jT^~7uBj}_IL8DJ_=FuXf^M|qP1M+A3HvI7Id3r4+dSG-TmSol=J*#qKT1#E +z=GN~1*5wc>^_PpqbHk+W>}{vN=49NWtzT_zDS6s` +zCSP8?;s+iB$gurpd;86i+JE{#`15T0)w7)g>Z)Fu_{=Qq=1WL!9v!^imdEFtyNB}p +z6ej9$ck}Qks1#mb?my!J!~Lfn_P4gUod1c-@9s4jRi#lfAgE2SjjIy-cC^30i@(rJ +z=**EkRU86ACZvr@h5ZN{rYvM0(psM4&H5=Y2z|}1(MA>xHCL)%#llpSB}9&I!I0pL +zZi|oR@aog|~;qyVUR1Xt_1^_V>2$)mj1U)67TI#YDGG +z-|$k|B-w+UORfY2E=_(^y|~FbZ;gBCtpFNk69!>x#67&H-13InxgR-_EjgiCd-O=V +zH%Oo@yGCuYP{+N9t`AZoM8I3;TR<88hP6RjH&*@OdPLQz67_Ik9Njr +zE)u@2r~BVg56+Spdx3P`@D?JW`@0fek?8gB4b|dV923Vw8l#Xn^k$c2w+NmTmlB?| +zQ?_hF#U>XPLIH%*3=`==p^ItK#o#%oHor#8xIxguI~#kL>q9L)42O&Afq3^=MdMXC +z&xONQ9a;wc30keNPdBpN`aRio8kO<~rwyNwn+McS3Q`kJwp&ytha^=bNCtUgeXzVF +zzMy0S!cw{begcrZCAkUkrNXDa^dcl@+jf)z_07ShCI=VgoLg$+&n>ktIJMNWXNct$ +zv|7@Sirc(0s9=RFdfJMv<( +z2bOyD>6+zBC?7FNjpMSZzQhi4A6FkdhFMuz!e5*g{L_jS_gEUC&|eGbpOl>PsD%RG +zYx4~>*P+kQOrtvDWHgt7Z)?q<_K(fl|B=gx28Jb4>XtLjtd*LB+*{L0^d-T +z>$kr)030h6qq8|4)J=oqbelOC2EC!$x;gKST&sCQSramQ!X@60g7Y4%P;>!Levk_L +zuXU2_XL1ye_1A=j`v|9|^rLyw5Ar+5!>?ycilHkD1FtdfKy+W6XZvWL8ahOS6x1Do +zQ7swmC`q$PR5e#lydA;vp7ewKN+qTPlvjiIz6wjJ`$pTb)_aX`q+GeQ}=c +zqj}N~W}qELA$PQ$bbqkv8n{;D^=8LsYc5mH0=KzC;Mz4&69qR-_&qx5Hi;C +zD&5U{b6=ci`{)jOJ1_&LVdajNPRzs0HoJzXNd@}Nt}JmEp}pc5%Jb2N$F9xmavb?B +zQ!<~7+G3WJ@>S+R_#3LDF-vL~8MGl_#aP}DJ@r`Jirp(s+@frgr76zNU^a&4yT!%x +z%8A~_#8sHK!Z3u}7-Bf!Hh}tagX9CXq(mO?9Wx7t2^(ASkfz<Wn&ZxCC#iVUM(% +zNp>jNKQ(%>on>c~B^`&kRG)wQYt2^-E~#7%sshWCygquvFr6jk_@1jw*B7!~cK}Go +z8HYJtP*}g*5`(1}Ah3LD)aP%B%>n`~iyH6#Xnb}!oj*H17qNEuN8H_iGDhd{ZwpS> +zix^v?=f($FWwCNBf0fGOdFh1r7lPu#xCu4OBkb)YdQ!2~RUFDvv`i@W!l +zuc=)AtM}%`r_K#+La46MRYx*?AW-#wVvFHVIN1DT=6pFV5 +z8XD`2LQ-%Zk_lfNv)VI@HjIw6=yGl@zJ8-t>&ptAF$w8G)pCVO<+axcWy3j|y_MFy +zQ*TiK_3mD6pFeDJK%W9N3rhObogUTw<_m$N}5<+9YzcXqdBsWR(H +z)O`>p8aig+QZ%laKdswtM}l+r;+hzTx_|9hIcB5rXox}uk~4Ct-$xM!^RCrc5ayTS +zs*X?S-i9H8^}ww$@&e8+XWRAJk+Ah+(EnzyH@nq;u3 +z((hI)Cu9_7JAdRY#~Qp*6`19%)Pv$B0g&WEU~L2yw7XGnETF_fa^!9fFcGwl1tKK{ +zjy{X{Ey4g*HNHPDnnyZpG3>Deshf_MReBW69hO_ItrKYsFmBq_r&E&w7Y=m?{97;$ +zkQ@{;_jXr3XvJMU_U=ua>4H<`6deHO(#~WKQpKmlqPF5Tx$Eat@a_i08n=R)Xfwt_?&kax +z>1o{bLm~bwd3*YLXZM*?jUB@?edjAKGCAj4`f2>Me|RKgOE*jS?lsqkL&Mg>Y +zaU}%~!*jAtdEehQpds&62GCphjI5k=jhH>Tq}D}flQB2fIR$`|&}IBqyXBk~yOr4X +zUf0ZRnzL-)m=-e)z_YR?n^?+Tx!GcGglyg9lrkumzQ8~hD|J%lW0xLFnl)~|VODKy +z!wmz&KNGXHqVVTq8D$DDG-pne_7<1eS_eR5FmGTu&-PKCE(Y^?;N+_GGW1|34ov%O +zALZ#H$%UC*pzfrP)A}*!HI&WawNAqOPNR*y?II>`K +z&qj`l%13Wo^IyF;_r)IL_=9~kPx>Jx8+NLa{yN*?e5y6+52<(m)jeGDCpX=BwvT2Y +zohoyO(@D=CPFC~zXg6i&**=;l{g4?PE^9`H_xE`hu=nP^IM4Rc=^>Xc=pHBL^-WZq +zJ{lg%KANXgHzc3*LO8E^2Za0LJe$T!uH3dtT0v8_BG*TcdG}wvH}}Qj4}Y+a<|*4# +zU4`wfJ~7OvT9N*cdiP&lZ01jHy7TM~ny#p5;BfA!wn +z7ZG1!gs|nuYGHkK34cX==DmwNYKvmo4b=h;4*Cp$@A%k$^S +z%aS)$qD}bG@bC7~Jn0Ad<)0MxN@2lVISR}>aNQT@**=;l{a`vO0CIaMX?b1ioiVRq +zf5(dJkRdzky8^qjJ}_DiJR=_>Xt{6hi}Q?ONtJy!Ps9{tKjTAB8f(?JjOrcfCd)tYQ?sh4lyPI+`BF@beCpJQb6^Wk0zHZa=5|jftaf9uPV7xk0 +zNtvE_>4hnpsy=#*G3VAFuT=H5Sx$*mulZ}*6Jz{$1Xi`{F#i +zAN@SuoBQHCr=XY=JLvuuLjKtMd2**9(xc@(r066iX)KED5O|NaVfZ<} +zIhc~$h=Dm)rXS6devsdE69?|8QKabe4n+6GdA5({$#!H=eEO5L+|F2ICjwaT>bhZo2bqAI*~;R$F)e(AxC8;T20O +z1e$&{Px?WA`6nell)`BNqGvoN!zXh4d8bnM#d)@m=1D)8{tJNIzPq*O_Wlxqi6sfa +z%|6>l^CSqOEl@lS41KvSc~j5!(L8B|5?>XJec|euak=s7N_leaTUU<{Kc^(g+D2)^ +z4iw!L@X+(4GyQyjGG3LB3Kc8zSr|o%d<5W+P~(%P+?5)ifU^p2@?nA+Us~5rO5Lrl +zo!b@)aQUpLx#24`u2Wia`lm)+<)RGR#IMtch+>O|aaoeKod;6+-k}$h +z9IBz&T=v`x@8gWfYva&?f`p@wbFofG3R+@>9PH$LCs}lx2cGaPwR@AauQOgeyEJnHLgvKZ!mLS|4 +zn6iYf-Fj_|IuP~xqal7+nQ3SPP>blYz{kWd$^}12&rz*u50dqc3?4>On*evLCnHGdt +z(01bUdo}A;k;UKWnePTiNKdOcowIH~YUGW{rl31IO-4~5FmYxvdjVC?!<0Ol4fa5IBU88|czR4sYqm;aUGs +zIPLlS9)2nnWslhy4W(ehOyB@F +zN~iUkLKj=uhgwaVv!Rl0P1vsxPCQ^+qEP{-kC~ZnI1E}kgmc1vJIt&$u}lL<63-93ea3Wti4(759Rc!- +z+#;C_!^og;{6Ucl_b_6EJ@tkDnZWfBeJokMEdy%i;u$qW?`*WMo;kW89cb +zQPNC_EQY&T=6{Bzon|j!S?=u~s@^C{f?kV6M)%b|S^0!yl9tfA+Ct(QbkGKfQaGF^ +zq;=7YE-v)bkV=et7~ztfoT4`*gr*%GQIJiHgedzldBma}UWN7Zy4u~`d(qfZvyhKm +zh8}M1&()bjxJLT0yVZQTeR#O}V*8L>@xVrv=r9`?pqE^#(zP`@l7a%b-eFuuY(;Vc +z&8vJz9gcgoEd;kkp4%h~c|>NPy~z0So?myj>JQjLi8_Okacz7XZu%2@?7$CCgokzk +zY&AD`cTI#G2LL4?2n~QfJjnr|#~>eyPW3_QuX*rj5KOPq@Fq_X)-+2PRdEs)B4*|O&M7UX)W>~iH2d2I}A=b&bR@nOw6 +zPIfXmjmSjxPJ8wxH{)Z^N;_wCT)GN+Lmnzwrux)GhnA|uM-=G^yIDq{P&(jBEu#vH +zryUNN=FqHr>1Z|=vWGM6lGo4~C-7FPn;c}?8J=;S2ENzvs7)kEpDOAXD!`aviP}HZ +z@kTi;FEGvLLyQ&NjfNr`A^(?n1`e-VA-WE(;b~=XmUCLEUl2dC^G3D$ee@0v>mN`Q +z%Xa%iHi;pZQ)FdL%moH_HEb&yTw@5-00RMHd+NgH{@_-Djs?-bx7H2=j57y07j-c7 +zxS!KWt|3O|ofWWH=9ECAw@K}%or1j->u|4HVqFEa?ogN(PH{IF97;U}%t>Qt!JhUu +zE&pt@9} +zyyP$?c$@DY#p3gid=UG~;@e*r-{F7r<-h!eZ!%2KbyKz^A=kO6Mh*?QE{8r-(QI3S +z2cskWloRuh99oiOC2z=4{su;Cm_;$k;=ALy#l?BkqQ&`gMIC=+2G`BJxOhB=If_$@ +z3SyXColsXSHK{=D_&wcD8ZR#GhO%D#)oJeW;<3|UcrGt~PzkhPdGU$*T_lUZol_yq +z%nh&4Ps}y}&|DFSWD!#8_>J%B990>apnHyF?>h_;B>1^l_E&}L6i}el`Ictw;ac^< +z^151h^yp#r;nE6S(;%I^9ay{P=d6c}^kI^e5mz8Bd&f%G={1|@=86@y6yvjMkhPr$ +z7x^0ePXD?=!yyPdK--%k$kQm?&?}{X|KxxBh +z7~@4iOJZqDa?CzmJu0OASMD5bJF+@wyJSM2FXMFzH%gL|4fM5Wh1Aq^3NS?OcM;Bx +zkBjaN?Q9Bb<_e~Bn!67>zkV-*w5N!?4rMcarM_uInx;p%)(E>;h=9#thkyvk>EshR +z)Ehh)$YRq4yt@PLKqn^O(xfgZJB{+oaPE2ptOrp{uW_$w791C>%>Y +zeqt6Z&?&eudN?ulRXE-mjyr~yn&$c^wM6w?cncH{%s{^B+^m=B0$=4c9Zs{EAph=4 +z;^`oho0X1vsWSoM_~mVY=HxDbi`gs}Cot^?znxA-0q34mY`s$f%;wF9iJ9D^kAQSP +z`K|Oa3rzp)WNV)qa9;i**qCu^OTcYy`K^NlDYv!dLe4E<)BG~@k(?3hLiCcVi8JVu +z^yWbw2f)vhg@K9Ux?Ld1o8JbVMF7aFTf+n(sa!d5sF~tCUUx=bQ{$mC>E6h@*WXEi +z()sdWNd^le(+;Ot3Tj>Bd1oKjpyGi#H3rOz|S5inREp%nJceo6QzHVluMCrmhA( +zqr)S3j%jhsG7d}dz2g?(6@6K*u2fg&U@Jc#gniX=uHNm+!MmhjKpvic26P$(>hR}- +zH7?P?5XP#8vX|f{QRf%IKcc_2f~a2~jE3iU9~8Dnb>XtO5w)I@W~AGI>_oCy>n&dQ +z7Il-Zd%10*Gj*>)7}0<+s*pgYQJJauXBNs;W6WuA9?gmAOfI0~Rz+vR1uP!)%1i3) +z{woam@ec2j-~POL(D-?C_w_cuqTbL^to_IXb&3XYk0hWrRKYBY%d2W@t137R<>sm) +z5+Qj;SK*Fn0K@6~Fbo0FJMk5VS$2Hz(UOU6R5n-&XQPhmvmctIqq(un$40#1hzVL2 +z<9hp}<@fXULE{7$w*+%J(bvITKDg)Py#v!f3bwRVsWFV5$%l +z)-ZAF&N;+mBoc&_lLQO9!W*vo-*`llA0cDFpcyABPY0x^!!EYvCd9&zPm`@Pvk-W%5);wR2&foNIA3b=!+ehbbY7dYe +zxO@+g>Q;^(VFV6&jZ;WQO+-?T9VfbUG=3Qu^87gxw_nqDy?9uoOJr#Y9saP%0FJ#p +z5>SDa_VHNI6syYTI(=ksj|Ktg;&&mf>S_*K*1GW%Ikh8ZLfu>_t*nScZl-S|F +z`a7HwWvcm;LzHx6*PAd^7FTe~FH4`MD2ws`YJ%tj0e93c#tB2L!1UDinTDjtQDSBz +zv3{>uI{dl7g +zwRuy~ea95gCC+=J8cdc$(~<-zGO;XMRu5!^N)RvhUaL;qjD9b6;Phdty}uz|o>TBW +zHamE=v$cr33;fE4XE6dZodWAdWQ}D`XPps-Zid;&J?7HXY;D=@w@ +zCpf1;&_WUXL(z&(tFqErZTEXL)q<_-2b3wGZVl;>dOn>4eX`Jh&`YD5ZdC^iBx;uy +z%V4_}w-y#?YvMC)oNB|)_nL^L+mWtV$7ZHDcLl9*VM$AzF?3sjlku84+{BB8=pYm+ +z#9hP@o|(E(IcjIS@;TN4p$OCqtXNM+EjxbX$5-zsD7*4o(=7RHJ+ +z%}LvnYjU){K`7B2Dcm4xylBBGYW3=qJRjM$Rz*MV)6G=>s!fWWa^=Sgyowbq1z4yp63% +zYoKQVE~fI~Xqi!4Fbd{w!BpS8g+w<6?w3#XR8MnqWcuubOjSQ|2&QR}J0N3gTPy@{ +z`;l^xl^@eXV-hkW;uO8rSmajecD?}cV!FiV;YDhB7WUdE=HkNV_I_*=(kL))B+@0l +z(NLmYY&Kbbzpu8CQKsDv&%$01ohK|!yowU^>SMysCc_)HQsZ3dedEkQkwu#eiu$_; +z?gjd}OreYm3uZ45^j0&W*3YW(vumqkwA7Dm12r~Z)Em>Vz_GWHmSi{90{!=1to&;t +z_XZ?N91g~@*40jX05{l#miRnUCSwIE7C#io9$3*DJvk9qW)kHN#&$F#!P<)ZHv>A7 +z&Th@Am8GRs^?VS9>M%YVULnu&JRSiXjBT%~ogUgX&_%i(9nlFx!$~ZdNI|Nz5Z1kg +zbC^;zup#w$lq`h?7zO%<<_hJ)yIBxZah=e(iF)rJ9Arr$V%V&CalcP?O$ +zfB5SI=Vs(fj64^<+{hDVac4+M;yPd!)Wb+*G}!TK)N|p5hu%$Xt-ex!@EDlNo!+HZ +zIrr=iuryJcGT!5s|K{8iEqves!NE9uy|?*t8<>^*fZ+0{?%$^muYmVLoUQ8*eh#)& +zA)W4qI+-;uaAX+KL#>z6<0IyB`FCI|B}11=>X)?EA1|#@?|m=6>e)gAx6ok9LWx@_ +znX=HOTj+99p?eD?sKyxZQlwAiGhZhGax=4xm%zAReGvGU+a4@}mka*c+(5&mEF|-n +z(=y!^0$O|T0!$_4!7Ts?=zJMoFT%c-+$1E#Hvlt9lg19QkU(U+tdqv{xM(u;O-jxf +zN>UNfF=H4fo$xa3xByd0Q;s1cMucQO%xR%cDrjN`AQ1|o3#^$GjINt>?5+8N27PSO +zO8xb^^9cXXXd0jCJ#SHDsI}xGrQD+H(!7!WE(My&1s_!;p94tMTB3zaa#dD{DXzMH +zS5?<@tHzB8HA;iau(|X6uu+D8o+x^HwR!YY^Kkps=E3IC{()G1CuUGFS=;SXeg_PG +zb7TSu^ABixLyvs$XO0BHY$%;a>}YFgnS%6XDnA{bxq~zA`pTMzVhX${@ZDk9ttQ9iLb;EQ`E20UTdn| +zuqj}olo6bmr(LAWlkj#lK!Y_(tV+!R+k663*wd_-#RIBtt*(y5O%Sx6uX_Y?s$mbN +zXxMNJC^k=3dbmkJNZh7S`?d3{kaZ=JQNQ0I$iy_NvNZ|@2&A5ZRl%Z)duXYH9={-o +z&$yTu_$<*Z$0yxxSfgl$1E1#cKVYixSAUXM{fYe-jCE>uXTF%IDn9OiLS7s9kqp~S +zqxaI-s)~^&-rU-S%O*@JuHzI0 +z4eR&e=2Ix`BnI=s>B|rS8mPqHftO0CFG&zZ1+bQG!h^>THdHYH#SUN`mfN!BTj;R} +ziFlG_%sCgd)Aj6x&w^OKJ+DTlIpgEQMKh&L8g1bY$df5%hnDDxoeP9A<$O?4>)PrG +z-7=8_2Ti*GBMY5@SsxniAV|kJ4bjxWSBsoPe5dIh;+`{>Co(nxuYgROb%dppu2cH9E#R7?w&jGMX06e`{Dz9<40Q-e9+z$WOm)9Nq +z&jCRz0Nr_cp2+ykAhVk|B|4}4dHcZ$8EyO=V-UwQZ+et*VV{`ZIcQ@XsNVu{1d5M3 +zw*$1|0~qL6Wd81|2e}78t8O@WAa68mU9~YQ{efvc-dtM7(vjZAld#VZ +z$R0G`!}vFQX#R5+kceL771%^Pm@caoeX@2vv!Qfd1n=geYH)5mWaYRvBiF;^hb-4G +z8PEZ(HDO$7eO?qID*ExZafsw>E4!gKwh2$m#COdBE=P +z&KYS<*h!~s8a3y$C`X@6s1v7bCaQ=2m=l?R9d^%&Z$hidke=a^9uoY^o4yiYvYA1^ +zX_Z=VGZy9OQNGpWvNtt*IJum~VyV51o6?J4nW<40uK+7xTnFeZoOgsyD9#l6R{4k3 +zT7a0r3e{iIONXxj`CpXl0SU(wd3N|del&j5vZ>-h?K|?HhFL%4Ej;6tEt^KZ5ysTN +zJhuMjY3g4dQ$HQ`NI&Nn@^pkI!Glqs9Gnd3G+1d@6?yX=^`RYI0Ar%Zvy2Px^U!n{ +zf!JF@*3c3^YPf5Y-#)#q!sd7-=5e%JCSoEyAShQPKjfUS_rcohCfFQuKQ%h<+|ZV3 +zE{C-vP~6rOp-;oed)3;;JlGq7(N? +z3%!L^sKMwG85+Qzk#U5Ys1Q8@2K7hQv^zu@7K~)<42QP3wzt;gyo@!M$u=5Yt7I%c_X9!JEn?Acjs4J%$(uTRW@X47zH7&LnblGQn%E|aL4q<$M +zyP`FVLYQD6Mw)G-4Kl&Ess_y475VzdQ5Kh{^jy*)dlWPUs9Scuq%BLhJw&@wDxVX^ +zDm6|7A%BcA4`;qfLca=l)ZjCU$H4&r&u^IW9E;o_}o +zNqdLCueRCZMC?Ha3Hbw}y}5MWYL&>FVnlLzb_n4bJF!|g?n3o@HC*uRQMY@epxhJe +zI09;vR|XpRR)x0Q%E_@f +zVNH7nk%rC^ZEVk_nkDW6JjC4Ea$tCMH7F4%@vgZ0q`MGLNuNAESipG235){%sF_bC +z8c4eCjLwkHg6}21H!W?Hq&gaPNW&{m_AupNOY1E9{#p5Vp61T9C3mKNlnr}RtOwkW +zYmw?NB8^Vs+h2bnCyuAhTdZKcRBhoRY5$nDOQ*8MU(1VtGmfj$oYkddb=8E;G!x^@ +zhAbldk0#n1h>~-+oIw#^yn_hhBbS$sA)+{0bKs6c!05b(4y1v5Tq+Eb0c;rZD4bV0 +z#VomX+=$`zLD^x7C>P&g!2`vS;E)j#D}rk+^w`Qz5rbg*Sh4k07^EPTb +zi!9Xgs#<>VMD`-);!GY6DZ|geh2(lOt2l$84-gi>lIKY1AL+RpOEEu_V15;P`S=^X +zETETE7aL%PZM2p9Gmz1=-O!?)F4)aU6>8KvU2L^dp^S2RgtnKp8Dpm;8Fg5o%!p?Q +zwi88Y9Px7nL|y~ZUP!!EnktD$w`2xHbW9qQ;*>a$sLeuIqza0Xy0}NWqgYpAS-eGdUpT%jbhU +zJUZCfd*MLj51$Y4>FXB<+pqQyjvScgTMDct`s7xXke{9PQcR5w`MMiwnFYIYJwt54 +zn;pDxsS6r>kw4%Cf9ucs174WMA26{nci<1$T2_1=x4g>nllzDBvQv5HU6{f%FAY%2 +zA#Qnh2QMu*)MQ`1%-s5X@KmMNpNP;#U+pe_REw2#BQ@`w=MH#*ayUGgsh`img1wpUW~oSTOx2-7tEiX1yP4|e>q--)t8(ljXFFQGS@~b#I4~7cZxY$ +zE5N|9^OAPVLiB)xv^WD=(4xsCD(g~q9BInUZAcQ|sMKD!Le53YM&aa*8GO^LUqW61!JAclj0b**8d +zLE2jr@;CB6><`VE0722EiKuc=O&Cyx?&DHQ7$QMF@$XgSl2_k2;HDC=m*nHww;brb +zxm0_MN<-usxjv8DOa01;-Ym7$IqtM6!?CP31VQ(YQ12&9aWeyNZ8ML}iC|HnUCM_` +zy)UIf+X6+o&HcYLyIQubGMJ0s&6P|M(unRXyBLI8Dr8ki(UxNQDt)M!Q|KVPr0E`v +zdbyZ&2QXLkx@3x)!i)`b8B|4V_`E)n0zVDcm-K1^l&SkMm%T-E*k(IoI_Q)|6+<#- +zrtd$V%v%>h?;L#xN9Zgv-S~|u$6!iGG!BIgq&>PDN*KEhrMwR3v}00%N!4j%5h?DD +zW`1?!3vhLL6Ku6X+<2q7S-wK`r5ws>Z_!!2>+O~$XPtX7@lv``(l&c_d`FsF`u@$) +z;4;H7g%+2%KyU!LjV;jiD*2Z59J#XO?9VA>9<*9Pw=&FijQUAkDfIpX9F3?)guR3u +ztp_cb)}VD$ced|LRa1oARHoI2xAP7q$W9iUE%ah+2<(gGe6!UO(H{_$W9DHqmI@++ +z7bE=?&RKkzKn{4-YGo16IT@aAP}nz!yO9XkM5(rzCVVD1A&?&?wHA$R#7Qq&^wZ5q +z1=VpD$(Qk<>oPEufNuK+LpoiIYxfre)+Byx)aWAHpR0>d{QP=O>Sh6Ltm}L6?KVfD +zXOd}7hYue)r^C;wL)71KIox?*0V($%9avz&>k16?biJS&7HlW5pwoWS{Lg5;0j&|B +zdEOi8#`|9pTS;h{h4uaSN*m&lwEN+s#}4Ab+4R14%U7}j&l2YE22pQz?!zD)jt0Hi +zr8!tNH3WsHSzJ1}0}viNX#98$cnzYzI3CBPIhunfl3RbL)4&6?Av8gulH57Zl}fbe +z6#qWqYanr~$CiZ^w(UcW{OA%LIEt{RN~hWZ>*`SqU-reFjyY-~IB=|ZYz~tK&z3%A +zMxI6`xp4D>Gi35e+uZ;Sne7G-@s9UhU|xmCtFbOY9x@h<6}Aa0qxP +z(%zc~Q|y0_R+c_{|I4e9m%_ODp#r)&x0>*x@evZklm%V)Y)#ei2RR+j0d*@O@p-Ft +zCsN|np3;Kdgm!@Y5pEQ!*@U)jHJg|fFT^1s?6spacb~w)AKbXBb=v_b8Z0?m$)i=X +zl|cEtodiCcjRg0Sk18Z>Tns^+YayPZjW9?|hMfpGZki^U4l|gCOQ;WKOxN-jI{LIv +zDGa>W+VZQ$54t9-0$@laHWa2iq1sB6PI70H&JU0xUnbzGnF&6`BtX@tLDUDUIf$AE +z>sFWwtLywuP?f>c5%LVUmQNKAaealS6N`-JxcN8;P72)lw;|ZnLWH42Z)s>oGyjMdTYNY8{7%e}cD{oicJ>fyoU)1#z +z0(Us-?H{VO`f`1_02~&Ovh(_<)qf%h^YeWMw70!QQP%29^_6k0ONN6{YpD7$Htz%e +zb6r(8Pd+`lC+`21mxF8kM>s&&Vjq^OOP{zpRMUC03p~YgeQ5>iT=MH81l$?g$gv&h +zGWw!OMyGtojJoO!{LMVqrIo9K9>@QQNcSfgbO{)S)9S%us9~&gwt@xPiE3K#t&c(p +z;k5$>izd8IRvJk&0cswXZ;2xomT)Xv=yC3^=W0RCo~s|#IjqtR1t&G?>`$*=zfljN +zkKT}mNmwVi3ky6U2x1n&&!ZJ9&r!>KOwHk(!t@UcabRm-t=3mA*9xXgNt=gH%(DPN +zmUju7%M}33C1|x*8+>|#{1!kOE-YYnc>Sa+j=LdwsJVb+0PCwAV)T+xzYhc3?%dQi +z_YQX~+ejCp5{|-aAED9PcZeb@52|YU;U{h?wE+|7(FHUN@b%lJca*fS0AJjuK)r`s +zfK1A-(j5*}t5I-bvi(9oLZ|ViOo38*)j4%W{o#Nr!w1!u&STwur{?jPj8O^!N8}>A +z^uCU2yF^7+>MIX7)bfL+_1e@oz{N%4f^rGY5(ipql29{wbd2%GltuoJqRz=<2iMi!X=GK +zrWT%&WyS}fZBG=-Clr|}PLfYNUR%;krOZ_xV<|}vbEzqMS_{xJ0kRwT{K1`_=qJ}( +z#CnWjJfvvB8C6nKr&HF9bCoK;|NfXaDN&5$QalsNY~Rzf#u!>-|JBi9qXMh}^kvi= +z#2t*P62s(f`ATwu(eFRYezH`kLP{#;#!h@emK-nPc|IXaZV_|}Ii>*mck?}pjLD6>^)zlGi;0RK +z2+5}`skCwA#m_nwjq!`Pgl00`-rae+w|&%nzIk}md;=i1e%jvpyIN*KzA%LozlE|l +zA-SIV$VdD1IG*RHZz9s>7n+QPDX3OSYl6!uE>_;&`f0zpH_pcuolGekN%Pj-P&yxY +zQ=~FEQ@x-Mle!jrob&)X;cPTC&l48EXovDbgZ!K&v0KZ6I4P$V>B&@prk!kd0?4B_ +z&I{l~1ehMsWTbF<<@KK&bY;4HGA({jge08exZd6d#x&SZp7e7Y%>k7+yej;beIP76 +z`jpNAD9K~zCdfC}mzk4#E01Oic^=I^1K5fK%=$I^3_#@FY+(vwQs4o!fR?0lPeDqs +z$emG=w0F@WI^w!)bIFKXK7*%vm5DFTT(ovPZ+_Vtb6og+?h?xdai=Scop6p>U^>G( +zJHT%^pZQC6aoyTI=|YZs(%XYtv7pim>(;JHr&(7;o<)mRRyO|>Yl{or+3L!3dFrh& +z)*emeB(vFTf1UY|(&(xen(<+pi{75c(l1+VE~w95ZUsQ@birw-rDK+y%>wf$Bj_dR +zui2&d87^KIa$UTB4!9K;TzUz9hPzjm>5x&u7kWisDE5l(L_Eqk{am;Mr=N5@&pQ2F +znC$dZkp!mOYzF;E2U=>Bmg|p7_u$m{JR%eD^Efu=W(|?OjrG}hGoW~gwu}T3CMYc&YkuY5k%4+uyJZ-{z17KH5)8!!c#&VCRimOwdEE^A%;!i|#ix +zfbK@;0Ycf*Uv*d`c?FIhZdg>)3} +zZG`C#g!4f>>f_Z+aCSy!=lh3?E0sj=D=AQ@f*%;Kbe$W=Vm}GHL2nqfusQW~6U2rQ +z$z?B$M+tiIx6!0XBbM%>>W(C=KIZB)P)`q^DF{8M6_0xCRJb3;fVy~-snFRNkXX{2Qb{LBE?A`;i$h~V@~T*O?R&NC +z)mry1eyrpF7e5mHng2*jkf@G4%V+nKUE}frm+btU_}(U~9AhE8fB1Zv^uY1Xa{t+p +zTCFd!b=#1lF2`3r*|*Ld5vMKxjQlH;zYar|c%=bkF`|ivmeM6d*n*H`4}j!ZFtA3& +zT;0Id{)%BQz(G6Ln?}-#qn-^tZ|A`^GfJ7ZA`mAG^S>q*(U;rr^vKg0wf6q3M| +z8>CZnCWJ9_7N3oA3wMEU3t4PixGk>vz5r2kl&&M8ScRQSS!Gg82z$h5aM2kub4lDR +zeS^#K=7XTa79$#52+h?cE{i}Xwlzd*B7o^R?ch*d(d5Z_c +zbdC~cCw_V*)zxZkjgNJKvOyi-t!Bniad);b6JXj-2?b4?F*jrAn|(~-;vVu1n*(T- +znuE8aGx!hxX=8o-)0+ZEVkk1?#~snS?BpjK)0n^E0f6hc?FP8bH>o#$>t27O?3Uh__`391r)Yyg1Ers&Xp86si+MMy+Siay=UsNqvO^Z%#M2; +zImHkX93}X}WiY4#7y7AAN3fx*=*0d_$kj6!QDLvmN!lP)k-OGtI1);e;dYy^4)$Lh +zY`&zuJM|6qwB^&MiiySHl|I}$*m-s273NP)Sq%9j`7Omj_*Nm;QsK}tWdcvfhCU;WRB +zm|8k@-djjI7^`PlsvwLT2Hn1^cFitRDD>wEt{26dAdpkuNMjpo2Pp9AsaPm!PXm;z +zk{|>f{RVYSUy=_**z0P$+Djt0$%()iStmTOFQd!^N?gHd&-% +zZ`28#JZif`qw!G$R +zzsh8$(=9C%j0n5C!4N60geJWb2Rwlm@OBWJ +zNG}QHfEPi(?~Yh>R<&nII3QM)8)XbJjJ!kPnUs!>P$9az3@ijwjgq?-?K9L_Z@L9^ +z&Jm2Y5V%cY8*&{|%nB|4Y!TH)<&0C-5RKa5fP7Ej(l^sP@tTPz9%~5(B#XuSAY5Zc +zISB_cv`Y2dr+W+BBUpGh7(~PA(75}kuT$IPiz`7}dJqI#!F7^F-#K8f^t!pP_GO`L +z*bBzVLyBHUtr(ddX(cM|w28U_qM?t4L3BFO$;o&37Fh3%dZ%X?1^eR$^RDZePOWe} +zJ5PII9w#pe>-zpRb=5?x9j}g3mqz|oQ=^nrf32p9R-Y7IOd+{_&Hj7i5%Te6<25!q +z@5Si;1ib~PTg10r)3@ljTuqf7-=t^U7>pHnjAyfQU3dfz3_~i|(6u4OzY@6~-R(U! +z@+VSrJfUm0N>vBkiO5^<2%VEAEcX-V_~ft79t +zwFdD?%g+xxM*pf!nhZ3J*T@;~93JlMy)Y7kYYCGi-_ftw2cqE^A<}?egtH@_t_|7{ +zvk2|ct)wEfXEPgF7I>;wLk&p`f#vMF09XJvA+?dtU2;?w{G8+5)|l`|$0t&x;@oTw +z;~1Ae;*{=79{KnjAVeFOghKzj?{VmBedvo^h^l%F(#)fY`x*WV&Wd(;Ar +zlX}H)c^n5ZQRP{xs@b2zi8u{elqOe|3_=${X<@G&(!IEQ28ua)3x{^^MDIf`rd-(N +zS*j!*zVETy=O76JY2i9YaDY@rH{KyD=!Hn8u;18EFk7|MGu +zvE3b#GEmeijyH)y42~2Ti`O0Eplie&*Qv!)N2B6QjH*{Gios6SQ+wg{@NkI1l>nRf +zp+Ypj=FEhC=Z*YCmvzrnYM +zm~!FIcX7cT`w(7UdbD;YPJ|CO_jY%le$oB)6xaEF+s0kr>zq^Q-ckEEfBE|zT#-?HlwK*+2{CMUicT?Z-3T}D2>zj +zD^VP=yerX#)Zj6?n2}@mi@8gYof3|%!#Zv^7jmw#n!fSU7bot-`IDJ;ah+LA{+)|n +zModYtOJ%={j-gz3@l3d)p{102JtHaWlUz4XtOIlA)xh7^^_G_z4@4$o6zF%)CJEMO +z3&WW}&%ob^eb3oegTcMpSJ*FWf5`5(y!`l1cDK!guer00yX%?7Pjl1BvWv@ScfrrN +zHmYvmy-~G^7e`f80ZtFzvA3h1dlbP! +zVxu*d(U(?m+dyW@gfF{&EHoRZEiXQs#Hm3S8Hp8E^}?{t0qZumcK5e7cY!F#Qw`7h +zo|O4hfY&}jr$z~`>CLCoCvN8E>!W?V@I)~3mPM%3Dy6!z4>hW +zKtSO{l(VjM +z;7L=KFO=kx7-0Aj}s^JaYA4w`y{+jY8kEIm3P2DJ2YU8cD`~q3wO%6s);fcUB +ztbEN+r$M<~^KIyX#ep&W +z^4Fma=%&0;wms3n^TNNUI4&Jz^y^9r?~2d(Q&F97Y{s9Cy5zDM-?)r_HJ9<3%l}Wc +z+Q0D_|29;>4%#;s<6p>PWN3-k)&F>c@n>calvdMia(tt(jf!XgRrJCMY&dTDH&n^^ +zRs*c`T?1rC5%nE)B04XKdLvP^(Z>JjiTlGyRNAkXX|xygh*st=q0}3w)A&3_7h=W- +zQq>p&>-ZZzQk)=l2-b=9^|M_z2+}U1v!RRG<@>0ru;dObHK0X-=>o?asR?Lid;vh? +zM(DpaG|uWojiZW`1Kk3UI|(Ehr$G`T<)G$ESqy)NdKjlto2gzrV^AP(?9A2{Dq;La +zzB4W?tS839)fsAGkr_FDm)4lBW*2LEIzKEgR8-|t`EMmx1M5GLpZtuYX3DCd)xnS2 +zW^tlzfdljQrUnZ>D(ArZw&8r^L?@g_3y|>JnRIH_Q~3?`ESI>WChheCWPsFC86Q5TI8_@%XYKOxh>Lg>MC*FBQ)5JQtuU-w}OI*RE1%s;M +zgDxwX1g97(0T;GzNxgs$TIXgyopbsin(xy8!0JpiPS`tJ*?xN>ByHv7-hvmAH#0?E +zOx}UxspWfXasd?{mr8Sb8D--278m14zCsn*My65zu^6F`%Rd5bE}P6HTPKdXO_-y> +zzg^cZZ`r4G{y$Y`e!gXA()qt~XT*FZqYPwiSQh7dAIb2QpanL65!=}fZW+Yc(J +zQ`D3?Y)a}BpUHpJ(cs2}TR1s;??#9H4k`WF}=HsRS +zl4bD%R#0n731fsU-%B>E5)R(HMv}L`s(15?i(-;J&2n>V$zNb@j<33;T#*$8JHlOs +zhpNi{o@hw5w5W^0p3sd|=SF*uOkm(~eFO+#OHql`3EoMmac- +zF#%Ak-2#M5)ND|npHp!U{iJH==VWF?{?F^Y5k5tK<8bmDk;56fIr+#-bN2 +z#GbkiyT(}EK+v@G$WNCI-xEDvU$X0@Zd@a=t3-g<#KndSmzS?0I{XO%>QC@GZ`0?w +zI?auHexTT+>BoTZ=3$@w@*3!@PA*@!|AE~ +zoYQa2|DOJazAI-qY=+8eYht1VVU9$k$Y!K6qNe2A;Pf5!ol6)oDi+a8*;2ErIvov# +zyfiB0*{n-36QO7;9H8S{z$~&m!%B!D)iuq-Kw>4{WS)fA{ee4_8>;g5*ZRBp_bpI#GB@LR=_{&cs}JM2vQ$QxslQsUWsD8j808a-Pbja1@%G +zkmwB3D+xLDgEjUHeW3-to6{J5k^unRVX$8s?2o`D1@9v?Wt+)qL8jN#XXld}3?cVe +zATj#P3H>TaHiV|=D07P+)nX-A?-v*FL`L4B))Mkpb}l>7$rm&6cUnoBfq(c=bMOxz +z`lic)R&LhEK0Pgy&vT4`MaMavy3RC`J*&EB0-Uh+2>tgtJ#>P7qYu3^q}Wx({))*m +z(*=OK__WoIZzkq$J7b^ +zE`cd%VmC#BAH(?&+d~85L4f8|xl4+JWY}ow0qi&!@@;BsQtyt4m<1GU4sIHi`l6mw +zGA^Hni-2a!q5OIIDog$9f$vX3$k@{eiZ?pVvGb^1x0E?9|#yb6_!Ik8~~p?8`Z-) +zI^@QXw0MZ|z|ZNBy~KV}D251~r`%U3gKi~zKJm^Y<|JZIAzDKJr#XKpkF!^w!Pl!i +z9-h9Zd1y6(gPwM$!X=5G#&eg8mn$Nt?QMk!e^(pRSFU|p_ddR(u3PiTCi9rP4>!wt +zwoWSm`~Ms%Yigcj=kfHnsrMgQ +z0%N7&f6y+JqS7a`&c=}H-V^1f&Cj_`u1+-h{#wM@A;+2)GkWIIVj#hFj!R!TG1`BB +zE-6JJ&2$%OnrMDKN_{7_ejbIcm)-fyA)=EH6dr`JblYYD`n3P_e;n$}Nkp9mwaT2~ +zwhX+DYl+@Nt-#?{oO}_GDd@IusQ%wYzwbw9J;eD$U`1!Q +zCG};47I#kOEo(ej&LjBb2DWyoD!;1v1&8E7cI6fxP-pyR3rIZ+I;U>W9qc6%gV+k6 +zd{d?76_K9iStmFz&CJXoH%~dfQ?fEVK~wD|e$laeN;WId&KFx-jT58Z?`B}_e$+`KaPWLW +z9l*>@c3ILWf8Ylq-jqt(aXOWM?=8rCsdhenj7{{H!um&vs!b_f^2(~>>{eRzf$t=+q^A?FL=^A<`dx-0iAqfuV4I-`WVIO +zZ#T)}@TMOoIp2|Z&}XRcC8~spJM*&`11Hik7~01UrjudZ345$UcCdA*9@HOJ5_FwU +zKJM#@ZelVVj9No=I>LPw_GxvEgz4VG^PSyoHLqsp2dyOThrKy9>tvlrEj4<>0JlI$ +zzc%436rFp5;DTY)0(1-pYCcr6eMp&;vn79=?~8njYKxu_KVTSv{@dss^8y|u^dnCX +z(4g}<{UX&?4dki<6rB@@{4t^0E`w$#f&shKZyZx`_OjZaqfZH-={YqQ5@Dt=31QFa +z0yw|3mvb)Dl5j(5I`$8rtF`))+5*-h_+7PH6j7amj^o7!OjOW86{#Anq*D{ql_M%% +zaNI<7HtMysKf_^6Xh7osWH>rIW2Gw;H&u?WfBLDSF2ZZ-WY8LhM6B@wO9B;&P6kI= +z2WXdgs7H-dWC+vuC4Qob`|a?*|4sA;t|8bt9Zff}J(OG}mS8c-FC +z)>Uvr7qlGBlk~DUGIzjKGZ+kl8)z;Ds2r+J7$iKHfaSdqok0eyje9kShM~Z2G?t__ +z9H!=i!n321)xwG?g +zlNT)gYt}BcVQ}7pM*#+JmrruocUb_iDlw=hWU8vAIn=bl=eJAm6mptg^0G~)F&fMM +zW3*(%TVTP^U7M-}y(D_VdO(;TFyf429;0fiwOzucLRz6Hzt*ddoSY`OSTI(ATFtJ>=~YI&)?vc#8ius#Me +zwaw5bavW~4o=6}qP_<{xpI*Iw(>&aNeXzAnaU6a=Si`E{v@o%`{pM(U551`#q7+W< +z8IT0Qc$Z4bZ=tL$s8p4*&`a@_-qZZ)dJ=XRiO^GZ*oevL5a& +zhzZ@-Ie|@o+R|5V`M2izCB)cImbf+bqYKB9C!D +zmP=(=mrKd{si5aJaf%b8&bTgTCpPuZ2Z!z9%S{tmrys_sR5~Kx9a{?vR&Nb81VtHR +z3)q1}vUj-RtS5+Ol`293dX2@d!~r*yYKN^3GF1@=D(6dI+?Q~8ptR%VLsy1?a1S7b +zC!;y0wrIymfv0Fpq^s+;7AlR}p;o@*Ca?h`DVjt>Yq3#Dta(X0Bq!BSmlMjRKKX2A +zFOpjQ&M3kEnEOs&BYhL@ecNdMD>oV)_|aL3XuC{Qs#4Jp$j1UJT-qwB%Q(U_UwdPN +zKqG%Y2haxb6)@mWC?Szl!Q@d@c6bsyKhqwZ*>?Df&irzEPcTRA(xx^CvmD=g^zHll*+v +z|B$or(_V-waMVhjv?^XqS$n;fVmIk8H)n-UXBFlC`8ip9@FyJ6;6FWZ(zESX&vp(P +z9F*1#n*FIA_Bq~{oiu`pddCO^kMi1WiT@GK`F*yBVE<1T?lyQIda=Z1@1i~c7YtjL +zs%-B)t59yJKN`a3KJzz11xD-otDpAw{&z#^^m_}CUo3mC^feUO+LN0SW~@1sb#xh4 +z*+D5b5xu2aFH7wyi~`AWV|ddcUlJNLd7?N)-*w!*DU3fRfyi-O0-crIjne%RfB1bA +z55orR!0^HXtwxWA2pxT(Q$D=ZKuu+KL`$^_5Yt!P1R4L5Ohxxh;=9pailcP0-GieT +zcEN-N7qhtCFu3%;W7#fVi=Cs@=0()HAj8eL)fx>@L*e8KgZKi1jQV&yMQk8UX1_E& +z)kmi!tr5@^JENUAevh|rC%A@Dn|OxWNgb>7K!c +zq^t*}kCr|02knI1C?k%${_Wg}mtXT;&p*66C;;QZ#O}V@gVQwPz|+HL`8ePxyx4lE +z9rxWvF!`=)Tq$W}sW{l;nt@L-4*9)Jb-3>K*z0r&_J94=={t0kFSniO>=OjQwse8u +z*Uzx-ZX!sqbpNd(vsTco)xsW{+0}py0=9>})=drFW)dBUF})ong&AOfQ|CaidfqgB +zV318)qNz(1sK8Ku;E#Yp7nd#Z2KmIP>UvyuykNa{182h+K|b74cqh<7%H<=?)#gjs +zWS(wr{rzxv^YEue<+x%e=`*V(kj3RXgs|c_|)L?0AwN +zM@~3nGNPwE%mE^{qfj3>N6OCf#bvu&DlGe +zcG$t2#QPplJocT4HL%Zh_6EYH*9^zlU!$EgtTQ0U@c?}~5j0?8`Gy@^hdKe&J@S>7 +z)0jY9*BY;5up>UJz~VL=)Jg3nd_V^fi8|>E!@&-?baT|R3aQd`-{asIehywZ$5z}& +zH69vRyp54j)HTHJpj}x8C=&PVl|jgGSSTAnhdTjsLw5V2>RWw(3NtNfwR0NxODGQF +zM^UFOMr*7~`dTGH#VBmV4zSe8s82@UFcS!09L0IfL*HZ!Btegy;n^8BAwHAKE;`(>S`-4L +z4(qv0b(5hGS2-GxPk!5FHqWOPdN8^=cmNL{gYYMZaRUaBdGRS$y>NqG6o(W!qg~kF +zfio2E1i4c^sHzNQ}3H +zeVj6KGMt9~#PLyo7!H9U47A@c(u;zF#Emz=RfF}!)fw+=8VI_sV_mGEuR0in*hL+z +z5@R7ixz4EDQ;(L^EY)*7S7n_ZhJqmt*qspBTwcTyW)O +zdEIywyGib`ilMPhwp|(gwHG7tVcIiiyAYfW$x{~k)eFw6u$Qzhf?kw#S^pMM^z?@4 +zR*lQ*_#HQuPRD|wu{xFGCgDtYjr27_9n3-a`v@8?T9__3Kb|E6j?7UppK1BwT(ny! +zx;&8)!W0eWBg4jP7;pj=NB}dO%Trq*i6J#(%OS#kzl8bIKY_q#m +z1|mwJJ4UgONN>P2{BYEJHHcH%4d|E;2Uoja(U4&9+a2226|{i;qk5_sw0$|G0LD_L +zx?$#AyKPoN?;8Fxke$H)TK>S+&$alIQ(nX@jT8c^VYi=~bOdR(beZD3TjDJ&Ck1+s +zRbln1)>?Qp4!^KJ{u(OPM$c6UAupyx!JG9l4;3-Oy5o{g70Hez%&e|kCH5j~4P@En1 +zL@W3gx(t{@O`sT2jC(z7<6yFa@{N|XSXhMA3FGP#@NpX>D`@;#E+Odc&4fn0Et}(#?jWySc$N)3KLZQ>neI +zJRzs+gYyvy;*k6RyVJG+QU6uAc~0V2Jh))mnWSseS=eGTq?v^ZKX7 +zHdmej7J%E^-Xdd!`ci#md{f1Cq#t8j$t>l%s&2>@MJch=^73%a{|JG7Yp4%P)um6m +zQas4K*@d&ra(!t9YF_ed6zT~Kq2cs8Fa+qX6Zi*?aD>{kT)~@pu1|;73wnH`5SfE> +z54N)|*PK~6JBLHs(wy!*+G^0=?F}@XI_m;`VL?w80wO!N`T03zX0T;Gr{;K0 +zagGm!CtLe!wZ3w>Ryd&=8HP`sHvxsVaA?saR(5mnvfhA7)EZ4o0@JZq1)Sch)63Bs%rV+C+qGUxi?6jKZ_C3 +z{(Aj(>767lEWo#Pqo4(cTYz}VuiPCXk`juc9kx0+B|)Wbj9#=(-BEuykV^59W^T!} +zqMvHRc>G5eQ5&V`y2!>-Krh&H +zqcd{MuR7#n-!@$vfQg~!Z%^D#1pT+G@7VOy%R7JiM4i@t_zn8>Ak~xCyGI8*Z)&S6 +z>gQD;NV5mwrFuN4E>k#XG0xP+v$bq+=9{OXZ`w@Xw3&)bl!PJs`c5HqMSq-22&r+R +z*C5H`u&aI|1q{*S=5mI@K7RlGv9VWyPmyLIENyZ5^PD=;UWq*S4O{!Kjt(1@+WrcR +z*Qhs$JDpl5j{7LKh`Z6Sb_SCY)-5IG7{DvLq&!H)#!kzaYE%grVX67<0S;=qX;XlHCPG +zdgg#p@qjJU5QBkBN47v)CvTAD+fDMbS`3G+MQK@8QPA)NrSbBK^3lnIlAO$>8U#Fm +z%H&5bXEFV)8=VITWy@A3_ci>QsM9zeo_1o4903gXStst}9cz@d5)E{X8{vRHP1+ic +zmiv)^ZXIzeP{4%aUPmCFOD}@67--|*6Ge=8i53=EY%!D5&%<(BMM3u3nPeE+1Wch+T7hW +zH=$W)GXbn)fpr(oX8tu1S^+6rt$5Vqs6}Fh3Wrm^h8_fL0Gf1ycuy^%FUZe@;}>^VxauEaeTZOCoAx;3_m@-KAXP+; +zuwSFtzAgYZ*xi3;>NfYUP^$K2ZI(^7mh{6G9FAMc&Li!pT2J7oS5jTA*4FrxZaCeX +zl4L1Ef*NBRscNl~6y-bBReD2qZ^mA}+N*8*WNp>;B?5Dat`5o66cOf(7p94a>=YrA +zY3@N_vUO}g2@F^@8(Y$euM`j@GlmCgK}uYFLyQ&8vELfMj5r38@}T +z7q!Q1T=}OOCsl%oy-q^2P3Qq2hHDLm*kwpg2SJPXfbxgSU{C{g_LGhq>Im96`g^Ox +zfkUAPD|Qbl>LN#NL}6+&jD{mwoS9v>`RZW*#lhxF+OAUH8kO<~`Shvc2a(n}54R3> +zULARb`O_3-pKTs(dL{9LTTa!wYJF|3GQ~}bam?!8C&PkB;8Z?~pXR1?>{?hp%fz6_ +zp7jsiQcsX#kg0_ZaJphbo8DA6>Wd4tYO~qwH>(oTltd0C8lL0QvFBh9!8GX$fo>*p +zqC1x5p0*tNybBv*7M-&XtOINJQIX1lbw%}J8Ow_6#K~GYps%e6w{FqiFX896%kMUn +zHei5JENK>&gEWc)7p!q)PjM_xe5C+KGC{RCQ5Lj9KQ-Zgb#rqm&vXmNxacNVGMfmxz|-6=G}jue|U +z2zs69RP)sL)%G=C`&iNj=R30YDCv#1M9NjsP#=E+bC4zj5z^bh6I|U}ol=-qCW35~ +zSElo?Dfy>xrYSk6^_+RIxwpIX^e#2S5#t$ZDJ@rYYHXNHFy6Z%k2S2m0ckf5BDoJG +z?A4Y0i;hd5#bDEbjOVa%nsPa8huQN6Orsv>$VVFvqC2)4EezId;fiK7nAy`TpJqLz +z`f{d4DJqwl^9ekQp8i~x#U`%b8EN39ud+?X2^U2g?tC`K$B#-+!{5+nV=0G<1cU!d +z3bJ`{*VJS4AfIwQ15Wsw)BtNJrUsY_)BuOsQiCyuz{y1*`q$R>SH6um_vK7eTljKzn(;mygI;ZJ +z{eAPrc1;A%pR^d?lq5kuoX+Ny2LKPDBoXYz>6Bhf2`o}iCo$>U6@z_JY|?7psKOqL +z0FS(1!U0-qKgK;W&w}3d(V0j*U=2N7c`y?Aqh>yph~m*IjLy*Q1bi<&aWZ|{sFw8F +z>%S+0Y&&YD=VpxGlpzBC2<^tabaGMp5-vkZN!<3yiL9i?M}u9er%! +zZxgVEGEI*yl>JMvg#hGY3#a5_i%$BF!xl3dcY!Squ<_V}m-sb(+2G-fmogr6NKs+@ +zEoT;g+(KV~MJ|{;T=LTMFe;VdKMk+a<8uetl?5p{MrtHHA_KhM;Co;*BrtNX#e)iI +zUBdrQHY#KtO&<0C=f$g6>~r|!Nrf$PpY0#I821J-#AUt&+rDe4Hy*yd-rIbMqCEPo +zos5Vlc7xo0Vqr4O;+ryMvH@;uQ0biN43P^-ZW6wJGM#8tplwb7Tl_1|yP@-HvqZo7 +zjdD@ZiCR|Yy-}^x_SKQ(+c-5O$kOZ-ummafBhFefoDF}53?nonfQ0`1aSuclh7@;&J`BzF5(D00Dwt+>2U4 +z2g9eBt57%rcZ>y|>6Gy(hp%#BmHg!x{{FJ~mvb98n%yXPx%E9vscf26$}!+16^L>5 +zm6E?$2vBRuRBCU@-J{>`GddycKFb`nw0U!>WH4yw3=jIKL7Pd&|yuCy`>!*s5e1#%JwgVu#Hk7nsZr>(Vm1iHJv#d6iHMsFK-mAe!rz1pW( +zxp-06nL_%&`LZi@{7KIP0ccm7wmO?PTcuo{Y3j>_o{0SJv%7Yz1K4E2OwDs-1R2&5 +zxFgE2Y=@_#Zv+=DE4Xl4b!KuIRg;p@;?GO9J_}QPj5lzNEL4YN(4K*QZo<$gP>4_r +z5M3q;2B^|ju*u?Pifml1Ci|E{AF@t`}8X%Y) +zooO#YLyr5sXmQ1OA7ZUq10cd-@w!_=3l1_o|K9Tj7qS`gEWrCnlD? +z^48yXw0~Oxg)oe)IaE+U;@nQOAI|3{HP)sl6T3J`94E3&z0+GKZ3Mv|ue7-6*)7CH +z&x*uF&+cAal-USA!2j~$k|oRrS-lg=vEfu(gm37kpO&d#sTf_{qU_2OVu{K01Z_T+ +z=bo^4{AD)zm?$Qe1&0nvVHRhhV{>-ZjVGmJi;fi}%j~19a2#iQE6RGmkU%K(HdehQ +zaX_)`?lZfPr&!0!Fj%(nnLhfgb~ah-bWEWKmML7Y26FSkn7MpFHq+FWlil)8d +zK$hIXCFLbgIkhRh`d)YPRA!1yLjrIE*n4@`cS(CMJ%@x7?~S}2ZtrD-AXwOU%$l*f +zdaFgc??!i>tXgixwGF%dX0O{YtQFqR4db}eL@QNkrt((=uRePHDC?v;K=#T8T +zOLNY~U^0K)kqXFRB%p#+gvQ>;`DGcuG$NW7l+up1=$vMo*uPB^ZPr^fp`X(P;ywKW +zskLnYls>`Kybn=((wtDc!LW59qD13OOx_92mYd%XTuzpYrH=VUChiOfHg_N3g!O41xX{G1KDu^gF&vC~Ep#==-Y%yx +zotg+_TKavseHSNVlHMb34C2xGg`wB5j7fxq20TYn?}F@vYs;lq^GQ+p1OT+l!P>v{?)1kTE_&ti(R$5!)NLm2wnS3iy$R`O=t=` +z3oVt+vlSv%GvgoE%!M-2wz@Zsns1!Y)-@1Jy&QOkUG)D4pNYU$xaY+(02 +z4h)KnYrn(1aiK++g*Wt9n)B{U#PglyjE3mw*En%*%NJ<3as~=&bpV&kHPnxMw*L|n +z)2%_AM;LPm!+_9-Vm!?P0VlVrV-vBNKBZ(cEssU{foBIn)T5rPA-BJp!ty?{SHmUO`=m-s%PXsE57r+(dMrs> +zl+;4cq&Xlpho>d6nz|-oha58xMJyI2JZx5ISdwm(oWu5bxmUipDt*WA8G@lWtH;0YrScQ>dO2BEMgkYkcgFhq}$ +ziFbNqCnCdez+>ine<#+yg03zo#DeE}Kkd`@zBGEao4N>#x?oC1Q}sH>pIuKDnsRyQH#Nk5|*bC87~x?V%=1o(Zxx8Y+jRM(B! +zo{+Dc(=bjxr&!XC)+Uy7XK{P?xq6Gi66l}#+9~i&Z(r`dJA4X90Z|Ah5zxo>O)uy| +z34k|ODPFS1DGf=GYPp{MV`{vF%Fh=KLz^;SjQ(3q16%R#$G-Icfr~ +zVOT%?Fq*GLtB=-a>+`635TO@zK!Od0ALo7?)1~tM)Bkz)`sFL&gDbXy?O-4c99#tb +zByQi_s%*;vp@g#a(XI;&XK5MVqvw)X(&n#h=Bm(&D_NL8TWMmaL{(EUhJi{z|AdYPr6u +z;@-r@aGwQXq~i7sJXf-MA$p?D24M&bgJ%crjIlq>CSZQE2`wW{rEOKyDmpr)fbDmd +zdaFM&%1Y7vqjlv3Mc5M>V+f3FHc5yMSmHBuSlL5CAl~)S1%8134TczB&qCP^hbR!@ +zYd#7eql0Py!x?pqeq*Z>63&eJrtp+#IQtw%2ioyb+B3HpydMH|$GlOi-BqLR*&l}b}9e=?(>6nsGG6T+-ao!t!29dq!kFJ-O +z>MKk0AL()VR_lH?vE-Ki`S@zHcCd4}MK5*wcW!DLkQv``l-3_rr$^BMcPUr^_^^%- +zJ@g3}L+`k6jP$$DjP~K`%E$QgzSl`S +zE+Yo2XJ+n;YZ^av*~y=L|vI_^pbR_c#x{rD;z^joEAacR=r?7qag +z@tD9{Ad~}LwwC&Q9$9m-Do)N;k@~>zn*4qa^PIF|^!fc+MOnJ~IVEqB%Lk*Yw+|nY +zRx-Y>&5y1oGpzZb)-;Uz3IZ{2tNQVQOPL8J;FQ#kwa52vJd6j>nYk~=gNdgB_0lP$ +zg!^MSm1)__)S8+17{y*|Fu5P@IO>84hK=eCi{HAgrrglqY0-ppu{$YOj=9CWhW^QCz2k1P1CX +zyi#$eEm9vAbiD;2H`qn-_{t$k(7^73T+gGEEno(r7@gCCp5*xPyYJMKxp#UR1N4;u +zIa-~7Zf?=t-zg3r3>EiY&sU2=fFdF9;$x%o_UYEM?H31!NAD^O?EvLi6fBh(FDWS9 +z(ykWZ*hjKEzIMb*Ky3XM0|r*DQ8}J{+Z6K`{UCuarJkcf&`VGPqD%w_6ko;|Wz}L{ +zKyH~ex-tCgvq2XsSXRd?$E)giH3JZ@Uf6#Go(UNcMQ0HB9F`8CwnG@P0VywNIjxT@ +z!?@YPOpTJn^5mPQU+W53hU3{fbf>(C$^pQcQt*xAGCsnz0Ejooq1{rwsnP@l1MVk;9=#_J0sE>D{-@hHlfsuox`JF +zY{?5cD56F)tV~g_ZbuaGa}<%Y-gYny7=5Ydg6@_xnhqh3iV +z0V%f*fG>%9j9m&9KXEP)HRC?a!Jv_cwT_Xa{cpDr}N?Z7dS+YgNk@ +zDL2uLK|kB59SJ?HE!y^8!wxIPY2-Z_gIx`w<-wqxrt7GZ1Vq2~vsPT3-cY7+CGjmF +zlCvAfVLNNas!zjv&0GpSl@m13&rHs+y>IV +zEfwL#A5e{uEXc=g;~AF$35k(i!pUy_T*6iGePx&yNs6H6+2V<>4W(QoO5>%e}u%58B?(EVWn#)KS +z1rj0LWo)0X7`nwuAW#&3r4?cg+bbJ@NUM9KoM$G=(F32@U08;BkywsDs`5CbR>wc6 +zGF6*1N?#1~s}8Q!hC_WCs;`vRfJY*NZmN;8;d&qSqTff+*^Sn1ca*|ppfR@r2NVrU +zkU|%KIWo%D-AlHsl<($A!x9y1UXCW4PSrk)xS21>C+=tvnk(+47o6iAgZ6o$`C^G* +z?6z2FuDdYH72AazJ@K4ExZEa`Vmd-ZBZr#YhK|Tep3#fqJnV%73Ab*JdayR@>|veU +z;g-koM{W9MkX +z)5#n$&-pG7fy-7SdlI# +z34P!jjPYBHk6}o5kssIVes~od72X+AAuJ4Il?=OHTsa&ZR0-eRd5UHU_*1f9ZS*F3 +z;1tf91C5hYWy-y{c{++ZK(w^w*UZ#g9(FQ+zr&P2j2`RJw8lwZ00xI?A=^qF^*|3* +z*^F>%gq$(P6cc=bn=cB>WNqRSHq!Iec!(Wv!Yc@fVgNu+Gv$31MmJ8h2WK$qjo&F9 +za16|Xk_kbjBV5hn0=n^Sd^YNuPG!(3zEC6gyyiQf#iS3U!#U(^>!PY34Mi!@z084@ +znmNrloN#o2(|0BXthR2p>#y+MLLN^(etc8$gU05y?JYQj=O_8cW2?wlbdn#xkxf%a +zF$gbT$@hst1CZ@@IkzD>Uwzm>f~Qj~WwgzgP204o)l1{|`Jni_Q6l99&}eZS!+yU} +zDQ~@crSKmj9u-dDBLF6Dsai`30k+w4mlT&paw-Mm9CDWftGxTH04QxD7PK2%P`l^! +zzfP?s3j_!kGe(gMfpVZ6H6Bc-9-CVuKU2GY5jJT +zMqrMJ`iXbiCH8U}_T6AAQif1UTs~bVfpD?_=;g#(nCX%4`cF3J0 +zj7c=JXBq1m;^34!F18cX3TFEK3>7Sp(&Xg)4+zJcJzhI{F@D75wA1K*zX@M?U&vB` +z{Cxb(MVwI2K11dd((IRsgJ_e)|740L+YAnA-uPOviP`rPMl)qt0C5?xH0V4h52#U4>^F54k0SBq8N1=%V5 +znTdp1^}y`eFr~Emzb)`@3p}&H?J7)0bVrYCMtkPSuEeiL3|`?rm9Szs=0V25XPtl+ +z$r}MVW^HznD?u9;`0g#Udbg2kS{DyALpm{D^xYvt?z%y1;vyu@kkG4veP@tHf@MI +z%6vDTNhyDzKB`%!+1siz8+<&StIRo6l9V5rOp#Jzx+#r{6t39&;+#zMQ?a+fQyjz6 +zKnl)edD$?W#`X&!0*y@a)RVWlcen$K$T^=);W#*_&=eEP*9X5i$hEm*%xGf@@Z7blM^)RI4@knolDSc`g_ +zeGb{{{9$#Rv_Qp}$5)0Tmrjr4Rl>g^w@wfeQvl*9Uw +zWecTHb;Is_6>A!jx1wQ8RQuoL1n3Y%@9Z}#ilhYxw~`L*guN`&)~HG_5UqPz(%rT2#HyrHD=-+124miNW;h6C}Zm^HFoZjlD!&LFz3 +zt-%aFQ0EwQ3?(qc47JdyxatNdpVmrtY>ZP2dP$Vhvm+_C?4pn-qinbF@5JU%*M)b1 +znVzkviu$Wsx?Xzzd`>kQ__VS#=V(vw9PaM_vVAbynp3ltprXESD183wU+D+lD*vds +z`H%Krzj`J4ow7fw%4S6^K#lNHQvhjBZ6JubtRlBl>{vv|vjufW6`KeB@X8wt^SKurY%QRU(EL6-;9+i6q{>)2?1y? +zj0_`N&)qUyvnthS^iDRJ>ceh2U#Fk*ZrnpRz3TLoesW|f)A4EgP(Ss--f7?1lYJ`R +z`t)0rOT>lJfB*flURs)N(9PRV+ndj}4-VC`U3%77b04<1gPk|(L4CD~X0wY(*V$|Z +zs0O_NXk<~arcTrvva9#(|Kx&L!~^I3&@)aVK58b&aIwIvp^~Zog87BUI!%CL +z5ncemYTTYUZV-by{UH|^O%SJG#@C`{*++VOAkY*MhS#1lIyGyn^XRY2H>}FrI#ry~Cg8yQ?b7Eq$3Yg3=Z!_rA=EsQ~ +zhaEdLN`lj<6Af?1k9b~*?707XF$Uk*f^TfWH@3jLe#(cpqPg0)`P3v=7x?#~xD#mWH$A&=dUiQd?w|@o@f&LeONy&N_g$|1_O2_?8g{qq5y9a2MkISqSyS)~ +zPv8Ej!I{<;tOHCE-_G#{PTBltO_*#{6fa4fkDQtowQtj}NpL=I_{l|y@&DV661v`m +z+6EY?C_%S;qJ#e9^o_kG(9df*d*KV!=4cory)faZ$dBvvjhzhV^G7y;6@!i*k4vv) +z{+`18ZSnj)4b_&+AMCET8r<8#y}O0!uK7D!oP{7iuhkJ-ZJmuUa#Gb>{v0+7_ot>)(8)BQKF>)cnhssGgd`&8l}#29V7KS^LR)EnR2`upaK +z?dIO*%WaC+jOHa$;+A#j)?tI^Sbu}Dj$Mx}X2uEs7Hyna$C2rOiulQ}ML9y%;~ci) +zUoNon*}y-mxKz8K-|uy9R6iUTN8on*Kt<##vESx1JF-`_n+!01-%#^sc@FQ1?Xq6; +zO$;1S+wuMBBYL<&9bNu@8eB%LXmlLhWWTtd5c(8oomXtyVDYB0ccOodqi7%s$GYf- +z2=VJ|lx*%2#{)Bg=2d(N%zV`5{gqlSX1@r7w5OQE`f=mVYiP$wx)!biPkQL9E+0PT +z!1(eo!uSJ|{s}0BE)$)hk1t3lan$^K0%N2=!zDlhbgp`SAo7T$~-_oIY!Kt2Tx +zMDl*!C~>Ic<5DglAlfLKZ~(EB%j41syCHP@m)C9MsgWfYsVJVuxjj@XKe!>c#X%yw +zXZ6N}dQi%9rA;L^*bkz1i0HaHU8W85-opI+y!r)Bi9ilEG-E-*E?^|c3;75Q(O|1* +z(@#H0Q4}Us29fGl75T09sAWQ|vyHxnsa+v*wB3K8tvLcgkEgsrQFwQ^L^rr0L4Xsa +z_a9-VF$@N+)J83oOHnv8VvvHfGi*I|5JT4^2OFOm@CE|a%3wH9ELqK_`%Fh65lAFD +zG9{}oLB$#>gR!8gArzGZrY#t>NvD%S7D6jAerhM|qFFA+a)X9qGR0P9I5+|vTNOt@ +zxUf){!>?{YSD3=!9EcRmfbi?Z=3qJP5nQ7Q+F@QY+pC@ +zMVZcIBYEm5JJap(_tiE>?P3XFG)TzPb{lc5lsQNZf*uAhB=1*|jg@9D&nUhZ?^lC! +z3c?0k8|@BRIRL|=tq3b@lvkz}sbT)<1ZtRbS`+?*&Ar{7r*~t+Z%3Y?`j?Y_jSZ7& +zA}>(amB0wm+Q3zW+c)ptv`04&w_j}@Y#!|&h{|4KwrWh)j?O5*0|vi28+T$i?!<1~ +zvh`!cV7dZj_i193AVGvNA?#5Mdd(7$myX2E(>HZ2>S-!FfJ^DS=k$OTAm%up^(-C% +zWgc6rzBw1NrB?LHVxr|bhR6S;HRVhLQ;RQy0u$(s#)e#CV-xS1(&XN)d;Lmb@lel4 +zS$BH^J^2Fi@u#B}?f~31&2VAoQx0$VQw6?JkqK19AG|-5bg2C0<QL^;M +zUxNijvW!3;YE5ApX4_Y273OBSdp^kRsO_Du#9IqK)yl|6?vNuwyRZJ;Fhm6EPekDk +zj}CV3BBFse>;yEQrcqKuXZc3OCQvawT=^LJ$8tj4mU6mvsU?@5`w2ux@F17kn6y8V +z3ChFWq0B>BIy`}Xd_KAOvrz}9^IwPk8AB=Df%mh2qZ(83J~DKFB&it7`N-tuF+S4N +zEZ>u*InMW7uIHBY$7|Xcp69F4BBh)@nvUrzT=e${lr9cgdxR?OPTUWBq?9aQuA<)R +z3ViR-N7Pc;@*MTnYMfEa{c4>UQe#YLM@cpXJ$If*mtn8&kqfC!vNkbm0j;2nmjQ+< +z%PCZ1%8c>92=aAqCUoa<-HQ>6a*|o~m6f4^$fDA6Lcx?ImJ$qLKR6GD{J~R!gMLd~ +zbzHsYaok2QS`3_w`Y2efy8*Q6CSkrdU&Dyu>wHafUp>bVf2e+abrH2L)aKJ246PdI +zFxYj2IFPWk)b{clhC}uNkW@n>Lr*;+wsGQkW +zFj{moK-hAK8fw|_pPBHU46sx@kA@Y{6kteU*vt~(sACLeEGsd&{1lhKtyYr?G%^1d +za~CG)aqyq-|5oV>yFa4|*B!bA{kp!F{>^Q?zM0SFhXek%=#M3FIkfO=+Og$TcT4-( +zW4%F6a#tmc%YO$=p2GE3&e#_mISO*FyNBrOQhqk%k4xy5#bw0qvnqjT69C(MgYk{j +zO8rrNsj9;BR-%^cOUMKFLZBQ^;PApc3i86Vp)(xAaX36l$-kMVBZ=Hj0~-!7lF?~0 +zjD{mptsvcvi?Gv2Pn2-(RnQ)cFN8r*kv)bJ_fVY%t@lYMNG_r?(%ra^8uI~0pbuKZ +za3C5W$WsGg)Zu6i;aoy874%p_VO47sR<&(>cHLWe152b)!F5uDf{VYtSzN5px@l6@ +zCbbhXEFRCkJw7fSAD@(u;qTq?+#>ueFP>MVPbj~EvrupvUxuvl(dH1>1V>#0>xL&2 +zMWLV2lm=_(Ruxv2UsGoEP}`;x+;C9XM08bx9x$n`ppUs>XgjtAFd6~5dCXK^F++oG +zLzqon%4wbbD=+F_-MFo|hq0%I$p(^+Mv2HriPK(CkZ02l%p(3XnlYXN8b%SO74#@3 +zeY?rJH1-6y2_1Rgi?4ceE=#n%gbLJ2J*dF^w=Qtn5l4}_MlH&T3@VUaGy_#H%Rg^b +z5f~rFm_e=7q4vrg^c#MWE(J&zkzwJ3b}+goK?r}VCl}BuZZ#@`IlX}Ih;m2*nw_>) +zO~F$-e}f!YC!I}`F~{B*`oFb>ocvZv-ZK0?BgBxy??^im>O2l}46Dfuw;Z8~8`wM` +zk;~>mBN+JKn+%y#`K8esjJ!;eeAoy)pwLYG4oz;g-0#nJcaQe>cPUYx8|_Yqr`l%Q +zeMULp=+$X^-}jnaAwD!pogQrQB{zekgaf&(rVP%8n{V$WW!QV!=yl!i`%nMp+3S}q +zgp%h5Y-{aNx9?_i?&##kX~Rvnf-Dx#c!_4C)RHcKYsBv56cBHeAPBWC(*p3NppLM= +zQT~9Ln?WZEl20|yZr;siohBX)fH;sT5-f<(^*quIJf6~94N!Bwil0QNp#a~M5kRP< +zHHi8YEXImDnsGvBbPHgPh&_X!Qqr7MSw=9&D~pvA +zyI*8045I5*eVE?ddE-O^zX*(KTw<*;Uu@xdw9^S&!xhaX!JhIQNdy#SK!Y$y;vU&# +z!C5>JQS#RQ?(X*15!oLe!rA6B8pJ)cqc!WQ>gv@=OsmVF7bO=&XjOl7c82sg>BjFv +z-?{Re@&^yToOfaR-*_ipx=GqM~L3?9}FgGITr3IltP*3Y0}o>oZMEFjs=#g0rx5m`DZyVuLyr!#p{Vc +zZvjz@k}^YGDyKjFGXuY5*Eej9@fA>Ck!luPEs+s;>N5$@)0#CY)R14ryjr$?-1%OTrM5E*cU6pFJDI +zVt9)M=b%(OY5~d9dfWFY5tFn~RzgP{)M`gFIj_9~&T +znRU^1SFd)qrnsCP4`3R*8atSGa9x|7p@x-M=ItdX4WSDn1fwCUs|^kO;$0Oia{ +z%p4KQ=`So|w8QZN`O}m|cuoT=wO=~bN?xKgv{K`Tik7sZQs)+;OEn<(7TS@c$`8;^CF&lGdb^|AH$d6| +z&pUvquCW2d{KH_yxLzzQ__C#Dk&oJ1SP=Vzo4Kl-j^fixJVpR0B%!^^P)EE)n;F-X +z!h(a*J|$5?oh>T3ZKIxqF;>Y<_cZPZeRSE{BPq@!jsTyo{W1+;J0Bs2y4Mw +zB|R9YA&dkZ0Pt4yfqq!WhaO4{;yxZoKB_o5Tb18609Qb$zxjRO4j@oGw)HWGT_Te3 +z4j8t77}^Qd6}N-IRn$XRgNvY_#O<32@JJkmGBMa(@U&zzZvpF!<~@SGhMVA}@bahT +zv;RfbjAG1<8^W_*jA6k6R%V!5H|Nq?VAjvC@S%UTy23-T;M2uTTF +zs|L^+l>KNThnpd9{CVl<9GDlU%ONzkFr;=J0rQN!$xt)=Di4zV>%KrNTtvn}%VnkjxeD +z+}J4rM94HvGv?L`2M`AO@N!%DGaLZKAl4`lMARl#df%>3*dz$w;df1b9~8ATwKvh> +z7bXY^H&G6lSY!y&!^lE~W~)EK-7gB(*UV`0>G=U*@|8aJCu(PNeN7qXMUbmt6MSlR +zL9S2C1`BeZ_5ep~r#l;qK+qOph;VyK>VQ#|{5j+23!n>+abWOadC5F2yGwzcXp#t! +zDO)Zz=M}>7s*Pme6m})NI@#L#amqn2*eG(ggdlIDkkedg3^FeKUnM&bU~pbLaPLH^D*o12Mpv}j_-$1`PMWE&IZ&hFq+yx@Pl^}ERJ?l_M`H7o(5o62Qa7owPz@P(!A+^yw=#aI1Aqt#r_lHEbw3c;c~+9 +zX@)eBe|lAW{ie#Y!L2Qlq@(mGM%R_-|n27&L0&pyD$Dk$VBRHkRAz8X?yNZ}l@dECy3t+H+@&W1FH}q-8RL +z`|ph2nt5N(@(x}Jn_1tuel36Vxoniv$1jX|;q4vH{!+4hiMPeQ$!;u7*<>5)O)oAM +zwCj6=DY+%P?`6T1@;DRAPTiiZX=eC@am9Pft$YZPJ?V$72<7^&NcToZSt15s +zi@&|g?wn(h!}v|~AbosN-rA~IhqCaV1F=#pavtwS`cA-$FKP65#kH`~lPX(vCxza3 +z*_l->RHe6S=3QPz_`Q?~a-lXn^qDwjLAyP!Bcu|tg}1QMwy<|;73+|AqPHn+wKI13 +z?z$%9m3yiMWgQ6JhPig`YSQaQl5WdlPYLlB*PLAJ4ms^&@G_P}C`EC&QPL{JM1nG3 +z^E+A6?B0Jk7yiw5;~Pu<-(kCvOD?{m3CCA7)vz?oC3GH3Na_tkH4od;yn@}m#XcbM +zenNF`)Nl}^Nqz#o>~wGoXvbGQtsk3VBHbYqJ`y#G3Y11}#oYOzr{M3>1xSjeMO7L7 +z0A@Ue+vB}liwvkhlGP}&}zPA2IJm9LPr=|<#MY4#7RER&znrk8T`>(jZ@8A`rl +z8qRGP;!e);=>!dIkSD3NSa&Mw!te*ZkTpllArAFI^wxh%&O={MLJd$CxfFJ_s;6f- +z#sZqgLRH)NK$$x*P%V?~uvvI{dXPE|=B@3#@bJOjOiIkgPy<@C^rVz)FV5iN5ox|{ +zwp#Ikbx2}$6nE9p0KnW-)lSe;yFsrNs-xhh0}Lp;4@K*EzGWS__Pq&f(c#r9D(ZJ6x3?6bw8$ySfX^jR0)SZTAgsou=$)0Odt&k@^U`;M^%{oe|C^E(dZ~gKN)wSC- +zmQql?q+`UvV`y~llU5Z_)hfFLz;b9=fxmbx)2cTjh_HS`Q0jmdHL>ak1E5!72Z7OI +zAoX`rUanm!RH4n6z-BD4W9-qQo{tq5ajoJl;uA5HX@1CX`5O<`A1!6%lym5t_ra5V +zDWzL4i%M|kHBywKX1Ol0j$D5Tcq?l~L%8Cj^Ij|>e7UQF_IuuX+YILrXhv{@He^N` +zgqWlSL9SdO)v|O%!t6RMkP>)VB>tHjVh|QVpPcsMA)VN(#Cm|hL9cgW_RWBNU%E*& +z?smt|vR{Pe6LVs=xx;_Lsb0mf8=&w+x8xa~zy9-;5VU$|3r;;F8DOqb(k=Povh +z42~gO_w+fHBZ!u328&~1iiXQ1FGTZ(IM3Cv}vw_ +zg#?ml&8x|p(!Gefug&t&KcH|J#sVqk7I0C-jmxNQV*}&yU^*^Dddv>eP>IrZd?Euf +zrfeSX;f$2vy~j@y@6fX-7}&>Cmu1Akb3pM@8^#!(!j_!??5_`y(r2K2cJ&hw*yb<5 +zUOz*MQ*#r244M9B%@`GGo9W{dVzMga<@5N2G@NR`RVWz8DVo3}!P$gsp)Uq)?tvU1 +z14w|=haV@|F5dChQe(tFXwxtl4kLbIM+=lf;-Gx_&*$>`;4;&L1I +zyl@C%;?s~z9tFlyOg&o^%U8@K+ATmQzb{{h_k1WM$y?1h>C9r*SF-h6s)JJsn) +zjCW4<^|WDgaps1~IQ>fB6IFP-k#EJjP{kLpjt5iG%!WP^95TCrSSkK=%?@nLQ`71} +zlMU=$kD~&1w!Hgn&H^8&(KOzJ>2&b2T*AEtvI%V(b7vkOx}eK`BOWX|)y{fGJ@RcO +z32;C`gC_eGJywN14BSTE3EWJ`ll9`Nqf{RaEfdMNBQ+?b^CK`eTNGpJ@QlMvqJ^|^ +z69S!a9g^7B@VcMeboE!)O$oYOX!gRZ!Za?L=yW#BYKqM|4NMbnP$B8+BJPB?u#+;p +z!0VqTvb^4RWa`llstF85OpZH<0-4WfA0G|!i%41$;ZXi~7_6}eZ|{?K$FuiRl>q{J-$63d +zy9|2~x|hR{_2=YqO-eNTQ9sl^n2swzD(mxVaSZH3<5BKAD`T*$VBUCv#;!XT`lxbew8JgdTS`qqGF^&=2s5KrT3L_5Eae#~)ISeSm7=(~t8|n)% +zZgMoNIPNTw*b-&L7?~R7xY^VrfD;F8gQtorqm75-c%+F{o-?u{yI1Y`on1a)uU{Vi +zOui>@rCkK%OXD;Qdy1u7Y`5Bp;SaB)Bkh;$7bN+Jf8;41-D;4taJfo{PP&@&u2Xp~ +z{xWI};v@#@{&SR!fNg~)_+H5PsQ+EYGm7iQ&?=3x)tcvFE1S`EK1MnuMB<3Qv(-Aq +zawH8qXUg4s6p+tE?LMp0P;70%7{Fq0IYcPz_J=pr983Vh_~EMasiLjUgaLW6_Zn>} +zi}!Ori)F1T#u@699mVF(8}V#-Uv|y_&fATbP1d<;-^^m+HuuP_7u^2ZG}~<0x{}ykXU>R)k^(weYuKl*Loie +zhe`N|d{s*Rh!&Zse58j`dQ>;DdSQLT$)swcCqNAxQ6i7|GqDvEVuFck3ss?MU<;9) +zJbY%Hq#$$T#=h;w?da@=gWYln7lfm&&I2-7@u!RepJ<;_u=dcaNkCB^B=W6m_nC6? +zl5&*?2aPf-vozVw*J7{|U5oyIy&VjLf0miYz0aJXLN9)_pCdU#nbIxG@9sQ3*gW{( +z=FT&<48?C<{^#w3!=3#-Rqh7A#e>g*aIpRJ4ucqkml5v6(?Rjw3PPG;YyPR7-rOyeng}}&+dcKd;SaKa5)H%pIS9Leol%RzISc2TS~!SS`-k2lHDF?; +znf^6erznoab)aw{0V8q$K>fQ2IFWSNX${19z(~+Jpx=fYv;Wfms{KAO{{v+-jMMNU +zxQx)h-&yYJkLfUF*oLaU+89}PDv+aFNYC^dBi})DMjQbrGF7Xgw`i2SEF0sH%7!Co +zh7}9EN3sDdE_xBj3wh4ch}_ef$GB_3%m2i{*IuZnK)7M^3t%k1|7~!(`nOXQ5de+; +z0i`JkUuX$2r3pT7wJZ=V&ac%>l{)ZvJ4`Sdh(L&dkxzzz1$g>KXQjwTm`3|#1|6LD +zVxm&cSwKz}j_iRCe6%svl9=2=majTxd91}$xRP_pnwc7H0I#QLEE9zNE?kJjerl8N +zZW!QR#i7gt?banSE2xJT57>EyM=9C?p6%{xr%$(7?9OWDRN?1!D(Xl!mUQv2EA;2+pK?Y8%(O#Fz*9)(BEo#)~6-HbMEiv?PgI;tl +zVOpazIynsi9fq*~_2UTrzLEDEpn=XY*x5ql{8-nYv}-!zipWo%_`<|Rh9?(skOb8> +zshUQ!$!%(yPk&opaWcsPRWF-ooz6=*ze1jBUP1E_7_yw?e`*#t&(N7^j^h=FM~FM1 +zzd8+e%waLuW;aPW77^k^iXr_aC&4?c>hLPoXIPx_`q!F<>H2TGItW{cml@<`A8E|x;}I5!-RM*a +zaPd6ps$9?tz`G6!>d3MN;~b3p?xB=Jy6<&-9eWx-W;ac5>l-J +zoSvDg-A?BVw+J1}#jj%SpLx888TFizbgzpTN!$RevLM9u7l|mzAu!<4Nv+18YrqLq +z(5o5gAXOc{6c2u|d4z*NRD^UUWxNV!E2!#|r2|M`c(utX8Qs=#iKGCCp~+7}I_aK` +zI@&6M!gf-zXPZZxz~!E^34((K643(=377Fkxx +zIaH-$H?s+wUZrd%w2~{fHndZt{&IDZ{jVJ^wh3iR$)ft3db?D6{BC}6(R`YJQb%^D +zga}<+f1YSt5BCn!Qt7^N6^BzEbnwFAhGnI7g9)?C$&f_98U&;NHPhEJZuPfm{AP-Om$Jy_d!rj~T6g +zI^USVvtBOPkp`Xn1>#t?3JT6NfzZM!dDvLSHxyN+EB=Udp916rS|H0YaA%bDRexNT +z6#Puwz;XFLF#srkp@=XcMHwOKpPxJ6#UQ`U#b?gN_#>GJW$VbR1m3j$sivahOJ;iE&s-AA1cxD0YFG4|nU=e0U#MwcpIS_MnG%sc +zef~_X9M>O>5r}4meG_k%P$kVsJTZLWygrvYH!FO5Yp#tL#F)FIL++YB+mVzseTT$A +zroBk|1c=R +z!ctaIPmFlk+mq|`xED~ELUaGbQ1HTh(j63x4bdLp%$+R8nf5L@lLdE{#lUBpH>-0u7|}Rm#`9M)`&~6A{Oi16nl*Qzj=k +zjjJ=Z`>c8JdaucM*xr<9uRFLqwE^9d(2IZlQK)pMOUfBoGE~M1UngAskj0f8Z1qhd +z-n$GiOlTW}S)rC+O^59aflvn>)6(?7wy43M|(%58UV7Pv!tq%kVX>o>1YV12daXs7&T^I6Oy=DqMNbbqd+HBSJ#`=rGey<@}21ojIpr&B;37%nTvs-SWx=L +zp&i=@OX35{^bQ)?1eUG|&=I)6b~tQ6LBu~%rmsC^lr&4e7xO7md^?qLPE5r$*rp!g +z;ING;;uQcC|34_I%=8?&UJ6KN0Z_D63Kc4u>L}2xoeqW_4(8DfulUZsr~QVphhGhV +z;$HD!NlOhRd)V+v3C(o1X?f1TsjVn{S6zq +z&@`3Ej!YfxZ_zc~84&yuc{#0hfh0wMN3~(xg2~rlw%)v=;_Z2z#X2jJ}?tYYrs9U957|C}%l6jn27djgxf~U#N(m_W9WYZ8B>s +zP}!&y)7q4+R6cqyEw5<&#>YCLrlyj(u{2J~AGWqWsak&!^@cT^fEs<*nNC~}*=J-I +zWJ{MsGXpS}1H31h3?cx68I3!a)W;@mp{`${8RKc2f_V~74MKE}7q$&er}W&BwJx}A +zagH-RrlhwMP|=+snSmud?Z8EvsKMUJpNwVX##|>01Y(TE#W-HMSvv$dJ)sI*IHVPl +z-dF_$Qcc@34&a!Oc!O4r-xY69o|#%zDJQ3EpE6@vJfHS3UC^Y(i{<0)8TWm?a)$?= +zu#3)k74VtiMVddgVDhPJYIV${nr)$4tjWp1{8_~t4E^L1(H#m7+m(R7M2-XU8%K^Q +zU`+(Qb5eLDr}VJV>v&TXP|Ol7b0zE;y|^|eBx{B5P%tD>lCch03<@rDi)|pt;5X*nt9V|qK5a#W9};q-eASV +z6FCdzBtW)n}>1qGh4 +z>e>b>shz;#?wE6Xd%u#8F2AsGoVk^CP(O$Jn_|gM9RCAVH1IRI6I_C$1Bt{jocT=Q +zwD?UQJ4e)vi|MCq+}MA~XqQryY%=QhVnJRtB`(iQxsX+MC0D8R9W37bY1Lhl#XBSM +z`bhKP6a#BBspJ|W(p8Jl?hdHmMSMk!C*){HC_W&iUUr>HkXX4bYjbla*fRyX+&!jL +z6p03EtwAT-GPyA<%Vk167%wyMH!l4BW@Yl$%IC_1#k!MQNr*m=Ga(C1q4b*}_}Z +zI;}F>c%Q&C?h~kv@lVs5hLKkuSwR?WD#2(NcTuiqi8wi8m0=JulKu`8A-yPe22dFe +zMpizm$A=9#JK@l}U}gd5jXsZQVM9&@3>Wh(?!P|Tz^F0sfiE!o5`Ss +zJ!m2pH7X~tHVB_;S1^#0Rys+kQ51&}r}KPCALvWwUc}^sGF*C@kM`!OqJV8SA4rOd +zw(Ob6)bn#NfX@i1TCT6ExHkbN{0!+dPX_vGnmY7lfiqVJVTS~UK!W;l5?$Y@^6Z@J +zf7^(c&SImsEq_QIlA06ph#80xhTj~HdT^rZ@PrdaBQu+br@j=R8`K31hbV^rM{+^g +zD|qhi#^{s>j$_Br^j6RhQHr(Mfs-6&1L}Eh!m{5dk)Aq%-TU`ZJY?5{fXsciU+nAW4oe7 +z8@fD8{CmCJ1$K@6U)4oQPvcSJK-H*G&F^wE2TpaLXI>qT96!>P0t^A@|glQ{>`o5Qe8o+k`1E-kD)>LEfi_&(unNg$V>N +z;sj_R4w?2^&{|j+43}U6;TyVDKvx1Si~&9v;l&WcvdS*cM?>@iBbK7Hmgp|ZBkQ~d +z(S?S%VKB8YIO9Nu#NXz6gB4Toh7{TV^ImiY;D}3@6{VI|%%Tw#k_?9(xoISGIrb64 +zQMYB7pyy*$DQ>Sgq4a5MQFmtwM(v=0QTt3yi~H)eOWLYpsbb~>2FFaic1g-NNjOVq +zVSv-;4bq(s(bT=n@TpVxUw3bnu;rXIy#~0!C&*qJr47Ce%5}sbJum3EtD0Bb>0IT= +zKM)VbhTt^(Lq@BDi_J|w>In`0C*i@VT7W^&q?-Hj`IqDWq%EPKY=cJ}Hl*(5IQSKp +zX~{udX!3>83@&K>H29puw@eb-U~O65m|}tZ#%HVqc$9oS6g@msjf_7i&UoYu#T|`;9ssZJT23`_&1Br2nML!j(NmwAs-OlAJHVQL +zuBQjitTJ?D{BVB7?FkO&Nt~<~vlcH@&C=()W-e~M*rq4WW^yu_$nOqTcxRqv5rl5YnEu*S*iLHGW~YsxqvN@nV5-z +zbI`jwZdGP1-Y(T1zRP@IHHo|8h{s*@q!*sXCVsN|r(bJ!K6`%LW?J4TeZvqZE1AXc +zCDQCE^*#NeVqvCSE|~iXwX?T#w6k}3w7IvnopV`X4YR^CeNFIe`*7=E=hYG35FD3u +zj^k3UQDwF~S?Ercv!o7p_Fn96tG)fb!=E+}wx3N|g|V9*pE>Malg*mOlS!}<+x`#j +z%xnMG8Vu=ST2vbcxH3_;3k{9B{k+4529v%0%2r^}@oe=L%xSLBQBToaQULh7p9-4Dmw!M$8&CLU +z94=b*FX4#gm~r51ZU^NgXBoaB&Ne6>D=NOWRY9ziVD92Og|A%bq6#@1qL_7B>?G33 +z1A^pME<3GO*e^H*tV#Fu<*s!4_*kT?CKfxr8Gqu!PgwE)NAf}$W63cDcpd@VHrWN$ +z^|iH9HAYel*~|@fZ~k=gfHA9VMvtm%){Oa2;zzTYx!H{E+){?xoyG(C<{U}mZKH%i +zV)2UJ`0v%D>WWe8GRDbbN3AWV!){x<2Db_fDI;iYbzO$9-^ZOHYb2bbrhUNX&V+;5 +z^&|#j=5|OGjf@M-tDV+=C534!P8#}ErS?p3q$J{a`4nSVdJoL%wb2OqY?n!?BV;G) +z)THQAOFJ;r!411xmsZfxzY59AvN!1)dL|nKnDs|tC_On%#TeO4&xszdW9_e0-muqI +zB1Cqlr+y6j>J>fY=ytvzb$ZqJLBD!Q$9*9Ad(mwKa +zLksdc8Vv9yj?VF-GT}GS#H#s@RtG(r(JP#YgVS*(N+^#&z0BL$B%IM5Z@|xq&UWT7 +z=)YLwgvm|;jvN=L(60)EVYfrUHDD2SCkWva9RqmaJ&T`!vOY258=yZT1xU7I0qg*~ +z5cZqoJzfJ*rfUJus{pr!7MZ@{1f1!zc&lTb8SSl?ZVl~dfOTYe?A(%l=28GpR|vn> +zb2V8su%4BU_Cbm}1hS^4nI2l5xlohPCVh#%(yq9(U>b1Iu9& +zMmh-QJ*9I`={U|~ZXqejI87P?$D@fZvOdRIxy3~{`DnK;tTxn_K2}0QORo=;)K;a% +zim&~!IaL?tlTh}QaZVAXO%tZM+R|P~*fc6$8(&RQi@oh-Iy+IMr#fXNCQo$YDtTyp +zeD%!|2WPy#0{r~V1hmd1>%W=zmAi)%y_?E{?iA`S-#o)cZ-tDz%MT(;0l= +z=<;5g=oU(>0&37( +zlY(x(LP?cYcs^#o9kvCpc5cmaAD_*_)(k=BZ^E4GMKYdR7@gcuKgw>0)1T_F?!Me% +zZ(BPHNVwmB{*RT;8#&xLNEoSivfU-v}ugQzQH8p +z+Da#)h%>%S{0iR(UHIh_JMM2CS1Hz%s$Fh*ziEta24THVmxC5U@Vx6rk(ajsAQgyK +z@*mdfvc(ITT8kT0w97LFdQRCXCFKLzXsMVLjM=&z^@a@t9baQ=#txLoKo%1|7XJ`W +z9UoyDq<1lHqgy$v!bs$!zl`FzQxg~H|Ku`2t4Tcs@&~CO3)zDth8!o^2>HJ-Ph|4W +zMqN=y4g};5lbWD$G1Z#(i)`{`#5}J8T>80e26`BT3v320%xS%!B@5 +zh_PQ`jUH83swsKD^X|pIS|xZknmGUJezP(GfYKj)E0yNqyU~D)cni&Y)Eb2mGYR!N +zq`(~^39one500>0U48e>VoAJpN=xMEHjy?Di_&SAHq=M7(O{2?j+F-1$nxr})Vk}4 +zE|Uu*4|H>B;WHnA1=xv0H0M}aoPr>%(-o!>bt@i0*^GwdidXn#)`KzLL96O;7@bpi +zZodt*#ZPyOyQm?YhM+Z119mPIyG@*vmkta{1~+eeZ0wZp?9mR`Ce~F*d7xd8sOXQY +zYe+YD(Smr9Q~>~ZzsHIH0LR?6gm)oEk75lWDL|@5=wDzp?==&CAr8gEvg6Pf +z@FbeYv$NYQyX4!VE(bYHMs6w8<$G)VN#cSHfj@+40T7|Di9X#OS<%qxtrXp(!c1TZ +zZ9~ZR&|(@6Q5He9qO6U${j7uJrAdhRcK4Z;=H%SCxSywj +z@U}=i10b)ruB)Gizg3rNrwhOQR{M47bn(=-SbTW8`j8v|ZSd*D_W(1-TK0T4(C-=? +zlLGp|GKGn6+S_kv&smvO7YiHe4zR#{Qkp=fOU@5$h&kIhu_Gy|YKdO*63 +zTb;*KDJY*-`YW))El-il5R`C+=vWW`uGivojCR^>ac~+>d3P$!G=XfVx(UMl?dq!i +zfeL-Y&N(M!()PCfOco-m2fupmb7^HLX?&_3>w5-|DlP_4OLz~n-eH^`G~iFJuIG02 +zl+qXUZ}#s+VkfwKY^g!5{){3s; +z9FWcC1DKLS<-r6whi~xGwHA&~LZ}ohP1E5n;GT&&hX!BAb6H&bt&6@}ZZ2x2GhI#t +zw^#0$>aVp*?V@y6{KK54kJzX5m|~hstuAr5XXinD$&#N+lMrZCqJ;l}bos~526cN{ +zY*FYsLZ8Mypw)$v^&)V~Bdl@;{}2s^rLpz1L=^QF<)AYQ^p^3Cyjl!&nzcI61I4W- +zKWl)TxqDq!|8{1V;QwKMF#GK3;l#xJA#Yx^Hna}ZW4CMa=+@8^bl!OxAiMzFlX2iD +z?Po61Vclg`VCBpTif)Zq?>9petrxs^dnd!jlHI7O+J*cm*K6fk`J!-^oU`jcF>A`x +z0eo;Z4Zf=rSA)m$XD++Fd%DJc$9?%q-L<8kI{im$h)IDL5yDBF$B}O@=P^Qjp;UE{ +zGb`bjD7>1NL0rnX$G?>P+d9udUoJ7wy6Lh|)x(wC%&p`jcXyBXnVjR@#Wmh-h!qbi +zrZ}pDYg7BEg9Rq;VId?4QbIfJ%hi1vNRCE%Dr +zj|;xjezGbT{qbiJ`F(+8>~w;3!qQI@WG1oL%l$Vs?Y@kt!cuBmc%7s3f3-10&ZsUH +zeb-Fv0byM;c?dHZsTzEOXgoSgZJKmbDVhqFEOQGQDVwekcH7n)#b@2f4EaPR^qAxn +zsM-6&j`x!XYX@ahvxn!X82Pu@RN%@IY$pBk&2aXUclLCcodmVXSulKlnK(eOs!DU~ +zpBoQM69!Fj$TzQEVpzaH3sy05mHHLkn%lvj`hnMbD +zc0Onh}c80B~uJ*DYNSs3cPMZwZFv$Gp6~!JC_+WPMxZM%_Q>cR(ubiv}G^?KS +zYlx>GdapB((`ObM=0?%Bqi;nq)!t(<>THotlsIFAk{raHPPp3JmVK!_TKlk6fPYnC +zF{@up>jf8`X8qAx<-9X88(Qge&Awk1e%Z?V$W!V1@WWPq`WWjzee70+U$!dzFg2e( +z_IjQ&&OVx@R)FwmUZ&r)X1hO&f0%|p-hxn@AX^lXAAt)stCBxGS)k3BE>xV>bitl; +zbn59~4)ctL^8G!$X;B-fivhfWwkvZW@OHb3${vu3WIE*|%$gJ|>Lp;6skFaDXX&A_ +z(RnDH@9e#B`}zXOfxlR?UFqLaxIGm_byS?*pxYrI*{U4?PLg{<8-+s&;NF{P#80oX +zT=N+17CCAjW0-UHl`h`W$#fhc$!(Eqo|BC_Td<+>AXMbLxaI2yCP*Ky{1d&~QXj;t +zU>D>ho8{iCB#2>?_b|)So?8)*gw`bU^*e!hRAjXA@KOzEuSP;-?Y~K=PhrG8GIJei +zZ3GEeL={OwVjPvkWp1U1ZpLLq6@qDX9$kkf{;b!9#8!eKw^$QGWcczdjO!^%5|xT9 +zgDAk4MJE;ISAhsrFqO4OxfK&1g-q0Iye0_+F%o3qCS=ilC0i}Ya=N}zKamprRL82H +ziUzW{v|F6xUc$pnat-&x5%TN{X(h-H>+qA^ejN +zn{Y|f_$Sw6>}OT7yWLgs8D`4!@m#@v`sw=X{lVrrQ?;H_zx~eloC?3IR_rp15W)>T +zGfTacq{Y&T_9V{G0E6}CM>=;#IaA?IfJ(bl?Rwh1TD3P1q%tR}A>VtC39>XDN(aX^ +z@9`y9Z$^(2-3@+7xFSrQ14zz+_v~4G3GC#p(Zytz!%;YBHe*jQxz+?4a2P{+o$FmoXns-)gn!e6f&lP!-2C&$TZYx8%H5(rJPRn|jkmW?v +zW_+KwCeG&9BmFs1wg2x3-ubR#Tt_jp(JJ|mPg5N=0*<)|Av?b5nKz^<*6fOlI +zZCDhSy-HIk**L0ZKj2n#72*ABG2}=Q%~T$`C)rqSmjSV^EteWG(!Yc~i~& +zk3u%sxD4?Q47wBpklds-XEF5ew2i8%vBye^>LwdK&eB5K^l{2MCa0UTl3B&bHhD%1 +zJ#8|Tc}S|Pec8@dW{|zV~ji+cBr;Da&ms)t{95MZwPNqT4&Uh^46K?AfNZZ;;24X$xu0L52G=GcIwK^{>X`@@Bb?wRp258k7QPy +z6?aXu+z(A^yqKSfW~hyww>w*n!=s%SyKmLj!Ry1_y`3Yv@0EM`7xX+F*Q7G-Ru?6s +zge0!LQF-~+AU=`NKp)kUb2ZqSLRtpe1^o10cOZ15lf*1Mzu#pkK3K!3L{kNFxDd2j +z4FKA7zHT>_PE$$wcAaQxlI(d8dfsE=Z*tE`A4^k^8QV8<^VfWBIbNeV~y6g>t0fPx3?rdotf(6j6J-#0e5$QN~O +z2}!m#`e(0RR$>0N2g^DS>)K59L#iDvl1}&AN4xJ-ACSIHp2E!HDE1xR>Gz}NI2y-% +z4AI?gr_b>AeYex=jG&DlR4Z%(Zyd&UX=&SDSbzOx(Y9J$?PONG2uFC;M(tK`BV(Fx +zB}Qb%Vs-?91crW0-rdz@7_|6Gl9~-TTjO)p3-E!M!%_pBwa4h(wH;oe%Ka!p=7gV& +zl|0PjV=t~yx6>TS12bSyJC23L4LDuh=t?YK4}sf*ew}H-5WZ*sz4(hv){jrN(Lx;^ +z$FobeGCOYOCY-wD1(;!?6_>bhSY)~^AvkiNyLeU^B>O*(4*CUh0 +z*f1nSNggE@(C#|tYB?=naik+o3x!3#Qk2xtIg4t|;@WVyiX|Wm@AGk7FOuVEdd;o8 +zSEb+7(sD_;#g$u`Onwq`kR~~unIxeFj6SU&qrXy>*c%hET(hhw^pd@xkb&#T$;nmx3{%aYZJYri +ze~bB88YF{Q5jH5xr59lzIN)M7jA~2k(if_Lp#@^?gQ}HOijbf(z)xp%hXg7T(J2@n +zW**8@EkRDNeX84;+}CA{DTlAiDd~`ZSw)guiBH&?hNgK@%OpgRq^h9K=j^nrsWJl* +z%g@QJ&q>E(!{mRBUJiisLSgE0y@>xlSf=j+4G#mR!LNeQre7fG`{$E5Upjr0x_|xb +z`)l|9+P%Ma^RL|`dj0cn-c*l&>gCIrJsacS;%ZI~dgASzRXBY?CrizEM`s9~3YAv( +zmY27d3{JbTx!kO>CNBMdLej)jy_=j#7WFeqnPfCp#>5GKsf0 +z^Zy0e63;eAvLu<)Xvmg?=RQ;%k}tz^xHRbZw +zZRP7_uzA+3f0LdG@XImna=T&6E+b6GI_6TuM&dGCgei^Nx +zqPT(WJ-2#x1AZCPKz893E+oncW)@6a_5uv!{yuaxhp6)2=KucOI5=wTAN+)j15%g( +z2R(|wh=pLu*o7#%b7(0HP~X8Yj3L|Ul9Sj@pY%4=pc{-Z7DQFkzNBiC?8aFFS|7~H +zn3YpQ7Sa@S*1;^L)5?T){DMw9-iY)dCpVTV>NV#K&2KKh!Bo*igZVXA+)A?l>0kCc +z1tXLB6h*8Jkvt2)5iD-FRVlCCkA|&bVd +zVfSsuIs$(mFf2m40{ZF5a4pK$Df&Ke!f6TdZ>F1SN)vd7lDE|Rk|jH*5ZkGSbLi~M +za!)m!=1{RxFzKU!sIVl#hb~h3@5Ji>^Rni!%}R=KWl|p`-$boXC(drseJ+YF?T_vA +z5_XflicKp1lt*lZn2vPMlNo9W+qReMOY}tiW`uKvY`JJ!Vo9U20lh!;qs1(zRvC44 +z;H(Kgux9PwxPY5748588Ele0x!u6InHZ4)M6knc~KgrH=UB;7h{Ta%HmP-Gxq?`7tJP&jzXI?k!q2MLr}G>H?G0@SqH>VK&Bh1EmOm8R6Zph{6vmEX&H`o*K=U_T8 +zw7P?o%nFsv0RftF-0R(Jlrji@hi{zaA`}?Oz6&MuPkzR8c~|!9Ti27)$=%L*R$6ra +zuehG^tfq^!!hz%3PN}P|#u~_JHk!@GRo6bi@nIqUIIdUT+kVg$Zz>rb7LSGiSEh9! +z_Xpz<4x!Z<)~n7qGv`ETnxcC($VL+Fs=>!G`_0=I%u?cVp!&8zDf3 +zX2YsX%u*?nP-KE4$r|`Xnk28n(=_3LL(yw73IA1Kp+4$Jgdt!-m|jaYyQE(uSeHV> +zwL5SNT%qXXJc>qel!C!PLb73H?Nhqd!BciVMk24w;c~A!(9}&dMlGxhV5>(Md$BVB +zvJd&EYJ7?H>4t+sL%5fk?}7_Kn=VL +zsb7k#O942fjWd?oRE3DIRE8nlY$Yr?42R>sM6<&|v0-`>F6L2agX|eU-OXWVK+|P= +zdLDeE)30-oDwz$2mVoQ95~4Q5DNMRpt9JUe(wXpC$=Nr&1yCm6Ocy98nx9!Nml~h8 +zpa>w44tFEqus2`vx~&EfkMxH{#K$|^S{Y^Y2>!pp$xvu-TkY*Pj@ABab^K~)Z%-Yc9PJ+J +z!T`GHTNcrq{-)dDs;f&3MCPoLLTFf_hUn1o?>xN&-O}h1Da}S4v_mKJ>M{ZvUE?B~ +z-gQE4=@!yq2;4{lx|BE;$JOy}I5z>Ebe&U>CP9FN$F{8<@7T6&bH}!g9qib)ZQHhO +zd;T$R?k?iu9_}J4`k}ijqMy2=vogOd0iEus=afV|YG=)2zxHa=n|On)6!2a+XzYAq +zS_g@T>{Bcs;VgJ`%<3Z!6y=gkL*&7N|MwR0_pw{x2vB;lf(avy7C)OJusGg{;n09e +zRq~e4oagnxu84`bb;@%pRTCv>hD07OrdSZ}%jYb7rn7GL;Keg|DyB5aad%89fG|kv +zv~LeI;tggdzA_b&$wVBIQf+xEO{8=cQ#uz#8YZ#m9m*{!zqi=C +zvOrD^!bM8oxvGxywU3gwxe^pDRV#nvXvA(&!K3@-RKmlL; +zY7YI)#RD1m4}7Y?_7%GYIiv#oK;P}IzL>CvEzzLZ_q9$ZY=GX|7f5`z?!(AZuJV0%?gC;#{yIL<=ON +zYNKDUwc~?mBA}Hm5@Ha#s}9Od>C8Ud6Un}B!aedb1g>JH;sH~@`!$uhq-=nN>#>R; +zb_z?UZ?ngRV`K#k3Vu5zr@)w?!#L=S{nkBNZ~zX(Co%)*!_$N3iTMS(%9?j~M~l}z +zbI62yomYL2lXs;a9#B#-0(*>{Ys>Z}@R;k%@#*cZJEZP+F!^;O`1vAAi$#h7wzj~G +zYkOVx%S>%ue@UDM%4#H1EIl4{A(vgT9RVAP^RFvO^Fx|Lhn|6Y&h&~5t%?Nfy{$xgjrgVWS}~L@QqA952u6M +z84NHXwtBI*z#@Z+#+@5u_hu2#-@wk41^Rq+x;3KFT_Tc3>btDFQDWR@0^m6-sb_$d0x=R0Vt$!eigqcQsO9dB6<$XxSp%!wAVi)IsMFO6c7H}5 +zsH<(K6h{b>0jW{$3kq2g$FJpO`9!XXYkk_-(5f;hg1lV6()E_SMD%~Y*7l#OjVKnN +z1Sd-jM1C`Xzz0$xTC$bEV+e#zm?pH|S!NUc_Q#JHh#P1*(0zh5!^ykS{?(LZ`S=K* +zXG3Zzylr{B^n*(D>;^cx5$@>9As{?0F86&!Y^7v&P{?3Ggt5P2P`)W(H3(8)BCEtZF^;J+En!9R890ROd5K&_K^>|A(#UKvOtheBS}BQdmoKNLHoSxRW_eeCpTu4o|=Q@gZ4&->Ot^EcgK(P>Z2t?%Og(()Rkk +zV@KV0It$bGh4VcB&l?^tkXOD*>)r$#BUAE-huLV}+PB!o)J<$R_eiS~JBSX(?U0-=R1v>SKU>^JKFQ!sDw4kx}YFv +z*0G`+BF&qBprw##;l6N9m(VBC+GH`rqF)nL-T$gjdE<%_CL8zX=22%|@aIr$!T=k_ +zN|YQFsD55uyA`B5Qy`(FZdkeq1$RS5kc+cfJP5jDWqh?kiYRH00lLILIJq#G2p(<& +z?F;btds0|8AO*S;#sWuyB*U^+CO?TOd{k%78mscjb`pg&{=$3HiY39_Jcd|Dt+TE1 +zk=*q&(i(QUrsTOfm{Y<`xI}La`g8hgGhD^QGve!AE0Z$EmCYm< +zkBNxu{0{>VFb1WZ@5=HkyT9UUs1cs2MVw)Gpk>QTB#herc`Wkmw^^+#8tEr3+xNA +z;{%BAm44xOt4acibD4H8rnz#Yr7lpXX^LMpGd{8*sOIejKco|n$WK@#9~St(tZ&`o +zFoMm*S3h;SFFJ3X7#~0UA*gb$6y>{ml2QDS?^9a!h$hOa`{TOZSgrX-UogBY$cE|Y +zWl`2Nnz$6&VvI4jq(4ItYRZE#G~$}R`V~Zxf>99XZZ2!sEFQTIo_uoF5Y_o)Qq&?- +z?gp~gvgZ_zSh!=@#1}T!ZV_^N&R(CgVzw|sK~yjwLxn*;_PF}|L0e4O%n$I0fXIq1 +zrU{WL(frH~)2O{oOIH-$V&k%YWgkWnn%g(&-%rJ_;W|K*0AZM@kxIL)@DCM@fW$X1 +zZcY?5_A|-dd4W}gnq?}6W|7*j-z7a(L)nxmE~2Qv?>v7DPJ1&2+zb7KCJj4*LbD(x +zp#U*COS#&cmlc(MxvFd3EF +zt%>te3$J1I2I?0ET1+~q^WWHB1Z0rfZYWd%+os{ESaQsSVbDYPpx+JR8s^f~^^g;1 +zCu-*mSu~#rLB5eszt5&E+H&1?h4Or&2L)i$E=BlvO`QuHOfMqM@*ae5hy>J}#+~ft +zO7yUOB3%FYD081xJ$oy}S|rG++L^w}+LbL^ILRfAQW5L|v0Oalh>`zTj&pQ`N1mF*d8)nmcVy`Zdd%_{~ +z9!fzAlPr3n9w-q)xvL8yK>CbrZJUE9caz3r)zZ!F`^RGkVBnku8??(Kx1*AUO>fB6 +zVZWgb^9Xok93piquC@wr63J0mqfvevW3UW6cBbaaE>^8vVubjmk3}-XLNRAN>-~G-tzRSwJJ2+Ov=g#0l`K)BNAcba$&6+NFn=6e3 +zo`GNiu1MpAxj|#azbozrR4Y899C3Vj`#%R(!dY|oPfO%){vLE$8mrr(2sWdC0jlgM +zNf4gez--(FIr=B!606QCE6i%w2`XpJqvWPF*O4l7hqVZ^XPG?T!7-cC4J0%<2Wgm3 +zPm$ooh4XB;A+6OkctMdx3svDniwVW|d8!IoiHev(%DG7IA03AJvK3;i>{P2eRw#sF +z-Ei1Pd=u-7AJP-Er_dbMJ;1;MuMZ8iw8|W>JH3dqFOgr^UI&7#UNf5XxAkldK0*t* +zN+jRsnk6P>VqQGHdI7uMJpDzqUKIgv-$&)azq<0c*S}~fJk2v*Z$2p{c@7qzARNTm +z)+}r$^V8WYoaH^bt)VCD?jIF3XY~?Bm#OIbk3CR_fBv6v<&YB$>mnjQsf*po5;@=2 +zpITxLJjOJ%K21pft065}A{F|UTgkEwaFHIUb-m^vjv?0B` +zxV0(ZI|HLtSN(Rd#e7JrAKNG=+MQBX=imJ${K(ZtuGq$CyyiM)y-4W3_L^uBhxFU% +zhd6v{kTi`>#f{j5(6fdVSZC;F^bLIrG?fU^ba*kc&LG)q+^DJ?eIXMB7t_fr7pBHC=1AGLs(97O)aZ;})p^}XwKG7eH8mOt{T9O&2QVRl=&uLy|fxxLWh(Ku;GtAaO}hWvm{!D^`s9AEZ=YT~Nx +z@VT&ajVMYL6eQ{y`WNg)82${sy%R;6&cCL6CFK}OxRexcEL;8Z%5;So>z4I27TvO_I3c)<7ab$^t#SyX>6r>jbtFGDXqks$3(q5oaD=!1**J47#@(|Rq?69Ua4X0 +zn*@Mp8!uL^9!YjI?R_3I;ZD;UtQ)uN^i+OQvznJ}B~P5Yo1NrD9b_elI`JF0JJUGm +zsaZvQRXKc3jMrFd(q?|wzx|v=`gNGw#+IRaHYRiC4SJhq{G?LkPVN%VZl7_yYxt4~ +zV|GW@4>T!o203Q>%+1{*w>AWnz9N&S_oA1{_+0Fnu%7Br;po#%6908QtKt2`KLALz +zlk`39Mu++K${F#di^0hT?fYHoHN2b9DYPHhDXM;(R=rJ;U_iBuoU%|}+}?zVQ5Lc% +zJN6quAjaUqOzF%0^9tR%`NqPeQz53cMwF>^LkYn&0->{OC`fXGf530GMqG(7$z?$t +zWy|Vl;mror=CrE5&X0xQM~Na$H|E^WgN8vOFlNWx6x4s}B`nO2jTh8Wqu2_iw@TSb +z1e9R$ohyo+{LVgL+y?HM*u#A|IA1u_%99k3+0#5dwUji^F34=D%ou=z@tZE;Iib;@ +zR*ye~QB9g0KT9oE`U2rn9)8nTjNJA#p(}3&lsiwzX-}MUi|Jl_b|g7$-GQ8ngSgib +z0Vbnr?YXK}N?a`w1mw$_+Ux&RV9&BA-O}YstzGQkI#mRsA#HY}o{2$dh&w#FEbFLVb +zaYS4afOeW=A-yc8+)r4=WDQi_6jcVsc%uy^HfT{^cJlIYaB=coVPZ5Ou0A`Dm}FL7 +zO3z*3`qF18(z+!Z*E$tHFU$>S@G2t)IIZ~;Cnl*ERjL7>Z8)@LoD5pk{Q)0{d3XG4 +z{hI5k&=(FN>!>3f!~O}Gr1p>-h%=zpzeVoTSYa-aE?AfniEdEq5L`)GzkHGhm=$V4 +z@4-NrlW7WEjmm_j()9rC7$UzIYJx;}MFOV!6yYe$Pozd0^+NGPq|W6|C{Y^m#Mjl= +z^||Lj_8VIycOyghb|PX{K^e%#Sfv*&)1dxT+<$>O>@~CN5kXm-Un^_XnMe3Vy?%lc +zv*@XFKl~Sgi#nPfmQr(b!)^Wctz5Y{UEPbs6(YpD^r4}3l=wDag{AWyWa;d?m*2h` +zwlV$?zjz^<7<8UE3Z@FPkXy@Zbbwt%D#7O@#Tq@n4dX!>- +z`sNNTeGj1|TiZlzs+_~BBl@8NSM@KREXX^u@y+J%lcPOit^mUen)pRx(0^6Evl`F! +zD{Uc%RR!zYu(*APR5Fi=F@sKV=$H6|;f%q~i>__rxH( +zO#j-T6Xg{yRFPrkP7mXRhEYJDcG>ao(?CK0xa3z%;CgBc_0S`qQCf1Mvf;)tlQBin +zed*O-tDw|?O03frW)_*JP)B^w%z5REx>f#&kzE#|jzC};L6=goN$2s~jOi)029~eu +zXg>Y|5T!GqXqEH^qrE35{jo^f*-;?}wY^^-ctyBdjN@epy^l$>RWvcIQD)+%L&*x-&645D5aJ|2BVVyF|TAo4f%T7fP<55G8>xJ +zXw9?o!QkPY8*ur{t5Z|$`#cJ;*B!gF#~*|*jX6i-c@P>do$CR5+r)v#y*tv()}Mu* +zV4?EOrAs^8*wo%w*e4Wa*3lY0WZGUH+D*X$Mw)NYNeU{LG2QdSVBUk$KcUXSQmDHh3qY~p%fX_mi_c`=;bg9g +zub&uf0_tftbjzFyZQCFl*yx$#;9J|aWI1&RIodRNN*tHvaFHycH;v;+cYq&2(#O(X +z9)+VbLEWC`sdap(NlKJuw&AOtzF~G%;YJO$QuKloSKp7FuGxhkUCJSp1;jw=8wkj{ +z9h|9TV>y{r(T#iIMBqZQd@Y;mf+!1o?pA1y-js;E#;;-M0!}T`f#GYv?`B3Mpz^JB +zHlVtRLB!d}57-ZDwKgHTl62zXJA7-4T!H3|$Nx?7MA;x&L#0In!0rTxcsgkq)EGI; +zktK7CO$SW*{jXM<4$_5hY`G$;=_wLJB^gB8=z;o#V*%zR{Uk*{z-qfv3<)gq@Tn!|fW<&ILky;L^INW4`;GWfq2rt+KmZgjq5Bo3S +z`0h}8P+yuBYnbejQvpIT?O8}F*x}g!_g4oF4129xxEIBCQE<}Qoh>)tBOGlSW6=->y-ZL; +z_Oi3N{GwIpwYO>5!C13MNmd@N-IEczwC;FhSioq`Ggy>P=iECS(VQTU%sttEC7*po +zdd**RJSbu28m+QrcW@mCnFv8j+aoLX1kdzKZl$aj6q>t#K%HyR&V<}>YCRz-Etplm +zyfY9hl0Ru=e(@1=FznqRbW)hCFH$XD)OH4!NB0x)4gwnPK4%{xeqi(j@vyetti_)@ +z@Gr$q#H#Dq*`X`D(Q=hbIUzki?C+f3xWVFLj=V~tXX{yBT;~}GlR80EDkucU`;%Ic +z1nyx88b2Jb!A2=IcxL6!mT;pP=vtRHIm0G+5B^pLy>ZqhMw(aa#5_xmDoVF~Lgtvvy&Z-m%9*lXfARXQHV +z$SFM>x`#C{VWWDYHA=woww{sOccH^QU{4O8Dedcixg$yp3g*5NW}s1kUoMHJ6i^>t +z?H0-z9m+~vWA$mTg4;O9Jz;WPN&)xwWR%Twn2DV5TSvg$<5wgxvs+}U$A+R~)`!FS +zN4OR4&R}D=f@}ZzPlgmsE3VEaO2P_u( +z>4Lgh7L=eyUU8{RP}{~hwso7kh2(vu7nffS@y&@k +zhT@IiJ)4lWH}2W^#zOpFx5O$hevm<$D>M>F{H6hXJ^=TXV62khYA|n35ne1aS7yin +zD1Io*rz9J`{Y&EIW+ws!h7Yt3Ig?#BeqPWta#SL}bl)PMQ=Lf2uQZd*%iz`B7*^7k +zNog`H;`wKZJoEPu3MHU5+P!9h+y&a(K-Zi_59F+I$()8<%B9sf=p#kKqbE*`0q^#= +zPx4ZmBxrkcj!ckaZF0ECf(5@O&TSUoyq*|0SUce~0W}3BOmWqxzm5Pv)@XE{@OgS5 +z4?~cO+3ZnRwq0c38v_}qtcqNBUORjlHnP)CRl +zI5-v7VmGRq8+Zrw&RjHx?%ll9YD44OxchkSTw!7)1t*FVH&wtaaqH$cCVX((hRfy`?65~E~ +zX=ksk%<$x8@BBcZ<_KL;5Qx!N`uKzMHm5A~2azovb_tgYwg|&hxIwAQu!-Hd{b6Jm +zog~db_bwK(2~o&8TA|gc)#<@=&h*QW9~?M;NPtSs&b39+!RYU7jkd`1 +zU#{IgkLTfw-2LZG19(nDSXl1jjK2z*tWxlvPc=@ijU) +zHD~=hZzh@0{Xl)~h3)du#22uWL%=ZSJZ#7Se`*rEX}*+U&d{4MEk`CuL{Y +z_KqI|=v{=n`wBt$t>pZ~J`29jz?zDpe&T4YSO5~#NM#fJ5BcroM4R|%r|_9Xq6F_b +znSJYvsZ@38r5|A5DE)&JN7lU_5{5H%9Fr&p4I% +z5l${KB|m`}vVCJ)orJA$3C-~KO6Z0Q1^qlX +zI1u}~5LQ{Xt`j#+$i$UXng6)@fys +zD)j1^f3U7(J(;IxXtpz^SR-@x7>pMO6!Lg|M~BB6ms~XnZ|CkZ1P+mYbNkDC#9qzM +zywC5ZBMPMk=%HHif5Nd}RM|aQ)b{#lSqk#FR9UVV5ex&)))t0`EjN=aEDE#AG{&4k_H#hq)xaGRp|60wy>3xcashg?V+hfM5&%CDGmDwwti5KC$B +zf`op|3ATpKTbp;XerP%s_)HZh)#A>A8ha)TqqEMndEEFeIp#cpa`z9L1b%=;WhBXp +zHta{F`HX?;kbyVN>}Dj-uXh9IaG0Jo!Fs06(*uh-`(z+<+eP5fM;drwntXk(FBR5S +zQi-y0bF9-|S9FcH{!0d+=g|~I&>i0P(10<9*_ie@(Zab28SQW5qq~%zM|m~%?$Ij9 +zV-;_>Fh(cHPm)$UF2rQ*IJSI0Q4?=&&$|>=7Fkl8GeFd4TU)s6^@7cfQ{)phfYE8|(UBwVhSV!HOdfaO!P${TvE5D&;>vnWeURtCC>{`|UGVG4=#?o(eI~ +ztsWH{KN_l45?hHw<7cY5>FZGJ#VE67T8w*2Z7&t38`jA036@BFfmdyrQDsJq!?N!+5Uwl|@Ft%Cf +z0j9B5oU1Gahkn48O@(E=#UWr1btUh^eXv4k6bA;#JuC_WzYWnF#_!x`wPQ%_&#jN~9p#MZxrOrsa@4PTy~*bU9tK<6IJU*( +z34E9ci8{u)fvm+=6GBgCj$P45!5DnW5fGG;GMD~uOBTZj4o;{8zi{(c{xNac{OVC? +zwSLqT9{fyGB<@K(vb2it!pTf=mbH=)nfyXCA9g!sf$E<+DPm9)j(l%7)k`^}mSXvNhFGzfNG;AgI^I=EH(bCQ0eajB7=I@#+ +zoQqJNS?Dn3Z|7UdikxflU#)cecR)4Hi!#;DJC7QfsEGMtvky?9Ee(#l9oYzxo-pn@ +z;z(d5{;*bzv6hI6idL>s%ko&m_izKF?L=P>bfWLw8|q1|vcSI;gXnvNZ|sGYzo*RJ +z8}QhHpQ$)95H=T<>?UHCZ+m?JjUT6Voc8tWr>RFbZJT}&t{FDE-wz$vPDH<*6o7R< +zDQXiJzVCCQvQ4ihMx-Hu-dcL4?WMT<28{0i{wbn}8L!x>E4#ly+Ez +z56OA~(6;7AbWIg(bq+ldy3JDcy|!*eXwBw6jRxZVDvvNZPn0ds`x3Sjme1jPb=(fQ +zX1)CXMz_r38~Z|ShUCKOSrz>07mRE{$qvu!%{+_aBQSJ@Z~giX=G*nNrd^R2S=IkJ +zda|7787`jB75wCXDzA}Wx=H_*9nruSZ=Rs+Pu$Xq@vKkZ+ulz}F<}^#qfZIVJPgMw +zd-ZF|ElZ4C^?t|eZPfOQK!!laW`4D@eLA?en@yVZRAB3!H@o>x!XgNOGSLMqp>|ej +zFQnl~?)z0u*Xl7u=twx{yvjkURt^-W_1ZovqI|yFXyj%f-!fguw+nUNuL+z0>qS%) +z?xRlvxqI}U^lh8{?ZLy62_zCC2q5Y)5>8+k5+Wxp&U1hW`-oI1^NDKaR<0#_Cp}rs +z{NP0us3zNqVO}@Xl!}cE8E-2RlPvc}c2F?OZ@WL{INL3}n8f-_gq_IwcHdM^8@?jR +z@dcQZGf&e$ZS8&=A1XsD#iHM-m~C;*pRvaf?uc`_gx(#AaxGaysZ?K#deU`cu;@Z7 +z+I~*h2_EfaBz^0ad9S=QEtl#hD&!#H_I+e%@zp3zn5kH{94Hy&hQNF{uj;!R@KZol +zWOxvIKk7Lg@V%TL?p6>016G1{A3Huez;qtPvcADm)Va7v%hfLt>M?yFbE&&d7ILsM +z!89pV^2R;0T{yGG3D16~Oh0n9uO$zUR&j7y*VH=!;G?ta+xznLzedq* +zF@(Q~1$x>~Bf%gK2IEFeYUujsOweMc?Pe93oq#`Exltn?W#dm~EPjVh1=8%+eQ@~^ +zs#(qJP}FI!J(?P~{M+z8ThFq +zz}5ABgFj7(Z?EZSh^2X%US?x=m<^LN8&S<4*BFk@Z++>e)-R5hFqx*Y)~7Y7%*h+f +zKE*uWw=#FK^C4P=(E31h)2vO36w~Osi$zZk4iC3VnHg#AjNe8cQ1AK4m&ah*0j7B; +z04zEMp&c9RiH&uSmSz_@BX)Z1**zX<0F9{cvsz#Ia{1)$T;e*`>z0_6AGeUw#18M< +zv4e+;3#~hS@<+D +zE*-2x$c+B5sx!;<-habnxhxFp#P_g<70e`o-6aR#nL7feJx5B0dZ0nJVFqZwYCv>^ +zGn_{}v)uL?%dg+ws6RDl7 +zG#6TyJ+JhZA56y6ne5Ox;23f2CLII3Th4Qpb&*%ZIhtok5T!`gt-}>e%e>NNyJSxF +z$XP_m6UjxsNXit%M*MKw6g)2%$b{Ei9F2v~`X$e1(ax7eN7{lb(WK@pPwN&^kv;-L +zTV$Q{N_ke?jh6&I)0M8CY%?agswgAhi;%~y_Z5{cHq1Ig_ul1LqK{yJ{y^tqSBKf2 +z_+X(SIo`$uUQQ+}2A(=Q1pb?7kQoWx-aX-WDU5`C-hlYtx|~Z +zN|(YJj_JaGa3%M$uXF#jzOKjCTdFTqpL;IzRywk(^_TfKl`Ui5Z{Frq_Y0f2%g)2U +zy(w3KQa|Ks*=||k&T`7-7Eow$THM;}N30(Ij+WY~k>;$d9&&T3zLfn&mDgX;^8hLa +zOp6v*EjUYd)3R!&*XUYZcUxax+TGY5do&Gw+g{M{ExGoIMlF~j+P|($`r5hO$Y*rf +zbnFJSiZy7iq9&VeBDQBm@Wu9?f|Ew?;fP6jkh8p1MTk)}7J(yzg)fMdoot0zlmsk& +z>)3Qz3``H4ygr(WUY3RXmSd@&i4W{kV(9@zvO^mAvXV}AHQ%3h+#ig{1H16+{`_Y7 +z+;6oI+?)3K2vMS;`x)>z^o7HhB +zfhlzWVV@1xceQ;&^;!^io5zC^MHp6FlLk0-Hykkc$d7a1UjkK=tP(Xs6o{Zp!@*nm +zxTzK%46HS3*a!U)dtsRUj&d+{QsV|9oT0FHe*)-NZgyxv1;Zt`jmmM+M5=S6EJSm7 +zs)t)))abCoDuG*F4wP`Nl(++W#;Q#PLY*s~hic3dInFQRM6urRz9Ynx-VO%5L@IpR +zfe=G_PeN*eRO5mrY}L5FF+%yYQlbQiXL}YRkOGq5dU<38YQ=~;viNMx%z)7)p6WpW +zE*U+XiP^1@_d>NLrI`klyV)ybpdj`IdnhrI^9voHkRswo1WpJGq7tKuAf{BK0{@p8 +z7Od@!=!wti4P~?TUQ?;T#3N>h7q@4X0iC%UN-U#R7(~!C78}+*7bBaK3)Kggd?1A5 +zkkp4l(MD93OqWG3H;F{lOjE+HT-XNrtb~DiiEJ&P9zbw%5w#*^ua$*G*z~6y=xE%z +zr@0?+Hw3Q6{42NFI6yNPf_uA5F=!V;z=9>vWBl?{bwqVow@B4kSkSsmDPRxP&L9OI +zE68Ez%Hh@NA*|{)WNP*o2)2>6%dnf_k3+>=Tv4(MF$7<)9GnObiDhpvxInb{4G2=i +z`Up&g@QS2)E((OiNgM|~=_ry$af@sV+9h`b+Fzc;2408Syb#}|V-B4P6>`e~3d?Y< +ziwJ4%uUy`54nF_k>X0mCx2hEgEQZGMLF|Wt--#F`9Fhel)=+KZ6$*K8IBatcuT9oi4-slDeCtYUmFp5{m_1D=veZ03n1!Hd{BCy~)*O47w2WsC<9 +zy@8%&5w8E41X0>c(A+gd(4v)tG_Vpi(kO$$3<@HQ;VNJRskKFvwfo}&^PN|x4W@6R +z8InAfkU2!HPD04;b2Sz6u?8fnU!GK(q*UgrC~^Gh>e+r9ae!b3-M1{w!K+&-oJZ}u +zC?~HTK=1|nEs$YV6w?&YY7LnUq)uLk!=%{&6V@fGa|gh6akuY$PfjjIpDSNOzb_fg +z_VUf((!lzSfG*aq73$D$zG4tb<`y~HW_}+}6gqlrYUghUDk?>sKa5ekc-O9wX3kNR +z2q`-;`MrgcU8)C?A1v}tnpz*#+Up`+>ZlN^L($8wE*AzSgQ+V%--~;`ZhueS7K=P`#CY +zUcptEN{lhf;p*u&fxXq%MWwEqnehuolb!SWpelr2U+v;w&ik#O+Mix4n^v~*TKZp4 +zpKGe%`byHOZ=#o&K#DnS^jE_}^}dLc>u@2xhPuBlb#4eRZ+1QHQMzi>YF0S@+#$9{`KY}Ii= +z#7B9Cz>z@J)!mIM9A8Z%aZ%vF7qteTr7L3EuiI~;TWY?*nu6Fzycw>-Xs53U;mEFv +zRa1ct5@G2k$C>x;r(4Z=qa&iUVK(y+!k5`4I}9tv;2Yb2tLG62IRJAQ5*cDltcu+s +zem%z7Uon5($uxy3%CCpsIZ`9kD9{Qx39!PWT{6X`17|yFgc;7BF##hU#8d^;I!83L +zwMT{(U89aoPUVEkVp&x7ZyPuV!S~^_;v`t1Vlg}4^O1u3Odgll!aPtjdehqg)A1mN +zGH$}CrMz`xw^q>Vi@O#H_#kXolb&h|XLA!9D%)R#PbA4m2<>a4j^vSJO-t4}9pAFv1+{8llghK)-kM(GHQs9p5kL +zKjZo&wD3u(f~vV_6@Hh1tKb8X!r(RhnWMb^$Vf$o_hJjw{*BQhG-W7)4z=O-c2nSH +zIAPP`#XL8*rq3Q&mc1}vPT~jFC02k>6vMr`KCb84Gg@LBu(Iyw{QK))++;HuVzQY? +zG6Jh;^VK6*coGdMiG4;a$Ev^0JsUlwjWOL#aJ{?(FjPsQ!atAf7b)}@{j1BXy}x#G +zFuBOKIfcyP2i-|Vb+?h8=pF~|qxo`u+z*y=hiKt@vJ%YeOhK7iqnUN5)Z}+Gv0A59 +z$Qni;1JjHAly|hN;M&acsjw4{kR_u +z*@Is_SbIk`FSJj45Acn>yDNc=>xOIOn^GKap4>#lV9!LfFX44iV*z;;@!` +zkH^<~pJ(GCX#F`6?xV<5@>n=TB;^Vvepk|+l9))Q*3m()R5;zrB%L7x0w+iuN#j3k +zVb7oFRktUmzS^9psFnivJO8}>DPdtbAq^ox4T#@Ako19rCeJg-FHaqM+5^m|`W`np +zJj6@g9!U^Vu29DIfBj#he&gH6U(#i; +z68pWzoXj|LTo*JbCJk~59r;d*ozKefmybRQ@63*+W|>M{tju1RS*eirB?4zkMYP;5d&VP5p!yGo-a +zmj<46+Ow(JeXM|8dJJ9Z8Iv{a^s(l!gzbqEs`F>0S9Ex6$XCWCvIBoPM~nor&@{kG +zg|JfAEze^qeER)`s4toPkIdyQ0Brxfith2rIZusScXHz1v7AIS#H41w-Ya+$lGw}y +z=w3|d()X(6e7=l7RT)e63K4xpg0H|Ab7a+ta?LlwWY2H)wUH@;VPcZR0p77ZHDn)5 +zPYb0!cadIATb!offNP6X2?ygBjD3QRCWukc7p}rRxBo$h3pQNPG1P3I;%rauMIa$k +z`<{6)HBXUuR%tw4M~jmq$g@{hVhyp$gj9!UO-BAoEZxSrj;(ayBAPTo@EIoOEcDc);oQS~h|Ci22G5qjCL0eAI_h3EnK>XZ +z$rVjwqC}&TNmuN(yw|+~sP{f7XQ%U0l(tuPTzbgq-_{Cj6Q3sp1PWf*P84+}pRz3o +zbbccLlcz<&VL^$=SNpJBwL?OrSdJFgJSF>;c+^rmgP-rcmg{{1SFScsi)aaW6C7T( +zSGxp}>7YwMaqoFP=ATj-MSPat4i%EjES?hm1WA15z3O)iE5u_wF3s?AEo?`bEZ +z;)I2^EzFTel8=VG(}^7%;gUEa{8AV4XMdnT)6&j`NKMq{t2`+YHGo-{B`ln50L~vK +zx`I#(CWcSE(@3|cZKdNV1wAMaNne-%7uz~NU!6Y&Sh-ctFaKtR`LI`4oqF#`Gkah( +zqhLMGnGIB$5%hYtH+SfuPv*?{g4GjS!q@*=-SZgVd|&&j>Kbuudt^g~d+|DPnEj&Z +zy(m9iuijO0tB_04siWhb%DS)%n@8v>2V+be%1O&FY`WPsEa +z&F5rx8xy*ThVk`@>yLI}= +z?J(%mU#BjWN+4|gZg#IebSd0(lY0fDa@ZafvV`@XiV{wDn?PP?8M+ABU7`Zh7+Xe# +zH)}a#J!v@%H05m*Z;xGco>-^ZErB5j#!L-n5rU>$zqXF84;?mqAgrKgt~OGk-F{Yl +z`RnQV3DGmMbd)tawz>tm3^3QV(9uJSOyO#4nu_WW=kqJ-LGoSzrUk|cWGsSXx!9&i4JNHS=L?8vA&u$j6Mr +zNN}<1F;^R2Wgwu~1v~Q9msA>Y)3yxrzl)p7K+zF};K=(+F<_jB@QspiH926u&`WSC8itMn2tPd%b#;(iM8{Vr%qX(gx1klz0^)f7VEkAbw +zxY$D%3~B>M^eT*hkiJvbBQpkbq1u;{iqeMysb7eyAur6Wm=T7J_PQY2o*2Z6lx7OV +z2Etb#WEWBx5N62_6gsSgx(;(RYXC-|!pw0(L7iCC;QB{Z)oL5ZVSt;%PLWQWnTscu +zMBog9kO#VYD6U(W>Gif7;)_XB+C +z4E8rqXK9j73NiMM;Y7)_$NTc(Xvtyc>>2&0ib_xb%f~M&uZ{Lx@3V)klf?f3k3ew02!ABSQ73~8 +z=a=N0tVAlgF=)WV`!QZr4Fpjtm6aj2fc8ekp@&8Okkr^D$6h*I-Z&i2vOgrZ6^sJT +zk}uubO-y=y+@SfPbII5U0VtFbUV`p9Y6e}WkoVh;&Wy~a3W>ov_J`y~-IiCt`)yii +zN4h$FNjjb-O6Cu}pL;;$oiy;>qw!`7ch*Ztm-35Ps1U!}3>)%8a(DN)Y_9zwxxgpe +zT>C?EpYJ-k_J`yiZSF&Fki#F6x_JaCn@4(V`#7e3owvQci%&Y6dkq2QM2ekJ+L0E_9(=kvK;XBcq0Z!AZhmAM +zjdY9bGZd2f!%H>eaDVzGcr5mZpKHeB{r1a5P6uXG6hi=!0{(T=%#fU4UOo@Ve0zCj +zIPOocL}Z&bW7)zpw6$d*pSUIf+Jl!zo39D{y_7_`qz +zI0ndhz4=c(r25m|6?{#=Z@5JH4iaBku`!Otiwf@2(<=U*7G +zs$3AAZEYNgcV8`&-zq5Zv9+PthgHAz@%KW4baP3$qO22{Dw((n)ZFbGVE@~W%r?#_ +z=nmUo6b3`eNVsvz8D`R3mR`?9lnQU9$tWkQY5gMZ1efqCx*g~M?-Sb5zQ{Eko{8|0 +zf1=>=%oIQvEb?NTGz2$W2mSXgt0efHx&E$-Mg1@Y)S>=l>lH$AKX^&7bltw*AW7BD +zWQZx{6`@H1!2UHxp2oQ3+5VrGhld*^ykRdQxFx|NNlIdMzKARl?lNm7bmUEf>@dab +zbr@2Ju=jASwE#B&A4hHKFsLXs=wV#0SS@hIT6N{|qW897pT%JI?&E;wK=BbDX3Q@| +z8^|KEY3U`~B9IxvyVywCyZuI7FEt0MGDy76nM_*0lGxj@3RSm1^LpxLx_u8H`~CVJ +z%_i(HZD{Wuiqk6tU{mwDq#}(0zA5TXdHGtv*+R{)zlNiSt>CXj9Zyk!t`4mm0GS2Z +zg@UMXg)O?B!Z;Qq>0U5E6ixAKV2?3Qqii@_*N@C|naFuO +zA4VTpl17Bt*H5tC*0JcaT0bGEn@n~pEm!+l6gV;W!Lp~H^>Y7>l|rpmpL~ZtFZ%C+ +z(IyG6rlW|kpxQV^Z=n^wHx=C^r^u_F&22a&ZV^dx3hnLg|1;4JB{@apA^6xSqLZ*x +zk<{Uykyim(6sE*s3b)e3cBPf{W%Y%TO6!IqVDo)C;G*|}7Li`ngd%UkdrZpRz2|J^ +zG*zDbo+Y%D9i6SLe#CK3UQgQB&S^%SJM>03S6*L~>GwoQcj!kTF}Ew7@AsxtCv`YY +z5nSt;i+cO%gXPmRK2{~R`s$B50orS`aReDUj>6ucONl|V3HX%USVSxh&apFCMne(S +zoL^DD92}xB<@i_i3m&Oo0dMfpt6Y|~iX{Ix7-CRf@$lIll-Wd*1-(%G$FhUSOmUsS +z3{A4m?^x&eaR(zk^V25@y16O|7SZoS5B`DS64g>^VHHx?H?O5Y-e^NjSd57D#l^ma +z%UA_m_>b(1^&0>preUbphg{w8qAsR{`JA~96jgT?GZP3 +z&XP02#ERSwpMg8IBwo0=tq03nscvGRd5Z42P8X9S=oFNcbWsh}PFbCVg~h8LDU1Wq +zeGeZMt%v*UqCc)i!;2rPg&B+?bOAm90yS_1;0$;eQ2!i@gM#8pSxvrX=%tDtck~r} +zs$IA_=U3}Bo470Vd{8Kyo}CuW148Kxl6a8@H~em~um$*iW#y52F$_a>9JNPRs4MgW +zHH2sh%W%mxt8#Jr$Xs4j@j}JQu~g;<+PwDQR;93t<35QRP(Be3$z3SZeE8s8Mo&dR +z^_`=B4qmFgsMTrTpzSpbKcPIZoS`#t8{-u;0q;i);y6@#Txxgh^EGNY%E5Px!Qphj +z$2T7v0)y!#d|SQotj5v74xnnrd8D_M*+rFr2Wx2qe3U;dv%G=D3iGG{vZ57#SUYD` +zq+ylHQeFGUFv|SGnij5$tE8!WZQVbx@vJTjppz=g*3bMV>y(Z!JM9r`J8Cx-$Zm9W^x%}07@ +zDz)6iIyovU%XXPfby@Ct^-2g~{e&o|v+4&0m;`#C(a1uttYi7Lt~V!Tys(5{KWf*; +z4kj^(%d-*?l&>udgk48G3rjvSZt&!;#p9}Ph#6nYgWfqHFbu%TYY6u`Y|#naf8J!X#T0~PJ27IYvY??TxKq9+WdklGbw@E_5 +z`oJIZm;dMrMSZgPr^{#53m)5{!5I!o!GKQgQP8_7Q$*@rf9a3OLl8d34np%fw;RUq +z*c%gD9}L;0zx0Rv9Zm=O +zaUbcni$00yKQG*WhNh>1zF7j)!8SYuzmxf%KqXD#t)eSwbwLIdRuxP|Z^)1myMkUo +zuA1R61Q4k;5E)b#{;25goWl>X$i=X=Btpw+DM4h}90N?^_?Lt0O;)y>ay2+HU9>%x +zpz|azr%mZtYXcdfLY9@=Y3|?)lg#RLgh*N^+r_Oq$ZuXhVR;zJn(xu?%Kr%k&%(zk +z8k+QmsLj2_S*}7a*zQ`9lNMKdziHiGU01aOp4oYrd7_H|qfy-bkSqj~-5=oBsp +z@ugI7JsVG}?3a}WlHQP~HIgo$Xei-DdDiw))udS;UZ*scC@f91!U0S4Y;6r#wgCfb +zwsc}*Rtb7>DrJ$bV_1x-H*=@YZwwkl*3&RI>Gqwm`fS7{-;~zgmEDyw8>DT8$o&}l +zK-M5lZd8fIWbU$q9-1-H5zUmvQ!Y!3!v1@pX-A%08}$a{NgKVFjXFK@HjUkBJz;_xF*wMa +z7I%AzCWSb`4*FzA@o3Q1j(m-`7JN|?2I_-6F0ri$o+KNcZbJveD&pYCBO%6za|)Hz +zimjY^B*moS5n5F&f0SoEJ&T1HX`66SVf+66UvbXeK!8d+#Et*L74-GnAq*{`K?_kclK&Q6dVzGiMjN1pVF)uk5 +zd|AdO7Rhm`Zb4&BazW(jqh~`WQYtn+Namu-O3qA~2yNousy=Blul6G&d()Ct7Kv-G +z>e}TaqcN|wDw{Ur69E}`u-X*kP1aj?ya9dVF%UyZ_QD$qDI# +z&)>W}+BrNpI&sRHG+W$NS1-Hj>b8iadp`9d@UHuf|?ZsIfbv@HE-Wz9zdjSTj&B!%xd?CJp9B8~!e*-@aj1w7s6vZvc@3z7Lmnan3_ +zBI~I_GJhm8_I1X7BI877I5119-RYY%W{H=47_$HkUo!=47GBu3D5> +zGFhy|I&!D_Gm&Y!bbcj@L}nAB)DD=nPi+nNYJa2(n4Z1gsbZ0{zi$6Y9qw{chdW(V +z)VRwDHSTml(&R3Cn%uU~*3T~qFaHE3%y$a!S!`#sEP73$)y=KFgRM=x6XeUudUJAs +zmn7!Nr=Llh<(!G1ekRl4lFdJC0W7|||Kb3$^`}$&HQW7y=uGEV#y(+k#>RT-4x(X|KEyQq<;>xyf8q>&`lmBIt&3kay79{MiWeeCJ?oRI80``Y3;27+b +z9fKWPKx}r(Vzc9{ApwB{0ec9+doJ)MjCaaO;~j6N8TLEnZ2O(OY8LM%67wpE6;HAX +zCp#w_w{gqaI#VxMQk&tGwHcmMM_d1ujrCvh5Kuq*)46Bf?(Dp!dxk!2#=-Od;SBz8 +zFSx_)-6Oi<@WY2=xvm9<<(FTCLOe(T`gTvh7FQAq&_9v|$nmZzLBA43o&y#<-rGEW +zrAwIvci|!Z^}+TIt-pNxL-pMO%b5Mdyb5}Z8L2K%H)uQIkAL&ay`S7eb6nh?9uzPD +zIE^9Ai>={b4^mGK4)z#0@yp9X7uB4FUryGElX>E2YbMaLgE|o3q(}Bow3MM1KFwB! +zUzfB=09#Q!{#KGPsXYuXCYr!38v}%?Mlj39E}@w0bap$K<)qQax-(jOea$0mgf)y`&>wP^Elg@8>>h0}9uA^7 +zv^M7FAse+z!Z|Q+6o<_!>XBV~WSfZxD9IQP#OFmzN!(nlw2%~JoINXv;Y67;Y&$IF +z(_)eHVRRL`Hb?I5{tMd{C6hQwN-pVgJdsZnrX9f3DcQWnWczG_%uqeM>6T*i# +z)UTawT{J^u8qWM9Z!L#(5?dVEqOQ%6O`T?SM8J9GLO4Gm%&=O{5bZlVx6w1#ux7kFeY?>%go#f2-B%ufG<``W=GxV@V5E +z*Qj>-g{pOgYde&nZtJYzfN4N!xPdCD*aw!sJ*4m@>klPVt==ZFD9f(0UR}cS)(@-G +z4P!C<^$`c?#3(~|NI3J&7MXVi){h>mL!zC?prOAJ*$9upx0)A9vZ@=C$Q^Vc#9ed* +zMjmc3zBNAgh|hLZzf@{J8nOEi4*bc6S>o`cDoPso{A=R?<23Z7YsR%_Q7@MD7Rfc) +zhnL+5<4@Jiuezp#5)@H_zp{;~o#;)~zT+c$Z#gX)X}3u-hJDCy#p5={EGpFOWFT43 +z<+syn4JT31qu5l1YPD9Nl_sx3o-DlRHCnYDMWeXxbs$B&HCuWJO+UQgC9}ql{yb=NiDg)JP4_ +zUkU8oHlHyUek?Vbnu1wK7YnfT(z^V+j;LT*4L~g_sqMvR4s$W(4%qr6b|%Aqg{w;l{HKex+LFN>N&m!&D(Iyc%S|gYxe+we +zznwc{cO&>36`#h=G|*YGoycV0#^Tu+OXm45c8X1DXh!$P_)OOkXKyTVa>)W?xN5QG +za>C@+oKKyrQ<-7VEQ5!O*+Zq}8*CMwseMq!1;2z3U);_V@Dg{Jw}39MMmBJzicDY(xCP(?wfr>!<7&E=~Qi-gv_CZ@ +z-0>Yl{H?k!u``I6<>WnHb5J{PyTJe0U98t3kY$bsR&QE>a!zP+zG?I;$zearlY3O=?B#*~n*H)v_j<{O}le +zO{};>DEO?q9--fW%eN;=SVG2a)mfUN-UlUQ4Sb5v>JRE4>&AUG?vv|pI5nAK7TL35 +zN;zZF3(3x-$zQN)q4wUec*H95_Iovcdj=7Yw>o-|*WZm^apM{$PDsu@byt(cgbcUFntbW=W7 +z6En>yk(#sLWTN}2OEAlT+y$A~TP?SN+pm-Zto)f=8k3P)5vS^{)*`b@ck($6*OE2v +z1{aCrnLBHnnF$Mbo&CfiBtc-(N+fIgtKr)BX(nl5N$M_wTxZ6^v_A(9`i)Uq#_$KGuGG;8HS40OGa7m<`W +zYhV5YRkR!cs6vu^d2ve%6GU)YC0&~u^)NDUVYPF5N^t-a!zy?JH7T8%yB!u(iR;;e +zt-xsFhrc~cUV*iT1<6}~sM47i1rpNe7K&yVNtnqDSZ$YA_7Z +zj|wRs$8bmM36;c|is$=bp;Ha3W%hf(O^svi&S0^u24OTn?=0lP>KtDthJ#@z=7$Rm +zAS}`O6bg`x?j;b8UMNdnQ4*k`<_f>B9U!Z#>xxSzCZXJCaZ_i&$WoLlXgPVhSPDq( +zV6zVk#Xz2$V|V;QZNkAJsZQeHh}cHn1hv*Q>HV{ui*&P73gKlH;TzFaha*5(cj3b( +z#(QGg@t%ST0IcB-EG{vl&v-U|b3=;SkFUz?qd$Lso4c +z99QDeO&7J&V+wk)PKC8wu|lz3xDBgFKBw&ptt+fQTR@R?t?6F2=k%c31v_bvddD)3 +zn=~rvM4y;f&mCocOfd~o>s_y|;G$F;$I*D$4AYI+^4ypX6EUx>Ji=D`V%M1CQHWI9 +z#H2txcE+%gse_(}8oo;6hUvk3P2GuMd!15GWmf4MSCGk!7Nh$0JJ3$Pm#vfUnIGox +zp?1=h%^TS2{+DG84{bEUOl*~6eMRaLh*1>q5?5`HnxdmINEx7h5M>7 +z&kb^))L?;KeEGP +z*&88`WNZe0y2zvDwsEA(dL1ZC$ehwG;+L!gd`gBChvqP$x>PL7+?QqUNFG1C4v#3KDOHxey$;tm*iXTScpSTZWU$N +zA%_BA%QAdgaAjRPRNxm${vhh}yV;FeSGBdx#sF1$#(*A2?BSbqS=$RkfLE*@SuFa-Z@X-88 +zJ}DZ>~WqM%2^Xb=vyKV53Y2rfE(@g~_Ti;f2`vBVk%m=U_`~e(D1Fs^r#O~-G5+Z4Bemq^}ujl4# +z>*MJfe{Fw!crn0s@dy4hw!g>tPe{Lca0t?UZ$dbBXYYSVPBk%qD1I-9`CABL=s}U7 +z94eLh^o8#c%3*5!ddRm7p9`2_31foYOK`qi367)0N^0tw7$#Tlo}oOE;l*05l)iuH +zIN&MqeOc$<1gH&f?}E6@l5fHWjLG5>@{QPt%^~_aE|pW4Mb1q@E;puL7B;9R`Dcf^ +zXM#f~qY>L{^w`r5#!j{np#7F2@s806sv^rc +z3;P)8lzr;p4hHX|PKzPH*$axU;fOTU0{Zqx{cCc^zfwW}8W@Iw1QhWi#vtu>IJ!=s +zGFfs#i_y{ENHMSi9}DAFSg(S3U4{$ftl15NVW}$O8G-aQbO9tj9`upmYrL$l@nxWL +z=^8I%D*OhT2%CDayskem1Sg)l`AiOe;g{d$)WWa)FU0_blts9JP8X#BUiigw){U=k +zdbsl+={vs+cRCD$>?LOCnK~xP$+XVWl27rgj +zEe_l6a0E +zsFEL(P_m(mB~<%gQkz>9Hcpio@t09Qf&&2%G46MMcX6MXy%=iA1(Y9>ClWS+5ic$o +z{xhy!l+x$+ht$Ef2i$32%l=>m+;buUhhrt85t3o)GfLP|dngE?zcXi*Pi7Ky{8V8kOFX|3Iv +z)ZltnX5#K10kNk2oYQow8Ti3*)!LG9zCR5+BeQK`i)?rkxBN($9BBqo2uJso;aT~S +zQvv`I0V!+bY)s51nd=g|0mh2-4|95b45OkcFD=+N9oEwOM8=QV9sLvy-@!JZ=X`1# +zP}W5_s*KQ+YK$M3VWr&-F3?||(+OU{!|XQ295cTF&Yo^JG$h2OWJ|)2zh~@7Zu{i(%DN5@#79+W{zP>jxdOBa>Ro6UG>z7l{B;c?L{gPG*e^)DFCwGoJ +zw;|yLXT?>XjJ9gzx*Aa>WVjYhCEho*_Suw^OqYMU@@;V|Z_@HKFt^8I{+f0{KT>2#~&A~A$Ik$CxFvb6w3gWJmslTu=sQmcI6V8 +z>W7>)?O|`qqsOH=S_L2<9TmPjjaEOCM4JJ@et2K@{4H;@&V_0l&Q{>%p7@+#;X%uF%*#{WLu@OxI%@0pFi6I6?X +zx&AXmi^dJpXco;hPdZe(OeV#mGiM1}^WUrcYfwT)d(O$HowZ(HU8ShWNM)wRM1wdO +zS(r-~N)oHgauJPK<4@*8t_c0p{WxWyPmNYt$t|^|zDEAiRe>*$hdn@vL +zEAo3Q^4#h(Tai0DwT=d^tDS35w<$o`I;ef3az&~-6y_AwUiZrJE*+C0y%}?%W$Qph +zw_QTQtQB69jzZH5n1I3Zf*$(d?+qGFV9ZAKRaT|LWC=T#uBO)YIcMbtuP~3*Ts9xf +zC+cnK1tj*|XgxR?$>E5Xtwb_;>GFK1@Z=dR=miH0lbFF#FS3Y6Cr-jMW(u>SnM8#Q +zER#`UQUkZgF?QMio+ze9`&PM3Zul*g*wqYLte%>CcA%wPol;$VMx|0#AZkIm>Dq@< +zI3_id8Fd@;s5R_yI<-cnZbz-TRr08{WSPm0+>u)2HvXo-j!E~F+C8OqPpRGe`?>e` +z^X2>dS)xr)y;Glz +zRrnlEeR9c%>##XCRzFC+8~fpGdSP;TkzAXlqXJq4p#z!15@^x98!8v2^97=UC<-^5 +za3mdJ^PPV@8g>Ti^$Qh8sE38mE#rY$>f+Nl62#)jo!%ViA*gL``d(XK@0Ac$F@e)V +z4R|3awlKUjYAd4N7qnplns3q*=)2HF(QBFTw+cqg0YK?pJv55VyIP0$YiVDFY)~Wm()yir6!!HPUZQdh?$gL< +z!c%Ai(Z~+_(fHzW-Ro=+#iNS&)8|Hro^poCuc9sZpX!HK+#p5C9N=3e>NOkFnj5JWLE~BoqFB4;*3S_}c3bsuBpz@z%0QLvLaOCkru*;Kq +zAq0cj`5;?5lLzv%bF1Ek_aSio`|>@WvmhgX;a5G`c#0@P!7G>Q3TC6`VR65glj`m} +zAP2XRd9{N+J(?pOTvycm5gKiqWV?g~%xM)Pac)9Kjz1$%Baq}EJM}Zs>jo6@8z-r{ +zs?`Q&Y&1VheRG*YQq%+p0X3k;Yvm +zSsLdXZ!~Z62ZAC6ISw^5BEwpy^9;)B^xsGC*oDOCs?!XOP948wv-TV+hohVQ0pJNd +z?jym-^m<9x!UDIuNb!|NfH<3@anQ9MA1J&s&MaoJo*3+jNY6}?A*SYl2JnkZ7@o6O +zQ-5fFCH4!{YC2;b(Bl9OSzO~PkTHk9(QHhT)Vbn9TthxSW_4UkcVyRI(Qy|3$zCd_ +zW+iGR0~#e%_SgAuFyjrSomuJ6JjX1K#}Z=1va>|U$5lsyK!$NmN5O;IW=mxzpS^H6g*Abt;Zh+~4Ei~R{C>nL8cHZgN;>(Xo!4;I` +zwIshaPUH1NXN@>OBX3sCw}xFnEL;scwAR+KLpQoGwzhq;|BDlfX({tqSZ}oX1sWo{ +z>Z36#0R&JDWks>bTd5wXjW>NDC`RKx%)NV4rZ{v5$IQpIgHAUlGkseJhs&CK@4~@I +zMT3wGbzRl8GO}L&(5@n}{ztP`9K;nVh!f4Tfnz2k1JS6wl`1Aku;0D7|i +zCcw_PiHxQRq$e5;JgP=8yx{9fnu`J6`Xdd?Uw>`nwHejK!)!8LRVu%aJK=~Q?Qq?n +zxK>n3agg@pX~<~|4v9Yx6ZuY>{=x1PlgMv?l>YFcOzij9Uze@fGafcvd&8%6#A37f +z518+&SX*)W<)>=-+w$sT_3Rl=baSh* +zyT5y~5D%L*?tmq1jn1IjT!a$Kt$vsOQQP4t9QIJ~fpM}&H-nI{S{yPDI*cM-cGM7W +zS+#3!0Q%Y5+&|dg-P+u19RGZLvh$h}IYKW6!`*zdcd}3$$HPU$s++HATn!!Yd4UI4 +zRy=(yqkh~0Minm{i8Osi(|LXTvT?L?jIBKnfiWWvHxPSwTrW0t7ikZ%V6w6pvASBV +z;;eD0)}EACVX+=P(yIlHAHR8ie6o-Z%Db4G%TaZ)%?d6=z@<``*>mV2rjN62A>*^!^Kqg-hNqi`!-wP +z>VS3zgUx0PM0S0Mo)X&Qep5Uom;tS>u9Uw~%d4y3!XF$G{s+ynUHrnU%^!Cf+k1z* +z(4FI~WvFoZYT5%`7dX-DS{yasg{WZXF1HgQyN(400TyDlJRgSJWTSL^fYaUF`sdDx +z=%;0sq7Gpz(NYTy-4?ks6MYp?Yh%!EaBs@JoRs+w8rBfZi~K@5HVTEbK##wn1$y$t +zS)j}S*Y!eWyYc*ZTP)}m{7U|OvH9b{5hfPQLUZ5ZFmC})XN`o?eO$>ha4%-KIelga +z+lJm~>o8~MK9X?bd~>p3 +zM1=@5HUHPi)?p%LM|Q;~pV}CUwKvvLf8s+YH1+YGWUqs+`}3-sA%TiaXEdU|bF +zzN6Kh_ujKIpPPWX`nLLn$#Hktv2x1WH#5Im(cp$%KP_x6s@3nldtAnUpU}Tg>ECbY +z-*4&P@5%~>ze4}6(!XoO@WIC;`uSL?7sD_FCb2!bLUo`Qc(n!0{OavH)W*b;o)7qezHK#D9z$viWGgBzsDYCtCd>pB{C&QbNGGorx~ivl^? +z<1V0*PP@~jwwcN9Mo4tV%$ES$gO3XAGbRp)@5w&e%mXOViy@q5__STM^n<}AFtlun +z2`maZjyb0{*7le=WhktE+C6y%NK0+*|Ezx6JUZIkKlz!sEPipow^5$oNcOuMTy5B= +zAYixOhuj-7>m4Wq3pNb;BMJ)sdgo~C6*Rf|e0Oj6}?*Y!#78V2gf@!!)M2Ezasfgz#^IibrVnY!Lp-ZQ1^n1K3M+oaP#DqS9tL5 +z0`@Q9!o>yoUaUPs`egIv4i|wFq)YH;vVa^ZUC93Q3VLc^byY?G&b>yX*@7Qi+c-A3 +zo{N9{@A0dKupi6SkHrPdXdLgrdTgE?94+#rMC-w_4*XNM0aFoQ5slx7FB{vNCz~=H +zowkS$3o1SJ^zmb_D3Z2Eo3ArUd&Q2oj&=`EGE2z_v`2L;qLXkOa0`x%r#s9P2yK|u +z21>o5*#5!M>&?A}o!t6^WuRRW2?xg~eu`9kv!AM%Ov0*(G-gjx4WdglEW7fD)kI#( +zO~>E3kpY_ayBVAUS=+nEC!|1su!**)PrK6CSQ*A4 +zqd-z*?*N&+*Nqy;zrC}+wYvjr$GzA&0J!wt2_&L?o!TV1(_&(P@|pOFL)N-Cjb3mAs1s6|^PsW>0nYEEovk-;n1Mw&**to=bAmJk +z45R`)_;?tjqGc2LN9T9zeaHEQlfE4F+zOq3JMwjY`(<2a1>l1z{t-g|KvS3>!Z||PKtpKo(0wT)vldupefxXz=JKmuJ_NU224KbUCzbFg9 +zlT+aX6ZjW>zBxI-gFy-MEy?BxJ+r?g3omJ%As6=MPyeKppZ*CyELVzY_7`MrZDG>Z +z7Jb4XUmtAmaEkoE43dITDt%$n;UWD#Jmep?gnVQ2&oAjh{fW}`55(L%FQ_d3rJtgr +z@{GSAX=m%z0Vd#I`Ptag35_kCv~QC3b<&ARI>DruM>{l7`oM&@JFxqdLSN7DKHYK_ +z$NqX|uUfg^pSi!CY8avc +z#F8p68L0~TSfo?A=)v><(fRnvi8@7oqIgeI@RJjry|BM9%L?5n&;Il?8*jD}`H+G| +z2w3*^>9fHjfxr0k#2xR69WfpyL>ic`zbV;0P4*XLK}7*C{(>YSN-@pSr}EW!{s!Ul +z;ONB3wuw$b3jE=e!QW0c0?7VLw*aR&MF7<#8<8ZZkPyReAxWY_E_KXh+!QDR%nK|Z +zX7Lv!X(j>_9fpG6tS}8fFacql67U0A2s;)#27Cw_H5h5>ZP@d}b>e+ARJJ*_N?;CZCXqgiwP; +zpqSzO6ms7o^NIR5W3|6@mW)(?>*UB5k4#xRO6RAQPsup#FUo31CY?S#{*Kf2FUT@n +z>NEc0B%Gm5mS32KL^r;{>b|`MD8Q0v%;7IgVr42y<4;J8(6Y*%gqMK)u~}`i(AnG{ +z7s<+jDzOEx*uYnO84SagI}1Mri`>Md-yzxNmto^P_DwiDv+3?{n=Kn}f7z_atrj_T +zEC6^34z1KUI7Cto5k5>j>|FF!KdQj#MRkLIvl9y8NxX?BF_->dmfUiJ)N&c%W!+(T +zfT6<9kpkU(O?Z%B7gd4|f3RFVe)9q@l$~SXm@|3Rb(O>2PUBRC6Z9EG4Eyj5AJyOo +zSugy9?9oZfjBO%Hnbk^4_+yleFBOZBxU^^zplVCTqeU@`C{W2=g4Lesmf2KTK&U{O^ndhb&hnTul1}=Bte9?Xf;pq1@}t!4K0{i<1Ogb3nw!qk1Xb +zB_J!jEcvP|Vkzgk^kV-M2cm1ETJ;T5d54dJ1&sm%um<#Yy&!h$#er+)_u;qdQtiWs +z(pkY=dZZX^7b78rTZF5j*n(C{cyDLUuU0I!O9gwx@){~|LxtRh!iEa=0>({u_tV=w +zZ>!9^z~Y^k`qm4^fH&Kk=rGPRPg~vtjm8%`*0df>(Xbt#G5LIvA1x*}VL~_2n3Q3g +zEsl}HPk%iQOfl|@ftPu&yolI5a)_3Y{6=Yr2O37iR!yOeSR3O@pfvM77ZRtepV4ZrydIy2|#gf +z?S3=_tXnjf+Xh^2?Rv4ernh|5h{Ld7??;@#e1>*A@l1d*u34(SRy*UO8q&2GTOeHC +zkFvm=ffrVai~x$lN>NF!Wnk87{OKH&;a3aZEsN#=GJH}X)2V#>%S;NoA3(?U6e0ea +zT-=nkXl(&6Fd5Gz@&V@UG-*gqw47vL4#fbC)?nUCb)ZNMAF%WeexW8YO=m;7d0E_n +zvq*X&XqozvzfO7M^p?ij9B|_}ZF}<+aae`qwd%Y^C4SrM(tEAJa8e`qUpTBJa_apquqb1Q&?9GyY8C|Fo7Mu46tQtwKf^h8GN+d$ +zf;$?Zg;?vz(dD0p7^Vyhodg#jti0u?e=cG;3bdUgis6@HaphN7IyC%n&oBpoK^O@O_hM&>K05n&^>S6V~wieKWNki +z5x)^SotWB|KAj&eSatP!@ +zUrvY|{RC$qW?E+ZxdRQQg3#C17N7YoKJv}~?3up@G6%>U2;0hqFlm{DJ6jq|wvu4t +zCv0VaNfJ)*7I;Z8VYW#Gcr7io^8|$CrH&gT)zO6L&g5KBFO?4DzjTJd$jFzR5qw&) +z8R0j$v#6SSdBlH?e|`=BlFluwO>qm*>AL7bnS0-neiav_&|(cWWamU#7qyrN#_5#a +zcOmK}5zb-p>>20D@AgiJFG?O}uZFT@{y +zD;Ay6);@eFoEi2-CB(2ZwB=8}_8}=~cAK{(uXplfHaZSjr6nmwa9A~xLo-e906MNf +zy%CZutX$)GJ>>8*gYRgWa6Q%yODZodK|qVa8kcZa&y}lc(DF-p*Ecp(DkU#lXLWEb +zS~YJyQn;(-;U-#3JqM_a<9C+LYXZP&pelo-bOVXeC%JsKq;sCEq!}~T=?$dG7z71- +z9;F>!0(q?gIa0~$Bcrt6n@h+1MN}F2XK_cU>p6qeuAQb7OD=tqPqO=&$1yqg4my2n +zNPl(oz{^KgkD%a{^~+5drBm4LZOTTlo^Q}wCk=q0Cn@VmHD%HypmN3>ErTL3uO^6& +z*0Ys{y)yjNLedP`_uS`@B=gFAIxRu+LB%=lJWJ`(j3{F?q%>^{_$t)46zUe)Qoath +z^X{;&GS!=HJMN0(lSDSqc%wlJAGcquY8sSX%huku-O?Sg{vcluB%wTtFGZOepax3Q +zb|sVQ`03bZy%I}HXL?%^Enxm)$>pN>eo2h4v9teUoeE<@-PSCe>5=)8Pm=9-n(Oun +z(M_==k4@E7k9mA|tObymsW{Z3udu^UeY$ock3_Ob0jJaJGoCL!=;((73QIR)ewOu6%0@K6347Jz#nk_DBN-Y9_vYLpxa79 +z*?L;AK5-jTrExm$-lW@;jY&K^tgFm7h~(o0HlJ~1Rfb*wRvon3>&i1ikyJhZ0o+7` +zIFTLeT#Ki%-@J$8q$vx7w4b=1Ywtq(bce4F_J2lJDE;cktiSM6=(B@|!*{UKo5_zR +zIQ@wyFZIGhd>++Jh!o5oe)5sZdOxCWg&^Su-ggwAE;>_uu;@~2M@m-JcrCG;!eSoh +zI3;gE@0LtmnQraGp1PZ*65H$5gVUwF8`QgJRpQXORguQ=$e@hV!jj;eBQ)Wxay@$} +zW<4~?dam_WtF8Ftz==_GNQjwF3ZO;0BYWi@q5Ko%)p1YJygCV?6%ixH>X%2=C*PGH +zRi8duM74mI`)|Z^RwO?82hotj$QnHYQaU)$@9`M8l>*F4{PG37E01sDAJOMC%s3t` +z8vn7^%`j|{IdygaVCOBGJgm=V>+edz@{I1CGSh7RouX);zfxIwQdxVVR@T@NzPvXL36z|c4L;q^F1E$APpkxc+$ +zY9v;US-%YDP~1zg^F8f(*_i^a-(VQE#!UoxZ-~@N4LyU%x`~C<^J5@FUo{SnGcp>_ +ze?Hl19RIX=Xfn}1QDb}ON3kt}Gv-x#v3Y#bc>C>B_8nt#$v@8V!QST4uI-2Y9YIsr +zrk{$Qi8i;lj~d6DjlG?Hv)2>aNwwj)81ibL9KG2(X#l6Ob^PWvyT1Vlf25YzzA1l8 +zfSz0kpzn9~w|6)9lR104dnU()VgO!L5TZ!d^bc&fv&$GFShm@uMn9|YY;9Ibe$DXZF6`31P#}YXKMDWA9qW} +zAJ#&p3%?iBZQ@cM?@eC6?|oNIiBalPJ8>}VFv}YcCuI)_0T3W(hQ;fJJ@lhCZRuX` +zygoSkdA9wSI9oi!Zo|IUsVVD-KAg_S?OxQn(<*+Cgj+vzO#Vqf*+wJBnI;QO!k*01 +zB${2$1bF(mm7MdIZciV#S%x_5^e?6#54LTb?Q}?^GqyQnlli-wgqq`@j~mb5ym)=E +zJrm5dx`R$5yuRDno7_Uy$mo*Uc{>|CYoBCy9a&EOtZ^Y$*gcpwD!_ATw3ov7g7;<{ +z;wYHm(BS}2Hm5EcqrFT-m^Da^31=DSY_|vwboOiHd*BZMM@((?&HgUn2-D=g#H>ND +zguzAV78eWRRNvTJ&}t2l!n(o-Pjx=N04fYw3wG&AbeC>1z9iqV=NRGvaAHOe)?zxd +zuQn>h*w{L@>CCp!B6>PPZH*SAM>yK?ZSuwR-8M +zSf8w3vW^w*CH8{mFiNCF@u2OeusdjACgWMX0VY>!f}kK>^tLu?Y$;ibbqto#_m|^_EmtIz=ZVdqXwn(mgyypSv89{Kb;*|A*ay?SvfXy^ +zKZj$sNlTRBn{Db6+&f75(;TGatm|Lr6XE~HcKp|R+qj3Hdq*1oMUFJ?eQDhL(zy4f +z@qfgZ#uOJ0m@vV2gYUB8LB21B1ZVVF-7(-8C-`A-vojnpV0NbG1|4F5>@tBD=TZ2m2cF_ +z%KGYe>uXQ$UF84UtCVFmQu;d8 +zT4FCgsLZoTb>aMG6sl;5wm+8v+u@vtzyi?i+U|s{GMWpOfDozlVMlPY^>D%tZfx3` +z8+FW6T~?Jk4$0!^L8TQn$Gs3v1vvv4h8MxG#nCT9y@veQqv9qUz!Bc)w;nIlDSW08 +zV^en+vziB5r_-k0p)aLsORCY3o?fAK(-epnG?WF)Ix8QFbqNcrYnKAAdU| +z{JKrd1i6nNm%mZV^e;lL(a<;#;t-WI>V<-n+6aahl!84qd-#0Q9H4eb;X$Q&*^63| +zhM$U23&PKd#Btj<5Qmub8;#b68TOt;QDfF?VA +zazJx_qh124h3$VGjQ-uZcnA1XeSZN-&o27oYS5{|EnW><;~&^wOvaV8i%Qsb>A*1#-&2Ro+es>AVl7bvAYSm{2J7|=DQ#Fu0& +zh3!l-Cfm?=f(G<8-G?+-hP#2n69I_=BOfaEFu#cVq`JY#R;}ht|CVN9XcLCbWSNB- +zv#*IZUt}ye#q2A~=F8l7xW3p(&Jq*v9t|-x6A-rDSWo^ChOv1*bF=G(XA0% +z|jEqUNx2*)<35YJMC*J`X3yT!0!*0+F;Se8> +zv4uyE;8;8d`WlPA-c&1VtE;P()kiCEe%>5!>Pc6S@G+1R9aMPHZaE- +z_FZ}l$!>=~cLswH8s|#5H1SuaRfKdbbOcQ!2v{uFjD{Fl4kihl7f+r9@@(=XjUm1u +zM_$+pEme_q(hJ3vg13alKUSA99Ms1L%N$bkHfuJ^)akDe~7?eM%4^ovK~`*pSY_=zggAb`CH#@$f^2U&lx +z44XHo7fyyZ>h#Qv7B&XcOBQ{0$lU>*Yvgcx!9}N8FFbts@b%`)-7UjJLqb8+s_O;% +zgFoNH_j^@o!}qXPFObAc7UUQsT#e7;QD-EF91kjX9>b>MBf~H{9|IJiQa*aoQEC^s +zDA?k-8{p=W7V*650eWv<2E(8^A`vaNg109$j54R@2>li!riNRs6#@1OE2QS%QrhLu +zgXOmXM6hMFp@kB@xUI&u-`>`0r3cH9#dZM=8g0E4*G?CHIXyi)JuMVZ;lE!`7i;im +zwRS-P2MKa_o^Nf#;=mei9&hdLs=NLNOa#7^^1I;Xhp440*C=%Vga*~pFI&xDSCKhtL+cOKso2S!{4) +zWLGmZg6%MO3eHC%a2Yq+wycE?pruHnk+6KajyruJ{w@Sm`T_>BHp8zlZ^ +z?^yN6ojB-gj^>~bECPlp+}qrLNmte0Rs$_&fi~Jg>L=(9!=OcF#P350C$5K>hs8Ej +zd)$ZX9pjWn!gPcjNR(J2z%#t@F<+91=qa9RSOv6&9oM(i0u%*Ad83ZE4i>4WpODlM +z|29$A#15r5A|UvXbR8pxqT3V6GDO@i$x{4-=K?rt^bs#g_-pS*Y`eh)0Jrf+VMC^0 +z-`dckP)^{R&}|xqJ*i=w6*LQfuu+<$ZE_P`4(Y2EUq}Ge!+dsM9FsgOKzB-U2Sd8b +zrSxEV9WGSJhx={r!7|bU?r7K^N-jrIH71RQ8(1!@=pgn~T+kG-JMM9*;ZZzBOs=Is+VMc4u4YArinnx#W@$MZI&MT?V`Qx +zM(2Sqqo#Yi=-%QFmitj3SiL%#CcT$GoB+&t9nFfOE7&F+bb)_0=-y}ZF#xJYt4lAJ +zb+n^ei|Pfq-cGCC=(Jd?7XOIO{}o=3KGvXawAR(RCLIfPqnh04hrtj|1ahBlz*}KO +zF(z&kNKIf2DR^-A24-}1i981Dc+9KH1yN)zBHu{n2IQYZ$}usAibIg8I<%)13i}9M +zV0lfSy~P4VqP;Z=G__wUjiB=H&C36-RKELlsSbDh8K5+5!!{rZh?=;&d9};zAg*gC +z0=k4}qfllGaNNgn5}A%JSz@#>>5PctHF_j*>cLvrrt}zb?$z&9qK(MwU8aukrLlZ{9p+K+ejS$|_mIrQsQU!#!tkGCpKXoMdB+|Ui +zNU|&Fk!0^@yVLKW_Z!001^!iV@-cnUoT~yS6!^^Hr<_PmN5sYr6&XFbEom=LmDYGr +zVV^1R)kOzUY?kI&l6m8d*&o|^2>6Cx6SRy8C3l2>kN_bQb9|}tRt=T1 +z4DvSXCbwt5Eixm393hj0igm8Yf6MA-T#>w+=8{}$HUWf}mY3n*i)Ispg)dd)<6?Ok +z|6F&Q_U@ze14#6pPCzOQ_DBCjT4T|qRz1Amopj^`9uOi +zpO%vLBdSM2ex<35t59pR@%uGvHAhM2gqySHDS;tKG1;H69m4-0(}i3W0*uhPS%BkS +z1!>@!^UgB^kj>0G&sV_^R_J0KAAFD}=n&NU9rFQ!BhL*QG&RRp$lcr3ZzbppsDc&* +zre%HC*jpz_vbmHPF}m(%Ao_qkkFJ=tp`8^JPEzYQO{ZpUmRz`eQvpjQW!$4WD}I;W +zZ;9gV6zN@(p#zJnUKq#d&lP4D(3C3zpH1{_OVbk-B_=GT7fknrpL*Ovkm~!F((@&u +zJSGtrK*^ZIj(~|-?*q^^FBQ(cjrT*?ZvrxnSVRevxIxNH!M)LZN8FIcdAxZd-!=+x +zjE5AneMsR9tI07vIgJw5^{(v?`uimkKk?G!0 +z?GC=c0U-j!1JDToaaS61-{3n^91a3}mLs5>Tl(enm(%}uI)D1x>DQ-ArwgZxr+=J& +zJpFLGar*t~52yb)EuE^)&c+uQ$nA9H6Qu +z?F-#Z7jb)#SSZR~6vry#n!t^HB#K%-3z~rn{T&YIY2T;q~ +z;(wKB(V1JJ=)gN0628&+!z*Z@(jHL7G95Jre=K1 +z%eRt8)Z{_vC1OqEbVkgV8`Ce(ZD9&0+M=Acig^;5Hq#LXNY +zyh*1yuKk8(Yc)K^a~7M;k&v^~MtRHbi(}X(luee(B{7uYjiwEcH<*l6R0QyY)TAq7 +zj^2*%jta2)ryv8Ye=Bs5gk<&~a~B+ui6sP2=yNt_ZxC~!wLD8l3{I_T2A0-GJGr-t +zH`YT)8V|*PCq%@X;+$s(&EU!AJC7c*;TO5~@5HRE00aluK%A053YkZiTfHIK&>THe +zTtrMc@ck{(u)Kz1^el@Wl%n&08Q%L=7?voLF+gsAWUq=K&Y?-uPxG=!nDidKvoen4a<-n5(gP1|3kDMuxnsL>tY9e?Q-J^_W<+0Tx}+%u!GiajrP +zz-9*6PR(&=j5YzRZ$bZXof&XXF6NOjF#4Gh`EVW0TWV?8WNZVgZ)65~?)}ISBWNbW +z>e7TJ3=O^-HAfaU8CzJ;)CbvrxpCBM{C=(UBAareH(U)OfyRQQv`18w%WnEI#q6gM +zRD}|z7S`cCsnelSaY#6e)aBxFyWP1CHRzk?BV0-&Jc$t}6E2HLud9P$00*e{*W%Gp +zURQXZYh*g>rC*v`FOJ*2IQq5Z?h&t{m5)_}R+>GmMlW~3RWVF9q(HZdRW<*1i0c2R#Hl@Id6Oy#S +zX|+i0$P?z75BsTg?M91gdb34*LoJ-m1fqffTOn#UB1@rsb%O5?TnU!Y~ZF +z1$DT)MdCTR;%Ea{E#W-EkRS{c6otzLSnaP>Lu`}UM}auN*2NWm46Yun;om4;vv6sc +zFr$c(1xo(%>pHmbFmNj*YyldB4QY_wVFRdv%cw=1?jVTc22eBp9?jExF;2M2BCpi@ +zpW@Ia+E^iMO&+!jS6e~1IY!lY4xoi^Ue1*yl&q{~r>%u$Lkjey+i>aR;hy#1`!g}FbY<~t#DZ5LHcEo6eW{h^!+a4@7D +zQ|mS$ojgpa7}3BMV<)X-6(frv)a3EWxHznq<-0D7v7ytEf*bwhuskg(Q+^HxT-UGfMaIxQTYYWqb?;_J;JB@M(-A)M0qQ +z(Fmnc1Z-$80hliAGS-gO0zqZvUyE#4gKx0VK9U}2wWE+G4NMby9{j*CmwoNb`M17( +z9bzwEf?CuME)*nBp7-tpG;2d@H3q@xGC>-U29f5fPt(OuQ?1K$l&I6uon}$(6*Ixc +z5>0Ql!TLG({Z!o(zzy=4M$60!S*)Dp@jw^IVxrr*4hP=mRXmSdjZ0vvfmcIEE9c{j +zx<@Zr<}T|d{L01qC~X3ESnqR8U|-pWWhjdsI+9bs8Oj+U6NWhKog)M{`I&Q0=&KY1 +zr?;0nCrW`@PBMYWw)ab#cF>pX^mbE>;mm~BTsLYM36Pb!^6zNv{6~c)0GUiR6!gYS;;-)dOE0f +z;x5(5sorz3)FE35Rg_WcIyRLO+2wJ)_>Tv!U#+5eR;~c^uwuxtugI4c)N}?YYC=B2Vu^`qqaAaSJK`x-j92CbV>IC8RTw0<+)$cnhNN +zjqNF=9y-RC9`9*{FNj94*CZ+0U|Hsc%+1V%w&?a;L`ny$E6 +zHYo3Xf&nquL!Y*sBKFi-JW5*k8Z+jsg+_l=Hih==y7)R!`hJ!5AnRavz51{=B(@{S +zVQo)Wn7d%*F1o3L@ei4x9fXZtbdUD5>lWpa#M9!SfbU~Tk(j#i#fRI+_m1nS(yXL& +z5z(S?QFj?Rg;&YjKM{}>vo_Aj`r*S1sJRrH` +zGx2G$;zJ@C_%S&thm`sWi6PomQ2BYa535TC@)u%vkE=+CP7_v$(W0J3kNPQ2c4h&c +z)#8}x%Aqh^x>vm`i|%gGrB<4yR>@hfdG)5>Wwt%c_X02nKB?qXQueNdd-Lnn(iA3X5XEF) +zX5!?Ge4dHRp`q9`Mrop8G>3Wd5z8mC4u%E!&v8K$>Ddf2Gl!&P?3O`;X2H*~fPkem +zM9e5muUHzkI+`cWf}_+xiV4Un{FMalJ>7awxBgw|)|qJ1nF!Kp)aYM8if*CA8YxRy +zSvaX33pLKPBSpwm>l9z1*AN5{+f2}GcJL}8g%^~HlSsW!8q?OpMe^w8o7*Orjt=Cg +z(?cI2y@C3{CFUJ8lPY#AQIjF4ryZbM +zN2l1fL=20@&XKvg>@+X6CkK&LGwRasI7Y`G89*Re@RR~yJPd3jM3G=w)DyWes|{y4 +zdgtHw^K7KiK+gf_{;@^xW;XZ5?%UTp>i|U1+GyM-6{j-48`IF>6vILRbtT@YAoU#2 +z%@sm6Urx3${YECsNi#)*eA7A1yLTRS<1$W?^J#-Uq(W}J0^daP1~(4z#t1H-7clXD +zbXCUX)7~vbiNLmk9)N7WQD3VHS+FEUYnlhNgSubm@FyJN_Bm6cdzoA?(8yVb4n`KU +zof2Kx#1J{UXXER~}f3frf1jY&xxIbj?jw_?N6eO`7Oz1(&Fotf`9 +zFvO>rdZLz_s0+rIFrKW!$qb;2V5d7F5CxKgoJBfSp8cINeu|;H$?Qm5j=&Blk^m;- +zFc>y3oiRW&4Njz|CJw73Sh63FB;suY*>$}jM5;8zWZb+$TR#WPaaoBB}((K5h +z(YgVA*J&n`1=Q+UiH%`+5nfA{@qlJ$1J{mOf|0XGfLzDj(Dc-g8e+6(lAM~XOy6KY +zW|e(i3bMLU&~ksf2L0Ap2g-$TwDm7%&9B`bgK*gMzz7LjKj9MjnnoP7?eO2Du~gmO +zfj?P9@D4D8Ha#Fl@Iq7u*-NCOV~lr==5Z(51trWb*eN!h@ei(%gCh+h4OkQgIfY%B +z&e-CQ%+VeQ#*nNn6#Cz49JS4Wo +zYY@~IogY%ewrVINPm|0_G|e)6#y(lzmRfnX6v?zz$v6?5p>1}Pnz{@}R_Aq|{IwISBt$!%_psG0lEF(#c1h<{^_ej5J{Sd@GaE>;9JLpLNj-8wqZe==mS|INkIPMtz +zU9PM6U1tEOB1UC)@%%>F-VQD;D(Z~}owc#4E7$$0ioYif1MceOg|4AoPcL%`t3{C` +zv3X4T-cO{cX9sUi4&R(S(-P1WA&^W;)bK6xl4Ftk@PoYx7ZaFIZW3RmZH^aAYq#^I +z=RJvN{VUu#8JL(d%{1xbpI>9}mS@^tXr_55E9py+QGh{@DbuEe$Mp&H{iKBCtHI7V{(5)@{^_MoTr73=q5`V<;N4kyPHWA7?fhDiE;X0qCB +z)J(%p!kdCSV5W4lhAlL(Gx$l(Idr_Bpafw*V>?37avPeuEmUT#j07#Z51|ik!;-Cd +z1)RrG7kw*WevYN&FQ=!qUs1I2%Vy<&gUY{uUFVd=6pUs#mBF_l)5&n$uV6>a&Walc +zhu-tHEDcxbBS6#g;DttCDDuP$j(psob?-Ve +zujWjX^J=8$C!p_nqbr=cw!srojzikDJ8IsLT-1^!R6b^g)k{^M +zeHpW=W?2clvxu&&B#n)BMQX@WYi1qAsH7L79A5kQZ;wYDt6?sUkxtK&ZI>ugKnRQ6 +zWVi0(1(ntG9j`qGQ{@gCWi*akzd2uMGuf4ZaZkqn0F3jo2^FAVqK>}9CsgB0ts+#( +zBHw&zI%P_AEtmX|OsSarGvS2Cy-KadP(~)-vy**DxUM2XJ%q4TvEouOOBGWaeb+oN +z&m6{`M5g@2pOZTl@eoI}!UIQ+;HL8orhzyT1QjL-Dj0-RXK+&vxnMF}Zgz7>4yc<+r>1)bQgFO}hA_xNOeiJn<2d;16LOSYXjD$C=39BPJvQ7?+B +z;p%RWIcy5@MMHjwrNCnNYPx6Uw}XMj +zeqrgO(51}5#1@XPBTuZ3`}w~yfK!ZK$JsbDUYrbI!8!g +z?mc-W&Iy$z5_e5z0f|-FqqQg`CagvCwh9+42;t$2+evcbrZ}4FsZls^c>5ld3<`<5tf!yJbIGuCAhWxaD=+Rg9VJdLqc{Cv`b*-j!g(0Q +z=7efr5!$PGi`21#=4eds_!7#5;tTX}PxKSqLJ*@u$E7{#nT&FBH|!3~-gRD=*$W0| +zDt|0^F#~Yx(O@7Z{AowD&7m80ycp=ZsaoTZb#8D-Vnx)%KxECvuzI(#XbACwwzzd0 +z!-+e5*SR!?f*SB)mvrO?{G>uxNp<30x@b0ivUB{f7%=aRKEVH|ulPgd9e;hO{8N7n +z5+AX1HQk{%df~#QkhiYM`QcOXmDn4LM0FIajm_^H!xMOU#jU=#;*^db~eYE6VbJDx`jh6FXqo~t=T +zoq0V18r@En$n(xcKN?ExYWC!8ZX1^AT!Gq81FK8Yiya=JfsJJ}vcshMSETNV +z&Y1x}ybsU`H)(!d4I>@iNQ&T-B@RLd9H#2qor?|zop{slToW_0x%;*{VZ|6_SMXUL +zm(6{ppNx2g38x^;2E6G(e?p~M9qy&x01eoa8$JU3*?l9k4 +z;WF3Z-}yD>)iK%`v9`NWKo@#c8pYdYd5KZ-n?9=b^d0Alu=V7yCM7Ij4->w?0dF~K +zhaF=CX+M2d*f>JZ$%yMwl#I?|FuZAX`if@xxJ$b2{S%zwddrFr&Gg<}WM3}4c$?PY +z(NK~22_sD!Z)tP0JZMTpR}R*TJel^?E?#R`X3F&BZIqkrn=jiOB<*I16`1&tn)@8; +zJQa}!hOgkxB*?gLT>pp}rlV3Sul!ZFBTumFXcOfuW5)CNygKA|*~p*^SLo=b8#?=u +z{~kP1`-OdjJ#e2o%o1d2CIDTl^#!#pZS22^EiEd^PUpFtp$~%CmW92()@8z(j@m|ZG=3yC~;>bm&k8SyX&0TB8qIs^77(=SjeZdn!wiSv|DIHX}Bx^t5w;MPJ5QvVq)rH|WB6(OpufrmBAwGk^W=2kg13pw*1>2<%=M!7aaP0xFs>$#522(=|l +zXB69a1yK_xF^Cti_^nv4P4=uRS4;z`RD0tTG9km53N&ET6KgteG`jW3(32mUPBCNd +zSN3*-a=ZtK)3Z~a#A)H}Y4H!g?#I)DI{lzd&74kwRavj8+65eanU(9DF5SFcc{_%i +zxRDwK%s8FwL5Ekj)y=8xWtjTz#x>ZuZR*~6jt;!z@wVu-q@5mcD|xO76V8;9E0-$h +z{;v7;^lBO-M#oswz-q#Dot+kWttRk}?=H!op(*70PV$Nv2(XTne1ts7mr~}i=6sJz +zKBn~@oa&cATnBXAiAR~+$4Yy!at +zX-<&@ALEof|Cd`VaI(A>oOCoqMeSRpMsLu-^MYVcn`a}5kuX+u9o&kibl>F2`J7iT +zNVeYXvIlkRUO^LB7~_mir8e+04i6>cS3ki +z`g0ZYT~}vb{60Rl9K+93Cnv-ldqP(30p+ZTwE(>1CFrt+ETt+(b6yw@Ti!L7pf7K+ +z`{9*d)aFgY&&Wo&WY)@NruBYAMweu`4%}U7Xw}E@J;Ver3#|!sVt>$+1nPk3QL*RN +z%FOj>U{HxA-?Z1_5@5D=w99A)XLEv~6bW3=sRgVk+RbUhS(cD>*s#ZPCN9$<0y7bg +zaZ$|~2D2!Xnn9B3q>aACBLCD>*14BibxcLBrH?Zn&qardwE$wtRVNLWQ~#o;9fTlb +zpU1x(`#gUMDGGqZF*EFzSy%_ZD7TuMXW<^Vfh>4&8@PDZ>9l)WrAkd2*b5VH@I|0ea##;9dM1(NJ^Mu0}FVcBF~JssGhd#E7{{7Enj1G-)v`kZ3PdI +zwYT!SQxCUy4)=DSA3r1{;2!RY*du}REWSg3NCXb(1UsY0l6*St$`b{{A>TXv +zM5>DE%Sfe_n=+_;;aA)wgPqxI5YrRZ>m(tPA_({>&yc~Ol1lLpoX|(WInKJ*$0$(C-D_uO$d#fpJYSSGjlR>x@vJOyT +z`jOl-N79fGnpp6z*gSMG(_SWKZT2GBI?@ieZ~aeN4G&=dnloY+W;*%k-Vb|sydNBr +zkzCF&tY=+ycs%y-cpN3~JJ~s`>|Z0Ej3jTpkDT?!FjVg_Mvp|`5*-xnHH_(EU^jjr +zdy*@ofH%pU$y0Qp#EHr-wEYQlrYV4!VNoO8^|`51&>7AX&!2T8PsLx3Y3!_FK?JaI +zQ@tOsv`b6sCk>G&#^oBhiJ_Ml>(fQUrk+K$kkQsItMQPGJ{Sb&oo;7zA6k8KOOw?wN@l1Gy#UyUs;W}Y$0O*sNkRi?sU-zEZE?1SYDHO1iZcRH +z%Si;)DhuC%O|bJXg$jwmP{(}EYSDR|Q4;)N6!x+8SZUbdemahU2rf;mdLbG^cf#zJ +zY30})=wB$G3K9+zxWKL!?ci`p9}C?XRWon$X~3{2vI5fOa>K{m7?E0Vf#;h<(wXb) +z`!O;M3ERWqn?P{h4ZpHgr=FK=T409z@2d<%H$#8_$(tl!FFA?w3CkPY#0V^<4UtAy +zmdCfglao3LOx`*LvK1RrZVcG(!!YE{)=~xSUNK6_qZm>U50p(4`T7XH7=tJV_X*gD +z*8X~K)DgGHurkJ!%aa<(fIO&LS&n8;vh6qNS<7<#5A1tCb1BN-!~`egd+E!yyCFSl +z2R};Wv{GJ-twP$*=sE)@?qxBj{La;LDE^bS1RBxN$jR!{k^A!TqA=GqNX;W#FH +z(ALsvs%S%TkQoIxRuF%ltu8U?543=bzvS#vaP`hPyXl&fy=jnxCrl8JIG9+c9oh9G +zN202Q6~oenkJl*NAfnJMar1B$%G3aQRm3=|xJ+;-kXkUT*02+>J0)q0_EG=P{&>i< +zy6FF)gAj4DZ6X7T=)FcZ0;i`y>Qy;it2tLywPq8H3zmu8GZbg$84ds+(~KgbXDc$xYP}c#vv2+A+4+gOv7G +z4iziTw28zd4#ja(mm?!3?2@=kJ%c|6SYMjq6>z{dDf5_&plql|a&yQ)j-yUvE4trZ +zIlQ@fwYyAtw-T-+)ZrRAF +zH_%T;JiXMLnJb`hByW@HBIW&et7kS{NfH~hQ +z=<2tGq3RNtIDkc{*j_INVst$?*N$R#;=ogp$p-azJjZFO;}&|1X_^>wGW-?h;;r0y +zNH5u&yPk=V(!1<+&xAnXuOQd4qw)-tyJ^9p;3rV-xfhc;ce4=F6DVo#DDcouHS8+VsnWzcSrcz4Pmm%SiyqH99lOo1?cAJ`xs +zcG?mGfQ~)3@2U8|EgEtZkHB01)h6Ksj1PLv;4P~H*>*RrmW9|R?p}ga)kU(<+!h;+#aK^WP@(9@0ipXh8yuOYcPI3()rdw4vX^Xw6U5pmGP8B +z(D}0csr;$%p|)%aAvs7-!cZXS(Gyjl0;5r^)k<1&4YOs@^{iKgqj#PwLHS%4h8DE_5>xkN2MMAnX(eHKS#w=EVrADtBSl}O*eWmLg?8;pQ7;lxwgI;o3r79GAiX#o +zsn)pHOG| +zjjHg!QjFnm+T@xIlA{*N8k0m-E(fP%di8?GsHM0+F6CRN8kBI}4KLwxwqC>xiu0Tc +z67CY0W{3*sdcnV45^TE}hmKwLqrg>-YfM=?yBTE{(|4H8PnEl-0DlT@==wRfB>voy4Ox +z237;Qhs}z~{#8d3XR}D8>H5)C5}Z(UmoTs7!Bl`)aFroai>_lb^6HTpop}4zp#X3Y +z97*x?Oj<43i!9rt&;Kj=P=K4k=F;g+I<<|_8*Gmaelbh$CW<2z56W2*Z}?bBJFbM~cg^$MH^cyk|`n5eTXzAIJvq}5M0lv=)dRE9_$zB5+^UA=OJM!^Exq#h|2dUkwoAXhmSC9l`ua702uNF-y8Yco&X@i`3s#( +zCt7v*r#Z94bB5kvH#eUI7pYbIGXZ01QF(=v9AM(AVTamWIwyou#>sz+^GPf>poMx?zgg@FE?;EB$bwIWt#MCM)umD +ztA6iJzY1u`%~zN9TFP%Fw*`-q$R1Y4aAp`rqWe^h2}tWJ<3s1vGO}4nXZD{g~#=9h8)VWnt9YBWw@j2c8Hd4oSJ0~ycr(W;=v7d6sXWsDc{eJt~ebOP! +zUf7KL=}ve(qv&Wu*be;sajFxp&}B4}#m{tt^w`B3TSQxZdZnkQ1| +z6)GBDiCb?m3qg@h)K&@1i|U3+^eK&q=Bz`jRTXRV!2h%H2KxDi1!Rwm+FGvPk_P1I +z%eW)2CU!6DB6oW8mM~ithAcUZZfu5zc8=nN)Va0NgsC@GVItMB;0hhuX7-+w6|=ie +zoSq5r>%CX*lWKJGjndnt+gZROs3T4vv7IYFl_%fT&9lEUPV4RKp>|2HUm3NB2T_lu +z>&F!SAEYz}!%iO?6BR&GQVd$YDHS@+_aEF{p?o1pUdXgOx!{shg``fwrsaJ*dV5cN4(*5 +z1OP6$z8!%a3f3ElNBFOZwX;lY4Ulp(WnO790=|ld@37Zygm5Qu1W9X-0CB*28yN3C +zqh(ra0x(j9#JXCeojl6J6oz3Ob>Hh))iFj@7>@h++FnhwMx>o^(T&c7u0+{u3_1hn +zWoJ&nbk2_9Rdf};N9AMMS&rdAn@uz8SkKm|xk>hCqe#DT$fyc_izug$Sx|3W-<3sC +z^7O3VE8&%6!$@!pimtH&f&nBNG!_dOtI2Vvr_^yICb!G)f7J_S)o*UoSxtLuG3aR+3xGq_yzeb}acsA2X|-x_UxcdS5OvxFJ7mKyi)!Lw>`^{R!Zo+ILXAyBdsEwJO +zJTT{=-*}v*azs45fq2wr9*E=r%Zvzxo3XeEBy%u#5W3sM;?kmWUh*x7g)_NwSAA7# +zM3F*i{xxYDPHM2nTrv-xnOn|~PHFVy5>}R8(uUh9?QG-vH04M(*CNZYp~>{_3QOKb +zr_&ta!$o|FZe8!O2IEas>bGv4T}Q4d$3zL6V?UFe^0JgNaoc6za;er+?i{S%YLaZ2 +z&0$-T08t3jAZ=V4IP6ILsXs?ZpHGv{`j2HHdfI4Ic6JX_O3G8#sXr+oHQw3u8*(X6JXJg?=hXNfrMwhIX+VzM_=?FT={rKukx +z!;U>MuA#3eGr3DD{HZ-&->S=_PwkE(zRud48#DHkSC(CR&Ahf;{8M|C=uaXfwlJ2F +z*%*cw;q|QJym6&@>DDO(T)c$6UHhU_S6|9?{B`|0j9cS#_UGJVXF*-hM+jz +zEt$csZsk>BPBVAfqM_?qhdgit!BLl4FDahbA~OJo>p~qFDIRHwWA~hg7x*%7CWT?rwgq#kYB8fM= +z1jCy}luUD6KaniS^bl!~ZC39o%4Ayqd9=y&t_8Od4j}Q+VK5XYGg>JCCpGM`5}*_5 +zH779pI+_?cM}bySt>FJbM#`usIrVQRPa3vX^)Ou5AQ(cz2!@DEe{u_MdBedUFc{Y=biKB%N-mjwEM-( +z)Ld^kS-jvh5KcVEiHTg0P7hk;2CQ~$4+`FudwWyfzfm1Cs+}*Z7*XZj9QIUKu@> +z;C;~PinnR0Yx}1a_4p|6bhi5VH +z0^TIAa0_t%($ +zM6{6b8D)euN6p;DrWK0j$f|K+_2Q>?r3^JvQ}mo~lGMqD{hTvk0LGbb;7D{M|K*j0 +zYqL0yv`o{6p4TgNclUC+qTL!r_a2fM7mdE01W3z+?D8J%I(sS7vs+=fF}y@1@*(DT-~)r&dUqG@c(+=XWC +zfTeC{qBEmNUWQev&%=-b)6yd&?LdZ;urm@0EbXk2B^s2vb;7*1G}A?WF^I>>BC!qq +zTOggW@zf8b#V{Sf}*6p +zPv!2aJEk4q1JSW}o8NzG85icQi%lg=RqU#vNKq=YjKoOtI7QDA*xgj7C$YFSIYTIx +zu(!0V1C-c8@`W-9+0^Fm2Hg&+TpfEIeCG~RJZ|TiM6k}zYyxn`v)^=CVpcZ_GVdoR +zg-M^2sAw#itnLrF*BiWVnnHQSQ(@62+UaBYBDbX}Dwf=!Sn|RSQjUf~(JDO6sH}iAzwa@Za$Ba +zP@X(pq1U4GZOZReIQDS1Zde53FwDW4ucIXv)gQdS%F3V{^5 +z`&=oncIaxX1gy`K0aZCXcyfAt9*6HH3_+JLpv2`knP@>M-!HKz&B$!&I1JZI$u +zBR5gu-MtAGHpzg|a*p}_t;A?VVvtF|Fmc4Y!IgJi4;Cc_iuGvV4~7SJ3zt0ag4&7a +zY(67sW;|f#^8CRvgCjXezH(pp5$BjFa8NL*SMw%_aVqQHVru|PK(xOmkEp?+Y)g_@ +zi2Pr8mYdE^PBWJt%Q2ndFYc~UgDa<|tfw)E^-^W=4_PW%D7#AVZzMaHHGy&y5c&A) +zL&Ee}3=DtD(F`gvo1x;lYY}hy?(C;ddP)kHSyR8umD)6;pjf0vjF}~Y8ZmtwJONF; +zdan<|_fMbb??GmMUZfag%ka>wtrPhQ2aoJWdpsdmRrV=OoJ$UYKZ)}GrQY_gqt>Tpy>x56)EB6v_e$eGnYUS;)Yo>_Q3E6rW +zKtCN{WF2R&%v{+_ztB=ULH|uwAGGQiOtjajgEY}a+tm-L$>ZZRi@Orrm1&CN&+CSG +zM-X&-lTOOLhy*jq5T@*kebHXUznY`458INMzP80*nr1Fe{%pOi>jtRPPupphIZn`q +zB>I@g1|H}USGrBJFg{ZR(!F*rGM`U^Z5k@WZD?guN3*xGydg5@`*XwEGh2-#XA2L& +zyUnr$bTwul^irM{@dA%{IC(Emi;j+7zL@7lQRK^eRiwcITDhSWBLW3r!{;$xSExON +zriN?}Mk5O03L^bJ-37j-2K2kgV#Fj*hKkg+Ub581f39wZ-&RFd<()?QkMV#Sq11XD +zl;wT5onjXXF7EcPcG4_&Ig(^aC&xe8R9-D`JEOsHn0CDe&vX@bs4{87NbJxJa6PGor{ +z6zK=@W`+^Ka*0R$SVCY7^lD^~T|Q0z1ONGk)E~OKl7kf&8GZCHR)N%@I7xWtO%tGV +z7~QLTPy^@`4&WliZ41H>&&&a@LeXkzaMLx#5WeaHf^!-GVr5yH84D^gW}{G+>`Dy> +z1Kxdix>pqcr#sg4G{`iA90sT9Er2rxIU%`#F}|g2Fa%EN)^+vPjKf`>t!u@jyAr31 +zRX*IB$hkceci;>eN7mI8t@bDa01n>m7 +z&GD@&uQ3Q86Cx!1ATD?Y8WH(`ZQdLe4?Uwt$C~4*)tf)Iwa7)yo7NasKZ{ne0e9Sr +zj*W=lM%e0RnLNLA9tn6WBWkzP;h5YkU7NXXy%aX}U?D@iRv#c@h}Yg+0YmnIB=)*Mg51y{ +z*kG=?i?rRs!04^SC5#~HcgTSU9dyg0HEf5bd-j8NEI3gl6g{S6krnk8EW_{XcpoKusQFI@?e=8EWRXmjDeRhn0M_Rq +z#lY|qA0=z`-sydmaOO$Y1x_5V1vZi$L)xG{H)g8nZkyL=DQ=-HCyiKE}LkVgy7FCdUJNu=Ec +zgxoPQ=@QBZC6&Jyv3z)P`EU`IA`N~S$)qs@O^P&3Y+i(J`XmzpFq>?uoA&*W)USX5 +z8WbQKF2;+CTW?{=Hfo<(a)KU5J<1&kj2GRpu0OQ?3&5PNolF=a4frP}(^wqEnZZr| +z+|u3&Hr=s+i{$SM$9zMJY1S)@S#+Cg>~hklnCz_{ignz%SZqmS;=|4&lw9aBho6qe +z>F9xvDmOzdYO{b~Ty@)`dB{;FUqqA!v=X~8Z7NBMJ466+DnCj1bdiK9Wa8fRV{8Ox +zly^dzveAR;i_WRLpHd9hJDe3(G1*m@e&3T@^HupTuX|Cya%yfk7^BGAlAFf!9xl4M +z33^?xy;)A4d~c#wXxJdWPocU^1-;*t+X)339?*4UHn`-?#Yvsa0pCL%(E$eku&tKd +zo;kepLh?x>Y$Ubs;V=8$9#0ESm`xXV%}~xH%po*Y>2^d4Cq1xKc%)-jrj+n!prw5YyYn|c#%SGzaB +zyE8U5dXIi<1Xk*D#jS+&4wXbec>ZeN18{p3SJQ#A{puJn)vkFd!e!89UEpt&kLjEi +zuaii5FG)>(85c?ePKnOQ))oKqDM4f05lbbBF1294+UrIgvgfX~!hvsAR$!|~+EEvE +z27-_`i<<0z?a(UBY=U6{xTQt`nhFfo*M76_QpVkKNcc+e$S}opS?L%p-hw`{+HPTi +z^f}3s82)>yQ@jU1{JysDuzit}IUjrQC!4aHcnTsxhIJ$E2UTc9`t^#14{z-rOLv6JzuWGJD^qe$M58~z +z*+b_*ATdbz2-j)S@6?l}dcBTaQip`S)J-*vQ&iA6s!{tAv6xrW^n$8lGAdKFxIxYo +z+RpJnnw;B?p`IMHvN69PaHX9MB{3ntV}1tl((#Ikr33FE)WNTP1*A# +zQH_T^x)dz7wb+rxAj%(G`d*K&2=*16UUTmrDjA$%_{uxR_z3&=@%8WH>r0O>!r4SH +z_>VimykY#WJ;VqcpN!G_CpA29d*sGpRh3J(;ogF<3TP)l@i7`^=;q7ogOfL}e@)&j +zudZHc0FBql!W()tVS9;6)njrYLCl79cVn7H4^51SiL(ojod~fYmyw!oW1|w&8(Fpr +z(A-#EiMF6A6l_#@cRBCZ3oil(M6?+ma+Vji@oievcCW?v3sXDblrBO>O{00T>MMps +zxUyCTW#6=7QB4lY)~sUDnkbZA1C2#v$FXS-d4A6?oi~e*bNK=1v@d#;9QCb%5#Un~ +z-AZx4d&WkEmPQWhpIeN#Z(~TGtmci85)EMz_oD@7&w_rMeS2}J{plGFdT#u7Mq)Ue +zvddc`1u?A2XAbbt2E9oN;*(y@>Ud{1JFRj_GJNki&gndE$3a}F;nG5k|LHSHSvFg=hhzpwde +z(AGT}jAHF{*~|-sWS}Em%*&2Jt6-W6x>|owGee3F#Upw|0wi;ZA#@IF&JYb`o>}=S +z?t=RN;N%v@Wo>~B1cm!0MuSgFv=KIDa`q67+sbc?53e9cO&l58j{D7$ALxiu9Hw#$ +zP&Mu%J@?9e)3qd*FPqkKoLCQc6lb_5WFWVKS`eaNxJ_Y)plcnWmPus;2!u`+=)w6V +z=H4-vg?y}~A2kc0YY$1$?5TihgJC0qR{`QpvQss1 +z9P#}|0`Wc=CpoH-wkJG$r`8e+n1LI6+&kMtaCkAwbFeBo4lIr=Dfz5g?e^rx1_%*9 +z1*t1{ML`1YaG1IA6c;sFJeH?STgE#DE;f;}=JT*`BJ-brd~@Yo_Q?vVvdBxZF$DoA +zqThnWSkj29?~nR329(HVSYw}wN#EoGjVHAjrlXtCBMJY+y^`olHL;a8y%s``BpOjJ +zxkbmix1UZfvT=7j5lm80bQGCv^p=t4XqbB=IGJ<`iwD;JJ&hNaE2iMZg|jO%bM?%e +z3s=SWEw`}r2S&H9YD+I(m`*FI9C0X{ACKL(>lwW15;6g!Osy&jTXiJO*&Fm`g=;j* +z?%T?G03=WV2YXm}XDUitRPxtyMH{w}8aUwF^Ko +z&j1+jn*$m@KkuUBEAm3u6?L*GI?&MR&<^yNxZD~F)H&G;tm_uN&~#o2(oMAZ(3c=^ +z*>(4F{4Ak=@{#JYfw_#x!GpiyD4bG$R8lE|F%-C01;BzmsF(*~wBV6RdlI?jBG37G +zt*xw9M`dM03cS%}-y*~N7XrvV4bLs;Vy;GaU_^HlG# +z!^%=xzp5v#?uV+eq>!5<*bx+)pjLxA$h_5<9hMP87kZb24#sAae(+P_z_;mna6DDu +z2b&BBD|!UwgUyNK32gkHtGYY)0_FmZOdrdy_2pGF5cZ;WDo7JvC2@}ShyGPkyG&>Z +zl&1~q_#q3}<9?~#;X;Th<&Ou4&C}0`c9KZNs?sxZohLM{%vZ63-mw&Jr2JP42nSg( +zo(rsDzXJz=K@pDdaLc|cw7QP+zuT5@43rd>qrJ}QTOM&Dr$HQ#@VHYJ7Q;nQ|X59lZKRg}7xp=IdIKSeaf&$*Ya|fm5AS`al!uQ|D +zM;IHC6FVce(W%V)>jCgW8eOPB{8V;>h!)z5^)yIzLG?!NXaNE+9t`vQ_@fP7^7%u_ +zCmI^;gzNg-oIjPqZ(Q-_E#;z))Z;HM1JtpF&ia6B$1E +ziQghv;HBq{axvQ{$p?4@a95*e1eR_D#T!!IJ336|UM{M9>6|VP7$7PaA1cpcdSs5)3mKD-Dy)2dMepDc +zGV+V}HRM3eBz6a0{B4aU214x(aHC%6u-T`Q(rrFwhzrWCgK|ufvVnN#q{nk|C@rc= +z6e-yhk~WU#6ef?Ksm6US=jxP}oQ#wu%5KcDpRw0X*z4BK?^!=%Z@xZP@iSe8pmVrP +z+lC7^BM?tvK?~W>7=xH&JEyapGW=M`dW?XUjR&K&aMz&H0-O4M_RHDS{bIg4%7s_9 +zXkMP9-)rv1+Toijaz98^?U-6MOWjc~Nb;P-Y81>W*r}U=XmU_48WoSGfWY*JFHl@{ +zA)p@%CEYJ+bEXiyf0@+evK#=T>6p}?4lff;_^lPAxMa0XJ;V}g*Wu(K6XGQ;#!_w^ +zar76q7P1Dq5(kEYd}XYI>2}aUwcYA5lhjeY7ps?a=hoJ7b@-*}+wRue!)0%~BUm3MdE3lR-7H~F +zhA?CZ-E>_h4V0J2>`v*O=-A-#%#+=zFk2Thw{Etzg+N;=KH+iQV~~$bT9ZcHMvF3I +z0aun{cwH97dL2g`bC`Idyrg909^Cpzs$|BgM^o64by*i9(`1ty8xigiy4qd!Qbn}F +z%0H=P3Dqs}(b>0Vx@6g3)XJ8Qa+_jgut3E*F~>q;vcuok0lP1xGZX$2=QR$Ux` +zn?C>^4uF5haWzR8(GQ{#unlNQjBpG91D5PyS0Z5cZYicQ02xDuku!D|z|ubg-q3iOwofBYe9;2AcY!`d#S>F +z?T3)aDT=Up)gND={K)OWlD7jNKo26qQcK38w;|6CijayT&_s$ +zVSEkm3PTZ>l5z;8Qu650BU;*Q(jCK*oxSZ2lRg^(O1OFP%QBW^96N@FUoz*TEB-ok +zy{1_6!DQ0pfErOuko!D?pFJV!qfr8@Oz{WA1mY1cvX7 +zF^VLiaN<-SiCdfM?gZH+E+gAn8qN%WtZq;Xg=yRKpH2591cjL* +zF+sFe#q30C7hlvH%wI29zT3PCY%0u>Pcf^A8&!mR+q0@LJX~N=K__6|nj$_5hdsEf +zIYsn79is)ZXPBqW7oBuYf`jr;r2>SvG+7zItvUrORaSM|8! +zfb=Tm`a$Sd>gk8Hyt48vTPf4;mCAV%%6^fVKAd8}20r~qY6j--6-XOXjUpRv)IOmm +zsVRO3oP>n6bk-wY%aEGNEx +zS@z>8bC#E0>%VU`Nbd>-1mlptJC7eH?4pJ`j%+-dU}6jwEp*~?k~&77@&@+z``+i; +z1@QdM*0@QiEAppI%vKFw71ni~LW@*GbBrupHH&O>3@x`X({!>Am@6aZnVOETu#lb`6=RPB2D`c^1MZoV5kDIyL*P*)hi?? +zp-i`kpWz$gFlGwE`8-5C3i@D9B0_>6z)!?8fWa3J<{~oHHNthBoZm;p;$*3ua}SYx +zTJyMtOmPV*+=BDEf;gEGqQ2~RNZV1hgWUk$pvOUNu-6Sc+zlDPhCf`dIAt$!tLvb{ +z9CrmNO%&zt?!^+J&odoa=5b<~>cGO9X>nZ1Z#xgCEOGQtF%Qk0qvn1j@!vG?-!$-_ +zlLi{hyc02u)Y^=i&B^zFBg&+Z!Sg~9;Ocr(hE9_uFb{M@;$4q_XYwn^y#QO +z5|{GfRtpn+ncI6~A;;U>Hp5SIH)=s@9lFtYd@~Bd``C_n4II7B3clXI(Q7}|m7xZc+b(~ke?Om^UuUig9txJY +zBswx^S?BkeHvK3$ZjCY~D0I_B&5KSw8%##+R4+E{K-!uFDjdJSPTICdD-4RTgclZF +z7vdF@Qe*M)>aqcMO}&ID=K6$!+EChW^%%17sxWFLDV?@xd5|oxQe!X7Me@aMQa(O8 +zdU3M-5}L*+Ehh1F`R{utr~5~T<+J^ld#7jHFORAE;^Rl%%T9WkG@I>VZ<67Ei;poM +z_o$yVN;^Q{K0=wa-|1drY3S}4W6}5J<{4G{Z}El^kbuL9aAY3D5ZGBT}wM^w@V?}o0Q{BUP-5WG$OMP+`clCx=6^>2>Ssz>oU2@I@Q62ah2wB +z-x9+eds$tC0F{koOV(j4sSrLevYMJ4`;D^fzVDkDE=r>1lyioloD`PioP?f_qHmlu +zH+fcOwKck82WoBIGdtGnCb4+|*a%J9@u?C(2pTe;ZT>~b;mZWSV)uChirzjI29c?5 +z>@RZ!Ed5aEW90X$o>}jJsaXoERm&wyL+lEjRbmaX$*q(yzg&;0_(13IQ@fKN*+UO^ +zZr{qBFj4GZNi6LQuSR}!of>DlHTviz*BE`i|Nqt5Z)yfm$yR@@FG~pB@@iv!by!JC +zmG68g7Wlw)~hrg~StNObP|ErWL$#)Sig~&H1mssSot9}8kkf^}S6~TvGzU07!$lWzmX+vTem)LR8 +zpT!r@A%_Zi=#TV1h+ScG-KtkT28vBFNGRqFpa{#B)6m1?(ykP+r5mxc;x5GRJ`~Sl +zMHCleRO1ZfiEKdeU&+dw#QyH(ttQSCT(lD~!-B2qp(lm`MTQ$&OKNYEr^$CV%&`;k +z_{sPGvF--*G36J%*gf?6F$EyL>~iBcHfOr00mL?9TfT6(PCHYG|7Brsf`vZnjR(y( +zGBiRYq$Xo>oR5ssDP}!@SvovA+yfSL +zc6XZ1D)L790A&(~2ON(QO5m}Kd?w8&{M-f+n?CD%x)=-C(lfex84eKzFVgXQ46r8* +z6vx6qJe6@WBTB6#e8YxZZo=(KcUXxoyJQfpP6so1!mH1Vk7JX6{U!ks^rORgPFZe> +zOwyD#eGHqnW_MbuB>A|uk}UD~tH~OS`|~pcEec^ddW(T#G1xL&7=h$*gT(#$C{2Gj +z-PIV-#J01X@cd+N556>iIy(8=_Q}z!!`;Ql67!Cs$7|^WC>>9Rn7|XqBsn}|5M45~PO{?$nl4w5?X+bHLpo$1zl&S?|0cx8btfYaK0n^3g +zDv<=o6U^~yQfgst+fggKW>?Ev55qJ{Z3)&WX`t{Xl2bcd11O0Nj`8R;V&Wvzm{N9N +z*s>;j<@kjrKQHbHT~*1UYo@Pbe^P%^{}XKv&3)}6z|;CVQ*kHd^^@gK&ePNSn)eI> +z7QWJC)}m<)Z-bpET+1aLu^)pAuU(=mT1t!+T2k9Zc-40EXj$@%m7P4^*Tcz&f9UW^ +zd9!H~8d$GmHP;&{QpB-LP%@{TC~$bge2MLHf6zn~A)L%Kf^u|>7(Ie1MWa*=jn;}B +z>h99M(J}=#R5IfoV2k>gDI2G2?cg2#k*g7klDNAlii&9Dyc#5{Q*|f>(FmiEmQ>w| +z`uycBBBpCojg+2!y>YjiBL2&En)!Ff@v#qZy +z#$&DW^%V(*IO<{pB;PVcoxOh&Q4OXV^YwP4Hu=TC}YAsx}hG&AWsLO +z9_1dRYi@`OeV(ii_JXwTX=07EriF_%SD>bWlN5FF@3?^tvK(uX8zBxO?T>9vX0O#o +zS<0-&+V||Y7VJ!&+rk;p&WC=C1d_BDKsnnzKjdR$z6Qf^ka#y5Zsz=js5kCuql}md +z=7u@npmOvwYW6B4$Ch)Kx9-c?*X_RlL^Ss4T#-+mxTiCto)#go3Ebh%&kuXrD8=HQ +z0^p2ce|*gzerA!T?=nSix$Zc};tf_p7FbS-{Pp`!;?83-4jUJa_an^0G)l7es5>Op +zSiyM(1DSbt-Q}qDx^aCmobzb@LpJXNZu_n;x~?evfvOx(<}31>PTLa}5u7k8cRoJv +z>bd0Daj@5RBvcDX#4TbeX=P1*5ib+a7cLt27_)Q6>LFRmhihM)>ha*ED6$z5D0HjK +z+eq>-<1}yh@O;}&uma6<&2xbIoe5>zb>ZbZR0!j4*WeQ1Yj@69K@N#&pa~%x3uIr^ +zPyVhqScW|7IeRgS_Dh4VQ1M`IP{vr=TOE8LbBNVGRc!eEWG=c?xF76=w)En2FueRd?>gMz}lf?O^ +z`)%uSojX*#E<-aG&+YgBn+&88k@r;hg(q-!-6c(W+{Dhu9G9Cv9;G0Lzhix-&EP@0 +zQB11Qy1Ya!i5hAEK>_KjI~WOf4>joEH#I3USch~=O0I4EDFT~b$zkY;k67_B?559+ +z(zG34`dC;E!9MBZhQycn^pSpT+Sums^ep*I{|_M{TV2NnC1Ef1Cg~>d8C1<)AewK} +zM;hz9pjSg+Y`1nh+3tLs5cttVe|KP+(fHD&UX6~U;S3ugJbP45B(2=(hiXO&FOjQT +zjU1MCDnUOp=My7QjQrf>RD6g2u#ot|p8mLZaFCSOl3MK&Xg5Y!tkLJdm~M?l(BhyQ +zzhNzaYH@?CR|^UfxK@jbi`>XnEWCc>3Css3L8GvZyENfLnw-CZ>6(!GjFX%8ugC`+ +zt)GzmDd8b*t6#(G-guY+@6!Dduq6GbPna>mMw!E8N{DT>Fhv>p7-9~lxuQ1-{laqrqsVz6KxYsH;b7ls2)aKs1l12HMB +zZr+jlF-zXB4tRKIf!9aJ*=#ZINdm(#e!fr`%5G96YoaZ0z3zRcd<-Xtr!aaZT3BG> +zk|)Xfw+_4cy@3K=D?a)vVRWP`I`gTPpr&HLfknMziDq2RAD~$Kp0FmoSNm5R +zIt{*+nvhB&b);yfFz)tT!)VlHVnc=*=A#PWz?#2|Qeb27I%S{hrfa-F_2(&KF2|pO +z0o)AW@IqWs6IqT3#^V~0ZiqY+F~~zkKA?omID8KAXYLhxw{?d0DKhYCCQsI)lu|D3 +z4Ks`w1^a6>xIopo1Tm>6$^Mu^!DhV{rn~53Osz-BO*(GjJvZ!3O!Ppl;5?yW7y$}N +z@Aw83u(UInU@8aN>>b)Fuz_JbNDDT_B&tN#PV3p~uRpJ@Ru&%z)B)3m_-`saA6&s7 +zk87`fPTpqMBoiJVo$mh(piE&L9F7JdH*SqE8kPZFLN@F$GBg9g9lo=BynXhgaMLh2 +zB^-3X^G7}6H?auQ5vjJhVGc8X@l2>#a0oR*-ltL0X;|QgnrFnNrE@9BuxHEYlF~{v>t3GP4~jGm8i>=goPZA^T?zEi?@0h$@o?l!qRYe +ziqejm;#cuGvQZ1dolYe6sK8z+*w~uBam}x2Aaq|Z$A}%k&yDgr0rck@X89YXI1aZv +zHFZbV2!y3mj9he9XtJ2Nu-l*5XgHEchEGtpyYnRhOr*BEuM`xQ7NK)$=Zo!rjM6c}R63M6?H#2h9{{M4~3&1YmKq +zw1l|)$g0C&qQOiW#EZxpd@#y(*-0Nv1L)Qv9n{SbY4gZEUbiiAa{1tRpHfIZH)yWZ +zuQLP?E6?E=uK|@u7@2`ud(}#|T3@bxpRBG9Wt{J?>Ed6cD_f049RzR(zTFK94F!Yl +z4)%XX+eFMw>%bpHG2qWJuPmVl918ub)SH*PfdF_i8r`%X?08)yCY}W+V~gAH5x@q= +zSYu(1&7ym?-RPBG5xq)@7q(Z)mM@isnhi{`I&GYL^_&H^eb2SjYE7yplz>TBq7!fF +zRg_&Cu_Z|G8!vy`>yYGLda9I}{nR4i +zLJ2F_5Osu?5DCj!6`FLwVtJz>Yx>b$i1p66u#)?}UiUsZgxIdx`fm*oMomA7b85)) +z62|`=?Tr)y46xvkYLshEIsNQRyW@^D+(>1PUg(v`p8&|n`(WS^>rm8~rHD35TvC*x +z934HzD@)sHmH|`mk6Q37W8QAT5rqF +zu~*%z{{k#>44@0AforSQ7kkWeBV+8{(n^FlvdjRIS@$TFEs6e!qb^YWrd;Ah({T8v +z2SJJsbGe?6=$r#w=(XiWO+iv#4lEaFwQ_gVw#)q8wB3uRgPT;NyQ@gs2H}A%Jllib +zpkHIbf+NUAx@O@jOMzMKa1GXqAiF0vzvRwA)~mqU|BxP?CMVwrF^mu2J2P`P>;CDv +zy0HO#2uOpL4~eFS^f2oYnxKkdU#c8fE_OOsQ}HUnCb1(?97m??CD`qX8ilK_ms4d4kd?%0Z=w9!XVbif4Lf +zJrR>SY>**BxAMIn)#(iem{(@Za>-&WunEO7sZIyKh#C&TiRIK7z844}~}f`Q(CxVh$-4 +z{IZb+WJfX5MFu`~tVT0fJko|eb=OQ_`)TdFL$il1AGMZYd8DT4)BxU9qs;`FsLR~_ +zj)Be(MjKINF&EubyW!qJn>NlI`4WDS?WncLAhT3$ukN)V^-ojY5Jn@}8MJ9zhF*dHliZWqr;h76p>tI#g{K{KoQSt??opUlFLyvop7ymiHFl|b*PI?KL$N~ +z$Tz;(9~9aV#D~JURUE=!JdPwO=+LrGw(=a&s=47gLRMGGbB3%|ODhX89Dxrtiz?Ae +zTB&M}!nrdO&K0@T4VzySXTKoIz8iY|o)Pwgpz8#yIb!Sckq_8@lipmQ-aD6vLbeFm +z+1ea|WH +za$$r*8tN*2yx7@=Z92!j`f1F_FWx2Ytev{K!#gR)J?~I;Jj(46=3A@XvL2h7#0&7W +zPgh%}JZCX{l!(6;k!uWA0)rV$uC8-=$w?bJY-O-zzLE_uF`(r{9Jp!9{mk8woZVp_ +zb1E?_m3d(@bFLlu4|^HS1OMM#R&ys4MI^I%baa8A{XD_A2TytfV>dE2ZFw#pH`SPx +zvwTWOZr{RW8q)f>YWb^w*7OXvKu+)GoNl42(52%}Dc`s)_!{cKayDi{Bm(X+nmr3B +zUCYEKml$QZZH=+~v>;}<=x&{o$$egC_Nf%ibEdk_P(qCkVz_Hnl5<2181$9xMf#5YBQZnQbA(N&gg(H%R*O8L+P;P-@+4lLG#lypW($o%2t1s4}QcWX_cynIeWY% +zh&u41w=UJMs4qk-@iW`VsbHK4TyI{M%N8QQES2*wHCpIuSre7|u~}n_5^qNV84tkf +zXE>hOT**NRj&SIrg297cK5kmDyt4!}8sR?2#B$|B{e5P!c%m^BnLms_K|r#qA};g4j;aK2Bvz#H6?>YjNWSEivgt&|tmdyP%e_{21x}om{$ORf-s$zK +zrki?w^`hHf)w-ejBx>23IHyWd;|yrdxxw+fzT9l}nDWvjyGP04(HRgSaZ922E4}n9 +zvI-?dwYhvxG$Xf$tLd3!-D*WiV^*OXBW`krm!+pwC?qhclm$9seR)WMk;pg|db4fH +zFA7qGhJxO6CFoOZTScO_Qi99NSIW+lG;rYC+|m#LEsf>vWJq2@A&sttXRb8&cS#KE +z=-}D#Sfz-?$L+}obBt}4<;UXV))n9*{DqdD@48rjv#h_k+5L=1*6JI(#$1>H5b4aj +zO^d(Wz;oJ#W6ij;YGU`|s^GskBPM$ld?jD$t?opb;%>xhPBBx=KL==c>~d`zw3B9^Xsim;Y%i)Rw&MMP6V`wKLHosiPZ +zwsWwHX^~F0Pkw2VnXp7%a<1GcNt9#c%{6DIt#=59NhAiOC*mij`Rk?Sxf0mlvGrKO +zGXKtqemQqanpfXi;hA3xWP(H-L5cea7@4a4H +zubPYLMAq>lz3TSSi`Aq$Hpb0Ox`bXz$$5}`NMK+8#235C;aN4XP(<(SKJ-RPG?vfY +zc;EIT9S+&GvD%?Nx5@TXqRAj(LwcTFBU~y5JycvYNRk*vLz`D#;}ZuGYtgNi!tjF6ml-K7g0Q&V;>8cgNu)mVabNW2sSX +zd~AGfd}=&veAoEC@z+MBku(uBdE*vjiF1~0lS(HgcM7HQx_S02 +zrmY>D*MwhJrk&SUovAVIWp{)ZyNX=mj&b1x|CY1LbMp4@+-IzXzY-d$bmlVT7vYXe +z-~hr|hoT)GEQI?=W45sS$zB?_+U;~Wc7m3Qn+%45Q`Dz4Spo{Qw%xR*jv9X-)<}QC +z@%3)gAJO=BnCdICO4WN_^1!;$ZxUx#^`Oyv4(#6z55gR*Fun8Vy}vQ{j=IE~47hK+XzlS~LOtu^I6GrL60zA67PVR;a)1R8MFG_s^t)8_*?Nt{8_ +z*g<4bAKf1^A0Zo4x@5JrSB@nutKQS&xww=g9(R(WRLn=&N$3F +zRH&IBib0z|Kd~T4Ltvy6xoz-JplC?Aa3IlQ*@_~Y#7WCsbbFw2{dXceJ#TSr3-|;g +zmUDyS5|BnO8>1;D4%?&$jE1wAXEogB@<~STH}yx!Dfy`4b;fwq;=rY32FFGWWXEW` +zb!oJ#Va&$4`$)Np)NXdJQ@&Bn($sR=E`Yk82Z{8=VDBi{kzF;EGi1@|L!c|>xvQs3 +zNeQ@pO?xty(gBayo9uz>Fqj +z87I|1N!X2=;Rq#oCDfVR+}tL-2SVg8KZ1j3oIII=`lQ#*#*X&Mj4l@r#>LPn7W9_j +z3g`^cEw+A9T535QJoqKDrp!(hd)%~qTEx^ey+L(G_(_>1%DTKmSr{pBwQ=H6MyEbK +zOrJEm|f|awiiOm(?~H94sckT-JMD=3sUQu3E`n++eCX +z3LEB(zf`sl+^(L~wsF35iPN`krtv+Aw&icUktteo5)wT5ts>+9Bq8@pzXn>t`m!nl +zOVxNFdkQ^2B_|Z1FLp7vig-5OibcAw-diM-P3NjU487qnluV#7eRQD%A;v%ypN-s} +zT_pqYMgz8fT|Q`_i+WODb>5f&$<|7rF_2=a`8X*79why)e+ars?R`q0zk<|Q&_V07 +z6XJz?B;Q6sB0RJBbVj7^G|5eqcci?kyMy%i>O4vN{LP(fVM?k#6r;QomNr=N3A?(8 +zQ7Z-J2Hsd{m5REoEN|sL;ojWQ|}zPL6Lg4(OY&OHdS>jI(ZsbP+h7 +z^aC95#tuhY=?yqcR&uf0W&$)fguWR_G#&2q5TN@N{;x`j497g!T +z1`+gO(kn~}J;<%&+UfGThmyu7j>Lz8m2xfRqWfJkv^b`Yg}5en6b8qPkw@!dVC`mA +z`!6U-C^vQn>@j+z#4yfj>Il-e7iVc;qDriZ<-8D;hMiy8N#_BHm +z-KvN7pMI2S)|drOp7a)N0Ad;c%-6!P`lFpzJZ78f4N@etwIFj;5SUP*EU`w|maCt> +zCj+IrX9dxJYp&80*8sv2axFuygwE&{El4E;@)q_TB;+g8#v(zI?F^mLd7*Mp^#H%rt*3Q# +z)V{4ca-^j5kr6+q9KRG6%+;!q?1PhB5qai)D`QSlqA59gpoQE;h`*;G;Nx!EnY8oQZ|=0wLoplQ_SA>Urp_?Bq(JGz+mV(jqTb96UVQ7^ +zbS3pN`|9MHDtXgzChAl!QZ`v9{oCBqBeN^Ys2q267gbYklLy^Uz>VJ~&`klF(9|M% +zBmCV*01rS>yjO$LKHZ9vCW^jmMhx(~==tNFmFAoe%_wda;*&14@6s{_U8VrYw4^`v +zx^W7e8cwZ-TP+VT6VZGjaRZ!m*P&S879M_alrc&THPA*KB1e=>`;ICNmYqwGDW!`&4zBbEK1iH& +z!m;rF|2#X@8WnDOn=l_J&M_378XVpiOBF)7h)vPt%1JW58Irzu6@FM5(e`@w@_2Xu +zgjZdP>bqPUW&W`$M4?tL+cKz-Vh8pbhDYX-)GWv9_|LU9``Xh_(H@XI#Iuy4>Yrr- +zCfjueoZ{9kPPv9Zfov>M=I(I#;vZ*m4KT`<)nl46cYYbJa35E;XetLkcY|)zDLO=5 +zwmJ2PbFI@uC=wS;-~>UJxt7ucgC0j-Hu_?UCD;`V-lI*@otKWpWz8jIy741m_t*{` +zS)*Pz9U1M@46G||<4sH^fl +z#j8b{g$axM1HKlA7SLLv)xUk;y0!7rUG96u;ReG-msd8!)`EuZHLc?Jpo-tN<*u1SHN%;QOLdN9FW6H=qEW?ZO!O-fXd0%HM1gJ; +z$$*aL#iBO5_~$lA%(~7sn)3_~tghynVsbxjedxpFl1OCTu@*+EXA=v0?z>yGCA1$f23$nt&N(NRnJT;XT|TEJKnoiAk&bl(_>=mHt>0 +zPnfM-BKVSp#|9y*ZZX+>M4xI8@~7lBY5hN~(#P{$R9BxVs4X;s+CvzL@b402E#P(y +zQZ`y`Q=XPL`o%xiRQ?q2NxZNSd>8EG#3M`&Zh^^Jt{2_`KT3WANz~pZ=YnxEr|XF} +z78tDHnR>e-s@0a}siw5jq-h1FhC{p6I=4`-+pa{NOBe5Gn7&wKmu}3`>%I*-?$VCU +zg0UKblCff6wPx(oFjkg=Ldc>?2!~^l+a&T-!f52@Zi|&7L@h8z`acxjyc1^HLf`>U +zs}W={D6QH?JUkThmJ5ZrfUC`DN&C2a)gK^|AyLJ2puJq^HatBfnyi6L)HgcxIDQf4 +zT2cnvx*Bt)B}}wbD(lS;2K&n^Ke(uwvw0C_YtAnO5>}Tft~=)g%Y<%7$S})>MLxAi +z4Kj>0aNtgO071rSr8gqoxMv8RACA7^?#^t{{3Ptxb_a(xFFQugp-m4i03-2mm!3O$ +zCfQG78M84?W8m4Qlb(8Hs`I^r=J&T+i5ZK0>G}El-YVNO$X+SC?>x(ovr(&`AuEi~ +zCUKiq!Z3mh<^oJ}JZMUW(qcg@0o`UC&eJaR61v-H{8!E->gPMH)-86=xX3DwEw7;{-WdB+4cf&Q|1JPwdV46qm{$ +zNl|vN)7(Bdpa`{IB2^d$e^QMaKiL?q{2UUMNC(@8FXGL^2h%wGcAAE#_&kyR0wN62 +z35p_|NE&KNVB!cP_9{Y^(?A#DA6i@$n!J3QyWMQqYuzUA>7rEQ%yf9~%)hX_bWX05 +zfIP>@vYw=~7o30T!5hqHUR8R#m!i*fzheWc8qtuyeX?Js35oPmIv?HS1NztyGNT)y +z6K&(|55sIq3W2rzpFqF2J9R9ge1Z@C$iaB&DZGNQm3rsyBP0@Micxeb)>a?&H>_ig}^ +zac45@q3up2YJ`k{_OyWxyBnhiPu|a1I`{pIWlc+3LqU~~m=InZQwAtBzmaWTFpvTj}05iTzF`3{IABI>1(RXsQtiWWrjD>0&cKe!Dn_79rUNZ=flM7Gk5 +z79@tF=3>If&n8=IxHk=Th(}n@D`9e$!c*)sEa~y@dI?iQ4>?oVz4paFQ?GuN%15q$ +zBQ_eLkw(r+W6_CeUj8dOINCfy&W`%Z-%<-cOJM_*%Q<61BNtsr8=LS*<{ia`c_FX% +zE^|XaSK(iE1;qO9`Tox@_cqjjV3fM9fEPFpI2c9k6;odtOT?%$ZGML&PN(BW>12P! +z0!Oq6MNoo*8Fr#$nyp?a(kn!%5<~F!Q8~nn+eKlZ=I?hSiKjNfRv5N8lDT|-i}d1Q +z^u{$OWV(+gvMn8E#uzByB-)a1=;wY>>oR8pSiCp#4QmR;HWsm&AOJ)AoGJ0>I9X5M +zlY)nmY2hK-Vd=nf)@nb&d|B*Ts-{ZM&|Z+LsPz%k0Q)M$f@yj~HmP%_?hBozlE{y9 +zUGKd-+TC-d46Q_&jk@h-D22E(2rr`54|`IPDgiv%sMxni?urL}5_?g1kN;NgH#ANU +znmlrbgKN-~>&nH)-hmStDG_JVZD{4kNl2vk|MS|`Os*Y*$l +zog%w?G00R;h$$T@i(IY0f^}d_i0=AFVWnp@U00zk08AaQl8tO`-K|%vU8XHG(agd& +zE?QZ)9Sqv_&_^Z#m(8@phIn?~2x*Xl8t0OIhznG-JgukmNBgD2f=06_n6op<@P0EkL7evJtjwS#iRDLOFiA0f$1%1!W1j*?!vb$ +zP?*a4+yYT+0?d(WJSZHJ@6PQiCGoaO|FkCK0nUU2=b~;)Z+lS-D4Kl4+Lp2bmL~fs +zgo7~>mlqTpz>$-{%y}Ukmj2OaE2<$8F&WcMJ+iBF{)iV;%M2eiXnm)qR +z0TM|HM*$o)S29$WG^~8Y5hl?YHz)Cwz8M2gUM8 +zdsI)3Pz(INo24rpag{q8XKC*e`&2e+f+oH=rjoOcyov9#lCu4Gj$R%^e>JgD!V;%P +zuTFOM7^aJlcjloJX5-iZBcv8563y}4GoP&C4PRFXs4R$3y4oONU%VOtBH=i*q4ytW +znemEJWegyej%t7ivPZ|vzM2F5cz?&FfJJb-weXssYlgM(OSGm0d9i<5J#_vuX=5Ab +z^+81(7AIYzCY;_+gTs*RCIQ-C2}U;+(it~V&qx`LG~pz+4=wdOtx>1q2ATi{OSc}| +z1lvWG)ro+UkWHc(l8{C8P3<%ym$kIN7a!ZUHHbT2P_(OYE{pd8f)Cv~s4Jt0yyM};w!+Jfz6vnTKI}pmXedpus3lUwc`4r8Q>9#Ud%tZgQ +z1M|lK!_IO=q87zC+`)*jn=Dk-_61N!k}DADb1WF>AYrJU`4f^JMlYIWe*QJu_*QfpR;A8U`kd{{mfo6 +zyLqk%X9N%#<;f8+qu`T{C}t?|ukV0Hpeb;YyuwQ;vG-T0#01*!vO5FacB&HtYKHvF +zX@$EBU-#PfZU9z}Z2$1|Z2REAImifs<*UO5ChW%Hz$U1wT#2_XdO@E!7R8nhnhY;M +zoVsF5gdmb8#Fnl-tOS$;^TnY5!=)MlaC@0VO9fgCClen2E?zQ*(~|Syu*9d)52w2| +zYyt*+(X*k*l-SNeUx;oF7)vfx(Dcqk3QHx{96F@1AOlsMn1@4_*W^zXppcS +z4m(hLZYARZa5uu2yR5heK(}xIykusHj~j{H4UJnygVu`{B3GJ9GwQeTr@|K=s7j)OyTNBwwzH_ouFqDK+u% +zXc;k6&RE!yL%wB8<3|qBeM$9J5!SQ7R2K&UyM5ff(YB0;|HmSex46G?z|0%EfA7COaml +zBL|BHwz-D7@0t;gJKcj!GVm%*{xq~A#|i9sdYPuo4( +zXE-oBPQ0v7I0VHd6Pok`5K~J0=HOgT(h!Q{zBPQb30$T^05t))OgS`9_73*8PoWXj +z3lCfEx2V(70-oLnD-vVoEIyq8LN0V36lQ|LZL_^tkW(?Sj#{;o*U1|XmGXXOvU!;$ +z1Zt(`MeO_IVN_16nNFUHv@}YlYB>93=hex{-r?Enjg!5O{ +zW*BNno0HLDLV{*1&@NIaU+@CBvB<@}RW*B}!GGq>0fdCYXe*CtHkm}Nz(%9&ZSS#j +zM@|Ly6wtVvVo()(?@9A0m_tjrraC&-nAsTUlDdF|RMGcjAnUGXa++^DP98BUK4d3SsS#Hqlj1lD{XxZ#lqnJ4w3S%V +zq7L|vl7j&(Q}TDc%-X +z`%3e-;w(X`zd_b}Jh@;i+~hKSpXkgmg{wJn-(PpFhz4KlTz_~Ale!)!OFPwM{V#v{ +z(+d9mpY-=%RuUNG8vXr*{(hP~AAxXvI=CFaM}&Qj*@nfxcfa4JCXb*!jBtm%10XJt +z!Jq!nq}yjCQ6WzV +zc@B(WWMhuj+r$EasCnF|m$Y~ImJjwctGWBH)lPWu_%&JFPm +zpc(2Uu^p^YH1%g1;Xs*(Cq(;~Sn^Zepo+~PBSS{2TDD-ic2>q%>KgVf^PK3Ch)f!5 +zXD=tc6>I_uCqM0<{Rn4DvVHhV^3(Ro$@bydFVD<9Ei!e?k>7Au7?=mF&iIxx4?jv? +z?w#!X2vxR!*gx1m`vvFleE;ll@ANczesq#-C&$|-XZt&^4z^E{<5wrgN2hpmBxxZi +zGkh^f4GG|jqfF-g3#_9X{S@ea+C|x_#lfU!t`z~bH&7;P?7;CEN|nGst|aeA-EpcM +zske%hq&&dkmE_yMBxfmV%aUUX16WH=F&1a?^eOCx9|qYNi@w~(%4<*7*Vk+7PuF0_ +zygJ>MX>F6kD9hi%ogiMw2#RO3BI+z`!$EAC73s_oGg~9l-dNp%uZwG8W&dVfBEDX^ +z#!RSr#!?ceqlKy6+r3FAHCsl}o-VA-XlNd^kBn+#BI`T$bW5$Vr#EraK%~FfG!WwC +zkEe_|K-Q+793}TOVw(<-GB!6D^!tqBXtSYqL9BIbjmM-bJ{RIh4wq~xjtX|(WptQ~ +z+GyG%!K3Sr*~z7WYg%u$?F`J@W~;sF7J=hTJZB1upgjpsL2_HIvz2)bb)0mLTVtq6 +z-v&5$F8+Y$B;_YTg!L%Eu(Z=uqKqMI@L!X3x>VlsLf!ZWIyuaB$5xyr<8vZtm$-3t +zC`&_QN!`b5oem+EP_-&iBvnk@OpxTUQMEr!lGm<3)%d@Z{_64HLotV9&H~s_zzUb| +zJU%&kakBlAu2WvU1QAd5+!D8-aULzfC`FQjen;eBl%QFT((z=37AOD{vdCv^EiueD +zeuQuPgZF(PTF@Dy5Vk4}(kPD1wF}O0#WP9C8>6^JD7AMho0^Iv|jol$u$En>$kV{_KZfzND|lh$&J|2@VJA!Wh~`( +zbH9ENHl(TE)lUXD2P+g$b$PCJkcHD#t +zT+y6)0i6ZD@o@j}#fCt@Qb$x~IKhX2^>es45>m;klE{haF=6%s`Elepkw^%ifn-AB +zJ$!Ue$IlgM`G&+2ywh`91Cr(%xi`+YWqDQma-5EO71e~|?cs}2>jKN(h~#Y`ATkr|`P&;kj<#XC`7c#nh?1XSmo+ACElCA#wI(f6a{d(u+o952Z;q(0$ +z%^&x+clS<~FsybJ!)jOS%d3s`RiL}UjKs0jE--r|;1Y|kgF?i`ou=!6O`f=MH(bp> +zTXJ0sH&Bbqjn&nPyx4&0tya!Gf9K*Z +z%9p_Ql!|?y?G|yX<#!2E(SN}M$?%S?o65?Z2b9y=RPs0bd~#Zf)4qZ&18vol+W2+| +z+!$;d6w#fDpmiY{fPZ37A4D}ks|I{2uL80FqRAK538J8zTq33mq9D3HbI`{_lW$Bs +zynk*i!Nu2`BV2R2PR!DjZVjYU65(zYm7L}9kcwBBsu1>p)8nQa2)dAA-qUO9Dl(l3yfy-vHXZUC*}N> +zFD1>Zc&jNVPEU65p3R`MDfmfA=xuqmy=qcT&@c#jrDn;FWx>q2J#-7md_rH|xw^i7 +zh_0{wu7l7NPITJW9II1mInC1$zxNiTs9HO$RzZK{rE2m~^=xa;lFt=wtsUPoz4XH; +z)WZBh8>TmH!#sy^{l5E!dzf>(sJiI)*eAXD_et-I_lcdzov>A_&5L(Fyh6lN#ohl3 +ze&=3jzYyX(JBX$I_AOsBIboS28vq+W19&TC=$3e_51$dSNI!7%=CYSeKcp73!v(*w_h!H}oF?b8_fsMUAZznP7&xVsx +zcQDDEX4+)3O43HFmyx9ro9Xv6y!%5_HfV{>ep&#?t1DDQvw*p@z5nxy)7I{*m1O^9 +z|L5u~EgiIQrZd$YJaAPZTz#z)K_=F;>$@Gj-?#T%wpZJWt*85_01$GDab +zVfELoEFG(<$uI||CtTxHprZu|S#Jg(K +z4J};|AFixLl}{R&taqjnqXaZX8AG$x!Ro4VNjxN5Bpja2ZYSC73i`jkOaIsR?|&{b +zy^kk)#cEwHFamWiwQ0QwpG}HMzNWVBaG|2Db(^DKNNjNEXsv{%J;Tjp|;-}j<`mVvF|vF +z8#}G3BZ_npAD@COTr7;paM>S>I*G7Q8z!tV%ME;iyU|!(eYE-vf34y_@R+P#;qxQ> +z{Y(TISzP>yZcOOMOP9_Rq7HxPRkQh8D(la(=F8(%)z?8n22-)VYKtg_yD34ObWDhc +zS~i;bjDcy(*yvFF#i@?Eie3xYn9*o6ma(_Ey9G<@%hG}wg=~cdrOE=@>a@0p@$4Dh{^HnACzdCmfBGaHm9rk4|er(a*_fX+;l(TLcYOON=M| +z)Y1ZpET|pL@SRC!IL{>3dnU&VkdGP~!A@t6vQc~0y^Riemf(94gA^3IH;WXub4MoW +zTlTwA^Z4=-9A-^660f@L*4yNZ!@&(Mng?eG`#+p)pX~3QCYv&*daos);i1`UH93q8 +z7Qmp}@?IRw>uvXCHfXTKe@B(I2Ocj&)`K~NaFWjQOMD)gM;S&;aT(Sm*c&yV1zB4OYCrjr$8z&pvmE|Ja;)Twd0feO)BD#`0V|hBqSORFUt6E!~{#VRc0;p`i +z*mFAiW_m|5+dFlI^MX!vN)C?gK0nxgfke*t%?AR$v4)we3VrlVke(Vqv{kzv4Blc= +z#9kjSRB9@B*IPi8clS=ucK1)J<)t2FiLI`}zeM8dtp(4!*)+p9rqiq5;h^jGr=L8) +zsm*iHb^8x<&_O$QJ?Pe+ur?rZ=j3^f84ry0`k(9HO2|{^2*k=;)>y9FA5O+XPja57 +z-;l%Sw=1F7>7R4Hr|aT@ip`)CDm{La%;AelewFTQ@~))QJUg)oR7qk$g?_xBH7QMW`4 +zR|0f`<~Nr0?zP?<|50pYnhWVn|4~x$Huv0M>tNuO7$VhQol +zgJX+-ZJ{H+a%K41KEbEIA8()i=oKEmy+Vq@h09CwySln10p7U?lLH+_q=4{*TF5?n +z1#v8Ns&hGXQ)}Hco9zxf?Cj#$fWa?+{QpmXZ2o=k1PS2d`seZzerTTV0mQb?j!vqi +zi*I*K=rEj*{M<5hvYA~scel^BWjOk-n$+4T4gcwzZ@i-F-jy%y6+7KI**`vumXZ;O +zg*Fw@S2&I;MkUeQclc3oxM|)}vJNPAcy#h|8#zXu98l=vlfB@@(dn80MykC!%vB6u +zVb$QBaF)QD_2BFRc+v}i=Jg;OyYKNC7qT_FO1%&K20rcXL-QDg3(j<$XGA`Ty~TJR +z7*>9!Op#3l6`|1Lq*>as>I +zU_vGwMr8}ayS<$=D@ht5u{Y2+A|dt$Q4!IWWBJfNt8nO7G}56h=!k~7mn0YZEwEr{ +zOGczZzk(wc+FC{?3}2x@=-0OrVOSQ$!B|-%59azqVK7#Mq`|N>ih|)gk^^Hcj3RR( +zDKLCVBB0*_$$++;5dfX#5a};~tP%fu0~h@)R?#NTeE?kD-Fv?M>Hw+k&cUl)!qVD) +z9sV=ajDANq-r{2*1*C$MO$Lv2ec8Ne-2!*AX(ABQ2zGX=#Em~cm4CgCtF+1N@9me( +zo#SJYER>|!XZ~y+I}OJjicq`gaCUYMc6I6;S~5B= +z3RH)M4t9&CX1ft-3%{A4wLwzen$1_yAvUYf-Wkhs>6n~=cjU3nkJyCJRRo|t6|4HF +zEy45I-p~7o&yVQ$-p^+z+f6J{HRl^rMEMD$-`?HbNB4g?GXOwDE`wKC=p~TU=JV}? +z(>*F+AI-MNc4=Ph{@h^OJd`!>B$NXSR +z$Zvf8%M0Qwf1>yLutocv%HqHDc#Ki}=mq|QS9?1@9^ni8S00-?`l7j`uMW+tLw$8- +zUY+5q7bkl(Q2K!{e%^!Cr#JL#3)#vY2RQa=%W|B;=5D#q&S%ToZUwKLLWZ&3^53{c +z&frC?HSYsduv(5S`H3(0e>mJbQ#VGtX0i9V;;=S;nhdF(7&UWu(^VLr99o}FOLY9L=`q|`>z`t9<`1tBFON>noX_^9Q;;H{I%V+L`HTp1 +z_`)r~Z=51PYQje3l~YJ$Lbs5-qC&2a$YtC&Pz0oW03UwhUw9CRw2dzv$(wj?dWS#o +z1>!ipz#k|{+p*X&wA#(~xXDCIf1B5~clX(RHa$3x%=h*F~KXL^7S7i0lUQY8J_68X}VD}@{Fbz7Nv +z&5!0|dpNP5;K6(tI8_F={JXT@8I0^FeumFhzp*7hw>XUf21CX;&G5l_6sgydc1Z{} +zW3^BENk*!__4U9OADFUsl+L5QRFiSqC;D_bFz@N7r{>`I`m{w{trX{9{0e7iU&|AI +zLSYr}OSNzB1r$JgApXL?@D<*6H;43&f5OWFChKq~;k`gLk%6`WbX*C-MPgr|N@me3 +zGx)_h9o<>@Z?MR1hSINoHcv*I;b}2M!C@BNeYT%v;q8 +z05!~*xA?ez`sz8b&wHmE?(YOp9aT$p{Qt#&Ek2H_v^SDM1^9F|x2TeR4Kq43Y>|ar +zI;5~Hf2BYb4YKzlW4KDRS|t(XIznx^T!xp+Rr3O>c0zqIUa*vx@GKH73;q-hO6#Up +zgX0^{i)(6Q!8k@dbJ`T^S$%~Dcl;YowfGl%quSn8iAH_vS%{h+Jp>c?R=2{9#APc6EalKQCqhcOJY>^SgOrz>5?u;DsX;Q@BY*m}zP$SB +zQ{}w$%-6pGe;-aaH+cC|)f7EualBg2 +z&CZPWS=6X9MzF=q%^(~1Zh2+po{N^0r?*@$FR^x%3Zr>ZaZ!oX0(?ZfKG@)!H@;OP +zJCpKv`t9Ps@?X#4QLi14ihPHz5mdY_8<%Dv9}Ubgg&E)9#YN`p9s<2{sdcb_dQ6vFuvBbfP$l7zvEM1^ +zRFBjV<^%fwZIW)DlTT#vDPR4Tu%!8s;#(37|0+!E^^SJjvf9Im^*a{+zqGdE14Zd%3?0L*hxHZs-bl +z8=N#Hxr2Y{;E%yofs?l+S@6K7z{Il}THoZ((Pd%teE7a2gPFD({~F8TMO0X#JKZK` +zBdwOp2sd3L9sGuj+M%)(vp|a>i51wC%jwN@WiD{2PD%f%xMf&rTuoNXx_^?{pBV6 +zO~$8e9lSzLKi)I6;tIoRoMmA#ynMvA*olP@MZvz6q866=puPe&DuB<53ZSOw& +zY65NMzST>CJV?y)DwlAf=gOvvT7D^qwsSKTqx-N^avYbT_NoVu9PR3Ow25G;bAZY? +zeg|w`6BG!pHay8U5R9JVVzIlr5sAC@w>D$OI=cZ64h9wMew22!1k|Ta;(bI)`@Q+{ +zDcvw3gK4y|^kyT`52T}|0;-n7qsEi693xgFPNX&MQk0*lTEf}FmYy?$g-Q(vU3j?C +z)rLm;paJS{yl1sv@X7m(_tEwhpC@Q-pG=zi8+rbt70Z0cF32;OHVHey*RE8Mlee0 +zOu=X(G#=QiG%Q9j{jF~`$W~0dl6ZnB3rx-`aDxWg8;J!x?F0e2Rpz_j?WmHRT%Y7t +zkhgd!8Ye#IL!)`ug>k&=>fq=XVa4_M2DUK%Z8qEGU?UL$T3=}CU~~G)I7byXYqJ{< +zLAOz%0G8PJV0Vk^AU$c{EdVIB5t0s_M2MLiNe)-z3l%BmuWr5}S*SoE0zKvs#((3N +zPy~o<_8j^dZOG!|Vdruqfxn~&{zV`df+#l3^nIqUT}tlKbpdcvq?ElY8u;#=q*6Nm +z@#ydukq?D4M^z|~MM8t=D)Jsl@^F}Aw~`!c7cJO9#XBv(%lw+ASvuLZleMZ&|-J1pG>a;K;CC9j{> +zzx~U~)B2yDR?!wk1ApR~$0-5P$b~kOCP&XW^{dT0Ez#@}a+^(-@c2Ew&Hj#NCTP(x +zHaWgAJthW`g9hq{M|(e`k?oAcy?C1)SYX9mq5UG$oUi?o=r_GyTYFMl`!;#9w(;ai +z%x}8L|2p5)TrSv8*H-?NJchsjj4s$ovW)+&!e0PZHCX))C;>EIzy2Q9I(dX)FMr(r +z`<_XXQ^l83wp6d@+}}#@9W%#YPKPe?XRCW+zBM(DOJT_(SQl2fx66BRi+6Q?zjKh6 +z{s1?da@J^b(;5wvF-U}H-`2coWp5L*p6ql+7-Vh;<>_FuMmn%a@PCUoXtFqaZT5Fw +z9?xEvu+-Ew2@8MOdgNOB1J;7pfH-^lHR+Ei1w1{ByEjaA>?2Ukn_-f5dq4xngZ|Yd +zO@?UnJ-BRk($@I;LDp@aRlCEQJ>-gg$$H&wwPwRzzzH+BnFF3!Z8lKDQd1!t7XC8u=34s$=mlB_ +zH!(8WfPeO~7XOf(%MU>Sc*SNfMZVnB#mE=`vgL@h_XjKpaZng*p~XpwzZCeelV(Fc +zC^Qx9LD?^ZdDz$=0PyU#U%TuL1|8yI;6HL9GCv-7hl8QF4IbZjDS)8OUW%a5)TIc@ +ze%Vrljr{>jG3gBPKZ5%g;=cN$T<0chz7&Dh6u37$Z439{C?0hHR{b&5 ++ echo $ECHO_N "checking low-level packet interface type... $ECHO_C" >&6 ++ ++-if test -r /dev/bpf0 ; then +++if [ -n "$LL_INT_TYPE" ]; then +++ echo "$as_me:$LINENO: result: found $LL_INT_TYPE (cached)" >&5 +++elif test -r /dev/bpf0 ; then ++ LL_INT_TYPE=bpf ++ echo "$as_me:$LINENO: result: found bpf" >&5 ++ echo "${ECHO_T}found bpf" >&6 ++diff -ur libnet.old/configure.in libnet.dev/configure.in ++--- libnet.old/configure.in 2007-04-01 17:36:55.000000000 +0200 +++++ libnet.dev/configure.in 2007-04-01 17:41:08.000000000 +0200 ++@@ -97,7 +97,9 @@ ++ dnl ++ AC_MSG_CHECKING(low-level packet interface type) ++ ++-if test -r /dev/bpf0 ; then +++if [ -n "$LL_INT_TYPE" ]; then +++ AC_MSG_RESULT(found $LL_INT_TYPE (cached)) +++elif test -r /dev/bpf0 ; then ++ LL_INT_TYPE=bpf ++ AC_MSG_RESULT(found bpf) ++ elif test -r /usr/include/net/pfilt.h ; then +diff --git a/feeds/packages/libs/libnet-1.1.x/.svn/entries b/feeds/packages/libs/libnet-1.1.x/.svn/entries +new file mode 100644 +index 0000000..841d92c +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnet-1.1.x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2bf031226872f84c747149434f620c21 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1727 ++ +diff --git a/feeds/packages/libs/libnet-1.1.x/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libnet-1.1.x/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libnet-1.1.x/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnet-1.1.x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d2895c6 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=libnet ++PKG_VERSION:=1.1.2.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME).tar.gz ++PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/ ++PKG_MD5SUM:=be845c41170d72c7db524f3411b50256 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/libnet ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnet1 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpcap ++ TITLE:=Low-level packet creation library (v1.1.x) ++ URL:=http://www.packetfactory.net/libnet/ ++endef ++ ++ENDIANESS:=lil ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ ENDIANESS:=big ++endif ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-pf_packet=yes ++ ++CONFIGURE_VARS += \ ++ ac_cv_libnet_endianess=$(ENDIANESS) \ ++ ac_libnet_have_pf_packet=yes \ ++ LL_INT_TYPE=libnet_link_linux ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure.in \ ++ include.m4 \ ++ aclocal.m4 \ ++ Makefile.in \ ++ configure \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.1.x/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.1.x/lib/ ++endef ++ ++define Package/libnet1/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnet1)) +diff --git a/feeds/packages/libs/libnet-1.1.x/Makefile b/feeds/packages/libs/libnet-1.1.x/Makefile +new file mode 100644 +index 0000000..d2895c6 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=libnet ++PKG_VERSION:=1.1.2.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME).tar.gz ++PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/ ++PKG_MD5SUM:=be845c41170d72c7db524f3411b50256 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/libnet ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnet1 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpcap ++ TITLE:=Low-level packet creation library (v1.1.x) ++ URL:=http://www.packetfactory.net/libnet/ ++endef ++ ++ENDIANESS:=lil ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ ENDIANESS:=big ++endif ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-pf_packet=yes ++ ++CONFIGURE_VARS += \ ++ ac_cv_libnet_endianess=$(ENDIANESS) \ ++ ac_libnet_have_pf_packet=yes \ ++ LL_INT_TYPE=libnet_link_linux ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure.in \ ++ include.m4 \ ++ aclocal.m4 \ ++ Makefile.in \ ++ configure \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.1.x/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/libnet-1.1.x/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.1.x/lib/ ++endef ++ ++define Package/libnet1/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnet1)) +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/.svn/entries b/feeds/packages/libs/libnet-1.1.x/patches/.svn/entries +new file mode 100644 +index 0000000..cf772cb +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnet-1.1.x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-10T15:10:38.193915Z ++24417 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-debian-subset.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++dd7733bdc962ef6d5c59fdceb2012d71 ++2010-12-10T15:10:38.193915Z ++24417 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2591 ++ ++150-portability.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++98cd9a9340ca073576a0a328390f7410 ++2010-12-10T15:10:38.193915Z ++24417 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++389 ++ ++160-endian_cache.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5e390e2b658daadadce438b38472dfed ++2010-12-10T15:10:38.193915Z ++24417 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++461 ++ +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/100-debian-subset.patch.svn-base b/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/100-debian-subset.patch.svn-base +new file mode 100644 +index 0000000..ec3b932 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/100-debian-subset.patch.svn-base +@@ -0,0 +1,107 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -21,7 +21,7 @@ ++ dnl ++ AC_PROG_CC ++ AC_PROG_INSTALL ++-AC_PROG_RANLIB +++AC_PROG_LIBTOOL ++ ++ AC_CHECK_HEADERS(sys/sockio.h) ++ ++--- a/include/libnet/libnet-functions.h +++++ b/include/libnet/libnet-functions.h ++@@ -1429,7 +1429,7 @@ ++ * @param ptag protocol tag to modify an existing header, 0 to build a new one ++ * @return protocol tag value on success, -1 on error ++ */ ++-inline u_int32_t +++u_int32_t ++ libnet_getgre_length(u_int16_t fv); ++ ++ /** ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -12,4 +12,4 @@ ++ ++ EXTRA_DIST = Makefile.am.common ++ ++-bin_scripts = libnet-config +++bin_SCRIPTS = libnet-config ++--- a/sample/Makefile.am +++++ b/sample/Makefile.am ++@@ -60,4 +60,4 @@ ++ ip_link_SOURCES = ip_link.c ++ sebek_SOURCES = sebek.c ++ ++-LDADD = $(top_srcdir)/src/libnet.a +++LDADD = $(top_srcdir)/src/libnet.la ++--- a/src/libnet_checksum.c +++++ b/src/libnet_checksum.c ++@@ -42,8 +42,10 @@ ++ libnet_in_cksum(u_int16_t *addr, int len) ++ { ++ int sum; +++ u_int16_t last_byte; ++ ++ sum = 0; +++ last_byte = 0; ++ ++ while (len > 1) ++ { ++@@ -52,7 +54,8 @@ ++ } ++ if (len == 1) ++ { ++- sum += *(u_int16_t *)addr; +++ *(u_int8_t*)&last_byte = *(u_int8_t*)addr; +++ sum += last_byte; ++ } ++ ++ return (sum); ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -8,9 +8,9 @@ ++ ++ include $(top_srcdir)/Makefile.am.common ++ ++-lib_LIBRARIES = libnet.a +++lib_LTLIBRARIES = libnet.la ++ ++-libnet_a_SOURCES = libnet_asn1.c \ +++libnet_la_SOURCES = libnet_asn1.c \ ++ libnet_build_802.1q.c \ ++ libnet_build_802.1x.c \ ++ libnet_build_802.2.c \ ++@@ -57,15 +57,20 @@ ++ libnet_version.c \ ++ libnet_write.c ++ ++-EXTRA_libnet_a_SOURCES = libnet_link_bpf.c \ ++- libnet_link_dlpi.c \ ++- libnet_link_linux.c \ ++- libnet_link_nit.c \ ++- libnet_link_none.c \ ++- libnet_link_pf.c \ ++- libnet_link_snit.c \ ++- libnet_link_snoop.c \ ++- libnet_link_win32.c ++- ++-libnet_a_LIBADD = @LIBOBJS@ +++libnet_la_LIBADD = @LTLIBOBJS@ ++ +++# Here are a set of rules to help you update your library version +++# information: +++# +++# 1. If the library source code has changed at all since the last +++# update, then increment REVISION (`C:R:A' becomes `C:r+1:A'). +++# +++# 2. If any interfaces have been added, removed, or changed since the +++# last update, increment CURRENT, and set REVISION to 0. +++# +++# 3. If any interfaces have been added since the last public release, +++# then increment AGE. +++# +++# 4. If any interfaces have been removed since the last public release, +++# then set AGE to 0. +++libnet_la_LDFLAGS = -version-info 4:0:3 # CURRENT[:REVISION[:AGE]] +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/150-portability.patch.svn-base b/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/150-portability.patch.svn-base +new file mode 100644 +index 0000000..d96b395 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/150-portability.patch.svn-base +@@ -0,0 +1,14 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -67,7 +67,10 @@ ++ dnl ++ AC_MSG_CHECKING(link-layer packet interface type) ++ ++-if test -r /dev/bpf0 ; then +++if test -n "$LL_INT_TYPE"; then +++ AC_LIBOBJ($LL_INT_TYPE) +++ AC_MSG_RESULT(found $LL_INT_TYPE (cached)) +++elif test -r /dev/bpf0 ; then ++ AC_LIBOBJ([libnet_link_bpf]) ++ AC_MSG_RESULT(found bpf) ++ elif test -r /usr/include/net/pfilt.h ; then +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/160-endian_cache.patch.svn-base b/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/160-endian_cache.patch.svn-base +new file mode 100644 +index 0000000..766d2fe +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/.svn/text-base/160-endian_cache.patch.svn-base +@@ -0,0 +1,18 @@ ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -281,6 +281,7 @@ ++ AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, ++ [AC_MSG_CHECKING(machine endianess) ++ +++ if \! test x${ac_cv_libnet_endianess+set} = xset ; then ++ cat > conftest.c << EOF ++ # include ++ # include ++@@ -332,6 +333,7 @@ ++ fi ++ fi ++ rm -f conftest* core core.conftest +++ fi ++ ++ AC_MSG_RESULT($ac_cv_libnet_endianess) ++ +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/100-debian-subset.patch b/feeds/packages/libs/libnet-1.1.x/patches/100-debian-subset.patch +new file mode 100644 +index 0000000..ec3b932 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/100-debian-subset.patch +@@ -0,0 +1,107 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -21,7 +21,7 @@ ++ dnl ++ AC_PROG_CC ++ AC_PROG_INSTALL ++-AC_PROG_RANLIB +++AC_PROG_LIBTOOL ++ ++ AC_CHECK_HEADERS(sys/sockio.h) ++ ++--- a/include/libnet/libnet-functions.h +++++ b/include/libnet/libnet-functions.h ++@@ -1429,7 +1429,7 @@ ++ * @param ptag protocol tag to modify an existing header, 0 to build a new one ++ * @return protocol tag value on success, -1 on error ++ */ ++-inline u_int32_t +++u_int32_t ++ libnet_getgre_length(u_int16_t fv); ++ ++ /** ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -12,4 +12,4 @@ ++ ++ EXTRA_DIST = Makefile.am.common ++ ++-bin_scripts = libnet-config +++bin_SCRIPTS = libnet-config ++--- a/sample/Makefile.am +++++ b/sample/Makefile.am ++@@ -60,4 +60,4 @@ ++ ip_link_SOURCES = ip_link.c ++ sebek_SOURCES = sebek.c ++ ++-LDADD = $(top_srcdir)/src/libnet.a +++LDADD = $(top_srcdir)/src/libnet.la ++--- a/src/libnet_checksum.c +++++ b/src/libnet_checksum.c ++@@ -42,8 +42,10 @@ ++ libnet_in_cksum(u_int16_t *addr, int len) ++ { ++ int sum; +++ u_int16_t last_byte; ++ ++ sum = 0; +++ last_byte = 0; ++ ++ while (len > 1) ++ { ++@@ -52,7 +54,8 @@ ++ } ++ if (len == 1) ++ { ++- sum += *(u_int16_t *)addr; +++ *(u_int8_t*)&last_byte = *(u_int8_t*)addr; +++ sum += last_byte; ++ } ++ ++ return (sum); ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -8,9 +8,9 @@ ++ ++ include $(top_srcdir)/Makefile.am.common ++ ++-lib_LIBRARIES = libnet.a +++lib_LTLIBRARIES = libnet.la ++ ++-libnet_a_SOURCES = libnet_asn1.c \ +++libnet_la_SOURCES = libnet_asn1.c \ ++ libnet_build_802.1q.c \ ++ libnet_build_802.1x.c \ ++ libnet_build_802.2.c \ ++@@ -57,15 +57,20 @@ ++ libnet_version.c \ ++ libnet_write.c ++ ++-EXTRA_libnet_a_SOURCES = libnet_link_bpf.c \ ++- libnet_link_dlpi.c \ ++- libnet_link_linux.c \ ++- libnet_link_nit.c \ ++- libnet_link_none.c \ ++- libnet_link_pf.c \ ++- libnet_link_snit.c \ ++- libnet_link_snoop.c \ ++- libnet_link_win32.c ++- ++-libnet_a_LIBADD = @LIBOBJS@ +++libnet_la_LIBADD = @LTLIBOBJS@ ++ +++# Here are a set of rules to help you update your library version +++# information: +++# +++# 1. If the library source code has changed at all since the last +++# update, then increment REVISION (`C:R:A' becomes `C:r+1:A'). +++# +++# 2. If any interfaces have been added, removed, or changed since the +++# last update, increment CURRENT, and set REVISION to 0. +++# +++# 3. If any interfaces have been added since the last public release, +++# then increment AGE. +++# +++# 4. If any interfaces have been removed since the last public release, +++# then set AGE to 0. +++libnet_la_LDFLAGS = -version-info 4:0:3 # CURRENT[:REVISION[:AGE]] +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/150-portability.patch b/feeds/packages/libs/libnet-1.1.x/patches/150-portability.patch +new file mode 100644 +index 0000000..d96b395 +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/150-portability.patch +@@ -0,0 +1,14 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -67,7 +67,10 @@ ++ dnl ++ AC_MSG_CHECKING(link-layer packet interface type) ++ ++-if test -r /dev/bpf0 ; then +++if test -n "$LL_INT_TYPE"; then +++ AC_LIBOBJ($LL_INT_TYPE) +++ AC_MSG_RESULT(found $LL_INT_TYPE (cached)) +++elif test -r /dev/bpf0 ; then ++ AC_LIBOBJ([libnet_link_bpf]) ++ AC_MSG_RESULT(found bpf) ++ elif test -r /usr/include/net/pfilt.h ; then +diff --git a/feeds/packages/libs/libnet-1.1.x/patches/160-endian_cache.patch b/feeds/packages/libs/libnet-1.1.x/patches/160-endian_cache.patch +new file mode 100644 +index 0000000..766d2fe +--- /dev/null ++++ b/feeds/packages/libs/libnet-1.1.x/patches/160-endian_cache.patch +@@ -0,0 +1,18 @@ ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -281,6 +281,7 @@ ++ AC_DEFUN(AC_LIBNET_ENDIAN_CHECK, ++ [AC_MSG_CHECKING(machine endianess) ++ +++ if \! test x${ac_cv_libnet_endianess+set} = xset ; then ++ cat > conftest.c << EOF ++ # include ++ # include ++@@ -332,6 +333,7 @@ ++ fi ++ fi ++ rm -f conftest* core core.conftest +++ fi ++ ++ AC_MSG_RESULT($ac_cv_libnet_endianess) ++ +diff --git a/feeds/packages/libs/libnetfilter-log/.svn/entries b/feeds/packages/libs/libnetfilter-log/.svn/entries +new file mode 100644 +index 0000000..8618380 +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-log/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnetfilter-log ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++42a6d375b0c7e64813f0376f35d87035 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1852 ++ +diff --git a/feeds/packages/libs/libnetfilter-log/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnetfilter-log/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2eca7ff +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-log/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,72 @@ ++# ++# 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:=libnetfilter_log ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:= \ ++ http://www.netfilter.org/projects/libnetfilter_log/files/ \ ++ ftp://ftp.netfilter.org/pub/libnetfilter_log/ \ ++ http://mirrors.evolva.ro/netfilter.org/libnetfilter_log/ ++PKG_MD5SUM:=acdb188a1e7504e95636d0770ade393c ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnetfilter-log ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnfnetlink +kmod-nfnetlink-log ++ TITLE:=API to packets logged by the kernel packet filter ++ URL:=http://www.netfilter.org/projects/libnetfilter_log/ ++endef ++ ++define Package/libnetfilter-log/description ++ libnetfilter_log is a userspace library providing interface to ++ packets that have been logged by the kernel packet filter. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ ++CONFIGURE_VARS += \ ++ LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \ ++ LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libnetfilter_log ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libnetfilter_log/*.h \ ++ $(1)/usr/include/libnetfilter_log/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_log.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libnetfilter-log/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnetfilter-log)) +diff --git a/feeds/packages/libs/libnetfilter-log/Makefile b/feeds/packages/libs/libnetfilter-log/Makefile +new file mode 100644 +index 0000000..2eca7ff +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-log/Makefile +@@ -0,0 +1,72 @@ ++# ++# 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:=libnetfilter_log ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:= \ ++ http://www.netfilter.org/projects/libnetfilter_log/files/ \ ++ ftp://ftp.netfilter.org/pub/libnetfilter_log/ \ ++ http://mirrors.evolva.ro/netfilter.org/libnetfilter_log/ ++PKG_MD5SUM:=acdb188a1e7504e95636d0770ade393c ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnetfilter-log ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnfnetlink +kmod-nfnetlink-log ++ TITLE:=API to packets logged by the kernel packet filter ++ URL:=http://www.netfilter.org/projects/libnetfilter_log/ ++endef ++ ++define Package/libnetfilter-log/description ++ libnetfilter_log is a userspace library providing interface to ++ packets that have been logged by the kernel packet filter. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ ++CONFIGURE_VARS += \ ++ LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \ ++ LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libnetfilter_log ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libnetfilter_log/*.h \ ++ $(1)/usr/include/libnetfilter_log/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_log.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libnetfilter-log/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_log*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnetfilter-log)) +diff --git a/feeds/packages/libs/libnetfilter-queue/.svn/entries b/feeds/packages/libs/libnetfilter-queue/.svn/entries +new file mode 100644 +index 0000000..02c3c24 +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-queue/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnetfilter-queue ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++222d1713038703c775f6283964c11139 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1883 ++ +diff --git a/feeds/packages/libs/libnetfilter-queue/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libnetfilter-queue/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-queue/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libnetfilter-queue/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnetfilter-queue/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c1d5fd5 +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-queue/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,72 @@ ++# ++# 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:=libnetfilter_queue ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:= \ ++ http://www.netfilter.org/projects/libnetfilter_queue/files/ \ ++ ftp://ftp.netfilter.org/pub/libnetfilter_queue/ \ ++ http://mirrors.evolva.ro/netfilter.org/libnetfilter_queue/ ++PKG_MD5SUM:=af6a9ea350f63a13609bc3b47b5c395c ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnetfilter-queue ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnfnetlink +kmod-nfnetlink-queue ++ TITLE:=API to packets queued by the kernel packet filter ++ URL:=http://www.netfilter.org/projects/libnetfilter_queue/ ++endef ++ ++define Package/libnetfilter-queue/description ++ libnetfilter_queue is a userspace library providing an API to packets ++ that have been queued by the kernel packet filter. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ ++CONFIGURE_VARS += \ ++ LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \ ++ LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue/*.h \ ++ $(1)/usr/include/libnetfilter_queue/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libnetfilter-queue/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnetfilter-queue)) +diff --git a/feeds/packages/libs/libnetfilter-queue/Makefile b/feeds/packages/libs/libnetfilter-queue/Makefile +new file mode 100644 +index 0000000..c1d5fd5 +--- /dev/null ++++ b/feeds/packages/libs/libnetfilter-queue/Makefile +@@ -0,0 +1,72 @@ ++# ++# 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:=libnetfilter_queue ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:= \ ++ http://www.netfilter.org/projects/libnetfilter_queue/files/ \ ++ ftp://ftp.netfilter.org/pub/libnetfilter_queue/ \ ++ http://mirrors.evolva.ro/netfilter.org/libnetfilter_queue/ ++PKG_MD5SUM:=af6a9ea350f63a13609bc3b47b5c395c ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnetfilter-queue ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnfnetlink +kmod-nfnetlink-queue ++ TITLE:=API to packets queued by the kernel packet filter ++ URL:=http://www.netfilter.org/projects/libnetfilter_queue/ ++endef ++ ++define Package/libnetfilter-queue/description ++ libnetfilter_queue is a userspace library providing an API to packets ++ that have been queued by the kernel packet filter. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ ++CONFIGURE_VARS += \ ++ LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \ ++ LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libnetfilter_queue ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libnetfilter_queue/*.h \ ++ $(1)/usr/include/libnetfilter_queue/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libnetfilter-queue/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnetfilter-queue)) +diff --git a/feeds/packages/libs/libnfc/.svn/entries b/feeds/packages/libs/libnfc/.svn/entries +new file mode 100644 +index 0000000..7c55d23 +--- /dev/null ++++ b/feeds/packages/libs/libnfc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnfc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++e8014eed67ab2945f6d5ae5c7f69c39b ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3375 ++ +diff --git a/feeds/packages/libs/libnfc/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnfc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..882554f +--- /dev/null ++++ b/feeds/packages/libs/libnfc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,118 @@ ++# ++# 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:=libnfc ++PKG_VERSION:=1.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://libnfc.googlecode.com/files ++PKG_MD5SUM:=c99b2b9212b1a1b064055a199779bdd8 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnfc/Default ++ TITLE:=Near Field Communication (NFC) library ++ URL:=http://www.libnfc.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 a free software library used to handle NFC capable devices. ++ It supports the four main NFC modulations: ++ * ISO14443-A (NXP MIFARE), ++ * ISO14443-B, ++ * JIS X 6319-4 (Sony Felica) and ++ * Jewel Topaz (Innovision Research & Development). ++ And depending on hardware, it supports: ++ * Read (RFID @13.56Mhz), ++ * Emulation and ++ * Peer2Peer mode. ++endef ++ ++define Package/libnfc-bin ++$(call Package/libnfc/Default) ++ TITLE+= (binaries) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libnfc ++endef ++ ++define Package/libnfc-bin/description ++ libnfc is provided with some useful tools: ++ * nfc-list: target listing; ++ * nfc-mfclassic: Mifare Classic operations; ++ * nfc-mfultralight: Mifare Ultralight operations. ++endef ++ ++define Package/libnfc-examples ++$(call Package/libnfc/Default) ++ TITLE+= (examples) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libnfc ++endef ++ ++define Package/libnfc-examples/description ++ libnfc is provided with some examples like: ++ * various targets emulation; ++ * NFC frames relay (ie. over network); ++ * manually done anticollision; ++ * etc. ++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/libnfc-bin/install ++ $(INSTALL_DIR) $(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/ ++endef ++ ++define Package/libnfc-examples/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-anticol $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-initiator $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-target $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-forum-tag4 $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-tag $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-uid $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-poll $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay-picc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libnfc)) ++$(eval $(call BuildPackage,libnfc-bin)) ++$(eval $(call BuildPackage,libnfc-examples)) +diff --git a/feeds/packages/libs/libnfc/Makefile b/feeds/packages/libs/libnfc/Makefile +new file mode 100644 +index 0000000..882554f +--- /dev/null ++++ b/feeds/packages/libs/libnfc/Makefile +@@ -0,0 +1,118 @@ ++# ++# 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:=libnfc ++PKG_VERSION:=1.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://libnfc.googlecode.com/files ++PKG_MD5SUM:=c99b2b9212b1a1b064055a199779bdd8 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnfc/Default ++ TITLE:=Near Field Communication (NFC) library ++ URL:=http://www.libnfc.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 a free software library used to handle NFC capable devices. ++ It supports the four main NFC modulations: ++ * ISO14443-A (NXP MIFARE), ++ * ISO14443-B, ++ * JIS X 6319-4 (Sony Felica) and ++ * Jewel Topaz (Innovision Research & Development). ++ And depending on hardware, it supports: ++ * Read (RFID @13.56Mhz), ++ * Emulation and ++ * Peer2Peer mode. ++endef ++ ++define Package/libnfc-bin ++$(call Package/libnfc/Default) ++ TITLE+= (binaries) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libnfc ++endef ++ ++define Package/libnfc-bin/description ++ libnfc is provided with some useful tools: ++ * nfc-list: target listing; ++ * nfc-mfclassic: Mifare Classic operations; ++ * nfc-mfultralight: Mifare Ultralight operations. ++endef ++ ++define Package/libnfc-examples ++$(call Package/libnfc/Default) ++ TITLE+= (examples) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libnfc ++endef ++ ++define Package/libnfc-examples/description ++ libnfc is provided with some examples like: ++ * various targets emulation; ++ * NFC frames relay (ie. over network); ++ * manually done anticollision; ++ * etc. ++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/libnfc-bin/install ++ $(INSTALL_DIR) $(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/ ++endef ++ ++define Package/libnfc-examples/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-anticol $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-initiator $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-target $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-forum-tag4 $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-tag $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-uid $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-poll $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay-picc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libnfc)) ++$(eval $(call BuildPackage,libnfc-bin)) ++$(eval $(call BuildPackage,libnfc-examples)) +diff --git a/feeds/packages/libs/libnfsidmap/.svn/entries b/feeds/packages/libs/libnfsidmap/.svn/entries +new file mode 100644 +index 0000000..0ffb064 +--- /dev/null ++++ b/feeds/packages/libs/libnfsidmap/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnfsidmap ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++1ae1709dcafdfdf0a450e93821a4c5ae ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1301 ++ +diff --git a/feeds/packages/libs/libnfsidmap/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnfsidmap/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..65415c3 +--- /dev/null ++++ b/feeds/packages/libs/libnfsidmap/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=libnfsidmap ++PKG_VERSION:=0.20 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ ++PKG_MD5SUM:=9233cb77876eb642374a0d2bcaba1170 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnfsidmap ++ SECTION:=libs ++ CATEGORY:=Libraries ++ SUBMENU:=Filesystem ++ TITLE:=libnfsidmap, for compiling mount.nfs4 ++ URL:=http://www.citi.umich.edu/projects/nfsv4 ++endef ++ ++define Package/libnfsidmap/description ++ needed for nfs-utils ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib ++ ++MAKE_FLAGS += \ ++ OPT="$(TARGET_CFLAGS)" \ ++ INSTALLSUID="install -m 4755" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/nfsidmap.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfsidmap.{a,so*} $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfsidmap.pc $(1)/usr/lib/pkgconfig ++endef ++ ++$(eval $(call BuildPackage,libnfsidmap)) +diff --git a/feeds/packages/libs/libnfsidmap/Makefile b/feeds/packages/libs/libnfsidmap/Makefile +new file mode 100644 +index 0000000..65415c3 +--- /dev/null ++++ b/feeds/packages/libs/libnfsidmap/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=libnfsidmap ++PKG_VERSION:=0.20 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ ++PKG_MD5SUM:=9233cb77876eb642374a0d2bcaba1170 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnfsidmap ++ SECTION:=libs ++ CATEGORY:=Libraries ++ SUBMENU:=Filesystem ++ TITLE:=libnfsidmap, for compiling mount.nfs4 ++ URL:=http://www.citi.umich.edu/projects/nfsv4 ++endef ++ ++define Package/libnfsidmap/description ++ needed for nfs-utils ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib ++ ++MAKE_FLAGS += \ ++ OPT="$(TARGET_CFLAGS)" \ ++ INSTALLSUID="install -m 4755" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/nfsidmap.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfsidmap.{a,so*} $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfsidmap.pc $(1)/usr/lib/pkgconfig ++endef ++ ++$(eval $(call BuildPackage,libnfsidmap)) +diff --git a/feeds/packages/libs/libnfsidmap/patches/.svn/entries b/feeds/packages/libs/libnfsidmap/patches/.svn/entries +new file mode 100644 +index 0000000..50b88b6 +--- /dev/null ++++ b/feeds/packages/libs/libnfsidmap/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnfsidmap/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-07-12T09:44:31.098204Z ++7935 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-no-getgrouplist.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f4cddd4458e1b3f317ba0d02284c17a6 ++2007-07-12T09:44:31.098204Z ++7935 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++508 ++ +diff --git a/feeds/packages/libs/libnfsidmap/patches/.svn/text-base/000-no-getgrouplist.patch.svn-base b/feeds/packages/libs/libnfsidmap/patches/.svn/text-base/000-no-getgrouplist.patch.svn-base +new file mode 100644 +index 0000000..ea48245 +--- /dev/null ++++ b/feeds/packages/libs/libnfsidmap/patches/.svn/text-base/000-no-getgrouplist.patch.svn-base +@@ -0,0 +1,17 @@ ++Index: libnfsidmap-0.20/nss.c ++=================================================================== ++--- libnfsidmap-0.20.orig/nss.c 2007-07-12 11:42:09.000000000 +0200 +++++ libnfsidmap-0.20/nss.c 2007-07-12 11:42:09.000000000 +0200 ++@@ -295,9 +295,9 @@ ++ ret = -ENOENT; ++ goto out; ++ } ++- if (getgrouplist(pw->pw_name, pw->pw_gid, groups, ngroups) < 0) ++- ret = -ERANGE; ++- free(pw); +++ // if (getgrouplist(pw->pw_name, pw->pw_gid, groups, ngroups) < 0) +++ // ret = -ERANGE; +++ // free(pw); ++ out: ++ return ret; ++ } +diff --git a/feeds/packages/libs/libnfsidmap/patches/000-no-getgrouplist.patch b/feeds/packages/libs/libnfsidmap/patches/000-no-getgrouplist.patch +new file mode 100644 +index 0000000..ea48245 +--- /dev/null ++++ b/feeds/packages/libs/libnfsidmap/patches/000-no-getgrouplist.patch +@@ -0,0 +1,17 @@ ++Index: libnfsidmap-0.20/nss.c ++=================================================================== ++--- libnfsidmap-0.20.orig/nss.c 2007-07-12 11:42:09.000000000 +0200 +++++ libnfsidmap-0.20/nss.c 2007-07-12 11:42:09.000000000 +0200 ++@@ -295,9 +295,9 @@ ++ ret = -ENOENT; ++ goto out; ++ } ++- if (getgrouplist(pw->pw_name, pw->pw_gid, groups, ngroups) < 0) ++- ret = -ERANGE; ++- free(pw); +++ // if (getgrouplist(pw->pw_name, pw->pw_gid, groups, ngroups) < 0) +++ // ret = -ERANGE; +++ // free(pw); ++ out: ++ return ret; ++ } +diff --git a/feeds/packages/libs/libnids/.svn/entries b/feeds/packages/libs/libnids/.svn/entries +new file mode 100644 +index 0000000..81ec6df +--- /dev/null ++++ b/feeds/packages/libs/libnids/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnids ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-27T13:31:21.845110Z ++20509 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7b0862e137650f319b7673becd2564ce ++2009-12-18T11:06:19.966693Z ++18816 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1614 ++ +diff --git a/feeds/packages/libs/libnids/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libnids/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libnids/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libnids/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libnids/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..21c0de1 +--- /dev/null ++++ b/feeds/packages/libs/libnids/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,66 @@ ++# ++# Copyright (C) 2006-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:=libnids ++PKG_VERSION:=1.18 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.packetfactory.net/projects/libnids/dist/ ++PKG_MD5SUM:=9ee6dcdfac97bae6fe611aa27d2594a5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnids ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnet0 ++ TITLE:=A network intrusion detection library ++ URL:=http://www.packetfactory.net/projects/libnids/ ++endef ++ ++define Package/libnids/description ++ An implementation of an E-component of Network Intrusion Detection ++ System. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ , \ ++ CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ ) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LNETLIB="-L$(STAGING_DIR)/usr/lib/libnet-1.0.x/lib -lnet" \ ++ PCAPLIB="$(TARGET_LDFLAGS) -lpcap" \ ++ install_prefix="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libnids/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnids)) +diff --git a/feeds/packages/libs/libnids/Makefile b/feeds/packages/libs/libnids/Makefile +new file mode 100644 +index 0000000..21c0de1 +--- /dev/null ++++ b/feeds/packages/libs/libnids/Makefile +@@ -0,0 +1,66 @@ ++# ++# Copyright (C) 2006-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:=libnids ++PKG_VERSION:=1.18 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.packetfactory.net/projects/libnids/dist/ ++PKG_MD5SUM:=9ee6dcdfac97bae6fe611aa27d2594a5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnids ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libnet0 ++ TITLE:=A network intrusion detection library ++ URL:=http://www.packetfactory.net/projects/libnids/ ++endef ++ ++define Package/libnids/description ++ An implementation of an E-component of Network Intrusion Detection ++ System. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ , \ ++ CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ ) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LNETLIB="-L$(STAGING_DIR)/usr/lib/libnet-1.0.x/lib -lnet" \ ++ PCAPLIB="$(TARGET_LDFLAGS) -lpcap" \ ++ install_prefix="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libnids/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnids)) +diff --git a/feeds/packages/libs/libnids/patches/.svn/entries b/feeds/packages/libs/libnids/patches/.svn/entries +new file mode 100644 +index 0000000..a36f5cc +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libnids/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-27T13:31:21.845110Z ++20509 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++003-missing_else.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++375714bdd3ba1670fa905b882e3af311 ++2010-03-27T13:31:21.845110Z ++20509 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++324 ++ ++001-no_asm_for_i386.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++3cb58288932312da2e4aad5b61df4708 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++394 ++ ++002-configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++14e5c27a76c71e9a4512722245b8cc27 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2151 ++ +diff --git a/feeds/packages/libs/libnids/patches/.svn/prop-base/001-no_asm_for_i386.patch.svn-base b/feeds/packages/libs/libnids/patches/.svn/prop-base/001-no_asm_for_i386.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/.svn/prop-base/001-no_asm_for_i386.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libnids/patches/.svn/prop-base/002-configure.patch.svn-base b/feeds/packages/libs/libnids/patches/.svn/prop-base/002-configure.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/.svn/prop-base/002-configure.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libnids/patches/.svn/text-base/001-no_asm_for_i386.patch.svn-base b/feeds/packages/libs/libnids/patches/.svn/text-base/001-no_asm_for_i386.patch.svn-base +new file mode 100644 +index 0000000..ff6fde7 +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/.svn/text-base/001-no_asm_for_i386.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -ruN libnids-1.18-orig/src/checksum.c libnids-1.18/src/checksum.c ++--- libnids-1.18-orig/src/checksum.c 2003-09-20 22:40:44.000000000 +0200 +++++ libnids-1.18/src/checksum.c 2005-08-09 23:55:00.000000000 +0200 ++@@ -4,7 +4,7 @@ ++ #include ++ #include ++ ++-#if ( __i386__ || __i386 ) +++#if 0 ++ // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels ++ ++ /* +diff --git a/feeds/packages/libs/libnids/patches/.svn/text-base/002-configure.patch.svn-base b/feeds/packages/libs/libnids/patches/.svn/text-base/002-configure.patch.svn-base +new file mode 100644 +index 0000000..3b56aba +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/.svn/text-base/002-configure.patch.svn-base +@@ -0,0 +1,62 @@ ++diff -Nur libnids-1.18/configure libnids-1.18.patched/configure ++--- libnids-1.18/configure 2003-10-15 01:40:09.000000000 +0200 +++++ libnids-1.18.patched/configure 2005-06-09 12:37:42.000000000 +0200 ++@@ -3253,7 +3253,7 @@ ++ esac ++ ++ ++-CFLAGS="$CFLAGS -D_BSD_SOURCE" +++CFLAGS="$CFLAGS" ++ ++ for ac_func in gettimeofday ++ do ++@@ -3489,17 +3489,21 @@ ++ echo "${ECHO_T}no" >&6 ++ ;; ++ *) ++- echo "$as_me:$LINENO: result: $withval" >&5 ++-echo "${ECHO_T}$withval" >&6 +++ echo "$ac_t""$withval" 1>&6 ++ if test -f $withval/pcap.h -a -f $withval/libpcap.a; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++- PCAP_CFLAGS="-I$withval -I$withval/bpf" +++ PCAPINC="-I$withval -I$withval/bpf" ++ PCAPLIB="-L$withval -lpcap" +++ elif test -f $withval/include/pcap.h -a \ +++ -f $withval/include/pcap-bpf.h -a \ +++ -f $withval/lib/libpcap.a; then +++ owd=`pwd` +++ if cd $withval; then withval=`pwd`; cd $owd; fi +++ PCAPINC="-I$withval/include" +++ PCAPLIB="-L$withval/lib -lpcap" ++ else ++- { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5 ++-echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;} ++- { (exit 1); exit 1; }; } +++ { echo "configure: error: pcap.h" 1>&2; exit 1; } ++ fi ++ ;; ++ esac ++@@ -3605,10 +3609,10 @@ ++ *) ++ echo "$as_me:$LINENO: result: $withval" >&5 ++ echo "${ECHO_T}$withval" >&6 ++- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then +++ if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/bin/libnet-config ; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++- LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`" +++ LNET_CFLAGS="-I$withval/include `$withval/bin/libnet-config --defines`" ++ LNETLIB="-L$withval/lib -lnet" ++ elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then ++ owd=`pwd` ++@@ -3861,7 +3865,7 @@ ++ else ++ echo "$as_me: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++-HAVE_BSD_UDPHDR=0 +++HAVE_BSD_UDPHDR=1 ++ fi ++ rm -f conftest.$ac_objext conftest.$ac_ext ++ +diff --git a/feeds/packages/libs/libnids/patches/.svn/text-base/003-missing_else.patch.svn-base b/feeds/packages/libs/libnids/patches/.svn/text-base/003-missing_else.patch.svn-base +new file mode 100644 +index 0000000..215fe92 +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/.svn/text-base/003-missing_else.patch.svn-base +@@ -0,0 +1,11 @@ ++diff -urN libnids-1.18/src/killtcp.c libnids-1.18.new/src/killtcp.c ++--- libnids-1.18/src/killtcp.c 2002-08-21 18:19:40.000000000 +0200 +++++ libnids-1.18.new/src/killtcp.c 2010-03-27 13:44:59.000000000 +0100 ++@@ -100,6 +100,6 @@ ++ if (initialized) ++ abort(); ++ } ++-#elif +++#else ++ #error Something wrong with LIBNET_VER ++ #endif +diff --git a/feeds/packages/libs/libnids/patches/001-no_asm_for_i386.patch b/feeds/packages/libs/libnids/patches/001-no_asm_for_i386.patch +new file mode 100644 +index 0000000..ff6fde7 +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/001-no_asm_for_i386.patch +@@ -0,0 +1,12 @@ ++diff -ruN libnids-1.18-orig/src/checksum.c libnids-1.18/src/checksum.c ++--- libnids-1.18-orig/src/checksum.c 2003-09-20 22:40:44.000000000 +0200 +++++ libnids-1.18/src/checksum.c 2005-08-09 23:55:00.000000000 +0200 ++@@ -4,7 +4,7 @@ ++ #include ++ #include ++ ++-#if ( __i386__ || __i386 ) +++#if 0 ++ // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels ++ ++ /* +diff --git a/feeds/packages/libs/libnids/patches/002-configure.patch b/feeds/packages/libs/libnids/patches/002-configure.patch +new file mode 100644 +index 0000000..3b56aba +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/002-configure.patch +@@ -0,0 +1,62 @@ ++diff -Nur libnids-1.18/configure libnids-1.18.patched/configure ++--- libnids-1.18/configure 2003-10-15 01:40:09.000000000 +0200 +++++ libnids-1.18.patched/configure 2005-06-09 12:37:42.000000000 +0200 ++@@ -3253,7 +3253,7 @@ ++ esac ++ ++ ++-CFLAGS="$CFLAGS -D_BSD_SOURCE" +++CFLAGS="$CFLAGS" ++ ++ for ac_func in gettimeofday ++ do ++@@ -3489,17 +3489,21 @@ ++ echo "${ECHO_T}no" >&6 ++ ;; ++ *) ++- echo "$as_me:$LINENO: result: $withval" >&5 ++-echo "${ECHO_T}$withval" >&6 +++ echo "$ac_t""$withval" 1>&6 ++ if test -f $withval/pcap.h -a -f $withval/libpcap.a; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++- PCAP_CFLAGS="-I$withval -I$withval/bpf" +++ PCAPINC="-I$withval -I$withval/bpf" ++ PCAPLIB="-L$withval -lpcap" +++ elif test -f $withval/include/pcap.h -a \ +++ -f $withval/include/pcap-bpf.h -a \ +++ -f $withval/lib/libpcap.a; then +++ owd=`pwd` +++ if cd $withval; then withval=`pwd`; cd $owd; fi +++ PCAPINC="-I$withval/include" +++ PCAPLIB="-L$withval/lib -lpcap" ++ else ++- { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5 ++-echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;} ++- { (exit 1); exit 1; }; } +++ { echo "configure: error: pcap.h" 1>&2; exit 1; } ++ fi ++ ;; ++ esac ++@@ -3605,10 +3609,10 @@ ++ *) ++ echo "$as_me:$LINENO: result: $withval" >&5 ++ echo "${ECHO_T}$withval" >&6 ++- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then +++ if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/bin/libnet-config ; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++- LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`" +++ LNET_CFLAGS="-I$withval/include `$withval/bin/libnet-config --defines`" ++ LNETLIB="-L$withval/lib -lnet" ++ elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then ++ owd=`pwd` ++@@ -3861,7 +3865,7 @@ ++ else ++ echo "$as_me: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++-HAVE_BSD_UDPHDR=0 +++HAVE_BSD_UDPHDR=1 ++ fi ++ rm -f conftest.$ac_objext conftest.$ac_ext ++ +diff --git a/feeds/packages/libs/libnids/patches/003-missing_else.patch b/feeds/packages/libs/libnids/patches/003-missing_else.patch +new file mode 100644 +index 0000000..215fe92 +--- /dev/null ++++ b/feeds/packages/libs/libnids/patches/003-missing_else.patch +@@ -0,0 +1,11 @@ ++diff -urN libnids-1.18/src/killtcp.c libnids-1.18.new/src/killtcp.c ++--- libnids-1.18/src/killtcp.c 2002-08-21 18:19:40.000000000 +0200 +++++ libnids-1.18.new/src/killtcp.c 2010-03-27 13:44:59.000000000 +0100 ++@@ -100,6 +100,6 @@ ++ if (initialized) ++ abort(); ++ } ++-#elif +++#else ++ #error Something wrong with LIBNET_VER ++ #endif +diff --git a/feeds/packages/libs/libogg/.svn/entries b/feeds/packages/libs/libogg/.svn/entries +new file mode 100644 +index 0000000..d411878 +--- /dev/null ++++ b/feeds/packages/libs/libogg/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libogg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:06.977927Z ++35793 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++1c8b18f2c6cc271238e72e33e144f8df ++2013-02-25T21:04:06.977927Z ++35793 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1601 ++ +diff --git a/feeds/packages/libs/libogg/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libogg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..883f0ce +--- /dev/null ++++ b/feeds/packages/libs/libogg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2008-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:=libogg ++PKG_VERSION:=1.3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/ ++PKG_MD5SUM:=84a35715170f2cd4c77a4448772b95d5 ++ ++PKG_LICENSE:=BSD-3c ++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/feeds/packages/libs/libogg/Makefile b/feeds/packages/libs/libogg/Makefile +new file mode 100644 +index 0000000..883f0ce +--- /dev/null ++++ b/feeds/packages/libs/libogg/Makefile +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2008-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:=libogg ++PKG_VERSION:=1.3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/ ++PKG_MD5SUM:=84a35715170f2cd4c77a4448772b95d5 ++ ++PKG_LICENSE:=BSD-3c ++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/feeds/packages/libs/liboil/.svn/entries b/feeds/packages/libs/liboil/.svn/entries +new file mode 100644 +index 0000000..f399cf4 +--- /dev/null ++++ b/feeds/packages/libs/liboil/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/liboil ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:30:26.626404Z ++32238 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++a4e6b6ef1d699c05354edaf5e34fe3e8 ++2012-06-11T23:30:26.626404Z ++32238 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1905 ++ +diff --git a/feeds/packages/libs/liboil/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/liboil/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ad77779 +--- /dev/null ++++ b/feeds/packages/libs/liboil/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# 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:=liboil ++PKG_VERSION:=0.3.17 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ ++PKG_MD5SUM:=47dc734f82faeb2964d97771cfd2e701 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/liboil ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=simple functions optimized for various CPUs ++ URL:=http://liboil.freedesktop.org/wiki/ ++ DEPENDS:=+librt ++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) ++ ++# 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/feeds/packages/libs/liboil/Makefile b/feeds/packages/libs/liboil/Makefile +new file mode 100644 +index 0000000..ad77779 +--- /dev/null ++++ b/feeds/packages/libs/liboil/Makefile +@@ -0,0 +1,65 @@ ++# ++# 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:=liboil ++PKG_VERSION:=0.3.17 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ ++PKG_MD5SUM:=47dc734f82faeb2964d97771cfd2e701 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/liboil ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=simple functions optimized for various CPUs ++ URL:=http://liboil.freedesktop.org/wiki/ ++ DEPENDS:=+librt ++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) ++ ++# 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/feeds/packages/libs/liboil/patches/.svn/entries b/feeds/packages/libs/liboil/patches/.svn/entries +new file mode 100644 +index 0000000..689b48d +--- /dev/null ++++ b/feeds/packages/libs/liboil/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/liboil/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T03:01:33.551430Z ++24579 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-pkgconfig.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++598922c4a378930a70559f2aa1a06043 ++2009-10-05T11:21:20.013499Z ++17868 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++482 ++ ++001-no-tools-docs-examples.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++4b72bfec052150e046922fb87c08fa3f ++2010-12-15T02:09:51.373611Z ++24576 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++617 ++ +diff --git a/feeds/packages/libs/liboil/patches/.svn/text-base/001-no-tools-docs-examples.patch.svn-base b/feeds/packages/libs/liboil/patches/.svn/text-base/001-no-tools-docs-examples.patch.svn-base +new file mode 100644 +index 0000000..1cebc70 +--- /dev/null ++++ b/feeds/packages/libs/liboil/patches/.svn/text-base/001-no-tools-docs-examples.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ ++ AUTOMAKE_OPTIONS = foreign ++ ++-SUBDIRS = liboil testsuite examples doc +++SUBDIRS = liboil ++ ++ EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign ++-SUBDIRS = liboil testsuite examples doc +++SUBDIRS = liboil ++ EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc +diff --git a/feeds/packages/libs/liboil/patches/.svn/text-base/002-pkgconfig.patch.svn-base b/feeds/packages/libs/liboil/patches/.svn/text-base/002-pkgconfig.patch.svn-base +new file mode 100644 +index 0000000..993f8e6 +--- /dev/null ++++ b/feeds/packages/libs/liboil/patches/.svn/text-base/002-pkgconfig.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/liboil.pc.in +++++ b/liboil.pc.in ++@@ -1,7 +1,7 @@ ++ prefix=@prefix@ ++ exec_prefix=@exec_prefix@ ++ libdir=@libdir@ ++-includedir=@includedir@/liboil-@LIBOIL_MAJORMINOR@ +++includedir=@includedir@ ++ toolsdir=${exec_prefix}/bin ++ ++ ++@@ -9,6 +9,6 @@ Name: liboil-@LIBOIL_MAJORMINOR@ ++ Description: Library of Optimized Inner Loops ++ Version: @VERSION@ ++ Libs: -L${libdir} -loil-@LIBOIL_MAJORMINOR@ @LIBM@ @LIBRT@ ++-Cflags: -I${includedir} +++Cflags: -I${includedir}/liboil-@LIBOIL_MAJORMINOR@ ++ ++ +diff --git a/feeds/packages/libs/liboil/patches/001-no-tools-docs-examples.patch b/feeds/packages/libs/liboil/patches/001-no-tools-docs-examples.patch +new file mode 100644 +index 0000000..1cebc70 +--- /dev/null ++++ b/feeds/packages/libs/liboil/patches/001-no-tools-docs-examples.patch +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ ++ AUTOMAKE_OPTIONS = foreign ++ ++-SUBDIRS = liboil testsuite examples doc +++SUBDIRS = liboil ++ ++ EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign ++-SUBDIRS = liboil testsuite examples doc +++SUBDIRS = liboil ++ EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc +diff --git a/feeds/packages/libs/liboil/patches/002-pkgconfig.patch b/feeds/packages/libs/liboil/patches/002-pkgconfig.patch +new file mode 100644 +index 0000000..993f8e6 +--- /dev/null ++++ b/feeds/packages/libs/liboil/patches/002-pkgconfig.patch +@@ -0,0 +1,19 @@ ++--- a/liboil.pc.in +++++ b/liboil.pc.in ++@@ -1,7 +1,7 @@ ++ prefix=@prefix@ ++ exec_prefix=@exec_prefix@ ++ libdir=@libdir@ ++-includedir=@includedir@/liboil-@LIBOIL_MAJORMINOR@ +++includedir=@includedir@ ++ toolsdir=${exec_prefix}/bin ++ ++ ++@@ -9,6 +9,6 @@ Name: liboil-@LIBOIL_MAJORMINOR@ ++ Description: Library of Optimized Inner Loops ++ Version: @VERSION@ ++ Libs: -L${libdir} -loil-@LIBOIL_MAJORMINOR@ @LIBM@ @LIBRT@ ++-Cflags: -I${includedir} +++Cflags: -I${includedir}/liboil-@LIBOIL_MAJORMINOR@ ++ ++ +diff --git a/feeds/packages/libs/libol/.svn/entries b/feeds/packages/libs/libol/.svn/entries +new file mode 100644 +index 0000000..4b43426 +--- /dev/null ++++ b/feeds/packages/libs/libol/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libol ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d3132c60dece487ee7e1f33f0992a43b ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1472 ++ +diff --git a/feeds/packages/libs/libol/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libol/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libol/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libol/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libol/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7c4b1cd +--- /dev/null ++++ b/feeds/packages/libs/libol/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=libol ++PKG_VERSION:=0.3.18 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/libol/0.3 ++PKG_MD5SUM:=cbadf4b7ea276dfa85acc38a1cc5ff17 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libol ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Support library for syslog-ng ++ URL:=http://www.balabit.com/products/syslog_ng/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ ) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++# pass CFLAGS again to override -O2 set by configure ++MAKE_ARGS += CFLAGS="$(TARGET_CFLAGS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/libol-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/libol-config ++ ++ $(INSTALL_DIR) $(1)/usr/include/libol ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libol/*.h \ ++ $(1)/usr/include/libol/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libol.{a,la,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libol/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libol.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libol)) +diff --git a/feeds/packages/libs/libol/Makefile b/feeds/packages/libs/libol/Makefile +new file mode 100644 +index 0000000..7c4b1cd +--- /dev/null ++++ b/feeds/packages/libs/libol/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=libol ++PKG_VERSION:=0.3.18 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/libol/0.3 ++PKG_MD5SUM:=cbadf4b7ea276dfa85acc38a1cc5ff17 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libol ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Support library for syslog-ng ++ URL:=http://www.balabit.com/products/syslog_ng/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ ) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++# pass CFLAGS again to override -O2 set by configure ++MAKE_ARGS += CFLAGS="$(TARGET_CFLAGS)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/libol-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/libol-config ++ ++ $(INSTALL_DIR) $(1)/usr/include/libol ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libol/*.h \ ++ $(1)/usr/include/libol/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libol.{a,la,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libol/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libol.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libol)) +diff --git a/feeds/packages/libs/liboping/.svn/entries b/feeds/packages/libs/liboping/.svn/entries +new file mode 100644 +index 0000000..74dc77f +--- /dev/null ++++ b/feeds/packages/libs/liboping/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/liboping ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++b4d4ca97e38758b2778143b2d1eec779 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1885 ++ +diff --git a/feeds/packages/libs/liboping/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/liboping/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..531a64e +--- /dev/null ++++ b/feeds/packages/libs/liboping/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,82 @@ ++# ++# 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:=liboping ++PKG_VERSION:=1.6.2 ++PKG_RELEASE:=1 ++ ++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/feeds/packages/libs/liboping/Makefile b/feeds/packages/libs/liboping/Makefile +new file mode 100644 +index 0000000..531a64e +--- /dev/null ++++ b/feeds/packages/libs/liboping/Makefile +@@ -0,0 +1,82 @@ ++# ++# 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:=liboping ++PKG_VERSION:=1.6.2 ++PKG_RELEASE:=1 ++ ++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/feeds/packages/libs/liboping/patches/.svn/entries b/feeds/packages/libs/liboping/patches/.svn/entries +new file mode 100644 +index 0000000..1cfc7fd +--- /dev/null ++++ b/feeds/packages/libs/liboping/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/liboping/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-27T02:12:17.636370Z ++31869 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++01-no-werror.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++206e37f1845b2f677988e1ff2a0e4184 ++2012-05-27T02:12:17.636370Z ++31869 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++221 ++ +diff --git a/feeds/packages/libs/liboping/patches/.svn/text-base/01-no-werror.patch.svn-base b/feeds/packages/libs/liboping/patches/.svn/text-base/01-no-werror.patch.svn-base +new file mode 100644 +index 0000000..8589284 +--- /dev/null ++++ b/feeds/packages/libs/liboping/patches/.svn/text-base/01-no-werror.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/libs/liboping/patches/01-no-werror.patch b/feeds/packages/libs/liboping/patches/01-no-werror.patch +new file mode 100644 +index 0000000..8589284 +--- /dev/null ++++ b/feeds/packages/libs/liboping/patches/01-no-werror.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/libs/libosip2/.svn/entries b/feeds/packages/libs/libosip2/.svn/entries +new file mode 100644 +index 0000000..4461668 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libosip2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++745d19c8aee32dd85033508b3b816601 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1524 ++ +diff --git a/feeds/packages/libs/libosip2/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libosip2/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libosip2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libosip2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..19d61f7 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=libosip2 ++PKG_VERSION:=3.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/osip ++PKG_MD5SUM:=7691546f6b3349d10007fc1aaff0f4e0 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libosip2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=GNU oSIP library ++ URL:=http://www.gnu.org/software/osip/ ++ DEPENDS:=+libpthread ++endef ++ ++define Package/libosip2description ++ GNU oSIP library, a Session Initiation Protocol (SIP) implementation. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-debug \ ++ --disable-trace \ ++ --enable-pthread \ ++ --enable-semaphore \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libosip2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libosip2)) +diff --git a/feeds/packages/libs/libosip2/Makefile b/feeds/packages/libs/libosip2/Makefile +new file mode 100644 +index 0000000..19d61f7 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=libosip2 ++PKG_VERSION:=3.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/osip ++PKG_MD5SUM:=7691546f6b3349d10007fc1aaff0f4e0 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libosip2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=GNU oSIP library ++ URL:=http://www.gnu.org/software/osip/ ++ DEPENDS:=+libpthread ++endef ++ ++define Package/libosip2description ++ GNU oSIP library, a Session Initiation Protocol (SIP) implementation. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-debug \ ++ --disable-trace \ ++ --enable-pthread \ ++ --enable-semaphore \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libosip2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libosip2)) +diff --git a/feeds/packages/libs/libosip2/patches/.svn/entries b/feeds/packages/libs/libosip2/patches/.svn/entries +new file mode 100644 +index 0000000..68efbc5 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libosip2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-08-03T21:08:39.404227Z ++27886 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f32cdc393457e9e3b100a2106b411745 ++2011-08-03T21:08:39.404227Z ++27886 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++200 ++ +diff --git a/feeds/packages/libs/libosip2/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libosip2/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..9c0bc11 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,8 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,3 +1,5 @@ +++ACLOCAL_AMFLAGS = -I scripts +++ ++ EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in ++ ++ SUBDIRS = include src scripts help platform +diff --git a/feeds/packages/libs/libosip2/patches/001-automake-compat.patch b/feeds/packages/libs/libosip2/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..9c0bc11 +--- /dev/null ++++ b/feeds/packages/libs/libosip2/patches/001-automake-compat.patch +@@ -0,0 +1,8 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,3 +1,5 @@ +++ACLOCAL_AMFLAGS = -I scripts +++ ++ EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in ++ ++ SUBDIRS = include src scripts help platform +diff --git a/feeds/packages/libs/libowfat/.svn/entries b/feeds/packages/libs/libowfat/.svn/entries +new file mode 100644 +index 0000000..0708a44 +--- /dev/null ++++ b/feeds/packages/libs/libowfat/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libowfat ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-23T04:35:04.973724Z ++20383 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++832f2db872e89088e582239846429cde ++2010-03-23T04:35:04.973724Z ++20383 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1276 ++ +diff --git a/feeds/packages/libs/libowfat/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libowfat/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..23a8869 +--- /dev/null ++++ b/feeds/packages/libs/libowfat/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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 ++ ++LOWFAT_VERSION=0.28 ++ ++PKG_NAME:=libowfat ++PKG_VERSION:=$(LOWFAT_VERSION) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.fefe.de ++PKG_MD5SUM:=6bbee9a86506419657d87123b7a6f2c1 ++ ++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) \ ++ COPTS="$(TARGET_CFLAGS)" \ ++ DEBUG="$(DEBUG)" \ ++ VERSION="$(LOWFAT_VERSION)" \ ++ CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \ ++ 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/feeds/packages/libs/libowfat/Makefile b/feeds/packages/libs/libowfat/Makefile +new file mode 100644 +index 0000000..23a8869 +--- /dev/null ++++ b/feeds/packages/libs/libowfat/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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 ++ ++LOWFAT_VERSION=0.28 ++ ++PKG_NAME:=libowfat ++PKG_VERSION:=$(LOWFAT_VERSION) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.fefe.de ++PKG_MD5SUM:=6bbee9a86506419657d87123b7a6f2c1 ++ ++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) \ ++ COPTS="$(TARGET_CFLAGS)" \ ++ DEBUG="$(DEBUG)" \ ++ VERSION="$(LOWFAT_VERSION)" \ ++ CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \ ++ 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/feeds/packages/libs/libpam/.svn/entries b/feeds/packages/libs/libpam/.svn/entries +new file mode 100644 +index 0000000..7f8f620 +--- /dev/null ++++ b/feeds/packages/libs/libpam/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpam ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f97a21bdbfca2faa62efcf1533c9462f ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1703 ++ +diff --git a/feeds/packages/libs/libpam/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libpam/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/libs/libpam/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libpam/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libpam/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..24e989c +--- /dev/null ++++ b/feeds/packages/libs/libpam/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,71 @@ ++# ++# Copyright (C) 2006-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:=libpam ++PKG_VERSION:=1.1.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pkgs.fedoraproject.org/repo/pkgs/pam/Linux-PAM-1.1.4.tar.bz2/e9af5fb27bb22edb55d077e2888b3ebc/ ++PKG_MD5SUM:=e9af5fb27bb22edb55d077e2888b3ebc ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpam ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=@BROKEN ++ TITLE:=free implementation of the following DCE-RFC from Sunsoft. ++ URL:=http://www.kernel.org/pub/linux/libs/pam ++endef ++ ++define Package/libpam/description ++ Linux-PAM is a free implementation of the following DCE-RFC from Sunsoft. ++ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); autoreconf -v -f --install || exit 1) ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --enable-pamlocking \ ++ --disable-prelude \ ++ --disable-lckpwdf \ ++ --disable-selinux \ ++ --disable-nls \ ++ --disable-rpath \ ++ ) ++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 ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,libpam)) +diff --git a/feeds/packages/libs/libpam/Makefile b/feeds/packages/libs/libpam/Makefile +new file mode 100644 +index 0000000..24e989c +--- /dev/null ++++ b/feeds/packages/libs/libpam/Makefile +@@ -0,0 +1,71 @@ ++# ++# Copyright (C) 2006-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:=libpam ++PKG_VERSION:=1.1.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pkgs.fedoraproject.org/repo/pkgs/pam/Linux-PAM-1.1.4.tar.bz2/e9af5fb27bb22edb55d077e2888b3ebc/ ++PKG_MD5SUM:=e9af5fb27bb22edb55d077e2888b3ebc ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpam ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=@BROKEN ++ TITLE:=free implementation of the following DCE-RFC from Sunsoft. ++ URL:=http://www.kernel.org/pub/linux/libs/pam ++endef ++ ++define Package/libpam/description ++ Linux-PAM is a free implementation of the following DCE-RFC from Sunsoft. ++ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); autoreconf -v -f --install || exit 1) ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --enable-pamlocking \ ++ --disable-prelude \ ++ --disable-lckpwdf \ ++ --disable-selinux \ ++ --disable-nls \ ++ --disable-rpath \ ++ ) ++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 ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,libpam)) +diff --git a/feeds/packages/libs/libpam/patches/.svn/entries b/feeds/packages/libs/libpam/patches/.svn/entries +new file mode 100644 +index 0000000..2c7b8e7 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/entries +@@ -0,0 +1,300 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpam/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-01T11:11:31.999483Z ++28350 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++003-no_doc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++85b98414d2b8c3e540c144ab61d0e72f ++2010-12-07T14:49:19.864479Z ++24301 ++acoul ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1594 ++ ++005-fix_ruserok.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a4d4f9ebc809b686d95d1e7947a7382a ++2011-10-01T10:55:47.163135Z ++28345 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8284 ++ ++001-no_nis.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a3c3972bb469121e69766f1a250578eb ++2011-09-29T10:36:49.361262Z ++28316 ++acoul ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1815 ++ ++002-no_yywrap.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++c80a0ad1afb8d608a157cedde23f2dbd ++2010-09-06T20:25:42.464303Z ++22961 ++acoul ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++522 ++ ++006-fix_xdr.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++7e6e7fd9fdef83a27fed5209d2b0dc3e ++2011-10-01T11:11:31.999483Z ++28350 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5419 ++ ++004-fix_lib64.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d54bef34983b7f4d2387aee62b5dc1b0 ++2010-09-06T20:25:42.464303Z ++22961 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++362 ++ ++000-OE-pam-no-innetgr.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8074708388c9769812121bc373ab5684 ++2010-12-07T14:49:19.864479Z ++24301 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3064 ++ ++000-OE-libpam-xtests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++11191d29049b283b2f9990f719941c90 ++2011-09-29T10:36:49.361262Z ++28316 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++942 ++ +diff --git a/feeds/packages/libs/libpam/patches/.svn/prop-base/001-no_nis.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/prop-base/001-no_nis.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/prop-base/001-no_nis.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libpam/patches/.svn/prop-base/002-no_yywrap.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/prop-base/002-no_yywrap.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/prop-base/002-no_yywrap.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libpam/patches/.svn/prop-base/003-no_doc.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/prop-base/003-no_doc.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/prop-base/003-no_doc.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libpam/patches/.svn/text-base/000-OE-libpam-xtests.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/000-OE-libpam-xtests.patch.svn-base +new file mode 100644 +index 0000000..aac30ab +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/000-OE-libpam-xtests.patch.svn-base +@@ -0,0 +1,35 @@ ++This patch is used to create a new sub package libpam-xtests to do more checks. ++ ++Upstream-Status: Pending ++ ++Signed-off-by: Kang Kai ++--- a/xtests/Makefile.am +++++ b/xtests/Makefile.am ++@@ -7,7 +7,7 @@ ++ AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ ++ -L$(top_builddir)/libpam_misc -lpam_misc ++ ++-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 @@ ++ ++ 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/feeds/packages/libs/libpam/patches/.svn/text-base/000-OE-pam-no-innetgr.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/000-OE-pam-no-innetgr.patch.svn-base +new file mode 100644 +index 0000000..45babfc +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/000-OE-pam-no-innetgr.patch.svn-base +@@ -0,0 +1,85 @@ ++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 ++@@ -659,7 +659,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; ++ } ++ ++@@ -361,14 +370,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/feeds/packages/libs/libpam/patches/.svn/text-base/001-no_nis.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/001-no_nis.patch.svn-base +new file mode 100644 +index 0000000..27d17a0 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/001-no_nis.patch.svn-base +@@ -0,0 +1,68 @@ ++--- a/modules/pam_access/pam_access.c +++++ b/modules/pam_access/pam_access.c ++@@ -44,7 +44,7 @@ ++ #include ++ #include ++ #include ++-#ifdef HAVE_RPCSVC_YPCLNT_H +++#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS ++ #include ++ #endif ++ #ifdef HAVE_LIBAUDIT ++--- a/modules/pam_unix/pam_unix_passwd.c +++++ b/modules/pam_unix/pam_unix_passwd.c ++@@ -74,18 +74,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 ++ ++-# if HAVE_RPCSVC_YP_PROT_H +++# if HAVE_RPCSVC_YP_PROT_H && USE_NIS ++ # include ++ # endif ++ ++-# if HAVE_RPCSVC_YPCLNT_H +++# if HAVE_RPCSVC_YPCLNT_H && USE_NIS ++ # include ++ # endif ++ ++--- a/modules/pam_unix/support.c +++++ b/modules/pam_unix/support.c ++@@ -19,7 +19,7 @@ ++ #include ++ #include ++ #include ++-#ifdef HAVE_RPCSVC_YPCLNT_H +++#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS ++ #include ++ #endif ++ ++@@ -285,7 +285,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 ++@@ -13,6 +13,10 @@ ++ #include "config.h" ++ ++ #include +++#ifdef USE_NIS +++#include +++#include +++#endif ++ #include "yppasswd.h" ++ ++ bool_t +diff --git a/feeds/packages/libs/libpam/patches/.svn/text-base/002-no_yywrap.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/002-no_yywrap.patch.svn-base +new file mode 100644 +index 0000000..0d73e4b +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/002-no_yywrap.patch.svn-base +@@ -0,0 +1,26 @@ ++--- 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/feeds/packages/libs/libpam/patches/.svn/text-base/003-no_doc.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/003-no_doc.patch.svn-base +new file mode 100644 +index 0000000..020f74d +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/003-no_doc.patch.svn-base +@@ -0,0 +1,36 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -5,9 +5,9 @@ ++ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news ++ ++ if STATIC_MODULES ++-SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests +++SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples xtests ++ else ++-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests +++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests ++ endif ++ ++ CLEANFILES = *~ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -74,7 +74,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re ++ distclean-recursive maintainer-clean-recursive ++ ETAGS = etags ++ CTAGS = ctags ++-DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \ +++DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf \ ++ examples xtests ++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ distdir = $(PACKAGE)-$(VERSION) ++@@ -253,8 +253,8 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news ++-@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests ++-@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests +++@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests +++@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples xtests ++ CLEANFILES = *~ ++ M4_FILES = m4/gettext.m4 m4/iconv.m4 m4/intlmacosx.m4 \ ++ m4/japhar_grep_cflags.m4 m4/jh_path_xml_catalog.m4 \ +diff --git a/feeds/packages/libs/libpam/patches/.svn/text-base/004-fix_lib64.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/004-fix_lib64.patch.svn-base +new file mode 100644 +index 0000000..6c83d08 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/004-fix_lib64.patch.svn-base +@@ -0,0 +1,16 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -26,12 +26,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/feeds/packages/libs/libpam/patches/.svn/text-base/005-fix_ruserok.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/005-fix_ruserok.patch.svn-base +new file mode 100644 +index 0000000..1f0f463 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/005-fix_ruserok.patch.svn-base +@@ -0,0 +1,364 @@ ++--- a/modules/pam_rhosts/pam_rhosts.c +++++ b/modules/pam_rhosts/pam_rhosts.c ++@@ -43,6 +43,361 @@ ++ #include ++ #include ++ +++#ifdef __UCLIBC__ +++ +++#include +++#include +++ +++ +++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') { +++ /* 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'; /* 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/feeds/packages/libs/libpam/patches/.svn/text-base/006-fix_xdr.patch.svn-base b/feeds/packages/libs/libpam/patches/.svn/text-base/006-fix_xdr.patch.svn-base +new file mode 100644 +index 0000000..eec6772 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/.svn/text-base/006-fix_xdr.patch.svn-base +@@ -0,0 +1,272 @@ ++--- a/modules/pam_unix/yppasswd_xdr.c +++++ b/modules/pam_unix/yppasswd_xdr.c ++2011-10-01 13:46:21.599443197 +0300 ++@@ -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/feeds/packages/libs/libpam/patches/000-OE-libpam-xtests.patch b/feeds/packages/libs/libpam/patches/000-OE-libpam-xtests.patch +new file mode 100644 +index 0000000..aac30ab +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/000-OE-libpam-xtests.patch +@@ -0,0 +1,35 @@ ++This patch is used to create a new sub package libpam-xtests to do more checks. ++ ++Upstream-Status: Pending ++ ++Signed-off-by: Kang Kai ++--- a/xtests/Makefile.am +++++ b/xtests/Makefile.am ++@@ -7,7 +7,7 @@ ++ AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ ++ -L$(top_builddir)/libpam_misc -lpam_misc ++ ++-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 @@ ++ ++ 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/feeds/packages/libs/libpam/patches/000-OE-pam-no-innetgr.patch b/feeds/packages/libs/libpam/patches/000-OE-pam-no-innetgr.patch +new file mode 100644 +index 0000000..45babfc +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/000-OE-pam-no-innetgr.patch +@@ -0,0 +1,85 @@ ++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 ++@@ -659,7 +659,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; ++ } ++ ++@@ -361,14 +370,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/feeds/packages/libs/libpam/patches/001-no_nis.patch b/feeds/packages/libs/libpam/patches/001-no_nis.patch +new file mode 100644 +index 0000000..27d17a0 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/001-no_nis.patch +@@ -0,0 +1,68 @@ ++--- a/modules/pam_access/pam_access.c +++++ b/modules/pam_access/pam_access.c ++@@ -44,7 +44,7 @@ ++ #include ++ #include ++ #include ++-#ifdef HAVE_RPCSVC_YPCLNT_H +++#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS ++ #include ++ #endif ++ #ifdef HAVE_LIBAUDIT ++--- a/modules/pam_unix/pam_unix_passwd.c +++++ b/modules/pam_unix/pam_unix_passwd.c ++@@ -74,18 +74,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 ++ ++-# if HAVE_RPCSVC_YP_PROT_H +++# if HAVE_RPCSVC_YP_PROT_H && USE_NIS ++ # include ++ # endif ++ ++-# if HAVE_RPCSVC_YPCLNT_H +++# if HAVE_RPCSVC_YPCLNT_H && USE_NIS ++ # include ++ # endif ++ ++--- a/modules/pam_unix/support.c +++++ b/modules/pam_unix/support.c ++@@ -19,7 +19,7 @@ ++ #include ++ #include ++ #include ++-#ifdef HAVE_RPCSVC_YPCLNT_H +++#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS ++ #include ++ #endif ++ ++@@ -285,7 +285,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 ++@@ -13,6 +13,10 @@ ++ #include "config.h" ++ ++ #include +++#ifdef USE_NIS +++#include +++#include +++#endif ++ #include "yppasswd.h" ++ ++ bool_t +diff --git a/feeds/packages/libs/libpam/patches/002-no_yywrap.patch b/feeds/packages/libs/libpam/patches/002-no_yywrap.patch +new file mode 100644 +index 0000000..0d73e4b +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/002-no_yywrap.patch +@@ -0,0 +1,26 @@ ++--- 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/feeds/packages/libs/libpam/patches/003-no_doc.patch b/feeds/packages/libs/libpam/patches/003-no_doc.patch +new file mode 100644 +index 0000000..020f74d +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/003-no_doc.patch +@@ -0,0 +1,36 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -5,9 +5,9 @@ ++ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news ++ ++ if STATIC_MODULES ++-SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests +++SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples xtests ++ else ++-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests +++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests ++ endif ++ ++ CLEANFILES = *~ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -74,7 +74,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re ++ distclean-recursive maintainer-clean-recursive ++ ETAGS = etags ++ CTAGS = ctags ++-DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \ +++DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf \ ++ examples xtests ++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ distdir = $(PACKAGE)-$(VERSION) ++@@ -253,8 +253,8 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news ++-@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests ++-@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests +++@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests +++@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples xtests ++ CLEANFILES = *~ ++ M4_FILES = m4/gettext.m4 m4/iconv.m4 m4/intlmacosx.m4 \ ++ m4/japhar_grep_cflags.m4 m4/jh_path_xml_catalog.m4 \ +diff --git a/feeds/packages/libs/libpam/patches/004-fix_lib64.patch b/feeds/packages/libs/libpam/patches/004-fix_lib64.patch +new file mode 100644 +index 0000000..6c83d08 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/004-fix_lib64.patch +@@ -0,0 +1,16 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -26,12 +26,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/feeds/packages/libs/libpam/patches/005-fix_ruserok.patch b/feeds/packages/libs/libpam/patches/005-fix_ruserok.patch +new file mode 100644 +index 0000000..1f0f463 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/005-fix_ruserok.patch +@@ -0,0 +1,364 @@ ++--- a/modules/pam_rhosts/pam_rhosts.c +++++ b/modules/pam_rhosts/pam_rhosts.c ++@@ -43,6 +43,361 @@ ++ #include ++ #include ++ +++#ifdef __UCLIBC__ +++ +++#include +++#include +++ +++ +++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') { +++ /* 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'; /* 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/feeds/packages/libs/libpam/patches/006-fix_xdr.patch b/feeds/packages/libs/libpam/patches/006-fix_xdr.patch +new file mode 100644 +index 0000000..eec6772 +--- /dev/null ++++ b/feeds/packages/libs/libpam/patches/006-fix_xdr.patch +@@ -0,0 +1,272 @@ ++--- a/modules/pam_unix/yppasswd_xdr.c +++++ b/modules/pam_unix/yppasswd_xdr.c ++2011-10-01 13:46:21.599443197 +0300 ++@@ -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/feeds/packages/libs/libpar2/.svn/entries b/feeds/packages/libs/libpar2/.svn/entries +new file mode 100644 +index 0000000..7ecffc1 +--- /dev/null ++++ b/feeds/packages/libs/libpar2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpar2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++ee9f00b8c8ff8c14e0ed73964f45899c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1244 ++ +diff --git a/feeds/packages/libs/libpar2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libpar2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1f8be5b +--- /dev/null ++++ b/feeds/packages/libs/libpar2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=libpar2 ++PKG_VERSION:=0.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/parchive ++PKG_MD5SUM:=94c6df4e38efe08056ecde2a04e0be91 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpar2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libsigcxx ++ TITLE:=A library for performing common tasks related to PAR recovery sets ++ URL:=http://parchive.sourceforge.net/ ++endef ++ ++define Package/libpar2/description ++A library for performing common tasks related to PAR recovery sets ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-static \ ++ --disable-nls \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libpar2 ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libpar2/*.h \ ++ $(1)/usr/include/libpar2/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libpar2.{la,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libpar2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libpar2.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libpar2)) +diff --git a/feeds/packages/libs/libpar2/Makefile b/feeds/packages/libs/libpar2/Makefile +new file mode 100644 +index 0000000..1f8be5b +--- /dev/null ++++ b/feeds/packages/libs/libpar2/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=libpar2 ++PKG_VERSION:=0.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/parchive ++PKG_MD5SUM:=94c6df4e38efe08056ecde2a04e0be91 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpar2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libsigcxx ++ TITLE:=A library for performing common tasks related to PAR recovery sets ++ URL:=http://parchive.sourceforge.net/ ++endef ++ ++define Package/libpar2/description ++A library for performing common tasks related to PAR recovery sets ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-static \ ++ --disable-nls \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libpar2 ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libpar2/*.h \ ++ $(1)/usr/include/libpar2/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libpar2.{la,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libpar2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libpar2.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libpar2)) +diff --git a/feeds/packages/libs/libpar2/patches/.svn/entries b/feeds/packages/libs/libpar2/patches/.svn/entries +new file mode 100644 +index 0000000..22e5477 +--- /dev/null ++++ b/feeds/packages/libs/libpar2/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpar2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-07T11:35:50.296701Z ++32099 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-par2cmdline-0.4-packed.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++ed1025dc7447b81980dcf33a0ce8951f ++2012-06-07T11:35:50.296701Z ++32099 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4575 ++ +diff --git a/feeds/packages/libs/libpar2/patches/.svn/text-base/100-par2cmdline-0.4-packed.patch.svn-base b/feeds/packages/libs/libpar2/patches/.svn/text-base/100-par2cmdline-0.4-packed.patch.svn-base +new file mode 100644 +index 0000000..23f6d1f +--- /dev/null ++++ b/feeds/packages/libs/libpar2/patches/.svn/text-base/100-par2cmdline-0.4-packed.patch.svn-base +@@ -0,0 +1,217 @@ ++--- a/letype.h +++++ b/letype.h ++@@ -28,44 +28,15 @@ typedef u64 leu64; ++ ++ #else ++ ++-class leu16 +++struct leu16 ++ { ++-public: ++- leu16(void); ++- ++- leu16(const leu16 &other); ++- leu16& operator=(const leu16 &other); ++- ++- leu16(const u16 &other); ++ leu16& operator=(const u16 &other); ++ ++ operator u16(void) const; ++ ++-protected: ++ u16 value; ++ }; ++ ++-inline leu16::leu16(void) ++-{ ++-} ++- ++-inline leu16::leu16(const leu16 &other) ++-: value(other.value) ++-{ ++-} ++- ++-inline leu16& leu16::operator =(const leu16 &other) ++-{ ++- value = other.value; ++- return *this; ++-} ++- ++-inline leu16::leu16(const u16 &other) ++-{ ++- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); ++-} ++- ++ inline leu16& leu16::operator=(const u16 &other) ++ { ++ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++@@ -81,46 +52,15 @@ inline leu16::operator u16(void) const ++ } ++ ++ ++-class leu32 +++struct leu32 ++ { ++-public: ++- leu32(void); ++- ++- leu32(const leu32 &other); ++- leu32& operator=(const leu32 &other); ++- ++- leu32(const u32 &other); ++ leu32& operator=(const u32 &other); ++ ++ operator u32(void) const; ++ ++-protected: ++ u32 value; ++ }; ++ ++-inline leu32::leu32(void) ++-{ ++-} ++- ++-inline leu32::leu32(const leu32 &other) ++-: value(other.value) ++-{ ++-} ++- ++-inline leu32& leu32::operator =(const leu32 &other) ++-{ ++- value = other.value; ++- return *this; ++-} ++- ++-inline leu32::leu32(const u32 &other) ++-{ ++- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); ++- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); ++- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); ++-} ++- ++ inline leu32& leu32::operator=(const u32 &other) ++ { ++ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++@@ -140,50 +80,15 @@ inline leu32::operator u32(void) const ++ } ++ ++ ++-class leu64 +++struct leu64 ++ { ++-public: ++- leu64(void); ++- ++- leu64(const leu64 &other); ++- leu64& operator=(const leu64 &other); ++- ++- leu64(const u64 &other); ++ leu64& operator=(const u64 &other); ++ ++ operator u64(void) const; ++ ++-protected: ++ u64 value; ++ }; ++ ++-inline leu64::leu64(void) ++-{ ++-} ++- ++-inline leu64::leu64(const leu64 &other) ++-: value(other.value) ++-{ ++-} ++- ++-inline leu64& leu64::operator =(const leu64 &other) ++-{ ++- value = other.value; ++- return *this; ++-} ++- ++-inline leu64::leu64(const u64 &other) ++-{ ++- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); ++- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); ++- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); ++- ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff); ++- ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff); ++- ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff); ++- ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff); ++-} ++- ++ inline leu64& leu64::operator=(const u64 &other) ++ { ++ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++--- a/md5.h +++++ b/md5.h ++@@ -20,6 +20,13 @@ ++ #ifndef __MD5_H__ ++ #define __MD5_H__ ++ +++#ifdef WIN32 +++#pragma pack(push, 1) +++#define PACKED +++#else +++#define PACKED __attribute__ ((packed)) +++#endif +++ ++ // This file defines the MD5Hash and MD5Context objects which are used ++ // to compute and manipulate the MD5 Hash values for a block of data. ++ ++@@ -35,12 +42,11 @@ ++ ++ // MD5 Hash value ++ ++-class MD5Hash ++-{ ++-public: ++- // Constructor does not initialise the value ++- MD5Hash(void) {}; +++struct MD5Hash; +++ostream& operator<<(ostream &s, const MD5Hash &hash); ++ +++struct MD5Hash +++{ ++ // Comparison operators ++ bool operator==(const MD5Hash &other) const; ++ bool operator!=(const MD5Hash &other) const; ++@@ -54,13 +60,8 @@ public: ++ friend ostream& operator<<(ostream &s, const MD5Hash &hash); ++ string print(void) const; ++ ++- // Copy and assignment ++- MD5Hash(const MD5Hash &other); ++- MD5Hash& operator=(const MD5Hash &other); ++- ++-public: ++ u8 hash[16]; // 16 byte MD5 Hash value ++-}; +++} PACKED; ++ ++ // Intermediate computation state ++ ++@@ -144,16 +145,9 @@ inline bool MD5Hash::operator<=(const MD ++ return !other.operator<(*this); ++ } ++ ++-inline MD5Hash::MD5Hash(const MD5Hash &other) ++-{ ++- memcpy(&hash, &other.hash, sizeof(hash)); ++-} ++- ++-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other) ++-{ ++- memcpy(&hash, &other.hash, sizeof(hash)); ++- ++- return *this; ++-} +++#ifdef WIN32 +++#pragma pack(pop) +++#endif +++#undef PACKED ++ ++ #endif // __MD5_H__ +diff --git a/feeds/packages/libs/libpar2/patches/100-par2cmdline-0.4-packed.patch b/feeds/packages/libs/libpar2/patches/100-par2cmdline-0.4-packed.patch +new file mode 100644 +index 0000000..23f6d1f +--- /dev/null ++++ b/feeds/packages/libs/libpar2/patches/100-par2cmdline-0.4-packed.patch +@@ -0,0 +1,217 @@ ++--- a/letype.h +++++ b/letype.h ++@@ -28,44 +28,15 @@ typedef u64 leu64; ++ ++ #else ++ ++-class leu16 +++struct leu16 ++ { ++-public: ++- leu16(void); ++- ++- leu16(const leu16 &other); ++- leu16& operator=(const leu16 &other); ++- ++- leu16(const u16 &other); ++ leu16& operator=(const u16 &other); ++ ++ operator u16(void) const; ++ ++-protected: ++ u16 value; ++ }; ++ ++-inline leu16::leu16(void) ++-{ ++-} ++- ++-inline leu16::leu16(const leu16 &other) ++-: value(other.value) ++-{ ++-} ++- ++-inline leu16& leu16::operator =(const leu16 &other) ++-{ ++- value = other.value; ++- return *this; ++-} ++- ++-inline leu16::leu16(const u16 &other) ++-{ ++- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); ++-} ++- ++ inline leu16& leu16::operator=(const u16 &other) ++ { ++ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++@@ -81,46 +52,15 @@ inline leu16::operator u16(void) const ++ } ++ ++ ++-class leu32 +++struct leu32 ++ { ++-public: ++- leu32(void); ++- ++- leu32(const leu32 &other); ++- leu32& operator=(const leu32 &other); ++- ++- leu32(const u32 &other); ++ leu32& operator=(const u32 &other); ++ ++ operator u32(void) const; ++ ++-protected: ++ u32 value; ++ }; ++ ++-inline leu32::leu32(void) ++-{ ++-} ++- ++-inline leu32::leu32(const leu32 &other) ++-: value(other.value) ++-{ ++-} ++- ++-inline leu32& leu32::operator =(const leu32 &other) ++-{ ++- value = other.value; ++- return *this; ++-} ++- ++-inline leu32::leu32(const u32 &other) ++-{ ++- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); ++- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); ++- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); ++-} ++- ++ inline leu32& leu32::operator=(const u32 &other) ++ { ++ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++@@ -140,50 +80,15 @@ inline leu32::operator u32(void) const ++ } ++ ++ ++-class leu64 +++struct leu64 ++ { ++-public: ++- leu64(void); ++- ++- leu64(const leu64 &other); ++- leu64& operator=(const leu64 &other); ++- ++- leu64(const u64 &other); ++ leu64& operator=(const u64 &other); ++ ++ operator u64(void) const; ++ ++-protected: ++ u64 value; ++ }; ++ ++-inline leu64::leu64(void) ++-{ ++-} ++- ++-inline leu64::leu64(const leu64 &other) ++-: value(other.value) ++-{ ++-} ++- ++-inline leu64& leu64::operator =(const leu64 &other) ++-{ ++- value = other.value; ++- return *this; ++-} ++- ++-inline leu64::leu64(const u64 &other) ++-{ ++- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); ++- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); ++- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); ++- ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff); ++- ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff); ++- ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff); ++- ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff); ++-} ++- ++ inline leu64& leu64::operator=(const u64 &other) ++ { ++ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); ++--- a/md5.h +++++ b/md5.h ++@@ -20,6 +20,13 @@ ++ #ifndef __MD5_H__ ++ #define __MD5_H__ ++ +++#ifdef WIN32 +++#pragma pack(push, 1) +++#define PACKED +++#else +++#define PACKED __attribute__ ((packed)) +++#endif +++ ++ // This file defines the MD5Hash and MD5Context objects which are used ++ // to compute and manipulate the MD5 Hash values for a block of data. ++ ++@@ -35,12 +42,11 @@ ++ ++ // MD5 Hash value ++ ++-class MD5Hash ++-{ ++-public: ++- // Constructor does not initialise the value ++- MD5Hash(void) {}; +++struct MD5Hash; +++ostream& operator<<(ostream &s, const MD5Hash &hash); ++ +++struct MD5Hash +++{ ++ // Comparison operators ++ bool operator==(const MD5Hash &other) const; ++ bool operator!=(const MD5Hash &other) const; ++@@ -54,13 +60,8 @@ public: ++ friend ostream& operator<<(ostream &s, const MD5Hash &hash); ++ string print(void) const; ++ ++- // Copy and assignment ++- MD5Hash(const MD5Hash &other); ++- MD5Hash& operator=(const MD5Hash &other); ++- ++-public: ++ u8 hash[16]; // 16 byte MD5 Hash value ++-}; +++} PACKED; ++ ++ // Intermediate computation state ++ ++@@ -144,16 +145,9 @@ inline bool MD5Hash::operator<=(const MD ++ return !other.operator<(*this); ++ } ++ ++-inline MD5Hash::MD5Hash(const MD5Hash &other) ++-{ ++- memcpy(&hash, &other.hash, sizeof(hash)); ++-} ++- ++-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other) ++-{ ++- memcpy(&hash, &other.hash, sizeof(hash)); ++- ++- return *this; ++-} +++#ifdef WIN32 +++#pragma pack(pop) +++#endif +++#undef PACKED ++ ++ #endif // __MD5_H__ +diff --git a/feeds/packages/libs/libpfm/.svn/entries b/feeds/packages/libs/libpfm/.svn/entries +new file mode 100644 +index 0000000..bc1ab71 +--- /dev/null ++++ b/feeds/packages/libs/libpfm/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpfm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-24T16:25:10.742672Z ++20404 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++cf36936bb78a7e954cad09afbd2805e9 ++2010-03-24T16:25:10.742672Z ++20404 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1377 ++ +diff --git a/feeds/packages/libs/libpfm/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libpfm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f9e25ee +--- /dev/null ++++ b/feeds/packages/libs/libpfm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=libpfm ++PKG_VERSION:=3.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/perfmon2 ++PKG_MD5SUM:=5075fa45ddce4aa647b70e9f9446eacc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpfm ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Perfmon2 Kernel performance monitoring interface ++ URL:=http://perfmon2.sourceforge.net/ ++ DEPENDS:=@BROKEN ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ ARCH=cell \ ++ CC=$(TARGET_CROSS)gcc \ ++ AR=$(TARGET_CROSS)ar \ ++ lib ++endef ++ ++define Build/InstallDev ++ echo "Build/InstallDev" ++ $(MAKE) -C $(PKG_BUILD_DIR)/include \ ++ ARCH=cell \ ++ DESTDIR=$(1) \ ++ INCDIR=/usr/include \ ++ CONFIG_PFMLIB_ARCH_POWERPC=y \ ++ install ++# $(MAKE) -C $(PKG_BUILD_DIR)/lib \ ++# ARCH=cell \ ++# CC=$(TARGET_CROSS)gcc \ ++# DESTDIR=$(1) \ ++# LIBDIR=/usr/lib \ ++# CONFIG_PFMLIB_ARCH_POWERPC=y \ ++# CONFIG_PFMLIB_CELL=y \ ++# CONFIG_PFMLIB_SHARED=y \ ++# install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libpfm* $(1)/usr/lib/ ++endef ++ ++define Package/libpfm/install ++ echo "Package/libpfm/install" ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libpfm* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libpfm)) +diff --git a/feeds/packages/libs/libpfm/Makefile b/feeds/packages/libs/libpfm/Makefile +new file mode 100644 +index 0000000..f9e25ee +--- /dev/null ++++ b/feeds/packages/libs/libpfm/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=libpfm ++PKG_VERSION:=3.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/perfmon2 ++PKG_MD5SUM:=5075fa45ddce4aa647b70e9f9446eacc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpfm ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Perfmon2 Kernel performance monitoring interface ++ URL:=http://perfmon2.sourceforge.net/ ++ DEPENDS:=@BROKEN ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ ARCH=cell \ ++ CC=$(TARGET_CROSS)gcc \ ++ AR=$(TARGET_CROSS)ar \ ++ lib ++endef ++ ++define Build/InstallDev ++ echo "Build/InstallDev" ++ $(MAKE) -C $(PKG_BUILD_DIR)/include \ ++ ARCH=cell \ ++ DESTDIR=$(1) \ ++ INCDIR=/usr/include \ ++ CONFIG_PFMLIB_ARCH_POWERPC=y \ ++ install ++# $(MAKE) -C $(PKG_BUILD_DIR)/lib \ ++# ARCH=cell \ ++# CC=$(TARGET_CROSS)gcc \ ++# DESTDIR=$(1) \ ++# LIBDIR=/usr/lib \ ++# CONFIG_PFMLIB_ARCH_POWERPC=y \ ++# CONFIG_PFMLIB_CELL=y \ ++# CONFIG_PFMLIB_SHARED=y \ ++# install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libpfm* $(1)/usr/lib/ ++endef ++ ++define Package/libpfm/install ++ echo "Package/libpfm/install" ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libpfm* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libpfm)) +diff --git a/feeds/packages/libs/libplist/.svn/entries b/feeds/packages/libs/libplist/.svn/entries +new file mode 100644 +index 0000000..18969b8 +--- /dev/null ++++ b/feeds/packages/libs/libplist/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libplist ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-12T06:41:03.364918Z ++29714 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++615c67be10fc57a8c3dbbe6815824e8e ++2012-01-12T06:41:03.364918Z ++29714 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2397 ++ +diff --git a/feeds/packages/libs/libplist/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libplist/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9aede13 +--- /dev/null ++++ b/feeds/packages/libs/libplist/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# Copyright (C) 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:=libplist ++PKG_VERSION:=1.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.libimobiledevice.org/downloads ++PKG_MD5SUM:=2a9e0258847d50f9760dc3ece25f4dc6 ++ ++CMAKE_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.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 ++ ++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/plutil* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libplist)) ++$(eval $(call BuildPackage,libplistcxx)) ++$(eval $(call BuildPackage,libplist-utils)) +diff --git a/feeds/packages/libs/libplist/Makefile b/feeds/packages/libs/libplist/Makefile +new file mode 100644 +index 0000000..9aede13 +--- /dev/null ++++ b/feeds/packages/libs/libplist/Makefile +@@ -0,0 +1,96 @@ ++# ++# Copyright (C) 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:=libplist ++PKG_VERSION:=1.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.libimobiledevice.org/downloads ++PKG_MD5SUM:=2a9e0258847d50f9760dc3ece25f4dc6 ++ ++CMAKE_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.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 ++ ++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/plutil* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libplist)) ++$(eval $(call BuildPackage,libplistcxx)) ++$(eval $(call BuildPackage,libplist-utils)) +diff --git a/feeds/packages/libs/libpng/.svn/entries b/feeds/packages/libs/libpng/.svn/entries +new file mode 100644 +index 0000000..f7560a5 +--- /dev/null ++++ b/feeds/packages/libs/libpng/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpng ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:07.932287Z ++35794 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d30f070b0a404e26c10a4be14f777145 ++2013-02-25T21:04:07.932287Z ++35794 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1777 ++ +diff --git a/feeds/packages/libs/libpng/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libpng/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libpng/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libpng/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libpng/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fc79573 +--- /dev/null ++++ b/feeds/packages/libs/libpng/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# 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:=libpng ++PKG_VERSION:=1.2.50 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@SF/libpng ++PKG_MD5SUM:=a3e00fccbfe356174ab515b5c00641c7 ++ ++PKG_LICENSE:=LIBPNG GPLv2 ++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/feeds/packages/libs/libpng/Makefile b/feeds/packages/libs/libpng/Makefile +new file mode 100644 +index 0000000..fc79573 +--- /dev/null ++++ b/feeds/packages/libs/libpng/Makefile +@@ -0,0 +1,67 @@ ++# ++# 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:=libpng ++PKG_VERSION:=1.2.50 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@SF/libpng ++PKG_MD5SUM:=a3e00fccbfe356174ab515b5c00641c7 ++ ++PKG_LICENSE:=LIBPNG GPLv2 ++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/feeds/packages/libs/libpng/patches/.svn/entries b/feeds/packages/libs/libpng/patches/.svn/entries +new file mode 100644 +index 0000000..22c93a5 +--- /dev/null ++++ b/feeds/packages/libs/libpng/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpng/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:07.932287Z ++35794 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-CVE-2011-3026.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2013-02-25T21:04:07.932287Z ++35794 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ ++100-config_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++50fcdd47c337cbffe04bb085270bb6e1 ++2010-07-13T03:11:20.053508Z ++22160 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++198 ++ +diff --git a/feeds/packages/libs/libpng/patches/.svn/prop-base/100-config_fix.patch.svn-base b/feeds/packages/libs/libpng/patches/.svn/prop-base/100-config_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/libpng/patches/.svn/prop-base/100-config_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libpng/patches/.svn/text-base/100-config_fix.patch.svn-base b/feeds/packages/libs/libpng/patches/.svn/text-base/100-config_fix.patch.svn-base +new file mode 100644 +index 0000000..3cb6d8a +--- /dev/null ++++ b/feeds/packages/libs/libpng/patches/.svn/text-base/100-config_fix.patch.svn-base +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/libs/libpng/patches/.svn/text-base/200-CVE-2011-3026.patch.svn-base b/feeds/packages/libs/libpng/patches/.svn/text-base/200-CVE-2011-3026.patch.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/libs/libpng/patches/100-config_fix.patch b/feeds/packages/libs/libpng/patches/100-config_fix.patch +new file mode 100644 +index 0000000..3cb6d8a +--- /dev/null ++++ b/feeds/packages/libs/libpng/patches/100-config_fix.patch +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/libs/libpng/patches/200-CVE-2011-3026.patch b/feeds/packages/libs/libpng/patches/200-CVE-2011-3026.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/libs/libpthread-stubs/.svn/entries b/feeds/packages/libs/libpthread-stubs/.svn/entries +new file mode 100644 +index 0000000..ae3ce2e +--- /dev/null ++++ b/feeds/packages/libs/libpthread-stubs/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libpthread-stubs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-03T00:02:28.390007Z ++17489 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++bf25ec9449e34f8edcf45e02e5bc0806 ++2009-09-03T00:02:28.390007Z ++17489 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1491 ++ +diff --git a/feeds/packages/libs/libpthread-stubs/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libpthread-stubs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..16d5fcc +--- /dev/null ++++ b/feeds/packages/libs/libpthread-stubs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=libpthread-stubs ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ ++PKG_MD5SUM:=774eabaf33440d534efe108ef9130a7d ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpthread-stubs ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libpthread-stubs ++ URL:=http://xcb.freedesktop.org/ ++ BUILDONLY:=1 ++endef ++ ++define Package/libpthread-stubs/description ++This library provides weak aliases for pthread functions not provided in libc ++or otherwise available by default. Libraries like libxcb rely on pthread ++stubs to use pthreads optionally, becoming thread-safe when linked to ++libpthread, while avoiding any performance hit when running single-threaded. ++libpthread-stubs supports this behavior even on platforms which do not supply ++all the necessary pthread stubs. On platforms which already supply all the ++necessary pthread stubs, this package ships only the pkg-config file ++pthread-stubs.pc, to allow libraries to unconditionally express a dependency ++on pthread-stubs and still obtain correct behavior. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++$(eval $(call BuildPackage,libpthread-stubs)) +diff --git a/feeds/packages/libs/libpthread-stubs/Makefile b/feeds/packages/libs/libpthread-stubs/Makefile +new file mode 100644 +index 0000000..16d5fcc +--- /dev/null ++++ b/feeds/packages/libs/libpthread-stubs/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=libpthread-stubs ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ ++PKG_MD5SUM:=774eabaf33440d534efe108ef9130a7d ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpthread-stubs ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libpthread-stubs ++ URL:=http://xcb.freedesktop.org/ ++ BUILDONLY:=1 ++endef ++ ++define Package/libpthread-stubs/description ++This library provides weak aliases for pthread functions not provided in libc ++or otherwise available by default. Libraries like libxcb rely on pthread ++stubs to use pthreads optionally, becoming thread-safe when linked to ++libpthread, while avoiding any performance hit when running single-threaded. ++libpthread-stubs supports this behavior even on platforms which do not supply ++all the necessary pthread stubs. On platforms which already supply all the ++necessary pthread stubs, this package ships only the pkg-config file ++pthread-stubs.pc, to allow libraries to unconditionally express a dependency ++on pthread-stubs and still obtain correct behavior. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++$(eval $(call BuildPackage,libpthread-stubs)) +diff --git a/feeds/packages/libs/libptmalloc3/.svn/entries b/feeds/packages/libs/libptmalloc3/.svn/entries +new file mode 100644 +index 0000000..b127d25 +--- /dev/null ++++ b/feeds/packages/libs/libptmalloc3/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libptmalloc3 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++51d99b0e3e94ae5cb721bd1423e77f06 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1077 ++ +diff --git a/feeds/packages/libs/libptmalloc3/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libptmalloc3/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a591c7e +--- /dev/null ++++ b/feeds/packages/libs/libptmalloc3/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# Copyright (C) 2008 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# ++# Sample usage: ++# env LD_PRELOAD="/usr/lib/libptmalloc3.so" ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libptmalloc3 ++PKG_VERSION:=20060531 ++PKG_RELEASE:=1 ++PKG_BUILD_DIR:=$(BUILD_DIR)/ptmalloc3 ++ ++PKG_SOURCE:=ptmalloc3-current.tar.gz ++PKG_SOURCE_URL:=http://www.malloc.de/malloc/ ++PKG_MD5SUM:=c0b9dd5f16f8eae979166dc74b60015c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libptmalloc3 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Efficient malloc implementation ++ URL:=http://www.malloc.de/en/ ++endef ++ ++# flags: taken from ptmalloc3/Makefile by combining ++# 'linux-shared' and 'linux-nothreads' targets ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ SYS_FLAGS="$(TARGET_CFLAGS)" \ ++ linux-shared-nothreads ++endef ++ ++define Package/libptmalloc3/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libptmalloc3.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libptmalloc3)) +diff --git a/feeds/packages/libs/libptmalloc3/Makefile b/feeds/packages/libs/libptmalloc3/Makefile +new file mode 100644 +index 0000000..a591c7e +--- /dev/null ++++ b/feeds/packages/libs/libptmalloc3/Makefile +@@ -0,0 +1,44 @@ ++# Copyright (C) 2008 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# ++# Sample usage: ++# env LD_PRELOAD="/usr/lib/libptmalloc3.so" ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libptmalloc3 ++PKG_VERSION:=20060531 ++PKG_RELEASE:=1 ++PKG_BUILD_DIR:=$(BUILD_DIR)/ptmalloc3 ++ ++PKG_SOURCE:=ptmalloc3-current.tar.gz ++PKG_SOURCE_URL:=http://www.malloc.de/malloc/ ++PKG_MD5SUM:=c0b9dd5f16f8eae979166dc74b60015c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libptmalloc3 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Efficient malloc implementation ++ URL:=http://www.malloc.de/en/ ++endef ++ ++# flags: taken from ptmalloc3/Makefile by combining ++# 'linux-shared' and 'linux-nothreads' targets ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ SYS_FLAGS="$(TARGET_CFLAGS)" \ ++ linux-shared-nothreads ++endef ++ ++define Package/libptmalloc3/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libptmalloc3.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libptmalloc3)) +diff --git a/feeds/packages/libs/libptmalloc3/patches/.svn/entries b/feeds/packages/libs/libptmalloc3/patches/.svn/entries +new file mode 100644 +index 0000000..c60a9ed +--- /dev/null ++++ b/feeds/packages/libs/libptmalloc3/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libptmalloc3/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-09T17:53:03.583968Z ++13159 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-nothreads.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++dba4ad6e6708472f78eba3aa2c336736 ++2008-11-09T17:53:03.583968Z ++13159 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++833 ++ +diff --git a/feeds/packages/libs/libptmalloc3/patches/.svn/text-base/100-nothreads.patch.svn-base b/feeds/packages/libs/libptmalloc3/patches/.svn/text-base/100-nothreads.patch.svn-base +new file mode 100644 +index 0000000..d8682de +--- /dev/null ++++ b/feeds/packages/libs/libptmalloc3/patches/.svn/text-base/100-nothreads.patch.svn-base +@@ -0,0 +1,20 @@ ++This patch adds an additional target to build a shared library without pthreads ++(should this be the default? or is the ulibc malloc threadsafe? or should we ++build two separate packages?) ++ ++--- ptmalloc3/Makefile.orig 2007-11-08 09:10:46.000000000 +0000 +++++ ptmalloc3/Makefile 2007-11-08 09:17:09.000000000 +0000 ++@@ -150,6 +150,13 @@ ++ INC_FLAGS='-Isysdeps/pthread -Isysdeps/generic -I.' M_FLAGS='$(M_FLAGS)' \ ++ LIB_MALLOC=libptmalloc3.so ++ +++linux-shared-nothreads: +++ $(MAKE) SYS_FLAGS='-D_GNU_SOURCE=1 -fpic' \ +++ WARN_FLAGS='-Wall -Wstrict-prototypes' \ +++ OPT_FLAGS='$(OPT_FLAGS)' THR_FLAGS='' THR_LIBS='' \ +++ INC_FLAGS='-Isysdeps/generic -I.' M_FLAGS='$(M_FLAGS)' \ +++ LIB_MALLOC=libptmalloc3.so +++ ++ sproc: ++ $(MAKE) THR_FLAGS='' THR_LIBS='' OPT_FLAGS='$(OPT_FLAGS)' CC='$(CC)' \ ++ INC_FLAGS='-Isysdeps/sproc -Isysdeps/generic -I.' \ +diff --git a/feeds/packages/libs/libptmalloc3/patches/100-nothreads.patch b/feeds/packages/libs/libptmalloc3/patches/100-nothreads.patch +new file mode 100644 +index 0000000..d8682de +--- /dev/null ++++ b/feeds/packages/libs/libptmalloc3/patches/100-nothreads.patch +@@ -0,0 +1,20 @@ ++This patch adds an additional target to build a shared library without pthreads ++(should this be the default? or is the ulibc malloc threadsafe? or should we ++build two separate packages?) ++ ++--- ptmalloc3/Makefile.orig 2007-11-08 09:10:46.000000000 +0000 +++++ ptmalloc3/Makefile 2007-11-08 09:17:09.000000000 +0000 ++@@ -150,6 +150,13 @@ ++ INC_FLAGS='-Isysdeps/pthread -Isysdeps/generic -I.' M_FLAGS='$(M_FLAGS)' \ ++ LIB_MALLOC=libptmalloc3.so ++ +++linux-shared-nothreads: +++ $(MAKE) SYS_FLAGS='-D_GNU_SOURCE=1 -fpic' \ +++ WARN_FLAGS='-Wall -Wstrict-prototypes' \ +++ OPT_FLAGS='$(OPT_FLAGS)' THR_FLAGS='' THR_LIBS='' \ +++ INC_FLAGS='-Isysdeps/generic -I.' M_FLAGS='$(M_FLAGS)' \ +++ LIB_MALLOC=libptmalloc3.so +++ ++ sproc: ++ $(MAKE) THR_FLAGS='' THR_LIBS='' OPT_FLAGS='$(OPT_FLAGS)' CC='$(CC)' \ ++ INC_FLAGS='-Isysdeps/sproc -Isysdeps/generic -I.' \ +diff --git a/feeds/packages/libs/libqmi/.svn/entries b/feeds/packages/libs/libqmi/.svn/entries +new file mode 100644 +index 0000000..af88763 +--- /dev/null ++++ b/feeds/packages/libs/libqmi/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libqmi ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T09:59:33.354615Z ++35654 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++46388ad0efa8c32eb4e4ccd67300e02c ++2013-02-18T09:59:33.354615Z ++35654 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1272 ++ +diff --git a/feeds/packages/libs/libqmi/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libqmi/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a9db3c0 +--- /dev/null ++++ b/feeds/packages/libs/libqmi/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libqmi ++PKG_VERSION:=1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=libqmi-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/libqmi/1.0/ ++PKG_MD5SUM:=1e00d300616efc1bf8d3e8e541a69f73 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libqmi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+glib2 +zlib +kmod-usb-net-qmi-wwan ++ TITLE:=Helper library and utils to talk to QMI enabled modems ++endef ++ ++define Package/libqmi/description ++ Helper library and utils to talk to QMI enabled modems ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/libqmi-glib \ ++ $(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 ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/qmi-glib.pc \ ++ $(1)/usr/lib/pkgconfig ++endef ++ ++define Package/libqmi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qmicli $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qmi-network $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libqmi)) +diff --git a/feeds/packages/libs/libqmi/Makefile b/feeds/packages/libs/libqmi/Makefile +new file mode 100644 +index 0000000..a9db3c0 +--- /dev/null ++++ b/feeds/packages/libs/libqmi/Makefile +@@ -0,0 +1,56 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libqmi ++PKG_VERSION:=1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=libqmi-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/libqmi/1.0/ ++PKG_MD5SUM:=1e00d300616efc1bf8d3e8e541a69f73 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libqmi ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+glib2 +zlib +kmod-usb-net-qmi-wwan ++ TITLE:=Helper library and utils to talk to QMI enabled modems ++endef ++ ++define Package/libqmi/description ++ Helper library and utils to talk to QMI enabled modems ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/libqmi-glib \ ++ $(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 ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/qmi-glib.pc \ ++ $(1)/usr/lib/pkgconfig ++endef ++ ++define Package/libqmi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qmicli $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qmi-network $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libqmi)) +diff --git a/feeds/packages/libs/librpcsecgss/.svn/entries b/feeds/packages/libs/librpcsecgss/.svn/entries +new file mode 100644 +index 0000000..7add57e +--- /dev/null ++++ b/feeds/packages/libs/librpcsecgss/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/librpcsecgss ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f97635c830cd8f428cd64dcbb8ffe6ef ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1476 ++ +diff --git a/feeds/packages/libs/librpcsecgss/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/librpcsecgss/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5d3d0cd +--- /dev/null ++++ b/feeds/packages/libs/librpcsecgss/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=librpcsecgss ++PKG_VERSION:=0.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=librpcsecgss-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ ++PKG_MD5SUM:=0d4cdee46a98731b1b71e30504589281 ++ ++PKG_BUILD_DEPENDS:=libgssapi ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/librpcsecgss ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=required libraries for the nfs-utils ++ URL:=http://www.citi.umich.edu/projects/nfsv4/linux ++endef ++ ++define Package/librpcsecgss/description ++ Support libraries - for newer nfs mount command (nfs4) ++endef ++ ++TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib -I$(STAGING_DIR)/usr/include/gssglue/ $(FPIC) ++ ++MAKE_FLAGS += \ ++ OPT="$(TARGET_CFLAGS)" \ ++ INSTALLSUID="install -m 4755" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ GSSAPI_LIBS="usr/lib/libgssapi.a" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/rpcsecgss/rpc ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/rpcsecgss/rpc/*.h $(1)/usr/include/rpcsecgss/rpc/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librpcsecgss.{a,so*} $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librpcsecgss.pc $(1)/usr/lib/pkgconfig ++endef ++ ++$(eval $(call BuildPackage,librpcsecgss)) +diff --git a/feeds/packages/libs/librpcsecgss/Makefile b/feeds/packages/libs/librpcsecgss/Makefile +new file mode 100644 +index 0000000..5d3d0cd +--- /dev/null ++++ b/feeds/packages/libs/librpcsecgss/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=librpcsecgss ++PKG_VERSION:=0.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=librpcsecgss-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ ++PKG_MD5SUM:=0d4cdee46a98731b1b71e30504589281 ++ ++PKG_BUILD_DEPENDS:=libgssapi ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/librpcsecgss ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=required libraries for the nfs-utils ++ URL:=http://www.citi.umich.edu/projects/nfsv4/linux ++endef ++ ++define Package/librpcsecgss/description ++ Support libraries - for newer nfs mount command (nfs4) ++endef ++ ++TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib -I$(STAGING_DIR)/usr/include/gssglue/ $(FPIC) ++ ++MAKE_FLAGS += \ ++ OPT="$(TARGET_CFLAGS)" \ ++ INSTALLSUID="install -m 4755" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ GSSAPI_LIBS="usr/lib/libgssapi.a" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/rpcsecgss/rpc ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/rpcsecgss/rpc/*.h $(1)/usr/include/rpcsecgss/rpc/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librpcsecgss.{a,so*} $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librpcsecgss.pc $(1)/usr/lib/pkgconfig ++endef ++ ++$(eval $(call BuildPackage,librpcsecgss)) +diff --git a/feeds/packages/libs/librsync/.svn/entries b/feeds/packages/libs/librsync/.svn/entries +new file mode 100644 +index 0000000..eadb088 +--- /dev/null ++++ b/feeds/packages/libs/librsync/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/librsync ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T01:56:49.659948Z ++32254 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++9b69f9f1ae412f37adb58157dce775c1 ++2012-06-12T01:56:49.659948Z ++32254 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1470 ++ +diff --git a/feeds/packages/libs/librsync/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/librsync/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/libs/librsync/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/librsync/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/librsync/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..653be54 +--- /dev/null ++++ b/feeds/packages/libs/librsync/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=librsync ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/librsync ++PKG_MD5SUM:=24cdb6b78f45e0e83766903fd4f6bc84 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/librsync ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=implementation of the rolling-checksum algorithm ++ DEPENDS:=+libbz2 +libpopt +zlib ++ URL:=http://librsync.sourceforge.net/ ++endef ++ ++define Package/librsync/description ++ librsync implements the rolling-checksum algorithm of remote file ++ synchronization that was popularized by the rsync utility and is ++ used in rproxy. This algorithm transfers the differences between 2 ++ files without needing both files on the same system. ++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/librsync{,-config}.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/librsync/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,librsync)) +diff --git a/feeds/packages/libs/librsync/Makefile b/feeds/packages/libs/librsync/Makefile +new file mode 100644 +index 0000000..653be54 +--- /dev/null ++++ b/feeds/packages/libs/librsync/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=librsync ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/librsync ++PKG_MD5SUM:=24cdb6b78f45e0e83766903fd4f6bc84 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/librsync ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=implementation of the rolling-checksum algorithm ++ DEPENDS:=+libbz2 +libpopt +zlib ++ URL:=http://librsync.sourceforge.net/ ++endef ++ ++define Package/librsync/description ++ librsync implements the rolling-checksum algorithm of remote file ++ synchronization that was popularized by the rsync utility and is ++ used in rproxy. This algorithm transfers the differences between 2 ++ files without needing both files on the same system. ++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/librsync{,-config}.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/librsync/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,librsync)) +diff --git a/feeds/packages/libs/librsync/patches/.svn/entries b/feeds/packages/libs/librsync/patches/.svn/entries +new file mode 100644 +index 0000000..3d7be42 +--- /dev/null ++++ b/feeds/packages/libs/librsync/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/librsync/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-08-08T14:12:27.857145Z ++17180 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-4gb_files.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5a705c4e517856bd8c31042077e9b760 ++2009-08-08T14:12:27.857145Z ++17180 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1028 ++ +diff --git a/feeds/packages/libs/librsync/patches/.svn/text-base/001-4gb_files.patch.svn-base b/feeds/packages/libs/librsync/patches/.svn/text-base/001-4gb_files.patch.svn-base +new file mode 100644 +index 0000000..3c0128e +--- /dev/null ++++ b/feeds/packages/libs/librsync/patches/.svn/text-base/001-4gb_files.patch.svn-base +@@ -0,0 +1,31 @@ ++diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7.new/mdfour.h ++--- librsync-0.9.7/mdfour.h 2004-02-08 00:17:57.000000000 +0100 +++++ librsync-0.9.7.new/mdfour.h 2009-08-08 16:08:57.000000000 +0200 ++@@ -24,7 +24,7 @@ ++ #include "types.h" ++ ++ struct rs_mdfour { ++- int A, B, C, D; +++ unsigned int A, B, C, D; ++ #if HAVE_UINT64 ++ uint64_t totalN; ++ #else ++diff -urN librsync-0.9.7/patch.c librsync-0.9.7.new/patch.c ++--- librsync-0.9.7/patch.c 2004-09-17 23:35:50.000000000 +0200 +++++ librsync-0.9.7.new/patch.c 2009-08-08 16:10:40.000000000 +0200 ++@@ -214,12 +214,12 @@ ++ void *buf, *ptr; ++ rs_buffers_t *buffs = job->stream; ++ ++- len = job->basis_len; ++- ++ /* copy only as much as will fit in the output buffer, so that we ++ * don't have to block or store the input. */ ++- if (len > buffs->avail_out) +++ if (job->basis_len > buffs->avail_out) ++ len = buffs->avail_out; +++ else +++ len = job->basis_len; ++ ++ if (!len) ++ return RS_BLOCKED; +diff --git a/feeds/packages/libs/librsync/patches/001-4gb_files.patch b/feeds/packages/libs/librsync/patches/001-4gb_files.patch +new file mode 100644 +index 0000000..3c0128e +--- /dev/null ++++ b/feeds/packages/libs/librsync/patches/001-4gb_files.patch +@@ -0,0 +1,31 @@ ++diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7.new/mdfour.h ++--- librsync-0.9.7/mdfour.h 2004-02-08 00:17:57.000000000 +0100 +++++ librsync-0.9.7.new/mdfour.h 2009-08-08 16:08:57.000000000 +0200 ++@@ -24,7 +24,7 @@ ++ #include "types.h" ++ ++ struct rs_mdfour { ++- int A, B, C, D; +++ unsigned int A, B, C, D; ++ #if HAVE_UINT64 ++ uint64_t totalN; ++ #else ++diff -urN librsync-0.9.7/patch.c librsync-0.9.7.new/patch.c ++--- librsync-0.9.7/patch.c 2004-09-17 23:35:50.000000000 +0200 +++++ librsync-0.9.7.new/patch.c 2009-08-08 16:10:40.000000000 +0200 ++@@ -214,12 +214,12 @@ ++ void *buf, *ptr; ++ rs_buffers_t *buffs = job->stream; ++ ++- len = job->basis_len; ++- ++ /* copy only as much as will fit in the output buffer, so that we ++ * don't have to block or store the input. */ ++- if (len > buffs->avail_out) +++ if (job->basis_len > buffs->avail_out) ++ len = buffs->avail_out; +++ else +++ len = job->basis_len; ++ ++ if (!len) ++ return RS_BLOCKED; +diff --git a/feeds/packages/libs/libsamplerate/.svn/entries b/feeds/packages/libs/libsamplerate/.svn/entries +new file mode 100644 +index 0000000..262e28a +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsamplerate ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2a0137c95d1a8631f55b66ef4ed1b90e ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1121 ++ +diff --git a/feeds/packages/libs/libsamplerate/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libsamplerate/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libsamplerate/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsamplerate/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b31a649 +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2007-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:=libsamplerate ++PKG_VERSION:=0.1.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/ ++PKG_MD5SUM:=ad093e60ec44f0a60de8e29983ddbc0f ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=autogen.sh ++ ++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/feeds/packages/libs/libsamplerate/Makefile b/feeds/packages/libs/libsamplerate/Makefile +new file mode 100644 +index 0000000..b31a649 +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/Makefile +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2007-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:=libsamplerate ++PKG_VERSION:=0.1.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/ ++PKG_MD5SUM:=ad093e60ec44f0a60de8e29983ddbc0f ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=autogen.sh ++ ++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/feeds/packages/libs/libsamplerate/patches/.svn/entries b/feeds/packages/libs/libsamplerate/patches/.svn/entries +new file mode 100644 +index 0000000..e31d48f +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsamplerate/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-08T17:07:25.591192Z ++24352 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-fix-m4-loop.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5ac6930db338c0881b1e06d90d31cee3 ++2010-12-08T17:07:25.591192Z ++24352 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++324 ++ +diff --git a/feeds/packages/libs/libsamplerate/patches/.svn/text-base/001-fix-m4-loop.patch.svn-base b/feeds/packages/libs/libsamplerate/patches/.svn/text-base/001-fix-m4-loop.patch.svn-base +new file mode 100644 +index 0000000..e91499c +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/patches/.svn/text-base/001-fix-m4-loop.patch.svn-base +@@ -0,0 +1,18 @@ ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -135,7 +135,6 @@ if test $ac_cv_c_byte_order = unknown ; ++ fi ++ ++ ) ++-] ++ ++ if test $ac_cv_c_byte_order = big ; then ++ ac_cv_c_big_endian=1 ++@@ -154,6 +153,7 @@ else ++ AC_MSG_WARN([[*****************************************************************]]) ++ fi ++ +++] ++ )# AC_C_FIND_ENDIAN ++ ++ +diff --git a/feeds/packages/libs/libsamplerate/patches/001-fix-m4-loop.patch b/feeds/packages/libs/libsamplerate/patches/001-fix-m4-loop.patch +new file mode 100644 +index 0000000..e91499c +--- /dev/null ++++ b/feeds/packages/libs/libsamplerate/patches/001-fix-m4-loop.patch +@@ -0,0 +1,18 @@ ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -135,7 +135,6 @@ if test $ac_cv_c_byte_order = unknown ; ++ fi ++ ++ ) ++-] ++ ++ if test $ac_cv_c_byte_order = big ; then ++ ac_cv_c_big_endian=1 ++@@ -154,6 +153,7 @@ else ++ AC_MSG_WARN([[*****************************************************************]]) ++ fi ++ +++] ++ )# AC_C_FIND_ENDIAN ++ ++ +diff --git a/feeds/packages/libs/libsdl/.svn/entries b/feeds/packages/libs/libsdl/.svn/entries +new file mode 100644 +index 0000000..eaec08d +--- /dev/null ++++ b/feeds/packages/libs/libsdl/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsdl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f9937b338e0d5d72ccc8b71fda5cb054 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3685 ++ +diff --git a/feeds/packages/libs/libsdl/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsdl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e87700c +--- /dev/null ++++ b/feeds/packages/libs/libsdl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,164 @@ ++# ++# 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:=SDL ++PKG_VERSION:=1.2.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.libsdl.org/release/ ++PKG_MD5SUM:=e52086d1b508fa0b76c52ee30b55bec4 ++ ++PKG_LICENSE:=LGPLv2.1 ++PKG_LICENSE_FILES:=COPYING test/COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_CONFIG_DEPENDS:=CONFIG_AUDIO_SUPPORT ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libsdl ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Simple DirectMedia Layer ++ URL:=http://www.libsdl.org ++ DEPENDS:=+directfb +zlib +libpthread +AUDIO_SUPPORT:alsa-lib ++endef ++ ++define Package/libsdl/description ++ SDL is a library that allows programs portable low level access to a video ++ framebuffer, audio output, mouse, and keyboard. ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-libc \ ++ --enable-video \ ++ --enable-events \ ++ --enable-joystick \ ++ --enable-cdrom \ ++ --enable-threads \ ++ --enable-timers \ ++ --enable-file \ ++ --enable-loadso \ ++ --enable-cpuinfo \ ++ --enable-assembly \ ++ --disable-oss \ ++ --disable-alsatest \ ++ --enable-alsa-shared \ ++ --disable-esd \ ++ --disable-esdtest \ ++ --enable-esd-shared \ ++ --disable-pulseaudio \ ++ --enable-pulseaudio-shared \ ++ --disable-arts \ ++ --enable-arts-shared \ ++ --disable-nas \ ++ --enable-nas-shared \ ++ --disable-diskaudio \ ++ --disable-dummyaudio \ ++ --disable-mintaudio \ ++ --disable-nasm \ ++ --disable-altivec \ ++ --disable-ipod \ ++ --disable-nanox \ ++ --disable-video-x11 \ ++ --enable-x11-shared \ ++ --enable-dga \ ++ --enable-video-dga \ ++ --enable-video-x11-dgamouse \ ++ --enable-video-x11-vm \ ++ --enable-video-x11-xv \ ++ --disable-video-x11-xinerama \ ++ --disable-video-x11-xme \ ++ --disable-video-x11-xrandr \ ++ --disable-video-photon \ ++ --disable-video-carbon \ ++ --disable-video-cocoa \ ++ --enable-video-fbcon \ ++ --enable-video-directfb \ ++ --disable-video-ps2gs \ ++ --disable-video-ps3 \ ++ --disable-video-ggi \ ++ --disable-video-svga \ ++ --disable-video-vgl \ ++ --disable-video-wscons \ ++ --disable-video-aalib \ ++ --disable-video-caca \ ++ --disable-video-qtopia \ ++ --disable-video-picogui \ ++ --disable-video-xbios \ ++ --disable-video-gem \ ++ --disable-video-dummy \ ++ --disable-video-opengl \ ++ --disable-osmesa-shared \ ++ --disable-screensaver \ ++ --enable-input-events \ ++ --disable-input-tslib \ ++ --enable-pth \ ++ --enable-pthreads \ ++ --enable-pthread-sem \ ++ --disable-stdio-redirect \ ++ --disable-directx \ ++ --enable-sdl-dlopen \ ++ --disable-atari-ldg \ ++ --disable-clock_gettime \ ++ --without-x \ ++ --disable-rpath \ ++ ++ifneq ($(CONFIG_AUDIO_SUPPORT),) ++ CONFIGURE_ARGS+= \ ++ --enable-audio \ ++ --enable-alsa ++else ++ CONFIGURE_ARGS+= \ ++ --disable-audio \ ++ --disable-alsa ++endif ++ ++CONFIGURE_VARS+= \ ++ ac_cv_path_DIRECTFBCONFIG=no \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/SDL* \ ++ $(1)/usr/include/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libSDL*.{a,so*} \ ++ $(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/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/sdl-config \ ++ $(1)/usr/bin/ ++ ++ $(SED) 's,^\(exec_prefix\|prefix\)=.*,\1=\"$(STAGING_DIR)/usr/\",g' \ ++ $(1)/usr/bin/sdl-config ++ ++ $(INSTALL_DIR) $(1)/host/bin ++ ln -sf ../../usr/bin/sdl-config $(1)/host/bin/ ++endef ++ ++define Package/libsdl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsdl)) +diff --git a/feeds/packages/libs/libsdl/Makefile b/feeds/packages/libs/libsdl/Makefile +new file mode 100644 +index 0000000..e87700c +--- /dev/null ++++ b/feeds/packages/libs/libsdl/Makefile +@@ -0,0 +1,164 @@ ++# ++# 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:=SDL ++PKG_VERSION:=1.2.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.libsdl.org/release/ ++PKG_MD5SUM:=e52086d1b508fa0b76c52ee30b55bec4 ++ ++PKG_LICENSE:=LGPLv2.1 ++PKG_LICENSE_FILES:=COPYING test/COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_CONFIG_DEPENDS:=CONFIG_AUDIO_SUPPORT ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libsdl ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Simple DirectMedia Layer ++ URL:=http://www.libsdl.org ++ DEPENDS:=+directfb +zlib +libpthread +AUDIO_SUPPORT:alsa-lib ++endef ++ ++define Package/libsdl/description ++ SDL is a library that allows programs portable low level access to a video ++ framebuffer, audio output, mouse, and keyboard. ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-libc \ ++ --enable-video \ ++ --enable-events \ ++ --enable-joystick \ ++ --enable-cdrom \ ++ --enable-threads \ ++ --enable-timers \ ++ --enable-file \ ++ --enable-loadso \ ++ --enable-cpuinfo \ ++ --enable-assembly \ ++ --disable-oss \ ++ --disable-alsatest \ ++ --enable-alsa-shared \ ++ --disable-esd \ ++ --disable-esdtest \ ++ --enable-esd-shared \ ++ --disable-pulseaudio \ ++ --enable-pulseaudio-shared \ ++ --disable-arts \ ++ --enable-arts-shared \ ++ --disable-nas \ ++ --enable-nas-shared \ ++ --disable-diskaudio \ ++ --disable-dummyaudio \ ++ --disable-mintaudio \ ++ --disable-nasm \ ++ --disable-altivec \ ++ --disable-ipod \ ++ --disable-nanox \ ++ --disable-video-x11 \ ++ --enable-x11-shared \ ++ --enable-dga \ ++ --enable-video-dga \ ++ --enable-video-x11-dgamouse \ ++ --enable-video-x11-vm \ ++ --enable-video-x11-xv \ ++ --disable-video-x11-xinerama \ ++ --disable-video-x11-xme \ ++ --disable-video-x11-xrandr \ ++ --disable-video-photon \ ++ --disable-video-carbon \ ++ --disable-video-cocoa \ ++ --enable-video-fbcon \ ++ --enable-video-directfb \ ++ --disable-video-ps2gs \ ++ --disable-video-ps3 \ ++ --disable-video-ggi \ ++ --disable-video-svga \ ++ --disable-video-vgl \ ++ --disable-video-wscons \ ++ --disable-video-aalib \ ++ --disable-video-caca \ ++ --disable-video-qtopia \ ++ --disable-video-picogui \ ++ --disable-video-xbios \ ++ --disable-video-gem \ ++ --disable-video-dummy \ ++ --disable-video-opengl \ ++ --disable-osmesa-shared \ ++ --disable-screensaver \ ++ --enable-input-events \ ++ --disable-input-tslib \ ++ --enable-pth \ ++ --enable-pthreads \ ++ --enable-pthread-sem \ ++ --disable-stdio-redirect \ ++ --disable-directx \ ++ --enable-sdl-dlopen \ ++ --disable-atari-ldg \ ++ --disable-clock_gettime \ ++ --without-x \ ++ --disable-rpath \ ++ ++ifneq ($(CONFIG_AUDIO_SUPPORT),) ++ CONFIGURE_ARGS+= \ ++ --enable-audio \ ++ --enable-alsa ++else ++ CONFIGURE_ARGS+= \ ++ --disable-audio \ ++ --disable-alsa ++endif ++ ++CONFIGURE_VARS+= \ ++ ac_cv_path_DIRECTFBCONFIG=no \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/SDL* \ ++ $(1)/usr/include/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libSDL*.{a,so*} \ ++ $(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/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/sdl-config \ ++ $(1)/usr/bin/ ++ ++ $(SED) 's,^\(exec_prefix\|prefix\)=.*,\1=\"$(STAGING_DIR)/usr/\",g' \ ++ $(1)/usr/bin/sdl-config ++ ++ $(INSTALL_DIR) $(1)/host/bin ++ ln -sf ../../usr/bin/sdl-config $(1)/host/bin/ ++endef ++ ++define Package/libsdl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsdl)) +diff --git a/feeds/packages/libs/libsdl/patches/.svn/entries b/feeds/packages/libs/libsdl/patches/.svn/entries +new file mode 100644 +index 0000000..1258382 +--- /dev/null ++++ b/feeds/packages/libs/libsdl/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsdl/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T20:33:57.854048Z ++24616 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4a777ba94d462bcd20bb814c0bb720ce ++2010-12-15T20:33:57.854048Z ++24616 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++98 ++ +diff --git a/feeds/packages/libs/libsdl/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libsdl/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..0e8ac79 +--- /dev/null ++++ b/feeds/packages/libs/libsdl/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,5 @@ ++--- /dev/null +++++ b/Makefile.am ++@@ -0,0 +1,2 @@ +++SUBDIRS = . +++ACLOCAL_AMFLAGS = -I . -I acinclude +diff --git a/feeds/packages/libs/libsdl/patches/001-automake-compat.patch b/feeds/packages/libs/libsdl/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..0e8ac79 +--- /dev/null ++++ b/feeds/packages/libs/libsdl/patches/001-automake-compat.patch +@@ -0,0 +1,5 @@ ++--- /dev/null +++++ b/Makefile.am ++@@ -0,0 +1,2 @@ +++SUBDIRS = . +++ACLOCAL_AMFLAGS = -I . -I acinclude +diff --git a/feeds/packages/libs/libsdl_mixer/.svn/entries b/feeds/packages/libs/libsdl_mixer/.svn/entries +new file mode 100644 +index 0000000..f947689 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsdl_mixer ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++3cf47c5f657b0fe0fe0bd2dcd28ab5ab ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1907 ++ +diff --git a/feeds/packages/libs/libsdl_mixer/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsdl_mixer/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..232080c +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,77 @@ ++# ++# 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:=SDL_mixer ++PKG_VERSION:=1.2.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.libsdl.org/projects/SDL_mixer/release/ ++PKG_MD5SUM:=65ada3d997fe85109191a5fb083f248c ++ ++PKG_FIXUP:=autoreconf ++PKG_MACRO_PATHS:=acinclude ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++define Package/libsdl-mixer ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Simple DirectMedia Layer Sound Mixer ++ URL:=http://www.libsdl.org/projects/SDL_mixer/ ++ DEPENDS:=+libsdl +libmikmod +libvorbisidec ++endef ++ ++define Package/libsdl-mixer/description ++ SDL_mixer is a sample multi-channel audio mixer library. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-sdltest \ ++ --enable-music-cmd \ ++ --enable-music-wave \ ++ --enable-music-mod \ ++ --enable-music-mod-shared \ ++ --enable-music-midi \ ++ --disable-music-ogg \ ++ --enable-music-ogg-tremor \ ++ --enable-music-ogg-shared \ ++ --disable-music-flac \ ++ --enable-music-flag-shared \ ++ --disable-music-mp3 \ ++ --enable-music-mp3-shared \ ++ --disable-smpegtest \ ++ --disable-music-mp3-mad-gpl \ ++ --with-sdl-exec-prefix="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/SDL/SDL_mixer.h \ ++ $(1)/usr/include/SDL/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libSDL_mixer*.{a,la,so*} \ ++ $(1)/usr/lib/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libsdl-mixer/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL_mixer*.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsdl-mixer)) +diff --git a/feeds/packages/libs/libsdl_mixer/Makefile b/feeds/packages/libs/libsdl_mixer/Makefile +new file mode 100644 +index 0000000..232080c +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/Makefile +@@ -0,0 +1,77 @@ ++# ++# 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:=SDL_mixer ++PKG_VERSION:=1.2.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.libsdl.org/projects/SDL_mixer/release/ ++PKG_MD5SUM:=65ada3d997fe85109191a5fb083f248c ++ ++PKG_FIXUP:=autoreconf ++PKG_MACRO_PATHS:=acinclude ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++define Package/libsdl-mixer ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Simple DirectMedia Layer Sound Mixer ++ URL:=http://www.libsdl.org/projects/SDL_mixer/ ++ DEPENDS:=+libsdl +libmikmod +libvorbisidec ++endef ++ ++define Package/libsdl-mixer/description ++ SDL_mixer is a sample multi-channel audio mixer library. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-sdltest \ ++ --enable-music-cmd \ ++ --enable-music-wave \ ++ --enable-music-mod \ ++ --enable-music-mod-shared \ ++ --enable-music-midi \ ++ --disable-music-ogg \ ++ --enable-music-ogg-tremor \ ++ --enable-music-ogg-shared \ ++ --disable-music-flac \ ++ --enable-music-flag-shared \ ++ --disable-music-mp3 \ ++ --enable-music-mp3-shared \ ++ --disable-smpegtest \ ++ --disable-music-mp3-mad-gpl \ ++ --with-sdl-exec-prefix="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/SDL/SDL_mixer.h \ ++ $(1)/usr/include/SDL/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libSDL_mixer*.{a,la,so*} \ ++ $(1)/usr/lib/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libsdl-mixer/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL_mixer*.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsdl-mixer)) +diff --git a/feeds/packages/libs/libsdl_mixer/files/.svn/entries b/feeds/packages/libs/libsdl_mixer/files/.svn/entries +new file mode 100644 +index 0000000..1280f5c +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsdl_mixer/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-01-04T21:06:15.683832Z ++19037 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++sdl-config ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d38db62495447ab1d8b12924d07ae525 ++2010-01-04T21:06:15.683832Z ++19037 ++mb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++70 ++ +diff --git a/feeds/packages/libs/libsdl_mixer/files/.svn/prop-base/sdl-config.svn-base b/feeds/packages/libs/libsdl_mixer/files/.svn/prop-base/sdl-config.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/files/.svn/prop-base/sdl-config.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/libs/libsdl_mixer/files/.svn/text-base/sdl-config.svn-base b/feeds/packages/libs/libsdl_mixer/files/.svn/text-base/sdl-config.svn-base +new file mode 100644 +index 0000000..e496baf +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/files/.svn/text-base/sdl-config.svn-base +@@ -0,0 +1,3 @@ ++#!/bin/sh ++# Fake sdl-config ++echo "-lSDL -ldirect -ldirectfb -lfusion" +diff --git a/feeds/packages/libs/libsdl_mixer/files/sdl-config b/feeds/packages/libs/libsdl_mixer/files/sdl-config +new file mode 100755 +index 0000000..e496baf +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/files/sdl-config +@@ -0,0 +1,3 @@ ++#!/bin/sh ++# Fake sdl-config ++echo "-lSDL -ldirect -ldirectfb -lfusion" +diff --git a/feeds/packages/libs/libsdl_mixer/patches/.svn/entries b/feeds/packages/libs/libsdl_mixer/patches/.svn/entries +new file mode 100644 +index 0000000..369f5d1 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsdl_mixer/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-03T17:16:24.160717Z ++25342 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++1957218f9df4e4b0fb48687dd387803a ++2011-02-03T17:16:24.160717Z ++25342 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++295 ++ ++002-fix-linking.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++25c774013cc1175f53e189ad8c226b8f ++2011-02-03T17:16:24.160717Z ++25342 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1011 ++ +diff --git a/feeds/packages/libs/libsdl_mixer/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libsdl_mixer/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..8e879c3 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -1,6 +1,6 @@ ++ dnl Process this file with autoconf to produce a configure script. ++ AC_INIT(README) ++-AC_CONFIG_AUX_DIRS($srcdir/build-scripts) +++AC_CONFIG_AUX_DIR([build-scripts]) ++ ++ dnl Set various version strings - taken gratefully from the GTk sources ++ +diff --git a/feeds/packages/libs/libsdl_mixer/patches/.svn/text-base/002-fix-linking.patch.svn-base b/feeds/packages/libs/libsdl_mixer/patches/.svn/text-base/002-fix-linking.patch.svn-base +new file mode 100644 +index 0000000..a7b1fb1 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/patches/.svn/text-base/002-fix-linking.patch.svn-base +@@ -0,0 +1,17 @@ ++diff --git a/Makefile.in b/Makefile.in ++index 76fdd3c..3ab4939 100644 ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -75,10 +75,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ ++ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) ++- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) +++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ ++ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) ++- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) +++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ ++ install: all install-hdrs install-lib #install-bin ++ install-hdrs: +diff --git a/feeds/packages/libs/libsdl_mixer/patches/001-automake-compat.patch b/feeds/packages/libs/libsdl_mixer/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..8e879c3 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/patches/001-automake-compat.patch +@@ -0,0 +1,10 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -1,6 +1,6 @@ ++ dnl Process this file with autoconf to produce a configure script. ++ AC_INIT(README) ++-AC_CONFIG_AUX_DIRS($srcdir/build-scripts) +++AC_CONFIG_AUX_DIR([build-scripts]) ++ ++ dnl Set various version strings - taken gratefully from the GTk sources ++ +diff --git a/feeds/packages/libs/libsdl_mixer/patches/002-fix-linking.patch b/feeds/packages/libs/libsdl_mixer/patches/002-fix-linking.patch +new file mode 100644 +index 0000000..a7b1fb1 +--- /dev/null ++++ b/feeds/packages/libs/libsdl_mixer/patches/002-fix-linking.patch +@@ -0,0 +1,17 @@ ++diff --git a/Makefile.in b/Makefile.in ++index 76fdd3c..3ab4939 100644 ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -75,10 +75,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ ++ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) ++- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) +++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ ++ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) ++- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) +++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ ++ install: all install-hdrs install-lib #install-bin ++ install-hdrs: +diff --git a/feeds/packages/libs/libsdl_sound/.svn/entries b/feeds/packages/libs/libsdl_sound/.svn/entries +new file mode 100644 +index 0000000..61c021b +--- /dev/null ++++ b/feeds/packages/libs/libsdl_sound/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsdl_sound ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-17T23:43:04.664326Z ++20257 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d786fba3fed57b8676e0cb36c323eff9 ++2010-03-17T23:43:04.664326Z ++20257 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1487 ++ +diff --git a/feeds/packages/libs/libsdl_sound/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsdl_sound/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..836b4fc +--- /dev/null ++++ b/feeds/packages/libs/libsdl_sound/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=libsdl-sound ++PKG_VERSION:=1.0.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=SDL_sound-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://icculus.org/SDL_sound/downloads/ ++PKG_MD5SUM:=aa09cd52df85d29bee87a664424c94b5 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_sound-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++define Package/libsdl-sound ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Simple DirectMedia Layer Sound Decoder ++ URL:=http://icculus.org/SDL_sound/ ++ DEPENDS:=+libsdl ++endef ++ ++define Package/libsdl-sound/description ++ SDL_sound is a library that handles the decoding ++ of several popular sound file formats, such as .WAV and .MP3. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-sdl-prefix="$(STAGING_DIR)/usr" \ ++ --disable-flac \ ++ --disable-mikmod \ ++ --disable-modplug \ ++ --disable-ogg \ ++ --disable-smpeg \ ++ --disable-speex \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/SDL/SDL_sound.h \ ++ $(1)/usr/include/SDL/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libSDL_sound*.{a,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libsdl-sound/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL_sound*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsdl-sound)) +diff --git a/feeds/packages/libs/libsdl_sound/Makefile b/feeds/packages/libs/libsdl_sound/Makefile +new file mode 100644 +index 0000000..836b4fc +--- /dev/null ++++ b/feeds/packages/libs/libsdl_sound/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=libsdl-sound ++PKG_VERSION:=1.0.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=SDL_sound-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://icculus.org/SDL_sound/downloads/ ++PKG_MD5SUM:=aa09cd52df85d29bee87a664424c94b5 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_sound-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++define Package/libsdl-sound ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Simple DirectMedia Layer Sound Decoder ++ URL:=http://icculus.org/SDL_sound/ ++ DEPENDS:=+libsdl ++endef ++ ++define Package/libsdl-sound/description ++ SDL_sound is a library that handles the decoding ++ of several popular sound file formats, such as .WAV and .MP3. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-sdl-prefix="$(STAGING_DIR)/usr" \ ++ --disable-flac \ ++ --disable-mikmod \ ++ --disable-modplug \ ++ --disable-ogg \ ++ --disable-smpeg \ ++ --disable-speex \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/SDL/SDL_sound.h \ ++ $(1)/usr/include/SDL/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libSDL_sound*.{a,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libsdl-sound/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL_sound*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsdl-sound)) +diff --git a/feeds/packages/libs/libshout/.svn/entries b/feeds/packages/libs/libshout/.svn/entries +new file mode 100644 +index 0000000..1fbd1e1 +--- /dev/null ++++ b/feeds/packages/libs/libshout/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libshout ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:28.997271Z ++32319 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++10ebbba775c077b16199987f174db709 ++2012-06-13T00:22:28.997271Z ++32319 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1972 ++ +diff --git a/feeds/packages/libs/libshout/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libshout/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5a11d25 +--- /dev/null ++++ b/feeds/packages/libs/libshout/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,66 @@ ++# ++# 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:=libshout ++PKG_VERSION:=2.2.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/ ++PKG_MD5SUM:=4f75fc9901c724b712c371c9a1e782d3 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/libshout ++ SECTION:=libs ++ DEPENDS:= +libspeex +libtheora +libvorbis +libvorbisidec +libpthread ++ CATEGORY:=Libraries ++ TITLE:=Library which can be used to write a source client like ices ++ URL:=http://www.icecast.org/download.php ++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 ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/" \ ++ VORBIS_LIBS="$(TARGET_LDFLAGS) -lvorbis -lvorbisidec" \ ++ --enable-shared \ ++ --enable-static \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/shout ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(SED) 's|/usr/include|$(STAGING_DIR)/usr/include|' \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/ ++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/feeds/packages/libs/libshout/Makefile b/feeds/packages/libs/libshout/Makefile +new file mode 100644 +index 0000000..5a11d25 +--- /dev/null ++++ b/feeds/packages/libs/libshout/Makefile +@@ -0,0 +1,66 @@ ++# ++# 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:=libshout ++PKG_VERSION:=2.2.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/ ++PKG_MD5SUM:=4f75fc9901c724b712c371c9a1e782d3 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/libshout ++ SECTION:=libs ++ DEPENDS:= +libspeex +libtheora +libvorbis +libvorbisidec +libpthread ++ CATEGORY:=Libraries ++ TITLE:=Library which can be used to write a source client like ices ++ URL:=http://www.icecast.org/download.php ++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 ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/" \ ++ VORBIS_LIBS="$(TARGET_LDFLAGS) -lvorbis -lvorbisidec" \ ++ --enable-shared \ ++ --enable-static \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/shout ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(SED) 's|/usr/include|$(STAGING_DIR)/usr/include|' \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/ ++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/feeds/packages/libs/libshout/patches/.svn/entries b/feeds/packages/libs/libshout/patches/.svn/entries +new file mode 100644 +index 0000000..5968964 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libshout/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-02-12T11:36:34.133642Z ++10445 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++120-vorbis-c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7f7168a7f6c508563a954cb82e1bbbd0 ++2008-02-12T11:36:34.133642Z ++10445 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++410 ++ ++100-ogg-c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++c8978ee9246aae7a254bfa5ab7443455 ++2008-02-12T11:36:34.133642Z ++10445 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++389 ++ ++110-shout-ogg-c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++77b19da065a10afa8f6a68d976ac1013 ++2008-02-12T11:36:34.133642Z ++10445 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++401 ++ ++140-no_example_doc_win32.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++c5c43c7de06a8acdddd10f26dd3703d8 ++2008-02-12T11:36:34.133642Z ++10445 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++888 ++ +diff --git a/feeds/packages/libs/libshout/patches/.svn/text-base/100-ogg-c.patch.svn-base b/feeds/packages/libs/libshout/patches/.svn/text-base/100-ogg-c.patch.svn-base +new file mode 100644 +index 0000000..4313986 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/.svn/text-base/100-ogg-c.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: libshout-2.2.2/src/ogg.c ++=================================================================== ++--- libshout-2.2.2.orig/src/ogg.c 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/src/ogg.c 2008-02-12 12:30:14.000000000 +0100 ++@@ -30,7 +30,7 @@ ++ #include ++ #endif ++ ++-#include +++#include ++ ++ #include ++ #include "shout_private.h" +diff --git a/feeds/packages/libs/libshout/patches/.svn/text-base/110-shout-ogg-c.patch.svn-base b/feeds/packages/libs/libshout/patches/.svn/text-base/110-shout-ogg-c.patch.svn-base +new file mode 100644 +index 0000000..d495570 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/.svn/text-base/110-shout-ogg-c.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: libshout-2.2.2/src/shout_ogg.h ++=================================================================== ++--- libshout-2.2.2.orig/src/shout_ogg.h 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/src/shout_ogg.h 2008-02-12 12:30:14.000000000 +0100 ++@@ -28,7 +28,7 @@ ++ ++ #include ++ ++-#include +++#include ++ ++ typedef struct _ogg_codec_tag { ++ ogg_stream_state os; +diff --git a/feeds/packages/libs/libshout/patches/.svn/text-base/120-vorbis-c.patch.svn-base b/feeds/packages/libs/libshout/patches/.svn/text-base/120-vorbis-c.patch.svn-base +new file mode 100644 +index 0000000..ab5bcee +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/.svn/text-base/120-vorbis-c.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: libshout-2.2.2/src/vorbis.c ++=================================================================== ++--- libshout-2.2.2.orig/src/vorbis.c 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/src/vorbis.c 2008-02-12 12:30:14.000000000 +0100 ++@@ -27,7 +27,7 @@ ++ #include ++ #endif ++ ++-#include +++#include ++ ++ #include "shout_private.h" ++ #include "shout_ogg.h" +diff --git a/feeds/packages/libs/libshout/patches/.svn/text-base/140-no_example_doc_win32.patch.svn-base b/feeds/packages/libs/libshout/patches/.svn/text-base/140-no_example_doc_win32.patch.svn-base +new file mode 100644 +index 0000000..329a1b3 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/.svn/text-base/140-no_example_doc_win32.patch.svn-base +@@ -0,0 +1,21 @@ ++Index: libshout-2.2.2/Makefile.in ++=================================================================== ++--- libshout-2.2.2.orig/Makefile.in 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/Makefile.in 2008-02-12 12:30:15.000000000 +0100 ++@@ -246,14 +246,14 @@ ++ target_alias = @target_alias@ ++ 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/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \ ++ m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ ++ m4/xiph_types.m4 ++ ++ DISTCLEANFILES = shout-config.in ++ docdir = $(datadir)/doc/$(PACKAGE) ++-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/feeds/packages/libs/libshout/patches/100-ogg-c.patch b/feeds/packages/libs/libshout/patches/100-ogg-c.patch +new file mode 100644 +index 0000000..4313986 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/100-ogg-c.patch +@@ -0,0 +1,13 @@ ++Index: libshout-2.2.2/src/ogg.c ++=================================================================== ++--- libshout-2.2.2.orig/src/ogg.c 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/src/ogg.c 2008-02-12 12:30:14.000000000 +0100 ++@@ -30,7 +30,7 @@ ++ #include ++ #endif ++ ++-#include +++#include ++ ++ #include ++ #include "shout_private.h" +diff --git a/feeds/packages/libs/libshout/patches/110-shout-ogg-c.patch b/feeds/packages/libs/libshout/patches/110-shout-ogg-c.patch +new file mode 100644 +index 0000000..d495570 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/110-shout-ogg-c.patch +@@ -0,0 +1,13 @@ ++Index: libshout-2.2.2/src/shout_ogg.h ++=================================================================== ++--- libshout-2.2.2.orig/src/shout_ogg.h 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/src/shout_ogg.h 2008-02-12 12:30:14.000000000 +0100 ++@@ -28,7 +28,7 @@ ++ ++ #include ++ ++-#include +++#include ++ ++ typedef struct _ogg_codec_tag { ++ ogg_stream_state os; +diff --git a/feeds/packages/libs/libshout/patches/120-vorbis-c.patch b/feeds/packages/libs/libshout/patches/120-vorbis-c.patch +new file mode 100644 +index 0000000..ab5bcee +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/120-vorbis-c.patch +@@ -0,0 +1,13 @@ ++Index: libshout-2.2.2/src/vorbis.c ++=================================================================== ++--- libshout-2.2.2.orig/src/vorbis.c 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/src/vorbis.c 2008-02-12 12:30:14.000000000 +0100 ++@@ -27,7 +27,7 @@ ++ #include ++ #endif ++ ++-#include +++#include ++ ++ #include "shout_private.h" ++ #include "shout_ogg.h" +diff --git a/feeds/packages/libs/libshout/patches/140-no_example_doc_win32.patch b/feeds/packages/libs/libshout/patches/140-no_example_doc_win32.patch +new file mode 100644 +index 0000000..329a1b3 +--- /dev/null ++++ b/feeds/packages/libs/libshout/patches/140-no_example_doc_win32.patch +@@ -0,0 +1,21 @@ ++Index: libshout-2.2.2/Makefile.in ++=================================================================== ++--- libshout-2.2.2.orig/Makefile.in 2008-02-12 12:30:14.000000000 +0100 +++++ libshout-2.2.2/Makefile.in 2008-02-12 12:30:15.000000000 +0100 ++@@ -246,14 +246,14 @@ ++ target_alias = @target_alias@ ++ 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/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \ ++ m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ ++ m4/xiph_types.m4 ++ ++ DISTCLEANFILES = shout-config.in ++ docdir = $(datadir)/doc/$(PACKAGE) ++-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/feeds/packages/libs/libsigc++/.svn/entries b/feeds/packages/libs/libsigc++/.svn/entries +new file mode 100644 +index 0000000..68b5a56 +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsigc++ ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d6eba882591b9e0d33bf55a4d2a1d275 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1567 ++ +diff --git a/feeds/packages/libs/libsigc++/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libsigc++/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libsigc++/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsigc++/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c8a87dd +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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:=libsigc++ ++PKG_VERSION:=2.2.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/libsigc++/2.2 ++PKG_MD5SUM:=73419b477f3bb9ddb9905c88a92f4b4c ++ ++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/feeds/packages/libs/libsigc++/Makefile b/feeds/packages/libs/libsigc++/Makefile +new file mode 100644 +index 0000000..c8a87dd +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=libsigc++ ++PKG_VERSION:=2.2.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/libsigc++/2.2 ++PKG_MD5SUM:=73419b477f3bb9ddb9905c88a92f4b4c ++ ++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/feeds/packages/libs/libsigc++/patches/.svn/entries b/feeds/packages/libs/libsigc++/patches/.svn/entries +new file mode 100644 +index 0000000..d217f0b +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsigc++/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-14T01:17:51.105030Z ++30514 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_doc_tests_examples.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++88a7944b2062c0a92c8d4513627d73b7 ++2012-02-14T01:17:51.105030Z ++30514 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++628 ++ +diff --git a/feeds/packages/libs/libsigc++/patches/.svn/text-base/001-no_doc_tests_examples.patch.svn-base b/feeds/packages/libs/libsigc++/patches/.svn/text-base/001-no_doc_tests_examples.patch.svn-base +new file mode 100644 +index 0000000..c69285f +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/patches/.svn/text-base/001-no_doc_tests_examples.patch.svn-base +@@ -0,0 +1,22 @@ ++--- 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 ++@@ -116,7 +116,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE ++ distdir dist dist-all distcheck ++ ETAGS = etags ++ CTAGS = ctags ++-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/feeds/packages/libs/libsigc++/patches/001-no_doc_tests_examples.patch b/feeds/packages/libs/libsigc++/patches/001-no_doc_tests_examples.patch +new file mode 100644 +index 0000000..c69285f +--- /dev/null ++++ b/feeds/packages/libs/libsigc++/patches/001-no_doc_tests_examples.patch +@@ -0,0 +1,22 @@ ++--- 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 ++@@ -116,7 +116,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE ++ distdir dist dist-all distcheck ++ ETAGS = etags ++ CTAGS = ctags ++-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/feeds/packages/libs/libsml/.svn/entries b/feeds/packages/libs/libsml/.svn/entries +new file mode 100644 +index 0000000..48286ec +--- /dev/null ++++ b/feeds/packages/libs/libsml/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsml ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T18:04:18.619206Z ++34529 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d8489af1cd1afaf55f861b33a846813c ++2012-12-05T18:04:18.619206Z ++34529 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1505 ++ +diff --git a/feeds/packages/libs/libsml/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsml/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b1649f7 +--- /dev/null ++++ b/feeds/packages/libs/libsml/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 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:=libsml ++PKG_VERSION:=0.2 ++PKG_RELEASE:=1 ++PKG_REV:=550aa8216295ff76076f35ce2eb00872dfd83f8f ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://github.com/dailab/libsml.git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_PROTO:=git ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libsml ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=https://github.com/dailab/libsml ++ TITLE:=Library which implements the Smart Messaging Language (SML) protocol ++ DEPENDS:=+libuuid ++endef ++ ++MAKE_FLAGS += \ ++ UNAME="Linux" ++ ++define Package/libsml/description ++ libSML is a library which implements the Smart Messaging Language (SML) protocol specified by ++ VDE's Forum Netztechnik/Netzbetrieb (FNN). It can be utilized to communicate to FNN specified ++ Smart Meters or Smart Meter components (EDL/MUC). ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/sml/include/sml $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.{so*,a} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_BUILD_DIR)/sml.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libsml/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsml)) +diff --git a/feeds/packages/libs/libsml/Makefile b/feeds/packages/libs/libsml/Makefile +new file mode 100644 +index 0000000..b1649f7 +--- /dev/null ++++ b/feeds/packages/libs/libsml/Makefile +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 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:=libsml ++PKG_VERSION:=0.2 ++PKG_RELEASE:=1 ++PKG_REV:=550aa8216295ff76076f35ce2eb00872dfd83f8f ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://github.com/dailab/libsml.git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_PROTO:=git ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libsml ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=https://github.com/dailab/libsml ++ TITLE:=Library which implements the Smart Messaging Language (SML) protocol ++ DEPENDS:=+libuuid ++endef ++ ++MAKE_FLAGS += \ ++ UNAME="Linux" ++ ++define Package/libsml/description ++ libSML is a library which implements the Smart Messaging Language (SML) protocol specified by ++ VDE's Forum Netztechnik/Netzbetrieb (FNN). It can be utilized to communicate to FNN specified ++ Smart Meters or Smart Meter components (EDL/MUC). ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/sml/include/sml $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.{so*,a} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_BUILD_DIR)/sml.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libsml/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsml)) +diff --git a/feeds/packages/libs/libsml/patches/.svn/entries b/feeds/packages/libs/libsml/patches/.svn/entries +new file mode 100644 +index 0000000..e9b57bd +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsml/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T18:04:18.619206Z ++34529 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++030-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++573fa11c7eda7549f2c818c6a3058510 ++2012-12-05T18:04:18.619206Z ++34529 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++258 ++ ++010-no-examples-tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a04be741cf43944807f1a44b4eaaa772 ++2012-01-19T15:08:02.801065Z ++29802 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++184 ++ ++020-ldflags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++57eba488928732896bbad85c543ae36b ++2012-01-19T15:08:02.801065Z ++29802 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++271 ++ +diff --git a/feeds/packages/libs/libsml/patches/.svn/text-base/010-no-examples-tests.patch.svn-base b/feeds/packages/libs/libsml/patches/.svn/text-base/010-no-examples-tests.patch.svn-base +new file mode 100644 +index 0000000..bf2220c +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/.svn/text-base/010-no-examples-tests.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -1,8 +1,8 @@ ++ ++ all: ++ @$(MAKE) -C sml ++- @$(MAKE) -C examples ++- @$(MAKE) -C test +++# @$(MAKE) -C examples +++# @$(MAKE) -C test ++ ++ .PHONY: clean ++ clean : +diff --git a/feeds/packages/libs/libsml/patches/.svn/text-base/020-ldflags.patch.svn-base b/feeds/packages/libs/libsml/patches/.svn/text-base/020-ldflags.patch.svn-base +new file mode 100644 +index 0000000..d6fa2e4 +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/.svn/text-base/020-ldflags.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/sml/Makefile +++++ b/sml/Makefile ++@@ -54,7 +54,7 @@ libsml: $(ST_LIB) $(OBJ_LIB) ++ endif ++ ++ $(DYN_LIB): $(OBJS) ++- $(LD) $(LIBS) -shared -soname $(SONAME) -o $@ $^ +++ $(LD) $(LDFLAGS) $(LIBS) -shared -soname $(SONAME) -o $@ $^ ++ ++ $(OBJ_LIB): $(OBJS) ++ $(LD) -r -o $@ $^ +diff --git a/feeds/packages/libs/libsml/patches/.svn/text-base/030-cross_compile.patch.svn-base b/feeds/packages/libs/libsml/patches/.svn/text-base/030-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..6e33014 +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/.svn/text-base/030-cross_compile.patch.svn-base +@@ -0,0 +1,8 @@ ++--- a/sml/Makefile 2012-12-05 18:54:49.000000000 +0100 +++++ b/sml/Makefile 2012-12-05 19:01:26.347952235 +0100 ++@@ -1,4 +1,4 @@ ++-UNAME := $(shell uname) +++UNAME ?= $(shell uname) ++ CFLAGS += -I./include/ -fPIC -fno-stack-protector -g -Wall ++ ++ # Available Flags: +diff --git a/feeds/packages/libs/libsml/patches/010-no-examples-tests.patch b/feeds/packages/libs/libsml/patches/010-no-examples-tests.patch +new file mode 100644 +index 0000000..bf2220c +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/010-no-examples-tests.patch +@@ -0,0 +1,13 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -1,8 +1,8 @@ ++ ++ all: ++ @$(MAKE) -C sml ++- @$(MAKE) -C examples ++- @$(MAKE) -C test +++# @$(MAKE) -C examples +++# @$(MAKE) -C test ++ ++ .PHONY: clean ++ clean : +diff --git a/feeds/packages/libs/libsml/patches/020-ldflags.patch b/feeds/packages/libs/libsml/patches/020-ldflags.patch +new file mode 100644 +index 0000000..d6fa2e4 +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/020-ldflags.patch +@@ -0,0 +1,11 @@ ++--- a/sml/Makefile +++++ b/sml/Makefile ++@@ -54,7 +54,7 @@ libsml: $(ST_LIB) $(OBJ_LIB) ++ endif ++ ++ $(DYN_LIB): $(OBJS) ++- $(LD) $(LIBS) -shared -soname $(SONAME) -o $@ $^ +++ $(LD) $(LDFLAGS) $(LIBS) -shared -soname $(SONAME) -o $@ $^ ++ ++ $(OBJ_LIB): $(OBJS) ++ $(LD) -r -o $@ $^ +diff --git a/feeds/packages/libs/libsml/patches/030-cross_compile.patch b/feeds/packages/libs/libsml/patches/030-cross_compile.patch +new file mode 100644 +index 0000000..6e33014 +--- /dev/null ++++ b/feeds/packages/libs/libsml/patches/030-cross_compile.patch +@@ -0,0 +1,8 @@ ++--- a/sml/Makefile 2012-12-05 18:54:49.000000000 +0100 +++++ b/sml/Makefile 2012-12-05 19:01:26.347952235 +0100 ++@@ -1,4 +1,4 @@ ++-UNAME := $(shell uname) +++UNAME ?= $(shell uname) ++ CFLAGS += -I./include/ -fPIC -fno-stack-protector -g -Wall ++ ++ # Available Flags: +diff --git a/feeds/packages/libs/libsndfile/.svn/entries b/feeds/packages/libs/libsndfile/.svn/entries +new file mode 100644 +index 0000000..8d7e9a3 +--- /dev/null ++++ b/feeds/packages/libs/libsndfile/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsndfile ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++9880a40121d413bc783a6a0fc695150b ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1440 ++ +diff --git a/feeds/packages/libs/libsndfile/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsndfile/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..55499c4 +--- /dev/null ++++ b/feeds/packages/libs/libsndfile/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# 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/ ++ 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/feeds/packages/libs/libsndfile/Makefile b/feeds/packages/libs/libsndfile/Makefile +new file mode 100644 +index 0000000..55499c4 +--- /dev/null ++++ b/feeds/packages/libs/libsndfile/Makefile +@@ -0,0 +1,64 @@ ++# ++# 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/ ++ 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/feeds/packages/libs/libsndfile/patches/.svn/entries b/feeds/packages/libs/libsndfile/patches/.svn/entries +new file mode 100644 +index 0000000..a009723 +--- /dev/null ++++ b/feeds/packages/libs/libsndfile/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsndfile/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T20:20:54.703192Z ++24614 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++00ca29a25fd472a6fa9439caabe7ed4a ++2010-12-15T20:20:54.703192Z ++24614 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++212 ++ +diff --git a/feeds/packages/libs/libsndfile/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libsndfile/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..2df32ae +--- /dev/null ++++ b/feeds/packages/libs/libsndfile/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/libs/libsndfile/patches/001-automake-compat.patch b/feeds/packages/libs/libsndfile/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..2df32ae +--- /dev/null ++++ b/feeds/packages/libs/libsndfile/patches/001-automake-compat.patch +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/libs/libsoup/.svn/entries b/feeds/packages/libs/libsoup/.svn/entries +new file mode 100644 +index 0000000..441a668 +--- /dev/null ++++ b/feeds/packages/libs/libsoup/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsoup ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:12.200766Z ++34513 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++965ccb8a54c5021512f4788237e6e7d1 ++2012-12-05T17:31:12.200766Z ++34513 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1343 ++ +diff --git a/feeds/packages/libs/libsoup/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsoup/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f6a7f84 +--- /dev/null ++++ b/feeds/packages/libs/libsoup/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libsoup ++PKG_VERSION:=2.38.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.38 ++PKG_MD5SUM:=d13fb4968acea24c26b83268a308f580 ++ ++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/libsoup ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libsoup ++ URL:=http://live.gnome.org/LibSoup ++ DEPENDS:=+glib2 +libxml2 +libgnutls ++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/feeds/packages/libs/libsoup/Makefile b/feeds/packages/libs/libsoup/Makefile +new file mode 100644 +index 0000000..f6a7f84 +--- /dev/null ++++ b/feeds/packages/libs/libsoup/Makefile +@@ -0,0 +1,64 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libsoup ++PKG_VERSION:=2.38.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.38 ++PKG_MD5SUM:=d13fb4968acea24c26b83268a308f580 ++ ++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/libsoup ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=libsoup ++ URL:=http://live.gnome.org/LibSoup ++ DEPENDS:=+glib2 +libxml2 +libgnutls ++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/feeds/packages/libs/libspe2/.svn/entries b/feeds/packages/libs/libspe2/.svn/entries +new file mode 100644 +index 0000000..a9e4e3f +--- /dev/null ++++ b/feeds/packages/libs/libspe2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libspe2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-18T11:06:19.966693Z ++18816 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++37732c4737b21da1be0a01975d2f9c34 ++2009-12-18T11:06:19.966693Z ++18816 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1217 ++ +diff --git a/feeds/packages/libs/libspe2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libspe2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2fc4aa4 +--- /dev/null ++++ b/feeds/packages/libs/libspe2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=libspe2 ++PKG_VERSION:=2.3.0 ++PKG_MINOR_VERSION:=135 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).$(PKG_MINOR_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libspe ++PKG_MD5SUM:=c77dc69d3585d45f980e661232ae2b0b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libspe2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=SPE Runtime Management Library for the Cell Broadband Engine ++ DEPENDS:=@TARGET_ps3||TARGET_ps3chk ++ URL:=http://sourceforge.net/projects/libspe/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" SYSROOT="" CROSS=$(TARGET_CROSS) all install ++endef ++ ++define Build/InstallDev ++ echo "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/libspe2* $(1)/usr/lib/ ++endef ++ ++define Package/libspe2/install ++ echo "Package/libspe2/install" ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspe2* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libspe2)) +diff --git a/feeds/packages/libs/libspe2/Makefile b/feeds/packages/libs/libspe2/Makefile +new file mode 100644 +index 0000000..2fc4aa4 +--- /dev/null ++++ b/feeds/packages/libs/libspe2/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=libspe2 ++PKG_VERSION:=2.3.0 ++PKG_MINOR_VERSION:=135 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).$(PKG_MINOR_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libspe ++PKG_MD5SUM:=c77dc69d3585d45f980e661232ae2b0b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libspe2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=SPE Runtime Management Library for the Cell Broadband Engine ++ DEPENDS:=@TARGET_ps3||TARGET_ps3chk ++ URL:=http://sourceforge.net/projects/libspe/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" SYSROOT="" CROSS=$(TARGET_CROSS) all install ++endef ++ ++define Build/InstallDev ++ echo "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/libspe2* $(1)/usr/lib/ ++endef ++ ++define Package/libspe2/install ++ echo "Package/libspe2/install" ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspe2* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libspe2)) +diff --git a/feeds/packages/libs/libspe2/patches/.svn/entries b/feeds/packages/libs/libspe2/patches/.svn/entries +new file mode 100644 +index 0000000..dab7c90 +--- /dev/null ++++ b/feeds/packages/libs/libspe2/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libspe2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-04T08:02:16.039243Z ++13121 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-remove_tls_requirement.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++ec8d86ab75c4ec5be525ffbed5570129 ++2008-11-04T08:02:16.039243Z ++13121 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2231 ++ +diff --git a/feeds/packages/libs/libspe2/patches/.svn/text-base/001-remove_tls_requirement.patch.svn-base b/feeds/packages/libs/libspe2/patches/.svn/text-base/001-remove_tls_requirement.patch.svn-base +new file mode 100644 +index 0000000..ae4d118 +--- /dev/null ++++ b/feeds/packages/libs/libspe2/patches/.svn/text-base/001-remove_tls_requirement.patch.svn-base +@@ -0,0 +1,93 @@ ++--- libspe2-2.3.0.old/spebase/run.c 2008-10-28 14:43:09.000000000 +0100 +++++ libspe2-2.3.0/spebase/run.c 2008-10-28 14:44:07.000000000 +0100 ++@@ -37,6 +37,7 @@ ++ #include "spebase.h" ++ #include "regs.h" ++ +++#if 0 ++ /*Thread-local variable for use by the debugger*/ ++ __thread struct spe_context_info { ++ int spe_id; ++@@ -44,13 +45,15 @@ ++ unsigned int status; ++ struct spe_context_info *prev; ++ }*__spe_current_active_context; +++#endif ++ ++- +++#if 0 ++ static void cleanupspeinfo(struct spe_context_info *ctxinfo) ++ { ++ struct spe_context_info *tmp = ctxinfo->prev; ++ __spe_current_active_context = tmp; ++ } +++#endif ++ ++ static int issue_isolated_exit(struct spe_context *spe) ++ { ++@@ -69,12 +72,14 @@ ++ return 0; ++ } ++ +++#if 0 ++ static inline void freespeinfo() ++ { ++ /*Clean up the debug variable*/ ++ struct spe_context_info *tmp = __spe_current_active_context->prev; ++ __spe_current_active_context = tmp; ++ } +++#endif ++ ++ int _base_spe_context_run(spe_context_ptr_t spe, unsigned int *entry, ++ unsigned int runflags, void *argp, void *envp, ++@@ -83,7 +88,9 @@ ++ int retval = 0, run_rc; ++ unsigned int run_status, tmp_entry; ++ spe_stop_info_t stopinfo_buf; +++#if 0 ++ struct spe_context_info this_context_info __attribute__((cleanup(cleanupspeinfo))); +++#endif ++ ++ /* If the caller hasn't set a stopinfo buffer, provide a buffer on the ++ * stack instead. */ ++@@ -146,6 +153,7 @@ ++ return -1; ++ } ++ +++#if 0 ++ /*Leave a trail of breadcrumbs for the debugger to follow */ ++ if (!__spe_current_active_context) { ++ __spe_current_active_context = &this_context_info; ++@@ -162,18 +170,23 @@ ++ } ++ /*remember the ls-addr*/ ++ __spe_current_active_context->spe_id = spe->base_private->fd_spe_dir; +++#endif ++ ++ do_run: +++#if 0 ++ /*Remember the npc value*/ ++ __spe_current_active_context->npc = tmp_entry; +++#endif ++ ++ /* run SPE context */ ++ run_rc = spu_run(spe->base_private->fd_spe_dir, ++ &tmp_entry, &run_status); ++ +++#if 0 ++ /*Remember the npc value*/ ++ __spe_current_active_context->npc = tmp_entry; ++ __spe_current_active_context->status = run_status; +++#endif ++ ++ DEBUG_PRINTF("spu_run returned run_rc=0x%08x, entry=0x%04x, " ++ "ext_status=0x%04x.\n", run_rc, tmp_entry, run_status); ++@@ -341,6 +354,8 @@ ++ ++ } ++ +++#if 0 ++ freespeinfo(); +++#endif ++ return retval; ++ } +diff --git a/feeds/packages/libs/libspe2/patches/001-remove_tls_requirement.patch b/feeds/packages/libs/libspe2/patches/001-remove_tls_requirement.patch +new file mode 100644 +index 0000000..ae4d118 +--- /dev/null ++++ b/feeds/packages/libs/libspe2/patches/001-remove_tls_requirement.patch +@@ -0,0 +1,93 @@ ++--- libspe2-2.3.0.old/spebase/run.c 2008-10-28 14:43:09.000000000 +0100 +++++ libspe2-2.3.0/spebase/run.c 2008-10-28 14:44:07.000000000 +0100 ++@@ -37,6 +37,7 @@ ++ #include "spebase.h" ++ #include "regs.h" ++ +++#if 0 ++ /*Thread-local variable for use by the debugger*/ ++ __thread struct spe_context_info { ++ int spe_id; ++@@ -44,13 +45,15 @@ ++ unsigned int status; ++ struct spe_context_info *prev; ++ }*__spe_current_active_context; +++#endif ++ ++- +++#if 0 ++ static void cleanupspeinfo(struct spe_context_info *ctxinfo) ++ { ++ struct spe_context_info *tmp = ctxinfo->prev; ++ __spe_current_active_context = tmp; ++ } +++#endif ++ ++ static int issue_isolated_exit(struct spe_context *spe) ++ { ++@@ -69,12 +72,14 @@ ++ return 0; ++ } ++ +++#if 0 ++ static inline void freespeinfo() ++ { ++ /*Clean up the debug variable*/ ++ struct spe_context_info *tmp = __spe_current_active_context->prev; ++ __spe_current_active_context = tmp; ++ } +++#endif ++ ++ int _base_spe_context_run(spe_context_ptr_t spe, unsigned int *entry, ++ unsigned int runflags, void *argp, void *envp, ++@@ -83,7 +88,9 @@ ++ int retval = 0, run_rc; ++ unsigned int run_status, tmp_entry; ++ spe_stop_info_t stopinfo_buf; +++#if 0 ++ struct spe_context_info this_context_info __attribute__((cleanup(cleanupspeinfo))); +++#endif ++ ++ /* If the caller hasn't set a stopinfo buffer, provide a buffer on the ++ * stack instead. */ ++@@ -146,6 +153,7 @@ ++ return -1; ++ } ++ +++#if 0 ++ /*Leave a trail of breadcrumbs for the debugger to follow */ ++ if (!__spe_current_active_context) { ++ __spe_current_active_context = &this_context_info; ++@@ -162,18 +170,23 @@ ++ } ++ /*remember the ls-addr*/ ++ __spe_current_active_context->spe_id = spe->base_private->fd_spe_dir; +++#endif ++ ++ do_run: +++#if 0 ++ /*Remember the npc value*/ ++ __spe_current_active_context->npc = tmp_entry; +++#endif ++ ++ /* run SPE context */ ++ run_rc = spu_run(spe->base_private->fd_spe_dir, ++ &tmp_entry, &run_status); ++ +++#if 0 ++ /*Remember the npc value*/ ++ __spe_current_active_context->npc = tmp_entry; ++ __spe_current_active_context->status = run_status; +++#endif ++ ++ DEBUG_PRINTF("spu_run returned run_rc=0x%08x, entry=0x%04x, " ++ "ext_status=0x%04x.\n", run_rc, tmp_entry, run_status); ++@@ -341,6 +354,8 @@ ++ ++ } ++ +++#if 0 ++ freespeinfo(); +++#endif ++ return retval; ++ } +diff --git a/feeds/packages/libs/libsrtp/.svn/entries b/feeds/packages/libs/libsrtp/.svn/entries +new file mode 100644 +index 0000000..6cb709c +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsrtp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++caee804e79043f05bade82a85ccb6157 ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1407 ++ +diff --git a/feeds/packages/libs/libsrtp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsrtp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..443d17f +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2011-2012 OpenWrt.org ++# Copyright (C) 2011 Victor Seva ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libsrtp ++PKG_VERSION:=1.4.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=srtp-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/srtp ++PKG_MD5SUM:=9b449edb011c934ca97009e7e0566d22 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/srtp ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++CONFIGURE_ARGS += --disable-stdout --enable-syslog ++ ++define Package/libsrtp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Secure Real-time Transport Protocol (SRTP) library ++ URL:=http://sourceforge.net/projects/srtp ++ MAINTAINER:=Victor Seva ++endef ++ ++define Package/libsrtp/description ++ Open-source implementation of the Secure Real-time Transport ++ Protocol (SRTP) originally authored by Cisco Systems, Inc. ++ It is available under a BSD-style license. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/srtp $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.{a,so*} $(1)/usr/lib/ ++endef ++ ++ ++define Package/libsrtp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.so.* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsrtp)) +diff --git a/feeds/packages/libs/libsrtp/Makefile b/feeds/packages/libs/libsrtp/Makefile +new file mode 100644 +index 0000000..443d17f +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/Makefile +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2011-2012 OpenWrt.org ++# Copyright (C) 2011 Victor Seva ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=libsrtp ++PKG_VERSION:=1.4.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=srtp-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/srtp ++PKG_MD5SUM:=9b449edb011c934ca97009e7e0566d22 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/srtp ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++CONFIGURE_ARGS += --disable-stdout --enable-syslog ++ ++define Package/libsrtp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Secure Real-time Transport Protocol (SRTP) library ++ URL:=http://sourceforge.net/projects/srtp ++ MAINTAINER:=Victor Seva ++endef ++ ++define Package/libsrtp/description ++ Open-source implementation of the Secure Real-time Transport ++ Protocol (SRTP) originally authored by Cisco Systems, Inc. ++ It is available under a BSD-style license. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/srtp $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.{a,so*} $(1)/usr/lib/ ++endef ++ ++ ++define Package/libsrtp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.so.* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsrtp)) +diff --git a/feeds/packages/libs/libsrtp/patches/.svn/entries b/feeds/packages/libs/libsrtp/patches/.svn/entries +new file mode 100644 +index 0000000..40ce7a4 +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsrtp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++1005_fix_data_alignment.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++54844aad8f97de05ada0667f7acfb306 ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1309 ++ ++1008_shared-lib.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++3cf163daf9716450ef4e401622ac8c27 ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1846 ++ ++1003_fix_mips_namespace_collision.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++134dcdef43b5d803a394a41f270ad1dc ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2359 ++ ++1007_update_Doxyfile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++cfba108a7f604e85bb58b47cf592c251 ++2012-01-19T15:55:18.862554Z ++29808 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2401 ++ +diff --git a/feeds/packages/libs/libsrtp/patches/.svn/text-base/1003_fix_mips_namespace_collision.patch.svn-base b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1003_fix_mips_namespace_collision.patch.svn-base +new file mode 100644 +index 0000000..534ea4b +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1003_fix_mips_namespace_collision.patch.svn-base +@@ -0,0 +1,59 @@ ++Description: Fix MIPS namespace collision ++Author: Thiemo Seufer ++Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=24;bug=439976 ++Bug-Debian: http://bugs.debian.org/439976 ++Last-Update: 2010-02-28 ++--- a/test/srtp_driver.c +++++ b/test/srtp_driver.c ++@@ -314,7 +314,7 @@ main (int argc, char *argv[]) { ++ if (do_codec_timing) { ++ srtp_policy_t policy; ++ int ignore; ++- double mips = mips_estimate(1000000000, &ignore); +++ double mips_est = mips_estimate(1000000000, &ignore); ++ ++ crypto_policy_set_rtp_default(&policy.rtp); ++ crypto_policy_set_rtcp_default(&policy.rtcp); ++@@ -323,33 +323,33 @@ main (int argc, char *argv[]) { ++ policy.key = test_key; ++ policy.next = NULL; ++ ++- printf("mips estimate: %e\n", mips); +++ printf("mips estimate: %e\n", mips_est); ++ ++ printf("testing srtp processing time for voice codecs:\n"); ++ printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n"); ++ printf("G.711\t\t%d\t\t\t%e\n", 80, ++- (double) mips * (80 * 8) / +++ (double) mips_est * (80 * 8) / ++ srtp_bits_per_second(80, &policy) / .01 ); ++ printf("G.711\t\t%d\t\t\t%e\n", 160, ++- (double) mips * (160 * 8) / +++ (double) mips_est * (160 * 8) / ++ srtp_bits_per_second(160, &policy) / .02); ++ printf("G.726-32\t%d\t\t\t%e\n", 40, ++- (double) mips * (40 * 8) / +++ (double) mips_est * (40 * 8) / ++ srtp_bits_per_second(40, &policy) / .01 ); ++ printf("G.726-32\t%d\t\t\t%e\n", 80, ++- (double) mips * (80 * 8) / +++ (double) mips_est * (80 * 8) / ++ srtp_bits_per_second(80, &policy) / .02); ++ printf("G.729\t\t%d\t\t\t%e\n", 10, ++- (double) mips * (10 * 8) / +++ (double) mips_est * (10 * 8) / ++ srtp_bits_per_second(10, &policy) / .01 ); ++ printf("G.729\t\t%d\t\t\t%e\n", 20, ++- (double) mips * (20 * 8) / +++ (double) mips_est * (20 * 8) / ++ srtp_bits_per_second(20, &policy) / .02 ); ++ printf("Wideband\t%d\t\t\t%e\n", 320, ++- (double) mips * (320 * 8) / +++ (double) mips_est * (320 * 8) / ++ srtp_bits_per_second(320, &policy) / .01 ); ++ printf("Wideband\t%d\t\t\t%e\n", 640, ++- (double) mips * (640 * 8) / +++ (double) mips_est * (640 * 8) / ++ srtp_bits_per_second(640, &policy) / .02 ); ++ } ++ +diff --git a/feeds/packages/libs/libsrtp/patches/.svn/text-base/1005_fix_data_alignment.patch.svn-base b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1005_fix_data_alignment.patch.svn-base +new file mode 100644 +index 0000000..4cb8889 +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1005_fix_data_alignment.patch.svn-base +@@ -0,0 +1,33 @@ ++Description: Fix data alignment ++Author: "Martin Guy" ++Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=470505 ++Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1912057&group_id=38894&atid=423799 ++Bug-Debian: http://bugs.debian.org/470505 ++Last-Update: 2011-05-30 ++--- a/test/srtp_driver.c +++++ b/test/srtp_driver.c ++@@ -1129,7 +1129,6 @@ mips_estimate(int num_trials, int *ignor ++ * These packets were made with the default SRTP policy. ++ */ ++ ++- ++ err_status_t ++ srtp_validate() { ++ unsigned char test_key[30] = { ++@@ -1144,14 +1143,14 @@ srtp_validate() { ++ 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, ++ 0xab, 0xab, 0xab, 0xab ++ }; ++- uint8_t srtp_plaintext[38] = { +++ uint8_t srtp_plaintext[38] __attribute__((aligned(4))) = { ++ 0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, ++ 0xca, 0xfe, 0xba, 0xbe, 0xab, 0xab, 0xab, 0xab, ++ 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, ++ 0xab, 0xab, 0xab, 0xab, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++ }; ++- uint8_t srtp_ciphertext[38] = { +++ uint8_t srtp_ciphertext[38] __attribute__((aligned(4))) = { ++ 0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, ++ 0xca, 0xfe, 0xba, 0xbe, 0x4e, 0x55, 0xdc, 0x4c, ++ 0xe7, 0x99, 0x78, 0xd8, 0x8c, 0xa4, 0xd2, 0x15, +diff --git a/feeds/packages/libs/libsrtp/patches/.svn/text-base/1007_update_Doxyfile.patch.svn-base b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1007_update_Doxyfile.patch.svn-base +new file mode 100644 +index 0000000..8108d7d +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1007_update_Doxyfile.patch.svn-base +@@ -0,0 +1,94 @@ ++Description: Update Doxyfile and header template ++Author: Jonas Smedegaard ++Last-Update: 2010-02-28 ++--- a/doc/Makefile.in +++++ b/doc/Makefile.in ++@@ -25,6 +25,7 @@ libsrtpdoc: ++ echo "*** Sorry, can't build doc outside source dir"; exit 1; \ ++ fi ++ sed 's/LIBSRTPVERSION/$(version)/' header.template > header.tex +++ doxygen -u ++ doxygen ++ sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp ++ mv latex/index.tmp latex/index.tex ++@@ -38,7 +39,7 @@ cryptodoc: clean ++ cp latex/refman.pdf crypto.pdf ++ ++ clean: ++- rm -rf latex/ header.tex +++ rm -rf latex/ header.tex Doxyfile.bak ++ for a in * ; do \ ++ if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ ++ done; ++--- a/doc/header.template +++++ b/doc/header.template ++@@ -6,28 +6,40 @@ ++ % ++ \documentclass[letterpaper]{book} ++ \usepackage{makeidx} ++-\usepackage{fancyhdr} ++ \usepackage{graphicx} ++ \usepackage{multicol} ++ \usepackage{float} +++\usepackage{listings} +++\usepackage{color} +++\usepackage{ifthen} +++\usepackage[table]{xcolor} ++ \usepackage{textcomp} ++ \usepackage{alltt} ++-\usepackage{times} ++-\usepackage{graphicx} ++-\ifx\pdfoutput\undefined ++-\usepackage[ps2pdf, +++\usepackage{ifpdf} +++\ifpdf +++\usepackage[pdftex, ++ pagebackref=true, ++ colorlinks=true, ++- linkcolor=blue +++ linkcolor=blue, +++ unicode ++ ]{hyperref} ++ \else ++-\usepackage[pdftex, +++\usepackage[ps2pdf, ++ pagebackref=true, ++ colorlinks=true, ++- linkcolor=blue +++ linkcolor=blue, +++ unicode ++ ]{hyperref} +++\usepackage{pspicture} ++ \fi +++\usepackage[utf8]{inputenc} +++\usepackage{mathptmx} +++\usepackage[scaled=.90]{helvet} +++\usepackage{courier} +++\usepackage{sectsty} +++\usepackage[titles]{tocloft} ++ \usepackage{doxygen} +++\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=3,numbers=left } ++ \makeindex ++ \setcounter{tocdepth}{1} ++ \renewcommand{\footrulewidth}{0.4pt} ++@@ -59,7 +71,9 @@ ++ \selectfont ++ ++ +++\renewcommand{\familydefault}{\sfdefault} ++ \begin{document} +++\hypersetup{pageanchor=false} ++ \begin{titlepage} ++ \vspace*{4cm} ++ %\begin{center} ++@@ -107,9 +121,6 @@ This reference material in this documena ++ \clearemptydoublepage ++ \pagenumbering{roman} ++ \tableofcontents ++-%\clearemptydoublepage ++- ++ \clearemptydoublepage ++ \pagenumbering{arabic} ++- ++- +++\hypersetup{pageanchor=true} +diff --git a/feeds/packages/libs/libsrtp/patches/.svn/text-base/1008_shared-lib.patch.svn-base b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1008_shared-lib.patch.svn-base +new file mode 100644 +index 0000000..96a13ca +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/.svn/text-base/1008_shared-lib.patch.svn-base +@@ -0,0 +1,55 @@ ++Description: Hack build routines to compile shared library ++Author: loki_val and solar ++Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch ++Last-Update: 2010-03-19 ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -15,7 +15,7 @@ ++ ++ .PHONY: all test build_table_apps ++ ++-all: test +++all: libsrtp.so test ++ ++ runtest: build_table_apps test ++ @echo "running libsrtp test applications..." ++@@ -67,7 +67,7 @@ libdir = @libdir@ ++ # implicit rules for object files and test apps ++ ++ %.o: %.c ++- $(COMPILE) -c $< -o $@ +++ $(COMPILE) -fPIC -c $< -o $@ ++ ++ %$(EXE): %.c ++ $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) ++@@ -105,6 +105,9 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi ++ ar cr libsrtp.a $^ ++ $(RANLIB) libsrtp.a ++ +++libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi) +++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0 $^ +++ ++ # libcryptomath.a contains general-purpose routines that are used to ++ # generate tables and verify cryptoalgorithm implementations - this ++ # library is not meant to be included in production code ++@@ -197,6 +200,11 @@ install: ++ cp include/*.h $(DESTDIR)$(includedir)/srtp ++ cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp ++ if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi +++ if [ -f libsrtp.so.0.0 ]; then \ +++ cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \ +++ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \ +++ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \ +++ fi ++ ++ uninstall: ++ rm -rf $(DESTDIR)$(includedir)/srtp ++@@ -204,7 +212,7 @@ uninstall: ++ ++ clean: ++ rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \ ++- libcryptomath.a libsrtp.a core *.core test/core +++ libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core ++ for a in * */* */*/*; do \ ++ if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ ++ done; +diff --git a/feeds/packages/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch b/feeds/packages/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch +new file mode 100644 +index 0000000..534ea4b +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch +@@ -0,0 +1,59 @@ ++Description: Fix MIPS namespace collision ++Author: Thiemo Seufer ++Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=24;bug=439976 ++Bug-Debian: http://bugs.debian.org/439976 ++Last-Update: 2010-02-28 ++--- a/test/srtp_driver.c +++++ b/test/srtp_driver.c ++@@ -314,7 +314,7 @@ main (int argc, char *argv[]) { ++ if (do_codec_timing) { ++ srtp_policy_t policy; ++ int ignore; ++- double mips = mips_estimate(1000000000, &ignore); +++ double mips_est = mips_estimate(1000000000, &ignore); ++ ++ crypto_policy_set_rtp_default(&policy.rtp); ++ crypto_policy_set_rtcp_default(&policy.rtcp); ++@@ -323,33 +323,33 @@ main (int argc, char *argv[]) { ++ policy.key = test_key; ++ policy.next = NULL; ++ ++- printf("mips estimate: %e\n", mips); +++ printf("mips estimate: %e\n", mips_est); ++ ++ printf("testing srtp processing time for voice codecs:\n"); ++ printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n"); ++ printf("G.711\t\t%d\t\t\t%e\n", 80, ++- (double) mips * (80 * 8) / +++ (double) mips_est * (80 * 8) / ++ srtp_bits_per_second(80, &policy) / .01 ); ++ printf("G.711\t\t%d\t\t\t%e\n", 160, ++- (double) mips * (160 * 8) / +++ (double) mips_est * (160 * 8) / ++ srtp_bits_per_second(160, &policy) / .02); ++ printf("G.726-32\t%d\t\t\t%e\n", 40, ++- (double) mips * (40 * 8) / +++ (double) mips_est * (40 * 8) / ++ srtp_bits_per_second(40, &policy) / .01 ); ++ printf("G.726-32\t%d\t\t\t%e\n", 80, ++- (double) mips * (80 * 8) / +++ (double) mips_est * (80 * 8) / ++ srtp_bits_per_second(80, &policy) / .02); ++ printf("G.729\t\t%d\t\t\t%e\n", 10, ++- (double) mips * (10 * 8) / +++ (double) mips_est * (10 * 8) / ++ srtp_bits_per_second(10, &policy) / .01 ); ++ printf("G.729\t\t%d\t\t\t%e\n", 20, ++- (double) mips * (20 * 8) / +++ (double) mips_est * (20 * 8) / ++ srtp_bits_per_second(20, &policy) / .02 ); ++ printf("Wideband\t%d\t\t\t%e\n", 320, ++- (double) mips * (320 * 8) / +++ (double) mips_est * (320 * 8) / ++ srtp_bits_per_second(320, &policy) / .01 ); ++ printf("Wideband\t%d\t\t\t%e\n", 640, ++- (double) mips * (640 * 8) / +++ (double) mips_est * (640 * 8) / ++ srtp_bits_per_second(640, &policy) / .02 ); ++ } ++ +diff --git a/feeds/packages/libs/libsrtp/patches/1005_fix_data_alignment.patch b/feeds/packages/libs/libsrtp/patches/1005_fix_data_alignment.patch +new file mode 100644 +index 0000000..4cb8889 +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/1005_fix_data_alignment.patch +@@ -0,0 +1,33 @@ ++Description: Fix data alignment ++Author: "Martin Guy" ++Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=470505 ++Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1912057&group_id=38894&atid=423799 ++Bug-Debian: http://bugs.debian.org/470505 ++Last-Update: 2011-05-30 ++--- a/test/srtp_driver.c +++++ b/test/srtp_driver.c ++@@ -1129,7 +1129,6 @@ mips_estimate(int num_trials, int *ignor ++ * These packets were made with the default SRTP policy. ++ */ ++ ++- ++ err_status_t ++ srtp_validate() { ++ unsigned char test_key[30] = { ++@@ -1144,14 +1143,14 @@ srtp_validate() { ++ 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, ++ 0xab, 0xab, 0xab, 0xab ++ }; ++- uint8_t srtp_plaintext[38] = { +++ uint8_t srtp_plaintext[38] __attribute__((aligned(4))) = { ++ 0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, ++ 0xca, 0xfe, 0xba, 0xbe, 0xab, 0xab, 0xab, 0xab, ++ 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, ++ 0xab, 0xab, 0xab, 0xab, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++ }; ++- uint8_t srtp_ciphertext[38] = { +++ uint8_t srtp_ciphertext[38] __attribute__((aligned(4))) = { ++ 0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, ++ 0xca, 0xfe, 0xba, 0xbe, 0x4e, 0x55, 0xdc, 0x4c, ++ 0xe7, 0x99, 0x78, 0xd8, 0x8c, 0xa4, 0xd2, 0x15, +diff --git a/feeds/packages/libs/libsrtp/patches/1007_update_Doxyfile.patch b/feeds/packages/libs/libsrtp/patches/1007_update_Doxyfile.patch +new file mode 100644 +index 0000000..8108d7d +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/1007_update_Doxyfile.patch +@@ -0,0 +1,94 @@ ++Description: Update Doxyfile and header template ++Author: Jonas Smedegaard ++Last-Update: 2010-02-28 ++--- a/doc/Makefile.in +++++ b/doc/Makefile.in ++@@ -25,6 +25,7 @@ libsrtpdoc: ++ echo "*** Sorry, can't build doc outside source dir"; exit 1; \ ++ fi ++ sed 's/LIBSRTPVERSION/$(version)/' header.template > header.tex +++ doxygen -u ++ doxygen ++ sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp ++ mv latex/index.tmp latex/index.tex ++@@ -38,7 +39,7 @@ cryptodoc: clean ++ cp latex/refman.pdf crypto.pdf ++ ++ clean: ++- rm -rf latex/ header.tex +++ rm -rf latex/ header.tex Doxyfile.bak ++ for a in * ; do \ ++ if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ ++ done; ++--- a/doc/header.template +++++ b/doc/header.template ++@@ -6,28 +6,40 @@ ++ % ++ \documentclass[letterpaper]{book} ++ \usepackage{makeidx} ++-\usepackage{fancyhdr} ++ \usepackage{graphicx} ++ \usepackage{multicol} ++ \usepackage{float} +++\usepackage{listings} +++\usepackage{color} +++\usepackage{ifthen} +++\usepackage[table]{xcolor} ++ \usepackage{textcomp} ++ \usepackage{alltt} ++-\usepackage{times} ++-\usepackage{graphicx} ++-\ifx\pdfoutput\undefined ++-\usepackage[ps2pdf, +++\usepackage{ifpdf} +++\ifpdf +++\usepackage[pdftex, ++ pagebackref=true, ++ colorlinks=true, ++- linkcolor=blue +++ linkcolor=blue, +++ unicode ++ ]{hyperref} ++ \else ++-\usepackage[pdftex, +++\usepackage[ps2pdf, ++ pagebackref=true, ++ colorlinks=true, ++- linkcolor=blue +++ linkcolor=blue, +++ unicode ++ ]{hyperref} +++\usepackage{pspicture} ++ \fi +++\usepackage[utf8]{inputenc} +++\usepackage{mathptmx} +++\usepackage[scaled=.90]{helvet} +++\usepackage{courier} +++\usepackage{sectsty} +++\usepackage[titles]{tocloft} ++ \usepackage{doxygen} +++\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=3,numbers=left } ++ \makeindex ++ \setcounter{tocdepth}{1} ++ \renewcommand{\footrulewidth}{0.4pt} ++@@ -59,7 +71,9 @@ ++ \selectfont ++ ++ +++\renewcommand{\familydefault}{\sfdefault} ++ \begin{document} +++\hypersetup{pageanchor=false} ++ \begin{titlepage} ++ \vspace*{4cm} ++ %\begin{center} ++@@ -107,9 +121,6 @@ This reference material in this documena ++ \clearemptydoublepage ++ \pagenumbering{roman} ++ \tableofcontents ++-%\clearemptydoublepage ++- ++ \clearemptydoublepage ++ \pagenumbering{arabic} ++- ++- +++\hypersetup{pageanchor=true} +diff --git a/feeds/packages/libs/libsrtp/patches/1008_shared-lib.patch b/feeds/packages/libs/libsrtp/patches/1008_shared-lib.patch +new file mode 100644 +index 0000000..96a13ca +--- /dev/null ++++ b/feeds/packages/libs/libsrtp/patches/1008_shared-lib.patch +@@ -0,0 +1,55 @@ ++Description: Hack build routines to compile shared library ++Author: loki_val and solar ++Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch ++Last-Update: 2010-03-19 ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -15,7 +15,7 @@ ++ ++ .PHONY: all test build_table_apps ++ ++-all: test +++all: libsrtp.so test ++ ++ runtest: build_table_apps test ++ @echo "running libsrtp test applications..." ++@@ -67,7 +67,7 @@ libdir = @libdir@ ++ # implicit rules for object files and test apps ++ ++ %.o: %.c ++- $(COMPILE) -c $< -o $@ +++ $(COMPILE) -fPIC -c $< -o $@ ++ ++ %$(EXE): %.c ++ $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) ++@@ -105,6 +105,9 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi ++ ar cr libsrtp.a $^ ++ $(RANLIB) libsrtp.a ++ +++libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi) +++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0 $^ +++ ++ # libcryptomath.a contains general-purpose routines that are used to ++ # generate tables and verify cryptoalgorithm implementations - this ++ # library is not meant to be included in production code ++@@ -197,6 +200,11 @@ install: ++ cp include/*.h $(DESTDIR)$(includedir)/srtp ++ cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp ++ if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi +++ if [ -f libsrtp.so.0.0 ]; then \ +++ cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \ +++ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \ +++ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \ +++ fi ++ ++ uninstall: ++ rm -rf $(DESTDIR)$(includedir)/srtp ++@@ -204,7 +212,7 @@ uninstall: ++ ++ clean: ++ rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \ ++- libcryptomath.a libsrtp.a core *.core test/core +++ libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core ++ for a in * */* */*/*; do \ ++ if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ ++ done; +diff --git a/feeds/packages/libs/libssh2/.svn/entries b/feeds/packages/libs/libssh2/.svn/entries +new file mode 100644 +index 0000000..51a72a3 +--- /dev/null ++++ b/feeds/packages/libs/libssh2/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libssh2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T00:17:01.477460Z ++31927 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++91ed10bd926b29e966b489b87fe8e680 ++2012-05-28T00:17:01.477460Z ++31927 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1176 ++ +diff --git a/feeds/packages/libs/libssh2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libssh2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..01f538f +--- /dev/null ++++ b/feeds/packages/libs/libssh2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 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:=libssh2 ++PKG_VERSION:=1.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.libssh2.org/download ++PKG_MD5SUM:=42e2b3796ac07fc1dbafc7abcc002cd3 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libssh2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=SSH2 library ++ URL:=http://www.libssh2.org/ ++ DEPENDS:=+libopenssl +zlib ++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 ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/ ++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/feeds/packages/libs/libssh2/Makefile b/feeds/packages/libs/libssh2/Makefile +new file mode 100644 +index 0000000..01f538f +--- /dev/null ++++ b/feeds/packages/libs/libssh2/Makefile +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 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:=libssh2 ++PKG_VERSION:=1.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.libssh2.org/download ++PKG_MD5SUM:=42e2b3796ac07fc1dbafc7abcc002cd3 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libssh2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=SSH2 library ++ URL:=http://www.libssh2.org/ ++ DEPENDS:=+libopenssl +zlib ++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 ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/ ++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/feeds/packages/libs/libsynce/.svn/entries b/feeds/packages/libs/libsynce/.svn/entries +new file mode 100644 +index 0000000..0c8044b +--- /dev/null ++++ b/feeds/packages/libs/libsynce/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libsynce ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++962259b7e21bb16092d00ba77ea714cd ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1634 ++ +diff --git a/feeds/packages/libs/libsynce/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libsynce/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..48d5a12 +--- /dev/null ++++ b/feeds/packages/libs/libsynce/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# 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:=libsynce ++PKG_VERSION:=0.12 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/synce ++PKG_MD5SUM:=fd473d3deceda7912af4427dede1736f ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++define Package/libsynce ++ DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=SynCE library ++ URL:=http://synce.sourceforge.net/ ++endef ++ ++define Package/libsynce/description ++The purpose of the SynCE project is to provide a means of communication with a ++Windows CE or Pocket PC device from a computer running Linux, *BSD or other unices. ++endef ++ ++MAKE_FLAGS += \ ++ OPTIM="$(TARGET_CFLAGS)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++CONFIGURE_ARGS += \ ++ --enable-hal-support=no \ ++ --enable-odccm-support=no ++ ++CONFIGURE_VARS+= \ ++ CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \ ++ CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \ ++ LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \ ++ LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \ ++ ++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/libsynce.so* $(1)/usr/lib/ ++endef ++ ++define Package/libsynce/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsynce.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsynce)) +diff --git a/feeds/packages/libs/libsynce/Makefile b/feeds/packages/libs/libsynce/Makefile +new file mode 100644 +index 0000000..48d5a12 +--- /dev/null ++++ b/feeds/packages/libs/libsynce/Makefile +@@ -0,0 +1,65 @@ ++# ++# 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:=libsynce ++PKG_VERSION:=0.12 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/synce ++PKG_MD5SUM:=fd473d3deceda7912af4427dede1736f ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++define Package/libsynce ++ DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=SynCE library ++ URL:=http://synce.sourceforge.net/ ++endef ++ ++define Package/libsynce/description ++The purpose of the SynCE project is to provide a means of communication with a ++Windows CE or Pocket PC device from a computer running Linux, *BSD or other unices. ++endef ++ ++MAKE_FLAGS += \ ++ OPTIM="$(TARGET_CFLAGS)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++CONFIGURE_ARGS += \ ++ --enable-hal-support=no \ ++ --enable-odccm-support=no ++ ++CONFIGURE_VARS+= \ ++ CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \ ++ CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \ ++ LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \ ++ LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \ ++ ++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/libsynce.so* $(1)/usr/lib/ ++endef ++ ++define Package/libsynce/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsynce.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libsynce)) +diff --git a/feeds/packages/libs/libtasn1/.svn/entries b/feeds/packages/libs/libtasn1/.svn/entries +new file mode 100644 +index 0000000..5b0bccb +--- /dev/null ++++ b/feeds/packages/libs/libtasn1/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtasn1 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d4e292d6b04bed7ace8bf16961a74750 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1893 ++ +diff --git a/feeds/packages/libs/libtasn1/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libtasn1/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d93d84 +--- /dev/null ++++ b/feeds/packages/libs/libtasn1/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2005-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libtasn1/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libtasn1/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..548f6ff +--- /dev/null ++++ b/feeds/packages/libs/libtasn1/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=1.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \ ++ ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \ ++ http://www.mirrors.wiretapped.net/security/network-security/gnutls/libtasn1/ \ ++ ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/libtasn1/ \ ++ http://josefsson.org/gnutls/releases/libtasn1/ ++PKG_MD5SUM:=a733ecdfed3517910e627d24e050979f ++ ++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 ++ URL:=ftp://ftp.gnutls.org/pub/gnutls/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_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(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/ ++ $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libtasn1-config ++ $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libtasn1-config ++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/feeds/packages/libs/libtasn1/Makefile b/feeds/packages/libs/libtasn1/Makefile +new file mode 100644 +index 0000000..548f6ff +--- /dev/null ++++ b/feeds/packages/libs/libtasn1/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=1.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \ ++ ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \ ++ http://www.mirrors.wiretapped.net/security/network-security/gnutls/libtasn1/ \ ++ ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/libtasn1/ \ ++ http://josefsson.org/gnutls/releases/libtasn1/ ++PKG_MD5SUM:=a733ecdfed3517910e627d24e050979f ++ ++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 ++ URL:=ftp://ftp.gnutls.org/pub/gnutls/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_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(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/ ++ $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libtasn1-config ++ $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libtasn1-config ++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/feeds/packages/libs/libtheora/.svn/entries b/feeds/packages/libs/libtheora/.svn/entries +new file mode 100644 +index 0000000..3ed3879 +--- /dev/null ++++ b/feeds/packages/libs/libtheora/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtheora ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:10.712118Z ++34512 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++9f49aed01e4114795d85920e89bffffc ++2012-12-05T17:31:10.712118Z ++34512 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1702 ++ +diff --git a/feeds/packages/libs/libtheora/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libtheora/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c159caa +--- /dev/null ++++ b/feeds/packages/libs/libtheora/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# 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_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/ ++ 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/feeds/packages/libs/libtheora/Makefile b/feeds/packages/libs/libtheora/Makefile +new file mode 100644 +index 0000000..c159caa +--- /dev/null ++++ b/feeds/packages/libs/libtheora/Makefile +@@ -0,0 +1,64 @@ ++# ++# 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_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/ ++ 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/feeds/packages/libs/libtheora/patches/.svn/entries b/feeds/packages/libs/libtheora/patches/.svn/entries +new file mode 100644 +index 0000000..850274e +--- /dev/null ++++ b/feeds/packages/libs/libtheora/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtheora/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:10.712118Z ++34512 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++684906af87b2127639a963e5f72b15a5 ++2012-12-05T17:31:10.712118Z ++34512 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1333 ++ ++002-no_sdl_check.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e3c3ec5962d4703327a569460a09cbc8 ++2012-12-05T17:31:10.712118Z ++34512 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++445 ++ +diff --git a/feeds/packages/libs/libtheora/patches/.svn/text-base/001-no_docs_tests.patch.svn-base b/feeds/packages/libs/libtheora/patches/.svn/text-base/001-no_docs_tests.patch.svn-base +new file mode 100644 +index 0000000..4a45b8b +--- /dev/null ++++ b/feeds/packages/libs/libtheora/patches/.svn/text-base/001-no_docs_tests.patch.svn-base +@@ -0,0 +1,33 @@ ++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/feeds/packages/libs/libtheora/patches/.svn/text-base/002-no_sdl_check.patch.svn-base b/feeds/packages/libs/libtheora/patches/.svn/text-base/002-no_sdl_check.patch.svn-base +new file mode 100644 +index 0000000..a1e7256 +--- /dev/null ++++ b/feeds/packages/libs/libtheora/patches/.svn/text-base/002-no_sdl_check.patch.svn-base +@@ -0,0 +1,14 @@ ++--- 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/feeds/packages/libs/libtheora/patches/001-no_docs_tests.patch b/feeds/packages/libs/libtheora/patches/001-no_docs_tests.patch +new file mode 100644 +index 0000000..4a45b8b +--- /dev/null ++++ b/feeds/packages/libs/libtheora/patches/001-no_docs_tests.patch +@@ -0,0 +1,33 @@ ++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/feeds/packages/libs/libtheora/patches/002-no_sdl_check.patch b/feeds/packages/libs/libtheora/patches/002-no_sdl_check.patch +new file mode 100644 +index 0000000..a1e7256 +--- /dev/null ++++ b/feeds/packages/libs/libtheora/patches/002-no_sdl_check.patch +@@ -0,0 +1,14 @@ ++--- 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/feeds/packages/libs/libtorrent/.svn/entries b/feeds/packages/libs/libtorrent/.svn/entries +new file mode 100644 +index 0000000..72af220 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtorrent ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a1ff215d38126c5a21a2dc9ccbe76e6c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1915 ++ +diff --git a/feeds/packages/libs/libtorrent/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libtorrent/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..fd3736b +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 13 ++svn:copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++K 11 ++svn:licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/libs/libtorrent/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libtorrent/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..42c0ee1 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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:=libtorrent ++PKG_VERSION:=0.12.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads ++PKG_MD5SUM:=037499ed708aaf72988cee60e5a8d96b ++ ++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:=Luka Perkov ++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_CPPFLAGS += -fno-strict-aliasing -fno-inline ++TARGET_LDFLAGS += $(LIBGCC_S) ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --enable-static \ ++ --enable-aligned \ ++ --disable-debug \ ++ --enable-openssl \ ++ ++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/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/feeds/packages/libs/libtorrent/Makefile b/feeds/packages/libs/libtorrent/Makefile +new file mode 100644 +index 0000000..42c0ee1 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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:=libtorrent ++PKG_VERSION:=0.12.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads ++PKG_MD5SUM:=037499ed708aaf72988cee60e5a8d96b ++ ++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:=Luka Perkov ++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_CPPFLAGS += -fno-strict-aliasing -fno-inline ++TARGET_LDFLAGS += $(LIBGCC_S) ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --enable-static \ ++ --enable-aligned \ ++ --disable-debug \ ++ --enable-openssl \ ++ ++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/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/feeds/packages/libs/libtorrent/patches/.svn/entries b/feeds/packages/libs/libtorrent/patches/.svn/entries +new file mode 100644 +index 0000000..fb708bd +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtorrent/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-26T20:54:12.413855Z ++30734 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-fix_cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++22324496dfc68544f4df08bdf1ed4e1e ++2012-02-26T20:54:12.413855Z ++30734 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++942 ++ ++000-upstream-gcc46-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++92d1c39905716ffe5396842a668a4841 ++2012-02-26T20:54:12.413855Z ++30734 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++847 ++ ++120-fix-ipv6_socket_datagram.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++829ef0345eb9065d5c538b8f503f29e7 ++2012-02-26T20:54:12.413855Z ++30734 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1158 ++ +diff --git a/feeds/packages/libs/libtorrent/patches/.svn/text-base/000-upstream-gcc46-fixes.patch.svn-base b/feeds/packages/libs/libtorrent/patches/.svn/text-base/000-upstream-gcc46-fixes.patch.svn-base +new file mode 100644 +index 0000000..d8bea4f +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/.svn/text-base/000-upstream-gcc46-fixes.patch.svn-base +@@ -0,0 +1,31 @@ ++--- a/src/data/memory_chunk.cc +++++ b/src/data/memory_chunk.cc ++@@ -71,7 +71,7 @@ MemoryChunk::MemoryChunk(char* ptr, char ++ if (page_align() >= m_pagesize) ++ throw internal_error("MemoryChunk::MemoryChunk(...) received an page alignment >= page size"); ++ ++- if ((ptrdiff_t)ptr % m_pagesize) +++ if ((std::ptrdiff_t)ptr % m_pagesize) ++ throw internal_error("MemoryChunk::MemoryChunk(...) is not aligned to a page"); ++ } ++ ++--- a/src/torrent/data/block.h +++++ b/src/torrent/data/block.h ++@@ -40,6 +40,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ namespace torrent { ++ ++--- a/src/torrent/data/block_transfer.h +++++ b/src/torrent/data/block_transfer.h ++@@ -39,6 +39,7 @@ ++ ++ #include ++ #include +++#include ++ ++ namespace torrent { ++ +diff --git a/feeds/packages/libs/libtorrent/patches/.svn/text-base/100-fix_cross_compile.patch.svn-base b/feeds/packages/libs/libtorrent/patches/.svn/text-base/100-fix_cross_compile.patch.svn-base +new file mode 100644 +index 0000000..7030718 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/.svn/text-base/100-fix_cross_compile.patch.svn-base +@@ -0,0 +1,31 @@ ++--- 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_LINK_IFELSE( ++ [[#include ++ #include ++ #include ++--- a/scripts/common.m4 +++++ b/scripts/common.m4 ++@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ ++ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ ++ AC_MSG_CHECKING(for execinfo.h) ++ ++- AC_RUN_IFELSE( +++ AC_LINK_IFELSE( ++ [[#include ++ int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} ++ ]], ++@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ ++ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ ++ AC_MSG_CHECKING(the byte alignment) ++ ++- AC_RUN_IFELSE( +++ AC_LINK_IFELSE( ++ [[#include ++ int main() { ++ char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; +diff --git a/feeds/packages/libs/libtorrent/patches/.svn/text-base/120-fix-ipv6_socket_datagram.patch.svn-base b/feeds/packages/libs/libtorrent/patches/.svn/text-base/120-fix-ipv6_socket_datagram.patch.svn-base +new file mode 100644 +index 0000000..1a46627 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/.svn/text-base/120-fix-ipv6_socket_datagram.patch.svn-base +@@ -0,0 +1,26 @@ ++--- 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/feeds/packages/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch b/feeds/packages/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch +new file mode 100644 +index 0000000..d8bea4f +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch +@@ -0,0 +1,31 @@ ++--- a/src/data/memory_chunk.cc +++++ b/src/data/memory_chunk.cc ++@@ -71,7 +71,7 @@ MemoryChunk::MemoryChunk(char* ptr, char ++ if (page_align() >= m_pagesize) ++ throw internal_error("MemoryChunk::MemoryChunk(...) received an page alignment >= page size"); ++ ++- if ((ptrdiff_t)ptr % m_pagesize) +++ if ((std::ptrdiff_t)ptr % m_pagesize) ++ throw internal_error("MemoryChunk::MemoryChunk(...) is not aligned to a page"); ++ } ++ ++--- a/src/torrent/data/block.h +++++ b/src/torrent/data/block.h ++@@ -40,6 +40,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ namespace torrent { ++ ++--- a/src/torrent/data/block_transfer.h +++++ b/src/torrent/data/block_transfer.h ++@@ -39,6 +39,7 @@ ++ ++ #include ++ #include +++#include ++ ++ namespace torrent { ++ +diff --git a/feeds/packages/libs/libtorrent/patches/100-fix_cross_compile.patch b/feeds/packages/libs/libtorrent/patches/100-fix_cross_compile.patch +new file mode 100644 +index 0000000..7030718 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/100-fix_cross_compile.patch +@@ -0,0 +1,31 @@ ++--- 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_LINK_IFELSE( ++ [[#include ++ #include ++ #include ++--- a/scripts/common.m4 +++++ b/scripts/common.m4 ++@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ ++ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ ++ AC_MSG_CHECKING(for execinfo.h) ++ ++- AC_RUN_IFELSE( +++ AC_LINK_IFELSE( ++ [[#include ++ int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} ++ ]], ++@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ ++ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ ++ AC_MSG_CHECKING(the byte alignment) ++ ++- AC_RUN_IFELSE( +++ AC_LINK_IFELSE( ++ [[#include ++ int main() { ++ char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; +diff --git a/feeds/packages/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch b/feeds/packages/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch +new file mode 100644 +index 0000000..1a46627 +--- /dev/null ++++ b/feeds/packages/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch +@@ -0,0 +1,26 @@ ++--- 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/feeds/packages/libs/libtwin/.svn/entries b/feeds/packages/libs/libtwin/.svn/entries +new file mode 100644 +index 0000000..a3e733a +--- /dev/null ++++ b/feeds/packages/libs/libtwin/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtwin ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++46eca163286a99b06256490b7c136942 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1606 ++ +diff --git a/feeds/packages/libs/libtwin/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libtwin/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9e6d1c9 +--- /dev/null ++++ b/feeds/packages/libs/libtwin/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=libtwin ++PKG_VERSION:=0.0.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ozlabs.org/~jk/projects/petitboot/downloads/ ++PKG_MD5SUM:=ebd7c5cca3c9e108208a7bf17b256a6c ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libtwin ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libpng +libjpeg +libfreetype ++ TITLE:=The tiny windowing system library ++ URL:=http://ozlabs.org/~jk/projects/petitboot/ ++ MAINTAINER:=Geoff Levand ++endef ++ ++define Package/libtwin/description ++ Keith Packard's Tiny Windowing System Library ++endef ++ ++CONFIGURE_ARGS += --enable-shared --enable-static --disable-x11 ++ ++ifdef CONFIG_powerpc ++ EXTRA_CFLAGS += -flax-vector-conversions ++endif ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libtwin ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libtwin/*.h \ ++ $(1)/usr/include/libtwin ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libtwin.{la,a,so*} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtwin.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libtwin/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libtwin.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libtwin)) +diff --git a/feeds/packages/libs/libtwin/Makefile b/feeds/packages/libs/libtwin/Makefile +new file mode 100644 +index 0000000..9e6d1c9 +--- /dev/null ++++ b/feeds/packages/libs/libtwin/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=libtwin ++PKG_VERSION:=0.0.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ozlabs.org/~jk/projects/petitboot/downloads/ ++PKG_MD5SUM:=ebd7c5cca3c9e108208a7bf17b256a6c ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libtwin ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libpng +libjpeg +libfreetype ++ TITLE:=The tiny windowing system library ++ URL:=http://ozlabs.org/~jk/projects/petitboot/ ++ MAINTAINER:=Geoff Levand ++endef ++ ++define Package/libtwin/description ++ Keith Packard's Tiny Windowing System Library ++endef ++ ++CONFIGURE_ARGS += --enable-shared --enable-static --disable-x11 ++ ++ifdef CONFIG_powerpc ++ EXTRA_CFLAGS += -flax-vector-conversions ++endif ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libtwin ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/libtwin/*.h \ ++ $(1)/usr/include/libtwin ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libtwin.{la,a,so*} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtwin.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libtwin/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libtwin.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libtwin)) +diff --git a/feeds/packages/libs/libtwin/patches/.svn/entries b/feeds/packages/libs/libtwin/patches/.svn/entries +new file mode 100644 +index 0000000..a00283e +--- /dev/null ++++ b/feeds/packages/libs/libtwin/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libtwin/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-12-22T14:55:24.154125Z ++13717 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++b920d51b395e6aa4db4589451ce84635 ++2008-12-22T14:55:24.154125Z ++13717 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++223 ++ +diff --git a/feeds/packages/libs/libtwin/patches/.svn/text-base/100-compile_fix.patch.svn-base b/feeds/packages/libs/libtwin/patches/.svn/text-base/100-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..dd9f9f8 +--- /dev/null ++++ b/feeds/packages/libs/libtwin/patches/.svn/text-base/100-compile_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/libtwin/twin_feature.c +++++ b/libtwin/twin_feature.c ++@@ -55,7 +55,7 @@ ++ } ++ ++ #else ++-#define _twin_have_altivec() +++#define _twin_have_altivec() 0 ++ #endif /* HAVE_ALTIVEC */ ++ ++ int twin_has_feature(unsigned int feature) +diff --git a/feeds/packages/libs/libtwin/patches/100-compile_fix.patch b/feeds/packages/libs/libtwin/patches/100-compile_fix.patch +new file mode 100644 +index 0000000..dd9f9f8 +--- /dev/null ++++ b/feeds/packages/libs/libtwin/patches/100-compile_fix.patch +@@ -0,0 +1,11 @@ ++--- a/libtwin/twin_feature.c +++++ b/libtwin/twin_feature.c ++@@ -55,7 +55,7 @@ ++ } ++ ++ #else ++-#define _twin_have_altivec() +++#define _twin_have_altivec() 0 ++ #endif /* HAVE_ALTIVEC */ ++ ++ int twin_has_feature(unsigned int feature) +diff --git a/feeds/packages/libs/libugpio/.svn/entries b/feeds/packages/libs/libugpio/.svn/entries +new file mode 100644 +index 0000000..705f709 +--- /dev/null ++++ b/feeds/packages/libs/libugpio/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libugpio ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:36.868336Z ++35269 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5a4470b740e42ff3d1e508d5feba0e53 ++2013-01-21T15:27:36.868336Z ++35269 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1969 ++ +diff --git a/feeds/packages/libs/libugpio/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libugpio/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3aed0d1 +--- /dev/null ++++ b/feeds/packages/libs/libugpio/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,73 @@ ++# ++# Copyright (C) 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:=libugpio ++PKG_VERSION:=0.0.1 ++PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/mhei/libugpio.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=8235d04096bfa9db594d5df75c5cd634a3bbc39a ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=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/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/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/feeds/packages/libs/libugpio/Makefile b/feeds/packages/libs/libugpio/Makefile +new file mode 100644 +index 0000000..3aed0d1 +--- /dev/null ++++ b/feeds/packages/libs/libugpio/Makefile +@@ -0,0 +1,73 @@ ++# ++# Copyright (C) 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:=libugpio ++PKG_VERSION:=0.0.1 ++PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/mhei/libugpio.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=8235d04096bfa9db594d5df75c5cd634a3bbc39a ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=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/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/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/feeds/packages/libs/libupnp/.svn/entries b/feeds/packages/libs/libupnp/.svn/entries +new file mode 100644 +index 0000000..97aef1c +--- /dev/null ++++ b/feeds/packages/libs/libupnp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libupnp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-08T17:41:50.099896Z ++35522 ++yardley ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++e6e303a081bd0e1d9e2252796dc8303b ++2013-02-08T17:41:50.099896Z ++35522 ++yardley ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2051 ++ +diff --git a/feeds/packages/libs/libupnp/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libupnp/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libupnp/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libupnp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libupnp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f76f520 +--- /dev/null ++++ b/feeds/packages/libs/libupnp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=libupnp ++PKG_VERSION:=1.6.18 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/pupnp ++PKG_MD5SUM:=11c6484fd2e2927bf3b8d8108407ca56 ++ ++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/feeds/packages/libs/libupnp/Makefile b/feeds/packages/libs/libupnp/Makefile +new file mode 100644 +index 0000000..f76f520 +--- /dev/null ++++ b/feeds/packages/libs/libupnp/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=libupnp ++PKG_VERSION:=1.6.18 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/pupnp ++PKG_MD5SUM:=11c6484fd2e2927bf3b8d8108407ca56 ++ ++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/feeds/packages/libs/liburcu/.svn/entries b/feeds/packages/libs/liburcu/.svn/entries +new file mode 100644 +index 0000000..42c8de4 +--- /dev/null ++++ b/feeds/packages/libs/liburcu/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/liburcu ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T10:15:37.311187Z ++35163 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++a3eabcef1193eb7d5ffcced7f5a0ca28 ++2013-01-15T10:15:37.311187Z ++35163 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1133 ++ +diff --git a/feeds/packages/libs/liburcu/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/liburcu/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..283a3b3 +--- /dev/null ++++ b/feeds/packages/libs/liburcu/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=liburcu ++PKG_VERSION:=0.7.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://lttng.org/files/urcu/ ++PKG_MD5SUM:=4c1ecb4bdcd43e36dfdffdd297023c8b ++PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION) ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/liburcu ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread ++ TITLE:=User-space Read-Copy-Update library ++ URL:=https://lttng.org/ ++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/feeds/packages/libs/liburcu/Makefile b/feeds/packages/libs/liburcu/Makefile +new file mode 100644 +index 0000000..283a3b3 +--- /dev/null ++++ b/feeds/packages/libs/liburcu/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=liburcu ++PKG_VERSION:=0.7.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://lttng.org/files/urcu/ ++PKG_MD5SUM:=4c1ecb4bdcd43e36dfdffdd297023c8b ++PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION) ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/liburcu ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread ++ TITLE:=User-space Read-Copy-Update library ++ URL:=https://lttng.org/ ++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/feeds/packages/libs/libv4l/.svn/entries b/feeds/packages/libs/libv4l/.svn/entries +new file mode 100644 +index 0000000..bd35b0b +--- /dev/null ++++ b/feeds/packages/libs/libv4l/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libv4l ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-03T21:35:34.785534Z ++32963 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++81d0fe8f81c6d87a1a41f3850fccfc49 ++2012-08-03T21:35:34.785534Z ++32963 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3459 ++ +diff --git a/feeds/packages/libs/libv4l/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libv4l/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ec4f7d +--- /dev/null ++++ b/feeds/packages/libs/libv4l/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,113 @@ ++# ++# Copyright (C) 2009-2012 OpenWrt.org ++# Copyright (C) 2009 David Cooper ++# ++# 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:=0.8.6 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.linuxtv.org/downloads/v4l-utils ++PKG_MD5SUM:=80062780ae90e5955473b09b31e9828a ++ ++PKG_BUILD_DEPENDS:=argp-standalone ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.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 ++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) ++endef ++ ++define Package/v4l-utils/description ++ $(call Package/libv4l/Default/description) ++ This package contains the video4linux utilities. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \ ++ DISABLE_LIBJPEG="1" \ ++ $(CONFIGURE_VARS) \ ++ all install ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \ ++ DISABLE_LIBJPEG="1" \ ++ $(CONFIGURE_VARS) \ ++ LINKTYPE="static" \ ++ all install ++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/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/feeds/packages/libs/libv4l/Makefile b/feeds/packages/libs/libv4l/Makefile +new file mode 100644 +index 0000000..8ec4f7d +--- /dev/null ++++ b/feeds/packages/libs/libv4l/Makefile +@@ -0,0 +1,113 @@ ++# ++# Copyright (C) 2009-2012 OpenWrt.org ++# Copyright (C) 2009 David Cooper ++# ++# 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:=0.8.6 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.linuxtv.org/downloads/v4l-utils ++PKG_MD5SUM:=80062780ae90e5955473b09b31e9828a ++ ++PKG_BUILD_DEPENDS:=argp-standalone ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.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 ++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) ++endef ++ ++define Package/v4l-utils/description ++ $(call Package/libv4l/Default/description) ++ This package contains the video4linux utilities. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \ ++ DISABLE_LIBJPEG="1" \ ++ $(CONFIGURE_VARS) \ ++ all install ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" PREFIX="/usr" \ ++ DISABLE_LIBJPEG="1" \ ++ $(CONFIGURE_VARS) \ ++ LINKTYPE="static" \ ++ all install ++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/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/feeds/packages/libs/libv4l/patches/.svn/entries b/feeds/packages/libs/libv4l/patches/.svn/entries +new file mode 100644 +index 0000000..24c56aa +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libv4l/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-12T21:21:02.602780Z ++30914 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-allow-disabling-libjpeg.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++db7a585bc0095ee08c64340529241159 ++2012-02-27T04:27:28.884900Z ++30735 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4940 ++ ++001-no-shm_open-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++80cecad701ac922652a776ca1b09f2e4 ++2012-02-27T04:27:28.884900Z ++30735 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2293 ++ ++003-add-missing-libs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++91848bb18d84275b44d9f6b776681b16 ++2012-02-27T04:27:28.884900Z ++30735 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2042 ++ ++004-disable-qv4l2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++a5c3154f56fa8c7cb37e1a6e7e80fe3a ++2012-03-12T21:21:02.602780Z ++30914 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++631 ++ +diff --git a/feeds/packages/libs/libv4l/patches/.svn/text-base/001-no-shm_open-fix.patch.svn-base b/feeds/packages/libs/libv4l/patches/.svn/text-base/001-no-shm_open-fix.patch.svn-base +new file mode 100644 +index 0000000..89d8791 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/.svn/text-base/001-no-shm_open-fix.patch.svn-base +@@ -0,0 +1,57 @@ ++--- a/lib/libv4lconvert/control/libv4lcontrol.c +++++ b/lib/libv4lconvert/control/libv4lcontrol.c ++@@ -525,7 +525,7 @@ static void v4lcontrol_get_flags_from_db ++ ++ struct v4lcontrol_data *v4lcontrol_create(int fd, 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; ++@@ -638,33 +638,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/feeds/packages/libs/libv4l/patches/.svn/text-base/002-allow-disabling-libjpeg.patch.svn-base b/feeds/packages/libs/libv4l/patches/.svn/text-base/002-allow-disabling-libjpeg.patch.svn-base +new file mode 100644 +index 0000000..ad306d4 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/.svn/text-base/002-allow-disabling-libjpeg.patch.svn-base +@@ -0,0 +1,160 @@ ++--- a/lib/libv4lconvert/Makefile +++++ b/lib/libv4lconvert/Makefile ++@@ -1,6 +1,6 @@ ++ override CPPFLAGS += -I../include -fvisibility=hidden ++ ++-LIBS_libv4lconvert = -lrt -lm -ljpeg +++LIBS_libv4lconvert = -lrt -lm ++ ++ ifeq ($(LINKTYPE),static) ++ CONVERT_LIB = libv4lconvert.a ++@@ -10,16 +10,22 @@ override CPPFLAGS += -fPIC ++ endif ++ ++ CONVERT_OBJS = libv4lconvert.o tinyjpeg.o sn9c10x.o sn9c20x.o pac207.o \ ++- jl2005bcd.o \ ++ mr97310a.o flip.o crop.o jidctflt.o spca561-decompress.o \ ++ rgbyuv.o sn9c2028-decomp.o spca501.o sq905c.o bayer.o hm12.o \ ++- stv0680.o cpia1.o se401.o jpgl.o jpeg.o jpeg_memsrcdest.o \ +++ stv0680.o cpia1.o se401.o jpgl.o jpeg.o \ ++ control/libv4lcontrol.o processing/libv4lprocessing.o \ ++ processing/whitebalance.o processing/autogain.o \ ++ processing/gamma.o helper.o ++ TARGETS = $(CONVERT_LIB) libv4lconvert.pc ov511-decomp ov518-decomp ++ INCLUDES = ../include/libv4lconvert.h ++ +++ifeq ($(DISABLE_LIBJPEG),1) +++override CFLAGS += -DDISABLE_LIBJPEG +++else +++LIBS_libv4lconvert += -ljpeg +++CONVERT_OBJS += jl2005bcd.o jpeg_memsrcdest.o +++endif +++ ++ override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)\" -DLIBSUBDIR=\"$(LIBSUBDIR)\" ++ ++ all: $(TARGETS) ++--- a/lib/libv4lconvert/jpeg.c +++++ b/lib/libv4lconvert/jpeg.c ++@@ -19,7 +19,9 @@ ++ #include ++ #include ++ #include "libv4lconvert-priv.h" +++#ifndef DISABLE_LIBJPEG ++ #include "jpeg_memsrcdest.h" +++#endif ++ ++ int v4lconvert_decode_jpeg_tinyjpeg(struct v4lconvert_data *data, ++ unsigned char *src, int src_size, unsigned char *dest, ++@@ -107,6 +109,8 @@ int v4lconvert_decode_jpeg_tinyjpeg(stru ++ return 0; ++ } ++ +++#ifndef DISABLE_LIBJPEG +++ ++ static void jerr_error_exit(j_common_ptr cinfo) ++ { ++ struct v4lconvert_data *data = cinfo->client_data; ++@@ -405,3 +409,6 @@ int v4lconvert_decode_jpeg_libjpeg(struc ++ ++ return result; ++ } +++ +++#endif +++ ++--- a/lib/libv4lconvert/libv4lconvert-priv.h +++++ b/lib/libv4lconvert/libv4lconvert-priv.h ++@@ -22,7 +22,9 @@ ++ #include ++ #include ++ #include +++#ifndef DISABLE_LIBJPEG ++ #include +++#endif ++ #include ++ #include "libv4lconvert.h" ++ #include "control/libv4lcontrol.h" ++@@ -50,11 +52,13 @@ struct v4lconvert_data { ++ int64_t supported_src_formats; /* bitfield */ ++ char error_msg[V4LCONVERT_ERROR_MSG_SIZE]; ++ struct jdec_private *tinyjpeg; +++#ifndef DISABLE_LIBJPEG ++ struct jpeg_error_mgr jerr; ++ int jerr_errno; ++ jmp_buf jerr_jmp_state; ++ struct jpeg_decompress_struct cinfo; ++ int cinfo_initialized; +++#endif ++ struct v4l2_frmsizeenum framesizes[V4LCONVERT_MAX_FRAMESIZES]; ++ unsigned int no_framesizes; ++ int bandwidth; ++--- a/lib/libv4lconvert/libv4lconvert.c +++++ b/lib/libv4lconvert/libv4lconvert.c ++@@ -78,7 +78,9 @@ static const struct v4lconvert_pixfmt su ++ { V4L2_PIX_FMT_SN9C2028, 0, 9, 9, 1 }, ++ { V4L2_PIX_FMT_PAC207, 0, 9, 9, 1 }, ++ { V4L2_PIX_FMT_MR97310A, 0, 9, 9, 1 }, +++#ifndef DISABLE_LIBJPEG ++ { V4L2_PIX_FMT_JL2005BCD, 0, 9, 9, 1 }, +++#endif ++ { V4L2_PIX_FMT_SQ905C, 0, 9, 9, 1 }, ++ /* special */ ++ { V4L2_PIX_FMT_SE401, 0, 8, 9, 1 }, ++@@ -186,8 +188,10 @@ void v4lconvert_destroy(struct v4lconver ++ tinyjpeg_set_components(data->tinyjpeg, comps, 3); ++ tinyjpeg_free(data->tinyjpeg); ++ } +++#ifndef DISABLE_LIBJPEG ++ if (data->cinfo_initialized) ++ jpeg_destroy_decompress(&data->cinfo); +++#endif ++ v4lconvert_helper_cleanup(data); ++ free(data->convert1_buf); ++ free(data->convert2_buf); ++@@ -634,10 +638,13 @@ static int v4lconvert_convert_pixfmt(str ++ /* JPG and variants */ ++ case V4L2_PIX_FMT_MJPEG: ++ case V4L2_PIX_FMT_JPEG: +++#ifndef DISABLE_LIBJPEG ++ if (data->flags & V4LCONVERT_USE_TINYJPEG) { +++#endif ++ result = v4lconvert_decode_jpeg_tinyjpeg(data, ++ src, src_size, dest, ++ fmt, dest_pix_fmt, 0); +++#ifndef DISABLE_LIBJPEG ++ } else { ++ result = v4lconvert_decode_jpeg_libjpeg(data, ++ src, src_size, dest, ++@@ -652,6 +659,7 @@ static int v4lconvert_convert_pixfmt(str ++ fmt, dest_pix_fmt, 0); ++ } ++ } +++#endif ++ break; ++ case V4L2_PIX_FMT_PJPG: ++ result = v4lconvert_decode_jpeg_tinyjpeg(data, src, src_size, ++@@ -777,7 +785,9 @@ static int v4lconvert_convert_pixfmt(str ++ case V4L2_PIX_FMT_SN9C10X: ++ case V4L2_PIX_FMT_PAC207: ++ case V4L2_PIX_FMT_MR97310A: +++#ifndef DISABLE_LIBJPEG ++ case V4L2_PIX_FMT_JL2005BCD: +++#endif ++ case V4L2_PIX_FMT_SN9C2028: ++ case V4L2_PIX_FMT_SQ905C: ++ case V4L2_PIX_FMT_STV0680: { /* Not compressed but needs some shuffling */ ++@@ -816,6 +826,7 @@ static int v4lconvert_convert_pixfmt(str ++ } ++ tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8; ++ break; +++#ifndef DISABLE_LIBJPEG ++ case V4L2_PIX_FMT_JL2005BCD: ++ if (v4lconvert_decode_jl2005bcd(data, src, src_size, ++ tmpbuf, ++@@ -826,6 +837,7 @@ static int v4lconvert_convert_pixfmt(str ++ } ++ tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SRGGB8; ++ break; +++#endif ++ case V4L2_PIX_FMT_SN9C2028: ++ v4lconvert_decode_sn9c2028(src, tmpbuf, width, height); ++ tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8; +diff --git a/feeds/packages/libs/libv4l/patches/.svn/text-base/003-add-missing-libs.patch.svn-base b/feeds/packages/libs/libv4l/patches/.svn/text-base/003-add-missing-libs.patch.svn-base +new file mode 100644 +index 0000000..e55bc53 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/.svn/text-base/003-add-missing-libs.patch.svn-base +@@ -0,0 +1,66 @@ ++--- a/contrib/test/Makefile +++++ b/contrib/test/Makefile ++@@ -28,7 +28,7 @@ pixfmt-test: pixfmt-test.o ++ $(CC) $(LDFLAGS) -o $@ $^ -lX11 ++ ++ v4l2grab: v4l2grab.o ../../lib/libv4l2/libv4l2.so ++- $(CC) $(LDFLAGS) -o $@ $^ -L../../lib/libv4l2 -L../../lib/libv4lconvert -lv4l2 -lv4lconvert +++ $(CC) $(LDFLAGS) -o $@ $^ -L../../lib/libv4l2 -L../../lib/libv4lconvert -lv4l2 -lv4lconvert -largp ++ ++ ioctl-test: ioctl-test.o ++ $(CC) $(LDFLAGS) -o $@ $^ ++--- a/utils/decode_tm6000/Makefile +++++ b/utils/decode_tm6000/Makefile ++@@ -5,7 +5,7 @@ all: $(TARGETS) ++ -include *.d ++ ++ decode_tm6000: decode_tm6000.o ../libv4l2util/libv4l2util.a ++- $(CC) $(LDFLAGS) -o $@ $^ +++ $(CC) $(LDFLAGS) -o $@ $^ -largp ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++--- a/utils/keytable/Makefile +++++ b/utils/keytable/Makefile ++@@ -5,7 +5,7 @@ all: $(TARGETS) ++ -include *.d ++ ++ ir-keytable: keytable.o ++- $(CC) $(LDFLAGS) -o $@ $^ +++ $(CC) $(LDFLAGS) -o $@ $^ -largp ++ ++ keytable.o: keytable.c parse.h ++ ++--- a/utils/v4l2-compliance/Makefile +++++ b/utils/v4l2-compliance/Makefile ++@@ -6,7 +6,7 @@ all: $(TARGETS) ++ ++ v4l2-compliance: v4l2-compliance.o v4l2-test-debug.o v4l2-test-input-output.o \ ++ v4l2-test-controls.o v4l2-test-io-config.o v4l2-test-formats.o ++- $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt +++ $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt -lpthread ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++--- a/utils/v4l2-ctl/Makefile +++++ b/utils/v4l2-ctl/Makefile ++@@ -13,7 +13,7 @@ ivtv-ctl: ivtv-ctl.o ++ $(CC) $(LDFLAGS) -o $@ $^ -lm ++ ++ v4l2-ctl: v4l2-ctl.o ++- $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt +++ $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt -lpthread ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++--- a/utils/v4l2-sysfs-path/Makefile +++++ b/utils/v4l2-sysfs-path/Makefile ++@@ -5,7 +5,7 @@ all: $(TARGETS) ++ -include *.d ++ ++ v4l2-sysfs-path: v4l2-sysfs-path.o ../libmedia_dev/libmedia_dev.a ++- $(CC) $(LDFLAGS) -o $@ $^ +++ $(CC) $(LDFLAGS) -o $@ $^ -largp ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin +diff --git a/feeds/packages/libs/libv4l/patches/.svn/text-base/004-disable-qv4l2.patch.svn-base b/feeds/packages/libs/libv4l/patches/.svn/text-base/004-disable-qv4l2.patch.svn-base +new file mode 100644 +index 0000000..f494643 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/.svn/text-base/004-disable-qv4l2.patch.svn-base +@@ -0,0 +1,24 @@ ++--- a/utils/Makefile +++++ b/utils/Makefile ++@@ -5,21 +5,6 @@ all install: ++ $(MAKE) -C $$i $@ || exit 1; \ ++ done ++ ++- # Test whether qmake is installed, and whether it is for qt4. ++- @if which qmake-qt4 >/dev/null 2>&1; then \ ++- QMAKE=qmake-qt4; \ ++- else \ ++- QMAKE=qmake; \ ++- fi; \ ++- if which $$QMAKE >/dev/null 2>&1; then \ ++- if $$QMAKE --version 2>&1 | grep '4\.[0-9][0-9]*\.[0-9][0-9]*' >/dev/null; then \ ++- if [ ! -f qv4l2/Makefile ]; then \ ++- (cd qv4l2 && $$QMAKE) || exit 1; \ ++- fi; \ ++- $(MAKE) -C qv4l2 -f Makefile.install $@; \ ++- fi \ ++- fi ++- ++ sync-with-kernel: ++ $(MAKE) -C keytable $@ ++ $(MAKE) -C v4l2-dbg $@ +diff --git a/feeds/packages/libs/libv4l/patches/001-no-shm_open-fix.patch b/feeds/packages/libs/libv4l/patches/001-no-shm_open-fix.patch +new file mode 100644 +index 0000000..89d8791 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/001-no-shm_open-fix.patch +@@ -0,0 +1,57 @@ ++--- a/lib/libv4lconvert/control/libv4lcontrol.c +++++ b/lib/libv4lconvert/control/libv4lcontrol.c ++@@ -525,7 +525,7 @@ static void v4lcontrol_get_flags_from_db ++ ++ struct v4lcontrol_data *v4lcontrol_create(int fd, 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; ++@@ -638,33 +638,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/feeds/packages/libs/libv4l/patches/002-allow-disabling-libjpeg.patch b/feeds/packages/libs/libv4l/patches/002-allow-disabling-libjpeg.patch +new file mode 100644 +index 0000000..ad306d4 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/002-allow-disabling-libjpeg.patch +@@ -0,0 +1,160 @@ ++--- a/lib/libv4lconvert/Makefile +++++ b/lib/libv4lconvert/Makefile ++@@ -1,6 +1,6 @@ ++ override CPPFLAGS += -I../include -fvisibility=hidden ++ ++-LIBS_libv4lconvert = -lrt -lm -ljpeg +++LIBS_libv4lconvert = -lrt -lm ++ ++ ifeq ($(LINKTYPE),static) ++ CONVERT_LIB = libv4lconvert.a ++@@ -10,16 +10,22 @@ override CPPFLAGS += -fPIC ++ endif ++ ++ CONVERT_OBJS = libv4lconvert.o tinyjpeg.o sn9c10x.o sn9c20x.o pac207.o \ ++- jl2005bcd.o \ ++ mr97310a.o flip.o crop.o jidctflt.o spca561-decompress.o \ ++ rgbyuv.o sn9c2028-decomp.o spca501.o sq905c.o bayer.o hm12.o \ ++- stv0680.o cpia1.o se401.o jpgl.o jpeg.o jpeg_memsrcdest.o \ +++ stv0680.o cpia1.o se401.o jpgl.o jpeg.o \ ++ control/libv4lcontrol.o processing/libv4lprocessing.o \ ++ processing/whitebalance.o processing/autogain.o \ ++ processing/gamma.o helper.o ++ TARGETS = $(CONVERT_LIB) libv4lconvert.pc ov511-decomp ov518-decomp ++ INCLUDES = ../include/libv4lconvert.h ++ +++ifeq ($(DISABLE_LIBJPEG),1) +++override CFLAGS += -DDISABLE_LIBJPEG +++else +++LIBS_libv4lconvert += -ljpeg +++CONVERT_OBJS += jl2005bcd.o jpeg_memsrcdest.o +++endif +++ ++ override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)\" -DLIBSUBDIR=\"$(LIBSUBDIR)\" ++ ++ all: $(TARGETS) ++--- a/lib/libv4lconvert/jpeg.c +++++ b/lib/libv4lconvert/jpeg.c ++@@ -19,7 +19,9 @@ ++ #include ++ #include ++ #include "libv4lconvert-priv.h" +++#ifndef DISABLE_LIBJPEG ++ #include "jpeg_memsrcdest.h" +++#endif ++ ++ int v4lconvert_decode_jpeg_tinyjpeg(struct v4lconvert_data *data, ++ unsigned char *src, int src_size, unsigned char *dest, ++@@ -107,6 +109,8 @@ int v4lconvert_decode_jpeg_tinyjpeg(stru ++ return 0; ++ } ++ +++#ifndef DISABLE_LIBJPEG +++ ++ static void jerr_error_exit(j_common_ptr cinfo) ++ { ++ struct v4lconvert_data *data = cinfo->client_data; ++@@ -405,3 +409,6 @@ int v4lconvert_decode_jpeg_libjpeg(struc ++ ++ return result; ++ } +++ +++#endif +++ ++--- a/lib/libv4lconvert/libv4lconvert-priv.h +++++ b/lib/libv4lconvert/libv4lconvert-priv.h ++@@ -22,7 +22,9 @@ ++ #include ++ #include ++ #include +++#ifndef DISABLE_LIBJPEG ++ #include +++#endif ++ #include ++ #include "libv4lconvert.h" ++ #include "control/libv4lcontrol.h" ++@@ -50,11 +52,13 @@ struct v4lconvert_data { ++ int64_t supported_src_formats; /* bitfield */ ++ char error_msg[V4LCONVERT_ERROR_MSG_SIZE]; ++ struct jdec_private *tinyjpeg; +++#ifndef DISABLE_LIBJPEG ++ struct jpeg_error_mgr jerr; ++ int jerr_errno; ++ jmp_buf jerr_jmp_state; ++ struct jpeg_decompress_struct cinfo; ++ int cinfo_initialized; +++#endif ++ struct v4l2_frmsizeenum framesizes[V4LCONVERT_MAX_FRAMESIZES]; ++ unsigned int no_framesizes; ++ int bandwidth; ++--- a/lib/libv4lconvert/libv4lconvert.c +++++ b/lib/libv4lconvert/libv4lconvert.c ++@@ -78,7 +78,9 @@ static const struct v4lconvert_pixfmt su ++ { V4L2_PIX_FMT_SN9C2028, 0, 9, 9, 1 }, ++ { V4L2_PIX_FMT_PAC207, 0, 9, 9, 1 }, ++ { V4L2_PIX_FMT_MR97310A, 0, 9, 9, 1 }, +++#ifndef DISABLE_LIBJPEG ++ { V4L2_PIX_FMT_JL2005BCD, 0, 9, 9, 1 }, +++#endif ++ { V4L2_PIX_FMT_SQ905C, 0, 9, 9, 1 }, ++ /* special */ ++ { V4L2_PIX_FMT_SE401, 0, 8, 9, 1 }, ++@@ -186,8 +188,10 @@ void v4lconvert_destroy(struct v4lconver ++ tinyjpeg_set_components(data->tinyjpeg, comps, 3); ++ tinyjpeg_free(data->tinyjpeg); ++ } +++#ifndef DISABLE_LIBJPEG ++ if (data->cinfo_initialized) ++ jpeg_destroy_decompress(&data->cinfo); +++#endif ++ v4lconvert_helper_cleanup(data); ++ free(data->convert1_buf); ++ free(data->convert2_buf); ++@@ -634,10 +638,13 @@ static int v4lconvert_convert_pixfmt(str ++ /* JPG and variants */ ++ case V4L2_PIX_FMT_MJPEG: ++ case V4L2_PIX_FMT_JPEG: +++#ifndef DISABLE_LIBJPEG ++ if (data->flags & V4LCONVERT_USE_TINYJPEG) { +++#endif ++ result = v4lconvert_decode_jpeg_tinyjpeg(data, ++ src, src_size, dest, ++ fmt, dest_pix_fmt, 0); +++#ifndef DISABLE_LIBJPEG ++ } else { ++ result = v4lconvert_decode_jpeg_libjpeg(data, ++ src, src_size, dest, ++@@ -652,6 +659,7 @@ static int v4lconvert_convert_pixfmt(str ++ fmt, dest_pix_fmt, 0); ++ } ++ } +++#endif ++ break; ++ case V4L2_PIX_FMT_PJPG: ++ result = v4lconvert_decode_jpeg_tinyjpeg(data, src, src_size, ++@@ -777,7 +785,9 @@ static int v4lconvert_convert_pixfmt(str ++ case V4L2_PIX_FMT_SN9C10X: ++ case V4L2_PIX_FMT_PAC207: ++ case V4L2_PIX_FMT_MR97310A: +++#ifndef DISABLE_LIBJPEG ++ case V4L2_PIX_FMT_JL2005BCD: +++#endif ++ case V4L2_PIX_FMT_SN9C2028: ++ case V4L2_PIX_FMT_SQ905C: ++ case V4L2_PIX_FMT_STV0680: { /* Not compressed but needs some shuffling */ ++@@ -816,6 +826,7 @@ static int v4lconvert_convert_pixfmt(str ++ } ++ tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8; ++ break; +++#ifndef DISABLE_LIBJPEG ++ case V4L2_PIX_FMT_JL2005BCD: ++ if (v4lconvert_decode_jl2005bcd(data, src, src_size, ++ tmpbuf, ++@@ -826,6 +837,7 @@ static int v4lconvert_convert_pixfmt(str ++ } ++ tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SRGGB8; ++ break; +++#endif ++ case V4L2_PIX_FMT_SN9C2028: ++ v4lconvert_decode_sn9c2028(src, tmpbuf, width, height); ++ tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8; +diff --git a/feeds/packages/libs/libv4l/patches/003-add-missing-libs.patch b/feeds/packages/libs/libv4l/patches/003-add-missing-libs.patch +new file mode 100644 +index 0000000..e55bc53 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/003-add-missing-libs.patch +@@ -0,0 +1,66 @@ ++--- a/contrib/test/Makefile +++++ b/contrib/test/Makefile ++@@ -28,7 +28,7 @@ pixfmt-test: pixfmt-test.o ++ $(CC) $(LDFLAGS) -o $@ $^ -lX11 ++ ++ v4l2grab: v4l2grab.o ../../lib/libv4l2/libv4l2.so ++- $(CC) $(LDFLAGS) -o $@ $^ -L../../lib/libv4l2 -L../../lib/libv4lconvert -lv4l2 -lv4lconvert +++ $(CC) $(LDFLAGS) -o $@ $^ -L../../lib/libv4l2 -L../../lib/libv4lconvert -lv4l2 -lv4lconvert -largp ++ ++ ioctl-test: ioctl-test.o ++ $(CC) $(LDFLAGS) -o $@ $^ ++--- a/utils/decode_tm6000/Makefile +++++ b/utils/decode_tm6000/Makefile ++@@ -5,7 +5,7 @@ all: $(TARGETS) ++ -include *.d ++ ++ decode_tm6000: decode_tm6000.o ../libv4l2util/libv4l2util.a ++- $(CC) $(LDFLAGS) -o $@ $^ +++ $(CC) $(LDFLAGS) -o $@ $^ -largp ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++--- a/utils/keytable/Makefile +++++ b/utils/keytable/Makefile ++@@ -5,7 +5,7 @@ all: $(TARGETS) ++ -include *.d ++ ++ ir-keytable: keytable.o ++- $(CC) $(LDFLAGS) -o $@ $^ +++ $(CC) $(LDFLAGS) -o $@ $^ -largp ++ ++ keytable.o: keytable.c parse.h ++ ++--- a/utils/v4l2-compliance/Makefile +++++ b/utils/v4l2-compliance/Makefile ++@@ -6,7 +6,7 @@ all: $(TARGETS) ++ ++ v4l2-compliance: v4l2-compliance.o v4l2-test-debug.o v4l2-test-input-output.o \ ++ v4l2-test-controls.o v4l2-test-io-config.o v4l2-test-formats.o ++- $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt +++ $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt -lpthread ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++--- a/utils/v4l2-ctl/Makefile +++++ b/utils/v4l2-ctl/Makefile ++@@ -13,7 +13,7 @@ ivtv-ctl: ivtv-ctl.o ++ $(CC) $(LDFLAGS) -o $@ $^ -lm ++ ++ v4l2-ctl: v4l2-ctl.o ++- $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt +++ $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt -lpthread ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++--- a/utils/v4l2-sysfs-path/Makefile +++++ b/utils/v4l2-sysfs-path/Makefile ++@@ -5,7 +5,7 @@ all: $(TARGETS) ++ -include *.d ++ ++ v4l2-sysfs-path: v4l2-sysfs-path.o ../libmedia_dev/libmedia_dev.a ++- $(CC) $(LDFLAGS) -o $@ $^ +++ $(CC) $(LDFLAGS) -o $@ $^ -largp ++ ++ install: $(TARGETS) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin +diff --git a/feeds/packages/libs/libv4l/patches/004-disable-qv4l2.patch b/feeds/packages/libs/libv4l/patches/004-disable-qv4l2.patch +new file mode 100644 +index 0000000..f494643 +--- /dev/null ++++ b/feeds/packages/libs/libv4l/patches/004-disable-qv4l2.patch +@@ -0,0 +1,24 @@ ++--- a/utils/Makefile +++++ b/utils/Makefile ++@@ -5,21 +5,6 @@ all install: ++ $(MAKE) -C $$i $@ || exit 1; \ ++ done ++ ++- # Test whether qmake is installed, and whether it is for qt4. ++- @if which qmake-qt4 >/dev/null 2>&1; then \ ++- QMAKE=qmake-qt4; \ ++- else \ ++- QMAKE=qmake; \ ++- fi; \ ++- if which $$QMAKE >/dev/null 2>&1; then \ ++- if $$QMAKE --version 2>&1 | grep '4\.[0-9][0-9]*\.[0-9][0-9]*' >/dev/null; then \ ++- if [ ! -f qv4l2/Makefile ]; then \ ++- (cd qv4l2 && $$QMAKE) || exit 1; \ ++- fi; \ ++- $(MAKE) -C qv4l2 -f Makefile.install $@; \ ++- fi \ ++- fi ++- ++ sync-with-kernel: ++ $(MAKE) -C keytable $@ ++ $(MAKE) -C v4l2-dbg $@ +diff --git a/feeds/packages/libs/libvncserver/.svn/entries b/feeds/packages/libs/libvncserver/.svn/entries +new file mode 100644 +index 0000000..c9f7075 +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libvncserver ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:27.655755Z ++32318 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++768c80954f4b89981a131f2e952811a3 ++2012-06-13T00:22:27.655755Z ++32318 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1358 ++ +diff --git a/feeds/packages/libs/libvncserver/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libvncserver/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fedd59f +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=LibVNCServer ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libvncserver ++PKG_MD5SUM:=14af5bdae461df4666c18e5f83c150c4 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libvncserver ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libjpeg +libpthread $(ICONV_DEPENDS) ++ TITLE:=VNC Server Library ++ URL:=http://libvncserver.sourceforge.net/ ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-xkeyboard \ ++ --without-xinerama \ ++ --without-xrandr \ ++ --without-xfixes \ ++ --without-xdamage \ ++ --without-xtrap \ ++ --without-xrecord \ ++ --without-fbpm \ ++ --without-dpms \ ++ --without-filetransfer \ ++ --without-macosx-native \ ++ --without-ssl \ ++ --without-avahi ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{lib,include,bin} ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ ++endef ++ ++define Package/libvncserver/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libvncserver)) +diff --git a/feeds/packages/libs/libvncserver/Makefile b/feeds/packages/libs/libvncserver/Makefile +new file mode 100644 +index 0000000..fedd59f +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=LibVNCServer ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libvncserver ++PKG_MD5SUM:=14af5bdae461df4666c18e5f83c150c4 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libvncserver ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libjpeg +libpthread $(ICONV_DEPENDS) ++ TITLE:=VNC Server Library ++ URL:=http://libvncserver.sourceforge.net/ ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-xkeyboard \ ++ --without-xinerama \ ++ --without-xrandr \ ++ --without-xfixes \ ++ --without-xdamage \ ++ --without-xtrap \ ++ --without-xrecord \ ++ --without-fbpm \ ++ --without-dpms \ ++ --without-filetransfer \ ++ --without-macosx-native \ ++ --without-ssl \ ++ --without-avahi ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{lib,include,bin} ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ ++endef ++ ++define Package/libvncserver/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libvncserver)) +diff --git a/feeds/packages/libs/libvncserver/patches/.svn/entries b/feeds/packages/libs/libvncserver/patches/.svn/entries +new file mode 100644 +index 0000000..652f521 +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libvncserver/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-13T02:22:14.405624Z ++24537 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++50b997aa637debb749dcc5be92888e2f ++2010-12-13T02:22:14.405624Z ++24537 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++237786 ++ ++100-noexamples.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++632f3d6d7039cc7415c39bc3f75d7d1a ++2010-12-13T02:22:14.405624Z ++24537 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1335 ++ +diff --git a/feeds/packages/libs/libvncserver/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libvncserver/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..eb8de73 +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,6426 @@ ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -601,6401 +601,3 @@ AS_VAR_POPDEF([_PKG])dnl ++ AS_VAR_POPDEF([_DEF])dnl ++ AS_VAR_POPDEF([_OUT])dnl ++ ],[PACKAGE="$PACKAGE"])]) ++- ++-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ++-## Free Software Foundation, Inc. ++-## Originally by Gordon Matzigkeit , 1996 ++-## ++-## This file is free software; the Free Software Foundation gives ++-## unlimited permission to copy and/or distribute it, with or without ++-## modifications, as long as this notice is preserved. ++- ++-# serial 48 AC_PROG_LIBTOOL ++- ++- ++-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++-# ----------------------------------------------------------- ++-# If this macro is not defined by Autoconf, define it here. ++-m4_ifdef([AC_PROVIDE_IFELSE], ++- [], ++- [m4_define([AC_PROVIDE_IFELSE], ++- [m4_ifdef([AC_PROVIDE_$1], ++- [$2], [$3])])]) ++- ++- ++-# AC_PROG_LIBTOOL ++-# --------------- ++-AC_DEFUN([AC_PROG_LIBTOOL], ++-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++- AC_PROVIDE_IFELSE([AC_PROG_CXX], ++- [AC_LIBTOOL_CXX], ++- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++- ])]) ++-dnl And a similar setup for Fortran 77 support ++- AC_PROVIDE_IFELSE([AC_PROG_F77], ++- [AC_LIBTOOL_F77], ++- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++-])]) ++- ++-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++- AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++- [AC_LIBTOOL_GCJ], ++- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++- [AC_LIBTOOL_GCJ], ++- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++- [AC_LIBTOOL_GCJ], ++- [ifdef([AC_PROG_GCJ], ++- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++- ifdef([A][M_PROG_GCJ], ++- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++- ifdef([LT_AC_PROG_GCJ], ++- [define([LT_AC_PROG_GCJ], ++- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++-])])# AC_PROG_LIBTOOL ++- ++- ++-# _AC_PROG_LIBTOOL ++-# ---------------- ++-AC_DEFUN([_AC_PROG_LIBTOOL], ++-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++- ++-# This can be used to rebuild libtool when needed ++-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++- ++-# Always use our own libtool. ++-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++-AC_SUBST(LIBTOOL)dnl ++- ++-# Prevent multiple expansion ++-define([AC_PROG_LIBTOOL], []) ++-])# _AC_PROG_LIBTOOL ++- ++- ++-# AC_LIBTOOL_SETUP ++-# ---------------- ++-AC_DEFUN([AC_LIBTOOL_SETUP], ++-[AC_PREREQ(2.50)dnl ++-AC_REQUIRE([AC_ENABLE_SHARED])dnl ++-AC_REQUIRE([AC_ENABLE_STATIC])dnl ++-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([AC_PROG_LD])dnl ++-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++-AC_REQUIRE([AC_PROG_NM])dnl ++- ++-AC_REQUIRE([AC_PROG_LN_S])dnl ++-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++-AC_REQUIRE([AC_OBJEXT])dnl ++-AC_REQUIRE([AC_EXEEXT])dnl ++-dnl ++- ++-AC_LIBTOOL_SYS_MAX_CMD_LEN ++-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++-AC_LIBTOOL_OBJDIR ++- ++-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++-_LT_AC_PROG_ECHO_BACKSLASH ++- ++-case $host_os in ++-aix3*) ++- # AIX sometimes has problems with the GCC collect2 program. For some ++- # reason, if we set the COLLECT_NAMES environment variable, the problems ++- # vanish in a puff of smoke. ++- if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++- fi ++- ;; ++-esac ++- ++-# Sed substitution that helps us do robust quoting. It backslashifies ++-# metacharacters that are still active within double-quoted strings. ++-Xsed='sed -e 1s/^X//' ++-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++- ++-# Same as above, but do not quote variable references. ++-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++- ++-# Sed substitution to delay expansion of an escaped shell variable in a ++-# double_quote_subst'ed string. ++-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++- ++-# Sed substitution to avoid accidental globbing in evaled expressions ++-no_glob_subst='s/\*/\\\*/g' ++- ++-# Constants: ++-rm="rm -f" ++- ++-# Global variables: ++-default_ofile=libtool ++-can_build_shared=yes ++- ++-# All known linkers require a `.a' archive for static linking (except MSVC, ++-# which needs '.lib'). ++-libext=a ++-ltmain="$ac_aux_dir/ltmain.sh" ++-ofile="$default_ofile" ++-with_gnu_ld="$lt_cv_prog_gnu_ld" ++- ++-AC_CHECK_TOOL(AR, ar, false) ++-AC_CHECK_TOOL(RANLIB, ranlib, :) ++-AC_CHECK_TOOL(STRIP, strip, :) ++- ++-old_CC="$CC" ++-old_CFLAGS="$CFLAGS" ++- ++-# Set sane defaults for various variables ++-test -z "$AR" && AR=ar ++-test -z "$AR_FLAGS" && AR_FLAGS=cru ++-test -z "$AS" && AS=as ++-test -z "$CC" && CC=cc ++-test -z "$LTCC" && LTCC=$CC ++-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++-test -z "$DLLTOOL" && DLLTOOL=dlltool ++-test -z "$LD" && LD=ld ++-test -z "$LN_S" && LN_S="ln -s" ++-test -z "$MAGIC_CMD" && MAGIC_CMD=file ++-test -z "$NM" && NM=nm ++-test -z "$SED" && SED=sed ++-test -z "$OBJDUMP" && OBJDUMP=objdump ++-test -z "$RANLIB" && RANLIB=: ++-test -z "$STRIP" && STRIP=: ++-test -z "$ac_objext" && ac_objext=o ++- ++-# Determine commands to create old-style static archives. ++-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++-old_postinstall_cmds='chmod 644 $oldlib' ++-old_postuninstall_cmds= ++- ++-if test -n "$RANLIB"; then ++- case $host_os in ++- openbsd*) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++- ;; ++- *) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++- ;; ++- esac ++- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++-fi ++- ++-_LT_CC_BASENAME([$compiler]) ++- ++-# Only perform the check for file, if the check method requires it ++-case $deplibs_check_method in ++-file_magic*) ++- if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++- AC_PATH_MAGIC ++- fi ++- ;; ++-esac ++- ++-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++-enable_win32_dll=yes, enable_win32_dll=no) ++- ++-AC_ARG_ENABLE([libtool-lock], ++- [AC_HELP_STRING([--disable-libtool-lock], ++- [avoid locking (might break parallel builds)])]) ++-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++- ++-AC_ARG_WITH([pic], ++- [AC_HELP_STRING([--with-pic], ++- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++- [pic_mode="$withval"], ++- [pic_mode=default]) ++-test -z "$pic_mode" && pic_mode=default ++- ++-# Use C for the default configuration in the libtool script ++-tagname= ++-AC_LIBTOOL_LANG_C_CONFIG ++-_LT_AC_TAGCONFIG ++-])# AC_LIBTOOL_SETUP ++- ++- ++-# _LT_AC_SYS_COMPILER ++-# ------------------- ++-AC_DEFUN([_LT_AC_SYS_COMPILER], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++- ++-# If no C compiler was specified, use CC. ++-LTCC=${LTCC-"$CC"} ++- ++-# If no C compiler flags were specified, use CFLAGS. ++-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++- ++-# Allow CC to be a program name with arguments. ++-compiler=$CC ++-])# _LT_AC_SYS_COMPILER ++- ++- ++-# _LT_CC_BASENAME(CC) ++-# ------------------- ++-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++-AC_DEFUN([_LT_CC_BASENAME], ++-[for cc_temp in $1""; do ++- case $cc_temp in ++- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++- \-*) ;; ++- *) break;; ++- esac ++-done ++-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++-]) ++- ++- ++-# _LT_COMPILER_BOILERPLATE ++-# ------------------------ ++-# Check for compiler boilerplate output or warnings with ++-# the simple compiler test code. ++-AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++-[ac_outfile=conftest.$ac_objext ++-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_compiler_boilerplate=`cat conftest.err` ++-$rm conftest* ++-])# _LT_COMPILER_BOILERPLATE ++- ++- ++-# _LT_LINKER_BOILERPLATE ++-# ---------------------- ++-# Check for linker boilerplate output or warnings with ++-# the simple link test code. ++-AC_DEFUN([_LT_LINKER_BOILERPLATE], ++-[ac_outfile=conftest.$ac_objext ++-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_linker_boilerplate=`cat conftest.err` ++-$rm conftest* ++-])# _LT_LINKER_BOILERPLATE ++- ++- ++-# _LT_AC_SYS_LIBPATH_AIX ++-# ---------------------- ++-# Links a minimal program and checks the executable ++-# for the system default hardcoded library path. In most cases, ++-# this is /usr/lib:/lib, but when the MPI compilers are used ++-# the location of the communication and MPI libs are included too. ++-# If we don't find anything, use the default library path according ++-# to the aix ld manual. ++-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++-}'` ++-# Check for a 64-bit object if we didn't find anything. ++-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++-}'`; fi],[]) ++-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++-])# _LT_AC_SYS_LIBPATH_AIX ++- ++- ++-# _LT_AC_SHELL_INIT(ARG) ++-# ---------------------- ++-AC_DEFUN([_LT_AC_SHELL_INIT], ++-[ifdef([AC_DIVERSION_NOTICE], ++- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++- [AC_DIVERT_PUSH(NOTICE)]) ++-$1 ++-AC_DIVERT_POP ++-])# _LT_AC_SHELL_INIT ++- ++- ++-# _LT_AC_PROG_ECHO_BACKSLASH ++-# -------------------------- ++-# Add some code to the start of the generated configure script which ++-# will find an echo command which doesn't interpret backslashes. ++-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++-[_LT_AC_SHELL_INIT([ ++-# Check that we are running under the correct shell. ++-SHELL=${CONFIG_SHELL-/bin/sh} ++- ++-case X$ECHO in ++-X*--fallback-echo) ++- # Remove one level of quotation (which was required for Make). ++- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++- ;; ++-esac ++- ++-echo=${ECHO-echo} ++-if test "X[$]1" = X--no-reexec; then ++- # Discard the --no-reexec flag, and continue. ++- shift ++-elif test "X[$]1" = X--fallback-echo; then ++- # Avoid inline document here, it may be left over ++- : ++-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++- # Yippee, $echo works! ++- : ++-else ++- # Restart under the correct shell. ++- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++-fi ++- ++-if test "X[$]1" = X--fallback-echo; then ++- # used as fallback echo ++- shift ++- cat </dev/null 2>&1 && unset CDPATH ++- ++-if test -z "$ECHO"; then ++-if test "X${echo_test_string+set}" != Xset; then ++-# find a string as large as possible, as long as the shell can cope with it ++- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++- if (echo_test_string=`eval $cmd`) 2>/dev/null && ++- echo_test_string=`eval $cmd` && ++- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++- then ++- break ++- fi ++- done ++-fi ++- ++-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- : ++-else ++- # The Solaris, AIX, and Digital Unix default echo programs unquote ++- # backslashes. This makes it impossible to quote backslashes using ++- # echo "$something" | sed 's/\\/\\\\/g' ++- # ++- # So, first we look for a working echo in the user's PATH. ++- ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for dir in $PATH /usr/ucb; do ++- IFS="$lt_save_ifs" ++- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- echo="$dir/echo" ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ++- if test "X$echo" = Xecho; then ++- # We didn't find a better echo, so look for alternatives. ++- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # This shell has a builtin print -r that does the trick. ++- echo='print -r' ++- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++- test "X$CONFIG_SHELL" != X/bin/ksh; then ++- # If we have ksh, try running configure again with it. ++- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++- export ORIGINAL_CONFIG_SHELL ++- CONFIG_SHELL=/bin/ksh ++- export CONFIG_SHELL ++- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++- else ++- # Try using printf. ++- echo='printf %s\n' ++- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # Cool, printf works ++- : ++- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++- export CONFIG_SHELL ++- SHELL="$CONFIG_SHELL" ++- export SHELL ++- echo="$CONFIG_SHELL [$]0 --fallback-echo" ++- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- echo="$CONFIG_SHELL [$]0 --fallback-echo" ++- else ++- # maybe with a smaller string... ++- prev=: ++- ++- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++- then ++- break ++- fi ++- prev="$cmd" ++- done ++- ++- if test "$prev" != 'sed 50q "[$]0"'; then ++- echo_test_string=`eval $prev` ++- export echo_test_string ++- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++- else ++- # Oops. We lost completely, so just stick with echo. ++- echo=echo ++- fi ++- fi ++- fi ++- fi ++-fi ++-fi ++- ++-# Copy echo and quote the copy suitably for passing to libtool from ++-# the Makefile, instead of quoting the original, which is used later. ++-ECHO=$echo ++-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++-fi ++- ++-AC_SUBST(ECHO) ++-])])# _LT_AC_PROG_ECHO_BACKSLASH ++- ++- ++-# _LT_AC_LOCK ++-# ----------- ++-AC_DEFUN([_LT_AC_LOCK], ++-[AC_ARG_ENABLE([libtool-lock], ++- [AC_HELP_STRING([--disable-libtool-lock], ++- [avoid locking (might break parallel builds)])]) ++-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++- ++-# Some flags need to be propagated to the compiler or linker for good ++-# libtool support. ++-case $host in ++-ia64-*-hpux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *ELF-32*) ++- HPUX_IA64_MODE="32" ++- ;; ++- *ELF-64*) ++- HPUX_IA64_MODE="64" ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++-*-*-irix6*) ++- # Find out which ABI we are using. ++- echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -melf32bsmip" ++- ;; ++- *N32*) ++- LD="${LD-ld} -melf32bmipn32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -melf64bmip" ++- ;; ++- esac ++- else ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -32" ++- ;; ++- *N32*) ++- LD="${LD-ld} -n32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -64" ++- ;; ++- esac ++- fi ++- fi ++- rm -rf conftest* ++- ;; ++- ++-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *32-bit*) ++- case $host in ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_i386" ++- ;; ++- ppc64-*linux*|powerpc64-*linux*) ++- LD="${LD-ld} -m elf32ppclinux" ++- ;; ++- s390x-*linux*) ++- LD="${LD-ld} -m elf_s390" ++- ;; ++- sparc64-*linux*) ++- LD="${LD-ld} -m elf32_sparc" ++- ;; ++- esac ++- ;; ++- *64-bit*) ++- case $host in ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_x86_64" ++- ;; ++- ppc*-*linux*|powerpc*-*linux*) ++- LD="${LD-ld} -m elf64ppc" ++- ;; ++- s390*-*linux*) ++- LD="${LD-ld} -m elf64_s390" ++- ;; ++- sparc*-*linux*) ++- LD="${LD-ld} -m elf64_sparc" ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++- ++-*-*-sco3.2v5*) ++- # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++- SAVE_CFLAGS="$CFLAGS" ++- CFLAGS="$CFLAGS -belf" ++- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++- [AC_LANG_PUSH(C) ++- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++- AC_LANG_POP]) ++- if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++- CFLAGS="$SAVE_CFLAGS" ++- fi ++- ;; ++-sparc*-*solaris*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *64-bit*) ++- case $lt_cv_prog_gnu_ld in ++- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++- *) LD="${LD-ld} -64" ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++- ++-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++- AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++- AC_CHECK_TOOL(AS, as, false) ++- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++- ;; ++- ]) ++-esac ++- ++-need_locks="$enable_libtool_lock" ++- ++-])# _LT_AC_LOCK ++- ++- ++-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ---------------------------------------------------------------- ++-# Check whether the given compiler option works ++-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++-[AC_REQUIRE([LT_AC_PROG_SED]) ++-AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++- lt_compiler_flag="$3" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- # The option is referenced via a variable to avoid confusing sed. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>conftest.err) ++- ac_status=$? ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s "$ac_outfile"; then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings other than the usual output. ++- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- fi ++- $rm conftest* ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- ifelse([$5], , :, [$5]) ++-else ++- ifelse([$6], , :, [$6]) ++-fi ++-])# AC_LIBTOOL_COMPILER_OPTION ++- ++- ++-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ------------------------------------------------------------ ++-# Check whether the given compiler option works ++-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++-[AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- save_LDFLAGS="$LDFLAGS" ++- LDFLAGS="$LDFLAGS $3" ++- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++- # The linker can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- if test -s conftest.err; then ++- # Append any errors to the config.log. ++- cat conftest.err 1>&AS_MESSAGE_LOG_FD ++- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- else ++- $2=yes ++- fi ++- fi ++- $rm conftest* ++- LDFLAGS="$save_LDFLAGS" ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- ifelse([$4], , :, [$4]) ++-else ++- ifelse([$5], , :, [$5]) ++-fi ++-])# AC_LIBTOOL_LINKER_OPTION ++- ++- ++-# AC_LIBTOOL_SYS_MAX_CMD_LEN ++-# -------------------------- ++-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++-[# find the maximum length of command line arguments ++-AC_MSG_CHECKING([the maximum length of command line arguments]) ++-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++- i=0 ++- teststring="ABCD" ++- ++- case $build_os in ++- msdosdjgpp*) ++- # On DJGPP, this test can blow up pretty badly due to problems in libc ++- # (any single argument exceeding 2000 bytes causes a buffer overrun ++- # during glob expansion). Even if it were fixed, the result of this ++- # check would be larger than it should be. ++- lt_cv_sys_max_cmd_len=12288; # 12K is about right ++- ;; ++- ++- gnu*) ++- # Under GNU Hurd, this test is not required because there is ++- # no limit to the length of command line arguments. ++- # Libtool will interpret -1 as no limit whatsoever ++- lt_cv_sys_max_cmd_len=-1; ++- ;; ++- ++- cygwin* | mingw*) ++- # On Win9x/ME, this test blows up -- it succeeds, but takes ++- # about 5 minutes as the teststring grows exponentially. ++- # Worse, since 9x/ME are not pre-emptively multitasking, ++- # you end up with a "frozen" computer, even though with patience ++- # the test eventually succeeds (with a max line length of 256k). ++- # Instead, let's just punt: use the minimum linelength reported by ++- # all of the supported platforms: 8192 (on NT/2K/XP). ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- amigaos*) ++- # On AmigaOS with pdksh, this test takes hours, literally. ++- # So we just punt and use a minimum line length of 8192. ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++- # This has been around since 386BSD, at least. Likely further. ++- if test -x /sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++- elif test -x /usr/sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++- else ++- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++- fi ++- # And add a safety zone ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++- ;; ++- ++- interix*) ++- # We know the value 262144 and hardcode it with a safety zone (like BSD) ++- lt_cv_sys_max_cmd_len=196608 ++- ;; ++- ++- osf*) ++- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++- # nice to cause kernel panics so lets avoid the loop below. ++- # First set a reasonable default. ++- lt_cv_sys_max_cmd_len=16384 ++- # ++- if test -x /sbin/sysconfig; then ++- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++- *1*) lt_cv_sys_max_cmd_len=-1 ;; ++- esac ++- fi ++- ;; ++- sco3.2v5*) ++- lt_cv_sys_max_cmd_len=102400 ++- ;; ++- sysv5* | sco5v6* | sysv4.2uw2*) ++- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++- if test -n "$kargmax"; then ++- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++- else ++- lt_cv_sys_max_cmd_len=32768 ++- fi ++- ;; ++- *) ++- # If test is not a shell built-in, we'll probably end up computing a ++- # maximum length that is only half of the actual maximum length, but ++- # we can't tell. ++- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++- = "XX$teststring") >/dev/null 2>&1 && ++- new_result=`expr "X$teststring" : ".*" 2>&1` && ++- lt_cv_sys_max_cmd_len=$new_result && ++- test $i != 17 # 1/2 MB should be enough ++- do ++- i=`expr $i + 1` ++- teststring=$teststring$teststring ++- done ++- teststring= ++- # Add a significant safety factor because C++ compilers can tack on massive ++- # amounts of additional arguments before passing them to the linker. ++- # It appears as though 1/2 is a usable value. ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++- ;; ++- esac ++-]) ++-if test -n $lt_cv_sys_max_cmd_len ; then ++- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++-else ++- AC_MSG_RESULT(none) ++-fi ++-])# AC_LIBTOOL_SYS_MAX_CMD_LEN ++- ++- ++-# _LT_AC_CHECK_DLFCN ++-# ------------------ ++-AC_DEFUN([_LT_AC_CHECK_DLFCN], ++-[AC_CHECK_HEADERS(dlfcn.h)dnl ++-])# _LT_AC_CHECK_DLFCN ++- ++- ++-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++-# --------------------------------------------------------------------- ++-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++-if test "$cross_compiling" = yes; then : ++- [$4] ++-else ++- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++- lt_status=$lt_dlunknown ++- cat > conftest.$ac_ext < ++-#endif ++- ++-#include ++- ++-#ifdef RTLD_GLOBAL ++-# define LT_DLGLOBAL RTLD_GLOBAL ++-#else ++-# ifdef DL_GLOBAL ++-# define LT_DLGLOBAL DL_GLOBAL ++-# else ++-# define LT_DLGLOBAL 0 ++-# endif ++-#endif ++- ++-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++- find out it does not work in some platform. */ ++-#ifndef LT_DLLAZY_OR_NOW ++-# ifdef RTLD_LAZY ++-# define LT_DLLAZY_OR_NOW RTLD_LAZY ++-# else ++-# ifdef DL_LAZY ++-# define LT_DLLAZY_OR_NOW DL_LAZY ++-# else ++-# ifdef RTLD_NOW ++-# define LT_DLLAZY_OR_NOW RTLD_NOW ++-# else ++-# ifdef DL_NOW ++-# define LT_DLLAZY_OR_NOW DL_NOW ++-# else ++-# define LT_DLLAZY_OR_NOW 0 ++-# endif ++-# endif ++-# endif ++-# endif ++-#endif ++- ++-#ifdef __cplusplus ++-extern "C" void exit (int); ++-#endif ++- ++-void fnord() { int i=42;} ++-int main () ++-{ ++- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++- int status = $lt_dlunknown; ++- ++- if (self) ++- { ++- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++- /* dlclose (self); */ ++- } ++- else ++- puts (dlerror ()); ++- ++- exit (status); ++-}] ++-EOF ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++- lt_status=$? ++- case x$lt_status in ++- x$lt_dlno_uscore) $1 ;; ++- x$lt_dlneed_uscore) $2 ;; ++- x$lt_dlunknown|x*) $3 ;; ++- esac ++- else : ++- # compilation failed ++- $3 ++- fi ++-fi ++-rm -fr conftest* ++-])# _LT_AC_TRY_DLOPEN_SELF ++- ++- ++-# AC_LIBTOOL_DLOPEN_SELF ++-# ---------------------- ++-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++-if test "x$enable_dlopen" != xyes; then ++- enable_dlopen=unknown ++- enable_dlopen_self=unknown ++- enable_dlopen_self_static=unknown ++-else ++- lt_cv_dlopen=no ++- lt_cv_dlopen_libs= ++- ++- case $host_os in ++- beos*) ++- lt_cv_dlopen="load_add_on" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ;; ++- ++- mingw* | pw32*) ++- lt_cv_dlopen="LoadLibrary" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- cygwin*) ++- lt_cv_dlopen="dlopen" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- darwin*) ++- # if libdl is installed we need to link against it ++- AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++- lt_cv_dlopen="dyld" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ]) ++- ;; ++- ++- *) ++- AC_CHECK_FUNC([shl_load], ++- [lt_cv_dlopen="shl_load"], ++- [AC_CHECK_LIB([dld], [shl_load], ++- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++- [AC_CHECK_FUNC([dlopen], ++- [lt_cv_dlopen="dlopen"], ++- [AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++- [AC_CHECK_LIB([svld], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++- [AC_CHECK_LIB([dld], [dld_link], ++- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ;; ++- esac ++- ++- if test "x$lt_cv_dlopen" != xno; then ++- enable_dlopen=yes ++- else ++- enable_dlopen=no ++- fi ++- ++- case $lt_cv_dlopen in ++- dlopen) ++- save_CPPFLAGS="$CPPFLAGS" ++- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++- ++- save_LDFLAGS="$LDFLAGS" ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++- ++- save_LIBS="$LIBS" ++- LIBS="$lt_cv_dlopen_libs $LIBS" ++- ++- AC_CACHE_CHECK([whether a program can dlopen itself], ++- lt_cv_dlopen_self, [dnl ++- _LT_AC_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++- ]) ++- ++- if test "x$lt_cv_dlopen_self" = xyes; then ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++- lt_cv_dlopen_self_static, [dnl ++- _LT_AC_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++- ]) ++- fi ++- ++- CPPFLAGS="$save_CPPFLAGS" ++- LDFLAGS="$save_LDFLAGS" ++- LIBS="$save_LIBS" ++- ;; ++- esac ++- ++- case $lt_cv_dlopen_self in ++- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++- *) enable_dlopen_self=unknown ;; ++- esac ++- ++- case $lt_cv_dlopen_self_static in ++- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++- *) enable_dlopen_self_static=unknown ;; ++- esac ++-fi ++-])# AC_LIBTOOL_DLOPEN_SELF ++- ++- ++-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++-# --------------------------------- ++-# Check to see if options -c and -o are simultaneously supported by compiler ++-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++- $rm -r conftest 2>/dev/null ++- mkdir conftest ++- cd conftest ++- mkdir out ++- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- lt_compiler_flag="-o out/conftest2.$ac_objext" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>out/conftest.err) ++- ac_status=$? ++- cat out/conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s out/conftest2.$ac_objext ++- then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++- fi ++- fi ++- chmod u+w . 2>&AS_MESSAGE_LOG_FD ++- $rm conftest* ++- # SGI C++ compiler will create directory out/ii_files/ for ++- # template instantiation ++- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++- $rm out/* && rmdir out ++- cd .. ++- rmdir conftest ++- $rm conftest* ++-]) ++-])# AC_LIBTOOL_PROG_CC_C_O ++- ++- ++-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++-# ----------------------------------------- ++-# Check to see if we can do hard links to lock some files if needed ++-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++-[AC_REQUIRE([_LT_AC_LOCK])dnl ++- ++-hard_links="nottested" ++-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++- # do not overwrite the value of need_locks provided by the user ++- AC_MSG_CHECKING([if we can lock with hard links]) ++- hard_links=yes ++- $rm conftest* ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- touch conftest.a ++- ln conftest.a conftest.b 2>&5 || hard_links=no ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- AC_MSG_RESULT([$hard_links]) ++- if test "$hard_links" = no; then ++- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++- need_locks=warn ++- fi ++-else ++- need_locks=no ++-fi ++-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++- ++- ++-# AC_LIBTOOL_OBJDIR ++-# ----------------- ++-AC_DEFUN([AC_LIBTOOL_OBJDIR], ++-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++-[rm -f .libs 2>/dev/null ++-mkdir .libs 2>/dev/null ++-if test -d .libs; then ++- lt_cv_objdir=.libs ++-else ++- # MS-DOS does not allow filenames that begin with a dot. ++- lt_cv_objdir=_libs ++-fi ++-rmdir .libs 2>/dev/null]) ++-objdir=$lt_cv_objdir ++-])# AC_LIBTOOL_OBJDIR ++- ++- ++-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++-# ---------------------------------------------- ++-# Check hardcoding attributes. ++-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++-[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++-_LT_AC_TAGVAR(hardcode_action, $1)= ++-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++- ++- # We can hardcode non-existant directories. ++- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++- # If the only mechanism to avoid hardcoding is shlibpath_var, we ++- # have to relink, otherwise we might link with an installed library ++- # when we should be linking with a yet-to-be-installed one ++- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++- # Linking always hardcodes the temporary library directory. ++- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++- else ++- # We can link without hardcoding, and we can hardcode nonexisting dirs. ++- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++- fi ++-else ++- # We cannot hardcode anything, or else we can only hardcode existing ++- # directories. ++- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++-fi ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++- ++-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++- # Fast installation is not supported ++- enable_fast_install=no ++-elif test "$shlibpath_overrides_runpath" = yes || ++- test "$enable_shared" = no; then ++- # Fast installation is not necessary ++- enable_fast_install=needless ++-fi ++-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++- ++- ++-# AC_LIBTOOL_SYS_LIB_STRIP ++-# ------------------------ ++-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++-[striplib= ++-old_striplib= ++-AC_MSG_CHECKING([whether stripping libraries is possible]) ++-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++- test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++- AC_MSG_RESULT([yes]) ++-else ++-# FIXME - insert some real tests, host_os isn't really good enough ++- case $host_os in ++- darwin*) ++- if test -n "$STRIP" ; then ++- striplib="$STRIP -x" ++- AC_MSG_RESULT([yes]) ++- else ++- AC_MSG_RESULT([no]) ++-fi ++- ;; ++- *) ++- AC_MSG_RESULT([no]) ++- ;; ++- esac ++-fi ++-])# AC_LIBTOOL_SYS_LIB_STRIP ++- ++- ++-# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++-# ----------------------------- ++-# PORTME Fill in your ld.so characteristics ++-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++-[AC_MSG_CHECKING([dynamic linker characteristics]) ++-library_names_spec= ++-libname_spec='lib$name' ++-soname_spec= ++-shrext_cmds=".so" ++-postinstall_cmds= ++-postuninstall_cmds= ++-finish_cmds= ++-finish_eval= ++-shlibpath_var= ++-shlibpath_overrides_runpath=unknown ++-version_type=none ++-dynamic_linker="$host_os ld.so" ++-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++-if test "$GCC" = yes; then ++- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++- # if the path contains ";" then we assume it to be the separator ++- # otherwise default to the standard path separator (i.e. ":") - it is ++- # assumed that no part of a normal pathname contains ";" but that should ++- # okay in the real world where ";" in dirpaths is itself problematic. ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++-else ++- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++-fi ++-need_lib_prefix=unknown ++-hardcode_into_libs=no ++- ++-# when you set need_version to no, make sure it does not cause -set_version ++-# flags to be left without arguments ++-need_version=unknown ++- ++-case $host_os in ++-aix3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++- shlibpath_var=LIBPATH ++- ++- # AIX 3 has no versioning support, so we append a major version to the name. ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- ++-aix4* | aix5*) ++- version_type=linux ++- need_lib_prefix=no ++- need_version=no ++- hardcode_into_libs=yes ++- if test "$host_cpu" = ia64; then ++- # AIX 5 supports IA64 ++- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- else ++- # With GCC up to 2.95.x, collect2 would create an import file ++- # for dependence libraries. The import file would start with ++- # the line `#! .'. This would cause the generated library to ++- # depend on `.', always an invalid library. This was fixed in ++- # development snapshots of GCC prior to 3.0. ++- case $host_os in ++- aix4 | aix4.[[01]] | aix4.[[01]].*) ++- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++- echo ' yes ' ++- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++- : ++- else ++- can_build_shared=no ++- fi ++- ;; ++- esac ++- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++- # soname into executable. Probably we can add versioning support to ++- # collect2, so additional links can be useful in future. ++- if test "$aix_use_runtimelinking" = yes; then ++- # If using run time linking (on AIX 4.2 or later) use lib.so ++- # instead of lib.a to let people know that these are not ++- # typical AIX shared libraries. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- else ++- # We preserve .a as extension for shared libraries through AIX4.2 ++- # and later when we are not doing run time linking. ++- library_names_spec='${libname}${release}.a $libname.a' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- fi ++- shlibpath_var=LIBPATH ++- fi ++- ;; ++- ++-amigaos*) ++- library_names_spec='$libname.ixlibrary $libname.a' ++- # Create ${libname}_ixlibrary.a entries in /sys/libs. ++- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++- ;; ++- ++-beos*) ++- library_names_spec='${libname}${shared_ext}' ++- dynamic_linker="$host_os ld.so" ++- shlibpath_var=LIBRARY_PATH ++- ;; ++- ++-bsdi[[45]]*) ++- version_type=linux ++- 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 $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++- # the default ld.so.conf also contains /usr/contrib/lib and ++- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++- # libtool to hard-code these into programs ++- ;; ++- ++-cygwin* | mingw* | pw32*) ++- version_type=windows ++- shrext_cmds=".dll" ++- need_version=no ++- need_lib_prefix=no ++- ++- case $GCC,$host_os in ++- yes,cygwin* | yes,mingw* | yes,pw32*) ++- library_names_spec='$libname.dll.a' ++- # DLL is installed to $(libdir)/../bin by postinstall_cmds ++- postinstall_cmds='base_file=`basename \${file}`~ ++- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++- dldir=$destdir/`dirname \$dlpath`~ ++- test -d \$dldir || mkdir -p \$dldir~ ++- $install_prog $dir/$dlname \$dldir/$dlname~ ++- chmod a+x \$dldir/$dlname' ++- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++- dlpath=$dir/\$dldll~ ++- $rm \$dlpath' ++- shlibpath_overrides_runpath=yes ++- ++- case $host_os in ++- cygwin*) ++- # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++- ;; ++- mingw*) ++- # MinGW DLLs use traditional 'lib' prefix ++- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++- # It is most probably a Windows format PATH printed by ++- # mingw gcc, but we are running on Cygwin. Gcc prints its search ++- # path with ; separators, and with drive letters. We can handle the ++- # drive letters (cygwin fileutils understands them), so leave them, ++- # especially as we might pass files found there to a mingw objdump, ++- # which wouldn't understand a cygwinified path. Ahh. ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++- ;; ++- pw32*) ++- # pw32 DLLs use 'pw' prefix rather than 'lib' ++- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- ;; ++- esac ++- ;; ++- ++- *) ++- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++- ;; ++- esac ++- dynamic_linker='Win32 ld.exe' ++- # FIXME: first we should search . and the directory the executable is in ++- shlibpath_var=PATH ++- ;; ++- ++-darwin* | rhapsody*) ++- dynamic_linker="$host_os dyld" ++- version_type=darwin ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++- soname_spec='${libname}${release}${major}$shared_ext' ++- shlibpath_overrides_runpath=yes ++- shlibpath_var=DYLD_LIBRARY_PATH ++- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. ++- if test "$GCC" = yes; then ++- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` ++- else ++- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' ++- fi ++- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++- ;; ++- ++-dgux*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-freebsd1*) ++- dynamic_linker=no ++- ;; ++- ++-kfreebsd*-gnu) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- dynamic_linker='GNU ld.so' ++- ;; ++- ++-freebsd* | dragonfly*) ++- # DragonFly does not have aout. When/if they implement a new ++- # versioning mechanism, adjust this. ++- if test -x /usr/bin/objformat; then ++- objformat=`/usr/bin/objformat` ++- else ++- case $host_os in ++- freebsd[[123]]*) objformat=aout ;; ++- *) objformat=elf ;; ++- esac ++- fi ++- version_type=freebsd-$objformat ++- case $version_type in ++- freebsd-elf*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- need_version=no ++- need_lib_prefix=no ++- ;; ++- freebsd-*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++- need_version=yes ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_os in ++- freebsd2*) ++- shlibpath_overrides_runpath=yes ++- ;; ++- freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- freebsd*) # from 4.6 on ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- esac ++- ;; ++- ++-gnu*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- hardcode_into_libs=yes ++- ;; ++- ++-hpux9* | hpux10* | hpux11*) ++- # Give a soname corresponding to the major version so that dld.sl refuses to ++- # link against other versions. ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- case $host_cpu in ++- ia64*) ++- shrext_cmds='.so' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.so" ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- if test "X$HPUX_IA64_MODE" = X32; then ++- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++- else ++- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++- fi ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- hppa*64*) ++- shrext_cmds='.sl' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- *) ++- shrext_cmds='.sl' ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=SHLIB_PATH ++- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- esac ++- # HP-UX runs *really* slowly unless shared libraries are mode 555. ++- postinstall_cmds='chmod 555 $lib' ++- ;; ++- ++-interix3*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $host_os in ++- nonstopux*) version_type=nonstopux ;; ++- *) ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- version_type=linux ++- else ++- version_type=irix ++- fi ;; ++- esac ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++- case $host_os in ++- irix5* | nonstopux*) ++- libsuff= shlibsuff= ++- ;; ++- *) ++- case $LD in # libtool.m4 will add one of these switches to LD ++- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++- libsuff= shlibsuff= libmagic=32-bit;; ++- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++- libsuff=32 shlibsuff=N32 libmagic=N32;; ++- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++- libsuff=64 shlibsuff=64 libmagic=64-bit;; ++- *) libsuff= shlibsuff= libmagic=never-match;; ++- esac ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++- hardcode_into_libs=yes ++- ;; ++- ++-# No shared lib support for Linux oldld, aout, or coff. ++-linux*oldld* | linux*aout* | linux*coff*) ++- dynamic_linker=no ++- ;; ++- ++-# This must be Linux ELF. ++-linux*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- # This implies no fast_install, which is unacceptable. ++- # Some rework will be needed to allow for fast_install ++- # before this can be enabled. ++- hardcode_into_libs=yes ++- ++- # Append ld.so.conf contents to the search path ++- if test -f /etc/ld.so.conf; then ++- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++- fi ++- ++- # We used to test for /lib/ld.so.1 and disable shared libraries on ++- # powerpc, because MkLinux only supported shared libraries with the ++- # GNU dynamic linker. Since this was broken with cross compilers, ++- # most powerpc-linux boxes support dynamic linking these days and ++- # people can always --disable-shared, the test was removed, and we ++- # assume the GNU/Linux dynamic linker is in use. ++- dynamic_linker='GNU/Linux ld.so' ++- ;; ++- ++-knetbsd*-gnu) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- dynamic_linker='GNU ld.so' ++- ;; ++- ++-netbsd*) ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- dynamic_linker='NetBSD (a.out) ld.so' ++- else ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- dynamic_linker='NetBSD ld.elf_so' ++- fi ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- ++-newsos6) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- ;; ++- ++-nto-qnx*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- ;; ++- ++-openbsd*) ++- version_type=sunos ++- sys_lib_dlsearch_path_spec="/usr/lib" ++- need_lib_prefix=no ++- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++- case $host_os in ++- openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++- *) need_version=no ;; ++- esac ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- case $host_os in ++- openbsd2.[[89]] | openbsd2.[[89]].*) ++- shlibpath_overrides_runpath=no ++- ;; ++- *) ++- shlibpath_overrides_runpath=yes ++- ;; ++- esac ++- else ++- shlibpath_overrides_runpath=yes ++- fi ++- ;; ++- ++-os2*) ++- libname_spec='$name' ++- shrext_cmds=".dll" ++- need_lib_prefix=no ++- library_names_spec='$libname${shared_ext} $libname.a' ++- dynamic_linker='OS/2 ld.exe' ++- shlibpath_var=LIBPATH ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- version_type=osf ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++- ;; ++- ++-solaris*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- # ldd complains unless libraries are executable ++- postinstall_cmds='chmod +x $lib' ++- ;; ++- ++-sunos4*) ++- version_type=sunos ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- if test "$with_gnu_ld" = yes; then ++- need_lib_prefix=no ++- fi ++- need_version=yes ++- ;; ++- ++-sysv4 | sysv4.3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_vendor in ++- sni) ++- shlibpath_overrides_runpath=no ++- need_lib_prefix=no ++- export_dynamic_flag_spec='${wl}-Blargedynsym' ++- runpath_var=LD_RUN_PATH ++- ;; ++- siemens) ++- need_lib_prefix=no ++- ;; ++- motorola) ++- need_lib_prefix=no ++- need_version=no ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++- ;; ++- esac ++- ;; ++- ++-sysv4*MP*) ++- if test -d /usr/nec ;then ++- version_type=linux ++- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++- soname_spec='$libname${shared_ext}.$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- fi ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- version_type=freebsd-elf ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- hardcode_into_libs=yes ++- if test "$with_gnu_ld" = yes; then ++- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++- shlibpath_overrides_runpath=no ++- else ++- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++- shlibpath_overrides_runpath=yes ++- case $host_os in ++- sco3.2v5*) ++- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++- ;; ++- esac ++- fi ++- sys_lib_dlsearch_path_spec='/usr/lib' ++- ;; ++- ++-uts4*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-*) ++- dynamic_linker=no ++- ;; ++-esac ++-AC_MSG_RESULT([$dynamic_linker]) ++-test "$dynamic_linker" = no && can_build_shared=no ++- ++-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++-if test "$GCC" = yes; then ++- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++-fi ++-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++- ++- ++-# _LT_AC_TAGCONFIG ++-# ---------------- ++-AC_DEFUN([_LT_AC_TAGCONFIG], ++-[AC_ARG_WITH([tags], ++- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++- [include additional configurations @<:@automatic@:>@])], ++- [tagnames="$withval"]) ++- ++-if test -f "$ltmain" && test -n "$tagnames"; then ++- if test ! -f "${ofile}"; then ++- AC_MSG_WARN([output file `$ofile' does not exist]) ++- fi ++- ++- if test -z "$LTCC"; then ++- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++- if test -z "$LTCC"; then ++- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++- else ++- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) ++- fi ++- fi ++- if test -z "$LTCFLAGS"; then ++- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++- fi ++- ++- # Extract list of available tagged configurations in $ofile. ++- # Note that this assumes the entire list is on one line. ++- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` ++- ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for tagname in $tagnames; do ++- IFS="$lt_save_ifs" ++- # Check whether tagname contains only valid characters ++- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++- "") ;; ++- *) AC_MSG_ERROR([invalid tag name: $tagname]) ++- ;; ++- esac ++- ++- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++- then ++- AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++- fi ++- ++- # Update the list of available tags. ++- if test -n "$tagname"; then ++- echo appending configuration tag \"$tagname\" to $ofile ++- ++- case $tagname in ++- CXX) ++- if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++- (test "X$CXX" != "Xg++"))) ; then ++- AC_LIBTOOL_LANG_CXX_CONFIG ++- else ++- tagname="" ++- fi ++- ;; ++- ++- F77) ++- if test -n "$F77" && test "X$F77" != "Xno"; then ++- AC_LIBTOOL_LANG_F77_CONFIG ++- else ++- tagname="" ++- fi ++- ;; ++- ++- GCJ) ++- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++- AC_LIBTOOL_LANG_GCJ_CONFIG ++- else ++- tagname="" ++- fi ++- ;; ++- ++- RC) ++- AC_LIBTOOL_LANG_RC_CONFIG ++- ;; ++- ++- *) ++- AC_MSG_ERROR([Unsupported tag name: $tagname]) ++- ;; ++- esac ++- ++- # Append the new tag name to the list of available tags. ++- if test -n "$tagname" ; then ++- available_tags="$available_tags $tagname" ++- fi ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ++- # Now substitute the updated list of available tags. ++- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++- mv "${ofile}T" "$ofile" ++- chmod +x "$ofile" ++- else ++- rm -f "${ofile}T" ++- AC_MSG_ERROR([unable to update list of available tagged configurations.]) ++- fi ++-fi ++-])# _LT_AC_TAGCONFIG ++- ++- ++-# AC_LIBTOOL_DLOPEN ++-# ----------------- ++-# enable checks for dlopen support ++-AC_DEFUN([AC_LIBTOOL_DLOPEN], ++- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++-])# AC_LIBTOOL_DLOPEN ++- ++- ++-# AC_LIBTOOL_WIN32_DLL ++-# -------------------- ++-# declare package support for building win32 DLLs ++-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++-])# AC_LIBTOOL_WIN32_DLL ++- ++- ++-# AC_ENABLE_SHARED([DEFAULT]) ++-# --------------------------- ++-# implement the --enable-shared flag ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-AC_DEFUN([AC_ENABLE_SHARED], ++-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++-AC_ARG_ENABLE([shared], ++- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_shared=yes ;; ++- no) enable_shared=no ;; ++- *) ++- enable_shared=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_shared=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++-])# AC_ENABLE_SHARED ++- ++- ++-# AC_DISABLE_SHARED ++-# ----------------- ++-# set the default shared flag to --disable-shared ++-AC_DEFUN([AC_DISABLE_SHARED], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-AC_ENABLE_SHARED(no) ++-])# AC_DISABLE_SHARED ++- ++- ++-# AC_ENABLE_STATIC([DEFAULT]) ++-# --------------------------- ++-# implement the --enable-static flag ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-AC_DEFUN([AC_ENABLE_STATIC], ++-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++-AC_ARG_ENABLE([static], ++- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_static=yes ;; ++- no) enable_static=no ;; ++- *) ++- enable_static=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_static=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++-])# AC_ENABLE_STATIC ++- ++- ++-# AC_DISABLE_STATIC ++-# ----------------- ++-# set the default static flag to --disable-static ++-AC_DEFUN([AC_DISABLE_STATIC], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-AC_ENABLE_STATIC(no) ++-])# AC_DISABLE_STATIC ++- ++- ++-# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++-# --------------------------------- ++-# implement the --enable-fast-install flag ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++-AC_ARG_ENABLE([fast-install], ++- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_fast_install=yes ;; ++- no) enable_fast_install=no ;; ++- *) ++- enable_fast_install=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_fast_install=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++-])# AC_ENABLE_FAST_INSTALL ++- ++- ++-# AC_DISABLE_FAST_INSTALL ++-# ----------------------- ++-# set the default to --disable-fast-install ++-AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-AC_ENABLE_FAST_INSTALL(no) ++-])# AC_DISABLE_FAST_INSTALL ++- ++- ++-# AC_LIBTOOL_PICMODE([MODE]) ++-# -------------------------- ++-# implement the --with-pic flag ++-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++-AC_DEFUN([AC_LIBTOOL_PICMODE], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-pic_mode=ifelse($#,1,$1,default) ++-])# AC_LIBTOOL_PICMODE ++- ++- ++-# AC_PROG_EGREP ++-# ------------- ++-# This is predefined starting with Autoconf 2.54, so this conditional ++-# definition can be removed once we require Autoconf 2.54 or later. ++-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++- then ac_cv_prog_egrep='grep -E' ++- else ac_cv_prog_egrep='egrep' ++- fi]) ++- EGREP=$ac_cv_prog_egrep ++- AC_SUBST([EGREP]) ++-])]) ++- ++- ++-# AC_PATH_TOOL_PREFIX ++-# ------------------- ++-# find a file program which can recognise shared library ++-AC_DEFUN([AC_PATH_TOOL_PREFIX], ++-[AC_REQUIRE([AC_PROG_EGREP])dnl ++-AC_MSG_CHECKING([for $1]) ++-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++-[case $MAGIC_CMD in ++-[[\\/*] | ?:[\\/]*]) ++- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++- ;; ++-*) ++- lt_save_MAGIC_CMD="$MAGIC_CMD" ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++-dnl $ac_dummy forces splitting on constant user-supplied paths. ++-dnl POSIX.2 word splitting is done only on the output of word expansions, ++-dnl not every word. This closes a longstanding sh security hole. ++- ac_dummy="ifelse([$2], , $PATH, [$2])" ++- for ac_dir in $ac_dummy; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$1; then ++- lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++- if test -n "$file_magic_test_file"; then ++- case $deplibs_check_method in ++- "file_magic "*) ++- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++- $EGREP "$file_magic_regex" > /dev/null; then ++- : ++- else ++- cat <&2 ++- ++-*** Warning: the command libtool uses to detect shared libraries, ++-*** $file_magic_cmd, produces output that libtool cannot recognize. ++-*** The result is that libtool may fail to recognize shared libraries ++-*** as such. This will affect the creation of libtool libraries that ++-*** depend on shared libraries, but programs linked with such libtool ++-*** libraries will work regardless of this problem. Nevertheless, you ++-*** may want to report the problem to your system manager and/or to ++-*** bug-libtool@gnu.org ++- ++-EOF ++- fi ;; ++- esac ++- fi ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- MAGIC_CMD="$lt_save_MAGIC_CMD" ++- ;; ++-esac]) ++-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++-if test -n "$MAGIC_CMD"; then ++- AC_MSG_RESULT($MAGIC_CMD) ++-else ++- AC_MSG_RESULT(no) ++-fi ++-])# AC_PATH_TOOL_PREFIX ++- ++- ++-# AC_PATH_MAGIC ++-# ------------- ++-# find a file program which can recognise a shared library ++-AC_DEFUN([AC_PATH_MAGIC], ++-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++-if test -z "$lt_cv_path_MAGIC_CMD"; then ++- if test -n "$ac_tool_prefix"; then ++- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++- else ++- MAGIC_CMD=: ++- fi ++-fi ++-])# AC_PATH_MAGIC ++- ++- ++-# AC_PROG_LD ++-# ---------- ++-# find the pathname to the GNU or non-GNU linker ++-AC_DEFUN([AC_PROG_LD], ++-[AC_ARG_WITH([gnu-ld], ++- [AC_HELP_STRING([--with-gnu-ld], ++- [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++- [test "$withval" = no || with_gnu_ld=yes], ++- [with_gnu_ld=no]) ++-AC_REQUIRE([LT_AC_PROG_SED])dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-ac_prog=ld ++-if test "$GCC" = yes; then ++- # Check if gcc -print-prog-name=ld gives a path. ++- AC_MSG_CHECKING([for ld used by $CC]) ++- case $host in ++- *-*-mingw*) ++- # gcc leaves a trailing carriage return which upsets mingw ++- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++- *) ++- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++- esac ++- case $ac_prog in ++- # Accept absolute paths. ++- [[\\/]]* | ?:[[\\/]]*) ++- re_direlt='/[[^/]][[^/]]*/\.\./' ++- # Canonicalize the pathname of ld ++- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++- done ++- test -z "$LD" && LD="$ac_prog" ++- ;; ++- "") ++- # If it fails, then pretend we aren't using GCC. ++- ac_prog=ld ++- ;; ++- *) ++- # If it is relative, then search for the first ld in PATH. ++- with_gnu_ld=unknown ++- ;; ++- esac ++-elif test "$with_gnu_ld" = yes; then ++- AC_MSG_CHECKING([for GNU ld]) ++-else ++- AC_MSG_CHECKING([for non-GNU ld]) ++-fi ++-AC_CACHE_VAL(lt_cv_path_LD, ++-[if test -z "$LD"; then ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++- lt_cv_path_LD="$ac_dir/$ac_prog" ++- # Check to see if the program is GNU ld. I'd rather use --version, ++- # but apparently some variants of GNU ld only accept -v. ++- # Break only if it was the GNU/non-GNU ld that we prefer. ++- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then ++- case $host_cpu in ++- i*86 ) ++- # Not sure whether the presence of OpenBSD here was a mistake. ++- # Let's accept both of them until this is cleared up. ++- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++- ;; ++- esac ++- else ++- lt_cv_deplibs_check_method=pass_all ++- fi ++- ;; ++- ++-gnu*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-hpux10.20* | hpux11*) ++- lt_cv_file_magic_cmd=/usr/bin/file ++- case $host_cpu in ++- ia64*) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++- ;; ++- hppa*64*) ++- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++- ;; ++- *) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++- ;; ++- esac ++- ;; ++- ++-interix3*) ++- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $LD in ++- *-32|*"-32 ") libmagic=32-bit;; ++- *-n32|*"-n32 ") libmagic=N32;; ++- *-64|*"-64 ") libmagic=64-bit;; ++- *) libmagic=never-match;; ++- esac ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-# This must be Linux ELF. ++-linux*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++- fi ++- ;; ++- ++-newos6*) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=/usr/lib/libnls.so ++- ;; ++- ++-nto-qnx*) ++- lt_cv_deplibs_check_method=unknown ++- ;; ++- ++-openbsd*) ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- fi ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-solaris*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-sysv4 | sysv4.3*) ++- case $host_vendor in ++- motorola) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++- ;; ++- ncr) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- sequent) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++- ;; ++- sni) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++- lt_cv_file_magic_test_file=/lib/libc.so ++- ;; ++- siemens) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- pc) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- esac ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++-esac ++-]) ++-file_magic_cmd=$lt_cv_file_magic_cmd ++-deplibs_check_method=$lt_cv_deplibs_check_method ++-test -z "$deplibs_check_method" && deplibs_check_method=unknown ++-])# AC_DEPLIBS_CHECK_METHOD ++- ++- ++-# AC_PROG_NM ++-# ---------- ++-# find the pathname to a BSD-compatible name lister ++-AC_DEFUN([AC_PROG_NM], ++-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++-[if test -n "$NM"; then ++- # Let the user override the test. ++- lt_cv_path_NM="$NM" ++-else ++- lt_nm_to_check="${ac_tool_prefix}nm" ++- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++- lt_nm_to_check="$lt_nm_to_check nm" ++- fi ++- for lt_tmp_nm in $lt_nm_to_check; do ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- tmp_nm="$ac_dir/$lt_tmp_nm" ++- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++- # Check to see if the nm accepts a BSD-compat flag. ++- # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++- # nm: unknown option "B" ignored ++- # Tru64's nm complains that /dev/null is an invalid object file ++- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++- */dev/null* | *'Invalid file or object type'*) ++- lt_cv_path_NM="$tmp_nm -B" ++- break ++- ;; ++- *) ++- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++- */dev/null*) ++- lt_cv_path_NM="$tmp_nm -p" ++- break ++- ;; ++- *) ++- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++- continue # so that we can try to find one that supports BSD flags ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- done ++- IFS="$lt_save_ifs" ++- done ++- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++-fi]) ++-NM="$lt_cv_path_NM" ++-])# AC_PROG_NM ++- ++- ++-# AC_CHECK_LIBM ++-# ------------- ++-# check for math library ++-AC_DEFUN([AC_CHECK_LIBM], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-LIBM= ++-case $host in ++-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++- # These system don't have libm, or don't need it ++- ;; ++-*-ncr-sysv4.3*) ++- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++- ;; ++-*) ++- AC_CHECK_LIB(m, cos, LIBM="-lm") ++- ;; ++-esac ++-])# AC_CHECK_LIBM ++- ++- ++-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++-# ----------------------------------- ++-# sets LIBLTDL to the link flags for the libltdl convenience library and ++-# LTDLINCL to the include flags for the libltdl header and adds ++-# --enable-ltdl-convenience to the configure arguments. Note that ++-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++-# (note the single quotes!). If your package is not flat and you're not ++-# using automake, define top_builddir and top_srcdir appropriately in ++-# the Makefiles. ++-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++- case $enable_ltdl_convenience in ++- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++- "") enable_ltdl_convenience=yes ++- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ++- esac ++- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++- # For backwards non-gettext consistent compatibility... ++- INCLTDL="$LTDLINCL" ++-])# AC_LIBLTDL_CONVENIENCE ++- ++- ++-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++-# ----------------------------------- ++-# sets LIBLTDL to the link flags for the libltdl installable library and ++-# LTDLINCL to the include flags for the libltdl header and adds ++-# --enable-ltdl-install to the configure arguments. Note that ++-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++-# and an installed libltdl is not found, it is assumed to be `libltdl'. ++-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++-# '${top_srcdir}/' (note the single quotes!). If your package is not ++-# flat and you're not using automake, define top_builddir and top_srcdir ++-# appropriately in the Makefiles. ++-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++- AC_CHECK_LIB(ltdl, lt_dlinit, ++- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++- [if test x"$enable_ltdl_install" = xno; then ++- AC_MSG_WARN([libltdl not installed, but installation disabled]) ++- else ++- enable_ltdl_install=yes ++- fi ++- ]) ++- if test x"$enable_ltdl_install" = x"yes"; then ++- ac_configure_args="$ac_configure_args --enable-ltdl-install" ++- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++- else ++- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++- LIBLTDL="-lltdl" ++- LTDLINCL= ++- fi ++- # For backwards non-gettext consistent compatibility... ++- INCLTDL="$LTDLINCL" ++-])# AC_LIBLTDL_INSTALLABLE ++- ++- ++-# AC_LIBTOOL_CXX ++-# -------------- ++-# enable support for C++ libraries ++-AC_DEFUN([AC_LIBTOOL_CXX], ++-[AC_REQUIRE([_LT_AC_LANG_CXX]) ++-])# AC_LIBTOOL_CXX ++- ++- ++-# _LT_AC_LANG_CXX ++-# --------------- ++-AC_DEFUN([_LT_AC_LANG_CXX], ++-[AC_REQUIRE([AC_PROG_CXX]) ++-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++-])# _LT_AC_LANG_CXX ++- ++-# _LT_AC_PROG_CXXCPP ++-# ------------------ ++-AC_DEFUN([_LT_AC_PROG_CXXCPP], ++-[ ++-AC_REQUIRE([AC_PROG_CXX]) ++-if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++- (test "X$CXX" != "Xg++"))) ; then ++- AC_PROG_CXXCPP ++-fi ++-])# _LT_AC_PROG_CXXCPP ++- ++-# AC_LIBTOOL_F77 ++-# -------------- ++-# enable support for Fortran 77 libraries ++-AC_DEFUN([AC_LIBTOOL_F77], ++-[AC_REQUIRE([_LT_AC_LANG_F77]) ++-])# AC_LIBTOOL_F77 ++- ++- ++-# _LT_AC_LANG_F77 ++-# --------------- ++-AC_DEFUN([_LT_AC_LANG_F77], ++-[AC_REQUIRE([AC_PROG_F77]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++-])# _LT_AC_LANG_F77 ++- ++- ++-# AC_LIBTOOL_GCJ ++-# -------------- ++-# enable support for GCJ libraries ++-AC_DEFUN([AC_LIBTOOL_GCJ], ++-[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++-])# AC_LIBTOOL_GCJ ++- ++- ++-# _LT_AC_LANG_GCJ ++-# --------------- ++-AC_DEFUN([_LT_AC_LANG_GCJ], ++-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++-])# _LT_AC_LANG_GCJ ++- ++- ++-# AC_LIBTOOL_RC ++-# ------------- ++-# enable support for Windows resource files ++-AC_DEFUN([AC_LIBTOOL_RC], ++-[AC_REQUIRE([LT_AC_PROG_RC]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++-])# AC_LIBTOOL_RC ++- ++- ++-# AC_LIBTOOL_LANG_C_CONFIG ++-# ------------------------ ++-# Ensure that the configuration vars for the C compiler are ++-# suitably defined. Those variables are subsequently used by ++-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++-AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++-[lt_save_CC="$CC" ++-AC_LANG_PUSH(C) ++- ++-# Source file extension for C test sources. ++-ac_ext=c ++- ++-# Object file extension for compiled C test sources. ++-objext=o ++-_LT_AC_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="int some_variable = 0;\n" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='int main(){return(0);}\n' ++- ++-_LT_AC_SYS_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-## CAVEAT EMPTOR: ++-## There is no encapsulation within the following macros, do not change ++-## the running order or otherwise move them around unless you know exactly ++-## what you are doing... ++-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++-AC_LIBTOOL_PROG_COMPILER_PIC($1) ++-AC_LIBTOOL_PROG_CC_C_O($1) ++-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++-AC_LIBTOOL_PROG_LD_SHLIBS($1) ++-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++-AC_LIBTOOL_SYS_LIB_STRIP ++-AC_LIBTOOL_DLOPEN_SELF ++- ++-# Report which library types will actually be built ++-AC_MSG_CHECKING([if libtool supports shared libraries]) ++-AC_MSG_RESULT([$can_build_shared]) ++- ++-AC_MSG_CHECKING([whether to build shared libraries]) ++-test "$can_build_shared" = "no" && enable_shared=no ++- ++-# On AIX, shared libraries and static libraries use the same namespace, and ++-# are all built from PIC. ++-case $host_os in ++-aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- ++-aix4* | aix5*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++-esac ++-AC_MSG_RESULT([$enable_shared]) ++- ++-AC_MSG_CHECKING([whether to build static libraries]) ++-# Make sure either enable_shared or enable_static is yes. ++-test "$enable_shared" = yes || enable_static=yes ++-AC_MSG_RESULT([$enable_static]) ++- ++-AC_LIBTOOL_CONFIG($1) ++- ++-AC_LANG_POP ++-CC="$lt_save_CC" ++-])# AC_LIBTOOL_LANG_C_CONFIG ++- ++- ++-# AC_LIBTOOL_LANG_CXX_CONFIG ++-# -------------------------- ++-# Ensure that the configuration vars for the C compiler are ++-# suitably defined. Those variables are subsequently used by ++-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) ++-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], ++-[AC_LANG_PUSH(C++) ++-AC_REQUIRE([AC_PROG_CXX]) ++-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++- ++-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++-_LT_AC_TAGVAR(always_export_symbols, $1)=no ++-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_AC_TAGVAR(hardcode_direct, $1)=no ++-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++-_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++-_LT_AC_TAGVAR(module_cmds, $1)= ++-_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_AC_TAGVAR(no_undefined_flag, $1)= ++-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Dependencies to place before and after the object being linked: ++-_LT_AC_TAGVAR(predep_objects, $1)= ++-_LT_AC_TAGVAR(postdep_objects, $1)= ++-_LT_AC_TAGVAR(predeps, $1)= ++-_LT_AC_TAGVAR(postdeps, $1)= ++-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++- ++-# Source file extension for C++ test sources. ++-ac_ext=cpp ++- ++-# Object file extension for compiled C++ test sources. ++-objext=o ++-_LT_AC_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="int some_variable = 0;\n" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' ++- ++-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++-_LT_AC_SYS_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-# Allow CC to be a program name with arguments. ++-lt_save_CC=$CC ++-lt_save_LD=$LD ++-lt_save_GCC=$GCC ++-GCC=$GXX ++-lt_save_with_gnu_ld=$with_gnu_ld ++-lt_save_path_LD=$lt_cv_path_LD ++-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++-else ++- $as_unset lt_cv_prog_gnu_ld ++-fi ++-if test -n "${lt_cv_path_LDCXX+set}"; then ++- lt_cv_path_LD=$lt_cv_path_LDCXX ++-else ++- $as_unset lt_cv_path_LD ++-fi ++-test -z "${LDCXX+set}" || LD=$LDCXX ++-CC=${CXX-"c++"} ++-compiler=$CC ++-_LT_AC_TAGVAR(compiler, $1)=$CC ++-_LT_CC_BASENAME([$compiler]) ++- ++-# We don't want -fno-exception wen compiling C++ code, so set the ++-# no_builtin_flag separately ++-if test "$GXX" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++-else ++- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++-fi ++- ++-if test "$GXX" = yes; then ++- # Set up default GNU C++ configuration ++- ++- AC_PROG_LD ++- ++- # Check if GNU C++ uses GNU ld as the underlying linker, since the ++- # archiving commands below assume that GNU ld is being used. ++- if test "$with_gnu_ld" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++- # investigate it a little bit more. (MM) ++- wlarc='${wl}' ++- ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++- grep 'no-whole-archive' > /dev/null; then ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- with_gnu_ld=no ++- wlarc= ++- ++- # A generic and very simple default shared library creation ++- # command for GNU C++ for the case where it uses the native ++- # linker, instead of GNU ld. If possible, this setting should ++- # overridden to take advantage of the native linker features on ++- # the platform it is being used on. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- fi ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++- ++-else ++- GXX=no ++- with_gnu_ld=no ++- wlarc= ++-fi ++- ++-# PORTME: fill in a description of your system's C++ link characteristics ++-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++-_LT_AC_TAGVAR(ld_shlibs, $1)=yes ++-case $host_os in ++- aix3*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aix4* | aix5*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++- for ld_flag in $LDFLAGS; do ++- case $ld_flag in ++- *-brtl*) ++- aix_use_runtimelinking=yes ++- break ++- ;; ++- esac ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_AC_TAGVAR(archive_cmds, $1)='' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- if test "$GXX" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && \ ++- strings "$collect2name" | grep resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- else ++- # We have old collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- chorus*) ++- case $cc_basename in ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- cygwin* | mingw* | pw32*) ++- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ++- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- darwin* | rhapsody*) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++- ;; ++- *) # Darwin 1.3 on ++- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- else ++- case ${MACOSX_DEPLOYMENT_TARGET} in ++- 10.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- ;; ++- 10.*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- if test "$GXX" = yes ; then ++- lt_int_apple_cc_single_mod=no ++- output_verbose_link_cmd='echo' ++- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++- lt_int_apple_cc_single_mod=yes ++- fi ++- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++- fi ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- else ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- fi ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- else ++- case $cc_basename in ++- xlc*) ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- ;; ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++- ;; ++- ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- freebsd[[12]]*) ++- # C++ shared libraries reported to be fairly broken before switch to ELF ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- freebsd-elf*) ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- ;; ++- freebsd* | kfreebsd*-gnu | dragonfly*) ++- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++- # conventions ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- ;; ++- gnu*) ++- ;; ++- hpux9*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- hpux10*|hpux11*) ++- if test $with_gnu_ld = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- ;; ++- *) ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- esac ++- fi ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ;; ++- esac ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test $with_gnu_ld = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- fi ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- interix3*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- irix5* | irix6*) ++- case $cc_basename in ++- CC*) ++- # SGI C++ ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++- fi ++- fi ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- esac ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- linux*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++- ;; ++- icpc*) ++- # Intel C++ ++- with_gnu_ld=yes ++- # version 8.0 and above of icpc choke on multiply defined symbols ++- # if we add $predep_objects and $postdep_objects, however 7.1 and ++- # earlier do not add the objects themselves. ++- case `$CC -V 2>&1` in ++- *"Version 7."*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- *) # Version 8.0 or newer ++- tmp_idyn= ++- case $host_cpu in ++- ia64*) tmp_idyn=' -i_dynamic';; ++- esac ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++- ;; ++- pgCC*) ++- # Portland Group C++ compiler ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- ;; ++- cxx*) ++- # Compaq C++ ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++- ++- runpath_var=LD_RUN_PATH ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- esac ++- ;; ++- lynxos*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- m88k*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++- wlarc= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- fi ++- # Workaround some broken pre-1.5 toolchains ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++- ;; ++- openbsd2*) ++- # C++ shared libraries are fairly broken ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- openbsd*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- fi ++- output_verbose_link_cmd='echo' ++- ;; ++- osf3*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Archives containing C++ object files must be created using ++- # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++- ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- cxx*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++- ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Archives containing C++ object files must be created using ++- # the KAI C++ compiler. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- cxx*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++- echo "-hidden">> $lib.exp~ ++- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++- $rm $lib.exp' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++- ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- psos*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- lcc*) ++- # Lucid ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The C++ compiler is used as linker so we must use $wl ++- # flag to pass the commands to the underlying system ++- # linker. We must also pass each convience library through ++- # to the system linker between allextract/defaultextract. ++- # The C++ compiler will combine linker options so we ++- # cannot just pass the convience library names through ++- # without $wl. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++- ;; ++- esac ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- output_verbose_link_cmd='echo' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -xar", where "CC" is the Sun C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- ++- # The C++ compiler must be used to create the archive. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++- ;; ++- *) ++- # GNU C++ compiler with Solaris linker ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++- if $CC --version | grep -v '^2\.7' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++- else ++- # g++ 2.7 appears to require `-G' NOT `-shared' on this ++- # platform. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++- fi ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++- fi ++- ;; ++- esac ++- ;; ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- # For security reasons, it is highly recommended that you always ++- # use absolute paths for naming shared libraries, and exclude the ++- # DT_RUNPATH tag from executables and libraries. But doing so ++- # requires that you compile everything twice, which is a pain. ++- # So that behaviour is only enabled if SCOABSPATH is set to a ++- # non-empty value in the environment. Most likely only useful for ++- # creating official distributions of packages. ++- # This is a hack until libtool officially supports absolute path ++- # names for shared libraries. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- vxworks*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++-esac ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++-_LT_AC_TAGVAR(GCC, $1)="$GXX" ++-_LT_AC_TAGVAR(LD, $1)="$LD" ++- ++-## CAVEAT EMPTOR: ++-## There is no encapsulation within the following macros, do not change ++-## the running order or otherwise move them around unless you know exactly ++-## what you are doing... ++-AC_LIBTOOL_POSTDEP_PREDEP($1) ++-AC_LIBTOOL_PROG_COMPILER_PIC($1) ++-AC_LIBTOOL_PROG_CC_C_O($1) ++-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++-AC_LIBTOOL_PROG_LD_SHLIBS($1) ++-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++- ++-AC_LIBTOOL_CONFIG($1) ++- ++-AC_LANG_POP ++-CC=$lt_save_CC ++-LDCXX=$LD ++-LD=$lt_save_LD ++-GCC=$lt_save_GCC ++-with_gnu_ldcxx=$with_gnu_ld ++-with_gnu_ld=$lt_save_with_gnu_ld ++-lt_cv_path_LDCXX=$lt_cv_path_LD ++-lt_cv_path_LD=$lt_save_path_LD ++-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++-])# AC_LIBTOOL_LANG_CXX_CONFIG ++- ++-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++-# ------------------------------------ ++-# Figure out "hidden" library dependencies from verbose ++-# compiler output when linking a shared library. ++-# Parse the compiler output and extract the necessary ++-# objects, libraries and library flags. ++-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++-dnl we can't use the lt_simple_compile_test_code here, ++-dnl because it contains code intended for an executable, ++-dnl not a library. It's possible we should let each ++-dnl tag define a new lt_????_link_test_code variable, ++-dnl but it's only used here... ++-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" ++-ifelse([$1], [], ++-[#! $SHELL ++- ++-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) ++-# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++-# ++-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ++-# Free Software Foundation, Inc. ++-# ++-# This file is part of GNU Libtool: ++-# Originally by Gordon Matzigkeit , 1996 ++-# ++-# 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. ++-# ++-# As a special exception to the GNU General Public License, if you ++-# distribute this file as part of a program that contains a ++-# configuration script generated by Autoconf, you may include it under ++-# the same distribution terms that you use for the rest of that program. ++- ++-# A sed program that does not truncate output. ++-SED=$lt_SED ++- ++-# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++-Xsed="$SED -e 1s/^X//" ++- ++-# The HP-UX ksh and POSIX shell print the target directory to stdout ++-# if CDPATH is set. ++-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++- ++-# The names of the tagged configurations supported by this script. ++-available_tags= ++- ++-# ### BEGIN LIBTOOL CONFIG], ++-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) ++- ++-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++- ++-# Shell to use when invoking shell scripts. ++-SHELL=$lt_SHELL ++- ++-# Whether or not to build shared libraries. ++-build_libtool_libs=$enable_shared ++- ++-# Whether or not to build static libraries. ++-build_old_libs=$enable_static ++- ++-# Whether or not to add -lc for building shared libraries. ++-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) ++- ++-# Whether or not to disallow shared libs when runtime libs are static ++-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) ++- ++-# Whether or not to optimize for fast installation. ++-fast_install=$enable_fast_install ++- ++-# The host system. ++-host_alias=$host_alias ++-host=$host ++-host_os=$host_os ++- ++-# The build system. ++-build_alias=$build_alias ++-build=$build ++-build_os=$build_os ++- ++-# An echo program that does not interpret backslashes. ++-echo=$lt_echo ++- ++-# The archiver. ++-AR=$lt_AR ++-AR_FLAGS=$lt_AR_FLAGS ++- ++-# A C compiler. ++-LTCC=$lt_LTCC ++- ++-# LTCC compiler flags. ++-LTCFLAGS=$lt_LTCFLAGS ++- ++-# A language-specific compiler. ++-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) ++- ++-# Is the compiler the GNU C compiler? ++-with_gcc=$_LT_AC_TAGVAR(GCC, $1) ++- ++-# An ERE matcher. ++-EGREP=$lt_EGREP ++- ++-# The linker used to build libraries. ++-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) ++- ++-# Whether we need hard or soft links. ++-LN_S=$lt_LN_S ++- ++-# A BSD-compatible nm program. ++-NM=$lt_NM ++- ++-# A symbol stripping program ++-STRIP=$lt_STRIP ++- ++-# Used to examine libraries when file_magic_cmd begins "file" ++-MAGIC_CMD=$MAGIC_CMD ++- ++-# Used on cygwin: DLL creation program. ++-DLLTOOL="$DLLTOOL" ++- ++-# Used on cygwin: object dumper. ++-OBJDUMP="$OBJDUMP" ++- ++-# Used on cygwin: assembler. ++-AS="$AS" ++- ++-# The name of the directory that contains temporary libtool files. ++-objdir=$objdir ++- ++-# How to create reloadable object files. ++-reload_flag=$lt_reload_flag ++-reload_cmds=$lt_reload_cmds ++- ++-# How to pass a linker flag through the compiler. ++-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++- ++-# Object file suffix (normally "o"). ++-objext="$ac_objext" ++- ++-# Old archive suffix (normally "a"). ++-libext="$libext" ++- ++-# Shared library suffix (normally ".so"). ++-shrext_cmds='$shrext_cmds' ++- ++-# Executable file suffix (normally ""). ++-exeext="$exeext" ++- ++-# Additional compiler flags for building library objects. ++-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++-pic_mode=$pic_mode ++- ++-# What is the maximum length of a command? ++-max_cmd_len=$lt_cv_sys_max_cmd_len ++- ++-# Does compiler simultaneously support -c and -o options? ++-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) ++- ++-# Must we lock files when doing compilation? ++-need_locks=$lt_need_locks ++- ++-# Do we need the lib prefix for modules? ++-need_lib_prefix=$need_lib_prefix ++- ++-# Do we need a version for libraries? ++-need_version=$need_version ++- ++-# Whether dlopen is supported. ++-dlopen_support=$enable_dlopen ++- ++-# Whether dlopen of programs is supported. ++-dlopen_self=$enable_dlopen_self ++- ++-# Whether dlopen of statically linked programs is supported. ++-dlopen_self_static=$enable_dlopen_self_static ++- ++-# Compiler flag to prevent dynamic linking. ++-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) ++- ++-# Compiler flag to turn off builtin functions. ++-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) ++- ++-# Compiler flag to allow reflexive dlopens. ++-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) ++- ++-# Compiler flag to generate shared objects directly from archives. ++-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) ++- ++-# Compiler flag to generate thread-safe objects. ++-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) ++- ++-# Library versioning type. ++-version_type=$version_type ++- ++-# Format of library name prefix. ++-libname_spec=$lt_libname_spec ++- ++-# List of archive names. First name is the real one, the rest are links. ++-# The last name is the one that the linker finds with -lNAME. ++-library_names_spec=$lt_library_names_spec ++- ++-# The coded name of the library, if different from the real name. ++-soname_spec=$lt_soname_spec ++- ++-# Commands used to build and install an old-style archive. ++-RANLIB=$lt_RANLIB ++-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) ++-old_postinstall_cmds=$lt_old_postinstall_cmds ++-old_postuninstall_cmds=$lt_old_postuninstall_cmds ++- ++-# Create an old-style archive from a shared archive. ++-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) ++- ++-# Create a temporary old-style archive to link instead of a shared archive. ++-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) ++- ++-# Commands used to build and install a shared archive. ++-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) ++-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) ++-postinstall_cmds=$lt_postinstall_cmds ++-postuninstall_cmds=$lt_postuninstall_cmds ++- ++-# Commands used to build a loadable module (assumed same as above if empty) ++-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) ++-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) ++- ++-# Commands to strip libraries. ++-old_striplib=$lt_old_striplib ++-striplib=$lt_striplib ++- ++-# Dependencies to place before the objects being linked to create a ++-# shared library. ++-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) ++- ++-# Dependencies to place after the objects being linked to create a ++-# shared library. ++-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) ++- ++-# Dependencies to place before the objects being linked to create a ++-# shared library. ++-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) ++- ++-# Dependencies to place after the objects being linked to create a ++-# shared library. ++-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) ++- ++-# The library search path used internally by the compiler when linking ++-# a shared library. ++-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) ++- ++-# Method to check whether dependent libraries are shared objects. ++-deplibs_check_method=$lt_deplibs_check_method ++- ++-# Command to use when deplibs_check_method == file_magic. ++-file_magic_cmd=$lt_file_magic_cmd ++- ++-# Flag that allows shared libraries with undefined symbols to be built. ++-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) ++- ++-# Flag that forces no undefined symbols. ++-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) ++- ++-# Commands used to finish a libtool library installation in a directory. ++-finish_cmds=$lt_finish_cmds ++- ++-# Same as above, but a single script fragment to be evaled but not shown. ++-finish_eval=$lt_finish_eval ++- ++-# Take the output of nm and produce a listing of raw symbols and C names. ++-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++- ++-# Transform the output of nm in a proper C declaration ++-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++- ++-# Transform the output of nm in a C name address pair ++-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++- ++-# This is the shared library runtime path variable. ++-runpath_var=$runpath_var ++- ++-# This is the shared library path variable. ++-shlibpath_var=$shlibpath_var ++- ++-# Is shlibpath searched before the hard-coded library search path? ++-shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++- ++-# How to hardcode a shared library path into an executable. ++-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) ++- ++-# Whether we should hardcode library paths into libraries. ++-hardcode_into_libs=$hardcode_into_libs ++- ++-# Flag to hardcode \$libdir into a binary during linking. ++-# This must work even if \$libdir does not exist. ++-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++- ++-# If ld is used when linking, flag to hardcode \$libdir into ++-# a binary during linking. This must work even if \$libdir does ++-# not exist. ++-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) ++- ++-# Whether we need a single -rpath flag with a separated argument. ++-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) ++- ++-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++-# resulting binary. ++-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) ++- ++-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++-# resulting binary. ++-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) ++- ++-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++-# the resulting binary. ++-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) ++- ++-# Set to yes if building a shared library automatically hardcodes DIR into the library ++-# and all subsequent libraries and executables linked against it. ++-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) ++- ++-# Variables whose values should be saved in libtool wrapper scripts and ++-# restored at relink time. ++-variables_saved_for_relink="$variables_saved_for_relink" ++- ++-# Whether libtool must link a program against all its dependency libraries. ++-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) ++- ++-# Compile-time system search path for libraries ++-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++- ++-# Run-time system search path for libraries ++-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++- ++-# Fix the shell variable \$srcfile for the compiler. ++-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" ++- ++-# Set to yes if exported symbols are required. ++-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) ++- ++-# The commands to list exported symbols. ++-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) ++- ++-# The commands to extract the exported symbol list from a shared archive. ++-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++- ++-# Symbols that should not be listed in the preloaded symbols. ++-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) ++- ++-# Symbols that must always be exported. ++-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) ++- ++-ifelse([$1],[], ++-[# ### END LIBTOOL CONFIG], ++-[# ### END LIBTOOL TAG CONFIG: $tagname]) ++- ++-__EOF__ ++- ++-ifelse([$1],[], [ ++- case $host_os in ++- aix3*) ++- cat <<\EOF >> "$cfgfile" ++- ++-# AIX sometimes has problems with the GCC collect2 program. For some ++-# reason, if we set the COLLECT_NAMES environment variable, the problems ++-# vanish in a puff of smoke. ++-if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++-fi ++-EOF ++- ;; ++- esac ++- ++- # We use sed instead of cat because bash on DJGPP gets confused if ++- # if finds mixed CR/LF and LF-only lines. Since sed operates in ++- # text mode, it properly converts lines to CR/LF. This bash problem ++- # is reportedly fixed, but why not run on old versions too? ++- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++- ++- mv -f "$cfgfile" "$ofile" || \ ++- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++- chmod +x "$ofile" ++-]) ++-else ++- # If there is no Makefile yet, we rely on a make rule to execute ++- # `config.status --recheck' to rerun these tests and create the ++- # libtool script then. ++- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++- if test -f "$ltmain_in"; then ++- test -f Makefile && make "$ltmain" ++- fi ++-fi ++-])# AC_LIBTOOL_CONFIG ++- ++- ++-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) ++-# ------------------------------------------- ++-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], ++-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++- ++-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++- ++-if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++- ++- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++- lt_cv_prog_compiler_rtti_exceptions, ++- [-fno-rtti -fno-exceptions], [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++-fi ++-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI ++- ++- ++-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++-# --------------------------------- ++-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], ++-[AC_REQUIRE([AC_CANONICAL_HOST]) ++-AC_REQUIRE([AC_PROG_NM]) ++-AC_REQUIRE([AC_OBJEXT]) ++-# Check for command to grab the raw symbol name followed by C symbol from nm. ++-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++-[ ++-# These are sane defaults that work on at least a few old systems. ++-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++- ++-# Character class describing NM global symbol codes. ++-symcode='[[BCDEGRST]]' ++- ++-# Regexp to match symbols that can be accessed directly from C. ++-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++- ++-# Transform an extracted symbol line into a proper C declaration ++-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++- ++-# Transform an extracted symbol line into symbol name and symbol address ++-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++- ++-# Define system-specific variables. ++-case $host_os in ++-aix*) ++- symcode='[[BCDT]]' ++- ;; ++-cygwin* | mingw* | pw32*) ++- symcode='[[ABCDGISTW]]' ++- ;; ++-hpux*) # Its linker distinguishes data from code symbols ++- if test "$host_cpu" = ia64; then ++- symcode='[[ABCDEGRST]]' ++- fi ++- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++- ;; ++-linux*) ++- if test "$host_cpu" = ia64; then ++- symcode='[[ABCDGIRSTW]]' ++- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++- fi ++- ;; ++-irix* | nonstopux*) ++- symcode='[[BCDEGRST]]' ++- ;; ++-osf*) ++- symcode='[[BCDEGQRST]]' ++- ;; ++-solaris*) ++- symcode='[[BDRT]]' ++- ;; ++-sco3.2v5*) ++- symcode='[[DT]]' ++- ;; ++-sysv4.2uw2*) ++- symcode='[[DT]]' ++- ;; ++-sysv5* | sco5v6* | unixware* | OpenUNIX*) ++- symcode='[[ABDT]]' ++- ;; ++-sysv4) ++- symcode='[[DFNSTU]]' ++- ;; ++-esac ++- ++-# Handle CRLF in mingw tool chain ++-opt_cr= ++-case $build_os in ++-mingw*) ++- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++- ;; ++-esac ++- ++-# If we're using GNU nm, then use its standard symbol codes. ++-case `$NM -V 2>&1` in ++-*GNU* | *'with BFD'*) ++- symcode='[[ABCDGIRSTW]]' ;; ++-esac ++- ++-# Try without a prefix undercore, then with it. ++-for ac_symprfx in "" "_"; do ++- ++- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++- symxfrm="\\1 $ac_symprfx\\2 \\2" ++- ++- # Write the raw and C identifiers. ++- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++- ++- # Check to see that the pipe works correctly. ++- pipe_works=no ++- ++- rm -f conftest* ++- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then ++- # Try sorting and uniquifying the output. ++- if sort "$nlist" | uniq > "$nlist"T; then ++- mv -f "$nlist"T "$nlist" ++- else ++- rm -f "$nlist"T ++- fi ++- ++- # Make sure that we snagged all the symbols we need. ++- if grep ' nm_test_var$' "$nlist" >/dev/null; then ++- if grep ' nm_test_func$' "$nlist" >/dev/null; then ++- cat < conftest.$ac_ext ++-#ifdef __cplusplus ++-extern "C" { ++-#endif ++- ++-EOF ++- # Now generate the symbol file. ++- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++- ++- cat <> conftest.$ac_ext ++-#if defined (__STDC__) && __STDC__ ++-# define lt_ptr_t void * ++-#else ++-# define lt_ptr_t char * ++-# define const ++-#endif ++- ++-/* The mapping between symbol names and symbols. */ ++-const struct { ++- const char *name; ++- lt_ptr_t address; ++-} ++-lt_preloaded_symbols[[]] = ++-{ ++-EOF ++- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++- cat <<\EOF >> conftest.$ac_ext ++- {0, (lt_ptr_t) 0} ++-}; ++- ++-#ifdef __cplusplus ++-} ++-#endif ++-EOF ++- # Now try linking the two files. ++- mv conftest.$ac_objext conftstm.$ac_objext ++- lt_save_LIBS="$LIBS" ++- lt_save_CFLAGS="$CFLAGS" ++- LIBS="conftstm.$ac_objext" ++- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++- pipe_works=yes ++- fi ++- LIBS="$lt_save_LIBS" ++- CFLAGS="$lt_save_CFLAGS" ++- else ++- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++- cat conftest.$ac_ext >&5 ++- fi ++- rm -f conftest* conftst* ++- ++- # Do not use the global_symbol_pipe unless it works. ++- if test "$pipe_works" = yes; then ++- break ++- else ++- lt_cv_sys_global_symbol_pipe= ++- fi ++-done ++-]) ++-if test -z "$lt_cv_sys_global_symbol_pipe"; then ++- lt_cv_sys_global_symbol_to_cdecl= ++-fi ++-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++- AC_MSG_RESULT(failed) ++-else ++- AC_MSG_RESULT(ok) ++-fi ++-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++- ++- ++-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) ++-# --------------------------------------- ++-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], ++-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= ++-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++- ++-AC_MSG_CHECKING([for $compiler option to produce PIC]) ++- ifelse([$1],[CXX],[ ++- # C++ specific cases for pic, static, wl, etc. ++- if test "$GXX" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- amigaos*) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- mingw* | os2* | pw32*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++- ;; ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- *djgpp*) ++- # DJGPP does not support shared libraries at all ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- interix3*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- hpux*) ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- case $host_os in ++- aix4* | aix5*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- chorus*) ++- case $cc_basename in ++- cxch68*) ++- # Green Hills C++ Compiler ++- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++- ;; ++- esac ++- ;; ++- darwin*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- case $cc_basename in ++- xlc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- esac ++- ;; ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- freebsd* | kfreebsd*-gnu | dragonfly*) ++- # FreeBSD uses GNU C++ ++- ;; ++- hpux9* | hpux10* | hpux11*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- if test "$host_cpu" != ia64; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- fi ++- ;; ++- aCC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- interix*) ++- # This is c89, which is MS Visual C++ (no shared libs) ++- # Anyone wants to do a port? ++- ;; ++- irix5* | irix6* | nonstopux*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- # CC pic flag -KPIC is the default. ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- linux*) ++- case $cc_basename in ++- KCC*) ++- # KAI C++ Compiler ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- icpc* | ecpc*) ++- # Intel C++ ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgCC*) ++- # Portland Group C++ compiler. ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- cxx*) ++- # Compaq C++ ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- lynxos*) ++- ;; ++- m88k*) ++- ;; ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- netbsd*) ++- ;; ++- osf3* | osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- cxx*) ++- # Digital/Compaq C++ ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- psos*) ++- ;; ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- lcc*) ++- # Lucid ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- esac ++- ;; ++- vxworks*) ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-], ++-[ ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- amigaos*) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- ++- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- ++- mingw* | pw32* | os2*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++- ;; ++- ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- ++- interix3*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- ++- msdosdjgpp*) ++- # Just because we use GCC doesn't mean we suddenly get shared libraries ++- # on systems that don't support them. ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- enable_shared=no ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- ++- hpux*) ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- # PORTME Check for flag to pass linker flags through the system compiler. ++- case $host_os in ++- aix*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- darwin*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- case $cc_basename in ++- xlc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- esac ++- ;; ++- ++- mingw* | pw32* | os2*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++- ;; ++- ++- hpux9* | hpux10* | hpux11*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- # Is there a better lt_prog_compiler_static that works with the bundled CC? ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC (with -KPIC) is the default. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- newsos6) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- linux*) ++- case $cc_basename in ++- icc* | ecc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgcc* | pgf77* | pgf90* | pgf95*) ++- # Portland Group compilers (*not* the Pentium gcc compiler, ++- # which looks to be a dead project) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ccc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All Alpha code is PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- esac ++- ;; ++- ++- osf3* | osf4* | osf5*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All OSF/1 code is PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- solaris*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- case $cc_basename in ++- f77* | f90* | f95*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4 | sysv4.2uw2* | sysv4.3*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec ;then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- unicos*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- ++- uts4*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-]) ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++- ++-# ++-# Check to make sure the PIC flag actually works. ++-# ++-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++- "" | " "*) ;; ++- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++- esac], ++- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++-fi ++-case $host_os in ++- # For platforms which do not support PIC, -DPIC is meaningless: ++- *djgpp*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++- ;; ++-esac ++- ++-# ++-# Check to make sure the static flag actually works. ++-# ++-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++- $lt_tmp_static_flag, ++- [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++-]) ++- ++- ++-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++-# ------------------------------------ ++-# See if the linker supports building shared libraries. ++-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++-ifelse([$1],[CXX],[ ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- case $host_os in ++- aix4* | aix5*) ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- fi ++- ;; ++- pw32*) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++- ;; ++- cygwin* | mingw*) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- *) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- esac ++-],[ ++- runpath_var= ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- _LT_AC_TAGVAR(archive_cmds, $1)= ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++- _LT_AC_TAGVAR(module_cmds, $1)= ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- # include_expsyms should be a list of space-separated symbols to be *always* ++- # included in the symbol list ++- _LT_AC_TAGVAR(include_expsyms, $1)= ++- # exclude_expsyms can be an extended regexp of symbols to exclude ++- # it will be wrapped by ` (' and `)$', so one must not match beginning or ++- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++- # as well as any symbol that contains `d'. ++- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++- # platforms (ab)use it in PIC code, but their linkers get confused if ++- # the symbol is explicitly referenced. Since portable code cannot ++- # rely on this symbol name, it's probably fine to never include it in ++- # preloaded symbol tables. ++- extract_expsyms_cmds= ++- # Just being paranoid about ensuring that cc_basename is set. ++- _LT_CC_BASENAME([$compiler]) ++- case $host_os in ++- cygwin* | mingw* | pw32*) ++- # FIXME: the MSVC++ port hasn't been tested in a loooong time ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- if test "$GCC" != yes; then ++- with_gnu_ld=no ++- fi ++- ;; ++- interix*) ++- # we just hope/assume this is gcc and not c89 (= MSVC++) ++- with_gnu_ld=yes ++- ;; ++- openbsd*) ++- with_gnu_ld=no ++- ;; ++- esac ++- ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- if test "$with_gnu_ld" = yes; then ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- wlarc='${wl}' ++- ++- # Set some defaults for GNU ld with shared library support. These ++- # are reset later if shared libraries are not supported. Putting them ++- # here allows them to be overridden if necessary. ++- runpath_var=LD_RUN_PATH ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- supports_anon_versioning=no ++- case `$LD -v 2>/dev/null` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++- *\ 2.11.*) ;; # other 2.11 versions ++- *) supports_anon_versioning=yes ;; ++- esac ++- ++- # See if GNU ld supports shared libraries. ++- case $host_os in ++- aix3* | aix4* | aix5*) ++- # On AIX/PPC, the GNU linker is very broken ++- if test "$host_cpu" != ia64; then ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <&2 ++- ++-*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++-*** to be unable to reliably create shared libraries on AIX. ++-*** Therefore, libtool is disabling shared libraries support. If you ++-*** really care for shared libraries, you may want to modify your PATH ++-*** so that a non-GNU linker is found, and then restart. ++- ++-EOF ++- fi ++- ;; ++- ++- amigaos*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- ++- # Samuel A. Falvo II reports ++- # that the semantics of dynamic libraries on AmigaOS, at least up ++- # to version 4, is to share data among multiple programs linked ++- # with the same dynamic library. Since this doesn't match the ++- # behavior of shared libraries on other platforms, we can't use ++- # them. ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- cygwin* | mingw* | pw32*) ++- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++- ++- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- interix3*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- ++- linux*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- tmp_addflag= ++- case $cc_basename,$host_cpu in ++- pgcc*) # Portland Group C compiler ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag' ++- ;; ++- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag -Mnomain' ;; ++- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++- tmp_addflag=' -i_dynamic' ;; ++- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++- tmp_addflag=' -i_dynamic -nofor_main' ;; ++- ifc* | ifort*) # Intel Fortran compiler ++- tmp_addflag=' -nofor_main' ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- ++- if test $supports_anon_versioning = yes; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- $echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++- wlarc= ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- fi ++- ;; ++- ++- solaris*) ++- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <&2 ++- ++-*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++-*** create shared libraries on Solaris systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.9.1 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-EOF ++- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++-*** reliably create shared libraries on SCO systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-_LT_EOF ++- ;; ++- *) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- wlarc= ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ++- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++- runpath_var= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- # PORTME fill in a description of your system's linker (not GNU ld) ++- case $host_os in ++- aix3*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++- # Note: this linker hardcodes the directories in LIBPATH if there ++- # are no directories specified by -L. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++- # Neither direct hardcoding nor static linking is supported with a ++- # broken collect2. ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- fi ++- ;; ++- ++- aix4* | aix5*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- fi ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++- for ld_flag in $LDFLAGS; do ++- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++- aix_use_runtimelinking=yes ++- break ++- fi ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_AC_TAGVAR(archive_cmds, $1)='' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- if test "$GCC" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && \ ++- strings "$collect2name" | grep resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- else ++- # We have old collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- amigaos*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- # see comment about different semantics on the GNU ld section ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- bsdi[[45]]*) ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++- ;; ++- ++- cygwin* | mingw* | pw32*) ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- # hardcode_libdir_flag_spec is actually meaningless, as there is ++- # no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Tell ltmain to make .lib files, not .a files. ++- libext=lib ++- # Tell ltmain to make .dll files, not .so files. ++- shrext_cmds=".dll" ++- # FIXME: Setting linknames here is a bad hack. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++- # The linker will automatically build a .lib file if we build a DLL. ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++- # FIXME: Should let the user specify the lib program. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' ++- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ;; ++- ++- darwin* | rhapsody*) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++- ;; ++- *) # Darwin 1.3 on ++- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- else ++- case ${MACOSX_DEPLOYMENT_TARGET} in ++- 10.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- ;; ++- 10.*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- if test "$GCC" = yes ; then ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- else ++- case $cc_basename in ++- xlc*) ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- ;; ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++- ;; ++- ++- dgux*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- freebsd1*) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++- # support. Future versions do this automatically, but an explicit c++rt0.o ++- # does not break anything, and helps significantly (at the cost of a little ++- # extra space). ++- freebsd2.2*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++- freebsd2*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++- freebsd* | kfreebsd*-gnu | dragonfly*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- hpux9*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- ++- hpux10*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- fi ++- ;; ++- ++- hpux11*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- else ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- fi ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- newsos6) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- openbsd*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- else ++- case $host_os in ++- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- ;; ++- esac ++- fi ++- ;; ++- ++- os2*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++- ;; ++- ++- osf3*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- osf4* | osf5*) # as osf3* with the addition of -msym flag ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- else ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++- ++- # Both c and cxx compiler support -rpath directly ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- solaris*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++- if test "$GCC" = yes; then ++- wlarc='${wl}' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++- else ++- wlarc='' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine linker options so we ++- # cannot just pass the convience library names through ++- # without $wl, iff we do not link with $LD. ++- # Luckily, gcc supports the same syntax we need for Sun Studio. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- case $wlarc in ++- '') ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++- *) ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; ++- esac ;; ++- esac ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- sunos4*) ++- if test "x$host_vendor" = xsequent; then ++- # Use $CC to link under sequent, because it throws in some extra .o ++- # files that make .init and .fini sections work. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4) ++- case $host_vendor in ++- sni) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++- ;; ++- siemens) ++- ## LD is ld it makes a PLAMLIB ++- ## CC just makes a GrossModule. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- ;; ++- motorola) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++- ;; ++- esac ++- runpath_var='LD_RUN_PATH' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4.3*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var=LD_RUN_PATH ++- hardcode_runpath_var=yes ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- fi ++- ;; ++- ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- uts4*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++-]) ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++-# ++-# Do we need to explicitly link libc? ++-# ++-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++-x|xyes) ++- # Assume -lc should be added ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- ++- if test "$enable_shared" = yes && test "$GCC" = yes; then ++- case $_LT_AC_TAGVAR(archive_cmds, $1) in ++- *'~'*) ++- # FIXME: we may have to deal with multi-command sequences. ++- ;; ++- '$CC '*) ++- # Test whether the compiler implicitly links with -lc since on some ++- # systems, -lgcc has to come before -lc. If gcc already passes -lc ++- # to ld, don't add -lc before -lgcc. ++- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++- $rm conftest* ++- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++- soname=conftest ++- lib=conftest ++- libobjs=conftest.$ac_objext ++- deplibs= ++- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++- compiler_flags=-v ++- linker_flags=-v ++- verstring= ++- output_objdir=. ++- libname=conftest ++- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++- then ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- else ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- fi ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++- else ++- cat conftest.err 1>&5 ++- fi ++- $rm conftest* ++- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++- ;; ++- esac ++- fi ++- ;; ++-esac ++-])# AC_LIBTOOL_PROG_LD_SHLIBS ++- ++- ++-# _LT_AC_FILE_LTDLL_C ++-# ------------------- ++-# Be careful that the start marker always follows a newline. ++-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++-# /* ltdll.c starts here */ ++-# #define WIN32_LEAN_AND_MEAN ++-# #include ++-# #undef WIN32_LEAN_AND_MEAN ++-# #include ++-# ++-# #ifndef __CYGWIN__ ++-# # ifdef __CYGWIN32__ ++-# # define __CYGWIN__ __CYGWIN32__ ++-# # endif ++-# #endif ++-# ++-# #ifdef __cplusplus ++-# extern "C" { ++-# #endif ++-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++-# #ifdef __cplusplus ++-# } ++-# #endif ++-# ++-# #ifdef __CYGWIN__ ++-# #include ++-# DECLARE_CYGWIN_DLL( DllMain ); ++-# #endif ++-# HINSTANCE __hDllInstance_base; ++-# ++-# BOOL APIENTRY ++-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++-# { ++-# __hDllInstance_base = hInst; ++-# return TRUE; ++-# } ++-# /* ltdll.c ends here */ ++-])# _LT_AC_FILE_LTDLL_C ++- ++- ++-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++-# --------------------------------- ++-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++- ++- ++-# old names ++-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++- ++-# This is just to silence aclocal about the macro not being used ++-ifelse([AC_DISABLE_FAST_INSTALL]) ++- ++-AC_DEFUN([LT_AC_PROG_GCJ], ++-[AC_CHECK_TOOL(GCJ, gcj, no) ++- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++- AC_SUBST(GCJFLAGS) ++-]) ++- ++-AC_DEFUN([LT_AC_PROG_RC], ++-[AC_CHECK_TOOL(RC, windres, no) ++-]) ++- ++-############################################################ ++-# NOTE: This macro has been submitted for inclusion into # ++-# GNU Autoconf as AC_PROG_SED. When it is available in # ++-# a released version of Autoconf we should remove this # ++-# macro and use it instead. # ++-############################################################ ++-# LT_AC_PROG_SED ++-# -------------- ++-# Check for a fully-functional sed program, that truncates ++-# as few characters as possible. Prefer GNU sed if found. ++-AC_DEFUN([LT_AC_PROG_SED], ++-[AC_MSG_CHECKING([for a sed that does not truncate output]) ++-AC_CACHE_VAL(lt_cv_path_SED, ++-[# Loop through the user's path and test for sed and gsed. ++-# Then use that list of sed's as ones to test for truncation. ++-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++-for as_dir in $PATH ++-do ++- IFS=$as_save_IFS ++- test -z "$as_dir" && as_dir=. ++- for lt_ac_prog in sed gsed; do ++- for ac_exec_ext in '' $ac_executable_extensions; do ++- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++- fi ++- done ++- done ++-done ++-lt_ac_max=0 ++-lt_ac_count=0 ++-# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++-# along with /bin/sed that truncates output. ++-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++- test ! -f $lt_ac_sed && continue ++- cat /dev/null > conftest.in ++- lt_ac_count=0 ++- echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++- # Check for GNU sed and select it if it is found. ++- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++- lt_cv_path_SED=$lt_ac_sed ++- break ++- fi ++- while true; do ++- cat conftest.in conftest.in >conftest.tmp ++- mv conftest.tmp conftest.in ++- cp conftest.in conftest.nl ++- echo >>conftest.nl ++- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++- cmp -s conftest.out conftest.nl || break ++- # 10000 chars as input seems more than enough ++- test $lt_ac_count -gt 10 && break ++- lt_ac_count=`expr $lt_ac_count + 1` ++- if test $lt_ac_count -gt $lt_ac_max; then ++- lt_ac_max=$lt_ac_count ++- lt_cv_path_SED=$lt_ac_sed ++- fi ++- done ++-done ++-]) ++-SED=$lt_cv_path_SED ++-AC_MSG_RESULT([$SED]) ++-]) ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -241,19 +241,6 @@ all: rfbconfig.h ++ .SUFFIXES: ++ am--refresh: ++ @: ++-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++- @for dep in $?; do \ ++- case '$(am__configure_deps)' in \ ++- *$$dep*) \ ++- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ++- cd $(srcdir) && $(AUTOMAKE) --gnu \ ++- && exit 0; \ ++- exit 1;; \ ++- esac; \ ++- done; \ ++- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++- cd $(top_srcdir) && \ ++- $(AUTOMAKE) --gnu Makefile ++ .PRECIOUS: Makefile ++ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ +diff --git a/feeds/packages/libs/libvncserver/patches/.svn/text-base/100-noexamples.patch.svn-base b/feeds/packages/libs/libvncserver/patches/.svn/text-base/100-noexamples.patch.svn-base +new file mode 100644 +index 0000000..dc7d933 +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/patches/.svn/text-base/100-noexamples.patch.svn-base +@@ -0,0 +1,43 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -228,8 +228,8 @@ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++ with_ffmpeg = @with_ffmpeg@ ++ @WITH_X11VNC_TRUE@X11VNC = x11vnc ++-SUBDIRS = libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC) ++-DIST_SUBDIRS = libvncserver examples contrib libvncclient vncterm classes client_examples test +++SUBDIRS = libvncserver +++DIST_SUBDIRS = libvncserver ++ bin_SCRIPTS = libvncserver-config ++ #include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h ++ include_HEADERS = rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \ ++--- a/configure.ac +++++ b/configure.ac ++@@ -748,14 +748,6 @@ AC_SUBST(RPMSOURCEDIR) ++ ++ AC_CONFIG_FILES([Makefile ++ libvncserver/Makefile ++- contrib/Makefile ++- examples/Makefile ++- vncterm/Makefile ++- classes/Makefile ++- classes/ssl/Makefile ++- libvncclient/Makefile ++- client_examples/Makefile ++- test/Makefile ++ libvncserver-config ++ LibVNCServer.spec]) ++ # ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -4,8 +4,8 @@ if WITH_X11VNC ++ X11VNC=x11vnc ++ endif ++ ++-SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC) ++-DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test +++SUBDIRS=libvncserver +++DIST_SUBDIRS=libvncserver ++ ++ bin_SCRIPTS = libvncserver-config ++ +diff --git a/feeds/packages/libs/libvncserver/patches/001-automake-compat.patch b/feeds/packages/libs/libvncserver/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..eb8de73 +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/patches/001-automake-compat.patch +@@ -0,0 +1,6426 @@ ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -601,6401 +601,3 @@ AS_VAR_POPDEF([_PKG])dnl ++ AS_VAR_POPDEF([_DEF])dnl ++ AS_VAR_POPDEF([_OUT])dnl ++ ],[PACKAGE="$PACKAGE"])]) ++- ++-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ++-## Free Software Foundation, Inc. ++-## Originally by Gordon Matzigkeit , 1996 ++-## ++-## This file is free software; the Free Software Foundation gives ++-## unlimited permission to copy and/or distribute it, with or without ++-## modifications, as long as this notice is preserved. ++- ++-# serial 48 AC_PROG_LIBTOOL ++- ++- ++-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++-# ----------------------------------------------------------- ++-# If this macro is not defined by Autoconf, define it here. ++-m4_ifdef([AC_PROVIDE_IFELSE], ++- [], ++- [m4_define([AC_PROVIDE_IFELSE], ++- [m4_ifdef([AC_PROVIDE_$1], ++- [$2], [$3])])]) ++- ++- ++-# AC_PROG_LIBTOOL ++-# --------------- ++-AC_DEFUN([AC_PROG_LIBTOOL], ++-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++- AC_PROVIDE_IFELSE([AC_PROG_CXX], ++- [AC_LIBTOOL_CXX], ++- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++- ])]) ++-dnl And a similar setup for Fortran 77 support ++- AC_PROVIDE_IFELSE([AC_PROG_F77], ++- [AC_LIBTOOL_F77], ++- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++-])]) ++- ++-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++- AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++- [AC_LIBTOOL_GCJ], ++- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++- [AC_LIBTOOL_GCJ], ++- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++- [AC_LIBTOOL_GCJ], ++- [ifdef([AC_PROG_GCJ], ++- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++- ifdef([A][M_PROG_GCJ], ++- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++- ifdef([LT_AC_PROG_GCJ], ++- [define([LT_AC_PROG_GCJ], ++- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++-])])# AC_PROG_LIBTOOL ++- ++- ++-# _AC_PROG_LIBTOOL ++-# ---------------- ++-AC_DEFUN([_AC_PROG_LIBTOOL], ++-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++- ++-# This can be used to rebuild libtool when needed ++-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++- ++-# Always use our own libtool. ++-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++-AC_SUBST(LIBTOOL)dnl ++- ++-# Prevent multiple expansion ++-define([AC_PROG_LIBTOOL], []) ++-])# _AC_PROG_LIBTOOL ++- ++- ++-# AC_LIBTOOL_SETUP ++-# ---------------- ++-AC_DEFUN([AC_LIBTOOL_SETUP], ++-[AC_PREREQ(2.50)dnl ++-AC_REQUIRE([AC_ENABLE_SHARED])dnl ++-AC_REQUIRE([AC_ENABLE_STATIC])dnl ++-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([AC_PROG_LD])dnl ++-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++-AC_REQUIRE([AC_PROG_NM])dnl ++- ++-AC_REQUIRE([AC_PROG_LN_S])dnl ++-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++-AC_REQUIRE([AC_OBJEXT])dnl ++-AC_REQUIRE([AC_EXEEXT])dnl ++-dnl ++- ++-AC_LIBTOOL_SYS_MAX_CMD_LEN ++-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++-AC_LIBTOOL_OBJDIR ++- ++-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++-_LT_AC_PROG_ECHO_BACKSLASH ++- ++-case $host_os in ++-aix3*) ++- # AIX sometimes has problems with the GCC collect2 program. For some ++- # reason, if we set the COLLECT_NAMES environment variable, the problems ++- # vanish in a puff of smoke. ++- if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++- fi ++- ;; ++-esac ++- ++-# Sed substitution that helps us do robust quoting. It backslashifies ++-# metacharacters that are still active within double-quoted strings. ++-Xsed='sed -e 1s/^X//' ++-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++- ++-# Same as above, but do not quote variable references. ++-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++- ++-# Sed substitution to delay expansion of an escaped shell variable in a ++-# double_quote_subst'ed string. ++-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++- ++-# Sed substitution to avoid accidental globbing in evaled expressions ++-no_glob_subst='s/\*/\\\*/g' ++- ++-# Constants: ++-rm="rm -f" ++- ++-# Global variables: ++-default_ofile=libtool ++-can_build_shared=yes ++- ++-# All known linkers require a `.a' archive for static linking (except MSVC, ++-# which needs '.lib'). ++-libext=a ++-ltmain="$ac_aux_dir/ltmain.sh" ++-ofile="$default_ofile" ++-with_gnu_ld="$lt_cv_prog_gnu_ld" ++- ++-AC_CHECK_TOOL(AR, ar, false) ++-AC_CHECK_TOOL(RANLIB, ranlib, :) ++-AC_CHECK_TOOL(STRIP, strip, :) ++- ++-old_CC="$CC" ++-old_CFLAGS="$CFLAGS" ++- ++-# Set sane defaults for various variables ++-test -z "$AR" && AR=ar ++-test -z "$AR_FLAGS" && AR_FLAGS=cru ++-test -z "$AS" && AS=as ++-test -z "$CC" && CC=cc ++-test -z "$LTCC" && LTCC=$CC ++-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++-test -z "$DLLTOOL" && DLLTOOL=dlltool ++-test -z "$LD" && LD=ld ++-test -z "$LN_S" && LN_S="ln -s" ++-test -z "$MAGIC_CMD" && MAGIC_CMD=file ++-test -z "$NM" && NM=nm ++-test -z "$SED" && SED=sed ++-test -z "$OBJDUMP" && OBJDUMP=objdump ++-test -z "$RANLIB" && RANLIB=: ++-test -z "$STRIP" && STRIP=: ++-test -z "$ac_objext" && ac_objext=o ++- ++-# Determine commands to create old-style static archives. ++-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++-old_postinstall_cmds='chmod 644 $oldlib' ++-old_postuninstall_cmds= ++- ++-if test -n "$RANLIB"; then ++- case $host_os in ++- openbsd*) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++- ;; ++- *) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++- ;; ++- esac ++- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++-fi ++- ++-_LT_CC_BASENAME([$compiler]) ++- ++-# Only perform the check for file, if the check method requires it ++-case $deplibs_check_method in ++-file_magic*) ++- if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++- AC_PATH_MAGIC ++- fi ++- ;; ++-esac ++- ++-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++-enable_win32_dll=yes, enable_win32_dll=no) ++- ++-AC_ARG_ENABLE([libtool-lock], ++- [AC_HELP_STRING([--disable-libtool-lock], ++- [avoid locking (might break parallel builds)])]) ++-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++- ++-AC_ARG_WITH([pic], ++- [AC_HELP_STRING([--with-pic], ++- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++- [pic_mode="$withval"], ++- [pic_mode=default]) ++-test -z "$pic_mode" && pic_mode=default ++- ++-# Use C for the default configuration in the libtool script ++-tagname= ++-AC_LIBTOOL_LANG_C_CONFIG ++-_LT_AC_TAGCONFIG ++-])# AC_LIBTOOL_SETUP ++- ++- ++-# _LT_AC_SYS_COMPILER ++-# ------------------- ++-AC_DEFUN([_LT_AC_SYS_COMPILER], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++- ++-# If no C compiler was specified, use CC. ++-LTCC=${LTCC-"$CC"} ++- ++-# If no C compiler flags were specified, use CFLAGS. ++-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++- ++-# Allow CC to be a program name with arguments. ++-compiler=$CC ++-])# _LT_AC_SYS_COMPILER ++- ++- ++-# _LT_CC_BASENAME(CC) ++-# ------------------- ++-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++-AC_DEFUN([_LT_CC_BASENAME], ++-[for cc_temp in $1""; do ++- case $cc_temp in ++- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++- \-*) ;; ++- *) break;; ++- esac ++-done ++-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++-]) ++- ++- ++-# _LT_COMPILER_BOILERPLATE ++-# ------------------------ ++-# Check for compiler boilerplate output or warnings with ++-# the simple compiler test code. ++-AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++-[ac_outfile=conftest.$ac_objext ++-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_compiler_boilerplate=`cat conftest.err` ++-$rm conftest* ++-])# _LT_COMPILER_BOILERPLATE ++- ++- ++-# _LT_LINKER_BOILERPLATE ++-# ---------------------- ++-# Check for linker boilerplate output or warnings with ++-# the simple link test code. ++-AC_DEFUN([_LT_LINKER_BOILERPLATE], ++-[ac_outfile=conftest.$ac_objext ++-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_linker_boilerplate=`cat conftest.err` ++-$rm conftest* ++-])# _LT_LINKER_BOILERPLATE ++- ++- ++-# _LT_AC_SYS_LIBPATH_AIX ++-# ---------------------- ++-# Links a minimal program and checks the executable ++-# for the system default hardcoded library path. In most cases, ++-# this is /usr/lib:/lib, but when the MPI compilers are used ++-# the location of the communication and MPI libs are included too. ++-# If we don't find anything, use the default library path according ++-# to the aix ld manual. ++-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++-}'` ++-# Check for a 64-bit object if we didn't find anything. ++-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } ++-}'`; fi],[]) ++-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++-])# _LT_AC_SYS_LIBPATH_AIX ++- ++- ++-# _LT_AC_SHELL_INIT(ARG) ++-# ---------------------- ++-AC_DEFUN([_LT_AC_SHELL_INIT], ++-[ifdef([AC_DIVERSION_NOTICE], ++- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++- [AC_DIVERT_PUSH(NOTICE)]) ++-$1 ++-AC_DIVERT_POP ++-])# _LT_AC_SHELL_INIT ++- ++- ++-# _LT_AC_PROG_ECHO_BACKSLASH ++-# -------------------------- ++-# Add some code to the start of the generated configure script which ++-# will find an echo command which doesn't interpret backslashes. ++-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++-[_LT_AC_SHELL_INIT([ ++-# Check that we are running under the correct shell. ++-SHELL=${CONFIG_SHELL-/bin/sh} ++- ++-case X$ECHO in ++-X*--fallback-echo) ++- # Remove one level of quotation (which was required for Make). ++- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++- ;; ++-esac ++- ++-echo=${ECHO-echo} ++-if test "X[$]1" = X--no-reexec; then ++- # Discard the --no-reexec flag, and continue. ++- shift ++-elif test "X[$]1" = X--fallback-echo; then ++- # Avoid inline document here, it may be left over ++- : ++-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++- # Yippee, $echo works! ++- : ++-else ++- # Restart under the correct shell. ++- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++-fi ++- ++-if test "X[$]1" = X--fallback-echo; then ++- # used as fallback echo ++- shift ++- cat </dev/null 2>&1 && unset CDPATH ++- ++-if test -z "$ECHO"; then ++-if test "X${echo_test_string+set}" != Xset; then ++-# find a string as large as possible, as long as the shell can cope with it ++- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++- if (echo_test_string=`eval $cmd`) 2>/dev/null && ++- echo_test_string=`eval $cmd` && ++- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++- then ++- break ++- fi ++- done ++-fi ++- ++-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- : ++-else ++- # The Solaris, AIX, and Digital Unix default echo programs unquote ++- # backslashes. This makes it impossible to quote backslashes using ++- # echo "$something" | sed 's/\\/\\\\/g' ++- # ++- # So, first we look for a working echo in the user's PATH. ++- ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for dir in $PATH /usr/ucb; do ++- IFS="$lt_save_ifs" ++- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- echo="$dir/echo" ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ++- if test "X$echo" = Xecho; then ++- # We didn't find a better echo, so look for alternatives. ++- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # This shell has a builtin print -r that does the trick. ++- echo='print -r' ++- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++- test "X$CONFIG_SHELL" != X/bin/ksh; then ++- # If we have ksh, try running configure again with it. ++- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++- export ORIGINAL_CONFIG_SHELL ++- CONFIG_SHELL=/bin/ksh ++- export CONFIG_SHELL ++- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++- else ++- # Try using printf. ++- echo='printf %s\n' ++- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # Cool, printf works ++- : ++- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++- export CONFIG_SHELL ++- SHELL="$CONFIG_SHELL" ++- export SHELL ++- echo="$CONFIG_SHELL [$]0 --fallback-echo" ++- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- echo="$CONFIG_SHELL [$]0 --fallback-echo" ++- else ++- # maybe with a smaller string... ++- prev=: ++- ++- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++- then ++- break ++- fi ++- prev="$cmd" ++- done ++- ++- if test "$prev" != 'sed 50q "[$]0"'; then ++- echo_test_string=`eval $prev` ++- export echo_test_string ++- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++- else ++- # Oops. We lost completely, so just stick with echo. ++- echo=echo ++- fi ++- fi ++- fi ++- fi ++-fi ++-fi ++- ++-# Copy echo and quote the copy suitably for passing to libtool from ++-# the Makefile, instead of quoting the original, which is used later. ++-ECHO=$echo ++-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++-fi ++- ++-AC_SUBST(ECHO) ++-])])# _LT_AC_PROG_ECHO_BACKSLASH ++- ++- ++-# _LT_AC_LOCK ++-# ----------- ++-AC_DEFUN([_LT_AC_LOCK], ++-[AC_ARG_ENABLE([libtool-lock], ++- [AC_HELP_STRING([--disable-libtool-lock], ++- [avoid locking (might break parallel builds)])]) ++-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++- ++-# Some flags need to be propagated to the compiler or linker for good ++-# libtool support. ++-case $host in ++-ia64-*-hpux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *ELF-32*) ++- HPUX_IA64_MODE="32" ++- ;; ++- *ELF-64*) ++- HPUX_IA64_MODE="64" ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++-*-*-irix6*) ++- # Find out which ABI we are using. ++- echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -melf32bsmip" ++- ;; ++- *N32*) ++- LD="${LD-ld} -melf32bmipn32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -melf64bmip" ++- ;; ++- esac ++- else ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -32" ++- ;; ++- *N32*) ++- LD="${LD-ld} -n32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -64" ++- ;; ++- esac ++- fi ++- fi ++- rm -rf conftest* ++- ;; ++- ++-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *32-bit*) ++- case $host in ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_i386" ++- ;; ++- ppc64-*linux*|powerpc64-*linux*) ++- LD="${LD-ld} -m elf32ppclinux" ++- ;; ++- s390x-*linux*) ++- LD="${LD-ld} -m elf_s390" ++- ;; ++- sparc64-*linux*) ++- LD="${LD-ld} -m elf32_sparc" ++- ;; ++- esac ++- ;; ++- *64-bit*) ++- case $host in ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_x86_64" ++- ;; ++- ppc*-*linux*|powerpc*-*linux*) ++- LD="${LD-ld} -m elf64ppc" ++- ;; ++- s390*-*linux*) ++- LD="${LD-ld} -m elf64_s390" ++- ;; ++- sparc*-*linux*) ++- LD="${LD-ld} -m elf64_sparc" ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++- ++-*-*-sco3.2v5*) ++- # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++- SAVE_CFLAGS="$CFLAGS" ++- CFLAGS="$CFLAGS -belf" ++- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++- [AC_LANG_PUSH(C) ++- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++- AC_LANG_POP]) ++- if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++- CFLAGS="$SAVE_CFLAGS" ++- fi ++- ;; ++-sparc*-*solaris*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *64-bit*) ++- case $lt_cv_prog_gnu_ld in ++- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++- *) LD="${LD-ld} -64" ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++- ++-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++- AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++- AC_CHECK_TOOL(AS, as, false) ++- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++- ;; ++- ]) ++-esac ++- ++-need_locks="$enable_libtool_lock" ++- ++-])# _LT_AC_LOCK ++- ++- ++-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ---------------------------------------------------------------- ++-# Check whether the given compiler option works ++-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++-[AC_REQUIRE([LT_AC_PROG_SED]) ++-AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++- lt_compiler_flag="$3" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- # The option is referenced via a variable to avoid confusing sed. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>conftest.err) ++- ac_status=$? ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s "$ac_outfile"; then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings other than the usual output. ++- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- fi ++- $rm conftest* ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- ifelse([$5], , :, [$5]) ++-else ++- ifelse([$6], , :, [$6]) ++-fi ++-])# AC_LIBTOOL_COMPILER_OPTION ++- ++- ++-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ------------------------------------------------------------ ++-# Check whether the given compiler option works ++-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++-[AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- save_LDFLAGS="$LDFLAGS" ++- LDFLAGS="$LDFLAGS $3" ++- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++- # The linker can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- if test -s conftest.err; then ++- # Append any errors to the config.log. ++- cat conftest.err 1>&AS_MESSAGE_LOG_FD ++- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- else ++- $2=yes ++- fi ++- fi ++- $rm conftest* ++- LDFLAGS="$save_LDFLAGS" ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- ifelse([$4], , :, [$4]) ++-else ++- ifelse([$5], , :, [$5]) ++-fi ++-])# AC_LIBTOOL_LINKER_OPTION ++- ++- ++-# AC_LIBTOOL_SYS_MAX_CMD_LEN ++-# -------------------------- ++-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++-[# find the maximum length of command line arguments ++-AC_MSG_CHECKING([the maximum length of command line arguments]) ++-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++- i=0 ++- teststring="ABCD" ++- ++- case $build_os in ++- msdosdjgpp*) ++- # On DJGPP, this test can blow up pretty badly due to problems in libc ++- # (any single argument exceeding 2000 bytes causes a buffer overrun ++- # during glob expansion). Even if it were fixed, the result of this ++- # check would be larger than it should be. ++- lt_cv_sys_max_cmd_len=12288; # 12K is about right ++- ;; ++- ++- gnu*) ++- # Under GNU Hurd, this test is not required because there is ++- # no limit to the length of command line arguments. ++- # Libtool will interpret -1 as no limit whatsoever ++- lt_cv_sys_max_cmd_len=-1; ++- ;; ++- ++- cygwin* | mingw*) ++- # On Win9x/ME, this test blows up -- it succeeds, but takes ++- # about 5 minutes as the teststring grows exponentially. ++- # Worse, since 9x/ME are not pre-emptively multitasking, ++- # you end up with a "frozen" computer, even though with patience ++- # the test eventually succeeds (with a max line length of 256k). ++- # Instead, let's just punt: use the minimum linelength reported by ++- # all of the supported platforms: 8192 (on NT/2K/XP). ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- amigaos*) ++- # On AmigaOS with pdksh, this test takes hours, literally. ++- # So we just punt and use a minimum line length of 8192. ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++- # This has been around since 386BSD, at least. Likely further. ++- if test -x /sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++- elif test -x /usr/sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++- else ++- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++- fi ++- # And add a safety zone ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++- ;; ++- ++- interix*) ++- # We know the value 262144 and hardcode it with a safety zone (like BSD) ++- lt_cv_sys_max_cmd_len=196608 ++- ;; ++- ++- osf*) ++- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++- # nice to cause kernel panics so lets avoid the loop below. ++- # First set a reasonable default. ++- lt_cv_sys_max_cmd_len=16384 ++- # ++- if test -x /sbin/sysconfig; then ++- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++- *1*) lt_cv_sys_max_cmd_len=-1 ;; ++- esac ++- fi ++- ;; ++- sco3.2v5*) ++- lt_cv_sys_max_cmd_len=102400 ++- ;; ++- sysv5* | sco5v6* | sysv4.2uw2*) ++- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++- if test -n "$kargmax"; then ++- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++- else ++- lt_cv_sys_max_cmd_len=32768 ++- fi ++- ;; ++- *) ++- # If test is not a shell built-in, we'll probably end up computing a ++- # maximum length that is only half of the actual maximum length, but ++- # we can't tell. ++- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++- = "XX$teststring") >/dev/null 2>&1 && ++- new_result=`expr "X$teststring" : ".*" 2>&1` && ++- lt_cv_sys_max_cmd_len=$new_result && ++- test $i != 17 # 1/2 MB should be enough ++- do ++- i=`expr $i + 1` ++- teststring=$teststring$teststring ++- done ++- teststring= ++- # Add a significant safety factor because C++ compilers can tack on massive ++- # amounts of additional arguments before passing them to the linker. ++- # It appears as though 1/2 is a usable value. ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++- ;; ++- esac ++-]) ++-if test -n $lt_cv_sys_max_cmd_len ; then ++- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++-else ++- AC_MSG_RESULT(none) ++-fi ++-])# AC_LIBTOOL_SYS_MAX_CMD_LEN ++- ++- ++-# _LT_AC_CHECK_DLFCN ++-# ------------------ ++-AC_DEFUN([_LT_AC_CHECK_DLFCN], ++-[AC_CHECK_HEADERS(dlfcn.h)dnl ++-])# _LT_AC_CHECK_DLFCN ++- ++- ++-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++-# --------------------------------------------------------------------- ++-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++-if test "$cross_compiling" = yes; then : ++- [$4] ++-else ++- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++- lt_status=$lt_dlunknown ++- cat > conftest.$ac_ext < ++-#endif ++- ++-#include ++- ++-#ifdef RTLD_GLOBAL ++-# define LT_DLGLOBAL RTLD_GLOBAL ++-#else ++-# ifdef DL_GLOBAL ++-# define LT_DLGLOBAL DL_GLOBAL ++-# else ++-# define LT_DLGLOBAL 0 ++-# endif ++-#endif ++- ++-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++- find out it does not work in some platform. */ ++-#ifndef LT_DLLAZY_OR_NOW ++-# ifdef RTLD_LAZY ++-# define LT_DLLAZY_OR_NOW RTLD_LAZY ++-# else ++-# ifdef DL_LAZY ++-# define LT_DLLAZY_OR_NOW DL_LAZY ++-# else ++-# ifdef RTLD_NOW ++-# define LT_DLLAZY_OR_NOW RTLD_NOW ++-# else ++-# ifdef DL_NOW ++-# define LT_DLLAZY_OR_NOW DL_NOW ++-# else ++-# define LT_DLLAZY_OR_NOW 0 ++-# endif ++-# endif ++-# endif ++-# endif ++-#endif ++- ++-#ifdef __cplusplus ++-extern "C" void exit (int); ++-#endif ++- ++-void fnord() { int i=42;} ++-int main () ++-{ ++- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++- int status = $lt_dlunknown; ++- ++- if (self) ++- { ++- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++- /* dlclose (self); */ ++- } ++- else ++- puts (dlerror ()); ++- ++- exit (status); ++-}] ++-EOF ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++- lt_status=$? ++- case x$lt_status in ++- x$lt_dlno_uscore) $1 ;; ++- x$lt_dlneed_uscore) $2 ;; ++- x$lt_dlunknown|x*) $3 ;; ++- esac ++- else : ++- # compilation failed ++- $3 ++- fi ++-fi ++-rm -fr conftest* ++-])# _LT_AC_TRY_DLOPEN_SELF ++- ++- ++-# AC_LIBTOOL_DLOPEN_SELF ++-# ---------------------- ++-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++-if test "x$enable_dlopen" != xyes; then ++- enable_dlopen=unknown ++- enable_dlopen_self=unknown ++- enable_dlopen_self_static=unknown ++-else ++- lt_cv_dlopen=no ++- lt_cv_dlopen_libs= ++- ++- case $host_os in ++- beos*) ++- lt_cv_dlopen="load_add_on" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ;; ++- ++- mingw* | pw32*) ++- lt_cv_dlopen="LoadLibrary" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- cygwin*) ++- lt_cv_dlopen="dlopen" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- darwin*) ++- # if libdl is installed we need to link against it ++- AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++- lt_cv_dlopen="dyld" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ]) ++- ;; ++- ++- *) ++- AC_CHECK_FUNC([shl_load], ++- [lt_cv_dlopen="shl_load"], ++- [AC_CHECK_LIB([dld], [shl_load], ++- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++- [AC_CHECK_FUNC([dlopen], ++- [lt_cv_dlopen="dlopen"], ++- [AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++- [AC_CHECK_LIB([svld], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++- [AC_CHECK_LIB([dld], [dld_link], ++- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ;; ++- esac ++- ++- if test "x$lt_cv_dlopen" != xno; then ++- enable_dlopen=yes ++- else ++- enable_dlopen=no ++- fi ++- ++- case $lt_cv_dlopen in ++- dlopen) ++- save_CPPFLAGS="$CPPFLAGS" ++- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++- ++- save_LDFLAGS="$LDFLAGS" ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++- ++- save_LIBS="$LIBS" ++- LIBS="$lt_cv_dlopen_libs $LIBS" ++- ++- AC_CACHE_CHECK([whether a program can dlopen itself], ++- lt_cv_dlopen_self, [dnl ++- _LT_AC_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++- ]) ++- ++- if test "x$lt_cv_dlopen_self" = xyes; then ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++- lt_cv_dlopen_self_static, [dnl ++- _LT_AC_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++- ]) ++- fi ++- ++- CPPFLAGS="$save_CPPFLAGS" ++- LDFLAGS="$save_LDFLAGS" ++- LIBS="$save_LIBS" ++- ;; ++- esac ++- ++- case $lt_cv_dlopen_self in ++- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++- *) enable_dlopen_self=unknown ;; ++- esac ++- ++- case $lt_cv_dlopen_self_static in ++- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++- *) enable_dlopen_self_static=unknown ;; ++- esac ++-fi ++-])# AC_LIBTOOL_DLOPEN_SELF ++- ++- ++-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++-# --------------------------------- ++-# Check to see if options -c and -o are simultaneously supported by compiler ++-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++- $rm -r conftest 2>/dev/null ++- mkdir conftest ++- cd conftest ++- mkdir out ++- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- lt_compiler_flag="-o out/conftest2.$ac_objext" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>out/conftest.err) ++- ac_status=$? ++- cat out/conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s out/conftest2.$ac_objext ++- then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++- fi ++- fi ++- chmod u+w . 2>&AS_MESSAGE_LOG_FD ++- $rm conftest* ++- # SGI C++ compiler will create directory out/ii_files/ for ++- # template instantiation ++- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++- $rm out/* && rmdir out ++- cd .. ++- rmdir conftest ++- $rm conftest* ++-]) ++-])# AC_LIBTOOL_PROG_CC_C_O ++- ++- ++-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++-# ----------------------------------------- ++-# Check to see if we can do hard links to lock some files if needed ++-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++-[AC_REQUIRE([_LT_AC_LOCK])dnl ++- ++-hard_links="nottested" ++-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++- # do not overwrite the value of need_locks provided by the user ++- AC_MSG_CHECKING([if we can lock with hard links]) ++- hard_links=yes ++- $rm conftest* ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- touch conftest.a ++- ln conftest.a conftest.b 2>&5 || hard_links=no ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- AC_MSG_RESULT([$hard_links]) ++- if test "$hard_links" = no; then ++- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++- need_locks=warn ++- fi ++-else ++- need_locks=no ++-fi ++-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++- ++- ++-# AC_LIBTOOL_OBJDIR ++-# ----------------- ++-AC_DEFUN([AC_LIBTOOL_OBJDIR], ++-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++-[rm -f .libs 2>/dev/null ++-mkdir .libs 2>/dev/null ++-if test -d .libs; then ++- lt_cv_objdir=.libs ++-else ++- # MS-DOS does not allow filenames that begin with a dot. ++- lt_cv_objdir=_libs ++-fi ++-rmdir .libs 2>/dev/null]) ++-objdir=$lt_cv_objdir ++-])# AC_LIBTOOL_OBJDIR ++- ++- ++-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++-# ---------------------------------------------- ++-# Check hardcoding attributes. ++-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++-[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++-_LT_AC_TAGVAR(hardcode_action, $1)= ++-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++- ++- # We can hardcode non-existant directories. ++- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++- # If the only mechanism to avoid hardcoding is shlibpath_var, we ++- # have to relink, otherwise we might link with an installed library ++- # when we should be linking with a yet-to-be-installed one ++- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++- # Linking always hardcodes the temporary library directory. ++- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++- else ++- # We can link without hardcoding, and we can hardcode nonexisting dirs. ++- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++- fi ++-else ++- # We cannot hardcode anything, or else we can only hardcode existing ++- # directories. ++- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++-fi ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++- ++-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++- # Fast installation is not supported ++- enable_fast_install=no ++-elif test "$shlibpath_overrides_runpath" = yes || ++- test "$enable_shared" = no; then ++- # Fast installation is not necessary ++- enable_fast_install=needless ++-fi ++-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++- ++- ++-# AC_LIBTOOL_SYS_LIB_STRIP ++-# ------------------------ ++-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++-[striplib= ++-old_striplib= ++-AC_MSG_CHECKING([whether stripping libraries is possible]) ++-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++- test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++- AC_MSG_RESULT([yes]) ++-else ++-# FIXME - insert some real tests, host_os isn't really good enough ++- case $host_os in ++- darwin*) ++- if test -n "$STRIP" ; then ++- striplib="$STRIP -x" ++- AC_MSG_RESULT([yes]) ++- else ++- AC_MSG_RESULT([no]) ++-fi ++- ;; ++- *) ++- AC_MSG_RESULT([no]) ++- ;; ++- esac ++-fi ++-])# AC_LIBTOOL_SYS_LIB_STRIP ++- ++- ++-# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++-# ----------------------------- ++-# PORTME Fill in your ld.so characteristics ++-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++-[AC_MSG_CHECKING([dynamic linker characteristics]) ++-library_names_spec= ++-libname_spec='lib$name' ++-soname_spec= ++-shrext_cmds=".so" ++-postinstall_cmds= ++-postuninstall_cmds= ++-finish_cmds= ++-finish_eval= ++-shlibpath_var= ++-shlibpath_overrides_runpath=unknown ++-version_type=none ++-dynamic_linker="$host_os ld.so" ++-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++-if test "$GCC" = yes; then ++- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++- # if the path contains ";" then we assume it to be the separator ++- # otherwise default to the standard path separator (i.e. ":") - it is ++- # assumed that no part of a normal pathname contains ";" but that should ++- # okay in the real world where ";" in dirpaths is itself problematic. ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++-else ++- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++-fi ++-need_lib_prefix=unknown ++-hardcode_into_libs=no ++- ++-# when you set need_version to no, make sure it does not cause -set_version ++-# flags to be left without arguments ++-need_version=unknown ++- ++-case $host_os in ++-aix3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++- shlibpath_var=LIBPATH ++- ++- # AIX 3 has no versioning support, so we append a major version to the name. ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- ++-aix4* | aix5*) ++- version_type=linux ++- need_lib_prefix=no ++- need_version=no ++- hardcode_into_libs=yes ++- if test "$host_cpu" = ia64; then ++- # AIX 5 supports IA64 ++- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- else ++- # With GCC up to 2.95.x, collect2 would create an import file ++- # for dependence libraries. The import file would start with ++- # the line `#! .'. This would cause the generated library to ++- # depend on `.', always an invalid library. This was fixed in ++- # development snapshots of GCC prior to 3.0. ++- case $host_os in ++- aix4 | aix4.[[01]] | aix4.[[01]].*) ++- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++- echo ' yes ' ++- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++- : ++- else ++- can_build_shared=no ++- fi ++- ;; ++- esac ++- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++- # soname into executable. Probably we can add versioning support to ++- # collect2, so additional links can be useful in future. ++- if test "$aix_use_runtimelinking" = yes; then ++- # If using run time linking (on AIX 4.2 or later) use lib.so ++- # instead of lib.a to let people know that these are not ++- # typical AIX shared libraries. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- else ++- # We preserve .a as extension for shared libraries through AIX4.2 ++- # and later when we are not doing run time linking. ++- library_names_spec='${libname}${release}.a $libname.a' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- fi ++- shlibpath_var=LIBPATH ++- fi ++- ;; ++- ++-amigaos*) ++- library_names_spec='$libname.ixlibrary $libname.a' ++- # Create ${libname}_ixlibrary.a entries in /sys/libs. ++- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++- ;; ++- ++-beos*) ++- library_names_spec='${libname}${shared_ext}' ++- dynamic_linker="$host_os ld.so" ++- shlibpath_var=LIBRARY_PATH ++- ;; ++- ++-bsdi[[45]]*) ++- version_type=linux ++- 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 $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++- # the default ld.so.conf also contains /usr/contrib/lib and ++- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++- # libtool to hard-code these into programs ++- ;; ++- ++-cygwin* | mingw* | pw32*) ++- version_type=windows ++- shrext_cmds=".dll" ++- need_version=no ++- need_lib_prefix=no ++- ++- case $GCC,$host_os in ++- yes,cygwin* | yes,mingw* | yes,pw32*) ++- library_names_spec='$libname.dll.a' ++- # DLL is installed to $(libdir)/../bin by postinstall_cmds ++- postinstall_cmds='base_file=`basename \${file}`~ ++- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++- dldir=$destdir/`dirname \$dlpath`~ ++- test -d \$dldir || mkdir -p \$dldir~ ++- $install_prog $dir/$dlname \$dldir/$dlname~ ++- chmod a+x \$dldir/$dlname' ++- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++- dlpath=$dir/\$dldll~ ++- $rm \$dlpath' ++- shlibpath_overrides_runpath=yes ++- ++- case $host_os in ++- cygwin*) ++- # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++- ;; ++- mingw*) ++- # MinGW DLLs use traditional 'lib' prefix ++- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++- # It is most probably a Windows format PATH printed by ++- # mingw gcc, but we are running on Cygwin. Gcc prints its search ++- # path with ; separators, and with drive letters. We can handle the ++- # drive letters (cygwin fileutils understands them), so leave them, ++- # especially as we might pass files found there to a mingw objdump, ++- # which wouldn't understand a cygwinified path. Ahh. ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++- ;; ++- pw32*) ++- # pw32 DLLs use 'pw' prefix rather than 'lib' ++- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- ;; ++- esac ++- ;; ++- ++- *) ++- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++- ;; ++- esac ++- dynamic_linker='Win32 ld.exe' ++- # FIXME: first we should search . and the directory the executable is in ++- shlibpath_var=PATH ++- ;; ++- ++-darwin* | rhapsody*) ++- dynamic_linker="$host_os dyld" ++- version_type=darwin ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++- soname_spec='${libname}${release}${major}$shared_ext' ++- shlibpath_overrides_runpath=yes ++- shlibpath_var=DYLD_LIBRARY_PATH ++- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. ++- if test "$GCC" = yes; then ++- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` ++- else ++- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' ++- fi ++- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++- ;; ++- ++-dgux*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-freebsd1*) ++- dynamic_linker=no ++- ;; ++- ++-kfreebsd*-gnu) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- dynamic_linker='GNU ld.so' ++- ;; ++- ++-freebsd* | dragonfly*) ++- # DragonFly does not have aout. When/if they implement a new ++- # versioning mechanism, adjust this. ++- if test -x /usr/bin/objformat; then ++- objformat=`/usr/bin/objformat` ++- else ++- case $host_os in ++- freebsd[[123]]*) objformat=aout ;; ++- *) objformat=elf ;; ++- esac ++- fi ++- version_type=freebsd-$objformat ++- case $version_type in ++- freebsd-elf*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- need_version=no ++- need_lib_prefix=no ++- ;; ++- freebsd-*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++- need_version=yes ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_os in ++- freebsd2*) ++- shlibpath_overrides_runpath=yes ++- ;; ++- freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- freebsd*) # from 4.6 on ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- esac ++- ;; ++- ++-gnu*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- hardcode_into_libs=yes ++- ;; ++- ++-hpux9* | hpux10* | hpux11*) ++- # Give a soname corresponding to the major version so that dld.sl refuses to ++- # link against other versions. ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- case $host_cpu in ++- ia64*) ++- shrext_cmds='.so' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.so" ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- if test "X$HPUX_IA64_MODE" = X32; then ++- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++- else ++- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++- fi ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- hppa*64*) ++- shrext_cmds='.sl' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- *) ++- shrext_cmds='.sl' ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=SHLIB_PATH ++- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- esac ++- # HP-UX runs *really* slowly unless shared libraries are mode 555. ++- postinstall_cmds='chmod 555 $lib' ++- ;; ++- ++-interix3*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $host_os in ++- nonstopux*) version_type=nonstopux ;; ++- *) ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- version_type=linux ++- else ++- version_type=irix ++- fi ;; ++- esac ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++- case $host_os in ++- irix5* | nonstopux*) ++- libsuff= shlibsuff= ++- ;; ++- *) ++- case $LD in # libtool.m4 will add one of these switches to LD ++- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++- libsuff= shlibsuff= libmagic=32-bit;; ++- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++- libsuff=32 shlibsuff=N32 libmagic=N32;; ++- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++- libsuff=64 shlibsuff=64 libmagic=64-bit;; ++- *) libsuff= shlibsuff= libmagic=never-match;; ++- esac ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++- hardcode_into_libs=yes ++- ;; ++- ++-# No shared lib support for Linux oldld, aout, or coff. ++-linux*oldld* | linux*aout* | linux*coff*) ++- dynamic_linker=no ++- ;; ++- ++-# This must be Linux ELF. ++-linux*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- # This implies no fast_install, which is unacceptable. ++- # Some rework will be needed to allow for fast_install ++- # before this can be enabled. ++- hardcode_into_libs=yes ++- ++- # Append ld.so.conf contents to the search path ++- if test -f /etc/ld.so.conf; then ++- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++- fi ++- ++- # We used to test for /lib/ld.so.1 and disable shared libraries on ++- # powerpc, because MkLinux only supported shared libraries with the ++- # GNU dynamic linker. Since this was broken with cross compilers, ++- # most powerpc-linux boxes support dynamic linking these days and ++- # people can always --disable-shared, the test was removed, and we ++- # assume the GNU/Linux dynamic linker is in use. ++- dynamic_linker='GNU/Linux ld.so' ++- ;; ++- ++-knetbsd*-gnu) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- dynamic_linker='GNU ld.so' ++- ;; ++- ++-netbsd*) ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- dynamic_linker='NetBSD (a.out) ld.so' ++- else ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- dynamic_linker='NetBSD ld.elf_so' ++- fi ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- ++-newsos6) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- ;; ++- ++-nto-qnx*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- ;; ++- ++-openbsd*) ++- version_type=sunos ++- sys_lib_dlsearch_path_spec="/usr/lib" ++- need_lib_prefix=no ++- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++- case $host_os in ++- openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++- *) need_version=no ;; ++- esac ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- case $host_os in ++- openbsd2.[[89]] | openbsd2.[[89]].*) ++- shlibpath_overrides_runpath=no ++- ;; ++- *) ++- shlibpath_overrides_runpath=yes ++- ;; ++- esac ++- else ++- shlibpath_overrides_runpath=yes ++- fi ++- ;; ++- ++-os2*) ++- libname_spec='$name' ++- shrext_cmds=".dll" ++- need_lib_prefix=no ++- library_names_spec='$libname${shared_ext} $libname.a' ++- dynamic_linker='OS/2 ld.exe' ++- shlibpath_var=LIBPATH ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- version_type=osf ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++- ;; ++- ++-solaris*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- # ldd complains unless libraries are executable ++- postinstall_cmds='chmod +x $lib' ++- ;; ++- ++-sunos4*) ++- version_type=sunos ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- if test "$with_gnu_ld" = yes; then ++- need_lib_prefix=no ++- fi ++- need_version=yes ++- ;; ++- ++-sysv4 | sysv4.3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_vendor in ++- sni) ++- shlibpath_overrides_runpath=no ++- need_lib_prefix=no ++- export_dynamic_flag_spec='${wl}-Blargedynsym' ++- runpath_var=LD_RUN_PATH ++- ;; ++- siemens) ++- need_lib_prefix=no ++- ;; ++- motorola) ++- need_lib_prefix=no ++- need_version=no ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++- ;; ++- esac ++- ;; ++- ++-sysv4*MP*) ++- if test -d /usr/nec ;then ++- version_type=linux ++- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++- soname_spec='$libname${shared_ext}.$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- fi ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- version_type=freebsd-elf ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- hardcode_into_libs=yes ++- if test "$with_gnu_ld" = yes; then ++- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++- shlibpath_overrides_runpath=no ++- else ++- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++- shlibpath_overrides_runpath=yes ++- case $host_os in ++- sco3.2v5*) ++- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++- ;; ++- esac ++- fi ++- sys_lib_dlsearch_path_spec='/usr/lib' ++- ;; ++- ++-uts4*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-*) ++- dynamic_linker=no ++- ;; ++-esac ++-AC_MSG_RESULT([$dynamic_linker]) ++-test "$dynamic_linker" = no && can_build_shared=no ++- ++-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++-if test "$GCC" = yes; then ++- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++-fi ++-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++- ++- ++-# _LT_AC_TAGCONFIG ++-# ---------------- ++-AC_DEFUN([_LT_AC_TAGCONFIG], ++-[AC_ARG_WITH([tags], ++- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++- [include additional configurations @<:@automatic@:>@])], ++- [tagnames="$withval"]) ++- ++-if test -f "$ltmain" && test -n "$tagnames"; then ++- if test ! -f "${ofile}"; then ++- AC_MSG_WARN([output file `$ofile' does not exist]) ++- fi ++- ++- if test -z "$LTCC"; then ++- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++- if test -z "$LTCC"; then ++- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++- else ++- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) ++- fi ++- fi ++- if test -z "$LTCFLAGS"; then ++- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++- fi ++- ++- # Extract list of available tagged configurations in $ofile. ++- # Note that this assumes the entire list is on one line. ++- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` ++- ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for tagname in $tagnames; do ++- IFS="$lt_save_ifs" ++- # Check whether tagname contains only valid characters ++- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++- "") ;; ++- *) AC_MSG_ERROR([invalid tag name: $tagname]) ++- ;; ++- esac ++- ++- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++- then ++- AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++- fi ++- ++- # Update the list of available tags. ++- if test -n "$tagname"; then ++- echo appending configuration tag \"$tagname\" to $ofile ++- ++- case $tagname in ++- CXX) ++- if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++- (test "X$CXX" != "Xg++"))) ; then ++- AC_LIBTOOL_LANG_CXX_CONFIG ++- else ++- tagname="" ++- fi ++- ;; ++- ++- F77) ++- if test -n "$F77" && test "X$F77" != "Xno"; then ++- AC_LIBTOOL_LANG_F77_CONFIG ++- else ++- tagname="" ++- fi ++- ;; ++- ++- GCJ) ++- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++- AC_LIBTOOL_LANG_GCJ_CONFIG ++- else ++- tagname="" ++- fi ++- ;; ++- ++- RC) ++- AC_LIBTOOL_LANG_RC_CONFIG ++- ;; ++- ++- *) ++- AC_MSG_ERROR([Unsupported tag name: $tagname]) ++- ;; ++- esac ++- ++- # Append the new tag name to the list of available tags. ++- if test -n "$tagname" ; then ++- available_tags="$available_tags $tagname" ++- fi ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ++- # Now substitute the updated list of available tags. ++- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++- mv "${ofile}T" "$ofile" ++- chmod +x "$ofile" ++- else ++- rm -f "${ofile}T" ++- AC_MSG_ERROR([unable to update list of available tagged configurations.]) ++- fi ++-fi ++-])# _LT_AC_TAGCONFIG ++- ++- ++-# AC_LIBTOOL_DLOPEN ++-# ----------------- ++-# enable checks for dlopen support ++-AC_DEFUN([AC_LIBTOOL_DLOPEN], ++- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++-])# AC_LIBTOOL_DLOPEN ++- ++- ++-# AC_LIBTOOL_WIN32_DLL ++-# -------------------- ++-# declare package support for building win32 DLLs ++-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++-])# AC_LIBTOOL_WIN32_DLL ++- ++- ++-# AC_ENABLE_SHARED([DEFAULT]) ++-# --------------------------- ++-# implement the --enable-shared flag ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-AC_DEFUN([AC_ENABLE_SHARED], ++-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++-AC_ARG_ENABLE([shared], ++- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_shared=yes ;; ++- no) enable_shared=no ;; ++- *) ++- enable_shared=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_shared=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++-])# AC_ENABLE_SHARED ++- ++- ++-# AC_DISABLE_SHARED ++-# ----------------- ++-# set the default shared flag to --disable-shared ++-AC_DEFUN([AC_DISABLE_SHARED], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-AC_ENABLE_SHARED(no) ++-])# AC_DISABLE_SHARED ++- ++- ++-# AC_ENABLE_STATIC([DEFAULT]) ++-# --------------------------- ++-# implement the --enable-static flag ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-AC_DEFUN([AC_ENABLE_STATIC], ++-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++-AC_ARG_ENABLE([static], ++- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_static=yes ;; ++- no) enable_static=no ;; ++- *) ++- enable_static=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_static=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++-])# AC_ENABLE_STATIC ++- ++- ++-# AC_DISABLE_STATIC ++-# ----------------- ++-# set the default static flag to --disable-static ++-AC_DEFUN([AC_DISABLE_STATIC], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-AC_ENABLE_STATIC(no) ++-])# AC_DISABLE_STATIC ++- ++- ++-# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++-# --------------------------------- ++-# implement the --enable-fast-install flag ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++-AC_ARG_ENABLE([fast-install], ++- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_fast_install=yes ;; ++- no) enable_fast_install=no ;; ++- *) ++- enable_fast_install=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_fast_install=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++-])# AC_ENABLE_FAST_INSTALL ++- ++- ++-# AC_DISABLE_FAST_INSTALL ++-# ----------------------- ++-# set the default to --disable-fast-install ++-AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-AC_ENABLE_FAST_INSTALL(no) ++-])# AC_DISABLE_FAST_INSTALL ++- ++- ++-# AC_LIBTOOL_PICMODE([MODE]) ++-# -------------------------- ++-# implement the --with-pic flag ++-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++-AC_DEFUN([AC_LIBTOOL_PICMODE], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++-pic_mode=ifelse($#,1,$1,default) ++-])# AC_LIBTOOL_PICMODE ++- ++- ++-# AC_PROG_EGREP ++-# ------------- ++-# This is predefined starting with Autoconf 2.54, so this conditional ++-# definition can be removed once we require Autoconf 2.54 or later. ++-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++- then ac_cv_prog_egrep='grep -E' ++- else ac_cv_prog_egrep='egrep' ++- fi]) ++- EGREP=$ac_cv_prog_egrep ++- AC_SUBST([EGREP]) ++-])]) ++- ++- ++-# AC_PATH_TOOL_PREFIX ++-# ------------------- ++-# find a file program which can recognise shared library ++-AC_DEFUN([AC_PATH_TOOL_PREFIX], ++-[AC_REQUIRE([AC_PROG_EGREP])dnl ++-AC_MSG_CHECKING([for $1]) ++-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++-[case $MAGIC_CMD in ++-[[\\/*] | ?:[\\/]*]) ++- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++- ;; ++-*) ++- lt_save_MAGIC_CMD="$MAGIC_CMD" ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++-dnl $ac_dummy forces splitting on constant user-supplied paths. ++-dnl POSIX.2 word splitting is done only on the output of word expansions, ++-dnl not every word. This closes a longstanding sh security hole. ++- ac_dummy="ifelse([$2], , $PATH, [$2])" ++- for ac_dir in $ac_dummy; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$1; then ++- lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++- if test -n "$file_magic_test_file"; then ++- case $deplibs_check_method in ++- "file_magic "*) ++- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++- $EGREP "$file_magic_regex" > /dev/null; then ++- : ++- else ++- cat <&2 ++- ++-*** Warning: the command libtool uses to detect shared libraries, ++-*** $file_magic_cmd, produces output that libtool cannot recognize. ++-*** The result is that libtool may fail to recognize shared libraries ++-*** as such. This will affect the creation of libtool libraries that ++-*** depend on shared libraries, but programs linked with such libtool ++-*** libraries will work regardless of this problem. Nevertheless, you ++-*** may want to report the problem to your system manager and/or to ++-*** bug-libtool@gnu.org ++- ++-EOF ++- fi ;; ++- esac ++- fi ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- MAGIC_CMD="$lt_save_MAGIC_CMD" ++- ;; ++-esac]) ++-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++-if test -n "$MAGIC_CMD"; then ++- AC_MSG_RESULT($MAGIC_CMD) ++-else ++- AC_MSG_RESULT(no) ++-fi ++-])# AC_PATH_TOOL_PREFIX ++- ++- ++-# AC_PATH_MAGIC ++-# ------------- ++-# find a file program which can recognise a shared library ++-AC_DEFUN([AC_PATH_MAGIC], ++-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++-if test -z "$lt_cv_path_MAGIC_CMD"; then ++- if test -n "$ac_tool_prefix"; then ++- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++- else ++- MAGIC_CMD=: ++- fi ++-fi ++-])# AC_PATH_MAGIC ++- ++- ++-# AC_PROG_LD ++-# ---------- ++-# find the pathname to the GNU or non-GNU linker ++-AC_DEFUN([AC_PROG_LD], ++-[AC_ARG_WITH([gnu-ld], ++- [AC_HELP_STRING([--with-gnu-ld], ++- [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++- [test "$withval" = no || with_gnu_ld=yes], ++- [with_gnu_ld=no]) ++-AC_REQUIRE([LT_AC_PROG_SED])dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-ac_prog=ld ++-if test "$GCC" = yes; then ++- # Check if gcc -print-prog-name=ld gives a path. ++- AC_MSG_CHECKING([for ld used by $CC]) ++- case $host in ++- *-*-mingw*) ++- # gcc leaves a trailing carriage return which upsets mingw ++- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++- *) ++- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++- esac ++- case $ac_prog in ++- # Accept absolute paths. ++- [[\\/]]* | ?:[[\\/]]*) ++- re_direlt='/[[^/]][[^/]]*/\.\./' ++- # Canonicalize the pathname of ld ++- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++- done ++- test -z "$LD" && LD="$ac_prog" ++- ;; ++- "") ++- # If it fails, then pretend we aren't using GCC. ++- ac_prog=ld ++- ;; ++- *) ++- # If it is relative, then search for the first ld in PATH. ++- with_gnu_ld=unknown ++- ;; ++- esac ++-elif test "$with_gnu_ld" = yes; then ++- AC_MSG_CHECKING([for GNU ld]) ++-else ++- AC_MSG_CHECKING([for non-GNU ld]) ++-fi ++-AC_CACHE_VAL(lt_cv_path_LD, ++-[if test -z "$LD"; then ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++- lt_cv_path_LD="$ac_dir/$ac_prog" ++- # Check to see if the program is GNU ld. I'd rather use --version, ++- # but apparently some variants of GNU ld only accept -v. ++- # Break only if it was the GNU/non-GNU ld that we prefer. ++- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then ++- case $host_cpu in ++- i*86 ) ++- # Not sure whether the presence of OpenBSD here was a mistake. ++- # Let's accept both of them until this is cleared up. ++- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++- ;; ++- esac ++- else ++- lt_cv_deplibs_check_method=pass_all ++- fi ++- ;; ++- ++-gnu*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-hpux10.20* | hpux11*) ++- lt_cv_file_magic_cmd=/usr/bin/file ++- case $host_cpu in ++- ia64*) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++- ;; ++- hppa*64*) ++- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++- ;; ++- *) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++- ;; ++- esac ++- ;; ++- ++-interix3*) ++- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $LD in ++- *-32|*"-32 ") libmagic=32-bit;; ++- *-n32|*"-n32 ") libmagic=N32;; ++- *-64|*"-64 ") libmagic=64-bit;; ++- *) libmagic=never-match;; ++- esac ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-# This must be Linux ELF. ++-linux*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++- fi ++- ;; ++- ++-newos6*) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=/usr/lib/libnls.so ++- ;; ++- ++-nto-qnx*) ++- lt_cv_deplibs_check_method=unknown ++- ;; ++- ++-openbsd*) ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- fi ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-solaris*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-sysv4 | sysv4.3*) ++- case $host_vendor in ++- motorola) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++- ;; ++- ncr) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- sequent) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++- ;; ++- sni) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++- lt_cv_file_magic_test_file=/lib/libc.so ++- ;; ++- siemens) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- pc) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- esac ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++-esac ++-]) ++-file_magic_cmd=$lt_cv_file_magic_cmd ++-deplibs_check_method=$lt_cv_deplibs_check_method ++-test -z "$deplibs_check_method" && deplibs_check_method=unknown ++-])# AC_DEPLIBS_CHECK_METHOD ++- ++- ++-# AC_PROG_NM ++-# ---------- ++-# find the pathname to a BSD-compatible name lister ++-AC_DEFUN([AC_PROG_NM], ++-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++-[if test -n "$NM"; then ++- # Let the user override the test. ++- lt_cv_path_NM="$NM" ++-else ++- lt_nm_to_check="${ac_tool_prefix}nm" ++- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++- lt_nm_to_check="$lt_nm_to_check nm" ++- fi ++- for lt_tmp_nm in $lt_nm_to_check; do ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- tmp_nm="$ac_dir/$lt_tmp_nm" ++- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++- # Check to see if the nm accepts a BSD-compat flag. ++- # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++- # nm: unknown option "B" ignored ++- # Tru64's nm complains that /dev/null is an invalid object file ++- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++- */dev/null* | *'Invalid file or object type'*) ++- lt_cv_path_NM="$tmp_nm -B" ++- break ++- ;; ++- *) ++- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++- */dev/null*) ++- lt_cv_path_NM="$tmp_nm -p" ++- break ++- ;; ++- *) ++- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++- continue # so that we can try to find one that supports BSD flags ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- done ++- IFS="$lt_save_ifs" ++- done ++- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++-fi]) ++-NM="$lt_cv_path_NM" ++-])# AC_PROG_NM ++- ++- ++-# AC_CHECK_LIBM ++-# ------------- ++-# check for math library ++-AC_DEFUN([AC_CHECK_LIBM], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-LIBM= ++-case $host in ++-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++- # These system don't have libm, or don't need it ++- ;; ++-*-ncr-sysv4.3*) ++- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++- ;; ++-*) ++- AC_CHECK_LIB(m, cos, LIBM="-lm") ++- ;; ++-esac ++-])# AC_CHECK_LIBM ++- ++- ++-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++-# ----------------------------------- ++-# sets LIBLTDL to the link flags for the libltdl convenience library and ++-# LTDLINCL to the include flags for the libltdl header and adds ++-# --enable-ltdl-convenience to the configure arguments. Note that ++-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++-# (note the single quotes!). If your package is not flat and you're not ++-# using automake, define top_builddir and top_srcdir appropriately in ++-# the Makefiles. ++-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++- case $enable_ltdl_convenience in ++- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++- "") enable_ltdl_convenience=yes ++- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ++- esac ++- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++- # For backwards non-gettext consistent compatibility... ++- INCLTDL="$LTDLINCL" ++-])# AC_LIBLTDL_CONVENIENCE ++- ++- ++-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++-# ----------------------------------- ++-# sets LIBLTDL to the link flags for the libltdl installable library and ++-# LTDLINCL to the include flags for the libltdl header and adds ++-# --enable-ltdl-install to the configure arguments. Note that ++-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++-# and an installed libltdl is not found, it is assumed to be `libltdl'. ++-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++-# '${top_srcdir}/' (note the single quotes!). If your package is not ++-# flat and you're not using automake, define top_builddir and top_srcdir ++-# appropriately in the Makefiles. ++-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++- AC_CHECK_LIB(ltdl, lt_dlinit, ++- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++- [if test x"$enable_ltdl_install" = xno; then ++- AC_MSG_WARN([libltdl not installed, but installation disabled]) ++- else ++- enable_ltdl_install=yes ++- fi ++- ]) ++- if test x"$enable_ltdl_install" = x"yes"; then ++- ac_configure_args="$ac_configure_args --enable-ltdl-install" ++- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++- else ++- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++- LIBLTDL="-lltdl" ++- LTDLINCL= ++- fi ++- # For backwards non-gettext consistent compatibility... ++- INCLTDL="$LTDLINCL" ++-])# AC_LIBLTDL_INSTALLABLE ++- ++- ++-# AC_LIBTOOL_CXX ++-# -------------- ++-# enable support for C++ libraries ++-AC_DEFUN([AC_LIBTOOL_CXX], ++-[AC_REQUIRE([_LT_AC_LANG_CXX]) ++-])# AC_LIBTOOL_CXX ++- ++- ++-# _LT_AC_LANG_CXX ++-# --------------- ++-AC_DEFUN([_LT_AC_LANG_CXX], ++-[AC_REQUIRE([AC_PROG_CXX]) ++-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++-])# _LT_AC_LANG_CXX ++- ++-# _LT_AC_PROG_CXXCPP ++-# ------------------ ++-AC_DEFUN([_LT_AC_PROG_CXXCPP], ++-[ ++-AC_REQUIRE([AC_PROG_CXX]) ++-if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++- (test "X$CXX" != "Xg++"))) ; then ++- AC_PROG_CXXCPP ++-fi ++-])# _LT_AC_PROG_CXXCPP ++- ++-# AC_LIBTOOL_F77 ++-# -------------- ++-# enable support for Fortran 77 libraries ++-AC_DEFUN([AC_LIBTOOL_F77], ++-[AC_REQUIRE([_LT_AC_LANG_F77]) ++-])# AC_LIBTOOL_F77 ++- ++- ++-# _LT_AC_LANG_F77 ++-# --------------- ++-AC_DEFUN([_LT_AC_LANG_F77], ++-[AC_REQUIRE([AC_PROG_F77]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++-])# _LT_AC_LANG_F77 ++- ++- ++-# AC_LIBTOOL_GCJ ++-# -------------- ++-# enable support for GCJ libraries ++-AC_DEFUN([AC_LIBTOOL_GCJ], ++-[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++-])# AC_LIBTOOL_GCJ ++- ++- ++-# _LT_AC_LANG_GCJ ++-# --------------- ++-AC_DEFUN([_LT_AC_LANG_GCJ], ++-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++-])# _LT_AC_LANG_GCJ ++- ++- ++-# AC_LIBTOOL_RC ++-# ------------- ++-# enable support for Windows resource files ++-AC_DEFUN([AC_LIBTOOL_RC], ++-[AC_REQUIRE([LT_AC_PROG_RC]) ++-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++-])# AC_LIBTOOL_RC ++- ++- ++-# AC_LIBTOOL_LANG_C_CONFIG ++-# ------------------------ ++-# Ensure that the configuration vars for the C compiler are ++-# suitably defined. Those variables are subsequently used by ++-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++-AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++-[lt_save_CC="$CC" ++-AC_LANG_PUSH(C) ++- ++-# Source file extension for C test sources. ++-ac_ext=c ++- ++-# Object file extension for compiled C test sources. ++-objext=o ++-_LT_AC_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="int some_variable = 0;\n" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='int main(){return(0);}\n' ++- ++-_LT_AC_SYS_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-## CAVEAT EMPTOR: ++-## There is no encapsulation within the following macros, do not change ++-## the running order or otherwise move them around unless you know exactly ++-## what you are doing... ++-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++-AC_LIBTOOL_PROG_COMPILER_PIC($1) ++-AC_LIBTOOL_PROG_CC_C_O($1) ++-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++-AC_LIBTOOL_PROG_LD_SHLIBS($1) ++-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++-AC_LIBTOOL_SYS_LIB_STRIP ++-AC_LIBTOOL_DLOPEN_SELF ++- ++-# Report which library types will actually be built ++-AC_MSG_CHECKING([if libtool supports shared libraries]) ++-AC_MSG_RESULT([$can_build_shared]) ++- ++-AC_MSG_CHECKING([whether to build shared libraries]) ++-test "$can_build_shared" = "no" && enable_shared=no ++- ++-# On AIX, shared libraries and static libraries use the same namespace, and ++-# are all built from PIC. ++-case $host_os in ++-aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- ++-aix4* | aix5*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++-esac ++-AC_MSG_RESULT([$enable_shared]) ++- ++-AC_MSG_CHECKING([whether to build static libraries]) ++-# Make sure either enable_shared or enable_static is yes. ++-test "$enable_shared" = yes || enable_static=yes ++-AC_MSG_RESULT([$enable_static]) ++- ++-AC_LIBTOOL_CONFIG($1) ++- ++-AC_LANG_POP ++-CC="$lt_save_CC" ++-])# AC_LIBTOOL_LANG_C_CONFIG ++- ++- ++-# AC_LIBTOOL_LANG_CXX_CONFIG ++-# -------------------------- ++-# Ensure that the configuration vars for the C compiler are ++-# suitably defined. Those variables are subsequently used by ++-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) ++-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], ++-[AC_LANG_PUSH(C++) ++-AC_REQUIRE([AC_PROG_CXX]) ++-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++- ++-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++-_LT_AC_TAGVAR(always_export_symbols, $1)=no ++-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_AC_TAGVAR(hardcode_direct, $1)=no ++-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++-_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++-_LT_AC_TAGVAR(module_cmds, $1)= ++-_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_AC_TAGVAR(no_undefined_flag, $1)= ++-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Dependencies to place before and after the object being linked: ++-_LT_AC_TAGVAR(predep_objects, $1)= ++-_LT_AC_TAGVAR(postdep_objects, $1)= ++-_LT_AC_TAGVAR(predeps, $1)= ++-_LT_AC_TAGVAR(postdeps, $1)= ++-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++- ++-# Source file extension for C++ test sources. ++-ac_ext=cpp ++- ++-# Object file extension for compiled C++ test sources. ++-objext=o ++-_LT_AC_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="int some_variable = 0;\n" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' ++- ++-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++-_LT_AC_SYS_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-# Allow CC to be a program name with arguments. ++-lt_save_CC=$CC ++-lt_save_LD=$LD ++-lt_save_GCC=$GCC ++-GCC=$GXX ++-lt_save_with_gnu_ld=$with_gnu_ld ++-lt_save_path_LD=$lt_cv_path_LD ++-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++-else ++- $as_unset lt_cv_prog_gnu_ld ++-fi ++-if test -n "${lt_cv_path_LDCXX+set}"; then ++- lt_cv_path_LD=$lt_cv_path_LDCXX ++-else ++- $as_unset lt_cv_path_LD ++-fi ++-test -z "${LDCXX+set}" || LD=$LDCXX ++-CC=${CXX-"c++"} ++-compiler=$CC ++-_LT_AC_TAGVAR(compiler, $1)=$CC ++-_LT_CC_BASENAME([$compiler]) ++- ++-# We don't want -fno-exception wen compiling C++ code, so set the ++-# no_builtin_flag separately ++-if test "$GXX" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++-else ++- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++-fi ++- ++-if test "$GXX" = yes; then ++- # Set up default GNU C++ configuration ++- ++- AC_PROG_LD ++- ++- # Check if GNU C++ uses GNU ld as the underlying linker, since the ++- # archiving commands below assume that GNU ld is being used. ++- if test "$with_gnu_ld" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++- # investigate it a little bit more. (MM) ++- wlarc='${wl}' ++- ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++- grep 'no-whole-archive' > /dev/null; then ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- with_gnu_ld=no ++- wlarc= ++- ++- # A generic and very simple default shared library creation ++- # command for GNU C++ for the case where it uses the native ++- # linker, instead of GNU ld. If possible, this setting should ++- # overridden to take advantage of the native linker features on ++- # the platform it is being used on. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- fi ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++- ++-else ++- GXX=no ++- with_gnu_ld=no ++- wlarc= ++-fi ++- ++-# PORTME: fill in a description of your system's C++ link characteristics ++-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++-_LT_AC_TAGVAR(ld_shlibs, $1)=yes ++-case $host_os in ++- aix3*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aix4* | aix5*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++- for ld_flag in $LDFLAGS; do ++- case $ld_flag in ++- *-brtl*) ++- aix_use_runtimelinking=yes ++- break ++- ;; ++- esac ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_AC_TAGVAR(archive_cmds, $1)='' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- if test "$GXX" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && \ ++- strings "$collect2name" | grep resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- else ++- # We have old collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- chorus*) ++- case $cc_basename in ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- cygwin* | mingw* | pw32*) ++- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ++- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- darwin* | rhapsody*) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++- ;; ++- *) # Darwin 1.3 on ++- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- else ++- case ${MACOSX_DEPLOYMENT_TARGET} in ++- 10.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- ;; ++- 10.*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- if test "$GXX" = yes ; then ++- lt_int_apple_cc_single_mod=no ++- output_verbose_link_cmd='echo' ++- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++- lt_int_apple_cc_single_mod=yes ++- fi ++- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++- fi ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- else ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- fi ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- else ++- case $cc_basename in ++- xlc*) ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- ;; ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++- ;; ++- ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- freebsd[[12]]*) ++- # C++ shared libraries reported to be fairly broken before switch to ELF ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- freebsd-elf*) ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- ;; ++- freebsd* | kfreebsd*-gnu | dragonfly*) ++- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++- # conventions ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- ;; ++- gnu*) ++- ;; ++- hpux9*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- hpux10*|hpux11*) ++- if test $with_gnu_ld = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- ;; ++- *) ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- esac ++- fi ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ;; ++- esac ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test $with_gnu_ld = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- fi ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- interix3*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- irix5* | irix6*) ++- case $cc_basename in ++- CC*) ++- # SGI C++ ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++- fi ++- fi ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- esac ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- linux*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++- ;; ++- icpc*) ++- # Intel C++ ++- with_gnu_ld=yes ++- # version 8.0 and above of icpc choke on multiply defined symbols ++- # if we add $predep_objects and $postdep_objects, however 7.1 and ++- # earlier do not add the objects themselves. ++- case `$CC -V 2>&1` in ++- *"Version 7."*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- *) # Version 8.0 or newer ++- tmp_idyn= ++- case $host_cpu in ++- ia64*) tmp_idyn=' -i_dynamic';; ++- esac ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++- ;; ++- pgCC*) ++- # Portland Group C++ compiler ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- ;; ++- cxx*) ++- # Compaq C++ ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++- ++- runpath_var=LD_RUN_PATH ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- esac ++- ;; ++- lynxos*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- m88k*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++- wlarc= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- fi ++- # Workaround some broken pre-1.5 toolchains ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++- ;; ++- openbsd2*) ++- # C++ shared libraries are fairly broken ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- openbsd*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- fi ++- output_verbose_link_cmd='echo' ++- ;; ++- osf3*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Archives containing C++ object files must be created using ++- # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++- ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- cxx*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++- ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Archives containing C++ object files must be created using ++- # the KAI C++ compiler. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- cxx*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++- echo "-hidden">> $lib.exp~ ++- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++- $rm $lib.exp' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++- ;; ++- *) ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++- ++- else ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- psos*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- lcc*) ++- # Lucid ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The C++ compiler is used as linker so we must use $wl ++- # flag to pass the commands to the underlying system ++- # linker. We must also pass each convience library through ++- # to the system linker between allextract/defaultextract. ++- # The C++ compiler will combine linker options so we ++- # cannot just pass the convience library names through ++- # without $wl. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++- ;; ++- esac ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- output_verbose_link_cmd='echo' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -xar", where "CC" is the Sun C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- ++- # The C++ compiler must be used to create the archive. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++- ;; ++- *) ++- # GNU C++ compiler with Solaris linker ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++- if $CC --version | grep -v '^2\.7' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++- else ++- # g++ 2.7 appears to require `-G' NOT `-shared' on this ++- # platform. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++- fi ++- ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++- fi ++- ;; ++- esac ++- ;; ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- # For security reasons, it is highly recommended that you always ++- # use absolute paths for naming shared libraries, and exclude the ++- # DT_RUNPATH tag from executables and libraries. But doing so ++- # requires that you compile everything twice, which is a pain. ++- # So that behaviour is only enabled if SCOABSPATH is set to a ++- # non-empty value in the environment. Most likely only useful for ++- # creating official distributions of packages. ++- # This is a hack until libtool officially supports absolute path ++- # names for shared libraries. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- vxworks*) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++-esac ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++-_LT_AC_TAGVAR(GCC, $1)="$GXX" ++-_LT_AC_TAGVAR(LD, $1)="$LD" ++- ++-## CAVEAT EMPTOR: ++-## There is no encapsulation within the following macros, do not change ++-## the running order or otherwise move them around unless you know exactly ++-## what you are doing... ++-AC_LIBTOOL_POSTDEP_PREDEP($1) ++-AC_LIBTOOL_PROG_COMPILER_PIC($1) ++-AC_LIBTOOL_PROG_CC_C_O($1) ++-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++-AC_LIBTOOL_PROG_LD_SHLIBS($1) ++-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++- ++-AC_LIBTOOL_CONFIG($1) ++- ++-AC_LANG_POP ++-CC=$lt_save_CC ++-LDCXX=$LD ++-LD=$lt_save_LD ++-GCC=$lt_save_GCC ++-with_gnu_ldcxx=$with_gnu_ld ++-with_gnu_ld=$lt_save_with_gnu_ld ++-lt_cv_path_LDCXX=$lt_cv_path_LD ++-lt_cv_path_LD=$lt_save_path_LD ++-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++-])# AC_LIBTOOL_LANG_CXX_CONFIG ++- ++-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++-# ------------------------------------ ++-# Figure out "hidden" library dependencies from verbose ++-# compiler output when linking a shared library. ++-# Parse the compiler output and extract the necessary ++-# objects, libraries and library flags. ++-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++-dnl we can't use the lt_simple_compile_test_code here, ++-dnl because it contains code intended for an executable, ++-dnl not a library. It's possible we should let each ++-dnl tag define a new lt_????_link_test_code variable, ++-dnl but it's only used here... ++-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" ++-ifelse([$1], [], ++-[#! $SHELL ++- ++-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) ++-# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++-# ++-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 ++-# Free Software Foundation, Inc. ++-# ++-# This file is part of GNU Libtool: ++-# Originally by Gordon Matzigkeit , 1996 ++-# ++-# 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. ++-# ++-# As a special exception to the GNU General Public License, if you ++-# distribute this file as part of a program that contains a ++-# configuration script generated by Autoconf, you may include it under ++-# the same distribution terms that you use for the rest of that program. ++- ++-# A sed program that does not truncate output. ++-SED=$lt_SED ++- ++-# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++-Xsed="$SED -e 1s/^X//" ++- ++-# The HP-UX ksh and POSIX shell print the target directory to stdout ++-# if CDPATH is set. ++-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++- ++-# The names of the tagged configurations supported by this script. ++-available_tags= ++- ++-# ### BEGIN LIBTOOL CONFIG], ++-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) ++- ++-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++- ++-# Shell to use when invoking shell scripts. ++-SHELL=$lt_SHELL ++- ++-# Whether or not to build shared libraries. ++-build_libtool_libs=$enable_shared ++- ++-# Whether or not to build static libraries. ++-build_old_libs=$enable_static ++- ++-# Whether or not to add -lc for building shared libraries. ++-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) ++- ++-# Whether or not to disallow shared libs when runtime libs are static ++-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) ++- ++-# Whether or not to optimize for fast installation. ++-fast_install=$enable_fast_install ++- ++-# The host system. ++-host_alias=$host_alias ++-host=$host ++-host_os=$host_os ++- ++-# The build system. ++-build_alias=$build_alias ++-build=$build ++-build_os=$build_os ++- ++-# An echo program that does not interpret backslashes. ++-echo=$lt_echo ++- ++-# The archiver. ++-AR=$lt_AR ++-AR_FLAGS=$lt_AR_FLAGS ++- ++-# A C compiler. ++-LTCC=$lt_LTCC ++- ++-# LTCC compiler flags. ++-LTCFLAGS=$lt_LTCFLAGS ++- ++-# A language-specific compiler. ++-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) ++- ++-# Is the compiler the GNU C compiler? ++-with_gcc=$_LT_AC_TAGVAR(GCC, $1) ++- ++-# An ERE matcher. ++-EGREP=$lt_EGREP ++- ++-# The linker used to build libraries. ++-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) ++- ++-# Whether we need hard or soft links. ++-LN_S=$lt_LN_S ++- ++-# A BSD-compatible nm program. ++-NM=$lt_NM ++- ++-# A symbol stripping program ++-STRIP=$lt_STRIP ++- ++-# Used to examine libraries when file_magic_cmd begins "file" ++-MAGIC_CMD=$MAGIC_CMD ++- ++-# Used on cygwin: DLL creation program. ++-DLLTOOL="$DLLTOOL" ++- ++-# Used on cygwin: object dumper. ++-OBJDUMP="$OBJDUMP" ++- ++-# Used on cygwin: assembler. ++-AS="$AS" ++- ++-# The name of the directory that contains temporary libtool files. ++-objdir=$objdir ++- ++-# How to create reloadable object files. ++-reload_flag=$lt_reload_flag ++-reload_cmds=$lt_reload_cmds ++- ++-# How to pass a linker flag through the compiler. ++-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++- ++-# Object file suffix (normally "o"). ++-objext="$ac_objext" ++- ++-# Old archive suffix (normally "a"). ++-libext="$libext" ++- ++-# Shared library suffix (normally ".so"). ++-shrext_cmds='$shrext_cmds' ++- ++-# Executable file suffix (normally ""). ++-exeext="$exeext" ++- ++-# Additional compiler flags for building library objects. ++-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++-pic_mode=$pic_mode ++- ++-# What is the maximum length of a command? ++-max_cmd_len=$lt_cv_sys_max_cmd_len ++- ++-# Does compiler simultaneously support -c and -o options? ++-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) ++- ++-# Must we lock files when doing compilation? ++-need_locks=$lt_need_locks ++- ++-# Do we need the lib prefix for modules? ++-need_lib_prefix=$need_lib_prefix ++- ++-# Do we need a version for libraries? ++-need_version=$need_version ++- ++-# Whether dlopen is supported. ++-dlopen_support=$enable_dlopen ++- ++-# Whether dlopen of programs is supported. ++-dlopen_self=$enable_dlopen_self ++- ++-# Whether dlopen of statically linked programs is supported. ++-dlopen_self_static=$enable_dlopen_self_static ++- ++-# Compiler flag to prevent dynamic linking. ++-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) ++- ++-# Compiler flag to turn off builtin functions. ++-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) ++- ++-# Compiler flag to allow reflexive dlopens. ++-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) ++- ++-# Compiler flag to generate shared objects directly from archives. ++-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) ++- ++-# Compiler flag to generate thread-safe objects. ++-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) ++- ++-# Library versioning type. ++-version_type=$version_type ++- ++-# Format of library name prefix. ++-libname_spec=$lt_libname_spec ++- ++-# List of archive names. First name is the real one, the rest are links. ++-# The last name is the one that the linker finds with -lNAME. ++-library_names_spec=$lt_library_names_spec ++- ++-# The coded name of the library, if different from the real name. ++-soname_spec=$lt_soname_spec ++- ++-# Commands used to build and install an old-style archive. ++-RANLIB=$lt_RANLIB ++-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) ++-old_postinstall_cmds=$lt_old_postinstall_cmds ++-old_postuninstall_cmds=$lt_old_postuninstall_cmds ++- ++-# Create an old-style archive from a shared archive. ++-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) ++- ++-# Create a temporary old-style archive to link instead of a shared archive. ++-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) ++- ++-# Commands used to build and install a shared archive. ++-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) ++-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) ++-postinstall_cmds=$lt_postinstall_cmds ++-postuninstall_cmds=$lt_postuninstall_cmds ++- ++-# Commands used to build a loadable module (assumed same as above if empty) ++-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) ++-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) ++- ++-# Commands to strip libraries. ++-old_striplib=$lt_old_striplib ++-striplib=$lt_striplib ++- ++-# Dependencies to place before the objects being linked to create a ++-# shared library. ++-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) ++- ++-# Dependencies to place after the objects being linked to create a ++-# shared library. ++-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) ++- ++-# Dependencies to place before the objects being linked to create a ++-# shared library. ++-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) ++- ++-# Dependencies to place after the objects being linked to create a ++-# shared library. ++-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) ++- ++-# The library search path used internally by the compiler when linking ++-# a shared library. ++-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) ++- ++-# Method to check whether dependent libraries are shared objects. ++-deplibs_check_method=$lt_deplibs_check_method ++- ++-# Command to use when deplibs_check_method == file_magic. ++-file_magic_cmd=$lt_file_magic_cmd ++- ++-# Flag that allows shared libraries with undefined symbols to be built. ++-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) ++- ++-# Flag that forces no undefined symbols. ++-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) ++- ++-# Commands used to finish a libtool library installation in a directory. ++-finish_cmds=$lt_finish_cmds ++- ++-# Same as above, but a single script fragment to be evaled but not shown. ++-finish_eval=$lt_finish_eval ++- ++-# Take the output of nm and produce a listing of raw symbols and C names. ++-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++- ++-# Transform the output of nm in a proper C declaration ++-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++- ++-# Transform the output of nm in a C name address pair ++-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++- ++-# This is the shared library runtime path variable. ++-runpath_var=$runpath_var ++- ++-# This is the shared library path variable. ++-shlibpath_var=$shlibpath_var ++- ++-# Is shlibpath searched before the hard-coded library search path? ++-shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++- ++-# How to hardcode a shared library path into an executable. ++-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) ++- ++-# Whether we should hardcode library paths into libraries. ++-hardcode_into_libs=$hardcode_into_libs ++- ++-# Flag to hardcode \$libdir into a binary during linking. ++-# This must work even if \$libdir does not exist. ++-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++- ++-# If ld is used when linking, flag to hardcode \$libdir into ++-# a binary during linking. This must work even if \$libdir does ++-# not exist. ++-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) ++- ++-# Whether we need a single -rpath flag with a separated argument. ++-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) ++- ++-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++-# resulting binary. ++-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) ++- ++-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++-# resulting binary. ++-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) ++- ++-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++-# the resulting binary. ++-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) ++- ++-# Set to yes if building a shared library automatically hardcodes DIR into the library ++-# and all subsequent libraries and executables linked against it. ++-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) ++- ++-# Variables whose values should be saved in libtool wrapper scripts and ++-# restored at relink time. ++-variables_saved_for_relink="$variables_saved_for_relink" ++- ++-# Whether libtool must link a program against all its dependency libraries. ++-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) ++- ++-# Compile-time system search path for libraries ++-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++- ++-# Run-time system search path for libraries ++-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++- ++-# Fix the shell variable \$srcfile for the compiler. ++-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" ++- ++-# Set to yes if exported symbols are required. ++-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) ++- ++-# The commands to list exported symbols. ++-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) ++- ++-# The commands to extract the exported symbol list from a shared archive. ++-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++- ++-# Symbols that should not be listed in the preloaded symbols. ++-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) ++- ++-# Symbols that must always be exported. ++-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) ++- ++-ifelse([$1],[], ++-[# ### END LIBTOOL CONFIG], ++-[# ### END LIBTOOL TAG CONFIG: $tagname]) ++- ++-__EOF__ ++- ++-ifelse([$1],[], [ ++- case $host_os in ++- aix3*) ++- cat <<\EOF >> "$cfgfile" ++- ++-# AIX sometimes has problems with the GCC collect2 program. For some ++-# reason, if we set the COLLECT_NAMES environment variable, the problems ++-# vanish in a puff of smoke. ++-if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++-fi ++-EOF ++- ;; ++- esac ++- ++- # We use sed instead of cat because bash on DJGPP gets confused if ++- # if finds mixed CR/LF and LF-only lines. Since sed operates in ++- # text mode, it properly converts lines to CR/LF. This bash problem ++- # is reportedly fixed, but why not run on old versions too? ++- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++- ++- mv -f "$cfgfile" "$ofile" || \ ++- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++- chmod +x "$ofile" ++-]) ++-else ++- # If there is no Makefile yet, we rely on a make rule to execute ++- # `config.status --recheck' to rerun these tests and create the ++- # libtool script then. ++- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++- if test -f "$ltmain_in"; then ++- test -f Makefile && make "$ltmain" ++- fi ++-fi ++-])# AC_LIBTOOL_CONFIG ++- ++- ++-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) ++-# ------------------------------------------- ++-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], ++-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++- ++-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++- ++-if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++- ++- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++- lt_cv_prog_compiler_rtti_exceptions, ++- [-fno-rtti -fno-exceptions], [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++-fi ++-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI ++- ++- ++-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++-# --------------------------------- ++-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], ++-[AC_REQUIRE([AC_CANONICAL_HOST]) ++-AC_REQUIRE([AC_PROG_NM]) ++-AC_REQUIRE([AC_OBJEXT]) ++-# Check for command to grab the raw symbol name followed by C symbol from nm. ++-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++-[ ++-# These are sane defaults that work on at least a few old systems. ++-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++- ++-# Character class describing NM global symbol codes. ++-symcode='[[BCDEGRST]]' ++- ++-# Regexp to match symbols that can be accessed directly from C. ++-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++- ++-# Transform an extracted symbol line into a proper C declaration ++-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++- ++-# Transform an extracted symbol line into symbol name and symbol address ++-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++- ++-# Define system-specific variables. ++-case $host_os in ++-aix*) ++- symcode='[[BCDT]]' ++- ;; ++-cygwin* | mingw* | pw32*) ++- symcode='[[ABCDGISTW]]' ++- ;; ++-hpux*) # Its linker distinguishes data from code symbols ++- if test "$host_cpu" = ia64; then ++- symcode='[[ABCDEGRST]]' ++- fi ++- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++- ;; ++-linux*) ++- if test "$host_cpu" = ia64; then ++- symcode='[[ABCDGIRSTW]]' ++- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ++- fi ++- ;; ++-irix* | nonstopux*) ++- symcode='[[BCDEGRST]]' ++- ;; ++-osf*) ++- symcode='[[BCDEGQRST]]' ++- ;; ++-solaris*) ++- symcode='[[BDRT]]' ++- ;; ++-sco3.2v5*) ++- symcode='[[DT]]' ++- ;; ++-sysv4.2uw2*) ++- symcode='[[DT]]' ++- ;; ++-sysv5* | sco5v6* | unixware* | OpenUNIX*) ++- symcode='[[ABDT]]' ++- ;; ++-sysv4) ++- symcode='[[DFNSTU]]' ++- ;; ++-esac ++- ++-# Handle CRLF in mingw tool chain ++-opt_cr= ++-case $build_os in ++-mingw*) ++- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++- ;; ++-esac ++- ++-# If we're using GNU nm, then use its standard symbol codes. ++-case `$NM -V 2>&1` in ++-*GNU* | *'with BFD'*) ++- symcode='[[ABCDGIRSTW]]' ;; ++-esac ++- ++-# Try without a prefix undercore, then with it. ++-for ac_symprfx in "" "_"; do ++- ++- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++- symxfrm="\\1 $ac_symprfx\\2 \\2" ++- ++- # Write the raw and C identifiers. ++- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++- ++- # Check to see that the pipe works correctly. ++- pipe_works=no ++- ++- rm -f conftest* ++- cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then ++- # Try sorting and uniquifying the output. ++- if sort "$nlist" | uniq > "$nlist"T; then ++- mv -f "$nlist"T "$nlist" ++- else ++- rm -f "$nlist"T ++- fi ++- ++- # Make sure that we snagged all the symbols we need. ++- if grep ' nm_test_var$' "$nlist" >/dev/null; then ++- if grep ' nm_test_func$' "$nlist" >/dev/null; then ++- cat < conftest.$ac_ext ++-#ifdef __cplusplus ++-extern "C" { ++-#endif ++- ++-EOF ++- # Now generate the symbol file. ++- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++- ++- cat <> conftest.$ac_ext ++-#if defined (__STDC__) && __STDC__ ++-# define lt_ptr_t void * ++-#else ++-# define lt_ptr_t char * ++-# define const ++-#endif ++- ++-/* The mapping between symbol names and symbols. */ ++-const struct { ++- const char *name; ++- lt_ptr_t address; ++-} ++-lt_preloaded_symbols[[]] = ++-{ ++-EOF ++- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++- cat <<\EOF >> conftest.$ac_ext ++- {0, (lt_ptr_t) 0} ++-}; ++- ++-#ifdef __cplusplus ++-} ++-#endif ++-EOF ++- # Now try linking the two files. ++- mv conftest.$ac_objext conftstm.$ac_objext ++- lt_save_LIBS="$LIBS" ++- lt_save_CFLAGS="$CFLAGS" ++- LIBS="conftstm.$ac_objext" ++- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++- pipe_works=yes ++- fi ++- LIBS="$lt_save_LIBS" ++- CFLAGS="$lt_save_CFLAGS" ++- else ++- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++- cat conftest.$ac_ext >&5 ++- fi ++- rm -f conftest* conftst* ++- ++- # Do not use the global_symbol_pipe unless it works. ++- if test "$pipe_works" = yes; then ++- break ++- else ++- lt_cv_sys_global_symbol_pipe= ++- fi ++-done ++-]) ++-if test -z "$lt_cv_sys_global_symbol_pipe"; then ++- lt_cv_sys_global_symbol_to_cdecl= ++-fi ++-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++- AC_MSG_RESULT(failed) ++-else ++- AC_MSG_RESULT(ok) ++-fi ++-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++- ++- ++-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) ++-# --------------------------------------- ++-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], ++-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= ++-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++- ++-AC_MSG_CHECKING([for $compiler option to produce PIC]) ++- ifelse([$1],[CXX],[ ++- # C++ specific cases for pic, static, wl, etc. ++- if test "$GXX" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- amigaos*) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- mingw* | os2* | pw32*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++- ;; ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- *djgpp*) ++- # DJGPP does not support shared libraries at all ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- interix3*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- hpux*) ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- case $host_os in ++- aix4* | aix5*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- chorus*) ++- case $cc_basename in ++- cxch68*) ++- # Green Hills C++ Compiler ++- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++- ;; ++- esac ++- ;; ++- darwin*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- case $cc_basename in ++- xlc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- esac ++- ;; ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- freebsd* | kfreebsd*-gnu | dragonfly*) ++- # FreeBSD uses GNU C++ ++- ;; ++- hpux9* | hpux10* | hpux11*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- if test "$host_cpu" != ia64; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- fi ++- ;; ++- aCC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- interix*) ++- # This is c89, which is MS Visual C++ (no shared libs) ++- # Anyone wants to do a port? ++- ;; ++- irix5* | irix6* | nonstopux*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- # CC pic flag -KPIC is the default. ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- linux*) ++- case $cc_basename in ++- KCC*) ++- # KAI C++ Compiler ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- icpc* | ecpc*) ++- # Intel C++ ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgCC*) ++- # Portland Group C++ compiler. ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- cxx*) ++- # Compaq C++ ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- lynxos*) ++- ;; ++- m88k*) ++- ;; ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- netbsd*) ++- ;; ++- osf3* | osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- cxx*) ++- # Digital/Compaq C++ ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- psos*) ++- ;; ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- lcc*) ++- # Lucid ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- case $cc_basename in ++- CC*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- esac ++- ;; ++- vxworks*) ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-], ++-[ ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- amigaos*) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- ++- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- ++- mingw* | pw32* | os2*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++- ;; ++- ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- ++- interix3*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- ++- msdosdjgpp*) ++- # Just because we use GCC doesn't mean we suddenly get shared libraries ++- # on systems that don't support them. ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- enable_shared=no ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- ++- hpux*) ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- # PORTME Check for flag to pass linker flags through the system compiler. ++- case $host_os in ++- aix*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- darwin*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- case $cc_basename in ++- xlc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- esac ++- ;; ++- ++- mingw* | pw32* | os2*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++- ;; ++- ++- hpux9* | hpux10* | hpux11*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- # Is there a better lt_prog_compiler_static that works with the bundled CC? ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC (with -KPIC) is the default. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- newsos6) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- linux*) ++- case $cc_basename in ++- icc* | ecc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgcc* | pgf77* | pgf90* | pgf95*) ++- # Portland Group compilers (*not* the Pentium gcc compiler, ++- # which looks to be a dead project) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ccc*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All Alpha code is PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- esac ++- ;; ++- ++- osf3* | osf4* | osf5*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All OSF/1 code is PIC. ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- solaris*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- case $cc_basename in ++- f77* | f90* | f95*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4 | sysv4.2uw2* | sysv4.3*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec ;then ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- unicos*) ++- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- ++- uts4*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-]) ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++- ++-# ++-# Check to make sure the PIC flag actually works. ++-# ++-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++- "" | " "*) ;; ++- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++- esac], ++- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++-fi ++-case $host_os in ++- # For platforms which do not support PIC, -DPIC is meaningless: ++- *djgpp*) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- *) ++- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++- ;; ++-esac ++- ++-# ++-# Check to make sure the static flag actually works. ++-# ++-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++- $lt_tmp_static_flag, ++- [], ++- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++-]) ++- ++- ++-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++-# ------------------------------------ ++-# See if the linker supports building shared libraries. ++-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++-ifelse([$1],[CXX],[ ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- case $host_os in ++- aix4* | aix5*) ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- fi ++- ;; ++- pw32*) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++- ;; ++- cygwin* | mingw*) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- *) ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- esac ++-],[ ++- runpath_var= ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- _LT_AC_TAGVAR(archive_cmds, $1)= ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++- _LT_AC_TAGVAR(module_cmds, $1)= ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- # include_expsyms should be a list of space-separated symbols to be *always* ++- # included in the symbol list ++- _LT_AC_TAGVAR(include_expsyms, $1)= ++- # exclude_expsyms can be an extended regexp of symbols to exclude ++- # it will be wrapped by ` (' and `)$', so one must not match beginning or ++- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++- # as well as any symbol that contains `d'. ++- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++- # platforms (ab)use it in PIC code, but their linkers get confused if ++- # the symbol is explicitly referenced. Since portable code cannot ++- # rely on this symbol name, it's probably fine to never include it in ++- # preloaded symbol tables. ++- extract_expsyms_cmds= ++- # Just being paranoid about ensuring that cc_basename is set. ++- _LT_CC_BASENAME([$compiler]) ++- case $host_os in ++- cygwin* | mingw* | pw32*) ++- # FIXME: the MSVC++ port hasn't been tested in a loooong time ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- if test "$GCC" != yes; then ++- with_gnu_ld=no ++- fi ++- ;; ++- interix*) ++- # we just hope/assume this is gcc and not c89 (= MSVC++) ++- with_gnu_ld=yes ++- ;; ++- openbsd*) ++- with_gnu_ld=no ++- ;; ++- esac ++- ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- if test "$with_gnu_ld" = yes; then ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- wlarc='${wl}' ++- ++- # Set some defaults for GNU ld with shared library support. These ++- # are reset later if shared libraries are not supported. Putting them ++- # here allows them to be overridden if necessary. ++- runpath_var=LD_RUN_PATH ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- supports_anon_versioning=no ++- case `$LD -v 2>/dev/null` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++- *\ 2.11.*) ;; # other 2.11 versions ++- *) supports_anon_versioning=yes ;; ++- esac ++- ++- # See if GNU ld supports shared libraries. ++- case $host_os in ++- aix3* | aix4* | aix5*) ++- # On AIX/PPC, the GNU linker is very broken ++- if test "$host_cpu" != ia64; then ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <&2 ++- ++-*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++-*** to be unable to reliably create shared libraries on AIX. ++-*** Therefore, libtool is disabling shared libraries support. If you ++-*** really care for shared libraries, you may want to modify your PATH ++-*** so that a non-GNU linker is found, and then restart. ++- ++-EOF ++- fi ++- ;; ++- ++- amigaos*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- ++- # Samuel A. Falvo II reports ++- # that the semantics of dynamic libraries on AmigaOS, at least up ++- # to version 4, is to share data among multiple programs linked ++- # with the same dynamic library. Since this doesn't match the ++- # behavior of shared libraries on other platforms, we can't use ++- # them. ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- cygwin* | mingw* | pw32*) ++- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=no ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++- ++- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- interix3*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- ++- linux*) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- tmp_addflag= ++- case $cc_basename,$host_cpu in ++- pgcc*) # Portland Group C compiler ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag' ++- ;; ++- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag -Mnomain' ;; ++- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++- tmp_addflag=' -i_dynamic' ;; ++- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++- tmp_addflag=' -i_dynamic -nofor_main' ;; ++- ifc* | ifort*) # Intel Fortran compiler ++- tmp_addflag=' -nofor_main' ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- ++- if test $supports_anon_versioning = yes; then ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- $echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++- wlarc= ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- fi ++- ;; ++- ++- solaris*) ++- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <&2 ++- ++-*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++-*** create shared libraries on Solaris systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.9.1 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-EOF ++- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++-*** reliably create shared libraries on SCO systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-_LT_EOF ++- ;; ++- *) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- wlarc= ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ++- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++- runpath_var= ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- # PORTME fill in a description of your system's linker (not GNU ld) ++- case $host_os in ++- aix3*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++- # Note: this linker hardcodes the directories in LIBPATH if there ++- # are no directories specified by -L. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++- # Neither direct hardcoding nor static linking is supported with a ++- # broken collect2. ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- fi ++- ;; ++- ++- aix4* | aix5*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++- fi ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++- for ld_flag in $LDFLAGS; do ++- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++- aix_use_runtimelinking=yes ++- break ++- fi ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_AC_TAGVAR(archive_cmds, $1)='' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ++- if test "$GCC" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && \ ++- strings "$collect2name" | grep resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- else ++- # We have old collect2 ++- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an empty executable. ++- _LT_AC_SYS_LIBPATH_AIX ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- amigaos*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- # see comment about different semantics on the GNU ld section ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- bsdi[[45]]*) ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++- ;; ++- ++- cygwin* | mingw* | pw32*) ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- # hardcode_libdir_flag_spec is actually meaningless, as there is ++- # no search path for DLLs. ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Tell ltmain to make .lib files, not .a files. ++- libext=lib ++- # Tell ltmain to make .dll files, not .so files. ++- shrext_cmds=".dll" ++- # FIXME: Setting linknames here is a bad hack. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++- # The linker will automatically build a .lib file if we build a DLL. ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++- # FIXME: Should let the user specify the lib program. ++- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' ++- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ;; ++- ++- darwin* | rhapsody*) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++- ;; ++- *) # Darwin 1.3 on ++- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- else ++- case ${MACOSX_DEPLOYMENT_TARGET} in ++- 10.[[012]]) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++- ;; ++- 10.*) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- if test "$GCC" = yes ; then ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- else ++- case $cc_basename in ++- xlc*) ++- output_verbose_link_cmd='echo' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- ;; ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++- ;; ++- ++- dgux*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- freebsd1*) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++- # support. Future versions do this automatically, but an explicit c++rt0.o ++- # does not break anything, and helps significantly (at the cost of a little ++- # extra space). ++- freebsd2.2*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++- freebsd2*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++- freebsd* | kfreebsd*-gnu | dragonfly*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- hpux9*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- ++- hpux10*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- fi ++- ;; ++- ++- hpux11*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- else ++- case $host_cpu in ++- hppa*64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- fi ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- newsos6) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- openbsd*) ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- else ++- case $host_os in ++- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- ;; ++- *) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- ;; ++- esac ++- fi ++- ;; ++- ++- os2*) ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++- ;; ++- ++- osf3*) ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- osf4* | osf5*) # as osf3* with the addition of -msym flag ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- else ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++- ++- # Both c and cxx compiler support -rpath directly ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- solaris*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++- if test "$GCC" = yes; then ++- wlarc='${wl}' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++- else ++- wlarc='' ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine linker options so we ++- # cannot just pass the convience library names through ++- # without $wl, iff we do not link with $LD. ++- # Luckily, gcc supports the same syntax we need for Sun Studio. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- case $wlarc in ++- '') ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++- *) ++- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; ++- esac ;; ++- esac ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- sunos4*) ++- if test "x$host_vendor" = xsequent; then ++- # Use $CC to link under sequent, because it throws in some extra .o ++- # files that make .init and .fini sections work. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4) ++- case $host_vendor in ++- sni) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++- ;; ++- siemens) ++- ## LD is ld it makes a PLAMLIB ++- ## CC just makes a GrossModule. ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++- ;; ++- motorola) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++- ;; ++- esac ++- runpath_var='LD_RUN_PATH' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4.3*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var=LD_RUN_PATH ++- hardcode_runpath_var=yes ++- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++- fi ++- ;; ++- ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- uts4*) ++- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- fi ++-]) ++-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++-# ++-# Do we need to explicitly link libc? ++-# ++-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++-x|xyes) ++- # Assume -lc should be added ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- ++- if test "$enable_shared" = yes && test "$GCC" = yes; then ++- case $_LT_AC_TAGVAR(archive_cmds, $1) in ++- *'~'*) ++- # FIXME: we may have to deal with multi-command sequences. ++- ;; ++- '$CC '*) ++- # Test whether the compiler implicitly links with -lc since on some ++- # systems, -lgcc has to come before -lc. If gcc already passes -lc ++- # to ld, don't add -lc before -lgcc. ++- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++- $rm conftest* ++- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++- soname=conftest ++- lib=conftest ++- libobjs=conftest.$ac_objext ++- deplibs= ++- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++- compiler_flags=-v ++- linker_flags=-v ++- verstring= ++- output_objdir=. ++- libname=conftest ++- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++- then ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++- else ++- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++- fi ++- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++- else ++- cat conftest.err 1>&5 ++- fi ++- $rm conftest* ++- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++- ;; ++- esac ++- fi ++- ;; ++-esac ++-])# AC_LIBTOOL_PROG_LD_SHLIBS ++- ++- ++-# _LT_AC_FILE_LTDLL_C ++-# ------------------- ++-# Be careful that the start marker always follows a newline. ++-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++-# /* ltdll.c starts here */ ++-# #define WIN32_LEAN_AND_MEAN ++-# #include ++-# #undef WIN32_LEAN_AND_MEAN ++-# #include ++-# ++-# #ifndef __CYGWIN__ ++-# # ifdef __CYGWIN32__ ++-# # define __CYGWIN__ __CYGWIN32__ ++-# # endif ++-# #endif ++-# ++-# #ifdef __cplusplus ++-# extern "C" { ++-# #endif ++-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++-# #ifdef __cplusplus ++-# } ++-# #endif ++-# ++-# #ifdef __CYGWIN__ ++-# #include ++-# DECLARE_CYGWIN_DLL( DllMain ); ++-# #endif ++-# HINSTANCE __hDllInstance_base; ++-# ++-# BOOL APIENTRY ++-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++-# { ++-# __hDllInstance_base = hInst; ++-# return TRUE; ++-# } ++-# /* ltdll.c ends here */ ++-])# _LT_AC_FILE_LTDLL_C ++- ++- ++-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++-# --------------------------------- ++-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++- ++- ++-# old names ++-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++- ++-# This is just to silence aclocal about the macro not being used ++-ifelse([AC_DISABLE_FAST_INSTALL]) ++- ++-AC_DEFUN([LT_AC_PROG_GCJ], ++-[AC_CHECK_TOOL(GCJ, gcj, no) ++- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++- AC_SUBST(GCJFLAGS) ++-]) ++- ++-AC_DEFUN([LT_AC_PROG_RC], ++-[AC_CHECK_TOOL(RC, windres, no) ++-]) ++- ++-############################################################ ++-# NOTE: This macro has been submitted for inclusion into # ++-# GNU Autoconf as AC_PROG_SED. When it is available in # ++-# a released version of Autoconf we should remove this # ++-# macro and use it instead. # ++-############################################################ ++-# LT_AC_PROG_SED ++-# -------------- ++-# Check for a fully-functional sed program, that truncates ++-# as few characters as possible. Prefer GNU sed if found. ++-AC_DEFUN([LT_AC_PROG_SED], ++-[AC_MSG_CHECKING([for a sed that does not truncate output]) ++-AC_CACHE_VAL(lt_cv_path_SED, ++-[# Loop through the user's path and test for sed and gsed. ++-# Then use that list of sed's as ones to test for truncation. ++-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++-for as_dir in $PATH ++-do ++- IFS=$as_save_IFS ++- test -z "$as_dir" && as_dir=. ++- for lt_ac_prog in sed gsed; do ++- for ac_exec_ext in '' $ac_executable_extensions; do ++- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++- fi ++- done ++- done ++-done ++-lt_ac_max=0 ++-lt_ac_count=0 ++-# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++-# along with /bin/sed that truncates output. ++-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++- test ! -f $lt_ac_sed && continue ++- cat /dev/null > conftest.in ++- lt_ac_count=0 ++- echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++- # Check for GNU sed and select it if it is found. ++- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++- lt_cv_path_SED=$lt_ac_sed ++- break ++- fi ++- while true; do ++- cat conftest.in conftest.in >conftest.tmp ++- mv conftest.tmp conftest.in ++- cp conftest.in conftest.nl ++- echo >>conftest.nl ++- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++- cmp -s conftest.out conftest.nl || break ++- # 10000 chars as input seems more than enough ++- test $lt_ac_count -gt 10 && break ++- lt_ac_count=`expr $lt_ac_count + 1` ++- if test $lt_ac_count -gt $lt_ac_max; then ++- lt_ac_max=$lt_ac_count ++- lt_cv_path_SED=$lt_ac_sed ++- fi ++- done ++-done ++-]) ++-SED=$lt_cv_path_SED ++-AC_MSG_RESULT([$SED]) ++-]) ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -241,19 +241,6 @@ all: rfbconfig.h ++ .SUFFIXES: ++ am--refresh: ++ @: ++-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++- @for dep in $?; do \ ++- case '$(am__configure_deps)' in \ ++- *$$dep*) \ ++- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ++- cd $(srcdir) && $(AUTOMAKE) --gnu \ ++- && exit 0; \ ++- exit 1;; \ ++- esac; \ ++- done; \ ++- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++- cd $(top_srcdir) && \ ++- $(AUTOMAKE) --gnu Makefile ++ .PRECIOUS: Makefile ++ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ +diff --git a/feeds/packages/libs/libvncserver/patches/100-noexamples.patch b/feeds/packages/libs/libvncserver/patches/100-noexamples.patch +new file mode 100644 +index 0000000..dc7d933 +--- /dev/null ++++ b/feeds/packages/libs/libvncserver/patches/100-noexamples.patch +@@ -0,0 +1,43 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -228,8 +228,8 @@ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++ with_ffmpeg = @with_ffmpeg@ ++ @WITH_X11VNC_TRUE@X11VNC = x11vnc ++-SUBDIRS = libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC) ++-DIST_SUBDIRS = libvncserver examples contrib libvncclient vncterm classes client_examples test +++SUBDIRS = libvncserver +++DIST_SUBDIRS = libvncserver ++ bin_SCRIPTS = libvncserver-config ++ #include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h ++ include_HEADERS = rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \ ++--- a/configure.ac +++++ b/configure.ac ++@@ -748,14 +748,6 @@ AC_SUBST(RPMSOURCEDIR) ++ ++ AC_CONFIG_FILES([Makefile ++ libvncserver/Makefile ++- contrib/Makefile ++- examples/Makefile ++- vncterm/Makefile ++- classes/Makefile ++- classes/ssl/Makefile ++- libvncclient/Makefile ++- client_examples/Makefile ++- test/Makefile ++ libvncserver-config ++ LibVNCServer.spec]) ++ # ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -4,8 +4,8 @@ if WITH_X11VNC ++ X11VNC=x11vnc ++ endif ++ ++-SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC) ++-DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test +++SUBDIRS=libvncserver +++DIST_SUBDIRS=libvncserver ++ ++ bin_SCRIPTS = libvncserver-config ++ +diff --git a/feeds/packages/libs/libvorbis/.svn/entries b/feeds/packages/libs/libvorbis/.svn/entries +new file mode 100644 +index 0000000..86855f3 +--- /dev/null ++++ b/feeds/packages/libs/libvorbis/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libvorbis ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:05.551071Z ++35792 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++bcc75d1d538e25a73ea283f859c5271f ++2013-02-25T21:04:05.551071Z ++35792 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1876 ++ +diff --git a/feeds/packages/libs/libvorbis/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libvorbis/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..961c86e +--- /dev/null ++++ b/feeds/packages/libs/libvorbis/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# Copyright (C) 2008-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:=libvorbis ++PKG_VERSION:=1.3.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/ ++PKG_MD5SUM:=71b649d3e08e63ece16649df906ce8b9 ++ ++PKG_LICENSE:=BSD-3c ++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/feeds/packages/libs/libvorbis/Makefile b/feeds/packages/libs/libvorbis/Makefile +new file mode 100644 +index 0000000..961c86e +--- /dev/null ++++ b/feeds/packages/libs/libvorbis/Makefile +@@ -0,0 +1,64 @@ ++# ++# Copyright (C) 2008-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:=libvorbis ++PKG_VERSION:=1.3.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/ ++PKG_MD5SUM:=71b649d3e08e63ece16649df906ce8b9 ++ ++PKG_LICENSE:=BSD-3c ++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/feeds/packages/libs/libvorbis/patches/.svn/entries b/feeds/packages/libs/libvorbis/patches/.svn/entries +new file mode 100644 +index 0000000..9d8f7ec +--- /dev/null ++++ b/feeds/packages/libs/libvorbis/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libvorbis/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T21:04:05.551071Z ++35792 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2013-02-25T21:04:05.551071Z ++35792 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ +diff --git a/feeds/packages/libs/libvorbis/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/libvorbis/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/libs/libvorbis/patches/001-automake-compat.patch b/feeds/packages/libs/libvorbis/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/libs/libvorbisidec/.svn/entries b/feeds/packages/libs/libvorbisidec/.svn/entries +new file mode 100644 +index 0000000..a920020 +--- /dev/null ++++ b/feeds/packages/libs/libvorbisidec/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libvorbisidec ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e410598939f2bd850076ebca80fc9901 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1469 ++ +diff --git a/feeds/packages/libs/libvorbisidec/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libvorbisidec/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libvorbisidec/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libvorbisidec/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libvorbisidec/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..151cc9a +--- /dev/null ++++ b/feeds/packages/libs/libvorbisidec/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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:=libvorbisidec ++PKG_VERSION:=1.0.2+svn14261 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/ ++PKG_MD5SUM:=bc617d4af1cd74b38d7c51451dd6eff0 ++ ++PKG_LICENSE:=BSD-3c ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libvorbisidec ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=A fixed-point Ogg/Vorbis decoder library ++ 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/feeds/packages/libs/libvorbisidec/Makefile b/feeds/packages/libs/libvorbisidec/Makefile +new file mode 100644 +index 0000000..151cc9a +--- /dev/null ++++ b/feeds/packages/libs/libvorbisidec/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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:=libvorbisidec ++PKG_VERSION:=1.0.2+svn14261 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/ ++PKG_MD5SUM:=bc617d4af1cd74b38d7c51451dd6eff0 ++ ++PKG_LICENSE:=BSD-3c ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libvorbisidec ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=A fixed-point Ogg/Vorbis decoder library ++ 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/feeds/packages/libs/libxapian/.svn/entries b/feeds/packages/libs/libxapian/.svn/entries +new file mode 100644 +index 0000000..7fda70f +--- /dev/null ++++ b/feeds/packages/libs/libxapian/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libxapian ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T11:40:15.696761Z ++32523 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++104e7abb63994710a8cabe454ab15928 ++2012-06-29T11:40:15.696761Z ++32523 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1978 ++ +diff --git a/feeds/packages/libs/libxapian/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libxapian/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7b290c0 +--- /dev/null ++++ b/feeds/packages/libs/libxapian/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,85 @@ ++# ++# 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:=xapian-core ++PKG_VERSION:=1.2.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://oligarchy.co.uk/xapian/$(PKG_VERSION) ++PKG_MD5SUM:=6c9f9e7ac43aa4e086283201329e98ee ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_BUILD_DEPENDS:=util-linux ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libxapian ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=xapian ++ URL:=http://xapian.org ++ DEPENDS:=+libstdcpp +zlib ++endef ++ ++MAKE_FLAGS += \ ++ SUBDIRS=. ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/share/aclocal ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ ++ $(1)/usr/share/aclocal ++ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/xapian.h \ ++ $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/include/xapian ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/xapian/* \ ++ $(1)/usr/include/xapian ++ ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/xapian-config \ ++ $(2)/bin ++ $(SED) 's,prefix=",prefix="$(STAGING_DIR),g' $(2)/bin/xapian-config ++ ++ #FIXME: Libtool should handle this ++ if [ -f $(TOOLCHAIN_DIR)/usr/lib/libstdc++.la ]; then \ ++ $(SED) \ ++ "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/usr/lib/libstdc++,g" \ ++ $(1)/usr/lib/libxapian.la ; \ ++ else \ ++ $(SED) \ ++ "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/lib/libstdc++,g" \ ++ $(1)/usr/lib/libxapian.la ; \ ++ fi ++endef ++ ++define Package/libxapian/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,libxapian)) +diff --git a/feeds/packages/libs/libxapian/Makefile b/feeds/packages/libs/libxapian/Makefile +new file mode 100644 +index 0000000..7b290c0 +--- /dev/null ++++ b/feeds/packages/libs/libxapian/Makefile +@@ -0,0 +1,85 @@ ++# ++# 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:=xapian-core ++PKG_VERSION:=1.2.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://oligarchy.co.uk/xapian/$(PKG_VERSION) ++PKG_MD5SUM:=6c9f9e7ac43aa4e086283201329e98ee ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_BUILD_DEPENDS:=util-linux ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/libxapian ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=xapian ++ URL:=http://xapian.org ++ DEPENDS:=+libstdcpp +zlib ++endef ++ ++MAKE_FLAGS += \ ++ SUBDIRS=. ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/share/aclocal ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ ++ $(1)/usr/share/aclocal ++ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/xapian.h \ ++ $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/include/xapian ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/xapian/* \ ++ $(1)/usr/include/xapian ++ ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/xapian-config \ ++ $(2)/bin ++ $(SED) 's,prefix=",prefix="$(STAGING_DIR),g' $(2)/bin/xapian-config ++ ++ #FIXME: Libtool should handle this ++ if [ -f $(TOOLCHAIN_DIR)/usr/lib/libstdc++.la ]; then \ ++ $(SED) \ ++ "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/usr/lib/libstdc++,g" \ ++ $(1)/usr/lib/libxapian.la ; \ ++ else \ ++ $(SED) \ ++ "s,$(STAGING_DIR)/usr/lib/libstdc++,$(TOOLCHAIN_DIR)/lib/libstdc++,g" \ ++ $(1)/usr/lib/libxapian.la ; \ ++ fi ++endef ++ ++define Package/libxapian/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,libxapian)) +diff --git a/feeds/packages/libs/libxapian/patches/.svn/entries b/feeds/packages/libs/libxapian/patches/.svn/entries +new file mode 100644 +index 0000000..af3c02f +--- /dev/null ++++ b/feeds/packages/libs/libxapian/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libxapian/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-16T18:08:31.143363Z ++30600 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-xapian_config_no_ltlibs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4a8cda8c7ee19799935651aa29fce5d4 ++2012-02-16T18:08:31.143363Z ++30600 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2327 ++ ++001-missing_includes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f88467783c1db17ad99caa476cb94d60 ++2012-02-16T18:08:31.143363Z ++30600 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++745 ++ +diff --git a/feeds/packages/libs/libxapian/patches/.svn/text-base/001-missing_includes.patch.svn-base b/feeds/packages/libs/libxapian/patches/.svn/text-base/001-missing_includes.patch.svn-base +new file mode 100644 +index 0000000..fba4bc0 +--- /dev/null ++++ b/feeds/packages/libs/libxapian/patches/.svn/text-base/001-missing_includes.patch.svn-base +@@ -0,0 +1,50 @@ ++--- a/backends/flint/flint_version.cc +++++ b/backends/flint/flint_version.cc ++@@ -20,6 +20,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include "safeerrno.h" ++ ++--- a/bin/xapian-progsrv.cc +++++ b/bin/xapian-progsrv.cc ++@@ -19,6 +19,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include "remoteserver.h" ++ ++--- a/bin/xapian-tcpsrv.cc +++++ b/bin/xapian-tcpsrv.cc ++@@ -21,6 +21,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ ++--- a/examples/delve.cc +++++ b/examples/delve.cc ++@@ -21,6 +21,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ ++--- a/examples/quest.cc +++++ b/examples/quest.cc ++@@ -19,6 +19,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ +diff --git a/feeds/packages/libs/libxapian/patches/.svn/text-base/002-xapian_config_no_ltlibs.patch.svn-base b/feeds/packages/libs/libxapian/patches/.svn/text-base/002-xapian_config_no_ltlibs.patch.svn-base +new file mode 100644 +index 0000000..c5d4dc7 +--- /dev/null ++++ b/feeds/packages/libs/libxapian/patches/.svn/text-base/002-xapian_config_no_ltlibs.patch.svn-base +@@ -0,0 +1,55 @@ ++--- a/m4-macros/xapian.m4 +++++ b/m4-macros/xapian.m4 ++@@ -52,11 +52,11 @@ ++ [$2]) ++ else ++ AC_MSG_CHECKING([$XAPIAN_CONFIG works]) ++- dnl check for --ltlibs but not --libs as "xapian-config --libs" will +++ dnl check for --libs but not --libs as "xapian-config --libs" will ++ dnl fail if xapian isn't installed... ++ ++ dnl run with exec to avoid leaking output on "real" bourne shells ++- if (exec >&5 2>&5 ; $XAPIAN_CONFIG --ltlibs --cxxflags; exit $?) then +++ if (exec >&5 2>&5 ; $XAPIAN_CONFIG --libs --cxxflags; exit $?) then ++ AC_MSG_RESULT(yes) ++ else ++ case $? in ++@@ -70,7 +70,7 @@ ++ AC_MSG_ERROR([\`$XAPIAN_CONFIG' not executable, aborting]) ++ ;; ++ esac ++- AC_MSG_ERROR([\`$XAPIAN_CONFIG --ltlibs --cxxflags' doesn't work, aborting]) +++ AC_MSG_ERROR([\`$XAPIAN_CONFIG --libs --cxxflags' doesn't work, aborting]) ++ fi ++ ++ dnl If LT_INIT, AC_PROG_LIBTOOL or the deprecated older version ++@@ -80,11 +80,11 @@ ++ XAPIAN_VERSION=`$XAPIAN_CONFIG --version|sed 's/.* //;s/_svn[[0-9]]*$//'` ++ XAPIAN_CXXFLAGS=`$XAPIAN_CONFIG --cxxflags` ++ AC_PROVIDE_IFELSE([LT_INIT], ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], ++ [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], ++ [AC_PROVIDE_IFELSE([AM_PROG_LIBTOOL], ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], ++ dnl Pass magic option so xapian-config knows we called it (so it ++ dnl can choose a more appropriate error message if asked to link ++ dnl with an uninstalled libxapian). Also pass ac_top_srcdir ++@@ -92,11 +92,11 @@ ++ dnl "configure.in" according to which is in use. ++ [XAPIAN_LIBS=`ac_top_srcdir="$ac_top_srcdir" $XAPIAN_CONFIG --from-xo-lib-xapian --libs` ++ define([LT_INIT], defn([LT_INIT]) ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`]) +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`]) ++ define([AC_PROG_LIBTOOL], defn([AC_PROG_LIBTOOL]) ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`]) +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`]) ++ define([AM_PROG_LIBTOOL], defn([AM_PROG_LIBTOOL]) ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])])])]) +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])])])]) ++ ifelse([$1], , :, [$1]) ++ fi ++ AC_SUBST(XAPIAN_CXXFLAGS) +diff --git a/feeds/packages/libs/libxapian/patches/001-missing_includes.patch b/feeds/packages/libs/libxapian/patches/001-missing_includes.patch +new file mode 100644 +index 0000000..fba4bc0 +--- /dev/null ++++ b/feeds/packages/libs/libxapian/patches/001-missing_includes.patch +@@ -0,0 +1,50 @@ ++--- a/backends/flint/flint_version.cc +++++ b/backends/flint/flint_version.cc ++@@ -20,6 +20,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include "safeerrno.h" ++ ++--- a/bin/xapian-progsrv.cc +++++ b/bin/xapian-progsrv.cc ++@@ -19,6 +19,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include "remoteserver.h" ++ ++--- a/bin/xapian-tcpsrv.cc +++++ b/bin/xapian-tcpsrv.cc ++@@ -21,6 +21,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ ++--- a/examples/delve.cc +++++ b/examples/delve.cc ++@@ -21,6 +21,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ ++--- a/examples/quest.cc +++++ b/examples/quest.cc ++@@ -19,6 +19,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #include ++ +diff --git a/feeds/packages/libs/libxapian/patches/002-xapian_config_no_ltlibs.patch b/feeds/packages/libs/libxapian/patches/002-xapian_config_no_ltlibs.patch +new file mode 100644 +index 0000000..c5d4dc7 +--- /dev/null ++++ b/feeds/packages/libs/libxapian/patches/002-xapian_config_no_ltlibs.patch +@@ -0,0 +1,55 @@ ++--- a/m4-macros/xapian.m4 +++++ b/m4-macros/xapian.m4 ++@@ -52,11 +52,11 @@ ++ [$2]) ++ else ++ AC_MSG_CHECKING([$XAPIAN_CONFIG works]) ++- dnl check for --ltlibs but not --libs as "xapian-config --libs" will +++ dnl check for --libs but not --libs as "xapian-config --libs" will ++ dnl fail if xapian isn't installed... ++ ++ dnl run with exec to avoid leaking output on "real" bourne shells ++- if (exec >&5 2>&5 ; $XAPIAN_CONFIG --ltlibs --cxxflags; exit $?) then +++ if (exec >&5 2>&5 ; $XAPIAN_CONFIG --libs --cxxflags; exit $?) then ++ AC_MSG_RESULT(yes) ++ else ++ case $? in ++@@ -70,7 +70,7 @@ ++ AC_MSG_ERROR([\`$XAPIAN_CONFIG' not executable, aborting]) ++ ;; ++ esac ++- AC_MSG_ERROR([\`$XAPIAN_CONFIG --ltlibs --cxxflags' doesn't work, aborting]) +++ AC_MSG_ERROR([\`$XAPIAN_CONFIG --libs --cxxflags' doesn't work, aborting]) ++ fi ++ ++ dnl If LT_INIT, AC_PROG_LIBTOOL or the deprecated older version ++@@ -80,11 +80,11 @@ ++ XAPIAN_VERSION=`$XAPIAN_CONFIG --version|sed 's/.* //;s/_svn[[0-9]]*$//'` ++ XAPIAN_CXXFLAGS=`$XAPIAN_CONFIG --cxxflags` ++ AC_PROVIDE_IFELSE([LT_INIT], ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], ++ [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL], ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], ++ [AC_PROVIDE_IFELSE([AM_PROG_LIBTOOL], ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`], +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`], ++ dnl Pass magic option so xapian-config knows we called it (so it ++ dnl can choose a more appropriate error message if asked to link ++ dnl with an uninstalled libxapian). Also pass ac_top_srcdir ++@@ -92,11 +92,11 @@ ++ dnl "configure.in" according to which is in use. ++ [XAPIAN_LIBS=`ac_top_srcdir="$ac_top_srcdir" $XAPIAN_CONFIG --from-xo-lib-xapian --libs` ++ define([LT_INIT], defn([LT_INIT]) ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`]) +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`]) ++ define([AC_PROG_LIBTOOL], defn([AC_PROG_LIBTOOL]) ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`]) +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`]) ++ define([AM_PROG_LIBTOOL], defn([AM_PROG_LIBTOOL]) ++- [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])])])]) +++ [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])])])]) ++ ifelse([$1], , :, [$1]) ++ fi ++ AC_SUBST(XAPIAN_CXXFLAGS) +diff --git a/feeds/packages/libs/libxml2/.svn/entries b/feeds/packages/libs/libxml2/.svn/entries +new file mode 100644 +index 0000000..a3b4ddc +--- /dev/null ++++ b/feeds/packages/libs/libxml2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libxml2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++96a8bd173bca4c0ea9a59b13fdc9d794 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2260 ++ +diff --git a/feeds/packages/libs/libxml2/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libxml2/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libxml2/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libxml2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libxml2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..735c8c8 +--- /dev/null ++++ b/feeds/packages/libs/libxml2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,108 @@ ++# ++# 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:=libxml2 ++PKG_VERSION:=2.7.8 ++PKG_RELEASE:=2 ++ ++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:=8127a65e8c3b08856093099b52599c86 ++ ++PKG_LICENSE:=MIT ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++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 \ ++ ++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 BuildPackage,libxml2)) +diff --git a/feeds/packages/libs/libxml2/Makefile b/feeds/packages/libs/libxml2/Makefile +new file mode 100644 +index 0000000..735c8c8 +--- /dev/null ++++ b/feeds/packages/libs/libxml2/Makefile +@@ -0,0 +1,108 @@ ++# ++# 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:=libxml2 ++PKG_VERSION:=2.7.8 ++PKG_RELEASE:=2 ++ ++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:=8127a65e8c3b08856093099b52599c86 ++ ++PKG_LICENSE:=MIT ++PKG_LICENSE_FILES:=COPYING ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++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 \ ++ ++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 BuildPackage,libxml2)) +diff --git a/feeds/packages/libs/libxml2/patches/.svn/entries b/feeds/packages/libs/libxml2/patches/.svn/entries +new file mode 100644 +index 0000000..3850384 +--- /dev/null ++++ b/feeds/packages/libs/libxml2/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libxml2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-28T10:35:14.703893Z ++33578 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-debian_CVEs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8fd7e9ce8bad94eced4a9cfeeb32e5da ++2012-09-28T10:35:14.703893Z ++33578 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++30986 ++ +diff --git a/feeds/packages/libs/libxml2/patches/.svn/text-base/001-debian_CVEs.patch.svn-base b/feeds/packages/libs/libxml2/patches/.svn/text-base/001-debian_CVEs.patch.svn-base +new file mode 100644 +index 0000000..6b34bf6 +--- /dev/null ++++ b/feeds/packages/libs/libxml2/patches/.svn/text-base/001-debian_CVEs.patch.svn-base +@@ -0,0 +1,1028 @@ ++--- libxml2-2.7.8/dict.c 2010-10-12 08:25:31.000000000 +0200 +++++ libxml2-2.7.8.patched/dict.c 2012-09-28 12:08:37.432414664 +0200 ++@@ -2,7 +2,7 @@ ++ * dict.c: dictionary of reusable strings, just used to avoid allocation ++ * and freeing operations. ++ * ++- * Copyright (C) 2003 Daniel Veillard. +++ * Copyright (C) 2003-2012 Daniel Veillard. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++@@ -19,6 +19,28 @@ ++ #define IN_LIBXML ++ #include "libxml.h" ++ +++#ifdef HAVE_STDLIB_H +++#include +++#endif +++#ifdef HAVE_TIME_H +++#include +++#endif +++ +++/* +++ * Following http://www.ocert.org/advisories/ocert-2011-003.html +++ * it seems that having hash randomization might be a good idea +++ * when using XML with untrusted data +++ * Note1: that it works correctly only if compiled with WITH_BIG_KEY +++ * which is the default. +++ * Note2: the fast function used for a small dict won't protect very +++ * well but since the attack is based on growing a very big hash +++ * list we will use the BigKey algo as soon as the hash size grows +++ * over MIN_DICT_SIZE so this actually works +++ */ +++#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) +++#define DICT_RANDOMIZATION +++#endif +++ ++ #include ++ #ifdef HAVE_STDINT_H ++ #include ++@@ -44,23 +66,23 @@ ++ #define WITH_BIG_KEY ++ ++ #ifdef WITH_BIG_KEY ++-#define xmlDictComputeKey(dict, name, len) \ ++- (((dict)->size == MIN_DICT_SIZE) ? \ ++- xmlDictComputeFastKey(name, len) : \ ++- xmlDictComputeBigKey(name, len)) ++- ++-#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ ++- (((prefix) == NULL) ? \ ++- (xmlDictComputeKey(dict, name, len)) : \ ++- (((dict)->size == MIN_DICT_SIZE) ? \ ++- xmlDictComputeFastQKey(prefix, plen, name, len) : \ ++- xmlDictComputeBigQKey(prefix, plen, name, len))) +++#define xmlDictComputeKey(dict, name, len) \ +++ (((dict)->size == MIN_DICT_SIZE) ? \ +++ xmlDictComputeFastKey(name, len, (dict)->seed) : \ +++ xmlDictComputeBigKey(name, len, (dict)->seed)) +++ +++#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ +++ (((prefix) == NULL) ? \ +++ (xmlDictComputeKey(dict, name, len)) : \ +++ (((dict)->size == MIN_DICT_SIZE) ? \ +++ xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) : \ +++ xmlDictComputeBigQKey(prefix, plen, name, len, (dict)->seed))) ++ ++ #else /* !WITH_BIG_KEY */ ++-#define xmlDictComputeKey(dict, name, len) \ ++- xmlDictComputeFastKey(name, len) ++-#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ ++- xmlDictComputeFastQKey(prefix, plen, name, len) +++#define xmlDictComputeKey(dict, name, len) \ +++ xmlDictComputeFastKey(name, len, (dict)->seed) +++#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ +++ xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) ++ #endif /* WITH_BIG_KEY */ ++ ++ /* ++@@ -98,6 +120,8 @@ ++ xmlDictStringsPtr strings; ++ ++ struct _xmlDict *subdict; +++ /* used for randomization */ +++ int seed; ++ }; ++ ++ /* ++@@ -125,6 +149,9 @@ ++ if ((xmlDictMutex = xmlNewRMutex()) == NULL) ++ return(0); ++ +++#ifdef DICT_RANDOMIZATION +++ srand(time(NULL)); +++#endif ++ xmlDictInitialized = 1; ++ return(1); ++ } ++@@ -277,13 +304,13 @@ ++ */ ++ ++ static uint32_t ++-xmlDictComputeBigKey(const xmlChar* data, int namelen) { +++xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) { ++ uint32_t hash; ++ int i; ++ ++ if (namelen <= 0 || data == NULL) return(0); ++ ++- hash = 0; +++ hash = seed; ++ ++ for (i = 0;i < namelen; i++) { ++ hash += data[i]; ++@@ -310,12 +337,12 @@ ++ */ ++ static unsigned long ++ xmlDictComputeBigQKey(const xmlChar *prefix, int plen, ++- const xmlChar *name, int len) +++ const xmlChar *name, int len, int seed) ++ { ++ uint32_t hash; ++ int i; ++ ++- hash = 0; +++ hash = seed; ++ ++ for (i = 0;i < plen; i++) { ++ hash += prefix[i]; ++@@ -346,8 +373,8 @@ ++ * for low hash table fill. ++ */ ++ static unsigned long ++-xmlDictComputeFastKey(const xmlChar *name, int namelen) { ++- unsigned long value = 0L; +++xmlDictComputeFastKey(const xmlChar *name, int namelen, int seed) { +++ unsigned long value = seed; ++ ++ if (name == NULL) return(0); ++ value = *name; ++@@ -381,9 +408,9 @@ ++ */ ++ static unsigned long ++ xmlDictComputeFastQKey(const xmlChar *prefix, int plen, ++- const xmlChar *name, int len) +++ const xmlChar *name, int len, int seed) ++ { ++- unsigned long value = 0L; +++ unsigned long value = (unsigned long) seed; ++ ++ if (plen == 0) ++ value += 30 * (unsigned long) ':'; ++@@ -460,6 +487,11 @@ ++ dict->subdict = NULL; ++ if (dict->dict) { ++ memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry)); +++#ifdef DICT_RANDOMIZATION +++ dict->seed = rand(); +++#else +++ dict->seed = 0; +++#endif ++ return(dict); ++ } ++ xmlFree(dict); ++@@ -486,6 +518,7 @@ ++ #ifdef DICT_DEBUG_PATTERNS ++ fprintf(stderr, "R"); ++ #endif +++ dict->seed = sub->seed; ++ dict->subdict = sub; ++ xmlDictReference(dict->subdict); ++ } ++--- libxml2-2.7.8/encoding.c 2010-11-04 17:40:06.000000000 +0100 +++++ libxml2-2.7.8.patched/encoding.c 2012-09-28 12:08:37.440414665 +0200 ++@@ -1928,7 +1928,7 @@ ++ if (in == NULL) return(-1); ++ ++ /* calculate space available */ ++- written = out->size - out->use; +++ written = out->size - out->use - 1; /* count '\0' */ ++ toconv = in->use; ++ /* ++ * echo '' | wc -c => 38 ++@@ -2059,7 +2059,7 @@ ++ toconv = in->use; ++ if (toconv == 0) ++ return (0); ++- written = out->size - out->use; +++ written = out->size - out->use - 1; /* count '\0' */ ++ if (toconv * 2 >= written) { ++ xmlBufferGrow(out, out->size + toconv * 2); ++ written = out->size - out->use - 1; ++--- libxml2-2.7.8/entities.c 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/entities.c 2012-09-28 12:08:37.432414664 +0200 ++@@ -528,13 +528,13 @@ ++ * Macro used to grow the current buffer. ++ */ ++ #define growBufferReentrant() { \ ++- buffer_size *= 2; \ ++- buffer = (xmlChar *) \ ++- xmlRealloc(buffer, buffer_size * sizeof(xmlChar)); \ ++- if (buffer == NULL) { \ ++- xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed");\ ++- return(NULL); \ ++- } \ +++ xmlChar *tmp; \ +++ size_t new_size = buffer_size * 2; \ +++ if (new_size < buffer_size) goto mem_error; \ +++ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \ +++ if (tmp == NULL) goto mem_error; \ +++ buffer = tmp; \ +++ buffer_size = new_size; \ ++ } ++ ++ ++@@ -555,7 +555,7 @@ ++ const xmlChar *cur = input; ++ xmlChar *buffer = NULL; ++ xmlChar *out = NULL; ++- int buffer_size = 0; +++ size_t buffer_size = 0; ++ int html = 0; ++ ++ if (input == NULL) return(NULL); ++@@ -574,8 +574,8 @@ ++ out = buffer; ++ ++ while (*cur != '\0') { ++- if (out - buffer > buffer_size - 100) { ++- int indx = out - buffer; +++ size_t indx = out - buffer; +++ if (indx + 100 > buffer_size) { ++ ++ growBufferReentrant(); ++ out = &buffer[indx]; ++@@ -692,6 +692,11 @@ ++ } ++ *out = 0; ++ return(buffer); +++ +++mem_error: +++ xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed"); +++ xmlFree(buffer); +++ return(NULL); ++ } ++ ++ /** ++@@ -709,7 +714,7 @@ ++ const xmlChar *cur = input; ++ xmlChar *buffer = NULL; ++ xmlChar *out = NULL; ++- int buffer_size = 0; +++ size_t buffer_size = 0; ++ if (input == NULL) return(NULL); ++ ++ /* ++@@ -724,8 +729,8 @@ ++ out = buffer; ++ ++ while (*cur != '\0') { ++- if (out - buffer > buffer_size - 10) { ++- int indx = out - buffer; +++ size_t indx = out - buffer; +++ if (indx + 10 > buffer_size) { ++ ++ growBufferReentrant(); ++ out = &buffer[indx]; ++@@ -774,6 +779,11 @@ ++ } ++ *out = 0; ++ return(buffer); +++ +++mem_error: +++ xmlEntitiesErrMemory("xmlEncodeSpecialChars: realloc failed"); +++ xmlFree(buffer); +++ return(NULL); ++ } ++ ++ /** ++--- libxml2-2.7.8/hash.c 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/hash.c 2012-09-28 12:08:37.392414663 +0200 ++@@ -3,7 +3,7 @@ ++ * ++ * Reference: Your favorite introductory book on algorithms ++ * ++- * Copyright (C) 2000 Bjorn Reese and Daniel Veillard. +++ * Copyright (C) 2000,2012 Bjorn Reese and Daniel Veillard. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++@@ -21,6 +21,22 @@ ++ #include "libxml.h" ++ ++ #include +++#ifdef HAVE_STDLIB_H +++#include +++#endif +++#ifdef HAVE_TIME_H +++#include +++#endif +++ +++/* +++ * Following http://www.ocert.org/advisories/ocert-2011-003.html +++ * it seems that having hash randomization might be a good idea +++ * when using XML with untrusted data +++ */ +++#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) +++#define HASH_RANDOMIZATION +++#endif +++ ++ #include ++ #include ++ #include ++@@ -31,6 +47,10 @@ ++ ++ /* #define DEBUG_GROW */ ++ +++#ifdef HASH_RANDOMIZATION +++static int hash_initialized = 0; +++#endif +++ ++ /* ++ * A single entry in the hash table ++ */ ++@@ -53,6 +73,9 @@ ++ int size; ++ int nbElems; ++ xmlDictPtr dict; +++#ifdef HASH_RANDOMIZATION +++ int random_seed; +++#endif ++ }; ++ ++ /* ++@@ -65,6 +88,9 @@ ++ unsigned long value = 0L; ++ char ch; ++ +++#ifdef HASH_RANDOMIZATION +++ value = table->random_seed; +++#endif ++ if (name != NULL) { ++ value += 30 * (*name); ++ while ((ch = *name++) != 0) { ++@@ -92,6 +118,9 @@ ++ unsigned long value = 0L; ++ char ch; ++ +++#ifdef HASH_RANDOMIZATION +++ value = table->random_seed; +++#endif ++ if (prefix != NULL) ++ value += 30 * (*prefix); ++ else ++@@ -156,6 +185,13 @@ ++ table->table = xmlMalloc(size * sizeof(xmlHashEntry)); ++ if (table->table) { ++ memset(table->table, 0, size * sizeof(xmlHashEntry)); +++#ifdef HASH_RANDOMIZATION +++ if (!hash_initialized) { +++ srand(time(NULL)); +++ hash_initialized = 1; +++ } +++ table->random_seed = rand(); +++#endif ++ return(table); ++ } ++ xmlFree(table); ++--- libxml2-2.7.8/parser.c 2010-11-04 16:55:45.000000000 +0100 +++++ libxml2-2.7.8.patched/parser.c 2012-09-28 12:08:37.440414665 +0200 ++@@ -40,6 +40,7 @@ ++ #endif ++ ++ #include +++#include ++ #include ++ #include ++ #include ++@@ -114,10 +115,10 @@ ++ * parser option. ++ */ ++ static int ++-xmlParserEntityCheck(xmlParserCtxtPtr ctxt, unsigned long size, +++xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, ++ xmlEntityPtr ent) ++ { ++- unsigned long consumed = 0; +++ size_t consumed = 0; ++ ++ if ((ctxt == NULL) || (ctxt->options & XML_PARSE_HUGE)) ++ return (0); ++@@ -2580,15 +2581,17 @@ ++ ++ /* ++ * Macro used to grow the current buffer. +++ * buffer##_size is expected to be a size_t +++ * mem_error: is expected to handle memory allocation failures ++ */ ++ #define growBuffer(buffer, n) { \ ++ xmlChar *tmp; \ ++- buffer##_size *= 2; \ ++- buffer##_size += n; \ ++- tmp = (xmlChar *) \ ++- xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \ +++ size_t new_size = buffer##_size * 2 + n; \ +++ if (new_size < buffer##_size) goto mem_error; \ +++ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \ ++ if (tmp == NULL) goto mem_error; \ ++ buffer = tmp; \ +++ buffer##_size = new_size; \ ++ } ++ ++ /** ++@@ -2614,14 +2617,14 @@ ++ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, ++ int what, xmlChar end, xmlChar end2, xmlChar end3) { ++ xmlChar *buffer = NULL; ++- int buffer_size = 0; +++ size_t buffer_size = 0; +++ size_t nbchars = 0; ++ ++ xmlChar *current = NULL; ++ xmlChar *rep = NULL; ++ const xmlChar *last; ++ xmlEntityPtr ent; ++ int c,l; ++- int nbchars = 0; ++ ++ if ((ctxt == NULL) || (str == NULL) || (len < 0)) ++ return(NULL); ++@@ -2638,7 +2641,7 @@ ++ * allocate a translation buffer. ++ */ ++ buffer_size = XML_PARSER_BIG_BUFFER_SIZE; ++- buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar)); +++ buffer = (xmlChar *) xmlMallocAtomic(buffer_size); ++ if (buffer == NULL) goto mem_error; ++ ++ /* ++@@ -2658,7 +2661,7 @@ ++ if (val != 0) { ++ COPY_BUF(0,buffer,nbchars,val); ++ } ++- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ } ++ } else if ((c == '&') && (what & XML_SUBSTITUTE_REF)) { ++@@ -2676,7 +2679,7 @@ ++ (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { ++ if (ent->content != NULL) { ++ COPY_BUF(0,buffer,nbchars,ent->content[0]); ++- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ } ++ } else { ++@@ -2693,8 +2696,7 @@ ++ current = rep; ++ while (*current != 0) { /* non input consuming loop */ ++ buffer[nbchars++] = *current++; ++- if (nbchars > ++- buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ if (xmlParserEntityCheck(ctxt, nbchars, ent)) ++ goto int_error; ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++@@ -2708,8 +2710,8 @@ ++ const xmlChar *cur = ent->name; ++ ++ buffer[nbchars++] = '&'; ++- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { ++- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); +++ if (nbchars + i + XML_PARSER_BUFFER_SIZE > buffer_size) { +++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); ++ } ++ for (;i > 0;i--) ++ buffer[nbchars++] = *cur++; ++@@ -2736,8 +2738,7 @@ ++ current = rep; ++ while (*current != 0) { /* non input consuming loop */ ++ buffer[nbchars++] = *current++; ++- if (nbchars > ++- buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ if (xmlParserEntityCheck(ctxt, nbchars, ent)) ++ goto int_error; ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++@@ -2750,8 +2751,8 @@ ++ } else { ++ COPY_BUF(l,buffer,nbchars,c); ++ str += l; ++- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { ++- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { +++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ } ++ } ++ if (str < last) ++@@ -3755,8 +3756,8 @@ ++ xmlChar limit = 0; ++ xmlChar *buf = NULL; ++ xmlChar *rep = NULL; ++- int len = 0; ++- int buf_size = 0; +++ size_t len = 0; +++ size_t buf_size = 0; ++ int c, l, in_space = 0; ++ xmlChar *current = NULL; ++ xmlEntityPtr ent; ++@@ -3778,7 +3779,7 @@ ++ * allocate a translation buffer. ++ */ ++ buf_size = XML_PARSER_BUFFER_SIZE; ++- buf = (xmlChar *) xmlMallocAtomic(buf_size * sizeof(xmlChar)); +++ buf = (xmlChar *) xmlMallocAtomic(buf_size); ++ if (buf == NULL) goto mem_error; ++ ++ /* ++@@ -3795,7 +3796,7 @@ ++ ++ if (val == '&') { ++ if (ctxt->replaceEntities) { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ buf[len++] = '&'; ++@@ -3804,7 +3805,7 @@ ++ * The reparsing will be done in xmlStringGetNodeList() ++ * called by the attribute() function in SAX.c ++ */ ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ buf[len++] = '&'; ++@@ -3814,7 +3815,7 @@ ++ buf[len++] = ';'; ++ } ++ } else if (val != 0) { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ len += xmlCopyChar(0, &buf[len], val); ++@@ -3826,7 +3827,7 @@ ++ ctxt->nbentities += ent->owner; ++ if ((ent != NULL) && ++ (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ if ((ctxt->replaceEntities == 0) && ++@@ -3854,7 +3855,7 @@ ++ current++; ++ } else ++ buf[len++] = *current++; ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ } ++@@ -3862,7 +3863,7 @@ ++ rep = NULL; ++ } ++ } else { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ if (ent->content != NULL) ++@@ -3890,7 +3891,7 @@ ++ * Just output the reference ++ */ ++ buf[len++] = '&'; ++- while (len > buf_size - i - 10) { +++ while (len + i + 10 > buf_size) { ++ growBuffer(buf, i + 10); ++ } ++ for (;i > 0;i--) ++@@ -3903,7 +3904,7 @@ ++ if ((len != 0) || (!normalize)) { ++ if ((!normalize) || (!in_space)) { ++ COPY_BUF(l,buf,len,0x20); ++- while (len > buf_size - 10) { +++ while (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ } ++@@ -3912,7 +3913,7 @@ ++ } else { ++ in_space = 0; ++ COPY_BUF(l,buf,len,c); ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ } ++@@ -3937,7 +3938,18 @@ ++ } ++ } else ++ NEXT; ++- if (attlen != NULL) *attlen = len; +++ +++ /* +++ * There we potentially risk an overflow, don't allow attribute value of +++ * lenght more than INT_MAX it is a very reasonnable assumption ! +++ */ +++ if (len >= INT_MAX) { +++ xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, +++ "AttValue lenght too long\n"); +++ goto mem_error; +++ } +++ +++ if (attlen != NULL) *attlen = (int) len; ++ return(buf); ++ ++ mem_error: ++@@ -4949,7 +4961,8 @@ ++ (ctxt->sax->processingInstruction != NULL)) ++ ctxt->sax->processingInstruction(ctxt->userData, ++ target, NULL); ++- ctxt->instate = state; +++ if (ctxt->instate != XML_PARSER_EOF) +++ ctxt->instate = state; ++ return; ++ } ++ buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); ++@@ -5029,7 +5042,8 @@ ++ } else { ++ xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); ++ } ++- ctxt->instate = state; +++ if (ctxt->instate != XML_PARSER_EOF) +++ ctxt->instate = state; ++ } ++ } ++ ++@@ -9588,6 +9602,8 @@ ++ else ++ name = xmlParseStartTag(ctxt); ++ #endif /* LIBXML_SAX1_ENABLED */ +++ if (ctxt->instate == XML_PARSER_EOF) +++ return; ++ if (name == NULL) { ++ spacePop(ctxt); ++ return; ++@@ -10967,6 +10983,8 @@ ++ else ++ name = xmlParseStartTag(ctxt); ++ #endif /* LIBXML_SAX1_ENABLED */ +++ if (ctxt->instate == XML_PARSER_EOF) +++ goto done; ++ if (name == NULL) { ++ spacePop(ctxt); ++ ctxt->instate = XML_PARSER_EOF; ++@@ -11153,7 +11171,9 @@ ++ else ++ xmlParseEndTag1(ctxt, 0); ++ #endif /* LIBXML_SAX1_ENABLED */ ++- if (ctxt->nameNr == 0) { +++ if (ctxt->instate == XML_PARSER_EOF) { +++ /* Nothing */ +++ } else if (ctxt->nameNr == 0) { ++ ctxt->instate = XML_PARSER_EPILOG; ++ } else { ++ ctxt->instate = XML_PARSER_CONTENT; ++--- libxml2-2.7.8/xmllint.c 2010-11-03 15:49:11.000000000 +0100 +++++ libxml2-2.7.8.patched/xmllint.c 2012-09-28 12:08:37.436414665 +0200 ++@@ -2976,7 +2976,7 @@ ++ printf("\t--huge : remove any internal arbitrary parser limits\n"); ++ printf("\t--noent : substitute entity references by their value\n"); ++ printf("\t--noout : don't output the result tree\n"); ++- printf("\t--path 'paths': provide a set of paths for resources\n"); +++ printf("\t--path 'paths' : provide a set of paths for resources\n"); ++ printf("\t--load-trace : print trace of all external entites loaded\n"); ++ printf("\t--nonet : refuse to fetch DTDs or entities over network\n"); ++ printf("\t--nocompact : do not generate compact text nodes\n"); ++@@ -3032,7 +3032,7 @@ ++ printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n"); ++ printf("\t otherwise XML Catalogs starting from \n"); ++ printf("\t %s are activated by default\n", XML_XML_DEFAULT_CATALOG); ++- printf("\t--nocatalogs: deactivate all catalogs\n"); +++ printf("\t--nocatalogs : deactivate all catalogs\n"); ++ #endif ++ printf("\t--auto : generate a small doc on the fly\n"); ++ #ifdef LIBXML_XINCLUDE_ENABLED ++--- libxml2-2.7.8/xpath.c 2010-11-03 20:18:27.000000000 +0100 +++++ libxml2-2.7.8.patched/xpath.c 2012-09-28 12:08:37.444414664 +0200 ++@@ -252,6 +252,7 @@ ++ "Encoding error\n", ++ "Char out of XML range\n", ++ "Invalid or incomplete context\n", +++ "Stack usage errror\n", ++ "?? Unknown error ??\n" /* Must be last in the list! */ ++ }; ++ #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ ++@@ -2398,6 +2399,42 @@ ++ ************************************************************************/ ++ ++ /** +++ * xmlXPathSetFrame: +++ * @ctxt: an XPath parser context +++ * +++ * Set the callee evaluation frame +++ * +++ * Returns the previous frame value to be restored once done +++ */ +++static int +++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { +++ int ret; +++ +++ if (ctxt == NULL) +++ return(0); +++ ret = ctxt->valueFrame; +++ ctxt->valueFrame = ctxt->valueNr; +++ return(ret); +++} +++ +++/** +++ * xmlXPathPopFrame: +++ * @ctxt: an XPath parser context +++ * @frame: the previous frame value +++ * +++ * Remove the callee evaluation frame +++ */ +++static void +++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { +++ if (ctxt == NULL) +++ return; +++ if (ctxt->valueNr < ctxt->valueFrame) { +++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); +++ } +++ ctxt->valueFrame = frame; +++} +++ +++/** ++ * valuePop: ++ * @ctxt: an XPath evaluation context ++ * ++@@ -2412,6 +2449,12 @@ ++ ++ if ((ctxt == NULL) || (ctxt->valueNr <= 0)) ++ return (NULL); +++ +++ if (ctxt->valueNr <= ctxt->valueFrame) { +++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); +++ return (NULL); +++ } +++ ++ ctxt->valueNr--; ++ if (ctxt->valueNr > 0) ++ ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; ++@@ -3522,13 +3565,13 @@ ++ } else if (cur->nodeNr == cur->nodeMax) { ++ xmlNodePtr *temp; ++ ++- cur->nodeMax *= 2; ++- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * +++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * ++ sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "growing nodeset\n"); ++ return; ++ } +++ cur->nodeMax *= 2; ++ cur->nodeTab = temp; ++ } ++ cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns); ++@@ -3627,14 +3670,14 @@ ++ } else if (cur->nodeNr == cur->nodeMax) { ++ xmlNodePtr *temp; ++ ++- cur->nodeMax *= 2; ++- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * +++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * ++ sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "growing nodeset\n"); ++ return; ++ } ++ cur->nodeTab = temp; +++ cur->nodeMax *= 2; ++ } ++ if (val->type == XML_NAMESPACE_DECL) { ++ xmlNsPtr ns = (xmlNsPtr) val; ++@@ -3738,14 +3781,14 @@ ++ } else if (val1->nodeNr == val1->nodeMax) { ++ xmlNodePtr *temp; ++ ++- val1->nodeMax *= 2; ++- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * +++ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 * ++ sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "merging nodeset\n"); ++ return(NULL); ++ } ++ val1->nodeTab = temp; +++ val1->nodeMax *= 2; ++ } ++ if (n2->type == XML_NAMESPACE_DECL) { ++ xmlNsPtr ns = (xmlNsPtr) n2; ++@@ -3907,14 +3950,14 @@ ++ } else if (set1->nodeNr >= set1->nodeMax) { ++ xmlNodePtr *temp; ++ ++- set1->nodeMax *= 2; ++ temp = (xmlNodePtr *) xmlRealloc( ++- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); +++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "merging nodeset\n"); ++ return(NULL); ++ } ++ set1->nodeTab = temp; +++ set1->nodeMax *= 2; ++ } ++ if (n2->type == XML_NAMESPACE_DECL) { ++ xmlNsPtr ns = (xmlNsPtr) n2; ++@@ -3991,14 +4034,14 @@ ++ } else if (set1->nodeNr >= set1->nodeMax) { ++ xmlNodePtr *temp; ++ ++- set1->nodeMax *= 2; ++ temp = (xmlNodePtr *) xmlRealloc( ++- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); +++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "merging nodeset\n"); ++ return(NULL); ++ } ++ set1->nodeTab = temp; +++ set1->nodeMax *= 2; ++ } ++ set1->nodeTab[set1->nodeNr++] = n2; ++ } ++@@ -6154,6 +6197,7 @@ ++ ret->valueNr = 0; ++ ret->valueMax = 10; ++ ret->value = NULL; +++ ret->valueFrame = 0; ++ ++ ret->context = ctxt; ++ ret->comp = comp; ++@@ -11712,6 +11756,7 @@ ++ xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; ++ xmlNodePtr oldContextNode, contextNode = NULL; ++ xmlXPathContextPtr xpctxt = ctxt->context; +++ int frame; ++ ++ #ifdef LIBXML_XPTR_ENABLED ++ /* ++@@ -11731,6 +11776,8 @@ ++ */ ++ exprOp = &ctxt->comp->steps[op->ch2]; ++ for (i = 0; i < set->nodeNr; i++) { +++ xmlXPathObjectPtr tmp; +++ ++ if (set->nodeTab[i] == NULL) ++ continue; ++ ++@@ -11758,18 +11805,25 @@ ++ xmlXPathNodeSetAddUnique(contextObj->nodesetval, ++ contextNode); ++ +++ frame = xmlXPathSetFrame(ctxt); ++ valuePush(ctxt, contextObj); ++ res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); +++ tmp = valuePop(ctxt); +++ xmlXPathPopFrame(ctxt, frame); ++ ++ if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { ++- xmlXPathObjectPtr tmp; ++- /* pop the result */ ++- tmp = valuePop(ctxt); ++- xmlXPathReleaseObject(xpctxt, tmp); ++- /* then pop off contextObj, which will be freed later */ ++- valuePop(ctxt); +++ while (tmp != contextObj) { +++ /* +++ * Free up the result +++ * then pop off contextObj, which will be freed later +++ */ +++ xmlXPathReleaseObject(xpctxt, tmp); +++ tmp = valuePop(ctxt); +++ } ++ goto evaluation_error; ++ } +++ /* push the result back onto the stack */ +++ valuePush(ctxt, tmp); ++ ++ if (res) ++ pos++; ++@@ -13357,6 +13411,7 @@ ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", ++ (char *) op->value4, (char *)op->value5); +++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; ++ return (total); ++ } ++ val = xmlXPathVariableLookupNS(ctxt->context, ++@@ -13373,7 +13428,9 @@ ++ xmlXPathFunction func; ++ const xmlChar *oldFunc, *oldFuncURI; ++ int i; +++ int frame; ++ +++ frame = xmlXPathSetFrame(ctxt); ++ if (op->ch1 != -1) ++ total += ++ xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); ++@@ -13381,15 +13438,18 @@ ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: parameter error\n"); ++ ctxt->error = XPATH_INVALID_OPERAND; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++- for (i = 0; i < op->value; i++) +++ for (i = 0; i < op->value; i++) { ++ if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: parameter error\n"); ++ ctxt->error = XPATH_INVALID_OPERAND; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } +++ } ++ if (op->cache != NULL) ++ XML_CAST_FPTR(func) = op->cache; ++ else { ++@@ -13405,6 +13465,8 @@ ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", ++ (char *)op->value4, (char *)op->value5); +++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++ func = xmlXPathFunctionLookupNS(ctxt->context, ++@@ -13426,6 +13488,7 @@ ++ func(ctxt, op->value); ++ ctxt->context->function = oldFunc; ++ ctxt->context->functionURI = oldFuncURI; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++ case XPATH_OP_ARG: ++@@ -14329,6 +14392,7 @@ ++ ctxt->valueNr = 0; ++ ctxt->valueMax = 10; ++ ctxt->value = NULL; +++ ctxt->valueFrame = 0; ++ } ++ #ifdef XPATH_STREAMING ++ if (ctxt->comp->stream) { ++--- libxml2-2.7.8/xpointer.c 2010-10-12 08:25:33.000000000 +0200 +++++ libxml2-2.7.8.patched/xpointer.c 2012-09-28 12:08:37.428414664 +0200 ++@@ -1007,21 +1007,14 @@ ++ NEXT; ++ break; ++ } ++- *cur++ = CUR; ++ } else if (CUR == '(') { ++ level++; ++- *cur++ = CUR; ++ } else if (CUR == '^') { ++- NEXT; ++- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) { ++- *cur++ = CUR; ++- } else { ++- *cur++ = '^'; ++- *cur++ = CUR; ++- } ++- } else { ++- *cur++ = CUR; +++ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) { +++ NEXT; +++ } ++ } +++ *cur++ = CUR; ++ NEXT; ++ } ++ *cur = 0; ++@@ -1269,6 +1262,7 @@ ++ ctxt->valueNr = 0; ++ ctxt->valueMax = 10; ++ ctxt->value = NULL; +++ ctxt->valueFrame = 0; ++ } ++ SKIP_BLANKS; ++ if (CUR == '/') { ++--- libxml2-2.7.8/libxml.h 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/libxml.h 2012-09-28 12:08:37.432414664 +0200 ++@@ -13,6 +13,9 @@ ++ #ifndef _LARGEFILE_SOURCE ++ #define _LARGEFILE_SOURCE ++ #endif +++#ifndef _LARGEFILE64_SOURCE +++#define _LARGEFILE64_SOURCE +++#endif ++ #ifndef _FILE_OFFSET_BITS ++ #define _FILE_OFFSET_BITS 64 ++ #endif ++--- libxml2-2.7.8/include/libxml/xpath.h 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/include/libxml/xpath.h 2012-09-28 12:08:37.456414665 +0200 ++@@ -68,7 +68,8 @@ ++ XPATH_UNDEF_PREFIX_ERROR, ++ XPATH_ENCODING_ERROR, ++ XPATH_INVALID_CHAR_ERROR, ++- XPATH_INVALID_CTXT +++ XPATH_INVALID_CTXT, +++ XPATH_STACK_ERROR ++ } xmlXPathError; ++ ++ /* ++@@ -380,6 +381,8 @@ ++ xmlXPathCompExprPtr comp; /* the precompiled expression */ ++ int xptr; /* it this an XPointer expression */ ++ xmlNodePtr ancestor; /* used for walking preceding axis */ +++ +++ int valueFrame; /* used to limit Pop on the stack */ ++ }; ++ ++ /************************************************************************ +diff --git a/feeds/packages/libs/libxml2/patches/001-debian_CVEs.patch b/feeds/packages/libs/libxml2/patches/001-debian_CVEs.patch +new file mode 100644 +index 0000000..6b34bf6 +--- /dev/null ++++ b/feeds/packages/libs/libxml2/patches/001-debian_CVEs.patch +@@ -0,0 +1,1028 @@ ++--- libxml2-2.7.8/dict.c 2010-10-12 08:25:31.000000000 +0200 +++++ libxml2-2.7.8.patched/dict.c 2012-09-28 12:08:37.432414664 +0200 ++@@ -2,7 +2,7 @@ ++ * dict.c: dictionary of reusable strings, just used to avoid allocation ++ * and freeing operations. ++ * ++- * Copyright (C) 2003 Daniel Veillard. +++ * Copyright (C) 2003-2012 Daniel Veillard. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++@@ -19,6 +19,28 @@ ++ #define IN_LIBXML ++ #include "libxml.h" ++ +++#ifdef HAVE_STDLIB_H +++#include +++#endif +++#ifdef HAVE_TIME_H +++#include +++#endif +++ +++/* +++ * Following http://www.ocert.org/advisories/ocert-2011-003.html +++ * it seems that having hash randomization might be a good idea +++ * when using XML with untrusted data +++ * Note1: that it works correctly only if compiled with WITH_BIG_KEY +++ * which is the default. +++ * Note2: the fast function used for a small dict won't protect very +++ * well but since the attack is based on growing a very big hash +++ * list we will use the BigKey algo as soon as the hash size grows +++ * over MIN_DICT_SIZE so this actually works +++ */ +++#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) +++#define DICT_RANDOMIZATION +++#endif +++ ++ #include ++ #ifdef HAVE_STDINT_H ++ #include ++@@ -44,23 +66,23 @@ ++ #define WITH_BIG_KEY ++ ++ #ifdef WITH_BIG_KEY ++-#define xmlDictComputeKey(dict, name, len) \ ++- (((dict)->size == MIN_DICT_SIZE) ? \ ++- xmlDictComputeFastKey(name, len) : \ ++- xmlDictComputeBigKey(name, len)) ++- ++-#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ ++- (((prefix) == NULL) ? \ ++- (xmlDictComputeKey(dict, name, len)) : \ ++- (((dict)->size == MIN_DICT_SIZE) ? \ ++- xmlDictComputeFastQKey(prefix, plen, name, len) : \ ++- xmlDictComputeBigQKey(prefix, plen, name, len))) +++#define xmlDictComputeKey(dict, name, len) \ +++ (((dict)->size == MIN_DICT_SIZE) ? \ +++ xmlDictComputeFastKey(name, len, (dict)->seed) : \ +++ xmlDictComputeBigKey(name, len, (dict)->seed)) +++ +++#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ +++ (((prefix) == NULL) ? \ +++ (xmlDictComputeKey(dict, name, len)) : \ +++ (((dict)->size == MIN_DICT_SIZE) ? \ +++ xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) : \ +++ xmlDictComputeBigQKey(prefix, plen, name, len, (dict)->seed))) ++ ++ #else /* !WITH_BIG_KEY */ ++-#define xmlDictComputeKey(dict, name, len) \ ++- xmlDictComputeFastKey(name, len) ++-#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ ++- xmlDictComputeFastQKey(prefix, plen, name, len) +++#define xmlDictComputeKey(dict, name, len) \ +++ xmlDictComputeFastKey(name, len, (dict)->seed) +++#define xmlDictComputeQKey(dict, prefix, plen, name, len) \ +++ xmlDictComputeFastQKey(prefix, plen, name, len, (dict)->seed) ++ #endif /* WITH_BIG_KEY */ ++ ++ /* ++@@ -98,6 +120,8 @@ ++ xmlDictStringsPtr strings; ++ ++ struct _xmlDict *subdict; +++ /* used for randomization */ +++ int seed; ++ }; ++ ++ /* ++@@ -125,6 +149,9 @@ ++ if ((xmlDictMutex = xmlNewRMutex()) == NULL) ++ return(0); ++ +++#ifdef DICT_RANDOMIZATION +++ srand(time(NULL)); +++#endif ++ xmlDictInitialized = 1; ++ return(1); ++ } ++@@ -277,13 +304,13 @@ ++ */ ++ ++ static uint32_t ++-xmlDictComputeBigKey(const xmlChar* data, int namelen) { +++xmlDictComputeBigKey(const xmlChar* data, int namelen, int seed) { ++ uint32_t hash; ++ int i; ++ ++ if (namelen <= 0 || data == NULL) return(0); ++ ++- hash = 0; +++ hash = seed; ++ ++ for (i = 0;i < namelen; i++) { ++ hash += data[i]; ++@@ -310,12 +337,12 @@ ++ */ ++ static unsigned long ++ xmlDictComputeBigQKey(const xmlChar *prefix, int plen, ++- const xmlChar *name, int len) +++ const xmlChar *name, int len, int seed) ++ { ++ uint32_t hash; ++ int i; ++ ++- hash = 0; +++ hash = seed; ++ ++ for (i = 0;i < plen; i++) { ++ hash += prefix[i]; ++@@ -346,8 +373,8 @@ ++ * for low hash table fill. ++ */ ++ static unsigned long ++-xmlDictComputeFastKey(const xmlChar *name, int namelen) { ++- unsigned long value = 0L; +++xmlDictComputeFastKey(const xmlChar *name, int namelen, int seed) { +++ unsigned long value = seed; ++ ++ if (name == NULL) return(0); ++ value = *name; ++@@ -381,9 +408,9 @@ ++ */ ++ static unsigned long ++ xmlDictComputeFastQKey(const xmlChar *prefix, int plen, ++- const xmlChar *name, int len) +++ const xmlChar *name, int len, int seed) ++ { ++- unsigned long value = 0L; +++ unsigned long value = (unsigned long) seed; ++ ++ if (plen == 0) ++ value += 30 * (unsigned long) ':'; ++@@ -460,6 +487,11 @@ ++ dict->subdict = NULL; ++ if (dict->dict) { ++ memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry)); +++#ifdef DICT_RANDOMIZATION +++ dict->seed = rand(); +++#else +++ dict->seed = 0; +++#endif ++ return(dict); ++ } ++ xmlFree(dict); ++@@ -486,6 +518,7 @@ ++ #ifdef DICT_DEBUG_PATTERNS ++ fprintf(stderr, "R"); ++ #endif +++ dict->seed = sub->seed; ++ dict->subdict = sub; ++ xmlDictReference(dict->subdict); ++ } ++--- libxml2-2.7.8/encoding.c 2010-11-04 17:40:06.000000000 +0100 +++++ libxml2-2.7.8.patched/encoding.c 2012-09-28 12:08:37.440414665 +0200 ++@@ -1928,7 +1928,7 @@ ++ if (in == NULL) return(-1); ++ ++ /* calculate space available */ ++- written = out->size - out->use; +++ written = out->size - out->use - 1; /* count '\0' */ ++ toconv = in->use; ++ /* ++ * echo '' | wc -c => 38 ++@@ -2059,7 +2059,7 @@ ++ toconv = in->use; ++ if (toconv == 0) ++ return (0); ++- written = out->size - out->use; +++ written = out->size - out->use - 1; /* count '\0' */ ++ if (toconv * 2 >= written) { ++ xmlBufferGrow(out, out->size + toconv * 2); ++ written = out->size - out->use - 1; ++--- libxml2-2.7.8/entities.c 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/entities.c 2012-09-28 12:08:37.432414664 +0200 ++@@ -528,13 +528,13 @@ ++ * Macro used to grow the current buffer. ++ */ ++ #define growBufferReentrant() { \ ++- buffer_size *= 2; \ ++- buffer = (xmlChar *) \ ++- xmlRealloc(buffer, buffer_size * sizeof(xmlChar)); \ ++- if (buffer == NULL) { \ ++- xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed");\ ++- return(NULL); \ ++- } \ +++ xmlChar *tmp; \ +++ size_t new_size = buffer_size * 2; \ +++ if (new_size < buffer_size) goto mem_error; \ +++ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \ +++ if (tmp == NULL) goto mem_error; \ +++ buffer = tmp; \ +++ buffer_size = new_size; \ ++ } ++ ++ ++@@ -555,7 +555,7 @@ ++ const xmlChar *cur = input; ++ xmlChar *buffer = NULL; ++ xmlChar *out = NULL; ++- int buffer_size = 0; +++ size_t buffer_size = 0; ++ int html = 0; ++ ++ if (input == NULL) return(NULL); ++@@ -574,8 +574,8 @@ ++ out = buffer; ++ ++ while (*cur != '\0') { ++- if (out - buffer > buffer_size - 100) { ++- int indx = out - buffer; +++ size_t indx = out - buffer; +++ if (indx + 100 > buffer_size) { ++ ++ growBufferReentrant(); ++ out = &buffer[indx]; ++@@ -692,6 +692,11 @@ ++ } ++ *out = 0; ++ return(buffer); +++ +++mem_error: +++ xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed"); +++ xmlFree(buffer); +++ return(NULL); ++ } ++ ++ /** ++@@ -709,7 +714,7 @@ ++ const xmlChar *cur = input; ++ xmlChar *buffer = NULL; ++ xmlChar *out = NULL; ++- int buffer_size = 0; +++ size_t buffer_size = 0; ++ if (input == NULL) return(NULL); ++ ++ /* ++@@ -724,8 +729,8 @@ ++ out = buffer; ++ ++ while (*cur != '\0') { ++- if (out - buffer > buffer_size - 10) { ++- int indx = out - buffer; +++ size_t indx = out - buffer; +++ if (indx + 10 > buffer_size) { ++ ++ growBufferReentrant(); ++ out = &buffer[indx]; ++@@ -774,6 +779,11 @@ ++ } ++ *out = 0; ++ return(buffer); +++ +++mem_error: +++ xmlEntitiesErrMemory("xmlEncodeSpecialChars: realloc failed"); +++ xmlFree(buffer); +++ return(NULL); ++ } ++ ++ /** ++--- libxml2-2.7.8/hash.c 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/hash.c 2012-09-28 12:08:37.392414663 +0200 ++@@ -3,7 +3,7 @@ ++ * ++ * Reference: Your favorite introductory book on algorithms ++ * ++- * Copyright (C) 2000 Bjorn Reese and Daniel Veillard. +++ * Copyright (C) 2000,2012 Bjorn Reese and Daniel Veillard. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++@@ -21,6 +21,22 @@ ++ #include "libxml.h" ++ ++ #include +++#ifdef HAVE_STDLIB_H +++#include +++#endif +++#ifdef HAVE_TIME_H +++#include +++#endif +++ +++/* +++ * Following http://www.ocert.org/advisories/ocert-2011-003.html +++ * it seems that having hash randomization might be a good idea +++ * when using XML with untrusted data +++ */ +++#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) +++#define HASH_RANDOMIZATION +++#endif +++ ++ #include ++ #include ++ #include ++@@ -31,6 +47,10 @@ ++ ++ /* #define DEBUG_GROW */ ++ +++#ifdef HASH_RANDOMIZATION +++static int hash_initialized = 0; +++#endif +++ ++ /* ++ * A single entry in the hash table ++ */ ++@@ -53,6 +73,9 @@ ++ int size; ++ int nbElems; ++ xmlDictPtr dict; +++#ifdef HASH_RANDOMIZATION +++ int random_seed; +++#endif ++ }; ++ ++ /* ++@@ -65,6 +88,9 @@ ++ unsigned long value = 0L; ++ char ch; ++ +++#ifdef HASH_RANDOMIZATION +++ value = table->random_seed; +++#endif ++ if (name != NULL) { ++ value += 30 * (*name); ++ while ((ch = *name++) != 0) { ++@@ -92,6 +118,9 @@ ++ unsigned long value = 0L; ++ char ch; ++ +++#ifdef HASH_RANDOMIZATION +++ value = table->random_seed; +++#endif ++ if (prefix != NULL) ++ value += 30 * (*prefix); ++ else ++@@ -156,6 +185,13 @@ ++ table->table = xmlMalloc(size * sizeof(xmlHashEntry)); ++ if (table->table) { ++ memset(table->table, 0, size * sizeof(xmlHashEntry)); +++#ifdef HASH_RANDOMIZATION +++ if (!hash_initialized) { +++ srand(time(NULL)); +++ hash_initialized = 1; +++ } +++ table->random_seed = rand(); +++#endif ++ return(table); ++ } ++ xmlFree(table); ++--- libxml2-2.7.8/parser.c 2010-11-04 16:55:45.000000000 +0100 +++++ libxml2-2.7.8.patched/parser.c 2012-09-28 12:08:37.440414665 +0200 ++@@ -40,6 +40,7 @@ ++ #endif ++ ++ #include +++#include ++ #include ++ #include ++ #include ++@@ -114,10 +115,10 @@ ++ * parser option. ++ */ ++ static int ++-xmlParserEntityCheck(xmlParserCtxtPtr ctxt, unsigned long size, +++xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, ++ xmlEntityPtr ent) ++ { ++- unsigned long consumed = 0; +++ size_t consumed = 0; ++ ++ if ((ctxt == NULL) || (ctxt->options & XML_PARSE_HUGE)) ++ return (0); ++@@ -2580,15 +2581,17 @@ ++ ++ /* ++ * Macro used to grow the current buffer. +++ * buffer##_size is expected to be a size_t +++ * mem_error: is expected to handle memory allocation failures ++ */ ++ #define growBuffer(buffer, n) { \ ++ xmlChar *tmp; \ ++- buffer##_size *= 2; \ ++- buffer##_size += n; \ ++- tmp = (xmlChar *) \ ++- xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \ +++ size_t new_size = buffer##_size * 2 + n; \ +++ if (new_size < buffer##_size) goto mem_error; \ +++ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \ ++ if (tmp == NULL) goto mem_error; \ ++ buffer = tmp; \ +++ buffer##_size = new_size; \ ++ } ++ ++ /** ++@@ -2614,14 +2617,14 @@ ++ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, ++ int what, xmlChar end, xmlChar end2, xmlChar end3) { ++ xmlChar *buffer = NULL; ++- int buffer_size = 0; +++ size_t buffer_size = 0; +++ size_t nbchars = 0; ++ ++ xmlChar *current = NULL; ++ xmlChar *rep = NULL; ++ const xmlChar *last; ++ xmlEntityPtr ent; ++ int c,l; ++- int nbchars = 0; ++ ++ if ((ctxt == NULL) || (str == NULL) || (len < 0)) ++ return(NULL); ++@@ -2638,7 +2641,7 @@ ++ * allocate a translation buffer. ++ */ ++ buffer_size = XML_PARSER_BIG_BUFFER_SIZE; ++- buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar)); +++ buffer = (xmlChar *) xmlMallocAtomic(buffer_size); ++ if (buffer == NULL) goto mem_error; ++ ++ /* ++@@ -2658,7 +2661,7 @@ ++ if (val != 0) { ++ COPY_BUF(0,buffer,nbchars,val); ++ } ++- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ } ++ } else if ((c == '&') && (what & XML_SUBSTITUTE_REF)) { ++@@ -2676,7 +2679,7 @@ ++ (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { ++ if (ent->content != NULL) { ++ COPY_BUF(0,buffer,nbchars,ent->content[0]); ++- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ } ++ } else { ++@@ -2693,8 +2696,7 @@ ++ current = rep; ++ while (*current != 0) { /* non input consuming loop */ ++ buffer[nbchars++] = *current++; ++- if (nbchars > ++- buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ if (xmlParserEntityCheck(ctxt, nbchars, ent)) ++ goto int_error; ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++@@ -2708,8 +2710,8 @@ ++ const xmlChar *cur = ent->name; ++ ++ buffer[nbchars++] = '&'; ++- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { ++- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); +++ if (nbchars + i + XML_PARSER_BUFFER_SIZE > buffer_size) { +++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); ++ } ++ for (;i > 0;i--) ++ buffer[nbchars++] = *cur++; ++@@ -2736,8 +2738,7 @@ ++ current = rep; ++ while (*current != 0) { /* non input consuming loop */ ++ buffer[nbchars++] = *current++; ++- if (nbchars > ++- buffer_size - XML_PARSER_BUFFER_SIZE) { +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { ++ if (xmlParserEntityCheck(ctxt, nbchars, ent)) ++ goto int_error; ++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++@@ -2750,8 +2751,8 @@ ++ } else { ++ COPY_BUF(l,buffer,nbchars,c); ++ str += l; ++- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { ++- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); +++ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { +++ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ } ++ } ++ if (str < last) ++@@ -3755,8 +3756,8 @@ ++ xmlChar limit = 0; ++ xmlChar *buf = NULL; ++ xmlChar *rep = NULL; ++- int len = 0; ++- int buf_size = 0; +++ size_t len = 0; +++ size_t buf_size = 0; ++ int c, l, in_space = 0; ++ xmlChar *current = NULL; ++ xmlEntityPtr ent; ++@@ -3778,7 +3779,7 @@ ++ * allocate a translation buffer. ++ */ ++ buf_size = XML_PARSER_BUFFER_SIZE; ++- buf = (xmlChar *) xmlMallocAtomic(buf_size * sizeof(xmlChar)); +++ buf = (xmlChar *) xmlMallocAtomic(buf_size); ++ if (buf == NULL) goto mem_error; ++ ++ /* ++@@ -3795,7 +3796,7 @@ ++ ++ if (val == '&') { ++ if (ctxt->replaceEntities) { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ buf[len++] = '&'; ++@@ -3804,7 +3805,7 @@ ++ * The reparsing will be done in xmlStringGetNodeList() ++ * called by the attribute() function in SAX.c ++ */ ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ buf[len++] = '&'; ++@@ -3814,7 +3815,7 @@ ++ buf[len++] = ';'; ++ } ++ } else if (val != 0) { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ len += xmlCopyChar(0, &buf[len], val); ++@@ -3826,7 +3827,7 @@ ++ ctxt->nbentities += ent->owner; ++ if ((ent != NULL) && ++ (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ if ((ctxt->replaceEntities == 0) && ++@@ -3854,7 +3855,7 @@ ++ current++; ++ } else ++ buf[len++] = *current++; ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ } ++@@ -3862,7 +3863,7 @@ ++ rep = NULL; ++ } ++ } else { ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ if (ent->content != NULL) ++@@ -3890,7 +3891,7 @@ ++ * Just output the reference ++ */ ++ buf[len++] = '&'; ++- while (len > buf_size - i - 10) { +++ while (len + i + 10 > buf_size) { ++ growBuffer(buf, i + 10); ++ } ++ for (;i > 0;i--) ++@@ -3903,7 +3904,7 @@ ++ if ((len != 0) || (!normalize)) { ++ if ((!normalize) || (!in_space)) { ++ COPY_BUF(l,buf,len,0x20); ++- while (len > buf_size - 10) { +++ while (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ } ++@@ -3912,7 +3913,7 @@ ++ } else { ++ in_space = 0; ++ COPY_BUF(l,buf,len,c); ++- if (len > buf_size - 10) { +++ if (len + 10 > buf_size) { ++ growBuffer(buf, 10); ++ } ++ } ++@@ -3937,7 +3938,18 @@ ++ } ++ } else ++ NEXT; ++- if (attlen != NULL) *attlen = len; +++ +++ /* +++ * There we potentially risk an overflow, don't allow attribute value of +++ * lenght more than INT_MAX it is a very reasonnable assumption ! +++ */ +++ if (len >= INT_MAX) { +++ xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, +++ "AttValue lenght too long\n"); +++ goto mem_error; +++ } +++ +++ if (attlen != NULL) *attlen = (int) len; ++ return(buf); ++ ++ mem_error: ++@@ -4949,7 +4961,8 @@ ++ (ctxt->sax->processingInstruction != NULL)) ++ ctxt->sax->processingInstruction(ctxt->userData, ++ target, NULL); ++- ctxt->instate = state; +++ if (ctxt->instate != XML_PARSER_EOF) +++ ctxt->instate = state; ++ return; ++ } ++ buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); ++@@ -5029,7 +5042,8 @@ ++ } else { ++ xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); ++ } ++- ctxt->instate = state; +++ if (ctxt->instate != XML_PARSER_EOF) +++ ctxt->instate = state; ++ } ++ } ++ ++@@ -9588,6 +9602,8 @@ ++ else ++ name = xmlParseStartTag(ctxt); ++ #endif /* LIBXML_SAX1_ENABLED */ +++ if (ctxt->instate == XML_PARSER_EOF) +++ return; ++ if (name == NULL) { ++ spacePop(ctxt); ++ return; ++@@ -10967,6 +10983,8 @@ ++ else ++ name = xmlParseStartTag(ctxt); ++ #endif /* LIBXML_SAX1_ENABLED */ +++ if (ctxt->instate == XML_PARSER_EOF) +++ goto done; ++ if (name == NULL) { ++ spacePop(ctxt); ++ ctxt->instate = XML_PARSER_EOF; ++@@ -11153,7 +11171,9 @@ ++ else ++ xmlParseEndTag1(ctxt, 0); ++ #endif /* LIBXML_SAX1_ENABLED */ ++- if (ctxt->nameNr == 0) { +++ if (ctxt->instate == XML_PARSER_EOF) { +++ /* Nothing */ +++ } else if (ctxt->nameNr == 0) { ++ ctxt->instate = XML_PARSER_EPILOG; ++ } else { ++ ctxt->instate = XML_PARSER_CONTENT; ++--- libxml2-2.7.8/xmllint.c 2010-11-03 15:49:11.000000000 +0100 +++++ libxml2-2.7.8.patched/xmllint.c 2012-09-28 12:08:37.436414665 +0200 ++@@ -2976,7 +2976,7 @@ ++ printf("\t--huge : remove any internal arbitrary parser limits\n"); ++ printf("\t--noent : substitute entity references by their value\n"); ++ printf("\t--noout : don't output the result tree\n"); ++- printf("\t--path 'paths': provide a set of paths for resources\n"); +++ printf("\t--path 'paths' : provide a set of paths for resources\n"); ++ printf("\t--load-trace : print trace of all external entites loaded\n"); ++ printf("\t--nonet : refuse to fetch DTDs or entities over network\n"); ++ printf("\t--nocompact : do not generate compact text nodes\n"); ++@@ -3032,7 +3032,7 @@ ++ printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n"); ++ printf("\t otherwise XML Catalogs starting from \n"); ++ printf("\t %s are activated by default\n", XML_XML_DEFAULT_CATALOG); ++- printf("\t--nocatalogs: deactivate all catalogs\n"); +++ printf("\t--nocatalogs : deactivate all catalogs\n"); ++ #endif ++ printf("\t--auto : generate a small doc on the fly\n"); ++ #ifdef LIBXML_XINCLUDE_ENABLED ++--- libxml2-2.7.8/xpath.c 2010-11-03 20:18:27.000000000 +0100 +++++ libxml2-2.7.8.patched/xpath.c 2012-09-28 12:08:37.444414664 +0200 ++@@ -252,6 +252,7 @@ ++ "Encoding error\n", ++ "Char out of XML range\n", ++ "Invalid or incomplete context\n", +++ "Stack usage errror\n", ++ "?? Unknown error ??\n" /* Must be last in the list! */ ++ }; ++ #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ ++@@ -2398,6 +2399,42 @@ ++ ************************************************************************/ ++ ++ /** +++ * xmlXPathSetFrame: +++ * @ctxt: an XPath parser context +++ * +++ * Set the callee evaluation frame +++ * +++ * Returns the previous frame value to be restored once done +++ */ +++static int +++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { +++ int ret; +++ +++ if (ctxt == NULL) +++ return(0); +++ ret = ctxt->valueFrame; +++ ctxt->valueFrame = ctxt->valueNr; +++ return(ret); +++} +++ +++/** +++ * xmlXPathPopFrame: +++ * @ctxt: an XPath parser context +++ * @frame: the previous frame value +++ * +++ * Remove the callee evaluation frame +++ */ +++static void +++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { +++ if (ctxt == NULL) +++ return; +++ if (ctxt->valueNr < ctxt->valueFrame) { +++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); +++ } +++ ctxt->valueFrame = frame; +++} +++ +++/** ++ * valuePop: ++ * @ctxt: an XPath evaluation context ++ * ++@@ -2412,6 +2449,12 @@ ++ ++ if ((ctxt == NULL) || (ctxt->valueNr <= 0)) ++ return (NULL); +++ +++ if (ctxt->valueNr <= ctxt->valueFrame) { +++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); +++ return (NULL); +++ } +++ ++ ctxt->valueNr--; ++ if (ctxt->valueNr > 0) ++ ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; ++@@ -3522,13 +3565,13 @@ ++ } else if (cur->nodeNr == cur->nodeMax) { ++ xmlNodePtr *temp; ++ ++- cur->nodeMax *= 2; ++- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * +++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * ++ sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "growing nodeset\n"); ++ return; ++ } +++ cur->nodeMax *= 2; ++ cur->nodeTab = temp; ++ } ++ cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns); ++@@ -3627,14 +3670,14 @@ ++ } else if (cur->nodeNr == cur->nodeMax) { ++ xmlNodePtr *temp; ++ ++- cur->nodeMax *= 2; ++- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * +++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * ++ sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "growing nodeset\n"); ++ return; ++ } ++ cur->nodeTab = temp; +++ cur->nodeMax *= 2; ++ } ++ if (val->type == XML_NAMESPACE_DECL) { ++ xmlNsPtr ns = (xmlNsPtr) val; ++@@ -3738,14 +3781,14 @@ ++ } else if (val1->nodeNr == val1->nodeMax) { ++ xmlNodePtr *temp; ++ ++- val1->nodeMax *= 2; ++- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * +++ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 * ++ sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "merging nodeset\n"); ++ return(NULL); ++ } ++ val1->nodeTab = temp; +++ val1->nodeMax *= 2; ++ } ++ if (n2->type == XML_NAMESPACE_DECL) { ++ xmlNsPtr ns = (xmlNsPtr) n2; ++@@ -3907,14 +3950,14 @@ ++ } else if (set1->nodeNr >= set1->nodeMax) { ++ xmlNodePtr *temp; ++ ++- set1->nodeMax *= 2; ++ temp = (xmlNodePtr *) xmlRealloc( ++- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); +++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "merging nodeset\n"); ++ return(NULL); ++ } ++ set1->nodeTab = temp; +++ set1->nodeMax *= 2; ++ } ++ if (n2->type == XML_NAMESPACE_DECL) { ++ xmlNsPtr ns = (xmlNsPtr) n2; ++@@ -3991,14 +4034,14 @@ ++ } else if (set1->nodeNr >= set1->nodeMax) { ++ xmlNodePtr *temp; ++ ++- set1->nodeMax *= 2; ++ temp = (xmlNodePtr *) xmlRealloc( ++- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); +++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); ++ if (temp == NULL) { ++ xmlXPathErrMemory(NULL, "merging nodeset\n"); ++ return(NULL); ++ } ++ set1->nodeTab = temp; +++ set1->nodeMax *= 2; ++ } ++ set1->nodeTab[set1->nodeNr++] = n2; ++ } ++@@ -6154,6 +6197,7 @@ ++ ret->valueNr = 0; ++ ret->valueMax = 10; ++ ret->value = NULL; +++ ret->valueFrame = 0; ++ ++ ret->context = ctxt; ++ ret->comp = comp; ++@@ -11712,6 +11756,7 @@ ++ xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; ++ xmlNodePtr oldContextNode, contextNode = NULL; ++ xmlXPathContextPtr xpctxt = ctxt->context; +++ int frame; ++ ++ #ifdef LIBXML_XPTR_ENABLED ++ /* ++@@ -11731,6 +11776,8 @@ ++ */ ++ exprOp = &ctxt->comp->steps[op->ch2]; ++ for (i = 0; i < set->nodeNr; i++) { +++ xmlXPathObjectPtr tmp; +++ ++ if (set->nodeTab[i] == NULL) ++ continue; ++ ++@@ -11758,18 +11805,25 @@ ++ xmlXPathNodeSetAddUnique(contextObj->nodesetval, ++ contextNode); ++ +++ frame = xmlXPathSetFrame(ctxt); ++ valuePush(ctxt, contextObj); ++ res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); +++ tmp = valuePop(ctxt); +++ xmlXPathPopFrame(ctxt, frame); ++ ++ if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { ++- xmlXPathObjectPtr tmp; ++- /* pop the result */ ++- tmp = valuePop(ctxt); ++- xmlXPathReleaseObject(xpctxt, tmp); ++- /* then pop off contextObj, which will be freed later */ ++- valuePop(ctxt); +++ while (tmp != contextObj) { +++ /* +++ * Free up the result +++ * then pop off contextObj, which will be freed later +++ */ +++ xmlXPathReleaseObject(xpctxt, tmp); +++ tmp = valuePop(ctxt); +++ } ++ goto evaluation_error; ++ } +++ /* push the result back onto the stack */ +++ valuePush(ctxt, tmp); ++ ++ if (res) ++ pos++; ++@@ -13357,6 +13411,7 @@ ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", ++ (char *) op->value4, (char *)op->value5); +++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; ++ return (total); ++ } ++ val = xmlXPathVariableLookupNS(ctxt->context, ++@@ -13373,7 +13428,9 @@ ++ xmlXPathFunction func; ++ const xmlChar *oldFunc, *oldFuncURI; ++ int i; +++ int frame; ++ +++ frame = xmlXPathSetFrame(ctxt); ++ if (op->ch1 != -1) ++ total += ++ xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); ++@@ -13381,15 +13438,18 @@ ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: parameter error\n"); ++ ctxt->error = XPATH_INVALID_OPERAND; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++- for (i = 0; i < op->value; i++) +++ for (i = 0; i < op->value; i++) { ++ if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: parameter error\n"); ++ ctxt->error = XPATH_INVALID_OPERAND; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } +++ } ++ if (op->cache != NULL) ++ XML_CAST_FPTR(func) = op->cache; ++ else { ++@@ -13405,6 +13465,8 @@ ++ xmlGenericError(xmlGenericErrorContext, ++ "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", ++ (char *)op->value4, (char *)op->value5); +++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++ func = xmlXPathFunctionLookupNS(ctxt->context, ++@@ -13426,6 +13488,7 @@ ++ func(ctxt, op->value); ++ ctxt->context->function = oldFunc; ++ ctxt->context->functionURI = oldFuncURI; +++ xmlXPathPopFrame(ctxt, frame); ++ return (total); ++ } ++ case XPATH_OP_ARG: ++@@ -14329,6 +14392,7 @@ ++ ctxt->valueNr = 0; ++ ctxt->valueMax = 10; ++ ctxt->value = NULL; +++ ctxt->valueFrame = 0; ++ } ++ #ifdef XPATH_STREAMING ++ if (ctxt->comp->stream) { ++--- libxml2-2.7.8/xpointer.c 2010-10-12 08:25:33.000000000 +0200 +++++ libxml2-2.7.8.patched/xpointer.c 2012-09-28 12:08:37.428414664 +0200 ++@@ -1007,21 +1007,14 @@ ++ NEXT; ++ break; ++ } ++- *cur++ = CUR; ++ } else if (CUR == '(') { ++ level++; ++- *cur++ = CUR; ++ } else if (CUR == '^') { ++- NEXT; ++- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) { ++- *cur++ = CUR; ++- } else { ++- *cur++ = '^'; ++- *cur++ = CUR; ++- } ++- } else { ++- *cur++ = CUR; +++ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) { +++ NEXT; +++ } ++ } +++ *cur++ = CUR; ++ NEXT; ++ } ++ *cur = 0; ++@@ -1269,6 +1262,7 @@ ++ ctxt->valueNr = 0; ++ ctxt->valueMax = 10; ++ ctxt->value = NULL; +++ ctxt->valueFrame = 0; ++ } ++ SKIP_BLANKS; ++ if (CUR == '/') { ++--- libxml2-2.7.8/libxml.h 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/libxml.h 2012-09-28 12:08:37.432414664 +0200 ++@@ -13,6 +13,9 @@ ++ #ifndef _LARGEFILE_SOURCE ++ #define _LARGEFILE_SOURCE ++ #endif +++#ifndef _LARGEFILE64_SOURCE +++#define _LARGEFILE64_SOURCE +++#endif ++ #ifndef _FILE_OFFSET_BITS ++ #define _FILE_OFFSET_BITS 64 ++ #endif ++--- libxml2-2.7.8/include/libxml/xpath.h 2010-10-12 08:25:32.000000000 +0200 +++++ libxml2-2.7.8.patched/include/libxml/xpath.h 2012-09-28 12:08:37.456414665 +0200 ++@@ -68,7 +68,8 @@ ++ XPATH_UNDEF_PREFIX_ERROR, ++ XPATH_ENCODING_ERROR, ++ XPATH_INVALID_CHAR_ERROR, ++- XPATH_INVALID_CTXT +++ XPATH_INVALID_CTXT, +++ XPATH_STACK_ERROR ++ } xmlXPathError; ++ ++ /* ++@@ -380,6 +381,8 @@ ++ xmlXPathCompExprPtr comp; /* the precompiled expression */ ++ int xptr; /* it this an XPointer expression */ ++ xmlNodePtr ancestor; /* used for walking preceding axis */ +++ +++ int valueFrame; /* used to limit Pop on the stack */ ++ }; ++ ++ /************************************************************************ +diff --git a/feeds/packages/libs/libxslt/.svn/entries b/feeds/packages/libs/libxslt/.svn/entries +new file mode 100644 +index 0000000..666453d +--- /dev/null ++++ b/feeds/packages/libs/libxslt/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libxslt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8bc9d300e9ce7c42cd146600aa171d23 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3252 ++ +diff --git a/feeds/packages/libs/libxslt/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/libxslt/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/libxslt/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/libxslt/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libxslt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4d76669 +--- /dev/null ++++ b/feeds/packages/libs/libxslt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,146 @@ ++# ++# 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:=libxslt ++PKG_VERSION:=1.1.26 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \ ++ ftp://fr.rpmfind.net/pub/libxml/ ++PKG_MD5SUM:=e61d0364a30146aaa3001296f853b2b9 ++ ++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 ++ A extention 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/feeds/packages/libs/libxslt/Makefile b/feeds/packages/libs/libxslt/Makefile +new file mode 100644 +index 0000000..4d76669 +--- /dev/null ++++ b/feeds/packages/libs/libxslt/Makefile +@@ -0,0 +1,146 @@ ++# ++# 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:=libxslt ++PKG_VERSION:=1.1.26 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \ ++ ftp://fr.rpmfind.net/pub/libxml/ ++PKG_MD5SUM:=e61d0364a30146aaa3001296f853b2b9 ++ ++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 ++ A extention 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/feeds/packages/libs/libyaml/.svn/entries b/feeds/packages/libs/libyaml/.svn/entries +new file mode 100644 +index 0000000..de7ab6f +--- /dev/null ++++ b/feeds/packages/libs/libyaml/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libyaml ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++fd831ed5aa114a1324a5f5bd90e056b7 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1080 ++ +diff --git a/feeds/packages/libs/libyaml/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libyaml/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..78f996a +--- /dev/null ++++ b/feeds/packages/libs/libyaml/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=yaml ++PKG_VERSION:=0.1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://pyyaml.org/download/libyaml/ ++PKG_MD5SUM:=b8ab9064e8e0330423fe640de76608cd ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/libyaml ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=libyaml ++ URL:=http://pyyaml.org/wiki/LibYAML ++endef ++ ++define Package/libyaml/description ++ yaml library written in c ++endef ++ ++define Package/libyaml/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.so $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.{a,la} $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libyaml)) +diff --git a/feeds/packages/libs/libyaml/Makefile b/feeds/packages/libs/libyaml/Makefile +new file mode 100644 +index 0000000..78f996a +--- /dev/null ++++ b/feeds/packages/libs/libyaml/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=yaml ++PKG_VERSION:=0.1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://pyyaml.org/download/libyaml/ ++PKG_MD5SUM:=b8ab9064e8e0330423fe640de76608cd ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/libyaml ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=libyaml ++ URL:=http://pyyaml.org/wiki/LibYAML ++endef ++ ++define Package/libyaml/description ++ yaml library written in c ++endef ++ ++define Package/libyaml/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.so $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.{a,la} $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libyaml)) +diff --git a/feeds/packages/libs/libzip/.svn/entries b/feeds/packages/libs/libzip/.svn/entries +new file mode 100644 +index 0000000..4e8c778 +--- /dev/null ++++ b/feeds/packages/libs/libzip/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libzip ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-15T11:51:48.280771Z ++32724 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++8dbc04b3bea6c46741f8db8e23495a78 ++2012-07-15T11:51:48.280771Z ++32724 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1657 ++ +diff --git a/feeds/packages/libs/libzip/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libzip/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e38557e +--- /dev/null ++++ b/feeds/packages/libs/libzip/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,74 @@ ++# ++# Copyright (C) 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:=libzip ++PKG_VERSION:=0.10.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.nih.at/libzip/ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libzip/default ++ TITLE:=libzip ++ URL:=http://www.nih.at/libzip/ ++endef ++ ++define Package/libzip ++$(call Package/libzip/default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib ++endef ++ ++define Package/libzip-utils ++$(call Package/libzip/default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=compression ++ TITLE+= utilities ++ DEPENDS:=+libzip ++endef ++ ++define Package/libzip/description ++ C library for reading, creating, and modifying zip archives ++endef ++ ++define Package/libzip-utils/description ++ package contains binaries from libzip library (zipcmp, ziptorrent, zipmerge) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* \ ++ $(PKG_INSTALL_DIR)/usr/lib/libzip/include/* \ ++ $(1)/usr/include/ ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,la,so*} \ ++ $(1)/usr/lib/ ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libzip.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libzip/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++endef ++ ++define Package/libzip-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libzip)) ++$(eval $(call BuildPackage,libzip-utils)) +diff --git a/feeds/packages/libs/libzip/Makefile b/feeds/packages/libs/libzip/Makefile +new file mode 100644 +index 0000000..e38557e +--- /dev/null ++++ b/feeds/packages/libs/libzip/Makefile +@@ -0,0 +1,74 @@ ++# ++# Copyright (C) 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:=libzip ++PKG_VERSION:=0.10.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.nih.at/libzip/ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libzip/default ++ TITLE:=libzip ++ URL:=http://www.nih.at/libzip/ ++endef ++ ++define Package/libzip ++$(call Package/libzip/default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib ++endef ++ ++define Package/libzip-utils ++$(call Package/libzip/default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=compression ++ TITLE+= utilities ++ DEPENDS:=+libzip ++endef ++ ++define Package/libzip/description ++ C library for reading, creating, and modifying zip archives ++endef ++ ++define Package/libzip-utils/description ++ package contains binaries from libzip library (zipcmp, ziptorrent, zipmerge) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* \ ++ $(PKG_INSTALL_DIR)/usr/lib/libzip/include/* \ ++ $(1)/usr/include/ ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,la,so*} \ ++ $(1)/usr/lib/ ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libzip.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libzip/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++endef ++ ++define Package/libzip-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libzip)) ++$(eval $(call BuildPackage,libzip-utils)) +diff --git a/feeds/packages/libs/libzstream/.svn/entries b/feeds/packages/libs/libzstream/.svn/entries +new file mode 100644 +index 0000000..b7da0f8 +--- /dev/null ++++ b/feeds/packages/libs/libzstream/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/libzstream ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-10T23:36:14.088418Z ++32178 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++91b073367d858289637ac2a18a685698 ++2012-06-10T23:36:14.088418Z ++32178 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1787 ++ +diff --git a/feeds/packages/libs/libzstream/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/libzstream/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f16642a +--- /dev/null ++++ b/feeds/packages/libs/libzstream/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# Copyright (C) 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:=libzstream ++PKG_VERSION:=2012-06-11 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/zstream-clone/ ++# PKG_SOURCE_URL:=git://midlink.org/zstream.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=3b9748999aa3d81a5811eff1cc221266a2588e28 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libzstream ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=minimalistic network stream library ++ DEPENDS:=+libubox +libopenssl ++endef ++ ++define Package/zstream ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=File Transfer ++ TITLE:=minimalistic network stream client ++ DEPENDS:=+libzstream ++endef ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/zstream.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/include/zstream ++ $(CP) $(PKG_BUILD_DIR)/zstream/http.h $(1)/usr/include/zstream ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libzstream.so $(1)/usr/lib ++endef ++ ++define Package/libzstream/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libzstream.so $(1)/usr/lib ++endef ++ ++define Package/zstream/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/cli/zstream $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,libzstream)) ++$(eval $(call BuildPackage,zstream)) +diff --git a/feeds/packages/libs/libzstream/Makefile b/feeds/packages/libs/libzstream/Makefile +new file mode 100644 +index 0000000..f16642a +--- /dev/null ++++ b/feeds/packages/libs/libzstream/Makefile +@@ -0,0 +1,69 @@ ++# ++# Copyright (C) 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:=libzstream ++PKG_VERSION:=2012-06-11 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/zstream-clone/ ++# PKG_SOURCE_URL:=git://midlink.org/zstream.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=3b9748999aa3d81a5811eff1cc221266a2588e28 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libzstream ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=minimalistic network stream library ++ DEPENDS:=+libubox +libopenssl ++endef ++ ++define Package/zstream ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=File Transfer ++ TITLE:=minimalistic network stream client ++ DEPENDS:=+libzstream ++endef ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/zstream.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/include/zstream ++ $(CP) $(PKG_BUILD_DIR)/zstream/http.h $(1)/usr/include/zstream ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libzstream.so $(1)/usr/lib ++endef ++ ++define Package/libzstream/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libzstream.so $(1)/usr/lib ++endef ++ ++define Package/zstream/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/cli/zstream $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,libzstream)) ++$(eval $(call BuildPackage,zstream)) +diff --git a/feeds/packages/libs/lttng-ust/.svn/entries b/feeds/packages/libs/lttng-ust/.svn/entries +new file mode 100644 +index 0000000..8e2fc94 +--- /dev/null ++++ b/feeds/packages/libs/lttng-ust/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/lttng-ust ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T10:15:42.970825Z ++35164 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++be9f1f57695c2a455532bfe38b196cb3 ++2013-01-15T10:15:42.970825Z ++35164 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1106 ++ +diff --git a/feeds/packages/libs/lttng-ust/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/lttng-ust/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8c38593 +--- /dev/null ++++ b/feeds/packages/libs/lttng-ust/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=lttng-ust ++PKG_VERSION:=2.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME) ++PKG_MD5SUM:=2032e66f3438949c51ec9922c6f8542b ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lttng-ust ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+liburcu +libuuid +librt ++ TITLE:=LTTng Userspace Tracing Library ++ URL:=https://lttng.org/ ++endef ++ ++define Package/lttng-ust/description ++ LTTng Userspace Tracing Library ++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/ ++endef ++ ++define Package/lttng-ust/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,lttng-ust)) +diff --git a/feeds/packages/libs/lttng-ust/Makefile b/feeds/packages/libs/lttng-ust/Makefile +new file mode 100644 +index 0000000..8c38593 +--- /dev/null ++++ b/feeds/packages/libs/lttng-ust/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=lttng-ust ++PKG_VERSION:=2.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME) ++PKG_MD5SUM:=2032e66f3438949c51ec9922c6f8542b ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lttng-ust ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+liburcu +libuuid +librt ++ TITLE:=LTTng Userspace Tracing Library ++ URL:=https://lttng.org/ ++endef ++ ++define Package/lttng-ust/description ++ LTTng Userspace Tracing Library ++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/ ++endef ++ ++define Package/lttng-ust/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,lttng-ust)) +diff --git a/feeds/packages/libs/lttng-ust/patches/.svn/entries b/feeds/packages/libs/lttng-ust/patches/.svn/entries +new file mode 100644 +index 0000000..48b35f6 +--- /dev/null ++++ b/feeds/packages/libs/lttng-ust/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/lttng-ust/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T10:15:42.970825Z ++35164 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001.no_docs_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++10345bdb9687ed5240d803ecf513e90f ++2013-01-15T10:15:42.970825Z ++35164 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1328 ++ +diff --git a/feeds/packages/libs/lttng-ust/patches/.svn/text-base/001.no_docs_tests.patch.svn-base b/feeds/packages/libs/lttng-ust/patches/.svn/text-base/001.no_docs_tests.patch.svn-base +new file mode 100644 +index 0000000..3a58fb9 +--- /dev/null ++++ b/feeds/packages/libs/lttng-ust/patches/.svn/text-base/001.no_docs_tests.patch.svn-base +@@ -0,0 +1,35 @@ ++diff -urN lttng-ust-2.1.0/Makefile.am lttng-ust-2.1.0.new/Makefile.am ++--- lttng-ust-2.1.0/Makefile.am 2012-12-10 21:29:20.000000000 +0100 +++++ lttng-ust-2.1.0.new/Makefile.am 2013-01-14 14:25:41.923661688 +0100 ++@@ -5,9 +5,7 @@ ++ liblttng-ust-ctl \ ++ liblttng-ust-fork \ ++ liblttng-ust-libc-wrapper \ ++- tools \ ++- tests \ ++- doc +++ tools ++ ++ if BUILD_JNI_INTERFACE ++ SUBDIRS += liblttng-ust-java ++diff -urN lttng-ust-2.1.0/Makefile.in lttng-ust-2.1.0.new/Makefile.in ++--- lttng-ust-2.1.0/Makefile.in 2012-12-20 19:24:57.000000000 +0100 +++++ lttng-ust-2.1.0.new/Makefile.in 2013-01-14 14:25:31.247661789 +0100 ++@@ -135,7 +135,7 @@ ++ CTAGS = ctags ++ DIST_SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ ++ liblttng-ust liblttng-ust-ctl liblttng-ust-fork \ ++- liblttng-ust-libc-wrapper tools tests doc liblttng-ust-java +++ liblttng-ust-libc-wrapper tools liblttng-ust-java ++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ distdir = $(PACKAGE)-$(VERSION) ++ top_distdir = $(distdir) ++@@ -307,7 +307,7 @@ ++ ACLOCAL_AMFLAGS = -I config ++ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ ++ liblttng-ust liblttng-ust-ctl liblttng-ust-fork \ ++- liblttng-ust-libc-wrapper tools tests doc $(am__append_1) +++ liblttng-ust-libc-wrapper tools $(am__append_1) ++ ++ #temporarily disabled ++ # liblttng-ust-malloc +diff --git a/feeds/packages/libs/lttng-ust/patches/001.no_docs_tests.patch b/feeds/packages/libs/lttng-ust/patches/001.no_docs_tests.patch +new file mode 100644 +index 0000000..3a58fb9 +--- /dev/null ++++ b/feeds/packages/libs/lttng-ust/patches/001.no_docs_tests.patch +@@ -0,0 +1,35 @@ ++diff -urN lttng-ust-2.1.0/Makefile.am lttng-ust-2.1.0.new/Makefile.am ++--- lttng-ust-2.1.0/Makefile.am 2012-12-10 21:29:20.000000000 +0100 +++++ lttng-ust-2.1.0.new/Makefile.am 2013-01-14 14:25:41.923661688 +0100 ++@@ -5,9 +5,7 @@ ++ liblttng-ust-ctl \ ++ liblttng-ust-fork \ ++ liblttng-ust-libc-wrapper \ ++- tools \ ++- tests \ ++- doc +++ tools ++ ++ if BUILD_JNI_INTERFACE ++ SUBDIRS += liblttng-ust-java ++diff -urN lttng-ust-2.1.0/Makefile.in lttng-ust-2.1.0.new/Makefile.in ++--- lttng-ust-2.1.0/Makefile.in 2012-12-20 19:24:57.000000000 +0100 +++++ lttng-ust-2.1.0.new/Makefile.in 2013-01-14 14:25:31.247661789 +0100 ++@@ -135,7 +135,7 @@ ++ CTAGS = ctags ++ DIST_SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ ++ liblttng-ust liblttng-ust-ctl liblttng-ust-fork \ ++- liblttng-ust-libc-wrapper tools tests doc liblttng-ust-java +++ liblttng-ust-libc-wrapper tools liblttng-ust-java ++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ distdir = $(PACKAGE)-$(VERSION) ++ top_distdir = $(distdir) ++@@ -307,7 +307,7 @@ ++ ACLOCAL_AMFLAGS = -I config ++ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ ++ liblttng-ust liblttng-ust-ctl liblttng-ust-fork \ ++- liblttng-ust-libc-wrapper tools tests doc $(am__append_1) +++ liblttng-ust-libc-wrapper tools $(am__append_1) ++ ++ #temporarily disabled ++ # liblttng-ust-malloc +diff --git a/feeds/packages/libs/matrixssl/.svn/entries b/feeds/packages/libs/matrixssl/.svn/entries +new file mode 100644 +index 0000000..c805540 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/matrixssl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++fe0aeed5e4d1a6768072104e1cba5ec1 ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1309 ++ +diff --git a/feeds/packages/libs/matrixssl/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/matrixssl/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/matrixssl/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/matrixssl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6580b8c +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=matrixssl ++PKG_VERSION:=1.2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt ++PKG_MD5SUM:=771c1489488e62668d673478311d63ca ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmatrixssl ++ SECTION:=libs ++ SUBMENU:=SSL ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread ++ TITLE:=Embedded SSL implementation ++ URL:=http://www.matrixssl.org/ ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ DFLAGS="$(TARGET_CFLAGS) -Wall" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/matrixSsl ++ $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(1)/usr/include/matrixSsl/ ++ ln -sf matrixSsl/matrixSsl.h $(1)/usr/include/matrixSsl.h ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(1)/usr/lib/ ++endef ++ ++define Package/libmatrixssl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmatrixssl)) +diff --git a/feeds/packages/libs/matrixssl/Makefile b/feeds/packages/libs/matrixssl/Makefile +new file mode 100644 +index 0000000..6580b8c +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=matrixssl ++PKG_VERSION:=1.2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt ++PKG_MD5SUM:=771c1489488e62668d673478311d63ca ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libmatrixssl ++ SECTION:=libs ++ SUBMENU:=SSL ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread ++ TITLE:=Embedded SSL implementation ++ URL:=http://www.matrixssl.org/ ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ DFLAGS="$(TARGET_CFLAGS) -Wall" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/matrixSsl ++ $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(1)/usr/include/matrixSsl/ ++ ln -sf matrixSsl/matrixSsl.h $(1)/usr/include/matrixSsl.h ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(1)/usr/lib/ ++endef ++ ++define Package/libmatrixssl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libmatrixssl)) +diff --git a/feeds/packages/libs/matrixssl/patches/.svn/entries b/feeds/packages/libs/matrixssl/patches/.svn/entries +new file mode 100644 +index 0000000..c82ffe1 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/matrixssl/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-11-02T20:09:48.024274Z ++23800 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++1a83b9f32a0926f82bdc436c1a17a133 ++2010-11-02T20:09:48.024274Z ++23800 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1712 ++ ++100-matrixssl_1.2.4.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++aa08413dd2f83035191ffa9610c1a2d1 ++2010-11-02T20:09:48.024274Z ++23800 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++94454 ++ +diff --git a/feeds/packages/libs/matrixssl/patches/.svn/text-base/100-matrixssl_1.2.4.patch.svn-base b/feeds/packages/libs/matrixssl/patches/.svn/text-base/100-matrixssl_1.2.4.patch.svn-base +new file mode 100644 +index 0000000..b4a2bc9 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/patches/.svn/text-base/100-matrixssl_1.2.4.patch.svn-base +@@ -0,0 +1,1971 @@ ++diff -urN matrixssl.old/matrixSsl.h matrixssl/matrixSsl.h ++--- matrixssl.old/matrixSsl.h 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/matrixSsl.h 2005-03-06 01:32:33.000000000 +0100 ++@@ -154,6 +154,29 @@ ++ ++ #define SSL_OPTION_DELETE_SESSION 0 ++ +++ +++#define SSL_MD5_DIGEST_LENGTH 16 +++#define SSL_MD5_CONTEXT_DATA_SIZE 96 +++ +++typedef struct { +++ unsigned char data[SSL_MD5_CONTEXT_DATA_SIZE]; +++} sslMd5Context_t; +++ +++ +++#define SSL_SHA1_DIGEST_LENGTH 20 +++#define SSL_SHA1_CONTEXT_DATA_SIZE 96 +++ +++typedef struct { +++ unsigned char data[SSL_SHA1_CONTEXT_DATA_SIZE]; +++} sslSha1Context_t; +++ +++ +++#define SSL_CIPHER_CONTEXT_DATA_SIZE 784 +++ +++typedef struct { +++ unsigned char data[SSL_CIPHER_CONTEXT_DATA_SIZE]; +++} sslCipherContext_t; +++ ++ /******************************************************************************/ ++ /* ++ Explicitly import these apis on Windows. If we're being included from the ++@@ -220,6 +243,71 @@ ++ char *privBuf, int32 privLen, char *privPass, ++ char *trustedCABuf, int32 trustedCALen); ++ +++ +++/* +++ ARC4 (RC4) API +++*/ +++ +++SSLPUBLIC void matrixArc4Init(sslCipherContext_t *ctx, unsigned char *key, +++ int keylen); +++ +++SSLPUBLIC int matrixArc4(sslCipherContext_t *ctx, unsigned char *in, +++ unsigned char *out, int len); +++ +++/* +++ 3DES (Triple-DES) API +++*/ +++ +++SSLPUBLIC int matrix3desInit(sslCipherContext_t *ctx, unsigned char *IV, +++ unsigned char *key, int keylen); +++ +++SSLPUBLIC int matrix3desEncrypt(sslCipherContext_t *ctx, unsigned char *pt, +++ unsigned char *ct, int len); +++ +++SSLPUBLIC int matrix3desDecrypt(sslCipherContext_t *ctx, unsigned char *ct, +++ unsigned char *pt, int len); +++ +++/* +++ AES API +++*/ +++ +++SSLPUBLIC int matrixAesInit(sslCipherContext_t *ctx, unsigned char *IV, +++ unsigned char *key, int keylen); +++ +++SSLPUBLIC int matrixAesEncrypt(sslCipherContext_t *ctx, unsigned char *pt, +++ unsigned char *ct, int len); +++ +++SSLPUBLIC int matrixAesDecrypt(sslCipherContext_t *ctx, unsigned char *ct, +++ unsigned char *pt, int len); +++ +++/* +++ MD5 API +++*/ +++ +++SSLPUBLIC void matrixMd5Init(sslMd5Context_t *ctx); +++ +++SSLPUBLIC void matrixMd5Update(sslMd5Context_t *ctx, const unsigned char *buf, +++ unsigned long len); +++ +++SSLPUBLIC int matrixMd5Final(sslMd5Context_t *ctx, unsigned char *hash); +++ +++SSLPUBLIC unsigned char *matrixMd5Digest(const unsigned char *buf, +++ unsigned long len, unsigned char *hash); +++ +++/* +++ SHA1 API +++*/ +++ +++SSLPUBLIC void matrixSha1Init(sslSha1Context_t *ctx); +++ +++SSLPUBLIC void matrixSha1Update(sslSha1Context_t *ctx, const unsigned char *buf, +++ unsigned long len); +++ +++SSLPUBLIC int matrixSha1Final(sslSha1Context_t *ctx, unsigned char *hash); +++ +++SSLPUBLIC unsigned char *matrixSha1Digest(const unsigned char *buf, +++ unsigned long len, unsigned char *hash); +++ ++ /******************************************************************************/ ++ ++ #ifdef __cplusplus ++diff -urN matrixssl.old/src/crypto/cryptoLayer.h matrixssl/src/crypto/cryptoLayer.h ++--- matrixssl.old/src/crypto/cryptoLayer.h 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/cryptoLayer.h 2005-03-06 01:32:33.000000000 +0100 ++@@ -115,6 +115,7 @@ ++ */ ++ /* #define USE_FULL_CERT_PARSE */ ++ /* #define USE_MD2 */ +++#define USE_AES ++ ++ /* ++ Now that we've set up the required defines, include the crypto layer header ++diff -urN matrixssl.old/src/crypto/peersec/aes.c matrixssl/src/crypto/peersec/aes.c ++--- matrixssl.old/src/crypto/peersec/aes.c 1970-01-01 01:00:00.000000000 +0100 +++++ matrixssl/src/crypto/peersec/aes.c 2005-03-06 01:32:33.000000000 +0100 ++@@ -0,0 +1,1708 @@ +++/* +++ * aes.c +++ * +++ * AES CBC block cipher implementation +++ */ +++/* +++ * Copyright (c) PeerSec Networks, 2002-2004. All Rights Reserved. +++ * The latest version of this code is available at http://www.matrixssl.org +++ * +++ * This software is open source; 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 General Public License does NOT permit incorporating this software +++ * into proprietary programs. If you are unable to comply with the GPL, a +++ * commercial license for this software may be purchased from PeerSec Networks +++ * at http://www.peersec.com +++ * +++ * This program is distributed in 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ * http://www.gnu.org/copyleft/gpl.html +++ */ +++/******************************************************************************/ +++ +++#include "../cryptoLayer.h" +++ +++#ifdef USE_AES +++ +++/* The precomputed tables for AES */ +++/* +++Te0[x] = S [x].[02, 01, 01, 03]; +++Te1[x] = S [x].[03, 02, 01, 01]; +++Te2[x] = S [x].[01, 03, 02, 01]; +++Te3[x] = S [x].[01, 01, 03, 02]; +++Te4[x] = S [x].[01, 01, 01, 01]; +++ +++Td0[x] = Si[x].[0e, 09, 0d, 0b]; +++Td1[x] = Si[x].[0b, 0e, 09, 0d]; +++Td2[x] = Si[x].[0d, 0b, 0e, 09]; +++Td3[x] = Si[x].[09, 0d, 0b, 0e]; +++Td4[x] = Si[x].[01, 01, 01, 01]; +++*/ +++ +++static const ulong32 TE0[256] = { +++ 0xc66363a5UL, 0xf87c7c84UL, 0xee777799UL, 0xf67b7b8dUL, +++ 0xfff2f20dUL, 0xd66b6bbdUL, 0xde6f6fb1UL, 0x91c5c554UL, +++ 0x60303050UL, 0x02010103UL, 0xce6767a9UL, 0x562b2b7dUL, +++ 0xe7fefe19UL, 0xb5d7d762UL, 0x4dababe6UL, 0xec76769aUL, +++ 0x8fcaca45UL, 0x1f82829dUL, 0x89c9c940UL, 0xfa7d7d87UL, +++ 0xeffafa15UL, 0xb25959ebUL, 0x8e4747c9UL, 0xfbf0f00bUL, +++ 0x41adadecUL, 0xb3d4d467UL, 0x5fa2a2fdUL, 0x45afafeaUL, +++ 0x239c9cbfUL, 0x53a4a4f7UL, 0xe4727296UL, 0x9bc0c05bUL, +++ 0x75b7b7c2UL, 0xe1fdfd1cUL, 0x3d9393aeUL, 0x4c26266aUL, +++ 0x6c36365aUL, 0x7e3f3f41UL, 0xf5f7f702UL, 0x83cccc4fUL, +++ 0x6834345cUL, 0x51a5a5f4UL, 0xd1e5e534UL, 0xf9f1f108UL, +++ 0xe2717193UL, 0xabd8d873UL, 0x62313153UL, 0x2a15153fUL, +++ 0x0804040cUL, 0x95c7c752UL, 0x46232365UL, 0x9dc3c35eUL, +++ 0x30181828UL, 0x379696a1UL, 0x0a05050fUL, 0x2f9a9ab5UL, +++ 0x0e070709UL, 0x24121236UL, 0x1b80809bUL, 0xdfe2e23dUL, +++ 0xcdebeb26UL, 0x4e272769UL, 0x7fb2b2cdUL, 0xea75759fUL, +++ 0x1209091bUL, 0x1d83839eUL, 0x582c2c74UL, 0x341a1a2eUL, +++ 0x361b1b2dUL, 0xdc6e6eb2UL, 0xb45a5aeeUL, 0x5ba0a0fbUL, +++ 0xa45252f6UL, 0x763b3b4dUL, 0xb7d6d661UL, 0x7db3b3ceUL, +++ 0x5229297bUL, 0xdde3e33eUL, 0x5e2f2f71UL, 0x13848497UL, +++ 0xa65353f5UL, 0xb9d1d168UL, 0x00000000UL, 0xc1eded2cUL, +++ 0x40202060UL, 0xe3fcfc1fUL, 0x79b1b1c8UL, 0xb65b5bedUL, +++ 0xd46a6abeUL, 0x8dcbcb46UL, 0x67bebed9UL, 0x7239394bUL, +++ 0x944a4adeUL, 0x984c4cd4UL, 0xb05858e8UL, 0x85cfcf4aUL, +++ 0xbbd0d06bUL, 0xc5efef2aUL, 0x4faaaae5UL, 0xedfbfb16UL, +++ 0x864343c5UL, 0x9a4d4dd7UL, 0x66333355UL, 0x11858594UL, +++ 0x8a4545cfUL, 0xe9f9f910UL, 0x04020206UL, 0xfe7f7f81UL, +++ 0xa05050f0UL, 0x783c3c44UL, 0x259f9fbaUL, 0x4ba8a8e3UL, +++ 0xa25151f3UL, 0x5da3a3feUL, 0x804040c0UL, 0x058f8f8aUL, +++ 0x3f9292adUL, 0x219d9dbcUL, 0x70383848UL, 0xf1f5f504UL, +++ 0x63bcbcdfUL, 0x77b6b6c1UL, 0xafdada75UL, 0x42212163UL, +++ 0x20101030UL, 0xe5ffff1aUL, 0xfdf3f30eUL, 0xbfd2d26dUL, +++ 0x81cdcd4cUL, 0x180c0c14UL, 0x26131335UL, 0xc3ecec2fUL, +++ 0xbe5f5fe1UL, 0x359797a2UL, 0x884444ccUL, 0x2e171739UL, +++ 0x93c4c457UL, 0x55a7a7f2UL, 0xfc7e7e82UL, 0x7a3d3d47UL, +++ 0xc86464acUL, 0xba5d5de7UL, 0x3219192bUL, 0xe6737395UL, +++ 0xc06060a0UL, 0x19818198UL, 0x9e4f4fd1UL, 0xa3dcdc7fUL, +++ 0x44222266UL, 0x542a2a7eUL, 0x3b9090abUL, 0x0b888883UL, +++ 0x8c4646caUL, 0xc7eeee29UL, 0x6bb8b8d3UL, 0x2814143cUL, +++ 0xa7dede79UL, 0xbc5e5ee2UL, 0x160b0b1dUL, 0xaddbdb76UL, +++ 0xdbe0e03bUL, 0x64323256UL, 0x743a3a4eUL, 0x140a0a1eUL, +++ 0x924949dbUL, 0x0c06060aUL, 0x4824246cUL, 0xb85c5ce4UL, +++ 0x9fc2c25dUL, 0xbdd3d36eUL, 0x43acacefUL, 0xc46262a6UL, +++ 0x399191a8UL, 0x319595a4UL, 0xd3e4e437UL, 0xf279798bUL, +++ 0xd5e7e732UL, 0x8bc8c843UL, 0x6e373759UL, 0xda6d6db7UL, +++ 0x018d8d8cUL, 0xb1d5d564UL, 0x9c4e4ed2UL, 0x49a9a9e0UL, +++ 0xd86c6cb4UL, 0xac5656faUL, 0xf3f4f407UL, 0xcfeaea25UL, +++ 0xca6565afUL, 0xf47a7a8eUL, 0x47aeaee9UL, 0x10080818UL, +++ 0x6fbabad5UL, 0xf0787888UL, 0x4a25256fUL, 0x5c2e2e72UL, +++ 0x381c1c24UL, 0x57a6a6f1UL, 0x73b4b4c7UL, 0x97c6c651UL, +++ 0xcbe8e823UL, 0xa1dddd7cUL, 0xe874749cUL, 0x3e1f1f21UL, +++ 0x964b4bddUL, 0x61bdbddcUL, 0x0d8b8b86UL, 0x0f8a8a85UL, +++ 0xe0707090UL, 0x7c3e3e42UL, 0x71b5b5c4UL, 0xcc6666aaUL, +++ 0x904848d8UL, 0x06030305UL, 0xf7f6f601UL, 0x1c0e0e12UL, +++ 0xc26161a3UL, 0x6a35355fUL, 0xae5757f9UL, 0x69b9b9d0UL, +++ 0x17868691UL, 0x99c1c158UL, 0x3a1d1d27UL, 0x279e9eb9UL, +++ 0xd9e1e138UL, 0xebf8f813UL, 0x2b9898b3UL, 0x22111133UL, +++ 0xd26969bbUL, 0xa9d9d970UL, 0x078e8e89UL, 0x339494a7UL, +++ 0x2d9b9bb6UL, 0x3c1e1e22UL, 0x15878792UL, 0xc9e9e920UL, +++ 0x87cece49UL, 0xaa5555ffUL, 0x50282878UL, 0xa5dfdf7aUL, +++ 0x038c8c8fUL, 0x59a1a1f8UL, 0x09898980UL, 0x1a0d0d17UL, +++ 0x65bfbfdaUL, 0xd7e6e631UL, 0x844242c6UL, 0xd06868b8UL, +++ 0x824141c3UL, 0x299999b0UL, 0x5a2d2d77UL, 0x1e0f0f11UL, +++ 0x7bb0b0cbUL, 0xa85454fcUL, 0x6dbbbbd6UL, 0x2c16163aUL, +++}; +++ +++static const ulong32 Te4[256] = { +++ 0x63636363UL, 0x7c7c7c7cUL, 0x77777777UL, 0x7b7b7b7bUL, +++ 0xf2f2f2f2UL, 0x6b6b6b6bUL, 0x6f6f6f6fUL, 0xc5c5c5c5UL, +++ 0x30303030UL, 0x01010101UL, 0x67676767UL, 0x2b2b2b2bUL, +++ 0xfefefefeUL, 0xd7d7d7d7UL, 0xababababUL, 0x76767676UL, +++ 0xcacacacaUL, 0x82828282UL, 0xc9c9c9c9UL, 0x7d7d7d7dUL, +++ 0xfafafafaUL, 0x59595959UL, 0x47474747UL, 0xf0f0f0f0UL, +++ 0xadadadadUL, 0xd4d4d4d4UL, 0xa2a2a2a2UL, 0xafafafafUL, +++ 0x9c9c9c9cUL, 0xa4a4a4a4UL, 0x72727272UL, 0xc0c0c0c0UL, +++ 0xb7b7b7b7UL, 0xfdfdfdfdUL, 0x93939393UL, 0x26262626UL, +++ 0x36363636UL, 0x3f3f3f3fUL, 0xf7f7f7f7UL, 0xccccccccUL, +++ 0x34343434UL, 0xa5a5a5a5UL, 0xe5e5e5e5UL, 0xf1f1f1f1UL, +++ 0x71717171UL, 0xd8d8d8d8UL, 0x31313131UL, 0x15151515UL, +++ 0x04040404UL, 0xc7c7c7c7UL, 0x23232323UL, 0xc3c3c3c3UL, +++ 0x18181818UL, 0x96969696UL, 0x05050505UL, 0x9a9a9a9aUL, +++ 0x07070707UL, 0x12121212UL, 0x80808080UL, 0xe2e2e2e2UL, +++ 0xebebebebUL, 0x27272727UL, 0xb2b2b2b2UL, 0x75757575UL, +++ 0x09090909UL, 0x83838383UL, 0x2c2c2c2cUL, 0x1a1a1a1aUL, +++ 0x1b1b1b1bUL, 0x6e6e6e6eUL, 0x5a5a5a5aUL, 0xa0a0a0a0UL, +++ 0x52525252UL, 0x3b3b3b3bUL, 0xd6d6d6d6UL, 0xb3b3b3b3UL, +++ 0x29292929UL, 0xe3e3e3e3UL, 0x2f2f2f2fUL, 0x84848484UL, +++ 0x53535353UL, 0xd1d1d1d1UL, 0x00000000UL, 0xededededUL, +++ 0x20202020UL, 0xfcfcfcfcUL, 0xb1b1b1b1UL, 0x5b5b5b5bUL, +++ 0x6a6a6a6aUL, 0xcbcbcbcbUL, 0xbebebebeUL, 0x39393939UL, +++ 0x4a4a4a4aUL, 0x4c4c4c4cUL, 0x58585858UL, 0xcfcfcfcfUL, +++ 0xd0d0d0d0UL, 0xefefefefUL, 0xaaaaaaaaUL, 0xfbfbfbfbUL, +++ 0x43434343UL, 0x4d4d4d4dUL, 0x33333333UL, 0x85858585UL, +++ 0x45454545UL, 0xf9f9f9f9UL, 0x02020202UL, 0x7f7f7f7fUL, +++ 0x50505050UL, 0x3c3c3c3cUL, 0x9f9f9f9fUL, 0xa8a8a8a8UL, +++ 0x51515151UL, 0xa3a3a3a3UL, 0x40404040UL, 0x8f8f8f8fUL, +++ 0x92929292UL, 0x9d9d9d9dUL, 0x38383838UL, 0xf5f5f5f5UL, +++ 0xbcbcbcbcUL, 0xb6b6b6b6UL, 0xdadadadaUL, 0x21212121UL, +++ 0x10101010UL, 0xffffffffUL, 0xf3f3f3f3UL, 0xd2d2d2d2UL, +++ 0xcdcdcdcdUL, 0x0c0c0c0cUL, 0x13131313UL, 0xececececUL, +++ 0x5f5f5f5fUL, 0x97979797UL, 0x44444444UL, 0x17171717UL, +++ 0xc4c4c4c4UL, 0xa7a7a7a7UL, 0x7e7e7e7eUL, 0x3d3d3d3dUL, +++ 0x64646464UL, 0x5d5d5d5dUL, 0x19191919UL, 0x73737373UL, +++ 0x60606060UL, 0x81818181UL, 0x4f4f4f4fUL, 0xdcdcdcdcUL, +++ 0x22222222UL, 0x2a2a2a2aUL, 0x90909090UL, 0x88888888UL, +++ 0x46464646UL, 0xeeeeeeeeUL, 0xb8b8b8b8UL, 0x14141414UL, +++ 0xdedededeUL, 0x5e5e5e5eUL, 0x0b0b0b0bUL, 0xdbdbdbdbUL, +++ 0xe0e0e0e0UL, 0x32323232UL, 0x3a3a3a3aUL, 0x0a0a0a0aUL, +++ 0x49494949UL, 0x06060606UL, 0x24242424UL, 0x5c5c5c5cUL, +++ 0xc2c2c2c2UL, 0xd3d3d3d3UL, 0xacacacacUL, 0x62626262UL, +++ 0x91919191UL, 0x95959595UL, 0xe4e4e4e4UL, 0x79797979UL, +++ 0xe7e7e7e7UL, 0xc8c8c8c8UL, 0x37373737UL, 0x6d6d6d6dUL, +++ 0x8d8d8d8dUL, 0xd5d5d5d5UL, 0x4e4e4e4eUL, 0xa9a9a9a9UL, +++ 0x6c6c6c6cUL, 0x56565656UL, 0xf4f4f4f4UL, 0xeaeaeaeaUL, +++ 0x65656565UL, 0x7a7a7a7aUL, 0xaeaeaeaeUL, 0x08080808UL, +++ 0xbabababaUL, 0x78787878UL, 0x25252525UL, 0x2e2e2e2eUL, +++ 0x1c1c1c1cUL, 0xa6a6a6a6UL, 0xb4b4b4b4UL, 0xc6c6c6c6UL, +++ 0xe8e8e8e8UL, 0xddddddddUL, 0x74747474UL, 0x1f1f1f1fUL, +++ 0x4b4b4b4bUL, 0xbdbdbdbdUL, 0x8b8b8b8bUL, 0x8a8a8a8aUL, +++ 0x70707070UL, 0x3e3e3e3eUL, 0xb5b5b5b5UL, 0x66666666UL, +++ 0x48484848UL, 0x03030303UL, 0xf6f6f6f6UL, 0x0e0e0e0eUL, +++ 0x61616161UL, 0x35353535UL, 0x57575757UL, 0xb9b9b9b9UL, +++ 0x86868686UL, 0xc1c1c1c1UL, 0x1d1d1d1dUL, 0x9e9e9e9eUL, +++ 0xe1e1e1e1UL, 0xf8f8f8f8UL, 0x98989898UL, 0x11111111UL, +++ 0x69696969UL, 0xd9d9d9d9UL, 0x8e8e8e8eUL, 0x94949494UL, +++ 0x9b9b9b9bUL, 0x1e1e1e1eUL, 0x87878787UL, 0xe9e9e9e9UL, +++ 0xcecececeUL, 0x55555555UL, 0x28282828UL, 0xdfdfdfdfUL, +++ 0x8c8c8c8cUL, 0xa1a1a1a1UL, 0x89898989UL, 0x0d0d0d0dUL, +++ 0xbfbfbfbfUL, 0xe6e6e6e6UL, 0x42424242UL, 0x68686868UL, +++ 0x41414141UL, 0x99999999UL, 0x2d2d2d2dUL, 0x0f0f0f0fUL, +++ 0xb0b0b0b0UL, 0x54545454UL, 0xbbbbbbbbUL, 0x16161616UL, +++}; +++ +++static const ulong32 TD0[256] = { +++ 0x51f4a750UL, 0x7e416553UL, 0x1a17a4c3UL, 0x3a275e96UL, +++ 0x3bab6bcbUL, 0x1f9d45f1UL, 0xacfa58abUL, 0x4be30393UL, +++ 0x2030fa55UL, 0xad766df6UL, 0x88cc7691UL, 0xf5024c25UL, +++ 0x4fe5d7fcUL, 0xc52acbd7UL, 0x26354480UL, 0xb562a38fUL, +++ 0xdeb15a49UL, 0x25ba1b67UL, 0x45ea0e98UL, 0x5dfec0e1UL, +++ 0xc32f7502UL, 0x814cf012UL, 0x8d4697a3UL, 0x6bd3f9c6UL, +++ 0x038f5fe7UL, 0x15929c95UL, 0xbf6d7aebUL, 0x955259daUL, +++ 0xd4be832dUL, 0x587421d3UL, 0x49e06929UL, 0x8ec9c844UL, +++ 0x75c2896aUL, 0xf48e7978UL, 0x99583e6bUL, 0x27b971ddUL, +++ 0xbee14fb6UL, 0xf088ad17UL, 0xc920ac66UL, 0x7dce3ab4UL, +++ 0x63df4a18UL, 0xe51a3182UL, 0x97513360UL, 0x62537f45UL, +++ 0xb16477e0UL, 0xbb6bae84UL, 0xfe81a01cUL, 0xf9082b94UL, +++ 0x70486858UL, 0x8f45fd19UL, 0x94de6c87UL, 0x527bf8b7UL, +++ 0xab73d323UL, 0x724b02e2UL, 0xe31f8f57UL, 0x6655ab2aUL, +++ 0xb2eb2807UL, 0x2fb5c203UL, 0x86c57b9aUL, 0xd33708a5UL, +++ 0x302887f2UL, 0x23bfa5b2UL, 0x02036abaUL, 0xed16825cUL, +++ 0x8acf1c2bUL, 0xa779b492UL, 0xf307f2f0UL, 0x4e69e2a1UL, +++ 0x65daf4cdUL, 0x0605bed5UL, 0xd134621fUL, 0xc4a6fe8aUL, +++ 0x342e539dUL, 0xa2f355a0UL, 0x058ae132UL, 0xa4f6eb75UL, +++ 0x0b83ec39UL, 0x4060efaaUL, 0x5e719f06UL, 0xbd6e1051UL, +++ 0x3e218af9UL, 0x96dd063dUL, 0xdd3e05aeUL, 0x4de6bd46UL, +++ 0x91548db5UL, 0x71c45d05UL, 0x0406d46fUL, 0x605015ffUL, +++ 0x1998fb24UL, 0xd6bde997UL, 0x894043ccUL, 0x67d99e77UL, +++ 0xb0e842bdUL, 0x07898b88UL, 0xe7195b38UL, 0x79c8eedbUL, +++ 0xa17c0a47UL, 0x7c420fe9UL, 0xf8841ec9UL, 0x00000000UL, +++ 0x09808683UL, 0x322bed48UL, 0x1e1170acUL, 0x6c5a724eUL, +++ 0xfd0efffbUL, 0x0f853856UL, 0x3daed51eUL, 0x362d3927UL, +++ 0x0a0fd964UL, 0x685ca621UL, 0x9b5b54d1UL, 0x24362e3aUL, +++ 0x0c0a67b1UL, 0x9357e70fUL, 0xb4ee96d2UL, 0x1b9b919eUL, +++ 0x80c0c54fUL, 0x61dc20a2UL, 0x5a774b69UL, 0x1c121a16UL, +++ 0xe293ba0aUL, 0xc0a02ae5UL, 0x3c22e043UL, 0x121b171dUL, +++ 0x0e090d0bUL, 0xf28bc7adUL, 0x2db6a8b9UL, 0x141ea9c8UL, +++ 0x57f11985UL, 0xaf75074cUL, 0xee99ddbbUL, 0xa37f60fdUL, +++ 0xf701269fUL, 0x5c72f5bcUL, 0x44663bc5UL, 0x5bfb7e34UL, +++ 0x8b432976UL, 0xcb23c6dcUL, 0xb6edfc68UL, 0xb8e4f163UL, +++ 0xd731dccaUL, 0x42638510UL, 0x13972240UL, 0x84c61120UL, +++ 0x854a247dUL, 0xd2bb3df8UL, 0xaef93211UL, 0xc729a16dUL, +++ 0x1d9e2f4bUL, 0xdcb230f3UL, 0x0d8652ecUL, 0x77c1e3d0UL, +++ 0x2bb3166cUL, 0xa970b999UL, 0x119448faUL, 0x47e96422UL, +++ 0xa8fc8cc4UL, 0xa0f03f1aUL, 0x567d2cd8UL, 0x223390efUL, +++ 0x87494ec7UL, 0xd938d1c1UL, 0x8ccaa2feUL, 0x98d40b36UL, +++ 0xa6f581cfUL, 0xa57ade28UL, 0xdab78e26UL, 0x3fadbfa4UL, +++ 0x2c3a9de4UL, 0x5078920dUL, 0x6a5fcc9bUL, 0x547e4662UL, +++ 0xf68d13c2UL, 0x90d8b8e8UL, 0x2e39f75eUL, 0x82c3aff5UL, +++ 0x9f5d80beUL, 0x69d0937cUL, 0x6fd52da9UL, 0xcf2512b3UL, +++ 0xc8ac993bUL, 0x10187da7UL, 0xe89c636eUL, 0xdb3bbb7bUL, +++ 0xcd267809UL, 0x6e5918f4UL, 0xec9ab701UL, 0x834f9aa8UL, +++ 0xe6956e65UL, 0xaaffe67eUL, 0x21bccf08UL, 0xef15e8e6UL, +++ 0xbae79bd9UL, 0x4a6f36ceUL, 0xea9f09d4UL, 0x29b07cd6UL, +++ 0x31a4b2afUL, 0x2a3f2331UL, 0xc6a59430UL, 0x35a266c0UL, +++ 0x744ebc37UL, 0xfc82caa6UL, 0xe090d0b0UL, 0x33a7d815UL, +++ 0xf104984aUL, 0x41ecdaf7UL, 0x7fcd500eUL, 0x1791f62fUL, +++ 0x764dd68dUL, 0x43efb04dUL, 0xccaa4d54UL, 0xe49604dfUL, +++ 0x9ed1b5e3UL, 0x4c6a881bUL, 0xc12c1fb8UL, 0x4665517fUL, +++ 0x9d5eea04UL, 0x018c355dUL, 0xfa877473UL, 0xfb0b412eUL, +++ 0xb3671d5aUL, 0x92dbd252UL, 0xe9105633UL, 0x6dd64713UL, +++ 0x9ad7618cUL, 0x37a10c7aUL, 0x59f8148eUL, 0xeb133c89UL, +++ 0xcea927eeUL, 0xb761c935UL, 0xe11ce5edUL, 0x7a47b13cUL, +++ 0x9cd2df59UL, 0x55f2733fUL, 0x1814ce79UL, 0x73c737bfUL, +++ 0x53f7cdeaUL, 0x5ffdaa5bUL, 0xdf3d6f14UL, 0x7844db86UL, +++ 0xcaaff381UL, 0xb968c43eUL, 0x3824342cUL, 0xc2a3405fUL, +++ 0x161dc372UL, 0xbce2250cUL, 0x283c498bUL, 0xff0d9541UL, +++ 0x39a80171UL, 0x080cb3deUL, 0xd8b4e49cUL, 0x6456c190UL, +++ 0x7bcb8461UL, 0xd532b670UL, 0x486c5c74UL, 0xd0b85742UL, +++}; +++ +++static const ulong32 Td4[256] = { +++ 0x52525252UL, 0x09090909UL, 0x6a6a6a6aUL, 0xd5d5d5d5UL, +++ 0x30303030UL, 0x36363636UL, 0xa5a5a5a5UL, 0x38383838UL, +++ 0xbfbfbfbfUL, 0x40404040UL, 0xa3a3a3a3UL, 0x9e9e9e9eUL, +++ 0x81818181UL, 0xf3f3f3f3UL, 0xd7d7d7d7UL, 0xfbfbfbfbUL, +++ 0x7c7c7c7cUL, 0xe3e3e3e3UL, 0x39393939UL, 0x82828282UL, +++ 0x9b9b9b9bUL, 0x2f2f2f2fUL, 0xffffffffUL, 0x87878787UL, +++ 0x34343434UL, 0x8e8e8e8eUL, 0x43434343UL, 0x44444444UL, +++ 0xc4c4c4c4UL, 0xdedededeUL, 0xe9e9e9e9UL, 0xcbcbcbcbUL, +++ 0x54545454UL, 0x7b7b7b7bUL, 0x94949494UL, 0x32323232UL, +++ 0xa6a6a6a6UL, 0xc2c2c2c2UL, 0x23232323UL, 0x3d3d3d3dUL, +++ 0xeeeeeeeeUL, 0x4c4c4c4cUL, 0x95959595UL, 0x0b0b0b0bUL, +++ 0x42424242UL, 0xfafafafaUL, 0xc3c3c3c3UL, 0x4e4e4e4eUL, +++ 0x08080808UL, 0x2e2e2e2eUL, 0xa1a1a1a1UL, 0x66666666UL, +++ 0x28282828UL, 0xd9d9d9d9UL, 0x24242424UL, 0xb2b2b2b2UL, +++ 0x76767676UL, 0x5b5b5b5bUL, 0xa2a2a2a2UL, 0x49494949UL, +++ 0x6d6d6d6dUL, 0x8b8b8b8bUL, 0xd1d1d1d1UL, 0x25252525UL, +++ 0x72727272UL, 0xf8f8f8f8UL, 0xf6f6f6f6UL, 0x64646464UL, +++ 0x86868686UL, 0x68686868UL, 0x98989898UL, 0x16161616UL, +++ 0xd4d4d4d4UL, 0xa4a4a4a4UL, 0x5c5c5c5cUL, 0xccccccccUL, +++ 0x5d5d5d5dUL, 0x65656565UL, 0xb6b6b6b6UL, 0x92929292UL, +++ 0x6c6c6c6cUL, 0x70707070UL, 0x48484848UL, 0x50505050UL, +++ 0xfdfdfdfdUL, 0xededededUL, 0xb9b9b9b9UL, 0xdadadadaUL, +++ 0x5e5e5e5eUL, 0x15151515UL, 0x46464646UL, 0x57575757UL, +++ 0xa7a7a7a7UL, 0x8d8d8d8dUL, 0x9d9d9d9dUL, 0x84848484UL, +++ 0x90909090UL, 0xd8d8d8d8UL, 0xababababUL, 0x00000000UL, +++ 0x8c8c8c8cUL, 0xbcbcbcbcUL, 0xd3d3d3d3UL, 0x0a0a0a0aUL, +++ 0xf7f7f7f7UL, 0xe4e4e4e4UL, 0x58585858UL, 0x05050505UL, +++ 0xb8b8b8b8UL, 0xb3b3b3b3UL, 0x45454545UL, 0x06060606UL, +++ 0xd0d0d0d0UL, 0x2c2c2c2cUL, 0x1e1e1e1eUL, 0x8f8f8f8fUL, +++ 0xcacacacaUL, 0x3f3f3f3fUL, 0x0f0f0f0fUL, 0x02020202UL, +++ 0xc1c1c1c1UL, 0xafafafafUL, 0xbdbdbdbdUL, 0x03030303UL, +++ 0x01010101UL, 0x13131313UL, 0x8a8a8a8aUL, 0x6b6b6b6bUL, +++ 0x3a3a3a3aUL, 0x91919191UL, 0x11111111UL, 0x41414141UL, +++ 0x4f4f4f4fUL, 0x67676767UL, 0xdcdcdcdcUL, 0xeaeaeaeaUL, +++ 0x97979797UL, 0xf2f2f2f2UL, 0xcfcfcfcfUL, 0xcecececeUL, +++ 0xf0f0f0f0UL, 0xb4b4b4b4UL, 0xe6e6e6e6UL, 0x73737373UL, +++ 0x96969696UL, 0xacacacacUL, 0x74747474UL, 0x22222222UL, +++ 0xe7e7e7e7UL, 0xadadadadUL, 0x35353535UL, 0x85858585UL, +++ 0xe2e2e2e2UL, 0xf9f9f9f9UL, 0x37373737UL, 0xe8e8e8e8UL, +++ 0x1c1c1c1cUL, 0x75757575UL, 0xdfdfdfdfUL, 0x6e6e6e6eUL, +++ 0x47474747UL, 0xf1f1f1f1UL, 0x1a1a1a1aUL, 0x71717171UL, +++ 0x1d1d1d1dUL, 0x29292929UL, 0xc5c5c5c5UL, 0x89898989UL, +++ 0x6f6f6f6fUL, 0xb7b7b7b7UL, 0x62626262UL, 0x0e0e0e0eUL, +++ 0xaaaaaaaaUL, 0x18181818UL, 0xbebebebeUL, 0x1b1b1b1bUL, +++ 0xfcfcfcfcUL, 0x56565656UL, 0x3e3e3e3eUL, 0x4b4b4b4bUL, +++ 0xc6c6c6c6UL, 0xd2d2d2d2UL, 0x79797979UL, 0x20202020UL, +++ 0x9a9a9a9aUL, 0xdbdbdbdbUL, 0xc0c0c0c0UL, 0xfefefefeUL, +++ 0x78787878UL, 0xcdcdcdcdUL, 0x5a5a5a5aUL, 0xf4f4f4f4UL, +++ 0x1f1f1f1fUL, 0xddddddddUL, 0xa8a8a8a8UL, 0x33333333UL, +++ 0x88888888UL, 0x07070707UL, 0xc7c7c7c7UL, 0x31313131UL, +++ 0xb1b1b1b1UL, 0x12121212UL, 0x10101010UL, 0x59595959UL, +++ 0x27272727UL, 0x80808080UL, 0xececececUL, 0x5f5f5f5fUL, +++ 0x60606060UL, 0x51515151UL, 0x7f7f7f7fUL, 0xa9a9a9a9UL, +++ 0x19191919UL, 0xb5b5b5b5UL, 0x4a4a4a4aUL, 0x0d0d0d0dUL, +++ 0x2d2d2d2dUL, 0xe5e5e5e5UL, 0x7a7a7a7aUL, 0x9f9f9f9fUL, +++ 0x93939393UL, 0xc9c9c9c9UL, 0x9c9c9c9cUL, 0xefefefefUL, +++ 0xa0a0a0a0UL, 0xe0e0e0e0UL, 0x3b3b3b3bUL, 0x4d4d4d4dUL, +++ 0xaeaeaeaeUL, 0x2a2a2a2aUL, 0xf5f5f5f5UL, 0xb0b0b0b0UL, +++ 0xc8c8c8c8UL, 0xebebebebUL, 0xbbbbbbbbUL, 0x3c3c3c3cUL, +++ 0x83838383UL, 0x53535353UL, 0x99999999UL, 0x61616161UL, +++ 0x17171717UL, 0x2b2b2b2bUL, 0x04040404UL, 0x7e7e7e7eUL, +++ 0xbabababaUL, 0x77777777UL, 0xd6d6d6d6UL, 0x26262626UL, +++ 0xe1e1e1e1UL, 0x69696969UL, 0x14141414UL, 0x63636363UL, +++ 0x55555555UL, 0x21212121UL, 0x0c0c0c0cUL, 0x7d7d7d7dUL, +++}; +++ +++#ifdef SMALL_CODE +++ +++#define Te0(x) TE0[x] +++#define Te1(x) ROR(TE0[x], 8) +++#define Te2(x) ROR(TE0[x], 16) +++#define Te3(x) ROR(TE0[x], 24) +++ +++#define Td0(x) TD0[x] +++#define Td1(x) ROR(TD0[x], 8) +++#define Td2(x) ROR(TD0[x], 16) +++#define Td3(x) ROR(TD0[x], 24) +++ +++#define Te4_0 0x000000FF & Te4 +++#define Te4_1 0x0000FF00 & Te4 +++#define Te4_2 0x00FF0000 & Te4 +++#define Te4_3 0xFF000000 & Te4 +++ +++#else /* SMALL_CODE */ +++ +++#define Te0(x) TE0[x] +++#define Te1(x) TE1[x] +++#define Te2(x) TE2[x] +++#define Te3(x) TE3[x] +++ +++#define Td0(x) TD0[x] +++#define Td1(x) TD1[x] +++#define Td2(x) TD2[x] +++#define Td3(x) TD3[x] +++ +++static const ulong32 TE1[256] = { +++ 0xa5c66363UL, 0x84f87c7cUL, 0x99ee7777UL, 0x8df67b7bUL, +++ 0x0dfff2f2UL, 0xbdd66b6bUL, 0xb1de6f6fUL, 0x5491c5c5UL, +++ 0x50603030UL, 0x03020101UL, 0xa9ce6767UL, 0x7d562b2bUL, +++ 0x19e7fefeUL, 0x62b5d7d7UL, 0xe64dababUL, 0x9aec7676UL, +++ 0x458fcacaUL, 0x9d1f8282UL, 0x4089c9c9UL, 0x87fa7d7dUL, +++ 0x15effafaUL, 0xebb25959UL, 0xc98e4747UL, 0x0bfbf0f0UL, +++ 0xec41adadUL, 0x67b3d4d4UL, 0xfd5fa2a2UL, 0xea45afafUL, +++ 0xbf239c9cUL, 0xf753a4a4UL, 0x96e47272UL, 0x5b9bc0c0UL, +++ 0xc275b7b7UL, 0x1ce1fdfdUL, 0xae3d9393UL, 0x6a4c2626UL, +++ 0x5a6c3636UL, 0x417e3f3fUL, 0x02f5f7f7UL, 0x4f83ccccUL, +++ 0x5c683434UL, 0xf451a5a5UL, 0x34d1e5e5UL, 0x08f9f1f1UL, +++ 0x93e27171UL, 0x73abd8d8UL, 0x53623131UL, 0x3f2a1515UL, +++ 0x0c080404UL, 0x5295c7c7UL, 0x65462323UL, 0x5e9dc3c3UL, +++ 0x28301818UL, 0xa1379696UL, 0x0f0a0505UL, 0xb52f9a9aUL, +++ 0x090e0707UL, 0x36241212UL, 0x9b1b8080UL, 0x3ddfe2e2UL, +++ 0x26cdebebUL, 0x694e2727UL, 0xcd7fb2b2UL, 0x9fea7575UL, +++ 0x1b120909UL, 0x9e1d8383UL, 0x74582c2cUL, 0x2e341a1aUL, +++ 0x2d361b1bUL, 0xb2dc6e6eUL, 0xeeb45a5aUL, 0xfb5ba0a0UL, +++ 0xf6a45252UL, 0x4d763b3bUL, 0x61b7d6d6UL, 0xce7db3b3UL, +++ 0x7b522929UL, 0x3edde3e3UL, 0x715e2f2fUL, 0x97138484UL, +++ 0xf5a65353UL, 0x68b9d1d1UL, 0x00000000UL, 0x2cc1ededUL, +++ 0x60402020UL, 0x1fe3fcfcUL, 0xc879b1b1UL, 0xedb65b5bUL, +++ 0xbed46a6aUL, 0x468dcbcbUL, 0xd967bebeUL, 0x4b723939UL, +++ 0xde944a4aUL, 0xd4984c4cUL, 0xe8b05858UL, 0x4a85cfcfUL, +++ 0x6bbbd0d0UL, 0x2ac5efefUL, 0xe54faaaaUL, 0x16edfbfbUL, +++ 0xc5864343UL, 0xd79a4d4dUL, 0x55663333UL, 0x94118585UL, +++ 0xcf8a4545UL, 0x10e9f9f9UL, 0x06040202UL, 0x81fe7f7fUL, +++ 0xf0a05050UL, 0x44783c3cUL, 0xba259f9fUL, 0xe34ba8a8UL, +++ 0xf3a25151UL, 0xfe5da3a3UL, 0xc0804040UL, 0x8a058f8fUL, +++ 0xad3f9292UL, 0xbc219d9dUL, 0x48703838UL, 0x04f1f5f5UL, +++ 0xdf63bcbcUL, 0xc177b6b6UL, 0x75afdadaUL, 0x63422121UL, +++ 0x30201010UL, 0x1ae5ffffUL, 0x0efdf3f3UL, 0x6dbfd2d2UL, +++ 0x4c81cdcdUL, 0x14180c0cUL, 0x35261313UL, 0x2fc3ececUL, +++ 0xe1be5f5fUL, 0xa2359797UL, 0xcc884444UL, 0x392e1717UL, +++ 0x5793c4c4UL, 0xf255a7a7UL, 0x82fc7e7eUL, 0x477a3d3dUL, +++ 0xacc86464UL, 0xe7ba5d5dUL, 0x2b321919UL, 0x95e67373UL, +++ 0xa0c06060UL, 0x98198181UL, 0xd19e4f4fUL, 0x7fa3dcdcUL, +++ 0x66442222UL, 0x7e542a2aUL, 0xab3b9090UL, 0x830b8888UL, +++ 0xca8c4646UL, 0x29c7eeeeUL, 0xd36bb8b8UL, 0x3c281414UL, +++ 0x79a7dedeUL, 0xe2bc5e5eUL, 0x1d160b0bUL, 0x76addbdbUL, +++ 0x3bdbe0e0UL, 0x56643232UL, 0x4e743a3aUL, 0x1e140a0aUL, +++ 0xdb924949UL, 0x0a0c0606UL, 0x6c482424UL, 0xe4b85c5cUL, +++ 0x5d9fc2c2UL, 0x6ebdd3d3UL, 0xef43acacUL, 0xa6c46262UL, +++ 0xa8399191UL, 0xa4319595UL, 0x37d3e4e4UL, 0x8bf27979UL, +++ 0x32d5e7e7UL, 0x438bc8c8UL, 0x596e3737UL, 0xb7da6d6dUL, +++ 0x8c018d8dUL, 0x64b1d5d5UL, 0xd29c4e4eUL, 0xe049a9a9UL, +++ 0xb4d86c6cUL, 0xfaac5656UL, 0x07f3f4f4UL, 0x25cfeaeaUL, +++ 0xafca6565UL, 0x8ef47a7aUL, 0xe947aeaeUL, 0x18100808UL, +++ 0xd56fbabaUL, 0x88f07878UL, 0x6f4a2525UL, 0x725c2e2eUL, +++ 0x24381c1cUL, 0xf157a6a6UL, 0xc773b4b4UL, 0x5197c6c6UL, +++ 0x23cbe8e8UL, 0x7ca1ddddUL, 0x9ce87474UL, 0x213e1f1fUL, +++ 0xdd964b4bUL, 0xdc61bdbdUL, 0x860d8b8bUL, 0x850f8a8aUL, +++ 0x90e07070UL, 0x427c3e3eUL, 0xc471b5b5UL, 0xaacc6666UL, +++ 0xd8904848UL, 0x05060303UL, 0x01f7f6f6UL, 0x121c0e0eUL, +++ 0xa3c26161UL, 0x5f6a3535UL, 0xf9ae5757UL, 0xd069b9b9UL, +++ 0x91178686UL, 0x5899c1c1UL, 0x273a1d1dUL, 0xb9279e9eUL, +++ 0x38d9e1e1UL, 0x13ebf8f8UL, 0xb32b9898UL, 0x33221111UL, +++ 0xbbd26969UL, 0x70a9d9d9UL, 0x89078e8eUL, 0xa7339494UL, +++ 0xb62d9b9bUL, 0x223c1e1eUL, 0x92158787UL, 0x20c9e9e9UL, +++ 0x4987ceceUL, 0xffaa5555UL, 0x78502828UL, 0x7aa5dfdfUL, +++ 0x8f038c8cUL, 0xf859a1a1UL, 0x80098989UL, 0x171a0d0dUL, +++ 0xda65bfbfUL, 0x31d7e6e6UL, 0xc6844242UL, 0xb8d06868UL, +++ 0xc3824141UL, 0xb0299999UL, 0x775a2d2dUL, 0x111e0f0fUL, +++ 0xcb7bb0b0UL, 0xfca85454UL, 0xd66dbbbbUL, 0x3a2c1616UL, +++}; +++static const ulong32 TE2[256] = { +++ 0x63a5c663UL, 0x7c84f87cUL, 0x7799ee77UL, 0x7b8df67bUL, +++ 0xf20dfff2UL, 0x6bbdd66bUL, 0x6fb1de6fUL, 0xc55491c5UL, +++ 0x30506030UL, 0x01030201UL, 0x67a9ce67UL, 0x2b7d562bUL, +++ 0xfe19e7feUL, 0xd762b5d7UL, 0xabe64dabUL, 0x769aec76UL, +++ 0xca458fcaUL, 0x829d1f82UL, 0xc94089c9UL, 0x7d87fa7dUL, +++ 0xfa15effaUL, 0x59ebb259UL, 0x47c98e47UL, 0xf00bfbf0UL, +++ 0xadec41adUL, 0xd467b3d4UL, 0xa2fd5fa2UL, 0xafea45afUL, +++ 0x9cbf239cUL, 0xa4f753a4UL, 0x7296e472UL, 0xc05b9bc0UL, +++ 0xb7c275b7UL, 0xfd1ce1fdUL, 0x93ae3d93UL, 0x266a4c26UL, +++ 0x365a6c36UL, 0x3f417e3fUL, 0xf702f5f7UL, 0xcc4f83ccUL, +++ 0x345c6834UL, 0xa5f451a5UL, 0xe534d1e5UL, 0xf108f9f1UL, +++ 0x7193e271UL, 0xd873abd8UL, 0x31536231UL, 0x153f2a15UL, +++ 0x040c0804UL, 0xc75295c7UL, 0x23654623UL, 0xc35e9dc3UL, +++ 0x18283018UL, 0x96a13796UL, 0x050f0a05UL, 0x9ab52f9aUL, +++ 0x07090e07UL, 0x12362412UL, 0x809b1b80UL, 0xe23ddfe2UL, +++ 0xeb26cdebUL, 0x27694e27UL, 0xb2cd7fb2UL, 0x759fea75UL, +++ 0x091b1209UL, 0x839e1d83UL, 0x2c74582cUL, 0x1a2e341aUL, +++ 0x1b2d361bUL, 0x6eb2dc6eUL, 0x5aeeb45aUL, 0xa0fb5ba0UL, +++ 0x52f6a452UL, 0x3b4d763bUL, 0xd661b7d6UL, 0xb3ce7db3UL, +++ 0x297b5229UL, 0xe33edde3UL, 0x2f715e2fUL, 0x84971384UL, +++ 0x53f5a653UL, 0xd168b9d1UL, 0x00000000UL, 0xed2cc1edUL, +++ 0x20604020UL, 0xfc1fe3fcUL, 0xb1c879b1UL, 0x5bedb65bUL, +++ 0x6abed46aUL, 0xcb468dcbUL, 0xbed967beUL, 0x394b7239UL, +++ 0x4ade944aUL, 0x4cd4984cUL, 0x58e8b058UL, 0xcf4a85cfUL, +++ 0xd06bbbd0UL, 0xef2ac5efUL, 0xaae54faaUL, 0xfb16edfbUL, +++ 0x43c58643UL, 0x4dd79a4dUL, 0x33556633UL, 0x85941185UL, +++ 0x45cf8a45UL, 0xf910e9f9UL, 0x02060402UL, 0x7f81fe7fUL, +++ 0x50f0a050UL, 0x3c44783cUL, 0x9fba259fUL, 0xa8e34ba8UL, +++ 0x51f3a251UL, 0xa3fe5da3UL, 0x40c08040UL, 0x8f8a058fUL, +++ 0x92ad3f92UL, 0x9dbc219dUL, 0x38487038UL, 0xf504f1f5UL, +++ 0xbcdf63bcUL, 0xb6c177b6UL, 0xda75afdaUL, 0x21634221UL, +++ 0x10302010UL, 0xff1ae5ffUL, 0xf30efdf3UL, 0xd26dbfd2UL, +++ 0xcd4c81cdUL, 0x0c14180cUL, 0x13352613UL, 0xec2fc3ecUL, +++ 0x5fe1be5fUL, 0x97a23597UL, 0x44cc8844UL, 0x17392e17UL, +++ 0xc45793c4UL, 0xa7f255a7UL, 0x7e82fc7eUL, 0x3d477a3dUL, +++ 0x64acc864UL, 0x5de7ba5dUL, 0x192b3219UL, 0x7395e673UL, +++ 0x60a0c060UL, 0x81981981UL, 0x4fd19e4fUL, 0xdc7fa3dcUL, +++ 0x22664422UL, 0x2a7e542aUL, 0x90ab3b90UL, 0x88830b88UL, +++ 0x46ca8c46UL, 0xee29c7eeUL, 0xb8d36bb8UL, 0x143c2814UL, +++ 0xde79a7deUL, 0x5ee2bc5eUL, 0x0b1d160bUL, 0xdb76addbUL, +++ 0xe03bdbe0UL, 0x32566432UL, 0x3a4e743aUL, 0x0a1e140aUL, +++ 0x49db9249UL, 0x060a0c06UL, 0x246c4824UL, 0x5ce4b85cUL, +++ 0xc25d9fc2UL, 0xd36ebdd3UL, 0xacef43acUL, 0x62a6c462UL, +++ 0x91a83991UL, 0x95a43195UL, 0xe437d3e4UL, 0x798bf279UL, +++ 0xe732d5e7UL, 0xc8438bc8UL, 0x37596e37UL, 0x6db7da6dUL, +++ 0x8d8c018dUL, 0xd564b1d5UL, 0x4ed29c4eUL, 0xa9e049a9UL, +++ 0x6cb4d86cUL, 0x56faac56UL, 0xf407f3f4UL, 0xea25cfeaUL, +++ 0x65afca65UL, 0x7a8ef47aUL, 0xaee947aeUL, 0x08181008UL, +++ 0xbad56fbaUL, 0x7888f078UL, 0x256f4a25UL, 0x2e725c2eUL, +++ 0x1c24381cUL, 0xa6f157a6UL, 0xb4c773b4UL, 0xc65197c6UL, +++ 0xe823cbe8UL, 0xdd7ca1ddUL, 0x749ce874UL, 0x1f213e1fUL, +++ 0x4bdd964bUL, 0xbddc61bdUL, 0x8b860d8bUL, 0x8a850f8aUL, +++ 0x7090e070UL, 0x3e427c3eUL, 0xb5c471b5UL, 0x66aacc66UL, +++ 0x48d89048UL, 0x03050603UL, 0xf601f7f6UL, 0x0e121c0eUL, +++ 0x61a3c261UL, 0x355f6a35UL, 0x57f9ae57UL, 0xb9d069b9UL, +++ 0x86911786UL, 0xc15899c1UL, 0x1d273a1dUL, 0x9eb9279eUL, +++ 0xe138d9e1UL, 0xf813ebf8UL, 0x98b32b98UL, 0x11332211UL, +++ 0x69bbd269UL, 0xd970a9d9UL, 0x8e89078eUL, 0x94a73394UL, +++ 0x9bb62d9bUL, 0x1e223c1eUL, 0x87921587UL, 0xe920c9e9UL, +++ 0xce4987ceUL, 0x55ffaa55UL, 0x28785028UL, 0xdf7aa5dfUL, +++ 0x8c8f038cUL, 0xa1f859a1UL, 0x89800989UL, 0x0d171a0dUL, +++ 0xbfda65bfUL, 0xe631d7e6UL, 0x42c68442UL, 0x68b8d068UL, +++ 0x41c38241UL, 0x99b02999UL, 0x2d775a2dUL, 0x0f111e0fUL, +++ 0xb0cb7bb0UL, 0x54fca854UL, 0xbbd66dbbUL, 0x163a2c16UL, +++}; +++static const ulong32 TE3[256] = { +++ +++ 0x6363a5c6UL, 0x7c7c84f8UL, 0x777799eeUL, 0x7b7b8df6UL, +++ 0xf2f20dffUL, 0x6b6bbdd6UL, 0x6f6fb1deUL, 0xc5c55491UL, +++ 0x30305060UL, 0x01010302UL, 0x6767a9ceUL, 0x2b2b7d56UL, +++ 0xfefe19e7UL, 0xd7d762b5UL, 0xababe64dUL, 0x76769aecUL, +++ 0xcaca458fUL, 0x82829d1fUL, 0xc9c94089UL, 0x7d7d87faUL, +++ 0xfafa15efUL, 0x5959ebb2UL, 0x4747c98eUL, 0xf0f00bfbUL, +++ 0xadadec41UL, 0xd4d467b3UL, 0xa2a2fd5fUL, 0xafafea45UL, +++ 0x9c9cbf23UL, 0xa4a4f753UL, 0x727296e4UL, 0xc0c05b9bUL, +++ 0xb7b7c275UL, 0xfdfd1ce1UL, 0x9393ae3dUL, 0x26266a4cUL, +++ 0x36365a6cUL, 0x3f3f417eUL, 0xf7f702f5UL, 0xcccc4f83UL, +++ 0x34345c68UL, 0xa5a5f451UL, 0xe5e534d1UL, 0xf1f108f9UL, +++ 0x717193e2UL, 0xd8d873abUL, 0x31315362UL, 0x15153f2aUL, +++ 0x04040c08UL, 0xc7c75295UL, 0x23236546UL, 0xc3c35e9dUL, +++ 0x18182830UL, 0x9696a137UL, 0x05050f0aUL, 0x9a9ab52fUL, +++ 0x0707090eUL, 0x12123624UL, 0x80809b1bUL, 0xe2e23ddfUL, +++ 0xebeb26cdUL, 0x2727694eUL, 0xb2b2cd7fUL, 0x75759feaUL, +++ 0x09091b12UL, 0x83839e1dUL, 0x2c2c7458UL, 0x1a1a2e34UL, +++ 0x1b1b2d36UL, 0x6e6eb2dcUL, 0x5a5aeeb4UL, 0xa0a0fb5bUL, +++ 0x5252f6a4UL, 0x3b3b4d76UL, 0xd6d661b7UL, 0xb3b3ce7dUL, +++ 0x29297b52UL, 0xe3e33eddUL, 0x2f2f715eUL, 0x84849713UL, +++ 0x5353f5a6UL, 0xd1d168b9UL, 0x00000000UL, 0xeded2cc1UL, +++ 0x20206040UL, 0xfcfc1fe3UL, 0xb1b1c879UL, 0x5b5bedb6UL, +++ 0x6a6abed4UL, 0xcbcb468dUL, 0xbebed967UL, 0x39394b72UL, +++ 0x4a4ade94UL, 0x4c4cd498UL, 0x5858e8b0UL, 0xcfcf4a85UL, +++ 0xd0d06bbbUL, 0xefef2ac5UL, 0xaaaae54fUL, 0xfbfb16edUL, +++ 0x4343c586UL, 0x4d4dd79aUL, 0x33335566UL, 0x85859411UL, +++ 0x4545cf8aUL, 0xf9f910e9UL, 0x02020604UL, 0x7f7f81feUL, +++ 0x5050f0a0UL, 0x3c3c4478UL, 0x9f9fba25UL, 0xa8a8e34bUL, +++ 0x5151f3a2UL, 0xa3a3fe5dUL, 0x4040c080UL, 0x8f8f8a05UL, +++ 0x9292ad3fUL, 0x9d9dbc21UL, 0x38384870UL, 0xf5f504f1UL, +++ 0xbcbcdf63UL, 0xb6b6c177UL, 0xdada75afUL, 0x21216342UL, +++ 0x10103020UL, 0xffff1ae5UL, 0xf3f30efdUL, 0xd2d26dbfUL, +++ 0xcdcd4c81UL, 0x0c0c1418UL, 0x13133526UL, 0xecec2fc3UL, +++ 0x5f5fe1beUL, 0x9797a235UL, 0x4444cc88UL, 0x1717392eUL, +++ 0xc4c45793UL, 0xa7a7f255UL, 0x7e7e82fcUL, 0x3d3d477aUL, +++ 0x6464acc8UL, 0x5d5de7baUL, 0x19192b32UL, 0x737395e6UL, +++ 0x6060a0c0UL, 0x81819819UL, 0x4f4fd19eUL, 0xdcdc7fa3UL, +++ 0x22226644UL, 0x2a2a7e54UL, 0x9090ab3bUL, 0x8888830bUL, +++ 0x4646ca8cUL, 0xeeee29c7UL, 0xb8b8d36bUL, 0x14143c28UL, +++ 0xdede79a7UL, 0x5e5ee2bcUL, 0x0b0b1d16UL, 0xdbdb76adUL, +++ 0xe0e03bdbUL, 0x32325664UL, 0x3a3a4e74UL, 0x0a0a1e14UL, +++ 0x4949db92UL, 0x06060a0cUL, 0x24246c48UL, 0x5c5ce4b8UL, +++ 0xc2c25d9fUL, 0xd3d36ebdUL, 0xacacef43UL, 0x6262a6c4UL, +++ 0x9191a839UL, 0x9595a431UL, 0xe4e437d3UL, 0x79798bf2UL, +++ 0xe7e732d5UL, 0xc8c8438bUL, 0x3737596eUL, 0x6d6db7daUL, +++ 0x8d8d8c01UL, 0xd5d564b1UL, 0x4e4ed29cUL, 0xa9a9e049UL, +++ 0x6c6cb4d8UL, 0x5656faacUL, 0xf4f407f3UL, 0xeaea25cfUL, +++ 0x6565afcaUL, 0x7a7a8ef4UL, 0xaeaee947UL, 0x08081810UL, +++ 0xbabad56fUL, 0x787888f0UL, 0x25256f4aUL, 0x2e2e725cUL, +++ 0x1c1c2438UL, 0xa6a6f157UL, 0xb4b4c773UL, 0xc6c65197UL, +++ 0xe8e823cbUL, 0xdddd7ca1UL, 0x74749ce8UL, 0x1f1f213eUL, +++ 0x4b4bdd96UL, 0xbdbddc61UL, 0x8b8b860dUL, 0x8a8a850fUL, +++ 0x707090e0UL, 0x3e3e427cUL, 0xb5b5c471UL, 0x6666aaccUL, +++ 0x4848d890UL, 0x03030506UL, 0xf6f601f7UL, 0x0e0e121cUL, +++ 0x6161a3c2UL, 0x35355f6aUL, 0x5757f9aeUL, 0xb9b9d069UL, +++ 0x86869117UL, 0xc1c15899UL, 0x1d1d273aUL, 0x9e9eb927UL, +++ 0xe1e138d9UL, 0xf8f813ebUL, 0x9898b32bUL, 0x11113322UL, +++ 0x6969bbd2UL, 0xd9d970a9UL, 0x8e8e8907UL, 0x9494a733UL, +++ 0x9b9bb62dUL, 0x1e1e223cUL, 0x87879215UL, 0xe9e920c9UL, +++ 0xcece4987UL, 0x5555ffaaUL, 0x28287850UL, 0xdfdf7aa5UL, +++ 0x8c8c8f03UL, 0xa1a1f859UL, 0x89898009UL, 0x0d0d171aUL, +++ 0xbfbfda65UL, 0xe6e631d7UL, 0x4242c684UL, 0x6868b8d0UL, +++ 0x4141c382UL, 0x9999b029UL, 0x2d2d775aUL, 0x0f0f111eUL, +++ 0xb0b0cb7bUL, 0x5454fca8UL, 0xbbbbd66dUL, 0x16163a2cUL, +++}; +++ +++static const ulong32 Te4_0[] = { +++0x00000063UL, 0x0000007cUL, 0x00000077UL, 0x0000007bUL, 0x000000f2UL, 0x0000006bUL, 0x0000006fUL, 0x000000c5UL, +++0x00000030UL, 0x00000001UL, 0x00000067UL, 0x0000002bUL, 0x000000feUL, 0x000000d7UL, 0x000000abUL, 0x00000076UL, +++0x000000caUL, 0x00000082UL, 0x000000c9UL, 0x0000007dUL, 0x000000faUL, 0x00000059UL, 0x00000047UL, 0x000000f0UL, +++0x000000adUL, 0x000000d4UL, 0x000000a2UL, 0x000000afUL, 0x0000009cUL, 0x000000a4UL, 0x00000072UL, 0x000000c0UL, +++0x000000b7UL, 0x000000fdUL, 0x00000093UL, 0x00000026UL, 0x00000036UL, 0x0000003fUL, 0x000000f7UL, 0x000000ccUL, +++0x00000034UL, 0x000000a5UL, 0x000000e5UL, 0x000000f1UL, 0x00000071UL, 0x000000d8UL, 0x00000031UL, 0x00000015UL, +++0x00000004UL, 0x000000c7UL, 0x00000023UL, 0x000000c3UL, 0x00000018UL, 0x00000096UL, 0x00000005UL, 0x0000009aUL, +++0x00000007UL, 0x00000012UL, 0x00000080UL, 0x000000e2UL, 0x000000ebUL, 0x00000027UL, 0x000000b2UL, 0x00000075UL, +++0x00000009UL, 0x00000083UL, 0x0000002cUL, 0x0000001aUL, 0x0000001bUL, 0x0000006eUL, 0x0000005aUL, 0x000000a0UL, +++0x00000052UL, 0x0000003bUL, 0x000000d6UL, 0x000000b3UL, 0x00000029UL, 0x000000e3UL, 0x0000002fUL, 0x00000084UL, +++0x00000053UL, 0x000000d1UL, 0x00000000UL, 0x000000edUL, 0x00000020UL, 0x000000fcUL, 0x000000b1UL, 0x0000005bUL, +++0x0000006aUL, 0x000000cbUL, 0x000000beUL, 0x00000039UL, 0x0000004aUL, 0x0000004cUL, 0x00000058UL, 0x000000cfUL, +++0x000000d0UL, 0x000000efUL, 0x000000aaUL, 0x000000fbUL, 0x00000043UL, 0x0000004dUL, 0x00000033UL, 0x00000085UL, +++0x00000045UL, 0x000000f9UL, 0x00000002UL, 0x0000007fUL, 0x00000050UL, 0x0000003cUL, 0x0000009fUL, 0x000000a8UL, +++0x00000051UL, 0x000000a3UL, 0x00000040UL, 0x0000008fUL, 0x00000092UL, 0x0000009dUL, 0x00000038UL, 0x000000f5UL, +++0x000000bcUL, 0x000000b6UL, 0x000000daUL, 0x00000021UL, 0x00000010UL, 0x000000ffUL, 0x000000f3UL, 0x000000d2UL, +++0x000000cdUL, 0x0000000cUL, 0x00000013UL, 0x000000ecUL, 0x0000005fUL, 0x00000097UL, 0x00000044UL, 0x00000017UL, +++0x000000c4UL, 0x000000a7UL, 0x0000007eUL, 0x0000003dUL, 0x00000064UL, 0x0000005dUL, 0x00000019UL, 0x00000073UL, +++0x00000060UL, 0x00000081UL, 0x0000004fUL, 0x000000dcUL, 0x00000022UL, 0x0000002aUL, 0x00000090UL, 0x00000088UL, +++0x00000046UL, 0x000000eeUL, 0x000000b8UL, 0x00000014UL, 0x000000deUL, 0x0000005eUL, 0x0000000bUL, 0x000000dbUL, +++0x000000e0UL, 0x00000032UL, 0x0000003aUL, 0x0000000aUL, 0x00000049UL, 0x00000006UL, 0x00000024UL, 0x0000005cUL, +++0x000000c2UL, 0x000000d3UL, 0x000000acUL, 0x00000062UL, 0x00000091UL, 0x00000095UL, 0x000000e4UL, 0x00000079UL, +++0x000000e7UL, 0x000000c8UL, 0x00000037UL, 0x0000006dUL, 0x0000008dUL, 0x000000d5UL, 0x0000004eUL, 0x000000a9UL, +++0x0000006cUL, 0x00000056UL, 0x000000f4UL, 0x000000eaUL, 0x00000065UL, 0x0000007aUL, 0x000000aeUL, 0x00000008UL, +++0x000000baUL, 0x00000078UL, 0x00000025UL, 0x0000002eUL, 0x0000001cUL, 0x000000a6UL, 0x000000b4UL, 0x000000c6UL, +++0x000000e8UL, 0x000000ddUL, 0x00000074UL, 0x0000001fUL, 0x0000004bUL, 0x000000bdUL, 0x0000008bUL, 0x0000008aUL, +++0x00000070UL, 0x0000003eUL, 0x000000b5UL, 0x00000066UL, 0x00000048UL, 0x00000003UL, 0x000000f6UL, 0x0000000eUL, +++0x00000061UL, 0x00000035UL, 0x00000057UL, 0x000000b9UL, 0x00000086UL, 0x000000c1UL, 0x0000001dUL, 0x0000009eUL, +++0x000000e1UL, 0x000000f8UL, 0x00000098UL, 0x00000011UL, 0x00000069UL, 0x000000d9UL, 0x0000008eUL, 0x00000094UL, +++0x0000009bUL, 0x0000001eUL, 0x00000087UL, 0x000000e9UL, 0x000000ceUL, 0x00000055UL, 0x00000028UL, 0x000000dfUL, +++0x0000008cUL, 0x000000a1UL, 0x00000089UL, 0x0000000dUL, 0x000000bfUL, 0x000000e6UL, 0x00000042UL, 0x00000068UL, +++0x00000041UL, 0x00000099UL, 0x0000002dUL, 0x0000000fUL, 0x000000b0UL, 0x00000054UL, 0x000000bbUL, 0x00000016UL +++}; +++ +++static const ulong32 Te4_1[] = { +++0x00006300UL, 0x00007c00UL, 0x00007700UL, 0x00007b00UL, 0x0000f200UL, 0x00006b00UL, 0x00006f00UL, 0x0000c500UL, +++0x00003000UL, 0x00000100UL, 0x00006700UL, 0x00002b00UL, 0x0000fe00UL, 0x0000d700UL, 0x0000ab00UL, 0x00007600UL, +++0x0000ca00UL, 0x00008200UL, 0x0000c900UL, 0x00007d00UL, 0x0000fa00UL, 0x00005900UL, 0x00004700UL, 0x0000f000UL, +++0x0000ad00UL, 0x0000d400UL, 0x0000a200UL, 0x0000af00UL, 0x00009c00UL, 0x0000a400UL, 0x00007200UL, 0x0000c000UL, +++0x0000b700UL, 0x0000fd00UL, 0x00009300UL, 0x00002600UL, 0x00003600UL, 0x00003f00UL, 0x0000f700UL, 0x0000cc00UL, +++0x00003400UL, 0x0000a500UL, 0x0000e500UL, 0x0000f100UL, 0x00007100UL, 0x0000d800UL, 0x00003100UL, 0x00001500UL, +++0x00000400UL, 0x0000c700UL, 0x00002300UL, 0x0000c300UL, 0x00001800UL, 0x00009600UL, 0x00000500UL, 0x00009a00UL, +++0x00000700UL, 0x00001200UL, 0x00008000UL, 0x0000e200UL, 0x0000eb00UL, 0x00002700UL, 0x0000b200UL, 0x00007500UL, +++0x00000900UL, 0x00008300UL, 0x00002c00UL, 0x00001a00UL, 0x00001b00UL, 0x00006e00UL, 0x00005a00UL, 0x0000a000UL, +++0x00005200UL, 0x00003b00UL, 0x0000d600UL, 0x0000b300UL, 0x00002900UL, 0x0000e300UL, 0x00002f00UL, 0x00008400UL, +++0x00005300UL, 0x0000d100UL, 0x00000000UL, 0x0000ed00UL, 0x00002000UL, 0x0000fc00UL, 0x0000b100UL, 0x00005b00UL, +++0x00006a00UL, 0x0000cb00UL, 0x0000be00UL, 0x00003900UL, 0x00004a00UL, 0x00004c00UL, 0x00005800UL, 0x0000cf00UL, +++0x0000d000UL, 0x0000ef00UL, 0x0000aa00UL, 0x0000fb00UL, 0x00004300UL, 0x00004d00UL, 0x00003300UL, 0x00008500UL, +++0x00004500UL, 0x0000f900UL, 0x00000200UL, 0x00007f00UL, 0x00005000UL, 0x00003c00UL, 0x00009f00UL, 0x0000a800UL, +++0x00005100UL, 0x0000a300UL, 0x00004000UL, 0x00008f00UL, 0x00009200UL, 0x00009d00UL, 0x00003800UL, 0x0000f500UL, +++0x0000bc00UL, 0x0000b600UL, 0x0000da00UL, 0x00002100UL, 0x00001000UL, 0x0000ff00UL, 0x0000f300UL, 0x0000d200UL, +++0x0000cd00UL, 0x00000c00UL, 0x00001300UL, 0x0000ec00UL, 0x00005f00UL, 0x00009700UL, 0x00004400UL, 0x00001700UL, +++0x0000c400UL, 0x0000a700UL, 0x00007e00UL, 0x00003d00UL, 0x00006400UL, 0x00005d00UL, 0x00001900UL, 0x00007300UL, +++0x00006000UL, 0x00008100UL, 0x00004f00UL, 0x0000dc00UL, 0x00002200UL, 0x00002a00UL, 0x00009000UL, 0x00008800UL, +++0x00004600UL, 0x0000ee00UL, 0x0000b800UL, 0x00001400UL, 0x0000de00UL, 0x00005e00UL, 0x00000b00UL, 0x0000db00UL, +++0x0000e000UL, 0x00003200UL, 0x00003a00UL, 0x00000a00UL, 0x00004900UL, 0x00000600UL, 0x00002400UL, 0x00005c00UL, +++0x0000c200UL, 0x0000d300UL, 0x0000ac00UL, 0x00006200UL, 0x00009100UL, 0x00009500UL, 0x0000e400UL, 0x00007900UL, +++0x0000e700UL, 0x0000c800UL, 0x00003700UL, 0x00006d00UL, 0x00008d00UL, 0x0000d500UL, 0x00004e00UL, 0x0000a900UL, +++0x00006c00UL, 0x00005600UL, 0x0000f400UL, 0x0000ea00UL, 0x00006500UL, 0x00007a00UL, 0x0000ae00UL, 0x00000800UL, +++0x0000ba00UL, 0x00007800UL, 0x00002500UL, 0x00002e00UL, 0x00001c00UL, 0x0000a600UL, 0x0000b400UL, 0x0000c600UL, +++0x0000e800UL, 0x0000dd00UL, 0x00007400UL, 0x00001f00UL, 0x00004b00UL, 0x0000bd00UL, 0x00008b00UL, 0x00008a00UL, +++0x00007000UL, 0x00003e00UL, 0x0000b500UL, 0x00006600UL, 0x00004800UL, 0x00000300UL, 0x0000f600UL, 0x00000e00UL, +++0x00006100UL, 0x00003500UL, 0x00005700UL, 0x0000b900UL, 0x00008600UL, 0x0000c100UL, 0x00001d00UL, 0x00009e00UL, +++0x0000e100UL, 0x0000f800UL, 0x00009800UL, 0x00001100UL, 0x00006900UL, 0x0000d900UL, 0x00008e00UL, 0x00009400UL, +++0x00009b00UL, 0x00001e00UL, 0x00008700UL, 0x0000e900UL, 0x0000ce00UL, 0x00005500UL, 0x00002800UL, 0x0000df00UL, +++0x00008c00UL, 0x0000a100UL, 0x00008900UL, 0x00000d00UL, 0x0000bf00UL, 0x0000e600UL, 0x00004200UL, 0x00006800UL, +++0x00004100UL, 0x00009900UL, 0x00002d00UL, 0x00000f00UL, 0x0000b000UL, 0x00005400UL, 0x0000bb00UL, 0x00001600UL +++}; +++ +++static const ulong32 Te4_2[] = { +++0x00630000UL, 0x007c0000UL, 0x00770000UL, 0x007b0000UL, 0x00f20000UL, 0x006b0000UL, 0x006f0000UL, 0x00c50000UL, +++0x00300000UL, 0x00010000UL, 0x00670000UL, 0x002b0000UL, 0x00fe0000UL, 0x00d70000UL, 0x00ab0000UL, 0x00760000UL, +++0x00ca0000UL, 0x00820000UL, 0x00c90000UL, 0x007d0000UL, 0x00fa0000UL, 0x00590000UL, 0x00470000UL, 0x00f00000UL, +++0x00ad0000UL, 0x00d40000UL, 0x00a20000UL, 0x00af0000UL, 0x009c0000UL, 0x00a40000UL, 0x00720000UL, 0x00c00000UL, +++0x00b70000UL, 0x00fd0000UL, 0x00930000UL, 0x00260000UL, 0x00360000UL, 0x003f0000UL, 0x00f70000UL, 0x00cc0000UL, +++0x00340000UL, 0x00a50000UL, 0x00e50000UL, 0x00f10000UL, 0x00710000UL, 0x00d80000UL, 0x00310000UL, 0x00150000UL, +++0x00040000UL, 0x00c70000UL, 0x00230000UL, 0x00c30000UL, 0x00180000UL, 0x00960000UL, 0x00050000UL, 0x009a0000UL, +++0x00070000UL, 0x00120000UL, 0x00800000UL, 0x00e20000UL, 0x00eb0000UL, 0x00270000UL, 0x00b20000UL, 0x00750000UL, +++0x00090000UL, 0x00830000UL, 0x002c0000UL, 0x001a0000UL, 0x001b0000UL, 0x006e0000UL, 0x005a0000UL, 0x00a00000UL, +++0x00520000UL, 0x003b0000UL, 0x00d60000UL, 0x00b30000UL, 0x00290000UL, 0x00e30000UL, 0x002f0000UL, 0x00840000UL, +++0x00530000UL, 0x00d10000UL, 0x00000000UL, 0x00ed0000UL, 0x00200000UL, 0x00fc0000UL, 0x00b10000UL, 0x005b0000UL, +++0x006a0000UL, 0x00cb0000UL, 0x00be0000UL, 0x00390000UL, 0x004a0000UL, 0x004c0000UL, 0x00580000UL, 0x00cf0000UL, +++0x00d00000UL, 0x00ef0000UL, 0x00aa0000UL, 0x00fb0000UL, 0x00430000UL, 0x004d0000UL, 0x00330000UL, 0x00850000UL, +++0x00450000UL, 0x00f90000UL, 0x00020000UL, 0x007f0000UL, 0x00500000UL, 0x003c0000UL, 0x009f0000UL, 0x00a80000UL, +++0x00510000UL, 0x00a30000UL, 0x00400000UL, 0x008f0000UL, 0x00920000UL, 0x009d0000UL, 0x00380000UL, 0x00f50000UL, +++0x00bc0000UL, 0x00b60000UL, 0x00da0000UL, 0x00210000UL, 0x00100000UL, 0x00ff0000UL, 0x00f30000UL, 0x00d20000UL, +++0x00cd0000UL, 0x000c0000UL, 0x00130000UL, 0x00ec0000UL, 0x005f0000UL, 0x00970000UL, 0x00440000UL, 0x00170000UL, +++0x00c40000UL, 0x00a70000UL, 0x007e0000UL, 0x003d0000UL, 0x00640000UL, 0x005d0000UL, 0x00190000UL, 0x00730000UL, +++0x00600000UL, 0x00810000UL, 0x004f0000UL, 0x00dc0000UL, 0x00220000UL, 0x002a0000UL, 0x00900000UL, 0x00880000UL, +++0x00460000UL, 0x00ee0000UL, 0x00b80000UL, 0x00140000UL, 0x00de0000UL, 0x005e0000UL, 0x000b0000UL, 0x00db0000UL, +++0x00e00000UL, 0x00320000UL, 0x003a0000UL, 0x000a0000UL, 0x00490000UL, 0x00060000UL, 0x00240000UL, 0x005c0000UL, +++0x00c20000UL, 0x00d30000UL, 0x00ac0000UL, 0x00620000UL, 0x00910000UL, 0x00950000UL, 0x00e40000UL, 0x00790000UL, +++0x00e70000UL, 0x00c80000UL, 0x00370000UL, 0x006d0000UL, 0x008d0000UL, 0x00d50000UL, 0x004e0000UL, 0x00a90000UL, +++0x006c0000UL, 0x00560000UL, 0x00f40000UL, 0x00ea0000UL, 0x00650000UL, 0x007a0000UL, 0x00ae0000UL, 0x00080000UL, +++0x00ba0000UL, 0x00780000UL, 0x00250000UL, 0x002e0000UL, 0x001c0000UL, 0x00a60000UL, 0x00b40000UL, 0x00c60000UL, +++0x00e80000UL, 0x00dd0000UL, 0x00740000UL, 0x001f0000UL, 0x004b0000UL, 0x00bd0000UL, 0x008b0000UL, 0x008a0000UL, +++0x00700000UL, 0x003e0000UL, 0x00b50000UL, 0x00660000UL, 0x00480000UL, 0x00030000UL, 0x00f60000UL, 0x000e0000UL, +++0x00610000UL, 0x00350000UL, 0x00570000UL, 0x00b90000UL, 0x00860000UL, 0x00c10000UL, 0x001d0000UL, 0x009e0000UL, +++0x00e10000UL, 0x00f80000UL, 0x00980000UL, 0x00110000UL, 0x00690000UL, 0x00d90000UL, 0x008e0000UL, 0x00940000UL, +++0x009b0000UL, 0x001e0000UL, 0x00870000UL, 0x00e90000UL, 0x00ce0000UL, 0x00550000UL, 0x00280000UL, 0x00df0000UL, +++0x008c0000UL, 0x00a10000UL, 0x00890000UL, 0x000d0000UL, 0x00bf0000UL, 0x00e60000UL, 0x00420000UL, 0x00680000UL, +++0x00410000UL, 0x00990000UL, 0x002d0000UL, 0x000f0000UL, 0x00b00000UL, 0x00540000UL, 0x00bb0000UL, 0x00160000UL +++}; +++ +++static const ulong32 Te4_3[] = { +++0x63000000UL, 0x7c000000UL, 0x77000000UL, 0x7b000000UL, 0xf2000000UL, 0x6b000000UL, 0x6f000000UL, 0xc5000000UL, +++0x30000000UL, 0x01000000UL, 0x67000000UL, 0x2b000000UL, 0xfe000000UL, 0xd7000000UL, 0xab000000UL, 0x76000000UL, +++0xca000000UL, 0x82000000UL, 0xc9000000UL, 0x7d000000UL, 0xfa000000UL, 0x59000000UL, 0x47000000UL, 0xf0000000UL, +++0xad000000UL, 0xd4000000UL, 0xa2000000UL, 0xaf000000UL, 0x9c000000UL, 0xa4000000UL, 0x72000000UL, 0xc0000000UL, +++0xb7000000UL, 0xfd000000UL, 0x93000000UL, 0x26000000UL, 0x36000000UL, 0x3f000000UL, 0xf7000000UL, 0xcc000000UL, +++0x34000000UL, 0xa5000000UL, 0xe5000000UL, 0xf1000000UL, 0x71000000UL, 0xd8000000UL, 0x31000000UL, 0x15000000UL, +++0x04000000UL, 0xc7000000UL, 0x23000000UL, 0xc3000000UL, 0x18000000UL, 0x96000000UL, 0x05000000UL, 0x9a000000UL, +++0x07000000UL, 0x12000000UL, 0x80000000UL, 0xe2000000UL, 0xeb000000UL, 0x27000000UL, 0xb2000000UL, 0x75000000UL, +++0x09000000UL, 0x83000000UL, 0x2c000000UL, 0x1a000000UL, 0x1b000000UL, 0x6e000000UL, 0x5a000000UL, 0xa0000000UL, +++0x52000000UL, 0x3b000000UL, 0xd6000000UL, 0xb3000000UL, 0x29000000UL, 0xe3000000UL, 0x2f000000UL, 0x84000000UL, +++0x53000000UL, 0xd1000000UL, 0x00000000UL, 0xed000000UL, 0x20000000UL, 0xfc000000UL, 0xb1000000UL, 0x5b000000UL, +++0x6a000000UL, 0xcb000000UL, 0xbe000000UL, 0x39000000UL, 0x4a000000UL, 0x4c000000UL, 0x58000000UL, 0xcf000000UL, +++0xd0000000UL, 0xef000000UL, 0xaa000000UL, 0xfb000000UL, 0x43000000UL, 0x4d000000UL, 0x33000000UL, 0x85000000UL, +++0x45000000UL, 0xf9000000UL, 0x02000000UL, 0x7f000000UL, 0x50000000UL, 0x3c000000UL, 0x9f000000UL, 0xa8000000UL, +++0x51000000UL, 0xa3000000UL, 0x40000000UL, 0x8f000000UL, 0x92000000UL, 0x9d000000UL, 0x38000000UL, 0xf5000000UL, +++0xbc000000UL, 0xb6000000UL, 0xda000000UL, 0x21000000UL, 0x10000000UL, 0xff000000UL, 0xf3000000UL, 0xd2000000UL, +++0xcd000000UL, 0x0c000000UL, 0x13000000UL, 0xec000000UL, 0x5f000000UL, 0x97000000UL, 0x44000000UL, 0x17000000UL, +++0xc4000000UL, 0xa7000000UL, 0x7e000000UL, 0x3d000000UL, 0x64000000UL, 0x5d000000UL, 0x19000000UL, 0x73000000UL, +++0x60000000UL, 0x81000000UL, 0x4f000000UL, 0xdc000000UL, 0x22000000UL, 0x2a000000UL, 0x90000000UL, 0x88000000UL, +++0x46000000UL, 0xee000000UL, 0xb8000000UL, 0x14000000UL, 0xde000000UL, 0x5e000000UL, 0x0b000000UL, 0xdb000000UL, +++0xe0000000UL, 0x32000000UL, 0x3a000000UL, 0x0a000000UL, 0x49000000UL, 0x06000000UL, 0x24000000UL, 0x5c000000UL, +++0xc2000000UL, 0xd3000000UL, 0xac000000UL, 0x62000000UL, 0x91000000UL, 0x95000000UL, 0xe4000000UL, 0x79000000UL, +++0xe7000000UL, 0xc8000000UL, 0x37000000UL, 0x6d000000UL, 0x8d000000UL, 0xd5000000UL, 0x4e000000UL, 0xa9000000UL, +++0x6c000000UL, 0x56000000UL, 0xf4000000UL, 0xea000000UL, 0x65000000UL, 0x7a000000UL, 0xae000000UL, 0x08000000UL, +++0xba000000UL, 0x78000000UL, 0x25000000UL, 0x2e000000UL, 0x1c000000UL, 0xa6000000UL, 0xb4000000UL, 0xc6000000UL, +++0xe8000000UL, 0xdd000000UL, 0x74000000UL, 0x1f000000UL, 0x4b000000UL, 0xbd000000UL, 0x8b000000UL, 0x8a000000UL, +++0x70000000UL, 0x3e000000UL, 0xb5000000UL, 0x66000000UL, 0x48000000UL, 0x03000000UL, 0xf6000000UL, 0x0e000000UL, +++0x61000000UL, 0x35000000UL, 0x57000000UL, 0xb9000000UL, 0x86000000UL, 0xc1000000UL, 0x1d000000UL, 0x9e000000UL, +++0xe1000000UL, 0xf8000000UL, 0x98000000UL, 0x11000000UL, 0x69000000UL, 0xd9000000UL, 0x8e000000UL, 0x94000000UL, +++0x9b000000UL, 0x1e000000UL, 0x87000000UL, 0xe9000000UL, 0xce000000UL, 0x55000000UL, 0x28000000UL, 0xdf000000UL, +++0x8c000000UL, 0xa1000000UL, 0x89000000UL, 0x0d000000UL, 0xbf000000UL, 0xe6000000UL, 0x42000000UL, 0x68000000UL, +++0x41000000UL, 0x99000000UL, 0x2d000000UL, 0x0f000000UL, 0xb0000000UL, 0x54000000UL, 0xbb000000UL, 0x16000000UL +++}; +++ +++static const ulong32 TD1[256] = { +++ 0x5051f4a7UL, 0x537e4165UL, 0xc31a17a4UL, 0x963a275eUL, +++ 0xcb3bab6bUL, 0xf11f9d45UL, 0xabacfa58UL, 0x934be303UL, +++ 0x552030faUL, 0xf6ad766dUL, 0x9188cc76UL, 0x25f5024cUL, +++ 0xfc4fe5d7UL, 0xd7c52acbUL, 0x80263544UL, 0x8fb562a3UL, +++ 0x49deb15aUL, 0x6725ba1bUL, 0x9845ea0eUL, 0xe15dfec0UL, +++ 0x02c32f75UL, 0x12814cf0UL, 0xa38d4697UL, 0xc66bd3f9UL, +++ 0xe7038f5fUL, 0x9515929cUL, 0xebbf6d7aUL, 0xda955259UL, +++ 0x2dd4be83UL, 0xd3587421UL, 0x2949e069UL, 0x448ec9c8UL, +++ 0x6a75c289UL, 0x78f48e79UL, 0x6b99583eUL, 0xdd27b971UL, +++ 0xb6bee14fUL, 0x17f088adUL, 0x66c920acUL, 0xb47dce3aUL, +++ 0x1863df4aUL, 0x82e51a31UL, 0x60975133UL, 0x4562537fUL, +++ 0xe0b16477UL, 0x84bb6baeUL, 0x1cfe81a0UL, 0x94f9082bUL, +++ 0x58704868UL, 0x198f45fdUL, 0x8794de6cUL, 0xb7527bf8UL, +++ 0x23ab73d3UL, 0xe2724b02UL, 0x57e31f8fUL, 0x2a6655abUL, +++ 0x07b2eb28UL, 0x032fb5c2UL, 0x9a86c57bUL, 0xa5d33708UL, +++ 0xf2302887UL, 0xb223bfa5UL, 0xba02036aUL, 0x5ced1682UL, +++ 0x2b8acf1cUL, 0x92a779b4UL, 0xf0f307f2UL, 0xa14e69e2UL, +++ 0xcd65daf4UL, 0xd50605beUL, 0x1fd13462UL, 0x8ac4a6feUL, +++ 0x9d342e53UL, 0xa0a2f355UL, 0x32058ae1UL, 0x75a4f6ebUL, +++ 0x390b83ecUL, 0xaa4060efUL, 0x065e719fUL, 0x51bd6e10UL, +++ 0xf93e218aUL, 0x3d96dd06UL, 0xaedd3e05UL, 0x464de6bdUL, +++ 0xb591548dUL, 0x0571c45dUL, 0x6f0406d4UL, 0xff605015UL, +++ 0x241998fbUL, 0x97d6bde9UL, 0xcc894043UL, 0x7767d99eUL, +++ 0xbdb0e842UL, 0x8807898bUL, 0x38e7195bUL, 0xdb79c8eeUL, +++ 0x47a17c0aUL, 0xe97c420fUL, 0xc9f8841eUL, 0x00000000UL, +++ 0x83098086UL, 0x48322bedUL, 0xac1e1170UL, 0x4e6c5a72UL, +++ 0xfbfd0effUL, 0x560f8538UL, 0x1e3daed5UL, 0x27362d39UL, +++ 0x640a0fd9UL, 0x21685ca6UL, 0xd19b5b54UL, 0x3a24362eUL, +++ 0xb10c0a67UL, 0x0f9357e7UL, 0xd2b4ee96UL, 0x9e1b9b91UL, +++ 0x4f80c0c5UL, 0xa261dc20UL, 0x695a774bUL, 0x161c121aUL, +++ 0x0ae293baUL, 0xe5c0a02aUL, 0x433c22e0UL, 0x1d121b17UL, +++ 0x0b0e090dUL, 0xadf28bc7UL, 0xb92db6a8UL, 0xc8141ea9UL, +++ 0x8557f119UL, 0x4caf7507UL, 0xbbee99ddUL, 0xfda37f60UL, +++ 0x9ff70126UL, 0xbc5c72f5UL, 0xc544663bUL, 0x345bfb7eUL, +++ 0x768b4329UL, 0xdccb23c6UL, 0x68b6edfcUL, 0x63b8e4f1UL, +++ 0xcad731dcUL, 0x10426385UL, 0x40139722UL, 0x2084c611UL, +++ 0x7d854a24UL, 0xf8d2bb3dUL, 0x11aef932UL, 0x6dc729a1UL, +++ 0x4b1d9e2fUL, 0xf3dcb230UL, 0xec0d8652UL, 0xd077c1e3UL, +++ 0x6c2bb316UL, 0x99a970b9UL, 0xfa119448UL, 0x2247e964UL, +++ 0xc4a8fc8cUL, 0x1aa0f03fUL, 0xd8567d2cUL, 0xef223390UL, +++ 0xc787494eUL, 0xc1d938d1UL, 0xfe8ccaa2UL, 0x3698d40bUL, +++ 0xcfa6f581UL, 0x28a57adeUL, 0x26dab78eUL, 0xa43fadbfUL, +++ 0xe42c3a9dUL, 0x0d507892UL, 0x9b6a5fccUL, 0x62547e46UL, +++ 0xc2f68d13UL, 0xe890d8b8UL, 0x5e2e39f7UL, 0xf582c3afUL, +++ 0xbe9f5d80UL, 0x7c69d093UL, 0xa96fd52dUL, 0xb3cf2512UL, +++ 0x3bc8ac99UL, 0xa710187dUL, 0x6ee89c63UL, 0x7bdb3bbbUL, +++ 0x09cd2678UL, 0xf46e5918UL, 0x01ec9ab7UL, 0xa8834f9aUL, +++ 0x65e6956eUL, 0x7eaaffe6UL, 0x0821bccfUL, 0xe6ef15e8UL, +++ 0xd9bae79bUL, 0xce4a6f36UL, 0xd4ea9f09UL, 0xd629b07cUL, +++ 0xaf31a4b2UL, 0x312a3f23UL, 0x30c6a594UL, 0xc035a266UL, +++ 0x37744ebcUL, 0xa6fc82caUL, 0xb0e090d0UL, 0x1533a7d8UL, +++ 0x4af10498UL, 0xf741ecdaUL, 0x0e7fcd50UL, 0x2f1791f6UL, +++ 0x8d764dd6UL, 0x4d43efb0UL, 0x54ccaa4dUL, 0xdfe49604UL, +++ 0xe39ed1b5UL, 0x1b4c6a88UL, 0xb8c12c1fUL, 0x7f466551UL, +++ 0x049d5eeaUL, 0x5d018c35UL, 0x73fa8774UL, 0x2efb0b41UL, +++ 0x5ab3671dUL, 0x5292dbd2UL, 0x33e91056UL, 0x136dd647UL, +++ 0x8c9ad761UL, 0x7a37a10cUL, 0x8e59f814UL, 0x89eb133cUL, +++ 0xeecea927UL, 0x35b761c9UL, 0xede11ce5UL, 0x3c7a47b1UL, +++ 0x599cd2dfUL, 0x3f55f273UL, 0x791814ceUL, 0xbf73c737UL, +++ 0xea53f7cdUL, 0x5b5ffdaaUL, 0x14df3d6fUL, 0x867844dbUL, +++ 0x81caaff3UL, 0x3eb968c4UL, 0x2c382434UL, 0x5fc2a340UL, +++ 0x72161dc3UL, 0x0cbce225UL, 0x8b283c49UL, 0x41ff0d95UL, +++ 0x7139a801UL, 0xde080cb3UL, 0x9cd8b4e4UL, 0x906456c1UL, +++ 0x617bcb84UL, 0x70d532b6UL, 0x74486c5cUL, 0x42d0b857UL, +++}; +++static const ulong32 TD2[256] = { +++ 0xa75051f4UL, 0x65537e41UL, 0xa4c31a17UL, 0x5e963a27UL, +++ 0x6bcb3babUL, 0x45f11f9dUL, 0x58abacfaUL, 0x03934be3UL, +++ 0xfa552030UL, 0x6df6ad76UL, 0x769188ccUL, 0x4c25f502UL, +++ 0xd7fc4fe5UL, 0xcbd7c52aUL, 0x44802635UL, 0xa38fb562UL, +++ 0x5a49deb1UL, 0x1b6725baUL, 0x0e9845eaUL, 0xc0e15dfeUL, +++ 0x7502c32fUL, 0xf012814cUL, 0x97a38d46UL, 0xf9c66bd3UL, +++ 0x5fe7038fUL, 0x9c951592UL, 0x7aebbf6dUL, 0x59da9552UL, +++ 0x832dd4beUL, 0x21d35874UL, 0x692949e0UL, 0xc8448ec9UL, +++ 0x896a75c2UL, 0x7978f48eUL, 0x3e6b9958UL, 0x71dd27b9UL, +++ 0x4fb6bee1UL, 0xad17f088UL, 0xac66c920UL, 0x3ab47dceUL, +++ 0x4a1863dfUL, 0x3182e51aUL, 0x33609751UL, 0x7f456253UL, +++ 0x77e0b164UL, 0xae84bb6bUL, 0xa01cfe81UL, 0x2b94f908UL, +++ 0x68587048UL, 0xfd198f45UL, 0x6c8794deUL, 0xf8b7527bUL, +++ 0xd323ab73UL, 0x02e2724bUL, 0x8f57e31fUL, 0xab2a6655UL, +++ 0x2807b2ebUL, 0xc2032fb5UL, 0x7b9a86c5UL, 0x08a5d337UL, +++ 0x87f23028UL, 0xa5b223bfUL, 0x6aba0203UL, 0x825ced16UL, +++ 0x1c2b8acfUL, 0xb492a779UL, 0xf2f0f307UL, 0xe2a14e69UL, +++ 0xf4cd65daUL, 0xbed50605UL, 0x621fd134UL, 0xfe8ac4a6UL, +++ 0x539d342eUL, 0x55a0a2f3UL, 0xe132058aUL, 0xeb75a4f6UL, +++ 0xec390b83UL, 0xefaa4060UL, 0x9f065e71UL, 0x1051bd6eUL, +++ 0x8af93e21UL, 0x063d96ddUL, 0x05aedd3eUL, 0xbd464de6UL, +++ 0x8db59154UL, 0x5d0571c4UL, 0xd46f0406UL, 0x15ff6050UL, +++ 0xfb241998UL, 0xe997d6bdUL, 0x43cc8940UL, 0x9e7767d9UL, +++ 0x42bdb0e8UL, 0x8b880789UL, 0x5b38e719UL, 0xeedb79c8UL, +++ 0x0a47a17cUL, 0x0fe97c42UL, 0x1ec9f884UL, 0x00000000UL, +++ 0x86830980UL, 0xed48322bUL, 0x70ac1e11UL, 0x724e6c5aUL, +++ 0xfffbfd0eUL, 0x38560f85UL, 0xd51e3daeUL, 0x3927362dUL, +++ 0xd9640a0fUL, 0xa621685cUL, 0x54d19b5bUL, 0x2e3a2436UL, +++ 0x67b10c0aUL, 0xe70f9357UL, 0x96d2b4eeUL, 0x919e1b9bUL, +++ 0xc54f80c0UL, 0x20a261dcUL, 0x4b695a77UL, 0x1a161c12UL, +++ 0xba0ae293UL, 0x2ae5c0a0UL, 0xe0433c22UL, 0x171d121bUL, +++ 0x0d0b0e09UL, 0xc7adf28bUL, 0xa8b92db6UL, 0xa9c8141eUL, +++ 0x198557f1UL, 0x074caf75UL, 0xddbbee99UL, 0x60fda37fUL, +++ 0x269ff701UL, 0xf5bc5c72UL, 0x3bc54466UL, 0x7e345bfbUL, +++ 0x29768b43UL, 0xc6dccb23UL, 0xfc68b6edUL, 0xf163b8e4UL, +++ 0xdccad731UL, 0x85104263UL, 0x22401397UL, 0x112084c6UL, +++ 0x247d854aUL, 0x3df8d2bbUL, 0x3211aef9UL, 0xa16dc729UL, +++ 0x2f4b1d9eUL, 0x30f3dcb2UL, 0x52ec0d86UL, 0xe3d077c1UL, +++ 0x166c2bb3UL, 0xb999a970UL, 0x48fa1194UL, 0x642247e9UL, +++ 0x8cc4a8fcUL, 0x3f1aa0f0UL, 0x2cd8567dUL, 0x90ef2233UL, +++ 0x4ec78749UL, 0xd1c1d938UL, 0xa2fe8ccaUL, 0x0b3698d4UL, +++ 0x81cfa6f5UL, 0xde28a57aUL, 0x8e26dab7UL, 0xbfa43fadUL, +++ 0x9de42c3aUL, 0x920d5078UL, 0xcc9b6a5fUL, 0x4662547eUL, +++ 0x13c2f68dUL, 0xb8e890d8UL, 0xf75e2e39UL, 0xaff582c3UL, +++ 0x80be9f5dUL, 0x937c69d0UL, 0x2da96fd5UL, 0x12b3cf25UL, +++ 0x993bc8acUL, 0x7da71018UL, 0x636ee89cUL, 0xbb7bdb3bUL, +++ 0x7809cd26UL, 0x18f46e59UL, 0xb701ec9aUL, 0x9aa8834fUL, +++ 0x6e65e695UL, 0xe67eaaffUL, 0xcf0821bcUL, 0xe8e6ef15UL, +++ 0x9bd9bae7UL, 0x36ce4a6fUL, 0x09d4ea9fUL, 0x7cd629b0UL, +++ 0xb2af31a4UL, 0x23312a3fUL, 0x9430c6a5UL, 0x66c035a2UL, +++ 0xbc37744eUL, 0xcaa6fc82UL, 0xd0b0e090UL, 0xd81533a7UL, +++ 0x984af104UL, 0xdaf741ecUL, 0x500e7fcdUL, 0xf62f1791UL, +++ 0xd68d764dUL, 0xb04d43efUL, 0x4d54ccaaUL, 0x04dfe496UL, +++ 0xb5e39ed1UL, 0x881b4c6aUL, 0x1fb8c12cUL, 0x517f4665UL, +++ 0xea049d5eUL, 0x355d018cUL, 0x7473fa87UL, 0x412efb0bUL, +++ 0x1d5ab367UL, 0xd25292dbUL, 0x5633e910UL, 0x47136dd6UL, +++ 0x618c9ad7UL, 0x0c7a37a1UL, 0x148e59f8UL, 0x3c89eb13UL, +++ 0x27eecea9UL, 0xc935b761UL, 0xe5ede11cUL, 0xb13c7a47UL, +++ 0xdf599cd2UL, 0x733f55f2UL, 0xce791814UL, 0x37bf73c7UL, +++ 0xcdea53f7UL, 0xaa5b5ffdUL, 0x6f14df3dUL, 0xdb867844UL, +++ 0xf381caafUL, 0xc43eb968UL, 0x342c3824UL, 0x405fc2a3UL, +++ 0xc372161dUL, 0x250cbce2UL, 0x498b283cUL, 0x9541ff0dUL, +++ 0x017139a8UL, 0xb3de080cUL, 0xe49cd8b4UL, 0xc1906456UL, +++ 0x84617bcbUL, 0xb670d532UL, 0x5c74486cUL, 0x5742d0b8UL, +++}; +++static const ulong32 TD3[256] = { +++ 0xf4a75051UL, 0x4165537eUL, 0x17a4c31aUL, 0x275e963aUL, +++ 0xab6bcb3bUL, 0x9d45f11fUL, 0xfa58abacUL, 0xe303934bUL, +++ 0x30fa5520UL, 0x766df6adUL, 0xcc769188UL, 0x024c25f5UL, +++ 0xe5d7fc4fUL, 0x2acbd7c5UL, 0x35448026UL, 0x62a38fb5UL, +++ 0xb15a49deUL, 0xba1b6725UL, 0xea0e9845UL, 0xfec0e15dUL, +++ 0x2f7502c3UL, 0x4cf01281UL, 0x4697a38dUL, 0xd3f9c66bUL, +++ 0x8f5fe703UL, 0x929c9515UL, 0x6d7aebbfUL, 0x5259da95UL, +++ 0xbe832dd4UL, 0x7421d358UL, 0xe0692949UL, 0xc9c8448eUL, +++ 0xc2896a75UL, 0x8e7978f4UL, 0x583e6b99UL, 0xb971dd27UL, +++ 0xe14fb6beUL, 0x88ad17f0UL, 0x20ac66c9UL, 0xce3ab47dUL, +++ 0xdf4a1863UL, 0x1a3182e5UL, 0x51336097UL, 0x537f4562UL, +++ 0x6477e0b1UL, 0x6bae84bbUL, 0x81a01cfeUL, 0x082b94f9UL, +++ 0x48685870UL, 0x45fd198fUL, 0xde6c8794UL, 0x7bf8b752UL, +++ 0x73d323abUL, 0x4b02e272UL, 0x1f8f57e3UL, 0x55ab2a66UL, +++ 0xeb2807b2UL, 0xb5c2032fUL, 0xc57b9a86UL, 0x3708a5d3UL, +++ 0x2887f230UL, 0xbfa5b223UL, 0x036aba02UL, 0x16825cedUL, +++ 0xcf1c2b8aUL, 0x79b492a7UL, 0x07f2f0f3UL, 0x69e2a14eUL, +++ 0xdaf4cd65UL, 0x05bed506UL, 0x34621fd1UL, 0xa6fe8ac4UL, +++ 0x2e539d34UL, 0xf355a0a2UL, 0x8ae13205UL, 0xf6eb75a4UL, +++ 0x83ec390bUL, 0x60efaa40UL, 0x719f065eUL, 0x6e1051bdUL, +++ 0x218af93eUL, 0xdd063d96UL, 0x3e05aeddUL, 0xe6bd464dUL, +++ 0x548db591UL, 0xc45d0571UL, 0x06d46f04UL, 0x5015ff60UL, +++ 0x98fb2419UL, 0xbde997d6UL, 0x4043cc89UL, 0xd99e7767UL, +++ 0xe842bdb0UL, 0x898b8807UL, 0x195b38e7UL, 0xc8eedb79UL, +++ 0x7c0a47a1UL, 0x420fe97cUL, 0x841ec9f8UL, 0x00000000UL, +++ 0x80868309UL, 0x2bed4832UL, 0x1170ac1eUL, 0x5a724e6cUL, +++ 0x0efffbfdUL, 0x8538560fUL, 0xaed51e3dUL, 0x2d392736UL, +++ 0x0fd9640aUL, 0x5ca62168UL, 0x5b54d19bUL, 0x362e3a24UL, +++ 0x0a67b10cUL, 0x57e70f93UL, 0xee96d2b4UL, 0x9b919e1bUL, +++ 0xc0c54f80UL, 0xdc20a261UL, 0x774b695aUL, 0x121a161cUL, +++ 0x93ba0ae2UL, 0xa02ae5c0UL, 0x22e0433cUL, 0x1b171d12UL, +++ 0x090d0b0eUL, 0x8bc7adf2UL, 0xb6a8b92dUL, 0x1ea9c814UL, +++ 0xf1198557UL, 0x75074cafUL, 0x99ddbbeeUL, 0x7f60fda3UL, +++ 0x01269ff7UL, 0x72f5bc5cUL, 0x663bc544UL, 0xfb7e345bUL, +++ 0x4329768bUL, 0x23c6dccbUL, 0xedfc68b6UL, 0xe4f163b8UL, +++ 0x31dccad7UL, 0x63851042UL, 0x97224013UL, 0xc6112084UL, +++ 0x4a247d85UL, 0xbb3df8d2UL, 0xf93211aeUL, 0x29a16dc7UL, +++ 0x9e2f4b1dUL, 0xb230f3dcUL, 0x8652ec0dUL, 0xc1e3d077UL, +++ 0xb3166c2bUL, 0x70b999a9UL, 0x9448fa11UL, 0xe9642247UL, +++ 0xfc8cc4a8UL, 0xf03f1aa0UL, 0x7d2cd856UL, 0x3390ef22UL, +++ 0x494ec787UL, 0x38d1c1d9UL, 0xcaa2fe8cUL, 0xd40b3698UL, +++ 0xf581cfa6UL, 0x7ade28a5UL, 0xb78e26daUL, 0xadbfa43fUL, +++ 0x3a9de42cUL, 0x78920d50UL, 0x5fcc9b6aUL, 0x7e466254UL, +++ 0x8d13c2f6UL, 0xd8b8e890UL, 0x39f75e2eUL, 0xc3aff582UL, +++ 0x5d80be9fUL, 0xd0937c69UL, 0xd52da96fUL, 0x2512b3cfUL, +++ 0xac993bc8UL, 0x187da710UL, 0x9c636ee8UL, 0x3bbb7bdbUL, +++ 0x267809cdUL, 0x5918f46eUL, 0x9ab701ecUL, 0x4f9aa883UL, +++ 0x956e65e6UL, 0xffe67eaaUL, 0xbccf0821UL, 0x15e8e6efUL, +++ 0xe79bd9baUL, 0x6f36ce4aUL, 0x9f09d4eaUL, 0xb07cd629UL, +++ 0xa4b2af31UL, 0x3f23312aUL, 0xa59430c6UL, 0xa266c035UL, +++ 0x4ebc3774UL, 0x82caa6fcUL, 0x90d0b0e0UL, 0xa7d81533UL, +++ 0x04984af1UL, 0xecdaf741UL, 0xcd500e7fUL, 0x91f62f17UL, +++ 0x4dd68d76UL, 0xefb04d43UL, 0xaa4d54ccUL, 0x9604dfe4UL, +++ 0xd1b5e39eUL, 0x6a881b4cUL, 0x2c1fb8c1UL, 0x65517f46UL, +++ 0x5eea049dUL, 0x8c355d01UL, 0x877473faUL, 0x0b412efbUL, +++ 0x671d5ab3UL, 0xdbd25292UL, 0x105633e9UL, 0xd647136dUL, +++ 0xd7618c9aUL, 0xa10c7a37UL, 0xf8148e59UL, 0x133c89ebUL, +++ 0xa927eeceUL, 0x61c935b7UL, 0x1ce5ede1UL, 0x47b13c7aUL, +++ 0xd2df599cUL, 0xf2733f55UL, 0x14ce7918UL, 0xc737bf73UL, +++ 0xf7cdea53UL, 0xfdaa5b5fUL, 0x3d6f14dfUL, 0x44db8678UL, +++ 0xaff381caUL, 0x68c43eb9UL, 0x24342c38UL, 0xa3405fc2UL, +++ 0x1dc37216UL, 0xe2250cbcUL, 0x3c498b28UL, 0x0d9541ffUL, +++ 0xa8017139UL, 0x0cb3de08UL, 0xb4e49cd8UL, 0x56c19064UL, +++ 0xcb84617bUL, 0x32b670d5UL, 0x6c5c7448UL, 0xb85742d0UL, +++}; +++ +++static const ulong32 Tks0[] = { +++0x00000000UL, 0x0e090d0bUL, 0x1c121a16UL, 0x121b171dUL, 0x3824342cUL, 0x362d3927UL, 0x24362e3aUL, 0x2a3f2331UL, +++0x70486858UL, 0x7e416553UL, 0x6c5a724eUL, 0x62537f45UL, 0x486c5c74UL, 0x4665517fUL, 0x547e4662UL, 0x5a774b69UL, +++0xe090d0b0UL, 0xee99ddbbUL, 0xfc82caa6UL, 0xf28bc7adUL, 0xd8b4e49cUL, 0xd6bde997UL, 0xc4a6fe8aUL, 0xcaaff381UL, +++0x90d8b8e8UL, 0x9ed1b5e3UL, 0x8ccaa2feUL, 0x82c3aff5UL, 0xa8fc8cc4UL, 0xa6f581cfUL, 0xb4ee96d2UL, 0xbae79bd9UL, +++0xdb3bbb7bUL, 0xd532b670UL, 0xc729a16dUL, 0xc920ac66UL, 0xe31f8f57UL, 0xed16825cUL, 0xff0d9541UL, 0xf104984aUL, +++0xab73d323UL, 0xa57ade28UL, 0xb761c935UL, 0xb968c43eUL, 0x9357e70fUL, 0x9d5eea04UL, 0x8f45fd19UL, 0x814cf012UL, +++0x3bab6bcbUL, 0x35a266c0UL, 0x27b971ddUL, 0x29b07cd6UL, 0x038f5fe7UL, 0x0d8652ecUL, 0x1f9d45f1UL, 0x119448faUL, +++0x4be30393UL, 0x45ea0e98UL, 0x57f11985UL, 0x59f8148eUL, 0x73c737bfUL, 0x7dce3ab4UL, 0x6fd52da9UL, 0x61dc20a2UL, +++0xad766df6UL, 0xa37f60fdUL, 0xb16477e0UL, 0xbf6d7aebUL, 0x955259daUL, 0x9b5b54d1UL, 0x894043ccUL, 0x87494ec7UL, +++0xdd3e05aeUL, 0xd33708a5UL, 0xc12c1fb8UL, 0xcf2512b3UL, 0xe51a3182UL, 0xeb133c89UL, 0xf9082b94UL, 0xf701269fUL, +++0x4de6bd46UL, 0x43efb04dUL, 0x51f4a750UL, 0x5ffdaa5bUL, 0x75c2896aUL, 0x7bcb8461UL, 0x69d0937cUL, 0x67d99e77UL, +++0x3daed51eUL, 0x33a7d815UL, 0x21bccf08UL, 0x2fb5c203UL, 0x058ae132UL, 0x0b83ec39UL, 0x1998fb24UL, 0x1791f62fUL, +++0x764dd68dUL, 0x7844db86UL, 0x6a5fcc9bUL, 0x6456c190UL, 0x4e69e2a1UL, 0x4060efaaUL, 0x527bf8b7UL, 0x5c72f5bcUL, +++0x0605bed5UL, 0x080cb3deUL, 0x1a17a4c3UL, 0x141ea9c8UL, 0x3e218af9UL, 0x302887f2UL, 0x223390efUL, 0x2c3a9de4UL, +++0x96dd063dUL, 0x98d40b36UL, 0x8acf1c2bUL, 0x84c61120UL, 0xaef93211UL, 0xa0f03f1aUL, 0xb2eb2807UL, 0xbce2250cUL, +++0xe6956e65UL, 0xe89c636eUL, 0xfa877473UL, 0xf48e7978UL, 0xdeb15a49UL, 0xd0b85742UL, 0xc2a3405fUL, 0xccaa4d54UL, +++0x41ecdaf7UL, 0x4fe5d7fcUL, 0x5dfec0e1UL, 0x53f7cdeaUL, 0x79c8eedbUL, 0x77c1e3d0UL, 0x65daf4cdUL, 0x6bd3f9c6UL, +++0x31a4b2afUL, 0x3fadbfa4UL, 0x2db6a8b9UL, 0x23bfa5b2UL, 0x09808683UL, 0x07898b88UL, 0x15929c95UL, 0x1b9b919eUL, +++0xa17c0a47UL, 0xaf75074cUL, 0xbd6e1051UL, 0xb3671d5aUL, 0x99583e6bUL, 0x97513360UL, 0x854a247dUL, 0x8b432976UL, +++0xd134621fUL, 0xdf3d6f14UL, 0xcd267809UL, 0xc32f7502UL, 0xe9105633UL, 0xe7195b38UL, 0xf5024c25UL, 0xfb0b412eUL, +++0x9ad7618cUL, 0x94de6c87UL, 0x86c57b9aUL, 0x88cc7691UL, 0xa2f355a0UL, 0xacfa58abUL, 0xbee14fb6UL, 0xb0e842bdUL, +++0xea9f09d4UL, 0xe49604dfUL, 0xf68d13c2UL, 0xf8841ec9UL, 0xd2bb3df8UL, 0xdcb230f3UL, 0xcea927eeUL, 0xc0a02ae5UL, +++0x7a47b13cUL, 0x744ebc37UL, 0x6655ab2aUL, 0x685ca621UL, 0x42638510UL, 0x4c6a881bUL, 0x5e719f06UL, 0x5078920dUL, +++0x0a0fd964UL, 0x0406d46fUL, 0x161dc372UL, 0x1814ce79UL, 0x322bed48UL, 0x3c22e043UL, 0x2e39f75eUL, 0x2030fa55UL, +++0xec9ab701UL, 0xe293ba0aUL, 0xf088ad17UL, 0xfe81a01cUL, 0xd4be832dUL, 0xdab78e26UL, 0xc8ac993bUL, 0xc6a59430UL, +++0x9cd2df59UL, 0x92dbd252UL, 0x80c0c54fUL, 0x8ec9c844UL, 0xa4f6eb75UL, 0xaaffe67eUL, 0xb8e4f163UL, 0xb6edfc68UL, +++0x0c0a67b1UL, 0x02036abaUL, 0x10187da7UL, 0x1e1170acUL, 0x342e539dUL, 0x3a275e96UL, 0x283c498bUL, 0x26354480UL, +++0x7c420fe9UL, 0x724b02e2UL, 0x605015ffUL, 0x6e5918f4UL, 0x44663bc5UL, 0x4a6f36ceUL, 0x587421d3UL, 0x567d2cd8UL, +++0x37a10c7aUL, 0x39a80171UL, 0x2bb3166cUL, 0x25ba1b67UL, 0x0f853856UL, 0x018c355dUL, 0x13972240UL, 0x1d9e2f4bUL, +++0x47e96422UL, 0x49e06929UL, 0x5bfb7e34UL, 0x55f2733fUL, 0x7fcd500eUL, 0x71c45d05UL, 0x63df4a18UL, 0x6dd64713UL, +++0xd731dccaUL, 0xd938d1c1UL, 0xcb23c6dcUL, 0xc52acbd7UL, 0xef15e8e6UL, 0xe11ce5edUL, 0xf307f2f0UL, 0xfd0efffbUL, +++0xa779b492UL, 0xa970b999UL, 0xbb6bae84UL, 0xb562a38fUL, 0x9f5d80beUL, 0x91548db5UL, 0x834f9aa8UL, 0x8d4697a3UL +++}; +++ +++static const ulong32 Tks1[] = { +++0x00000000UL, 0x0b0e090dUL, 0x161c121aUL, 0x1d121b17UL, 0x2c382434UL, 0x27362d39UL, 0x3a24362eUL, 0x312a3f23UL, +++0x58704868UL, 0x537e4165UL, 0x4e6c5a72UL, 0x4562537fUL, 0x74486c5cUL, 0x7f466551UL, 0x62547e46UL, 0x695a774bUL, +++0xb0e090d0UL, 0xbbee99ddUL, 0xa6fc82caUL, 0xadf28bc7UL, 0x9cd8b4e4UL, 0x97d6bde9UL, 0x8ac4a6feUL, 0x81caaff3UL, +++0xe890d8b8UL, 0xe39ed1b5UL, 0xfe8ccaa2UL, 0xf582c3afUL, 0xc4a8fc8cUL, 0xcfa6f581UL, 0xd2b4ee96UL, 0xd9bae79bUL, +++0x7bdb3bbbUL, 0x70d532b6UL, 0x6dc729a1UL, 0x66c920acUL, 0x57e31f8fUL, 0x5ced1682UL, 0x41ff0d95UL, 0x4af10498UL, +++0x23ab73d3UL, 0x28a57adeUL, 0x35b761c9UL, 0x3eb968c4UL, 0x0f9357e7UL, 0x049d5eeaUL, 0x198f45fdUL, 0x12814cf0UL, +++0xcb3bab6bUL, 0xc035a266UL, 0xdd27b971UL, 0xd629b07cUL, 0xe7038f5fUL, 0xec0d8652UL, 0xf11f9d45UL, 0xfa119448UL, +++0x934be303UL, 0x9845ea0eUL, 0x8557f119UL, 0x8e59f814UL, 0xbf73c737UL, 0xb47dce3aUL, 0xa96fd52dUL, 0xa261dc20UL, +++0xf6ad766dUL, 0xfda37f60UL, 0xe0b16477UL, 0xebbf6d7aUL, 0xda955259UL, 0xd19b5b54UL, 0xcc894043UL, 0xc787494eUL, +++0xaedd3e05UL, 0xa5d33708UL, 0xb8c12c1fUL, 0xb3cf2512UL, 0x82e51a31UL, 0x89eb133cUL, 0x94f9082bUL, 0x9ff70126UL, +++0x464de6bdUL, 0x4d43efb0UL, 0x5051f4a7UL, 0x5b5ffdaaUL, 0x6a75c289UL, 0x617bcb84UL, 0x7c69d093UL, 0x7767d99eUL, +++0x1e3daed5UL, 0x1533a7d8UL, 0x0821bccfUL, 0x032fb5c2UL, 0x32058ae1UL, 0x390b83ecUL, 0x241998fbUL, 0x2f1791f6UL, +++0x8d764dd6UL, 0x867844dbUL, 0x9b6a5fccUL, 0x906456c1UL, 0xa14e69e2UL, 0xaa4060efUL, 0xb7527bf8UL, 0xbc5c72f5UL, +++0xd50605beUL, 0xde080cb3UL, 0xc31a17a4UL, 0xc8141ea9UL, 0xf93e218aUL, 0xf2302887UL, 0xef223390UL, 0xe42c3a9dUL, +++0x3d96dd06UL, 0x3698d40bUL, 0x2b8acf1cUL, 0x2084c611UL, 0x11aef932UL, 0x1aa0f03fUL, 0x07b2eb28UL, 0x0cbce225UL, +++0x65e6956eUL, 0x6ee89c63UL, 0x73fa8774UL, 0x78f48e79UL, 0x49deb15aUL, 0x42d0b857UL, 0x5fc2a340UL, 0x54ccaa4dUL, +++0xf741ecdaUL, 0xfc4fe5d7UL, 0xe15dfec0UL, 0xea53f7cdUL, 0xdb79c8eeUL, 0xd077c1e3UL, 0xcd65daf4UL, 0xc66bd3f9UL, +++0xaf31a4b2UL, 0xa43fadbfUL, 0xb92db6a8UL, 0xb223bfa5UL, 0x83098086UL, 0x8807898bUL, 0x9515929cUL, 0x9e1b9b91UL, +++0x47a17c0aUL, 0x4caf7507UL, 0x51bd6e10UL, 0x5ab3671dUL, 0x6b99583eUL, 0x60975133UL, 0x7d854a24UL, 0x768b4329UL, +++0x1fd13462UL, 0x14df3d6fUL, 0x09cd2678UL, 0x02c32f75UL, 0x33e91056UL, 0x38e7195bUL, 0x25f5024cUL, 0x2efb0b41UL, +++0x8c9ad761UL, 0x8794de6cUL, 0x9a86c57bUL, 0x9188cc76UL, 0xa0a2f355UL, 0xabacfa58UL, 0xb6bee14fUL, 0xbdb0e842UL, +++0xd4ea9f09UL, 0xdfe49604UL, 0xc2f68d13UL, 0xc9f8841eUL, 0xf8d2bb3dUL, 0xf3dcb230UL, 0xeecea927UL, 0xe5c0a02aUL, +++0x3c7a47b1UL, 0x37744ebcUL, 0x2a6655abUL, 0x21685ca6UL, 0x10426385UL, 0x1b4c6a88UL, 0x065e719fUL, 0x0d507892UL, +++0x640a0fd9UL, 0x6f0406d4UL, 0x72161dc3UL, 0x791814ceUL, 0x48322bedUL, 0x433c22e0UL, 0x5e2e39f7UL, 0x552030faUL, +++0x01ec9ab7UL, 0x0ae293baUL, 0x17f088adUL, 0x1cfe81a0UL, 0x2dd4be83UL, 0x26dab78eUL, 0x3bc8ac99UL, 0x30c6a594UL, +++0x599cd2dfUL, 0x5292dbd2UL, 0x4f80c0c5UL, 0x448ec9c8UL, 0x75a4f6ebUL, 0x7eaaffe6UL, 0x63b8e4f1UL, 0x68b6edfcUL, +++0xb10c0a67UL, 0xba02036aUL, 0xa710187dUL, 0xac1e1170UL, 0x9d342e53UL, 0x963a275eUL, 0x8b283c49UL, 0x80263544UL, +++0xe97c420fUL, 0xe2724b02UL, 0xff605015UL, 0xf46e5918UL, 0xc544663bUL, 0xce4a6f36UL, 0xd3587421UL, 0xd8567d2cUL, +++0x7a37a10cUL, 0x7139a801UL, 0x6c2bb316UL, 0x6725ba1bUL, 0x560f8538UL, 0x5d018c35UL, 0x40139722UL, 0x4b1d9e2fUL, +++0x2247e964UL, 0x2949e069UL, 0x345bfb7eUL, 0x3f55f273UL, 0x0e7fcd50UL, 0x0571c45dUL, 0x1863df4aUL, 0x136dd647UL, +++0xcad731dcUL, 0xc1d938d1UL, 0xdccb23c6UL, 0xd7c52acbUL, 0xe6ef15e8UL, 0xede11ce5UL, 0xf0f307f2UL, 0xfbfd0effUL, +++0x92a779b4UL, 0x99a970b9UL, 0x84bb6baeUL, 0x8fb562a3UL, 0xbe9f5d80UL, 0xb591548dUL, 0xa8834f9aUL, 0xa38d4697UL +++}; +++ +++static const ulong32 Tks2[] = { +++0x00000000UL, 0x0d0b0e09UL, 0x1a161c12UL, 0x171d121bUL, 0x342c3824UL, 0x3927362dUL, 0x2e3a2436UL, 0x23312a3fUL, +++0x68587048UL, 0x65537e41UL, 0x724e6c5aUL, 0x7f456253UL, 0x5c74486cUL, 0x517f4665UL, 0x4662547eUL, 0x4b695a77UL, +++0xd0b0e090UL, 0xddbbee99UL, 0xcaa6fc82UL, 0xc7adf28bUL, 0xe49cd8b4UL, 0xe997d6bdUL, 0xfe8ac4a6UL, 0xf381caafUL, +++0xb8e890d8UL, 0xb5e39ed1UL, 0xa2fe8ccaUL, 0xaff582c3UL, 0x8cc4a8fcUL, 0x81cfa6f5UL, 0x96d2b4eeUL, 0x9bd9bae7UL, +++0xbb7bdb3bUL, 0xb670d532UL, 0xa16dc729UL, 0xac66c920UL, 0x8f57e31fUL, 0x825ced16UL, 0x9541ff0dUL, 0x984af104UL, +++0xd323ab73UL, 0xde28a57aUL, 0xc935b761UL, 0xc43eb968UL, 0xe70f9357UL, 0xea049d5eUL, 0xfd198f45UL, 0xf012814cUL, +++0x6bcb3babUL, 0x66c035a2UL, 0x71dd27b9UL, 0x7cd629b0UL, 0x5fe7038fUL, 0x52ec0d86UL, 0x45f11f9dUL, 0x48fa1194UL, +++0x03934be3UL, 0x0e9845eaUL, 0x198557f1UL, 0x148e59f8UL, 0x37bf73c7UL, 0x3ab47dceUL, 0x2da96fd5UL, 0x20a261dcUL, +++0x6df6ad76UL, 0x60fda37fUL, 0x77e0b164UL, 0x7aebbf6dUL, 0x59da9552UL, 0x54d19b5bUL, 0x43cc8940UL, 0x4ec78749UL, +++0x05aedd3eUL, 0x08a5d337UL, 0x1fb8c12cUL, 0x12b3cf25UL, 0x3182e51aUL, 0x3c89eb13UL, 0x2b94f908UL, 0x269ff701UL, +++0xbd464de6UL, 0xb04d43efUL, 0xa75051f4UL, 0xaa5b5ffdUL, 0x896a75c2UL, 0x84617bcbUL, 0x937c69d0UL, 0x9e7767d9UL, +++0xd51e3daeUL, 0xd81533a7UL, 0xcf0821bcUL, 0xc2032fb5UL, 0xe132058aUL, 0xec390b83UL, 0xfb241998UL, 0xf62f1791UL, +++0xd68d764dUL, 0xdb867844UL, 0xcc9b6a5fUL, 0xc1906456UL, 0xe2a14e69UL, 0xefaa4060UL, 0xf8b7527bUL, 0xf5bc5c72UL, +++0xbed50605UL, 0xb3de080cUL, 0xa4c31a17UL, 0xa9c8141eUL, 0x8af93e21UL, 0x87f23028UL, 0x90ef2233UL, 0x9de42c3aUL, +++0x063d96ddUL, 0x0b3698d4UL, 0x1c2b8acfUL, 0x112084c6UL, 0x3211aef9UL, 0x3f1aa0f0UL, 0x2807b2ebUL, 0x250cbce2UL, +++0x6e65e695UL, 0x636ee89cUL, 0x7473fa87UL, 0x7978f48eUL, 0x5a49deb1UL, 0x5742d0b8UL, 0x405fc2a3UL, 0x4d54ccaaUL, +++0xdaf741ecUL, 0xd7fc4fe5UL, 0xc0e15dfeUL, 0xcdea53f7UL, 0xeedb79c8UL, 0xe3d077c1UL, 0xf4cd65daUL, 0xf9c66bd3UL, +++0xb2af31a4UL, 0xbfa43fadUL, 0xa8b92db6UL, 0xa5b223bfUL, 0x86830980UL, 0x8b880789UL, 0x9c951592UL, 0x919e1b9bUL, +++0x0a47a17cUL, 0x074caf75UL, 0x1051bd6eUL, 0x1d5ab367UL, 0x3e6b9958UL, 0x33609751UL, 0x247d854aUL, 0x29768b43UL, +++0x621fd134UL, 0x6f14df3dUL, 0x7809cd26UL, 0x7502c32fUL, 0x5633e910UL, 0x5b38e719UL, 0x4c25f502UL, 0x412efb0bUL, +++0x618c9ad7UL, 0x6c8794deUL, 0x7b9a86c5UL, 0x769188ccUL, 0x55a0a2f3UL, 0x58abacfaUL, 0x4fb6bee1UL, 0x42bdb0e8UL, +++0x09d4ea9fUL, 0x04dfe496UL, 0x13c2f68dUL, 0x1ec9f884UL, 0x3df8d2bbUL, 0x30f3dcb2UL, 0x27eecea9UL, 0x2ae5c0a0UL, +++0xb13c7a47UL, 0xbc37744eUL, 0xab2a6655UL, 0xa621685cUL, 0x85104263UL, 0x881b4c6aUL, 0x9f065e71UL, 0x920d5078UL, +++0xd9640a0fUL, 0xd46f0406UL, 0xc372161dUL, 0xce791814UL, 0xed48322bUL, 0xe0433c22UL, 0xf75e2e39UL, 0xfa552030UL, +++0xb701ec9aUL, 0xba0ae293UL, 0xad17f088UL, 0xa01cfe81UL, 0x832dd4beUL, 0x8e26dab7UL, 0x993bc8acUL, 0x9430c6a5UL, +++0xdf599cd2UL, 0xd25292dbUL, 0xc54f80c0UL, 0xc8448ec9UL, 0xeb75a4f6UL, 0xe67eaaffUL, 0xf163b8e4UL, 0xfc68b6edUL, +++0x67b10c0aUL, 0x6aba0203UL, 0x7da71018UL, 0x70ac1e11UL, 0x539d342eUL, 0x5e963a27UL, 0x498b283cUL, 0x44802635UL, +++0x0fe97c42UL, 0x02e2724bUL, 0x15ff6050UL, 0x18f46e59UL, 0x3bc54466UL, 0x36ce4a6fUL, 0x21d35874UL, 0x2cd8567dUL, +++0x0c7a37a1UL, 0x017139a8UL, 0x166c2bb3UL, 0x1b6725baUL, 0x38560f85UL, 0x355d018cUL, 0x22401397UL, 0x2f4b1d9eUL, +++0x642247e9UL, 0x692949e0UL, 0x7e345bfbUL, 0x733f55f2UL, 0x500e7fcdUL, 0x5d0571c4UL, 0x4a1863dfUL, 0x47136dd6UL, +++0xdccad731UL, 0xd1c1d938UL, 0xc6dccb23UL, 0xcbd7c52aUL, 0xe8e6ef15UL, 0xe5ede11cUL, 0xf2f0f307UL, 0xfffbfd0eUL, +++0xb492a779UL, 0xb999a970UL, 0xae84bb6bUL, 0xa38fb562UL, 0x80be9f5dUL, 0x8db59154UL, 0x9aa8834fUL, 0x97a38d46UL +++}; +++ +++static const ulong32 Tks3[] = { +++0x00000000UL, 0x090d0b0eUL, 0x121a161cUL, 0x1b171d12UL, 0x24342c38UL, 0x2d392736UL, 0x362e3a24UL, 0x3f23312aUL, +++0x48685870UL, 0x4165537eUL, 0x5a724e6cUL, 0x537f4562UL, 0x6c5c7448UL, 0x65517f46UL, 0x7e466254UL, 0x774b695aUL, +++0x90d0b0e0UL, 0x99ddbbeeUL, 0x82caa6fcUL, 0x8bc7adf2UL, 0xb4e49cd8UL, 0xbde997d6UL, 0xa6fe8ac4UL, 0xaff381caUL, +++0xd8b8e890UL, 0xd1b5e39eUL, 0xcaa2fe8cUL, 0xc3aff582UL, 0xfc8cc4a8UL, 0xf581cfa6UL, 0xee96d2b4UL, 0xe79bd9baUL, +++0x3bbb7bdbUL, 0x32b670d5UL, 0x29a16dc7UL, 0x20ac66c9UL, 0x1f8f57e3UL, 0x16825cedUL, 0x0d9541ffUL, 0x04984af1UL, +++0x73d323abUL, 0x7ade28a5UL, 0x61c935b7UL, 0x68c43eb9UL, 0x57e70f93UL, 0x5eea049dUL, 0x45fd198fUL, 0x4cf01281UL, +++0xab6bcb3bUL, 0xa266c035UL, 0xb971dd27UL, 0xb07cd629UL, 0x8f5fe703UL, 0x8652ec0dUL, 0x9d45f11fUL, 0x9448fa11UL, +++0xe303934bUL, 0xea0e9845UL, 0xf1198557UL, 0xf8148e59UL, 0xc737bf73UL, 0xce3ab47dUL, 0xd52da96fUL, 0xdc20a261UL, +++0x766df6adUL, 0x7f60fda3UL, 0x6477e0b1UL, 0x6d7aebbfUL, 0x5259da95UL, 0x5b54d19bUL, 0x4043cc89UL, 0x494ec787UL, +++0x3e05aeddUL, 0x3708a5d3UL, 0x2c1fb8c1UL, 0x2512b3cfUL, 0x1a3182e5UL, 0x133c89ebUL, 0x082b94f9UL, 0x01269ff7UL, +++0xe6bd464dUL, 0xefb04d43UL, 0xf4a75051UL, 0xfdaa5b5fUL, 0xc2896a75UL, 0xcb84617bUL, 0xd0937c69UL, 0xd99e7767UL, +++0xaed51e3dUL, 0xa7d81533UL, 0xbccf0821UL, 0xb5c2032fUL, 0x8ae13205UL, 0x83ec390bUL, 0x98fb2419UL, 0x91f62f17UL, +++0x4dd68d76UL, 0x44db8678UL, 0x5fcc9b6aUL, 0x56c19064UL, 0x69e2a14eUL, 0x60efaa40UL, 0x7bf8b752UL, 0x72f5bc5cUL, +++0x05bed506UL, 0x0cb3de08UL, 0x17a4c31aUL, 0x1ea9c814UL, 0x218af93eUL, 0x2887f230UL, 0x3390ef22UL, 0x3a9de42cUL, +++0xdd063d96UL, 0xd40b3698UL, 0xcf1c2b8aUL, 0xc6112084UL, 0xf93211aeUL, 0xf03f1aa0UL, 0xeb2807b2UL, 0xe2250cbcUL, +++0x956e65e6UL, 0x9c636ee8UL, 0x877473faUL, 0x8e7978f4UL, 0xb15a49deUL, 0xb85742d0UL, 0xa3405fc2UL, 0xaa4d54ccUL, +++0xecdaf741UL, 0xe5d7fc4fUL, 0xfec0e15dUL, 0xf7cdea53UL, 0xc8eedb79UL, 0xc1e3d077UL, 0xdaf4cd65UL, 0xd3f9c66bUL, +++0xa4b2af31UL, 0xadbfa43fUL, 0xb6a8b92dUL, 0xbfa5b223UL, 0x80868309UL, 0x898b8807UL, 0x929c9515UL, 0x9b919e1bUL, +++0x7c0a47a1UL, 0x75074cafUL, 0x6e1051bdUL, 0x671d5ab3UL, 0x583e6b99UL, 0x51336097UL, 0x4a247d85UL, 0x4329768bUL, +++0x34621fd1UL, 0x3d6f14dfUL, 0x267809cdUL, 0x2f7502c3UL, 0x105633e9UL, 0x195b38e7UL, 0x024c25f5UL, 0x0b412efbUL, +++0xd7618c9aUL, 0xde6c8794UL, 0xc57b9a86UL, 0xcc769188UL, 0xf355a0a2UL, 0xfa58abacUL, 0xe14fb6beUL, 0xe842bdb0UL, +++0x9f09d4eaUL, 0x9604dfe4UL, 0x8d13c2f6UL, 0x841ec9f8UL, 0xbb3df8d2UL, 0xb230f3dcUL, 0xa927eeceUL, 0xa02ae5c0UL, +++0x47b13c7aUL, 0x4ebc3774UL, 0x55ab2a66UL, 0x5ca62168UL, 0x63851042UL, 0x6a881b4cUL, 0x719f065eUL, 0x78920d50UL, +++0x0fd9640aUL, 0x06d46f04UL, 0x1dc37216UL, 0x14ce7918UL, 0x2bed4832UL, 0x22e0433cUL, 0x39f75e2eUL, 0x30fa5520UL, +++0x9ab701ecUL, 0x93ba0ae2UL, 0x88ad17f0UL, 0x81a01cfeUL, 0xbe832dd4UL, 0xb78e26daUL, 0xac993bc8UL, 0xa59430c6UL, +++0xd2df599cUL, 0xdbd25292UL, 0xc0c54f80UL, 0xc9c8448eUL, 0xf6eb75a4UL, 0xffe67eaaUL, 0xe4f163b8UL, 0xedfc68b6UL, +++0x0a67b10cUL, 0x036aba02UL, 0x187da710UL, 0x1170ac1eUL, 0x2e539d34UL, 0x275e963aUL, 0x3c498b28UL, 0x35448026UL, +++0x420fe97cUL, 0x4b02e272UL, 0x5015ff60UL, 0x5918f46eUL, 0x663bc544UL, 0x6f36ce4aUL, 0x7421d358UL, 0x7d2cd856UL, +++0xa10c7a37UL, 0xa8017139UL, 0xb3166c2bUL, 0xba1b6725UL, 0x8538560fUL, 0x8c355d01UL, 0x97224013UL, 0x9e2f4b1dUL, +++0xe9642247UL, 0xe0692949UL, 0xfb7e345bUL, 0xf2733f55UL, 0xcd500e7fUL, 0xc45d0571UL, 0xdf4a1863UL, 0xd647136dUL, +++0x31dccad7UL, 0x38d1c1d9UL, 0x23c6dccbUL, 0x2acbd7c5UL, 0x15e8e6efUL, 0x1ce5ede1UL, 0x07f2f0f3UL, 0x0efffbfdUL, +++0x79b492a7UL, 0x70b999a9UL, 0x6bae84bbUL, 0x62a38fb5UL, 0x5d80be9fUL, 0x548db591UL, 0x4f9aa883UL, 0x4697a38dUL +++}; +++ +++#endif /* SMALL CODE */ +++ +++static const ulong32 rcon[] = { +++ 0x01000000UL, 0x02000000UL, 0x04000000UL, 0x08000000UL, +++ 0x10000000UL, 0x20000000UL, 0x40000000UL, 0x80000000UL, +++ 0x1B000000UL, 0x36000000UL, /* for 128-bit blocks, AES never uses more than 10 rcon values */ +++}; +++ +++ +++static int aes_setup(const unsigned char *key, int keylen, int rounds, aes_CBC *skey); +++static void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey); +++static void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey); +++ +++#ifdef CLEAN_STACK +++static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey); +++static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey); +++#endif +++ +++int matrixAesInit(sslCipherContext_t *ctx, unsigned char *IV, unsigned char *key, int keylen) +++{ +++ int x, err; +++ +++ if (IV == NULL || key == NULL || ctx == NULL) { +++ return -1; +++ } +++/* +++ setup cipher +++ */ +++ if ((err = aes_setup(key, keylen, 0, &ctx->aes)) != CRYPT_OK) { +++ return -1; +++ } +++/* +++ copy IV +++ */ +++ ctx->aes.blocklen = 16; +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ ctx->aes.IV[x] = IV[x]; +++ } +++ return 0; +++} +++ +++int matrixAesEncrypt(sslCipherContext_t *ctx, unsigned char *pt, unsigned char *ct, int len) +++{ +++ int x, i; +++ unsigned char tmp[MAXBLOCKSIZE]; +++ +++ if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) { +++ matrixStrDebugMsg("Bad parameters to matrixAesEncrypt\n", NULL); +++ return -1; +++ } +++ +++/* +++ is blocklen valid? +++ */ +++ if (ctx->aes.blocklen < 0 || ctx->aes.blocklen > +++ (int)sizeof(ctx->aes.IV)) { +++ return -1; +++ } +++ +++ for (i = 0; i < len; i += ctx->aes.blocklen) { +++/* +++ xor IV against plaintext +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ tmp[x] = pt[x] ^ ctx->aes.IV[x]; +++ } +++/* +++ encrypt +++ */ +++ aes_ecb_encrypt(tmp, ct, &ctx->aes); +++ +++/* +++ store IV [ciphertext] for a future block +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ ctx->aes.IV[x] = ct[x]; +++ } +++ ct += ctx->aes.blocklen; +++ pt += ctx->aes.blocklen; +++ } +++ +++#ifdef CLEAN_STACK +++ zeromem(tmp, sizeof(tmp)); +++#endif +++ return len; +++} +++ +++int matrixAesDecrypt(sslCipherContext_t *ctx, unsigned char *ct, unsigned char *pt, int len) +++{ +++ int x, i; +++ unsigned char tmp[MAXBLOCKSIZE], tmp2[MAXBLOCKSIZE]; +++ +++ if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) { +++ matrixStrDebugMsg("Bad parameters to matrixAesDecrypt\n", NULL); +++ return -1; +++ } +++ +++/* +++ is blocklen valid? +++ */ +++ if (ctx->aes.blocklen < 0 || ctx->aes.blocklen > +++ (int)sizeof(ctx->aes.IV)) { +++ return -1; +++ } +++ for (i = 0; i < len; i += ctx->aes.blocklen) { +++/* +++ decrypt the block from ct into tmp +++ */ +++ aes_ecb_decrypt(ct, tmp, &ctx->aes); +++/* +++ xor IV against the plaintext of the previous step +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++/* +++ copy CT in case ct == pt +++ */ +++ tmp2[x] = ct[x]; +++/* +++ actually decrypt the byte +++ */ +++ pt[x] = tmp[x] ^ ctx->aes.IV[x]; +++ } +++/* +++ replace IV with this current ciphertext +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ ctx->aes.IV[x] = tmp2[x]; +++ } +++ ct += ctx->aes.blocklen; +++ pt += ctx->aes.blocklen; +++ } +++#ifdef CLEAN_STACK +++ zeromem(tmp, sizeof(tmp)); +++ zeromem(tmp2, sizeof(tmp2)); +++#endif +++ return len; +++} +++ +++int aes_setup(const unsigned char *key, int keylen, int rounds, aes_CBC *skey) +++{ +++ int i, j; +++ ulong32 temp, *rk, *rrk; +++ +++ if (key == NULL || skey == NULL) { +++ return -1; +++ } +++ +++ if (keylen != 16 && keylen != 24 && keylen != 32) { +++ return CRYPT_INVALID_KEYSIZE; +++ } +++ +++ if (rounds != 0 && rounds != (10 + ((keylen/8)-2)*2)) { +++ return CRYPT_INVALID_ROUNDS; +++ } +++ +++ skey->key.Nr = 10 + ((keylen/8)-2)*2; +++ +++/* +++ setup the forward key +++ */ +++ i = 0; +++ rk = skey->key.eK; +++ LOAD32H(rk[0], key ); +++ LOAD32H(rk[1], key + 4); +++ LOAD32H(rk[2], key + 8); +++ LOAD32H(rk[3], key + 12); +++ if (keylen == 16) { +++ j = 44; +++ for (;;) { +++ temp = rk[3]; +++ rk[4] = rk[0] ^ +++ (Te4_3[byte(temp, 2)]) ^ +++ (Te4_2[byte(temp, 1)]) ^ +++ (Te4_1[byte(temp, 0)]) ^ +++ (Te4_0[byte(temp, 3)]) ^ +++ rcon[i]; +++ rk[5] = rk[1] ^ rk[4]; +++ rk[6] = rk[2] ^ rk[5]; +++ rk[7] = rk[3] ^ rk[6]; +++ if (++i == 10) { +++ break; +++ } +++ rk += 4; +++ } +++ } else if (keylen == 24) { +++ j = 52; +++ LOAD32H(rk[4], key + 16); +++ LOAD32H(rk[5], key + 20); +++ for (;;) { +++ #ifdef _MSC_VER +++ temp = skey->key.eK[rk - skey->key.eK + 5]; +++ #else +++ temp = rk[5]; +++ #endif /* _MSC_VER */ +++ rk[ 6] = rk[ 0] ^ +++ (Te4_3[byte(temp, 2)]) ^ +++ (Te4_2[byte(temp, 1)]) ^ +++ (Te4_1[byte(temp, 0)]) ^ +++ (Te4_0[byte(temp, 3)]) ^ +++ rcon[i]; +++ rk[ 7] = rk[ 1] ^ rk[ 6]; +++ rk[ 8] = rk[ 2] ^ rk[ 7]; +++ rk[ 9] = rk[ 3] ^ rk[ 8]; +++ if (++i == 8) { +++ break; +++ } +++ rk[10] = rk[ 4] ^ rk[ 9]; +++ rk[11] = rk[ 5] ^ rk[10]; +++ rk += 6; +++ } +++ } else if (keylen == 32) { +++ j = 60; +++ LOAD32H(rk[4], key + 16); +++ LOAD32H(rk[5], key + 20); +++ LOAD32H(rk[6], key + 24); +++ LOAD32H(rk[7], key + 28); +++ for (;;) { +++ #ifdef _MSC_VER +++ temp = skey->key.eK[rk - skey->key.eK + 7]; +++ #else +++ temp = rk[7]; +++ #endif /* _MSC_VER */ +++ rk[ 8] = rk[ 0] ^ +++ (Te4_3[byte(temp, 2)]) ^ +++ (Te4_2[byte(temp, 1)]) ^ +++ (Te4_1[byte(temp, 0)]) ^ +++ (Te4_0[byte(temp, 3)]) ^ +++ rcon[i]; +++ rk[ 9] = rk[ 1] ^ rk[ 8]; +++ rk[10] = rk[ 2] ^ rk[ 9]; +++ rk[11] = rk[ 3] ^ rk[10]; +++ if (++i == 7) { +++ break; +++ } +++ temp = rk[11]; +++ rk[12] = rk[ 4] ^ +++ (Te4_3[byte(temp, 3)]) ^ +++ (Te4_2[byte(temp, 2)]) ^ +++ (Te4_1[byte(temp, 1)]) ^ +++ (Te4_0[byte(temp, 0)]); +++ rk[13] = rk[ 5] ^ rk[12]; +++ rk[14] = rk[ 6] ^ rk[13]; +++ rk[15] = rk[ 7] ^ rk[14]; +++ rk += 8; +++ } +++ } else { +++/* +++ this can't happen +++ */ +++ j = 4; +++ } +++ +++/* +++ setup the inverse key now +++ */ +++ rk = skey->key.dK; +++ rrk = skey->key.eK + j - 4; +++ +++/* +++ apply the inverse MixColumn transform to all round keys but the first and the last: +++ */ +++ /* copy first */ +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk = *rrk; +++ rk -= 3; rrk -= 3; +++ +++ for (i = 1; i < skey->key.Nr; i++) { +++ rrk -= 4; +++ rk += 4; +++#ifdef SMALL_CODE +++ temp = rrk[0]; +++ rk[0] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++ temp = rrk[1]; +++ rk[1] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++ temp = rrk[2]; +++ rk[2] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++ temp = rrk[3]; +++ rk[3] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++#else /* SMALL CODE */ +++ temp = rrk[0]; +++ rk[0] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++ temp = rrk[1]; +++ rk[1] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++ temp = rrk[2]; +++ rk[2] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++ temp = rrk[3]; +++ rk[3] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++#endif /* SMALL CODE */ +++ } +++ +++ /* copy last */ +++ rrk -= 4; +++ rk += 4; +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk = *rrk; +++ +++ return CRYPT_OK; +++} +++ +++#ifdef CLEAN_STACK +++void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++{ +++ _aes_ecb_encrypt(pt, ct, skey); +++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); +++} +++#endif /* CLEAN_STACK */ +++ +++#ifdef CLEAN_STACK +++static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++#else +++void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++#endif /* CLEAN_STACK */ +++{ +++ ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk; +++ int Nr, r; +++ +++ if (pt == NULL || ct == NULL || skey == NULL) { +++ return; +++ } +++ +++ Nr = skey->key.Nr; +++ rk = skey->key.eK; +++ +++/* +++ map byte array block to cipher state +++ and add initial round key: +++ */ +++ LOAD32H(s0, pt ); s0 ^= rk[0]; +++ LOAD32H(s1, pt + 4); s1 ^= rk[1]; +++ LOAD32H(s2, pt + 8); s2 ^= rk[2]; +++ LOAD32H(s3, pt + 12); s3 ^= rk[3]; +++ +++/* +++ Nr - 1 full rounds: +++ */ +++ r = Nr >> 1; +++ for (;;) { +++ +++ t0 = +++ Te0(byte(s0, 3)) ^ +++ Te1(byte(s1, 2)) ^ +++ Te2(byte(s2, 1)) ^ +++ Te3(byte(s3, 0)) ^ +++ rk[4]; +++ t1 = +++ Te0(byte(s1, 3)) ^ +++ Te1(byte(s2, 2)) ^ +++ Te2(byte(s3, 1)) ^ +++ Te3(byte(s0, 0)) ^ +++ rk[5]; +++ t2 = +++ Te0(byte(s2, 3)) ^ +++ Te1(byte(s3, 2)) ^ +++ Te2(byte(s0, 1)) ^ +++ Te3(byte(s1, 0)) ^ +++ rk[6]; +++ t3 = +++ Te0(byte(s3, 3)) ^ +++ Te1(byte(s0, 2)) ^ +++ Te2(byte(s1, 1)) ^ +++ Te3(byte(s2, 0)) ^ +++ rk[7]; +++ +++ rk += 8; +++ if (--r == 0) { +++ break; +++ } +++ +++ s0 = +++ Te0(byte(t0, 3)) ^ +++ Te1(byte(t1, 2)) ^ +++ Te2(byte(t2, 1)) ^ +++ Te3(byte(t3, 0)) ^ +++ rk[0]; +++ s1 = +++ Te0(byte(t1, 3)) ^ +++ Te1(byte(t2, 2)) ^ +++ Te2(byte(t3, 1)) ^ +++ Te3(byte(t0, 0)) ^ +++ rk[1]; +++ s2 = +++ Te0(byte(t2, 3)) ^ +++ Te1(byte(t3, 2)) ^ +++ Te2(byte(t0, 1)) ^ +++ Te3(byte(t1, 0)) ^ +++ rk[2]; +++ s3 = +++ Te0(byte(t3, 3)) ^ +++ Te1(byte(t0, 2)) ^ +++ Te2(byte(t1, 1)) ^ +++ Te3(byte(t2, 0)) ^ +++ rk[3]; +++ } +++/* +++ apply last round and map cipher state to byte array block: +++ */ +++ s0 = +++ (Te4_3[byte(t0, 3)]) ^ +++ (Te4_2[byte(t1, 2)]) ^ +++ (Te4_1[byte(t2, 1)]) ^ +++ (Te4_0[byte(t3, 0)]) ^ +++ rk[0]; +++ STORE32H(s0, ct); +++ s1 = +++ (Te4_3[byte(t1, 3)]) ^ +++ (Te4_2[byte(t2, 2)]) ^ +++ (Te4_1[byte(t3, 1)]) ^ +++ (Te4_0[byte(t0, 0)]) ^ +++ rk[1]; +++ STORE32H(s1, ct+4); +++ s2 = +++ (Te4_3[byte(t2, 3)]) ^ +++ (Te4_2[byte(t3, 2)]) ^ +++ (Te4_1[byte(t0, 1)]) ^ +++ (Te4_0[byte(t1, 0)]) ^ +++ rk[2]; +++ STORE32H(s2, ct+8); +++ s3 = +++ (Te4_3[byte(t3, 3)]) ^ +++ (Te4_2[byte(t0, 2)]) ^ +++ (Te4_1[byte(t1, 1)]) ^ +++ (Te4_0[byte(t2, 0)]) ^ +++ rk[3]; +++ STORE32H(s3, ct+12); +++} +++ +++#ifdef CLEAN_STACK +++void aes_ecb_decrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++{ +++ _aes_ecb_decrypt(pt, ct, skey); +++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); +++} +++#endif /* CLEAN_STACK */ +++ +++#ifdef CLEAN_STACK +++static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) +++#else +++void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) +++#endif /* CLEAN_STACK */ +++{ +++ ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk; +++ int Nr, r; +++ +++ if (pt == NULL || ct == NULL || skey == NULL) { +++ return; +++ } +++ +++ Nr = skey->key.Nr; +++ rk = skey->key.dK; +++ +++/* +++ map byte array block to cipher state and add initial round key: +++ */ +++ LOAD32H(s0, ct ); s0 ^= rk[0]; +++ LOAD32H(s1, ct + 4); s1 ^= rk[1]; +++ LOAD32H(s2, ct + 8); s2 ^= rk[2]; +++ LOAD32H(s3, ct + 12); s3 ^= rk[3]; +++ +++/* +++ Nr - 1 full rounds: +++ */ +++ r = Nr >> 1; +++ for (;;) { +++ +++ t0 = +++ Td0(byte(s0, 3)) ^ +++ Td1(byte(s3, 2)) ^ +++ Td2(byte(s2, 1)) ^ +++ Td3(byte(s1, 0)) ^ +++ rk[4]; +++ t1 = +++ Td0(byte(s1, 3)) ^ +++ Td1(byte(s0, 2)) ^ +++ Td2(byte(s3, 1)) ^ +++ Td3(byte(s2, 0)) ^ +++ rk[5]; +++ t2 = +++ Td0(byte(s2, 3)) ^ +++ Td1(byte(s1, 2)) ^ +++ Td2(byte(s0, 1)) ^ +++ Td3(byte(s3, 0)) ^ +++ rk[6]; +++ t3 = +++ Td0(byte(s3, 3)) ^ +++ Td1(byte(s2, 2)) ^ +++ Td2(byte(s1, 1)) ^ +++ Td3(byte(s0, 0)) ^ +++ rk[7]; +++ +++ rk += 8; +++ if (--r == 0) { +++ break; +++ } +++ +++ s0 = +++ Td0(byte(t0, 3)) ^ +++ Td1(byte(t3, 2)) ^ +++ Td2(byte(t2, 1)) ^ +++ Td3(byte(t1, 0)) ^ +++ rk[0]; +++ s1 = +++ Td0(byte(t1, 3)) ^ +++ Td1(byte(t0, 2)) ^ +++ Td2(byte(t3, 1)) ^ +++ Td3(byte(t2, 0)) ^ +++ rk[1]; +++ s2 = +++ Td0(byte(t2, 3)) ^ +++ Td1(byte(t1, 2)) ^ +++ Td2(byte(t0, 1)) ^ +++ Td3(byte(t3, 0)) ^ +++ rk[2]; +++ s3 = +++ Td0(byte(t3, 3)) ^ +++ Td1(byte(t2, 2)) ^ +++ Td2(byte(t1, 1)) ^ +++ Td3(byte(t0, 0)) ^ +++ rk[3]; +++ } +++ +++/* +++ apply last round and map cipher state to byte array block: +++ */ +++ s0 = +++ (Td4[byte(t0, 3)] & 0xff000000) ^ +++ (Td4[byte(t3, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t2, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t1, 0)] & 0x000000ff) ^ +++ rk[0]; +++ STORE32H(s0, pt); +++ s1 = +++ (Td4[byte(t1, 3)] & 0xff000000) ^ +++ (Td4[byte(t0, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t3, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t2, 0)] & 0x000000ff) ^ +++ rk[1]; +++ STORE32H(s1, pt+4); +++ s2 = +++ (Td4[byte(t2, 3)] & 0xff000000) ^ +++ (Td4[byte(t1, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t0, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t3, 0)] & 0x000000ff) ^ +++ rk[2]; +++ STORE32H(s2, pt+8); +++ s3 = +++ (Td4[byte(t3, 3)] & 0xff000000) ^ +++ (Td4[byte(t2, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t1, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t0, 0)] & 0x000000ff) ^ +++ rk[3]; +++ STORE32H(s3, pt+12); +++} +++ +++#ifdef CLEAN_STACK +++void aes(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) +++{ +++ _aes_ecb_decrypt(ct, pt, skey); +++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); +++} +++#endif /* CLEAN_STACK */ +++ +++ +++#ifdef PEERSEC_TEST +++ +++int matrixAesTest() +++{ +++ int err; +++ static const struct { +++ int keylen; +++ unsigned char key[32], pt[16], ct[16]; +++ } tests[] = { +++ { 16, +++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, +++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, +++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, +++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, +++ { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30, +++ 0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a } +++ }, { +++ 24, +++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, +++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, +++ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 }, +++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, +++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, +++ { 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0, +++ 0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 } +++ }, { +++ 32, +++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, +++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, +++ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, +++ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, +++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, +++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, +++ { 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf, +++ 0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 } +++ } +++ }; +++ +++ aes_CBC key; +++ unsigned char tmp[2][16]; +++ int i, y; +++ +++ for (i = 0; i < (int)(sizeof(tests)/sizeof(tests[0])); i++) { +++ zeromem(&key, sizeof(key)); +++ if ((err = aes_setup(tests[i].key, tests[i].keylen, 0, &key)) != CRYPT_OK) { +++ return err; +++ } +++ +++ aes_ecb_encrypt(tests[i].pt, tmp[0], &key); +++ aes_ecb_decrypt(tmp[0], tmp[1], &key); +++ if (memcmp(tmp[0], tests[i].ct, 16) || memcmp(tmp[1], tests[i].pt, 16)) { +++#if 0 +++ printf("\n\nTest %d failed\n", i); +++ if (memcmp(tmp[0], tests[i].ct, 16)) { +++ printf("CT: "); +++ for (i = 0; i < 16; i++) { +++ printf("%02x ", tmp[0][i]); +++ } +++ printf("\n"); +++ } else { +++ printf("PT: "); +++ for (i = 0; i < 16; i++) { +++ printf("%02x ", tmp[1][i]); +++ } +++ printf("\n"); +++ } +++#endif /* 0 */ +++ return CRYPT_FAIL_TESTVECTOR; +++ } +++ +++/* +++ now see if we can encrypt all zero bytes 1000 times, +++ decrypt and come back where we started +++ */ +++ for (y = 0; y < 16; y++) tmp[0][y] = 0; +++ for (y = 0; y < 1000; y++) aes_ecb_encrypt(tmp[0], tmp[0], &key); +++ for (y = 0; y < 1000; y++) aes_ecb_decrypt(tmp[0], tmp[0], &key); +++ for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR; +++ } +++ return CRYPT_OK; +++} +++#endif /* PEERSEC_TEST */ +++ +++#endif /* USE_AES */ +++/******************************************************************************/ ++diff -urN matrixssl.old/src/crypto/peersec/md5.c matrixssl/src/crypto/peersec/md5.c ++--- matrixssl.old/src/crypto/peersec/md5.c 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/peersec/md5.c 2005-03-06 01:32:33.000000000 +0100 ++@@ -334,7 +334,7 @@ ++ #ifdef CLEAN_STACK ++ psZeromem(md, sizeof(hash_state)); ++ #endif /* CLEAN_STACK */ ++- return 16; +++ return SSL_MD5_HASH_SIZE; ++ } ++ ++ #ifdef PEERSEC_TEST ++diff -urN matrixssl.old/src/crypto/peersec/pscrypto.h matrixssl/src/crypto/peersec/pscrypto.h ++--- matrixssl.old/src/crypto/peersec/pscrypto.h 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/peersec/pscrypto.h 2005-03-06 01:32:33.000000000 +0100 ++@@ -40,7 +40,7 @@ ++ PeerSec crypto-specific defines. ++ */ ++ #define SMALL_CODE ++-#define CLEAN_STACK +++#undef CLEAN_STACK ++ /* ++ If Native 64 bit integers are not supported, we must set the 16 bit flag ++ to produce 32 bit mp_words in mpi.h ++diff -urN matrixssl.old/src/crypto/peersec/sha1.c matrixssl/src/crypto/peersec/sha1.c ++--- matrixssl.old/src/crypto/peersec/sha1.c 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/peersec/sha1.c 2005-03-06 01:32:33.000000000 +0100 ++@@ -273,7 +273,7 @@ ++ #ifdef CLEAN_STACK ++ psZeromem(md, sizeof(hash_state)); ++ #endif /* CLEAN_STACK */ ++- return 20; +++ return SSL_SHA1_HASH_SIZE; ++ } ++ ++ #ifdef PEERSEC_TEST ++diff -urN matrixssl.old/src/Makefile matrixssl/src/Makefile ++--- matrixssl.old/src/Makefile 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/Makefile 2005-03-06 01:39:06.000000000 +0100 ++@@ -15,7 +15,14 @@ ++ E = ++ ++ LIBRARY = libmatrixssl$(SO) ++-STATIC = libmatrixsslstatic$(A) +++ +++SOVERSION_MAJ := 1 +++SOVERSION_MIN := 2 +++SOVERSION_REV := 4 +++SONAME := $(LIBRARY).$(SOVERSION_MAJ) +++SOREAL := $(LIBRARY).$(SOVERSION_MAJ).$(SOVERSION_MIN).$(SOVERSION_REV) +++ ++++STATIC = libmatrixsslstatic$(A) ++ ++ OBJECTS = \ ++ cipherSuite$(O) \ ++@@ -24,6 +31,7 @@ ++ sslEncode$(O) \ ++ sslv3$(O) \ ++ os/linux/linux$(O) \ +++ crypto/peersec/aes$(O) \ ++ crypto/peersec/arc4$(O) \ ++ crypto/peersec/asn1$(O) \ ++ crypto/peersec/base64$(O) \ ++@@ -66,7 +74,7 @@ ++ # ++ SHARED = -shared ++ CFLAGS = $(DFLAGS) -DLINUX -I./ -Icrypto/peersec ++-LDFLAGS = -lc -lpthread -lcrypto +++LDFLAGS = -lc -lpthread -Wl,-soname,$(SONAME) ++ ++ # ++ # Override variables for compilation on Mac OS X (Darwin) ++@@ -105,8 +113,9 @@ ++ # Build the library ++ # ++ $(LIBRARY): $(OBJECTS) ++- $(CC) $(SHARED) -o $@ $^ $(LDFLAGS) ++- $(STRIP) $(LIBRARY) +++ $(CC) $(SHARED) -o $(SOREAL) $^ $(LDFLAGS) +++ ln -sf $(SOREAL) $(SONAME) +++ ln -sf $(SONAME) $(LIBRARY) ++ ++ # ++ # Build the static library ++@@ -119,4 +128,4 @@ ++ # Clean up all generated files ++ # ++ clean: ++- rm -f $(LIBRARY) $(OBJECTS) $(STATIC) +++ rm -f $(LIBRARY) $(OBJECTS) $(SONAME) $(SOREAL) ++diff -urN matrixssl.old/src/matrixSsl.c matrixssl/src/matrixSsl.c ++--- matrixssl.old/src/matrixSsl.c 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/matrixSsl.c 2005-03-06 01:37:41.000000000 +0100 ++@@ -950,6 +950,49 @@ ++ sslAssert(ssl->hsPool == NULL); ++ } ++ +++ +++/******************************************************************************/ +++/* +++ Compute an MD5 digest +++*/ +++unsigned char *matrixMd5Digest( +++ const unsigned char *buf, unsigned long len, unsigned char *hash) +++{ +++ sslMd5Context_t ctx; +++ static unsigned char hashBuf[SSL_MD5_HASH_SIZE]; +++ +++ if (hash == NULL) { +++ hash = hashBuf; +++ } +++ +++ matrixMd5Init(&ctx); +++ matrixMd5Update(&ctx, buf, len); +++ matrixMd5Final(&ctx, hash); +++ +++ return hash; +++} +++ +++/******************************************************************************/ +++/* +++ Compute an SHA1 digest +++*/ +++unsigned char *matrixSha1Digest( +++ const unsigned char *buf, unsigned long len, unsigned char *hash) +++{ +++ sslSha1Context_t ctx; +++ static unsigned char hashBuf[SSL_SHA1_HASH_SIZE]; +++ +++ if (hash == NULL) { +++ hash = hashBuf; +++ } +++ +++ matrixSha1Init(&ctx); +++ matrixSha1Update(&ctx, buf, len); +++ matrixSha1Final(&ctx, hash); +++ +++ return hash; +++} +++ ++ /******************************************************************************/ ++ /* ++ Debugging APIs +diff --git a/feeds/packages/libs/matrixssl/patches/.svn/text-base/200-compile-fixes.patch.svn-base b/feeds/packages/libs/matrixssl/patches/.svn/text-base/200-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..ab6a261 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/patches/.svn/text-base/200-compile-fixes.patch.svn-base +@@ -0,0 +1,64 @@ ++Index: matrixssl/src/os/linux/linux.c ++=================================================================== ++--- matrixssl.orig/src/os/linux/linux.c 2010-11-02 21:01:53.702000002 +0100 +++++ matrixssl/src/os/linux/linux.c 2010-11-02 21:02:37.657009753 +0100 ++@@ -39,8 +39,12 @@ ++ ++ #include "../osLayer.h" ++ +++#ifndef CLK_TCK +++# define CLK_TCK CLOCKS_PER_SEC +++#endif +++ ++ #if defined(__i386__) || defined(RDTSC) ++-#include +++//#include ++ /* ++ As defined in asm/timex.h for x386: ++ */ ++@@ -51,7 +55,7 @@ ++ static sslTime_t hiresStart; /* zero-time */ ++ static sslTime_t hiresFreq; /* tics per second */ ++ #else /* __i386__ */ ++-static unsigned int32 prevTicks; /* Check wrap */ +++static uint32 prevTicks; /* Check wrap */ ++ static sslTime_t elapsedTime; /* Last elapsed time */ ++ #endif ++ ++Index: matrixssl/src/Makefile ++=================================================================== ++--- matrixssl.orig/src/Makefile 2010-11-02 21:02:42.312000001 +0100 +++++ matrixssl/src/Makefile 2010-11-02 21:04:21.979001189 +0100 ++@@ -63,13 +63,6 @@ ++ endif ++ ++ # ++-# Override variables for compilation on x86-64 (AMD64, Nacona, etc) ++-# ++-ifeq ($(shell uname -m),x86_64) ++-DFLAGS += -march=k8 -fPIC -DFP_64BIT -DTFM_X86_64 -DRDTSC ++-endif ++- ++-# ++ # Compile options ++ # ++ SHARED = -shared ++@@ -77,18 +70,6 @@ ++ LDFLAGS = -lc -lpthread -Wl,-soname,$(SONAME) ++ ++ # ++-# Override variables for compilation on Mac OS X (Darwin) ++-# ++-ifeq ($(shell uname),Darwin) ++-CC = cc ++-SO = .dylib ++-SHARED = -dynamiclib ++-CFLAGS += -DOSX -isystem -I/usr/include ++-LDFLAGS = -flat_namespace -install_name @executable_path/../src/$(LIBRARY) ++-STRIP = test ++-endif ++- ++-# ++ # Override variables for compilation on uClinux (example only) ++ # ++ ifdef UCLINUX +diff --git a/feeds/packages/libs/matrixssl/patches/100-matrixssl_1.2.4.patch b/feeds/packages/libs/matrixssl/patches/100-matrixssl_1.2.4.patch +new file mode 100644 +index 0000000..b4a2bc9 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/patches/100-matrixssl_1.2.4.patch +@@ -0,0 +1,1971 @@ ++diff -urN matrixssl.old/matrixSsl.h matrixssl/matrixSsl.h ++--- matrixssl.old/matrixSsl.h 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/matrixSsl.h 2005-03-06 01:32:33.000000000 +0100 ++@@ -154,6 +154,29 @@ ++ ++ #define SSL_OPTION_DELETE_SESSION 0 ++ +++ +++#define SSL_MD5_DIGEST_LENGTH 16 +++#define SSL_MD5_CONTEXT_DATA_SIZE 96 +++ +++typedef struct { +++ unsigned char data[SSL_MD5_CONTEXT_DATA_SIZE]; +++} sslMd5Context_t; +++ +++ +++#define SSL_SHA1_DIGEST_LENGTH 20 +++#define SSL_SHA1_CONTEXT_DATA_SIZE 96 +++ +++typedef struct { +++ unsigned char data[SSL_SHA1_CONTEXT_DATA_SIZE]; +++} sslSha1Context_t; +++ +++ +++#define SSL_CIPHER_CONTEXT_DATA_SIZE 784 +++ +++typedef struct { +++ unsigned char data[SSL_CIPHER_CONTEXT_DATA_SIZE]; +++} sslCipherContext_t; +++ ++ /******************************************************************************/ ++ /* ++ Explicitly import these apis on Windows. If we're being included from the ++@@ -220,6 +243,71 @@ ++ char *privBuf, int32 privLen, char *privPass, ++ char *trustedCABuf, int32 trustedCALen); ++ +++ +++/* +++ ARC4 (RC4) API +++*/ +++ +++SSLPUBLIC void matrixArc4Init(sslCipherContext_t *ctx, unsigned char *key, +++ int keylen); +++ +++SSLPUBLIC int matrixArc4(sslCipherContext_t *ctx, unsigned char *in, +++ unsigned char *out, int len); +++ +++/* +++ 3DES (Triple-DES) API +++*/ +++ +++SSLPUBLIC int matrix3desInit(sslCipherContext_t *ctx, unsigned char *IV, +++ unsigned char *key, int keylen); +++ +++SSLPUBLIC int matrix3desEncrypt(sslCipherContext_t *ctx, unsigned char *pt, +++ unsigned char *ct, int len); +++ +++SSLPUBLIC int matrix3desDecrypt(sslCipherContext_t *ctx, unsigned char *ct, +++ unsigned char *pt, int len); +++ +++/* +++ AES API +++*/ +++ +++SSLPUBLIC int matrixAesInit(sslCipherContext_t *ctx, unsigned char *IV, +++ unsigned char *key, int keylen); +++ +++SSLPUBLIC int matrixAesEncrypt(sslCipherContext_t *ctx, unsigned char *pt, +++ unsigned char *ct, int len); +++ +++SSLPUBLIC int matrixAesDecrypt(sslCipherContext_t *ctx, unsigned char *ct, +++ unsigned char *pt, int len); +++ +++/* +++ MD5 API +++*/ +++ +++SSLPUBLIC void matrixMd5Init(sslMd5Context_t *ctx); +++ +++SSLPUBLIC void matrixMd5Update(sslMd5Context_t *ctx, const unsigned char *buf, +++ unsigned long len); +++ +++SSLPUBLIC int matrixMd5Final(sslMd5Context_t *ctx, unsigned char *hash); +++ +++SSLPUBLIC unsigned char *matrixMd5Digest(const unsigned char *buf, +++ unsigned long len, unsigned char *hash); +++ +++/* +++ SHA1 API +++*/ +++ +++SSLPUBLIC void matrixSha1Init(sslSha1Context_t *ctx); +++ +++SSLPUBLIC void matrixSha1Update(sslSha1Context_t *ctx, const unsigned char *buf, +++ unsigned long len); +++ +++SSLPUBLIC int matrixSha1Final(sslSha1Context_t *ctx, unsigned char *hash); +++ +++SSLPUBLIC unsigned char *matrixSha1Digest(const unsigned char *buf, +++ unsigned long len, unsigned char *hash); +++ ++ /******************************************************************************/ ++ ++ #ifdef __cplusplus ++diff -urN matrixssl.old/src/crypto/cryptoLayer.h matrixssl/src/crypto/cryptoLayer.h ++--- matrixssl.old/src/crypto/cryptoLayer.h 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/cryptoLayer.h 2005-03-06 01:32:33.000000000 +0100 ++@@ -115,6 +115,7 @@ ++ */ ++ /* #define USE_FULL_CERT_PARSE */ ++ /* #define USE_MD2 */ +++#define USE_AES ++ ++ /* ++ Now that we've set up the required defines, include the crypto layer header ++diff -urN matrixssl.old/src/crypto/peersec/aes.c matrixssl/src/crypto/peersec/aes.c ++--- matrixssl.old/src/crypto/peersec/aes.c 1970-01-01 01:00:00.000000000 +0100 +++++ matrixssl/src/crypto/peersec/aes.c 2005-03-06 01:32:33.000000000 +0100 ++@@ -0,0 +1,1708 @@ +++/* +++ * aes.c +++ * +++ * AES CBC block cipher implementation +++ */ +++/* +++ * Copyright (c) PeerSec Networks, 2002-2004. All Rights Reserved. +++ * The latest version of this code is available at http://www.matrixssl.org +++ * +++ * This software is open source; 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 General Public License does NOT permit incorporating this software +++ * into proprietary programs. If you are unable to comply with the GPL, a +++ * commercial license for this software may be purchased from PeerSec Networks +++ * at http://www.peersec.com +++ * +++ * This program is distributed in 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ * http://www.gnu.org/copyleft/gpl.html +++ */ +++/******************************************************************************/ +++ +++#include "../cryptoLayer.h" +++ +++#ifdef USE_AES +++ +++/* The precomputed tables for AES */ +++/* +++Te0[x] = S [x].[02, 01, 01, 03]; +++Te1[x] = S [x].[03, 02, 01, 01]; +++Te2[x] = S [x].[01, 03, 02, 01]; +++Te3[x] = S [x].[01, 01, 03, 02]; +++Te4[x] = S [x].[01, 01, 01, 01]; +++ +++Td0[x] = Si[x].[0e, 09, 0d, 0b]; +++Td1[x] = Si[x].[0b, 0e, 09, 0d]; +++Td2[x] = Si[x].[0d, 0b, 0e, 09]; +++Td3[x] = Si[x].[09, 0d, 0b, 0e]; +++Td4[x] = Si[x].[01, 01, 01, 01]; +++*/ +++ +++static const ulong32 TE0[256] = { +++ 0xc66363a5UL, 0xf87c7c84UL, 0xee777799UL, 0xf67b7b8dUL, +++ 0xfff2f20dUL, 0xd66b6bbdUL, 0xde6f6fb1UL, 0x91c5c554UL, +++ 0x60303050UL, 0x02010103UL, 0xce6767a9UL, 0x562b2b7dUL, +++ 0xe7fefe19UL, 0xb5d7d762UL, 0x4dababe6UL, 0xec76769aUL, +++ 0x8fcaca45UL, 0x1f82829dUL, 0x89c9c940UL, 0xfa7d7d87UL, +++ 0xeffafa15UL, 0xb25959ebUL, 0x8e4747c9UL, 0xfbf0f00bUL, +++ 0x41adadecUL, 0xb3d4d467UL, 0x5fa2a2fdUL, 0x45afafeaUL, +++ 0x239c9cbfUL, 0x53a4a4f7UL, 0xe4727296UL, 0x9bc0c05bUL, +++ 0x75b7b7c2UL, 0xe1fdfd1cUL, 0x3d9393aeUL, 0x4c26266aUL, +++ 0x6c36365aUL, 0x7e3f3f41UL, 0xf5f7f702UL, 0x83cccc4fUL, +++ 0x6834345cUL, 0x51a5a5f4UL, 0xd1e5e534UL, 0xf9f1f108UL, +++ 0xe2717193UL, 0xabd8d873UL, 0x62313153UL, 0x2a15153fUL, +++ 0x0804040cUL, 0x95c7c752UL, 0x46232365UL, 0x9dc3c35eUL, +++ 0x30181828UL, 0x379696a1UL, 0x0a05050fUL, 0x2f9a9ab5UL, +++ 0x0e070709UL, 0x24121236UL, 0x1b80809bUL, 0xdfe2e23dUL, +++ 0xcdebeb26UL, 0x4e272769UL, 0x7fb2b2cdUL, 0xea75759fUL, +++ 0x1209091bUL, 0x1d83839eUL, 0x582c2c74UL, 0x341a1a2eUL, +++ 0x361b1b2dUL, 0xdc6e6eb2UL, 0xb45a5aeeUL, 0x5ba0a0fbUL, +++ 0xa45252f6UL, 0x763b3b4dUL, 0xb7d6d661UL, 0x7db3b3ceUL, +++ 0x5229297bUL, 0xdde3e33eUL, 0x5e2f2f71UL, 0x13848497UL, +++ 0xa65353f5UL, 0xb9d1d168UL, 0x00000000UL, 0xc1eded2cUL, +++ 0x40202060UL, 0xe3fcfc1fUL, 0x79b1b1c8UL, 0xb65b5bedUL, +++ 0xd46a6abeUL, 0x8dcbcb46UL, 0x67bebed9UL, 0x7239394bUL, +++ 0x944a4adeUL, 0x984c4cd4UL, 0xb05858e8UL, 0x85cfcf4aUL, +++ 0xbbd0d06bUL, 0xc5efef2aUL, 0x4faaaae5UL, 0xedfbfb16UL, +++ 0x864343c5UL, 0x9a4d4dd7UL, 0x66333355UL, 0x11858594UL, +++ 0x8a4545cfUL, 0xe9f9f910UL, 0x04020206UL, 0xfe7f7f81UL, +++ 0xa05050f0UL, 0x783c3c44UL, 0x259f9fbaUL, 0x4ba8a8e3UL, +++ 0xa25151f3UL, 0x5da3a3feUL, 0x804040c0UL, 0x058f8f8aUL, +++ 0x3f9292adUL, 0x219d9dbcUL, 0x70383848UL, 0xf1f5f504UL, +++ 0x63bcbcdfUL, 0x77b6b6c1UL, 0xafdada75UL, 0x42212163UL, +++ 0x20101030UL, 0xe5ffff1aUL, 0xfdf3f30eUL, 0xbfd2d26dUL, +++ 0x81cdcd4cUL, 0x180c0c14UL, 0x26131335UL, 0xc3ecec2fUL, +++ 0xbe5f5fe1UL, 0x359797a2UL, 0x884444ccUL, 0x2e171739UL, +++ 0x93c4c457UL, 0x55a7a7f2UL, 0xfc7e7e82UL, 0x7a3d3d47UL, +++ 0xc86464acUL, 0xba5d5de7UL, 0x3219192bUL, 0xe6737395UL, +++ 0xc06060a0UL, 0x19818198UL, 0x9e4f4fd1UL, 0xa3dcdc7fUL, +++ 0x44222266UL, 0x542a2a7eUL, 0x3b9090abUL, 0x0b888883UL, +++ 0x8c4646caUL, 0xc7eeee29UL, 0x6bb8b8d3UL, 0x2814143cUL, +++ 0xa7dede79UL, 0xbc5e5ee2UL, 0x160b0b1dUL, 0xaddbdb76UL, +++ 0xdbe0e03bUL, 0x64323256UL, 0x743a3a4eUL, 0x140a0a1eUL, +++ 0x924949dbUL, 0x0c06060aUL, 0x4824246cUL, 0xb85c5ce4UL, +++ 0x9fc2c25dUL, 0xbdd3d36eUL, 0x43acacefUL, 0xc46262a6UL, +++ 0x399191a8UL, 0x319595a4UL, 0xd3e4e437UL, 0xf279798bUL, +++ 0xd5e7e732UL, 0x8bc8c843UL, 0x6e373759UL, 0xda6d6db7UL, +++ 0x018d8d8cUL, 0xb1d5d564UL, 0x9c4e4ed2UL, 0x49a9a9e0UL, +++ 0xd86c6cb4UL, 0xac5656faUL, 0xf3f4f407UL, 0xcfeaea25UL, +++ 0xca6565afUL, 0xf47a7a8eUL, 0x47aeaee9UL, 0x10080818UL, +++ 0x6fbabad5UL, 0xf0787888UL, 0x4a25256fUL, 0x5c2e2e72UL, +++ 0x381c1c24UL, 0x57a6a6f1UL, 0x73b4b4c7UL, 0x97c6c651UL, +++ 0xcbe8e823UL, 0xa1dddd7cUL, 0xe874749cUL, 0x3e1f1f21UL, +++ 0x964b4bddUL, 0x61bdbddcUL, 0x0d8b8b86UL, 0x0f8a8a85UL, +++ 0xe0707090UL, 0x7c3e3e42UL, 0x71b5b5c4UL, 0xcc6666aaUL, +++ 0x904848d8UL, 0x06030305UL, 0xf7f6f601UL, 0x1c0e0e12UL, +++ 0xc26161a3UL, 0x6a35355fUL, 0xae5757f9UL, 0x69b9b9d0UL, +++ 0x17868691UL, 0x99c1c158UL, 0x3a1d1d27UL, 0x279e9eb9UL, +++ 0xd9e1e138UL, 0xebf8f813UL, 0x2b9898b3UL, 0x22111133UL, +++ 0xd26969bbUL, 0xa9d9d970UL, 0x078e8e89UL, 0x339494a7UL, +++ 0x2d9b9bb6UL, 0x3c1e1e22UL, 0x15878792UL, 0xc9e9e920UL, +++ 0x87cece49UL, 0xaa5555ffUL, 0x50282878UL, 0xa5dfdf7aUL, +++ 0x038c8c8fUL, 0x59a1a1f8UL, 0x09898980UL, 0x1a0d0d17UL, +++ 0x65bfbfdaUL, 0xd7e6e631UL, 0x844242c6UL, 0xd06868b8UL, +++ 0x824141c3UL, 0x299999b0UL, 0x5a2d2d77UL, 0x1e0f0f11UL, +++ 0x7bb0b0cbUL, 0xa85454fcUL, 0x6dbbbbd6UL, 0x2c16163aUL, +++}; +++ +++static const ulong32 Te4[256] = { +++ 0x63636363UL, 0x7c7c7c7cUL, 0x77777777UL, 0x7b7b7b7bUL, +++ 0xf2f2f2f2UL, 0x6b6b6b6bUL, 0x6f6f6f6fUL, 0xc5c5c5c5UL, +++ 0x30303030UL, 0x01010101UL, 0x67676767UL, 0x2b2b2b2bUL, +++ 0xfefefefeUL, 0xd7d7d7d7UL, 0xababababUL, 0x76767676UL, +++ 0xcacacacaUL, 0x82828282UL, 0xc9c9c9c9UL, 0x7d7d7d7dUL, +++ 0xfafafafaUL, 0x59595959UL, 0x47474747UL, 0xf0f0f0f0UL, +++ 0xadadadadUL, 0xd4d4d4d4UL, 0xa2a2a2a2UL, 0xafafafafUL, +++ 0x9c9c9c9cUL, 0xa4a4a4a4UL, 0x72727272UL, 0xc0c0c0c0UL, +++ 0xb7b7b7b7UL, 0xfdfdfdfdUL, 0x93939393UL, 0x26262626UL, +++ 0x36363636UL, 0x3f3f3f3fUL, 0xf7f7f7f7UL, 0xccccccccUL, +++ 0x34343434UL, 0xa5a5a5a5UL, 0xe5e5e5e5UL, 0xf1f1f1f1UL, +++ 0x71717171UL, 0xd8d8d8d8UL, 0x31313131UL, 0x15151515UL, +++ 0x04040404UL, 0xc7c7c7c7UL, 0x23232323UL, 0xc3c3c3c3UL, +++ 0x18181818UL, 0x96969696UL, 0x05050505UL, 0x9a9a9a9aUL, +++ 0x07070707UL, 0x12121212UL, 0x80808080UL, 0xe2e2e2e2UL, +++ 0xebebebebUL, 0x27272727UL, 0xb2b2b2b2UL, 0x75757575UL, +++ 0x09090909UL, 0x83838383UL, 0x2c2c2c2cUL, 0x1a1a1a1aUL, +++ 0x1b1b1b1bUL, 0x6e6e6e6eUL, 0x5a5a5a5aUL, 0xa0a0a0a0UL, +++ 0x52525252UL, 0x3b3b3b3bUL, 0xd6d6d6d6UL, 0xb3b3b3b3UL, +++ 0x29292929UL, 0xe3e3e3e3UL, 0x2f2f2f2fUL, 0x84848484UL, +++ 0x53535353UL, 0xd1d1d1d1UL, 0x00000000UL, 0xededededUL, +++ 0x20202020UL, 0xfcfcfcfcUL, 0xb1b1b1b1UL, 0x5b5b5b5bUL, +++ 0x6a6a6a6aUL, 0xcbcbcbcbUL, 0xbebebebeUL, 0x39393939UL, +++ 0x4a4a4a4aUL, 0x4c4c4c4cUL, 0x58585858UL, 0xcfcfcfcfUL, +++ 0xd0d0d0d0UL, 0xefefefefUL, 0xaaaaaaaaUL, 0xfbfbfbfbUL, +++ 0x43434343UL, 0x4d4d4d4dUL, 0x33333333UL, 0x85858585UL, +++ 0x45454545UL, 0xf9f9f9f9UL, 0x02020202UL, 0x7f7f7f7fUL, +++ 0x50505050UL, 0x3c3c3c3cUL, 0x9f9f9f9fUL, 0xa8a8a8a8UL, +++ 0x51515151UL, 0xa3a3a3a3UL, 0x40404040UL, 0x8f8f8f8fUL, +++ 0x92929292UL, 0x9d9d9d9dUL, 0x38383838UL, 0xf5f5f5f5UL, +++ 0xbcbcbcbcUL, 0xb6b6b6b6UL, 0xdadadadaUL, 0x21212121UL, +++ 0x10101010UL, 0xffffffffUL, 0xf3f3f3f3UL, 0xd2d2d2d2UL, +++ 0xcdcdcdcdUL, 0x0c0c0c0cUL, 0x13131313UL, 0xececececUL, +++ 0x5f5f5f5fUL, 0x97979797UL, 0x44444444UL, 0x17171717UL, +++ 0xc4c4c4c4UL, 0xa7a7a7a7UL, 0x7e7e7e7eUL, 0x3d3d3d3dUL, +++ 0x64646464UL, 0x5d5d5d5dUL, 0x19191919UL, 0x73737373UL, +++ 0x60606060UL, 0x81818181UL, 0x4f4f4f4fUL, 0xdcdcdcdcUL, +++ 0x22222222UL, 0x2a2a2a2aUL, 0x90909090UL, 0x88888888UL, +++ 0x46464646UL, 0xeeeeeeeeUL, 0xb8b8b8b8UL, 0x14141414UL, +++ 0xdedededeUL, 0x5e5e5e5eUL, 0x0b0b0b0bUL, 0xdbdbdbdbUL, +++ 0xe0e0e0e0UL, 0x32323232UL, 0x3a3a3a3aUL, 0x0a0a0a0aUL, +++ 0x49494949UL, 0x06060606UL, 0x24242424UL, 0x5c5c5c5cUL, +++ 0xc2c2c2c2UL, 0xd3d3d3d3UL, 0xacacacacUL, 0x62626262UL, +++ 0x91919191UL, 0x95959595UL, 0xe4e4e4e4UL, 0x79797979UL, +++ 0xe7e7e7e7UL, 0xc8c8c8c8UL, 0x37373737UL, 0x6d6d6d6dUL, +++ 0x8d8d8d8dUL, 0xd5d5d5d5UL, 0x4e4e4e4eUL, 0xa9a9a9a9UL, +++ 0x6c6c6c6cUL, 0x56565656UL, 0xf4f4f4f4UL, 0xeaeaeaeaUL, +++ 0x65656565UL, 0x7a7a7a7aUL, 0xaeaeaeaeUL, 0x08080808UL, +++ 0xbabababaUL, 0x78787878UL, 0x25252525UL, 0x2e2e2e2eUL, +++ 0x1c1c1c1cUL, 0xa6a6a6a6UL, 0xb4b4b4b4UL, 0xc6c6c6c6UL, +++ 0xe8e8e8e8UL, 0xddddddddUL, 0x74747474UL, 0x1f1f1f1fUL, +++ 0x4b4b4b4bUL, 0xbdbdbdbdUL, 0x8b8b8b8bUL, 0x8a8a8a8aUL, +++ 0x70707070UL, 0x3e3e3e3eUL, 0xb5b5b5b5UL, 0x66666666UL, +++ 0x48484848UL, 0x03030303UL, 0xf6f6f6f6UL, 0x0e0e0e0eUL, +++ 0x61616161UL, 0x35353535UL, 0x57575757UL, 0xb9b9b9b9UL, +++ 0x86868686UL, 0xc1c1c1c1UL, 0x1d1d1d1dUL, 0x9e9e9e9eUL, +++ 0xe1e1e1e1UL, 0xf8f8f8f8UL, 0x98989898UL, 0x11111111UL, +++ 0x69696969UL, 0xd9d9d9d9UL, 0x8e8e8e8eUL, 0x94949494UL, +++ 0x9b9b9b9bUL, 0x1e1e1e1eUL, 0x87878787UL, 0xe9e9e9e9UL, +++ 0xcecececeUL, 0x55555555UL, 0x28282828UL, 0xdfdfdfdfUL, +++ 0x8c8c8c8cUL, 0xa1a1a1a1UL, 0x89898989UL, 0x0d0d0d0dUL, +++ 0xbfbfbfbfUL, 0xe6e6e6e6UL, 0x42424242UL, 0x68686868UL, +++ 0x41414141UL, 0x99999999UL, 0x2d2d2d2dUL, 0x0f0f0f0fUL, +++ 0xb0b0b0b0UL, 0x54545454UL, 0xbbbbbbbbUL, 0x16161616UL, +++}; +++ +++static const ulong32 TD0[256] = { +++ 0x51f4a750UL, 0x7e416553UL, 0x1a17a4c3UL, 0x3a275e96UL, +++ 0x3bab6bcbUL, 0x1f9d45f1UL, 0xacfa58abUL, 0x4be30393UL, +++ 0x2030fa55UL, 0xad766df6UL, 0x88cc7691UL, 0xf5024c25UL, +++ 0x4fe5d7fcUL, 0xc52acbd7UL, 0x26354480UL, 0xb562a38fUL, +++ 0xdeb15a49UL, 0x25ba1b67UL, 0x45ea0e98UL, 0x5dfec0e1UL, +++ 0xc32f7502UL, 0x814cf012UL, 0x8d4697a3UL, 0x6bd3f9c6UL, +++ 0x038f5fe7UL, 0x15929c95UL, 0xbf6d7aebUL, 0x955259daUL, +++ 0xd4be832dUL, 0x587421d3UL, 0x49e06929UL, 0x8ec9c844UL, +++ 0x75c2896aUL, 0xf48e7978UL, 0x99583e6bUL, 0x27b971ddUL, +++ 0xbee14fb6UL, 0xf088ad17UL, 0xc920ac66UL, 0x7dce3ab4UL, +++ 0x63df4a18UL, 0xe51a3182UL, 0x97513360UL, 0x62537f45UL, +++ 0xb16477e0UL, 0xbb6bae84UL, 0xfe81a01cUL, 0xf9082b94UL, +++ 0x70486858UL, 0x8f45fd19UL, 0x94de6c87UL, 0x527bf8b7UL, +++ 0xab73d323UL, 0x724b02e2UL, 0xe31f8f57UL, 0x6655ab2aUL, +++ 0xb2eb2807UL, 0x2fb5c203UL, 0x86c57b9aUL, 0xd33708a5UL, +++ 0x302887f2UL, 0x23bfa5b2UL, 0x02036abaUL, 0xed16825cUL, +++ 0x8acf1c2bUL, 0xa779b492UL, 0xf307f2f0UL, 0x4e69e2a1UL, +++ 0x65daf4cdUL, 0x0605bed5UL, 0xd134621fUL, 0xc4a6fe8aUL, +++ 0x342e539dUL, 0xa2f355a0UL, 0x058ae132UL, 0xa4f6eb75UL, +++ 0x0b83ec39UL, 0x4060efaaUL, 0x5e719f06UL, 0xbd6e1051UL, +++ 0x3e218af9UL, 0x96dd063dUL, 0xdd3e05aeUL, 0x4de6bd46UL, +++ 0x91548db5UL, 0x71c45d05UL, 0x0406d46fUL, 0x605015ffUL, +++ 0x1998fb24UL, 0xd6bde997UL, 0x894043ccUL, 0x67d99e77UL, +++ 0xb0e842bdUL, 0x07898b88UL, 0xe7195b38UL, 0x79c8eedbUL, +++ 0xa17c0a47UL, 0x7c420fe9UL, 0xf8841ec9UL, 0x00000000UL, +++ 0x09808683UL, 0x322bed48UL, 0x1e1170acUL, 0x6c5a724eUL, +++ 0xfd0efffbUL, 0x0f853856UL, 0x3daed51eUL, 0x362d3927UL, +++ 0x0a0fd964UL, 0x685ca621UL, 0x9b5b54d1UL, 0x24362e3aUL, +++ 0x0c0a67b1UL, 0x9357e70fUL, 0xb4ee96d2UL, 0x1b9b919eUL, +++ 0x80c0c54fUL, 0x61dc20a2UL, 0x5a774b69UL, 0x1c121a16UL, +++ 0xe293ba0aUL, 0xc0a02ae5UL, 0x3c22e043UL, 0x121b171dUL, +++ 0x0e090d0bUL, 0xf28bc7adUL, 0x2db6a8b9UL, 0x141ea9c8UL, +++ 0x57f11985UL, 0xaf75074cUL, 0xee99ddbbUL, 0xa37f60fdUL, +++ 0xf701269fUL, 0x5c72f5bcUL, 0x44663bc5UL, 0x5bfb7e34UL, +++ 0x8b432976UL, 0xcb23c6dcUL, 0xb6edfc68UL, 0xb8e4f163UL, +++ 0xd731dccaUL, 0x42638510UL, 0x13972240UL, 0x84c61120UL, +++ 0x854a247dUL, 0xd2bb3df8UL, 0xaef93211UL, 0xc729a16dUL, +++ 0x1d9e2f4bUL, 0xdcb230f3UL, 0x0d8652ecUL, 0x77c1e3d0UL, +++ 0x2bb3166cUL, 0xa970b999UL, 0x119448faUL, 0x47e96422UL, +++ 0xa8fc8cc4UL, 0xa0f03f1aUL, 0x567d2cd8UL, 0x223390efUL, +++ 0x87494ec7UL, 0xd938d1c1UL, 0x8ccaa2feUL, 0x98d40b36UL, +++ 0xa6f581cfUL, 0xa57ade28UL, 0xdab78e26UL, 0x3fadbfa4UL, +++ 0x2c3a9de4UL, 0x5078920dUL, 0x6a5fcc9bUL, 0x547e4662UL, +++ 0xf68d13c2UL, 0x90d8b8e8UL, 0x2e39f75eUL, 0x82c3aff5UL, +++ 0x9f5d80beUL, 0x69d0937cUL, 0x6fd52da9UL, 0xcf2512b3UL, +++ 0xc8ac993bUL, 0x10187da7UL, 0xe89c636eUL, 0xdb3bbb7bUL, +++ 0xcd267809UL, 0x6e5918f4UL, 0xec9ab701UL, 0x834f9aa8UL, +++ 0xe6956e65UL, 0xaaffe67eUL, 0x21bccf08UL, 0xef15e8e6UL, +++ 0xbae79bd9UL, 0x4a6f36ceUL, 0xea9f09d4UL, 0x29b07cd6UL, +++ 0x31a4b2afUL, 0x2a3f2331UL, 0xc6a59430UL, 0x35a266c0UL, +++ 0x744ebc37UL, 0xfc82caa6UL, 0xe090d0b0UL, 0x33a7d815UL, +++ 0xf104984aUL, 0x41ecdaf7UL, 0x7fcd500eUL, 0x1791f62fUL, +++ 0x764dd68dUL, 0x43efb04dUL, 0xccaa4d54UL, 0xe49604dfUL, +++ 0x9ed1b5e3UL, 0x4c6a881bUL, 0xc12c1fb8UL, 0x4665517fUL, +++ 0x9d5eea04UL, 0x018c355dUL, 0xfa877473UL, 0xfb0b412eUL, +++ 0xb3671d5aUL, 0x92dbd252UL, 0xe9105633UL, 0x6dd64713UL, +++ 0x9ad7618cUL, 0x37a10c7aUL, 0x59f8148eUL, 0xeb133c89UL, +++ 0xcea927eeUL, 0xb761c935UL, 0xe11ce5edUL, 0x7a47b13cUL, +++ 0x9cd2df59UL, 0x55f2733fUL, 0x1814ce79UL, 0x73c737bfUL, +++ 0x53f7cdeaUL, 0x5ffdaa5bUL, 0xdf3d6f14UL, 0x7844db86UL, +++ 0xcaaff381UL, 0xb968c43eUL, 0x3824342cUL, 0xc2a3405fUL, +++ 0x161dc372UL, 0xbce2250cUL, 0x283c498bUL, 0xff0d9541UL, +++ 0x39a80171UL, 0x080cb3deUL, 0xd8b4e49cUL, 0x6456c190UL, +++ 0x7bcb8461UL, 0xd532b670UL, 0x486c5c74UL, 0xd0b85742UL, +++}; +++ +++static const ulong32 Td4[256] = { +++ 0x52525252UL, 0x09090909UL, 0x6a6a6a6aUL, 0xd5d5d5d5UL, +++ 0x30303030UL, 0x36363636UL, 0xa5a5a5a5UL, 0x38383838UL, +++ 0xbfbfbfbfUL, 0x40404040UL, 0xa3a3a3a3UL, 0x9e9e9e9eUL, +++ 0x81818181UL, 0xf3f3f3f3UL, 0xd7d7d7d7UL, 0xfbfbfbfbUL, +++ 0x7c7c7c7cUL, 0xe3e3e3e3UL, 0x39393939UL, 0x82828282UL, +++ 0x9b9b9b9bUL, 0x2f2f2f2fUL, 0xffffffffUL, 0x87878787UL, +++ 0x34343434UL, 0x8e8e8e8eUL, 0x43434343UL, 0x44444444UL, +++ 0xc4c4c4c4UL, 0xdedededeUL, 0xe9e9e9e9UL, 0xcbcbcbcbUL, +++ 0x54545454UL, 0x7b7b7b7bUL, 0x94949494UL, 0x32323232UL, +++ 0xa6a6a6a6UL, 0xc2c2c2c2UL, 0x23232323UL, 0x3d3d3d3dUL, +++ 0xeeeeeeeeUL, 0x4c4c4c4cUL, 0x95959595UL, 0x0b0b0b0bUL, +++ 0x42424242UL, 0xfafafafaUL, 0xc3c3c3c3UL, 0x4e4e4e4eUL, +++ 0x08080808UL, 0x2e2e2e2eUL, 0xa1a1a1a1UL, 0x66666666UL, +++ 0x28282828UL, 0xd9d9d9d9UL, 0x24242424UL, 0xb2b2b2b2UL, +++ 0x76767676UL, 0x5b5b5b5bUL, 0xa2a2a2a2UL, 0x49494949UL, +++ 0x6d6d6d6dUL, 0x8b8b8b8bUL, 0xd1d1d1d1UL, 0x25252525UL, +++ 0x72727272UL, 0xf8f8f8f8UL, 0xf6f6f6f6UL, 0x64646464UL, +++ 0x86868686UL, 0x68686868UL, 0x98989898UL, 0x16161616UL, +++ 0xd4d4d4d4UL, 0xa4a4a4a4UL, 0x5c5c5c5cUL, 0xccccccccUL, +++ 0x5d5d5d5dUL, 0x65656565UL, 0xb6b6b6b6UL, 0x92929292UL, +++ 0x6c6c6c6cUL, 0x70707070UL, 0x48484848UL, 0x50505050UL, +++ 0xfdfdfdfdUL, 0xededededUL, 0xb9b9b9b9UL, 0xdadadadaUL, +++ 0x5e5e5e5eUL, 0x15151515UL, 0x46464646UL, 0x57575757UL, +++ 0xa7a7a7a7UL, 0x8d8d8d8dUL, 0x9d9d9d9dUL, 0x84848484UL, +++ 0x90909090UL, 0xd8d8d8d8UL, 0xababababUL, 0x00000000UL, +++ 0x8c8c8c8cUL, 0xbcbcbcbcUL, 0xd3d3d3d3UL, 0x0a0a0a0aUL, +++ 0xf7f7f7f7UL, 0xe4e4e4e4UL, 0x58585858UL, 0x05050505UL, +++ 0xb8b8b8b8UL, 0xb3b3b3b3UL, 0x45454545UL, 0x06060606UL, +++ 0xd0d0d0d0UL, 0x2c2c2c2cUL, 0x1e1e1e1eUL, 0x8f8f8f8fUL, +++ 0xcacacacaUL, 0x3f3f3f3fUL, 0x0f0f0f0fUL, 0x02020202UL, +++ 0xc1c1c1c1UL, 0xafafafafUL, 0xbdbdbdbdUL, 0x03030303UL, +++ 0x01010101UL, 0x13131313UL, 0x8a8a8a8aUL, 0x6b6b6b6bUL, +++ 0x3a3a3a3aUL, 0x91919191UL, 0x11111111UL, 0x41414141UL, +++ 0x4f4f4f4fUL, 0x67676767UL, 0xdcdcdcdcUL, 0xeaeaeaeaUL, +++ 0x97979797UL, 0xf2f2f2f2UL, 0xcfcfcfcfUL, 0xcecececeUL, +++ 0xf0f0f0f0UL, 0xb4b4b4b4UL, 0xe6e6e6e6UL, 0x73737373UL, +++ 0x96969696UL, 0xacacacacUL, 0x74747474UL, 0x22222222UL, +++ 0xe7e7e7e7UL, 0xadadadadUL, 0x35353535UL, 0x85858585UL, +++ 0xe2e2e2e2UL, 0xf9f9f9f9UL, 0x37373737UL, 0xe8e8e8e8UL, +++ 0x1c1c1c1cUL, 0x75757575UL, 0xdfdfdfdfUL, 0x6e6e6e6eUL, +++ 0x47474747UL, 0xf1f1f1f1UL, 0x1a1a1a1aUL, 0x71717171UL, +++ 0x1d1d1d1dUL, 0x29292929UL, 0xc5c5c5c5UL, 0x89898989UL, +++ 0x6f6f6f6fUL, 0xb7b7b7b7UL, 0x62626262UL, 0x0e0e0e0eUL, +++ 0xaaaaaaaaUL, 0x18181818UL, 0xbebebebeUL, 0x1b1b1b1bUL, +++ 0xfcfcfcfcUL, 0x56565656UL, 0x3e3e3e3eUL, 0x4b4b4b4bUL, +++ 0xc6c6c6c6UL, 0xd2d2d2d2UL, 0x79797979UL, 0x20202020UL, +++ 0x9a9a9a9aUL, 0xdbdbdbdbUL, 0xc0c0c0c0UL, 0xfefefefeUL, +++ 0x78787878UL, 0xcdcdcdcdUL, 0x5a5a5a5aUL, 0xf4f4f4f4UL, +++ 0x1f1f1f1fUL, 0xddddddddUL, 0xa8a8a8a8UL, 0x33333333UL, +++ 0x88888888UL, 0x07070707UL, 0xc7c7c7c7UL, 0x31313131UL, +++ 0xb1b1b1b1UL, 0x12121212UL, 0x10101010UL, 0x59595959UL, +++ 0x27272727UL, 0x80808080UL, 0xececececUL, 0x5f5f5f5fUL, +++ 0x60606060UL, 0x51515151UL, 0x7f7f7f7fUL, 0xa9a9a9a9UL, +++ 0x19191919UL, 0xb5b5b5b5UL, 0x4a4a4a4aUL, 0x0d0d0d0dUL, +++ 0x2d2d2d2dUL, 0xe5e5e5e5UL, 0x7a7a7a7aUL, 0x9f9f9f9fUL, +++ 0x93939393UL, 0xc9c9c9c9UL, 0x9c9c9c9cUL, 0xefefefefUL, +++ 0xa0a0a0a0UL, 0xe0e0e0e0UL, 0x3b3b3b3bUL, 0x4d4d4d4dUL, +++ 0xaeaeaeaeUL, 0x2a2a2a2aUL, 0xf5f5f5f5UL, 0xb0b0b0b0UL, +++ 0xc8c8c8c8UL, 0xebebebebUL, 0xbbbbbbbbUL, 0x3c3c3c3cUL, +++ 0x83838383UL, 0x53535353UL, 0x99999999UL, 0x61616161UL, +++ 0x17171717UL, 0x2b2b2b2bUL, 0x04040404UL, 0x7e7e7e7eUL, +++ 0xbabababaUL, 0x77777777UL, 0xd6d6d6d6UL, 0x26262626UL, +++ 0xe1e1e1e1UL, 0x69696969UL, 0x14141414UL, 0x63636363UL, +++ 0x55555555UL, 0x21212121UL, 0x0c0c0c0cUL, 0x7d7d7d7dUL, +++}; +++ +++#ifdef SMALL_CODE +++ +++#define Te0(x) TE0[x] +++#define Te1(x) ROR(TE0[x], 8) +++#define Te2(x) ROR(TE0[x], 16) +++#define Te3(x) ROR(TE0[x], 24) +++ +++#define Td0(x) TD0[x] +++#define Td1(x) ROR(TD0[x], 8) +++#define Td2(x) ROR(TD0[x], 16) +++#define Td3(x) ROR(TD0[x], 24) +++ +++#define Te4_0 0x000000FF & Te4 +++#define Te4_1 0x0000FF00 & Te4 +++#define Te4_2 0x00FF0000 & Te4 +++#define Te4_3 0xFF000000 & Te4 +++ +++#else /* SMALL_CODE */ +++ +++#define Te0(x) TE0[x] +++#define Te1(x) TE1[x] +++#define Te2(x) TE2[x] +++#define Te3(x) TE3[x] +++ +++#define Td0(x) TD0[x] +++#define Td1(x) TD1[x] +++#define Td2(x) TD2[x] +++#define Td3(x) TD3[x] +++ +++static const ulong32 TE1[256] = { +++ 0xa5c66363UL, 0x84f87c7cUL, 0x99ee7777UL, 0x8df67b7bUL, +++ 0x0dfff2f2UL, 0xbdd66b6bUL, 0xb1de6f6fUL, 0x5491c5c5UL, +++ 0x50603030UL, 0x03020101UL, 0xa9ce6767UL, 0x7d562b2bUL, +++ 0x19e7fefeUL, 0x62b5d7d7UL, 0xe64dababUL, 0x9aec7676UL, +++ 0x458fcacaUL, 0x9d1f8282UL, 0x4089c9c9UL, 0x87fa7d7dUL, +++ 0x15effafaUL, 0xebb25959UL, 0xc98e4747UL, 0x0bfbf0f0UL, +++ 0xec41adadUL, 0x67b3d4d4UL, 0xfd5fa2a2UL, 0xea45afafUL, +++ 0xbf239c9cUL, 0xf753a4a4UL, 0x96e47272UL, 0x5b9bc0c0UL, +++ 0xc275b7b7UL, 0x1ce1fdfdUL, 0xae3d9393UL, 0x6a4c2626UL, +++ 0x5a6c3636UL, 0x417e3f3fUL, 0x02f5f7f7UL, 0x4f83ccccUL, +++ 0x5c683434UL, 0xf451a5a5UL, 0x34d1e5e5UL, 0x08f9f1f1UL, +++ 0x93e27171UL, 0x73abd8d8UL, 0x53623131UL, 0x3f2a1515UL, +++ 0x0c080404UL, 0x5295c7c7UL, 0x65462323UL, 0x5e9dc3c3UL, +++ 0x28301818UL, 0xa1379696UL, 0x0f0a0505UL, 0xb52f9a9aUL, +++ 0x090e0707UL, 0x36241212UL, 0x9b1b8080UL, 0x3ddfe2e2UL, +++ 0x26cdebebUL, 0x694e2727UL, 0xcd7fb2b2UL, 0x9fea7575UL, +++ 0x1b120909UL, 0x9e1d8383UL, 0x74582c2cUL, 0x2e341a1aUL, +++ 0x2d361b1bUL, 0xb2dc6e6eUL, 0xeeb45a5aUL, 0xfb5ba0a0UL, +++ 0xf6a45252UL, 0x4d763b3bUL, 0x61b7d6d6UL, 0xce7db3b3UL, +++ 0x7b522929UL, 0x3edde3e3UL, 0x715e2f2fUL, 0x97138484UL, +++ 0xf5a65353UL, 0x68b9d1d1UL, 0x00000000UL, 0x2cc1ededUL, +++ 0x60402020UL, 0x1fe3fcfcUL, 0xc879b1b1UL, 0xedb65b5bUL, +++ 0xbed46a6aUL, 0x468dcbcbUL, 0xd967bebeUL, 0x4b723939UL, +++ 0xde944a4aUL, 0xd4984c4cUL, 0xe8b05858UL, 0x4a85cfcfUL, +++ 0x6bbbd0d0UL, 0x2ac5efefUL, 0xe54faaaaUL, 0x16edfbfbUL, +++ 0xc5864343UL, 0xd79a4d4dUL, 0x55663333UL, 0x94118585UL, +++ 0xcf8a4545UL, 0x10e9f9f9UL, 0x06040202UL, 0x81fe7f7fUL, +++ 0xf0a05050UL, 0x44783c3cUL, 0xba259f9fUL, 0xe34ba8a8UL, +++ 0xf3a25151UL, 0xfe5da3a3UL, 0xc0804040UL, 0x8a058f8fUL, +++ 0xad3f9292UL, 0xbc219d9dUL, 0x48703838UL, 0x04f1f5f5UL, +++ 0xdf63bcbcUL, 0xc177b6b6UL, 0x75afdadaUL, 0x63422121UL, +++ 0x30201010UL, 0x1ae5ffffUL, 0x0efdf3f3UL, 0x6dbfd2d2UL, +++ 0x4c81cdcdUL, 0x14180c0cUL, 0x35261313UL, 0x2fc3ececUL, +++ 0xe1be5f5fUL, 0xa2359797UL, 0xcc884444UL, 0x392e1717UL, +++ 0x5793c4c4UL, 0xf255a7a7UL, 0x82fc7e7eUL, 0x477a3d3dUL, +++ 0xacc86464UL, 0xe7ba5d5dUL, 0x2b321919UL, 0x95e67373UL, +++ 0xa0c06060UL, 0x98198181UL, 0xd19e4f4fUL, 0x7fa3dcdcUL, +++ 0x66442222UL, 0x7e542a2aUL, 0xab3b9090UL, 0x830b8888UL, +++ 0xca8c4646UL, 0x29c7eeeeUL, 0xd36bb8b8UL, 0x3c281414UL, +++ 0x79a7dedeUL, 0xe2bc5e5eUL, 0x1d160b0bUL, 0x76addbdbUL, +++ 0x3bdbe0e0UL, 0x56643232UL, 0x4e743a3aUL, 0x1e140a0aUL, +++ 0xdb924949UL, 0x0a0c0606UL, 0x6c482424UL, 0xe4b85c5cUL, +++ 0x5d9fc2c2UL, 0x6ebdd3d3UL, 0xef43acacUL, 0xa6c46262UL, +++ 0xa8399191UL, 0xa4319595UL, 0x37d3e4e4UL, 0x8bf27979UL, +++ 0x32d5e7e7UL, 0x438bc8c8UL, 0x596e3737UL, 0xb7da6d6dUL, +++ 0x8c018d8dUL, 0x64b1d5d5UL, 0xd29c4e4eUL, 0xe049a9a9UL, +++ 0xb4d86c6cUL, 0xfaac5656UL, 0x07f3f4f4UL, 0x25cfeaeaUL, +++ 0xafca6565UL, 0x8ef47a7aUL, 0xe947aeaeUL, 0x18100808UL, +++ 0xd56fbabaUL, 0x88f07878UL, 0x6f4a2525UL, 0x725c2e2eUL, +++ 0x24381c1cUL, 0xf157a6a6UL, 0xc773b4b4UL, 0x5197c6c6UL, +++ 0x23cbe8e8UL, 0x7ca1ddddUL, 0x9ce87474UL, 0x213e1f1fUL, +++ 0xdd964b4bUL, 0xdc61bdbdUL, 0x860d8b8bUL, 0x850f8a8aUL, +++ 0x90e07070UL, 0x427c3e3eUL, 0xc471b5b5UL, 0xaacc6666UL, +++ 0xd8904848UL, 0x05060303UL, 0x01f7f6f6UL, 0x121c0e0eUL, +++ 0xa3c26161UL, 0x5f6a3535UL, 0xf9ae5757UL, 0xd069b9b9UL, +++ 0x91178686UL, 0x5899c1c1UL, 0x273a1d1dUL, 0xb9279e9eUL, +++ 0x38d9e1e1UL, 0x13ebf8f8UL, 0xb32b9898UL, 0x33221111UL, +++ 0xbbd26969UL, 0x70a9d9d9UL, 0x89078e8eUL, 0xa7339494UL, +++ 0xb62d9b9bUL, 0x223c1e1eUL, 0x92158787UL, 0x20c9e9e9UL, +++ 0x4987ceceUL, 0xffaa5555UL, 0x78502828UL, 0x7aa5dfdfUL, +++ 0x8f038c8cUL, 0xf859a1a1UL, 0x80098989UL, 0x171a0d0dUL, +++ 0xda65bfbfUL, 0x31d7e6e6UL, 0xc6844242UL, 0xb8d06868UL, +++ 0xc3824141UL, 0xb0299999UL, 0x775a2d2dUL, 0x111e0f0fUL, +++ 0xcb7bb0b0UL, 0xfca85454UL, 0xd66dbbbbUL, 0x3a2c1616UL, +++}; +++static const ulong32 TE2[256] = { +++ 0x63a5c663UL, 0x7c84f87cUL, 0x7799ee77UL, 0x7b8df67bUL, +++ 0xf20dfff2UL, 0x6bbdd66bUL, 0x6fb1de6fUL, 0xc55491c5UL, +++ 0x30506030UL, 0x01030201UL, 0x67a9ce67UL, 0x2b7d562bUL, +++ 0xfe19e7feUL, 0xd762b5d7UL, 0xabe64dabUL, 0x769aec76UL, +++ 0xca458fcaUL, 0x829d1f82UL, 0xc94089c9UL, 0x7d87fa7dUL, +++ 0xfa15effaUL, 0x59ebb259UL, 0x47c98e47UL, 0xf00bfbf0UL, +++ 0xadec41adUL, 0xd467b3d4UL, 0xa2fd5fa2UL, 0xafea45afUL, +++ 0x9cbf239cUL, 0xa4f753a4UL, 0x7296e472UL, 0xc05b9bc0UL, +++ 0xb7c275b7UL, 0xfd1ce1fdUL, 0x93ae3d93UL, 0x266a4c26UL, +++ 0x365a6c36UL, 0x3f417e3fUL, 0xf702f5f7UL, 0xcc4f83ccUL, +++ 0x345c6834UL, 0xa5f451a5UL, 0xe534d1e5UL, 0xf108f9f1UL, +++ 0x7193e271UL, 0xd873abd8UL, 0x31536231UL, 0x153f2a15UL, +++ 0x040c0804UL, 0xc75295c7UL, 0x23654623UL, 0xc35e9dc3UL, +++ 0x18283018UL, 0x96a13796UL, 0x050f0a05UL, 0x9ab52f9aUL, +++ 0x07090e07UL, 0x12362412UL, 0x809b1b80UL, 0xe23ddfe2UL, +++ 0xeb26cdebUL, 0x27694e27UL, 0xb2cd7fb2UL, 0x759fea75UL, +++ 0x091b1209UL, 0x839e1d83UL, 0x2c74582cUL, 0x1a2e341aUL, +++ 0x1b2d361bUL, 0x6eb2dc6eUL, 0x5aeeb45aUL, 0xa0fb5ba0UL, +++ 0x52f6a452UL, 0x3b4d763bUL, 0xd661b7d6UL, 0xb3ce7db3UL, +++ 0x297b5229UL, 0xe33edde3UL, 0x2f715e2fUL, 0x84971384UL, +++ 0x53f5a653UL, 0xd168b9d1UL, 0x00000000UL, 0xed2cc1edUL, +++ 0x20604020UL, 0xfc1fe3fcUL, 0xb1c879b1UL, 0x5bedb65bUL, +++ 0x6abed46aUL, 0xcb468dcbUL, 0xbed967beUL, 0x394b7239UL, +++ 0x4ade944aUL, 0x4cd4984cUL, 0x58e8b058UL, 0xcf4a85cfUL, +++ 0xd06bbbd0UL, 0xef2ac5efUL, 0xaae54faaUL, 0xfb16edfbUL, +++ 0x43c58643UL, 0x4dd79a4dUL, 0x33556633UL, 0x85941185UL, +++ 0x45cf8a45UL, 0xf910e9f9UL, 0x02060402UL, 0x7f81fe7fUL, +++ 0x50f0a050UL, 0x3c44783cUL, 0x9fba259fUL, 0xa8e34ba8UL, +++ 0x51f3a251UL, 0xa3fe5da3UL, 0x40c08040UL, 0x8f8a058fUL, +++ 0x92ad3f92UL, 0x9dbc219dUL, 0x38487038UL, 0xf504f1f5UL, +++ 0xbcdf63bcUL, 0xb6c177b6UL, 0xda75afdaUL, 0x21634221UL, +++ 0x10302010UL, 0xff1ae5ffUL, 0xf30efdf3UL, 0xd26dbfd2UL, +++ 0xcd4c81cdUL, 0x0c14180cUL, 0x13352613UL, 0xec2fc3ecUL, +++ 0x5fe1be5fUL, 0x97a23597UL, 0x44cc8844UL, 0x17392e17UL, +++ 0xc45793c4UL, 0xa7f255a7UL, 0x7e82fc7eUL, 0x3d477a3dUL, +++ 0x64acc864UL, 0x5de7ba5dUL, 0x192b3219UL, 0x7395e673UL, +++ 0x60a0c060UL, 0x81981981UL, 0x4fd19e4fUL, 0xdc7fa3dcUL, +++ 0x22664422UL, 0x2a7e542aUL, 0x90ab3b90UL, 0x88830b88UL, +++ 0x46ca8c46UL, 0xee29c7eeUL, 0xb8d36bb8UL, 0x143c2814UL, +++ 0xde79a7deUL, 0x5ee2bc5eUL, 0x0b1d160bUL, 0xdb76addbUL, +++ 0xe03bdbe0UL, 0x32566432UL, 0x3a4e743aUL, 0x0a1e140aUL, +++ 0x49db9249UL, 0x060a0c06UL, 0x246c4824UL, 0x5ce4b85cUL, +++ 0xc25d9fc2UL, 0xd36ebdd3UL, 0xacef43acUL, 0x62a6c462UL, +++ 0x91a83991UL, 0x95a43195UL, 0xe437d3e4UL, 0x798bf279UL, +++ 0xe732d5e7UL, 0xc8438bc8UL, 0x37596e37UL, 0x6db7da6dUL, +++ 0x8d8c018dUL, 0xd564b1d5UL, 0x4ed29c4eUL, 0xa9e049a9UL, +++ 0x6cb4d86cUL, 0x56faac56UL, 0xf407f3f4UL, 0xea25cfeaUL, +++ 0x65afca65UL, 0x7a8ef47aUL, 0xaee947aeUL, 0x08181008UL, +++ 0xbad56fbaUL, 0x7888f078UL, 0x256f4a25UL, 0x2e725c2eUL, +++ 0x1c24381cUL, 0xa6f157a6UL, 0xb4c773b4UL, 0xc65197c6UL, +++ 0xe823cbe8UL, 0xdd7ca1ddUL, 0x749ce874UL, 0x1f213e1fUL, +++ 0x4bdd964bUL, 0xbddc61bdUL, 0x8b860d8bUL, 0x8a850f8aUL, +++ 0x7090e070UL, 0x3e427c3eUL, 0xb5c471b5UL, 0x66aacc66UL, +++ 0x48d89048UL, 0x03050603UL, 0xf601f7f6UL, 0x0e121c0eUL, +++ 0x61a3c261UL, 0x355f6a35UL, 0x57f9ae57UL, 0xb9d069b9UL, +++ 0x86911786UL, 0xc15899c1UL, 0x1d273a1dUL, 0x9eb9279eUL, +++ 0xe138d9e1UL, 0xf813ebf8UL, 0x98b32b98UL, 0x11332211UL, +++ 0x69bbd269UL, 0xd970a9d9UL, 0x8e89078eUL, 0x94a73394UL, +++ 0x9bb62d9bUL, 0x1e223c1eUL, 0x87921587UL, 0xe920c9e9UL, +++ 0xce4987ceUL, 0x55ffaa55UL, 0x28785028UL, 0xdf7aa5dfUL, +++ 0x8c8f038cUL, 0xa1f859a1UL, 0x89800989UL, 0x0d171a0dUL, +++ 0xbfda65bfUL, 0xe631d7e6UL, 0x42c68442UL, 0x68b8d068UL, +++ 0x41c38241UL, 0x99b02999UL, 0x2d775a2dUL, 0x0f111e0fUL, +++ 0xb0cb7bb0UL, 0x54fca854UL, 0xbbd66dbbUL, 0x163a2c16UL, +++}; +++static const ulong32 TE3[256] = { +++ +++ 0x6363a5c6UL, 0x7c7c84f8UL, 0x777799eeUL, 0x7b7b8df6UL, +++ 0xf2f20dffUL, 0x6b6bbdd6UL, 0x6f6fb1deUL, 0xc5c55491UL, +++ 0x30305060UL, 0x01010302UL, 0x6767a9ceUL, 0x2b2b7d56UL, +++ 0xfefe19e7UL, 0xd7d762b5UL, 0xababe64dUL, 0x76769aecUL, +++ 0xcaca458fUL, 0x82829d1fUL, 0xc9c94089UL, 0x7d7d87faUL, +++ 0xfafa15efUL, 0x5959ebb2UL, 0x4747c98eUL, 0xf0f00bfbUL, +++ 0xadadec41UL, 0xd4d467b3UL, 0xa2a2fd5fUL, 0xafafea45UL, +++ 0x9c9cbf23UL, 0xa4a4f753UL, 0x727296e4UL, 0xc0c05b9bUL, +++ 0xb7b7c275UL, 0xfdfd1ce1UL, 0x9393ae3dUL, 0x26266a4cUL, +++ 0x36365a6cUL, 0x3f3f417eUL, 0xf7f702f5UL, 0xcccc4f83UL, +++ 0x34345c68UL, 0xa5a5f451UL, 0xe5e534d1UL, 0xf1f108f9UL, +++ 0x717193e2UL, 0xd8d873abUL, 0x31315362UL, 0x15153f2aUL, +++ 0x04040c08UL, 0xc7c75295UL, 0x23236546UL, 0xc3c35e9dUL, +++ 0x18182830UL, 0x9696a137UL, 0x05050f0aUL, 0x9a9ab52fUL, +++ 0x0707090eUL, 0x12123624UL, 0x80809b1bUL, 0xe2e23ddfUL, +++ 0xebeb26cdUL, 0x2727694eUL, 0xb2b2cd7fUL, 0x75759feaUL, +++ 0x09091b12UL, 0x83839e1dUL, 0x2c2c7458UL, 0x1a1a2e34UL, +++ 0x1b1b2d36UL, 0x6e6eb2dcUL, 0x5a5aeeb4UL, 0xa0a0fb5bUL, +++ 0x5252f6a4UL, 0x3b3b4d76UL, 0xd6d661b7UL, 0xb3b3ce7dUL, +++ 0x29297b52UL, 0xe3e33eddUL, 0x2f2f715eUL, 0x84849713UL, +++ 0x5353f5a6UL, 0xd1d168b9UL, 0x00000000UL, 0xeded2cc1UL, +++ 0x20206040UL, 0xfcfc1fe3UL, 0xb1b1c879UL, 0x5b5bedb6UL, +++ 0x6a6abed4UL, 0xcbcb468dUL, 0xbebed967UL, 0x39394b72UL, +++ 0x4a4ade94UL, 0x4c4cd498UL, 0x5858e8b0UL, 0xcfcf4a85UL, +++ 0xd0d06bbbUL, 0xefef2ac5UL, 0xaaaae54fUL, 0xfbfb16edUL, +++ 0x4343c586UL, 0x4d4dd79aUL, 0x33335566UL, 0x85859411UL, +++ 0x4545cf8aUL, 0xf9f910e9UL, 0x02020604UL, 0x7f7f81feUL, +++ 0x5050f0a0UL, 0x3c3c4478UL, 0x9f9fba25UL, 0xa8a8e34bUL, +++ 0x5151f3a2UL, 0xa3a3fe5dUL, 0x4040c080UL, 0x8f8f8a05UL, +++ 0x9292ad3fUL, 0x9d9dbc21UL, 0x38384870UL, 0xf5f504f1UL, +++ 0xbcbcdf63UL, 0xb6b6c177UL, 0xdada75afUL, 0x21216342UL, +++ 0x10103020UL, 0xffff1ae5UL, 0xf3f30efdUL, 0xd2d26dbfUL, +++ 0xcdcd4c81UL, 0x0c0c1418UL, 0x13133526UL, 0xecec2fc3UL, +++ 0x5f5fe1beUL, 0x9797a235UL, 0x4444cc88UL, 0x1717392eUL, +++ 0xc4c45793UL, 0xa7a7f255UL, 0x7e7e82fcUL, 0x3d3d477aUL, +++ 0x6464acc8UL, 0x5d5de7baUL, 0x19192b32UL, 0x737395e6UL, +++ 0x6060a0c0UL, 0x81819819UL, 0x4f4fd19eUL, 0xdcdc7fa3UL, +++ 0x22226644UL, 0x2a2a7e54UL, 0x9090ab3bUL, 0x8888830bUL, +++ 0x4646ca8cUL, 0xeeee29c7UL, 0xb8b8d36bUL, 0x14143c28UL, +++ 0xdede79a7UL, 0x5e5ee2bcUL, 0x0b0b1d16UL, 0xdbdb76adUL, +++ 0xe0e03bdbUL, 0x32325664UL, 0x3a3a4e74UL, 0x0a0a1e14UL, +++ 0x4949db92UL, 0x06060a0cUL, 0x24246c48UL, 0x5c5ce4b8UL, +++ 0xc2c25d9fUL, 0xd3d36ebdUL, 0xacacef43UL, 0x6262a6c4UL, +++ 0x9191a839UL, 0x9595a431UL, 0xe4e437d3UL, 0x79798bf2UL, +++ 0xe7e732d5UL, 0xc8c8438bUL, 0x3737596eUL, 0x6d6db7daUL, +++ 0x8d8d8c01UL, 0xd5d564b1UL, 0x4e4ed29cUL, 0xa9a9e049UL, +++ 0x6c6cb4d8UL, 0x5656faacUL, 0xf4f407f3UL, 0xeaea25cfUL, +++ 0x6565afcaUL, 0x7a7a8ef4UL, 0xaeaee947UL, 0x08081810UL, +++ 0xbabad56fUL, 0x787888f0UL, 0x25256f4aUL, 0x2e2e725cUL, +++ 0x1c1c2438UL, 0xa6a6f157UL, 0xb4b4c773UL, 0xc6c65197UL, +++ 0xe8e823cbUL, 0xdddd7ca1UL, 0x74749ce8UL, 0x1f1f213eUL, +++ 0x4b4bdd96UL, 0xbdbddc61UL, 0x8b8b860dUL, 0x8a8a850fUL, +++ 0x707090e0UL, 0x3e3e427cUL, 0xb5b5c471UL, 0x6666aaccUL, +++ 0x4848d890UL, 0x03030506UL, 0xf6f601f7UL, 0x0e0e121cUL, +++ 0x6161a3c2UL, 0x35355f6aUL, 0x5757f9aeUL, 0xb9b9d069UL, +++ 0x86869117UL, 0xc1c15899UL, 0x1d1d273aUL, 0x9e9eb927UL, +++ 0xe1e138d9UL, 0xf8f813ebUL, 0x9898b32bUL, 0x11113322UL, +++ 0x6969bbd2UL, 0xd9d970a9UL, 0x8e8e8907UL, 0x9494a733UL, +++ 0x9b9bb62dUL, 0x1e1e223cUL, 0x87879215UL, 0xe9e920c9UL, +++ 0xcece4987UL, 0x5555ffaaUL, 0x28287850UL, 0xdfdf7aa5UL, +++ 0x8c8c8f03UL, 0xa1a1f859UL, 0x89898009UL, 0x0d0d171aUL, +++ 0xbfbfda65UL, 0xe6e631d7UL, 0x4242c684UL, 0x6868b8d0UL, +++ 0x4141c382UL, 0x9999b029UL, 0x2d2d775aUL, 0x0f0f111eUL, +++ 0xb0b0cb7bUL, 0x5454fca8UL, 0xbbbbd66dUL, 0x16163a2cUL, +++}; +++ +++static const ulong32 Te4_0[] = { +++0x00000063UL, 0x0000007cUL, 0x00000077UL, 0x0000007bUL, 0x000000f2UL, 0x0000006bUL, 0x0000006fUL, 0x000000c5UL, +++0x00000030UL, 0x00000001UL, 0x00000067UL, 0x0000002bUL, 0x000000feUL, 0x000000d7UL, 0x000000abUL, 0x00000076UL, +++0x000000caUL, 0x00000082UL, 0x000000c9UL, 0x0000007dUL, 0x000000faUL, 0x00000059UL, 0x00000047UL, 0x000000f0UL, +++0x000000adUL, 0x000000d4UL, 0x000000a2UL, 0x000000afUL, 0x0000009cUL, 0x000000a4UL, 0x00000072UL, 0x000000c0UL, +++0x000000b7UL, 0x000000fdUL, 0x00000093UL, 0x00000026UL, 0x00000036UL, 0x0000003fUL, 0x000000f7UL, 0x000000ccUL, +++0x00000034UL, 0x000000a5UL, 0x000000e5UL, 0x000000f1UL, 0x00000071UL, 0x000000d8UL, 0x00000031UL, 0x00000015UL, +++0x00000004UL, 0x000000c7UL, 0x00000023UL, 0x000000c3UL, 0x00000018UL, 0x00000096UL, 0x00000005UL, 0x0000009aUL, +++0x00000007UL, 0x00000012UL, 0x00000080UL, 0x000000e2UL, 0x000000ebUL, 0x00000027UL, 0x000000b2UL, 0x00000075UL, +++0x00000009UL, 0x00000083UL, 0x0000002cUL, 0x0000001aUL, 0x0000001bUL, 0x0000006eUL, 0x0000005aUL, 0x000000a0UL, +++0x00000052UL, 0x0000003bUL, 0x000000d6UL, 0x000000b3UL, 0x00000029UL, 0x000000e3UL, 0x0000002fUL, 0x00000084UL, +++0x00000053UL, 0x000000d1UL, 0x00000000UL, 0x000000edUL, 0x00000020UL, 0x000000fcUL, 0x000000b1UL, 0x0000005bUL, +++0x0000006aUL, 0x000000cbUL, 0x000000beUL, 0x00000039UL, 0x0000004aUL, 0x0000004cUL, 0x00000058UL, 0x000000cfUL, +++0x000000d0UL, 0x000000efUL, 0x000000aaUL, 0x000000fbUL, 0x00000043UL, 0x0000004dUL, 0x00000033UL, 0x00000085UL, +++0x00000045UL, 0x000000f9UL, 0x00000002UL, 0x0000007fUL, 0x00000050UL, 0x0000003cUL, 0x0000009fUL, 0x000000a8UL, +++0x00000051UL, 0x000000a3UL, 0x00000040UL, 0x0000008fUL, 0x00000092UL, 0x0000009dUL, 0x00000038UL, 0x000000f5UL, +++0x000000bcUL, 0x000000b6UL, 0x000000daUL, 0x00000021UL, 0x00000010UL, 0x000000ffUL, 0x000000f3UL, 0x000000d2UL, +++0x000000cdUL, 0x0000000cUL, 0x00000013UL, 0x000000ecUL, 0x0000005fUL, 0x00000097UL, 0x00000044UL, 0x00000017UL, +++0x000000c4UL, 0x000000a7UL, 0x0000007eUL, 0x0000003dUL, 0x00000064UL, 0x0000005dUL, 0x00000019UL, 0x00000073UL, +++0x00000060UL, 0x00000081UL, 0x0000004fUL, 0x000000dcUL, 0x00000022UL, 0x0000002aUL, 0x00000090UL, 0x00000088UL, +++0x00000046UL, 0x000000eeUL, 0x000000b8UL, 0x00000014UL, 0x000000deUL, 0x0000005eUL, 0x0000000bUL, 0x000000dbUL, +++0x000000e0UL, 0x00000032UL, 0x0000003aUL, 0x0000000aUL, 0x00000049UL, 0x00000006UL, 0x00000024UL, 0x0000005cUL, +++0x000000c2UL, 0x000000d3UL, 0x000000acUL, 0x00000062UL, 0x00000091UL, 0x00000095UL, 0x000000e4UL, 0x00000079UL, +++0x000000e7UL, 0x000000c8UL, 0x00000037UL, 0x0000006dUL, 0x0000008dUL, 0x000000d5UL, 0x0000004eUL, 0x000000a9UL, +++0x0000006cUL, 0x00000056UL, 0x000000f4UL, 0x000000eaUL, 0x00000065UL, 0x0000007aUL, 0x000000aeUL, 0x00000008UL, +++0x000000baUL, 0x00000078UL, 0x00000025UL, 0x0000002eUL, 0x0000001cUL, 0x000000a6UL, 0x000000b4UL, 0x000000c6UL, +++0x000000e8UL, 0x000000ddUL, 0x00000074UL, 0x0000001fUL, 0x0000004bUL, 0x000000bdUL, 0x0000008bUL, 0x0000008aUL, +++0x00000070UL, 0x0000003eUL, 0x000000b5UL, 0x00000066UL, 0x00000048UL, 0x00000003UL, 0x000000f6UL, 0x0000000eUL, +++0x00000061UL, 0x00000035UL, 0x00000057UL, 0x000000b9UL, 0x00000086UL, 0x000000c1UL, 0x0000001dUL, 0x0000009eUL, +++0x000000e1UL, 0x000000f8UL, 0x00000098UL, 0x00000011UL, 0x00000069UL, 0x000000d9UL, 0x0000008eUL, 0x00000094UL, +++0x0000009bUL, 0x0000001eUL, 0x00000087UL, 0x000000e9UL, 0x000000ceUL, 0x00000055UL, 0x00000028UL, 0x000000dfUL, +++0x0000008cUL, 0x000000a1UL, 0x00000089UL, 0x0000000dUL, 0x000000bfUL, 0x000000e6UL, 0x00000042UL, 0x00000068UL, +++0x00000041UL, 0x00000099UL, 0x0000002dUL, 0x0000000fUL, 0x000000b0UL, 0x00000054UL, 0x000000bbUL, 0x00000016UL +++}; +++ +++static const ulong32 Te4_1[] = { +++0x00006300UL, 0x00007c00UL, 0x00007700UL, 0x00007b00UL, 0x0000f200UL, 0x00006b00UL, 0x00006f00UL, 0x0000c500UL, +++0x00003000UL, 0x00000100UL, 0x00006700UL, 0x00002b00UL, 0x0000fe00UL, 0x0000d700UL, 0x0000ab00UL, 0x00007600UL, +++0x0000ca00UL, 0x00008200UL, 0x0000c900UL, 0x00007d00UL, 0x0000fa00UL, 0x00005900UL, 0x00004700UL, 0x0000f000UL, +++0x0000ad00UL, 0x0000d400UL, 0x0000a200UL, 0x0000af00UL, 0x00009c00UL, 0x0000a400UL, 0x00007200UL, 0x0000c000UL, +++0x0000b700UL, 0x0000fd00UL, 0x00009300UL, 0x00002600UL, 0x00003600UL, 0x00003f00UL, 0x0000f700UL, 0x0000cc00UL, +++0x00003400UL, 0x0000a500UL, 0x0000e500UL, 0x0000f100UL, 0x00007100UL, 0x0000d800UL, 0x00003100UL, 0x00001500UL, +++0x00000400UL, 0x0000c700UL, 0x00002300UL, 0x0000c300UL, 0x00001800UL, 0x00009600UL, 0x00000500UL, 0x00009a00UL, +++0x00000700UL, 0x00001200UL, 0x00008000UL, 0x0000e200UL, 0x0000eb00UL, 0x00002700UL, 0x0000b200UL, 0x00007500UL, +++0x00000900UL, 0x00008300UL, 0x00002c00UL, 0x00001a00UL, 0x00001b00UL, 0x00006e00UL, 0x00005a00UL, 0x0000a000UL, +++0x00005200UL, 0x00003b00UL, 0x0000d600UL, 0x0000b300UL, 0x00002900UL, 0x0000e300UL, 0x00002f00UL, 0x00008400UL, +++0x00005300UL, 0x0000d100UL, 0x00000000UL, 0x0000ed00UL, 0x00002000UL, 0x0000fc00UL, 0x0000b100UL, 0x00005b00UL, +++0x00006a00UL, 0x0000cb00UL, 0x0000be00UL, 0x00003900UL, 0x00004a00UL, 0x00004c00UL, 0x00005800UL, 0x0000cf00UL, +++0x0000d000UL, 0x0000ef00UL, 0x0000aa00UL, 0x0000fb00UL, 0x00004300UL, 0x00004d00UL, 0x00003300UL, 0x00008500UL, +++0x00004500UL, 0x0000f900UL, 0x00000200UL, 0x00007f00UL, 0x00005000UL, 0x00003c00UL, 0x00009f00UL, 0x0000a800UL, +++0x00005100UL, 0x0000a300UL, 0x00004000UL, 0x00008f00UL, 0x00009200UL, 0x00009d00UL, 0x00003800UL, 0x0000f500UL, +++0x0000bc00UL, 0x0000b600UL, 0x0000da00UL, 0x00002100UL, 0x00001000UL, 0x0000ff00UL, 0x0000f300UL, 0x0000d200UL, +++0x0000cd00UL, 0x00000c00UL, 0x00001300UL, 0x0000ec00UL, 0x00005f00UL, 0x00009700UL, 0x00004400UL, 0x00001700UL, +++0x0000c400UL, 0x0000a700UL, 0x00007e00UL, 0x00003d00UL, 0x00006400UL, 0x00005d00UL, 0x00001900UL, 0x00007300UL, +++0x00006000UL, 0x00008100UL, 0x00004f00UL, 0x0000dc00UL, 0x00002200UL, 0x00002a00UL, 0x00009000UL, 0x00008800UL, +++0x00004600UL, 0x0000ee00UL, 0x0000b800UL, 0x00001400UL, 0x0000de00UL, 0x00005e00UL, 0x00000b00UL, 0x0000db00UL, +++0x0000e000UL, 0x00003200UL, 0x00003a00UL, 0x00000a00UL, 0x00004900UL, 0x00000600UL, 0x00002400UL, 0x00005c00UL, +++0x0000c200UL, 0x0000d300UL, 0x0000ac00UL, 0x00006200UL, 0x00009100UL, 0x00009500UL, 0x0000e400UL, 0x00007900UL, +++0x0000e700UL, 0x0000c800UL, 0x00003700UL, 0x00006d00UL, 0x00008d00UL, 0x0000d500UL, 0x00004e00UL, 0x0000a900UL, +++0x00006c00UL, 0x00005600UL, 0x0000f400UL, 0x0000ea00UL, 0x00006500UL, 0x00007a00UL, 0x0000ae00UL, 0x00000800UL, +++0x0000ba00UL, 0x00007800UL, 0x00002500UL, 0x00002e00UL, 0x00001c00UL, 0x0000a600UL, 0x0000b400UL, 0x0000c600UL, +++0x0000e800UL, 0x0000dd00UL, 0x00007400UL, 0x00001f00UL, 0x00004b00UL, 0x0000bd00UL, 0x00008b00UL, 0x00008a00UL, +++0x00007000UL, 0x00003e00UL, 0x0000b500UL, 0x00006600UL, 0x00004800UL, 0x00000300UL, 0x0000f600UL, 0x00000e00UL, +++0x00006100UL, 0x00003500UL, 0x00005700UL, 0x0000b900UL, 0x00008600UL, 0x0000c100UL, 0x00001d00UL, 0x00009e00UL, +++0x0000e100UL, 0x0000f800UL, 0x00009800UL, 0x00001100UL, 0x00006900UL, 0x0000d900UL, 0x00008e00UL, 0x00009400UL, +++0x00009b00UL, 0x00001e00UL, 0x00008700UL, 0x0000e900UL, 0x0000ce00UL, 0x00005500UL, 0x00002800UL, 0x0000df00UL, +++0x00008c00UL, 0x0000a100UL, 0x00008900UL, 0x00000d00UL, 0x0000bf00UL, 0x0000e600UL, 0x00004200UL, 0x00006800UL, +++0x00004100UL, 0x00009900UL, 0x00002d00UL, 0x00000f00UL, 0x0000b000UL, 0x00005400UL, 0x0000bb00UL, 0x00001600UL +++}; +++ +++static const ulong32 Te4_2[] = { +++0x00630000UL, 0x007c0000UL, 0x00770000UL, 0x007b0000UL, 0x00f20000UL, 0x006b0000UL, 0x006f0000UL, 0x00c50000UL, +++0x00300000UL, 0x00010000UL, 0x00670000UL, 0x002b0000UL, 0x00fe0000UL, 0x00d70000UL, 0x00ab0000UL, 0x00760000UL, +++0x00ca0000UL, 0x00820000UL, 0x00c90000UL, 0x007d0000UL, 0x00fa0000UL, 0x00590000UL, 0x00470000UL, 0x00f00000UL, +++0x00ad0000UL, 0x00d40000UL, 0x00a20000UL, 0x00af0000UL, 0x009c0000UL, 0x00a40000UL, 0x00720000UL, 0x00c00000UL, +++0x00b70000UL, 0x00fd0000UL, 0x00930000UL, 0x00260000UL, 0x00360000UL, 0x003f0000UL, 0x00f70000UL, 0x00cc0000UL, +++0x00340000UL, 0x00a50000UL, 0x00e50000UL, 0x00f10000UL, 0x00710000UL, 0x00d80000UL, 0x00310000UL, 0x00150000UL, +++0x00040000UL, 0x00c70000UL, 0x00230000UL, 0x00c30000UL, 0x00180000UL, 0x00960000UL, 0x00050000UL, 0x009a0000UL, +++0x00070000UL, 0x00120000UL, 0x00800000UL, 0x00e20000UL, 0x00eb0000UL, 0x00270000UL, 0x00b20000UL, 0x00750000UL, +++0x00090000UL, 0x00830000UL, 0x002c0000UL, 0x001a0000UL, 0x001b0000UL, 0x006e0000UL, 0x005a0000UL, 0x00a00000UL, +++0x00520000UL, 0x003b0000UL, 0x00d60000UL, 0x00b30000UL, 0x00290000UL, 0x00e30000UL, 0x002f0000UL, 0x00840000UL, +++0x00530000UL, 0x00d10000UL, 0x00000000UL, 0x00ed0000UL, 0x00200000UL, 0x00fc0000UL, 0x00b10000UL, 0x005b0000UL, +++0x006a0000UL, 0x00cb0000UL, 0x00be0000UL, 0x00390000UL, 0x004a0000UL, 0x004c0000UL, 0x00580000UL, 0x00cf0000UL, +++0x00d00000UL, 0x00ef0000UL, 0x00aa0000UL, 0x00fb0000UL, 0x00430000UL, 0x004d0000UL, 0x00330000UL, 0x00850000UL, +++0x00450000UL, 0x00f90000UL, 0x00020000UL, 0x007f0000UL, 0x00500000UL, 0x003c0000UL, 0x009f0000UL, 0x00a80000UL, +++0x00510000UL, 0x00a30000UL, 0x00400000UL, 0x008f0000UL, 0x00920000UL, 0x009d0000UL, 0x00380000UL, 0x00f50000UL, +++0x00bc0000UL, 0x00b60000UL, 0x00da0000UL, 0x00210000UL, 0x00100000UL, 0x00ff0000UL, 0x00f30000UL, 0x00d20000UL, +++0x00cd0000UL, 0x000c0000UL, 0x00130000UL, 0x00ec0000UL, 0x005f0000UL, 0x00970000UL, 0x00440000UL, 0x00170000UL, +++0x00c40000UL, 0x00a70000UL, 0x007e0000UL, 0x003d0000UL, 0x00640000UL, 0x005d0000UL, 0x00190000UL, 0x00730000UL, +++0x00600000UL, 0x00810000UL, 0x004f0000UL, 0x00dc0000UL, 0x00220000UL, 0x002a0000UL, 0x00900000UL, 0x00880000UL, +++0x00460000UL, 0x00ee0000UL, 0x00b80000UL, 0x00140000UL, 0x00de0000UL, 0x005e0000UL, 0x000b0000UL, 0x00db0000UL, +++0x00e00000UL, 0x00320000UL, 0x003a0000UL, 0x000a0000UL, 0x00490000UL, 0x00060000UL, 0x00240000UL, 0x005c0000UL, +++0x00c20000UL, 0x00d30000UL, 0x00ac0000UL, 0x00620000UL, 0x00910000UL, 0x00950000UL, 0x00e40000UL, 0x00790000UL, +++0x00e70000UL, 0x00c80000UL, 0x00370000UL, 0x006d0000UL, 0x008d0000UL, 0x00d50000UL, 0x004e0000UL, 0x00a90000UL, +++0x006c0000UL, 0x00560000UL, 0x00f40000UL, 0x00ea0000UL, 0x00650000UL, 0x007a0000UL, 0x00ae0000UL, 0x00080000UL, +++0x00ba0000UL, 0x00780000UL, 0x00250000UL, 0x002e0000UL, 0x001c0000UL, 0x00a60000UL, 0x00b40000UL, 0x00c60000UL, +++0x00e80000UL, 0x00dd0000UL, 0x00740000UL, 0x001f0000UL, 0x004b0000UL, 0x00bd0000UL, 0x008b0000UL, 0x008a0000UL, +++0x00700000UL, 0x003e0000UL, 0x00b50000UL, 0x00660000UL, 0x00480000UL, 0x00030000UL, 0x00f60000UL, 0x000e0000UL, +++0x00610000UL, 0x00350000UL, 0x00570000UL, 0x00b90000UL, 0x00860000UL, 0x00c10000UL, 0x001d0000UL, 0x009e0000UL, +++0x00e10000UL, 0x00f80000UL, 0x00980000UL, 0x00110000UL, 0x00690000UL, 0x00d90000UL, 0x008e0000UL, 0x00940000UL, +++0x009b0000UL, 0x001e0000UL, 0x00870000UL, 0x00e90000UL, 0x00ce0000UL, 0x00550000UL, 0x00280000UL, 0x00df0000UL, +++0x008c0000UL, 0x00a10000UL, 0x00890000UL, 0x000d0000UL, 0x00bf0000UL, 0x00e60000UL, 0x00420000UL, 0x00680000UL, +++0x00410000UL, 0x00990000UL, 0x002d0000UL, 0x000f0000UL, 0x00b00000UL, 0x00540000UL, 0x00bb0000UL, 0x00160000UL +++}; +++ +++static const ulong32 Te4_3[] = { +++0x63000000UL, 0x7c000000UL, 0x77000000UL, 0x7b000000UL, 0xf2000000UL, 0x6b000000UL, 0x6f000000UL, 0xc5000000UL, +++0x30000000UL, 0x01000000UL, 0x67000000UL, 0x2b000000UL, 0xfe000000UL, 0xd7000000UL, 0xab000000UL, 0x76000000UL, +++0xca000000UL, 0x82000000UL, 0xc9000000UL, 0x7d000000UL, 0xfa000000UL, 0x59000000UL, 0x47000000UL, 0xf0000000UL, +++0xad000000UL, 0xd4000000UL, 0xa2000000UL, 0xaf000000UL, 0x9c000000UL, 0xa4000000UL, 0x72000000UL, 0xc0000000UL, +++0xb7000000UL, 0xfd000000UL, 0x93000000UL, 0x26000000UL, 0x36000000UL, 0x3f000000UL, 0xf7000000UL, 0xcc000000UL, +++0x34000000UL, 0xa5000000UL, 0xe5000000UL, 0xf1000000UL, 0x71000000UL, 0xd8000000UL, 0x31000000UL, 0x15000000UL, +++0x04000000UL, 0xc7000000UL, 0x23000000UL, 0xc3000000UL, 0x18000000UL, 0x96000000UL, 0x05000000UL, 0x9a000000UL, +++0x07000000UL, 0x12000000UL, 0x80000000UL, 0xe2000000UL, 0xeb000000UL, 0x27000000UL, 0xb2000000UL, 0x75000000UL, +++0x09000000UL, 0x83000000UL, 0x2c000000UL, 0x1a000000UL, 0x1b000000UL, 0x6e000000UL, 0x5a000000UL, 0xa0000000UL, +++0x52000000UL, 0x3b000000UL, 0xd6000000UL, 0xb3000000UL, 0x29000000UL, 0xe3000000UL, 0x2f000000UL, 0x84000000UL, +++0x53000000UL, 0xd1000000UL, 0x00000000UL, 0xed000000UL, 0x20000000UL, 0xfc000000UL, 0xb1000000UL, 0x5b000000UL, +++0x6a000000UL, 0xcb000000UL, 0xbe000000UL, 0x39000000UL, 0x4a000000UL, 0x4c000000UL, 0x58000000UL, 0xcf000000UL, +++0xd0000000UL, 0xef000000UL, 0xaa000000UL, 0xfb000000UL, 0x43000000UL, 0x4d000000UL, 0x33000000UL, 0x85000000UL, +++0x45000000UL, 0xf9000000UL, 0x02000000UL, 0x7f000000UL, 0x50000000UL, 0x3c000000UL, 0x9f000000UL, 0xa8000000UL, +++0x51000000UL, 0xa3000000UL, 0x40000000UL, 0x8f000000UL, 0x92000000UL, 0x9d000000UL, 0x38000000UL, 0xf5000000UL, +++0xbc000000UL, 0xb6000000UL, 0xda000000UL, 0x21000000UL, 0x10000000UL, 0xff000000UL, 0xf3000000UL, 0xd2000000UL, +++0xcd000000UL, 0x0c000000UL, 0x13000000UL, 0xec000000UL, 0x5f000000UL, 0x97000000UL, 0x44000000UL, 0x17000000UL, +++0xc4000000UL, 0xa7000000UL, 0x7e000000UL, 0x3d000000UL, 0x64000000UL, 0x5d000000UL, 0x19000000UL, 0x73000000UL, +++0x60000000UL, 0x81000000UL, 0x4f000000UL, 0xdc000000UL, 0x22000000UL, 0x2a000000UL, 0x90000000UL, 0x88000000UL, +++0x46000000UL, 0xee000000UL, 0xb8000000UL, 0x14000000UL, 0xde000000UL, 0x5e000000UL, 0x0b000000UL, 0xdb000000UL, +++0xe0000000UL, 0x32000000UL, 0x3a000000UL, 0x0a000000UL, 0x49000000UL, 0x06000000UL, 0x24000000UL, 0x5c000000UL, +++0xc2000000UL, 0xd3000000UL, 0xac000000UL, 0x62000000UL, 0x91000000UL, 0x95000000UL, 0xe4000000UL, 0x79000000UL, +++0xe7000000UL, 0xc8000000UL, 0x37000000UL, 0x6d000000UL, 0x8d000000UL, 0xd5000000UL, 0x4e000000UL, 0xa9000000UL, +++0x6c000000UL, 0x56000000UL, 0xf4000000UL, 0xea000000UL, 0x65000000UL, 0x7a000000UL, 0xae000000UL, 0x08000000UL, +++0xba000000UL, 0x78000000UL, 0x25000000UL, 0x2e000000UL, 0x1c000000UL, 0xa6000000UL, 0xb4000000UL, 0xc6000000UL, +++0xe8000000UL, 0xdd000000UL, 0x74000000UL, 0x1f000000UL, 0x4b000000UL, 0xbd000000UL, 0x8b000000UL, 0x8a000000UL, +++0x70000000UL, 0x3e000000UL, 0xb5000000UL, 0x66000000UL, 0x48000000UL, 0x03000000UL, 0xf6000000UL, 0x0e000000UL, +++0x61000000UL, 0x35000000UL, 0x57000000UL, 0xb9000000UL, 0x86000000UL, 0xc1000000UL, 0x1d000000UL, 0x9e000000UL, +++0xe1000000UL, 0xf8000000UL, 0x98000000UL, 0x11000000UL, 0x69000000UL, 0xd9000000UL, 0x8e000000UL, 0x94000000UL, +++0x9b000000UL, 0x1e000000UL, 0x87000000UL, 0xe9000000UL, 0xce000000UL, 0x55000000UL, 0x28000000UL, 0xdf000000UL, +++0x8c000000UL, 0xa1000000UL, 0x89000000UL, 0x0d000000UL, 0xbf000000UL, 0xe6000000UL, 0x42000000UL, 0x68000000UL, +++0x41000000UL, 0x99000000UL, 0x2d000000UL, 0x0f000000UL, 0xb0000000UL, 0x54000000UL, 0xbb000000UL, 0x16000000UL +++}; +++ +++static const ulong32 TD1[256] = { +++ 0x5051f4a7UL, 0x537e4165UL, 0xc31a17a4UL, 0x963a275eUL, +++ 0xcb3bab6bUL, 0xf11f9d45UL, 0xabacfa58UL, 0x934be303UL, +++ 0x552030faUL, 0xf6ad766dUL, 0x9188cc76UL, 0x25f5024cUL, +++ 0xfc4fe5d7UL, 0xd7c52acbUL, 0x80263544UL, 0x8fb562a3UL, +++ 0x49deb15aUL, 0x6725ba1bUL, 0x9845ea0eUL, 0xe15dfec0UL, +++ 0x02c32f75UL, 0x12814cf0UL, 0xa38d4697UL, 0xc66bd3f9UL, +++ 0xe7038f5fUL, 0x9515929cUL, 0xebbf6d7aUL, 0xda955259UL, +++ 0x2dd4be83UL, 0xd3587421UL, 0x2949e069UL, 0x448ec9c8UL, +++ 0x6a75c289UL, 0x78f48e79UL, 0x6b99583eUL, 0xdd27b971UL, +++ 0xb6bee14fUL, 0x17f088adUL, 0x66c920acUL, 0xb47dce3aUL, +++ 0x1863df4aUL, 0x82e51a31UL, 0x60975133UL, 0x4562537fUL, +++ 0xe0b16477UL, 0x84bb6baeUL, 0x1cfe81a0UL, 0x94f9082bUL, +++ 0x58704868UL, 0x198f45fdUL, 0x8794de6cUL, 0xb7527bf8UL, +++ 0x23ab73d3UL, 0xe2724b02UL, 0x57e31f8fUL, 0x2a6655abUL, +++ 0x07b2eb28UL, 0x032fb5c2UL, 0x9a86c57bUL, 0xa5d33708UL, +++ 0xf2302887UL, 0xb223bfa5UL, 0xba02036aUL, 0x5ced1682UL, +++ 0x2b8acf1cUL, 0x92a779b4UL, 0xf0f307f2UL, 0xa14e69e2UL, +++ 0xcd65daf4UL, 0xd50605beUL, 0x1fd13462UL, 0x8ac4a6feUL, +++ 0x9d342e53UL, 0xa0a2f355UL, 0x32058ae1UL, 0x75a4f6ebUL, +++ 0x390b83ecUL, 0xaa4060efUL, 0x065e719fUL, 0x51bd6e10UL, +++ 0xf93e218aUL, 0x3d96dd06UL, 0xaedd3e05UL, 0x464de6bdUL, +++ 0xb591548dUL, 0x0571c45dUL, 0x6f0406d4UL, 0xff605015UL, +++ 0x241998fbUL, 0x97d6bde9UL, 0xcc894043UL, 0x7767d99eUL, +++ 0xbdb0e842UL, 0x8807898bUL, 0x38e7195bUL, 0xdb79c8eeUL, +++ 0x47a17c0aUL, 0xe97c420fUL, 0xc9f8841eUL, 0x00000000UL, +++ 0x83098086UL, 0x48322bedUL, 0xac1e1170UL, 0x4e6c5a72UL, +++ 0xfbfd0effUL, 0x560f8538UL, 0x1e3daed5UL, 0x27362d39UL, +++ 0x640a0fd9UL, 0x21685ca6UL, 0xd19b5b54UL, 0x3a24362eUL, +++ 0xb10c0a67UL, 0x0f9357e7UL, 0xd2b4ee96UL, 0x9e1b9b91UL, +++ 0x4f80c0c5UL, 0xa261dc20UL, 0x695a774bUL, 0x161c121aUL, +++ 0x0ae293baUL, 0xe5c0a02aUL, 0x433c22e0UL, 0x1d121b17UL, +++ 0x0b0e090dUL, 0xadf28bc7UL, 0xb92db6a8UL, 0xc8141ea9UL, +++ 0x8557f119UL, 0x4caf7507UL, 0xbbee99ddUL, 0xfda37f60UL, +++ 0x9ff70126UL, 0xbc5c72f5UL, 0xc544663bUL, 0x345bfb7eUL, +++ 0x768b4329UL, 0xdccb23c6UL, 0x68b6edfcUL, 0x63b8e4f1UL, +++ 0xcad731dcUL, 0x10426385UL, 0x40139722UL, 0x2084c611UL, +++ 0x7d854a24UL, 0xf8d2bb3dUL, 0x11aef932UL, 0x6dc729a1UL, +++ 0x4b1d9e2fUL, 0xf3dcb230UL, 0xec0d8652UL, 0xd077c1e3UL, +++ 0x6c2bb316UL, 0x99a970b9UL, 0xfa119448UL, 0x2247e964UL, +++ 0xc4a8fc8cUL, 0x1aa0f03fUL, 0xd8567d2cUL, 0xef223390UL, +++ 0xc787494eUL, 0xc1d938d1UL, 0xfe8ccaa2UL, 0x3698d40bUL, +++ 0xcfa6f581UL, 0x28a57adeUL, 0x26dab78eUL, 0xa43fadbfUL, +++ 0xe42c3a9dUL, 0x0d507892UL, 0x9b6a5fccUL, 0x62547e46UL, +++ 0xc2f68d13UL, 0xe890d8b8UL, 0x5e2e39f7UL, 0xf582c3afUL, +++ 0xbe9f5d80UL, 0x7c69d093UL, 0xa96fd52dUL, 0xb3cf2512UL, +++ 0x3bc8ac99UL, 0xa710187dUL, 0x6ee89c63UL, 0x7bdb3bbbUL, +++ 0x09cd2678UL, 0xf46e5918UL, 0x01ec9ab7UL, 0xa8834f9aUL, +++ 0x65e6956eUL, 0x7eaaffe6UL, 0x0821bccfUL, 0xe6ef15e8UL, +++ 0xd9bae79bUL, 0xce4a6f36UL, 0xd4ea9f09UL, 0xd629b07cUL, +++ 0xaf31a4b2UL, 0x312a3f23UL, 0x30c6a594UL, 0xc035a266UL, +++ 0x37744ebcUL, 0xa6fc82caUL, 0xb0e090d0UL, 0x1533a7d8UL, +++ 0x4af10498UL, 0xf741ecdaUL, 0x0e7fcd50UL, 0x2f1791f6UL, +++ 0x8d764dd6UL, 0x4d43efb0UL, 0x54ccaa4dUL, 0xdfe49604UL, +++ 0xe39ed1b5UL, 0x1b4c6a88UL, 0xb8c12c1fUL, 0x7f466551UL, +++ 0x049d5eeaUL, 0x5d018c35UL, 0x73fa8774UL, 0x2efb0b41UL, +++ 0x5ab3671dUL, 0x5292dbd2UL, 0x33e91056UL, 0x136dd647UL, +++ 0x8c9ad761UL, 0x7a37a10cUL, 0x8e59f814UL, 0x89eb133cUL, +++ 0xeecea927UL, 0x35b761c9UL, 0xede11ce5UL, 0x3c7a47b1UL, +++ 0x599cd2dfUL, 0x3f55f273UL, 0x791814ceUL, 0xbf73c737UL, +++ 0xea53f7cdUL, 0x5b5ffdaaUL, 0x14df3d6fUL, 0x867844dbUL, +++ 0x81caaff3UL, 0x3eb968c4UL, 0x2c382434UL, 0x5fc2a340UL, +++ 0x72161dc3UL, 0x0cbce225UL, 0x8b283c49UL, 0x41ff0d95UL, +++ 0x7139a801UL, 0xde080cb3UL, 0x9cd8b4e4UL, 0x906456c1UL, +++ 0x617bcb84UL, 0x70d532b6UL, 0x74486c5cUL, 0x42d0b857UL, +++}; +++static const ulong32 TD2[256] = { +++ 0xa75051f4UL, 0x65537e41UL, 0xa4c31a17UL, 0x5e963a27UL, +++ 0x6bcb3babUL, 0x45f11f9dUL, 0x58abacfaUL, 0x03934be3UL, +++ 0xfa552030UL, 0x6df6ad76UL, 0x769188ccUL, 0x4c25f502UL, +++ 0xd7fc4fe5UL, 0xcbd7c52aUL, 0x44802635UL, 0xa38fb562UL, +++ 0x5a49deb1UL, 0x1b6725baUL, 0x0e9845eaUL, 0xc0e15dfeUL, +++ 0x7502c32fUL, 0xf012814cUL, 0x97a38d46UL, 0xf9c66bd3UL, +++ 0x5fe7038fUL, 0x9c951592UL, 0x7aebbf6dUL, 0x59da9552UL, +++ 0x832dd4beUL, 0x21d35874UL, 0x692949e0UL, 0xc8448ec9UL, +++ 0x896a75c2UL, 0x7978f48eUL, 0x3e6b9958UL, 0x71dd27b9UL, +++ 0x4fb6bee1UL, 0xad17f088UL, 0xac66c920UL, 0x3ab47dceUL, +++ 0x4a1863dfUL, 0x3182e51aUL, 0x33609751UL, 0x7f456253UL, +++ 0x77e0b164UL, 0xae84bb6bUL, 0xa01cfe81UL, 0x2b94f908UL, +++ 0x68587048UL, 0xfd198f45UL, 0x6c8794deUL, 0xf8b7527bUL, +++ 0xd323ab73UL, 0x02e2724bUL, 0x8f57e31fUL, 0xab2a6655UL, +++ 0x2807b2ebUL, 0xc2032fb5UL, 0x7b9a86c5UL, 0x08a5d337UL, +++ 0x87f23028UL, 0xa5b223bfUL, 0x6aba0203UL, 0x825ced16UL, +++ 0x1c2b8acfUL, 0xb492a779UL, 0xf2f0f307UL, 0xe2a14e69UL, +++ 0xf4cd65daUL, 0xbed50605UL, 0x621fd134UL, 0xfe8ac4a6UL, +++ 0x539d342eUL, 0x55a0a2f3UL, 0xe132058aUL, 0xeb75a4f6UL, +++ 0xec390b83UL, 0xefaa4060UL, 0x9f065e71UL, 0x1051bd6eUL, +++ 0x8af93e21UL, 0x063d96ddUL, 0x05aedd3eUL, 0xbd464de6UL, +++ 0x8db59154UL, 0x5d0571c4UL, 0xd46f0406UL, 0x15ff6050UL, +++ 0xfb241998UL, 0xe997d6bdUL, 0x43cc8940UL, 0x9e7767d9UL, +++ 0x42bdb0e8UL, 0x8b880789UL, 0x5b38e719UL, 0xeedb79c8UL, +++ 0x0a47a17cUL, 0x0fe97c42UL, 0x1ec9f884UL, 0x00000000UL, +++ 0x86830980UL, 0xed48322bUL, 0x70ac1e11UL, 0x724e6c5aUL, +++ 0xfffbfd0eUL, 0x38560f85UL, 0xd51e3daeUL, 0x3927362dUL, +++ 0xd9640a0fUL, 0xa621685cUL, 0x54d19b5bUL, 0x2e3a2436UL, +++ 0x67b10c0aUL, 0xe70f9357UL, 0x96d2b4eeUL, 0x919e1b9bUL, +++ 0xc54f80c0UL, 0x20a261dcUL, 0x4b695a77UL, 0x1a161c12UL, +++ 0xba0ae293UL, 0x2ae5c0a0UL, 0xe0433c22UL, 0x171d121bUL, +++ 0x0d0b0e09UL, 0xc7adf28bUL, 0xa8b92db6UL, 0xa9c8141eUL, +++ 0x198557f1UL, 0x074caf75UL, 0xddbbee99UL, 0x60fda37fUL, +++ 0x269ff701UL, 0xf5bc5c72UL, 0x3bc54466UL, 0x7e345bfbUL, +++ 0x29768b43UL, 0xc6dccb23UL, 0xfc68b6edUL, 0xf163b8e4UL, +++ 0xdccad731UL, 0x85104263UL, 0x22401397UL, 0x112084c6UL, +++ 0x247d854aUL, 0x3df8d2bbUL, 0x3211aef9UL, 0xa16dc729UL, +++ 0x2f4b1d9eUL, 0x30f3dcb2UL, 0x52ec0d86UL, 0xe3d077c1UL, +++ 0x166c2bb3UL, 0xb999a970UL, 0x48fa1194UL, 0x642247e9UL, +++ 0x8cc4a8fcUL, 0x3f1aa0f0UL, 0x2cd8567dUL, 0x90ef2233UL, +++ 0x4ec78749UL, 0xd1c1d938UL, 0xa2fe8ccaUL, 0x0b3698d4UL, +++ 0x81cfa6f5UL, 0xde28a57aUL, 0x8e26dab7UL, 0xbfa43fadUL, +++ 0x9de42c3aUL, 0x920d5078UL, 0xcc9b6a5fUL, 0x4662547eUL, +++ 0x13c2f68dUL, 0xb8e890d8UL, 0xf75e2e39UL, 0xaff582c3UL, +++ 0x80be9f5dUL, 0x937c69d0UL, 0x2da96fd5UL, 0x12b3cf25UL, +++ 0x993bc8acUL, 0x7da71018UL, 0x636ee89cUL, 0xbb7bdb3bUL, +++ 0x7809cd26UL, 0x18f46e59UL, 0xb701ec9aUL, 0x9aa8834fUL, +++ 0x6e65e695UL, 0xe67eaaffUL, 0xcf0821bcUL, 0xe8e6ef15UL, +++ 0x9bd9bae7UL, 0x36ce4a6fUL, 0x09d4ea9fUL, 0x7cd629b0UL, +++ 0xb2af31a4UL, 0x23312a3fUL, 0x9430c6a5UL, 0x66c035a2UL, +++ 0xbc37744eUL, 0xcaa6fc82UL, 0xd0b0e090UL, 0xd81533a7UL, +++ 0x984af104UL, 0xdaf741ecUL, 0x500e7fcdUL, 0xf62f1791UL, +++ 0xd68d764dUL, 0xb04d43efUL, 0x4d54ccaaUL, 0x04dfe496UL, +++ 0xb5e39ed1UL, 0x881b4c6aUL, 0x1fb8c12cUL, 0x517f4665UL, +++ 0xea049d5eUL, 0x355d018cUL, 0x7473fa87UL, 0x412efb0bUL, +++ 0x1d5ab367UL, 0xd25292dbUL, 0x5633e910UL, 0x47136dd6UL, +++ 0x618c9ad7UL, 0x0c7a37a1UL, 0x148e59f8UL, 0x3c89eb13UL, +++ 0x27eecea9UL, 0xc935b761UL, 0xe5ede11cUL, 0xb13c7a47UL, +++ 0xdf599cd2UL, 0x733f55f2UL, 0xce791814UL, 0x37bf73c7UL, +++ 0xcdea53f7UL, 0xaa5b5ffdUL, 0x6f14df3dUL, 0xdb867844UL, +++ 0xf381caafUL, 0xc43eb968UL, 0x342c3824UL, 0x405fc2a3UL, +++ 0xc372161dUL, 0x250cbce2UL, 0x498b283cUL, 0x9541ff0dUL, +++ 0x017139a8UL, 0xb3de080cUL, 0xe49cd8b4UL, 0xc1906456UL, +++ 0x84617bcbUL, 0xb670d532UL, 0x5c74486cUL, 0x5742d0b8UL, +++}; +++static const ulong32 TD3[256] = { +++ 0xf4a75051UL, 0x4165537eUL, 0x17a4c31aUL, 0x275e963aUL, +++ 0xab6bcb3bUL, 0x9d45f11fUL, 0xfa58abacUL, 0xe303934bUL, +++ 0x30fa5520UL, 0x766df6adUL, 0xcc769188UL, 0x024c25f5UL, +++ 0xe5d7fc4fUL, 0x2acbd7c5UL, 0x35448026UL, 0x62a38fb5UL, +++ 0xb15a49deUL, 0xba1b6725UL, 0xea0e9845UL, 0xfec0e15dUL, +++ 0x2f7502c3UL, 0x4cf01281UL, 0x4697a38dUL, 0xd3f9c66bUL, +++ 0x8f5fe703UL, 0x929c9515UL, 0x6d7aebbfUL, 0x5259da95UL, +++ 0xbe832dd4UL, 0x7421d358UL, 0xe0692949UL, 0xc9c8448eUL, +++ 0xc2896a75UL, 0x8e7978f4UL, 0x583e6b99UL, 0xb971dd27UL, +++ 0xe14fb6beUL, 0x88ad17f0UL, 0x20ac66c9UL, 0xce3ab47dUL, +++ 0xdf4a1863UL, 0x1a3182e5UL, 0x51336097UL, 0x537f4562UL, +++ 0x6477e0b1UL, 0x6bae84bbUL, 0x81a01cfeUL, 0x082b94f9UL, +++ 0x48685870UL, 0x45fd198fUL, 0xde6c8794UL, 0x7bf8b752UL, +++ 0x73d323abUL, 0x4b02e272UL, 0x1f8f57e3UL, 0x55ab2a66UL, +++ 0xeb2807b2UL, 0xb5c2032fUL, 0xc57b9a86UL, 0x3708a5d3UL, +++ 0x2887f230UL, 0xbfa5b223UL, 0x036aba02UL, 0x16825cedUL, +++ 0xcf1c2b8aUL, 0x79b492a7UL, 0x07f2f0f3UL, 0x69e2a14eUL, +++ 0xdaf4cd65UL, 0x05bed506UL, 0x34621fd1UL, 0xa6fe8ac4UL, +++ 0x2e539d34UL, 0xf355a0a2UL, 0x8ae13205UL, 0xf6eb75a4UL, +++ 0x83ec390bUL, 0x60efaa40UL, 0x719f065eUL, 0x6e1051bdUL, +++ 0x218af93eUL, 0xdd063d96UL, 0x3e05aeddUL, 0xe6bd464dUL, +++ 0x548db591UL, 0xc45d0571UL, 0x06d46f04UL, 0x5015ff60UL, +++ 0x98fb2419UL, 0xbde997d6UL, 0x4043cc89UL, 0xd99e7767UL, +++ 0xe842bdb0UL, 0x898b8807UL, 0x195b38e7UL, 0xc8eedb79UL, +++ 0x7c0a47a1UL, 0x420fe97cUL, 0x841ec9f8UL, 0x00000000UL, +++ 0x80868309UL, 0x2bed4832UL, 0x1170ac1eUL, 0x5a724e6cUL, +++ 0x0efffbfdUL, 0x8538560fUL, 0xaed51e3dUL, 0x2d392736UL, +++ 0x0fd9640aUL, 0x5ca62168UL, 0x5b54d19bUL, 0x362e3a24UL, +++ 0x0a67b10cUL, 0x57e70f93UL, 0xee96d2b4UL, 0x9b919e1bUL, +++ 0xc0c54f80UL, 0xdc20a261UL, 0x774b695aUL, 0x121a161cUL, +++ 0x93ba0ae2UL, 0xa02ae5c0UL, 0x22e0433cUL, 0x1b171d12UL, +++ 0x090d0b0eUL, 0x8bc7adf2UL, 0xb6a8b92dUL, 0x1ea9c814UL, +++ 0xf1198557UL, 0x75074cafUL, 0x99ddbbeeUL, 0x7f60fda3UL, +++ 0x01269ff7UL, 0x72f5bc5cUL, 0x663bc544UL, 0xfb7e345bUL, +++ 0x4329768bUL, 0x23c6dccbUL, 0xedfc68b6UL, 0xe4f163b8UL, +++ 0x31dccad7UL, 0x63851042UL, 0x97224013UL, 0xc6112084UL, +++ 0x4a247d85UL, 0xbb3df8d2UL, 0xf93211aeUL, 0x29a16dc7UL, +++ 0x9e2f4b1dUL, 0xb230f3dcUL, 0x8652ec0dUL, 0xc1e3d077UL, +++ 0xb3166c2bUL, 0x70b999a9UL, 0x9448fa11UL, 0xe9642247UL, +++ 0xfc8cc4a8UL, 0xf03f1aa0UL, 0x7d2cd856UL, 0x3390ef22UL, +++ 0x494ec787UL, 0x38d1c1d9UL, 0xcaa2fe8cUL, 0xd40b3698UL, +++ 0xf581cfa6UL, 0x7ade28a5UL, 0xb78e26daUL, 0xadbfa43fUL, +++ 0x3a9de42cUL, 0x78920d50UL, 0x5fcc9b6aUL, 0x7e466254UL, +++ 0x8d13c2f6UL, 0xd8b8e890UL, 0x39f75e2eUL, 0xc3aff582UL, +++ 0x5d80be9fUL, 0xd0937c69UL, 0xd52da96fUL, 0x2512b3cfUL, +++ 0xac993bc8UL, 0x187da710UL, 0x9c636ee8UL, 0x3bbb7bdbUL, +++ 0x267809cdUL, 0x5918f46eUL, 0x9ab701ecUL, 0x4f9aa883UL, +++ 0x956e65e6UL, 0xffe67eaaUL, 0xbccf0821UL, 0x15e8e6efUL, +++ 0xe79bd9baUL, 0x6f36ce4aUL, 0x9f09d4eaUL, 0xb07cd629UL, +++ 0xa4b2af31UL, 0x3f23312aUL, 0xa59430c6UL, 0xa266c035UL, +++ 0x4ebc3774UL, 0x82caa6fcUL, 0x90d0b0e0UL, 0xa7d81533UL, +++ 0x04984af1UL, 0xecdaf741UL, 0xcd500e7fUL, 0x91f62f17UL, +++ 0x4dd68d76UL, 0xefb04d43UL, 0xaa4d54ccUL, 0x9604dfe4UL, +++ 0xd1b5e39eUL, 0x6a881b4cUL, 0x2c1fb8c1UL, 0x65517f46UL, +++ 0x5eea049dUL, 0x8c355d01UL, 0x877473faUL, 0x0b412efbUL, +++ 0x671d5ab3UL, 0xdbd25292UL, 0x105633e9UL, 0xd647136dUL, +++ 0xd7618c9aUL, 0xa10c7a37UL, 0xf8148e59UL, 0x133c89ebUL, +++ 0xa927eeceUL, 0x61c935b7UL, 0x1ce5ede1UL, 0x47b13c7aUL, +++ 0xd2df599cUL, 0xf2733f55UL, 0x14ce7918UL, 0xc737bf73UL, +++ 0xf7cdea53UL, 0xfdaa5b5fUL, 0x3d6f14dfUL, 0x44db8678UL, +++ 0xaff381caUL, 0x68c43eb9UL, 0x24342c38UL, 0xa3405fc2UL, +++ 0x1dc37216UL, 0xe2250cbcUL, 0x3c498b28UL, 0x0d9541ffUL, +++ 0xa8017139UL, 0x0cb3de08UL, 0xb4e49cd8UL, 0x56c19064UL, +++ 0xcb84617bUL, 0x32b670d5UL, 0x6c5c7448UL, 0xb85742d0UL, +++}; +++ +++static const ulong32 Tks0[] = { +++0x00000000UL, 0x0e090d0bUL, 0x1c121a16UL, 0x121b171dUL, 0x3824342cUL, 0x362d3927UL, 0x24362e3aUL, 0x2a3f2331UL, +++0x70486858UL, 0x7e416553UL, 0x6c5a724eUL, 0x62537f45UL, 0x486c5c74UL, 0x4665517fUL, 0x547e4662UL, 0x5a774b69UL, +++0xe090d0b0UL, 0xee99ddbbUL, 0xfc82caa6UL, 0xf28bc7adUL, 0xd8b4e49cUL, 0xd6bde997UL, 0xc4a6fe8aUL, 0xcaaff381UL, +++0x90d8b8e8UL, 0x9ed1b5e3UL, 0x8ccaa2feUL, 0x82c3aff5UL, 0xa8fc8cc4UL, 0xa6f581cfUL, 0xb4ee96d2UL, 0xbae79bd9UL, +++0xdb3bbb7bUL, 0xd532b670UL, 0xc729a16dUL, 0xc920ac66UL, 0xe31f8f57UL, 0xed16825cUL, 0xff0d9541UL, 0xf104984aUL, +++0xab73d323UL, 0xa57ade28UL, 0xb761c935UL, 0xb968c43eUL, 0x9357e70fUL, 0x9d5eea04UL, 0x8f45fd19UL, 0x814cf012UL, +++0x3bab6bcbUL, 0x35a266c0UL, 0x27b971ddUL, 0x29b07cd6UL, 0x038f5fe7UL, 0x0d8652ecUL, 0x1f9d45f1UL, 0x119448faUL, +++0x4be30393UL, 0x45ea0e98UL, 0x57f11985UL, 0x59f8148eUL, 0x73c737bfUL, 0x7dce3ab4UL, 0x6fd52da9UL, 0x61dc20a2UL, +++0xad766df6UL, 0xa37f60fdUL, 0xb16477e0UL, 0xbf6d7aebUL, 0x955259daUL, 0x9b5b54d1UL, 0x894043ccUL, 0x87494ec7UL, +++0xdd3e05aeUL, 0xd33708a5UL, 0xc12c1fb8UL, 0xcf2512b3UL, 0xe51a3182UL, 0xeb133c89UL, 0xf9082b94UL, 0xf701269fUL, +++0x4de6bd46UL, 0x43efb04dUL, 0x51f4a750UL, 0x5ffdaa5bUL, 0x75c2896aUL, 0x7bcb8461UL, 0x69d0937cUL, 0x67d99e77UL, +++0x3daed51eUL, 0x33a7d815UL, 0x21bccf08UL, 0x2fb5c203UL, 0x058ae132UL, 0x0b83ec39UL, 0x1998fb24UL, 0x1791f62fUL, +++0x764dd68dUL, 0x7844db86UL, 0x6a5fcc9bUL, 0x6456c190UL, 0x4e69e2a1UL, 0x4060efaaUL, 0x527bf8b7UL, 0x5c72f5bcUL, +++0x0605bed5UL, 0x080cb3deUL, 0x1a17a4c3UL, 0x141ea9c8UL, 0x3e218af9UL, 0x302887f2UL, 0x223390efUL, 0x2c3a9de4UL, +++0x96dd063dUL, 0x98d40b36UL, 0x8acf1c2bUL, 0x84c61120UL, 0xaef93211UL, 0xa0f03f1aUL, 0xb2eb2807UL, 0xbce2250cUL, +++0xe6956e65UL, 0xe89c636eUL, 0xfa877473UL, 0xf48e7978UL, 0xdeb15a49UL, 0xd0b85742UL, 0xc2a3405fUL, 0xccaa4d54UL, +++0x41ecdaf7UL, 0x4fe5d7fcUL, 0x5dfec0e1UL, 0x53f7cdeaUL, 0x79c8eedbUL, 0x77c1e3d0UL, 0x65daf4cdUL, 0x6bd3f9c6UL, +++0x31a4b2afUL, 0x3fadbfa4UL, 0x2db6a8b9UL, 0x23bfa5b2UL, 0x09808683UL, 0x07898b88UL, 0x15929c95UL, 0x1b9b919eUL, +++0xa17c0a47UL, 0xaf75074cUL, 0xbd6e1051UL, 0xb3671d5aUL, 0x99583e6bUL, 0x97513360UL, 0x854a247dUL, 0x8b432976UL, +++0xd134621fUL, 0xdf3d6f14UL, 0xcd267809UL, 0xc32f7502UL, 0xe9105633UL, 0xe7195b38UL, 0xf5024c25UL, 0xfb0b412eUL, +++0x9ad7618cUL, 0x94de6c87UL, 0x86c57b9aUL, 0x88cc7691UL, 0xa2f355a0UL, 0xacfa58abUL, 0xbee14fb6UL, 0xb0e842bdUL, +++0xea9f09d4UL, 0xe49604dfUL, 0xf68d13c2UL, 0xf8841ec9UL, 0xd2bb3df8UL, 0xdcb230f3UL, 0xcea927eeUL, 0xc0a02ae5UL, +++0x7a47b13cUL, 0x744ebc37UL, 0x6655ab2aUL, 0x685ca621UL, 0x42638510UL, 0x4c6a881bUL, 0x5e719f06UL, 0x5078920dUL, +++0x0a0fd964UL, 0x0406d46fUL, 0x161dc372UL, 0x1814ce79UL, 0x322bed48UL, 0x3c22e043UL, 0x2e39f75eUL, 0x2030fa55UL, +++0xec9ab701UL, 0xe293ba0aUL, 0xf088ad17UL, 0xfe81a01cUL, 0xd4be832dUL, 0xdab78e26UL, 0xc8ac993bUL, 0xc6a59430UL, +++0x9cd2df59UL, 0x92dbd252UL, 0x80c0c54fUL, 0x8ec9c844UL, 0xa4f6eb75UL, 0xaaffe67eUL, 0xb8e4f163UL, 0xb6edfc68UL, +++0x0c0a67b1UL, 0x02036abaUL, 0x10187da7UL, 0x1e1170acUL, 0x342e539dUL, 0x3a275e96UL, 0x283c498bUL, 0x26354480UL, +++0x7c420fe9UL, 0x724b02e2UL, 0x605015ffUL, 0x6e5918f4UL, 0x44663bc5UL, 0x4a6f36ceUL, 0x587421d3UL, 0x567d2cd8UL, +++0x37a10c7aUL, 0x39a80171UL, 0x2bb3166cUL, 0x25ba1b67UL, 0x0f853856UL, 0x018c355dUL, 0x13972240UL, 0x1d9e2f4bUL, +++0x47e96422UL, 0x49e06929UL, 0x5bfb7e34UL, 0x55f2733fUL, 0x7fcd500eUL, 0x71c45d05UL, 0x63df4a18UL, 0x6dd64713UL, +++0xd731dccaUL, 0xd938d1c1UL, 0xcb23c6dcUL, 0xc52acbd7UL, 0xef15e8e6UL, 0xe11ce5edUL, 0xf307f2f0UL, 0xfd0efffbUL, +++0xa779b492UL, 0xa970b999UL, 0xbb6bae84UL, 0xb562a38fUL, 0x9f5d80beUL, 0x91548db5UL, 0x834f9aa8UL, 0x8d4697a3UL +++}; +++ +++static const ulong32 Tks1[] = { +++0x00000000UL, 0x0b0e090dUL, 0x161c121aUL, 0x1d121b17UL, 0x2c382434UL, 0x27362d39UL, 0x3a24362eUL, 0x312a3f23UL, +++0x58704868UL, 0x537e4165UL, 0x4e6c5a72UL, 0x4562537fUL, 0x74486c5cUL, 0x7f466551UL, 0x62547e46UL, 0x695a774bUL, +++0xb0e090d0UL, 0xbbee99ddUL, 0xa6fc82caUL, 0xadf28bc7UL, 0x9cd8b4e4UL, 0x97d6bde9UL, 0x8ac4a6feUL, 0x81caaff3UL, +++0xe890d8b8UL, 0xe39ed1b5UL, 0xfe8ccaa2UL, 0xf582c3afUL, 0xc4a8fc8cUL, 0xcfa6f581UL, 0xd2b4ee96UL, 0xd9bae79bUL, +++0x7bdb3bbbUL, 0x70d532b6UL, 0x6dc729a1UL, 0x66c920acUL, 0x57e31f8fUL, 0x5ced1682UL, 0x41ff0d95UL, 0x4af10498UL, +++0x23ab73d3UL, 0x28a57adeUL, 0x35b761c9UL, 0x3eb968c4UL, 0x0f9357e7UL, 0x049d5eeaUL, 0x198f45fdUL, 0x12814cf0UL, +++0xcb3bab6bUL, 0xc035a266UL, 0xdd27b971UL, 0xd629b07cUL, 0xe7038f5fUL, 0xec0d8652UL, 0xf11f9d45UL, 0xfa119448UL, +++0x934be303UL, 0x9845ea0eUL, 0x8557f119UL, 0x8e59f814UL, 0xbf73c737UL, 0xb47dce3aUL, 0xa96fd52dUL, 0xa261dc20UL, +++0xf6ad766dUL, 0xfda37f60UL, 0xe0b16477UL, 0xebbf6d7aUL, 0xda955259UL, 0xd19b5b54UL, 0xcc894043UL, 0xc787494eUL, +++0xaedd3e05UL, 0xa5d33708UL, 0xb8c12c1fUL, 0xb3cf2512UL, 0x82e51a31UL, 0x89eb133cUL, 0x94f9082bUL, 0x9ff70126UL, +++0x464de6bdUL, 0x4d43efb0UL, 0x5051f4a7UL, 0x5b5ffdaaUL, 0x6a75c289UL, 0x617bcb84UL, 0x7c69d093UL, 0x7767d99eUL, +++0x1e3daed5UL, 0x1533a7d8UL, 0x0821bccfUL, 0x032fb5c2UL, 0x32058ae1UL, 0x390b83ecUL, 0x241998fbUL, 0x2f1791f6UL, +++0x8d764dd6UL, 0x867844dbUL, 0x9b6a5fccUL, 0x906456c1UL, 0xa14e69e2UL, 0xaa4060efUL, 0xb7527bf8UL, 0xbc5c72f5UL, +++0xd50605beUL, 0xde080cb3UL, 0xc31a17a4UL, 0xc8141ea9UL, 0xf93e218aUL, 0xf2302887UL, 0xef223390UL, 0xe42c3a9dUL, +++0x3d96dd06UL, 0x3698d40bUL, 0x2b8acf1cUL, 0x2084c611UL, 0x11aef932UL, 0x1aa0f03fUL, 0x07b2eb28UL, 0x0cbce225UL, +++0x65e6956eUL, 0x6ee89c63UL, 0x73fa8774UL, 0x78f48e79UL, 0x49deb15aUL, 0x42d0b857UL, 0x5fc2a340UL, 0x54ccaa4dUL, +++0xf741ecdaUL, 0xfc4fe5d7UL, 0xe15dfec0UL, 0xea53f7cdUL, 0xdb79c8eeUL, 0xd077c1e3UL, 0xcd65daf4UL, 0xc66bd3f9UL, +++0xaf31a4b2UL, 0xa43fadbfUL, 0xb92db6a8UL, 0xb223bfa5UL, 0x83098086UL, 0x8807898bUL, 0x9515929cUL, 0x9e1b9b91UL, +++0x47a17c0aUL, 0x4caf7507UL, 0x51bd6e10UL, 0x5ab3671dUL, 0x6b99583eUL, 0x60975133UL, 0x7d854a24UL, 0x768b4329UL, +++0x1fd13462UL, 0x14df3d6fUL, 0x09cd2678UL, 0x02c32f75UL, 0x33e91056UL, 0x38e7195bUL, 0x25f5024cUL, 0x2efb0b41UL, +++0x8c9ad761UL, 0x8794de6cUL, 0x9a86c57bUL, 0x9188cc76UL, 0xa0a2f355UL, 0xabacfa58UL, 0xb6bee14fUL, 0xbdb0e842UL, +++0xd4ea9f09UL, 0xdfe49604UL, 0xc2f68d13UL, 0xc9f8841eUL, 0xf8d2bb3dUL, 0xf3dcb230UL, 0xeecea927UL, 0xe5c0a02aUL, +++0x3c7a47b1UL, 0x37744ebcUL, 0x2a6655abUL, 0x21685ca6UL, 0x10426385UL, 0x1b4c6a88UL, 0x065e719fUL, 0x0d507892UL, +++0x640a0fd9UL, 0x6f0406d4UL, 0x72161dc3UL, 0x791814ceUL, 0x48322bedUL, 0x433c22e0UL, 0x5e2e39f7UL, 0x552030faUL, +++0x01ec9ab7UL, 0x0ae293baUL, 0x17f088adUL, 0x1cfe81a0UL, 0x2dd4be83UL, 0x26dab78eUL, 0x3bc8ac99UL, 0x30c6a594UL, +++0x599cd2dfUL, 0x5292dbd2UL, 0x4f80c0c5UL, 0x448ec9c8UL, 0x75a4f6ebUL, 0x7eaaffe6UL, 0x63b8e4f1UL, 0x68b6edfcUL, +++0xb10c0a67UL, 0xba02036aUL, 0xa710187dUL, 0xac1e1170UL, 0x9d342e53UL, 0x963a275eUL, 0x8b283c49UL, 0x80263544UL, +++0xe97c420fUL, 0xe2724b02UL, 0xff605015UL, 0xf46e5918UL, 0xc544663bUL, 0xce4a6f36UL, 0xd3587421UL, 0xd8567d2cUL, +++0x7a37a10cUL, 0x7139a801UL, 0x6c2bb316UL, 0x6725ba1bUL, 0x560f8538UL, 0x5d018c35UL, 0x40139722UL, 0x4b1d9e2fUL, +++0x2247e964UL, 0x2949e069UL, 0x345bfb7eUL, 0x3f55f273UL, 0x0e7fcd50UL, 0x0571c45dUL, 0x1863df4aUL, 0x136dd647UL, +++0xcad731dcUL, 0xc1d938d1UL, 0xdccb23c6UL, 0xd7c52acbUL, 0xe6ef15e8UL, 0xede11ce5UL, 0xf0f307f2UL, 0xfbfd0effUL, +++0x92a779b4UL, 0x99a970b9UL, 0x84bb6baeUL, 0x8fb562a3UL, 0xbe9f5d80UL, 0xb591548dUL, 0xa8834f9aUL, 0xa38d4697UL +++}; +++ +++static const ulong32 Tks2[] = { +++0x00000000UL, 0x0d0b0e09UL, 0x1a161c12UL, 0x171d121bUL, 0x342c3824UL, 0x3927362dUL, 0x2e3a2436UL, 0x23312a3fUL, +++0x68587048UL, 0x65537e41UL, 0x724e6c5aUL, 0x7f456253UL, 0x5c74486cUL, 0x517f4665UL, 0x4662547eUL, 0x4b695a77UL, +++0xd0b0e090UL, 0xddbbee99UL, 0xcaa6fc82UL, 0xc7adf28bUL, 0xe49cd8b4UL, 0xe997d6bdUL, 0xfe8ac4a6UL, 0xf381caafUL, +++0xb8e890d8UL, 0xb5e39ed1UL, 0xa2fe8ccaUL, 0xaff582c3UL, 0x8cc4a8fcUL, 0x81cfa6f5UL, 0x96d2b4eeUL, 0x9bd9bae7UL, +++0xbb7bdb3bUL, 0xb670d532UL, 0xa16dc729UL, 0xac66c920UL, 0x8f57e31fUL, 0x825ced16UL, 0x9541ff0dUL, 0x984af104UL, +++0xd323ab73UL, 0xde28a57aUL, 0xc935b761UL, 0xc43eb968UL, 0xe70f9357UL, 0xea049d5eUL, 0xfd198f45UL, 0xf012814cUL, +++0x6bcb3babUL, 0x66c035a2UL, 0x71dd27b9UL, 0x7cd629b0UL, 0x5fe7038fUL, 0x52ec0d86UL, 0x45f11f9dUL, 0x48fa1194UL, +++0x03934be3UL, 0x0e9845eaUL, 0x198557f1UL, 0x148e59f8UL, 0x37bf73c7UL, 0x3ab47dceUL, 0x2da96fd5UL, 0x20a261dcUL, +++0x6df6ad76UL, 0x60fda37fUL, 0x77e0b164UL, 0x7aebbf6dUL, 0x59da9552UL, 0x54d19b5bUL, 0x43cc8940UL, 0x4ec78749UL, +++0x05aedd3eUL, 0x08a5d337UL, 0x1fb8c12cUL, 0x12b3cf25UL, 0x3182e51aUL, 0x3c89eb13UL, 0x2b94f908UL, 0x269ff701UL, +++0xbd464de6UL, 0xb04d43efUL, 0xa75051f4UL, 0xaa5b5ffdUL, 0x896a75c2UL, 0x84617bcbUL, 0x937c69d0UL, 0x9e7767d9UL, +++0xd51e3daeUL, 0xd81533a7UL, 0xcf0821bcUL, 0xc2032fb5UL, 0xe132058aUL, 0xec390b83UL, 0xfb241998UL, 0xf62f1791UL, +++0xd68d764dUL, 0xdb867844UL, 0xcc9b6a5fUL, 0xc1906456UL, 0xe2a14e69UL, 0xefaa4060UL, 0xf8b7527bUL, 0xf5bc5c72UL, +++0xbed50605UL, 0xb3de080cUL, 0xa4c31a17UL, 0xa9c8141eUL, 0x8af93e21UL, 0x87f23028UL, 0x90ef2233UL, 0x9de42c3aUL, +++0x063d96ddUL, 0x0b3698d4UL, 0x1c2b8acfUL, 0x112084c6UL, 0x3211aef9UL, 0x3f1aa0f0UL, 0x2807b2ebUL, 0x250cbce2UL, +++0x6e65e695UL, 0x636ee89cUL, 0x7473fa87UL, 0x7978f48eUL, 0x5a49deb1UL, 0x5742d0b8UL, 0x405fc2a3UL, 0x4d54ccaaUL, +++0xdaf741ecUL, 0xd7fc4fe5UL, 0xc0e15dfeUL, 0xcdea53f7UL, 0xeedb79c8UL, 0xe3d077c1UL, 0xf4cd65daUL, 0xf9c66bd3UL, +++0xb2af31a4UL, 0xbfa43fadUL, 0xa8b92db6UL, 0xa5b223bfUL, 0x86830980UL, 0x8b880789UL, 0x9c951592UL, 0x919e1b9bUL, +++0x0a47a17cUL, 0x074caf75UL, 0x1051bd6eUL, 0x1d5ab367UL, 0x3e6b9958UL, 0x33609751UL, 0x247d854aUL, 0x29768b43UL, +++0x621fd134UL, 0x6f14df3dUL, 0x7809cd26UL, 0x7502c32fUL, 0x5633e910UL, 0x5b38e719UL, 0x4c25f502UL, 0x412efb0bUL, +++0x618c9ad7UL, 0x6c8794deUL, 0x7b9a86c5UL, 0x769188ccUL, 0x55a0a2f3UL, 0x58abacfaUL, 0x4fb6bee1UL, 0x42bdb0e8UL, +++0x09d4ea9fUL, 0x04dfe496UL, 0x13c2f68dUL, 0x1ec9f884UL, 0x3df8d2bbUL, 0x30f3dcb2UL, 0x27eecea9UL, 0x2ae5c0a0UL, +++0xb13c7a47UL, 0xbc37744eUL, 0xab2a6655UL, 0xa621685cUL, 0x85104263UL, 0x881b4c6aUL, 0x9f065e71UL, 0x920d5078UL, +++0xd9640a0fUL, 0xd46f0406UL, 0xc372161dUL, 0xce791814UL, 0xed48322bUL, 0xe0433c22UL, 0xf75e2e39UL, 0xfa552030UL, +++0xb701ec9aUL, 0xba0ae293UL, 0xad17f088UL, 0xa01cfe81UL, 0x832dd4beUL, 0x8e26dab7UL, 0x993bc8acUL, 0x9430c6a5UL, +++0xdf599cd2UL, 0xd25292dbUL, 0xc54f80c0UL, 0xc8448ec9UL, 0xeb75a4f6UL, 0xe67eaaffUL, 0xf163b8e4UL, 0xfc68b6edUL, +++0x67b10c0aUL, 0x6aba0203UL, 0x7da71018UL, 0x70ac1e11UL, 0x539d342eUL, 0x5e963a27UL, 0x498b283cUL, 0x44802635UL, +++0x0fe97c42UL, 0x02e2724bUL, 0x15ff6050UL, 0x18f46e59UL, 0x3bc54466UL, 0x36ce4a6fUL, 0x21d35874UL, 0x2cd8567dUL, +++0x0c7a37a1UL, 0x017139a8UL, 0x166c2bb3UL, 0x1b6725baUL, 0x38560f85UL, 0x355d018cUL, 0x22401397UL, 0x2f4b1d9eUL, +++0x642247e9UL, 0x692949e0UL, 0x7e345bfbUL, 0x733f55f2UL, 0x500e7fcdUL, 0x5d0571c4UL, 0x4a1863dfUL, 0x47136dd6UL, +++0xdccad731UL, 0xd1c1d938UL, 0xc6dccb23UL, 0xcbd7c52aUL, 0xe8e6ef15UL, 0xe5ede11cUL, 0xf2f0f307UL, 0xfffbfd0eUL, +++0xb492a779UL, 0xb999a970UL, 0xae84bb6bUL, 0xa38fb562UL, 0x80be9f5dUL, 0x8db59154UL, 0x9aa8834fUL, 0x97a38d46UL +++}; +++ +++static const ulong32 Tks3[] = { +++0x00000000UL, 0x090d0b0eUL, 0x121a161cUL, 0x1b171d12UL, 0x24342c38UL, 0x2d392736UL, 0x362e3a24UL, 0x3f23312aUL, +++0x48685870UL, 0x4165537eUL, 0x5a724e6cUL, 0x537f4562UL, 0x6c5c7448UL, 0x65517f46UL, 0x7e466254UL, 0x774b695aUL, +++0x90d0b0e0UL, 0x99ddbbeeUL, 0x82caa6fcUL, 0x8bc7adf2UL, 0xb4e49cd8UL, 0xbde997d6UL, 0xa6fe8ac4UL, 0xaff381caUL, +++0xd8b8e890UL, 0xd1b5e39eUL, 0xcaa2fe8cUL, 0xc3aff582UL, 0xfc8cc4a8UL, 0xf581cfa6UL, 0xee96d2b4UL, 0xe79bd9baUL, +++0x3bbb7bdbUL, 0x32b670d5UL, 0x29a16dc7UL, 0x20ac66c9UL, 0x1f8f57e3UL, 0x16825cedUL, 0x0d9541ffUL, 0x04984af1UL, +++0x73d323abUL, 0x7ade28a5UL, 0x61c935b7UL, 0x68c43eb9UL, 0x57e70f93UL, 0x5eea049dUL, 0x45fd198fUL, 0x4cf01281UL, +++0xab6bcb3bUL, 0xa266c035UL, 0xb971dd27UL, 0xb07cd629UL, 0x8f5fe703UL, 0x8652ec0dUL, 0x9d45f11fUL, 0x9448fa11UL, +++0xe303934bUL, 0xea0e9845UL, 0xf1198557UL, 0xf8148e59UL, 0xc737bf73UL, 0xce3ab47dUL, 0xd52da96fUL, 0xdc20a261UL, +++0x766df6adUL, 0x7f60fda3UL, 0x6477e0b1UL, 0x6d7aebbfUL, 0x5259da95UL, 0x5b54d19bUL, 0x4043cc89UL, 0x494ec787UL, +++0x3e05aeddUL, 0x3708a5d3UL, 0x2c1fb8c1UL, 0x2512b3cfUL, 0x1a3182e5UL, 0x133c89ebUL, 0x082b94f9UL, 0x01269ff7UL, +++0xe6bd464dUL, 0xefb04d43UL, 0xf4a75051UL, 0xfdaa5b5fUL, 0xc2896a75UL, 0xcb84617bUL, 0xd0937c69UL, 0xd99e7767UL, +++0xaed51e3dUL, 0xa7d81533UL, 0xbccf0821UL, 0xb5c2032fUL, 0x8ae13205UL, 0x83ec390bUL, 0x98fb2419UL, 0x91f62f17UL, +++0x4dd68d76UL, 0x44db8678UL, 0x5fcc9b6aUL, 0x56c19064UL, 0x69e2a14eUL, 0x60efaa40UL, 0x7bf8b752UL, 0x72f5bc5cUL, +++0x05bed506UL, 0x0cb3de08UL, 0x17a4c31aUL, 0x1ea9c814UL, 0x218af93eUL, 0x2887f230UL, 0x3390ef22UL, 0x3a9de42cUL, +++0xdd063d96UL, 0xd40b3698UL, 0xcf1c2b8aUL, 0xc6112084UL, 0xf93211aeUL, 0xf03f1aa0UL, 0xeb2807b2UL, 0xe2250cbcUL, +++0x956e65e6UL, 0x9c636ee8UL, 0x877473faUL, 0x8e7978f4UL, 0xb15a49deUL, 0xb85742d0UL, 0xa3405fc2UL, 0xaa4d54ccUL, +++0xecdaf741UL, 0xe5d7fc4fUL, 0xfec0e15dUL, 0xf7cdea53UL, 0xc8eedb79UL, 0xc1e3d077UL, 0xdaf4cd65UL, 0xd3f9c66bUL, +++0xa4b2af31UL, 0xadbfa43fUL, 0xb6a8b92dUL, 0xbfa5b223UL, 0x80868309UL, 0x898b8807UL, 0x929c9515UL, 0x9b919e1bUL, +++0x7c0a47a1UL, 0x75074cafUL, 0x6e1051bdUL, 0x671d5ab3UL, 0x583e6b99UL, 0x51336097UL, 0x4a247d85UL, 0x4329768bUL, +++0x34621fd1UL, 0x3d6f14dfUL, 0x267809cdUL, 0x2f7502c3UL, 0x105633e9UL, 0x195b38e7UL, 0x024c25f5UL, 0x0b412efbUL, +++0xd7618c9aUL, 0xde6c8794UL, 0xc57b9a86UL, 0xcc769188UL, 0xf355a0a2UL, 0xfa58abacUL, 0xe14fb6beUL, 0xe842bdb0UL, +++0x9f09d4eaUL, 0x9604dfe4UL, 0x8d13c2f6UL, 0x841ec9f8UL, 0xbb3df8d2UL, 0xb230f3dcUL, 0xa927eeceUL, 0xa02ae5c0UL, +++0x47b13c7aUL, 0x4ebc3774UL, 0x55ab2a66UL, 0x5ca62168UL, 0x63851042UL, 0x6a881b4cUL, 0x719f065eUL, 0x78920d50UL, +++0x0fd9640aUL, 0x06d46f04UL, 0x1dc37216UL, 0x14ce7918UL, 0x2bed4832UL, 0x22e0433cUL, 0x39f75e2eUL, 0x30fa5520UL, +++0x9ab701ecUL, 0x93ba0ae2UL, 0x88ad17f0UL, 0x81a01cfeUL, 0xbe832dd4UL, 0xb78e26daUL, 0xac993bc8UL, 0xa59430c6UL, +++0xd2df599cUL, 0xdbd25292UL, 0xc0c54f80UL, 0xc9c8448eUL, 0xf6eb75a4UL, 0xffe67eaaUL, 0xe4f163b8UL, 0xedfc68b6UL, +++0x0a67b10cUL, 0x036aba02UL, 0x187da710UL, 0x1170ac1eUL, 0x2e539d34UL, 0x275e963aUL, 0x3c498b28UL, 0x35448026UL, +++0x420fe97cUL, 0x4b02e272UL, 0x5015ff60UL, 0x5918f46eUL, 0x663bc544UL, 0x6f36ce4aUL, 0x7421d358UL, 0x7d2cd856UL, +++0xa10c7a37UL, 0xa8017139UL, 0xb3166c2bUL, 0xba1b6725UL, 0x8538560fUL, 0x8c355d01UL, 0x97224013UL, 0x9e2f4b1dUL, +++0xe9642247UL, 0xe0692949UL, 0xfb7e345bUL, 0xf2733f55UL, 0xcd500e7fUL, 0xc45d0571UL, 0xdf4a1863UL, 0xd647136dUL, +++0x31dccad7UL, 0x38d1c1d9UL, 0x23c6dccbUL, 0x2acbd7c5UL, 0x15e8e6efUL, 0x1ce5ede1UL, 0x07f2f0f3UL, 0x0efffbfdUL, +++0x79b492a7UL, 0x70b999a9UL, 0x6bae84bbUL, 0x62a38fb5UL, 0x5d80be9fUL, 0x548db591UL, 0x4f9aa883UL, 0x4697a38dUL +++}; +++ +++#endif /* SMALL CODE */ +++ +++static const ulong32 rcon[] = { +++ 0x01000000UL, 0x02000000UL, 0x04000000UL, 0x08000000UL, +++ 0x10000000UL, 0x20000000UL, 0x40000000UL, 0x80000000UL, +++ 0x1B000000UL, 0x36000000UL, /* for 128-bit blocks, AES never uses more than 10 rcon values */ +++}; +++ +++ +++static int aes_setup(const unsigned char *key, int keylen, int rounds, aes_CBC *skey); +++static void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey); +++static void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey); +++ +++#ifdef CLEAN_STACK +++static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey); +++static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey); +++#endif +++ +++int matrixAesInit(sslCipherContext_t *ctx, unsigned char *IV, unsigned char *key, int keylen) +++{ +++ int x, err; +++ +++ if (IV == NULL || key == NULL || ctx == NULL) { +++ return -1; +++ } +++/* +++ setup cipher +++ */ +++ if ((err = aes_setup(key, keylen, 0, &ctx->aes)) != CRYPT_OK) { +++ return -1; +++ } +++/* +++ copy IV +++ */ +++ ctx->aes.blocklen = 16; +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ ctx->aes.IV[x] = IV[x]; +++ } +++ return 0; +++} +++ +++int matrixAesEncrypt(sslCipherContext_t *ctx, unsigned char *pt, unsigned char *ct, int len) +++{ +++ int x, i; +++ unsigned char tmp[MAXBLOCKSIZE]; +++ +++ if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) { +++ matrixStrDebugMsg("Bad parameters to matrixAesEncrypt\n", NULL); +++ return -1; +++ } +++ +++/* +++ is blocklen valid? +++ */ +++ if (ctx->aes.blocklen < 0 || ctx->aes.blocklen > +++ (int)sizeof(ctx->aes.IV)) { +++ return -1; +++ } +++ +++ for (i = 0; i < len; i += ctx->aes.blocklen) { +++/* +++ xor IV against plaintext +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ tmp[x] = pt[x] ^ ctx->aes.IV[x]; +++ } +++/* +++ encrypt +++ */ +++ aes_ecb_encrypt(tmp, ct, &ctx->aes); +++ +++/* +++ store IV [ciphertext] for a future block +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ ctx->aes.IV[x] = ct[x]; +++ } +++ ct += ctx->aes.blocklen; +++ pt += ctx->aes.blocklen; +++ } +++ +++#ifdef CLEAN_STACK +++ zeromem(tmp, sizeof(tmp)); +++#endif +++ return len; +++} +++ +++int matrixAesDecrypt(sslCipherContext_t *ctx, unsigned char *ct, unsigned char *pt, int len) +++{ +++ int x, i; +++ unsigned char tmp[MAXBLOCKSIZE], tmp2[MAXBLOCKSIZE]; +++ +++ if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) { +++ matrixStrDebugMsg("Bad parameters to matrixAesDecrypt\n", NULL); +++ return -1; +++ } +++ +++/* +++ is blocklen valid? +++ */ +++ if (ctx->aes.blocklen < 0 || ctx->aes.blocklen > +++ (int)sizeof(ctx->aes.IV)) { +++ return -1; +++ } +++ for (i = 0; i < len; i += ctx->aes.blocklen) { +++/* +++ decrypt the block from ct into tmp +++ */ +++ aes_ecb_decrypt(ct, tmp, &ctx->aes); +++/* +++ xor IV against the plaintext of the previous step +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++/* +++ copy CT in case ct == pt +++ */ +++ tmp2[x] = ct[x]; +++/* +++ actually decrypt the byte +++ */ +++ pt[x] = tmp[x] ^ ctx->aes.IV[x]; +++ } +++/* +++ replace IV with this current ciphertext +++ */ +++ for (x = 0; x < ctx->aes.blocklen; x++) { +++ ctx->aes.IV[x] = tmp2[x]; +++ } +++ ct += ctx->aes.blocklen; +++ pt += ctx->aes.blocklen; +++ } +++#ifdef CLEAN_STACK +++ zeromem(tmp, sizeof(tmp)); +++ zeromem(tmp2, sizeof(tmp2)); +++#endif +++ return len; +++} +++ +++int aes_setup(const unsigned char *key, int keylen, int rounds, aes_CBC *skey) +++{ +++ int i, j; +++ ulong32 temp, *rk, *rrk; +++ +++ if (key == NULL || skey == NULL) { +++ return -1; +++ } +++ +++ if (keylen != 16 && keylen != 24 && keylen != 32) { +++ return CRYPT_INVALID_KEYSIZE; +++ } +++ +++ if (rounds != 0 && rounds != (10 + ((keylen/8)-2)*2)) { +++ return CRYPT_INVALID_ROUNDS; +++ } +++ +++ skey->key.Nr = 10 + ((keylen/8)-2)*2; +++ +++/* +++ setup the forward key +++ */ +++ i = 0; +++ rk = skey->key.eK; +++ LOAD32H(rk[0], key ); +++ LOAD32H(rk[1], key + 4); +++ LOAD32H(rk[2], key + 8); +++ LOAD32H(rk[3], key + 12); +++ if (keylen == 16) { +++ j = 44; +++ for (;;) { +++ temp = rk[3]; +++ rk[4] = rk[0] ^ +++ (Te4_3[byte(temp, 2)]) ^ +++ (Te4_2[byte(temp, 1)]) ^ +++ (Te4_1[byte(temp, 0)]) ^ +++ (Te4_0[byte(temp, 3)]) ^ +++ rcon[i]; +++ rk[5] = rk[1] ^ rk[4]; +++ rk[6] = rk[2] ^ rk[5]; +++ rk[7] = rk[3] ^ rk[6]; +++ if (++i == 10) { +++ break; +++ } +++ rk += 4; +++ } +++ } else if (keylen == 24) { +++ j = 52; +++ LOAD32H(rk[4], key + 16); +++ LOAD32H(rk[5], key + 20); +++ for (;;) { +++ #ifdef _MSC_VER +++ temp = skey->key.eK[rk - skey->key.eK + 5]; +++ #else +++ temp = rk[5]; +++ #endif /* _MSC_VER */ +++ rk[ 6] = rk[ 0] ^ +++ (Te4_3[byte(temp, 2)]) ^ +++ (Te4_2[byte(temp, 1)]) ^ +++ (Te4_1[byte(temp, 0)]) ^ +++ (Te4_0[byte(temp, 3)]) ^ +++ rcon[i]; +++ rk[ 7] = rk[ 1] ^ rk[ 6]; +++ rk[ 8] = rk[ 2] ^ rk[ 7]; +++ rk[ 9] = rk[ 3] ^ rk[ 8]; +++ if (++i == 8) { +++ break; +++ } +++ rk[10] = rk[ 4] ^ rk[ 9]; +++ rk[11] = rk[ 5] ^ rk[10]; +++ rk += 6; +++ } +++ } else if (keylen == 32) { +++ j = 60; +++ LOAD32H(rk[4], key + 16); +++ LOAD32H(rk[5], key + 20); +++ LOAD32H(rk[6], key + 24); +++ LOAD32H(rk[7], key + 28); +++ for (;;) { +++ #ifdef _MSC_VER +++ temp = skey->key.eK[rk - skey->key.eK + 7]; +++ #else +++ temp = rk[7]; +++ #endif /* _MSC_VER */ +++ rk[ 8] = rk[ 0] ^ +++ (Te4_3[byte(temp, 2)]) ^ +++ (Te4_2[byte(temp, 1)]) ^ +++ (Te4_1[byte(temp, 0)]) ^ +++ (Te4_0[byte(temp, 3)]) ^ +++ rcon[i]; +++ rk[ 9] = rk[ 1] ^ rk[ 8]; +++ rk[10] = rk[ 2] ^ rk[ 9]; +++ rk[11] = rk[ 3] ^ rk[10]; +++ if (++i == 7) { +++ break; +++ } +++ temp = rk[11]; +++ rk[12] = rk[ 4] ^ +++ (Te4_3[byte(temp, 3)]) ^ +++ (Te4_2[byte(temp, 2)]) ^ +++ (Te4_1[byte(temp, 1)]) ^ +++ (Te4_0[byte(temp, 0)]); +++ rk[13] = rk[ 5] ^ rk[12]; +++ rk[14] = rk[ 6] ^ rk[13]; +++ rk[15] = rk[ 7] ^ rk[14]; +++ rk += 8; +++ } +++ } else { +++/* +++ this can't happen +++ */ +++ j = 4; +++ } +++ +++/* +++ setup the inverse key now +++ */ +++ rk = skey->key.dK; +++ rrk = skey->key.eK + j - 4; +++ +++/* +++ apply the inverse MixColumn transform to all round keys but the first and the last: +++ */ +++ /* copy first */ +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk = *rrk; +++ rk -= 3; rrk -= 3; +++ +++ for (i = 1; i < skey->key.Nr; i++) { +++ rrk -= 4; +++ rk += 4; +++#ifdef SMALL_CODE +++ temp = rrk[0]; +++ rk[0] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++ temp = rrk[1]; +++ rk[1] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++ temp = rrk[2]; +++ rk[2] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++ temp = rrk[3]; +++ rk[3] = +++ Td0(255 & Te4[byte(temp, 3)]) ^ +++ Td1(255 & Te4[byte(temp, 2)]) ^ +++ Td2(255 & Te4[byte(temp, 1)]) ^ +++ Td3(255 & Te4[byte(temp, 0)]); +++#else /* SMALL CODE */ +++ temp = rrk[0]; +++ rk[0] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++ temp = rrk[1]; +++ rk[1] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++ temp = rrk[2]; +++ rk[2] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++ temp = rrk[3]; +++ rk[3] = +++ Tks0[byte(temp, 3)] ^ +++ Tks1[byte(temp, 2)] ^ +++ Tks2[byte(temp, 1)] ^ +++ Tks3[byte(temp, 0)]; +++#endif /* SMALL CODE */ +++ } +++ +++ /* copy last */ +++ rrk -= 4; +++ rk += 4; +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk++ = *rrk++; +++ *rk = *rrk; +++ +++ return CRYPT_OK; +++} +++ +++#ifdef CLEAN_STACK +++void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++{ +++ _aes_ecb_encrypt(pt, ct, skey); +++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); +++} +++#endif /* CLEAN_STACK */ +++ +++#ifdef CLEAN_STACK +++static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++#else +++void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++#endif /* CLEAN_STACK */ +++{ +++ ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk; +++ int Nr, r; +++ +++ if (pt == NULL || ct == NULL || skey == NULL) { +++ return; +++ } +++ +++ Nr = skey->key.Nr; +++ rk = skey->key.eK; +++ +++/* +++ map byte array block to cipher state +++ and add initial round key: +++ */ +++ LOAD32H(s0, pt ); s0 ^= rk[0]; +++ LOAD32H(s1, pt + 4); s1 ^= rk[1]; +++ LOAD32H(s2, pt + 8); s2 ^= rk[2]; +++ LOAD32H(s3, pt + 12); s3 ^= rk[3]; +++ +++/* +++ Nr - 1 full rounds: +++ */ +++ r = Nr >> 1; +++ for (;;) { +++ +++ t0 = +++ Te0(byte(s0, 3)) ^ +++ Te1(byte(s1, 2)) ^ +++ Te2(byte(s2, 1)) ^ +++ Te3(byte(s3, 0)) ^ +++ rk[4]; +++ t1 = +++ Te0(byte(s1, 3)) ^ +++ Te1(byte(s2, 2)) ^ +++ Te2(byte(s3, 1)) ^ +++ Te3(byte(s0, 0)) ^ +++ rk[5]; +++ t2 = +++ Te0(byte(s2, 3)) ^ +++ Te1(byte(s3, 2)) ^ +++ Te2(byte(s0, 1)) ^ +++ Te3(byte(s1, 0)) ^ +++ rk[6]; +++ t3 = +++ Te0(byte(s3, 3)) ^ +++ Te1(byte(s0, 2)) ^ +++ Te2(byte(s1, 1)) ^ +++ Te3(byte(s2, 0)) ^ +++ rk[7]; +++ +++ rk += 8; +++ if (--r == 0) { +++ break; +++ } +++ +++ s0 = +++ Te0(byte(t0, 3)) ^ +++ Te1(byte(t1, 2)) ^ +++ Te2(byte(t2, 1)) ^ +++ Te3(byte(t3, 0)) ^ +++ rk[0]; +++ s1 = +++ Te0(byte(t1, 3)) ^ +++ Te1(byte(t2, 2)) ^ +++ Te2(byte(t3, 1)) ^ +++ Te3(byte(t0, 0)) ^ +++ rk[1]; +++ s2 = +++ Te0(byte(t2, 3)) ^ +++ Te1(byte(t3, 2)) ^ +++ Te2(byte(t0, 1)) ^ +++ Te3(byte(t1, 0)) ^ +++ rk[2]; +++ s3 = +++ Te0(byte(t3, 3)) ^ +++ Te1(byte(t0, 2)) ^ +++ Te2(byte(t1, 1)) ^ +++ Te3(byte(t2, 0)) ^ +++ rk[3]; +++ } +++/* +++ apply last round and map cipher state to byte array block: +++ */ +++ s0 = +++ (Te4_3[byte(t0, 3)]) ^ +++ (Te4_2[byte(t1, 2)]) ^ +++ (Te4_1[byte(t2, 1)]) ^ +++ (Te4_0[byte(t3, 0)]) ^ +++ rk[0]; +++ STORE32H(s0, ct); +++ s1 = +++ (Te4_3[byte(t1, 3)]) ^ +++ (Te4_2[byte(t2, 2)]) ^ +++ (Te4_1[byte(t3, 1)]) ^ +++ (Te4_0[byte(t0, 0)]) ^ +++ rk[1]; +++ STORE32H(s1, ct+4); +++ s2 = +++ (Te4_3[byte(t2, 3)]) ^ +++ (Te4_2[byte(t3, 2)]) ^ +++ (Te4_1[byte(t0, 1)]) ^ +++ (Te4_0[byte(t1, 0)]) ^ +++ rk[2]; +++ STORE32H(s2, ct+8); +++ s3 = +++ (Te4_3[byte(t3, 3)]) ^ +++ (Te4_2[byte(t0, 2)]) ^ +++ (Te4_1[byte(t1, 1)]) ^ +++ (Te4_0[byte(t2, 0)]) ^ +++ rk[3]; +++ STORE32H(s3, ct+12); +++} +++ +++#ifdef CLEAN_STACK +++void aes_ecb_decrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) +++{ +++ _aes_ecb_decrypt(pt, ct, skey); +++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); +++} +++#endif /* CLEAN_STACK */ +++ +++#ifdef CLEAN_STACK +++static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) +++#else +++void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) +++#endif /* CLEAN_STACK */ +++{ +++ ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk; +++ int Nr, r; +++ +++ if (pt == NULL || ct == NULL || skey == NULL) { +++ return; +++ } +++ +++ Nr = skey->key.Nr; +++ rk = skey->key.dK; +++ +++/* +++ map byte array block to cipher state and add initial round key: +++ */ +++ LOAD32H(s0, ct ); s0 ^= rk[0]; +++ LOAD32H(s1, ct + 4); s1 ^= rk[1]; +++ LOAD32H(s2, ct + 8); s2 ^= rk[2]; +++ LOAD32H(s3, ct + 12); s3 ^= rk[3]; +++ +++/* +++ Nr - 1 full rounds: +++ */ +++ r = Nr >> 1; +++ for (;;) { +++ +++ t0 = +++ Td0(byte(s0, 3)) ^ +++ Td1(byte(s3, 2)) ^ +++ Td2(byte(s2, 1)) ^ +++ Td3(byte(s1, 0)) ^ +++ rk[4]; +++ t1 = +++ Td0(byte(s1, 3)) ^ +++ Td1(byte(s0, 2)) ^ +++ Td2(byte(s3, 1)) ^ +++ Td3(byte(s2, 0)) ^ +++ rk[5]; +++ t2 = +++ Td0(byte(s2, 3)) ^ +++ Td1(byte(s1, 2)) ^ +++ Td2(byte(s0, 1)) ^ +++ Td3(byte(s3, 0)) ^ +++ rk[6]; +++ t3 = +++ Td0(byte(s3, 3)) ^ +++ Td1(byte(s2, 2)) ^ +++ Td2(byte(s1, 1)) ^ +++ Td3(byte(s0, 0)) ^ +++ rk[7]; +++ +++ rk += 8; +++ if (--r == 0) { +++ break; +++ } +++ +++ s0 = +++ Td0(byte(t0, 3)) ^ +++ Td1(byte(t3, 2)) ^ +++ Td2(byte(t2, 1)) ^ +++ Td3(byte(t1, 0)) ^ +++ rk[0]; +++ s1 = +++ Td0(byte(t1, 3)) ^ +++ Td1(byte(t0, 2)) ^ +++ Td2(byte(t3, 1)) ^ +++ Td3(byte(t2, 0)) ^ +++ rk[1]; +++ s2 = +++ Td0(byte(t2, 3)) ^ +++ Td1(byte(t1, 2)) ^ +++ Td2(byte(t0, 1)) ^ +++ Td3(byte(t3, 0)) ^ +++ rk[2]; +++ s3 = +++ Td0(byte(t3, 3)) ^ +++ Td1(byte(t2, 2)) ^ +++ Td2(byte(t1, 1)) ^ +++ Td3(byte(t0, 0)) ^ +++ rk[3]; +++ } +++ +++/* +++ apply last round and map cipher state to byte array block: +++ */ +++ s0 = +++ (Td4[byte(t0, 3)] & 0xff000000) ^ +++ (Td4[byte(t3, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t2, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t1, 0)] & 0x000000ff) ^ +++ rk[0]; +++ STORE32H(s0, pt); +++ s1 = +++ (Td4[byte(t1, 3)] & 0xff000000) ^ +++ (Td4[byte(t0, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t3, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t2, 0)] & 0x000000ff) ^ +++ rk[1]; +++ STORE32H(s1, pt+4); +++ s2 = +++ (Td4[byte(t2, 3)] & 0xff000000) ^ +++ (Td4[byte(t1, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t0, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t3, 0)] & 0x000000ff) ^ +++ rk[2]; +++ STORE32H(s2, pt+8); +++ s3 = +++ (Td4[byte(t3, 3)] & 0xff000000) ^ +++ (Td4[byte(t2, 2)] & 0x00ff0000) ^ +++ (Td4[byte(t1, 1)] & 0x0000ff00) ^ +++ (Td4[byte(t0, 0)] & 0x000000ff) ^ +++ rk[3]; +++ STORE32H(s3, pt+12); +++} +++ +++#ifdef CLEAN_STACK +++void aes(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) +++{ +++ _aes_ecb_decrypt(ct, pt, skey); +++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); +++} +++#endif /* CLEAN_STACK */ +++ +++ +++#ifdef PEERSEC_TEST +++ +++int matrixAesTest() +++{ +++ int err; +++ static const struct { +++ int keylen; +++ unsigned char key[32], pt[16], ct[16]; +++ } tests[] = { +++ { 16, +++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, +++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, +++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, +++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, +++ { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30, +++ 0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a } +++ }, { +++ 24, +++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, +++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, +++ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 }, +++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, +++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, +++ { 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0, +++ 0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 } +++ }, { +++ 32, +++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, +++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, +++ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, +++ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, +++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, +++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, +++ { 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf, +++ 0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 } +++ } +++ }; +++ +++ aes_CBC key; +++ unsigned char tmp[2][16]; +++ int i, y; +++ +++ for (i = 0; i < (int)(sizeof(tests)/sizeof(tests[0])); i++) { +++ zeromem(&key, sizeof(key)); +++ if ((err = aes_setup(tests[i].key, tests[i].keylen, 0, &key)) != CRYPT_OK) { +++ return err; +++ } +++ +++ aes_ecb_encrypt(tests[i].pt, tmp[0], &key); +++ aes_ecb_decrypt(tmp[0], tmp[1], &key); +++ if (memcmp(tmp[0], tests[i].ct, 16) || memcmp(tmp[1], tests[i].pt, 16)) { +++#if 0 +++ printf("\n\nTest %d failed\n", i); +++ if (memcmp(tmp[0], tests[i].ct, 16)) { +++ printf("CT: "); +++ for (i = 0; i < 16; i++) { +++ printf("%02x ", tmp[0][i]); +++ } +++ printf("\n"); +++ } else { +++ printf("PT: "); +++ for (i = 0; i < 16; i++) { +++ printf("%02x ", tmp[1][i]); +++ } +++ printf("\n"); +++ } +++#endif /* 0 */ +++ return CRYPT_FAIL_TESTVECTOR; +++ } +++ +++/* +++ now see if we can encrypt all zero bytes 1000 times, +++ decrypt and come back where we started +++ */ +++ for (y = 0; y < 16; y++) tmp[0][y] = 0; +++ for (y = 0; y < 1000; y++) aes_ecb_encrypt(tmp[0], tmp[0], &key); +++ for (y = 0; y < 1000; y++) aes_ecb_decrypt(tmp[0], tmp[0], &key); +++ for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR; +++ } +++ return CRYPT_OK; +++} +++#endif /* PEERSEC_TEST */ +++ +++#endif /* USE_AES */ +++/******************************************************************************/ ++diff -urN matrixssl.old/src/crypto/peersec/md5.c matrixssl/src/crypto/peersec/md5.c ++--- matrixssl.old/src/crypto/peersec/md5.c 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/peersec/md5.c 2005-03-06 01:32:33.000000000 +0100 ++@@ -334,7 +334,7 @@ ++ #ifdef CLEAN_STACK ++ psZeromem(md, sizeof(hash_state)); ++ #endif /* CLEAN_STACK */ ++- return 16; +++ return SSL_MD5_HASH_SIZE; ++ } ++ ++ #ifdef PEERSEC_TEST ++diff -urN matrixssl.old/src/crypto/peersec/pscrypto.h matrixssl/src/crypto/peersec/pscrypto.h ++--- matrixssl.old/src/crypto/peersec/pscrypto.h 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/peersec/pscrypto.h 2005-03-06 01:32:33.000000000 +0100 ++@@ -40,7 +40,7 @@ ++ PeerSec crypto-specific defines. ++ */ ++ #define SMALL_CODE ++-#define CLEAN_STACK +++#undef CLEAN_STACK ++ /* ++ If Native 64 bit integers are not supported, we must set the 16 bit flag ++ to produce 32 bit mp_words in mpi.h ++diff -urN matrixssl.old/src/crypto/peersec/sha1.c matrixssl/src/crypto/peersec/sha1.c ++--- matrixssl.old/src/crypto/peersec/sha1.c 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/crypto/peersec/sha1.c 2005-03-06 01:32:33.000000000 +0100 ++@@ -273,7 +273,7 @@ ++ #ifdef CLEAN_STACK ++ psZeromem(md, sizeof(hash_state)); ++ #endif /* CLEAN_STACK */ ++- return 20; +++ return SSL_SHA1_HASH_SIZE; ++ } ++ ++ #ifdef PEERSEC_TEST ++diff -urN matrixssl.old/src/Makefile matrixssl/src/Makefile ++--- matrixssl.old/src/Makefile 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/Makefile 2005-03-06 01:39:06.000000000 +0100 ++@@ -15,7 +15,14 @@ ++ E = ++ ++ LIBRARY = libmatrixssl$(SO) ++-STATIC = libmatrixsslstatic$(A) +++ +++SOVERSION_MAJ := 1 +++SOVERSION_MIN := 2 +++SOVERSION_REV := 4 +++SONAME := $(LIBRARY).$(SOVERSION_MAJ) +++SOREAL := $(LIBRARY).$(SOVERSION_MAJ).$(SOVERSION_MIN).$(SOVERSION_REV) +++ ++++STATIC = libmatrixsslstatic$(A) ++ ++ OBJECTS = \ ++ cipherSuite$(O) \ ++@@ -24,6 +31,7 @@ ++ sslEncode$(O) \ ++ sslv3$(O) \ ++ os/linux/linux$(O) \ +++ crypto/peersec/aes$(O) \ ++ crypto/peersec/arc4$(O) \ ++ crypto/peersec/asn1$(O) \ ++ crypto/peersec/base64$(O) \ ++@@ -66,7 +74,7 @@ ++ # ++ SHARED = -shared ++ CFLAGS = $(DFLAGS) -DLINUX -I./ -Icrypto/peersec ++-LDFLAGS = -lc -lpthread -lcrypto +++LDFLAGS = -lc -lpthread -Wl,-soname,$(SONAME) ++ ++ # ++ # Override variables for compilation on Mac OS X (Darwin) ++@@ -105,8 +113,9 @@ ++ # Build the library ++ # ++ $(LIBRARY): $(OBJECTS) ++- $(CC) $(SHARED) -o $@ $^ $(LDFLAGS) ++- $(STRIP) $(LIBRARY) +++ $(CC) $(SHARED) -o $(SOREAL) $^ $(LDFLAGS) +++ ln -sf $(SOREAL) $(SONAME) +++ ln -sf $(SONAME) $(LIBRARY) ++ ++ # ++ # Build the static library ++@@ -119,4 +128,4 @@ ++ # Clean up all generated files ++ # ++ clean: ++- rm -f $(LIBRARY) $(OBJECTS) $(STATIC) +++ rm -f $(LIBRARY) $(OBJECTS) $(SONAME) $(SOREAL) ++diff -urN matrixssl.old/src/matrixSsl.c matrixssl/src/matrixSsl.c ++--- matrixssl.old/src/matrixSsl.c 2005-02-23 22:43:10.000000000 +0100 +++++ matrixssl/src/matrixSsl.c 2005-03-06 01:37:41.000000000 +0100 ++@@ -950,6 +950,49 @@ ++ sslAssert(ssl->hsPool == NULL); ++ } ++ +++ +++/******************************************************************************/ +++/* +++ Compute an MD5 digest +++*/ +++unsigned char *matrixMd5Digest( +++ const unsigned char *buf, unsigned long len, unsigned char *hash) +++{ +++ sslMd5Context_t ctx; +++ static unsigned char hashBuf[SSL_MD5_HASH_SIZE]; +++ +++ if (hash == NULL) { +++ hash = hashBuf; +++ } +++ +++ matrixMd5Init(&ctx); +++ matrixMd5Update(&ctx, buf, len); +++ matrixMd5Final(&ctx, hash); +++ +++ return hash; +++} +++ +++/******************************************************************************/ +++/* +++ Compute an SHA1 digest +++*/ +++unsigned char *matrixSha1Digest( +++ const unsigned char *buf, unsigned long len, unsigned char *hash) +++{ +++ sslSha1Context_t ctx; +++ static unsigned char hashBuf[SSL_SHA1_HASH_SIZE]; +++ +++ if (hash == NULL) { +++ hash = hashBuf; +++ } +++ +++ matrixSha1Init(&ctx); +++ matrixSha1Update(&ctx, buf, len); +++ matrixSha1Final(&ctx, hash); +++ +++ return hash; +++} +++ ++ /******************************************************************************/ ++ /* ++ Debugging APIs +diff --git a/feeds/packages/libs/matrixssl/patches/200-compile-fixes.patch b/feeds/packages/libs/matrixssl/patches/200-compile-fixes.patch +new file mode 100644 +index 0000000..ab6a261 +--- /dev/null ++++ b/feeds/packages/libs/matrixssl/patches/200-compile-fixes.patch +@@ -0,0 +1,64 @@ ++Index: matrixssl/src/os/linux/linux.c ++=================================================================== ++--- matrixssl.orig/src/os/linux/linux.c 2010-11-02 21:01:53.702000002 +0100 +++++ matrixssl/src/os/linux/linux.c 2010-11-02 21:02:37.657009753 +0100 ++@@ -39,8 +39,12 @@ ++ ++ #include "../osLayer.h" ++ +++#ifndef CLK_TCK +++# define CLK_TCK CLOCKS_PER_SEC +++#endif +++ ++ #if defined(__i386__) || defined(RDTSC) ++-#include +++//#include ++ /* ++ As defined in asm/timex.h for x386: ++ */ ++@@ -51,7 +55,7 @@ ++ static sslTime_t hiresStart; /* zero-time */ ++ static sslTime_t hiresFreq; /* tics per second */ ++ #else /* __i386__ */ ++-static unsigned int32 prevTicks; /* Check wrap */ +++static uint32 prevTicks; /* Check wrap */ ++ static sslTime_t elapsedTime; /* Last elapsed time */ ++ #endif ++ ++Index: matrixssl/src/Makefile ++=================================================================== ++--- matrixssl.orig/src/Makefile 2010-11-02 21:02:42.312000001 +0100 +++++ matrixssl/src/Makefile 2010-11-02 21:04:21.979001189 +0100 ++@@ -63,13 +63,6 @@ ++ endif ++ ++ # ++-# Override variables for compilation on x86-64 (AMD64, Nacona, etc) ++-# ++-ifeq ($(shell uname -m),x86_64) ++-DFLAGS += -march=k8 -fPIC -DFP_64BIT -DTFM_X86_64 -DRDTSC ++-endif ++- ++-# ++ # Compile options ++ # ++ SHARED = -shared ++@@ -77,18 +70,6 @@ ++ LDFLAGS = -lc -lpthread -Wl,-soname,$(SONAME) ++ ++ # ++-# Override variables for compilation on Mac OS X (Darwin) ++-# ++-ifeq ($(shell uname),Darwin) ++-CC = cc ++-SO = .dylib ++-SHARED = -dynamiclib ++-CFLAGS += -DOSX -isystem -I/usr/include ++-LDFLAGS = -flat_namespace -install_name @executable_path/../src/$(LIBRARY) ++-STRIP = test ++-endif ++- ++-# ++ # Override variables for compilation on uClinux (example only) ++ # ++ ifdef UCLINUX +diff --git a/feeds/packages/libs/mxml/.svn/entries b/feeds/packages/libs/mxml/.svn/entries +new file mode 100644 +index 0000000..db42c70 +--- /dev/null ++++ b/feeds/packages/libs/mxml/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/mxml ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++7dd634f2bebb9f0987b184a191664ed5 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1161 ++ +diff --git a/feeds/packages/libs/mxml/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/mxml/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fdaa504 +--- /dev/null ++++ b/feeds/packages/libs/mxml/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2010 Tobias Schneider ++# 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:=mxml ++PKG_VERSION:=2.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ftp.easysw.com/pub/mxml/$(PKG_VERSION)/ ++PKG_FIXUP:=autoreconf ++ ++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) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ ) ++endef ++ ++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/feeds/packages/libs/mxml/Makefile b/feeds/packages/libs/mxml/Makefile +new file mode 100644 +index 0000000..fdaa504 +--- /dev/null ++++ b/feeds/packages/libs/mxml/Makefile +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2010 Tobias Schneider ++# 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:=mxml ++PKG_VERSION:=2.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ftp.easysw.com/pub/mxml/$(PKG_VERSION)/ ++PKG_FIXUP:=autoreconf ++ ++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) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ ) ++endef ++ ++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/feeds/packages/libs/mxml/patches/.svn/entries b/feeds/packages/libs/mxml/patches/.svn/entries +new file mode 100644 +index 0000000..1b0ca9a +--- /dev/null ++++ b/feeds/packages/libs/mxml/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/mxml/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-06-06T19:02:16.273876Z ++21686 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-targets.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++39d8ac01d619109bc891dac4721ffd3f ++2010-06-06T19:02:16.273876Z ++21686 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++431 ++ +diff --git a/feeds/packages/libs/mxml/patches/.svn/text-base/001-targets.patch.svn-base b/feeds/packages/libs/mxml/patches/.svn/text-base/001-targets.patch.svn-base +new file mode 100644 +index 0000000..6d53249 +--- /dev/null ++++ b/feeds/packages/libs/mxml/patches/.svn/text-base/001-targets.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -Nur mxml-2.6-orig/Makefile.in mxml-2.6/Makefile.in ++--- mxml-2.6-orig/Makefile.in 2008-12-06 05:20:38.000000000 +0100 +++++ mxml-2.6/Makefile.in 2010-05-28 01:58:37.000000000 +0200 ++@@ -88,7 +88,7 @@ ++ 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/feeds/packages/libs/mxml/patches/001-targets.patch b/feeds/packages/libs/mxml/patches/001-targets.patch +new file mode 100644 +index 0000000..6d53249 +--- /dev/null ++++ b/feeds/packages/libs/mxml/patches/001-targets.patch +@@ -0,0 +1,12 @@ ++diff -Nur mxml-2.6-orig/Makefile.in mxml-2.6/Makefile.in ++--- mxml-2.6-orig/Makefile.in 2008-12-06 05:20:38.000000000 +0100 +++++ mxml-2.6/Makefile.in 2010-05-28 01:58:37.000000000 +0200 ++@@ -88,7 +88,7 @@ ++ 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/feeds/packages/libs/mysql/.svn/entries b/feeds/packages/libs/mysql/.svn/entries +new file mode 100644 +index 0000000..13b367a +--- /dev/null ++++ b/feeds/packages/libs/mysql/.svn/entries +@@ -0,0 +1,71 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/mysql ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-25T22:04:14.064354Z ++35802 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++conf ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++845822ec9cd85c6cf6a7d6a5d12e241b ++2013-02-25T22:04:14.064354Z ++35802 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5522 ++ +diff --git a/feeds/packages/libs/mysql/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/mysql/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/mysql/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/mysql/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/mysql/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1f756b9 +--- /dev/null ++++ b/feeds/packages/libs/mysql/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,190 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/uclibc++.mk ++ ++PKG_NAME:=mysql ++PKG_VERSION:=5.1.68 ++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/ \ ++ http://downloads.mysql.com/archives/mysql-5.1/ ++ ++PKG_MD5SUM:=3a4a627d0865ce7660504728a15b0fb9 ++ ++PKG_BUILD_DEPENDS:=libncurses libreadline ++PKG_BUILD_PARALLEL:=1 ++ ++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 ++ ++TARGET_CXX=g++-uc ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --enable-thread-safe-client \ ++ --disable-assembler \ ++ --with-pthread \ ++ --with-server \ ++ --without-mysqlmanager \ ++ --without-raid \ ++ --with-mysqld-user=root \ ++ --with-unix-socket-path=/tmp \ ++ --without-libwrap \ ++ --without-pstack \ ++ --with-low-memory \ ++ --without-embedded-server \ ++ --without-query-cache \ ++ --without-mysqlfs \ ++ --without-vio \ ++ --without-ssl \ ++ --without-docs \ ++ --without-man \ ++ --without-bench \ ++ --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/feeds/packages/libs/mysql/Makefile b/feeds/packages/libs/mysql/Makefile +new file mode 100644 +index 0000000..1f756b9 +--- /dev/null ++++ b/feeds/packages/libs/mysql/Makefile +@@ -0,0 +1,190 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/uclibc++.mk ++ ++PKG_NAME:=mysql ++PKG_VERSION:=5.1.68 ++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/ \ ++ http://downloads.mysql.com/archives/mysql-5.1/ ++ ++PKG_MD5SUM:=3a4a627d0865ce7660504728a15b0fb9 ++ ++PKG_BUILD_DEPENDS:=libncurses libreadline ++PKG_BUILD_PARALLEL:=1 ++ ++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 ++ ++TARGET_CXX=g++-uc ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --enable-thread-safe-client \ ++ --disable-assembler \ ++ --with-pthread \ ++ --with-server \ ++ --without-mysqlmanager \ ++ --without-raid \ ++ --with-mysqld-user=root \ ++ --with-unix-socket-path=/tmp \ ++ --without-libwrap \ ++ --without-pstack \ ++ --with-low-memory \ ++ --without-embedded-server \ ++ --without-query-cache \ ++ --without-mysqlfs \ ++ --without-vio \ ++ --without-ssl \ ++ --without-docs \ ++ --without-man \ ++ --without-bench \ ++ --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/feeds/packages/libs/mysql/conf/.svn/entries b/feeds/packages/libs/mysql/conf/.svn/entries +new file mode 100644 +index 0000000..c5a233f +--- /dev/null ++++ b/feeds/packages/libs/mysql/conf/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/mysql/conf ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-09-04T18:04:02.345281Z ++22911 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++my.cnf ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++2afde6844aee3408bc64a6ee67884939 ++2010-09-04T18:04:02.345281Z ++22911 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1139 ++ +diff --git a/feeds/packages/libs/mysql/conf/.svn/text-base/my.cnf.svn-base b/feeds/packages/libs/mysql/conf/.svn/text-base/my.cnf.svn-base +new file mode 100644 +index 0000000..ec2ade2 +--- /dev/null ++++ b/feeds/packages/libs/mysql/conf/.svn/text-base/my.cnf.svn-base +@@ -0,0 +1,54 @@ ++[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/feeds/packages/libs/mysql/conf/my.cnf b/feeds/packages/libs/mysql/conf/my.cnf +new file mode 100644 +index 0000000..ec2ade2 +--- /dev/null ++++ b/feeds/packages/libs/mysql/conf/my.cnf +@@ -0,0 +1,54 @@ ++[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/feeds/packages/libs/mysql/files/.svn/entries b/feeds/packages/libs/mysql/files/.svn/entries +new file mode 100644 +index 0000000..8491823 +--- /dev/null ++++ b/feeds/packages/libs/mysql/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/mysql/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-12T19:32:26.623088Z ++35122 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mysqld.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++0c7efcc61113755d0e544618a55ee5b4 ++2011-11-16T09:44:18.433869Z ++29176 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++703 ++ +diff --git a/feeds/packages/libs/mysql/files/.svn/text-base/mysqld.init.svn-base b/feeds/packages/libs/mysql/files/.svn/text-base/mysqld.init.svn-base +new file mode 100644 +index 0000000..48e6189 +--- /dev/null ++++ b/feeds/packages/libs/mysql/files/.svn/text-base/mysqld.init.svn-base +@@ -0,0 +1,30 @@ ++#!/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/feeds/packages/libs/mysql/files/mysqld.init b/feeds/packages/libs/mysql/files/mysqld.init +new file mode 100644 +index 0000000..48e6189 +--- /dev/null ++++ b/feeds/packages/libs/mysql/files/mysqld.init +@@ -0,0 +1,30 @@ ++#!/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/feeds/packages/libs/mysql/patches/.svn/entries b/feeds/packages/libs/mysql/patches/.svn/entries +new file mode 100644 +index 0000000..46e113d +--- /dev/null ++++ b/feeds/packages/libs/mysql/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/mysql/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-12T19:32:26.623088Z ++35122 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-fix_hostname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++2ea5e949485b929143d9fc3dc0693ef8 ++2013-01-12T19:32:26.623088Z ++35122 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++295 ++ ++110-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++51db78f38b6045151d0d92504db08f02 ++2013-01-12T19:32:26.623088Z ++35122 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4334 ++ +diff --git a/feeds/packages/libs/mysql/patches/.svn/text-base/100-fix_hostname.patch.svn-base b/feeds/packages/libs/mysql/patches/.svn/text-base/100-fix_hostname.patch.svn-base +new file mode 100644 +index 0000000..2b6d09a +--- /dev/null ++++ b/feeds/packages/libs/mysql/patches/.svn/text-base/100-fix_hostname.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/scripts/mysql_install_db.sh +++++ b/scripts/mysql_install_db.sh ++@@ -322,7 +322,7 @@ ++ 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/feeds/packages/libs/mysql/patches/.svn/text-base/110-cross_compile.patch.svn-base b/feeds/packages/libs/mysql/patches/.svn/text-base/110-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..160bc2b +--- /dev/null ++++ b/feeds/packages/libs/mysql/patches/.svn/text-base/110-cross_compile.patch.svn-base +@@ -0,0 +1,179 @@ ++--- a/storage/innodb_plugin/plug.in +++++ b/storage/innodb_plugin/plug.in ++@@ -56,10 +56,8 @@ ++ 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 @@ ++ ++ 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 ++ #include ++ ++@@ -127,16 +122,14 @@ ++ ++ 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 @@ ++ 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 @@ ++ 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 @@ ++ } ++ ++ ++-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 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 @@ ++ }\n\ ++ }\n" ++ ); ++- my_end(0); ++ exit(0); ++ } ++ ++--- a/sql/Makefile.am +++++ b/sql/Makefile.am ++@@ -26,7 +26,6 @@ ++ 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/feeds/packages/libs/mysql/patches/100-fix_hostname.patch b/feeds/packages/libs/mysql/patches/100-fix_hostname.patch +new file mode 100644 +index 0000000..2b6d09a +--- /dev/null ++++ b/feeds/packages/libs/mysql/patches/100-fix_hostname.patch +@@ -0,0 +1,11 @@ ++--- a/scripts/mysql_install_db.sh +++++ b/scripts/mysql_install_db.sh ++@@ -322,7 +322,7 @@ ++ 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/feeds/packages/libs/mysql/patches/110-cross_compile.patch b/feeds/packages/libs/mysql/patches/110-cross_compile.patch +new file mode 100644 +index 0000000..160bc2b +--- /dev/null ++++ b/feeds/packages/libs/mysql/patches/110-cross_compile.patch +@@ -0,0 +1,179 @@ ++--- a/storage/innodb_plugin/plug.in +++++ b/storage/innodb_plugin/plug.in ++@@ -56,10 +56,8 @@ ++ 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 @@ ++ ++ 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 ++ #include ++ ++@@ -127,16 +122,14 @@ ++ ++ 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 @@ ++ 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 @@ ++ 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 @@ ++ } ++ ++ ++-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 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 @@ ++ }\n\ ++ }\n" ++ ); ++- my_end(0); ++ exit(0); ++ } ++ ++--- a/sql/Makefile.am +++++ b/sql/Makefile.am ++@@ -26,7 +26,6 @@ ++ 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/feeds/packages/libs/nacl/.svn/entries b/feeds/packages/libs/nacl/.svn/entries +new file mode 100644 +index 0000000..f52a7c8 +--- /dev/null ++++ b/feeds/packages/libs/nacl/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/nacl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-04-05T16:40:42.119098Z ++26490 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++04fa78e8e69eff439848fcd27c2e0273 ++2011-04-05T16:40:42.119098Z ++26490 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1086 ++ ++do-openwrt ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++a628cbd5c534ecb9031bb4b664a05c51 ++2011-01-26T01:38:14.281003Z ++25098 ++dingo ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4413 ++ +diff --git a/feeds/packages/libs/nacl/.svn/prop-base/do-openwrt.svn-base b/feeds/packages/libs/nacl/.svn/prop-base/do-openwrt.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/libs/nacl/.svn/prop-base/do-openwrt.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/libs/nacl/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/nacl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..546f071 +--- /dev/null ++++ b/feeds/packages/libs/nacl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=nacl ++PKG_VERSION:=20110221 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://hyperelliptic.org/nacl ++PKG_MD5SUM:=7efb5715561c3d10dafd3fa97b4f2d20 ++ ++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 ++ cp do-openwrt $(PKG_BUILD_DIR) ++ ( \ ++ cd $(PKG_BUILD_DIR); \ ++ chmod +x do-openwrt; \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ AR="$(TARGET_CROSS)ar" \ ++ RANLIB="$(TARGET_CROSS)ranlib" \ ++ ./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/feeds/packages/libs/nacl/.svn/text-base/do-openwrt.svn-base b/feeds/packages/libs/nacl/.svn/text-base/do-openwrt.svn-base +new file mode 100644 +index 0000000..65d9376 +--- /dev/null ++++ b/feeds/packages/libs/nacl/.svn/text-base/do-openwrt.svn-base +@@ -0,0 +1,206 @@ ++#!/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 " ++ 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 ' ++ #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/feeds/packages/libs/nacl/Makefile b/feeds/packages/libs/nacl/Makefile +new file mode 100644 +index 0000000..546f071 +--- /dev/null ++++ b/feeds/packages/libs/nacl/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=nacl ++PKG_VERSION:=20110221 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://hyperelliptic.org/nacl ++PKG_MD5SUM:=7efb5715561c3d10dafd3fa97b4f2d20 ++ ++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 ++ cp do-openwrt $(PKG_BUILD_DIR) ++ ( \ ++ cd $(PKG_BUILD_DIR); \ ++ chmod +x do-openwrt; \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ AR="$(TARGET_CROSS)ar" \ ++ RANLIB="$(TARGET_CROSS)ranlib" \ ++ ./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/feeds/packages/libs/nacl/do-openwrt b/feeds/packages/libs/nacl/do-openwrt +new file mode 100755 +index 0000000..65d9376 +--- /dev/null ++++ b/feeds/packages/libs/nacl/do-openwrt +@@ -0,0 +1,206 @@ ++#!/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 " ++ 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 ' ++ #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/feeds/packages/libs/neon/.svn/entries b/feeds/packages/libs/neon/.svn/entries +new file mode 100644 +index 0000000..e05d499 +--- /dev/null ++++ b/feeds/packages/libs/neon/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/neon ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0d342afe12e3fc44d0cf09dbe6512ebb ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1661 ++ +diff --git a/feeds/packages/libs/neon/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/neon/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4a95cac +--- /dev/null ++++ b/feeds/packages/libs/neon/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=neon ++PKG_VERSION:=0.29.6 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.webdav.org/neon ++PKG_MD5SUM:=591e0c82e6979e7e615211b386b8f6bc ++ ++PKG_FIXUP:=autoreconf ++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 ++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/feeds/packages/libs/neon/Makefile b/feeds/packages/libs/neon/Makefile +new file mode 100644 +index 0000000..4a95cac +--- /dev/null ++++ b/feeds/packages/libs/neon/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=neon ++PKG_VERSION:=0.29.6 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.webdav.org/neon ++PKG_MD5SUM:=591e0c82e6979e7e615211b386b8f6bc ++ ++PKG_FIXUP:=autoreconf ++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 ++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/feeds/packages/libs/neon/patches/.svn/entries b/feeds/packages/libs/neon/patches/.svn/entries +new file mode 100644 +index 0000000..2933b7d +--- /dev/null ++++ b/feeds/packages/libs/neon/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/neon/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T14:46:58.792153Z ++24607 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++aa8444ef177b5ad889929ba24ed9f334 ++2010-12-15T14:46:58.792153Z ++24607 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++90 ++ +diff --git a/feeds/packages/libs/neon/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/neon/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..f6ffa0f +--- /dev/null ++++ b/feeds/packages/libs/neon/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,5 @@ ++--- /dev/null +++++ b/Makefile.am ++@@ -0,0 +1,2 @@ +++SUBDIRS = . +++ACLOCAL_AMFLAGS = -I macros +diff --git a/feeds/packages/libs/neon/patches/001-automake-compat.patch b/feeds/packages/libs/neon/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..f6ffa0f +--- /dev/null ++++ b/feeds/packages/libs/neon/patches/001-automake-compat.patch +@@ -0,0 +1,5 @@ ++--- /dev/null +++++ b/Makefile.am ++@@ -0,0 +1,2 @@ +++SUBDIRS = . +++ACLOCAL_AMFLAGS = -I macros +diff --git a/feeds/packages/libs/newt/.svn/entries b/feeds/packages/libs/newt/.svn/entries +new file mode 100644 +index 0000000..c350652 +--- /dev/null ++++ b/feeds/packages/libs/newt/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/newt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-18T15:06:07.869953Z ++32424 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++140d0d46d8882df965d9c471c5a8d4bd ++2012-06-18T15:06:07.869953Z ++32424 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1797 ++ +diff --git a/feeds/packages/libs/newt/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/newt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..79dad88 +--- /dev/null ++++ b/feeds/packages/libs/newt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,76 @@ ++# ++# Copyright (C) 2006-2011 OpenWrt.org ++# Copyright (C) 2011 SMBPhone Inc. ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=newt ++PKG_VERSION:=0.52.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://fedorahosted.org/releases/n/e/newt/ ++PKG_MD5SUM:=51b04128d9e1bf000fa769c417b74486 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnewt ++ URL:=http://fedorahosted.org/newt/ ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Not Erik's Windowing Toolkit ++ DEPENDS:= +libslang2 +libpopt ++endef ++ ++define Package/libnewt/description ++ Programming library for colour text mode widget-based user interfaces, ++ based on S-Lang. ++endef ++ ++define Package/whiptail ++ URL:=http://fedorahosted.org/newt/ ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Dialog boxes from shell scripts ++ DEPENDS:= +libnewt ++endef ++ ++define Package/whiptail/description ++ A lightweight replacement for the dialog command (dialog boxes from shell ++ scripts), based on libnewt. ++endef ++ ++TARGET_CFLAGS += $(FPIC) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_ARGS += \ ++ --disable-nls \ ++ --without-tcl \ ++ --without-gpm-support ++ ++MAKE_FLAGS += AR="$(TARGET_CROSS)ar" ++ ++define Package/libnewt/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libnewt.so* $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/newt.h $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libnewt.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/whiptail/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/whiptail $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libnewt)) ++$(eval $(call BuildPackage,whiptail)) ++ +diff --git a/feeds/packages/libs/newt/Makefile b/feeds/packages/libs/newt/Makefile +new file mode 100644 +index 0000000..79dad88 +--- /dev/null ++++ b/feeds/packages/libs/newt/Makefile +@@ -0,0 +1,76 @@ ++# ++# Copyright (C) 2006-2011 OpenWrt.org ++# Copyright (C) 2011 SMBPhone Inc. ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=newt ++PKG_VERSION:=0.52.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://fedorahosted.org/releases/n/e/newt/ ++PKG_MD5SUM:=51b04128d9e1bf000fa769c417b74486 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnewt ++ URL:=http://fedorahosted.org/newt/ ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Not Erik's Windowing Toolkit ++ DEPENDS:= +libslang2 +libpopt ++endef ++ ++define Package/libnewt/description ++ Programming library for colour text mode widget-based user interfaces, ++ based on S-Lang. ++endef ++ ++define Package/whiptail ++ URL:=http://fedorahosted.org/newt/ ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Dialog boxes from shell scripts ++ DEPENDS:= +libnewt ++endef ++ ++define Package/whiptail/description ++ A lightweight replacement for the dialog command (dialog boxes from shell ++ scripts), based on libnewt. ++endef ++ ++TARGET_CFLAGS += $(FPIC) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_ARGS += \ ++ --disable-nls \ ++ --without-tcl \ ++ --without-gpm-support ++ ++MAKE_FLAGS += AR="$(TARGET_CROSS)ar" ++ ++define Package/libnewt/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libnewt.so* $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/newt.h $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libnewt.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/whiptail/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/whiptail $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libnewt)) ++$(eval $(call BuildPackage,whiptail)) ++ +diff --git a/feeds/packages/libs/newt/patches/.svn/entries b/feeds/packages/libs/newt/patches/.svn/entries +new file mode 100644 +index 0000000..ca26639 +--- /dev/null ++++ b/feeds/packages/libs/newt/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/newt/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-18T15:06:07.869953Z ++32424 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile-fix-broken-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7ad43f5186bf4c151a5cd499204899e2 ++2012-06-18T15:06:07.869953Z ++32424 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2297 ++ ++110-disable-snackmodule-python.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++c4af2917f476991e55ba1398aee96482 ++2012-06-18T15:06:07.869953Z ++32424 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1806 ++ +diff --git a/feeds/packages/libs/newt/patches/.svn/text-base/100-compile-fix-broken-makefile.patch.svn-base b/feeds/packages/libs/newt/patches/.svn/text-base/100-compile-fix-broken-makefile.patch.svn-base +new file mode 100644 +index 0000000..cbada60 +--- /dev/null ++++ b/feeds/packages/libs/newt/patches/.svn/text-base/100-compile-fix-broken-makefile.patch.svn-base +@@ -0,0 +1,68 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -4,7 +4,8 @@ LIBTCL = -ltcl8.4 ++ CC = @CC@ ++ CPP = @CPP@ ++ CFLAGS = @CFLAGS@ ++-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ +++AR ?= ar +++CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ ++ ++ SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver ++ VERSION = @VERSION@ ++@@ -53,19 +54,19 @@ endif ++ all: $(TARGET) _snackmodule.so ++ ++ test: test.o $(LIBNEWT) ++- $(CC) -g -o test test.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o test test.o $(LIBNEWT) $(LIBS) ++ ++ testgrid: testgrid.o $(LIBNEWT) ++- $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS) ++ ++ testtree: testtree.o $(LIBNEWT) ++- $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o testtree testtree.o $(LIBNEWT) $(LIBS) ++ ++ showchars: showchars.o $(LIBNEWT) ++- $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o showchars showchars.o $(LIBNEWT) $(LIBS) ++ ++ showkey: showkey.o $(LIBNEWT) ++- $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o showkey showkey.o $(LIBNEWT) $(LIBS) ++ ++ _snackmodule.so: snackmodule.c $(LIBNEWTSH) ++ for ver in $(PYTHONVERS) ; do \ ++@@ -76,13 +77,13 @@ _snackmodule.so: snackmodule.c $(LIBNE ++ touch $@ ++ ++ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) ++- $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt +++ $(CC) $(CFLAGS) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt ++ ++ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) ++ $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lpopt ++ ++ $(LIBNEWT): $(LIBOBJS) ++- ar rv $@ $^ +++ $(AR) rv $@ $^ ++ ++ newt.o $(SHAREDDIR)/newt.o: newt.c Makefile ++ ++@@ -102,12 +103,12 @@ $(SHAREDDIR): ++ sharedlib: $(LIBNEWTSH) ++ ++ $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS) ++- $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS) +++ $(CC) $(CFLAGS) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS) ++ ln -fs $(LIBNEWTSONAME) libnewt.so ++ ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME) ++ ++ $(SHAREDDIR)/%.o : %.c ++- $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< +++ $(CC) $(CFLAGS) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< ++ ++ install: $(LIBNEWT) install-sh whiptail ++ [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir) +diff --git a/feeds/packages/libs/newt/patches/.svn/text-base/110-disable-snackmodule-python.patch.svn-base b/feeds/packages/libs/newt/patches/.svn/text-base/110-disable-snackmodule-python.patch.svn-base +new file mode 100644 +index 0000000..79e7e11 +--- /dev/null ++++ b/feeds/packages/libs/newt/patches/.svn/text-base/110-disable-snackmodule-python.patch.svn-base +@@ -0,0 +1,45 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -51,7 +51,7 @@ else ++ TARGET=depend $(PROGS) ++ endif ++ ++-all: $(TARGET) _snackmodule.so +++all: $(TARGET) ++ ++ test: test.o $(LIBNEWT) ++ $(CC) $(CFLAGS) -g -o test test.o $(LIBNEWT) $(LIBS) ++@@ -68,14 +68,6 @@ showchars: showchars.o $(LIBNEWT) ++ showkey: showkey.o $(LIBNEWT) ++ $(CC) $(CFLAGS) -g -o showkey showkey.o $(LIBNEWT) $(LIBS) ++ ++-_snackmodule.so: snackmodule.c $(LIBNEWTSH) ++- for ver in $(PYTHONVERS) ; do \ ++- mkdir -p $$ver ;\ ++- $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\ ++- $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . -lnewt ;\ ++- done ++- touch $@ ++- ++ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) ++ $(CC) $(CFLAGS) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt ++ ++@@ -122,17 +114,12 @@ install: $(LIBNEWT) install-sh whiptail ++ make -C po datadir=$(instroot)/$(datadir) install ++ install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc ++ ++-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so +++install-sh: sharedlib $(WHIPTCLSO) ++ [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) ++ install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) ++ ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so ++ ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME) ++ [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : ++- for ver in $(PYTHONVERS) ; do \ ++- [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ ++- install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ ++- install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ ++- done ++ ++ Makefile: newt.spec ++ echo "You need to rerun ./configure before continuing" +diff --git a/feeds/packages/libs/newt/patches/100-compile-fix-broken-makefile.patch b/feeds/packages/libs/newt/patches/100-compile-fix-broken-makefile.patch +new file mode 100644 +index 0000000..cbada60 +--- /dev/null ++++ b/feeds/packages/libs/newt/patches/100-compile-fix-broken-makefile.patch +@@ -0,0 +1,68 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -4,7 +4,8 @@ LIBTCL = -ltcl8.4 ++ CC = @CC@ ++ CPP = @CPP@ ++ CFLAGS = @CFLAGS@ ++-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ +++AR ?= ar +++CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ ++ ++ SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver ++ VERSION = @VERSION@ ++@@ -53,19 +54,19 @@ endif ++ all: $(TARGET) _snackmodule.so ++ ++ test: test.o $(LIBNEWT) ++- $(CC) -g -o test test.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o test test.o $(LIBNEWT) $(LIBS) ++ ++ testgrid: testgrid.o $(LIBNEWT) ++- $(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS) ++ ++ testtree: testtree.o $(LIBNEWT) ++- $(CC) -g -o testtree testtree.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o testtree testtree.o $(LIBNEWT) $(LIBS) ++ ++ showchars: showchars.o $(LIBNEWT) ++- $(CC) -g -o showchars showchars.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o showchars showchars.o $(LIBNEWT) $(LIBS) ++ ++ showkey: showkey.o $(LIBNEWT) ++- $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS) +++ $(CC) $(CFLAGS) -g -o showkey showkey.o $(LIBNEWT) $(LIBS) ++ ++ _snackmodule.so: snackmodule.c $(LIBNEWTSH) ++ for ver in $(PYTHONVERS) ; do \ ++@@ -76,13 +77,13 @@ _snackmodule.so: snackmodule.c $(LIBNE ++ touch $@ ++ ++ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) ++- $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt +++ $(CC) $(CFLAGS) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt ++ ++ whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) ++ $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lpopt ++ ++ $(LIBNEWT): $(LIBOBJS) ++- ar rv $@ $^ +++ $(AR) rv $@ $^ ++ ++ newt.o $(SHAREDDIR)/newt.o: newt.c Makefile ++ ++@@ -102,12 +103,12 @@ $(SHAREDDIR): ++ sharedlib: $(LIBNEWTSH) ++ ++ $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS) ++- $(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS) +++ $(CC) $(CFLAGS) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS) ++ ln -fs $(LIBNEWTSONAME) libnewt.so ++ ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME) ++ ++ $(SHAREDDIR)/%.o : %.c ++- $(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< +++ $(CC) $(CFLAGS) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< ++ ++ install: $(LIBNEWT) install-sh whiptail ++ [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir) +diff --git a/feeds/packages/libs/newt/patches/110-disable-snackmodule-python.patch b/feeds/packages/libs/newt/patches/110-disable-snackmodule-python.patch +new file mode 100644 +index 0000000..79e7e11 +--- /dev/null ++++ b/feeds/packages/libs/newt/patches/110-disable-snackmodule-python.patch +@@ -0,0 +1,45 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -51,7 +51,7 @@ else ++ TARGET=depend $(PROGS) ++ endif ++ ++-all: $(TARGET) _snackmodule.so +++all: $(TARGET) ++ ++ test: test.o $(LIBNEWT) ++ $(CC) $(CFLAGS) -g -o test test.o $(LIBNEWT) $(LIBS) ++@@ -68,14 +68,6 @@ showchars: showchars.o $(LIBNEWT) ++ showkey: showkey.o $(LIBNEWT) ++ $(CC) $(CFLAGS) -g -o showkey showkey.o $(LIBNEWT) $(LIBS) ++ ++-_snackmodule.so: snackmodule.c $(LIBNEWTSH) ++- for ver in $(PYTHONVERS) ; do \ ++- mkdir -p $$ver ;\ ++- $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\ ++- $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . -lnewt ;\ ++- done ++- touch $@ ++- ++ whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) ++ $(CC) $(CFLAGS) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt ++ ++@@ -122,17 +114,12 @@ install: $(LIBNEWT) install-sh whiptail ++ make -C po datadir=$(instroot)/$(datadir) install ++ install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc ++ ++-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so +++install-sh: sharedlib $(WHIPTCLSO) ++ [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) ++ install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) ++ ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so ++ ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME) ++ [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : ++- for ver in $(PYTHONVERS) ; do \ ++- [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ ++- install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ ++- install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ ++- done ++ ++ Makefile: newt.spec ++ echo "You need to rerun ./configure before continuing" +diff --git a/feeds/packages/libs/nmeap/.svn/entries b/feeds/packages/libs/nmeap/.svn/entries +new file mode 100644 +index 0000000..2f2ecb1 +--- /dev/null ++++ b/feeds/packages/libs/nmeap/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/nmeap ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++6b4ae2562305078297d406a84395f0e3 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1151 ++ +diff --git a/feeds/packages/libs/nmeap/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/nmeap/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9978e4b +--- /dev/null ++++ b/feeds/packages/libs/nmeap/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=nmeap ++PKG_VERSION:=0.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nmeap ++PKG_MD5SUM:=cbcc9fdf5176f9d6c9e48f27db443c4f ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnmeap ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=extensible NMEA-0183 parser written in standard C ++ URL:=http://www.dmh2000.com/nmea/nmeap.shtml ++endef ++ ++define Package/libnmeap/description ++The NMEAP parser is intended for use in applications that need to input NMEA-0183 ++ data from a GPS (typically over a serial port). NMEAP is a linkable library written in portable ++ standard C and is suitable for both desktop and embedded applications. ++ It is licensed under the BSD open source license. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/inc/nmeap{,_def}.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libnmeap.a $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnmeap)) +diff --git a/feeds/packages/libs/nmeap/Makefile b/feeds/packages/libs/nmeap/Makefile +new file mode 100644 +index 0000000..9978e4b +--- /dev/null ++++ b/feeds/packages/libs/nmeap/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=nmeap ++PKG_VERSION:=0.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/nmeap ++PKG_MD5SUM:=cbcc9fdf5176f9d6c9e48f27db443c4f ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libnmeap ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=extensible NMEA-0183 parser written in standard C ++ URL:=http://www.dmh2000.com/nmea/nmeap.shtml ++endef ++ ++define Package/libnmeap/description ++The NMEAP parser is intended for use in applications that need to input NMEA-0183 ++ data from a GPS (typically over a serial port). NMEAP is a linkable library written in portable ++ standard C and is suitable for both desktop and embedded applications. ++ It is licensed under the BSD open source license. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/inc/nmeap{,_def}.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libnmeap.a $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libnmeap)) +diff --git a/feeds/packages/libs/nmeap/patches/.svn/entries b/feeds/packages/libs/nmeap/patches/.svn/entries +new file mode 100644 +index 0000000..e3d21e2 +--- /dev/null ++++ b/feeds/packages/libs/nmeap/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/nmeap/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-07-25T13:51:45.679901Z ++8155 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-no_test.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7af7bd6dd7655a1909222d4779ab16af ++2007-07-25T13:51:45.679901Z ++8155 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++447 ++ +diff --git a/feeds/packages/libs/nmeap/patches/.svn/text-base/100-no_test.patch.svn-base b/feeds/packages/libs/nmeap/patches/.svn/text-base/100-no_test.patch.svn-base +new file mode 100644 +index 0000000..891e2a8 +--- /dev/null ++++ b/feeds/packages/libs/nmeap/patches/.svn/text-base/100-no_test.patch.svn-base +@@ -0,0 +1,21 @@ ++--- nmeap-0.3/Makefile 2005-05-06 19:57:39.000000000 +0200 +++++ nmeap-0.3.new/Makefile 2007-07-25 15:26:47.000000000 +0200 ++@@ -5,18 +5,15 @@ ++ # directories ++ BASE :=$(shell pwd) ++ export SRC=$(BASE)/src ++-export TST=$(BASE)/tst ++ export INC=$(BASE)/inc ++ export LIB=$(BASE)/lib ++ ++ all : ++ cd $(SRC) && $(MAKE) all ++- cd $(TST) && $(MAKE) all ++ ++ ++ clean : ++ cd $(SRC) && $(MAKE) clean ++- cd $(TST) && $(MAKE) clean ++ ++ doc : ++ doxygen +diff --git a/feeds/packages/libs/nmeap/patches/100-no_test.patch b/feeds/packages/libs/nmeap/patches/100-no_test.patch +new file mode 100644 +index 0000000..891e2a8 +--- /dev/null ++++ b/feeds/packages/libs/nmeap/patches/100-no_test.patch +@@ -0,0 +1,21 @@ ++--- nmeap-0.3/Makefile 2005-05-06 19:57:39.000000000 +0200 +++++ nmeap-0.3.new/Makefile 2007-07-25 15:26:47.000000000 +0200 ++@@ -5,18 +5,15 @@ ++ # directories ++ BASE :=$(shell pwd) ++ export SRC=$(BASE)/src ++-export TST=$(BASE)/tst ++ export INC=$(BASE)/inc ++ export LIB=$(BASE)/lib ++ ++ all : ++ cd $(SRC) && $(MAKE) all ++- cd $(TST) && $(MAKE) all ++ ++ ++ clean : ++ cd $(SRC) && $(MAKE) clean ++- cd $(TST) && $(MAKE) clean ++ ++ doc : ++ doxygen +diff --git a/feeds/packages/libs/opal/.svn/entries b/feeds/packages/libs/opal/.svn/entries +new file mode 100644 +index 0000000..dbb5faf +--- /dev/null ++++ b/feeds/packages/libs/opal/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/opal ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:10.649433Z ++34634 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4354d2e5330cc1b748771a27dca0fd01 ++2012-12-11T16:58:10.649433Z ++34634 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1591 ++ +diff --git a/feeds/packages/libs/opal/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/opal/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..80e6e0f +--- /dev/null ++++ b/feeds/packages/libs/opal/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=opal ++PKG_VERSION:=3.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 ++PKG_SOURCE_URL:=@SF/opalvoip ++PKG_MD5SUM:=405ba3b03ec706b6e6f873de340937e2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libopal ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+ptlib +libstdcpp ++ TITLE:=Open Phone Abstraction Library ++ URL:=http://www.opalvoip.org/ ++endef ++ ++define Package/libopal/description ++ Open Phone Abstraction Library, implementation of the ITU H.323 ++ teleconferencing protocol, and successor of the openh323 library. It ++ supports not only the H.323 protocol but also SIP and IAX2. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-audio \ ++ --disable-video \ ++ --enable-sip \ ++ --enable-h323 \ ++ --disable-iax \ ++ --disable-h224 \ ++ --disable-h450 \ ++ --disable-h460 \ ++ --disable-ivr \ ++ --disable-rfc4175 \ ++ --disable-versioncheck \ ++ --disable-theora \ ++ --enable-localgsm ++ ++CONFIGURE_VARS += \ ++ PTLIBDIR="$(BUILD_DIR)/ptlib" \ ++ PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" ++ CXXFLAGS="$(TARGET_CFLAGS)" \ ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ PTLIBDIR="$(BUILD_DIR)/ptlib" \ ++ PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" \ ++ optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)_$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,libopal)) +diff --git a/feeds/packages/libs/opal/Makefile b/feeds/packages/libs/opal/Makefile +new file mode 100644 +index 0000000..80e6e0f +--- /dev/null ++++ b/feeds/packages/libs/opal/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=opal ++PKG_VERSION:=3.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 ++PKG_SOURCE_URL:=@SF/opalvoip ++PKG_MD5SUM:=405ba3b03ec706b6e6f873de340937e2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libopal ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+ptlib +libstdcpp ++ TITLE:=Open Phone Abstraction Library ++ URL:=http://www.opalvoip.org/ ++endef ++ ++define Package/libopal/description ++ Open Phone Abstraction Library, implementation of the ITU H.323 ++ teleconferencing protocol, and successor of the openh323 library. It ++ supports not only the H.323 protocol but also SIP and IAX2. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-audio \ ++ --disable-video \ ++ --enable-sip \ ++ --enable-h323 \ ++ --disable-iax \ ++ --disable-h224 \ ++ --disable-h450 \ ++ --disable-h460 \ ++ --disable-ivr \ ++ --disable-rfc4175 \ ++ --disable-versioncheck \ ++ --disable-theora \ ++ --enable-localgsm ++ ++CONFIGURE_VARS += \ ++ PTLIBDIR="$(BUILD_DIR)/ptlib" \ ++ PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" ++ CXXFLAGS="$(TARGET_CFLAGS)" \ ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ PTLIBDIR="$(BUILD_DIR)/ptlib" \ ++ PTLIBPLUGINDIR="$(BUILD_DIR)/ptlib/plugins/ptlib/" \ ++ optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)_$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,libopal)) +diff --git a/feeds/packages/libs/opal/patches/.svn/entries b/feeds/packages/libs/opal/patches/.svn/entries +new file mode 100644 +index 0000000..30c496f +--- /dev/null ++++ b/feeds/packages/libs/opal/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/opal/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-03-09T20:00:14.011967Z ++14823 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix-gcc_4_3-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++7e45de0c018042a339a507def42902fe ++2009-03-09T20:00:14.011967Z ++14823 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++783 ++ +diff --git a/feeds/packages/libs/opal/patches/.svn/text-base/010-fix-gcc_4_3-compile.patch.svn-base b/feeds/packages/libs/opal/patches/.svn/text-base/010-fix-gcc_4_3-compile.patch.svn-base +new file mode 100644 +index 0000000..15d80b4 +--- /dev/null ++++ b/feeds/packages/libs/opal/patches/.svn/text-base/010-fix-gcc_4_3-compile.patch.svn-base +@@ -0,0 +1,25 @@ ++diff --git a/plugins/video/common/trace.cxx b/plugins/video/common/trace.cxx ++index 7262478..de641af 100644 ++--- a/plugins/video/common/trace.cxx +++++ b/plugins/video/common/trace.cxx ++@@ -30,6 +30,7 @@ ++ /*****************************************************************************/ ++ ++ #include "trace.h" +++#include ++ ++ #ifdef __MACOSX__ ++ #include ++diff --git a/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx b/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx ++index 4a17b2c..a2f051c 100644 ++--- a/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx +++++ b/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx ++@@ -54,6 +54,8 @@ ++ #define _CRT_NONSTDC_NO_WARNINGS ++ #define _CRT_SECURE_NO_DEPRECATE ++ #include +++#include +++#include ++ ++ #include ++ #ifdef _WIN32 +diff --git a/feeds/packages/libs/opal/patches/010-fix-gcc_4_3-compile.patch b/feeds/packages/libs/opal/patches/010-fix-gcc_4_3-compile.patch +new file mode 100644 +index 0000000..15d80b4 +--- /dev/null ++++ b/feeds/packages/libs/opal/patches/010-fix-gcc_4_3-compile.patch +@@ -0,0 +1,25 @@ ++diff --git a/plugins/video/common/trace.cxx b/plugins/video/common/trace.cxx ++index 7262478..de641af 100644 ++--- a/plugins/video/common/trace.cxx +++++ b/plugins/video/common/trace.cxx ++@@ -30,6 +30,7 @@ ++ /*****************************************************************************/ ++ ++ #include "trace.h" +++#include ++ ++ #ifdef __MACOSX__ ++ #include ++diff --git a/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx b/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx ++index 4a17b2c..a2f051c 100644 ++--- a/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx +++++ b/plugins/video/H.263-ffmpeg/h263ffmpeg.cxx ++@@ -54,6 +54,8 @@ ++ #define _CRT_NONSTDC_NO_WARNINGS ++ #define _CRT_SECURE_NO_DEPRECATE ++ #include +++#include +++#include ++ ++ #include ++ #ifdef _WIN32 +diff --git a/feeds/packages/libs/opencdk/.svn/entries b/feeds/packages/libs/opencdk/.svn/entries +new file mode 100644 +index 0000000..7b5e010 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/opencdk ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++e77f8862859398cc1523d6ff2dcfc67c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1876 ++ +diff --git a/feeds/packages/libs/opencdk/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/opencdk/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/opencdk/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/opencdk/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2648fd6 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,76 @@ ++# ++# 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:=opencdk ++PKG_VERSION:=0.6.6 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/attic/opencdk ++PKG_MD5SUM:=813d62d7afe7b2c2d8f3df0a6c9d9331 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libopencdk ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libgcrypt zlib ++ TITLE:=The Open Crypto Development Kit library ++ URL:=ftp://ftp.gnutls.org/pub/gnutls/attic/opencdk/ ++endef ++ ++define Package/libopencdk/description ++ This library provides basic parts of the OpenPGP message format. ++ For reference, please read the rfc2440.txt in the doc/ directory. ++ Due to some possible security problems, the library also implements ++ parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange ++ messages with earlier PGP version < 7, you should use the compat mode. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/opencdk-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/opencdk-config ++ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/opencdk.h \ ++ $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{la,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libopencdk/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libopencdk)) +diff --git a/feeds/packages/libs/opencdk/Makefile b/feeds/packages/libs/opencdk/Makefile +new file mode 100644 +index 0000000..2648fd6 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/Makefile +@@ -0,0 +1,76 @@ ++# ++# 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:=opencdk ++PKG_VERSION:=0.6.6 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/attic/opencdk ++PKG_MD5SUM:=813d62d7afe7b2c2d8f3df0a6c9d9331 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/libopencdk ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libgcrypt zlib ++ TITLE:=The Open Crypto Development Kit library ++ URL:=ftp://ftp.gnutls.org/pub/gnutls/attic/opencdk/ ++endef ++ ++define Package/libopencdk/description ++ This library provides basic parts of the OpenPGP message format. ++ For reference, please read the rfc2440.txt in the doc/ directory. ++ Due to some possible security problems, the library also implements ++ parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange ++ messages with earlier PGP version < 7, you should use the compat mode. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/opencdk-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/opencdk-config ++ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/opencdk.h \ ++ $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{la,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/libopencdk/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libopencdk)) +diff --git a/feeds/packages/libs/opencdk/patches/.svn/entries b/feeds/packages/libs/opencdk/patches/.svn/entries +new file mode 100644 +index 0000000..6326991 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/opencdk/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-09T20:36:32.317222Z ++25437 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-verify-clearsigned.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++6bfe68599e074d0d4800691e93193c15 ++2011-02-09T20:36:32.317222Z ++25437 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++418 ++ ++100-fix-tests-build ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++cce072b2879f672659e6ad56219f84de ++2008-07-06T17:45:22.958090Z ++11730 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++518 ++ +diff --git a/feeds/packages/libs/opencdk/patches/.svn/text-base/100-fix-tests-build.svn-base b/feeds/packages/libs/opencdk/patches/.svn/text-base/100-fix-tests-build.svn-base +new file mode 100644 +index 0000000..c4df1a0 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/patches/.svn/text-base/100-fix-tests-build.svn-base +@@ -0,0 +1,22 @@ ++--- a/tests/Makefile.am +++++ b/tests/Makefile.am ++@@ -34,7 +34,7 @@ ++ ++ CLEANFILES = plain-test ++ ++-LDADD = ../src/libopencdk.la +++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS) ++ ++ if HAVE_W32_SYSTEM ++ # there is a problem with some tests and WINE ++--- a/tests/Makefile.in +++++ b/tests/Makefile.in ++@@ -258,7 +258,7 @@ ++ AM_LDFLAGS = -no-install ++ AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS) ++ CLEANFILES = plain-test ++-LDADD = ../src/libopencdk.la +++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS) ++ noinst_HEADER = t-support.h ++ all: all-am ++ +diff --git a/feeds/packages/libs/opencdk/patches/.svn/text-base/200-verify-clearsigned.patch.svn-base b/feeds/packages/libs/opencdk/patches/.svn/text-base/200-verify-clearsigned.patch.svn-base +new file mode 100644 +index 0000000..a222aa8 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/patches/.svn/text-base/200-verify-clearsigned.patch.svn-base +@@ -0,0 +1,13 @@ ++--- opencdk-0.6.6/src/stream.c 2007-11-08 19:31:45.000000000 +0100 +++++ opencdk-0.6.6-my/src/stream.c 2011-01-17 20:30:19.000000000 +0100 ++@@ -1384,7 +1384,9 @@ ++ while (!cdk_stream_eof (s) && count > 0) ++ { ++ c = cdk_stream_getc (s); ++- if (c == EOF || c == '\r' || c == '\n' ) +++ if (c == '\r') +++ c = cdk_stream_getc (s); +++ if (c == EOF || c == '\n' ) ++ { ++ buf[i++] = '\0'; ++ break; +diff --git a/feeds/packages/libs/opencdk/patches/100-fix-tests-build b/feeds/packages/libs/opencdk/patches/100-fix-tests-build +new file mode 100644 +index 0000000..c4df1a0 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/patches/100-fix-tests-build +@@ -0,0 +1,22 @@ ++--- a/tests/Makefile.am +++++ b/tests/Makefile.am ++@@ -34,7 +34,7 @@ ++ ++ CLEANFILES = plain-test ++ ++-LDADD = ../src/libopencdk.la +++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS) ++ ++ if HAVE_W32_SYSTEM ++ # there is a problem with some tests and WINE ++--- a/tests/Makefile.in +++++ b/tests/Makefile.in ++@@ -258,7 +258,7 @@ ++ AM_LDFLAGS = -no-install ++ AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS) ++ CLEANFILES = plain-test ++-LDADD = ../src/libopencdk.la +++LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS) ++ noinst_HEADER = t-support.h ++ all: all-am ++ +diff --git a/feeds/packages/libs/opencdk/patches/200-verify-clearsigned.patch b/feeds/packages/libs/opencdk/patches/200-verify-clearsigned.patch +new file mode 100644 +index 0000000..a222aa8 +--- /dev/null ++++ b/feeds/packages/libs/opencdk/patches/200-verify-clearsigned.patch +@@ -0,0 +1,13 @@ ++--- opencdk-0.6.6/src/stream.c 2007-11-08 19:31:45.000000000 +0100 +++++ opencdk-0.6.6-my/src/stream.c 2011-01-17 20:30:19.000000000 +0100 ++@@ -1384,7 +1384,9 @@ ++ while (!cdk_stream_eof (s) && count > 0) ++ { ++ c = cdk_stream_getc (s); ++- if (c == EOF || c == '\r' || c == '\n' ) +++ if (c == '\r') +++ c = cdk_stream_getc (s); +++ if (c == EOF || c == '\n' ) ++ { ++ buf[i++] = '\0'; ++ break; +diff --git a/feeds/packages/libs/openh323/.svn/entries b/feeds/packages/libs/openh323/.svn/entries +new file mode 100644 +index 0000000..26e9847 +--- /dev/null ++++ b/feeds/packages/libs/openh323/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/openh323 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:22.558913Z ++33048 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2c43c9274db329373980a9b6599c4952 ++2012-08-07T16:09:22.558913Z ++33048 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1023 ++ +diff --git a/feeds/packages/libs/openh323/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/openh323/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/openh323/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/openh323/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/openh323/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..da1e985 +--- /dev/null ++++ b/feeds/packages/libs/openh323/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# Copyright (C) 2006-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:=openh323 ++PKG_VERSION:=cvs-20051230 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://trash.uid0.hu/openwrt/ ++PKG_MD5SUM:=ba1ffd45016f533bec2bb1539b78e43a ++ ++PKG_BUILD_DEPENDS:=pwlib ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libopenh323 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=OpenH323 library ++ URL:=http://openh323.sourceforge.net/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-minsize \ ++ --enable-audio \ ++ --disable-video \ ++ --enable-localspeex \ ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \ ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ ++ CCFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ ++ optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,libopenh323)) +diff --git a/feeds/packages/libs/openh323/Makefile b/feeds/packages/libs/openh323/Makefile +new file mode 100644 +index 0000000..da1e985 +--- /dev/null ++++ b/feeds/packages/libs/openh323/Makefile +@@ -0,0 +1,49 @@ ++# ++# Copyright (C) 2006-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:=openh323 ++PKG_VERSION:=cvs-20051230 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://trash.uid0.hu/openwrt/ ++PKG_MD5SUM:=ba1ffd45016f533bec2bb1539b78e43a ++ ++PKG_BUILD_DEPENDS:=pwlib ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libopenh323 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=OpenH323 library ++ URL:=http://openh323.sourceforge.net/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-minsize \ ++ --enable-audio \ ++ --disable-video \ ++ --enable-localspeex \ ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \ ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ ++ CCFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ ++ optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,libopenh323)) +diff --git a/feeds/packages/libs/openh323/patches/.svn/entries b/feeds/packages/libs/openh323/patches/.svn/entries +new file mode 100644 +index 0000000..8ef7eaf +--- /dev/null ++++ b/feeds/packages/libs/openh323/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/openh323/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++b6b7cc908752d7de68abbc7aa34b4d17 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5877 ++ +diff --git a/feeds/packages/libs/openh323/patches/.svn/prop-base/001-configure.patch.svn-base b/feeds/packages/libs/openh323/patches/.svn/prop-base/001-configure.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/openh323/patches/.svn/prop-base/001-configure.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/openh323/patches/.svn/text-base/001-configure.patch.svn-base b/feeds/packages/libs/openh323/patches/.svn/text-base/001-configure.patch.svn-base +new file mode 100644 +index 0000000..04ed8c5 +--- /dev/null ++++ b/feeds/packages/libs/openh323/patches/.svn/text-base/001-configure.patch.svn-base +@@ -0,0 +1,122 @@ ++--- openh323-cvs-20051230.orig/configure 2005-08-30 03:12:38.000000000 +0200 +++++ openh323-cvs-20051230/configure 2005-12-30 11:29:57.000000000 +0100 ++@@ -3080,10 +3080,10 @@ ++ if eval "test \"\${$as_ac_File+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "${PWLIBDIR}/version.h"; then ++ eval "$as_ac_File=yes" ++ else ++@@ -3104,10 +3104,10 @@ ++ if eval "test \"\${$as_ac_File+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "${OPENH323DIR}/../pwlib/version.h"; then ++ eval "$as_ac_File=yes" ++ else ++@@ -3129,10 +3129,10 @@ ++ if eval "test \"\${$as_ac_File+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "${HOME}/pwlib/include/ptlib.h"; then ++ eval "$as_ac_File=yes" ++ else ++@@ -3153,10 +3153,10 @@ ++ if test "${ac_cv_file__usr_local_include_ptlib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/include/ptlib.h"; then ++ ac_cv_file__usr_local_include_ptlib_h=yes ++ else ++@@ -3215,10 +3215,10 @@ ++ if test "${ac_cv_file__usr_include_ptlib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/include/ptlib.h"; then ++ ac_cv_file__usr_include_ptlib_h=yes ++ else ++@@ -3985,10 +3985,10 @@ ++ if test "${ac_cv_file__usr_local_include_ffmpeg_avcodec_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/include/ffmpeg/avcodec.h"; then ++ ac_cv_file__usr_local_include_ffmpeg_avcodec_h=yes ++ else ++@@ -4193,10 +4193,10 @@ ++ if test "${ac_cv_file__usr_local_lib_libvich263_so+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/lib/libvich263.so"; then ++ ac_cv_file__usr_local_lib_libvich263_so=yes ++ else ++@@ -4219,10 +4219,10 @@ ++ if test "${ac_cv_file__usr_local_include_vich263_encoder_h263_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/include/vich263/encoder-h263.h"; then ++ ac_cv_file__usr_local_include_vich263_encoder_h263_h=yes ++ else +diff --git a/feeds/packages/libs/openh323/patches/001-configure.patch b/feeds/packages/libs/openh323/patches/001-configure.patch +new file mode 100644 +index 0000000..04ed8c5 +--- /dev/null ++++ b/feeds/packages/libs/openh323/patches/001-configure.patch +@@ -0,0 +1,122 @@ ++--- openh323-cvs-20051230.orig/configure 2005-08-30 03:12:38.000000000 +0200 +++++ openh323-cvs-20051230/configure 2005-12-30 11:29:57.000000000 +0100 ++@@ -3080,10 +3080,10 @@ ++ if eval "test \"\${$as_ac_File+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "${PWLIBDIR}/version.h"; then ++ eval "$as_ac_File=yes" ++ else ++@@ -3104,10 +3104,10 @@ ++ if eval "test \"\${$as_ac_File+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "${OPENH323DIR}/../pwlib/version.h"; then ++ eval "$as_ac_File=yes" ++ else ++@@ -3129,10 +3129,10 @@ ++ if eval "test \"\${$as_ac_File+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "${HOME}/pwlib/include/ptlib.h"; then ++ eval "$as_ac_File=yes" ++ else ++@@ -3153,10 +3153,10 @@ ++ if test "${ac_cv_file__usr_local_include_ptlib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/include/ptlib.h"; then ++ ac_cv_file__usr_local_include_ptlib_h=yes ++ else ++@@ -3215,10 +3215,10 @@ ++ if test "${ac_cv_file__usr_include_ptlib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/include/ptlib.h"; then ++ ac_cv_file__usr_include_ptlib_h=yes ++ else ++@@ -3985,10 +3985,10 @@ ++ if test "${ac_cv_file__usr_local_include_ffmpeg_avcodec_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/include/ffmpeg/avcodec.h"; then ++ ac_cv_file__usr_local_include_ffmpeg_avcodec_h=yes ++ else ++@@ -4193,10 +4193,10 @@ ++ if test "${ac_cv_file__usr_local_lib_libvich263_so+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/lib/libvich263.so"; then ++ ac_cv_file__usr_local_lib_libvich263_so=yes ++ else ++@@ -4219,10 +4219,10 @@ ++ if test "${ac_cv_file__usr_local_include_vich263_encoder_h263_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- test "$cross_compiling" = yes && ++- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++- { (exit 1); exit 1; }; } +++# test "$cross_compiling" = yes && +++# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +++#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +++# { (exit 1); exit 1; }; } ++ if test -r "/usr/local/include/vich263/encoder-h263.h"; then ++ ac_cv_file__usr_local_include_vich263_encoder_h263_h=yes ++ else +diff --git a/feeds/packages/libs/openldap/.svn/entries b/feeds/packages/libs/openldap/.svn/entries +new file mode 100644 +index 0000000..0408552 +--- /dev/null ++++ b/feeds/packages/libs/openldap/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/openldap ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++6730e8baec5d8563def03ed0b179a0df ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4080 ++ +diff --git a/feeds/packages/libs/openldap/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/openldap/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/openldap/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/openldap/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/openldap/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a9cb408 +--- /dev/null ++++ b/feeds/packages/libs/openldap/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,150 @@ ++# ++# 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.23 ++PKG_RELEASE:=4 ++ ++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:=90150b8c0d0192e10b30157e68844ddf ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/openldap/Default ++ TITLE:=LDAP implementation ++ URL:=http://www.openldap.org/ ++ MAINTAINER:=W. Michael Petullo ++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 ++ 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) ++ ++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 \ ++ --without-tls \ ++ --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/feeds/packages/libs/openldap/Makefile b/feeds/packages/libs/openldap/Makefile +new file mode 100644 +index 0000000..a9cb408 +--- /dev/null ++++ b/feeds/packages/libs/openldap/Makefile +@@ -0,0 +1,150 @@ ++# ++# 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.23 ++PKG_RELEASE:=4 ++ ++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:=90150b8c0d0192e10b30157e68844ddf ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/openldap/Default ++ TITLE:=LDAP implementation ++ URL:=http://www.openldap.org/ ++ MAINTAINER:=W. Michael Petullo ++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 ++ 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) ++ ++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 \ ++ --without-tls \ ++ --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/feeds/packages/libs/openldap/files/.svn/entries b/feeds/packages/libs/openldap/files/.svn/entries +new file mode 100644 +index 0000000..c1183e0 +--- /dev/null ++++ b/feeds/packages/libs/openldap/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/openldap/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:25:19.181506Z ++28905 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ldap.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++ca987bb028fd126358cfca3040598bf1 ++2011-11-09T23:25:19.181506Z ++28905 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++261 ++ +diff --git a/feeds/packages/libs/openldap/files/.svn/text-base/ldap.init.svn-base b/feeds/packages/libs/openldap/files/.svn/text-base/ldap.init.svn-base +new file mode 100644 +index 0000000..b30bbf1 +--- /dev/null ++++ b/feeds/packages/libs/openldap/files/.svn/text-base/ldap.init.svn-base +@@ -0,0 +1,19 @@ ++#!/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 ++} ++ ++stop() { ++ service_stop /usr/sbin/slapd ++} ++ ++reload() { ++ service_reload /usr/sbin/slapd ++} +diff --git a/feeds/packages/libs/openldap/files/ldap.init b/feeds/packages/libs/openldap/files/ldap.init +new file mode 100644 +index 0000000..b30bbf1 +--- /dev/null ++++ b/feeds/packages/libs/openldap/files/ldap.init +@@ -0,0 +1,19 @@ ++#!/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 ++} ++ ++stop() { ++ service_stop /usr/sbin/slapd ++} ++ ++reload() { ++ service_reload /usr/sbin/slapd ++} +diff --git a/feeds/packages/libs/openldap/patches/.svn/entries b/feeds/packages/libs/openldap/patches/.svn/entries +new file mode 100644 +index 0000000..48e4dd8 +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/openldap/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-24T12:44:15.720769Z ++29885 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++750-no-strip.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++053d6d3fad4c44c34e04d44c80000edd ++2010-12-15T06:30:35.200867Z ++24589 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++807 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++87e163cf30cb25c624feb9c375615f1d ++2010-12-15T06:30:35.200867Z ++24589 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9114 ++ ++020-autofs-schema.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++1e83cfabfd03578e83e5ee8ce4444904 ++2012-01-24T12:44:15.720769Z ++29885 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++859 ++ +diff --git a/feeds/packages/libs/openldap/patches/.svn/prop-base/750-no-strip.patch.svn-base b/feeds/packages/libs/openldap/patches/.svn/prop-base/750-no-strip.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/.svn/prop-base/750-no-strip.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/openldap/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/libs/openldap/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..4ab2622 +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,312 @@ ++--- /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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++SHELL = @SHELL@ +++ ++ PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \ ++ slapd-modify slapd-bind 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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++SHELL = @SHELL@ +++ ++ SRCS = ldif.c ++ OBJS = ldif.lo ++ ++--- 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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++SHELL = @SHELL@ +++ ++ LIBRARY = libslapi.la ++ ++ #all-common: $(LIBRARY) $(PROGRAMS) +diff --git a/feeds/packages/libs/openldap/patches/.svn/text-base/020-autofs-schema.patch.svn-base b/feeds/packages/libs/openldap/patches/.svn/text-base/020-autofs-schema.patch.svn-base +new file mode 100644 +index 0000000..11c73f5 +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/.svn/text-base/020-autofs-schema.patch.svn-base +@@ -0,0 +1,26 @@ ++--- /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/feeds/packages/libs/openldap/patches/.svn/text-base/750-no-strip.patch.svn-base b/feeds/packages/libs/openldap/patches/.svn/text-base/750-no-strip.patch.svn-base +new file mode 100644 +index 0000000..e771dcb +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/.svn/text-base/750-no-strip.patch.svn-base +@@ -0,0 +1,22 @@ ++--- 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 ++@@ -377,7 +377,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/feeds/packages/libs/openldap/patches/001-automake-compat.patch b/feeds/packages/libs/openldap/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..4ab2622 +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/001-automake-compat.patch +@@ -0,0 +1,312 @@ ++--- /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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++SHELL = @SHELL@ +++ ++ PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \ ++ slapd-modify slapd-bind 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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++SHELL = @SHELL@ +++ ++ SRCS = ldif.c ++ OBJS = ldif.lo ++ ++--- 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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++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 ++ ## . ++ +++SHELL = @SHELL@ +++ ++ LIBRARY = libslapi.la ++ ++ #all-common: $(LIBRARY) $(PROGRAMS) +diff --git a/feeds/packages/libs/openldap/patches/020-autofs-schema.patch b/feeds/packages/libs/openldap/patches/020-autofs-schema.patch +new file mode 100644 +index 0000000..11c73f5 +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/020-autofs-schema.patch +@@ -0,0 +1,26 @@ ++--- /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/feeds/packages/libs/openldap/patches/750-no-strip.patch b/feeds/packages/libs/openldap/patches/750-no-strip.patch +new file mode 100644 +index 0000000..e771dcb +--- /dev/null ++++ b/feeds/packages/libs/openldap/patches/750-no-strip.patch +@@ -0,0 +1,22 @@ ++--- 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 ++@@ -377,7 +377,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/feeds/packages/libs/orbit2/.svn/entries b/feeds/packages/libs/orbit2/.svn/entries +new file mode 100644 +index 0000000..3762faa +--- /dev/null ++++ b/feeds/packages/libs/orbit2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/orbit2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:02.939539Z ++34631 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++b43b019e55d29099936454a4cd32f489 ++2012-12-11T16:58:02.939539Z ++34631 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2522 ++ +diff --git a/feeds/packages/libs/orbit2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/orbit2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..320ba38 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,103 @@ ++# ++# 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:=orbit2 ++PKG_VERSION:=2.14.19 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/ORBit2-$(PKG_VERSION) ++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/ORBit2-$(PKG_VERSION) ++PKG_SOURCE:=ORBit2-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@GNOME/ORBit2/2.14 ++PKG_MD5SUM:=7082d317a9573ab338302243082d10d1 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++PKG_INSTALL:=1 ++ ++HOST_BUILD_DEPENDS:=libIDL2/host ++PKG_BUILD_DEPENDS:=orbit2/host ++ ++BIGENDIAN=no ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ BIGENDIAN:=yes ++endif ++ ++CONFIGURE_VARS += \ ++ ac_cv_c_bigendian=$(BIGENDIAN) \ ++ ac_cv_alignof_CORBA_octet=1 \ ++ ac_cv_alignof_CORBA_boolean=1 \ ++ ac_cv_alignof_CORBA_char=1 \ ++ ac_cv_alignof_CORBA_wchar=2 \ ++ ac_cv_alignof_CORBA_short=2 \ ++ ac_cv_alignof_CORBA_long=4 \ ++ ac_cv_alignof_CORBA_long_long=4 \ ++ ac_cv_alignof_CORBA_float=4 \ ++ ac_cv_alignof_CORBA_double=4 \ ++ ac_cv_alignof_CORBA_long_double=4 \ ++ ac_cv_alignof_CORBA_struct=1 \ ++ ac_cv_alignof_CORBA_pointer=4 ++ ++define Package/orbit2 ++ SECTION:=xorg-libraries ++ CATEGORY:=Xorg ++ SUBMENU:=libraries ++ TITLE:=ORBit2 ++ URL:=http://www.gnome.org/projects/ORBit2/ ++ DEPENDS:=+glib2 +libIDL2 ++endef ++ ++define Package/orbit2/description ++ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB). ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++ find $(PKG_BUILD_DIR) -name Makefile -exec sed -i 's,IDL_COMPILER.*orbit-idl-2,IDL_COMPILER = $(STAGING_DIR_HOST)/bin/orbit-idl-2,g' {} \; # tell orbit2 to use the host-built idl-compiler ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{include/orbit-2.0,lib/pkgconfig} ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/orbit-2.0/* \ ++ $(1)/usr/include/orbit-2.0/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/aclocal ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ ++ $(1)/usr/share/aclocal/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/idl/orbit-2.0 ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/idl/orbit-2.0/* \ ++ $(1)/usr/share/idl/orbit-2.0/ ++endef ++ ++define Package/orbit2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libORBit*.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call HostBuild)) ++$(eval $(call BuildPackage,orbit2)) +diff --git a/feeds/packages/libs/orbit2/Makefile b/feeds/packages/libs/orbit2/Makefile +new file mode 100644 +index 0000000..320ba38 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/Makefile +@@ -0,0 +1,103 @@ ++# ++# 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:=orbit2 ++PKG_VERSION:=2.14.19 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/ORBit2-$(PKG_VERSION) ++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/ORBit2-$(PKG_VERSION) ++PKG_SOURCE:=ORBit2-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@GNOME/ORBit2/2.14 ++PKG_MD5SUM:=7082d317a9573ab338302243082d10d1 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/host-build.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++PKG_INSTALL:=1 ++ ++HOST_BUILD_DEPENDS:=libIDL2/host ++PKG_BUILD_DEPENDS:=orbit2/host ++ ++BIGENDIAN=no ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ BIGENDIAN:=yes ++endif ++ ++CONFIGURE_VARS += \ ++ ac_cv_c_bigendian=$(BIGENDIAN) \ ++ ac_cv_alignof_CORBA_octet=1 \ ++ ac_cv_alignof_CORBA_boolean=1 \ ++ ac_cv_alignof_CORBA_char=1 \ ++ ac_cv_alignof_CORBA_wchar=2 \ ++ ac_cv_alignof_CORBA_short=2 \ ++ ac_cv_alignof_CORBA_long=4 \ ++ ac_cv_alignof_CORBA_long_long=4 \ ++ ac_cv_alignof_CORBA_float=4 \ ++ ac_cv_alignof_CORBA_double=4 \ ++ ac_cv_alignof_CORBA_long_double=4 \ ++ ac_cv_alignof_CORBA_struct=1 \ ++ ac_cv_alignof_CORBA_pointer=4 ++ ++define Package/orbit2 ++ SECTION:=xorg-libraries ++ CATEGORY:=Xorg ++ SUBMENU:=libraries ++ TITLE:=ORBit2 ++ URL:=http://www.gnome.org/projects/ORBit2/ ++ DEPENDS:=+glib2 +libIDL2 ++endef ++ ++define Package/orbit2/description ++ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB). ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++ find $(PKG_BUILD_DIR) -name Makefile -exec sed -i 's,IDL_COMPILER.*orbit-idl-2,IDL_COMPILER = $(STAGING_DIR_HOST)/bin/orbit-idl-2,g' {} \; # tell orbit2 to use the host-built idl-compiler ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{include/orbit-2.0,lib/pkgconfig} ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/orbit-2.0/* \ ++ $(1)/usr/include/orbit-2.0/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/aclocal ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ ++ $(1)/usr/share/aclocal/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/idl/orbit-2.0 ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/idl/orbit-2.0/* \ ++ $(1)/usr/share/idl/orbit-2.0/ ++endef ++ ++define Package/orbit2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libORBit*.so* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call HostBuild)) ++$(eval $(call BuildPackage,orbit2)) +diff --git a/feeds/packages/libs/orbit2/patches/.svn/entries b/feeds/packages/libs/orbit2/patches/.svn/entries +new file mode 100644 +index 0000000..4c74623 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/orbit2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:02.939539Z ++34631 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-dont-run-testprograms.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++15d9ffb8ec846f32a442eda2774eeb3c ++2012-12-11T16:58:02.939539Z ++34631 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1004 ++ ++001-remove-libtool.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e8b3c53450f54cc668ab7ba48f796db3 ++2012-12-11T16:58:02.939539Z ++34631 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++289761 ++ +diff --git a/feeds/packages/libs/orbit2/patches/.svn/text-base/001-remove-libtool.patch.svn-base b/feeds/packages/libs/orbit2/patches/.svn/text-base/001-remove-libtool.patch.svn-base +new file mode 100644 +index 0000000..7bfccf4 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/patches/.svn/text-base/001-remove-libtool.patch.svn-base +@@ -0,0 +1,7954 @@ ++diff -urN ORBit2-2.14.19/aclocal.m4 ORBit2-2.14.19.new/aclocal.m4 ++--- ORBit2-2.14.19/aclocal.m4 2010-09-28 11:39:36.000000000 +0200 +++++ ORBit2-2.14.19.new/aclocal.m4 2012-12-11 14:00:59.824764295 +0100 ++@@ -989,7950 +989,6 @@ ++ AC_SUBST([am__untar]) ++ ]) # _AM_PROG_TAR ++ ++-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++-# ++-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++-# 2006, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gordon Matzigkeit, 1996 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-m4_define([_LT_COPYING], [dnl ++-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++-# 2006, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gordon Matzigkeit, 1996 ++-# ++-# This file is part of GNU Libtool. ++-# ++-# GNU Libtool 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. ++-# ++-# As a special exception to the GNU General Public License, ++-# if you distribute this file as part of a program or library that ++-# is built using GNU Libtool, you may include this file under the ++-# same distribution terms that you use for the rest of that program. ++-# ++-# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++-# obtained by writing to the Free Software Foundation, Inc., ++-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++-]) ++- ++-# serial 56 LT_INIT ++- ++- ++-# LT_PREREQ(VERSION) ++-# ------------------ ++-# Complain and exit if this libtool version is less that VERSION. ++-m4_defun([LT_PREREQ], ++-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++- [m4_default([$3], ++- [m4_fatal([Libtool version $1 or higher is required], ++- 63)])], ++- [$2])]) ++- ++- ++-# _LT_CHECK_BUILDDIR ++-# ------------------ ++-# Complain if the absolute build directory name contains unusual characters ++-m4_defun([_LT_CHECK_BUILDDIR], ++-[case `pwd` in ++- *\ * | *\ *) ++- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++-esac ++-]) ++- ++- ++-# LT_INIT([OPTIONS]) ++-# ------------------ ++-AC_DEFUN([LT_INIT], ++-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++-AC_BEFORE([$0], [LT_LANG])dnl ++-AC_BEFORE([$0], [LT_OUTPUT])dnl ++-AC_BEFORE([$0], [LTDL_INIT])dnl ++-m4_require([_LT_CHECK_BUILDDIR])dnl ++- ++-dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++-dnl unless we require an AC_DEFUNed macro: ++-AC_REQUIRE([LTOPTIONS_VERSION])dnl ++-AC_REQUIRE([LTSUGAR_VERSION])dnl ++-AC_REQUIRE([LTVERSION_VERSION])dnl ++-AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++-m4_require([_LT_PROG_LTMAIN])dnl ++- ++-dnl Parse OPTIONS ++-_LT_SET_OPTIONS([$0], [$1]) ++- ++-# This can be used to rebuild libtool when needed ++-LIBTOOL_DEPS="$ltmain" ++- ++-# Always use our own libtool. ++-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++-AC_SUBST(LIBTOOL)dnl ++- ++-_LT_SETUP ++- ++-# Only expand once: ++-m4_define([LT_INIT]) ++-])# LT_INIT ++- ++-# Old names: ++-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++-dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++- ++- ++-# _LT_CC_BASENAME(CC) ++-# ------------------- ++-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++-m4_defun([_LT_CC_BASENAME], ++-[for cc_temp in $1""; do ++- case $cc_temp in ++- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++- \-*) ;; ++- *) break;; ++- esac ++-done ++-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++-]) ++- ++- ++-# _LT_FILEUTILS_DEFAULTS ++-# ---------------------- ++-# It is okay to use these file commands and assume they have been set ++-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++-m4_defun([_LT_FILEUTILS_DEFAULTS], ++-[: ${CP="cp -f"} ++-: ${MV="mv -f"} ++-: ${RM="rm -f"} ++-])# _LT_FILEUTILS_DEFAULTS ++- ++- ++-# _LT_SETUP ++-# --------- ++-m4_defun([_LT_SETUP], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-_LT_DECL([], [host_alias], [0], [The host system])dnl ++-_LT_DECL([], [host], [0])dnl ++-_LT_DECL([], [host_os], [0])dnl ++-dnl ++-_LT_DECL([], [build_alias], [0], [The build system])dnl ++-_LT_DECL([], [build], [0])dnl ++-_LT_DECL([], [build_os], [0])dnl ++-dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([LT_PATH_LD])dnl ++-AC_REQUIRE([LT_PATH_NM])dnl ++-dnl ++-AC_REQUIRE([AC_PROG_LN_S])dnl ++-test -z "$LN_S" && LN_S="ln -s" ++-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++-dnl ++-AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++-dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++-m4_require([_LT_CMD_RELOAD])dnl ++-m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++-m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++- ++-_LT_CONFIG_LIBTOOL_INIT([ ++-# See if we are running on zsh, and set the options which allow our ++-# commands through without removal of \ escapes INIT. ++-if test -n "\${ZSH_VERSION+set}" ; then ++- setopt NO_GLOB_SUBST ++-fi ++-]) ++-if test -n "${ZSH_VERSION+set}" ; then ++- setopt NO_GLOB_SUBST ++-fi ++- ++-_LT_CHECK_OBJDIR ++- ++-m4_require([_LT_TAG_COMPILER])dnl ++-_LT_PROG_ECHO_BACKSLASH ++- ++-case $host_os in ++-aix3*) ++- # AIX sometimes has problems with the GCC collect2 program. For some ++- # reason, if we set the COLLECT_NAMES environment variable, the problems ++- # vanish in a puff of smoke. ++- if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++- fi ++- ;; ++-esac ++- ++-# Sed substitution that helps us do robust quoting. It backslashifies ++-# metacharacters that are still active within double-quoted strings. ++-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++- ++-# Same as above, but do not quote variable references. ++-double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++- ++-# Sed substitution to delay expansion of an escaped shell variable in a ++-# double_quote_subst'ed string. ++-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++- ++-# Sed substitution to delay expansion of an escaped single quote. ++-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++- ++-# Sed substitution to avoid accidental globbing in evaled expressions ++-no_glob_subst='s/\*/\\\*/g' ++- ++-# Global variables: ++-ofile=libtool ++-can_build_shared=yes ++- ++-# All known linkers require a `.a' archive for static linking (except MSVC, ++-# which needs '.lib'). ++-libext=a ++- ++-with_gnu_ld="$lt_cv_prog_gnu_ld" ++- ++-old_CC="$CC" ++-old_CFLAGS="$CFLAGS" ++- ++-# Set sane defaults for various variables ++-test -z "$CC" && CC=cc ++-test -z "$LTCC" && LTCC=$CC ++-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++-test -z "$LD" && LD=ld ++-test -z "$ac_objext" && ac_objext=o ++- ++-_LT_CC_BASENAME([$compiler]) ++- ++-# Only perform the check for file, if the check method requires it ++-test -z "$MAGIC_CMD" && MAGIC_CMD=file ++-case $deplibs_check_method in ++-file_magic*) ++- if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++- _LT_PATH_MAGIC ++- fi ++- ;; ++-esac ++- ++-# Use C for the default configuration in the libtool script ++-LT_SUPPORTED_TAG([CC]) ++-_LT_LANG_C_CONFIG ++-_LT_LANG_DEFAULT_CONFIG ++-_LT_CONFIG_COMMANDS ++-])# _LT_SETUP ++- ++- ++-# _LT_PROG_LTMAIN ++-# --------------- ++-# Note that this code is called both from `configure', and `config.status' ++-# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++-# `config.status' has no value for ac_aux_dir unless we are using Automake, ++-# so we pass a copy along to make sure it has a sensible value anyway. ++-m4_defun([_LT_PROG_LTMAIN], ++-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++-ltmain="$ac_aux_dir/ltmain.sh" ++-])# _LT_PROG_LTMAIN ++- ++- ++- ++-# So that we can recreate a full libtool script including additional ++-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++-# in macros and then make a single call at the end using the `libtool' ++-# label. ++- ++- ++-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++-# ---------------------------------------- ++-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++-m4_define([_LT_CONFIG_LIBTOOL_INIT], ++-[m4_ifval([$1], ++- [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++- [$1 ++-])])]) ++- ++-# Initialize. ++-m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++- ++- ++-# _LT_CONFIG_LIBTOOL([COMMANDS]) ++-# ------------------------------ ++-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++-m4_define([_LT_CONFIG_LIBTOOL], ++-[m4_ifval([$1], ++- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++- [$1 ++-])])]) ++- ++-# Initialize. ++-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++- ++- ++-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++-# ----------------------------------------------------- ++-m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++-[_LT_CONFIG_LIBTOOL([$1]) ++-_LT_CONFIG_LIBTOOL_INIT([$2]) ++-]) ++- ++- ++-# _LT_FORMAT_COMMENT([COMMENT]) ++-# ----------------------------- ++-# Add leading comment marks to the start of each line, and a trailing ++-# full-stop to the whole comment if one is not present already. ++-m4_define([_LT_FORMAT_COMMENT], ++-[m4_ifval([$1], [ ++-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++-)]) ++- ++- ++- ++- ++- ++-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++-# ------------------------------------------------------------------- ++-# CONFIGNAME is the name given to the value in the libtool script. ++-# VARNAME is the (base) name used in the configure script. ++-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++-# VARNAME. Any other value will be used directly. ++-m4_define([_LT_DECL], ++-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++- [m4_ifval([$1], [$1], [$2])]) ++- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++- m4_ifval([$4], ++- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++- lt_dict_add_subkey([lt_decl_dict], [$2], ++- [tagged?], [m4_ifval([$5], [yes], [no])])]) ++-]) ++- ++- ++-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++-# -------------------------------------------------------- ++-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++- ++- ++-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++-# ------------------------------------------------ ++-m4_define([lt_decl_tag_varnames], ++-[_lt_decl_filter([tagged?], [yes], $@)]) ++- ++- ++-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++-# --------------------------------------------------------- ++-m4_define([_lt_decl_filter], ++-[m4_case([$#], ++- [0], [m4_fatal([$0: too few arguments: $#])], ++- [1], [m4_fatal([$0: too few arguments: $#: $1])], ++- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++- [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++-]) ++- ++- ++-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++-# -------------------------------------------------- ++-m4_define([lt_decl_quote_varnames], ++-[_lt_decl_filter([value], [1], $@)]) ++- ++- ++-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++-# --------------------------------------------------- ++-m4_define([lt_decl_dquote_varnames], ++-[_lt_decl_filter([value], [2], $@)]) ++- ++- ++-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++-# --------------------------------------------------- ++-m4_define([lt_decl_varnames_tagged], ++-[m4_assert([$# <= 2])dnl ++-_$0(m4_quote(m4_default([$1], [[, ]])), ++- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++-m4_define([_lt_decl_varnames_tagged], ++-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++- ++- ++-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++-# ------------------------------------------------ ++-m4_define([lt_decl_all_varnames], ++-[_$0(m4_quote(m4_default([$1], [[, ]])), ++- m4_if([$2], [], ++- m4_quote(lt_decl_varnames), ++- m4_quote(m4_shift($@))))[]dnl ++-]) ++-m4_define([_lt_decl_all_varnames], ++-[lt_join($@, lt_decl_varnames_tagged([$1], ++- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++-]) ++- ++- ++-# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++-# ------------------------------------ ++-# Quote a variable value, and forward it to `config.status' so that its ++-# declaration there will have the same value as in `configure'. VARNAME ++-# must have a single quote delimited value for this to work. ++-m4_define([_LT_CONFIG_STATUS_DECLARE], ++-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++- ++- ++-# _LT_CONFIG_STATUS_DECLARATIONS ++-# ------------------------------ ++-# We delimit libtool config variables with single quotes, so when ++-# we write them to config.status, we have to be sure to quote all ++-# embedded single quotes properly. In configure, this macro expands ++-# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++-# ++-# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++- ++- ++-# _LT_LIBTOOL_TAGS ++-# ---------------- ++-# Output comment and list of tags supported by the script ++-m4_defun([_LT_LIBTOOL_TAGS], ++-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++-available_tags="_LT_TAGS"dnl ++-]) ++- ++- ++-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++-# ----------------------------------- ++-# Extract the dictionary values for VARNAME (optionally with TAG) and ++-# expand to a commented shell variable setting: ++-# ++-# # Some comment about what VAR is for. ++-# visible_name=$lt_internal_name ++-m4_define([_LT_LIBTOOL_DECLARE], ++-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++- [description])))[]dnl ++-m4_pushdef([_libtool_name], ++- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++- [0], [_libtool_name=[$]$1], ++- [1], [_libtool_name=$lt_[]$1], ++- [2], [_libtool_name=$lt_[]$1], ++- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++-]) ++- ++- ++-# _LT_LIBTOOL_CONFIG_VARS ++-# ----------------------- ++-# Produce commented declarations of non-tagged libtool config variables ++-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++-# section) are produced by _LT_LIBTOOL_TAG_VARS. ++-m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++-[m4_foreach([_lt_var], ++- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++- ++- ++-# _LT_LIBTOOL_TAG_VARS(TAG) ++-# ------------------------- ++-m4_define([_LT_LIBTOOL_TAG_VARS], ++-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++- ++- ++-# _LT_TAGVAR(VARNAME, [TAGNAME]) ++-# ------------------------------ ++-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++- ++- ++-# _LT_CONFIG_COMMANDS ++-# ------------------- ++-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++-# variables for single and double quote escaping we saved from calls ++-# to _LT_DECL, we can put quote escaped variables declarations ++-# into `config.status', and then the shell code to quote escape them in ++-# for loops in `config.status'. Finally, any additional code accumulated ++-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++-m4_defun([_LT_CONFIG_COMMANDS], ++-[AC_PROVIDE_IFELSE([LT_OUTPUT], ++- dnl If the libtool generation code has been placed in $CONFIG_LT, ++- dnl instead of duplicating it all over again into config.status, ++- dnl then we will have config.status run $CONFIG_LT later, so it ++- dnl needs to know what name is stored there: ++- [AC_CONFIG_COMMANDS([libtool], ++- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++- dnl If the libtool generation code is destined for config.status, ++- dnl expand the accumulated commands and init code now: ++- [AC_CONFIG_COMMANDS([libtool], ++- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++-])#_LT_CONFIG_COMMANDS ++- ++- ++-# Initialize. ++-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++-[ ++- ++-# The HP-UX ksh and POSIX shell print the target directory to stdout ++-# if CDPATH is set. ++-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++- ++-sed_quote_subst='$sed_quote_subst' ++-double_quote_subst='$double_quote_subst' ++-delay_variable_subst='$delay_variable_subst' ++-_LT_CONFIG_STATUS_DECLARATIONS ++-LTCC='$LTCC' ++-LTCFLAGS='$LTCFLAGS' ++-compiler='$compiler_DEFAULT' ++- ++-# Quote evaled strings. ++-for var in lt_decl_all_varnames([[ \ ++-]], lt_decl_quote_varnames); do ++- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++- *[[\\\\\\\`\\"\\\$]]*) ++- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++- ;; ++- *) ++- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++- ;; ++- esac ++-done ++- ++-# Double-quote double-evaled strings. ++-for var in lt_decl_all_varnames([[ \ ++-]], lt_decl_dquote_varnames); do ++- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++- *[[\\\\\\\`\\"\\\$]]*) ++- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++- ;; ++- *) ++- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++- ;; ++- esac ++-done ++- ++-# Fix-up fallback echo if it was mangled by the above quoting rules. ++-case \$lt_ECHO in ++-*'\\\[$]0 --fallback-echo"')dnl " ++- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++- ;; ++-esac ++- ++-_LT_OUTPUT_LIBTOOL_INIT ++-]) ++- ++- ++-# LT_OUTPUT ++-# --------- ++-# This macro allows early generation of the libtool script (before ++-# AC_OUTPUT is called), incase it is used in configure for compilation ++-# tests. ++-AC_DEFUN([LT_OUTPUT], ++-[: ${CONFIG_LT=./config.lt} ++-AC_MSG_NOTICE([creating $CONFIG_LT]) ++-cat >"$CONFIG_LT" <<_LTEOF ++-#! $SHELL ++-# Generated by $as_me. ++-# Run this file to recreate a libtool stub with the current configuration. ++- ++-lt_cl_silent=false ++-SHELL=\${CONFIG_SHELL-$SHELL} ++-_LTEOF ++- ++-cat >>"$CONFIG_LT" <<\_LTEOF ++-AS_SHELL_SANITIZE ++-_AS_PREPARE ++- ++-exec AS_MESSAGE_FD>&1 ++-exec AS_MESSAGE_LOG_FD>>config.log ++-{ ++- echo ++- AS_BOX([Running $as_me.]) ++-} >&AS_MESSAGE_LOG_FD ++- ++-lt_cl_help="\ ++-\`$as_me' creates a local libtool stub from the current configuration, ++-for use in further configure time tests before the real libtool is ++-generated. ++- ++-Usage: $[0] [[OPTIONS]] ++- ++- -h, --help print this help, then exit ++- -V, --version print version number, then exit ++- -q, --quiet do not print progress messages ++- -d, --debug don't remove temporary files ++- ++-Report bugs to ." ++- ++-lt_cl_version="\ ++-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++-configured by $[0], generated by m4_PACKAGE_STRING. ++- ++-Copyright (C) 2008 Free Software Foundation, Inc. ++-This config.lt script is free software; the Free Software Foundation ++-gives unlimited permision to copy, distribute and modify it." ++- ++-while test $[#] != 0 ++-do ++- case $[1] in ++- --version | --v* | -V ) ++- echo "$lt_cl_version"; exit 0 ;; ++- --help | --h* | -h ) ++- echo "$lt_cl_help"; exit 0 ;; ++- --debug | --d* | -d ) ++- debug=: ;; ++- --quiet | --q* | --silent | --s* | -q ) ++- lt_cl_silent=: ;; ++- ++- -*) AC_MSG_ERROR([unrecognized option: $[1] ++-Try \`$[0] --help' for more information.]) ;; ++- ++- *) AC_MSG_ERROR([unrecognized argument: $[1] ++-Try \`$[0] --help' for more information.]) ;; ++- esac ++- shift ++-done ++- ++-if $lt_cl_silent; then ++- exec AS_MESSAGE_FD>/dev/null ++-fi ++-_LTEOF ++- ++-cat >>"$CONFIG_LT" <<_LTEOF ++-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++-_LTEOF ++- ++-cat >>"$CONFIG_LT" <<\_LTEOF ++-AC_MSG_NOTICE([creating $ofile]) ++-_LT_OUTPUT_LIBTOOL_COMMANDS ++-AS_EXIT(0) ++-_LTEOF ++-chmod +x "$CONFIG_LT" ++- ++-# configure is writing to config.log, but config.lt does its own redirection, ++-# appending to config.log, which fails on DOS, as config.log is still kept ++-# open by configure. Here we exec the FD to /dev/null, effectively closing ++-# config.log, so it can be properly (re)opened and appended to by config.lt. ++-if test "$no_create" != yes; then ++- lt_cl_success=: ++- test "$silent" = yes && ++- lt_config_lt_args="$lt_config_lt_args --quiet" ++- exec AS_MESSAGE_LOG_FD>/dev/null ++- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++- exec AS_MESSAGE_LOG_FD>>config.log ++- $lt_cl_success || AS_EXIT(1) ++-fi ++-])# LT_OUTPUT ++- ++- ++-# _LT_CONFIG(TAG) ++-# --------------- ++-# If TAG is the built-in tag, create an initial libtool script with a ++-# default configuration from the untagged config vars. Otherwise add code ++-# to config.status for appending the configuration named by TAG from the ++-# matching tagged config vars. ++-m4_defun([_LT_CONFIG], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-_LT_CONFIG_SAVE_COMMANDS([ ++- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++- m4_if(_LT_TAG, [C], [ ++- # See if we are running on zsh, and set the options which allow our ++- # commands through without removal of \ escapes. ++- if test -n "${ZSH_VERSION+set}" ; then ++- setopt NO_GLOB_SUBST ++- fi ++- ++- cfgfile="${ofile}T" ++- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++- $RM "$cfgfile" ++- ++- cat <<_LT_EOF >> "$cfgfile" ++-#! $SHELL ++- ++-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++-# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++-# ++-_LT_COPYING ++-_LT_LIBTOOL_TAGS ++- ++-# ### BEGIN LIBTOOL CONFIG ++-_LT_LIBTOOL_CONFIG_VARS ++-_LT_LIBTOOL_TAG_VARS ++-# ### END LIBTOOL CONFIG ++- ++-_LT_EOF ++- ++- case $host_os in ++- aix3*) ++- cat <<\_LT_EOF >> "$cfgfile" ++-# AIX sometimes has problems with the GCC collect2 program. For some ++-# reason, if we set the COLLECT_NAMES environment variable, the problems ++-# vanish in a puff of smoke. ++-if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++-fi ++-_LT_EOF ++- ;; ++- esac ++- ++- _LT_PROG_LTMAIN ++- ++- # We use sed instead of cat because bash on DJGPP gets confused if ++- # if finds mixed CR/LF and LF-only lines. Since sed operates in ++- # text mode, it properly converts lines to CR/LF. This bash problem ++- # is reportedly fixed, but why not run on old versions too? ++- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++- || (rm -f "$cfgfile"; exit 1) ++- ++- _LT_PROG_XSI_SHELLFNS ++- ++- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++- || (rm -f "$cfgfile"; exit 1) ++- ++- mv -f "$cfgfile" "$ofile" || ++- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++- chmod +x "$ofile" ++-], ++-[cat <<_LT_EOF >> "$ofile" ++- ++-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++-dnl in a comment (ie after a #). ++-# ### BEGIN LIBTOOL TAG CONFIG: $1 ++-_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++-# ### END LIBTOOL TAG CONFIG: $1 ++-_LT_EOF ++-])dnl /m4_if ++-], ++-[m4_if([$1], [], [ ++- PACKAGE='$PACKAGE' ++- VERSION='$VERSION' ++- TIMESTAMP='$TIMESTAMP' ++- RM='$RM' ++- ofile='$ofile'], []) ++-])dnl /_LT_CONFIG_SAVE_COMMANDS ++-])# _LT_CONFIG ++- ++- ++-# LT_SUPPORTED_TAG(TAG) ++-# --------------------- ++-# Trace this macro to discover what tags are supported by the libtool ++-# --tag option, using: ++-# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++-AC_DEFUN([LT_SUPPORTED_TAG], []) ++- ++- ++-# C support is built-in for now ++-m4_define([_LT_LANG_C_enabled], []) ++-m4_define([_LT_TAGS], []) ++- ++- ++-# LT_LANG(LANG) ++-# ------------- ++-# Enable libtool support for the given language if not already enabled. ++-AC_DEFUN([LT_LANG], ++-[AC_BEFORE([$0], [LT_OUTPUT])dnl ++-m4_case([$1], ++- [C], [_LT_LANG(C)], ++- [C++], [_LT_LANG(CXX)], ++- [Java], [_LT_LANG(GCJ)], ++- [Fortran 77], [_LT_LANG(F77)], ++- [Fortran], [_LT_LANG(FC)], ++- [Windows Resource], [_LT_LANG(RC)], ++- [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++- [_LT_LANG($1)], ++- [m4_fatal([$0: unsupported language: "$1"])])])dnl ++-])# LT_LANG ++- ++- ++-# _LT_LANG(LANGNAME) ++-# ------------------ ++-m4_defun([_LT_LANG], ++-[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++- [LT_SUPPORTED_TAG([$1])dnl ++- m4_append([_LT_TAGS], [$1 ])dnl ++- m4_define([_LT_LANG_]$1[_enabled], [])dnl ++- _LT_LANG_$1_CONFIG($1)])dnl ++-])# _LT_LANG ++- ++- ++-# _LT_LANG_DEFAULT_CONFIG ++-# ----------------------- ++-m4_defun([_LT_LANG_DEFAULT_CONFIG], ++-[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++- [LT_LANG(CXX)], ++- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++- ++-AC_PROVIDE_IFELSE([AC_PROG_F77], ++- [LT_LANG(F77)], ++- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++- ++-AC_PROVIDE_IFELSE([AC_PROG_FC], ++- [LT_LANG(FC)], ++- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++- ++-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++-dnl pulling things in needlessly. ++-AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++- [LT_LANG(GCJ)], ++- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++- [LT_LANG(GCJ)], ++- [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++- [LT_LANG(GCJ)], ++- [m4_ifdef([AC_PROG_GCJ], ++- [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++- m4_ifdef([A][M_PROG_GCJ], ++- [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++- m4_ifdef([LT_PROG_GCJ], ++- [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++- ++-AC_PROVIDE_IFELSE([LT_PROG_RC], ++- [LT_LANG(RC)], ++- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++-])# _LT_LANG_DEFAULT_CONFIG ++- ++-# Obsolete macros: ++-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++-dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++-dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++-dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++- ++- ++-# _LT_TAG_COMPILER ++-# ---------------- ++-m4_defun([_LT_TAG_COMPILER], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++- ++-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++- ++-# If no C compiler was specified, use CC. ++-LTCC=${LTCC-"$CC"} ++- ++-# If no C compiler flags were specified, use CFLAGS. ++-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++- ++-# Allow CC to be a program name with arguments. ++-compiler=$CC ++-])# _LT_TAG_COMPILER ++- ++- ++-# _LT_COMPILER_BOILERPLATE ++-# ------------------------ ++-# Check for compiler boilerplate output or warnings with ++-# the simple compiler test code. ++-m4_defun([_LT_COMPILER_BOILERPLATE], ++-[m4_require([_LT_DECL_SED])dnl ++-ac_outfile=conftest.$ac_objext ++-echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_compiler_boilerplate=`cat conftest.err` ++-$RM conftest* ++-])# _LT_COMPILER_BOILERPLATE ++- ++- ++-# _LT_LINKER_BOILERPLATE ++-# ---------------------- ++-# Check for linker boilerplate output or warnings with ++-# the simple link test code. ++-m4_defun([_LT_LINKER_BOILERPLATE], ++-[m4_require([_LT_DECL_SED])dnl ++-ac_outfile=conftest.$ac_objext ++-echo "$lt_simple_link_test_code" >conftest.$ac_ext ++-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_linker_boilerplate=`cat conftest.err` ++-$RM -r conftest* ++-])# _LT_LINKER_BOILERPLATE ++- ++-# _LT_REQUIRED_DARWIN_CHECKS ++-# ------------------------- ++-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ++- case $host_os in ++- rhapsody* | darwin*) ++- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++- AC_CHECK_TOOL([LIPO], [lipo], [:]) ++- AC_CHECK_TOOL([OTOOL], [otool], [:]) ++- AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++- _LT_DECL([], [DSYMUTIL], [1], ++- [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++- _LT_DECL([], [NMEDIT], [1], ++- [Tool to change global to local symbols on Mac OS X]) ++- _LT_DECL([], [LIPO], [1], ++- [Tool to manipulate fat objects and archives on Mac OS X]) ++- _LT_DECL([], [OTOOL], [1], ++- [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++- _LT_DECL([], [OTOOL64], [1], ++- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++- ++- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++- [lt_cv_apple_cc_single_mod=no ++- if test -z "${LT_MULTI_MODULE}"; then ++- # By default we will add the -single_module flag. You can override ++- # by either setting the environment variable LT_MULTI_MODULE ++- # non-empty at configure time, or by adding -multi_module to the ++- # link flags. ++- rm -rf libconftest.dylib* ++- echo "int foo(void){return 1;}" > conftest.c ++- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++- _lt_result=$? ++- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++- lt_cv_apple_cc_single_mod=yes ++- else ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- fi ++- rm -rf libconftest.dylib* ++- rm -f conftest.* ++- fi]) ++- AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++- [lt_cv_ld_exported_symbols_list], ++- [lt_cv_ld_exported_symbols_list=no ++- save_LDFLAGS=$LDFLAGS ++- echo "_main" > conftest.sym ++- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++- [lt_cv_ld_exported_symbols_list=yes], ++- [lt_cv_ld_exported_symbols_list=no]) ++- LDFLAGS="$save_LDFLAGS" ++- ]) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++- darwin1.*) ++- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++- darwin*) # darwin 5.x on ++- # if running on 10.5 or later, the deployment target defaults ++- # to the OS version, if on x86, and 10.4, the deployment ++- # target defaults to 10.4. Don't you love it? ++- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++- 10.[[012]]*) ++- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++- 10.*) ++- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++- esac ++- ;; ++- esac ++- if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++- _lt_dar_single_mod='$single_module' ++- fi ++- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++- else ++- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- fi ++- if test "$DSYMUTIL" != ":"; then ++- _lt_dsymutil='~$DSYMUTIL $lib || :' ++- else ++- _lt_dsymutil= ++- fi ++- ;; ++- esac ++-]) ++- ++- ++-# _LT_DARWIN_LINKER_FEATURES ++-# -------------------------- ++-# Checks for linker and compiler features on darwin ++-m4_defun([_LT_DARWIN_LINKER_FEATURES], ++-[ ++- m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++- case $cc_basename in ++- ifort*) _lt_dar_can_shared=yes ;; ++- *) _lt_dar_can_shared=$GCC ;; ++- esac ++- if test "$_lt_dar_can_shared" = "yes"; then ++- output_verbose_link_cmd=echo ++- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++- m4_if([$1], [CXX], ++-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++- fi ++-],[]) ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++-]) ++- ++-# _LT_SYS_MODULE_PATH_AIX ++-# ----------------------- ++-# Links a minimal program and checks the executable ++-# for the system default hardcoded library path. In most cases, ++-# this is /usr/lib:/lib, but when the MPI compilers are used ++-# the location of the communication and MPI libs are included too. ++-# If we don't find anything, use the default library path according ++-# to the aix ld manual. ++-m4_defun([_LT_SYS_MODULE_PATH_AIX], ++-[m4_require([_LT_DECL_SED])dnl ++-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++-lt_aix_libpath_sed=' ++- /Import File Strings/,/^$/ { ++- /^0/ { ++- s/^0 *\(.*\)$/\1/ ++- p ++- } ++- }' ++-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++-# Check for a 64-bit object if we didn't find anything. ++-if test -z "$aix_libpath"; then ++- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++-fi],[]) ++-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++-])# _LT_SYS_MODULE_PATH_AIX ++- ++- ++-# _LT_SHELL_INIT(ARG) ++-# ------------------- ++-m4_define([_LT_SHELL_INIT], ++-[ifdef([AC_DIVERSION_NOTICE], ++- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++- [AC_DIVERT_PUSH(NOTICE)]) ++-$1 ++-AC_DIVERT_POP ++-])# _LT_SHELL_INIT ++- ++- ++-# _LT_PROG_ECHO_BACKSLASH ++-# ----------------------- ++-# Add some code to the start of the generated configure script which ++-# will find an echo command which doesn't interpret backslashes. ++-m4_defun([_LT_PROG_ECHO_BACKSLASH], ++-[_LT_SHELL_INIT([ ++-# Check that we are running under the correct shell. ++-SHELL=${CONFIG_SHELL-/bin/sh} ++- ++-case X$lt_ECHO in ++-X*--fallback-echo) ++- # Remove one level of quotation (which was required for Make). ++- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++- ;; ++-esac ++- ++-ECHO=${lt_ECHO-echo} ++-if test "X[$]1" = X--no-reexec; then ++- # Discard the --no-reexec flag, and continue. ++- shift ++-elif test "X[$]1" = X--fallback-echo; then ++- # Avoid inline document here, it may be left over ++- : ++-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++- # Yippee, $ECHO works! ++- : ++-else ++- # Restart under the correct shell. ++- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++-fi ++- ++-if test "X[$]1" = X--fallback-echo; then ++- # used as fallback echo ++- shift ++- cat <<_LT_EOF ++-[$]* ++-_LT_EOF ++- exit 0 ++-fi ++- ++-# The HP-UX ksh and POSIX shell print the target directory to stdout ++-# if CDPATH is set. ++-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++- ++-if test -z "$lt_ECHO"; then ++- if test "X${echo_test_string+set}" != Xset; then ++- # find a string as large as possible, as long as the shell can cope with it ++- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++- if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++- then ++- break ++- fi ++- done ++- fi ++- ++- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- : ++- else ++- # The Solaris, AIX, and Digital Unix default echo programs unquote ++- # backslashes. This makes it impossible to quote backslashes using ++- # echo "$something" | sed 's/\\/\\\\/g' ++- # ++- # So, first we look for a working echo in the user's PATH. ++- ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for dir in $PATH /usr/ucb; do ++- IFS="$lt_save_ifs" ++- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- ECHO="$dir/echo" ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ++- if test "X$ECHO" = Xecho; then ++- # We didn't find a better echo, so look for alternatives. ++- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # This shell has a builtin print -r that does the trick. ++- ECHO='print -r' ++- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++- test "X$CONFIG_SHELL" != X/bin/ksh; then ++- # If we have ksh, try running configure again with it. ++- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++- export ORIGINAL_CONFIG_SHELL ++- CONFIG_SHELL=/bin/ksh ++- export CONFIG_SHELL ++- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++- else ++- # Try using printf. ++- ECHO='printf %s\n' ++- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # Cool, printf works ++- : ++- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++- export CONFIG_SHELL ++- SHELL="$CONFIG_SHELL" ++- export SHELL ++- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++- else ++- # maybe with a smaller string... ++- prev=: ++- ++- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++- then ++- break ++- fi ++- prev="$cmd" ++- done ++- ++- if test "$prev" != 'sed 50q "[$]0"'; then ++- echo_test_string=`eval $prev` ++- export echo_test_string ++- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++- else ++- # Oops. We lost completely, so just stick with echo. ++- ECHO=echo ++- fi ++- fi ++- fi ++- fi ++- fi ++-fi ++- ++-# Copy echo and quote the copy suitably for passing to libtool from ++-# the Makefile, instead of quoting the original, which is used later. ++-lt_ECHO=$ECHO ++-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++-fi ++- ++-AC_SUBST(lt_ECHO) ++-]) ++-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++-_LT_DECL([], [ECHO], [1], ++- [An echo program that does not interpret backslashes]) ++-])# _LT_PROG_ECHO_BACKSLASH ++- ++- ++-# _LT_ENABLE_LOCK ++-# --------------- ++-m4_defun([_LT_ENABLE_LOCK], ++-[AC_ARG_ENABLE([libtool-lock], ++- [AS_HELP_STRING([--disable-libtool-lock], ++- [avoid locking (might break parallel builds)])]) ++-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++- ++-# Some flags need to be propagated to the compiler or linker for good ++-# libtool support. ++-case $host in ++-ia64-*-hpux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *ELF-32*) ++- HPUX_IA64_MODE="32" ++- ;; ++- *ELF-64*) ++- HPUX_IA64_MODE="64" ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++-*-*-irix6*) ++- # Find out which ABI we are using. ++- echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -melf32bsmip" ++- ;; ++- *N32*) ++- LD="${LD-ld} -melf32bmipn32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -melf64bmip" ++- ;; ++- esac ++- else ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -32" ++- ;; ++- *N32*) ++- LD="${LD-ld} -n32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -64" ++- ;; ++- esac ++- fi ++- fi ++- rm -rf conftest* ++- ;; ++- ++-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++-s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *32-bit*) ++- case $host in ++- x86_64-*kfreebsd*-gnu) ++- LD="${LD-ld} -m elf_i386_fbsd" ++- ;; ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_i386" ++- ;; ++- ppc64-*linux*|powerpc64-*linux*) ++- LD="${LD-ld} -m elf32ppclinux" ++- ;; ++- s390x-*linux*) ++- LD="${LD-ld} -m elf_s390" ++- ;; ++- sparc64-*linux*) ++- LD="${LD-ld} -m elf32_sparc" ++- ;; ++- esac ++- ;; ++- *64-bit*) ++- case $host in ++- x86_64-*kfreebsd*-gnu) ++- LD="${LD-ld} -m elf_x86_64_fbsd" ++- ;; ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_x86_64" ++- ;; ++- ppc*-*linux*|powerpc*-*linux*) ++- LD="${LD-ld} -m elf64ppc" ++- ;; ++- s390*-*linux*|s390*-*tpf*) ++- LD="${LD-ld} -m elf64_s390" ++- ;; ++- sparc*-*linux*) ++- LD="${LD-ld} -m elf64_sparc" ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++- ++-*-*-sco3.2v5*) ++- # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++- SAVE_CFLAGS="$CFLAGS" ++- CFLAGS="$CFLAGS -belf" ++- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++- [AC_LANG_PUSH(C) ++- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++- AC_LANG_POP]) ++- if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++- CFLAGS="$SAVE_CFLAGS" ++- fi ++- ;; ++-sparc*-*solaris*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *64-bit*) ++- case $lt_cv_prog_gnu_ld in ++- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++- *) ++- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++- LD="${LD-ld} -64" ++- fi ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++-esac ++- ++-need_locks="$enable_libtool_lock" ++-])# _LT_ENABLE_LOCK ++- ++- ++-# _LT_CMD_OLD_ARCHIVE ++-# ------------------- ++-m4_defun([_LT_CMD_OLD_ARCHIVE], ++-[AC_CHECK_TOOL(AR, ar, false) ++-test -z "$AR" && AR=ar ++-test -z "$AR_FLAGS" && AR_FLAGS=cru ++-_LT_DECL([], [AR], [1], [The archiver]) ++-_LT_DECL([], [AR_FLAGS], [1]) ++- ++-AC_CHECK_TOOL(STRIP, strip, :) ++-test -z "$STRIP" && STRIP=: ++-_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++- ++-AC_CHECK_TOOL(RANLIB, ranlib, :) ++-test -z "$RANLIB" && RANLIB=: ++-_LT_DECL([], [RANLIB], [1], ++- [Commands used to install an old-style archive]) ++- ++-# Determine commands to create old-style static archives. ++-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++-old_postinstall_cmds='chmod 644 $oldlib' ++-old_postuninstall_cmds= ++- ++-if test -n "$RANLIB"; then ++- case $host_os in ++- openbsd*) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++- ;; ++- *) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++- ;; ++- esac ++- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++-fi ++-_LT_DECL([], [old_postinstall_cmds], [2]) ++-_LT_DECL([], [old_postuninstall_cmds], [2]) ++-_LT_TAGDECL([], [old_archive_cmds], [2], ++- [Commands used to build an old-style archive]) ++-])# _LT_CMD_OLD_ARCHIVE ++- ++- ++-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ---------------------------------------------------------------- ++-# Check whether the given compiler option works ++-AC_DEFUN([_LT_COMPILER_OPTION], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_SED])dnl ++-AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++- lt_compiler_flag="$3" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- # The option is referenced via a variable to avoid confusing sed. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>conftest.err) ++- ac_status=$? ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s "$ac_outfile"; then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings other than the usual output. ++- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- fi ++- $RM conftest* ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- m4_if([$5], , :, [$5]) ++-else ++- m4_if([$6], , :, [$6]) ++-fi ++-])# _LT_COMPILER_OPTION ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++- ++- ++-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ---------------------------------------------------- ++-# Check whether the given linker option works ++-AC_DEFUN([_LT_LINKER_OPTION], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_SED])dnl ++-AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- save_LDFLAGS="$LDFLAGS" ++- LDFLAGS="$LDFLAGS $3" ++- echo "$lt_simple_link_test_code" > conftest.$ac_ext ++- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++- # The linker can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- if test -s conftest.err; then ++- # Append any errors to the config.log. ++- cat conftest.err 1>&AS_MESSAGE_LOG_FD ++- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- else ++- $2=yes ++- fi ++- fi ++- $RM -r conftest* ++- LDFLAGS="$save_LDFLAGS" ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- m4_if([$4], , :, [$4]) ++-else ++- m4_if([$5], , :, [$5]) ++-fi ++-])# _LT_LINKER_OPTION ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) ++- ++- ++-# LT_CMD_MAX_LEN ++-#--------------- ++-AC_DEFUN([LT_CMD_MAX_LEN], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-# find the maximum length of command line arguments ++-AC_MSG_CHECKING([the maximum length of command line arguments]) ++-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++- i=0 ++- teststring="ABCD" ++- ++- case $build_os in ++- msdosdjgpp*) ++- # On DJGPP, this test can blow up pretty badly due to problems in libc ++- # (any single argument exceeding 2000 bytes causes a buffer overrun ++- # during glob expansion). Even if it were fixed, the result of this ++- # check would be larger than it should be. ++- lt_cv_sys_max_cmd_len=12288; # 12K is about right ++- ;; ++- ++- gnu*) ++- # Under GNU Hurd, this test is not required because there is ++- # no limit to the length of command line arguments. ++- # Libtool will interpret -1 as no limit whatsoever ++- lt_cv_sys_max_cmd_len=-1; ++- ;; ++- ++- cygwin* | mingw* | cegcc*) ++- # On Win9x/ME, this test blows up -- it succeeds, but takes ++- # about 5 minutes as the teststring grows exponentially. ++- # Worse, since 9x/ME are not pre-emptively multitasking, ++- # you end up with a "frozen" computer, even though with patience ++- # the test eventually succeeds (with a max line length of 256k). ++- # Instead, let's just punt: use the minimum linelength reported by ++- # all of the supported platforms: 8192 (on NT/2K/XP). ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- amigaos*) ++- # On AmigaOS with pdksh, this test takes hours, literally. ++- # So we just punt and use a minimum line length of 8192. ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++- # This has been around since 386BSD, at least. Likely further. ++- if test -x /sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++- elif test -x /usr/sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++- else ++- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++- fi ++- # And add a safety zone ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++- ;; ++- ++- interix*) ++- # We know the value 262144 and hardcode it with a safety zone (like BSD) ++- lt_cv_sys_max_cmd_len=196608 ++- ;; ++- ++- osf*) ++- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++- # nice to cause kernel panics so lets avoid the loop below. ++- # First set a reasonable default. ++- lt_cv_sys_max_cmd_len=16384 ++- # ++- if test -x /sbin/sysconfig; then ++- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++- *1*) lt_cv_sys_max_cmd_len=-1 ;; ++- esac ++- fi ++- ;; ++- sco3.2v5*) ++- lt_cv_sys_max_cmd_len=102400 ++- ;; ++- sysv5* | sco5v6* | sysv4.2uw2*) ++- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++- if test -n "$kargmax"; then ++- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++- else ++- lt_cv_sys_max_cmd_len=32768 ++- fi ++- ;; ++- *) ++- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++- if test -n "$lt_cv_sys_max_cmd_len"; then ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++- else ++- # Make teststring a little bigger before we do anything with it. ++- # a 1K string should be a reasonable start. ++- for i in 1 2 3 4 5 6 7 8 ; do ++- teststring=$teststring$teststring ++- done ++- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++- # If test is not a shell built-in, we'll probably end up computing a ++- # maximum length that is only half of the actual maximum length, but ++- # we can't tell. ++- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++- = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++- test $i != 17 # 1/2 MB should be enough ++- do ++- i=`expr $i + 1` ++- teststring=$teststring$teststring ++- done ++- # Only check the string length outside the loop. ++- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++- teststring= ++- # Add a significant safety factor because C++ compilers can tack on ++- # massive amounts of additional arguments before passing them to the ++- # linker. It appears as though 1/2 is a usable value. ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++- fi ++- ;; ++- esac ++-]) ++-if test -n $lt_cv_sys_max_cmd_len ; then ++- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++-else ++- AC_MSG_RESULT(none) ++-fi ++-max_cmd_len=$lt_cv_sys_max_cmd_len ++-_LT_DECL([], [max_cmd_len], [0], ++- [What is the maximum length of a command?]) ++-])# LT_CMD_MAX_LEN ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) ++- ++- ++-# _LT_HEADER_DLFCN ++-# ---------------- ++-m4_defun([_LT_HEADER_DLFCN], ++-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++-])# _LT_HEADER_DLFCN ++- ++- ++-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++-# ---------------------------------------------------------------- ++-m4_defun([_LT_TRY_DLOPEN_SELF], ++-[m4_require([_LT_HEADER_DLFCN])dnl ++-if test "$cross_compiling" = yes; then : ++- [$4] ++-else ++- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++- lt_status=$lt_dlunknown ++- cat > conftest.$ac_ext <<_LT_EOF ++-[#line __oline__ "configure" ++-#include "confdefs.h" ++- ++-#if HAVE_DLFCN_H ++-#include ++-#endif ++- ++-#include ++- ++-#ifdef RTLD_GLOBAL ++-# define LT_DLGLOBAL RTLD_GLOBAL ++-#else ++-# ifdef DL_GLOBAL ++-# define LT_DLGLOBAL DL_GLOBAL ++-# else ++-# define LT_DLGLOBAL 0 ++-# endif ++-#endif ++- ++-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++- find out it does not work in some platform. */ ++-#ifndef LT_DLLAZY_OR_NOW ++-# ifdef RTLD_LAZY ++-# define LT_DLLAZY_OR_NOW RTLD_LAZY ++-# else ++-# ifdef DL_LAZY ++-# define LT_DLLAZY_OR_NOW DL_LAZY ++-# else ++-# ifdef RTLD_NOW ++-# define LT_DLLAZY_OR_NOW RTLD_NOW ++-# else ++-# ifdef DL_NOW ++-# define LT_DLLAZY_OR_NOW DL_NOW ++-# else ++-# define LT_DLLAZY_OR_NOW 0 ++-# endif ++-# endif ++-# endif ++-# endif ++-#endif ++- ++-void fnord() { int i=42;} ++-int main () ++-{ ++- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++- int status = $lt_dlunknown; ++- ++- if (self) ++- { ++- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++- /* dlclose (self); */ ++- } ++- else ++- puts (dlerror ()); ++- ++- return status; ++-}] ++-_LT_EOF ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++- lt_status=$? ++- case x$lt_status in ++- x$lt_dlno_uscore) $1 ;; ++- x$lt_dlneed_uscore) $2 ;; ++- x$lt_dlunknown|x*) $3 ;; ++- esac ++- else : ++- # compilation failed ++- $3 ++- fi ++-fi ++-rm -fr conftest* ++-])# _LT_TRY_DLOPEN_SELF ++- ++- ++-# LT_SYS_DLOPEN_SELF ++-# ------------------ ++-AC_DEFUN([LT_SYS_DLOPEN_SELF], ++-[m4_require([_LT_HEADER_DLFCN])dnl ++-if test "x$enable_dlopen" != xyes; then ++- enable_dlopen=unknown ++- enable_dlopen_self=unknown ++- enable_dlopen_self_static=unknown ++-else ++- lt_cv_dlopen=no ++- lt_cv_dlopen_libs= ++- ++- case $host_os in ++- beos*) ++- lt_cv_dlopen="load_add_on" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ;; ++- ++- mingw* | pw32* | cegcc*) ++- lt_cv_dlopen="LoadLibrary" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- cygwin*) ++- lt_cv_dlopen="dlopen" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- darwin*) ++- # if libdl is installed we need to link against it ++- AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++- lt_cv_dlopen="dyld" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ]) ++- ;; ++- ++- *) ++- AC_CHECK_FUNC([shl_load], ++- [lt_cv_dlopen="shl_load"], ++- [AC_CHECK_LIB([dld], [shl_load], ++- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++- [AC_CHECK_FUNC([dlopen], ++- [lt_cv_dlopen="dlopen"], ++- [AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++- [AC_CHECK_LIB([svld], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++- [AC_CHECK_LIB([dld], [dld_link], ++- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ;; ++- esac ++- ++- if test "x$lt_cv_dlopen" != xno; then ++- enable_dlopen=yes ++- else ++- enable_dlopen=no ++- fi ++- ++- case $lt_cv_dlopen in ++- dlopen) ++- save_CPPFLAGS="$CPPFLAGS" ++- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++- ++- save_LDFLAGS="$LDFLAGS" ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++- ++- save_LIBS="$LIBS" ++- LIBS="$lt_cv_dlopen_libs $LIBS" ++- ++- AC_CACHE_CHECK([whether a program can dlopen itself], ++- lt_cv_dlopen_self, [dnl ++- _LT_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++- ]) ++- ++- if test "x$lt_cv_dlopen_self" = xyes; then ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++- lt_cv_dlopen_self_static, [dnl ++- _LT_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++- ]) ++- fi ++- ++- CPPFLAGS="$save_CPPFLAGS" ++- LDFLAGS="$save_LDFLAGS" ++- LIBS="$save_LIBS" ++- ;; ++- esac ++- ++- case $lt_cv_dlopen_self in ++- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++- *) enable_dlopen_self=unknown ;; ++- esac ++- ++- case $lt_cv_dlopen_self_static in ++- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++- *) enable_dlopen_self_static=unknown ;; ++- esac ++-fi ++-_LT_DECL([dlopen_support], [enable_dlopen], [0], ++- [Whether dlopen is supported]) ++-_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++- [Whether dlopen of programs is supported]) ++-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++- [Whether dlopen of statically linked programs is supported]) ++-])# LT_SYS_DLOPEN_SELF ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) ++- ++- ++-# _LT_COMPILER_C_O([TAGNAME]) ++-# --------------------------- ++-# Check to see if options -c and -o are simultaneously supported by compiler. ++-# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++-m4_defun([_LT_COMPILER_C_O], ++-[m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_TAG_COMPILER])dnl ++-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++- $RM -r conftest 2>/dev/null ++- mkdir conftest ++- cd conftest ++- mkdir out ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- lt_compiler_flag="-o out/conftest2.$ac_objext" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>out/conftest.err) ++- ac_status=$? ++- cat out/conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s out/conftest2.$ac_objext ++- then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++- fi ++- fi ++- chmod u+w . 2>&AS_MESSAGE_LOG_FD ++- $RM conftest* ++- # SGI C++ compiler will create directory out/ii_files/ for ++- # template instantiation ++- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++- $RM out/* && rmdir out ++- cd .. ++- $RM -r conftest ++- $RM conftest* ++-]) ++-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++- [Does compiler simultaneously support -c and -o options?]) ++-])# _LT_COMPILER_C_O ++- ++- ++-# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++-# ---------------------------------- ++-# Check to see if we can do hard links to lock some files if needed ++-m4_defun([_LT_COMPILER_FILE_LOCKS], ++-[m4_require([_LT_ENABLE_LOCK])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-_LT_COMPILER_C_O([$1]) ++- ++-hard_links="nottested" ++-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++- # do not overwrite the value of need_locks provided by the user ++- AC_MSG_CHECKING([if we can lock with hard links]) ++- hard_links=yes ++- $RM conftest* ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- touch conftest.a ++- ln conftest.a conftest.b 2>&5 || hard_links=no ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- AC_MSG_RESULT([$hard_links]) ++- if test "$hard_links" = no; then ++- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++- need_locks=warn ++- fi ++-else ++- need_locks=no ++-fi ++-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++-])# _LT_COMPILER_FILE_LOCKS ++- ++- ++-# _LT_CHECK_OBJDIR ++-# ---------------- ++-m4_defun([_LT_CHECK_OBJDIR], ++-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++-[rm -f .libs 2>/dev/null ++-mkdir .libs 2>/dev/null ++-if test -d .libs; then ++- lt_cv_objdir=.libs ++-else ++- # MS-DOS does not allow filenames that begin with a dot. ++- lt_cv_objdir=_libs ++-fi ++-rmdir .libs 2>/dev/null]) ++-objdir=$lt_cv_objdir ++-_LT_DECL([], [objdir], [0], ++- [The name of the directory that contains temporary libtool files])dnl ++-m4_pattern_allow([LT_OBJDIR])dnl ++-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++- [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++-])# _LT_CHECK_OBJDIR ++- ++- ++-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++-# -------------------------------------- ++-# Check hardcoding attributes. ++-m4_defun([_LT_LINKER_HARDCODE_LIBPATH], ++-[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++-_LT_TAGVAR(hardcode_action, $1)= ++-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++- test -n "$_LT_TAGVAR(runpath_var, $1)" || ++- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++- ++- # We can hardcode non-existent directories. ++- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && ++- # If the only mechanism to avoid hardcoding is shlibpath_var, we ++- # have to relink, otherwise we might link with an installed library ++- # when we should be linking with a yet-to-be-installed one ++- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then ++- # Linking always hardcodes the temporary library directory. ++- _LT_TAGVAR(hardcode_action, $1)=relink ++- else ++- # We can link without hardcoding, and we can hardcode nonexisting dirs. ++- _LT_TAGVAR(hardcode_action, $1)=immediate ++- fi ++-else ++- # We cannot hardcode anything, or else we can only hardcode existing ++- # directories. ++- _LT_TAGVAR(hardcode_action, $1)=unsupported ++-fi ++-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) ++- ++-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then ++- # Fast installation is not supported ++- enable_fast_install=no ++-elif test "$shlibpath_overrides_runpath" = yes || ++- test "$enable_shared" = no; then ++- # Fast installation is not necessary ++- enable_fast_install=needless ++-fi ++-_LT_TAGDECL([], [hardcode_action], [0], ++- [How to hardcode a shared library path into an executable]) ++-])# _LT_LINKER_HARDCODE_LIBPATH ++- ++- ++-# _LT_CMD_STRIPLIB ++-# ---------------- ++-m4_defun([_LT_CMD_STRIPLIB], ++-[m4_require([_LT_DECL_EGREP]) ++-striplib= ++-old_striplib= ++-AC_MSG_CHECKING([whether stripping libraries is possible]) ++-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++- test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++- AC_MSG_RESULT([yes]) ++-else ++-# FIXME - insert some real tests, host_os isn't really good enough ++- case $host_os in ++- darwin*) ++- if test -n "$STRIP" ; then ++- striplib="$STRIP -x" ++- old_striplib="$STRIP -S" ++- AC_MSG_RESULT([yes]) ++- else ++- AC_MSG_RESULT([no]) ++- fi ++- ;; ++- *) ++- AC_MSG_RESULT([no]) ++- ;; ++- esac ++-fi ++-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++-_LT_DECL([], [striplib], [1]) ++-])# _LT_CMD_STRIPLIB ++- ++- ++-# _LT_SYS_DYNAMIC_LINKER([TAG]) ++-# ----------------------------- ++-# PORTME Fill in your ld.so characteristics ++-m4_defun([_LT_SYS_DYNAMIC_LINKER], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_OBJDUMP])dnl ++-m4_require([_LT_DECL_SED])dnl ++-AC_MSG_CHECKING([dynamic linker characteristics]) ++-m4_if([$1], ++- [], [ ++-if test "$GCC" = yes; then ++- case $host_os in ++- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++- *) lt_awk_arg="/^libraries:/" ;; ++- esac ++- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++- # if the path contains ";" then we assume it to be the separator ++- # otherwise default to the standard path separator (i.e. ":") - it is ++- # assumed that no part of a normal pathname contains ";" but that should ++- # okay in the real world where ";" in dirpaths is itself problematic. ++- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++- # Ok, now we have the path, separated by spaces, we can step through it ++- # and add multilib dir if necessary. ++- lt_tmp_lt_search_path_spec= ++- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++- for lt_sys_path in $lt_search_path_spec; do ++- if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++- else ++- test -d "$lt_sys_path" && \ ++- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++- fi ++- done ++- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++-BEGIN {RS=" "; FS="/|\n";} { ++- lt_foo=""; ++- lt_count=0; ++- for (lt_i = NF; lt_i > 0; lt_i--) { ++- if ($lt_i != "" && $lt_i != ".") { ++- if ($lt_i == "..") { ++- lt_count++; ++- } else { ++- if (lt_count == 0) { ++- lt_foo="/" $lt_i lt_foo; ++- } else { ++- lt_count--; ++- } ++- } ++- } ++- } ++- if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++- if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++-}'` ++- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++-else ++- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++-fi]) ++-library_names_spec= ++-libname_spec='lib$name' ++-soname_spec= ++-shrext_cmds=".so" ++-postinstall_cmds= ++-postuninstall_cmds= ++-finish_cmds= ++-finish_eval= ++-shlibpath_var= ++-shlibpath_overrides_runpath=unknown ++-version_type=none ++-dynamic_linker="$host_os ld.so" ++-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++-need_lib_prefix=unknown ++-hardcode_into_libs=no ++- ++-# when you set need_version to no, make sure it does not cause -set_version ++-# flags to be left without arguments ++-need_version=unknown ++- ++-case $host_os in ++-aix3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++- shlibpath_var=LIBPATH ++- ++- # AIX 3 has no versioning support, so we append a major version to the name. ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- ++-aix[[4-9]]*) ++- version_type=linux ++- need_lib_prefix=no ++- need_version=no ++- hardcode_into_libs=yes ++- if test "$host_cpu" = ia64; then ++- # AIX 5 supports IA64 ++- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- else ++- # With GCC up to 2.95.x, collect2 would create an import file ++- # for dependence libraries. The import file would start with ++- # the line `#! .'. This would cause the generated library to ++- # depend on `.', always an invalid library. This was fixed in ++- # development snapshots of GCC prior to 3.0. ++- case $host_os in ++- aix4 | aix4.[[01]] | aix4.[[01]].*) ++- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++- echo ' yes ' ++- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++- : ++- else ++- can_build_shared=no ++- fi ++- ;; ++- esac ++- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++- # soname into executable. Probably we can add versioning support to ++- # collect2, so additional links can be useful in future. ++- if test "$aix_use_runtimelinking" = yes; then ++- # If using run time linking (on AIX 4.2 or later) use lib.so ++- # instead of lib.a to let people know that these are not ++- # typical AIX shared libraries. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- else ++- # We preserve .a as extension for shared libraries through AIX4.2 ++- # and later when we are not doing run time linking. ++- library_names_spec='${libname}${release}.a $libname.a' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- fi ++- shlibpath_var=LIBPATH ++- fi ++- ;; ++- ++-amigaos*) ++- case $host_cpu in ++- powerpc) ++- # Since July 2007 AmigaOS4 officially supports .so libraries. ++- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- ;; ++- m68k) ++- library_names_spec='$libname.ixlibrary $libname.a' ++- # Create ${libname}_ixlibrary.a entries in /sys/libs. ++- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++- ;; ++- esac ++- ;; ++- ++-beos*) ++- library_names_spec='${libname}${shared_ext}' ++- dynamic_linker="$host_os ld.so" ++- shlibpath_var=LIBRARY_PATH ++- ;; ++- ++-bsdi[[45]]*) ++- version_type=linux ++- 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 $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++- # the default ld.so.conf also contains /usr/contrib/lib and ++- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++- # libtool to hard-code these into programs ++- ;; ++- ++-cygwin* | mingw* | pw32* | cegcc*) ++- version_type=windows ++- shrext_cmds=".dll" ++- need_version=no ++- need_lib_prefix=no ++- ++- case $GCC,$host_os in ++- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++- library_names_spec='$libname.dll.a' ++- # DLL is installed to $(libdir)/../bin by postinstall_cmds ++- postinstall_cmds='base_file=`basename \${file}`~ ++- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++- dldir=$destdir/`dirname \$dlpath`~ ++- test -d \$dldir || mkdir -p \$dldir~ ++- $install_prog $dir/$dlname \$dldir/$dlname~ ++- chmod a+x \$dldir/$dlname~ ++- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++- fi' ++- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++- dlpath=$dir/\$dldll~ ++- $RM \$dlpath' ++- shlibpath_overrides_runpath=yes ++- ++- case $host_os in ++- cygwin*) ++- # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++- ;; ++- mingw* | cegcc*) ++- # MinGW DLLs use traditional 'lib' prefix ++- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++- # It is most probably a Windows format PATH printed by ++- # mingw gcc, but we are running on Cygwin. Gcc prints its search ++- # path with ; separators, and with drive letters. We can handle the ++- # drive letters (cygwin fileutils understands them), so leave them, ++- # especially as we might pass files found there to a mingw objdump, ++- # which wouldn't understand a cygwinified path. Ahh. ++- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++- ;; ++- pw32*) ++- # pw32 DLLs use 'pw' prefix rather than 'lib' ++- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- ;; ++- esac ++- ;; ++- ++- *) ++- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++- ;; ++- esac ++- dynamic_linker='Win32 ld.exe' ++- # FIXME: first we should search . and the directory the executable is in ++- shlibpath_var=PATH ++- ;; ++- ++-darwin* | rhapsody*) ++- dynamic_linker="$host_os dyld" ++- version_type=darwin ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++- soname_spec='${libname}${release}${major}$shared_ext' ++- shlibpath_overrides_runpath=yes ++- shlibpath_var=DYLD_LIBRARY_PATH ++- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++-m4_if([$1], [],[ ++- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++- ;; ++- ++-dgux*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-freebsd1*) ++- dynamic_linker=no ++- ;; ++- ++-freebsd* | dragonfly*) ++- # DragonFly does not have aout. When/if they implement a new ++- # versioning mechanism, adjust this. ++- if test -x /usr/bin/objformat; then ++- objformat=`/usr/bin/objformat` ++- else ++- case $host_os in ++- freebsd[[123]]*) objformat=aout ;; ++- *) objformat=elf ;; ++- esac ++- fi ++- version_type=freebsd-$objformat ++- case $version_type in ++- freebsd-elf*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- need_version=no ++- need_lib_prefix=no ++- ;; ++- freebsd-*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++- need_version=yes ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_os in ++- freebsd2*) ++- shlibpath_overrides_runpath=yes ++- ;; ++- freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- *) # from 4.6 on, and DragonFly ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- esac ++- ;; ++- ++-gnu*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- hardcode_into_libs=yes ++- ;; ++- ++-hpux9* | hpux10* | hpux11*) ++- # Give a soname corresponding to the major version so that dld.sl refuses to ++- # link against other versions. ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- case $host_cpu in ++- ia64*) ++- shrext_cmds='.so' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.so" ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- if test "X$HPUX_IA64_MODE" = X32; then ++- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++- else ++- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++- fi ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- hppa*64*) ++- shrext_cmds='.sl' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- *) ++- shrext_cmds='.sl' ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=SHLIB_PATH ++- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- esac ++- # HP-UX runs *really* slowly unless shared libraries are mode 555. ++- postinstall_cmds='chmod 555 $lib' ++- ;; ++- ++-interix[[3-9]]*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $host_os in ++- nonstopux*) version_type=nonstopux ;; ++- *) ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- version_type=linux ++- else ++- version_type=irix ++- fi ;; ++- esac ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++- case $host_os in ++- irix5* | nonstopux*) ++- libsuff= shlibsuff= ++- ;; ++- *) ++- case $LD in # libtool.m4 will add one of these switches to LD ++- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++- libsuff= shlibsuff= libmagic=32-bit;; ++- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++- libsuff=32 shlibsuff=N32 libmagic=N32;; ++- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++- libsuff=64 shlibsuff=64 libmagic=64-bit;; ++- *) libsuff= shlibsuff= libmagic=never-match;; ++- esac ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++- hardcode_into_libs=yes ++- ;; ++- ++-# No shared lib support for Linux oldld, aout, or coff. ++-linux*oldld* | linux*aout* | linux*coff*) ++- dynamic_linker=no ++- ;; ++- ++-# This must be Linux ELF. ++-linux* | k*bsd*-gnu) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- # Some binutils ld are patched to set DT_RUNPATH ++- save_LDFLAGS=$LDFLAGS ++- save_libdir=$libdir ++- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++- [shlibpath_overrides_runpath=yes])]) ++- LDFLAGS=$save_LDFLAGS ++- libdir=$save_libdir ++- ++- # This implies no fast_install, which is unacceptable. ++- # Some rework will be needed to allow for fast_install ++- # before this can be enabled. ++- hardcode_into_libs=yes ++- ++- # Append ld.so.conf contents to the search path ++- if test -f /etc/ld.so.conf; then ++- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++- fi ++- ++- # We used to test for /lib/ld.so.1 and disable shared libraries on ++- # powerpc, because MkLinux only supported shared libraries with the ++- # GNU dynamic linker. Since this was broken with cross compilers, ++- # most powerpc-linux boxes support dynamic linking these days and ++- # people can always --disable-shared, the test was removed, and we ++- # assume the GNU/Linux dynamic linker is in use. ++- dynamic_linker='GNU/Linux ld.so' ++- ;; ++- ++-netbsd*) ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- dynamic_linker='NetBSD (a.out) ld.so' ++- else ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- dynamic_linker='NetBSD ld.elf_so' ++- fi ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- ++-newsos6) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- ;; ++- ++-*nto* | *qnx*) ++- version_type=qnx ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- dynamic_linker='ldqnx.so' ++- ;; ++- ++-openbsd*) ++- version_type=sunos ++- sys_lib_dlsearch_path_spec="/usr/lib" ++- need_lib_prefix=no ++- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++- case $host_os in ++- openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++- *) need_version=no ;; ++- esac ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- case $host_os in ++- openbsd2.[[89]] | openbsd2.[[89]].*) ++- shlibpath_overrides_runpath=no ++- ;; ++- *) ++- shlibpath_overrides_runpath=yes ++- ;; ++- esac ++- else ++- shlibpath_overrides_runpath=yes ++- fi ++- ;; ++- ++-os2*) ++- libname_spec='$name' ++- shrext_cmds=".dll" ++- need_lib_prefix=no ++- library_names_spec='$libname${shared_ext} $libname.a' ++- dynamic_linker='OS/2 ld.exe' ++- shlibpath_var=LIBPATH ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- version_type=osf ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++- ;; ++- ++-rdos*) ++- dynamic_linker=no ++- ;; ++- ++-solaris*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- # ldd complains unless libraries are executable ++- postinstall_cmds='chmod +x $lib' ++- ;; ++- ++-sunos4*) ++- version_type=sunos ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- if test "$with_gnu_ld" = yes; then ++- need_lib_prefix=no ++- fi ++- need_version=yes ++- ;; ++- ++-sysv4 | sysv4.3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_vendor in ++- sni) ++- shlibpath_overrides_runpath=no ++- need_lib_prefix=no ++- runpath_var=LD_RUN_PATH ++- ;; ++- siemens) ++- need_lib_prefix=no ++- ;; ++- motorola) ++- need_lib_prefix=no ++- need_version=no ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++- ;; ++- esac ++- ;; ++- ++-sysv4*MP*) ++- if test -d /usr/nec ;then ++- version_type=linux ++- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++- soname_spec='$libname${shared_ext}.$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- fi ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- version_type=freebsd-elf ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- if test "$with_gnu_ld" = yes; then ++- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++- else ++- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++- case $host_os in ++- sco3.2v5*) ++- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++- ;; ++- esac ++- fi ++- sys_lib_dlsearch_path_spec='/usr/lib' ++- ;; ++- ++-tpf*) ++- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++- version_type=linux ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- ++-uts4*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-*) ++- dynamic_linker=no ++- ;; ++-esac ++-AC_MSG_RESULT([$dynamic_linker]) ++-test "$dynamic_linker" = no && can_build_shared=no ++- ++-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++-if test "$GCC" = yes; then ++- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++-fi ++- ++-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++-fi ++-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++-fi ++- ++-_LT_DECL([], [variables_saved_for_relink], [1], ++- [Variables whose values should be saved in libtool wrapper scripts and ++- restored at link time]) ++-_LT_DECL([], [need_lib_prefix], [0], ++- [Do we need the "lib" prefix for modules?]) ++-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++-_LT_DECL([], [version_type], [0], [Library versioning type]) ++-_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++-_LT_DECL([], [shlibpath_overrides_runpath], [0], ++- [Is shlibpath searched before the hard-coded library search path?]) ++-_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++-_LT_DECL([], [library_names_spec], [1], ++- [[List of archive names. First name is the real one, the rest are links. ++- The last name is the one that the linker finds with -lNAME]]) ++-_LT_DECL([], [soname_spec], [1], ++- [[The coded name of the library, if different from the real name]]) ++-_LT_DECL([], [postinstall_cmds], [2], ++- [Command to use after installation of a shared archive]) ++-_LT_DECL([], [postuninstall_cmds], [2], ++- [Command to use after uninstallation of a shared archive]) ++-_LT_DECL([], [finish_cmds], [2], ++- [Commands used to finish a libtool library installation in a directory]) ++-_LT_DECL([], [finish_eval], [1], ++- [[As "finish_cmds", except a single script fragment to be evaled but ++- not shown]]) ++-_LT_DECL([], [hardcode_into_libs], [0], ++- [Whether we should hardcode library paths into libraries]) ++-_LT_DECL([], [sys_lib_search_path_spec], [2], ++- [Compile-time system search path for libraries]) ++-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++- [Run-time system search path for libraries]) ++-])# _LT_SYS_DYNAMIC_LINKER ++- ++- ++-# _LT_PATH_TOOL_PREFIX(TOOL) ++-# -------------------------- ++-# find a file program which can recognize shared library ++-AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++-[m4_require([_LT_DECL_EGREP])dnl ++-AC_MSG_CHECKING([for $1]) ++-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++-[case $MAGIC_CMD in ++-[[\\/*] | ?:[\\/]*]) ++- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++- ;; ++-*) ++- lt_save_MAGIC_CMD="$MAGIC_CMD" ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++-dnl $ac_dummy forces splitting on constant user-supplied paths. ++-dnl POSIX.2 word splitting is done only on the output of word expansions, ++-dnl not every word. This closes a longstanding sh security hole. ++- ac_dummy="m4_if([$2], , $PATH, [$2])" ++- for ac_dir in $ac_dummy; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$1; then ++- lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++- if test -n "$file_magic_test_file"; then ++- case $deplibs_check_method in ++- "file_magic "*) ++- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++- $EGREP "$file_magic_regex" > /dev/null; then ++- : ++- else ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: the command libtool uses to detect shared libraries, ++-*** $file_magic_cmd, produces output that libtool cannot recognize. ++-*** The result is that libtool may fail to recognize shared libraries ++-*** as such. This will affect the creation of libtool libraries that ++-*** depend on shared libraries, but programs linked with such libtool ++-*** libraries will work regardless of this problem. Nevertheless, you ++-*** may want to report the problem to your system manager and/or to ++-*** bug-libtool@gnu.org ++- ++-_LT_EOF ++- fi ;; ++- esac ++- fi ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- MAGIC_CMD="$lt_save_MAGIC_CMD" ++- ;; ++-esac]) ++-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++-if test -n "$MAGIC_CMD"; then ++- AC_MSG_RESULT($MAGIC_CMD) ++-else ++- AC_MSG_RESULT(no) ++-fi ++-_LT_DECL([], [MAGIC_CMD], [0], ++- [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++-])# _LT_PATH_TOOL_PREFIX ++- ++-# Old name: ++-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++- ++- ++-# _LT_PATH_MAGIC ++-# -------------- ++-# find a file program which can recognize a shared library ++-m4_defun([_LT_PATH_MAGIC], ++-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++-if test -z "$lt_cv_path_MAGIC_CMD"; then ++- if test -n "$ac_tool_prefix"; then ++- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++- else ++- MAGIC_CMD=: ++- fi ++-fi ++-])# _LT_PATH_MAGIC ++- ++- ++-# LT_PATH_LD ++-# ---------- ++-# find the pathname to the GNU or non-GNU linker ++-AC_DEFUN([LT_PATH_LD], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++- ++-AC_ARG_WITH([gnu-ld], ++- [AS_HELP_STRING([--with-gnu-ld], ++- [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++- [test "$withval" = no || with_gnu_ld=yes], ++- [with_gnu_ld=no])dnl ++- ++-ac_prog=ld ++-if test "$GCC" = yes; then ++- # Check if gcc -print-prog-name=ld gives a path. ++- AC_MSG_CHECKING([for ld used by $CC]) ++- case $host in ++- *-*-mingw*) ++- # gcc leaves a trailing carriage return which upsets mingw ++- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++- *) ++- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++- esac ++- case $ac_prog in ++- # Accept absolute paths. ++- [[\\/]]* | ?:[[\\/]]*) ++- re_direlt='/[[^/]][[^/]]*/\.\./' ++- # Canonicalize the pathname of ld ++- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++- done ++- test -z "$LD" && LD="$ac_prog" ++- ;; ++- "") ++- # If it fails, then pretend we aren't using GCC. ++- ac_prog=ld ++- ;; ++- *) ++- # If it is relative, then search for the first ld in PATH. ++- with_gnu_ld=unknown ++- ;; ++- esac ++-elif test "$with_gnu_ld" = yes; then ++- AC_MSG_CHECKING([for GNU ld]) ++-else ++- AC_MSG_CHECKING([for non-GNU ld]) ++-fi ++-AC_CACHE_VAL(lt_cv_path_LD, ++-[if test -z "$LD"; then ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++- lt_cv_path_LD="$ac_dir/$ac_prog" ++- # Check to see if the program is GNU ld. I'd rather use --version, ++- # but apparently some variants of GNU ld only accept -v. ++- # Break only if it was the GNU/non-GNU ld that we prefer. ++- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then ++- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++- lt_cv_file_magic_cmd='func_win32_libid' ++- else ++- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++- lt_cv_file_magic_cmd='$OBJDUMP -f' ++- fi ++- ;; ++- ++-cegcc) ++- # use the weaker test based on 'objdump'. See mingw*. ++- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++- lt_cv_file_magic_cmd='$OBJDUMP -f' ++- ;; ++- ++-darwin* | rhapsody*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-freebsd* | dragonfly*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++- case $host_cpu in ++- i*86 ) ++- # Not sure whether the presence of OpenBSD here was a mistake. ++- # Let's accept both of them until this is cleared up. ++- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++- ;; ++- esac ++- else ++- lt_cv_deplibs_check_method=pass_all ++- fi ++- ;; ++- ++-gnu*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-hpux10.20* | hpux11*) ++- lt_cv_file_magic_cmd=/usr/bin/file ++- case $host_cpu in ++- ia64*) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++- ;; ++- hppa*64*) ++- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++- ;; ++- *) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++- ;; ++- esac ++- ;; ++- ++-interix[[3-9]]*) ++- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $LD in ++- *-32|*"-32 ") libmagic=32-bit;; ++- *-n32|*"-n32 ") libmagic=N32;; ++- *-64|*"-64 ") libmagic=64-bit;; ++- *) libmagic=never-match;; ++- esac ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-# This must be Linux ELF. ++-linux* | k*bsd*-gnu) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++- fi ++- ;; ++- ++-newos6*) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=/usr/lib/libnls.so ++- ;; ++- ++-*nto* | *qnx*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-openbsd*) ++- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- fi ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-rdos*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-solaris*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-sysv4 | sysv4.3*) ++- case $host_vendor in ++- motorola) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++- ;; ++- ncr) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- sequent) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++- ;; ++- sni) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++- lt_cv_file_magic_test_file=/lib/libc.so ++- ;; ++- siemens) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- pc) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- esac ++- ;; ++- ++-tpf*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++-esac ++-]) ++-file_magic_cmd=$lt_cv_file_magic_cmd ++-deplibs_check_method=$lt_cv_deplibs_check_method ++-test -z "$deplibs_check_method" && deplibs_check_method=unknown ++- ++-_LT_DECL([], [deplibs_check_method], [1], ++- [Method to check whether dependent libraries are shared objects]) ++-_LT_DECL([], [file_magic_cmd], [1], ++- [Command to use when deplibs_check_method == "file_magic"]) ++-])# _LT_CHECK_MAGIC_METHOD ++- ++- ++-# LT_PATH_NM ++-# ---------- ++-# find the pathname to a BSD- or MS-compatible name lister ++-AC_DEFUN([LT_PATH_NM], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, ++-[if test -n "$NM"; then ++- # Let the user override the test. ++- lt_cv_path_NM="$NM" ++-else ++- lt_nm_to_check="${ac_tool_prefix}nm" ++- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++- lt_nm_to_check="$lt_nm_to_check nm" ++- fi ++- for lt_tmp_nm in $lt_nm_to_check; do ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- tmp_nm="$ac_dir/$lt_tmp_nm" ++- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++- # Check to see if the nm accepts a BSD-compat flag. ++- # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++- # nm: unknown option "B" ignored ++- # Tru64's nm complains that /dev/null is an invalid object file ++- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++- */dev/null* | *'Invalid file or object type'*) ++- lt_cv_path_NM="$tmp_nm -B" ++- break ++- ;; ++- *) ++- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++- */dev/null*) ++- lt_cv_path_NM="$tmp_nm -p" ++- break ++- ;; ++- *) ++- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++- continue # so that we can try to find one that supports BSD flags ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- done ++- IFS="$lt_save_ifs" ++- done ++- : ${lt_cv_path_NM=no} ++-fi]) ++-if test "$lt_cv_path_NM" != "no"; then ++- NM="$lt_cv_path_NM" ++-else ++- # Didn't find any BSD compatible name lister, look for dumpbin. ++- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++- AC_SUBST([DUMPBIN]) ++- if test "$DUMPBIN" != ":"; then ++- NM="$DUMPBIN" ++- fi ++-fi ++-test -z "$NM" && NM=nm ++-AC_SUBST([NM]) ++-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl ++- ++-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++- [lt_cv_nm_interface="BSD nm" ++- echo "int some_variable = 0;" > conftest.$ac_ext ++- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$ac_compile" 2>conftest.err) ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++- cat conftest.out >&AS_MESSAGE_LOG_FD ++- if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++- lt_cv_nm_interface="MS dumpbin" ++- fi ++- rm -f conftest*]) ++-])# LT_PATH_NM ++- ++-# Old names: ++-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) ++-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AM_PROG_NM], []) ++-dnl AC_DEFUN([AC_PROG_NM], []) ++- ++- ++-# LT_LIB_M ++-# -------- ++-# check for math library ++-AC_DEFUN([LT_LIB_M], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-LIBM= ++-case $host in ++-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++- # These system don't have libm, or don't need it ++- ;; ++-*-ncr-sysv4.3*) ++- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++- ;; ++-*) ++- AC_CHECK_LIB(m, cos, LIBM="-lm") ++- ;; ++-esac ++-AC_SUBST([LIBM]) ++-])# LT_LIB_M ++- ++-# Old name: ++-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_CHECK_LIBM], []) ++- ++- ++-# _LT_COMPILER_NO_RTTI([TAGNAME]) ++-# ------------------------------- ++-m4_defun([_LT_COMPILER_NO_RTTI], ++-[m4_require([_LT_TAG_COMPILER])dnl ++- ++-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++- ++-if test "$GCC" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++- ++- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++- lt_cv_prog_compiler_rtti_exceptions, ++- [-fno-rtti -fno-exceptions], [], ++- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++-fi ++-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], ++- [Compiler flag to turn off builtin functions]) ++-])# _LT_COMPILER_NO_RTTI ++- ++- ++-# _LT_CMD_GLOBAL_SYMBOLS ++-# ---------------------- ++-m4_defun([_LT_CMD_GLOBAL_SYMBOLS], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([LT_PATH_NM])dnl ++-AC_REQUIRE([LT_PATH_LD])dnl ++-m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++-m4_require([_LT_TAG_COMPILER])dnl ++- ++-# Check for command to grab the raw symbol name followed by C symbol from nm. ++-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++-[ ++-# These are sane defaults that work on at least a few old systems. ++-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++- ++-# Character class describing NM global symbol codes. ++-symcode='[[BCDEGRST]]' ++- ++-# Regexp to match symbols that can be accessed directly from C. ++-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++- ++-# Define system-specific variables. ++-case $host_os in ++-aix*) ++- symcode='[[BCDT]]' ++- ;; ++-cygwin* | mingw* | pw32* | cegcc*) ++- symcode='[[ABCDGISTW]]' ++- ;; ++-hpux*) ++- if test "$host_cpu" = ia64; then ++- symcode='[[ABCDEGRST]]' ++- fi ++- ;; ++-irix* | nonstopux*) ++- symcode='[[BCDEGRST]]' ++- ;; ++-osf*) ++- symcode='[[BCDEGQRST]]' ++- ;; ++-solaris*) ++- symcode='[[BDRT]]' ++- ;; ++-sco3.2v5*) ++- symcode='[[DT]]' ++- ;; ++-sysv4.2uw2*) ++- symcode='[[DT]]' ++- ;; ++-sysv5* | sco5v6* | unixware* | OpenUNIX*) ++- symcode='[[ABDT]]' ++- ;; ++-sysv4) ++- symcode='[[DFNSTU]]' ++- ;; ++-esac ++- ++-# If we're using GNU nm, then use its standard symbol codes. ++-case `$NM -V 2>&1` in ++-*GNU* | *'with BFD'*) ++- symcode='[[ABCDGIRSTW]]' ;; ++-esac ++- ++-# Transform an extracted symbol line into a proper C declaration. ++-# Some systems (esp. on ia64) link data and code symbols differently, ++-# so use this general approach. ++-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++- ++-# Transform an extracted symbol line into symbol name and symbol address ++-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++- ++-# Handle CRLF in mingw tool chain ++-opt_cr= ++-case $build_os in ++-mingw*) ++- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++- ;; ++-esac ++- ++-# Try without a prefix underscore, then with it. ++-for ac_symprfx in "" "_"; do ++- ++- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++- symxfrm="\\1 $ac_symprfx\\2 \\2" ++- ++- # Write the raw and C identifiers. ++- if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++- # Fake it for dumpbin and say T for any non-static function ++- # and D for any global variable. ++- # Also find C++ and __fastcall symbols from MSVC++, ++- # which start with @ or ?. ++- lt_cv_sys_global_symbol_pipe="$AWK ['"\ ++-" {last_section=section; section=\$ 3};"\ ++-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++-" \$ 0!~/External *\|/{next};"\ ++-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++-" {if(hide[section]) next};"\ ++-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++-" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++-" ' prfx=^$ac_symprfx]" ++- else ++- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++- fi ++- ++- # Check to see that the pipe works correctly. ++- pipe_works=no ++- ++- rm -f conftest* ++- cat > conftest.$ac_ext <<_LT_EOF ++-#ifdef __cplusplus ++-extern "C" { ++-#endif ++-char nm_test_var; ++-void nm_test_func(void); ++-void nm_test_func(void){} ++-#ifdef __cplusplus ++-} ++-#endif ++-int main(){nm_test_var='a';nm_test_func();return(0);} ++-_LT_EOF ++- ++- if AC_TRY_EVAL(ac_compile); then ++- # Now try to grab the symbols. ++- nlist=conftest.nm ++- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then ++- # Try sorting and uniquifying the output. ++- if sort "$nlist" | uniq > "$nlist"T; then ++- mv -f "$nlist"T "$nlist" ++- else ++- rm -f "$nlist"T ++- fi ++- ++- # Make sure that we snagged all the symbols we need. ++- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++- cat <<_LT_EOF > conftest.$ac_ext ++-#ifdef __cplusplus ++-extern "C" { ++-#endif ++- ++-_LT_EOF ++- # Now generate the symbol file. ++- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++- ++- cat <<_LT_EOF >> conftest.$ac_ext ++- ++-/* The mapping between symbol names and symbols. */ ++-const struct { ++- const char *name; ++- void *address; ++-} ++-lt__PROGRAM__LTX_preloaded_symbols[[]] = ++-{ ++- { "@PROGRAM@", (void *) 0 }, ++-_LT_EOF ++- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++- cat <<\_LT_EOF >> conftest.$ac_ext ++- {0, (void *) 0} ++-}; ++- ++-/* This works around a problem in FreeBSD linker */ ++-#ifdef FREEBSD_WORKAROUND ++-static const void *lt_preloaded_setup() { ++- return lt__PROGRAM__LTX_preloaded_symbols; ++-} ++-#endif ++- ++-#ifdef __cplusplus ++-} ++-#endif ++-_LT_EOF ++- # Now try linking the two files. ++- mv conftest.$ac_objext conftstm.$ac_objext ++- lt_save_LIBS="$LIBS" ++- lt_save_CFLAGS="$CFLAGS" ++- LIBS="conftstm.$ac_objext" ++- CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++- pipe_works=yes ++- fi ++- LIBS="$lt_save_LIBS" ++- CFLAGS="$lt_save_CFLAGS" ++- else ++- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++- cat conftest.$ac_ext >&5 ++- fi ++- rm -rf conftest* conftst* ++- ++- # Do not use the global_symbol_pipe unless it works. ++- if test "$pipe_works" = yes; then ++- break ++- else ++- lt_cv_sys_global_symbol_pipe= ++- fi ++-done ++-]) ++-if test -z "$lt_cv_sys_global_symbol_pipe"; then ++- lt_cv_sys_global_symbol_to_cdecl= ++-fi ++-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++- AC_MSG_RESULT(failed) ++-else ++- AC_MSG_RESULT(ok) ++-fi ++- ++-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], ++- [Take the output of nm and produce a listing of raw symbols and C names]) ++-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], ++- [Transform the output of nm in a proper C declaration]) ++-_LT_DECL([global_symbol_to_c_name_address], ++- [lt_cv_sys_global_symbol_to_c_name_address], [1], ++- [Transform the output of nm in a C name address pair]) ++-_LT_DECL([global_symbol_to_c_name_address_lib_prefix], ++- [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], ++- [Transform the output of nm in a C name address pair when lib prefix is needed]) ++-]) # _LT_CMD_GLOBAL_SYMBOLS ++- ++- ++-# _LT_COMPILER_PIC([TAGNAME]) ++-# --------------------------- ++-m4_defun([_LT_COMPILER_PIC], ++-[m4_require([_LT_TAG_COMPILER])dnl ++-_LT_TAGVAR(lt_prog_compiler_wl, $1)= ++-_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++-_LT_TAGVAR(lt_prog_compiler_static, $1)= ++- ++-AC_MSG_CHECKING([for $compiler option to produce PIC]) ++-m4_if([$1], [CXX], [ ++- # C++ specific cases for pic, static, wl, etc. ++- if test "$GXX" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- m68k) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- esac ++- ;; ++- ++- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- mingw* | cygwin* | os2* | pw32* | cegcc*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- # Although the cygwin gcc ignores -fPIC, still need this for old-style ++- # (--disable-auto-import) libraries ++- m4_if([$1], [GCJ], [], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++- ;; ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- *djgpp*) ++- # DJGPP does not support shared libraries at all ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- interix[[3-9]]*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- hpux*) ++- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++- # sets the default TLS model and affects inlining. ++- case $host_cpu in ++- hppa*64*) ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- *qnx* | *nto*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- case $host_os in ++- aix[[4-9]]*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- chorus*) ++- case $cc_basename in ++- cxch68*) ++- # Green Hills C++ Compiler ++- # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++- ;; ++- esac ++- ;; ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- freebsd* | dragonfly*) ++- # FreeBSD uses GNU C++ ++- ;; ++- hpux9* | hpux10* | hpux11*) ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- if test "$host_cpu" != ia64; then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- fi ++- ;; ++- aCC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- interix*) ++- # This is c89, which is MS Visual C++ (no shared libs) ++- # Anyone wants to do a port? ++- ;; ++- irix5* | irix6* | nonstopux*) ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- # CC pic flag -KPIC is the default. ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- KCC*) ++- # KAI C++ Compiler ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- ecpc* ) ++- # old Intel C++ for x86_64 which still supported -KPIC. ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- icpc* ) ++- # Intel C++, used to be incompatible with GCC. ++- # ICC 10 doesn't accept -KPIC any more. ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgCC* | pgcpp*) ++- # Portland Group C++ compiler ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- cxx*) ++- # Compaq C++ ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- xlc* | xlC*) ++- # IBM XL 8.0 on PPC ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C++ 5.9 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- ;; ++- esac ++- ;; ++- esac ++- ;; ++- lynxos*) ++- ;; ++- m88k*) ++- ;; ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- netbsd*) ++- ;; ++- *qnx* | *nto*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- osf3* | osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- cxx*) ++- # Digital/Compaq C++ ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- psos*) ++- ;; ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- lcc*) ++- # Lucid ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- vxworks*) ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-], ++-[ ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- m68k) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- esac ++- ;; ++- ++- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- ++- mingw* | cygwin* | pw32* | os2* | cegcc*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- # Although the cygwin gcc ignores -fPIC, still need this for old-style ++- # (--disable-auto-import) libraries ++- m4_if([$1], [GCJ], [], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++- ;; ++- ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- ++- hpux*) ++- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++- # sets the default TLS model and affects inlining. ++- case $host_cpu in ++- hppa*64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- ++- interix[[3-9]]*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- ++- msdosdjgpp*) ++- # Just because we use GCC doesn't mean we suddenly get shared libraries ++- # on systems that don't support them. ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- enable_shared=no ++- ;; ++- ++- *nto* | *qnx*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- # PORTME Check for flag to pass linker flags through the system compiler. ++- case $host_os in ++- aix*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- ++- mingw* | cygwin* | pw32* | os2* | cegcc*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- m4_if([$1], [GCJ], [], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++- ;; ++- ++- hpux9* | hpux10* | hpux11*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- # Is there a better lt_prog_compiler_static that works with the bundled CC? ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC (with -KPIC) is the default. ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- # old Intel for x86_64 which still supported -KPIC. ++- ecc*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- # icc used to be incompatible with GCC. ++- # ICC 10 doesn't accept -KPIC any more. ++- icc* | ifort*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- # Lahey Fortran 8.1. ++- lf95*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++- ;; ++- pgcc* | pgf77* | pgf90* | pgf95*) ++- # Portland Group compilers (*not* the Pentium gcc compiler, ++- # which looks to be a dead project) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ccc*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All Alpha code is PIC. ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- xl*) ++- # IBM XL C 8.0/Fortran 10.1 on PPC ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C 5.9 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- *Sun\ F*) ++- # Sun Fortran 8.3 passes all unrecognized flags to the linker ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ++- ;; ++- esac ++- ;; ++- esac ++- ;; ++- ++- newsos6) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- *nto* | *qnx*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- ++- osf3* | osf4* | osf5*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All OSF/1 code is PIC. ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- rdos*) ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- solaris*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- case $cc_basename in ++- f77* | f90* | f95*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4 | sysv4.2uw2* | sysv4.3*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec ;then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- unicos*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- ++- uts4*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- *) ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-]) ++-case $host_os in ++- # For platforms which do not support PIC, -DPIC is meaningless: ++- *djgpp*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ++- ;; ++-esac ++-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++- [How to pass a linker flag through the compiler]) ++- ++-# ++-# Check to make sure the PIC flag actually works. ++-# ++-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], ++- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], ++- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], ++- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in ++- "" | " "*) ;; ++- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++- esac], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++-fi ++-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], ++- [Additional compiler flags for building library objects]) ++- ++-# ++-# Check to make sure the static flag actually works. ++-# ++-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" ++-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++- $lt_tmp_static_flag, ++- [], ++- [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) ++-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], ++- [Compiler flag to prevent dynamic linking]) ++-])# _LT_COMPILER_PIC ++- ++- ++-# _LT_LINKER_SHLIBS([TAGNAME]) ++-# ---------------------------- ++-# See if the linker supports building shared libraries. ++-m4_defun([_LT_LINKER_SHLIBS], ++-[AC_REQUIRE([LT_PATH_LD])dnl ++-AC_REQUIRE([LT_PATH_NM])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++-m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++-m4_require([_LT_TAG_COMPILER])dnl ++-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++-m4_if([$1], [CXX], [ ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- case $host_os in ++- aix[[4-9]]*) ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- fi ++- ;; ++- pw32*) ++- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++- ;; ++- cygwin* | mingw* | cegcc*) ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- *) ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- esac ++- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++-], [ ++- runpath_var= ++- _LT_TAGVAR(allow_undefined_flag, $1)= ++- _LT_TAGVAR(always_export_symbols, $1)=no ++- _LT_TAGVAR(archive_cmds, $1)= ++- _LT_TAGVAR(archive_expsym_cmds, $1)= ++- _LT_TAGVAR(compiler_needs_object, $1)=no ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- _LT_TAGVAR(hardcode_automatic, $1)=no ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++- _LT_TAGVAR(hardcode_libdir_separator, $1)= ++- _LT_TAGVAR(hardcode_minus_L, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_TAGVAR(inherit_rpath, $1)=no ++- _LT_TAGVAR(link_all_deplibs, $1)=unknown ++- _LT_TAGVAR(module_cmds, $1)= ++- _LT_TAGVAR(module_expsym_cmds, $1)= ++- _LT_TAGVAR(old_archive_from_new_cmds, $1)= ++- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++- _LT_TAGVAR(thread_safe_flag_spec, $1)= ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- # include_expsyms should be a list of space-separated symbols to be *always* ++- # included in the symbol list ++- _LT_TAGVAR(include_expsyms, $1)= ++- # exclude_expsyms can be an extended regexp of symbols to exclude ++- # it will be wrapped by ` (' and `)$', so one must not match beginning or ++- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++- # as well as any symbol that contains `d'. ++- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++- # platforms (ab)use it in PIC code, but their linkers get confused if ++- # the symbol is explicitly referenced. Since portable code cannot ++- # rely on this symbol name, it's probably fine to never include it in ++- # preloaded symbol tables. ++- # Exclude shared library initialization/finalization symbols. ++-dnl Note also adjust exclude_expsyms for C++ above. ++- extract_expsyms_cmds= ++- ++- case $host_os in ++- cygwin* | mingw* | pw32* | cegcc*) ++- # FIXME: the MSVC++ port hasn't been tested in a loooong time ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- if test "$GCC" != yes; then ++- with_gnu_ld=no ++- fi ++- ;; ++- interix*) ++- # we just hope/assume this is gcc and not c89 (= MSVC++) ++- with_gnu_ld=yes ++- ;; ++- openbsd*) ++- with_gnu_ld=no ++- ;; ++- esac ++- ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- if test "$with_gnu_ld" = yes; then ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- wlarc='${wl}' ++- ++- # Set some defaults for GNU ld with shared library support. These ++- # are reset later if shared libraries are not supported. Putting them ++- # here allows them to be overridden if necessary. ++- runpath_var=LD_RUN_PATH ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- supports_anon_versioning=no ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++- *\ 2.11.*) ;; # other 2.11 versions ++- *) supports_anon_versioning=yes ;; ++- esac ++- ++- # See if GNU ld supports shared libraries. ++- case $host_os in ++- aix[[3-9]]*) ++- # On AIX/PPC, the GNU linker is very broken ++- if test "$host_cpu" != ia64; then ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++-*** to be unable to reliably create shared libraries on AIX. ++-*** Therefore, libtool is disabling shared libraries support. If you ++-*** really care for shared libraries, you may want to modify your PATH ++-*** so that a non-GNU linker is found, and then restart. ++- ++-_LT_EOF ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='' ++- ;; ++- m68k) ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- cygwin* | mingw* | pw32* | cegcc*) ++- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(always_export_symbols, $1)=no ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++- ++- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- interix[[3-9]]*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- ++- gnu* | linux* | tpf* | k*bsd*-gnu) ++- tmp_diet=no ++- if test "$host_os" = linux-dietlibc; then ++- case $cc_basename in ++- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++- esac ++- fi ++- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++- && test "$tmp_diet" = no ++- then ++- tmp_addflag= ++- tmp_sharedflag='-shared' ++- case $cc_basename,$host_cpu in ++- pgcc*) # Portland Group C compiler ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag' ++- ;; ++- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag -Mnomain' ;; ++- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++- tmp_addflag=' -i_dynamic' ;; ++- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++- tmp_addflag=' -i_dynamic -nofor_main' ;; ++- ifc* | ifort*) # Intel Fortran compiler ++- tmp_addflag=' -nofor_main' ;; ++- lf95*) # Lahey Fortran 8.1 ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- tmp_sharedflag='--shared' ;; ++- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++- tmp_sharedflag='-qmkshrobj' ++- tmp_addflag= ;; ++- esac ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) # Sun C 5.9 ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- _LT_TAGVAR(compiler_needs_object, $1)=yes ++- tmp_sharedflag='-G' ;; ++- *Sun\ F*) # Sun Fortran 8.3 ++- tmp_sharedflag='-G' ;; ++- esac ++- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- ++- if test "x$supports_anon_versioning" = xyes; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- ++- case $cc_basename in ++- xlf*) ++- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++- if test "x$supports_anon_versioning" = xyes; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++- fi ++- ;; ++- esac ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++- wlarc= ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- fi ++- ;; ++- ++- solaris*) ++- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++-*** create shared libraries on Solaris systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.9.1 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-_LT_EOF ++- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++-*** reliably create shared libraries on SCO systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-_LT_EOF ++- ;; ++- *) ++- # For security reasons, it is highly recommended that you always ++- # use absolute paths for naming shared libraries, and exclude the ++- # DT_RUNPATH tag from executables and libraries. But doing so ++- # requires that you compile everything twice, which is a pain. ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- wlarc= ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ++- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then ++- runpath_var= ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- # PORTME fill in a description of your system's linker (not GNU ld) ++- case $host_os in ++- aix3*) ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(always_export_symbols, $1)=yes ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++- # Note: this linker hardcodes the directories in LIBPATH if there ++- # are no directories specified by -L. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++- # Neither direct hardcoding nor static linking is supported with a ++- # broken collect2. ++- _LT_TAGVAR(hardcode_direct, $1)=unsupported ++- fi ++- ;; ++- ++- aix[[4-9]]*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- fi ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++- for ld_flag in $LDFLAGS; do ++- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++- aix_use_runtimelinking=yes ++- break ++- fi ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_TAGVAR(archive_cmds, $1)='' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++- ++- if test "$GCC" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && ++- strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- : ++- else ++- # We have old collect2 ++- _LT_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an ++- # empty executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an ++- # empty executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='' ++- ;; ++- m68k) ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- ;; ++- ++- bsdi[[45]]*) ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++- ;; ++- ++- cygwin* | mingw* | pw32* | cegcc*) ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- # hardcode_libdir_flag_spec is actually meaningless, as there is ++- # no search path for DLLs. ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Tell ltmain to make .lib files, not .a files. ++- libext=lib ++- # Tell ltmain to make .dll files, not .so files. ++- shrext_cmds=".dll" ++- # FIXME: Setting linknames here is a bad hack. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++- # The linker will automatically build a .lib file if we build a DLL. ++- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++- # FIXME: Should let the user specify the lib program. ++- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ;; ++- ++- darwin* | rhapsody*) ++- _LT_DARWIN_LINKER_FEATURES($1) ++- ;; ++- ++- dgux*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- freebsd1*) ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++- # support. Future versions do this automatically, but an explicit c++rt0.o ++- # does not break anything, and helps significantly (at the cost of a little ++- # extra space). ++- freebsd2.2*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++- freebsd2*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++- freebsd* | dragonfly*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- hpux9*) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- ++- hpux10*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- fi ++- ;; ++- ++- hpux11*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- else ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- fi ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- # Try to use the -exported_symbol ld option, if it does not ++- # work, assume that -exports_file does not work either and ++- # implicitly export all symbols. ++- save_LDFLAGS="$LDFLAGS" ++- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++- AC_LINK_IFELSE(int foo(void) {}, ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++- ) ++- LDFLAGS="$save_LDFLAGS" ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++- fi ++- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(inherit_rpath, $1)=yes ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- newsos6) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *nto* | *qnx*) ++- ;; ++- ++- openbsd*) ++- if test -f /usr/libexec/ld.so; then ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- else ++- case $host_os in ++- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- ;; ++- esac ++- fi ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- os2*) ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++- ;; ++- ++- osf3*) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- fi ++- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- osf4* | osf5*) # as osf3* with the addition of -msym flag ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- else ++- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++- ++- # Both c and cxx compiler support -rpath directly ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- fi ++- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- solaris*) ++- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' ++- if test "$GCC" = yes; then ++- wlarc='${wl}' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++- else ++- case `$CC -V 2>&1` in ++- *"Compilers 5.0"*) ++- wlarc='' ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++- ;; ++- *) ++- wlarc='${wl}' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++- ;; ++- esac ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine and reorder linker options, ++- # but understands `-z linker_flag'. GCC discards it without `$wl', ++- # but is careful enough not to reorder. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++- else ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++- fi ++- ;; ++- esac ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- sunos4*) ++- if test "x$host_vendor" = xsequent; then ++- # Use $CC to link under sequent, because it throws in some extra .o ++- # files that make .init and .fini sections work. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4) ++- case $host_vendor in ++- sni) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++- ;; ++- siemens) ++- ## LD is ld it makes a PLAMLIB ++- ## CC just makes a GrossModule. ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- ;; ++- motorola) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++- ;; ++- esac ++- runpath_var='LD_RUN_PATH' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4.3*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var=LD_RUN_PATH ++- hardcode_runpath_var=yes ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- fi ++- ;; ++- ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- uts4*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ++- if test x$host_vendor = xsni; then ++- case $host in ++- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++- ;; ++- esac ++- fi ++- fi ++-]) ++-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld ++- ++-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl ++-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl ++-_LT_DECL([], [extract_expsyms_cmds], [2], ++- [The commands to extract the exported symbol list from a shared archive]) ++- ++-# ++-# Do we need to explicitly link libc? ++-# ++-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in ++-x|xyes) ++- # Assume -lc should be added ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- ++- if test "$enable_shared" = yes && test "$GCC" = yes; then ++- case $_LT_TAGVAR(archive_cmds, $1) in ++- *'~'*) ++- # FIXME: we may have to deal with multi-command sequences. ++- ;; ++- '$CC '*) ++- # Test whether the compiler implicitly links with -lc since on some ++- # systems, -lgcc has to come before -lc. If gcc already passes -lc ++- # to ld, don't add -lc before -lgcc. ++- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++- $RM conftest* ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++- soname=conftest ++- lib=conftest ++- libobjs=conftest.$ac_objext ++- deplibs= ++- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) ++- compiler_flags=-v ++- linker_flags=-v ++- verstring= ++- output_objdir=. ++- libname=conftest ++- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++- _LT_TAGVAR(allow_undefined_flag, $1)= ++- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) ++- then ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- else ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- fi ++- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++- else ++- cat conftest.err 1>&5 ++- fi ++- $RM conftest* ++- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ++- ;; ++- esac ++- fi ++- ;; ++-esac ++- ++-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], ++- [Whether or not to add -lc for building shared libraries]) ++-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], ++- [enable_shared_with_static_runtimes], [0], ++- [Whether or not to disallow shared libs when runtime libs are static]) ++-_LT_TAGDECL([], [export_dynamic_flag_spec], [1], ++- [Compiler flag to allow reflexive dlopens]) ++-_LT_TAGDECL([], [whole_archive_flag_spec], [1], ++- [Compiler flag to generate shared objects directly from archives]) ++-_LT_TAGDECL([], [compiler_needs_object], [1], ++- [Whether the compiler copes with passing no objects directly]) ++-_LT_TAGDECL([], [old_archive_from_new_cmds], [2], ++- [Create an old-style archive from a shared archive]) ++-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], ++- [Create a temporary old-style archive to link instead of a shared archive]) ++-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) ++-_LT_TAGDECL([], [archive_expsym_cmds], [2]) ++-_LT_TAGDECL([], [module_cmds], [2], ++- [Commands used to build a loadable module if different from building ++- a shared archive.]) ++-_LT_TAGDECL([], [module_expsym_cmds], [2]) ++-_LT_TAGDECL([], [with_gnu_ld], [1], ++- [Whether we are building with GNU ld or not]) ++-_LT_TAGDECL([], [allow_undefined_flag], [1], ++- [Flag that allows shared libraries with undefined symbols to be built]) ++-_LT_TAGDECL([], [no_undefined_flag], [1], ++- [Flag that enforces no undefined symbols]) ++-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], ++- [Flag to hardcode $libdir into a binary during linking. ++- This must work even if $libdir does not exist]) ++-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], ++- [[If ld is used when linking, flag to hardcode $libdir into a binary ++- during linking. This must work even if $libdir does not exist]]) ++-_LT_TAGDECL([], [hardcode_libdir_separator], [1], ++- [Whether we need a single "-rpath" flag with a separated argument]) ++-_LT_TAGDECL([], [hardcode_direct], [0], ++- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++- DIR into the resulting binary]) ++-_LT_TAGDECL([], [hardcode_direct_absolute], [0], ++- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++- DIR into the resulting binary and the resulting library dependency is ++- "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++- library is relocated]) ++-_LT_TAGDECL([], [hardcode_minus_L], [0], ++- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++- into the resulting binary]) ++-_LT_TAGDECL([], [hardcode_shlibpath_var], [0], ++- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++- into the resulting binary]) ++-_LT_TAGDECL([], [hardcode_automatic], [0], ++- [Set to "yes" if building a shared library automatically hardcodes DIR ++- into the library and all subsequent libraries and executables linked ++- against it]) ++-_LT_TAGDECL([], [inherit_rpath], [0], ++- [Set to yes if linker adds runtime paths of dependent libraries ++- to runtime path list]) ++-_LT_TAGDECL([], [link_all_deplibs], [0], ++- [Whether libtool must link a program against all its dependency libraries]) ++-_LT_TAGDECL([], [fix_srcfile_path], [1], ++- [Fix the shell variable $srcfile for the compiler]) ++-_LT_TAGDECL([], [always_export_symbols], [0], ++- [Set to "yes" if exported symbols are required]) ++-_LT_TAGDECL([], [export_symbols_cmds], [2], ++- [The commands to list exported symbols]) ++-_LT_TAGDECL([], [exclude_expsyms], [1], ++- [Symbols that should not be listed in the preloaded symbols]) ++-_LT_TAGDECL([], [include_expsyms], [1], ++- [Symbols that must always be exported]) ++-_LT_TAGDECL([], [prelink_cmds], [2], ++- [Commands necessary for linking programs (against libraries) with templates]) ++-_LT_TAGDECL([], [file_list_spec], [1], ++- [Specify filename containing input files]) ++-dnl FIXME: Not yet implemented ++-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], ++-dnl [Compiler flag to generate thread safe objects]) ++-])# _LT_LINKER_SHLIBS ++- ++- ++-# _LT_LANG_C_CONFIG([TAG]) ++-# ------------------------ ++-# Ensure that the configuration variables for a C compiler are suitably ++-# defined. These variables are subsequently used by _LT_CONFIG to write ++-# the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_C_CONFIG], ++-[m4_require([_LT_DECL_EGREP])dnl ++-lt_save_CC="$CC" ++-AC_LANG_PUSH(C) ++- ++-# Source file extension for C test sources. ++-ac_ext=c ++- ++-# Object file extension for compiled C test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="int some_variable = 0;" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='int main(){return(0);}' ++- ++-_LT_TAG_COMPILER ++-# Save the default compiler, since it gets overwritten when the other ++-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++-compiler_DEFAULT=$CC ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-if test -n "$compiler"; then ++- _LT_COMPILER_NO_RTTI($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- LT_SYS_DLOPEN_SELF ++- _LT_CMD_STRIPLIB ++- ++- # Report which library types will actually be built ++- AC_MSG_CHECKING([if libtool supports shared libraries]) ++- AC_MSG_RESULT([$can_build_shared]) ++- ++- AC_MSG_CHECKING([whether to build shared libraries]) ++- test "$can_build_shared" = "no" && enable_shared=no ++- ++- # On AIX, shared libraries and static libraries use the same namespace, and ++- # are all built from PIC. ++- case $host_os in ++- aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- ++- aix[[4-9]]*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++- esac ++- AC_MSG_RESULT([$enable_shared]) ++- ++- AC_MSG_CHECKING([whether to build static libraries]) ++- # Make sure either enable_shared or enable_static is yes. ++- test "$enable_shared" = yes || enable_static=yes ++- AC_MSG_RESULT([$enable_static]) ++- ++- _LT_CONFIG($1) ++-fi ++-AC_LANG_POP ++-CC="$lt_save_CC" ++-])# _LT_LANG_C_CONFIG ++- ++- ++-# _LT_PROG_CXX ++-# ------------ ++-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ ++-# compiler, we have our own version here. ++-m4_defun([_LT_PROG_CXX], ++-[ ++-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) ++-AC_PROG_CXX ++-if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++- (test "X$CXX" != "Xg++"))) ; then ++- AC_PROG_CXXCPP ++-else ++- _lt_caught_CXX_error=yes ++-fi ++-popdef([AC_MSG_ERROR]) ++-])# _LT_PROG_CXX ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([_LT_PROG_CXX], []) ++- ++- ++-# _LT_LANG_CXX_CONFIG([TAG]) ++-# -------------------------- ++-# Ensure that the configuration variables for a C++ compiler are suitably ++-# defined. These variables are subsequently used by _LT_CONFIG to write ++-# the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_CXX_CONFIG], ++-[AC_REQUIRE([_LT_PROG_CXX])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++- ++-AC_LANG_PUSH(C++) ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_TAGVAR(allow_undefined_flag, $1)= ++-_LT_TAGVAR(always_export_symbols, $1)=no ++-_LT_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_TAGVAR(compiler_needs_object, $1)=no ++-_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_direct, $1)=no ++-_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++-_LT_TAGVAR(hardcode_automatic, $1)=no ++-_LT_TAGVAR(inherit_rpath, $1)=no ++-_LT_TAGVAR(module_cmds, $1)= ++-_LT_TAGVAR(module_expsym_cmds, $1)= ++-_LT_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_TAGVAR(no_undefined_flag, $1)= ++-_LT_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Source file extension for C++ test sources. ++-ac_ext=cpp ++- ++-# Object file extension for compiled C++ test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# No sense in running all these tests if we already determined that ++-# the CXX compiler isn't working. Some variables (like enable_shared) ++-# are currently assumed to apply to all compilers on this platform, ++-# and will be corrupted by setting them based on a non-working compiler. ++-if test "$_lt_caught_CXX_error" != yes; then ++- # Code to be used in simple compile tests ++- lt_simple_compile_test_code="int some_variable = 0;" ++- ++- # Code to be used in simple link tests ++- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' ++- ++- # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++- _LT_TAG_COMPILER ++- ++- # save warnings/boilerplate of simple test code ++- _LT_COMPILER_BOILERPLATE ++- _LT_LINKER_BOILERPLATE ++- ++- # Allow CC to be a program name with arguments. ++- lt_save_CC=$CC ++- lt_save_LD=$LD ++- lt_save_GCC=$GCC ++- GCC=$GXX ++- lt_save_with_gnu_ld=$with_gnu_ld ++- lt_save_path_LD=$lt_cv_path_LD ++- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++- else ++- $as_unset lt_cv_prog_gnu_ld ++- fi ++- if test -n "${lt_cv_path_LDCXX+set}"; then ++- lt_cv_path_LD=$lt_cv_path_LDCXX ++- else ++- $as_unset lt_cv_path_LD ++- fi ++- test -z "${LDCXX+set}" || LD=$LDCXX ++- CC=${CXX-"c++"} ++- compiler=$CC ++- _LT_TAGVAR(compiler, $1)=$CC ++- _LT_CC_BASENAME([$compiler]) ++- ++- if test -n "$compiler"; then ++- # We don't want -fno-exception when compiling C++ code, so set the ++- # no_builtin_flag separately ++- if test "$GXX" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++- else ++- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++- fi ++- ++- if test "$GXX" = yes; then ++- # Set up default GNU C++ configuration ++- ++- LT_PATH_LD ++- ++- # Check if GNU C++ uses GNU ld as the underlying linker, since the ++- # archiving commands below assume that GNU ld is being used. ++- if test "$with_gnu_ld" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++- # investigate it a little bit more. (MM) ++- wlarc='${wl}' ++- ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++- $GREP 'no-whole-archive' > /dev/null; then ++- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- with_gnu_ld=no ++- wlarc= ++- ++- # A generic and very simple default shared library creation ++- # command for GNU C++ for the case where it uses the native ++- # linker, instead of GNU ld. If possible, this setting should ++- # overridden to take advantage of the native linker features on ++- # the platform it is being used on. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- fi ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- ++- else ++- GXX=no ++- with_gnu_ld=no ++- wlarc= ++- fi ++- ++- # PORTME: fill in a description of your system's C++ link characteristics ++- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- case $host_os in ++- aix3*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aix[[4-9]]*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++- for ld_flag in $LDFLAGS; do ++- case $ld_flag in ++- *-brtl*) ++- aix_use_runtimelinking=yes ++- break ++- ;; ++- esac ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_TAGVAR(archive_cmds, $1)='' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++- ++- if test "$GXX" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && ++- strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- : ++- else ++- # We have old collect2 ++- _LT_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to ++- # export. ++- _LT_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty ++- # executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an ++- # empty executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared ++- # libraries. ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- chorus*) ++- case $cc_basename in ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- cygwin* | mingw* | pw32* | cegcc*) ++- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(always_export_symbols, $1)=no ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ++- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- darwin* | rhapsody*) ++- _LT_DARWIN_LINKER_FEATURES($1) ++- ;; ++- ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- freebsd[[12]]*) ++- # C++ shared libraries reported to be fairly broken before ++- # switch to ELF ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- freebsd-elf*) ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- ;; ++- ++- freebsd* | dragonfly*) ++- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++- # conventions ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- ;; ++- ++- gnu*) ++- ;; ++- ++- hpux9*) ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- hpux10*|hpux11*) ++- if test $with_gnu_ld = no; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- ;; ++- *) ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- esac ++- fi ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ;; ++- esac ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test $with_gnu_ld = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- fi ++- else ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- interix[[3-9]]*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- irix5* | irix6*) ++- case $cc_basename in ++- CC*) ++- # SGI C++ ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++- fi ++- fi ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- esac ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(inherit_rpath, $1)=yes ++- ;; ++- ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++- ;; ++- icpc* | ecpc* ) ++- # Intel C++ ++- with_gnu_ld=yes ++- # version 8.0 and above of icpc choke on multiply defined symbols ++- # if we add $predep_objects and $postdep_objects, however 7.1 and ++- # earlier do not add the objects themselves. ++- case `$CC -V 2>&1` in ++- *"Version 7."*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- *) # Version 8.0 or newer ++- tmp_idyn= ++- case $host_cpu in ++- ia64*) tmp_idyn=' -i_dynamic';; ++- esac ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- esac ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++- ;; ++- pgCC* | pgcpp*) ++- # Portland Group C++ compiler ++- case `$CC -V` in ++- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) ++- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++- $RANLIB $oldlib' ++- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++- ;; ++- *) # Version 6 will use weak symbols ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++- ;; ++- esac ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- ;; ++- cxx*) ++- # Compaq C++ ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++- ++- runpath_var=LD_RUN_PATH ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- xl*) ++- # IBM XL 8.0 on PPC, with GNU ld ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- if test "x$supports_anon_versioning" = xyes; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C++ 5.9 ++- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- _LT_TAGVAR(compiler_needs_object, $1)=yes ++- ++- # Not sure whether something based on ++- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++- # would be better. ++- output_verbose_link_cmd='echo' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -xar", where "CC" is the Sun C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++- ;; ++- esac ++- ;; ++- esac ++- ;; ++- ++- lynxos*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- m88k*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++- wlarc= ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- fi ++- # Workaround some broken pre-1.5 toolchains ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++- ;; ++- ++- *nto* | *qnx*) ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- ;; ++- ++- openbsd2*) ++- # C++ shared libraries are fairly broken ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- openbsd*) ++- if test -f /usr/libexec/ld.so; then ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- fi ++- output_verbose_link_cmd=echo ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- osf3* | osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Archives containing C++ object files must be created using ++- # the KAI C++ compiler. ++- case $host in ++- osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; ++- *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; ++- esac ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- cxx*) ++- case $host in ++- osf3*) ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- ;; ++- *) ++- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++- echo "-hidden">> $lib.exp~ ++- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++- $RM $lib.exp' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- ;; ++- esac ++- ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- *) ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- case $host in ++- osf3*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ;; ++- esac ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- ++- else ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- psos*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- lcc*) ++- # Lucid ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes ++- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine and reorder linker options, ++- # but understands `-z linker_flag'. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++- ;; ++- esac ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ++- output_verbose_link_cmd='echo' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -xar", where "CC" is the Sun C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- ++- # The C++ compiler must be used to create the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++- ;; ++- *) ++- # GNU C++ compiler with Solaris linker ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++- if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- else ++- # g++ 2.7 appears to require `-G' NOT `-shared' on this ++- # platform. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- fi ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- ;; ++- ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- vxworks*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ++- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++- _LT_TAGVAR(GCC, $1)="$GXX" ++- _LT_TAGVAR(LD, $1)="$LD" ++- ++- ## CAVEAT EMPTOR: ++- ## There is no encapsulation within the following macros, do not change ++- ## the running order or otherwise move them around unless you know exactly ++- ## what you are doing... ++- _LT_SYS_HIDDEN_LIBDEPS($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++- fi # test -n "$compiler" ++- ++- CC=$lt_save_CC ++- LDCXX=$LD ++- LD=$lt_save_LD ++- GCC=$lt_save_GCC ++- with_gnu_ld=$lt_save_with_gnu_ld ++- lt_cv_path_LDCXX=$lt_cv_path_LD ++- lt_cv_path_LD=$lt_save_path_LD ++- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++-fi # test "$_lt_caught_CXX_error" != yes ++- ++-AC_LANG_POP ++-])# _LT_LANG_CXX_CONFIG ++- ++- ++-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) ++-# --------------------------------- ++-# Figure out "hidden" library dependencies from verbose ++-# compiler output when linking a shared library. ++-# Parse the compiler output and extract the necessary ++-# objects, libraries and library flags. ++-m4_defun([_LT_SYS_HIDDEN_LIBDEPS], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-# Dependencies to place before and after the object being linked: ++-_LT_TAGVAR(predep_objects, $1)= ++-_LT_TAGVAR(postdep_objects, $1)= ++-_LT_TAGVAR(predeps, $1)= ++-_LT_TAGVAR(postdeps, $1)= ++-_LT_TAGVAR(compiler_lib_search_path, $1)= ++- ++-dnl we can't use the lt_simple_compile_test_code here, ++-dnl because it contains code intended for an executable, ++-dnl not a library. It's possible we should let each ++-dnl tag define a new lt_????_link_test_code variable, ++-dnl but it's only used here... ++-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF ++-int a; ++-void foo (void) { a = 0; } ++-_LT_EOF ++-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF ++-class Foo ++-{ ++-public: ++- Foo (void) { a = 0; } ++-private: ++- int a; ++-}; ++-_LT_EOF ++-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF ++- subroutine foo ++- implicit none ++- integer*4 a ++- a=0 ++- return ++- end ++-_LT_EOF ++-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF ++- subroutine foo ++- implicit none ++- integer a ++- a=0 ++- return ++- end ++-_LT_EOF ++-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF ++-public class foo { ++- private int a; ++- public void bar (void) { ++- a = 0; ++- } ++-}; ++-_LT_EOF ++-]) ++-dnl Parse the compiler output and extract the necessary ++-dnl objects, libraries and library flags. ++-if AC_TRY_EVAL(ac_compile); then ++- # Parse the compiler output and extract the necessary ++- # objects, libraries and library flags. ++- ++- # Sentinel used to keep track of whether or not we are before ++- # the conftest object file. ++- pre_test_object_deps_done=no ++- ++- for p in `eval "$output_verbose_link_cmd"`; do ++- case $p in ++- ++- -L* | -R* | -l*) ++- # Some compilers place space between "-{L,R}" and the path. ++- # Remove the space. ++- if test $p = "-L" || ++- test $p = "-R"; then ++- prev=$p ++- continue ++- else ++- prev= ++- fi ++- ++- if test "$pre_test_object_deps_done" = no; then ++- case $p in ++- -L* | -R*) ++- # Internal compiler library paths should come after those ++- # provided the user. The postdeps already come after the ++- # user supplied libs so there is no need to process them. ++- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then ++- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++- else ++- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++- fi ++- ;; ++- # The "-l" case would never come before the object being ++- # linked, so don't bother handling this case. ++- esac ++- else ++- if test -z "$_LT_TAGVAR(postdeps, $1)"; then ++- _LT_TAGVAR(postdeps, $1)="${prev}${p}" ++- else ++- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" ++- fi ++- fi ++- ;; ++- ++- *.$objext) ++- # This assumes that the test object file only shows up ++- # once in the compiler output. ++- if test "$p" = "conftest.$objext"; then ++- pre_test_object_deps_done=yes ++- continue ++- fi ++- ++- if test "$pre_test_object_deps_done" = no; then ++- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then ++- _LT_TAGVAR(predep_objects, $1)="$p" ++- else ++- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" ++- fi ++- else ++- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then ++- _LT_TAGVAR(postdep_objects, $1)="$p" ++- else ++- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" ++- fi ++- fi ++- ;; ++- ++- *) ;; # Ignore the rest. ++- ++- esac ++- done ++- ++- # Clean up. ++- rm -f a.out a.exe ++-else ++- echo "libtool.m4: error: problem compiling $1 test program" ++-fi ++- ++-$RM -f confest.$objext ++- ++-# PORTME: override above test on systems where it is broken ++-m4_if([$1], [CXX], ++-[case $host_os in ++-interix[[3-9]]*) ++- # Interix 3.5 installs completely hosed .la files for C++, so rather than ++- # hack all around it, let's just trust "g++" to DTRT. ++- _LT_TAGVAR(predep_objects,$1)= ++- _LT_TAGVAR(postdep_objects,$1)= ++- _LT_TAGVAR(postdeps,$1)= ++- ;; ++- ++-linux*) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C++ 5.9 ++- ++- # The more standards-conforming stlport4 library is ++- # incompatible with the Cstd library. Avoid specifying ++- # it if it's in CXXFLAGS. Ignore libCrun as ++- # -library=stlport4 depends on it. ++- case " $CXX $CXXFLAGS " in ++- *" -library=stlport4 "*) ++- solaris_use_stlport4=yes ++- ;; ++- esac ++- ++- if test "$solaris_use_stlport4" != yes; then ++- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++- fi ++- ;; ++- esac ++- ;; ++- ++-solaris*) ++- case $cc_basename in ++- CC*) ++- # The more standards-conforming stlport4 library is ++- # incompatible with the Cstd library. Avoid specifying ++- # it if it's in CXXFLAGS. Ignore libCrun as ++- # -library=stlport4 depends on it. ++- case " $CXX $CXXFLAGS " in ++- *" -library=stlport4 "*) ++- solaris_use_stlport4=yes ++- ;; ++- esac ++- ++- # Adding this requires a known-good setup of shared libraries for ++- # Sun compiler versions before 5.6, else PIC objects from an old ++- # archive will be linked into the output, leading to subtle bugs. ++- if test "$solaris_use_stlport4" != yes; then ++- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++- fi ++- ;; ++- esac ++- ;; ++-esac ++-]) ++- ++-case " $_LT_TAGVAR(postdeps, $1) " in ++-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++-esac ++- _LT_TAGVAR(compiler_lib_search_dirs, $1)= ++-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then ++- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++-fi ++-_LT_TAGDECL([], [compiler_lib_search_dirs], [1], ++- [The directories searched by this compiler when creating a shared library]) ++-_LT_TAGDECL([], [predep_objects], [1], ++- [Dependencies to place before and after the objects being linked to ++- create a shared library]) ++-_LT_TAGDECL([], [postdep_objects], [1]) ++-_LT_TAGDECL([], [predeps], [1]) ++-_LT_TAGDECL([], [postdeps], [1]) ++-_LT_TAGDECL([], [compiler_lib_search_path], [1], ++- [The library search path used internally by the compiler when linking ++- a shared library]) ++-])# _LT_SYS_HIDDEN_LIBDEPS ++- ++- ++-# _LT_PROG_F77 ++-# ------------ ++-# Since AC_PROG_F77 is broken, in that it returns the empty string ++-# if there is no fortran compiler, we have our own version here. ++-m4_defun([_LT_PROG_F77], ++-[ ++-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) ++-AC_PROG_F77 ++-if test -z "$F77" || test "X$F77" = "Xno"; then ++- _lt_disable_F77=yes ++-fi ++-popdef([AC_MSG_ERROR]) ++-])# _LT_PROG_F77 ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([_LT_PROG_F77], []) ++- ++- ++-# _LT_LANG_F77_CONFIG([TAG]) ++-# -------------------------- ++-# Ensure that the configuration variables for a Fortran 77 compiler are ++-# suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_F77_CONFIG], ++-[AC_REQUIRE([_LT_PROG_F77])dnl ++-AC_LANG_PUSH(Fortran 77) ++- ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_TAGVAR(allow_undefined_flag, $1)= ++-_LT_TAGVAR(always_export_symbols, $1)=no ++-_LT_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_direct, $1)=no ++-_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_TAGVAR(hardcode_automatic, $1)=no ++-_LT_TAGVAR(inherit_rpath, $1)=no ++-_LT_TAGVAR(module_cmds, $1)= ++-_LT_TAGVAR(module_expsym_cmds, $1)= ++-_LT_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_TAGVAR(no_undefined_flag, $1)= ++-_LT_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Source file extension for f77 test sources. ++-ac_ext=f ++- ++-# Object file extension for compiled f77 test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# No sense in running all these tests if we already determined that ++-# the F77 compiler isn't working. Some variables (like enable_shared) ++-# are currently assumed to apply to all compilers on this platform, ++-# and will be corrupted by setting them based on a non-working compiler. ++-if test "$_lt_disable_F77" != yes; then ++- # Code to be used in simple compile tests ++- lt_simple_compile_test_code="\ ++- subroutine t ++- return ++- end ++-" ++- ++- # Code to be used in simple link tests ++- lt_simple_link_test_code="\ ++- program t ++- end ++-" ++- ++- # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++- _LT_TAG_COMPILER ++- ++- # save warnings/boilerplate of simple test code ++- _LT_COMPILER_BOILERPLATE ++- _LT_LINKER_BOILERPLATE ++- ++- # Allow CC to be a program name with arguments. ++- lt_save_CC="$CC" ++- lt_save_GCC=$GCC ++- CC=${F77-"f77"} ++- compiler=$CC ++- _LT_TAGVAR(compiler, $1)=$CC ++- _LT_CC_BASENAME([$compiler]) ++- GCC=$G77 ++- if test -n "$compiler"; then ++- AC_MSG_CHECKING([if libtool supports shared libraries]) ++- AC_MSG_RESULT([$can_build_shared]) ++- ++- AC_MSG_CHECKING([whether to build shared libraries]) ++- test "$can_build_shared" = "no" && enable_shared=no ++- ++- # On AIX, shared libraries and static libraries use the same namespace, and ++- # are all built from PIC. ++- case $host_os in ++- aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- aix[[4-9]]*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++- esac ++- AC_MSG_RESULT([$enable_shared]) ++- ++- AC_MSG_CHECKING([whether to build static libraries]) ++- # Make sure either enable_shared or enable_static is yes. ++- test "$enable_shared" = yes || enable_static=yes ++- AC_MSG_RESULT([$enable_static]) ++- ++- _LT_TAGVAR(GCC, $1)="$G77" ++- _LT_TAGVAR(LD, $1)="$LD" ++- ++- ## CAVEAT EMPTOR: ++- ## There is no encapsulation within the following macros, do not change ++- ## the running order or otherwise move them around unless you know exactly ++- ## what you are doing... ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++- fi # test -n "$compiler" ++- ++- GCC=$lt_save_GCC ++- CC="$lt_save_CC" ++-fi # test "$_lt_disable_F77" != yes ++- ++-AC_LANG_POP ++-])# _LT_LANG_F77_CONFIG ++- ++- ++-# _LT_PROG_FC ++-# ----------- ++-# Since AC_PROG_FC is broken, in that it returns the empty string ++-# if there is no fortran compiler, we have our own version here. ++-m4_defun([_LT_PROG_FC], ++-[ ++-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) ++-AC_PROG_FC ++-if test -z "$FC" || test "X$FC" = "Xno"; then ++- _lt_disable_FC=yes ++-fi ++-popdef([AC_MSG_ERROR]) ++-])# _LT_PROG_FC ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([_LT_PROG_FC], []) ++- ++- ++-# _LT_LANG_FC_CONFIG([TAG]) ++-# ------------------------- ++-# Ensure that the configuration variables for a Fortran compiler are ++-# suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_FC_CONFIG], ++-[AC_REQUIRE([_LT_PROG_FC])dnl ++-AC_LANG_PUSH(Fortran) ++- ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_TAGVAR(allow_undefined_flag, $1)= ++-_LT_TAGVAR(always_export_symbols, $1)=no ++-_LT_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_direct, $1)=no ++-_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_TAGVAR(hardcode_automatic, $1)=no ++-_LT_TAGVAR(inherit_rpath, $1)=no ++-_LT_TAGVAR(module_cmds, $1)= ++-_LT_TAGVAR(module_expsym_cmds, $1)= ++-_LT_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_TAGVAR(no_undefined_flag, $1)= ++-_LT_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Source file extension for fc test sources. ++-ac_ext=${ac_fc_srcext-f} ++- ++-# Object file extension for compiled fc test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# No sense in running all these tests if we already determined that ++-# the FC compiler isn't working. Some variables (like enable_shared) ++-# are currently assumed to apply to all compilers on this platform, ++-# and will be corrupted by setting them based on a non-working compiler. ++-if test "$_lt_disable_FC" != yes; then ++- # Code to be used in simple compile tests ++- lt_simple_compile_test_code="\ ++- subroutine t ++- return ++- end ++-" ++- ++- # Code to be used in simple link tests ++- lt_simple_link_test_code="\ ++- program t ++- end ++-" ++- ++- # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++- _LT_TAG_COMPILER ++- ++- # save warnings/boilerplate of simple test code ++- _LT_COMPILER_BOILERPLATE ++- _LT_LINKER_BOILERPLATE ++- ++- # Allow CC to be a program name with arguments. ++- lt_save_CC="$CC" ++- lt_save_GCC=$GCC ++- CC=${FC-"f95"} ++- compiler=$CC ++- GCC=$ac_cv_fc_compiler_gnu ++- ++- _LT_TAGVAR(compiler, $1)=$CC ++- _LT_CC_BASENAME([$compiler]) ++- ++- if test -n "$compiler"; then ++- AC_MSG_CHECKING([if libtool supports shared libraries]) ++- AC_MSG_RESULT([$can_build_shared]) ++- ++- AC_MSG_CHECKING([whether to build shared libraries]) ++- test "$can_build_shared" = "no" && enable_shared=no ++- ++- # On AIX, shared libraries and static libraries use the same namespace, and ++- # are all built from PIC. ++- case $host_os in ++- aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- aix[[4-9]]*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++- esac ++- AC_MSG_RESULT([$enable_shared]) ++- ++- AC_MSG_CHECKING([whether to build static libraries]) ++- # Make sure either enable_shared or enable_static is yes. ++- test "$enable_shared" = yes || enable_static=yes ++- AC_MSG_RESULT([$enable_static]) ++- ++- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" ++- _LT_TAGVAR(LD, $1)="$LD" ++- ++- ## CAVEAT EMPTOR: ++- ## There is no encapsulation within the following macros, do not change ++- ## the running order or otherwise move them around unless you know exactly ++- ## what you are doing... ++- _LT_SYS_HIDDEN_LIBDEPS($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++- fi # test -n "$compiler" ++- ++- GCC=$lt_save_GCC ++- CC="$lt_save_CC" ++-fi # test "$_lt_disable_FC" != yes ++- ++-AC_LANG_POP ++-])# _LT_LANG_FC_CONFIG ++- ++- ++-# _LT_LANG_GCJ_CONFIG([TAG]) ++-# -------------------------- ++-# Ensure that the configuration variables for the GNU Java Compiler compiler ++-# are suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_GCJ_CONFIG], ++-[AC_REQUIRE([LT_PROG_GCJ])dnl ++-AC_LANG_SAVE ++- ++-# Source file extension for Java test sources. ++-ac_ext=java ++- ++-# Object file extension for compiled Java test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="class foo {}" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' ++- ++-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++-_LT_TAG_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-# Allow CC to be a program name with arguments. ++-lt_save_CC="$CC" ++-lt_save_GCC=$GCC ++-GCC=yes ++-CC=${GCJ-"gcj"} ++-compiler=$CC ++-_LT_TAGVAR(compiler, $1)=$CC ++-_LT_TAGVAR(LD, $1)="$LD" ++-_LT_CC_BASENAME([$compiler]) ++- ++-# GCJ did not exist at the time GCC didn't implicitly link libc in. ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++- ++-if test -n "$compiler"; then ++- _LT_COMPILER_NO_RTTI($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++-fi ++- ++-AC_LANG_RESTORE ++- ++-GCC=$lt_save_GCC ++-CC="$lt_save_CC" ++-])# _LT_LANG_GCJ_CONFIG ++- ++- ++-# _LT_LANG_RC_CONFIG([TAG]) ++-# ------------------------- ++-# Ensure that the configuration variables for the Windows resource compiler ++-# are suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_RC_CONFIG], ++-[AC_REQUIRE([LT_PROG_RC])dnl ++-AC_LANG_SAVE ++- ++-# Source file extension for RC test sources. ++-ac_ext=rc ++- ++-# Object file extension for compiled RC test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code="$lt_simple_compile_test_code" ++- ++-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++-_LT_TAG_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-# Allow CC to be a program name with arguments. ++-lt_save_CC="$CC" ++-lt_save_GCC=$GCC ++-GCC= ++-CC=${RC-"windres"} ++-compiler=$CC ++-_LT_TAGVAR(compiler, $1)=$CC ++-_LT_CC_BASENAME([$compiler]) ++-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++- ++-if test -n "$compiler"; then ++- : ++- _LT_CONFIG($1) ++-fi ++- ++-GCC=$lt_save_GCC ++-AC_LANG_RESTORE ++-CC="$lt_save_CC" ++-])# _LT_LANG_RC_CONFIG ++- ++- ++-# LT_PROG_GCJ ++-# ----------- ++-AC_DEFUN([LT_PROG_GCJ], ++-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], ++- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], ++- [AC_CHECK_TOOL(GCJ, gcj,) ++- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++- AC_SUBST(GCJFLAGS)])])[]dnl ++-]) ++- ++-# Old name: ++-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([LT_AC_PROG_GCJ], []) ++- ++- ++-# LT_PROG_RC ++-# ---------- ++-AC_DEFUN([LT_PROG_RC], ++-[AC_CHECK_TOOL(RC, windres,) ++-]) ++- ++-# Old name: ++-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([LT_AC_PROG_RC], []) ++- ++- ++-# _LT_DECL_EGREP ++-# -------------- ++-# If we don't have a new enough Autoconf to choose the best grep ++-# available, choose the one first in the user's PATH. ++-m4_defun([_LT_DECL_EGREP], ++-[AC_REQUIRE([AC_PROG_EGREP])dnl ++-AC_REQUIRE([AC_PROG_FGREP])dnl ++-test -z "$GREP" && GREP=grep ++-_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) ++-_LT_DECL([], [EGREP], [1], [An ERE matcher]) ++-_LT_DECL([], [FGREP], [1], [A literal string matcher]) ++-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too ++-AC_SUBST([GREP]) ++-]) ++- ++- ++-# _LT_DECL_OBJDUMP ++-# -------------- ++-# If we don't have a new enough Autoconf to choose the best objdump ++-# available, choose the one first in the user's PATH. ++-m4_defun([_LT_DECL_OBJDUMP], ++-[AC_CHECK_TOOL(OBJDUMP, objdump, false) ++-test -z "$OBJDUMP" && OBJDUMP=objdump ++-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) ++-AC_SUBST([OBJDUMP]) ++-]) ++- ++- ++-# _LT_DECL_SED ++-# ------------ ++-# Check for a fully-functional sed program, that truncates ++-# as few characters as possible. Prefer GNU sed if found. ++-m4_defun([_LT_DECL_SED], ++-[AC_PROG_SED ++-test -z "$SED" && SED=sed ++-Xsed="$SED -e 1s/^X//" ++-_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) ++-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], ++- [Sed that helps us avoid accidentally triggering echo(1) options like -n]) ++-])# _LT_DECL_SED ++- ++-m4_ifndef([AC_PROG_SED], [ ++-# NOTE: This macro has been submitted for inclusion into # ++-# GNU Autoconf as AC_PROG_SED. When it is available in # ++-# a released version of Autoconf we should remove this # ++-# macro and use it instead. # ++- ++-m4_defun([AC_PROG_SED], ++-[AC_MSG_CHECKING([for a sed that does not truncate output]) ++-AC_CACHE_VAL(lt_cv_path_SED, ++-[# Loop through the user's path and test for sed and gsed. ++-# Then use that list of sed's as ones to test for truncation. ++-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++-for as_dir in $PATH ++-do ++- IFS=$as_save_IFS ++- test -z "$as_dir" && as_dir=. ++- for lt_ac_prog in sed gsed; do ++- for ac_exec_ext in '' $ac_executable_extensions; do ++- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++- fi ++- done ++- done ++-done ++-IFS=$as_save_IFS ++-lt_ac_max=0 ++-lt_ac_count=0 ++-# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++-# along with /bin/sed that truncates output. ++-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++- test ! -f $lt_ac_sed && continue ++- cat /dev/null > conftest.in ++- lt_ac_count=0 ++- echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++- # Check for GNU sed and select it if it is found. ++- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++- lt_cv_path_SED=$lt_ac_sed ++- break ++- fi ++- while true; do ++- cat conftest.in conftest.in >conftest.tmp ++- mv conftest.tmp conftest.in ++- cp conftest.in conftest.nl ++- echo >>conftest.nl ++- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++- cmp -s conftest.out conftest.nl || break ++- # 10000 chars as input seems more than enough ++- test $lt_ac_count -gt 10 && break ++- lt_ac_count=`expr $lt_ac_count + 1` ++- if test $lt_ac_count -gt $lt_ac_max; then ++- lt_ac_max=$lt_ac_count ++- lt_cv_path_SED=$lt_ac_sed ++- fi ++- done ++-done ++-]) ++-SED=$lt_cv_path_SED ++-AC_SUBST([SED]) ++-AC_MSG_RESULT([$SED]) ++-])#AC_PROG_SED ++-])#m4_ifndef ++- ++-# Old name: ++-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([LT_AC_PROG_SED], []) ++- ++- ++-# _LT_CHECK_SHELL_FEATURES ++-# ------------------------ ++-# Find out whether the shell is Bourne or XSI compatible, ++-# or has some other useful features. ++-m4_defun([_LT_CHECK_SHELL_FEATURES], ++-[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) ++-# Try some XSI features ++-xsi_shell=no ++-( _lt_dummy="a/b/c" ++- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++- = c,a/b,, \ ++- && eval 'test $(( 1 + 1 )) -eq 2 \ ++- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++- && xsi_shell=yes ++-AC_MSG_RESULT([$xsi_shell]) ++-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) ++- ++-AC_MSG_CHECKING([whether the shell understands "+="]) ++-lt_shell_append=no ++-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ ++- >/dev/null 2>&1 \ ++- && lt_shell_append=yes ++-AC_MSG_RESULT([$lt_shell_append]) ++-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) ++- ++-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++- lt_unset=unset ++-else ++- lt_unset=false ++-fi ++-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl ++- ++-# test EBCDIC or ASCII ++-case `echo X|tr X '\101'` in ++- A) # ASCII based system ++- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++- lt_SP2NL='tr \040 \012' ++- lt_NL2SP='tr \015\012 \040\040' ++- ;; ++- *) # EBCDIC based system ++- lt_SP2NL='tr \100 \n' ++- lt_NL2SP='tr \r\n \100\100' ++- ;; ++-esac ++-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl ++-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ++-])# _LT_CHECK_SHELL_FEATURES ++- ++- ++-# _LT_PROG_XSI_SHELLFNS ++-# --------------------- ++-# Bourne and XSI compatible variants of some useful shell functions. ++-m4_defun([_LT_PROG_XSI_SHELLFNS], ++-[case $xsi_shell in ++- yes) ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_dirname file append nondir_replacement ++-# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++-# otherwise set result to NONDIR_REPLACEMENT. ++-func_dirname () ++-{ ++- case ${1} in ++- */*) func_dirname_result="${1%/*}${2}" ;; ++- * ) func_dirname_result="${3}" ;; ++- esac ++-} ++- ++-# func_basename file ++-func_basename () ++-{ ++- func_basename_result="${1##*/}" ++-} ++- ++-# func_dirname_and_basename file append nondir_replacement ++-# perform func_basename and func_dirname in a single function ++-# call: ++-# dirname: Compute the dirname of FILE. If nonempty, ++-# add APPEND to the result, otherwise set result ++-# to NONDIR_REPLACEMENT. ++-# value returned in "$func_dirname_result" ++-# basename: Compute filename of FILE. ++-# value retuned in "$func_basename_result" ++-# Implementation must be kept synchronized with func_dirname ++-# and func_basename. For efficiency, we do not delegate to ++-# those functions but instead duplicate the functionality here. ++-func_dirname_and_basename () ++-{ ++- case ${1} in ++- */*) func_dirname_result="${1%/*}${2}" ;; ++- * ) func_dirname_result="${3}" ;; ++- esac ++- func_basename_result="${1##*/}" ++-} ++- ++-# func_stripname prefix suffix name ++-# strip PREFIX and SUFFIX off of NAME. ++-# PREFIX and SUFFIX must not contain globbing or regex special ++-# characters, hashes, percent signs, but SUFFIX may contain a leading ++-# dot (in which case that matches only a dot). ++-func_stripname () ++-{ ++- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++- # positional parameters, so assign one to ordinary parameter first. ++- func_stripname_result=${3} ++- func_stripname_result=${func_stripname_result#"${1}"} ++- func_stripname_result=${func_stripname_result%"${2}"} ++-} ++- ++-# func_opt_split ++-func_opt_split () ++-{ ++- func_opt_split_opt=${1%%=*} ++- func_opt_split_arg=${1#*=} ++-} ++- ++-# func_lo2o object ++-func_lo2o () ++-{ ++- case ${1} in ++- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++- *) func_lo2o_result=${1} ;; ++- esac ++-} ++- ++-# func_xform libobj-or-source ++-func_xform () ++-{ ++- func_xform_result=${1%.*}.lo ++-} ++- ++-# func_arith arithmetic-term... ++-func_arith () ++-{ ++- func_arith_result=$(( $[*] )) ++-} ++- ++-# func_len string ++-# STRING may not start with a hyphen. ++-func_len () ++-{ ++- func_len_result=${#1} ++-} ++- ++-_LT_EOF ++- ;; ++- *) # Bourne compatible functions. ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_dirname file append nondir_replacement ++-# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++-# otherwise set result to NONDIR_REPLACEMENT. ++-func_dirname () ++-{ ++- # Extract subdirectory from the argument. ++- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++- if test "X$func_dirname_result" = "X${1}"; then ++- func_dirname_result="${3}" ++- else ++- func_dirname_result="$func_dirname_result${2}" ++- fi ++-} ++- ++-# func_basename file ++-func_basename () ++-{ ++- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++-} ++- ++-dnl func_dirname_and_basename ++-dnl A portable version of this function is already defined in general.m4sh ++-dnl so there is no need for it here. ++- ++-# func_stripname prefix suffix name ++-# strip PREFIX and SUFFIX off of NAME. ++-# PREFIX and SUFFIX must not contain globbing or regex special ++-# characters, hashes, percent signs, but SUFFIX may contain a leading ++-# dot (in which case that matches only a dot). ++-# func_strip_suffix prefix name ++-func_stripname () ++-{ ++- case ${2} in ++- .*) func_stripname_result=`$ECHO "X${3}" \ ++- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++- *) func_stripname_result=`$ECHO "X${3}" \ ++- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++- esac ++-} ++- ++-# sed scripts: ++-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' ++-my_sed_long_arg='1s/^-[[^=]]*=//' ++- ++-# func_opt_split ++-func_opt_split () ++-{ ++- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++-} ++- ++-# func_lo2o object ++-func_lo2o () ++-{ ++- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++-} ++- ++-# func_xform libobj-or-source ++-func_xform () ++-{ ++- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` ++-} ++- ++-# func_arith arithmetic-term... ++-func_arith () ++-{ ++- func_arith_result=`expr "$[@]"` ++-} ++- ++-# func_len string ++-# STRING may not start with a hyphen. ++-func_len () ++-{ ++- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` ++-} ++- ++-_LT_EOF ++-esac ++- ++-case $lt_shell_append in ++- yes) ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_append var value ++-# Append VALUE to the end of shell variable VAR. ++-func_append () ++-{ ++- eval "$[1]+=\$[2]" ++-} ++-_LT_EOF ++- ;; ++- *) ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_append var value ++-# Append VALUE to the end of shell variable VAR. ++-func_append () ++-{ ++- eval "$[1]=\$$[1]\$[2]" ++-} ++- ++-_LT_EOF ++- ;; ++- esac ++-]) ++- ++-# Helper functions for option handling. -*- Autoconf -*- ++-# ++-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gary V. Vaughan, 2004 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# serial 6 ltoptions.m4 ++- ++-# This is to help aclocal find these macros, as it can't see m4_define. ++-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ++- ++- ++-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) ++-# ------------------------------------------ ++-m4_define([_LT_MANGLE_OPTION], ++-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) ++- ++- ++-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) ++-# --------------------------------------- ++-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a ++-# matching handler defined, dispatch to it. Other OPTION-NAMEs are ++-# saved as a flag. ++-m4_define([_LT_SET_OPTION], ++-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl ++-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), ++- _LT_MANGLE_DEFUN([$1], [$2]), ++- [m4_warning([Unknown $1 option `$2'])])[]dnl ++-]) ++- ++- ++-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) ++-# ------------------------------------------------------------ ++-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++-m4_define([_LT_IF_OPTION], ++-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) ++- ++- ++-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) ++-# ------------------------------------------------------- ++-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME ++-# are set. ++-m4_define([_LT_UNLESS_OPTIONS], ++-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), ++- [m4_define([$0_found])])])[]dnl ++-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 ++-])[]dnl ++-]) ++- ++- ++-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) ++-# ---------------------------------------- ++-# OPTION-LIST is a space-separated list of Libtool options associated ++-# with MACRO-NAME. If any OPTION has a matching handler declared with ++-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about ++-# the unknown option and exit. ++-m4_defun([_LT_SET_OPTIONS], ++-[# Set options ++-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++- [_LT_SET_OPTION([$1], _LT_Option)]) ++- ++-m4_if([$1],[LT_INIT],[ ++- dnl ++- dnl Simply set some default values (i.e off) if boolean options were not ++- dnl specified: ++- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no ++- ]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no ++- ]) ++- dnl ++- dnl If no reference was made to various pairs of opposing options, then ++- dnl we run the default mode handler for the pair. For example, if neither ++- dnl `shared' nor `disable-shared' was passed, we enable building of shared ++- dnl archives by default: ++- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], ++- [_LT_ENABLE_FAST_INSTALL]) ++- ]) ++-])# _LT_SET_OPTIONS ++- ++- ++- ++-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) ++-# ----------------------------------------- ++-m4_define([_LT_MANGLE_DEFUN], ++-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) ++- ++- ++-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) ++-# ----------------------------------------------- ++-m4_define([LT_OPTION_DEFINE], ++-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl ++-])# LT_OPTION_DEFINE ++- ++- ++-# dlopen ++-# ------ ++-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ++-]) ++- ++-AU_DEFUN([AC_LIBTOOL_DLOPEN], ++-[_LT_SET_OPTION([LT_INIT], [dlopen]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you ++-put the `dlopen' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) ++- ++- ++-# win32-dll ++-# --------- ++-# Declare package support for building win32 dll's. ++-LT_OPTION_DEFINE([LT_INIT], [win32-dll], ++-[enable_win32_dll=yes ++- ++-case $host in ++-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++- AC_CHECK_TOOL(AS, as, false) ++- AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++- ;; ++-esac ++- ++-test -z "$AS" && AS=as ++-_LT_DECL([], [AS], [0], [Assembler program])dnl ++- ++-test -z "$DLLTOOL" && DLLTOOL=dlltool ++-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl ++- ++-test -z "$OBJDUMP" && OBJDUMP=objdump ++-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ++-])# win32-dll ++- ++-AU_DEFUN([AC_LIBTOOL_WIN32_DLL], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-_LT_SET_OPTION([LT_INIT], [win32-dll]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you ++-put the `win32-dll' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) ++- ++- ++-# _LT_ENABLE_SHARED([DEFAULT]) ++-# ---------------------------- ++-# implement the --enable-shared flag, and supports the `shared' and ++-# `disable-shared' LT_INIT options. ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-m4_define([_LT_ENABLE_SHARED], ++-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl ++-AC_ARG_ENABLE([shared], ++- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_shared=yes ;; ++- no) enable_shared=no ;; ++- *) ++- enable_shared=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_shared=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) ++- ++- _LT_DECL([build_libtool_libs], [enable_shared], [0], ++- [Whether or not to build shared libraries]) ++-])# _LT_ENABLE_SHARED ++- ++-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) ++- ++-# Old names: ++-AC_DEFUN([AC_ENABLE_SHARED], ++-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++-]) ++- ++-AC_DEFUN([AC_DISABLE_SHARED], ++-[_LT_SET_OPTION([LT_INIT], [disable-shared]) ++-]) ++- ++-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AM_ENABLE_SHARED], []) ++-dnl AC_DEFUN([AM_DISABLE_SHARED], []) ++- ++- ++- ++-# _LT_ENABLE_STATIC([DEFAULT]) ++-# ---------------------------- ++-# implement the --enable-static flag, and support the `static' and ++-# `disable-static' LT_INIT options. ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-m4_define([_LT_ENABLE_STATIC], ++-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl ++-AC_ARG_ENABLE([static], ++- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_static=yes ;; ++- no) enable_static=no ;; ++- *) ++- enable_static=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_static=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_static=]_LT_ENABLE_STATIC_DEFAULT) ++- ++- _LT_DECL([build_old_libs], [enable_static], [0], ++- [Whether or not to build static libraries]) ++-])# _LT_ENABLE_STATIC ++- ++-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) ++- ++-# Old names: ++-AC_DEFUN([AC_ENABLE_STATIC], ++-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ++-]) ++- ++-AC_DEFUN([AC_DISABLE_STATIC], ++-[_LT_SET_OPTION([LT_INIT], [disable-static]) ++-]) ++- ++-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AM_ENABLE_STATIC], []) ++-dnl AC_DEFUN([AM_DISABLE_STATIC], []) ++- ++- ++- ++-# _LT_ENABLE_FAST_INSTALL([DEFAULT]) ++-# ---------------------------------- ++-# implement the --enable-fast-install flag, and support the `fast-install' ++-# and `disable-fast-install' LT_INIT options. ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-m4_define([_LT_ENABLE_FAST_INSTALL], ++-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl ++-AC_ARG_ENABLE([fast-install], ++- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_fast_install=yes ;; ++- no) enable_fast_install=no ;; ++- *) ++- enable_fast_install=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_fast_install=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) ++- ++-_LT_DECL([fast_install], [enable_fast_install], [0], ++- [Whether or not to optimize for fast installation])dnl ++-])# _LT_ENABLE_FAST_INSTALL ++- ++-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) ++- ++-# Old names: ++-AU_DEFUN([AC_ENABLE_FAST_INSTALL], ++-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++-the `fast-install' option into LT_INIT's first parameter.]) ++-]) ++- ++-AU_DEFUN([AC_DISABLE_FAST_INSTALL], ++-[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++-the `disable-fast-install' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) ++-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) ++- ++- ++-# _LT_WITH_PIC([MODE]) ++-# -------------------- ++-# implement the --with-pic flag, and support the `pic-only' and `no-pic' ++-# LT_INIT options. ++-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++-m4_define([_LT_WITH_PIC], ++-[AC_ARG_WITH([pic], ++- [AS_HELP_STRING([--with-pic], ++- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++- [pic_mode="$withval"], ++- [pic_mode=default]) ++- ++-test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) ++- ++-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ++-])# _LT_WITH_PIC ++- ++-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) ++- ++-# Old name: ++-AU_DEFUN([AC_LIBTOOL_PICMODE], ++-[_LT_SET_OPTION([LT_INIT], [pic-only]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you ++-put the `pic-only' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) ++- ++- ++-m4_define([_LTDL_MODE], []) ++-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], ++- [m4_define([_LTDL_MODE], [nonrecursive])]) ++-LT_OPTION_DEFINE([LTDL_INIT], [recursive], ++- [m4_define([_LTDL_MODE], [recursive])]) ++-LT_OPTION_DEFINE([LTDL_INIT], [subproject], ++- [m4_define([_LTDL_MODE], [subproject])]) ++- ++-m4_define([_LTDL_TYPE], []) ++-LT_OPTION_DEFINE([LTDL_INIT], [installable], ++- [m4_define([_LTDL_TYPE], [installable])]) ++-LT_OPTION_DEFINE([LTDL_INIT], [convenience], ++- [m4_define([_LTDL_TYPE], [convenience])]) ++- ++-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- ++-# ++-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gary V. Vaughan, 2004 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# serial 6 ltsugar.m4 ++- ++-# This is to help aclocal find these macros, as it can't see m4_define. ++-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) ++- ++- ++-# lt_join(SEP, ARG1, [ARG2...]) ++-# ----------------------------- ++-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their ++-# associated separator. ++-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier ++-# versions in m4sugar had bugs. ++-m4_define([lt_join], ++-[m4_if([$#], [1], [], ++- [$#], [2], [[$2]], ++- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) ++-m4_define([_lt_join], ++-[m4_if([$#$2], [2], [], ++- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) ++- ++- ++-# lt_car(LIST) ++-# lt_cdr(LIST) ++-# ------------ ++-# Manipulate m4 lists. ++-# These macros are necessary as long as will still need to support ++-# Autoconf-2.59 which quotes differently. ++-m4_define([lt_car], [[$1]]) ++-m4_define([lt_cdr], ++-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], ++- [$#], 1, [], ++- [m4_dquote(m4_shift($@))])]) ++-m4_define([lt_unquote], $1) ++- ++- ++-# lt_append(MACRO-NAME, STRING, [SEPARATOR]) ++-# ------------------------------------------ ++-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. ++-# Note that neither SEPARATOR nor STRING are expanded; they are appended ++-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). ++-# No SEPARATOR is output if MACRO-NAME was previously undefined (different ++-# than defined and empty). ++-# ++-# This macro is needed until we can rely on Autoconf 2.62, since earlier ++-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. ++-m4_define([lt_append], ++-[m4_define([$1], ++- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) ++- ++- ++- ++-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) ++-# ---------------------------------------------------------- ++-# Produce a SEP delimited list of all paired combinations of elements of ++-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list ++-# has the form PREFIXmINFIXSUFFIXn. ++-# Needed until we can rely on m4_combine added in Autoconf 2.62. ++-m4_define([lt_combine], ++-[m4_if(m4_eval([$# > 3]), [1], ++- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl ++-[[m4_foreach([_Lt_prefix], [$2], ++- [m4_foreach([_Lt_suffix], ++- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, ++- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) ++- ++- ++-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) ++-# ----------------------------------------------------------------------- ++-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited ++-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. ++-m4_define([lt_if_append_uniq], ++-[m4_ifdef([$1], ++- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], ++- [lt_append([$1], [$2], [$3])$4], ++- [$5])], ++- [lt_append([$1], [$2], [$3])$4])]) ++- ++- ++-# lt_dict_add(DICT, KEY, VALUE) ++-# ----------------------------- ++-m4_define([lt_dict_add], ++-[m4_define([$1($2)], [$3])]) ++- ++- ++-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) ++-# -------------------------------------------- ++-m4_define([lt_dict_add_subkey], ++-[m4_define([$1($2:$3)], [$4])]) ++- ++- ++-# lt_dict_fetch(DICT, KEY, [SUBKEY]) ++-# ---------------------------------- ++-m4_define([lt_dict_fetch], ++-[m4_ifval([$3], ++- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), ++- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) ++- ++- ++-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) ++-# ----------------------------------------------------------------- ++-m4_define([lt_if_dict_fetch], ++-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], ++- [$5], ++- [$6])]) ++- ++- ++-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) ++-# -------------------------------------------------------------- ++-m4_define([lt_dict_filter], ++-[m4_if([$5], [], [], ++- [lt_join(m4_quote(m4_default([$4], [[, ]])), ++- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), ++- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ++-]) ++- ++-# ltversion.m4 -- version numbers -*- Autoconf -*- ++-# ++-# Copyright (C) 2004 Free Software Foundation, Inc. ++-# Written by Scott James Remnant, 2004 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# Generated from ltversion.in. ++- ++-# serial 3017 ltversion.m4 ++-# This file is part of GNU Libtool ++- ++-m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++-m4_define([LT_PACKAGE_REVISION], [1.3017]) ++- ++-AC_DEFUN([LTVERSION_VERSION], ++-[macro_version='2.2.6b' ++-macro_revision='1.3017' ++-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) ++-_LT_DECL(, macro_revision, 0) ++-]) ++- ++-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- ++-# ++-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++-# Written by Scott James Remnant, 2004. ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# serial 4 lt~obsolete.m4 ++- ++-# These exist entirely to fool aclocal when bootstrapping libtool. ++-# ++-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++-# which have later been changed to m4_define as they aren't part of the ++-# exported API, or moved to Autoconf or Automake where they belong. ++-# ++-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN ++-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us ++-# using a macro with the same name in our local m4/libtool.m4 it'll ++-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define ++-# and doesn't know about Autoconf macros at all.) ++-# ++-# So we provide this file, which has a silly filename so it's always ++-# included after everything else. This provides aclocal with the ++-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything ++-# because those macros already exist, or will be overwritten later. ++-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. ++-# ++-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. ++-# Yes, that means every name once taken will need to remain here until ++-# we give up compatibility with versions before 1.7, at which point ++-# we need to keep only those names which we still refer to. ++- ++-# This is to help aclocal find these macros, as it can't see m4_define. ++-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) ++- ++-m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) ++-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) ++-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) ++-m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) ++-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) ++-m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) ++-m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) ++-m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) ++-m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) ++-m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) ++-m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) ++-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) ++-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) ++-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) ++-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) ++-m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) ++-m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) ++-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) ++-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) ++-m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) ++-m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) ++-m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) ++-m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) ++-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) ++-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) ++-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) ++-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) ++-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) ++-m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) ++-m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) ++-m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) ++-m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) ++-m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) ++-m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) ++-m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) ++-m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) ++-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) ++-m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) ++-m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) ++-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) ++-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) ++-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) ++-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) ++-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) ++ ++ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++ # serial 1 (pkg-config-0.24) +diff --git a/feeds/packages/libs/orbit2/patches/.svn/text-base/010-dont-run-testprograms.patch.svn-base b/feeds/packages/libs/orbit2/patches/.svn/text-base/010-dont-run-testprograms.patch.svn-base +new file mode 100644 +index 0000000..5e105f2 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/patches/.svn/text-base/010-dont-run-testprograms.patch.svn-base +@@ -0,0 +1,28 @@ ++--- ORBit2-2.14.19/configure.in 2010-07-01 15:57:01.000000000 +0200 +++++ ORBit2-2.14.19.new/configure.in 2012-12-11 14:02:51.624767158 +0100 ++@@ -213,25 +213,6 @@ ++ AC_C_BIGENDIAN ++ ++ ++-dnl ++-dnl So many people with broken linking setups asked about this ++-dnl it turned out to be necessary to check for this. ++-dnl ++-dofus_save_libs="$LIBS" ++-LIBS="$ORBIT_LIBS $LIBS" ++-AC_TRY_RUN([ #include ++- main () ++- { ++- return 0; ++- } ],, ++- AC_MSG_ERROR([ ++-Linking is badly borked on your system. Please ensure your library path is correct ++-Check config.log for details - check near the end of the log above 'failed program was' ++-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the ++-prefix you're compiling on: '${prefix}' ]), ++-AC_MSG_WARN([Could not check for borked linking while cross-compiling])) ++-LIBS="$dofus_save_libs" ++- ++ orig_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" ++ AC_CHECK_ALIGNOF(CORBA_octet) +diff --git a/feeds/packages/libs/orbit2/patches/001-remove-libtool.patch b/feeds/packages/libs/orbit2/patches/001-remove-libtool.patch +new file mode 100644 +index 0000000..7bfccf4 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/patches/001-remove-libtool.patch +@@ -0,0 +1,7954 @@ ++diff -urN ORBit2-2.14.19/aclocal.m4 ORBit2-2.14.19.new/aclocal.m4 ++--- ORBit2-2.14.19/aclocal.m4 2010-09-28 11:39:36.000000000 +0200 +++++ ORBit2-2.14.19.new/aclocal.m4 2012-12-11 14:00:59.824764295 +0100 ++@@ -989,7950 +989,6 @@ ++ AC_SUBST([am__untar]) ++ ]) # _AM_PROG_TAR ++ ++-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++-# ++-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++-# 2006, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gordon Matzigkeit, 1996 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-m4_define([_LT_COPYING], [dnl ++-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++-# 2006, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gordon Matzigkeit, 1996 ++-# ++-# This file is part of GNU Libtool. ++-# ++-# GNU Libtool 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. ++-# ++-# As a special exception to the GNU General Public License, ++-# if you distribute this file as part of a program or library that ++-# is built using GNU Libtool, you may include this file under the ++-# same distribution terms that you use for the rest of that program. ++-# ++-# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++-# obtained by writing to the Free Software Foundation, Inc., ++-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++-]) ++- ++-# serial 56 LT_INIT ++- ++- ++-# LT_PREREQ(VERSION) ++-# ------------------ ++-# Complain and exit if this libtool version is less that VERSION. ++-m4_defun([LT_PREREQ], ++-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++- [m4_default([$3], ++- [m4_fatal([Libtool version $1 or higher is required], ++- 63)])], ++- [$2])]) ++- ++- ++-# _LT_CHECK_BUILDDIR ++-# ------------------ ++-# Complain if the absolute build directory name contains unusual characters ++-m4_defun([_LT_CHECK_BUILDDIR], ++-[case `pwd` in ++- *\ * | *\ *) ++- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++-esac ++-]) ++- ++- ++-# LT_INIT([OPTIONS]) ++-# ------------------ ++-AC_DEFUN([LT_INIT], ++-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++-AC_BEFORE([$0], [LT_LANG])dnl ++-AC_BEFORE([$0], [LT_OUTPUT])dnl ++-AC_BEFORE([$0], [LTDL_INIT])dnl ++-m4_require([_LT_CHECK_BUILDDIR])dnl ++- ++-dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++-dnl unless we require an AC_DEFUNed macro: ++-AC_REQUIRE([LTOPTIONS_VERSION])dnl ++-AC_REQUIRE([LTSUGAR_VERSION])dnl ++-AC_REQUIRE([LTVERSION_VERSION])dnl ++-AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++-m4_require([_LT_PROG_LTMAIN])dnl ++- ++-dnl Parse OPTIONS ++-_LT_SET_OPTIONS([$0], [$1]) ++- ++-# This can be used to rebuild libtool when needed ++-LIBTOOL_DEPS="$ltmain" ++- ++-# Always use our own libtool. ++-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++-AC_SUBST(LIBTOOL)dnl ++- ++-_LT_SETUP ++- ++-# Only expand once: ++-m4_define([LT_INIT]) ++-])# LT_INIT ++- ++-# Old names: ++-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++-dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++- ++- ++-# _LT_CC_BASENAME(CC) ++-# ------------------- ++-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++-m4_defun([_LT_CC_BASENAME], ++-[for cc_temp in $1""; do ++- case $cc_temp in ++- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++- \-*) ;; ++- *) break;; ++- esac ++-done ++-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++-]) ++- ++- ++-# _LT_FILEUTILS_DEFAULTS ++-# ---------------------- ++-# It is okay to use these file commands and assume they have been set ++-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++-m4_defun([_LT_FILEUTILS_DEFAULTS], ++-[: ${CP="cp -f"} ++-: ${MV="mv -f"} ++-: ${RM="rm -f"} ++-])# _LT_FILEUTILS_DEFAULTS ++- ++- ++-# _LT_SETUP ++-# --------- ++-m4_defun([_LT_SETUP], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-_LT_DECL([], [host_alias], [0], [The host system])dnl ++-_LT_DECL([], [host], [0])dnl ++-_LT_DECL([], [host_os], [0])dnl ++-dnl ++-_LT_DECL([], [build_alias], [0], [The build system])dnl ++-_LT_DECL([], [build], [0])dnl ++-_LT_DECL([], [build_os], [0])dnl ++-dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([LT_PATH_LD])dnl ++-AC_REQUIRE([LT_PATH_NM])dnl ++-dnl ++-AC_REQUIRE([AC_PROG_LN_S])dnl ++-test -z "$LN_S" && LN_S="ln -s" ++-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++-dnl ++-AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++-dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++-m4_require([_LT_CMD_RELOAD])dnl ++-m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++-m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++- ++-_LT_CONFIG_LIBTOOL_INIT([ ++-# See if we are running on zsh, and set the options which allow our ++-# commands through without removal of \ escapes INIT. ++-if test -n "\${ZSH_VERSION+set}" ; then ++- setopt NO_GLOB_SUBST ++-fi ++-]) ++-if test -n "${ZSH_VERSION+set}" ; then ++- setopt NO_GLOB_SUBST ++-fi ++- ++-_LT_CHECK_OBJDIR ++- ++-m4_require([_LT_TAG_COMPILER])dnl ++-_LT_PROG_ECHO_BACKSLASH ++- ++-case $host_os in ++-aix3*) ++- # AIX sometimes has problems with the GCC collect2 program. For some ++- # reason, if we set the COLLECT_NAMES environment variable, the problems ++- # vanish in a puff of smoke. ++- if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++- fi ++- ;; ++-esac ++- ++-# Sed substitution that helps us do robust quoting. It backslashifies ++-# metacharacters that are still active within double-quoted strings. ++-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++- ++-# Same as above, but do not quote variable references. ++-double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++- ++-# Sed substitution to delay expansion of an escaped shell variable in a ++-# double_quote_subst'ed string. ++-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++- ++-# Sed substitution to delay expansion of an escaped single quote. ++-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++- ++-# Sed substitution to avoid accidental globbing in evaled expressions ++-no_glob_subst='s/\*/\\\*/g' ++- ++-# Global variables: ++-ofile=libtool ++-can_build_shared=yes ++- ++-# All known linkers require a `.a' archive for static linking (except MSVC, ++-# which needs '.lib'). ++-libext=a ++- ++-with_gnu_ld="$lt_cv_prog_gnu_ld" ++- ++-old_CC="$CC" ++-old_CFLAGS="$CFLAGS" ++- ++-# Set sane defaults for various variables ++-test -z "$CC" && CC=cc ++-test -z "$LTCC" && LTCC=$CC ++-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++-test -z "$LD" && LD=ld ++-test -z "$ac_objext" && ac_objext=o ++- ++-_LT_CC_BASENAME([$compiler]) ++- ++-# Only perform the check for file, if the check method requires it ++-test -z "$MAGIC_CMD" && MAGIC_CMD=file ++-case $deplibs_check_method in ++-file_magic*) ++- if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++- _LT_PATH_MAGIC ++- fi ++- ;; ++-esac ++- ++-# Use C for the default configuration in the libtool script ++-LT_SUPPORTED_TAG([CC]) ++-_LT_LANG_C_CONFIG ++-_LT_LANG_DEFAULT_CONFIG ++-_LT_CONFIG_COMMANDS ++-])# _LT_SETUP ++- ++- ++-# _LT_PROG_LTMAIN ++-# --------------- ++-# Note that this code is called both from `configure', and `config.status' ++-# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++-# `config.status' has no value for ac_aux_dir unless we are using Automake, ++-# so we pass a copy along to make sure it has a sensible value anyway. ++-m4_defun([_LT_PROG_LTMAIN], ++-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++-ltmain="$ac_aux_dir/ltmain.sh" ++-])# _LT_PROG_LTMAIN ++- ++- ++- ++-# So that we can recreate a full libtool script including additional ++-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++-# in macros and then make a single call at the end using the `libtool' ++-# label. ++- ++- ++-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++-# ---------------------------------------- ++-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++-m4_define([_LT_CONFIG_LIBTOOL_INIT], ++-[m4_ifval([$1], ++- [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++- [$1 ++-])])]) ++- ++-# Initialize. ++-m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++- ++- ++-# _LT_CONFIG_LIBTOOL([COMMANDS]) ++-# ------------------------------ ++-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++-m4_define([_LT_CONFIG_LIBTOOL], ++-[m4_ifval([$1], ++- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++- [$1 ++-])])]) ++- ++-# Initialize. ++-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++- ++- ++-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++-# ----------------------------------------------------- ++-m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++-[_LT_CONFIG_LIBTOOL([$1]) ++-_LT_CONFIG_LIBTOOL_INIT([$2]) ++-]) ++- ++- ++-# _LT_FORMAT_COMMENT([COMMENT]) ++-# ----------------------------- ++-# Add leading comment marks to the start of each line, and a trailing ++-# full-stop to the whole comment if one is not present already. ++-m4_define([_LT_FORMAT_COMMENT], ++-[m4_ifval([$1], [ ++-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++-)]) ++- ++- ++- ++- ++- ++-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++-# ------------------------------------------------------------------- ++-# CONFIGNAME is the name given to the value in the libtool script. ++-# VARNAME is the (base) name used in the configure script. ++-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++-# VARNAME. Any other value will be used directly. ++-m4_define([_LT_DECL], ++-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++- [m4_ifval([$1], [$1], [$2])]) ++- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++- m4_ifval([$4], ++- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++- lt_dict_add_subkey([lt_decl_dict], [$2], ++- [tagged?], [m4_ifval([$5], [yes], [no])])]) ++-]) ++- ++- ++-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++-# -------------------------------------------------------- ++-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++- ++- ++-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++-# ------------------------------------------------ ++-m4_define([lt_decl_tag_varnames], ++-[_lt_decl_filter([tagged?], [yes], $@)]) ++- ++- ++-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++-# --------------------------------------------------------- ++-m4_define([_lt_decl_filter], ++-[m4_case([$#], ++- [0], [m4_fatal([$0: too few arguments: $#])], ++- [1], [m4_fatal([$0: too few arguments: $#: $1])], ++- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++- [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++-]) ++- ++- ++-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++-# -------------------------------------------------- ++-m4_define([lt_decl_quote_varnames], ++-[_lt_decl_filter([value], [1], $@)]) ++- ++- ++-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++-# --------------------------------------------------- ++-m4_define([lt_decl_dquote_varnames], ++-[_lt_decl_filter([value], [2], $@)]) ++- ++- ++-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++-# --------------------------------------------------- ++-m4_define([lt_decl_varnames_tagged], ++-[m4_assert([$# <= 2])dnl ++-_$0(m4_quote(m4_default([$1], [[, ]])), ++- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++-m4_define([_lt_decl_varnames_tagged], ++-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++- ++- ++-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++-# ------------------------------------------------ ++-m4_define([lt_decl_all_varnames], ++-[_$0(m4_quote(m4_default([$1], [[, ]])), ++- m4_if([$2], [], ++- m4_quote(lt_decl_varnames), ++- m4_quote(m4_shift($@))))[]dnl ++-]) ++-m4_define([_lt_decl_all_varnames], ++-[lt_join($@, lt_decl_varnames_tagged([$1], ++- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++-]) ++- ++- ++-# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++-# ------------------------------------ ++-# Quote a variable value, and forward it to `config.status' so that its ++-# declaration there will have the same value as in `configure'. VARNAME ++-# must have a single quote delimited value for this to work. ++-m4_define([_LT_CONFIG_STATUS_DECLARE], ++-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++- ++- ++-# _LT_CONFIG_STATUS_DECLARATIONS ++-# ------------------------------ ++-# We delimit libtool config variables with single quotes, so when ++-# we write them to config.status, we have to be sure to quote all ++-# embedded single quotes properly. In configure, this macro expands ++-# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++-# ++-# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++- ++- ++-# _LT_LIBTOOL_TAGS ++-# ---------------- ++-# Output comment and list of tags supported by the script ++-m4_defun([_LT_LIBTOOL_TAGS], ++-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++-available_tags="_LT_TAGS"dnl ++-]) ++- ++- ++-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++-# ----------------------------------- ++-# Extract the dictionary values for VARNAME (optionally with TAG) and ++-# expand to a commented shell variable setting: ++-# ++-# # Some comment about what VAR is for. ++-# visible_name=$lt_internal_name ++-m4_define([_LT_LIBTOOL_DECLARE], ++-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++- [description])))[]dnl ++-m4_pushdef([_libtool_name], ++- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++- [0], [_libtool_name=[$]$1], ++- [1], [_libtool_name=$lt_[]$1], ++- [2], [_libtool_name=$lt_[]$1], ++- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++-]) ++- ++- ++-# _LT_LIBTOOL_CONFIG_VARS ++-# ----------------------- ++-# Produce commented declarations of non-tagged libtool config variables ++-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++-# section) are produced by _LT_LIBTOOL_TAG_VARS. ++-m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++-[m4_foreach([_lt_var], ++- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++- ++- ++-# _LT_LIBTOOL_TAG_VARS(TAG) ++-# ------------------------- ++-m4_define([_LT_LIBTOOL_TAG_VARS], ++-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++- ++- ++-# _LT_TAGVAR(VARNAME, [TAGNAME]) ++-# ------------------------------ ++-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++- ++- ++-# _LT_CONFIG_COMMANDS ++-# ------------------- ++-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++-# variables for single and double quote escaping we saved from calls ++-# to _LT_DECL, we can put quote escaped variables declarations ++-# into `config.status', and then the shell code to quote escape them in ++-# for loops in `config.status'. Finally, any additional code accumulated ++-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++-m4_defun([_LT_CONFIG_COMMANDS], ++-[AC_PROVIDE_IFELSE([LT_OUTPUT], ++- dnl If the libtool generation code has been placed in $CONFIG_LT, ++- dnl instead of duplicating it all over again into config.status, ++- dnl then we will have config.status run $CONFIG_LT later, so it ++- dnl needs to know what name is stored there: ++- [AC_CONFIG_COMMANDS([libtool], ++- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++- dnl If the libtool generation code is destined for config.status, ++- dnl expand the accumulated commands and init code now: ++- [AC_CONFIG_COMMANDS([libtool], ++- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++-])#_LT_CONFIG_COMMANDS ++- ++- ++-# Initialize. ++-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++-[ ++- ++-# The HP-UX ksh and POSIX shell print the target directory to stdout ++-# if CDPATH is set. ++-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++- ++-sed_quote_subst='$sed_quote_subst' ++-double_quote_subst='$double_quote_subst' ++-delay_variable_subst='$delay_variable_subst' ++-_LT_CONFIG_STATUS_DECLARATIONS ++-LTCC='$LTCC' ++-LTCFLAGS='$LTCFLAGS' ++-compiler='$compiler_DEFAULT' ++- ++-# Quote evaled strings. ++-for var in lt_decl_all_varnames([[ \ ++-]], lt_decl_quote_varnames); do ++- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++- *[[\\\\\\\`\\"\\\$]]*) ++- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++- ;; ++- *) ++- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++- ;; ++- esac ++-done ++- ++-# Double-quote double-evaled strings. ++-for var in lt_decl_all_varnames([[ \ ++-]], lt_decl_dquote_varnames); do ++- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++- *[[\\\\\\\`\\"\\\$]]*) ++- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++- ;; ++- *) ++- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++- ;; ++- esac ++-done ++- ++-# Fix-up fallback echo if it was mangled by the above quoting rules. ++-case \$lt_ECHO in ++-*'\\\[$]0 --fallback-echo"')dnl " ++- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++- ;; ++-esac ++- ++-_LT_OUTPUT_LIBTOOL_INIT ++-]) ++- ++- ++-# LT_OUTPUT ++-# --------- ++-# This macro allows early generation of the libtool script (before ++-# AC_OUTPUT is called), incase it is used in configure for compilation ++-# tests. ++-AC_DEFUN([LT_OUTPUT], ++-[: ${CONFIG_LT=./config.lt} ++-AC_MSG_NOTICE([creating $CONFIG_LT]) ++-cat >"$CONFIG_LT" <<_LTEOF ++-#! $SHELL ++-# Generated by $as_me. ++-# Run this file to recreate a libtool stub with the current configuration. ++- ++-lt_cl_silent=false ++-SHELL=\${CONFIG_SHELL-$SHELL} ++-_LTEOF ++- ++-cat >>"$CONFIG_LT" <<\_LTEOF ++-AS_SHELL_SANITIZE ++-_AS_PREPARE ++- ++-exec AS_MESSAGE_FD>&1 ++-exec AS_MESSAGE_LOG_FD>>config.log ++-{ ++- echo ++- AS_BOX([Running $as_me.]) ++-} >&AS_MESSAGE_LOG_FD ++- ++-lt_cl_help="\ ++-\`$as_me' creates a local libtool stub from the current configuration, ++-for use in further configure time tests before the real libtool is ++-generated. ++- ++-Usage: $[0] [[OPTIONS]] ++- ++- -h, --help print this help, then exit ++- -V, --version print version number, then exit ++- -q, --quiet do not print progress messages ++- -d, --debug don't remove temporary files ++- ++-Report bugs to ." ++- ++-lt_cl_version="\ ++-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++-configured by $[0], generated by m4_PACKAGE_STRING. ++- ++-Copyright (C) 2008 Free Software Foundation, Inc. ++-This config.lt script is free software; the Free Software Foundation ++-gives unlimited permision to copy, distribute and modify it." ++- ++-while test $[#] != 0 ++-do ++- case $[1] in ++- --version | --v* | -V ) ++- echo "$lt_cl_version"; exit 0 ;; ++- --help | --h* | -h ) ++- echo "$lt_cl_help"; exit 0 ;; ++- --debug | --d* | -d ) ++- debug=: ;; ++- --quiet | --q* | --silent | --s* | -q ) ++- lt_cl_silent=: ;; ++- ++- -*) AC_MSG_ERROR([unrecognized option: $[1] ++-Try \`$[0] --help' for more information.]) ;; ++- ++- *) AC_MSG_ERROR([unrecognized argument: $[1] ++-Try \`$[0] --help' for more information.]) ;; ++- esac ++- shift ++-done ++- ++-if $lt_cl_silent; then ++- exec AS_MESSAGE_FD>/dev/null ++-fi ++-_LTEOF ++- ++-cat >>"$CONFIG_LT" <<_LTEOF ++-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++-_LTEOF ++- ++-cat >>"$CONFIG_LT" <<\_LTEOF ++-AC_MSG_NOTICE([creating $ofile]) ++-_LT_OUTPUT_LIBTOOL_COMMANDS ++-AS_EXIT(0) ++-_LTEOF ++-chmod +x "$CONFIG_LT" ++- ++-# configure is writing to config.log, but config.lt does its own redirection, ++-# appending to config.log, which fails on DOS, as config.log is still kept ++-# open by configure. Here we exec the FD to /dev/null, effectively closing ++-# config.log, so it can be properly (re)opened and appended to by config.lt. ++-if test "$no_create" != yes; then ++- lt_cl_success=: ++- test "$silent" = yes && ++- lt_config_lt_args="$lt_config_lt_args --quiet" ++- exec AS_MESSAGE_LOG_FD>/dev/null ++- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++- exec AS_MESSAGE_LOG_FD>>config.log ++- $lt_cl_success || AS_EXIT(1) ++-fi ++-])# LT_OUTPUT ++- ++- ++-# _LT_CONFIG(TAG) ++-# --------------- ++-# If TAG is the built-in tag, create an initial libtool script with a ++-# default configuration from the untagged config vars. Otherwise add code ++-# to config.status for appending the configuration named by TAG from the ++-# matching tagged config vars. ++-m4_defun([_LT_CONFIG], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-_LT_CONFIG_SAVE_COMMANDS([ ++- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++- m4_if(_LT_TAG, [C], [ ++- # See if we are running on zsh, and set the options which allow our ++- # commands through without removal of \ escapes. ++- if test -n "${ZSH_VERSION+set}" ; then ++- setopt NO_GLOB_SUBST ++- fi ++- ++- cfgfile="${ofile}T" ++- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++- $RM "$cfgfile" ++- ++- cat <<_LT_EOF >> "$cfgfile" ++-#! $SHELL ++- ++-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++-# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++-# ++-_LT_COPYING ++-_LT_LIBTOOL_TAGS ++- ++-# ### BEGIN LIBTOOL CONFIG ++-_LT_LIBTOOL_CONFIG_VARS ++-_LT_LIBTOOL_TAG_VARS ++-# ### END LIBTOOL CONFIG ++- ++-_LT_EOF ++- ++- case $host_os in ++- aix3*) ++- cat <<\_LT_EOF >> "$cfgfile" ++-# AIX sometimes has problems with the GCC collect2 program. For some ++-# reason, if we set the COLLECT_NAMES environment variable, the problems ++-# vanish in a puff of smoke. ++-if test "X${COLLECT_NAMES+set}" != Xset; then ++- COLLECT_NAMES= ++- export COLLECT_NAMES ++-fi ++-_LT_EOF ++- ;; ++- esac ++- ++- _LT_PROG_LTMAIN ++- ++- # We use sed instead of cat because bash on DJGPP gets confused if ++- # if finds mixed CR/LF and LF-only lines. Since sed operates in ++- # text mode, it properly converts lines to CR/LF. This bash problem ++- # is reportedly fixed, but why not run on old versions too? ++- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++- || (rm -f "$cfgfile"; exit 1) ++- ++- _LT_PROG_XSI_SHELLFNS ++- ++- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++- || (rm -f "$cfgfile"; exit 1) ++- ++- mv -f "$cfgfile" "$ofile" || ++- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++- chmod +x "$ofile" ++-], ++-[cat <<_LT_EOF >> "$ofile" ++- ++-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++-dnl in a comment (ie after a #). ++-# ### BEGIN LIBTOOL TAG CONFIG: $1 ++-_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++-# ### END LIBTOOL TAG CONFIG: $1 ++-_LT_EOF ++-])dnl /m4_if ++-], ++-[m4_if([$1], [], [ ++- PACKAGE='$PACKAGE' ++- VERSION='$VERSION' ++- TIMESTAMP='$TIMESTAMP' ++- RM='$RM' ++- ofile='$ofile'], []) ++-])dnl /_LT_CONFIG_SAVE_COMMANDS ++-])# _LT_CONFIG ++- ++- ++-# LT_SUPPORTED_TAG(TAG) ++-# --------------------- ++-# Trace this macro to discover what tags are supported by the libtool ++-# --tag option, using: ++-# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++-AC_DEFUN([LT_SUPPORTED_TAG], []) ++- ++- ++-# C support is built-in for now ++-m4_define([_LT_LANG_C_enabled], []) ++-m4_define([_LT_TAGS], []) ++- ++- ++-# LT_LANG(LANG) ++-# ------------- ++-# Enable libtool support for the given language if not already enabled. ++-AC_DEFUN([LT_LANG], ++-[AC_BEFORE([$0], [LT_OUTPUT])dnl ++-m4_case([$1], ++- [C], [_LT_LANG(C)], ++- [C++], [_LT_LANG(CXX)], ++- [Java], [_LT_LANG(GCJ)], ++- [Fortran 77], [_LT_LANG(F77)], ++- [Fortran], [_LT_LANG(FC)], ++- [Windows Resource], [_LT_LANG(RC)], ++- [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++- [_LT_LANG($1)], ++- [m4_fatal([$0: unsupported language: "$1"])])])dnl ++-])# LT_LANG ++- ++- ++-# _LT_LANG(LANGNAME) ++-# ------------------ ++-m4_defun([_LT_LANG], ++-[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++- [LT_SUPPORTED_TAG([$1])dnl ++- m4_append([_LT_TAGS], [$1 ])dnl ++- m4_define([_LT_LANG_]$1[_enabled], [])dnl ++- _LT_LANG_$1_CONFIG($1)])dnl ++-])# _LT_LANG ++- ++- ++-# _LT_LANG_DEFAULT_CONFIG ++-# ----------------------- ++-m4_defun([_LT_LANG_DEFAULT_CONFIG], ++-[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++- [LT_LANG(CXX)], ++- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++- ++-AC_PROVIDE_IFELSE([AC_PROG_F77], ++- [LT_LANG(F77)], ++- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++- ++-AC_PROVIDE_IFELSE([AC_PROG_FC], ++- [LT_LANG(FC)], ++- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++- ++-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++-dnl pulling things in needlessly. ++-AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++- [LT_LANG(GCJ)], ++- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++- [LT_LANG(GCJ)], ++- [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++- [LT_LANG(GCJ)], ++- [m4_ifdef([AC_PROG_GCJ], ++- [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++- m4_ifdef([A][M_PROG_GCJ], ++- [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++- m4_ifdef([LT_PROG_GCJ], ++- [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++- ++-AC_PROVIDE_IFELSE([LT_PROG_RC], ++- [LT_LANG(RC)], ++- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++-])# _LT_LANG_DEFAULT_CONFIG ++- ++-# Obsolete macros: ++-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++-dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++-dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++-dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++- ++- ++-# _LT_TAG_COMPILER ++-# ---------------- ++-m4_defun([_LT_TAG_COMPILER], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++- ++-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++- ++-# If no C compiler was specified, use CC. ++-LTCC=${LTCC-"$CC"} ++- ++-# If no C compiler flags were specified, use CFLAGS. ++-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++- ++-# Allow CC to be a program name with arguments. ++-compiler=$CC ++-])# _LT_TAG_COMPILER ++- ++- ++-# _LT_COMPILER_BOILERPLATE ++-# ------------------------ ++-# Check for compiler boilerplate output or warnings with ++-# the simple compiler test code. ++-m4_defun([_LT_COMPILER_BOILERPLATE], ++-[m4_require([_LT_DECL_SED])dnl ++-ac_outfile=conftest.$ac_objext ++-echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_compiler_boilerplate=`cat conftest.err` ++-$RM conftest* ++-])# _LT_COMPILER_BOILERPLATE ++- ++- ++-# _LT_LINKER_BOILERPLATE ++-# ---------------------- ++-# Check for linker boilerplate output or warnings with ++-# the simple link test code. ++-m4_defun([_LT_LINKER_BOILERPLATE], ++-[m4_require([_LT_DECL_SED])dnl ++-ac_outfile=conftest.$ac_objext ++-echo "$lt_simple_link_test_code" >conftest.$ac_ext ++-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++-_lt_linker_boilerplate=`cat conftest.err` ++-$RM -r conftest* ++-])# _LT_LINKER_BOILERPLATE ++- ++-# _LT_REQUIRED_DARWIN_CHECKS ++-# ------------------------- ++-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ++- case $host_os in ++- rhapsody* | darwin*) ++- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++- AC_CHECK_TOOL([LIPO], [lipo], [:]) ++- AC_CHECK_TOOL([OTOOL], [otool], [:]) ++- AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++- _LT_DECL([], [DSYMUTIL], [1], ++- [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++- _LT_DECL([], [NMEDIT], [1], ++- [Tool to change global to local symbols on Mac OS X]) ++- _LT_DECL([], [LIPO], [1], ++- [Tool to manipulate fat objects and archives on Mac OS X]) ++- _LT_DECL([], [OTOOL], [1], ++- [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++- _LT_DECL([], [OTOOL64], [1], ++- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++- ++- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++- [lt_cv_apple_cc_single_mod=no ++- if test -z "${LT_MULTI_MODULE}"; then ++- # By default we will add the -single_module flag. You can override ++- # by either setting the environment variable LT_MULTI_MODULE ++- # non-empty at configure time, or by adding -multi_module to the ++- # link flags. ++- rm -rf libconftest.dylib* ++- echo "int foo(void){return 1;}" > conftest.c ++- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++- _lt_result=$? ++- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++- lt_cv_apple_cc_single_mod=yes ++- else ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- fi ++- rm -rf libconftest.dylib* ++- rm -f conftest.* ++- fi]) ++- AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++- [lt_cv_ld_exported_symbols_list], ++- [lt_cv_ld_exported_symbols_list=no ++- save_LDFLAGS=$LDFLAGS ++- echo "_main" > conftest.sym ++- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++- [lt_cv_ld_exported_symbols_list=yes], ++- [lt_cv_ld_exported_symbols_list=no]) ++- LDFLAGS="$save_LDFLAGS" ++- ]) ++- case $host_os in ++- rhapsody* | darwin1.[[012]]) ++- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++- darwin1.*) ++- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++- darwin*) # darwin 5.x on ++- # if running on 10.5 or later, the deployment target defaults ++- # to the OS version, if on x86, and 10.4, the deployment ++- # target defaults to 10.4. Don't you love it? ++- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++- 10.[[012]]*) ++- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++- 10.*) ++- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++- esac ++- ;; ++- esac ++- if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++- _lt_dar_single_mod='$single_module' ++- fi ++- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++- else ++- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++- fi ++- if test "$DSYMUTIL" != ":"; then ++- _lt_dsymutil='~$DSYMUTIL $lib || :' ++- else ++- _lt_dsymutil= ++- fi ++- ;; ++- esac ++-]) ++- ++- ++-# _LT_DARWIN_LINKER_FEATURES ++-# -------------------------- ++-# Checks for linker and compiler features on darwin ++-m4_defun([_LT_DARWIN_LINKER_FEATURES], ++-[ ++- m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_automatic, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++- case $cc_basename in ++- ifort*) _lt_dar_can_shared=yes ;; ++- *) _lt_dar_can_shared=$GCC ;; ++- esac ++- if test "$_lt_dar_can_shared" = "yes"; then ++- output_verbose_link_cmd=echo ++- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++- m4_if([$1], [CXX], ++-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++- fi ++-],[]) ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++-]) ++- ++-# _LT_SYS_MODULE_PATH_AIX ++-# ----------------------- ++-# Links a minimal program and checks the executable ++-# for the system default hardcoded library path. In most cases, ++-# this is /usr/lib:/lib, but when the MPI compilers are used ++-# the location of the communication and MPI libs are included too. ++-# If we don't find anything, use the default library path according ++-# to the aix ld manual. ++-m4_defun([_LT_SYS_MODULE_PATH_AIX], ++-[m4_require([_LT_DECL_SED])dnl ++-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++-lt_aix_libpath_sed=' ++- /Import File Strings/,/^$/ { ++- /^0/ { ++- s/^0 *\(.*\)$/\1/ ++- p ++- } ++- }' ++-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++-# Check for a 64-bit object if we didn't find anything. ++-if test -z "$aix_libpath"; then ++- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++-fi],[]) ++-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++-])# _LT_SYS_MODULE_PATH_AIX ++- ++- ++-# _LT_SHELL_INIT(ARG) ++-# ------------------- ++-m4_define([_LT_SHELL_INIT], ++-[ifdef([AC_DIVERSION_NOTICE], ++- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++- [AC_DIVERT_PUSH(NOTICE)]) ++-$1 ++-AC_DIVERT_POP ++-])# _LT_SHELL_INIT ++- ++- ++-# _LT_PROG_ECHO_BACKSLASH ++-# ----------------------- ++-# Add some code to the start of the generated configure script which ++-# will find an echo command which doesn't interpret backslashes. ++-m4_defun([_LT_PROG_ECHO_BACKSLASH], ++-[_LT_SHELL_INIT([ ++-# Check that we are running under the correct shell. ++-SHELL=${CONFIG_SHELL-/bin/sh} ++- ++-case X$lt_ECHO in ++-X*--fallback-echo) ++- # Remove one level of quotation (which was required for Make). ++- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++- ;; ++-esac ++- ++-ECHO=${lt_ECHO-echo} ++-if test "X[$]1" = X--no-reexec; then ++- # Discard the --no-reexec flag, and continue. ++- shift ++-elif test "X[$]1" = X--fallback-echo; then ++- # Avoid inline document here, it may be left over ++- : ++-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++- # Yippee, $ECHO works! ++- : ++-else ++- # Restart under the correct shell. ++- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++-fi ++- ++-if test "X[$]1" = X--fallback-echo; then ++- # used as fallback echo ++- shift ++- cat <<_LT_EOF ++-[$]* ++-_LT_EOF ++- exit 0 ++-fi ++- ++-# The HP-UX ksh and POSIX shell print the target directory to stdout ++-# if CDPATH is set. ++-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++- ++-if test -z "$lt_ECHO"; then ++- if test "X${echo_test_string+set}" != Xset; then ++- # find a string as large as possible, as long as the shell can cope with it ++- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++- if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++- then ++- break ++- fi ++- done ++- fi ++- ++- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- : ++- else ++- # The Solaris, AIX, and Digital Unix default echo programs unquote ++- # backslashes. This makes it impossible to quote backslashes using ++- # echo "$something" | sed 's/\\/\\\\/g' ++- # ++- # So, first we look for a working echo in the user's PATH. ++- ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for dir in $PATH /usr/ucb; do ++- IFS="$lt_save_ifs" ++- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- ECHO="$dir/echo" ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ++- if test "X$ECHO" = Xecho; then ++- # We didn't find a better echo, so look for alternatives. ++- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # This shell has a builtin print -r that does the trick. ++- ECHO='print -r' ++- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++- test "X$CONFIG_SHELL" != X/bin/ksh; then ++- # If we have ksh, try running configure again with it. ++- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++- export ORIGINAL_CONFIG_SHELL ++- CONFIG_SHELL=/bin/ksh ++- export CONFIG_SHELL ++- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++- else ++- # Try using printf. ++- ECHO='printf %s\n' ++- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- # Cool, printf works ++- : ++- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++- export CONFIG_SHELL ++- SHELL="$CONFIG_SHELL" ++- export SHELL ++- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++- test "X$echo_testing_string" = 'X\t' && ++- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++- test "X$echo_testing_string" = "X$echo_test_string"; then ++- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++- else ++- # maybe with a smaller string... ++- prev=: ++- ++- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++- then ++- break ++- fi ++- prev="$cmd" ++- done ++- ++- if test "$prev" != 'sed 50q "[$]0"'; then ++- echo_test_string=`eval $prev` ++- export echo_test_string ++- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++- else ++- # Oops. We lost completely, so just stick with echo. ++- ECHO=echo ++- fi ++- fi ++- fi ++- fi ++- fi ++-fi ++- ++-# Copy echo and quote the copy suitably for passing to libtool from ++-# the Makefile, instead of quoting the original, which is used later. ++-lt_ECHO=$ECHO ++-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++-fi ++- ++-AC_SUBST(lt_ECHO) ++-]) ++-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++-_LT_DECL([], [ECHO], [1], ++- [An echo program that does not interpret backslashes]) ++-])# _LT_PROG_ECHO_BACKSLASH ++- ++- ++-# _LT_ENABLE_LOCK ++-# --------------- ++-m4_defun([_LT_ENABLE_LOCK], ++-[AC_ARG_ENABLE([libtool-lock], ++- [AS_HELP_STRING([--disable-libtool-lock], ++- [avoid locking (might break parallel builds)])]) ++-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++- ++-# Some flags need to be propagated to the compiler or linker for good ++-# libtool support. ++-case $host in ++-ia64-*-hpux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *ELF-32*) ++- HPUX_IA64_MODE="32" ++- ;; ++- *ELF-64*) ++- HPUX_IA64_MODE="64" ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++-*-*-irix6*) ++- # Find out which ABI we are using. ++- echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -melf32bsmip" ++- ;; ++- *N32*) ++- LD="${LD-ld} -melf32bmipn32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -melf64bmip" ++- ;; ++- esac ++- else ++- case `/usr/bin/file conftest.$ac_objext` in ++- *32-bit*) ++- LD="${LD-ld} -32" ++- ;; ++- *N32*) ++- LD="${LD-ld} -n32" ++- ;; ++- *64-bit*) ++- LD="${LD-ld} -64" ++- ;; ++- esac ++- fi ++- fi ++- rm -rf conftest* ++- ;; ++- ++-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++-s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *32-bit*) ++- case $host in ++- x86_64-*kfreebsd*-gnu) ++- LD="${LD-ld} -m elf_i386_fbsd" ++- ;; ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_i386" ++- ;; ++- ppc64-*linux*|powerpc64-*linux*) ++- LD="${LD-ld} -m elf32ppclinux" ++- ;; ++- s390x-*linux*) ++- LD="${LD-ld} -m elf_s390" ++- ;; ++- sparc64-*linux*) ++- LD="${LD-ld} -m elf32_sparc" ++- ;; ++- esac ++- ;; ++- *64-bit*) ++- case $host in ++- x86_64-*kfreebsd*-gnu) ++- LD="${LD-ld} -m elf_x86_64_fbsd" ++- ;; ++- x86_64-*linux*) ++- LD="${LD-ld} -m elf_x86_64" ++- ;; ++- ppc*-*linux*|powerpc*-*linux*) ++- LD="${LD-ld} -m elf64ppc" ++- ;; ++- s390*-*linux*|s390*-*tpf*) ++- LD="${LD-ld} -m elf64_s390" ++- ;; ++- sparc*-*linux*) ++- LD="${LD-ld} -m elf64_sparc" ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++- ++-*-*-sco3.2v5*) ++- # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++- SAVE_CFLAGS="$CFLAGS" ++- CFLAGS="$CFLAGS -belf" ++- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++- [AC_LANG_PUSH(C) ++- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++- AC_LANG_POP]) ++- if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++- CFLAGS="$SAVE_CFLAGS" ++- fi ++- ;; ++-sparc*-*solaris*) ++- # Find out which ABI we are using. ++- echo 'int i;' > conftest.$ac_ext ++- if AC_TRY_EVAL(ac_compile); then ++- case `/usr/bin/file conftest.o` in ++- *64-bit*) ++- case $lt_cv_prog_gnu_ld in ++- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++- *) ++- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++- LD="${LD-ld} -64" ++- fi ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- rm -rf conftest* ++- ;; ++-esac ++- ++-need_locks="$enable_libtool_lock" ++-])# _LT_ENABLE_LOCK ++- ++- ++-# _LT_CMD_OLD_ARCHIVE ++-# ------------------- ++-m4_defun([_LT_CMD_OLD_ARCHIVE], ++-[AC_CHECK_TOOL(AR, ar, false) ++-test -z "$AR" && AR=ar ++-test -z "$AR_FLAGS" && AR_FLAGS=cru ++-_LT_DECL([], [AR], [1], [The archiver]) ++-_LT_DECL([], [AR_FLAGS], [1]) ++- ++-AC_CHECK_TOOL(STRIP, strip, :) ++-test -z "$STRIP" && STRIP=: ++-_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++- ++-AC_CHECK_TOOL(RANLIB, ranlib, :) ++-test -z "$RANLIB" && RANLIB=: ++-_LT_DECL([], [RANLIB], [1], ++- [Commands used to install an old-style archive]) ++- ++-# Determine commands to create old-style static archives. ++-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++-old_postinstall_cmds='chmod 644 $oldlib' ++-old_postuninstall_cmds= ++- ++-if test -n "$RANLIB"; then ++- case $host_os in ++- openbsd*) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++- ;; ++- *) ++- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++- ;; ++- esac ++- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++-fi ++-_LT_DECL([], [old_postinstall_cmds], [2]) ++-_LT_DECL([], [old_postuninstall_cmds], [2]) ++-_LT_TAGDECL([], [old_archive_cmds], [2], ++- [Commands used to build an old-style archive]) ++-])# _LT_CMD_OLD_ARCHIVE ++- ++- ++-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ---------------------------------------------------------------- ++-# Check whether the given compiler option works ++-AC_DEFUN([_LT_COMPILER_OPTION], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_SED])dnl ++-AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++- lt_compiler_flag="$3" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- # The option is referenced via a variable to avoid confusing sed. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>conftest.err) ++- ac_status=$? ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s "$ac_outfile"; then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings other than the usual output. ++- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- fi ++- $RM conftest* ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- m4_if([$5], , :, [$5]) ++-else ++- m4_if([$6], , :, [$6]) ++-fi ++-])# _LT_COMPILER_OPTION ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++- ++- ++-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++-# [ACTION-SUCCESS], [ACTION-FAILURE]) ++-# ---------------------------------------------------- ++-# Check whether the given linker option works ++-AC_DEFUN([_LT_LINKER_OPTION], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_SED])dnl ++-AC_CACHE_CHECK([$1], [$2], ++- [$2=no ++- save_LDFLAGS="$LDFLAGS" ++- LDFLAGS="$LDFLAGS $3" ++- echo "$lt_simple_link_test_code" > conftest.$ac_ext ++- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++- # The linker can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- if test -s conftest.err; then ++- # Append any errors to the config.log. ++- cat conftest.err 1>&AS_MESSAGE_LOG_FD ++- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++- if diff conftest.exp conftest.er2 >/dev/null; then ++- $2=yes ++- fi ++- else ++- $2=yes ++- fi ++- fi ++- $RM -r conftest* ++- LDFLAGS="$save_LDFLAGS" ++-]) ++- ++-if test x"[$]$2" = xyes; then ++- m4_if([$4], , :, [$4]) ++-else ++- m4_if([$5], , :, [$5]) ++-fi ++-])# _LT_LINKER_OPTION ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) ++- ++- ++-# LT_CMD_MAX_LEN ++-#--------------- ++-AC_DEFUN([LT_CMD_MAX_LEN], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-# find the maximum length of command line arguments ++-AC_MSG_CHECKING([the maximum length of command line arguments]) ++-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++- i=0 ++- teststring="ABCD" ++- ++- case $build_os in ++- msdosdjgpp*) ++- # On DJGPP, this test can blow up pretty badly due to problems in libc ++- # (any single argument exceeding 2000 bytes causes a buffer overrun ++- # during glob expansion). Even if it were fixed, the result of this ++- # check would be larger than it should be. ++- lt_cv_sys_max_cmd_len=12288; # 12K is about right ++- ;; ++- ++- gnu*) ++- # Under GNU Hurd, this test is not required because there is ++- # no limit to the length of command line arguments. ++- # Libtool will interpret -1 as no limit whatsoever ++- lt_cv_sys_max_cmd_len=-1; ++- ;; ++- ++- cygwin* | mingw* | cegcc*) ++- # On Win9x/ME, this test blows up -- it succeeds, but takes ++- # about 5 minutes as the teststring grows exponentially. ++- # Worse, since 9x/ME are not pre-emptively multitasking, ++- # you end up with a "frozen" computer, even though with patience ++- # the test eventually succeeds (with a max line length of 256k). ++- # Instead, let's just punt: use the minimum linelength reported by ++- # all of the supported platforms: 8192 (on NT/2K/XP). ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- amigaos*) ++- # On AmigaOS with pdksh, this test takes hours, literally. ++- # So we just punt and use a minimum line length of 8192. ++- lt_cv_sys_max_cmd_len=8192; ++- ;; ++- ++- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++- # This has been around since 386BSD, at least. Likely further. ++- if test -x /sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++- elif test -x /usr/sbin/sysctl; then ++- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++- else ++- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++- fi ++- # And add a safety zone ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++- ;; ++- ++- interix*) ++- # We know the value 262144 and hardcode it with a safety zone (like BSD) ++- lt_cv_sys_max_cmd_len=196608 ++- ;; ++- ++- osf*) ++- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++- # nice to cause kernel panics so lets avoid the loop below. ++- # First set a reasonable default. ++- lt_cv_sys_max_cmd_len=16384 ++- # ++- if test -x /sbin/sysconfig; then ++- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++- *1*) lt_cv_sys_max_cmd_len=-1 ;; ++- esac ++- fi ++- ;; ++- sco3.2v5*) ++- lt_cv_sys_max_cmd_len=102400 ++- ;; ++- sysv5* | sco5v6* | sysv4.2uw2*) ++- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++- if test -n "$kargmax"; then ++- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++- else ++- lt_cv_sys_max_cmd_len=32768 ++- fi ++- ;; ++- *) ++- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++- if test -n "$lt_cv_sys_max_cmd_len"; then ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++- else ++- # Make teststring a little bigger before we do anything with it. ++- # a 1K string should be a reasonable start. ++- for i in 1 2 3 4 5 6 7 8 ; do ++- teststring=$teststring$teststring ++- done ++- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++- # If test is not a shell built-in, we'll probably end up computing a ++- # maximum length that is only half of the actual maximum length, but ++- # we can't tell. ++- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++- = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++- test $i != 17 # 1/2 MB should be enough ++- do ++- i=`expr $i + 1` ++- teststring=$teststring$teststring ++- done ++- # Only check the string length outside the loop. ++- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++- teststring= ++- # Add a significant safety factor because C++ compilers can tack on ++- # massive amounts of additional arguments before passing them to the ++- # linker. It appears as though 1/2 is a usable value. ++- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++- fi ++- ;; ++- esac ++-]) ++-if test -n $lt_cv_sys_max_cmd_len ; then ++- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++-else ++- AC_MSG_RESULT(none) ++-fi ++-max_cmd_len=$lt_cv_sys_max_cmd_len ++-_LT_DECL([], [max_cmd_len], [0], ++- [What is the maximum length of a command?]) ++-])# LT_CMD_MAX_LEN ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) ++- ++- ++-# _LT_HEADER_DLFCN ++-# ---------------- ++-m4_defun([_LT_HEADER_DLFCN], ++-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++-])# _LT_HEADER_DLFCN ++- ++- ++-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++-# ---------------------------------------------------------------- ++-m4_defun([_LT_TRY_DLOPEN_SELF], ++-[m4_require([_LT_HEADER_DLFCN])dnl ++-if test "$cross_compiling" = yes; then : ++- [$4] ++-else ++- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++- lt_status=$lt_dlunknown ++- cat > conftest.$ac_ext <<_LT_EOF ++-[#line __oline__ "configure" ++-#include "confdefs.h" ++- ++-#if HAVE_DLFCN_H ++-#include ++-#endif ++- ++-#include ++- ++-#ifdef RTLD_GLOBAL ++-# define LT_DLGLOBAL RTLD_GLOBAL ++-#else ++-# ifdef DL_GLOBAL ++-# define LT_DLGLOBAL DL_GLOBAL ++-# else ++-# define LT_DLGLOBAL 0 ++-# endif ++-#endif ++- ++-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++- find out it does not work in some platform. */ ++-#ifndef LT_DLLAZY_OR_NOW ++-# ifdef RTLD_LAZY ++-# define LT_DLLAZY_OR_NOW RTLD_LAZY ++-# else ++-# ifdef DL_LAZY ++-# define LT_DLLAZY_OR_NOW DL_LAZY ++-# else ++-# ifdef RTLD_NOW ++-# define LT_DLLAZY_OR_NOW RTLD_NOW ++-# else ++-# ifdef DL_NOW ++-# define LT_DLLAZY_OR_NOW DL_NOW ++-# else ++-# define LT_DLLAZY_OR_NOW 0 ++-# endif ++-# endif ++-# endif ++-# endif ++-#endif ++- ++-void fnord() { int i=42;} ++-int main () ++-{ ++- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++- int status = $lt_dlunknown; ++- ++- if (self) ++- { ++- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++- /* dlclose (self); */ ++- } ++- else ++- puts (dlerror ()); ++- ++- return status; ++-}] ++-_LT_EOF ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++- lt_status=$? ++- case x$lt_status in ++- x$lt_dlno_uscore) $1 ;; ++- x$lt_dlneed_uscore) $2 ;; ++- x$lt_dlunknown|x*) $3 ;; ++- esac ++- else : ++- # compilation failed ++- $3 ++- fi ++-fi ++-rm -fr conftest* ++-])# _LT_TRY_DLOPEN_SELF ++- ++- ++-# LT_SYS_DLOPEN_SELF ++-# ------------------ ++-AC_DEFUN([LT_SYS_DLOPEN_SELF], ++-[m4_require([_LT_HEADER_DLFCN])dnl ++-if test "x$enable_dlopen" != xyes; then ++- enable_dlopen=unknown ++- enable_dlopen_self=unknown ++- enable_dlopen_self_static=unknown ++-else ++- lt_cv_dlopen=no ++- lt_cv_dlopen_libs= ++- ++- case $host_os in ++- beos*) ++- lt_cv_dlopen="load_add_on" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ;; ++- ++- mingw* | pw32* | cegcc*) ++- lt_cv_dlopen="LoadLibrary" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- cygwin*) ++- lt_cv_dlopen="dlopen" ++- lt_cv_dlopen_libs= ++- ;; ++- ++- darwin*) ++- # if libdl is installed we need to link against it ++- AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++- lt_cv_dlopen="dyld" ++- lt_cv_dlopen_libs= ++- lt_cv_dlopen_self=yes ++- ]) ++- ;; ++- ++- *) ++- AC_CHECK_FUNC([shl_load], ++- [lt_cv_dlopen="shl_load"], ++- [AC_CHECK_LIB([dld], [shl_load], ++- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++- [AC_CHECK_FUNC([dlopen], ++- [lt_cv_dlopen="dlopen"], ++- [AC_CHECK_LIB([dl], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++- [AC_CHECK_LIB([svld], [dlopen], ++- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++- [AC_CHECK_LIB([dld], [dld_link], ++- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ]) ++- ;; ++- esac ++- ++- if test "x$lt_cv_dlopen" != xno; then ++- enable_dlopen=yes ++- else ++- enable_dlopen=no ++- fi ++- ++- case $lt_cv_dlopen in ++- dlopen) ++- save_CPPFLAGS="$CPPFLAGS" ++- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++- ++- save_LDFLAGS="$LDFLAGS" ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++- ++- save_LIBS="$LIBS" ++- LIBS="$lt_cv_dlopen_libs $LIBS" ++- ++- AC_CACHE_CHECK([whether a program can dlopen itself], ++- lt_cv_dlopen_self, [dnl ++- _LT_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++- ]) ++- ++- if test "x$lt_cv_dlopen_self" = xyes; then ++- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++- lt_cv_dlopen_self_static, [dnl ++- _LT_TRY_DLOPEN_SELF( ++- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++- ]) ++- fi ++- ++- CPPFLAGS="$save_CPPFLAGS" ++- LDFLAGS="$save_LDFLAGS" ++- LIBS="$save_LIBS" ++- ;; ++- esac ++- ++- case $lt_cv_dlopen_self in ++- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++- *) enable_dlopen_self=unknown ;; ++- esac ++- ++- case $lt_cv_dlopen_self_static in ++- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++- *) enable_dlopen_self_static=unknown ;; ++- esac ++-fi ++-_LT_DECL([dlopen_support], [enable_dlopen], [0], ++- [Whether dlopen is supported]) ++-_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++- [Whether dlopen of programs is supported]) ++-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++- [Whether dlopen of statically linked programs is supported]) ++-])# LT_SYS_DLOPEN_SELF ++- ++-# Old name: ++-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) ++- ++- ++-# _LT_COMPILER_C_O([TAGNAME]) ++-# --------------------------- ++-# Check to see if options -c and -o are simultaneously supported by compiler. ++-# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++-m4_defun([_LT_COMPILER_C_O], ++-[m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_TAG_COMPILER])dnl ++-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++- $RM -r conftest 2>/dev/null ++- mkdir conftest ++- cd conftest ++- mkdir out ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- lt_compiler_flag="-o out/conftest2.$ac_objext" ++- # Insert the option either (1) after the last *FLAGS variable, or ++- # (2) before a word containing "conftest.", or (3) at the end. ++- # Note that $ac_compile itself does not contain backslashes and begins ++- # with a dollar sign (not a hyphen), so the echo should work correctly. ++- lt_compile=`echo "$ac_compile" | $SED \ ++- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++- -e 's:$: $lt_compiler_flag:'` ++- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$lt_compile" 2>out/conftest.err) ++- ac_status=$? ++- cat out/conftest.err >&AS_MESSAGE_LOG_FD ++- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++- if (exit $ac_status) && test -s out/conftest2.$ac_objext ++- then ++- # The compiler can only warn and ignore the option if not recognized ++- # So say no if there are warnings ++- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++- fi ++- fi ++- chmod u+w . 2>&AS_MESSAGE_LOG_FD ++- $RM conftest* ++- # SGI C++ compiler will create directory out/ii_files/ for ++- # template instantiation ++- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++- $RM out/* && rmdir out ++- cd .. ++- $RM -r conftest ++- $RM conftest* ++-]) ++-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++- [Does compiler simultaneously support -c and -o options?]) ++-])# _LT_COMPILER_C_O ++- ++- ++-# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++-# ---------------------------------- ++-# Check to see if we can do hard links to lock some files if needed ++-m4_defun([_LT_COMPILER_FILE_LOCKS], ++-[m4_require([_LT_ENABLE_LOCK])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-_LT_COMPILER_C_O([$1]) ++- ++-hard_links="nottested" ++-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++- # do not overwrite the value of need_locks provided by the user ++- AC_MSG_CHECKING([if we can lock with hard links]) ++- hard_links=yes ++- $RM conftest* ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- touch conftest.a ++- ln conftest.a conftest.b 2>&5 || hard_links=no ++- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++- AC_MSG_RESULT([$hard_links]) ++- if test "$hard_links" = no; then ++- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++- need_locks=warn ++- fi ++-else ++- need_locks=no ++-fi ++-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++-])# _LT_COMPILER_FILE_LOCKS ++- ++- ++-# _LT_CHECK_OBJDIR ++-# ---------------- ++-m4_defun([_LT_CHECK_OBJDIR], ++-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++-[rm -f .libs 2>/dev/null ++-mkdir .libs 2>/dev/null ++-if test -d .libs; then ++- lt_cv_objdir=.libs ++-else ++- # MS-DOS does not allow filenames that begin with a dot. ++- lt_cv_objdir=_libs ++-fi ++-rmdir .libs 2>/dev/null]) ++-objdir=$lt_cv_objdir ++-_LT_DECL([], [objdir], [0], ++- [The name of the directory that contains temporary libtool files])dnl ++-m4_pattern_allow([LT_OBJDIR])dnl ++-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++- [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++-])# _LT_CHECK_OBJDIR ++- ++- ++-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++-# -------------------------------------- ++-# Check hardcoding attributes. ++-m4_defun([_LT_LINKER_HARDCODE_LIBPATH], ++-[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++-_LT_TAGVAR(hardcode_action, $1)= ++-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++- test -n "$_LT_TAGVAR(runpath_var, $1)" || ++- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++- ++- # We can hardcode non-existent directories. ++- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && ++- # If the only mechanism to avoid hardcoding is shlibpath_var, we ++- # have to relink, otherwise we might link with an installed library ++- # when we should be linking with a yet-to-be-installed one ++- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then ++- # Linking always hardcodes the temporary library directory. ++- _LT_TAGVAR(hardcode_action, $1)=relink ++- else ++- # We can link without hardcoding, and we can hardcode nonexisting dirs. ++- _LT_TAGVAR(hardcode_action, $1)=immediate ++- fi ++-else ++- # We cannot hardcode anything, or else we can only hardcode existing ++- # directories. ++- _LT_TAGVAR(hardcode_action, $1)=unsupported ++-fi ++-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) ++- ++-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then ++- # Fast installation is not supported ++- enable_fast_install=no ++-elif test "$shlibpath_overrides_runpath" = yes || ++- test "$enable_shared" = no; then ++- # Fast installation is not necessary ++- enable_fast_install=needless ++-fi ++-_LT_TAGDECL([], [hardcode_action], [0], ++- [How to hardcode a shared library path into an executable]) ++-])# _LT_LINKER_HARDCODE_LIBPATH ++- ++- ++-# _LT_CMD_STRIPLIB ++-# ---------------- ++-m4_defun([_LT_CMD_STRIPLIB], ++-[m4_require([_LT_DECL_EGREP]) ++-striplib= ++-old_striplib= ++-AC_MSG_CHECKING([whether stripping libraries is possible]) ++-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++- test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++- AC_MSG_RESULT([yes]) ++-else ++-# FIXME - insert some real tests, host_os isn't really good enough ++- case $host_os in ++- darwin*) ++- if test -n "$STRIP" ; then ++- striplib="$STRIP -x" ++- old_striplib="$STRIP -S" ++- AC_MSG_RESULT([yes]) ++- else ++- AC_MSG_RESULT([no]) ++- fi ++- ;; ++- *) ++- AC_MSG_RESULT([no]) ++- ;; ++- esac ++-fi ++-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++-_LT_DECL([], [striplib], [1]) ++-])# _LT_CMD_STRIPLIB ++- ++- ++-# _LT_SYS_DYNAMIC_LINKER([TAG]) ++-# ----------------------------- ++-# PORTME Fill in your ld.so characteristics ++-m4_defun([_LT_SYS_DYNAMIC_LINKER], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_OBJDUMP])dnl ++-m4_require([_LT_DECL_SED])dnl ++-AC_MSG_CHECKING([dynamic linker characteristics]) ++-m4_if([$1], ++- [], [ ++-if test "$GCC" = yes; then ++- case $host_os in ++- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++- *) lt_awk_arg="/^libraries:/" ;; ++- esac ++- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++- # if the path contains ";" then we assume it to be the separator ++- # otherwise default to the standard path separator (i.e. ":") - it is ++- # assumed that no part of a normal pathname contains ";" but that should ++- # okay in the real world where ";" in dirpaths is itself problematic. ++- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++- # Ok, now we have the path, separated by spaces, we can step through it ++- # and add multilib dir if necessary. ++- lt_tmp_lt_search_path_spec= ++- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++- for lt_sys_path in $lt_search_path_spec; do ++- if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++- else ++- test -d "$lt_sys_path" && \ ++- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++- fi ++- done ++- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++-BEGIN {RS=" "; FS="/|\n";} { ++- lt_foo=""; ++- lt_count=0; ++- for (lt_i = NF; lt_i > 0; lt_i--) { ++- if ($lt_i != "" && $lt_i != ".") { ++- if ($lt_i == "..") { ++- lt_count++; ++- } else { ++- if (lt_count == 0) { ++- lt_foo="/" $lt_i lt_foo; ++- } else { ++- lt_count--; ++- } ++- } ++- } ++- } ++- if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++- if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++-}'` ++- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++-else ++- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++-fi]) ++-library_names_spec= ++-libname_spec='lib$name' ++-soname_spec= ++-shrext_cmds=".so" ++-postinstall_cmds= ++-postuninstall_cmds= ++-finish_cmds= ++-finish_eval= ++-shlibpath_var= ++-shlibpath_overrides_runpath=unknown ++-version_type=none ++-dynamic_linker="$host_os ld.so" ++-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++-need_lib_prefix=unknown ++-hardcode_into_libs=no ++- ++-# when you set need_version to no, make sure it does not cause -set_version ++-# flags to be left without arguments ++-need_version=unknown ++- ++-case $host_os in ++-aix3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++- shlibpath_var=LIBPATH ++- ++- # AIX 3 has no versioning support, so we append a major version to the name. ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- ++-aix[[4-9]]*) ++- version_type=linux ++- need_lib_prefix=no ++- need_version=no ++- hardcode_into_libs=yes ++- if test "$host_cpu" = ia64; then ++- # AIX 5 supports IA64 ++- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- else ++- # With GCC up to 2.95.x, collect2 would create an import file ++- # for dependence libraries. The import file would start with ++- # the line `#! .'. This would cause the generated library to ++- # depend on `.', always an invalid library. This was fixed in ++- # development snapshots of GCC prior to 3.0. ++- case $host_os in ++- aix4 | aix4.[[01]] | aix4.[[01]].*) ++- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++- echo ' yes ' ++- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++- : ++- else ++- can_build_shared=no ++- fi ++- ;; ++- esac ++- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++- # soname into executable. Probably we can add versioning support to ++- # collect2, so additional links can be useful in future. ++- if test "$aix_use_runtimelinking" = yes; then ++- # If using run time linking (on AIX 4.2 or later) use lib.so ++- # instead of lib.a to let people know that these are not ++- # typical AIX shared libraries. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- else ++- # We preserve .a as extension for shared libraries through AIX4.2 ++- # and later when we are not doing run time linking. ++- library_names_spec='${libname}${release}.a $libname.a' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- fi ++- shlibpath_var=LIBPATH ++- fi ++- ;; ++- ++-amigaos*) ++- case $host_cpu in ++- powerpc) ++- # Since July 2007 AmigaOS4 officially supports .so libraries. ++- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- ;; ++- m68k) ++- library_names_spec='$libname.ixlibrary $libname.a' ++- # Create ${libname}_ixlibrary.a entries in /sys/libs. ++- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++- ;; ++- esac ++- ;; ++- ++-beos*) ++- library_names_spec='${libname}${shared_ext}' ++- dynamic_linker="$host_os ld.so" ++- shlibpath_var=LIBRARY_PATH ++- ;; ++- ++-bsdi[[45]]*) ++- version_type=linux ++- 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 $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++- # the default ld.so.conf also contains /usr/contrib/lib and ++- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++- # libtool to hard-code these into programs ++- ;; ++- ++-cygwin* | mingw* | pw32* | cegcc*) ++- version_type=windows ++- shrext_cmds=".dll" ++- need_version=no ++- need_lib_prefix=no ++- ++- case $GCC,$host_os in ++- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++- library_names_spec='$libname.dll.a' ++- # DLL is installed to $(libdir)/../bin by postinstall_cmds ++- postinstall_cmds='base_file=`basename \${file}`~ ++- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++- dldir=$destdir/`dirname \$dlpath`~ ++- test -d \$dldir || mkdir -p \$dldir~ ++- $install_prog $dir/$dlname \$dldir/$dlname~ ++- chmod a+x \$dldir/$dlname~ ++- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++- fi' ++- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++- dlpath=$dir/\$dldll~ ++- $RM \$dlpath' ++- shlibpath_overrides_runpath=yes ++- ++- case $host_os in ++- cygwin*) ++- # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++- ;; ++- mingw* | cegcc*) ++- # MinGW DLLs use traditional 'lib' prefix ++- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++- # It is most probably a Windows format PATH printed by ++- # mingw gcc, but we are running on Cygwin. Gcc prints its search ++- # path with ; separators, and with drive letters. We can handle the ++- # drive letters (cygwin fileutils understands them), so leave them, ++- # especially as we might pass files found there to a mingw objdump, ++- # which wouldn't understand a cygwinified path. Ahh. ++- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++- else ++- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++- fi ++- ;; ++- pw32*) ++- # pw32 DLLs use 'pw' prefix rather than 'lib' ++- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++- ;; ++- esac ++- ;; ++- ++- *) ++- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++- ;; ++- esac ++- dynamic_linker='Win32 ld.exe' ++- # FIXME: first we should search . and the directory the executable is in ++- shlibpath_var=PATH ++- ;; ++- ++-darwin* | rhapsody*) ++- dynamic_linker="$host_os dyld" ++- version_type=darwin ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++- soname_spec='${libname}${release}${major}$shared_ext' ++- shlibpath_overrides_runpath=yes ++- shlibpath_var=DYLD_LIBRARY_PATH ++- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++-m4_if([$1], [],[ ++- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++- ;; ++- ++-dgux*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-freebsd1*) ++- dynamic_linker=no ++- ;; ++- ++-freebsd* | dragonfly*) ++- # DragonFly does not have aout. When/if they implement a new ++- # versioning mechanism, adjust this. ++- if test -x /usr/bin/objformat; then ++- objformat=`/usr/bin/objformat` ++- else ++- case $host_os in ++- freebsd[[123]]*) objformat=aout ;; ++- *) objformat=elf ;; ++- esac ++- fi ++- version_type=freebsd-$objformat ++- case $version_type in ++- freebsd-elf*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- need_version=no ++- need_lib_prefix=no ++- ;; ++- freebsd-*) ++- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++- need_version=yes ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_os in ++- freebsd2*) ++- shlibpath_overrides_runpath=yes ++- ;; ++- freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- *) # from 4.6 on, and DragonFly ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- esac ++- ;; ++- ++-gnu*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- hardcode_into_libs=yes ++- ;; ++- ++-hpux9* | hpux10* | hpux11*) ++- # Give a soname corresponding to the major version so that dld.sl refuses to ++- # link against other versions. ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- case $host_cpu in ++- ia64*) ++- shrext_cmds='.so' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.so" ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- if test "X$HPUX_IA64_MODE" = X32; then ++- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++- else ++- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++- fi ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- hppa*64*) ++- shrext_cmds='.sl' ++- hardcode_into_libs=yes ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++- ;; ++- *) ++- shrext_cmds='.sl' ++- dynamic_linker="$host_os dld.sl" ++- shlibpath_var=SHLIB_PATH ++- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- ;; ++- esac ++- # HP-UX runs *really* slowly unless shared libraries are mode 555. ++- postinstall_cmds='chmod 555 $lib' ++- ;; ++- ++-interix[[3-9]]*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $host_os in ++- nonstopux*) version_type=nonstopux ;; ++- *) ++- if test "$lt_cv_prog_gnu_ld" = yes; then ++- version_type=linux ++- else ++- version_type=irix ++- fi ;; ++- esac ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++- case $host_os in ++- irix5* | nonstopux*) ++- libsuff= shlibsuff= ++- ;; ++- *) ++- case $LD in # libtool.m4 will add one of these switches to LD ++- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++- libsuff= shlibsuff= libmagic=32-bit;; ++- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++- libsuff=32 shlibsuff=N32 libmagic=N32;; ++- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++- libsuff=64 shlibsuff=64 libmagic=64-bit;; ++- *) libsuff= shlibsuff= libmagic=never-match;; ++- esac ++- ;; ++- esac ++- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++- hardcode_into_libs=yes ++- ;; ++- ++-# No shared lib support for Linux oldld, aout, or coff. ++-linux*oldld* | linux*aout* | linux*coff*) ++- dynamic_linker=no ++- ;; ++- ++-# This must be Linux ELF. ++-linux* | k*bsd*-gnu) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- # Some binutils ld are patched to set DT_RUNPATH ++- save_LDFLAGS=$LDFLAGS ++- save_libdir=$libdir ++- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++- [shlibpath_overrides_runpath=yes])]) ++- LDFLAGS=$save_LDFLAGS ++- libdir=$save_libdir ++- ++- # This implies no fast_install, which is unacceptable. ++- # Some rework will be needed to allow for fast_install ++- # before this can be enabled. ++- hardcode_into_libs=yes ++- ++- # Append ld.so.conf contents to the search path ++- if test -f /etc/ld.so.conf; then ++- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++- fi ++- ++- # We used to test for /lib/ld.so.1 and disable shared libraries on ++- # powerpc, because MkLinux only supported shared libraries with the ++- # GNU dynamic linker. Since this was broken with cross compilers, ++- # most powerpc-linux boxes support dynamic linking these days and ++- # people can always --disable-shared, the test was removed, and we ++- # assume the GNU/Linux dynamic linker is in use. ++- dynamic_linker='GNU/Linux ld.so' ++- ;; ++- ++-netbsd*) ++- version_type=sunos ++- need_lib_prefix=no ++- need_version=no ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- dynamic_linker='NetBSD (a.out) ld.so' ++- else ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- dynamic_linker='NetBSD ld.elf_so' ++- fi ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- ;; ++- ++-newsos6) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- ;; ++- ++-*nto* | *qnx*) ++- version_type=qnx ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- dynamic_linker='ldqnx.so' ++- ;; ++- ++-openbsd*) ++- version_type=sunos ++- sys_lib_dlsearch_path_spec="/usr/lib" ++- need_lib_prefix=no ++- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++- case $host_os in ++- openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++- *) need_version=no ;; ++- esac ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- case $host_os in ++- openbsd2.[[89]] | openbsd2.[[89]].*) ++- shlibpath_overrides_runpath=no ++- ;; ++- *) ++- shlibpath_overrides_runpath=yes ++- ;; ++- esac ++- else ++- shlibpath_overrides_runpath=yes ++- fi ++- ;; ++- ++-os2*) ++- libname_spec='$name' ++- shrext_cmds=".dll" ++- need_lib_prefix=no ++- library_names_spec='$libname${shared_ext} $libname.a' ++- dynamic_linker='OS/2 ld.exe' ++- shlibpath_var=LIBPATH ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- version_type=osf ++- need_lib_prefix=no ++- need_version=no ++- soname_spec='${libname}${release}${shared_ext}$major' ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++- ;; ++- ++-rdos*) ++- dynamic_linker=no ++- ;; ++- ++-solaris*) ++- version_type=linux ++- need_lib_prefix=no ++- 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' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- # ldd complains unless libraries are executable ++- postinstall_cmds='chmod +x $lib' ++- ;; ++- ++-sunos4*) ++- version_type=sunos ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- if test "$with_gnu_ld" = yes; then ++- need_lib_prefix=no ++- fi ++- need_version=yes ++- ;; ++- ++-sysv4 | sysv4.3*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- case $host_vendor in ++- sni) ++- shlibpath_overrides_runpath=no ++- need_lib_prefix=no ++- runpath_var=LD_RUN_PATH ++- ;; ++- siemens) ++- need_lib_prefix=no ++- ;; ++- motorola) ++- need_lib_prefix=no ++- need_version=no ++- shlibpath_overrides_runpath=no ++- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++- ;; ++- esac ++- ;; ++- ++-sysv4*MP*) ++- if test -d /usr/nec ;then ++- version_type=linux ++- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++- soname_spec='$libname${shared_ext}.$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- fi ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- version_type=freebsd-elf ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=yes ++- hardcode_into_libs=yes ++- if test "$with_gnu_ld" = yes; then ++- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++- else ++- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++- case $host_os in ++- sco3.2v5*) ++- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++- ;; ++- esac ++- fi ++- sys_lib_dlsearch_path_spec='/usr/lib' ++- ;; ++- ++-tpf*) ++- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++- version_type=linux ++- need_lib_prefix=no ++- need_version=no ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- shlibpath_var=LD_LIBRARY_PATH ++- shlibpath_overrides_runpath=no ++- hardcode_into_libs=yes ++- ;; ++- ++-uts4*) ++- version_type=linux ++- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++- soname_spec='${libname}${release}${shared_ext}$major' ++- shlibpath_var=LD_LIBRARY_PATH ++- ;; ++- ++-*) ++- dynamic_linker=no ++- ;; ++-esac ++-AC_MSG_RESULT([$dynamic_linker]) ++-test "$dynamic_linker" = no && can_build_shared=no ++- ++-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++-if test "$GCC" = yes; then ++- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++-fi ++- ++-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++-fi ++-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++-fi ++- ++-_LT_DECL([], [variables_saved_for_relink], [1], ++- [Variables whose values should be saved in libtool wrapper scripts and ++- restored at link time]) ++-_LT_DECL([], [need_lib_prefix], [0], ++- [Do we need the "lib" prefix for modules?]) ++-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++-_LT_DECL([], [version_type], [0], [Library versioning type]) ++-_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++-_LT_DECL([], [shlibpath_overrides_runpath], [0], ++- [Is shlibpath searched before the hard-coded library search path?]) ++-_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++-_LT_DECL([], [library_names_spec], [1], ++- [[List of archive names. First name is the real one, the rest are links. ++- The last name is the one that the linker finds with -lNAME]]) ++-_LT_DECL([], [soname_spec], [1], ++- [[The coded name of the library, if different from the real name]]) ++-_LT_DECL([], [postinstall_cmds], [2], ++- [Command to use after installation of a shared archive]) ++-_LT_DECL([], [postuninstall_cmds], [2], ++- [Command to use after uninstallation of a shared archive]) ++-_LT_DECL([], [finish_cmds], [2], ++- [Commands used to finish a libtool library installation in a directory]) ++-_LT_DECL([], [finish_eval], [1], ++- [[As "finish_cmds", except a single script fragment to be evaled but ++- not shown]]) ++-_LT_DECL([], [hardcode_into_libs], [0], ++- [Whether we should hardcode library paths into libraries]) ++-_LT_DECL([], [sys_lib_search_path_spec], [2], ++- [Compile-time system search path for libraries]) ++-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++- [Run-time system search path for libraries]) ++-])# _LT_SYS_DYNAMIC_LINKER ++- ++- ++-# _LT_PATH_TOOL_PREFIX(TOOL) ++-# -------------------------- ++-# find a file program which can recognize shared library ++-AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++-[m4_require([_LT_DECL_EGREP])dnl ++-AC_MSG_CHECKING([for $1]) ++-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++-[case $MAGIC_CMD in ++-[[\\/*] | ?:[\\/]*]) ++- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++- ;; ++-*) ++- lt_save_MAGIC_CMD="$MAGIC_CMD" ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++-dnl $ac_dummy forces splitting on constant user-supplied paths. ++-dnl POSIX.2 word splitting is done only on the output of word expansions, ++-dnl not every word. This closes a longstanding sh security hole. ++- ac_dummy="m4_if([$2], , $PATH, [$2])" ++- for ac_dir in $ac_dummy; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$1; then ++- lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++- if test -n "$file_magic_test_file"; then ++- case $deplibs_check_method in ++- "file_magic "*) ++- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++- $EGREP "$file_magic_regex" > /dev/null; then ++- : ++- else ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: the command libtool uses to detect shared libraries, ++-*** $file_magic_cmd, produces output that libtool cannot recognize. ++-*** The result is that libtool may fail to recognize shared libraries ++-*** as such. This will affect the creation of libtool libraries that ++-*** depend on shared libraries, but programs linked with such libtool ++-*** libraries will work regardless of this problem. Nevertheless, you ++-*** may want to report the problem to your system manager and/or to ++-*** bug-libtool@gnu.org ++- ++-_LT_EOF ++- fi ;; ++- esac ++- fi ++- break ++- fi ++- done ++- IFS="$lt_save_ifs" ++- MAGIC_CMD="$lt_save_MAGIC_CMD" ++- ;; ++-esac]) ++-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++-if test -n "$MAGIC_CMD"; then ++- AC_MSG_RESULT($MAGIC_CMD) ++-else ++- AC_MSG_RESULT(no) ++-fi ++-_LT_DECL([], [MAGIC_CMD], [0], ++- [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++-])# _LT_PATH_TOOL_PREFIX ++- ++-# Old name: ++-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++- ++- ++-# _LT_PATH_MAGIC ++-# -------------- ++-# find a file program which can recognize a shared library ++-m4_defun([_LT_PATH_MAGIC], ++-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++-if test -z "$lt_cv_path_MAGIC_CMD"; then ++- if test -n "$ac_tool_prefix"; then ++- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++- else ++- MAGIC_CMD=: ++- fi ++-fi ++-])# _LT_PATH_MAGIC ++- ++- ++-# LT_PATH_LD ++-# ---------- ++-# find the pathname to the GNU or non-GNU linker ++-AC_DEFUN([LT_PATH_LD], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++-m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++- ++-AC_ARG_WITH([gnu-ld], ++- [AS_HELP_STRING([--with-gnu-ld], ++- [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++- [test "$withval" = no || with_gnu_ld=yes], ++- [with_gnu_ld=no])dnl ++- ++-ac_prog=ld ++-if test "$GCC" = yes; then ++- # Check if gcc -print-prog-name=ld gives a path. ++- AC_MSG_CHECKING([for ld used by $CC]) ++- case $host in ++- *-*-mingw*) ++- # gcc leaves a trailing carriage return which upsets mingw ++- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++- *) ++- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++- esac ++- case $ac_prog in ++- # Accept absolute paths. ++- [[\\/]]* | ?:[[\\/]]*) ++- re_direlt='/[[^/]][[^/]]*/\.\./' ++- # Canonicalize the pathname of ld ++- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++- done ++- test -z "$LD" && LD="$ac_prog" ++- ;; ++- "") ++- # If it fails, then pretend we aren't using GCC. ++- ac_prog=ld ++- ;; ++- *) ++- # If it is relative, then search for the first ld in PATH. ++- with_gnu_ld=unknown ++- ;; ++- esac ++-elif test "$with_gnu_ld" = yes; then ++- AC_MSG_CHECKING([for GNU ld]) ++-else ++- AC_MSG_CHECKING([for non-GNU ld]) ++-fi ++-AC_CACHE_VAL(lt_cv_path_LD, ++-[if test -z "$LD"; then ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++- lt_cv_path_LD="$ac_dir/$ac_prog" ++- # Check to see if the program is GNU ld. I'd rather use --version, ++- # but apparently some variants of GNU ld only accept -v. ++- # Break only if it was the GNU/non-GNU ld that we prefer. ++- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then ++- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++- lt_cv_file_magic_cmd='func_win32_libid' ++- else ++- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++- lt_cv_file_magic_cmd='$OBJDUMP -f' ++- fi ++- ;; ++- ++-cegcc) ++- # use the weaker test based on 'objdump'. See mingw*. ++- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++- lt_cv_file_magic_cmd='$OBJDUMP -f' ++- ;; ++- ++-darwin* | rhapsody*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-freebsd* | dragonfly*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++- case $host_cpu in ++- i*86 ) ++- # Not sure whether the presence of OpenBSD here was a mistake. ++- # Let's accept both of them until this is cleared up. ++- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++- ;; ++- esac ++- else ++- lt_cv_deplibs_check_method=pass_all ++- fi ++- ;; ++- ++-gnu*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-hpux10.20* | hpux11*) ++- lt_cv_file_magic_cmd=/usr/bin/file ++- case $host_cpu in ++- ia64*) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++- ;; ++- hppa*64*) ++- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++- ;; ++- *) ++- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++- ;; ++- esac ++- ;; ++- ++-interix[[3-9]]*) ++- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++- ;; ++- ++-irix5* | irix6* | nonstopux*) ++- case $LD in ++- *-32|*"-32 ") libmagic=32-bit;; ++- *-n32|*"-n32 ") libmagic=N32;; ++- *-64|*"-64 ") libmagic=64-bit;; ++- *) libmagic=never-match;; ++- esac ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-# This must be Linux ELF. ++-linux* | k*bsd*-gnu) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++- fi ++- ;; ++- ++-newos6*) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++- lt_cv_file_magic_cmd=/usr/bin/file ++- lt_cv_file_magic_test_file=/usr/lib/libnls.so ++- ;; ++- ++-*nto* | *qnx*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-openbsd*) ++- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++- else ++- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++- fi ++- ;; ++- ++-osf3* | osf4* | osf5*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-rdos*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-solaris*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- ++-sysv4 | sysv4.3*) ++- case $host_vendor in ++- motorola) ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++- ;; ++- ncr) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- sequent) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++- ;; ++- sni) ++- lt_cv_file_magic_cmd='/bin/file' ++- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++- lt_cv_file_magic_test_file=/lib/libc.so ++- ;; ++- siemens) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- pc) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++- esac ++- ;; ++- ++-tpf*) ++- lt_cv_deplibs_check_method=pass_all ++- ;; ++-esac ++-]) ++-file_magic_cmd=$lt_cv_file_magic_cmd ++-deplibs_check_method=$lt_cv_deplibs_check_method ++-test -z "$deplibs_check_method" && deplibs_check_method=unknown ++- ++-_LT_DECL([], [deplibs_check_method], [1], ++- [Method to check whether dependent libraries are shared objects]) ++-_LT_DECL([], [file_magic_cmd], [1], ++- [Command to use when deplibs_check_method == "file_magic"]) ++-])# _LT_CHECK_MAGIC_METHOD ++- ++- ++-# LT_PATH_NM ++-# ---------- ++-# find the pathname to a BSD- or MS-compatible name lister ++-AC_DEFUN([LT_PATH_NM], ++-[AC_REQUIRE([AC_PROG_CC])dnl ++-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, ++-[if test -n "$NM"; then ++- # Let the user override the test. ++- lt_cv_path_NM="$NM" ++-else ++- lt_nm_to_check="${ac_tool_prefix}nm" ++- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++- lt_nm_to_check="$lt_nm_to_check nm" ++- fi ++- for lt_tmp_nm in $lt_nm_to_check; do ++- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++- IFS="$lt_save_ifs" ++- test -z "$ac_dir" && ac_dir=. ++- tmp_nm="$ac_dir/$lt_tmp_nm" ++- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++- # Check to see if the nm accepts a BSD-compat flag. ++- # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++- # nm: unknown option "B" ignored ++- # Tru64's nm complains that /dev/null is an invalid object file ++- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++- */dev/null* | *'Invalid file or object type'*) ++- lt_cv_path_NM="$tmp_nm -B" ++- break ++- ;; ++- *) ++- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++- */dev/null*) ++- lt_cv_path_NM="$tmp_nm -p" ++- break ++- ;; ++- *) ++- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++- continue # so that we can try to find one that supports BSD flags ++- ;; ++- esac ++- ;; ++- esac ++- fi ++- done ++- IFS="$lt_save_ifs" ++- done ++- : ${lt_cv_path_NM=no} ++-fi]) ++-if test "$lt_cv_path_NM" != "no"; then ++- NM="$lt_cv_path_NM" ++-else ++- # Didn't find any BSD compatible name lister, look for dumpbin. ++- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++- AC_SUBST([DUMPBIN]) ++- if test "$DUMPBIN" != ":"; then ++- NM="$DUMPBIN" ++- fi ++-fi ++-test -z "$NM" && NM=nm ++-AC_SUBST([NM]) ++-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl ++- ++-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++- [lt_cv_nm_interface="BSD nm" ++- echo "int some_variable = 0;" > conftest.$ac_ext ++- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$ac_compile" 2>conftest.err) ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++- cat conftest.err >&AS_MESSAGE_LOG_FD ++- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++- cat conftest.out >&AS_MESSAGE_LOG_FD ++- if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++- lt_cv_nm_interface="MS dumpbin" ++- fi ++- rm -f conftest*]) ++-])# LT_PATH_NM ++- ++-# Old names: ++-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) ++-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AM_PROG_NM], []) ++-dnl AC_DEFUN([AC_PROG_NM], []) ++- ++- ++-# LT_LIB_M ++-# -------- ++-# check for math library ++-AC_DEFUN([LT_LIB_M], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-LIBM= ++-case $host in ++-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++- # These system don't have libm, or don't need it ++- ;; ++-*-ncr-sysv4.3*) ++- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++- ;; ++-*) ++- AC_CHECK_LIB(m, cos, LIBM="-lm") ++- ;; ++-esac ++-AC_SUBST([LIBM]) ++-])# LT_LIB_M ++- ++-# Old name: ++-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_CHECK_LIBM], []) ++- ++- ++-# _LT_COMPILER_NO_RTTI([TAGNAME]) ++-# ------------------------------- ++-m4_defun([_LT_COMPILER_NO_RTTI], ++-[m4_require([_LT_TAG_COMPILER])dnl ++- ++-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++- ++-if test "$GCC" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++- ++- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++- lt_cv_prog_compiler_rtti_exceptions, ++- [-fno-rtti -fno-exceptions], [], ++- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++-fi ++-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], ++- [Compiler flag to turn off builtin functions]) ++-])# _LT_COMPILER_NO_RTTI ++- ++- ++-# _LT_CMD_GLOBAL_SYMBOLS ++-# ---------------------- ++-m4_defun([_LT_CMD_GLOBAL_SYMBOLS], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-AC_REQUIRE([AC_PROG_CC])dnl ++-AC_REQUIRE([LT_PATH_NM])dnl ++-AC_REQUIRE([LT_PATH_LD])dnl ++-m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++-m4_require([_LT_TAG_COMPILER])dnl ++- ++-# Check for command to grab the raw symbol name followed by C symbol from nm. ++-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++-[ ++-# These are sane defaults that work on at least a few old systems. ++-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++- ++-# Character class describing NM global symbol codes. ++-symcode='[[BCDEGRST]]' ++- ++-# Regexp to match symbols that can be accessed directly from C. ++-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++- ++-# Define system-specific variables. ++-case $host_os in ++-aix*) ++- symcode='[[BCDT]]' ++- ;; ++-cygwin* | mingw* | pw32* | cegcc*) ++- symcode='[[ABCDGISTW]]' ++- ;; ++-hpux*) ++- if test "$host_cpu" = ia64; then ++- symcode='[[ABCDEGRST]]' ++- fi ++- ;; ++-irix* | nonstopux*) ++- symcode='[[BCDEGRST]]' ++- ;; ++-osf*) ++- symcode='[[BCDEGQRST]]' ++- ;; ++-solaris*) ++- symcode='[[BDRT]]' ++- ;; ++-sco3.2v5*) ++- symcode='[[DT]]' ++- ;; ++-sysv4.2uw2*) ++- symcode='[[DT]]' ++- ;; ++-sysv5* | sco5v6* | unixware* | OpenUNIX*) ++- symcode='[[ABDT]]' ++- ;; ++-sysv4) ++- symcode='[[DFNSTU]]' ++- ;; ++-esac ++- ++-# If we're using GNU nm, then use its standard symbol codes. ++-case `$NM -V 2>&1` in ++-*GNU* | *'with BFD'*) ++- symcode='[[ABCDGIRSTW]]' ;; ++-esac ++- ++-# Transform an extracted symbol line into a proper C declaration. ++-# Some systems (esp. on ia64) link data and code symbols differently, ++-# so use this general approach. ++-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++- ++-# Transform an extracted symbol line into symbol name and symbol address ++-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++- ++-# Handle CRLF in mingw tool chain ++-opt_cr= ++-case $build_os in ++-mingw*) ++- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++- ;; ++-esac ++- ++-# Try without a prefix underscore, then with it. ++-for ac_symprfx in "" "_"; do ++- ++- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++- symxfrm="\\1 $ac_symprfx\\2 \\2" ++- ++- # Write the raw and C identifiers. ++- if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++- # Fake it for dumpbin and say T for any non-static function ++- # and D for any global variable. ++- # Also find C++ and __fastcall symbols from MSVC++, ++- # which start with @ or ?. ++- lt_cv_sys_global_symbol_pipe="$AWK ['"\ ++-" {last_section=section; section=\$ 3};"\ ++-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++-" \$ 0!~/External *\|/{next};"\ ++-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++-" {if(hide[section]) next};"\ ++-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++-" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++-" ' prfx=^$ac_symprfx]" ++- else ++- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++- fi ++- ++- # Check to see that the pipe works correctly. ++- pipe_works=no ++- ++- rm -f conftest* ++- cat > conftest.$ac_ext <<_LT_EOF ++-#ifdef __cplusplus ++-extern "C" { ++-#endif ++-char nm_test_var; ++-void nm_test_func(void); ++-void nm_test_func(void){} ++-#ifdef __cplusplus ++-} ++-#endif ++-int main(){nm_test_var='a';nm_test_func();return(0);} ++-_LT_EOF ++- ++- if AC_TRY_EVAL(ac_compile); then ++- # Now try to grab the symbols. ++- nlist=conftest.nm ++- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then ++- # Try sorting and uniquifying the output. ++- if sort "$nlist" | uniq > "$nlist"T; then ++- mv -f "$nlist"T "$nlist" ++- else ++- rm -f "$nlist"T ++- fi ++- ++- # Make sure that we snagged all the symbols we need. ++- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++- cat <<_LT_EOF > conftest.$ac_ext ++-#ifdef __cplusplus ++-extern "C" { ++-#endif ++- ++-_LT_EOF ++- # Now generate the symbol file. ++- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++- ++- cat <<_LT_EOF >> conftest.$ac_ext ++- ++-/* The mapping between symbol names and symbols. */ ++-const struct { ++- const char *name; ++- void *address; ++-} ++-lt__PROGRAM__LTX_preloaded_symbols[[]] = ++-{ ++- { "@PROGRAM@", (void *) 0 }, ++-_LT_EOF ++- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++- cat <<\_LT_EOF >> conftest.$ac_ext ++- {0, (void *) 0} ++-}; ++- ++-/* This works around a problem in FreeBSD linker */ ++-#ifdef FREEBSD_WORKAROUND ++-static const void *lt_preloaded_setup() { ++- return lt__PROGRAM__LTX_preloaded_symbols; ++-} ++-#endif ++- ++-#ifdef __cplusplus ++-} ++-#endif ++-_LT_EOF ++- # Now try linking the two files. ++- mv conftest.$ac_objext conftstm.$ac_objext ++- lt_save_LIBS="$LIBS" ++- lt_save_CFLAGS="$CFLAGS" ++- LIBS="conftstm.$ac_objext" ++- CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++- pipe_works=yes ++- fi ++- LIBS="$lt_save_LIBS" ++- CFLAGS="$lt_save_CFLAGS" ++- else ++- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++- fi ++- else ++- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++- cat conftest.$ac_ext >&5 ++- fi ++- rm -rf conftest* conftst* ++- ++- # Do not use the global_symbol_pipe unless it works. ++- if test "$pipe_works" = yes; then ++- break ++- else ++- lt_cv_sys_global_symbol_pipe= ++- fi ++-done ++-]) ++-if test -z "$lt_cv_sys_global_symbol_pipe"; then ++- lt_cv_sys_global_symbol_to_cdecl= ++-fi ++-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++- AC_MSG_RESULT(failed) ++-else ++- AC_MSG_RESULT(ok) ++-fi ++- ++-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], ++- [Take the output of nm and produce a listing of raw symbols and C names]) ++-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], ++- [Transform the output of nm in a proper C declaration]) ++-_LT_DECL([global_symbol_to_c_name_address], ++- [lt_cv_sys_global_symbol_to_c_name_address], [1], ++- [Transform the output of nm in a C name address pair]) ++-_LT_DECL([global_symbol_to_c_name_address_lib_prefix], ++- [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], ++- [Transform the output of nm in a C name address pair when lib prefix is needed]) ++-]) # _LT_CMD_GLOBAL_SYMBOLS ++- ++- ++-# _LT_COMPILER_PIC([TAGNAME]) ++-# --------------------------- ++-m4_defun([_LT_COMPILER_PIC], ++-[m4_require([_LT_TAG_COMPILER])dnl ++-_LT_TAGVAR(lt_prog_compiler_wl, $1)= ++-_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++-_LT_TAGVAR(lt_prog_compiler_static, $1)= ++- ++-AC_MSG_CHECKING([for $compiler option to produce PIC]) ++-m4_if([$1], [CXX], [ ++- # C++ specific cases for pic, static, wl, etc. ++- if test "$GXX" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- m68k) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- esac ++- ;; ++- ++- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- mingw* | cygwin* | os2* | pw32* | cegcc*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- # Although the cygwin gcc ignores -fPIC, still need this for old-style ++- # (--disable-auto-import) libraries ++- m4_if([$1], [GCJ], [], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++- ;; ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- *djgpp*) ++- # DJGPP does not support shared libraries at all ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- interix[[3-9]]*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- hpux*) ++- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++- # sets the default TLS model and affects inlining. ++- case $host_cpu in ++- hppa*64*) ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- *qnx* | *nto*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- case $host_os in ++- aix[[4-9]]*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- chorus*) ++- case $cc_basename in ++- cxch68*) ++- # Green Hills C++ Compiler ++- # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++- ;; ++- esac ++- ;; ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- freebsd* | dragonfly*) ++- # FreeBSD uses GNU C++ ++- ;; ++- hpux9* | hpux10* | hpux11*) ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- if test "$host_cpu" != ia64; then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- fi ++- ;; ++- aCC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- interix*) ++- # This is c89, which is MS Visual C++ (no shared libs) ++- # Anyone wants to do a port? ++- ;; ++- irix5* | irix6* | nonstopux*) ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- # CC pic flag -KPIC is the default. ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- KCC*) ++- # KAI C++ Compiler ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- ecpc* ) ++- # old Intel C++ for x86_64 which still supported -KPIC. ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- icpc* ) ++- # Intel C++, used to be incompatible with GCC. ++- # ICC 10 doesn't accept -KPIC any more. ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- pgCC* | pgcpp*) ++- # Portland Group C++ compiler ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- cxx*) ++- # Compaq C++ ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- xlc* | xlC*) ++- # IBM XL 8.0 on PPC ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C++ 5.9 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- ;; ++- esac ++- ;; ++- esac ++- ;; ++- lynxos*) ++- ;; ++- m88k*) ++- ;; ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- netbsd*) ++- ;; ++- *qnx* | *nto*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- osf3* | osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- cxx*) ++- # Digital/Compaq C++ ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # Make sure the PIC flag is empty. It appears that all Alpha ++- # Linux and Compaq Tru64 Unix objects are PIC. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- psos*) ++- ;; ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- lcc*) ++- # Lucid ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- esac ++- ;; ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- ;; ++- *) ++- ;; ++- esac ++- ;; ++- vxworks*) ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-], ++-[ ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ++- case $host_os in ++- aix*) ++- # All AIX code is PIC. ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- m68k) ++- # FIXME: we need at least 68020 code to build shared libraries, but ++- # adding the `-m68020' flag to GCC prevents building anything better, ++- # like `-m68040'. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++- ;; ++- esac ++- ;; ++- ++- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++- # PIC is the default for these OSes. ++- ;; ++- ++- mingw* | cygwin* | pw32* | os2* | cegcc*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- # Although the cygwin gcc ignores -fPIC, still need this for old-style ++- # (--disable-auto-import) libraries ++- m4_if([$1], [GCJ], [], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++- ;; ++- ++- darwin* | rhapsody*) ++- # PIC is the default on this platform ++- # Common symbols not allowed in MH_DYLIB files ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++- ;; ++- ++- hpux*) ++- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++- # sets the default TLS model and affects inlining. ++- case $host_cpu in ++- hppa*64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- ;; ++- ++- interix[[3-9]]*) ++- # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++- # Instead, we relocate shared libraries at runtime. ++- ;; ++- ++- msdosdjgpp*) ++- # Just because we use GCC doesn't mean we suddenly get shared libraries ++- # on systems that don't support them. ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- enable_shared=no ++- ;; ++- ++- *nto* | *qnx*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++- fi ++- ;; ++- ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- ;; ++- esac ++- else ++- # PORTME Check for flag to pass linker flags through the system compiler. ++- case $host_os in ++- aix*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- if test "$host_cpu" = ia64; then ++- # AIX 5 now supports IA64 processor ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- else ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++- fi ++- ;; ++- ++- mingw* | cygwin* | pw32* | os2* | cegcc*) ++- # This hack is so that the source file can tell whether it is being ++- # built for inclusion in a dll (and should export symbols for example). ++- m4_if([$1], [GCJ], [], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++- ;; ++- ++- hpux9* | hpux10* | hpux11*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++- # not for PA HP-UX. ++- case $host_cpu in ++- hppa*64*|ia64*) ++- # +Z the default ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++- ;; ++- esac ++- # Is there a better lt_prog_compiler_static that works with the bundled CC? ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # PIC (with -KPIC) is the default. ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- # old Intel for x86_64 which still supported -KPIC. ++- ecc*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- # icc used to be incompatible with GCC. ++- # ICC 10 doesn't accept -KPIC any more. ++- icc* | ifort*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++- ;; ++- # Lahey Fortran 8.1. ++- lf95*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++- ;; ++- pgcc* | pgf77* | pgf90* | pgf95*) ++- # Portland Group compilers (*not* the Pentium gcc compiler, ++- # which looks to be a dead project) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ccc*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All Alpha code is PIC. ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- xl*) ++- # IBM XL C 8.0/Fortran 10.1 on PPC ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C 5.9 ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- ;; ++- *Sun\ F*) ++- # Sun Fortran 8.3 passes all unrecognized flags to the linker ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ++- ;; ++- esac ++- ;; ++- esac ++- ;; ++- ++- newsos6) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- *nto* | *qnx*) ++- # QNX uses GNU C++, but need to define -shared option too, otherwise ++- # it will coredump. ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++- ;; ++- ++- osf3* | osf4* | osf5*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- # All OSF/1 code is PIC. ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- rdos*) ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++- ;; ++- ++- solaris*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- case $cc_basename in ++- f77* | f90* | f95*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4 | sysv4.2uw2* | sysv4.3*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec ;then ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- fi ++- ;; ++- ++- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- unicos*) ++- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- ++- uts4*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++- ;; ++- ++- *) ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++- ;; ++- esac ++- fi ++-]) ++-case $host_os in ++- # For platforms which do not support PIC, -DPIC is meaningless: ++- *djgpp*) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- ;; ++- *) ++- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ++- ;; ++-esac ++-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++- [How to pass a linker flag through the compiler]) ++- ++-# ++-# Check to make sure the PIC flag actually works. ++-# ++-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], ++- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], ++- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], ++- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in ++- "" | " "*) ;; ++- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++- esac], ++- [_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++-fi ++-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], ++- [Additional compiler flags for building library objects]) ++- ++-# ++-# Check to make sure the static flag actually works. ++-# ++-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" ++-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++- $lt_tmp_static_flag, ++- [], ++- [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) ++-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], ++- [Compiler flag to prevent dynamic linking]) ++-])# _LT_COMPILER_PIC ++- ++- ++-# _LT_LINKER_SHLIBS([TAGNAME]) ++-# ---------------------------- ++-# See if the linker supports building shared libraries. ++-m4_defun([_LT_LINKER_SHLIBS], ++-[AC_REQUIRE([LT_PATH_LD])dnl ++-AC_REQUIRE([LT_PATH_NM])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++-m4_require([_LT_DECL_SED])dnl ++-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++-m4_require([_LT_TAG_COMPILER])dnl ++-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++-m4_if([$1], [CXX], [ ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- case $host_os in ++- aix[[4-9]]*) ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- fi ++- ;; ++- pw32*) ++- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++- ;; ++- cygwin* | mingw* | cegcc*) ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- *) ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- ;; ++- esac ++- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++-], [ ++- runpath_var= ++- _LT_TAGVAR(allow_undefined_flag, $1)= ++- _LT_TAGVAR(always_export_symbols, $1)=no ++- _LT_TAGVAR(archive_cmds, $1)= ++- _LT_TAGVAR(archive_expsym_cmds, $1)= ++- _LT_TAGVAR(compiler_needs_object, $1)=no ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++- _LT_TAGVAR(hardcode_automatic, $1)=no ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++- _LT_TAGVAR(hardcode_libdir_separator, $1)= ++- _LT_TAGVAR(hardcode_minus_L, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++- _LT_TAGVAR(inherit_rpath, $1)=no ++- _LT_TAGVAR(link_all_deplibs, $1)=unknown ++- _LT_TAGVAR(module_cmds, $1)= ++- _LT_TAGVAR(module_expsym_cmds, $1)= ++- _LT_TAGVAR(old_archive_from_new_cmds, $1)= ++- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++- _LT_TAGVAR(thread_safe_flag_spec, $1)= ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- # include_expsyms should be a list of space-separated symbols to be *always* ++- # included in the symbol list ++- _LT_TAGVAR(include_expsyms, $1)= ++- # exclude_expsyms can be an extended regexp of symbols to exclude ++- # it will be wrapped by ` (' and `)$', so one must not match beginning or ++- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++- # as well as any symbol that contains `d'. ++- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++- # platforms (ab)use it in PIC code, but their linkers get confused if ++- # the symbol is explicitly referenced. Since portable code cannot ++- # rely on this symbol name, it's probably fine to never include it in ++- # preloaded symbol tables. ++- # Exclude shared library initialization/finalization symbols. ++-dnl Note also adjust exclude_expsyms for C++ above. ++- extract_expsyms_cmds= ++- ++- case $host_os in ++- cygwin* | mingw* | pw32* | cegcc*) ++- # FIXME: the MSVC++ port hasn't been tested in a loooong time ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- if test "$GCC" != yes; then ++- with_gnu_ld=no ++- fi ++- ;; ++- interix*) ++- # we just hope/assume this is gcc and not c89 (= MSVC++) ++- with_gnu_ld=yes ++- ;; ++- openbsd*) ++- with_gnu_ld=no ++- ;; ++- esac ++- ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- if test "$with_gnu_ld" = yes; then ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- wlarc='${wl}' ++- ++- # Set some defaults for GNU ld with shared library support. These ++- # are reset later if shared libraries are not supported. Putting them ++- # here allows them to be overridden if necessary. ++- runpath_var=LD_RUN_PATH ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- supports_anon_versioning=no ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++- *\ 2.11.*) ;; # other 2.11 versions ++- *) supports_anon_versioning=yes ;; ++- esac ++- ++- # See if GNU ld supports shared libraries. ++- case $host_os in ++- aix[[3-9]]*) ++- # On AIX/PPC, the GNU linker is very broken ++- if test "$host_cpu" != ia64; then ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++-*** to be unable to reliably create shared libraries on AIX. ++-*** Therefore, libtool is disabling shared libraries support. If you ++-*** really care for shared libraries, you may want to modify your PATH ++-*** so that a non-GNU linker is found, and then restart. ++- ++-_LT_EOF ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='' ++- ;; ++- m68k) ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- cygwin* | mingw* | pw32* | cegcc*) ++- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(always_export_symbols, $1)=no ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++- ++- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- interix[[3-9]]*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- ++- gnu* | linux* | tpf* | k*bsd*-gnu) ++- tmp_diet=no ++- if test "$host_os" = linux-dietlibc; then ++- case $cc_basename in ++- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++- esac ++- fi ++- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++- && test "$tmp_diet" = no ++- then ++- tmp_addflag= ++- tmp_sharedflag='-shared' ++- case $cc_basename,$host_cpu in ++- pgcc*) # Portland Group C compiler ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag' ++- ;; ++- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- tmp_addflag=' $pic_flag -Mnomain' ;; ++- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++- tmp_addflag=' -i_dynamic' ;; ++- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++- tmp_addflag=' -i_dynamic -nofor_main' ;; ++- ifc* | ifort*) # Intel Fortran compiler ++- tmp_addflag=' -nofor_main' ;; ++- lf95*) # Lahey Fortran 8.1 ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- tmp_sharedflag='--shared' ;; ++- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++- tmp_sharedflag='-qmkshrobj' ++- tmp_addflag= ;; ++- esac ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) # Sun C 5.9 ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- _LT_TAGVAR(compiler_needs_object, $1)=yes ++- tmp_sharedflag='-G' ;; ++- *Sun\ F*) # Sun Fortran 8.3 ++- tmp_sharedflag='-G' ;; ++- esac ++- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- ++- if test "x$supports_anon_versioning" = xyes; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- ++- case $cc_basename in ++- xlf*) ++- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++- if test "x$supports_anon_versioning" = xyes; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++- fi ++- ;; ++- esac ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++- wlarc= ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- fi ++- ;; ++- ++- solaris*) ++- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++-*** create shared libraries on Solaris systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.9.1 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-_LT_EOF ++- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++- case `$LD -v 2>&1` in ++- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- cat <<_LT_EOF 1>&2 ++- ++-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++-*** reliably create shared libraries on SCO systems. Therefore, libtool ++-*** is disabling shared libraries support. We urge you to upgrade GNU ++-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++-*** your PATH or compiler configuration so that the native linker is ++-*** used, and then restart. ++- ++-_LT_EOF ++- ;; ++- *) ++- # For security reasons, it is highly recommended that you always ++- # use absolute paths for naming shared libraries, and exclude the ++- # DT_RUNPATH tag from executables and libraries. But doing so ++- # requires that you compile everything twice, which is a pain. ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- sunos4*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- wlarc= ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ++- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then ++- runpath_var= ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- # PORTME fill in a description of your system's linker (not GNU ld) ++- case $host_os in ++- aix3*) ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(always_export_symbols, $1)=yes ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++- # Note: this linker hardcodes the directories in LIBPATH if there ++- # are no directories specified by -L. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++- # Neither direct hardcoding nor static linking is supported with a ++- # broken collect2. ++- _LT_TAGVAR(hardcode_direct, $1)=unsupported ++- fi ++- ;; ++- ++- aix[[4-9]]*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- # If we're using GNU nm, then we don't want the "-C" option. ++- # -C means demangle to AIX nm, but means don't demangle with GNU nm ++- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- else ++- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++- fi ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++- for ld_flag in $LDFLAGS; do ++- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++- aix_use_runtimelinking=yes ++- break ++- fi ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_TAGVAR(archive_cmds, $1)='' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++- ++- if test "$GCC" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && ++- strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- : ++- else ++- # We have old collect2 ++- _LT_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- ;; ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to export. ++- _LT_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an ++- # empty executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an ++- # empty executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared libraries. ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- amigaos*) ++- case $host_cpu in ++- powerpc) ++- # see comment about AmigaOS4 .so support ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='' ++- ;; ++- m68k) ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- ;; ++- ++- bsdi[[45]]*) ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++- ;; ++- ++- cygwin* | mingw* | pw32* | cegcc*) ++- # When not using gcc, we currently assume that we are using ++- # Microsoft Visual C++. ++- # hardcode_libdir_flag_spec is actually meaningless, as there is ++- # no search path for DLLs. ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Tell ltmain to make .lib files, not .a files. ++- libext=lib ++- # Tell ltmain to make .dll files, not .so files. ++- shrext_cmds=".dll" ++- # FIXME: Setting linknames here is a bad hack. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++- # The linker will automatically build a .lib file if we build a DLL. ++- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++- # FIXME: Should let the user specify the lib program. ++- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ;; ++- ++- darwin* | rhapsody*) ++- _LT_DARWIN_LINKER_FEATURES($1) ++- ;; ++- ++- dgux*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- freebsd1*) ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++- # support. Future versions do this automatically, but an explicit c++rt0.o ++- # does not break anything, and helps significantly (at the cost of a little ++- # extra space). ++- freebsd2.2*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++- freebsd2*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++- freebsd* | dragonfly*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- hpux9*) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- ++- hpux10*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- fi ++- ;; ++- ++- hpux11*) ++- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- else ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- fi ++- if test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ++- # hardcode_minus_L: Not really in the search PATH, ++- # but as the default location of the library. ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- ;; ++- esac ++- fi ++- ;; ++- ++- irix5* | irix6* | nonstopux*) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- # Try to use the -exported_symbol ld option, if it does not ++- # work, assume that -exports_file does not work either and ++- # implicitly export all symbols. ++- save_LDFLAGS="$LDFLAGS" ++- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++- AC_LINK_IFELSE(int foo(void) {}, ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++- ) ++- LDFLAGS="$save_LDFLAGS" ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++- fi ++- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(inherit_rpath, $1)=yes ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- newsos6) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *nto* | *qnx*) ++- ;; ++- ++- openbsd*) ++- if test -f /usr/libexec/ld.so; then ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- else ++- case $host_os in ++- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- ;; ++- esac ++- fi ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- os2*) ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++- ;; ++- ++- osf3*) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- fi ++- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- osf4* | osf5*) # as osf3* with the addition of -msym flag ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- else ++- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++- ++- # Both c and cxx compiler support -rpath directly ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- fi ++- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ;; ++- ++- solaris*) ++- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' ++- if test "$GCC" = yes; then ++- wlarc='${wl}' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++- else ++- case `$CC -V 2>&1` in ++- *"Compilers 5.0"*) ++- wlarc='' ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++- ;; ++- *) ++- wlarc='${wl}' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++- ;; ++- esac ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine and reorder linker options, ++- # but understands `-z linker_flag'. GCC discards it without `$wl', ++- # but is careful enough not to reorder. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++- else ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++- fi ++- ;; ++- esac ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- ++- sunos4*) ++- if test "x$host_vendor" = xsequent; then ++- # Use $CC to link under sequent, because it throws in some extra .o ++- # files that make .init and .fini sections work. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++- fi ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4) ++- case $host_vendor in ++- sni) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++- ;; ++- siemens) ++- ## LD is ld it makes a PLAMLIB ++- ## CC just makes a GrossModule. ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- ;; ++- motorola) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++- ;; ++- esac ++- runpath_var='LD_RUN_PATH' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- sysv4.3*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++- ;; ++- ++- sysv4*MP*) ++- if test -d /usr/nec; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var=LD_RUN_PATH ++- hardcode_runpath_var=yes ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- fi ++- ;; ++- ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- if test "$GCC" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- fi ++- ;; ++- ++- uts4*) ++- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- ++- *) ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ++- if test x$host_vendor = xsni; then ++- case $host in ++- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++- ;; ++- esac ++- fi ++- fi ++-]) ++-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld ++- ++-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl ++-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl ++-_LT_DECL([], [extract_expsyms_cmds], [2], ++- [The commands to extract the exported symbol list from a shared archive]) ++- ++-# ++-# Do we need to explicitly link libc? ++-# ++-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in ++-x|xyes) ++- # Assume -lc should be added ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- ++- if test "$enable_shared" = yes && test "$GCC" = yes; then ++- case $_LT_TAGVAR(archive_cmds, $1) in ++- *'~'*) ++- # FIXME: we may have to deal with multi-command sequences. ++- ;; ++- '$CC '*) ++- # Test whether the compiler implicitly links with -lc since on some ++- # systems, -lgcc has to come before -lc. If gcc already passes -lc ++- # to ld, don't add -lc before -lgcc. ++- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++- $RM conftest* ++- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++- ++- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++- soname=conftest ++- lib=conftest ++- libobjs=conftest.$ac_objext ++- deplibs= ++- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) ++- compiler_flags=-v ++- linker_flags=-v ++- verstring= ++- output_objdir=. ++- libname=conftest ++- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++- _LT_TAGVAR(allow_undefined_flag, $1)= ++- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) ++- then ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- else ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- fi ++- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++- else ++- cat conftest.err 1>&5 ++- fi ++- $RM conftest* ++- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ++- ;; ++- esac ++- fi ++- ;; ++-esac ++- ++-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], ++- [Whether or not to add -lc for building shared libraries]) ++-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], ++- [enable_shared_with_static_runtimes], [0], ++- [Whether or not to disallow shared libs when runtime libs are static]) ++-_LT_TAGDECL([], [export_dynamic_flag_spec], [1], ++- [Compiler flag to allow reflexive dlopens]) ++-_LT_TAGDECL([], [whole_archive_flag_spec], [1], ++- [Compiler flag to generate shared objects directly from archives]) ++-_LT_TAGDECL([], [compiler_needs_object], [1], ++- [Whether the compiler copes with passing no objects directly]) ++-_LT_TAGDECL([], [old_archive_from_new_cmds], [2], ++- [Create an old-style archive from a shared archive]) ++-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], ++- [Create a temporary old-style archive to link instead of a shared archive]) ++-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) ++-_LT_TAGDECL([], [archive_expsym_cmds], [2]) ++-_LT_TAGDECL([], [module_cmds], [2], ++- [Commands used to build a loadable module if different from building ++- a shared archive.]) ++-_LT_TAGDECL([], [module_expsym_cmds], [2]) ++-_LT_TAGDECL([], [with_gnu_ld], [1], ++- [Whether we are building with GNU ld or not]) ++-_LT_TAGDECL([], [allow_undefined_flag], [1], ++- [Flag that allows shared libraries with undefined symbols to be built]) ++-_LT_TAGDECL([], [no_undefined_flag], [1], ++- [Flag that enforces no undefined symbols]) ++-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], ++- [Flag to hardcode $libdir into a binary during linking. ++- This must work even if $libdir does not exist]) ++-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], ++- [[If ld is used when linking, flag to hardcode $libdir into a binary ++- during linking. This must work even if $libdir does not exist]]) ++-_LT_TAGDECL([], [hardcode_libdir_separator], [1], ++- [Whether we need a single "-rpath" flag with a separated argument]) ++-_LT_TAGDECL([], [hardcode_direct], [0], ++- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++- DIR into the resulting binary]) ++-_LT_TAGDECL([], [hardcode_direct_absolute], [0], ++- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++- DIR into the resulting binary and the resulting library dependency is ++- "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++- library is relocated]) ++-_LT_TAGDECL([], [hardcode_minus_L], [0], ++- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++- into the resulting binary]) ++-_LT_TAGDECL([], [hardcode_shlibpath_var], [0], ++- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++- into the resulting binary]) ++-_LT_TAGDECL([], [hardcode_automatic], [0], ++- [Set to "yes" if building a shared library automatically hardcodes DIR ++- into the library and all subsequent libraries and executables linked ++- against it]) ++-_LT_TAGDECL([], [inherit_rpath], [0], ++- [Set to yes if linker adds runtime paths of dependent libraries ++- to runtime path list]) ++-_LT_TAGDECL([], [link_all_deplibs], [0], ++- [Whether libtool must link a program against all its dependency libraries]) ++-_LT_TAGDECL([], [fix_srcfile_path], [1], ++- [Fix the shell variable $srcfile for the compiler]) ++-_LT_TAGDECL([], [always_export_symbols], [0], ++- [Set to "yes" if exported symbols are required]) ++-_LT_TAGDECL([], [export_symbols_cmds], [2], ++- [The commands to list exported symbols]) ++-_LT_TAGDECL([], [exclude_expsyms], [1], ++- [Symbols that should not be listed in the preloaded symbols]) ++-_LT_TAGDECL([], [include_expsyms], [1], ++- [Symbols that must always be exported]) ++-_LT_TAGDECL([], [prelink_cmds], [2], ++- [Commands necessary for linking programs (against libraries) with templates]) ++-_LT_TAGDECL([], [file_list_spec], [1], ++- [Specify filename containing input files]) ++-dnl FIXME: Not yet implemented ++-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], ++-dnl [Compiler flag to generate thread safe objects]) ++-])# _LT_LINKER_SHLIBS ++- ++- ++-# _LT_LANG_C_CONFIG([TAG]) ++-# ------------------------ ++-# Ensure that the configuration variables for a C compiler are suitably ++-# defined. These variables are subsequently used by _LT_CONFIG to write ++-# the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_C_CONFIG], ++-[m4_require([_LT_DECL_EGREP])dnl ++-lt_save_CC="$CC" ++-AC_LANG_PUSH(C) ++- ++-# Source file extension for C test sources. ++-ac_ext=c ++- ++-# Object file extension for compiled C test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="int some_variable = 0;" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='int main(){return(0);}' ++- ++-_LT_TAG_COMPILER ++-# Save the default compiler, since it gets overwritten when the other ++-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++-compiler_DEFAULT=$CC ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-if test -n "$compiler"; then ++- _LT_COMPILER_NO_RTTI($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- LT_SYS_DLOPEN_SELF ++- _LT_CMD_STRIPLIB ++- ++- # Report which library types will actually be built ++- AC_MSG_CHECKING([if libtool supports shared libraries]) ++- AC_MSG_RESULT([$can_build_shared]) ++- ++- AC_MSG_CHECKING([whether to build shared libraries]) ++- test "$can_build_shared" = "no" && enable_shared=no ++- ++- # On AIX, shared libraries and static libraries use the same namespace, and ++- # are all built from PIC. ++- case $host_os in ++- aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- ++- aix[[4-9]]*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++- esac ++- AC_MSG_RESULT([$enable_shared]) ++- ++- AC_MSG_CHECKING([whether to build static libraries]) ++- # Make sure either enable_shared or enable_static is yes. ++- test "$enable_shared" = yes || enable_static=yes ++- AC_MSG_RESULT([$enable_static]) ++- ++- _LT_CONFIG($1) ++-fi ++-AC_LANG_POP ++-CC="$lt_save_CC" ++-])# _LT_LANG_C_CONFIG ++- ++- ++-# _LT_PROG_CXX ++-# ------------ ++-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ ++-# compiler, we have our own version here. ++-m4_defun([_LT_PROG_CXX], ++-[ ++-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) ++-AC_PROG_CXX ++-if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++- (test "X$CXX" != "Xg++"))) ; then ++- AC_PROG_CXXCPP ++-else ++- _lt_caught_CXX_error=yes ++-fi ++-popdef([AC_MSG_ERROR]) ++-])# _LT_PROG_CXX ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([_LT_PROG_CXX], []) ++- ++- ++-# _LT_LANG_CXX_CONFIG([TAG]) ++-# -------------------------- ++-# Ensure that the configuration variables for a C++ compiler are suitably ++-# defined. These variables are subsequently used by _LT_CONFIG to write ++-# the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_CXX_CONFIG], ++-[AC_REQUIRE([_LT_PROG_CXX])dnl ++-m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-m4_require([_LT_DECL_EGREP])dnl ++- ++-AC_LANG_PUSH(C++) ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_TAGVAR(allow_undefined_flag, $1)= ++-_LT_TAGVAR(always_export_symbols, $1)=no ++-_LT_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_TAGVAR(compiler_needs_object, $1)=no ++-_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_direct, $1)=no ++-_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++-_LT_TAGVAR(hardcode_automatic, $1)=no ++-_LT_TAGVAR(inherit_rpath, $1)=no ++-_LT_TAGVAR(module_cmds, $1)= ++-_LT_TAGVAR(module_expsym_cmds, $1)= ++-_LT_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_TAGVAR(no_undefined_flag, $1)= ++-_LT_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Source file extension for C++ test sources. ++-ac_ext=cpp ++- ++-# Object file extension for compiled C++ test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# No sense in running all these tests if we already determined that ++-# the CXX compiler isn't working. Some variables (like enable_shared) ++-# are currently assumed to apply to all compilers on this platform, ++-# and will be corrupted by setting them based on a non-working compiler. ++-if test "$_lt_caught_CXX_error" != yes; then ++- # Code to be used in simple compile tests ++- lt_simple_compile_test_code="int some_variable = 0;" ++- ++- # Code to be used in simple link tests ++- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' ++- ++- # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++- _LT_TAG_COMPILER ++- ++- # save warnings/boilerplate of simple test code ++- _LT_COMPILER_BOILERPLATE ++- _LT_LINKER_BOILERPLATE ++- ++- # Allow CC to be a program name with arguments. ++- lt_save_CC=$CC ++- lt_save_LD=$LD ++- lt_save_GCC=$GCC ++- GCC=$GXX ++- lt_save_with_gnu_ld=$with_gnu_ld ++- lt_save_path_LD=$lt_cv_path_LD ++- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++- else ++- $as_unset lt_cv_prog_gnu_ld ++- fi ++- if test -n "${lt_cv_path_LDCXX+set}"; then ++- lt_cv_path_LD=$lt_cv_path_LDCXX ++- else ++- $as_unset lt_cv_path_LD ++- fi ++- test -z "${LDCXX+set}" || LD=$LDCXX ++- CC=${CXX-"c++"} ++- compiler=$CC ++- _LT_TAGVAR(compiler, $1)=$CC ++- _LT_CC_BASENAME([$compiler]) ++- ++- if test -n "$compiler"; then ++- # We don't want -fno-exception when compiling C++ code, so set the ++- # no_builtin_flag separately ++- if test "$GXX" = yes; then ++- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++- else ++- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++- fi ++- ++- if test "$GXX" = yes; then ++- # Set up default GNU C++ configuration ++- ++- LT_PATH_LD ++- ++- # Check if GNU C++ uses GNU ld as the underlying linker, since the ++- # archiving commands below assume that GNU ld is being used. ++- if test "$with_gnu_ld" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # If archive_cmds runs LD, not CC, wlarc should be empty ++- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++- # investigate it a little bit more. (MM) ++- wlarc='${wl}' ++- ++- # ancient GNU ld didn't support --whole-archive et. al. ++- if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++- $GREP 'no-whole-archive' > /dev/null; then ++- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- else ++- _LT_TAGVAR(whole_archive_flag_spec, $1)= ++- fi ++- else ++- with_gnu_ld=no ++- wlarc= ++- ++- # A generic and very simple default shared library creation ++- # command for GNU C++ for the case where it uses the native ++- # linker, instead of GNU ld. If possible, this setting should ++- # overridden to take advantage of the native linker features on ++- # the platform it is being used on. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- fi ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- ++- else ++- GXX=no ++- with_gnu_ld=no ++- wlarc= ++- fi ++- ++- # PORTME: fill in a description of your system's C++ link characteristics ++- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- case $host_os in ++- aix3*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aix[[4-9]]*) ++- if test "$host_cpu" = ia64; then ++- # On IA64, the linker does run time linking by default, so we don't ++- # have to do anything special. ++- aix_use_runtimelinking=no ++- exp_sym_flag='-Bexport' ++- no_entry_flag="" ++- else ++- aix_use_runtimelinking=no ++- ++- # Test if we are trying to use run time linking or normal ++- # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++- # need to do runtime linking. ++- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++- for ld_flag in $LDFLAGS; do ++- case $ld_flag in ++- *-brtl*) ++- aix_use_runtimelinking=yes ++- break ++- ;; ++- esac ++- done ++- ;; ++- esac ++- ++- exp_sym_flag='-bexport' ++- no_entry_flag='-bnoentry' ++- fi ++- ++- # When large executables or shared objects are built, AIX ld can ++- # have problems creating the table of contents. If linking a library ++- # or program results in "error TOC overflow" add -mminimal-toc to ++- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++- ++- _LT_TAGVAR(archive_cmds, $1)='' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++- ++- if test "$GXX" = yes; then ++- case $host_os in aix4.[[012]]|aix4.[[012]].*) ++- # We only want to do this on AIX 4.2 and lower, the check ++- # below for broken collect2 doesn't work under 4.3+ ++- collect2name=`${CC} -print-prog-name=collect2` ++- if test -f "$collect2name" && ++- strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++- then ++- # We have reworked collect2 ++- : ++- else ++- # We have old collect2 ++- _LT_TAGVAR(hardcode_direct, $1)=unsupported ++- # It fails to find uninstalled libraries when the uninstalled ++- # path is not listed in the libpath. Setting hardcode_minus_L ++- # to unsupported forces relinking ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)= ++- fi ++- esac ++- shared_flag='-shared' ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag="$shared_flag "'${wl}-G' ++- fi ++- else ++- # not using gcc ++- if test "$host_cpu" = ia64; then ++- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++- # chokes on -Wl,-G. The following line is correct: ++- shared_flag='-G' ++- else ++- if test "$aix_use_runtimelinking" = yes; then ++- shared_flag='${wl}-G' ++- else ++- shared_flag='${wl}-bM:SRE' ++- fi ++- fi ++- fi ++- ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++- # It seems that -bexpall does not export symbols beginning with ++- # underscore (_), so it is better to generate a list of symbols to ++- # export. ++- _LT_TAGVAR(always_export_symbols, $1)=yes ++- if test "$aix_use_runtimelinking" = yes; then ++- # Warning - without using the other runtime loading flags (-brtl), ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++- # Determine the default libpath from the value encoded in an empty ++- # executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++- else ++- if test "$host_cpu" = ia64; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++- else ++- # Determine the default libpath from the value encoded in an ++- # empty executable. ++- _LT_SYS_MODULE_PATH_AIX ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++- # Warning - without using the other run time loading flags, ++- # -berok will link without error, but may produce a broken library. ++- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++- # Exported symbols can be pulled into shared objects from archives ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++- # This is similar to how AIX traditionally builds its shared ++- # libraries. ++- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++- fi ++- fi ++- ;; ++- ++- beos*) ++- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- # Joseph Beckenbach says some releases of gcc ++- # support --undefined. This deserves some investigation. FIXME ++- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- chorus*) ++- case $cc_basename in ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- cygwin* | mingw* | pw32* | cegcc*) ++- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++- # as there is no search path for DLLs. ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++- _LT_TAGVAR(always_export_symbols, $1)=no ++- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++- ++- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- # If the export-symbols file already is a .def file (1st line ++- # is EXPORTS), use it as is; otherwise, prepend... ++- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++- cp $export_symbols $output_objdir/$soname.def; ++- else ++- echo EXPORTS > $output_objdir/$soname.def; ++- cat $export_symbols >> $output_objdir/$soname.def; ++- fi~ ++- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- darwin* | rhapsody*) ++- _LT_DARWIN_LINKER_FEATURES($1) ++- ;; ++- ++- dgux*) ++- case $cc_basename in ++- ec++*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ghcx*) ++- # Green Hills C++ Compiler ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- freebsd[[12]]*) ++- # C++ shared libraries reported to be fairly broken before ++- # switch to ELF ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- freebsd-elf*) ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- ;; ++- ++- freebsd* | dragonfly*) ++- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++- # conventions ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- ;; ++- ++- gnu*) ++- ;; ++- ++- hpux9*) ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++- else ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- hpux10*|hpux11*) ++- if test $with_gnu_ld = no; then ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- case $host_cpu in ++- hppa*64*|ia64*) ++- ;; ++- *) ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- ;; ++- esac ++- fi ++- case $host_cpu in ++- hppa*64*|ia64*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- ;; ++- *) ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++- # but as the default ++- # location of the library. ++- ;; ++- esac ++- ++- case $cc_basename in ++- CC*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- aCC*) ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test $with_gnu_ld = no; then ++- case $host_cpu in ++- hppa*64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- ia64*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- ;; ++- esac ++- fi ++- else ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- interix[[3-9]]*) ++- _LT_TAGVAR(hardcode_direct, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++- # Instead, shared libraries are loaded at an image base (0x10000000 by ++- # default) and relocated if they conflict, which is a slow very memory ++- # consuming and fragmenting process. To avoid this, we pick a random, ++- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++- # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++- ;; ++- irix5* | irix6*) ++- case $cc_basename in ++- CC*) ++- # SGI C++ ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++- ;; ++- *) ++- if test "$GXX" = yes; then ++- if test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- else ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++- fi ++- fi ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ;; ++- esac ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- _LT_TAGVAR(inherit_rpath, $1)=yes ++- ;; ++- ++- linux* | k*bsd*-gnu) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++- ;; ++- icpc* | ecpc* ) ++- # Intel C++ ++- with_gnu_ld=yes ++- # version 8.0 and above of icpc choke on multiply defined symbols ++- # if we add $predep_objects and $postdep_objects, however 7.1 and ++- # earlier do not add the objects themselves. ++- case `$CC -V 2>&1` in ++- *"Version 7."*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- *) # Version 8.0 or newer ++- tmp_idyn= ++- case $host_cpu in ++- ia64*) tmp_idyn=' -i_dynamic';; ++- esac ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- ;; ++- esac ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++- ;; ++- pgCC* | pgcpp*) ++- # Portland Group C++ compiler ++- case `$CC -V` in ++- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) ++- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++- $RANLIB $oldlib' ++- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ ++- rm -rf $tpldir~ ++- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++- ;; ++- *) # Version 6 will use weak symbols ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++- ;; ++- esac ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- ;; ++- cxx*) ++- # Compaq C++ ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++- ++- runpath_var=LD_RUN_PATH ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- xl*) ++- # IBM XL 8.0 on PPC, with GNU ld ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++- if test "x$supports_anon_versioning" = xyes; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++- echo "local: *; };" >> $output_objdir/$libname.ver~ ++- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++- fi ++- ;; ++- *) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C++ 5.9 ++- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++- _LT_TAGVAR(compiler_needs_object, $1)=yes ++- ++- # Not sure whether something based on ++- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++- # would be better. ++- output_verbose_link_cmd='echo' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -xar", where "CC" is the Sun C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++- ;; ++- esac ++- ;; ++- esac ++- ;; ++- ++- lynxos*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- m88k*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- mvs*) ++- case $cc_basename in ++- cxx*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- netbsd*) ++- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++- wlarc= ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- fi ++- # Workaround some broken pre-1.5 toolchains ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++- ;; ++- ++- *nto* | *qnx*) ++- _LT_TAGVAR(ld_shlibs, $1)=yes ++- ;; ++- ++- openbsd2*) ++- # C++ shared libraries are fairly broken ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- openbsd*) ++- if test -f /usr/libexec/ld.so; then ++- _LT_TAGVAR(hardcode_direct, $1)=yes ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++- fi ++- output_verbose_link_cmd=echo ++- else ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- ++- osf3* | osf4* | osf5*) ++- case $cc_basename in ++- KCC*) ++- # Kuck and Associates, Inc. (KAI) C++ Compiler ++- ++- # KCC will only create a shared library if the output file ++- # ends with ".so" (or ".sl" for HP-UX), so rename the library ++- # to its proper name (with version) after linking. ++- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Archives containing C++ object files must be created using ++- # the KAI C++ compiler. ++- case $host in ++- osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; ++- *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; ++- esac ++- ;; ++- RCC*) ++- # Rational C++ 2.4.1 ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- cxx*) ++- case $host in ++- osf3*) ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- ;; ++- *) ++- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++- echo "-hidden">> $lib.exp~ ++- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++- $RM $lib.exp' ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++- ;; ++- esac ++- ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- # ++- # There doesn't appear to be a way to prevent this compiler from ++- # explicitly linking system object files so we need to strip them ++- # from the output so that they don't get included in the library ++- # dependencies. ++- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++- ;; ++- *) ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++- case $host in ++- osf3*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++- ;; ++- esac ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- ++- else ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- fi ++- ;; ++- esac ++- ;; ++- ++- psos*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- sunos4*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.x ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- lcc*) ++- # Lucid ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- solaris*) ++- case $cc_basename in ++- CC*) ++- # Sun C++ 4.2, 5.x and Centerline C++ ++- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes ++- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- # The compiler driver will combine and reorder linker options, ++- # but understands `-z linker_flag'. ++- # Supported since Solaris 2.6 (maybe 2.5.1?) ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++- ;; ++- esac ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- ++- output_verbose_link_cmd='echo' ++- ++- # Archives containing C++ object files must be created using ++- # "CC -xar", where "CC" is the Sun C++ compiler. This is ++- # necessary to make sure instantiated templates are included ++- # in the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++- ;; ++- gcx*) ++- # Green Hills C++ Compiler ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- ++- # The C++ compiler must be used to create the archive. ++- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++- ;; ++- *) ++- # GNU C++ compiler with Solaris linker ++- if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++- if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- else ++- # g++ 2.7 appears to require `-G' NOT `-shared' on this ++- # platform. ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++- ++- # Commands to make compiler produce verbose output that lists ++- # what "hidden" libraries, object files and flags are used when ++- # linking a shared library. ++- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++- fi ++- ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++- case $host_os in ++- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++- *) ++- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++- ;; ++- esac ++- fi ++- ;; ++- esac ++- ;; ++- ++- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- ++- sysv5* | sco3.2v5* | sco5v6*) ++- # Note: We can NOT use -z defs as we might desire, because we do not ++- # link with -lc, and that would cause any symbols used from libc to ++- # always be unresolved, which means just about no library would ++- # ever link correctly. If we're not using GNU ld we use -z text ++- # though, which does catch some bad symbols but isn't as heavy-handed ++- # as -z defs. ++- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++- _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++- _LT_TAGVAR(link_all_deplibs, $1)=yes ++- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++- runpath_var='LD_RUN_PATH' ++- ++- case $cc_basename in ++- CC*) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- *) ++- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++- ;; ++- esac ++- ;; ++- ++- tandem*) ++- case $cc_basename in ++- NCC*) ++- # NonStop-UX NCC 3.20 ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ;; ++- ++- vxworks*) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- ++- *) ++- # FIXME: insert proper C++ library support ++- _LT_TAGVAR(ld_shlibs, $1)=no ++- ;; ++- esac ++- ++- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++- ++- _LT_TAGVAR(GCC, $1)="$GXX" ++- _LT_TAGVAR(LD, $1)="$LD" ++- ++- ## CAVEAT EMPTOR: ++- ## There is no encapsulation within the following macros, do not change ++- ## the running order or otherwise move them around unless you know exactly ++- ## what you are doing... ++- _LT_SYS_HIDDEN_LIBDEPS($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++- fi # test -n "$compiler" ++- ++- CC=$lt_save_CC ++- LDCXX=$LD ++- LD=$lt_save_LD ++- GCC=$lt_save_GCC ++- with_gnu_ld=$lt_save_with_gnu_ld ++- lt_cv_path_LDCXX=$lt_cv_path_LD ++- lt_cv_path_LD=$lt_save_path_LD ++- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++-fi # test "$_lt_caught_CXX_error" != yes ++- ++-AC_LANG_POP ++-])# _LT_LANG_CXX_CONFIG ++- ++- ++-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) ++-# --------------------------------- ++-# Figure out "hidden" library dependencies from verbose ++-# compiler output when linking a shared library. ++-# Parse the compiler output and extract the necessary ++-# objects, libraries and library flags. ++-m4_defun([_LT_SYS_HIDDEN_LIBDEPS], ++-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++-# Dependencies to place before and after the object being linked: ++-_LT_TAGVAR(predep_objects, $1)= ++-_LT_TAGVAR(postdep_objects, $1)= ++-_LT_TAGVAR(predeps, $1)= ++-_LT_TAGVAR(postdeps, $1)= ++-_LT_TAGVAR(compiler_lib_search_path, $1)= ++- ++-dnl we can't use the lt_simple_compile_test_code here, ++-dnl because it contains code intended for an executable, ++-dnl not a library. It's possible we should let each ++-dnl tag define a new lt_????_link_test_code variable, ++-dnl but it's only used here... ++-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF ++-int a; ++-void foo (void) { a = 0; } ++-_LT_EOF ++-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF ++-class Foo ++-{ ++-public: ++- Foo (void) { a = 0; } ++-private: ++- int a; ++-}; ++-_LT_EOF ++-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF ++- subroutine foo ++- implicit none ++- integer*4 a ++- a=0 ++- return ++- end ++-_LT_EOF ++-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF ++- subroutine foo ++- implicit none ++- integer a ++- a=0 ++- return ++- end ++-_LT_EOF ++-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF ++-public class foo { ++- private int a; ++- public void bar (void) { ++- a = 0; ++- } ++-}; ++-_LT_EOF ++-]) ++-dnl Parse the compiler output and extract the necessary ++-dnl objects, libraries and library flags. ++-if AC_TRY_EVAL(ac_compile); then ++- # Parse the compiler output and extract the necessary ++- # objects, libraries and library flags. ++- ++- # Sentinel used to keep track of whether or not we are before ++- # the conftest object file. ++- pre_test_object_deps_done=no ++- ++- for p in `eval "$output_verbose_link_cmd"`; do ++- case $p in ++- ++- -L* | -R* | -l*) ++- # Some compilers place space between "-{L,R}" and the path. ++- # Remove the space. ++- if test $p = "-L" || ++- test $p = "-R"; then ++- prev=$p ++- continue ++- else ++- prev= ++- fi ++- ++- if test "$pre_test_object_deps_done" = no; then ++- case $p in ++- -L* | -R*) ++- # Internal compiler library paths should come after those ++- # provided the user. The postdeps already come after the ++- # user supplied libs so there is no need to process them. ++- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then ++- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++- else ++- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++- fi ++- ;; ++- # The "-l" case would never come before the object being ++- # linked, so don't bother handling this case. ++- esac ++- else ++- if test -z "$_LT_TAGVAR(postdeps, $1)"; then ++- _LT_TAGVAR(postdeps, $1)="${prev}${p}" ++- else ++- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" ++- fi ++- fi ++- ;; ++- ++- *.$objext) ++- # This assumes that the test object file only shows up ++- # once in the compiler output. ++- if test "$p" = "conftest.$objext"; then ++- pre_test_object_deps_done=yes ++- continue ++- fi ++- ++- if test "$pre_test_object_deps_done" = no; then ++- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then ++- _LT_TAGVAR(predep_objects, $1)="$p" ++- else ++- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" ++- fi ++- else ++- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then ++- _LT_TAGVAR(postdep_objects, $1)="$p" ++- else ++- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" ++- fi ++- fi ++- ;; ++- ++- *) ;; # Ignore the rest. ++- ++- esac ++- done ++- ++- # Clean up. ++- rm -f a.out a.exe ++-else ++- echo "libtool.m4: error: problem compiling $1 test program" ++-fi ++- ++-$RM -f confest.$objext ++- ++-# PORTME: override above test on systems where it is broken ++-m4_if([$1], [CXX], ++-[case $host_os in ++-interix[[3-9]]*) ++- # Interix 3.5 installs completely hosed .la files for C++, so rather than ++- # hack all around it, let's just trust "g++" to DTRT. ++- _LT_TAGVAR(predep_objects,$1)= ++- _LT_TAGVAR(postdep_objects,$1)= ++- _LT_TAGVAR(postdeps,$1)= ++- ;; ++- ++-linux*) ++- case `$CC -V 2>&1 | sed 5q` in ++- *Sun\ C*) ++- # Sun C++ 5.9 ++- ++- # The more standards-conforming stlport4 library is ++- # incompatible with the Cstd library. Avoid specifying ++- # it if it's in CXXFLAGS. Ignore libCrun as ++- # -library=stlport4 depends on it. ++- case " $CXX $CXXFLAGS " in ++- *" -library=stlport4 "*) ++- solaris_use_stlport4=yes ++- ;; ++- esac ++- ++- if test "$solaris_use_stlport4" != yes; then ++- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++- fi ++- ;; ++- esac ++- ;; ++- ++-solaris*) ++- case $cc_basename in ++- CC*) ++- # The more standards-conforming stlport4 library is ++- # incompatible with the Cstd library. Avoid specifying ++- # it if it's in CXXFLAGS. Ignore libCrun as ++- # -library=stlport4 depends on it. ++- case " $CXX $CXXFLAGS " in ++- *" -library=stlport4 "*) ++- solaris_use_stlport4=yes ++- ;; ++- esac ++- ++- # Adding this requires a known-good setup of shared libraries for ++- # Sun compiler versions before 5.6, else PIC objects from an old ++- # archive will be linked into the output, leading to subtle bugs. ++- if test "$solaris_use_stlport4" != yes; then ++- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++- fi ++- ;; ++- esac ++- ;; ++-esac ++-]) ++- ++-case " $_LT_TAGVAR(postdeps, $1) " in ++-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++-esac ++- _LT_TAGVAR(compiler_lib_search_dirs, $1)= ++-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then ++- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++-fi ++-_LT_TAGDECL([], [compiler_lib_search_dirs], [1], ++- [The directories searched by this compiler when creating a shared library]) ++-_LT_TAGDECL([], [predep_objects], [1], ++- [Dependencies to place before and after the objects being linked to ++- create a shared library]) ++-_LT_TAGDECL([], [postdep_objects], [1]) ++-_LT_TAGDECL([], [predeps], [1]) ++-_LT_TAGDECL([], [postdeps], [1]) ++-_LT_TAGDECL([], [compiler_lib_search_path], [1], ++- [The library search path used internally by the compiler when linking ++- a shared library]) ++-])# _LT_SYS_HIDDEN_LIBDEPS ++- ++- ++-# _LT_PROG_F77 ++-# ------------ ++-# Since AC_PROG_F77 is broken, in that it returns the empty string ++-# if there is no fortran compiler, we have our own version here. ++-m4_defun([_LT_PROG_F77], ++-[ ++-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) ++-AC_PROG_F77 ++-if test -z "$F77" || test "X$F77" = "Xno"; then ++- _lt_disable_F77=yes ++-fi ++-popdef([AC_MSG_ERROR]) ++-])# _LT_PROG_F77 ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([_LT_PROG_F77], []) ++- ++- ++-# _LT_LANG_F77_CONFIG([TAG]) ++-# -------------------------- ++-# Ensure that the configuration variables for a Fortran 77 compiler are ++-# suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_F77_CONFIG], ++-[AC_REQUIRE([_LT_PROG_F77])dnl ++-AC_LANG_PUSH(Fortran 77) ++- ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_TAGVAR(allow_undefined_flag, $1)= ++-_LT_TAGVAR(always_export_symbols, $1)=no ++-_LT_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_direct, $1)=no ++-_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_TAGVAR(hardcode_automatic, $1)=no ++-_LT_TAGVAR(inherit_rpath, $1)=no ++-_LT_TAGVAR(module_cmds, $1)= ++-_LT_TAGVAR(module_expsym_cmds, $1)= ++-_LT_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_TAGVAR(no_undefined_flag, $1)= ++-_LT_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Source file extension for f77 test sources. ++-ac_ext=f ++- ++-# Object file extension for compiled f77 test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# No sense in running all these tests if we already determined that ++-# the F77 compiler isn't working. Some variables (like enable_shared) ++-# are currently assumed to apply to all compilers on this platform, ++-# and will be corrupted by setting them based on a non-working compiler. ++-if test "$_lt_disable_F77" != yes; then ++- # Code to be used in simple compile tests ++- lt_simple_compile_test_code="\ ++- subroutine t ++- return ++- end ++-" ++- ++- # Code to be used in simple link tests ++- lt_simple_link_test_code="\ ++- program t ++- end ++-" ++- ++- # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++- _LT_TAG_COMPILER ++- ++- # save warnings/boilerplate of simple test code ++- _LT_COMPILER_BOILERPLATE ++- _LT_LINKER_BOILERPLATE ++- ++- # Allow CC to be a program name with arguments. ++- lt_save_CC="$CC" ++- lt_save_GCC=$GCC ++- CC=${F77-"f77"} ++- compiler=$CC ++- _LT_TAGVAR(compiler, $1)=$CC ++- _LT_CC_BASENAME([$compiler]) ++- GCC=$G77 ++- if test -n "$compiler"; then ++- AC_MSG_CHECKING([if libtool supports shared libraries]) ++- AC_MSG_RESULT([$can_build_shared]) ++- ++- AC_MSG_CHECKING([whether to build shared libraries]) ++- test "$can_build_shared" = "no" && enable_shared=no ++- ++- # On AIX, shared libraries and static libraries use the same namespace, and ++- # are all built from PIC. ++- case $host_os in ++- aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- aix[[4-9]]*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++- esac ++- AC_MSG_RESULT([$enable_shared]) ++- ++- AC_MSG_CHECKING([whether to build static libraries]) ++- # Make sure either enable_shared or enable_static is yes. ++- test "$enable_shared" = yes || enable_static=yes ++- AC_MSG_RESULT([$enable_static]) ++- ++- _LT_TAGVAR(GCC, $1)="$G77" ++- _LT_TAGVAR(LD, $1)="$LD" ++- ++- ## CAVEAT EMPTOR: ++- ## There is no encapsulation within the following macros, do not change ++- ## the running order or otherwise move them around unless you know exactly ++- ## what you are doing... ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++- fi # test -n "$compiler" ++- ++- GCC=$lt_save_GCC ++- CC="$lt_save_CC" ++-fi # test "$_lt_disable_F77" != yes ++- ++-AC_LANG_POP ++-])# _LT_LANG_F77_CONFIG ++- ++- ++-# _LT_PROG_FC ++-# ----------- ++-# Since AC_PROG_FC is broken, in that it returns the empty string ++-# if there is no fortran compiler, we have our own version here. ++-m4_defun([_LT_PROG_FC], ++-[ ++-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) ++-AC_PROG_FC ++-if test -z "$FC" || test "X$FC" = "Xno"; then ++- _lt_disable_FC=yes ++-fi ++-popdef([AC_MSG_ERROR]) ++-])# _LT_PROG_FC ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([_LT_PROG_FC], []) ++- ++- ++-# _LT_LANG_FC_CONFIG([TAG]) ++-# ------------------------- ++-# Ensure that the configuration variables for a Fortran compiler are ++-# suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_FC_CONFIG], ++-[AC_REQUIRE([_LT_PROG_FC])dnl ++-AC_LANG_PUSH(Fortran) ++- ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++-_LT_TAGVAR(allow_undefined_flag, $1)= ++-_LT_TAGVAR(always_export_symbols, $1)=no ++-_LT_TAGVAR(archive_expsym_cmds, $1)= ++-_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_direct, $1)=no ++-_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++-_LT_TAGVAR(hardcode_libdir_separator, $1)= ++-_LT_TAGVAR(hardcode_minus_L, $1)=no ++-_LT_TAGVAR(hardcode_automatic, $1)=no ++-_LT_TAGVAR(inherit_rpath, $1)=no ++-_LT_TAGVAR(module_cmds, $1)= ++-_LT_TAGVAR(module_expsym_cmds, $1)= ++-_LT_TAGVAR(link_all_deplibs, $1)=unknown ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++-_LT_TAGVAR(no_undefined_flag, $1)= ++-_LT_TAGVAR(whole_archive_flag_spec, $1)= ++-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++- ++-# Source file extension for fc test sources. ++-ac_ext=${ac_fc_srcext-f} ++- ++-# Object file extension for compiled fc test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# No sense in running all these tests if we already determined that ++-# the FC compiler isn't working. Some variables (like enable_shared) ++-# are currently assumed to apply to all compilers on this platform, ++-# and will be corrupted by setting them based on a non-working compiler. ++-if test "$_lt_disable_FC" != yes; then ++- # Code to be used in simple compile tests ++- lt_simple_compile_test_code="\ ++- subroutine t ++- return ++- end ++-" ++- ++- # Code to be used in simple link tests ++- lt_simple_link_test_code="\ ++- program t ++- end ++-" ++- ++- # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++- _LT_TAG_COMPILER ++- ++- # save warnings/boilerplate of simple test code ++- _LT_COMPILER_BOILERPLATE ++- _LT_LINKER_BOILERPLATE ++- ++- # Allow CC to be a program name with arguments. ++- lt_save_CC="$CC" ++- lt_save_GCC=$GCC ++- CC=${FC-"f95"} ++- compiler=$CC ++- GCC=$ac_cv_fc_compiler_gnu ++- ++- _LT_TAGVAR(compiler, $1)=$CC ++- _LT_CC_BASENAME([$compiler]) ++- ++- if test -n "$compiler"; then ++- AC_MSG_CHECKING([if libtool supports shared libraries]) ++- AC_MSG_RESULT([$can_build_shared]) ++- ++- AC_MSG_CHECKING([whether to build shared libraries]) ++- test "$can_build_shared" = "no" && enable_shared=no ++- ++- # On AIX, shared libraries and static libraries use the same namespace, and ++- # are all built from PIC. ++- case $host_os in ++- aix3*) ++- test "$enable_shared" = yes && enable_static=no ++- if test -n "$RANLIB"; then ++- archive_cmds="$archive_cmds~\$RANLIB \$lib" ++- postinstall_cmds='$RANLIB $lib' ++- fi ++- ;; ++- aix[[4-9]]*) ++- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++- test "$enable_shared" = yes && enable_static=no ++- fi ++- ;; ++- esac ++- AC_MSG_RESULT([$enable_shared]) ++- ++- AC_MSG_CHECKING([whether to build static libraries]) ++- # Make sure either enable_shared or enable_static is yes. ++- test "$enable_shared" = yes || enable_static=yes ++- AC_MSG_RESULT([$enable_static]) ++- ++- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" ++- _LT_TAGVAR(LD, $1)="$LD" ++- ++- ## CAVEAT EMPTOR: ++- ## There is no encapsulation within the following macros, do not change ++- ## the running order or otherwise move them around unless you know exactly ++- ## what you are doing... ++- _LT_SYS_HIDDEN_LIBDEPS($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_SYS_DYNAMIC_LINKER($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++- fi # test -n "$compiler" ++- ++- GCC=$lt_save_GCC ++- CC="$lt_save_CC" ++-fi # test "$_lt_disable_FC" != yes ++- ++-AC_LANG_POP ++-])# _LT_LANG_FC_CONFIG ++- ++- ++-# _LT_LANG_GCJ_CONFIG([TAG]) ++-# -------------------------- ++-# Ensure that the configuration variables for the GNU Java Compiler compiler ++-# are suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_GCJ_CONFIG], ++-[AC_REQUIRE([LT_PROG_GCJ])dnl ++-AC_LANG_SAVE ++- ++-# Source file extension for Java test sources. ++-ac_ext=java ++- ++-# Object file extension for compiled Java test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code="class foo {}" ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' ++- ++-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++-_LT_TAG_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-# Allow CC to be a program name with arguments. ++-lt_save_CC="$CC" ++-lt_save_GCC=$GCC ++-GCC=yes ++-CC=${GCJ-"gcj"} ++-compiler=$CC ++-_LT_TAGVAR(compiler, $1)=$CC ++-_LT_TAGVAR(LD, $1)="$LD" ++-_LT_CC_BASENAME([$compiler]) ++- ++-# GCJ did not exist at the time GCC didn't implicitly link libc in. ++-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++- ++-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++- ++-if test -n "$compiler"; then ++- _LT_COMPILER_NO_RTTI($1) ++- _LT_COMPILER_PIC($1) ++- _LT_COMPILER_C_O($1) ++- _LT_COMPILER_FILE_LOCKS($1) ++- _LT_LINKER_SHLIBS($1) ++- _LT_LINKER_HARDCODE_LIBPATH($1) ++- ++- _LT_CONFIG($1) ++-fi ++- ++-AC_LANG_RESTORE ++- ++-GCC=$lt_save_GCC ++-CC="$lt_save_CC" ++-])# _LT_LANG_GCJ_CONFIG ++- ++- ++-# _LT_LANG_RC_CONFIG([TAG]) ++-# ------------------------- ++-# Ensure that the configuration variables for the Windows resource compiler ++-# are suitably defined. These variables are subsequently used by _LT_CONFIG ++-# to write the compiler configuration to `libtool'. ++-m4_defun([_LT_LANG_RC_CONFIG], ++-[AC_REQUIRE([LT_PROG_RC])dnl ++-AC_LANG_SAVE ++- ++-# Source file extension for RC test sources. ++-ac_ext=rc ++- ++-# Object file extension for compiled RC test sources. ++-objext=o ++-_LT_TAGVAR(objext, $1)=$objext ++- ++-# Code to be used in simple compile tests ++-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' ++- ++-# Code to be used in simple link tests ++-lt_simple_link_test_code="$lt_simple_compile_test_code" ++- ++-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++-_LT_TAG_COMPILER ++- ++-# save warnings/boilerplate of simple test code ++-_LT_COMPILER_BOILERPLATE ++-_LT_LINKER_BOILERPLATE ++- ++-# Allow CC to be a program name with arguments. ++-lt_save_CC="$CC" ++-lt_save_GCC=$GCC ++-GCC= ++-CC=${RC-"windres"} ++-compiler=$CC ++-_LT_TAGVAR(compiler, $1)=$CC ++-_LT_CC_BASENAME([$compiler]) ++-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++- ++-if test -n "$compiler"; then ++- : ++- _LT_CONFIG($1) ++-fi ++- ++-GCC=$lt_save_GCC ++-AC_LANG_RESTORE ++-CC="$lt_save_CC" ++-])# _LT_LANG_RC_CONFIG ++- ++- ++-# LT_PROG_GCJ ++-# ----------- ++-AC_DEFUN([LT_PROG_GCJ], ++-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], ++- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], ++- [AC_CHECK_TOOL(GCJ, gcj,) ++- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++- AC_SUBST(GCJFLAGS)])])[]dnl ++-]) ++- ++-# Old name: ++-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([LT_AC_PROG_GCJ], []) ++- ++- ++-# LT_PROG_RC ++-# ---------- ++-AC_DEFUN([LT_PROG_RC], ++-[AC_CHECK_TOOL(RC, windres,) ++-]) ++- ++-# Old name: ++-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([LT_AC_PROG_RC], []) ++- ++- ++-# _LT_DECL_EGREP ++-# -------------- ++-# If we don't have a new enough Autoconf to choose the best grep ++-# available, choose the one first in the user's PATH. ++-m4_defun([_LT_DECL_EGREP], ++-[AC_REQUIRE([AC_PROG_EGREP])dnl ++-AC_REQUIRE([AC_PROG_FGREP])dnl ++-test -z "$GREP" && GREP=grep ++-_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) ++-_LT_DECL([], [EGREP], [1], [An ERE matcher]) ++-_LT_DECL([], [FGREP], [1], [A literal string matcher]) ++-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too ++-AC_SUBST([GREP]) ++-]) ++- ++- ++-# _LT_DECL_OBJDUMP ++-# -------------- ++-# If we don't have a new enough Autoconf to choose the best objdump ++-# available, choose the one first in the user's PATH. ++-m4_defun([_LT_DECL_OBJDUMP], ++-[AC_CHECK_TOOL(OBJDUMP, objdump, false) ++-test -z "$OBJDUMP" && OBJDUMP=objdump ++-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) ++-AC_SUBST([OBJDUMP]) ++-]) ++- ++- ++-# _LT_DECL_SED ++-# ------------ ++-# Check for a fully-functional sed program, that truncates ++-# as few characters as possible. Prefer GNU sed if found. ++-m4_defun([_LT_DECL_SED], ++-[AC_PROG_SED ++-test -z "$SED" && SED=sed ++-Xsed="$SED -e 1s/^X//" ++-_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) ++-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], ++- [Sed that helps us avoid accidentally triggering echo(1) options like -n]) ++-])# _LT_DECL_SED ++- ++-m4_ifndef([AC_PROG_SED], [ ++-# NOTE: This macro has been submitted for inclusion into # ++-# GNU Autoconf as AC_PROG_SED. When it is available in # ++-# a released version of Autoconf we should remove this # ++-# macro and use it instead. # ++- ++-m4_defun([AC_PROG_SED], ++-[AC_MSG_CHECKING([for a sed that does not truncate output]) ++-AC_CACHE_VAL(lt_cv_path_SED, ++-[# Loop through the user's path and test for sed and gsed. ++-# Then use that list of sed's as ones to test for truncation. ++-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++-for as_dir in $PATH ++-do ++- IFS=$as_save_IFS ++- test -z "$as_dir" && as_dir=. ++- for lt_ac_prog in sed gsed; do ++- for ac_exec_ext in '' $ac_executable_extensions; do ++- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++- fi ++- done ++- done ++-done ++-IFS=$as_save_IFS ++-lt_ac_max=0 ++-lt_ac_count=0 ++-# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++-# along with /bin/sed that truncates output. ++-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++- test ! -f $lt_ac_sed && continue ++- cat /dev/null > conftest.in ++- lt_ac_count=0 ++- echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++- # Check for GNU sed and select it if it is found. ++- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++- lt_cv_path_SED=$lt_ac_sed ++- break ++- fi ++- while true; do ++- cat conftest.in conftest.in >conftest.tmp ++- mv conftest.tmp conftest.in ++- cp conftest.in conftest.nl ++- echo >>conftest.nl ++- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++- cmp -s conftest.out conftest.nl || break ++- # 10000 chars as input seems more than enough ++- test $lt_ac_count -gt 10 && break ++- lt_ac_count=`expr $lt_ac_count + 1` ++- if test $lt_ac_count -gt $lt_ac_max; then ++- lt_ac_max=$lt_ac_count ++- lt_cv_path_SED=$lt_ac_sed ++- fi ++- done ++-done ++-]) ++-SED=$lt_cv_path_SED ++-AC_SUBST([SED]) ++-AC_MSG_RESULT([$SED]) ++-])#AC_PROG_SED ++-])#m4_ifndef ++- ++-# Old name: ++-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([LT_AC_PROG_SED], []) ++- ++- ++-# _LT_CHECK_SHELL_FEATURES ++-# ------------------------ ++-# Find out whether the shell is Bourne or XSI compatible, ++-# or has some other useful features. ++-m4_defun([_LT_CHECK_SHELL_FEATURES], ++-[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) ++-# Try some XSI features ++-xsi_shell=no ++-( _lt_dummy="a/b/c" ++- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++- = c,a/b,, \ ++- && eval 'test $(( 1 + 1 )) -eq 2 \ ++- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++- && xsi_shell=yes ++-AC_MSG_RESULT([$xsi_shell]) ++-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) ++- ++-AC_MSG_CHECKING([whether the shell understands "+="]) ++-lt_shell_append=no ++-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ ++- >/dev/null 2>&1 \ ++- && lt_shell_append=yes ++-AC_MSG_RESULT([$lt_shell_append]) ++-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) ++- ++-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++- lt_unset=unset ++-else ++- lt_unset=false ++-fi ++-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl ++- ++-# test EBCDIC or ASCII ++-case `echo X|tr X '\101'` in ++- A) # ASCII based system ++- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++- lt_SP2NL='tr \040 \012' ++- lt_NL2SP='tr \015\012 \040\040' ++- ;; ++- *) # EBCDIC based system ++- lt_SP2NL='tr \100 \n' ++- lt_NL2SP='tr \r\n \100\100' ++- ;; ++-esac ++-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl ++-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ++-])# _LT_CHECK_SHELL_FEATURES ++- ++- ++-# _LT_PROG_XSI_SHELLFNS ++-# --------------------- ++-# Bourne and XSI compatible variants of some useful shell functions. ++-m4_defun([_LT_PROG_XSI_SHELLFNS], ++-[case $xsi_shell in ++- yes) ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_dirname file append nondir_replacement ++-# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++-# otherwise set result to NONDIR_REPLACEMENT. ++-func_dirname () ++-{ ++- case ${1} in ++- */*) func_dirname_result="${1%/*}${2}" ;; ++- * ) func_dirname_result="${3}" ;; ++- esac ++-} ++- ++-# func_basename file ++-func_basename () ++-{ ++- func_basename_result="${1##*/}" ++-} ++- ++-# func_dirname_and_basename file append nondir_replacement ++-# perform func_basename and func_dirname in a single function ++-# call: ++-# dirname: Compute the dirname of FILE. If nonempty, ++-# add APPEND to the result, otherwise set result ++-# to NONDIR_REPLACEMENT. ++-# value returned in "$func_dirname_result" ++-# basename: Compute filename of FILE. ++-# value retuned in "$func_basename_result" ++-# Implementation must be kept synchronized with func_dirname ++-# and func_basename. For efficiency, we do not delegate to ++-# those functions but instead duplicate the functionality here. ++-func_dirname_and_basename () ++-{ ++- case ${1} in ++- */*) func_dirname_result="${1%/*}${2}" ;; ++- * ) func_dirname_result="${3}" ;; ++- esac ++- func_basename_result="${1##*/}" ++-} ++- ++-# func_stripname prefix suffix name ++-# strip PREFIX and SUFFIX off of NAME. ++-# PREFIX and SUFFIX must not contain globbing or regex special ++-# characters, hashes, percent signs, but SUFFIX may contain a leading ++-# dot (in which case that matches only a dot). ++-func_stripname () ++-{ ++- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++- # positional parameters, so assign one to ordinary parameter first. ++- func_stripname_result=${3} ++- func_stripname_result=${func_stripname_result#"${1}"} ++- func_stripname_result=${func_stripname_result%"${2}"} ++-} ++- ++-# func_opt_split ++-func_opt_split () ++-{ ++- func_opt_split_opt=${1%%=*} ++- func_opt_split_arg=${1#*=} ++-} ++- ++-# func_lo2o object ++-func_lo2o () ++-{ ++- case ${1} in ++- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++- *) func_lo2o_result=${1} ;; ++- esac ++-} ++- ++-# func_xform libobj-or-source ++-func_xform () ++-{ ++- func_xform_result=${1%.*}.lo ++-} ++- ++-# func_arith arithmetic-term... ++-func_arith () ++-{ ++- func_arith_result=$(( $[*] )) ++-} ++- ++-# func_len string ++-# STRING may not start with a hyphen. ++-func_len () ++-{ ++- func_len_result=${#1} ++-} ++- ++-_LT_EOF ++- ;; ++- *) # Bourne compatible functions. ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_dirname file append nondir_replacement ++-# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++-# otherwise set result to NONDIR_REPLACEMENT. ++-func_dirname () ++-{ ++- # Extract subdirectory from the argument. ++- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++- if test "X$func_dirname_result" = "X${1}"; then ++- func_dirname_result="${3}" ++- else ++- func_dirname_result="$func_dirname_result${2}" ++- fi ++-} ++- ++-# func_basename file ++-func_basename () ++-{ ++- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++-} ++- ++-dnl func_dirname_and_basename ++-dnl A portable version of this function is already defined in general.m4sh ++-dnl so there is no need for it here. ++- ++-# func_stripname prefix suffix name ++-# strip PREFIX and SUFFIX off of NAME. ++-# PREFIX and SUFFIX must not contain globbing or regex special ++-# characters, hashes, percent signs, but SUFFIX may contain a leading ++-# dot (in which case that matches only a dot). ++-# func_strip_suffix prefix name ++-func_stripname () ++-{ ++- case ${2} in ++- .*) func_stripname_result=`$ECHO "X${3}" \ ++- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++- *) func_stripname_result=`$ECHO "X${3}" \ ++- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++- esac ++-} ++- ++-# sed scripts: ++-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' ++-my_sed_long_arg='1s/^-[[^=]]*=//' ++- ++-# func_opt_split ++-func_opt_split () ++-{ ++- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++-} ++- ++-# func_lo2o object ++-func_lo2o () ++-{ ++- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++-} ++- ++-# func_xform libobj-or-source ++-func_xform () ++-{ ++- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` ++-} ++- ++-# func_arith arithmetic-term... ++-func_arith () ++-{ ++- func_arith_result=`expr "$[@]"` ++-} ++- ++-# func_len string ++-# STRING may not start with a hyphen. ++-func_len () ++-{ ++- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` ++-} ++- ++-_LT_EOF ++-esac ++- ++-case $lt_shell_append in ++- yes) ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_append var value ++-# Append VALUE to the end of shell variable VAR. ++-func_append () ++-{ ++- eval "$[1]+=\$[2]" ++-} ++-_LT_EOF ++- ;; ++- *) ++- cat << \_LT_EOF >> "$cfgfile" ++- ++-# func_append var value ++-# Append VALUE to the end of shell variable VAR. ++-func_append () ++-{ ++- eval "$[1]=\$$[1]\$[2]" ++-} ++- ++-_LT_EOF ++- ;; ++- esac ++-]) ++- ++-# Helper functions for option handling. -*- Autoconf -*- ++-# ++-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gary V. Vaughan, 2004 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# serial 6 ltoptions.m4 ++- ++-# This is to help aclocal find these macros, as it can't see m4_define. ++-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ++- ++- ++-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) ++-# ------------------------------------------ ++-m4_define([_LT_MANGLE_OPTION], ++-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) ++- ++- ++-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) ++-# --------------------------------------- ++-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a ++-# matching handler defined, dispatch to it. Other OPTION-NAMEs are ++-# saved as a flag. ++-m4_define([_LT_SET_OPTION], ++-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl ++-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), ++- _LT_MANGLE_DEFUN([$1], [$2]), ++- [m4_warning([Unknown $1 option `$2'])])[]dnl ++-]) ++- ++- ++-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) ++-# ------------------------------------------------------------ ++-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++-m4_define([_LT_IF_OPTION], ++-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) ++- ++- ++-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) ++-# ------------------------------------------------------- ++-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME ++-# are set. ++-m4_define([_LT_UNLESS_OPTIONS], ++-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), ++- [m4_define([$0_found])])])[]dnl ++-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 ++-])[]dnl ++-]) ++- ++- ++-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) ++-# ---------------------------------------- ++-# OPTION-LIST is a space-separated list of Libtool options associated ++-# with MACRO-NAME. If any OPTION has a matching handler declared with ++-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about ++-# the unknown option and exit. ++-m4_defun([_LT_SET_OPTIONS], ++-[# Set options ++-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++- [_LT_SET_OPTION([$1], _LT_Option)]) ++- ++-m4_if([$1],[LT_INIT],[ ++- dnl ++- dnl Simply set some default values (i.e off) if boolean options were not ++- dnl specified: ++- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no ++- ]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no ++- ]) ++- dnl ++- dnl If no reference was made to various pairs of opposing options, then ++- dnl we run the default mode handler for the pair. For example, if neither ++- dnl `shared' nor `disable-shared' was passed, we enable building of shared ++- dnl archives by default: ++- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) ++- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], ++- [_LT_ENABLE_FAST_INSTALL]) ++- ]) ++-])# _LT_SET_OPTIONS ++- ++- ++- ++-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) ++-# ----------------------------------------- ++-m4_define([_LT_MANGLE_DEFUN], ++-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) ++- ++- ++-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) ++-# ----------------------------------------------- ++-m4_define([LT_OPTION_DEFINE], ++-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl ++-])# LT_OPTION_DEFINE ++- ++- ++-# dlopen ++-# ------ ++-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ++-]) ++- ++-AU_DEFUN([AC_LIBTOOL_DLOPEN], ++-[_LT_SET_OPTION([LT_INIT], [dlopen]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you ++-put the `dlopen' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) ++- ++- ++-# win32-dll ++-# --------- ++-# Declare package support for building win32 dll's. ++-LT_OPTION_DEFINE([LT_INIT], [win32-dll], ++-[enable_win32_dll=yes ++- ++-case $host in ++-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++- AC_CHECK_TOOL(AS, as, false) ++- AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++- ;; ++-esac ++- ++-test -z "$AS" && AS=as ++-_LT_DECL([], [AS], [0], [Assembler program])dnl ++- ++-test -z "$DLLTOOL" && DLLTOOL=dlltool ++-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl ++- ++-test -z "$OBJDUMP" && OBJDUMP=objdump ++-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ++-])# win32-dll ++- ++-AU_DEFUN([AC_LIBTOOL_WIN32_DLL], ++-[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++-_LT_SET_OPTION([LT_INIT], [win32-dll]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you ++-put the `win32-dll' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) ++- ++- ++-# _LT_ENABLE_SHARED([DEFAULT]) ++-# ---------------------------- ++-# implement the --enable-shared flag, and supports the `shared' and ++-# `disable-shared' LT_INIT options. ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-m4_define([_LT_ENABLE_SHARED], ++-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl ++-AC_ARG_ENABLE([shared], ++- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_shared=yes ;; ++- no) enable_shared=no ;; ++- *) ++- enable_shared=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_shared=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) ++- ++- _LT_DECL([build_libtool_libs], [enable_shared], [0], ++- [Whether or not to build shared libraries]) ++-])# _LT_ENABLE_SHARED ++- ++-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) ++- ++-# Old names: ++-AC_DEFUN([AC_ENABLE_SHARED], ++-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++-]) ++- ++-AC_DEFUN([AC_DISABLE_SHARED], ++-[_LT_SET_OPTION([LT_INIT], [disable-shared]) ++-]) ++- ++-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AM_ENABLE_SHARED], []) ++-dnl AC_DEFUN([AM_DISABLE_SHARED], []) ++- ++- ++- ++-# _LT_ENABLE_STATIC([DEFAULT]) ++-# ---------------------------- ++-# implement the --enable-static flag, and support the `static' and ++-# `disable-static' LT_INIT options. ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-m4_define([_LT_ENABLE_STATIC], ++-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl ++-AC_ARG_ENABLE([static], ++- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_static=yes ;; ++- no) enable_static=no ;; ++- *) ++- enable_static=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_static=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_static=]_LT_ENABLE_STATIC_DEFAULT) ++- ++- _LT_DECL([build_old_libs], [enable_static], [0], ++- [Whether or not to build static libraries]) ++-])# _LT_ENABLE_STATIC ++- ++-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) ++- ++-# Old names: ++-AC_DEFUN([AC_ENABLE_STATIC], ++-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ++-]) ++- ++-AC_DEFUN([AC_DISABLE_STATIC], ++-[_LT_SET_OPTION([LT_INIT], [disable-static]) ++-]) ++- ++-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AM_ENABLE_STATIC], []) ++-dnl AC_DEFUN([AM_DISABLE_STATIC], []) ++- ++- ++- ++-# _LT_ENABLE_FAST_INSTALL([DEFAULT]) ++-# ---------------------------------- ++-# implement the --enable-fast-install flag, and support the `fast-install' ++-# and `disable-fast-install' LT_INIT options. ++-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++-m4_define([_LT_ENABLE_FAST_INSTALL], ++-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl ++-AC_ARG_ENABLE([fast-install], ++- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++- [p=${PACKAGE-default} ++- case $enableval in ++- yes) enable_fast_install=yes ;; ++- no) enable_fast_install=no ;; ++- *) ++- enable_fast_install=no ++- # Look at the argument we got. We use all the common list separators. ++- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++- for pkg in $enableval; do ++- IFS="$lt_save_ifs" ++- if test "X$pkg" = "X$p"; then ++- enable_fast_install=yes ++- fi ++- done ++- IFS="$lt_save_ifs" ++- ;; ++- esac], ++- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) ++- ++-_LT_DECL([fast_install], [enable_fast_install], [0], ++- [Whether or not to optimize for fast installation])dnl ++-])# _LT_ENABLE_FAST_INSTALL ++- ++-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) ++- ++-# Old names: ++-AU_DEFUN([AC_ENABLE_FAST_INSTALL], ++-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++-the `fast-install' option into LT_INIT's first parameter.]) ++-]) ++- ++-AU_DEFUN([AC_DISABLE_FAST_INSTALL], ++-[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++-the `disable-fast-install' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) ++-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) ++- ++- ++-# _LT_WITH_PIC([MODE]) ++-# -------------------- ++-# implement the --with-pic flag, and support the `pic-only' and `no-pic' ++-# LT_INIT options. ++-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++-m4_define([_LT_WITH_PIC], ++-[AC_ARG_WITH([pic], ++- [AS_HELP_STRING([--with-pic], ++- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++- [pic_mode="$withval"], ++- [pic_mode=default]) ++- ++-test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) ++- ++-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ++-])# _LT_WITH_PIC ++- ++-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) ++-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) ++- ++-# Old name: ++-AU_DEFUN([AC_LIBTOOL_PICMODE], ++-[_LT_SET_OPTION([LT_INIT], [pic-only]) ++-AC_DIAGNOSE([obsolete], ++-[$0: Remove this warning and the call to _LT_SET_OPTION when you ++-put the `pic-only' option into LT_INIT's first parameter.]) ++-]) ++- ++-dnl aclocal-1.4 backwards compatibility: ++-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) ++- ++- ++-m4_define([_LTDL_MODE], []) ++-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], ++- [m4_define([_LTDL_MODE], [nonrecursive])]) ++-LT_OPTION_DEFINE([LTDL_INIT], [recursive], ++- [m4_define([_LTDL_MODE], [recursive])]) ++-LT_OPTION_DEFINE([LTDL_INIT], [subproject], ++- [m4_define([_LTDL_MODE], [subproject])]) ++- ++-m4_define([_LTDL_TYPE], []) ++-LT_OPTION_DEFINE([LTDL_INIT], [installable], ++- [m4_define([_LTDL_TYPE], [installable])]) ++-LT_OPTION_DEFINE([LTDL_INIT], [convenience], ++- [m4_define([_LTDL_TYPE], [convenience])]) ++- ++-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- ++-# ++-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++-# Written by Gary V. Vaughan, 2004 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# serial 6 ltsugar.m4 ++- ++-# This is to help aclocal find these macros, as it can't see m4_define. ++-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) ++- ++- ++-# lt_join(SEP, ARG1, [ARG2...]) ++-# ----------------------------- ++-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their ++-# associated separator. ++-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier ++-# versions in m4sugar had bugs. ++-m4_define([lt_join], ++-[m4_if([$#], [1], [], ++- [$#], [2], [[$2]], ++- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) ++-m4_define([_lt_join], ++-[m4_if([$#$2], [2], [], ++- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) ++- ++- ++-# lt_car(LIST) ++-# lt_cdr(LIST) ++-# ------------ ++-# Manipulate m4 lists. ++-# These macros are necessary as long as will still need to support ++-# Autoconf-2.59 which quotes differently. ++-m4_define([lt_car], [[$1]]) ++-m4_define([lt_cdr], ++-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], ++- [$#], 1, [], ++- [m4_dquote(m4_shift($@))])]) ++-m4_define([lt_unquote], $1) ++- ++- ++-# lt_append(MACRO-NAME, STRING, [SEPARATOR]) ++-# ------------------------------------------ ++-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. ++-# Note that neither SEPARATOR nor STRING are expanded; they are appended ++-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). ++-# No SEPARATOR is output if MACRO-NAME was previously undefined (different ++-# than defined and empty). ++-# ++-# This macro is needed until we can rely on Autoconf 2.62, since earlier ++-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. ++-m4_define([lt_append], ++-[m4_define([$1], ++- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) ++- ++- ++- ++-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) ++-# ---------------------------------------------------------- ++-# Produce a SEP delimited list of all paired combinations of elements of ++-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list ++-# has the form PREFIXmINFIXSUFFIXn. ++-# Needed until we can rely on m4_combine added in Autoconf 2.62. ++-m4_define([lt_combine], ++-[m4_if(m4_eval([$# > 3]), [1], ++- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl ++-[[m4_foreach([_Lt_prefix], [$2], ++- [m4_foreach([_Lt_suffix], ++- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, ++- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) ++- ++- ++-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) ++-# ----------------------------------------------------------------------- ++-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited ++-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. ++-m4_define([lt_if_append_uniq], ++-[m4_ifdef([$1], ++- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], ++- [lt_append([$1], [$2], [$3])$4], ++- [$5])], ++- [lt_append([$1], [$2], [$3])$4])]) ++- ++- ++-# lt_dict_add(DICT, KEY, VALUE) ++-# ----------------------------- ++-m4_define([lt_dict_add], ++-[m4_define([$1($2)], [$3])]) ++- ++- ++-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) ++-# -------------------------------------------- ++-m4_define([lt_dict_add_subkey], ++-[m4_define([$1($2:$3)], [$4])]) ++- ++- ++-# lt_dict_fetch(DICT, KEY, [SUBKEY]) ++-# ---------------------------------- ++-m4_define([lt_dict_fetch], ++-[m4_ifval([$3], ++- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), ++- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) ++- ++- ++-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) ++-# ----------------------------------------------------------------- ++-m4_define([lt_if_dict_fetch], ++-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], ++- [$5], ++- [$6])]) ++- ++- ++-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) ++-# -------------------------------------------------------------- ++-m4_define([lt_dict_filter], ++-[m4_if([$5], [], [], ++- [lt_join(m4_quote(m4_default([$4], [[, ]])), ++- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), ++- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ++-]) ++- ++-# ltversion.m4 -- version numbers -*- Autoconf -*- ++-# ++-# Copyright (C) 2004 Free Software Foundation, Inc. ++-# Written by Scott James Remnant, 2004 ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# Generated from ltversion.in. ++- ++-# serial 3017 ltversion.m4 ++-# This file is part of GNU Libtool ++- ++-m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++-m4_define([LT_PACKAGE_REVISION], [1.3017]) ++- ++-AC_DEFUN([LTVERSION_VERSION], ++-[macro_version='2.2.6b' ++-macro_revision='1.3017' ++-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) ++-_LT_DECL(, macro_revision, 0) ++-]) ++- ++-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- ++-# ++-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++-# Written by Scott James Remnant, 2004. ++-# ++-# This file is free software; the Free Software Foundation gives ++-# unlimited permission to copy and/or distribute it, with or without ++-# modifications, as long as this notice is preserved. ++- ++-# serial 4 lt~obsolete.m4 ++- ++-# These exist entirely to fool aclocal when bootstrapping libtool. ++-# ++-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++-# which have later been changed to m4_define as they aren't part of the ++-# exported API, or moved to Autoconf or Automake where they belong. ++-# ++-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN ++-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us ++-# using a macro with the same name in our local m4/libtool.m4 it'll ++-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define ++-# and doesn't know about Autoconf macros at all.) ++-# ++-# So we provide this file, which has a silly filename so it's always ++-# included after everything else. This provides aclocal with the ++-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything ++-# because those macros already exist, or will be overwritten later. ++-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. ++-# ++-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. ++-# Yes, that means every name once taken will need to remain here until ++-# we give up compatibility with versions before 1.7, at which point ++-# we need to keep only those names which we still refer to. ++- ++-# This is to help aclocal find these macros, as it can't see m4_define. ++-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) ++- ++-m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) ++-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) ++-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) ++-m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) ++-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) ++-m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) ++-m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) ++-m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) ++-m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) ++-m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) ++-m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) ++-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) ++-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) ++-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) ++-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) ++-m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) ++-m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) ++-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) ++-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) ++-m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) ++-m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) ++-m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) ++-m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) ++-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) ++-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) ++-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) ++-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) ++-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) ++-m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) ++-m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) ++-m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) ++-m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) ++-m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) ++-m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) ++-m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) ++-m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) ++-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) ++-m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) ++-m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) ++-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) ++-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) ++-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) ++-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) ++-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) ++-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) ++-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) ++ ++ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++ # serial 1 (pkg-config-0.24) +diff --git a/feeds/packages/libs/orbit2/patches/010-dont-run-testprograms.patch b/feeds/packages/libs/orbit2/patches/010-dont-run-testprograms.patch +new file mode 100644 +index 0000000..5e105f2 +--- /dev/null ++++ b/feeds/packages/libs/orbit2/patches/010-dont-run-testprograms.patch +@@ -0,0 +1,28 @@ ++--- ORBit2-2.14.19/configure.in 2010-07-01 15:57:01.000000000 +0200 +++++ ORBit2-2.14.19.new/configure.in 2012-12-11 14:02:51.624767158 +0100 ++@@ -213,25 +213,6 @@ ++ AC_C_BIGENDIAN ++ ++ ++-dnl ++-dnl So many people with broken linking setups asked about this ++-dnl it turned out to be necessary to check for this. ++-dnl ++-dofus_save_libs="$LIBS" ++-LIBS="$ORBIT_LIBS $LIBS" ++-AC_TRY_RUN([ #include ++- main () ++- { ++- return 0; ++- } ],, ++- AC_MSG_ERROR([ ++-Linking is badly borked on your system. Please ensure your library path is correct ++-Check config.log for details - check near the end of the log above 'failed program was' ++-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the ++-prefix you're compiling on: '${prefix}' ]), ++-AC_MSG_WARN([Could not check for borked linking while cross-compiling])) ++-LIBS="$dofus_save_libs" ++- ++ orig_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" ++ AC_CHECK_ALIGNOF(CORBA_octet) +diff --git a/feeds/packages/libs/ortp/.svn/entries b/feeds/packages/libs/ortp/.svn/entries +new file mode 100644 +index 0000000..bb5e1ba +--- /dev/null ++++ b/feeds/packages/libs/ortp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ortp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++6914b6ca26edb948b4e69ef88faf7a26 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1637 ++ +diff --git a/feeds/packages/libs/ortp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/ortp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6ba9031 +--- /dev/null ++++ b/feeds/packages/libs/ortp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=ortp ++PKG_VERSION:=0.16.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:= \ ++ http://download.savannah.gnu.org/releases-noredirect/linphone/ortp/sources/ \ ++ http://www.very-clever.com/download/nongnu/linphone/ortp/sources/ ++PKG_MD5SUM:=2b0281600cb958d1c94e318a86b62fe3 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libortp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Real-time Transport Protocol (RTP) library ++ URL:=http://www.linphone.org/index.php/eng/code_review/ortp ++ DEPENDS:= +libpthread ++endef ++ ++ifneq ($(CONFIG_avr32),) ++ TARGET_CFLAGS += -fsigned-char ++endif ++ ++CONFIGURE_ARGS += \ ++ --disable-debug \ ++ --enable-ipv6 \ ++ --enable-perf \ ++ --disable-ssl-hmac \ ++ --disable-so-reuseaddr \ ++ --without-srtp \ ++ ++CONFIGURE_VARS += \ ++ ac_cv_header_srtp_srtp_h=no \ ++ ac_cv_lib_srtp_srtp_init=no \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/include/ortp \ ++ $(1)/usr/include/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/libortp.{a,so*} \ ++ $(1)/usr/lib/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/pkgconfig/ortp.pc \ ++ $(1)/usr/lib/pkgconfig/ \ ++ ) ++endef ++ ++define Package/libortp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/libortp.so.* \ ++ $(1)/usr/lib/ \ ++ ) ++endef ++ ++$(eval $(call BuildPackage,libortp)) +diff --git a/feeds/packages/libs/ortp/Makefile b/feeds/packages/libs/ortp/Makefile +new file mode 100644 +index 0000000..6ba9031 +--- /dev/null ++++ b/feeds/packages/libs/ortp/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=ortp ++PKG_VERSION:=0.16.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:= \ ++ http://download.savannah.gnu.org/releases-noredirect/linphone/ortp/sources/ \ ++ http://www.very-clever.com/download/nongnu/linphone/ortp/sources/ ++PKG_MD5SUM:=2b0281600cb958d1c94e318a86b62fe3 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libortp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Real-time Transport Protocol (RTP) library ++ URL:=http://www.linphone.org/index.php/eng/code_review/ortp ++ DEPENDS:= +libpthread ++endef ++ ++ifneq ($(CONFIG_avr32),) ++ TARGET_CFLAGS += -fsigned-char ++endif ++ ++CONFIGURE_ARGS += \ ++ --disable-debug \ ++ --enable-ipv6 \ ++ --enable-perf \ ++ --disable-ssl-hmac \ ++ --disable-so-reuseaddr \ ++ --without-srtp \ ++ ++CONFIGURE_VARS += \ ++ ac_cv_header_srtp_srtp_h=no \ ++ ac_cv_lib_srtp_srtp_init=no \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/include/ortp \ ++ $(1)/usr/include/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/libortp.{a,so*} \ ++ $(1)/usr/lib/ \ ++ ) ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/pkgconfig/ortp.pc \ ++ $(1)/usr/lib/pkgconfig/ \ ++ ) ++endef ++ ++define Package/libortp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/libortp.so.* \ ++ $(1)/usr/lib/ \ ++ ) ++endef ++ ++$(eval $(call BuildPackage,libortp)) +diff --git a/feeds/packages/libs/ossp-js/.svn/entries b/feeds/packages/libs/ossp-js/.svn/entries +new file mode 100644 +index 0000000..02111c9 +--- /dev/null ++++ b/feeds/packages/libs/ossp-js/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ossp-js ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++b11ea097d4cab1d4ce0f955e269c2335 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2450 ++ +diff --git a/feeds/packages/libs/ossp-js/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/ossp-js/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..323a7d8 +--- /dev/null ++++ b/feeds/packages/libs/ossp-js/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/libs/ossp-js/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/ossp-js/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..129cd12 +--- /dev/null ++++ b/feeds/packages/libs/ossp-js/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,119 @@ ++# ++# 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:=js ++PKG_VERSION:=1.6.20070208 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.ossp.org/pkg/lib/js/ ++PKG_MD5SUM:=07f6cad7e03fd74a949588c3d4b333de ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 libtool.m4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/js/Default ++ TITLE:=Mozilla JavaScript Engine ++ URL:=http://www.ossp.org/pkg/lib/js/ ++endef ++ ++define Package/js ++$(call Package/js/Default) ++ SECTION:=lang ++ CATEGORY:=Languages ++ SUBMENU:=JavaScript ++ TITLE+= (interpreter) ++ DEPENDS+= +libjs +libreadline +libncurses ++endef ++ ++define Package/libjs ++$(call Package/js/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-dso \ ++ --with-editline \ ++ --with-file \ ++ --without-perl ++ ++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) \ ++ --disable-shared \ ++ --enable-static \ ++ ); ++ $(MAKE) -C $(PKG_BUILD_DIR) src/jsautocfg.h ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/js-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/js-config ++ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/js \ ++ $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libjs.{la,so*} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/js.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/js/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/js \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/libjs/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libjs.so.* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,js)) ++$(eval $(call BuildPackage,libjs)) +diff --git a/feeds/packages/libs/ossp-js/Makefile b/feeds/packages/libs/ossp-js/Makefile +new file mode 100644 +index 0000000..129cd12 +--- /dev/null ++++ b/feeds/packages/libs/ossp-js/Makefile +@@ -0,0 +1,119 @@ ++# ++# 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:=js ++PKG_VERSION:=1.6.20070208 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.ossp.org/pkg/lib/js/ ++PKG_MD5SUM:=07f6cad7e03fd74a949588c3d4b333de ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 libtool.m4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/js/Default ++ TITLE:=Mozilla JavaScript Engine ++ URL:=http://www.ossp.org/pkg/lib/js/ ++endef ++ ++define Package/js ++$(call Package/js/Default) ++ SECTION:=lang ++ CATEGORY:=Languages ++ SUBMENU:=JavaScript ++ TITLE+= (interpreter) ++ DEPENDS+= +libjs +libreadline +libncurses ++endef ++ ++define Package/libjs ++$(call Package/js/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --with-dso \ ++ --with-editline \ ++ --with-file \ ++ --without-perl ++ ++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) \ ++ --disable-shared \ ++ --enable-static \ ++ ); ++ $(MAKE) -C $(PKG_BUILD_DIR) src/jsautocfg.h ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/js-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/js-config ++ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/js \ ++ $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libjs.{la,so*} \ ++ $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/js.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/js/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/js \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/libjs/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libjs.so.* \ ++ $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,js)) ++$(eval $(call BuildPackage,libjs)) +diff --git a/feeds/packages/libs/pcre/.svn/entries b/feeds/packages/libs/pcre/.svn/entries +new file mode 100644 +index 0000000..f035402 +--- /dev/null ++++ b/feeds/packages/libs/pcre/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/pcre ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4752e4178d088ad4fc092571a1470525 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1985 ++ +diff --git a/feeds/packages/libs/pcre/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/pcre/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/pcre/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/pcre/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/pcre/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a7ca6d0 +--- /dev/null ++++ b/feeds/packages/libs/pcre/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,89 @@ ++# ++# 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:=pcre ++PKG_VERSION:=8.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/pcre ++PKG_MD5SUM:=ef907b8792ec7f90f0dcd773848f0b3b ++ ++PKG_LICENSE:=BSD-3c ++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/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 \ ++ ++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/ ++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,libpcrecpp)) +diff --git a/feeds/packages/libs/pcre/Makefile b/feeds/packages/libs/pcre/Makefile +new file mode 100644 +index 0000000..a7ca6d0 +--- /dev/null ++++ b/feeds/packages/libs/pcre/Makefile +@@ -0,0 +1,89 @@ ++# ++# 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:=pcre ++PKG_VERSION:=8.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/pcre ++PKG_MD5SUM:=ef907b8792ec7f90f0dcd773848f0b3b ++ ++PKG_LICENSE:=BSD-3c ++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/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 \ ++ ++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/ ++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,libpcrecpp)) +diff --git a/feeds/packages/libs/pcre/patches/.svn/entries b/feeds/packages/libs/pcre/patches/.svn/entries +new file mode 100644 +index 0000000..d71ff86 +--- /dev/null ++++ b/feeds/packages/libs/pcre/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/pcre/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-10T16:17:39.773260Z ++24428 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++750-pcre_config_cross.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++2d0db44ff7e18798d353b28c408b6f90 ++2010-03-22T14:25:18.161875Z ++20368 ++rhk ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++588 ++ +diff --git a/feeds/packages/libs/pcre/patches/.svn/prop-base/750-pcre_config_cross.patch.svn-base b/feeds/packages/libs/pcre/patches/.svn/prop-base/750-pcre_config_cross.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/pcre/patches/.svn/prop-base/750-pcre_config_cross.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/pcre/patches/.svn/text-base/750-pcre_config_cross.patch.svn-base b/feeds/packages/libs/pcre/patches/.svn/text-base/750-pcre_config_cross.patch.svn-base +new file mode 100644 +index 0000000..1a5ab00 +--- /dev/null ++++ b/feeds/packages/libs/pcre/patches/.svn/text-base/750-pcre_config_cross.patch.svn-base +@@ -0,0 +1,26 @@ ++--- a/pcre-config.in +++++ b/pcre-config.in ++@@ -24,6 +24,10 @@ case `uname -s` in ++ libR=" -Wl,-R@libdir@" ++ ;; ++ esac +++libS= +++if test @libdir@ != /usr/lib ; then +++ libS=-L@libdir@ +++fi ++ ++ while test $# -gt 0; do ++ case "$1" in ++@@ -58,10 +62,10 @@ while test $# -gt 0; do ++ echo $includes @PCRE_STATIC_CFLAG@ ++ ;; ++ --libs-posix) ++- echo -L@libdir@$libR -lpcreposix -lpcre +++ echo $libS$libR -lpcreposix -lpcre ++ ;; ++ --libs) ++- echo -L@libdir@$libR -lpcre +++ echo $libS$libR -lpcre ++ ;; ++ --libs-cpp) ++ if test @enable_cpp@ = yes ; then +diff --git a/feeds/packages/libs/pcre/patches/750-pcre_config_cross.patch b/feeds/packages/libs/pcre/patches/750-pcre_config_cross.patch +new file mode 100644 +index 0000000..1a5ab00 +--- /dev/null ++++ b/feeds/packages/libs/pcre/patches/750-pcre_config_cross.patch +@@ -0,0 +1,26 @@ ++--- a/pcre-config.in +++++ b/pcre-config.in ++@@ -24,6 +24,10 @@ case `uname -s` in ++ libR=" -Wl,-R@libdir@" ++ ;; ++ esac +++libS= +++if test @libdir@ != /usr/lib ; then +++ libS=-L@libdir@ +++fi ++ ++ while test $# -gt 0; do ++ case "$1" in ++@@ -58,10 +62,10 @@ while test $# -gt 0; do ++ echo $includes @PCRE_STATIC_CFLAG@ ++ ;; ++ --libs-posix) ++- echo -L@libdir@$libR -lpcreposix -lpcre +++ echo $libS$libR -lpcreposix -lpcre ++ ;; ++ --libs) ++- echo -L@libdir@$libR -lpcre +++ echo $libS$libR -lpcre ++ ;; ++ --libs-cpp) ++ if test @enable_cpp@ = yes ; then +diff --git a/feeds/packages/libs/phidget21/.svn/entries b/feeds/packages/libs/phidget21/.svn/entries +new file mode 100644 +index 0000000..429f9d2 +--- /dev/null ++++ b/feeds/packages/libs/phidget21/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/phidget21 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T01:56:52.232535Z ++32255 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++0f468b5733c54ad14ec245aed2d3a1b2 ++2012-06-12T01:56:52.232535Z ++32255 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2353 ++ +diff --git a/feeds/packages/libs/phidget21/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/phidget21/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..70a2ef8 +--- /dev/null ++++ b/feeds/packages/libs/phidget21/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,86 @@ ++# ++# 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:=phidget21 ++PKG_VERSION:=2.1.6.20091105 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Phidgetlinux_$(PKG_VERSION).tar.gz ++PKG_BUILD_DIR:=$(BUILD_DIR)/Phidgetlinux ++PKG_SOURCE_URL:=http://www.phidgets.com/downloads/libraries/ ++PKG_MD5SUM:=eb48c7fc68ab189a0255c35e71d55ecd ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/phidget21 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread ++ TITLE:=Phidget API ++ URL:=http://www.phidgets.com/ ++endef ++ ++define Package/phidget21/description ++ The Phidget API library. ++endef ++ ++define Package/phidget-service ++ SECTION:=misc ++ CATEGORY:=Network ++ TITLE:=Phidget Web Service ++ URL:=http://www.phidgets.com/ ++ DEPENDS:=phidget21 ++endef ++ ++define Package/phidget-service/description ++ The Phidget Web Service. ++endef ++ ++define Build/Configure ++ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/include/ ++ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/lib/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/phidget21 \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-strict-aliasing -fpic -D_LINUX -I. -Iutils" \ ++ INSTALLPREFIX="$(PKG_INSTALL_DIR)" LDCONFIG="" \ ++ all install ++ $(MAKE) -C $(PKG_BUILD_DIR)/webservice \ ++ $(TARGET_CONFIGURE_OPTS) LDCONFIG="true" \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-strict-aliasing -fpic -D_LINUX -I. -Iutils" \ ++ phidget21internal.h ++ $(MAKE) -C $(PKG_BUILD_DIR)/webservice \ ++ $(TARGET_CONFIGURE_OPTS) LDCONFIG="true" \ ++ LIBS="-lphidget21 -lpthread -ldl -L../phidget21" \ ++ CFLAGS="$(TARGET_CFLAGS) -static -D_LINUX -I. -I../phidget21 -I../phidget21/utils" \ ++ webservice21 ++endef ++ ++define Build/InstallDev ++ ls $(PKG_INSTALL_DIR) ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/phidget21.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libphidget21.so $(1)/usr/lib/ ++endef ++ ++define Package/phidget21/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libphidget21.so $(1)/usr/lib/ ++endef ++ ++define Package/phidget-service/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/webservice/phidgetwebservice21 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,phidget21)) ++$(eval $(call BuildPackage,phidget-service)) +diff --git a/feeds/packages/libs/phidget21/Makefile b/feeds/packages/libs/phidget21/Makefile +new file mode 100644 +index 0000000..70a2ef8 +--- /dev/null ++++ b/feeds/packages/libs/phidget21/Makefile +@@ -0,0 +1,86 @@ ++# ++# 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:=phidget21 ++PKG_VERSION:=2.1.6.20091105 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=Phidgetlinux_$(PKG_VERSION).tar.gz ++PKG_BUILD_DIR:=$(BUILD_DIR)/Phidgetlinux ++PKG_SOURCE_URL:=http://www.phidgets.com/downloads/libraries/ ++PKG_MD5SUM:=eb48c7fc68ab189a0255c35e71d55ecd ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/phidget21 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread ++ TITLE:=Phidget API ++ URL:=http://www.phidgets.com/ ++endef ++ ++define Package/phidget21/description ++ The Phidget API library. ++endef ++ ++define Package/phidget-service ++ SECTION:=misc ++ CATEGORY:=Network ++ TITLE:=Phidget Web Service ++ URL:=http://www.phidgets.com/ ++ DEPENDS:=phidget21 ++endef ++ ++define Package/phidget-service/description ++ The Phidget Web Service. ++endef ++ ++define Build/Configure ++ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/include/ ++ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/lib/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/phidget21 \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-strict-aliasing -fpic -D_LINUX -I. -Iutils" \ ++ INSTALLPREFIX="$(PKG_INSTALL_DIR)" LDCONFIG="" \ ++ all install ++ $(MAKE) -C $(PKG_BUILD_DIR)/webservice \ ++ $(TARGET_CONFIGURE_OPTS) LDCONFIG="true" \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-strict-aliasing -fpic -D_LINUX -I. -Iutils" \ ++ phidget21internal.h ++ $(MAKE) -C $(PKG_BUILD_DIR)/webservice \ ++ $(TARGET_CONFIGURE_OPTS) LDCONFIG="true" \ ++ LIBS="-lphidget21 -lpthread -ldl -L../phidget21" \ ++ CFLAGS="$(TARGET_CFLAGS) -static -D_LINUX -I. -I../phidget21 -I../phidget21/utils" \ ++ webservice21 ++endef ++ ++define Build/InstallDev ++ ls $(PKG_INSTALL_DIR) ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/phidget21.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libphidget21.so $(1)/usr/lib/ ++endef ++ ++define Package/phidget21/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libphidget21.so $(1)/usr/lib/ ++endef ++ ++define Package/phidget-service/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/webservice/phidgetwebservice21 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,phidget21)) ++$(eval $(call BuildPackage,phidget-service)) +diff --git a/feeds/packages/libs/poco/.svn/entries b/feeds/packages/libs/poco/.svn/entries +new file mode 100644 +index 0000000..d1e5019 +--- /dev/null ++++ b/feeds/packages/libs/poco/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/poco ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:30:36.598713Z ++32242 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++cce70b7dd52921b2bde384f9bd6a875f ++2012-06-11T23:30:36.598713Z ++32242 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1408 ++ +diff --git a/feeds/packages/libs/poco/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/poco/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2b75e1f +--- /dev/null ++++ b/feeds/packages/libs/poco/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=poco ++PKG_VERSION:=1.3.6p2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/poco/sources/poco-1.3.6 ++PKG_MD5SUM:=32d154ca5f34d20217c0baaffa432c1c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/poco ++ NAME:=poco ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Poco C++ libraries ++ URL:=http://www.pocoproject.org/ ++ DEPENDS:=+libstdcpp +libpthread +librt ++endef ++ ++define Package/poco/description ++ Modern, powerful open source C++ class libraries and frameworks for building ++ network- and internet-based applications that run on desktop, server and ++ embedded systems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --config=Linux \ ++ --no-tests \ ++ --no-samples \ ++ --no-fpenvironment \ ++ --no-sharedmemory \ ++ --no-wstring ++ ++define Package/poco/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,Net,Util}.so* $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) -r $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,Net,Util}.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,poco)) +diff --git a/feeds/packages/libs/poco/Makefile b/feeds/packages/libs/poco/Makefile +new file mode 100644 +index 0000000..2b75e1f +--- /dev/null ++++ b/feeds/packages/libs/poco/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=poco ++PKG_VERSION:=1.3.6p2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/poco/sources/poco-1.3.6 ++PKG_MD5SUM:=32d154ca5f34d20217c0baaffa432c1c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/poco ++ NAME:=poco ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Poco C++ libraries ++ URL:=http://www.pocoproject.org/ ++ DEPENDS:=+libstdcpp +libpthread +librt ++endef ++ ++define Package/poco/description ++ Modern, powerful open source C++ class libraries and frameworks for building ++ network- and internet-based applications that run on desktop, server and ++ embedded systems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --config=Linux \ ++ --no-tests \ ++ --no-samples \ ++ --no-fpenvironment \ ++ --no-sharedmemory \ ++ --no-wstring ++ ++define Package/poco/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,Net,Util}.so* $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) -r $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,Net,Util}.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,poco)) +diff --git a/feeds/packages/libs/poco/patches/.svn/entries b/feeds/packages/libs/poco/patches/.svn/entries +new file mode 100644 +index 0000000..b73caaa +--- /dev/null ++++ b/feeds/packages/libs/poco/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/poco/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-09-04T18:03:54.701599Z ++22910 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-sharedmemory.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f4e71b996276f85430ecf2a6b2f8b43a ++2010-09-04T18:03:54.701599Z ++22910 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++820 ++ +diff --git a/feeds/packages/libs/poco/patches/.svn/text-base/100-sharedmemory.patch.svn-base b/feeds/packages/libs/poco/patches/.svn/text-base/100-sharedmemory.patch.svn-base +new file mode 100644 +index 0000000..811a964 +--- /dev/null ++++ b/feeds/packages/libs/poco/patches/.svn/text-base/100-sharedmemory.patch.svn-base +@@ -0,0 +1,26 @@ ++--- a/configure +++++ b/configure ++@@ -50,6 +50,11 @@ ++ Useful if your C++ compiler has incomplete floating-point support ++ (such as uClibc-based systems). ++ +++ --no-sharedmemory +++ Compile with -DPOCO_NO_SHAREDMEMORY +++ Useful if your C++ compiler has incomplete shared memory support +++ (such as uClibc-based systems). +++ ++ --omit={,} ++ Do not build the specified component(s). ++ Example: --omit=Data/MySQL,Data/ODBC,Zip ++@@ -140,6 +145,10 @@ ++ flags="$flags -DPOCO_NO_FPENVIRONMENT" ++ fi ++ +++ if [ "$1" = "--no-sharedmemory" ] ; then +++ flags="$flags -DPOCO_NO_SHAREDMEMORY" +++ fi +++ ++ if [ "$1" = "--poquito" ] ; then ++ flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ++ fi ++ +diff --git a/feeds/packages/libs/poco/patches/100-sharedmemory.patch b/feeds/packages/libs/poco/patches/100-sharedmemory.patch +new file mode 100644 +index 0000000..811a964 +--- /dev/null ++++ b/feeds/packages/libs/poco/patches/100-sharedmemory.patch +@@ -0,0 +1,26 @@ ++--- a/configure +++++ b/configure ++@@ -50,6 +50,11 @@ ++ Useful if your C++ compiler has incomplete floating-point support ++ (such as uClibc-based systems). ++ +++ --no-sharedmemory +++ Compile with -DPOCO_NO_SHAREDMEMORY +++ Useful if your C++ compiler has incomplete shared memory support +++ (such as uClibc-based systems). +++ ++ --omit={,} ++ Do not build the specified component(s). ++ Example: --omit=Data/MySQL,Data/ODBC,Zip ++@@ -140,6 +145,10 @@ ++ flags="$flags -DPOCO_NO_FPENVIRONMENT" ++ fi ++ +++ if [ "$1" = "--no-sharedmemory" ] ; then +++ flags="$flags -DPOCO_NO_SHAREDMEMORY" +++ fi +++ ++ if [ "$1" = "--poquito" ] ; then ++ flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ++ fi ++ +diff --git a/feeds/packages/libs/postgresql/.svn/entries b/feeds/packages/libs/postgresql/.svn/entries +new file mode 100644 +index 0000000..e37aa18 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/postgresql ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++48f840b1ab2b36e969f8269dc335aabb ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7093 ++ +diff --git a/feeds/packages/libs/postgresql/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/postgresql/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/postgresql/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/postgresql/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..74d2ceb +--- /dev/null ++++ b/feeds/packages/libs/postgresql/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,250 @@ ++# ++# 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:=postgresql ++PKG_VERSION:=9.0.1 ++PKG_RELEASE:=3 ++ ++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:=57ba57e43cfe29e16dacbf5789be98d1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpq ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libreadline +libpthread +libncurses +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) ++ ++# 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/feeds/packages/libs/postgresql/Makefile b/feeds/packages/libs/postgresql/Makefile +new file mode 100644 +index 0000000..74d2ceb +--- /dev/null ++++ b/feeds/packages/libs/postgresql/Makefile +@@ -0,0 +1,250 @@ ++# ++# 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:=postgresql ++PKG_VERSION:=9.0.1 ++PKG_RELEASE:=3 ++ ++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:=57ba57e43cfe29e16dacbf5789be98d1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libpq ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libreadline +libpthread +libncurses +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) ++ ++# 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/feeds/packages/libs/postgresql/files/.svn/entries b/feeds/packages/libs/postgresql/files/.svn/entries +new file mode 100644 +index 0000000..48530ad +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/postgresql/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-31T23:30:04.304036Z ++23755 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++postgresql.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e7f9381e4a8cd6d4eba0dd924c5851e5 ++2010-10-31T23:30:04.304036Z ++23755 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2203 ++ ++postgresql.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++3b4791b74f02ea7d152a09f2bf94f6c2 ++2007-04-10T22:34:14.694242Z ++6928 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++166 ++ +diff --git a/feeds/packages/libs/postgresql/files/.svn/prop-base/postgresql.config.svn-base b/feeds/packages/libs/postgresql/files/.svn/prop-base/postgresql.config.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/.svn/prop-base/postgresql.config.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/postgresql/files/.svn/prop-base/postgresql.init.svn-base b/feeds/packages/libs/postgresql/files/.svn/prop-base/postgresql.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/.svn/prop-base/postgresql.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/postgresql/files/.svn/text-base/postgresql.config.svn-base b/feeds/packages/libs/postgresql/files/.svn/text-base/postgresql.config.svn-base +new file mode 100644 +index 0000000..df17c12 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/.svn/text-base/postgresql.config.svn-base +@@ -0,0 +1,5 @@ ++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/feeds/packages/libs/postgresql/files/.svn/text-base/postgresql.init.svn-base b/feeds/packages/libs/postgresql/files/.svn/text-base/postgresql.init.svn-base +new file mode 100644 +index 0000000..1e1c52f +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/.svn/text-base/postgresql.init.svn-base +@@ -0,0 +1,93 @@ ++#!/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/feeds/packages/libs/postgresql/files/postgresql.config b/feeds/packages/libs/postgresql/files/postgresql.config +new file mode 100644 +index 0000000..df17c12 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/postgresql.config +@@ -0,0 +1,5 @@ ++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/feeds/packages/libs/postgresql/files/postgresql.init b/feeds/packages/libs/postgresql/files/postgresql.init +new file mode 100644 +index 0000000..1e1c52f +--- /dev/null ++++ b/feeds/packages/libs/postgresql/files/postgresql.init +@@ -0,0 +1,93 @@ ++#!/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/feeds/packages/libs/postgresql/patches/.svn/entries b/feeds/packages/libs/postgresql/patches/.svn/entries +new file mode 100644 +index 0000000..69d86ee +--- /dev/null ++++ b/feeds/packages/libs/postgresql/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/postgresql/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-11T13:48:39.802933Z ++24485 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-ranlib.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++2a4e9e6778f67da23435cd9ddbf05fa8 ++2010-11-21T14:17:24.463870Z ++24056 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++231 ++ ++800-busybox-default-pager.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++b81b7c647628b0ca0bcb52195a9c4849 ++2010-11-21T14:17:24.463870Z ++24056 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++349 ++ +diff --git a/feeds/packages/libs/postgresql/patches/.svn/prop-base/200-ranlib.patch.svn-base b/feeds/packages/libs/postgresql/patches/.svn/prop-base/200-ranlib.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/patches/.svn/prop-base/200-ranlib.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/postgresql/patches/.svn/text-base/200-ranlib.patch.svn-base b/feeds/packages/libs/postgresql/patches/.svn/text-base/200-ranlib.patch.svn-base +new file mode 100644 +index 0000000..1b68b83 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/patches/.svn/text-base/200-ranlib.patch.svn-base +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/libs/postgresql/patches/.svn/text-base/800-busybox-default-pager.patch.svn-base b/feeds/packages/libs/postgresql/patches/.svn/text-base/800-busybox-default-pager.patch.svn-base +new file mode 100644 +index 0000000..3cd2532 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/patches/.svn/text-base/800-busybox-default-pager.patch.svn-base +@@ -0,0 +1,13 @@ ++--- 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/feeds/packages/libs/postgresql/patches/200-ranlib.patch b/feeds/packages/libs/postgresql/patches/200-ranlib.patch +new file mode 100644 +index 0000000..1b68b83 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/patches/200-ranlib.patch +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/libs/postgresql/patches/800-busybox-default-pager.patch b/feeds/packages/libs/postgresql/patches/800-busybox-default-pager.patch +new file mode 100644 +index 0000000..3cd2532 +--- /dev/null ++++ b/feeds/packages/libs/postgresql/patches/800-busybox-default-pager.patch +@@ -0,0 +1,13 @@ ++--- 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/feeds/packages/libs/protobuf-c/.svn/entries b/feeds/packages/libs/protobuf-c/.svn/entries +new file mode 100644 +index 0000000..d4ce097 +--- /dev/null ++++ b/feeds/packages/libs/protobuf-c/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/protobuf-c ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-08T07:48:20.589844Z ++28194 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f0f67687a574d678408542f498760900 ++2011-09-08T07:48:20.589844Z ++28194 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1550 ++ +diff --git a/feeds/packages/libs/protobuf-c/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/protobuf-c/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fd1e4f6 +--- /dev/null ++++ b/feeds/packages/libs/protobuf-c/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=protobuf-c ++PKG_VERSION:=0.15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://protobuf-c.googlecode.com/files ++PKG_MD5SUM:=73ff0c8df50d2eee75269ad8f8c07dc8 ++ ++PKG_INSTALL:=1 ++ ++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/google/protobuf-c ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/google/protobuf-c/* \ ++ $(1)/usr/include/google/protobuf-c/ ++ $(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/feeds/packages/libs/protobuf-c/Makefile b/feeds/packages/libs/protobuf-c/Makefile +new file mode 100644 +index 0000000..fd1e4f6 +--- /dev/null ++++ b/feeds/packages/libs/protobuf-c/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=protobuf-c ++PKG_VERSION:=0.15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://protobuf-c.googlecode.com/files ++PKG_MD5SUM:=73ff0c8df50d2eee75269ad8f8c07dc8 ++ ++PKG_INSTALL:=1 ++ ++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/google/protobuf-c ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/google/protobuf-c/* \ ++ $(1)/usr/include/google/protobuf-c/ ++ $(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/feeds/packages/libs/protobuf/.svn/entries b/feeds/packages/libs/protobuf/.svn/entries +new file mode 100644 +index 0000000..48e1681 +--- /dev/null ++++ b/feeds/packages/libs/protobuf/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/protobuf ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:34.906741Z ++32281 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++270d803d0d7d943deee437196e7ddcfe ++2012-06-12T23:47:34.906741Z ++32281 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1609 ++ +diff --git a/feeds/packages/libs/protobuf/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/protobuf/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f82027b +--- /dev/null ++++ b/feeds/packages/libs/protobuf/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,74 @@ ++# ++# 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.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://protobuf.googlecode.com/files ++PKG_MD5SUM:=ed436802019c9e1f40cc750eaf78f318 ++ ++PKG_BUILD_DEPENDS:=protobuf/host ++ ++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 ++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 ++ ++CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOST)/bin/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/feeds/packages/libs/protobuf/Makefile b/feeds/packages/libs/protobuf/Makefile +new file mode 100644 +index 0000000..f82027b +--- /dev/null ++++ b/feeds/packages/libs/protobuf/Makefile +@@ -0,0 +1,74 @@ ++# ++# 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.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://protobuf.googlecode.com/files ++PKG_MD5SUM:=ed436802019c9e1f40cc750eaf78f318 ++ ++PKG_BUILD_DEPENDS:=protobuf/host ++ ++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 ++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 ++ ++CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOST)/bin/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/feeds/packages/libs/pthsem/.svn/entries b/feeds/packages/libs/pthsem/.svn/entries +new file mode 100644 +index 0000000..18f5ba9 +--- /dev/null ++++ b/feeds/packages/libs/pthsem/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/pthsem ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++abd3a55ae2e9d3db232571de575a604e ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1517 ++ +diff --git a/feeds/packages/libs/pthsem/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/pthsem/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c40930b +--- /dev/null ++++ b/feeds/packages/libs/pthsem/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=pthsem ++PKG_VERSION:=2.0.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/ ++PKG_MD5SUM:=9144b26dcc27e67498d63dd5456f934c ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++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 ++ DEPENDS:=@USE_EGLIBC @TARGET_x86 ++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 ++ ++MAKE_FLAGS += \ ++ OPTIM="$(TARGET_CFLAGS)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/pthsem-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/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/ ++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/feeds/packages/libs/pthsem/Makefile b/feeds/packages/libs/pthsem/Makefile +new file mode 100644 +index 0000000..c40930b +--- /dev/null ++++ b/feeds/packages/libs/pthsem/Makefile +@@ -0,0 +1,59 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=pthsem ++PKG_VERSION:=2.0.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/ ++PKG_MD5SUM:=9144b26dcc27e67498d63dd5456f934c ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++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 ++ DEPENDS:=@USE_EGLIBC @TARGET_x86 ++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 ++ ++MAKE_FLAGS += \ ++ OPTIM="$(TARGET_CFLAGS)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/pthsem-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/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/ ++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/feeds/packages/libs/ptlib/.svn/entries b/feeds/packages/libs/ptlib/.svn/entries +new file mode 100644 +index 0000000..e3fb0d7 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ptlib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:09.705640Z ++34633 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++2cf9c6358a3b2b11d7bc52bb0b2beb75 ++2012-12-11T16:58:09.705640Z ++34633 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2577 ++ +diff --git a/feeds/packages/libs/ptlib/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/ptlib/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f8b8380 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,107 @@ ++# ++# Copyright (C) 2006-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:=ptlib ++PKG_VERSION:=2.10.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/opalvoip ++PKG_MD5SUM:= ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ptlib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libexpat ++ TITLE:=Portable Tools library ++ URL:=http://www.opalvoip.org/ ++endef ++ ++define Package/ptlib/description ++ PTLib is a moderately large class library that has its genesis many years ago as ++ PWLib (portable Windows Library), a method to product applications to run on both ++ Microsoft Windows and Unix X-Windows systems. It also was to have a Macintosh port ++ as well but that never eventuated. The parts of the library relating to GUI ++ functions have long been removed as other class libraries such as wxWidgets were ++ much more advanced. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-minsize \ ++ --enable-opal \ ++ --enable-internalregex \ ++ --enable-audio \ ++ --disable-alsa \ ++ --disable-asn \ ++ --disable-avc \ ++ --enable-configfile \ ++ --disable-dc \ ++ --disable-dtmf \ ++ --enable-expat \ ++ --disable-ftp \ ++ --disable-http \ ++ --disable-httpsvc \ ++ --disable-jabber \ ++ --disable-odbc \ ++ --disable-openldap \ ++ --disable-openssl \ ++ --disable-oss \ ++ --disable-pipechan \ ++ --disable-plugins \ ++ --disable-pop3smtp \ ++ --disable-remconn \ ++ --enable-resolver \ ++ --enable-qos \ ++ --disable-sasl \ ++ --disable-sdl \ ++ --disable-serial \ ++ --disable-shm-video \ ++ --disable-snmp \ ++ --disable-soap \ ++ --disable-socks \ ++ --enable-stun \ ++ --disable-telnet \ ++ --disable-tts \ ++ --disable-v4l \ ++ --disable-v4l2 \ ++ --disable-bsdvideo \ ++ --disable-video \ ++ --disable-vxml \ ++ --enable-wavfile \ ++ --disable-xmlrpc \ ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \ ++ ++CONFIGURE_CMD = ./configure ++ ++define Build/Configure/Default ++ (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \ ++ if [ -x $(CONFIGURE_CMD) ]; then \ ++ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \ ++ $(CONFIGURE_VARS) \ ++ $(2) \ ++ $(CONFIGURE_CMD) \ ++ $(CONFIGURE_ARGS) \ ++ $(1); \ ++ fi; \ ++ ) ++endef ++ ++MAKE_FLAGS += optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)_$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++ $(SED) 's|//\(#include \)|\1|' $(PKG_BUILD_DIR)/include/ptlib.h ++endef ++ ++$(eval $(call BuildPackage,ptlib)) +diff --git a/feeds/packages/libs/ptlib/Makefile b/feeds/packages/libs/ptlib/Makefile +new file mode 100644 +index 0000000..f8b8380 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/Makefile +@@ -0,0 +1,107 @@ ++# ++# Copyright (C) 2006-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:=ptlib ++PKG_VERSION:=2.10.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/opalvoip ++PKG_MD5SUM:= ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ptlib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libexpat ++ TITLE:=Portable Tools library ++ URL:=http://www.opalvoip.org/ ++endef ++ ++define Package/ptlib/description ++ PTLib is a moderately large class library that has its genesis many years ago as ++ PWLib (portable Windows Library), a method to product applications to run on both ++ Microsoft Windows and Unix X-Windows systems. It also was to have a Macintosh port ++ as well but that never eventuated. The parts of the library relating to GUI ++ functions have long been removed as other class libraries such as wxWidgets were ++ much more advanced. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-minsize \ ++ --enable-opal \ ++ --enable-internalregex \ ++ --enable-audio \ ++ --disable-alsa \ ++ --disable-asn \ ++ --disable-avc \ ++ --enable-configfile \ ++ --disable-dc \ ++ --disable-dtmf \ ++ --enable-expat \ ++ --disable-ftp \ ++ --disable-http \ ++ --disable-httpsvc \ ++ --disable-jabber \ ++ --disable-odbc \ ++ --disable-openldap \ ++ --disable-openssl \ ++ --disable-oss \ ++ --disable-pipechan \ ++ --disable-plugins \ ++ --disable-pop3smtp \ ++ --disable-remconn \ ++ --enable-resolver \ ++ --enable-qos \ ++ --disable-sasl \ ++ --disable-sdl \ ++ --disable-serial \ ++ --disable-shm-video \ ++ --disable-snmp \ ++ --disable-soap \ ++ --disable-socks \ ++ --enable-stun \ ++ --disable-telnet \ ++ --disable-tts \ ++ --disable-v4l \ ++ --disable-v4l2 \ ++ --disable-bsdvideo \ ++ --disable-video \ ++ --disable-vxml \ ++ --enable-wavfile \ ++ --disable-xmlrpc \ ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \ ++ ++CONFIGURE_CMD = ./configure ++ ++define Build/Configure/Default ++ (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \ ++ if [ -x $(CONFIGURE_CMD) ]; then \ ++ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \ ++ $(CONFIGURE_VARS) \ ++ $(2) \ ++ $(CONFIGURE_CMD) \ ++ $(CONFIGURE_ARGS) \ ++ $(1); \ ++ fi; \ ++ ) ++endef ++ ++MAKE_FLAGS += optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)_$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++ $(SED) 's|//\(#include \)|\1|' $(PKG_BUILD_DIR)/include/ptlib.h ++endef ++ ++$(eval $(call BuildPackage,ptlib)) +diff --git a/feeds/packages/libs/ptlib/patches/.svn/entries b/feeds/packages/libs/ptlib/patches/.svn/entries +new file mode 100644 +index 0000000..492459a +--- /dev/null ++++ b/feeds/packages/libs/ptlib/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ptlib/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:09.705640Z ++34633 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix-gcc_4_3-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++27ae845bc31ce0092129c64ed99495c9 ++2012-12-11T16:58:09.705640Z ++34633 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++362 ++ ++020-uclibc-res_nsearch.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++638bb5cd9b4bf2e3548f9740d717ab22 ++2012-06-07T14:55:32.537135Z ++32107 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++421 ++ +diff --git a/feeds/packages/libs/ptlib/patches/.svn/text-base/010-fix-gcc_4_3-compile.patch.svn-base b/feeds/packages/libs/ptlib/patches/.svn/text-base/010-fix-gcc_4_3-compile.patch.svn-base +new file mode 100644 +index 0000000..c764ca1 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/patches/.svn/text-base/010-fix-gcc_4_3-compile.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -urN ptlib-2.10.9/src/ptclib/socks.cxx ptlib-2.10.9.new/src/ptclib/socks.cxx ++--- ptlib-2.10.9/src/ptclib/socks.cxx 2012-11-26 11:44:52.000000000 +0100 +++++ ptlib-2.10.9.new/src/ptclib/socks.cxx 2012-12-11 15:55:41.320940496 +0100 ++@@ -34,6 +34,8 @@ ++ ++ #include ++ +++#include +++ ++ #define new PNEW ++ ++ #define SOCKS_VERSION_4 ((BYTE)4) +diff --git a/feeds/packages/libs/ptlib/patches/.svn/text-base/020-uclibc-res_nsearch.patch.svn-base b/feeds/packages/libs/ptlib/patches/.svn/text-base/020-uclibc-res_nsearch.patch.svn-base +new file mode 100644 +index 0000000..f644350 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/patches/.svn/text-base/020-uclibc-res_nsearch.patch.svn-base +@@ -0,0 +1,14 @@ ++diff -Naur ptlib-2.10.4.orig/src/ptclib/pdns.cxx ptlib-2.10.4/src/ptclib/pdns.cxx ++--- ptlib-2.10.4.orig/src/ptclib/pdns.cxx 2012-03-12 13:34:10.000000000 -0400 +++++ ptlib-2.10.4/src/ptclib/pdns.cxx 2012-03-12 13:35:05.000000000 -0400 ++@@ -37,6 +37,10 @@ ++ #include ++ #include ++ +++#if defined(__UCLIBC__) +++ #undef P_HAS_RES_NINIT +++#endif +++ ++ #define new PNEW ++ ++ #define USE_RESOLVER_CACHING 1 +diff --git a/feeds/packages/libs/ptlib/patches/010-fix-gcc_4_3-compile.patch b/feeds/packages/libs/ptlib/patches/010-fix-gcc_4_3-compile.patch +new file mode 100644 +index 0000000..c764ca1 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/patches/010-fix-gcc_4_3-compile.patch +@@ -0,0 +1,12 @@ ++diff -urN ptlib-2.10.9/src/ptclib/socks.cxx ptlib-2.10.9.new/src/ptclib/socks.cxx ++--- ptlib-2.10.9/src/ptclib/socks.cxx 2012-11-26 11:44:52.000000000 +0100 +++++ ptlib-2.10.9.new/src/ptclib/socks.cxx 2012-12-11 15:55:41.320940496 +0100 ++@@ -34,6 +34,8 @@ ++ ++ #include ++ +++#include +++ ++ #define new PNEW ++ ++ #define SOCKS_VERSION_4 ((BYTE)4) +diff --git a/feeds/packages/libs/ptlib/patches/020-uclibc-res_nsearch.patch b/feeds/packages/libs/ptlib/patches/020-uclibc-res_nsearch.patch +new file mode 100644 +index 0000000..f644350 +--- /dev/null ++++ b/feeds/packages/libs/ptlib/patches/020-uclibc-res_nsearch.patch +@@ -0,0 +1,14 @@ ++diff -Naur ptlib-2.10.4.orig/src/ptclib/pdns.cxx ptlib-2.10.4/src/ptclib/pdns.cxx ++--- ptlib-2.10.4.orig/src/ptclib/pdns.cxx 2012-03-12 13:34:10.000000000 -0400 +++++ ptlib-2.10.4/src/ptclib/pdns.cxx 2012-03-12 13:35:05.000000000 -0400 ++@@ -37,6 +37,10 @@ ++ #include ++ #include ++ +++#if defined(__UCLIBC__) +++ #undef P_HAS_RES_NINIT +++#endif +++ ++ #define new PNEW ++ ++ #define USE_RESOLVER_CACHING 1 +diff --git a/feeds/packages/libs/pwlib/.svn/entries b/feeds/packages/libs/pwlib/.svn/entries +new file mode 100644 +index 0000000..17c8584 +--- /dev/null ++++ b/feeds/packages/libs/pwlib/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/pwlib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:21.179671Z ++33047 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++cf3bd8b78553a27b7bb7e8874ea3ca85 ++2012-08-07T16:09:21.179671Z ++33047 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1950 ++ +diff --git a/feeds/packages/libs/pwlib/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/pwlib/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/pwlib/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/pwlib/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/pwlib/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..84e4f3e +--- /dev/null ++++ b/feeds/packages/libs/pwlib/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,90 @@ ++# ++# Copyright (C) 2006-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:=pwlib ++PKG_VERSION:=1.11.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://peternixon.net/pub/voxgratia ++PKG_MD5SUM:=e1102dfd2608e3a117a2e016d0db53e3 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/pwlib-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pwlib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Portable Windows library ++ URL:=http://www.voxgratia.org/ ++endef ++ ++define Package/pwlib/description ++ PWLib is a moderately large class library that was created as a method to ++ produce applications that run on both Microsoft Windows and the X Window ++ System. ++endef ++ ++TARGET_CFLAGS += $(FPIC) -fpermissive ++ ++CONFIGURE_ARGS += \ ++ --enable-minsize \ ++ --enable-openh323 \ ++ --enable-opal \ ++ --disable-internalregex \ ++ --disable-plugins \ ++ --enable-audio \ ++ --disable-alsa \ ++ --enable-asn \ ++ --disable-avc \ ++ --disable-dc \ ++ --disable-dtmf \ ++ --disable-expat \ ++ --disable-ftp \ ++ --enable-http \ ++ --disable-httpsvc \ ++ --disable-jabber \ ++ --disable-openldap \ ++ --disable-openssl \ ++ --disable-oss \ ++ --disable-pipechan \ ++ --disable-pop3smtp \ ++ --disable-remconn \ ++ --disable-resolver \ ++ --disable-qos \ ++ --disable-sasl \ ++ --disable-sdl \ ++ --disable-serial \ ++ --disable-shm-video \ ++ --disable-snmp \ ++ --disable-soap \ ++ --disable-socks \ ++ --enable-stun \ ++ --disable-telnet \ ++ --disable-tts \ ++ --disable-v4l \ ++ --disable-v4l2 \ ++ --disable-bsdvideo \ ++ --disable-video \ ++ --disable-vxml \ ++ --disable-wavfile \ ++ --disable-xmlrpc \ ++ ++CONFIGURE_VARS += \ ++ STDCXXFLAGS="$(TARGET_CFLAGS) -fno-builtin" \ ++ ++MAKE_FLAGS += optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++ $(SED) 's|//\(#include \)|\1|' $(PKG_BUILD_DIR)/include/ptlib.h ++endef ++ ++$(eval $(call BuildPackage,pwlib)) +diff --git a/feeds/packages/libs/pwlib/Makefile b/feeds/packages/libs/pwlib/Makefile +new file mode 100644 +index 0000000..84e4f3e +--- /dev/null ++++ b/feeds/packages/libs/pwlib/Makefile +@@ -0,0 +1,90 @@ ++# ++# Copyright (C) 2006-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:=pwlib ++PKG_VERSION:=1.11.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://peternixon.net/pub/voxgratia ++PKG_MD5SUM:=e1102dfd2608e3a117a2e016d0db53e3 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/pwlib-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pwlib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Portable Windows library ++ URL:=http://www.voxgratia.org/ ++endef ++ ++define Package/pwlib/description ++ PWLib is a moderately large class library that was created as a method to ++ produce applications that run on both Microsoft Windows and the X Window ++ System. ++endef ++ ++TARGET_CFLAGS += $(FPIC) -fpermissive ++ ++CONFIGURE_ARGS += \ ++ --enable-minsize \ ++ --enable-openh323 \ ++ --enable-opal \ ++ --disable-internalregex \ ++ --disable-plugins \ ++ --enable-audio \ ++ --disable-alsa \ ++ --enable-asn \ ++ --disable-avc \ ++ --disable-dc \ ++ --disable-dtmf \ ++ --disable-expat \ ++ --disable-ftp \ ++ --enable-http \ ++ --disable-httpsvc \ ++ --disable-jabber \ ++ --disable-openldap \ ++ --disable-openssl \ ++ --disable-oss \ ++ --disable-pipechan \ ++ --disable-pop3smtp \ ++ --disable-remconn \ ++ --disable-resolver \ ++ --disable-qos \ ++ --disable-sasl \ ++ --disable-sdl \ ++ --disable-serial \ ++ --disable-shm-video \ ++ --disable-snmp \ ++ --disable-soap \ ++ --disable-socks \ ++ --enable-stun \ ++ --disable-telnet \ ++ --disable-tts \ ++ --disable-v4l \ ++ --disable-v4l2 \ ++ --disable-bsdvideo \ ++ --disable-video \ ++ --disable-vxml \ ++ --disable-wavfile \ ++ --disable-xmlrpc \ ++ ++CONFIGURE_VARS += \ ++ STDCXXFLAGS="$(TARGET_CFLAGS) -fno-builtin" \ ++ ++MAKE_FLAGS += optnoshared ++ ++define Build/InstallDev ++ ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++ $(SED) 's|//\(#include \)|\1|' $(PKG_BUILD_DIR)/include/ptlib.h ++endef ++ ++$(eval $(call BuildPackage,pwlib)) +diff --git a/feeds/packages/libs/pwlib/patches/.svn/entries b/feeds/packages/libs/pwlib/patches/.svn/entries +new file mode 100644 +index 0000000..6a29fb3 +--- /dev/null ++++ b/feeds/packages/libs/pwlib/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/pwlib/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-lib_mak.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f9aeed2c1b3fdd618b1f5d68fdcf42e2 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++369 ++ +diff --git a/feeds/packages/libs/pwlib/patches/.svn/prop-base/002-lib_mak.patch.svn-base b/feeds/packages/libs/pwlib/patches/.svn/prop-base/002-lib_mak.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/pwlib/patches/.svn/prop-base/002-lib_mak.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/pwlib/patches/.svn/text-base/002-lib_mak.patch.svn-base b/feeds/packages/libs/pwlib/patches/.svn/text-base/002-lib_mak.patch.svn-base +new file mode 100644 +index 0000000..43018bd +--- /dev/null ++++ b/feeds/packages/libs/pwlib/patches/.svn/text-base/002-lib_mak.patch.svn-base +@@ -0,0 +1,11 @@ ++--- pwlib-cvs-20051227/make/lib.mak.orig 2005-09-25 12:51:23.000000000 +0200 +++++ pwlib-cvs-20051227/make/lib.mak 2005-12-30 01:18:21.000000000 +0100 ++@@ -201,7 +201,7 @@ ++ LDSOOPTS += -Wl,--kill-at ++ else ++ ifneq ($(OSTYPE),Darwin) ++- LDSOOPTS += -Wl,-soname,$(LIB_SONAME) +++ LDSOOPTS += -soname,$(LIB_SONAME) ++ endif ++ endif ++ LD = $(CPLUS) +diff --git a/feeds/packages/libs/pwlib/patches/002-lib_mak.patch b/feeds/packages/libs/pwlib/patches/002-lib_mak.patch +new file mode 100644 +index 0000000..43018bd +--- /dev/null ++++ b/feeds/packages/libs/pwlib/patches/002-lib_mak.patch +@@ -0,0 +1,11 @@ ++--- pwlib-cvs-20051227/make/lib.mak.orig 2005-09-25 12:51:23.000000000 +0200 +++++ pwlib-cvs-20051227/make/lib.mak 2005-12-30 01:18:21.000000000 +0100 ++@@ -201,7 +201,7 @@ ++ LDSOOPTS += -Wl,--kill-at ++ else ++ ifneq ($(OSTYPE),Darwin) ++- LDSOOPTS += -Wl,-soname,$(LIB_SONAME) +++ LDSOOPTS += -soname,$(LIB_SONAME) ++ endif ++ endif ++ LD = $(CPLUS) +diff --git a/feeds/packages/libs/radiusclient-ng/.svn/entries b/feeds/packages/libs/radiusclient-ng/.svn/entries +new file mode 100644 +index 0000000..e7cb3c2 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/radiusclient-ng ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++314afb1d3a6d5bd15013d551578b105f ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2568 ++ +diff --git a/feeds/packages/libs/radiusclient-ng/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/radiusclient-ng/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/radiusclient-ng/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/radiusclient-ng/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3d125b9 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# 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:=radiusclient-ng ++PKG_VERSION:=0.5.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.berlios.de/radiusclient-ng/ ++PKG_MD5SUM:=6fb7d4d0aefafaee7385831ac46a8e9c ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/radiusclient-ng/Default ++ URL:=http://developer.berlios.de/projects/radiusclient-ng/ ++endef ++ ++define Package/radiusclient-ng/Default/description ++ Purpose of this project is to build a portable, easy-to-use and ++ standard compliant library suitable for developing free and commercial ++ software that need support for RADIUS protocol (RFCs 2128 and 2139). ++endef ++ ++define Package/libradiusclient-ng ++$(call Package/radiusclient-ng/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=RADIUS client library ++endef ++ ++define Package/libradiusclient-ng/description ++$(call Package/radiusclient-ng/Default/description) ++ This package contains shared libraries, needed by other programs. ++endef ++ ++define Package/libradiusclient-ng/conffiles ++/etc/radiusclient-ng/issue ++/etc/radiusclient-ng/port-id-map ++/etc/radiusclient-ng/radiusclient.conf ++/etc/radiusclient-ng/servers ++endef ++ ++define Package/radiusclient-ng ++ $(call Package/radiusclient-ng/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libradiusclient-ng ++ TITLE:=RADIUS client ++endef ++ ++define Package/radiusclient-ng/description ++$(call Package/radiusclient-ng/Default/description) ++ This package contains a RADIUS client. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ ++define Build/Compile ++ $(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/radiusclient-ng.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.{a,so}* $(1)/usr/lib/ ++endef ++ ++define Package/libradiusclient-ng/install ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_INSTALL_DIR)/etc/radiusclient-ng $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.so.* $(1)/usr/lib/ ++endef ++ ++define Package/radiusclient-ng/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,libradiusclient-ng)) ++$(eval $(call BuildPackage,radiusclient-ng)) +diff --git a/feeds/packages/libs/radiusclient-ng/Makefile b/feeds/packages/libs/radiusclient-ng/Makefile +new file mode 100644 +index 0000000..3d125b9 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/Makefile +@@ -0,0 +1,96 @@ ++# ++# 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:=radiusclient-ng ++PKG_VERSION:=0.5.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.berlios.de/radiusclient-ng/ ++PKG_MD5SUM:=6fb7d4d0aefafaee7385831ac46a8e9c ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/radiusclient-ng/Default ++ URL:=http://developer.berlios.de/projects/radiusclient-ng/ ++endef ++ ++define Package/radiusclient-ng/Default/description ++ Purpose of this project is to build a portable, easy-to-use and ++ standard compliant library suitable for developing free and commercial ++ software that need support for RADIUS protocol (RFCs 2128 and 2139). ++endef ++ ++define Package/libradiusclient-ng ++$(call Package/radiusclient-ng/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=RADIUS client library ++endef ++ ++define Package/libradiusclient-ng/description ++$(call Package/radiusclient-ng/Default/description) ++ This package contains shared libraries, needed by other programs. ++endef ++ ++define Package/libradiusclient-ng/conffiles ++/etc/radiusclient-ng/issue ++/etc/radiusclient-ng/port-id-map ++/etc/radiusclient-ng/radiusclient.conf ++/etc/radiusclient-ng/servers ++endef ++ ++define Package/radiusclient-ng ++ $(call Package/radiusclient-ng/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libradiusclient-ng ++ TITLE:=RADIUS client ++endef ++ ++define Package/radiusclient-ng/description ++$(call Package/radiusclient-ng/Default/description) ++ This package contains a RADIUS client. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ ++define Build/Compile ++ $(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/radiusclient-ng.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.{a,so}* $(1)/usr/lib/ ++endef ++ ++define Package/libradiusclient-ng/install ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_INSTALL_DIR)/etc/radiusclient-ng $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.so.* $(1)/usr/lib/ ++endef ++ ++define Package/radiusclient-ng/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,libradiusclient-ng)) ++$(eval $(call BuildPackage,radiusclient-ng)) +diff --git a/feeds/packages/libs/radiusclient-ng/patches/.svn/entries b/feeds/packages/libs/radiusclient-ng/patches/.svn/entries +new file mode 100644 +index 0000000..6b3518e +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/radiusclient-ng/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-13T00:48:33.463908Z ++24532 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++b970bd1ccc1221eb60f15f1b1efa5ed6 ++2010-12-13T00:48:33.463908Z ++24532 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1324 ++ +diff --git a/feeds/packages/libs/radiusclient-ng/patches/.svn/prop-base/001-cross_compile.patch.svn-base b/feeds/packages/libs/radiusclient-ng/patches/.svn/prop-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/patches/.svn/prop-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/radiusclient-ng/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/libs/radiusclient-ng/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..3925563 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,48 @@ ++--- a/configure +++++ b/configure ++@@ -23332,8 +23332,7 @@ echo $ECHO_N "checking for field domainn ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++-See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++See \`config.log' for more details." >&2;} } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/configure.in +++++ b/configure.in ++@@ -104,32 +104,7 @@ AC_REPLACE_FUNCS(strdup strerror strcase ++ AC_CHECK_FUNCS(flock fcntl uname gethostname sysinfo getdomainname) ++ AC_CHECK_FUNCS(stricmp random rand snprintf vsnprintf) ++ ++-if test "$ac_cv_func_uname" = 'yes' ++-then ++- AC_MSG_CHECKING([for field domainname in struct utsname]) ++- AC_TRY_RUN([ ++- #include ++- ++- main(int argc, char **argv) ++- { ++- struct utsname uts; ++- uts.domainname[0] = '\0'; ++- } ++- ], ++- AC_MSG_RESULT(yes) ++- AC_DEFINE(HAVE_STRUCT_UTSNAME_DOMAINNAME), ++- AC_MSG_RESULT(no) ++- ) ++-fi ++- ++-AC_MSG_CHECKING([for /dev/urandom]) ++-if test -c /dev/urandom ++-then ++- AC_MSG_RESULT(yes) ++- AC_DEFINE(HAVE_DEV_URANDOM) ++-else ++- AC_MSG_RESULT(no) ++-fi +++AC_DEFINE(HAVE_DEV_URANDOM) ++ ++ dnl Determine PATH setting ++ echo $ac_n "using the following PATH setting for exec'ed programs... $ac_c" 1>&6 +diff --git a/feeds/packages/libs/radiusclient-ng/patches/001-cross_compile.patch b/feeds/packages/libs/radiusclient-ng/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..3925563 +--- /dev/null ++++ b/feeds/packages/libs/radiusclient-ng/patches/001-cross_compile.patch +@@ -0,0 +1,48 @@ ++--- a/configure +++++ b/configure ++@@ -23332,8 +23332,7 @@ echo $ECHO_N "checking for field domainn ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++-See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++See \`config.log' for more details." >&2;} } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/configure.in +++++ b/configure.in ++@@ -104,32 +104,7 @@ AC_REPLACE_FUNCS(strdup strerror strcase ++ AC_CHECK_FUNCS(flock fcntl uname gethostname sysinfo getdomainname) ++ AC_CHECK_FUNCS(stricmp random rand snprintf vsnprintf) ++ ++-if test "$ac_cv_func_uname" = 'yes' ++-then ++- AC_MSG_CHECKING([for field domainname in struct utsname]) ++- AC_TRY_RUN([ ++- #include ++- ++- main(int argc, char **argv) ++- { ++- struct utsname uts; ++- uts.domainname[0] = '\0'; ++- } ++- ], ++- AC_MSG_RESULT(yes) ++- AC_DEFINE(HAVE_STRUCT_UTSNAME_DOMAINNAME), ++- AC_MSG_RESULT(no) ++- ) ++-fi ++- ++-AC_MSG_CHECKING([for /dev/urandom]) ++-if test -c /dev/urandom ++-then ++- AC_MSG_RESULT(yes) ++- AC_DEFINE(HAVE_DEV_URANDOM) ++-else ++- AC_MSG_RESULT(no) ++-fi +++AC_DEFINE(HAVE_DEV_URANDOM) ++ ++ dnl Determine PATH setting ++ echo $ac_n "using the following PATH setting for exec'ed programs... $ac_c" 1>&6 +diff --git a/feeds/packages/libs/radlib/.svn/entries b/feeds/packages/libs/radlib/.svn/entries +new file mode 100644 +index 0000000..b4ff8c5 +--- /dev/null ++++ b/feeds/packages/libs/radlib/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/radlib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-13T20:04:08.269014Z ++33176 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f3c2c59720b3d5a179a52218dd39ef32 ++2012-08-13T20:04:08.269014Z ++33176 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1515 ++ +diff --git a/feeds/packages/libs/radlib/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/radlib/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f406b2 +--- /dev/null ++++ b/feeds/packages/libs/radlib/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=radlib ++PKG_VERSION:=2.12.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/radlib ++PKG_SHA1SUM:=1b3feace6d0361436c9e4ce9b06856195a5ac1b1 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/radlib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread +libsqlite3 ++ TITLE:=Rapid Application Development Library ++ URL:=http://www.radlib.teel.ws/ ++endef ++ ++define Package/radlib/description ++ radlib is a rapid application development library for unix multi-process applications ++endef ++ ++define Package/radlib-sqlite/description ++ $(call Package/radlib/description) ++ This package comes with sqlite support ++endef ++ ++EXTRA_LDFLAGS=-lsqlite3 ++CONFIGURE_ARGS += \ ++ --prefix="$(TOOLCHAIN_DIR)/usr" \ ++ --enable-sqlite ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/h/rad*.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/src/.libs/librad.so* $(1)/usr/lib/ ++endef ++ ++define Package/radlib/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/librad.so* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/msgRouter/.libs/radmrouted $(1)/usr/bin/ ++endef ++ ++define Package/radlib-sqlite/install ++ $(call Package/radlib/install,$(1)) ++endef ++ ++$(eval $(call BuildPackage,radlib)) +diff --git a/feeds/packages/libs/radlib/Makefile b/feeds/packages/libs/radlib/Makefile +new file mode 100644 +index 0000000..0f406b2 +--- /dev/null ++++ b/feeds/packages/libs/radlib/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=radlib ++PKG_VERSION:=2.12.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/radlib ++PKG_SHA1SUM:=1b3feace6d0361436c9e4ce9b06856195a5ac1b1 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/radlib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpthread +libsqlite3 ++ TITLE:=Rapid Application Development Library ++ URL:=http://www.radlib.teel.ws/ ++endef ++ ++define Package/radlib/description ++ radlib is a rapid application development library for unix multi-process applications ++endef ++ ++define Package/radlib-sqlite/description ++ $(call Package/radlib/description) ++ This package comes with sqlite support ++endef ++ ++EXTRA_LDFLAGS=-lsqlite3 ++CONFIGURE_ARGS += \ ++ --prefix="$(TOOLCHAIN_DIR)/usr" \ ++ --enable-sqlite ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/h/rad*.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/src/.libs/librad.so* $(1)/usr/lib/ ++endef ++ ++define Package/radlib/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/librad.so* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/msgRouter/.libs/radmrouted $(1)/usr/bin/ ++endef ++ ++define Package/radlib-sqlite/install ++ $(call Package/radlib/install,$(1)) ++endef ++ ++$(eval $(call BuildPackage,radlib)) +diff --git a/feeds/packages/libs/radlib/patches/.svn/entries b/feeds/packages/libs/radlib/patches/.svn/entries +new file mode 100644 +index 0000000..fc386e4 +--- /dev/null ++++ b/feeds/packages/libs/radlib/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/radlib/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:20.379760Z ++33082 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross_compile_link_bug.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d21e0ed3874c44b40e0a08531241c487 ++2012-08-10T15:49:20.379760Z ++33082 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2080 ++ +diff --git a/feeds/packages/libs/radlib/patches/.svn/text-base/001-cross_compile_link_bug.patch.svn-base b/feeds/packages/libs/radlib/patches/.svn/text-base/001-cross_compile_link_bug.patch.svn-base +new file mode 100644 +index 0000000..2c943bd +--- /dev/null ++++ b/feeds/packages/libs/radlib/patches/.svn/text-base/001-cross_compile_link_bug.patch.svn-base +@@ -0,0 +1,71 @@ ++--- a/debug/Makefile.am +++++ b/debug/Makefile.am ++@@ -27,8 +27,8 @@ raddebug_LDADD += -lsqlite3 ++ endif ++ ++ # define library directories ++-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib ++-INCLUDES += -I$(prefix)/include -I/usr/include +++raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib +++INCLUDES += -I$(prefix)/include ++ ++ if MYSQL ++ raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql ++@@ -39,6 +39,6 @@ INCLUDES += -I$(prefix)/pgsql/in ++ endif ++ endif ++ ++-if CROSSCOMPILE ++-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++-endif +++#if CROSSCOMPILE +++#raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o +++#endif ++--- a/msgRouter/Makefile.am +++++ b/msgRouter/Makefile.am ++@@ -27,8 +27,8 @@ radmrouted_LDADD += -lsqlite3 ++ endif ++ ++ # define library directories ++-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib ++-INCLUDES += -I$(prefix)/include -I/usr/include +++radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib +++INCLUDES += -I$(prefix)/include ++ ++ if MYSQL ++ radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql ++@@ -39,6 +39,6 @@ INCLUDES += -I$(prefix)/pgsql/ ++ endif ++ endif ++ ++-if CROSSCOMPILE ++-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++-endif +++#if CROSSCOMPILE +++#radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o +++#endif ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -34,9 +34,6 @@ PGSQL_HDRS = \ ++ $(top_srcdir)/database/postgresql/_pg-types.h ++ endif ++ if SQLITE ++-SQ_INCLUDES = \ ++- -I$(prefix)/include \ ++- -I/usr/include ++ SQ_SOURCES = \ ++ $(top_srcdir)/src/radsqlite.c ++ SQLITE_HDRS = \ ++@@ -46,11 +43,9 @@ endif ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/h \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ $(MY_INCLUDES) \ ++- $(PG_INCLUDES) \ ++- $(SQ_INCLUDES) +++ $(PG_INCLUDES) ++ ++ ++ +diff --git a/feeds/packages/libs/radlib/patches/001-cross_compile_link_bug.patch b/feeds/packages/libs/radlib/patches/001-cross_compile_link_bug.patch +new file mode 100644 +index 0000000..2c943bd +--- /dev/null ++++ b/feeds/packages/libs/radlib/patches/001-cross_compile_link_bug.patch +@@ -0,0 +1,71 @@ ++--- a/debug/Makefile.am +++++ b/debug/Makefile.am ++@@ -27,8 +27,8 @@ raddebug_LDADD += -lsqlite3 ++ endif ++ ++ # define library directories ++-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib ++-INCLUDES += -I$(prefix)/include -I/usr/include +++raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib +++INCLUDES += -I$(prefix)/include ++ ++ if MYSQL ++ raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql ++@@ -39,6 +39,6 @@ INCLUDES += -I$(prefix)/pgsql/in ++ endif ++ endif ++ ++-if CROSSCOMPILE ++-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++-endif +++#if CROSSCOMPILE +++#raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o +++#endif ++--- a/msgRouter/Makefile.am +++++ b/msgRouter/Makefile.am ++@@ -27,8 +27,8 @@ radmrouted_LDADD += -lsqlite3 ++ endif ++ ++ # define library directories ++-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib ++-INCLUDES += -I$(prefix)/include -I/usr/include +++radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib +++INCLUDES += -I$(prefix)/include ++ ++ if MYSQL ++ radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql ++@@ -39,6 +39,6 @@ INCLUDES += -I$(prefix)/pgsql/ ++ endif ++ endif ++ ++-if CROSSCOMPILE ++-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++-endif +++#if CROSSCOMPILE +++#radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o +++#endif ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -34,9 +34,6 @@ PGSQL_HDRS = \ ++ $(top_srcdir)/database/postgresql/_pg-types.h ++ endif ++ if SQLITE ++-SQ_INCLUDES = \ ++- -I$(prefix)/include \ ++- -I/usr/include ++ SQ_SOURCES = \ ++ $(top_srcdir)/src/radsqlite.c ++ SQLITE_HDRS = \ ++@@ -46,11 +43,9 @@ endif ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/h \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ $(MY_INCLUDES) \ ++- $(PG_INCLUDES) \ ++- $(SQ_INCLUDES) +++ $(PG_INCLUDES) ++ ++ ++ +diff --git a/feeds/packages/libs/rblibtorrent/.svn/entries b/feeds/packages/libs/rblibtorrent/.svn/entries +new file mode 100644 +index 0000000..98924f3 +--- /dev/null ++++ b/feeds/packages/libs/rblibtorrent/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/rblibtorrent ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-30T03:34:30.600602Z ++27028 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8657c95a2caef086e1b272a983a31c1f ++2011-05-30T03:34:30.600602Z ++27028 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2485 ++ +diff --git a/feeds/packages/libs/rblibtorrent/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/rblibtorrent/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..760f185 +--- /dev/null ++++ b/feeds/packages/libs/rblibtorrent/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,77 @@ ++# ++# Copyright (C) 2007 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 9173 2007-10-07 03:20:26Z blogic $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=rblibtorrent ++PKG_VERSION:=0.14.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=libtorrent-rasterbar-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libtorrent ++PKG_MD5SUM:=6959f719245d82758235fd73d93373b2 ++PKG_BUILD_DIR:=$(BUILD_DIR)/libtorrent-rasterbar-$(PKG_VERSION) ++PKG_BUILD_DEPENDS:=libtool ++BOOSTPOSTFIX=mt ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rblibtorrent ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Rasterbar BitTorrent library ++ URL:=http://www.rasterbar.com/products/libtorrent/ ++ DEPENDS:=+boost +boost-python +boost-filesystem +boost-regex +boost-thread +boost-program_options +boost-system +libopenssl @BROKEN ++endef ++ ++define Package/rblibtorrent/description ++Rasterbar libtorrent is a C++ library that aims to be a good alternative to ++all the other bittorrent implementations around. It is a library and not a ++full featured client, although it comes with a working example client. ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-debug \ ++ --enable-python-binding \ ++ --with-ssl=$(STAGING_DIR)/usr \ ++ --with-boost=$(STAGING_DIR)/usr/include \ ++ --with-boost-libdir=$(STAGING_DIR)/usr/lib \ ++ --with-zlib=detect \ ++ --with-boost-system=boost_system-$(BOOSTPOSTFIX) \ ++ --with-boost-filesystem=boost_filesystem-$(BOOSTPOSTFIX) \ ++ --with-boost-thread=boost_thread-$(BOOSTPOSTFIX) \ ++ --with-boost-regex=boost_regex-$(BOOSTPOSTFIX) \ ++ --with-boost-python=boost_python-$(BOOSTPOSTFIX) \ ++ --with-boost-program_options=boost_program_options-$(BOOSTPOSTFIX) ++ ++CONFIGURE_VARS+=CC="$(TARGET_CXX)" ++ ++EXTRA_LDFLAGS+=-lz -lpthread ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ $(call Build/Install/Default) ++endef ++ ++define Build/InstallDev ++ mkdir -p $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libtorrent $(1)/usr/include/ ++ mkdir -p $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++ mkdir -p $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/rblibtorrent/install ++ $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/python2.6/site-packages/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.6/site-packages/*.so* $(1)/usr/lib/python2.6/site-packages/ ++endef ++ ++$(eval $(call BuildPackage,rblibtorrent)) +diff --git a/feeds/packages/libs/rblibtorrent/Makefile b/feeds/packages/libs/rblibtorrent/Makefile +new file mode 100644 +index 0000000..760f185 +--- /dev/null ++++ b/feeds/packages/libs/rblibtorrent/Makefile +@@ -0,0 +1,77 @@ ++# ++# Copyright (C) 2007 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 9173 2007-10-07 03:20:26Z blogic $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=rblibtorrent ++PKG_VERSION:=0.14.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=libtorrent-rasterbar-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/libtorrent ++PKG_MD5SUM:=6959f719245d82758235fd73d93373b2 ++PKG_BUILD_DIR:=$(BUILD_DIR)/libtorrent-rasterbar-$(PKG_VERSION) ++PKG_BUILD_DEPENDS:=libtool ++BOOSTPOSTFIX=mt ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rblibtorrent ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Rasterbar BitTorrent library ++ URL:=http://www.rasterbar.com/products/libtorrent/ ++ DEPENDS:=+boost +boost-python +boost-filesystem +boost-regex +boost-thread +boost-program_options +boost-system +libopenssl @BROKEN ++endef ++ ++define Package/rblibtorrent/description ++Rasterbar libtorrent is a C++ library that aims to be a good alternative to ++all the other bittorrent implementations around. It is a library and not a ++full featured client, although it comes with a working example client. ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-debug \ ++ --enable-python-binding \ ++ --with-ssl=$(STAGING_DIR)/usr \ ++ --with-boost=$(STAGING_DIR)/usr/include \ ++ --with-boost-libdir=$(STAGING_DIR)/usr/lib \ ++ --with-zlib=detect \ ++ --with-boost-system=boost_system-$(BOOSTPOSTFIX) \ ++ --with-boost-filesystem=boost_filesystem-$(BOOSTPOSTFIX) \ ++ --with-boost-thread=boost_thread-$(BOOSTPOSTFIX) \ ++ --with-boost-regex=boost_regex-$(BOOSTPOSTFIX) \ ++ --with-boost-python=boost_python-$(BOOSTPOSTFIX) \ ++ --with-boost-program_options=boost_program_options-$(BOOSTPOSTFIX) ++ ++CONFIGURE_VARS+=CC="$(TARGET_CXX)" ++ ++EXTRA_LDFLAGS+=-lz -lpthread ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ $(call Build/Install/Default) ++endef ++ ++define Build/InstallDev ++ mkdir -p $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libtorrent $(1)/usr/include/ ++ mkdir -p $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++ mkdir -p $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/rblibtorrent/install ++ $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/python2.6/site-packages/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.6/site-packages/*.so* $(1)/usr/lib/python2.6/site-packages/ ++endef ++ ++$(eval $(call BuildPackage,rblibtorrent)) +diff --git a/feeds/packages/libs/rblibtorrent/patches/.svn/entries b/feeds/packages/libs/rblibtorrent/patches/.svn/entries +new file mode 100644 +index 0000000..15a4bb0 +--- /dev/null ++++ b/feeds/packages/libs/rblibtorrent/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/rblibtorrent/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-13T02:55:32.232420Z ++20173 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++enable-shared-linking.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++9771b8266970b8dc5adf00fbac22ebc5 ++2010-03-13T02:55:32.232420Z ++20173 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++528 ++ +diff --git a/feeds/packages/libs/rblibtorrent/patches/.svn/text-base/enable-shared-linking.patch.svn-base b/feeds/packages/libs/rblibtorrent/patches/.svn/text-base/enable-shared-linking.patch.svn-base +new file mode 100644 +index 0000000..dec80cc +--- /dev/null ++++ b/feeds/packages/libs/rblibtorrent/patches/.svn/text-base/enable-shared-linking.patch.svn-base +@@ -0,0 +1,11 @@ ++--- libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2009-11-18 09:25:39.000000000 +0100 +++++ libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2010-02-26 13:27:58.000000000 +0100 ++@@ -408,7 +408,7 @@ ++ ++ ++ @ENABLE_PYTHON_BINDING_TRUE@all-local: ++-@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py build +++@ENABLE_PYTHON_BINDING_TRUE@ CXX="$(CXX) -pthread -shared" $(PYTHON) setup.py build ++ ++ @ENABLE_PYTHON_BINDING_TRUE@install-exec-local: ++ @ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py install @PYTHON_INSTALL_PARAMS@ +diff --git a/feeds/packages/libs/rblibtorrent/patches/enable-shared-linking.patch b/feeds/packages/libs/rblibtorrent/patches/enable-shared-linking.patch +new file mode 100644 +index 0000000..dec80cc +--- /dev/null ++++ b/feeds/packages/libs/rblibtorrent/patches/enable-shared-linking.patch +@@ -0,0 +1,11 @@ ++--- libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2009-11-18 09:25:39.000000000 +0100 +++++ libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2010-02-26 13:27:58.000000000 +0100 ++@@ -408,7 +408,7 @@ ++ ++ ++ @ENABLE_PYTHON_BINDING_TRUE@all-local: ++-@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py build +++@ENABLE_PYTHON_BINDING_TRUE@ CXX="$(CXX) -pthread -shared" $(PYTHON) setup.py build ++ ++ @ENABLE_PYTHON_BINDING_TRUE@install-exec-local: ++ @ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py install @PYTHON_INSTALL_PARAMS@ +diff --git a/feeds/packages/libs/re/.svn/entries b/feeds/packages/libs/re/.svn/entries +new file mode 100644 +index 0000000..9954729 +--- /dev/null ++++ b/feeds/packages/libs/re/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/re ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-06T11:07:38.980263Z ++33008 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++ae00fffb27e626163df90e93309300fb ++2012-08-06T11:07:38.980263Z ++33008 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1630 ++ +diff --git a/feeds/packages/libs/re/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/re/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fbafd47 +--- /dev/null ++++ b/feeds/packages/libs/re/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=re ++PKG_VERSION:=0.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.creytiv.com/pub ++PKG_MD5SUM:=cff9e0d2bfec09c84e316faaf202809b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libre ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libopenssl +libpthread ++ TITLE:=Generic library for real-time communications with async IO support ++ URL:=http://www.creytiv.com/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++TARGET_CFLAGS += -D_GNU_SOURCE ++endif ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ HAVE_LIBRESOLV= \ ++ CC="$(TARGET_CC)" \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ ++ EXTRA_LFLAGS="-lm" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ ++ SYSROOT_ALT="$(STAGING_DIR)/usr" \ ++ RELEASE=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ OS=linux \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/share/re ++ $(CP) $(PKG_BUILD_DIR)/mk/re.mk $(1)/usr/share/re/ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so} $(1)/usr/lib/ ++endef ++ ++define Package/libre/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libre)) +diff --git a/feeds/packages/libs/re/Makefile b/feeds/packages/libs/re/Makefile +new file mode 100644 +index 0000000..fbafd47 +--- /dev/null ++++ b/feeds/packages/libs/re/Makefile +@@ -0,0 +1,64 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=re ++PKG_VERSION:=0.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.creytiv.com/pub ++PKG_MD5SUM:=cff9e0d2bfec09c84e316faaf202809b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libre ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libopenssl +libpthread ++ TITLE:=Generic library for real-time communications with async IO support ++ URL:=http://www.creytiv.com/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++TARGET_CFLAGS += -D_GNU_SOURCE ++endif ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ HAVE_LIBRESOLV= \ ++ CC="$(TARGET_CC)" \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ ++ EXTRA_LFLAGS="-lm" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ ++ SYSROOT_ALT="$(STAGING_DIR)/usr" \ ++ RELEASE=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ OS=linux \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/share/re ++ $(CP) $(PKG_BUILD_DIR)/mk/re.mk $(1)/usr/share/re/ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so} $(1)/usr/lib/ ++endef ++ ++define Package/libre/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libre)) +diff --git a/feeds/packages/libs/rem/.svn/entries b/feeds/packages/libs/rem/.svn/entries +new file mode 100644 +index 0000000..2435ffb +--- /dev/null ++++ b/feeds/packages/libs/rem/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/rem ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-18T23:50:30.447342Z ++32442 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0a4a93c82484d142f72cfe8506629390 ++2012-06-18T23:50:30.447342Z ++32442 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1651 ++ +diff --git a/feeds/packages/libs/rem/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/rem/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0e86b09 +--- /dev/null ++++ b/feeds/packages/libs/rem/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=rem ++PKG_VERSION:=0.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.creytiv.com/pub ++PKG_MD5SUM:=bfac8837974e911bd4d4017a8f1ce39b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/librem ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libre +libpthread ++ TITLE:=Audio and video processing media library ++ URL:=http://www.creytiv.com/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ ++ LIBRE_INC=$(STAGING_DIR)/usr/include/re \ ++ LIBRE_SO=$(STAGING_DIR)/usr/lib \ ++ CC="$(TARGET_CC)" \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ ++ EXTRA_LFLAGS="-lm" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ ++ SYSROOT_ALT="$(STAGING_DIR)/usr" \ ++ RELEASE=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ OS=linux \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/rem $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.{a,so} $(1)/usr/lib/ ++endef ++ ++define Package/librem/install ++ rm -f $(BUILD_DIR)/$(PKG_NAME) ++ ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,librem)) +diff --git a/feeds/packages/libs/rem/Makefile b/feeds/packages/libs/rem/Makefile +new file mode 100644 +index 0000000..0e86b09 +--- /dev/null ++++ b/feeds/packages/libs/rem/Makefile +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=rem ++PKG_VERSION:=0.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.creytiv.com/pub ++PKG_MD5SUM:=bfac8837974e911bd4d4017a8f1ce39b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/librem ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libre +libpthread ++ TITLE:=Audio and video processing media library ++ URL:=http://www.creytiv.com/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ ++ LIBRE_INC=$(STAGING_DIR)/usr/include/re \ ++ LIBRE_SO=$(STAGING_DIR)/usr/lib \ ++ CC="$(TARGET_CC)" \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ ++ EXTRA_LFLAGS="-lm" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ ++ SYSROOT_ALT="$(STAGING_DIR)/usr" \ ++ RELEASE=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ OS=linux \ ++ all install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/rem $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.{a,so} $(1)/usr/lib/ ++endef ++ ++define Package/librem/install ++ rm -f $(BUILD_DIR)/$(PKG_NAME) ++ ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.so $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,librem)) +diff --git a/feeds/packages/libs/rrdtool-1.0.x/.svn/entries b/feeds/packages/libs/rrdtool-1.0.x/.svn/entries +new file mode 100644 +index 0000000..f5d0469 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/rrdtool-1.0.x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++fed38889ac3bf210d61190e279199262 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3580 ++ +diff --git a/feeds/packages/libs/rrdtool-1.0.x/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/rrdtool-1.0.x/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/rrdtool-1.0.x/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/rrdtool-1.0.x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2ef831f +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,131 @@ ++# ++# 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:=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_FIXUP:=autoreconf ++ ++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/feeds/packages/libs/rrdtool-1.0.x/Makefile b/feeds/packages/libs/rrdtool-1.0.x/Makefile +new file mode 100644 +index 0000000..2ef831f +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/Makefile +@@ -0,0 +1,131 @@ ++# ++# 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:=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_FIXUP:=autoreconf ++ ++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/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/entries b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/entries +new file mode 100644 +index 0000000..d72c360 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/rrdtool-1.0.x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-23T13:55:11.271304Z ++29874 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_ordering_cd_joke.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++da517f078fdb1cf40f7dd6a9d61af4d0 ++2009-03-09T16:31:42.286405Z ++14820 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++656 ++ ++002-no_timezone.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++56c60b8643cc8609670ee9bb637debd2 ++2009-05-04T15:21:38.500706Z ++15590 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++653 ++ ++020-x86-float-cast.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++08678d33c126239ffe19dafa68684465 ++2012-01-23T13:55:11.271304Z ++29874 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++418 ++ +diff --git a/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/001-no_ordering_cd_joke.patch.svn-base b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/001-no_ordering_cd_joke.patch.svn-base +new file mode 100644 +index 0000000..442fe49 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/001-no_ordering_cd_joke.patch.svn-base +@@ -0,0 +1,21 @@ ++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/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/002-no_timezone.patch.svn-base b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/002-no_timezone.patch.svn-base +new file mode 100644 +index 0000000..07564b4 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/002-no_timezone.patch.svn-base +@@ -0,0 +1,24 @@ ++--- 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(¤ttime,&tz); +++ gettimeofday(¤ttime,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/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/020-x86-float-cast.patch.svn-base b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/020-x86-float-cast.patch.svn-base +new file mode 100644 +index 0000000..5b8a662 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/.svn/text-base/020-x86-float-cast.patch.svn-base +@@ -0,0 +1,13 @@ ++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/feeds/packages/libs/rrdtool-1.0.x/patches/001-no_ordering_cd_joke.patch b/feeds/packages/libs/rrdtool-1.0.x/patches/001-no_ordering_cd_joke.patch +new file mode 100644 +index 0000000..442fe49 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/001-no_ordering_cd_joke.patch +@@ -0,0 +1,21 @@ ++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/feeds/packages/libs/rrdtool-1.0.x/patches/002-no_timezone.patch b/feeds/packages/libs/rrdtool-1.0.x/patches/002-no_timezone.patch +new file mode 100644 +index 0000000..07564b4 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/002-no_timezone.patch +@@ -0,0 +1,24 @@ ++--- 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(¤ttime,&tz); +++ gettimeofday(¤ttime,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/feeds/packages/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch b/feeds/packages/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch +new file mode 100644 +index 0000000..5b8a662 +--- /dev/null ++++ b/feeds/packages/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch +@@ -0,0 +1,13 @@ ++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/feeds/packages/libs/sctp/.svn/entries b/feeds/packages/libs/sctp/.svn/entries +new file mode 100644 +index 0000000..9af73d0 +--- /dev/null ++++ b/feeds/packages/libs/sctp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/sctp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++653dfcd213746c94ab92d5c8d53ae834 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1349 ++ +diff --git a/feeds/packages/libs/sctp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/sctp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..dd9e3a7 +--- /dev/null ++++ b/feeds/packages/libs/sctp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=lksctp-tools ++PKG_VERSION:=1.0.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/lksctp/ ++PKG_MD5SUM:=e9cf6c57402c9d4f1173a9529466e16d ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++##### ++## lksctp library: provides sctp_* functions in user space ++##### ++ ++define Package/sctp ++ SECTION:=libs ++ CATEGORY:=Network ++ TITLE:=SCTP user-land library ++ URL:=http://lksctp.sourceforge.net ++ DEPENDS:=+kmod-sctp ++endef ++ ++define Package/sctp/description ++ SCTP user-land library for sctp_* functions (when socket API is too limited). ++endef ++ ++TARGET_LDFLAGS := -L$(STAGING_DIR)/usr/lib $(TARGET_LDFLAGS) ++ ++define Package/sctp/install ++ # Install the library in the router ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \ ++ $(1)/usr/lib/ ++ # And also in staging for dependent packages ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/include/netinet ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/netinet/* \ ++ $(STAGING_DIR)/usr/include/netinet/ ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \ ++ $(STAGING_DIR)/usr/lib/ ++ ++endef ++ ++$(eval $(call BuildPackage,sctp)) ++ +diff --git a/feeds/packages/libs/sctp/Makefile b/feeds/packages/libs/sctp/Makefile +new file mode 100644 +index 0000000..dd9e3a7 +--- /dev/null ++++ b/feeds/packages/libs/sctp/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=lksctp-tools ++PKG_VERSION:=1.0.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/lksctp/ ++PKG_MD5SUM:=e9cf6c57402c9d4f1173a9529466e16d ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++##### ++## lksctp library: provides sctp_* functions in user space ++##### ++ ++define Package/sctp ++ SECTION:=libs ++ CATEGORY:=Network ++ TITLE:=SCTP user-land library ++ URL:=http://lksctp.sourceforge.net ++ DEPENDS:=+kmod-sctp ++endef ++ ++define Package/sctp/description ++ SCTP user-land library for sctp_* functions (when socket API is too limited). ++endef ++ ++TARGET_LDFLAGS := -L$(STAGING_DIR)/usr/lib $(TARGET_LDFLAGS) ++ ++define Package/sctp/install ++ # Install the library in the router ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \ ++ $(1)/usr/lib/ ++ # And also in staging for dependent packages ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/include/netinet ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include/netinet/* \ ++ $(STAGING_DIR)/usr/include/netinet/ ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \ ++ $(STAGING_DIR)/usr/lib/ ++ ++endef ++ ++$(eval $(call BuildPackage,sctp)) ++ +diff --git a/feeds/packages/libs/serdisplib/.svn/entries b/feeds/packages/libs/serdisplib/.svn/entries +new file mode 100644 +index 0000000..d7cbf57 +--- /dev/null ++++ b/feeds/packages/libs/serdisplib/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/serdisplib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8c3f3866583740cbb226fa8473834444 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1311 ++ +diff --git a/feeds/packages/libs/serdisplib/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/serdisplib/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/serdisplib/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/serdisplib/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/serdisplib/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..26102a6 +--- /dev/null ++++ b/feeds/packages/libs/serdisplib/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=serdisplib ++PKG_VERSION:=1.97.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/serdisplib ++PKG_MD5SUM:=130552ec60d01e974712a60274f34de7 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/serdisplib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=A display control library ++ URL:=http://serdisplib.sourceforge.net/ ++ DEPENDS:=+libusb-compat ++endef ++ ++define Package/serdisplib/description ++ serdisplib is a library to drive serial and parallel displays ++ with built-in controllers. ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --enable-static \ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-implicit -I../include -I.." \ ++ all ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/include/serdisplib $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/serdisplib/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,serdisplib)) +diff --git a/feeds/packages/libs/serdisplib/Makefile b/feeds/packages/libs/serdisplib/Makefile +new file mode 100644 +index 0000000..26102a6 +--- /dev/null ++++ b/feeds/packages/libs/serdisplib/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=serdisplib ++PKG_VERSION:=1.97.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/serdisplib ++PKG_MD5SUM:=130552ec60d01e974712a60274f34de7 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/serdisplib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=A display control library ++ URL:=http://serdisplib.sourceforge.net/ ++ DEPENDS:=+libusb-compat ++endef ++ ++define Package/serdisplib/description ++ serdisplib is a library to drive serial and parallel displays ++ with built-in controllers. ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --enable-static \ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Wno-implicit -I../include -I.." \ ++ all ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/include/serdisplib $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/serdisplib/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,serdisplib)) +diff --git a/feeds/packages/libs/shflags/.svn/entries b/feeds/packages/libs/shflags/.svn/entries +new file mode 100644 +index 0000000..a5e8b33 +--- /dev/null ++++ b/feeds/packages/libs/shflags/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/shflags ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-10T23:36:12.436605Z ++32177 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8c80066334796c43d1b676da117d964e ++2012-06-10T23:36:12.436605Z ++32177 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1063 ++ +diff --git a/feeds/packages/libs/shflags/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/shflags/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5f1c754 +--- /dev/null ++++ b/feeds/packages/libs/shflags/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 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:=shflags ++PKG_VERSION:=2012-06-11 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/shflags-clone/ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=4411ea9115802b86ffee68a2cbbbbf143dfeebbd ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shflags ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=shflags ++ DEPENDS:=+getopt ++ URL:=http://code.google.com/p/shflags/ ++endef ++ ++define Package/shflags/description ++ command-line flags module for Unix shell scripts ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Build/Install ++endef ++ ++define Package/shflags/install ++ $(INSTALL_DIR) $(1)/usr/share/shflags ++ $(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags $(1)/usr/share/shflags/shflags.sh ++endef ++ ++$(eval $(call BuildPackage,shflags)) +diff --git a/feeds/packages/libs/shflags/Makefile b/feeds/packages/libs/shflags/Makefile +new file mode 100644 +index 0000000..5f1c754 +--- /dev/null ++++ b/feeds/packages/libs/shflags/Makefile +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 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:=shflags ++PKG_VERSION:=2012-06-11 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/shflags-clone/ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=4411ea9115802b86ffee68a2cbbbbf143dfeebbd ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shflags ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=shflags ++ DEPENDS:=+getopt ++ URL:=http://code.google.com/p/shflags/ ++endef ++ ++define Package/shflags/description ++ command-line flags module for Unix shell scripts ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Build/Install ++endef ++ ++define Package/shflags/install ++ $(INSTALL_DIR) $(1)/usr/share/shflags ++ $(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags $(1)/usr/share/shflags/shflags.sh ++endef ++ ++$(eval $(call BuildPackage,shflags)) +diff --git a/feeds/packages/libs/shflags/patches/.svn/entries b/feeds/packages/libs/shflags/patches/.svn/entries +new file mode 100644 +index 0000000..e658773 +--- /dev/null ++++ b/feeds/packages/libs/shflags/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/shflags/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-10T23:36:12.436605Z ++32177 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-strip.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++18797599935455d58a8851761153587f ++2012-06-10T23:36:12.436605Z ++32177 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24014 ++ +diff --git a/feeds/packages/libs/shflags/patches/.svn/text-base/000-strip.patch.svn-base b/feeds/packages/libs/shflags/patches/.svn/text-base/000-strip.patch.svn-base +new file mode 100644 +index 0000000..bc05948 +--- /dev/null ++++ b/feeds/packages/libs/shflags/patches/.svn/text-base/000-strip.patch.svn-base +@@ -0,0 +1,763 @@ ++--- a/source/1.0/src/shflags +++++ b/source/1.0/src/shflags ++@@ -1,91 +1,10 @@ ++-# $Id$ ++-# vim:et:ft=sh:sts=2:sw=2 ++-# ++-# Copyright 2008 Kate Ward. All Rights Reserved. ++-# Released under the LGPL (GNU Lesser General Public License) ++-# ++-# shFlags -- Advanced command-line flag library for Unix shell scripts. ++-# http://code.google.com/p/shflags/ ++-# ++-# Author: kate.ward@forestent.com (Kate Ward) ++-# ++-# This module implements something like the google-gflags library available ++-# from http://code.google.com/p/google-gflags/. ++-# ++-# FLAG TYPES: This is a list of the DEFINE_*'s that you can do. All flags take ++-# a name, default value, help-string, and optional 'short' name (one-letter ++-# name). Some flags have other arguments, which are described with the flag. ++-# ++-# DEFINE_string: takes any input, and intreprets it as a string. ++-# ++-# DEFINE_boolean: typically does not take any argument: say --myflag to set ++-# FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false. ++-# Alternately, you can say ++-# --myflag=true or --myflag=t or --myflag=0 or ++-# --myflag=false or --myflag=f or --myflag=1 ++-# Passing an option has the same affect as passing the option once. ++-# ++-# DEFINE_float: takes an input and intreprets it as a floating point number. As ++-# shell does not support floats per-se, the input is merely validated as ++-# being a valid floating point value. ++-# ++-# DEFINE_integer: takes an input and intreprets it as an integer. ++-# ++-# SPECIAL FLAGS: There are a few flags that have special meaning: ++-# --help (or -?) prints a list of all the flags in a human-readable fashion ++-# --flagfile=foo read flags from foo. (not implemented yet) ++-# -- as in getopt(), terminates flag-processing ++-# ++-# EXAMPLE USAGE: ++-# ++-# -- begin hello.sh -- ++-# #! /bin/sh ++-# . ./shflags ++-# DEFINE_string name 'world' "somebody's name" n ++-# FLAGS "$@" || exit $? ++-# eval set -- "${FLAGS_ARGV}" ++-# echo "Hello, ${FLAGS_name}." ++-# -- end hello.sh -- ++-# ++-# $ ./hello.sh -n Kate ++-# Hello, Kate. ++-# ++-# NOTE: Not all systems include a getopt version that supports long flags. On ++-# these systems, only short flags are recognized. ++- ++-#============================================================================== ++-# shFlags ++-# ++-# Shared attributes: ++-# flags_error: last error message ++-# flags_return: last return value ++-# ++-# __flags_longNames: list of long names for all flags ++-# __flags_shortNames: list of short names for all flags ++-# __flags_boolNames: list of boolean flag names ++-# ++-# __flags_opts: options parsed by getopt ++-# ++-# Per-flag attributes: ++-# FLAGS_: contains value of flag named 'flag_name' ++-# __flags__default: the default flag value ++-# __flags__help: the flag help string ++-# __flags__short: the flag short name ++-# __flags__type: the flag type ++-# ++-# Notes: ++-# - lists of strings are space separated, and a null value is the '~' char. ++- ++-# return if FLAGS already loaded ++ [ -n "${FLAGS_VERSION:-}" ] && return 0 ++ FLAGS_VERSION='1.0.3' ++ ++-# return values ++ FLAGS_TRUE=0 ++ FLAGS_FALSE=1 ++ FLAGS_ERROR=2 ++ ++-# reserved flag names ++ FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION' ++ ++ _flags_debug() { echo "flags:DEBUG $@" >&2; } ++@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2 ++ _flags_error() { echo "flags:ERROR $@" >&2; } ++ _flags_fatal() { echo "flags:FATAL $@" >&2; } ++ ++-# specific shell checks ++ if [ -n "${ZSH_VERSION:-}" ]; then ++ setopt |grep "^shwordsplit$" >/dev/null ++ if [ $? -ne ${FLAGS_TRUE} ]; then ++@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then ++ fi ++ fi ++ ++-# ++-# constants ++-# ++ ++-# getopt version ++ __FLAGS_GETOPT_VERS_STD=0 ++ __FLAGS_GETOPT_VERS_ENH=1 ++ __FLAGS_GETOPT_VERS_BSD=2 ++ ++ getopt >/dev/null 2>&1 ++ case $? in ++- 0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;; # bsd getopt +++ 0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;; ++ 2) ++- # TODO(kward): look into '-T' option to test the internal getopt() version ++ if [ "`getopt --version`" = '-- ' ]; then ++ __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ++ else ++@@ -133,82 +46,49 @@ case $? in ++ ;; ++ esac ++ ++-# getopt optstring lengths ++ __FLAGS_OPTSTR_SHORT=0 ++ __FLAGS_OPTSTR_LONG=1 ++ ++ __FLAGS_NULL='~' ++ ++-# flag info strings ++ __FLAGS_INFO_DEFAULT='default' ++ __FLAGS_INFO_HELP='help' ++ __FLAGS_INFO_SHORT='short' ++ __FLAGS_INFO_TYPE='type' ++ ++-# flag lengths ++ __FLAGS_LEN_SHORT=0 ++ __FLAGS_LEN_LONG=1 ++ ++-# flag types ++ __FLAGS_TYPE_NONE=0 ++ __FLAGS_TYPE_BOOLEAN=1 ++ __FLAGS_TYPE_FLOAT=2 ++ __FLAGS_TYPE_INTEGER=3 ++ __FLAGS_TYPE_STRING=4 ++ ++-# set the constants readonly ++ __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'` ++ for __flags_const in ${__flags_constants}; do ++- # skip certain flags ++ case ${__flags_const} in ++ FLAGS_HELP) continue ;; ++ FLAGS_PARENT) continue ;; ++ esac ++- # set flag readonly ++ if [ -z "${ZSH_VERSION:-}" ]; then ++ readonly ${__flags_const} ++- else # handle zsh +++ else ++ case ${ZSH_VERSION} in ++ [123].*) readonly ${__flags_const} ;; ++- *) readonly -g ${__flags_const} ;; # declare readonly constants globally +++ *) readonly -g ${__flags_const} ;; ++ esac ++ fi ++ done ++ unset __flags_const __flags_constants ++ ++-# ++-# internal variables ++-# ++- ++-__flags_boolNames=' ' # space separated list of boolean flag names ++-__flags_longNames=' ' # space separated list of long flag names ++-__flags_shortNames=' ' # space separated list of short flag names ++- ++-__flags_columns='' # screen width in columns ++-__flags_opts='' # temporary storage for parsed getopt flags ++- ++-#------------------------------------------------------------------------------ ++-# private functions ++-# ++- ++-# Define a flag. ++-# ++-# Calling this function will define the following info variables for the ++-# specified flag: ++-# FLAGS_flagname - the name for this flag (based upon the long flag name) ++-# __flags__default - the default value ++-# __flags_flagname_help - the help string ++-# __flags_flagname_short - the single letter alias ++-# __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*) ++-# ++-# Args: ++-# _flags__type: integer: internal type of flag (__FLAGS_TYPE_*) ++-# _flags__name: string: long flag name ++-# _flags__default: default flag value ++-# _flags__help: string: help string ++-# _flags__short: string: (optional) short flag name ++-# Returns: ++-# integer: success of operation, or error +++ +++__flags_boolNames=' ' +++__flags_longNames=' ' +++__flags_shortNames=' ' +++__flags_columns='' +++__flags_opts='' +++ ++ _flags_define() ++ { ++ if [ $# -lt 4 ]; then ++@@ -226,16 +106,13 @@ _flags_define() ++ ++ _flags_return_=${FLAGS_TRUE} ++ ++- # TODO(kward): check for validity of the flag name (e.g. dashes) ++ ++- # check whether the flag name is reserved ++ echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null ++ if [ $? -eq 0 ]; then ++ flags_error="flag name (${_flags_name_}) is reserved" ++ _flags_return_=${FLAGS_ERROR} ++ fi ++ ++- # require short option for getopt that don't support long options ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} \ ++ -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \ ++ -a "${_flags_short_}" = "${__FLAGS_NULL}" ] ++@@ -244,7 +121,6 @@ _flags_define() ++ _flags_return_=${FLAGS_ERROR} ++ fi ++ ++- # check for existing long name definition ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then ++ if _flags_itemInList "${_flags_name_}" \ ++ ${__flags_longNames} ${__flags_boolNames} ++@@ -255,7 +131,6 @@ _flags_define() ++ fi ++ fi ++ ++- # check for existing short name definition ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} \ ++ -a "${_flags_short_}" != "${__FLAGS_NULL}" ] ++ then ++@@ -266,9 +141,6 @@ _flags_define() ++ fi ++ fi ++ ++- # handle default value. note, on several occasions the 'if' portion of an ++- # if/then/else contains just a ':' which does nothing. a binary reversal via ++- # '!' is not done because it does not work on all shells. ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then ++ case ${_flags_type_} in ++ ${__FLAGS_TYPE_BOOLEAN}) ++@@ -301,7 +173,7 @@ _flags_define() ++ fi ++ ;; ++ ++- ${__FLAGS_TYPE_STRING}) ;; # everything in shell is a valid string +++ ${__FLAGS_TYPE_STRING}) ;; ++ ++ *) ++ flags_error="unrecognized flag type '${_flags_type_}'" ++@@ -311,7 +183,6 @@ _flags_define() ++ fi ++ ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then ++- # store flag information ++ eval "FLAGS_${_flags_name_}='${_flags_default_}'" ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}" ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\ ++@@ -319,7 +190,6 @@ _flags_define() ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\"" ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'" ++ ++- # append flag name(s) to list of names ++ __flags_longNames="${__flags_longNames}${_flags_name_} " ++ __flags_shortNames="${__flags_shortNames}${_flags_short_} " ++ [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \ ++@@ -333,17 +203,6 @@ _flags_define() ++ return ${flags_return} ++ } ++ ++-# Return valid getopt options using currently defined list of long options. ++-# ++-# This function builds a proper getopt option string for short (and long) ++-# options, using the current list of long options for reference. ++-# ++-# Args: ++-# _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*) ++-# Output: ++-# string: generated option string for getopt ++-# Returns: ++-# boolean: success of operation (always returns True) ++ _flags_genOptStr() ++ { ++ _flags_optStrType_=$1 ++@@ -358,7 +217,6 @@ _flags_genOptStr() ++ ${_flags_flag_} ${__FLAGS_INFO_SHORT}` ++ if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then ++ _flags_opts_="${_flags_opts_}${_flags_shortName_}" ++- # getopt needs a trailing ':' to indicate a required argument ++ [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \ ++ _flags_opts_="${_flags_opts_}:" ++ fi ++@@ -366,7 +224,6 @@ _flags_genOptStr() ++ ++ ${__FLAGS_OPTSTR_LONG}) ++ _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}" ++- # getopt needs a trailing ':' to indicate a required argument ++ [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \ ++ _flags_opts_="${_flags_opts_}:" ++ ;; ++@@ -379,15 +236,6 @@ _flags_genOptStr() ++ return ${FLAGS_TRUE} ++ } ++ ++-# Returns flag details based on a flag name and flag info. ++-# ++-# Args: ++-# string: long flag name ++-# string: flag info (see the _flags_define function for valid info types) ++-# Output: ++-# string: value of dereferenced flag variable ++-# Returns: ++-# integer: one of FLAGS_{TRUE|FALSE|ERROR} ++ _flags_getFlagInfo() ++ { ++ _flags_name_=$1 ++@@ -399,13 +247,6 @@ _flags_getFlagInfo() ++ if [ -n "${_flags_value_}" ]; then ++ flags_return=${FLAGS_TRUE} ++ else ++- # see if the _flags_name_ variable is a string as strings can be empty... ++- # note: the DRY principle would say to have this function call itself for ++- # the next three lines, but doing so results in an infinite loop as an ++- # invalid _flags_name_ will also not have the associated _type variable. ++- # Because it doesn't (it will evaluate to an empty string) the logic will ++- # try to find the _type variable of the _type variable, and so on. Not so ++- # good ;-) ++ _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}" ++ _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\"" ++ eval "${_flags_strToEval_}" ++@@ -424,15 +265,6 @@ _flags_getFlagInfo() ++ return ${flags_return} ++ } ++ ++-# check for presense of item in a list. passed a string (e.g. 'abc'), this ++-# function will determine if the string is present in the list of strings (e.g. ++-# ' foo bar abc '). ++-# ++-# Args: ++-# _flags__str: string: string to search for in a list of strings ++-# unnamed: list: list of strings ++-# Returns: ++-# boolean: true if item is in the list ++ _flags_itemInList() ++ { ++ _flags_str_=$1 ++@@ -449,34 +281,22 @@ _flags_itemInList() ++ return ${flags_return} ++ } ++ ++-# Returns the width of the current screen. ++-# ++-# Output: ++-# integer: width in columns of the current screen. ++ _flags_columns() ++ { ++ if [ -z "${__flags_columns}" ]; then ++- # determine the value and store it ++ if eval stty size >/dev/null 2>&1; then ++- # stty size worked :-) ++ set -- `stty size` ++ __flags_columns=$2 ++ elif eval tput cols >/dev/null 2>&1; then ++ set -- `tput cols` ++ __flags_columns=$1 ++ else ++- __flags_columns=80 # default terminal width +++ __flags_columns=80 ++ fi ++ fi ++ echo ${__flags_columns} ++ } ++ ++-# Validate a boolean. ++-# ++-# Args: ++-# _flags__bool: boolean: value to validate ++-# Returns: ++-# bool: true if the value is a valid boolean ++ _flags_validateBoolean() ++ { ++ _flags_bool_=$1 ++@@ -492,12 +312,6 @@ _flags_validateBoolean() ++ return ${flags_return} ++ } ++ ++-# Validate a float. ++-# ++-# Args: ++-# _flags__float: float: value to validate ++-# Returns: ++-# bool: true if the value is a valid float ++ _flags_validateFloat() ++ { ++ _flags_float_=$1 ++@@ -507,10 +321,10 @@ _flags_validateFloat() ++ else ++ flags_return=${FLAGS_TRUE} ++ case ${_flags_float_} in ++- -*) # negative floats +++ -*) ++ _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'` ++ ;; ++- *) # positive floats +++ *) ++ _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'` ++ ;; ++ esac ++@@ -521,22 +335,16 @@ _flags_validateFloat() ++ return ${flags_return} ++ } ++ ++-# Validate an integer. ++-# ++-# Args: ++-# _flags__integer: interger: value to validate ++-# Returns: ++-# bool: true if the value is a valid integer ++ _flags_validateInteger() ++ { ++ _flags_int_=$1 ++ ++ flags_return=${FLAGS_TRUE} ++ case ${_flags_int_} in ++- -*) # negative ints +++ -*) ++ _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'` ++ ;; ++- *) # positive ints +++ *) ++ _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'` ++ ;; ++ esac ++@@ -546,23 +354,12 @@ _flags_validateInteger() ++ return ${flags_return} ++ } ++ ++-# Parse command-line options using the standard getopt. ++-# ++-# Note: the flag options are passed around in the global __flags_opts so that ++-# the formatting is not lost due to shell parsing and such. ++-# ++-# Args: ++-# @: varies: command-line options to parse ++-# Returns: ++-# integer: a FLAGS success condition ++ _flags_getoptStandard() ++ { ++ flags_return=${FLAGS_TRUE} ++ _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}` ++ ++- # check for spaces in passed options ++ for _flags_opt_ in "$@"; do ++- # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06 ++ _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'` ++ if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then ++ flags_error='the available getopt does not support spaces in options' ++@@ -585,15 +382,6 @@ _flags_getoptStandard() ++ return ${flags_return} ++ } ++ ++-# Parse command-line options using the enhanced getopt. ++-# ++-# Note: the flag options are passed around in the global __flags_opts so that ++-# the formatting is not lost due to shell parsing and such. ++-# ++-# Args: ++-# @: varies: command-line options to parse ++-# Returns: ++-# integer: a FLAGS success condition ++ _flags_getoptEnhanced() ++ { ++ flags_return=${FLAGS_TRUE} ++@@ -617,17 +405,6 @@ _flags_getoptEnhanced() ++ return ${flags_return} ++ } ++ ++-# Dynamically parse a getopt result and set appropriate variables. ++-# ++-# This function does the actual conversion of getopt output and runs it through ++-# the standard case structure for parsing. The case structure is actually quite ++-# dynamic to support any number of flags. ++-# ++-# Args: ++-# argc: int: original command-line argument count ++-# @: varies: output from getopt parsing ++-# Returns: ++-# integer: a FLAGS success condition ++ _flags_parseGetopt() ++ { ++ _flags_argc_=$1 ++@@ -638,35 +415,26 @@ _flags_parseGetopt() ++ if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then ++ set -- $@ ++ else ++- # note the quotes around the `$@' -- they are essential! ++ eval set -- "$@" ++ fi ++ ++- # provide user with number of arguments to shift by later ++- # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not ++- # properly give user access to non-flag arguments mixed in between flag ++- # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only ++- # for backwards compatibility reasons. ++ FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}` ++ ++- # handle options. note options with values must do an additional shift ++ while true; do ++ _flags_opt_=$1 ++ _flags_arg_=${2:-} ++ _flags_type_=${__FLAGS_TYPE_NONE} ++ _flags_name_='' ++ ++- # determine long flag name ++ case "${_flags_opt_}" in ++- --) shift; break ;; # discontinue option parsing +++ --) shift; break ;; ++ ++- --*) # long option +++ --*) ++ _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'` ++ _flags_len_=${__FLAGS_LEN_LONG} ++ if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then ++ _flags_name_=${_flags_opt_} ++ else ++- # check for negated long boolean version ++ if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then ++ _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'` ++ _flags_type_=${__FLAGS_TYPE_BOOLEAN} ++@@ -675,12 +443,10 @@ _flags_parseGetopt() ++ fi ++ ;; ++ ++- -*) # short option +++ -*) ++ _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'` ++ _flags_len_=${__FLAGS_LEN_SHORT} ++ if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then ++- # yes. match short name to long name. note purposeful off-by-one ++- # (too high) with awk calculations. ++ _flags_pos_=`echo "${__flags_shortNames}" \ ++ |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \ ++ e=${_flags_opt_}` ++@@ -690,14 +456,12 @@ _flags_parseGetopt() ++ ;; ++ esac ++ ++- # die if the flag was unrecognized ++ if [ -z "${_flags_name_}" ]; then ++ flags_error="unrecognized option (${_flags_opt_})" ++ flags_return=${FLAGS_ERROR} ++ break ++ fi ++ ++- # set new flag value ++ [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \ ++ _flags_type_=`_flags_getFlagInfo \ ++ "${_flags_name_}" ${__FLAGS_INFO_TYPE}` ++@@ -746,7 +510,6 @@ _flags_parseGetopt() ++ ;; ++ esac ++ ++- # handle special case help flag ++ if [ "${_flags_name_}" = 'help' ]; then ++ if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then ++ flags_help ++@@ -756,12 +519,10 @@ _flags_parseGetopt() ++ fi ++ fi ++ ++- # shift the option and non-boolean arguements out. ++ shift ++ [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift ++ done ++ ++- # give user back non-flag arguments ++ FLAGS_ARGV='' ++ while [ $# -gt 0 ]; do ++ FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'" ++@@ -773,43 +534,18 @@ _flags_parseGetopt() ++ return ${flags_return} ++ } ++ ++-#------------------------------------------------------------------------------ ++-# public functions ++-# ++- ++-# A basic boolean flag. Boolean flags do not take any arguments, and their ++-# value is either 1 (false) or 0 (true). For long flags, the false value is ++-# specified on the command line by prepending the word 'no'. With short flags, ++-# the presense of the flag toggles the current value between true and false. ++-# Specifying a short boolean flag twice on the command results in returning the ++-# value back to the default value. ++-# ++-# A default value is required for boolean flags. ++-# ++-# For example, lets say a Boolean flag was created whose long name was 'update' ++-# and whose short name was 'x', and the default value was 'false'. This flag ++-# could be explicitly set to 'true' with '--update' or by '-x', and it could be ++-# explicitly set to 'false' with '--noupdate'. +++ ++ DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; } ++ ++-# Other basic flags. ++ DEFINE_float() { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; } ++ DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; } ++ DEFINE_string() { _flags_define ${__FLAGS_TYPE_STRING} "$@"; } ++ ++-# Parse the flags. ++-# ++-# Args: ++-# unnamed: list: command-line flags to parse ++-# Returns: ++-# integer: success of operation, or error ++ FLAGS() ++ { ++- # define a standard 'help' flag if one isn't already defined ++ [ -z "${__flags_help_type:-}" ] && \ ++ DEFINE_boolean 'help' false 'show this help' 'h' ++ ++- # parse options ++ if [ $# -gt 0 ]; then ++ if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then ++ _flags_getoptStandard "$@" ++@@ -818,7 +554,6 @@ FLAGS() ++ fi ++ flags_return=$? ++ else ++- # nothing passed; won't bother running getopt ++ __flags_opts='--' ++ flags_return=${FLAGS_TRUE} ++ fi ++@@ -832,23 +567,11 @@ FLAGS() ++ return ${flags_return} ++ } ++ ++-# This is a helper function for determining the `getopt` version for platforms ++-# where the detection isn't working. It simply outputs debug information that ++-# can be included in a bug report. ++-# ++-# Args: ++-# none ++-# Output: ++-# debug info that can be included in a bug report ++-# Returns: ++-# nothing ++ flags_getoptInfo() ++ { ++- # platform info ++ _flags_debug "uname -a: `uname -a`" ++ _flags_debug "PATH: ${PATH}" ++ ++- # shell info ++ if [ -n "${BASH_VERSION:-}" ]; then ++ _flags_debug 'shell: bash' ++ _flags_debug "BASH_VERSION: ${BASH_VERSION}" ++@@ -857,7 +580,6 @@ flags_getoptInfo() ++ _flags_debug "ZSH_VERSION: ${ZSH_VERSION}" ++ fi ++ ++- # getopt info ++ getopt >/dev/null ++ _flags_getoptReturn=$? ++ _flags_debug "getopt return: ${_flags_getoptReturn}" ++@@ -866,39 +588,16 @@ flags_getoptInfo() ++ unset _flags_getoptReturn ++ } ++ ++-# Returns whether the detected getopt version is the enhanced version. ++-# ++-# Args: ++-# none ++-# Output: ++-# none ++-# Returns: ++-# bool: true if getopt is the enhanced version ++ flags_getoptIsEnh() ++ { ++ test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH} ++ } ++ ++-# Returns whether the detected getopt version is the standard version. ++-# ++-# Args: ++-# none ++-# Returns: ++-# bool: true if getopt is the standard version ++ flags_getoptIsStd() ++ { ++ test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} ++ } ++ ++-# This is effectively a 'usage()' function. It prints usage information and ++-# exits the program with ${FLAGS_FALSE} if it is ever found in the command line ++-# arguments. Note this function can be overridden so other apps can define ++-# their own --help flag, replacing this one, if they want. ++-# ++-# Args: ++-# none ++-# Returns: ++-# integer: success of operation (always returns true) ++ flags_help() ++ { ++ if [ -n "${FLAGS_HELP:-}" ]; then ++@@ -953,19 +652,14 @@ flags_help() ++ echo "${flags_helpStr_}" >&2 ++ else ++ echo " ${flags_flagStr_} ${flags_help_}" >&2 ++- # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06 ++- # because it doesn't like empty strings when used in this manner. ++ flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \ ++ |awk '{printf "%"length($0)-2"s", ""}'`" ++ flags_helpStr_=" ${flags_emptyStr_} ${flags_defaultStr_}" ++ flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'` ++ if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \ ++ -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then ++- # indented to match help string ++ echo "${flags_helpStr_}" >&2 ++ else ++- # indented four from left to allow for longer defaults as long flag ++- # names might be used too, making things too long ++ echo " ${flags_defaultStr_}" >&2 ++ fi ++ fi ++@@ -978,12 +672,6 @@ flags_help() ++ return ${FLAGS_TRUE} ++ } ++ ++-# Reset shflags back to an uninitialized state. ++-# ++-# Args: ++-# none ++-# Returns: ++-# nothing ++ flags_reset() ++ { ++ for flags_name_ in ${__flags_longNames}; do ++@@ -1000,7 +688,6 @@ flags_reset() ++ eval ${flags_strToEval_} ++ done ++ ++- # reset internal variables ++ __flags_boolNames=' ' ++ __flags_longNames=' ' ++ __flags_shortNames=' ' +diff --git a/feeds/packages/libs/shflags/patches/000-strip.patch b/feeds/packages/libs/shflags/patches/000-strip.patch +new file mode 100644 +index 0000000..bc05948 +--- /dev/null ++++ b/feeds/packages/libs/shflags/patches/000-strip.patch +@@ -0,0 +1,763 @@ ++--- a/source/1.0/src/shflags +++++ b/source/1.0/src/shflags ++@@ -1,91 +1,10 @@ ++-# $Id$ ++-# vim:et:ft=sh:sts=2:sw=2 ++-# ++-# Copyright 2008 Kate Ward. All Rights Reserved. ++-# Released under the LGPL (GNU Lesser General Public License) ++-# ++-# shFlags -- Advanced command-line flag library for Unix shell scripts. ++-# http://code.google.com/p/shflags/ ++-# ++-# Author: kate.ward@forestent.com (Kate Ward) ++-# ++-# This module implements something like the google-gflags library available ++-# from http://code.google.com/p/google-gflags/. ++-# ++-# FLAG TYPES: This is a list of the DEFINE_*'s that you can do. All flags take ++-# a name, default value, help-string, and optional 'short' name (one-letter ++-# name). Some flags have other arguments, which are described with the flag. ++-# ++-# DEFINE_string: takes any input, and intreprets it as a string. ++-# ++-# DEFINE_boolean: typically does not take any argument: say --myflag to set ++-# FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false. ++-# Alternately, you can say ++-# --myflag=true or --myflag=t or --myflag=0 or ++-# --myflag=false or --myflag=f or --myflag=1 ++-# Passing an option has the same affect as passing the option once. ++-# ++-# DEFINE_float: takes an input and intreprets it as a floating point number. As ++-# shell does not support floats per-se, the input is merely validated as ++-# being a valid floating point value. ++-# ++-# DEFINE_integer: takes an input and intreprets it as an integer. ++-# ++-# SPECIAL FLAGS: There are a few flags that have special meaning: ++-# --help (or -?) prints a list of all the flags in a human-readable fashion ++-# --flagfile=foo read flags from foo. (not implemented yet) ++-# -- as in getopt(), terminates flag-processing ++-# ++-# EXAMPLE USAGE: ++-# ++-# -- begin hello.sh -- ++-# #! /bin/sh ++-# . ./shflags ++-# DEFINE_string name 'world' "somebody's name" n ++-# FLAGS "$@" || exit $? ++-# eval set -- "${FLAGS_ARGV}" ++-# echo "Hello, ${FLAGS_name}." ++-# -- end hello.sh -- ++-# ++-# $ ./hello.sh -n Kate ++-# Hello, Kate. ++-# ++-# NOTE: Not all systems include a getopt version that supports long flags. On ++-# these systems, only short flags are recognized. ++- ++-#============================================================================== ++-# shFlags ++-# ++-# Shared attributes: ++-# flags_error: last error message ++-# flags_return: last return value ++-# ++-# __flags_longNames: list of long names for all flags ++-# __flags_shortNames: list of short names for all flags ++-# __flags_boolNames: list of boolean flag names ++-# ++-# __flags_opts: options parsed by getopt ++-# ++-# Per-flag attributes: ++-# FLAGS_: contains value of flag named 'flag_name' ++-# __flags__default: the default flag value ++-# __flags__help: the flag help string ++-# __flags__short: the flag short name ++-# __flags__type: the flag type ++-# ++-# Notes: ++-# - lists of strings are space separated, and a null value is the '~' char. ++- ++-# return if FLAGS already loaded ++ [ -n "${FLAGS_VERSION:-}" ] && return 0 ++ FLAGS_VERSION='1.0.3' ++ ++-# return values ++ FLAGS_TRUE=0 ++ FLAGS_FALSE=1 ++ FLAGS_ERROR=2 ++ ++-# reserved flag names ++ FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION' ++ ++ _flags_debug() { echo "flags:DEBUG $@" >&2; } ++@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2 ++ _flags_error() { echo "flags:ERROR $@" >&2; } ++ _flags_fatal() { echo "flags:FATAL $@" >&2; } ++ ++-# specific shell checks ++ if [ -n "${ZSH_VERSION:-}" ]; then ++ setopt |grep "^shwordsplit$" >/dev/null ++ if [ $? -ne ${FLAGS_TRUE} ]; then ++@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then ++ fi ++ fi ++ ++-# ++-# constants ++-# ++ ++-# getopt version ++ __FLAGS_GETOPT_VERS_STD=0 ++ __FLAGS_GETOPT_VERS_ENH=1 ++ __FLAGS_GETOPT_VERS_BSD=2 ++ ++ getopt >/dev/null 2>&1 ++ case $? in ++- 0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;; # bsd getopt +++ 0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;; ++ 2) ++- # TODO(kward): look into '-T' option to test the internal getopt() version ++ if [ "`getopt --version`" = '-- ' ]; then ++ __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ++ else ++@@ -133,82 +46,49 @@ case $? in ++ ;; ++ esac ++ ++-# getopt optstring lengths ++ __FLAGS_OPTSTR_SHORT=0 ++ __FLAGS_OPTSTR_LONG=1 ++ ++ __FLAGS_NULL='~' ++ ++-# flag info strings ++ __FLAGS_INFO_DEFAULT='default' ++ __FLAGS_INFO_HELP='help' ++ __FLAGS_INFO_SHORT='short' ++ __FLAGS_INFO_TYPE='type' ++ ++-# flag lengths ++ __FLAGS_LEN_SHORT=0 ++ __FLAGS_LEN_LONG=1 ++ ++-# flag types ++ __FLAGS_TYPE_NONE=0 ++ __FLAGS_TYPE_BOOLEAN=1 ++ __FLAGS_TYPE_FLOAT=2 ++ __FLAGS_TYPE_INTEGER=3 ++ __FLAGS_TYPE_STRING=4 ++ ++-# set the constants readonly ++ __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'` ++ for __flags_const in ${__flags_constants}; do ++- # skip certain flags ++ case ${__flags_const} in ++ FLAGS_HELP) continue ;; ++ FLAGS_PARENT) continue ;; ++ esac ++- # set flag readonly ++ if [ -z "${ZSH_VERSION:-}" ]; then ++ readonly ${__flags_const} ++- else # handle zsh +++ else ++ case ${ZSH_VERSION} in ++ [123].*) readonly ${__flags_const} ;; ++- *) readonly -g ${__flags_const} ;; # declare readonly constants globally +++ *) readonly -g ${__flags_const} ;; ++ esac ++ fi ++ done ++ unset __flags_const __flags_constants ++ ++-# ++-# internal variables ++-# ++- ++-__flags_boolNames=' ' # space separated list of boolean flag names ++-__flags_longNames=' ' # space separated list of long flag names ++-__flags_shortNames=' ' # space separated list of short flag names ++- ++-__flags_columns='' # screen width in columns ++-__flags_opts='' # temporary storage for parsed getopt flags ++- ++-#------------------------------------------------------------------------------ ++-# private functions ++-# ++- ++-# Define a flag. ++-# ++-# Calling this function will define the following info variables for the ++-# specified flag: ++-# FLAGS_flagname - the name for this flag (based upon the long flag name) ++-# __flags__default - the default value ++-# __flags_flagname_help - the help string ++-# __flags_flagname_short - the single letter alias ++-# __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*) ++-# ++-# Args: ++-# _flags__type: integer: internal type of flag (__FLAGS_TYPE_*) ++-# _flags__name: string: long flag name ++-# _flags__default: default flag value ++-# _flags__help: string: help string ++-# _flags__short: string: (optional) short flag name ++-# Returns: ++-# integer: success of operation, or error +++ +++__flags_boolNames=' ' +++__flags_longNames=' ' +++__flags_shortNames=' ' +++__flags_columns='' +++__flags_opts='' +++ ++ _flags_define() ++ { ++ if [ $# -lt 4 ]; then ++@@ -226,16 +106,13 @@ _flags_define() ++ ++ _flags_return_=${FLAGS_TRUE} ++ ++- # TODO(kward): check for validity of the flag name (e.g. dashes) ++ ++- # check whether the flag name is reserved ++ echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null ++ if [ $? -eq 0 ]; then ++ flags_error="flag name (${_flags_name_}) is reserved" ++ _flags_return_=${FLAGS_ERROR} ++ fi ++ ++- # require short option for getopt that don't support long options ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} \ ++ -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \ ++ -a "${_flags_short_}" = "${__FLAGS_NULL}" ] ++@@ -244,7 +121,6 @@ _flags_define() ++ _flags_return_=${FLAGS_ERROR} ++ fi ++ ++- # check for existing long name definition ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then ++ if _flags_itemInList "${_flags_name_}" \ ++ ${__flags_longNames} ${__flags_boolNames} ++@@ -255,7 +131,6 @@ _flags_define() ++ fi ++ fi ++ ++- # check for existing short name definition ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} \ ++ -a "${_flags_short_}" != "${__FLAGS_NULL}" ] ++ then ++@@ -266,9 +141,6 @@ _flags_define() ++ fi ++ fi ++ ++- # handle default value. note, on several occasions the 'if' portion of an ++- # if/then/else contains just a ':' which does nothing. a binary reversal via ++- # '!' is not done because it does not work on all shells. ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then ++ case ${_flags_type_} in ++ ${__FLAGS_TYPE_BOOLEAN}) ++@@ -301,7 +173,7 @@ _flags_define() ++ fi ++ ;; ++ ++- ${__FLAGS_TYPE_STRING}) ;; # everything in shell is a valid string +++ ${__FLAGS_TYPE_STRING}) ;; ++ ++ *) ++ flags_error="unrecognized flag type '${_flags_type_}'" ++@@ -311,7 +183,6 @@ _flags_define() ++ fi ++ ++ if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then ++- # store flag information ++ eval "FLAGS_${_flags_name_}='${_flags_default_}'" ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}" ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\ ++@@ -319,7 +190,6 @@ _flags_define() ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\"" ++ eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'" ++ ++- # append flag name(s) to list of names ++ __flags_longNames="${__flags_longNames}${_flags_name_} " ++ __flags_shortNames="${__flags_shortNames}${_flags_short_} " ++ [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \ ++@@ -333,17 +203,6 @@ _flags_define() ++ return ${flags_return} ++ } ++ ++-# Return valid getopt options using currently defined list of long options. ++-# ++-# This function builds a proper getopt option string for short (and long) ++-# options, using the current list of long options for reference. ++-# ++-# Args: ++-# _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*) ++-# Output: ++-# string: generated option string for getopt ++-# Returns: ++-# boolean: success of operation (always returns True) ++ _flags_genOptStr() ++ { ++ _flags_optStrType_=$1 ++@@ -358,7 +217,6 @@ _flags_genOptStr() ++ ${_flags_flag_} ${__FLAGS_INFO_SHORT}` ++ if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then ++ _flags_opts_="${_flags_opts_}${_flags_shortName_}" ++- # getopt needs a trailing ':' to indicate a required argument ++ [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \ ++ _flags_opts_="${_flags_opts_}:" ++ fi ++@@ -366,7 +224,6 @@ _flags_genOptStr() ++ ++ ${__FLAGS_OPTSTR_LONG}) ++ _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}" ++- # getopt needs a trailing ':' to indicate a required argument ++ [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \ ++ _flags_opts_="${_flags_opts_}:" ++ ;; ++@@ -379,15 +236,6 @@ _flags_genOptStr() ++ return ${FLAGS_TRUE} ++ } ++ ++-# Returns flag details based on a flag name and flag info. ++-# ++-# Args: ++-# string: long flag name ++-# string: flag info (see the _flags_define function for valid info types) ++-# Output: ++-# string: value of dereferenced flag variable ++-# Returns: ++-# integer: one of FLAGS_{TRUE|FALSE|ERROR} ++ _flags_getFlagInfo() ++ { ++ _flags_name_=$1 ++@@ -399,13 +247,6 @@ _flags_getFlagInfo() ++ if [ -n "${_flags_value_}" ]; then ++ flags_return=${FLAGS_TRUE} ++ else ++- # see if the _flags_name_ variable is a string as strings can be empty... ++- # note: the DRY principle would say to have this function call itself for ++- # the next three lines, but doing so results in an infinite loop as an ++- # invalid _flags_name_ will also not have the associated _type variable. ++- # Because it doesn't (it will evaluate to an empty string) the logic will ++- # try to find the _type variable of the _type variable, and so on. Not so ++- # good ;-) ++ _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}" ++ _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\"" ++ eval "${_flags_strToEval_}" ++@@ -424,15 +265,6 @@ _flags_getFlagInfo() ++ return ${flags_return} ++ } ++ ++-# check for presense of item in a list. passed a string (e.g. 'abc'), this ++-# function will determine if the string is present in the list of strings (e.g. ++-# ' foo bar abc '). ++-# ++-# Args: ++-# _flags__str: string: string to search for in a list of strings ++-# unnamed: list: list of strings ++-# Returns: ++-# boolean: true if item is in the list ++ _flags_itemInList() ++ { ++ _flags_str_=$1 ++@@ -449,34 +281,22 @@ _flags_itemInList() ++ return ${flags_return} ++ } ++ ++-# Returns the width of the current screen. ++-# ++-# Output: ++-# integer: width in columns of the current screen. ++ _flags_columns() ++ { ++ if [ -z "${__flags_columns}" ]; then ++- # determine the value and store it ++ if eval stty size >/dev/null 2>&1; then ++- # stty size worked :-) ++ set -- `stty size` ++ __flags_columns=$2 ++ elif eval tput cols >/dev/null 2>&1; then ++ set -- `tput cols` ++ __flags_columns=$1 ++ else ++- __flags_columns=80 # default terminal width +++ __flags_columns=80 ++ fi ++ fi ++ echo ${__flags_columns} ++ } ++ ++-# Validate a boolean. ++-# ++-# Args: ++-# _flags__bool: boolean: value to validate ++-# Returns: ++-# bool: true if the value is a valid boolean ++ _flags_validateBoolean() ++ { ++ _flags_bool_=$1 ++@@ -492,12 +312,6 @@ _flags_validateBoolean() ++ return ${flags_return} ++ } ++ ++-# Validate a float. ++-# ++-# Args: ++-# _flags__float: float: value to validate ++-# Returns: ++-# bool: true if the value is a valid float ++ _flags_validateFloat() ++ { ++ _flags_float_=$1 ++@@ -507,10 +321,10 @@ _flags_validateFloat() ++ else ++ flags_return=${FLAGS_TRUE} ++ case ${_flags_float_} in ++- -*) # negative floats +++ -*) ++ _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'` ++ ;; ++- *) # positive floats +++ *) ++ _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'` ++ ;; ++ esac ++@@ -521,22 +335,16 @@ _flags_validateFloat() ++ return ${flags_return} ++ } ++ ++-# Validate an integer. ++-# ++-# Args: ++-# _flags__integer: interger: value to validate ++-# Returns: ++-# bool: true if the value is a valid integer ++ _flags_validateInteger() ++ { ++ _flags_int_=$1 ++ ++ flags_return=${FLAGS_TRUE} ++ case ${_flags_int_} in ++- -*) # negative ints +++ -*) ++ _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'` ++ ;; ++- *) # positive ints +++ *) ++ _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'` ++ ;; ++ esac ++@@ -546,23 +354,12 @@ _flags_validateInteger() ++ return ${flags_return} ++ } ++ ++-# Parse command-line options using the standard getopt. ++-# ++-# Note: the flag options are passed around in the global __flags_opts so that ++-# the formatting is not lost due to shell parsing and such. ++-# ++-# Args: ++-# @: varies: command-line options to parse ++-# Returns: ++-# integer: a FLAGS success condition ++ _flags_getoptStandard() ++ { ++ flags_return=${FLAGS_TRUE} ++ _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}` ++ ++- # check for spaces in passed options ++ for _flags_opt_ in "$@"; do ++- # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06 ++ _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'` ++ if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then ++ flags_error='the available getopt does not support spaces in options' ++@@ -585,15 +382,6 @@ _flags_getoptStandard() ++ return ${flags_return} ++ } ++ ++-# Parse command-line options using the enhanced getopt. ++-# ++-# Note: the flag options are passed around in the global __flags_opts so that ++-# the formatting is not lost due to shell parsing and such. ++-# ++-# Args: ++-# @: varies: command-line options to parse ++-# Returns: ++-# integer: a FLAGS success condition ++ _flags_getoptEnhanced() ++ { ++ flags_return=${FLAGS_TRUE} ++@@ -617,17 +405,6 @@ _flags_getoptEnhanced() ++ return ${flags_return} ++ } ++ ++-# Dynamically parse a getopt result and set appropriate variables. ++-# ++-# This function does the actual conversion of getopt output and runs it through ++-# the standard case structure for parsing. The case structure is actually quite ++-# dynamic to support any number of flags. ++-# ++-# Args: ++-# argc: int: original command-line argument count ++-# @: varies: output from getopt parsing ++-# Returns: ++-# integer: a FLAGS success condition ++ _flags_parseGetopt() ++ { ++ _flags_argc_=$1 ++@@ -638,35 +415,26 @@ _flags_parseGetopt() ++ if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then ++ set -- $@ ++ else ++- # note the quotes around the `$@' -- they are essential! ++ eval set -- "$@" ++ fi ++ ++- # provide user with number of arguments to shift by later ++- # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not ++- # properly give user access to non-flag arguments mixed in between flag ++- # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only ++- # for backwards compatibility reasons. ++ FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}` ++ ++- # handle options. note options with values must do an additional shift ++ while true; do ++ _flags_opt_=$1 ++ _flags_arg_=${2:-} ++ _flags_type_=${__FLAGS_TYPE_NONE} ++ _flags_name_='' ++ ++- # determine long flag name ++ case "${_flags_opt_}" in ++- --) shift; break ;; # discontinue option parsing +++ --) shift; break ;; ++ ++- --*) # long option +++ --*) ++ _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'` ++ _flags_len_=${__FLAGS_LEN_LONG} ++ if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then ++ _flags_name_=${_flags_opt_} ++ else ++- # check for negated long boolean version ++ if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then ++ _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'` ++ _flags_type_=${__FLAGS_TYPE_BOOLEAN} ++@@ -675,12 +443,10 @@ _flags_parseGetopt() ++ fi ++ ;; ++ ++- -*) # short option +++ -*) ++ _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'` ++ _flags_len_=${__FLAGS_LEN_SHORT} ++ if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then ++- # yes. match short name to long name. note purposeful off-by-one ++- # (too high) with awk calculations. ++ _flags_pos_=`echo "${__flags_shortNames}" \ ++ |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \ ++ e=${_flags_opt_}` ++@@ -690,14 +456,12 @@ _flags_parseGetopt() ++ ;; ++ esac ++ ++- # die if the flag was unrecognized ++ if [ -z "${_flags_name_}" ]; then ++ flags_error="unrecognized option (${_flags_opt_})" ++ flags_return=${FLAGS_ERROR} ++ break ++ fi ++ ++- # set new flag value ++ [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \ ++ _flags_type_=`_flags_getFlagInfo \ ++ "${_flags_name_}" ${__FLAGS_INFO_TYPE}` ++@@ -746,7 +510,6 @@ _flags_parseGetopt() ++ ;; ++ esac ++ ++- # handle special case help flag ++ if [ "${_flags_name_}" = 'help' ]; then ++ if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then ++ flags_help ++@@ -756,12 +519,10 @@ _flags_parseGetopt() ++ fi ++ fi ++ ++- # shift the option and non-boolean arguements out. ++ shift ++ [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift ++ done ++ ++- # give user back non-flag arguments ++ FLAGS_ARGV='' ++ while [ $# -gt 0 ]; do ++ FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'" ++@@ -773,43 +534,18 @@ _flags_parseGetopt() ++ return ${flags_return} ++ } ++ ++-#------------------------------------------------------------------------------ ++-# public functions ++-# ++- ++-# A basic boolean flag. Boolean flags do not take any arguments, and their ++-# value is either 1 (false) or 0 (true). For long flags, the false value is ++-# specified on the command line by prepending the word 'no'. With short flags, ++-# the presense of the flag toggles the current value between true and false. ++-# Specifying a short boolean flag twice on the command results in returning the ++-# value back to the default value. ++-# ++-# A default value is required for boolean flags. ++-# ++-# For example, lets say a Boolean flag was created whose long name was 'update' ++-# and whose short name was 'x', and the default value was 'false'. This flag ++-# could be explicitly set to 'true' with '--update' or by '-x', and it could be ++-# explicitly set to 'false' with '--noupdate'. +++ ++ DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; } ++ ++-# Other basic flags. ++ DEFINE_float() { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; } ++ DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; } ++ DEFINE_string() { _flags_define ${__FLAGS_TYPE_STRING} "$@"; } ++ ++-# Parse the flags. ++-# ++-# Args: ++-# unnamed: list: command-line flags to parse ++-# Returns: ++-# integer: success of operation, or error ++ FLAGS() ++ { ++- # define a standard 'help' flag if one isn't already defined ++ [ -z "${__flags_help_type:-}" ] && \ ++ DEFINE_boolean 'help' false 'show this help' 'h' ++ ++- # parse options ++ if [ $# -gt 0 ]; then ++ if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then ++ _flags_getoptStandard "$@" ++@@ -818,7 +554,6 @@ FLAGS() ++ fi ++ flags_return=$? ++ else ++- # nothing passed; won't bother running getopt ++ __flags_opts='--' ++ flags_return=${FLAGS_TRUE} ++ fi ++@@ -832,23 +567,11 @@ FLAGS() ++ return ${flags_return} ++ } ++ ++-# This is a helper function for determining the `getopt` version for platforms ++-# where the detection isn't working. It simply outputs debug information that ++-# can be included in a bug report. ++-# ++-# Args: ++-# none ++-# Output: ++-# debug info that can be included in a bug report ++-# Returns: ++-# nothing ++ flags_getoptInfo() ++ { ++- # platform info ++ _flags_debug "uname -a: `uname -a`" ++ _flags_debug "PATH: ${PATH}" ++ ++- # shell info ++ if [ -n "${BASH_VERSION:-}" ]; then ++ _flags_debug 'shell: bash' ++ _flags_debug "BASH_VERSION: ${BASH_VERSION}" ++@@ -857,7 +580,6 @@ flags_getoptInfo() ++ _flags_debug "ZSH_VERSION: ${ZSH_VERSION}" ++ fi ++ ++- # getopt info ++ getopt >/dev/null ++ _flags_getoptReturn=$? ++ _flags_debug "getopt return: ${_flags_getoptReturn}" ++@@ -866,39 +588,16 @@ flags_getoptInfo() ++ unset _flags_getoptReturn ++ } ++ ++-# Returns whether the detected getopt version is the enhanced version. ++-# ++-# Args: ++-# none ++-# Output: ++-# none ++-# Returns: ++-# bool: true if getopt is the enhanced version ++ flags_getoptIsEnh() ++ { ++ test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH} ++ } ++ ++-# Returns whether the detected getopt version is the standard version. ++-# ++-# Args: ++-# none ++-# Returns: ++-# bool: true if getopt is the standard version ++ flags_getoptIsStd() ++ { ++ test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} ++ } ++ ++-# This is effectively a 'usage()' function. It prints usage information and ++-# exits the program with ${FLAGS_FALSE} if it is ever found in the command line ++-# arguments. Note this function can be overridden so other apps can define ++-# their own --help flag, replacing this one, if they want. ++-# ++-# Args: ++-# none ++-# Returns: ++-# integer: success of operation (always returns true) ++ flags_help() ++ { ++ if [ -n "${FLAGS_HELP:-}" ]; then ++@@ -953,19 +652,14 @@ flags_help() ++ echo "${flags_helpStr_}" >&2 ++ else ++ echo " ${flags_flagStr_} ${flags_help_}" >&2 ++- # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06 ++- # because it doesn't like empty strings when used in this manner. ++ flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \ ++ |awk '{printf "%"length($0)-2"s", ""}'`" ++ flags_helpStr_=" ${flags_emptyStr_} ${flags_defaultStr_}" ++ flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'` ++ if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \ ++ -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then ++- # indented to match help string ++ echo "${flags_helpStr_}" >&2 ++ else ++- # indented four from left to allow for longer defaults as long flag ++- # names might be used too, making things too long ++ echo " ${flags_defaultStr_}" >&2 ++ fi ++ fi ++@@ -978,12 +672,6 @@ flags_help() ++ return ${FLAGS_TRUE} ++ } ++ ++-# Reset shflags back to an uninitialized state. ++-# ++-# Args: ++-# none ++-# Returns: ++-# nothing ++ flags_reset() ++ { ++ for flags_name_ in ${__flags_longNames}; do ++@@ -1000,7 +688,6 @@ flags_reset() ++ eval ${flags_strToEval_} ++ done ++ ++- # reset internal variables ++ __flags_boolNames=' ' ++ __flags_longNames=' ' ++ __flags_shortNames=' ' +diff --git a/feeds/packages/libs/slang2/.svn/entries b/feeds/packages/libs/slang2/.svn/entries +new file mode 100644 +index 0000000..43ae8ea +--- /dev/null ++++ b/feeds/packages/libs/slang2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/slang2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-27T19:49:24.749399Z ++31494 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++fd1a6a8be7e68e4b4efdc5728aa8ed11 ++2012-04-27T19:49:24.749399Z ++31494 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2481 ++ +diff --git a/feeds/packages/libs/slang2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/slang2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..594bc82 +--- /dev/null ++++ b/feeds/packages/libs/slang2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,97 @@ ++# ++# Copyright (C) 2006-2011 Openwrt.org ++# Copyright (C) 2011 SMBPhone Inc. ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=slang ++PKG_VERSION:=2.2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://space.mit.edu/pub/davis/slang/v2.2 \ ++ ftp://space.mit.edu/pub/davis/slang/v2.2/OLD ++PKG_MD5SUM:=7fcfd447e378f07dd0c0bae671fe6487 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libslang2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=S-Lang v2.2 ++ URL:=http://www.jedsoft.org/slang ++ DEPENDS:= +terminfo ++endef ++ ++define Package/libslang2/description ++ Multi-platform programmer's library providing facilities for interactive ++ applications. Includes such things as display/screen management, ++ keyboard input, keymaps, etc. Includes the embeddable S-Lang interpreter. ++endef ++ ++define Package/slsh ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=S-Lang Shell ++ URL:=http://www.jedsoft.org/slang/slsh.html ++ DEPENDS:= +libslang2 ++endef ++ ++define Package/libslang2/description ++ This is a shell which is mostly just a wrapper around the S-Lang Interpreter, ++ which is part of the S-Lang Library. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++TARGET_LDFLAGS += -L../src/${ARCH}elfobjs ++ ++CONFIGURE_ARGS += \ ++ --enable-largefile \ ++ --disable-warnings \ ++ --with-terminfo=default \ ++ --with-readline=slang \ ++ --without-x \ ++ --without-pcre \ ++ --without-onig \ ++ --without-png \ ++ --without-z \ ++ ac_cv_path_nc5config=$(PWD)/files/ncurses5-config ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ static install install-static ++endef ++ ++define Package/libslang2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libslang.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/slang/ $(1)/usr/lib/ ++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/libslang.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/slsh/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/slsh $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/slsh/ $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,libslang2)) ++$(eval $(call BuildPackage,slsh)) +diff --git a/feeds/packages/libs/slang2/Makefile b/feeds/packages/libs/slang2/Makefile +new file mode 100644 +index 0000000..594bc82 +--- /dev/null ++++ b/feeds/packages/libs/slang2/Makefile +@@ -0,0 +1,97 @@ ++# ++# Copyright (C) 2006-2011 Openwrt.org ++# Copyright (C) 2011 SMBPhone Inc. ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=slang ++PKG_VERSION:=2.2.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://space.mit.edu/pub/davis/slang/v2.2 \ ++ ftp://space.mit.edu/pub/davis/slang/v2.2/OLD ++PKG_MD5SUM:=7fcfd447e378f07dd0c0bae671fe6487 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libslang2 ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=S-Lang v2.2 ++ URL:=http://www.jedsoft.org/slang ++ DEPENDS:= +terminfo ++endef ++ ++define Package/libslang2/description ++ Multi-platform programmer's library providing facilities for interactive ++ applications. Includes such things as display/screen management, ++ keyboard input, keymaps, etc. Includes the embeddable S-Lang interpreter. ++endef ++ ++define Package/slsh ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=S-Lang Shell ++ URL:=http://www.jedsoft.org/slang/slsh.html ++ DEPENDS:= +libslang2 ++endef ++ ++define Package/libslang2/description ++ This is a shell which is mostly just a wrapper around the S-Lang Interpreter, ++ which is part of the S-Lang Library. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++TARGET_LDFLAGS += -L../src/${ARCH}elfobjs ++ ++CONFIGURE_ARGS += \ ++ --enable-largefile \ ++ --disable-warnings \ ++ --with-terminfo=default \ ++ --with-readline=slang \ ++ --without-x \ ++ --without-pcre \ ++ --without-onig \ ++ --without-png \ ++ --without-z \ ++ ac_cv_path_nc5config=$(PWD)/files/ncurses5-config ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ static install install-static ++endef ++ ++define Package/libslang2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libslang.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/slang/ $(1)/usr/lib/ ++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/libslang.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/slsh/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/slsh $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/slsh/ $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,libslang2)) ++$(eval $(call BuildPackage,slsh)) +diff --git a/feeds/packages/libs/slang2/files/.svn/entries b/feeds/packages/libs/slang2/files/.svn/entries +new file mode 100644 +index 0000000..bf80c65 +--- /dev/null ++++ b/feeds/packages/libs/slang2/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/slang2/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-18T23:37:40.493467Z ++26233 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ncurses5-config ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++15bdba481f6fc3609ea450a64324aa05 ++2011-03-18T23:37:40.493467Z ++26233 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++77 ++ +diff --git a/feeds/packages/libs/slang2/files/.svn/prop-base/ncurses5-config.svn-base b/feeds/packages/libs/slang2/files/.svn/prop-base/ncurses5-config.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/libs/slang2/files/.svn/prop-base/ncurses5-config.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/libs/slang2/files/.svn/text-base/ncurses5-config.svn-base b/feeds/packages/libs/slang2/files/.svn/text-base/ncurses5-config.svn-base +new file mode 100644 +index 0000000..210d43f +--- /dev/null ++++ b/feeds/packages/libs/slang2/files/.svn/text-base/ncurses5-config.svn-base +@@ -0,0 +1,6 @@ ++#!/bin/sh ++ ++if [ "$1" == "--terminfo" ]; then ++ echo "/usr/share/terminfo" ++fi ++ +diff --git a/feeds/packages/libs/slang2/files/ncurses5-config b/feeds/packages/libs/slang2/files/ncurses5-config +new file mode 100755 +index 0000000..210d43f +--- /dev/null ++++ b/feeds/packages/libs/slang2/files/ncurses5-config +@@ -0,0 +1,6 @@ ++#!/bin/sh ++ ++if [ "$1" == "--terminfo" ]; then ++ echo "/usr/share/terminfo" ++fi ++ +diff --git a/feeds/packages/libs/spandsp/.svn/entries b/feeds/packages/libs/spandsp/.svn/entries +new file mode 100644 +index 0000000..5dbdf88 +--- /dev/null ++++ b/feeds/packages/libs/spandsp/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/spandsp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T02:38:54.159341Z ++29792 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f7bafe5f1448b11a6f99d89d605d1d57 ++2012-01-19T02:38:54.159341Z ++29792 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1034 ++ +diff --git a/feeds/packages/libs/spandsp/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/spandsp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e2054a0 +--- /dev/null ++++ b/feeds/packages/libs/spandsp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=spandsp ++PKG_VERSION:=0.0.6 ++PKG_VERSION_SUFFIX:=pre17 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VERSION_SUFFIX).tgz ++PKG_SOURCE_URL:=http://www.soft-switch.org/downloads/spandsp/ ++PKG_MD5SUM:=cc860f77270cf3b881f8ccd42d2d0238 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libspandsp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=spandsp library ++ DEPENDS:=+libtiff ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{lib,include} ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp* $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ ++endef ++ ++define Package/libspandsp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp*so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libspandsp)) +diff --git a/feeds/packages/libs/spandsp/Makefile b/feeds/packages/libs/spandsp/Makefile +new file mode 100644 +index 0000000..e2054a0 +--- /dev/null ++++ b/feeds/packages/libs/spandsp/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=spandsp ++PKG_VERSION:=0.0.6 ++PKG_VERSION_SUFFIX:=pre17 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VERSION_SUFFIX).tgz ++PKG_SOURCE_URL:=http://www.soft-switch.org/downloads/spandsp/ ++PKG_MD5SUM:=cc860f77270cf3b881f8ccd42d2d0238 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libspandsp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=spandsp library ++ DEPENDS:=+libtiff ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/{lib,include} ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp* $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ ++endef ++ ++define Package/libspandsp/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspandsp*so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libspandsp)) +diff --git a/feeds/packages/libs/spandsp/patches/.svn/entries b/feeds/packages/libs/spandsp/patches/.svn/entries +new file mode 100644 +index 0000000..0fde032 +--- /dev/null ++++ b/feeds/packages/libs/spandsp/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/spandsp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T02:38:54.159341Z ++29792 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5c9f6e5d758791e961bf249518fd7414 ++2012-01-19T02:38:54.159341Z ++29792 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++549 ++ +diff --git a/feeds/packages/libs/spandsp/patches/.svn/text-base/100-compile-fixes.patch.svn-base b/feeds/packages/libs/spandsp/patches/.svn/text-base/100-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..afe9e33 +--- /dev/null ++++ b/feeds/packages/libs/spandsp/patches/.svn/text-base/100-compile-fixes.patch.svn-base +@@ -0,0 +1,23 @@ ++--- a/src/spandsp/fast_convert.h +++++ b/src/spandsp/fast_convert.h ++@@ -197,7 +197,7 @@ extern "C" ++ { ++ return (long int) (x); ++ } ++-#elif defined(__ppc__) || defined(__powerpc__) +++#elif defined(THISISNOTDEFINEDYADDAYADDA) ++ static __inline__ long int lfastrint(register double x) ++ { ++ int res[2]; ++--- a/configure.ac +++++ b/configure.ac ++@@ -152,9 +152,7 @@ AC_ARG_ENABLE(builtin_tiff, ++ ++ AC_FUNC_ERROR_AT_LINE ++ AC_FUNC_VPRINTF ++-AC_FUNC_MALLOC ++ AC_FUNC_MEMCMP ++-AC_FUNC_REALLOC ++ AC_FUNC_SELECT_ARGTYPES ++ ++ AX_C99_FUNC_LRINT +diff --git a/feeds/packages/libs/spandsp/patches/100-compile-fixes.patch b/feeds/packages/libs/spandsp/patches/100-compile-fixes.patch +new file mode 100644 +index 0000000..afe9e33 +--- /dev/null ++++ b/feeds/packages/libs/spandsp/patches/100-compile-fixes.patch +@@ -0,0 +1,23 @@ ++--- a/src/spandsp/fast_convert.h +++++ b/src/spandsp/fast_convert.h ++@@ -197,7 +197,7 @@ extern "C" ++ { ++ return (long int) (x); ++ } ++-#elif defined(__ppc__) || defined(__powerpc__) +++#elif defined(THISISNOTDEFINEDYADDAYADDA) ++ static __inline__ long int lfastrint(register double x) ++ { ++ int res[2]; ++--- a/configure.ac +++++ b/configure.ac ++@@ -152,9 +152,7 @@ AC_ARG_ENABLE(builtin_tiff, ++ ++ AC_FUNC_ERROR_AT_LINE ++ AC_FUNC_VPRINTF ++-AC_FUNC_MALLOC ++ AC_FUNC_MEMCMP ++-AC_FUNC_REALLOC ++ AC_FUNC_SELECT_ARGTYPES ++ ++ AX_C99_FUNC_LRINT +diff --git a/feeds/packages/libs/speex/.svn/entries b/feeds/packages/libs/speex/.svn/entries +new file mode 100644 +index 0000000..e4bf1f9 +--- /dev/null ++++ b/feeds/packages/libs/speex/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/speex ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++b002d53c5cb215860c85633ba082d8e9 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3109 ++ +diff --git a/feeds/packages/libs/speex/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/speex/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/speex/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/speex/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/speex/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1441049 +--- /dev/null ++++ b/feeds/packages/libs/speex/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,104 @@ ++# ++# 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/ ++endef ++ ++define Package/libspeexdsp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Open source speech compression codec library output to DSP ++ URL:=http://www.speex.org/ ++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/feeds/packages/libs/speex/Makefile b/feeds/packages/libs/speex/Makefile +new file mode 100644 +index 0000000..1441049 +--- /dev/null ++++ b/feeds/packages/libs/speex/Makefile +@@ -0,0 +1,104 @@ ++# ++# 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/ ++endef ++ ++define Package/libspeexdsp ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Open source speech compression codec library output to DSP ++ URL:=http://www.speex.org/ ++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/feeds/packages/libs/sqlite2/.svn/entries b/feeds/packages/libs/sqlite2/.svn/entries +new file mode 100644 +index 0000000..d18bf30 +--- /dev/null ++++ b/feeds/packages/libs/sqlite2/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/sqlite2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++87e74bea2070162c23df8fb1be48607a ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2688 ++ +diff --git a/feeds/packages/libs/sqlite2/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/sqlite2/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/sqlite2/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/sqlite2/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/sqlite2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..68306d6 +--- /dev/null ++++ b/feeds/packages/libs/sqlite2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,101 @@ ++# ++# 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:=sqlite2 ++PKG_VERSION:=2.8.17 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=sqlite-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sqlite.org/ ++PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION) ++ ++PKG_BUILD_DEPENDS:=libncurses libreadline ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/sqlite2/Default ++ SUBMENU:=database ++ TITLE:=SQLite (v2.x) database engine ++ URL:=http://www.sqlite.org/ ++endef ++ ++define Package/libsqlite2 ++ $(call Package/sqlite2/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++endef ++ ++define Package/libsqlite2/description ++ SQLite is a small C library that implements a self-contained, embeddable, ++ zero-configuration SQL database engine. ++ This package contains the SQLite (v2.x) shared library, used by other programs. ++endef ++ ++define Package/sqlite2-cli ++ $(call Package/sqlite2/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libsqlite2 +libncurses +libreadline ++ TITLE+= (cli) ++ SUBMENU:=database ++endef ++ ++define Package/sqlite2-cli/description ++ SQLite is a small C library that implements a self-contained, embeddable, ++ zero-configuration SQL database engine. ++ This package contains a terminal-based front-end to the SQLite (v2.x) library ++ that can evaluate queries interactively and display the results in ++ multiple formats. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ , \ ++ 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" \ ++ config_TARGET_TCL_INC="-DNO_TCL=1" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libsqlite2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/ ++endef ++ ++define Package/sqlite2-cli/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libsqlite2)) ++$(eval $(call BuildPackage,sqlite2-cli)) +diff --git a/feeds/packages/libs/sqlite2/Makefile b/feeds/packages/libs/sqlite2/Makefile +new file mode 100644 +index 0000000..68306d6 +--- /dev/null ++++ b/feeds/packages/libs/sqlite2/Makefile +@@ -0,0 +1,101 @@ ++# ++# 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:=sqlite2 ++PKG_VERSION:=2.8.17 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=sqlite-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sqlite.org/ ++PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION) ++ ++PKG_BUILD_DEPENDS:=libncurses libreadline ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Package/sqlite2/Default ++ SUBMENU:=database ++ TITLE:=SQLite (v2.x) database engine ++ URL:=http://www.sqlite.org/ ++endef ++ ++define Package/libsqlite2 ++ $(call Package/sqlite2/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++endef ++ ++define Package/libsqlite2/description ++ SQLite is a small C library that implements a self-contained, embeddable, ++ zero-configuration SQL database engine. ++ This package contains the SQLite (v2.x) shared library, used by other programs. ++endef ++ ++define Package/sqlite2-cli ++ $(call Package/sqlite2/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libsqlite2 +libncurses +libreadline ++ TITLE+= (cli) ++ SUBMENU:=database ++endef ++ ++define Package/sqlite2-cli/description ++ SQLite is a small C library that implements a self-contained, embeddable, ++ zero-configuration SQL database engine. ++ This package contains a terminal-based front-end to the SQLite (v2.x) library ++ that can evaluate queries interactively and display the results in ++ multiple formats. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --enable-static \ ++ , \ ++ 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" \ ++ config_TARGET_TCL_INC="-DNO_TCL=1" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/libsqlite2/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/ ++endef ++ ++define Package/sqlite2-cli/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,libsqlite2)) ++$(eval $(call BuildPackage,sqlite2-cli)) +diff --git a/feeds/packages/libs/sqlite3/.svn/entries b/feeds/packages/libs/sqlite3/.svn/entries +new file mode 100644 +index 0000000..80043c9 +--- /dev/null ++++ b/feeds/packages/libs/sqlite3/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/sqlite3 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++16024716fad22de3c3a2e17313774098 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2748 ++ +diff --git a/feeds/packages/libs/sqlite3/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/sqlite3/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/sqlite3/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/sqlite3/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/sqlite3/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2c41eeb +--- /dev/null ++++ b/feeds/packages/libs/sqlite3/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,105 @@ ++# ++# 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:=sqlite ++PKG_VERSION:=3071201 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sqlite.org ++PKG_MD5SUM:=eb7bbd258913518ad30971ea7ecb0ca9 ++ ++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/ ++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/feeds/packages/libs/sqlite3/Makefile b/feeds/packages/libs/sqlite3/Makefile +new file mode 100644 +index 0000000..2c41eeb +--- /dev/null ++++ b/feeds/packages/libs/sqlite3/Makefile +@@ -0,0 +1,105 @@ ++# ++# 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:=sqlite ++PKG_VERSION:=3071201 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sqlite.org ++PKG_MD5SUM:=eb7bbd258913518ad30971ea7ecb0ca9 ++ ++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/ ++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/feeds/packages/libs/st2205tool/.svn/entries b/feeds/packages/libs/st2205tool/.svn/entries +new file mode 100644 +index 0000000..89160dd +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/st2205tool ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-09T15:12:08.423945Z ++23360 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f1ec607a75a6e41d1f2cf6c24e5c0891 ++2010-10-09T15:12:08.423945Z ++23360 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1561 ++ +diff --git a/feeds/packages/libs/st2205tool/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/st2205tool/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..81e120f +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2008-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:=st2205tool ++PKG_VERSION:=1.4.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=st2205tool-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ ++PKG_MD5SUM:=827e3b719ebaf6bc537f2ce0ece3fccb ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/st2205tool ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=ST220xu powered photo-frames library ++ DEPENDS:=+libgd ++ URL:=http://picframe.spritesserver.nl/wiki/ ++endef ++ ++define Package/st2205tool/description ++ Library for hacked photo-frames based on st220xu chipset. You may use those photo-frames with ++ mplayer or LCD4Linux ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/libst2205/" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ SETPICLIBS="$(TARGET_LDFLAGS) -lgd -ljpeg -lpng -lz -L../libst2205 -lst2205" \ ++ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/libst2205/st2205.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libst2205/libst2205.{a,so*} $(1)/usr/lib/ ++endef ++ ++ ++define Package/st2205tool/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/setpic/setpic $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libst2205/libst2205.so $(1)/usr/lib/libst2205.so.1 ++endef ++ ++$(eval $(call BuildPackage,st2205tool)) +diff --git a/feeds/packages/libs/st2205tool/Makefile b/feeds/packages/libs/st2205tool/Makefile +new file mode 100644 +index 0000000..81e120f +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/Makefile +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2008-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:=st2205tool ++PKG_VERSION:=1.4.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=st2205tool-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ ++PKG_MD5SUM:=827e3b719ebaf6bc537f2ce0ece3fccb ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/st2205tool ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=ST220xu powered photo-frames library ++ DEPENDS:=+libgd ++ URL:=http://picframe.spritesserver.nl/wiki/ ++endef ++ ++define Package/st2205tool/description ++ Library for hacked photo-frames based on st220xu chipset. You may use those photo-frames with ++ mplayer or LCD4Linux ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/libst2205/" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ SETPICLIBS="$(TARGET_LDFLAGS) -lgd -ljpeg -lpng -lz -L../libst2205 -lst2205" \ ++ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/libst2205/st2205.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libst2205/libst2205.{a,so*} $(1)/usr/lib/ ++endef ++ ++ ++define Package/st2205tool/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/setpic/setpic $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libst2205/libst2205.so $(1)/usr/lib/libst2205.so.1 ++endef ++ ++$(eval $(call BuildPackage,st2205tool)) +diff --git a/feeds/packages/libs/st2205tool/patches/.svn/entries b/feeds/packages/libs/st2205tool/patches/.svn/entries +new file mode 100644 +index 0000000..996ef42 +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/st2205tool/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-09T15:12:08.423945Z ++23360 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++120-setpic-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++3ba6260856fb0c794f80ba54b08c8a56 ++2008-05-08T01:17:42.560346Z ++11068 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++477 ++ ++100-base-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++f58b2bc22d7e8dc77329c7da74999ac4 ++2010-10-09T15:12:08.423945Z ++23360 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1038 ++ ++110-libst-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++8213d2bdd5702663064929dfc5c52034 ++2009-08-21T09:04:43.405265Z ++17343 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++937 ++ +diff --git a/feeds/packages/libs/st2205tool/patches/.svn/text-base/100-base-makefile.patch.svn-base b/feeds/packages/libs/st2205tool/patches/.svn/text-base/100-base-makefile.patch.svn-base +new file mode 100644 +index 0000000..854d040 +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/.svn/text-base/100-base-makefile.patch.svn-base +@@ -0,0 +1,45 @@ ++--- ++ Makefile | 20 ++++++++++---------- ++ 1 file changed, 10 insertions(+), 10 deletions(-) ++ ++--- st2205tool.orig/Makefile +++++ st2205tool/Makefile ++@@ -6,27 +6,27 @@ LIBS = ++ all: libst2205/libst2205.so setpic/setpic phack splice bgrep ++ ++ install: all ++- make -C libst2205 install +++ $(MAKE) -C libst2205 install ++ ++ libst2205/libst2205.so: ++- make -C libst2205 +++ $(MAKE) -C libst2205 ++ ++-setpic/setpic: ++- make -C setpic +++setpic/setpic: libst2205/libst2205.so +++ $(MAKE) -C setpic ++ ++ phack: $(OBJ) $(SRC) ++- gcc -o $(@) $(OBJ) $(LIBS) $(FLAGS) +++ $(GCC) -o $(@) $(OBJ) $(LIBS) $(FLAGS) ++ ++ splice: splice.o splice.c ++- gcc -o splice splice.o +++ $(GCC) -o splice splice.o ++ ++ bgrep: bgrep.o bgrep.c ++- gcc -o bgrep bgrep.o +++ $(GCC) -o bgrep bgrep.o ++ ++ clean: ++- make -C libst2205 clean ++- make -C setpic clean +++ $(MAKE) -C libst2205 clean +++ $(MAKE) -C setpic clean ++ rm -f $(OBJ) phack splice splice.o bgrep bgrep.o ++ ++ distclean: clean ++- rm -f fwimage.bak memimage.bak fwimage.bin ++\ No newline at end of file +++ rm -f fwimage.bak memimage.bak fwimage.bin +diff --git a/feeds/packages/libs/st2205tool/patches/.svn/text-base/110-libst-makefile.patch.svn-base b/feeds/packages/libs/st2205tool/patches/.svn/text-base/110-libst-makefile.patch.svn-base +new file mode 100644 +index 0000000..96b95ae +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/.svn/text-base/110-libst-makefile.patch.svn-base +@@ -0,0 +1,25 @@ ++--- st2205tool/libst2205/Makefile.orig 2009-08-19 17:05:54.000000000 +0200 +++++ st2205tool/libst2205/Makefile 2009-08-19 17:06:27.000000000 +0200 ++@@ -7,15 +7,15 @@ ++ all: libst2205.so ++ ++ libst2205.so: $(OBJ) $(SRC) $(HEADERS) ++- ar -rv libst2205.a $(OBJ) ++- gcc -shared -Wl,-soname,libst2205.so.1 -o libst2205.so $(OBJ) $(LIBS) +++ $(AR) -rv libst2205.a $(OBJ) +++ $(GCC) -shared -Wl,-soname,libst2205.so.1 -o libst2205.so $(OBJ) $(LIBS) ++ ++ clean: ++ rm -f $(OBJ) test *.a *.so ++ ++ install: libst2205.so ++- test -z "/usr/local/lib" || /bin/mkdir -p "/usr/local/lib" ++- test -z "/usr/local/include" || /bin/mkdir -p "/usr/local/include" ++- install libst2205.so /usr/local/lib ++- install st2205.h /usr/local/include ++- ldconfig +++# test -z "/usr/local/lib" || /bin/mkdir -p "/usr/local/lib" +++# test -z "/usr/local/include" || /bin/mkdir -p "/usr/local/include" +++# install libst2205.so /usr/local/lib +++# install st2205.h /usr/local/include +++# ldconfig +diff --git a/feeds/packages/libs/st2205tool/patches/.svn/text-base/120-setpic-makefile.patch.svn-base b/feeds/packages/libs/st2205tool/patches/.svn/text-base/120-setpic-makefile.patch.svn-base +new file mode 100644 +index 0000000..a3a0121 +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/.svn/text-base/120-setpic-makefile.patch.svn-base +@@ -0,0 +1,18 @@ ++--- st2205tool/setpic/Makefile.orig 2008-01-20 19:50:11.000000000 +0100 +++++ st2205tool/setpic/Makefile 2008-04-22 16:06:40.000000000 +0200 ++@@ -1,12 +1,12 @@ ++ SRC = main.c ++ OBJ = main.o ++-CFLAGS = -g -Wall -I../libst2205 ++-LIBS = -lgd -L../libst2205 -lst2205 +++#CFLAGS = -g -Wall -I./../libst2205 +++#LIBS = -lgd -lst2205 ++ ++ all: setpic ++ ++ setpic: $(OBJ) $(SRC) ++- gcc -o $(@) $(OBJ) $(LIBS) $(FLAGS) +++ $(GCC) -o $(@) $(OBJ) $(SETPICLIBS) $(CFLAGS) ++ ++ clean: ++ rm -f $(OBJ) setpic +diff --git a/feeds/packages/libs/st2205tool/patches/100-base-makefile.patch b/feeds/packages/libs/st2205tool/patches/100-base-makefile.patch +new file mode 100644 +index 0000000..854d040 +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/100-base-makefile.patch +@@ -0,0 +1,45 @@ ++--- ++ Makefile | 20 ++++++++++---------- ++ 1 file changed, 10 insertions(+), 10 deletions(-) ++ ++--- st2205tool.orig/Makefile +++++ st2205tool/Makefile ++@@ -6,27 +6,27 @@ LIBS = ++ all: libst2205/libst2205.so setpic/setpic phack splice bgrep ++ ++ install: all ++- make -C libst2205 install +++ $(MAKE) -C libst2205 install ++ ++ libst2205/libst2205.so: ++- make -C libst2205 +++ $(MAKE) -C libst2205 ++ ++-setpic/setpic: ++- make -C setpic +++setpic/setpic: libst2205/libst2205.so +++ $(MAKE) -C setpic ++ ++ phack: $(OBJ) $(SRC) ++- gcc -o $(@) $(OBJ) $(LIBS) $(FLAGS) +++ $(GCC) -o $(@) $(OBJ) $(LIBS) $(FLAGS) ++ ++ splice: splice.o splice.c ++- gcc -o splice splice.o +++ $(GCC) -o splice splice.o ++ ++ bgrep: bgrep.o bgrep.c ++- gcc -o bgrep bgrep.o +++ $(GCC) -o bgrep bgrep.o ++ ++ clean: ++- make -C libst2205 clean ++- make -C setpic clean +++ $(MAKE) -C libst2205 clean +++ $(MAKE) -C setpic clean ++ rm -f $(OBJ) phack splice splice.o bgrep bgrep.o ++ ++ distclean: clean ++- rm -f fwimage.bak memimage.bak fwimage.bin ++\ No newline at end of file +++ rm -f fwimage.bak memimage.bak fwimage.bin +diff --git a/feeds/packages/libs/st2205tool/patches/110-libst-makefile.patch b/feeds/packages/libs/st2205tool/patches/110-libst-makefile.patch +new file mode 100644 +index 0000000..96b95ae +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/110-libst-makefile.patch +@@ -0,0 +1,25 @@ ++--- st2205tool/libst2205/Makefile.orig 2009-08-19 17:05:54.000000000 +0200 +++++ st2205tool/libst2205/Makefile 2009-08-19 17:06:27.000000000 +0200 ++@@ -7,15 +7,15 @@ ++ all: libst2205.so ++ ++ libst2205.so: $(OBJ) $(SRC) $(HEADERS) ++- ar -rv libst2205.a $(OBJ) ++- gcc -shared -Wl,-soname,libst2205.so.1 -o libst2205.so $(OBJ) $(LIBS) +++ $(AR) -rv libst2205.a $(OBJ) +++ $(GCC) -shared -Wl,-soname,libst2205.so.1 -o libst2205.so $(OBJ) $(LIBS) ++ ++ clean: ++ rm -f $(OBJ) test *.a *.so ++ ++ install: libst2205.so ++- test -z "/usr/local/lib" || /bin/mkdir -p "/usr/local/lib" ++- test -z "/usr/local/include" || /bin/mkdir -p "/usr/local/include" ++- install libst2205.so /usr/local/lib ++- install st2205.h /usr/local/include ++- ldconfig +++# test -z "/usr/local/lib" || /bin/mkdir -p "/usr/local/lib" +++# test -z "/usr/local/include" || /bin/mkdir -p "/usr/local/include" +++# install libst2205.so /usr/local/lib +++# install st2205.h /usr/local/include +++# ldconfig +diff --git a/feeds/packages/libs/st2205tool/patches/120-setpic-makefile.patch b/feeds/packages/libs/st2205tool/patches/120-setpic-makefile.patch +new file mode 100644 +index 0000000..a3a0121 +--- /dev/null ++++ b/feeds/packages/libs/st2205tool/patches/120-setpic-makefile.patch +@@ -0,0 +1,18 @@ ++--- st2205tool/setpic/Makefile.orig 2008-01-20 19:50:11.000000000 +0100 +++++ st2205tool/setpic/Makefile 2008-04-22 16:06:40.000000000 +0200 ++@@ -1,12 +1,12 @@ ++ SRC = main.c ++ OBJ = main.o ++-CFLAGS = -g -Wall -I../libst2205 ++-LIBS = -lgd -L../libst2205 -lst2205 +++#CFLAGS = -g -Wall -I./../libst2205 +++#LIBS = -lgd -lst2205 ++ ++ all: setpic ++ ++ setpic: $(OBJ) $(SRC) ++- gcc -o $(@) $(OBJ) $(LIBS) $(FLAGS) +++ $(GCC) -o $(@) $(OBJ) $(SETPICLIBS) $(CFLAGS) ++ ++ clean: ++ rm -f $(OBJ) setpic +diff --git a/feeds/packages/libs/taglib/.svn/entries b/feeds/packages/libs/taglib/.svn/entries +new file mode 100644 +index 0000000..102faa9 +--- /dev/null ++++ b/feeds/packages/libs/taglib/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/taglib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-04T17:01:56.990127Z ++32974 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++05f8f7e9edc6fbca34cae14a25183b58 ++2012-08-04T17:01:56.990127Z ++32974 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1688 ++ +diff --git a/feeds/packages/libs/taglib/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/taglib/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ef4101 +--- /dev/null ++++ b/feeds/packages/libs/taglib/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,72 @@ ++# ++# 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:=taglib ++PKG_VERSION:=1.6.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://developer.kde.org/~wheeler/files/src/ ++PKG_MD5SUM:=ddf02f4e1d2dc30f76734df806e613eb ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++PKG_INSTALL:=1 ++ ++define Package/taglib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:= $(CXX_DEPENDS) +zlib @!TARGET_avr32 ++ TITLE:=Audio output library ++ URL:=http://developer.kde.org/~wheeler/taglib.html ++endef ++ ++define Package/taglibc ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+taglib ++ TITLE:=Audio output library ++ URL:=http://developer.kde.org/~wheeler/taglib.html ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/taglib-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/taglib-config ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libtag{,_c}.so* \ ++ $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/include/taglib ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/taglib/* \ ++ $(1)/usr/include/taglib/ ++endef ++ ++define Package/taglib/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag.so.* $(1)/usr/lib/ ++endef ++ ++define Package/taglibc/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag_c.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,taglib)) ++$(eval $(call BuildPackage,taglibc)) +diff --git a/feeds/packages/libs/taglib/Makefile b/feeds/packages/libs/taglib/Makefile +new file mode 100644 +index 0000000..8ef4101 +--- /dev/null ++++ b/feeds/packages/libs/taglib/Makefile +@@ -0,0 +1,72 @@ ++# ++# 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:=taglib ++PKG_VERSION:=1.6.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://developer.kde.org/~wheeler/files/src/ ++PKG_MD5SUM:=ddf02f4e1d2dc30f76734df806e613eb ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++PKG_INSTALL:=1 ++ ++define Package/taglib ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:= $(CXX_DEPENDS) +zlib @!TARGET_avr32 ++ TITLE:=Audio output library ++ URL:=http://developer.kde.org/~wheeler/taglib.html ++endef ++ ++define Package/taglibc ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+taglib ++ TITLE:=Audio output library ++ URL:=http://developer.kde.org/~wheeler/taglib.html ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/taglib-config \ ++ $(2)/bin/ ++ $(SED) \ ++ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ ++ $(2)/bin/taglib-config ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libtag{,_c}.so* \ ++ $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/include/taglib ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/taglib/* \ ++ $(1)/usr/include/taglib/ ++endef ++ ++define Package/taglib/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag.so.* $(1)/usr/lib/ ++endef ++ ++define Package/taglibc/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag_c.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,taglib)) ++$(eval $(call BuildPackage,taglibc)) +diff --git a/feeds/packages/libs/taglib/patches/.svn/entries b/feeds/packages/libs/taglib/patches/.svn/entries +new file mode 100644 +index 0000000..296a8b5 +--- /dev/null ++++ b/feeds/packages/libs/taglib/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/taglib/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-03T14:54:15.122095Z ++25853 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-uclibc++-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++2f9a593e2e9af0a4d1df45f4b32dc72d ++2011-03-03T14:54:15.122095Z ++25853 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1316 ++ +diff --git a/feeds/packages/libs/taglib/patches/.svn/text-base/100-uclibc++-compat.patch.svn-base b/feeds/packages/libs/taglib/patches/.svn/text-base/100-uclibc++-compat.patch.svn-base +new file mode 100644 +index 0000000..69a175e +--- /dev/null ++++ b/feeds/packages/libs/taglib/patches/.svn/text-base/100-uclibc++-compat.patch.svn-base +@@ -0,0 +1,49 @@ ++--- a/taglib/toolkit/tlist.h +++++ b/taglib/toolkit/tlist.h ++@@ -226,6 +226,7 @@ namespace TagLib { ++ * the same. ++ */ ++ bool operator==(const List &l) const; +++ bool operator!=(const List &l) const; ++ ++ protected: ++ /* ++--- a/taglib/toolkit/tlist.tcc +++++ b/taglib/toolkit/tlist.tcc ++@@ -300,6 +300,12 @@ bool List::operator==(const List & ++ return d->list == l.d->list; ++ } ++ +++template +++bool List::operator!=(const List &l) const +++{ +++ return !(operator==(l)); +++} +++ ++ //////////////////////////////////////////////////////////////////////////////// ++ // protected members ++ //////////////////////////////////////////////////////////////////////////////// ++--- a/taglib/toolkit/tstring.cpp +++++ b/taglib/toolkit/tstring.cpp ++@@ -546,6 +546,11 @@ bool String::operator==(const String &s) ++ return d == s.d || d->data == s.d->data; ++ } ++ +++bool String::operator!=(const String &s) const +++{ +++ return !(operator==(s)); +++} +++ ++ String &String::operator+=(const String &s) ++ { ++ detach(); ++--- a/taglib/toolkit/tstring.h +++++ b/taglib/toolkit/tstring.h ++@@ -342,6 +342,7 @@ namespace TagLib { ++ * returns true if the strings match. ++ */ ++ bool operator==(const String &s) const; +++ bool operator!=(const String &s) const; ++ ++ /*! ++ * Appends \a s to the end of the String. +diff --git a/feeds/packages/libs/taglib/patches/100-uclibc++-compat.patch b/feeds/packages/libs/taglib/patches/100-uclibc++-compat.patch +new file mode 100644 +index 0000000..69a175e +--- /dev/null ++++ b/feeds/packages/libs/taglib/patches/100-uclibc++-compat.patch +@@ -0,0 +1,49 @@ ++--- a/taglib/toolkit/tlist.h +++++ b/taglib/toolkit/tlist.h ++@@ -226,6 +226,7 @@ namespace TagLib { ++ * the same. ++ */ ++ bool operator==(const List &l) const; +++ bool operator!=(const List &l) const; ++ ++ protected: ++ /* ++--- a/taglib/toolkit/tlist.tcc +++++ b/taglib/toolkit/tlist.tcc ++@@ -300,6 +300,12 @@ bool List::operator==(const List & ++ return d->list == l.d->list; ++ } ++ +++template +++bool List::operator!=(const List &l) const +++{ +++ return !(operator==(l)); +++} +++ ++ //////////////////////////////////////////////////////////////////////////////// ++ // protected members ++ //////////////////////////////////////////////////////////////////////////////// ++--- a/taglib/toolkit/tstring.cpp +++++ b/taglib/toolkit/tstring.cpp ++@@ -546,6 +546,11 @@ bool String::operator==(const String &s) ++ return d == s.d || d->data == s.d->data; ++ } ++ +++bool String::operator!=(const String &s) const +++{ +++ return !(operator==(s)); +++} +++ ++ String &String::operator+=(const String &s) ++ { ++ detach(); ++--- a/taglib/toolkit/tstring.h +++++ b/taglib/toolkit/tstring.h ++@@ -342,6 +342,7 @@ namespace TagLib { ++ * returns true if the strings match. ++ */ ++ bool operator==(const String &s) const; +++ bool operator!=(const String &s) const; ++ ++ /*! ++ * Appends \a s to the end of the String. +diff --git a/feeds/packages/libs/tcp_wrappers/.svn/entries b/feeds/packages/libs/tcp_wrappers/.svn/entries +new file mode 100644 +index 0000000..e0ec062 +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/tcp_wrappers ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++adb0ae9b9f1d767e120d662fa733f5af ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1566 ++ +diff --git a/feeds/packages/libs/tcp_wrappers/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/tcp_wrappers/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/tcp_wrappers/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/tcp_wrappers/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7b6b22c +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# 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 ++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/feeds/packages/libs/tcp_wrappers/Makefile b/feeds/packages/libs/tcp_wrappers/Makefile +new file mode 100644 +index 0000000..7b6b22c +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/Makefile +@@ -0,0 +1,64 @@ ++# ++# 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 ++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/feeds/packages/libs/tcp_wrappers/patches/.svn/entries b/feeds/packages/libs/tcp_wrappers/patches/.svn/entries +new file mode 100644 +index 0000000..9272c1f +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/tcp_wrappers/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-15T09:37:20.925484Z ++26899 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-debian_subset.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++8aaeebe0239bbcd89b8c966e60a54a75 ++2011-05-15T09:37:20.925484Z ++26899 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++33888 ++ ++003-scaffold_malloc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d35a5db64991226c745ca18a457f885b ++2011-05-15T09:37:20.925484Z ++26899 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++346 ++ ++002-opt_cflags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++81a2f5fde3546610964fc3ab4a25115d ++2011-05-15T09:37:20.925484Z ++26899 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++488 ++ ++004-ipv4_prefix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++841aef9c92a0b5009fbc9d2bf37ef58e ++2011-05-15T09:37:20.925484Z ++26899 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2362 ++ +diff --git a/feeds/packages/libs/tcp_wrappers/patches/.svn/prop-base/001-debian_subset.patch.svn-base b/feeds/packages/libs/tcp_wrappers/patches/.svn/prop-base/001-debian_subset.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/prop-base/001-debian_subset.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/tcp_wrappers/patches/.svn/prop-base/002-opt_cflags.patch.svn-base b/feeds/packages/libs/tcp_wrappers/patches/.svn/prop-base/002-opt_cflags.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/prop-base/002-opt_cflags.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/001-debian_subset.patch.svn-base b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/001-debian_subset.patch.svn-base +new file mode 100644 +index 0000000..0b3ad2c +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/001-debian_subset.patch.svn-base +@@ -0,0 +1,936 @@ ++--- 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 +++#include +++ +++__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 % 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 % 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 % 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 % ++ 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 ++ ++ 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 ++ #include ++ #include +++#include ++ ++ 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 % 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 ++ ++ 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 +++ */ +++ +++#ifdef HAVE_WEAKSYMS +++#include +++int deny_severity = LOG_WARNING; +++int allow_severity = SEVERITY; +++#endif +diff --git a/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/002-opt_cflags.patch.svn-base b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/002-opt_cflags.patch.svn-base +new file mode 100644 +index 0000000..1f38eb3 +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/002-opt_cflags.patch.svn-base +@@ -0,0 +1,12 @@ ++--- 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/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/003-scaffold_malloc.patch.svn-base b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/003-scaffold_malloc.patch.svn-base +new file mode 100644 +index 0000000..ecda5ae +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/003-scaffold_malloc.patch.svn-base +@@ -0,0 +1,17 @@ ++--- a/scaffold.c +++++ b/scaffold.c ++@@ -20,13 +20,12 @@ static char sccs_id[] = "@(#) scaffold.c ++ #include ++ #include ++ #include +++#include ++ ++ #ifndef INADDR_NONE ++ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ++ #endif ++ ++-extern char *malloc(); ++- ++ /* Application-specific. */ ++ ++ #include "tcpd.h" +diff --git a/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/004-ipv4_prefix.patch.svn-base b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/004-ipv4_prefix.patch.svn-base +new file mode 100644 +index 0000000..29c9cef +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/.svn/text-base/004-ipv4_prefix.patch.svn-base +@@ -0,0 +1,72 @@ ++--- 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 ++ #include ++ #include +++#include +++#include ++ ++ #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/feeds/packages/libs/tcp_wrappers/patches/001-debian_subset.patch b/feeds/packages/libs/tcp_wrappers/patches/001-debian_subset.patch +new file mode 100644 +index 0000000..0b3ad2c +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/001-debian_subset.patch +@@ -0,0 +1,936 @@ ++--- 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 +++#include +++ +++__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 % 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 % 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 % 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 % ++ 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 ++ ++ 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 ++ #include ++ #include +++#include ++ ++ 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 % 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 ++ ++ 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 +++ */ +++ +++#ifdef HAVE_WEAKSYMS +++#include +++int deny_severity = LOG_WARNING; +++int allow_severity = SEVERITY; +++#endif +diff --git a/feeds/packages/libs/tcp_wrappers/patches/002-opt_cflags.patch b/feeds/packages/libs/tcp_wrappers/patches/002-opt_cflags.patch +new file mode 100644 +index 0000000..1f38eb3 +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/002-opt_cflags.patch +@@ -0,0 +1,12 @@ ++--- 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/feeds/packages/libs/tcp_wrappers/patches/003-scaffold_malloc.patch b/feeds/packages/libs/tcp_wrappers/patches/003-scaffold_malloc.patch +new file mode 100644 +index 0000000..ecda5ae +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/003-scaffold_malloc.patch +@@ -0,0 +1,17 @@ ++--- a/scaffold.c +++++ b/scaffold.c ++@@ -20,13 +20,12 @@ static char sccs_id[] = "@(#) scaffold.c ++ #include ++ #include ++ #include +++#include ++ ++ #ifndef INADDR_NONE ++ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ++ #endif ++ ++-extern char *malloc(); ++- ++ /* Application-specific. */ ++ ++ #include "tcpd.h" +diff --git a/feeds/packages/libs/tcp_wrappers/patches/004-ipv4_prefix.patch b/feeds/packages/libs/tcp_wrappers/patches/004-ipv4_prefix.patch +new file mode 100644 +index 0000000..29c9cef +--- /dev/null ++++ b/feeds/packages/libs/tcp_wrappers/patches/004-ipv4_prefix.patch +@@ -0,0 +1,72 @@ ++--- 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 ++ #include ++ #include +++#include +++#include ++ ++ #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/feeds/packages/libs/tiff/.svn/entries b/feeds/packages/libs/tiff/.svn/entries +new file mode 100644 +index 0000000..ecd2ae7 +--- /dev/null ++++ b/feeds/packages/libs/tiff/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/tiff ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-28T10:35:12.177464Z ++33577 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++3168684a406a1d0bf6bb4e759dd164e9 ++2012-09-28T10:35:12.177464Z ++33577 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2261 ++ +diff --git a/feeds/packages/libs/tiff/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/tiff/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ca31f39 +--- /dev/null ++++ b/feeds/packages/libs/tiff/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,105 @@ ++# ++# Copyright (C) 2006-2012 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:=tiff ++PKG_VERSION:=4.0.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.osgeo.org/libtiff ++PKG_MD5SUM:=051c1068e6a0627f461948c365290410 ++ ++PKG_FIXUP:=libtool-ucxx ++PKG_REMOVE_FILES:=autogen.sh aclocal.m4 ++ ++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/ ++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 \ ++ ) \ ++ --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 \ ++ --with-apple-opengl-framework \ ++ ) ++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/feeds/packages/libs/tiff/Makefile b/feeds/packages/libs/tiff/Makefile +new file mode 100644 +index 0000000..ca31f39 +--- /dev/null ++++ b/feeds/packages/libs/tiff/Makefile +@@ -0,0 +1,105 @@ ++# ++# Copyright (C) 2006-2012 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:=tiff ++PKG_VERSION:=4.0.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.osgeo.org/libtiff ++PKG_MD5SUM:=051c1068e6a0627f461948c365290410 ++ ++PKG_FIXUP:=libtool-ucxx ++PKG_REMOVE_FILES:=autogen.sh aclocal.m4 ++ ++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/ ++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 \ ++ ) \ ++ --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 \ ++ --with-apple-opengl-framework \ ++ ) ++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/feeds/packages/libs/tokyocabinet/.svn/entries b/feeds/packages/libs/tokyocabinet/.svn/entries +new file mode 100644 +index 0000000..08f213d +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/tokyocabinet ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:44.145262Z ++32288 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++36c7ec573b1898aa7c95ae8a73caf54d ++2012-06-12T23:47:44.145262Z ++32288 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1896 ++ +diff --git a/feeds/packages/libs/tokyocabinet/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/tokyocabinet/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..54f8a00 +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=tokyocabinet ++PKG_VERSION:=1.4.47 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fallabs.com/tokyocabinet ++PKG_MD5SUM:=3d94fe2aebf5d9ff0478ed895bc46fc9 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tokyocabinet ++ SUBMENU:=database ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=A library of routines to manage databases ++ URL:=http://fallabs.com/tokyocabinet/ ++ DEPENDS:=+zlib +bzip2 +libpthread +librt ++ MAINTAINER:=Obinou ++endef ++ ++define Package/tokyocabinet/description ++ Tokyo Cabinet is a library of routines for managing a database. ++ The database is a simple data file containing records, each ++ is a pair of a key and a value. Every key and value is serial bytes ++ with variable length. Both binary data and character string can be ++ used as a key and a value. There is neither concept of data tables ++ nor data types. Records are organized in hash table, B+ tree, ++ or fixed-length array. ++ ++ Tokyo Cabinet is developed as the successor of GDBM and QDBM on the ++ following purposes. They are achieved and Tokyo Cabinet replaces ++ conventional DBM products. ++endef ++ ++CONFIGURE_ARGS += --prefix=/usr ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Build/InstallDev ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(1)" install ++endef ++ ++define Package/tokyocabinet/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtokyocabinet.so* $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/share/tokyocabinet ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/tokyocabinet/tokyocabinet.idl $(1)/usr/share/tokyocabinet ++endef ++ ++$(eval $(call BuildPackage,tokyocabinet)) +diff --git a/feeds/packages/libs/tokyocabinet/Makefile b/feeds/packages/libs/tokyocabinet/Makefile +new file mode 100644 +index 0000000..54f8a00 +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=tokyocabinet ++PKG_VERSION:=1.4.47 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fallabs.com/tokyocabinet ++PKG_MD5SUM:=3d94fe2aebf5d9ff0478ed895bc46fc9 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tokyocabinet ++ SUBMENU:=database ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=A library of routines to manage databases ++ URL:=http://fallabs.com/tokyocabinet/ ++ DEPENDS:=+zlib +bzip2 +libpthread +librt ++ MAINTAINER:=Obinou ++endef ++ ++define Package/tokyocabinet/description ++ Tokyo Cabinet is a library of routines for managing a database. ++ The database is a simple data file containing records, each ++ is a pair of a key and a value. Every key and value is serial bytes ++ with variable length. Both binary data and character string can be ++ used as a key and a value. There is neither concept of data tables ++ nor data types. Records are organized in hash table, B+ tree, ++ or fixed-length array. ++ ++ Tokyo Cabinet is developed as the successor of GDBM and QDBM on the ++ following purposes. They are achieved and Tokyo Cabinet replaces ++ conventional DBM products. ++endef ++ ++CONFIGURE_ARGS += --prefix=/usr ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Build/InstallDev ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(1)" install ++endef ++ ++define Package/tokyocabinet/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtokyocabinet.so* $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/share/tokyocabinet ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/tokyocabinet/tokyocabinet.idl $(1)/usr/share/tokyocabinet ++endef ++ ++$(eval $(call BuildPackage,tokyocabinet)) +diff --git a/feeds/packages/libs/tokyocabinet/patches/.svn/entries b/feeds/packages/libs/tokyocabinet/patches/.svn/entries +new file mode 100644 +index 0000000..5f7904c +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/tokyocabinet/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-10T23:39:33.903018Z ++27584 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-remove_extra_paths_from_configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++41ff12d57a9e2c28e513696cc7045dc6 ++2011-06-07T10:24:54.449166Z ++27123 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3152 ++ ++200-uclibc_0.9.30_compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e5c5abc6cf290ae301d2d7a544ce4af9 ++2011-07-10T23:39:33.903018Z ++27584 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++855 ++ +diff --git a/feeds/packages/libs/tokyocabinet/patches/.svn/text-base/100-remove_extra_paths_from_configure.patch.svn-base b/feeds/packages/libs/tokyocabinet/patches/.svn/text-base/100-remove_extra_paths_from_configure.patch.svn-base +new file mode 100644 +index 0000000..aa9ba24 +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/patches/.svn/text-base/100-remove_extra_paths_from_configure.patch.svn-base +@@ -0,0 +1,75 @@ ++diff -ru tokyocabinet-1.4.47/configure tokyocabinet-1.4.47-new/configure ++--- tokyocabinet-1.4.47/configure 2011-02-11 10:59:53.000000000 +0100 +++++ tokyocabinet-1.4.47-new/configure 2011-06-01 16:54:33.082157954 +0200 ++@@ -2066,24 +2066,14 @@ ++ ++ # Building flags ++ MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" ++-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" +++MYCPPFLAGS="-I." ++ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" ++-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" +++MYLDFLAGS="-L." ++ MYCMDLDFLAGS="" ++ MYRUNPATH="\$(LIBDIR)" ++ MYLDLIBPATHENV="LD_LIBRARY_PATH" ++ MYPOSTCMD="true" ++ ++-# Building paths ++-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" ++-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" ++-CPATH="$HOME/include:/usr/local/include:$CPATH" ++-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" ++-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" ++-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" ++-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH ++- ++- ++ ++ #================================================================ ++ # Options ++diff -ru tokyocabinet-1.4.47/configure.in tokyocabinet-1.4.47-new/configure.in ++--- tokyocabinet-1.4.47/configure.in 2010-08-15 16:14:53.000000000 +0200 +++++ tokyocabinet-1.4.47-new/configure.in 2011-06-01 16:53:34.645989924 +0200 ++@@ -32,25 +32,14 @@ ++ ++ # Building flags ++ MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" ++-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" +++MYCPPFLAGS="-I." ++ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" ++-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" +++MYLDFLAGS="-L." ++ MYCMDLDFLAGS="" ++ MYRUNPATH="\$(LIBDIR)" ++ MYLDLIBPATHENV="LD_LIBRARY_PATH" ++ MYPOSTCMD="true" ++ ++-# Building paths ++-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" ++-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" ++-CPATH="$HOME/include:/usr/local/include:$CPATH" ++-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" ++-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" ++-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" ++-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH ++- ++- ++- ++ #================================================================ ++ # Options ++ #================================================================ ++diff -ru tokyocabinet-1.4.47/Makefile.in tokyocabinet-1.4.47-new/Makefile.in ++--- tokyocabinet-1.4.47/Makefile.in 2010-07-04 10:36:20.000000000 +0200 +++++ tokyocabinet-1.4.47-new/Makefile.in 2011-06-01 15:02:19.383826342 +0200 ++@@ -54,8 +54,8 @@ ++ LDFLAGS = @MYLDFLAGS@ ++ CMDLDFLAGS = @MYCMDLDFLAGS@ ++ LIBS = @LIBS@ ++-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. ++-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ +++LDENV = LD_RUN_PATH=$(LIBDIR):@MYRUNPATH@:. +++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR):@MYRUNPATH@ ++ POSTCMD = @MYPOSTCMD@ ++ ++ +diff --git a/feeds/packages/libs/tokyocabinet/patches/.svn/text-base/200-uclibc_0.9.30_compat.patch.svn-base b/feeds/packages/libs/tokyocabinet/patches/.svn/text-base/200-uclibc_0.9.30_compat.patch.svn-base +new file mode 100644 +index 0000000..bf6a434 +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/patches/.svn/text-base/200-uclibc_0.9.30_compat.patch.svn-base +@@ -0,0 +1,29 @@ ++--- a/tctdb.c +++++ b/tctdb.c ++@@ -20,6 +20,26 @@ ++ #include "tctdb.h" ++ #include "myconf.h" ++ +++#ifdef __UCLIBC__ +++# include +++# if __UCLIBC_MINOR__ <= 9 && __UCLIBC_SUBLEVEL__ <= 30 +++ +++size_t strlen(const char *s); +++long double strtold(const char *nptr, char **endptr); +++static inline long double nanl(const char *tagp) +++{ +++ if (tagp[0] != '\0') { +++ char buf[6 + strlen(tagp)]; +++ sprintf(buf, "NAN(%s)", tagp); +++ return strtold(buf, NULL); +++ } +++ return NAN; +++} +++ +++# endif /* __UCLIBC_MINOR__ <= 9 && __UCLIBC_SUBLEVEL__ <= 30 */ +++#endif /* __UCLIBC__ */ +++ +++ ++ #define TDBOPAQUESIZ 64 // size of using opaque field ++ #define TDBLEFTOPQSIZ 64 // size of left opaque field ++ #define TDBPAGEBUFSIZ 32768 // size of a buffer to read each page +diff --git a/feeds/packages/libs/tokyocabinet/patches/100-remove_extra_paths_from_configure.patch b/feeds/packages/libs/tokyocabinet/patches/100-remove_extra_paths_from_configure.patch +new file mode 100644 +index 0000000..aa9ba24 +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/patches/100-remove_extra_paths_from_configure.patch +@@ -0,0 +1,75 @@ ++diff -ru tokyocabinet-1.4.47/configure tokyocabinet-1.4.47-new/configure ++--- tokyocabinet-1.4.47/configure 2011-02-11 10:59:53.000000000 +0100 +++++ tokyocabinet-1.4.47-new/configure 2011-06-01 16:54:33.082157954 +0200 ++@@ -2066,24 +2066,14 @@ ++ ++ # Building flags ++ MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" ++-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" +++MYCPPFLAGS="-I." ++ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" ++-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" +++MYLDFLAGS="-L." ++ MYCMDLDFLAGS="" ++ MYRUNPATH="\$(LIBDIR)" ++ MYLDLIBPATHENV="LD_LIBRARY_PATH" ++ MYPOSTCMD="true" ++ ++-# Building paths ++-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" ++-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" ++-CPATH="$HOME/include:/usr/local/include:$CPATH" ++-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" ++-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" ++-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" ++-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH ++- ++- ++ ++ #================================================================ ++ # Options ++diff -ru tokyocabinet-1.4.47/configure.in tokyocabinet-1.4.47-new/configure.in ++--- tokyocabinet-1.4.47/configure.in 2010-08-15 16:14:53.000000000 +0200 +++++ tokyocabinet-1.4.47-new/configure.in 2011-06-01 16:53:34.645989924 +0200 ++@@ -32,25 +32,14 @@ ++ ++ # Building flags ++ MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" ++-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" +++MYCPPFLAGS="-I." ++ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" ++-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" +++MYLDFLAGS="-L." ++ MYCMDLDFLAGS="" ++ MYRUNPATH="\$(LIBDIR)" ++ MYLDLIBPATHENV="LD_LIBRARY_PATH" ++ MYPOSTCMD="true" ++ ++-# Building paths ++-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" ++-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" ++-CPATH="$HOME/include:/usr/local/include:$CPATH" ++-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" ++-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" ++-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" ++-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH ++- ++- ++- ++ #================================================================ ++ # Options ++ #================================================================ ++diff -ru tokyocabinet-1.4.47/Makefile.in tokyocabinet-1.4.47-new/Makefile.in ++--- tokyocabinet-1.4.47/Makefile.in 2010-07-04 10:36:20.000000000 +0200 +++++ tokyocabinet-1.4.47-new/Makefile.in 2011-06-01 15:02:19.383826342 +0200 ++@@ -54,8 +54,8 @@ ++ LDFLAGS = @MYLDFLAGS@ ++ CMDLDFLAGS = @MYCMDLDFLAGS@ ++ LIBS = @LIBS@ ++-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. ++-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ +++LDENV = LD_RUN_PATH=$(LIBDIR):@MYRUNPATH@:. +++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR):@MYRUNPATH@ ++ POSTCMD = @MYPOSTCMD@ ++ ++ +diff --git a/feeds/packages/libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch b/feeds/packages/libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch +new file mode 100644 +index 0000000..bf6a434 +--- /dev/null ++++ b/feeds/packages/libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch +@@ -0,0 +1,29 @@ ++--- a/tctdb.c +++++ b/tctdb.c ++@@ -20,6 +20,26 @@ ++ #include "tctdb.h" ++ #include "myconf.h" ++ +++#ifdef __UCLIBC__ +++# include +++# if __UCLIBC_MINOR__ <= 9 && __UCLIBC_SUBLEVEL__ <= 30 +++ +++size_t strlen(const char *s); +++long double strtold(const char *nptr, char **endptr); +++static inline long double nanl(const char *tagp) +++{ +++ if (tagp[0] != '\0') { +++ char buf[6 + strlen(tagp)]; +++ sprintf(buf, "NAN(%s)", tagp); +++ return strtold(buf, NULL); +++ } +++ return NAN; +++} +++ +++# endif /* __UCLIBC_MINOR__ <= 9 && __UCLIBC_SUBLEVEL__ <= 30 */ +++#endif /* __UCLIBC__ */ +++ +++ ++ #define TDBOPAQUESIZ 64 // size of using opaque field ++ #define TDBLEFTOPQSIZ 64 // size of left opaque field ++ #define TDBPAGEBUFSIZ 32768 // size of a buffer to read each page +diff --git a/feeds/packages/libs/ucl/.svn/entries b/feeds/packages/libs/ucl/.svn/entries +new file mode 100644 +index 0000000..c1561bb +--- /dev/null ++++ b/feeds/packages/libs/ucl/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ucl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++fc5b50889439310a3ffdf3614debeca7 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1401 ++ +diff --git a/feeds/packages/libs/ucl/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/ucl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3d3359a +--- /dev/null ++++ b/feeds/packages/libs/ucl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=ucl ++PKG_VERSION:=1.03 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/ ++PKG_MD5SUM:=852bd691d8abc75b52053465846fba34 ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libucl ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Portable lossless data compression library ++ URL:=http://www.oberhumer.com/opensource/ucl/ ++endef ++ ++define Package/libucl/description ++UCL is a portable lossless data compression library written in ANSI C. UCL ++implements a number of compression algorithms that achieve an excellent ++compression ratio while allowing *very* fast decompression. Decompression ++requires no additional memory. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ --disable-asm ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/ucl ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ucl/ucl{,conf}.h $(1)/usr/include/ucl/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libucl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libucl)) ++ +diff --git a/feeds/packages/libs/ucl/Makefile b/feeds/packages/libs/ucl/Makefile +new file mode 100644 +index 0000000..3d3359a +--- /dev/null ++++ b/feeds/packages/libs/ucl/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=ucl ++PKG_VERSION:=1.03 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/ ++PKG_MD5SUM:=852bd691d8abc75b52053465846fba34 ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libucl ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Portable lossless data compression library ++ URL:=http://www.oberhumer.com/opensource/ucl/ ++endef ++ ++define Package/libucl/description ++UCL is a portable lossless data compression library written in ANSI C. UCL ++implements a number of compression algorithms that achieve an excellent ++compression ratio while allowing *very* fast decompression. Decompression ++requires no additional memory. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ --disable-asm ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/ucl ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ucl/ucl{,conf}.h $(1)/usr/include/ucl/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/libucl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libucl)) ++ +diff --git a/feeds/packages/libs/ucl/patches/.svn/entries b/feeds/packages/libs/ucl/patches/.svn/entries +new file mode 100644 +index 0000000..073d169 +--- /dev/null ++++ b/feeds/packages/libs/ucl/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ucl/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-22T07:56:28.720220Z ++24783 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-autoconf-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++4545747cce7e07efbb36dc1dfd6ea1e9 ++2010-12-08T19:58:40.463354Z ++24363 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++241 ++ +diff --git a/feeds/packages/libs/ucl/patches/.svn/text-base/001-autoconf-compat.patch.svn-base b/feeds/packages/libs/ucl/patches/.svn/text-base/001-autoconf-compat.patch.svn-base +new file mode 100644 +index 0000000..7dda83d +--- /dev/null ++++ b/feeds/packages/libs/ucl/patches/.svn/text-base/001-autoconf-compat.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -48,7 +48,7 @@ AC_CANONICAL_TARGET ++ AM_MAINTAINER_MODE ++ ++ if test -z "$ac_abs_top_srcdir"; then ++- _AC_SRCPATHS(.) +++ _AC_SRCDIRS(.) ++ fi ++ if test -r .Conf.settings1; then ++ . ./.Conf.settings1 +diff --git a/feeds/packages/libs/ucl/patches/001-autoconf-compat.patch b/feeds/packages/libs/ucl/patches/001-autoconf-compat.patch +new file mode 100644 +index 0000000..7dda83d +--- /dev/null ++++ b/feeds/packages/libs/ucl/patches/001-autoconf-compat.patch +@@ -0,0 +1,11 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -48,7 +48,7 @@ AC_CANONICAL_TARGET ++ AM_MAINTAINER_MODE ++ ++ if test -z "$ac_abs_top_srcdir"; then ++- _AC_SRCPATHS(.) +++ _AC_SRCDIRS(.) ++ fi ++ if test -r .Conf.settings1; then ++ . ./.Conf.settings1 +diff --git a/feeds/packages/libs/unixodbc/.svn/entries b/feeds/packages/libs/unixodbc/.svn/entries +new file mode 100644 +index 0000000..0996833 +--- /dev/null ++++ b/feeds/packages/libs/unixodbc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/unixodbc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T11:02:36.055888Z ++32331 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++0c8dc6ce8c68551268ebb05b4be6a024 ++2012-06-13T11:02:36.055888Z ++32331 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2927 ++ +diff --git a/feeds/packages/libs/unixodbc/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/unixodbc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e8cca56 +--- /dev/null ++++ b/feeds/packages/libs/unixodbc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,115 @@ ++# ++# Copyright (C) 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:=unixodbc ++PKG_VERSION:=2.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=ftp://ftp.unixodbc.org/pub/unixODBC/ ++PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=86788d4006620fa1f171c13d07fdcaab ++PKG_BUILD_DIR:=$(BUILD_DIR)/unixODBC-$(PKG_VERSION) ++ ++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/feeds/packages/libs/unixodbc/Makefile b/feeds/packages/libs/unixodbc/Makefile +new file mode 100644 +index 0000000..e8cca56 +--- /dev/null ++++ b/feeds/packages/libs/unixodbc/Makefile +@@ -0,0 +1,115 @@ ++# ++# Copyright (C) 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:=unixodbc ++PKG_VERSION:=2.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=ftp://ftp.unixodbc.org/pub/unixODBC/ ++PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=86788d4006620fa1f171c13d07fdcaab ++PKG_BUILD_DIR:=$(BUILD_DIR)/unixODBC-$(PKG_VERSION) ++ ++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/feeds/packages/libs/unixodbc/files/.svn/entries b/feeds/packages/libs/unixodbc/files/.svn/entries +new file mode 100644 +index 0000000..66d7ddd +--- /dev/null ++++ b/feeds/packages/libs/unixodbc/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/unixodbc/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T16:20:04.871583Z ++31164 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++unixodbc_conf.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++79651e386ac39e6894e18cb17b4ae672 ++2012-04-02T16:20:04.871583Z ++31164 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++396 ++ +diff --git a/feeds/packages/libs/unixodbc/files/.svn/text-base/unixodbc_conf.h.svn-base b/feeds/packages/libs/unixodbc/files/.svn/text-base/unixodbc_conf.h.svn-base +new file mode 100644 +index 0000000..f149d02 +--- /dev/null ++++ b/feeds/packages/libs/unixodbc/files/.svn/text-base/unixodbc_conf.h.svn-base +@@ -0,0 +1,22 @@ ++@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/feeds/packages/libs/unixodbc/files/unixodbc_conf.h b/feeds/packages/libs/unixodbc/files/unixodbc_conf.h +new file mode 100644 +index 0000000..f149d02 +--- /dev/null ++++ b/feeds/packages/libs/unixodbc/files/unixodbc_conf.h +@@ -0,0 +1,22 @@ ++@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/feeds/packages/libs/ustl/.svn/entries b/feeds/packages/libs/ustl/.svn/entries +new file mode 100644 +index 0000000..11b467e +--- /dev/null ++++ b/feeds/packages/libs/ustl/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ustl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-14T17:34:08.761991Z ++30530 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d16cdff419029adf40f677585fce7038 ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1547 ++ +diff --git a/feeds/packages/libs/ustl/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/ustl/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/libs/ustl/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/ustl/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/ustl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f467e97 +--- /dev/null ++++ b/feeds/packages/libs/ustl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=ustl ++PKG_VERSION:=0.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2 ++PKG_SOURCE_URL:=@SF/ustl ++PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ustl ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=C++ STL for embedded systems ++ DEPENDS:=@!TARGET_avr32 ++ URL:=http://ustl.sourceforge.net/ ++endef ++ ++define Package/ustl/description ++ C++ Standard Template Library (STL) for embedded systems.\\\ ++ uSTL is a partial implementation of the STL (Standard Template \\\ ++ Library) that reduces code size by factoring memory management \\\ ++ code into a non-template base class and deriving containers \\\ ++ from it. ++endef ++ ++define Build/Configure ++ $(CP) ./files/config.h $(PKG_BUILD_DIR)/ ++ $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CROSS="$(TARGET_CROSS)" \ ++ OPTFLAGS="$(TARGET_CFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/ustl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,ustl)) +diff --git a/feeds/packages/libs/ustl/Makefile b/feeds/packages/libs/ustl/Makefile +new file mode 100644 +index 0000000..f467e97 +--- /dev/null ++++ b/feeds/packages/libs/ustl/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=ustl ++PKG_VERSION:=0.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2 ++PKG_SOURCE_URL:=@SF/ustl ++PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ustl ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=C++ STL for embedded systems ++ DEPENDS:=@!TARGET_avr32 ++ URL:=http://ustl.sourceforge.net/ ++endef ++ ++define Package/ustl/description ++ C++ Standard Template Library (STL) for embedded systems.\\\ ++ uSTL is a partial implementation of the STL (Standard Template \\\ ++ Library) that reduces code size by factoring memory management \\\ ++ code into a non-template base class and deriving containers \\\ ++ from it. ++endef ++ ++define Build/Configure ++ $(CP) ./files/config.h $(PKG_BUILD_DIR)/ ++ $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CROSS="$(TARGET_CROSS)" \ ++ OPTFLAGS="$(TARGET_CFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/ustl/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(1)/usr/lib/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,ustl)) +diff --git a/feeds/packages/libs/ustl/files/.svn/entries b/feeds/packages/libs/ustl/files/.svn/entries +new file mode 100644 +index 0000000..aad599a +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ustl/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-14T17:34:08.761991Z ++30530 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++cf35dab01b339adc325ea4b09c38cafa ++2011-02-02T02:36:52.752590Z ++25304 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8507 ++ ++Common.mk ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++9689a654b5b236e28995141dbef343dc ++2012-02-14T17:34:08.761991Z ++30530 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1508 ++ +diff --git a/feeds/packages/libs/ustl/files/.svn/prop-base/Common.mk.svn-base b/feeds/packages/libs/ustl/files/.svn/prop-base/Common.mk.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/.svn/prop-base/Common.mk.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/ustl/files/.svn/prop-base/config.h.svn-base b/feeds/packages/libs/ustl/files/.svn/prop-base/config.h.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/.svn/prop-base/config.h.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/ustl/files/.svn/text-base/Common.mk.svn-base b/feeds/packages/libs/ustl/files/.svn/text-base/Common.mk.svn-base +new file mode 100644 +index 0000000..ab0cdf5 +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/.svn/text-base/Common.mk.svn-base +@@ -0,0 +1,74 @@ ++LIBNAME = ustl ++MAJOR = 0 ++MINOR = 8 ++BUILD = 0 ++ ++CC = $(CROSS)gcc ++CXX = $(CROSS)g++ ++LD = $(CROSS)gcc ++AR = $(CROSS)ar ++RANLIB = $(CROSS)ranlib ++DOXYGEN = echo ++INSTALL = install ++RM = rm -f ++LN = ln -sf ++ ++prefix = /usr ++exec_prefix = /usr ++BINDIR = /usr/bin ++INCDIR = /usr/include ++LIBDIR = /usr/lib ++ ++DESTDIR = ++ ++INSTALLDIR = ${INSTALL} -d ++INSTALLLIB = ${INSTALL} -p -m 644 ++INSTALLEXE = ${INSTALL} -p -m 755 ++INSTALLDATA = ${INSTALL} -p -m 644 ++ ++CWARNOPTS = -Wall -W -Wpointer-arith -Wno-cast-align \ ++ -Wcast-qual -Wwrite-strings -Wredundant-decls ++CXXWARNOPTS = ${CWARNOPTS} -Wconversion -Wsign-promo -Wsynth -Woverloaded-virtual ++PROCESSOR_OPTS = ++INLINE_OPTS = -finline-limit=65535 ++CUSTOMINCDIR = ++CUSTOMLIBDIR = ++ ++BUILD_SHARED = 1 ++BUILD_STATIC = 1 ++#DEBUG = 1 ++#PROFILE = 1 ++STANDALONE = -nodefaultlibs ++ ++CFLAGS = \ ++ ${CUSTOMINCDIR} ${OPTFLAGS} ${CWARNOPTS} ${STANDALONE} ++CXXFLAGS = \ ++ ${CUSTOMINCDIR} ${OPTFLAGS} ${INLINE_OPTS} \ ++ ${CXXWARNOPTS} ${STANDALONE} -fno-builtin ++LDFLAGS = ${CUSTOMLIBDIR} ${STANDALONE} ++OPTFLAGS = ${PROCESSOR_OPTS} ++ifdef DEBUG ++ OPTFLAGS += -O0 -g ++else ++ OPTFLAGS += -O3 -DNDEBUG=1 ++endif ++ifdef PROFILE ++ OPTFLAGS += -pg ++endif ++ifdef STANDALONE ++ LIBS += -lsupc++ -lgcc_s -lc ++endif ++ifdef BUILD_SHARED ++ CFLAGS += -fPIC ++ CXXFLAGS += -fPIC ++endif ++SHBLDFL = -shared ++ ++LIBA = lib${LIBNAME}.a ++LIBSO = lib${LIBNAME}.so ++ifdef MAJOR ++LIBSOLNK = ${LIBSO}.${MAJOR}.${MINOR} ++LIBSOBLD = ${LIBSO}.${MAJOR}.${MINOR}.${BUILD} ++endif ++TOCLEAN += ${LIBSO} ${LIBA} ${LIBSOBLD} ++ +diff --git a/feeds/packages/libs/ustl/files/.svn/text-base/config.h.svn-base b/feeds/packages/libs/ustl/files/.svn/text-base/config.h.svn-base +new file mode 100644 +index 0000000..903e225 +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/.svn/text-base/config.h.svn-base +@@ -0,0 +1,286 @@ ++// config.h ++// ++// Autogenerated from config.h.in by bsconf. ++// ++ ++#ifndef CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F ++#define CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F ++ ++// Define to the one symbol short name of this package. ++#define USTL_NAME "ustl" ++// Define to the full name and version of this package. ++#define USTL_STRING "ustl 0.8" ++// Define to the version of this package. ++#define USTL_VERSION 0x080 ++// Define to the address where bug reports for this package should be sent. ++#define USTL_BUGREPORT "Mike Sharov " ++ ++/// Define to 1 if you want to build without libstdc++ ++#define WITHOUT_LIBSTDCPP 1 ++ ++/// Define to 1 if you want stream operations to throw exceptions on ++/// insufficient data or insufficient space. All these errors should ++/// be preventable in output code; the input code should verify the ++/// data in a separate step. It slows down stream operations a lot, ++/// but it's your call. By default only debug builds throw. ++/// ++#undef WANT_STREAM_BOUNDS_CHECKING ++ ++#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) && !defined(WITHOUT_LIBSTDCPP) ++ #define WANT_STREAM_BOUNDS_CHECKING 1 ++#endif ++ ++/// Define to 1 if you don't want the standard streams. ++/// You will not be able to run bvt tests if you do this. ++/// ++#undef WITHOUT_CIN_COUT_CERR ++ ++/// Define GNU extensions if unavailable. ++#ifndef __GNUC__ ++ /// GCC (and some other compilers) define '__attribute__'; ustl is using this ++ /// macro to alert the compiler to flag inconsistencies in printf/scanf-like ++ /// function calls. Just in case '__attribute__' isn't defined, make a dummy. ++ /// ++ #ifndef __attribute__ ++ #define __attribute__(p) ++ #endif ++#endif ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++ #define DLL_EXPORT __attribute__((visibility("default"))) ++ #define DLL_LOCAL __attribute__((visibility("hidden"))) ++#else ++ #define DLL_EXPORT ++ #define DLL_LOCAL ++#endif ++#if defined(__GNUC__) && (__GNUC__ >= 3) && defined(__i386__) ++ /// GCC 3+ supports the prefetch directive, which some CPUs use to improve caching ++ #define prefetch(p,rw,loc) __builtin_prefetch(p,rw,loc) ++#else ++ #define prefetch(p,rw,loc) ++#endif ++#if !defined(__GNUC__) || (__GNUC__ < 3) ++ /// __alignof__ returns the recommended alignment for the type ++ #define __alignof__(v) min(sizeof(v), sizeof(void*)) ++#endif ++ ++/// Define to 1 if you have the `atexit' function. ++#define HAVE_ATEXIT 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_ASSERT_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_CTYPE_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_ERRNO_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_FCNTL_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_FLOAT_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_INTTYPES_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_LIMITS_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_LOCALE_H 1 ++ ++/// Define to 1 if your system has a working `malloc' function. ++#define HAVE_MALLOC 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_MALLOC_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_ALLOCA_H 1 ++ ++// Define to 1 if you have the `memchr' function. ++#define HAVE_MEMCHR 1 ++ ++// Define to 1 if you have the `memmove' function. ++#define HAVE_MEMMOVE 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_MEMORY_H 1 ++ ++// Define to 1 if you have the `memset' function. ++#define HAVE_MEMSET 1 ++ ++// Define to 1 if the system has the type `ptrdiff_t'. ++#define HAVE_PTRDIFF_T 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_SIGNAL_H 1 ++ ++// Define to 1 if you have the __va_copy function ++#define HAVE_VA_COPY 1 ++ ++// Define to 1 if `stat' has the bug that it succeeds when given the ++// zero-length file name argument. ++/* #undef HAVE_STAT_EMPTY_STRING_BUG */ ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDARG_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDDEF_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDINT_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDIO_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDLIB_H 1 ++ ++// Define to 1 if you have the `strerror' function. ++#define HAVE_STRERROR 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STRINGS_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STRING_H 1 ++ ++// Define to 1 if you have the `strrchr' function. ++#define HAVE_STRRCHR 1 ++ ++// Define to 1 if you have the `strsignal' function. ++#define HAVE_STRSIGNAL 1 ++ ++// Define to 1 if you have the `strtol' function. ++#define HAVE_STRTOL 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_SYS_STAT_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_SYS_TYPES_H 1 ++ ++// Define to 1 if you have that is POSIX.1 compatible. ++#define HAVE_SYS_WAIT_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_TIME_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_UNISTD_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_MATH_H 1 ++ ++// Define to 1 if you have the rintf function. Will use rint otherwise. ++#undef HAVE_RINTF ++ ++// STDC_HEADERS is defined to 1 on sane systems. ++#if defined(HAVE_ASSERT_H) && defined(HAVE_CTYPE_H) &&\ ++ defined(HAVE_ERRNO_H) && defined(HAVE_FLOAT_H) &&\ ++ defined(HAVE_LIMITS_H) && defined(HAVE_LOCALE_H) &&\ ++ defined(HAVE_MATH_H) && defined(HAVE_SIGNAL_H) &&\ ++ defined(HAVE_STDARG_H) && defined(HAVE_STDDEF_H) &&\ ++ defined(HAVE_STDIO_H) && defined(HAVE_STDLIB_H) &&\ ++ defined(HAVE_STRING_H) && defined(HAVE_TIME_H) ++#define STDC_HEADERS 1 ++#endif ++ ++// STDC_HEADERS is defined to 1 on unix systems. ++#if defined(HAVE_FCNTL_H) && defined(HAVE_SYS_STAT_H) && defined(HAVE_UNISTD_H) ++#define STDUNIX_HEADERS 1 ++#endif ++ ++// Define to 1 if you have the header file. ++#if (__GNUC__ >= 3) // gcc 2.95 somehow doesn't recognize 'asm volatile' in libc byteswap.h ++#define HAVE_BYTESWAP_H 1 ++#endif ++ ++// Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. ++#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 ++ ++// Define to 1 if your compiler treats char as a separate type along with ++// signed char and unsigned char. This will create overloads for char. ++#define HAVE_THREE_CHAR_TYPES 1 ++ ++// Define as the return type of signal handlers (`int' or `void'). ++#define RETSIGTYPE void ++ ++// Define to 1 if you have 64 bit types available ++#define HAVE_INT64_T 1 ++ ++// Define to 1 if you have the long long type ++#define HAVE_LONG_LONG 1 ++ ++// Define to 1 if you want unrolled specializations for fill and copy ++#undef WANT_UNROLLED_COPY ++ ++// Define to 1 if you want to use MMX/SSE/3dNow! processor instructions ++#undef WANT_MMX ++ ++// Define to byte sizes of types ++#define SIZE_OF_CHAR 1 ++#define SIZE_OF_SHORT 2 ++#define SIZE_OF_INT 4 ++#define SIZE_OF_LONG 4 ++#define SIZE_OF_LONG_LONG 8 ++#define SIZE_OF_POINTER 4 ++#define SIZE_OF_SIZE_T 4 ++#define SIZE_OF_BOOL SIZE_OF_CHAR ++#undef SIZE_T_IS_LONG ++ ++// Byte order macros, converted in utypes.h ++#define USTL_LITTLE_ENDIAN 4321 ++#define USTL_BIG_ENDIAN 1234 ++#define USTL_BYTE_ORDER USTL_LITTLE_ENDIAN ++ ++// Extended CPU capabilities ++#define CPU_HAS_FPU 1 ++#define CPU_HAS_EXT_DEBUG 1 ++#define CPU_HAS_TIMESTAMPC 1 ++#define CPU_HAS_MSR 1 ++#define CPU_HAS_CMPXCHG8 1 ++#define CPU_HAS_APIC 1 ++#define CPU_HAS_SYSCALL 1 ++#define CPU_HAS_MTRR 1 ++#define CPU_HAS_CMOV 1 ++#define CPU_HAS_FCMOV 1 ++#if WANT_MMX ++#undef CPU_HAS_MMX 1 ++#undef CPU_HAS_FXSAVE ++#undef CPU_HAS_SSE 1 ++#undef CPU_HAS_SSE2 1 ++#undef CPU_HAS_SSE3 ++#undef CPU_HAS_EXT_3DNOW ++#undef CPU_HAS_3DNOW ++#endif ++ ++// GCC vector extensions ++#if defined(CPU_HAS_MMX) || defined(CPU_HAS_SSE) ++ #undef HAVE_VECTOR_EXTENSIONS ++#endif ++ ++#if CPU_HAS_SSE && defined(__GNUC__) ++ #define __sse_align __attribute__((aligned(16))) ++#else ++ #define __sse_align ++#endif ++ ++// Define to empty if `const' does not conform to ANSI C. ++/* #define const */ ++ ++// Define as `__inline' if that's what the C compiler calls it, or to nothing ++// if it is not supported. ++/* #define inline __inline */ ++ ++// Define to `long' if does not define. ++/* typedef long off_t; */ ++ ++// Define to `unsigned' if does not define. ++/* typedef long size_t; */ ++ ++#endif // CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F ++ +diff --git a/feeds/packages/libs/ustl/files/Common.mk b/feeds/packages/libs/ustl/files/Common.mk +new file mode 100644 +index 0000000..ab0cdf5 +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/Common.mk +@@ -0,0 +1,74 @@ ++LIBNAME = ustl ++MAJOR = 0 ++MINOR = 8 ++BUILD = 0 ++ ++CC = $(CROSS)gcc ++CXX = $(CROSS)g++ ++LD = $(CROSS)gcc ++AR = $(CROSS)ar ++RANLIB = $(CROSS)ranlib ++DOXYGEN = echo ++INSTALL = install ++RM = rm -f ++LN = ln -sf ++ ++prefix = /usr ++exec_prefix = /usr ++BINDIR = /usr/bin ++INCDIR = /usr/include ++LIBDIR = /usr/lib ++ ++DESTDIR = ++ ++INSTALLDIR = ${INSTALL} -d ++INSTALLLIB = ${INSTALL} -p -m 644 ++INSTALLEXE = ${INSTALL} -p -m 755 ++INSTALLDATA = ${INSTALL} -p -m 644 ++ ++CWARNOPTS = -Wall -W -Wpointer-arith -Wno-cast-align \ ++ -Wcast-qual -Wwrite-strings -Wredundant-decls ++CXXWARNOPTS = ${CWARNOPTS} -Wconversion -Wsign-promo -Wsynth -Woverloaded-virtual ++PROCESSOR_OPTS = ++INLINE_OPTS = -finline-limit=65535 ++CUSTOMINCDIR = ++CUSTOMLIBDIR = ++ ++BUILD_SHARED = 1 ++BUILD_STATIC = 1 ++#DEBUG = 1 ++#PROFILE = 1 ++STANDALONE = -nodefaultlibs ++ ++CFLAGS = \ ++ ${CUSTOMINCDIR} ${OPTFLAGS} ${CWARNOPTS} ${STANDALONE} ++CXXFLAGS = \ ++ ${CUSTOMINCDIR} ${OPTFLAGS} ${INLINE_OPTS} \ ++ ${CXXWARNOPTS} ${STANDALONE} -fno-builtin ++LDFLAGS = ${CUSTOMLIBDIR} ${STANDALONE} ++OPTFLAGS = ${PROCESSOR_OPTS} ++ifdef DEBUG ++ OPTFLAGS += -O0 -g ++else ++ OPTFLAGS += -O3 -DNDEBUG=1 ++endif ++ifdef PROFILE ++ OPTFLAGS += -pg ++endif ++ifdef STANDALONE ++ LIBS += -lsupc++ -lgcc_s -lc ++endif ++ifdef BUILD_SHARED ++ CFLAGS += -fPIC ++ CXXFLAGS += -fPIC ++endif ++SHBLDFL = -shared ++ ++LIBA = lib${LIBNAME}.a ++LIBSO = lib${LIBNAME}.so ++ifdef MAJOR ++LIBSOLNK = ${LIBSO}.${MAJOR}.${MINOR} ++LIBSOBLD = ${LIBSO}.${MAJOR}.${MINOR}.${BUILD} ++endif ++TOCLEAN += ${LIBSO} ${LIBA} ${LIBSOBLD} ++ +diff --git a/feeds/packages/libs/ustl/files/config.h b/feeds/packages/libs/ustl/files/config.h +new file mode 100644 +index 0000000..903e225 +--- /dev/null ++++ b/feeds/packages/libs/ustl/files/config.h +@@ -0,0 +1,286 @@ ++// config.h ++// ++// Autogenerated from config.h.in by bsconf. ++// ++ ++#ifndef CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F ++#define CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F ++ ++// Define to the one symbol short name of this package. ++#define USTL_NAME "ustl" ++// Define to the full name and version of this package. ++#define USTL_STRING "ustl 0.8" ++// Define to the version of this package. ++#define USTL_VERSION 0x080 ++// Define to the address where bug reports for this package should be sent. ++#define USTL_BUGREPORT "Mike Sharov " ++ ++/// Define to 1 if you want to build without libstdc++ ++#define WITHOUT_LIBSTDCPP 1 ++ ++/// Define to 1 if you want stream operations to throw exceptions on ++/// insufficient data or insufficient space. All these errors should ++/// be preventable in output code; the input code should verify the ++/// data in a separate step. It slows down stream operations a lot, ++/// but it's your call. By default only debug builds throw. ++/// ++#undef WANT_STREAM_BOUNDS_CHECKING ++ ++#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) && !defined(WITHOUT_LIBSTDCPP) ++ #define WANT_STREAM_BOUNDS_CHECKING 1 ++#endif ++ ++/// Define to 1 if you don't want the standard streams. ++/// You will not be able to run bvt tests if you do this. ++/// ++#undef WITHOUT_CIN_COUT_CERR ++ ++/// Define GNU extensions if unavailable. ++#ifndef __GNUC__ ++ /// GCC (and some other compilers) define '__attribute__'; ustl is using this ++ /// macro to alert the compiler to flag inconsistencies in printf/scanf-like ++ /// function calls. Just in case '__attribute__' isn't defined, make a dummy. ++ /// ++ #ifndef __attribute__ ++ #define __attribute__(p) ++ #endif ++#endif ++#if defined(__GNUC__) && (__GNUC__ >= 4) ++ #define DLL_EXPORT __attribute__((visibility("default"))) ++ #define DLL_LOCAL __attribute__((visibility("hidden"))) ++#else ++ #define DLL_EXPORT ++ #define DLL_LOCAL ++#endif ++#if defined(__GNUC__) && (__GNUC__ >= 3) && defined(__i386__) ++ /// GCC 3+ supports the prefetch directive, which some CPUs use to improve caching ++ #define prefetch(p,rw,loc) __builtin_prefetch(p,rw,loc) ++#else ++ #define prefetch(p,rw,loc) ++#endif ++#if !defined(__GNUC__) || (__GNUC__ < 3) ++ /// __alignof__ returns the recommended alignment for the type ++ #define __alignof__(v) min(sizeof(v), sizeof(void*)) ++#endif ++ ++/// Define to 1 if you have the `atexit' function. ++#define HAVE_ATEXIT 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_ASSERT_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_CTYPE_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_ERRNO_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_FCNTL_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_FLOAT_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_INTTYPES_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_LIMITS_H 1 ++ ++/// Define to 1 if you have the header file. ++#define HAVE_LOCALE_H 1 ++ ++/// Define to 1 if your system has a working `malloc' function. ++#define HAVE_MALLOC 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_MALLOC_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_ALLOCA_H 1 ++ ++// Define to 1 if you have the `memchr' function. ++#define HAVE_MEMCHR 1 ++ ++// Define to 1 if you have the `memmove' function. ++#define HAVE_MEMMOVE 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_MEMORY_H 1 ++ ++// Define to 1 if you have the `memset' function. ++#define HAVE_MEMSET 1 ++ ++// Define to 1 if the system has the type `ptrdiff_t'. ++#define HAVE_PTRDIFF_T 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_SIGNAL_H 1 ++ ++// Define to 1 if you have the __va_copy function ++#define HAVE_VA_COPY 1 ++ ++// Define to 1 if `stat' has the bug that it succeeds when given the ++// zero-length file name argument. ++/* #undef HAVE_STAT_EMPTY_STRING_BUG */ ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDARG_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDDEF_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDINT_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDIO_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STDLIB_H 1 ++ ++// Define to 1 if you have the `strerror' function. ++#define HAVE_STRERROR 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STRINGS_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_STRING_H 1 ++ ++// Define to 1 if you have the `strrchr' function. ++#define HAVE_STRRCHR 1 ++ ++// Define to 1 if you have the `strsignal' function. ++#define HAVE_STRSIGNAL 1 ++ ++// Define to 1 if you have the `strtol' function. ++#define HAVE_STRTOL 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_SYS_STAT_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_SYS_TYPES_H 1 ++ ++// Define to 1 if you have that is POSIX.1 compatible. ++#define HAVE_SYS_WAIT_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_TIME_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_UNISTD_H 1 ++ ++// Define to 1 if you have the header file. ++#define HAVE_MATH_H 1 ++ ++// Define to 1 if you have the rintf function. Will use rint otherwise. ++#undef HAVE_RINTF ++ ++// STDC_HEADERS is defined to 1 on sane systems. ++#if defined(HAVE_ASSERT_H) && defined(HAVE_CTYPE_H) &&\ ++ defined(HAVE_ERRNO_H) && defined(HAVE_FLOAT_H) &&\ ++ defined(HAVE_LIMITS_H) && defined(HAVE_LOCALE_H) &&\ ++ defined(HAVE_MATH_H) && defined(HAVE_SIGNAL_H) &&\ ++ defined(HAVE_STDARG_H) && defined(HAVE_STDDEF_H) &&\ ++ defined(HAVE_STDIO_H) && defined(HAVE_STDLIB_H) &&\ ++ defined(HAVE_STRING_H) && defined(HAVE_TIME_H) ++#define STDC_HEADERS 1 ++#endif ++ ++// STDC_HEADERS is defined to 1 on unix systems. ++#if defined(HAVE_FCNTL_H) && defined(HAVE_SYS_STAT_H) && defined(HAVE_UNISTD_H) ++#define STDUNIX_HEADERS 1 ++#endif ++ ++// Define to 1 if you have the header file. ++#if (__GNUC__ >= 3) // gcc 2.95 somehow doesn't recognize 'asm volatile' in libc byteswap.h ++#define HAVE_BYTESWAP_H 1 ++#endif ++ ++// Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. ++#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 ++ ++// Define to 1 if your compiler treats char as a separate type along with ++// signed char and unsigned char. This will create overloads for char. ++#define HAVE_THREE_CHAR_TYPES 1 ++ ++// Define as the return type of signal handlers (`int' or `void'). ++#define RETSIGTYPE void ++ ++// Define to 1 if you have 64 bit types available ++#define HAVE_INT64_T 1 ++ ++// Define to 1 if you have the long long type ++#define HAVE_LONG_LONG 1 ++ ++// Define to 1 if you want unrolled specializations for fill and copy ++#undef WANT_UNROLLED_COPY ++ ++// Define to 1 if you want to use MMX/SSE/3dNow! processor instructions ++#undef WANT_MMX ++ ++// Define to byte sizes of types ++#define SIZE_OF_CHAR 1 ++#define SIZE_OF_SHORT 2 ++#define SIZE_OF_INT 4 ++#define SIZE_OF_LONG 4 ++#define SIZE_OF_LONG_LONG 8 ++#define SIZE_OF_POINTER 4 ++#define SIZE_OF_SIZE_T 4 ++#define SIZE_OF_BOOL SIZE_OF_CHAR ++#undef SIZE_T_IS_LONG ++ ++// Byte order macros, converted in utypes.h ++#define USTL_LITTLE_ENDIAN 4321 ++#define USTL_BIG_ENDIAN 1234 ++#define USTL_BYTE_ORDER USTL_LITTLE_ENDIAN ++ ++// Extended CPU capabilities ++#define CPU_HAS_FPU 1 ++#define CPU_HAS_EXT_DEBUG 1 ++#define CPU_HAS_TIMESTAMPC 1 ++#define CPU_HAS_MSR 1 ++#define CPU_HAS_CMPXCHG8 1 ++#define CPU_HAS_APIC 1 ++#define CPU_HAS_SYSCALL 1 ++#define CPU_HAS_MTRR 1 ++#define CPU_HAS_CMOV 1 ++#define CPU_HAS_FCMOV 1 ++#if WANT_MMX ++#undef CPU_HAS_MMX 1 ++#undef CPU_HAS_FXSAVE ++#undef CPU_HAS_SSE 1 ++#undef CPU_HAS_SSE2 1 ++#undef CPU_HAS_SSE3 ++#undef CPU_HAS_EXT_3DNOW ++#undef CPU_HAS_3DNOW ++#endif ++ ++// GCC vector extensions ++#if defined(CPU_HAS_MMX) || defined(CPU_HAS_SSE) ++ #undef HAVE_VECTOR_EXTENSIONS ++#endif ++ ++#if CPU_HAS_SSE && defined(__GNUC__) ++ #define __sse_align __attribute__((aligned(16))) ++#else ++ #define __sse_align ++#endif ++ ++// Define to empty if `const' does not conform to ANSI C. ++/* #define const */ ++ ++// Define as `__inline' if that's what the C compiler calls it, or to nothing ++// if it is not supported. ++/* #define inline __inline */ ++ ++// Define to `long' if does not define. ++/* typedef long off_t; */ ++ ++// Define to `unsigned' if does not define. ++/* typedef long size_t; */ ++ ++#endif // CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F ++ +diff --git a/feeds/packages/libs/ustl/patches/.svn/entries b/feeds/packages/libs/ustl/patches/.svn/entries +new file mode 100644 +index 0000000..f165b63 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/ustl/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-02T02:36:52.752590Z ++25304 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-install_path.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++ca66c4a05fb914030067103ab14d01bf ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++316 ++ ++001-install-DESTDIR.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++6d49741830425542b81cb979f2aadd7f ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2385 ++ ++003-fix_stream_bounds_check_dep.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++d79cfd8778f826823d4639663494fbac ++2011-02-02T02:36:52.752590Z ++25304 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1616 ++ +diff --git a/feeds/packages/libs/ustl/patches/.svn/prop-base/001-install-DESTDIR.patch.svn-base b/feeds/packages/libs/ustl/patches/.svn/prop-base/001-install-DESTDIR.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/.svn/prop-base/001-install-DESTDIR.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/ustl/patches/.svn/prop-base/002-install_path.patch.svn-base b/feeds/packages/libs/ustl/patches/.svn/prop-base/002-install_path.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/.svn/prop-base/002-install_path.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/ustl/patches/.svn/text-base/001-install-DESTDIR.patch.svn-base b/feeds/packages/libs/ustl/patches/.svn/text-base/001-install-DESTDIR.patch.svn-base +new file mode 100644 +index 0000000..ec3a959 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/.svn/text-base/001-install-DESTDIR.patch.svn-base +@@ -0,0 +1,56 @@ ++diff -ruN ustl-0.8-old/Makefile ustl-0.8-new/Makefile ++--- ustl-0.8-old/Makefile 2005-11-10 21:06:53.000000000 +0100 +++++ ustl-0.8-new/Makefile 2005-12-08 13:57:07.000000000 +0100 ++@@ -39,35 +39,35 @@ ++ .PHONY: install-static install-shared uninstall-static uninstall-shared ++ ++ install-shared: ${LIBSOBLD} install-incs ++- @echo "Installing ${LIBSOBLD} to ${LIBDIR} ..." ++- @${INSTALLDIR} ${LIBDIR} ++- @${INSTALLLIB} ${LIBSOBLD} ${LIBDIR} ++- @(cd ${LIBDIR}; ${RM} ${LIBSO} ${LIBSOLNK}; ${LN} -sf ${LIBSOBLD} ${LIBSO}; ${LN} -sf ${LIBSOBLD} ${LIBSOLNK}) +++ @echo "Installing ${LIBSOBLD} to ${DESTDIR}${LIBDIR} ..." +++ @${INSTALLDIR} ${DESTDIR}${LIBDIR} +++ @${INSTALLLIB} ${LIBSOBLD} ${DESTDIR}${LIBDIR} +++ @(cd ${DESTDIR}${LIBDIR}; ${RM} ${LIBSO} ${LIBSOLNK}; ${LN} -sf ${LIBSOBLD} ${LIBSO}; ${LN} -sf ${LIBSOBLD} ${LIBSOLNK}) ++ ++ uninstall-shared: uninstall-incs ++- @echo "Removing ${LIBSOBLD} from ${LIBDIR} ..." ++- @${RM} -f ${LIBDIR}/${LIBSO} ${LIBDIR}/${LIBSOLNK} ${LIBDIR}/${LIBSOBLD} +++ @echo "Removing ${LIBSOBLD} from ${DESTDIR}${LIBDIR} ..." +++ @${RM} -f ${DESTDIR}${LIBDIR}/${LIBSO} ${DESTDIR}${LIBDIR}/${LIBSOLNK} ${DESTDIR}${LIBDIR}/${LIBSOBLD} ++ ++ install-static: ${LIBA} install-incs ++- @echo "Installing ${LIBA} to ${LIBDIR} ..." ++- @${INSTALLDIR} ${LIBDIR} ++- @${INSTALLLIB} ${LIBA} ${LIBDIR} +++ @echo "Installing ${LIBA} to ${DESTDIR}${LIBDIR} ..." +++ @${INSTALLDIR} ${DESTDIR}${LIBDIR} +++ @${INSTALLLIB} ${LIBA} ${DESTDIR}${LIBDIR} ++ ++ uninstall-static: uninstall-incs ++- @echo "Removing ${LIBA} from ${LIBDIR} ..." ++- @${RM} -f ${LIBDIR}/${LIBA} +++ @echo "Removing ${LIBA} from ${DESTDIR}${LIBDIR} ..." +++ @${RM} -f ${DESTDIR}${LIBDIR}/${LIBA} ++ ++ install-incs: ${INCS} ++- @echo "Installing headers to ${INCDIR} ..." ++- @${INSTALLDIR} ${INCDIR}/${LIBNAME} +++ @echo "Installing headers to ${DESTDIR}${INCDIR} ..." +++ @${INSTALLDIR} ${DESTDIR}${INCDIR}/${LIBNAME} ++ @for i in $(filter-out ${LIBNAME}.h,${INCS}); do \ ++- ${INSTALLDATA} $$i ${INCDIR}/${LIBNAME}/$$i; \ +++ ${INSTALLDATA} $$i ${DESTDIR}${INCDIR}/${LIBNAME}/$$i; \ ++ done; ++- @${INSTALLDATA} ${LIBNAME}.h ${INCDIR} +++ @${INSTALLDATA} ${LIBNAME}.h ${DESTDIR}${INCDIR} ++ ++ uninstall-incs: ++- @echo "Removing headers from ${INCDIR} ..." ++- @${RM} -rf ${INCDIR}/${LIBNAME} ${INCDIR}/${LIBNAME}.h +++ @echo "Removing headers from ${DESTDIR}${INCDIR} ..." +++ @${RM} -rf ${DESTDIR}${INCDIR}/${LIBNAME} ${DESTDIR}${INCDIR}/${LIBNAME}.h ++ ++ ++ %.o: %.cc +diff --git a/feeds/packages/libs/ustl/patches/.svn/text-base/002-install_path.patch.svn-base b/feeds/packages/libs/ustl/patches/.svn/text-base/002-install_path.patch.svn-base +new file mode 100644 +index 0000000..3a7cf8a +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/.svn/text-base/002-install_path.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -urN ustl.old/Common.mk.in ustl.dev/Common.mk.in ++--- ustl.old/Common.mk.in 2005-11-10 21:06:53.000000000 +0100 +++++ ustl.dev/Common.mk.in 2006-03-23 16:12:05.000000000 +0100 ++@@ -9,7 +9,7 @@ ++ AR = @AR@ ++ RANLIB = @RANLIB@ ++ DOXYGEN = @DOXYGEN@ ++-INSTALL = @INSTALL@ +++INSTALL = install ++ RM = @RM@ ++ LN = @LN@ ++ +diff --git a/feeds/packages/libs/ustl/patches/.svn/text-base/003-fix_stream_bounds_check_dep.patch.svn-base b/feeds/packages/libs/ustl/patches/.svn/text-base/003-fix_stream_bounds_check_dep.patch.svn-base +new file mode 100644 +index 0000000..6def743 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/.svn/text-base/003-fix_stream_bounds_check_dep.patch.svn-base +@@ -0,0 +1,54 @@ ++--- a/config.h.in +++++ b/config.h.in ++@@ -15,6 +15,9 @@ ++ // Define to the address where bug reports for this package should be sent. ++ #define USTL_BUGREPORT "@PACKAGE_BUGREPORT@" ++ +++/// Define to 1 if you want to build without libstdc++ +++#undef WITHOUT_LIBSTDCPP +++ ++ /// Define to 1 if you want stream operations to throw exceptions on ++ /// insufficient data or insufficient space. All these errors should ++ /// be preventable in output code; the input code should verify the ++@@ -23,13 +26,10 @@ ++ /// ++ #undef WANT_STREAM_BOUNDS_CHECKING ++ ++-#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) +++#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) && !defined(WITHOUT_LIBSTDCPP) ++ #define WANT_STREAM_BOUNDS_CHECKING 1 ++ #endif ++ ++-/// Define to 1 if you want to build without libstdc++ ++-#undef WITHOUT_LIBSTDCPP ++- ++ /// Define to 1 if you don't want the standard streams. ++ /// You will not be able to run bvt tests if you do this. ++ /// ++--- a/mostream.h +++++ b/mostream.h ++@@ -11,7 +11,9 @@ ++ #include "memlink.h" ++ #include "uexception.h" ++ #include "utf8.h" +++#ifdef WANT_STREAM_BOUNDS_CHECKING ++ #include +++#endif ++ ++ namespace ustl { ++ ++--- a/uctrstrm.h +++++ b/uctrstrm.h ++@@ -109,8 +109,12 @@ ++ size_type n; ++ is >> n; ++ const size_type expectedSize = n * stream_size_of(value_type()); +++#ifdef WANT_STREAM_BOUNDS_CHECKING ++ if (expectedSize > is.remaining()) ++ throw stream_bounds_exception ("read", typeid(v).name(), is.pos(), expectedSize, is.remaining()); +++#else +++ assert(expectedSize <= is.remaining()); +++#endif ++ v.resize (n); ++ nr_container_read (is, v); ++ is.align(); +diff --git a/feeds/packages/libs/ustl/patches/001-install-DESTDIR.patch b/feeds/packages/libs/ustl/patches/001-install-DESTDIR.patch +new file mode 100644 +index 0000000..ec3a959 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/001-install-DESTDIR.patch +@@ -0,0 +1,56 @@ ++diff -ruN ustl-0.8-old/Makefile ustl-0.8-new/Makefile ++--- ustl-0.8-old/Makefile 2005-11-10 21:06:53.000000000 +0100 +++++ ustl-0.8-new/Makefile 2005-12-08 13:57:07.000000000 +0100 ++@@ -39,35 +39,35 @@ ++ .PHONY: install-static install-shared uninstall-static uninstall-shared ++ ++ install-shared: ${LIBSOBLD} install-incs ++- @echo "Installing ${LIBSOBLD} to ${LIBDIR} ..." ++- @${INSTALLDIR} ${LIBDIR} ++- @${INSTALLLIB} ${LIBSOBLD} ${LIBDIR} ++- @(cd ${LIBDIR}; ${RM} ${LIBSO} ${LIBSOLNK}; ${LN} -sf ${LIBSOBLD} ${LIBSO}; ${LN} -sf ${LIBSOBLD} ${LIBSOLNK}) +++ @echo "Installing ${LIBSOBLD} to ${DESTDIR}${LIBDIR} ..." +++ @${INSTALLDIR} ${DESTDIR}${LIBDIR} +++ @${INSTALLLIB} ${LIBSOBLD} ${DESTDIR}${LIBDIR} +++ @(cd ${DESTDIR}${LIBDIR}; ${RM} ${LIBSO} ${LIBSOLNK}; ${LN} -sf ${LIBSOBLD} ${LIBSO}; ${LN} -sf ${LIBSOBLD} ${LIBSOLNK}) ++ ++ uninstall-shared: uninstall-incs ++- @echo "Removing ${LIBSOBLD} from ${LIBDIR} ..." ++- @${RM} -f ${LIBDIR}/${LIBSO} ${LIBDIR}/${LIBSOLNK} ${LIBDIR}/${LIBSOBLD} +++ @echo "Removing ${LIBSOBLD} from ${DESTDIR}${LIBDIR} ..." +++ @${RM} -f ${DESTDIR}${LIBDIR}/${LIBSO} ${DESTDIR}${LIBDIR}/${LIBSOLNK} ${DESTDIR}${LIBDIR}/${LIBSOBLD} ++ ++ install-static: ${LIBA} install-incs ++- @echo "Installing ${LIBA} to ${LIBDIR} ..." ++- @${INSTALLDIR} ${LIBDIR} ++- @${INSTALLLIB} ${LIBA} ${LIBDIR} +++ @echo "Installing ${LIBA} to ${DESTDIR}${LIBDIR} ..." +++ @${INSTALLDIR} ${DESTDIR}${LIBDIR} +++ @${INSTALLLIB} ${LIBA} ${DESTDIR}${LIBDIR} ++ ++ uninstall-static: uninstall-incs ++- @echo "Removing ${LIBA} from ${LIBDIR} ..." ++- @${RM} -f ${LIBDIR}/${LIBA} +++ @echo "Removing ${LIBA} from ${DESTDIR}${LIBDIR} ..." +++ @${RM} -f ${DESTDIR}${LIBDIR}/${LIBA} ++ ++ install-incs: ${INCS} ++- @echo "Installing headers to ${INCDIR} ..." ++- @${INSTALLDIR} ${INCDIR}/${LIBNAME} +++ @echo "Installing headers to ${DESTDIR}${INCDIR} ..." +++ @${INSTALLDIR} ${DESTDIR}${INCDIR}/${LIBNAME} ++ @for i in $(filter-out ${LIBNAME}.h,${INCS}); do \ ++- ${INSTALLDATA} $$i ${INCDIR}/${LIBNAME}/$$i; \ +++ ${INSTALLDATA} $$i ${DESTDIR}${INCDIR}/${LIBNAME}/$$i; \ ++ done; ++- @${INSTALLDATA} ${LIBNAME}.h ${INCDIR} +++ @${INSTALLDATA} ${LIBNAME}.h ${DESTDIR}${INCDIR} ++ ++ uninstall-incs: ++- @echo "Removing headers from ${INCDIR} ..." ++- @${RM} -rf ${INCDIR}/${LIBNAME} ${INCDIR}/${LIBNAME}.h +++ @echo "Removing headers from ${DESTDIR}${INCDIR} ..." +++ @${RM} -rf ${DESTDIR}${INCDIR}/${LIBNAME} ${DESTDIR}${INCDIR}/${LIBNAME}.h ++ ++ ++ %.o: %.cc +diff --git a/feeds/packages/libs/ustl/patches/002-install_path.patch b/feeds/packages/libs/ustl/patches/002-install_path.patch +new file mode 100644 +index 0000000..3a7cf8a +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/002-install_path.patch +@@ -0,0 +1,12 @@ ++diff -urN ustl.old/Common.mk.in ustl.dev/Common.mk.in ++--- ustl.old/Common.mk.in 2005-11-10 21:06:53.000000000 +0100 +++++ ustl.dev/Common.mk.in 2006-03-23 16:12:05.000000000 +0100 ++@@ -9,7 +9,7 @@ ++ AR = @AR@ ++ RANLIB = @RANLIB@ ++ DOXYGEN = @DOXYGEN@ ++-INSTALL = @INSTALL@ +++INSTALL = install ++ RM = @RM@ ++ LN = @LN@ ++ +diff --git a/feeds/packages/libs/ustl/patches/003-fix_stream_bounds_check_dep.patch b/feeds/packages/libs/ustl/patches/003-fix_stream_bounds_check_dep.patch +new file mode 100644 +index 0000000..6def743 +--- /dev/null ++++ b/feeds/packages/libs/ustl/patches/003-fix_stream_bounds_check_dep.patch +@@ -0,0 +1,54 @@ ++--- a/config.h.in +++++ b/config.h.in ++@@ -15,6 +15,9 @@ ++ // Define to the address where bug reports for this package should be sent. ++ #define USTL_BUGREPORT "@PACKAGE_BUGREPORT@" ++ +++/// Define to 1 if you want to build without libstdc++ +++#undef WITHOUT_LIBSTDCPP +++ ++ /// Define to 1 if you want stream operations to throw exceptions on ++ /// insufficient data or insufficient space. All these errors should ++ /// be preventable in output code; the input code should verify the ++@@ -23,13 +26,10 @@ ++ /// ++ #undef WANT_STREAM_BOUNDS_CHECKING ++ ++-#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) +++#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) && !defined(WITHOUT_LIBSTDCPP) ++ #define WANT_STREAM_BOUNDS_CHECKING 1 ++ #endif ++ ++-/// Define to 1 if you want to build without libstdc++ ++-#undef WITHOUT_LIBSTDCPP ++- ++ /// Define to 1 if you don't want the standard streams. ++ /// You will not be able to run bvt tests if you do this. ++ /// ++--- a/mostream.h +++++ b/mostream.h ++@@ -11,7 +11,9 @@ ++ #include "memlink.h" ++ #include "uexception.h" ++ #include "utf8.h" +++#ifdef WANT_STREAM_BOUNDS_CHECKING ++ #include +++#endif ++ ++ namespace ustl { ++ ++--- a/uctrstrm.h +++++ b/uctrstrm.h ++@@ -109,8 +109,12 @@ ++ size_type n; ++ is >> n; ++ const size_type expectedSize = n * stream_size_of(value_type()); +++#ifdef WANT_STREAM_BOUNDS_CHECKING ++ if (expectedSize > is.remaining()) ++ throw stream_bounds_exception ("read", typeid(v).name(), is.pos(), expectedSize, is.remaining()); +++#else +++ assert(expectedSize <= is.remaining()); +++#endif ++ v.resize (n); ++ nr_container_read (is, v); ++ is.align(); +diff --git a/feeds/packages/libs/vips/.svn/entries b/feeds/packages/libs/vips/.svn/entries +new file mode 100644 +index 0000000..422c5ab +--- /dev/null ++++ b/feeds/packages/libs/vips/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/vips ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-17T17:25:29.011623Z ++32771 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d7c9dc18144b25751730bb8d3e9a3af9 ++2012-07-17T17:25:29.011623Z ++32771 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1672 ++ +diff --git a/feeds/packages/libs/vips/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/vips/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..69dff41 +--- /dev/null ++++ b/feeds/packages/libs/vips/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,80 @@ ++# ++# 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.28.9 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.28/ ++PKG_MD5SUM:=c34e4c6367078c6d50893927aa5924bd ++PKG_FIXUP:=autoreconf ++ ++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/ ++ 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/feeds/packages/libs/vips/Makefile b/feeds/packages/libs/vips/Makefile +new file mode 100644 +index 0000000..69dff41 +--- /dev/null ++++ b/feeds/packages/libs/vips/Makefile +@@ -0,0 +1,80 @@ ++# ++# 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.28.9 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.28/ ++PKG_MD5SUM:=c34e4c6367078c6d50893927aa5924bd ++PKG_FIXUP:=autoreconf ++ ++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/ ++ 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/feeds/packages/libs/vips/patches/.svn/entries b/feeds/packages/libs/vips/patches/.svn/entries +new file mode 100644 +index 0000000..28b1af2 +--- /dev/null ++++ b/feeds/packages/libs/vips/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/vips/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T12:22:53.900016Z ++32744 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_cpp.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d25a6be39c1df347a65b74464c0d4373 ++2012-07-16T12:22:53.900016Z ++32744 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7419 ++ +diff --git a/feeds/packages/libs/vips/patches/.svn/text-base/001-no_cpp.patch.svn-base b/feeds/packages/libs/vips/patches/.svn/text-base/001-no_cpp.patch.svn-base +new file mode 100644 +index 0000000..8f54073 +--- /dev/null ++++ b/feeds/packages/libs/vips/patches/.svn/text-base/001-no_cpp.patch.svn-base +@@ -0,0 +1,279 @@ ++diff -u --recursive vips-7.28.9-vanilla/configure.in vips-7.28.9/configure.in ++--- vips-7.28.9-vanilla/configure.in 2012-07-14 22:35:08.209029299 -0500 +++++ vips-7.28.9/configure.in 2012-07-14 22:36:25.634927858 -0500 ++@@ -182,7 +182,6 @@ ++ AC_PROG_AWK ++ AC_PROG_CC ++ AC_PROG_CC_STDC ++-AC_PROG_CXX ++ AC_C_CONST ++ AC_C_RESTRICT ++ AC_PROG_RANLIB ++@@ -190,45 +189,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 ++-# platforms, so have an option to disable it ++-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-7.xx.pc to help mingw and friends link programs ++- # using libvips ++- VIPS_CXX_LIBS="-lstdc++" ++- 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 ++- ++ # we need a fully expanded version of $libdir ++ # without this we get something like ++ # define VIPS_LIBDIR ${exec_prefix}/lib ++@@ -681,7 +641,6 @@ ++ AC_SUBST(VIPS_CFLAGS) ++ AC_SUBST(VIPS_INCLUDES) ++ AC_SUBST(VIPS_LIBS) ++-AC_SUBST(VIPS_CXX_LIBS) ++ AC_SUBST(PACKAGES_USED) ++ ++ # you'd think we could have ++@@ -689,14 +648,12 @@ ++ # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 ++ AC_OUTPUT([ ++ vips-7.28.pc ++- vipsCC-7.28.pc ++ Makefile ++ libvips/include/vips/version.h ++ libvips/include/Makefile ++ libvips/include/vips/Makefile ++ libvips/Makefile ++ libvips/arithmetic/Makefile ++- libvips/cimg/Makefile ++ libvips/colour/Makefile ++ libvips/conversion/Makefile ++ libvips/convolution/Makefile ++@@ -711,9 +668,6 @@ ++ libvips/other/Makefile ++ libvips/resample/Makefile ++ libvips/video/Makefile ++- libvipsCC/include/Makefile ++- libvipsCC/include/vips/Makefile ++- libvipsCC/Makefile ++ tools/Makefile ++ tools/batch_crop ++ tools/batch_image_convert ++@@ -721,7 +675,6 @@ ++ tools/light_correct ++ tools/shrink_width ++ swig/Makefile ++- swig/vipsCC/Makefile ++ swig/python/setup.py ++ man/Makefile ++ doc/Makefile ++diff -u --recursive vips-7.28.9-vanilla/libvips/Makefile.am vips-7.28.9/libvips/Makefile.am ++--- vips-7.28.9-vanilla/libvips/Makefile.am 2012-07-14 22:35:08.206029420 -0500 +++++ vips-7.28.9/libvips/Makefile.am 2012-07-14 22:37:24.446571912 -0500 ++@@ -1,14 +1,4 @@ ++ # only build in the cimg dir if C++ is enabled ++-if ENABLE_CXX ++-C_COMPILE_DIR = cimg ++-C_DIST_DIR = ++-C_LIB = cimg/libcimg.la ++-else ++-C_COMPILE_DIR = ++-C_DIST_DIR = cimg ++-C_LIB = ++-endif ++- ++ SUBDIRS = \ ++ include \ ++ foreign \ ++@@ -18,7 +8,6 @@ ++ conversion \ ++ deprecated \ ++ convolution \ ++- $(C_COMPILE_DIR) \ ++ freq_filt \ ++ histograms_lut \ ++ inplace \ ++@@ -34,14 +23,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 = cimg/dummy2.cc ++-endif ++- ++ # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end ++ libvips_la_LIBADD = \ ++ resample/libresample.la \ ++@@ -50,7 +31,6 @@ ++ conversion/libconversion.la \ ++ convolution/libconvolution.la \ ++ deprecated/libdeprecated.la \ ++- $(C_LIB) \ ++ foreign/libforeign.la \ ++ freq_filt/libfreq_filt.la \ ++ histograms_lut/libhistograms_lut.la \ ++@@ -62,17 +42,10 @@ ++ video/libvideo.la \ ++ @VIPS_LIBS@ ++ ++-if ENABLE_CXX ++-libvips_la_LIBADD += @VIPS_CXX_LIBS@ ++-endif ++- ++ libvips_la_LDFLAGS = \ ++ -no-undefined \ ++ -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ ++ ++-EXTRA_DIST = \ ++- $(C_DIST_DIR) ++- ++ CLEANFILES = ++ ++ -include $(INTROSPECTION_MAKEFILE) ++diff -u --recursive vips-7.28.9-vanilla/libvips/resample/Makefile.am vips-7.28.9/libvips/resample/Makefile.am ++--- vips-7.28.9-vanilla/libvips/resample/Makefile.am 2012-07-14 22:35:08.191030020 -0500 +++++ vips-7.28.9/libvips/resample/Makefile.am 2012-07-14 22:37:49.470569578 -0500 ++@@ -2,22 +2,6 @@ ++ # 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 = \ ++- im_affine.c \ ++- interpolate.c \ ++- im_shrink.c \ ++- im_rightshift_size.c \ ++- transform.c \ ++- resample_dispatch.c \ ++- bicubic.cpp \ ++- lbb.cpp \ ++- nohalo.cpp \ ++- vsqbs.cpp \ ++- templates.h ++- ++-else ++ ++ libresample_la_SOURCES = \ ++ im_affine.c \ ++@@ -27,15 +11,6 @@ ++ transform.c \ ++ resample_dispatch.c ++ ++-EXTRA_DIST = \ ++- bicubic.cpp \ ++- lbb.cpp \ ++- nohalo.cpp \ ++- vsqbs.cpp \ ++- templates.h ++- ++-endif ++- ++ noinst_LTLIBRARIES = libresample.la ++ ++ INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ ++diff -u --recursive vips-7.28.9-vanilla/Makefile.am vips-7.28.9/Makefile.am ++--- vips-7.28.9-vanilla/Makefile.am 2012-07-14 22:35:08.220028859 -0500 +++++ vips-7.28.9/Makefile.am 2012-07-14 22:38:43.217417048 -0500 ++@@ -1,43 +1,17 @@ ++- ++-# turn off libvipsCC if C++ is disabled ++-if ENABLE_CXX ++-C_COMPILE_DIR = libvipsCC ++-C_DIST_DIR = ++-C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc ++- ++-# turn on Python if we can (requires C++) ++-if HAVE_PYTHON ++-P_COMPILE_DIR = swig ++-P_DIST_DIR = ++-endif ++- ++-else ++-C_COMPILE_DIR = ++-C_DIST_DIR = libvipsCC ++-C_PKGCONFIG = ++-P_COMPILE_DIR = ++-P_DIST_DIR = swig ++-endif ++- ++ SUBDIRS = \ ++ libvips \ ++ tools \ ++ po \ ++ man \ ++- doc \ ++- $(C_COMPILE_DIR) \ ++- $(P_COMPILE_DIR) +++ doc ++ ++ EXTRA_DIST = \ ++ m4 \ ++ benchmark \ ++ bootstrap.sh \ ++ vips-7.${VIPS_MINOR_VERSION}.pc.in \ ++- vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \ ++ acinclude.m4 \ ++- depcomp \ ++- $(C_DIST_DIR) \ ++- $(P_DIST_DIR) +++ depcomp ++ ++ pkgconfigdir = $(libdir)/pkgconfig ++ pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) ++diff -u --recursive vips-7.28.9-vanilla/tools/Makefile.am vips-7.28.9/tools/Makefile.am ++--- vips-7.28.9-vanilla/tools/Makefile.am 2012-07-14 22:35:08.221028819 -0500 +++++ vips-7.28.9/tools/Makefile.am 2012-07-14 22:40:51.397283833 -0500 ++@@ -16,9 +16,6 @@ ++ INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ ++ AM_LDFLAGS = @LDFLAGS@ ++ LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@ ++-if ENABLE_CXX ++-LDADD += @VIPS_CXX_LIBS@ ++-endif ++ ++ bin_SCRIPTS = \ ++ light_correct \ ++diff -u --recursive vips-7.28.9-vanilla/vips-7.28.pc.in vips-7.28.9/vips-7.28.pc.in ++--- vips-7.28.9-vanilla/vips-7.28.pc.in 2012-07-14 22:35:08.208029340 -0500 +++++ vips-7.28.9/vips-7.28.pc.in 2012-07-14 22:41:03.591795535 -0500 ++@@ -7,5 +7,5 @@ ++ Description: Image processing library ++ Version: @VERSION@ ++ Requires: @PACKAGES_USED@ ++-Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@ +++Libs: -L${libdir} -lvips @VIPS_LIBS@ ++ Cflags: -I${includedir} +diff --git a/feeds/packages/libs/vips/patches/001-no_cpp.patch b/feeds/packages/libs/vips/patches/001-no_cpp.patch +new file mode 100644 +index 0000000..8f54073 +--- /dev/null ++++ b/feeds/packages/libs/vips/patches/001-no_cpp.patch +@@ -0,0 +1,279 @@ ++diff -u --recursive vips-7.28.9-vanilla/configure.in vips-7.28.9/configure.in ++--- vips-7.28.9-vanilla/configure.in 2012-07-14 22:35:08.209029299 -0500 +++++ vips-7.28.9/configure.in 2012-07-14 22:36:25.634927858 -0500 ++@@ -182,7 +182,6 @@ ++ AC_PROG_AWK ++ AC_PROG_CC ++ AC_PROG_CC_STDC ++-AC_PROG_CXX ++ AC_C_CONST ++ AC_C_RESTRICT ++ AC_PROG_RANLIB ++@@ -190,45 +189,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 ++-# platforms, so have an option to disable it ++-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-7.xx.pc to help mingw and friends link programs ++- # using libvips ++- VIPS_CXX_LIBS="-lstdc++" ++- 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 ++- ++ # we need a fully expanded version of $libdir ++ # without this we get something like ++ # define VIPS_LIBDIR ${exec_prefix}/lib ++@@ -681,7 +641,6 @@ ++ AC_SUBST(VIPS_CFLAGS) ++ AC_SUBST(VIPS_INCLUDES) ++ AC_SUBST(VIPS_LIBS) ++-AC_SUBST(VIPS_CXX_LIBS) ++ AC_SUBST(PACKAGES_USED) ++ ++ # you'd think we could have ++@@ -689,14 +648,12 @@ ++ # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 ++ AC_OUTPUT([ ++ vips-7.28.pc ++- vipsCC-7.28.pc ++ Makefile ++ libvips/include/vips/version.h ++ libvips/include/Makefile ++ libvips/include/vips/Makefile ++ libvips/Makefile ++ libvips/arithmetic/Makefile ++- libvips/cimg/Makefile ++ libvips/colour/Makefile ++ libvips/conversion/Makefile ++ libvips/convolution/Makefile ++@@ -711,9 +668,6 @@ ++ libvips/other/Makefile ++ libvips/resample/Makefile ++ libvips/video/Makefile ++- libvipsCC/include/Makefile ++- libvipsCC/include/vips/Makefile ++- libvipsCC/Makefile ++ tools/Makefile ++ tools/batch_crop ++ tools/batch_image_convert ++@@ -721,7 +675,6 @@ ++ tools/light_correct ++ tools/shrink_width ++ swig/Makefile ++- swig/vipsCC/Makefile ++ swig/python/setup.py ++ man/Makefile ++ doc/Makefile ++diff -u --recursive vips-7.28.9-vanilla/libvips/Makefile.am vips-7.28.9/libvips/Makefile.am ++--- vips-7.28.9-vanilla/libvips/Makefile.am 2012-07-14 22:35:08.206029420 -0500 +++++ vips-7.28.9/libvips/Makefile.am 2012-07-14 22:37:24.446571912 -0500 ++@@ -1,14 +1,4 @@ ++ # only build in the cimg dir if C++ is enabled ++-if ENABLE_CXX ++-C_COMPILE_DIR = cimg ++-C_DIST_DIR = ++-C_LIB = cimg/libcimg.la ++-else ++-C_COMPILE_DIR = ++-C_DIST_DIR = cimg ++-C_LIB = ++-endif ++- ++ SUBDIRS = \ ++ include \ ++ foreign \ ++@@ -18,7 +8,6 @@ ++ conversion \ ++ deprecated \ ++ convolution \ ++- $(C_COMPILE_DIR) \ ++ freq_filt \ ++ histograms_lut \ ++ inplace \ ++@@ -34,14 +23,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 = cimg/dummy2.cc ++-endif ++- ++ # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end ++ libvips_la_LIBADD = \ ++ resample/libresample.la \ ++@@ -50,7 +31,6 @@ ++ conversion/libconversion.la \ ++ convolution/libconvolution.la \ ++ deprecated/libdeprecated.la \ ++- $(C_LIB) \ ++ foreign/libforeign.la \ ++ freq_filt/libfreq_filt.la \ ++ histograms_lut/libhistograms_lut.la \ ++@@ -62,17 +42,10 @@ ++ video/libvideo.la \ ++ @VIPS_LIBS@ ++ ++-if ENABLE_CXX ++-libvips_la_LIBADD += @VIPS_CXX_LIBS@ ++-endif ++- ++ libvips_la_LDFLAGS = \ ++ -no-undefined \ ++ -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ ++ ++-EXTRA_DIST = \ ++- $(C_DIST_DIR) ++- ++ CLEANFILES = ++ ++ -include $(INTROSPECTION_MAKEFILE) ++diff -u --recursive vips-7.28.9-vanilla/libvips/resample/Makefile.am vips-7.28.9/libvips/resample/Makefile.am ++--- vips-7.28.9-vanilla/libvips/resample/Makefile.am 2012-07-14 22:35:08.191030020 -0500 +++++ vips-7.28.9/libvips/resample/Makefile.am 2012-07-14 22:37:49.470569578 -0500 ++@@ -2,22 +2,6 @@ ++ # 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 = \ ++- im_affine.c \ ++- interpolate.c \ ++- im_shrink.c \ ++- im_rightshift_size.c \ ++- transform.c \ ++- resample_dispatch.c \ ++- bicubic.cpp \ ++- lbb.cpp \ ++- nohalo.cpp \ ++- vsqbs.cpp \ ++- templates.h ++- ++-else ++ ++ libresample_la_SOURCES = \ ++ im_affine.c \ ++@@ -27,15 +11,6 @@ ++ transform.c \ ++ resample_dispatch.c ++ ++-EXTRA_DIST = \ ++- bicubic.cpp \ ++- lbb.cpp \ ++- nohalo.cpp \ ++- vsqbs.cpp \ ++- templates.h ++- ++-endif ++- ++ noinst_LTLIBRARIES = libresample.la ++ ++ INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ ++diff -u --recursive vips-7.28.9-vanilla/Makefile.am vips-7.28.9/Makefile.am ++--- vips-7.28.9-vanilla/Makefile.am 2012-07-14 22:35:08.220028859 -0500 +++++ vips-7.28.9/Makefile.am 2012-07-14 22:38:43.217417048 -0500 ++@@ -1,43 +1,17 @@ ++- ++-# turn off libvipsCC if C++ is disabled ++-if ENABLE_CXX ++-C_COMPILE_DIR = libvipsCC ++-C_DIST_DIR = ++-C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc ++- ++-# turn on Python if we can (requires C++) ++-if HAVE_PYTHON ++-P_COMPILE_DIR = swig ++-P_DIST_DIR = ++-endif ++- ++-else ++-C_COMPILE_DIR = ++-C_DIST_DIR = libvipsCC ++-C_PKGCONFIG = ++-P_COMPILE_DIR = ++-P_DIST_DIR = swig ++-endif ++- ++ SUBDIRS = \ ++ libvips \ ++ tools \ ++ po \ ++ man \ ++- doc \ ++- $(C_COMPILE_DIR) \ ++- $(P_COMPILE_DIR) +++ doc ++ ++ EXTRA_DIST = \ ++ m4 \ ++ benchmark \ ++ bootstrap.sh \ ++ vips-7.${VIPS_MINOR_VERSION}.pc.in \ ++- vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \ ++ acinclude.m4 \ ++- depcomp \ ++- $(C_DIST_DIR) \ ++- $(P_DIST_DIR) +++ depcomp ++ ++ pkgconfigdir = $(libdir)/pkgconfig ++ pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) ++diff -u --recursive vips-7.28.9-vanilla/tools/Makefile.am vips-7.28.9/tools/Makefile.am ++--- vips-7.28.9-vanilla/tools/Makefile.am 2012-07-14 22:35:08.221028819 -0500 +++++ vips-7.28.9/tools/Makefile.am 2012-07-14 22:40:51.397283833 -0500 ++@@ -16,9 +16,6 @@ ++ INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ ++ AM_LDFLAGS = @LDFLAGS@ ++ LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@ ++-if ENABLE_CXX ++-LDADD += @VIPS_CXX_LIBS@ ++-endif ++ ++ bin_SCRIPTS = \ ++ light_correct \ ++diff -u --recursive vips-7.28.9-vanilla/vips-7.28.pc.in vips-7.28.9/vips-7.28.pc.in ++--- vips-7.28.9-vanilla/vips-7.28.pc.in 2012-07-14 22:35:08.208029340 -0500 +++++ vips-7.28.9/vips-7.28.pc.in 2012-07-14 22:41:03.591795535 -0500 ++@@ -7,5 +7,5 @@ ++ Description: Image processing library ++ Version: @VERSION@ ++ Requires: @PACKAGES_USED@ ++-Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@ +++Libs: -L${libdir} -lvips @VIPS_LIBS@ ++ Cflags: -I${includedir} +diff --git a/feeds/packages/libs/wt/.svn/entries b/feeds/packages/libs/wt/.svn/entries +new file mode 100644 +index 0000000..b7ba4aa +--- /dev/null ++++ b/feeds/packages/libs/wt/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/wt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T17:22:31.941287Z ++34636 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++bfe8796a466532d58daff702ea70ceb6 ++2011-10-06T16:17:33.810998Z ++28375 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3927 ++ +diff --git a/feeds/packages/libs/wt/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/wt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b9b4941 +--- /dev/null ++++ b/feeds/packages/libs/wt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,164 @@ ++# ++# 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:=wt ++PKG_VERSION:=3.1.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/witty/wt/$(PKG_VERSION) ++PKG_MD5SUM:=ee9490d5f24a47766e54f630ba0da2bb ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++PKG_INSTALL:=1 ++ ++define Package/wt/Default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=http://www.webtoolkit.eu/wt ++endef ++ ++define Package/wt ++ $(call Package/wt/Default) ++ MENU:=1 ++ DEPENDS:= +libstdcpp +boost-date_time +boost-system +boost-filesystem +boost-thread +boost-program_options +boost-signals +boost-regex +libpthread ++ TITLE:=C++ Web Toolkit ++endef ++ ++define Package/wt-resources ++ $(call Package/wt/Default) ++ DEPENDS:=wt ++ TITLE:=Optional Resource Files ++endef ++ ++define Package/wt-fcgi ++ $(call Package/wt/Default) ++ DEPENDS:=wt +fcgixx ++ TITLE:=FastCGI Connector ++endef ++ ++define Package/wt-http ++ $(call Package/wt/Default) ++ DEPENDS:=wt +PACKAGE_wt_http_zlib:zlib +PACKAGE_wt_http_ssl:libopenssl ++ TITLE:=Built in HTTP Server ++endef ++ ++define Package/wt-http/config ++config PACKAGE_wt_http_zlib ++ bool "Enable zlib compression option" ++ depends on PACKAGE_wt-http ++ default n ++config PACKAGE_wt_http_ssl ++ bool "Enable ssl option" ++ depends on PACKAGE_wt-http ++ default n ++endef ++ ++define Package/wt-dbo ++ $(call Package/wt/Default) ++ DEPENDS:=wt ++ TITLE:=Object Relational Mapping ++endef ++ ++define Package/wt-dbosqlite3 ++ $(call Package/wt/Default) ++ DEPENDS:=wt +wt-dbo ++ TITLE:=Sqlite3 Dbo Backend ++endef ++ ++define Package/wt-resources/conffiles ++/usr/share/Wt ++endef ++ ++# TODO: some parts of the code show that -DHAVE_GNU_REGEX can be defined to avoid dependence or boost-regex ++# But that's turning out not to be the case (some portions still depend on boost-regex) ++TARGET_CFLAGS += $(FPIC) ++CMAKE_OPTIONS += \ ++ -DCMAKE_BUILD_TYPE=MinSizeRel \ ++ -DCMAKE_CXX_FLAGS_MINSIZEREL:STRING="-DNDEBUG -DWT_NO_SPIRIT -DWT_NO_XSS_FILTER" \ ++ -DSHARED_LIBS:BOOL=ON \ ++ -DBUILD_TESTS=OFF \ ++ -DBUILD_EXAMPLES=OFF \ ++ -DINSTALL_RESOURCES=ON \ ++ -DENABLE_GM=OFF \ ++ -DENABLE_HARU=OFF \ ++ -DENABLE_PANGO=OFF \ ++ -DENABLE_EXT=OFF \ ++ -DENABLE_POSTGRES=OFF \ ++ -DENABLE_QT4=OFF \ ++ -DWT_NO_STD_LOCALE=ON \ ++ -DWT_NO_STD_WSTRING=ON ++ ++ifndef CONFIG_PACKAGE_wt-http ++CMAKE_OPTIONS += \ ++ -DCONNECTOR_HTTP=OFF ++endif ++ ++ifndef CONFIG_PACKAGE_wt_http_zlib ++CMAKE_OPTIONS += \ ++ -DHTTP_WITH_ZLIB=OFF ++endif ++ ++ifndef CONFIG_PACKAGE_wt_http_ssl ++CMAKE_OPTIONS += \ ++ -DHTTP_WITH_SSL=OFF ++endif ++ ++ifndef CONFIG_PACKAGE_wt-fcgi ++CMAKE_OPTIONS += \ ++ -DCONNECTOR_FCGI=OFF ++endif ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) -a $(PKG_INSTALL_DIR)/usr/include/Wt $(1)/usr/include ++ ++ $(INSTALL_DIR) $(1)/usr/share/cmake-2.4/Modules ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cmake-2.4/Modules/FindWt.cmake $(1)/usr/share/cmake-2.4/Modules ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt*.so* $(1)/usr/lib ++endef ++ ++define BuildPlugin ++ define Package/$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib ++ for m in $(2); do \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt$$$$$$$${m}.so* $$(1)/usr/lib/ ; \ ++ done ++ endef ++ ++ $$(eval $$(call BuildPackage,$(1))) ++endef ++ ++define Package/wt/install ++ $(INSTALL_DIR) $(1)/etc/wt ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/wt_config.xml $(1)/etc/wt ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt.so* $(1)/usr/lib ++endef ++ ++define Package/wt/conffiles ++/etc/wt ++endef ++ ++define Package/wt-resources/install ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) -a $(PKG_INSTALL_DIR)/usr/share/Wt $(1)/usr/share ++endef ++ ++$(eval $(call BuildPackage,wt)) ++$(eval $(call BuildPackage,wt-resources)) ++$(eval $(call BuildPlugin,wt-http,http)) ++$(eval $(call BuildPlugin,wt-fcgi,fcgi)) ++$(eval $(call BuildPlugin,wt-dbo,dbo)) ++$(eval $(call BuildPlugin,wt-dbosqlite3,dbosqlite3)) +diff --git a/feeds/packages/libs/wt/Makefile b/feeds/packages/libs/wt/Makefile +new file mode 100644 +index 0000000..b9b4941 +--- /dev/null ++++ b/feeds/packages/libs/wt/Makefile +@@ -0,0 +1,164 @@ ++# ++# 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:=wt ++PKG_VERSION:=3.1.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/witty/wt/$(PKG_VERSION) ++PKG_MD5SUM:=ee9490d5f24a47766e54f630ba0da2bb ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++PKG_INSTALL:=1 ++ ++define Package/wt/Default ++ SECTION:=libs ++ CATEGORY:=Libraries ++ URL:=http://www.webtoolkit.eu/wt ++endef ++ ++define Package/wt ++ $(call Package/wt/Default) ++ MENU:=1 ++ DEPENDS:= +libstdcpp +boost-date_time +boost-system +boost-filesystem +boost-thread +boost-program_options +boost-signals +boost-regex +libpthread ++ TITLE:=C++ Web Toolkit ++endef ++ ++define Package/wt-resources ++ $(call Package/wt/Default) ++ DEPENDS:=wt ++ TITLE:=Optional Resource Files ++endef ++ ++define Package/wt-fcgi ++ $(call Package/wt/Default) ++ DEPENDS:=wt +fcgixx ++ TITLE:=FastCGI Connector ++endef ++ ++define Package/wt-http ++ $(call Package/wt/Default) ++ DEPENDS:=wt +PACKAGE_wt_http_zlib:zlib +PACKAGE_wt_http_ssl:libopenssl ++ TITLE:=Built in HTTP Server ++endef ++ ++define Package/wt-http/config ++config PACKAGE_wt_http_zlib ++ bool "Enable zlib compression option" ++ depends on PACKAGE_wt-http ++ default n ++config PACKAGE_wt_http_ssl ++ bool "Enable ssl option" ++ depends on PACKAGE_wt-http ++ default n ++endef ++ ++define Package/wt-dbo ++ $(call Package/wt/Default) ++ DEPENDS:=wt ++ TITLE:=Object Relational Mapping ++endef ++ ++define Package/wt-dbosqlite3 ++ $(call Package/wt/Default) ++ DEPENDS:=wt +wt-dbo ++ TITLE:=Sqlite3 Dbo Backend ++endef ++ ++define Package/wt-resources/conffiles ++/usr/share/Wt ++endef ++ ++# TODO: some parts of the code show that -DHAVE_GNU_REGEX can be defined to avoid dependence or boost-regex ++# But that's turning out not to be the case (some portions still depend on boost-regex) ++TARGET_CFLAGS += $(FPIC) ++CMAKE_OPTIONS += \ ++ -DCMAKE_BUILD_TYPE=MinSizeRel \ ++ -DCMAKE_CXX_FLAGS_MINSIZEREL:STRING="-DNDEBUG -DWT_NO_SPIRIT -DWT_NO_XSS_FILTER" \ ++ -DSHARED_LIBS:BOOL=ON \ ++ -DBUILD_TESTS=OFF \ ++ -DBUILD_EXAMPLES=OFF \ ++ -DINSTALL_RESOURCES=ON \ ++ -DENABLE_GM=OFF \ ++ -DENABLE_HARU=OFF \ ++ -DENABLE_PANGO=OFF \ ++ -DENABLE_EXT=OFF \ ++ -DENABLE_POSTGRES=OFF \ ++ -DENABLE_QT4=OFF \ ++ -DWT_NO_STD_LOCALE=ON \ ++ -DWT_NO_STD_WSTRING=ON ++ ++ifndef CONFIG_PACKAGE_wt-http ++CMAKE_OPTIONS += \ ++ -DCONNECTOR_HTTP=OFF ++endif ++ ++ifndef CONFIG_PACKAGE_wt_http_zlib ++CMAKE_OPTIONS += \ ++ -DHTTP_WITH_ZLIB=OFF ++endif ++ ++ifndef CONFIG_PACKAGE_wt_http_ssl ++CMAKE_OPTIONS += \ ++ -DHTTP_WITH_SSL=OFF ++endif ++ ++ifndef CONFIG_PACKAGE_wt-fcgi ++CMAKE_OPTIONS += \ ++ -DCONNECTOR_FCGI=OFF ++endif ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) -a $(PKG_INSTALL_DIR)/usr/include/Wt $(1)/usr/include ++ ++ $(INSTALL_DIR) $(1)/usr/share/cmake-2.4/Modules ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cmake-2.4/Modules/FindWt.cmake $(1)/usr/share/cmake-2.4/Modules ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt*.so* $(1)/usr/lib ++endef ++ ++define BuildPlugin ++ define Package/$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib ++ for m in $(2); do \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt$$$$$$$${m}.so* $$(1)/usr/lib/ ; \ ++ done ++ endef ++ ++ $$(eval $$(call BuildPackage,$(1))) ++endef ++ ++define Package/wt/install ++ $(INSTALL_DIR) $(1)/etc/wt ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/wt_config.xml $(1)/etc/wt ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt.so* $(1)/usr/lib ++endef ++ ++define Package/wt/conffiles ++/etc/wt ++endef ++ ++define Package/wt-resources/install ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) -a $(PKG_INSTALL_DIR)/usr/share/Wt $(1)/usr/share ++endef ++ ++$(eval $(call BuildPackage,wt)) ++$(eval $(call BuildPackage,wt-resources)) ++$(eval $(call BuildPlugin,wt-http,http)) ++$(eval $(call BuildPlugin,wt-fcgi,fcgi)) ++$(eval $(call BuildPlugin,wt-dbo,dbo)) ++$(eval $(call BuildPlugin,wt-dbosqlite3,dbosqlite3)) +diff --git a/feeds/packages/libs/wt/patches/.svn/entries b/feeds/packages/libs/wt/patches/.svn/entries +new file mode 100644 +index 0000000..81c7226 +--- /dev/null ++++ b/feeds/packages/libs/wt/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/wt/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T17:22:31.941287Z ++34636 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-fix_random_dev.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++20cb28b34294ab26b849809a90505964 ++2012-06-11T21:57:32.786451Z ++32210 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1245 ++ ++200-fix_boost_1_50_build.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++020cb86f483e7c910fceb902239efa15 ++2012-12-11T17:22:31.941287Z ++34636 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++786 ++ +diff --git a/feeds/packages/libs/wt/patches/.svn/text-base/100-fix_random_dev.patch.svn-base b/feeds/packages/libs/wt/patches/.svn/text-base/100-fix_random_dev.patch.svn-base +new file mode 100644 +index 0000000..977611c +--- /dev/null ++++ b/feeds/packages/libs/wt/patches/.svn/text-base/100-fix_random_dev.patch.svn-base +@@ -0,0 +1,38 @@ ++--- a/src/web/random_device.cpp +++++ b/src/web/random_device.cpp ++@@ -39,16 +39,6 @@ ++ #endif ++ ++ #ifdef USE_URANDOM ++-#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION ++-// A definition is required even for integral static constants ++-const bool boost::random_device::has_fixed_range; ++-const boost::random_device::result_type boost::random_device::min_value; ++-const boost::random_device::result_type boost::random_device::max_value; ++-#endif ++- ++-// the default is the unlimited capacity device, using some secure hash ++-// try "/dev/random" for blocking when the entropy pool has drained ++-const char * const boost::random_device::default_token = "/dev/urandom"; ++ ++ /* ++ * This uses the POSIX interface for unbuffered reading. ++@@ -119,7 +109,6 @@ ++ #include ++ #include ++ #include ++-const char * const boost::random_device::default_token = ""; ++ ++ // Note about thread-safety: according to my reading of the MSDN page ++ // 'Threading Issues with Cryptographic Service Providers', both the ++@@ -156,6 +145,10 @@ ++ }; ++ #endif ++ +++BOOST_RANDOM_DECL boost::random::random_device::random_device() +++ : pimpl(new impl("/dev/urandom")) +++{} +++ ++ boost::random_device::random_device(const std::string& token) ++ : pimpl(new impl(token)) ++ { +diff --git a/feeds/packages/libs/wt/patches/.svn/text-base/200-fix_boost_1_50_build.patch.svn-base b/feeds/packages/libs/wt/patches/.svn/text-base/200-fix_boost_1_50_build.patch.svn-base +new file mode 100644 +index 0000000..0ffcabf +--- /dev/null ++++ b/feeds/packages/libs/wt/patches/.svn/text-base/200-fix_boost_1_50_build.patch.svn-base +@@ -0,0 +1,27 @@ ++--- a/src/threadpool/threadpool/task_adaptors.hpp +++++ b/src/threadpool/threadpool/task_adaptors.hpp ++@@ -135,7 +135,11 @@ ++ if(m_break_s > 0 || m_break_ns > 0) ++ { // Sleep some time before first execution ++ xtime xt; +++#if BOOST_VERSION >= 105000 +++ xtime_get(&xt, TIME_UTC_); +++#else ++ xtime_get(&xt, TIME_UTC); +++#endif ++ xt.nsec += m_break_ns; ++ xt.sec += m_break_s; ++ thread::sleep(xt); ++@@ -146,7 +150,11 @@ ++ if(m_break_s > 0 || m_break_ns > 0) ++ { ++ xtime xt; +++#if BOOST_VERSION >= 105000 +++ xtime_get(&xt, TIME_UTC_); +++#else ++ xtime_get(&xt, TIME_UTC); +++#endif ++ xt.nsec += m_break_ns; ++ xt.sec += m_break_s; ++ thread::sleep(xt); ++ +diff --git a/feeds/packages/libs/wt/patches/100-fix_random_dev.patch b/feeds/packages/libs/wt/patches/100-fix_random_dev.patch +new file mode 100644 +index 0000000..977611c +--- /dev/null ++++ b/feeds/packages/libs/wt/patches/100-fix_random_dev.patch +@@ -0,0 +1,38 @@ ++--- a/src/web/random_device.cpp +++++ b/src/web/random_device.cpp ++@@ -39,16 +39,6 @@ ++ #endif ++ ++ #ifdef USE_URANDOM ++-#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION ++-// A definition is required even for integral static constants ++-const bool boost::random_device::has_fixed_range; ++-const boost::random_device::result_type boost::random_device::min_value; ++-const boost::random_device::result_type boost::random_device::max_value; ++-#endif ++- ++-// the default is the unlimited capacity device, using some secure hash ++-// try "/dev/random" for blocking when the entropy pool has drained ++-const char * const boost::random_device::default_token = "/dev/urandom"; ++ ++ /* ++ * This uses the POSIX interface for unbuffered reading. ++@@ -119,7 +109,6 @@ ++ #include ++ #include ++ #include ++-const char * const boost::random_device::default_token = ""; ++ ++ // Note about thread-safety: according to my reading of the MSDN page ++ // 'Threading Issues with Cryptographic Service Providers', both the ++@@ -156,6 +145,10 @@ ++ }; ++ #endif ++ +++BOOST_RANDOM_DECL boost::random::random_device::random_device() +++ : pimpl(new impl("/dev/urandom")) +++{} +++ ++ boost::random_device::random_device(const std::string& token) ++ : pimpl(new impl(token)) ++ { +diff --git a/feeds/packages/libs/wt/patches/200-fix_boost_1_50_build.patch b/feeds/packages/libs/wt/patches/200-fix_boost_1_50_build.patch +new file mode 100644 +index 0000000..0ffcabf +--- /dev/null ++++ b/feeds/packages/libs/wt/patches/200-fix_boost_1_50_build.patch +@@ -0,0 +1,27 @@ ++--- a/src/threadpool/threadpool/task_adaptors.hpp +++++ b/src/threadpool/threadpool/task_adaptors.hpp ++@@ -135,7 +135,11 @@ ++ if(m_break_s > 0 || m_break_ns > 0) ++ { // Sleep some time before first execution ++ xtime xt; +++#if BOOST_VERSION >= 105000 +++ xtime_get(&xt, TIME_UTC_); +++#else ++ xtime_get(&xt, TIME_UTC); +++#endif ++ xt.nsec += m_break_ns; ++ xt.sec += m_break_s; ++ thread::sleep(xt); ++@@ -146,7 +150,11 @@ ++ if(m_break_s > 0 || m_break_ns > 0) ++ { ++ xtime xt; +++#if BOOST_VERSION >= 105000 +++ xtime_get(&xt, TIME_UTC_); +++#else ++ xtime_get(&xt, TIME_UTC); +++#endif ++ xt.nsec += m_break_ns; ++ xt.sec += m_break_s; ++ thread::sleep(xt); ++ +diff --git a/feeds/packages/libs/wxbase/.svn/entries b/feeds/packages/libs/wxbase/.svn/entries +new file mode 100644 +index 0000000..b105e92 +--- /dev/null ++++ b/feeds/packages/libs/wxbase/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/wxbase ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:01.276221Z ++32301 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++6f158ef342cee01fee0ac5ec9f4606e3 ++2012-06-13T00:22:01.276221Z ++32301 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3310 ++ +diff --git a/feeds/packages/libs/wxbase/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/wxbase/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/libs/wxbase/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/libs/wxbase/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/wxbase/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..aa50bc1 +--- /dev/null ++++ b/feeds/packages/libs/wxbase/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,133 @@ ++# ++# Copyright (C) 2007-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:=wxbase ++PKG_VERSION:=2.8.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/wxwindows ++PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libwxbase ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Cross-platform C++ framework ++ URL:=http://www.wxwidgets.org/ ++ DEPENDS:=+libexpat +libstdcpp +zlib +libpthread ++endef ++ ++define Package/libwxbase/description ++ wxBase contains most of the non-GUI classes from the wxWindows cross- ++ -platform C++ framework. There are 2 categories: generally useful portable ++ code (date/time handling, command line parsing, regular expression support) ++ and wrappers for the OS objects (files, directories, sockets, threads, ++ etc.) allowing you to write portable programs easily. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++# XXX: aMule *needs* the following configure options to be enabled: ++# --enable-intl ++# --enable-largefile ++# --disable-no_rtti ++# --with-regex ++# --enable-unicode ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-rpath \ ++ --with-gnu-ld \ ++ --disable-gui \ ++ --disable-monolithic \ ++ --enable-plugins \ ++ --disable-universal \ ++ --disable-nanox \ ++ --disable-gtk2 \ ++ --disable-gpe \ ++ --disable-optimise \ ++ --disable-debug \ ++ --disable-stl \ ++ --disable-omf \ ++ --disable-debug_flag \ ++ --disable-debug_info \ ++ --disable-debug_gdb \ ++ --disable-debug_cntxt \ ++ --disable-mem_tracing \ ++ --disable-profile \ ++ --disable-no_rtti \ ++ --disable-no_exceptions \ ++ --disable-compat22 \ ++ --disable-compat24 \ ++ --enable-intl \ ++ --disable-backtrace \ ++ --enable-exceptions \ ++ --disable-sound \ ++ --enable-largefile \ ++ \ ++ --without-gtk \ ++ --without-motif \ ++ --without-mac \ ++ --without-cocoa \ ++ --without-wine \ ++ --without-msw \ ++ --without-pm \ ++ --without-mgl \ ++ --without-microwin \ ++ --without-x11 \ ++ --without-libpng \ ++ --without-libjpeg \ ++ --without-libtiff \ ++ --without-libxpm \ ++ --without-libmspack \ ++ --without-sdl \ ++ --without-gnomeprint \ ++ --without-opengl \ ++ --without-dmalloc \ ++ --with-regex="sys" \ ++ --with-zlib="sys" \ ++ --without-odbc \ ++ --with-expat="sys" \ ++ --without-gtk-prefix \ ++ --without-x \ ++ --without-libiconv-prefix \ ++ --without-sdl-prefix \ ++ --without-cppunit-prefix \ ++ ++UNICODE=yes ++ ++ifeq ($(UNICODE),yes) ++ CONFIGURE_ARGS+= --enable-unicode ++ LIB_PFX:=u ++else ++ CONFIGURE_ARGS+= --disable-unicode ++ LIB_PFX:= ++endif ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib ++ $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ ++ $(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config ++ $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config ++endef ++ ++define Package/libwxbase/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libwxbase)) +diff --git a/feeds/packages/libs/wxbase/Makefile b/feeds/packages/libs/wxbase/Makefile +new file mode 100644 +index 0000000..aa50bc1 +--- /dev/null ++++ b/feeds/packages/libs/wxbase/Makefile +@@ -0,0 +1,133 @@ ++# ++# Copyright (C) 2007-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:=wxbase ++PKG_VERSION:=2.8.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/wxwindows ++PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/libwxbase ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Cross-platform C++ framework ++ URL:=http://www.wxwidgets.org/ ++ DEPENDS:=+libexpat +libstdcpp +zlib +libpthread ++endef ++ ++define Package/libwxbase/description ++ wxBase contains most of the non-GUI classes from the wxWindows cross- ++ -platform C++ framework. There are 2 categories: generally useful portable ++ code (date/time handling, command line parsing, regular expression support) ++ and wrappers for the OS objects (files, directories, sockets, threads, ++ etc.) allowing you to write portable programs easily. ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++# XXX: aMule *needs* the following configure options to be enabled: ++# --enable-intl ++# --enable-largefile ++# --disable-no_rtti ++# --with-regex ++# --enable-unicode ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-rpath \ ++ --with-gnu-ld \ ++ --disable-gui \ ++ --disable-monolithic \ ++ --enable-plugins \ ++ --disable-universal \ ++ --disable-nanox \ ++ --disable-gtk2 \ ++ --disable-gpe \ ++ --disable-optimise \ ++ --disable-debug \ ++ --disable-stl \ ++ --disable-omf \ ++ --disable-debug_flag \ ++ --disable-debug_info \ ++ --disable-debug_gdb \ ++ --disable-debug_cntxt \ ++ --disable-mem_tracing \ ++ --disable-profile \ ++ --disable-no_rtti \ ++ --disable-no_exceptions \ ++ --disable-compat22 \ ++ --disable-compat24 \ ++ --enable-intl \ ++ --disable-backtrace \ ++ --enable-exceptions \ ++ --disable-sound \ ++ --enable-largefile \ ++ \ ++ --without-gtk \ ++ --without-motif \ ++ --without-mac \ ++ --without-cocoa \ ++ --without-wine \ ++ --without-msw \ ++ --without-pm \ ++ --without-mgl \ ++ --without-microwin \ ++ --without-x11 \ ++ --without-libpng \ ++ --without-libjpeg \ ++ --without-libtiff \ ++ --without-libxpm \ ++ --without-libmspack \ ++ --without-sdl \ ++ --without-gnomeprint \ ++ --without-opengl \ ++ --without-dmalloc \ ++ --with-regex="sys" \ ++ --with-zlib="sys" \ ++ --without-odbc \ ++ --with-expat="sys" \ ++ --without-gtk-prefix \ ++ --without-x \ ++ --without-libiconv-prefix \ ++ --without-sdl-prefix \ ++ --without-cppunit-prefix \ ++ ++UNICODE=yes ++ ++ifeq ($(UNICODE),yes) ++ CONFIGURE_ARGS+= --enable-unicode ++ LIB_PFX:=u ++else ++ CONFIGURE_ARGS+= --disable-unicode ++ LIB_PFX:= ++endif ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib ++ $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ ++ $(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config ++ $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config ++endef ++ ++define Package/libwxbase/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,libwxbase)) +diff --git a/feeds/packages/libs/xmlrpc-c/.svn/entries b/feeds/packages/libs/xmlrpc-c/.svn/entries +new file mode 100644 +index 0000000..187e8ec +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/xmlrpc-c ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++8b0cc2445d6ac5d3c74485eb7615d737 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5298 ++ +diff --git a/feeds/packages/libs/xmlrpc-c/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/xmlrpc-c/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..381c823 +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,218 @@ ++# ++# Copyright (C) 2007-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:=xmlrpc-c ++PKG_REV:=2233 ++PKG_VERSION:=advanced_r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++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 ++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 ++endef ++ ++define Package/xmlrpc-c ++ $(call Package/xmlrpc-c/Default) ++ 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 ++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 \ ++ --enable-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/feeds/packages/libs/xmlrpc-c/Makefile b/feeds/packages/libs/xmlrpc-c/Makefile +new file mode 100644 +index 0000000..381c823 +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/Makefile +@@ -0,0 +1,218 @@ ++# ++# Copyright (C) 2007-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:=xmlrpc-c ++PKG_REV:=2233 ++PKG_VERSION:=advanced_r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++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 ++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 ++endef ++ ++define Package/xmlrpc-c ++ $(call Package/xmlrpc-c/Default) ++ 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 ++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 \ ++ --enable-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/feeds/packages/libs/xmlrpc-c/patches/.svn/entries b/feeds/packages/libs/xmlrpc-c/patches/.svn/entries +new file mode 100644 +index 0000000..ecbd358 +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/xmlrpc-c/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-06T22:12:53.780385Z ++25396 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++5cb87f59ca385ce94f3f3599fac5eb86 ++2011-02-06T22:12:53.780385Z ++25396 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++332 ++ ++001-config.mk.in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++81da80c4cbcd5c07f4cea5715f2369fc ++2010-12-17T05:03:20.573658Z ++24636 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++380 ++ +diff --git a/feeds/packages/libs/xmlrpc-c/patches/.svn/text-base/001-config.mk.in.patch.svn-base b/feeds/packages/libs/xmlrpc-c/patches/.svn/text-base/001-config.mk.in.patch.svn-base +new file mode 100644 +index 0000000..e190ebb +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/patches/.svn/text-base/001-config.mk.in.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/libs/xmlrpc-c/patches/.svn/text-base/002-automake-compat.patch.svn-base b/feeds/packages/libs/xmlrpc-c/patches/.svn/text-base/002-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..7503b7c +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/patches/.svn/text-base/002-automake-compat.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -230,9 +230,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/feeds/packages/libs/xmlrpc-c/patches/001-config.mk.in.patch b/feeds/packages/libs/xmlrpc-c/patches/001-config.mk.in.patch +new file mode 100644 +index 0000000..e190ebb +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/patches/001-config.mk.in.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/libs/xmlrpc-c/patches/002-automake-compat.patch b/feeds/packages/libs/xmlrpc-c/patches/002-automake-compat.patch +new file mode 100644 +index 0000000..7503b7c +--- /dev/null ++++ b/feeds/packages/libs/xmlrpc-c/patches/002-automake-compat.patch +@@ -0,0 +1,13 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -230,9 +230,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/feeds/packages/libs/xmpp4r/.svn/entries b/feeds/packages/libs/xmpp4r/.svn/entries +new file mode 100644 +index 0000000..0ea99d1 +--- /dev/null ++++ b/feeds/packages/libs/xmpp4r/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/xmpp4r ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-15T21:23:53.225386Z ++23462 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:41.000000Z ++bd83773e131495d011396d0cc2582cc4 ++2010-10-15T21:23:53.225386Z ++23462 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1117 ++ +diff --git a/feeds/packages/libs/xmpp4r/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/xmpp4r/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9e2ef4c +--- /dev/null ++++ b/feeds/packages/libs/xmpp4r/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# Copyright (C) 2006 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:=xmpp4r ++PKG_VERSION:=0.5 ++PKG_RELEASE:=0 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip ++PKG_SOURCE_URL:=http://download.gna.org/xmpp4r ++PKG_MD5SUM:=70eafe960727d750a43ec77ffc1856e9 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xmpp4r ++ TITLE:=XMPP/Jabber library for Ruby ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+ruby ++ MAINTAINER:=Giovanni Di Stasi ++ URL:=http://home.gna.org/xmpp4r/ ++endef ++ ++define Package/xmpp4r/description ++ This package contains xmpp4r, an XMPP/Jabber library for Ruby. ++endef ++ ++define Build/Compile ++ (cd $(PKG_BUILD_DIR); \ ++ ruby $(PKG_BUILD_DIR)/setup.rb config \ ++ --rbconfig=$(wildcard $(STAGING_DIR)/usr/lib/ruby/*.*/*-linux/rbconfig.rb); \ ++ ruby $(PKG_BUILD_DIR)/setup.rb install --prefix="$(PKG_INSTALL_DIR)"; \ ++ ) ++endef ++ ++define Package/xmpp4r/install ++ $(INSTALL_DIR) $(1)/usr/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr ++endef ++ ++$(eval $(call BuildPackage,xmpp4r)) +diff --git a/feeds/packages/libs/xmpp4r/Makefile b/feeds/packages/libs/xmpp4r/Makefile +new file mode 100644 +index 0000000..9e2ef4c +--- /dev/null ++++ b/feeds/packages/libs/xmpp4r/Makefile +@@ -0,0 +1,46 @@ ++# ++# Copyright (C) 2006 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:=xmpp4r ++PKG_VERSION:=0.5 ++PKG_RELEASE:=0 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip ++PKG_SOURCE_URL:=http://download.gna.org/xmpp4r ++PKG_MD5SUM:=70eafe960727d750a43ec77ffc1856e9 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xmpp4r ++ TITLE:=XMPP/Jabber library for Ruby ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+ruby ++ MAINTAINER:=Giovanni Di Stasi ++ URL:=http://home.gna.org/xmpp4r/ ++endef ++ ++define Package/xmpp4r/description ++ This package contains xmpp4r, an XMPP/Jabber library for Ruby. ++endef ++ ++define Build/Compile ++ (cd $(PKG_BUILD_DIR); \ ++ ruby $(PKG_BUILD_DIR)/setup.rb config \ ++ --rbconfig=$(wildcard $(STAGING_DIR)/usr/lib/ruby/*.*/*-linux/rbconfig.rb); \ ++ ruby $(PKG_BUILD_DIR)/setup.rb install --prefix="$(PKG_INSTALL_DIR)"; \ ++ ) ++endef ++ ++define Package/xmpp4r/install ++ $(INSTALL_DIR) $(1)/usr/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr ++endef ++ ++$(eval $(call BuildPackage,xmpp4r)) +diff --git a/feeds/packages/libs/zaptel-1.4.x/.svn/entries b/feeds/packages/libs/zaptel-1.4.x/.svn/entries +new file mode 100644 +index 0000000..7a0cef4 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/zaptel-1.4.x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++8d7d5bd1d27b209d682b2dd383095be9 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5042 ++ +diff --git a/feeds/packages/libs/zaptel-1.4.x/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/zaptel-1.4.x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7d6ba2e +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,176 @@ ++# ++# Copyright (C) 2006-2009 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:=zaptel ++PKG_VERSION:=1.4.12.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/zaptel/releases/ \ ++ http://ftp.digium.com/pub/zaptel/releases/ ++PKG_MD5SUM:=71e83a020b020fa60905edecf70e95a3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/zaptel14/Default ++ TITLE:=Zaptel ++ URL:=http://ftp.digium.com/pub/zaptel/releases ++ DEPENDS:= ++endef ++ ++define KernelPackage/zaptel14/Default ++ TITLE:=Zaptel (kernel module) ++ SUBMENU:=Voice over IP ++ DEPENDS:= ++endef ++ ++define KernelPackage/zaptel14 ++ $(call KernelPackage/zaptel14/Default) ++ TITLE:=Zaptel (kernel module) ++ FILES:=$(PKG_BUILD_DIR)/kernel/zaptel.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,70,zaptel) ++endef ++ ++define KernelPackage/zaptel14/description ++ This package contains the Zaptel core module. No longer includes ztdummy ++ because it is not needed in all cases (and is in fact broken on x86). ++endef ++ ++ ++define KernelPackage/zaptel14-dummy ++ $(call KernelPackage/zaptel14/Default) ++ TITLE:=Zaptel Dummy (timer; kernel module) ++ DEPENDS += +kmod-zaptel14 ++ FILES:=$(PKG_BUILD_DIR)/kernel/ztdummy.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,71,ztdummy) ++endef ++ ++define KernelPackage/zaptel14/description ++ This package contains the Zaptel ztdummy driver. Broken on x86 due to lack ++ of RTC on some hardware. ++endef ++ ++define KernelPackage/zaptel14-wcusb ++ $(call KernelPackage/zaptel14/Default) ++ DEPENDS += +kmod-zaptel14 ++ FILES:=$(PKG_BUILD_DIR)/kernel/wcusb.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,72,wcusb) ++endef ++ ++define KernelPackage/zaptel14-wcusb/description ++ This package contains the Zaptel S100U usb driver. ++endef ++ ++define KernelPackage/zaptel14-wctdm ++ $(call KernelPackage/zaptel14/Default) ++ DEPENDS += +kmod-zaptel14 ++ FILES:=$(PKG_BUILD_DIR)/kernel/wctdm.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,72,wctdm) ++endef ++ ++define KernelPackage/zaptel14-wctdm/description ++ This package contains the Zaptel wctdm driver. ++endef ++ ++define Package/zaptel14-util ++ $(call Package/zaptel14/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= utils ++ DEPENDS += +kmod-zaptel14 +zaptel14-libtonezone +libnewt ++endef ++ ++define Package/zaptel14-util/description ++ This package contains the zaptel utils. ++endef ++ ++define Package/zaptel14-libtonezone ++ $(call Package/zaptel14/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= libtonezone (library) ++ DEPENDS += +kmod-zaptel14 ++endef ++ ++define Package/zaptel14-libtonezone/description ++ This package contains the libraries for accessing zaptel/dummy drivers. ++endef ++ ++CONFIGURE_VARS += \ ++ LDFLAGS="$$$$LDFLAGS -Wl,-rpath-link $(STAGING_DIR)/usr/lib" ++ ++CONFIGURE_ARGS += \ ++ --with-newt="$(STAGING_DIR)/usr" \ ++ --without-curses \ ++ --without-ncurses ++ ++MAKE_FLAGS:= \ ++ ARCH="$(LINUX_KARCH)" \ ++ CC="$(TARGET_CC) $(TARGET_CFLAGS)" \ ++ LD="$(TARGET_CROSS)ld" \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ KVERS="$(LINUX_VERSION)" \ ++ KSRC="$(LINUX_DIR)" \ ++ TOPDIR_MODULES="zaptel ztdummy wcusb wctdm" \ ++ SUBDIR_MODULES="" ++ ++define Build/Compile/kmod ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(MAKE_FLAGS) \ ++ modules ++endef ++ ++define Build/Compile/user ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ ARCH="$(LINUX_KARCH)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ AR="$(TARGET_CROSS)ar" \ ++ RANLIB="$(TARGET_CROSS)ranlib" \ ++ install-libs install-include zttest ztcfg zttool ztdiag fxotune ztmonitor ztscan ztspeed fxstest ++endef ++ ++define Build/Compile ++ $(call Build/Compile/kmod) ++ $(call Build/Compile/user) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/zaptel $(STAGING_DIR)/usr/include/ ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.* $(STAGING_DIR)/usr/lib/ ++endef ++ ++define Package/zaptel14-util/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/zttest $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztcfg $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/zttool $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztdiag $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fxotune $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fxstest $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztmonitor $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztscan $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztspeed $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/zaptel ++ $(INSTALL_DATA) ./files/10-create-device-node $(1)/etc/hotplug.d/zaptel/ ++endef ++ ++define Package/zaptel14-libtonezone/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call KernelPackage,zaptel14)) ++$(eval $(call KernelPackage,zaptel14-dummy)) ++$(eval $(call KernelPackage,zaptel14-wcusb)) ++$(eval $(call KernelPackage,zaptel14-wctdm)) ++$(eval $(call BuildPackage,zaptel14-util)) ++$(eval $(call BuildPackage,zaptel14-libtonezone)) +diff --git a/feeds/packages/libs/zaptel-1.4.x/Makefile b/feeds/packages/libs/zaptel-1.4.x/Makefile +new file mode 100644 +index 0000000..7d6ba2e +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/Makefile +@@ -0,0 +1,176 @@ ++# ++# Copyright (C) 2006-2009 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:=zaptel ++PKG_VERSION:=1.4.12.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/zaptel/releases/ \ ++ http://ftp.digium.com/pub/zaptel/releases/ ++PKG_MD5SUM:=71e83a020b020fa60905edecf70e95a3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/zaptel14/Default ++ TITLE:=Zaptel ++ URL:=http://ftp.digium.com/pub/zaptel/releases ++ DEPENDS:= ++endef ++ ++define KernelPackage/zaptel14/Default ++ TITLE:=Zaptel (kernel module) ++ SUBMENU:=Voice over IP ++ DEPENDS:= ++endef ++ ++define KernelPackage/zaptel14 ++ $(call KernelPackage/zaptel14/Default) ++ TITLE:=Zaptel (kernel module) ++ FILES:=$(PKG_BUILD_DIR)/kernel/zaptel.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,70,zaptel) ++endef ++ ++define KernelPackage/zaptel14/description ++ This package contains the Zaptel core module. No longer includes ztdummy ++ because it is not needed in all cases (and is in fact broken on x86). ++endef ++ ++ ++define KernelPackage/zaptel14-dummy ++ $(call KernelPackage/zaptel14/Default) ++ TITLE:=Zaptel Dummy (timer; kernel module) ++ DEPENDS += +kmod-zaptel14 ++ FILES:=$(PKG_BUILD_DIR)/kernel/ztdummy.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,71,ztdummy) ++endef ++ ++define KernelPackage/zaptel14/description ++ This package contains the Zaptel ztdummy driver. Broken on x86 due to lack ++ of RTC on some hardware. ++endef ++ ++define KernelPackage/zaptel14-wcusb ++ $(call KernelPackage/zaptel14/Default) ++ DEPENDS += +kmod-zaptel14 ++ FILES:=$(PKG_BUILD_DIR)/kernel/wcusb.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,72,wcusb) ++endef ++ ++define KernelPackage/zaptel14-wcusb/description ++ This package contains the Zaptel S100U usb driver. ++endef ++ ++define KernelPackage/zaptel14-wctdm ++ $(call KernelPackage/zaptel14/Default) ++ DEPENDS += +kmod-zaptel14 ++ FILES:=$(PKG_BUILD_DIR)/kernel/wctdm.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,72,wctdm) ++endef ++ ++define KernelPackage/zaptel14-wctdm/description ++ This package contains the Zaptel wctdm driver. ++endef ++ ++define Package/zaptel14-util ++ $(call Package/zaptel14/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= utils ++ DEPENDS += +kmod-zaptel14 +zaptel14-libtonezone +libnewt ++endef ++ ++define Package/zaptel14-util/description ++ This package contains the zaptel utils. ++endef ++ ++define Package/zaptel14-libtonezone ++ $(call Package/zaptel14/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= libtonezone (library) ++ DEPENDS += +kmod-zaptel14 ++endef ++ ++define Package/zaptel14-libtonezone/description ++ This package contains the libraries for accessing zaptel/dummy drivers. ++endef ++ ++CONFIGURE_VARS += \ ++ LDFLAGS="$$$$LDFLAGS -Wl,-rpath-link $(STAGING_DIR)/usr/lib" ++ ++CONFIGURE_ARGS += \ ++ --with-newt="$(STAGING_DIR)/usr" \ ++ --without-curses \ ++ --without-ncurses ++ ++MAKE_FLAGS:= \ ++ ARCH="$(LINUX_KARCH)" \ ++ CC="$(TARGET_CC) $(TARGET_CFLAGS)" \ ++ LD="$(TARGET_CROSS)ld" \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ KVERS="$(LINUX_VERSION)" \ ++ KSRC="$(LINUX_DIR)" \ ++ TOPDIR_MODULES="zaptel ztdummy wcusb wctdm" \ ++ SUBDIR_MODULES="" ++ ++define Build/Compile/kmod ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(MAKE_FLAGS) \ ++ modules ++endef ++ ++define Build/Compile/user ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ ARCH="$(LINUX_KARCH)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ AR="$(TARGET_CROSS)ar" \ ++ RANLIB="$(TARGET_CROSS)ranlib" \ ++ install-libs install-include zttest ztcfg zttool ztdiag fxotune ztmonitor ztscan ztspeed fxstest ++endef ++ ++define Build/Compile ++ $(call Build/Compile/kmod) ++ $(call Build/Compile/user) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/zaptel $(STAGING_DIR)/usr/include/ ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.* $(STAGING_DIR)/usr/lib/ ++endef ++ ++define Package/zaptel14-util/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/zttest $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztcfg $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/zttool $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztdiag $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fxotune $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fxstest $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztmonitor $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztscan $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ztspeed $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/zaptel ++ $(INSTALL_DATA) ./files/10-create-device-node $(1)/etc/hotplug.d/zaptel/ ++endef ++ ++define Package/zaptel14-libtonezone/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call KernelPackage,zaptel14)) ++$(eval $(call KernelPackage,zaptel14-dummy)) ++$(eval $(call KernelPackage,zaptel14-wcusb)) ++$(eval $(call KernelPackage,zaptel14-wctdm)) ++$(eval $(call BuildPackage,zaptel14-util)) ++$(eval $(call BuildPackage,zaptel14-libtonezone)) +diff --git a/feeds/packages/libs/zaptel-1.4.x/files/.svn/entries b/feeds/packages/libs/zaptel-1.4.x/files/.svn/entries +new file mode 100644 +index 0000000..3bd7b94 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/zaptel-1.4.x/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-22T00:35:30.324828Z ++26262 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++10-create-device-node ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++af66a55f895d0ebbc0c009b2d4afb83d ++2011-03-22T00:35:30.324828Z ++26262 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++185 ++ +diff --git a/feeds/packages/libs/zaptel-1.4.x/files/.svn/text-base/10-create-device-node.svn-base b/feeds/packages/libs/zaptel-1.4.x/files/.svn/text-base/10-create-device-node.svn-base +new file mode 100644 +index 0000000..f49c6c1 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/files/.svn/text-base/10-create-device-node.svn-base +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++case "$ACTION" in ++ add) ++ /bin/mkdir -p /dev/zap ++ /bin/mknod -m 0644 /dev/zap/${DEVICENAME#zap} c $MAJOR $MINOR ++ ;; ++esac ++ +diff --git a/feeds/packages/libs/zaptel-1.4.x/files/10-create-device-node b/feeds/packages/libs/zaptel-1.4.x/files/10-create-device-node +new file mode 100644 +index 0000000..f49c6c1 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/files/10-create-device-node +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++case "$ACTION" in ++ add) ++ /bin/mkdir -p /dev/zap ++ /bin/mknod -m 0644 /dev/zap/${DEVICENAME#zap} c $MAJOR $MINOR ++ ;; ++esac ++ +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/entries b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/entries +new file mode 100644 +index 0000000..dca0489 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/entries +@@ -0,0 +1,402 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/zaptel-1.4.x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++370-2.6.36.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7dc17277b4e80099126fd290ba953769 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++937 ++ ++200-Makefile-pwd.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++edac4d11bbafd52087e45a4aa333b5a5 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++242 ++ ++330-uname_m.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7251e7a8a32769418ea7723e198f556b ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++290 ++ ++390-include_spinlock_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++7fccc79598e18ec78789af2d3914db01 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++483 ++ ++100-no_hrtimer_on_x86_only.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e890a433b5c08014334dbc1208a4170f ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++603 ++ ++360-slab.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++4b3b9ba0da22650fe36572806f1000dc ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++717 ++ ++002-upstream_hrtimer.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++e771615e814452874803e35c7e8232f3 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1657 ++ ++340-2.6.32.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++bfeff9deeb3f5cc86c27d724dbc61145 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++346 ++ ++350-2.6.34.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++f2ecdfed6fa1b3951432bcbc36404615 ++2012-08-01T18:40:32.820797Z ++32936 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++301 ++ ++380-use_cross_ar.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++b42780654b0e199fd1f1c004e4674f5e ++2012-06-18T15:06:33.677896Z ++32425 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++553 ++ ++371-3.x.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++489505df24ad02aa9e25dfab809806a2 ++2012-06-18T15:06:33.677896Z ++32425 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++508 ++ +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/002-upstream_hrtimer.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/002-upstream_hrtimer.patch.svn-base +new file mode 100644 +index 0000000..1143068 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/002-upstream_hrtimer.patch.svn-base +@@ -0,0 +1,52 @@ ++--- ++ kernel/ztdummy.c | 18 +++++++++++++++--- ++ 1 file changed, 15 insertions(+), 3 deletions(-) ++ ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -54,7 +54,7 @@ ++ * the #define USE_RTC should be commented out. ++ */ ++ #if defined(__i386__) || defined(__x86_64__) ++-#if LINUX_VERSION_CODE >= VERSION_CODE(2,6,13) +++#if LINUX_VERSION_CODE >= VERSION_CODE(2,6,15) ++ /* The symbol hrtimer_forward is only exported as of 2.6.22: */ ++ #if defined(CONFIG_HIGH_RES_TIMERS) && LINUX_VERSION_CODE >= VERSION_CODE(2,6,22) ++ #define USE_HIGHRESTIMER ++@@ -90,6 +90,18 @@ ++ #endif ++ #include "ztdummy.h" ++ +++#if defined(USE_HIGHRESTIMER) && ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) ) +++/* compatibility with new hrtimer interface */ +++static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer) +++{ +++ return timer->expires; +++} +++ +++static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) +++{ +++ timer->expires = time; +++} +++#endif ++ ++ static struct ztdummy *ztd; ++ ++@@ -199,7 +211,7 @@ static enum hrtimer_restart ztdummy_hr_i ++ * expired. ++ * We should worry if overrun is 2 or more; then we really missed ++ * a tick */ ++- overrun = hrtimer_forward(&zaptimer, htmr->expires, +++ overrun = hrtimer_forward(&zaptimer, hrtimer_get_expires(htmr), ++ ktime_set(0, ZAPTEL_TIME_NS)); ++ if(overrun > 1) { ++ if(printk_ratelimit()) ++@@ -222,7 +234,7 @@ static enum hrtimer_restart ztdummy_hr_i ++ /* use kernel system tick timer if PC architecture RTC is not available */ ++ static void ztdummy_timer(unsigned long param) ++ { ++- timer.expires = jiffies + 1; +++ hrtimer_set_expires(timer, jiffies + 1); ++ add_timer(&timer); ++ ++ ztd->counter += ZAPTEL_TIME; +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/100-no_hrtimer_on_x86_only.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/100-no_hrtimer_on_x86_only.patch.svn-base +new file mode 100644 +index 0000000..cd9666e +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/100-no_hrtimer_on_x86_only.patch.svn-base +@@ -0,0 +1,22 @@ ++--- ++ kernel/ztdummy.c | 2 -- ++ 1 file changed, 2 deletions(-) ++ ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -53,7 +53,6 @@ ++ * If using an i386 architecture without a PC real-time clock, ++ * the #define USE_RTC should be commented out. ++ */ ++-#if defined(__i386__) || defined(__x86_64__) ++ #if LINUX_VERSION_CODE >= VERSION_CODE(2,6,15) ++ /* The symbol hrtimer_forward is only exported as of 2.6.22: */ ++ #if defined(CONFIG_HIGH_RES_TIMERS) && LINUX_VERSION_CODE >= VERSION_CODE(2,6,22) ++@@ -66,7 +65,6 @@ ++ #define USE_RTC ++ #endif ++ #endif ++-#endif ++ ++ #include ++ #include +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/200-Makefile-pwd.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/200-Makefile-pwd.patch.svn-base +new file mode 100644 +index 0000000..fa6aea7 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/200-Makefile-pwd.patch.svn-base +@@ -0,0 +1,14 @@ ++--- ++ Makefile | 1 + ++ 1 file changed, 1 insertion(+) ++ ++--- a/Makefile +++++ b/Makefile ++@@ -18,6 +18,7 @@ ifeq ($(MAKELEVEL),0) ++ PWD:=$(shell pwd) ++ export PWD ++ endif +++PWD:=`pwd` ++ ++ ifeq ($(ARCH),) ++ ARCH:=$(shell uname -m | sed -e s/i.86/i386/) +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/330-uname_m.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/330-uname_m.patch.svn-base +new file mode 100644 +index 0000000..7b91ff0 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/330-uname_m.patch.svn-base +@@ -0,0 +1,15 @@ ++--- ++ Makefile | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++--- a/Makefile +++++ b/Makefile ++@@ -25,7 +25,7 @@ ARCH:=$(shell uname -m | sed -e s/i.86/i ++ endif ++ ++ ifeq ($(DEB_HOST_GNU_TYPE),) ++-UNAME_M:=$(shell uname -m) +++UNAME_M:=$(ARCH) ++ else ++ UNAME_M:=$(DEB_HOST_GNU_TYPE) ++ endif +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/340-2.6.32.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/340-2.6.32.patch.svn-base +new file mode 100644 +index 0000000..948cc48 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/340-2.6.32.patch.svn-base +@@ -0,0 +1,16 @@ ++--- ++ kernel/zaptel-base.c | 3 +++ ++ 1 file changed, 3 insertions(+) ++ ++--- a/kernel/zaptel-base.c +++++ b/kernel/zaptel-base.c ++@@ -59,6 +59,9 @@ ++ #include ++ #endif ++ #include +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) +++#include +++#endif ++ ++ #ifndef CONFIG_OLD_HDLC_API ++ #define NEW_HDLC_INTERFACE +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/350-2.6.34.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/350-2.6.34.patch.svn-base +new file mode 100644 +index 0000000..d5696e5 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/350-2.6.34.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/kernel/zconfig.h +++++ b/kernel/zconfig.h ++@@ -22,6 +22,8 @@ ++ #include ++ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) ++ #include +++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) +++#include ++ #else ++ #include ++ #endif +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/360-slab.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/360-slab.patch.svn-base +new file mode 100644 +index 0000000..0221505 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/360-slab.patch.svn-base +@@ -0,0 +1,31 @@ ++--- a/kernel/wctdm.c +++++ b/kernel/wctdm.c ++@@ -30,6 +30,8 @@ ++ #include ++ #include ++ #include +++#include +++#include ++ #include ++ #include "proslic.h" ++ #include "wctdm.h" ++--- a/kernel/wcusb.c +++++ b/kernel/wcusb.c ++@@ -37,6 +37,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -38,6 +38,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #ifndef VERSION_CODE ++ # define VERSION_CODE(vers,rel,seq) ( ((vers)<<16) | ((rel)<<8) | (seq) ) +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/370-2.6.36.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/370-2.6.36.patch.svn-base +new file mode 100644 +index 0000000..b3d29a1 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/370-2.6.36.patch.svn-base +@@ -0,0 +1,39 @@ ++--- ++ kernel/zaptel-base.c | 18 ++++++++++++++++++ ++ 1 file changed, 18 insertions(+) ++ ++--- a/kernel/zaptel-base.c +++++ b/kernel/zaptel-base.c ++@@ -5181,6 +5181,20 @@ static int zt_ioctl(struct inode *inode, ++ return zt_chan_ioctl(inode, file, cmd, data, unit); ++ } ++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++#include +++static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) +++{ +++ int ret; +++ +++ lock_kernel(); +++ ret = zt_ioctl(file->f_path.dentry->d_inode, file, cmd, data); +++ unlock_kernel(); +++ +++ return ret; +++} +++#endif +++ ++ int zt_register(struct zt_span *span, int prefmaster) ++ { ++ int x; ++@@ -7632,7 +7646,11 @@ static struct file_operations zt_fops = ++ llseek: NULL, ++ open: zt_open, ++ release: zt_release, +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++ unlocked_ioctl: zt_ioctl_unlocked, +++#else ++ ioctl: zt_ioctl, +++#endif ++ read: zt_read, ++ write: zt_write, ++ poll: zt_poll, +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/371-3.x.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/371-3.x.patch.svn-base +new file mode 100644 +index 0000000..0404a4b +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/371-3.x.patch.svn-base +@@ -0,0 +1,23 @@ ++--- a/kernel/zaptel-base.c +++++ b/kernel/zaptel-base.c ++@@ -5182,14 +5182,20 @@ static int zt_ioctl(struct inode *inode, ++ } ++ ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++#ifdef CONFIG_BKL ++ #include +++#endif ++ static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) ++ { ++ int ret; ++ +++#ifdef CONFIG_BKL ++ lock_kernel(); +++#endif ++ ret = zt_ioctl(file->f_path.dentry->d_inode, file, cmd, data); +++#ifdef CONFIG_BKL ++ unlock_kernel(); +++#endif ++ ++ return ret; ++ } +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/380-use_cross_ar.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/380-use_cross_ar.patch.svn-base +new file mode 100644 +index 0000000..90f8ef5 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/380-use_cross_ar.patch.svn-base +@@ -0,0 +1,23 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -30,6 +30,9 @@ else ++ UNAME_M:=$(DEB_HOST_GNU_TYPE) ++ endif ++ +++AR ?= ar +++RANLIB ?= ranlib +++ ++ # If you want to build for a kernel other than the current kernel, set KVERS ++ ifndef KVERS ++ KVERS:=$(shell uname -r) ++@@ -352,8 +355,8 @@ ztspeed: CFLAGS= ++ sethdlc-new: CFLAGS+=-I$(KINCLUDES) ++ ++ $(LTZ_A): $(LTZ_A_OBJS) ++- ar rcs $@ $^ ++- ranlib $@ +++ $(AR) rcs $@ $^ +++ $(RANLIB) $@ ++ ++ $(LTZ_SO): $(LTZ_SO_OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/390-include_spinlock_h.patch.svn-base b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/390-include_spinlock_h.patch.svn-base +new file mode 100644 +index 0000000..ff81638 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/.svn/text-base/390-include_spinlock_h.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -79,6 +79,7 @@ ++ #include ++ #endif ++ #ifdef LINUX26 +++#include ++ #ifdef USE_HIGHRESTIMER ++ #include ++ #endif ++@@ -328,7 +329,7 @@ int init_module(void) ++ #ifdef LINUX26 ++ ztd->counter = 0; ++ #ifdef USE_RTC ++- ztd->rtclock = SPIN_LOCK_UNLOCKED; +++ spin_lock_init(&ztd->rtclock); ++ ztd->rtc_task.func = ztdummy_rtc_interrupt; ++ ztd->rtc_task.private_data = ztd; ++ err = rtc_register(&ztd->rtc_task); +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch b/feeds/packages/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch +new file mode 100644 +index 0000000..1143068 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch +@@ -0,0 +1,52 @@ ++--- ++ kernel/ztdummy.c | 18 +++++++++++++++--- ++ 1 file changed, 15 insertions(+), 3 deletions(-) ++ ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -54,7 +54,7 @@ ++ * the #define USE_RTC should be commented out. ++ */ ++ #if defined(__i386__) || defined(__x86_64__) ++-#if LINUX_VERSION_CODE >= VERSION_CODE(2,6,13) +++#if LINUX_VERSION_CODE >= VERSION_CODE(2,6,15) ++ /* The symbol hrtimer_forward is only exported as of 2.6.22: */ ++ #if defined(CONFIG_HIGH_RES_TIMERS) && LINUX_VERSION_CODE >= VERSION_CODE(2,6,22) ++ #define USE_HIGHRESTIMER ++@@ -90,6 +90,18 @@ ++ #endif ++ #include "ztdummy.h" ++ +++#if defined(USE_HIGHRESTIMER) && ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) ) +++/* compatibility with new hrtimer interface */ +++static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer) +++{ +++ return timer->expires; +++} +++ +++static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) +++{ +++ timer->expires = time; +++} +++#endif ++ ++ static struct ztdummy *ztd; ++ ++@@ -199,7 +211,7 @@ static enum hrtimer_restart ztdummy_hr_i ++ * expired. ++ * We should worry if overrun is 2 or more; then we really missed ++ * a tick */ ++- overrun = hrtimer_forward(&zaptimer, htmr->expires, +++ overrun = hrtimer_forward(&zaptimer, hrtimer_get_expires(htmr), ++ ktime_set(0, ZAPTEL_TIME_NS)); ++ if(overrun > 1) { ++ if(printk_ratelimit()) ++@@ -222,7 +234,7 @@ static enum hrtimer_restart ztdummy_hr_i ++ /* use kernel system tick timer if PC architecture RTC is not available */ ++ static void ztdummy_timer(unsigned long param) ++ { ++- timer.expires = jiffies + 1; +++ hrtimer_set_expires(timer, jiffies + 1); ++ add_timer(&timer); ++ ++ ztd->counter += ZAPTEL_TIME; +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch b/feeds/packages/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch +new file mode 100644 +index 0000000..cd9666e +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch +@@ -0,0 +1,22 @@ ++--- ++ kernel/ztdummy.c | 2 -- ++ 1 file changed, 2 deletions(-) ++ ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -53,7 +53,6 @@ ++ * If using an i386 architecture without a PC real-time clock, ++ * the #define USE_RTC should be commented out. ++ */ ++-#if defined(__i386__) || defined(__x86_64__) ++ #if LINUX_VERSION_CODE >= VERSION_CODE(2,6,15) ++ /* The symbol hrtimer_forward is only exported as of 2.6.22: */ ++ #if defined(CONFIG_HIGH_RES_TIMERS) && LINUX_VERSION_CODE >= VERSION_CODE(2,6,22) ++@@ -66,7 +65,6 @@ ++ #define USE_RTC ++ #endif ++ #endif ++-#endif ++ ++ #include ++ #include +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch b/feeds/packages/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch +new file mode 100644 +index 0000000..fa6aea7 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch +@@ -0,0 +1,14 @@ ++--- ++ Makefile | 1 + ++ 1 file changed, 1 insertion(+) ++ ++--- a/Makefile +++++ b/Makefile ++@@ -18,6 +18,7 @@ ifeq ($(MAKELEVEL),0) ++ PWD:=$(shell pwd) ++ export PWD ++ endif +++PWD:=`pwd` ++ ++ ifeq ($(ARCH),) ++ ARCH:=$(shell uname -m | sed -e s/i.86/i386/) +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/330-uname_m.patch b/feeds/packages/libs/zaptel-1.4.x/patches/330-uname_m.patch +new file mode 100644 +index 0000000..7b91ff0 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/330-uname_m.patch +@@ -0,0 +1,15 @@ ++--- ++ Makefile | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++--- a/Makefile +++++ b/Makefile ++@@ -25,7 +25,7 @@ ARCH:=$(shell uname -m | sed -e s/i.86/i ++ endif ++ ++ ifeq ($(DEB_HOST_GNU_TYPE),) ++-UNAME_M:=$(shell uname -m) +++UNAME_M:=$(ARCH) ++ else ++ UNAME_M:=$(DEB_HOST_GNU_TYPE) ++ endif +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/340-2.6.32.patch b/feeds/packages/libs/zaptel-1.4.x/patches/340-2.6.32.patch +new file mode 100644 +index 0000000..948cc48 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/340-2.6.32.patch +@@ -0,0 +1,16 @@ ++--- ++ kernel/zaptel-base.c | 3 +++ ++ 1 file changed, 3 insertions(+) ++ ++--- a/kernel/zaptel-base.c +++++ b/kernel/zaptel-base.c ++@@ -59,6 +59,9 @@ ++ #include ++ #endif ++ #include +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) +++#include +++#endif ++ ++ #ifndef CONFIG_OLD_HDLC_API ++ #define NEW_HDLC_INTERFACE +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/350-2.6.34.patch b/feeds/packages/libs/zaptel-1.4.x/patches/350-2.6.34.patch +new file mode 100644 +index 0000000..d5696e5 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/350-2.6.34.patch +@@ -0,0 +1,11 @@ ++--- a/kernel/zconfig.h +++++ b/kernel/zconfig.h ++@@ -22,6 +22,8 @@ ++ #include ++ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) ++ #include +++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)) +++#include ++ #else ++ #include ++ #endif +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/360-slab.patch b/feeds/packages/libs/zaptel-1.4.x/patches/360-slab.patch +new file mode 100644 +index 0000000..0221505 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/360-slab.patch +@@ -0,0 +1,31 @@ ++--- a/kernel/wctdm.c +++++ b/kernel/wctdm.c ++@@ -30,6 +30,8 @@ ++ #include ++ #include ++ #include +++#include +++#include ++ #include ++ #include "proslic.h" ++ #include "wctdm.h" ++--- a/kernel/wcusb.c +++++ b/kernel/wcusb.c ++@@ -37,6 +37,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -38,6 +38,7 @@ ++ */ ++ ++ #include +++#include ++ ++ #ifndef VERSION_CODE ++ # define VERSION_CODE(vers,rel,seq) ( ((vers)<<16) | ((rel)<<8) | (seq) ) +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/370-2.6.36.patch b/feeds/packages/libs/zaptel-1.4.x/patches/370-2.6.36.patch +new file mode 100644 +index 0000000..b3d29a1 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/370-2.6.36.patch +@@ -0,0 +1,39 @@ ++--- ++ kernel/zaptel-base.c | 18 ++++++++++++++++++ ++ 1 file changed, 18 insertions(+) ++ ++--- a/kernel/zaptel-base.c +++++ b/kernel/zaptel-base.c ++@@ -5181,6 +5181,20 @@ static int zt_ioctl(struct inode *inode, ++ return zt_chan_ioctl(inode, file, cmd, data, unit); ++ } ++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++#include +++static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) +++{ +++ int ret; +++ +++ lock_kernel(); +++ ret = zt_ioctl(file->f_path.dentry->d_inode, file, cmd, data); +++ unlock_kernel(); +++ +++ return ret; +++} +++#endif +++ ++ int zt_register(struct zt_span *span, int prefmaster) ++ { ++ int x; ++@@ -7632,7 +7646,11 @@ static struct file_operations zt_fops = ++ llseek: NULL, ++ open: zt_open, ++ release: zt_release, +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++ unlocked_ioctl: zt_ioctl_unlocked, +++#else ++ ioctl: zt_ioctl, +++#endif ++ read: zt_read, ++ write: zt_write, ++ poll: zt_poll, +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/371-3.x.patch b/feeds/packages/libs/zaptel-1.4.x/patches/371-3.x.patch +new file mode 100644 +index 0000000..0404a4b +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/371-3.x.patch +@@ -0,0 +1,23 @@ ++--- a/kernel/zaptel-base.c +++++ b/kernel/zaptel-base.c ++@@ -5182,14 +5182,20 @@ static int zt_ioctl(struct inode *inode, ++ } ++ ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++#ifdef CONFIG_BKL ++ #include +++#endif ++ static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) ++ { ++ int ret; ++ +++#ifdef CONFIG_BKL ++ lock_kernel(); +++#endif ++ ret = zt_ioctl(file->f_path.dentry->d_inode, file, cmd, data); +++#ifdef CONFIG_BKL ++ unlock_kernel(); +++#endif ++ ++ return ret; ++ } +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/380-use_cross_ar.patch b/feeds/packages/libs/zaptel-1.4.x/patches/380-use_cross_ar.patch +new file mode 100644 +index 0000000..90f8ef5 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/380-use_cross_ar.patch +@@ -0,0 +1,23 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -30,6 +30,9 @@ else ++ UNAME_M:=$(DEB_HOST_GNU_TYPE) ++ endif ++ +++AR ?= ar +++RANLIB ?= ranlib +++ ++ # If you want to build for a kernel other than the current kernel, set KVERS ++ ifndef KVERS ++ KVERS:=$(shell uname -r) ++@@ -352,8 +355,8 @@ ztspeed: CFLAGS= ++ sethdlc-new: CFLAGS+=-I$(KINCLUDES) ++ ++ $(LTZ_A): $(LTZ_A_OBJS) ++- ar rcs $@ $^ ++- ranlib $@ +++ $(AR) rcs $@ $^ +++ $(RANLIB) $@ ++ ++ $(LTZ_SO): $(LTZ_SO_OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm +diff --git a/feeds/packages/libs/zaptel-1.4.x/patches/390-include_spinlock_h.patch b/feeds/packages/libs/zaptel-1.4.x/patches/390-include_spinlock_h.patch +new file mode 100644 +index 0000000..ff81638 +--- /dev/null ++++ b/feeds/packages/libs/zaptel-1.4.x/patches/390-include_spinlock_h.patch +@@ -0,0 +1,19 @@ ++--- a/kernel/ztdummy.c +++++ b/kernel/ztdummy.c ++@@ -79,6 +79,7 @@ ++ #include ++ #endif ++ #ifdef LINUX26 +++#include ++ #ifdef USE_HIGHRESTIMER ++ #include ++ #endif ++@@ -328,7 +329,7 @@ int init_module(void) ++ #ifdef LINUX26 ++ ztd->counter = 0; ++ #ifdef USE_RTC ++- ztd->rtclock = SPIN_LOCK_UNLOCKED; +++ spin_lock_init(&ztd->rtclock); ++ ztd->rtc_task.func = ztdummy_rtc_interrupt; ++ ztd->rtc_task.private_data = ztd; ++ err = rtc_register(&ztd->rtc_task); +diff --git a/feeds/packages/libs/zaptel/.svn/entries b/feeds/packages/libs/zaptel/.svn/entries +new file mode 100644 +index 0000000..83627e7 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/zaptel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-06T17:14:00.953062Z ++17957 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++835f3376a2a42d02e27a67a2d8676088 ++2009-10-06T17:14:00.953062Z ++17957 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1510 ++ +diff --git a/feeds/packages/libs/zaptel/.svn/prop-base/Makefile.svn-base b/feeds/packages/libs/zaptel/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/zaptel/.svn/text-base/Makefile.svn-base b/feeds/packages/libs/zaptel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cccc705 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2006-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:=zaptel ++PKG_VERSION:=1.2.27 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/zaptel/releases/ ++PKG_MD5SUM:=6e0ccf2a2a805054123b35bf8eb10ae9 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++define Package/zaptel-libtonezone ++ SECTION:=libs ++ CATEGORY:=Libraries ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Zaptel tonezone library. ++ URL:=http://downloads.asterisk.org/pub/telephony/zaptel/ ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ HOSTCC="$(HOSTCC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I. -DBUILDING_TONEZONE" \ ++ KSRC="$(LINUX_DIR)" \ ++ KVERS="$(LINUX_VERSION)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install-tonezone ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/linux ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/linux/zaptel.h $(1)/usr/include/linux/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/tonezone.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so* $(1)/usr/lib/ ++endef ++ ++define Package/zaptel-libtonezone/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,zaptel-libtonezone)) +diff --git a/feeds/packages/libs/zaptel/Makefile b/feeds/packages/libs/zaptel/Makefile +new file mode 100644 +index 0000000..cccc705 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/Makefile +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2006-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:=zaptel ++PKG_VERSION:=1.2.27 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/zaptel/releases/ ++PKG_MD5SUM:=6e0ccf2a2a805054123b35bf8eb10ae9 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++define Package/zaptel-libtonezone ++ SECTION:=libs ++ CATEGORY:=Libraries ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE:=Zaptel tonezone library. ++ URL:=http://downloads.asterisk.org/pub/telephony/zaptel/ ++endef ++ ++define Build/Configure ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ HOSTCC="$(HOSTCC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I. -DBUILDING_TONEZONE" \ ++ KSRC="$(LINUX_DIR)" \ ++ KVERS="$(LINUX_VERSION)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install-tonezone ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/linux ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/linux/zaptel.h $(1)/usr/include/linux/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/tonezone.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so* $(1)/usr/lib/ ++endef ++ ++define Package/zaptel-libtonezone/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,zaptel-libtonezone)) +diff --git a/feeds/packages/libs/zaptel/patches/.svn/entries b/feeds/packages/libs/zaptel/patches/.svn/entries +new file mode 100644 +index 0000000..36e9dca +--- /dev/null ++++ b/feeds/packages/libs/zaptel/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/libs/zaptel/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-06T17:14:00.953062Z ++17957 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-Makefile-tonezone_install.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:42.000000Z ++0d3d1b54d6056df2a7a60ba518697352 ++2009-10-06T17:14:00.953062Z ++17957 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++917 ++ +diff --git a/feeds/packages/libs/zaptel/patches/.svn/prop-base/110-Makefile-tonezone_install.patch.svn-base b/feeds/packages/libs/zaptel/patches/.svn/prop-base/110-Makefile-tonezone_install.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/patches/.svn/prop-base/110-Makefile-tonezone_install.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/libs/zaptel/patches/.svn/text-base/110-Makefile-tonezone_install.patch.svn-base b/feeds/packages/libs/zaptel/patches/.svn/text-base/110-Makefile-tonezone_install.patch.svn-base +new file mode 100644 +index 0000000..2825bb2 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/patches/.svn/text-base/110-Makefile-tonezone_install.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -501,6 +501,16 @@ install-include: zaptel.h torisa.h ++ install -d $(DESTDIR)$(INCLUDE_DIR)/linux ++ install -m 644 zaptel.h torisa.h $(DESTDIR)$(INCLUDE_DIR)/linux/ ++ +++install-tonezone: $(LIBTONEZONE_SO) +++ install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) +++ rm -f $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO) +++ ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ +++ $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) +++ ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ +++ $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO) +++ install -D -m 644 zaptel.h $(DESTDIR)/usr/include/linux/zaptel.h +++ install -D -m 644 tonezone.h $(DESTDIR)/usr/include/tonezone.h +++ ++ install-udev: devices ++ ++ # FIRMWARE_DIR also implies HOTPLUG_FIRMWARE, unless set manually. +diff --git a/feeds/packages/libs/zaptel/patches/110-Makefile-tonezone_install.patch b/feeds/packages/libs/zaptel/patches/110-Makefile-tonezone_install.patch +new file mode 100644 +index 0000000..2825bb2 +--- /dev/null ++++ b/feeds/packages/libs/zaptel/patches/110-Makefile-tonezone_install.patch +@@ -0,0 +1,19 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -501,6 +501,16 @@ install-include: zaptel.h torisa.h ++ install -d $(DESTDIR)$(INCLUDE_DIR)/linux ++ install -m 644 zaptel.h torisa.h $(DESTDIR)$(INCLUDE_DIR)/linux/ ++ +++install-tonezone: $(LIBTONEZONE_SO) +++ install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) +++ rm -f $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO) +++ ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ +++ $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) +++ ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ +++ $(DESTDIR)/usr/lib/$(LIBTONEZONE_SO) +++ install -D -m 644 zaptel.h $(DESTDIR)/usr/include/linux/zaptel.h +++ install -D -m 644 tonezone.h $(DESTDIR)/usr/include/tonezone.h +++ ++ install-udev: devices ++ ++ # FIRMWARE_DIR also implies HOTPLUG_FIRMWARE, unless set manually. +diff --git a/feeds/packages/mail/.svn/entries b/feeds/packages/mail/.svn/entries +new file mode 100644 +index 0000000..118c621 +--- /dev/null ++++ b/feeds/packages/mail/.svn/entries +@@ -0,0 +1,58 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-02T11:05:52.351887Z ++34967 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++msmtp ++dir ++ ++dovecot ++dir ++ ++nullmailer ++dir ++ ++procmail ++dir ++ ++ssmtp ++dir ++ ++mini_sendmail ++dir ++ ++mutt ++dir ++ ++xmail ++dir ++ ++fetchmail ++dir ++ ++imapfilter ++dir ++ +diff --git a/feeds/packages/mail/dovecot/.svn/entries b/feeds/packages/mail/dovecot/.svn/entries +new file mode 100644 +index 0000000..75f6a08 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/dovecot ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T12:37:41.508167Z ++32335 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++ff4f71d39dcf6fcb05e9d5c9ff786154 ++2012-06-13T12:37:41.508167Z ++32335 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1748 ++ +diff --git a/feeds/packages/mail/dovecot/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/dovecot/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8bedfa3 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006,2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/mail/dovecot/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/dovecot/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e13fd1a +--- /dev/null ++++ b/feeds/packages/mail/dovecot/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,71 @@ ++# ++# 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:=dovecot ++PKG_VERSION:=1.2.13 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.2 ++PKG_MD5SUM:=aaee3b5fd59e01780305553248f686bc ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dovecot ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libopenssl +librt +zlib +libbz2 ++ TITLE:=An IMAP and POP3 daemon ++ URL:=http://www.dovecot.org/ ++endef ++ ++define Package/dovecot/description ++ Dovecot is a program which provides POP3 and IMAP services. ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-gssapi \ ++ --without-pam \ ++ --without-libcap \ ++ --with-moduledir=/usr/lib/dovecot/modules \ ++ --with-notify=dnotify \ ++ ++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 ++ $(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dovecot-example.conf $(1)/etc/dovecot.conf ++ $(INSTALL_DIR) $(1)/usr/lib/dovecot ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++ find $(1)/usr/lib/dovecot/modules/ \ ++ -name "*.a" -o -name "*.la" | xargs rm ++endef ++ ++define Package/dovecot/conffiles ++/etc/dovecot.conf ++endef ++ ++$(eval $(call BuildPackage,dovecot)) +diff --git a/feeds/packages/mail/dovecot/Makefile b/feeds/packages/mail/dovecot/Makefile +new file mode 100644 +index 0000000..e13fd1a +--- /dev/null ++++ b/feeds/packages/mail/dovecot/Makefile +@@ -0,0 +1,71 @@ ++# ++# 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:=dovecot ++PKG_VERSION:=1.2.13 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.2 ++PKG_MD5SUM:=aaee3b5fd59e01780305553248f686bc ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dovecot ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libopenssl +librt +zlib +libbz2 ++ TITLE:=An IMAP and POP3 daemon ++ URL:=http://www.dovecot.org/ ++endef ++ ++define Package/dovecot/description ++ Dovecot is a program which provides POP3 and IMAP services. ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-gssapi \ ++ --without-pam \ ++ --without-libcap \ ++ --with-moduledir=/usr/lib/dovecot/modules \ ++ --with-notify=dnotify \ ++ ++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 ++ $(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dovecot-example.conf $(1)/etc/dovecot.conf ++ $(INSTALL_DIR) $(1)/usr/lib/dovecot ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++ find $(1)/usr/lib/dovecot/modules/ \ ++ -name "*.a" -o -name "*.la" | xargs rm ++endef ++ ++define Package/dovecot/conffiles ++/etc/dovecot.conf ++endef ++ ++$(eval $(call BuildPackage,dovecot)) +diff --git a/feeds/packages/mail/dovecot/files/.svn/entries b/feeds/packages/mail/dovecot/files/.svn/entries +new file mode 100644 +index 0000000..5ff1fbe +--- /dev/null ++++ b/feeds/packages/mail/dovecot/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/dovecot/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:25:15.464867Z ++28903 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dovecot.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++402335da359e1ce839412e7f5102ca2c ++2011-11-09T23:25:15.464867Z ++28903 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++452 ++ +diff --git a/feeds/packages/mail/dovecot/files/.svn/prop-base/dovecot.init.svn-base b/feeds/packages/mail/dovecot/files/.svn/prop-base/dovecot.init.svn-base +new file mode 100644 +index 0000000..8bedfa3 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/files/.svn/prop-base/dovecot.init.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006,2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/mail/dovecot/files/.svn/text-base/dovecot.init.svn-base b/feeds/packages/mail/dovecot/files/.svn/text-base/dovecot.init.svn-base +new file mode 100644 +index 0000000..7539fb6 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/files/.svn/text-base/dovecot.init.svn-base +@@ -0,0 +1,23 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=99 ++ ++SERVICE_PID_FILE=/var/run/dovecot/master.pid ++ ++start() { ++ user_exists dovecot 59 || user_add dovecot 59 ++ group_exists dovecot 59 || group_add dovecot 59 ++ mkdir -p -m 0755 /var/lib/dovecot ++ mkdir -p -m 0755 /var/run/dovecot ++ chmod 0750 /var/lib/dovecot ++ service_start /usr/sbin/dovecot ++} ++ ++stop() { ++ service_stop /usr/sbin/dovecot ++} ++ ++reload() { ++ service_reload /usr/sbin/dovecot ++} +diff --git a/feeds/packages/mail/dovecot/files/dovecot.init b/feeds/packages/mail/dovecot/files/dovecot.init +new file mode 100644 +index 0000000..7539fb6 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/files/dovecot.init +@@ -0,0 +1,23 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=99 ++ ++SERVICE_PID_FILE=/var/run/dovecot/master.pid ++ ++start() { ++ user_exists dovecot 59 || user_add dovecot 59 ++ group_exists dovecot 59 || group_add dovecot 59 ++ mkdir -p -m 0755 /var/lib/dovecot ++ mkdir -p -m 0755 /var/run/dovecot ++ chmod 0750 /var/lib/dovecot ++ service_start /usr/sbin/dovecot ++} ++ ++stop() { ++ service_stop /usr/sbin/dovecot ++} ++ ++reload() { ++ service_reload /usr/sbin/dovecot ++} +diff --git a/feeds/packages/mail/dovecot/patches/.svn/entries b/feeds/packages/mail/dovecot/patches/.svn/entries +new file mode 100644 +index 0000000..e45fe80 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/dovecot/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-05T01:06:43.795083Z ++18648 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-configure_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++606b0daf4382646c8ac5c5fbcc08efea ++2009-12-05T01:06:43.795083Z ++18648 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++949 ++ ++002-example_conf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++f18424deded02e9ce4eac0751cc3b77a ++2009-12-05T01:06:43.795083Z ++18648 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3284 ++ +diff --git a/feeds/packages/mail/dovecot/patches/.svn/prop-base/001-configure_in.patch.svn-base b/feeds/packages/mail/dovecot/patches/.svn/prop-base/001-configure_in.patch.svn-base +new file mode 100644 +index 0000000..bfd87e6 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/.svn/prop-base/001-configure_in.patch.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006,2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/mail/dovecot/patches/.svn/prop-base/002-example_conf.patch.svn-base b/feeds/packages/mail/dovecot/patches/.svn/prop-base/002-example_conf.patch.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/.svn/prop-base/002-example_conf.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/mail/dovecot/patches/.svn/text-base/001-configure_in.patch.svn-base b/feeds/packages/mail/dovecot/patches/.svn/text-base/001-configure_in.patch.svn-base +new file mode 100644 +index 0000000..2192605 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/.svn/text-base/001-configure_in.patch.svn-base +@@ -0,0 +1,31 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -398,9 +398,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 ++- +++ ], [ ++ int main() ++ { ++ return epoll_create(5) < 1; ++@@ -559,7 +559,7 @@ AC_TRY_COMPILE([ ++ 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 ++ #include ++@@ -568,6 +568,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/feeds/packages/mail/dovecot/patches/.svn/text-base/002-example_conf.patch.svn-base b/feeds/packages/mail/dovecot/patches/.svn/text-base/002-example_conf.patch.svn-base +new file mode 100644 +index 0000000..c2e98b4 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/.svn/text-base/002-example_conf.patch.svn-base +@@ -0,0 +1,87 @@ ++--- a/dovecot-example.conf +++++ b/dovecot-example.conf ++@@ -537,20 +537,20 @@ ++ ++ protocol imap { ++ # Login executable location. ++- #login_executable = /usr/libexec/dovecot/imap-login +++ #login_executable = /usr/lib/dovecot/imap-login ++ ++ # IMAP executable location. Changing this allows you to execute other ++ # binaries before the imap process is executed. ++ # ++ # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists: ++- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap +++ # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap ++ # ++ # ++ # This would attach gdb into the imap process and write backtraces into ++ # /tmp/gdbhelper.* files: ++- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap +++ # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap ++ # ++- #mail_executable = /usr/libexec/dovecot/imap +++ #mail_executable = /usr/lib/dovecot/imap ++ ++ # Maximum IMAP command line length in bytes. Some clients generate very long ++ # command lines with huge mailboxes, so you may need to raise this if you get ++@@ -614,11 +614,11 @@ protocol imap { ++ ++ protocol pop3 { ++ # Login executable location. ++- #login_executable = /usr/libexec/dovecot/pop3-login +++ #login_executable = /usr/lib/dovecot/pop3-login ++ ++ # POP3 executable location. See IMAP's mail_executable above for examples ++ # how this could be changed. ++- #mail_executable = /usr/libexec/dovecot/pop3 +++ #mail_executable = /usr/lib/dovecot/pop3 ++ ++ # Don't try to set mails non-recent or seen with POP3 sessions. This is ++ # mostly intended to reduce disk I/O. With maildir it doesn't move files ++@@ -743,7 +743,7 @@ protocol lda { ++ ## ++ ++ # Executable location ++-#auth_executable = /usr/libexec/dovecot/dovecot-auth +++#auth_executable = /usr/lib/dovecot/dovecot-auth ++ ++ # Set max. process size in megabytes. ++ #auth_process_size = 256 ++@@ -872,7 +872,7 @@ auth default { ++ # database (passwd usually), you can use static userdb. ++ # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM ++ # authentication to actually work. ++- passdb pam { +++ #passdb pam { ++ # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=] ++ # [cache_key=] [] ++ # ++@@ -905,15 +905,15 @@ auth default { ++ # args = session=yes %Ls ++ # args = cache_key=%u dovecot ++ #args = dovecot ++- } +++ #} ++ ++ # System users (NSS, /etc/passwd, or similiar) ++ # In many systems nowadays this uses Name Service Switch, which is ++ # configured in /etc/nsswitch.conf. ++- #passdb passwd { +++ passdb passwd { ++ # [blocking=yes] - See userdb passwd for explanation ++ #args = ++- #} +++ } ++ ++ # Shadow passwords for system users (NSS, /etc/shadow or similiar). ++ # Deprecated by PAM nowadays. ++@@ -1192,7 +1192,7 @@ plugin { ++ # a dictionary so it can be quickly determined which mailboxes contain ++ # expired mails. The actual expunging is done in a nightly cronjob, which ++ # you must set up: ++- # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool +++ # dovecot --exec-mail ext /usr/lib/dovecot/expire-tool ++ #expire = Trash 7 Spam 30 ++ #expire_dict = proxy::expire ++ +diff --git a/feeds/packages/mail/dovecot/patches/001-configure_in.patch b/feeds/packages/mail/dovecot/patches/001-configure_in.patch +new file mode 100644 +index 0000000..2192605 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/001-configure_in.patch +@@ -0,0 +1,31 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -398,9 +398,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 ++- +++ ], [ ++ int main() ++ { ++ return epoll_create(5) < 1; ++@@ -559,7 +559,7 @@ AC_TRY_COMPILE([ ++ 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 ++ #include ++@@ -568,6 +568,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/feeds/packages/mail/dovecot/patches/002-example_conf.patch b/feeds/packages/mail/dovecot/patches/002-example_conf.patch +new file mode 100644 +index 0000000..c2e98b4 +--- /dev/null ++++ b/feeds/packages/mail/dovecot/patches/002-example_conf.patch +@@ -0,0 +1,87 @@ ++--- a/dovecot-example.conf +++++ b/dovecot-example.conf ++@@ -537,20 +537,20 @@ ++ ++ protocol imap { ++ # Login executable location. ++- #login_executable = /usr/libexec/dovecot/imap-login +++ #login_executable = /usr/lib/dovecot/imap-login ++ ++ # IMAP executable location. Changing this allows you to execute other ++ # binaries before the imap process is executed. ++ # ++ # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists: ++- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap +++ # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap ++ # ++ # ++ # This would attach gdb into the imap process and write backtraces into ++ # /tmp/gdbhelper.* files: ++- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap +++ # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap ++ # ++- #mail_executable = /usr/libexec/dovecot/imap +++ #mail_executable = /usr/lib/dovecot/imap ++ ++ # Maximum IMAP command line length in bytes. Some clients generate very long ++ # command lines with huge mailboxes, so you may need to raise this if you get ++@@ -614,11 +614,11 @@ protocol imap { ++ ++ protocol pop3 { ++ # Login executable location. ++- #login_executable = /usr/libexec/dovecot/pop3-login +++ #login_executable = /usr/lib/dovecot/pop3-login ++ ++ # POP3 executable location. See IMAP's mail_executable above for examples ++ # how this could be changed. ++- #mail_executable = /usr/libexec/dovecot/pop3 +++ #mail_executable = /usr/lib/dovecot/pop3 ++ ++ # Don't try to set mails non-recent or seen with POP3 sessions. This is ++ # mostly intended to reduce disk I/O. With maildir it doesn't move files ++@@ -743,7 +743,7 @@ protocol lda { ++ ## ++ ++ # Executable location ++-#auth_executable = /usr/libexec/dovecot/dovecot-auth +++#auth_executable = /usr/lib/dovecot/dovecot-auth ++ ++ # Set max. process size in megabytes. ++ #auth_process_size = 256 ++@@ -872,7 +872,7 @@ auth default { ++ # database (passwd usually), you can use static userdb. ++ # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM ++ # authentication to actually work. ++- passdb pam { +++ #passdb pam { ++ # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=] ++ # [cache_key=] [] ++ # ++@@ -905,15 +905,15 @@ auth default { ++ # args = session=yes %Ls ++ # args = cache_key=%u dovecot ++ #args = dovecot ++- } +++ #} ++ ++ # System users (NSS, /etc/passwd, or similiar) ++ # In many systems nowadays this uses Name Service Switch, which is ++ # configured in /etc/nsswitch.conf. ++- #passdb passwd { +++ passdb passwd { ++ # [blocking=yes] - See userdb passwd for explanation ++ #args = ++- #} +++ } ++ ++ # Shadow passwords for system users (NSS, /etc/shadow or similiar). ++ # Deprecated by PAM nowadays. ++@@ -1192,7 +1192,7 @@ plugin { ++ # a dictionary so it can be quickly determined which mailboxes contain ++ # expired mails. The actual expunging is done in a nightly cronjob, which ++ # you must set up: ++- # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool +++ # dovecot --exec-mail ext /usr/lib/dovecot/expire-tool ++ #expire = Trash 7 Spam 30 ++ #expire_dict = proxy::expire ++ +diff --git a/feeds/packages/mail/fetchmail/.svn/entries b/feeds/packages/mail/fetchmail/.svn/entries +new file mode 100644 +index 0000000..ccf6ef4 +--- /dev/null ++++ b/feeds/packages/mail/fetchmail/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/fetchmail ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-02T11:05:52.351887Z ++34967 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++89da0e721987081de446a1da4e2c2893 ++2013-01-02T11:05:52.351887Z ++34967 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1890 ++ +diff --git a/feeds/packages/mail/fetchmail/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/fetchmail/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/mail/fetchmail/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/fetchmail/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/fetchmail/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2e7b368 +--- /dev/null ++++ b/feeds/packages/mail/fetchmail/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,83 @@ ++# ++# 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:=fetchmail ++PKG_VERSION:=6.3.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://download.berlios.de/fetchmail ++PKG_MD5SUM:=94edece56453d88ce260ec650e92ce70 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fetchmail/Default ++ SECTION:=mail ++ CATEGORY:=Mail ++ TITLE:=Remote mail retriever ++ URL:=http://fetchmail.berlios.de/ ++endef ++ ++define Package/fetchmail/Default/description ++ Retrieves remote mail via POP/IMAP. ++ Very useful in conjunction with mutt. ++endef ++ ++define Package/fetchmail ++ $(call Package/fetchmail/Default) ++ DEPENDS+= +libopenssl ++ TITLE+= (with SSL support) ++ VARIANT:=ssl ++endef ++ ++define Package/fetchmail/description ++ $(call Package/fetchmail/Default/description) ++ This package is built with SSL support. ++endef ++ ++define Package/fetchmail-nossl ++ $(call Package/fetchmail/Default) ++ TITLE+= (without SSL support) ++ VARIANT:=nossl ++endef ++ ++define Package/fetchmail-nossl/description ++ $(call Package/fetchmail/Default/description) ++ This package is built without SSL support. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-fallback=procmail \ ++ --without-hesiod ++ ++ifeq ($(BUILD_VARIANT),ssl) ++ CONFIGURE_ARGS += \ ++ --with-ssl="$(STAGING_DIR)/usr" ++endif ++ ++ifeq ($(BUILD_VARIANT),nossl) ++ CONFIGURE_ARGS += \ ++ --without-ssl ++endif ++ ++CONFIGURE_VARS += \ ++ ac_cv_path_procmail=/usr/sbin/procmail ++ ++define Package/fetchmail/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ ++endef ++ ++Package/fetchmail-nossl/install = $(Package/fetchmail/install) ++ ++$(eval $(call BuildPackage,fetchmail)) ++$(eval $(call BuildPackage,fetchmail-nossl)) +diff --git a/feeds/packages/mail/fetchmail/Makefile b/feeds/packages/mail/fetchmail/Makefile +new file mode 100644 +index 0000000..2e7b368 +--- /dev/null ++++ b/feeds/packages/mail/fetchmail/Makefile +@@ -0,0 +1,83 @@ ++# ++# 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:=fetchmail ++PKG_VERSION:=6.3.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://download.berlios.de/fetchmail ++PKG_MD5SUM:=94edece56453d88ce260ec650e92ce70 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fetchmail/Default ++ SECTION:=mail ++ CATEGORY:=Mail ++ TITLE:=Remote mail retriever ++ URL:=http://fetchmail.berlios.de/ ++endef ++ ++define Package/fetchmail/Default/description ++ Retrieves remote mail via POP/IMAP. ++ Very useful in conjunction with mutt. ++endef ++ ++define Package/fetchmail ++ $(call Package/fetchmail/Default) ++ DEPENDS+= +libopenssl ++ TITLE+= (with SSL support) ++ VARIANT:=ssl ++endef ++ ++define Package/fetchmail/description ++ $(call Package/fetchmail/Default/description) ++ This package is built with SSL support. ++endef ++ ++define Package/fetchmail-nossl ++ $(call Package/fetchmail/Default) ++ TITLE+= (without SSL support) ++ VARIANT:=nossl ++endef ++ ++define Package/fetchmail-nossl/description ++ $(call Package/fetchmail/Default/description) ++ This package is built without SSL support. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-fallback=procmail \ ++ --without-hesiod ++ ++ifeq ($(BUILD_VARIANT),ssl) ++ CONFIGURE_ARGS += \ ++ --with-ssl="$(STAGING_DIR)/usr" ++endif ++ ++ifeq ($(BUILD_VARIANT),nossl) ++ CONFIGURE_ARGS += \ ++ --without-ssl ++endif ++ ++CONFIGURE_VARS += \ ++ ac_cv_path_procmail=/usr/sbin/procmail ++ ++define Package/fetchmail/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ ++endef ++ ++Package/fetchmail-nossl/install = $(Package/fetchmail/install) ++ ++$(eval $(call BuildPackage,fetchmail)) ++$(eval $(call BuildPackage,fetchmail-nossl)) +diff --git a/feeds/packages/mail/imapfilter/.svn/entries b/feeds/packages/mail/imapfilter/.svn/entries +new file mode 100644 +index 0000000..210d032 +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/imapfilter ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-08-26T01:05:45.929370Z ++22810 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++3ef866e833a535bed30f6607bceae2ab ++2010-08-26T01:05:45.929370Z ++22810 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1981 ++ +diff --git a/feeds/packages/mail/imapfilter/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/imapfilter/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/imapfilter/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/imapfilter/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..802e835 +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=imapfilter ++PKG_VERSION:=2.2.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://imapfilter.hellug.gr/source/ ++PKG_MD5SUM:=09c6ffb085a5a244dc9f3e798259f341 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/imapfilter ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+liblua +libopenssl +libpcre ++ TITLE:=IMAP server based email filtering ++ URL:=http://imapfilter.hellug.gr/ ++endef ++ ++define Package/imapfilter/description ++ IMAPFilter is a mail filtering utility. It connects to remote mail ++ servers using the Internet Message Access Protocol (IMAP), sends ++ searching queries to the server and processes mailboxes based on the ++ results. It can be used to delete, copy, move, flag, etc. messages ++ residing in mailboxes at the same or different mail servers. The 4rev1 ++ and 4 versions of the IMAP protocol are supported. ++ ++ IMAPFilter uses the Lua programming language as a configuration and ++ extension language. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ ./configure \ ++ -d /usr \ ++ ); ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ INCDIRS="$(TARGET_CPPFLAGS)" \ ++ LIBDIRS="$(TARGET_LDFLAGS)" \ ++ MYCFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ ++ MYLDFLAGS="-lcrypt" ++endef ++ ++define Package/imapfilter/conffiles ++/etc/imapfilter/config.lua ++endef ++ ++define Package/imapfilter/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/imapfilter $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/imapfilter ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample.config.lua $(1)/etc/imapfilter/config.lua ++ $(INSTALL_DIR) $(1)/usr/share/imapfilter ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/{account,auxiliary,common,mailbox,message,options,regex,set,deprecated}.lua $(1)/usr/share/imapfilter/ ++endef ++ ++$(eval $(call BuildPackage,imapfilter)) +diff --git a/feeds/packages/mail/imapfilter/Makefile b/feeds/packages/mail/imapfilter/Makefile +new file mode 100644 +index 0000000..802e835 +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=imapfilter ++PKG_VERSION:=2.2.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://imapfilter.hellug.gr/source/ ++PKG_MD5SUM:=09c6ffb085a5a244dc9f3e798259f341 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/imapfilter ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+liblua +libopenssl +libpcre ++ TITLE:=IMAP server based email filtering ++ URL:=http://imapfilter.hellug.gr/ ++endef ++ ++define Package/imapfilter/description ++ IMAPFilter is a mail filtering utility. It connects to remote mail ++ servers using the Internet Message Access Protocol (IMAP), sends ++ searching queries to the server and processes mailboxes based on the ++ results. It can be used to delete, copy, move, flag, etc. messages ++ residing in mailboxes at the same or different mail servers. The 4rev1 ++ and 4 versions of the IMAP protocol are supported. ++ ++ IMAPFilter uses the Lua programming language as a configuration and ++ extension language. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ ./configure \ ++ -d /usr \ ++ ); ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ INCDIRS="$(TARGET_CPPFLAGS)" \ ++ LIBDIRS="$(TARGET_LDFLAGS)" \ ++ MYCFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ ++ MYLDFLAGS="-lcrypt" ++endef ++ ++define Package/imapfilter/conffiles ++/etc/imapfilter/config.lua ++endef ++ ++define Package/imapfilter/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/imapfilter $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/imapfilter ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample.config.lua $(1)/etc/imapfilter/config.lua ++ $(INSTALL_DIR) $(1)/usr/share/imapfilter ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/{account,auxiliary,common,mailbox,message,options,regex,set,deprecated}.lua $(1)/usr/share/imapfilter/ ++endef ++ ++$(eval $(call BuildPackage,imapfilter)) +diff --git a/feeds/packages/mail/imapfilter/patches/.svn/entries b/feeds/packages/mail/imapfilter/patches/.svn/entries +new file mode 100644 +index 0000000..b3662ce +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/imapfilter/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-13T21:57:26.647608Z ++11809 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-pathnames.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++6a9975ce2225469de5a6582f8fe34925 ++2008-07-13T21:57:26.647608Z ++11809 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++753 ++ +diff --git a/feeds/packages/mail/imapfilter/patches/.svn/prop-base/010-pathnames.patch.svn-base b/feeds/packages/mail/imapfilter/patches/.svn/prop-base/010-pathnames.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/patches/.svn/prop-base/010-pathnames.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/imapfilter/patches/.svn/text-base/010-pathnames.patch.svn-base b/feeds/packages/mail/imapfilter/patches/.svn/text-base/010-pathnames.patch.svn-base +new file mode 100644 +index 0000000..6e9a43f +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/patches/.svn/text-base/010-pathnames.patch.svn-base +@@ -0,0 +1,31 @@ ++--- a/pathnames.h +++++ b/pathnames.h ++@@ -3,7 +3,7 @@ ++ ++ ++ /* Program's home directory. */ ++-#define PATHNAME_HOME ".imapfilter" +++#define PATHNAME_HOME "/etc/imapfilter" ++ ++ /* Program's configuration file. */ ++ #define PATHNAME_CONFIG PATHNAME_HOME "/config.lua" ++@@ -39,7 +39,7 @@ ++ #define PATHNAME_CERTS PATHNAME_HOME "/certificates" ++ ++ /* Debug temporary file template. */ ++-#define PATHNAME_DEBUG PATHNAME_HOME "/debug.XXXXXX" +++#define PATHNAME_DEBUG "/tmp/imapfilterdebug.XXXXXX" ++ ++ ++ #endif /* PATHNAMES_H */ ++--- a/imapfilter.c +++++ b/imapfilter.c ++@@ -50,7 +50,7 @@ ++ opts.config = NULL; ++ opts.oneline = NULL; ++ ++- env.home = getenv("HOME"); +++ env.home = ""; ++ env.pathmax = -1; ++ ++ while ((c = getopt(argc, argv, "Vc:de:il:v?")) != -1) { +diff --git a/feeds/packages/mail/imapfilter/patches/010-pathnames.patch b/feeds/packages/mail/imapfilter/patches/010-pathnames.patch +new file mode 100644 +index 0000000..6e9a43f +--- /dev/null ++++ b/feeds/packages/mail/imapfilter/patches/010-pathnames.patch +@@ -0,0 +1,31 @@ ++--- a/pathnames.h +++++ b/pathnames.h ++@@ -3,7 +3,7 @@ ++ ++ ++ /* Program's home directory. */ ++-#define PATHNAME_HOME ".imapfilter" +++#define PATHNAME_HOME "/etc/imapfilter" ++ ++ /* Program's configuration file. */ ++ #define PATHNAME_CONFIG PATHNAME_HOME "/config.lua" ++@@ -39,7 +39,7 @@ ++ #define PATHNAME_CERTS PATHNAME_HOME "/certificates" ++ ++ /* Debug temporary file template. */ ++-#define PATHNAME_DEBUG PATHNAME_HOME "/debug.XXXXXX" +++#define PATHNAME_DEBUG "/tmp/imapfilterdebug.XXXXXX" ++ ++ ++ #endif /* PATHNAMES_H */ ++--- a/imapfilter.c +++++ b/imapfilter.c ++@@ -50,7 +50,7 @@ ++ opts.config = NULL; ++ opts.oneline = NULL; ++ ++- env.home = getenv("HOME"); +++ env.home = ""; ++ env.pathmax = -1; ++ ++ while ((c = getopt(argc, argv, "Vc:de:il:v?")) != -1) { +diff --git a/feeds/packages/mail/mini_sendmail/.svn/entries b/feeds/packages/mail/mini_sendmail/.svn/entries +new file mode 100644 +index 0000000..30b656e +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/mini_sendmail ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-24T12:08:11.885061Z ++24817 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++ac3f3a08e6c8254d0bb860df9cfdb208 ++2010-12-24T12:08:11.885061Z ++24817 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1316 ++ +diff --git a/feeds/packages/mail/mini_sendmail/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/mini_sendmail/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/mini_sendmail/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/mini_sendmail/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8024f88 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=mini-sendmail ++PKG_VERSION:=1.3.6 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=mini_sendmail-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ ++PKG_MD5SUM:=fb1585d2ad81c519a26d83bfd783dee8 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/mini_sendmail-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mini-sendmail ++ SECTION:=mail ++ CATEGORY:=Mail ++ TITLE:=A small sendmail-compatible mail forwarder ++ URL:=http://www.acme.com/software/mini_sendmail/ ++endef ++ ++define Package/mini-sendmail/description ++ mini_sendmail reads its standard input up to an end-of-file and sends a ++ copy of the message found there to all of the addresses listed. ++ The message is sent by connecting to a local SMTP server. This means ++ mini_sendmail can be used to send email from inside a chroot(2) area. ++endef ++ ++MAKE_FLAGS += \ ++ OFLAGS="$(TARGET_CFLAGS)" ++ ++define Package/mini-sendmail/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_sendmail $(1)/usr/sbin/ ++endef ++ ++define Package/mini-sendmail/postinst ++ ln -sf mini_sendmail $${IPKG_INSTROOT}/usr/sbin/sendmail ++endef ++ ++$(eval $(call BuildPackage,mini-sendmail)) +diff --git a/feeds/packages/mail/mini_sendmail/Makefile b/feeds/packages/mail/mini_sendmail/Makefile +new file mode 100644 +index 0000000..8024f88 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=mini-sendmail ++PKG_VERSION:=1.3.6 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=mini_sendmail-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ ++PKG_MD5SUM:=fb1585d2ad81c519a26d83bfd783dee8 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/mini_sendmail-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mini-sendmail ++ SECTION:=mail ++ CATEGORY:=Mail ++ TITLE:=A small sendmail-compatible mail forwarder ++ URL:=http://www.acme.com/software/mini_sendmail/ ++endef ++ ++define Package/mini-sendmail/description ++ mini_sendmail reads its standard input up to an end-of-file and sends a ++ copy of the message found there to all of the addresses listed. ++ The message is sent by connecting to a local SMTP server. This means ++ mini_sendmail can be used to send email from inside a chroot(2) area. ++endef ++ ++MAKE_FLAGS += \ ++ OFLAGS="$(TARGET_CFLAGS)" ++ ++define Package/mini-sendmail/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_sendmail $(1)/usr/sbin/ ++endef ++ ++define Package/mini-sendmail/postinst ++ ln -sf mini_sendmail $${IPKG_INSTROOT}/usr/sbin/sendmail ++endef ++ ++$(eval $(call BuildPackage,mini-sendmail)) +diff --git a/feeds/packages/mail/mini_sendmail/patches/.svn/entries b/feeds/packages/mail/mini_sendmail/patches/.svn/entries +new file mode 100644 +index 0000000..9c13d47 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/mini_sendmail/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-fullname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8a0f40e7e268f7af629426c20f0cd6dc ++2007-08-28T16:01:46.426765Z ++8530 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1055 ++ ++500-flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++ade98d727bc19032320ba44f6b411ff0 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++467 ++ +diff --git a/feeds/packages/mail/mini_sendmail/patches/.svn/prop-base/500-flags.patch.svn-base b/feeds/packages/mail/mini_sendmail/patches/.svn/prop-base/500-flags.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/patches/.svn/prop-base/500-flags.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/mini_sendmail/patches/.svn/text-base/200-fullname.patch.svn-base b/feeds/packages/mail/mini_sendmail/patches/.svn/text-base/200-fullname.patch.svn-base +new file mode 100644 +index 0000000..95e19a7 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/patches/.svn/text-base/200-fullname.patch.svn-base +@@ -0,0 +1,36 @@ ++Index: mini_sendmail-1.3.6/mini_sendmail.c ++=================================================================== ++--- mini_sendmail-1.3.6.orig/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 +++++ mini_sendmail-1.3.6/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 ++@@ -542,6 +542,7 @@ ++ } ++ ++ /* Strip off any angle brackets. */ +++/* ++ while ( len > 0 && *recipient == '<' ) ++ { ++ ++recipient; ++@@ -551,6 +552,23 @@ ++ --len; ++ ++ (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); +++*/ +++ if (len > 0 && recipient[len-1] == '>' ) +++ { +++ /* "" or: "Full Name " */ +++ while (len > 0 && *recipient != '<' ) +++ { +++ ++recipient; +++ --len; +++ } +++ (void) snprintf( buf, sizeof(buf), "RCPT TO:%.*s", len, recipient ); +++ } +++ else +++ { +++ /* name@domain */ +++ (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); +++ } +++ ++ send_command( buf ); ++ status = read_response(); ++ if ( status != 250 && status != 251 ) +diff --git a/feeds/packages/mail/mini_sendmail/patches/.svn/text-base/500-flags.patch.svn-base b/feeds/packages/mail/mini_sendmail/patches/.svn/text-base/500-flags.patch.svn-base +new file mode 100644 +index 0000000..39b42b4 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/patches/.svn/text-base/500-flags.patch.svn-base +@@ -0,0 +1,17 @@ ++Index: mini_sendmail-1.3.6/Makefile ++=================================================================== ++--- mini_sendmail-1.3.6.orig/Makefile 2007-08-28 17:58:37.000000000 +0200 +++++ mini_sendmail-1.3.6/Makefile 2007-08-28 17:58:37.000000000 +0200 ++@@ -7,9 +7,10 @@ ++ BINDIR = /usr/local/sbin ++ MANDIR = /usr/local/man ++ CC = gcc ++-CFLAGS = -O +++OFLAGS = -O +++CFLAGS = $(OFLAGS) ++ #CFLAGS = -g ++-LDFLAGS = -s -static +++LDFLAGS = ++ #LDFLAGS = -g -static ++ LDLIBS = $(SYSV_LIBS) ++ +diff --git a/feeds/packages/mail/mini_sendmail/patches/200-fullname.patch b/feeds/packages/mail/mini_sendmail/patches/200-fullname.patch +new file mode 100644 +index 0000000..95e19a7 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/patches/200-fullname.patch +@@ -0,0 +1,36 @@ ++Index: mini_sendmail-1.3.6/mini_sendmail.c ++=================================================================== ++--- mini_sendmail-1.3.6.orig/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 +++++ mini_sendmail-1.3.6/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 ++@@ -542,6 +542,7 @@ ++ } ++ ++ /* Strip off any angle brackets. */ +++/* ++ while ( len > 0 && *recipient == '<' ) ++ { ++ ++recipient; ++@@ -551,6 +552,23 @@ ++ --len; ++ ++ (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); +++*/ +++ if (len > 0 && recipient[len-1] == '>' ) +++ { +++ /* "" or: "Full Name " */ +++ while (len > 0 && *recipient != '<' ) +++ { +++ ++recipient; +++ --len; +++ } +++ (void) snprintf( buf, sizeof(buf), "RCPT TO:%.*s", len, recipient ); +++ } +++ else +++ { +++ /* name@domain */ +++ (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); +++ } +++ ++ send_command( buf ); ++ status = read_response(); ++ if ( status != 250 && status != 251 ) +diff --git a/feeds/packages/mail/mini_sendmail/patches/500-flags.patch b/feeds/packages/mail/mini_sendmail/patches/500-flags.patch +new file mode 100644 +index 0000000..39b42b4 +--- /dev/null ++++ b/feeds/packages/mail/mini_sendmail/patches/500-flags.patch +@@ -0,0 +1,17 @@ ++Index: mini_sendmail-1.3.6/Makefile ++=================================================================== ++--- mini_sendmail-1.3.6.orig/Makefile 2007-08-28 17:58:37.000000000 +0200 +++++ mini_sendmail-1.3.6/Makefile 2007-08-28 17:58:37.000000000 +0200 ++@@ -7,9 +7,10 @@ ++ BINDIR = /usr/local/sbin ++ MANDIR = /usr/local/man ++ CC = gcc ++-CFLAGS = -O +++OFLAGS = -O +++CFLAGS = $(OFLAGS) ++ #CFLAGS = -g ++-LDFLAGS = -s -static +++LDFLAGS = ++ #LDFLAGS = -g -static ++ LDLIBS = $(SYSV_LIBS) ++ +diff --git a/feeds/packages/mail/msmtp/.svn/entries b/feeds/packages/mail/msmtp/.svn/entries +new file mode 100644 +index 0000000..c887c80 +--- /dev/null ++++ b/feeds/packages/mail/msmtp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/msmtp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e5ac45d50961f0dbbdb0456a472fa1ac ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3039 ++ +diff --git a/feeds/packages/mail/msmtp/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/msmtp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8392a3c +--- /dev/null ++++ b/feeds/packages/mail/msmtp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,122 @@ ++# ++# Copyright (C) 2009 David Cooper ++# 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:=msmtp ++PKG_VERSION:=1.4.27 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/msmtp ++PKG_MD5SUM:=2d6d10d9c59ed2b2635554ed35fb9226 ++ ++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 ++ ++MAKE_FLAGS := ++ ++ifeq ($(BUILD_VARIANT),ssl) ++ CONFIGURE_ARGS += \ ++ --with-ssl=openssl ++endif ++ ++ifeq ($(BUILD_VARIANT),nossl) ++ CONFIGURE_ARGS += \ ++ --with-ssl=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 ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++endef ++ ++define Package/msmtp/postinst ++ ln -sf ../bin/msmtp $${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) ++ ++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/feeds/packages/mail/msmtp/Makefile b/feeds/packages/mail/msmtp/Makefile +new file mode 100644 +index 0000000..8392a3c +--- /dev/null ++++ b/feeds/packages/mail/msmtp/Makefile +@@ -0,0 +1,122 @@ ++# ++# Copyright (C) 2009 David Cooper ++# 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:=msmtp ++PKG_VERSION:=1.4.27 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/msmtp ++PKG_MD5SUM:=2d6d10d9c59ed2b2635554ed35fb9226 ++ ++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 ++ ++MAKE_FLAGS := ++ ++ifeq ($(BUILD_VARIANT),ssl) ++ CONFIGURE_ARGS += \ ++ --with-ssl=openssl ++endif ++ ++ifeq ($(BUILD_VARIANT),nossl) ++ CONFIGURE_ARGS += \ ++ --with-ssl=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 ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++endef ++ ++define Package/msmtp/postinst ++ ln -sf ../bin/msmtp $${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) ++ ++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/feeds/packages/mail/mutt/.svn/entries b/feeds/packages/mail/mutt/.svn/entries +new file mode 100644 +index 0000000..3a8f6fa +--- /dev/null ++++ b/feeds/packages/mail/mutt/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/mutt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:59.188859Z ++32299 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++a069644ae494e7a7608e392283da81f8 ++2012-06-12T23:47:59.188859Z ++32299 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++999 ++ +diff --git a/feeds/packages/mail/mutt/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/mutt/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/mail/mutt/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/mutt/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/mutt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eb7381d +--- /dev/null ++++ b/feeds/packages/mail/mutt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=mutt ++PKG_VERSION:=1.5.21 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=@SF/mutt ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=a29db8f1d51e2f10c070bf88e8a553fd ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mutt ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libopenssl +libncursesw ++ TITLE:=Console mail client ++ URL:=http://www.mutt.org/ ++endef ++ ++define Package/mutt/description ++ Mutt is a small but very powerful text-based mail client for Unix ++ operating systems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --includedir=$(PKG_BUILD_DIR)/. \ ++ --oldincludedir=$(PKG_BUILD_DIR)/. \ ++ --enable-pop \ ++ --enable-imap \ ++ --with-ssl \ ++ --without-idn ++ ++define Package/mutt/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutt $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,mutt)) +diff --git a/feeds/packages/mail/mutt/Makefile b/feeds/packages/mail/mutt/Makefile +new file mode 100644 +index 0000000..eb7381d +--- /dev/null ++++ b/feeds/packages/mail/mutt/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=mutt ++PKG_VERSION:=1.5.21 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=@SF/mutt ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=a29db8f1d51e2f10c070bf88e8a553fd ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mutt ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libopenssl +libncursesw ++ TITLE:=Console mail client ++ URL:=http://www.mutt.org/ ++endef ++ ++define Package/mutt/description ++ Mutt is a small but very powerful text-based mail client for Unix ++ operating systems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --includedir=$(PKG_BUILD_DIR)/. \ ++ --oldincludedir=$(PKG_BUILD_DIR)/. \ ++ --enable-pop \ ++ --enable-imap \ ++ --with-ssl \ ++ --without-idn ++ ++define Package/mutt/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutt $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,mutt)) +diff --git a/feeds/packages/mail/mutt/patches/.svn/entries b/feeds/packages/mail/mutt/patches/.svn/entries +new file mode 100644 +index 0000000..61039e9 +--- /dev/null ++++ b/feeds/packages/mail/mutt/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/mutt/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-24T12:01:56.196155Z ++24815 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_po_and_docs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++37548378f956fe843fe468eed728c566 ++2010-12-24T12:01:56.196155Z ++24815 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++453 ++ +diff --git a/feeds/packages/mail/mutt/patches/.svn/text-base/001-no_po_and_docs.patch.svn-base b/feeds/packages/mail/mutt/patches/.svn/text-base/001-no_po_and_docs.patch.svn-base +new file mode 100644 +index 0000000..a645993 +--- /dev/null ++++ b/feeds/packages/mail/mutt/patches/.svn/text-base/001-no_po_and_docs.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = 1.6 foreign ++ @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap ++ @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap ++-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) +++SUBDIRS = m4 intl contrib $(IMAP_SUBDIR) ++ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@ ++ @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h ++ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h $(HCVERSION) +diff --git a/feeds/packages/mail/mutt/patches/001-no_po_and_docs.patch b/feeds/packages/mail/mutt/patches/001-no_po_and_docs.patch +new file mode 100644 +index 0000000..a645993 +--- /dev/null ++++ b/feeds/packages/mail/mutt/patches/001-no_po_and_docs.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = 1.6 foreign ++ @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap ++ @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap ++-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) +++SUBDIRS = m4 intl contrib $(IMAP_SUBDIR) ++ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@ ++ @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h ++ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h $(HCVERSION) +diff --git a/feeds/packages/mail/nullmailer/.svn/entries b/feeds/packages/mail/nullmailer/.svn/entries +new file mode 100644 +index 0000000..3c4ec2b +--- /dev/null ++++ b/feeds/packages/mail/nullmailer/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/nullmailer ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:35:42.185704Z ++32248 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c5787751d04343ffa43e7b799f91d281 ++2012-06-11T23:35:42.185704Z ++32248 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1891 ++ +diff --git a/feeds/packages/mail/nullmailer/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/nullmailer/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7416064 +--- /dev/null ++++ b/feeds/packages/mail/nullmailer/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=nullmailer ++PKG_VERSION:=1.05 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://untroubled.org/nullmailer/ ++PKG_MD5SUM:=35124cc05f893efba1310e2ec7c876ff ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nullmailer ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libstdcpp ++ TITLE:=A minimal MTA for hosts which relay to a fixed set of smart relays ++ URL:=http://untroubled.org/nullmailer/ ++endef ++ ++define Package/nullmailer/description ++ This is nullmailer, a sendmail/qmail/etc replacement MTA for hosts ++ which relay to a fixed set of smart relays. It is designed to be ++ simple to configure, secure, and easily extendable. ++endef ++ ++TARGET_CFLAGS += $(TARGET_CPPFLAGS) ++ ++define Package/nullmailer/install ++ $(INSTALL_DIR) $(1)/etc/nullmailer ++ echo "# List of smart relays" > $(1)/etc/nullmailer/remotes ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mailq $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nullmailer-inject $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nullmailer-queue $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nullmailer-send $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sendmail $(1)/usr/sbin/nullmailer-sendmail ++ $(INSTALL_DIR) $(1)/usr/lib/nullmailer ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/protocols/qmqp $(1)/usr/lib/nullmailer/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/protocols/smtp $(1)/usr/lib/nullmailer/ ++endef ++ ++define Package/nullmailer/conffiles ++/etc/nullmailer/remotes ++endef ++ ++define Package/nullmailer/postinst ++ ln -sf ../sbin/sendmail $${IPKG_INSTROOT}/usr/lib/sendmail ++ ln -sf nullmailer-sendmail $${IPKG_INSTROOT}/usr/sbin/sendmail ++endef ++ ++$(eval $(call BuildPackage,nullmailer)) +diff --git a/feeds/packages/mail/nullmailer/Makefile b/feeds/packages/mail/nullmailer/Makefile +new file mode 100644 +index 0000000..7416064 +--- /dev/null ++++ b/feeds/packages/mail/nullmailer/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=nullmailer ++PKG_VERSION:=1.05 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://untroubled.org/nullmailer/ ++PKG_MD5SUM:=35124cc05f893efba1310e2ec7c876ff ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nullmailer ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libstdcpp ++ TITLE:=A minimal MTA for hosts which relay to a fixed set of smart relays ++ URL:=http://untroubled.org/nullmailer/ ++endef ++ ++define Package/nullmailer/description ++ This is nullmailer, a sendmail/qmail/etc replacement MTA for hosts ++ which relay to a fixed set of smart relays. It is designed to be ++ simple to configure, secure, and easily extendable. ++endef ++ ++TARGET_CFLAGS += $(TARGET_CPPFLAGS) ++ ++define Package/nullmailer/install ++ $(INSTALL_DIR) $(1)/etc/nullmailer ++ echo "# List of smart relays" > $(1)/etc/nullmailer/remotes ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mailq $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nullmailer-inject $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nullmailer-queue $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nullmailer-send $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sendmail $(1)/usr/sbin/nullmailer-sendmail ++ $(INSTALL_DIR) $(1)/usr/lib/nullmailer ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/protocols/qmqp $(1)/usr/lib/nullmailer/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/protocols/smtp $(1)/usr/lib/nullmailer/ ++endef ++ ++define Package/nullmailer/conffiles ++/etc/nullmailer/remotes ++endef ++ ++define Package/nullmailer/postinst ++ ln -sf ../sbin/sendmail $${IPKG_INSTROOT}/usr/lib/sendmail ++ ln -sf nullmailer-sendmail $${IPKG_INSTROOT}/usr/sbin/sendmail ++endef ++ ++$(eval $(call BuildPackage,nullmailer)) +diff --git a/feeds/packages/mail/procmail/.svn/entries b/feeds/packages/mail/procmail/.svn/entries +new file mode 100644 +index 0000000..a9aa643 +--- /dev/null ++++ b/feeds/packages/mail/procmail/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/procmail ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T21:09:37.667973Z ++32540 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++0a7a288a7f4eb29d8a229e81ccd4c430 ++2012-06-29T21:09:37.667973Z ++32540 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1080 ++ +diff --git a/feeds/packages/mail/procmail/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/procmail/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/mail/procmail/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/procmail/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/procmail/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f006e12 +--- /dev/null ++++ b/feeds/packages/mail/procmail/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=procmail ++PKG_VERSION:=3.22 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://www.procmail.org/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=1678ea99b973eb77eda4ecf6acae53f1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/procmail ++ SECTION:=mail ++ CATEGORY:=Mail ++ TITLE:=Mail processing tool ++ URL:=http://www.procmail.org ++endef ++ ++define Package/procmail/description ++ Procmail is able to process and classify incoming mail into ++ different mail boxes. ++ Very useful in conjunction with mutt. ++endef ++ ++TARGET_CFLAGS += -DPROCMAIL ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/src -f ../Makefile.openwrt \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" ++endef ++ ++define Package/procmail/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/src/procmail $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/src/formail $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,procmail)) +diff --git a/feeds/packages/mail/procmail/Makefile b/feeds/packages/mail/procmail/Makefile +new file mode 100644 +index 0000000..f006e12 +--- /dev/null ++++ b/feeds/packages/mail/procmail/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=procmail ++PKG_VERSION:=3.22 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://www.procmail.org/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=1678ea99b973eb77eda4ecf6acae53f1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/procmail ++ SECTION:=mail ++ CATEGORY:=Mail ++ TITLE:=Mail processing tool ++ URL:=http://www.procmail.org ++endef ++ ++define Package/procmail/description ++ Procmail is able to process and classify incoming mail into ++ different mail boxes. ++ Very useful in conjunction with mutt. ++endef ++ ++TARGET_CFLAGS += -DPROCMAIL ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/src -f ../Makefile.openwrt \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" ++endef ++ ++define Package/procmail/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/src/procmail $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/src/formail $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,procmail)) +diff --git a/feeds/packages/mail/procmail/patches/.svn/entries b/feeds/packages/mail/procmail/patches/.svn/entries +new file mode 100644 +index 0000000..f759c64 +--- /dev/null ++++ b/feeds/packages/mail/procmail/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/procmail/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T21:09:35.469371Z ++32539 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-procmail_openwrt.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++92a573f9804a92abc338924fe79db716 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1927 ++ ++100-rename_getline.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++15588bf93b4028fe52d0db005463b77c ++2012-06-29T21:09:35.469371Z ++32539 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1773 ++ +diff --git a/feeds/packages/mail/procmail/patches/.svn/prop-base/001-procmail_openwrt.patch.svn-base b/feeds/packages/mail/procmail/patches/.svn/prop-base/001-procmail_openwrt.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/mail/procmail/patches/.svn/prop-base/001-procmail_openwrt.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/procmail/patches/.svn/text-base/001-procmail_openwrt.patch.svn-base b/feeds/packages/mail/procmail/patches/.svn/text-base/001-procmail_openwrt.patch.svn-base +new file mode 100644 +index 0000000..c33d826 +--- /dev/null ++++ b/feeds/packages/mail/procmail/patches/.svn/text-base/001-procmail_openwrt.patch.svn-base +@@ -0,0 +1,51 @@ ++This patch is required to make procmail cross compile - it tries to run some automatic tests which ++obviously do not work in a cross compiled environment. ++ ++ ++diff -Naur procmail-3.22_orig/autoconf.h procmail-3.22/autoconf.h ++--- procmail-3.22_orig/autoconf.h 1970-01-01 10:00:00.000000000 +1000 +++++ procmail-3.22/autoconf.h 2006-03-23 12:15:36.000000000 +1100 ++@@ -0,0 +1,21 @@ +++/* This file was automagically generated by autoconf */ +++ +++/* 5 moves in 64 steps of size 16384 when reallocing */ +++#define NOpw_class +++#define NOstrlcat +++#define NOsetrgid +++#define MAX_argc 7588 +++/* Your system's strstr() is 1.12 times FASTER than my C-routine */ +++#define UDP_protocolno 17 +++#define BIFF_serviceport "512" +++#define IP_localhost {127,0,0,1} +++#define MAILSPOOLDIR "/var/spool/mail/" +++#define SENDMAIL "/usr/sbin/sendmail" +++#define CF_no_procmail_yet +++#define buggy_SENDMAIL +++#define defPATH "PATH=$HOME/bin:/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" +++#define defSPATH "PATH=/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" +++#define PM_VERSION "3.22" +++/* Hotwire LOCKINGTEST=100 */ +++/* Procmail will lock via: dotlocking, fcntl() */ +++/* autoconf completed */ ++diff -Naur procmail-3.22_orig/Makefile.openwrt procmail-3.22/Makefile.openwrt ++--- procmail-3.22_orig/Makefile.openwrt 1970-01-01 10:00:00.000000000 +1000 +++++ procmail-3.22/Makefile.openwrt 2006-03-23 12:15:36.000000000 +1100 ++@@ -0,0 +1,18 @@ +++PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ +++ mailfold.o foldinfo.o misc.o pipes.o regexp.o robust.o \ +++ sublib.o acommon.o mcommon.o lastdirsep.o authenticate.o \ +++ lmtp.o memblk.o variables.o from.o comsat.o +++ +++FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ +++ acommon.o +++ +++LDFLAGS = -lm -lnsl -ldl -lc +++CFLAGS = -Os -DPROCMAIL +++ +++all: procmail formail +++ +++procmail: procmail.o $(PM_OBJ) +++ $(CC) $(CFLAGS) $@.o $(PM_OBJ) -o $@ $(LDFLAGS) +++ +++formail: formail.o $(FM_OBJ) +++ $(CC) $(CFLAGS) $@.o $(FM_OBJ) -o $@ $(LDFLAGS) +diff --git a/feeds/packages/mail/procmail/patches/.svn/text-base/100-rename_getline.patch.svn-base b/feeds/packages/mail/procmail/patches/.svn/text-base/100-rename_getline.patch.svn-base +new file mode 100644 +index 0000000..6cd359d +--- /dev/null ++++ b/feeds/packages/mail/procmail/patches/.svn/text-base/100-rename_getline.patch.svn-base +@@ -0,0 +1,52 @@ ++--- a/src/fields.c +++++ b/src/fields.c ++@@ -110,16 +110,16 @@ ++ /* try and append one valid field to rdheader from stdin */ ++ int readhead P((void)) ++ { int idlen; ++- getline(); +++ __getline(); ++ if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */ ++ return 0; ++ if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ ++ { if(rdheader) ++ return 0; /* the From_ line was a fake! */ ++- for(;buflast=='>';getline()); /* gather continued >From_ lines */ +++ for(;buflast=='>';__getline()); /* gather continued >From_ lines */ ++ } ++ else ++- for(;;getline()) /* get the rest of the continued field */ +++ for(;;__getline()) /* get the rest of the continued field */ ++ { switch(buflast) /* will this line be continued? */ ++ { case ' ':case '\t': /* yep, it sure is */ ++ continue; ++--- a/src/formail.c +++++ b/src/formail.c ++@@ -819,7 +819,7 @@ ++ { if(split) /* gobble up the next start separator */ ++ { buffilled=0; ++ #ifdef sMAILBOX_SEPARATOR ++- getline();buffilled=0; /* but only if it's defined */ +++ __getline();buffilled=0; /* but only if it's defined */ ++ #endif ++ if(buflast!=EOF) /* if any */ ++ goto splitit; ++--- a/src/formisc.c +++++ b/src/formisc.c ++@@ -115,7 +115,7 @@ ++ buf[buffilled++]=c; ++ } ++ ++-int getline P((void)) /* read a newline-terminated line */ +++int __getline P((void)) /* read a newline-terminated line */ ++ { if(buflast==EOF) /* at the end of our Latin already? */ ++ { loadchar('\n'); /* fake empty line */ ++ return EOF; /* spread the word */ ++--- a/src/formisc.h +++++ b/src/formisc.h ++@@ -17,4 +17,4 @@ ++ char* ++ skipwords P((char*start)); ++ int ++- getline P((void)); +++ __getline P((void)); +diff --git a/feeds/packages/mail/procmail/patches/001-procmail_openwrt.patch b/feeds/packages/mail/procmail/patches/001-procmail_openwrt.patch +new file mode 100644 +index 0000000..c33d826 +--- /dev/null ++++ b/feeds/packages/mail/procmail/patches/001-procmail_openwrt.patch +@@ -0,0 +1,51 @@ ++This patch is required to make procmail cross compile - it tries to run some automatic tests which ++obviously do not work in a cross compiled environment. ++ ++ ++diff -Naur procmail-3.22_orig/autoconf.h procmail-3.22/autoconf.h ++--- procmail-3.22_orig/autoconf.h 1970-01-01 10:00:00.000000000 +1000 +++++ procmail-3.22/autoconf.h 2006-03-23 12:15:36.000000000 +1100 ++@@ -0,0 +1,21 @@ +++/* This file was automagically generated by autoconf */ +++ +++/* 5 moves in 64 steps of size 16384 when reallocing */ +++#define NOpw_class +++#define NOstrlcat +++#define NOsetrgid +++#define MAX_argc 7588 +++/* Your system's strstr() is 1.12 times FASTER than my C-routine */ +++#define UDP_protocolno 17 +++#define BIFF_serviceport "512" +++#define IP_localhost {127,0,0,1} +++#define MAILSPOOLDIR "/var/spool/mail/" +++#define SENDMAIL "/usr/sbin/sendmail" +++#define CF_no_procmail_yet +++#define buggy_SENDMAIL +++#define defPATH "PATH=$HOME/bin:/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" +++#define defSPATH "PATH=/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" +++#define PM_VERSION "3.22" +++/* Hotwire LOCKINGTEST=100 */ +++/* Procmail will lock via: dotlocking, fcntl() */ +++/* autoconf completed */ ++diff -Naur procmail-3.22_orig/Makefile.openwrt procmail-3.22/Makefile.openwrt ++--- procmail-3.22_orig/Makefile.openwrt 1970-01-01 10:00:00.000000000 +1000 +++++ procmail-3.22/Makefile.openwrt 2006-03-23 12:15:36.000000000 +1100 ++@@ -0,0 +1,18 @@ +++PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ +++ mailfold.o foldinfo.o misc.o pipes.o regexp.o robust.o \ +++ sublib.o acommon.o mcommon.o lastdirsep.o authenticate.o \ +++ lmtp.o memblk.o variables.o from.o comsat.o +++ +++FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ +++ acommon.o +++ +++LDFLAGS = -lm -lnsl -ldl -lc +++CFLAGS = -Os -DPROCMAIL +++ +++all: procmail formail +++ +++procmail: procmail.o $(PM_OBJ) +++ $(CC) $(CFLAGS) $@.o $(PM_OBJ) -o $@ $(LDFLAGS) +++ +++formail: formail.o $(FM_OBJ) +++ $(CC) $(CFLAGS) $@.o $(FM_OBJ) -o $@ $(LDFLAGS) +diff --git a/feeds/packages/mail/procmail/patches/100-rename_getline.patch b/feeds/packages/mail/procmail/patches/100-rename_getline.patch +new file mode 100644 +index 0000000..6cd359d +--- /dev/null ++++ b/feeds/packages/mail/procmail/patches/100-rename_getline.patch +@@ -0,0 +1,52 @@ ++--- a/src/fields.c +++++ b/src/fields.c ++@@ -110,16 +110,16 @@ ++ /* try and append one valid field to rdheader from stdin */ ++ int readhead P((void)) ++ { int idlen; ++- getline(); +++ __getline(); ++ if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */ ++ return 0; ++ if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ ++ { if(rdheader) ++ return 0; /* the From_ line was a fake! */ ++- for(;buflast=='>';getline()); /* gather continued >From_ lines */ +++ for(;buflast=='>';__getline()); /* gather continued >From_ lines */ ++ } ++ else ++- for(;;getline()) /* get the rest of the continued field */ +++ for(;;__getline()) /* get the rest of the continued field */ ++ { switch(buflast) /* will this line be continued? */ ++ { case ' ':case '\t': /* yep, it sure is */ ++ continue; ++--- a/src/formail.c +++++ b/src/formail.c ++@@ -819,7 +819,7 @@ ++ { if(split) /* gobble up the next start separator */ ++ { buffilled=0; ++ #ifdef sMAILBOX_SEPARATOR ++- getline();buffilled=0; /* but only if it's defined */ +++ __getline();buffilled=0; /* but only if it's defined */ ++ #endif ++ if(buflast!=EOF) /* if any */ ++ goto splitit; ++--- a/src/formisc.c +++++ b/src/formisc.c ++@@ -115,7 +115,7 @@ ++ buf[buffilled++]=c; ++ } ++ ++-int getline P((void)) /* read a newline-terminated line */ +++int __getline P((void)) /* read a newline-terminated line */ ++ { if(buflast==EOF) /* at the end of our Latin already? */ ++ { loadchar('\n'); /* fake empty line */ ++ return EOF; /* spread the word */ ++--- a/src/formisc.h +++++ b/src/formisc.h ++@@ -17,4 +17,4 @@ ++ char* ++ skipwords P((char*start)); ++ int ++- getline P((void)); +++ __getline P((void)); +diff --git a/feeds/packages/mail/ssmtp/.svn/entries b/feeds/packages/mail/ssmtp/.svn/entries +new file mode 100644 +index 0000000..763d2d4 +--- /dev/null ++++ b/feeds/packages/mail/ssmtp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/ssmtp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-24T19:08:26.941517Z ++29898 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++90d516658a7385ccbdb36a90224feaf6 ++2012-01-24T19:08:26.941517Z ++29898 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1559 ++ +diff --git a/feeds/packages/mail/ssmtp/.svn/prop-base/Makefile.svn-base b/feeds/packages/mail/ssmtp/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/mail/ssmtp/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/mail/ssmtp/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/ssmtp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0240ae0 +--- /dev/null ++++ b/feeds/packages/mail/ssmtp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2007-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:=ssmtp ++PKG_VERSION:=2.64 ++PKG_RELEASE:=4 ++ ++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 ++ 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/feeds/packages/mail/ssmtp/Makefile b/feeds/packages/mail/ssmtp/Makefile +new file mode 100644 +index 0000000..0240ae0 +--- /dev/null ++++ b/feeds/packages/mail/ssmtp/Makefile +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2007-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:=ssmtp ++PKG_VERSION:=2.64 ++PKG_RELEASE:=4 ++ ++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 ++ 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/feeds/packages/mail/xmail/.svn/entries b/feeds/packages/mail/xmail/.svn/entries +new file mode 100644 +index 0000000..21144e8 +--- /dev/null ++++ b/feeds/packages/mail/xmail/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/xmail ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-08T15:38:40.178577Z ++33058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++4b8ac6d1510f954f3768c09eb3e5403f ++2012-08-08T15:38:40.178577Z ++33058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1618 ++ +diff --git a/feeds/packages/mail/xmail/.svn/text-base/Makefile.svn-base b/feeds/packages/mail/xmail/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e756c05 +--- /dev/null ++++ b/feeds/packages/mail/xmail/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2007-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:=xmail ++PKG_VERSION:=1.26 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.xmailserver.org/ ++PKG_MD5SUM:=26d35c2fc104d79ebb6397c7dece5b15 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xmail ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libopenssl +libpthread $(CXX_DEPENDS) ++ TITLE:=advanced, fast and reliable ESMTP/POP3 mail server ++ URL:=http://www.xmailserver.org/ ++endef ++ ++define Package/xmail/description ++ XMail is an Internet mail server featuring an SMTP, POP3 and finger server. ++ It's incredibly easy to set up and has lots of features including : ++ multiple domains, virtual users and spam protection. ++endef ++ ++define Build/Compile ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lnx \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ LD="$(TARGET_CXX)" \ ++ all ++ tar -cjf $(PKG_BUILD_DIR)/MailRoot.tar.bz2 -C $(PKG_BUILD_DIR)/MailRoot --exclude bin . ++endef ++ ++define Package/xmail/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/MailRoot.tar.bz2 $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/xmail.config $(1)/etc/config/xmail ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/xmail.init $(1)/etc/init.d/xmail ++endef ++ ++define Package/xmail/conffiles ++/etc/config/xmail ++endef ++ ++$(eval $(call BuildPackage,xmail)) +diff --git a/feeds/packages/mail/xmail/Makefile b/feeds/packages/mail/xmail/Makefile +new file mode 100644 +index 0000000..e756c05 +--- /dev/null ++++ b/feeds/packages/mail/xmail/Makefile +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2007-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:=xmail ++PKG_VERSION:=1.26 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.xmailserver.org/ ++PKG_MD5SUM:=26d35c2fc104d79ebb6397c7dece5b15 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xmail ++ SECTION:=mail ++ CATEGORY:=Mail ++ DEPENDS:=+libopenssl +libpthread $(CXX_DEPENDS) ++ TITLE:=advanced, fast and reliable ESMTP/POP3 mail server ++ URL:=http://www.xmailserver.org/ ++endef ++ ++define Package/xmail/description ++ XMail is an Internet mail server featuring an SMTP, POP3 and finger server. ++ It's incredibly easy to set up and has lots of features including : ++ multiple domains, virtual users and spam protection. ++endef ++ ++define Build/Compile ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lnx \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ LD="$(TARGET_CXX)" \ ++ all ++ tar -cjf $(PKG_BUILD_DIR)/MailRoot.tar.bz2 -C $(PKG_BUILD_DIR)/MailRoot --exclude bin . ++endef ++ ++define Package/xmail/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/MailRoot.tar.bz2 $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/xmail.config $(1)/etc/config/xmail ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/xmail.init $(1)/etc/init.d/xmail ++endef ++ ++define Package/xmail/conffiles ++/etc/config/xmail ++endef ++ ++$(eval $(call BuildPackage,xmail)) +diff --git a/feeds/packages/mail/xmail/files/.svn/entries b/feeds/packages/mail/xmail/files/.svn/entries +new file mode 100644 +index 0000000..42bf011 +--- /dev/null ++++ b/feeds/packages/mail/xmail/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/xmail/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-08T15:38:40.178577Z ++33058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++xmail.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++e802d55b3faee855613383206e025387 ++2012-08-08T15:38:40.178577Z ++33058 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4512 ++ ++xmail.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++7d414b9052c20f3082877b5c20d5bcda ++2008-07-28T20:21:01.327006Z ++11977 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3225 ++ +diff --git a/feeds/packages/mail/xmail/files/.svn/text-base/xmail.config.svn-base b/feeds/packages/mail/xmail/files/.svn/text-base/xmail.config.svn-base +new file mode 100644 +index 0000000..b4d49a0 +--- /dev/null ++++ b/feeds/packages/mail/xmail/files/.svn/text-base/xmail.config.svn-base +@@ -0,0 +1,111 @@ ++# Configuration parameters for xmail ++# ++# To see what xmail command line parameters each parameter corresponds to, ++# please see /etc/init.d/xmail ++# ++# The xmail configuration files are contained in /etc/MailRoot.tar.gz, and need ++# to be installed in the MAIL_ROOT directory, set by default to ++# /var/MailRoot below by: ++# MAIL_ROOT=`grep "option.*mail_root.*'$" /etc/config/xmail | sed -e "s/'$//" -e "s/.*'//"` ++# mkdir -p $MAIL_ROOT; cd $MAIL_ROOT; tar -xjf /etc/MailRoot.tar.bz2 ++# NOTE: On OpenWRT /var is a temporary filesystem, so change mail_root below, ++# but it is probably not a good idea to install on a device's internal ++# flash due to the amount of writing of the flash that will ensue. ++# ++# To see what settings are appropriate, please refer to: ++# http://www.xmailserver.org/Readme.html ++# which also documents the configuration files in mail_root ++# ( please note that the values commented out are not real values ) ++# ++ ++config xmail ++ option mail_root '/var/MailRoot' ++# option debug 1 ++# option log_rotate '3600' ++# option split_level 'param-split_level' ++# option rx_buffer 'param-rx_buffer' ++# option tx_buffer 'param-tx_buffer' ++# option maildir_delivery 1 ++# option mailbox_delivery 1 ++# option dns_cache_dirs 'param-dns_cache_dirs' ++# option ipv4_only 1 ++# option ipv6_only 1 ++# option ipv4_then_ipv6 1 ++# option ipv6_then_ipv4 1 ++ ++config pop3 ++# option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++# option log 1 ++# option delay_timeout 'param-delay_timeout' ++# option bad_login_hang 1 ++# option local_address 'param-local_address' ++ option num_threads 4 ++ ++config pop3s ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option local_address 'param-local_address' ++ ++config smtp ++# option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++# option log 1 ++# option local_address 'param-local_address' ++ option num_threads 4 ++# option max_recipients 'param-max_recipients' ++# option expire_timeout 'param-expire_timeout' ++ ++config smtps ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option local_address 'param-local_address' ++ ++config smail ++ option num_threads 8 ++# option next_try_timeout 'param-next_try_timeout' ++# option ratio 'param-ratio' ++# option retries 'param-retries' ++# option log 1 ++# option filters_timeout 'param-filters_timeout' ++# option filter_log 1 ++ ++config psync ++ option disable 1 ++# option interval 'param-interval' ++# option num_threads 'param-num_threads' ++# option timeout 'param-timeout' ++# option log 1 ++ ++config finger ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option log 1 ++# option local_address 'param-local_address' ++ ++config ctrl ++# option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++# option log 1 ++# option local_address 'param-local_address' ++# option num_threads 'param-num_threads' ++ ++config ctrls ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++ ++config lmail ++ option num_threads 4 ++# option sleep_timeout 'param-sleep_timeout' ++# option log 1 +diff --git a/feeds/packages/mail/xmail/files/.svn/text-base/xmail.init.svn-base b/feeds/packages/mail/xmail/files/.svn/text-base/xmail.init.svn-base +new file mode 100644 +index 0000000..2b4990b +--- /dev/null ++++ b/feeds/packages/mail/xmail/files/.svn/text-base/xmail.init.svn-base +@@ -0,0 +1,221 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=90 ++STOP=10 ++ ++MAIL_ROOT= ++DAEMON=/usr/bin/XMail ++NAME=XMail ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -le 0 ] && return 0 ++ append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++xmail() { ++ local cfg="$1" ++ ++ append_parm "$cfg" mail_root "-Ms" ++ append_bool "$cfg" debug "-Md" ++ append_parm "$cfg" log_rotate "-Mr" ++ append_parm "$cfg" split_level "-Mx" ++ append_parm "$cfg" rx_buffer "-MR" ++ append_parm "$cfg" tx_buffer "-MS" ++ append_bool "$cfg" maildir_delivery "-MM" ++ append_bool "$cfg" mailbox_delivery "-Mm" ++ append_parm "$cfg" dns_cache_dirs "-MD" ++ append_bool "$cfg" ipv4_only "-M4" ++ append_bool "$cfg" ipv6_only "-M6" ++ append_bool "$cfg" ipv4_then_ipv6 "-M5" ++ append_bool "$cfg" ipv6_then_ipv4 "-M7" ++ ++ config_get mail_root $cfg mail_root ++ [ -n "$mail_root" ] || return 0 ++ MAIL_ROOT=$mail_root ++} ++ ++pop3() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-P-" ++ append_bool "$cfg" ipv6 "-P6" ++ append_parm "$cfg" server_port "-Pp" ++ append_parm "$cfg" session_timeout "-Pt" ++ append_bool "$cfg" log "-Pl" ++ append_parm "$cfg" delay_timeout "-Pw" ++ append_bool "$cfg" bad_login_hang "-Ph" ++ append_parm "$cfg" local_address "-PI" ++ append_parm "$cfg" num_threads "-PX" ++} ++ ++pop3s() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-B-" ++ append_bool "$cfg" ipv6 "-B6" ++ append_parm "$cfg" server_port "-Bp" ++ append_parm "$cfg" local_address "-BI" ++} ++ ++smtp() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-S-" ++ append_bool "$cfg" ipv6 "-S6" ++ append_parm "$cfg" server_port "-Sp" ++ append_parm "$cfg" session_timeout "-St" ++ append_bool "$cfg" log "-Sl" ++ append_parm "$cfg" local_address "-SI" ++ append_parm "$cfg" num_threads "-SX" ++ append_parm "$cfg" max_recipients "-Sr" ++ append_parm "$cfg" expire_timeout "-Se" ++} ++ ++smtps() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-X-" ++ append_bool "$cfg" ipv6 "-X6" ++ append_parm "$cfg" server_port "-Xp" ++ append_parm "$cfg" local_address "-XI" ++} ++ ++smail() { ++ local cfg="$1" ++ ++ append_parm "$cfg" num_threads "-Qn" ++ append_parm "$cfg" next_try_timeout "-Qt" ++ append_parm "$cfg" ratio "-Qi" ++ append_parm "$cfg" retries "-Qr" ++ append_bool "$cfg" log "-Ql" ++ append_parm "$cfg" filters_timeout "-QT" ++ append_bool "$cfg" filter_log "-Qg" ++} ++ ++psync() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-Y-" ++ append_parm "$cfg" interval "-Yi" ++ append_parm "$cfg" num_threads "-Yt" ++ append_parm "$cfg" timeout "-Yi" ++ append_bool "$cfg" log "-Yl" ++} ++ ++finger() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-F-" ++ append_bool "$cfg" ipv6 "-F6" ++ append_parm "$cfg" server_port "-Fp" ++ append_bool "$cfg" log "-Fl" ++ append_parm "$cfg" local_address "-FI" ++} ++ ++ctrl() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-C-" ++ append_bool "$cfg" ipv6 "-C6" ++ append_parm "$cfg" server_port "-Cp" ++ append_parm "$cfg" session_timeout "-Ct" ++ append_bool "$cfg" log "-Cl" ++ append_parm "$cfg" local_address "-CI" ++ append_parm "$cfg" num_threads "-CX" ++} ++ ++ctrls() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-W-" ++ append_bool "$cfg" ipv6 "-W6" ++ append_parm "$cfg" server_port "-Wp" ++ append_parm "$cfg" session_timeout "-Wt" ++} ++ ++lmail() { ++ local cfg="$1" ++ ++ append_parm "$cfg" num_threads "-Ln" ++ append_parm "$cfg" sleep_timeout "-Lt" ++ append_bool "$cfg" log "-Ll" ++} ++ ++start() { ++ test -f $DAEMON || exit 0 ++ ++ set -e ++ ulimit -c 10000 ++ ulimit -s 128 ++ ++ config_load xmail ++ ++ args="" ++ ++ config_foreach xmail xmail ++ config_foreach pop3 pop3 ++ config_foreach pop3s pop3s ++ config_foreach smtp smtp ++ config_foreach smtps smtps ++ config_foreach smail smail ++ config_foreach psync psync ++ config_foreach finger finger ++ config_foreach ctrl ctrl ++ config_foreach ctrls ctrls ++ config_foreach lmail lmail ++ ++ [ -z "$MAIL_ROOT" ] && exit 0 ++ [ -d $MAIL_ROOT ] || exit 0 ++ ++ export MAIL_ROOT ++ ++ rm -f /var/run/$NAME.pid ++ ++ $DAEMON $args ++ ++ MAX_WAIT=20 ++ while [ ! -f /var/run/$NAME.pid -a $MAX_WAIT -gt 0 ] ++ do ++ sleep 1 ++ MAX_WAIT=`expr $MAX_WAIT - 1` ++ done ++} ++ ++stop() { ++ if [ -f /var/run/$NAME.pid ] ++ then ++ config_load xmail ++ config_foreach xmail xmail ++ [ -z "$MAIL_ROOT" ] || echo `date` > $MAIL_ROOT/.shutdown ++ kill -INT `cat /var/run/$NAME.pid` ++ ++ MAX_WAIT=20 ++ while [ -f $MAIL_ROOT/.shutdown -a $MAX_WAIT -gt 0 ] ++ do ++ sleep 1 ++ MAX_WAIT=`expr $MAX_WAIT - 1` ++ done ++ fi ++} ++ ++restart() { ++ stop ++ sleep 1 ++ start ++} +diff --git a/feeds/packages/mail/xmail/files/xmail.config b/feeds/packages/mail/xmail/files/xmail.config +new file mode 100644 +index 0000000..b4d49a0 +--- /dev/null ++++ b/feeds/packages/mail/xmail/files/xmail.config +@@ -0,0 +1,111 @@ ++# Configuration parameters for xmail ++# ++# To see what xmail command line parameters each parameter corresponds to, ++# please see /etc/init.d/xmail ++# ++# The xmail configuration files are contained in /etc/MailRoot.tar.gz, and need ++# to be installed in the MAIL_ROOT directory, set by default to ++# /var/MailRoot below by: ++# MAIL_ROOT=`grep "option.*mail_root.*'$" /etc/config/xmail | sed -e "s/'$//" -e "s/.*'//"` ++# mkdir -p $MAIL_ROOT; cd $MAIL_ROOT; tar -xjf /etc/MailRoot.tar.bz2 ++# NOTE: On OpenWRT /var is a temporary filesystem, so change mail_root below, ++# but it is probably not a good idea to install on a device's internal ++# flash due to the amount of writing of the flash that will ensue. ++# ++# To see what settings are appropriate, please refer to: ++# http://www.xmailserver.org/Readme.html ++# which also documents the configuration files in mail_root ++# ( please note that the values commented out are not real values ) ++# ++ ++config xmail ++ option mail_root '/var/MailRoot' ++# option debug 1 ++# option log_rotate '3600' ++# option split_level 'param-split_level' ++# option rx_buffer 'param-rx_buffer' ++# option tx_buffer 'param-tx_buffer' ++# option maildir_delivery 1 ++# option mailbox_delivery 1 ++# option dns_cache_dirs 'param-dns_cache_dirs' ++# option ipv4_only 1 ++# option ipv6_only 1 ++# option ipv4_then_ipv6 1 ++# option ipv6_then_ipv4 1 ++ ++config pop3 ++# option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++# option log 1 ++# option delay_timeout 'param-delay_timeout' ++# option bad_login_hang 1 ++# option local_address 'param-local_address' ++ option num_threads 4 ++ ++config pop3s ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option local_address 'param-local_address' ++ ++config smtp ++# option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++# option log 1 ++# option local_address 'param-local_address' ++ option num_threads 4 ++# option max_recipients 'param-max_recipients' ++# option expire_timeout 'param-expire_timeout' ++ ++config smtps ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option local_address 'param-local_address' ++ ++config smail ++ option num_threads 8 ++# option next_try_timeout 'param-next_try_timeout' ++# option ratio 'param-ratio' ++# option retries 'param-retries' ++# option log 1 ++# option filters_timeout 'param-filters_timeout' ++# option filter_log 1 ++ ++config psync ++ option disable 1 ++# option interval 'param-interval' ++# option num_threads 'param-num_threads' ++# option timeout 'param-timeout' ++# option log 1 ++ ++config finger ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option log 1 ++# option local_address 'param-local_address' ++ ++config ctrl ++# option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++# option log 1 ++# option local_address 'param-local_address' ++# option num_threads 'param-num_threads' ++ ++config ctrls ++ option disable 1 ++# option ipv6 1 ++# option server_port 'param-server_port' ++# option session_timeout 'param-session_timeout' ++ ++config lmail ++ option num_threads 4 ++# option sleep_timeout 'param-sleep_timeout' ++# option log 1 +diff --git a/feeds/packages/mail/xmail/files/xmail.init b/feeds/packages/mail/xmail/files/xmail.init +new file mode 100644 +index 0000000..2b4990b +--- /dev/null ++++ b/feeds/packages/mail/xmail/files/xmail.init +@@ -0,0 +1,221 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=90 ++STOP=10 ++ ++MAIL_ROOT= ++DAEMON=/usr/bin/XMail ++NAME=XMail ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -le 0 ] && return 0 ++ append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++xmail() { ++ local cfg="$1" ++ ++ append_parm "$cfg" mail_root "-Ms" ++ append_bool "$cfg" debug "-Md" ++ append_parm "$cfg" log_rotate "-Mr" ++ append_parm "$cfg" split_level "-Mx" ++ append_parm "$cfg" rx_buffer "-MR" ++ append_parm "$cfg" tx_buffer "-MS" ++ append_bool "$cfg" maildir_delivery "-MM" ++ append_bool "$cfg" mailbox_delivery "-Mm" ++ append_parm "$cfg" dns_cache_dirs "-MD" ++ append_bool "$cfg" ipv4_only "-M4" ++ append_bool "$cfg" ipv6_only "-M6" ++ append_bool "$cfg" ipv4_then_ipv6 "-M5" ++ append_bool "$cfg" ipv6_then_ipv4 "-M7" ++ ++ config_get mail_root $cfg mail_root ++ [ -n "$mail_root" ] || return 0 ++ MAIL_ROOT=$mail_root ++} ++ ++pop3() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-P-" ++ append_bool "$cfg" ipv6 "-P6" ++ append_parm "$cfg" server_port "-Pp" ++ append_parm "$cfg" session_timeout "-Pt" ++ append_bool "$cfg" log "-Pl" ++ append_parm "$cfg" delay_timeout "-Pw" ++ append_bool "$cfg" bad_login_hang "-Ph" ++ append_parm "$cfg" local_address "-PI" ++ append_parm "$cfg" num_threads "-PX" ++} ++ ++pop3s() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-B-" ++ append_bool "$cfg" ipv6 "-B6" ++ append_parm "$cfg" server_port "-Bp" ++ append_parm "$cfg" local_address "-BI" ++} ++ ++smtp() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-S-" ++ append_bool "$cfg" ipv6 "-S6" ++ append_parm "$cfg" server_port "-Sp" ++ append_parm "$cfg" session_timeout "-St" ++ append_bool "$cfg" log "-Sl" ++ append_parm "$cfg" local_address "-SI" ++ append_parm "$cfg" num_threads "-SX" ++ append_parm "$cfg" max_recipients "-Sr" ++ append_parm "$cfg" expire_timeout "-Se" ++} ++ ++smtps() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-X-" ++ append_bool "$cfg" ipv6 "-X6" ++ append_parm "$cfg" server_port "-Xp" ++ append_parm "$cfg" local_address "-XI" ++} ++ ++smail() { ++ local cfg="$1" ++ ++ append_parm "$cfg" num_threads "-Qn" ++ append_parm "$cfg" next_try_timeout "-Qt" ++ append_parm "$cfg" ratio "-Qi" ++ append_parm "$cfg" retries "-Qr" ++ append_bool "$cfg" log "-Ql" ++ append_parm "$cfg" filters_timeout "-QT" ++ append_bool "$cfg" filter_log "-Qg" ++} ++ ++psync() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-Y-" ++ append_parm "$cfg" interval "-Yi" ++ append_parm "$cfg" num_threads "-Yt" ++ append_parm "$cfg" timeout "-Yi" ++ append_bool "$cfg" log "-Yl" ++} ++ ++finger() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-F-" ++ append_bool "$cfg" ipv6 "-F6" ++ append_parm "$cfg" server_port "-Fp" ++ append_bool "$cfg" log "-Fl" ++ append_parm "$cfg" local_address "-FI" ++} ++ ++ctrl() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-C-" ++ append_bool "$cfg" ipv6 "-C6" ++ append_parm "$cfg" server_port "-Cp" ++ append_parm "$cfg" session_timeout "-Ct" ++ append_bool "$cfg" log "-Cl" ++ append_parm "$cfg" local_address "-CI" ++ append_parm "$cfg" num_threads "-CX" ++} ++ ++ctrls() { ++ local cfg="$1" ++ ++ append_bool "$cfg" disable "-W-" ++ append_bool "$cfg" ipv6 "-W6" ++ append_parm "$cfg" server_port "-Wp" ++ append_parm "$cfg" session_timeout "-Wt" ++} ++ ++lmail() { ++ local cfg="$1" ++ ++ append_parm "$cfg" num_threads "-Ln" ++ append_parm "$cfg" sleep_timeout "-Lt" ++ append_bool "$cfg" log "-Ll" ++} ++ ++start() { ++ test -f $DAEMON || exit 0 ++ ++ set -e ++ ulimit -c 10000 ++ ulimit -s 128 ++ ++ config_load xmail ++ ++ args="" ++ ++ config_foreach xmail xmail ++ config_foreach pop3 pop3 ++ config_foreach pop3s pop3s ++ config_foreach smtp smtp ++ config_foreach smtps smtps ++ config_foreach smail smail ++ config_foreach psync psync ++ config_foreach finger finger ++ config_foreach ctrl ctrl ++ config_foreach ctrls ctrls ++ config_foreach lmail lmail ++ ++ [ -z "$MAIL_ROOT" ] && exit 0 ++ [ -d $MAIL_ROOT ] || exit 0 ++ ++ export MAIL_ROOT ++ ++ rm -f /var/run/$NAME.pid ++ ++ $DAEMON $args ++ ++ MAX_WAIT=20 ++ while [ ! -f /var/run/$NAME.pid -a $MAX_WAIT -gt 0 ] ++ do ++ sleep 1 ++ MAX_WAIT=`expr $MAX_WAIT - 1` ++ done ++} ++ ++stop() { ++ if [ -f /var/run/$NAME.pid ] ++ then ++ config_load xmail ++ config_foreach xmail xmail ++ [ -z "$MAIL_ROOT" ] || echo `date` > $MAIL_ROOT/.shutdown ++ kill -INT `cat /var/run/$NAME.pid` ++ ++ MAX_WAIT=20 ++ while [ -f $MAIL_ROOT/.shutdown -a $MAX_WAIT -gt 0 ] ++ do ++ sleep 1 ++ MAX_WAIT=`expr $MAX_WAIT - 1` ++ done ++ fi ++} ++ ++restart() { ++ stop ++ sleep 1 ++ start ++} +diff --git a/feeds/packages/mail/xmail/patches/.svn/entries b/feeds/packages/mail/xmail/patches/.svn/entries +new file mode 100644 +index 0000000..d4f9444 +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/mail/xmail/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-28T20:21:01.327006Z ++11977 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-Makefile.common.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++45b8d67930bdd2c1bdc6fdd8125d4196 ++2008-07-06T14:56:42.959277Z ++11718 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++533 ++ ++030-sysmachine.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++eace8fc53c917cd7df3a37610bba2075 ++2008-07-28T20:21:01.327006Z ++11977 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++634 ++ ++040-honour_opt_flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++f55084ce31c236dfdf30f13d5b531fbf ++2008-07-06T14:56:42.959277Z ++11718 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++269 ++ ++020-Makefile.lnx.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++c2a7dc9441b6734acf3b822a08695c65 ++2008-07-06T14:56:42.959277Z ++11718 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++282 ++ +diff --git a/feeds/packages/mail/xmail/patches/.svn/text-base/010-Makefile.common.patch.svn-base b/feeds/packages/mail/xmail/patches/.svn/text-base/010-Makefile.common.patch.svn-base +new file mode 100644 +index 0000000..af6aa70 +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/.svn/text-base/010-Makefile.common.patch.svn-base +@@ -0,0 +1,21 @@ ++--- a/Makefile.common +++++ b/Makefile.common ++@@ -76,15 +76,15 @@ ++ SENDMAILOBJS = SendMail.o ++ ++ %.o : %.cpp ++- ${CC} ${CPPFLAGS} ${CFLAGS} -c $*.cpp +++ ${CXX} ${CPPFLAGS} ${CFLAGS} -c $*.cpp ++ ++ all: ${OUTDIR} ${MKMACHDEPINC} ${MAILSVR} ${CRTLCLNT} ${XMCRYPT} ${MKUSERS} ${SENDMAIL} ++ ++ ${OUTDIR}: ++ @mkdir ${OUTDIR} ++ ++-${MKMACHDEPINC}: ${MKMACHDEP} ++- ./${MKMACHDEP} > ${MKMACHDEPINC} +++#${MKMACHDEPINC}: ${MKMACHDEP} +++# ./${MKMACHDEP} > ${MKMACHDEPINC} ++ ++ ${MKMACHDEP}: ${MKMACHDEPOBJS} ++ ${LD} -o ${MKMACHDEP} ${MKMACHDEPOBJS} ${LDFLAGS} +diff --git a/feeds/packages/mail/xmail/patches/.svn/text-base/020-Makefile.lnx.patch.svn-base b/feeds/packages/mail/xmail/patches/.svn/text-base/020-Makefile.lnx.patch.svn-base +new file mode 100644 +index 0000000..3f8866b +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/.svn/text-base/020-Makefile.lnx.patch.svn-base +@@ -0,0 +1,15 @@ ++--- a/Makefile.lnx +++++ b/Makefile.lnx ++@@ -19,9 +19,9 @@ ++ # Davide Libenzi ++ # ++ SYSTYPE = linux ++-CC = g++ ++-LD = g++ ++-STRIP = strip +++CC = $(CXX) +++LD = $(CXX) +++#STRIP = strip ++ ++ ifneq ("$(WITH_SSL_INCLUDE)", "") ++ CFLAGS := $(CFLAGS) -I$(WITH_SSL_INCLUDE) +diff --git a/feeds/packages/mail/xmail/patches/.svn/text-base/030-sysmachine.patch.svn-base b/feeds/packages/mail/xmail/patches/.svn/text-base/030-sysmachine.patch.svn-base +new file mode 100644 +index 0000000..b3704fb +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/.svn/text-base/030-sysmachine.patch.svn-base +@@ -0,0 +1,28 @@ ++diff -urN xmail-1.25.orig/SysMachine.h xmail-1.25/SysMachine.h ++--- xmail-1.25.orig/SysMachine.h 1970-01-01 01:00:00.000000000 +0100 +++++ xmail-1.25/SysMachine.h 2008-07-28 10:16:47.000000000 +0200 ++@@ -0,0 +1,24 @@ +++#ifndef _MACHDEFS_H +++#define _MACHDEFS_H +++ +++ +++#undef MACH_BIG_ENDIAN_WORDS +++ +++#undef MACH_BIG_ENDIAN_BITFIELD +++ +++typedef signed char MachInt8; +++typedef unsigned char MachUInt8; +++#define MACH_TYPE_8BIT char +++ +++typedef signed short MachInt16; +++typedef unsigned short MachUInt16; +++#define MACH_TYPE_16BIT short +++ +++typedef signed int MachInt32; +++typedef unsigned int MachUInt32; +++#define MACH_TYPE_32BIT int +++ +++ +++ +++#endif +++ +diff --git a/feeds/packages/mail/xmail/patches/.svn/text-base/040-honour_opt_flags.patch.svn-base b/feeds/packages/mail/xmail/patches/.svn/text-base/040-honour_opt_flags.patch.svn-base +new file mode 100644 +index 0000000..5170432 +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/.svn/text-base/040-honour_opt_flags.patch.svn-base +@@ -0,0 +1,15 @@ ++--- a/Makefile.common +++++ b/Makefile.common ++@@ -24,10 +24,10 @@ ++ endif ++ ++ ifeq ($(XMAIL_DEBUG), 1) ++- CFLAGS := $(CFLAGS) -O0 -g +++ CFLAGS := -O0 -g $(CFLAGS) ++ STRIP = touch ++ else ++- CFLAGS := $(CFLAGS) -O2 +++ CFLAGS := -O2 $(CFLAGS) ++ endif ++ ++ OUTDIR = bin +diff --git a/feeds/packages/mail/xmail/patches/010-Makefile.common.patch b/feeds/packages/mail/xmail/patches/010-Makefile.common.patch +new file mode 100644 +index 0000000..af6aa70 +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/010-Makefile.common.patch +@@ -0,0 +1,21 @@ ++--- a/Makefile.common +++++ b/Makefile.common ++@@ -76,15 +76,15 @@ ++ SENDMAILOBJS = SendMail.o ++ ++ %.o : %.cpp ++- ${CC} ${CPPFLAGS} ${CFLAGS} -c $*.cpp +++ ${CXX} ${CPPFLAGS} ${CFLAGS} -c $*.cpp ++ ++ all: ${OUTDIR} ${MKMACHDEPINC} ${MAILSVR} ${CRTLCLNT} ${XMCRYPT} ${MKUSERS} ${SENDMAIL} ++ ++ ${OUTDIR}: ++ @mkdir ${OUTDIR} ++ ++-${MKMACHDEPINC}: ${MKMACHDEP} ++- ./${MKMACHDEP} > ${MKMACHDEPINC} +++#${MKMACHDEPINC}: ${MKMACHDEP} +++# ./${MKMACHDEP} > ${MKMACHDEPINC} ++ ++ ${MKMACHDEP}: ${MKMACHDEPOBJS} ++ ${LD} -o ${MKMACHDEP} ${MKMACHDEPOBJS} ${LDFLAGS} +diff --git a/feeds/packages/mail/xmail/patches/020-Makefile.lnx.patch b/feeds/packages/mail/xmail/patches/020-Makefile.lnx.patch +new file mode 100644 +index 0000000..3f8866b +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/020-Makefile.lnx.patch +@@ -0,0 +1,15 @@ ++--- a/Makefile.lnx +++++ b/Makefile.lnx ++@@ -19,9 +19,9 @@ ++ # Davide Libenzi ++ # ++ SYSTYPE = linux ++-CC = g++ ++-LD = g++ ++-STRIP = strip +++CC = $(CXX) +++LD = $(CXX) +++#STRIP = strip ++ ++ ifneq ("$(WITH_SSL_INCLUDE)", "") ++ CFLAGS := $(CFLAGS) -I$(WITH_SSL_INCLUDE) +diff --git a/feeds/packages/mail/xmail/patches/030-sysmachine.patch b/feeds/packages/mail/xmail/patches/030-sysmachine.patch +new file mode 100644 +index 0000000..b3704fb +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/030-sysmachine.patch +@@ -0,0 +1,28 @@ ++diff -urN xmail-1.25.orig/SysMachine.h xmail-1.25/SysMachine.h ++--- xmail-1.25.orig/SysMachine.h 1970-01-01 01:00:00.000000000 +0100 +++++ xmail-1.25/SysMachine.h 2008-07-28 10:16:47.000000000 +0200 ++@@ -0,0 +1,24 @@ +++#ifndef _MACHDEFS_H +++#define _MACHDEFS_H +++ +++ +++#undef MACH_BIG_ENDIAN_WORDS +++ +++#undef MACH_BIG_ENDIAN_BITFIELD +++ +++typedef signed char MachInt8; +++typedef unsigned char MachUInt8; +++#define MACH_TYPE_8BIT char +++ +++typedef signed short MachInt16; +++typedef unsigned short MachUInt16; +++#define MACH_TYPE_16BIT short +++ +++typedef signed int MachInt32; +++typedef unsigned int MachUInt32; +++#define MACH_TYPE_32BIT int +++ +++ +++ +++#endif +++ +diff --git a/feeds/packages/mail/xmail/patches/040-honour_opt_flags.patch b/feeds/packages/mail/xmail/patches/040-honour_opt_flags.patch +new file mode 100644 +index 0000000..5170432 +--- /dev/null ++++ b/feeds/packages/mail/xmail/patches/040-honour_opt_flags.patch +@@ -0,0 +1,15 @@ ++--- a/Makefile.common +++++ b/Makefile.common ++@@ -24,10 +24,10 @@ ++ endif ++ ++ ifeq ($(XMAIL_DEBUG), 1) ++- CFLAGS := $(CFLAGS) -O0 -g +++ CFLAGS := -O0 -g $(CFLAGS) ++ STRIP = touch ++ else ++- CFLAGS := $(CFLAGS) -O2 +++ CFLAGS := -O2 $(CFLAGS) ++ endif ++ ++ OUTDIR = bin +diff --git a/feeds/packages/multimedia/.svn/entries b/feeds/packages/multimedia/.svn/entries +new file mode 100644 +index 0000000..fc70cec +--- /dev/null ++++ b/feeds/packages/multimedia/.svn/entries +@@ -0,0 +1,109 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-28T11:40:21.034050Z ++35832 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hasciicam ++dir ++ ++gphoto2 ++dir ++ ++rygel ++dir ++ ++gst-plugins-base ++dir ++ ++ushare ++dir ++ ++fswebcam ++dir ++ ++gstreamer ++dir ++ ++gst-plugins-ugly ++dir ++ ++minidlna ++dir ++ ++imagemagick ++dir ++ ++gst-ffmpeg ++dir ++ ++gst-plugins-bad ++dir ++ ++ftpd-topfield ++dir ++ ++tvheadend ++dir ++ ++darkice ++dir ++ ++gst-plugins-good ++dir ++ ++ffmpeg ++dir ++ ++motion ++dir ++ ++kissdx ++dir ++ ++peercast ++dir ++ ++shairport ++dir ++ ++icecast ++dir ++ ++crtmpserver ++dir ++ ++graphicsmagick ++dir ++ ++puppy ++dir ++ ++mjpg-streamer ++dir ++ ++gmediaserver ++dir ++ +diff --git a/feeds/packages/multimedia/crtmpserver/.svn/entries b/feeds/packages/multimedia/crtmpserver/.svn/entries +new file mode 100644 +index 0000000..7a4d941 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/crtmpserver ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++02fd0d5b086f6f45a6a7fea3f2242313 ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3037 ++ +diff --git a/feeds/packages/multimedia/crtmpserver/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/crtmpserver/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f3e27e +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,85 @@ ++# ++# 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:=726 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/trunk ++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 ++ ++# 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 ++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_DATA) $(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 ++endef ++ ++$(eval $(call BuildPackage,crtmpserver)) ++ +diff --git a/feeds/packages/multimedia/crtmpserver/Makefile b/feeds/packages/multimedia/crtmpserver/Makefile +new file mode 100644 +index 0000000..0f3e27e +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/Makefile +@@ -0,0 +1,85 @@ ++# ++# 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:=726 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/trunk ++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 ++ ++# 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 ++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_DATA) $(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 ++endef ++ ++$(eval $(call BuildPackage,crtmpserver)) ++ +diff --git a/feeds/packages/multimedia/crtmpserver/patches/.svn/entries b/feeds/packages/multimedia/crtmpserver/patches/.svn/entries +new file mode 100644 +index 0000000..705762f +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/crtmpserver/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-07T18:14:44.894242Z ++32125 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++020-add-rpath.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++bccb1a4ef6eda8bdfc087697bbd30043 ++2012-01-19T01:08:19.791244Z ++29785 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++771 ++ ++030-default-config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++95bf1fa20618e7354f6dcf36835dc9df ++2012-01-19T01:08:19.791244Z ++29785 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1717 ++ ++050-add-missing-make-defines.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++60b1965a7c71613442ba2e59a68effa1 ++2012-01-19T01:08:19.791244Z ++29785 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++587 ++ ++040-use-select.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++7e683e8b60c1ae596c670dbe58fce52b ++2012-01-19T01:08:19.791244Z ++29785 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++388 ++ ++060-add-dl-for-crypto.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++5b260728b599c9cedc16b26aa5740944 ++2012-06-07T18:14:44.894242Z ++32125 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++507 ++ ++010-link-crypt-for-lua.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++814fe1fd7c5cfae60c628b3a79509320 ++2012-01-19T01:08:19.791244Z ++29785 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++661 ++ +diff --git a/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/010-link-crypt-for-lua.patch.svn-base b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/010-link-crypt-for-lua.patch.svn-base +new file mode 100644 +index 0000000..4840ec4 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/010-link-crypt-for-lua.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: crtmpserver-r692/builders/make/compile.mk ++=================================================================== ++--- crtmpserver-r692.orig/builders/make/compile.mk +++++ crtmpserver-r692/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/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/020-add-rpath.patch.svn-base b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/020-add-rpath.patch.svn-base +new file mode 100644 +index 0000000..83ebe56 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/020-add-rpath.patch.svn-base +@@ -0,0 +1,15 @@ ++Index: crtmpserver-r692/builders/make/linux.mk ++=================================================================== ++--- crtmpserver-r692.orig/builders/make/linux.mk +++++ crtmpserver-r692/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/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/030-default-config.patch.svn-base b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/030-default-config.patch.svn-base +new file mode 100644 +index 0000000..a5031c9 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/030-default-config.patch.svn-base +@@ -0,0 +1,53 @@ ++Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua ++=================================================================== ++--- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua +++++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua ++@@ -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: ++ -- //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/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/040-use-select.patch.svn-base b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/040-use-select.patch.svn-base +new file mode 100644 +index 0000000..466f86c +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/040-use-select.patch.svn-base +@@ -0,0 +1,13 @@ ++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/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/050-add-missing-make-defines.patch.svn-base b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/050-add-missing-make-defines.patch.svn-base +new file mode 100644 +index 0000000..43447b0 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/050-add-missing-make-defines.patch.svn-base +@@ -0,0 +1,22 @@ ++Index: crtmpserver-r726/builders/make/compile.mk ++=================================================================== ++--- crtmpserver-r726.orig/builders/make/compile.mk +++++ crtmpserver-r726/builders/make/compile.mk ++@@ -43,10 +43,16 @@ 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_MEDIA_NSV \ +++ -DHAS_SYSLOG +++ ++ ++ ++ DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES) +diff --git a/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/060-add-dl-for-crypto.patch.svn-base b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/060-add-dl-for-crypto.patch.svn-base +new file mode 100644 +index 0000000..cbd5daf +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/.svn/text-base/060-add-dl-for-crypto.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: crtmpserver-r726/builders/make/compile.mk ++=================================================================== ++--- crtmpserver-r726.orig/builders/make/compile.mk 2012-06-07 19:53:18.028378001 +0200 +++++ crtmpserver-r726/builders/make/compile.mk 2012-06-07 20:02:08.260400669 +0200 ++@@ -59,7 +59,7 @@ ++ ++ #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 +diff --git a/feeds/packages/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch b/feeds/packages/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch +new file mode 100644 +index 0000000..4840ec4 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch +@@ -0,0 +1,13 @@ ++Index: crtmpserver-r692/builders/make/compile.mk ++=================================================================== ++--- crtmpserver-r692.orig/builders/make/compile.mk +++++ crtmpserver-r692/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/feeds/packages/multimedia/crtmpserver/patches/020-add-rpath.patch b/feeds/packages/multimedia/crtmpserver/patches/020-add-rpath.patch +new file mode 100644 +index 0000000..83ebe56 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/020-add-rpath.patch +@@ -0,0 +1,15 @@ ++Index: crtmpserver-r692/builders/make/linux.mk ++=================================================================== ++--- crtmpserver-r692.orig/builders/make/linux.mk +++++ crtmpserver-r692/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/feeds/packages/multimedia/crtmpserver/patches/030-default-config.patch b/feeds/packages/multimedia/crtmpserver/patches/030-default-config.patch +new file mode 100644 +index 0000000..a5031c9 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/030-default-config.patch +@@ -0,0 +1,53 @@ ++Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua ++=================================================================== ++--- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua +++++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua ++@@ -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: ++ -- //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/feeds/packages/multimedia/crtmpserver/patches/040-use-select.patch b/feeds/packages/multimedia/crtmpserver/patches/040-use-select.patch +new file mode 100644 +index 0000000..466f86c +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/040-use-select.patch +@@ -0,0 +1,13 @@ ++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/feeds/packages/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch b/feeds/packages/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch +new file mode 100644 +index 0000000..43447b0 +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch +@@ -0,0 +1,22 @@ ++Index: crtmpserver-r726/builders/make/compile.mk ++=================================================================== ++--- crtmpserver-r726.orig/builders/make/compile.mk +++++ crtmpserver-r726/builders/make/compile.mk ++@@ -43,10 +43,16 @@ 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_MEDIA_NSV \ +++ -DHAS_SYSLOG +++ ++ ++ ++ DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES) +diff --git a/feeds/packages/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch b/feeds/packages/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch +new file mode 100644 +index 0000000..cbd5daf +--- /dev/null ++++ b/feeds/packages/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch +@@ -0,0 +1,13 @@ ++Index: crtmpserver-r726/builders/make/compile.mk ++=================================================================== ++--- crtmpserver-r726.orig/builders/make/compile.mk 2012-06-07 19:53:18.028378001 +0200 +++++ crtmpserver-r726/builders/make/compile.mk 2012-06-07 20:02:08.260400669 +0200 ++@@ -59,7 +59,7 @@ ++ ++ #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 +diff --git a/feeds/packages/multimedia/darkice/.svn/entries b/feeds/packages/multimedia/darkice/.svn/entries +new file mode 100644 +index 0000000..a81e5cb +--- /dev/null ++++ b/feeds/packages/multimedia/darkice/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/darkice ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:13.995704Z ++32309 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++5fa34bc2182540c50fffc7d1485a9cf5 ++2012-06-13T00:22:13.995704Z ++32309 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1404 ++ +diff --git a/feeds/packages/multimedia/darkice/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/darkice/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..453b847 +--- /dev/null ++++ b/feeds/packages/multimedia/darkice/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=darkice ++PKG_VERSION:=1.0 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://darkice.googlecode.com/files/ ++PKG_MD5SUM:= 1804e63d42a9703d01fe378c9a77c473 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/darkice ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ SUBMENU:=Streaming ++ TITLE:=DarkIce is a live audio streamer ++ DEPENDS:=+lame-lib +librt +libpthread +libstdcpp ++ MAINTAINER:=Artur Wronowski ++endef ++ ++define Package/darkice/description ++DarkIce is a live audio streamer. It records audio from an audio interface (e.g. sound card), encodes it and sends it to a streaming server. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-lame \ ++ --without-aacplus \ ++ --without-alsa \ ++ --without-faac \ ++ --without-jack \ ++ --without-samplerate \ ++ --without-twolame \ ++ --without-vorbis \ ++ --with-lame-prefix="$(STAGING_DIR)/usr" \ ++ ++define Package/darkice/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/darkice $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/darkice.cfg $(1)/etc/ ++endef ++ ++define Package/darkice/conffiles ++/etc/darkice.cfg ++endef ++ ++$(eval $(call BuildPackage,darkice)) +diff --git a/feeds/packages/multimedia/darkice/Makefile b/feeds/packages/multimedia/darkice/Makefile +new file mode 100644 +index 0000000..453b847 +--- /dev/null ++++ b/feeds/packages/multimedia/darkice/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=darkice ++PKG_VERSION:=1.0 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://darkice.googlecode.com/files/ ++PKG_MD5SUM:= 1804e63d42a9703d01fe378c9a77c473 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/darkice ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ SUBMENU:=Streaming ++ TITLE:=DarkIce is a live audio streamer ++ DEPENDS:=+lame-lib +librt +libpthread +libstdcpp ++ MAINTAINER:=Artur Wronowski ++endef ++ ++define Package/darkice/description ++DarkIce is a live audio streamer. It records audio from an audio interface (e.g. sound card), encodes it and sends it to a streaming server. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-lame \ ++ --without-aacplus \ ++ --without-alsa \ ++ --without-faac \ ++ --without-jack \ ++ --without-samplerate \ ++ --without-twolame \ ++ --without-vorbis \ ++ --with-lame-prefix="$(STAGING_DIR)/usr" \ ++ ++define Package/darkice/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/darkice $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/darkice.cfg $(1)/etc/ ++endef ++ ++define Package/darkice/conffiles ++/etc/darkice.cfg ++endef ++ ++$(eval $(call BuildPackage,darkice)) +diff --git a/feeds/packages/multimedia/darkice/patches/.svn/entries b/feeds/packages/multimedia/darkice/patches/.svn/entries +new file mode 100644 +index 0000000..42124d8 +--- /dev/null ++++ b/feeds/packages/multimedia/darkice/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/darkice/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-21T18:59:02.971711Z ++28506 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-upstream_svn_r494.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++4ee79d90c65de59b4fb81e2c4e4e670e ++2011-10-21T18:59:02.971711Z ++28506 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++229 ++ +diff --git a/feeds/packages/multimedia/darkice/patches/.svn/text-base/001-upstream_svn_r494.patch.svn-base b/feeds/packages/multimedia/darkice/patches/.svn/text-base/001-upstream_svn_r494.patch.svn-base +new file mode 100644 +index 0000000..3f6b3f1 +--- /dev/null ++++ b/feeds/packages/multimedia/darkice/patches/.svn/text-base/001-upstream_svn_r494.patch.svn-base +@@ -0,0 +1,15 @@ ++--- a/src/SerialUlaw.cpp +++++ b/src/SerialUlaw.cpp ++@@ -40,6 +40,12 @@ ++ #include "config.h" ++ #endif ++ +++#ifdef HAVE_STDIO_H +++#include +++#else +++#error need stdio.h +++#endif +++ ++ #ifdef HAVE_UNISTD_H ++ #include ++ #else +diff --git a/feeds/packages/multimedia/darkice/patches/001-upstream_svn_r494.patch b/feeds/packages/multimedia/darkice/patches/001-upstream_svn_r494.patch +new file mode 100644 +index 0000000..3f6b3f1 +--- /dev/null ++++ b/feeds/packages/multimedia/darkice/patches/001-upstream_svn_r494.patch +@@ -0,0 +1,15 @@ ++--- a/src/SerialUlaw.cpp +++++ b/src/SerialUlaw.cpp ++@@ -40,6 +40,12 @@ ++ #include "config.h" ++ #endif ++ +++#ifdef HAVE_STDIO_H +++#include +++#else +++#error need stdio.h +++#endif +++ ++ #ifdef HAVE_UNISTD_H ++ #include ++ #else +diff --git a/feeds/packages/multimedia/ffmpeg/.svn/entries b/feeds/packages/multimedia/ffmpeg/.svn/entries +new file mode 100644 +index 0000000..25ea712 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ffmpeg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-28T11:40:21.034050Z ++35832 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++20f895b42eb0fcbb760f0fc64442d771 ++2011-10-17T10:41:49.911424Z ++28467 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7024 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++08acdb00d1efcd1867171159da4ff1d6 ++2013-02-28T11:40:21.034050Z ++35832 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9776 ++ +diff --git a/feeds/packages/multimedia/ffmpeg/.svn/prop-base/Config.in.svn-base b/feeds/packages/multimedia/ffmpeg/.svn/prop-base/Config.in.svn-base +new file mode 100644 +index 0000000..323a7d8 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/.svn/prop-base/Config.in.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/multimedia/ffmpeg/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/ffmpeg/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..323a7d8 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/multimedia/ffmpeg/.svn/text-base/Config.in.svn-base b/feeds/packages/multimedia/ffmpeg/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..fcd2124 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,314 @@ ++menu "Configuration" ++ depends PACKAGE_libffmpeg-custom ++ ++config FFMPEG_CUSTOM_PATENTED ++ bool "Include patented codecs and technologies" ++ default BUILD_PATENTED ++ ++comment "Profiles ---" ++ ++config FFMPEG_CUSTOM_FFSERVER_SUPPORT ++ bool "Include support for ffserver (FFmpeg streaming server)" ++ select FFMPEG_CUSTOM_MUXER_ffm ++ select FFMPEG_CUSTOM_DEMUXER_ffm ++ select FFMPEG_CUSTOM_DEMUXER_rtsp ++ select FFMPEG_CUSTOM_PROTOCOL_rtp ++ ++config FFMPEG_CUSTOM_LIBDLNA_SUPPORT ++ bool "Include support for libdlna/ushare" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_DECODER_ac3 ++ select FFMPEG_CUSTOM_DECODER_atrac3 ++ select FFMPEG_CUSTOM_DECODER_h264 ++ select FFMPEG_CUSTOM_DECODER_jpegls ++ select FFMPEG_CUSTOM_DECODER_mp3 ++ select FFMPEG_CUSTOM_DECODER_mpeg1video ++ select FFMPEG_CUSTOM_DECODER_mpeg2video ++ select FFMPEG_CUSTOM_DECODER_mpeg4 ++ select FFMPEG_CUSTOM_DECODER_mpegvideo ++ select FFMPEG_CUSTOM_DECODER_wmav1 ++ select FFMPEG_CUSTOM_DECODER_wmav2 ++ select FFMPEG_CUSTOM_DECODER_png ++ select FFMPEG_CUSTOM_DEMUXER_ac3 ++ select FFMPEG_CUSTOM_DEMUXER_h264 ++ select FFMPEG_CUSTOM_DEMUXER_mp3 ++ select FFMPEG_CUSTOM_DEMUXER_mpegvideo ++ ++config FFMPEG_CUSTOM_MINIDLNA_SUPPORT ++ bool "Include support for minidlna" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_DECODER_aac ++ select FFMPEG_CUSTOM_DECODER_ac3 ++ select FFMPEG_CUSTOM_DECODER_flac ++ select FFMPEG_CUSTOM_DECODER_h264 ++ select FFMPEG_CUSTOM_DECODER_jpegls ++ select FFMPEG_CUSTOM_DECODER_mp3 ++ select FFMPEG_CUSTOM_DECODER_mpeg1video ++ select FFMPEG_CUSTOM_DECODER_mpeg2video ++ select FFMPEG_CUSTOM_DECODER_mpeg4 ++ select FFMPEG_CUSTOM_DECODER_mpegvideo ++ select FFMPEG_CUSTOM_DECODER_wmav1 ++ select FFMPEG_CUSTOM_DECODER_wmav2 ++ select FFMPEG_CUSTOM_DECODER_png ++ select FFMPEG_CUSTOM_DEMUXER_aac ++ select FFMPEG_CUSTOM_DEMUXER_ac3 ++ select FFMPEG_CUSTOM_DEMUXER_avi ++ select FFMPEG_CUSTOM_DEMUXER_flac ++ select FFMPEG_CUSTOM_DEMUXER_h264 ++ select FFMPEG_CUSTOM_DEMUXER_matroska ++ select FFMPEG_CUSTOM_DEMUXER_mov ++ select FFMPEG_CUSTOM_DEMUXER_mp3 ++ select FFMPEG_CUSTOM_DEMUXER_mpegvideo ++ select FFMPEG_CUSTOM_PROTOCOL_file ++ ++comment "Encoders ---" ++ ++config FFMPEG_CUSTOM_ENCODER_ac3 ++ bool "AC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_PARSER_ac3 ++ ++config FFMPEG_CUSTOM_ENCODER_jpegls ++ bool "JPEG-LS" ++ ++config FFMPEG_CUSTOM_ENCODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config FFMPEG_CUSTOM_ENCODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_ENCODER_mpeg4 ++ bool "MPEG-4" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_ENCODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config FFMPEG_CUSTOM_ENCODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config FFMPEG_CUSTOM_ENCODER_png ++ bool "PNG" ++ select FFMPEG_CUSTOM_ENCODER_zlib ++ ++config FFMPEG_CUSTOM_ENCODER_vorbis ++ bool "Vorbis" ++ ++config FFMPEG_CUSTOM_ENCODER_zlib ++ bool "Zlib" ++ ++comment "Decoders ---" ++ ++config FFMPEG_CUSTOM_DECODER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_PARSER_aac ++ ++config FFMPEG_CUSTOM_DECODER_ac3 ++ bool "AC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_PARSER_ac3 ++ ++config FFMPEG_CUSTOM_DECODER_atrac3 ++ bool "ATRAC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_flac ++ bool "FLAC" ++ ++config FFMPEG_CUSTOM_DECODER_gif ++ bool "GIF" ++ ++config FFMPEG_CUSTOM_DECODER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_jpegls ++ bool "JPEG-LS" ++ ++config FFMPEG_CUSTOM_DECODER_mp2 ++ bool "MP2 (MPEG Audio Layer 2)" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_mp3 ++ bool "MP3 (MPEG Audio Layer 2)" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_mpegvideo ++ bool "MPEG Video" ++ ++config FFMPEG_CUSTOM_DECODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config FFMPEG_CUSTOM_DECODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_mpeg4 ++ bool "MPEG-4" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config FFMPEG_CUSTOM_DECODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config FFMPEG_CUSTOM_DECODER_png ++ bool "PNG" ++ select FFMPEG_CUSTOM_DECODER_zlib ++ ++config FFMPEG_CUSTOM_DECODER_vorbis ++ bool "Vorbis" ++ ++config FFMPEG_CUSTOM_DECODER_wmav1 ++ bool "WMAv1" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_wmav2 ++ bool "WMAv2" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_zlib ++ bool "Zlib" ++ ++comment "Muxers ---" ++ ++config FFMPEG_CUSTOM_MUXER_ac3 ++ bool "AC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_MUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config FFMPEG_CUSTOM_MUXER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_MUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ ++config FFMPEG_CUSTOM_MUXER_mp4 ++ bool "MP4" ++ ++config FFMPEG_CUSTOM_MUXER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config FFMPEG_CUSTOM_MUXER_mpeg2video ++ bool "MPEG-2 Video" ++ ++config FFMPEG_CUSTOM_MUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config FFMPEG_CUSTOM_MUXER_ogg ++ bool "Ogg" ++ ++config FFMPEG_CUSTOM_MUXER_rtp ++ bool "RTP" ++ ++comment "Demuxers ---" ++ ++config FFMPEG_CUSTOM_DEMUXER_aac ++ bool "AAC" ++ ++config FFMPEG_CUSTOM_DEMUXER_avi ++ bool "AVI (Audio Video Interleave)" ++ ++config FFMPEG_CUSTOM_DEMUXER_ac3 ++ bool "AC3" ++ ++config FFMPEG_CUSTOM_DEMUXER_flac ++ bool "FLAC" ++ ++config FFMPEG_CUSTOM_DEMUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config FFMPEG_CUSTOM_DEMUXER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DEMUXER_matroska ++ bool "Matroska (MKA,MKV)" ++ select FFMPEG_CUSTOM_DECODER_zlib ++ ++config FFMPEG_CUSTOM_DEMUXER_mov ++ bool "MOV/MP4/M4A/3GP/3G2/MJ2" ++ select FFMPEG_CUSTOM_DECODER_zlib ++ ++config FFMPEG_CUSTOM_DEMUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ select FFMPEG_CUSTOM_PARSER_mpegaudio ++ ++config FFMPEG_CUSTOM_DEMUXER_mpegvideo ++ bool "MPEG Video" ++ ++config FFMPEG_CUSTOM_DEMUXER_mpegps ++ bool "MPEG-2 (PS)" ++ ++config FFMPEG_CUSTOM_DEMUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config FFMPEG_CUSTOM_DEMUXER_ogg ++ bool "Ogg" ++ ++config FFMPEG_CUSTOM_DEMUXER_rm ++ bool "RM" ++ help ++ RealMedia format demuxer ++ ++config FFMPEG_CUSTOM_DEMUXER_rtsp ++ bool "RTSP" ++ select FFMPEG_CUSTOM_DEMUXER_rm ++ select FFMPEG_CUSTOM_DEMUXER_sdp ++ ++config FFMPEG_CUSTOM_DEMUXER_sdp ++ bool "SDP" ++ select FFMPEG_CUSTOM_DEMUXER_mpegts ++ ++comment "Parsers ---" ++ ++config FFMPEG_CUSTOM_PARSER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_PARSER_ac3 ++ bool "AC3" ++ ++config FFMPEG_CUSTOM_PARSER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_DECODER_h264 ++ ++config FFMPEG_CUSTOM_PARSER_mpegaudio ++ bool "MPEG Audio" ++ ++config FFMPEG_CUSTOM_PARSER_mpegvideo ++ bool "MPEG Video" ++ ++config FFMPEG_CUSTOM_PARSER_mpeg4video ++ bool "MPEG-4 Video" ++ ++comment "Protocols ---" ++ ++config FFMPEG_CUSTOM_PROTOCOL_file ++ bool "file:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_http ++ bool "http:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_pipe ++ bool "pipe:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_rtp ++ bool "rtp:" ++ select FFMPEG_CUSTOM_PROTOCOL_udp ++ ++config FFMPEG_CUSTOM_PROTOCOL_tcp ++ bool "tcp:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_udp ++ bool "udp:" ++ ++endmenu ++ +diff --git a/feeds/packages/multimedia/ffmpeg/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/ffmpeg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bd4b422 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,436 @@ ++# ++# 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:=ffmpeg ++PKG_VERSION:=0.11.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://ffmpeg.org/releases/ ++PKG_MD5SUM:=93c1908022567b321df74db7214da6ac ++ ++PKG_LICENSE:=LGPLv2.1+ GPLv2+ LGPLv3 ++PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3 ++ ++FFMPEG_CUSTOM_ENCODERS:= \ ++ ac3 \ ++ jpegls \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ zlib \ ++ ++FFMPEG_CUSTOM_DECODERS:= \ ++ aac \ ++ ac3 \ ++ atrac3 \ ++ flac \ ++ gif \ ++ h264 \ ++ jpegls \ ++ mp2 \ ++ mp3 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ mpegvideo \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ wmav1 \ ++ wmav2 \ ++ zlib \ ++ ++FFMPEG_CUSTOM_MUXERS:= \ ++ ac3 \ ++ ffm \ ++ h264 \ ++ mp3 \ ++ mp4 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpegts \ ++ ogg \ ++ rtp \ ++ ++FFMPEG_CUSTOM_DEMUXERS:= \ ++ aac \ ++ ac3 \ ++ avi \ ++ flac \ ++ ffm \ ++ h264 \ ++ matroska \ ++ mov \ ++ mp3 \ ++ mpegps \ ++ mpegts \ ++ mpegvideo \ ++ ogg \ ++ rm \ ++ rtsp \ ++ sdp \ ++ v4l2 \ ++ ++FFMPEG_CUSTOM_PARSERS:= \ ++ aac \ ++ ac3 \ ++ h264 \ ++ mpegaudio \ ++ mpeg4video \ ++ mpegvideo \ ++ ++FFMPEG_CUSTOM_PROTOCOLS:= \ ++ file http pipe rtp tcp udp ++ ++FFMPEG_MINI_ENCODERS:= \ ++ ++FFMPEG_MINI_DECODERS:= \ ++ aac \ ++ ac3 \ ++ atrac3 \ ++ flac \ ++ h263 \ ++ h264 \ ++ jpegls \ ++ mp3 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ mpegvideo \ ++ png \ ++ wmav1 \ ++ wmav2 \ ++ ++FFMPEG_MINI_MUXERS:= \ ++ ffm \ ++ ++FFMPEG_MINI_DEMUXERS := \ ++ aac \ ++ ac3 \ ++ asf \ ++ avi \ ++ ffm \ ++ flac \ ++ h264 \ ++ matroska \ ++ mov \ ++ mp3 \ ++ mpegts \ ++ mpegvideo \ ++ rtsp \ ++ ++FFMPEG_MINI_PARSERS:= \ ++ ac3 \ ++ flac \ ++ h263 \ ++ h264 \ ++ mpeg4video \ ++ mpegaudio \ ++ ++FFMPEG_MINI_PROTOCOLS := \ ++ file http rtp tcp udp \ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_ENCODER_%,$(FFMPEG_CUSTOM_ENCODERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_DECODER_%,$(FFMPEG_CUSTOM_DECODERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_MUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_DEMUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_PARSER_%,$(FFMPEG_CUSTOM_PARSERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_PROTOCOL_%,$(FFMPEG_CUSTOM_PROTOCOLS)) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ffmpeg/Default ++ TITLE:=FFmpeg ++ URL:=http://ffmpeg.mplayerhq.hu/ ++endef ++ ++define Package/ffmpeg/Default/description ++ FFmpeg is a a software package that can record, convert and stream digital ++ audio and video in numerous formats. ++endef ++ ++ ++define Package/ffmpeg ++$(call Package/ffmpeg/Default) ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE+= program ++ DEPENDS+= +libpthread +libffmpeg-full ++ VARIANT:=full ++endef ++ ++define Package/ffmpeg/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains the FFmpeg command line tool. ++endef ++ ++ ++define Package/ffprobe ++$(call Package/ffmpeg/Default) ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE+= CLI media identifier ++ DEPENDS+= +libffmpeg-full ++ VARIANT:=full ++endef ++ ++define Package/ffprobe/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains the FFprobe command line tool. ++endef ++ ++ ++define Package/ffserver ++$(call Package/ffserver/Default) ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE+= streaming server ++ DEPENDS+= +libpthread +libffmpeg-full ++ VARIANT:=full ++endef ++ ++define Package/ffserver/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains the FFmpeg streaming server. ++endef ++ ++ ++define Package/libffmpeg/Default ++$(call Package/ffmpeg/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= libraries ++ DEPENDS+= +libpthread +zlib +libbz2 ++ PROVIDES:= libffmpeg ++endef ++ ++ ++define Package/libffmpeg-custom ++$(call Package/libffmpeg/Default) ++ TITLE+= (mini) ++ DEPENDS+= @DEVEL ++ VARIANT:=custom ++ MENU:=1 ++endef ++ ++define Package/libffmpeg-custom/config ++source "$(SOURCE)/Config.in" ++endef ++ ++define Package/libffmpeg-custom/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains customized FFmpeg shared libraries. ++endef ++ ++ ++define Package/libffmpeg-full ++$(call Package/libffmpeg/Default) ++ TITLE+= (full) ++ DEPENDS+= @BUILD_PATENTED +alsa-lib ++ VARIANT:=full ++endef ++ ++define Package/libffmpeg-full/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains full-featured FFmpeg shared libraries. ++endef ++ ++ ++define Package/libffmpeg-mini ++$(call Package/libffmpeg/Default) ++ TITLE+= (mini) ++ DEPENDS+= @BUILD_PATENTED ++ VARIANT:=mini ++endef ++ ++define Package/libffmpeg-mini/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains minimal-featured FFmpeg shared libraries. ++endef ++ ++ ++FFMPEG_CONFIGURE:= \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ ./configure \ ++ --enable-cross-compile \ ++ --cross-prefix="$(TARGET_CROSS)" \ ++ --arch="$(ARCH)" \ ++ --target-os=linux \ ++ --prefix="/usr" \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-debug \ ++ --pkg-config="pkg-config" \ ++ \ ++ --enable-gpl \ ++ --enable-version3 \ ++ \ ++ --disable-asm \ ++ --disable-doc \ ++ --disable-dxva2 \ ++ --enable-pthreads \ ++ --disable-optimizations \ ++ --enable-small \ ++ --disable-stripping \ ++ --enable-zlib \ ++ --disable-outdevs ++ ++ifeq ($(BUILD_VARIANT),custom) ++ ++ FFMPEG_ENABLE= \ ++ $(foreach c, $(2), \ ++ $(if $($(3)_$(c)),--enable-$(1)="$(c)") \ ++ ) ++ ++ FFMPEG_CONFIGURE+= \ ++ --disable-ffmpeg \ ++ --disable-ffplay \ ++ --disable-ffprobe \ ++ --disable-ffserver \ ++ --disable-avfilter \ ++ --disable-postproc \ ++ --disable-swresample \ ++ --disable-swscale \ ++ --disable-everything \ ++ $(call FFMPEG_ENABLE,encoder,$(FFMPEG_CUSTOM_ENCODERS),CONFIG_FFMPEG_CUSTOM_ENCODER) \ ++ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_CUSTOM_DECODERS),CONFIG_FFMPEG_CUSTOM_DECODER) \ ++ $(call FFMPEG_ENABLE,muxer,$(FFMPEG_CUSTOM_MUXERS),CONFIG_FFMPEG_CUSTOM_MUXER) \ ++ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_CUSTOM_DEMUXERS),CONFIG_FFMPEG_CUSTOM_DEMUXER) \ ++ $(call FFMPEG_ENABLE,parser,$(FFMPEG_CUSTOM_PARSERS),CONFIG_FFMPEG_CUSTOM_PARSER) \ ++ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_CUSTOM_PROTOCOLS),CONFIG_FFMPEG_CUSTOM_PROTOCOL) \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),mini) ++ ++ FFMPEG_ENABLE= \ ++ $(foreach c, $(2), \ ++ --enable-$(1)="$(c)" \ ++ ) ++ ++ FFMPEG_CONFIGURE+= \ ++ --disable-ffmpeg \ ++ --disable-ffplay \ ++ --disable-ffprobe \ ++ --disable-ffserver \ ++ --disable-avfilter \ ++ --disable-postproc \ ++ --disable-swresample \ ++ --disable-swscale \ ++ --disable-everything \ ++ $(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \ ++ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \ ++ $(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \ ++ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \ ++ $(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \ ++ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \ ++ ++endif ++ ++ifneq ($(CONFIG_TARGET_x86),) ++ TARGET_CFLAGS += -fomit-frame-pointer ++endif ++ ++define Build/Configure ++ ( cd $(PKG_BUILD_DIR); $(FFMPEG_CONFIGURE) ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev/custom ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avformat,avutil} $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avformat,avutil}.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Build/InstallDev/full ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale} $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++Build/InstallDev/mini = $(Build/InstallDev/custom) ++ ++# XXX: attempt at installing "best" dev files available ++ifeq ($(BUILD_VARIANT),custom) ++ # XXX: only install "custom" dev files if -full & -mini are not selected ++ ifeq ($(CONFIG_PACKAGE_libffmpeg-full)$(CONFIG_PACKAGE_libffmpeg-mini),) ++ Build/InstallDev = $(Build/InstallDev/custom) ++ endif ++endif ++ifeq ($(BUILD_VARIANT),full) ++ # XXX: always install "full" dev files if -full is selected ++ Build/InstallDev = $(Build/InstallDev/full) ++endif ++ifeq ($(BUILD_VARIANT),mini) ++ # XXX: only install "mini" dev files if -full is not selected ++ ifeq ($(CONFIG_PACKAGE_libffmpeg-full),) ++ Build/InstallDev = $(Build/InstallDev/mini) ++ endif ++endif ++ ++define Package/ffmpeg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffmpeg $(1)/usr/bin/ ++endef ++ ++define Package/ffprobe/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/ ++endef ++ ++define Package/ffserver/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffserver $(1)/usr/bin/ ++endef ++ ++define Package/libffmpeg-custom/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libffmpeg-full/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.so.* $(1)/usr/lib/ ++endef ++ ++Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install) ++ ++$(eval $(call BuildPackage,ffmpeg)) ++$(eval $(call BuildPackage,ffprobe)) ++$(eval $(call BuildPackage,ffserver)) ++$(eval $(call BuildPackage,libffmpeg-custom)) ++$(eval $(call BuildPackage,libffmpeg-full)) ++$(eval $(call BuildPackage,libffmpeg-mini)) +diff --git a/feeds/packages/multimedia/ffmpeg/Config.in b/feeds/packages/multimedia/ffmpeg/Config.in +new file mode 100644 +index 0000000..fcd2124 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/Config.in +@@ -0,0 +1,314 @@ ++menu "Configuration" ++ depends PACKAGE_libffmpeg-custom ++ ++config FFMPEG_CUSTOM_PATENTED ++ bool "Include patented codecs and technologies" ++ default BUILD_PATENTED ++ ++comment "Profiles ---" ++ ++config FFMPEG_CUSTOM_FFSERVER_SUPPORT ++ bool "Include support for ffserver (FFmpeg streaming server)" ++ select FFMPEG_CUSTOM_MUXER_ffm ++ select FFMPEG_CUSTOM_DEMUXER_ffm ++ select FFMPEG_CUSTOM_DEMUXER_rtsp ++ select FFMPEG_CUSTOM_PROTOCOL_rtp ++ ++config FFMPEG_CUSTOM_LIBDLNA_SUPPORT ++ bool "Include support for libdlna/ushare" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_DECODER_ac3 ++ select FFMPEG_CUSTOM_DECODER_atrac3 ++ select FFMPEG_CUSTOM_DECODER_h264 ++ select FFMPEG_CUSTOM_DECODER_jpegls ++ select FFMPEG_CUSTOM_DECODER_mp3 ++ select FFMPEG_CUSTOM_DECODER_mpeg1video ++ select FFMPEG_CUSTOM_DECODER_mpeg2video ++ select FFMPEG_CUSTOM_DECODER_mpeg4 ++ select FFMPEG_CUSTOM_DECODER_mpegvideo ++ select FFMPEG_CUSTOM_DECODER_wmav1 ++ select FFMPEG_CUSTOM_DECODER_wmav2 ++ select FFMPEG_CUSTOM_DECODER_png ++ select FFMPEG_CUSTOM_DEMUXER_ac3 ++ select FFMPEG_CUSTOM_DEMUXER_h264 ++ select FFMPEG_CUSTOM_DEMUXER_mp3 ++ select FFMPEG_CUSTOM_DEMUXER_mpegvideo ++ ++config FFMPEG_CUSTOM_MINIDLNA_SUPPORT ++ bool "Include support for minidlna" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_DECODER_aac ++ select FFMPEG_CUSTOM_DECODER_ac3 ++ select FFMPEG_CUSTOM_DECODER_flac ++ select FFMPEG_CUSTOM_DECODER_h264 ++ select FFMPEG_CUSTOM_DECODER_jpegls ++ select FFMPEG_CUSTOM_DECODER_mp3 ++ select FFMPEG_CUSTOM_DECODER_mpeg1video ++ select FFMPEG_CUSTOM_DECODER_mpeg2video ++ select FFMPEG_CUSTOM_DECODER_mpeg4 ++ select FFMPEG_CUSTOM_DECODER_mpegvideo ++ select FFMPEG_CUSTOM_DECODER_wmav1 ++ select FFMPEG_CUSTOM_DECODER_wmav2 ++ select FFMPEG_CUSTOM_DECODER_png ++ select FFMPEG_CUSTOM_DEMUXER_aac ++ select FFMPEG_CUSTOM_DEMUXER_ac3 ++ select FFMPEG_CUSTOM_DEMUXER_avi ++ select FFMPEG_CUSTOM_DEMUXER_flac ++ select FFMPEG_CUSTOM_DEMUXER_h264 ++ select FFMPEG_CUSTOM_DEMUXER_matroska ++ select FFMPEG_CUSTOM_DEMUXER_mov ++ select FFMPEG_CUSTOM_DEMUXER_mp3 ++ select FFMPEG_CUSTOM_DEMUXER_mpegvideo ++ select FFMPEG_CUSTOM_PROTOCOL_file ++ ++comment "Encoders ---" ++ ++config FFMPEG_CUSTOM_ENCODER_ac3 ++ bool "AC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_PARSER_ac3 ++ ++config FFMPEG_CUSTOM_ENCODER_jpegls ++ bool "JPEG-LS" ++ ++config FFMPEG_CUSTOM_ENCODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config FFMPEG_CUSTOM_ENCODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_ENCODER_mpeg4 ++ bool "MPEG-4" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_ENCODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config FFMPEG_CUSTOM_ENCODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config FFMPEG_CUSTOM_ENCODER_png ++ bool "PNG" ++ select FFMPEG_CUSTOM_ENCODER_zlib ++ ++config FFMPEG_CUSTOM_ENCODER_vorbis ++ bool "Vorbis" ++ ++config FFMPEG_CUSTOM_ENCODER_zlib ++ bool "Zlib" ++ ++comment "Decoders ---" ++ ++config FFMPEG_CUSTOM_DECODER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_PARSER_aac ++ ++config FFMPEG_CUSTOM_DECODER_ac3 ++ bool "AC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_PARSER_ac3 ++ ++config FFMPEG_CUSTOM_DECODER_atrac3 ++ bool "ATRAC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_flac ++ bool "FLAC" ++ ++config FFMPEG_CUSTOM_DECODER_gif ++ bool "GIF" ++ ++config FFMPEG_CUSTOM_DECODER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_jpegls ++ bool "JPEG-LS" ++ ++config FFMPEG_CUSTOM_DECODER_mp2 ++ bool "MP2 (MPEG Audio Layer 2)" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_mp3 ++ bool "MP3 (MPEG Audio Layer 2)" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_mpegvideo ++ bool "MPEG Video" ++ ++config FFMPEG_CUSTOM_DECODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config FFMPEG_CUSTOM_DECODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_mpeg4 ++ bool "MPEG-4" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config FFMPEG_CUSTOM_DECODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config FFMPEG_CUSTOM_DECODER_png ++ bool "PNG" ++ select FFMPEG_CUSTOM_DECODER_zlib ++ ++config FFMPEG_CUSTOM_DECODER_vorbis ++ bool "Vorbis" ++ ++config FFMPEG_CUSTOM_DECODER_wmav1 ++ bool "WMAv1" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_wmav2 ++ bool "WMAv2" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DECODER_zlib ++ bool "Zlib" ++ ++comment "Muxers ---" ++ ++config FFMPEG_CUSTOM_MUXER_ac3 ++ bool "AC3" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_MUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config FFMPEG_CUSTOM_MUXER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_MUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ ++config FFMPEG_CUSTOM_MUXER_mp4 ++ bool "MP4" ++ ++config FFMPEG_CUSTOM_MUXER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config FFMPEG_CUSTOM_MUXER_mpeg2video ++ bool "MPEG-2 Video" ++ ++config FFMPEG_CUSTOM_MUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config FFMPEG_CUSTOM_MUXER_ogg ++ bool "Ogg" ++ ++config FFMPEG_CUSTOM_MUXER_rtp ++ bool "RTP" ++ ++comment "Demuxers ---" ++ ++config FFMPEG_CUSTOM_DEMUXER_aac ++ bool "AAC" ++ ++config FFMPEG_CUSTOM_DEMUXER_avi ++ bool "AVI (Audio Video Interleave)" ++ ++config FFMPEG_CUSTOM_DEMUXER_ac3 ++ bool "AC3" ++ ++config FFMPEG_CUSTOM_DEMUXER_flac ++ bool "FLAC" ++ ++config FFMPEG_CUSTOM_DEMUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config FFMPEG_CUSTOM_DEMUXER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_DEMUXER_matroska ++ bool "Matroska (MKA,MKV)" ++ select FFMPEG_CUSTOM_DECODER_zlib ++ ++config FFMPEG_CUSTOM_DEMUXER_mov ++ bool "MOV/MP4/M4A/3GP/3G2/MJ2" ++ select FFMPEG_CUSTOM_DECODER_zlib ++ ++config FFMPEG_CUSTOM_DEMUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ select FFMPEG_CUSTOM_PARSER_mpegaudio ++ ++config FFMPEG_CUSTOM_DEMUXER_mpegvideo ++ bool "MPEG Video" ++ ++config FFMPEG_CUSTOM_DEMUXER_mpegps ++ bool "MPEG-2 (PS)" ++ ++config FFMPEG_CUSTOM_DEMUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config FFMPEG_CUSTOM_DEMUXER_ogg ++ bool "Ogg" ++ ++config FFMPEG_CUSTOM_DEMUXER_rm ++ bool "RM" ++ help ++ RealMedia format demuxer ++ ++config FFMPEG_CUSTOM_DEMUXER_rtsp ++ bool "RTSP" ++ select FFMPEG_CUSTOM_DEMUXER_rm ++ select FFMPEG_CUSTOM_DEMUXER_sdp ++ ++config FFMPEG_CUSTOM_DEMUXER_sdp ++ bool "SDP" ++ select FFMPEG_CUSTOM_DEMUXER_mpegts ++ ++comment "Parsers ---" ++ ++config FFMPEG_CUSTOM_PARSER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends FFMPEG_CUSTOM_PATENTED ++ ++config FFMPEG_CUSTOM_PARSER_ac3 ++ bool "AC3" ++ ++config FFMPEG_CUSTOM_PARSER_h264 ++ bool "H.264" ++ depends FFMPEG_CUSTOM_PATENTED ++ select FFMPEG_CUSTOM_DECODER_h264 ++ ++config FFMPEG_CUSTOM_PARSER_mpegaudio ++ bool "MPEG Audio" ++ ++config FFMPEG_CUSTOM_PARSER_mpegvideo ++ bool "MPEG Video" ++ ++config FFMPEG_CUSTOM_PARSER_mpeg4video ++ bool "MPEG-4 Video" ++ ++comment "Protocols ---" ++ ++config FFMPEG_CUSTOM_PROTOCOL_file ++ bool "file:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_http ++ bool "http:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_pipe ++ bool "pipe:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_rtp ++ bool "rtp:" ++ select FFMPEG_CUSTOM_PROTOCOL_udp ++ ++config FFMPEG_CUSTOM_PROTOCOL_tcp ++ bool "tcp:" ++ ++config FFMPEG_CUSTOM_PROTOCOL_udp ++ bool "udp:" ++ ++endmenu ++ +diff --git a/feeds/packages/multimedia/ffmpeg/Makefile b/feeds/packages/multimedia/ffmpeg/Makefile +new file mode 100644 +index 0000000..bd4b422 +--- /dev/null ++++ b/feeds/packages/multimedia/ffmpeg/Makefile +@@ -0,0 +1,436 @@ ++# ++# 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:=ffmpeg ++PKG_VERSION:=0.11.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://ffmpeg.org/releases/ ++PKG_MD5SUM:=93c1908022567b321df74db7214da6ac ++ ++PKG_LICENSE:=LGPLv2.1+ GPLv2+ LGPLv3 ++PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3 ++ ++FFMPEG_CUSTOM_ENCODERS:= \ ++ ac3 \ ++ jpegls \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ zlib \ ++ ++FFMPEG_CUSTOM_DECODERS:= \ ++ aac \ ++ ac3 \ ++ atrac3 \ ++ flac \ ++ gif \ ++ h264 \ ++ jpegls \ ++ mp2 \ ++ mp3 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ mpegvideo \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ wmav1 \ ++ wmav2 \ ++ zlib \ ++ ++FFMPEG_CUSTOM_MUXERS:= \ ++ ac3 \ ++ ffm \ ++ h264 \ ++ mp3 \ ++ mp4 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpegts \ ++ ogg \ ++ rtp \ ++ ++FFMPEG_CUSTOM_DEMUXERS:= \ ++ aac \ ++ ac3 \ ++ avi \ ++ flac \ ++ ffm \ ++ h264 \ ++ matroska \ ++ mov \ ++ mp3 \ ++ mpegps \ ++ mpegts \ ++ mpegvideo \ ++ ogg \ ++ rm \ ++ rtsp \ ++ sdp \ ++ v4l2 \ ++ ++FFMPEG_CUSTOM_PARSERS:= \ ++ aac \ ++ ac3 \ ++ h264 \ ++ mpegaudio \ ++ mpeg4video \ ++ mpegvideo \ ++ ++FFMPEG_CUSTOM_PROTOCOLS:= \ ++ file http pipe rtp tcp udp ++ ++FFMPEG_MINI_ENCODERS:= \ ++ ++FFMPEG_MINI_DECODERS:= \ ++ aac \ ++ ac3 \ ++ atrac3 \ ++ flac \ ++ h263 \ ++ h264 \ ++ jpegls \ ++ mp3 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ mpegvideo \ ++ png \ ++ wmav1 \ ++ wmav2 \ ++ ++FFMPEG_MINI_MUXERS:= \ ++ ffm \ ++ ++FFMPEG_MINI_DEMUXERS := \ ++ aac \ ++ ac3 \ ++ asf \ ++ avi \ ++ ffm \ ++ flac \ ++ h264 \ ++ matroska \ ++ mov \ ++ mp3 \ ++ mpegts \ ++ mpegvideo \ ++ rtsp \ ++ ++FFMPEG_MINI_PARSERS:= \ ++ ac3 \ ++ flac \ ++ h263 \ ++ h264 \ ++ mpeg4video \ ++ mpegaudio \ ++ ++FFMPEG_MINI_PROTOCOLS := \ ++ file http rtp tcp udp \ ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_ENCODER_%,$(FFMPEG_CUSTOM_ENCODERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_DECODER_%,$(FFMPEG_CUSTOM_DECODERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_MUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_DEMUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_PARSER_%,$(FFMPEG_CUSTOM_PARSERS)) \ ++ $(patsubst %,CONFIG_FFMPEG_CUSTOM_PROTOCOL_%,$(FFMPEG_CUSTOM_PROTOCOLS)) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ffmpeg/Default ++ TITLE:=FFmpeg ++ URL:=http://ffmpeg.mplayerhq.hu/ ++endef ++ ++define Package/ffmpeg/Default/description ++ FFmpeg is a a software package that can record, convert and stream digital ++ audio and video in numerous formats. ++endef ++ ++ ++define Package/ffmpeg ++$(call Package/ffmpeg/Default) ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE+= program ++ DEPENDS+= +libpthread +libffmpeg-full ++ VARIANT:=full ++endef ++ ++define Package/ffmpeg/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains the FFmpeg command line tool. ++endef ++ ++ ++define Package/ffprobe ++$(call Package/ffmpeg/Default) ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE+= CLI media identifier ++ DEPENDS+= +libffmpeg-full ++ VARIANT:=full ++endef ++ ++define Package/ffprobe/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains the FFprobe command line tool. ++endef ++ ++ ++define Package/ffserver ++$(call Package/ffserver/Default) ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE+= streaming server ++ DEPENDS+= +libpthread +libffmpeg-full ++ VARIANT:=full ++endef ++ ++define Package/ffserver/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains the FFmpeg streaming server. ++endef ++ ++ ++define Package/libffmpeg/Default ++$(call Package/ffmpeg/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= libraries ++ DEPENDS+= +libpthread +zlib +libbz2 ++ PROVIDES:= libffmpeg ++endef ++ ++ ++define Package/libffmpeg-custom ++$(call Package/libffmpeg/Default) ++ TITLE+= (mini) ++ DEPENDS+= @DEVEL ++ VARIANT:=custom ++ MENU:=1 ++endef ++ ++define Package/libffmpeg-custom/config ++source "$(SOURCE)/Config.in" ++endef ++ ++define Package/libffmpeg-custom/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains customized FFmpeg shared libraries. ++endef ++ ++ ++define Package/libffmpeg-full ++$(call Package/libffmpeg/Default) ++ TITLE+= (full) ++ DEPENDS+= @BUILD_PATENTED +alsa-lib ++ VARIANT:=full ++endef ++ ++define Package/libffmpeg-full/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains full-featured FFmpeg shared libraries. ++endef ++ ++ ++define Package/libffmpeg-mini ++$(call Package/libffmpeg/Default) ++ TITLE+= (mini) ++ DEPENDS+= @BUILD_PATENTED ++ VARIANT:=mini ++endef ++ ++define Package/libffmpeg-mini/description ++$(call Package/ffmpeg/Default/description) ++ . ++ This package contains minimal-featured FFmpeg shared libraries. ++endef ++ ++ ++FFMPEG_CONFIGURE:= \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ ./configure \ ++ --enable-cross-compile \ ++ --cross-prefix="$(TARGET_CROSS)" \ ++ --arch="$(ARCH)" \ ++ --target-os=linux \ ++ --prefix="/usr" \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-debug \ ++ --pkg-config="pkg-config" \ ++ \ ++ --enable-gpl \ ++ --enable-version3 \ ++ \ ++ --disable-asm \ ++ --disable-doc \ ++ --disable-dxva2 \ ++ --enable-pthreads \ ++ --disable-optimizations \ ++ --enable-small \ ++ --disable-stripping \ ++ --enable-zlib \ ++ --disable-outdevs ++ ++ifeq ($(BUILD_VARIANT),custom) ++ ++ FFMPEG_ENABLE= \ ++ $(foreach c, $(2), \ ++ $(if $($(3)_$(c)),--enable-$(1)="$(c)") \ ++ ) ++ ++ FFMPEG_CONFIGURE+= \ ++ --disable-ffmpeg \ ++ --disable-ffplay \ ++ --disable-ffprobe \ ++ --disable-ffserver \ ++ --disable-avfilter \ ++ --disable-postproc \ ++ --disable-swresample \ ++ --disable-swscale \ ++ --disable-everything \ ++ $(call FFMPEG_ENABLE,encoder,$(FFMPEG_CUSTOM_ENCODERS),CONFIG_FFMPEG_CUSTOM_ENCODER) \ ++ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_CUSTOM_DECODERS),CONFIG_FFMPEG_CUSTOM_DECODER) \ ++ $(call FFMPEG_ENABLE,muxer,$(FFMPEG_CUSTOM_MUXERS),CONFIG_FFMPEG_CUSTOM_MUXER) \ ++ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_CUSTOM_DEMUXERS),CONFIG_FFMPEG_CUSTOM_DEMUXER) \ ++ $(call FFMPEG_ENABLE,parser,$(FFMPEG_CUSTOM_PARSERS),CONFIG_FFMPEG_CUSTOM_PARSER) \ ++ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_CUSTOM_PROTOCOLS),CONFIG_FFMPEG_CUSTOM_PROTOCOL) \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),mini) ++ ++ FFMPEG_ENABLE= \ ++ $(foreach c, $(2), \ ++ --enable-$(1)="$(c)" \ ++ ) ++ ++ FFMPEG_CONFIGURE+= \ ++ --disable-ffmpeg \ ++ --disable-ffplay \ ++ --disable-ffprobe \ ++ --disable-ffserver \ ++ --disable-avfilter \ ++ --disable-postproc \ ++ --disable-swresample \ ++ --disable-swscale \ ++ --disable-everything \ ++ $(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \ ++ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \ ++ $(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \ ++ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \ ++ $(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \ ++ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \ ++ ++endif ++ ++ifneq ($(CONFIG_TARGET_x86),) ++ TARGET_CFLAGS += -fomit-frame-pointer ++endif ++ ++define Build/Configure ++ ( cd $(PKG_BUILD_DIR); $(FFMPEG_CONFIGURE) ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Build/InstallDev/custom ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avformat,avutil} $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avformat,avutil}.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Build/InstallDev/full ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale} $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.{a,so*} $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.pc $(1)/usr/lib/pkgconfig/ ++endef ++ ++Build/InstallDev/mini = $(Build/InstallDev/custom) ++ ++# XXX: attempt at installing "best" dev files available ++ifeq ($(BUILD_VARIANT),custom) ++ # XXX: only install "custom" dev files if -full & -mini are not selected ++ ifeq ($(CONFIG_PACKAGE_libffmpeg-full)$(CONFIG_PACKAGE_libffmpeg-mini),) ++ Build/InstallDev = $(Build/InstallDev/custom) ++ endif ++endif ++ifeq ($(BUILD_VARIANT),full) ++ # XXX: always install "full" dev files if -full is selected ++ Build/InstallDev = $(Build/InstallDev/full) ++endif ++ifeq ($(BUILD_VARIANT),mini) ++ # XXX: only install "mini" dev files if -full is not selected ++ ifeq ($(CONFIG_PACKAGE_libffmpeg-full),) ++ Build/InstallDev = $(Build/InstallDev/mini) ++ endif ++endif ++ ++define Package/ffmpeg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffmpeg $(1)/usr/bin/ ++endef ++ ++define Package/ffprobe/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/ ++endef ++ ++define Package/ffserver/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffserver $(1)/usr/bin/ ++endef ++ ++define Package/libffmpeg-custom/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libffmpeg-full/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.so.* $(1)/usr/lib/ ++endef ++ ++Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install) ++ ++$(eval $(call BuildPackage,ffmpeg)) ++$(eval $(call BuildPackage,ffprobe)) ++$(eval $(call BuildPackage,ffserver)) ++$(eval $(call BuildPackage,libffmpeg-custom)) ++$(eval $(call BuildPackage,libffmpeg-full)) ++$(eval $(call BuildPackage,libffmpeg-mini)) +diff --git a/feeds/packages/multimedia/fswebcam/.svn/entries b/feeds/packages/multimedia/fswebcam/.svn/entries +new file mode 100644 +index 0000000..15938bd +--- /dev/null ++++ b/feeds/packages/multimedia/fswebcam/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/fswebcam ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-10T04:31:13.354226Z ++30860 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++cee32d9a316becd31d885b481855ecfe ++2012-03-10T04:31:13.354226Z ++30860 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1276 ++ +diff --git a/feeds/packages/multimedia/fswebcam/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/fswebcam/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..98afbdc +--- /dev/null ++++ b/feeds/packages/multimedia/fswebcam/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=fswebcam ++PKG_VERSION:=20110717 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://www.sanslogic.co.uk/fswebcam/files ++PKG_MD5SUM:=0b343a827771b7546cf4ede19a5ed000 ++ ++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/feeds/packages/multimedia/fswebcam/Makefile b/feeds/packages/multimedia/fswebcam/Makefile +new file mode 100644 +index 0000000..98afbdc +--- /dev/null ++++ b/feeds/packages/multimedia/fswebcam/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=fswebcam ++PKG_VERSION:=20110717 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://www.sanslogic.co.uk/fswebcam/files ++PKG_MD5SUM:=0b343a827771b7546cf4ede19a5ed000 ++ ++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/feeds/packages/multimedia/ftpd-topfield/.svn/entries b/feeds/packages/multimedia/ftpd-topfield/.svn/entries +new file mode 100644 +index 0000000..16ab163 +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ftpd-topfield ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d4ecf42fc9910da49cd736f90f5d5caa ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1201 ++ +diff --git a/feeds/packages/multimedia/ftpd-topfield/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/ftpd-topfield/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..89d0198 +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=ftpd-topfield ++PKG_VERSION:=0.7.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/puppy ++PKG_MD5SUM:=4a29f04fd41aaa5890e2f202d936e270 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ftpd-topfield ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=@USB_SUPPORT +libusb-compat ++ TITLE:=Topfield PVR access via FTP ++ URL:=http://puppy.sourceforge.net/ ++endef ++ ++define Package/ftpd-topfield/description ++FTP server to export the filesystem of a connected Topfield PVR ++endef ++ ++define Build/Configure ++endef ++ ++define Package/ftpd-topfield/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftpd $(1)/usr/sbin/ftpd-topfield ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ftpd-topfield.init $(1)/etc/init.d/ftpd-topfield ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/ftpd-topfield.config $(1)/etc/config/ftpd-topfield ++endef ++ ++define Package/ftpd-topfield/conffiles ++/etc/config/ftpd-topfield ++endef ++ ++$(eval $(call BuildPackage,ftpd-topfield)) +diff --git a/feeds/packages/multimedia/ftpd-topfield/Makefile b/feeds/packages/multimedia/ftpd-topfield/Makefile +new file mode 100644 +index 0000000..89d0198 +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=ftpd-topfield ++PKG_VERSION:=0.7.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/puppy ++PKG_MD5SUM:=4a29f04fd41aaa5890e2f202d936e270 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ftpd-topfield ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=@USB_SUPPORT +libusb-compat ++ TITLE:=Topfield PVR access via FTP ++ URL:=http://puppy.sourceforge.net/ ++endef ++ ++define Package/ftpd-topfield/description ++FTP server to export the filesystem of a connected Topfield PVR ++endef ++ ++define Build/Configure ++endef ++ ++define Package/ftpd-topfield/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftpd $(1)/usr/sbin/ftpd-topfield ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ftpd-topfield.init $(1)/etc/init.d/ftpd-topfield ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/ftpd-topfield.config $(1)/etc/config/ftpd-topfield ++endef ++ ++define Package/ftpd-topfield/conffiles ++/etc/config/ftpd-topfield ++endef ++ ++$(eval $(call BuildPackage,ftpd-topfield)) +diff --git a/feeds/packages/multimedia/ftpd-topfield/files/.svn/entries b/feeds/packages/multimedia/ftpd-topfield/files/.svn/entries +new file mode 100644 +index 0000000..3179b0d +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ftpd-topfield/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-17T11:48:53.993226Z ++29223 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ftpd-topfield.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++874e09fd3ec963626cabb94a45429a66 ++2011-11-17T11:48:53.993226Z ++29223 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++804 ++ ++ftpd-topfield.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++b6370b8e65ee84e24e2001d68145b262 ++2011-11-17T11:48:53.993226Z ++29223 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++96 ++ +diff --git a/feeds/packages/multimedia/ftpd-topfield/files/.svn/text-base/ftpd-topfield.config.svn-base b/feeds/packages/multimedia/ftpd-topfield/files/.svn/text-base/ftpd-topfield.config.svn-base +new file mode 100644 +index 0000000..ec5ef2e +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/files/.svn/text-base/ftpd-topfield.config.svn-base +@@ -0,0 +1,4 @@ ++config 'ftpd-topfield' ++ option 'port' '21' ++ option 'turbo' 'disabled' ++ option 'elpf' 'disabled' +diff --git a/feeds/packages/multimedia/ftpd-topfield/files/.svn/text-base/ftpd-topfield.init.svn-base b/feeds/packages/multimedia/ftpd-topfield/files/.svn/text-base/ftpd-topfield.init.svn-base +new file mode 100644 +index 0000000..27c4825 +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/files/.svn/text-base/ftpd-topfield.init.svn-base +@@ -0,0 +1,35 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=50 ++ ++config_cb() { ++ local cfg="$CONFIG_SECTION" ++ local cfgt ++ config_get cfgt "$cfg" TYPE ++ ++ case "$cfgt" in ++ ftpd-topfield) ++ config_get turbo $cfg turbo ++ config_get port $cfg port ++ config_get elpf $cfg elpf ++ ++ case "$turbo" in ++ yes|on|enabled|1) turbo=1;; ++ esac ++ case "$elpf" in ++ yes|on|enabled|1) elpf=1;; ++ esac ++ TOPFIELD_ARGS="-D ${turbo:+--turbo }${port:+-P $port }${elpf:+-E}" ++ ;; ++ esac ++} ++ ++start() { ++ config_load ftpd-topfield ++ /usr/sbin/ftpd-topfield $TOPFIELD_ARGS ++} ++ ++stop() { ++ killall ftpd-topfield ++} +diff --git a/feeds/packages/multimedia/ftpd-topfield/files/ftpd-topfield.config b/feeds/packages/multimedia/ftpd-topfield/files/ftpd-topfield.config +new file mode 100644 +index 0000000..ec5ef2e +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/files/ftpd-topfield.config +@@ -0,0 +1,4 @@ ++config 'ftpd-topfield' ++ option 'port' '21' ++ option 'turbo' 'disabled' ++ option 'elpf' 'disabled' +diff --git a/feeds/packages/multimedia/ftpd-topfield/files/ftpd-topfield.init b/feeds/packages/multimedia/ftpd-topfield/files/ftpd-topfield.init +new file mode 100644 +index 0000000..27c4825 +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/files/ftpd-topfield.init +@@ -0,0 +1,35 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=50 ++ ++config_cb() { ++ local cfg="$CONFIG_SECTION" ++ local cfgt ++ config_get cfgt "$cfg" TYPE ++ ++ case "$cfgt" in ++ ftpd-topfield) ++ config_get turbo $cfg turbo ++ config_get port $cfg port ++ config_get elpf $cfg elpf ++ ++ case "$turbo" in ++ yes|on|enabled|1) turbo=1;; ++ esac ++ case "$elpf" in ++ yes|on|enabled|1) elpf=1;; ++ esac ++ TOPFIELD_ARGS="-D ${turbo:+--turbo }${port:+-P $port }${elpf:+-E}" ++ ;; ++ esac ++} ++ ++start() { ++ config_load ftpd-topfield ++ /usr/sbin/ftpd-topfield $TOPFIELD_ARGS ++} ++ ++stop() { ++ killall ftpd-topfield ++} +diff --git a/feeds/packages/multimedia/ftpd-topfield/patches/.svn/entries b/feeds/packages/multimedia/ftpd-topfield/patches/.svn/entries +new file mode 100644 +index 0000000..86e39a7 +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ftpd-topfield/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-12-22T22:22:37.748719Z ++13726 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-kernel_header_rename.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d30740aa8183f821bd9281157a59f40e ++2008-12-22T22:22:37.748719Z ++13726 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++607 ++ +diff --git a/feeds/packages/multimedia/ftpd-topfield/patches/.svn/text-base/001-kernel_header_rename.patch.svn-base b/feeds/packages/multimedia/ftpd-topfield/patches/.svn/text-base/001-kernel_header_rename.patch.svn-base +new file mode 100644 +index 0000000..dedfbba +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/patches/.svn/text-base/001-kernel_header_rename.patch.svn-base +@@ -0,0 +1,14 @@ ++diff -up ftpd-topfield-0.7.4/libtopfield/usb_io.h.orig ftpd-topfield-0.7.4/libtopfield/usb_io.h ++--- ftpd-topfield-0.7.4/libtopfield/usb_io.h.orig 2008-11-24 10:19:56.000000000 +0100 +++++ ftpd-topfield-0.7.4/libtopfield/usb_io.h 2008-11-24 10:22:27.000000000 +0100 ++@@ -35,7 +35,9 @@ ++ #include ++ ++ /* linux/usb_ch9.h wasn't separated out until 2.4.23 */ ++-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23) +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) +++#include +++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23) ++ #include ++ #else ++ #include +diff --git a/feeds/packages/multimedia/ftpd-topfield/patches/001-kernel_header_rename.patch b/feeds/packages/multimedia/ftpd-topfield/patches/001-kernel_header_rename.patch +new file mode 100644 +index 0000000..dedfbba +--- /dev/null ++++ b/feeds/packages/multimedia/ftpd-topfield/patches/001-kernel_header_rename.patch +@@ -0,0 +1,14 @@ ++diff -up ftpd-topfield-0.7.4/libtopfield/usb_io.h.orig ftpd-topfield-0.7.4/libtopfield/usb_io.h ++--- ftpd-topfield-0.7.4/libtopfield/usb_io.h.orig 2008-11-24 10:19:56.000000000 +0100 +++++ ftpd-topfield-0.7.4/libtopfield/usb_io.h 2008-11-24 10:22:27.000000000 +0100 ++@@ -35,7 +35,9 @@ ++ #include ++ ++ /* linux/usb_ch9.h wasn't separated out until 2.4.23 */ ++-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23) +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) +++#include +++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23) ++ #include ++ #else ++ #include +diff --git a/feeds/packages/multimedia/gmediaserver/.svn/entries b/feeds/packages/multimedia/gmediaserver/.svn/entries +new file mode 100644 +index 0000000..9a723a4 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gmediaserver ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-05T08:52:52.249174Z ++32999 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e2a08eafb4035f24efd0c06d76b29242 ++2012-08-05T08:52:52.249174Z ++32999 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1801 ++ +diff --git a/feeds/packages/multimedia/gmediaserver/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/gmediaserver/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ac8620 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gmediaserver/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gmediaserver/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5834a07 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# 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:=gmediaserver ++PKG_VERSION:=0.13.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/ ++PKG_MD5SUM:=c422de386331e2a1a859d45f6fa270a3 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gmediaserver ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+id3lib +libmagic +file +libupnp +libuuid +zlib $(ICONV_DEPENDS) ++ TITLE:=An UPnP music media server ++ URL:=http://www.nongnu.org/gmediaserver/ ++endef ++ ++define Package/gmediaserver/description ++ GMediaServer is a server for UPnP media players like the ++ Netgear MP101, Linksys WMLS11B etc. It exports one or more ++ directories using the UPnP protocol so the mediaserver can ++ browse through them and play audio or video files. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-rpath \ ++ --enable-threads=posix \ ++ --with-libiconv-prefix="$(ICONV_PREFIX)" \ ++ --without-libintl-prefix \ ++ --with-id3lib="$(STAGING_DIR)/usr" \ ++ --with-libupnp="$(STAGING_DIR)/usr" \ ++ , \ ++ LIBS="-lz" \ ++ ++MAKE_FLAGS += \ ++ AR="$(TARGET_CROSS)ar" \ ++ LTLIBICONV="" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Package/gmediaserver/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(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/gmediaserver/conffiles ++/etc/config/gmediaserver ++endef ++ ++$(eval $(call BuildPackage,gmediaserver)) +diff --git a/feeds/packages/multimedia/gmediaserver/Makefile b/feeds/packages/multimedia/gmediaserver/Makefile +new file mode 100644 +index 0000000..5834a07 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/Makefile +@@ -0,0 +1,67 @@ ++# ++# 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:=gmediaserver ++PKG_VERSION:=0.13.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/ ++PKG_MD5SUM:=c422de386331e2a1a859d45f6fa270a3 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gmediaserver ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+id3lib +libmagic +file +libupnp +libuuid +zlib $(ICONV_DEPENDS) ++ TITLE:=An UPnP music media server ++ URL:=http://www.nongnu.org/gmediaserver/ ++endef ++ ++define Package/gmediaserver/description ++ GMediaServer is a server for UPnP media players like the ++ Netgear MP101, Linksys WMLS11B etc. It exports one or more ++ directories using the UPnP protocol so the mediaserver can ++ browse through them and play audio or video files. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-rpath \ ++ --enable-threads=posix \ ++ --with-libiconv-prefix="$(ICONV_PREFIX)" \ ++ --without-libintl-prefix \ ++ --with-id3lib="$(STAGING_DIR)/usr" \ ++ --with-libupnp="$(STAGING_DIR)/usr" \ ++ , \ ++ LIBS="-lz" \ ++ ++MAKE_FLAGS += \ ++ AR="$(TARGET_CROSS)ar" \ ++ LTLIBICONV="" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Package/gmediaserver/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(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/gmediaserver/conffiles ++/etc/config/gmediaserver ++endef ++ ++$(eval $(call BuildPackage,gmediaserver)) +diff --git a/feeds/packages/multimedia/gmediaserver/files/.svn/entries b/feeds/packages/multimedia/gmediaserver/files/.svn/entries +new file mode 100644 +index 0000000..f5a83b5 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gmediaserver/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T09:06:35.846467Z ++26107 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++gmediaserver.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++991c773e80d016b4498671e09a06d98a ++2011-03-12T09:06:35.846467Z ++26107 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++534 ++ ++gmediaserver.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++93e7babe2add986fc4b889703e3d3ca7 ++2011-03-12T09:06:35.846467Z ++26107 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++88 ++ +diff --git a/feeds/packages/multimedia/gmediaserver/files/.svn/prop-base/gmediaserver.init.svn-base b/feeds/packages/multimedia/gmediaserver/files/.svn/prop-base/gmediaserver.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/files/.svn/prop-base/gmediaserver.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gmediaserver/files/.svn/text-base/gmediaserver.config.svn-base b/feeds/packages/multimedia/gmediaserver/files/.svn/text-base/gmediaserver.config.svn-base +new file mode 100644 +index 0000000..ba1fc9f +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/files/.svn/text-base/gmediaserver.config.svn-base +@@ -0,0 +1,3 @@ ++config gmediaserver ++ option content_directory '/tmp' ++ option interface 'br-lan' +diff --git a/feeds/packages/multimedia/gmediaserver/files/.svn/text-base/gmediaserver.init.svn-base b/feeds/packages/multimedia/gmediaserver/files/.svn/text-base/gmediaserver.init.svn-base +new file mode 100644 +index 0000000..4fc6067 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/files/.svn/text-base/gmediaserver.init.svn-base +@@ -0,0 +1,27 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++BIN=gmediaserver ++DEFAULT=/etc/default/$BIN ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ mkdir -p $RUN_D ++ config_load gmediaserver ++ config_foreach start_service gmediaserver ++} ++ ++start_service() { ++ local cfg="$1" ++ config_get content_directory "$cfg" content_directory ++ config_get interface "$cfg" interface ++ ++ $BIN --background --interface=${interface:-br-lan} --pid-file=$PID_F ${content_directory:-/tmp} ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} ++ +diff --git a/feeds/packages/multimedia/gmediaserver/files/gmediaserver.config b/feeds/packages/multimedia/gmediaserver/files/gmediaserver.config +new file mode 100644 +index 0000000..ba1fc9f +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/files/gmediaserver.config +@@ -0,0 +1,3 @@ ++config gmediaserver ++ option content_directory '/tmp' ++ option interface 'br-lan' +diff --git a/feeds/packages/multimedia/gmediaserver/files/gmediaserver.init b/feeds/packages/multimedia/gmediaserver/files/gmediaserver.init +new file mode 100644 +index 0000000..4fc6067 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/files/gmediaserver.init +@@ -0,0 +1,27 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++BIN=gmediaserver ++DEFAULT=/etc/default/$BIN ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ mkdir -p $RUN_D ++ config_load gmediaserver ++ config_foreach start_service gmediaserver ++} ++ ++start_service() { ++ local cfg="$1" ++ config_get content_directory "$cfg" content_directory ++ config_get interface "$cfg" interface ++ ++ $BIN --background --interface=${interface:-br-lan} --pid-file=$PID_F ${content_directory:-/tmp} ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} ++ +diff --git a/feeds/packages/multimedia/gmediaserver/patches/.svn/entries b/feeds/packages/multimedia/gmediaserver/patches/.svn/entries +new file mode 100644 +index 0000000..4f87da4 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gmediaserver/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T09:06:35.846467Z ++26107 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++32604732a955fac0bf224e00e5c49f05 ++2011-03-12T09:06:35.846467Z ++26107 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4898 ++ +diff --git a/feeds/packages/multimedia/gmediaserver/patches/.svn/text-base/010-compile-fixes.patch.svn-base b/feeds/packages/multimedia/gmediaserver/patches/.svn/text-base/010-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..3a11500 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/patches/.svn/text-base/010-compile-fixes.patch.svn-base +@@ -0,0 +1,144 @@ ++--- a/src/upnp.c +++++ b/src/upnp.c ++@@ -36,6 +36,7 @@ ++ #include ++ #include "intutil.h" ++ #include "gmediaserver.h" +++#include "webserver.h" ++ #include "schemas/MediaServer.h" ++ ++ #define GMEDIASERVER_SSDP_PAUSE 100 ++@@ -265,7 +266,7 @@ handle_get_var_request(struct Upnp_State ++ say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN)); ++ say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID)); ++ say(3, _("Event variable name: %s\n"), quotearg(request->StateVarName)); ++- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr)); +++ say(3, _("Event source: %s\n"), inet_ntoa((*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr)); ++ ++ if (strcmp(request->DevUDN, device_udn) != 0) { ++ say(1, _("Discarding event - event device UDN (%s) not recognized\n"), quotearg(request->DevUDN)); ++@@ -306,7 +307,7 @@ handle_action_request(struct Upnp_Action ++ say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN)); ++ say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID)); ++ say(3, _("Event action name: %s\n"), quotearg(request->ActionName)); ++- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr)); +++ say(3, _("Event source: %s\n"), inet_ntoa((*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr)); ++ say_document(4, _("Event action request:\n"), request->ActionRequest); ++ ++ if (strcmp(request->DevUDN, device_udn) != 0) { ++@@ -502,9 +503,24 @@ init_upnp(const char *listenip, uint16_t ++ res = UpnpEnableWebserver(TRUE); ++ if (res != UPNP_E_SUCCESS) ++ die(_("cannot enable UPnP web server - %s\n"), upnp_errmsg(res)); ++- res = UpnpSetVirtualDirCallbacks(&virtual_dir_callbacks); ++- if (res != UPNP_E_SUCCESS) ++- die(_("cannot set virtual directory callbacks - %s\n"), upnp_errmsg(res)); +++ +++#define upnp_set_callback(cb, func) \ +++ do { \ +++ res = UpnpVirtualDir_set_##cb##Callback(func); \ +++ if (res != UPNP_E_SUCCESS) \ +++ { \ +++ die(_("cannot set virtual directory callbacks - %s\n"), \ +++ upnp_errmsg(res)); \ +++ } \ +++ } while(0) +++ +++ upnp_set_callback(GetInfo, webserver_get_info); +++ upnp_set_callback(Open, webserver_open); +++ upnp_set_callback(Read, webserver_read); +++ upnp_set_callback(Seek, webserver_seek); +++ upnp_set_callback(Write, webserver_write); +++ upnp_set_callback(Close, webserver_close); +++ ++ res = UpnpAddVirtualDir("/files"); ++ if (res != UPNP_E_SUCCESS) ++ die(_("cannot add virtual directory for web server - %s\n"), upnp_errmsg(res)); ++--- a/src/webserver.c +++++ b/src/webserver.c ++@@ -83,7 +83,7 @@ get_entry_from_url(const char *filename) ++ return get_entry_by_id(id); ++ } ++ ++-static int +++int ++ webserver_get_info(const char *filename, struct File_Info *info) ++ { ++ Entry *entry; ++@@ -180,7 +180,7 @@ webserver_get_info(const char *filename, ++ return -1; ++ } ++ ++-static UpnpWebFileHandle +++UpnpWebFileHandle ++ webserver_open(const char *filename, enum UpnpOpenFileMode mode) ++ { ++ Entry *entry; ++@@ -277,7 +277,7 @@ webserver_open(const char *filename, enu ++ return NULL; ++ } ++ ++-static int +++int ++ webserver_read(UpnpWebFileHandle fh, char *buf, size_t buflen) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -307,7 +307,7 @@ webserver_read(UpnpWebFileHandle fh, cha ++ return len; ++ } ++ ++-static int +++int ++ webserver_write(UpnpWebFileHandle fh, char *buf, size_t buflen) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -317,7 +317,7 @@ webserver_write(UpnpWebFileHandle fh, ch ++ return -1; ++ } ++ ++-static int +++int ++ webserver_seek(UpnpWebFileHandle fh, off_t offset, int origin) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -396,7 +396,7 @@ webserver_seek(UpnpWebFileHandle fh, off ++ return 0; ++ } ++ ++-static int +++int ++ webserver_close(UpnpWebFileHandle fh) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -419,12 +419,3 @@ webserver_close(UpnpWebFileHandle fh) ++ ++ return 0; ++ } ++- ++-struct UpnpVirtualDirCallbacks virtual_dir_callbacks = { ++- webserver_get_info, ++- webserver_open, ++- webserver_read, ++- webserver_write, ++- webserver_seek, ++- webserver_close ++-}; ++--- /dev/null +++++ b/src/webserver.h ++@@ -0,0 +1,6 @@ +++int webserver_get_info(const char *filename, struct File_Info *info); +++UpnpWebFileHandle webserver_open(const char *filename, enum UpnpOpenFileMode mode); +++int webserver_read(UpnpWebFileHandle fh, char *buf, size_t buflen); +++int webserver_write(UpnpWebFileHandle fh, char *buf, size_t buflen); +++int webserver_seek(UpnpWebFileHandle fh, off_t offset, int origin); +++int webserver_close(UpnpWebFileHandle fh); ++--- a/src/contentdir.c +++++ b/src/contentdir.c ++@@ -22,6 +22,7 @@ ++ #include /* Gnulib/C99 */ ++ #include /* ? */ ++ #include /* POSIX */ +++#include ++ #include "gettext.h" /* Gnulib/gettext */ ++ #define _(s) gettext(s) ++ #define N_(s) gettext_noop(s) +diff --git a/feeds/packages/multimedia/gmediaserver/patches/010-compile-fixes.patch b/feeds/packages/multimedia/gmediaserver/patches/010-compile-fixes.patch +new file mode 100644 +index 0000000..3a11500 +--- /dev/null ++++ b/feeds/packages/multimedia/gmediaserver/patches/010-compile-fixes.patch +@@ -0,0 +1,144 @@ ++--- a/src/upnp.c +++++ b/src/upnp.c ++@@ -36,6 +36,7 @@ ++ #include ++ #include "intutil.h" ++ #include "gmediaserver.h" +++#include "webserver.h" ++ #include "schemas/MediaServer.h" ++ ++ #define GMEDIASERVER_SSDP_PAUSE 100 ++@@ -265,7 +266,7 @@ handle_get_var_request(struct Upnp_State ++ say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN)); ++ say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID)); ++ say(3, _("Event variable name: %s\n"), quotearg(request->StateVarName)); ++- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr)); +++ say(3, _("Event source: %s\n"), inet_ntoa((*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr)); ++ ++ if (strcmp(request->DevUDN, device_udn) != 0) { ++ say(1, _("Discarding event - event device UDN (%s) not recognized\n"), quotearg(request->DevUDN)); ++@@ -306,7 +307,7 @@ handle_action_request(struct Upnp_Action ++ say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN)); ++ say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID)); ++ say(3, _("Event action name: %s\n"), quotearg(request->ActionName)); ++- say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr)); +++ say(3, _("Event source: %s\n"), inet_ntoa((*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr)); ++ say_document(4, _("Event action request:\n"), request->ActionRequest); ++ ++ if (strcmp(request->DevUDN, device_udn) != 0) { ++@@ -502,9 +503,24 @@ init_upnp(const char *listenip, uint16_t ++ res = UpnpEnableWebserver(TRUE); ++ if (res != UPNP_E_SUCCESS) ++ die(_("cannot enable UPnP web server - %s\n"), upnp_errmsg(res)); ++- res = UpnpSetVirtualDirCallbacks(&virtual_dir_callbacks); ++- if (res != UPNP_E_SUCCESS) ++- die(_("cannot set virtual directory callbacks - %s\n"), upnp_errmsg(res)); +++ +++#define upnp_set_callback(cb, func) \ +++ do { \ +++ res = UpnpVirtualDir_set_##cb##Callback(func); \ +++ if (res != UPNP_E_SUCCESS) \ +++ { \ +++ die(_("cannot set virtual directory callbacks - %s\n"), \ +++ upnp_errmsg(res)); \ +++ } \ +++ } while(0) +++ +++ upnp_set_callback(GetInfo, webserver_get_info); +++ upnp_set_callback(Open, webserver_open); +++ upnp_set_callback(Read, webserver_read); +++ upnp_set_callback(Seek, webserver_seek); +++ upnp_set_callback(Write, webserver_write); +++ upnp_set_callback(Close, webserver_close); +++ ++ res = UpnpAddVirtualDir("/files"); ++ if (res != UPNP_E_SUCCESS) ++ die(_("cannot add virtual directory for web server - %s\n"), upnp_errmsg(res)); ++--- a/src/webserver.c +++++ b/src/webserver.c ++@@ -83,7 +83,7 @@ get_entry_from_url(const char *filename) ++ return get_entry_by_id(id); ++ } ++ ++-static int +++int ++ webserver_get_info(const char *filename, struct File_Info *info) ++ { ++ Entry *entry; ++@@ -180,7 +180,7 @@ webserver_get_info(const char *filename, ++ return -1; ++ } ++ ++-static UpnpWebFileHandle +++UpnpWebFileHandle ++ webserver_open(const char *filename, enum UpnpOpenFileMode mode) ++ { ++ Entry *entry; ++@@ -277,7 +277,7 @@ webserver_open(const char *filename, enu ++ return NULL; ++ } ++ ++-static int +++int ++ webserver_read(UpnpWebFileHandle fh, char *buf, size_t buflen) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -307,7 +307,7 @@ webserver_read(UpnpWebFileHandle fh, cha ++ return len; ++ } ++ ++-static int +++int ++ webserver_write(UpnpWebFileHandle fh, char *buf, size_t buflen) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -317,7 +317,7 @@ webserver_write(UpnpWebFileHandle fh, ch ++ return -1; ++ } ++ ++-static int +++int ++ webserver_seek(UpnpWebFileHandle fh, off_t offset, int origin) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -396,7 +396,7 @@ webserver_seek(UpnpWebFileHandle fh, off ++ return 0; ++ } ++ ++-static int +++int ++ webserver_close(UpnpWebFileHandle fh) ++ { ++ WebServerFile *file = (WebServerFile *) fh; ++@@ -419,12 +419,3 @@ webserver_close(UpnpWebFileHandle fh) ++ ++ return 0; ++ } ++- ++-struct UpnpVirtualDirCallbacks virtual_dir_callbacks = { ++- webserver_get_info, ++- webserver_open, ++- webserver_read, ++- webserver_write, ++- webserver_seek, ++- webserver_close ++-}; ++--- /dev/null +++++ b/src/webserver.h ++@@ -0,0 +1,6 @@ +++int webserver_get_info(const char *filename, struct File_Info *info); +++UpnpWebFileHandle webserver_open(const char *filename, enum UpnpOpenFileMode mode); +++int webserver_read(UpnpWebFileHandle fh, char *buf, size_t buflen); +++int webserver_write(UpnpWebFileHandle fh, char *buf, size_t buflen); +++int webserver_seek(UpnpWebFileHandle fh, off_t offset, int origin); +++int webserver_close(UpnpWebFileHandle fh); ++--- a/src/contentdir.c +++++ b/src/contentdir.c ++@@ -22,6 +22,7 @@ ++ #include /* Gnulib/C99 */ ++ #include /* ? */ ++ #include /* POSIX */ +++#include ++ #include "gettext.h" /* Gnulib/gettext */ ++ #define _(s) gettext(s) ++ #define N_(s) gettext_noop(s) +diff --git a/feeds/packages/multimedia/gphoto2/.svn/entries b/feeds/packages/multimedia/gphoto2/.svn/entries +new file mode 100644 +index 0000000..e89b786 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gphoto2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:55.026824Z ++32296 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++6a0e98a10dac025f62aa999b9839e4c4 ++2012-06-12T23:47:55.026824Z ++32296 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1323 ++ +diff --git a/feeds/packages/multimedia/gphoto2/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/gphoto2/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gphoto2/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gphoto2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d1a0545 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=gphoto2 ++PKG_VERSION:=2.4.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/gphoto ++PKG_MD5SUM:=2635075f702b40eb2e95a80658bd4773 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gphoto2 ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=Gphoto Digital Camera Control ++ URL:=http://www.gphoto.org/ ++ DEPENDS:=+libgphoto2 +libpopt +libpthread +libreadline +libncurses ++endef ++ ++define Package/gphoto2/description ++ For downloading and controlling digital cameras ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-aalib \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++CONFIGURE_VARS += \ ++ LIBGPHOTO2_CFLAGS="$$$$CFLAGS -I$(STAGING_DIR)/usr/include/gphoto2 $$$$CPPFLAGS" \ ++ LIBGPHOTO2_LIBS="$$$$LDFLAGS -lgphoto2 -lgphoto2_port -lltdl" \ ++ LIBEXIF_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ ++ POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ POPT_LIBS="$$$$LDFLAGS -lpopt" \ ++ ++define Package/gphoto2/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,gphoto2)) +diff --git a/feeds/packages/multimedia/gphoto2/Makefile b/feeds/packages/multimedia/gphoto2/Makefile +new file mode 100644 +index 0000000..d1a0545 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=gphoto2 ++PKG_VERSION:=2.4.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/gphoto ++PKG_MD5SUM:=2635075f702b40eb2e95a80658bd4773 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gphoto2 ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=Gphoto Digital Camera Control ++ URL:=http://www.gphoto.org/ ++ DEPENDS:=+libgphoto2 +libpopt +libpthread +libreadline +libncurses ++endef ++ ++define Package/gphoto2/description ++ For downloading and controlling digital cameras ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-aalib \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++CONFIGURE_VARS += \ ++ LIBGPHOTO2_CFLAGS="$$$$CFLAGS -I$(STAGING_DIR)/usr/include/gphoto2 $$$$CPPFLAGS" \ ++ LIBGPHOTO2_LIBS="$$$$LDFLAGS -lgphoto2 -lgphoto2_port -lltdl" \ ++ LIBEXIF_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ ++ POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ ++ POPT_LIBS="$$$$LDFLAGS -lpopt" \ ++ ++define Package/gphoto2/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,gphoto2)) +diff --git a/feeds/packages/multimedia/gphoto2/patches/.svn/entries b/feeds/packages/multimedia/gphoto2/patches/.svn/entries +new file mode 100644 +index 0000000..285ce3b +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gphoto2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-05T21:16:20.213453Z ++30324 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++43f341a2594caf48bc0907a5537220df ++2010-12-15T05:08:41.092060Z ++24586 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++318 ++ ++002-disable-docs-translations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++421af1b82ee077df58e9dbf5b7efa582 ++2012-02-05T21:16:20.213453Z ++30324 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1508 ++ ++100-gpdebug.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++7592de23d1cae7a7fb7ce4ffa21c812d ++2009-07-14T00:56:08.657596Z ++16836 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++329 ++ +diff --git a/feeds/packages/multimedia/gphoto2/patches/.svn/prop-base/100-gpdebug.patch.svn-base b/feeds/packages/multimedia/gphoto2/patches/.svn/prop-base/100-gpdebug.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/.svn/prop-base/100-gpdebug.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..89cad74 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -66,7 +66,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and oth ++ ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" ++ AM_GNU_GETTEXT_VERSION([0.14.1]) ++ AM_GNU_GETTEXT([external]) ++-AM_PO_SUBDIRS() ++ AM_ICONV() ++ GP_GETTEXT_FLAGS() ++ +diff --git a/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/002-disable-docs-translations.patch.svn-base b/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/002-disable-docs-translations.patch.svn-base +new file mode 100644 +index 0000000..1def16a +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/002-disable-docs-translations.patch.svn-base +@@ -0,0 +1,45 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -62,12 +62,7 @@ GP_REFERENCES()dnl ++ dnl --------------------------------------------------------------------------- ++ dnl i18n support ++ dnl --------------------------------------------------------------------------- ++-GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) ++-ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" ++-AM_GNU_GETTEXT_VERSION([0.14.1]) ++-AM_GNU_GETTEXT([external]) ++ AM_ICONV() ++-GP_GETTEXT_FLAGS() ++ ++ dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as ++ dnl we require make to do insert the proper $(datadir) value ++@@ -352,11 +347,9 @@ AC_SUBST([AM_LDFLAGS]) ++ # Create output files ++ # --------------------------------------------------------------------------- ++ AC_CONFIG_FILES([ ++-po/Makefile.in ++ Makefile ++ gphoto2/Makefile ++ m4m/Makefile ++-doc/Makefile ++ contrib/Makefile ++ packaging/Makefile ++ packaging/rpm/Makefile ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,3 +1,3 @@ ++-SUBDIRS = m4m contrib doc gphoto2 packaging po +++SUBDIRS = m4m contrib gphoto2 packaging ++ ++ ACLOCAL_AMFLAGS = -I auto-m4 -I m4m ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -278,7 +278,7 @@ target_alias = @target_alias@ ++ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++-SUBDIRS = m4m contrib doc gphoto2 packaging po +++SUBDIRS = m4m contrib gphoto2 packaging ++ ACLOCAL_AMFLAGS = -I auto-m4 -I m4m ++ all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive +diff --git a/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/100-gpdebug.patch.svn-base b/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/100-gpdebug.patch.svn-base +new file mode 100644 +index 0000000..177fc09 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/.svn/text-base/100-gpdebug.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/gphoto2/foreach.c +++++ b/gphoto2/foreach.c ++@@ -31,6 +31,8 @@ ++ ++ #include ++ +++#define GP_DEBUG (void) +++ ++ #define GP_ERROR_FRONTEND_BAD_ID -10000 ++ #define CR(result) {int __r=(result); if(__r<0) return(__r);} ++ #define CL(result,list) {int __r=(result); if(__r<0) {gp_list_free(list);return(__r);}} +diff --git a/feeds/packages/multimedia/gphoto2/patches/001-automake-compat.patch b/feeds/packages/multimedia/gphoto2/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..89cad74 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/001-automake-compat.patch +@@ -0,0 +1,10 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -66,7 +66,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and oth ++ ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" ++ AM_GNU_GETTEXT_VERSION([0.14.1]) ++ AM_GNU_GETTEXT([external]) ++-AM_PO_SUBDIRS() ++ AM_ICONV() ++ GP_GETTEXT_FLAGS() ++ +diff --git a/feeds/packages/multimedia/gphoto2/patches/002-disable-docs-translations.patch b/feeds/packages/multimedia/gphoto2/patches/002-disable-docs-translations.patch +new file mode 100644 +index 0000000..1def16a +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/002-disable-docs-translations.patch +@@ -0,0 +1,45 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -62,12 +62,7 @@ GP_REFERENCES()dnl ++ dnl --------------------------------------------------------------------------- ++ dnl i18n support ++ dnl --------------------------------------------------------------------------- ++-GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) ++-ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" ++-AM_GNU_GETTEXT_VERSION([0.14.1]) ++-AM_GNU_GETTEXT([external]) ++ AM_ICONV() ++-GP_GETTEXT_FLAGS() ++ ++ dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as ++ dnl we require make to do insert the proper $(datadir) value ++@@ -352,11 +347,9 @@ AC_SUBST([AM_LDFLAGS]) ++ # Create output files ++ # --------------------------------------------------------------------------- ++ AC_CONFIG_FILES([ ++-po/Makefile.in ++ Makefile ++ gphoto2/Makefile ++ m4m/Makefile ++-doc/Makefile ++ contrib/Makefile ++ packaging/Makefile ++ packaging/rpm/Makefile ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,3 +1,3 @@ ++-SUBDIRS = m4m contrib doc gphoto2 packaging po +++SUBDIRS = m4m contrib gphoto2 packaging ++ ++ ACLOCAL_AMFLAGS = -I auto-m4 -I m4m ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -278,7 +278,7 @@ target_alias = @target_alias@ ++ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++-SUBDIRS = m4m contrib doc gphoto2 packaging po +++SUBDIRS = m4m contrib gphoto2 packaging ++ ACLOCAL_AMFLAGS = -I auto-m4 -I m4m ++ all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive +diff --git a/feeds/packages/multimedia/gphoto2/patches/100-gpdebug.patch b/feeds/packages/multimedia/gphoto2/patches/100-gpdebug.patch +new file mode 100644 +index 0000000..177fc09 +--- /dev/null ++++ b/feeds/packages/multimedia/gphoto2/patches/100-gpdebug.patch +@@ -0,0 +1,11 @@ ++--- a/gphoto2/foreach.c +++++ b/gphoto2/foreach.c ++@@ -31,6 +31,8 @@ ++ ++ #include ++ +++#define GP_DEBUG (void) +++ ++ #define GP_ERROR_FRONTEND_BAD_ID -10000 ++ #define CR(result) {int __r=(result); if(__r<0) return(__r);} ++ #define CL(result,list) {int __r=(result); if(__r<0) {gp_list_free(list);return(__r);}} +diff --git a/feeds/packages/multimedia/graphicsmagick/.svn/entries b/feeds/packages/multimedia/graphicsmagick/.svn/entries +new file mode 100644 +index 0000000..d470d7f +--- /dev/null ++++ b/feeds/packages/multimedia/graphicsmagick/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/graphicsmagick ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T01:57:19.212386Z ++32263 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e87c6bacd41182c7ebc38e9af0d883d1 ++2012-06-12T01:57:19.212386Z ++32263 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2417 ++ +diff --git a/feeds/packages/multimedia/graphicsmagick/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/graphicsmagick/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eccd58a +--- /dev/null ++++ b/feeds/packages/multimedia/graphicsmagick/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,98 @@ ++# ++# 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:=GraphicsMagick ++PKG_VERSION:=1.3.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/graphicsmagick ++PKG_MD5SUM:=c0428886ea07736b0f1872d256ab7ebd ++ ++include $(INCLUDE_DIR)/package.mk ++ ++export PATH:=$(PKG_BUILD_DIR)/bin:$(TARGET_PATH) ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++define Package/GraphicsMagick/Default ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=GraphicsMagick ++ URL:=http://www.graphicsmagick.org/ ++ DEPENDS:=+libbz2 +libfreetype +libltdl +libpthread +libstdcpp +zlib ++endef ++ ++define Package/GraphicsMagick ++ $(call Package/GraphicsMagick/Default) ++endef ++ ++define Package/GraphicsMagick/description ++ An image manipulation library. ++endef ++ ++define Package/GraphicsMagick-jpeg ++ $(call Package/GraphicsMagick/Default) ++ TITLE+= (jpeg) ++ DEPENDS:=+GraphicsMagick +libjpeg +zlib ++endef ++ ++define Package/GraphicsMagick-jpeg/description ++ GraphicsMagick JPEG module ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-modules \ ++ --enable-shared \ ++ --enable-static \ ++ --without-xml \ ++ --without-x \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/GraphicsMagick/magick ++ $(INSTALL_DIR) $(1)/usr/include/GraphicsMagick/wand ++ $(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/GraphicsMagick/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/share/GraphicsMagick-$(PKG_VERSION) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/share/GraphicsMagick-$(PKG_VERSION)/* \ ++ $(1)/usr/share/GraphicsMagick-$(PKG_VERSION) ++endef ++ ++define BuildPlugin ++ define Package/GraphicsMagick-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib/GraphicsMagick-$(PKG_VERSION)/modules-Q8/coders ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/GraphicsMagick-$(PKG_VERSION)/modules-Q8/coders/$(1).{so,la} \ ++ $$(1)/usr/lib/GraphicsMagick-$(PKG_VERSION)/modules-Q8/coders ++ endef ++ ++ $$(eval $$(call BuildPackage,GraphicsMagick-$(1))) ++endef ++ ++$(eval $(call BuildPackage,GraphicsMagick)) ++$(eval $(call BuildPlugin,jpeg)) +diff --git a/feeds/packages/multimedia/graphicsmagick/Makefile b/feeds/packages/multimedia/graphicsmagick/Makefile +new file mode 100644 +index 0000000..eccd58a +--- /dev/null ++++ b/feeds/packages/multimedia/graphicsmagick/Makefile +@@ -0,0 +1,98 @@ ++# ++# 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:=GraphicsMagick ++PKG_VERSION:=1.3.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/graphicsmagick ++PKG_MD5SUM:=c0428886ea07736b0f1872d256ab7ebd ++ ++include $(INCLUDE_DIR)/package.mk ++ ++export PATH:=$(PKG_BUILD_DIR)/bin:$(TARGET_PATH) ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++define Package/GraphicsMagick/Default ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=GraphicsMagick ++ URL:=http://www.graphicsmagick.org/ ++ DEPENDS:=+libbz2 +libfreetype +libltdl +libpthread +libstdcpp +zlib ++endef ++ ++define Package/GraphicsMagick ++ $(call Package/GraphicsMagick/Default) ++endef ++ ++define Package/GraphicsMagick/description ++ An image manipulation library. ++endef ++ ++define Package/GraphicsMagick-jpeg ++ $(call Package/GraphicsMagick/Default) ++ TITLE+= (jpeg) ++ DEPENDS:=+GraphicsMagick +libjpeg +zlib ++endef ++ ++define Package/GraphicsMagick-jpeg/description ++ GraphicsMagick JPEG module ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-modules \ ++ --enable-shared \ ++ --enable-static \ ++ --without-xml \ ++ --without-x \ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/GraphicsMagick/magick ++ $(INSTALL_DIR) $(1)/usr/include/GraphicsMagick/wand ++ $(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/GraphicsMagick/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/share/GraphicsMagick-$(PKG_VERSION) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/share/GraphicsMagick-$(PKG_VERSION)/* \ ++ $(1)/usr/share/GraphicsMagick-$(PKG_VERSION) ++endef ++ ++define BuildPlugin ++ define Package/GraphicsMagick-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib/GraphicsMagick-$(PKG_VERSION)/modules-Q8/coders ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/GraphicsMagick-$(PKG_VERSION)/modules-Q8/coders/$(1).{so,la} \ ++ $$(1)/usr/lib/GraphicsMagick-$(PKG_VERSION)/modules-Q8/coders ++ endef ++ ++ $$(eval $$(call BuildPackage,GraphicsMagick-$(1))) ++endef ++ ++$(eval $(call BuildPackage,GraphicsMagick)) ++$(eval $(call BuildPlugin,jpeg)) +diff --git a/feeds/packages/multimedia/gst-ffmpeg/.svn/entries b/feeds/packages/multimedia/gst-ffmpeg/.svn/entries +new file mode 100644 +index 0000000..98d67f3 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-ffmpeg/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-ffmpeg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-14T23:07:24.467536Z ++32378 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++23801fe141f60f893a55da1cb853d129 ++2011-03-11T21:24:20.683138Z ++26045 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5285 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++58084d4882320bf0452154c9f9159557 ++2012-06-14T23:07:24.467536Z ++32378 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3600 ++ +diff --git a/feeds/packages/multimedia/gst-ffmpeg/.svn/text-base/Config.in.svn-base b/feeds/packages/multimedia/gst-ffmpeg/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..9f579c7 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-ffmpeg/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,269 @@ ++menu "Configuration" ++ depends PACKAGE_gst-ffmpeg ++ ++config GST_FFMPEG_IPV6 ++ bool "Enable IPv6" ++ default IPV6 ++ ++config GST_FFMPEG_PATENTED ++ bool "Include patented codecs and technologies" ++ default BUILD_PATENTED ++ ++config GET_FFMPEG_LIBDLNA_SUPPORT ++ bool "Include support for libdlna/ushare" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_DECODER_ac3 ++ select GST_FFMPEG_DECODER_atrac3 ++ select GST_FFMPEG_DECODER_h264 ++ select GST_FFMPEG_DECODER_jpegls ++ select GST_FFMPEG_DECODER_mp3 ++ select GST_FFMPEG_DECODER_mpeg1video ++ select GST_FFMPEG_DECODER_mpeg2video ++ select GST_FFMPEG_DECODER_mpeg4 ++ select GST_FFMPEG_DECODER_mpeg4aac ++ select GST_FFMPEG_DECODER_mpegvideo ++ select GST_FFMPEG_DECODER_wmav1 ++ select GST_FFMPEG_DECODER_wmav2 ++ select GST_FFMPEG_DECODER_png ++ select GST_FFMPEG_DEMUXER_ac3 ++ select GST_FFMPEG_DEMUXER_h264 ++ select GST_FFMPEG_DEMUXER_mp3 ++ select GST_FFMPEG_DEMUXER_mpegvideo ++ ++comment "Encoders ---" ++ ++config GST_FFMPEG_ENCODER_ac3 ++ bool "AC3" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_PARSER_ac3 ++ ++config GST_FFMPEG_ENCODER_jpegls ++ bool "JPEG-LS" ++ ++config GST_FFMPEG_ENCODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config GST_FFMPEG_ENCODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_ENCODER_mpeg4 ++ bool "MPEG-4" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_ENCODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config GST_FFMPEG_ENCODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config GST_FFMPEG_ENCODER_png ++ bool "PNG" ++ select GST_FFMPEG_ENCODER_zlib ++ ++config GST_FFMPEG_ENCODER_vorbis ++ bool "Vorbis" ++ ++config GST_FFMPEG_ENCODER_zlib ++ bool "Zlib" ++ ++comment "Decoders ---" ++ ++config GST_FFMPEG_DECODER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_PARSER_aac ++ ++config GST_FFMPEG_DECODER_ac3 ++ bool "AC3" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_PARSER_ac3 ++ ++config GST_FFMPEG_DECODER_atrac3 ++ bool "ATRAC3" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_gif ++ bool "GIF" ++ ++config GST_FFMPEG_DECODER_h264 ++ bool "H.264" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_jpegls ++ bool "JPEG-LS" ++ ++config GST_FFMPEG_DECODER_mp2 ++ bool "MP2 (MPEG Audio Layer 2)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mp3 ++ bool "MP3 (MPEG Audio Layer 2)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mpegvideo ++ bool "MPEG Video" ++ ++config GST_FFMPEG_DECODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config GST_FFMPEG_DECODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mpeg4 ++ bool "MPEG-4" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mpeg4aac ++ bool "MPEG-4 (AAC)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config GST_FFMPEG_DECODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config GST_FFMPEG_DECODER_png ++ bool "PNG" ++ select GST_FFMPEG_DECODER_zlib ++ ++config GST_FFMPEG_DECODER_vorbis ++ bool "Vorbis" ++ ++config GST_FFMPEG_DECODER_wmav1 ++ bool "WMAv1" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_wmav2 ++ bool "WMAv2" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_zlib ++ bool "Zlib" ++ ++comment "Muxers ---" ++ ++config GST_FFMPEG_MUXER_ac3 ++ bool "AC3" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_MUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config GST_FFMPEG_MUXER_h264 ++ bool "H.264" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_MUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ ++config GST_FFMPEG_MUXER_mp4 ++ bool "MP4" ++ ++config GST_FFMPEG_MUXER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config GST_FFMPEG_MUXER_mpeg2video ++ bool "MPEG-2 Video" ++ ++config GST_FFMPEG_MUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config GST_FFMPEG_MUXER_ogg ++ bool "Ogg" ++ ++config GST_FFMPEG_MUXER_oss ++ bool "OSS (Open Sound System playback)" ++ ++config GST_FFMPEG_MUXER_rtp ++ bool "RTP" ++ ++comment "Demuxers ---" ++ ++config GST_FFMPEG_DEMUXER_ac3 ++ bool "AC3" ++ ++config GST_FFMPEG_DEMUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config GST_FFMPEG_DEMUXER_h264 ++ bool "H.264" ++ depends FFMPEG_PATENTED ++ ++config GST_FFMPEG_DEMUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ ++config GST_FFMPEG_DEMUXER_mpegvideo ++ bool "MPEG Video" ++ ++config GST_FFMPEG_DEMUXER_mpegps ++ bool "MPEG-2 (PS)" ++ ++config GST_FFMPEG_DEMUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config GST_FFMPEG_DEMUXER_ogg ++ bool "Ogg" ++ ++config GST_FFMPEG_DEMUXER_rm ++ bool "RM" ++ help ++ RealMedia format demuxer ++ ++config GST_FFMPEG_DEMUXER_rtsp ++ bool "RTSP" ++ select GST_FFMPEG_DEMUXER_rm ++ select GST_FFMPEG_DEMUXER_sdp ++ ++config GST_FFMPEG_DEMUXER_sdp ++ bool "SDP" ++ select GST_FFMPEG_DEMUXER_mpegts ++ ++comment "Parsers ---" ++ ++config GST_FFMPEG_PARSER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_PARSER_ac3 ++ bool "AC3" ++ ++config GST_FFMPEG_PARSER_h264 ++ bool "H.264" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_DECODER_h264 ++ ++config GST_FFMPEG_PARSER_mpegaudio ++ bool "MPEG Audio" ++ ++config GST_FFMPEG_PARSER_mpegvideo ++ bool "MPEG Video" ++ ++config GST_FFMPEG_PARSER_mpeg4video ++ bool "MPEG-4 Video" ++ ++comment "Protocols ---" ++ ++config GST_FFMPEG_PROTOCOL_file ++ bool "file:" ++ ++config GST_FFMPEG_PROTOCOL_http ++ bool "http:" ++ ++config GST_FFMPEG_PROTOCOL_pipe ++ bool "pipe:" ++ ++config GST_FFMPEG_PROTOCOL_rtp ++ bool "rtp:" ++ select GST_FFMPEG_PROTOCOL_udp ++ ++config GST_FFMPEG_PROTOCOL_tcp ++ bool "tcp:" ++ ++config GST_FFMPEG_PROTOCOL_udp ++ bool "udp:" ++ ++endmenu ++ +diff --git a/feeds/packages/multimedia/gst-ffmpeg/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gst-ffmpeg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..24aea0c +--- /dev/null ++++ b/feeds/packages/multimedia/gst-ffmpeg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,170 @@ ++# ++# 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:=gst-ffmpeg ++PKG_RELEASE:=1 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-ffmpeg ++PKG_VERSION:=0.10.11 ++PKG_MD5SUM:=0d23197ba7ac06ea34fa66d38469ebe5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++FFMPEG_ENCODERS:= \ ++ ac3 \ ++ jpegls \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ zlib \ ++ ++FFMPEG_DECODERS:= \ ++ aac \ ++ ac3 \ ++ atrac3 \ ++ gif \ ++ h264 \ ++ jpegls \ ++ mp2 \ ++ mp3 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ mpeg4aac \ ++ mpegvideo \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ wmav1 \ ++ wmav2 \ ++ zlib \ ++ ++FFMPEG_MUXERS:= \ ++ ac3 \ ++ ffm \ ++ h264 \ ++ mp3 \ ++ mp4 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpegts \ ++ ogg \ ++ oss \ ++ rtp \ ++ ++FFMPEG_DEMUXERS:= \ ++ ac3 \ ++ ffm \ ++ h264 \ ++ mp3 \ ++ mpegps \ ++ mpegts \ ++ mpegvideo \ ++ ogg \ ++ rm \ ++ rtsp \ ++ sdp \ ++ v4l2 \ ++ ++FFMPEG_PARSERS:= \ ++ aac \ ++ ac3 \ ++ h264 \ ++ mpegaudio \ ++ mpegvideo \ ++ mpeg4video \ ++ ++FFMPEG_PROTOCOLS:= \ ++ file http pipe rtp tcp udp ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_GST_FFMPEG_ENCODER_%,$(FFMPEG_ENCODERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_DECODER_%,$(FFMPEG_DECODERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_MUXER_%,$(FFMPEG_DEMUXERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_DEMUXER_%,$(FFMPEG_DEMUXERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_PARSER_%,$(FFMPEG_PARSERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_PROTOCOL_%,$(FFMPEG_PROTOCOLS)) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gst-ffmpeg ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=GStreamer ffmpeg bindings ++ URL:=http://www.gstreamer.net/modules/gst-ffmpeg.html ++ MAINTAINER:=Okkel Klaver ++ DEPENDS:= +libgstreamer +gst-mod-alsa +libbz2 +libgstaudio ++endef ++ ++define Package/gst-ffmpeg/description ++ GStreamer ffmpeg bindings ++endef ++ ++define Package/gst-ffmpeg/config ++source "$(SOURCE)/Config.in" ++endef ++ ++FILTER_CONFIG= \ ++ $(foreach c, $(3), \ ++ $(if $(CONFIG_GST_FFMPEG_$(1)_$(c)),--enable-$(2)='$(c)') \ ++ ) ++ ++FFMPEG_CONFIGURE_ENCODERS:=$(call FILTER_CONFIG,ENCODER,encoder,$(FFMPEG_ENCODERS)) ++FFMPEG_CONFIGURE_DECODERS:=$(call FILTER_CONFIG,DECODER,decoder,$(FFMPEG_DECODERS)) ++FFMPEG_CONFIGURE_MUXERS:=$(call FILTER_CONFIG,MUXER,muxer,$(FFMPEG_MUXERS)) ++FFMPEG_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(FFMPEG_DEMUXERS)) ++FFMPEG_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(FFMPEG_PARSERS)) ++FFMPEG_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(FFMPEG_PROTOCOLS)) ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --with-ffmpeg-extra-configure="--target-os=linux \ ++ --disable-bsfs \ ++ --disable-devices \ ++ --disable-encoders \ ++ $(FFMPEG_CONFIGURE_ENCODERS) \ ++ --disable-decoders \ ++ $(FFMPEG_CONFIGURE_DECODERS) \ ++ --disable-muxers \ ++ $(FFMPEG_CONFIGURE_MUXERS) \ ++ --disable-demuxers \ ++ $(FFMPEG_CONFIGURE_DEMUXERS) \ ++ --disable-parsers \ ++ $(FFMPEG_CONFIGURE_PARSERS) \ ++ --disable-protocols \ ++ $(FFMPEG_CONFIGURE_PROTOCOLS)" ++ ++# XXX: trick to force use of embedded FFmpeg headers ++TARGET_CFLAGS += $(TARGET_CPPFLAGS) ++TARGET_CPPFLAGS := ++ ++TARGET_LDFLAGS += $(FPIC) ++ ++define Build/Prepare ++$(call Build/Prepare/Default) ++endef ++ ++define Package/gst-ffmpeg/install ++ $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/gstreamer-$(GST_VERSION)/libgstffmpeg.so* \ ++ $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \ ++ ) ++endef ++ ++$(eval $(call BuildPackage,gst-ffmpeg)) +diff --git a/feeds/packages/multimedia/gst-ffmpeg/Config.in b/feeds/packages/multimedia/gst-ffmpeg/Config.in +new file mode 100644 +index 0000000..9f579c7 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-ffmpeg/Config.in +@@ -0,0 +1,269 @@ ++menu "Configuration" ++ depends PACKAGE_gst-ffmpeg ++ ++config GST_FFMPEG_IPV6 ++ bool "Enable IPv6" ++ default IPV6 ++ ++config GST_FFMPEG_PATENTED ++ bool "Include patented codecs and technologies" ++ default BUILD_PATENTED ++ ++config GET_FFMPEG_LIBDLNA_SUPPORT ++ bool "Include support for libdlna/ushare" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_DECODER_ac3 ++ select GST_FFMPEG_DECODER_atrac3 ++ select GST_FFMPEG_DECODER_h264 ++ select GST_FFMPEG_DECODER_jpegls ++ select GST_FFMPEG_DECODER_mp3 ++ select GST_FFMPEG_DECODER_mpeg1video ++ select GST_FFMPEG_DECODER_mpeg2video ++ select GST_FFMPEG_DECODER_mpeg4 ++ select GST_FFMPEG_DECODER_mpeg4aac ++ select GST_FFMPEG_DECODER_mpegvideo ++ select GST_FFMPEG_DECODER_wmav1 ++ select GST_FFMPEG_DECODER_wmav2 ++ select GST_FFMPEG_DECODER_png ++ select GST_FFMPEG_DEMUXER_ac3 ++ select GST_FFMPEG_DEMUXER_h264 ++ select GST_FFMPEG_DEMUXER_mp3 ++ select GST_FFMPEG_DEMUXER_mpegvideo ++ ++comment "Encoders ---" ++ ++config GST_FFMPEG_ENCODER_ac3 ++ bool "AC3" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_PARSER_ac3 ++ ++config GST_FFMPEG_ENCODER_jpegls ++ bool "JPEG-LS" ++ ++config GST_FFMPEG_ENCODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config GST_FFMPEG_ENCODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_ENCODER_mpeg4 ++ bool "MPEG-4" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_ENCODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config GST_FFMPEG_ENCODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config GST_FFMPEG_ENCODER_png ++ bool "PNG" ++ select GST_FFMPEG_ENCODER_zlib ++ ++config GST_FFMPEG_ENCODER_vorbis ++ bool "Vorbis" ++ ++config GST_FFMPEG_ENCODER_zlib ++ bool "Zlib" ++ ++comment "Decoders ---" ++ ++config GST_FFMPEG_DECODER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_PARSER_aac ++ ++config GST_FFMPEG_DECODER_ac3 ++ bool "AC3" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_PARSER_ac3 ++ ++config GST_FFMPEG_DECODER_atrac3 ++ bool "ATRAC3" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_gif ++ bool "GIF" ++ ++config GST_FFMPEG_DECODER_h264 ++ bool "H.264" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_jpegls ++ bool "JPEG-LS" ++ ++config GST_FFMPEG_DECODER_mp2 ++ bool "MP2 (MPEG Audio Layer 2)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mp3 ++ bool "MP3 (MPEG Audio Layer 2)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mpegvideo ++ bool "MPEG Video" ++ ++config GST_FFMPEG_DECODER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config GST_FFMPEG_DECODER_mpeg2video ++ bool "MPEG-2 Video" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mpeg4 ++ bool "MPEG-4" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_mpeg4aac ++ bool "MPEG-4 (AAC)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_pcm_s16be ++ bool "PCM signed 16-bit big-endian" ++ ++config GST_FFMPEG_DECODER_pcm_s16le ++ bool "PCM signed 16-bit little-endian" ++ ++config GST_FFMPEG_DECODER_png ++ bool "PNG" ++ select GST_FFMPEG_DECODER_zlib ++ ++config GST_FFMPEG_DECODER_vorbis ++ bool "Vorbis" ++ ++config GST_FFMPEG_DECODER_wmav1 ++ bool "WMAv1" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_wmav2 ++ bool "WMAv2" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_DECODER_zlib ++ bool "Zlib" ++ ++comment "Muxers ---" ++ ++config GST_FFMPEG_MUXER_ac3 ++ bool "AC3" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_MUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config GST_FFMPEG_MUXER_h264 ++ bool "H.264" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_MUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ ++config GST_FFMPEG_MUXER_mp4 ++ bool "MP4" ++ ++config GST_FFMPEG_MUXER_mpeg1video ++ bool "MPEG-1 Video" ++ ++config GST_FFMPEG_MUXER_mpeg2video ++ bool "MPEG-2 Video" ++ ++config GST_FFMPEG_MUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config GST_FFMPEG_MUXER_ogg ++ bool "Ogg" ++ ++config GST_FFMPEG_MUXER_oss ++ bool "OSS (Open Sound System playback)" ++ ++config GST_FFMPEG_MUXER_rtp ++ bool "RTP" ++ ++comment "Demuxers ---" ++ ++config GST_FFMPEG_DEMUXER_ac3 ++ bool "AC3" ++ ++config GST_FFMPEG_DEMUXER_ffm ++ bool "FFM (ffserver live feed)" ++ ++config GST_FFMPEG_DEMUXER_h264 ++ bool "H.264" ++ depends FFMPEG_PATENTED ++ ++config GST_FFMPEG_DEMUXER_mp3 ++ bool "MP3 (MPEG Audio Layer 3)" ++ ++config GST_FFMPEG_DEMUXER_mpegvideo ++ bool "MPEG Video" ++ ++config GST_FFMPEG_DEMUXER_mpegps ++ bool "MPEG-2 (PS)" ++ ++config GST_FFMPEG_DEMUXER_mpegts ++ bool "MPEG-2 (TS)" ++ ++config GST_FFMPEG_DEMUXER_ogg ++ bool "Ogg" ++ ++config GST_FFMPEG_DEMUXER_rm ++ bool "RM" ++ help ++ RealMedia format demuxer ++ ++config GST_FFMPEG_DEMUXER_rtsp ++ bool "RTSP" ++ select GST_FFMPEG_DEMUXER_rm ++ select GST_FFMPEG_DEMUXER_sdp ++ ++config GST_FFMPEG_DEMUXER_sdp ++ bool "SDP" ++ select GST_FFMPEG_DEMUXER_mpegts ++ ++comment "Parsers ---" ++ ++config GST_FFMPEG_PARSER_aac ++ bool "AAC (Advanced Audio Coding)" ++ depends GST_FFMPEG_PATENTED ++ ++config GST_FFMPEG_PARSER_ac3 ++ bool "AC3" ++ ++config GST_FFMPEG_PARSER_h264 ++ bool "H.264" ++ depends GST_FFMPEG_PATENTED ++ select GST_FFMPEG_DECODER_h264 ++ ++config GST_FFMPEG_PARSER_mpegaudio ++ bool "MPEG Audio" ++ ++config GST_FFMPEG_PARSER_mpegvideo ++ bool "MPEG Video" ++ ++config GST_FFMPEG_PARSER_mpeg4video ++ bool "MPEG-4 Video" ++ ++comment "Protocols ---" ++ ++config GST_FFMPEG_PROTOCOL_file ++ bool "file:" ++ ++config GST_FFMPEG_PROTOCOL_http ++ bool "http:" ++ ++config GST_FFMPEG_PROTOCOL_pipe ++ bool "pipe:" ++ ++config GST_FFMPEG_PROTOCOL_rtp ++ bool "rtp:" ++ select GST_FFMPEG_PROTOCOL_udp ++ ++config GST_FFMPEG_PROTOCOL_tcp ++ bool "tcp:" ++ ++config GST_FFMPEG_PROTOCOL_udp ++ bool "udp:" ++ ++endmenu ++ +diff --git a/feeds/packages/multimedia/gst-ffmpeg/Makefile b/feeds/packages/multimedia/gst-ffmpeg/Makefile +new file mode 100644 +index 0000000..24aea0c +--- /dev/null ++++ b/feeds/packages/multimedia/gst-ffmpeg/Makefile +@@ -0,0 +1,170 @@ ++# ++# 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:=gst-ffmpeg ++PKG_RELEASE:=1 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-ffmpeg ++PKG_VERSION:=0.10.11 ++PKG_MD5SUM:=0d23197ba7ac06ea34fa66d38469ebe5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++FFMPEG_ENCODERS:= \ ++ ac3 \ ++ jpegls \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ zlib \ ++ ++FFMPEG_DECODERS:= \ ++ aac \ ++ ac3 \ ++ atrac3 \ ++ gif \ ++ h264 \ ++ jpegls \ ++ mp2 \ ++ mp3 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpeg4 \ ++ mpeg4aac \ ++ mpegvideo \ ++ pcm_s16be \ ++ pcm_s16le \ ++ png \ ++ vorbis \ ++ wmav1 \ ++ wmav2 \ ++ zlib \ ++ ++FFMPEG_MUXERS:= \ ++ ac3 \ ++ ffm \ ++ h264 \ ++ mp3 \ ++ mp4 \ ++ mpeg1video \ ++ mpeg2video \ ++ mpegts \ ++ ogg \ ++ oss \ ++ rtp \ ++ ++FFMPEG_DEMUXERS:= \ ++ ac3 \ ++ ffm \ ++ h264 \ ++ mp3 \ ++ mpegps \ ++ mpegts \ ++ mpegvideo \ ++ ogg \ ++ rm \ ++ rtsp \ ++ sdp \ ++ v4l2 \ ++ ++FFMPEG_PARSERS:= \ ++ aac \ ++ ac3 \ ++ h264 \ ++ mpegaudio \ ++ mpegvideo \ ++ mpeg4video \ ++ ++FFMPEG_PROTOCOLS:= \ ++ file http pipe rtp tcp udp ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_GST_FFMPEG_ENCODER_%,$(FFMPEG_ENCODERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_DECODER_%,$(FFMPEG_DECODERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_MUXER_%,$(FFMPEG_DEMUXERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_DEMUXER_%,$(FFMPEG_DEMUXERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_PARSER_%,$(FFMPEG_PARSERS)) \ ++ $(patsubst %,CONFIG_GST_FFMPEG_PROTOCOL_%,$(FFMPEG_PROTOCOLS)) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gst-ffmpeg ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=GStreamer ffmpeg bindings ++ URL:=http://www.gstreamer.net/modules/gst-ffmpeg.html ++ MAINTAINER:=Okkel Klaver ++ DEPENDS:= +libgstreamer +gst-mod-alsa +libbz2 +libgstaudio ++endef ++ ++define Package/gst-ffmpeg/description ++ GStreamer ffmpeg bindings ++endef ++ ++define Package/gst-ffmpeg/config ++source "$(SOURCE)/Config.in" ++endef ++ ++FILTER_CONFIG= \ ++ $(foreach c, $(3), \ ++ $(if $(CONFIG_GST_FFMPEG_$(1)_$(c)),--enable-$(2)='$(c)') \ ++ ) ++ ++FFMPEG_CONFIGURE_ENCODERS:=$(call FILTER_CONFIG,ENCODER,encoder,$(FFMPEG_ENCODERS)) ++FFMPEG_CONFIGURE_DECODERS:=$(call FILTER_CONFIG,DECODER,decoder,$(FFMPEG_DECODERS)) ++FFMPEG_CONFIGURE_MUXERS:=$(call FILTER_CONFIG,MUXER,muxer,$(FFMPEG_MUXERS)) ++FFMPEG_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(FFMPEG_DEMUXERS)) ++FFMPEG_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(FFMPEG_PARSERS)) ++FFMPEG_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(FFMPEG_PROTOCOLS)) ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --with-ffmpeg-extra-configure="--target-os=linux \ ++ --disable-bsfs \ ++ --disable-devices \ ++ --disable-encoders \ ++ $(FFMPEG_CONFIGURE_ENCODERS) \ ++ --disable-decoders \ ++ $(FFMPEG_CONFIGURE_DECODERS) \ ++ --disable-muxers \ ++ $(FFMPEG_CONFIGURE_MUXERS) \ ++ --disable-demuxers \ ++ $(FFMPEG_CONFIGURE_DEMUXERS) \ ++ --disable-parsers \ ++ $(FFMPEG_CONFIGURE_PARSERS) \ ++ --disable-protocols \ ++ $(FFMPEG_CONFIGURE_PROTOCOLS)" ++ ++# XXX: trick to force use of embedded FFmpeg headers ++TARGET_CFLAGS += $(TARGET_CPPFLAGS) ++TARGET_CPPFLAGS := ++ ++TARGET_LDFLAGS += $(FPIC) ++ ++define Build/Prepare ++$(call Build/Prepare/Default) ++endef ++ ++define Package/gst-ffmpeg/install ++ $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/lib/gstreamer-$(GST_VERSION)/libgstffmpeg.so* \ ++ $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \ ++ ) ++endef ++ ++$(eval $(call BuildPackage,gst-ffmpeg)) +diff --git a/feeds/packages/multimedia/gst-plugins-bad/.svn/entries b/feeds/packages/multimedia/gst-plugins-bad/.svn/entries +new file mode 100644 +index 0000000..66f7931 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-bad/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-bad ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:30:28.393452Z ++35225 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d05daecd48166b9a467000d1dbba2c89 ++2013-01-18T13:30:28.393452Z ++35225 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7460 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-bad/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gst-plugins-bad/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f7214b8 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-bad/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,245 @@ ++# ++# 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:=gst-plugins-bad ++PKG_VERSION:=0.10.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ ++PKG_MD5SUM:=e4822fa2cc933768e2998311a1565979 ++ ++PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-bad ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (bad) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-bad/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other plugins from ++ the bad plugins collection. ++endef ++ ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ --disable-nls \ ++ \ ++ --disable-directsound \ ++ --disable-directdraw \ ++ --disable-osx_video \ ++ --disable-quicktime \ ++ --disable-vcd \ ++ --disable-alsa \ ++ --disable-assrender \ ++ --disable-amrwb \ ++ --disable-apexsink \ ++ --disable-bz2 \ ++ --disable-cdaudio \ ++ --disable-celt \ ++ --disable-cog \ ++ --disable-dc1394 \ ++ --disable-directfb \ ++ --disable-dirac \ ++ --disable-dts \ ++ --disable-divx \ ++ --disable-resindvd \ ++ --disable-metadata \ ++ --disable-faac \ ++ --disable-fbdev \ ++ --disable-flite \ ++ --disable-gsm \ ++ --disable-jack \ ++ --disable-jp2k \ ++ --disable-kate \ ++ --disable-ladspa \ ++ --disable-lv2 \ ++ --disable-modplug \ ++ --disable-mimic \ ++ --disable-mpeg2enc \ ++ --disable-mplex \ ++ --disable-musepack \ ++ --disable-musicbrainz \ ++ --disable-mythtv \ ++ --disable-nas \ ++ --disable-neon \ ++ --disable-ofa \ ++ --disable-rsvg \ ++ --disable-timidity \ ++ --disable-wildmidi \ ++ --disable-sdl \ ++ --disable-sdltest \ ++ --disable-sndfile \ ++ --disable-soundtouch \ ++ --disable-spc \ ++ --disable-gme \ ++ --disable-swfdec \ ++ --disable-theoradec \ ++ --disable-xvid \ ++ --disable-dvb \ ++ --disable-wininet \ ++ --disable-acm \ ++ --disable-vdpau \ ++ --disable-schro \ ++ --disable-zbar \ ++ --disable-vp8 \ ++ --disable-librfb \ ++ \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ --without-x \ ++ ++EXTRA_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ ++ ++define Package/gst-plugins-ugly/install ++ /bin/true ++endef ++ ++# 1: short name ++# 2: description ++# 3: dependencies on other gstreamer libraries (short name) ++# 4: dependencies on other packages ++define GstBuildLibrary ++ ++ GST_DEPENDS += +libgst$(1) ++ ++ define Package/libgst$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) library (base) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4) ++ endef ++ ++ define Package/libgst$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) library. ++ endef ++ ++ define Package/libgst$(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,libgst$(1))) ++endef ++$(eval $(call GstBuildLibrary,photography,photography,,)) ++ ++ ++# 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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (bad) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,,,)) ++$(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,,,)) ++$(eval $(call GstBuildPlugin,aiff,aiff support,tag,,)) ++$(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,)) ++$(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,)) ++$(eval $(call GstBuildPlugin,camerabin,camerabin support,interfaces photography tag,,)) ++$(eval $(call GstBuildPlugin,legacyresample,legacyresample support,,,+liboil +librt)) ++$(eval $(call GstBuildPlugin,bayer,bayer support,video,,)) ++$(eval $(call GstBuildPlugin,cdxaparse,cdxaparse support,riff,,)) ++$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,)) ++$(eval $(call GstBuildPlugin,dccp,dccp support,,,)) ++$(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,interfaces video,,)) ++$(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,)) ++$(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,)) ++$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2)) ++$(eval $(call GstBuildPlugin,festival,festival support,audio,,)) ++$(eval $(call GstBuildPlugin,freeze,freeze support,,,)) ++$(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,)) ++$(eval $(call GstBuildPlugin,h264parse,h264parse support,,,)) ++$(eval $(call GstBuildPlugin,hdvparse,hdvparse support,,,)) ++$(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,)) ++$(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag interfaces,,)) ++$(eval $(call GstBuildPlugin,liveadder,liveadder support,audio,,)) ++$(eval $(call GstBuildPlugin,mpegdemux,mpegdemux support,tag,,+liboil +librt)) ++$(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,video,,)) ++$(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,)) ++$(eval $(call GstBuildPlugin,mpegvideoparse,mpegvideoparse support,,,)) ++$(eval $(call GstBuildPlugin,mve,mve support,,,)) ++$(eval $(call GstBuildPlugin,mxf,mxf support,video,,)) ++$(eval $(call GstBuildPlugin,nsf,nsf support,,,)) ++$(eval $(call GstBuildPlugin,nuvdemux,nuvdemux support,,,)) ++$(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,)) ++$(eval $(call GstBuildPlugin,pnm,pnm support,video,,)) ++$(eval $(call GstBuildPlugin,rawparse,rawparse support,video audio,,)) ++$(eval $(call GstBuildPlugin,rtpmux,rtpmux support,rtp,,)) ++#$(eval $(call GstBuildPlugin,rfbsrc,rfb support,,,)) ++$(eval $(call GstBuildPlugin,scaletempoplugin,scaletempo support,,,)) ++$(eval $(call GstBuildPlugin,sdpelem,sdp support,interfaces rtp sdp,,)) ++$(eval $(call GstBuildPlugin,segmentclip,segmentclip support,audio,,)) ++$(eval $(call GstBuildPlugin,siren,siren support,rtp,,)) ++#$(eval $(call GstBuildPlugin,soundtouch,soundtouch support,,,)) ++$(eval $(call GstBuildPlugin,speed,speed support,,,)) ++$(eval $(call GstBuildPlugin,subenc,subenc support,controller,,)) ++$(eval $(call GstBuildPlugin,stereo,stereo support,audio controller,,)) ++$(eval $(call GstBuildPlugin,tta,tta support,,,)) ++$(eval $(call GstBuildPlugin,videomeasure,videomeasure support,video,,)) ++$(eval $(call GstBuildPlugin,videosignal,videosignal support,video,,)) ++$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,)) ++$(eval $(call GstBuildPlugin,mms,mms support,,,+libmms)) ++ ++$(eval $(call BuildPackage,gst-plugins-bad)) +diff --git a/feeds/packages/multimedia/gst-plugins-bad/Makefile b/feeds/packages/multimedia/gst-plugins-bad/Makefile +new file mode 100644 +index 0000000..f7214b8 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-bad/Makefile +@@ -0,0 +1,245 @@ ++# ++# 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:=gst-plugins-bad ++PKG_VERSION:=0.10.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ ++PKG_MD5SUM:=e4822fa2cc933768e2998311a1565979 ++ ++PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-bad ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (bad) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-bad/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other plugins from ++ the bad plugins collection. ++endef ++ ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ --disable-nls \ ++ \ ++ --disable-directsound \ ++ --disable-directdraw \ ++ --disable-osx_video \ ++ --disable-quicktime \ ++ --disable-vcd \ ++ --disable-alsa \ ++ --disable-assrender \ ++ --disable-amrwb \ ++ --disable-apexsink \ ++ --disable-bz2 \ ++ --disable-cdaudio \ ++ --disable-celt \ ++ --disable-cog \ ++ --disable-dc1394 \ ++ --disable-directfb \ ++ --disable-dirac \ ++ --disable-dts \ ++ --disable-divx \ ++ --disable-resindvd \ ++ --disable-metadata \ ++ --disable-faac \ ++ --disable-fbdev \ ++ --disable-flite \ ++ --disable-gsm \ ++ --disable-jack \ ++ --disable-jp2k \ ++ --disable-kate \ ++ --disable-ladspa \ ++ --disable-lv2 \ ++ --disable-modplug \ ++ --disable-mimic \ ++ --disable-mpeg2enc \ ++ --disable-mplex \ ++ --disable-musepack \ ++ --disable-musicbrainz \ ++ --disable-mythtv \ ++ --disable-nas \ ++ --disable-neon \ ++ --disable-ofa \ ++ --disable-rsvg \ ++ --disable-timidity \ ++ --disable-wildmidi \ ++ --disable-sdl \ ++ --disable-sdltest \ ++ --disable-sndfile \ ++ --disable-soundtouch \ ++ --disable-spc \ ++ --disable-gme \ ++ --disable-swfdec \ ++ --disable-theoradec \ ++ --disable-xvid \ ++ --disable-dvb \ ++ --disable-wininet \ ++ --disable-acm \ ++ --disable-vdpau \ ++ --disable-schro \ ++ --disable-zbar \ ++ --disable-vp8 \ ++ --disable-librfb \ ++ \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ --without-x \ ++ ++EXTRA_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ ++ ++define Package/gst-plugins-ugly/install ++ /bin/true ++endef ++ ++# 1: short name ++# 2: description ++# 3: dependencies on other gstreamer libraries (short name) ++# 4: dependencies on other packages ++define GstBuildLibrary ++ ++ GST_DEPENDS += +libgst$(1) ++ ++ define Package/libgst$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) library (base) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4) ++ endef ++ ++ define Package/libgst$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) library. ++ endef ++ ++ define Package/libgst$(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,libgst$(1))) ++endef ++$(eval $(call GstBuildLibrary,photography,photography,,)) ++ ++ ++# 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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (bad) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,,,)) ++$(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,,,)) ++$(eval $(call GstBuildPlugin,aiff,aiff support,tag,,)) ++$(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,)) ++$(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,)) ++$(eval $(call GstBuildPlugin,camerabin,camerabin support,interfaces photography tag,,)) ++$(eval $(call GstBuildPlugin,legacyresample,legacyresample support,,,+liboil +librt)) ++$(eval $(call GstBuildPlugin,bayer,bayer support,video,,)) ++$(eval $(call GstBuildPlugin,cdxaparse,cdxaparse support,riff,,)) ++$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,)) ++$(eval $(call GstBuildPlugin,dccp,dccp support,,,)) ++$(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,interfaces video,,)) ++$(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,)) ++$(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,)) ++$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2)) ++$(eval $(call GstBuildPlugin,festival,festival support,audio,,)) ++$(eval $(call GstBuildPlugin,freeze,freeze support,,,)) ++$(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,)) ++$(eval $(call GstBuildPlugin,h264parse,h264parse support,,,)) ++$(eval $(call GstBuildPlugin,hdvparse,hdvparse support,,,)) ++$(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,)) ++$(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag interfaces,,)) ++$(eval $(call GstBuildPlugin,liveadder,liveadder support,audio,,)) ++$(eval $(call GstBuildPlugin,mpegdemux,mpegdemux support,tag,,+liboil +librt)) ++$(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,video,,)) ++$(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,)) ++$(eval $(call GstBuildPlugin,mpegvideoparse,mpegvideoparse support,,,)) ++$(eval $(call GstBuildPlugin,mve,mve support,,,)) ++$(eval $(call GstBuildPlugin,mxf,mxf support,video,,)) ++$(eval $(call GstBuildPlugin,nsf,nsf support,,,)) ++$(eval $(call GstBuildPlugin,nuvdemux,nuvdemux support,,,)) ++$(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,)) ++$(eval $(call GstBuildPlugin,pnm,pnm support,video,,)) ++$(eval $(call GstBuildPlugin,rawparse,rawparse support,video audio,,)) ++$(eval $(call GstBuildPlugin,rtpmux,rtpmux support,rtp,,)) ++#$(eval $(call GstBuildPlugin,rfbsrc,rfb support,,,)) ++$(eval $(call GstBuildPlugin,scaletempoplugin,scaletempo support,,,)) ++$(eval $(call GstBuildPlugin,sdpelem,sdp support,interfaces rtp sdp,,)) ++$(eval $(call GstBuildPlugin,segmentclip,segmentclip support,audio,,)) ++$(eval $(call GstBuildPlugin,siren,siren support,rtp,,)) ++#$(eval $(call GstBuildPlugin,soundtouch,soundtouch support,,,)) ++$(eval $(call GstBuildPlugin,speed,speed support,,,)) ++$(eval $(call GstBuildPlugin,subenc,subenc support,controller,,)) ++$(eval $(call GstBuildPlugin,stereo,stereo support,audio controller,,)) ++$(eval $(call GstBuildPlugin,tta,tta support,,,)) ++$(eval $(call GstBuildPlugin,videomeasure,videomeasure support,video,,)) ++$(eval $(call GstBuildPlugin,videosignal,videosignal support,video,,)) ++$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,)) ++$(eval $(call GstBuildPlugin,mms,mms support,,,+libmms)) ++ ++$(eval $(call BuildPackage,gst-plugins-bad)) +diff --git a/feeds/packages/multimedia/gst-plugins-bad/patches/.svn/entries b/feeds/packages/multimedia/gst-plugins-bad/patches/.svn/entries +new file mode 100644 +index 0000000..9a65ce0 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-bad/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-bad/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-11T21:52:44.420394Z ++26046 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-gettext.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++1b03f7e53b7c5fe0f4c0c5014579be69 ++2011-03-11T21:52:44.420394Z ++26046 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++827 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-bad/patches/.svn/text-base/000-gettext.patch.svn-base b/feeds/packages/multimedia/gst-plugins-bad/patches/.svn/text-base/000-gettext.patch.svn-base +new file mode 100644 +index 0000000..b2c2d19 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-bad/patches/.svn/text-base/000-gettext.patch.svn-base +@@ -0,0 +1,23 @@ ++diff -ur gst-plugins-bad-0.10.19.orig/configure.ac gst-plugins-bad-0.10.19/configure.ac ++--- gst-plugins-bad-0.10.19.orig/configure.ac 2011-01-07 01:44:21.000000000 +0100 +++++ gst-plugins-bad-0.10.19/configure.ac 2011-01-07 01:45:31.000000000 +0100 ++@@ -1772,7 +1772,6 @@ ++ ext/vp8/Makefile ++ ext/xvid/Makefile ++ ext/zbar/Makefile ++-po/Makefile.in ++ docs/Makefile ++ docs/plugins/Makefile ++ docs/version.entities ++diff -ur gst-plugins-bad-0.10.19.orig/Makefile.am gst-plugins-bad-0.10.19/Makefile.am ++--- gst-plugins-bad-0.10.19.orig/Makefile.am 2011-01-07 01:44:21.000000000 +0100 +++++ gst-plugins-bad-0.10.19/Makefile.am 2011-01-07 01:46:17.000000000 +0100 ++@@ -2,7 +2,7 @@ ++ ++ SUBDIRS = \ ++ gst-libs gst sys ext pkgconfig \ ++- m4 common docs tests po tools +++ m4 common docs tests tools ++ ++ DIST_SUBDIRS = \ ++ gst gst-libs sys ext pkgconfig \ +diff --git a/feeds/packages/multimedia/gst-plugins-bad/patches/000-gettext.patch b/feeds/packages/multimedia/gst-plugins-bad/patches/000-gettext.patch +new file mode 100644 +index 0000000..b2c2d19 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-bad/patches/000-gettext.patch +@@ -0,0 +1,23 @@ ++diff -ur gst-plugins-bad-0.10.19.orig/configure.ac gst-plugins-bad-0.10.19/configure.ac ++--- gst-plugins-bad-0.10.19.orig/configure.ac 2011-01-07 01:44:21.000000000 +0100 +++++ gst-plugins-bad-0.10.19/configure.ac 2011-01-07 01:45:31.000000000 +0100 ++@@ -1772,7 +1772,6 @@ ++ ext/vp8/Makefile ++ ext/xvid/Makefile ++ ext/zbar/Makefile ++-po/Makefile.in ++ docs/Makefile ++ docs/plugins/Makefile ++ docs/version.entities ++diff -ur gst-plugins-bad-0.10.19.orig/Makefile.am gst-plugins-bad-0.10.19/Makefile.am ++--- gst-plugins-bad-0.10.19.orig/Makefile.am 2011-01-07 01:44:21.000000000 +0100 +++++ gst-plugins-bad-0.10.19/Makefile.am 2011-01-07 01:46:17.000000000 +0100 ++@@ -2,7 +2,7 @@ ++ ++ SUBDIRS = \ ++ gst-libs gst sys ext pkgconfig \ ++- m4 common docs tests po tools +++ m4 common docs tests tools ++ ++ DIST_SUBDIRS = \ ++ gst gst-libs sys ext pkgconfig \ +diff --git a/feeds/packages/multimedia/gst-plugins-base/.svn/entries b/feeds/packages/multimedia/gst-plugins-base/.svn/entries +new file mode 100644 +index 0000000..23b6c9c +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-base ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:22:57.968929Z ++35224 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++05bd04ddbac042badc855e9176213081 ++2013-01-18T13:22:57.968929Z ++35224 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7029 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-base/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/gst-plugins-base/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gst-plugins-base/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gst-plugins-base/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9c16586 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,241 @@ ++# ++# 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:=gst-plugins-base ++PKG_VERSION:=0.10.36 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/ ++PKG_MD5SUM:=776c73883e567f67b9c4a2847d8d041a ++ ++PKG_BUILD_DEPENDS:= gstreamer liboil ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_PACKAGE_gst-mod-alsa \ ++ CONFIG_PACKAGE_gst-mod-app \ ++ CONFIG_PACKAGE_gst-mod-audioconvert \ ++ CONFIG_PACKAGE_gst-mod-audiorate \ ++ CONFIG_PACKAGE_gst-mod-audioresample \ ++ CONFIG_PACKAGE_gst-mod-audiotestsrc \ ++ CONFIG_PACKAGE_gst-mod-gio \ ++ CONFIG_PACKAGE_gst-mod-ogg \ ++ CONFIG_PACKAGE_gst-mod-tcp \ ++ CONFIG_PACKAGE_gst-mod-theora \ ++ CONFIG_PACKAGE_gst-mod-videotestsrc \ ++ CONFIG_PACKAGE_gst-mod-volume \ ++ CONFIG_PACKAGE_gst-mod-vorbis \ ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++# -liconv crept in from pkg-config, to be revisited later ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-base ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (base) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-base/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other libraries and ++ plugins from the base plugins collection. ++endef ++ ++ ++GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1)) ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ \ ++ $(call GST_COND_SELECT,alsa) \ ++ --disable-alsa-test \ ++ $(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-ffmpegcolorspace \ ++ --disable-freetypetest \ ++ $(call GST_COND_SELECT,gio) \ ++ --disable-gnome_vfs \ ++ --disable-gst_v4l \ ++ --disable-libvisual \ ++ $(call GST_COND_SELECT,ogg) \ ++ --disable-oggtest \ ++ --disable-pango \ ++ --disable-subparse \ ++ $(call GST_COND_SELECT,tcp) \ ++ $(call GST_COND_SELECT,theora) \ ++ --disable-videorate \ ++ --disable-videoscale \ ++ $(call GST_COND_SELECT,videotestsrc) \ ++ $(call GST_COND_SELECT,volume) \ ++ $(call GST_COND_SELECT,vorbis) \ ++ --disable-vorbistest \ ++ --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 \ ++ ++ ++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/ \ ++ ) ++endef ++ ++ ++define Package/gst-plugins-base/install ++ /bin/true ++endef ++ ++ ++# 1: short name ++# 2: description ++# 3: dependencies on other gstreamer libraries (short name) ++# 4: dependencies on other packages ++define GstBuildLibrary ++ ++ GST_DEPENDS += +libgst$(1) ++ ++ define Package/libgst$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) library (base) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4) ++ endef ++ ++ define Package/libgst$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) library. ++ endef ++ ++ define Package/libgst$(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,libgst$(1))) ++endef ++ ++$(eval $(call GstBuildLibrary,app,app,,)) ++$(eval $(call GstBuildLibrary,audio,audio,interfaces pbutils,)) ++$(eval $(call GstBuildLibrary,cdda,CDDA,tag,)) ++$(eval $(call GstBuildLibrary,fft,FFT,,)) ++$(eval $(call GstBuildLibrary,interfaces,interfaces,)) ++$(eval $(call GstBuildLibrary,netbuffer,network buffer,,)) ++$(eval $(call GstBuildLibrary,pbutils,utils,,)) ++$(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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (base) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,alsa,ALSA,audio,,+alsa-lib)) ++$(eval $(call GstBuildPlugin,app,app,app,,)) ++$(eval $(call GstBuildPlugin,audioconvert,audio format conversion,audio,,)) ++$(eval $(call GstBuildPlugin,audiorate,audio rate adjusting,,,)) ++$(eval $(call GstBuildPlugin,audioresample,audio resampling,,,)) ++$(eval $(call GstBuildPlugin,audiotestsrc,audio test,controller,,)) ++$(eval $(call GstBuildPlugin,decodebin,media decoder,pbutils,,)) ++$(eval $(call GstBuildPlugin,decodebin2,media decoder (v2),pbutils,,)) ++$(eval $(call GstBuildPlugin,gio,GIO,,,)) ++$(eval $(call GstBuildPlugin,ogg,Ogg,riff tag,,+libogg)) ++$(eval $(call GstBuildPlugin,playbin,playback,video interfaces pbutils,,)) ++$(eval $(call GstBuildPlugin,tcp,TCP,dataprotocol,,)) ++$(eval $(call GstBuildPlugin,theora,Theora,video tag,ogg,+libtheora)) ++$(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,pbutils,,)) ++$(eval $(call GstBuildPlugin,videotestsrc,video test,,,+liboil)) ++$(eval $(call GstBuildPlugin,volume,volume,audio controller,,+liboil)) ++$(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis)) ++ ++$(eval $(call BuildPackage,gst-plugins-base)) +diff --git a/feeds/packages/multimedia/gst-plugins-base/Makefile b/feeds/packages/multimedia/gst-plugins-base/Makefile +new file mode 100644 +index 0000000..9c16586 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/Makefile +@@ -0,0 +1,241 @@ ++# ++# 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:=gst-plugins-base ++PKG_VERSION:=0.10.36 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/ ++PKG_MD5SUM:=776c73883e567f67b9c4a2847d8d041a ++ ++PKG_BUILD_DEPENDS:= gstreamer liboil ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_PACKAGE_gst-mod-alsa \ ++ CONFIG_PACKAGE_gst-mod-app \ ++ CONFIG_PACKAGE_gst-mod-audioconvert \ ++ CONFIG_PACKAGE_gst-mod-audiorate \ ++ CONFIG_PACKAGE_gst-mod-audioresample \ ++ CONFIG_PACKAGE_gst-mod-audiotestsrc \ ++ CONFIG_PACKAGE_gst-mod-gio \ ++ CONFIG_PACKAGE_gst-mod-ogg \ ++ CONFIG_PACKAGE_gst-mod-tcp \ ++ CONFIG_PACKAGE_gst-mod-theora \ ++ CONFIG_PACKAGE_gst-mod-videotestsrc \ ++ CONFIG_PACKAGE_gst-mod-volume \ ++ CONFIG_PACKAGE_gst-mod-vorbis \ ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++# -liconv crept in from pkg-config, to be revisited later ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-base ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (base) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-base/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other libraries and ++ plugins from the base plugins collection. ++endef ++ ++ ++GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1)) ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ \ ++ $(call GST_COND_SELECT,alsa) \ ++ --disable-alsa-test \ ++ $(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-ffmpegcolorspace \ ++ --disable-freetypetest \ ++ $(call GST_COND_SELECT,gio) \ ++ --disable-gnome_vfs \ ++ --disable-gst_v4l \ ++ --disable-libvisual \ ++ $(call GST_COND_SELECT,ogg) \ ++ --disable-oggtest \ ++ --disable-pango \ ++ --disable-subparse \ ++ $(call GST_COND_SELECT,tcp) \ ++ $(call GST_COND_SELECT,theora) \ ++ --disable-videorate \ ++ --disable-videoscale \ ++ $(call GST_COND_SELECT,videotestsrc) \ ++ $(call GST_COND_SELECT,volume) \ ++ $(call GST_COND_SELECT,vorbis) \ ++ --disable-vorbistest \ ++ --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 \ ++ ++ ++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/ \ ++ ) ++endef ++ ++ ++define Package/gst-plugins-base/install ++ /bin/true ++endef ++ ++ ++# 1: short name ++# 2: description ++# 3: dependencies on other gstreamer libraries (short name) ++# 4: dependencies on other packages ++define GstBuildLibrary ++ ++ GST_DEPENDS += +libgst$(1) ++ ++ define Package/libgst$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) library (base) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4) ++ endef ++ ++ define Package/libgst$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) library. ++ endef ++ ++ define Package/libgst$(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,libgst$(1))) ++endef ++ ++$(eval $(call GstBuildLibrary,app,app,,)) ++$(eval $(call GstBuildLibrary,audio,audio,interfaces pbutils,)) ++$(eval $(call GstBuildLibrary,cdda,CDDA,tag,)) ++$(eval $(call GstBuildLibrary,fft,FFT,,)) ++$(eval $(call GstBuildLibrary,interfaces,interfaces,)) ++$(eval $(call GstBuildLibrary,netbuffer,network buffer,,)) ++$(eval $(call GstBuildLibrary,pbutils,utils,,)) ++$(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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (base) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,alsa,ALSA,audio,,+alsa-lib)) ++$(eval $(call GstBuildPlugin,app,app,app,,)) ++$(eval $(call GstBuildPlugin,audioconvert,audio format conversion,audio,,)) ++$(eval $(call GstBuildPlugin,audiorate,audio rate adjusting,,,)) ++$(eval $(call GstBuildPlugin,audioresample,audio resampling,,,)) ++$(eval $(call GstBuildPlugin,audiotestsrc,audio test,controller,,)) ++$(eval $(call GstBuildPlugin,decodebin,media decoder,pbutils,,)) ++$(eval $(call GstBuildPlugin,decodebin2,media decoder (v2),pbutils,,)) ++$(eval $(call GstBuildPlugin,gio,GIO,,,)) ++$(eval $(call GstBuildPlugin,ogg,Ogg,riff tag,,+libogg)) ++$(eval $(call GstBuildPlugin,playbin,playback,video interfaces pbutils,,)) ++$(eval $(call GstBuildPlugin,tcp,TCP,dataprotocol,,)) ++$(eval $(call GstBuildPlugin,theora,Theora,video tag,ogg,+libtheora)) ++$(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,pbutils,,)) ++$(eval $(call GstBuildPlugin,videotestsrc,video test,,,+liboil)) ++$(eval $(call GstBuildPlugin,volume,volume,audio controller,,+liboil)) ++$(eval $(call GstBuildPlugin,vorbis,Vorbis,audio tag,ogg,+libvorbis)) ++ ++$(eval $(call BuildPackage,gst-plugins-base)) +diff --git a/feeds/packages/multimedia/gst-plugins-base/patches/.svn/entries b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/entries +new file mode 100644 +index 0000000..32b34ba +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-base/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T03:11:28.058728Z ++24580 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++5ccaa8d108557208501a1cd4d4078f7d ++2010-07-05T01:47:30.692041Z ++22068 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++512 ++ ++002-no_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++8615c9958117a041644cae64751b5a34 ++2010-07-05T01:47:30.692041Z ++22068 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++580 ++ ++003-no_translations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++fe828e47c3d90c7d3af42f4be29b4547 ++2010-12-15T03:11:28.058728Z ++24580 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++747 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/001-no_docs.patch.svn-base b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/001-no_docs.patch.svn-base +new file mode 100644 +index 0000000..a2ca92e +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/001-no_docs.patch.svn-base +@@ -0,0 +1,34 @@ ++--- 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 ++@@ -446,14 +446,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/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/002-no_tests.patch.svn-base b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/002-no_tests.patch.svn-base +new file mode 100644 +index 0000000..c92135f +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/002-no_tests.patch.svn-base +@@ -0,0 +1,36 @@ ++--- 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 ++@@ -445,7 +445,6 @@ SUBDIRS = \ ++ gst-libs \ ++ gst sys $(SUBDIRS_EXT) \ ++ tools \ ++- tests \ ++ po \ ++ common \ ++ m4 ++@@ -455,7 +454,6 @@ DIST_SUBDIRS = \ ++ gst-libs \ ++ gst sys ext \ ++ tools \ ++- tests \ ++ po \ ++ common \ ++ m4 +diff --git a/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/003-no_translations.patch.svn-base b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/003-no_translations.patch.svn-base +new file mode 100644 +index 0000000..8654f8b +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/.svn/text-base/003-no_translations.patch.svn-base +@@ -0,0 +1,46 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -956,7 +956,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 ++@@ -445,7 +445,6 @@ SUBDIRS = \ ++ gst-libs \ ++ gst sys $(SUBDIRS_EXT) \ ++ tools \ ++- po \ ++ common \ ++ m4 ++ ++@@ -454,7 +453,6 @@ DIST_SUBDIRS = \ ++ gst-libs \ ++ gst sys ext \ ++ tools \ ++- po \ ++ common \ ++ m4 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-base/patches/001-no_docs.patch b/feeds/packages/multimedia/gst-plugins-base/patches/001-no_docs.patch +new file mode 100644 +index 0000000..a2ca92e +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/001-no_docs.patch +@@ -0,0 +1,34 @@ ++--- 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 ++@@ -446,14 +446,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/feeds/packages/multimedia/gst-plugins-base/patches/002-no_tests.patch b/feeds/packages/multimedia/gst-plugins-base/patches/002-no_tests.patch +new file mode 100644 +index 0000000..c92135f +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/002-no_tests.patch +@@ -0,0 +1,36 @@ ++--- 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 ++@@ -445,7 +445,6 @@ SUBDIRS = \ ++ gst-libs \ ++ gst sys $(SUBDIRS_EXT) \ ++ tools \ ++- tests \ ++ po \ ++ common \ ++ m4 ++@@ -455,7 +454,6 @@ DIST_SUBDIRS = \ ++ gst-libs \ ++ gst sys ext \ ++ tools \ ++- tests \ ++ po \ ++ common \ ++ m4 +diff --git a/feeds/packages/multimedia/gst-plugins-base/patches/003-no_translations.patch b/feeds/packages/multimedia/gst-plugins-base/patches/003-no_translations.patch +new file mode 100644 +index 0000000..8654f8b +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-base/patches/003-no_translations.patch +@@ -0,0 +1,46 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -956,7 +956,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 ++@@ -445,7 +445,6 @@ SUBDIRS = \ ++ gst-libs \ ++ gst sys $(SUBDIRS_EXT) \ ++ tools \ ++- po \ ++ common \ ++ m4 ++ ++@@ -454,7 +453,6 @@ DIST_SUBDIRS = \ ++ gst-libs \ ++ gst sys ext \ ++ tools \ ++- po \ ++ common \ ++ m4 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-good/.svn/entries b/feeds/packages/multimedia/gst-plugins-good/.svn/entries +new file mode 100644 +index 0000000..6c0c79a +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-good ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:30:28.393452Z ++35225 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++6f730bc7c29fb561a8c391173e6b1795 ++2013-01-18T13:30:28.393452Z ++35225 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4836 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-good/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/gst-plugins-good/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gst-plugins-good/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gst-plugins-good/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cab463f +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,175 @@ ++# ++# 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:=gst-plugins-good ++PKG_VERSION:=0.10.31 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/ ++PKG_MD5SUM:= ++ ++PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-good ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (good) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-good/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other plugins from ++ the good plugins collection. ++endef ++ ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ \ ++ --disable-aalib \ ++ --disable-alpha \ ++ --disable-annodex \ ++ --disable-apetag \ ++ --disable-auparse \ ++ --disable-avi \ ++ --disable-bz2 \ ++ --disable-cairo \ ++ --disable-directsound \ ++ --disable-dv1394 \ ++ --disable-effectv \ ++ --disable-esd \ ++ --disable-flv \ ++ --disable-flx \ ++ --disable-gconf \ ++ --disable-gconftool \ ++ --disable-gdk_pixbuf \ ++ --disable-goom \ ++ --disable-goom2k1 \ ++ --disable-gst_v4l2 \ ++ --disable-hal \ ++ --disable-jpeg \ ++ --disable-law \ ++ --disable-libcaca \ ++ --disable-libdv \ ++ --disable-libpng \ ++ --disable-matroska \ ++ --disable-monoscope \ ++ --disable-osx_audio \ ++ --disable-osx_video \ ++ --disable-pulse \ ++ --disable-qtdemux \ ++ --disable-rtspmanager \ ++ --disable-smpte \ ++ --disable-shout2 \ ++ --disable-speex \ ++ --disable-sunaudio \ ++ --disable-taglib \ ++ --disable-videobox \ ++ --disable-videocrop \ ++ --disable-videofilter \ ++ --disable-videomixer \ ++ --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 \ ++ ++ ++define Package/gst-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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (good) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,audiofx,audio effects,audio fft controller,,)) ++$(eval $(call GstBuildPlugin,autodetect,format auto-detection,,,)) ++$(eval $(call GstBuildPlugin,audioparsers,audio parsers,audio tag,,)) ++$(eval $(call GstBuildPlugin,cutter,audio cutter,audio,,)) ++$(eval $(call GstBuildPlugin,debug,debugging,,,)) ++$(eval $(call GstBuildPlugin,equalizer,audio equalizer,audio controller,,)) ++$(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac)) ++$(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,)) ++$(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,)) ++$(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,)) ++$(eval $(call GstBuildPlugin,isomp4,isomp4,riff rtp tag pbutils audio,,)) ++$(eval $(call GstBuildPlugin,level,audio level,audio,,)) ++$(eval $(call GstBuildPlugin,multifile,multiple files access,video,,)) ++$(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,)) ++$(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio interfaces,,)) ++$(eval $(call GstBuildPlugin,replaygain,volume normalization,pbutils,,)) ++$(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils,,)) ++$(eval $(call GstBuildPlugin,rtsp,RTSP,interfaces rtp rtsp sdp,,)) ++$(eval $(call GstBuildPlugin,souphttpsrc,soup input,tag,,+libsoup)) ++$(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,)) ++$(eval $(call GstBuildPlugin,udp,UDP,netbuffer,,)) ++$(eval $(call GstBuildPlugin,wavenc,Wav encoder,riff,,)) ++$(eval $(call GstBuildPlugin,wavparse,Wav parser,audio riff tag,,)) ++ ++$(eval $(call BuildPackage,gst-plugins-good)) +diff --git a/feeds/packages/multimedia/gst-plugins-good/Makefile b/feeds/packages/multimedia/gst-plugins-good/Makefile +new file mode 100644 +index 0000000..cab463f +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/Makefile +@@ -0,0 +1,175 @@ ++# ++# 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:=gst-plugins-good ++PKG_VERSION:=0.10.31 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/ ++PKG_MD5SUM:= ++ ++PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-good ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (good) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-good/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other plugins from ++ the good plugins collection. ++endef ++ ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ \ ++ --disable-aalib \ ++ --disable-alpha \ ++ --disable-annodex \ ++ --disable-apetag \ ++ --disable-auparse \ ++ --disable-avi \ ++ --disable-bz2 \ ++ --disable-cairo \ ++ --disable-directsound \ ++ --disable-dv1394 \ ++ --disable-effectv \ ++ --disable-esd \ ++ --disable-flv \ ++ --disable-flx \ ++ --disable-gconf \ ++ --disable-gconftool \ ++ --disable-gdk_pixbuf \ ++ --disable-goom \ ++ --disable-goom2k1 \ ++ --disable-gst_v4l2 \ ++ --disable-hal \ ++ --disable-jpeg \ ++ --disable-law \ ++ --disable-libcaca \ ++ --disable-libdv \ ++ --disable-libpng \ ++ --disable-matroska \ ++ --disable-monoscope \ ++ --disable-osx_audio \ ++ --disable-osx_video \ ++ --disable-pulse \ ++ --disable-qtdemux \ ++ --disable-rtspmanager \ ++ --disable-smpte \ ++ --disable-shout2 \ ++ --disable-speex \ ++ --disable-sunaudio \ ++ --disable-taglib \ ++ --disable-videobox \ ++ --disable-videocrop \ ++ --disable-videofilter \ ++ --disable-videomixer \ ++ --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 \ ++ ++ ++define Package/gst-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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (good) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,audiofx,audio effects,audio fft controller,,)) ++$(eval $(call GstBuildPlugin,autodetect,format auto-detection,,,)) ++$(eval $(call GstBuildPlugin,audioparsers,audio parsers,audio tag,,)) ++$(eval $(call GstBuildPlugin,cutter,audio cutter,audio,,)) ++$(eval $(call GstBuildPlugin,debug,debugging,,,)) ++$(eval $(call GstBuildPlugin,equalizer,audio equalizer,audio controller,,)) ++$(eval $(call GstBuildPlugin,flac,FLAC codec,audio pbutils tag,,+libflac)) ++$(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,)) ++$(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,)) ++$(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,)) ++$(eval $(call GstBuildPlugin,isomp4,isomp4,riff rtp tag pbutils audio,,)) ++$(eval $(call GstBuildPlugin,level,audio level,audio,,)) ++$(eval $(call GstBuildPlugin,multifile,multiple files access,video,,)) ++$(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,)) ++$(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio interfaces,,)) ++$(eval $(call GstBuildPlugin,replaygain,volume normalization,pbutils,,)) ++$(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils,,)) ++$(eval $(call GstBuildPlugin,rtsp,RTSP,interfaces rtp rtsp sdp,,)) ++$(eval $(call GstBuildPlugin,souphttpsrc,soup input,tag,,+libsoup)) ++$(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,)) ++$(eval $(call GstBuildPlugin,udp,UDP,netbuffer,,)) ++$(eval $(call GstBuildPlugin,wavenc,Wav encoder,riff,,)) ++$(eval $(call GstBuildPlugin,wavparse,Wav parser,audio riff tag,,)) ++ ++$(eval $(call BuildPackage,gst-plugins-good)) +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/.svn/entries b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/entries +new file mode 100644 +index 0000000..0573a02 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-good/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T03:26:01.702982Z ++24581 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++6ecec5a2848013d2634541937f463477 ++2010-07-05T01:49:55.802194Z ++22069 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++340 ++ ++002-no_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e05062f9d463c3264d19c4d8d3ef7ebd ++2010-07-05T01:49:55.802194Z ++22069 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++359 ++ ++003-no_translations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++3f6dd3ea067ca6114780b7c12fff335d ++2010-12-15T03:26:01.702982Z ++24581 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++583 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/001-no_docs.patch.svn-base b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/001-no_docs.patch.svn-base +new file mode 100644 +index 0000000..9a7f60b +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/001-no_docs.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -9,7 +9,6 @@ endif ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++ tests \ ++- docs \ ++ po \ ++ common \ ++ m4 \ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -476,7 +476,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++ tests \ ++- docs \ ++ po \ ++ common \ ++ m4 \ +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/002-no_tests.patch.svn-base b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/002-no_tests.patch.svn-base +new file mode 100644 +index 0000000..2b67186 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/002-no_tests.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,7 +8,6 @@ endif ++ ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- tests \ ++ po \ ++ common \ ++ m4 \ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -475,7 +475,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ @USE_GCONFTOOL_TRUE@GCONF_DIR = gconf ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- tests \ ++ po \ ++ common \ ++ m4 \ +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/003-no_translations.patch.svn-base b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/003-no_translations.patch.svn-base +new file mode 100644 +index 0000000..453f6f1 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/.svn/text-base/003-no_translations.patch.svn-base +@@ -0,0 +1,30 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -1147,7 +1147,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 ++@@ -8,7 +8,6 @@ endif ++ ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- po \ ++ common \ ++ m4 \ ++ pkgconfig ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -475,7 +475,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ @USE_GCONFTOOL_TRUE@GCONF_DIR = gconf ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- po \ ++ common \ ++ m4 \ ++ pkgconfig +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/001-no_docs.patch b/feeds/packages/multimedia/gst-plugins-good/patches/001-no_docs.patch +new file mode 100644 +index 0000000..9a7f60b +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/001-no_docs.patch +@@ -0,0 +1,20 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -9,7 +9,6 @@ endif ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++ tests \ ++- docs \ ++ po \ ++ common \ ++ m4 \ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -476,7 +476,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++ tests \ ++- docs \ ++ po \ ++ common \ ++ m4 \ +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/002-no_tests.patch b/feeds/packages/multimedia/gst-plugins-good/patches/002-no_tests.patch +new file mode 100644 +index 0000000..2b67186 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/002-no_tests.patch +@@ -0,0 +1,20 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,7 +8,6 @@ endif ++ ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- tests \ ++ po \ ++ common \ ++ m4 \ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -475,7 +475,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ @USE_GCONFTOOL_TRUE@GCONF_DIR = gconf ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- tests \ ++ po \ ++ common \ ++ m4 \ +diff --git a/feeds/packages/multimedia/gst-plugins-good/patches/003-no_translations.patch b/feeds/packages/multimedia/gst-plugins-good/patches/003-no_translations.patch +new file mode 100644 +index 0000000..453f6f1 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-good/patches/003-no_translations.patch +@@ -0,0 +1,30 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -1147,7 +1147,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 ++@@ -8,7 +8,6 @@ endif ++ ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- po \ ++ common \ ++ m4 \ ++ pkgconfig ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -475,7 +475,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ @USE_GCONFTOOL_TRUE@GCONF_DIR = gconf ++ ALWAYS_SUBDIRS = \ ++ gst sys ext \ ++- po \ ++ common \ ++ m4 \ ++ pkgconfig +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/.svn/entries b/feeds/packages/multimedia/gst-plugins-ugly/.svn/entries +new file mode 100644 +index 0000000..1f2e9e5 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-ugly ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:30:28.393452Z ++35225 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c7dced71dd0d569934e17adeffcc0dff ++2013-01-18T13:30:28.393452Z ++35225 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3383 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gst-plugins-ugly/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e1b5847 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,133 @@ ++# ++# 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:=gst-plugins-ugly ++PKG_VERSION:=0.10.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ ++PKG_MD5SUM:=ba26045c8c8c91f0d48d327ccf53ac0c ++ ++PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil ++PKG_CONFIG_Dba26045c8c8c91f0d48d327ccf53ac0cEPENDS:= \ ++ CONFIG_PACKAGE_gst-mod-asf \ ++ CONFIG_PACKAGE_gst-mod-lame \ ++ CONFIG_PACKAGE_gst-mod-mad \ ++ CONFIG_PACKAGE_gst-mod-mpeg2dec \ ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-ugly ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (ugly) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-ugly/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other plugins from ++ the ugly plugins collection. ++endef ++ ++ ++GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1)) ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ \ ++ --disable-a52dec \ ++ --disable-amrnb \ ++ --disable-amrwb \ ++ $(call GST_COND_SELECT,asf) \ ++ --disable-cdio \ ++ --disable-dvdlpcmdec \ ++ --disable-dvdread \ ++ --disable-dvdsub \ ++ --disable-iec958 \ ++ $(call GST_COND_SELECT,lame) \ ++ $(call GST_COND_SELECT,mad) \ ++ $(call GST_COND_SELECT,mpeg2dec) \ ++ --disable-mpegaudioparse \ ++ --disable-mpegstream \ ++ --disable-realmedia \ ++ --disable-sidplay \ ++ --disable-synaesthesia \ ++ --disable-twolame \ ++ --disable-x264 \ ++ \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++EXTRA_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ ++ ++define Package/gst-plugins-ugly/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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (ugly) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,asf,ASF demuxer,audio riff rtp rtsp sdp tag,,)) ++$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib)) ++$(eval $(call GstBuildPlugin,mad,MP3 decoder (using MAD),audio tag,,+libid3tag +libmad)) ++$(eval $(call GstBuildPlugin,mpeg2dec,MPEG decoder,video,,+libmpeg2)) ++ ++$(eval $(call BuildPackage,gst-plugins-ugly)) +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/Makefile b/feeds/packages/multimedia/gst-plugins-ugly/Makefile +new file mode 100644 +index 0000000..e1b5847 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/Makefile +@@ -0,0 +1,133 @@ ++# ++# 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:=gst-plugins-ugly ++PKG_VERSION:=0.10.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ ++PKG_MD5SUM:=ba26045c8c8c91f0d48d327ccf53ac0c ++ ++PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil ++PKG_CONFIG_Dba26045c8c8c91f0d48d327ccf53ac0cEPENDS:= \ ++ CONFIG_PACKAGE_gst-mod-asf \ ++ CONFIG_PACKAGE_gst-mod-lame \ ++ CONFIG_PACKAGE_gst-mod-mad \ ++ CONFIG_PACKAGE_gst-mod-mpeg2dec \ ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gst-plugins-ugly ++$(call Package/gstreamer/Default) ++ TITLE+= plugins collection (ugly) ++ DEPENDS+= $(GST_DEPENDS) ++endef ++ ++define Package/gts-plugins-ugly/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies to the other plugins from ++ the ugly plugins collection. ++endef ++ ++ ++GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1)) ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ \ ++ --disable-a52dec \ ++ --disable-amrnb \ ++ --disable-amrwb \ ++ $(call GST_COND_SELECT,asf) \ ++ --disable-cdio \ ++ --disable-dvdlpcmdec \ ++ --disable-dvdread \ ++ --disable-dvdsub \ ++ --disable-iec958 \ ++ $(call GST_COND_SELECT,lame) \ ++ $(call GST_COND_SELECT,mad) \ ++ $(call GST_COND_SELECT,mpeg2dec) \ ++ --disable-mpegaudioparse \ ++ --disable-mpegstream \ ++ --disable-realmedia \ ++ --disable-sidplay \ ++ --disable-synaesthesia \ ++ --disable-twolame \ ++ --disable-x264 \ ++ \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++EXTRA_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ ++ ++define Package/gst-plugins-ugly/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 += +gst-mod-$(1) ++ ++ define Package/gst-mod-$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) plugin (ugly) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $$(foreach p,$(4),+gst-mod-$$(p)) $(5) ++ endef ++ ++ define Package/gst-mod-$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) plugin. ++ endef ++ ++ define Package/gst-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,gst-mod-$(1))) ++endef ++ ++$(eval $(call GstBuildPlugin,asf,ASF demuxer,audio riff rtp rtsp sdp tag,,)) ++$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib)) ++$(eval $(call GstBuildPlugin,mad,MP3 decoder (using MAD),audio tag,,+libid3tag +libmad)) ++$(eval $(call GstBuildPlugin,mpeg2dec,MPEG decoder,video,,+libmpeg2)) ++ ++$(eval $(call BuildPackage,gst-plugins-ugly)) +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/entries b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/entries +new file mode 100644 +index 0000000..076c3af +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gst-plugins-ugly/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:28.403315Z ++34522 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++acd3d42581b831ba3818873267bead30 ++2012-12-05T17:31:28.403315Z ++34522 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++652 ++ ++002-no_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e9db3d93d33f6434fc492ad9d9cc41c6 ++2012-12-05T17:31:28.403315Z ++34522 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++630 ++ ++003-no_translations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++a8d07aa4df5a94b3ba849e810e9a4c21 ++2012-12-05T17:31:28.403315Z ++34522 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++856 ++ +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/001-no_docs.patch.svn-base b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/001-no_docs.patch.svn-base +new file mode 100644 +index 0000000..8bcb83b +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/001-no_docs.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ++ ++ SUBDIRS = \ ++- gst-libs gst ext docs m4 tests common pkgconfig po +++ gst-libs gst ext m4 tests common pkgconfig po ++ ++ # include before EXTRA_DIST for win32 assignment ++ include $(top_srcdir)/common/win32.mak ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -395,7 +395,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ SUBDIRS = \ ++- gst-libs gst ext docs m4 tests common pkgconfig po +++ gst-libs gst ext m4 tests common pkgconfig po ++ ++ ++ # the MANIFEST contains all win32 related files that should be disted +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/002-no_tests.patch.svn-base b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/002-no_tests.patch.svn-base +new file mode 100644 +index 0000000..3a830ac +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/002-no_tests.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ++ ++ SUBDIRS = \ ++- gst-libs gst ext m4 tests common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig po ++ ++ # include before EXTRA_DIST for win32 assignment ++ include $(top_srcdir)/common/win32.mak ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -395,7 +395,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ SUBDIRS = \ ++- gst-libs gst ext m4 tests common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig po ++ ++ ++ # the MANIFEST contains all win32 related files that should be disted +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/003-no_translations.patch.svn-base b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/003-no_translations.patch.svn-base +new file mode 100644 +index 0000000..71cc5c5 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/.svn/text-base/003-no_translations.patch.svn-base +@@ -0,0 +1,34 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -495,7 +495,6 @@ docs/version.entities ++ tests/Makefile ++ tests/check/Makefile ++ m4/Makefile ++-po/Makefile.in ++ pkgconfig/Makefile ++ pkgconfig/gstreamer-plugins-ugly-uninstalled.pc ++ gst-plugins-ugly.spec ++ ) ++ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ++ ++ SUBDIRS = \ ++- gst-libs gst ext m4 common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig ++ ++ # include before EXTRA_DIST for win32 assignment ++ include $(top_srcdir)/common/win32.mak ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -395,7 +395,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ SUBDIRS = \ ++- gst-libs gst ext m4 common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig ++ ++ ++ # the MANIFEST contains all win32 related files that should be disted +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/001-no_docs.patch b/feeds/packages/multimedia/gst-plugins-ugly/patches/001-no_docs.patch +new file mode 100644 +index 0000000..8bcb83b +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/001-no_docs.patch +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ++ ++ SUBDIRS = \ ++- gst-libs gst ext docs m4 tests common pkgconfig po +++ gst-libs gst ext m4 tests common pkgconfig po ++ ++ # include before EXTRA_DIST for win32 assignment ++ include $(top_srcdir)/common/win32.mak ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -395,7 +395,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ SUBDIRS = \ ++- gst-libs gst ext docs m4 tests common pkgconfig po +++ gst-libs gst ext m4 tests common pkgconfig po ++ ++ ++ # the MANIFEST contains all win32 related files that should be disted +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/002-no_tests.patch b/feeds/packages/multimedia/gst-plugins-ugly/patches/002-no_tests.patch +new file mode 100644 +index 0000000..3a830ac +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/002-no_tests.patch +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ++ ++ SUBDIRS = \ ++- gst-libs gst ext m4 tests common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig po ++ ++ # include before EXTRA_DIST for win32 assignment ++ include $(top_srcdir)/common/win32.mak ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -395,7 +395,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ SUBDIRS = \ ++- gst-libs gst ext m4 tests common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig po ++ ++ ++ # the MANIFEST contains all win32 related files that should be disted +diff --git a/feeds/packages/multimedia/gst-plugins-ugly/patches/003-no_translations.patch b/feeds/packages/multimedia/gst-plugins-ugly/patches/003-no_translations.patch +new file mode 100644 +index 0000000..71cc5c5 +--- /dev/null ++++ b/feeds/packages/multimedia/gst-plugins-ugly/patches/003-no_translations.patch +@@ -0,0 +1,34 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -495,7 +495,6 @@ docs/version.entities ++ tests/Makefile ++ tests/check/Makefile ++ m4/Makefile ++-po/Makefile.in ++ pkgconfig/Makefile ++ pkgconfig/gstreamer-plugins-ugly-uninstalled.pc ++ gst-plugins-ugly.spec ++ ) ++ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,7 +1,7 @@ ++ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc ++ ++ SUBDIRS = \ ++- gst-libs gst ext m4 common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig ++ ++ # include before EXTRA_DIST for win32 assignment ++ include $(top_srcdir)/common/win32.mak ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -395,7 +395,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc ++ SUBDIRS = \ ++- gst-libs gst ext m4 common pkgconfig po +++ gst-libs gst ext m4 common pkgconfig ++ ++ ++ # the MANIFEST contains all win32 related files that should be disted +diff --git a/feeds/packages/multimedia/gstreamer/.svn/entries b/feeds/packages/multimedia/gstreamer/.svn/entries +new file mode 100644 +index 0000000..7af5f4f +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gstreamer ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:20:39.507263Z ++35223 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c814e1bdc4c2d9ef6ebee3c87dffaf04 ++2013-01-18T13:20:39.507263Z ++35223 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4623 ++ +diff --git a/feeds/packages/multimedia/gstreamer/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/gstreamer/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/gstreamer/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/gstreamer/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a5e896f +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,193 @@ ++# ++# 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:=gstreamer ++PKG_VERSION:=0.10.36 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ ++PKG_MD5SUM:=a0cf7d6877f694a1a2ad2b4d1ecb890b ++ ++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/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gstreamer ++$(call Package/gstreamer/Default) ++ TITLE+= framework ++ DEPENDS+= +libgstreamer \ ++ +libgstcheck \ ++ +libgstcontroller \ ++ +libgstdataprotocol \ ++ +libgstnet ++endef ++ ++define Package/gstreamer/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies on the other GStreamer ++ componenents. ++endef ++ ++ ++define Package/gstreamer-utils ++$(call Package/gstreamer/Default) ++ TITLE+= utilities ++ DEPENDS+= +libgstreamer ++endef ++ ++define Package/gstreamer-utils/description ++$(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer utilities. ++endef ++ ++ ++define Package/libgstreamer ++$(call Package/gstreamer/Default) ++ TITLE+= library (core) ++ DEPENDS+= +glib2 +libpthread +libxml2 ++endef ++ ++define Package/libgstreamer/description ++$(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer core library. ++endef ++ ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ --disable-tests \ ++ --disable-valgrind \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ --without-x \ ++ ++EXTRA_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ -L$(ICONV_PREFIX)/lib -L$(INTL_PREFIX)/lib ++ ++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/gstreamer/install ++ /bin/true ++endef ++ ++define Package/gstreamer-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/bin/gst-feedback* \ ++ ./usr/bin/gst-launch* \ ++ ./usr/bin/gst-inspect* \ ++ ./usr/bin/gst-typefind* \ ++ ./usr/bin/gst-xmlinspect* \ ++ ./usr/bin/gst-xmllaunch* \ ++ $(1)/usr/bin/ \ ++ ) ++endef ++ ++define Package/libgstreamer/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)/ \ ++ ) ++endef ++ ++ ++# 1: short name ++# 2: description ++# 3: dependencies on other gstreamer libraries (short name) ++# 4: dependencies on other packages ++define GstBuildLibrary ++ ++ define Package/libgst$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) library (core) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4) ++ endef ++ ++ define Package/libgst$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) library. ++ endef ++ ++ define Package/libgst$(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,libgst$(1))) ++endef ++ ++$(eval $(call GstBuildLibrary,check,check unit testing)) ++$(eval $(call GstBuildLibrary,controller,dynamic parameter control)) ++$(eval $(call GstBuildLibrary,dataprotocol,data protocol)) ++$(eval $(call GstBuildLibrary,net,network classes)) ++ ++$(eval $(call BuildPackage,gstreamer)) ++$(eval $(call BuildPackage,gstreamer-utils)) ++$(eval $(call BuildPackage,libgstreamer)) ++ +diff --git a/feeds/packages/multimedia/gstreamer/Makefile b/feeds/packages/multimedia/gstreamer/Makefile +new file mode 100644 +index 0000000..a5e896f +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/Makefile +@@ -0,0 +1,193 @@ ++# ++# 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:=gstreamer ++PKG_VERSION:=0.10.36 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ ++PKG_MD5SUM:=a0cf7d6877f694a1a2ad2b4d1ecb890b ++ ++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/gstreamer/Default ++ CATEGORY:=Multimedia ++ SECTION:=multimedia ++ TITLE:=GStreamer ++ URL:=http://gstreamer.freedesktop.org/ ++endef ++ ++define Package/gstreamer/description/Default ++ GStreamer open source multimedia framework ++endef ++ ++ ++define Package/gstreamer ++$(call Package/gstreamer/Default) ++ TITLE+= framework ++ DEPENDS+= +libgstreamer \ ++ +libgstcheck \ ++ +libgstcontroller \ ++ +libgstdataprotocol \ ++ +libgstnet ++endef ++ ++define Package/gstreamer/description ++$(call Package/gstreamer/description/Default) ++ . ++ This meta package contains only dependencies on the other GStreamer ++ componenents. ++endef ++ ++ ++define Package/gstreamer-utils ++$(call Package/gstreamer/Default) ++ TITLE+= utilities ++ DEPENDS+= +libgstreamer ++endef ++ ++define Package/gstreamer-utils/description ++$(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer utilities. ++endef ++ ++ ++define Package/libgstreamer ++$(call Package/gstreamer/Default) ++ TITLE+= library (core) ++ DEPENDS+= +glib2 +libpthread +libxml2 ++endef ++ ++define Package/libgstreamer/description ++$(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer core library. ++endef ++ ++ ++GST_VERSION:=0.10 ++ ++CONFIGURE_ARGS += \ ++ --disable-examples \ ++ --disable-tests \ ++ --disable-valgrind \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ --without-x \ ++ ++EXTRA_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ -L$(ICONV_PREFIX)/lib -L$(INTL_PREFIX)/lib ++ ++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/gstreamer/install ++ /bin/true ++endef ++ ++define Package/gstreamer-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ ( cd $(PKG_INSTALL_DIR); $(CP) \ ++ ./usr/bin/gst-feedback* \ ++ ./usr/bin/gst-launch* \ ++ ./usr/bin/gst-inspect* \ ++ ./usr/bin/gst-typefind* \ ++ ./usr/bin/gst-xmlinspect* \ ++ ./usr/bin/gst-xmllaunch* \ ++ $(1)/usr/bin/ \ ++ ) ++endef ++ ++define Package/libgstreamer/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)/ \ ++ ) ++endef ++ ++ ++# 1: short name ++# 2: description ++# 3: dependencies on other gstreamer libraries (short name) ++# 4: dependencies on other packages ++define GstBuildLibrary ++ ++ define Package/libgst$(1) ++ $(call Package/gstreamer/Default) ++ TITLE+= $(2) library (core) ++ DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4) ++ endef ++ ++ define Package/libgst$(1)/description ++ $(call Package/gstreamer/description/Default) ++ . ++ This package contains the GStreamer $(2) library. ++ endef ++ ++ define Package/libgst$(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,libgst$(1))) ++endef ++ ++$(eval $(call GstBuildLibrary,check,check unit testing)) ++$(eval $(call GstBuildLibrary,controller,dynamic parameter control)) ++$(eval $(call GstBuildLibrary,dataprotocol,data protocol)) ++$(eval $(call GstBuildLibrary,net,network classes)) ++ ++$(eval $(call BuildPackage,gstreamer)) ++$(eval $(call BuildPackage,gstreamer-utils)) ++$(eval $(call BuildPackage,libgstreamer)) ++ +diff --git a/feeds/packages/multimedia/gstreamer/patches/.svn/entries b/feeds/packages/multimedia/gstreamer/patches/.svn/entries +new file mode 100644 +index 0000000..62e67b7 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/gstreamer/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T13:20:39.507263Z ++35223 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_docs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e77d483846906aecd9dcc85a920e6088 ++2010-07-05T01:42:30.822399Z ++22067 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++757 ++ ++004-add_gst_debug_log2_debug_symbol.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c048645eb9871c14aec22bf991764607 ++2013-01-18T13:20:39.507263Z ++35223 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1258 ++ ++002-no_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++a40cf89f0e9a95cdf0d9ef6710d4815c ++2010-07-05T01:42:30.822399Z ++22067 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++882 ++ ++003-no_translations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++1c0c44eb054065c3d7e7cea7c1dd43dc ++2010-12-13T15:14:36.978156Z ++24545 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++900 ++ +diff --git a/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/001-no_docs.patch.svn-base b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/001-no_docs.patch.svn-base +new file mode 100644 +index 0000000..e94fd00 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/001-no_docs.patch.svn-base +@@ -0,0 +1,36 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_MA ++ ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common ++@@ -16,7 +15,6 @@ SUBDIRS = pkgconfig \ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common ++@@ -454,7 +453,6 @@ SUBDIRS = pkgconfig \ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common +diff --git a/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/002-no_tests.patch.svn-base b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/002-no_tests.patch.svn-base +new file mode 100644 +index 0000000..6058a38 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/002-no_tests.patch.svn-base +@@ -0,0 +1,39 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -7,14 +7,14 @@ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ ++ SUBDIRS = pkgconfig \ ++- gst libs plugins tools tests \ +++ gst libs plugins tools \ ++ po \ ++ m4 \ ++ common ++ ++ # 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 ++@@ -444,7 +444,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ SUBDIRS = pkgconfig \ ++- gst libs plugins tools tests \ +++ gst libs plugins tools \ ++ po \ ++ m4 \ ++ common ++@@ -452,7 +452,7 @@ SUBDIRS = pkgconfig \ ++ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++- gst libs plugins tools tests \ +++ gst libs plugins tools \ ++ po \ ++ m4 \ ++ common +diff --git a/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/003-no_translations.patch.svn-base b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/003-no_translations.patch.svn-base +new file mode 100644 +index 0000000..8090563 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/003-no_translations.patch.svn-base +@@ -0,0 +1,45 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -695,7 +695,6 @@ libs/gst/net/Makefile ++ plugins/Makefile ++ plugins/indexers/Makefile ++ plugins/elements/Makefile ++-po/Makefile.in ++ tests/Makefile ++ tests/benchmarks/Makefile ++ tests/check/Makefile ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,14 +8,12 @@ aclocal_DATA = gst-element-check-@GST_MA ++ ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ ++@@ -453,7 +452,6 @@ SUBDIRS = pkgconfig \ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ +diff --git a/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/004-add_gst_debug_log2_debug_symbol.patch.svn-base b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/004-add_gst_debug_log2_debug_symbol.patch.svn-base +new file mode 100644 +index 0000000..bc2e9e2 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/.svn/text-base/004-add_gst_debug_log2_debug_symbol.patch.svn-base +@@ -0,0 +1,43 @@ ++--- gstreamer-0.10.36/gst/gstinfo.c 2011-12-30 02:14:34.000000000 +0100 +++++ gstreamer-0.10.36.modified/gst/gstinfo.c 2013-01-03 14:01:37.000000000 +0100 ++@@ -462,6 +462,39 @@ ++ va_end (var_args); ++ } ++ +++typedef struct { +++ const gchar *file; +++ const gchar *function; +++ const gint line; +++} GstDebugTraceLocation; +++ +++ +++/** +++ * gst_debug_log2: +++ * category: category to log +++ * level: level of the message is in +++ * location: the file, function name, and line number of the location that +++ * emitted the message +++ * object: the object this message relates to or NULL if none +++ * format: a printf style format string +++ * ...: optional arguments for the format +++ * +++ * Logs the given message using the currently registered debugging handlers. +++ */ +++void +++gst_debug_log2 (GstDebugCategory * category, GstDebugLevel level, +++ const GstDebugTraceLocation * location, +++ GObject * object, const gchar * format, ...) +++{ +++#if 0 +++ va_list var_args; +++ +++ va_start (var_args, format); +++ gst_debug_log_valist2 (category, level, location, object, format, var_args); +++ va_end (var_args); +++#endif +++} +++ ++ #ifdef _MSC_VER ++ /* based on g_basename(), which we can't use because it was deprecated */ ++ static inline const gchar * ++ +diff --git a/feeds/packages/multimedia/gstreamer/patches/001-no_docs.patch b/feeds/packages/multimedia/gstreamer/patches/001-no_docs.patch +new file mode 100644 +index 0000000..e94fd00 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/001-no_docs.patch +@@ -0,0 +1,36 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_MA ++ ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common ++@@ -16,7 +15,6 @@ SUBDIRS = pkgconfig \ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common ++@@ -454,7 +453,6 @@ SUBDIRS = pkgconfig \ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools tests \ ++- docs \ ++ po \ ++ m4 \ ++ common +diff --git a/feeds/packages/multimedia/gstreamer/patches/002-no_tests.patch b/feeds/packages/multimedia/gstreamer/patches/002-no_tests.patch +new file mode 100644 +index 0000000..6058a38 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/002-no_tests.patch +@@ -0,0 +1,39 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -7,14 +7,14 @@ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ ++ SUBDIRS = pkgconfig \ ++- gst libs plugins tools tests \ +++ gst libs plugins tools \ ++ po \ ++ m4 \ ++ common ++ ++ # 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 ++@@ -444,7 +444,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk ++ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ SUBDIRS = pkgconfig \ ++- gst libs plugins tools tests \ +++ gst libs plugins tools \ ++ po \ ++ m4 \ ++ common ++@@ -452,7 +452,7 @@ SUBDIRS = pkgconfig \ ++ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++- gst libs plugins tools tests \ +++ gst libs plugins tools \ ++ po \ ++ m4 \ ++ common +diff --git a/feeds/packages/multimedia/gstreamer/patches/003-no_translations.patch b/feeds/packages/multimedia/gstreamer/patches/003-no_translations.patch +new file mode 100644 +index 0000000..8090563 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/003-no_translations.patch +@@ -0,0 +1,45 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -695,7 +695,6 @@ libs/gst/net/Makefile ++ plugins/Makefile ++ plugins/indexers/Makefile ++ plugins/elements/Makefile ++-po/Makefile.in ++ tests/Makefile ++ tests/benchmarks/Makefile ++ tests/check/Makefile ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -8,14 +8,12 @@ aclocal_DATA = gst-element-check-@GST_MA ++ ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal ++ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 ++ SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ ++@@ -453,7 +452,6 @@ SUBDIRS = pkgconfig \ ++ # These are all the possible subdirs ++ DIST_SUBDIRS = pkgconfig \ ++ gst libs plugins tools \ ++- po \ ++ m4 \ ++ common ++ +diff --git a/feeds/packages/multimedia/gstreamer/patches/004-add_gst_debug_log2_debug_symbol.patch b/feeds/packages/multimedia/gstreamer/patches/004-add_gst_debug_log2_debug_symbol.patch +new file mode 100644 +index 0000000..bc2e9e2 +--- /dev/null ++++ b/feeds/packages/multimedia/gstreamer/patches/004-add_gst_debug_log2_debug_symbol.patch +@@ -0,0 +1,43 @@ ++--- gstreamer-0.10.36/gst/gstinfo.c 2011-12-30 02:14:34.000000000 +0100 +++++ gstreamer-0.10.36.modified/gst/gstinfo.c 2013-01-03 14:01:37.000000000 +0100 ++@@ -462,6 +462,39 @@ ++ va_end (var_args); ++ } ++ +++typedef struct { +++ const gchar *file; +++ const gchar *function; +++ const gint line; +++} GstDebugTraceLocation; +++ +++ +++/** +++ * gst_debug_log2: +++ * category: category to log +++ * level: level of the message is in +++ * location: the file, function name, and line number of the location that +++ * emitted the message +++ * object: the object this message relates to or NULL if none +++ * format: a printf style format string +++ * ...: optional arguments for the format +++ * +++ * Logs the given message using the currently registered debugging handlers. +++ */ +++void +++gst_debug_log2 (GstDebugCategory * category, GstDebugLevel level, +++ const GstDebugTraceLocation * location, +++ GObject * object, const gchar * format, ...) +++{ +++#if 0 +++ va_list var_args; +++ +++ va_start (var_args, format); +++ gst_debug_log_valist2 (category, level, location, object, format, var_args); +++ va_end (var_args); +++#endif +++} +++ ++ #ifdef _MSC_VER ++ /* based on g_basename(), which we can't use because it was deprecated */ ++ static inline const gchar * ++ +diff --git a/feeds/packages/multimedia/hasciicam/.svn/entries b/feeds/packages/multimedia/hasciicam/.svn/entries +new file mode 100644 +index 0000000..6e6a776 +--- /dev/null ++++ b/feeds/packages/multimedia/hasciicam/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/hasciicam ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-12T20:22:31.312613Z ++28997 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++7978204cbf6fad19842a702281dbce55 ++2011-11-12T20:22:31.312613Z ++28997 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++821 ++ +diff --git a/feeds/packages/multimedia/hasciicam/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/hasciicam/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a982281 +--- /dev/null ++++ b/feeds/packages/multimedia/hasciicam/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# ++# 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:=hasciicam ++PKG_VERSION:=1.1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.dyne.org/hasciicam/releases/ ++PKG_MD5SUM:=2c7393270e18ab913043683fa3390d8c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/hasciicam ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=Live ASCII video feeds ++ URL:=http://ascii.dyne.org/ ++ DEPENDS:= +libaa +ftplib ++endef ++ ++ ++CONFIGURE_VARS += \ ++ LIBS="-lncurses" \ ++ ++define Package/hasciicam/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hasciicam $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,hasciicam)) +diff --git a/feeds/packages/multimedia/hasciicam/Makefile b/feeds/packages/multimedia/hasciicam/Makefile +new file mode 100644 +index 0000000..a982281 +--- /dev/null ++++ b/feeds/packages/multimedia/hasciicam/Makefile +@@ -0,0 +1,39 @@ ++# ++# 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:=hasciicam ++PKG_VERSION:=1.1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.dyne.org/hasciicam/releases/ ++PKG_MD5SUM:=2c7393270e18ab913043683fa3390d8c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/hasciicam ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=Live ASCII video feeds ++ URL:=http://ascii.dyne.org/ ++ DEPENDS:= +libaa +ftplib ++endef ++ ++ ++CONFIGURE_VARS += \ ++ LIBS="-lncurses" \ ++ ++define Package/hasciicam/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hasciicam $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,hasciicam)) +diff --git a/feeds/packages/multimedia/icecast/.svn/entries b/feeds/packages/multimedia/icecast/.svn/entries +new file mode 100644 +index 0000000..a4f3947 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/.svn/entries +@@ -0,0 +1,99 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/icecast ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-20T03:50:35.554305Z ++29268 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++libvorbisidec.mk ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++8f7987e4cca4cfe403caf43a24eec26d ++2011-03-12T09:06:35.846467Z ++26107 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++866 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++28bfa226dae6428feaa8f60563767387 ++2011-11-20T03:50:35.554305Z ++29268 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2588 ++ +diff --git a/feeds/packages/multimedia/icecast/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/icecast/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/icecast/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/icecast/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2b44113 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,91 @@ ++# ++# 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.3.2 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/ ++PKG_MD5SUM:=ff516b3ccd2bcc31e68f460cd316093f ++ ++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 ++ 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)/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/feeds/packages/multimedia/icecast/.svn/text-base/libvorbisidec.mk.svn-base b/feeds/packages/multimedia/icecast/.svn/text-base/libvorbisidec.mk.svn-base +new file mode 100644 +index 0000000..eda6e76 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/.svn/text-base/libvorbisidec.mk.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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/feeds/packages/multimedia/icecast/Makefile b/feeds/packages/multimedia/icecast/Makefile +new file mode 100644 +index 0000000..2b44113 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/Makefile +@@ -0,0 +1,91 @@ ++# ++# 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.3.2 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/ ++PKG_MD5SUM:=ff516b3ccd2bcc31e68f460cd316093f ++ ++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 ++ 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)/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/feeds/packages/multimedia/icecast/libvorbisidec.mk b/feeds/packages/multimedia/icecast/libvorbisidec.mk +new file mode 100644 +index 0000000..eda6e76 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/libvorbisidec.mk +@@ -0,0 +1,41 @@ ++# ++# 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/feeds/packages/multimedia/icecast/patches/.svn/entries b/feeds/packages/multimedia/icecast/patches/.svn/entries +new file mode 100644 +index 0000000..fb64455 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/icecast/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-20T03:50:35.554305Z ++29268 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix_libcurl_test_crap.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++298e76aa929b6a9ea8d7575e204a6956 ++2011-11-20T03:50:35.554305Z ++29268 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++282 ++ ++001-icecast-2.3.0-tremor.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++2d11d056d54bd454f11458939b58a57c ++2011-11-20T03:50:35.554305Z ++29268 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3345 ++ +diff --git a/feeds/packages/multimedia/icecast/patches/.svn/prop-base/001-icecast-2.3.0-tremor.patch.svn-base b/feeds/packages/multimedia/icecast/patches/.svn/prop-base/001-icecast-2.3.0-tremor.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/patches/.svn/prop-base/001-icecast-2.3.0-tremor.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/icecast/patches/.svn/text-base/001-icecast-2.3.0-tremor.patch.svn-base b/feeds/packages/multimedia/icecast/patches/.svn/text-base/001-icecast-2.3.0-tremor.patch.svn-base +new file mode 100644 +index 0000000..6fa6f08 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/patches/.svn/text-base/001-icecast-2.3.0-tremor.patch.svn-base +@@ -0,0 +1,155 @@ ++--- a/src/format_flac.c +++++ b/src/format_flac.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_midi.c +++++ b/src/format_midi.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_ogg.c +++++ b/src/format_ogg.c ++@@ -24,7 +24,7 @@ ++ #include ++ #include ++ ++-#include +++#include ++ ++ #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 +++#include ++ #include "refbuf.h" ++ #include "format.h" ++ ++--- a/src/format_speex.c +++++ b/src/format_speex.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_theora.c +++++ b/src/format_theora.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_vorbis.c +++++ b/src/format_vorbis.c ++@@ -18,8 +18,8 @@ ++ #endif ++ ++ #include ++-#include ++-#include +++#include +++#include ++ #include ++ #include ++ ++--- a/src/source.c +++++ b/src/source.c ++@@ -19,7 +19,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include ++ #include ++ ++ #ifndef _WIN32 ++--- a/src/format_kate.c +++++ b/src/format_kate.c ++@@ -19,7 +19,7 @@ ++ ++ #include ++ #include ++-#include +++#include ++ #ifdef HAVE_KATE ++ #include ++ #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 ++-#include ++- ], [ ++-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 ],, +++ [ AC_TRY_LINK([#include ],, ++ [ xt_cv_lib_ogg="pre v1.0, needs updating" ], ++ [ xt_cv_lib_ogg="not found" ]) ++ ]) +diff --git a/feeds/packages/multimedia/icecast/patches/.svn/text-base/010-fix_libcurl_test_crap.patch.svn-base b/feeds/packages/multimedia/icecast/patches/.svn/text-base/010-fix_libcurl_test_crap.patch.svn-base +new file mode 100644 +index 0000000..8da6e33 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/patches/.svn/text-base/010-fix_libcurl_test_crap.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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 ++ int main() ++ { +diff --git a/feeds/packages/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch b/feeds/packages/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch +new file mode 100644 +index 0000000..6fa6f08 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch +@@ -0,0 +1,155 @@ ++--- a/src/format_flac.c +++++ b/src/format_flac.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_midi.c +++++ b/src/format_midi.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_ogg.c +++++ b/src/format_ogg.c ++@@ -24,7 +24,7 @@ ++ #include ++ #include ++ ++-#include +++#include ++ ++ #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 +++#include ++ #include "refbuf.h" ++ #include "format.h" ++ ++--- a/src/format_speex.c +++++ b/src/format_speex.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_theora.c +++++ b/src/format_theora.c ++@@ -18,7 +18,7 @@ ++ #endif ++ ++ #include ++-#include +++#include ++ #include ++ ++ typedef struct source_tag source_t; ++--- a/src/format_vorbis.c +++++ b/src/format_vorbis.c ++@@ -18,8 +18,8 @@ ++ #endif ++ ++ #include ++-#include ++-#include +++#include +++#include ++ #include ++ #include ++ ++--- a/src/source.c +++++ b/src/source.c ++@@ -19,7 +19,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include ++ #include ++ ++ #ifndef _WIN32 ++--- a/src/format_kate.c +++++ b/src/format_kate.c ++@@ -19,7 +19,7 @@ ++ ++ #include ++ #include ++-#include +++#include ++ #ifdef HAVE_KATE ++ #include ++ #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 ++-#include ++- ], [ ++-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 ],, +++ [ AC_TRY_LINK([#include ],, ++ [ xt_cv_lib_ogg="pre v1.0, needs updating" ], ++ [ xt_cv_lib_ogg="not found" ]) ++ ]) +diff --git a/feeds/packages/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch b/feeds/packages/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch +new file mode 100644 +index 0000000..8da6e33 +--- /dev/null ++++ b/feeds/packages/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch +@@ -0,0 +1,11 @@ ++--- 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 ++ int main() ++ { +diff --git a/feeds/packages/multimedia/imagemagick/.svn/entries b/feeds/packages/multimedia/imagemagick/.svn/entries +new file mode 100644 +index 0000000..5467580 +--- /dev/null ++++ b/feeds/packages/multimedia/imagemagick/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/imagemagick ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-14T18:49:18.257646Z ++33190 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++8b0b5541281d494ffa0370b769fee261 ++2012-08-14T18:49:18.257646Z ++33190 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3647 ++ +diff --git a/feeds/packages/multimedia/imagemagick/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/imagemagick/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..28a6bff +--- /dev/null ++++ b/feeds/packages/multimedia/imagemagick/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,157 @@ ++# ++# 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:=imagemagick ++PKG_VERSION:=6.7.8 ++PKG_REVISION:=10 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/ImageMagick-$(PKG_VERSION)-$(PKG_REVISION) ++PKG_SOURCE:=ImageMagick-$(PKG_VERSION)-$(PKG_REVISION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.fifi.org/pub/ImageMagick/ ++PKG_MD5SUM:=c66bea4710370b2e115aed512fbe4601 ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/imagemagick/Default ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=imagemagick ++ URL:=http://image_magick.veidrodis.com/ ++endef ++ ++define Package/imagemagick ++ $(call Package/imagemagick/Default) ++ DEPENDS:=+libpthread +libltdl +libjpeg +libtiff +zlib ++endef ++ ++define Package/imagemagick/description ++ An image manipulation library. ++endef ++ ++define Package/imagemagick-jpeg ++ $(call Package/imagemagick/Default) ++ TITLE+= (jpeg) ++ DEPENDS:=+imagemagick ++endef ++ ++define Package/imagemagick-jpeg/description ++ imagemagick JPEG module ++endef ++ ++define Package/imagemagick-png ++ $(call Package/imagemagick/Default) ++ TITLE+= (png) ++ DEPENDS:=+imagemagick +libpng ++endef ++ ++define Package/imagemagick-png/description ++ imagemagick PNG module ++endef ++ ++define Package/imagemagick-tools ++ $(call Package/imagemagick/Default) ++ TITLE+= (tools) ++ DEPENDS:=+imagemagick ++endef ++ ++define Package/imagemagick-png/description ++ imagemagick tools (mogrify,convert) ++endef ++ ++define Package/imagemagick-tiff ++ $(call Package/imagemagick/Default) ++ TITLE+= (tiff) ++ DEPENDS:=+imagemagick ++endef ++ ++define Package/imagemagick-tiff/description ++ imagemagick TIFF module ++endef ++ ++ ++CONFIGURE_ARGS += \ ++ --with-modules \ ++ --enable-shared \ ++ --enable-static \ ++ --without-pango \ ++ --without-bzlib \ ++ --without-freetype \ ++ --without-fontconfig \ ++ --without-rsvg \ ++ --without-fftw \ ++ --without-xml \ ++ --without-x \ ++ --without-magick-plus-plus ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux -I$(PKG_BUILD_DIR)/include" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/magick ++ $(INSTALL_DIR) $(1)/usr/include/wand ++ $(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/imagemagick/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/imagemagick-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/mogrify \ ++ $(1)/usr/bin/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/convert \ ++ $(1)/usr/bin/ ++endef ++ ++define BuildPlugin ++ define Package/imagemagick-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).so \ ++ $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).la \ ++ $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders ++ endef ++ ++ $$(eval $$(call BuildPackage,imagemagick-$(1))) ++endef ++ ++$(eval $(call BuildPackage,imagemagick)) ++$(eval $(call BuildPackage,imagemagick-tools)) ++$(eval $(call BuildPlugin,jpeg)) ++$(eval $(call BuildPlugin,png)) ++$(eval $(call BuildPlugin,tiff)) ++ +diff --git a/feeds/packages/multimedia/imagemagick/Makefile b/feeds/packages/multimedia/imagemagick/Makefile +new file mode 100644 +index 0000000..28a6bff +--- /dev/null ++++ b/feeds/packages/multimedia/imagemagick/Makefile +@@ -0,0 +1,157 @@ ++# ++# 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:=imagemagick ++PKG_VERSION:=6.7.8 ++PKG_REVISION:=10 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/ImageMagick-$(PKG_VERSION)-$(PKG_REVISION) ++PKG_SOURCE:=ImageMagick-$(PKG_VERSION)-$(PKG_REVISION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.fifi.org/pub/ImageMagick/ ++PKG_MD5SUM:=c66bea4710370b2e115aed512fbe4601 ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 m4/libtool.m4 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_INSTALL=1 ++ ++define Package/imagemagick/Default ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=imagemagick ++ URL:=http://image_magick.veidrodis.com/ ++endef ++ ++define Package/imagemagick ++ $(call Package/imagemagick/Default) ++ DEPENDS:=+libpthread +libltdl +libjpeg +libtiff +zlib ++endef ++ ++define Package/imagemagick/description ++ An image manipulation library. ++endef ++ ++define Package/imagemagick-jpeg ++ $(call Package/imagemagick/Default) ++ TITLE+= (jpeg) ++ DEPENDS:=+imagemagick ++endef ++ ++define Package/imagemagick-jpeg/description ++ imagemagick JPEG module ++endef ++ ++define Package/imagemagick-png ++ $(call Package/imagemagick/Default) ++ TITLE+= (png) ++ DEPENDS:=+imagemagick +libpng ++endef ++ ++define Package/imagemagick-png/description ++ imagemagick PNG module ++endef ++ ++define Package/imagemagick-tools ++ $(call Package/imagemagick/Default) ++ TITLE+= (tools) ++ DEPENDS:=+imagemagick ++endef ++ ++define Package/imagemagick-png/description ++ imagemagick tools (mogrify,convert) ++endef ++ ++define Package/imagemagick-tiff ++ $(call Package/imagemagick/Default) ++ TITLE+= (tiff) ++ DEPENDS:=+imagemagick ++endef ++ ++define Package/imagemagick-tiff/description ++ imagemagick TIFF module ++endef ++ ++ ++CONFIGURE_ARGS += \ ++ --with-modules \ ++ --enable-shared \ ++ --enable-static \ ++ --without-pango \ ++ --without-bzlib \ ++ --without-freetype \ ++ --without-fontconfig \ ++ --without-rsvg \ ++ --without-fftw \ ++ --without-xml \ ++ --without-x \ ++ --without-magick-plus-plus ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux -I$(PKG_BUILD_DIR)/include" ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/magick ++ $(INSTALL_DIR) $(1)/usr/include/wand ++ $(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/imagemagick/install ++ $(INSTALL_DIR) $(1)/usr/lib/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/imagemagick-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/mogrify \ ++ $(1)/usr/bin/ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/convert \ ++ $(1)/usr/bin/ ++endef ++ ++define BuildPlugin ++ define Package/imagemagick-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).so \ ++ $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders/$(1).la \ ++ $$(1)/usr/lib/ImageMagick-$(PKG_VERSION)/modules-Q16/coders ++ endef ++ ++ $$(eval $$(call BuildPackage,imagemagick-$(1))) ++endef ++ ++$(eval $(call BuildPackage,imagemagick)) ++$(eval $(call BuildPackage,imagemagick-tools)) ++$(eval $(call BuildPlugin,jpeg)) ++$(eval $(call BuildPlugin,png)) ++$(eval $(call BuildPlugin,tiff)) ++ +diff --git a/feeds/packages/multimedia/kissdx/.svn/entries b/feeds/packages/multimedia/kissdx/.svn/entries +new file mode 100644 +index 0000000..99a7eb9 +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/kissdx ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:02.908649Z ++33037 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d10698bd8c5819936cee93d0ff5683d1 ++2012-08-07T16:09:02.908649Z ++33037 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1958 ++ +diff --git a/feeds/packages/multimedia/kissdx/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/kissdx/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1b787db +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# 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:=kissdx ++PKG_REV:=193 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_URL:=http://www.famille-kahn.com/svn/kissdx/kissdx/trunk ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/kissdx ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libjpeg +libdvdread $(ICONV_DEPENDS) ++ TITLE:=PC-Link clone for KiSS media players ++ URL:=http://kissdx.vidartysse.net ++endef ++ ++define Package/kissdx/description ++ kissdx is a PC-Link clone for KiSS media players, based for ++ the most part on kissd (which it now replaces), with added ++ features for media playback, management, flexibility and more. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(ICONV_PREFIX)/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \ ++ LDFLAGS="-L$(ICONV_PREFIX)/lib $(TARGET_LDFLAGS)" \ ++ STRIP=$(STRIP) \ ++ IconvExternal=defined \ ++ CC="$(TARGET_CROSS)gcc" all ++endef ++ ++define Package/kissdx/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kissdx $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/kissdx.config $(1)/etc/config/kissdx ++ $(INSTALL_BIN) ./files/kissdx.init $(1)/etc/init.d/kissdx ++endef ++ ++define Package/kissdx/conffiles ++/etc/config/kissdx ++endef ++ ++$(eval $(call BuildPackage,kissdx)) +diff --git a/feeds/packages/multimedia/kissdx/Makefile b/feeds/packages/multimedia/kissdx/Makefile +new file mode 100644 +index 0000000..1b787db +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/Makefile +@@ -0,0 +1,64 @@ ++# ++# 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:=kissdx ++PKG_REV:=193 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_URL:=http://www.famille-kahn.com/svn/kissdx/kissdx/trunk ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/kissdx ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libjpeg +libdvdread $(ICONV_DEPENDS) ++ TITLE:=PC-Link clone for KiSS media players ++ URL:=http://kissdx.vidartysse.net ++endef ++ ++define Package/kissdx/description ++ kissdx is a PC-Link clone for KiSS media players, based for ++ the most part on kissd (which it now replaces), with added ++ features for media playback, management, flexibility and more. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(ICONV_PREFIX)/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \ ++ LDFLAGS="-L$(ICONV_PREFIX)/lib $(TARGET_LDFLAGS)" \ ++ STRIP=$(STRIP) \ ++ IconvExternal=defined \ ++ CC="$(TARGET_CROSS)gcc" all ++endef ++ ++define Package/kissdx/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kissdx $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/kissdx.config $(1)/etc/config/kissdx ++ $(INSTALL_BIN) ./files/kissdx.init $(1)/etc/init.d/kissdx ++endef ++ ++define Package/kissdx/conffiles ++/etc/config/kissdx ++endef ++ ++$(eval $(call BuildPackage,kissdx)) +diff --git a/feeds/packages/multimedia/kissdx/files/.svn/entries b/feeds/packages/multimedia/kissdx/files/.svn/entries +new file mode 100644 +index 0000000..b8edb68 +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/kissdx/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:02.908649Z ++33037 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++kissdx.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++ddc9ac93b46b8427c2e0f21fc0151b1d ++2012-08-07T16:09:02.908649Z ++33037 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4616 ++ ++kissdx.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++9480fd7075930e735370ba48a88d9839 ++2012-08-07T16:09:02.908649Z ++33037 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1049 ++ +diff --git a/feeds/packages/multimedia/kissdx/files/.svn/prop-base/kissdx.init.svn-base b/feeds/packages/multimedia/kissdx/files/.svn/prop-base/kissdx.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/files/.svn/prop-base/kissdx.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/multimedia/kissdx/files/.svn/text-base/kissdx.config.svn-base b/feeds/packages/multimedia/kissdx/files/.svn/text-base/kissdx.config.svn-base +new file mode 100644 +index 0000000..5cd2b17 +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/files/.svn/text-base/kissdx.config.svn-base +@@ -0,0 +1,34 @@ ++config 'kissdx' 'server' ++ option 'signature' 'kissdx {Version} ({VersionDate}) @ {ShortHostName} {ConfigReloadStatus}' ++ option 'pidfile' '/var/run/kissdx.pid' ++ option 'characterset' 'ISO-8859-1' ++ option 'picturetargetwidth' '1280' ++ option 'picturetargetheight' '720' ++ option 'picturemaxzoompercent' '20' ++ option 'enablehiddenfilestext' 'Show it all' ++ option 'enablehiddenfilesminutes' '5' ++ option 'listhiddenentries' 'no' ++ option 'displaysequencenumbers' 'no' ++ option 'loglevel' '4' ++ ++config 'kissdx' 'paths' ++ option 'audio' '/mnt/music' ++ option 'video' '/mnt/movies' ++ option 'picture' '/mnt/photos' ++ ++config 'kissdx' 'files' ++ option 'audio' 'mp3,ogg,wma,wav' ++ option 'video' 'mpg,mpeg,vob,avi,wmv,ts,mp4,divx' ++ option 'picture' 'jpg,jpeg,png,bmp' ++ option 'iso' 'iso,img' ++ option 'renamefiletypes' 'ts:mpg,wav:mp3' ++ ++config 'kissdx' 'subtitles' ++ option 'filemapping' '*:{name}*.*' ++ ++config 'kissdx' 'recentfiles' ++ option 'foldername' '[Recently played]' ++ option 'max' '30' ++ ++config 'kissdx' 'kml' ++ option 'forwardurl' 'http://tinystocks.com/k/kiss.php' +diff --git a/feeds/packages/multimedia/kissdx/files/.svn/text-base/kissdx.init.svn-base b/feeds/packages/multimedia/kissdx/files/.svn/text-base/kissdx.init.svn-base +new file mode 100644 +index 0000000..9f1a78e +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/files/.svn/text-base/kissdx.init.svn-base +@@ -0,0 +1,115 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=65 ++ ++SERVICE_USE_PID=1 ++ ++CFGFILE=/tmp/kissdx.conf ++ ++create_configfile() { ++ local signature pidfile characterset \ ++ picturetargetwidth picturetargetheight picturemaxzoompercent \ ++ enablehiddenfilestext enablehiddenfilesminutes \ ++ listhiddenentries displaysequencenumbers loglevel ++ local path_audio path_video path_picture ++ local files_audio files_video files_picture files_iso files_renamefiletypes ++ local subtitles_filemapping ++ local recentfiles_foldername recentfiles_max ++ local kml_forwardurl ++ ++ echo '### AUTOGENERATED CONFIGURATION FILE - DO NOT EDIT ###' > $CFGFILE ++ echo '### Edit /etc/config/kissdx to make changes to setup ###' >> $CFGFILE ++ echo '' >> $CFGFILE ++ ++ config_get signature server signature ++ config_get pidfile server pidfile ++ config_get characterset server characterset ++ config_get picturetargetwidth server picturetargetwidth ++ config_get picturetargetheight server picturetargetheight ++ config_get picturemaxzoompercent server picturemaxzoompercent ++ config_get enablehiddenfilestext server enablehiddenfilestext ++ config_get enablehiddenfilesminutes server enablehiddenfilesminutes ++ config_get listhiddenentries server listhiddenentries ++ config_get displaysequencenumbers server displaysequencenumbers ++ config_get loglevel server loglevel ++ ++ config_get path_audio paths audio ++ config_get path_video paths video ++ config_get path_picture paths picture ++ ++ config_get files_audio files audio ++ config_get files_video files video ++ config_get files_picture files picture ++ config_get files_iso files iso ++ config_get files_renamefiletypes files renamefiletypes ++ ++ config_get subtitles_filemapping subtitles filemapping ++ ++ config_get recentfiles_foldername recentfiles foldername ++ config_get recentfiles_max recentfiles max ++ ++ config_get kml_forwardurl kml forwardurl ++ ++ echo 'serversignature = ' $signature >> $CFGFILE ++ echo '#listenaddress = 192.168.1.2' >> $CFGFILE ++ echo '#networktimeoutinterval = 3600' >> $CFGFILE ++ echo '#adminserver_port = 8003' >> $CFGFILE ++ echo 'configautoload = no' >> $CFGFILE ++ echo '#dvdaccessmethod = libdvdnav' >> $CFGFILE ++ echo 'pidfilepath = ' $pidfile >> $CFGFILE ++ echo '#persistentstoragepath = /tmp/kissdx' >> $CFGFILE ++ echo '#server_character_set = CP850' >> $CFGFILE ++ echo '#client_character_set = ISO-8859-1' >> $CFGFILE ++ echo 'config_character_set = ' $characterset >> $CFGFILE ++ echo 'playlist_character_set = ' $characterset >> $CFGFILE ++ echo 'displaysequencenumbers = ' $displaysequencenumbers >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo '# 0 = caching disabled, -1 = no limit or amount of pictures in cache' >> $CFGFILE ++ echo 'picturecachesize = 0' >> $CFGFILE ++ echo '#picturecachetrimminginterval = 10' >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'audiopath = ' $path_audio >> $CFGFILE ++ echo 'videopath = ' $path_video >> $CFGFILE ++ echo 'picturepath = ' $path_picture >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'audiofileextensions = ' $files_audio >> $CFGFILE ++ echo 'videofileextensions = ' $files_video >> $CFGFILE ++ echo 'picturefileextensions = ' $files_picture >> $CFGFILE ++ echo 'isofileextensions = ' $files_iso >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'renamefiletypes = ' $files_renamefiletypes >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'listhiddenentries = ' $listhiddenentries >> $CFGFILE ++ echo 'enablehiddenfilestext = ' $enablehiddenfilestext >> $CFGFILE ++ echo 'enablehiddenfilesminutes = ' $enablehiddenfilesminutes >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'picturetargetwidth = ' $picturetargetwidth >> $CFGFILE ++ echo 'picturetargetheight = ' $picturetargetheight >> $CFGFILE ++ echo 'picturemaxzoompercent = ' $picturemaxzoompercent >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'subtitlefilemapping = ' $subtitles_filemapping >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'recentlyusedfoldername = ' $recentfiles_foldername >> $CFGFILE ++ echo 'max_recent_files = ' $recentfiles_max >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'kmlforwardurl = ' $kml_forwardurl >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo '#pretrigger = /usr/bin/kissd-pretrigger' >> $CFGFILE ++ echo '#posttrigger = /usr/bin/kissd-posttrigger' >> $CFGFILE ++ echo '#directorypretrigger = /usr/bin/kissddirpretrigger' >> $CFGFILE ++ echo '#directoryposttrigger = /usr/bin/kisdddirposttrigger' >> $CFGFILE ++ echo '#Set logging level (1 to 5). 5 means no log. Loglevel can also be' >> $CFGFILE ++ echo '#specified as one of: Error, Warning, Protocol, Information, Debug.' >> $CFGFILE ++ echo 'loglevel = ' $loglevel >> $CFGFILE ++} ++ ++start () { ++ config_load kissdx ++ create_configfile ++ service_start /usr/bin/kissdx -c $CFGFILE -d ++} ++ ++stop() { ++ service_stop /usr/bin/kissdx ++} +diff --git a/feeds/packages/multimedia/kissdx/files/kissdx.config b/feeds/packages/multimedia/kissdx/files/kissdx.config +new file mode 100644 +index 0000000..5cd2b17 +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/files/kissdx.config +@@ -0,0 +1,34 @@ ++config 'kissdx' 'server' ++ option 'signature' 'kissdx {Version} ({VersionDate}) @ {ShortHostName} {ConfigReloadStatus}' ++ option 'pidfile' '/var/run/kissdx.pid' ++ option 'characterset' 'ISO-8859-1' ++ option 'picturetargetwidth' '1280' ++ option 'picturetargetheight' '720' ++ option 'picturemaxzoompercent' '20' ++ option 'enablehiddenfilestext' 'Show it all' ++ option 'enablehiddenfilesminutes' '5' ++ option 'listhiddenentries' 'no' ++ option 'displaysequencenumbers' 'no' ++ option 'loglevel' '4' ++ ++config 'kissdx' 'paths' ++ option 'audio' '/mnt/music' ++ option 'video' '/mnt/movies' ++ option 'picture' '/mnt/photos' ++ ++config 'kissdx' 'files' ++ option 'audio' 'mp3,ogg,wma,wav' ++ option 'video' 'mpg,mpeg,vob,avi,wmv,ts,mp4,divx' ++ option 'picture' 'jpg,jpeg,png,bmp' ++ option 'iso' 'iso,img' ++ option 'renamefiletypes' 'ts:mpg,wav:mp3' ++ ++config 'kissdx' 'subtitles' ++ option 'filemapping' '*:{name}*.*' ++ ++config 'kissdx' 'recentfiles' ++ option 'foldername' '[Recently played]' ++ option 'max' '30' ++ ++config 'kissdx' 'kml' ++ option 'forwardurl' 'http://tinystocks.com/k/kiss.php' +diff --git a/feeds/packages/multimedia/kissdx/files/kissdx.init b/feeds/packages/multimedia/kissdx/files/kissdx.init +new file mode 100755 +index 0000000..9f1a78e +--- /dev/null ++++ b/feeds/packages/multimedia/kissdx/files/kissdx.init +@@ -0,0 +1,115 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=65 ++ ++SERVICE_USE_PID=1 ++ ++CFGFILE=/tmp/kissdx.conf ++ ++create_configfile() { ++ local signature pidfile characterset \ ++ picturetargetwidth picturetargetheight picturemaxzoompercent \ ++ enablehiddenfilestext enablehiddenfilesminutes \ ++ listhiddenentries displaysequencenumbers loglevel ++ local path_audio path_video path_picture ++ local files_audio files_video files_picture files_iso files_renamefiletypes ++ local subtitles_filemapping ++ local recentfiles_foldername recentfiles_max ++ local kml_forwardurl ++ ++ echo '### AUTOGENERATED CONFIGURATION FILE - DO NOT EDIT ###' > $CFGFILE ++ echo '### Edit /etc/config/kissdx to make changes to setup ###' >> $CFGFILE ++ echo '' >> $CFGFILE ++ ++ config_get signature server signature ++ config_get pidfile server pidfile ++ config_get characterset server characterset ++ config_get picturetargetwidth server picturetargetwidth ++ config_get picturetargetheight server picturetargetheight ++ config_get picturemaxzoompercent server picturemaxzoompercent ++ config_get enablehiddenfilestext server enablehiddenfilestext ++ config_get enablehiddenfilesminutes server enablehiddenfilesminutes ++ config_get listhiddenentries server listhiddenentries ++ config_get displaysequencenumbers server displaysequencenumbers ++ config_get loglevel server loglevel ++ ++ config_get path_audio paths audio ++ config_get path_video paths video ++ config_get path_picture paths picture ++ ++ config_get files_audio files audio ++ config_get files_video files video ++ config_get files_picture files picture ++ config_get files_iso files iso ++ config_get files_renamefiletypes files renamefiletypes ++ ++ config_get subtitles_filemapping subtitles filemapping ++ ++ config_get recentfiles_foldername recentfiles foldername ++ config_get recentfiles_max recentfiles max ++ ++ config_get kml_forwardurl kml forwardurl ++ ++ echo 'serversignature = ' $signature >> $CFGFILE ++ echo '#listenaddress = 192.168.1.2' >> $CFGFILE ++ echo '#networktimeoutinterval = 3600' >> $CFGFILE ++ echo '#adminserver_port = 8003' >> $CFGFILE ++ echo 'configautoload = no' >> $CFGFILE ++ echo '#dvdaccessmethod = libdvdnav' >> $CFGFILE ++ echo 'pidfilepath = ' $pidfile >> $CFGFILE ++ echo '#persistentstoragepath = /tmp/kissdx' >> $CFGFILE ++ echo '#server_character_set = CP850' >> $CFGFILE ++ echo '#client_character_set = ISO-8859-1' >> $CFGFILE ++ echo 'config_character_set = ' $characterset >> $CFGFILE ++ echo 'playlist_character_set = ' $characterset >> $CFGFILE ++ echo 'displaysequencenumbers = ' $displaysequencenumbers >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo '# 0 = caching disabled, -1 = no limit or amount of pictures in cache' >> $CFGFILE ++ echo 'picturecachesize = 0' >> $CFGFILE ++ echo '#picturecachetrimminginterval = 10' >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'audiopath = ' $path_audio >> $CFGFILE ++ echo 'videopath = ' $path_video >> $CFGFILE ++ echo 'picturepath = ' $path_picture >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'audiofileextensions = ' $files_audio >> $CFGFILE ++ echo 'videofileextensions = ' $files_video >> $CFGFILE ++ echo 'picturefileextensions = ' $files_picture >> $CFGFILE ++ echo 'isofileextensions = ' $files_iso >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'renamefiletypes = ' $files_renamefiletypes >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'listhiddenentries = ' $listhiddenentries >> $CFGFILE ++ echo 'enablehiddenfilestext = ' $enablehiddenfilestext >> $CFGFILE ++ echo 'enablehiddenfilesminutes = ' $enablehiddenfilesminutes >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'picturetargetwidth = ' $picturetargetwidth >> $CFGFILE ++ echo 'picturetargetheight = ' $picturetargetheight >> $CFGFILE ++ echo 'picturemaxzoompercent = ' $picturemaxzoompercent >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'subtitlefilemapping = ' $subtitles_filemapping >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'recentlyusedfoldername = ' $recentfiles_foldername >> $CFGFILE ++ echo 'max_recent_files = ' $recentfiles_max >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo 'kmlforwardurl = ' $kml_forwardurl >> $CFGFILE ++ echo '' >> $CFGFILE ++ echo '#pretrigger = /usr/bin/kissd-pretrigger' >> $CFGFILE ++ echo '#posttrigger = /usr/bin/kissd-posttrigger' >> $CFGFILE ++ echo '#directorypretrigger = /usr/bin/kissddirpretrigger' >> $CFGFILE ++ echo '#directoryposttrigger = /usr/bin/kisdddirposttrigger' >> $CFGFILE ++ echo '#Set logging level (1 to 5). 5 means no log. Loglevel can also be' >> $CFGFILE ++ echo '#specified as one of: Error, Warning, Protocol, Information, Debug.' >> $CFGFILE ++ echo 'loglevel = ' $loglevel >> $CFGFILE ++} ++ ++start () { ++ config_load kissdx ++ create_configfile ++ service_start /usr/bin/kissdx -c $CFGFILE -d ++} ++ ++stop() { ++ service_stop /usr/bin/kissdx ++} +diff --git a/feeds/packages/multimedia/minidlna/.svn/entries b/feeds/packages/multimedia/minidlna/.svn/entries +new file mode 100644 +index 0000000..c659f4d +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/minidlna ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T10:04:17.027695Z ++35658 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++757eaa64703b3b9e0e0fed6bf13de50d ++2013-02-18T10:04:17.027695Z ++35658 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2400 ++ +diff --git a/feeds/packages/multimedia/minidlna/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/minidlna/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..be9804d +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,91 @@ ++# ++# Copyright (C) 2010-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:=minidlna ++PKG_VERSION:=1.0.25 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz ++PKG_SOURCE_URL:=@SF/minidlna ++PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5 ++ ++PKG_BUILD_PARALLEL:=0 ++PKG_BUILD_DEPENDS:=util-linux ++ ++include $(INCLUDE_DIR)/kernel.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/minidlna ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=UPnP A/V & DLNA Media Server ++ URL:=http://minidlna.sourceforge.net/ ++ DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \ ++ +libid3tag +libflac +libvorbis +libuuid \ ++ $(ICONV_DEPENDS) $(INTL_DEPENDS) ++endef ++ ++define Package/minidlna/description ++ MiniDLNA (aka ReadyDLNA) is server software with the aim of ++ being fully compliant with DLNA/UPnP-AV clients. ++endef ++ ++define Package/minidlna/conffiles ++/etc/minidlna.conf ++endef ++ ++TARGET_CPPFLAGS += \ ++ -I$(STAGING_DIR)/usr/include \ ++ -I$(STAGING_DIR)/usr/include/FLAC \ ++ -I$(STAGING_DIR)/usr/include/libavcodec \ ++ -I$(STAGING_DIR)/usr/include/libavformat \ ++ -I$(STAGING_DIR)/usr/include/libavutil \ ++ -I$(STAGING_DIR)/usr/include/libexif \ ++ -I$(STAGING_DIR)/usr/include/uuid \ ++ -I$(STAGING_DIR)/usr/include/vorbis \ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(INTL_PREFIX)/include \ ++ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ ++ ++TARGET_LDFLAGS += \ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/lib \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ ++MAKE_FLAGS +=\ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ ICONV_LIBS="-liconv $(if $(INTL_FULL),-lintl)" \ ++ ++MAKE_VARS +=\ ++ PREFIX="$(STAGING_DIR)/usr" \ ++ ICONV_PREFIX="$(ICONV_PREFIX)" \ ++ INTL_PREFIX="$(INTL_PREFIX)" \ ++ OS_NAME="OpenWrt Linux" \ ++ OS_VERSION="$(LINUX_VERSION)" \ ++ OS_URL="http://openwrt.org/" \ ++ DB_PATH="/var/run/minidlna" \ ++ LOG_PATH="/var/log" \ ++ ++ ++define Package/minidlna/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/minidlna.config $(1)/etc/config/minidlna ++endef ++ ++define Package/minidlna/conffiles ++/etc/config/minidlna ++endef ++ ++$(eval $(call BuildPackage,minidlna)) +diff --git a/feeds/packages/multimedia/minidlna/Makefile b/feeds/packages/multimedia/minidlna/Makefile +new file mode 100644 +index 0000000..be9804d +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/Makefile +@@ -0,0 +1,91 @@ ++# ++# Copyright (C) 2010-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:=minidlna ++PKG_VERSION:=1.0.25 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz ++PKG_SOURCE_URL:=@SF/minidlna ++PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5 ++ ++PKG_BUILD_PARALLEL:=0 ++PKG_BUILD_DEPENDS:=util-linux ++ ++include $(INCLUDE_DIR)/kernel.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/minidlna ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=UPnP A/V & DLNA Media Server ++ URL:=http://minidlna.sourceforge.net/ ++ DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \ ++ +libid3tag +libflac +libvorbis +libuuid \ ++ $(ICONV_DEPENDS) $(INTL_DEPENDS) ++endef ++ ++define Package/minidlna/description ++ MiniDLNA (aka ReadyDLNA) is server software with the aim of ++ being fully compliant with DLNA/UPnP-AV clients. ++endef ++ ++define Package/minidlna/conffiles ++/etc/minidlna.conf ++endef ++ ++TARGET_CPPFLAGS += \ ++ -I$(STAGING_DIR)/usr/include \ ++ -I$(STAGING_DIR)/usr/include/FLAC \ ++ -I$(STAGING_DIR)/usr/include/libavcodec \ ++ -I$(STAGING_DIR)/usr/include/libavformat \ ++ -I$(STAGING_DIR)/usr/include/libavutil \ ++ -I$(STAGING_DIR)/usr/include/libexif \ ++ -I$(STAGING_DIR)/usr/include/uuid \ ++ -I$(STAGING_DIR)/usr/include/vorbis \ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(INTL_PREFIX)/include \ ++ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ ++ ++TARGET_LDFLAGS += \ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/lib \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ ++MAKE_FLAGS +=\ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ ICONV_LIBS="-liconv $(if $(INTL_FULL),-lintl)" \ ++ ++MAKE_VARS +=\ ++ PREFIX="$(STAGING_DIR)/usr" \ ++ ICONV_PREFIX="$(ICONV_PREFIX)" \ ++ INTL_PREFIX="$(INTL_PREFIX)" \ ++ OS_NAME="OpenWrt Linux" \ ++ OS_VERSION="$(LINUX_VERSION)" \ ++ OS_URL="http://openwrt.org/" \ ++ DB_PATH="/var/run/minidlna" \ ++ LOG_PATH="/var/log" \ ++ ++ ++define Package/minidlna/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/minidlna.config $(1)/etc/config/minidlna ++endef ++ ++define Package/minidlna/conffiles ++/etc/config/minidlna ++endef ++ ++$(eval $(call BuildPackage,minidlna)) +diff --git a/feeds/packages/multimedia/minidlna/files/.svn/entries b/feeds/packages/multimedia/minidlna/files/.svn/entries +new file mode 100644 +index 0000000..09cd4a5 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/minidlna/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-10T20:27:27.002900Z ++34612 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++minidlna.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++6911e04bf862a9e3934b9a88bcf51776 ++2012-04-06T06:51:20.762372Z ++31211 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++595 ++ ++minidlna.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++03d58f17d64ef121ce4a4d4e7c8df920 ++2012-12-10T20:27:27.002900Z ++34612 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2108 ++ +diff --git a/feeds/packages/multimedia/minidlna/files/.svn/text-base/minidlna.config.svn-base b/feeds/packages/multimedia/minidlna/files/.svn/text-base/minidlna.config.svn-base +new file mode 100644 +index 0000000..459be3e +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/files/.svn/text-base/minidlna.config.svn-base +@@ -0,0 +1,17 @@ ++config minidlna config ++ option 'enabled' '0' ++ option port '8200' ++ option interface 'br-lan' ++ option friendly_name 'OpenWrt DLNA Server' ++ option db_dir '/var/run/minidlna' ++ option log_dir '/var/log' ++ option inotify '1' ++ option enable_tivo '0' ++ option strict_dlna '0' ++ option presentation_url '' ++ option notify_interval '900' ++ option serial '12345678' ++ option model_number '1' ++ option root_container '.' ++ list media_dir '/mnt' ++ option album_art_names 'Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg' +diff --git a/feeds/packages/multimedia/minidlna/files/.svn/text-base/minidlna.init.svn-base b/feeds/packages/multimedia/minidlna/files/.svn/text-base/minidlna.init.svn-base +new file mode 100644 +index 0000000..581c8d1 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/files/.svn/text-base/minidlna.init.svn-base +@@ -0,0 +1,96 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++MINIDLNA_CONFIG_FILE="/tmp/minidlna.conf" ++ ++minidlna_cfg_append() { ++ echo "$1" >> "$MINIDLNA_CONFIG_FILE" ++} ++ ++minidlna_cfg_addbool() { ++ local cfg="$1" ++ local key="$2" ++ local def="$3" ++ local val ++ ++ config_get_bool val "$cfg" "$key" "$def" ++ [ "$val" -gt 0 ] && val="yes" || val="no" ++ minidlna_cfg_append "$key=$val" ++} ++ ++minidlna_cfg_addstr() { ++ local cfg="$1" ++ local key="$2" ++ local def="$3" ++ local val ++ ++ config_get val "$cfg" "$key" "$def" ++ [ -n "$val" ] && minidlna_cfg_append "$key=$val" ++} ++ ++minidlna_cfg_add_media_dir() { ++ local val=$1 ++ ++ minidlna_cfg_append "media_dir=$val" ++} ++ ++minidlna_create_config() { ++ local cfg=$1 ++ local port ++ local interface ++ ++ config_get port $cfg port ++ config_get interface $cfg interface ++ ++ [ -z "$interface" -o -t "$port" ] && return 1 ++ ++ echo "# this file is generated automatically, don't edit" > "$MINIDLNA_CONFIG_FILE" ++ ++ minidlna_cfg_append "port=$port" ++ minidlna_cfg_append "network_interface=$interface" ++ ++ minidlna_cfg_addstr $cfg friendly_name ++ minidlna_cfg_addstr $cfg db_dir ++ minidlna_cfg_addstr $cfg log_dir ++ minidlna_cfg_addbool $cfg inotify '1' ++ minidlna_cfg_addbool $cfg enable_tivo '0' ++ minidlna_cfg_addbool $cfg strict_dlna '0' ++ minidlna_cfg_addstr $cfg album_art_names ++ minidlna_cfg_addstr $cfg presentation_url ++ minidlna_cfg_addstr $cfg notify_interval '900' ++ minidlna_cfg_addstr $cfg serial '12345678' ++ minidlna_cfg_addstr $cfg model_number '1' ++ minidlna_cfg_addstr $cfg minissdpsocket ++ minidlna_cfg_addstr $cfg root_container '.' ++ config_list_foreach "$cfg" "media_dir" minidlna_cfg_add_media_dir ++ ++ return 0 ++} ++ ++start() { ++ local enabled ++ local db_dir ++ local log_dir ++ ++ config_load 'minidlna' ++ config_get_bool enabled config 'enabled' '0' ++ ++ [ "$enabled" -gt 0 ] || return 1 ++ ++ minidlna_create_config config || return 1 ++ ++ config_get db_dir config 'db_dir' '/var/run/minidlna' ++ config_get log_dir config 'log_dir' '/var/log' ++ ++ mkdir -m 0755 -p $db_dir ++ mkdir -m 0755 -p $log_dir ++ service_start /usr/bin/minidlna -f "$MINIDLNA_CONFIG_FILE" ++} ++ ++stop() { ++ service_stop /usr/bin/minidlna ++} +diff --git a/feeds/packages/multimedia/minidlna/files/minidlna.config b/feeds/packages/multimedia/minidlna/files/minidlna.config +new file mode 100644 +index 0000000..459be3e +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/files/minidlna.config +@@ -0,0 +1,17 @@ ++config minidlna config ++ option 'enabled' '0' ++ option port '8200' ++ option interface 'br-lan' ++ option friendly_name 'OpenWrt DLNA Server' ++ option db_dir '/var/run/minidlna' ++ option log_dir '/var/log' ++ option inotify '1' ++ option enable_tivo '0' ++ option strict_dlna '0' ++ option presentation_url '' ++ option notify_interval '900' ++ option serial '12345678' ++ option model_number '1' ++ option root_container '.' ++ list media_dir '/mnt' ++ option album_art_names 'Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg' +diff --git a/feeds/packages/multimedia/minidlna/files/minidlna.init b/feeds/packages/multimedia/minidlna/files/minidlna.init +new file mode 100644 +index 0000000..581c8d1 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/files/minidlna.init +@@ -0,0 +1,96 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++MINIDLNA_CONFIG_FILE="/tmp/minidlna.conf" ++ ++minidlna_cfg_append() { ++ echo "$1" >> "$MINIDLNA_CONFIG_FILE" ++} ++ ++minidlna_cfg_addbool() { ++ local cfg="$1" ++ local key="$2" ++ local def="$3" ++ local val ++ ++ config_get_bool val "$cfg" "$key" "$def" ++ [ "$val" -gt 0 ] && val="yes" || val="no" ++ minidlna_cfg_append "$key=$val" ++} ++ ++minidlna_cfg_addstr() { ++ local cfg="$1" ++ local key="$2" ++ local def="$3" ++ local val ++ ++ config_get val "$cfg" "$key" "$def" ++ [ -n "$val" ] && minidlna_cfg_append "$key=$val" ++} ++ ++minidlna_cfg_add_media_dir() { ++ local val=$1 ++ ++ minidlna_cfg_append "media_dir=$val" ++} ++ ++minidlna_create_config() { ++ local cfg=$1 ++ local port ++ local interface ++ ++ config_get port $cfg port ++ config_get interface $cfg interface ++ ++ [ -z "$interface" -o -t "$port" ] && return 1 ++ ++ echo "# this file is generated automatically, don't edit" > "$MINIDLNA_CONFIG_FILE" ++ ++ minidlna_cfg_append "port=$port" ++ minidlna_cfg_append "network_interface=$interface" ++ ++ minidlna_cfg_addstr $cfg friendly_name ++ minidlna_cfg_addstr $cfg db_dir ++ minidlna_cfg_addstr $cfg log_dir ++ minidlna_cfg_addbool $cfg inotify '1' ++ minidlna_cfg_addbool $cfg enable_tivo '0' ++ minidlna_cfg_addbool $cfg strict_dlna '0' ++ minidlna_cfg_addstr $cfg album_art_names ++ minidlna_cfg_addstr $cfg presentation_url ++ minidlna_cfg_addstr $cfg notify_interval '900' ++ minidlna_cfg_addstr $cfg serial '12345678' ++ minidlna_cfg_addstr $cfg model_number '1' ++ minidlna_cfg_addstr $cfg minissdpsocket ++ minidlna_cfg_addstr $cfg root_container '.' ++ config_list_foreach "$cfg" "media_dir" minidlna_cfg_add_media_dir ++ ++ return 0 ++} ++ ++start() { ++ local enabled ++ local db_dir ++ local log_dir ++ ++ config_load 'minidlna' ++ config_get_bool enabled config 'enabled' '0' ++ ++ [ "$enabled" -gt 0 ] || return 1 ++ ++ minidlna_create_config config || return 1 ++ ++ config_get db_dir config 'db_dir' '/var/run/minidlna' ++ config_get log_dir config 'log_dir' '/var/log' ++ ++ mkdir -m 0755 -p $db_dir ++ mkdir -m 0755 -p $log_dir ++ service_start /usr/bin/minidlna -f "$MINIDLNA_CONFIG_FILE" ++} ++ ++stop() { ++ service_stop /usr/bin/minidlna ++} +diff --git a/feeds/packages/multimedia/minidlna/patches/.svn/entries b/feeds/packages/multimedia/minidlna/patches/.svn/entries +new file mode 100644 +index 0000000..16ae7ce +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/minidlna/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T10:04:17.027695Z ++35658 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++020-makefile-tweaks.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d17c1ddf1f6e6c59a5a7d40462febfd9 ++2012-03-18T20:31:54.845094Z ++30990 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1819 ++ ++030-missing-include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++65387b61d27f17c7a89c48893d6df0fa ++2011-04-07T23:32:01.607394Z ++26530 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++205 ++ ++010-genconfig-checks.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++66c6eefac86edbb189a1db90b9237346 ++2012-03-18T20:31:54.845094Z ++30990 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3958 ++ ++040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++bcd249856997f2d6a46950248a403f59 ++2013-02-18T10:04:17.027695Z ++35658 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++393 ++ +diff --git a/feeds/packages/multimedia/minidlna/patches/.svn/text-base/010-genconfig-checks.patch.svn-base b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/010-genconfig-checks.patch.svn-base +new file mode 100644 +index 0000000..bce8456 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/010-genconfig-checks.patch.svn-base +@@ -0,0 +1,92 @@ ++--- a/genconfig.sh +++++ b/genconfig.sh ++@@ -23,14 +23,18 @@ RM="rm -f" ++ CONFIGFILE="config.h" ++ CONFIGMACRO="__CONFIG_H__" ++ +++PREFIX="${PREFIX:-/usr}" +++ICONV_PREFIX="${ICONV_PREFIX:-$PREFIX}" +++INTL_PREFIX="${INTL_PREFIX:-$PREFIX}" +++ ++ # Database path ++-DB_PATH="/tmp/minidlna" +++DB_PATH="${DB_PATH:-/tmp/minidlna}" ++ # Log path ++-LOG_PATH="${DB_PATH}" +++LOG_PATH="${LOG_PATH:-$DB_PATH}" ++ ++ # detecting the OS name and version ++-OS_NAME=`uname -s` ++-OS_VERSION=`uname -r` +++OS_NAME="${OS_NAME:-$(uname -s)}" +++OS_VERSION="${OS_VERSION:-$(uname -r)}" ++ TIVO="/*#define TIVO_SUPPORT*/" ++ NETGEAR="/*#define NETGEAR*/" ++ READYNAS="/*#define READYNAS*/" ++@@ -40,22 +44,22 @@ ${RM} ${CONFIGFILE} ++ ++ # Detect if there are missing headers ++ # NOTE: This check only works with a normal distro ++-[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" ++-[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" ++-[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" ++-[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" ++-[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" ++-[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" ++-[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" ++-[ ! -e "/usr/include/ffmpeg/avutil.h" -a \ ++- ! -e "/usr/include/libavutil/avutil.h" -a \ ++- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" ++-[ ! -e "/usr/include/ffmpeg/avformat.h" -a \ ++- ! -e "/usr/include/libavformat/avformat.h" -a \ ++- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" ++-[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ ++- ! -e "/usr/include/libavcodec/avcodec.h" -a \ ++- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" +++[ ! -e "${PREFIX}/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" +++[ ! -e "${PREFIX}/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" +++[ ! -e "${PREFIX}/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" +++[ ! -e "${PREFIX}/include/id3tag.h" ] && MISSING="libid3tag $MISSING" +++[ ! -e "${PREFIX}/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" +++[ ! -e "${PREFIX}/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" +++[ ! -e "${PREFIX}/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" +++[ ! -e "${PREFIX}/include/ffmpeg/avutil.h" -a \ +++ ! -e "${PREFIX}/include/libavutil/avutil.h" -a \ +++ ! -e "${PREFIX}/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" +++[ ! -e "${PREFIX}/include/ffmpeg/avformat.h" -a \ +++ ! -e "${PREFIX}/include/libavformat/avformat.h" -a \ +++ ! -e "${PREFIX}/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" +++[ ! -e "${PREFIX}/include/ffmpeg/avcodec.h" -a \ +++ ! -e "${PREFIX}/include/libavcodec/avcodec.h" -a \ +++ ! -e "${PREFIX}/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" ++ if [ -n "$MISSING" ]; then ++ echo -e "\nERROR! Cannot continue." ++ echo -e "The following required libraries are either missing, or are missing development headers:\n" ++@@ -151,8 +155,7 @@ case $OS_NAME in ++ fi ++ ;; ++ *) ++- echo "Unknown OS : $OS_NAME" ++- exit 1 +++ echo "WARNING: Unknown OS : $OS_NAME" 1>&2 ++ ;; ++ esac ++ ++@@ -183,7 +186,7 @@ fi ++ echo "" >> ${CONFIGFILE} ++ ++ echo "/* Enable if the system iconv.h exists. ID3 tag reading in various character sets will not work properly otherwise. */" >> ${CONFIGFILE} ++-if [ -f /usr/include/iconv.h ]; then +++if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then ++ echo "#define HAVE_ICONV_H" >> ${CONFIGFILE} ++ else ++ echo -e "\nWARNING!! Iconv support not found. ID3 tag reading may not work." ++@@ -192,7 +195,7 @@ fi ++ echo "" >> ${CONFIGFILE} ++ ++ echo "/* Enable if the system libintl.h exists for NLS support. */" >> ${CONFIGFILE} ++-if [ -f /usr/include/libintl.h ]; then +++if [ -f ${INTL_PREFIX}/include/libintl.h ]; then ++ echo "#define ENABLE_NLS" >> ${CONFIGFILE} ++ else ++ echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE} +diff --git a/feeds/packages/multimedia/minidlna/patches/.svn/text-base/020-makefile-tweaks.patch.svn-base b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/020-makefile-tweaks.patch.svn-base +new file mode 100644 +index 0000000..8314d94 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/020-makefile-tweaks.patch.svn-base +@@ -0,0 +1,48 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -10,19 +10,23 @@ ++ # or : ++ # $ make install ++ # +++PREFIX ?= /usr +++ICONV_PREFIX ?= $(PREFIX) +++INTL_PREFIX ?= $(PREFIX) ++ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG ++ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE ++ CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ ++- -I/usr/include/ffmpeg \ ++- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ ++- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat +++ -I$(PREFIX)/include/ffmpeg \ +++ -I$(PREFIX)/include/libavutil -I$(PREFIX)/include/libavcodec -I$(PREFIX)/include/libavformat \ +++ -I$(PREFIX)/include/ffmpeg/libavutil -I$(PREFIX)/include/ffmpeg/libavcodec -I$(PREFIX)/include/ffmpeg/libavformat +++ ++ #STATIC_LINKING: CFLAGS += -DSTATIC ++ #STATIC_LINKING: LDFLAGS = -static ++ CC = gcc ++ RM = rm -f ++ INSTALL = install ++ ++-INSTALLPREFIX ?= $(DESTDIR)/usr +++INSTALLPREFIX ?= $(DESTDIR)$(PREFIX) ++ SBININSTALLDIR = $(INSTALLPREFIX)/sbin ++ ETCINSTALLDIR = $(DESTDIR)/etc ++ ++@@ -37,7 +41,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes ++ ++ ALLOBJS = $(BASEOBJS) $(LNXOBJS) ++ ++-LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis +++LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid $(ICONV_LIBS) ++ #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm ++ ++ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o ++@@ -64,7 +68,7 @@ install-conf: ++ $(INSTALL) -d $(ETCINSTALLDIR) ++ $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) ++ ++-minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS) +++minidlna: $(BASEOBJS) $(LNXOBJS) ++ @echo Linking $@ ++ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS) ++ +diff --git a/feeds/packages/multimedia/minidlna/patches/.svn/text-base/030-missing-include.patch.svn-base b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/030-missing-include.patch.svn-base +new file mode 100644 +index 0000000..a1491ba +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/030-missing-include.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/minidlna.c +++++ b/minidlna.c ++@@ -58,6 +58,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/multimedia/minidlna/patches/.svn/text-base/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch.svn-base b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch.svn-base +new file mode 100644 +index 0000000..5f69126 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/.svn/text-base/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/metadata.c 2012-08-27 23:00:06.997932249 +0100 +++++ b/metadata.c 2012-08-27 23:10:07.716582960 +0100 ++@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch ++ static inline void ++ lav_close(AVFormatContext *ctx) ++ { ++-#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0) +++#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0) ++ avformat_close_input(&ctx); ++ #else ++ av_close_input_file(ctx); +diff --git a/feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch b/feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch +new file mode 100644 +index 0000000..bce8456 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch +@@ -0,0 +1,92 @@ ++--- a/genconfig.sh +++++ b/genconfig.sh ++@@ -23,14 +23,18 @@ RM="rm -f" ++ CONFIGFILE="config.h" ++ CONFIGMACRO="__CONFIG_H__" ++ +++PREFIX="${PREFIX:-/usr}" +++ICONV_PREFIX="${ICONV_PREFIX:-$PREFIX}" +++INTL_PREFIX="${INTL_PREFIX:-$PREFIX}" +++ ++ # Database path ++-DB_PATH="/tmp/minidlna" +++DB_PATH="${DB_PATH:-/tmp/minidlna}" ++ # Log path ++-LOG_PATH="${DB_PATH}" +++LOG_PATH="${LOG_PATH:-$DB_PATH}" ++ ++ # detecting the OS name and version ++-OS_NAME=`uname -s` ++-OS_VERSION=`uname -r` +++OS_NAME="${OS_NAME:-$(uname -s)}" +++OS_VERSION="${OS_VERSION:-$(uname -r)}" ++ TIVO="/*#define TIVO_SUPPORT*/" ++ NETGEAR="/*#define NETGEAR*/" ++ READYNAS="/*#define READYNAS*/" ++@@ -40,22 +44,22 @@ ${RM} ${CONFIGFILE} ++ ++ # Detect if there are missing headers ++ # NOTE: This check only works with a normal distro ++-[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" ++-[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" ++-[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" ++-[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" ++-[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" ++-[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" ++-[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" ++-[ ! -e "/usr/include/ffmpeg/avutil.h" -a \ ++- ! -e "/usr/include/libavutil/avutil.h" -a \ ++- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" ++-[ ! -e "/usr/include/ffmpeg/avformat.h" -a \ ++- ! -e "/usr/include/libavformat/avformat.h" -a \ ++- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" ++-[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ ++- ! -e "/usr/include/libavcodec/avcodec.h" -a \ ++- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" +++[ ! -e "${PREFIX}/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" +++[ ! -e "${PREFIX}/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" +++[ ! -e "${PREFIX}/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" +++[ ! -e "${PREFIX}/include/id3tag.h" ] && MISSING="libid3tag $MISSING" +++[ ! -e "${PREFIX}/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" +++[ ! -e "${PREFIX}/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" +++[ ! -e "${PREFIX}/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" +++[ ! -e "${PREFIX}/include/ffmpeg/avutil.h" -a \ +++ ! -e "${PREFIX}/include/libavutil/avutil.h" -a \ +++ ! -e "${PREFIX}/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" +++[ ! -e "${PREFIX}/include/ffmpeg/avformat.h" -a \ +++ ! -e "${PREFIX}/include/libavformat/avformat.h" -a \ +++ ! -e "${PREFIX}/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" +++[ ! -e "${PREFIX}/include/ffmpeg/avcodec.h" -a \ +++ ! -e "${PREFIX}/include/libavcodec/avcodec.h" -a \ +++ ! -e "${PREFIX}/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" ++ if [ -n "$MISSING" ]; then ++ echo -e "\nERROR! Cannot continue." ++ echo -e "The following required libraries are either missing, or are missing development headers:\n" ++@@ -151,8 +155,7 @@ case $OS_NAME in ++ fi ++ ;; ++ *) ++- echo "Unknown OS : $OS_NAME" ++- exit 1 +++ echo "WARNING: Unknown OS : $OS_NAME" 1>&2 ++ ;; ++ esac ++ ++@@ -183,7 +186,7 @@ fi ++ echo "" >> ${CONFIGFILE} ++ ++ echo "/* Enable if the system iconv.h exists. ID3 tag reading in various character sets will not work properly otherwise. */" >> ${CONFIGFILE} ++-if [ -f /usr/include/iconv.h ]; then +++if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then ++ echo "#define HAVE_ICONV_H" >> ${CONFIGFILE} ++ else ++ echo -e "\nWARNING!! Iconv support not found. ID3 tag reading may not work." ++@@ -192,7 +195,7 @@ fi ++ echo "" >> ${CONFIGFILE} ++ ++ echo "/* Enable if the system libintl.h exists for NLS support. */" >> ${CONFIGFILE} ++-if [ -f /usr/include/libintl.h ]; then +++if [ -f ${INTL_PREFIX}/include/libintl.h ]; then ++ echo "#define ENABLE_NLS" >> ${CONFIGFILE} ++ else ++ echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE} +diff --git a/feeds/packages/multimedia/minidlna/patches/020-makefile-tweaks.patch b/feeds/packages/multimedia/minidlna/patches/020-makefile-tweaks.patch +new file mode 100644 +index 0000000..8314d94 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/020-makefile-tweaks.patch +@@ -0,0 +1,48 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -10,19 +10,23 @@ ++ # or : ++ # $ make install ++ # +++PREFIX ?= /usr +++ICONV_PREFIX ?= $(PREFIX) +++INTL_PREFIX ?= $(PREFIX) ++ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG ++ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE ++ CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ ++- -I/usr/include/ffmpeg \ ++- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ ++- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat +++ -I$(PREFIX)/include/ffmpeg \ +++ -I$(PREFIX)/include/libavutil -I$(PREFIX)/include/libavcodec -I$(PREFIX)/include/libavformat \ +++ -I$(PREFIX)/include/ffmpeg/libavutil -I$(PREFIX)/include/ffmpeg/libavcodec -I$(PREFIX)/include/ffmpeg/libavformat +++ ++ #STATIC_LINKING: CFLAGS += -DSTATIC ++ #STATIC_LINKING: LDFLAGS = -static ++ CC = gcc ++ RM = rm -f ++ INSTALL = install ++ ++-INSTALLPREFIX ?= $(DESTDIR)/usr +++INSTALLPREFIX ?= $(DESTDIR)$(PREFIX) ++ SBININSTALLDIR = $(INSTALLPREFIX)/sbin ++ ETCINSTALLDIR = $(DESTDIR)/etc ++ ++@@ -37,7 +41,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes ++ ++ ALLOBJS = $(BASEOBJS) $(LNXOBJS) ++ ++-LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis +++LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid $(ICONV_LIBS) ++ #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm ++ ++ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o ++@@ -64,7 +68,7 @@ install-conf: ++ $(INSTALL) -d $(ETCINSTALLDIR) ++ $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) ++ ++-minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS) +++minidlna: $(BASEOBJS) $(LNXOBJS) ++ @echo Linking $@ ++ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS) ++ +diff --git a/feeds/packages/multimedia/minidlna/patches/030-missing-include.patch b/feeds/packages/multimedia/minidlna/patches/030-missing-include.patch +new file mode 100644 +index 0000000..a1491ba +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/030-missing-include.patch +@@ -0,0 +1,10 @@ ++--- a/minidlna.c +++++ b/minidlna.c ++@@ -58,6 +58,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch b/feeds/packages/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch +new file mode 100644 +index 0000000..5f69126 +--- /dev/null ++++ b/feeds/packages/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch +@@ -0,0 +1,11 @@ ++--- a/metadata.c 2012-08-27 23:00:06.997932249 +0100 +++++ b/metadata.c 2012-08-27 23:10:07.716582960 +0100 ++@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch ++ static inline void ++ lav_close(AVFormatContext *ctx) ++ { ++-#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0) +++#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0) ++ avformat_close_input(&ctx); ++ #else ++ av_close_input_file(ctx); +diff --git a/feeds/packages/multimedia/mjpg-streamer/.svn/entries b/feeds/packages/multimedia/mjpg-streamer/.svn/entries +new file mode 100644 +index 0000000..47aed02 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/mjpg-streamer ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-08T15:38:41.408577Z ++33059 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++d1e3cf3632d8f962908568c27be87154 ++2012-08-08T15:38:41.408577Z ++33059 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1773 ++ +diff --git a/feeds/packages/multimedia/mjpg-streamer/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/mjpg-streamer/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/mjpg-streamer/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/mjpg-streamer/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9f178a3 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=mjpg-streamer ++PKG_REV:=148 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer/ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mjpg-streamer ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=MJPG-streamer ++ DEPENDS:=+libpthread +libjpeg ++ URL:=http://mjpg-streamer.wiki.sourceforge.net/ ++endef ++ ++define Package/mjpg-streamer/description ++ Streaming application for Linux-UVC compatible webcams ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) ++ ++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)/usr/lib ++ $(CP) $(foreach input_plugin,file uvc,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib ++ $(CP) $(foreach output_plugin,http file,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb ++ $(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer ++ $(INSTALL_DIR) $(1)/www/webcam ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/www/* $(1)/www/webcam ++endef ++ ++define Package/mjpg-streamer/conffiles ++/etc/config/mjpg-streamer ++endef ++ ++$(eval $(call BuildPackage,mjpg-streamer)) +diff --git a/feeds/packages/multimedia/mjpg-streamer/Makefile b/feeds/packages/multimedia/mjpg-streamer/Makefile +new file mode 100644 +index 0000000..9f178a3 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=mjpg-streamer ++PKG_REV:=148 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer/ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mjpg-streamer ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=MJPG-streamer ++ DEPENDS:=+libpthread +libjpeg ++ URL:=http://mjpg-streamer.wiki.sourceforge.net/ ++endef ++ ++define Package/mjpg-streamer/description ++ Streaming application for Linux-UVC compatible webcams ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) ++ ++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)/usr/lib ++ $(CP) $(foreach input_plugin,file uvc,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib ++ $(CP) $(foreach output_plugin,http file,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb ++ $(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer ++ $(INSTALL_DIR) $(1)/www/webcam ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/www/* $(1)/www/webcam ++endef ++ ++define Package/mjpg-streamer/conffiles ++/etc/config/mjpg-streamer ++endef ++ ++$(eval $(call BuildPackage,mjpg-streamer)) +diff --git a/feeds/packages/multimedia/mjpg-streamer/files/.svn/entries b/feeds/packages/multimedia/mjpg-streamer/files/.svn/entries +new file mode 100644 +index 0000000..feebb48 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/mjpg-streamer/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-08T15:38:41.408577Z ++33059 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mjpg-streamer.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c59d4c416586c8daa542ec4d86877ae3 ++2012-08-08T15:38:41.408577Z ++33059 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1040 ++ ++mjpg-streamer.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++503befb4bcad4098480b7bb987f22567 ++2012-08-08T15:38:41.408577Z ++33059 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++171 ++ ++mjpg-streamer.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++8c9c1857e2242aa1401c85186439b742 ++2009-07-26T11:09:22.268297Z ++17002 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++179 ++ +diff --git a/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.config.svn-base b/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.config.svn-base +new file mode 100644 +index 0000000..5be37ea +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.config.svn-base +@@ -0,0 +1,7 @@ ++config mjpg-streamer core ++ option enabled "0" ++ option device "/dev/video0" ++ option resolution "640x480" ++ option fps "5" ++ option www "/www/webcam" ++ option port "8080" +diff --git a/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.hotplug.svn-base b/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.hotplug.svn-base +new file mode 100644 +index 0000000..c6f29cc +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.hotplug.svn-base +@@ -0,0 +1,11 @@ ++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/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.init.svn-base b/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.init.svn-base +new file mode 100644 +index 0000000..b0a2043 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/.svn/text-base/mjpg-streamer.init.svn-base +@@ -0,0 +1,57 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2012 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++PROG=/usr/bin/mjpg_streamer ++ ++error() { ++ echo "${initscript}:" "$@" 1>&2 ++} ++ ++section_enabled() { ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ config_get device "$s" 'device' ++ config_get resolution "$s" 'resolution' ++ config_get fps "$s" 'fps' ++ config_get www "$s" 'www' ++ config_get port "$s" 'port' ++ ++ [ -c "$device" ] || { ++ error "device '$device' does not exist" ++ return 1 ++ } ++ ++ service_start /usr/bin/mjpg_streamer --input "input_uvc.so \ ++ --device $device --fps $fps --resolution $resolution" \ ++ --output "output_http.so --www $www --port $port" ++} ++ ++stop_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ service_stop /usr/bin/mjpg_streamer ++} ++ ++start() { ++ config_load 'mjpg-streamer' ++ config_foreach start_instance 'mjpg-streamer' ++} ++ ++stop() { ++ config_load 'mjpg-streamer' ++ config_foreach stop_instance 'mjpg-streamer' ++} +diff --git a/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.config b/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.config +new file mode 100644 +index 0000000..5be37ea +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.config +@@ -0,0 +1,7 @@ ++config mjpg-streamer core ++ option enabled "0" ++ option device "/dev/video0" ++ option resolution "640x480" ++ option fps "5" ++ option www "/www/webcam" ++ option port "8080" +diff --git a/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.hotplug b/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.hotplug +new file mode 100644 +index 0000000..c6f29cc +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.hotplug +@@ -0,0 +1,11 @@ ++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/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.init b/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.init +new file mode 100644 +index 0000000..b0a2043 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/files/mjpg-streamer.init +@@ -0,0 +1,57 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2012 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++PROG=/usr/bin/mjpg_streamer ++ ++error() { ++ echo "${initscript}:" "$@" 1>&2 ++} ++ ++section_enabled() { ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ config_get device "$s" 'device' ++ config_get resolution "$s" 'resolution' ++ config_get fps "$s" 'fps' ++ config_get www "$s" 'www' ++ config_get port "$s" 'port' ++ ++ [ -c "$device" ] || { ++ error "device '$device' does not exist" ++ return 1 ++ } ++ ++ service_start /usr/bin/mjpg_streamer --input "input_uvc.so \ ++ --device $device --fps $fps --resolution $resolution" \ ++ --output "output_http.so --www $www --port $port" ++} ++ ++stop_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ service_stop /usr/bin/mjpg_streamer ++} ++ ++start() { ++ config_load 'mjpg-streamer' ++ config_foreach start_instance 'mjpg-streamer' ++} ++ ++stop() { ++ config_load 'mjpg-streamer' ++ config_foreach stop_instance 'mjpg-streamer' ++} +diff --git a/feeds/packages/multimedia/motion/.svn/entries b/feeds/packages/multimedia/motion/.svn/entries +new file mode 100644 +index 0000000..d980ef5 +--- /dev/null ++++ b/feeds/packages/multimedia/motion/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/motion ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:29.109054Z ++29196 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++cc3b9d46f48b9f1a8932dea4d67b570b ++2011-11-16T20:02:29.109054Z ++29196 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1151 ++ +diff --git a/feeds/packages/multimedia/motion/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/motion/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/multimedia/motion/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/motion/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/motion/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0909c24 +--- /dev/null ++++ b/feeds/packages/multimedia/motion/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=20110826-051001 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \ ++ @SF/motion ++PKG_MD5SUM:=e703fce57ae2215cb05f25e3027f5818 ++ ++PKG_INSTALL:=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_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/ ++ ++endef ++ ++$(eval $(call BuildPackage,motion)) +diff --git a/feeds/packages/multimedia/motion/Makefile b/feeds/packages/multimedia/motion/Makefile +new file mode 100644 +index 0000000..0909c24 +--- /dev/null ++++ b/feeds/packages/multimedia/motion/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=20110826-051001 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \ ++ @SF/motion ++PKG_MD5SUM:=e703fce57ae2215cb05f25e3027f5818 ++ ++PKG_INSTALL:=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_INSTALL_DIR)/etc/motion-dist.conf $(1)/etc/motion.conf ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/motion $(1)/usr/bin/ ++ ++endef ++ ++$(eval $(call BuildPackage,motion)) +diff --git a/feeds/packages/multimedia/motion/patches/.svn/entries b/feeds/packages/multimedia/motion/patches/.svn/entries +new file mode 100644 +index 0000000..4b4b38c +--- /dev/null ++++ b/feeds/packages/multimedia/motion/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/motion/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-06T03:02:53.594449Z ++17944 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-honor_cppflags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++98ec7207f567ffe4e1b3489879817b78 ++2009-10-06T03:02:53.594449Z ++17944 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++764 ++ +diff --git a/feeds/packages/multimedia/motion/patches/.svn/prop-base/002-honor_cppflags.patch.svn-base b/feeds/packages/multimedia/motion/patches/.svn/prop-base/002-honor_cppflags.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/motion/patches/.svn/prop-base/002-honor_cppflags.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/motion/patches/.svn/text-base/002-honor_cppflags.patch.svn-base b/feeds/packages/multimedia/motion/patches/.svn/text-base/002-honor_cppflags.patch.svn-base +new file mode 100644 +index 0000000..ac10f1e +--- /dev/null ++++ b/feeds/packages/multimedia/motion/patches/.svn/text-base/002-honor_cppflags.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -31,6 +31,7 @@ examplesdir = $(datadir)/@PACKAGE_NAME@- ++ # install. # ++ ################################################################################ ++ CFLAGS = @CFLAGS@ -Wall -DVERSION=\"@PACKAGE_VERSION@\" -Dsysconfdir=\"$(sysconfdir)\" +++CPPFLAGS = @CPPFLAGS@ ++ LDFLAGS = @LDFLAGS@ ++ LIBS = @LIBS@ ++ VIDEO_OBJ = @VIDEO@ ++@@ -118,7 +119,7 @@ endif ++ ################################################################################ ++ $(DEPEND_FILE): *.h $(SRC) ++ @echo "Generating dependencies, please wait..." ++- @$(CC) $(CFLAGS) -M $(SRC) > .tmp +++ @$(CC) $(CFLAGS) $(CPPFLAGS) -M $(SRC) > .tmp ++ @mv -f .tmp $(DEPEND_FILE) ++ @echo ++ +diff --git a/feeds/packages/multimedia/motion/patches/002-honor_cppflags.patch b/feeds/packages/multimedia/motion/patches/002-honor_cppflags.patch +new file mode 100644 +index 0000000..ac10f1e +--- /dev/null ++++ b/feeds/packages/multimedia/motion/patches/002-honor_cppflags.patch +@@ -0,0 +1,19 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -31,6 +31,7 @@ examplesdir = $(datadir)/@PACKAGE_NAME@- ++ # install. # ++ ################################################################################ ++ CFLAGS = @CFLAGS@ -Wall -DVERSION=\"@PACKAGE_VERSION@\" -Dsysconfdir=\"$(sysconfdir)\" +++CPPFLAGS = @CPPFLAGS@ ++ LDFLAGS = @LDFLAGS@ ++ LIBS = @LIBS@ ++ VIDEO_OBJ = @VIDEO@ ++@@ -118,7 +119,7 @@ endif ++ ################################################################################ ++ $(DEPEND_FILE): *.h $(SRC) ++ @echo "Generating dependencies, please wait..." ++- @$(CC) $(CFLAGS) -M $(SRC) > .tmp +++ @$(CC) $(CFLAGS) $(CPPFLAGS) -M $(SRC) > .tmp ++ @mv -f .tmp $(DEPEND_FILE) ++ @echo ++ +diff --git a/feeds/packages/multimedia/peercast/.svn/entries b/feeds/packages/multimedia/peercast/.svn/entries +new file mode 100644 +index 0000000..7885e52 +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/peercast ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T21:09:28.078263Z ++32538 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++56ecf88a5cb487b0e5efac0ea261bd12 ++2012-06-29T21:09:28.078263Z ++32538 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1650 ++ +diff --git a/feeds/packages/multimedia/peercast/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/peercast/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/peercast/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/peercast/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fec240b +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,64 @@ ++# ++# 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:=peercast ++PKG_VERSION:=0.1214 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast ++PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 acinclude.m4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/peercast ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libpthread $(CXX_DEPENDS) ++ TITLE:=P2P audio and video streaming server ++ URL:=http://www.peercast.org/ ++endef ++ ++define Package/peercast/conffiles ++/etc/peercast.ini ++endef ++ ++define Package/peercast/description ++ PeerCast is a fresh new P2P streaming server. It can stream music and ++ video from a broad variety of formats. Many audio players can listen to ++ peercast streams, as it's been built to remain compatible with Nullsoft ++ Shoutcast. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-staticbin \ ++ ++CONFIGURE_VARS += \ ++ LIBS="-lpthread" ++ ++TARGET_CFLAGS += -fpermissive ++ ++define Package/peercast/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/share/peercast/html ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(1)/usr/share/peercast/html/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/peercast.ini $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/peercast.init $(1)/etc/init.d/peercast ++endef ++ ++$(eval $(call BuildPackage,peercast)) +diff --git a/feeds/packages/multimedia/peercast/Makefile b/feeds/packages/multimedia/peercast/Makefile +new file mode 100644 +index 0000000..fec240b +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/Makefile +@@ -0,0 +1,64 @@ ++# ++# 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:=peercast ++PKG_VERSION:=0.1214 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast ++PKG_MD5SUM:=4e8449cde7135ad97f788e67e1bd64ee ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 acinclude.m4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/peercast ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libpthread $(CXX_DEPENDS) ++ TITLE:=P2P audio and video streaming server ++ URL:=http://www.peercast.org/ ++endef ++ ++define Package/peercast/conffiles ++/etc/peercast.ini ++endef ++ ++define Package/peercast/description ++ PeerCast is a fresh new P2P streaming server. It can stream music and ++ video from a broad variety of formats. Many audio players can listen to ++ peercast streams, as it's been built to remain compatible with Nullsoft ++ Shoutcast. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-staticbin \ ++ ++CONFIGURE_VARS += \ ++ LIBS="-lpthread" ++ ++TARGET_CFLAGS += -fpermissive ++ ++define Package/peercast/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/share/peercast/html ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(1)/usr/share/peercast/html/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/peercast.ini $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/peercast.init $(1)/etc/init.d/peercast ++endef ++ ++$(eval $(call BuildPackage,peercast)) +diff --git a/feeds/packages/multimedia/peercast/files/.svn/entries b/feeds/packages/multimedia/peercast/files/.svn/entries +new file mode 100644 +index 0000000..7a4a73a +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/peercast/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-05-10T10:38:53.347939Z ++7164 ++mbm ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++peercast.ini ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++46d6cbd015340fff12e3be8b5a02f581 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1200 ++ ++peercast.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++3ca6f186218e0a72f1fe79600c8b07e0 ++2007-05-10T10:38:53.347939Z ++7164 ++mbm ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++244 ++ +diff --git a/feeds/packages/multimedia/peercast/files/.svn/prop-base/peercast.ini.svn-base b/feeds/packages/multimedia/peercast/files/.svn/prop-base/peercast.ini.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/.svn/prop-base/peercast.ini.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/peercast/files/.svn/prop-base/peercast.init.svn-base b/feeds/packages/multimedia/peercast/files/.svn/prop-base/peercast.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/.svn/prop-base/peercast.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/multimedia/peercast/files/.svn/text-base/peercast.ini.svn-base b/feeds/packages/multimedia/peercast/files/.svn/text-base/peercast.ini.svn-base +new file mode 100644 +index 0000000..f703c6e +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/.svn/text-base/peercast.ini.svn-base +@@ -0,0 +1,81 @@ ++ ++[Server] ++serverPort = 7144 ++autoServe = Yes ++forceIP = ++isRoot = No ++maxBitrateOut = 0 ++maxRelays = 1 ++maxDirect = 0 ++maxRelaysPerChannel = 0 ++firewallTimeout = 30 ++forceNormal = No ++rootMsg = ++authType = cookie ++cookiesExpire = session ++htmlPath = html/en ++minPGNUIncoming = 10 ++maxPGNUIncoming = 20 ++maxServIn = 50 ++chanLog = ++networkID = 00000000000000000000000000000000 ++ ++[Broadcast] ++broadcastMsgInterval = 10 ++broadcastMsg = ++icyMetaInterval = 8192 ++broadcastID = 898145B5C0427118B595AF7D9E110000 ++hostUpdateInterval = 180 ++maxControlConnections = 3 ++rootHost = yp.peercast.org ++ ++[Client] ++refreshHTML = 5 ++relayBroadcast = 30 ++minBroadcastTTL = 1 ++maxBroadcastTTL = 7 ++pushTries = 5 ++pushTimeout = 60 ++maxPushHops = 8 ++autoQuery = 0 ++queryTTL = 7 ++ ++[Privacy] ++password = hackme ++maxUptime = 0 ++ ++[Filter] ++ip = 255.255.255.255 ++private = No ++ban = No ++network = Yes ++direct = Yes ++[End] ++ ++[Notify] ++PeerCast = Yes ++Broadcasters = Yes ++TrackInfo = Yes ++[End] ++ ++[Server1] ++allowHTML = Yes ++allowBroadcast = Yes ++allowNetwork = Yes ++allowDirect = Yes ++[End] ++ ++[Server2] ++allowHTML = No ++allowBroadcast = Yes ++allowNetwork = No ++allowDirect = No ++[End] ++ ++[Debug] ++logDebug = No ++logErrors = No ++logNetwork = No ++logChannel = No ++pauseLog = No ++idleSleepTime = 10 +diff --git a/feeds/packages/multimedia/peercast/files/.svn/text-base/peercast.init.svn-base b/feeds/packages/multimedia/peercast/files/.svn/text-base/peercast.init.svn-base +new file mode 100644 +index 0000000..033beb0 +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/.svn/text-base/peercast.init.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++PID_F=/var/run/peercast.pid ++ ++start() { ++ peercast -d -i /etc/peercast.ini -l /var/log/peercast.log -p $PID_F ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1 ++} ++ +diff --git a/feeds/packages/multimedia/peercast/files/peercast.ini b/feeds/packages/multimedia/peercast/files/peercast.ini +new file mode 100644 +index 0000000..f703c6e +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/peercast.ini +@@ -0,0 +1,81 @@ ++ ++[Server] ++serverPort = 7144 ++autoServe = Yes ++forceIP = ++isRoot = No ++maxBitrateOut = 0 ++maxRelays = 1 ++maxDirect = 0 ++maxRelaysPerChannel = 0 ++firewallTimeout = 30 ++forceNormal = No ++rootMsg = ++authType = cookie ++cookiesExpire = session ++htmlPath = html/en ++minPGNUIncoming = 10 ++maxPGNUIncoming = 20 ++maxServIn = 50 ++chanLog = ++networkID = 00000000000000000000000000000000 ++ ++[Broadcast] ++broadcastMsgInterval = 10 ++broadcastMsg = ++icyMetaInterval = 8192 ++broadcastID = 898145B5C0427118B595AF7D9E110000 ++hostUpdateInterval = 180 ++maxControlConnections = 3 ++rootHost = yp.peercast.org ++ ++[Client] ++refreshHTML = 5 ++relayBroadcast = 30 ++minBroadcastTTL = 1 ++maxBroadcastTTL = 7 ++pushTries = 5 ++pushTimeout = 60 ++maxPushHops = 8 ++autoQuery = 0 ++queryTTL = 7 ++ ++[Privacy] ++password = hackme ++maxUptime = 0 ++ ++[Filter] ++ip = 255.255.255.255 ++private = No ++ban = No ++network = Yes ++direct = Yes ++[End] ++ ++[Notify] ++PeerCast = Yes ++Broadcasters = Yes ++TrackInfo = Yes ++[End] ++ ++[Server1] ++allowHTML = Yes ++allowBroadcast = Yes ++allowNetwork = Yes ++allowDirect = Yes ++[End] ++ ++[Server2] ++allowHTML = No ++allowBroadcast = Yes ++allowNetwork = No ++allowDirect = No ++[End] ++ ++[Debug] ++logDebug = No ++logErrors = No ++logNetwork = No ++logChannel = No ++pauseLog = No ++idleSleepTime = 10 +diff --git a/feeds/packages/multimedia/peercast/files/peercast.init b/feeds/packages/multimedia/peercast/files/peercast.init +new file mode 100644 +index 0000000..033beb0 +--- /dev/null ++++ b/feeds/packages/multimedia/peercast/files/peercast.init +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++PID_F=/var/run/peercast.pid ++ ++start() { ++ peercast -d -i /etc/peercast.ini -l /var/log/peercast.log -p $PID_F ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1 ++} ++ +diff --git a/feeds/packages/multimedia/puppy/.svn/entries b/feeds/packages/multimedia/puppy/.svn/entries +new file mode 100644 +index 0000000..acdcb37 +--- /dev/null ++++ b/feeds/packages/multimedia/puppy/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/puppy ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++0a102fbeecf1cc729a8401cdd1abcee3 ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++729 ++ +diff --git a/feeds/packages/multimedia/puppy/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/puppy/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c17434d +--- /dev/null ++++ b/feeds/packages/multimedia/puppy/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,36 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=puppy ++PKG_VERSION:=1.14 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=puppy_$(PKG_VERSION)_src.tar.bz2 ++PKG_SOURCE_URL:=@SF/puppy ++PKG_MD5SUM:=a7a53da5b8ba4fdb15e2fc8e1531b82c ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/puppy_$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/puppy ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=@USB_SUPPORT ++ TITLE:=Topfield PVR file transfer client ++ URL:=http://puppy.sourceforge.net/ ++endef ++ ++define Package/puppy/description ++Client to access Topfield PVRs via the USB port ++endef ++ ++define Build/Configure ++endef ++ ++define Package/puppy/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/puppy $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,puppy)) +diff --git a/feeds/packages/multimedia/puppy/Makefile b/feeds/packages/multimedia/puppy/Makefile +new file mode 100644 +index 0000000..c17434d +--- /dev/null ++++ b/feeds/packages/multimedia/puppy/Makefile +@@ -0,0 +1,36 @@ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=puppy ++PKG_VERSION:=1.14 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=puppy_$(PKG_VERSION)_src.tar.bz2 ++PKG_SOURCE_URL:=@SF/puppy ++PKG_MD5SUM:=a7a53da5b8ba4fdb15e2fc8e1531b82c ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/puppy_$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/puppy ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=@USB_SUPPORT ++ TITLE:=Topfield PVR file transfer client ++ URL:=http://puppy.sourceforge.net/ ++endef ++ ++define Package/puppy/description ++Client to access Topfield PVRs via the USB port ++endef ++ ++define Build/Configure ++endef ++ ++define Package/puppy/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/puppy $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,puppy)) +diff --git a/feeds/packages/multimedia/rygel/.svn/entries b/feeds/packages/multimedia/rygel/.svn/entries +new file mode 100644 +index 0000000..10296ba +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/rygel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++c5ccf84d21425767b6dc4f1adb8eac20 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5392 ++ +diff --git a/feeds/packages/multimedia/rygel/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/rygel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ce9c4e7 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,195 @@ ++# ++# 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:=rygel ++PKG_VERSION:=0.14.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/rygel/0.14/ ++PKG_SHA256SUM:=c4f79fb30bc1a062a2ffdadc7a55dd91fa58240302f152fb070d8c674bdddd67 ++ ++PKG_FIXUP:=autoreconf ++PKG_BUILD_DEPENDS:=vala/host intltool/host vala gupnp-vala ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++TARGET_LDFLAGS+=\ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/rygel/Default ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=GNOME UPnP/DLNA services ++ URL:=http://live.gnome.org/Rygel ++endef ++ ++define Package/rygel/description/Default ++ Rygel is a collection of DLNA (UPnP AV) services (devices in UPnP speak), ++ implemented through a plug-in mechanism. ++endef ++ ++define Package/rygel ++$(call Package/rygel/Default) ++ DEPENDS:=+libgssdp +libgupnp +libgupnp-av +libgupnp-dlna +libgee \ ++ +libsoup +gstreamer +libgstvideo +libgstpbutils ++endef ++ ++define Package/rygel/conffiles ++/etc/config/rygel ++endef ++ ++define Package/rygel/description ++$(call Package/rygel/description/Default) ++ . ++ This package contains the main rygel binary. ++endef ++ ++define RemoveValaStamps ++ find $(PKG_BUILD_DIR) -name "*_vala.stamp" | xargs rm -f ++endef ++ ++Hooks/Configure/Pre += RemoveValaStamps ++ ++define Build/Configure ++ $(call Build/Configure/Default,--without-ui,) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/rygel/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/rygel \ ++ $(1)/usr/bin ++ ++ $(INSTALL_DIR) $(1)/usr/share/rygel/xml ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/rygel/xml/*.xml \ ++ $(1)/usr/share/rygel/xml ++ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) files/etc/rygel.conf $(1)/etc ++ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) files/etc/init.d/rygel $(1)/etc/init.d/rygel ++ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) files/etc/config/rygel $(1)/etc/config/rygel ++ ++ $(INSTALL_DIR) $(1)/usr/share/icons/hicolor/{32x32,48x48,128x128}/apps ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/icons/hicolor/32x32/apps/rygel.png \ ++ $(1)/usr/share/icons/hicolor/32x32/apps/rygel.png ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/icons/hicolor/48x48/apps/rygel.png \ ++ $(1)/usr/share/icons/hicolor/48x48/apps/rygel.png ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/icons/hicolor/128x128/apps/rygel.png \ ++ $(1)/usr/share/icons/hicolor/128x128/apps/rygel.png ++endef ++ ++# 1: plugin name as used in shared library filename ++# 2: additional dependencies, if any ++define RygelBuildPlugin ++ ++ define Package/rygel-$(1) ++ $(call Package/rygel/Default) ++ TITLE+= - $(1) plugin ++ DEPENDS:=+rygel $(2) ++ endef ++ ++ define Package/rygel-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib/rygel-1.0 ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/rygel-1.0/librygel-$(1).so \ ++ $$(1)/usr/lib/rygel-1.0 ++ endef ++ ++ $$(eval $$(call BuildPackage,rygel-$(1))) ++endef ++ ++define Package/rygel-external/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the external plugin, a MediaServer plugin that exports ++ media provided by applications implementing the D-Bus MediaServer interface. ++endef ++$(eval $(call RygelBuildPlugin,external)) ++ ++define Package/rygel-media-export/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the media-export plugin, a MediaServer plugin that ++ recursively exports files and folders specified in the user configuration. ++endef ++$(eval $(call RygelBuildPlugin,media-export,+libsqlite3 +libgstapp +libgsttag)) ++ ++define Package/rygel-mpris/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the mpris plugin, a MediaServer plugin that exports ++ media provided by applications implementing the D-Bus MPRIS2 interface. ++endef ++$(eval $(call RygelBuildPlugin,mpris)) ++ ++define Package/rygel-tracker/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the tracker plugin, a MediaServer plugin that exports ++ media known to Tracker. ++endef ++$(eval $(call RygelBuildPlugin,tracker)) ++ ++define Package/rygel-playbin/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the playbin plugin, the MediaRenderer plugin. ++endef ++$(eval $(call RygelBuildPlugin,playbin)) ++ ++define Package/rygel-playbin-gst-suggested/description ++ $(call Package/rygel/description/Default) ++ . ++ This optional metapackage installs a suggested set of gstreamer plugins to ++ support audio playback in rygel-playbin. ++endef ++ ++define Package/rygel-playbin-gst-suggested ++ $(call Package/rygel/Default) ++ TITLE:=Suggested GStreamer plugins for rygel-playbin ++ DEPENDS:= \ ++ +gst-mod-alsa \ ++ +gst-mod-audioconvert \ ++ +gst-mod-audioparsers \ ++ +gst-mod-audioresample \ ++ +gst-mod-autodetect \ ++ +gst-mod-decodebin2 \ ++ +gst-mod-flac \ ++ +gst-mod-icydemux \ ++ +gst-mod-id3demux \ ++ +gst-mod-isomp4 \ ++ +gst-mod-ogg \ ++ +gst-mod-playbin \ ++ +gst-mod-souphttpsrc \ ++ +gst-mod-typefindfunctions \ ++ +gst-mod-volume \ ++ +gst-mod-vorbis \ ++ +BUILD_PATENTED:gst-mod-faad \ ++ +BUILD_PATENTED:gst-mod-mad ++endef ++$(eval $(call BuildPackage,rygel-playbin-gst-suggested)) ++ ++$(eval $(call BuildPackage,rygel)) +diff --git a/feeds/packages/multimedia/rygel/Makefile b/feeds/packages/multimedia/rygel/Makefile +new file mode 100644 +index 0000000..ce9c4e7 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/Makefile +@@ -0,0 +1,195 @@ ++# ++# 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:=rygel ++PKG_VERSION:=0.14.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNOME/rygel/0.14/ ++PKG_SHA256SUM:=c4f79fb30bc1a062a2ffdadc7a55dd91fa58240302f152fb070d8c674bdddd67 ++ ++PKG_FIXUP:=autoreconf ++PKG_BUILD_DEPENDS:=vala/host intltool/host vala gupnp-vala ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++TARGET_LDFLAGS+=\ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/rygel/Default ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=GNOME UPnP/DLNA services ++ URL:=http://live.gnome.org/Rygel ++endef ++ ++define Package/rygel/description/Default ++ Rygel is a collection of DLNA (UPnP AV) services (devices in UPnP speak), ++ implemented through a plug-in mechanism. ++endef ++ ++define Package/rygel ++$(call Package/rygel/Default) ++ DEPENDS:=+libgssdp +libgupnp +libgupnp-av +libgupnp-dlna +libgee \ ++ +libsoup +gstreamer +libgstvideo +libgstpbutils ++endef ++ ++define Package/rygel/conffiles ++/etc/config/rygel ++endef ++ ++define Package/rygel/description ++$(call Package/rygel/description/Default) ++ . ++ This package contains the main rygel binary. ++endef ++ ++define RemoveValaStamps ++ find $(PKG_BUILD_DIR) -name "*_vala.stamp" | xargs rm -f ++endef ++ ++Hooks/Configure/Pre += RemoveValaStamps ++ ++define Build/Configure ++ $(call Build/Configure/Default,--without-ui,) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/rygel/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/rygel \ ++ $(1)/usr/bin ++ ++ $(INSTALL_DIR) $(1)/usr/share/rygel/xml ++ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/rygel/xml/*.xml \ ++ $(1)/usr/share/rygel/xml ++ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) files/etc/rygel.conf $(1)/etc ++ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) files/etc/init.d/rygel $(1)/etc/init.d/rygel ++ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) files/etc/config/rygel $(1)/etc/config/rygel ++ ++ $(INSTALL_DIR) $(1)/usr/share/icons/hicolor/{32x32,48x48,128x128}/apps ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/icons/hicolor/32x32/apps/rygel.png \ ++ $(1)/usr/share/icons/hicolor/32x32/apps/rygel.png ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/icons/hicolor/48x48/apps/rygel.png \ ++ $(1)/usr/share/icons/hicolor/48x48/apps/rygel.png ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/share/icons/hicolor/128x128/apps/rygel.png \ ++ $(1)/usr/share/icons/hicolor/128x128/apps/rygel.png ++endef ++ ++# 1: plugin name as used in shared library filename ++# 2: additional dependencies, if any ++define RygelBuildPlugin ++ ++ define Package/rygel-$(1) ++ $(call Package/rygel/Default) ++ TITLE+= - $(1) plugin ++ DEPENDS:=+rygel $(2) ++ endef ++ ++ define Package/rygel-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/lib/rygel-1.0 ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/rygel-1.0/librygel-$(1).so \ ++ $$(1)/usr/lib/rygel-1.0 ++ endef ++ ++ $$(eval $$(call BuildPackage,rygel-$(1))) ++endef ++ ++define Package/rygel-external/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the external plugin, a MediaServer plugin that exports ++ media provided by applications implementing the D-Bus MediaServer interface. ++endef ++$(eval $(call RygelBuildPlugin,external)) ++ ++define Package/rygel-media-export/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the media-export plugin, a MediaServer plugin that ++ recursively exports files and folders specified in the user configuration. ++endef ++$(eval $(call RygelBuildPlugin,media-export,+libsqlite3 +libgstapp +libgsttag)) ++ ++define Package/rygel-mpris/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the mpris plugin, a MediaServer plugin that exports ++ media provided by applications implementing the D-Bus MPRIS2 interface. ++endef ++$(eval $(call RygelBuildPlugin,mpris)) ++ ++define Package/rygel-tracker/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the tracker plugin, a MediaServer plugin that exports ++ media known to Tracker. ++endef ++$(eval $(call RygelBuildPlugin,tracker)) ++ ++define Package/rygel-playbin/description ++ $(call Package/rygel/description/Default) ++ . ++ This package contains the playbin plugin, the MediaRenderer plugin. ++endef ++$(eval $(call RygelBuildPlugin,playbin)) ++ ++define Package/rygel-playbin-gst-suggested/description ++ $(call Package/rygel/description/Default) ++ . ++ This optional metapackage installs a suggested set of gstreamer plugins to ++ support audio playback in rygel-playbin. ++endef ++ ++define Package/rygel-playbin-gst-suggested ++ $(call Package/rygel/Default) ++ TITLE:=Suggested GStreamer plugins for rygel-playbin ++ DEPENDS:= \ ++ +gst-mod-alsa \ ++ +gst-mod-audioconvert \ ++ +gst-mod-audioparsers \ ++ +gst-mod-audioresample \ ++ +gst-mod-autodetect \ ++ +gst-mod-decodebin2 \ ++ +gst-mod-flac \ ++ +gst-mod-icydemux \ ++ +gst-mod-id3demux \ ++ +gst-mod-isomp4 \ ++ +gst-mod-ogg \ ++ +gst-mod-playbin \ ++ +gst-mod-souphttpsrc \ ++ +gst-mod-typefindfunctions \ ++ +gst-mod-volume \ ++ +gst-mod-vorbis \ ++ +BUILD_PATENTED:gst-mod-faad \ ++ +BUILD_PATENTED:gst-mod-mad ++endef ++$(eval $(call BuildPackage,rygel-playbin-gst-suggested)) ++ ++$(eval $(call BuildPackage,rygel)) +diff --git a/feeds/packages/multimedia/rygel/files/.svn/entries b/feeds/packages/multimedia/rygel/files/.svn/entries +new file mode 100644 +index 0000000..4ac72a8 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/rygel/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/multimedia/rygel/files/etc/.svn/entries b/feeds/packages/multimedia/rygel/files/etc/.svn/entries +new file mode 100644 +index 0000000..bb8f4c4 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/rygel/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config ++dir ++ ++init.d ++dir ++ ++rygel.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++f90285e0cb473ba41766161e2c4ed3c2 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++251 ++ +diff --git a/feeds/packages/multimedia/rygel/files/etc/.svn/text-base/rygel.conf.svn-base b/feeds/packages/multimedia/rygel/files/etc/.svn/text-base/rygel.conf.svn-base +new file mode 100644 +index 0000000..7e86d5a +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/.svn/text-base/rygel.conf.svn-base +@@ -0,0 +1,9 @@ ++# Rygel requires that /etc/rygel.conf exists in order to start properly. ++# This file contains some simple default configuration. ++# Configuration changes should be made in /etc/config/rygel. ++ ++[general] ++upnp-enabled=true ++log-level=*:4 ++interface= ++port=0 +diff --git a/feeds/packages/multimedia/rygel/files/etc/config/.svn/entries b/feeds/packages/multimedia/rygel/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..6fb7ee4 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/rygel/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++rygel ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++b2e47f62fbf4a9a774d0b320aea08913 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++202 ++ +diff --git a/feeds/packages/multimedia/rygel/files/etc/config/.svn/text-base/rygel.svn-base b/feeds/packages/multimedia/rygel/files/etc/config/.svn/text-base/rygel.svn-base +new file mode 100644 +index 0000000..3dd222e +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/config/.svn/text-base/rygel.svn-base +@@ -0,0 +1,6 @@ ++# This file is converted to the rygel config syntax. ++# Underscores in option names are changed to hyphens. ++ ++config plugin Playbin ++ option enabled true ++ option title 'Audio/Video playback on @HOSTNAME@' +diff --git a/feeds/packages/multimedia/rygel/files/etc/config/rygel b/feeds/packages/multimedia/rygel/files/etc/config/rygel +new file mode 100644 +index 0000000..3dd222e +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/config/rygel +@@ -0,0 +1,6 @@ ++# This file is converted to the rygel config syntax. ++# Underscores in option names are changed to hyphens. ++ ++config plugin Playbin ++ option enabled true ++ option title 'Audio/Video playback on @HOSTNAME@' +diff --git a/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/entries b/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..d062efd +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/rygel/files/etc/init.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++rygel ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++1812b4aca872bcd0cbe7d67737e11ba9 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++487 ++ +diff --git a/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/prop-base/rygel.svn-base b/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/prop-base/rygel.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/prop-base/rygel.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/text-base/rygel.svn-base b/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/text-base/rygel.svn-base +new file mode 100644 +index 0000000..9d1ede4 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/init.d/.svn/text-base/rygel.svn-base +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012 OpenWrt.org ++ ++START=90 ++STOP=10 ++ ++SERVICE_DAEMONIZE=1 ++ ++cfgfile="/var/run/rygel.conf" ++rm -f $cfgfile ++ ++config_cb() { ++ local section="$2" ++ [ -n "$section" ] && echo "[$section]" >> $cfgfile ++} ++ ++option_cb() { ++ local name=$(echo "$1" | tr _ -) ++ local value="$2" ++ echo "$name=$value" >> $cfgfile ++} ++ ++start() { ++ config_load rygel ++ service_start /usr/bin/rygel -c $cfgfile ++} ++ ++stop() { ++ service_stop /usr/bin/rygel ++} +diff --git a/feeds/packages/multimedia/rygel/files/etc/init.d/rygel b/feeds/packages/multimedia/rygel/files/etc/init.d/rygel +new file mode 100755 +index 0000000..9d1ede4 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/init.d/rygel +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012 OpenWrt.org ++ ++START=90 ++STOP=10 ++ ++SERVICE_DAEMONIZE=1 ++ ++cfgfile="/var/run/rygel.conf" ++rm -f $cfgfile ++ ++config_cb() { ++ local section="$2" ++ [ -n "$section" ] && echo "[$section]" >> $cfgfile ++} ++ ++option_cb() { ++ local name=$(echo "$1" | tr _ -) ++ local value="$2" ++ echo "$name=$value" >> $cfgfile ++} ++ ++start() { ++ config_load rygel ++ service_start /usr/bin/rygel -c $cfgfile ++} ++ ++stop() { ++ service_stop /usr/bin/rygel ++} +diff --git a/feeds/packages/multimedia/rygel/files/etc/rygel.conf b/feeds/packages/multimedia/rygel/files/etc/rygel.conf +new file mode 100644 +index 0000000..7e86d5a +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/files/etc/rygel.conf +@@ -0,0 +1,9 @@ ++# Rygel requires that /etc/rygel.conf exists in order to start properly. ++# This file contains some simple default configuration. ++# Configuration changes should be made in /etc/config/rygel. ++ ++[general] ++upnp-enabled=true ++log-level=*:4 ++interface= ++port=0 +diff --git a/feeds/packages/multimedia/rygel/patches/.svn/entries b/feeds/packages/multimedia/rygel/patches/.svn/entries +new file mode 100644 +index 0000000..8750bea +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/rygel/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-vapidirs-from-pkg-config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++2e022c589707c051485a02261bec9572 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1318 ++ ++020-playbin-mime-types.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++4d709a64595b3cf5a833529ede95f46a ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++512 ++ ++010-conftest-honor-cc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++a04261ce1c4e1c25705290c3f2ca6073 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++437 ++ ++010-identify-libs-by-suffix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++8625588bd4c871399ba6f19cb9c230c0 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++836 ++ ++030-output-to-syslog.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++fc15fa37403650dae9df4e5c3194b3e9 ++2012-12-05T17:31:34.563167Z ++34528 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1667 ++ +diff --git a/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-conftest-honor-cc.patch.svn-base b/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-conftest-honor-cc.patch.svn-base +new file mode 100644 +index 0000000..3eab47c +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-conftest-honor-cc.patch.svn-base +@@ -0,0 +1,16 @@ ++--- a/m4/vala.m4 +++++ b/m4/vala.m4 ++@@ -28,7 +28,12 @@ ++ void main(){} ++ _ACEOF ++ ++- AS_IF([vala_error=`$VALAC $1 -q -o conftest$ac_exeext conftest.vala 2>&1`], +++ unset vala_cc_args +++ for cflag in $CFLAGS $CPPFLAGS $LDFLAGS; do +++ vala_cc_args="${vala_cc_args:+$vala_cc_args }-X $cflag" +++ done +++ +++ AS_IF([vala_error=`$VALAC $1 -q $VALAFLAGS --cc $CC $vala_cc_args -o conftest$ac_exeext conftest.vala 2>&1`], ++ [$2], [$3]) ++ ]) ++ +diff --git a/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-identify-libs-by-suffix.patch.svn-base b/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-identify-libs-by-suffix.patch.svn-base +new file mode 100644 +index 0000000..50df4fc +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-identify-libs-by-suffix.patch.svn-base +@@ -0,0 +1,18 @@ ++--- a/src/rygel/rygel-plugin-loader.vala +++++ b/src/rygel/rygel-plugin-loader.vala ++@@ -126,13 +126,12 @@ ++ foreach (var info in infos) { ++ var file = dir.get_child (info.get_name ()); ++ FileType file_type = info.get_file_type (); ++- string content_type = info.get_content_type (); ++- string mime = ContentType.get_mime_type (content_type); +++ string file_name = info.get_name (); ++ ++ if (file_type == FileType.DIRECTORY) { ++ // Recurse into directories ++ this.load_modules_from_dir.begin (file); ++- } else if (mime == "application/x-sharedlib") { +++ } else if (file_name.has_suffix (Module.SUFFIX)) { ++ // Seems like we found a module ++ this.load_module_from_file (file); ++ } +diff --git a/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-vapidirs-from-pkg-config.patch.svn-base b/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-vapidirs-from-pkg-config.patch.svn-base +new file mode 100644 +index 0000000..70023c5 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/.svn/text-base/010-vapidirs-from-pkg-config.patch.svn-base +@@ -0,0 +1,28 @@ ++--- a/m4/rygel.m4 2012-04-12 08:47:08.000000000 -0700 +++++ b/m4/rygel.m4 2012-06-15 11:55:36.000000000 -0700 ++@@ -99,6 +99,25 @@ ++ [dnl check for vala ++ AM_PROG_VALAC([$1]) ++ +++ dnl See where we should look for vapi files. If it's under +++ dnl $datadir, then assume it's one of the standard locations where +++ dnl vala will look. Otherwise, specify explicitly. +++ dnl +++ dnl Note the distinction between these directories (where we look +++ dnl for APIs when we do vala builds) and VAPIDIR, which is where we +++ dnl install our own vapi files. +++ +++ for var in vapidir vapidir_versioned; do +++ AS_IF([dir=`$PKG_CONFIG --variable=$var vapigen`], +++ [ +++ AC_MSG_NOTICE([got $var=$dir from pkg-config]) +++ AS_IF([expr "$dir" : "${datadir}"], +++ [], +++ [RYGEL_ADD_VALAFLAGS([--vapidir $dir])]) +++ ], +++ [AC_MSG_NOTICE([pkg-config didn't return a value for $var, relying on valac built-in defaults])]) +++ done +++ ++ AS_IF([test x$VALAC = "x"], ++ [AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])], ++ [ +diff --git a/feeds/packages/multimedia/rygel/patches/.svn/text-base/020-playbin-mime-types.patch.svn-base b/feeds/packages/multimedia/rygel/patches/.svn/text-base/020-playbin-mime-types.patch.svn-base +new file mode 100644 +index 0000000..7ef4333 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/.svn/text-base/020-playbin-mime-types.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/src/plugins/playbin/rygel-playbin-player.vala +++++ b/src/plugins/playbin/rygel-playbin-player.vala ++@@ -37,6 +37,7 @@ ++ "audio/x-wav", ++ "audio/x-ac3", ++ "audio/x-m4a", +++ "audio/mp4", ++ "image/jpeg", ++ "image/png", ++ "video/x-theora", +diff --git a/feeds/packages/multimedia/rygel/patches/.svn/text-base/030-output-to-syslog.patch.svn-base b/feeds/packages/multimedia/rygel/patches/.svn/text-base/030-output-to-syslog.patch.svn-base +new file mode 100644 +index 0000000..0ed15cd +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/.svn/text-base/030-output-to-syslog.patch.svn-base +@@ -0,0 +1,35 @@ ++Take all the output and send it to syslog. ++This isn't great, but it's better than sending it to the bitbucket, at least ++for troubleshooting. ++--- a/src/rygel/rygel-log-handler.vala +++++ b/src/rygel/rygel-log-handler.vala ++@@ -56,6 +56,29 @@ ++ private LogHandler () { ++ this.log_level_hash = new HashMap (); ++ +++ string[] argv = { "/usr/bin/logger", "-t", "rygel" }; +++ int logger_fd; +++ +++ try { +++ GLib.Process.spawn_async_with_pipes (null, // working_directory +++ argv, +++ null, // envp +++ SpawnFlags.STDOUT_TO_DEV_NULL | +++ SpawnFlags.STDERR_TO_DEV_NULL, +++ null, // child_setup +++ null, // child_pid +++ out logger_fd, // standard_input +++ null, // standard_output +++ null); // standard_error +++ +++ Posix.dup2 (logger_fd, Posix.STDOUT_FILENO); +++ Posix.dup2 (logger_fd, Posix.STDERR_FILENO); +++ Posix.close (logger_fd); +++ } catch (Error err) { +++ warning (_("Unable to send output to /usr/bin/logger: %s"), +++ err.message); +++ } +++ ++ // Get the allowed log levels from the config ++ var config = MetaConfig.get_default (); ++ string log_levels; +diff --git a/feeds/packages/multimedia/rygel/patches/010-conftest-honor-cc.patch b/feeds/packages/multimedia/rygel/patches/010-conftest-honor-cc.patch +new file mode 100644 +index 0000000..3eab47c +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/010-conftest-honor-cc.patch +@@ -0,0 +1,16 @@ ++--- a/m4/vala.m4 +++++ b/m4/vala.m4 ++@@ -28,7 +28,12 @@ ++ void main(){} ++ _ACEOF ++ ++- AS_IF([vala_error=`$VALAC $1 -q -o conftest$ac_exeext conftest.vala 2>&1`], +++ unset vala_cc_args +++ for cflag in $CFLAGS $CPPFLAGS $LDFLAGS; do +++ vala_cc_args="${vala_cc_args:+$vala_cc_args }-X $cflag" +++ done +++ +++ AS_IF([vala_error=`$VALAC $1 -q $VALAFLAGS --cc $CC $vala_cc_args -o conftest$ac_exeext conftest.vala 2>&1`], ++ [$2], [$3]) ++ ]) ++ +diff --git a/feeds/packages/multimedia/rygel/patches/010-identify-libs-by-suffix.patch b/feeds/packages/multimedia/rygel/patches/010-identify-libs-by-suffix.patch +new file mode 100644 +index 0000000..50df4fc +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/010-identify-libs-by-suffix.patch +@@ -0,0 +1,18 @@ ++--- a/src/rygel/rygel-plugin-loader.vala +++++ b/src/rygel/rygel-plugin-loader.vala ++@@ -126,13 +126,12 @@ ++ foreach (var info in infos) { ++ var file = dir.get_child (info.get_name ()); ++ FileType file_type = info.get_file_type (); ++- string content_type = info.get_content_type (); ++- string mime = ContentType.get_mime_type (content_type); +++ string file_name = info.get_name (); ++ ++ if (file_type == FileType.DIRECTORY) { ++ // Recurse into directories ++ this.load_modules_from_dir.begin (file); ++- } else if (mime == "application/x-sharedlib") { +++ } else if (file_name.has_suffix (Module.SUFFIX)) { ++ // Seems like we found a module ++ this.load_module_from_file (file); ++ } +diff --git a/feeds/packages/multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch b/feeds/packages/multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch +new file mode 100644 +index 0000000..70023c5 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/010-vapidirs-from-pkg-config.patch +@@ -0,0 +1,28 @@ ++--- a/m4/rygel.m4 2012-04-12 08:47:08.000000000 -0700 +++++ b/m4/rygel.m4 2012-06-15 11:55:36.000000000 -0700 ++@@ -99,6 +99,25 @@ ++ [dnl check for vala ++ AM_PROG_VALAC([$1]) ++ +++ dnl See where we should look for vapi files. If it's under +++ dnl $datadir, then assume it's one of the standard locations where +++ dnl vala will look. Otherwise, specify explicitly. +++ dnl +++ dnl Note the distinction between these directories (where we look +++ dnl for APIs when we do vala builds) and VAPIDIR, which is where we +++ dnl install our own vapi files. +++ +++ for var in vapidir vapidir_versioned; do +++ AS_IF([dir=`$PKG_CONFIG --variable=$var vapigen`], +++ [ +++ AC_MSG_NOTICE([got $var=$dir from pkg-config]) +++ AS_IF([expr "$dir" : "${datadir}"], +++ [], +++ [RYGEL_ADD_VALAFLAGS([--vapidir $dir])]) +++ ], +++ [AC_MSG_NOTICE([pkg-config didn't return a value for $var, relying on valac built-in defaults])]) +++ done +++ ++ AS_IF([test x$VALAC = "x"], ++ [AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])], ++ [ +diff --git a/feeds/packages/multimedia/rygel/patches/020-playbin-mime-types.patch b/feeds/packages/multimedia/rygel/patches/020-playbin-mime-types.patch +new file mode 100644 +index 0000000..7ef4333 +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/020-playbin-mime-types.patch +@@ -0,0 +1,10 @@ ++--- a/src/plugins/playbin/rygel-playbin-player.vala +++++ b/src/plugins/playbin/rygel-playbin-player.vala ++@@ -37,6 +37,7 @@ ++ "audio/x-wav", ++ "audio/x-ac3", ++ "audio/x-m4a", +++ "audio/mp4", ++ "image/jpeg", ++ "image/png", ++ "video/x-theora", +diff --git a/feeds/packages/multimedia/rygel/patches/030-output-to-syslog.patch b/feeds/packages/multimedia/rygel/patches/030-output-to-syslog.patch +new file mode 100644 +index 0000000..0ed15cd +--- /dev/null ++++ b/feeds/packages/multimedia/rygel/patches/030-output-to-syslog.patch +@@ -0,0 +1,35 @@ ++Take all the output and send it to syslog. ++This isn't great, but it's better than sending it to the bitbucket, at least ++for troubleshooting. ++--- a/src/rygel/rygel-log-handler.vala +++++ b/src/rygel/rygel-log-handler.vala ++@@ -56,6 +56,29 @@ ++ private LogHandler () { ++ this.log_level_hash = new HashMap (); ++ +++ string[] argv = { "/usr/bin/logger", "-t", "rygel" }; +++ int logger_fd; +++ +++ try { +++ GLib.Process.spawn_async_with_pipes (null, // working_directory +++ argv, +++ null, // envp +++ SpawnFlags.STDOUT_TO_DEV_NULL | +++ SpawnFlags.STDERR_TO_DEV_NULL, +++ null, // child_setup +++ null, // child_pid +++ out logger_fd, // standard_input +++ null, // standard_output +++ null); // standard_error +++ +++ Posix.dup2 (logger_fd, Posix.STDOUT_FILENO); +++ Posix.dup2 (logger_fd, Posix.STDERR_FILENO); +++ Posix.close (logger_fd); +++ } catch (Error err) { +++ warning (_("Unable to send output to /usr/bin/logger: %s"), +++ err.message); +++ } +++ ++ // Get the allowed log levels from the config ++ var config = MetaConfig.get_default (); ++ string log_levels; +diff --git a/feeds/packages/multimedia/shairport/.svn/entries b/feeds/packages/multimedia/shairport/.svn/entries +new file mode 100644 +index 0000000..383a9c9 +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/shairport ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++65b9f8b48568d8e239e919627211ca15 ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1636 ++ +diff --git a/feeds/packages/multimedia/shairport/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/shairport/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..332c41a +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=shairport ++PKG_VERSION:=2012-10-20 ++PKG_RELEASE:=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/albertz/shairport.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=4746bb11395d171ee800f074f489c42020a84932 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shairport ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libpthread +avahi-utils +libopenssl +libao ++ TITLE:=ShairPort AirPort Express emulator ++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:=-lao -lm -lcrypto -lpthread ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(LIBS)" ++ ++define Package/shairport/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/shairport $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) files/shairport.init $(1)/etc/init.d/shairport ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) files/shairport.config $(1)/etc/config/shairport ++endef ++ ++$(eval $(call BuildPackage,shairport)) +diff --git a/feeds/packages/multimedia/shairport/Makefile b/feeds/packages/multimedia/shairport/Makefile +new file mode 100644 +index 0000000..332c41a +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=shairport ++PKG_VERSION:=2012-10-20 ++PKG_RELEASE:=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/albertz/shairport.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=4746bb11395d171ee800f074f489c42020a84932 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shairport ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libpthread +avahi-utils +libopenssl +libao ++ TITLE:=ShairPort AirPort Express emulator ++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:=-lao -lm -lcrypto -lpthread ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(LIBS)" ++ ++define Package/shairport/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/shairport $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d/ ++ $(INSTALL_BIN) files/shairport.init $(1)/etc/init.d/shairport ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) files/shairport.config $(1)/etc/config/shairport ++endef ++ ++$(eval $(call BuildPackage,shairport)) +diff --git a/feeds/packages/multimedia/shairport/files/.svn/entries b/feeds/packages/multimedia/shairport/files/.svn/entries +new file mode 100644 +index 0000000..58a510b +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/shairport/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++shairport.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++f2c864b5d6fb03976ee7815d3712bb6c ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++62 ++ ++shairport.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++aacabea873276a23303421e17ab9dfd1 ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++618 ++ +diff --git a/feeds/packages/multimedia/shairport/files/.svn/text-base/shairport.config.svn-base b/feeds/packages/multimedia/shairport/files/.svn/text-base/shairport.config.svn-base +new file mode 100644 +index 0000000..83ba692 +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/files/.svn/text-base/shairport.config.svn-base +@@ -0,0 +1,3 @@ ++config shairport ++ option name 'AirPort' ++ option buffer '256' +diff --git a/feeds/packages/multimedia/shairport/files/.svn/text-base/shairport.init.svn-base b/feeds/packages/multimedia/shairport/files/.svn/text-base/shairport.init.svn-base +new file mode 100644 +index 0000000..f3aa75f +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/files/.svn/text-base/shairport.init.svn-base +@@ -0,0 +1,36 @@ ++#!/bin/sh /etc/rc.common ++START=80 ++ ++DAEMON="/usr/sbin/shairport" ++ ++config_shairport() { ++ local cfg="$1" ++ local args="" ++ ++ config_get name "$cfg" name ++ config_get password "$cfg" password ++ config_get port "$cfg" port ++ config_get buffer "$cfg" buffer ++ ++ [ -z $name ] && name="AirPort" ++ args="$args -a $name" ++ ++ [ ! -z "$password" ] && args="$args -p $password" ++ [ ! -z "$port" ] && args="$args -o $port" ++ ++ [ -z $buffer ] && buffer="256" ++ args="$args -b $buffer" ++ ++ args="$args -d" ++ ++ service_start $DAEMON $args ++} ++ ++start() { ++ config_load shairport ++ config_foreach config_shairport shairport ++} ++ ++stop() { ++ service_stop $DAEMON ++} +diff --git a/feeds/packages/multimedia/shairport/files/shairport.config b/feeds/packages/multimedia/shairport/files/shairport.config +new file mode 100644 +index 0000000..83ba692 +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/files/shairport.config +@@ -0,0 +1,3 @@ ++config shairport ++ option name 'AirPort' ++ option buffer '256' +diff --git a/feeds/packages/multimedia/shairport/files/shairport.init b/feeds/packages/multimedia/shairport/files/shairport.init +new file mode 100644 +index 0000000..f3aa75f +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/files/shairport.init +@@ -0,0 +1,36 @@ ++#!/bin/sh /etc/rc.common ++START=80 ++ ++DAEMON="/usr/sbin/shairport" ++ ++config_shairport() { ++ local cfg="$1" ++ local args="" ++ ++ config_get name "$cfg" name ++ config_get password "$cfg" password ++ config_get port "$cfg" port ++ config_get buffer "$cfg" buffer ++ ++ [ -z $name ] && name="AirPort" ++ args="$args -a $name" ++ ++ [ ! -z "$password" ] && args="$args -p $password" ++ [ ! -z "$port" ] && args="$args -o $port" ++ ++ [ -z $buffer ] && buffer="256" ++ args="$args -b $buffer" ++ ++ args="$args -d" ++ ++ service_start $DAEMON $args ++} ++ ++start() { ++ config_load shairport ++ config_foreach config_shairport shairport ++} ++ ++stop() { ++ service_stop $DAEMON ++} +diff --git a/feeds/packages/multimedia/shairport/patches/.svn/entries b/feeds/packages/multimedia/shairport/patches/.svn/entries +new file mode 100644 +index 0000000..b877898 +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/shairport/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-fix_ipv6_fallback.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++1f9ea08e889c5528ca327e098277ddca ++2013-02-22T14:52:38.824309Z ++35746 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3519 ++ +diff --git a/feeds/packages/multimedia/shairport/patches/.svn/text-base/001-fix_ipv6_fallback.patch.svn-base b/feeds/packages/multimedia/shairport/patches/.svn/text-base/001-fix_ipv6_fallback.patch.svn-base +new file mode 100644 +index 0000000..070742b +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/patches/.svn/text-base/001-fix_ipv6_fallback.patch.svn-base +@@ -0,0 +1,108 @@ ++diff --git a/socketlib.c b/socketlib.c ++index 9efdf22..eb44bcf 100644 ++--- a/socketlib.c +++++ b/socketlib.c ++@@ -39,9 +39,11 @@ ++ #include ++ #include ++ ++-int common_setup(struct addrinfo *pAddrInfo) ++-{ +++int common_setup(struct addrinfo **ppAddrInfo, int pPort) +++{ ++ int tSock; +++ struct addrinfo *pAddrInfo = *ppAddrInfo; +++ ++ //printAddrs(pAddrInfo); ++ tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0); ++ #ifdef AF_INET6 ++@@ -49,7 +51,17 @@ int common_setup(struct addrinfo *pAddrInfo) ++ { ++ //Fallback to ipv4 ++ perror("Failed to create ipv6 socket. Trying ipv4"); ++- pAddrInfo->ai_family = AF_INET; +++ (*ppAddrInfo)->ai_family = AF_INET; +++ if (pPort != -1) +++ { +++ char tService[SERVLEN]; +++ sprintf(tService, "%d", pPort); // copies port to string +++ int tFamily = AF_INET; +++ if(getAddr(NULL, tService, tFamily, SOCK_STREAM, ppAddrInfo)) +++ { +++ return ERROR; // getAddr prints out error message +++ } +++ } ++ tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0); ++ } ++ #endif ++@@ -63,7 +75,7 @@ int setup_client(struct addrinfo *server_host) ++ ++ while(tIdx++ < RETRY_COUNT) ++ { ++- tSockDesc = common_setup(server_host); +++ tSockDesc = common_setup(&server_host, -1); ++ if (tSockDesc < 0 && tIdx >= RETRY_COUNT) ++ { ++ perror("Error: Could not create socket"); ++@@ -107,9 +119,23 @@ int getAddr(char *pHostname, char *pService, int pFamily, int pSockType, struct ++ return tError; ++ } ++ ++-int setup_server(struct addrinfo *server_addr) +++int setup_server(struct addrinfo *server_addr, int pPort) ++ { ++- int tSock = common_setup(server_addr); +++ char tService[SERVLEN]; +++ sprintf(tService, "%d", pPort); // copies port to string +++ int tFamily = AF_INET; +++ #ifdef AF_INET6 +++ //printf("Listening on IPv6 Socket\n"); +++ tFamily = AF_INET6; +++ #else +++ //printf("Listening on IPv4 Socket"); +++ #endif +++ if(getAddr(NULL, tService, tFamily, SOCK_STREAM, &server_addr)) +++ { +++ return ERROR; // getAddr prints out error message +++ } +++ +++ int tSock = common_setup(&server_addr, pPort); ++ if (tSock < 0) ++ { ++ perror("Error: Could not create server socket"); ++@@ -154,21 +180,7 @@ int acceptClient(int pSock, struct addrinfo *server_addr) ++ ++ int setupListenServer(struct addrinfo **pAddrInfo, int pPort) ++ { ++- char tService[SERVLEN]; ++- sprintf(tService, "%d", pPort); // copies port to string ++- int tFamily = AF_INET; ++- #ifdef AF_INET6 ++- //printf("Listening on IPv6 Socket\n"); ++- tFamily = AF_INET6; ++- #else ++- //printf("Listening on IPv4 Socket"); ++- #endif ++- if(getAddr(NULL, tService, tFamily, SOCK_STREAM, pAddrInfo)) ++- { ++- return ERROR; // getAddr prints out error message ++- } ++- ++- int tSocketDescriptor = setup_server(*pAddrInfo); +++ int tSocketDescriptor = setup_server(*pAddrInfo, pPort); ++ char tAddr[INET6_ADDRSTRLEN]; ++ socklen_t tSize = INET6_ADDRSTRLEN; ++ inet_ntop((*pAddrInfo)->ai_family, (*pAddrInfo)->ai_addr, tAddr, tSize); ++diff --git a/socketlib.h b/socketlib.h ++index 6d501f3..5cb1bf0 100644 ++--- a/socketlib.h +++++ b/socketlib.h ++@@ -24,7 +24,7 @@ ++ #define DEFAULT_UNIX "/unix" ++ ++ int setup_client(struct addrinfo *server_info); ++-int setup_server(struct addrinfo *server_address); +++int setup_server(struct addrinfo *server_address, int pPort); ++ int setupListenServer(struct addrinfo **pAddrInfo, int pPort); ++ int acceptClient(int pSock, struct addrinfo *server_addr); ++ void delay(long pMillisecs, struct timeval *pRes); +diff --git a/feeds/packages/multimedia/shairport/patches/001-fix_ipv6_fallback.patch b/feeds/packages/multimedia/shairport/patches/001-fix_ipv6_fallback.patch +new file mode 100644 +index 0000000..070742b +--- /dev/null ++++ b/feeds/packages/multimedia/shairport/patches/001-fix_ipv6_fallback.patch +@@ -0,0 +1,108 @@ ++diff --git a/socketlib.c b/socketlib.c ++index 9efdf22..eb44bcf 100644 ++--- a/socketlib.c +++++ b/socketlib.c ++@@ -39,9 +39,11 @@ ++ #include ++ #include ++ ++-int common_setup(struct addrinfo *pAddrInfo) ++-{ +++int common_setup(struct addrinfo **ppAddrInfo, int pPort) +++{ ++ int tSock; +++ struct addrinfo *pAddrInfo = *ppAddrInfo; +++ ++ //printAddrs(pAddrInfo); ++ tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0); ++ #ifdef AF_INET6 ++@@ -49,7 +51,17 @@ int common_setup(struct addrinfo *pAddrInfo) ++ { ++ //Fallback to ipv4 ++ perror("Failed to create ipv6 socket. Trying ipv4"); ++- pAddrInfo->ai_family = AF_INET; +++ (*ppAddrInfo)->ai_family = AF_INET; +++ if (pPort != -1) +++ { +++ char tService[SERVLEN]; +++ sprintf(tService, "%d", pPort); // copies port to string +++ int tFamily = AF_INET; +++ if(getAddr(NULL, tService, tFamily, SOCK_STREAM, ppAddrInfo)) +++ { +++ return ERROR; // getAddr prints out error message +++ } +++ } ++ tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0); ++ } ++ #endif ++@@ -63,7 +75,7 @@ int setup_client(struct addrinfo *server_host) ++ ++ while(tIdx++ < RETRY_COUNT) ++ { ++- tSockDesc = common_setup(server_host); +++ tSockDesc = common_setup(&server_host, -1); ++ if (tSockDesc < 0 && tIdx >= RETRY_COUNT) ++ { ++ perror("Error: Could not create socket"); ++@@ -107,9 +119,23 @@ int getAddr(char *pHostname, char *pService, int pFamily, int pSockType, struct ++ return tError; ++ } ++ ++-int setup_server(struct addrinfo *server_addr) +++int setup_server(struct addrinfo *server_addr, int pPort) ++ { ++- int tSock = common_setup(server_addr); +++ char tService[SERVLEN]; +++ sprintf(tService, "%d", pPort); // copies port to string +++ int tFamily = AF_INET; +++ #ifdef AF_INET6 +++ //printf("Listening on IPv6 Socket\n"); +++ tFamily = AF_INET6; +++ #else +++ //printf("Listening on IPv4 Socket"); +++ #endif +++ if(getAddr(NULL, tService, tFamily, SOCK_STREAM, &server_addr)) +++ { +++ return ERROR; // getAddr prints out error message +++ } +++ +++ int tSock = common_setup(&server_addr, pPort); ++ if (tSock < 0) ++ { ++ perror("Error: Could not create server socket"); ++@@ -154,21 +180,7 @@ int acceptClient(int pSock, struct addrinfo *server_addr) ++ ++ int setupListenServer(struct addrinfo **pAddrInfo, int pPort) ++ { ++- char tService[SERVLEN]; ++- sprintf(tService, "%d", pPort); // copies port to string ++- int tFamily = AF_INET; ++- #ifdef AF_INET6 ++- //printf("Listening on IPv6 Socket\n"); ++- tFamily = AF_INET6; ++- #else ++- //printf("Listening on IPv4 Socket"); ++- #endif ++- if(getAddr(NULL, tService, tFamily, SOCK_STREAM, pAddrInfo)) ++- { ++- return ERROR; // getAddr prints out error message ++- } ++- ++- int tSocketDescriptor = setup_server(*pAddrInfo); +++ int tSocketDescriptor = setup_server(*pAddrInfo, pPort); ++ char tAddr[INET6_ADDRSTRLEN]; ++ socklen_t tSize = INET6_ADDRSTRLEN; ++ inet_ntop((*pAddrInfo)->ai_family, (*pAddrInfo)->ai_addr, tAddr, tSize); ++diff --git a/socketlib.h b/socketlib.h ++index 6d501f3..5cb1bf0 100644 ++--- a/socketlib.h +++++ b/socketlib.h ++@@ -24,7 +24,7 @@ ++ #define DEFAULT_UNIX "/unix" ++ ++ int setup_client(struct addrinfo *server_info); ++-int setup_server(struct addrinfo *server_address); +++int setup_server(struct addrinfo *server_address, int pPort); ++ int setupListenServer(struct addrinfo **pAddrInfo, int pPort); ++ int acceptClient(int pSock, struct addrinfo *server_addr); ++ void delay(long pMillisecs, struct timeval *pRes); +diff --git a/feeds/packages/multimedia/tvheadend/.svn/entries b/feeds/packages/multimedia/tvheadend/.svn/entries +new file mode 100644 +index 0000000..91f7662 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/.svn/entries +@@ -0,0 +1,102 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/tvheadend ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++f88d7cd8d76e0ea0ccdea50d0d577030 ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++446 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++a943acb09911e59d0c3e1453b138f01b ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2012 ++ +diff --git a/feeds/packages/multimedia/tvheadend/.svn/text-base/Config.in.svn-base b/feeds/packages/multimedia/tvheadend/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..52c018f +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,21 @@ ++config TVHEADEND_CWC_SUPPORT ++ bool "NewCamD support" ++ default n ++ ++config TVHEADEND_V4L_SUPPORT ++ bool "Video4Linux v2 support" ++ default n ++ ++config TVHEADEND_LINUXDVB_SUPPORT ++ bool "Linux DVB support" ++ default n ++ ++config TVHEADEND_DVBSCAN_SUPPORT ++ bool "Fetch DVB-scan data" ++ depends TVHEADEND_LINUXDVB_SUPPORT ++ default TVHEADEND_LINUXDVB_SUPPORT ++ ++config TVHEADEND_AVAHI_SUPPORT ++ bool "Avahi client support" ++ select PACKAGE_libavahi-client ++ default n +diff --git a/feeds/packages/multimedia/tvheadend/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/tvheadend/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4a5a059 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,78 @@ ++# ++# Copyright (C) 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:=tvheadend ++PKG_VERSION:=3.2 ++PKG_RELEASE:=0.1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://github.com/downloads/tvheadend/tvheadend/ ++PKG_MD5SUM:=4f7faa75c4ea24942c5a12a77ebdcdf0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tvheadend ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=Tvheadend is a TV streaming server for Linux ++ DEPENDS:=+libopenssl +librt +zlib +TVHEADEND_AVAHI_SUPPORT:libavahi-client ++ URL:=http://www.lonelycoder.com/hts/tvheadend_overview.html ++endef ++ ++define Package/tvheadend/description ++ Tvheadend is a TV streaming server for Linux supporting DVB, ATSC, IPTV, ++ and Analog video (V4L) as input sources. ++ Can be used as a backend to Showtime, XBMC and various other clients. ++endef ++ ++define Package/tvheadend/config ++ menu "Configuration" ++ depends on PACKAGE_tvheadend ++ source "$(SOURCE)/Config.in" ++ endmenu ++endef ++ ++ifeq ($(CONFIG_TVHEADEND_CWC_SUPPORT),) ++ CONFIGURE_ARGS += --disable-cwc ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_V4L_SUPPORT),) ++ CONFIGURE_ARGS += --disable-v4l ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_LINUXDVB_SUPPORT),) ++ CONFIGURE_ARGS += --disable-linuxdvb ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_DVBSCAN_SUPPORT),) ++ CONFIGURE_ARGS += --disable-dvbscan ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_AVAHI_SUPPORT),) ++ CONFIGURE_ARGS += --disable-avahi ++else ++ CONFIGURE_ARGS += --enable-avahi ++endif ++ ++CONFIGURE_ARGS += \ ++ --release \ ++ --enable-bundle ++ ++define Package/tvheadend/install ++ $(INSTALL_DIR) $(1)/etc/tvheadend ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/tvheadend.init $(1)/etc/init.d/tvheadend ++ $(INSTALL_DIR) $(1)/lib/upgrade/keep.d ++ $(INSTALL_DATA) ./files/tvheadend.upgrade $(1)/lib/upgrade/keep.d/tvheadend ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/build.linux/tvheadend $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,tvheadend)) +diff --git a/feeds/packages/multimedia/tvheadend/Config.in b/feeds/packages/multimedia/tvheadend/Config.in +new file mode 100644 +index 0000000..52c018f +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/Config.in +@@ -0,0 +1,21 @@ ++config TVHEADEND_CWC_SUPPORT ++ bool "NewCamD support" ++ default n ++ ++config TVHEADEND_V4L_SUPPORT ++ bool "Video4Linux v2 support" ++ default n ++ ++config TVHEADEND_LINUXDVB_SUPPORT ++ bool "Linux DVB support" ++ default n ++ ++config TVHEADEND_DVBSCAN_SUPPORT ++ bool "Fetch DVB-scan data" ++ depends TVHEADEND_LINUXDVB_SUPPORT ++ default TVHEADEND_LINUXDVB_SUPPORT ++ ++config TVHEADEND_AVAHI_SUPPORT ++ bool "Avahi client support" ++ select PACKAGE_libavahi-client ++ default n +diff --git a/feeds/packages/multimedia/tvheadend/Makefile b/feeds/packages/multimedia/tvheadend/Makefile +new file mode 100644 +index 0000000..4a5a059 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/Makefile +@@ -0,0 +1,78 @@ ++# ++# Copyright (C) 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:=tvheadend ++PKG_VERSION:=3.2 ++PKG_RELEASE:=0.1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://github.com/downloads/tvheadend/tvheadend/ ++PKG_MD5SUM:=4f7faa75c4ea24942c5a12a77ebdcdf0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tvheadend ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:=Tvheadend is a TV streaming server for Linux ++ DEPENDS:=+libopenssl +librt +zlib +TVHEADEND_AVAHI_SUPPORT:libavahi-client ++ URL:=http://www.lonelycoder.com/hts/tvheadend_overview.html ++endef ++ ++define Package/tvheadend/description ++ Tvheadend is a TV streaming server for Linux supporting DVB, ATSC, IPTV, ++ and Analog video (V4L) as input sources. ++ Can be used as a backend to Showtime, XBMC and various other clients. ++endef ++ ++define Package/tvheadend/config ++ menu "Configuration" ++ depends on PACKAGE_tvheadend ++ source "$(SOURCE)/Config.in" ++ endmenu ++endef ++ ++ifeq ($(CONFIG_TVHEADEND_CWC_SUPPORT),) ++ CONFIGURE_ARGS += --disable-cwc ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_V4L_SUPPORT),) ++ CONFIGURE_ARGS += --disable-v4l ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_LINUXDVB_SUPPORT),) ++ CONFIGURE_ARGS += --disable-linuxdvb ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_DVBSCAN_SUPPORT),) ++ CONFIGURE_ARGS += --disable-dvbscan ++endif ++ ++ifeq ($(CONFIG_TVHEADEND_AVAHI_SUPPORT),) ++ CONFIGURE_ARGS += --disable-avahi ++else ++ CONFIGURE_ARGS += --enable-avahi ++endif ++ ++CONFIGURE_ARGS += \ ++ --release \ ++ --enable-bundle ++ ++define Package/tvheadend/install ++ $(INSTALL_DIR) $(1)/etc/tvheadend ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/tvheadend.init $(1)/etc/init.d/tvheadend ++ $(INSTALL_DIR) $(1)/lib/upgrade/keep.d ++ $(INSTALL_DATA) ./files/tvheadend.upgrade $(1)/lib/upgrade/keep.d/tvheadend ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/build.linux/tvheadend $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,tvheadend)) +diff --git a/feeds/packages/multimedia/tvheadend/files/.svn/entries b/feeds/packages/multimedia/tvheadend/files/.svn/entries +new file mode 100644 +index 0000000..92dbfc7 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/tvheadend/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++tvheadend.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++a3efd6814eaf77f7b6538f75a875fe47 ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++295 ++ ++tvheadend.upgrade ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++57921c01f93b64c86d6d1924a8288c7f ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++15 ++ +diff --git a/feeds/packages/multimedia/tvheadend/files/.svn/text-base/tvheadend.init.svn-base b/feeds/packages/multimedia/tvheadend/files/.svn/text-base/tvheadend.init.svn-base +new file mode 100644 +index 0000000..45258a5 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/files/.svn/text-base/tvheadend.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012 OpenWrt.org ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++START=80 ++ ++start() { ++ service_start /usr/bin/tvheadend -f -c /etc/tvheadend ++} ++ ++stop() { ++ service_stop /usr/bin/tvheadend ++} +diff --git a/feeds/packages/multimedia/tvheadend/files/.svn/text-base/tvheadend.upgrade.svn-base b/feeds/packages/multimedia/tvheadend/files/.svn/text-base/tvheadend.upgrade.svn-base +new file mode 100644 +index 0000000..87b2b53 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/files/.svn/text-base/tvheadend.upgrade.svn-base +@@ -0,0 +1 @@ ++/etc/tvheadend +diff --git a/feeds/packages/multimedia/tvheadend/files/tvheadend.init b/feeds/packages/multimedia/tvheadend/files/tvheadend.init +new file mode 100644 +index 0000000..45258a5 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/files/tvheadend.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012 OpenWrt.org ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++START=80 ++ ++start() { ++ service_start /usr/bin/tvheadend -f -c /etc/tvheadend ++} ++ ++stop() { ++ service_stop /usr/bin/tvheadend ++} +diff --git a/feeds/packages/multimedia/tvheadend/files/tvheadend.upgrade b/feeds/packages/multimedia/tvheadend/files/tvheadend.upgrade +new file mode 100644 +index 0000000..87b2b53 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/files/tvheadend.upgrade +@@ -0,0 +1 @@ ++/etc/tvheadend +diff --git a/feeds/packages/multimedia/tvheadend/patches/.svn/entries b/feeds/packages/multimedia/tvheadend/patches/.svn/entries +new file mode 100644 +index 0000000..e7b3550 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/tvheadend/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-SHA1.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++e590e55d7d7992ea1e34d7462f2fcc29 ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++559 ++ ++020-Werror.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++152fb4fc1eed59863f33608612871f15 ++2012-12-04T16:20:54.086756Z ++34486 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++771 ++ +diff --git a/feeds/packages/multimedia/tvheadend/patches/.svn/text-base/010-SHA1.patch.svn-base b/feeds/packages/multimedia/tvheadend/patches/.svn/text-base/010-SHA1.patch.svn-base +new file mode 100644 +index 0000000..dc51ec7 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/patches/.svn/text-base/010-SHA1.patch.svn-base +@@ -0,0 +1,16 @@ ++diff -urN tvheadend-3.2-orig/src/trap.c tvheadend-3.2/src/trap.c ++--- tvheadend-3.2-orig/src/trap.c 2012-10-23 12:56:27.000000000 +0400 +++++ tvheadend-3.2/src/trap.c 2012-10-24 21:01:34.254818786 +0400 ++@@ -243,9 +243,9 @@ ++ char *m = malloc(st.st_size); ++ if(m != NULL) { ++ if(read(fd, m, st.st_size) == st.st_size) { ++- SHA_Init(&binsum); ++- SHA_Update(&binsum, (void *)m, st.st_size); ++- SHA_Final(digest, &binsum); +++ SHA1_Init(&binsum); +++ SHA1_Update(&binsum, (void *)m, st.st_size); +++ SHA1_Final(digest, &binsum); ++ } ++ free(m); ++ } +diff --git a/feeds/packages/multimedia/tvheadend/patches/.svn/text-base/020-Werror.patch.svn-base b/feeds/packages/multimedia/tvheadend/patches/.svn/text-base/020-Werror.patch.svn-base +new file mode 100644 +index 0000000..56acfac +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/patches/.svn/text-base/020-Werror.patch.svn-base +@@ -0,0 +1,30 @@ ++diff -urN tvheadend-3.2-orig/src/trap.c tvheadend-3.2/src/trap.c ++--- tvheadend-3.2-orig/src/trap.c 2012-10-24 21:01:34.254818786 +0400 +++++ tvheadend-3.2/src/trap.c 2012-10-24 21:05:09.122437531 +0400 ++@@ -67,6 +67,7 @@ ++ /** ++ * ++ */ +++#if ENABLE_EXECINFO ++ static int ++ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen) ++ { ++@@ -126,6 +127,7 @@ ++ close(fd[0]); ++ return 0; ++ } +++#endif /* ENABLE_EXECINFO */ ++ ++ ++ ++@@ -133,8 +135,8 @@ ++ traphandler(int sig, siginfo_t *si, void *UC) ++ { ++ ucontext_t *uc = UC; ++- char buf[200]; ++ #if ENABLE_EXECINFO +++ char buf[200]; ++ static void *frames[MAXFRAMES]; ++ int nframes = backtrace(frames, MAXFRAMES); ++ Dl_info dli; ++Binary files tvheadend-3.2-orig/src/.trap.c.swp and tvheadend-3.2/src/.trap.c.swp differ +diff --git a/feeds/packages/multimedia/tvheadend/patches/010-SHA1.patch b/feeds/packages/multimedia/tvheadend/patches/010-SHA1.patch +new file mode 100644 +index 0000000..dc51ec7 +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/patches/010-SHA1.patch +@@ -0,0 +1,16 @@ ++diff -urN tvheadend-3.2-orig/src/trap.c tvheadend-3.2/src/trap.c ++--- tvheadend-3.2-orig/src/trap.c 2012-10-23 12:56:27.000000000 +0400 +++++ tvheadend-3.2/src/trap.c 2012-10-24 21:01:34.254818786 +0400 ++@@ -243,9 +243,9 @@ ++ char *m = malloc(st.st_size); ++ if(m != NULL) { ++ if(read(fd, m, st.st_size) == st.st_size) { ++- SHA_Init(&binsum); ++- SHA_Update(&binsum, (void *)m, st.st_size); ++- SHA_Final(digest, &binsum); +++ SHA1_Init(&binsum); +++ SHA1_Update(&binsum, (void *)m, st.st_size); +++ SHA1_Final(digest, &binsum); ++ } ++ free(m); ++ } +diff --git a/feeds/packages/multimedia/tvheadend/patches/020-Werror.patch b/feeds/packages/multimedia/tvheadend/patches/020-Werror.patch +new file mode 100644 +index 0000000..56acfac +--- /dev/null ++++ b/feeds/packages/multimedia/tvheadend/patches/020-Werror.patch +@@ -0,0 +1,30 @@ ++diff -urN tvheadend-3.2-orig/src/trap.c tvheadend-3.2/src/trap.c ++--- tvheadend-3.2-orig/src/trap.c 2012-10-24 21:01:34.254818786 +0400 +++++ tvheadend-3.2/src/trap.c 2012-10-24 21:05:09.122437531 +0400 ++@@ -67,6 +67,7 @@ ++ /** ++ * ++ */ +++#if ENABLE_EXECINFO ++ static int ++ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen) ++ { ++@@ -126,6 +127,7 @@ ++ close(fd[0]); ++ return 0; ++ } +++#endif /* ENABLE_EXECINFO */ ++ ++ ++ ++@@ -133,8 +135,8 @@ ++ traphandler(int sig, siginfo_t *si, void *UC) ++ { ++ ucontext_t *uc = UC; ++- char buf[200]; ++ #if ENABLE_EXECINFO +++ char buf[200]; ++ static void *frames[MAXFRAMES]; ++ int nframes = backtrace(frames, MAXFRAMES); ++ Dl_info dli; ++Binary files tvheadend-3.2-orig/src/.trap.c.swp and tvheadend-3.2/src/.trap.c.swp differ +diff --git a/feeds/packages/multimedia/ushare/.svn/entries b/feeds/packages/multimedia/ushare/.svn/entries +new file mode 100644 +index 0000000..e3651d5 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ushare ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T12:11:04.809913Z ++32334 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++ed11edb08e3a9fe6ae517b0321c91ec9 ++2012-06-13T12:11:04.809913Z ++32334 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1920 ++ +diff --git a/feeds/packages/multimedia/ushare/.svn/prop-base/Makefile.svn-base b/feeds/packages/multimedia/ushare/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..323a7d8 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/multimedia/ushare/.svn/text-base/Makefile.svn-base b/feeds/packages/multimedia/ushare/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ed19787 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=ushare ++PKG_VERSION:=1.1a ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://ushare.geexbox.org/releases/ ++PKG_MD5SUM:=5bbcdbf1ff85a9710fa3d4e82ccaa251 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ushare ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:= UPnP A/V & DLNA Media Server ++ URL:=http://ushare.geexbox.org/ ++ DEPENDS:=+libdlna +libupnp +libffmpeg ++endef ++ ++define Package/ushare/description ++ uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server ++ component that provides UPnP media devices with information on available ++ multimedia files. ++endef ++ ++MAKE_INSTALL_FLAGS+= \ ++ INSTALL="install" \ ++ ++define Build/Configure ++ # this is *NOT* GNU configure ++ ( cd $(PKG_BUILD_DIR); \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib" \ ++ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ ./configure \ ++ --cross-compile \ ++ --cross-prefix="$(TARGET_CROSS)" \ ++ --prefix="/usr" \ ++ --sysconfdir="/etc" \ ++ --enable-dlna \ ++ --disable-nls \ ++ --disable-debug \ ++ --disable-optimize \ ++ --disable-strip \ ++ ) ++endef ++ ++define Package/ushare/conffiles ++/etc/config/ushare ++/etc/ushare.conf ++endef ++ ++define Package/ushare/install ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_INSTALL_DIR)/etc/ushare.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ushare $(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,ushare)) +diff --git a/feeds/packages/multimedia/ushare/Makefile b/feeds/packages/multimedia/ushare/Makefile +new file mode 100644 +index 0000000..ed19787 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=ushare ++PKG_VERSION:=1.1a ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://ushare.geexbox.org/releases/ ++PKG_MD5SUM:=5bbcdbf1ff85a9710fa3d4e82ccaa251 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ushare ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ TITLE:= UPnP A/V & DLNA Media Server ++ URL:=http://ushare.geexbox.org/ ++ DEPENDS:=+libdlna +libupnp +libffmpeg ++endef ++ ++define Package/ushare/description ++ uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server ++ component that provides UPnP media devices with information on available ++ multimedia files. ++endef ++ ++MAKE_INSTALL_FLAGS+= \ ++ INSTALL="install" \ ++ ++define Build/Configure ++ # this is *NOT* GNU configure ++ ( cd $(PKG_BUILD_DIR); \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib" \ ++ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ ./configure \ ++ --cross-compile \ ++ --cross-prefix="$(TARGET_CROSS)" \ ++ --prefix="/usr" \ ++ --sysconfdir="/etc" \ ++ --enable-dlna \ ++ --disable-nls \ ++ --disable-debug \ ++ --disable-optimize \ ++ --disable-strip \ ++ ) ++endef ++ ++define Package/ushare/conffiles ++/etc/config/ushare ++/etc/ushare.conf ++endef ++ ++define Package/ushare/install ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_INSTALL_DIR)/etc/ushare.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ushare $(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,ushare)) +diff --git a/feeds/packages/multimedia/ushare/files/.svn/entries b/feeds/packages/multimedia/ushare/files/.svn/entries +new file mode 100644 +index 0000000..e2907d9 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ushare/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T09:44:14.848397Z ++29174 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ushare.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++7e6bbc0a38be8018fbe82d8857bad393 ++2011-11-16T09:44:14.848397Z ++29174 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1430 ++ ++ushare.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++49046784e1d6b398e365b3a35b3e77ec ++2011-11-16T09:44:14.848397Z ++29174 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++237 ++ +diff --git a/feeds/packages/multimedia/ushare/files/.svn/text-base/ushare.config.svn-base b/feeds/packages/multimedia/ushare/files/.svn/text-base/ushare.config.svn-base +new file mode 100644 +index 0000000..d7d0dce +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/files/.svn/text-base/ushare.config.svn-base +@@ -0,0 +1,9 @@ ++config 'ushare' ++ option 'enabled' '0' ++ option 'user' 'nobody' ++ option 'servername' 'OpenWrt' ++ option 'interface' 'br-lan' ++ option 'options' '' ++ option 'content_directories' '/tmp' ++ option 'disable_telnet' '1' ++ option 'disable_webif' '1' +diff --git a/feeds/packages/multimedia/ushare/files/.svn/text-base/ushare.init.svn-base b/feeds/packages/multimedia/ushare/files/.svn/text-base/ushare.init.svn-base +new file mode 100644 +index 0000000..db661d1 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/files/.svn/text-base/ushare.init.svn-base +@@ -0,0 +1,68 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++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" ++} ++ ++section_enabled() { ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local section="$1" ++ ++ section_enabled "$section" || return 1 ++ ++ args="" ++ config_get uid "$section" 'user' ++ config_get servername "$section" 'servername' ++ config_get interface "$section" 'interface' ++ config_get options "$section" 'options' ++ config_get content_directories "$section" 'content_directories' ++ append_bool "$section" 'disable_webif' '-w' ++ append_bool "$section" 'disable_telnet' '-t' ++ ++ SERVICE_UID="$uid" \ ++ service_start /usr/bin/ushare -n "${servername:-OpenWrt}" -i "${interface:-br-lan}" -c "${content_directories:-/tmp}" $args ${options} ++} ++ ++stop_instance() { ++ local section="$1" ++ ++ section_enabled "$section" || return 1 ++ ++ config_get uid "$section" "user" ++ ++ SERVICE_UID="$uid" \ ++ service_stop /usr/bin/ushare ++} ++ ++start() { ++ config_load 'ushare' ++ config_foreach start_instance 'ushare' ++} ++ ++stop() { ++ config_load 'ushare' ++ config_foreach stop_instance 'ushare' ++} +diff --git a/feeds/packages/multimedia/ushare/files/ushare.config b/feeds/packages/multimedia/ushare/files/ushare.config +new file mode 100644 +index 0000000..d7d0dce +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/files/ushare.config +@@ -0,0 +1,9 @@ ++config 'ushare' ++ option 'enabled' '0' ++ option 'user' 'nobody' ++ option 'servername' 'OpenWrt' ++ option 'interface' 'br-lan' ++ option 'options' '' ++ option 'content_directories' '/tmp' ++ option 'disable_telnet' '1' ++ option 'disable_webif' '1' +diff --git a/feeds/packages/multimedia/ushare/files/ushare.init b/feeds/packages/multimedia/ushare/files/ushare.init +new file mode 100644 +index 0000000..db661d1 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/files/ushare.init +@@ -0,0 +1,68 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++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" ++} ++ ++section_enabled() { ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local section="$1" ++ ++ section_enabled "$section" || return 1 ++ ++ args="" ++ config_get uid "$section" 'user' ++ config_get servername "$section" 'servername' ++ config_get interface "$section" 'interface' ++ config_get options "$section" 'options' ++ config_get content_directories "$section" 'content_directories' ++ append_bool "$section" 'disable_webif' '-w' ++ append_bool "$section" 'disable_telnet' '-t' ++ ++ SERVICE_UID="$uid" \ ++ service_start /usr/bin/ushare -n "${servername:-OpenWrt}" -i "${interface:-br-lan}" -c "${content_directories:-/tmp}" $args ${options} ++} ++ ++stop_instance() { ++ local section="$1" ++ ++ section_enabled "$section" || return 1 ++ ++ config_get uid "$section" "user" ++ ++ SERVICE_UID="$uid" \ ++ service_stop /usr/bin/ushare ++} ++ ++start() { ++ config_load 'ushare' ++ config_foreach start_instance 'ushare' ++} ++ ++stop() { ++ config_load 'ushare' ++ config_foreach stop_instance 'ushare' ++} +diff --git a/feeds/packages/multimedia/ushare/patches/.svn/entries b/feeds/packages/multimedia/ushare/patches/.svn/entries +new file mode 100644 +index 0000000..6aa505e +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/multimedia/ushare/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-11-25T17:03:30.854487Z ++24144 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-configure_grep_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++ba198169afe9a3550caa1ac12dd7445d ++2008-04-20T11:23:41.896263Z ++10886 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++442 ++ ++200-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:43.000000Z ++411e6f85e770b6eb87c85deaee8222f3 ++2010-11-25T17:03:30.854487Z ++24144 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5416 ++ +diff --git a/feeds/packages/multimedia/ushare/patches/.svn/text-base/100-configure_grep_fix.patch.svn-base b/feeds/packages/multimedia/ushare/patches/.svn/text-base/100-configure_grep_fix.patch.svn-base +new file mode 100644 +index 0000000..0bfb161 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/patches/.svn/text-base/100-configure_grep_fix.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -ruN ushare-1.1a-orig/configure ushare-1.1a/configure ++--- ushare-1.1a-orig/configure 2007-12-09 14:03:36.000000000 +0100 +++++ ushare-1.1a/configure 2008-04-19 22:48:35.000000000 +0200 ++@@ -130,7 +130,7 @@ ++ var=$1 ++ shift ++ for f in $@; do ++- if eval echo \$$var | grep -qv -e "$f"; then +++ if eval echo \$$var | grep -qv -e "$(echo $f | sed -e 's|\.|\\\.|g')"; then ++ eval "$var=\"\$$var $f\"" ++ fi ++ done +diff --git a/feeds/packages/multimedia/ushare/patches/.svn/text-base/200-compile-fixes.patch.svn-base b/feeds/packages/multimedia/ushare/patches/.svn/text-base/200-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..dc38465 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/patches/.svn/text-base/200-compile-fixes.patch.svn-base +@@ -0,0 +1,202 @@ ++--- a/src/cds.c +++++ b/src/cds.c ++@@ -20,6 +20,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ #include ++ #include ++ ++--- a/src/http.c +++++ b/src/http.c ++@@ -25,6 +25,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ ++@@ -77,8 +78,7 @@ set_info_file (struct File_Info *info, c ++ info->content_type = ixmlCloneDOMString (content_type); ++ } ++ ++-static int ++-http_get_info (const char *filename, struct File_Info *info) +++int http_get_info (const char *filename, struct File_Info *info) ++ { ++ extern struct ushare_t *ut; ++ struct upnp_entry_t *entry = NULL; ++@@ -197,8 +197,7 @@ get_file_memory (const char *fullpath, c ++ return ((UpnpWebFileHandle) file); ++ } ++ ++-static UpnpWebFileHandle ++-http_open (const char *filename, enum UpnpOpenFileMode mode) +++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode) ++ { ++ extern struct ushare_t *ut; ++ struct upnp_entry_t *entry = NULL; ++@@ -251,8 +250,7 @@ http_open (const char *filename, enum Up ++ return ((UpnpWebFileHandle) file); ++ } ++ ++-static int ++-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) +++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) ++ { ++ struct web_file_t *file = (struct web_file_t *) fh; ++ ssize_t len = -1; ++@@ -286,8 +284,7 @@ http_read (UpnpWebFileHandle fh, char *b ++ return len; ++ } ++ ++-static int ++-http_write (UpnpWebFileHandle fh __attribute__((unused)), +++int http_write (UpnpWebFileHandle fh __attribute__((unused)), ++ char *buf __attribute__((unused)), ++ size_t buflen __attribute__((unused))) ++ { ++@@ -296,8 +293,7 @@ http_write (UpnpWebFileHandle fh __attri ++ return 0; ++ } ++ ++-static int ++-http_seek (UpnpWebFileHandle fh, off_t offset, int origin) +++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin) ++ { ++ struct web_file_t *file = (struct web_file_t *) fh; ++ off_t newpos = -1; ++@@ -371,8 +367,7 @@ http_seek (UpnpWebFileHandle fh, off_t o ++ return 0; ++ } ++ ++-static int ++-http_close (UpnpWebFileHandle fh) +++int http_close (UpnpWebFileHandle fh) ++ { ++ struct web_file_t *file = (struct web_file_t *) fh; ++ ++@@ -402,13 +397,3 @@ http_close (UpnpWebFileHandle fh) ++ ++ return 0; ++ } ++- ++-struct UpnpVirtualDirCallbacks virtual_dir_callbacks = ++- { ++- http_get_info, ++- http_open, ++- http_read, ++- http_write, ++- http_seek, ++- http_close ++- }; ++--- a/src/http.h +++++ b/src/http.h ++@@ -25,6 +25,18 @@ ++ #include ++ #include ++ ++-struct UpnpVirtualDirCallbacks virtual_dir_callbacks; +++int http_get_info (const char *filename, struct File_Info *info); +++ +++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode); +++ +++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen); +++ +++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin); +++ +++int http_write (UpnpWebFileHandle fh __attribute__((unused)), +++ char *buf __attribute__((unused)), +++ size_t buflen __attribute__((unused))); +++ +++int http_close (UpnpWebFileHandle fh); ++ ++ #endif /* _HTTP_H_ */ ++--- a/src/ushare.c +++++ b/src/ushare.c ++@@ -188,7 +188,7 @@ handle_action_request (struct Upnp_Actio ++ if (strcmp (request->DevUDN + 5, ut->udn)) ++ return; ++ ++- ip = request->CtrlPtIPAddr.s_addr; +++ ip = (*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr.s_addr; ++ ip = ntohl (ip); ++ sprintf (val, "%d.%d.%d.%d", ++ (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF); ++@@ -348,13 +348,23 @@ init_upnp (struct ushare_t *ut) ++ ++ UpnpEnableWebserver (TRUE); ++ ++- res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks); ++- if (res != UPNP_E_SUCCESS) ++- { ++- log_error (_("Cannot set virtual directory callbacks\n")); ++- free (description); ++- return -1; ++- } +++#define upnp_set_callback(cb, func) \ +++ do { \ +++ res = UpnpVirtualDir_set_##cb##Callback(func); \ +++ if (res != UPNP_E_SUCCESS) \ +++ { \ +++ log_error (_("Cannot set virtual directory callbacks\n")); \ +++ free (description); \ +++ return -1; \ +++ } \ +++ } while(0) +++ +++ upnp_set_callback(GetInfo, http_get_info); +++ upnp_set_callback(Open, http_open); +++ upnp_set_callback(Read, http_read); +++ upnp_set_callback(Seek, http_seek); +++ upnp_set_callback(Write, http_write); +++ upnp_set_callback(Close, http_close); ++ ++ res = UpnpAddVirtualDir (VIRTUAL_DIR); ++ if (res != UPNP_E_SUCCESS) ++--- a/src/cms.c +++++ b/src/cms.c ++@@ -20,6 +20,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ #include ++ #include ++ ++--- a/src/mime.c +++++ b/src/mime.c ++@@ -20,6 +20,7 @@ ++ */ ++ ++ #include +++#include ++ #include ++ ++ #include "mime.h" ++--- a/src/presentation.c +++++ b/src/presentation.c ++@@ -19,6 +19,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ ++ #if HAVE_LANGINFO_CODESET ++ # include ++--- a/src/services.c +++++ b/src/services.c ++@@ -20,6 +20,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ #include ++ #include ++ +diff --git a/feeds/packages/multimedia/ushare/patches/100-configure_grep_fix.patch b/feeds/packages/multimedia/ushare/patches/100-configure_grep_fix.patch +new file mode 100644 +index 0000000..0bfb161 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/patches/100-configure_grep_fix.patch +@@ -0,0 +1,12 @@ ++diff -ruN ushare-1.1a-orig/configure ushare-1.1a/configure ++--- ushare-1.1a-orig/configure 2007-12-09 14:03:36.000000000 +0100 +++++ ushare-1.1a/configure 2008-04-19 22:48:35.000000000 +0200 ++@@ -130,7 +130,7 @@ ++ var=$1 ++ shift ++ for f in $@; do ++- if eval echo \$$var | grep -qv -e "$f"; then +++ if eval echo \$$var | grep -qv -e "$(echo $f | sed -e 's|\.|\\\.|g')"; then ++ eval "$var=\"\$$var $f\"" ++ fi ++ done +diff --git a/feeds/packages/multimedia/ushare/patches/200-compile-fixes.patch b/feeds/packages/multimedia/ushare/patches/200-compile-fixes.patch +new file mode 100644 +index 0000000..dc38465 +--- /dev/null ++++ b/feeds/packages/multimedia/ushare/patches/200-compile-fixes.patch +@@ -0,0 +1,202 @@ ++--- a/src/cds.c +++++ b/src/cds.c ++@@ -20,6 +20,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ #include ++ #include ++ ++--- a/src/http.c +++++ b/src/http.c ++@@ -25,6 +25,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ ++@@ -77,8 +78,7 @@ set_info_file (struct File_Info *info, c ++ info->content_type = ixmlCloneDOMString (content_type); ++ } ++ ++-static int ++-http_get_info (const char *filename, struct File_Info *info) +++int http_get_info (const char *filename, struct File_Info *info) ++ { ++ extern struct ushare_t *ut; ++ struct upnp_entry_t *entry = NULL; ++@@ -197,8 +197,7 @@ get_file_memory (const char *fullpath, c ++ return ((UpnpWebFileHandle) file); ++ } ++ ++-static UpnpWebFileHandle ++-http_open (const char *filename, enum UpnpOpenFileMode mode) +++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode) ++ { ++ extern struct ushare_t *ut; ++ struct upnp_entry_t *entry = NULL; ++@@ -251,8 +250,7 @@ http_open (const char *filename, enum Up ++ return ((UpnpWebFileHandle) file); ++ } ++ ++-static int ++-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) +++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) ++ { ++ struct web_file_t *file = (struct web_file_t *) fh; ++ ssize_t len = -1; ++@@ -286,8 +284,7 @@ http_read (UpnpWebFileHandle fh, char *b ++ return len; ++ } ++ ++-static int ++-http_write (UpnpWebFileHandle fh __attribute__((unused)), +++int http_write (UpnpWebFileHandle fh __attribute__((unused)), ++ char *buf __attribute__((unused)), ++ size_t buflen __attribute__((unused))) ++ { ++@@ -296,8 +293,7 @@ http_write (UpnpWebFileHandle fh __attri ++ return 0; ++ } ++ ++-static int ++-http_seek (UpnpWebFileHandle fh, off_t offset, int origin) +++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin) ++ { ++ struct web_file_t *file = (struct web_file_t *) fh; ++ off_t newpos = -1; ++@@ -371,8 +367,7 @@ http_seek (UpnpWebFileHandle fh, off_t o ++ return 0; ++ } ++ ++-static int ++-http_close (UpnpWebFileHandle fh) +++int http_close (UpnpWebFileHandle fh) ++ { ++ struct web_file_t *file = (struct web_file_t *) fh; ++ ++@@ -402,13 +397,3 @@ http_close (UpnpWebFileHandle fh) ++ ++ return 0; ++ } ++- ++-struct UpnpVirtualDirCallbacks virtual_dir_callbacks = ++- { ++- http_get_info, ++- http_open, ++- http_read, ++- http_write, ++- http_seek, ++- http_close ++- }; ++--- a/src/http.h +++++ b/src/http.h ++@@ -25,6 +25,18 @@ ++ #include ++ #include ++ ++-struct UpnpVirtualDirCallbacks virtual_dir_callbacks; +++int http_get_info (const char *filename, struct File_Info *info); +++ +++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode); +++ +++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen); +++ +++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin); +++ +++int http_write (UpnpWebFileHandle fh __attribute__((unused)), +++ char *buf __attribute__((unused)), +++ size_t buflen __attribute__((unused))); +++ +++int http_close (UpnpWebFileHandle fh); ++ ++ #endif /* _HTTP_H_ */ ++--- a/src/ushare.c +++++ b/src/ushare.c ++@@ -188,7 +188,7 @@ handle_action_request (struct Upnp_Actio ++ if (strcmp (request->DevUDN + 5, ut->udn)) ++ return; ++ ++- ip = request->CtrlPtIPAddr.s_addr; +++ ip = (*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr.s_addr; ++ ip = ntohl (ip); ++ sprintf (val, "%d.%d.%d.%d", ++ (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF); ++@@ -348,13 +348,23 @@ init_upnp (struct ushare_t *ut) ++ ++ UpnpEnableWebserver (TRUE); ++ ++- res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks); ++- if (res != UPNP_E_SUCCESS) ++- { ++- log_error (_("Cannot set virtual directory callbacks\n")); ++- free (description); ++- return -1; ++- } +++#define upnp_set_callback(cb, func) \ +++ do { \ +++ res = UpnpVirtualDir_set_##cb##Callback(func); \ +++ if (res != UPNP_E_SUCCESS) \ +++ { \ +++ log_error (_("Cannot set virtual directory callbacks\n")); \ +++ free (description); \ +++ return -1; \ +++ } \ +++ } while(0) +++ +++ upnp_set_callback(GetInfo, http_get_info); +++ upnp_set_callback(Open, http_open); +++ upnp_set_callback(Read, http_read); +++ upnp_set_callback(Seek, http_seek); +++ upnp_set_callback(Write, http_write); +++ upnp_set_callback(Close, http_close); ++ ++ res = UpnpAddVirtualDir (VIRTUAL_DIR); ++ if (res != UPNP_E_SUCCESS) ++--- a/src/cms.c +++++ b/src/cms.c ++@@ -20,6 +20,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ #include ++ #include ++ ++--- a/src/mime.c +++++ b/src/mime.c ++@@ -20,6 +20,7 @@ ++ */ ++ ++ #include +++#include ++ #include ++ ++ #include "mime.h" ++--- a/src/presentation.c +++++ b/src/presentation.c ++@@ -19,6 +19,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ ++ #if HAVE_LANGINFO_CODESET ++ # include ++--- a/src/services.c +++++ b/src/services.c ++@@ -20,6 +20,8 @@ ++ */ ++ ++ #include +++#include +++#include ++ #include ++ #include ++ +diff --git a/feeds/packages/net/.svn/entries b/feeds/packages/net/.svn/entries +new file mode 100644 +index 0000000..b735c6e +--- /dev/null ++++ b/feeds/packages/net/.svn/entries +@@ -0,0 +1,1087 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-16T22:10:20.308945Z ++36058 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++l2tpv3tun ++dir ++ ++yafc ++dir ++ ++ser2net ++dir ++ ++linuxigd ++dir ++ ++remotefs ++dir ++ ++net-tools ++dir ++ ++nprobe ++dir ++ ++scdp ++dir ++ ++dudders ++dir ++ ++karma ++dir ++ ++rp-l2tp ++dir ++ ++opensips ++dir ++ ++smcroute ++dir ++ ++corkscrew ++dir ++ ++netperf ++dir ++ ++radsecproxy ++dir ++ ++deluge ++dir ++ ++cutter ++dir ++ ++rrs ++dir ++ ++socat ++dir ++ ++cups ++dir ++ ++seeks ++dir ++ ++openconnect ++dir ++ ++umurmur ++dir ++ ++dns2tcp ++dir ++ ++sscep ++dir ++ ++netcat ++dir ++ ++atftp ++dir ++ ++l2tpns ++dir ++ ++git ++dir ++ ++mercurial ++dir ++ ++frickin ++dir ++ ++ez-ipupdate ++dir ++ ++opennhrp ++dir ++ ++mini_snmpd ++dir ++ ++smap ++dir ++ ++mutella ++dir ++ ++uhub ++dir ++ ++amule ++dir ++ ++tor ++dir ++ ++flow-tools ++dir ++ ++lispmob ++dir ++ ++lftp ++dir ++ ++peerguardian ++dir ++ ++madwimax ++dir ++ ++ucspi-tcp ++dir ++ ++siit ++dir ++ ++xsupplicant ++dir ++ ++ncftp ++dir ++ ++ucarp ++dir ++ ++smtptrapd ++dir ++ ++openslp ++dir ++ ++portmap ++dir ++ ++jtg ++dir ++ ++iptraf ++dir ++ ++tor-alpha ++dir ++ ++openrrcp ++dir ++ ++nmap ++dir ++ ++vpnc-scripts ++dir ++ ++nstx ++dir ++ ++reaim ++dir ++ ++igmpproxy ++dir ++ ++rsync ++dir ++ ++subversion ++dir ++ ++cups-bjnp ++dir ++ ++ipsec-tools ++dir ++ ++netstat-nat ++dir ++ ++krb5 ++dir ++ ++wing ++dir ++ ++mosquitto ++dir ++ ++tsocks ++dir ++ ++pure-ftpd ++dir ++ ++faifa ++dir ++ ++transocks ++dir ++ ++aprx ++dir ++ ++bind ++dir ++ ++cmdftp ++dir ++ ++ethtool ++dir ++ ++bing ++dir ++ ++rtorrent ++dir ++ ++nodogsplash ++dir ++ ++mdnsresponder ++dir ++ ++imsnif ++dir ++ ++dhcpcd ++dir ++ ++squid ++dir ++ ++ipkungfu ++dir ++ ++siproxd ++dir ++ ++vblade ++dir ++ ++vrrpd ++dir ++ ++srelay ++dir ++ ++asterisk-1.8.x ++dir ++ ++pepperspot ++dir ++ ++net-snmp ++dir ++ ++serialoverip ++dir ++ ++babel ++dir ++ ++etherpuppet ++dir ++ ++cdp ++dir ++ ++nfs-kernel-server ++dir ++ ++p910nd ++dir ++ ++bmx6 ++dir ++ ++ddns-scripts ++dir ++ ++ndyndns ++dir ++ ++tftp-hpa ++dir ++ ++sslstrip ++dir ++ ++arpd ++dir ++ ++irssi ++dir ++ ++paris-traceroute ++dir ++ ++mii-tool ++dir ++ ++stun ++dir ++ ++obfsproxy ++dir ++ ++spawn-fcgi ++dir ++ ++quagga ++dir ++ ++ttcp ++dir ++ ++ipupdate ++dir ++ ++freeradius2 ++dir ++ ++redsocks ++dir ++ ++leafnode ++dir ++ ++darkstat ++dir ++ ++etherwake ++dir ++ ++dircproxy ++dir ++ ++click ++dir ++ ++bwm ++dir ++ ++irssi-glib1 ++dir ++ ++nbtscan ++dir ++ ++axel ++dir ++ ++bmxd ++dir ++ ++lsm ++dir ++ ++gpsd ++dir ++ ++fakeidentd ++dir ++ ++mdk3 ++dir ++ ++mini_httpd ++dir ++ ++horst ++dir ++ ++chrony ++dir ++ ++wget ++dir ++ ++dhcp-forwarder ++dir ++ ++ptpd ++dir ++ ++dsniff ++dir ++ ++vnc-reflector ++dir ++ ++asterisk-11.x ++dir ++ ++nuttcp ++dir ++ ++chaosvpn ++dir ++ ++reaver ++dir ++ ++tcptraceroute ++dir ++ ++nzbgetweb ++dir ++ ++ntripclient ++dir ++ ++n2n ++dir ++ ++polipo ++dir ++ ++miniupnpc ++dir ++ ++miniupnpd ++dir ++ ++netpipe ++dir ++ ++memcached ++dir ++ ++kamailio3 ++dir ++ ++coova-chilli ++dir ++ ++ngrep ++dir ++ ++wavemon ++dir ++ ++vncrepeater ++dir ++ ++nocatsplash ++dir ++ ++peervpn ++dir ++ ++madwifi ++dir ++ ++bird ++dir ++ ++fprobe-ulog ++dir ++ ++yaddns ++dir ++ ++mgen ++dir ++ ++ssltunnel ++dir ++ ++openntpd ++dir ++ ++scanlogd ++dir ++ ++miau ++dir ++ ++kismet ++dir ++ ++miax ++dir ++ ++natpmp ++dir ++ ++shat ++dir ++ ++wol ++dir ++ ++rp-pppoe ++dir ++ ++udpcast ++dir ++ ++nbd ++dir ++ ++quicktun ++dir ++ ++snort ++dir ++ ++knock ++dir ++ ++imspector ++dir ++ ++hsflowd ++dir ++ ++ngircd ++dir ++ ++opendchub ++dir ++ ++arpwatch ++dir ++ ++fprobe ++dir ++ ++proftpd ++dir ++ ++nufw ++dir ++ ++weechat ++dir ++ ++aodv-uu ++dir ++ ++aircrack-ng ++dir ++ ++synce-dccm ++dir ++ ++lft ++dir ++ ++hping3 ++dir ++ ++wifidog ++dir ++ ++transmission ++dir ++ ++portsentry ++dir ++ ++matrixtunnel ++dir ++ ++xinetd ++dir ++ ++wput ++dir ++ ++snort-wireless ++dir ++ ++batman ++dir ++ ++mtr ++dir ++ ++wrt-radauth ++dir ++ ++fping ++dir ++ ++icmptx ++dir ++ ++redir ++dir ++ ++vsftpd ++dir ++ ++softflowd ++dir ++ ++iodine ++dir ++ ++sslh ++dir ++ ++wshaper ++dir ++ ++unbound ++dir ++ ++sipp ++dir ++ ++xl2tpd ++dir ++ ++netio ++dir ++ ++gesftpserver ++dir ++ ++openssh ++dir ++ ++apache ++dir ++ ++olsrd ++dir ++ ++dmapd ++dir ++ ++netdiscover ++dir ++ ++pptpd ++dir ++ ++haproxy ++dir ++ ++tinc ++dir ++ ++live ++dir ++ ++prosody ++dir ++ ++ctorrent ++dir ++ ++freeswitch ++dir ++ ++speedtouch-usb-firmware ++dir ++ ++httptunnel ++dir ++ ++pyrit ++dir ++ ++udpxy ++dir ++ ++uucp ++dir ++ ++uob-nomad ++dir ++ ++bahamut ++dir ++ ++rinetd ++dir ++ ++parprouted ++dir ++ ++pcapsipdump ++dir ++ ++gatling ++dir ++ ++bwping ++dir ++ ++shorewall-core ++dir ++ ++sslcat ++dir ++ ++mvprelay ++dir ++ ++multiwan ++dir ++ ++airpwn ++dir ++ ++udp-broadcast-relay ++dir ++ ++fwknop ++dir ++ ++snortsam ++dir ++ ++ettercap ++dir ++ ++openser ++dir ++ ++ipcad ++dir ++ ++usbip ++dir ++ ++tig ++dir ++ ++maradns ++dir ++ ++ptunnel ++dir ++ ++isakmpd ++dir ++ ++pyload ++dir ++ ++nzbget ++dir ++ ++btpd ++dir ++ ++nfs-server ++dir ++ ++ifstat ++dir ++ ++isc-dhcp ++dir ++ ++wdiag ++dir ++ ++shorewall-lite ++dir ++ ++raddump ++dir ++ ++aria2 ++dir ++ ++apcupsd ++dir ++ ++wccpd ++dir ++ ++uanytun ++dir ++ ++djbdns ++dir ++ ++apf ++dir ++ ++curlftpfs ++dir ++ ++pdnsd ++dir ++ ++chillispot ++dir ++ ++httping ++dir ++ ++appweb ++dir ++ ++dhcp ++dir ++ ++lighttpd ++dir ++ ++bitchx ++dir ++ ++freepops ++dir ++ ++tmsnc ++dir ++ ++tinyproxy ++dir ++ ++aoetools ++dir ++ ++sshfs ++dir ++ ++hiawatha ++dir ++ ++sslsniff ++dir ++ ++znc ++dir ++ ++bmon ++dir ++ ++unfs3 ++dir ++ ++ntpclient ++dir ++ ++netatalk ++dir ++ ++dsl-qos-queue ++dir ++ ++bitlbee ++dir ++ ++mrtg ++dir ++ ++batman-adv ++dir ++ ++uftp ++dir ++ ++crowdcontrol ++dir ++ ++rssh ++dir ++ ++vnstat ++dir ++ ++vpzone ++dir ++ ++restund ++dir ++ ++l2tpd ++dir ++ ++oidentd ++dir ++ ++autossh ++dir ++ ++stunnel ++dir ++ ++htpdate ++dir ++ ++openswan ++dir ++ ++vgp ++dir ++ ++vtun ++dir ++ ++wprobe ++dir ++ ++psybnc ++dir ++ ++ntripcaster ++dir ++ ++slurm ++dir ++ ++tctool ++dir ++ ++veth ++dir ++ ++vpnc ++dir ++ ++wiviz ++dir ++ ++crda ++dir ++ ++ulogd ++dir ++ ++iptables-snmp ++dir ++ ++cifs-utils ++dir ++ ++nginx ++dir ++ ++baresip ++dir ++ ++kamailio ++dir ++ ++sipsak ++dir ++ ++cbtt ++dir ++ ++wknock ++dir ++ ++dansguardian ++dir ++ ++asterisk-chan-sccp-b ++dir ++ ++yate ++dir ++ ++ekg ++dir ++ ++rtpproxy ++dir ++ ++privoxy ++dir ++ ++e169-stats ++dir ++ ++pen ++dir ++ ++sshtunnel ++dir ++ ++ntripserver ++dir ++ ++pepsal ++dir ++ ++elinks ++dir ++ ++nocatauth ++dir ++ ++qolyester ++dir ++ ++aircrack-ptw ++dir ++ ++ditg ++dir ++ ++updatedd ++dir ++ ++bridge-utils ++dir ++ ++daemonlogger ++dir ++ ++openl2tp ++dir ++ ++l7-protocols ++dir ++ ++ntpd ++dir ++ ++strongswan ++dir ++ ++rarpd ++dir ++ ++mac-to-devinfo ++dir ++ ++keepalived ++dir ++ ++amwall ++dir ++ +diff --git a/feeds/packages/net/aircrack-ng/.svn/entries b/feeds/packages/net/aircrack-ng/.svn/entries +new file mode 100644 +index 0000000..8ad86ef +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aircrack-ng ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-16T12:33:32.152538Z ++26910 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++1b9adefd2de79b41082f363ee869fb5d ++2011-05-16T12:33:32.152538Z ++26910 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1289 ++ +diff --git a/feeds/packages/net/aircrack-ng/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/aircrack-ng/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aircrack-ng/.svn/text-base/Makefile.svn-base b/feeds/packages/net/aircrack-ng/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e912dfe +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=aircrack-ng ++PKG_VERSION:=1.1 ++PKG_RELEASE:=3 ++ ++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:=f7a24ed8fad122c4187d06bfd6f998b4 ++ ++PKG_BUILD_PARALLEL:=0 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aircrack-ng ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread +libopenssl +libpcap ++ TITLE:=next generation of aircrack with new features ++ URL:=http://www.aircrack-ng.org/ ++ SUBMENU:=wireless ++endef ++ ++define Package/aircrack-ng/description ++Aircrack-ng is the next generation of aircrack with new features ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ OSNAME=Linux \ ++ prefix="/usr" \ ++ sqlite="false" \ ++ unstable="true" ++ ++define Package/aircrack-ng/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 ++ ++$(eval $(call BuildPackage,aircrack-ng)) +diff --git a/feeds/packages/net/aircrack-ng/Makefile b/feeds/packages/net/aircrack-ng/Makefile +new file mode 100644 +index 0000000..e912dfe +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=aircrack-ng ++PKG_VERSION:=1.1 ++PKG_RELEASE:=3 ++ ++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:=f7a24ed8fad122c4187d06bfd6f998b4 ++ ++PKG_BUILD_PARALLEL:=0 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aircrack-ng ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread +libopenssl +libpcap ++ TITLE:=next generation of aircrack with new features ++ URL:=http://www.aircrack-ng.org/ ++ SUBMENU:=wireless ++endef ++ ++define Package/aircrack-ng/description ++Aircrack-ng is the next generation of aircrack with new features ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ OSNAME=Linux \ ++ prefix="/usr" \ ++ sqlite="false" \ ++ unstable="true" ++ ++define Package/aircrack-ng/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 ++ ++$(eval $(call BuildPackage,aircrack-ng)) +diff --git a/feeds/packages/net/aircrack-ng/patches/.svn/entries b/feeds/packages/net/aircrack-ng/patches/.svn/entries +new file mode 100644 +index 0000000..0762ec0 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aircrack-ng/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-16T12:33:32.152538Z ++26910 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-add-ignore-channel-negative-1.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++9a01f99a30b72be62e856a01ecc3770f ++2011-05-16T12:33:32.152538Z ++26910 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1793 ++ +diff --git a/feeds/packages/net/aircrack-ng/patches/.svn/text-base/100-add-ignore-channel-negative-1.patch.svn-base b/feeds/packages/net/aircrack-ng/patches/.svn/text-base/100-add-ignore-channel-negative-1.patch.svn-base +new file mode 100644 +index 0000000..394a300 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/patches/.svn/text-base/100-add-ignore-channel-negative-1.patch.svn-base +@@ -0,0 +1,52 @@ ++--- a/src/aireplay-ng.c +++++ b/src/aireplay-ng.c ++@@ -200,7 +200,9 @@ char usage[] = ++ "\n" ++ " Miscellaneous options:\n" ++ "\n" ++-" -R : disable /dev/rtc usage\n" +++" -R : disable /dev/rtc usage\n" +++" --ignore-negative-one : if the interface's channel can't be determined,\n" +++" ignore the mismatch, needed for unpatched cfg80211\n" ++ "\n" ++ " Attack modes (numbers can still be used):\n" ++ "\n" ++@@ -268,6 +270,7 @@ struct options ++ int bittest; ++ ++ int nodetect; +++ int ignore_negative_one; ++ int rtc; ++ } ++ opt; ++@@ -715,6 +718,13 @@ int attack_check(uchar* bssid, char* ess ++ ++ iface_chan = wi_get_channel(wi); ++ +++ if(iface_chan == -1 && !opt.ignore_negative_one) +++ { +++ PCT; printf("Couldn't determine current channel for %s, you should either force the operation with --ignore-negative-one or apply a kernel patch\n", +++ wi_get_ifname(wi)); +++ return -1; +++ } +++ ++ if(bssid != NULL) ++ { ++ ap_chan = wait_for_beacon(bssid, capa, essid); ++@@ -723,7 +733,7 @@ int attack_check(uchar* bssid, char* ess ++ PCT; printf("No such BSSID available.\n"); ++ return -1; ++ } ++- if(ap_chan != iface_chan) +++ if((ap_chan != iface_chan) && (iface_chan != -1 || !opt.ignore_negative_one)) ++ { ++ PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan); ++ return -1; ++@@ -5765,6 +5775,7 @@ int main( int argc, char *argv[] ) ++ {"help", 0, 0, 'H'}, ++ {"fast", 0, 0, 'F'}, ++ {"bittest", 0, 0, 'B'}, +++ {"ignore-negative-one", 0, &opt.ignore_negative_one, 1}, ++ {0, 0, 0, 0 } ++ }; ++ +diff --git a/feeds/packages/net/aircrack-ng/patches/100-add-ignore-channel-negative-1.patch b/feeds/packages/net/aircrack-ng/patches/100-add-ignore-channel-negative-1.patch +new file mode 100644 +index 0000000..394a300 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ng/patches/100-add-ignore-channel-negative-1.patch +@@ -0,0 +1,52 @@ ++--- a/src/aireplay-ng.c +++++ b/src/aireplay-ng.c ++@@ -200,7 +200,9 @@ char usage[] = ++ "\n" ++ " Miscellaneous options:\n" ++ "\n" ++-" -R : disable /dev/rtc usage\n" +++" -R : disable /dev/rtc usage\n" +++" --ignore-negative-one : if the interface's channel can't be determined,\n" +++" ignore the mismatch, needed for unpatched cfg80211\n" ++ "\n" ++ " Attack modes (numbers can still be used):\n" ++ "\n" ++@@ -268,6 +270,7 @@ struct options ++ int bittest; ++ ++ int nodetect; +++ int ignore_negative_one; ++ int rtc; ++ } ++ opt; ++@@ -715,6 +718,13 @@ int attack_check(uchar* bssid, char* ess ++ ++ iface_chan = wi_get_channel(wi); ++ +++ if(iface_chan == -1 && !opt.ignore_negative_one) +++ { +++ PCT; printf("Couldn't determine current channel for %s, you should either force the operation with --ignore-negative-one or apply a kernel patch\n", +++ wi_get_ifname(wi)); +++ return -1; +++ } +++ ++ if(bssid != NULL) ++ { ++ ap_chan = wait_for_beacon(bssid, capa, essid); ++@@ -723,7 +733,7 @@ int attack_check(uchar* bssid, char* ess ++ PCT; printf("No such BSSID available.\n"); ++ return -1; ++ } ++- if(ap_chan != iface_chan) +++ if((ap_chan != iface_chan) && (iface_chan != -1 || !opt.ignore_negative_one)) ++ { ++ PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan); ++ return -1; ++@@ -5765,6 +5775,7 @@ int main( int argc, char *argv[] ) ++ {"help", 0, 0, 'H'}, ++ {"fast", 0, 0, 'F'}, ++ {"bittest", 0, 0, 'B'}, +++ {"ignore-negative-one", 0, &opt.ignore_negative_one, 1}, ++ {0, 0, 0, 0 } ++ }; ++ +diff --git a/feeds/packages/net/aircrack-ptw/.svn/entries b/feeds/packages/net/aircrack-ptw/.svn/entries +new file mode 100644 +index 0000000..4cc0545 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ptw/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aircrack-ptw ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++0cab285a13535f5207d51e1ae3c7bcf2 ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1091 ++ +diff --git a/feeds/packages/net/aircrack-ptw/.svn/text-base/Makefile.svn-base b/feeds/packages/net/aircrack-ptw/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5dacde1 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ptw/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=aircrack-ptw ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.cdc.informatik.tu-darmstadt.de/aircrack-ptw/download ++PKG_MD5SUM:=1d7d84d1e69189bc1397db3f565c183a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aircrack-ptw ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap ++ TITLE:=A tool using a new method for breaking WEP Keys ++ URL:=http://www.cdc.informatik.tu-darmstadt.de/aircrack-ptw/ ++ SUBMENU:=wireless ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \ ++ $(TARGET_LDFLAGS) \ ++ -lpcap -o $(PKG_BUILD_DIR)/aircrack-ptw \ ++ $(PKG_BUILD_DIR)/aircrack-ptw.c \ ++ $(PKG_BUILD_DIR)/aircrack-ptw-lib.c ++endef ++ ++define Package/aircrack-ptw/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/aircrack-ptw $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,aircrack-ptw)) +diff --git a/feeds/packages/net/aircrack-ptw/Makefile b/feeds/packages/net/aircrack-ptw/Makefile +new file mode 100644 +index 0000000..5dacde1 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ptw/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=aircrack-ptw ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.cdc.informatik.tu-darmstadt.de/aircrack-ptw/download ++PKG_MD5SUM:=1d7d84d1e69189bc1397db3f565c183a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aircrack-ptw ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap ++ TITLE:=A tool using a new method for breaking WEP Keys ++ URL:=http://www.cdc.informatik.tu-darmstadt.de/aircrack-ptw/ ++ SUBMENU:=wireless ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \ ++ $(TARGET_LDFLAGS) \ ++ -lpcap -o $(PKG_BUILD_DIR)/aircrack-ptw \ ++ $(PKG_BUILD_DIR)/aircrack-ptw.c \ ++ $(PKG_BUILD_DIR)/aircrack-ptw-lib.c ++endef ++ ++define Package/aircrack-ptw/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/aircrack-ptw $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,aircrack-ptw)) +diff --git a/feeds/packages/net/aircrack-ptw/patches/.svn/entries b/feeds/packages/net/aircrack-ptw/patches/.svn/entries +new file mode 100644 +index 0000000..d897952 +--- /dev/null ++++ b/feeds/packages/net/aircrack-ptw/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aircrack-ptw/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-04-08T19:59:36.882201Z ++6898 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-smaller.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++af1540ce330a5039fe523509682b7611 ++2007-04-08T19:59:36.882201Z ++6898 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++386 ++ +diff --git a/feeds/packages/net/aircrack-ptw/patches/.svn/text-base/001-smaller.patch.svn-base b/feeds/packages/net/aircrack-ptw/patches/.svn/text-base/001-smaller.patch.svn-base +new file mode 100644 +index 0000000..9dbf14b +--- /dev/null ++++ b/feeds/packages/net/aircrack-ptw/patches/.svn/text-base/001-smaller.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -purN aircrack-ptw-1.0.0/aircrack-ptw.c aircrack-ptw-1.0.0_patch/aircrack-ptw.c ++--- aircrack-ptw-1.0.0/aircrack-ptw.c 2007-04-03 08:50:42.000000000 -0400 +++++ aircrack-ptw-1.0.0_patch/aircrack-ptw.c 2007-04-07 16:50:38.000000000 -0400 ++@@ -6,7 +6,7 @@ ++ ++ #include "aircrack-ptw-lib.h" ++ ++-#define KEYLIMIT (1000000) +++#define KEYLIMIT (10000) ++ #define BSSIDLEN (6) ++ ++ typedef struct { +diff --git a/feeds/packages/net/aircrack-ptw/patches/001-smaller.patch b/feeds/packages/net/aircrack-ptw/patches/001-smaller.patch +new file mode 100644 +index 0000000..9dbf14b +--- /dev/null ++++ b/feeds/packages/net/aircrack-ptw/patches/001-smaller.patch +@@ -0,0 +1,12 @@ ++diff -purN aircrack-ptw-1.0.0/aircrack-ptw.c aircrack-ptw-1.0.0_patch/aircrack-ptw.c ++--- aircrack-ptw-1.0.0/aircrack-ptw.c 2007-04-03 08:50:42.000000000 -0400 +++++ aircrack-ptw-1.0.0_patch/aircrack-ptw.c 2007-04-07 16:50:38.000000000 -0400 ++@@ -6,7 +6,7 @@ ++ ++ #include "aircrack-ptw-lib.h" ++ ++-#define KEYLIMIT (1000000) +++#define KEYLIMIT (10000) ++ #define BSSIDLEN (6) ++ ++ typedef struct { +diff --git a/feeds/packages/net/airpwn/.svn/entries b/feeds/packages/net/airpwn/.svn/entries +new file mode 100644 +index 0000000..131bf43 +--- /dev/null ++++ b/feeds/packages/net/airpwn/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/airpwn ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:28.315135Z ++32276 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++f4a5b01c62aa76a2b823b51594e2ed0b ++2012-06-12T23:47:28.315135Z ++32276 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2184 ++ +diff --git a/feeds/packages/net/airpwn/.svn/text-base/Makefile.svn-base b/feeds/packages/net/airpwn/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9a47311 +--- /dev/null ++++ b/feeds/packages/net/airpwn/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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:=airpwn ++PKG_RELEASE:=1 ++PKG_VERSION:=1.3 ++ ++PKG_SOURCE:=airpwn-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/airpwn ++PKG_MD5SUM:=15b6f1cd287b4bb20dd586bb6c83628d ++ ++PKG_BUILD_DEPENDS:=libnet1 libopenssl libpcap libpcre ++ ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=. lorcon ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/airpwn ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=wireless ++ TITLE:=Packet injection pwnage ++ DEPENDS:=+libnet1 +libopenssl +libpcap +libpcre +libpthread ++ URL:=http://airpwn.sourceforge.net/Airpwn.html ++endef ++ ++define Package/airpwn/description ++ Airpwn is a framework for 802.11 (wireless) packet injection. ++ Airpwn listens to incoming wireless packets, and if the data ++ matches a pattern specified in the config files, custom content ++ is injected "spoofed" from the wireless access point. From the ++ perspective of the wireless client, airpwn becomes the server. ++endef ++ ++CONFIGURE_VARS:= \ ++ CC="$(TARGET_CC)" \ ++ LD="$(TARGET_LD)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include -I$(STAGING_DIR)/usr/include -I$(PKG_BUILD_DIR)/lorcon" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib -L$(PKG_BUILD_DIR)/lorcon/.libs -lcrypto -lssl" \ ++ LIBTOOL="$(STAGING_DIR)/host/bin/libtool" ++ ++define Build/Configure ++ ( cd $(PKG_BUILD_DIR); tar -xzf lorcon-current.tgz; cd lorcon; \ ++ $(CONFIGURE_VARS) ./configure $(CONFIGURE_ARGS); \ ++ $(MAKE) -C $(PKG_BUILD_DIR)/lorcon $(CONFIGURE_VARS); cd ..; \ ++ $(CONFIGURE_VARS) ./configure $(CONFIGURE_ARGS) ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) $(CONFIGURE_VARS) ++endef ++ ++define Package/airpwn/install ++ $(INSTALL_DIR) $(1)/etc/airpwn ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/* $(1)/etc/airpwn/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/airpwn $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lorcon/.libs/liborcon-1.0.0.so $(1)/usr/lib/ ++ ( cd $(1)/usr/lib; ln -s liborcon-1.0.0.so liborcon.so ) ++endef ++ ++$(eval $(call BuildPackage,airpwn)) +diff --git a/feeds/packages/net/airpwn/Makefile b/feeds/packages/net/airpwn/Makefile +new file mode 100644 +index 0000000..9a47311 +--- /dev/null ++++ b/feeds/packages/net/airpwn/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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:=airpwn ++PKG_RELEASE:=1 ++PKG_VERSION:=1.3 ++ ++PKG_SOURCE:=airpwn-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/airpwn ++PKG_MD5SUM:=15b6f1cd287b4bb20dd586bb6c83628d ++ ++PKG_BUILD_DEPENDS:=libnet1 libopenssl libpcap libpcre ++ ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=. lorcon ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/airpwn ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=wireless ++ TITLE:=Packet injection pwnage ++ DEPENDS:=+libnet1 +libopenssl +libpcap +libpcre +libpthread ++ URL:=http://airpwn.sourceforge.net/Airpwn.html ++endef ++ ++define Package/airpwn/description ++ Airpwn is a framework for 802.11 (wireless) packet injection. ++ Airpwn listens to incoming wireless packets, and if the data ++ matches a pattern specified in the config files, custom content ++ is injected "spoofed" from the wireless access point. From the ++ perspective of the wireless client, airpwn becomes the server. ++endef ++ ++CONFIGURE_VARS:= \ ++ CC="$(TARGET_CC)" \ ++ LD="$(TARGET_LD)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include -I$(STAGING_DIR)/usr/include -I$(PKG_BUILD_DIR)/lorcon" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib -L$(PKG_BUILD_DIR)/lorcon/.libs -lcrypto -lssl" \ ++ LIBTOOL="$(STAGING_DIR)/host/bin/libtool" ++ ++define Build/Configure ++ ( cd $(PKG_BUILD_DIR); tar -xzf lorcon-current.tgz; cd lorcon; \ ++ $(CONFIGURE_VARS) ./configure $(CONFIGURE_ARGS); \ ++ $(MAKE) -C $(PKG_BUILD_DIR)/lorcon $(CONFIGURE_VARS); cd ..; \ ++ $(CONFIGURE_VARS) ./configure $(CONFIGURE_ARGS) ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) $(CONFIGURE_VARS) ++endef ++ ++define Package/airpwn/install ++ $(INSTALL_DIR) $(1)/etc/airpwn ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/* $(1)/etc/airpwn/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/airpwn $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lorcon/.libs/liborcon-1.0.0.so $(1)/usr/lib/ ++ ( cd $(1)/usr/lib; ln -s liborcon-1.0.0.so liborcon.so ) ++endef ++ ++$(eval $(call BuildPackage,airpwn)) +diff --git a/feeds/packages/net/amule/.svn/entries b/feeds/packages/net/amule/.svn/entries +new file mode 100644 +index 0000000..9d74108 +--- /dev/null ++++ b/feeds/packages/net/amule/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/amule ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-28T21:54:43.841290Z ++32903 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++fe88e0192c7dc4f9e33d5cc72e7dd513 ++2011-02-02T18:54:24.998850Z ++25319 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1987 ++ +diff --git a/feeds/packages/net/amule/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/amule/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/net/amule/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/net/amule/.svn/text-base/Makefile.svn-base b/feeds/packages/net/amule/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ab1f8f1 +--- /dev/null ++++ b/feeds/packages/net/amule/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,86 @@ ++# ++# Copyright (C) 2007-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:=aMule ++PKG_VERSION:=2.2.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/amule ++PKG_MD5SUM:=530d9b48187e36f78fc21bb19e94326d ++ ++PKG_BUILD_DEPENDS:=libgd ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/amule ++ SUBMENU:=P2P ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A multi-platform eMule-like ed2k client ++ URL:=http://www.amule.org/ ++ DEPENDS:=+libpng +libpthread +libncurses +libreadline +libwxbase +libcryptoxx ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --with-gnu-ld \ ++ --disable-ccache \ ++ --disable-debug \ ++ --disable-optimize \ ++ --disable-profile \ ++ --disable-monolithic \ ++ --enable-amule-daemon \ ++ --enable-amulecmd \ ++ --disable-amulecmdgui \ ++ --enable-webserver \ ++ --disable-webservergui \ ++ --disable-amule-gui \ ++ --disable-cas \ ++ --disable-wxcas \ ++ --disable-ed2k \ ++ --disable-alc \ ++ --disable-alcc \ ++ --disable-systray \ ++ --disable-utf8-systray \ ++ --enable-embedded-crypto \ ++ --enable-gsocket \ ++ --disable-gtktest \ ++ --disable-crypto \ ++ \ ++ --with-zlib="$(STAGING_DIR)/usr" \ ++ --with-gdlib-prefix="$(STAGING_DIR)/usr" \ ++ --with-libpng-prefix="$(STAGING_DIR)/usr" \ ++ --with-wx-prefix="$(STAGING_DIR)/usr" \ ++ --with-crypto-prefix="$(STAGING_DIR)/usr" \ ++ --with-libiconv-prefix="$(ICONV_PREFIX)" \ ++ --with-libintl-prefix="$(INTL_PREFIX)" \ ++ --without-x \ ++ ++TARGET_LDFLAGS += \ ++ -liconv ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ HOSTCC="$(HOSTCC)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/amule/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amule{cmd,d,web} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/amule $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,amule)) +diff --git a/feeds/packages/net/amule/Makefile b/feeds/packages/net/amule/Makefile +new file mode 100644 +index 0000000..ab1f8f1 +--- /dev/null ++++ b/feeds/packages/net/amule/Makefile +@@ -0,0 +1,86 @@ ++# ++# Copyright (C) 2007-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:=aMule ++PKG_VERSION:=2.2.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/amule ++PKG_MD5SUM:=530d9b48187e36f78fc21bb19e94326d ++ ++PKG_BUILD_DEPENDS:=libgd ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/amule ++ SUBMENU:=P2P ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A multi-platform eMule-like ed2k client ++ URL:=http://www.amule.org/ ++ DEPENDS:=+libpng +libpthread +libncurses +libreadline +libwxbase +libcryptoxx ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --with-gnu-ld \ ++ --disable-ccache \ ++ --disable-debug \ ++ --disable-optimize \ ++ --disable-profile \ ++ --disable-monolithic \ ++ --enable-amule-daemon \ ++ --enable-amulecmd \ ++ --disable-amulecmdgui \ ++ --enable-webserver \ ++ --disable-webservergui \ ++ --disable-amule-gui \ ++ --disable-cas \ ++ --disable-wxcas \ ++ --disable-ed2k \ ++ --disable-alc \ ++ --disable-alcc \ ++ --disable-systray \ ++ --disable-utf8-systray \ ++ --enable-embedded-crypto \ ++ --enable-gsocket \ ++ --disable-gtktest \ ++ --disable-crypto \ ++ \ ++ --with-zlib="$(STAGING_DIR)/usr" \ ++ --with-gdlib-prefix="$(STAGING_DIR)/usr" \ ++ --with-libpng-prefix="$(STAGING_DIR)/usr" \ ++ --with-wx-prefix="$(STAGING_DIR)/usr" \ ++ --with-crypto-prefix="$(STAGING_DIR)/usr" \ ++ --with-libiconv-prefix="$(ICONV_PREFIX)" \ ++ --with-libintl-prefix="$(INTL_PREFIX)" \ ++ --without-x \ ++ ++TARGET_LDFLAGS += \ ++ -liconv ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ HOSTCC="$(HOSTCC)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/amule/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amule{cmd,d,web} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/amule $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,amule)) +diff --git a/feeds/packages/net/amule/patches/.svn/entries b/feeds/packages/net/amule/patches/.svn/entries +new file mode 100644 +index 0000000..2278b2f +--- /dev/null ++++ b/feeds/packages/net/amule/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/amule/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-28T21:54:43.841290Z ++32903 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_backtrace.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++62c916ff09a8e4770d56911417869cca ++2012-07-28T21:54:43.841290Z ++32903 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2745 ++ +diff --git a/feeds/packages/net/amule/patches/.svn/text-base/001-no_backtrace.patch.svn-base b/feeds/packages/net/amule/patches/.svn/text-base/001-no_backtrace.patch.svn-base +new file mode 100644 +index 0000000..7676235 +--- /dev/null ++++ b/feeds/packages/net/amule/patches/.svn/text-base/001-no_backtrace.patch.svn-base +@@ -0,0 +1,98 @@ ++Index: aMule-2.2.6/configure ++=================================================================== ++--- aMule-2.2.6.orig/configure 2012-07-28 23:50:12.000000000 +0200 +++++ aMule-2.2.6/configure 2012-07-28 23:50:51.000000000 +0200 ++@@ -18375,93 +18375,6 @@ ++ ++ ++ ++-# Check for bfd.h (to have proper backtraces without using wxExecute) ++- ++- echo "$as_me:$LINENO: checking for bfd" >&5 ++-echo $ECHO_N "checking for bfd... $ECHO_C" >&6 ++- result=no ++- for bfd_ldadd in "" "${LIBINTL}"; do ++- mule_backup_LIBS="$LIBS" ++- mule_backup_LDFLAGS="$LDFLAGS" ++- LIBS="-lbfd -liberty ${bfd_ldadd} ${ZLIB_LIBS} $LIBS" ++- LDFLAGS="$LDFLAGS ${ZLIB_LDFLAGS}" ++- cat >conftest.$ac_ext <<_ACEOF ++- ++- /* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++- ++- #include ++- #include ++- ++-int ++-main () ++-{ ++- ++- char *dummy = bfd_errmsg(bfd_get_error()); ++- ++- ; ++- return 0; ++-} ++- ++-_ACEOF ++-rm -f conftest.$ac_objext conftest$ac_exeext ++-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 ++- (exit $ac_status); } && ++- { ac_try='test -z "$ac_c_werror_flag" ++- || test ! -s conftest.err' ++- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++- (eval $ac_try) 2>&5 ++- ac_status=$? ++- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++- (exit $ac_status); }; } && ++- { ac_try='test -s conftest$ac_exeext' ++- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++- (eval $ac_try) 2>&5 ++- ac_status=$? ++- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++- (exit $ac_status); }; }; then ++- ++- result=yes ++- BFD_CPPFLAGS="-DHAVE_BFD" ++- BFD_LIBS="-lbfd -liberty ${bfd_ldadd}" ++- LIBS="$mule_backup_LIBS" ++- LDFLAGS="$mule_backup_LDFLAGS" ++- break ++- ++-else ++- echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++-fi ++-rm -f conftest.err conftest.$ac_objext \ ++- conftest$ac_exeext conftest.$ac_ext ++- LIBS="$mule_backup_LIBS" ++- LDFLAGS="$mule_backup_LDFLAGS" ++- done ++- ++- echo "$as_me:$LINENO: result: $result" >&5 ++-echo "${ECHO_T}$result" >&6 ++- ++- if test $result = no; then ++- { echo "$as_me:$LINENO: WARNING: ++- bfd.h not found or unusable, please install binutils development ++- package if you are a developer or want to help testing aMule" >&5 ++-echo "$as_me: WARNING: ++- bfd.h not found or unusable, please install binutils development ++- package if you are a developer or want to help testing aMule" >&2;} ++- ++-fi ++- ++- ++ echo "$as_me:$LINENO: checking for and backtrace()" >&5 ++ echo $ECHO_N "checking for and backtrace()... $ECHO_C" >&6 ++ cat >conftest.$ac_ext <<_ACEOF +diff --git a/feeds/packages/net/amule/patches/001-no_backtrace.patch b/feeds/packages/net/amule/patches/001-no_backtrace.patch +new file mode 100644 +index 0000000..7676235 +--- /dev/null ++++ b/feeds/packages/net/amule/patches/001-no_backtrace.patch +@@ -0,0 +1,98 @@ ++Index: aMule-2.2.6/configure ++=================================================================== ++--- aMule-2.2.6.orig/configure 2012-07-28 23:50:12.000000000 +0200 +++++ aMule-2.2.6/configure 2012-07-28 23:50:51.000000000 +0200 ++@@ -18375,93 +18375,6 @@ ++ ++ ++ ++-# Check for bfd.h (to have proper backtraces without using wxExecute) ++- ++- echo "$as_me:$LINENO: checking for bfd" >&5 ++-echo $ECHO_N "checking for bfd... $ECHO_C" >&6 ++- result=no ++- for bfd_ldadd in "" "${LIBINTL}"; do ++- mule_backup_LIBS="$LIBS" ++- mule_backup_LDFLAGS="$LDFLAGS" ++- LIBS="-lbfd -liberty ${bfd_ldadd} ${ZLIB_LIBS} $LIBS" ++- LDFLAGS="$LDFLAGS ${ZLIB_LDFLAGS}" ++- cat >conftest.$ac_ext <<_ACEOF ++- ++- /* confdefs.h. */ ++-_ACEOF ++-cat confdefs.h >>conftest.$ac_ext ++-cat >>conftest.$ac_ext <<_ACEOF ++-/* end confdefs.h. */ ++- ++- #include ++- #include ++- ++-int ++-main () ++-{ ++- ++- char *dummy = bfd_errmsg(bfd_get_error()); ++- ++- ; ++- return 0; ++-} ++- ++-_ACEOF ++-rm -f conftest.$ac_objext conftest$ac_exeext ++-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 ++- (exit $ac_status); } && ++- { ac_try='test -z "$ac_c_werror_flag" ++- || test ! -s conftest.err' ++- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++- (eval $ac_try) 2>&5 ++- ac_status=$? ++- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++- (exit $ac_status); }; } && ++- { ac_try='test -s conftest$ac_exeext' ++- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++- (eval $ac_try) 2>&5 ++- ac_status=$? ++- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++- (exit $ac_status); }; }; then ++- ++- result=yes ++- BFD_CPPFLAGS="-DHAVE_BFD" ++- BFD_LIBS="-lbfd -liberty ${bfd_ldadd}" ++- LIBS="$mule_backup_LIBS" ++- LDFLAGS="$mule_backup_LDFLAGS" ++- break ++- ++-else ++- echo "$as_me: failed program was:" >&5 ++-sed 's/^/| /' conftest.$ac_ext >&5 ++- ++-fi ++-rm -f conftest.err conftest.$ac_objext \ ++- conftest$ac_exeext conftest.$ac_ext ++- LIBS="$mule_backup_LIBS" ++- LDFLAGS="$mule_backup_LDFLAGS" ++- done ++- ++- echo "$as_me:$LINENO: result: $result" >&5 ++-echo "${ECHO_T}$result" >&6 ++- ++- if test $result = no; then ++- { echo "$as_me:$LINENO: WARNING: ++- bfd.h not found or unusable, please install binutils development ++- package if you are a developer or want to help testing aMule" >&5 ++-echo "$as_me: WARNING: ++- bfd.h not found or unusable, please install binutils development ++- package if you are a developer or want to help testing aMule" >&2;} ++- ++-fi ++- ++- ++ echo "$as_me:$LINENO: checking for and backtrace()" >&5 ++ echo $ECHO_N "checking for and backtrace()... $ECHO_C" >&6 ++ cat >conftest.$ac_ext <<_ACEOF +diff --git a/feeds/packages/net/amwall/.svn/entries b/feeds/packages/net/amwall/.svn/entries +new file mode 100644 +index 0000000..ba50435 +--- /dev/null ++++ b/feeds/packages/net/amwall/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/amwall ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++496d290ea24a2f0da3d6640aa76684d2 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1302 ++ +diff --git a/feeds/packages/net/amwall/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/amwall/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/amwall/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/amwall/.svn/text-base/Makefile.svn-base b/feeds/packages/net/amwall/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3acf3d4 +--- /dev/null ++++ b/feeds/packages/net/amwall/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=amwall ++PKG_VERSION:=0.1.0 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/ ++PKG_MD5SUM:=a8b6438e7fd9ccadc9f68824ae62349c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/amwall ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libamsel ++ TITLE:=PF to iptables ++ URL:=http://www.amselinux.net/ ++ SUBMENU:=Firewall ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ V= \ ++ LDIR="$(PKG_BUILD_DIR)" \ ++ AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \ ++ OPT_LDFLAGS="$(TARGET_LDFLAGS)" \ ++ PREFIX="/usr" \ ++ CONFIG="$(PKG_BUILD_DIR)/etc/amsel" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SHELL="/bin/bash" \ ++ all install ++endef ++ ++define Package/amwall/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/ ++ $(INSTALL_DIR) $(1)/etc/amsel ++ $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc/ ++endef ++ ++define Package/amwall/conffiles ++/etc/amsel/firewall.conf ++endef ++ ++$(eval $(call BuildPackage,amwall)) +diff --git a/feeds/packages/net/amwall/Makefile b/feeds/packages/net/amwall/Makefile +new file mode 100644 +index 0000000..3acf3d4 +--- /dev/null ++++ b/feeds/packages/net/amwall/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=amwall ++PKG_VERSION:=0.1.0 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/ ++PKG_MD5SUM:=a8b6438e7fd9ccadc9f68824ae62349c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/amwall ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libamsel ++ TITLE:=PF to iptables ++ URL:=http://www.amselinux.net/ ++ SUBMENU:=Firewall ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ V= \ ++ LDIR="$(PKG_BUILD_DIR)" \ ++ AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \ ++ OPT_LDFLAGS="$(TARGET_LDFLAGS)" \ ++ PREFIX="/usr" \ ++ CONFIG="$(PKG_BUILD_DIR)/etc/amsel" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SHELL="/bin/bash" \ ++ all install ++endef ++ ++define Package/amwall/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/ ++ $(INSTALL_DIR) $(1)/etc/amsel ++ $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc/ ++endef ++ ++define Package/amwall/conffiles ++/etc/amsel/firewall.conf ++endef ++ ++$(eval $(call BuildPackage,amwall)) +diff --git a/feeds/packages/net/amwall/patches/.svn/entries b/feeds/packages/net/amwall/patches/.svn/entries +new file mode 100644 +index 0000000..56f211a +--- /dev/null ++++ b/feeds/packages/net/amwall/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/amwall/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++da44592d3802490475c21adde0b9a6ae ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++394 ++ +diff --git a/feeds/packages/net/amwall/patches/.svn/prop-base/010-compile_fix.patch.svn-base b/feeds/packages/net/amwall/patches/.svn/prop-base/010-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/amwall/patches/.svn/prop-base/010-compile_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/amwall/patches/.svn/text-base/010-compile_fix.patch.svn-base b/feeds/packages/net/amwall/patches/.svn/text-base/010-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..caa0b42 +--- /dev/null ++++ b/feeds/packages/net/amwall/patches/.svn/text-base/010-compile_fix.patch.svn-base +@@ -0,0 +1,21 @@ ++diff -ur amwall.old/grammar_en.y amwall.dev/grammar_en.y ++--- amwall.old/grammar_en.y Sun May 23 17:17:54 2004 +++++ amwall.dev/grammar_en.y Sat Oct 14 17:21:28 2006 ++@@ -651,7 +651,7 @@ ++ { ++ AMWALL_ADD_RULE("CONTINUE"); ++ } ++- +++ ; ++ dnat : DNAT ++ { ++ switch(chain_type) { ++@@ -667,7 +667,7 @@ ++ ++ AMWALL_ADD_RULE("DNAT"); ++ } ++- +++ ; ++ drop : DROP ++ { ++ AMWALL_ADD_RULE("DROP"); +diff --git a/feeds/packages/net/amwall/patches/010-compile_fix.patch b/feeds/packages/net/amwall/patches/010-compile_fix.patch +new file mode 100644 +index 0000000..caa0b42 +--- /dev/null ++++ b/feeds/packages/net/amwall/patches/010-compile_fix.patch +@@ -0,0 +1,21 @@ ++diff -ur amwall.old/grammar_en.y amwall.dev/grammar_en.y ++--- amwall.old/grammar_en.y Sun May 23 17:17:54 2004 +++++ amwall.dev/grammar_en.y Sat Oct 14 17:21:28 2006 ++@@ -651,7 +651,7 @@ ++ { ++ AMWALL_ADD_RULE("CONTINUE"); ++ } ++- +++ ; ++ dnat : DNAT ++ { ++ switch(chain_type) { ++@@ -667,7 +667,7 @@ ++ ++ AMWALL_ADD_RULE("DNAT"); ++ } ++- +++ ; ++ drop : DROP ++ { ++ AMWALL_ADD_RULE("DROP"); +diff --git a/feeds/packages/net/aodv-uu/.svn/entries b/feeds/packages/net/aodv-uu/.svn/entries +new file mode 100644 +index 0000000..c456c99 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aodv-uu ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-09T17:19:19.630478Z ++23368 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++30a45510fb318500f43ff74eb0f94b0b ++2010-10-09T17:19:19.630478Z ++23368 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2733 ++ +diff --git a/feeds/packages/net/aodv-uu/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/aodv-uu/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..ca3abc5 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,17 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aodv-uu/.svn/text-base/Makefile.svn-base b/feeds/packages/net/aodv-uu/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4a7cd96 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,104 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=aodv-uu ++PKG_VERSION:=0.9.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://core.it.uu.se/core/files/ ++PKG_MD5SUM:=05460543054449cb4b170252a7168c65 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aodv-uu/Default ++ TITLE:=Ad-hoc On-demand Distance Vector Routing ++ DEPENDS:=@BROKEN ++ URL:=http://core.it.uu.se/core/index.php/AODV-UU ++endef ++ ++define Package/aodv-uu/Default/description ++ AODV is the Ad-hoc On-demand Distance Vector routing protocol ++ implementation created at Uppsala University. ++endef ++ ++define Package/aodv-uu ++$(call Package/aodv-uu/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE+= (daemon) ++endef ++ ++define Package/aodv-uu/description ++$(call Package/aodv-uu/Default/description) ++ This package contains the AODV userland daemon. ++endef ++ ++define KernelPackage/aodv-uu ++$(call Package/aodv-uu/Default) ++ TITLE+= (kernel module) ++ FILES:=$(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) ++ SUBMENU:=Network Support ++ AUTOLOAD:=$(call AutoLoad,80,$(shell cat ./files/aodv-uu.modules)) ++endef ++ ++define KernelPackage/aodv-uu/description ++$(call Package/aodv-uu/Default/description) ++ This package contains the AODV kernel module. ++endef ++ ++ifneq ($(CONFIG_LINUX_2_4),y) ++ define Build/Compile/linux26 ++ $(MAKE) -C $(LINUX_DIR) \ ++ ARCH="$(LINUX_KARCH)" \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ PATCHLEVEL="$(LINUX_VERSION)" \ ++ KERNDIR="$(LINUX_DIR)" \ ++ SUBDIRS="$(PKG_BUILD_DIR)/lnx" \ ++ modules ++ endef ++else ++ # We assume 2.4 builds are only for brcm-2.4 yet ++ define Build/Compile/linux24-brcm ++ $(call Build/Compile/Default,\ ++ KERNEL_DIR="$(LINUX_DIR)" \ ++ KCC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ kaodv-mips \ ++ ) ++ cp $(PKG_BUILD_DIR)/lnx/kaodv-mips.$(LINUX_KMOD_SUFFIX) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) ++ endef ++endif ++ ++define Build/Compile ++ $(call Build/Compile/linux26) ++ $(call Build/Compile/linux24-brcm) ++ $(call Build/Compile/Default,\ ++ KERNEL_DIR="$(LINUX_DIR)" \ ++ KCC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ aodvd \ ++ ) ++endef ++ ++define Package/aodv-uu/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin ++endef ++ ++define Package/kmod-aodv-uu/install ++ $(INSTALL_DIR) $(1)/etc/modules.d ++ $(INSTALL_DATA) ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu ++ $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) ++ $(CP) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) $(1)/lib/modules/$(LINUX_VERSION)/ ++endef ++ ++$(eval $(call BuildPackage,aodv-uu)) ++$(eval $(call KernelPackage,aodv-uu)) +diff --git a/feeds/packages/net/aodv-uu/Makefile b/feeds/packages/net/aodv-uu/Makefile +new file mode 100644 +index 0000000..4a7cd96 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/Makefile +@@ -0,0 +1,104 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=aodv-uu ++PKG_VERSION:=0.9.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://core.it.uu.se/core/files/ ++PKG_MD5SUM:=05460543054449cb4b170252a7168c65 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aodv-uu/Default ++ TITLE:=Ad-hoc On-demand Distance Vector Routing ++ DEPENDS:=@BROKEN ++ URL:=http://core.it.uu.se/core/index.php/AODV-UU ++endef ++ ++define Package/aodv-uu/Default/description ++ AODV is the Ad-hoc On-demand Distance Vector routing protocol ++ implementation created at Uppsala University. ++endef ++ ++define Package/aodv-uu ++$(call Package/aodv-uu/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE+= (daemon) ++endef ++ ++define Package/aodv-uu/description ++$(call Package/aodv-uu/Default/description) ++ This package contains the AODV userland daemon. ++endef ++ ++define KernelPackage/aodv-uu ++$(call Package/aodv-uu/Default) ++ TITLE+= (kernel module) ++ FILES:=$(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) ++ SUBMENU:=Network Support ++ AUTOLOAD:=$(call AutoLoad,80,$(shell cat ./files/aodv-uu.modules)) ++endef ++ ++define KernelPackage/aodv-uu/description ++$(call Package/aodv-uu/Default/description) ++ This package contains the AODV kernel module. ++endef ++ ++ifneq ($(CONFIG_LINUX_2_4),y) ++ define Build/Compile/linux26 ++ $(MAKE) -C $(LINUX_DIR) \ ++ ARCH="$(LINUX_KARCH)" \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ PATCHLEVEL="$(LINUX_VERSION)" \ ++ KERNDIR="$(LINUX_DIR)" \ ++ SUBDIRS="$(PKG_BUILD_DIR)/lnx" \ ++ modules ++ endef ++else ++ # We assume 2.4 builds are only for brcm-2.4 yet ++ define Build/Compile/linux24-brcm ++ $(call Build/Compile/Default,\ ++ KERNEL_DIR="$(LINUX_DIR)" \ ++ KCC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ kaodv-mips \ ++ ) ++ cp $(PKG_BUILD_DIR)/lnx/kaodv-mips.$(LINUX_KMOD_SUFFIX) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) ++ endef ++endif ++ ++define Build/Compile ++ $(call Build/Compile/linux26) ++ $(call Build/Compile/linux24-brcm) ++ $(call Build/Compile/Default,\ ++ KERNEL_DIR="$(LINUX_DIR)" \ ++ KCC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ aodvd \ ++ ) ++endef ++ ++define Package/aodv-uu/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin ++endef ++ ++define Package/kmod-aodv-uu/install ++ $(INSTALL_DIR) $(1)/etc/modules.d ++ $(INSTALL_DATA) ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu ++ $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION) ++ $(CP) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) $(1)/lib/modules/$(LINUX_VERSION)/ ++endef ++ ++$(eval $(call BuildPackage,aodv-uu)) ++$(eval $(call KernelPackage,aodv-uu)) +diff --git a/feeds/packages/net/aodv-uu/files/.svn/entries b/feeds/packages/net/aodv-uu/files/.svn/entries +new file mode 100644 +index 0000000..7ab08d6 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aodv-uu/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-08-20T22:00:41.990579Z ++12359 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++aodv-uu.modules ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++569bc50572220507cca737960e6516e8 ++2007-03-04T04:41:46.644094Z ++6501 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6 ++ +diff --git a/feeds/packages/net/aodv-uu/files/.svn/prop-base/aodv-uu.modules.svn-base b/feeds/packages/net/aodv-uu/files/.svn/prop-base/aodv-uu.modules.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/files/.svn/prop-base/aodv-uu.modules.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aodv-uu/files/.svn/text-base/aodv-uu.modules.svn-base b/feeds/packages/net/aodv-uu/files/.svn/text-base/aodv-uu.modules.svn-base +new file mode 100644 +index 0000000..809c4da +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/files/.svn/text-base/aodv-uu.modules.svn-base +@@ -0,0 +1 @@ ++kaodv +diff --git a/feeds/packages/net/aodv-uu/files/aodv-uu.modules b/feeds/packages/net/aodv-uu/files/aodv-uu.modules +new file mode 100644 +index 0000000..809c4da +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/files/aodv-uu.modules +@@ -0,0 +1 @@ ++kaodv +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/entries b/feeds/packages/net/aodv-uu/patches/.svn/entries +new file mode 100644 +index 0000000..b291210 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aodv-uu/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-08-20T22:00:41.990579Z ++12359 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++004-linux_2.6.19_includes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++c82e69ad23e7de683c4e3315ab163e57 ++2007-06-04T11:25:53.556750Z ++7490 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++922 ++ ++005-linux_2.6.22_skbuff.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++8d41074999a78803edbf83d1dade302f ++2007-07-25T14:00:45.258652Z ++8156 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5634 ++ ++003-linux_2.6.19_security_netlink_recv_change.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++3e545cb578108692af860bee9d1425c4 ++2007-06-04T11:25:53.556750Z ++7490 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++552 ++ ++002-linux_2.6.19_ip_route_me_harder_change.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++f261dd8a8fb6accb7c89966ed3c8d6d7 ++2007-06-04T11:25:53.556750Z ++7490 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1443 ++ ++001-normalize.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++5b6912beeb0eb8d24c5de06bed450fe3 ++2007-06-04T11:25:53.556750Z ++7490 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2365 ++ +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/prop-base/001-normalize.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/001-normalize.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/001-normalize.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/prop-base/002-linux_2.6.19_ip_route_me_harder_change.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/002-linux_2.6.19_ip_route_me_harder_change.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/002-linux_2.6.19_ip_route_me_harder_change.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/prop-base/003-linux_2.6.19_security_netlink_recv_change.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/003-linux_2.6.19_security_netlink_recv_change.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/003-linux_2.6.19_security_netlink_recv_change.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/prop-base/004-linux_2.6.19_includes.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/004-linux_2.6.19_includes.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/prop-base/004-linux_2.6.19_includes.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/text-base/001-normalize.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/text-base/001-normalize.patch.svn-base +new file mode 100644 +index 0000000..bdc6fda +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/text-base/001-normalize.patch.svn-base +@@ -0,0 +1,64 @@ ++Index: aodv-uu-0.9.3/lnx/Makefile ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/Makefile 2007-06-04 13:22:19.859836128 +0200 +++++ aodv-uu-0.9.3/lnx/Makefile 2007-06-04 13:22:19.932825032 +0200 ++@@ -30,7 +30,7 @@ ++ KCFLAGS=-Wall -Wno-strict-aliasing -O2 $(KDEFS) $(KINC) $(XDEFS) ++ KCFLAGS_ARM=-Wall -O2 -D__KERNEL__ -DMODULE -nostdinc $(shell $(ARM_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC) ++ KCFLAGS_MIPS=-Wall -mips2 -O2 -fno-pic -mno-abicalls -mlong-calls -G0 -msoft-float -D__KERNEL__ -DMODULE -nostdinc $(shell $(MIPS_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC) $(XDEFS) ++- +++endif ++ .PHONY: clean clean-2.4 clean-2.6 indent default ++ ++ # Check for kernel version ++@@ -89,5 +89,3 @@ ++ etags *.c *.h ++ indent: ++ indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h ++-endif ++- ++Index: aodv-uu-0.9.3/Makefile ++=================================================================== ++--- aodv-uu-0.9.3.orig/Makefile 2007-06-04 13:22:19.866835064 +0200 +++++ aodv-uu-0.9.3/Makefile 2007-06-04 13:22:19.932825032 +0200 ++@@ -87,7 +87,7 @@ ++ mips: aodvd-mips kaodv-mips ++ ++ endian.h: ++- $(CC) $(CFLAGS) -o endian endian.c +++ gcc -o endian endian.c ++ ./endian > endian.h ++ ++ $(OBJS): %.o: %.c Makefile ++@@ -143,19 +143,18 @@ ++ @makedepend -Y./ -- $(DEFS) -- $(SRC) &>/dev/null ++ @makedepend -a -Y./ -- $(KDEFS) kaodv.c &>/dev/null ++ ++-install: default ++- install -s -m 755 aodvd /usr/sbin/aodvd ++- @if [ ! -d /lib/modules/$(KERNEL)/aodv ]; then \ ++- mkdir /lib/modules/$(KERNEL)/aodv; \ ++- fi ++- ++- @echo "Installing kernel module in /lib/modules/$(KERNEL)/aodv/"; ++- @if [ -f ./kaodv.ko ]; then \ ++- install -m 644 kaodv.ko /lib/modules/$(KERNEL)/aodv/kaodv.ko; \ ++- else \ ++- install -m 644 kaodv.o /lib/modules/$(KERNEL)/aodv/kaodv.o; \ ++- fi ++- /sbin/depmod -a +++install: install-aodvd install-kaodv +++ +++install-aodvd: +++ @echo "Installing aodv in $(DESTDIR)/usr/sbin"; +++ install -d -m0755 $(DESTDIR)/usr/sbin/ +++ install -m0755 aodvd $(DESTDIR)/usr/sbin/aodvd +++ +++install-kaodv: +++ @echo "Installing kernel module in $(DESTDIR)/lib/modules/$(KERNEL)/"; +++ install -d -m0644 $(DESTDIR)/lib/modules/$(KERNEL)/ +++ install -m 644 lnx/kaodv.$(KMOD_SUFFIX) $(DESTDIR)/lib/modules/$(KERNEL)/kaodv.$(KMOD_SUFFIX); +++ ++ uninstall: ++ rm -f /usr/sbin/aodvd ++ rm -rf /lib/modules/$(KERNEL)/aodv +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/text-base/002-linux_2.6.19_ip_route_me_harder_change.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/text-base/002-linux_2.6.19_ip_route_me_harder_change.patch.svn-base +new file mode 100644 +index 0000000..638de87 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/text-base/002-linux_2.6.19_ip_route_me_harder_change.patch.svn-base +@@ -0,0 +1,49 @@ ++Index: aodv-uu-0.9.3/lnx/kaodv-mod.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-04 13:22:19.830840536 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-04 13:22:20.130794936 +0200 ++@@ -19,7 +19,7 @@ ++ * Author: Erik Nordström, ++ * ++ *****************************************************************************/ ++-#include +++#include ++ #include ++ ++ #ifdef KERNEL26 ++@@ -258,7 +258,11 @@ ++ if (!(*skb)) ++ return NF_STOLEN; ++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ ip_route_me_harder(skb, RTN_UNSPEC); +++#else ++ ip_route_me_harder(skb); +++#endif ++ } ++ break; ++ case NF_IP_POST_ROUTING: ++Index: aodv-uu-0.9.3/lnx/kaodv-queue.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-04 13:22:19.837839472 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-04 13:22:20.130794936 +0200 ++@@ -29,6 +29,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ #include ++@@ -246,7 +247,11 @@ ++ if (!entry->skb) ++ goto next; ++ } +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ ip_route_me_harder(&entry->skb, RTN_UNSPEC); +++#else ++ ip_route_me_harder(&entry->skb); +++#endif ++ ++ pkts++; ++ +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/text-base/003-linux_2.6.19_security_netlink_recv_change.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/text-base/003-linux_2.6.19_security_netlink_recv_change.patch.svn-base +new file mode 100644 +index 0000000..53d9064 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/text-base/003-linux_2.6.19_security_netlink_recv_change.patch.svn-base +@@ -0,0 +1,16 @@ ++Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-04 13:22:19.810843576 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-04 13:22:20.326765144 +0200 ++@@ -284,7 +284,11 @@ ++ /* RCV_SKB_FAIL(-EINVAL); */ ++ ++ #ifdef KERNEL26 +++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ if (security_netlink_recv(skb, CAP_NET_ADMIN)) +++# else ++ if (security_netlink_recv(skb)) +++# endif ++ RCV_SKB_FAIL(-EPERM); ++ #endif ++ //write_lock_bh(&queue_lock); +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/text-base/004-linux_2.6.19_includes.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/text-base/004-linux_2.6.19_includes.patch.svn-base +new file mode 100644 +index 0000000..8dc1adf +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/text-base/004-linux_2.6.19_includes.patch.svn-base +@@ -0,0 +1,28 @@ ++Index: aodv-uu-0.9.3/main.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/main.c 2007-06-04 13:22:19.782847832 +0200 +++++ aodv-uu-0.9.3/main.c 2007-06-04 13:22:20.513736720 +0200 ++@@ -26,6 +26,8 @@ ++ #include ++ #include ++ #include +++#include +++#include ++ #include ++ #include ++ #include ++Index: aodv-uu-0.9.3/nl.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/nl.c 2007-06-04 13:22:19.789846768 +0200 +++++ aodv-uu-0.9.3/nl.c 2007-06-04 13:22:20.513736720 +0200 ++@@ -33,6 +33,10 @@ ++ #include ++ #include ++ #include +++#include +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++#include +++#endif ++ ++ #include "defs.h" ++ #include "lnx/kaodv-netlink.h" +diff --git a/feeds/packages/net/aodv-uu/patches/.svn/text-base/005-linux_2.6.22_skbuff.patch.svn-base b/feeds/packages/net/aodv-uu/patches/.svn/text-base/005-linux_2.6.22_skbuff.patch.svn-base +new file mode 100644 +index 0000000..0831c5f +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/.svn/text-base/005-linux_2.6.22_skbuff.patch.svn-base +@@ -0,0 +1,164 @@ ++Index: aodv-uu-0.9.3/lnx/kaodv-compat.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ aodv-uu-0.9.3/lnx/kaodv-compat.h 2007-06-17 02:49:46.844217144 +0200 ++@@ -0,0 +1,15 @@ +++#ifndef __KAODV_COMPAT_H +++#define __KAODV_COMPAT_H +++ +++#include +++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) +++ +++#define ip_hdr(_skb) (_skb)->nh.iph +++#define skb_reset_network_header(_skb) do { \ +++ _skb->nh.iph = (struct iphdr *)_skb->data; \ +++ } while (0); +++ +++ +++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ +++ +++#endif ++Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.c 2007-06-17 02:31:56.448941960 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-ipenc.c 2007-06-17 02:45:50.420159064 +0200 ++@@ -64,7 +64,7 @@ ++ if (skb->sk != NULL) ++ skb_set_owner_w(nskb, skb->sk); ++ ++- iph = skb->nh.iph; +++ iph = ip_hdr(skb); ++ ++ skb_put(nskb, sizeof(struct min_ipenc_hdr)); ++ ++@@ -78,7 +78,8 @@ ++ skb = nskb; ++ ++ /* Update pointers */ ++- iph = skb->nh.iph = (struct iphdr *)skb->data; +++ skb_reset_network_header(skb); +++ iph = (struct iphdr *)skb->data; ++ ++ ipe = (struct min_ipenc_hdr *)(skb->data + (iph->ihl << 2)); ++ ++@@ -99,8 +100,8 @@ ++ ++ ip_send_check(iph); ++ ++- if (skb->nh.iph->id == 0) ++- ip_select_ident(skb->nh.iph, skb->dst, NULL); +++ if (ip_hdr(skb)->id == 0) +++ ip_select_ident(ip_hdr(skb), skb->dst, NULL); ++ ++ return skb; ++ } ++@@ -108,9 +109,7 @@ ++ struct sk_buff *ip_pkt_decapsulate(struct sk_buff *skb) ++ { ++ struct min_ipenc_hdr *ipe; ++- /* skb->nh.iph is probably not set yet */ ++- struct iphdr *iph = skb->nh.iph; ++- +++ struct iphdr *iph = ip_hdr(skb); ++ ++ ipe = (struct min_ipenc_hdr *)((char *)iph + (iph->ihl << 2)); ++ ++@@ -123,8 +122,9 @@ ++ skb->len - (iph->ihl << 2) - sizeof(struct min_ipenc_hdr)); ++ ++ skb_trim(skb, skb->len - sizeof(struct min_ipenc_hdr)); ++- ++- skb->nh.iph = iph = (struct iphdr *)skb->data; +++ +++ skb_reset_network_header(skb); +++ iph = (struct iphdr *)skb->data; ++ ++ iph->tot_len = htons((ntohs(iph->tot_len) - sizeof(struct min_ipenc_hdr))); ++ ip_send_check(iph); ++Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.h ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.h 2007-06-17 02:44:13.881835120 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-ipenc.h 2007-06-17 02:44:16.549429584 +0200 ++@@ -27,6 +27,7 @@ ++ #include ++ #include ++ #include +++#include "kaodv-compat.h" ++ ++ #define IPPROTO_MIPE 55 ++ ++Index: aodv-uu-0.9.3/lnx/kaodv-mod.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-17 02:43:33.776931992 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-17 02:43:39.008136728 +0200 ++@@ -120,7 +120,7 @@ ++ const struct net_device *out, ++ int (*okfn) (struct sk_buff *)) ++ { ++- struct iphdr *iph = (*skb)->nh.iph; +++ struct iphdr *iph = ip_hdr(*skb); ++ struct expl_entry e; ++ struct in_addr ifaddr, bcaddr; ++ int res = 0; ++@@ -188,7 +188,7 @@ ++ if (is_gateway && iph->protocol == IPPROTO_MIPE && ++ iph->daddr == ifaddr.s_addr) { ++ ip_pkt_decapsulate(*skb); ++- iph = (*skb)->nh.iph; +++ iph = ip_hdr(*skb); ++ return NF_ACCEPT; ++ } ++ /* Ignore packets generated locally or that are for this ++Index: aodv-uu-0.9.3/lnx/kaodv-mod.h ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.h 2007-06-17 02:44:32.498005032 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-mod.h 2007-06-17 02:44:34.662675952 +0200 ++@@ -5,6 +5,7 @@ ++ #include ++ #include ++ #include +++#include "kaodv-compat.h" ++ ++ /* Interface information */ ++ struct if_info { ++Index: aodv-uu-0.9.3/lnx/kaodv-queue.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-17 02:45:01.513593992 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-17 02:45:11.534070648 +0200 ++@@ -152,7 +152,7 @@ ++ { ++ int status = -EINVAL; ++ struct kaodv_queue_entry *entry; ++- struct iphdr *iph = skb->nh.iph; +++ struct iphdr *iph = ip_hdr(skb); ++ ++ entry = kmalloc(sizeof(*entry), GFP_ATOMIC); ++ ++Index: aodv-uu-0.9.3/lnx/kaodv-queue.h ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.h 2007-06-17 02:44:50.537262648 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-queue.h 2007-06-17 02:44:53.629792512 +0200 ++@@ -21,6 +21,7 @@ ++ *****************************************************************************/ ++ #ifndef _KAODV_QUEUE_H ++ #define _KAODV_QUEUE_H +++#include "kaodv-compat.h" ++ ++ #define KAODV_QUEUE_DROP 1 ++ #define KAODV_QUEUE_SEND 2 ++Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-17 02:47:48.927143264 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-17 02:49:11.604574384 +0200 ++@@ -338,8 +338,10 @@ ++ netlink_register_notifier(&kaodv_nl_notifier); ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)) ++ kaodvnl = netlink_kernel_create(NETLINK_AODV, kaodv_netlink_rcv_sk); ++-#else +++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) ++ kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, THIS_MODULE); +++#else +++ kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, NULL, THIS_MODULE); ++ #endif ++ if (kaodvnl == NULL) { ++ printk(KERN_ERR "kaodv_netlink: failed to create netlink socket\n"); +diff --git a/feeds/packages/net/aodv-uu/patches/001-normalize.patch b/feeds/packages/net/aodv-uu/patches/001-normalize.patch +new file mode 100644 +index 0000000..bdc6fda +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/001-normalize.patch +@@ -0,0 +1,64 @@ ++Index: aodv-uu-0.9.3/lnx/Makefile ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/Makefile 2007-06-04 13:22:19.859836128 +0200 +++++ aodv-uu-0.9.3/lnx/Makefile 2007-06-04 13:22:19.932825032 +0200 ++@@ -30,7 +30,7 @@ ++ KCFLAGS=-Wall -Wno-strict-aliasing -O2 $(KDEFS) $(KINC) $(XDEFS) ++ KCFLAGS_ARM=-Wall -O2 -D__KERNEL__ -DMODULE -nostdinc $(shell $(ARM_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC) ++ KCFLAGS_MIPS=-Wall -mips2 -O2 -fno-pic -mno-abicalls -mlong-calls -G0 -msoft-float -D__KERNEL__ -DMODULE -nostdinc $(shell $(MIPS_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC) $(XDEFS) ++- +++endif ++ .PHONY: clean clean-2.4 clean-2.6 indent default ++ ++ # Check for kernel version ++@@ -89,5 +89,3 @@ ++ etags *.c *.h ++ indent: ++ indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h ++-endif ++- ++Index: aodv-uu-0.9.3/Makefile ++=================================================================== ++--- aodv-uu-0.9.3.orig/Makefile 2007-06-04 13:22:19.866835064 +0200 +++++ aodv-uu-0.9.3/Makefile 2007-06-04 13:22:19.932825032 +0200 ++@@ -87,7 +87,7 @@ ++ mips: aodvd-mips kaodv-mips ++ ++ endian.h: ++- $(CC) $(CFLAGS) -o endian endian.c +++ gcc -o endian endian.c ++ ./endian > endian.h ++ ++ $(OBJS): %.o: %.c Makefile ++@@ -143,19 +143,18 @@ ++ @makedepend -Y./ -- $(DEFS) -- $(SRC) &>/dev/null ++ @makedepend -a -Y./ -- $(KDEFS) kaodv.c &>/dev/null ++ ++-install: default ++- install -s -m 755 aodvd /usr/sbin/aodvd ++- @if [ ! -d /lib/modules/$(KERNEL)/aodv ]; then \ ++- mkdir /lib/modules/$(KERNEL)/aodv; \ ++- fi ++- ++- @echo "Installing kernel module in /lib/modules/$(KERNEL)/aodv/"; ++- @if [ -f ./kaodv.ko ]; then \ ++- install -m 644 kaodv.ko /lib/modules/$(KERNEL)/aodv/kaodv.ko; \ ++- else \ ++- install -m 644 kaodv.o /lib/modules/$(KERNEL)/aodv/kaodv.o; \ ++- fi ++- /sbin/depmod -a +++install: install-aodvd install-kaodv +++ +++install-aodvd: +++ @echo "Installing aodv in $(DESTDIR)/usr/sbin"; +++ install -d -m0755 $(DESTDIR)/usr/sbin/ +++ install -m0755 aodvd $(DESTDIR)/usr/sbin/aodvd +++ +++install-kaodv: +++ @echo "Installing kernel module in $(DESTDIR)/lib/modules/$(KERNEL)/"; +++ install -d -m0644 $(DESTDIR)/lib/modules/$(KERNEL)/ +++ install -m 644 lnx/kaodv.$(KMOD_SUFFIX) $(DESTDIR)/lib/modules/$(KERNEL)/kaodv.$(KMOD_SUFFIX); +++ ++ uninstall: ++ rm -f /usr/sbin/aodvd ++ rm -rf /lib/modules/$(KERNEL)/aodv +diff --git a/feeds/packages/net/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch b/feeds/packages/net/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch +new file mode 100644 +index 0000000..638de87 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch +@@ -0,0 +1,49 @@ ++Index: aodv-uu-0.9.3/lnx/kaodv-mod.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-04 13:22:19.830840536 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-04 13:22:20.130794936 +0200 ++@@ -19,7 +19,7 @@ ++ * Author: Erik Nordström, ++ * ++ *****************************************************************************/ ++-#include +++#include ++ #include ++ ++ #ifdef KERNEL26 ++@@ -258,7 +258,11 @@ ++ if (!(*skb)) ++ return NF_STOLEN; ++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ ip_route_me_harder(skb, RTN_UNSPEC); +++#else ++ ip_route_me_harder(skb); +++#endif ++ } ++ break; ++ case NF_IP_POST_ROUTING: ++Index: aodv-uu-0.9.3/lnx/kaodv-queue.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-04 13:22:19.837839472 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-04 13:22:20.130794936 +0200 ++@@ -29,6 +29,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ #include ++@@ -246,7 +247,11 @@ ++ if (!entry->skb) ++ goto next; ++ } +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ ip_route_me_harder(&entry->skb, RTN_UNSPEC); +++#else ++ ip_route_me_harder(&entry->skb); +++#endif ++ ++ pkts++; ++ +diff --git a/feeds/packages/net/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch b/feeds/packages/net/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch +new file mode 100644 +index 0000000..53d9064 +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch +@@ -0,0 +1,16 @@ ++Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-04 13:22:19.810843576 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-04 13:22:20.326765144 +0200 ++@@ -284,7 +284,11 @@ ++ /* RCV_SKB_FAIL(-EINVAL); */ ++ ++ #ifdef KERNEL26 +++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++ if (security_netlink_recv(skb, CAP_NET_ADMIN)) +++# else ++ if (security_netlink_recv(skb)) +++# endif ++ RCV_SKB_FAIL(-EPERM); ++ #endif ++ //write_lock_bh(&queue_lock); +diff --git a/feeds/packages/net/aodv-uu/patches/004-linux_2.6.19_includes.patch b/feeds/packages/net/aodv-uu/patches/004-linux_2.6.19_includes.patch +new file mode 100644 +index 0000000..8dc1adf +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/004-linux_2.6.19_includes.patch +@@ -0,0 +1,28 @@ ++Index: aodv-uu-0.9.3/main.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/main.c 2007-06-04 13:22:19.782847832 +0200 +++++ aodv-uu-0.9.3/main.c 2007-06-04 13:22:20.513736720 +0200 ++@@ -26,6 +26,8 @@ ++ #include ++ #include ++ #include +++#include +++#include ++ #include ++ #include ++ #include ++Index: aodv-uu-0.9.3/nl.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/nl.c 2007-06-04 13:22:19.789846768 +0200 +++++ aodv-uu-0.9.3/nl.c 2007-06-04 13:22:20.513736720 +0200 ++@@ -33,6 +33,10 @@ ++ #include ++ #include ++ #include +++#include +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +++#include +++#endif ++ ++ #include "defs.h" ++ #include "lnx/kaodv-netlink.h" +diff --git a/feeds/packages/net/aodv-uu/patches/005-linux_2.6.22_skbuff.patch b/feeds/packages/net/aodv-uu/patches/005-linux_2.6.22_skbuff.patch +new file mode 100644 +index 0000000..0831c5f +--- /dev/null ++++ b/feeds/packages/net/aodv-uu/patches/005-linux_2.6.22_skbuff.patch +@@ -0,0 +1,164 @@ ++Index: aodv-uu-0.9.3/lnx/kaodv-compat.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ aodv-uu-0.9.3/lnx/kaodv-compat.h 2007-06-17 02:49:46.844217144 +0200 ++@@ -0,0 +1,15 @@ +++#ifndef __KAODV_COMPAT_H +++#define __KAODV_COMPAT_H +++ +++#include +++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) +++ +++#define ip_hdr(_skb) (_skb)->nh.iph +++#define skb_reset_network_header(_skb) do { \ +++ _skb->nh.iph = (struct iphdr *)_skb->data; \ +++ } while (0); +++ +++ +++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ +++ +++#endif ++Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.c 2007-06-17 02:31:56.448941960 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-ipenc.c 2007-06-17 02:45:50.420159064 +0200 ++@@ -64,7 +64,7 @@ ++ if (skb->sk != NULL) ++ skb_set_owner_w(nskb, skb->sk); ++ ++- iph = skb->nh.iph; +++ iph = ip_hdr(skb); ++ ++ skb_put(nskb, sizeof(struct min_ipenc_hdr)); ++ ++@@ -78,7 +78,8 @@ ++ skb = nskb; ++ ++ /* Update pointers */ ++- iph = skb->nh.iph = (struct iphdr *)skb->data; +++ skb_reset_network_header(skb); +++ iph = (struct iphdr *)skb->data; ++ ++ ipe = (struct min_ipenc_hdr *)(skb->data + (iph->ihl << 2)); ++ ++@@ -99,8 +100,8 @@ ++ ++ ip_send_check(iph); ++ ++- if (skb->nh.iph->id == 0) ++- ip_select_ident(skb->nh.iph, skb->dst, NULL); +++ if (ip_hdr(skb)->id == 0) +++ ip_select_ident(ip_hdr(skb), skb->dst, NULL); ++ ++ return skb; ++ } ++@@ -108,9 +109,7 @@ ++ struct sk_buff *ip_pkt_decapsulate(struct sk_buff *skb) ++ { ++ struct min_ipenc_hdr *ipe; ++- /* skb->nh.iph is probably not set yet */ ++- struct iphdr *iph = skb->nh.iph; ++- +++ struct iphdr *iph = ip_hdr(skb); ++ ++ ipe = (struct min_ipenc_hdr *)((char *)iph + (iph->ihl << 2)); ++ ++@@ -123,8 +122,9 @@ ++ skb->len - (iph->ihl << 2) - sizeof(struct min_ipenc_hdr)); ++ ++ skb_trim(skb, skb->len - sizeof(struct min_ipenc_hdr)); ++- ++- skb->nh.iph = iph = (struct iphdr *)skb->data; +++ +++ skb_reset_network_header(skb); +++ iph = (struct iphdr *)skb->data; ++ ++ iph->tot_len = htons((ntohs(iph->tot_len) - sizeof(struct min_ipenc_hdr))); ++ ip_send_check(iph); ++Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.h ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.h 2007-06-17 02:44:13.881835120 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-ipenc.h 2007-06-17 02:44:16.549429584 +0200 ++@@ -27,6 +27,7 @@ ++ #include ++ #include ++ #include +++#include "kaodv-compat.h" ++ ++ #define IPPROTO_MIPE 55 ++ ++Index: aodv-uu-0.9.3/lnx/kaodv-mod.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-17 02:43:33.776931992 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-17 02:43:39.008136728 +0200 ++@@ -120,7 +120,7 @@ ++ const struct net_device *out, ++ int (*okfn) (struct sk_buff *)) ++ { ++- struct iphdr *iph = (*skb)->nh.iph; +++ struct iphdr *iph = ip_hdr(*skb); ++ struct expl_entry e; ++ struct in_addr ifaddr, bcaddr; ++ int res = 0; ++@@ -188,7 +188,7 @@ ++ if (is_gateway && iph->protocol == IPPROTO_MIPE && ++ iph->daddr == ifaddr.s_addr) { ++ ip_pkt_decapsulate(*skb); ++- iph = (*skb)->nh.iph; +++ iph = ip_hdr(*skb); ++ return NF_ACCEPT; ++ } ++ /* Ignore packets generated locally or that are for this ++Index: aodv-uu-0.9.3/lnx/kaodv-mod.h ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.h 2007-06-17 02:44:32.498005032 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-mod.h 2007-06-17 02:44:34.662675952 +0200 ++@@ -5,6 +5,7 @@ ++ #include ++ #include ++ #include +++#include "kaodv-compat.h" ++ ++ /* Interface information */ ++ struct if_info { ++Index: aodv-uu-0.9.3/lnx/kaodv-queue.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-17 02:45:01.513593992 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-17 02:45:11.534070648 +0200 ++@@ -152,7 +152,7 @@ ++ { ++ int status = -EINVAL; ++ struct kaodv_queue_entry *entry; ++- struct iphdr *iph = skb->nh.iph; +++ struct iphdr *iph = ip_hdr(skb); ++ ++ entry = kmalloc(sizeof(*entry), GFP_ATOMIC); ++ ++Index: aodv-uu-0.9.3/lnx/kaodv-queue.h ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.h 2007-06-17 02:44:50.537262648 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-queue.h 2007-06-17 02:44:53.629792512 +0200 ++@@ -21,6 +21,7 @@ ++ *****************************************************************************/ ++ #ifndef _KAODV_QUEUE_H ++ #define _KAODV_QUEUE_H +++#include "kaodv-compat.h" ++ ++ #define KAODV_QUEUE_DROP 1 ++ #define KAODV_QUEUE_SEND 2 ++Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c ++=================================================================== ++--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-17 02:47:48.927143264 +0200 +++++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-17 02:49:11.604574384 +0200 ++@@ -338,8 +338,10 @@ ++ netlink_register_notifier(&kaodv_nl_notifier); ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)) ++ kaodvnl = netlink_kernel_create(NETLINK_AODV, kaodv_netlink_rcv_sk); ++-#else +++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) ++ kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, THIS_MODULE); +++#else +++ kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, NULL, THIS_MODULE); ++ #endif ++ if (kaodvnl == NULL) { ++ printk(KERN_ERR "kaodv_netlink: failed to create netlink socket\n"); +diff --git a/feeds/packages/net/aoetools/.svn/entries b/feeds/packages/net/aoetools/.svn/entries +new file mode 100644 +index 0000000..3032358 +--- /dev/null ++++ b/feeds/packages/net/aoetools/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aoetools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-02T18:31:49.113759Z ++24882 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f3a0e8f7eccc92702dc8ad67757e6282 ++2011-01-02T18:31:49.113759Z ++24882 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1214 ++ +diff --git a/feeds/packages/net/aoetools/.svn/text-base/Makefile.svn-base b/feeds/packages/net/aoetools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f2f7756 +--- /dev/null ++++ b/feeds/packages/net/aoetools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=aoetools ++PKG_VERSION:=32 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/aoetools ++PKG_MD5SUM:=62c8b5664d413019d0008f27ab5dc4d1 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aoetools ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=ATA over Ethernet tools ++ URL:=http://aoetools.sourceforge.net/ ++ DEPENDS:=+kmod-aoe +libpthread ++endef ++ ++define Package/aoetools/description ++ The aoetools are programs for users of the ATA over Ethernet (AoE) ++ network storage protocol, a simple protocol for using storage over an ++ ethernet LAN. The vblade program (storage target) exports a block ++ device using AoE. ++endef ++ ++CONFIGURE_ARGS += NPERSHELF=16 ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/aoe-{discover,flush,interfaces,mkdevs,mkshelf,revalidate,sancheck,stat,version} \ ++ $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/aoe{cfg,ping} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/net/aoetools/Makefile b/feeds/packages/net/aoetools/Makefile +new file mode 100644 +index 0000000..f2f7756 +--- /dev/null ++++ b/feeds/packages/net/aoetools/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=aoetools ++PKG_VERSION:=32 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/aoetools ++PKG_MD5SUM:=62c8b5664d413019d0008f27ab5dc4d1 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aoetools ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=ATA over Ethernet tools ++ URL:=http://aoetools.sourceforge.net/ ++ DEPENDS:=+kmod-aoe +libpthread ++endef ++ ++define Package/aoetools/description ++ The aoetools are programs for users of the ATA over Ethernet (AoE) ++ network storage protocol, a simple protocol for using storage over an ++ ethernet LAN. The vblade program (storage target) exports a block ++ device using AoE. ++endef ++ ++CONFIGURE_ARGS += NPERSHELF=16 ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/aoe-{discover,flush,interfaces,mkdevs,mkshelf,revalidate,sancheck,stat,version} \ ++ $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/aoe{cfg,ping} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/net/apache/.svn/entries b/feeds/packages/net/apache/.svn/entries +new file mode 100644 +index 0000000..cb059db +--- /dev/null ++++ b/feeds/packages/net/apache/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/apache ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:07.735129Z ++32305 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++5629df88ac162223c0da04e42e7732e9 ++2012-06-13T00:22:07.735129Z ++32305 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5089 ++ +diff --git a/feeds/packages/net/apache/.svn/text-base/Makefile.svn-base b/feeds/packages/net/apache/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b1a1106 +--- /dev/null ++++ b/feeds/packages/net/apache/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,164 @@ ++# ++# 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.15 ++PKG_RELEASE:=3 ++PKG_SOURCE_NAME:=httpd ++ ++PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/ \ ++ http://apache.imsam.info/httpd/ ++PKG_MD5SUM:=016cec97337eccead2aad6a7c27f2e14 ++ ++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/feeds/packages/net/apache/Makefile b/feeds/packages/net/apache/Makefile +new file mode 100644 +index 0000000..b1a1106 +--- /dev/null ++++ b/feeds/packages/net/apache/Makefile +@@ -0,0 +1,164 @@ ++# ++# 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.15 ++PKG_RELEASE:=3 ++PKG_SOURCE_NAME:=httpd ++ ++PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/ \ ++ http://apache.imsam.info/httpd/ ++PKG_MD5SUM:=016cec97337eccead2aad6a7c27f2e14 ++ ++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/feeds/packages/net/apache/patches/.svn/entries b/feeds/packages/net/apache/patches/.svn/entries +new file mode 100644 +index 0000000..a5e1610 +--- /dev/null ++++ b/feeds/packages/net/apache/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/apache/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-20T13:13:05.462663Z ++17645 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-Makefile_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++c69f2f111bae432657a25ab94f516548 ++2009-09-20T13:13:05.462663Z ++17645 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++435 ++ ++002-test_char_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++463863a663d36bc2b4146100b02f95d3 ++2009-09-20T13:13:05.462663Z ++17645 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1172 ++ ++004-pidfile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++612a50c1e9056f328549ce4f37d49628 ++2009-09-20T13:13:05.462663Z ++17645 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++345 ++ ++003-logdir_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++ee96ce8f9a3501b6ccd758faabd9c20d ++2009-09-20T13:13:05.462663Z ++17645 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++949 ++ ++005-httpd_conf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++c2334ce7e205fc7af9e4cbad63397ddc ++2009-09-20T13:13:05.462663Z ++17645 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1547 ++ +diff --git a/feeds/packages/net/apache/patches/.svn/text-base/001-Makefile_in.patch.svn-base b/feeds/packages/net/apache/patches/.svn/text-base/001-Makefile_in.patch.svn-base +new file mode 100644 +index 0000000..0bccfd3 +--- /dev/null ++++ b/feeds/packages/net/apache/patches/.svn/text-base/001-Makefile_in.patch.svn-base +@@ -0,0 +1,14 @@ ++--- 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/feeds/packages/net/apache/patches/.svn/text-base/002-test_char_h.patch.svn-base b/feeds/packages/net/apache/patches/.svn/text-base/002-test_char_h.patch.svn-base +new file mode 100644 +index 0000000..e8ea3cd +--- /dev/null ++++ b/feeds/packages/net/apache/patches/.svn/text-base/002-test_char_h.patch.svn-base +@@ -0,0 +1,26 @@ ++--- /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/feeds/packages/net/apache/patches/.svn/text-base/003-logdir_fix.patch.svn-base b/feeds/packages/net/apache/patches/.svn/text-base/003-logdir_fix.patch.svn-base +new file mode 100644 +index 0000000..635c65c +--- /dev/null ++++ b/feeds/packages/net/apache/patches/.svn/text-base/003-logdir_fix.patch.svn-base +@@ -0,0 +1,33 @@ ++--- 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 ++ ++ ++@@ -150,7 +150,7 @@ ++ includedir: ${prefix}/include ++ localstatedir: /var${prefix} ++ runtimedir: ${localstatedir}/run ++- logfiledir: ${localstatedir}/logs +++ logfiledir: ${localstatedir}/log ++ proxycachedir: ${localstatedir}/proxy ++ ++ +diff --git a/feeds/packages/net/apache/patches/.svn/text-base/004-pidfile_fix.patch.svn-base b/feeds/packages/net/apache/patches/.svn/text-base/004-pidfile_fix.patch.svn-base +new file mode 100644 +index 0000000..e9f0b6d +--- /dev/null ++++ b/feeds/packages/net/apache/patches/.svn/text-base/004-pidfile_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/net/apache/patches/.svn/text-base/005-httpd_conf.patch.svn-base b/feeds/packages/net/apache/patches/.svn/text-base/005-httpd_conf.patch.svn-base +new file mode 100644 +index 0000000..60f0dca +--- /dev/null ++++ b/feeds/packages/net/apache/patches/.svn/text-base/005-httpd_conf.patch.svn-base +@@ -0,0 +1,60 @@ ++--- 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@@ ++ ++ ++ ++@@ -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 ++ ++ ++ ++@@ -191,7 +190,7 @@ ErrorLog "@rel_logfiledir@/error_log" ++ # Possible values include: debug, info, notice, warn, error, crit, ++ # alert, emerg. ++ # ++-LogLevel warn +++LogLevel debug ++ ++ ++ # ++@@ -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. ++ # ++- ++-SSLRandomSeed startup builtin ++-SSLRandomSeed connect builtin ++- +++# +++#SSLRandomSeed startup builtin +++#SSLRandomSeed connect builtin +++# +diff --git a/feeds/packages/net/apache/patches/001-Makefile_in.patch b/feeds/packages/net/apache/patches/001-Makefile_in.patch +new file mode 100644 +index 0000000..0bccfd3 +--- /dev/null ++++ b/feeds/packages/net/apache/patches/001-Makefile_in.patch +@@ -0,0 +1,14 @@ ++--- 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/feeds/packages/net/apache/patches/002-test_char_h.patch b/feeds/packages/net/apache/patches/002-test_char_h.patch +new file mode 100644 +index 0000000..e8ea3cd +--- /dev/null ++++ b/feeds/packages/net/apache/patches/002-test_char_h.patch +@@ -0,0 +1,26 @@ ++--- /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/feeds/packages/net/apache/patches/003-logdir_fix.patch b/feeds/packages/net/apache/patches/003-logdir_fix.patch +new file mode 100644 +index 0000000..635c65c +--- /dev/null ++++ b/feeds/packages/net/apache/patches/003-logdir_fix.patch +@@ -0,0 +1,33 @@ ++--- 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 ++ ++ ++@@ -150,7 +150,7 @@ ++ includedir: ${prefix}/include ++ localstatedir: /var${prefix} ++ runtimedir: ${localstatedir}/run ++- logfiledir: ${localstatedir}/logs +++ logfiledir: ${localstatedir}/log ++ proxycachedir: ${localstatedir}/proxy ++ ++ +diff --git a/feeds/packages/net/apache/patches/004-pidfile_fix.patch b/feeds/packages/net/apache/patches/004-pidfile_fix.patch +new file mode 100644 +index 0000000..e9f0b6d +--- /dev/null ++++ b/feeds/packages/net/apache/patches/004-pidfile_fix.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/net/apache/patches/005-httpd_conf.patch b/feeds/packages/net/apache/patches/005-httpd_conf.patch +new file mode 100644 +index 0000000..60f0dca +--- /dev/null ++++ b/feeds/packages/net/apache/patches/005-httpd_conf.patch +@@ -0,0 +1,60 @@ ++--- 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@@ ++ ++ ++ ++@@ -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 ++ ++ ++ ++@@ -191,7 +190,7 @@ ErrorLog "@rel_logfiledir@/error_log" ++ # Possible values include: debug, info, notice, warn, error, crit, ++ # alert, emerg. ++ # ++-LogLevel warn +++LogLevel debug ++ ++ ++ # ++@@ -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. ++ # ++- ++-SSLRandomSeed startup builtin ++-SSLRandomSeed connect builtin ++- +++# +++#SSLRandomSeed startup builtin +++#SSLRandomSeed connect builtin +++# +diff --git a/feeds/packages/net/apcupsd/.svn/entries b/feeds/packages/net/apcupsd/.svn/entries +new file mode 100644 +index 0000000..d724586 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/apcupsd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++a993c1e8e77e378636a5d32f7f7cf291 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2045 ++ +diff --git a/feeds/packages/net/apcupsd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/apcupsd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eb4de81 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,74 @@ ++# ++# 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:=apcupsd ++PKG_VERSION:=3.14.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/apcupsd ++PKG_MD5SUM:=bb2f8e4fc6b2f5d7b3e236eb57b81640 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/apcupsd ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libpthread +libusb-compat ++ TITLE:=UPS control software ++ 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-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/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 ++ ++$(eval $(call BuildPackage,apcupsd)) +diff --git a/feeds/packages/net/apcupsd/Makefile b/feeds/packages/net/apcupsd/Makefile +new file mode 100644 +index 0000000..eb4de81 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/Makefile +@@ -0,0 +1,74 @@ ++# ++# 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:=apcupsd ++PKG_VERSION:=3.14.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/apcupsd ++PKG_MD5SUM:=bb2f8e4fc6b2f5d7b3e236eb57b81640 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/apcupsd ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libpthread +libusb-compat ++ TITLE:=UPS control software ++ 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-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/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 ++ ++$(eval $(call BuildPackage,apcupsd)) +diff --git a/feeds/packages/net/apcupsd/files/.svn/entries b/feeds/packages/net/apcupsd/files/.svn/entries +new file mode 100644 +index 0000000..231b0d1 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/entries +@@ -0,0 +1,334 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/apcupsd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-14T03:37:42.102703Z ++20193 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++apcupsd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++72195bb419875053e6ebb2895f3168a8 ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++182 ++ ++apcupsd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++06029f022aae356ff53e3281ca327da0 ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11801 ++ ++commfailure ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0e7521c0f01635e993b41421326e96da ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++441 ++ ++apccontrol ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++205df830c4075137f98e6537b397a402 ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4160 ++ ++apcupsd_mail.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++399d282d1bf995eb1fbc432e1ab326ae ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++113 ++ ++commok ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++a423facd6b5e472078b6c591428ccbb2 ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++442 ++ ++offbattery ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++07de19ee383f8b716c6e270d246eefe0 ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++409 ++ ++changeme ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3e230786effc1870d3b1a6f368188b93 ++2010-03-14T03:37:42.102703Z ++20193 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++414 ++ ++onbattery ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++df4daef4dec85eb479dd52b638785c07 ++2008-07-28T16:51:41.773084Z ++11971 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++374 ++ +diff --git a/feeds/packages/net/apcupsd/files/.svn/text-base/apccontrol.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/apccontrol.svn-base +new file mode 100644 +index 0000000..2549354 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/apccontrol.svn-base +@@ -0,0 +1,146 @@ ++#!/bin/sh ++# ++# Copyright (C) 1999-2002 Riccardo Facchetti ++# ++# 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/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd.conf.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd.conf.svn-base +new file mode 100644 +index 0000000..b9acd61 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd.conf.svn-base +@@ -0,0 +1,322 @@ ++## 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 ++# Defines the type of cable connecting the UPS to your computer. ++# ++# Possible generic choices for 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 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 for device lock file. Not used on Win32. ++LOCKFILE /var/lock ++ ++# SCRIPTDIR ++# Directory in which apccontrol and event scripts are located. ++SCRIPTDIR /etc/apcupsd ++ ++# PWRFAILDIR ++# 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 ++# 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 [ 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 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 ++# 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 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 ++# 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 ++# 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/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd.init.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd.init.svn-base +new file mode 100644 +index 0000000..5454377 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd.init.svn-base +@@ -0,0 +1,12 @@ ++#!/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/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd_mail.conf.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd_mail.conf.svn-base +new file mode 100644 +index 0000000..51206c7 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/apcupsd_mail.conf.svn-base +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++MAILPROG="/usr/sbin/smtp" ++MAILHOST="mail:25" ++FROM="OpenWrt" ++TO="apcups@example.com" ++HOSTNAME="OpenWrt" +\ No newline at end of file +diff --git a/feeds/packages/net/apcupsd/files/.svn/text-base/changeme.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/changeme.svn-base +new file mode 100644 +index 0000000..bcf448a +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/changeme.svn-base +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/.svn/text-base/commfailure.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/commfailure.svn-base +new file mode 100644 +index 0000000..b899195 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/commfailure.svn-base +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/.svn/text-base/commok.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/commok.svn-base +new file mode 100644 +index 0000000..cd5d1c6 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/commok.svn-base +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/.svn/text-base/offbattery.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/offbattery.svn-base +new file mode 100644 +index 0000000..22c0b98 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/offbattery.svn-base +@@ -0,0 +1,17 @@ ++#!/bin/sh ++# ++# This shell script if placed in /etc/apcupsd ++# will be called by /etc/apcupsd/apccontrol when the ++# UPS goes back on to the mains after a power failure. ++# We send an email message to root to notify him. ++# ++. /etc/apcupsd/apcupsd_mail.conf ++ ++MSG="$HOSTNAME Power has returned" ++# ++( ++ echo "$MSG" ++ echo " " ++ /usr/sbin/apcaccess status ++) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO ++exit 0 +diff --git a/feeds/packages/net/apcupsd/files/.svn/text-base/onbattery.svn-base b/feeds/packages/net/apcupsd/files/.svn/text-base/onbattery.svn-base +new file mode 100644 +index 0000000..ee5f653 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/.svn/text-base/onbattery.svn-base +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/apccontrol b/feeds/packages/net/apcupsd/files/apccontrol +new file mode 100644 +index 0000000..2549354 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/apccontrol +@@ -0,0 +1,146 @@ ++#!/bin/sh ++# ++# Copyright (C) 1999-2002 Riccardo Facchetti ++# ++# 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/feeds/packages/net/apcupsd/files/apcupsd.conf b/feeds/packages/net/apcupsd/files/apcupsd.conf +new file mode 100644 +index 0000000..b9acd61 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/apcupsd.conf +@@ -0,0 +1,322 @@ ++## 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 ++# Defines the type of cable connecting the UPS to your computer. ++# ++# Possible generic choices for 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 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 for device lock file. Not used on Win32. ++LOCKFILE /var/lock ++ ++# SCRIPTDIR ++# Directory in which apccontrol and event scripts are located. ++SCRIPTDIR /etc/apcupsd ++ ++# PWRFAILDIR ++# 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 ++# 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 [ 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 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 ++# 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 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 ++# 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 ++# 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/feeds/packages/net/apcupsd/files/apcupsd.init b/feeds/packages/net/apcupsd/files/apcupsd.init +new file mode 100644 +index 0000000..5454377 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/apcupsd.init +@@ -0,0 +1,12 @@ ++#!/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/feeds/packages/net/apcupsd/files/apcupsd_mail.conf b/feeds/packages/net/apcupsd/files/apcupsd_mail.conf +new file mode 100644 +index 0000000..51206c7 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/apcupsd_mail.conf +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++MAILPROG="/usr/sbin/smtp" ++MAILHOST="mail:25" ++FROM="OpenWrt" ++TO="apcups@example.com" ++HOSTNAME="OpenWrt" +\ No newline at end of file +diff --git a/feeds/packages/net/apcupsd/files/changeme b/feeds/packages/net/apcupsd/files/changeme +new file mode 100644 +index 0000000..bcf448a +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/changeme +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/commfailure b/feeds/packages/net/apcupsd/files/commfailure +new file mode 100644 +index 0000000..b899195 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/commfailure +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/commok b/feeds/packages/net/apcupsd/files/commok +new file mode 100644 +index 0000000..cd5d1c6 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/commok +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/files/offbattery b/feeds/packages/net/apcupsd/files/offbattery +new file mode 100644 +index 0000000..22c0b98 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/offbattery +@@ -0,0 +1,17 @@ ++#!/bin/sh ++# ++# This shell script if placed in /etc/apcupsd ++# will be called by /etc/apcupsd/apccontrol when the ++# UPS goes back on to the mains after a power failure. ++# We send an email message to root to notify him. ++# ++. /etc/apcupsd/apcupsd_mail.conf ++ ++MSG="$HOSTNAME Power has returned" ++# ++( ++ echo "$MSG" ++ echo " " ++ /usr/sbin/apcaccess status ++) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO ++exit 0 +diff --git a/feeds/packages/net/apcupsd/files/onbattery b/feeds/packages/net/apcupsd/files/onbattery +new file mode 100644 +index 0000000..ee5f653 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/files/onbattery +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/net/apcupsd/patches/.svn/entries b/feeds/packages/net/apcupsd/patches/.svn/entries +new file mode 100644 +index 0000000..13537d5 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/apcupsd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-20T21:36:16.870247Z ++19784 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix-include-paths.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++fd6ccc5a9505a016079a1c4c08417d99 ++2010-02-20T21:36:16.870247Z ++19784 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++501 ++ +diff --git a/feeds/packages/net/apcupsd/patches/.svn/text-base/010-fix-include-paths.patch.svn-base b/feeds/packages/net/apcupsd/patches/.svn/text-base/010-fix-include-paths.patch.svn-base +new file mode 100644 +index 0000000..2151544 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/patches/.svn/text-base/010-fix-include-paths.patch.svn-base +@@ -0,0 +1,13 @@ ++diff --git a/autoconf/variables.mak.in b/autoconf/variables.mak.in ++index b67e467..6022434 100644 ++--- a/autoconf/variables.mak.in +++++ b/autoconf/variables.mak.in ++@@ -65,7 +65,7 @@ DRVLIBS = @PTHREAD_LFLAGS@ @DRVLIBS@ ++ X_LIBS = @X_LIBS@ ++ X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++ ++-CPPFLAGS = @CPPFLAGS@ -I$(topdir)/include $(EXTRAINCS) +++CPPFLAGS = -I$(topdir)/include @CPPFLAGS@ $(EXTRAINCS) ++ CFLAGS = $(CPPFLAGS) @CFLAGS@ @PTHREAD_CFLAGS@ ++ CXXFLAGS = $(CPPFLAGS) @CXXFLAGS@ @PTHREAD_CFLAGS@ ++ LDFLAGS = @LDFLAGS@ +diff --git a/feeds/packages/net/apcupsd/patches/010-fix-include-paths.patch b/feeds/packages/net/apcupsd/patches/010-fix-include-paths.patch +new file mode 100644 +index 0000000..2151544 +--- /dev/null ++++ b/feeds/packages/net/apcupsd/patches/010-fix-include-paths.patch +@@ -0,0 +1,13 @@ ++diff --git a/autoconf/variables.mak.in b/autoconf/variables.mak.in ++index b67e467..6022434 100644 ++--- a/autoconf/variables.mak.in +++++ b/autoconf/variables.mak.in ++@@ -65,7 +65,7 @@ DRVLIBS = @PTHREAD_LFLAGS@ @DRVLIBS@ ++ X_LIBS = @X_LIBS@ ++ X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++ ++-CPPFLAGS = @CPPFLAGS@ -I$(topdir)/include $(EXTRAINCS) +++CPPFLAGS = -I$(topdir)/include @CPPFLAGS@ $(EXTRAINCS) ++ CFLAGS = $(CPPFLAGS) @CFLAGS@ @PTHREAD_CFLAGS@ ++ CXXFLAGS = $(CPPFLAGS) @CXXFLAGS@ @PTHREAD_CFLAGS@ ++ LDFLAGS = @LDFLAGS@ +diff --git a/feeds/packages/net/apf/.svn/entries b/feeds/packages/net/apf/.svn/entries +new file mode 100644 +index 0000000..8232563 +--- /dev/null ++++ b/feeds/packages/net/apf/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/apf ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:25.147198Z ++32316 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++a4a8560461459170eb55f5c666721b38 ++2012-06-13T00:22:25.147198Z ++32316 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1090 ++ +diff --git a/feeds/packages/net/apf/.svn/text-base/Makefile.svn-base b/feeds/packages/net/apf/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..89e46aa +--- /dev/null ++++ b/feeds/packages/net/apf/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=apf ++PKG_VERSION:=0.8.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gray-world.net/projects/af/ ++PKG_MD5SUM:=4411785b05ec59e955152fe4e61705b1 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_VARS += \ ++ LDFLAGS="$$$$LDFLAGS -lcrypto -lssl -lz" ++ ++define Package/apf ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Active port forwarder ++ URL:=http://gray-world.net/pr_af.shtml ++ DEPENDS:=+libopenssl +libpthread ++endef ++ ++define Package/apf/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/af{client,server} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/afclient_example.conf $(1)/etc/afclient.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/afserver_example.conf $(1)/etc/afserver.conf ++endef ++ ++define Package/apf/conffiles ++/etc/afclient.conf ++/etc/afserver.conf ++endef ++ ++$(eval $(call BuildPackage,apf)) +diff --git a/feeds/packages/net/apf/Makefile b/feeds/packages/net/apf/Makefile +new file mode 100644 +index 0000000..89e46aa +--- /dev/null ++++ b/feeds/packages/net/apf/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=apf ++PKG_VERSION:=0.8.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gray-world.net/projects/af/ ++PKG_MD5SUM:=4411785b05ec59e955152fe4e61705b1 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_VARS += \ ++ LDFLAGS="$$$$LDFLAGS -lcrypto -lssl -lz" ++ ++define Package/apf ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Active port forwarder ++ URL:=http://gray-world.net/pr_af.shtml ++ DEPENDS:=+libopenssl +libpthread ++endef ++ ++define Package/apf/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/af{client,server} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/afclient_example.conf $(1)/etc/afclient.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/afserver_example.conf $(1)/etc/afserver.conf ++endef ++ ++define Package/apf/conffiles ++/etc/afclient.conf ++/etc/afserver.conf ++endef ++ ++$(eval $(call BuildPackage,apf)) +diff --git a/feeds/packages/net/appweb/.svn/entries b/feeds/packages/net/appweb/.svn/entries +new file mode 100644 +index 0000000..77070c5 +--- /dev/null ++++ b/feeds/packages/net/appweb/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/appweb ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T14:20:49.458601Z ++35226 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++686b41264ba2e0bc10f035eea4aeddf5 ++2013-01-18T14:20:49.458601Z ++35226 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2353 ++ +diff --git a/feeds/packages/net/appweb/.svn/text-base/Makefile.svn-base b/feeds/packages/net/appweb/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..dc83165 +--- /dev/null ++++ b/feeds/packages/net/appweb/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,104 @@ ++# ++# Copyright (C) 2009-2013 OpenWrt.org ++# Copyright (C) 2009 Embedthis Software ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# Commercial and other licenses are available from http://www.embedthis.com/. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=appweb ++PKG_RELEASE:=2 ++ ++# ++# Build stable ++# ++PKG_VERSION:=3.4.1-0 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tgz ++PKG_SOURCE_URL:=http://www.appwebserver.org/software/ ++PKG_MD5SUM:=23540af5852e4b0f6789bc47013d311c ++ ++# ++# Build the latest snapshot from the default trunk ++# ++#PKG_VERSION:=default ++#PKG_SOURCE:=tip.tar.gz ++#PKG_SOURCE_URL:= http://hg.embedthis.com/appweb/archive/ ++#PKG_MD5SUM:= ++ ++include $(INCLUDE_DIR)/package.mk ++ ++# The files in the .tar.gz are ++# src/all/... ++# src/build/... ++# src/test/... ++# and so on ++# ++# What we want is ++# $(PKG_BUILD_DIR)/all/... ++# $(PKG_BUILD_DIR)/build/... ++# $(PKG_BUILD_DIR)/test/... ++# and so on ++# ++# The following two lines make this happen ++# 1. change tar option to strip out the top-level, src in ++# this case ++# 2. change the tar output to the build directory. The ++# original tar command was ++# $(HOST_TAR) -C/.. $(1) $(TAR_OPTIONS) ++ ++TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) ++TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) ++ ++define Package/appweb ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Web Servers/Proxies ++ TITLE:=Appweb Web Server ++ URL:=http://www.appwebserver.org/ ++ DEPENDS:=@!avr32 +libpthread +libpcre +libsqlite3 ++endef ++ ++define Package/appweb/description ++ Appweb is a powerful, compact embedded web server designed for dynamic web ++ applications. ++endef ++ ++CONFIGURE_ARGS += \ ++ -q \ ++ --defaults=release \ ++ --shared \ ++ --tune=size \ ++ --without-php \ ++ --without-ssl \ ++ --disable-angel \ ++ --disable-samples \ ++ --disable-access-log \ ++ --disable-complete-native \ ++ --disable-complete-cross \ ++ --webdir=/www \ ++ --logdir=/var/log \ ++ --port=8000 \ ++ --sslPort=8443 \ ++ --config=flat ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ BLD_CC_DYN_LOAD=1 ++endef ++ ++define Package/appweb/install ++ ( cd $(PKG_BUILD_DIR) ; $(PKG_BUILD_DIR)/build/bin/makeInstall \ ++ --root=$(1) --install --with-openwrt=1 binary ) ++ rm -rf $(1)/var ++endef ++ ++$(eval $(call BuildPackage,appweb)) +diff --git a/feeds/packages/net/appweb/Makefile b/feeds/packages/net/appweb/Makefile +new file mode 100644 +index 0000000..dc83165 +--- /dev/null ++++ b/feeds/packages/net/appweb/Makefile +@@ -0,0 +1,104 @@ ++# ++# Copyright (C) 2009-2013 OpenWrt.org ++# Copyright (C) 2009 Embedthis Software ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# Commercial and other licenses are available from http://www.embedthis.com/. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=appweb ++PKG_RELEASE:=2 ++ ++# ++# Build stable ++# ++PKG_VERSION:=3.4.1-0 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tgz ++PKG_SOURCE_URL:=http://www.appwebserver.org/software/ ++PKG_MD5SUM:=23540af5852e4b0f6789bc47013d311c ++ ++# ++# Build the latest snapshot from the default trunk ++# ++#PKG_VERSION:=default ++#PKG_SOURCE:=tip.tar.gz ++#PKG_SOURCE_URL:= http://hg.embedthis.com/appweb/archive/ ++#PKG_MD5SUM:= ++ ++include $(INCLUDE_DIR)/package.mk ++ ++# The files in the .tar.gz are ++# src/all/... ++# src/build/... ++# src/test/... ++# and so on ++# ++# What we want is ++# $(PKG_BUILD_DIR)/all/... ++# $(PKG_BUILD_DIR)/build/... ++# $(PKG_BUILD_DIR)/test/... ++# and so on ++# ++# The following two lines make this happen ++# 1. change tar option to strip out the top-level, src in ++# this case ++# 2. change the tar output to the build directory. The ++# original tar command was ++# $(HOST_TAR) -C/.. $(1) $(TAR_OPTIONS) ++ ++TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) ++TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) ++ ++define Package/appweb ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Web Servers/Proxies ++ TITLE:=Appweb Web Server ++ URL:=http://www.appwebserver.org/ ++ DEPENDS:=@!avr32 +libpthread +libpcre +libsqlite3 ++endef ++ ++define Package/appweb/description ++ Appweb is a powerful, compact embedded web server designed for dynamic web ++ applications. ++endef ++ ++CONFIGURE_ARGS += \ ++ -q \ ++ --defaults=release \ ++ --shared \ ++ --tune=size \ ++ --without-php \ ++ --without-ssl \ ++ --disable-angel \ ++ --disable-samples \ ++ --disable-access-log \ ++ --disable-complete-native \ ++ --disable-complete-cross \ ++ --webdir=/www \ ++ --logdir=/var/log \ ++ --port=8000 \ ++ --sslPort=8443 \ ++ --config=flat ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ BLD_CC_DYN_LOAD=1 ++endef ++ ++define Package/appweb/install ++ ( cd $(PKG_BUILD_DIR) ; $(PKG_BUILD_DIR)/build/bin/makeInstall \ ++ --root=$(1) --install --with-openwrt=1 binary ) ++ rm -rf $(1)/var ++endef ++ ++$(eval $(call BuildPackage,appweb)) +diff --git a/feeds/packages/net/appweb/patches/.svn/entries b/feeds/packages/net/appweb/patches/.svn/entries +new file mode 100644 +index 0000000..6462d96 +--- /dev/null ++++ b/feeds/packages/net/appweb/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/appweb/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T14:20:49.458601Z ++35226 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-add-ipv6-in-configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f8d99fb97eb05106174a605a870a8661 ++2013-01-18T14:20:49.458601Z ++35226 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++286 ++ +diff --git a/feeds/packages/net/appweb/patches/.svn/text-base/001-add-ipv6-in-configure.patch.svn-base b/feeds/packages/net/appweb/patches/.svn/text-base/001-add-ipv6-in-configure.patch.svn-base +new file mode 100644 +index 0000000..c927cbf +--- /dev/null ++++ b/feeds/packages/net/appweb/patches/.svn/text-base/001-add-ipv6-in-configure.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -2503,6 +2503,8 @@ while [ "${1#--}" != "$1" ] ; do ++ # ++ # Ignored but provided for compatibility with autoconf ++ # +++ disable-ipv6|enable-ipv6) +++ ;; ++ bindir=*|libdir=*|libexecdir=*|moddir=*) ++ ;; ++ disable-nls|enable-nls) +diff --git a/feeds/packages/net/appweb/patches/001-add-ipv6-in-configure.patch b/feeds/packages/net/appweb/patches/001-add-ipv6-in-configure.patch +new file mode 100644 +index 0000000..c927cbf +--- /dev/null ++++ b/feeds/packages/net/appweb/patches/001-add-ipv6-in-configure.patch +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -2503,6 +2503,8 @@ while [ "${1#--}" != "$1" ] ; do ++ # ++ # Ignored but provided for compatibility with autoconf ++ # +++ disable-ipv6|enable-ipv6) +++ ;; ++ bindir=*|libdir=*|libexecdir=*|moddir=*) ++ ;; ++ disable-nls|enable-nls) +diff --git a/feeds/packages/net/aprx/.svn/entries b/feeds/packages/net/aprx/.svn/entries +new file mode 100644 +index 0000000..1ac45c7 +--- /dev/null ++++ b/feeds/packages/net/aprx/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aprx ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++6f74e465b2244cbe1cbb6d60c193c34d ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1260 ++ +diff --git a/feeds/packages/net/aprx/.svn/text-base/Makefile.svn-base b/feeds/packages/net/aprx/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..16e98ba +--- /dev/null ++++ b/feeds/packages/net/aprx/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=aprx ++PKG_REV:=421 ++PKG_VERSION:=2.00_r$(PKG_REV) ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://repo.ham.fi/svn/aprx/trunk/ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aprx ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=APRS RX only I-gate ++ URL:=http://ham.zmailer.org/oh2mqk/aprx/ ++endef ++ ++define Package/aprx/description ++ This daemon listens for traffic on the specified serial interfaces. ++ It then forwards appropriate packets to APRS-IS servers. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-embedded \ ++ ++define Package/aprx/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/aprx.init $(1)/etc/init.d/aprx ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/aprx.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/aprx $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/aprx-stat $(1)/usr/sbin/ ++endef ++ ++define Package/aprx/conffiles ++/etc/aprx.conf ++endef ++ ++$(eval $(call BuildPackage,aprx)) +diff --git a/feeds/packages/net/aprx/Makefile b/feeds/packages/net/aprx/Makefile +new file mode 100644 +index 0000000..16e98ba +--- /dev/null ++++ b/feeds/packages/net/aprx/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=aprx ++PKG_REV:=421 ++PKG_VERSION:=2.00_r$(PKG_REV) ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://repo.ham.fi/svn/aprx/trunk/ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aprx ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=APRS RX only I-gate ++ URL:=http://ham.zmailer.org/oh2mqk/aprx/ ++endef ++ ++define Package/aprx/description ++ This daemon listens for traffic on the specified serial interfaces. ++ It then forwards appropriate packets to APRS-IS servers. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-embedded \ ++ ++define Package/aprx/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/aprx.init $(1)/etc/init.d/aprx ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/aprx.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/aprx $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/aprx-stat $(1)/usr/sbin/ ++endef ++ ++define Package/aprx/conffiles ++/etc/aprx.conf ++endef ++ ++$(eval $(call BuildPackage,aprx)) +diff --git a/feeds/packages/net/aprx/files/.svn/entries b/feeds/packages/net/aprx/files/.svn/entries +new file mode 100644 +index 0000000..e04c095 +--- /dev/null ++++ b/feeds/packages/net/aprx/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aprx/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:15:23.724249Z ++29048 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++aprx.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++164f3938fc3079b09961aa5f156545e1 ++2011-11-13T22:15:23.724249Z ++29048 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++208 ++ +diff --git a/feeds/packages/net/aprx/files/.svn/text-base/aprx.init.svn-base b/feeds/packages/net/aprx/files/.svn/text-base/aprx.init.svn-base +new file mode 100644 +index 0000000..9682eee +--- /dev/null ++++ b/feeds/packages/net/aprx/files/.svn/text-base/aprx.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=99 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ mkdir -m 0755 -p /var/log/aprx ++ service_start /usr/sbin/aprx ++} ++ ++stop() { ++ service_stop /usr/sbin/aprx ++} +diff --git a/feeds/packages/net/aprx/files/aprx.init b/feeds/packages/net/aprx/files/aprx.init +new file mode 100644 +index 0000000..9682eee +--- /dev/null ++++ b/feeds/packages/net/aprx/files/aprx.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=99 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ mkdir -m 0755 -p /var/log/aprx ++ service_start /usr/sbin/aprx ++} ++ ++stop() { ++ service_stop /usr/sbin/aprx ++} +diff --git a/feeds/packages/net/aprx/patches/.svn/entries b/feeds/packages/net/aprx/patches/.svn/entries +new file mode 100644 +index 0000000..2ba3060 +--- /dev/null ++++ b/feeds/packages/net/aprx/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aprx/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-08-22T16:36:30.621770Z ++22761 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-Makefile_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++d03b8380280f4ae9f86410136265d668 ++2010-08-22T16:36:30.621770Z ++22761 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++739 ++ +diff --git a/feeds/packages/net/aprx/patches/.svn/text-base/100-Makefile_in.patch.svn-base b/feeds/packages/net/aprx/patches/.svn/text-base/100-Makefile_in.patch.svn-base +new file mode 100644 +index 0000000..cb06f79 +--- /dev/null ++++ b/feeds/packages/net/aprx/patches/.svn/text-base/100-Makefile_in.patch.svn-base +@@ -0,0 +1,27 @@ ++diff -ruN aprx-2.00_r421.orig/Makefile.in aprx-2.00_r421/Makefile.in ++--- aprx-2.00_r421.orig/Makefile.in 2010-06-19 15:13:47.000000000 +0000 +++++ aprx-2.00_r421/Makefile.in 2010-08-22 00:14:35.000000000 +0000 ++@@ -27,8 +27,9 @@ ++ CFLAGS= @CFLAGS@ ++ ++ # Linker and flags ++-LD= @LD@ +++LD= @CC@ ++ LDFLAGS= @LDFLAGS@ $(PROF) +++datarootdir = @datarootdir@ ++ ++ INSTALL= $(srcdir)/install-sh ++ INSTALL_PROGRAM=$(INSTALL) -m 755 ++@@ -89,10 +90,10 @@ ++ ++ ++ $(PROGAPRX): $(OBJSAPRX) VERSION Makefile ++- $(LD) $(LDFLAGS) -o $@ $(OBJSAPRX) $(LIBS) +++ $(CC) $(CFLAGS) -o $@ $(OBJSAPRX) $(LIBS) ++ ++ $(PROGSTAT): $(OBJSSTAT) VERSION Makefile ++- $(LD) $(LDFLAGS) -o $@ $(OBJSSTAT) $(LIBS) +++ $(CC) $(CFLAGS) -o $@ $(OBJSSTAT) $(LIBS) ++ ++ .PHONY: man ++ man: $(MAN) +diff --git a/feeds/packages/net/aprx/patches/100-Makefile_in.patch b/feeds/packages/net/aprx/patches/100-Makefile_in.patch +new file mode 100644 +index 0000000..cb06f79 +--- /dev/null ++++ b/feeds/packages/net/aprx/patches/100-Makefile_in.patch +@@ -0,0 +1,27 @@ ++diff -ruN aprx-2.00_r421.orig/Makefile.in aprx-2.00_r421/Makefile.in ++--- aprx-2.00_r421.orig/Makefile.in 2010-06-19 15:13:47.000000000 +0000 +++++ aprx-2.00_r421/Makefile.in 2010-08-22 00:14:35.000000000 +0000 ++@@ -27,8 +27,9 @@ ++ CFLAGS= @CFLAGS@ ++ ++ # Linker and flags ++-LD= @LD@ +++LD= @CC@ ++ LDFLAGS= @LDFLAGS@ $(PROF) +++datarootdir = @datarootdir@ ++ ++ INSTALL= $(srcdir)/install-sh ++ INSTALL_PROGRAM=$(INSTALL) -m 755 ++@@ -89,10 +90,10 @@ ++ ++ ++ $(PROGAPRX): $(OBJSAPRX) VERSION Makefile ++- $(LD) $(LDFLAGS) -o $@ $(OBJSAPRX) $(LIBS) +++ $(CC) $(CFLAGS) -o $@ $(OBJSAPRX) $(LIBS) ++ ++ $(PROGSTAT): $(OBJSSTAT) VERSION Makefile ++- $(LD) $(LDFLAGS) -o $@ $(OBJSSTAT) $(LIBS) +++ $(CC) $(CFLAGS) -o $@ $(OBJSSTAT) $(LIBS) ++ ++ .PHONY: man ++ man: $(MAN) +diff --git a/feeds/packages/net/aria2/.svn/entries b/feeds/packages/net/aria2/.svn/entries +new file mode 100644 +index 0000000..808a9bb +--- /dev/null ++++ b/feeds/packages/net/aria2/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/aria2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-20T13:54:59.776630Z ++35701 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++182db75ad920e2f9fed60ecaf22bec5c ++2013-02-20T13:54:59.776630Z ++35701 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1279 ++ +diff --git a/feeds/packages/net/aria2/.svn/text-base/Makefile.svn-base b/feeds/packages/net/aria2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b466d29 +--- /dev/null ++++ b/feeds/packages/net/aria2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# Copyright (C) 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:=aria2 ++PKG_VERSION:=1.16.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/aria2 ++PKG_MD5SUM:=2f37c41e6a9f883f75525970582b1414 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aria2 ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=File Transfer ++ TITLE:=lightweight download utility ++ URL:=http://aria2.sourceforge.net/ ++ DEPENDS:=+libopenssl +zlib +libxml2 +libstdcpp \ ++ $(INTL_DEPENDS) $(ICONV_DEPENDS) ++endef ++ ++define Package/aria2/description ++ aria2 is a lightweight multi-protocol & multi-source command-line download ++ utility ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-nls \ ++ --without-gnutls \ ++ --without-libnettle \ ++ --without-libgmp \ ++ --without-libgcrypt \ ++ --without-libexpat \ ++ --without-libcares \ ++ --without-sqlite3 \ ++ --with-openssl \ ++ --with-libxml2 \ ++ --with-libz ++ ++CONFIGURE_VARS += \ ++ ZLIB_CFLAGS="-I$(STAGING_DIR)/usr/include" \ ++ ZLIB_LIBS="-L$(STAGING_DIR)/usr/lib" ++ ++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/feeds/packages/net/aria2/Makefile b/feeds/packages/net/aria2/Makefile +new file mode 100644 +index 0000000..b466d29 +--- /dev/null ++++ b/feeds/packages/net/aria2/Makefile +@@ -0,0 +1,57 @@ ++# ++# Copyright (C) 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:=aria2 ++PKG_VERSION:=1.16.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/aria2 ++PKG_MD5SUM:=2f37c41e6a9f883f75525970582b1414 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/aria2 ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=File Transfer ++ TITLE:=lightweight download utility ++ URL:=http://aria2.sourceforge.net/ ++ DEPENDS:=+libopenssl +zlib +libxml2 +libstdcpp \ ++ $(INTL_DEPENDS) $(ICONV_DEPENDS) ++endef ++ ++define Package/aria2/description ++ aria2 is a lightweight multi-protocol & multi-source command-line download ++ utility ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-nls \ ++ --without-gnutls \ ++ --without-libnettle \ ++ --without-libgmp \ ++ --without-libgcrypt \ ++ --without-libexpat \ ++ --without-libcares \ ++ --without-sqlite3 \ ++ --with-openssl \ ++ --with-libxml2 \ ++ --with-libz ++ ++CONFIGURE_VARS += \ ++ ZLIB_CFLAGS="-I$(STAGING_DIR)/usr/include" \ ++ ZLIB_LIBS="-L$(STAGING_DIR)/usr/lib" ++ ++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/feeds/packages/net/arpd/.svn/entries b/feeds/packages/net/arpd/.svn/entries +new file mode 100644 +index 0000000..780ebc6 +--- /dev/null ++++ b/feeds/packages/net/arpd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/arpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:06.047116Z ++32304 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++06629a04450c9108296dd40d10a0c050 ++2012-06-13T00:22:06.047116Z ++32304 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1218 ++ +diff --git a/feeds/packages/net/arpd/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/arpd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/arpd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/arpd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/arpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5c7bd4e +--- /dev/null ++++ b/feeds/packages/net/arpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2006-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:=arpd ++PKG_VERSION:=0.2 ++PKG_RELEASE:=2 ++ ++PKG_MD5SUM:=e2911fa9de1b92ef50deda1489ae944d ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://niels.xtdnet.nl/honeyd ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/arpd ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libdnet +libevent2 +librt ++ TITLE:=A daemon to fake ARP replies ++ URL:=http://niels.xtdnet.nl/honeyd/ ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ stamp-h.in \ ++ config.h.in \ ++ ); ++ $(call Build/Configure/Default, \ ++ --with-libdnet="$(STAGING_DIR)/usr" \ ++ --with-libevent="$(STAGING_DIR)/usr" \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS)" \ ++ INCLS="-I. $(TARGET_CPPFLAGS)" \ ++ LIBS="$(TARGET_LDFLAGS) -lpcap -ldnet -levent" ++endef ++ ++define Package/arpd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/arpd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,arpd)) +diff --git a/feeds/packages/net/arpd/Makefile b/feeds/packages/net/arpd/Makefile +new file mode 100644 +index 0000000..5c7bd4e +--- /dev/null ++++ b/feeds/packages/net/arpd/Makefile +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2006-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:=arpd ++PKG_VERSION:=0.2 ++PKG_RELEASE:=2 ++ ++PKG_MD5SUM:=e2911fa9de1b92ef50deda1489ae944d ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://niels.xtdnet.nl/honeyd ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/arpd ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libdnet +libevent2 +librt ++ TITLE:=A daemon to fake ARP replies ++ URL:=http://niels.xtdnet.nl/honeyd/ ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ stamp-h.in \ ++ config.h.in \ ++ ); ++ $(call Build/Configure/Default, \ ++ --with-libdnet="$(STAGING_DIR)/usr" \ ++ --with-libevent="$(STAGING_DIR)/usr" \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CCOPT="$(TARGET_CFLAGS)" \ ++ INCLS="-I. $(TARGET_CPPFLAGS)" \ ++ LIBS="$(TARGET_LDFLAGS) -lpcap -ldnet -levent" ++endef ++ ++define Package/arpd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/arpd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,arpd)) +diff --git a/feeds/packages/net/arpd/patches/.svn/entries b/feeds/packages/net/arpd/patches/.svn/entries +new file mode 100644 +index 0000000..3febb46 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/arpd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-30T14:31:18.831617Z ++21268 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-configure_no_bpf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++308915cc06d1de144254ae97e55ae228 ++2009-09-20T12:23:08.283596Z ++17633 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++485 ++ ++004-no_dnet_config_check.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++ae9e8216da2cfba69dcb46ad1474474c ++2009-09-20T12:23:08.283596Z ++17633 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++420 ++ ++002-function_string.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++f8d637b9519488e8fe342d599621149e ++2009-09-20T12:23:08.283596Z ++17633 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1546 ++ ++005-remove-dropped-libevent-features.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++7c6ba1d801fbf3b67334eca7a1cc2edf ++2010-04-30T14:31:18.831617Z ++21268 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++525 ++ ++003-pcap_and_arg.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++3501259eb5548a3629d8e3f526c932f4 ++2010-04-30T14:31:18.831617Z ++21268 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2131 ++ +diff --git a/feeds/packages/net/arpd/patches/.svn/prop-base/001-configure_no_bpf.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/prop-base/001-configure_no_bpf.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/prop-base/001-configure_no_bpf.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/arpd/patches/.svn/prop-base/002-function_string.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/prop-base/002-function_string.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/prop-base/002-function_string.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/arpd/patches/.svn/prop-base/003-pcap_and_arg.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/prop-base/003-pcap_and_arg.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/prop-base/003-pcap_and_arg.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/arpd/patches/.svn/text-base/001-configure_no_bpf.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/text-base/001-configure_no_bpf.patch.svn-base +new file mode 100644 +index 0000000..7113b45 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/text-base/001-configure_no_bpf.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -2258,8 +2258,7 @@ echo "${ECHO_T}$withval" >&6 ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++ PCAPINC="-I$withval -I$withval/bpf" ++ PCAPLIB="-L$withval -lpcap" ++- elif test -f $withval/include/pcap.h -a \ ++- -f $withval/include/net/bpf.h; then +++ elif test -f $withval/include/pcap.h; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++ PCAPINC="-I$withval/include" +diff --git a/feeds/packages/net/arpd/patches/.svn/text-base/002-function_string.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/text-base/002-function_string.patch.svn-base +new file mode 100644 +index 0000000..c2a3b41 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/text-base/002-function_string.patch.svn-base +@@ -0,0 +1,42 @@ ++--- a/arpd.c +++++ b/arpd.c ++@@ -265,7 +265,7 @@ arpd_send(eth_t *eth, int op, ++ spa->addr_ip, tha->addr_eth, tpa->addr_ip); ++ ++ if (op == ARP_OP_REQUEST) { ++- syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s", +++ syslog(LOG_DEBUG, "%s: who-has %s tell %s", __FUNCTION__, ++ addr_ntoa(tpa), addr_ntoa(spa)); ++ } else if (op == ARP_OP_REPLY) { ++ syslog(LOG_INFO, "arp reply %s is-at %s", ++@@ -282,7 +282,7 @@ arpd_lookup(struct addr *addr) ++ int error; ++ ++ if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) { ++- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", +++ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__, ++ addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr)); ++ return (0); ++ } ++@@ -291,10 +291,10 @@ arpd_lookup(struct addr *addr) ++ error = arp_get(arpd_arp, &arpent); ++ ++ if (error == -1) { ++- syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s", +++ syslog(LOG_DEBUG, "%s: no entry for %s", __FUNCTION__, ++ addr_ntoa(addr)); ++ } else { ++- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", +++ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__, ++ addr_ntoa(addr), addr_ntoa(&arpent.arp_ha)); ++ } ++ return (error); ++@@ -423,7 +423,7 @@ arpd_recv_cb(u_char *u, const struct pca ++ if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) { ++ addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS, ++ ethip->ar_sha, ETH_ADDR_LEN); ++- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", +++ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__, ++ addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha)); ++ ++ /* This address is claimed */ +diff --git a/feeds/packages/net/arpd/patches/.svn/text-base/003-pcap_and_arg.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/text-base/003-pcap_and_arg.patch.svn-base +new file mode 100644 +index 0000000..c48b8f4 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/text-base/003-pcap_and_arg.patch.svn-base +@@ -0,0 +1,76 @@ ++--- a/arpd.c +++++ b/arpd.c ++@@ -70,7 +70,7 @@ static int arpd_sig; ++ static void ++ usage(void) ++ { ++- fprintf(stderr, "Usage: arpd [-d] [-i interface] [net]\n"); +++ fprintf(stderr, "Usage: arpd [-d] [-i interface] [-a 'pcap_expr'] [{host|net|range} ...]\n"); ++ exit(1); ++ } ++ ++@@ -182,7 +182,7 @@ arpd_expandips(int naddresses, char **ad ++ } ++ ++ static void ++-arpd_init(char *dev, int naddresses, char **addresses) +++arpd_init(char *dev, char *and_pcap_exp, int naddresses, char **addresses) ++ { ++ struct bpf_program fcode; ++ char filter[1024], ebuf[PCAP_ERRBUF_SIZE], *dst; ++@@ -214,9 +214,13 @@ arpd_init(char *dev, int naddresses, cha ++ errx(1, "bad interface configuration: not IP or Ethernet"); ++ arpd_ifent.intf_addr.addr_bits = IP_ADDR_BITS; ++ ++- snprintf(filter, sizeof(filter), "arp %s%s%s and not ether src %s", +++ snprintf(filter, sizeof(filter), "arp %s%s%s and not ether src %s%s%s%s", ++ dst ? "and (" : "", dst ? dst : "", dst ? ")" : "", ++- addr_ntoa(&arpd_ifent.intf_link_addr)); +++ addr_ntoa(&arpd_ifent.intf_link_addr), +++ and_pcap_exp ? " and (" : "", +++ and_pcap_exp ? and_pcap_exp : "", +++ and_pcap_exp ? ")" : "" +++ ); ++ ++ if ((arpd_pcap = pcap_open_live(dev, 128, 0, 500, ebuf)) == NULL) ++ errx(1, "pcap_open_live: %s", ebuf); ++@@ -465,14 +469,15 @@ main(int argc, char *argv[]) ++ { ++ struct event recv_ev; ++ extern int (*event_sigcb)(void); ++- char *dev; +++ char *dev, *and_pcap_exp; ++ int c, debug; ++ FILE *fp; ++ ++ dev = NULL; +++ and_pcap_exp = NULL; ++ debug = 0; ++ ++- while ((c = getopt(argc, argv, "di:h?")) != -1) { +++ while ((c = getopt(argc, argv, "a:di:h?")) != -1) { ++ switch (c) { ++ case 'd': ++ debug = 1; ++@@ -480,6 +485,9 @@ main(int argc, char *argv[]) ++ case 'i': ++ dev = optarg; ++ break; +++ case 'a': +++ and_pcap_exp = optarg; +++ break; ++ default: ++ usage(); ++ break; ++@@ -489,9 +497,9 @@ main(int argc, char *argv[]) ++ argv += optind; ++ ++ if (argc == 0) ++- arpd_init(dev, 0, NULL); +++ arpd_init(dev, and_pcap_exp, 0, NULL); ++ else ++- arpd_init(dev, argc, argv); +++ arpd_init(dev, and_pcap_exp, argc, argv); ++ ++ if ((fp = fopen(PIDFILE, "w")) == NULL) ++ err(1, "fopen"); +diff --git a/feeds/packages/net/arpd/patches/.svn/text-base/004-no_dnet_config_check.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/text-base/004-no_dnet_config_check.patch.svn-base +new file mode 100644 +index 0000000..c3ebc12 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/text-base/004-no_dnet_config_check.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -2170,8 +2170,7 @@ echo "${ECHO_T}$withval" >&6 ++ DNETLIB="`$withval/bin/dnet-config --libs`" ++ else ++ { { echo "$as_me:2172: error: dnet-config not found in $withval/bin" >&5 ++-echo "$as_me: error: dnet-config not found in $withval/bin" >&2;} ++- { (exit 1); exit 1; }; } +++echo "$as_me: error: dnet-config not found in $withval/bin" >&2;} } ++ fi ++ ;; ++ esac +diff --git a/feeds/packages/net/arpd/patches/.svn/text-base/005-remove-dropped-libevent-features.patch.svn-base b/feeds/packages/net/arpd/patches/.svn/text-base/005-remove-dropped-libevent-features.patch.svn-base +new file mode 100644 +index 0000000..0936345 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/.svn/text-base/005-remove-dropped-libevent-features.patch.svn-base +@@ -0,0 +1,29 @@ ++--- a/arpd.c +++++ b/arpd.c ++@@ -449,9 +449,6 @@ arpd_recv(int fd, short type, void *ev) ++ void ++ terminate_handler(int sig) ++ { ++- extern int event_gotsig; ++- ++- event_gotsig = 1; ++ arpd_sig = sig; ++ } ++ ++@@ -468,7 +465,6 @@ int ++ main(int argc, char *argv[]) ++ { ++ struct event recv_ev; ++- extern int (*event_sigcb)(void); ++ char *dev, *and_pcap_exp; ++ int c, debug; ++ FILE *fp; ++@@ -532,8 +528,6 @@ main(int argc, char *argv[]) ++ perror("signal"); ++ return (-1); ++ } ++- event_sigcb = arpd_signal; ++- ++ event_dispatch(); ++ ++ return (0); +diff --git a/feeds/packages/net/arpd/patches/001-configure_no_bpf.patch b/feeds/packages/net/arpd/patches/001-configure_no_bpf.patch +new file mode 100644 +index 0000000..7113b45 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/001-configure_no_bpf.patch +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -2258,8 +2258,7 @@ echo "${ECHO_T}$withval" >&6 ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++ PCAPINC="-I$withval -I$withval/bpf" ++ PCAPLIB="-L$withval -lpcap" ++- elif test -f $withval/include/pcap.h -a \ ++- -f $withval/include/net/bpf.h; then +++ elif test -f $withval/include/pcap.h; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++ PCAPINC="-I$withval/include" +diff --git a/feeds/packages/net/arpd/patches/002-function_string.patch b/feeds/packages/net/arpd/patches/002-function_string.patch +new file mode 100644 +index 0000000..c2a3b41 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/002-function_string.patch +@@ -0,0 +1,42 @@ ++--- a/arpd.c +++++ b/arpd.c ++@@ -265,7 +265,7 @@ arpd_send(eth_t *eth, int op, ++ spa->addr_ip, tha->addr_eth, tpa->addr_ip); ++ ++ if (op == ARP_OP_REQUEST) { ++- syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s", +++ syslog(LOG_DEBUG, "%s: who-has %s tell %s", __FUNCTION__, ++ addr_ntoa(tpa), addr_ntoa(spa)); ++ } else if (op == ARP_OP_REPLY) { ++ syslog(LOG_INFO, "arp reply %s is-at %s", ++@@ -282,7 +282,7 @@ arpd_lookup(struct addr *addr) ++ int error; ++ ++ if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) { ++- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", +++ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__, ++ addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr)); ++ return (0); ++ } ++@@ -291,10 +291,10 @@ arpd_lookup(struct addr *addr) ++ error = arp_get(arpd_arp, &arpent); ++ ++ if (error == -1) { ++- syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s", +++ syslog(LOG_DEBUG, "%s: no entry for %s", __FUNCTION__, ++ addr_ntoa(addr)); ++ } else { ++- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", +++ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__, ++ addr_ntoa(addr), addr_ntoa(&arpent.arp_ha)); ++ } ++ return (error); ++@@ -423,7 +423,7 @@ arpd_recv_cb(u_char *u, const struct pca ++ if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) { ++ addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS, ++ ethip->ar_sha, ETH_ADDR_LEN); ++- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", +++ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__, ++ addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha)); ++ ++ /* This address is claimed */ +diff --git a/feeds/packages/net/arpd/patches/003-pcap_and_arg.patch b/feeds/packages/net/arpd/patches/003-pcap_and_arg.patch +new file mode 100644 +index 0000000..c48b8f4 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/003-pcap_and_arg.patch +@@ -0,0 +1,76 @@ ++--- a/arpd.c +++++ b/arpd.c ++@@ -70,7 +70,7 @@ static int arpd_sig; ++ static void ++ usage(void) ++ { ++- fprintf(stderr, "Usage: arpd [-d] [-i interface] [net]\n"); +++ fprintf(stderr, "Usage: arpd [-d] [-i interface] [-a 'pcap_expr'] [{host|net|range} ...]\n"); ++ exit(1); ++ } ++ ++@@ -182,7 +182,7 @@ arpd_expandips(int naddresses, char **ad ++ } ++ ++ static void ++-arpd_init(char *dev, int naddresses, char **addresses) +++arpd_init(char *dev, char *and_pcap_exp, int naddresses, char **addresses) ++ { ++ struct bpf_program fcode; ++ char filter[1024], ebuf[PCAP_ERRBUF_SIZE], *dst; ++@@ -214,9 +214,13 @@ arpd_init(char *dev, int naddresses, cha ++ errx(1, "bad interface configuration: not IP or Ethernet"); ++ arpd_ifent.intf_addr.addr_bits = IP_ADDR_BITS; ++ ++- snprintf(filter, sizeof(filter), "arp %s%s%s and not ether src %s", +++ snprintf(filter, sizeof(filter), "arp %s%s%s and not ether src %s%s%s%s", ++ dst ? "and (" : "", dst ? dst : "", dst ? ")" : "", ++- addr_ntoa(&arpd_ifent.intf_link_addr)); +++ addr_ntoa(&arpd_ifent.intf_link_addr), +++ and_pcap_exp ? " and (" : "", +++ and_pcap_exp ? and_pcap_exp : "", +++ and_pcap_exp ? ")" : "" +++ ); ++ ++ if ((arpd_pcap = pcap_open_live(dev, 128, 0, 500, ebuf)) == NULL) ++ errx(1, "pcap_open_live: %s", ebuf); ++@@ -465,14 +469,15 @@ main(int argc, char *argv[]) ++ { ++ struct event recv_ev; ++ extern int (*event_sigcb)(void); ++- char *dev; +++ char *dev, *and_pcap_exp; ++ int c, debug; ++ FILE *fp; ++ ++ dev = NULL; +++ and_pcap_exp = NULL; ++ debug = 0; ++ ++- while ((c = getopt(argc, argv, "di:h?")) != -1) { +++ while ((c = getopt(argc, argv, "a:di:h?")) != -1) { ++ switch (c) { ++ case 'd': ++ debug = 1; ++@@ -480,6 +485,9 @@ main(int argc, char *argv[]) ++ case 'i': ++ dev = optarg; ++ break; +++ case 'a': +++ and_pcap_exp = optarg; +++ break; ++ default: ++ usage(); ++ break; ++@@ -489,9 +497,9 @@ main(int argc, char *argv[]) ++ argv += optind; ++ ++ if (argc == 0) ++- arpd_init(dev, 0, NULL); +++ arpd_init(dev, and_pcap_exp, 0, NULL); ++ else ++- arpd_init(dev, argc, argv); +++ arpd_init(dev, and_pcap_exp, argc, argv); ++ ++ if ((fp = fopen(PIDFILE, "w")) == NULL) ++ err(1, "fopen"); +diff --git a/feeds/packages/net/arpd/patches/004-no_dnet_config_check.patch b/feeds/packages/net/arpd/patches/004-no_dnet_config_check.patch +new file mode 100644 +index 0000000..c3ebc12 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/004-no_dnet_config_check.patch +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -2170,8 +2170,7 @@ echo "${ECHO_T}$withval" >&6 ++ DNETLIB="`$withval/bin/dnet-config --libs`" ++ else ++ { { echo "$as_me:2172: error: dnet-config not found in $withval/bin" >&5 ++-echo "$as_me: error: dnet-config not found in $withval/bin" >&2;} ++- { (exit 1); exit 1; }; } +++echo "$as_me: error: dnet-config not found in $withval/bin" >&2;} } ++ fi ++ ;; ++ esac +diff --git a/feeds/packages/net/arpd/patches/005-remove-dropped-libevent-features.patch b/feeds/packages/net/arpd/patches/005-remove-dropped-libevent-features.patch +new file mode 100644 +index 0000000..0936345 +--- /dev/null ++++ b/feeds/packages/net/arpd/patches/005-remove-dropped-libevent-features.patch +@@ -0,0 +1,29 @@ ++--- a/arpd.c +++++ b/arpd.c ++@@ -449,9 +449,6 @@ arpd_recv(int fd, short type, void *ev) ++ void ++ terminate_handler(int sig) ++ { ++- extern int event_gotsig; ++- ++- event_gotsig = 1; ++ arpd_sig = sig; ++ } ++ ++@@ -468,7 +465,6 @@ int ++ main(int argc, char *argv[]) ++ { ++ struct event recv_ev; ++- extern int (*event_sigcb)(void); ++ char *dev, *and_pcap_exp; ++ int c, debug; ++ FILE *fp; ++@@ -532,8 +528,6 @@ main(int argc, char *argv[]) ++ perror("signal"); ++ return (-1); ++ } ++- event_sigcb = arpd_signal; ++- ++ event_dispatch(); ++ ++ return (0); +diff --git a/feeds/packages/net/arpwatch/.svn/entries b/feeds/packages/net/arpwatch/.svn/entries +new file mode 100644 +index 0000000..c5ed9ad +--- /dev/null ++++ b/feeds/packages/net/arpwatch/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/arpwatch ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:43:25.192149Z ++28912 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++9732bac480b34de4fea26260c8f2e875 ++2011-11-09T23:43:25.192149Z ++28912 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1547 ++ +diff --git a/feeds/packages/net/arpwatch/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/arpwatch/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/arpwatch/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/arpwatch/.svn/text-base/Makefile.svn-base b/feeds/packages/net/arpwatch/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..20b1959 +--- /dev/null ++++ b/feeds/packages/net/arpwatch/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=arpwatch ++PKG_VERSION:=2.1a15 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/ ++PKG_MD5SUM:=cebfeb99c4a7c2a6cee2564770415fe7 ++ ++# use a subdirectory to prevent configure for finding libpcap build dir ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/arpwatch ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap ++ TITLE:=Ethernet station activity monitor ++ URL:=http://www-nrg.ee.lbl.gov/ ++endef ++ ++define Package/arpwatch/description ++ Ethernet monitor program for keeping track of ethernet/ip address ++ pairings. ++endef ++ ++define Package/arpwatch/conffiles ++/etc/arpwatch/arp.dat ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ chmod -R u+w $(PKG_BUILD_DIR) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ ARPDIR=/etc/arpwatch \ ++ CCOPT="$(TARGET_CFLAGS)" \ ++ INCLS="-I. $(TARGET_CPPFLAGS)" \ ++ LIBS="$(TARGET_LDFLAGS) -lpcap" ++endef ++ ++define Package/arpwatch/install ++ $(INSTALL_DIR) $(1)/etc/arpwatch ++ $(CP) $(PKG_BUILD_DIR)/arp.dat $(1)/etc/arpwatch/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/arp{watch,snmp} $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/arpwatch.init $(1)/etc/init.d/arpwatch ++endef ++ ++$(eval $(call BuildPackage,arpwatch)) +diff --git a/feeds/packages/net/arpwatch/Makefile b/feeds/packages/net/arpwatch/Makefile +new file mode 100644 +index 0000000..20b1959 +--- /dev/null ++++ b/feeds/packages/net/arpwatch/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=arpwatch ++PKG_VERSION:=2.1a15 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/ ++PKG_MD5SUM:=cebfeb99c4a7c2a6cee2564770415fe7 ++ ++# use a subdirectory to prevent configure for finding libpcap build dir ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/arpwatch ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap ++ TITLE:=Ethernet station activity monitor ++ URL:=http://www-nrg.ee.lbl.gov/ ++endef ++ ++define Package/arpwatch/description ++ Ethernet monitor program for keeping track of ethernet/ip address ++ pairings. ++endef ++ ++define Package/arpwatch/conffiles ++/etc/arpwatch/arp.dat ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ chmod -R u+w $(PKG_BUILD_DIR) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ ARPDIR=/etc/arpwatch \ ++ CCOPT="$(TARGET_CFLAGS)" \ ++ INCLS="-I. $(TARGET_CPPFLAGS)" \ ++ LIBS="$(TARGET_LDFLAGS) -lpcap" ++endef ++ ++define Package/arpwatch/install ++ $(INSTALL_DIR) $(1)/etc/arpwatch ++ $(CP) $(PKG_BUILD_DIR)/arp.dat $(1)/etc/arpwatch/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/arp{watch,snmp} $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/arpwatch.init $(1)/etc/init.d/arpwatch ++endef ++ ++$(eval $(call BuildPackage,arpwatch)) +diff --git a/feeds/packages/net/arpwatch/files/.svn/entries b/feeds/packages/net/arpwatch/files/.svn/entries +new file mode 100644 +index 0000000..0dcb740 +--- /dev/null ++++ b/feeds/packages/net/arpwatch/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/arpwatch/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:43:25.192149Z ++28912 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++arpwatch.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++6b48283574d00792b29a2f0fff7d0649 ++2011-11-09T23:43:25.192149Z ++28912 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++200 ++ +diff --git a/feeds/packages/net/arpwatch/files/.svn/text-base/arpwatch.init.svn-base b/feeds/packages/net/arpwatch/files/.svn/text-base/arpwatch.init.svn-base +new file mode 100644 +index 0000000..b05692b +--- /dev/null ++++ b/feeds/packages/net/arpwatch/files/.svn/text-base/arpwatch.init.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=90 ++ ++start() { ++ service_start /usr/sbin/arpwatch -f /etc/arpwatch/arp.dat -i br-lan ++} ++ ++stop() { ++ service_stop /usr/sbin/arpwatch ++} +diff --git a/feeds/packages/net/arpwatch/files/arpwatch.init b/feeds/packages/net/arpwatch/files/arpwatch.init +new file mode 100644 +index 0000000..b05692b +--- /dev/null ++++ b/feeds/packages/net/arpwatch/files/arpwatch.init +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=90 ++ ++start() { ++ service_start /usr/sbin/arpwatch -f /etc/arpwatch/arp.dat -i br-lan ++} ++ ++stop() { ++ service_stop /usr/sbin/arpwatch ++} +diff --git a/feeds/packages/net/asterisk-1.8.x/.svn/entries b/feeds/packages/net/asterisk-1.8.x/.svn/entries +new file mode 100644 +index 0000000..4d8d704 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/.svn/entries +@@ -0,0 +1,71 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-1.8.x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-08T14:50:56.209630Z ++34121 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++src-lantiq ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++ae2d2cb112bbe7ce21404b068f6c6f96 ++2012-10-29T17:38:12.210779Z ++33995 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++26519 ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/.svn/text-base/Makefile.svn-base b/feeds/packages/net/asterisk-1.8.x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ab95160 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,704 @@ ++# ++# 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:=asterisk18 ++PKG_VERSION:=1.8.10.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ ++PKG_MD5SUM:=415738d347b9037cbe5f8bfbe66843de ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/ltqtapi.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/asterisk18/Default ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://www.asterisk.org/ ++endef ++ ++define Package/asterisk18/Default/description ++ Asterisk is a complete PBX in software. It provides all of the features ++ you would expect from a PBX and more. Asterisk does voice over IP in three ++ protocols, and can interoperate with almost all standards-based telephony ++ equipment using relatively inexpensive hardware. ++endef ++ ++ ++define Package/asterisk18 ++$(call Package/asterisk18/Default) ++ TITLE:=Complete open source PBX, v1.8x ++ MENU:=1 ++ DEPENDS:= +libopenssl +libncurses +libpopt +libpthread +zlib @!TARGET_avr32 ++endef ++ ++define Package/asterisk18/description ++$(call Package/asterisk18/Default/description) ++endef ++ ++define Package/asterisk18-sounds ++$(call Package/asterisk18/Default) ++ TITLE:=Sound files ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-sounds/description ++$(call Package/asterisk18/Default/description) ++ This package contains sound files for Asterisk. ++endef ++ ++define Package/asterisk18-voicemail ++$(call Package/asterisk18/Default) ++ TITLE:=Voicemail support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-voicemail/description ++$(call Package/asterisk18/Default/description) ++ This package contains voicemail related modules for Asterisk. ++endef ++ ++define Package/asterisk18-app-meetme ++$(call Package/asterisk18/Default) ++ TITLE:=conferencing support ++ DEPENDS:= asterisk18 +dahdi-tools-libtonezone +kmod-dahdi-linux ++endef ++ ++define Package/asterisk18-app-meetme/description ++$(call Package/asterisk18/Default/description) ++ This package provides the MeetMe application driver Conferencing support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-chan-iax2 ++$(call Package/asterisk18/Default) ++ TITLE:=IAX support ++ DEPENDS:= asterisk18 +asterisk18-res-crypto ++endef ++ ++define Package/asterisk18-chan-iax2/description ++$(call Package/asterisk18/Default/description) ++ This package provides IAX support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-cdr ++$(call Package/asterisk18/Default) ++ TITLE:=CDR support ++ DEPENDS:= asterisk18 @BROKEN ++endef ++ ++define Package/asterisk18-cdr/description ++$(call Package/asterisk18/Default/description) ++ This package provides Call Detail Record support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-res-musiconhold ++$(call Package/asterisk18/Default) ++ TITLE:=MOH support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-res-musiconhold/description ++$(call Package/asterisk18/Default/description) ++ This package provides Music On Hold support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-res-srtp ++$(call Package/asterisk18/Default) ++ TITLE:=SRTP support ++ DEPENDS:= asterisk18 libsrtp +asterisk18-res-crypto ++endef ++ ++define Package/asterisk18-res-srtp/description ++$(call Package/asterisk18/Default/description) ++ This package provides SRTP support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-chan-gtalk ++$(call Package/asterisk18/Default) ++ TITLE:=GTalk support ++ DEPENDS:= asterisk18 +libiksemel ++endef ++ ++define Package/asterisk18-chan-gtalk/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_gtalk and res_jabber for GTalk ++ support to Asterisk. ++endef ++ ++define Package/asterisk18-chan-mobile ++$(call Package/asterisk18/Default) ++ TITLE:=Mobile channel support ++ DEPENDS:= asterisk18 +bluez-libs ++endef ++ ++define Package/asterisk18-chan-mobile/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_mobile support to Asterisk. ++endef ++ ++define Package/asterisk18-res-timing-timerfd ++$(call Package/asterisk18/Default) ++ TITLE:= Timerfd Timing Interface ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-res-timing-pthread ++$(call Package/asterisk18/Default) ++ TITLE:= pthread Timing Interface ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-res-fax ++$(call Package/asterisk18/Default) ++ TITLE:=Generic FAX Resource for FAX technology resource modules ++ DEPENDS:= asterisk18 +asterisk18-res-timing-pthread ++endef ++ ++define Package/asterisk18-res-fax-spandsp ++$(call Package/asterisk18/Default) ++ TITLE:=Spandsp T.38 and G.711 FAX Resource ++ DEPENDS:= asterisk18 +asterisk18-res-fax +libspandsp ++endef ++ ++define Package/asterisk18-chan-mgcp ++$(call Package/asterisk18/Default) ++ TITLE:=MGCP channel support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-chan-mgcp/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_mgcp support to Asterisk. ++endef ++ ++define Package/asterisk18-chan-skinny ++$(call Package/asterisk18/Default) ++ TITLE:=Skinny channel support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-chan-skinny/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_skinny support to Asterisk. ++endef ++ ++define Package/asterisk18-curl ++$(call Package/asterisk18/Default) ++ TITLE:=CURL support ++ DEPENDS:= asterisk18 +libcurl ++endef ++ ++define Package/asterisk18-curl/description ++$(call Package/asterisk18/Default/description) ++ This package provides CURL ++ support to Asterisk. ++endef ++ ++define Package/asterisk18-mysql ++$(call Package/asterisk18/Default) ++ TITLE:=MySQL support ++ DEPENDS:= asterisk18 +PACKAGE_asterisk18-mysql:libmysqlclient ++endef ++ ++define Package/asterisk18-mysql/description ++$(call Package/asterisk18/Default/description) ++ This package provides MySQL ++ support to Asterisk. ++endef ++ ++define Package/asterisk18-chan-lantiq ++$(call Package/asterisk18/Default) ++ TITLE:=Lantiq TAPI support ++ DEPENDS:= asterisk18 $(LTQ_TAPI_DEPENDS) ++ URL:=http://git.nanl.de/?p=asterisk_channel_lantiq.git ++ MAINTAINER:=Mirko Vogt ++endef ++ ++define Package/asterisk18-chan-lantiq/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_lantiq support to Asterisk. ++endef ++ ++define Package/asterisk18-odbc ++$(call Package/asterisk18/Default) ++ TITLE:=ODBC support ++ DEPENDS:= asterisk18 +libpthread +libc +unixodbc ++endef ++ ++define Package/asterisk18-odbc/description ++$(call Package/asterisk18/Default/description) ++ This package provides ODBC support for Asterisk. ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-app-meetme),) ++ CONFIGURE_ARGS+= \ ++ --with-dahdi="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-dahdi ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),) ++ CONFIGURE_ARGS+= \ ++ --with-gnutls="$(STAGING_DIR)/usr" \ ++ --with-iksemel="$(STAGING_DIR)/usr" ++ SITE_VARS+= \ ++ ac_cv_lib_iksemel_iks_start_sasl=yes \ ++ ac_cv_lib_gnutls_gnutls_bye=yes ++else ++ CONFIGURE_ARGS+= \ ++ --without-gnutls \ ++ --without-iksemel ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-curl),) ++ CONFIGURE_ARGS+= \ ++ --with-curl="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-curl ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mysql),) ++ CONFIGURE_ARGS+= \ ++ --with-mysqlclient="$(STAGING_DIR)/usr/bin" ++else ++ CONFIGURE_ARGS+= \ ++ --without-mysqlclient ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-res-fax-spandsp),) ++ CONFIGURE_ARGS+= \ ++ --with-spandsp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-spandsp ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-mobile),) ++ CONFIGURE_ARGS+= \ ++ --with-bluetooth="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-bluetooth ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-res-srtp),) ++ CONFIGURE_ARGS+= \ ++ --with-srtp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-srtp ++endif ++ ++CONFIGURE_ARGS+= \ ++ --without-curses \ ++ --with-gsm=internal \ ++ --without-cap \ ++ --without-gtk \ ++ --without-gtk2 \ ++ --without-isdnnet \ ++ --without-kde \ ++ --without-misdn \ ++ --without-nbs \ ++ --with-ncurses="$(STAGING_DIR)/usr" \ ++ --without-netsnmp \ ++ --without-newt \ ++ --without-ogg \ ++ --without-osptk \ ++ --with-popt="$(STAGING_DIR)/usr" \ ++ --without-pri \ ++ --without-qt \ ++ --without-radius \ ++ --without-sdl \ ++ --without-suppserv \ ++ --without-tds \ ++ --without-termcap \ ++ --without-tinfo \ ++ --without-vorbis \ ++ --without-vpb \ ++ --with-z="$(STAGING_DIR)/usr" \ ++ --with-sounds-cache="$(DL_DIR)" \ ++ --disable-xmldoc ++ ++EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ifneq ($(CONFIG_TARGET_lantiq),) ++ $(CP) ./src-lantiq/* $(PKG_BUILD_DIR)/ ++endif ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default,,$(SITE_VARS)) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ include/asterisk/version.h \ ++ include/asterisk/buildopts.h defaults.h \ ++ makeopts.embed_rules ++ ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" \ ++ ASTLDFLAGS="$(EXTRA_LDFLAGS)" \ ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ ASTVARLIBDIR="/usr/lib/asterisk" \ ++ ASTDATADIR="/usr/lib/asterisk" \ ++ ASTKEYDIR="/usr/lib/asterisk" \ ++ ASTDBDIR="/usr/lib/asterisk" \ ++ NOISY_BUILD="1" \ ++ DEBUG="" \ ++ OPTIMIZE="" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install samples ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/asterisk-1.8/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-1.8/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/ ++endef ++ ++define Package/asterisk18/conffiles ++/etc/asterisk/asterisk.conf ++/etc/asterisk/modules.conf ++/etc/asterisk/extensions.conf ++/etc/asterisk/sip.conf ++/etc/asterisk/sip_notify.conf ++/etc/asterisk/features.conf ++/etc/asterisk/indications.conf ++/etc/asterisk/logger.conf ++/etc/asterisk/manager.conf ++/etc/asterisk/rtp.conf ++/etc/default/asterisk ++/etc/init.d/asterisk ++endef ++ ++define Package/asterisk18/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ for f in asterisk extensions features \ ++ indications logger manager modules \ ++ sip sip_notify rtp; do \ ++ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \ ++ done ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ for f in app_dial app_echo app_playback app_macro \ ++ chan_sip res_rtp_asterisk res_rtp_multicast \ ++ codec_ulaw codec_gsm \ ++ format_gsm format_pcm format_wav format_wav_gsm \ ++ pbx_config \ ++ func_strings func_timeout func_callerid func_logic; do \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \ ++ done ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/default ++ $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk ++endef ++ ++define Package/asterisk18-sounds/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/ ++ rm -f $(1)/usr/lib/asterisk/sounds/vm-* ++ rm -f $(1)/usr/lib/asterisk/sounds/conf-* ++endef ++ ++ ++define Package/asterisk18-voicemail/conffiles ++/etc/asterisk/voicemail.conf ++endef ++ ++define Package/asterisk18-voicemail/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/voicemail.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ ++endef ++ ++define Package/asterisk18-app-meetme/conffiles ++/etc/asterisk/meetme.conf ++endef ++ ++define Package/asterisk18-app-meetme/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_dahdi.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/conf-*.gsm $(1)/usr/lib/asterisk/sounds/ ++endef ++ ++define Package/asterisk18-chan-iax2/conffiles ++/etc/asterisk/iax.conf ++/etc/asterisk/iaxprov.conf ++endef ++ ++define Package/asterisk18-cdr/conffiles ++/etc/asterisk/cdr.conf ++/etc/asterisk/cdr_custom.conf ++/etc/asterisk/cdr_manager.conf ++/etc/asterisk/cdr_odbc.conf ++/etc/asterisk/cdr_pgsql.conf ++/etc/asterisk/cdr_tds.conf ++endef ++ ++define Package/asterisk18-res-musiconhold/conffiles ++/etc/asterisk/musiconhold.conf ++endef ++ ++define Package/asterisk18-chan-iax2/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iax.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iaxprov.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_iax2.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-cdr/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr*.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*cdr*.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-musiconhold/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_musiconhold.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-gtalk/conffiles ++/etc/asterisk/gtalk.conf ++/etc/asterisk/jabber.conf ++endef ++ ++define Package/asterisk18-chan-gtalk/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/gtalk.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/jabber.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_gtalk.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_jabber.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-mobile/conffiles ++/etc/asterisk/chan_mobile.conf ++endef ++ ++define Package/asterisk18-chan-mobile/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/chan_mobile.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mobile.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-timing-timerfd/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_timerfd.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-timing-pthread/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_pthread.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-fax/conffiles ++/etc/asterisk/res_fax.conf ++endef ++ ++define Package/asterisk18-res-fax/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_fax.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-fax-spandsp/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax_spandsp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-mgcp/conffiles ++/etc/asterisk/mgcp.conf ++endef ++ ++define Package/asterisk18-chan-mgcp/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/mgcp.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mgcp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-skinny/conffiles ++/etc/asterisk/skinny.conf ++endef ++ ++define Package/asterisk18-chan-skinny/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/skinny.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-curl/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_curl.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-mysql/conffiles ++/etc/asterisk/app_mysql.conf ++/etc/asterisk/res_config_mysql.conf ++/etc/asterisk/cdr_mysql.conf ++endef ++ ++define Package/asterisk18-mysql/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/app_mysql.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_config_mysql.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr_mysql.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_mysql.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/cdr_mysql.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-lantiq/conffiles ++/etc/asterisk/lantiq.conf ++endef ++ ++define Package/asterisk18-chan-lantiq/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/lantiq.conf $(1)/etc/asterisk/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_lantiq.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-srtp/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-odbc/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/*odbc*.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*odbc*.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Buildasterisk18ModuleTemplate ++ ++ define Package/asterisk18-$(subst _,-,$(1)) ++ $$(call Package/asterisk18/Default) ++ TITLE:=$(2) support ++ DEPENDS:= asterisk18 $(4) ++ endef ++ ++ define Package/asterisk18-$(subst _,-,$(1))/description ++ $$(call Package/asterisk18/Default/description) ++ This package provides support $(3) in Asterisk. ++ endef ++ ++ define Package/asterisk18-$(subst _,-,$(1))/install ++ $(INSTALL_DIR) $$(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$(1).so $$(1)/usr/lib/asterisk/modules/ ++ endef ++ ++ $$(eval $$(call BuildPackage,asterisk18-$(subst _,-,$(1)))) ++endef ++ ++$(eval $(call BuildPackage,asterisk18)) ++$(eval $(call BuildPackage,asterisk18-voicemail)) ++$(eval $(call BuildPackage,asterisk18-sounds)) ++#$(eval $(call BuildPackage,asterisk18-app-meetme)) ++$(eval $(call BuildPackage,asterisk18-chan-iax2)) ++$(eval $(call BuildPackage,asterisk18-cdr)) ++$(eval $(call BuildPackage,asterisk18-res-musiconhold)) ++$(eval $(call BuildPackage,asterisk18-chan-gtalk)) ++$(eval $(call BuildPackage,asterisk18-chan-mobile)) ++$(eval $(call BuildPackage,asterisk18-odbc)) ++$(eval $(call BuildPackage,asterisk18-res-fax)) ++$(eval $(call BuildPackage,asterisk18-res-fax-spandsp)) ++$(eval $(call BuildPackage,asterisk18-res-timing-timerfd)) ++$(eval $(call BuildPackage,asterisk18-res-timing-pthread)) ++$(eval $(call BuildPackage,asterisk18-chan-mgcp)) ++$(eval $(call BuildPackage,asterisk18-chan-skinny)) ++$(eval $(call BuildPackage,asterisk18-curl)) ++$(eval $(call BuildPackage,asterisk18-mysql)) ++$(eval $(call BuildPackage,asterisk18-chan-lantiq)) ++$(eval $(call BuildPackage,asterisk18-res-srtp)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_directed_pickup,Directed call pickup,support for directed call pickup)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_exec,Exec application,support for application execution)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail system)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_readexten,Extension to variable,a trivial application to read an extension into a variable)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_read,Variable read,a trivial application to read a variable)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_sayunixtime,Say Unix time,an application to say Unix time)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_sms,SMS,SMS support (ETSI ES 201 912 protocol 1))) ++$(eval $(call Buildasterisk18ModuleTemplate,app_stack,Stack applications, stack applications Gosub Return etc., +asterisk18-res-agi)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_system,System exec,support for executing system commands)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_talkdetect,File playback with audio detect,for file playback with audio detect)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_waituntil,Sleep,support sleeping until the given epoch)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_while,While loop,a while loop implementation)) ++$(eval $(call Buildasterisk18ModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel)) ++$(eval $(call Buildasterisk18ModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_g726,G.726,support for headerless G.726 16/24/32/40kbps data format)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_g729,G.729,support for raw headerless G729 data)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_sln,Raw slinear format,support for raw slinear format)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_sln16,Raw slinear 16 format,support for Raw slinear 16 format)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_db,Database interaction,functions for interaction with the database)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_devstate,Blinky lights control,functions for manually controlled blinky lights)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_vmcount,vmcount dialplan,a vmcount dialplan function)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_global,Global variable,global variable dialplan functions)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_shell,Shell,support for shell execution)) ++$(eval $(call Buildasterisk18ModuleTemplate,pbx_ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_ael_share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules)) ++$(eval $(call Buildasterisk18ModuleTemplate,pbx_spool,Call Spool,outgoing call spool support)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_crypto,Provide Crypto,Cryptographic Signature capability)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_setcallerid,Set callerid,support for setting callerid)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_verbose,Verbose logging,Verbose logging application)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_channel,Channel info,Channel info dialplan function)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_uri,URI encoding and decoding,Encodes and decodes URI-safe strings)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_disa,Direct Inward System Access,Direct Inward System Access)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_senddtmf,Send DTMF digits,Sends arbitrary DTMF digits)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_cut,CUT function,CUT function)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_playtones,Playtones application,play a tone list)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_record,Record sound file,to record a sound file)) +diff --git a/feeds/packages/net/asterisk-1.8.x/Makefile b/feeds/packages/net/asterisk-1.8.x/Makefile +new file mode 100644 +index 0000000..ab95160 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/Makefile +@@ -0,0 +1,704 @@ ++# ++# 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:=asterisk18 ++PKG_VERSION:=1.8.10.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ ++PKG_MD5SUM:=415738d347b9037cbe5f8bfbe66843de ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/ltqtapi.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/asterisk18/Default ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://www.asterisk.org/ ++endef ++ ++define Package/asterisk18/Default/description ++ Asterisk is a complete PBX in software. It provides all of the features ++ you would expect from a PBX and more. Asterisk does voice over IP in three ++ protocols, and can interoperate with almost all standards-based telephony ++ equipment using relatively inexpensive hardware. ++endef ++ ++ ++define Package/asterisk18 ++$(call Package/asterisk18/Default) ++ TITLE:=Complete open source PBX, v1.8x ++ MENU:=1 ++ DEPENDS:= +libopenssl +libncurses +libpopt +libpthread +zlib @!TARGET_avr32 ++endef ++ ++define Package/asterisk18/description ++$(call Package/asterisk18/Default/description) ++endef ++ ++define Package/asterisk18-sounds ++$(call Package/asterisk18/Default) ++ TITLE:=Sound files ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-sounds/description ++$(call Package/asterisk18/Default/description) ++ This package contains sound files for Asterisk. ++endef ++ ++define Package/asterisk18-voicemail ++$(call Package/asterisk18/Default) ++ TITLE:=Voicemail support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-voicemail/description ++$(call Package/asterisk18/Default/description) ++ This package contains voicemail related modules for Asterisk. ++endef ++ ++define Package/asterisk18-app-meetme ++$(call Package/asterisk18/Default) ++ TITLE:=conferencing support ++ DEPENDS:= asterisk18 +dahdi-tools-libtonezone +kmod-dahdi-linux ++endef ++ ++define Package/asterisk18-app-meetme/description ++$(call Package/asterisk18/Default/description) ++ This package provides the MeetMe application driver Conferencing support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-chan-iax2 ++$(call Package/asterisk18/Default) ++ TITLE:=IAX support ++ DEPENDS:= asterisk18 +asterisk18-res-crypto ++endef ++ ++define Package/asterisk18-chan-iax2/description ++$(call Package/asterisk18/Default/description) ++ This package provides IAX support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-cdr ++$(call Package/asterisk18/Default) ++ TITLE:=CDR support ++ DEPENDS:= asterisk18 @BROKEN ++endef ++ ++define Package/asterisk18-cdr/description ++$(call Package/asterisk18/Default/description) ++ This package provides Call Detail Record support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-res-musiconhold ++$(call Package/asterisk18/Default) ++ TITLE:=MOH support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-res-musiconhold/description ++$(call Package/asterisk18/Default/description) ++ This package provides Music On Hold support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-res-srtp ++$(call Package/asterisk18/Default) ++ TITLE:=SRTP support ++ DEPENDS:= asterisk18 libsrtp +asterisk18-res-crypto ++endef ++ ++define Package/asterisk18-res-srtp/description ++$(call Package/asterisk18/Default/description) ++ This package provides SRTP support to ++ Asterisk. ++endef ++ ++define Package/asterisk18-chan-gtalk ++$(call Package/asterisk18/Default) ++ TITLE:=GTalk support ++ DEPENDS:= asterisk18 +libiksemel ++endef ++ ++define Package/asterisk18-chan-gtalk/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_gtalk and res_jabber for GTalk ++ support to Asterisk. ++endef ++ ++define Package/asterisk18-chan-mobile ++$(call Package/asterisk18/Default) ++ TITLE:=Mobile channel support ++ DEPENDS:= asterisk18 +bluez-libs ++endef ++ ++define Package/asterisk18-chan-mobile/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_mobile support to Asterisk. ++endef ++ ++define Package/asterisk18-res-timing-timerfd ++$(call Package/asterisk18/Default) ++ TITLE:= Timerfd Timing Interface ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-res-timing-pthread ++$(call Package/asterisk18/Default) ++ TITLE:= pthread Timing Interface ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-res-fax ++$(call Package/asterisk18/Default) ++ TITLE:=Generic FAX Resource for FAX technology resource modules ++ DEPENDS:= asterisk18 +asterisk18-res-timing-pthread ++endef ++ ++define Package/asterisk18-res-fax-spandsp ++$(call Package/asterisk18/Default) ++ TITLE:=Spandsp T.38 and G.711 FAX Resource ++ DEPENDS:= asterisk18 +asterisk18-res-fax +libspandsp ++endef ++ ++define Package/asterisk18-chan-mgcp ++$(call Package/asterisk18/Default) ++ TITLE:=MGCP channel support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-chan-mgcp/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_mgcp support to Asterisk. ++endef ++ ++define Package/asterisk18-chan-skinny ++$(call Package/asterisk18/Default) ++ TITLE:=Skinny channel support ++ DEPENDS:= asterisk18 ++endef ++ ++define Package/asterisk18-chan-skinny/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_skinny support to Asterisk. ++endef ++ ++define Package/asterisk18-curl ++$(call Package/asterisk18/Default) ++ TITLE:=CURL support ++ DEPENDS:= asterisk18 +libcurl ++endef ++ ++define Package/asterisk18-curl/description ++$(call Package/asterisk18/Default/description) ++ This package provides CURL ++ support to Asterisk. ++endef ++ ++define Package/asterisk18-mysql ++$(call Package/asterisk18/Default) ++ TITLE:=MySQL support ++ DEPENDS:= asterisk18 +PACKAGE_asterisk18-mysql:libmysqlclient ++endef ++ ++define Package/asterisk18-mysql/description ++$(call Package/asterisk18/Default/description) ++ This package provides MySQL ++ support to Asterisk. ++endef ++ ++define Package/asterisk18-chan-lantiq ++$(call Package/asterisk18/Default) ++ TITLE:=Lantiq TAPI support ++ DEPENDS:= asterisk18 $(LTQ_TAPI_DEPENDS) ++ URL:=http://git.nanl.de/?p=asterisk_channel_lantiq.git ++ MAINTAINER:=Mirko Vogt ++endef ++ ++define Package/asterisk18-chan-lantiq/description ++$(call Package/asterisk18/Default/description) ++ This package provides the channel chan_lantiq support to Asterisk. ++endef ++ ++define Package/asterisk18-odbc ++$(call Package/asterisk18/Default) ++ TITLE:=ODBC support ++ DEPENDS:= asterisk18 +libpthread +libc +unixodbc ++endef ++ ++define Package/asterisk18-odbc/description ++$(call Package/asterisk18/Default/description) ++ This package provides ODBC support for Asterisk. ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-app-meetme),) ++ CONFIGURE_ARGS+= \ ++ --with-dahdi="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-dahdi ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),) ++ CONFIGURE_ARGS+= \ ++ --with-gnutls="$(STAGING_DIR)/usr" \ ++ --with-iksemel="$(STAGING_DIR)/usr" ++ SITE_VARS+= \ ++ ac_cv_lib_iksemel_iks_start_sasl=yes \ ++ ac_cv_lib_gnutls_gnutls_bye=yes ++else ++ CONFIGURE_ARGS+= \ ++ --without-gnutls \ ++ --without-iksemel ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-curl),) ++ CONFIGURE_ARGS+= \ ++ --with-curl="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-curl ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mysql),) ++ CONFIGURE_ARGS+= \ ++ --with-mysqlclient="$(STAGING_DIR)/usr/bin" ++else ++ CONFIGURE_ARGS+= \ ++ --without-mysqlclient ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-res-fax-spandsp),) ++ CONFIGURE_ARGS+= \ ++ --with-spandsp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-spandsp ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-mobile),) ++ CONFIGURE_ARGS+= \ ++ --with-bluetooth="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-bluetooth ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-res-srtp),) ++ CONFIGURE_ARGS+= \ ++ --with-srtp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-srtp ++endif ++ ++CONFIGURE_ARGS+= \ ++ --without-curses \ ++ --with-gsm=internal \ ++ --without-cap \ ++ --without-gtk \ ++ --without-gtk2 \ ++ --without-isdnnet \ ++ --without-kde \ ++ --without-misdn \ ++ --without-nbs \ ++ --with-ncurses="$(STAGING_DIR)/usr" \ ++ --without-netsnmp \ ++ --without-newt \ ++ --without-ogg \ ++ --without-osptk \ ++ --with-popt="$(STAGING_DIR)/usr" \ ++ --without-pri \ ++ --without-qt \ ++ --without-radius \ ++ --without-sdl \ ++ --without-suppserv \ ++ --without-tds \ ++ --without-termcap \ ++ --without-tinfo \ ++ --without-vorbis \ ++ --without-vpb \ ++ --with-z="$(STAGING_DIR)/usr" \ ++ --with-sounds-cache="$(DL_DIR)" \ ++ --disable-xmldoc ++ ++EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ifneq ($(CONFIG_TARGET_lantiq),) ++ $(CP) ./src-lantiq/* $(PKG_BUILD_DIR)/ ++endif ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default,,$(SITE_VARS)) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ include/asterisk/version.h \ ++ include/asterisk/buildopts.h defaults.h \ ++ makeopts.embed_rules ++ ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" \ ++ ASTLDFLAGS="$(EXTRA_LDFLAGS)" \ ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ ASTVARLIBDIR="/usr/lib/asterisk" \ ++ ASTDATADIR="/usr/lib/asterisk" \ ++ ASTKEYDIR="/usr/lib/asterisk" \ ++ ASTDBDIR="/usr/lib/asterisk" \ ++ NOISY_BUILD="1" \ ++ DEBUG="" \ ++ OPTIMIZE="" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install samples ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/asterisk-1.8/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-1.8/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/ ++endef ++ ++define Package/asterisk18/conffiles ++/etc/asterisk/asterisk.conf ++/etc/asterisk/modules.conf ++/etc/asterisk/extensions.conf ++/etc/asterisk/sip.conf ++/etc/asterisk/sip_notify.conf ++/etc/asterisk/features.conf ++/etc/asterisk/indications.conf ++/etc/asterisk/logger.conf ++/etc/asterisk/manager.conf ++/etc/asterisk/rtp.conf ++/etc/default/asterisk ++/etc/init.d/asterisk ++endef ++ ++define Package/asterisk18/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ for f in asterisk extensions features \ ++ indications logger manager modules \ ++ sip sip_notify rtp; do \ ++ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \ ++ done ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ for f in app_dial app_echo app_playback app_macro \ ++ chan_sip res_rtp_asterisk res_rtp_multicast \ ++ codec_ulaw codec_gsm \ ++ format_gsm format_pcm format_wav format_wav_gsm \ ++ pbx_config \ ++ func_strings func_timeout func_callerid func_logic; do \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \ ++ done ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/default ++ $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk ++endef ++ ++define Package/asterisk18-sounds/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/ ++ rm -f $(1)/usr/lib/asterisk/sounds/vm-* ++ rm -f $(1)/usr/lib/asterisk/sounds/conf-* ++endef ++ ++ ++define Package/asterisk18-voicemail/conffiles ++/etc/asterisk/voicemail.conf ++endef ++ ++define Package/asterisk18-voicemail/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/voicemail.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ ++endef ++ ++define Package/asterisk18-app-meetme/conffiles ++/etc/asterisk/meetme.conf ++endef ++ ++define Package/asterisk18-app-meetme/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_dahdi.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/conf-*.gsm $(1)/usr/lib/asterisk/sounds/ ++endef ++ ++define Package/asterisk18-chan-iax2/conffiles ++/etc/asterisk/iax.conf ++/etc/asterisk/iaxprov.conf ++endef ++ ++define Package/asterisk18-cdr/conffiles ++/etc/asterisk/cdr.conf ++/etc/asterisk/cdr_custom.conf ++/etc/asterisk/cdr_manager.conf ++/etc/asterisk/cdr_odbc.conf ++/etc/asterisk/cdr_pgsql.conf ++/etc/asterisk/cdr_tds.conf ++endef ++ ++define Package/asterisk18-res-musiconhold/conffiles ++/etc/asterisk/musiconhold.conf ++endef ++ ++define Package/asterisk18-chan-iax2/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iax.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iaxprov.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_iax2.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-cdr/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr*.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*cdr*.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-musiconhold/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_musiconhold.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-gtalk/conffiles ++/etc/asterisk/gtalk.conf ++/etc/asterisk/jabber.conf ++endef ++ ++define Package/asterisk18-chan-gtalk/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/gtalk.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/jabber.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_gtalk.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_jabber.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-mobile/conffiles ++/etc/asterisk/chan_mobile.conf ++endef ++ ++define Package/asterisk18-chan-mobile/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/chan_mobile.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mobile.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-timing-timerfd/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_timerfd.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-timing-pthread/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_pthread.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-fax/conffiles ++/etc/asterisk/res_fax.conf ++endef ++ ++define Package/asterisk18-res-fax/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_fax.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-fax-spandsp/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax_spandsp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-mgcp/conffiles ++/etc/asterisk/mgcp.conf ++endef ++ ++define Package/asterisk18-chan-mgcp/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/mgcp.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mgcp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-skinny/conffiles ++/etc/asterisk/skinny.conf ++endef ++ ++define Package/asterisk18-chan-skinny/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/skinny.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-curl/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_curl.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-mysql/conffiles ++/etc/asterisk/app_mysql.conf ++/etc/asterisk/res_config_mysql.conf ++/etc/asterisk/cdr_mysql.conf ++endef ++ ++define Package/asterisk18-mysql/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/app_mysql.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_config_mysql.conf $(1)/etc/asterisk/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr_mysql.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_mysql.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/cdr_mysql.so $(1)/usr/lib/asterisk/modules/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-chan-lantiq/conffiles ++/etc/asterisk/lantiq.conf ++endef ++ ++define Package/asterisk18-chan-lantiq/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/lantiq.conf $(1)/etc/asterisk/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_lantiq.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-res-srtp/install ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk18-odbc/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/*odbc*.conf $(1)/etc/asterisk/ ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*odbc*.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Buildasterisk18ModuleTemplate ++ ++ define Package/asterisk18-$(subst _,-,$(1)) ++ $$(call Package/asterisk18/Default) ++ TITLE:=$(2) support ++ DEPENDS:= asterisk18 $(4) ++ endef ++ ++ define Package/asterisk18-$(subst _,-,$(1))/description ++ $$(call Package/asterisk18/Default/description) ++ This package provides support $(3) in Asterisk. ++ endef ++ ++ define Package/asterisk18-$(subst _,-,$(1))/install ++ $(INSTALL_DIR) $$(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$(1).so $$(1)/usr/lib/asterisk/modules/ ++ endef ++ ++ $$(eval $$(call BuildPackage,asterisk18-$(subst _,-,$(1)))) ++endef ++ ++$(eval $(call BuildPackage,asterisk18)) ++$(eval $(call BuildPackage,asterisk18-voicemail)) ++$(eval $(call BuildPackage,asterisk18-sounds)) ++#$(eval $(call BuildPackage,asterisk18-app-meetme)) ++$(eval $(call BuildPackage,asterisk18-chan-iax2)) ++$(eval $(call BuildPackage,asterisk18-cdr)) ++$(eval $(call BuildPackage,asterisk18-res-musiconhold)) ++$(eval $(call BuildPackage,asterisk18-chan-gtalk)) ++$(eval $(call BuildPackage,asterisk18-chan-mobile)) ++$(eval $(call BuildPackage,asterisk18-odbc)) ++$(eval $(call BuildPackage,asterisk18-res-fax)) ++$(eval $(call BuildPackage,asterisk18-res-fax-spandsp)) ++$(eval $(call BuildPackage,asterisk18-res-timing-timerfd)) ++$(eval $(call BuildPackage,asterisk18-res-timing-pthread)) ++$(eval $(call BuildPackage,asterisk18-chan-mgcp)) ++$(eval $(call BuildPackage,asterisk18-chan-skinny)) ++$(eval $(call BuildPackage,asterisk18-curl)) ++$(eval $(call BuildPackage,asterisk18-mysql)) ++$(eval $(call BuildPackage,asterisk18-chan-lantiq)) ++$(eval $(call BuildPackage,asterisk18-res-srtp)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_directed_pickup,Directed call pickup,support for directed call pickup)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_exec,Exec application,support for application execution)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail system)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_readexten,Extension to variable,a trivial application to read an extension into a variable)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_read,Variable read,a trivial application to read a variable)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_sayunixtime,Say Unix time,an application to say Unix time)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_sms,SMS,SMS support (ETSI ES 201 912 protocol 1))) ++$(eval $(call Buildasterisk18ModuleTemplate,app_stack,Stack applications, stack applications Gosub Return etc., +asterisk18-res-agi)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_system,System exec,support for executing system commands)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_talkdetect,File playback with audio detect,for file playback with audio detect)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_waituntil,Sleep,support sleeping until the given epoch)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_while,While loop,a while loop implementation)) ++$(eval $(call Buildasterisk18ModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel)) ++$(eval $(call Buildasterisk18ModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec)) ++$(eval $(call Buildasterisk18ModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_g726,G.726,support for headerless G.726 16/24/32/40kbps data format)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_g729,G.729,support for raw headerless G729 data)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_sln,Raw slinear format,support for raw slinear format)) ++$(eval $(call Buildasterisk18ModuleTemplate,format_sln16,Raw slinear 16 format,support for Raw slinear 16 format)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_db,Database interaction,functions for interaction with the database)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_devstate,Blinky lights control,functions for manually controlled blinky lights)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_vmcount,vmcount dialplan,a vmcount dialplan function)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_global,Global variable,global variable dialplan functions)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_shell,Shell,support for shell execution)) ++$(eval $(call Buildasterisk18ModuleTemplate,pbx_ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_ael_share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules)) ++$(eval $(call Buildasterisk18ModuleTemplate,pbx_spool,Call Spool,outgoing call spool support)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_crypto,Provide Crypto,Cryptographic Signature capability)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_setcallerid,Set callerid,support for setting callerid)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_verbose,Verbose logging,Verbose logging application)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_channel,Channel info,Channel info dialplan function)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_uri,URI encoding and decoding,Encodes and decodes URI-safe strings)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_disa,Direct Inward System Access,Direct Inward System Access)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_senddtmf,Send DTMF digits,Sends arbitrary DTMF digits)) ++$(eval $(call Buildasterisk18ModuleTemplate,func_cut,CUT function,CUT function)) ++$(eval $(call Buildasterisk18ModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_playtones,Playtones application,play a tone list)) ++$(eval $(call Buildasterisk18ModuleTemplate,app_record,Record sound file,to record a sound file)) +diff --git a/feeds/packages/net/asterisk-1.8.x/files/.svn/entries b/feeds/packages/net/asterisk-1.8.x/files/.svn/entries +new file mode 100644 +index 0000000..2fb67c8 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-1.8.x/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-15T10:18:49.790487Z ++25545 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++asterisk.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++078afffcdf30e3859cd65dfbdbeba509 ++2011-02-15T10:18:49.790487Z ++25545 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++700 ++ ++asterisk.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++beb679feb84cfd71b41819f658c73f05 ++2011-02-15T10:18:49.790487Z ++25545 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++78 ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/files/.svn/text-base/asterisk.default.svn-base b/feeds/packages/net/asterisk-1.8.x/files/.svn/text-base/asterisk.default.svn-base +new file mode 100644 +index 0000000..9d046c4 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/files/.svn/text-base/asterisk.default.svn-base +@@ -0,0 +1,4 @@ ++## startup options for /etc/init.d/asterisk ++ ++ENABLE_ASTERISK="yes" ++OPTIONS="" +diff --git a/feeds/packages/net/asterisk-1.8.x/files/.svn/text-base/asterisk.init.svn-base b/feeds/packages/net/asterisk-1.8.x/files/.svn/text-base/asterisk.init.svn-base +new file mode 100644 +index 0000000..53bf4af +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/files/.svn/text-base/asterisk.init.svn-base +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++START=50 ++ ++DEST= ++DEFAULT=$DEST/etc/default/asterisk ++OPTIONS="" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ [ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk ++ [ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk ++ [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk ++ [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk ++ [ -h $DEST/usr/lib/asterisk/astdb ] || ln -sf /var/spool/asterisk/astdb $DEST/usr/lib/asterisk/astdb ++ $DEST/usr/sbin/asterisk $OPTIONS ++} ++ ++stop() { ++ [ -f $DEST/var/run/asterisk/asterisk.pid ] && kill $(cat $DEST/var/run/asterisk/asterisk.pid) >/dev/null 2>&1 ++} +diff --git a/feeds/packages/net/asterisk-1.8.x/files/asterisk.default b/feeds/packages/net/asterisk-1.8.x/files/asterisk.default +new file mode 100644 +index 0000000..9d046c4 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/files/asterisk.default +@@ -0,0 +1,4 @@ ++## startup options for /etc/init.d/asterisk ++ ++ENABLE_ASTERISK="yes" ++OPTIONS="" +diff --git a/feeds/packages/net/asterisk-1.8.x/files/asterisk.init b/feeds/packages/net/asterisk-1.8.x/files/asterisk.init +new file mode 100644 +index 0000000..53bf4af +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/files/asterisk.init +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++START=50 ++ ++DEST= ++DEFAULT=$DEST/etc/default/asterisk ++OPTIONS="" ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ [ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk ++ [ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk ++ [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk ++ [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk ++ [ -h $DEST/usr/lib/asterisk/astdb ] || ln -sf /var/spool/asterisk/astdb $DEST/usr/lib/asterisk/astdb ++ $DEST/usr/sbin/asterisk $OPTIONS ++} ++ ++stop() { ++ [ -f $DEST/var/run/asterisk/asterisk.pid ] && kill $(cat $DEST/var/run/asterisk/asterisk.pid) >/dev/null 2>&1 ++} +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/.svn/entries b/feeds/packages/net/asterisk-1.8.x/patches/.svn/entries +new file mode 100644 +index 0000000..6fef534 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-1.8.x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-25T13:37:04.438633Z ++33541 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-build_tools-iconv.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++26d9fdfb1124537d4b84c2a30d1e790b ++2011-08-22T11:26:02.114433Z ++28072 ++zandbelt ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++254 ++ ++500-nres.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++ab75ef7f4a177b63da65edf810c9ca9e ++2012-03-11T19:25:48.323468Z ++30891 ++zandbelt ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++451 ++ ++200-addons-defaultenable.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++cc1612390901af9384c69b530f5c8bf7 ++2012-03-11T19:25:48.323468Z ++30891 ++zandbelt ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1809 ++ ++600-CVE-2012-2186.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++090afd4377bdcda948735f0bdf293117 ++2012-09-25T13:37:04.438633Z ++33541 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++549 ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/100-build_tools-iconv.patch.svn-base b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/100-build_tools-iconv.patch.svn-base +new file mode 100644 +index 0000000..d3cad82 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/100-build_tools-iconv.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/build_tools/menuselect-deps.in +++++ b/build_tools/menuselect-deps.in ++@@ -16,7 +16,7 @@ GTK2=@PBX_GTK2@ ++ H323=@PBX_H323@ ++ HOARD=@PBX_HOARD@ ++ ICAL=@PBX_ICAL@ ++-ICONV=@PBX_ICONV@ +++ICONV=0 ++ IKSEMEL=@PBX_IKSEMEL@ ++ IMAP_TK=@PBX_IMAP_TK@ ++ IODBC=@PBX_IODBC@ +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/200-addons-defaultenable.patch.svn-base b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/200-addons-defaultenable.patch.svn-base +new file mode 100644 +index 0000000..65b9e79 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/200-addons-defaultenable.patch.svn-base +@@ -0,0 +1,77 @@ ++--- a/addons/app_mysql.c +++++ b/addons/app_mysql.c ++@@ -25,7 +25,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ deprecated ++ func_odbc ++ ***/ ++--- a/addons/app_saycountpl.c +++++ b/addons/app_saycountpl.c ++@@ -21,7 +21,7 @@ ++ */ ++ ++ /*** MODULEINFO ++- no +++ yes ++ deprecated ++ say.conf ++ ***/ ++--- a/addons/cdr_mysql.c +++++ b/addons/cdr_mysql.c ++@@ -35,7 +35,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ deprecated ++ cdr_adaptive_odbc ++ ***/ ++--- a/addons/chan_mobile.c +++++ b/addons/chan_mobile.c ++@@ -27,7 +27,7 @@ ++ ++ /*** MODULEINFO ++ bluetooth ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/addons/chan_ooh323.c +++++ b/addons/chan_ooh323.c ++@@ -18,7 +18,7 @@ ++ ++ ++ /*** MODULEINFO ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/addons/res_config_mysql.c +++++ b/addons/res_config_mysql.c ++@@ -24,7 +24,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/res/res_pktccops.c +++++ b/res/res_pktccops.c ++@@ -31,7 +31,7 @@ ++ */ ++ ++ /*** MODULEINFO ++- no +++ yes ++ extended ++ ***/ ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/500-nres.patch.svn-base b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/500-nres.patch.svn-base +new file mode 100644 +index 0000000..1d030b5 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/500-nres.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -16784,7 +16784,7 @@ if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++ $as_echo "yes" >&6; } ++ ++-$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h +++$as_echo "//#define HAVE_RES_NINIT 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5 ++ $as_echo_n "checking for library containing res_9_ndestroy... " >&6; } +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/600-CVE-2012-2186.patch.svn-base b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/600-CVE-2012-2186.patch.svn-base +new file mode 100644 +index 0000000..dbe790b +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/.svn/text-base/600-CVE-2012-2186.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/main/manager.c +++++ b/main/manager.c ++@@ -4020,6 +4020,7 @@ static int action_originate(struct manse ++ TryExec(System(rm -rf /)) */ ++ strcasestr(app, "agi") || /* AGI(/bin/rm,-rf /) ++ EAGI(/bin/rm,-rf /) */ +++ strcasestr(app, "externalivr") || /* ExternalIVR(rm -rf) */ ++ strstr(appdata, "SHELL") || /* NoOp(${SHELL(rm -rf /)}) */ ++ strstr(appdata, "EVAL") /* NoOp(${EVAL(${some_var_containing_SHELL})}) */ ++ )) { +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch b/feeds/packages/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch +new file mode 100644 +index 0000000..d3cad82 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch +@@ -0,0 +1,11 @@ ++--- a/build_tools/menuselect-deps.in +++++ b/build_tools/menuselect-deps.in ++@@ -16,7 +16,7 @@ GTK2=@PBX_GTK2@ ++ H323=@PBX_H323@ ++ HOARD=@PBX_HOARD@ ++ ICAL=@PBX_ICAL@ ++-ICONV=@PBX_ICONV@ +++ICONV=0 ++ IKSEMEL=@PBX_IKSEMEL@ ++ IMAP_TK=@PBX_IMAP_TK@ ++ IODBC=@PBX_IODBC@ +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch b/feeds/packages/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch +new file mode 100644 +index 0000000..65b9e79 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch +@@ -0,0 +1,77 @@ ++--- a/addons/app_mysql.c +++++ b/addons/app_mysql.c ++@@ -25,7 +25,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ deprecated ++ func_odbc ++ ***/ ++--- a/addons/app_saycountpl.c +++++ b/addons/app_saycountpl.c ++@@ -21,7 +21,7 @@ ++ */ ++ ++ /*** MODULEINFO ++- no +++ yes ++ deprecated ++ say.conf ++ ***/ ++--- a/addons/cdr_mysql.c +++++ b/addons/cdr_mysql.c ++@@ -35,7 +35,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ deprecated ++ cdr_adaptive_odbc ++ ***/ ++--- a/addons/chan_mobile.c +++++ b/addons/chan_mobile.c ++@@ -27,7 +27,7 @@ ++ ++ /*** MODULEINFO ++ bluetooth ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/addons/chan_ooh323.c +++++ b/addons/chan_ooh323.c ++@@ -18,7 +18,7 @@ ++ ++ ++ /*** MODULEINFO ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/addons/res_config_mysql.c +++++ b/addons/res_config_mysql.c ++@@ -24,7 +24,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/res/res_pktccops.c +++++ b/res/res_pktccops.c ++@@ -31,7 +31,7 @@ ++ */ ++ ++ /*** MODULEINFO ++- no +++ yes ++ extended ++ ***/ ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/500-nres.patch b/feeds/packages/net/asterisk-1.8.x/patches/500-nres.patch +new file mode 100644 +index 0000000..1d030b5 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/500-nres.patch +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -16784,7 +16784,7 @@ if ac_fn_c_try_link "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++ $as_echo "yes" >&6; } ++ ++-$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h +++$as_echo "//#define HAVE_RES_NINIT 1" >>confdefs.h ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5 ++ $as_echo_n "checking for library containing res_9_ndestroy... " >&6; } +diff --git a/feeds/packages/net/asterisk-1.8.x/patches/600-CVE-2012-2186.patch b/feeds/packages/net/asterisk-1.8.x/patches/600-CVE-2012-2186.patch +new file mode 100644 +index 0000000..dbe790b +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/patches/600-CVE-2012-2186.patch +@@ -0,0 +1,10 @@ ++--- a/main/manager.c +++++ b/main/manager.c ++@@ -4020,6 +4020,7 @@ static int action_originate(struct manse ++ TryExec(System(rm -rf /)) */ ++ strcasestr(app, "agi") || /* AGI(/bin/rm,-rf /) ++ EAGI(/bin/rm,-rf /) */ +++ strcasestr(app, "externalivr") || /* ExternalIVR(rm -rf) */ ++ strstr(appdata, "SHELL") || /* NoOp(${SHELL(rm -rf /)}) */ ++ strstr(appdata, "EVAL") /* NoOp(${EVAL(${some_var_containing_SHELL})}) */ ++ )) { +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/.svn/entries b/feeds/packages/net/asterisk-1.8.x/src-lantiq/.svn/entries +new file mode 100644 +index 0000000..816b5eb +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-1.8.x/src-lantiq ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-08T14:50:56.209630Z ++34121 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++configs ++dir ++ ++channels ++dir ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/.svn/entries b/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/.svn/entries +new file mode 100644 +index 0000000..335423f +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-1.8.x/src-lantiq/channels ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-08T14:50:56.209630Z ++34121 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++chan_lantiq.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++08f87531c01b991ff7ec01c9c4b56389 ++2012-11-08T14:50:56.209630Z ++34121 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++47965 ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/.svn/text-base/chan_lantiq.c.svn-base b/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/.svn/text-base/chan_lantiq.c.svn-base +new file mode 100644 +index 0000000..6e2b502 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/.svn/text-base/chan_lantiq.c.svn-base +@@ -0,0 +1,1679 @@ ++/* ++ * Asterisk -- An open source telephony toolkit. ++ * ++ * Copyright (C) 2012, Luka Perkov ++ * Copyright (C) 2012, John Crispin ++ * Copyright (C) 2012, Andrej VlaÅ¡ić ++ * Copyright (C) 2012, Kaspar Schleiser for T-Labs ++ * (Deutsche Telekom Innovation Laboratories) ++ * Copyright (C) 2012, Mirko Vogt for T-Labs ++ * (Deutsche Telekom Innovation Laboratories) ++ * ++ * Luka Perkov ++ * John Crispin ++ * Andrej VlaÅ¡ić ++ * Kaspar Schleiser ++ * Mirko Vogt ++ * ++ * See http://www.asterisk.org for more information about ++ * the Asterisk project. Please do not directly contact ++ * any of the maintainers of this project for assistance; ++ * the project provides a web site, mailing lists and IRC ++ * channels for your use. ++ * ++ * This program is free software, distributed under the terms of ++ * the GNU General Public License Version 2. See the LICENSE file ++ * at the top of the source tree. ++ */ ++ ++/*! \file ++ * ++ * \brief Asterisk channel line driver for Lantiq based TAPI boards ++ * ++ * \author Luka Perkov ++ * \author John Crispin ++ * \author Andrej VlaÅ¡ić ++ * \author Kaspar Schleiser ++ * \author Mirko Vogt ++ * ++ * \ingroup channel_drivers ++ */ ++ ++#include "asterisk.h" ++ ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: xxx $") ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef HAVE_LINUX_COMPILER_H ++#include ++#endif ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Lantiq TAPI includes */ ++#include ++#include ++ ++#define RTP_HEADER_LEN 12 ++ ++#define TAPI_AUDIO_PORT_NUM_MAX 2 ++#define TAPI_TONE_LOCALE_NONE 0 ++#define TAPI_TONE_LOCALE_RINGING_CODE 26 ++#define TAPI_TONE_LOCALE_BUSY_CODE 27 ++#define TAPI_TONE_LOCALE_CONGESTION_CODE 27 ++#define TAPI_TONE_LOCALE_DIAL_CODE 25 ++#define TAPI_TONE_LOCALE_WAITING_CODE 37 ++ ++#define LANTIQ_CONTEXT_PREFIX "lantiq" ++ ++static const char config[] = "lantiq.conf"; ++ ++static char firmware_filename[PATH_MAX] = "/lib/firmware/ifx_firmware.bin"; ++static char bbd_filename[PATH_MAX] = "/lib/firmware/ifx_bbd_fxs.bin"; ++static char base_path[PATH_MAX] = "/dev/vmmc"; ++static int per_channel_context = 0; ++ ++/* ++ * The private structures of the Phone Jack channels are linked for selecting ++ * outgoing channels. ++ */ ++enum channel_state { ++ ONHOOK, ++ OFFHOOK, ++ DIALING, ++ INCALL, ++ CALL_ENDED, ++ RINGING, ++ UNKNOWN ++}; ++ ++static struct lantiq_pvt { ++ struct ast_channel *owner; /* Channel we belong to, possibly NULL */ ++ int port_id; /* Port number of this object, 0..n */ ++ int channel_state; ++ char context[AST_MAX_CONTEXT]; /* this port's dialplan context */ ++ char ext[AST_MAX_EXTENSION+1]; /* the extension this port is connecting */ ++ int dial_timer; /* timer handle for autodial timeout */ ++ char dtmfbuf[AST_MAX_EXTENSION+1]; /* buffer holding dialed digits */ ++ int dtmfbuf_len; /* lenght of dtmfbuf */ ++ int rtp_timestamp; /* timestamp for RTP packets */ ++ uint16_t rtp_seqno; /* Sequence nr for RTP packets */ ++ uint32_t call_setup_start; /* Start of dialling in ms */ ++ uint32_t call_setup_delay; /* time between ^ and 1st ring in ms */ ++ uint16_t jb_size; /* Jitter buffer size */ ++ uint32_t jb_underflow; /* Jitter buffer injected samples */ ++ uint32_t jb_overflow; /* Jitter buffer dropped samples */ ++ uint16_t jb_delay; /* Jitter buffer: playout delay */ ++ uint16_t jb_invalid; /* Jitter buffer: Nr. of invalid packets */ ++ ++} *iflist = NULL; ++ ++static struct lantiq_ctx { ++ int dev_fd; ++ int channels; ++ int ch_fd[TAPI_AUDIO_PORT_NUM_MAX]; ++} dev_ctx; ++ ++static int ast_digit_begin(struct ast_channel *ast, char digit); ++static int ast_digit_end(struct ast_channel *ast, char digit, unsigned int duration); ++static int ast_lantiq_call(struct ast_channel *ast, char *dest, int timeout); ++static int ast_lantiq_hangup(struct ast_channel *ast); ++static int ast_lantiq_answer(struct ast_channel *ast); ++static struct ast_frame *ast_lantiq_read(struct ast_channel *ast); ++static int ast_lantiq_write(struct ast_channel *ast, struct ast_frame *frame); ++static struct ast_frame *ast_lantiq_exception(struct ast_channel *ast); ++static int ast_lantiq_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen); ++static int ast_lantiq_fixup(struct ast_channel *old, struct ast_channel *new); ++static struct ast_channel *ast_lantiq_requester(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause); ++static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *args, char *buf, size_t buflen); ++static void lantiq_jb_get_stats(int c); ++ ++static const struct ast_channel_tech lantiq_tech = { ++ .type = "TAPI", ++ .description = "Lantiq TAPI Telephony API Driver", ++ .capabilities = AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW | AST_FORMAT_G729A, ++ .send_digit_begin = ast_digit_begin, ++ .send_digit_end = ast_digit_end, ++ .call = ast_lantiq_call, ++ .hangup = ast_lantiq_hangup, ++ .answer = ast_lantiq_answer, ++ .read = ast_lantiq_read, ++ .write = ast_lantiq_write, ++ .exception = ast_lantiq_exception, ++ .indicate = ast_lantiq_indicate, ++ .fixup = ast_lantiq_fixup, ++ .requester = ast_lantiq_requester, ++ .func_channel_read = acf_channel_read ++}; ++ ++/* Protect the interface list (of lantiq_pvt's) */ ++AST_MUTEX_DEFINE_STATIC(iflock); ++ ++/* ++ * Protect the monitoring thread, so only one process can kill or start it, and ++ * not when it's doing something critical. ++ */ ++AST_MUTEX_DEFINE_STATIC(monlock); ++ ++/* Boolean value whether the monitoring thread shall continue. */ ++static unsigned int monitor; ++ ++/* The scheduling thread */ ++struct ast_sched_thread *sched_thread; ++ ++/* ++ * This is the thread for the monitor which checks for input on the channels ++ * which are not currently in use. ++ */ ++static pthread_t monitor_thread = AST_PTHREADT_NULL; ++ ++ ++#define WORDS_BIGENDIAN ++/* struct taken from some GPLed code by Mike Borella */ ++typedef struct rtp_header ++{ ++#if defined(WORDS_BIGENDIAN) ++ uint8_t version:2, padding:1, extension:1, csrc_count:4; ++#else ++ uint8_t csrc_count:4, extension:1, padding:1, version:2; ++#endif ++#if defined(WORDS_BIGENDIAN) ++ uint8_t marker:1, payload_type:7; ++#else ++ uint8_t payload_type:7, marker:1; ++#endif ++ uint16_t seqno; ++ uint32_t timestamp; ++ uint32_t ssrc; ++} rtp_header_t; ++ ++static uint32_t now(void) { ++ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ++ ++ uint64_t tmp = ts.tv_sec*1000 + (ts.tv_nsec/1000000); ++ return (uint32_t) tmp; ++} ++ ++static int lantiq_dev_open(const char *dev_path, const int32_t ch_num) ++{ ++ char dev_name[PATH_MAX]; ++ memset(dev_name, 0, sizeof(dev_name)); ++ snprintf(dev_name, PATH_MAX, "%s%u%u", dev_path, 1, ch_num); ++ return open((const char*)dev_name, O_RDWR, 0644); ++} ++ ++static void lantiq_ring(int c, int r, const char *cid) ++{ ++ uint8_t status; ++ ++ if (r) { ++ if (!cid) { ++ status = (uint8_t) ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_START, 0); ++ } else { ++ IFX_TAPI_CID_MSG_t msg; ++ IFX_TAPI_CID_MSG_STRING_t cid_el; ++ ++ memset(&msg, 0, sizeof(msg)); ++ memset(&cid_el, 0, sizeof(cid_el)); ++ ++ cid_el.elementType = IFX_TAPI_CID_ST_CLI; ++ cid_el.len = strlen(cid); ++ strncpy((char*)cid_el.element, cid, (size_t)cid_el.len); ++ ++ msg.txMode = IFX_TAPI_CID_HM_ONHOOK; ++ msg.messageType = IFX_TAPI_CID_MT_CSUP; ++ msg.message = (IFX_TAPI_CID_MSG_ELEMENT_t *)&cid_el; ++ msg.nMsgElements = 1; ++ ++ status = (uint8_t) ioctl(dev_ctx.ch_fd[c], IFX_TAPI_CID_TX_SEQ_START, (IFX_int32_t) &msg); ++ } ++ } else { ++ status = (uint8_t) ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_STOP, 0); ++ } ++ ++ if (status) { ++ ast_log(LOG_ERROR, "%s ioctl failed\n", ++ (r ? "IFX_TAPI_RING_START" : "IFX_TAPI_RING_STOP")); ++ } ++} ++ ++static int lantiq_play_tone(int c, int t) ++{ ++ /* stop currently playing tone before starting new one */ ++ if (t != TAPI_TONE_LOCALE_NONE) { ++ ioctl(dev_ctx.ch_fd[c], IFX_TAPI_TONE_LOCAL_PLAY, TAPI_TONE_LOCALE_NONE); ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_TONE_LOCAL_PLAY, t)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_TONE_LOCAL_PLAY ioctl failed\n"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static enum channel_state lantiq_get_hookstatus(int port) ++{ ++ uint8_t status; ++ ++ if (ioctl(dev_ctx.ch_fd[port], IFX_TAPI_LINE_HOOK_STATUS_GET, &status)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_STATUS_GET ioctl failed\n"); ++ return UNKNOWN; ++ } ++ ++ if (status) { ++ return OFFHOOK; ++ } else { ++ return ONHOOK; ++ } ++} ++ ++static int ++lantiq_dev_binary_buffer_create(const char *path, uint8_t **ppBuf, uint32_t *pBufSz) ++{ ++ FILE *fd; ++ struct stat file_stat; ++ int32_t status = 0; ++ ++ fd = fopen(path, "rb"); ++ if (fd == NULL) { ++ ast_log(LOG_ERROR, "binary file %s open failed\n", path); ++ return -1; ++ } ++ ++ if (stat(path, &file_stat)) { ++ ast_log(LOG_ERROR, "file %s statistics get failed\n", path); ++ return -1; ++ } ++ ++ *ppBuf = malloc(file_stat.st_size); ++ if (*ppBuf == NULL) { ++ ast_log(LOG_ERROR, "binary file %s memory allocation failed\n", path); ++ status = -1; ++ goto on_exit; ++ } ++ ++ if (fread (*ppBuf, sizeof(uint8_t), file_stat.st_size, fd) <= 0) { ++ ast_log(LOG_ERROR, "file %s read failed\n", path); ++ status = -1; ++ goto on_exit; ++ } ++ ++ *pBufSz = file_stat.st_size; ++ ++on_exit: ++ if (fd != NULL) ++ fclose(fd); ++ ++ if (*ppBuf != NULL && status) ++ free(*ppBuf); ++ ++ return status; ++} ++ ++static int32_t lantiq_dev_firmware_download(int32_t fd, const char *path) ++{ ++ uint8_t *firmware = NULL; ++ uint32_t size = 0; ++ VMMC_IO_INIT vmmc_io_init; ++ ++ ast_log(LOG_DEBUG, "loading firmware: \"%s\".", path); ++ ++ if (lantiq_dev_binary_buffer_create(path, &firmware, &size)) ++ return -1; ++ ++ memset(&vmmc_io_init, 0, sizeof(VMMC_IO_INIT)); ++ vmmc_io_init.pPRAMfw = firmware; ++ vmmc_io_init.pram_size = size; ++ ++ if (ioctl(fd, FIO_FW_DOWNLOAD, &vmmc_io_init)) { ++ ast_log(LOG_ERROR, "FIO_FW_DOWNLOAD ioctl failed\n"); ++ return -1; ++ } ++ ++ if (firmware != NULL) ++ free(firmware); ++ ++ return 0; ++} ++ ++static const char *state_string(enum channel_state s) ++{ ++ switch (s) { ++ case ONHOOK: return "ONHOOK"; ++ case OFFHOOK: return "OFFHOOK"; ++ case DIALING: return "DIALING"; ++ case INCALL: return "INCALL"; ++ case CALL_ENDED: return "CALL_ENDED"; ++ case RINGING: return "RINGING"; ++ default: return "UNKNOWN"; ++ } ++} ++ ++static const char *control_string(int c) ++{ ++ switch (c) { ++ case AST_CONTROL_HANGUP: return "Other end has hungup"; ++ case AST_CONTROL_RING: return "Local ring"; ++ case AST_CONTROL_RINGING: return "Remote end is ringing"; ++ case AST_CONTROL_ANSWER: return "Remote end has answered"; ++ case AST_CONTROL_BUSY: return "Remote end is busy"; ++ case AST_CONTROL_TAKEOFFHOOK: return "Make it go off hook"; ++ case AST_CONTROL_OFFHOOK: return "Line is off hook"; ++ case AST_CONTROL_CONGESTION: return "Congestion (circuits busy)"; ++ case AST_CONTROL_FLASH: return "Flash hook"; ++ case AST_CONTROL_WINK: return "Wink"; ++ case AST_CONTROL_OPTION: return "Set a low-level option"; ++ case AST_CONTROL_RADIO_KEY: return "Key Radio"; ++ case AST_CONTROL_RADIO_UNKEY: return "Un-Key Radio"; ++ case AST_CONTROL_PROGRESS: return "Remote end is making Progress"; ++ case AST_CONTROL_PROCEEDING: return "Remote end is proceeding"; ++ case AST_CONTROL_HOLD: return "Hold"; ++ case AST_CONTROL_UNHOLD: return "Unhold"; ++ case AST_CONTROL_SRCUPDATE: return "Media Source Update"; ++ case AST_CONTROL_CONNECTED_LINE: return "Connected Line"; ++ case AST_CONTROL_REDIRECTING: return "Redirecting"; ++ case AST_CONTROL_INCOMPLETE: return "Incomplete"; ++ case -1: return "Stop tone"; ++ default: return "Unknown"; ++ } ++} ++ ++static int ast_lantiq_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen) ++{ ++ ast_verb(3, "phone indication \"%s\"\n", control_string(condition)); ++ ++ struct lantiq_pvt *pvt = chan->tech_pvt; ++ ++ switch (condition) { ++ case -1: ++ { ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_NONE); ++ return 0; ++ } ++ case AST_CONTROL_CONGESTION: ++ case AST_CONTROL_BUSY: ++ { ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_BUSY_CODE); ++ return 0; ++ } ++ case AST_CONTROL_RINGING: ++ { ++ pvt->call_setup_delay = now() - pvt->call_setup_start; ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_RINGING_CODE); ++ return 0; ++ } ++ default: ++ { ++ /* -1 lets asterisk generate the tone */ ++ return -1; ++ } ++ } ++} ++ ++static int ast_lantiq_fixup(struct ast_channel *old, struct ast_channel *new) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static int ast_digit_begin(struct ast_channel *chan, char digit) ++{ ++ /* TODO: Modify this callback to let Asterisk support controlling the length of DTMF */ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static int ast_digit_end(struct ast_channel *ast, char digit, unsigned int duration) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static int ast_lantiq_call(struct ast_channel *ast, char *dest, int timeout) ++{ ++ /* lock to prevent simultaneous access with do_monitor thread processing */ ++ ast_mutex_lock(&iflock); ++ ++ struct lantiq_pvt *pvt = ast->tech_pvt; ++ ast_log(LOG_DEBUG, "state: %s\n", state_string(pvt->channel_state)); ++ ++ if (pvt->channel_state == ONHOOK) { ++ ast_log(LOG_DEBUG, "port %i is ringing\n", pvt->port_id); ++ ++ char *cid = ast->connected.id.number.valid ? ast->connected.id.number.str : NULL; ++ ast_log(LOG_DEBUG, "port %i CID: %s\n", pvt->port_id, cid ? cid : "none"); ++ ++ lantiq_ring(pvt->port_id, 1, cid); ++ pvt->channel_state = RINGING; ++ ++ ast_setstate(ast, AST_STATE_RINGING); ++ ast_queue_control(ast, AST_CONTROL_RINGING); ++ } else { ++ ast_log(LOG_DEBUG, "port %i is busy\n", pvt->port_id); ++ ast_setstate(ast, AST_STATE_BUSY); ++ ast_queue_control(ast, AST_CONTROL_BUSY); ++ } ++ ++ ast_mutex_unlock(&iflock); ++ ++ return 0; ++} ++ ++static int ast_lantiq_hangup(struct ast_channel *ast) ++{ ++ /* lock to prevent simultaneous access with do_monitor thread processing */ ++ ast_mutex_lock(&iflock); ++ ++ struct lantiq_pvt *pvt = ast->tech_pvt; ++ ast_log(LOG_DEBUG, "state: %s\n", state_string(pvt->channel_state)); ++ ++ if (ast->_state == AST_STATE_RINGING) { ++ // FIXME ++ ast_debug(1, "TAPI: ast_lantiq_hangup(): ast->_state == AST_STATE_RINGING\n"); ++ } ++ ++ switch (pvt->channel_state) { ++ case RINGING: ++ case ONHOOK: ++ lantiq_ring(pvt->port_id, 0, NULL); ++ pvt->channel_state = ONHOOK; ++ break; ++ default: ++ ast_log(LOG_DEBUG, "we were hung up, play busy tone\n"); ++ pvt->channel_state = CALL_ENDED; ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_BUSY_CODE); ++ } ++ ++ lantiq_jb_get_stats(pvt->port_id); ++ ++ ast_setstate(ast, AST_STATE_DOWN); ++ ast_module_unref(ast_module_info->self); ++ ast->tech_pvt = NULL; ++ pvt->owner = NULL; ++ ++ ast_mutex_unlock(&iflock); ++ ++ return 0; ++} ++ ++static int ast_lantiq_answer(struct ast_channel *ast) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static struct ast_frame * ast_lantiq_read(struct ast_channel *ast) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return NULL; ++} ++ ++static int ast_lantiq_write(struct ast_channel *ast, struct ast_frame *frame) ++{ ++ char buf[2048]; ++ struct lantiq_pvt *pvt = ast->tech_pvt; ++ int ret = -1; ++ rtp_header_t *rtp_header = (rtp_header_t *) buf; ++ ++ if(frame->frametype != AST_FRAME_VOICE) { ++ ast_log(LOG_DEBUG, "unhandled frame type\n"); ++ return 0; ++ } ++ ++ if (frame->datalen == 0) { ++ ast_log(LOG_DEBUG, "we've been prodded\n"); ++ return 0; ++ } ++ ++ memset(buf, 0, sizeof(rtp_header_t)); ++ rtp_header->version = 2; ++ rtp_header->padding = 0; ++ rtp_header->extension = 0; ++ rtp_header->csrc_count = 0; ++ rtp_header->marker = 0; ++ rtp_header->timestamp = pvt->rtp_timestamp; ++ rtp_header->seqno = pvt->rtp_seqno++; ++ rtp_header->ssrc = 0; ++ rtp_header->payload_type = (uint8_t) frame->subclass.codec; ++ ++ pvt->rtp_timestamp += 160; ++ ++ memcpy(buf+RTP_HEADER_LEN, frame->data.ptr, frame->datalen); ++ ++ ret = write(dev_ctx.ch_fd[pvt->port_id], buf, frame->datalen+RTP_HEADER_LEN); ++ if (ret <= 0) { ++ ast_debug(1, "TAPI: ast_lantiq_write(): error writing.\n"); ++ return -1; ++ } ++ ++#ifdef TODO_DEVEL_INFO ++ ast_debug(1, "ast_lantiq_write(): size: %i version: %i padding: %i extension: %i csrc_count: %i\n" ++ "marker: %i payload_type: %s seqno: %i timestamp: %i ssrc: %i\n", ++ (int)ret, ++ (int)rtp_header->version, ++ (int)rtp_header->padding, ++ (int)rtp_header->extension, ++ (int)rtp_header->csrc_count, ++ (int)rtp_header->marker, ++ ast_codec2str(rtp_header->payload_type), ++ (int)rtp_header->seqno, ++ (int)rtp_header->timestamp, ++ (int)rtp_header->ssrc); ++#endif ++ ++ return 0; ++} ++ ++static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *args, char *buf, size_t buflen) ++{ ++ struct lantiq_pvt *pvt; ++ int res = 0; ++ ++ if (!chan || chan->tech != &lantiq_tech) { ++ ast_log(LOG_ERROR, "This function requires a valid Lantiq TAPI channel\n"); ++ return -1; ++ } ++ ++ ast_mutex_lock(&iflock); ++ ++ pvt = (struct lantiq_pvt*) chan->tech_pvt; ++ ++ if (!strcasecmp(args, "csd")) { ++ snprintf(buf, buflen, "%lu", (unsigned long int) pvt->call_setup_delay); ++ } else if (!strcasecmp(args, "jitter_stats")){ ++ lantiq_jb_get_stats(pvt->port_id); ++ snprintf(buf, buflen, "jbBufSize=%u,jbUnderflow=%u,jbOverflow=%u,jbDelay=%u,jbInvalid=%u", ++ (uint32_t) pvt->jb_size, ++ (uint32_t) pvt->jb_underflow, ++ (uint32_t) pvt->jb_overflow, ++ (uint32_t) pvt->jb_delay, ++ (uint32_t) pvt->jb_invalid); ++ } else { ++ res = -1; ++ } ++ ++ ast_mutex_unlock(&iflock); ++ ++ return res; ++} ++ ++ ++static struct ast_frame * ast_lantiq_exception(struct ast_channel *ast) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return NULL; ++} ++ ++static void lantiq_jb_get_stats(int c) { ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ IFX_TAPI_JB_STATISTICS_t param; ++ memset (¶m, 0, sizeof (param)); ++ if (ioctl (dev_ctx.ch_fd[c], IFX_TAPI_JB_STATISTICS_GET, (IFX_int32_t) ¶m) != IFX_SUCCESS) { ++ ast_debug(1, "Error getting jitter buffer stats.\n"); ++ } else { ++#if !defined (TAPI_VERSION3) && defined (TAPI_VERSION4) ++ ast_debug(1, "Jitter buffer stats: dev=%u, ch=%u, nType=%u, nBufSize=%u, nIsUnderflow=%u, nDsOverflow=%u, nPODelay=%u, nInvalid=%u", ++ (uint32_t) param.dev, ++ (uint32_t) param.ch, ++#else ++ ast_debug(1, "Jitter buffer stats: nType=%u, nBufSize=%u, nIsUnderflow=%u, nDsOverflow=%u, nPODelay=%u, nInvalid=%u", ++#endif ++ (uint32_t) param.nType, ++ (uint32_t) param.nBufSize, ++ (uint32_t) param.nIsUnderflow, ++ (uint32_t) param.nDsOverflow, ++ (uint32_t) param.nPODelay, ++ (uint32_t) param.nInvalid); ++ ++ pvt->jb_size = param.nBufSize; ++ pvt->jb_underflow = param.nIsUnderflow; ++ pvt->jb_overflow = param.nDsOverflow; ++ pvt->jb_invalid = param.nInvalid; ++ pvt->jb_delay = param.nPODelay; ++ } ++} ++ ++ ++static int lantiq_standby(int c) ++{ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_STANDBY)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_FEED_SET ioctl failed\n"); ++ return -1; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_STOP, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_STOP ioctl failed\n"); ++ return -1; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_DEC_STOP, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEC_STOP ioctl failed\n"); ++ return -1; ++ } ++ ++ return lantiq_play_tone(c, TAPI_TONE_LOCALE_NONE); ++} ++ ++static int lantiq_end_dialing(int c) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ if (pvt->dial_timer) { ++ ast_sched_thread_del(sched_thread, pvt->dial_timer); ++ pvt->dial_timer = 0; ++ } ++ ++ if(pvt->owner) { ++ ast_hangup(pvt->owner); ++ } ++ ++ return 0; ++} ++ ++static int lantiq_end_call(int c) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ if(pvt->owner) { ++ lantiq_jb_get_stats(c); ++ ast_queue_hangup(pvt->owner); ++ } ++ ++ return 0; ++} ++ ++static struct ast_channel * lantiq_channel(int state, int c, char *ext, char *ctx) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ ++ struct ast_channel *chan = NULL; ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ chan = ast_channel_alloc(1, state, NULL, NULL, "", ext, ctx, 0, c, "TAPI/%s", "1"); ++ ++ chan->tech = &lantiq_tech; ++ chan->nativeformats = AST_FORMAT_ULAW; ++ chan->readformat = AST_FORMAT_ULAW; ++ chan->writeformat = AST_FORMAT_ULAW; ++ chan->tech_pvt = pvt; ++ ++ pvt->owner = chan; ++ ++ return chan; ++} ++ ++static struct ast_channel * ast_lantiq_requester(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause) ++{ ++ ast_mutex_lock(&iflock); ++ ++ char buf[BUFSIZ]; ++ struct ast_channel *chan = NULL; ++ int port_id = -1; ++ ++ ast_debug(1, "Asked to create a TAPI channel with formats: %s\n", ast_getformatname_multiple(buf, sizeof(buf), format)); ++ ++ ++ /* check for correct data argument */ ++ if (ast_strlen_zero(data)) { ++ ast_log(LOG_ERROR, "Unable to create channel with empty destination.\n"); ++ *cause = AST_CAUSE_CHANNEL_UNACCEPTABLE; ++ return NULL; ++ } ++ ++ /* get our port number */ ++ port_id = atoi((char*) data); ++ if (port_id < 1 || port_id > dev_ctx.channels) { ++ ast_log(LOG_ERROR, "Unknown channel ID: \"%s\"\n", (char*) data); ++ *cause = AST_CAUSE_CHANNEL_UNACCEPTABLE; ++ return NULL; ++ } ++ ++ /* on asterisk user's side, we're using port 1-2. ++ * Here in non normal human's world, we begin ++ * counting at 0. ++ */ ++ port_id -= 1; ++ ++ chan = lantiq_channel(AST_STATE_DOWN, port_id, NULL, NULL); ++ ++ ast_mutex_unlock(&iflock); ++ return chan; ++} ++ ++static int lantiq_dev_data_handler(int c) ++{ ++ char buf[BUFSIZ]; ++ struct ast_frame frame = {0}; ++ ++ int res = read(dev_ctx.ch_fd[c], buf, sizeof(buf)); ++ if (res <= 0) ast_log(LOG_ERROR, "we got read error %i\n", res); ++ ++ rtp_header_t *rtp = (rtp_header_t*) buf; ++ ++ frame.src = "TAPI"; ++ frame.frametype = AST_FRAME_VOICE; ++ frame.subclass.codec = rtp->payload_type; ++ frame.samples = res - RTP_HEADER_LEN; ++ frame.datalen = res - RTP_HEADER_LEN; ++ frame.data.ptr = buf + RTP_HEADER_LEN; ++ ++ struct lantiq_pvt *pvt = (struct lantiq_pvt *) &iflist[c]; ++ if (pvt->owner && (pvt->owner->_state == AST_STATE_UP)) { ++ if(!ast_channel_trylock(pvt->owner)) { ++ ast_queue_frame(pvt->owner, &frame); ++ ast_channel_unlock(pvt->owner); ++ } ++ } ++ ++/* ast_debug(1, "lantiq_dev_data_handler(): size: %i version: %i padding: %i extension: %i csrc_count: %i \n" ++ "marker: %i payload_type: %s seqno: %i timestamp: %i ssrc: %i\n", ++ (int)res, ++ (int)rtp->version, ++ (int)rtp->padding, ++ (int)rtp->extension, ++ (int)rtp->csrc_count, ++ (int)rtp->marker, ++ ast_codec2str(rtp->payload_type), ++ (int)rtp->seqno, ++ (int)rtp->timestamp, ++ (int)rtp->ssrc); ++*/ ++ return 0; ++} ++ ++static int accept_call(int c) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ if (pvt->owner) { ++ struct ast_channel *chan = pvt->owner; ++ ++ switch (chan->_state) { ++ case AST_STATE_RINGING: ++ lantiq_play_tone(c, TAPI_TONE_LOCALE_NONE); ++ ast_queue_control(pvt->owner, AST_CONTROL_ANSWER); ++ pvt->channel_state = INCALL; ++ break; ++ default: ++ ast_log(LOG_WARNING, "entered unhandled state %s\n", ast_state2str(chan->_state)); ++ } ++ } ++ ++ return 0; ++} ++ ++static int lantiq_dev_event_hook(int c, int state) ++{ ++ ast_mutex_lock(&iflock); ++ ++ ast_log(LOG_DEBUG, "on port %i detected event %s hook\n", c, state ? "on" : "off"); ++ ++ int ret = -1; ++ if (state) { /* going onhook */ ++ switch (iflist[c].channel_state) { ++ case OFFHOOK: ++ ret = lantiq_standby(c); ++ break; ++ case DIALING: ++ ret = lantiq_end_dialing(c); ++ break; ++ case INCALL: ++ ret = lantiq_end_call(c); ++ break; ++ case CALL_ENDED: ++ ret = lantiq_standby(c); // TODO: are we sure for this ? ++ break; ++ default: ++ break; ++ } ++ iflist[c].channel_state = ONHOOK; ++ } else { /* going offhook */ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_ACTIVE)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_FEED_SET ioctl failed\n"); ++ goto out; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_START, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_START ioctl failed\n"); ++ goto out; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_DEC_START, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEC_START ioctl failed\n"); ++ goto out; ++ } ++ ++ switch (iflist[c].channel_state) { ++ case RINGING: ++ ret = accept_call(c); ++ break; ++ default: ++ iflist[c].channel_state = OFFHOOK; ++ lantiq_play_tone(c, TAPI_TONE_LOCALE_DIAL_CODE); ++ ret = 0; ++ break; ++ } ++ ++ } ++ ++out: ++ ast_mutex_unlock(&iflock); ++ ++ return ret; ++} ++ ++static void lantiq_reset_dtmfbuf(struct lantiq_pvt *pvt) ++{ ++ pvt->dtmfbuf[0] = '\0'; ++ pvt->dtmfbuf_len = 0; ++ pvt->ext[0] = '\0'; ++} ++ ++static void lantiq_dial(struct lantiq_pvt *pvt) ++{ ++ struct ast_channel *chan = NULL; ++ ++ ast_log(LOG_DEBUG, "user want's to dial %s.\n", pvt->dtmfbuf); ++ ++ if (ast_exists_extension(NULL, pvt->context, pvt->dtmfbuf, 1, NULL)) { ++ ast_debug(1, "found extension %s, dialing\n", pvt->dtmfbuf); ++ ++ strcpy(pvt->ext, pvt->dtmfbuf); ++ ++ ast_verbose(VERBOSE_PREFIX_3 " extension exists, starting PBX %s\n", pvt->ext); ++ ++ chan = lantiq_channel(AST_STATE_UP, pvt->port_id, pvt->ext+1, pvt->context); ++ chan->tech_pvt = pvt; ++ pvt->owner = chan; ++ ++ strcpy(chan->exten, pvt->ext); ++ ast_setstate(chan, AST_STATE_RING); ++ pvt->channel_state = INCALL; ++ ++ pvt->call_setup_start = now(); ++ ++ if (ast_pbx_start(chan)) { ++ ast_log(LOG_WARNING, " unable to start PBX on %s\n", chan->name); ++ ast_hangup(chan); ++ } ++ } else { ++ ast_log(LOG_DEBUG, "no extension found\n"); ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_BUSY_CODE); ++ pvt->channel_state = CALL_ENDED; ++ } ++ ++ lantiq_reset_dtmfbuf(pvt); ++} ++ ++static int lantiq_event_dial_timeout(const void* data) ++{ ++ ast_debug(1, "TAPI: lantiq_event_dial_timeout()\n"); ++ ++ struct lantiq_pvt *pvt = (struct lantiq_pvt *) data; ++ pvt->dial_timer = 0; ++ ++ if (! pvt->channel_state == ONHOOK) { ++ lantiq_dial(pvt); ++ } else { ++ ast_debug(1, "TAPI: lantiq_event_dial_timeout(): dial timeout in state ONHOOK.\n"); ++ } ++ ++ return 0; ++} ++ ++static int lantiq_send_digit(int c, char digit) ++{ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ struct ast_frame f = { .frametype = AST_FRAME_DTMF, .subclass.integer = digit }; ++ ++ if (pvt->owner) { ++ ast_log(LOG_DEBUG, "Port %i transmitting digit \"%c\"\n", c, digit); ++ return ast_queue_frame(pvt->owner, &f); ++ } else { ++ ast_debug(1, "Warning: lantiq_send_digit() without owner!\n"); ++ return -1; ++ } ++} ++ ++static void lantiq_dev_event_digit(int c, char digit) ++{ ++ ast_mutex_lock(&iflock); ++ ++ ast_log(LOG_DEBUG, "on port %i detected digit \"%c\"\n", c, digit); ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ switch (pvt->channel_state) { ++ case INCALL: ++ { ++ lantiq_send_digit(c, digit); ++ break; ++ } ++ case OFFHOOK: ++ pvt->channel_state = DIALING; ++ ++ lantiq_play_tone(c, TAPI_TONE_LOCALE_NONE); ++ ++ /* fall through */ ++ case DIALING: ++ if (digit == '#') { ++ if (pvt->dial_timer) { ++ ast_sched_thread_del(sched_thread, pvt->dial_timer); ++ pvt->dial_timer = 0; ++ } ++ ++ lantiq_dial(pvt); ++ } else { ++ pvt->dtmfbuf[pvt->dtmfbuf_len] = digit; ++ pvt->dtmfbuf_len++; ++ pvt->dtmfbuf[pvt->dtmfbuf_len] = '\0'; ++ ++ /* setup autodial timer */ ++ if (!pvt->dial_timer) { ++ ast_log(LOG_DEBUG, "setting new timer\n"); ++ pvt->dial_timer = ast_sched_thread_add(sched_thread, 2000, lantiq_event_dial_timeout, (const void*) pvt); ++ } else { ++ ast_log(LOG_DEBUG, "replacing timer\n"); ++ struct sched_context *sched = ast_sched_thread_get_context(sched_thread); ++ AST_SCHED_REPLACE(pvt->dial_timer, sched, 2000, lantiq_event_dial_timeout, (const void*) pvt); ++ } ++ } ++ break; ++ default: ++ ast_log(LOG_ERROR, "don't know what to do in unhandled state\n"); ++ break; ++ } ++ ++ ast_mutex_unlock(&iflock); ++ return; ++} ++ ++static void lantiq_dev_event_handler(void) ++{ ++ IFX_TAPI_EVENT_t event; ++ unsigned int i; ++ ++ for (i = 0; i < dev_ctx.channels ; i++) { ++ ast_mutex_lock(&iflock); ++ ++ memset (&event, 0, sizeof(event)); ++ event.ch = i; ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_EVENT_GET, &event)) { ++ ast_mutex_unlock(&iflock); ++ continue; ++ } ++ if (event.id == IFX_TAPI_EVENT_NONE) { ++ ast_mutex_unlock(&iflock); ++ continue; ++ } ++ ++ ast_mutex_unlock(&iflock); ++ ++ switch(event.id) { ++ case IFX_TAPI_EVENT_FXS_ONHOOK: ++ lantiq_dev_event_hook(i, 1); ++ break; ++ case IFX_TAPI_EVENT_FXS_OFFHOOK: ++ lantiq_dev_event_hook(i, 0); ++ break; ++ case IFX_TAPI_EVENT_DTMF_DIGIT: ++ lantiq_dev_event_digit(i, (char)event.data.dtmf.ascii); ++ break; ++ case IFX_TAPI_EVENT_PULSE_DIGIT: ++ if (event.data.pulse.digit == 0xB) { ++ lantiq_dev_event_digit(i, '0'); ++ } else { ++ lantiq_dev_event_digit(i, '0' + (char)event.data.pulse.digit); ++ } ++ break; ++ case IFX_TAPI_EVENT_COD_DEC_CHG: ++ case IFX_TAPI_EVENT_TONE_GEN_END: ++ case IFX_TAPI_EVENT_CID_TX_SEQ_END: ++ break; ++ default: ++ ast_log(LOG_ERROR, "unknown TAPI event %08X\n", event.id); ++ break; ++ } ++ } ++} ++ ++static void * lantiq_events_monitor(void *data) ++{ ++ ast_verbose("TAPI thread started\n"); ++ ++ struct pollfd fds[3]; ++ ++ fds[0].fd = dev_ctx.dev_fd; ++ fds[0].events = POLLIN; ++ fds[1].fd = dev_ctx.ch_fd[0]; ++ fds[1].events = POLLIN; ++ fds[2].fd = dev_ctx.ch_fd[1]; ++ fds[2].events = POLLIN; ++ ++ while (monitor) { ++ ast_mutex_lock(&monlock); ++ ++ if (poll(fds, dev_ctx.channels + 1, 2000) <= 0) { ++ ast_mutex_unlock(&monlock); ++ continue; ++ } ++ ++ if (fds[0].revents & POLLIN) { ++ lantiq_dev_event_handler(); ++ } ++ ++ ast_mutex_unlock(&monlock); ++ ++ if ((fds[1].revents & POLLIN) && (lantiq_dev_data_handler(0))) { ++ ast_log(LOG_ERROR, "data handler 0 failed\n"); ++ break; ++ } ++ ++ if ((fds[2].revents & POLLIN) && (lantiq_dev_data_handler(1))) { ++ ast_log(LOG_ERROR, "data handler 1 failed\n"); ++ break; ++ } ++ } ++ ++ return NULL; ++} ++ ++static int restart_monitor(void) ++{ ++ /* If we're supposed to be stopped -- stay stopped */ ++ if (monitor_thread == AST_PTHREADT_STOP) ++ return 0; ++ ++ ast_mutex_lock(&monlock); ++ ++ if (monitor_thread == pthread_self()) { ++ ast_mutex_unlock(&monlock); ++ ast_log(LOG_WARNING, "Cannot kill myself\n"); ++ return -1; ++ } ++ ++ if (monitor_thread != AST_PTHREADT_NULL) { ++ if (ast_mutex_lock(&iflock)) { ++ ast_mutex_unlock(&monlock); ++ ast_log(LOG_WARNING, "Unable to lock the interface list\n"); ++ return -1; ++ } ++ monitor = 0; ++ while (pthread_kill(monitor_thread, SIGURG) == 0) ++ sched_yield(); ++ pthread_join(monitor_thread, NULL); ++ ast_mutex_unlock(&iflock); ++ } ++ ++ monitor = 1; ++ /* Start a new monitor */ ++ if (ast_pthread_create_background(&monitor_thread, NULL, lantiq_events_monitor, NULL) < 0) { ++ ast_mutex_unlock(&monlock); ++ ast_log(LOG_ERROR, "Unable to start monitor thread.\n"); ++ return -1; ++ } ++ ++ ast_mutex_unlock(&monlock); ++ ++ return 0; ++} ++ ++static void lantiq_cleanup(void) ++{ ++ int c; ++ ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_STANDBY)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_LINE_FEED_SET ioctl failed\n"); ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_STOP, 0)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_ENC_STOP ioctl failed\n"); ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_DEC_STOP, 0)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_DEC_STOP ioctl failed\n"); ++ } ++ } ++ ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_DEV_STOP, 0)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_DEV_STOP ioctl failed\n"); ++ } ++ ++ close(dev_ctx.dev_fd); ++} ++ ++static int unload_module(void) ++{ ++ int c; ++ ++ ast_channel_unregister(&lantiq_tech); ++ ++ if (!ast_mutex_lock(&iflock)) { ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ if (iflist[c].owner) ++ ast_softhangup(iflist[c].owner, AST_SOFTHANGUP_APPUNLOAD); ++ } ++ ast_mutex_unlock(&iflock); ++ } else { ++ ast_log(LOG_WARNING, "Unable to lock the monitor\n"); ++ return -1; ++ } ++ ++ if (!ast_mutex_lock(&monlock)) { ++ if (monitor_thread > AST_PTHREADT_NULL) { ++ monitor = 0; ++ while (pthread_kill(monitor_thread, SIGURG) == 0) ++ sched_yield(); ++ pthread_join(monitor_thread, NULL); ++ } ++ monitor_thread = AST_PTHREADT_STOP; ++ ast_mutex_unlock(&monlock); ++ } else { ++ ast_log(LOG_WARNING, "Unable to lock the monitor\n"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static struct lantiq_pvt *lantiq_init_pvt(struct lantiq_pvt *pvt) ++{ ++ if (pvt) { ++ pvt->owner = NULL; ++ pvt->port_id = -1; ++ pvt->channel_state = UNKNOWN; ++ pvt->context[0] = '\0'; ++ pvt->ext[0] = '\0'; ++ pvt->dial_timer = 0; ++ pvt->dtmfbuf[0] = '\0'; ++ pvt->dtmfbuf_len = 0; ++ pvt->call_setup_start = 0; ++ pvt->call_setup_delay = 0; ++ pvt->jb_size = 0; ++ pvt->jb_underflow = 0; ++ pvt->jb_overflow = 0; ++ pvt->jb_delay = 0; ++ pvt->jb_invalid = 0; ++ } else { ++ ast_log(LOG_ERROR, "unable to clear pvt structure\n"); ++ } ++ ++ return pvt; ++} ++ ++static int lantiq_create_pvts(void) ++{ ++ int i; ++ ++ iflist = ast_calloc(1, sizeof(struct lantiq_pvt) * dev_ctx.channels); ++ ++ if (iflist) { ++ for (i=0 ; inext) { ++ if (!strcasecmp(v->name, "channels")) { ++ dev_ctx.channels = atoi(v->value); ++ if (!dev_ctx.channels) { ++ ast_log(LOG_ERROR, "Invalid value for channels in config %s\n", config); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "firmwarefilename")) { ++ ast_copy_string(firmware_filename, v->value, sizeof(firmware_filename)); ++ } else if (!strcasecmp(v->name, "bbdfilename")) { ++ ast_copy_string(bbd_filename, v->value, sizeof(bbd_filename)); ++ } else if (!strcasecmp(v->name, "basepath")) { ++ ast_copy_string(base_path, v->value, sizeof(base_path)); ++ } else if (!strcasecmp(v->name, "per_channel_context")) { ++ if (!strcasecmp(v->value, "on")) { ++ per_channel_context = 1; ++ } else if (!strcasecmp(v->value, "off")) { ++ per_channel_context = 0; ++ } else { ++ ast_log(LOG_ERROR, "Unknown per_channel_context value '%s'. Try 'on' or 'off'.\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } ++ } ++ ++ for (v = ast_variable_browse(cfg, "general"); v; v = v->next) { ++ if (!strcasecmp(v->name, "rxgain")) { ++ rxgain = atoi(v->value); ++ if (!rxgain) { ++ rxgain = 0; ++ ast_log(LOG_WARNING, "Invalid rxgain: %s, using default.\n", v->value); ++ } ++ } else if (!strcasecmp(v->name, "txgain")) { ++ txgain = atoi(v->value); ++ if (!txgain) { ++ txgain = 0; ++ ast_log(LOG_WARNING, "Invalid txgain: %s, using default.\n", v->value); ++ } ++ } else if (!strcasecmp(v->name, "echocancel")) { ++ if (!strcasecmp(v->value, "off")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_OFF; ++ } else if (!strcasecmp(v->value, "nlec")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NE; ++ if (!strcasecmp(v->name, "echocancelfixedwindowsize")) { ++ wlec_nbne = atoi(v->value); ++ } ++ } else if (!strcasecmp(v->value, "wlec")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NFE; ++ if (!strcasecmp(v->name, "echocancelnfemovingwindowsize")) { ++ wlec_nbfe = atoi(v->value); ++ } else if (!strcasecmp(v->name, "echocancelfixedwindowsize")) { ++ wlec_nbne = atoi(v->value); ++ } else if (!strcasecmp(v->name, "echocancelwidefixedwindowsize")) { ++ wlec_wbne = atoi(v->value); ++ } ++ } else if (!strcasecmp(v->value, "nees")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NE_ES; ++ } else if (!strcasecmp(v->value, "nfees")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NFE_ES; ++ } else if (!strcasecmp(v->value, "es")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_ES; ++ } else { ++ wlec_type = IFX_TAPI_WLEC_TYPE_OFF; ++ ast_log(LOG_ERROR, "Unknown echo cancellation type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "echocancelnlp")) { ++ if (!strcasecmp(v->value, "on")) { ++ wlec_nlp = IFX_TAPI_WLEC_NLP_ON; ++ } else if (!strcasecmp(v->value, "off")) { ++ wlec_nlp = IFX_TAPI_WLEC_NLP_OFF; ++ } else { ++ ast_log(LOG_ERROR, "Unknown echo cancellation nlp '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "jitterbuffertype")) { ++ if (!strcasecmp(v->value, "fixed")) { ++ jb_type = IFX_TAPI_JB_TYPE_FIXED; ++ } else if (!strcasecmp(v->value, "adaptive")) { ++ jb_type = IFX_TAPI_JB_TYPE_ADAPTIVE; ++ jb_localadpt = IFX_TAPI_JB_LOCAL_ADAPT_DEFAULT; ++ if (!strcasecmp(v->name, "jitterbufferadaptation")) { ++ if (!strcasecmp(v->value, "on")) { ++ jb_localadpt = IFX_TAPI_JB_LOCAL_ADAPT_ON; ++ } else if (!strcasecmp(v->value, "off")) { ++ jb_localadpt = IFX_TAPI_JB_LOCAL_ADAPT_OFF; ++ } ++ } else if (!strcasecmp(v->name, "jitterbufferscalling")) { ++ jb_scaling = atoi(v->value); ++ } else if (!strcasecmp(v->name, "jitterbufferinitialsize")) { ++ jb_initialsize = atoi(v->value); ++ } else if (!strcasecmp(v->name, "jitterbufferminsize")) { ++ jb_minsize = atoi(v->value); ++ } else if (!strcasecmp(v->name, "jitterbuffermaxsize")) { ++ jb_maxsize = atoi(v->value); ++ } ++ } else { ++ ast_log(LOG_ERROR, "Unknown jitter buffer type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "jitterbufferpackettype")) { ++ if (!strcasecmp(v->value, "voice")) { ++ jb_pckadpt = IFX_TAPI_JB_PKT_ADAPT_VOICE; ++ } else if (!strcasecmp(v->value, "data")) { ++ jb_pckadpt = IFX_TAPI_JB_PKT_ADAPT_DATA; ++ } else if (!strcasecmp(v->value, "datanorep")) { ++ jb_pckadpt = IFX_TAPI_JB_PKT_ADAPT_DATA_NO_REP; ++ } else { ++ ast_log(LOG_ERROR, "Unknown jitter buffer packet adaptation type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "calleridtype")) { ++ ast_log(LOG_DEBUG, "Setting CID type to %s.\n", v->value); ++ if (!strcasecmp(v->value, "telecordia")) { ++ cid_type = IFX_TAPI_CID_STD_TELCORDIA; ++ } else if (!strcasecmp(v->value, "etsifsk")) { ++ cid_type = IFX_TAPI_CID_STD_ETSI_FSK; ++ } else if (!strcasecmp(v->value, "etsidtmf")) { ++ cid_type = IFX_TAPI_CID_STD_ETSI_DTMF; ++ } else if (!strcasecmp(v->value, "sin")) { ++ cid_type = IFX_TAPI_CID_STD_SIN; ++ } else if (!strcasecmp(v->value, "ntt")) { ++ cid_type = IFX_TAPI_CID_STD_NTT; ++ } else if (!strcasecmp(v->value, "kpndtmf")) { ++ cid_type = IFX_TAPI_CID_STD_KPN_DTMF; ++ } else if (!strcasecmp(v->value, "kpndtmffsk")) { ++ cid_type = IFX_TAPI_CID_STD_KPN_DTMF_FSK; ++ } else { ++ ast_log(LOG_ERROR, "Unknown caller id type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "voiceactivitydetection")) { ++ if (!strcasecmp(v->value, "on")) { ++ vad_type = IFX_TAPI_ENC_VAD_ON; ++ } else if (!strcasecmp(v->value, "g711")) { ++ vad_type = IFX_TAPI_ENC_VAD_G711; ++ } else if (!strcasecmp(v->value, "cng")) { ++ vad_type = IFX_TAPI_ENC_VAD_CNG_ONLY; ++ } else if (!strcasecmp(v->value, "sc")) { ++ vad_type = IFX_TAPI_ENC_VAD_SC_ONLY; ++ } else { ++ ast_log(LOG_ERROR, "Unknown voice activity detection value '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } ++ } ++ ++ lantiq_create_pvts(); ++ ++ ast_mutex_unlock(&iflock); ++ ++ if (ast_channel_register(&lantiq_tech)) { ++ ast_log(LOG_ERROR, "Unable to register channel class 'Phone'\n"); ++ ast_config_destroy(cfg); ++ unload_module(); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ast_config_destroy(cfg); ++ ++ /* tapi */ ++#ifdef TODO_TONES ++ IFX_TAPI_TONE_t tone; ++#endif ++ IFX_TAPI_DEV_START_CFG_t dev_start; ++ IFX_TAPI_MAP_DATA_t map_data; ++ IFX_TAPI_ENC_CFG_t enc_cfg; ++ IFX_TAPI_LINE_VOLUME_t line_vol; ++ IFX_TAPI_WLEC_CFG_t wlec_cfg; ++ IFX_TAPI_JB_CFG_t jb_cfg; ++ IFX_TAPI_CID_CFG_t cid_cfg; ++ uint8_t c; ++ ++ /* open device */ ++ dev_ctx.dev_fd = lantiq_dev_open(base_path, 0); ++ ++ if (dev_ctx.dev_fd < 0) { ++ ast_log(LOG_ERROR, "lantiq tapi device open function failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ dev_ctx.ch_fd[c] = lantiq_dev_open(base_path, c + 1); ++ ++ if (dev_ctx.ch_fd[c] < 0) { ++ ast_log(LOG_ERROR, "lantiq tapi channel %d open function failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ } ++ ++ if (lantiq_dev_firmware_download(dev_ctx.dev_fd, firmware_filename)) { ++ ast_log(LOG_ERROR, "voice firmware download failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_DEV_STOP, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEV_STOP ioctl failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ memset(&dev_start, 0x0, sizeof(IFX_TAPI_DEV_START_CFG_t)); ++ dev_start.nMode = IFX_TAPI_INIT_MODE_VOICE_CODER; ++ ++ /* Start TAPI */ ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_DEV_START, &dev_start)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEV_START ioctl failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ /* tones */ ++#ifdef TODO_TONES ++ memset(&tone, 0, sizeof(IFX_TAPI_TONE_t)); ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_TONE_TABLE_CFG_SET, &tone)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_TONE_TABLE_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++#endif ++ /* ringing type */ ++ IFX_TAPI_RING_CFG_t ringingType; ++ memset(&ringingType, 0, sizeof(IFX_TAPI_RING_CFG_t)); ++ ringingType.nMode = IFX_TAPI_RING_CFG_MODE_INTERNAL_BALANCED; ++ ringingType.nSubmode = IFX_TAPI_RING_CFG_SUBMODE_DC_RNG_TRIP_FAST; ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_CFG_SET, (IFX_int32_t) &ringingType)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_RING_CFG_SET failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* ring cadence */ ++ IFX_char_t data[15] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00 }; ++ ++ IFX_TAPI_RING_CADENCE_t ringCadence; ++ memset(&ringCadence, 0, sizeof(IFX_TAPI_RING_CADENCE_t)); ++ memcpy(&ringCadence.data, data, sizeof(data)); ++ ringCadence.nr = sizeof(data) * 8; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_CADENCE_HR_SET, &ringCadence)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_RING_CADENCE_HR_SET failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* perform mapping */ ++ memset(&map_data, 0x0, sizeof(IFX_TAPI_MAP_DATA_t)); ++ map_data.nDstCh = c; ++ map_data.nChType = IFX_TAPI_MAP_TYPE_PHONE; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_MAP_DATA_ADD, &map_data)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_MAP_DATA_ADD %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* set line feed */ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_STANDBY)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_FEED_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure encoder */ ++ memset(&enc_cfg, 0x0, sizeof(IFX_TAPI_ENC_CFG_t)); ++ enc_cfg.nFrameLen = IFX_TAPI_COD_LENGTH_20; ++ enc_cfg.nEncType = IFX_TAPI_COD_TYPE_MLAW; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_CFG_SET, &enc_cfg)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* set volume */ ++ memset(&line_vol, 0, sizeof(line_vol)); ++ line_vol.nGainRx = rxgain; ++ line_vol.nGainTx = txgain; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_PHONE_VOLUME_SET, &line_vol)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_PHONE_VOLUME_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure line echo canceller */ ++ memset(&wlec_cfg, 0, sizeof(wlec_cfg)); ++ wlec_cfg.nType = wlec_type; ++ wlec_cfg.bNlp = wlec_nlp; ++ wlec_cfg.nNBFEwindow = wlec_nbfe; ++ wlec_cfg.nNBNEwindow = wlec_nbne; ++ wlec_cfg.nWBNEwindow = wlec_wbne; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_WLEC_PHONE_CFG_SET, &wlec_cfg)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_WLEC_PHONE_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure jitter buffer */ ++ memset(&jb_cfg, 0, sizeof(jb_cfg)); ++ jb_cfg.nJbType = jb_type; ++ jb_cfg.nPckAdpt = jb_pckadpt; ++ jb_cfg.nLocalAdpt = jb_localadpt; ++ jb_cfg.nScaling = jb_scaling; ++ jb_cfg.nInitialSize = jb_initialsize; ++ jb_cfg.nMinSize = jb_minsize; ++ jb_cfg.nMaxSize = jb_maxsize; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_JB_CFG_SET, &jb_cfg)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_JB_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure Caller ID type */ ++ memset(&cid_cfg, 0, sizeof(cid_cfg)); ++ cid_cfg.nStandard = cid_type; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_CID_CFG_SET, &cid_cfg)) { ++ ast_log(LOG_ERROR, "IIFX_TAPI_CID_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure voice activity detection */ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_VAD_CFG_SET, vad_type)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_VAD_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Setup TAPI <-> Asterisk codec type mapping */ ++ if (lantiq_setup_rtp(c)) { ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Set initial hook status */ ++ iflist[c].channel_state = lantiq_get_hookstatus(c); ++ ++ if (iflist[c].channel_state == UNKNOWN) { ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ } ++ ++ /* make sure our device will be closed properly */ ++ ast_register_atexit(lantiq_cleanup); ++ ++ restart_monitor(); ++ return AST_MODULE_LOAD_SUCCESS; ++} ++ ++AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Lantiq TAPI Telephony API Support"); +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/chan_lantiq.c b/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/chan_lantiq.c +new file mode 100644 +index 0000000..6e2b502 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/channels/chan_lantiq.c +@@ -0,0 +1,1679 @@ ++/* ++ * Asterisk -- An open source telephony toolkit. ++ * ++ * Copyright (C) 2012, Luka Perkov ++ * Copyright (C) 2012, John Crispin ++ * Copyright (C) 2012, Andrej VlaÅ¡ić ++ * Copyright (C) 2012, Kaspar Schleiser for T-Labs ++ * (Deutsche Telekom Innovation Laboratories) ++ * Copyright (C) 2012, Mirko Vogt for T-Labs ++ * (Deutsche Telekom Innovation Laboratories) ++ * ++ * Luka Perkov ++ * John Crispin ++ * Andrej VlaÅ¡ić ++ * Kaspar Schleiser ++ * Mirko Vogt ++ * ++ * See http://www.asterisk.org for more information about ++ * the Asterisk project. Please do not directly contact ++ * any of the maintainers of this project for assistance; ++ * the project provides a web site, mailing lists and IRC ++ * channels for your use. ++ * ++ * This program is free software, distributed under the terms of ++ * the GNU General Public License Version 2. See the LICENSE file ++ * at the top of the source tree. ++ */ ++ ++/*! \file ++ * ++ * \brief Asterisk channel line driver for Lantiq based TAPI boards ++ * ++ * \author Luka Perkov ++ * \author John Crispin ++ * \author Andrej VlaÅ¡ić ++ * \author Kaspar Schleiser ++ * \author Mirko Vogt ++ * ++ * \ingroup channel_drivers ++ */ ++ ++#include "asterisk.h" ++ ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: xxx $") ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef HAVE_LINUX_COMPILER_H ++#include ++#endif ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Lantiq TAPI includes */ ++#include ++#include ++ ++#define RTP_HEADER_LEN 12 ++ ++#define TAPI_AUDIO_PORT_NUM_MAX 2 ++#define TAPI_TONE_LOCALE_NONE 0 ++#define TAPI_TONE_LOCALE_RINGING_CODE 26 ++#define TAPI_TONE_LOCALE_BUSY_CODE 27 ++#define TAPI_TONE_LOCALE_CONGESTION_CODE 27 ++#define TAPI_TONE_LOCALE_DIAL_CODE 25 ++#define TAPI_TONE_LOCALE_WAITING_CODE 37 ++ ++#define LANTIQ_CONTEXT_PREFIX "lantiq" ++ ++static const char config[] = "lantiq.conf"; ++ ++static char firmware_filename[PATH_MAX] = "/lib/firmware/ifx_firmware.bin"; ++static char bbd_filename[PATH_MAX] = "/lib/firmware/ifx_bbd_fxs.bin"; ++static char base_path[PATH_MAX] = "/dev/vmmc"; ++static int per_channel_context = 0; ++ ++/* ++ * The private structures of the Phone Jack channels are linked for selecting ++ * outgoing channels. ++ */ ++enum channel_state { ++ ONHOOK, ++ OFFHOOK, ++ DIALING, ++ INCALL, ++ CALL_ENDED, ++ RINGING, ++ UNKNOWN ++}; ++ ++static struct lantiq_pvt { ++ struct ast_channel *owner; /* Channel we belong to, possibly NULL */ ++ int port_id; /* Port number of this object, 0..n */ ++ int channel_state; ++ char context[AST_MAX_CONTEXT]; /* this port's dialplan context */ ++ char ext[AST_MAX_EXTENSION+1]; /* the extension this port is connecting */ ++ int dial_timer; /* timer handle for autodial timeout */ ++ char dtmfbuf[AST_MAX_EXTENSION+1]; /* buffer holding dialed digits */ ++ int dtmfbuf_len; /* lenght of dtmfbuf */ ++ int rtp_timestamp; /* timestamp for RTP packets */ ++ uint16_t rtp_seqno; /* Sequence nr for RTP packets */ ++ uint32_t call_setup_start; /* Start of dialling in ms */ ++ uint32_t call_setup_delay; /* time between ^ and 1st ring in ms */ ++ uint16_t jb_size; /* Jitter buffer size */ ++ uint32_t jb_underflow; /* Jitter buffer injected samples */ ++ uint32_t jb_overflow; /* Jitter buffer dropped samples */ ++ uint16_t jb_delay; /* Jitter buffer: playout delay */ ++ uint16_t jb_invalid; /* Jitter buffer: Nr. of invalid packets */ ++ ++} *iflist = NULL; ++ ++static struct lantiq_ctx { ++ int dev_fd; ++ int channels; ++ int ch_fd[TAPI_AUDIO_PORT_NUM_MAX]; ++} dev_ctx; ++ ++static int ast_digit_begin(struct ast_channel *ast, char digit); ++static int ast_digit_end(struct ast_channel *ast, char digit, unsigned int duration); ++static int ast_lantiq_call(struct ast_channel *ast, char *dest, int timeout); ++static int ast_lantiq_hangup(struct ast_channel *ast); ++static int ast_lantiq_answer(struct ast_channel *ast); ++static struct ast_frame *ast_lantiq_read(struct ast_channel *ast); ++static int ast_lantiq_write(struct ast_channel *ast, struct ast_frame *frame); ++static struct ast_frame *ast_lantiq_exception(struct ast_channel *ast); ++static int ast_lantiq_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen); ++static int ast_lantiq_fixup(struct ast_channel *old, struct ast_channel *new); ++static struct ast_channel *ast_lantiq_requester(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause); ++static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *args, char *buf, size_t buflen); ++static void lantiq_jb_get_stats(int c); ++ ++static const struct ast_channel_tech lantiq_tech = { ++ .type = "TAPI", ++ .description = "Lantiq TAPI Telephony API Driver", ++ .capabilities = AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW | AST_FORMAT_G729A, ++ .send_digit_begin = ast_digit_begin, ++ .send_digit_end = ast_digit_end, ++ .call = ast_lantiq_call, ++ .hangup = ast_lantiq_hangup, ++ .answer = ast_lantiq_answer, ++ .read = ast_lantiq_read, ++ .write = ast_lantiq_write, ++ .exception = ast_lantiq_exception, ++ .indicate = ast_lantiq_indicate, ++ .fixup = ast_lantiq_fixup, ++ .requester = ast_lantiq_requester, ++ .func_channel_read = acf_channel_read ++}; ++ ++/* Protect the interface list (of lantiq_pvt's) */ ++AST_MUTEX_DEFINE_STATIC(iflock); ++ ++/* ++ * Protect the monitoring thread, so only one process can kill or start it, and ++ * not when it's doing something critical. ++ */ ++AST_MUTEX_DEFINE_STATIC(monlock); ++ ++/* Boolean value whether the monitoring thread shall continue. */ ++static unsigned int monitor; ++ ++/* The scheduling thread */ ++struct ast_sched_thread *sched_thread; ++ ++/* ++ * This is the thread for the monitor which checks for input on the channels ++ * which are not currently in use. ++ */ ++static pthread_t monitor_thread = AST_PTHREADT_NULL; ++ ++ ++#define WORDS_BIGENDIAN ++/* struct taken from some GPLed code by Mike Borella */ ++typedef struct rtp_header ++{ ++#if defined(WORDS_BIGENDIAN) ++ uint8_t version:2, padding:1, extension:1, csrc_count:4; ++#else ++ uint8_t csrc_count:4, extension:1, padding:1, version:2; ++#endif ++#if defined(WORDS_BIGENDIAN) ++ uint8_t marker:1, payload_type:7; ++#else ++ uint8_t payload_type:7, marker:1; ++#endif ++ uint16_t seqno; ++ uint32_t timestamp; ++ uint32_t ssrc; ++} rtp_header_t; ++ ++static uint32_t now(void) { ++ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ++ ++ uint64_t tmp = ts.tv_sec*1000 + (ts.tv_nsec/1000000); ++ return (uint32_t) tmp; ++} ++ ++static int lantiq_dev_open(const char *dev_path, const int32_t ch_num) ++{ ++ char dev_name[PATH_MAX]; ++ memset(dev_name, 0, sizeof(dev_name)); ++ snprintf(dev_name, PATH_MAX, "%s%u%u", dev_path, 1, ch_num); ++ return open((const char*)dev_name, O_RDWR, 0644); ++} ++ ++static void lantiq_ring(int c, int r, const char *cid) ++{ ++ uint8_t status; ++ ++ if (r) { ++ if (!cid) { ++ status = (uint8_t) ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_START, 0); ++ } else { ++ IFX_TAPI_CID_MSG_t msg; ++ IFX_TAPI_CID_MSG_STRING_t cid_el; ++ ++ memset(&msg, 0, sizeof(msg)); ++ memset(&cid_el, 0, sizeof(cid_el)); ++ ++ cid_el.elementType = IFX_TAPI_CID_ST_CLI; ++ cid_el.len = strlen(cid); ++ strncpy((char*)cid_el.element, cid, (size_t)cid_el.len); ++ ++ msg.txMode = IFX_TAPI_CID_HM_ONHOOK; ++ msg.messageType = IFX_TAPI_CID_MT_CSUP; ++ msg.message = (IFX_TAPI_CID_MSG_ELEMENT_t *)&cid_el; ++ msg.nMsgElements = 1; ++ ++ status = (uint8_t) ioctl(dev_ctx.ch_fd[c], IFX_TAPI_CID_TX_SEQ_START, (IFX_int32_t) &msg); ++ } ++ } else { ++ status = (uint8_t) ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_STOP, 0); ++ } ++ ++ if (status) { ++ ast_log(LOG_ERROR, "%s ioctl failed\n", ++ (r ? "IFX_TAPI_RING_START" : "IFX_TAPI_RING_STOP")); ++ } ++} ++ ++static int lantiq_play_tone(int c, int t) ++{ ++ /* stop currently playing tone before starting new one */ ++ if (t != TAPI_TONE_LOCALE_NONE) { ++ ioctl(dev_ctx.ch_fd[c], IFX_TAPI_TONE_LOCAL_PLAY, TAPI_TONE_LOCALE_NONE); ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_TONE_LOCAL_PLAY, t)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_TONE_LOCAL_PLAY ioctl failed\n"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static enum channel_state lantiq_get_hookstatus(int port) ++{ ++ uint8_t status; ++ ++ if (ioctl(dev_ctx.ch_fd[port], IFX_TAPI_LINE_HOOK_STATUS_GET, &status)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_HOOK_STATUS_GET ioctl failed\n"); ++ return UNKNOWN; ++ } ++ ++ if (status) { ++ return OFFHOOK; ++ } else { ++ return ONHOOK; ++ } ++} ++ ++static int ++lantiq_dev_binary_buffer_create(const char *path, uint8_t **ppBuf, uint32_t *pBufSz) ++{ ++ FILE *fd; ++ struct stat file_stat; ++ int32_t status = 0; ++ ++ fd = fopen(path, "rb"); ++ if (fd == NULL) { ++ ast_log(LOG_ERROR, "binary file %s open failed\n", path); ++ return -1; ++ } ++ ++ if (stat(path, &file_stat)) { ++ ast_log(LOG_ERROR, "file %s statistics get failed\n", path); ++ return -1; ++ } ++ ++ *ppBuf = malloc(file_stat.st_size); ++ if (*ppBuf == NULL) { ++ ast_log(LOG_ERROR, "binary file %s memory allocation failed\n", path); ++ status = -1; ++ goto on_exit; ++ } ++ ++ if (fread (*ppBuf, sizeof(uint8_t), file_stat.st_size, fd) <= 0) { ++ ast_log(LOG_ERROR, "file %s read failed\n", path); ++ status = -1; ++ goto on_exit; ++ } ++ ++ *pBufSz = file_stat.st_size; ++ ++on_exit: ++ if (fd != NULL) ++ fclose(fd); ++ ++ if (*ppBuf != NULL && status) ++ free(*ppBuf); ++ ++ return status; ++} ++ ++static int32_t lantiq_dev_firmware_download(int32_t fd, const char *path) ++{ ++ uint8_t *firmware = NULL; ++ uint32_t size = 0; ++ VMMC_IO_INIT vmmc_io_init; ++ ++ ast_log(LOG_DEBUG, "loading firmware: \"%s\".", path); ++ ++ if (lantiq_dev_binary_buffer_create(path, &firmware, &size)) ++ return -1; ++ ++ memset(&vmmc_io_init, 0, sizeof(VMMC_IO_INIT)); ++ vmmc_io_init.pPRAMfw = firmware; ++ vmmc_io_init.pram_size = size; ++ ++ if (ioctl(fd, FIO_FW_DOWNLOAD, &vmmc_io_init)) { ++ ast_log(LOG_ERROR, "FIO_FW_DOWNLOAD ioctl failed\n"); ++ return -1; ++ } ++ ++ if (firmware != NULL) ++ free(firmware); ++ ++ return 0; ++} ++ ++static const char *state_string(enum channel_state s) ++{ ++ switch (s) { ++ case ONHOOK: return "ONHOOK"; ++ case OFFHOOK: return "OFFHOOK"; ++ case DIALING: return "DIALING"; ++ case INCALL: return "INCALL"; ++ case CALL_ENDED: return "CALL_ENDED"; ++ case RINGING: return "RINGING"; ++ default: return "UNKNOWN"; ++ } ++} ++ ++static const char *control_string(int c) ++{ ++ switch (c) { ++ case AST_CONTROL_HANGUP: return "Other end has hungup"; ++ case AST_CONTROL_RING: return "Local ring"; ++ case AST_CONTROL_RINGING: return "Remote end is ringing"; ++ case AST_CONTROL_ANSWER: return "Remote end has answered"; ++ case AST_CONTROL_BUSY: return "Remote end is busy"; ++ case AST_CONTROL_TAKEOFFHOOK: return "Make it go off hook"; ++ case AST_CONTROL_OFFHOOK: return "Line is off hook"; ++ case AST_CONTROL_CONGESTION: return "Congestion (circuits busy)"; ++ case AST_CONTROL_FLASH: return "Flash hook"; ++ case AST_CONTROL_WINK: return "Wink"; ++ case AST_CONTROL_OPTION: return "Set a low-level option"; ++ case AST_CONTROL_RADIO_KEY: return "Key Radio"; ++ case AST_CONTROL_RADIO_UNKEY: return "Un-Key Radio"; ++ case AST_CONTROL_PROGRESS: return "Remote end is making Progress"; ++ case AST_CONTROL_PROCEEDING: return "Remote end is proceeding"; ++ case AST_CONTROL_HOLD: return "Hold"; ++ case AST_CONTROL_UNHOLD: return "Unhold"; ++ case AST_CONTROL_SRCUPDATE: return "Media Source Update"; ++ case AST_CONTROL_CONNECTED_LINE: return "Connected Line"; ++ case AST_CONTROL_REDIRECTING: return "Redirecting"; ++ case AST_CONTROL_INCOMPLETE: return "Incomplete"; ++ case -1: return "Stop tone"; ++ default: return "Unknown"; ++ } ++} ++ ++static int ast_lantiq_indicate(struct ast_channel *chan, int condition, const void *data, size_t datalen) ++{ ++ ast_verb(3, "phone indication \"%s\"\n", control_string(condition)); ++ ++ struct lantiq_pvt *pvt = chan->tech_pvt; ++ ++ switch (condition) { ++ case -1: ++ { ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_NONE); ++ return 0; ++ } ++ case AST_CONTROL_CONGESTION: ++ case AST_CONTROL_BUSY: ++ { ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_BUSY_CODE); ++ return 0; ++ } ++ case AST_CONTROL_RINGING: ++ { ++ pvt->call_setup_delay = now() - pvt->call_setup_start; ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_RINGING_CODE); ++ return 0; ++ } ++ default: ++ { ++ /* -1 lets asterisk generate the tone */ ++ return -1; ++ } ++ } ++} ++ ++static int ast_lantiq_fixup(struct ast_channel *old, struct ast_channel *new) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static int ast_digit_begin(struct ast_channel *chan, char digit) ++{ ++ /* TODO: Modify this callback to let Asterisk support controlling the length of DTMF */ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static int ast_digit_end(struct ast_channel *ast, char digit, unsigned int duration) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static int ast_lantiq_call(struct ast_channel *ast, char *dest, int timeout) ++{ ++ /* lock to prevent simultaneous access with do_monitor thread processing */ ++ ast_mutex_lock(&iflock); ++ ++ struct lantiq_pvt *pvt = ast->tech_pvt; ++ ast_log(LOG_DEBUG, "state: %s\n", state_string(pvt->channel_state)); ++ ++ if (pvt->channel_state == ONHOOK) { ++ ast_log(LOG_DEBUG, "port %i is ringing\n", pvt->port_id); ++ ++ char *cid = ast->connected.id.number.valid ? ast->connected.id.number.str : NULL; ++ ast_log(LOG_DEBUG, "port %i CID: %s\n", pvt->port_id, cid ? cid : "none"); ++ ++ lantiq_ring(pvt->port_id, 1, cid); ++ pvt->channel_state = RINGING; ++ ++ ast_setstate(ast, AST_STATE_RINGING); ++ ast_queue_control(ast, AST_CONTROL_RINGING); ++ } else { ++ ast_log(LOG_DEBUG, "port %i is busy\n", pvt->port_id); ++ ast_setstate(ast, AST_STATE_BUSY); ++ ast_queue_control(ast, AST_CONTROL_BUSY); ++ } ++ ++ ast_mutex_unlock(&iflock); ++ ++ return 0; ++} ++ ++static int ast_lantiq_hangup(struct ast_channel *ast) ++{ ++ /* lock to prevent simultaneous access with do_monitor thread processing */ ++ ast_mutex_lock(&iflock); ++ ++ struct lantiq_pvt *pvt = ast->tech_pvt; ++ ast_log(LOG_DEBUG, "state: %s\n", state_string(pvt->channel_state)); ++ ++ if (ast->_state == AST_STATE_RINGING) { ++ // FIXME ++ ast_debug(1, "TAPI: ast_lantiq_hangup(): ast->_state == AST_STATE_RINGING\n"); ++ } ++ ++ switch (pvt->channel_state) { ++ case RINGING: ++ case ONHOOK: ++ lantiq_ring(pvt->port_id, 0, NULL); ++ pvt->channel_state = ONHOOK; ++ break; ++ default: ++ ast_log(LOG_DEBUG, "we were hung up, play busy tone\n"); ++ pvt->channel_state = CALL_ENDED; ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_BUSY_CODE); ++ } ++ ++ lantiq_jb_get_stats(pvt->port_id); ++ ++ ast_setstate(ast, AST_STATE_DOWN); ++ ast_module_unref(ast_module_info->self); ++ ast->tech_pvt = NULL; ++ pvt->owner = NULL; ++ ++ ast_mutex_unlock(&iflock); ++ ++ return 0; ++} ++ ++static int ast_lantiq_answer(struct ast_channel *ast) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return 0; ++} ++ ++static struct ast_frame * ast_lantiq_read(struct ast_channel *ast) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return NULL; ++} ++ ++static int ast_lantiq_write(struct ast_channel *ast, struct ast_frame *frame) ++{ ++ char buf[2048]; ++ struct lantiq_pvt *pvt = ast->tech_pvt; ++ int ret = -1; ++ rtp_header_t *rtp_header = (rtp_header_t *) buf; ++ ++ if(frame->frametype != AST_FRAME_VOICE) { ++ ast_log(LOG_DEBUG, "unhandled frame type\n"); ++ return 0; ++ } ++ ++ if (frame->datalen == 0) { ++ ast_log(LOG_DEBUG, "we've been prodded\n"); ++ return 0; ++ } ++ ++ memset(buf, 0, sizeof(rtp_header_t)); ++ rtp_header->version = 2; ++ rtp_header->padding = 0; ++ rtp_header->extension = 0; ++ rtp_header->csrc_count = 0; ++ rtp_header->marker = 0; ++ rtp_header->timestamp = pvt->rtp_timestamp; ++ rtp_header->seqno = pvt->rtp_seqno++; ++ rtp_header->ssrc = 0; ++ rtp_header->payload_type = (uint8_t) frame->subclass.codec; ++ ++ pvt->rtp_timestamp += 160; ++ ++ memcpy(buf+RTP_HEADER_LEN, frame->data.ptr, frame->datalen); ++ ++ ret = write(dev_ctx.ch_fd[pvt->port_id], buf, frame->datalen+RTP_HEADER_LEN); ++ if (ret <= 0) { ++ ast_debug(1, "TAPI: ast_lantiq_write(): error writing.\n"); ++ return -1; ++ } ++ ++#ifdef TODO_DEVEL_INFO ++ ast_debug(1, "ast_lantiq_write(): size: %i version: %i padding: %i extension: %i csrc_count: %i\n" ++ "marker: %i payload_type: %s seqno: %i timestamp: %i ssrc: %i\n", ++ (int)ret, ++ (int)rtp_header->version, ++ (int)rtp_header->padding, ++ (int)rtp_header->extension, ++ (int)rtp_header->csrc_count, ++ (int)rtp_header->marker, ++ ast_codec2str(rtp_header->payload_type), ++ (int)rtp_header->seqno, ++ (int)rtp_header->timestamp, ++ (int)rtp_header->ssrc); ++#endif ++ ++ return 0; ++} ++ ++static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *args, char *buf, size_t buflen) ++{ ++ struct lantiq_pvt *pvt; ++ int res = 0; ++ ++ if (!chan || chan->tech != &lantiq_tech) { ++ ast_log(LOG_ERROR, "This function requires a valid Lantiq TAPI channel\n"); ++ return -1; ++ } ++ ++ ast_mutex_lock(&iflock); ++ ++ pvt = (struct lantiq_pvt*) chan->tech_pvt; ++ ++ if (!strcasecmp(args, "csd")) { ++ snprintf(buf, buflen, "%lu", (unsigned long int) pvt->call_setup_delay); ++ } else if (!strcasecmp(args, "jitter_stats")){ ++ lantiq_jb_get_stats(pvt->port_id); ++ snprintf(buf, buflen, "jbBufSize=%u,jbUnderflow=%u,jbOverflow=%u,jbDelay=%u,jbInvalid=%u", ++ (uint32_t) pvt->jb_size, ++ (uint32_t) pvt->jb_underflow, ++ (uint32_t) pvt->jb_overflow, ++ (uint32_t) pvt->jb_delay, ++ (uint32_t) pvt->jb_invalid); ++ } else { ++ res = -1; ++ } ++ ++ ast_mutex_unlock(&iflock); ++ ++ return res; ++} ++ ++ ++static struct ast_frame * ast_lantiq_exception(struct ast_channel *ast) ++{ ++ ast_log(LOG_DEBUG, "entering... no code here...\n"); ++ return NULL; ++} ++ ++static void lantiq_jb_get_stats(int c) { ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ IFX_TAPI_JB_STATISTICS_t param; ++ memset (¶m, 0, sizeof (param)); ++ if (ioctl (dev_ctx.ch_fd[c], IFX_TAPI_JB_STATISTICS_GET, (IFX_int32_t) ¶m) != IFX_SUCCESS) { ++ ast_debug(1, "Error getting jitter buffer stats.\n"); ++ } else { ++#if !defined (TAPI_VERSION3) && defined (TAPI_VERSION4) ++ ast_debug(1, "Jitter buffer stats: dev=%u, ch=%u, nType=%u, nBufSize=%u, nIsUnderflow=%u, nDsOverflow=%u, nPODelay=%u, nInvalid=%u", ++ (uint32_t) param.dev, ++ (uint32_t) param.ch, ++#else ++ ast_debug(1, "Jitter buffer stats: nType=%u, nBufSize=%u, nIsUnderflow=%u, nDsOverflow=%u, nPODelay=%u, nInvalid=%u", ++#endif ++ (uint32_t) param.nType, ++ (uint32_t) param.nBufSize, ++ (uint32_t) param.nIsUnderflow, ++ (uint32_t) param.nDsOverflow, ++ (uint32_t) param.nPODelay, ++ (uint32_t) param.nInvalid); ++ ++ pvt->jb_size = param.nBufSize; ++ pvt->jb_underflow = param.nIsUnderflow; ++ pvt->jb_overflow = param.nDsOverflow; ++ pvt->jb_invalid = param.nInvalid; ++ pvt->jb_delay = param.nPODelay; ++ } ++} ++ ++ ++static int lantiq_standby(int c) ++{ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_STANDBY)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_FEED_SET ioctl failed\n"); ++ return -1; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_STOP, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_STOP ioctl failed\n"); ++ return -1; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_DEC_STOP, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEC_STOP ioctl failed\n"); ++ return -1; ++ } ++ ++ return lantiq_play_tone(c, TAPI_TONE_LOCALE_NONE); ++} ++ ++static int lantiq_end_dialing(int c) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ if (pvt->dial_timer) { ++ ast_sched_thread_del(sched_thread, pvt->dial_timer); ++ pvt->dial_timer = 0; ++ } ++ ++ if(pvt->owner) { ++ ast_hangup(pvt->owner); ++ } ++ ++ return 0; ++} ++ ++static int lantiq_end_call(int c) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ if(pvt->owner) { ++ lantiq_jb_get_stats(c); ++ ast_queue_hangup(pvt->owner); ++ } ++ ++ return 0; ++} ++ ++static struct ast_channel * lantiq_channel(int state, int c, char *ext, char *ctx) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ ++ struct ast_channel *chan = NULL; ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ chan = ast_channel_alloc(1, state, NULL, NULL, "", ext, ctx, 0, c, "TAPI/%s", "1"); ++ ++ chan->tech = &lantiq_tech; ++ chan->nativeformats = AST_FORMAT_ULAW; ++ chan->readformat = AST_FORMAT_ULAW; ++ chan->writeformat = AST_FORMAT_ULAW; ++ chan->tech_pvt = pvt; ++ ++ pvt->owner = chan; ++ ++ return chan; ++} ++ ++static struct ast_channel * ast_lantiq_requester(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause) ++{ ++ ast_mutex_lock(&iflock); ++ ++ char buf[BUFSIZ]; ++ struct ast_channel *chan = NULL; ++ int port_id = -1; ++ ++ ast_debug(1, "Asked to create a TAPI channel with formats: %s\n", ast_getformatname_multiple(buf, sizeof(buf), format)); ++ ++ ++ /* check for correct data argument */ ++ if (ast_strlen_zero(data)) { ++ ast_log(LOG_ERROR, "Unable to create channel with empty destination.\n"); ++ *cause = AST_CAUSE_CHANNEL_UNACCEPTABLE; ++ return NULL; ++ } ++ ++ /* get our port number */ ++ port_id = atoi((char*) data); ++ if (port_id < 1 || port_id > dev_ctx.channels) { ++ ast_log(LOG_ERROR, "Unknown channel ID: \"%s\"\n", (char*) data); ++ *cause = AST_CAUSE_CHANNEL_UNACCEPTABLE; ++ return NULL; ++ } ++ ++ /* on asterisk user's side, we're using port 1-2. ++ * Here in non normal human's world, we begin ++ * counting at 0. ++ */ ++ port_id -= 1; ++ ++ chan = lantiq_channel(AST_STATE_DOWN, port_id, NULL, NULL); ++ ++ ast_mutex_unlock(&iflock); ++ return chan; ++} ++ ++static int lantiq_dev_data_handler(int c) ++{ ++ char buf[BUFSIZ]; ++ struct ast_frame frame = {0}; ++ ++ int res = read(dev_ctx.ch_fd[c], buf, sizeof(buf)); ++ if (res <= 0) ast_log(LOG_ERROR, "we got read error %i\n", res); ++ ++ rtp_header_t *rtp = (rtp_header_t*) buf; ++ ++ frame.src = "TAPI"; ++ frame.frametype = AST_FRAME_VOICE; ++ frame.subclass.codec = rtp->payload_type; ++ frame.samples = res - RTP_HEADER_LEN; ++ frame.datalen = res - RTP_HEADER_LEN; ++ frame.data.ptr = buf + RTP_HEADER_LEN; ++ ++ struct lantiq_pvt *pvt = (struct lantiq_pvt *) &iflist[c]; ++ if (pvt->owner && (pvt->owner->_state == AST_STATE_UP)) { ++ if(!ast_channel_trylock(pvt->owner)) { ++ ast_queue_frame(pvt->owner, &frame); ++ ast_channel_unlock(pvt->owner); ++ } ++ } ++ ++/* ast_debug(1, "lantiq_dev_data_handler(): size: %i version: %i padding: %i extension: %i csrc_count: %i \n" ++ "marker: %i payload_type: %s seqno: %i timestamp: %i ssrc: %i\n", ++ (int)res, ++ (int)rtp->version, ++ (int)rtp->padding, ++ (int)rtp->extension, ++ (int)rtp->csrc_count, ++ (int)rtp->marker, ++ ast_codec2str(rtp->payload_type), ++ (int)rtp->seqno, ++ (int)rtp->timestamp, ++ (int)rtp->ssrc); ++*/ ++ return 0; ++} ++ ++static int accept_call(int c) ++{ ++ ast_log(LOG_DEBUG, "TODO - DEBUG MSG\n"); ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ if (pvt->owner) { ++ struct ast_channel *chan = pvt->owner; ++ ++ switch (chan->_state) { ++ case AST_STATE_RINGING: ++ lantiq_play_tone(c, TAPI_TONE_LOCALE_NONE); ++ ast_queue_control(pvt->owner, AST_CONTROL_ANSWER); ++ pvt->channel_state = INCALL; ++ break; ++ default: ++ ast_log(LOG_WARNING, "entered unhandled state %s\n", ast_state2str(chan->_state)); ++ } ++ } ++ ++ return 0; ++} ++ ++static int lantiq_dev_event_hook(int c, int state) ++{ ++ ast_mutex_lock(&iflock); ++ ++ ast_log(LOG_DEBUG, "on port %i detected event %s hook\n", c, state ? "on" : "off"); ++ ++ int ret = -1; ++ if (state) { /* going onhook */ ++ switch (iflist[c].channel_state) { ++ case OFFHOOK: ++ ret = lantiq_standby(c); ++ break; ++ case DIALING: ++ ret = lantiq_end_dialing(c); ++ break; ++ case INCALL: ++ ret = lantiq_end_call(c); ++ break; ++ case CALL_ENDED: ++ ret = lantiq_standby(c); // TODO: are we sure for this ? ++ break; ++ default: ++ break; ++ } ++ iflist[c].channel_state = ONHOOK; ++ } else { /* going offhook */ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_ACTIVE)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_FEED_SET ioctl failed\n"); ++ goto out; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_START, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_START ioctl failed\n"); ++ goto out; ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_DEC_START, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEC_START ioctl failed\n"); ++ goto out; ++ } ++ ++ switch (iflist[c].channel_state) { ++ case RINGING: ++ ret = accept_call(c); ++ break; ++ default: ++ iflist[c].channel_state = OFFHOOK; ++ lantiq_play_tone(c, TAPI_TONE_LOCALE_DIAL_CODE); ++ ret = 0; ++ break; ++ } ++ ++ } ++ ++out: ++ ast_mutex_unlock(&iflock); ++ ++ return ret; ++} ++ ++static void lantiq_reset_dtmfbuf(struct lantiq_pvt *pvt) ++{ ++ pvt->dtmfbuf[0] = '\0'; ++ pvt->dtmfbuf_len = 0; ++ pvt->ext[0] = '\0'; ++} ++ ++static void lantiq_dial(struct lantiq_pvt *pvt) ++{ ++ struct ast_channel *chan = NULL; ++ ++ ast_log(LOG_DEBUG, "user want's to dial %s.\n", pvt->dtmfbuf); ++ ++ if (ast_exists_extension(NULL, pvt->context, pvt->dtmfbuf, 1, NULL)) { ++ ast_debug(1, "found extension %s, dialing\n", pvt->dtmfbuf); ++ ++ strcpy(pvt->ext, pvt->dtmfbuf); ++ ++ ast_verbose(VERBOSE_PREFIX_3 " extension exists, starting PBX %s\n", pvt->ext); ++ ++ chan = lantiq_channel(AST_STATE_UP, pvt->port_id, pvt->ext+1, pvt->context); ++ chan->tech_pvt = pvt; ++ pvt->owner = chan; ++ ++ strcpy(chan->exten, pvt->ext); ++ ast_setstate(chan, AST_STATE_RING); ++ pvt->channel_state = INCALL; ++ ++ pvt->call_setup_start = now(); ++ ++ if (ast_pbx_start(chan)) { ++ ast_log(LOG_WARNING, " unable to start PBX on %s\n", chan->name); ++ ast_hangup(chan); ++ } ++ } else { ++ ast_log(LOG_DEBUG, "no extension found\n"); ++ lantiq_play_tone(pvt->port_id, TAPI_TONE_LOCALE_BUSY_CODE); ++ pvt->channel_state = CALL_ENDED; ++ } ++ ++ lantiq_reset_dtmfbuf(pvt); ++} ++ ++static int lantiq_event_dial_timeout(const void* data) ++{ ++ ast_debug(1, "TAPI: lantiq_event_dial_timeout()\n"); ++ ++ struct lantiq_pvt *pvt = (struct lantiq_pvt *) data; ++ pvt->dial_timer = 0; ++ ++ if (! pvt->channel_state == ONHOOK) { ++ lantiq_dial(pvt); ++ } else { ++ ast_debug(1, "TAPI: lantiq_event_dial_timeout(): dial timeout in state ONHOOK.\n"); ++ } ++ ++ return 0; ++} ++ ++static int lantiq_send_digit(int c, char digit) ++{ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ struct ast_frame f = { .frametype = AST_FRAME_DTMF, .subclass.integer = digit }; ++ ++ if (pvt->owner) { ++ ast_log(LOG_DEBUG, "Port %i transmitting digit \"%c\"\n", c, digit); ++ return ast_queue_frame(pvt->owner, &f); ++ } else { ++ ast_debug(1, "Warning: lantiq_send_digit() without owner!\n"); ++ return -1; ++ } ++} ++ ++static void lantiq_dev_event_digit(int c, char digit) ++{ ++ ast_mutex_lock(&iflock); ++ ++ ast_log(LOG_DEBUG, "on port %i detected digit \"%c\"\n", c, digit); ++ ++ struct lantiq_pvt *pvt = &iflist[c]; ++ ++ switch (pvt->channel_state) { ++ case INCALL: ++ { ++ lantiq_send_digit(c, digit); ++ break; ++ } ++ case OFFHOOK: ++ pvt->channel_state = DIALING; ++ ++ lantiq_play_tone(c, TAPI_TONE_LOCALE_NONE); ++ ++ /* fall through */ ++ case DIALING: ++ if (digit == '#') { ++ if (pvt->dial_timer) { ++ ast_sched_thread_del(sched_thread, pvt->dial_timer); ++ pvt->dial_timer = 0; ++ } ++ ++ lantiq_dial(pvt); ++ } else { ++ pvt->dtmfbuf[pvt->dtmfbuf_len] = digit; ++ pvt->dtmfbuf_len++; ++ pvt->dtmfbuf[pvt->dtmfbuf_len] = '\0'; ++ ++ /* setup autodial timer */ ++ if (!pvt->dial_timer) { ++ ast_log(LOG_DEBUG, "setting new timer\n"); ++ pvt->dial_timer = ast_sched_thread_add(sched_thread, 2000, lantiq_event_dial_timeout, (const void*) pvt); ++ } else { ++ ast_log(LOG_DEBUG, "replacing timer\n"); ++ struct sched_context *sched = ast_sched_thread_get_context(sched_thread); ++ AST_SCHED_REPLACE(pvt->dial_timer, sched, 2000, lantiq_event_dial_timeout, (const void*) pvt); ++ } ++ } ++ break; ++ default: ++ ast_log(LOG_ERROR, "don't know what to do in unhandled state\n"); ++ break; ++ } ++ ++ ast_mutex_unlock(&iflock); ++ return; ++} ++ ++static void lantiq_dev_event_handler(void) ++{ ++ IFX_TAPI_EVENT_t event; ++ unsigned int i; ++ ++ for (i = 0; i < dev_ctx.channels ; i++) { ++ ast_mutex_lock(&iflock); ++ ++ memset (&event, 0, sizeof(event)); ++ event.ch = i; ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_EVENT_GET, &event)) { ++ ast_mutex_unlock(&iflock); ++ continue; ++ } ++ if (event.id == IFX_TAPI_EVENT_NONE) { ++ ast_mutex_unlock(&iflock); ++ continue; ++ } ++ ++ ast_mutex_unlock(&iflock); ++ ++ switch(event.id) { ++ case IFX_TAPI_EVENT_FXS_ONHOOK: ++ lantiq_dev_event_hook(i, 1); ++ break; ++ case IFX_TAPI_EVENT_FXS_OFFHOOK: ++ lantiq_dev_event_hook(i, 0); ++ break; ++ case IFX_TAPI_EVENT_DTMF_DIGIT: ++ lantiq_dev_event_digit(i, (char)event.data.dtmf.ascii); ++ break; ++ case IFX_TAPI_EVENT_PULSE_DIGIT: ++ if (event.data.pulse.digit == 0xB) { ++ lantiq_dev_event_digit(i, '0'); ++ } else { ++ lantiq_dev_event_digit(i, '0' + (char)event.data.pulse.digit); ++ } ++ break; ++ case IFX_TAPI_EVENT_COD_DEC_CHG: ++ case IFX_TAPI_EVENT_TONE_GEN_END: ++ case IFX_TAPI_EVENT_CID_TX_SEQ_END: ++ break; ++ default: ++ ast_log(LOG_ERROR, "unknown TAPI event %08X\n", event.id); ++ break; ++ } ++ } ++} ++ ++static void * lantiq_events_monitor(void *data) ++{ ++ ast_verbose("TAPI thread started\n"); ++ ++ struct pollfd fds[3]; ++ ++ fds[0].fd = dev_ctx.dev_fd; ++ fds[0].events = POLLIN; ++ fds[1].fd = dev_ctx.ch_fd[0]; ++ fds[1].events = POLLIN; ++ fds[2].fd = dev_ctx.ch_fd[1]; ++ fds[2].events = POLLIN; ++ ++ while (monitor) { ++ ast_mutex_lock(&monlock); ++ ++ if (poll(fds, dev_ctx.channels + 1, 2000) <= 0) { ++ ast_mutex_unlock(&monlock); ++ continue; ++ } ++ ++ if (fds[0].revents & POLLIN) { ++ lantiq_dev_event_handler(); ++ } ++ ++ ast_mutex_unlock(&monlock); ++ ++ if ((fds[1].revents & POLLIN) && (lantiq_dev_data_handler(0))) { ++ ast_log(LOG_ERROR, "data handler 0 failed\n"); ++ break; ++ } ++ ++ if ((fds[2].revents & POLLIN) && (lantiq_dev_data_handler(1))) { ++ ast_log(LOG_ERROR, "data handler 1 failed\n"); ++ break; ++ } ++ } ++ ++ return NULL; ++} ++ ++static int restart_monitor(void) ++{ ++ /* If we're supposed to be stopped -- stay stopped */ ++ if (monitor_thread == AST_PTHREADT_STOP) ++ return 0; ++ ++ ast_mutex_lock(&monlock); ++ ++ if (monitor_thread == pthread_self()) { ++ ast_mutex_unlock(&monlock); ++ ast_log(LOG_WARNING, "Cannot kill myself\n"); ++ return -1; ++ } ++ ++ if (monitor_thread != AST_PTHREADT_NULL) { ++ if (ast_mutex_lock(&iflock)) { ++ ast_mutex_unlock(&monlock); ++ ast_log(LOG_WARNING, "Unable to lock the interface list\n"); ++ return -1; ++ } ++ monitor = 0; ++ while (pthread_kill(monitor_thread, SIGURG) == 0) ++ sched_yield(); ++ pthread_join(monitor_thread, NULL); ++ ast_mutex_unlock(&iflock); ++ } ++ ++ monitor = 1; ++ /* Start a new monitor */ ++ if (ast_pthread_create_background(&monitor_thread, NULL, lantiq_events_monitor, NULL) < 0) { ++ ast_mutex_unlock(&monlock); ++ ast_log(LOG_ERROR, "Unable to start monitor thread.\n"); ++ return -1; ++ } ++ ++ ast_mutex_unlock(&monlock); ++ ++ return 0; ++} ++ ++static void lantiq_cleanup(void) ++{ ++ int c; ++ ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_STANDBY)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_LINE_FEED_SET ioctl failed\n"); ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_STOP, 0)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_ENC_STOP ioctl failed\n"); ++ } ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_DEC_STOP, 0)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_DEC_STOP ioctl failed\n"); ++ } ++ } ++ ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_DEV_STOP, 0)) { ++ ast_log(LOG_WARNING, "IFX_TAPI_DEV_STOP ioctl failed\n"); ++ } ++ ++ close(dev_ctx.dev_fd); ++} ++ ++static int unload_module(void) ++{ ++ int c; ++ ++ ast_channel_unregister(&lantiq_tech); ++ ++ if (!ast_mutex_lock(&iflock)) { ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ if (iflist[c].owner) ++ ast_softhangup(iflist[c].owner, AST_SOFTHANGUP_APPUNLOAD); ++ } ++ ast_mutex_unlock(&iflock); ++ } else { ++ ast_log(LOG_WARNING, "Unable to lock the monitor\n"); ++ return -1; ++ } ++ ++ if (!ast_mutex_lock(&monlock)) { ++ if (monitor_thread > AST_PTHREADT_NULL) { ++ monitor = 0; ++ while (pthread_kill(monitor_thread, SIGURG) == 0) ++ sched_yield(); ++ pthread_join(monitor_thread, NULL); ++ } ++ monitor_thread = AST_PTHREADT_STOP; ++ ast_mutex_unlock(&monlock); ++ } else { ++ ast_log(LOG_WARNING, "Unable to lock the monitor\n"); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static struct lantiq_pvt *lantiq_init_pvt(struct lantiq_pvt *pvt) ++{ ++ if (pvt) { ++ pvt->owner = NULL; ++ pvt->port_id = -1; ++ pvt->channel_state = UNKNOWN; ++ pvt->context[0] = '\0'; ++ pvt->ext[0] = '\0'; ++ pvt->dial_timer = 0; ++ pvt->dtmfbuf[0] = '\0'; ++ pvt->dtmfbuf_len = 0; ++ pvt->call_setup_start = 0; ++ pvt->call_setup_delay = 0; ++ pvt->jb_size = 0; ++ pvt->jb_underflow = 0; ++ pvt->jb_overflow = 0; ++ pvt->jb_delay = 0; ++ pvt->jb_invalid = 0; ++ } else { ++ ast_log(LOG_ERROR, "unable to clear pvt structure\n"); ++ } ++ ++ return pvt; ++} ++ ++static int lantiq_create_pvts(void) ++{ ++ int i; ++ ++ iflist = ast_calloc(1, sizeof(struct lantiq_pvt) * dev_ctx.channels); ++ ++ if (iflist) { ++ for (i=0 ; inext) { ++ if (!strcasecmp(v->name, "channels")) { ++ dev_ctx.channels = atoi(v->value); ++ if (!dev_ctx.channels) { ++ ast_log(LOG_ERROR, "Invalid value for channels in config %s\n", config); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "firmwarefilename")) { ++ ast_copy_string(firmware_filename, v->value, sizeof(firmware_filename)); ++ } else if (!strcasecmp(v->name, "bbdfilename")) { ++ ast_copy_string(bbd_filename, v->value, sizeof(bbd_filename)); ++ } else if (!strcasecmp(v->name, "basepath")) { ++ ast_copy_string(base_path, v->value, sizeof(base_path)); ++ } else if (!strcasecmp(v->name, "per_channel_context")) { ++ if (!strcasecmp(v->value, "on")) { ++ per_channel_context = 1; ++ } else if (!strcasecmp(v->value, "off")) { ++ per_channel_context = 0; ++ } else { ++ ast_log(LOG_ERROR, "Unknown per_channel_context value '%s'. Try 'on' or 'off'.\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } ++ } ++ ++ for (v = ast_variable_browse(cfg, "general"); v; v = v->next) { ++ if (!strcasecmp(v->name, "rxgain")) { ++ rxgain = atoi(v->value); ++ if (!rxgain) { ++ rxgain = 0; ++ ast_log(LOG_WARNING, "Invalid rxgain: %s, using default.\n", v->value); ++ } ++ } else if (!strcasecmp(v->name, "txgain")) { ++ txgain = atoi(v->value); ++ if (!txgain) { ++ txgain = 0; ++ ast_log(LOG_WARNING, "Invalid txgain: %s, using default.\n", v->value); ++ } ++ } else if (!strcasecmp(v->name, "echocancel")) { ++ if (!strcasecmp(v->value, "off")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_OFF; ++ } else if (!strcasecmp(v->value, "nlec")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NE; ++ if (!strcasecmp(v->name, "echocancelfixedwindowsize")) { ++ wlec_nbne = atoi(v->value); ++ } ++ } else if (!strcasecmp(v->value, "wlec")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NFE; ++ if (!strcasecmp(v->name, "echocancelnfemovingwindowsize")) { ++ wlec_nbfe = atoi(v->value); ++ } else if (!strcasecmp(v->name, "echocancelfixedwindowsize")) { ++ wlec_nbne = atoi(v->value); ++ } else if (!strcasecmp(v->name, "echocancelwidefixedwindowsize")) { ++ wlec_wbne = atoi(v->value); ++ } ++ } else if (!strcasecmp(v->value, "nees")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NE_ES; ++ } else if (!strcasecmp(v->value, "nfees")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_NFE_ES; ++ } else if (!strcasecmp(v->value, "es")) { ++ wlec_type = IFX_TAPI_WLEC_TYPE_ES; ++ } else { ++ wlec_type = IFX_TAPI_WLEC_TYPE_OFF; ++ ast_log(LOG_ERROR, "Unknown echo cancellation type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "echocancelnlp")) { ++ if (!strcasecmp(v->value, "on")) { ++ wlec_nlp = IFX_TAPI_WLEC_NLP_ON; ++ } else if (!strcasecmp(v->value, "off")) { ++ wlec_nlp = IFX_TAPI_WLEC_NLP_OFF; ++ } else { ++ ast_log(LOG_ERROR, "Unknown echo cancellation nlp '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "jitterbuffertype")) { ++ if (!strcasecmp(v->value, "fixed")) { ++ jb_type = IFX_TAPI_JB_TYPE_FIXED; ++ } else if (!strcasecmp(v->value, "adaptive")) { ++ jb_type = IFX_TAPI_JB_TYPE_ADAPTIVE; ++ jb_localadpt = IFX_TAPI_JB_LOCAL_ADAPT_DEFAULT; ++ if (!strcasecmp(v->name, "jitterbufferadaptation")) { ++ if (!strcasecmp(v->value, "on")) { ++ jb_localadpt = IFX_TAPI_JB_LOCAL_ADAPT_ON; ++ } else if (!strcasecmp(v->value, "off")) { ++ jb_localadpt = IFX_TAPI_JB_LOCAL_ADAPT_OFF; ++ } ++ } else if (!strcasecmp(v->name, "jitterbufferscalling")) { ++ jb_scaling = atoi(v->value); ++ } else if (!strcasecmp(v->name, "jitterbufferinitialsize")) { ++ jb_initialsize = atoi(v->value); ++ } else if (!strcasecmp(v->name, "jitterbufferminsize")) { ++ jb_minsize = atoi(v->value); ++ } else if (!strcasecmp(v->name, "jitterbuffermaxsize")) { ++ jb_maxsize = atoi(v->value); ++ } ++ } else { ++ ast_log(LOG_ERROR, "Unknown jitter buffer type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "jitterbufferpackettype")) { ++ if (!strcasecmp(v->value, "voice")) { ++ jb_pckadpt = IFX_TAPI_JB_PKT_ADAPT_VOICE; ++ } else if (!strcasecmp(v->value, "data")) { ++ jb_pckadpt = IFX_TAPI_JB_PKT_ADAPT_DATA; ++ } else if (!strcasecmp(v->value, "datanorep")) { ++ jb_pckadpt = IFX_TAPI_JB_PKT_ADAPT_DATA_NO_REP; ++ } else { ++ ast_log(LOG_ERROR, "Unknown jitter buffer packet adaptation type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "calleridtype")) { ++ ast_log(LOG_DEBUG, "Setting CID type to %s.\n", v->value); ++ if (!strcasecmp(v->value, "telecordia")) { ++ cid_type = IFX_TAPI_CID_STD_TELCORDIA; ++ } else if (!strcasecmp(v->value, "etsifsk")) { ++ cid_type = IFX_TAPI_CID_STD_ETSI_FSK; ++ } else if (!strcasecmp(v->value, "etsidtmf")) { ++ cid_type = IFX_TAPI_CID_STD_ETSI_DTMF; ++ } else if (!strcasecmp(v->value, "sin")) { ++ cid_type = IFX_TAPI_CID_STD_SIN; ++ } else if (!strcasecmp(v->value, "ntt")) { ++ cid_type = IFX_TAPI_CID_STD_NTT; ++ } else if (!strcasecmp(v->value, "kpndtmf")) { ++ cid_type = IFX_TAPI_CID_STD_KPN_DTMF; ++ } else if (!strcasecmp(v->value, "kpndtmffsk")) { ++ cid_type = IFX_TAPI_CID_STD_KPN_DTMF_FSK; ++ } else { ++ ast_log(LOG_ERROR, "Unknown caller id type '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } else if (!strcasecmp(v->name, "voiceactivitydetection")) { ++ if (!strcasecmp(v->value, "on")) { ++ vad_type = IFX_TAPI_ENC_VAD_ON; ++ } else if (!strcasecmp(v->value, "g711")) { ++ vad_type = IFX_TAPI_ENC_VAD_G711; ++ } else if (!strcasecmp(v->value, "cng")) { ++ vad_type = IFX_TAPI_ENC_VAD_CNG_ONLY; ++ } else if (!strcasecmp(v->value, "sc")) { ++ vad_type = IFX_TAPI_ENC_VAD_SC_ONLY; ++ } else { ++ ast_log(LOG_ERROR, "Unknown voice activity detection value '%s'\n", v->value); ++ ast_config_destroy(cfg); ++ return AST_MODULE_LOAD_DECLINE; ++ } ++ } ++ } ++ ++ lantiq_create_pvts(); ++ ++ ast_mutex_unlock(&iflock); ++ ++ if (ast_channel_register(&lantiq_tech)) { ++ ast_log(LOG_ERROR, "Unable to register channel class 'Phone'\n"); ++ ast_config_destroy(cfg); ++ unload_module(); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ast_config_destroy(cfg); ++ ++ /* tapi */ ++#ifdef TODO_TONES ++ IFX_TAPI_TONE_t tone; ++#endif ++ IFX_TAPI_DEV_START_CFG_t dev_start; ++ IFX_TAPI_MAP_DATA_t map_data; ++ IFX_TAPI_ENC_CFG_t enc_cfg; ++ IFX_TAPI_LINE_VOLUME_t line_vol; ++ IFX_TAPI_WLEC_CFG_t wlec_cfg; ++ IFX_TAPI_JB_CFG_t jb_cfg; ++ IFX_TAPI_CID_CFG_t cid_cfg; ++ uint8_t c; ++ ++ /* open device */ ++ dev_ctx.dev_fd = lantiq_dev_open(base_path, 0); ++ ++ if (dev_ctx.dev_fd < 0) { ++ ast_log(LOG_ERROR, "lantiq tapi device open function failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ dev_ctx.ch_fd[c] = lantiq_dev_open(base_path, c + 1); ++ ++ if (dev_ctx.ch_fd[c] < 0) { ++ ast_log(LOG_ERROR, "lantiq tapi channel %d open function failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ } ++ ++ if (lantiq_dev_firmware_download(dev_ctx.dev_fd, firmware_filename)) { ++ ast_log(LOG_ERROR, "voice firmware download failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_DEV_STOP, 0)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEV_STOP ioctl failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ memset(&dev_start, 0x0, sizeof(IFX_TAPI_DEV_START_CFG_t)); ++ dev_start.nMode = IFX_TAPI_INIT_MODE_VOICE_CODER; ++ ++ /* Start TAPI */ ++ if (ioctl(dev_ctx.dev_fd, IFX_TAPI_DEV_START, &dev_start)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_DEV_START ioctl failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ for (c = 0; c < dev_ctx.channels ; c++) { ++ /* tones */ ++#ifdef TODO_TONES ++ memset(&tone, 0, sizeof(IFX_TAPI_TONE_t)); ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_TONE_TABLE_CFG_SET, &tone)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_TONE_TABLE_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++#endif ++ /* ringing type */ ++ IFX_TAPI_RING_CFG_t ringingType; ++ memset(&ringingType, 0, sizeof(IFX_TAPI_RING_CFG_t)); ++ ringingType.nMode = IFX_TAPI_RING_CFG_MODE_INTERNAL_BALANCED; ++ ringingType.nSubmode = IFX_TAPI_RING_CFG_SUBMODE_DC_RNG_TRIP_FAST; ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_CFG_SET, (IFX_int32_t) &ringingType)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_RING_CFG_SET failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* ring cadence */ ++ IFX_char_t data[15] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00 }; ++ ++ IFX_TAPI_RING_CADENCE_t ringCadence; ++ memset(&ringCadence, 0, sizeof(IFX_TAPI_RING_CADENCE_t)); ++ memcpy(&ringCadence.data, data, sizeof(data)); ++ ringCadence.nr = sizeof(data) * 8; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_RING_CADENCE_HR_SET, &ringCadence)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_RING_CADENCE_HR_SET failed\n"); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* perform mapping */ ++ memset(&map_data, 0x0, sizeof(IFX_TAPI_MAP_DATA_t)); ++ map_data.nDstCh = c; ++ map_data.nChType = IFX_TAPI_MAP_TYPE_PHONE; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_MAP_DATA_ADD, &map_data)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_MAP_DATA_ADD %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* set line feed */ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_LINE_FEED_SET, IFX_TAPI_LINE_FEED_STANDBY)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_LINE_FEED_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure encoder */ ++ memset(&enc_cfg, 0x0, sizeof(IFX_TAPI_ENC_CFG_t)); ++ enc_cfg.nFrameLen = IFX_TAPI_COD_LENGTH_20; ++ enc_cfg.nEncType = IFX_TAPI_COD_TYPE_MLAW; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_CFG_SET, &enc_cfg)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* set volume */ ++ memset(&line_vol, 0, sizeof(line_vol)); ++ line_vol.nGainRx = rxgain; ++ line_vol.nGainTx = txgain; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_PHONE_VOLUME_SET, &line_vol)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_PHONE_VOLUME_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure line echo canceller */ ++ memset(&wlec_cfg, 0, sizeof(wlec_cfg)); ++ wlec_cfg.nType = wlec_type; ++ wlec_cfg.bNlp = wlec_nlp; ++ wlec_cfg.nNBFEwindow = wlec_nbfe; ++ wlec_cfg.nNBNEwindow = wlec_nbne; ++ wlec_cfg.nWBNEwindow = wlec_wbne; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_WLEC_PHONE_CFG_SET, &wlec_cfg)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_WLEC_PHONE_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure jitter buffer */ ++ memset(&jb_cfg, 0, sizeof(jb_cfg)); ++ jb_cfg.nJbType = jb_type; ++ jb_cfg.nPckAdpt = jb_pckadpt; ++ jb_cfg.nLocalAdpt = jb_localadpt; ++ jb_cfg.nScaling = jb_scaling; ++ jb_cfg.nInitialSize = jb_initialsize; ++ jb_cfg.nMinSize = jb_minsize; ++ jb_cfg.nMaxSize = jb_maxsize; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_JB_CFG_SET, &jb_cfg)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_JB_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure Caller ID type */ ++ memset(&cid_cfg, 0, sizeof(cid_cfg)); ++ cid_cfg.nStandard = cid_type; ++ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_CID_CFG_SET, &cid_cfg)) { ++ ast_log(LOG_ERROR, "IIFX_TAPI_CID_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Configure voice activity detection */ ++ if (ioctl(dev_ctx.ch_fd[c], IFX_TAPI_ENC_VAD_CFG_SET, vad_type)) { ++ ast_log(LOG_ERROR, "IFX_TAPI_ENC_VAD_CFG_SET %d failed\n", c); ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Setup TAPI <-> Asterisk codec type mapping */ ++ if (lantiq_setup_rtp(c)) { ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ ++ /* Set initial hook status */ ++ iflist[c].channel_state = lantiq_get_hookstatus(c); ++ ++ if (iflist[c].channel_state == UNKNOWN) { ++ return AST_MODULE_LOAD_FAILURE; ++ } ++ } ++ ++ /* make sure our device will be closed properly */ ++ ast_register_atexit(lantiq_cleanup); ++ ++ restart_monitor(); ++ return AST_MODULE_LOAD_SUCCESS; ++} ++ ++AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Lantiq TAPI Telephony API Support"); +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/.svn/entries b/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/.svn/entries +new file mode 100644 +index 0000000..dd1ed0b +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-1.8.x/src-lantiq/configs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-07T07:16:10.677064Z ++32097 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lantiq.conf.sample ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++89c1d8f294a5d814c91779cd63a4616d ++2012-06-07T07:16:10.677064Z ++32097 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4141 ++ +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/.svn/text-base/lantiq.conf.sample.svn-base b/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/.svn/text-base/lantiq.conf.sample.svn-base +new file mode 100644 +index 0000000..16ba174 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/.svn/text-base/lantiq.conf.sample.svn-base +@@ -0,0 +1,138 @@ ++; ++; TAPI Telephony Interface ++; ++; Configuration file ++ ++[interfaces] ++; ++; Number of FXS ports (default: 2) ++channels = 2 ++; ++; Set tapi firmware file path ++;firmwarefilename = /lib/firmware/danube_firmware.bin ++; ++; Set tapi bbd file path ++;bbdfilename = /lib/firmware/danube_bbd_fxs.bin ++; ++; Set vmmc device path ++;basepath = /dev/vmmc ++; ++[general] ++; ++; Gain setting for the receive and transmit path. ++; The value is given in dB within the range (-24dB to +12dB), in 1 dB steps. ++; ++;rxgain = 1 ++;txgain = 1 ++; ++; ++; ++; Line echo cancller valid types: ++; ++; off LEC and echo suppressor turned off. ++; nlec LEC using fixed window; no echo suppressor. ++; wlec LEC using fixed and moving window; no echo suppressor. ++; nees LEC using fixed window and echo suppressor. ++; nfees LEC using fixed and moving window and echo suppressor. ++; es Echo suppressor ++; ++;echocancel = off ++; ++; If nlec or wlec is selected than size of the fixed window in narrowband (8 kHz) sampling mode ++; can be defined with: ++; A value of 0 defaults to: 16 ms if type is nlec or 8 ms if type is wlec: ++; ++;echocancelfixedwindowsize = 0 ++; ++; If wlec is selected than size of the moving window in narrowband (8 kHz) sampling mode ++; can be defined with: ++; A value of 0 defaults to 8 ms. ++; ++;echocancelnfemovingwindowsize = 0 ++; ++; If wlec is selected than size of the moving window in wideband (16 kHz) sampling mode ++; can be defined with: ++; A value of 0 defaults to 8 ms. ++; ++;echocancelwidefixedwindowsize = 0 ++; ++; Activate or deactivate line echo cancller NLP (Non Linear Processor) if the LEC is active, ++; valid is on or off: ++; ++;echocancelnlp = off ++; ++; ++; ++; Jitter buffer valid types: ++; ++; fixed Fixed jitter buffer. ++; adaptive Adaptive jitter buffer. ++; ++;jitterbuffertype = fixed ++; ++; Jitter buffer packet adaptation valid types: ++; ++; voice Jitter buffer optimized for voice. ++; data Jitter buffer optimized for data. ++; datanorep Jitter buffer optimized for data but without doing packet repetition. ++; ++;jitterbufferpackettype = voice ++; ++; Following jitter buffer values can only be used with jitter buffer adaptive type: ++; Turns on or off jitter buffer adaptation: ++; ++;jitterbufferadaptation = off ++; ++; Scaling factor multiplied by 16; in adaptive jitter buffer mode, the target average playout delay is ++; equal to the estimated jitter multiplied by the scaling factor. The default value for the scaling factor ++; is about 1.4 (scaling=22), meaning that the target average playout delay is equal to the estimated ++; jitter. If less packets should be dropped because of jitter, the scaling factor has to be increased. An ++; increase in the scaling factor will eventually lead to an increased playout delay. ++; The supported range is 1 to 16 (16 up to 256). ++; ++;jitterbufferscalling = 1 ++; ++; Initial size of the jitter buffer in time stamps of 125 us: ++; ++;jitterbufferinitialsize = 125 ++; ++; Minimum size of the jitter buffer in time stamps of 125 us ++; ++;jitterbufferminsize = 125 ++; ++; Maximum size of the jitter buffer in time stamps of 125 us ++; ++;jitterbuffermaxsize = 125 ++; ++; ++; ++; Caller id valid standards: ++; ++; telecordia Bellcore/Telcordia GR-30-CORE; use Bell202 FSK coding of CID information. (default) ++; etsifsk ETSI 300-659-1/2/3 V1.3.1; use V.23 FSK coding to transmit CID information. ++; etsidtmf ETSI 300-659-1/2/3 V1.3.1; use DTMF transmission of CID information. ++; sin SIN 227 Issue 3.4; use V.23 FSK coding of CID information. ++; ntt NTT standard: TELEPHONE SERVICE INTERFACES, edition 5; use a modified V.23 FSK coding of ++; CID information. ++; kpndtmf KPN; use DTMF transmission of CID information. ++; kpndtmffsk KPN; use DTMF and FSK transmission of CID information. ++; ++;calleridtype = telecordia ++; ++; ++; ++; Voice activity detection: ++; ++; on Voice activity detection on; in this case also comfort noise and spectral ++; information (nicer noise) is switched on. ++; g711 Voice activity detection on with comfort noise generation, ++; but without spectral information. ++; cng Voice activity detection on with comfort noise generation, but without silence compression ++; sc Voice activity detection on with silence compression, ++; but without comfort noise generation. ++; ++;voiceactivitydetection = on ++; ++; ++; ++; +diff --git a/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/lantiq.conf.sample b/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/lantiq.conf.sample +new file mode 100644 +index 0000000..16ba174 +--- /dev/null ++++ b/feeds/packages/net/asterisk-1.8.x/src-lantiq/configs/lantiq.conf.sample +@@ -0,0 +1,138 @@ ++; ++; TAPI Telephony Interface ++; ++; Configuration file ++ ++[interfaces] ++; ++; Number of FXS ports (default: 2) ++channels = 2 ++; ++; Set tapi firmware file path ++;firmwarefilename = /lib/firmware/danube_firmware.bin ++; ++; Set tapi bbd file path ++;bbdfilename = /lib/firmware/danube_bbd_fxs.bin ++; ++; Set vmmc device path ++;basepath = /dev/vmmc ++; ++[general] ++; ++; Gain setting for the receive and transmit path. ++; The value is given in dB within the range (-24dB to +12dB), in 1 dB steps. ++; ++;rxgain = 1 ++;txgain = 1 ++; ++; ++; ++; Line echo cancller valid types: ++; ++; off LEC and echo suppressor turned off. ++; nlec LEC using fixed window; no echo suppressor. ++; wlec LEC using fixed and moving window; no echo suppressor. ++; nees LEC using fixed window and echo suppressor. ++; nfees LEC using fixed and moving window and echo suppressor. ++; es Echo suppressor ++; ++;echocancel = off ++; ++; If nlec or wlec is selected than size of the fixed window in narrowband (8 kHz) sampling mode ++; can be defined with: ++; A value of 0 defaults to: 16 ms if type is nlec or 8 ms if type is wlec: ++; ++;echocancelfixedwindowsize = 0 ++; ++; If wlec is selected than size of the moving window in narrowband (8 kHz) sampling mode ++; can be defined with: ++; A value of 0 defaults to 8 ms. ++; ++;echocancelnfemovingwindowsize = 0 ++; ++; If wlec is selected than size of the moving window in wideband (16 kHz) sampling mode ++; can be defined with: ++; A value of 0 defaults to 8 ms. ++; ++;echocancelwidefixedwindowsize = 0 ++; ++; Activate or deactivate line echo cancller NLP (Non Linear Processor) if the LEC is active, ++; valid is on or off: ++; ++;echocancelnlp = off ++; ++; ++; ++; Jitter buffer valid types: ++; ++; fixed Fixed jitter buffer. ++; adaptive Adaptive jitter buffer. ++; ++;jitterbuffertype = fixed ++; ++; Jitter buffer packet adaptation valid types: ++; ++; voice Jitter buffer optimized for voice. ++; data Jitter buffer optimized for data. ++; datanorep Jitter buffer optimized for data but without doing packet repetition. ++; ++;jitterbufferpackettype = voice ++; ++; Following jitter buffer values can only be used with jitter buffer adaptive type: ++; Turns on or off jitter buffer adaptation: ++; ++;jitterbufferadaptation = off ++; ++; Scaling factor multiplied by 16; in adaptive jitter buffer mode, the target average playout delay is ++; equal to the estimated jitter multiplied by the scaling factor. The default value for the scaling factor ++; is about 1.4 (scaling=22), meaning that the target average playout delay is equal to the estimated ++; jitter. If less packets should be dropped because of jitter, the scaling factor has to be increased. An ++; increase in the scaling factor will eventually lead to an increased playout delay. ++; The supported range is 1 to 16 (16 up to 256). ++; ++;jitterbufferscalling = 1 ++; ++; Initial size of the jitter buffer in time stamps of 125 us: ++; ++;jitterbufferinitialsize = 125 ++; ++; Minimum size of the jitter buffer in time stamps of 125 us ++; ++;jitterbufferminsize = 125 ++; ++; Maximum size of the jitter buffer in time stamps of 125 us ++; ++;jitterbuffermaxsize = 125 ++; ++; ++; ++; Caller id valid standards: ++; ++; telecordia Bellcore/Telcordia GR-30-CORE; use Bell202 FSK coding of CID information. (default) ++; etsifsk ETSI 300-659-1/2/3 V1.3.1; use V.23 FSK coding to transmit CID information. ++; etsidtmf ETSI 300-659-1/2/3 V1.3.1; use DTMF transmission of CID information. ++; sin SIN 227 Issue 3.4; use V.23 FSK coding of CID information. ++; ntt NTT standard: TELEPHONE SERVICE INTERFACES, edition 5; use a modified V.23 FSK coding of ++; CID information. ++; kpndtmf KPN; use DTMF transmission of CID information. ++; kpndtmffsk KPN; use DTMF and FSK transmission of CID information. ++; ++;calleridtype = telecordia ++; ++; ++; ++; Voice activity detection: ++; ++; on Voice activity detection on; in this case also comfort noise and spectral ++; information (nicer noise) is switched on. ++; g711 Voice activity detection on with comfort noise generation, ++; but without spectral information. ++; cng Voice activity detection on with comfort noise generation, but without silence compression ++; sc Voice activity detection on with silence compression, ++; but without comfort noise generation. ++; ++;voiceactivitydetection = on ++; ++; ++; ++; +diff --git a/feeds/packages/net/asterisk-11.x/.svn/entries b/feeds/packages/net/asterisk-11.x/.svn/entries +new file mode 100644 +index 0000000..b3f1ea2 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-11.x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-11T14:16:42.705762Z ++35954 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++5c4e45cdb299ce59da88624afd6428f0 ++2013-03-11T14:16:42.705762Z ++35954 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++20392 ++ +diff --git a/feeds/packages/net/asterisk-11.x/.svn/text-base/Makefile.svn-base b/feeds/packages/net/asterisk-11.x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a91a5aa +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,397 @@ ++# ++# 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:=asterisk11 ++PKG_VERSION:=11.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ ++PKG_MD5SUM:=b82a82e5adfff0383769e923bfb54c56 ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/asterisk11/install/module ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*$(2).so* $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk11/install/conffile ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/*$(2)* $(1)/etc/asterisk/ ++endef ++ ++define Package/asterisk11/install/lib ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/$(2).so* $(1)/usr/lib/ ++endef ++ ++define Package/asterisk11/install/sbin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(2) $(1)/usr/sbin/ ++endef ++ ++define Package/asterisk11/install/sounds ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/$(2) $(1)/usr/lib/asterisk/sounds/ ++endef ++ ++define BuildAsteriskModule ++ define Package/asterisk11-$(1) ++ $$(call Package/asterisk11/Default) ++ TITLE:=$(2) support ++ DEPENDS:= asterisk11 $(4) ++ endef ++ ++ define Package/asterisk11-$(1)/conffiles ++$(5) ++ endef ++ ++ define Package/asterisk11-$(1)/description ++ $$(call Package/asterisk11/Default/description) ++This package provides support $(3) in Asterisk. ++ endef ++ ++ define Package/asterisk11-$(1)/install ++$(foreach c,$(6),$(call Package/asterisk11/install/conffile,$$(1),$(c));) ++$(foreach m,$(7),$(call Package/asterisk11/install/module,$$(1),$(m));) ++$(foreach s,$(8),$(call Package/asterisk11/install/sounds,$$(1),$(s));) ++ endef ++ ++ $$(eval $$(call BuildPackage,asterisk11-$(1))) ++endef ++ ++define Package/asterisk11/Default ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://www.asterisk.org/ ++endef ++ ++define Package/asterisk11/Default/description ++Asterisk is a complete PBX in software. It provides all of the features ++you would expect from a PBX and more. Asterisk does voice over IP in three ++protocols, and can interoperate with almost all standards-based telephony ++equipment using relatively inexpensive hardware. ++endef ++ ++define Package/asterisk11 ++$(call Package/asterisk11/Default) ++ TITLE:=Complete open source PBX, v11.x ++ MENU:=1 ++ DEPENDS:=+libuuid +libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +zlib @!TARGET_avr32 ++endef ++ ++define Package/asterisk11/description ++$(call Package/asterisk11/Default/description) ++endef ++ ++define Package/asterisk11/conffiles ++/etc/asterisk/asterisk.conf ++/etc/asterisk/acl.conf ++/etc/asterisk/ccss.conf ++/etc/asterisk/modules.conf ++/etc/asterisk/extconfig.conf ++/etc/asterisk/extensions.conf ++/etc/asterisk/features.conf ++/etc/asterisk/indications.conf ++/etc/asterisk/logger.conf ++/etc/asterisk/manager.conf ++/etc/asterisk/rtp.conf ++/etc/asterisk/sip.conf ++/etc/asterisk/sip_notify.conf ++/etc/asterisk/udptl.conf ++/etc/default/asterisk ++/etc/init.d/asterisk ++endef ++ ++AST_CFG_FILES:= \ ++ asterisk.conf acl.conf ccss.conf extconfig.conf extensions.conf features.conf indications.conf logger.conf manager.conf modules.conf \ ++ rtp.conf sip_notify.conf sip.conf udptl.conf ++AST_EMB_MODULES:=\ ++ app_dial app_echo app_macro app_playback codec_gsm codec_ulaw format_gsm format_pcm format_wav format_wav_gsm func_callerid \ ++ func_logic func_strings func_timeout chan_sip chan_local pbx_config res_crypto res_http_websocket res_rtp_asterisk res_rtp_multicast ++ ++define Package/asterisk11/install ++$(call Package/asterisk11/install/lib,$(1),libasteriskssl) ++$(call Package/asterisk11/install/sbin,$(1),asterisk) ++$(call Package/asterisk11/install/sbin,$(1),safe_asterisk) ++$(call Package/asterisk11/install/sbin,$(1),astgenkey) ++$(foreach m,$(AST_CFG_FILES),$(call Package/asterisk11/install/conffile,$(1),$(m));) ++$(foreach m,$(AST_EMB_MODULES),$(call Package/asterisk11/install/module,$(1),$(m));) ++ $(INSTALL_DIR) $(1)/etc/default ++ $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),) ++ CONFIGURE_ARGS+= \ ++ --with-gnutls="$(STAGING_DIR)/usr" \ ++ --with-iksemel="$(STAGING_DIR)/usr" ++ SITE_VARS+= \ ++ ac_cv_lib_iksemel_iks_start_sasl=yes \ ++ ac_cv_lib_gnutls_gnutls_bye=yes ++else ++ CONFIGURE_ARGS+= \ ++ --without-gnutls \ ++ --without-iksemel ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-curl),) ++ CONFIGURE_ARGS+= \ ++ --with-curl="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-curl ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pgsql),) ++ CONFIGURE_ARGS+= \ ++ --with-postgres="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-postgres ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-mysql),) ++ CONFIGURE_ARGS+= \ ++ --with-mysqlclient="$(STAGING_DIR)/usr/bin" ++else ++ CONFIGURE_ARGS+= \ ++ --without-mysqlclient ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),) ++ CONFIGURE_ARGS+= \ ++ --with-spandsp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-spandsp ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-chan-mobile),) ++ CONFIGURE_ARGS+= \ ++ --with-bluetooth="$(STAGING_DIR)/usr" ++else ++ ++ CONFIGURE_ARGS+= \ ++ --without-bluetooth ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-srtp),) ++ CONFIGURE_ARGS+= \ ++ --with-srtp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-srtp ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pbx-lua),) ++ CONFIGURE_ARGS+= \ ++ --with-lua="$(STAGING_DIR)/usr" ++ TARGET_LDFLAGS+=-ldl -lcrypt ++else ++ CONFIGURE_ARGS+= \ ++ --without-lua ++endif ++ ++EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++CONFIGURE_ARGS+= \ ++ --without-curses \ ++ --with-gsm=internal \ ++ --without-cap \ ++ --without-gtk2 \ ++ --without-isdnnet \ ++ --without-misdn \ ++ --without-nbs \ ++ --with-ncurses="$(STAGING_DIR)/usr" \ ++ --without-netsnmp \ ++ --without-newt \ ++ --without-ogg \ ++ --without-osptk \ ++ --with-popt="$(STAGING_DIR)/usr" \ ++ --without-pri \ ++ --without-qt \ ++ --without-radius \ ++ --without-sdl \ ++ --without-suppserv \ ++ --without-tds \ ++ --without-termcap \ ++ --without-tinfo \ ++ --without-vorbis \ ++ --without-vpb \ ++ --with-z="$(STAGING_DIR)/usr" \ ++ --with-sounds-cache="$(DL_DIR)" \ ++ --disable-xmldoc ++PJLIB_CONFIGURE_ARGS= \ ++ --disable-floating-point \ ++ --disable-sound \ ++ --disable-oss \ ++ --disable-speex-aec \ ++ --disable-l16-codec \ ++ --disable-gsm-codec \ ++ --disable-g722-codec \ ++ --disable-g7221-codec \ ++ --disable-speex-codec \ ++ --disable-ilbc-codec \ ++ --disable-g711-codec \ ++ --disable-opencore-amrnb \ ++ --disable-video \ ++ --disable-sdl \ ++ --disable-ffmpeg \ ++ --disable-v4l2 ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ $(PJLIB_CONFIGURE_ARGS), \ ++ LD="$(TARGET_CC)" \ ++ AR="" \ ++ CFLAGS="$(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ CXXFLAGS="$(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -lc $(LIBGCC_S) -lm" \ ++ ,res/pjproject) ++ $(MAKE) -j1 -C $(PKG_BUILD_DIR)/res/pjproject dep ++ $(MAKE) -j1 -C $(PKG_BUILD_DIR)/res/pjproject ++ $(call Build/Configure/Default,,$(SITE_VARS)) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ include/asterisk/version.h \ ++ include/asterisk/buildopts.h defaults.h \ ++ makeopts.embed_rules ++ ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" ++ ASTLDFLAGS="$(EXTRA_LDFLAGS)" ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ ASTVARLIBDIR="/usr/lib/asterisk" \ ++ ASTDATADIR="/usr/lib/asterisk" \ ++ ASTKEYDIR="/usr/lib/asterisk" \ ++ ASTDBDIR="/usr/lib/asterisk" \ ++ NOISY_BUILD="yes" \ ++ DEBUG="" \ ++ OPTIMIZE="" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install samples ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/asterisk-11/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-11/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-11/include/ ++endef ++ ++$(eval $(call BuildPackage,asterisk11)) ++ ++################################ ++# AST modules ++# Params: ++# 1 - Package subname ++# 2 - Package title ++# 3 - Module description ++# 4 - Module dependencies ++# 5 - Full path to multiple conffiles ++# 6 - conf files ++# 7 - module files ++# 8 - sound files ++################################ ++ ++$(eval $(call BuildAsteriskModule,app-alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID,,,,app_alarmreceiver,)) ++$(eval $(call BuildAsteriskModule,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,,app_authenticate,)) ++$(eval $(call BuildAsteriskModule,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,,/etc/asterisk/confbridge.conf,confbridge.conf,app_confbridge,)) ++$(eval $(call BuildAsteriskModule,app-directed_pickup,Directed call pickup,support for directed call pickup,,,,app_directed_pickup,)) ++$(eval $(call BuildAsteriskModule,app-disa,Direct Inward System Access,Direct Inward System Access,,,,app_disa,)) ++$(eval $(call BuildAsteriskModule,app-exec,Exec application,support for application execution,,,,app_exec,)) ++$(eval $(call BuildAsteriskModule,app-chanisavail,Channel availability check,support for checking if a channel is available,,,,app_chanisavail,)) ++$(eval $(call BuildAsteriskModule,app-chanspy,Channel listen in,support for listening in on any channel,,,,app_chanspy,)) ++$(eval $(call BuildAsteriskModule,app-minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail,,/etc/asterisk/extensions_minivm.conf /etc/asterisk/minivm.conf,extensions_minivm.conf minivm.conf,app_minivm,)) ++$(eval $(call BuildAsteriskModule,app-mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording,,,,app_mixmonitor,)) ++$(eval $(call BuildAsteriskModule,app-originate,Originate a call,originating an outbound call and connecting it to a specified extension or application,,,,app_originate,)) ++$(eval $(call BuildAsteriskModule,app-playtones,Playtones application,play a tone list,,,,app_playtones,)) ++$(eval $(call BuildAsteriskModule,app-read,Variable read,a trivial application to read a variable,,,,app_read,)) ++$(eval $(call BuildAsteriskModule,app-readexten,Extension to variable,a trivial application to read an extension into a variable,,,,app_readexten,)) ++$(eval $(call BuildAsteriskModule,app-record,Record sound file,to record a sound file,,,,app_record,)) ++$(eval $(call BuildAsteriskModule,app-sayunixtime,Say Unix time,an application to say Unix time,,,,app_sayunixtime,)) ++$(eval $(call BuildAsteriskModule,app-senddtmf,Send DTMF digits,Sends arbitrary DTMF digits,,,,app_senddtmf,)) ++$(eval $(call BuildAsteriskModule,app-sms,SMS,SMS support (ETSI ES 201 912 protocol 1),,,,app_sms,)) ++$(eval $(call BuildAsteriskModule,app-stack,Stack applications, stack applications Gosub Return etc., +asterisk11-res-agi,,,app_stack,)) ++$(eval $(call BuildAsteriskModule,app-system,System exec,support for executing system commands,,,,app_system,)) ++$(eval $(call BuildAsteriskModule,app-talkdetect,File playback with audio detect,for file playback with audio detect,,,,app_talkdetect,)) ++$(eval $(call BuildAsteriskModule,app-verbose,Verbose logging,Verbose logging application,,,,app_verbose,)) ++$(eval $(call BuildAsteriskModule,app-waituntil,Sleep,support sleeping until the given epoch,,,,app_waituntil,)) ++$(eval $(call BuildAsteriskModule,app-while,While loop,a while loop implementation,,,,app_while,)) ++$(eval $(call BuildAsteriskModule,cdr-core,Provides CDR,Call Detail Record,,/etc/asterisk/cdr.conf /etc/asterisk/cdr_custom.conf /etc/asterisk/cdr_manager.conf /etc/asterisk/cdr_odbc.conf /etc/asterisk/cdr_pgsql.conf /etc/asterisk/cdr_tds.conf,cdr_adaptive_odbc cdr cdr_custom cdr_manager cdr_syslog,app_cdr app_forkcdr cdr_adaptive_odbc cdr_custom cdr_manager cdr_syslog func_cdr,)) ++$(eval $(call BuildAsteriskModule,cdr-csv,Provides CDR CSV,Call Detail Record with CSV support,,,,cdr_csv,)) ++$(eval $(call BuildAsteriskModule,cdr-sqlite3,Provides CDR SQLITE3,Call Detail Record with SQLITE3 support,libsqlite3,,,cdr_sqlite3_custom,)) ++$(eval $(call BuildAsteriskModule,codec-a-mu,Alaw to ulaw translation,translation between alaw and ulaw codecs,,,,codec_a_mu,)) ++$(eval $(call BuildAsteriskModule,codec-adpcm,ADPCM text,ADPCM text ,,,,codec_adpcm,)) ++$(eval $(call BuildAsteriskModule,codec-alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs,,,,codec_alaw,)) ++$(eval $(call BuildAsteriskModule,codec-g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec,,,,codec_g722,)) ++$(eval $(call BuildAsteriskModule,codec-g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs,,,,codec_g726,)) ++$(eval $(call BuildAsteriskModule,codec-gsm,linear to GSM translation,translate between signed linear and GSM,,,,codec_gsm,)) ++$(eval $(call BuildAsteriskModule,codec-ilbc,linear to ILBC translation,translate between signed linear and ILBC,,,,codec_ilbc,)) ++$(eval $(call BuildAsteriskModule,codec-lpc10,Linear to LPC10 translation,translate between signed linear and LPC10,,,,codec_lpc10,)) ++$(eval $(call BuildAsteriskModule,codec-resample,resample sLinear audio,resample sLinear audio,,,,codec_resample,)) ++$(eval $(call BuildAsteriskModule,codec-ulaw,Linear to ulaw translation,translate between signed linear and ulaw,,,,codec_ulaw,)) ++$(eval $(call BuildAsteriskModule,curl,CURL,CURL support,+libcurl,,,func_curl res_curl,)) ++$(eval $(call BuildAsteriskModule,format-g726,G.726,support for headerless G.726 16/24/32/40kbps data format,,,,format_g726,)) ++$(eval $(call BuildAsteriskModule,format-g729,G.729,support for raw headerless G729 data,,,,format_g729,)) ++$(eval $(call BuildAsteriskModule,format-gsm,GSM format,support for GSM format,,,,format_gsm,)) ++$(eval $(call BuildAsteriskModule,format-h263,H263 format,support for H264 format,,,,format_h263,)) ++$(eval $(call BuildAsteriskModule,format-h264,H264 format,support for H264 format,,,,format_h264,)) ++$(eval $(call BuildAsteriskModule,format-ilbc,ILBC format,support for ILBC format,,,,format_ilbc,)) ++$(eval $(call BuildAsteriskModule,format-pcm,PCM,support for PCM format,,,,format_pcm,)) ++$(eval $(call BuildAsteriskModule,format-sln,Raw slinear format,support for raw slinear format,,,,format_sln,)) ++$(eval $(call BuildAsteriskModule,format-vox,VOX format,support for ADPCM vox format,,,,format_vox,)) ++$(eval $(call BuildAsteriskModule,func-blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted,,,,func_blacklist,)) ++$(eval $(call BuildAsteriskModule,func-cut,CUT function,CUT function,,,,func_cut,)) ++$(eval $(call BuildAsteriskModule,func-db,Database interaction,functions for interaction with the database,,,,func_db,)) ++$(eval $(call BuildAsteriskModule,func-devstate,Blinky lights control,functions for manually controlled blinky lights,,,,func_devstate,)) ++$(eval $(call BuildAsteriskModule,func-extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control,,,,func_extstate,)) ++$(eval $(call BuildAsteriskModule,func-global,Global variable,global variable dialplan functions,,,,func_global,)) ++$(eval $(call BuildAsteriskModule,func-channel,Channel info,Channel info dialplan function,,,,func_channel,)) ++$(eval $(call BuildAsteriskModule,func-shell,Shell,support for shell execution,,,,func_shell,)) ++$(eval $(call BuildAsteriskModule,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,,func_uri,)) ++$(eval $(call BuildAsteriskModule,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,)) ++$(eval $(call BuildAsteriskModule,func-base64,base64 support,support of base64 function,,,,func_base64,)) ++$(eval $(call BuildAsteriskModule,chan-agent,Agents proxy channel, an implementation of agents proxy channel,,,,chan_agent,)) ++$(eval $(call BuildAsteriskModule,chan-iax2,IAX2 channel,IAX support,,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) ++$(eval $(call BuildAsteriskModule,chan-motif,Jingle channel,Motif Jingle Channel Driver,+asterisk11-res-xmpp,/etc/asterisk/motif.conf /etc/asterisk/jingle.conf,motif.conf jingle.conf,chan_motif,)) ++$(eval $(call BuildAsteriskModule,chan-mgcp,MGCP channel,the channel chan_mgcp,,/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,)) ++$(eval $(call BuildAsteriskModule,chan-mobile,Mobile channel,the channel chan_mobile,+bluez-libs,/etc/asterisk/chan_mobile.conf,chan_mobile.conf,chan_mobile,)) ++$(eval $(call BuildAsteriskModule,chan-skinny,Skinny channel,the channel chan_skinny,,/etc/asterisk/skinny.conf,skinny.conf,chan_skinny,)) ++$(eval $(call BuildAsteriskModule,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,/etc/asterisk/unistim.conf,unistim.conf,chan_unistim,)) ++$(eval $(call BuildAsteriskModule,mysql,MySQL,MySQL support,+libmysqlclient,/etc/asterisk/res_config_mysql.conf,res_config_mysql.conf,res_config_mysql,)) ++$(eval $(call BuildAsteriskModule,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_odbc,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc,)) ++$(eval $(call BuildAsteriskModule,pgsql,PostgreSQL,PostgreSQL support,+libpq,/etc/asterisk/cel_pgsql.conf /etc/asterisk/cdr_pgsql.conf /etc/asterisk/res_pgsql.conf,cel_pgsql.conf cdr_pgsql.conf res_pgsql.conf,cel_pgsql cdr_pgsql res_config_pgsql,)) ++$(eval $(call BuildAsteriskModule,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,,,extensions.ael,pbx_ael,)) ++$(eval $(call BuildAsteriskModule,pbx-spool,Call Spool,outgoing call spool support,,,,pbx_spool,)) ++$(eval $(call BuildAsteriskModule,pbx-lua,Lua,provides Lua resources for Asterisk,+libpthread +libc +liblua,/etc/asterisk/extensions.lua,extensions.lua,pbx_lua,)) ++$(eval $(call BuildAsteriskModule,res-ael-share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules,,,,res_ael_share,)) ++$(eval $(call BuildAsteriskModule,res-agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension,,,,res_agi,)) ++$(eval $(call BuildAsteriskModule,res-clioriginate,Calls via CLI,Originate calls via the CLI,,,,res_clioriginate,)) ++$(eval $(call BuildAsteriskModule,res-monitor,Provide Monitor,Cryptographic Signature capability,,,,res_monitor,)) ++$(eval $(call BuildAsteriskModule,res-pktccops,Provide PacketCable COPS,simple client/server model for supporting policy control over QoS signaling protocols,,/etc/asterisk/res_pktccops.conf,res_pktccops.conf,res_pktccops,)) ++$(eval $(call BuildAsteriskModule,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,/etc/asterisk/smdi.conf,smdi.conf,res_smdi,)) ++$(eval $(call BuildAsteriskModule,res-fax,FAX modules,Generic FAX resource for FAX technology resource modules,+asterisk11-res-timing-pthread,/etc/asterisk/res_fax.conf /etc/asterisk/udptl.conf,udptl.conf res_fax.conf,res_fax,)) ++$(eval $(call BuildAsteriskModule,res-fax-spandsp,Spandsp T.38 and G.711,Spandsp T.38 and G.711 FAX Resource,+asterisk11-res-fax +libspandsp +libtiff,,,res_fax_spandsp,)) ++$(eval $(call BuildAsteriskModule,res-musiconhold,MOH,Music On Hold support,,/etc/asterisk/musiconhold.conf,musiconhold.conf,res_musiconhold,)) ++$(eval $(call BuildAsteriskModule,res-srtp,SRTP,Secure RTP,+libsrtp,,,res_srtp,)) ++$(eval $(call BuildAsteriskModule,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,)) ++$(eval $(call BuildAsteriskModule,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) ++$(eval $(call BuildAsteriskModule,res-xmpp,XMPP client and component module,reference module for interfacting Asterisk directly as a client or component with XMPP server,+libiksemel +libopenssl,/etc/asterisk/xmpp.conf,xmpp.conf,res_xmpp,)) ++$(eval $(call BuildAsteriskModule,sounds,Sounds,contains sound files,,,,,a* b* d* h* i* m* p* q* s* t*)) ++$(eval $(call BuildAsteriskModule,voicemail,Voicemail,voicemail related modules,,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail res_adsi res_smdi,vm-*)) +diff --git a/feeds/packages/net/asterisk-11.x/Makefile b/feeds/packages/net/asterisk-11.x/Makefile +new file mode 100644 +index 0000000..a91a5aa +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/Makefile +@@ -0,0 +1,397 @@ ++# ++# 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:=asterisk11 ++PKG_VERSION:=11.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ ++PKG_MD5SUM:=b82a82e5adfff0383769e923bfb54c56 ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/asterisk11/install/module ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*$(2).so* $(1)/usr/lib/asterisk/modules/ ++endef ++ ++define Package/asterisk11/install/conffile ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/*$(2)* $(1)/etc/asterisk/ ++endef ++ ++define Package/asterisk11/install/lib ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/$(2).so* $(1)/usr/lib/ ++endef ++ ++define Package/asterisk11/install/sbin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(2) $(1)/usr/sbin/ ++endef ++ ++define Package/asterisk11/install/sounds ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/$(2) $(1)/usr/lib/asterisk/sounds/ ++endef ++ ++define BuildAsteriskModule ++ define Package/asterisk11-$(1) ++ $$(call Package/asterisk11/Default) ++ TITLE:=$(2) support ++ DEPENDS:= asterisk11 $(4) ++ endef ++ ++ define Package/asterisk11-$(1)/conffiles ++$(5) ++ endef ++ ++ define Package/asterisk11-$(1)/description ++ $$(call Package/asterisk11/Default/description) ++This package provides support $(3) in Asterisk. ++ endef ++ ++ define Package/asterisk11-$(1)/install ++$(foreach c,$(6),$(call Package/asterisk11/install/conffile,$$(1),$(c));) ++$(foreach m,$(7),$(call Package/asterisk11/install/module,$$(1),$(m));) ++$(foreach s,$(8),$(call Package/asterisk11/install/sounds,$$(1),$(s));) ++ endef ++ ++ $$(eval $$(call BuildPackage,asterisk11-$(1))) ++endef ++ ++define Package/asterisk11/Default ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://www.asterisk.org/ ++endef ++ ++define Package/asterisk11/Default/description ++Asterisk is a complete PBX in software. It provides all of the features ++you would expect from a PBX and more. Asterisk does voice over IP in three ++protocols, and can interoperate with almost all standards-based telephony ++equipment using relatively inexpensive hardware. ++endef ++ ++define Package/asterisk11 ++$(call Package/asterisk11/Default) ++ TITLE:=Complete open source PBX, v11.x ++ MENU:=1 ++ DEPENDS:=+libuuid +libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +zlib @!TARGET_avr32 ++endef ++ ++define Package/asterisk11/description ++$(call Package/asterisk11/Default/description) ++endef ++ ++define Package/asterisk11/conffiles ++/etc/asterisk/asterisk.conf ++/etc/asterisk/acl.conf ++/etc/asterisk/ccss.conf ++/etc/asterisk/modules.conf ++/etc/asterisk/extconfig.conf ++/etc/asterisk/extensions.conf ++/etc/asterisk/features.conf ++/etc/asterisk/indications.conf ++/etc/asterisk/logger.conf ++/etc/asterisk/manager.conf ++/etc/asterisk/rtp.conf ++/etc/asterisk/sip.conf ++/etc/asterisk/sip_notify.conf ++/etc/asterisk/udptl.conf ++/etc/default/asterisk ++/etc/init.d/asterisk ++endef ++ ++AST_CFG_FILES:= \ ++ asterisk.conf acl.conf ccss.conf extconfig.conf extensions.conf features.conf indications.conf logger.conf manager.conf modules.conf \ ++ rtp.conf sip_notify.conf sip.conf udptl.conf ++AST_EMB_MODULES:=\ ++ app_dial app_echo app_macro app_playback codec_gsm codec_ulaw format_gsm format_pcm format_wav format_wav_gsm func_callerid \ ++ func_logic func_strings func_timeout chan_sip chan_local pbx_config res_crypto res_http_websocket res_rtp_asterisk res_rtp_multicast ++ ++define Package/asterisk11/install ++$(call Package/asterisk11/install/lib,$(1),libasteriskssl) ++$(call Package/asterisk11/install/sbin,$(1),asterisk) ++$(call Package/asterisk11/install/sbin,$(1),safe_asterisk) ++$(call Package/asterisk11/install/sbin,$(1),astgenkey) ++$(foreach m,$(AST_CFG_FILES),$(call Package/asterisk11/install/conffile,$(1),$(m));) ++$(foreach m,$(AST_EMB_MODULES),$(call Package/asterisk11/install/module,$(1),$(m));) ++ $(INSTALL_DIR) $(1)/etc/default ++ $(INSTALL_DATA) ./files/asterisk.default $(1)/etc/default/asterisk ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/asterisk.init $(1)/etc/init.d/asterisk ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),) ++ CONFIGURE_ARGS+= \ ++ --with-gnutls="$(STAGING_DIR)/usr" \ ++ --with-iksemel="$(STAGING_DIR)/usr" ++ SITE_VARS+= \ ++ ac_cv_lib_iksemel_iks_start_sasl=yes \ ++ ac_cv_lib_gnutls_gnutls_bye=yes ++else ++ CONFIGURE_ARGS+= \ ++ --without-gnutls \ ++ --without-iksemel ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-curl),) ++ CONFIGURE_ARGS+= \ ++ --with-curl="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-curl ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pgsql),) ++ CONFIGURE_ARGS+= \ ++ --with-postgres="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-postgres ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-mysql),) ++ CONFIGURE_ARGS+= \ ++ --with-mysqlclient="$(STAGING_DIR)/usr/bin" ++else ++ CONFIGURE_ARGS+= \ ++ --without-mysqlclient ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),) ++ CONFIGURE_ARGS+= \ ++ --with-spandsp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-spandsp ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-chan-mobile),) ++ CONFIGURE_ARGS+= \ ++ --with-bluetooth="$(STAGING_DIR)/usr" ++else ++ ++ CONFIGURE_ARGS+= \ ++ --without-bluetooth ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-srtp),) ++ CONFIGURE_ARGS+= \ ++ --with-srtp="$(STAGING_DIR)/usr" ++else ++ CONFIGURE_ARGS+= \ ++ --without-srtp ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pbx-lua),) ++ CONFIGURE_ARGS+= \ ++ --with-lua="$(STAGING_DIR)/usr" ++ TARGET_LDFLAGS+=-ldl -lcrypt ++else ++ CONFIGURE_ARGS+= \ ++ --without-lua ++endif ++ ++EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++CONFIGURE_ARGS+= \ ++ --without-curses \ ++ --with-gsm=internal \ ++ --without-cap \ ++ --without-gtk2 \ ++ --without-isdnnet \ ++ --without-misdn \ ++ --without-nbs \ ++ --with-ncurses="$(STAGING_DIR)/usr" \ ++ --without-netsnmp \ ++ --without-newt \ ++ --without-ogg \ ++ --without-osptk \ ++ --with-popt="$(STAGING_DIR)/usr" \ ++ --without-pri \ ++ --without-qt \ ++ --without-radius \ ++ --without-sdl \ ++ --without-suppserv \ ++ --without-tds \ ++ --without-termcap \ ++ --without-tinfo \ ++ --without-vorbis \ ++ --without-vpb \ ++ --with-z="$(STAGING_DIR)/usr" \ ++ --with-sounds-cache="$(DL_DIR)" \ ++ --disable-xmldoc ++PJLIB_CONFIGURE_ARGS= \ ++ --disable-floating-point \ ++ --disable-sound \ ++ --disable-oss \ ++ --disable-speex-aec \ ++ --disable-l16-codec \ ++ --disable-gsm-codec \ ++ --disable-g722-codec \ ++ --disable-g7221-codec \ ++ --disable-speex-codec \ ++ --disable-ilbc-codec \ ++ --disable-g711-codec \ ++ --disable-opencore-amrnb \ ++ --disable-video \ ++ --disable-sdl \ ++ --disable-ffmpeg \ ++ --disable-v4l2 ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ $(PJLIB_CONFIGURE_ARGS), \ ++ LD="$(TARGET_CC)" \ ++ AR="" \ ++ CFLAGS="$(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ CXXFLAGS="$(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -lc $(LIBGCC_S) -lm" \ ++ ,res/pjproject) ++ $(MAKE) -j1 -C $(PKG_BUILD_DIR)/res/pjproject dep ++ $(MAKE) -j1 -C $(PKG_BUILD_DIR)/res/pjproject ++ $(call Build/Configure/Default,,$(SITE_VARS)) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ include/asterisk/version.h \ ++ include/asterisk/buildopts.h defaults.h \ ++ makeopts.embed_rules ++ ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" ++ ASTLDFLAGS="$(EXTRA_LDFLAGS)" ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ ASTVARLIBDIR="/usr/lib/asterisk" \ ++ ASTDATADIR="/usr/lib/asterisk" \ ++ ASTKEYDIR="/usr/lib/asterisk" \ ++ ASTDBDIR="/usr/lib/asterisk" \ ++ NOISY_BUILD="yes" \ ++ DEBUG="" \ ++ OPTIMIZE="" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install samples ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/asterisk-11/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-11/include/asterisk/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-11/include/ ++endef ++ ++$(eval $(call BuildPackage,asterisk11)) ++ ++################################ ++# AST modules ++# Params: ++# 1 - Package subname ++# 2 - Package title ++# 3 - Module description ++# 4 - Module dependencies ++# 5 - Full path to multiple conffiles ++# 6 - conf files ++# 7 - module files ++# 8 - sound files ++################################ ++ ++$(eval $(call BuildAsteriskModule,app-alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID,,,,app_alarmreceiver,)) ++$(eval $(call BuildAsteriskModule,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,,app_authenticate,)) ++$(eval $(call BuildAsteriskModule,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,,/etc/asterisk/confbridge.conf,confbridge.conf,app_confbridge,)) ++$(eval $(call BuildAsteriskModule,app-directed_pickup,Directed call pickup,support for directed call pickup,,,,app_directed_pickup,)) ++$(eval $(call BuildAsteriskModule,app-disa,Direct Inward System Access,Direct Inward System Access,,,,app_disa,)) ++$(eval $(call BuildAsteriskModule,app-exec,Exec application,support for application execution,,,,app_exec,)) ++$(eval $(call BuildAsteriskModule,app-chanisavail,Channel availability check,support for checking if a channel is available,,,,app_chanisavail,)) ++$(eval $(call BuildAsteriskModule,app-chanspy,Channel listen in,support for listening in on any channel,,,,app_chanspy,)) ++$(eval $(call BuildAsteriskModule,app-minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail,,/etc/asterisk/extensions_minivm.conf /etc/asterisk/minivm.conf,extensions_minivm.conf minivm.conf,app_minivm,)) ++$(eval $(call BuildAsteriskModule,app-mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording,,,,app_mixmonitor,)) ++$(eval $(call BuildAsteriskModule,app-originate,Originate a call,originating an outbound call and connecting it to a specified extension or application,,,,app_originate,)) ++$(eval $(call BuildAsteriskModule,app-playtones,Playtones application,play a tone list,,,,app_playtones,)) ++$(eval $(call BuildAsteriskModule,app-read,Variable read,a trivial application to read a variable,,,,app_read,)) ++$(eval $(call BuildAsteriskModule,app-readexten,Extension to variable,a trivial application to read an extension into a variable,,,,app_readexten,)) ++$(eval $(call BuildAsteriskModule,app-record,Record sound file,to record a sound file,,,,app_record,)) ++$(eval $(call BuildAsteriskModule,app-sayunixtime,Say Unix time,an application to say Unix time,,,,app_sayunixtime,)) ++$(eval $(call BuildAsteriskModule,app-senddtmf,Send DTMF digits,Sends arbitrary DTMF digits,,,,app_senddtmf,)) ++$(eval $(call BuildAsteriskModule,app-sms,SMS,SMS support (ETSI ES 201 912 protocol 1),,,,app_sms,)) ++$(eval $(call BuildAsteriskModule,app-stack,Stack applications, stack applications Gosub Return etc., +asterisk11-res-agi,,,app_stack,)) ++$(eval $(call BuildAsteriskModule,app-system,System exec,support for executing system commands,,,,app_system,)) ++$(eval $(call BuildAsteriskModule,app-talkdetect,File playback with audio detect,for file playback with audio detect,,,,app_talkdetect,)) ++$(eval $(call BuildAsteriskModule,app-verbose,Verbose logging,Verbose logging application,,,,app_verbose,)) ++$(eval $(call BuildAsteriskModule,app-waituntil,Sleep,support sleeping until the given epoch,,,,app_waituntil,)) ++$(eval $(call BuildAsteriskModule,app-while,While loop,a while loop implementation,,,,app_while,)) ++$(eval $(call BuildAsteriskModule,cdr-core,Provides CDR,Call Detail Record,,/etc/asterisk/cdr.conf /etc/asterisk/cdr_custom.conf /etc/asterisk/cdr_manager.conf /etc/asterisk/cdr_odbc.conf /etc/asterisk/cdr_pgsql.conf /etc/asterisk/cdr_tds.conf,cdr_adaptive_odbc cdr cdr_custom cdr_manager cdr_syslog,app_cdr app_forkcdr cdr_adaptive_odbc cdr_custom cdr_manager cdr_syslog func_cdr,)) ++$(eval $(call BuildAsteriskModule,cdr-csv,Provides CDR CSV,Call Detail Record with CSV support,,,,cdr_csv,)) ++$(eval $(call BuildAsteriskModule,cdr-sqlite3,Provides CDR SQLITE3,Call Detail Record with SQLITE3 support,libsqlite3,,,cdr_sqlite3_custom,)) ++$(eval $(call BuildAsteriskModule,codec-a-mu,Alaw to ulaw translation,translation between alaw and ulaw codecs,,,,codec_a_mu,)) ++$(eval $(call BuildAsteriskModule,codec-adpcm,ADPCM text,ADPCM text ,,,,codec_adpcm,)) ++$(eval $(call BuildAsteriskModule,codec-alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs,,,,codec_alaw,)) ++$(eval $(call BuildAsteriskModule,codec-g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec,,,,codec_g722,)) ++$(eval $(call BuildAsteriskModule,codec-g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs,,,,codec_g726,)) ++$(eval $(call BuildAsteriskModule,codec-gsm,linear to GSM translation,translate between signed linear and GSM,,,,codec_gsm,)) ++$(eval $(call BuildAsteriskModule,codec-ilbc,linear to ILBC translation,translate between signed linear and ILBC,,,,codec_ilbc,)) ++$(eval $(call BuildAsteriskModule,codec-lpc10,Linear to LPC10 translation,translate between signed linear and LPC10,,,,codec_lpc10,)) ++$(eval $(call BuildAsteriskModule,codec-resample,resample sLinear audio,resample sLinear audio,,,,codec_resample,)) ++$(eval $(call BuildAsteriskModule,codec-ulaw,Linear to ulaw translation,translate between signed linear and ulaw,,,,codec_ulaw,)) ++$(eval $(call BuildAsteriskModule,curl,CURL,CURL support,+libcurl,,,func_curl res_curl,)) ++$(eval $(call BuildAsteriskModule,format-g726,G.726,support for headerless G.726 16/24/32/40kbps data format,,,,format_g726,)) ++$(eval $(call BuildAsteriskModule,format-g729,G.729,support for raw headerless G729 data,,,,format_g729,)) ++$(eval $(call BuildAsteriskModule,format-gsm,GSM format,support for GSM format,,,,format_gsm,)) ++$(eval $(call BuildAsteriskModule,format-h263,H263 format,support for H264 format,,,,format_h263,)) ++$(eval $(call BuildAsteriskModule,format-h264,H264 format,support for H264 format,,,,format_h264,)) ++$(eval $(call BuildAsteriskModule,format-ilbc,ILBC format,support for ILBC format,,,,format_ilbc,)) ++$(eval $(call BuildAsteriskModule,format-pcm,PCM,support for PCM format,,,,format_pcm,)) ++$(eval $(call BuildAsteriskModule,format-sln,Raw slinear format,support for raw slinear format,,,,format_sln,)) ++$(eval $(call BuildAsteriskModule,format-vox,VOX format,support for ADPCM vox format,,,,format_vox,)) ++$(eval $(call BuildAsteriskModule,func-blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted,,,,func_blacklist,)) ++$(eval $(call BuildAsteriskModule,func-cut,CUT function,CUT function,,,,func_cut,)) ++$(eval $(call BuildAsteriskModule,func-db,Database interaction,functions for interaction with the database,,,,func_db,)) ++$(eval $(call BuildAsteriskModule,func-devstate,Blinky lights control,functions for manually controlled blinky lights,,,,func_devstate,)) ++$(eval $(call BuildAsteriskModule,func-extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control,,,,func_extstate,)) ++$(eval $(call BuildAsteriskModule,func-global,Global variable,global variable dialplan functions,,,,func_global,)) ++$(eval $(call BuildAsteriskModule,func-channel,Channel info,Channel info dialplan function,,,,func_channel,)) ++$(eval $(call BuildAsteriskModule,func-shell,Shell,support for shell execution,,,,func_shell,)) ++$(eval $(call BuildAsteriskModule,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,,func_uri,)) ++$(eval $(call BuildAsteriskModule,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,)) ++$(eval $(call BuildAsteriskModule,func-base64,base64 support,support of base64 function,,,,func_base64,)) ++$(eval $(call BuildAsteriskModule,chan-agent,Agents proxy channel, an implementation of agents proxy channel,,,,chan_agent,)) ++$(eval $(call BuildAsteriskModule,chan-iax2,IAX2 channel,IAX support,,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) ++$(eval $(call BuildAsteriskModule,chan-motif,Jingle channel,Motif Jingle Channel Driver,+asterisk11-res-xmpp,/etc/asterisk/motif.conf /etc/asterisk/jingle.conf,motif.conf jingle.conf,chan_motif,)) ++$(eval $(call BuildAsteriskModule,chan-mgcp,MGCP channel,the channel chan_mgcp,,/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,)) ++$(eval $(call BuildAsteriskModule,chan-mobile,Mobile channel,the channel chan_mobile,+bluez-libs,/etc/asterisk/chan_mobile.conf,chan_mobile.conf,chan_mobile,)) ++$(eval $(call BuildAsteriskModule,chan-skinny,Skinny channel,the channel chan_skinny,,/etc/asterisk/skinny.conf,skinny.conf,chan_skinny,)) ++$(eval $(call BuildAsteriskModule,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,/etc/asterisk/unistim.conf,unistim.conf,chan_unistim,)) ++$(eval $(call BuildAsteriskModule,mysql,MySQL,MySQL support,+libmysqlclient,/etc/asterisk/res_config_mysql.conf,res_config_mysql.conf,res_config_mysql,)) ++$(eval $(call BuildAsteriskModule,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_odbc,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc,)) ++$(eval $(call BuildAsteriskModule,pgsql,PostgreSQL,PostgreSQL support,+libpq,/etc/asterisk/cel_pgsql.conf /etc/asterisk/cdr_pgsql.conf /etc/asterisk/res_pgsql.conf,cel_pgsql.conf cdr_pgsql.conf res_pgsql.conf,cel_pgsql cdr_pgsql res_config_pgsql,)) ++$(eval $(call BuildAsteriskModule,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,,,extensions.ael,pbx_ael,)) ++$(eval $(call BuildAsteriskModule,pbx-spool,Call Spool,outgoing call spool support,,,,pbx_spool,)) ++$(eval $(call BuildAsteriskModule,pbx-lua,Lua,provides Lua resources for Asterisk,+libpthread +libc +liblua,/etc/asterisk/extensions.lua,extensions.lua,pbx_lua,)) ++$(eval $(call BuildAsteriskModule,res-ael-share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules,,,,res_ael_share,)) ++$(eval $(call BuildAsteriskModule,res-agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension,,,,res_agi,)) ++$(eval $(call BuildAsteriskModule,res-clioriginate,Calls via CLI,Originate calls via the CLI,,,,res_clioriginate,)) ++$(eval $(call BuildAsteriskModule,res-monitor,Provide Monitor,Cryptographic Signature capability,,,,res_monitor,)) ++$(eval $(call BuildAsteriskModule,res-pktccops,Provide PacketCable COPS,simple client/server model for supporting policy control over QoS signaling protocols,,/etc/asterisk/res_pktccops.conf,res_pktccops.conf,res_pktccops,)) ++$(eval $(call BuildAsteriskModule,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,/etc/asterisk/smdi.conf,smdi.conf,res_smdi,)) ++$(eval $(call BuildAsteriskModule,res-fax,FAX modules,Generic FAX resource for FAX technology resource modules,+asterisk11-res-timing-pthread,/etc/asterisk/res_fax.conf /etc/asterisk/udptl.conf,udptl.conf res_fax.conf,res_fax,)) ++$(eval $(call BuildAsteriskModule,res-fax-spandsp,Spandsp T.38 and G.711,Spandsp T.38 and G.711 FAX Resource,+asterisk11-res-fax +libspandsp +libtiff,,,res_fax_spandsp,)) ++$(eval $(call BuildAsteriskModule,res-musiconhold,MOH,Music On Hold support,,/etc/asterisk/musiconhold.conf,musiconhold.conf,res_musiconhold,)) ++$(eval $(call BuildAsteriskModule,res-srtp,SRTP,Secure RTP,+libsrtp,,,res_srtp,)) ++$(eval $(call BuildAsteriskModule,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,)) ++$(eval $(call BuildAsteriskModule,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) ++$(eval $(call BuildAsteriskModule,res-xmpp,XMPP client and component module,reference module for interfacting Asterisk directly as a client or component with XMPP server,+libiksemel +libopenssl,/etc/asterisk/xmpp.conf,xmpp.conf,res_xmpp,)) ++$(eval $(call BuildAsteriskModule,sounds,Sounds,contains sound files,,,,,a* b* d* h* i* m* p* q* s* t*)) ++$(eval $(call BuildAsteriskModule,voicemail,Voicemail,voicemail related modules,,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail res_adsi res_smdi,vm-*)) +diff --git a/feeds/packages/net/asterisk-11.x/files/.svn/entries b/feeds/packages/net/asterisk-11.x/files/.svn/entries +new file mode 100644 +index 0000000..beaa3f6 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-11.x/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++asterisk.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++709b5bf685963c37da62ccfc97ce92f4 ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1016 ++ ++asterisk.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++beb679feb84cfd71b41819f658c73f05 ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++78 ++ +diff --git a/feeds/packages/net/asterisk-11.x/files/.svn/text-base/asterisk.default.svn-base b/feeds/packages/net/asterisk-11.x/files/.svn/text-base/asterisk.default.svn-base +new file mode 100644 +index 0000000..9d046c4 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/files/.svn/text-base/asterisk.default.svn-base +@@ -0,0 +1,4 @@ ++## startup options for /etc/init.d/asterisk ++ ++ENABLE_ASTERISK="yes" ++OPTIONS="" +diff --git a/feeds/packages/net/asterisk-11.x/files/.svn/text-base/asterisk.init.svn-base b/feeds/packages/net/asterisk-11.x/files/.svn/text-base/asterisk.init.svn-base +new file mode 100644 +index 0000000..8761561 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/files/.svn/text-base/asterisk.init.svn-base +@@ -0,0 +1,35 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2013 OpenWrt.org ++ ++. /lib/functions/service.sh ++ ++START=99 ++APP=asterisk ++OPTIONS= ++DEST= ++DEFAULT=$DEST/etc/default/$APP ++BIN_FILE=$DEST/usr/sbin/$APP ++PID_FILE=$DEST/var/run/$APP/$APP.pid ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ [ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk ++ [ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk ++ [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk ++ [ -d $DEST/var/lib ] || mkdir -p $DEST/var/lib ++ [ -h $DEST/var/lib/asterisk ] || ln -s /usr/lib/asterisk /var/lib/asterisk ++ [ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys ++ ++ SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \ ++ service_start $BIN_FILE $OPTIONS ++} ++ ++stop() { ++ SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \ ++ service_stop $BIN_FILE ++} ++ ++reload() { ++ SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \ ++ service_reload $BIN_FILE ++} +diff --git a/feeds/packages/net/asterisk-11.x/files/asterisk.default b/feeds/packages/net/asterisk-11.x/files/asterisk.default +new file mode 100644 +index 0000000..9d046c4 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/files/asterisk.default +@@ -0,0 +1,4 @@ ++## startup options for /etc/init.d/asterisk ++ ++ENABLE_ASTERISK="yes" ++OPTIONS="" +diff --git a/feeds/packages/net/asterisk-11.x/files/asterisk.init b/feeds/packages/net/asterisk-11.x/files/asterisk.init +new file mode 100644 +index 0000000..8761561 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/files/asterisk.init +@@ -0,0 +1,35 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2013 OpenWrt.org ++ ++. /lib/functions/service.sh ++ ++START=99 ++APP=asterisk ++OPTIONS= ++DEST= ++DEFAULT=$DEST/etc/default/$APP ++BIN_FILE=$DEST/usr/sbin/$APP ++PID_FILE=$DEST/var/run/$APP/$APP.pid ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ [ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk ++ [ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk ++ [ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk ++ [ -d $DEST/var/lib ] || mkdir -p $DEST/var/lib ++ [ -h $DEST/var/lib/asterisk ] || ln -s /usr/lib/asterisk /var/lib/asterisk ++ [ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys ++ ++ SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \ ++ service_start $BIN_FILE $OPTIONS ++} ++ ++stop() { ++ SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \ ++ service_stop $BIN_FILE ++} ++ ++reload() { ++ SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \ ++ service_reload $BIN_FILE ++} +diff --git a/feeds/packages/net/asterisk-11.x/patches/.svn/entries b/feeds/packages/net/asterisk-11.x/patches/.svn/entries +new file mode 100644 +index 0000000..928f844 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-11.x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-pjlib-move-configure-compile-to-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++2fb8b24915592b0a5f43dc3c29131463 ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++656 ++ ++010-asterisk-configure-undef-res-ninit.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++dd8db6cea3c005943d1702dc1456d776 ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++376 ++ ++020-asterisk-enable-default-modules.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++d11585c8cb283bec8d76828a92441223 ++2013-02-10T17:17:09.548133Z ++35540 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++735 ++ +diff --git a/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/000-pjlib-move-configure-compile-to-makefile.patch.svn-base b/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/000-pjlib-move-configure-compile-to-makefile.patch.svn-base +new file mode 100644 +index 0000000..9ee14e1 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/000-pjlib-move-configure-compile-to-makefile.patch.svn-base +@@ -0,0 +1,17 @@ ++--- a/res/Makefile +++++ b/res/Makefile ++@@ -70,14 +70,8 @@ clean:: ++ $(MAKE) -C pjproject realclean ++ rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i ++ ++-pjproject/build.mak: ++- cd pjproject && ./configure AR="" CFLAGS=-fPIC --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec ++ ++ .PHONY : pjproject ++-pjproject: pjproject/build.mak ++- # Make sure we always build pjproject with a single job. ++- $(MAKE) -j1 -C pjproject dep ++- $(MAKE) -j1 -C pjproject ++ ++ include pjproject/build.mak ++ +diff --git a/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/010-asterisk-configure-undef-res-ninit.patch.svn-base b/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/010-asterisk-configure-undef-res-ninit.patch.svn-base +new file mode 100644 +index 0000000..4e1e448 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/010-asterisk-configure-undef-res-ninit.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -24043,9 +24043,6 @@ $as_echo "$ac_try_echo") >&5 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ $as_echo "yes" >&6; } ++ ++-cat >>confdefs.h <<\_ACEOF ++-#define HAVE_RES_NINIT 1 ++-_ACEOF ++ ++ { $as_echo "$as_me:$LINENO: checking for library containing res_9_ndestroy" >&5 ++ $as_echo_n "checking for library containing res_9_ndestroy... " >&6; } +diff --git a/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/020-asterisk-enable-default-modules.patch.svn-base b/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/020-asterisk-enable-default-modules.patch.svn-base +new file mode 100644 +index 0000000..07ca670 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/.svn/text-base/020-asterisk-enable-default-modules.patch.svn-base +@@ -0,0 +1,33 @@ ++--- a/addons/chan_mobile.c +++++ b/addons/chan_mobile.c ++@@ -27,7 +27,7 @@ ++ ++ /*** MODULEINFO ++ bluetooth ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/addons/res_config_mysql.c +++++ b/addons/res_config_mysql.c ++@@ -24,7 +24,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/res/res_pktccops.c +++++ b/res/res_pktccops.c ++@@ -31,7 +31,7 @@ ++ */ ++ ++ /*** MODULEINFO ++- no +++ yes ++ extended ++ ***/ ++ +diff --git a/feeds/packages/net/asterisk-11.x/patches/000-pjlib-move-configure-compile-to-makefile.patch b/feeds/packages/net/asterisk-11.x/patches/000-pjlib-move-configure-compile-to-makefile.patch +new file mode 100644 +index 0000000..9ee14e1 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/000-pjlib-move-configure-compile-to-makefile.patch +@@ -0,0 +1,17 @@ ++--- a/res/Makefile +++++ b/res/Makefile ++@@ -70,14 +70,8 @@ clean:: ++ $(MAKE) -C pjproject realclean ++ rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i ++ ++-pjproject/build.mak: ++- cd pjproject && ./configure AR="" CFLAGS=-fPIC --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec ++ ++ .PHONY : pjproject ++-pjproject: pjproject/build.mak ++- # Make sure we always build pjproject with a single job. ++- $(MAKE) -j1 -C pjproject dep ++- $(MAKE) -j1 -C pjproject ++ ++ include pjproject/build.mak ++ +diff --git a/feeds/packages/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/feeds/packages/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +new file mode 100644 +index 0000000..4e1e448 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -24043,9 +24043,6 @@ $as_echo "$ac_try_echo") >&5 ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ $as_echo "yes" >&6; } ++ ++-cat >>confdefs.h <<\_ACEOF ++-#define HAVE_RES_NINIT 1 ++-_ACEOF ++ ++ { $as_echo "$as_me:$LINENO: checking for library containing res_9_ndestroy" >&5 ++ $as_echo_n "checking for library containing res_9_ndestroy... " >&6; } +diff --git a/feeds/packages/net/asterisk-11.x/patches/020-asterisk-enable-default-modules.patch b/feeds/packages/net/asterisk-11.x/patches/020-asterisk-enable-default-modules.patch +new file mode 100644 +index 0000000..07ca670 +--- /dev/null ++++ b/feeds/packages/net/asterisk-11.x/patches/020-asterisk-enable-default-modules.patch +@@ -0,0 +1,33 @@ ++--- a/addons/chan_mobile.c +++++ b/addons/chan_mobile.c ++@@ -27,7 +27,7 @@ ++ ++ /*** MODULEINFO ++ bluetooth ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/addons/res_config_mysql.c +++++ b/addons/res_config_mysql.c ++@@ -24,7 +24,7 @@ ++ ++ /*** MODULEINFO ++ mysqlclient ++- no +++ yes ++ extended ++ ***/ ++ ++--- a/res/res_pktccops.c +++++ b/res/res_pktccops.c ++@@ -31,7 +31,7 @@ ++ */ ++ ++ /*** MODULEINFO ++- no +++ yes ++ extended ++ ***/ ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/.svn/entries b/feeds/packages/net/asterisk-chan-sccp-b/.svn/entries +new file mode 100644 +index 0000000..94acf13 +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-chan-sccp-b ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-20T13:54:41.021594Z ++35692 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++71c516e01593fa2b914f73b515a2ae20 ++2013-02-20T13:54:41.021594Z ++35692 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1639 ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/.svn/text-base/Makefile.svn-base b/feeds/packages/net/asterisk-chan-sccp-b/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..406c59e +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=asterisk18-chan-sccp-b ++PKG_REV=3004 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/trunk ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/asterisk18-chan-sccp-b ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=SCCP channel provider for asterisk ++ URL:=http://chan-sccp-b.net.sourceforge.net/ ++ MAINTAINER:=Hans Zandbelt ++ DEPENDS:=+asterisk18 +libltdl ++endef ++ ++define Package/asterisk18-chan-sccp-b/description ++ SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered ++ by asterisk by default. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8 ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ CFLAGS="$(CFLAGS) -DLOW_MEMORY" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/asterisk18-chan-sccp-b/conffiles ++/etc/asterisk/sccp.conf ++endef ++ ++define Package/asterisk18-chan-sccp-b/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++$(eval $(call BuildPackage,asterisk18-chan-sccp-b)) +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/Makefile b/feeds/packages/net/asterisk-chan-sccp-b/Makefile +new file mode 100644 +index 0000000..406c59e +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=asterisk18-chan-sccp-b ++PKG_REV=3004 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/trunk ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/asterisk18-chan-sccp-b ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=SCCP channel provider for asterisk ++ URL:=http://chan-sccp-b.net.sourceforge.net/ ++ MAINTAINER:=Hans Zandbelt ++ DEPENDS:=+asterisk18 +libltdl ++endef ++ ++define Package/asterisk18-chan-sccp-b/description ++ SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered ++ by asterisk by default. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8 ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ CFLAGS="$(CFLAGS) -DLOW_MEMORY" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/asterisk18-chan-sccp-b/conffiles ++/etc/asterisk/sccp.conf ++endef ++ ++define Package/asterisk18-chan-sccp-b/install ++ $(INSTALL_DIR) $(1)/etc/asterisk ++ $(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf ++ $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ ++endef ++ ++$(eval $(call BuildPackage,asterisk18-chan-sccp-b)) +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/files/.svn/entries b/feeds/packages/net/asterisk-chan-sccp-b/files/.svn/entries +new file mode 100644 +index 0000000..59cde4c +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-chan-sccp-b/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-06T16:17:32.615784Z ++28374 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++sccp.openwrt.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++d949870b3cd536c1406c71b1594a43f4 ++2011-10-06T16:17:32.615784Z ++28374 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1458 ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/files/.svn/text-base/sccp.openwrt.conf.svn-base b/feeds/packages/net/asterisk-chan-sccp-b/files/.svn/text-base/sccp.openwrt.conf.svn-base +new file mode 100644 +index 0000000..c59f4cd +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/files/.svn/text-base/sccp.openwrt.conf.svn-base +@@ -0,0 +1,89 @@ ++[general] ++servername = Openwrt ++keepalive = 60 ++debug = core ++context = default ++dateformat = D/M/Y ++bindaddr = 192.168.1.1 ++port = 2000 ++disallow=all ++allow=ulaw ++allow=alaw ++allow=gsm ++firstdigittimeout = 16 ++digittimeout = 6 ++autoanswer_ring_time = 1 ++musicclass=default ++language=en ++deny=0.0.0.0/0.0.0.0 ++permit=192.168.1.0/255.255.255.0 ++protocolversion=17 ++ ++hotline_enabled=yes ++hotline_context=default ++hotline_extension=111 ++ ++[SEP001122334455] ++type = device ++description = Phone Number One ++devicetype = 7940 ++button = line, 111 ++button = line, 113@01:shared ++button = speeddial,Phone 2 Line 1, 112, 112@hint ++ ++[SEP00a1a2a3a4a5] ++type = device ++description = Phone Number Two ++devicetype = 7960 ++button = line, 112 ++button = line, 113@01:shared ++button = speeddial,Phone 1 Line 1, 111, 111@hint ++ ++[111] ++id = 1000 ++type = line ++pin = 1234 ++label = Phone 1 Line 1 ++description = Line 111 ++mailbox = 10111 ++cid_name = Phone 1 CID ++cid_num = 111 ++accountcode=79111 ++callgroup=1 ++pickupgroup=1 ++context = default ++incominglimit = 2 ++vmnum = 600 ++trnsfvm = 1000 ++ ++[112] ++id = 1001 ++type = line ++pin = 1234 ++label = Phone 2 Line 1 ++description = Line 112 ++mailbox = 10112 ++cid_name = Phone 2 CID ++cid_num = 112 ++accountcode=79112 ++callgroup=1 ++pickupgroup=1 ++context = default ++incominglimit = 2 ++vmnum = 600 ++trnsfvm = 1000 ++ ++[113] ++id = 1002 ++type = line ++pin = 1234 ++label = SharedLine 1 ++description = Line 113 ++mailbox = 10113 ++cid_name = Shared ++cid_num = 113 ++accountcode=79113 ++incominglimit = 2 ++vmnum = 600 ++trnsfvm = 1000 ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/files/sccp.openwrt.conf b/feeds/packages/net/asterisk-chan-sccp-b/files/sccp.openwrt.conf +new file mode 100644 +index 0000000..c59f4cd +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/files/sccp.openwrt.conf +@@ -0,0 +1,89 @@ ++[general] ++servername = Openwrt ++keepalive = 60 ++debug = core ++context = default ++dateformat = D/M/Y ++bindaddr = 192.168.1.1 ++port = 2000 ++disallow=all ++allow=ulaw ++allow=alaw ++allow=gsm ++firstdigittimeout = 16 ++digittimeout = 6 ++autoanswer_ring_time = 1 ++musicclass=default ++language=en ++deny=0.0.0.0/0.0.0.0 ++permit=192.168.1.0/255.255.255.0 ++protocolversion=17 ++ ++hotline_enabled=yes ++hotline_context=default ++hotline_extension=111 ++ ++[SEP001122334455] ++type = device ++description = Phone Number One ++devicetype = 7940 ++button = line, 111 ++button = line, 113@01:shared ++button = speeddial,Phone 2 Line 1, 112, 112@hint ++ ++[SEP00a1a2a3a4a5] ++type = device ++description = Phone Number Two ++devicetype = 7960 ++button = line, 112 ++button = line, 113@01:shared ++button = speeddial,Phone 1 Line 1, 111, 111@hint ++ ++[111] ++id = 1000 ++type = line ++pin = 1234 ++label = Phone 1 Line 1 ++description = Line 111 ++mailbox = 10111 ++cid_name = Phone 1 CID ++cid_num = 111 ++accountcode=79111 ++callgroup=1 ++pickupgroup=1 ++context = default ++incominglimit = 2 ++vmnum = 600 ++trnsfvm = 1000 ++ ++[112] ++id = 1001 ++type = line ++pin = 1234 ++label = Phone 2 Line 1 ++description = Line 112 ++mailbox = 10112 ++cid_name = Phone 2 CID ++cid_num = 112 ++accountcode=79112 ++callgroup=1 ++pickupgroup=1 ++context = default ++incominglimit = 2 ++vmnum = 600 ++trnsfvm = 1000 ++ ++[113] ++id = 1002 ++type = line ++pin = 1234 ++label = SharedLine 1 ++description = Line 113 ++mailbox = 10113 ++cid_name = Shared ++cid_num = 113 ++accountcode=79113 ++incominglimit = 2 ++vmnum = 600 ++trnsfvm = 1000 ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/entries b/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/entries +new file mode 100644 +index 0000000..b81a9cf +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/asterisk-chan-sccp-b/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-28T09:25:54.930390Z ++28647 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-register-file-version.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++4e20a5d29a1ece3d9701dc7e74a6072f ++2011-10-28T09:25:54.930390Z ++28647 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++528 ++ ++300-stdarg.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++283d436d869f648df4d31eb25f6a8fdd ++2011-10-28T09:25:54.930390Z ++28647 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++233 ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/text-base/200-register-file-version.patch.svn-base b/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/text-base/200-register-file-version.patch.svn-base +new file mode 100644 +index 0000000..81ca9d3 +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/text-base/200-register-file-version.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/src/chan_sccp.h +++++ b/src/chan_sccp.h ++@@ -127,15 +127,7 @@ extern "C" { ++ # define CHECK_LEAKS() ++ # endif ++ ++-# define SCCP_FILE_VERSION(file, version) \ ++- static void __attribute__((constructor)) __register_file_version(void) \ ++- { \ ++- pbx_register_file_version(file, version); \ ++- } \ ++- static void __attribute__((destructor)) __unregister_file_version(void) \ ++- { \ ++- pbx_unregister_file_version(file); \ ++- } +++# define SCCP_FILE_VERSION(file, version) ++ ++ # define DEV_ID_LOG(x) x ? x->id : "SCCP" ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/text-base/300-stdarg.patch.svn-base b/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/text-base/300-stdarg.patch.svn-base +new file mode 100644 +index 0000000..be91ed7 +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/patches/.svn/text-base/300-stdarg.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/src/chan_sccp.h +++++ b/src/chan_sccp.h ++@@ -32,6 +32,7 @@ extern "C" { ++ #include "common.h" ++ #include ++ #include "asterisk/compiler.h" +++#include ++ #include "asterisk/lock.h" ++ #include "asterisk/abstract_jb.h" ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch b/feeds/packages/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch +new file mode 100644 +index 0000000..81ca9d3 +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch +@@ -0,0 +1,19 @@ ++--- a/src/chan_sccp.h +++++ b/src/chan_sccp.h ++@@ -127,15 +127,7 @@ extern "C" { ++ # define CHECK_LEAKS() ++ # endif ++ ++-# define SCCP_FILE_VERSION(file, version) \ ++- static void __attribute__((constructor)) __register_file_version(void) \ ++- { \ ++- pbx_register_file_version(file, version); \ ++- } \ ++- static void __attribute__((destructor)) __unregister_file_version(void) \ ++- { \ ++- pbx_unregister_file_version(file); \ ++- } +++# define SCCP_FILE_VERSION(file, version) ++ ++ # define DEV_ID_LOG(x) x ? x->id : "SCCP" ++ +diff --git a/feeds/packages/net/asterisk-chan-sccp-b/patches/300-stdarg.patch b/feeds/packages/net/asterisk-chan-sccp-b/patches/300-stdarg.patch +new file mode 100644 +index 0000000..be91ed7 +--- /dev/null ++++ b/feeds/packages/net/asterisk-chan-sccp-b/patches/300-stdarg.patch +@@ -0,0 +1,10 @@ ++--- a/src/chan_sccp.h +++++ b/src/chan_sccp.h ++@@ -32,6 +32,7 @@ extern "C" { ++ #include "common.h" ++ #include ++ #include "asterisk/compiler.h" +++#include ++ #include "asterisk/lock.h" ++ #include "asterisk/abstract_jb.h" ++ +diff --git a/feeds/packages/net/atftp/.svn/entries b/feeds/packages/net/atftp/.svn/entries +new file mode 100644 +index 0000000..98d6ff9 +--- /dev/null ++++ b/feeds/packages/net/atftp/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/atftp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T21:56:35.368344Z ++32547 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++d5c61b621c14be53118ce0c478f741bb ++2012-06-29T21:56:35.368344Z ++32547 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1452 ++ +diff --git a/feeds/packages/net/atftp/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/atftp/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/atftp/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/atftp/.svn/text-base/Makefile.svn-base b/feeds/packages/net/atftp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e15f410 +--- /dev/null ++++ b/feeds/packages/net/atftp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,69 @@ ++# ++# 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:=atftp ++PKG_VERSION:=0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/ ++PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82 ++ ++PKG_BUILD_DEPENDS:=libncurses libpcre libreadline ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/atftp/Default ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=TFTP ++ SUBMENU:=File Transfer ++endef ++ ++define Package/atftp ++ $(call Package/atftp/Default) ++ DEPENDS:=+libreadline +libncurses ++ TITLE+= client ++endef ++ ++define Package/atftpd ++ $(call Package/atftp/Default) ++ DEPENDS:=+libpcre +libpthread ++ TITLE+= server ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-libwrap ++ ++ifdef CONFIG_USE_EGLIBC ++ TARGET_CFLAGS += -DHAVE_ARGZ=1 ++ ++ define Build/Prepare ++ $(Build/Prepare/Default) ++ echo '#include_next ' > $(PKG_BUILD_DIR)/argz.h ++ endef ++endif ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \ ++ all ++ ++define Package/atftp/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin/ ++endef ++ ++define Package/atftpd/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftpd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,atftp)) ++$(eval $(call BuildPackage,atftpd)) +diff --git a/feeds/packages/net/atftp/Makefile b/feeds/packages/net/atftp/Makefile +new file mode 100644 +index 0000000..e15f410 +--- /dev/null ++++ b/feeds/packages/net/atftp/Makefile +@@ -0,0 +1,69 @@ ++# ++# 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:=atftp ++PKG_VERSION:=0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/ ++PKG_MD5SUM:=3b27365772d918050b2251d98a9c7c82 ++ ++PKG_BUILD_DEPENDS:=libncurses libpcre libreadline ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/atftp/Default ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=TFTP ++ SUBMENU:=File Transfer ++endef ++ ++define Package/atftp ++ $(call Package/atftp/Default) ++ DEPENDS:=+libreadline +libncurses ++ TITLE+= client ++endef ++ ++define Package/atftpd ++ $(call Package/atftp/Default) ++ DEPENDS:=+libpcre +libpthread ++ TITLE+= server ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-libwrap ++ ++ifdef CONFIG_USE_EGLIBC ++ TARGET_CFLAGS += -DHAVE_ARGZ=1 ++ ++ define Build/Prepare ++ $(Build/Prepare/Default) ++ echo '#include_next ' > $(PKG_BUILD_DIR)/argz.h ++ endef ++endif ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -D_REENTRANT" \ ++ all ++ ++define Package/atftp/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftp $(1)/usr/sbin/ ++endef ++ ++define Package/atftpd/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/atftpd $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,atftp)) ++$(eval $(call BuildPackage,atftpd)) +diff --git a/feeds/packages/net/atftp/patches/.svn/entries b/feeds/packages/net/atftp/patches/.svn/entries +new file mode 100644 +index 0000000..01973ef +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/atftp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-04T18:57:20.138708Z ++15601 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-services.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++73c00a74cfd14dfc841056fbb912fc87 ++2007-08-02T21:13:22.018973Z ++8321 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2522 ++ ++120-retry_setting.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++daf5d21c8ba4229c74c67befe7441e61 ++2007-08-02T21:13:22.018973Z ++8321 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4934 ++ ++130-missing_include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++da5f140c3e181947f39cdf4849d7975b ++2009-05-04T18:57:20.138708Z ++15601 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++720 ++ ++100-mconfig.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++b6e44e4031afcc90c0b89e2c34cfdf0c ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++472 ++ +diff --git a/feeds/packages/net/atftp/patches/.svn/prop-base/100-mconfig.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/prop-base/100-mconfig.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/prop-base/100-mconfig.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/atftp/patches/.svn/prop-base/110-services.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/prop-base/110-services.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/prop-base/110-services.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/atftp/patches/.svn/prop-base/120-retry_setting.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/prop-base/120-retry_setting.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/prop-base/120-retry_setting.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/atftp/patches/.svn/text-base/100-mconfig.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/text-base/100-mconfig.patch.svn-base +new file mode 100644 +index 0000000..01c1e36 +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/text-base/100-mconfig.patch.svn-base +@@ -0,0 +1,21 @@ ++Index: atftp-0.7/MCONFIG ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ atftp-0.7/MCONFIG 2007-08-02 23:04:23.000000000 +0200 ++@@ -0,0 +1,16 @@ +++# Generated by configure (confgen version 2) on Sun Jun 19 21:13:24 CEST 2005 +++# +++ +++BINDIR=/usr/bin +++SBINDIR=/usr/sbin +++MANDIR=/usr/man +++BINMODE=755 +++DAEMONMODE=755 +++MANMODE=644 +++PREFIX=/usr +++EXECPREFIX=/usr +++INSTALLROOT= +++CC= +++CFLAGS= +++LDFLAGS= +++LIBS= +diff --git a/feeds/packages/net/atftp/patches/.svn/text-base/110-services.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/text-base/110-services.patch.svn-base +new file mode 100644 +index 0000000..ab3e1fb +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/text-base/110-services.patch.svn-base +@@ -0,0 +1,79 @@ ++Index: atftp-0.7/tftp.c ++=================================================================== ++--- atftp-0.7.orig/tftp.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -409,7 +409,7 @@ ++ int set_peer(int argc, char **argv) ++ { ++ struct hostent *host; /* for host name lookup */ ++- struct servent *sp; /* server entry for tftp service */ +++ int port = htons(69); ++ ++ /* sanity check */ ++ if ((argc < 2) || (argc > 3)) ++@@ -418,13 +418,6 @@ ++ return ERR; ++ } ++ ++- /* get the server entry */ ++- sp = getservbyname("tftp", "udp"); ++- if (sp == 0) { ++- fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); ++- return ERR; ++- } ++- ++ /* look up the host */ ++ host = gethostbyname(argv[1]); ++ /* if valid, update s_inn structure */ ++@@ -437,7 +430,7 @@ ++ Strncpy(data.hostname, host->h_name, ++ sizeof(data.hostname)); ++ data.hostname[sizeof(data.hostname)-1] = 0; ++- data.sa_peer.sin_port = sp->s_port; +++ data.sa_peer.sin_port = port; ++ } ++ else ++ { ++@@ -448,17 +441,17 @@ ++ /* get the server port */ ++ if (argc == 3) ++ { ++- sp->s_port = htons(atoi(argv[2])); ++- if (sp->s_port < 0) +++ port = htons(atoi(argv[2])); +++ if (port < 0) ++ { ++ fprintf(stderr, "%s: bad port number.\n", argv[2]); ++ data.connected = 0; ++ return ERR; ++ } ++- data.sa_peer.sin_port = sp->s_port; +++ data.sa_peer.sin_port = port; ++ } ++ /* copy port number to data structure */ ++- data.port = ntohs(sp->s_port); +++ data.port = ntohs(port); ++ ++ data.connected = 1; ++ return OK; ++Index: atftp-0.7/tftpd.c ++=================================================================== ++--- atftp-0.7.orig/tftpd.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftpd.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -230,14 +230,8 @@ ++ ++ /* find the port */ ++ if (tftpd_port == 0) ++- { ++- if ((serv = getservbyname("tftp", "udp")) == NULL) ++- { ++- logger(LOG_ERR, "atftpd: udp/tftp, unknown service"); ++- exit(1); ++- } ++- tftpd_port = ntohs(serv->s_port); ++- } +++ tftpd_port = htons(69); +++ ++ /* initialise sockaddr_in structure */ ++ memset(&sa, 0, sizeof(sa)); ++ sa.sin_family = AF_INET; +diff --git a/feeds/packages/net/atftp/patches/.svn/text-base/120-retry_setting.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/text-base/120-retry_setting.patch.svn-base +new file mode 100644 +index 0000000..548090c +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/text-base/120-retry_setting.patch.svn-base +@@ -0,0 +1,121 @@ ++Index: atftp-0.7/tftp.c ++=================================================================== ++--- atftp-0.7.orig/tftp.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -967,6 +967,7 @@ ++ { "tftp-timeout", 1, NULL, 'T'}, ++ { "mode", 1, NULL, 'M'}, ++ { "option", 1, NULL, 'O'}, +++ { "retry", 1, NULL, 'R'}, ++ #if 1 ++ { "timeout", 1, NULL, 't'}, ++ { "blksize", 1, NULL, 'b'}, ++@@ -986,11 +987,16 @@ ++ }; ++ ++ /* Support old argument until 0.8 */ ++- while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:sm", +++ while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:smR:", ++ options, &option_index)) != EOF) ++ { ++ switch (c) ++ { +++ case 'R': +++ snprintf(string, sizeof(string), "option retry %s", optarg); +++ make_arg(string, &ac, &av); +++ process_cmd(ac, av); +++ break; ++ case 'g': ++ interactive = 0; ++ if ((action == PUT) || (action == MGET)) ++Index: atftp-0.7/tftp_def.c ++=================================================================== ++--- atftp-0.7.orig/tftp_def.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp_def.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -37,6 +37,7 @@ ++ { "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */ ++ { "blksize", "512", 0, 1 }, /* This is the default option */ ++ { "multicast", "", 0, 1 }, /* structure */ +++ { "retry", "5", 0, 1 }, ++ { "", "", 0, 0} ++ }; ++ ++Index: atftp-0.7/tftp_def.h ++=================================================================== ++--- atftp-0.7.orig/tftp_def.h 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp_def.h 2007-08-02 23:04:23.000000000 +0200 ++@@ -40,7 +40,8 @@ ++ #define OPT_TIMEOUT 3 ++ #define OPT_BLKSIZE 4 ++ #define OPT_MULTICAST 5 ++-#define OPT_NUMBER 7 +++#define OPT_RETRY 6 +++#define OPT_NUMBER 8 ++ ++ #define OPT_SIZE 12 ++ #define VAL_SIZE MAXLEN ++Index: atftp-0.7/tftp_file.c ++=================================================================== ++--- atftp-0.7.orig/tftp_file.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp_file.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -123,6 +123,7 @@ ++ struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; ++ FILE *fp = NULL; /* the local file pointer */ ++ int number_of_timeout = 0; +++ int num_retry = atoi(data->tftp_options[OPT_RETRY].value); ++ int convert = 0; /* if true, do netascii convertion */ ++ ++ int oacks = 0; /* count OACK for improved error checking */ ++@@ -141,7 +142,7 @@ ++ ++ int prev_block_number = 0; /* needed to support netascii convertion */ ++ int temp = 0; ++- +++ ++ data->file_size = 0; ++ tftp_cancel = 0; ++ from.sin_addr.s_addr = 0; ++@@ -288,7 +289,7 @@ ++ case GET_TIMEOUT: ++ number_of_timeout++; ++ fprintf(stderr, "timeout: retrying...\n"); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ else ++ state = timeout_state; ++@@ -325,7 +326,7 @@ ++ number_of_timeout++; ++ fprintf(stderr, "tftp: packet discard <%s:%d>.\n", ++ inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ break; ++ case ERR: ++@@ -614,6 +615,7 @@ ++ struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; ++ FILE *fp; /* the local file pointer */ ++ int number_of_timeout = 0; +++ int num_retry = atoi(data->tftp_options[OPT_RETRY].value); ++ struct stat file_stat; ++ int convert = 0; /* if true, do netascii convertion */ ++ char string[MAXLEN]; ++@@ -751,7 +753,7 @@ ++ case GET_TIMEOUT: ++ number_of_timeout++; ++ fprintf(stderr, "timeout: retrying...\n"); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ else ++ state = timeout_state; ++@@ -797,7 +799,7 @@ ++ number_of_timeout++; ++ fprintf(stderr, "tftp: packet discard <%s:%d>.\n", ++ inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ break; ++ case ERR: +diff --git a/feeds/packages/net/atftp/patches/.svn/text-base/130-missing_include.patch.svn-base b/feeds/packages/net/atftp/patches/.svn/text-base/130-missing_include.patch.svn-base +new file mode 100644 +index 0000000..d607d0e +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/.svn/text-base/130-missing_include.patch.svn-base +@@ -0,0 +1,21 @@ ++--- a/stats.c +++++ b/stats.c ++@@ -18,6 +18,7 @@ ++ ++ #include ++ #include +++#include ++ #include "tftp_def.h" ++ #include "stats.h" ++ #include "logger.h" ++@@ -157,8 +158,8 @@ ++ ++ logger(LOG_INFO, " Load measurements:"); ++ logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", ++- (double)(s_stats.tms.tms_utime) / CLK_TCK, ++- (double)(s_stats.tms.tms_stime) / CLK_TCK); +++ (double)(s_stats.tms.tms_utime) / CLOCKS_PER_SEC, +++ (double)(s_stats.tms.tms_stime) / CLOCKS_PER_SEC); ++ logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", ++ (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), ++ (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / +diff --git a/feeds/packages/net/atftp/patches/100-mconfig.patch b/feeds/packages/net/atftp/patches/100-mconfig.patch +new file mode 100644 +index 0000000..01c1e36 +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/100-mconfig.patch +@@ -0,0 +1,21 @@ ++Index: atftp-0.7/MCONFIG ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ atftp-0.7/MCONFIG 2007-08-02 23:04:23.000000000 +0200 ++@@ -0,0 +1,16 @@ +++# Generated by configure (confgen version 2) on Sun Jun 19 21:13:24 CEST 2005 +++# +++ +++BINDIR=/usr/bin +++SBINDIR=/usr/sbin +++MANDIR=/usr/man +++BINMODE=755 +++DAEMONMODE=755 +++MANMODE=644 +++PREFIX=/usr +++EXECPREFIX=/usr +++INSTALLROOT= +++CC= +++CFLAGS= +++LDFLAGS= +++LIBS= +diff --git a/feeds/packages/net/atftp/patches/110-services.patch b/feeds/packages/net/atftp/patches/110-services.patch +new file mode 100644 +index 0000000..ab3e1fb +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/110-services.patch +@@ -0,0 +1,79 @@ ++Index: atftp-0.7/tftp.c ++=================================================================== ++--- atftp-0.7.orig/tftp.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -409,7 +409,7 @@ ++ int set_peer(int argc, char **argv) ++ { ++ struct hostent *host; /* for host name lookup */ ++- struct servent *sp; /* server entry for tftp service */ +++ int port = htons(69); ++ ++ /* sanity check */ ++ if ((argc < 2) || (argc > 3)) ++@@ -418,13 +418,6 @@ ++ return ERR; ++ } ++ ++- /* get the server entry */ ++- sp = getservbyname("tftp", "udp"); ++- if (sp == 0) { ++- fprintf(stderr, "tftp: udp/tftp, unknown service.\n"); ++- return ERR; ++- } ++- ++ /* look up the host */ ++ host = gethostbyname(argv[1]); ++ /* if valid, update s_inn structure */ ++@@ -437,7 +430,7 @@ ++ Strncpy(data.hostname, host->h_name, ++ sizeof(data.hostname)); ++ data.hostname[sizeof(data.hostname)-1] = 0; ++- data.sa_peer.sin_port = sp->s_port; +++ data.sa_peer.sin_port = port; ++ } ++ else ++ { ++@@ -448,17 +441,17 @@ ++ /* get the server port */ ++ if (argc == 3) ++ { ++- sp->s_port = htons(atoi(argv[2])); ++- if (sp->s_port < 0) +++ port = htons(atoi(argv[2])); +++ if (port < 0) ++ { ++ fprintf(stderr, "%s: bad port number.\n", argv[2]); ++ data.connected = 0; ++ return ERR; ++ } ++- data.sa_peer.sin_port = sp->s_port; +++ data.sa_peer.sin_port = port; ++ } ++ /* copy port number to data structure */ ++- data.port = ntohs(sp->s_port); +++ data.port = ntohs(port); ++ ++ data.connected = 1; ++ return OK; ++Index: atftp-0.7/tftpd.c ++=================================================================== ++--- atftp-0.7.orig/tftpd.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftpd.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -230,14 +230,8 @@ ++ ++ /* find the port */ ++ if (tftpd_port == 0) ++- { ++- if ((serv = getservbyname("tftp", "udp")) == NULL) ++- { ++- logger(LOG_ERR, "atftpd: udp/tftp, unknown service"); ++- exit(1); ++- } ++- tftpd_port = ntohs(serv->s_port); ++- } +++ tftpd_port = htons(69); +++ ++ /* initialise sockaddr_in structure */ ++ memset(&sa, 0, sizeof(sa)); ++ sa.sin_family = AF_INET; +diff --git a/feeds/packages/net/atftp/patches/120-retry_setting.patch b/feeds/packages/net/atftp/patches/120-retry_setting.patch +new file mode 100644 +index 0000000..548090c +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/120-retry_setting.patch +@@ -0,0 +1,121 @@ ++Index: atftp-0.7/tftp.c ++=================================================================== ++--- atftp-0.7.orig/tftp.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -967,6 +967,7 @@ ++ { "tftp-timeout", 1, NULL, 'T'}, ++ { "mode", 1, NULL, 'M'}, ++ { "option", 1, NULL, 'O'}, +++ { "retry", 1, NULL, 'R'}, ++ #if 1 ++ { "timeout", 1, NULL, 't'}, ++ { "blksize", 1, NULL, 'b'}, ++@@ -986,11 +987,16 @@ ++ }; ++ ++ /* Support old argument until 0.8 */ ++- while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:sm", +++ while ((c = getopt_long(argc, argv, /*"gpl:r:Vh"*/ "gpl:r:Vht:b:smR:", ++ options, &option_index)) != EOF) ++ { ++ switch (c) ++ { +++ case 'R': +++ snprintf(string, sizeof(string), "option retry %s", optarg); +++ make_arg(string, &ac, &av); +++ process_cmd(ac, av); +++ break; ++ case 'g': ++ interactive = 0; ++ if ((action == PUT) || (action == MGET)) ++Index: atftp-0.7/tftp_def.c ++=================================================================== ++--- atftp-0.7.orig/tftp_def.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp_def.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -37,6 +37,7 @@ ++ { "timeout", "5", 0, 1 }, /* 2348, 2349, 2090. */ ++ { "blksize", "512", 0, 1 }, /* This is the default option */ ++ { "multicast", "", 0, 1 }, /* structure */ +++ { "retry", "5", 0, 1 }, ++ { "", "", 0, 0} ++ }; ++ ++Index: atftp-0.7/tftp_def.h ++=================================================================== ++--- atftp-0.7.orig/tftp_def.h 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp_def.h 2007-08-02 23:04:23.000000000 +0200 ++@@ -40,7 +40,8 @@ ++ #define OPT_TIMEOUT 3 ++ #define OPT_BLKSIZE 4 ++ #define OPT_MULTICAST 5 ++-#define OPT_NUMBER 7 +++#define OPT_RETRY 6 +++#define OPT_NUMBER 8 ++ ++ #define OPT_SIZE 12 ++ #define VAL_SIZE MAXLEN ++Index: atftp-0.7/tftp_file.c ++=================================================================== ++--- atftp-0.7.orig/tftp_file.c 2007-08-02 23:04:23.000000000 +0200 +++++ atftp-0.7/tftp_file.c 2007-08-02 23:04:23.000000000 +0200 ++@@ -123,6 +123,7 @@ ++ struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; ++ FILE *fp = NULL; /* the local file pointer */ ++ int number_of_timeout = 0; +++ int num_retry = atoi(data->tftp_options[OPT_RETRY].value); ++ int convert = 0; /* if true, do netascii convertion */ ++ ++ int oacks = 0; /* count OACK for improved error checking */ ++@@ -141,7 +142,7 @@ ++ ++ int prev_block_number = 0; /* needed to support netascii convertion */ ++ int temp = 0; ++- +++ ++ data->file_size = 0; ++ tftp_cancel = 0; ++ from.sin_addr.s_addr = 0; ++@@ -288,7 +289,7 @@ ++ case GET_TIMEOUT: ++ number_of_timeout++; ++ fprintf(stderr, "timeout: retrying...\n"); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ else ++ state = timeout_state; ++@@ -325,7 +326,7 @@ ++ number_of_timeout++; ++ fprintf(stderr, "tftp: packet discard <%s:%d>.\n", ++ inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ break; ++ case ERR: ++@@ -614,6 +615,7 @@ ++ struct tftphdr *tftphdr = (struct tftphdr *)data->data_buffer; ++ FILE *fp; /* the local file pointer */ ++ int number_of_timeout = 0; +++ int num_retry = atoi(data->tftp_options[OPT_RETRY].value); ++ struct stat file_stat; ++ int convert = 0; /* if true, do netascii convertion */ ++ char string[MAXLEN]; ++@@ -751,7 +753,7 @@ ++ case GET_TIMEOUT: ++ number_of_timeout++; ++ fprintf(stderr, "timeout: retrying...\n"); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ else ++ state = timeout_state; ++@@ -797,7 +799,7 @@ ++ number_of_timeout++; ++ fprintf(stderr, "tftp: packet discard <%s:%d>.\n", ++ inet_ntoa(from.sin_addr), ntohs(from.sin_port)); ++- if (number_of_timeout > NB_OF_RETRY) +++ if ((num_retry > 0) && (number_of_timeout > num_retry)) ++ state = S_ABORT; ++ break; ++ case ERR: +diff --git a/feeds/packages/net/atftp/patches/130-missing_include.patch b/feeds/packages/net/atftp/patches/130-missing_include.patch +new file mode 100644 +index 0000000..d607d0e +--- /dev/null ++++ b/feeds/packages/net/atftp/patches/130-missing_include.patch +@@ -0,0 +1,21 @@ ++--- a/stats.c +++++ b/stats.c ++@@ -18,6 +18,7 @@ ++ ++ #include ++ #include +++#include ++ #include "tftp_def.h" ++ #include "stats.h" ++ #include "logger.h" ++@@ -157,8 +158,8 @@ ++ ++ logger(LOG_INFO, " Load measurements:"); ++ logger(LOG_INFO, " User: %8.3fs Sys:%8.3fs", ++- (double)(s_stats.tms.tms_utime) / CLK_TCK, ++- (double)(s_stats.tms.tms_stime) / CLK_TCK); +++ (double)(s_stats.tms.tms_utime) / CLOCKS_PER_SEC, +++ (double)(s_stats.tms.tms_stime) / CLOCKS_PER_SEC); ++ logger(LOG_INFO, " Total:%8.3fs CPU:%8.3f%%", ++ (double)(tmp.tv_sec + tmp.tv_usec * 1e-6), ++ (double)(s_stats.tms.tms_utime + s_stats.tms.tms_stime) / +diff --git a/feeds/packages/net/autossh/.svn/entries b/feeds/packages/net/autossh/.svn/entries +new file mode 100644 +index 0000000..11c7b28 +--- /dev/null ++++ b/feeds/packages/net/autossh/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/autossh ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:21:05.419645Z ++34493 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++837853075c11e0b005757b8e77fe0197 ++2012-02-07T12:42:03.904175Z ++30349 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1271 ++ +diff --git a/feeds/packages/net/autossh/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/autossh/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/net/autossh/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/autossh/.svn/text-base/Makefile.svn-base b/feeds/packages/net/autossh/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ec6e7eb +--- /dev/null ++++ b/feeds/packages/net/autossh/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=autossh ++PKG_VERSION:=1.4b ++PKG_RELEASE:=6 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/ ++PKG_MD5SUM:=8f9aa006f6f69e912d3c2f504622d6f7 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/autossh ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Autossh client ++ URL:=http://www.harding.motd.ca/autossh/ ++ SUBMENU:=SSH ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, -f Makefile \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"\$$$$(SSH)\\\"\" -D\"VER=\\\"\$$$$(VER)\\\"\"" \ ++ all \ ++ ) ++endef ++ ++define Package/autossh/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/autossh $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/autossh.init $(1)/etc/init.d/autossh ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/autossh.config $(1)/etc/config/autossh ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DATA) ./files/autossh.hotplug $(1)/etc/hotplug.d/iface/20-autossh ++endef ++ ++define Package/autossh/conffiles ++/etc/config/autossh ++endef ++ ++$(eval $(call BuildPackage,autossh)) +diff --git a/feeds/packages/net/autossh/Makefile b/feeds/packages/net/autossh/Makefile +new file mode 100644 +index 0000000..ec6e7eb +--- /dev/null ++++ b/feeds/packages/net/autossh/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=autossh ++PKG_VERSION:=1.4b ++PKG_RELEASE:=6 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/ ++PKG_MD5SUM:=8f9aa006f6f69e912d3c2f504622d6f7 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/autossh ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Autossh client ++ URL:=http://www.harding.motd.ca/autossh/ ++ SUBMENU:=SSH ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, -f Makefile \ ++ CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"\$$$$(SSH)\\\"\" -D\"VER=\\\"\$$$$(VER)\\\"\"" \ ++ all \ ++ ) ++endef ++ ++define Package/autossh/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/autossh $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/autossh.init $(1)/etc/init.d/autossh ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/autossh.config $(1)/etc/config/autossh ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DATA) ./files/autossh.hotplug $(1)/etc/hotplug.d/iface/20-autossh ++endef ++ ++define Package/autossh/conffiles ++/etc/config/autossh ++endef ++ ++$(eval $(call BuildPackage,autossh)) +diff --git a/feeds/packages/net/autossh/files/.svn/entries b/feeds/packages/net/autossh/files/.svn/entries +new file mode 100644 +index 0000000..16809bb +--- /dev/null ++++ b/feeds/packages/net/autossh/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/autossh/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:21:05.419645Z ++34493 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++autossh.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++49c1ef59c437baa32462bd336fb02c63 ++2009-07-25T22:06:36.882816Z ++16985 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++204 ++ ++autossh.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++bb083230bfb1357ded5546a52481cd10 ++2012-12-04T16:21:05.419645Z ++34493 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++565 ++ ++autossh.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++039c1fca4112b61f6104a370822fa746 ++2011-08-16T20:34:24.004747Z ++28018 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++158 ++ +diff --git a/feeds/packages/net/autossh/files/.svn/prop-base/autossh.config.svn-base b/feeds/packages/net/autossh/files/.svn/prop-base/autossh.config.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/autossh/files/.svn/prop-base/autossh.config.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/autossh/files/.svn/prop-base/autossh.init.svn-base b/feeds/packages/net/autossh/files/.svn/prop-base/autossh.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/autossh/files/.svn/prop-base/autossh.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/autossh/files/.svn/text-base/autossh.config.svn-base b/feeds/packages/net/autossh/files/.svn/text-base/autossh.config.svn-base +new file mode 100644 +index 0000000..6ec3238 +--- /dev/null ++++ b/feeds/packages/net/autossh/files/.svn/text-base/autossh.config.svn-base +@@ -0,0 +1,5 @@ ++config autossh ++ option ssh '-i /etc/dropbear/id_rsa -N -T -R 2222:localhost:22 user@host' ++ option gatetime '0' ++ option monitorport '20000' ++ option poll '600' +diff --git a/feeds/packages/net/autossh/files/.svn/text-base/autossh.hotplug.svn-base b/feeds/packages/net/autossh/files/.svn/text-base/autossh.hotplug.svn-base +new file mode 100644 +index 0000000..4f695f4 +--- /dev/null ++++ b/feeds/packages/net/autossh/files/.svn/text-base/autossh.hotplug.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh ++# Copyright (C) 2007 OpenWrt.org ++ ++/etc/init.d/autossh enabled && { ++ ++ [ "$ACTION" = "ifup" ] && { ++ /etc/init.d/autossh start ++ } ++ ++ [ "$ACTION" = "ifdown" ] && { ++ /etc/init.d/autossh stop ++ } ++ ++} +diff --git a/feeds/packages/net/autossh/files/.svn/text-base/autossh.init.svn-base b/feeds/packages/net/autossh/files/.svn/text-base/autossh.init.svn-base +new file mode 100644 +index 0000000..f81bf4d +--- /dev/null ++++ b/feeds/packages/net/autossh/files/.svn/text-base/autossh.init.svn-base +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=80 ++ ++start_instance() { ++ local section="$1" ++ ++ config_get ssh "$section" 'ssh' ++ config_get gatetime "$section" 'gatetime' ++ config_get monitorport "$section" 'monitorport' ++ config_get poll "$section" 'poll' ++ ++ export AUTOSSH_GATETIME="${gatetime:-30}" ++ export AUTOSSH_POLL="${poll:-600}" ++ service_start /usr/sbin/autossh -M ${monitorport:-20000} -f ${ssh} ++} ++ ++boot() { ++ return ++} ++ ++start() { ++ config_load 'autossh' ++ config_foreach start_instance 'autossh' ++} ++ ++stop() { ++ service_stop /usr/sbin/autossh ++} +diff --git a/feeds/packages/net/autossh/files/autossh.config b/feeds/packages/net/autossh/files/autossh.config +new file mode 100644 +index 0000000..6ec3238 +--- /dev/null ++++ b/feeds/packages/net/autossh/files/autossh.config +@@ -0,0 +1,5 @@ ++config autossh ++ option ssh '-i /etc/dropbear/id_rsa -N -T -R 2222:localhost:22 user@host' ++ option gatetime '0' ++ option monitorport '20000' ++ option poll '600' +diff --git a/feeds/packages/net/autossh/files/autossh.hotplug b/feeds/packages/net/autossh/files/autossh.hotplug +new file mode 100644 +index 0000000..4f695f4 +--- /dev/null ++++ b/feeds/packages/net/autossh/files/autossh.hotplug +@@ -0,0 +1,14 @@ ++#!/bin/sh ++# Copyright (C) 2007 OpenWrt.org ++ ++/etc/init.d/autossh enabled && { ++ ++ [ "$ACTION" = "ifup" ] && { ++ /etc/init.d/autossh start ++ } ++ ++ [ "$ACTION" = "ifdown" ] && { ++ /etc/init.d/autossh stop ++ } ++ ++} +diff --git a/feeds/packages/net/autossh/files/autossh.init b/feeds/packages/net/autossh/files/autossh.init +new file mode 100644 +index 0000000..f81bf4d +--- /dev/null ++++ b/feeds/packages/net/autossh/files/autossh.init +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=80 ++ ++start_instance() { ++ local section="$1" ++ ++ config_get ssh "$section" 'ssh' ++ config_get gatetime "$section" 'gatetime' ++ config_get monitorport "$section" 'monitorport' ++ config_get poll "$section" 'poll' ++ ++ export AUTOSSH_GATETIME="${gatetime:-30}" ++ export AUTOSSH_POLL="${poll:-600}" ++ service_start /usr/sbin/autossh -M ${monitorport:-20000} -f ${ssh} ++} ++ ++boot() { ++ return ++} ++ ++start() { ++ config_load 'autossh' ++ config_foreach start_instance 'autossh' ++} ++ ++stop() { ++ service_stop /usr/sbin/autossh ++} +diff --git a/feeds/packages/net/axel/.svn/entries b/feeds/packages/net/axel/.svn/entries +new file mode 100644 +index 0000000..395f009 +--- /dev/null ++++ b/feeds/packages/net/axel/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/axel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++f80ffba82df82b6d872b0aa11b649845 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1610 ++ +diff --git a/feeds/packages/net/axel/.svn/text-base/Makefile.svn-base b/feeds/packages/net/axel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..415dc7e +--- /dev/null ++++ b/feeds/packages/net/axel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Gianluigi Tiesi ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=axel ++PKG_VERSION:=2.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3015 ++PKG_MD5SUM:=a2a762fce0c96781965c8f9786a3d09d ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/axel ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=File Transfer ++ TITLE:=Axel Download Accelerator ++ DEPENDS:=+libpthread ++ URL:=http://axel.alioth.debian.org/ ++ MAINTAINER:=Gianluigi Tiesi ++endef ++ ++define Package/axel/description ++ Axel tries to accelerate HTTP/FTP downloading process by using multiple connections for one file. ++ It can use multiple mirrors for a download. Axel has no dependencies and is lightweight, ++ so it might be useful as a wget clone on byte-critical systems. ++endef ++ ++# notes: ++# - I'm using := and not += because it is not a standard configure script ++# - I ask not to strip, because it should be handled by the toolchain ++CONFIGURE_ARGS := \ ++ --prefix=/usr \ ++ --etcdir=/etc \ ++ --debug=0 \ ++ --i18n=0 \ ++ --strip=0 ++ ++define Package/axel/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/axel $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/axelrc.example $(1)/etc/axelrc ++ echo "alternate_output = 1" >> $(1)/etc/axelrc ++endef ++ ++define Package/axel/conffiles ++/etc/axelrc ++endef ++ ++$(eval $(call BuildPackage,axel)) +diff --git a/feeds/packages/net/axel/Makefile b/feeds/packages/net/axel/Makefile +new file mode 100644 +index 0000000..415dc7e +--- /dev/null ++++ b/feeds/packages/net/axel/Makefile +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Gianluigi Tiesi ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=axel ++PKG_VERSION:=2.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3015 ++PKG_MD5SUM:=a2a762fce0c96781965c8f9786a3d09d ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/axel ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=File Transfer ++ TITLE:=Axel Download Accelerator ++ DEPENDS:=+libpthread ++ URL:=http://axel.alioth.debian.org/ ++ MAINTAINER:=Gianluigi Tiesi ++endef ++ ++define Package/axel/description ++ Axel tries to accelerate HTTP/FTP downloading process by using multiple connections for one file. ++ It can use multiple mirrors for a download. Axel has no dependencies and is lightweight, ++ so it might be useful as a wget clone on byte-critical systems. ++endef ++ ++# notes: ++# - I'm using := and not += because it is not a standard configure script ++# - I ask not to strip, because it should be handled by the toolchain ++CONFIGURE_ARGS := \ ++ --prefix=/usr \ ++ --etcdir=/etc \ ++ --debug=0 \ ++ --i18n=0 \ ++ --strip=0 ++ ++define Package/axel/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/axel $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/axelrc.example $(1)/etc/axelrc ++ echo "alternate_output = 1" >> $(1)/etc/axelrc ++endef ++ ++define Package/axel/conffiles ++/etc/axelrc ++endef ++ ++$(eval $(call BuildPackage,axel)) +diff --git a/feeds/packages/net/babel/.svn/entries b/feeds/packages/net/babel/.svn/entries +new file mode 100644 +index 0000000..d6b7155 +--- /dev/null ++++ b/feeds/packages/net/babel/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/babel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-02T12:54:13.965775Z ++32577 ++kerneis ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++413348438e84e0666ad0674573b052ff ++2012-07-02T12:54:13.965775Z ++32577 ++kerneis ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1764 ++ +diff --git a/feeds/packages/net/babel/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/babel/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/net/babel/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/net/babel/.svn/text-base/Makefile.svn-base b/feeds/packages/net/babel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..dc7dac8 +--- /dev/null ++++ b/feeds/packages/net/babel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2007-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:=babeld ++PKG_VERSION:=1.3.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/ ++PKG_MD5SUM:=56ca5107112aec09279995b7985c5ac3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/babeld ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE:=A loop-free distance-vector routing protocol ++ URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/ ++ MAINTAINER:=Gabriel Kerneis ++ DEPENDS:=+kmod-ipv6 +librt ++endef ++ ++define Package/babeld/description ++ Babel is a loop-avoiding distance-vector routing protocol roughly based ++ on DSDV and AODV, but with provisions for link cost estimation and ++ redistribution of routes from other routing protocols. ++ While it is optimised for wireless mesh networks, Babel will also work ++ efficiently on wired networks. It will generate between 1.2 and 2.4 times ++ the amount of routing traffic that RIPng would generate, while ++ never counting to infinity. ++endef ++ ++define Package/babeld/conffiles ++/etc/babeld.conf ++/etc/config/babeld ++endef ++ ++MAKE_FLAGS+= \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ ++define Package/babeld/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/babeld.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/babeld.config $(1)/etc/config/babeld ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld ++endef ++ ++$(eval $(call BuildPackage,babeld)) +diff --git a/feeds/packages/net/babel/Makefile b/feeds/packages/net/babel/Makefile +new file mode 100644 +index 0000000..dc7dac8 +--- /dev/null ++++ b/feeds/packages/net/babel/Makefile +@@ -0,0 +1,59 @@ ++# ++# Copyright (C) 2007-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:=babeld ++PKG_VERSION:=1.3.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/ ++PKG_MD5SUM:=56ca5107112aec09279995b7985c5ac3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/babeld ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE:=A loop-free distance-vector routing protocol ++ URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/ ++ MAINTAINER:=Gabriel Kerneis ++ DEPENDS:=+kmod-ipv6 +librt ++endef ++ ++define Package/babeld/description ++ Babel is a loop-avoiding distance-vector routing protocol roughly based ++ on DSDV and AODV, but with provisions for link cost estimation and ++ redistribution of routes from other routing protocols. ++ While it is optimised for wireless mesh networks, Babel will also work ++ efficiently on wired networks. It will generate between 1.2 and 2.4 times ++ the amount of routing traffic that RIPng would generate, while ++ never counting to infinity. ++endef ++ ++define Package/babeld/conffiles ++/etc/babeld.conf ++/etc/config/babeld ++endef ++ ++MAKE_FLAGS+= \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ ++define Package/babeld/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/babeld.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/babeld.config $(1)/etc/config/babeld ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld ++endef ++ ++$(eval $(call BuildPackage,babeld)) +diff --git a/feeds/packages/net/babel/files/.svn/entries b/feeds/packages/net/babel/files/.svn/entries +new file mode 100644 +index 0000000..2f97a45 +--- /dev/null ++++ b/feeds/packages/net/babel/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/babel/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-02T12:54:13.965775Z ++32577 ++kerneis ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++babeld.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++f9bdc5035582ecea8c57163a3c311918 ++2012-07-02T12:54:13.965775Z ++32577 ++kerneis ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3129 ++ ++babeld.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++8769c336c6110103d7c1ca5e1e5fdb4a ++2010-02-19T12:33:36.174871Z ++19754 ++kerneis ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1435 ++ ++babeld.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++73d8d64547aeebbd719a9d683e426298 ++2012-07-02T12:54:13.965775Z ++32577 ++kerneis ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2538 ++ +diff --git a/feeds/packages/net/babel/files/.svn/prop-base/babeld.init.svn-base b/feeds/packages/net/babel/files/.svn/prop-base/babeld.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/net/babel/files/.svn/prop-base/babeld.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/net/babel/files/.svn/text-base/babeld.conf.svn-base b/feeds/packages/net/babel/files/.svn/text-base/babeld.conf.svn-base +new file mode 100644 +index 0000000..fd488f9 +--- /dev/null ++++ b/feeds/packages/net/babel/files/.svn/text-base/babeld.conf.svn-base +@@ -0,0 +1,40 @@ ++# babel config file ++# Copyright (C) 2008-2010 Juliusz Chroboczek, L. Aaron Kaplan ++# , ++# ++# This config file simply documents sample entries. ++# "redistribute" means: redistribute routes from other routing protocols ++# into babel. "local" means addresses assigned to local interfaces. ++# ++# You do not need to edit this file: you can use /etc/config/babeld ++# instead (sections "interface" and "filter"). Both files can be used ++# simultaneously (the rules of this file are executed first). ++ ++# the default rules are: ++# ++## redistribute local ++## redistribute deny ++# ++# this says, redistribute local addresses but no other routes ++ ++ ++# redistribute IPv4 default route into babel ++## redistribute local ip 0.0.0.0/0 le 0 metric 128 ++ ++# same but for IPv6 ++## redistribute local ip ::/0 le 0 metric 128 ++ ++ ++# don't redistribute all local addresses, only selected ones ++# after the first line, the "deny" rules kicks in. After the "deny" ++# no redistribute local rules are going to match ++## redistribute local ip 192.160.4.0/24 ++## redistribute local deny ++ ++ ++# Babel refuses to redistribute routes with a protocol number of "boot"; ++# this is standard practice, and means that you cannot easily ++# redistribute the default route installed by dhcp. It is however ++# possible to redistribute such route by explicitly specifying "proto 3" ++# on the redistribute line. ++## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128 +diff --git a/feeds/packages/net/babel/files/.svn/text-base/babeld.config.svn-base b/feeds/packages/net/babel/files/.svn/text-base/babeld.config.svn-base +new file mode 100644 +index 0000000..688da5a +--- /dev/null ++++ b/feeds/packages/net/babel/files/.svn/text-base/babeld.config.svn-base +@@ -0,0 +1,69 @@ ++package babeld ++ ++config general ++ # option 'multicast_address' 'ff02:0:0:0:0:0:1:6' ++ # option 'port' '6696' ++ # option 'state_file' '/var/lib/babel-state' ++ # option 'hello_interval' '4' ++ # option 'wired_hello_interval' '20' ++ # option 'diversity' '0,128' ++ # option 'kernel_priority' '0' ++ # Do not use this option unless you know what you are doing, as it can ++ # cause persistent route flapping. ++ ## option 'duplication_priority' '0' ++ # option 'carrier_sense' 'false' ++ # option 'assume_wireless' 'false' ++ # option 'no_split_horizon' 'false' ++ # option 'debug' '0' ++ # Listen for connections from a front-end, e.g. on port 33123. ++ ## option 'local_server' '33123' ++ # Keep unfeasible routes ++ ## option 'keep_unfeasible' 'false' ++ # Use the given kernel routing table for routes inserted by babeld. ++ ## option 'export_table' '0' ++ # Export routes from the given kernel routing table. ++ ## option 'import_table' '0' ++ # The configuration file is not necessary since you can do everything ++ # from this file. ++ # option 'conf_file' '/etc/babeld.conf' ++ # option 'log_file' '/var/log/babeld.log' ++ ++# You can use aliases (like lan, wlan) or real names (like eth0.0). ++# If you use an alias, it must be already defined when babeld starts. ++# Otherwise, the name is taken literally and the interface can be ++# brought up later (useful for tunnels for instance). ++config interface wlan ++ # Remove this line to enable babeld on this interface ++ option 'ignore' 'true' ++ # option 'wired' 'auto' ++ # option 'link_quality' 'auto' ++ # option 'split_horizon' 'auto' ++ # The default is 96 for wired interfaces, and 256 for wireless ones ++ ## option 'rxcost' '256' ++ # The default is specified with the -h and -H command-line flags. ++ ## option 'hello_interval' '4' ++ # This can be set to a fairly large value, unless significant ++ # packet loss is expected. The default is four times the hello ++ # interval. ++ ## option 'update_interval' '16' ++ ++config interface lan ++ option 'ignore' 'true' ++ ++# A filter consists in a type ('in', 'out' or 'redistribute'), an action ++# ('allow', 'deny' or 'metric xxx') and a set of selectors ('ip', 'eq', ++# etc.). See /etc/babeld.conf for more details. ++# Here is a sample filter wich redistributes the default route if its ++# protocol number is "boot", e.g. when it installed by dhcp. It is ++# disabled by default. ++config filter ++ option 'ignore' 'true' ++ # Type ++ option 'type' 'redistribute' ++ # Selectors: ip, eq, le, ge, neigh, id, proto, local, if ++ option 'ip' '0.0.0.0/0' ++ option 'le' '0' ++ option 'proto' '3' ++ # Action ++ option 'action' 'metric 128' ++ +diff --git a/feeds/packages/net/babel/files/.svn/text-base/babeld.init.svn-base b/feeds/packages/net/babel/files/.svn/text-base/babeld.init.svn-base +new file mode 100644 +index 0000000..67a3544 +--- /dev/null ++++ b/feeds/packages/net/babel/files/.svn/text-base/babeld.init.svn-base +@@ -0,0 +1,136 @@ ++#!/bin/sh /etc/rc.common ++ ++START=70 ++ ++PID_F='/var/run/babeld.pid' ++EXTRA_COMMANDS="status" ++EXTRA_HELP=" status Dump Babel's table to the log file." ++ ++listen_ifname() { ++ local ifname=$(uci_get_state network "$1" ifname "$1") ++ local switch="$2" ++ append args "$switch $ifname" ++ append interfaces "$ifname" ++} ++ ++append_ifname() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _name ++ config_get _name "$section" "$option" ++ [ -z "$_name" ] && return 0 ++ local ifname=$(uci_get_state network "$_name" ifname "$_name") ++ append args "$switch $ifname" ++} ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -gt 0 ] && append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++babel_filter() { ++ local cfg="$1" ++ local _loctmp ++ ++ local _ignored ++ config_get_bool _ignored "$cfg" 'ignore' 0 ++ [ "$_ignored" -eq 1 ] && return 0 ++ ++ append args "-C '" ++ ++ append_parm "$cfg" 'type' '' ++ ++ append_bool "$cfg" 'local' 'local' ++ ++ append_parm "$cfg" 'ip' 'ip' ++ append_parm "$cfg" 'eq' 'eq' ++ append_parm "$cfg" 'le' 'le' ++ append_parm "$cfg" 'ge' 'ge' ++ append_parm "$cfg" 'neigh' 'neigh' ++ append_parm "$cfg" 'id' 'id' ++ append_parm "$cfg" 'proto' 'proto' ++ ++ append_ifname "$cfg" 'if' 'if' ++ ++ append_parm "$cfg" 'action' '' ++ ++ append args ' ' "'" ++} ++ ++babel_addif() { ++ local cfg="$1" ++ ++ local _ignored ++ config_get_bool _ignored "$cfg" 'ignore' 0 ++ [ "$_ignored" -eq 1 ] && return 0 ++ ++ listen_ifname "$cfg" "-C 'interface" ++ ++ append_parm "$cfg" 'wired' 'wired' ++ append_parm "$cfg" 'link_quality' 'link-quality' ++ append_parm "$cfg" 'split_horizon' 'split-horizon' ++ append_parm "$cfg" 'rxcost' 'rxcost' ++ append_parm "$cfg" 'hello_interval' 'hello-interval' ++ append_parm "$cfg" 'update_interval' 'update-interval' ++ ++ append args ' ' "'" ++} ++ ++babel_config() { ++ local cfg="$1" ++ ++ append_bool "$cfg" 'carrier_sense' '-l' ++ append_bool "$cfg" 'assume_wireless' '-w' ++ append_bool "$cfg" 'no_split_horizon' '-s' ++ append_bool "$cfg" 'keep_unfeasible' '-u' ++ ++ append_parm "$cfg" 'multicast_address' '-m' ++ append_parm "$cfg" 'port' '-p' ++ append_parm "$cfg" 'state_file' '-S' ++ append_parm "$cfg" 'hello_interval' '-h' ++ append_parm "$cfg" 'wired_hello_interval' '-H' ++ append_parm "$cfg" 'diversity' '-z' ++ append_parm "$cfg" 'kernel_priority' '-k' ++ append_parm "$cfg" 'duplication_priority' '-A' ++ append_parm "$cfg" 'debug' '-d' ++ append_parm "$cfg" 'local_server' '-g' ++ append_parm "$cfg" 'export_table' '-t' ++ append_parm "$cfg" 'import_table' '-T' ++ append_parm "$cfg" 'conf_file' '-c' ++ append_parm "$cfg" 'log_file' '-L' ++} ++ ++start() { ++ mkdir -p /var/lib ++ config_load babeld ++ unset args ++ unset interfaces ++ config_foreach babel_config general ++ config_foreach babel_addif interface ++ config_foreach babel_filter filter ++ [ -z "$interfaces" ] && return 0 ++ eval "/usr/sbin/babeld -D -I $PID_F $args $interfaces" ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} ++ ++status() { ++ [ -f $PID_F ] && kill -USR1 $(cat $PID_F) ++} +diff --git a/feeds/packages/net/babel/files/babeld.conf b/feeds/packages/net/babel/files/babeld.conf +new file mode 100644 +index 0000000..fd488f9 +--- /dev/null ++++ b/feeds/packages/net/babel/files/babeld.conf +@@ -0,0 +1,40 @@ ++# babel config file ++# Copyright (C) 2008-2010 Juliusz Chroboczek, L. Aaron Kaplan ++# , ++# ++# This config file simply documents sample entries. ++# "redistribute" means: redistribute routes from other routing protocols ++# into babel. "local" means addresses assigned to local interfaces. ++# ++# You do not need to edit this file: you can use /etc/config/babeld ++# instead (sections "interface" and "filter"). Both files can be used ++# simultaneously (the rules of this file are executed first). ++ ++# the default rules are: ++# ++## redistribute local ++## redistribute deny ++# ++# this says, redistribute local addresses but no other routes ++ ++ ++# redistribute IPv4 default route into babel ++## redistribute local ip 0.0.0.0/0 le 0 metric 128 ++ ++# same but for IPv6 ++## redistribute local ip ::/0 le 0 metric 128 ++ ++ ++# don't redistribute all local addresses, only selected ones ++# after the first line, the "deny" rules kicks in. After the "deny" ++# no redistribute local rules are going to match ++## redistribute local ip 192.160.4.0/24 ++## redistribute local deny ++ ++ ++# Babel refuses to redistribute routes with a protocol number of "boot"; ++# this is standard practice, and means that you cannot easily ++# redistribute the default route installed by dhcp. It is however ++# possible to redistribute such route by explicitly specifying "proto 3" ++# on the redistribute line. ++## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128 +diff --git a/feeds/packages/net/babel/files/babeld.config b/feeds/packages/net/babel/files/babeld.config +new file mode 100644 +index 0000000..688da5a +--- /dev/null ++++ b/feeds/packages/net/babel/files/babeld.config +@@ -0,0 +1,69 @@ ++package babeld ++ ++config general ++ # option 'multicast_address' 'ff02:0:0:0:0:0:1:6' ++ # option 'port' '6696' ++ # option 'state_file' '/var/lib/babel-state' ++ # option 'hello_interval' '4' ++ # option 'wired_hello_interval' '20' ++ # option 'diversity' '0,128' ++ # option 'kernel_priority' '0' ++ # Do not use this option unless you know what you are doing, as it can ++ # cause persistent route flapping. ++ ## option 'duplication_priority' '0' ++ # option 'carrier_sense' 'false' ++ # option 'assume_wireless' 'false' ++ # option 'no_split_horizon' 'false' ++ # option 'debug' '0' ++ # Listen for connections from a front-end, e.g. on port 33123. ++ ## option 'local_server' '33123' ++ # Keep unfeasible routes ++ ## option 'keep_unfeasible' 'false' ++ # Use the given kernel routing table for routes inserted by babeld. ++ ## option 'export_table' '0' ++ # Export routes from the given kernel routing table. ++ ## option 'import_table' '0' ++ # The configuration file is not necessary since you can do everything ++ # from this file. ++ # option 'conf_file' '/etc/babeld.conf' ++ # option 'log_file' '/var/log/babeld.log' ++ ++# You can use aliases (like lan, wlan) or real names (like eth0.0). ++# If you use an alias, it must be already defined when babeld starts. ++# Otherwise, the name is taken literally and the interface can be ++# brought up later (useful for tunnels for instance). ++config interface wlan ++ # Remove this line to enable babeld on this interface ++ option 'ignore' 'true' ++ # option 'wired' 'auto' ++ # option 'link_quality' 'auto' ++ # option 'split_horizon' 'auto' ++ # The default is 96 for wired interfaces, and 256 for wireless ones ++ ## option 'rxcost' '256' ++ # The default is specified with the -h and -H command-line flags. ++ ## option 'hello_interval' '4' ++ # This can be set to a fairly large value, unless significant ++ # packet loss is expected. The default is four times the hello ++ # interval. ++ ## option 'update_interval' '16' ++ ++config interface lan ++ option 'ignore' 'true' ++ ++# A filter consists in a type ('in', 'out' or 'redistribute'), an action ++# ('allow', 'deny' or 'metric xxx') and a set of selectors ('ip', 'eq', ++# etc.). See /etc/babeld.conf for more details. ++# Here is a sample filter wich redistributes the default route if its ++# protocol number is "boot", e.g. when it installed by dhcp. It is ++# disabled by default. ++config filter ++ option 'ignore' 'true' ++ # Type ++ option 'type' 'redistribute' ++ # Selectors: ip, eq, le, ge, neigh, id, proto, local, if ++ option 'ip' '0.0.0.0/0' ++ option 'le' '0' ++ option 'proto' '3' ++ # Action ++ option 'action' 'metric 128' ++ +diff --git a/feeds/packages/net/babel/files/babeld.init b/feeds/packages/net/babel/files/babeld.init +new file mode 100755 +index 0000000..67a3544 +--- /dev/null ++++ b/feeds/packages/net/babel/files/babeld.init +@@ -0,0 +1,136 @@ ++#!/bin/sh /etc/rc.common ++ ++START=70 ++ ++PID_F='/var/run/babeld.pid' ++EXTRA_COMMANDS="status" ++EXTRA_HELP=" status Dump Babel's table to the log file." ++ ++listen_ifname() { ++ local ifname=$(uci_get_state network "$1" ifname "$1") ++ local switch="$2" ++ append args "$switch $ifname" ++ append interfaces "$ifname" ++} ++ ++append_ifname() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _name ++ config_get _name "$section" "$option" ++ [ -z "$_name" ] && return 0 ++ local ifname=$(uci_get_state network "$_name" ifname "$_name") ++ append args "$switch $ifname" ++} ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -gt 0 ] && append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++babel_filter() { ++ local cfg="$1" ++ local _loctmp ++ ++ local _ignored ++ config_get_bool _ignored "$cfg" 'ignore' 0 ++ [ "$_ignored" -eq 1 ] && return 0 ++ ++ append args "-C '" ++ ++ append_parm "$cfg" 'type' '' ++ ++ append_bool "$cfg" 'local' 'local' ++ ++ append_parm "$cfg" 'ip' 'ip' ++ append_parm "$cfg" 'eq' 'eq' ++ append_parm "$cfg" 'le' 'le' ++ append_parm "$cfg" 'ge' 'ge' ++ append_parm "$cfg" 'neigh' 'neigh' ++ append_parm "$cfg" 'id' 'id' ++ append_parm "$cfg" 'proto' 'proto' ++ ++ append_ifname "$cfg" 'if' 'if' ++ ++ append_parm "$cfg" 'action' '' ++ ++ append args ' ' "'" ++} ++ ++babel_addif() { ++ local cfg="$1" ++ ++ local _ignored ++ config_get_bool _ignored "$cfg" 'ignore' 0 ++ [ "$_ignored" -eq 1 ] && return 0 ++ ++ listen_ifname "$cfg" "-C 'interface" ++ ++ append_parm "$cfg" 'wired' 'wired' ++ append_parm "$cfg" 'link_quality' 'link-quality' ++ append_parm "$cfg" 'split_horizon' 'split-horizon' ++ append_parm "$cfg" 'rxcost' 'rxcost' ++ append_parm "$cfg" 'hello_interval' 'hello-interval' ++ append_parm "$cfg" 'update_interval' 'update-interval' ++ ++ append args ' ' "'" ++} ++ ++babel_config() { ++ local cfg="$1" ++ ++ append_bool "$cfg" 'carrier_sense' '-l' ++ append_bool "$cfg" 'assume_wireless' '-w' ++ append_bool "$cfg" 'no_split_horizon' '-s' ++ append_bool "$cfg" 'keep_unfeasible' '-u' ++ ++ append_parm "$cfg" 'multicast_address' '-m' ++ append_parm "$cfg" 'port' '-p' ++ append_parm "$cfg" 'state_file' '-S' ++ append_parm "$cfg" 'hello_interval' '-h' ++ append_parm "$cfg" 'wired_hello_interval' '-H' ++ append_parm "$cfg" 'diversity' '-z' ++ append_parm "$cfg" 'kernel_priority' '-k' ++ append_parm "$cfg" 'duplication_priority' '-A' ++ append_parm "$cfg" 'debug' '-d' ++ append_parm "$cfg" 'local_server' '-g' ++ append_parm "$cfg" 'export_table' '-t' ++ append_parm "$cfg" 'import_table' '-T' ++ append_parm "$cfg" 'conf_file' '-c' ++ append_parm "$cfg" 'log_file' '-L' ++} ++ ++start() { ++ mkdir -p /var/lib ++ config_load babeld ++ unset args ++ unset interfaces ++ config_foreach babel_config general ++ config_foreach babel_addif interface ++ config_foreach babel_filter filter ++ [ -z "$interfaces" ] && return 0 ++ eval "/usr/sbin/babeld -D -I $PID_F $args $interfaces" ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} ++ ++status() { ++ [ -f $PID_F ] && kill -USR1 $(cat $PID_F) ++} +diff --git a/feeds/packages/net/bahamut/.svn/entries b/feeds/packages/net/bahamut/.svn/entries +new file mode 100644 +index 0000000..fd94140 +--- /dev/null ++++ b/feeds/packages/net/bahamut/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bahamut ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T06:25:44.872373Z ++26071 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++d087ea861c5c37629ee9a0b513cc3e61 ++2011-03-12T06:25:44.872373Z ++26071 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1299 ++ +diff --git a/feeds/packages/net/bahamut/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bahamut/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a0a8be4 +--- /dev/null ++++ b/feeds/packages/net/bahamut/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=bahamut ++PKG_VERSION:=1.8.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-release.tar.gz ++PKG_SOURCE_URL:=http://bahamut.dal.net/download ++PKG_MD5SUM:=a814a4e0ff1fabcf026ea8574b4a1e20 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bahamut ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libopenssl +zlib ++ SUBMENU:=Instant Messaging ++ TITLE:=Bahamut IRC server ++ URL:=http://bahamut.dal.net ++endef ++ ++TARGET_CFLAGS += \ ++ -DSYS_ERRLIST_DECLARED ++ ++define Build/Configure ++ $(call Build/Configure/Default,\ ++ --with-maxconnections=64 \ ++ --with-openssl="$(STAGING_DIR)/usr/lib" \ ++ ,\ ++ ac_cv_func_dn_skipname=yes \ ++ ZLIB_HOME="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,\ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ ++ STAGING_DIR="$(STAGING_DIR)" \ ++ all \ ++ ) ++endef ++ ++define Package/bahamut/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ircd $(1)/usr/sbin ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/*.{txt,conf} $(1)/etc/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,bahamut)) +diff --git a/feeds/packages/net/bahamut/Makefile b/feeds/packages/net/bahamut/Makefile +new file mode 100644 +index 0000000..a0a8be4 +--- /dev/null ++++ b/feeds/packages/net/bahamut/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=bahamut ++PKG_VERSION:=1.8.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-release.tar.gz ++PKG_SOURCE_URL:=http://bahamut.dal.net/download ++PKG_MD5SUM:=a814a4e0ff1fabcf026ea8574b4a1e20 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bahamut ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libopenssl +zlib ++ SUBMENU:=Instant Messaging ++ TITLE:=Bahamut IRC server ++ URL:=http://bahamut.dal.net ++endef ++ ++TARGET_CFLAGS += \ ++ -DSYS_ERRLIST_DECLARED ++ ++define Build/Configure ++ $(call Build/Configure/Default,\ ++ --with-maxconnections=64 \ ++ --with-openssl="$(STAGING_DIR)/usr/lib" \ ++ ,\ ++ ac_cv_func_dn_skipname=yes \ ++ ZLIB_HOME="$(STAGING_DIR)/usr" \ ++ ) ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,\ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ ++ STAGING_DIR="$(STAGING_DIR)" \ ++ all \ ++ ) ++endef ++ ++define Package/bahamut/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ircd $(1)/usr/sbin ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/*.{txt,conf} $(1)/etc/$(PKG_NAME) ++endef ++ ++$(eval $(call BuildPackage,bahamut)) +diff --git a/feeds/packages/net/bahamut/patches/.svn/entries b/feeds/packages/net/bahamut/patches/.svn/entries +new file mode 100644 +index 0000000..2059f8f +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bahamut/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-19T04:11:47.752259Z ++19729 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-glibc_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++3fce7dbe4f91f931507b5780c47ffc9c ++2009-07-18T08:32:38.267218Z ++16891 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1065 ++ ++010-dont-use-host-zlib.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++0760d2f1ea4ab111dfe19afab3c6bdf2 ++2010-02-19T04:11:47.752259Z ++19729 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++370 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++28f8f36f2c34538b29edef5723a73ad7 ++2009-07-18T08:32:38.267218Z ++16891 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2325 ++ +diff --git a/feeds/packages/net/bahamut/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/net/bahamut/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..ee398b0 +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,71 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -22,8 +22,8 @@ MV=@MV@ ++ ENGINE=@SENGINE@ ++ ++ SHELL=/bin/sh ++-SUBDIRS=src doc tools ++-INSTDIRS=src doc tools +++SUBDIRS=src +++INSTDIRS=src doc ++ CLEANSUBDIRS=src tools ++ ++ CC=@CC@ ++--- a/configure +++++ b/configure ++@@ -7057,8 +7057,7 @@ echo $ECHO_N "checking for epoll_create ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++-See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++See \`config.log' for more details." >&2;} } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -1,8 +1,8 @@ ++ CC=@CC@ ++ RM=@RM@ ++ MV=@MV@ ++-IRCDLIBS=@LIBS@ ++-INCLUDEDIR=-I../include +++IRCDLIBS=-lresolv -lz @LIBS@ -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib +++INCLUDEDIR=-I../include -I$(STAGING_DIR)/usr/include ++ OPENSSLINC=@SSL_INCLUDES@ ++ ENGINE=@SENGINE@ ++ CRYPTO=@ENCRYPT_SRC@ ++@@ -11,10 +11,10 @@ INSTALL_BIN=@INSTALL_PROGRAM@ ++ INSTALL_DIR=@INSTALL_DIR@ ++ CFLAGS=@CFLAGS@ -fno-strict-aliasing ++ ++-RES_SRC = +++#RES_SRC = ++ ++ #This is only for very old systems that NEED this ++-#RES_SRC = res_mkquery.c res_init.c res_comp.c +++RES_SRC = res_mkquery.c res_init.c res_comp.c ++ ++ SOURCES = blalloc.c bsd.c channel.c clientlist.c clones.c confparse.c \ ++ fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c ircsprintf.c \ ++@@ -22,7 +22,7 @@ SOURCES = blalloc.c bsd.c channel.c clie ++ m_who.c match.c memcount.c modules.c packet.c parse.c pcre.c \ ++ probability.c res.c s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c \ ++ s_misc.c s_numeric.c s_serv.c s_user.c sbuf.c scache.c send.c \ ++- struct.c support.c throttle.c userban.c whowas.c zlink.c \ +++ struct.c support.c throttle.c userban.c whowas.c zlink.c $(RES_SRC) \ ++ $(ENGINE) $(CRYPTO) ++ ++ OBJECTS = $(SOURCES:.c=.o) version.o ++--- a/src/res_comp.c +++++ b/src/res_comp.c ++@@ -229,7 +229,7 @@ dn_skipname(u_char *comp_dn, u_char *eom ++ * the first name on the list, not the pointer to the start of the ++ * message. ++ */ ++-int staticdn_find(u_char *exp_dn, u_char *msg, u_char **dnptrs, +++static int dn_find(u_char *exp_dn, u_char *msg, u_char **dnptrs, ++ u_char **lastdnptr) ++ { ++ u_char *dn, *cp, **cpp; +diff --git a/feeds/packages/net/bahamut/patches/.svn/text-base/002-glibc_fix.patch.svn-base b/feeds/packages/net/bahamut/patches/.svn/text-base/002-glibc_fix.patch.svn-base +new file mode 100644 +index 0000000..400caed +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/.svn/text-base/002-glibc_fix.patch.svn-base +@@ -0,0 +1,37 @@ ++--- a/include/resolv.h +++++ b/include/resolv.h ++@@ -60,7 +60,7 @@ ++ #if ((__GNU_LIBRARY__ == 6) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 3)) ++ # define MAXRESOLVSORT 10 /* number of net to sort on */ ++ ++-struct __res_state { +++struct state { ++ int retrans; /* retransmition time interval */ ++ int retry; /* number of times to retransmit */ ++ u_long options; /* option flags - see below. */ ++@@ -79,12 +79,9 @@ struct __res_state { ++ struct in_addr addr; ++ u_int32_t mask; ++ } sort_list[MAXRESOLVSORT]; +++ unsigned short order[MAXSERVICES + 1]; /* search service order */ ++ }; ++ ++-typedef struct __res_state *res_state; ++- ++-extern struct __res_state *__res_state(void) __attribute__ ((__const__)); ++-#define _res (*__res_state()) ++ ++ #else ++ ++@@ -101,9 +98,10 @@ struct state { ++ unsigned short order[MAXSERVICES + 1]; /* search service order */ ++ }; ++ ++-extern struct state _res; ++ #endif ++ +++extern struct state _res; +++ ++ extern char *p_cdname(), *p_rr(), *p_type(), *p_class(), *p_time(); ++ ++ #if ((__GNU_LIBRARY__ == 6) && (__GLIBC__ >=2) && (__GLIBC_MINOR__ >= 2)) +diff --git a/feeds/packages/net/bahamut/patches/.svn/text-base/010-dont-use-host-zlib.patch.svn-base b/feeds/packages/net/bahamut/patches/.svn/text-base/010-dont-use-host-zlib.patch.svn-base +new file mode 100644 +index 0000000..ef8029c +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/.svn/text-base/010-dont-use-host-zlib.patch.svn-base +@@ -0,0 +1,16 @@ ++diff --git a/configure b/configure ++index 4ef7659..c774c65 100755 ++--- a/configure +++++ b/configure ++@@ -8009,11 +8009,6 @@ fi ++ # zlib test ++ # ripped from http://autoconf-archive.cryp.to/check_zlib.html ++ # ++-ZLIB_HOME=/usr/local ++-if test ! -f "${ZLIB_HOME}/include/zlib.h" ++-then ++- ZLIB_HOME=/usr ++-fi ++ if test -n "${ZLIB_HOME}" ++ then ++ ZLIB_OLD_LDFLAGS=$LDFLAGS +diff --git a/feeds/packages/net/bahamut/patches/001-cross_compile.patch b/feeds/packages/net/bahamut/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..ee398b0 +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/001-cross_compile.patch +@@ -0,0 +1,71 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -22,8 +22,8 @@ MV=@MV@ ++ ENGINE=@SENGINE@ ++ ++ SHELL=/bin/sh ++-SUBDIRS=src doc tools ++-INSTDIRS=src doc tools +++SUBDIRS=src +++INSTDIRS=src doc ++ CLEANSUBDIRS=src tools ++ ++ CC=@CC@ ++--- a/configure +++++ b/configure ++@@ -7057,8 +7057,7 @@ echo $ECHO_N "checking for epoll_create ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++-See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++See \`config.log' for more details." >&2;} } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -1,8 +1,8 @@ ++ CC=@CC@ ++ RM=@RM@ ++ MV=@MV@ ++-IRCDLIBS=@LIBS@ ++-INCLUDEDIR=-I../include +++IRCDLIBS=-lresolv -lz @LIBS@ -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib +++INCLUDEDIR=-I../include -I$(STAGING_DIR)/usr/include ++ OPENSSLINC=@SSL_INCLUDES@ ++ ENGINE=@SENGINE@ ++ CRYPTO=@ENCRYPT_SRC@ ++@@ -11,10 +11,10 @@ INSTALL_BIN=@INSTALL_PROGRAM@ ++ INSTALL_DIR=@INSTALL_DIR@ ++ CFLAGS=@CFLAGS@ -fno-strict-aliasing ++ ++-RES_SRC = +++#RES_SRC = ++ ++ #This is only for very old systems that NEED this ++-#RES_SRC = res_mkquery.c res_init.c res_comp.c +++RES_SRC = res_mkquery.c res_init.c res_comp.c ++ ++ SOURCES = blalloc.c bsd.c channel.c clientlist.c clones.c confparse.c \ ++ fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c ircsprintf.c \ ++@@ -22,7 +22,7 @@ SOURCES = blalloc.c bsd.c channel.c clie ++ m_who.c match.c memcount.c modules.c packet.c parse.c pcre.c \ ++ probability.c res.c s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c \ ++ s_misc.c s_numeric.c s_serv.c s_user.c sbuf.c scache.c send.c \ ++- struct.c support.c throttle.c userban.c whowas.c zlink.c \ +++ struct.c support.c throttle.c userban.c whowas.c zlink.c $(RES_SRC) \ ++ $(ENGINE) $(CRYPTO) ++ ++ OBJECTS = $(SOURCES:.c=.o) version.o ++--- a/src/res_comp.c +++++ b/src/res_comp.c ++@@ -229,7 +229,7 @@ dn_skipname(u_char *comp_dn, u_char *eom ++ * the first name on the list, not the pointer to the start of the ++ * message. ++ */ ++-int staticdn_find(u_char *exp_dn, u_char *msg, u_char **dnptrs, +++static int dn_find(u_char *exp_dn, u_char *msg, u_char **dnptrs, ++ u_char **lastdnptr) ++ { ++ u_char *dn, *cp, **cpp; +diff --git a/feeds/packages/net/bahamut/patches/002-glibc_fix.patch b/feeds/packages/net/bahamut/patches/002-glibc_fix.patch +new file mode 100644 +index 0000000..400caed +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/002-glibc_fix.patch +@@ -0,0 +1,37 @@ ++--- a/include/resolv.h +++++ b/include/resolv.h ++@@ -60,7 +60,7 @@ ++ #if ((__GNU_LIBRARY__ == 6) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 3)) ++ # define MAXRESOLVSORT 10 /* number of net to sort on */ ++ ++-struct __res_state { +++struct state { ++ int retrans; /* retransmition time interval */ ++ int retry; /* number of times to retransmit */ ++ u_long options; /* option flags - see below. */ ++@@ -79,12 +79,9 @@ struct __res_state { ++ struct in_addr addr; ++ u_int32_t mask; ++ } sort_list[MAXRESOLVSORT]; +++ unsigned short order[MAXSERVICES + 1]; /* search service order */ ++ }; ++ ++-typedef struct __res_state *res_state; ++- ++-extern struct __res_state *__res_state(void) __attribute__ ((__const__)); ++-#define _res (*__res_state()) ++ ++ #else ++ ++@@ -101,9 +98,10 @@ struct state { ++ unsigned short order[MAXSERVICES + 1]; /* search service order */ ++ }; ++ ++-extern struct state _res; ++ #endif ++ +++extern struct state _res; +++ ++ extern char *p_cdname(), *p_rr(), *p_type(), *p_class(), *p_time(); ++ ++ #if ((__GNU_LIBRARY__ == 6) && (__GLIBC__ >=2) && (__GLIBC_MINOR__ >= 2)) +diff --git a/feeds/packages/net/bahamut/patches/010-dont-use-host-zlib.patch b/feeds/packages/net/bahamut/patches/010-dont-use-host-zlib.patch +new file mode 100644 +index 0000000..ef8029c +--- /dev/null ++++ b/feeds/packages/net/bahamut/patches/010-dont-use-host-zlib.patch +@@ -0,0 +1,16 @@ ++diff --git a/configure b/configure ++index 4ef7659..c774c65 100755 ++--- a/configure +++++ b/configure ++@@ -8009,11 +8009,6 @@ fi ++ # zlib test ++ # ripped from http://autoconf-archive.cryp.to/check_zlib.html ++ # ++-ZLIB_HOME=/usr/local ++-if test ! -f "${ZLIB_HOME}/include/zlib.h" ++-then ++- ZLIB_HOME=/usr ++-fi ++ if test -n "${ZLIB_HOME}" ++ then ++ ZLIB_OLD_LDFLAGS=$LDFLAGS +diff --git a/feeds/packages/net/baresip/.svn/entries b/feeds/packages/net/baresip/.svn/entries +new file mode 100644 +index 0000000..acf4fad +--- /dev/null ++++ b/feeds/packages/net/baresip/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/baresip ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-26T08:55:42.668889Z ++32501 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++fd740ab2e6b9c139c4f7033a487f9b12 ++2012-06-26T08:55:42.668889Z ++32501 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4401 ++ +diff --git a/feeds/packages/net/baresip/.svn/text-base/Makefile.svn-base b/feeds/packages/net/baresip/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f325467 +--- /dev/null ++++ b/feeds/packages/net/baresip/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,151 @@ ++# ++# Copyright (C) 2010-2012 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=baresip ++PKG_VERSION:=0.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.creytiv.com/pub/ ++PKG_MD5SUM:=1574e40bace9593ec40c527299654bb6 ++ ++baresip-mods:= \ ++ alsa \ ++ avcodec \ ++ avformat \ ++ cons \ ++ evdev \ ++ g711 \ ++ g722 \ ++ oss \ ++ sdl \ ++ speex \ ++ stdio \ ++ uuid \ ++ v4l \ ++ v4l2 \ ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_PACKAGE_baresip-mod-%,$(baresip-mods)) \ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/baresip/Default ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Telephony ++ URL:=http://www.creytiv.com/ ++endef ++ ++define Package/baresip ++$(call Package/baresip/Default) ++ TITLE:=Portable and modular SIP User-Agent with A/V support ++ DEPENDS:=+libre +librem +libpthread ++endef ++ ++ ++baresip-mod-alsa := USE_ALSA ++baresip-mod-avcodec := USE_FFMPEG ++baresip-mod-avformat := USE_FFMPEG_AVFORMAT ++baresip-mod-cons := USE_CONS ++baresip-mod-evdev := USE_EVDEV ++baresip-mod-g711 := USE_G711 ++baresip-mod-g722 := USE_G722 ++baresip-mod-oss := USE_OSS ++baresip-mod-sdl := USE_SDL ++baresip-mod-speex := USE_SPEEX ++baresip-mod-stdio := USE_STDIO ++baresip-mod-uuid := USE_UUID ++baresip-mod-v4l := USE_V4L ++baresip-mod-v4l2 := USE_V4L2 ++ ++BARESIP_MOD_OPTIONS:= \ ++ MOD_AUTODETECT= \ ++ $(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),1)) ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ ++ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ ++ LIBRE_SO="$(STAGING_DIR)/usr/lib" \ ++ LIBREM_PATH="../rem" \ ++ CC="$(TARGET_CC)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ ++ SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ ++ SYSROOT_ALT="$(STAGING_DIR)/usr" \ ++ RELEASE=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ OS="linux" \ ++ $(BARESIP_MOD_OPTIONS) \ ++ all install ++endef ++ ++define Package/baresip/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/baresip/modules ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/ice.so \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/stun.so \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/turn.so \ ++ $(1)/usr/lib/baresip/modules/. ++ $(INSTALL_DIR) $(1)/usr/share/baresip ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/baresip/* $(1)/usr/share/baresip/. ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/baresip.init $(1)/etc/init.d/baresip ++endef ++ ++ ++# ++# 1. Name ++# 2. Title ++# 3. Files ++# 4. Depends ++# ++define BuildPlugin ++ ++ define Package/baresip-mod-$(1) ++ $$(call Package/baresip/Default) ++ TITLE:= baresip $(2) module ++ DEPENDS:= baresip $(4) ++ endef ++ ++ define Package/baresip-mod-$(1)/install ++ [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules ++ for f in $(3); do \ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/$$$$$$$${f}.so \ ++ $$(1)/usr/lib/baresip/modules/ ; \ ++ done ++ endef ++ ++ $$(eval $$(call BuildPackage,baresip-mod-$(1))) ++endef ++ ++ ++$(eval $(call BuildPackage,baresip)) ++ ++$(eval $(call BuildPlugin,alsa,ALSA audio driver,alsa,+PACKAGE_baresip-mod-alsa:alsa-lib)) ++$(eval $(call BuildPlugin,avcodec,FFmpeg video codecs,avcodec,+PACKAGE_baresip-mod-avcodec:libffmpeg-full)) ++$(eval $(call BuildPlugin,avformat,FFmpeg video source,avformat,+PACKAGE_baresip-mod-avformat:libffmpeg-full)) ++$(eval $(call BuildPlugin,cons,console UI,cons,)) ++$(eval $(call BuildPlugin,evdev,input event device UI,evdev,)) ++$(eval $(call BuildPlugin,g711,G.711 audio codec,g711,)) ++$(eval $(call BuildPlugin,g722,G.722 audio codec,g722,+PACKAGE_baresip-mod-g722:libspandsp)) ++$(eval $(call BuildPlugin,sdl,SDL video display,sdl,+libsdl)) ++$(eval $(call BuildPlugin,oss,OSS audio driver,oss,)) ++$(eval $(call BuildPlugin,speex,Speex audio codec,speex,+PACKAGE_baresip-mod-speex:libspeex)) ++$(eval $(call BuildPlugin,stdio,standard I/O UI,stdio,)) ++$(eval $(call BuildPlugin,uuid,UUID,uuid,+libuuid)) ++$(eval $(call BuildPlugin,v4l,Video4Linux video source,v4l,+PACKAGE_baresip-mod-v4l:libv4l)) ++$(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,v4l2,+PACKAGE_baresip-mod-v4l2:libv4l)) +diff --git a/feeds/packages/net/baresip/Makefile b/feeds/packages/net/baresip/Makefile +new file mode 100644 +index 0000000..f325467 +--- /dev/null ++++ b/feeds/packages/net/baresip/Makefile +@@ -0,0 +1,151 @@ ++# ++# Copyright (C) 2010-2012 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=baresip ++PKG_VERSION:=0.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.creytiv.com/pub/ ++PKG_MD5SUM:=1574e40bace9593ec40c527299654bb6 ++ ++baresip-mods:= \ ++ alsa \ ++ avcodec \ ++ avformat \ ++ cons \ ++ evdev \ ++ g711 \ ++ g722 \ ++ oss \ ++ sdl \ ++ speex \ ++ stdio \ ++ uuid \ ++ v4l \ ++ v4l2 \ ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_PACKAGE_baresip-mod-%,$(baresip-mods)) \ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/baresip/Default ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Telephony ++ URL:=http://www.creytiv.com/ ++endef ++ ++define Package/baresip ++$(call Package/baresip/Default) ++ TITLE:=Portable and modular SIP User-Agent with A/V support ++ DEPENDS:=+libre +librem +libpthread ++endef ++ ++ ++baresip-mod-alsa := USE_ALSA ++baresip-mod-avcodec := USE_FFMPEG ++baresip-mod-avformat := USE_FFMPEG_AVFORMAT ++baresip-mod-cons := USE_CONS ++baresip-mod-evdev := USE_EVDEV ++baresip-mod-g711 := USE_G711 ++baresip-mod-g722 := USE_G722 ++baresip-mod-oss := USE_OSS ++baresip-mod-sdl := USE_SDL ++baresip-mod-speex := USE_SPEEX ++baresip-mod-stdio := USE_STDIO ++baresip-mod-uuid := USE_UUID ++baresip-mod-v4l := USE_V4L ++baresip-mod-v4l2 := USE_V4L2 ++ ++BARESIP_MOD_OPTIONS:= \ ++ MOD_AUTODETECT= \ ++ $(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),1)) ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ ++ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ ++ LIBRE_SO="$(STAGING_DIR)/usr/lib" \ ++ LIBREM_PATH="../rem" \ ++ CC="$(TARGET_CC)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ ++ SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ ++ SYSROOT_ALT="$(STAGING_DIR)/usr" \ ++ RELEASE=1 \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ OS="linux" \ ++ $(BARESIP_MOD_OPTIONS) \ ++ all install ++endef ++ ++define Package/baresip/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/baresip/modules ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/ice.so \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/stun.so \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/turn.so \ ++ $(1)/usr/lib/baresip/modules/. ++ $(INSTALL_DIR) $(1)/usr/share/baresip ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/baresip/* $(1)/usr/share/baresip/. ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/baresip.init $(1)/etc/init.d/baresip ++endef ++ ++ ++# ++# 1. Name ++# 2. Title ++# 3. Files ++# 4. Depends ++# ++define BuildPlugin ++ ++ define Package/baresip-mod-$(1) ++ $$(call Package/baresip/Default) ++ TITLE:= baresip $(2) module ++ DEPENDS:= baresip $(4) ++ endef ++ ++ define Package/baresip-mod-$(1)/install ++ [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules ++ for f in $(3); do \ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/$$$$$$$${f}.so \ ++ $$(1)/usr/lib/baresip/modules/ ; \ ++ done ++ endef ++ ++ $$(eval $$(call BuildPackage,baresip-mod-$(1))) ++endef ++ ++ ++$(eval $(call BuildPackage,baresip)) ++ ++$(eval $(call BuildPlugin,alsa,ALSA audio driver,alsa,+PACKAGE_baresip-mod-alsa:alsa-lib)) ++$(eval $(call BuildPlugin,avcodec,FFmpeg video codecs,avcodec,+PACKAGE_baresip-mod-avcodec:libffmpeg-full)) ++$(eval $(call BuildPlugin,avformat,FFmpeg video source,avformat,+PACKAGE_baresip-mod-avformat:libffmpeg-full)) ++$(eval $(call BuildPlugin,cons,console UI,cons,)) ++$(eval $(call BuildPlugin,evdev,input event device UI,evdev,)) ++$(eval $(call BuildPlugin,g711,G.711 audio codec,g711,)) ++$(eval $(call BuildPlugin,g722,G.722 audio codec,g722,+PACKAGE_baresip-mod-g722:libspandsp)) ++$(eval $(call BuildPlugin,sdl,SDL video display,sdl,+libsdl)) ++$(eval $(call BuildPlugin,oss,OSS audio driver,oss,)) ++$(eval $(call BuildPlugin,speex,Speex audio codec,speex,+PACKAGE_baresip-mod-speex:libspeex)) ++$(eval $(call BuildPlugin,stdio,standard I/O UI,stdio,)) ++$(eval $(call BuildPlugin,uuid,UUID,uuid,+libuuid)) ++$(eval $(call BuildPlugin,v4l,Video4Linux video source,v4l,+PACKAGE_baresip-mod-v4l:libv4l)) ++$(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,v4l2,+PACKAGE_baresip-mod-v4l2:libv4l)) +diff --git a/feeds/packages/net/baresip/files/.svn/entries b/feeds/packages/net/baresip/files/.svn/entries +new file mode 100644 +index 0000000..581d4eb +--- /dev/null ++++ b/feeds/packages/net/baresip/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/baresip/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T09:44:09.675990Z ++29171 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++baresip.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++31a86fe802aecd9959f5bdc3e2a85015 ++2011-11-16T09:44:09.675990Z ++29171 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++207 ++ +diff --git a/feeds/packages/net/baresip/files/.svn/text-base/baresip.init.svn-base b/feeds/packages/net/baresip/files/.svn/text-base/baresip.init.svn-base +new file mode 100644 +index 0000000..e398595 +--- /dev/null ++++ b/feeds/packages/net/baresip/files/.svn/text-base/baresip.init.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++ ++START=92 ++ ++start() { ++ service_start /usr/bin/baresip -d ++} ++ ++stop() { ++ service_stop /usr/bin/baresip ++} +diff --git a/feeds/packages/net/baresip/files/baresip.init b/feeds/packages/net/baresip/files/baresip.init +new file mode 100644 +index 0000000..e398595 +--- /dev/null ++++ b/feeds/packages/net/baresip/files/baresip.init +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alfred E. Heggestad ++# ++ ++START=92 ++ ++start() { ++ service_start /usr/bin/baresip -d ++} ++ ++stop() { ++ service_stop /usr/bin/baresip ++} +diff --git a/feeds/packages/net/baresip/patches/.svn/entries b/feeds/packages/net/baresip/patches/.svn/entries +new file mode 100644 +index 0000000..f10d66b +--- /dev/null ++++ b/feeds/packages/net/baresip/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/baresip/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-27T04:29:18.183469Z ++30736 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-videodev-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++f8691448cacb7b9e9a57cf83f0306c80 ++2012-02-27T04:29:18.183469Z ++30736 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++288 ++ +diff --git a/feeds/packages/net/baresip/patches/.svn/text-base/100-videodev-compat.patch.svn-base b/feeds/packages/net/baresip/patches/.svn/text-base/100-videodev-compat.patch.svn-base +new file mode 100644 +index 0000000..4b9997c +--- /dev/null ++++ b/feeds/packages/net/baresip/patches/.svn/text-base/100-videodev-compat.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/modules/v4l/v4l.c +++++ b/modules/v4l/v4l.c ++@@ -14,7 +14,7 @@ ++ #include ++ #include ++ #undef __STRICT_ANSI__ /* needed for RHEL4 kernel 2.6.9 */ ++-#include +++#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/net/baresip/patches/100-videodev-compat.patch b/feeds/packages/net/baresip/patches/100-videodev-compat.patch +new file mode 100644 +index 0000000..4b9997c +--- /dev/null ++++ b/feeds/packages/net/baresip/patches/100-videodev-compat.patch +@@ -0,0 +1,11 @@ ++--- a/modules/v4l/v4l.c +++++ b/modules/v4l/v4l.c ++@@ -14,7 +14,7 @@ ++ #include ++ #include ++ #undef __STRICT_ANSI__ /* needed for RHEL4 kernel 2.6.9 */ ++-#include +++#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/net/batman-adv/.svn/entries b/feeds/packages/net/batman-adv/.svn/entries +new file mode 100644 +index 0000000..d75f253 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/.svn/entries +@@ -0,0 +1,102 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-09T10:13:46.640081Z ++35906 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++c46d3b827961f4dd618db9ad667e19d5 ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++625 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++efbc18bfb79f2c318e82c4a9b7fbbe27 ++2013-03-09T10:13:46.640081Z ++35906 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3724 ++ +diff --git a/feeds/packages/net/batman-adv/.svn/text-base/Config.in.svn-base b/feeds/packages/net/batman-adv/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..08987e5 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,24 @@ ++ ++config KMOD_BATMAN_ADV_DEBUG_LOG ++ bool "enable verbose debug logging" ++ depends PACKAGE_kmod-batman-adv ++ default n ++ ++config KMOD_BATMAN_ADV_BLA ++ bool "enable bridge loop avoidance" ++ depends PACKAGE_kmod-batman-adv ++ default y ++ ++config KMOD_BATMAN_ADV_DAT ++ bool "enable distributed arp table" ++ depends PACKAGE_kmod-batman-adv ++ default y ++ ++config KMOD_BATMAN_ADV_BATCTL ++ bool "enable batctl" ++ depends PACKAGE_kmod-batman-adv ++ default y ++ help ++ batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced. ++ It is an easier method for configuring batman-adv and ++ provides some additional tools for debugging as well. +diff --git a/feeds/packages/net/batman-adv/.svn/text-base/Makefile.svn-base b/feeds/packages/net/batman-adv/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..efe7ed6 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,121 @@ ++# ++# Copyright (C) 2010 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=batman-adv ++ ++PKG_VERSION:=2013.1.0 ++BATCTL_VERSION:=2013.1.0 ++PKG_RELEASE:=2 ++PKG_MD5SUM:=fe1fd32eddde1f91575d7a7ec21d5782 ++BATCTL_MD5SUM:=767bf36c77c517e1d321169bf9a7fae5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_BATCTL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(BATCTL_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++define KernelPackage/batman-adv ++ URL:=http://www.open-mesh.org/ ++ MAINTAINER:=Marek Lindner ++ SUBMENU:=Network Support ++ DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc ++ TITLE:=B.A.T.M.A.N. Adv ++ FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,50,batman-adv) ++endef ++ ++define KernelPackage/batman-adv/description ++B.A.T.M.A.N. advanced is a kernel module which allows to ++build layer 2 mesh networks. This package contains the ++version $(PKG_VERSION) of the kernel module plus its user space ++configuration & managerment tool batctl. ++endef ++ ++define KernelPackage/batman-adv/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++MAKE_BATMAN_ADV_ARGS += \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ KERNELPATH="$(LINUX_DIR)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ PATH="$(TARGET_PATH)" \ ++ SUBDIRS="$(PKG_BUILD_DIR)" \ ++ PWD="$(PKG_BUILD_DIR)" \ ++ LINUX_VERSION="$(LINUX_VERSION)" \ ++ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \ ++ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \ ++ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \ ++ REVISION="" all ++ ++MAKE_BATCTL_ARGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ batctl install ++ ++ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),) ++define Download/batctl ++ FILE:=batctl-$(BATCTL_VERSION).tar.gz ++ URL:=$(PKG_SOURCE_URL) ++ MD5SUM:=$(BATCTL_MD5SUM) ++endef ++$(eval $(call Download,batctl)) ++ ++BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)" ++BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") ++BATCTL_BUILD = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) ++BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ ++endif ++ ++KPATCH ?= $(PATCH) ++define Build/DoPatch ++ @if [ -d "$(2)" ]; then \ ++ if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \ ++ $(KPATCH) "$(1)" "$(2)" "$(3)"; \ ++ fi; \ ++ fi ++endef ++ ++define Build/Patch ++ $(call Build/DoPatch,"$(PKG_BUILD_DIR)","$(PATCH_DIR)","*batman*") ++ $(BATCTL_EXTRACT) ++ $(BATCTL_PATCH) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS) ++ $(BATCTL_BUILD) ++endef ++ ++define Build/Clean ++ rm -rf $(BUILD_DIR)/$(PKG_NAME)/ ++endef ++ ++define KernelPackage/batman-adv/install ++ $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto ++ $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config ++ $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv ++ $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net ++ $(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto ++ $(BATCTL_INSTALL) ++endef ++ ++$(eval $(call KernelPackage,batman-adv)) +diff --git a/feeds/packages/net/batman-adv/Config.in b/feeds/packages/net/batman-adv/Config.in +new file mode 100644 +index 0000000..08987e5 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/Config.in +@@ -0,0 +1,24 @@ ++ ++config KMOD_BATMAN_ADV_DEBUG_LOG ++ bool "enable verbose debug logging" ++ depends PACKAGE_kmod-batman-adv ++ default n ++ ++config KMOD_BATMAN_ADV_BLA ++ bool "enable bridge loop avoidance" ++ depends PACKAGE_kmod-batman-adv ++ default y ++ ++config KMOD_BATMAN_ADV_DAT ++ bool "enable distributed arp table" ++ depends PACKAGE_kmod-batman-adv ++ default y ++ ++config KMOD_BATMAN_ADV_BATCTL ++ bool "enable batctl" ++ depends PACKAGE_kmod-batman-adv ++ default y ++ help ++ batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced. ++ It is an easier method for configuring batman-adv and ++ provides some additional tools for debugging as well. +diff --git a/feeds/packages/net/batman-adv/Makefile b/feeds/packages/net/batman-adv/Makefile +new file mode 100644 +index 0000000..efe7ed6 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/Makefile +@@ -0,0 +1,121 @@ ++# ++# Copyright (C) 2010 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=batman-adv ++ ++PKG_VERSION:=2013.1.0 ++BATCTL_VERSION:=2013.1.0 ++PKG_RELEASE:=2 ++PKG_MD5SUM:=fe1fd32eddde1f91575d7a7ec21d5782 ++BATCTL_MD5SUM:=767bf36c77c517e1d321169bf9a7fae5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_BATCTL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(BATCTL_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++define KernelPackage/batman-adv ++ URL:=http://www.open-mesh.org/ ++ MAINTAINER:=Marek Lindner ++ SUBMENU:=Network Support ++ DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc ++ TITLE:=B.A.T.M.A.N. Adv ++ FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,50,batman-adv) ++endef ++ ++define KernelPackage/batman-adv/description ++B.A.T.M.A.N. advanced is a kernel module which allows to ++build layer 2 mesh networks. This package contains the ++version $(PKG_VERSION) of the kernel module plus its user space ++configuration & managerment tool batctl. ++endef ++ ++define KernelPackage/batman-adv/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++MAKE_BATMAN_ADV_ARGS += \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ KERNELPATH="$(LINUX_DIR)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ PATH="$(TARGET_PATH)" \ ++ SUBDIRS="$(PKG_BUILD_DIR)" \ ++ PWD="$(PKG_BUILD_DIR)" \ ++ LINUX_VERSION="$(LINUX_VERSION)" \ ++ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \ ++ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \ ++ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \ ++ REVISION="" all ++ ++MAKE_BATCTL_ARGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ batctl install ++ ++ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),) ++define Download/batctl ++ FILE:=batctl-$(BATCTL_VERSION).tar.gz ++ URL:=$(PKG_SOURCE_URL) ++ MD5SUM:=$(BATCTL_MD5SUM) ++endef ++$(eval $(call Download,batctl)) ++ ++BATCTL_EXTRACT = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)" ++BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") ++BATCTL_BUILD = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) ++BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ ++endif ++ ++KPATCH ?= $(PATCH) ++define Build/DoPatch ++ @if [ -d "$(2)" ]; then \ ++ if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \ ++ $(KPATCH) "$(1)" "$(2)" "$(3)"; \ ++ fi; \ ++ fi ++endef ++ ++define Build/Patch ++ $(call Build/DoPatch,"$(PKG_BUILD_DIR)","$(PATCH_DIR)","*batman*") ++ $(BATCTL_EXTRACT) ++ $(BATCTL_PATCH) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS) ++ $(BATCTL_BUILD) ++endef ++ ++define Build/Clean ++ rm -rf $(BUILD_DIR)/$(PKG_NAME)/ ++endef ++ ++define KernelPackage/batman-adv/install ++ $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto ++ $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config ++ $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv ++ $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net ++ $(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto ++ $(BATCTL_INSTALL) ++endef ++ ++$(eval $(call KernelPackage,batman-adv)) +diff --git a/feeds/packages/net/batman-adv/files/.svn/entries b/feeds/packages/net/batman-adv/files/.svn/entries +new file mode 100644 +index 0000000..3383b88 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-04T02:12:11.600105Z ++35867 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lib ++dir ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/batman-adv/files/etc/.svn/entries b/feeds/packages/net/batman-adv/files/etc/.svn/entries +new file mode 100644 +index 0000000..495c3e1 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hotplug.d ++dir ++ ++config ++dir ++ +diff --git a/feeds/packages/net/batman-adv/files/etc/config/.svn/entries b/feeds/packages/net/batman-adv/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..0f2988e +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++batman-adv ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++8ebe466927a77e8e06a2f3c1a2782a55 ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++414 ++ +diff --git a/feeds/packages/net/batman-adv/files/etc/config/.svn/text-base/batman-adv.svn-base b/feeds/packages/net/batman-adv/files/etc/config/.svn/text-base/batman-adv.svn-base +new file mode 100644 +index 0000000..6a62203 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/config/.svn/text-base/batman-adv.svn-base +@@ -0,0 +1,19 @@ ++ ++config 'mesh' 'bat0' ++ option 'aggregated_ogms' ++ option 'ap_isolation' ++ option 'bonding' ++ option 'fragmentation' ++ option 'gw_bandwidth' ++ option 'gw_mode' ++ option 'gw_sel_class' ++ option 'log_level' ++ option 'orig_interval' ++ option 'vis_mode' ++ option 'bridge_loop_avoidance' ++ option 'distributed_arp_table' ++ option 'hop_penalty' ++ ++# yet another batX instance ++# config 'mesh' 'bat5' ++# option 'interfaces' 'second_mesh' +diff --git a/feeds/packages/net/batman-adv/files/etc/config/batman-adv b/feeds/packages/net/batman-adv/files/etc/config/batman-adv +new file mode 100644 +index 0000000..6a62203 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/config/batman-adv +@@ -0,0 +1,19 @@ ++ ++config 'mesh' 'bat0' ++ option 'aggregated_ogms' ++ option 'ap_isolation' ++ option 'bonding' ++ option 'fragmentation' ++ option 'gw_bandwidth' ++ option 'gw_mode' ++ option 'gw_sel_class' ++ option 'log_level' ++ option 'orig_interval' ++ option 'vis_mode' ++ option 'bridge_loop_avoidance' ++ option 'distributed_arp_table' ++ option 'hop_penalty' ++ ++# yet another batX instance ++# config 'mesh' 'bat5' ++# option 'interfaces' 'second_mesh' +diff --git a/feeds/packages/net/batman-adv/files/etc/hotplug.d/.svn/entries b/feeds/packages/net/batman-adv/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..f981802 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/etc/hotplug.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++net ++dir ++ +diff --git a/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/.svn/entries b/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/.svn/entries +new file mode 100644 +index 0000000..79df8f5 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/etc/hotplug.d/net ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++99-batman-adv ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++31d18c677bee9f7055c2a6eb9011cd22 ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++182 ++ +diff --git a/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/.svn/text-base/99-batman-adv.svn-base b/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/.svn/text-base/99-batman-adv.svn-base +new file mode 100644 +index 0000000..f0c391f +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/.svn/text-base/99-batman-adv.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++. /lib/batman-adv/config.sh ++ ++bat_load_module ++config_load batman-adv ++ ++case "$ACTION" in ++ add) ++ [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" ++ ;; ++esac +diff --git a/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/99-batman-adv b/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/99-batman-adv +new file mode 100644 +index 0000000..f0c391f +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/etc/hotplug.d/net/99-batman-adv +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++. /lib/batman-adv/config.sh ++ ++bat_load_module ++config_load batman-adv ++ ++case "$ACTION" in ++ add) ++ [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" ++ ;; ++esac +diff --git a/feeds/packages/net/batman-adv/files/lib/.svn/entries b/feeds/packages/net/batman-adv/files/lib/.svn/entries +new file mode 100644 +index 0000000..ebfe192 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/lib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++netifd ++dir ++ ++batman-adv ++dir ++ +diff --git a/feeds/packages/net/batman-adv/files/lib/batman-adv/.svn/entries b/feeds/packages/net/batman-adv/files/lib/batman-adv/.svn/entries +new file mode 100644 +index 0000000..14d1a3b +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/batman-adv/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/lib/batman-adv ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++cdb90d186039b12fdb7dbbdcc836acec ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2295 ++ +diff --git a/feeds/packages/net/batman-adv/files/lib/batman-adv/.svn/text-base/config.sh.svn-base b/feeds/packages/net/batman-adv/files/lib/batman-adv/.svn/text-base/config.sh.svn-base +new file mode 100644 +index 0000000..ae102e9 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/batman-adv/.svn/text-base/config.sh.svn-base +@@ -0,0 +1,46 @@ ++#!/bin/sh ++ ++bat_load_module() ++{ ++ [ -d "/sys/module/batman_adv/" ] && return ++ ++ . /lib/functions.sh ++ load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv* ++} ++ ++bat_config() ++{ ++ local mesh="$1" ++ local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation ++ local gw_bandwidth gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode ++ ++ config_get aggregated_ogms "$mesh" aggregated_ogms ++ config_get ap_isolation "$mesh" ap_isolation ++ config_get bonding "$mesh" bonding ++ config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance ++ config_get distributed_arp_table "$mesh" distributed_arp_table ++ config_get fragmentation "$mesh" fragmentation ++ config_get gw_bandwidth "$mesh" gw_bandwidth ++ config_get gw_mode "$mesh" gw_mode ++ config_get gw_sel_class "$mesh" gw_sel_class ++ config_get hop_penalty "$mesh" hop_penalty ++ config_get log_level "$mesh" log_level ++ config_get orig_interval "$mesh" orig_interval ++ config_get vis_mode "$mesh" vis_mode ++ ++ [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 ++ ++ [ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms ++ [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation ++ [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding ++ [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance ++ [ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table ++ [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation ++ [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth ++ [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode ++ [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class ++ [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty ++ [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- ++ [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval ++ [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode ++} +diff --git a/feeds/packages/net/batman-adv/files/lib/batman-adv/config.sh b/feeds/packages/net/batman-adv/files/lib/batman-adv/config.sh +new file mode 100644 +index 0000000..ae102e9 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/batman-adv/config.sh +@@ -0,0 +1,46 @@ ++#!/bin/sh ++ ++bat_load_module() ++{ ++ [ -d "/sys/module/batman_adv/" ] && return ++ ++ . /lib/functions.sh ++ load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-batman-adv* ++} ++ ++bat_config() ++{ ++ local mesh="$1" ++ local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation ++ local gw_bandwidth gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode ++ ++ config_get aggregated_ogms "$mesh" aggregated_ogms ++ config_get ap_isolation "$mesh" ap_isolation ++ config_get bonding "$mesh" bonding ++ config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance ++ config_get distributed_arp_table "$mesh" distributed_arp_table ++ config_get fragmentation "$mesh" fragmentation ++ config_get gw_bandwidth "$mesh" gw_bandwidth ++ config_get gw_mode "$mesh" gw_mode ++ config_get gw_sel_class "$mesh" gw_sel_class ++ config_get hop_penalty "$mesh" hop_penalty ++ config_get log_level "$mesh" log_level ++ config_get orig_interval "$mesh" orig_interval ++ config_get vis_mode "$mesh" vis_mode ++ ++ [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 ++ ++ [ -n "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms ++ [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation ++ [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding ++ [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance ++ [ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table ++ [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation ++ [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth ++ [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode ++ [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class ++ [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty ++ [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- ++ [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval ++ [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode ++} +diff --git a/feeds/packages/net/batman-adv/files/lib/netifd/.svn/entries b/feeds/packages/net/batman-adv/files/lib/netifd/.svn/entries +new file mode 100644 +index 0000000..c5a7b54 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/netifd/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/lib/netifd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++proto ++dir ++ +diff --git a/feeds/packages/net/batman-adv/files/lib/netifd/proto/.svn/entries b/feeds/packages/net/batman-adv/files/lib/netifd/proto/.svn/entries +new file mode 100644 +index 0000000..f275c82 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/netifd/proto/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/files/lib/netifd/proto ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++batadv.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++437c5cb32f55aa1428f266f8fb1976c7 ++2013-01-15T13:09:04.606328Z ++35175 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++507 ++ +diff --git a/feeds/packages/net/batman-adv/files/lib/netifd/proto/.svn/text-base/batadv.sh.svn-base b/feeds/packages/net/batman-adv/files/lib/netifd/proto/.svn/text-base/batadv.sh.svn-base +new file mode 100644 +index 0000000..632a209 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/netifd/proto/.svn/text-base/batadv.sh.svn-base +@@ -0,0 +1,30 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++. ../netifd-proto.sh ++init_proto "$@" ++ ++proto_batadv_init_config() { ++ proto_config_add_string "mesh" ++} ++ ++proto_batadv_setup() { ++ local config="$1" ++ local iface="$2" ++ ++ local mesh ++ json_get_vars mesh ++ ++ echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface" ++ proto_init_update "$iface" 1 ++ proto_send_update "$config" ++} ++ ++proto_batadv_teardown() { ++ local config="$1" ++ local iface="$2" ++ ++ echo "none" > "/sys/class/net/$iface/batman_adv/mesh_iface" || true ++} ++ ++add_protocol batadv +diff --git a/feeds/packages/net/batman-adv/files/lib/netifd/proto/batadv.sh b/feeds/packages/net/batman-adv/files/lib/netifd/proto/batadv.sh +new file mode 100644 +index 0000000..632a209 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/files/lib/netifd/proto/batadv.sh +@@ -0,0 +1,30 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++. ../netifd-proto.sh ++init_proto "$@" ++ ++proto_batadv_init_config() { ++ proto_config_add_string "mesh" ++} ++ ++proto_batadv_setup() { ++ local config="$1" ++ local iface="$2" ++ ++ local mesh ++ json_get_vars mesh ++ ++ echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface" ++ proto_init_update "$iface" 1 ++ proto_send_update "$config" ++} ++ ++proto_batadv_teardown() { ++ local config="$1" ++ local iface="$2" ++ ++ echo "none" > "/sys/class/net/$iface/batman_adv/mesh_iface" || true ++} ++ ++add_protocol batadv +diff --git a/feeds/packages/net/batman-adv/patches/.svn/entries b/feeds/packages/net/batman-adv/patches/.svn/entries +new file mode 100644 +index 0000000..54352d8 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman-adv/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-09T10:13:46.640081Z ++35906 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++2798076b79d476f68e6616f07b088162 ++2013-03-09T10:13:46.640081Z ++35906 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1478 ++ +diff --git a/feeds/packages/net/batman-adv/patches/.svn/text-base/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch.svn-base b/feeds/packages/net/batman-adv/patches/.svn/text-base/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch.svn-base +new file mode 100644 +index 0000000..37c6532 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/patches/.svn/text-base/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch.svn-base +@@ -0,0 +1,42 @@ ++From e56c79f4e863436d0fc6c48fed0db09b7a49e565 Mon Sep 17 00:00:00 2001 ++From: Marek Lindner ++Date: Mon, 4 Mar 2013 10:39:49 +0800 ++Subject: [PATCH] batman-adv: verify tt len does not exceed packet len ++ ++batadv_iv_ogm_process() accesses the packet using the tt_num_changes ++attribute regardless of the real packet len (assuming the length check ++was done before). Therefore a length check is needed to avoid reading ++random memory. ++ ++Signed-off-by: Marek Lindner ++--- ++ bat_iv_ogm.c | 6 +++--- ++ 1 file changed, 3 insertions(+), 3 deletions(-) ++ ++diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c ++index 72fe1bb..d5be889 100644 ++--- a/bat_iv_ogm.c +++++ b/bat_iv_ogm.c ++@@ -1292,7 +1292,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ++ batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff; ++ ++ /* unpack the aggregated packets and process them one by one */ ++- do { +++ while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, +++ batadv_ogm_packet->tt_num_changes)) { ++ tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN; ++ ++ batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff, ++@@ -1303,8 +1304,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ++ ++ packet_pos = packet_buff + buff_pos; ++ batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; ++- } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, ++- batadv_ogm_packet->tt_num_changes)); +++ } ++ ++ kfree_skb(skb); ++ return NET_RX_SUCCESS; ++-- ++1.7.10.4 ++ +diff --git a/feeds/packages/net/batman-adv/patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch b/feeds/packages/net/batman-adv/patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch +new file mode 100644 +index 0000000..37c6532 +--- /dev/null ++++ b/feeds/packages/net/batman-adv/patches/0001-batman-adv-verify-tt-len-does-not-exceed-packet-len.patch +@@ -0,0 +1,42 @@ ++From e56c79f4e863436d0fc6c48fed0db09b7a49e565 Mon Sep 17 00:00:00 2001 ++From: Marek Lindner ++Date: Mon, 4 Mar 2013 10:39:49 +0800 ++Subject: [PATCH] batman-adv: verify tt len does not exceed packet len ++ ++batadv_iv_ogm_process() accesses the packet using the tt_num_changes ++attribute regardless of the real packet len (assuming the length check ++was done before). Therefore a length check is needed to avoid reading ++random memory. ++ ++Signed-off-by: Marek Lindner ++--- ++ bat_iv_ogm.c | 6 +++--- ++ 1 file changed, 3 insertions(+), 3 deletions(-) ++ ++diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c ++index 72fe1bb..d5be889 100644 ++--- a/bat_iv_ogm.c +++++ b/bat_iv_ogm.c ++@@ -1292,7 +1292,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ++ batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff; ++ ++ /* unpack the aggregated packets and process them one by one */ ++- do { +++ while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, +++ batadv_ogm_packet->tt_num_changes)) { ++ tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN; ++ ++ batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff, ++@@ -1303,8 +1304,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ++ ++ packet_pos = packet_buff + buff_pos; ++ batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; ++- } while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len, ++- batadv_ogm_packet->tt_num_changes)); +++ } ++ ++ kfree_skb(skb); ++ return NET_RX_SUCCESS; ++-- ++1.7.10.4 ++ +diff --git a/feeds/packages/net/batman/.svn/entries b/feeds/packages/net/batman/.svn/entries +new file mode 100644 +index 0000000..2aa7af9 +--- /dev/null ++++ b/feeds/packages/net/batman/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-15T19:19:45.062263Z ++30557 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++03c28ba24421fe9d4fbe54de68b6cc01 ++2012-02-15T19:19:45.062263Z ++30557 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3978 ++ +diff --git a/feeds/packages/net/batman/.svn/text-base/Makefile.svn-base b/feeds/packages/net/batman/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4026496 +--- /dev/null ++++ b/feeds/packages/net/batman/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,152 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=batmand ++PKG_REV:=1439 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=2 ++PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),$(PKG_NAME))-$(PKG_VERSION) ++PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/trunk/ ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/batmand/Default ++ URL:=http://www.open-mesh.org/ ++ MAINTAINER:=Marek Lindner ++endef ++ ++define Package/batmand ++$(call Package/batmand/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ DEPENDS:=+libpthread +kmod-tun ++ TITLE:=B.A.T.M.A.N. layer 3 routing daemon ++endef ++ ++define Package/batmand/description ++B.A.T.M.A.N. layer 3 routing daemon ++endef ++ ++define Package/vis ++$(call Package/batmand/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ DEPENDS:=+libpthread ++ TITLE:=visualization server for B.A.T.M.A.N. layer 3 ++endef ++ ++define Package/vis/description ++visualization server for B.A.T.M.A.N. layer 3 ++endef ++ ++define KernelPackage/batgat ++$(call Package/batmand/Default) ++ SUBMENU:=Network Support ++ DEPENDS:=+batmand @BROKEN ++ TITLE:=B.A.T.M.A.N. gateway module ++ FILES:=$(PKG_KMOD_BUILD_DIR)/batgat.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,50,batgat) ++endef ++ ++ ++define KernelPackage/batgat/description ++Kernel gateway module for B.A.T.M.A.N. for better tunnel performance ++endef ++ ++MAKE_BATMAND_ARGS += \ ++ EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ batmand install ++ ++MAKE_VIS_ARGS += \ ++ EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ vis install ++ ++MAKE_BATGAT_ARGS += \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ PATH="$(TARGET_PATH)" \ ++ SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \ ++ LINUX_VERSION="$(LINUX_VERSION)" \ ++ REVISION="$(PKG_REV)" modules ++ ++ ++define Build/Configure ++endef ++ ++ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),) ++ BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS) ++endif ++ ++ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),) ++ BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS) ++endif ++ ++ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),) ++ BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS) ++endif ++ ++define Build/Compile ++ $(BUILD_BATMAND) ++ $(BUILD_VIS) ++ cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile ++ $(BUILD_BATGAT) ++endef ++ ++define Package/batmand/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/etc/init.d/batmand $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/etc/config/batmand $(1)/etc/config ++endef ++ ++define Package/batmand/conffiles ++/etc/config/batmand ++endef ++ ++define Package/vis/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config ++endef ++ ++define Package/vis/conffiles ++/etc/config/vis ++endef ++ ++$(eval $(call BuildPackage,batmand)) ++$(eval $(call BuildPackage,vis)) ++$(eval $(call KernelPackage,batgat)) +diff --git a/feeds/packages/net/batman/Makefile b/feeds/packages/net/batman/Makefile +new file mode 100644 +index 0000000..4026496 +--- /dev/null ++++ b/feeds/packages/net/batman/Makefile +@@ -0,0 +1,152 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=batmand ++PKG_REV:=1439 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=2 ++PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),$(PKG_NAME))-$(PKG_VERSION) ++PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/trunk/ ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/batmand/Default ++ URL:=http://www.open-mesh.org/ ++ MAINTAINER:=Marek Lindner ++endef ++ ++define Package/batmand ++$(call Package/batmand/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ DEPENDS:=+libpthread +kmod-tun ++ TITLE:=B.A.T.M.A.N. layer 3 routing daemon ++endef ++ ++define Package/batmand/description ++B.A.T.M.A.N. layer 3 routing daemon ++endef ++ ++define Package/vis ++$(call Package/batmand/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ DEPENDS:=+libpthread ++ TITLE:=visualization server for B.A.T.M.A.N. layer 3 ++endef ++ ++define Package/vis/description ++visualization server for B.A.T.M.A.N. layer 3 ++endef ++ ++define KernelPackage/batgat ++$(call Package/batmand/Default) ++ SUBMENU:=Network Support ++ DEPENDS:=+batmand @BROKEN ++ TITLE:=B.A.T.M.A.N. gateway module ++ FILES:=$(PKG_KMOD_BUILD_DIR)/batgat.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,50,batgat) ++endef ++ ++ ++define KernelPackage/batgat/description ++Kernel gateway module for B.A.T.M.A.N. for better tunnel performance ++endef ++ ++MAKE_BATMAND_ARGS += \ ++ EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ batmand install ++ ++MAKE_VIS_ARGS += \ ++ EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ vis install ++ ++MAKE_BATGAT_ARGS += \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ PATH="$(TARGET_PATH)" \ ++ SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \ ++ LINUX_VERSION="$(LINUX_VERSION)" \ ++ REVISION="$(PKG_REV)" modules ++ ++ ++define Build/Configure ++endef ++ ++ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),) ++ BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS) ++endif ++ ++ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),) ++ BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS) ++endif ++ ++ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),) ++ BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS) ++endif ++ ++define Build/Compile ++ $(BUILD_BATMAND) ++ $(BUILD_VIS) ++ cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile ++ $(BUILD_BATGAT) ++endef ++ ++define Package/batmand/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/etc/init.d/batmand $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/etc/config/batmand $(1)/etc/config ++endef ++ ++define Package/batmand/conffiles ++/etc/config/batmand ++endef ++ ++define Package/vis/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config ++endef ++ ++define Package/vis/conffiles ++/etc/config/vis ++endef ++ ++$(eval $(call BuildPackage,batmand)) ++$(eval $(call BuildPackage,vis)) ++$(eval $(call KernelPackage,batgat)) +diff --git a/feeds/packages/net/batman/files/.svn/entries b/feeds/packages/net/batman/files/.svn/entries +new file mode 100644 +index 0000000..fe27caf +--- /dev/null ++++ b/feeds/packages/net/batman/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-08T09:12:24.923339Z ++16376 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/batman/files/etc/.svn/entries b/feeds/packages/net/batman/files/etc/.svn/entries +new file mode 100644 +index 0000000..3672945 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-08T09:12:24.923339Z ++16376 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config ++dir ++ ++init.d ++dir ++ +diff --git a/feeds/packages/net/batman/files/etc/config/.svn/entries b/feeds/packages/net/batman/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..856e6eb +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/config/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-18T17:49:15.982911Z ++15917 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++vis ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++04ac6416ce4f8e2146e107ddebedba97 ++2009-04-21T19:16:40.671947Z ++15332 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++45 ++ ++batmand ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++9f2980c48eded8fab7f525ee9123ca11 ++2009-05-18T17:49:15.982911Z ++15917 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++276 ++ +diff --git a/feeds/packages/net/batman/files/etc/config/.svn/text-base/batmand.svn-base b/feeds/packages/net/batman/files/etc/config/.svn/text-base/batmand.svn-base +new file mode 100644 +index 0000000..6d1f3be +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/config/.svn/text-base/batmand.svn-base +@@ -0,0 +1,12 @@ ++config batmand general ++ option interface ath0 ++ option hna ++ option gateway_class ++ option originator_interval ++ option preferred_gateway ++ option routing_class ++ option visualisation_srv ++ option policy_routing_script ++ option disable_client_nat ++ option disable_aggregation ++ +diff --git a/feeds/packages/net/batman/files/etc/config/.svn/text-base/vis.svn-base b/feeds/packages/net/batman/files/etc/config/.svn/text-base/vis.svn-base +new file mode 100644 +index 0000000..6d30023 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/config/.svn/text-base/vis.svn-base +@@ -0,0 +1,3 @@ ++config vis general ++ option interface ath0 ++ +diff --git a/feeds/packages/net/batman/files/etc/config/batmand b/feeds/packages/net/batman/files/etc/config/batmand +new file mode 100644 +index 0000000..6d1f3be +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/config/batmand +@@ -0,0 +1,12 @@ ++config batmand general ++ option interface ath0 ++ option hna ++ option gateway_class ++ option originator_interval ++ option preferred_gateway ++ option routing_class ++ option visualisation_srv ++ option policy_routing_script ++ option disable_client_nat ++ option disable_aggregation ++ +diff --git a/feeds/packages/net/batman/files/etc/config/vis b/feeds/packages/net/batman/files/etc/config/vis +new file mode 100644 +index 0000000..6d30023 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/config/vis +@@ -0,0 +1,3 @@ ++config vis general ++ option interface ath0 ++ +diff --git a/feeds/packages/net/batman/files/etc/init.d/.svn/entries b/feeds/packages/net/batman/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..cf94ba7 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/init.d/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman/files/etc/init.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-08T09:12:24.923339Z ++16376 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++vis ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++1d433eb238cd73c55ea7c69da49afac1 ++2009-06-08T09:12:24.923339Z ++16376 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++294 ++ ++batmand ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++89474f98e4a1c6ac00a1b510db8c3e3f ++2009-06-08T09:12:24.923339Z ++16376 ++marek ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1738 ++ +diff --git a/feeds/packages/net/batman/files/etc/init.d/.svn/text-base/batmand.svn-base b/feeds/packages/net/batman/files/etc/init.d/.svn/text-base/batmand.svn-base +new file mode 100644 +index 0000000..403e9f3 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/init.d/.svn/text-base/batmand.svn-base +@@ -0,0 +1,66 @@ ++#!/bin/sh /etc/rc.common ++START=90 ++ ++start () { ++ interface=$(uci get batmand.general.interface) ++ if [ "$interface" = "" ]; then ++ echo $1 Error, you must specify at least a network interface ++ exit ++ fi ++ hnas=$(uci get batmand.general.hna) ++ gateway_class=$(uci get batmand.general.gateway_class) ++ originator_interval=$(uci get batmand.general.originator_interval) ++ preferred_gateway=$(uci get batmand.general.preferred_gateway) ++ routing_class=$(uci get batmand.general.routing_class) ++ visualisation_srv=$(uci get batmand.general.visualisation_srv) ++ policy_routing_script=$(uci get batmand.general.policy_routing_script) ++ disable_client_nat=$(uci get batmand.general.disable_client_nat) ++ disable_aggregation=$(uci get batmand.general.disable_aggregation) ++ batman_args="" ++ ++ for hna in $hnas ++ do ++ batman_args=${batman_args}'-a '$hna' ' ++ done ++ ++ if [ $gateway_class ]; then ++ batman_args=${batman_args}'-g '$gateway_class' ' ++ fi ++ ++ if [ $originator_interval ]; then ++ batman_args=${batman_args}'-o '$originator_interval' ' ++ fi ++ ++ if [ $preferred_gateway ]; then ++ batman_args=${batman_args}'-p '$preferred_gateway' ' ++ fi ++ ++ if [ $routing_class ]; then ++ batman_args=${batman_args}'-r '$routing_class' ' ++ fi ++ ++ if [ $visualisation_srv ]; then ++ batman_args=${batman_args}'-s '$visualisation_srv' ' ++ fi ++ ++ if [ $policy_routing_script ]; then ++ batman_args=${batman_args}'--policy-routing-script '$policy_routing_script' ' ++ fi ++ ++ if [ $disable_client_nat ]; then ++ batman_args=${batman_args}'--disable-client-nat ' ++ fi ++ ++ if [ $disable_aggregation ]; then ++ batman_args=${batman_args}'--disable-aggregation ' ++ fi ++ ++ batman_args=${batman_args}$interface ++ batmand $batman_args >/dev/null 2>&1 ++} ++ ++stop () { ++ killall batmand ++} ++ ++ +diff --git a/feeds/packages/net/batman/files/etc/init.d/.svn/text-base/vis.svn-base b/feeds/packages/net/batman/files/etc/init.d/.svn/text-base/vis.svn-base +new file mode 100644 +index 0000000..ef18eb7 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/init.d/.svn/text-base/vis.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++START=90 ++ ++start () { ++ interface=$(uci get vis.general.interface) ++ if [ "$interface" = "" ]; then ++ echo $1 Error, you must specify at least a network interface ++ exit ++ fi ++ vis_args=$interface ++ ++ vis $vis_args >/dev/null 2>&1 ++} ++ ++stop () { ++ killall vis ++} ++ ++ +diff --git a/feeds/packages/net/batman/files/etc/init.d/batmand b/feeds/packages/net/batman/files/etc/init.d/batmand +new file mode 100644 +index 0000000..403e9f3 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/init.d/batmand +@@ -0,0 +1,66 @@ ++#!/bin/sh /etc/rc.common ++START=90 ++ ++start () { ++ interface=$(uci get batmand.general.interface) ++ if [ "$interface" = "" ]; then ++ echo $1 Error, you must specify at least a network interface ++ exit ++ fi ++ hnas=$(uci get batmand.general.hna) ++ gateway_class=$(uci get batmand.general.gateway_class) ++ originator_interval=$(uci get batmand.general.originator_interval) ++ preferred_gateway=$(uci get batmand.general.preferred_gateway) ++ routing_class=$(uci get batmand.general.routing_class) ++ visualisation_srv=$(uci get batmand.general.visualisation_srv) ++ policy_routing_script=$(uci get batmand.general.policy_routing_script) ++ disable_client_nat=$(uci get batmand.general.disable_client_nat) ++ disable_aggregation=$(uci get batmand.general.disable_aggregation) ++ batman_args="" ++ ++ for hna in $hnas ++ do ++ batman_args=${batman_args}'-a '$hna' ' ++ done ++ ++ if [ $gateway_class ]; then ++ batman_args=${batman_args}'-g '$gateway_class' ' ++ fi ++ ++ if [ $originator_interval ]; then ++ batman_args=${batman_args}'-o '$originator_interval' ' ++ fi ++ ++ if [ $preferred_gateway ]; then ++ batman_args=${batman_args}'-p '$preferred_gateway' ' ++ fi ++ ++ if [ $routing_class ]; then ++ batman_args=${batman_args}'-r '$routing_class' ' ++ fi ++ ++ if [ $visualisation_srv ]; then ++ batman_args=${batman_args}'-s '$visualisation_srv' ' ++ fi ++ ++ if [ $policy_routing_script ]; then ++ batman_args=${batman_args}'--policy-routing-script '$policy_routing_script' ' ++ fi ++ ++ if [ $disable_client_nat ]; then ++ batman_args=${batman_args}'--disable-client-nat ' ++ fi ++ ++ if [ $disable_aggregation ]; then ++ batman_args=${batman_args}'--disable-aggregation ' ++ fi ++ ++ batman_args=${batman_args}$interface ++ batmand $batman_args >/dev/null 2>&1 ++} ++ ++stop () { ++ killall batmand ++} ++ ++ +diff --git a/feeds/packages/net/batman/files/etc/init.d/vis b/feeds/packages/net/batman/files/etc/init.d/vis +new file mode 100644 +index 0000000..ef18eb7 +--- /dev/null ++++ b/feeds/packages/net/batman/files/etc/init.d/vis +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++START=90 ++ ++start () { ++ interface=$(uci get vis.general.interface) ++ if [ "$interface" = "" ]; then ++ echo $1 Error, you must specify at least a network interface ++ exit ++ fi ++ vis_args=$interface ++ ++ vis $vis_args >/dev/null 2>&1 ++} ++ ++stop () { ++ killall vis ++} ++ ++ +diff --git a/feeds/packages/net/batman/patches/.svn/entries b/feeds/packages/net/batman/patches/.svn/entries +new file mode 100644 +index 0000000..eb5f2fb +--- /dev/null ++++ b/feeds/packages/net/batman/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/batman/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-07T22:06:23.302305Z ++23313 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-2.6.36.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++52b0c472ecc52b3ac44a603df0af5ea1 ++2010-10-07T22:06:23.302305Z ++23313 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1453 ++ +diff --git a/feeds/packages/net/batman/patches/.svn/text-base/100-2.6.36.patch.svn-base b/feeds/packages/net/batman/patches/.svn/text-base/100-2.6.36.patch.svn-base +new file mode 100644 +index 0000000..566c23b +--- /dev/null ++++ b/feeds/packages/net/batman/patches/.svn/text-base/100-2.6.36.patch.svn-base +@@ -0,0 +1,47 @@ ++--- ++ batman/linux/modules/gateway.c | 19 +++++++++++++++++++ ++ 1 file changed, 19 insertions(+) ++ ++--- batmand-r1439.orig/batman/linux/modules/gateway.c +++++ batmand-r1439/batman/linux/modules/gateway.c ++@@ -29,6 +29,7 @@ static struct class *batman_class; ++ static int batgat_open(struct inode *inode, struct file *filp); ++ static int batgat_release(struct inode *inode, struct file *file); ++ static int batgat_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg ); +++static long batgat_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg ); ++ ++ ++ static void udp_data_ready(struct sock *sk, int len); ++@@ -53,7 +54,11 @@ static int proc_clients_read(char *buf, ++ static struct file_operations fops = { ++ .open = batgat_open, ++ .release = batgat_release, +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++ .unlocked_ioctl = batgat_ioctl_unlocked, +++#else ++ .ioctl = batgat_ioctl, +++#endif ++ }; ++ ++ ++@@ -166,6 +171,20 @@ static int batgat_release(struct inode * ++ } ++ ++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++#include +++static long batgat_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg ) +++{ +++ int ret; +++ +++ lock_kernel(); +++ ret = batgat_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); +++ unlock_kernel(); +++ +++ return ret; +++} +++#endif +++ ++ static int batgat_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg ) ++ { ++ uint8_t tmp_ip[4]; +diff --git a/feeds/packages/net/batman/patches/100-2.6.36.patch b/feeds/packages/net/batman/patches/100-2.6.36.patch +new file mode 100644 +index 0000000..566c23b +--- /dev/null ++++ b/feeds/packages/net/batman/patches/100-2.6.36.patch +@@ -0,0 +1,47 @@ ++--- ++ batman/linux/modules/gateway.c | 19 +++++++++++++++++++ ++ 1 file changed, 19 insertions(+) ++ ++--- batmand-r1439.orig/batman/linux/modules/gateway.c +++++ batmand-r1439/batman/linux/modules/gateway.c ++@@ -29,6 +29,7 @@ static struct class *batman_class; ++ static int batgat_open(struct inode *inode, struct file *filp); ++ static int batgat_release(struct inode *inode, struct file *file); ++ static int batgat_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg ); +++static long batgat_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg ); ++ ++ ++ static void udp_data_ready(struct sock *sk, int len); ++@@ -53,7 +54,11 @@ static int proc_clients_read(char *buf, ++ static struct file_operations fops = { ++ .open = batgat_open, ++ .release = batgat_release, +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++ .unlocked_ioctl = batgat_ioctl_unlocked, +++#else ++ .ioctl = batgat_ioctl, +++#endif ++ }; ++ ++ ++@@ -166,6 +171,20 @@ static int batgat_release(struct inode * ++ } ++ ++ +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +++#include +++static long batgat_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg ) +++{ +++ int ret; +++ +++ lock_kernel(); +++ ret = batgat_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); +++ unlock_kernel(); +++ +++ return ret; +++} +++#endif +++ ++ static int batgat_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg ) ++ { ++ uint8_t tmp_ip[4]; +diff --git a/feeds/packages/net/bind/.svn/entries b/feeds/packages/net/bind/.svn/entries +new file mode 100644 +index 0000000..cc1c0e2 +--- /dev/null ++++ b/feeds/packages/net/bind/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bind ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-13T17:11:01.577132Z ++33396 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++e980732807df9c285714e50c276939ac ++2012-09-13T17:11:01.577132Z ++33396 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5192 ++ +diff --git a/feeds/packages/net/bind/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bind/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/bind/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bind/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..06929f5 +--- /dev/null ++++ b/feeds/packages/net/bind/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,198 @@ ++# ++# 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:=bind ++PKG_VERSION:=9.9.1-P3 ++PKG_RELEASE:=1 ++ ++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:=8f407c9a988d7b447a54b4cb54230dcb ++ ++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-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/feeds/packages/net/bind/Makefile b/feeds/packages/net/bind/Makefile +new file mode 100644 +index 0000000..06929f5 +--- /dev/null ++++ b/feeds/packages/net/bind/Makefile +@@ -0,0 +1,198 @@ ++# ++# 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:=bind ++PKG_VERSION:=9.9.1-P3 ++PKG_RELEASE:=1 ++ ++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:=8f407c9a988d7b447a54b4cb54230dcb ++ ++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-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/feeds/packages/net/bind/files/.svn/entries b/feeds/packages/net/bind/files/.svn/entries +new file mode 100644 +index 0000000..a030b6f +--- /dev/null ++++ b/feeds/packages/net/bind/files/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bind/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-07-15T22:42:48.517888Z ++22217 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++named.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++3379853d729dfaf6d4f1941bb7b78ece ++2010-07-15T22:42:48.517888Z ++22217 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++642 ++ ++bind ++dir ++ +diff --git a/feeds/packages/net/bind/files/.svn/prop-base/named.init.svn-base b/feeds/packages/net/bind/files/.svn/prop-base/named.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/.svn/prop-base/named.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/.svn/text-base/named.init.svn-base b/feeds/packages/net/bind/files/.svn/text-base/named.init.svn-base +new file mode 100644 +index 0000000..986e5fe +--- /dev/null ++++ b/feeds/packages/net/bind/files/.svn/text-base/named.init.svn-base +@@ -0,0 +1,40 @@ ++#!/bin/sh /etc/rc.common ++START=50 ++ ++config_file=/etc/bind/named.conf ++pid_file=/var/run/named/named.pid ++ ++start() { ++ if [ -e $pid_file ] ++ then ++ echo " named already running with PID `cat $pid_file`" ++ return 1 ++ fi ++ echo Starting isc-bind ++ ++ /usr/sbin/named -c $config_file ++ ++ if [ $? -ne 0 ] ++ then ++ echo " isc-bind failed to start" ++ fi ++} ++ ++stop() { ++ echo "Stopping isc-bind" ++ if [ -e $pid_file ] ++ then ++ kill `cat $pid_file` ++ ++ if [ $? -ne 0 ] ++ then ++ echo " PID " `cat $pid_file` not found ++ echo " Is the named server running?" ++ fi ++ ++ rm -f $pid_file ++ ++ else ++ echo " $pid_file not found" ++ fi ++} +diff --git a/feeds/packages/net/bind/files/bind/.svn/entries b/feeds/packages/net/bind/files/bind/.svn/entries +new file mode 100644 +index 0000000..0ff3c1c +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bind/files/bind ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-03T10:49:11.063581Z ++17835 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++db.255 ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8aba258068c8c60a7ade3952a285f57d ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++237 ++ ++named.conf.example ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++27d9616b5224e779a41c51d647b85104 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++905 ++ ++db.0 ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8aba258068c8c60a7ade3952a285f57d ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++237 ++ ++db.root ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++795d8b052c269c16fa4d0bda49a83cbc ++2009-10-03T10:49:11.063581Z ++17835 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1506 ++ ++db.127 ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++64f5cf50e8d8192109dad43b779e5e36 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++271 ++ ++db.local ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++4d038e5af0aa465bdfce60a0d2a7c816 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++256 ++ +diff --git a/feeds/packages/net/bind/files/bind/.svn/prop-base/db.0.svn-base b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.0.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.0.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/bind/.svn/prop-base/db.127.svn-base b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.127.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.127.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/bind/.svn/prop-base/db.255.svn-base b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.255.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.255.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/bind/.svn/prop-base/db.local.svn-base b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.local.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.local.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/bind/.svn/prop-base/db.root.svn-base b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.root.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/prop-base/db.root.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/bind/.svn/prop-base/named.conf.example.svn-base b/feeds/packages/net/bind/files/bind/.svn/prop-base/named.conf.example.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/prop-base/named.conf.example.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bind/files/bind/.svn/text-base/db.0.svn-base b/feeds/packages/net/bind/files/bind/.svn/text-base/db.0.svn-base +new file mode 100644 +index 0000000..e3aabdb +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/text-base/db.0.svn-base +@@ -0,0 +1,12 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/.svn/text-base/db.127.svn-base b/feeds/packages/net/bind/files/bind/.svn/text-base/db.127.svn-base +new file mode 100644 +index 0000000..cd05bef +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/text-base/db.127.svn-base +@@ -0,0 +1,13 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/.svn/text-base/db.255.svn-base b/feeds/packages/net/bind/files/bind/.svn/text-base/db.255.svn-base +new file mode 100644 +index 0000000..e3aabdb +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/text-base/db.255.svn-base +@@ -0,0 +1,12 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/.svn/text-base/db.local.svn-base b/feeds/packages/net/bind/files/bind/.svn/text-base/db.local.svn-base +new file mode 100644 +index 0000000..66b4892 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/text-base/db.local.svn-base +@@ -0,0 +1,13 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/.svn/text-base/db.root.svn-base b/feeds/packages/net/bind/files/bind/.svn/text-base/db.root.svn-base +new file mode 100644 +index 0000000..0eb52af +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/text-base/db.root.svn-base +@@ -0,0 +1,45 @@ ++ ++; <<>> 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/feeds/packages/net/bind/files/bind/.svn/text-base/named.conf.example.svn-base b/feeds/packages/net/bind/files/bind/.svn/text-base/named.conf.example.svn-base +new file mode 100644 +index 0000000..1624549 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/.svn/text-base/named.conf.example.svn-base +@@ -0,0 +1,45 @@ ++// 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/feeds/packages/net/bind/files/bind/db.0 b/feeds/packages/net/bind/files/bind/db.0 +new file mode 100644 +index 0000000..e3aabdb +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/db.0 +@@ -0,0 +1,12 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/db.127 b/feeds/packages/net/bind/files/bind/db.127 +new file mode 100644 +index 0000000..cd05bef +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/db.127 +@@ -0,0 +1,13 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/db.255 b/feeds/packages/net/bind/files/bind/db.255 +new file mode 100644 +index 0000000..e3aabdb +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/db.255 +@@ -0,0 +1,12 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/db.local b/feeds/packages/net/bind/files/bind/db.local +new file mode 100644 +index 0000000..66b4892 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/db.local +@@ -0,0 +1,13 @@ ++; ++; 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/feeds/packages/net/bind/files/bind/db.root b/feeds/packages/net/bind/files/bind/db.root +new file mode 100644 +index 0000000..0eb52af +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/db.root +@@ -0,0 +1,45 @@ ++ ++; <<>> 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/feeds/packages/net/bind/files/bind/named.conf.example b/feeds/packages/net/bind/files/bind/named.conf.example +new file mode 100644 +index 0000000..1624549 +--- /dev/null ++++ b/feeds/packages/net/bind/files/bind/named.conf.example +@@ -0,0 +1,45 @@ ++// 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/feeds/packages/net/bind/files/named.init b/feeds/packages/net/bind/files/named.init +new file mode 100644 +index 0000000..986e5fe +--- /dev/null ++++ b/feeds/packages/net/bind/files/named.init +@@ -0,0 +1,40 @@ ++#!/bin/sh /etc/rc.common ++START=50 ++ ++config_file=/etc/bind/named.conf ++pid_file=/var/run/named/named.pid ++ ++start() { ++ if [ -e $pid_file ] ++ then ++ echo " named already running with PID `cat $pid_file`" ++ return 1 ++ fi ++ echo Starting isc-bind ++ ++ /usr/sbin/named -c $config_file ++ ++ if [ $? -ne 0 ] ++ then ++ echo " isc-bind failed to start" ++ fi ++} ++ ++stop() { ++ echo "Stopping isc-bind" ++ if [ -e $pid_file ] ++ then ++ kill `cat $pid_file` ++ ++ if [ $? -ne 0 ] ++ then ++ echo " PID " `cat $pid_file` not found ++ echo " Is the named server running?" ++ fi ++ ++ rm -f $pid_file ++ ++ else ++ echo " $pid_file not found" ++ fi ++} +diff --git a/feeds/packages/net/bind/patches/.svn/entries b/feeds/packages/net/bind/patches/.svn/entries +new file mode 100644 +index 0000000..6d63532 +--- /dev/null ++++ b/feeds/packages/net/bind/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bind/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-02T05:22:12.485077Z ++30771 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no-tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++68b78022f496747f14b843ae193a268e ++2012-03-02T05:22:12.485077Z ++30771 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++567 ++ +diff --git a/feeds/packages/net/bind/patches/.svn/text-base/001-no-tests.patch.svn-base b/feeds/packages/net/bind/patches/.svn/text-base/001-no-tests.patch.svn-base +new file mode 100644 +index 0000000..c4dc533 +--- /dev/null ++++ b/feeds/packages/net/bind/patches/.svn/text-base/001-no-tests.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/bin/Makefile.in +++++ b/bin/Makefile.in ++@@ -19,7 +19,7 @@ srcdir = @srcdir@ ++ VPATH = @srcdir@ ++ top_srcdir = @top_srcdir@ ++ ++-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +++SUBDIRS = named rndc dig dnssec tools nsupdate \ ++ check confgen @PKCS11_TOOLS@ ++ TARGETS = ++ ++--- a/lib/Makefile.in +++++ b/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/feeds/packages/net/bind/patches/001-no-tests.patch b/feeds/packages/net/bind/patches/001-no-tests.patch +new file mode 100644 +index 0000000..c4dc533 +--- /dev/null ++++ b/feeds/packages/net/bind/patches/001-no-tests.patch +@@ -0,0 +1,22 @@ ++--- a/bin/Makefile.in +++++ b/bin/Makefile.in ++@@ -19,7 +19,7 @@ srcdir = @srcdir@ ++ VPATH = @srcdir@ ++ top_srcdir = @top_srcdir@ ++ ++-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +++SUBDIRS = named rndc dig dnssec tools nsupdate \ ++ check confgen @PKCS11_TOOLS@ ++ TARGETS = ++ ++--- a/lib/Makefile.in +++++ b/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/feeds/packages/net/bing/.svn/entries b/feeds/packages/net/bing/.svn/entries +new file mode 100644 +index 0000000..44e323d +--- /dev/null ++++ b/feeds/packages/net/bing/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bing ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++6430e1517921fb022ca7872bb4b1f62f ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++897 ++ +diff --git a/feeds/packages/net/bing/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bing/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/bing/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bing/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bing/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c271e8f +--- /dev/null ++++ b/feeds/packages/net/bing/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=bing ++PKG_VERSION:=1.3.5 ++PKG_RELEASE:=0 ++ ++PKG_SOURCE:=$(PKG_NAME)_src-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fgouget.free.fr/bing/ ++PKG_MD5SUM:=60aaee55277672d0cc163bf3f0b3d53f ++TAR_OPTIONS += || true ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bing ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=bing bandwidth measuring utility ++ URL:=http://fgouget.free.fr/bing/ ++endef ++ ++define Package/bing/description ++ bing evaluates the raw bandwidth of a link (PSTN, xDSL, Cable ...) ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,bing) ++endef ++ ++define Package/bing/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bing $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,bing)) +diff --git a/feeds/packages/net/bing/Makefile b/feeds/packages/net/bing/Makefile +new file mode 100644 +index 0000000..c271e8f +--- /dev/null ++++ b/feeds/packages/net/bing/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=bing ++PKG_VERSION:=1.3.5 ++PKG_RELEASE:=0 ++ ++PKG_SOURCE:=$(PKG_NAME)_src-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fgouget.free.fr/bing/ ++PKG_MD5SUM:=60aaee55277672d0cc163bf3f0b3d53f ++TAR_OPTIONS += || true ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bing ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=bing bandwidth measuring utility ++ URL:=http://fgouget.free.fr/bing/ ++endef ++ ++define Package/bing/description ++ bing evaluates the raw bandwidth of a link (PSTN, xDSL, Cable ...) ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,bing) ++endef ++ ++define Package/bing/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bing $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,bing)) +diff --git a/feeds/packages/net/bird/.svn/entries b/feeds/packages/net/bird/.svn/entries +new file mode 100644 +index 0000000..a8c02de +--- /dev/null ++++ b/feeds/packages/net/bird/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bird ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-19T15:35:00.861491Z ++33481 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++57ab5c3eec1a57236b3e7d79006e8a1e ++2012-09-19T15:35:00.861491Z ++33481 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4175 ++ +diff --git a/feeds/packages/net/bird/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bird/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9658b62 +--- /dev/null ++++ b/feeds/packages/net/bird/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,160 @@ ++# ++# 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:=bird ++PKG_VERSION:=1.3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird ++PKG_MD5SUM:=c400b008ef834d9e7288dcdbe41b7c15 ++PKG_BUILD_DEPENDS:=libncurses libreadline ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bird/Default ++ TITLE:=The BIRD Internet Routing Daemon ++ URL:=http://bird.network.cz/ ++ DEPENDS:= ++endef ++ ++define Package/birdc/Default ++ TITLE:=The BIRD command-line client ++ URL:=http://bird.network.cz/ ++ DEPENDS:= +libreadline +libncurses ++endef ++ ++define Package/bird/Default/description1 ++BIRD is an internet routing daemon which manages TCP/IP routing tables ++with support of modern routing protocols, easy to use configuration ++interface and powerful route filtering language. It is lightweight and ++efficient and therefore appropriate for small embedded routers. ++ ++endef ++ ++define Package/bird/Default/description2 ++In BGP, BIRD supports communities, multiprotocol extensions, MD5 ++authentication, 32bit AS numbers and could act as a route server or a ++route reflector. BIRD also supports multiple RIBs, multiple kernel ++routing tables and redistribution between the protocols with a powerful ++configuration syntax. ++ ++endef ++ ++define Package/bird/Default/description3 ++This is a BIRD command-line client. It is used to send commands to BIRD, ++commands can perform simple actions such as enabling/disabling of ++protocols, telling BIRD to show various information, telling it to show ++a routing table filtered by a filter, or asking BIRD to reconfigure. ++ ++Unless you can't afford dependency on ncurses and readline, you ++should install BIRD command-line client together with BIRD. ++ ++endef ++ ++define Package/bird4 ++$(call Package/bird/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE+= (IPv4) ++endef ++ ++define Package/birdc4 ++$(call Package/birdc/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE+= (IPv4) ++ DEPENDS+= +bird4 ++endef ++ ++define Package/bird6 ++$(call Package/bird/Default) ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE+= (IPv6) ++endef ++ ++define Package/birdc6 ++$(call Package/birdc/Default) ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE+= (IPv6) ++ DEPENDS+= +bird6 ++endef ++ ++define Package/bird4/description ++$(call Package/bird/Default/description1) ++This is IPv4 version of BIRD, it supports OSPFv2, RIPv2 and BGP ++protocols. ++ ++$(call Package/bird/Default/description2) ++endef ++ ++define Package/birdc4/description ++$(call Package/bird/Default/description1) ++$(call Package/bird/Default/description3) ++endef ++ ++define Package/bird6/description ++$(call Package/bird/Default/description1) ++This is IPv6 version of BIRD, it supports OSPFv3, RIPng and BGP ++protocols. ++ ++$(call Package/bird/Default/description2) ++endef ++ ++define Package/birdc6/description ++$(call Package/bird/Default/description1) ++$(call Package/bird/Default/description3) ++endef ++ ++CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)" ++ ++define Build/Template ++ ++$(STAMP_BUILT)-$(2): $(STAMP_PREPARED) ++ $(call Build/Configure/Default,$(3)) ++ $(call Build/Compile/Default,) ++ ( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2) ) ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(2) ++ ++define Package/bird$(2)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/bird$(2)loop $$(1)/usr/sbin/ ++ $(INSTALL_DIR) $$(1)/etc ++ $(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/ ++ $(INSTALL_DIR) $$(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bird$(2).init $$(1)/etc/init.d/bird$(2) ++ ++endef ++ ++define Package/bird$(2)/conffiles ++/etc/bird$(2).conf ++endef ++ ++define Package/birdc$(2)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/ ++endef ++ ++endef ++ ++ ++$(eval $(call Build/Template,bird4,4, --disable-ipv6)) ++$(eval $(call Build/Template,bird6,6, --enable-ipv6)) ++ ++$(eval $(call BuildPackage,bird4)) ++$(eval $(call BuildPackage,birdc4)) ++$(eval $(call BuildPackage,bird6)) ++$(eval $(call BuildPackage,birdc6)) +diff --git a/feeds/packages/net/bird/Makefile b/feeds/packages/net/bird/Makefile +new file mode 100644 +index 0000000..9658b62 +--- /dev/null ++++ b/feeds/packages/net/bird/Makefile +@@ -0,0 +1,160 @@ ++# ++# 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:=bird ++PKG_VERSION:=1.3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird ++PKG_MD5SUM:=c400b008ef834d9e7288dcdbe41b7c15 ++PKG_BUILD_DEPENDS:=libncurses libreadline ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bird/Default ++ TITLE:=The BIRD Internet Routing Daemon ++ URL:=http://bird.network.cz/ ++ DEPENDS:= ++endef ++ ++define Package/birdc/Default ++ TITLE:=The BIRD command-line client ++ URL:=http://bird.network.cz/ ++ DEPENDS:= +libreadline +libncurses ++endef ++ ++define Package/bird/Default/description1 ++BIRD is an internet routing daemon which manages TCP/IP routing tables ++with support of modern routing protocols, easy to use configuration ++interface and powerful route filtering language. It is lightweight and ++efficient and therefore appropriate for small embedded routers. ++ ++endef ++ ++define Package/bird/Default/description2 ++In BGP, BIRD supports communities, multiprotocol extensions, MD5 ++authentication, 32bit AS numbers and could act as a route server or a ++route reflector. BIRD also supports multiple RIBs, multiple kernel ++routing tables and redistribution between the protocols with a powerful ++configuration syntax. ++ ++endef ++ ++define Package/bird/Default/description3 ++This is a BIRD command-line client. It is used to send commands to BIRD, ++commands can perform simple actions such as enabling/disabling of ++protocols, telling BIRD to show various information, telling it to show ++a routing table filtered by a filter, or asking BIRD to reconfigure. ++ ++Unless you can't afford dependency on ncurses and readline, you ++should install BIRD command-line client together with BIRD. ++ ++endef ++ ++define Package/bird4 ++$(call Package/bird/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE+= (IPv4) ++endef ++ ++define Package/birdc4 ++$(call Package/birdc/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE+= (IPv4) ++ DEPENDS+= +bird4 ++endef ++ ++define Package/bird6 ++$(call Package/bird/Default) ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE+= (IPv6) ++endef ++ ++define Package/birdc6 ++$(call Package/birdc/Default) ++ SECTION:=ipv6 ++ CATEGORY:=IPv6 ++ TITLE+= (IPv6) ++ DEPENDS+= +bird6 ++endef ++ ++define Package/bird4/description ++$(call Package/bird/Default/description1) ++This is IPv4 version of BIRD, it supports OSPFv2, RIPv2 and BGP ++protocols. ++ ++$(call Package/bird/Default/description2) ++endef ++ ++define Package/birdc4/description ++$(call Package/bird/Default/description1) ++$(call Package/bird/Default/description3) ++endef ++ ++define Package/bird6/description ++$(call Package/bird/Default/description1) ++This is IPv6 version of BIRD, it supports OSPFv3, RIPng and BGP ++protocols. ++ ++$(call Package/bird/Default/description2) ++endef ++ ++define Package/birdc6/description ++$(call Package/bird/Default/description1) ++$(call Package/bird/Default/description3) ++endef ++ ++CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)" ++ ++define Build/Template ++ ++$(STAMP_BUILT)-$(2): $(STAMP_PREPARED) ++ $(call Build/Configure/Default,$(3)) ++ $(call Build/Compile/Default,) ++ ( cd $(PKG_BUILD_DIR); mv -f bird bird$(2); mv -f birdc birdc$(2) ) ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(2) ++ ++define Package/bird$(2)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/bird$(2)loop $$(1)/usr/sbin/ ++ $(INSTALL_DIR) $$(1)/etc ++ $(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/ ++ $(INSTALL_DIR) $$(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bird$(2).init $$(1)/etc/init.d/bird$(2) ++ ++endef ++ ++define Package/bird$(2)/conffiles ++/etc/bird$(2).conf ++endef ++ ++define Package/birdc$(2)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/ ++endef ++ ++endef ++ ++ ++$(eval $(call Build/Template,bird4,4, --disable-ipv6)) ++$(eval $(call Build/Template,bird6,6, --enable-ipv6)) ++ ++$(eval $(call BuildPackage,bird4)) ++$(eval $(call BuildPackage,birdc4)) ++$(eval $(call BuildPackage,bird6)) ++$(eval $(call BuildPackage,birdc6)) +diff --git a/feeds/packages/net/bird/files/.svn/entries b/feeds/packages/net/bird/files/.svn/entries +new file mode 100644 +index 0000000..a5016f7 +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bird/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-20T14:30:21.553490Z ++31043 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bird6loop ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++9f8d2173962b048b236409da5906dab9 ++2012-03-20T14:30:21.553490Z ++31043 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++343 ++ ++bird4.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++0201d3653c631af773594ec801a075c6 ++2011-11-13T22:16:25.336439Z ++29079 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++370 ++ ++bird4.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++b4f40b1627aaf55d9cdec0798988f54c ++2010-04-10T18:33:04.266340Z ++20780 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3323 ++ ++bird6.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++b80ebdd2ddc256964b8dc85114b5d918 ++2011-11-13T22:16:25.336439Z ++29079 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++370 ++ ++bird6.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++b4f40b1627aaf55d9cdec0798988f54c ++2010-04-10T18:33:04.266340Z ++20780 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3323 ++ ++bird4loop ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++529690fba0570cc94bf27f2dd51c4e4f ++2012-03-20T14:30:21.553490Z ++31043 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++343 ++ +diff --git a/feeds/packages/net/bird/files/.svn/text-base/bird4.conf.svn-base b/feeds/packages/net/bird/files/.svn/text-base/bird4.conf.svn-base +new file mode 100644 +index 0000000..8616a0a +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/text-base/bird4.conf.svn-base +@@ -0,0 +1,121 @@ ++ ++# THIS CONFIG FILE IS NOT A COMPLETE DOCUMENTATION ++# PLEASE LOOK IN THE BIRD DOCUMENTATION FOR MORE INFO ++ ++# However, most of options used here are just for example ++# and will be removed in real-life configs. ++ ++log syslog all; ++ ++# Override router ID ++#router id 192.168.0.1; ++ ++# Turn on global debugging of all protocols ++#debug protocols all; ++ ++ ++# Define a route filter... ++# filter test_filter { ++# if net ~ 10.0.0.0/16 then accept; ++# else reject; ++# } ++ ++# The direct protocol automatically generates device routes to all network ++# interfaces. Can exist in as many instances as you wish if you want to ++# populate multiple routing tables with device routes. Because device routes ++# are handled by Linux kernel, this protocol is usually not needed. ++# protocol direct { ++# interface "*"; # Restrict network interfaces it works with ++# } ++ ++# This pseudo-protocol performs synchronization between BIRD's routing ++# tables and the kernel. You can run multiple instances of the kernel ++# protocol and synchronize different kernel tables with different BIRD tables. ++protocol kernel { ++# learn; # Learn all alien routes from the kernel ++# persist; # Don't remove routes on bird shutdown ++ scan time 20; # Scan kernel routing table every 20 seconds ++# import none; # Default is import all ++# export all; # Default is export none ++} ++ ++# This pseudo-protocol watches all interface up/down events. ++protocol device { ++ scan time 10; # Scan interfaces every 10 seconds ++} ++ ++# Static routes (again, there can be multiple instances, so that you ++# can disable/enable various groups of static routes on the fly). ++protocol static { ++# export all; # Default is export none ++# route 0.0.0.0/0 via 62.168.0.13; ++# route 10.0.0.0/8 reject; ++# route 192.168.0.0/16 reject; ++} ++ ++ ++#protocol rip { ++# disabled; ++# import all; ++# export all; ++# export filter test_filter; ++ ++# port 1520; ++# period 7; ++# infinity 16; ++# garbage time 60; ++# interface "*" { mode broadcast; }; ++# honor neighbor; ++# honor always; ++# honor never; ++# authentication none; ++#} ++ ++ ++#protocol ospf { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# area 0 { ++# interface "eth*" { ++# cost 10; ++# hello 3; ++# retransmit 2; ++# wait 5; ++# dead 20; ++# type broadcast; ++# authentication simple; ++# password "pass"; ++# }; ++# }; ++#} ++ ++ ++#protocol bgp { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# local as 65000; ++# neighbor 192.168.1.1 as 65001; ++# multihop 20 via 192.168.2.1; ++ ++# hold time 240; ++# startup hold time 240; ++# connect retry time 120; ++# keepalive time 80; # defaults to hold time / 3 ++# start delay time 5; # How long do we wait before initial connect ++# error wait time 60, 300;# Minimum and maximum time we wait after an error (when consecutive ++# # errors occur, we increase the delay exponentially ... ++# error forget time 300; # ... until this timeout expires) ++# disable after error; # Disable the protocol automatically when an error occurs ++# next hop self; # Disable next hop processing and always advertise our local address as nexthop ++# source address 62.168.0.14; # What local address we use for the TCP connection ++# password "secret" # Password used for MD5 authentication ++# rr client; # I am a route reflector and the neighor is my client ++# rr cluster id 1.0.0.1 # Use this value for cluster id instead of my router id ++# }; ++#} +diff --git a/feeds/packages/net/bird/files/.svn/text-base/bird4.init.svn-base b/feeds/packages/net/bird/files/.svn/text-base/bird4.init.svn-base +new file mode 100644 +index 0000000..8ac5e75 +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/text-base/bird4.init.svn-base +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++start() { ++ service_start /usr/sbin/bird4 -d ++# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop ) ++} ++ ++stop() { ++# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop ) ++ service_stop /usr/sbin/bird4 ++} ++ ++reload() { ++ service_reload /usr/sbin/bird4 ++} +diff --git a/feeds/packages/net/bird/files/.svn/text-base/bird4loop.svn-base b/feeds/packages/net/bird/files/.svn/text-base/bird4loop.svn-base +new file mode 100644 +index 0000000..074a9a2 +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/text-base/bird4loop.svn-base +@@ -0,0 +1,24 @@ ++#!/bin/sh ++ ++BIRD=/usr/sbin/bird4 ++ ++$BIRD -p || return 1 ++ ++. /lib/functions.sh ++. /lib/functions/service.sh ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++sig_handler() { ++ running=0 ++ service_stop $BIRD ++} ++ ++running=1 ++trap sig_handler INT ++trap sig_handler TERM ++while [ $running -gt 0 ]; do ++ service_check $BIRD || service_start $BIRD -d "$@" ++ sleep 3 ++done +diff --git a/feeds/packages/net/bird/files/.svn/text-base/bird6.conf.svn-base b/feeds/packages/net/bird/files/.svn/text-base/bird6.conf.svn-base +new file mode 100644 +index 0000000..8616a0a +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/text-base/bird6.conf.svn-base +@@ -0,0 +1,121 @@ ++ ++# THIS CONFIG FILE IS NOT A COMPLETE DOCUMENTATION ++# PLEASE LOOK IN THE BIRD DOCUMENTATION FOR MORE INFO ++ ++# However, most of options used here are just for example ++# and will be removed in real-life configs. ++ ++log syslog all; ++ ++# Override router ID ++#router id 192.168.0.1; ++ ++# Turn on global debugging of all protocols ++#debug protocols all; ++ ++ ++# Define a route filter... ++# filter test_filter { ++# if net ~ 10.0.0.0/16 then accept; ++# else reject; ++# } ++ ++# The direct protocol automatically generates device routes to all network ++# interfaces. Can exist in as many instances as you wish if you want to ++# populate multiple routing tables with device routes. Because device routes ++# are handled by Linux kernel, this protocol is usually not needed. ++# protocol direct { ++# interface "*"; # Restrict network interfaces it works with ++# } ++ ++# This pseudo-protocol performs synchronization between BIRD's routing ++# tables and the kernel. You can run multiple instances of the kernel ++# protocol and synchronize different kernel tables with different BIRD tables. ++protocol kernel { ++# learn; # Learn all alien routes from the kernel ++# persist; # Don't remove routes on bird shutdown ++ scan time 20; # Scan kernel routing table every 20 seconds ++# import none; # Default is import all ++# export all; # Default is export none ++} ++ ++# This pseudo-protocol watches all interface up/down events. ++protocol device { ++ scan time 10; # Scan interfaces every 10 seconds ++} ++ ++# Static routes (again, there can be multiple instances, so that you ++# can disable/enable various groups of static routes on the fly). ++protocol static { ++# export all; # Default is export none ++# route 0.0.0.0/0 via 62.168.0.13; ++# route 10.0.0.0/8 reject; ++# route 192.168.0.0/16 reject; ++} ++ ++ ++#protocol rip { ++# disabled; ++# import all; ++# export all; ++# export filter test_filter; ++ ++# port 1520; ++# period 7; ++# infinity 16; ++# garbage time 60; ++# interface "*" { mode broadcast; }; ++# honor neighbor; ++# honor always; ++# honor never; ++# authentication none; ++#} ++ ++ ++#protocol ospf { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# area 0 { ++# interface "eth*" { ++# cost 10; ++# hello 3; ++# retransmit 2; ++# wait 5; ++# dead 20; ++# type broadcast; ++# authentication simple; ++# password "pass"; ++# }; ++# }; ++#} ++ ++ ++#protocol bgp { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# local as 65000; ++# neighbor 192.168.1.1 as 65001; ++# multihop 20 via 192.168.2.1; ++ ++# hold time 240; ++# startup hold time 240; ++# connect retry time 120; ++# keepalive time 80; # defaults to hold time / 3 ++# start delay time 5; # How long do we wait before initial connect ++# error wait time 60, 300;# Minimum and maximum time we wait after an error (when consecutive ++# # errors occur, we increase the delay exponentially ... ++# error forget time 300; # ... until this timeout expires) ++# disable after error; # Disable the protocol automatically when an error occurs ++# next hop self; # Disable next hop processing and always advertise our local address as nexthop ++# source address 62.168.0.14; # What local address we use for the TCP connection ++# password "secret" # Password used for MD5 authentication ++# rr client; # I am a route reflector and the neighor is my client ++# rr cluster id 1.0.0.1 # Use this value for cluster id instead of my router id ++# }; ++#} +diff --git a/feeds/packages/net/bird/files/.svn/text-base/bird6.init.svn-base b/feeds/packages/net/bird/files/.svn/text-base/bird6.init.svn-base +new file mode 100644 +index 0000000..2efb4f0 +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/text-base/bird6.init.svn-base +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++start() { ++ service_start /usr/sbin/bird6 -d ++# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop ) ++} ++ ++stop() { ++# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop ) ++ service_stop /usr/sbin/bird6 ++} ++ ++reload() { ++ service_reload /usr/sbin/bird6 ++} +diff --git a/feeds/packages/net/bird/files/.svn/text-base/bird6loop.svn-base b/feeds/packages/net/bird/files/.svn/text-base/bird6loop.svn-base +new file mode 100644 +index 0000000..c01cf2e +--- /dev/null ++++ b/feeds/packages/net/bird/files/.svn/text-base/bird6loop.svn-base +@@ -0,0 +1,24 @@ ++#!/bin/sh ++ ++BIRD=/usr/sbin/bird6 ++ ++$BIRD -p || return 1 ++ ++. /lib/functions.sh ++. /lib/functions/service.sh ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++sig_handler() { ++ running=0 ++ service_stop $BIRD ++} ++ ++running=1 ++trap sig_handler INT ++trap sig_handler TERM ++while [ $running -gt 0 ]; do ++ service_check $BIRD || service_start $BIRD -d "$@" ++ sleep 3 ++done +diff --git a/feeds/packages/net/bird/files/bird4.conf b/feeds/packages/net/bird/files/bird4.conf +new file mode 100644 +index 0000000..8616a0a +--- /dev/null ++++ b/feeds/packages/net/bird/files/bird4.conf +@@ -0,0 +1,121 @@ ++ ++# THIS CONFIG FILE IS NOT A COMPLETE DOCUMENTATION ++# PLEASE LOOK IN THE BIRD DOCUMENTATION FOR MORE INFO ++ ++# However, most of options used here are just for example ++# and will be removed in real-life configs. ++ ++log syslog all; ++ ++# Override router ID ++#router id 192.168.0.1; ++ ++# Turn on global debugging of all protocols ++#debug protocols all; ++ ++ ++# Define a route filter... ++# filter test_filter { ++# if net ~ 10.0.0.0/16 then accept; ++# else reject; ++# } ++ ++# The direct protocol automatically generates device routes to all network ++# interfaces. Can exist in as many instances as you wish if you want to ++# populate multiple routing tables with device routes. Because device routes ++# are handled by Linux kernel, this protocol is usually not needed. ++# protocol direct { ++# interface "*"; # Restrict network interfaces it works with ++# } ++ ++# This pseudo-protocol performs synchronization between BIRD's routing ++# tables and the kernel. You can run multiple instances of the kernel ++# protocol and synchronize different kernel tables with different BIRD tables. ++protocol kernel { ++# learn; # Learn all alien routes from the kernel ++# persist; # Don't remove routes on bird shutdown ++ scan time 20; # Scan kernel routing table every 20 seconds ++# import none; # Default is import all ++# export all; # Default is export none ++} ++ ++# This pseudo-protocol watches all interface up/down events. ++protocol device { ++ scan time 10; # Scan interfaces every 10 seconds ++} ++ ++# Static routes (again, there can be multiple instances, so that you ++# can disable/enable various groups of static routes on the fly). ++protocol static { ++# export all; # Default is export none ++# route 0.0.0.0/0 via 62.168.0.13; ++# route 10.0.0.0/8 reject; ++# route 192.168.0.0/16 reject; ++} ++ ++ ++#protocol rip { ++# disabled; ++# import all; ++# export all; ++# export filter test_filter; ++ ++# port 1520; ++# period 7; ++# infinity 16; ++# garbage time 60; ++# interface "*" { mode broadcast; }; ++# honor neighbor; ++# honor always; ++# honor never; ++# authentication none; ++#} ++ ++ ++#protocol ospf { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# area 0 { ++# interface "eth*" { ++# cost 10; ++# hello 3; ++# retransmit 2; ++# wait 5; ++# dead 20; ++# type broadcast; ++# authentication simple; ++# password "pass"; ++# }; ++# }; ++#} ++ ++ ++#protocol bgp { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# local as 65000; ++# neighbor 192.168.1.1 as 65001; ++# multihop 20 via 192.168.2.1; ++ ++# hold time 240; ++# startup hold time 240; ++# connect retry time 120; ++# keepalive time 80; # defaults to hold time / 3 ++# start delay time 5; # How long do we wait before initial connect ++# error wait time 60, 300;# Minimum and maximum time we wait after an error (when consecutive ++# # errors occur, we increase the delay exponentially ... ++# error forget time 300; # ... until this timeout expires) ++# disable after error; # Disable the protocol automatically when an error occurs ++# next hop self; # Disable next hop processing and always advertise our local address as nexthop ++# source address 62.168.0.14; # What local address we use for the TCP connection ++# password "secret" # Password used for MD5 authentication ++# rr client; # I am a route reflector and the neighor is my client ++# rr cluster id 1.0.0.1 # Use this value for cluster id instead of my router id ++# }; ++#} +diff --git a/feeds/packages/net/bird/files/bird4.init b/feeds/packages/net/bird/files/bird4.init +new file mode 100644 +index 0000000..8ac5e75 +--- /dev/null ++++ b/feeds/packages/net/bird/files/bird4.init +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++start() { ++ service_start /usr/sbin/bird4 -d ++# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop ) ++} ++ ++stop() { ++# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop ) ++ service_stop /usr/sbin/bird4 ++} ++ ++reload() { ++ service_reload /usr/sbin/bird4 ++} +diff --git a/feeds/packages/net/bird/files/bird4loop b/feeds/packages/net/bird/files/bird4loop +new file mode 100644 +index 0000000..074a9a2 +--- /dev/null ++++ b/feeds/packages/net/bird/files/bird4loop +@@ -0,0 +1,24 @@ ++#!/bin/sh ++ ++BIRD=/usr/sbin/bird4 ++ ++$BIRD -p || return 1 ++ ++. /lib/functions.sh ++. /lib/functions/service.sh ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++sig_handler() { ++ running=0 ++ service_stop $BIRD ++} ++ ++running=1 ++trap sig_handler INT ++trap sig_handler TERM ++while [ $running -gt 0 ]; do ++ service_check $BIRD || service_start $BIRD -d "$@" ++ sleep 3 ++done +diff --git a/feeds/packages/net/bird/files/bird6.conf b/feeds/packages/net/bird/files/bird6.conf +new file mode 100644 +index 0000000..8616a0a +--- /dev/null ++++ b/feeds/packages/net/bird/files/bird6.conf +@@ -0,0 +1,121 @@ ++ ++# THIS CONFIG FILE IS NOT A COMPLETE DOCUMENTATION ++# PLEASE LOOK IN THE BIRD DOCUMENTATION FOR MORE INFO ++ ++# However, most of options used here are just for example ++# and will be removed in real-life configs. ++ ++log syslog all; ++ ++# Override router ID ++#router id 192.168.0.1; ++ ++# Turn on global debugging of all protocols ++#debug protocols all; ++ ++ ++# Define a route filter... ++# filter test_filter { ++# if net ~ 10.0.0.0/16 then accept; ++# else reject; ++# } ++ ++# The direct protocol automatically generates device routes to all network ++# interfaces. Can exist in as many instances as you wish if you want to ++# populate multiple routing tables with device routes. Because device routes ++# are handled by Linux kernel, this protocol is usually not needed. ++# protocol direct { ++# interface "*"; # Restrict network interfaces it works with ++# } ++ ++# This pseudo-protocol performs synchronization between BIRD's routing ++# tables and the kernel. You can run multiple instances of the kernel ++# protocol and synchronize different kernel tables with different BIRD tables. ++protocol kernel { ++# learn; # Learn all alien routes from the kernel ++# persist; # Don't remove routes on bird shutdown ++ scan time 20; # Scan kernel routing table every 20 seconds ++# import none; # Default is import all ++# export all; # Default is export none ++} ++ ++# This pseudo-protocol watches all interface up/down events. ++protocol device { ++ scan time 10; # Scan interfaces every 10 seconds ++} ++ ++# Static routes (again, there can be multiple instances, so that you ++# can disable/enable various groups of static routes on the fly). ++protocol static { ++# export all; # Default is export none ++# route 0.0.0.0/0 via 62.168.0.13; ++# route 10.0.0.0/8 reject; ++# route 192.168.0.0/16 reject; ++} ++ ++ ++#protocol rip { ++# disabled; ++# import all; ++# export all; ++# export filter test_filter; ++ ++# port 1520; ++# period 7; ++# infinity 16; ++# garbage time 60; ++# interface "*" { mode broadcast; }; ++# honor neighbor; ++# honor always; ++# honor never; ++# authentication none; ++#} ++ ++ ++#protocol ospf { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# area 0 { ++# interface "eth*" { ++# cost 10; ++# hello 3; ++# retransmit 2; ++# wait 5; ++# dead 20; ++# type broadcast; ++# authentication simple; ++# password "pass"; ++# }; ++# }; ++#} ++ ++ ++#protocol bgp { ++# disabled; ++# import all; ++# export all; ++# export where source = RTS_STATIC; ++ ++# local as 65000; ++# neighbor 192.168.1.1 as 65001; ++# multihop 20 via 192.168.2.1; ++ ++# hold time 240; ++# startup hold time 240; ++# connect retry time 120; ++# keepalive time 80; # defaults to hold time / 3 ++# start delay time 5; # How long do we wait before initial connect ++# error wait time 60, 300;# Minimum and maximum time we wait after an error (when consecutive ++# # errors occur, we increase the delay exponentially ... ++# error forget time 300; # ... until this timeout expires) ++# disable after error; # Disable the protocol automatically when an error occurs ++# next hop self; # Disable next hop processing and always advertise our local address as nexthop ++# source address 62.168.0.14; # What local address we use for the TCP connection ++# password "secret" # Password used for MD5 authentication ++# rr client; # I am a route reflector and the neighor is my client ++# rr cluster id 1.0.0.1 # Use this value for cluster id instead of my router id ++# }; ++#} +diff --git a/feeds/packages/net/bird/files/bird6.init b/feeds/packages/net/bird/files/bird6.init +new file mode 100644 +index 0000000..2efb4f0 +--- /dev/null ++++ b/feeds/packages/net/bird/files/bird6.init +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++start() { ++ service_start /usr/sbin/bird6 -d ++# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop ) ++} ++ ++stop() { ++# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop ) ++ service_stop /usr/sbin/bird6 ++} ++ ++reload() { ++ service_reload /usr/sbin/bird6 ++} +diff --git a/feeds/packages/net/bird/files/bird6loop b/feeds/packages/net/bird/files/bird6loop +new file mode 100644 +index 0000000..c01cf2e +--- /dev/null ++++ b/feeds/packages/net/bird/files/bird6loop +@@ -0,0 +1,24 @@ ++#!/bin/sh ++ ++BIRD=/usr/sbin/bird6 ++ ++$BIRD -p || return 1 ++ ++. /lib/functions.sh ++. /lib/functions/service.sh ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++sig_handler() { ++ running=0 ++ service_stop $BIRD ++} ++ ++running=1 ++trap sig_handler INT ++trap sig_handler TERM ++while [ $running -gt 0 ]; do ++ service_check $BIRD || service_start $BIRD -d "$@" ++ sleep 3 ++done +diff --git a/feeds/packages/net/bird/patches/.svn/entries b/feeds/packages/net/bird/patches/.svn/entries +new file mode 100644 +index 0000000..ebbbd90 +--- /dev/null ++++ b/feeds/packages/net/bird/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bird/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-26T11:55:34.595798Z ++23638 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++0001-change_config_name.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++c0c3dbd6a81379f5f6c90d9aef72da03 ++2010-04-10T18:33:04.266340Z ++20780 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++637 ++ +diff --git a/feeds/packages/net/bird/patches/.svn/text-base/0001-change_config_name.patch.svn-base b/feeds/packages/net/bird/patches/.svn/text-base/0001-change_config_name.patch.svn-base +new file mode 100644 +index 0000000..98532f7 +--- /dev/null ++++ b/feeds/packages/net/bird/patches/.svn/text-base/0001-change_config_name.patch.svn-base +@@ -0,0 +1,20 @@ ++diff --git a/sysdep/config.h b/sysdep/config.h ++index 03399bd..bc5eb77 100644 ++--- a/sysdep/config.h +++++ b/sysdep/config.h ++@@ -46,11 +46,11 @@ typedef u16 word; ++ # endif ++ #else ++ # ifdef DEBUGGING ++-# define PATH_CONFIG "bird.conf" ++-# define PATH_CONTROL_SOCKET "bird.ctl" +++# define PATH_CONFIG "bird4.conf" +++# define PATH_CONTROL_SOCKET "bird4.ctl" ++ # else ++-# define PATH_CONFIG PATH_CONFIG_DIR "/bird.conf" ++-# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird.ctl" +++# define PATH_CONFIG PATH_CONFIG_DIR "/bird4.conf" +++# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird4.ctl" ++ # endif ++ #endif ++ +diff --git a/feeds/packages/net/bird/patches/0001-change_config_name.patch b/feeds/packages/net/bird/patches/0001-change_config_name.patch +new file mode 100644 +index 0000000..98532f7 +--- /dev/null ++++ b/feeds/packages/net/bird/patches/0001-change_config_name.patch +@@ -0,0 +1,20 @@ ++diff --git a/sysdep/config.h b/sysdep/config.h ++index 03399bd..bc5eb77 100644 ++--- a/sysdep/config.h +++++ b/sysdep/config.h ++@@ -46,11 +46,11 @@ typedef u16 word; ++ # endif ++ #else ++ # ifdef DEBUGGING ++-# define PATH_CONFIG "bird.conf" ++-# define PATH_CONTROL_SOCKET "bird.ctl" +++# define PATH_CONFIG "bird4.conf" +++# define PATH_CONTROL_SOCKET "bird4.ctl" ++ # else ++-# define PATH_CONFIG PATH_CONFIG_DIR "/bird.conf" ++-# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird.ctl" +++# define PATH_CONFIG PATH_CONFIG_DIR "/bird4.conf" +++# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird4.ctl" ++ # endif ++ #endif ++ +diff --git a/feeds/packages/net/bitchx/.svn/entries b/feeds/packages/net/bitchx/.svn/entries +new file mode 100644 +index 0000000..4b406fa +--- /dev/null ++++ b/feeds/packages/net/bitchx/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bitchx ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0834640b84b588b1d5f06acae308d502 ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2536 ++ +diff --git a/feeds/packages/net/bitchx/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bitchx/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/bitchx/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitchx/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bitchx/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9857bee +--- /dev/null ++++ b/feeds/packages/net/bitchx/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# Copyright (C) 2006-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:=bitchx ++PKG_VERSION:=1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=ircii-pana-$(PKG_VERSION)-final.tar.gz ++PKG_SOURCE_URL:=http://bitchx.org/files/source/ ++PKG_MD5SUM:=611d2dda222f00c10140236f4c331572 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/BitchX ++ ++PKG_BUILD_DEPENDS:=libncurses ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bitchx ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libncurses ++ TITLE:=popular IRC client ++ URL:=http://www.bitchx.org ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all ++ mkdir -p $(PKG_INSTALL_DIR)/tmp ++ mkdir -p $(PKG_INSTALL_DIR)/etc/init.d ++ mkdir -p $(PKG_INSTALL_DIR)/usr/bin ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx ++ mkdir -p $(PKG_INSTALL_DIR)/usr/share/man/man1 ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/translation ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/plugins ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/help ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/BitchX $(PKG_INSTALL_DIR)/usr/bin/BitchX-1.1-final ++ rm -f $(PKG_INSTALL_DIR)/usr/bin/BitchX ++ ln -s /usr/bin/BitchX-1.1-final $(PKG_INSTALL_DIR)/usr/bin/BitchX ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.help $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.help ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.ircnames $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.ircnames ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.quit $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.quit ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.reasons $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.kick ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/source/wserv $(PKG_INSTALL_DIR)/usr/lib/bx/wserv ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/scr-bx $(PKG_INSTALL_DIR)/usr/bin/scr-bx ++ $(CP) $(PKG_BUILD_DIR)/script $(PKG_INSTALL_DIR)/usr/lib/bx/ ++ $(CP) $(PKG_BUILD_DIR)/translation $(PKG_INSTALL_DIR)/usr/lib/bx/ ++ bzip2 $(PKG_INSTALL_DIR)/usr/lib/bx/translation/* ++ $(CP) ./files/bitchxrc $(PKG_INSTALL_DIR)/tmp/.bitchxrc ++ $(CP) ./files/bitchxrc.init $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc ++endef ++ ++define Package/bitchx/install ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/ ++ $(CP) $(PKG_INSTALL_DIR)/tmp/.bitchxrc $(1)/tmp ++endef ++ ++$(eval $(call BuildPackage,bitchx)) +diff --git a/feeds/packages/net/bitchx/Makefile b/feeds/packages/net/bitchx/Makefile +new file mode 100644 +index 0000000..9857bee +--- /dev/null ++++ b/feeds/packages/net/bitchx/Makefile +@@ -0,0 +1,70 @@ ++# ++# Copyright (C) 2006-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:=bitchx ++PKG_VERSION:=1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=ircii-pana-$(PKG_VERSION)-final.tar.gz ++PKG_SOURCE_URL:=http://bitchx.org/files/source/ ++PKG_MD5SUM:=611d2dda222f00c10140236f4c331572 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/BitchX ++ ++PKG_BUILD_DEPENDS:=libncurses ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bitchx ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libncurses ++ TITLE:=popular IRC client ++ URL:=http://www.bitchx.org ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all ++ mkdir -p $(PKG_INSTALL_DIR)/tmp ++ mkdir -p $(PKG_INSTALL_DIR)/etc/init.d ++ mkdir -p $(PKG_INSTALL_DIR)/usr/bin ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx ++ mkdir -p $(PKG_INSTALL_DIR)/usr/share/man/man1 ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/translation ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/plugins ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/bx/help ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/BitchX $(PKG_INSTALL_DIR)/usr/bin/BitchX-1.1-final ++ rm -f $(PKG_INSTALL_DIR)/usr/bin/BitchX ++ ln -s /usr/bin/BitchX-1.1-final $(PKG_INSTALL_DIR)/usr/bin/BitchX ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.help $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.help ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.ircnames $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.ircnames ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.quit $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.quit ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/BitchX.reasons $(PKG_INSTALL_DIR)/usr/lib/bx/BitchX.kick ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/source/wserv $(PKG_INSTALL_DIR)/usr/lib/bx/wserv ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/source/scr-bx $(PKG_INSTALL_DIR)/usr/bin/scr-bx ++ $(CP) $(PKG_BUILD_DIR)/script $(PKG_INSTALL_DIR)/usr/lib/bx/ ++ $(CP) $(PKG_BUILD_DIR)/translation $(PKG_INSTALL_DIR)/usr/lib/bx/ ++ bzip2 $(PKG_INSTALL_DIR)/usr/lib/bx/translation/* ++ $(CP) ./files/bitchxrc $(PKG_INSTALL_DIR)/tmp/.bitchxrc ++ $(CP) ./files/bitchxrc.init $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc ++endef ++ ++define Package/bitchx/install ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/ ++ $(CP) $(PKG_INSTALL_DIR)/tmp/.bitchxrc $(1)/tmp ++endef ++ ++$(eval $(call BuildPackage,bitchx)) +diff --git a/feeds/packages/net/bitchx/files/.svn/entries b/feeds/packages/net/bitchx/files/.svn/entries +new file mode 100644 +index 0000000..795f8a1 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bitchx/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-04-05T09:31:20.567810Z ++10734 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bitchxrc ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++329331e9087be0f3428898f0ef66e233 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++38 ++ ++bitchxrc.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++7935bae8f8d7fd709a18d2899f48b6f5 ++2008-04-05T09:31:20.567810Z ++10734 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++222 ++ +diff --git a/feeds/packages/net/bitchx/files/.svn/prop-base/bitchxrc.init.svn-base b/feeds/packages/net/bitchx/files/.svn/prop-base/bitchxrc.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/.svn/prop-base/bitchxrc.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitchx/files/.svn/prop-base/bitchxrc.svn-base b/feeds/packages/net/bitchx/files/.svn/prop-base/bitchxrc.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/.svn/prop-base/bitchxrc.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitchx/files/.svn/text-base/bitchxrc.init.svn-base b/feeds/packages/net/bitchx/files/.svn/text-base/bitchxrc.init.svn-base +new file mode 100644 +index 0000000..e5966d3 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/.svn/text-base/bitchxrc.init.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common ++ ++START=98 ++start() { ++ # make /tmp/.bitchxrc as many servers ban root ++ if [ ! -e /tmp/.bitchxrc ] ++ then ++ echo "IRCUSER OpenWrt" >/tmp/.bitchxrc ++ echo "IRCNAME OpenWrt User!" >>/tmp/.bitchxrc ++ fi ++} +diff --git a/feeds/packages/net/bitchx/files/.svn/text-base/bitchxrc.svn-base b/feeds/packages/net/bitchx/files/.svn/text-base/bitchxrc.svn-base +new file mode 100644 +index 0000000..6e2b271 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/.svn/text-base/bitchxrc.svn-base +@@ -0,0 +1,2 @@ ++IRCUSER OpenWrt ++IRCNAME OpenWrt User! +diff --git a/feeds/packages/net/bitchx/files/bitchxrc b/feeds/packages/net/bitchx/files/bitchxrc +new file mode 100644 +index 0000000..6e2b271 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/bitchxrc +@@ -0,0 +1,2 @@ ++IRCUSER OpenWrt ++IRCNAME OpenWrt User! +diff --git a/feeds/packages/net/bitchx/files/bitchxrc.init b/feeds/packages/net/bitchx/files/bitchxrc.init +new file mode 100644 +index 0000000..e5966d3 +--- /dev/null ++++ b/feeds/packages/net/bitchx/files/bitchxrc.init +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common ++ ++START=98 ++start() { ++ # make /tmp/.bitchxrc as many servers ban root ++ if [ ! -e /tmp/.bitchxrc ] ++ then ++ echo "IRCUSER OpenWrt" >/tmp/.bitchxrc ++ echo "IRCNAME OpenWrt User!" >>/tmp/.bitchxrc ++ fi ++} +diff --git a/feeds/packages/net/bitchx/patches/.svn/entries b/feeds/packages/net/bitchx/patches/.svn/entries +new file mode 100644 +index 0000000..5c963f7 +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bitchx/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-tparm.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++5353fcb9960446e82dd1976c5362c19f ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++287 ++ ++001-fix_declarations.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++920a09ab7a79489e672dedc68df4eac2 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++752 ++ +diff --git a/feeds/packages/net/bitchx/patches/.svn/prop-base/001-fix_declarations.patch.svn-base b/feeds/packages/net/bitchx/patches/.svn/prop-base/001-fix_declarations.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/.svn/prop-base/001-fix_declarations.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitchx/patches/.svn/prop-base/002-tparm.patch.svn-base b/feeds/packages/net/bitchx/patches/.svn/prop-base/002-tparm.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/.svn/prop-base/002-tparm.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitchx/patches/.svn/text-base/001-fix_declarations.patch.svn-base b/feeds/packages/net/bitchx/patches/.svn/text-base/001-fix_declarations.patch.svn-base +new file mode 100644 +index 0000000..b6766da +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/.svn/text-base/001-fix_declarations.patch.svn-base +@@ -0,0 +1,24 @@ ++diff -urN BitchX/include/ctcp.h BitchX.new/include/ctcp.h ++--- BitchX/include/ctcp.h 2003-04-11 03:09:07.000000000 +0200 +++++ BitchX.new/include/ctcp.h 2006-03-29 13:19:21.170693168 +0200 ++@@ -56,7 +56,7 @@ ++ extern CtcpEntryDll *dll_ctcp; ++ ++ ++-extern char *ctcp_type[]; +++//extern char *ctcp_type[]; /* already declared in ctcp.c ++ extern int sed; ++ extern int in_ctcp_flag; ++ ++diff -urN BitchX/include/struct.h BitchX.new/include/struct.h ++--- BitchX/include/struct.h 2003-04-11 03:09:07.000000000 +0200 +++++ BitchX.new/include/struct.h 2006-03-29 13:19:26.653859600 +0200 ++@@ -1064,7 +1064,7 @@ ++ int delete; ++ } TimerList; ++ ++-extern TimerList *PendingTimers; +++//extern TimerList *PendingTimers; ++ typedef struct nicktab_stru ++ { ++ struct nicktab_stru *next; +diff --git a/feeds/packages/net/bitchx/patches/.svn/text-base/002-tparm.patch.svn-base b/feeds/packages/net/bitchx/patches/.svn/text-base/002-tparm.patch.svn-base +new file mode 100644 +index 0000000..18bd7bf +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/.svn/text-base/002-tparm.patch.svn-base +@@ -0,0 +1,10 @@ ++--- BitchX/source/term.c.orig 2006-03-05 15:01:46.000000000 +1000 +++++ BitchX/source/term.c 2006-03-05 15:01:53.000000000 +1000 ++@@ -92,7 +92,6 @@ ++ #endif ++ ++ extern char *getenv(); ++-extern char *tparm(); ++ ++ /* ++ * The old code assumed termcap. termcap is almost always present, but on +diff --git a/feeds/packages/net/bitchx/patches/001-fix_declarations.patch b/feeds/packages/net/bitchx/patches/001-fix_declarations.patch +new file mode 100644 +index 0000000..b6766da +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/001-fix_declarations.patch +@@ -0,0 +1,24 @@ ++diff -urN BitchX/include/ctcp.h BitchX.new/include/ctcp.h ++--- BitchX/include/ctcp.h 2003-04-11 03:09:07.000000000 +0200 +++++ BitchX.new/include/ctcp.h 2006-03-29 13:19:21.170693168 +0200 ++@@ -56,7 +56,7 @@ ++ extern CtcpEntryDll *dll_ctcp; ++ ++ ++-extern char *ctcp_type[]; +++//extern char *ctcp_type[]; /* already declared in ctcp.c ++ extern int sed; ++ extern int in_ctcp_flag; ++ ++diff -urN BitchX/include/struct.h BitchX.new/include/struct.h ++--- BitchX/include/struct.h 2003-04-11 03:09:07.000000000 +0200 +++++ BitchX.new/include/struct.h 2006-03-29 13:19:26.653859600 +0200 ++@@ -1064,7 +1064,7 @@ ++ int delete; ++ } TimerList; ++ ++-extern TimerList *PendingTimers; +++//extern TimerList *PendingTimers; ++ typedef struct nicktab_stru ++ { ++ struct nicktab_stru *next; +diff --git a/feeds/packages/net/bitchx/patches/002-tparm.patch b/feeds/packages/net/bitchx/patches/002-tparm.patch +new file mode 100644 +index 0000000..18bd7bf +--- /dev/null ++++ b/feeds/packages/net/bitchx/patches/002-tparm.patch +@@ -0,0 +1,10 @@ ++--- BitchX/source/term.c.orig 2006-03-05 15:01:46.000000000 +1000 +++++ BitchX/source/term.c 2006-03-05 15:01:53.000000000 +1000 ++@@ -92,7 +92,6 @@ ++ #endif ++ ++ extern char *getenv(); ++-extern char *tparm(); ++ ++ /* ++ * The old code assumed termcap. termcap is almost always present, but on +diff --git a/feeds/packages/net/bitlbee/.svn/entries b/feeds/packages/net/bitlbee/.svn/entries +new file mode 100644 +index 0000000..7c17aeb +--- /dev/null ++++ b/feeds/packages/net/bitlbee/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bitlbee ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:15:34.124835Z ++29053 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++535962de22e6109f195cb0a691fdd789 ++2011-11-13T22:15:34.124835Z ++29053 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2193 ++ +diff --git a/feeds/packages/net/bitlbee/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bitlbee/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/bitlbee/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitlbee/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bitlbee/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..87ce80a +--- /dev/null ++++ b/feeds/packages/net/bitlbee/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,88 @@ ++# ++# 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:=bitlbee ++PKG_VERSION:=1.0.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://get.bitlbee.org/src \ ++ http://get.bitlbee.be/src \ ++ http://get.us.bitlbee.org/src \ ++ http://ftp.snt.utwente.nl/pub/software/bitlbee/src ++PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a ++ ++PKG_BUILD_DEPENDS:=libopenssl glib1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/bitlbee ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libopenssl +glib1 $(ICONV_DEPENDS) ++ TITLE:=IRC gateway to IM chat networks ++ URL:=http://www.bitlbee.org/ ++endef ++ ++define Package/bitlbee/conffiles ++/etc/bitlbee/motd.txt ++/etc/bitlbee/bitlbee.conf ++endef ++ ++define Build/Configure ++ # it's not GNU autoconf stuff ++ (cd $(PKG_BUILD_DIR); \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ STAGING_DIR="$(STAGING_DIR)" \ ++ STRIP="$(STRIP)" \ ++ ./configure \ ++ --prefix=/usr/ \ ++ --bindir=/usr/sbin/ \ ++ --etcdir=/etc/bitlbee/ \ ++ --datadir=/usr/share/bitlbee/ \ ++ --config=/var/lib/bitlbee/ \ ++ --arch=OpenWrt \ ++ --cpu="$(ARCH)" \ ++ --debug=0 \ ++ --strip=1 \ ++ --sizeopt=1 \ ++ --ipv6=1 \ ++ --ssl=openssl \ ++ --glib1=1 \ ++ --glib1prefix="$(STAGING_DIR)/usr" \ ++ ); ++ $(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\ ++ $(PKG_BUILD_DIR)/Makefile.settings ++ @echo 'CFLAGS+=-I$(ICONV_PREFIX)/include' >> \ ++ $(PKG_BUILD_DIR)/Makefile.settings ++ @echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \ ++ $(PKG_BUILD_DIR)/Makefile.settings ++ @echo 'LFLAGS+=-L$(ICONV_PREFIX)/lib' >> \ ++ $(PKG_BUILD_DIR)/Makefile.settings ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/bitlbee/install ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(1)" install-etc install-bin ++ $(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \ ++ DESTDIR="$(1)" install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bitlbee.init $(1)/etc/init.d/bitlbee ++endef ++ ++$(eval $(call BuildPackage,bitlbee)) +diff --git a/feeds/packages/net/bitlbee/Makefile b/feeds/packages/net/bitlbee/Makefile +new file mode 100644 +index 0000000..87ce80a +--- /dev/null ++++ b/feeds/packages/net/bitlbee/Makefile +@@ -0,0 +1,88 @@ ++# ++# 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:=bitlbee ++PKG_VERSION:=1.0.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://get.bitlbee.org/src \ ++ http://get.bitlbee.be/src \ ++ http://get.us.bitlbee.org/src \ ++ http://ftp.snt.utwente.nl/pub/software/bitlbee/src ++PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a ++ ++PKG_BUILD_DEPENDS:=libopenssl glib1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/bitlbee ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libopenssl +glib1 $(ICONV_DEPENDS) ++ TITLE:=IRC gateway to IM chat networks ++ URL:=http://www.bitlbee.org/ ++endef ++ ++define Package/bitlbee/conffiles ++/etc/bitlbee/motd.txt ++/etc/bitlbee/bitlbee.conf ++endef ++ ++define Build/Configure ++ # it's not GNU autoconf stuff ++ (cd $(PKG_BUILD_DIR); \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ STAGING_DIR="$(STAGING_DIR)" \ ++ STRIP="$(STRIP)" \ ++ ./configure \ ++ --prefix=/usr/ \ ++ --bindir=/usr/sbin/ \ ++ --etcdir=/etc/bitlbee/ \ ++ --datadir=/usr/share/bitlbee/ \ ++ --config=/var/lib/bitlbee/ \ ++ --arch=OpenWrt \ ++ --cpu="$(ARCH)" \ ++ --debug=0 \ ++ --strip=1 \ ++ --sizeopt=1 \ ++ --ipv6=1 \ ++ --ssl=openssl \ ++ --glib1=1 \ ++ --glib1prefix="$(STAGING_DIR)/usr" \ ++ ); ++ $(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\ ++ $(PKG_BUILD_DIR)/Makefile.settings ++ @echo 'CFLAGS+=-I$(ICONV_PREFIX)/include' >> \ ++ $(PKG_BUILD_DIR)/Makefile.settings ++ @echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \ ++ $(PKG_BUILD_DIR)/Makefile.settings ++ @echo 'LFLAGS+=-L$(ICONV_PREFIX)/lib' >> \ ++ $(PKG_BUILD_DIR)/Makefile.settings ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/bitlbee/install ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(1)" install-etc install-bin ++ $(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \ ++ DESTDIR="$(1)" install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bitlbee.init $(1)/etc/init.d/bitlbee ++endef ++ ++$(eval $(call BuildPackage,bitlbee)) +diff --git a/feeds/packages/net/bitlbee/files/.svn/entries b/feeds/packages/net/bitlbee/files/.svn/entries +new file mode 100644 +index 0000000..74975c7 +--- /dev/null ++++ b/feeds/packages/net/bitlbee/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bitlbee/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:15:34.124835Z ++29053 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bitlbee.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++de4483a772356caa5743d883e0bf3dc6 ++2011-11-13T22:15:34.124835Z ++29053 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++201 ++ +diff --git a/feeds/packages/net/bitlbee/files/.svn/prop-base/bitlbee.init.svn-base b/feeds/packages/net/bitlbee/files/.svn/prop-base/bitlbee.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bitlbee/files/.svn/prop-base/bitlbee.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitlbee/files/.svn/text-base/bitlbee.init.svn-base b/feeds/packages/net/bitlbee/files/.svn/text-base/bitlbee.init.svn-base +new file mode 100644 +index 0000000..b85450b +--- /dev/null ++++ b/feeds/packages/net/bitlbee/files/.svn/text-base/bitlbee.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ mkdir -m 0755 -p /var/lib/bitlbee ++ service_start /usr/sbin/bitlbee -D ++} ++ ++stop() { ++ service_stop /usr/sbin/bitlbee ++} +diff --git a/feeds/packages/net/bitlbee/files/bitlbee.init b/feeds/packages/net/bitlbee/files/bitlbee.init +new file mode 100644 +index 0000000..b85450b +--- /dev/null ++++ b/feeds/packages/net/bitlbee/files/bitlbee.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ mkdir -m 0755 -p /var/lib/bitlbee ++ service_start /usr/sbin/bitlbee -D ++} ++ ++stop() { ++ service_stop /usr/sbin/bitlbee ++} +diff --git a/feeds/packages/net/bitlbee/patches/.svn/entries b/feeds/packages/net/bitlbee/patches/.svn/entries +new file mode 100644 +index 0000000..afaa43f +--- /dev/null ++++ b/feeds/packages/net/bitlbee/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bitlbee/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-cross_compile_configure_fix ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++a51fa797b2cf29ace3b5b4f96d05f4a3 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2898 ++ +diff --git a/feeds/packages/net/bitlbee/patches/.svn/prop-base/100-cross_compile_configure_fix.svn-base b/feeds/packages/net/bitlbee/patches/.svn/prop-base/100-cross_compile_configure_fix.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bitlbee/patches/.svn/prop-base/100-cross_compile_configure_fix.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bitlbee/patches/.svn/text-base/100-cross_compile_configure_fix.svn-base b/feeds/packages/net/bitlbee/patches/.svn/text-base/100-cross_compile_configure_fix.svn-base +new file mode 100644 +index 0000000..3ba17d2 +--- /dev/null ++++ b/feeds/packages/net/bitlbee/patches/.svn/text-base/100-cross_compile_configure_fix.svn-base +@@ -0,0 +1,98 @@ ++diff -Nur bitlbee-1.0.1-orig/configure bitlbee-1.0.1/configure ++--- bitlbee-1.0.1-orig/configure 2006-01-14 16:14:05.000000000 +0100 +++++ bitlbee-1.0.1/configure 2006-03-06 18:30:19.000000000 +0100 ++@@ -21,9 +21,12 @@ ++ ++ debug=0 ++ strip=1 +++sizeopt=0 ++ ipv6=1 ++ ssl=auto ++ +++glib1=0 +++ ++ arch=`uname -s` ++ cpu=`uname -m` ++ ++@@ -52,11 +55,18 @@ ++ ++ --debug=0/1 Disable/enable debugging $debug ++ --strip=0/1 Disable/enable binary stripping $strip +++--sizeopt=0/1 Disable/enable size optimization $sizeopt +++ +++--arch=... Describe Operating System ?! $arch +++--cpu=... Describe CPU $cpu ++ ++ --ipv6=0/1 IPv6 socket support $ipv6 ++ ++ --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) ++ $ssl +++--glib1=0/1 Force usage of glib1 even if glib2 is present +++--glib1prefix=... +++ ++ EOF ++ exit; ++ fi ++@@ -110,8 +120,13 @@ ++ echo 'CFLAGS=-g' >> Makefile.settings ++ echo 'DEBUG=1' >> Makefile.settings ++ echo '#define DEBUG' >> config.h +++ if [ "$sizeopt" = "1" ]; then +++ echo "Warning: won't optimize for size since debug is on." +++ fi +++elif [ "$sizeopt" = "1" ]; then +++ echo 'CFLAGS=-Os' >> Makefile.settings ++ else ++- echo 'CFLAGS=-O3' >> Makefile.settings +++ echo 'CFLAGS=-O2' >> Makefile.settings ++ fi ++ ++ echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings ++@@ -138,24 +153,33 @@ ++ exit 1; ++ fi ++ ++-if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then +++if [ "$glib1" != "1" ] && \ +++ type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then ++ cat<>Makefile.settings ++ EFLAGS+=`pkg-config --libs glib-2.0` ++ CFLAGS+=`pkg-config --cflags glib-2.0` ++ EOF ++ echo '#define GLIB2' >> config.h ++-elif type glib-config > /dev/null 2> /dev/null; then +++elif [ "x$glib1prefix" = "x" ] && \ +++ type glib-config > /dev/null 2> /dev/null; then ++ cat<>Makefile.settings ++ EFLAGS+=`glib-config --libs` ++ CFLAGS+=`glib-config --cflags` ++ EOF ++ echo '#define GLIB1' >> config.h +++elif [ "x$glib1prefix" != "x" ] && \ +++ type "$glib1prefix/bin/glib-config" > /dev/null 2> /dev/null; then +++ cat<>Makefile.settings +++EFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --libs` +++CFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --cflags` +++EOF +++ echo '#define GLIB1' >> config.h ++ else ++ echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)' ++ exit 1; ++ fi ++ ++-if [ -r /usr/include/iconv.h ]; then +++if [ -r "$STAGING_DIR/usr/include/iconv.h" ]; then ++ :; ++ elif [ -r /usr/local/include/iconv.h ]; then ++ echo CFLAGS+=-I/usr/local/include >> Makefile.settings; ++@@ -360,6 +384,10 @@ ++ CYGWIN* ) ++ echo 'Cygwin is not officially supported.' ++ ;; +++OpenWrt ) +++ echo 'EFLAGS+=-liconv' >> Makefile.settings; +++ echo "CFLAGS+=\"-I$STAGING_DIR/usr/include\"" >> Makefile.settings; +++;; ++ * ) ++ echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' ++ echo 'Please report any problems at http://bugs.bitlbee.org/.' +diff --git a/feeds/packages/net/bitlbee/patches/100-cross_compile_configure_fix b/feeds/packages/net/bitlbee/patches/100-cross_compile_configure_fix +new file mode 100644 +index 0000000..3ba17d2 +--- /dev/null ++++ b/feeds/packages/net/bitlbee/patches/100-cross_compile_configure_fix +@@ -0,0 +1,98 @@ ++diff -Nur bitlbee-1.0.1-orig/configure bitlbee-1.0.1/configure ++--- bitlbee-1.0.1-orig/configure 2006-01-14 16:14:05.000000000 +0100 +++++ bitlbee-1.0.1/configure 2006-03-06 18:30:19.000000000 +0100 ++@@ -21,9 +21,12 @@ ++ ++ debug=0 ++ strip=1 +++sizeopt=0 ++ ipv6=1 ++ ssl=auto ++ +++glib1=0 +++ ++ arch=`uname -s` ++ cpu=`uname -m` ++ ++@@ -52,11 +55,18 @@ ++ ++ --debug=0/1 Disable/enable debugging $debug ++ --strip=0/1 Disable/enable binary stripping $strip +++--sizeopt=0/1 Disable/enable size optimization $sizeopt +++ +++--arch=... Describe Operating System ?! $arch +++--cpu=... Describe CPU $cpu ++ ++ --ipv6=0/1 IPv6 socket support $ipv6 ++ ++ --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) ++ $ssl +++--glib1=0/1 Force usage of glib1 even if glib2 is present +++--glib1prefix=... +++ ++ EOF ++ exit; ++ fi ++@@ -110,8 +120,13 @@ ++ echo 'CFLAGS=-g' >> Makefile.settings ++ echo 'DEBUG=1' >> Makefile.settings ++ echo '#define DEBUG' >> config.h +++ if [ "$sizeopt" = "1" ]; then +++ echo "Warning: won't optimize for size since debug is on." +++ fi +++elif [ "$sizeopt" = "1" ]; then +++ echo 'CFLAGS=-Os' >> Makefile.settings ++ else ++- echo 'CFLAGS=-O3' >> Makefile.settings +++ echo 'CFLAGS=-O2' >> Makefile.settings ++ fi ++ ++ echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings ++@@ -138,24 +153,33 @@ ++ exit 1; ++ fi ++ ++-if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then +++if [ "$glib1" != "1" ] && \ +++ type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then ++ cat<>Makefile.settings ++ EFLAGS+=`pkg-config --libs glib-2.0` ++ CFLAGS+=`pkg-config --cflags glib-2.0` ++ EOF ++ echo '#define GLIB2' >> config.h ++-elif type glib-config > /dev/null 2> /dev/null; then +++elif [ "x$glib1prefix" = "x" ] && \ +++ type glib-config > /dev/null 2> /dev/null; then ++ cat<>Makefile.settings ++ EFLAGS+=`glib-config --libs` ++ CFLAGS+=`glib-config --cflags` ++ EOF ++ echo '#define GLIB1' >> config.h +++elif [ "x$glib1prefix" != "x" ] && \ +++ type "$glib1prefix/bin/glib-config" > /dev/null 2> /dev/null; then +++ cat<>Makefile.settings +++EFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --libs` +++CFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --cflags` +++EOF +++ echo '#define GLIB1' >> config.h ++ else ++ echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)' ++ exit 1; ++ fi ++ ++-if [ -r /usr/include/iconv.h ]; then +++if [ -r "$STAGING_DIR/usr/include/iconv.h" ]; then ++ :; ++ elif [ -r /usr/local/include/iconv.h ]; then ++ echo CFLAGS+=-I/usr/local/include >> Makefile.settings; ++@@ -360,6 +384,10 @@ ++ CYGWIN* ) ++ echo 'Cygwin is not officially supported.' ++ ;; +++OpenWrt ) +++ echo 'EFLAGS+=-liconv' >> Makefile.settings; +++ echo "CFLAGS+=\"-I$STAGING_DIR/usr/include\"" >> Makefile.settings; +++;; ++ * ) ++ echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' ++ echo 'Please report any problems at http://bugs.bitlbee.org/.' +diff --git a/feeds/packages/net/bmon/.svn/entries b/feeds/packages/net/bmon/.svn/entries +new file mode 100644 +index 0000000..5196586 +--- /dev/null ++++ b/feeds/packages/net/bmon/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmon ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++64e379968ef3245d42cdabde33bee13e ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1096 ++ +diff --git a/feeds/packages/net/bmon/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bmon/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/bmon/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bmon/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bmon/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6235265 +--- /dev/null ++++ b/feeds/packages/net/bmon/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=bmon ++PKG_VERSION:=2.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://people.suug.ch/~tgr/bmon/files/ ++PKG_MD5SUM:=3111a027907016c0902d67350c619df6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bmon ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libncurses ++ TITLE:=bmon is a portable bandwidth monitor ++ URL:=http://people.suug.ch/~tgr/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 \ ++ --disable-dbi \ ++ --disable-rrd \ ++ --disable-asound \ ++ ++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/feeds/packages/net/bmon/Makefile b/feeds/packages/net/bmon/Makefile +new file mode 100644 +index 0000000..6235265 +--- /dev/null ++++ b/feeds/packages/net/bmon/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=bmon ++PKG_VERSION:=2.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://people.suug.ch/~tgr/bmon/files/ ++PKG_MD5SUM:=3111a027907016c0902d67350c619df6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bmon ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libncurses ++ TITLE:=bmon is a portable bandwidth monitor ++ URL:=http://people.suug.ch/~tgr/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 \ ++ --disable-dbi \ ++ --disable-rrd \ ++ --disable-asound \ ++ ++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/feeds/packages/net/bmon/patches/.svn/entries b/feeds/packages/net/bmon/patches/.svn/entries +new file mode 100644 +index 0000000..26e89ca +--- /dev/null ++++ b/feeds/packages/net/bmon/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmon/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-11-20T16:27:56.303584Z ++9585 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-bugfixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++ec8b80b5146f266c7c985e350e1b8cdd ++2007-11-20T16:27:56.303584Z ++9585 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++942 ++ +diff --git a/feeds/packages/net/bmon/patches/.svn/prop-base/001-bugfixes.patch.svn-base b/feeds/packages/net/bmon/patches/.svn/prop-base/001-bugfixes.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bmon/patches/.svn/prop-base/001-bugfixes.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bmon/patches/.svn/text-base/001-bugfixes.patch.svn-base b/feeds/packages/net/bmon/patches/.svn/text-base/001-bugfixes.patch.svn-base +new file mode 100644 +index 0000000..fcb9306 +--- /dev/null ++++ b/feeds/packages/net/bmon/patches/.svn/text-base/001-bugfixes.patch.svn-base +@@ -0,0 +1,26 @@ ++Index: bmon-2.1.0/src/out_audio.c ++=================================================================== ++--- bmon-2.1.0.orig/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100 +++++ bmon-2.1.0/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100 ++@@ -141,7 +141,7 @@ ++ .om_draw = audio_draw, ++ .om_set_opts = audio_set_opts, ++ .om_probe = audio_probe, ++- .om_shutdown audio_shutdown, +++ .om_shutdown = audio_shutdown, ++ }; ++ ++ static void __init audio_init(void) ++Index: bmon-2.1.0/src/out_xml_event.c ++=================================================================== ++--- bmon-2.1.0.orig/src/out_xml_event.c 2007-11-20 17:25:54.000000000 +0100 +++++ bmon-2.1.0/src/out_xml_event.c 2007-11-20 17:25:54.000000000 +0100 ++@@ -127,7 +127,7 @@ ++ .om_draw = xml_event_draw, ++ .om_set_opts = xml_event_set_opts, ++ .om_probe = xml_event_probe, ++- .om_shutdown xml_event_shutdown, +++ .om_shutdown = xml_event_shutdown, ++ }; ++ ++ static void __init xml_event_init(void) +diff --git a/feeds/packages/net/bmon/patches/001-bugfixes.patch b/feeds/packages/net/bmon/patches/001-bugfixes.patch +new file mode 100644 +index 0000000..fcb9306 +--- /dev/null ++++ b/feeds/packages/net/bmon/patches/001-bugfixes.patch +@@ -0,0 +1,26 @@ ++Index: bmon-2.1.0/src/out_audio.c ++=================================================================== ++--- bmon-2.1.0.orig/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100 +++++ bmon-2.1.0/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100 ++@@ -141,7 +141,7 @@ ++ .om_draw = audio_draw, ++ .om_set_opts = audio_set_opts, ++ .om_probe = audio_probe, ++- .om_shutdown audio_shutdown, +++ .om_shutdown = audio_shutdown, ++ }; ++ ++ static void __init audio_init(void) ++Index: bmon-2.1.0/src/out_xml_event.c ++=================================================================== ++--- bmon-2.1.0.orig/src/out_xml_event.c 2007-11-20 17:25:54.000000000 +0100 +++++ bmon-2.1.0/src/out_xml_event.c 2007-11-20 17:25:54.000000000 +0100 ++@@ -127,7 +127,7 @@ ++ .om_draw = xml_event_draw, ++ .om_set_opts = xml_event_set_opts, ++ .om_probe = xml_event_probe, ++- .om_shutdown xml_event_shutdown, +++ .om_shutdown = xml_event_shutdown, ++ }; ++ ++ static void __init xml_event_init(void) +diff --git a/feeds/packages/net/bmx6/.svn/entries b/feeds/packages/net/bmx6/.svn/entries +new file mode 100644 +index 0000000..3420c8c +--- /dev/null ++++ b/feeds/packages/net/bmx6/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmx6 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++5977c1c6e7b7d1fe8a84ccb4437030d5 ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2376 ++ +diff --git a/feeds/packages/net/bmx6/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bmx6/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdcdbbf +--- /dev/null ++++ b/feeds/packages/net/bmx6/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,102 @@ ++# ++# Copyright (C) 2011 OpenWrt.org, bmx6.net ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id$ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=bmx6 ++ ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://git.bmx6.net/bmx6.git ++PKG_REV:=c3ef7d76292a765c5e578bd4113030dc34ee3b9a ++ ++PKG_VERSION:=r2011031602 ++ ++#PKG_RELEASE:=1 ++#PKG_INSTALL:=1 # this tries to install straight to /usr/sbin/bmx6 ++ ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++#-DNO_TRAFFIC_DUMP -DNO_DYN_PLUGIN -DNO_DEBUG_DUMP -DNO_DEBUG_ALL -DNO_DEBUG_TRACK -DNO_DEBUG_SYS ++ ++MAKE_ARGS += \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ ++ EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ ++ REVISION_VERSION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ build_all ++ ++ ++define Package/bmx6/Default ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE:=BMX6 layer 3 routing daemon ++ URL:=http://bmx6.net/ ++ MAINTAINER:=Axel Neumann ++endef ++ ++define Package/bmx6/description ++BMX6 layer 3 routing daemon supporting IPv4, IPv6, and IPv4 over IPv6 - http://www.bmx6.net ++endef ++ ++define Package/bmx6 ++ $(call Package/bmx6/Default) ++ MENU:=1 ++endef ++ ++define Package/bmx6-uci-config ++ $(call Package/bmx6/Default) ++ DEPENDS:=bmx6 +libuci ++ TITLE:=configuration plugin based on uci (recommended!) ++endef ++ ++ ++ ++ ++define Build/Configure ++ mkdir -p $(PKG_INSTALL_DIR) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) ++endef ++ ++ ++define Package/bmx6/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6 ++endef ++ ++ ++define Package/bmx6-uci-config/conffiles ++/etc/config/bmx6 ++endef ++ ++ ++define Package/bmx6-uci-config/install ++ $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so ++ $(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6 ++ $(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6 ++endef ++ ++ ++$(eval $(call BuildPackage,bmx6)) ++$(eval $(call BuildPackage,bmx6-uci-config)) ++ +diff --git a/feeds/packages/net/bmx6/Makefile b/feeds/packages/net/bmx6/Makefile +new file mode 100644 +index 0000000..bdcdbbf +--- /dev/null ++++ b/feeds/packages/net/bmx6/Makefile +@@ -0,0 +1,102 @@ ++# ++# Copyright (C) 2011 OpenWrt.org, bmx6.net ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id$ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=bmx6 ++ ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://git.bmx6.net/bmx6.git ++PKG_REV:=c3ef7d76292a765c5e578bd4113030dc34ee3b9a ++ ++PKG_VERSION:=r2011031602 ++ ++#PKG_RELEASE:=1 ++#PKG_INSTALL:=1 # this tries to install straight to /usr/sbin/bmx6 ++ ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ ++TARGET_CFLAGS += $(FPIC) ++ ++#-DNO_TRAFFIC_DUMP -DNO_DYN_PLUGIN -DNO_DEBUG_DUMP -DNO_DEBUG_ALL -DNO_DEBUG_TRACK -DNO_DEBUG_SYS ++ ++MAKE_ARGS += \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DNO_DEBUG_ALL -DNO_DEBUG_DUMP" \ ++ EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib " \ ++ REVISION_VERSION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ INSTALL_DIR="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ build_all ++ ++ ++define Package/bmx6/Default ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ TITLE:=BMX6 layer 3 routing daemon ++ URL:=http://bmx6.net/ ++ MAINTAINER:=Axel Neumann ++endef ++ ++define Package/bmx6/description ++BMX6 layer 3 routing daemon supporting IPv4, IPv6, and IPv4 over IPv6 - http://www.bmx6.net ++endef ++ ++define Package/bmx6 ++ $(call Package/bmx6/Default) ++ MENU:=1 ++endef ++ ++define Package/bmx6-uci-config ++ $(call Package/bmx6/Default) ++ DEPENDS:=bmx6 +libuci ++ TITLE:=configuration plugin based on uci (recommended!) ++endef ++ ++ ++ ++ ++define Build/Configure ++ mkdir -p $(PKG_INSTALL_DIR) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) ++endef ++ ++ ++define Package/bmx6/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bmx6 $(1)/usr/sbin/bmx6 ++endef ++ ++ ++define Package/bmx6-uci-config/conffiles ++/etc/config/bmx6 ++endef ++ ++ ++define Package/bmx6-uci-config/install ++ $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmx6_uci_config/bmx6_config.so $(1)/usr/lib/bmx6_config.so ++ $(INSTALL_BIN) ./files/etc/init.d/bmx6 $(1)/etc/init.d/bmx6 ++ $(INSTALL_DATA) ./files/etc/config/bmx6 $(1)/etc/config/bmx6 ++endef ++ ++ ++$(eval $(call BuildPackage,bmx6)) ++$(eval $(call BuildPackage,bmx6-uci-config)) ++ +diff --git a/feeds/packages/net/bmx6/files/.svn/entries b/feeds/packages/net/bmx6/files/.svn/entries +new file mode 100644 +index 0000000..eee39ba +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmx6/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/bmx6/files/etc/.svn/entries b/feeds/packages/net/bmx6/files/etc/.svn/entries +new file mode 100644 +index 0000000..1f3a666 +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmx6/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config ++dir ++ ++init.d ++dir ++ +diff --git a/feeds/packages/net/bmx6/files/etc/config/.svn/entries b/feeds/packages/net/bmx6/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..10130fe +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmx6/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bmx6 ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++28e956051e668a9efd9e73aaa3d9c978 ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++574 ++ +diff --git a/feeds/packages/net/bmx6/files/etc/config/.svn/text-base/bmx6.svn-base b/feeds/packages/net/bmx6/files/etc/config/.svn/text-base/bmx6.svn-base +new file mode 100644 +index 0000000..d593e74 +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/config/.svn/text-base/bmx6.svn-base +@@ -0,0 +1,23 @@ ++# for more options execute: bmx6 --help ++ ++config 'bmx6' 'general' ++# option 'runtime_dir' '/var/run/bmx6' ++# option 'niit_source' '10.202.0.116' ++ ++#config 'ip_version' 'ip_version' ++# option 'ip_version' '6' # default is 4 ++# option 'throw_rules' '0' ++ ++config 'dev' 'mesh_1' ++ option 'dev' 'eth0.12' ++ ++config 'dev' 'mesh_2' ++ option 'dev' 'ath0.12' ++ ++#config 'unicast_hna' 'my_global_prefix' ++# option 'unicast_hna' '2012:0:0:74:0:0:0:0/64' ++ ++#config 'unicast_hna' 'niit6to4' ++# option 'unicast_hna' '0:0:0:0:0:ffff:10.202.0.116/128' ++ ++ +diff --git a/feeds/packages/net/bmx6/files/etc/config/bmx6 b/feeds/packages/net/bmx6/files/etc/config/bmx6 +new file mode 100644 +index 0000000..d593e74 +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/config/bmx6 +@@ -0,0 +1,23 @@ ++# for more options execute: bmx6 --help ++ ++config 'bmx6' 'general' ++# option 'runtime_dir' '/var/run/bmx6' ++# option 'niit_source' '10.202.0.116' ++ ++#config 'ip_version' 'ip_version' ++# option 'ip_version' '6' # default is 4 ++# option 'throw_rules' '0' ++ ++config 'dev' 'mesh_1' ++ option 'dev' 'eth0.12' ++ ++config 'dev' 'mesh_2' ++ option 'dev' 'ath0.12' ++ ++#config 'unicast_hna' 'my_global_prefix' ++# option 'unicast_hna' '2012:0:0:74:0:0:0:0/64' ++ ++#config 'unicast_hna' 'niit6to4' ++# option 'unicast_hna' '0:0:0:0:0:ffff:10.202.0.116/128' ++ ++ +diff --git a/feeds/packages/net/bmx6/files/etc/init.d/.svn/entries b/feeds/packages/net/bmx6/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..a5868ad +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmx6/files/etc/init.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bmx6 ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++d045aaa17da97a8803dc7a452b474148 ++2011-03-16T03:15:22.453297Z ++26187 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++270 ++ +diff --git a/feeds/packages/net/bmx6/files/etc/init.d/.svn/text-base/bmx6.svn-base b/feeds/packages/net/bmx6/files/etc/init.d/.svn/text-base/bmx6.svn-base +new file mode 100644 +index 0000000..c584718 +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/init.d/.svn/text-base/bmx6.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh /etc/rc.common ++START=91 ++ ++BIN=/usr/sbin/bmx6 ++CONF=/etc/config/bmx6 ++PID=/var/run/bmx6/pid ++ ++ ++start() { ++ #$BIN -f $CONF -d0 > /dev/null & ++ start-stop-daemon -b -x $BIN -S -- -f $CONF ++} ++ ++stop() { ++ start-stop-daemon -p $PID -K ++} ++ ++restart() { ++ stop; sleep 3; start ++} +diff --git a/feeds/packages/net/bmx6/files/etc/init.d/bmx6 b/feeds/packages/net/bmx6/files/etc/init.d/bmx6 +new file mode 100644 +index 0000000..c584718 +--- /dev/null ++++ b/feeds/packages/net/bmx6/files/etc/init.d/bmx6 +@@ -0,0 +1,20 @@ ++#!/bin/sh /etc/rc.common ++START=91 ++ ++BIN=/usr/sbin/bmx6 ++CONF=/etc/config/bmx6 ++PID=/var/run/bmx6/pid ++ ++ ++start() { ++ #$BIN -f $CONF -d0 > /dev/null & ++ start-stop-daemon -b -x $BIN -S -- -f $CONF ++} ++ ++stop() { ++ start-stop-daemon -p $PID -K ++} ++ ++restart() { ++ stop; sleep 3; start ++} +diff --git a/feeds/packages/net/bmxd/.svn/entries b/feeds/packages/net/bmxd/.svn/entries +new file mode 100644 +index 0000000..0fdf431 +--- /dev/null ++++ b/feeds/packages/net/bmxd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmxd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-13T19:44:57.671891Z ++29733 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++fed0f65cedfecacac4c3e72beb3f577a ++2012-01-13T19:44:57.671891Z ++29733 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1801 ++ +diff --git a/feeds/packages/net/bmxd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bmxd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5dfd7f9 +--- /dev/null ++++ b/feeds/packages/net/bmxd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# Copyright (C) 2008 Freifunk Leipzig ++# 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:=bmxd ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/axn/bmxd.git ++PKG_REV:=9c1d12b554dccd2efde249f5e44a7d4de59ce1a8 ++PKG_VERSION:=r2012011001 ++#PKG_RELEASE:=1 ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++PKG_EXTRA_CFLAGS:=-DNODEBUGALL ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bmxd/Default ++ URL:=http://www.bmx6.net/ ++ MAINTAINER:=Axel Neumann ++endef ++ ++define Package/bmxd ++$(call Package/bmxd/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ DEPENDS:=+kmod-tun ++ TITLE:=B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon ++endef ++ ++define Package/bmxd/conffiles ++/etc/config/bmxd ++endef ++ ++ ++define Package/bmxd/description ++B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon ++endef ++ ++MAKE_ARGS += \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)" \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ bmxd install ++ ++define Build/Compile ++ mkdir -p $(PKG_INSTALL_DIR)/usr/sbin ++ $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) ++endef ++ ++define Package/bmxd/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bmxd $(1)/usr/sbin/bmxd ++ $(INSTALL_BIN) ./files/etc/init.d/bmxd $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/etc/config/bmxd $(1)/etc/config ++endef ++ ++$(eval $(call BuildPackage,bmxd)) +diff --git a/feeds/packages/net/bmxd/Makefile b/feeds/packages/net/bmxd/Makefile +new file mode 100644 +index 0000000..5dfd7f9 +--- /dev/null ++++ b/feeds/packages/net/bmxd/Makefile +@@ -0,0 +1,75 @@ ++# ++# Copyright (C) 2008 Freifunk Leipzig ++# 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:=bmxd ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/axn/bmxd.git ++PKG_REV:=9c1d12b554dccd2efde249f5e44a7d4de59ce1a8 ++PKG_VERSION:=r2012011001 ++#PKG_RELEASE:=1 ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) ++ ++PKG_EXTRA_CFLAGS:=-DNODEBUGALL ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bmxd/Default ++ URL:=http://www.bmx6.net/ ++ MAINTAINER:=Axel Neumann ++endef ++ ++define Package/bmxd ++$(call Package/bmxd/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Routing and Redirection ++ DEPENDS:=+kmod-tun ++ TITLE:=B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon ++endef ++ ++define Package/bmxd/conffiles ++/etc/config/bmxd ++endef ++ ++ ++define Package/bmxd/description ++B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon ++endef ++ ++MAKE_ARGS += \ ++ EXTRA_CFLAGS="$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)" \ ++ CCFLAGS="$(TARGET_CFLAGS)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ REVISION="$(PKG_REV)" \ ++ CC="$(TARGET_CC)" \ ++ NODEBUG=1 \ ++ UNAME="Linux" \ ++ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ bmxd install ++ ++define Build/Compile ++ mkdir -p $(PKG_INSTALL_DIR)/usr/sbin ++ $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) ++endef ++ ++define Package/bmxd/install ++ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bmxd $(1)/usr/sbin/bmxd ++ $(INSTALL_BIN) ./files/etc/init.d/bmxd $(1)/etc/init.d ++ $(INSTALL_DATA) ./files/etc/config/bmxd $(1)/etc/config ++endef ++ ++$(eval $(call BuildPackage,bmxd)) +diff --git a/feeds/packages/net/bmxd/files/.svn/entries b/feeds/packages/net/bmxd/files/.svn/entries +new file mode 100644 +index 0000000..23bba74 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmxd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-25T21:13:31.755693Z ++21160 ++axel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/bmxd/files/etc/.svn/entries b/feeds/packages/net/bmxd/files/etc/.svn/entries +new file mode 100644 +index 0000000..5fe8814 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmxd/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-25T21:13:31.755693Z ++21160 ++axel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config ++dir ++ ++init.d ++dir ++ +diff --git a/feeds/packages/net/bmxd/files/etc/config/.svn/entries b/feeds/packages/net/bmxd/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..abd103a +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmxd/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-25T21:13:31.755693Z ++21160 ++axel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bmxd ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++eefdb5b942beb49c146e726d225656a4 ++2010-04-25T21:13:31.755693Z ++21160 ++axel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++238 ++ +diff --git a/feeds/packages/net/bmxd/files/etc/config/.svn/text-base/bmxd.svn-base b/feeds/packages/net/bmxd/files/etc/config/.svn/text-base/bmxd.svn-base +new file mode 100644 +index 0000000..c8619e9 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/config/.svn/text-base/bmxd.svn-base +@@ -0,0 +1,9 @@ ++config bmxd general ++ option interface 'ath0' ++# option announce ++# option gateway_class ++# option originator_interval ++# option preferred_gateway ++# option routing_class ++# option visualisation_srv ++# option misc 'base-port=14305' +diff --git a/feeds/packages/net/bmxd/files/etc/config/bmxd b/feeds/packages/net/bmxd/files/etc/config/bmxd +new file mode 100644 +index 0000000..c8619e9 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/config/bmxd +@@ -0,0 +1,9 @@ ++config bmxd general ++ option interface 'ath0' ++# option announce ++# option gateway_class ++# option originator_interval ++# option preferred_gateway ++# option routing_class ++# option visualisation_srv ++# option misc 'base-port=14305' +diff --git a/feeds/packages/net/bmxd/files/etc/init.d/.svn/entries b/feeds/packages/net/bmxd/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..f5ddef9 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bmxd/files/etc/init.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-25T21:13:31.755693Z ++21160 ++axel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bmxd ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++3a425d4106771b5b402c4d2500f08bd9 ++2010-04-25T21:13:31.755693Z ++21160 ++axel ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1218 ++ +diff --git a/feeds/packages/net/bmxd/files/etc/init.d/.svn/text-base/bmxd.svn-base b/feeds/packages/net/bmxd/files/etc/init.d/.svn/text-base/bmxd.svn-base +new file mode 100644 +index 0000000..d23b4c8 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/init.d/.svn/text-base/bmxd.svn-base +@@ -0,0 +1,51 @@ ++#!/bin/sh /etc/rc.common ++START=91 ++. /lib/config/uci.sh ++uci_load bmxd ++start () { ++ interface="$(uci get bmxd.general.interface)" ++ if [ "$interface" = "" ]; then ++ echo $1 Error, you must specify at least a network interface ++ exit ++ fi ++ announce=$(uci get bmxd.general.announce) ++ gateway_class=$(uci get bmxd.general.gateway_class) ++ originator_interval=$(uci get bmxd.general.originator_interval) ++ preferred_gateway=$(uci get bmxd.general.preferred_gateway) ++ routing_class=$(uci get bmxd.general.routing_class) ++ visualisation_srv=$(uci get bmxd.general.visualisation_srv) ++ misc="$(uci get bmxd.general.misc)" ++ bmx_args="" ++ ++ if [ $announce ]; then ++ bmx_args=${bmx_args}'-a '$announce' ' ++ fi ++ ++ if [ $gateway_class ]; then ++ bmx_args=${bmx_args}'-g '$gateway_class' ' ++ fi ++ ++ if [ $originator_interval ]; then ++ bmx_args=${bmx_args}'-o '$originator_interval' ' ++ fi ++ ++ if [ $preferred_gateway ]; then ++ bmx_args=${bmx_args}'-p '$preferred_gateway' ' ++ fi ++ ++ if [ $routing_class ]; then ++ bmx_args=${bmx_args}'-r '$routing_class' ' ++ fi ++ ++ if [ $visualisation_srv ]; then ++ bmx_args=${bmx_args}'-s '$visualisation_srv' ' ++ fi ++ ++ ++ bmx_args="$misc ${bmx_args} $interface" ++ bmxd $bmx_args >/dev/null 2>&1 ++} ++ ++stop () { ++ killall bmxd ++} +diff --git a/feeds/packages/net/bmxd/files/etc/init.d/bmxd b/feeds/packages/net/bmxd/files/etc/init.d/bmxd +new file mode 100644 +index 0000000..d23b4c8 +--- /dev/null ++++ b/feeds/packages/net/bmxd/files/etc/init.d/bmxd +@@ -0,0 +1,51 @@ ++#!/bin/sh /etc/rc.common ++START=91 ++. /lib/config/uci.sh ++uci_load bmxd ++start () { ++ interface="$(uci get bmxd.general.interface)" ++ if [ "$interface" = "" ]; then ++ echo $1 Error, you must specify at least a network interface ++ exit ++ fi ++ announce=$(uci get bmxd.general.announce) ++ gateway_class=$(uci get bmxd.general.gateway_class) ++ originator_interval=$(uci get bmxd.general.originator_interval) ++ preferred_gateway=$(uci get bmxd.general.preferred_gateway) ++ routing_class=$(uci get bmxd.general.routing_class) ++ visualisation_srv=$(uci get bmxd.general.visualisation_srv) ++ misc="$(uci get bmxd.general.misc)" ++ bmx_args="" ++ ++ if [ $announce ]; then ++ bmx_args=${bmx_args}'-a '$announce' ' ++ fi ++ ++ if [ $gateway_class ]; then ++ bmx_args=${bmx_args}'-g '$gateway_class' ' ++ fi ++ ++ if [ $originator_interval ]; then ++ bmx_args=${bmx_args}'-o '$originator_interval' ' ++ fi ++ ++ if [ $preferred_gateway ]; then ++ bmx_args=${bmx_args}'-p '$preferred_gateway' ' ++ fi ++ ++ if [ $routing_class ]; then ++ bmx_args=${bmx_args}'-r '$routing_class' ' ++ fi ++ ++ if [ $visualisation_srv ]; then ++ bmx_args=${bmx_args}'-s '$visualisation_srv' ' ++ fi ++ ++ ++ bmx_args="$misc ${bmx_args} $interface" ++ bmxd $bmx_args >/dev/null 2>&1 ++} ++ ++stop () { ++ killall bmxd ++} +diff --git a/feeds/packages/net/bridge-utils/.svn/entries b/feeds/packages/net/bridge-utils/.svn/entries +new file mode 100644 +index 0000000..82fb588 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bridge-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-13T16:16:43.278173Z ++35999 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++18e6efc8a9da8f621655097cb242400c ++2013-03-13T16:16:43.278173Z ++35999 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1115 ++ +diff --git a/feeds/packages/net/bridge-utils/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bridge-utils/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8e522ae +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bridge-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bridge-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..63edf4a +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=bridge-utils ++PKG_RELEASE:=2 ++PKG_SOURCE_URL:=@SF/bridge ++PKG_VERSION:=1.5 ++PKG_MD5SUM:=ec7b381160b340648dede58c31bb2238 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bridge ++ SECTION:=net ++ CATEGORY:=Base system ++ TITLE:=Ethernet bridging configuration utility ++ URL:=http://bridge.sourceforge.net/ ++endef ++ ++define Package/bridge/description ++ Manage ethernet bridging: a way to connect networks together to ++ form a larger network. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-linux-headers="$(LINUX_DIR)" \ ++ ++define Build/Prepare ++$(call Build/Prepare/Default) ++ ( cd $(PKG_BUILD_DIR) ; \ ++ [ -f ./configure ] || { \ ++ ln -sf configure.in configure.ac ; \ ++ autoconf ; \ ++ } \ ++ ) ++endef ++ ++define Package/bridge/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,bridge)) +diff --git a/feeds/packages/net/bridge-utils/Makefile b/feeds/packages/net/bridge-utils/Makefile +new file mode 100644 +index 0000000..63edf4a +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=bridge-utils ++PKG_RELEASE:=2 ++PKG_SOURCE_URL:=@SF/bridge ++PKG_VERSION:=1.5 ++PKG_MD5SUM:=ec7b381160b340648dede58c31bb2238 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bridge ++ SECTION:=net ++ CATEGORY:=Base system ++ TITLE:=Ethernet bridging configuration utility ++ URL:=http://bridge.sourceforge.net/ ++endef ++ ++define Package/bridge/description ++ Manage ethernet bridging: a way to connect networks together to ++ form a larger network. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-linux-headers="$(LINUX_DIR)" \ ++ ++define Build/Prepare ++$(call Build/Prepare/Default) ++ ( cd $(PKG_BUILD_DIR) ; \ ++ [ -f ./configure ] || { \ ++ ln -sf configure.in configure.ac ; \ ++ autoconf ; \ ++ } \ ++ ) ++endef ++ ++define Package/bridge/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,bridge)) +diff --git a/feeds/packages/net/bridge-utils/patches/.svn/entries b/feeds/packages/net/bridge-utils/patches/.svn/entries +new file mode 100644 +index 0000000..a847176 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bridge-utils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-13T16:16:43.278173Z ++35999 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix_struct_in6_addr_usage.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++647d93d50d164d784751bd2a55be694f ++2013-03-13T16:16:43.278173Z ++35999 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++203 ++ ++001-libbridge_cflags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++ce800a663402127f2b656ab8107ff2fc ++2010-03-26T14:27:35.237691Z ++20453 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++235 ++ +diff --git a/feeds/packages/net/bridge-utils/patches/.svn/prop-base/001-libbridge_cflags.patch.svn-base b/feeds/packages/net/bridge-utils/patches/.svn/prop-base/001-libbridge_cflags.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/patches/.svn/prop-base/001-libbridge_cflags.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bridge-utils/patches/.svn/text-base/001-libbridge_cflags.patch.svn-base b/feeds/packages/net/bridge-utils/patches/.svn/text-base/001-libbridge_cflags.patch.svn-base +new file mode 100644 +index 0000000..e35a649 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/patches/.svn/text-base/001-libbridge_cflags.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/libbridge/Makefile.in +++++ b/libbridge/Makefile.in ++@@ -5,7 +5,7 @@ AR=ar ++ RANLIB=@RANLIB@ ++ ++ CC=@CC@ ++-CFLAGS = -Wall -g $(KERNEL_HEADERS) +++CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) ++ ++ prefix=@prefix@ ++ exec_prefix=@exec_prefix@ +diff --git a/feeds/packages/net/bridge-utils/patches/.svn/text-base/010-fix_struct_in6_addr_usage.patch.svn-base b/feeds/packages/net/bridge-utils/patches/.svn/text-base/010-fix_struct_in6_addr_usage.patch.svn-base +new file mode 100644 +index 0000000..c2087e5 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/patches/.svn/text-base/010-fix_struct_in6_addr_usage.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/libbridge/libbridge.h +++++ b/libbridge/libbridge.h ++@@ -20,6 +20,7 @@ ++ #define _LIBBRIDGE_H ++ ++ #include +++#include ++ #include ++ #include ++ +diff --git a/feeds/packages/net/bridge-utils/patches/001-libbridge_cflags.patch b/feeds/packages/net/bridge-utils/patches/001-libbridge_cflags.patch +new file mode 100644 +index 0000000..e35a649 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/patches/001-libbridge_cflags.patch +@@ -0,0 +1,11 @@ ++--- a/libbridge/Makefile.in +++++ b/libbridge/Makefile.in ++@@ -5,7 +5,7 @@ AR=ar ++ RANLIB=@RANLIB@ ++ ++ CC=@CC@ ++-CFLAGS = -Wall -g $(KERNEL_HEADERS) +++CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) ++ ++ prefix=@prefix@ ++ exec_prefix=@exec_prefix@ +diff --git a/feeds/packages/net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch b/feeds/packages/net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch +new file mode 100644 +index 0000000..c2087e5 +--- /dev/null ++++ b/feeds/packages/net/bridge-utils/patches/010-fix_struct_in6_addr_usage.patch +@@ -0,0 +1,10 @@ ++--- a/libbridge/libbridge.h +++++ b/libbridge/libbridge.h ++@@ -20,6 +20,7 @@ ++ #define _LIBBRIDGE_H ++ ++ #include +++#include ++ #include ++ #include ++ +diff --git a/feeds/packages/net/btpd/.svn/entries b/feeds/packages/net/btpd/.svn/entries +new file mode 100644 +index 0000000..c3716fb +--- /dev/null ++++ b/feeds/packages/net/btpd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/btpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T18:30:12.686413Z ++32530 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d3655286ddb9300098a014a578cc4c3a ++2012-06-29T18:30:12.686413Z ++32530 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1559 ++ +diff --git a/feeds/packages/net/btpd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/btpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..351d46e +--- /dev/null ++++ b/feeds/packages/net/btpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=btpd ++PKG_VERSION:=0.16 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://github.com/downloads/btpd/btpd ++PKG_MD5SUM:=fe042aae8d7c515ecd855673d1c2b33e ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/btpd ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread +librt ++ SUBMENU:=BitTorrent ++ TITLE:=btpd - BitTorrent Protocol Daemon ++ URL:=https://github.com/btpd/btpd/wiki/ ++endef ++ ++define Package/btpd/description ++ BTPD is a bittorrent client consisting of a daemon and client commands, ++ which can be used to read and/or manipulate the daemon state. ++ The daemon is capable of running several torrents simultaneously and ++ only uses one tcp port. ++ It's fairly low on resource usage and should be perfect for file ++ distribution sites. ++ Efficient downloads and ease of use makes this client a good choice for ++ the casual user as well. ++endef ++ ++define Package/btpd/conffiles ++/etc/config/btpd ++endef ++ ++CONFIGURE_ARGS += -C --with-evloop-method=poll ++ ++define Package/btpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bt{cli,info,pd} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/btpd.init $(1)/etc/init.d/btpd ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/btpd.config $(1)/etc/config/btpd ++endef ++ ++$(eval $(call BuildPackage,btpd)) +diff --git a/feeds/packages/net/btpd/Makefile b/feeds/packages/net/btpd/Makefile +new file mode 100644 +index 0000000..351d46e +--- /dev/null ++++ b/feeds/packages/net/btpd/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=btpd ++PKG_VERSION:=0.16 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=https://github.com/downloads/btpd/btpd ++PKG_MD5SUM:=fe042aae8d7c515ecd855673d1c2b33e ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/btpd ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread +librt ++ SUBMENU:=BitTorrent ++ TITLE:=btpd - BitTorrent Protocol Daemon ++ URL:=https://github.com/btpd/btpd/wiki/ ++endef ++ ++define Package/btpd/description ++ BTPD is a bittorrent client consisting of a daemon and client commands, ++ which can be used to read and/or manipulate the daemon state. ++ The daemon is capable of running several torrents simultaneously and ++ only uses one tcp port. ++ It's fairly low on resource usage and should be perfect for file ++ distribution sites. ++ Efficient downloads and ease of use makes this client a good choice for ++ the casual user as well. ++endef ++ ++define Package/btpd/conffiles ++/etc/config/btpd ++endef ++ ++CONFIGURE_ARGS += -C --with-evloop-method=poll ++ ++define Package/btpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bt{cli,info,pd} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/btpd.init $(1)/etc/init.d/btpd ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/btpd.config $(1)/etc/config/btpd ++endef ++ ++$(eval $(call BuildPackage,btpd)) +diff --git a/feeds/packages/net/btpd/files/.svn/entries b/feeds/packages/net/btpd/files/.svn/entries +new file mode 100644 +index 0000000..acc32a9 +--- /dev/null ++++ b/feeds/packages/net/btpd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/btpd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:15:38.362349Z ++29055 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++btpd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++eb0bbdea334a65481e5c1c1d9d62a9e2 ++2011-11-13T22:15:38.362349Z ++29055 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1173 ++ ++btpd.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++699e83309f7cae4dd599f4f478ff89b9 ++2009-06-21T10:39:54.357502Z ++16524 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++169 ++ +diff --git a/feeds/packages/net/btpd/files/.svn/text-base/btpd.config.svn-base b/feeds/packages/net/btpd/files/.svn/text-base/btpd.config.svn-base +new file mode 100644 +index 0000000..9650fc9 +--- /dev/null ++++ b/feeds/packages/net/btpd/files/.svn/text-base/btpd.config.svn-base +@@ -0,0 +1,7 @@ ++config 'btpd' ++ option 'directory' '/usb/btpd' ++ option 'maxkbin' '1000' ++ option 'maxkbout' '40' ++ option 'maxpeers' '140' ++ option 'maxuploads' '50' ++ option 'port' '47194' +diff --git a/feeds/packages/net/btpd/files/.svn/text-base/btpd.init.svn-base b/feeds/packages/net/btpd/files/.svn/text-base/btpd.init.svn-base +new file mode 100644 +index 0000000..867b553 +--- /dev/null ++++ b/feeds/packages/net/btpd/files/.svn/text-base/btpd.init.svn-base +@@ -0,0 +1,61 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=99 ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -gt 0 ] && append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++ ++btpd() { ++ local cfg="$1" ++ args="" ++ directory="" ++ append_bool "$cfg" useipv4 "-4" ++ append_bool "$cfg" useipv6 "-6" ++ append_bool "$cfg" emptystart "--empty-start" ++ append_parm "$cfg" port "-p" ++ append_parm "$cfg" directory "-d" ++ append_parm "$cfg" maxpeers "--max-peers" ++ append_parm "$cfg" maxuploads "--max-uploads" ++ append_parm "$cfg" maxkbin "--bw-in" ++ append_parm "$cfg" maxkbout "--bw-out" ++ config_get directory "$cfg" directory ++} ++ ++start() { ++ config_load btpd ++ config_foreach btpd btpd ++ ++ service_start /usr/bin/btpd $args ++} ++ ++stop() { ++ config_load btpd ++ config_foreach btpd btpd ++ ++ [ -d $directory ] && args="-d $directory " ++ ++ while btcli $args kill ; do ++ sleep 3 ++ done 2>/dev/null ++ ++ service_stop /usr/bin/btpd ++} ++ +diff --git a/feeds/packages/net/btpd/files/btpd.config b/feeds/packages/net/btpd/files/btpd.config +new file mode 100644 +index 0000000..9650fc9 +--- /dev/null ++++ b/feeds/packages/net/btpd/files/btpd.config +@@ -0,0 +1,7 @@ ++config 'btpd' ++ option 'directory' '/usb/btpd' ++ option 'maxkbin' '1000' ++ option 'maxkbout' '40' ++ option 'maxpeers' '140' ++ option 'maxuploads' '50' ++ option 'port' '47194' +diff --git a/feeds/packages/net/btpd/files/btpd.init b/feeds/packages/net/btpd/files/btpd.init +new file mode 100644 +index 0000000..867b553 +--- /dev/null ++++ b/feeds/packages/net/btpd/files/btpd.init +@@ -0,0 +1,61 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=99 ++ ++append_bool() { ++ local section="$1" ++ local option="$2" ++ local value="$3" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" 0 ++ [ "$_loctmp" -gt 0 ] && append args "$value" ++} ++ ++append_parm() { ++ local section="$1" ++ local option="$2" ++ local switch="$3" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ [ -z "$_loctmp" ] && return 0 ++ append args "$switch $_loctmp" ++} ++ ++ ++btpd() { ++ local cfg="$1" ++ args="" ++ directory="" ++ append_bool "$cfg" useipv4 "-4" ++ append_bool "$cfg" useipv6 "-6" ++ append_bool "$cfg" emptystart "--empty-start" ++ append_parm "$cfg" port "-p" ++ append_parm "$cfg" directory "-d" ++ append_parm "$cfg" maxpeers "--max-peers" ++ append_parm "$cfg" maxuploads "--max-uploads" ++ append_parm "$cfg" maxkbin "--bw-in" ++ append_parm "$cfg" maxkbout "--bw-out" ++ config_get directory "$cfg" directory ++} ++ ++start() { ++ config_load btpd ++ config_foreach btpd btpd ++ ++ service_start /usr/bin/btpd $args ++} ++ ++stop() { ++ config_load btpd ++ config_foreach btpd btpd ++ ++ [ -d $directory ] && args="-d $directory " ++ ++ while btcli $args kill ; do ++ sleep 3 ++ done 2>/dev/null ++ ++ service_stop /usr/bin/btpd ++} ++ +diff --git a/feeds/packages/net/btpd/patches/.svn/entries b/feeds/packages/net/btpd/patches/.svn/entries +new file mode 100644 +index 0000000..0094554 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/btpd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-22T03:33:49.574431Z ++24776 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-sha1.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4100b1656502b09eee090ce0e8b42d7f ++2010-12-22T03:33:49.574431Z ++24776 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++23004 ++ ++100-clock.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++86fc4236bc248de74239505e6af1e437 ++2010-12-22T03:33:49.574431Z ++24776 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++76 ++ ++002-config.h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++5d044fa0357e6a6c7cd9280e3634ffe8 ++2010-12-22T03:33:49.574431Z ++24776 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++219 ++ ++001-gettime.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++681748c405ca3af127a32c4026abe2c0 ++2010-12-22T03:33:49.574431Z ++24776 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++242 ++ +diff --git a/feeds/packages/net/btpd/patches/.svn/text-base/000-sha1.diff.svn-base b/feeds/packages/net/btpd/patches/.svn/text-base/000-sha1.diff.svn-base +new file mode 100644 +index 0000000..a6d8640 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/.svn/text-base/000-sha1.diff.svn-base +@@ -0,0 +1,731 @@ ++--- a/btpd/btpd.c +++++ b/btpd/btpd.c ++@@ -1,6 +1,6 @@ ++ #include "btpd.h" ++ ++-#include +++#include "sha1.h" ++ #include ++ ++ static uint8_t m_peer_id[20]; ++@@ -114,7 +114,7 @@ btpd_init(void) ++ idcon[sizeof(idcon) - 1] = '\0'; ++ n = strlen(idcon); ++ ++- SHA1(idcon, n, m_peer_id); +++ sha1_buffer(idcon, n, m_peer_id); ++ bcopy(m_peer_id, &seed, sizeof(seed)); ++ bcopy(BTPD_VERSION, m_peer_id, sizeof(BTPD_VERSION) - 1); ++ m_peer_id[sizeof(BTPD_VERSION) - 1] = '|'; ++--- a/btpd/content.c +++++ b/btpd/content.c ++@@ -1,6 +1,6 @@ ++ #include "btpd.h" ++ ++-#include +++#include "sha1.h" ++ #include ++ ++ struct content { ++@@ -60,16 +60,16 @@ static struct timeout m_workev; ++ static int ++ test_hash(struct torrent *tp, uint8_t *hash, uint32_t piece) ++ { ++- char piece_hash[SHA_DIGEST_LENGTH]; +++ char piece_hash[SHA1_DIGEST_SIZE]; ++ tlib_read_hash(tp->tl, tp->pieces_off, piece, piece_hash); ++- return bcmp(hash, piece_hash, SHA_DIGEST_LENGTH); +++ return bcmp(hash, piece_hash, SHA1_DIGEST_SIZE); ++ } ++ ++ static int ++ test_piece(struct torrent *tp, uint32_t piece, int *ok) ++ { ++ int err; ++- uint8_t hash[SHA_DIGEST_LENGTH]; +++ uint8_t hash[SHA1_DIGEST_SIZE]; ++ if ((err = bts_sha(tp->cm->rds, piece * tp->piece_length, ++ torrent_piece_size(tp, piece), hash)) != 0) { ++ btpd_log(BTPD_L_ERROR, "io error on '%s' (%s).\n", ++--- a/btpd/download_subr.c +++++ b/btpd/download_subr.c ++@@ -21,7 +21,7 @@ ++ ++ #include "btpd.h" ++ ++-#include +++#include "sha1.h" ++ #include ++ ++ static void ++@@ -42,7 +42,7 @@ piece_log_hashes(struct piece *pc) ++ for (unsigned i = 0; i < pc->nblocks; i++) { ++ uint32_t bsize = torrent_block_size(tp, pc->index, pc->nblocks, i); ++ cm_get_bytes(tp, pc->index, i * PIECE_BLOCKLEN, bsize, &buf); ++- SHA1(buf, bsize, &log->hashes[i * 20]); +++ sha1_buffer(buf, bsize, &log->hashes[i * 20]); ++ free(buf); ++ } ++ } ++--- a/btpd/torrent.c +++++ b/btpd/torrent.c ++@@ -1,7 +1,5 @@ ++ #include "btpd.h" ++ ++-#include ++- ++ #define SAVE_INTERVAL 300 ++ ++ static unsigned m_nghosts; ++--- a/configure.ac +++++ b/configure.ac ++@@ -29,13 +29,6 @@ rm -f conftest.c conftest.$OBJEXT ++ rm -f conftest.c conftest.$OBJEXT ++ [$3])) ++ ++-AC_ARG_WITH(openssl, ++-[ --with-openssl=dir use openssl installed in dir], ++-[ ++- AC_SUBST(openssl_LDFLAGS,["-L${withval}/lib -Wl,-R,${withval}/lib"]) ++- AC_SUBST(openssl_CPPFLAGS,"-I${withval}/include") ++-]) ++- ++ AC_ARG_WITH(evloop-method, ++ [ --with-evloop-method select evloop method (epoll,poll,kqueue)], ++ evloop_methods=$withval, ++@@ -76,11 +69,6 @@ CC_ARGS_OK_IFELSE(-Wno-pointer-sign, ++ , ++ AC_MSG_RESULT(no)) ++ ++-old_LDFLAGS="$LDFLAGS" ++-LDFLAGS="$LDFLAGS $openssl_LDFLAGS" ++-AC_CHECK_LIB(crypto, SHA1_Final,:,AC_MSG_FAILURE(btpd needs openssl's libraries and headers)) ++-LDFLAGS=$old_LDFLAGS ++- ++ for m in $evloop_methods; do ++ case $m in ++ epoll) ++--- a/misc/metainfo.c +++++ b/misc/metainfo.c ++@@ -6,8 +6,7 @@ ++ #include ++ #include ++ ++-#include ++- +++#include "sha1.h" ++ #include "benc.h" ++ #include "metainfo.h" ++ #include "subr.h" ++@@ -159,7 +158,7 @@ mi_info_hash(const char *p, uint8_t *has ++ if (hash == NULL) ++ if ((hash = malloc(20)) == NULL) ++ return NULL; ++- return SHA1(info, benc_length(info), hash); +++ return (uint8_t *)sha1_buffer(info, benc_length(info), hash); ++ } ++ ++ char * ++--- /dev/null +++++ b/misc/sha1.c ++@@ -0,0 +1,428 @@ +++/* sha1.c - Functions to compute SHA1 message digest of files or +++ memory blocks according to the NIST specification FIPS-180-1. +++ +++ Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free +++ Software Foundation, 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, 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. */ +++ +++/* Written by Scott G. Miller +++ Credits: +++ Robert Klep -- Expansion function fix +++*/ +++ +++#include +++ +++#include "sha1.h" +++ +++#include +++#include +++#include +++ +++#if USE_UNLOCKED_IO +++# include "unlocked-io.h" +++#endif +++ +++#ifdef WORDS_BIGENDIAN +++# define SWAP(n) (n) +++#else +++# define SWAP(n) \ +++ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +++#endif +++ +++#define BLOCKSIZE 32768 +++#if BLOCKSIZE % 64 != 0 +++# error "invalid BLOCKSIZE" +++#endif +++ +++/* This array contains the bytes used to pad the buffer to the next +++ 64-byte boundary. (RFC 1321, 3.1: Step 1) */ +++static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; +++ +++ +++/* Take a pointer to a 160 bit block of data (five 32 bit ints) and +++ initialize it to the start constants of the SHA1 algorithm. This +++ must be called before using hash in the call to sha1_hash. */ +++void +++sha1_init_ctx (struct sha1_ctx *ctx) +++{ +++ ctx->A = 0x67452301; +++ ctx->B = 0xefcdab89; +++ ctx->C = 0x98badcfe; +++ ctx->D = 0x10325476; +++ ctx->E = 0xc3d2e1f0; +++ +++ ctx->total[0] = ctx->total[1] = 0; +++ ctx->buflen = 0; +++} +++ +++/* Copy the 4 byte value from v into the memory location pointed to by *cp, +++ If your architecture allows unaligned access this is equivalent to +++ * (uint32_t *) cp = v */ +++static inline void +++set_uint32 (char *cp, uint32_t v) +++{ +++ memcpy (cp, &v, sizeof v); +++} +++ +++/* Put result from CTX in first 20 bytes following RESBUF. The result +++ must be in little endian byte order. */ +++void * +++sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf) +++{ +++ char *r = resbuf; +++ set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A)); +++ set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B)); +++ set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C)); +++ set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D)); +++ set_uint32 (r + 4 * sizeof ctx->E, SWAP (ctx->E)); +++ +++ return resbuf; +++} +++ +++/* Process the remaining bytes in the internal buffer and the usual +++ prolog according to the standard and write the result to RESBUF. */ +++void * +++sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf) +++{ +++ /* Take yet unprocessed bytes into account. */ +++ uint32_t bytes = ctx->buflen; +++ size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4; +++ +++ /* Now count remaining bytes. */ +++ ctx->total[0] += bytes; +++ if (ctx->total[0] < bytes) +++ ++ctx->total[1]; +++ +++ /* Put the 64-bit file length in *bits* at the end of the buffer. */ +++ ctx->buffer[size - 2] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29)); +++ ctx->buffer[size - 1] = SWAP (ctx->total[0] << 3); +++ +++ memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes); +++ +++ /* Process last bytes. */ +++ sha1_process_block (ctx->buffer, size * 4, ctx); +++ +++ return sha1_read_ctx (ctx, resbuf); +++} +++ +++/* Compute SHA1 message digest for bytes read from STREAM. The +++ resulting message digest number will be written into the 16 bytes +++ beginning at RESBLOCK. */ +++int +++sha1_stream (FILE *stream, void *resblock) +++{ +++ struct sha1_ctx ctx; +++ size_t sum; +++ +++ char *buffer = malloc (BLOCKSIZE + 72); +++ if (!buffer) +++ return 1; +++ +++ /* Initialize the computation context. */ +++ sha1_init_ctx (&ctx); +++ +++ /* Iterate over full file contents. */ +++ while (1) +++ { +++ /* We read the file in blocks of BLOCKSIZE bytes. One call of the +++ computation function processes the whole buffer so that with the +++ next round of the loop another block can be read. */ +++ size_t n; +++ sum = 0; +++ +++ /* Read block. Take care for partial reads. */ +++ while (1) +++ { +++ n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); +++ +++ sum += n; +++ +++ if (sum == BLOCKSIZE) +++ break; +++ +++ if (n == 0) +++ { +++ /* Check for the error flag IFF N == 0, so that we don't +++ exit the loop after a partial read due to e.g., EAGAIN +++ or EWOULDBLOCK. */ +++ if (ferror (stream)) +++ { +++ free (buffer); +++ return 1; +++ } +++ goto process_partial_block; +++ } +++ +++ /* We've read at least one byte, so ignore errors. But always +++ check for EOF, since feof may be true even though N > 0. +++ Otherwise, we could end up calling fread after EOF. */ +++ if (feof (stream)) +++ goto process_partial_block; +++ } +++ +++ /* Process buffer with BLOCKSIZE bytes. Note that +++ BLOCKSIZE % 64 == 0 +++ */ +++ sha1_process_block (buffer, BLOCKSIZE, &ctx); +++ } +++ +++ process_partial_block:; +++ +++ /* Process any remaining bytes. */ +++ if (sum > 0) +++ sha1_process_bytes (buffer, sum, &ctx); +++ +++ /* Construct result in desired memory. */ +++ sha1_finish_ctx (&ctx, resblock); +++ free (buffer); +++ return 0; +++} +++ +++/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The +++ result is always in little endian byte order, so that a byte-wise +++ output yields to the wanted ASCII representation of the message +++ digest. */ +++void * +++sha1_buffer (const char *buffer, size_t len, void *resblock) +++{ +++ struct sha1_ctx ctx; +++ +++ /* Initialize the computation context. */ +++ sha1_init_ctx (&ctx); +++ +++ /* Process whole buffer but last len % 64 bytes. */ +++ sha1_process_bytes (buffer, len, &ctx); +++ +++ /* Put result in desired memory area. */ +++ return sha1_finish_ctx (&ctx, resblock); +++} +++ +++void +++sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) +++{ +++ /* When we already have some bits in our internal buffer concatenate +++ both inputs first. */ +++ if (ctx->buflen != 0) +++ { +++ size_t left_over = ctx->buflen; +++ size_t add = 128 - left_over > len ? len : 128 - left_over; +++ +++ memcpy (&((char *) ctx->buffer)[left_over], buffer, add); +++ ctx->buflen += add; +++ +++ if (ctx->buflen > 64) +++ { +++ sha1_process_block (ctx->buffer, ctx->buflen & ~63, ctx); +++ +++ ctx->buflen &= 63; +++ /* The regions in the following copy operation cannot overlap. */ +++ memcpy (ctx->buffer, +++ &((char *) ctx->buffer)[(left_over + add) & ~63], +++ ctx->buflen); +++ } +++ +++ buffer = (const char *) buffer + add; +++ len -= add; +++ } +++ +++ /* Process available complete blocks. */ +++ if (len >= 64) +++ { +++#if !_STRING_ARCH_unaligned +++# define alignof(type) offsetof (struct { char c; type x; }, x) +++# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) +++ if (UNALIGNED_P (buffer)) +++ while (len > 64) +++ { +++ sha1_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx); +++ buffer = (const char *) buffer + 64; +++ len -= 64; +++ } +++ else +++#endif +++ { +++ sha1_process_block (buffer, len & ~63, ctx); +++ buffer = (const char *) buffer + (len & ~63); +++ len &= 63; +++ } +++ } +++ +++ /* Move remaining bytes in internal buffer. */ +++ if (len > 0) +++ { +++ size_t left_over = ctx->buflen; +++ +++ memcpy (&((char *) ctx->buffer)[left_over], buffer, len); +++ left_over += len; +++ if (left_over >= 64) +++ { +++ sha1_process_block (ctx->buffer, 64, ctx); +++ left_over -= 64; +++ memcpy (ctx->buffer, &ctx->buffer[16], left_over); +++ } +++ ctx->buflen = left_over; +++ } +++} +++ +++/* --- Code below is the primary difference between md5.c and sha1.c --- */ +++ +++/* SHA1 round constants */ +++#define K1 0x5a827999 +++#define K2 0x6ed9eba1 +++#define K3 0x8f1bbcdc +++#define K4 0xca62c1d6 +++ +++/* Round functions. Note that F2 is the same as F4. */ +++#define F1(B,C,D) ( D ^ ( B & ( C ^ D ) ) ) +++#define F2(B,C,D) (B ^ C ^ D) +++#define F3(B,C,D) ( ( B & C ) | ( D & ( B | C ) ) ) +++#define F4(B,C,D) (B ^ C ^ D) +++ +++/* Process LEN bytes of BUFFER, accumulating context into CTX. +++ It is assumed that LEN % 64 == 0. +++ Most of this code comes from GnuPG's cipher/sha1.c. */ +++ +++void +++sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx) +++{ +++ const uint32_t *words = buffer; +++ size_t nwords = len / sizeof (uint32_t); +++ const uint32_t *endp = words + nwords; +++ uint32_t x[16]; +++ uint32_t a = ctx->A; +++ uint32_t b = ctx->B; +++ uint32_t c = ctx->C; +++ uint32_t d = ctx->D; +++ uint32_t e = ctx->E; +++ +++ /* First increment the byte count. RFC 1321 specifies the possible +++ length of the file up to 2^64 bits. Here we only compute the +++ number of bytes. Do a double word increment. */ +++ ctx->total[0] += len; +++ if (ctx->total[0] < len) +++ ++ctx->total[1]; +++ +++#define rol(x, n) (((x) << (n)) | ((uint32_t) (x) >> (32 - (n)))) +++ +++#define M(I) ( tm = x[I&0x0f] ^ x[(I-14)&0x0f] \ +++ ^ x[(I-8)&0x0f] ^ x[(I-3)&0x0f] \ +++ , (x[I&0x0f] = rol(tm, 1)) ) +++ +++#define R(A,B,C,D,E,F,K,M) do { E += rol( A, 5 ) \ +++ + F( B, C, D ) \ +++ + K \ +++ + M; \ +++ B = rol( B, 30 ); \ +++ } while(0) +++ +++ while (words < endp) +++ { +++ uint32_t tm; +++ int t; +++ for (t = 0; t < 16; t++) +++ { +++ x[t] = SWAP (*words); +++ words++; +++ } +++ +++ R( a, b, c, d, e, F1, K1, x[ 0] ); +++ R( e, a, b, c, d, F1, K1, x[ 1] ); +++ R( d, e, a, b, c, F1, K1, x[ 2] ); +++ R( c, d, e, a, b, F1, K1, x[ 3] ); +++ R( b, c, d, e, a, F1, K1, x[ 4] ); +++ R( a, b, c, d, e, F1, K1, x[ 5] ); +++ R( e, a, b, c, d, F1, K1, x[ 6] ); +++ R( d, e, a, b, c, F1, K1, x[ 7] ); +++ R( c, d, e, a, b, F1, K1, x[ 8] ); +++ R( b, c, d, e, a, F1, K1, x[ 9] ); +++ R( a, b, c, d, e, F1, K1, x[10] ); +++ R( e, a, b, c, d, F1, K1, x[11] ); +++ R( d, e, a, b, c, F1, K1, x[12] ); +++ R( c, d, e, a, b, F1, K1, x[13] ); +++ R( b, c, d, e, a, F1, K1, x[14] ); +++ R( a, b, c, d, e, F1, K1, x[15] ); +++ R( e, a, b, c, d, F1, K1, M(16) ); +++ R( d, e, a, b, c, F1, K1, M(17) ); +++ R( c, d, e, a, b, F1, K1, M(18) ); +++ R( b, c, d, e, a, F1, K1, M(19) ); +++ R( a, b, c, d, e, F2, K2, M(20) ); +++ R( e, a, b, c, d, F2, K2, M(21) ); +++ R( d, e, a, b, c, F2, K2, M(22) ); +++ R( c, d, e, a, b, F2, K2, M(23) ); +++ R( b, c, d, e, a, F2, K2, M(24) ); +++ R( a, b, c, d, e, F2, K2, M(25) ); +++ R( e, a, b, c, d, F2, K2, M(26) ); +++ R( d, e, a, b, c, F2, K2, M(27) ); +++ R( c, d, e, a, b, F2, K2, M(28) ); +++ R( b, c, d, e, a, F2, K2, M(29) ); +++ R( a, b, c, d, e, F2, K2, M(30) ); +++ R( e, a, b, c, d, F2, K2, M(31) ); +++ R( d, e, a, b, c, F2, K2, M(32) ); +++ R( c, d, e, a, b, F2, K2, M(33) ); +++ R( b, c, d, e, a, F2, K2, M(34) ); +++ R( a, b, c, d, e, F2, K2, M(35) ); +++ R( e, a, b, c, d, F2, K2, M(36) ); +++ R( d, e, a, b, c, F2, K2, M(37) ); +++ R( c, d, e, a, b, F2, K2, M(38) ); +++ R( b, c, d, e, a, F2, K2, M(39) ); +++ R( a, b, c, d, e, F3, K3, M(40) ); +++ R( e, a, b, c, d, F3, K3, M(41) ); +++ R( d, e, a, b, c, F3, K3, M(42) ); +++ R( c, d, e, a, b, F3, K3, M(43) ); +++ R( b, c, d, e, a, F3, K3, M(44) ); +++ R( a, b, c, d, e, F3, K3, M(45) ); +++ R( e, a, b, c, d, F3, K3, M(46) ); +++ R( d, e, a, b, c, F3, K3, M(47) ); +++ R( c, d, e, a, b, F3, K3, M(48) ); +++ R( b, c, d, e, a, F3, K3, M(49) ); +++ R( a, b, c, d, e, F3, K3, M(50) ); +++ R( e, a, b, c, d, F3, K3, M(51) ); +++ R( d, e, a, b, c, F3, K3, M(52) ); +++ R( c, d, e, a, b, F3, K3, M(53) ); +++ R( b, c, d, e, a, F3, K3, M(54) ); +++ R( a, b, c, d, e, F3, K3, M(55) ); +++ R( e, a, b, c, d, F3, K3, M(56) ); +++ R( d, e, a, b, c, F3, K3, M(57) ); +++ R( c, d, e, a, b, F3, K3, M(58) ); +++ R( b, c, d, e, a, F3, K3, M(59) ); +++ R( a, b, c, d, e, F4, K4, M(60) ); +++ R( e, a, b, c, d, F4, K4, M(61) ); +++ R( d, e, a, b, c, F4, K4, M(62) ); +++ R( c, d, e, a, b, F4, K4, M(63) ); +++ R( b, c, d, e, a, F4, K4, M(64) ); +++ R( a, b, c, d, e, F4, K4, M(65) ); +++ R( e, a, b, c, d, F4, K4, M(66) ); +++ R( d, e, a, b, c, F4, K4, M(67) ); +++ R( c, d, e, a, b, F4, K4, M(68) ); +++ R( b, c, d, e, a, F4, K4, M(69) ); +++ R( a, b, c, d, e, F4, K4, M(70) ); +++ R( e, a, b, c, d, F4, K4, M(71) ); +++ R( d, e, a, b, c, F4, K4, M(72) ); +++ R( c, d, e, a, b, F4, K4, M(73) ); +++ R( b, c, d, e, a, F4, K4, M(74) ); +++ R( a, b, c, d, e, F4, K4, M(75) ); +++ R( e, a, b, c, d, F4, K4, M(76) ); +++ R( d, e, a, b, c, F4, K4, M(77) ); +++ R( c, d, e, a, b, F4, K4, M(78) ); +++ R( b, c, d, e, a, F4, K4, M(79) ); +++ +++ a = ctx->A += a; +++ b = ctx->B += b; +++ c = ctx->C += c; +++ d = ctx->D += d; +++ e = ctx->E += e; +++ } +++} ++--- /dev/null +++++ b/misc/sha1.h ++@@ -0,0 +1,92 @@ +++/* Declarations of functions and data types used for SHA1 sum +++ library functions. +++ Copyright (C) 2000, 2001, 2003, 2005, 2006, 2008, 2009, 2010 Free Software +++ Foundation, 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, 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. */ +++ +++#ifndef SHA1_H +++# define SHA1_H 1 +++ +++# include +++# include +++ +++# ifdef __cplusplus +++extern "C" { +++# endif +++ +++#define SHA1_DIGEST_SIZE 20 +++ +++/* Structure to save state of computation between the single steps. */ +++struct sha1_ctx +++{ +++ uint32_t A; +++ uint32_t B; +++ uint32_t C; +++ uint32_t D; +++ uint32_t E; +++ +++ uint32_t total[2]; +++ uint32_t buflen; +++ uint32_t buffer[32]; +++}; +++ +++ +++/* Initialize structure containing state of computation. */ +++extern void sha1_init_ctx (struct sha1_ctx *ctx); +++ +++/* Starting with the result of former calls of this function (or the +++ initialization function update the context for the next LEN bytes +++ starting at BUFFER. +++ It is necessary that LEN is a multiple of 64!!! */ +++extern void sha1_process_block (const void *buffer, size_t len, +++ struct sha1_ctx *ctx); +++ +++/* Starting with the result of former calls of this function (or the +++ initialization function update the context for the next LEN bytes +++ starting at BUFFER. +++ It is NOT required that LEN is a multiple of 64. */ +++extern void sha1_process_bytes (const void *buffer, size_t len, +++ struct sha1_ctx *ctx); +++ +++/* Process the remaining bytes in the buffer and put result from CTX +++ in first 20 bytes following RESBUF. The result is always in little +++ endian byte order, so that a byte-wise output yields to the wanted +++ ASCII representation of the message digest. */ +++extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf); +++ +++ +++/* Put result from CTX in first 20 bytes following RESBUF. The result is +++ always in little endian byte order, so that a byte-wise output yields +++ to the wanted ASCII representation of the message digest. */ +++extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf); +++ +++ +++/* Compute SHA1 message digest for bytes read from STREAM. The +++ resulting message digest number will be written into the 20 bytes +++ beginning at RESBLOCK. */ +++extern int sha1_stream (FILE *stream, void *resblock); +++ +++/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The +++ result is always in little endian byte order, so that a byte-wise +++ output yields to the wanted ASCII representation of the message +++ digest. */ +++extern void *sha1_buffer (const char *buffer, size_t len, void *resblock); +++ +++# ifdef __cplusplus +++} +++# endif +++ +++#endif ++--- a/misc/stream.c +++++ b/misc/stream.c ++@@ -5,7 +5,7 @@ ++ #include ++ #include ++ ++-#include +++#include "sha1.h" ++ ++ #include "metainfo.h" ++ #include "subr.h" ++@@ -161,21 +161,21 @@ bts_put(struct bt_stream *bts, off_t off ++ int ++ bts_sha(struct bt_stream *bts, off_t start, off_t length, uint8_t *hash) ++ { ++- SHA_CTX ctx; +++ struct sha1_ctx ctx; ++ char buf[SHAFILEBUF]; ++ size_t wantread; ++ int err = 0; ++ ++- SHA1_Init(&ctx); +++ sha1_init_ctx(&ctx); ++ while (length > 0) { ++ wantread = min(length, SHAFILEBUF); ++ if ((err = bts_get(bts, start, buf, wantread)) != 0) ++ break; ++ length -= wantread; ++ start += wantread; ++- SHA1_Update(&ctx, buf, wantread); +++ sha1_process_bytes(buf, wantread, &ctx); ++ } ++- SHA1_Final(hash, &ctx); +++ sha1_finish_ctx(&ctx, hash); ++ return err; ++ } ++ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,6 +1,6 @@ ++ AM_CFLAGS=-std=c99 -Wall @WARNNPS@ ++-AM_CPPFLAGS=-D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop @openssl_CPPFLAGS@ ++-AM_LDFLAGS=@openssl_LDFLAGS@ +++AM_CPPFLAGS=-D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop +++AM_LDFLAGS= ++ ++ bin_PROGRAMS=btpd/btpd cli/btcli cli/btinfo ++ noinst_LIBRARIES=misc/libmisc.a evloop/libevloop.a ++@@ -25,15 +25,15 @@ btpd_btpd_SOURCES=\ ++ btpd/upload.c btpd/upload.h\ ++ btpd/util.c ++ btpd_btpd_CFLAGS=@TD_CFLAGS@ $(AM_CFLAGS) ++-btpd_btpd_LDADD=@TD_LIBS@ misc/libmisc.a evloop/libevloop.a -lcrypto -lm @CLOCKLIB@ @INETLIBS@ +++btpd_btpd_LDADD=@TD_LIBS@ misc/libmisc.a evloop/libevloop.a -lm @CLOCKLIB@ @INETLIBS@ ++ ++ # btinfo ++ cli_btinfo_SOURCES=cli/btinfo.c ++-cli_btinfo_LDADD=misc/libmisc.a -lcrypto -lm +++cli_btinfo_LDADD=misc/libmisc.a -lm ++ ++ # btcli ++ cli_btcli_SOURCES=cli/btcli.c cli/btcli.h cli/add.c cli/del.c cli/list.c cli/kill.c cli/start.c cli/stop.c cli/stat.c ++-cli_btcli_LDADD=misc/libmisc.a -lcrypto -lm @INETLIBS@ +++cli_btcli_LDADD=misc/libmisc.a -lm @INETLIBS@ ++ ++ # libmisc ++ misc_libmisc_a_SOURCES=\ ++@@ -45,7 +45,8 @@ misc_libmisc_a_SOURCES=\ ++ misc/iobuf.c misc/iobuf.h\ ++ misc/queue.h\ ++ misc/stream.c misc/stream.h\ ++- misc/subr.c misc/subr.h +++ misc/subr.c misc/subr.h\ +++ misc/sha1.c misc/sha1.h ++ ++ # evloop ++ EXTRA_evloop_libevloop_a_SOURCES=evloop/epoll.c evloop/kqueue.c evloop/poll.c +diff --git a/feeds/packages/net/btpd/patches/.svn/text-base/001-gettime.patch.svn-base b/feeds/packages/net/btpd/patches/.svn/text-base/001-gettime.patch.svn-base +new file mode 100644 +index 0000000..012b95d +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/.svn/text-base/001-gettime.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/evloop/timer.c +++++ b/evloop/timer.c ++@@ -14,7 +14,7 @@ ++ int ++ evtimer_gettime(struct timespec *ts) ++ { ++- return clock_gettime(TIMER_CLOCK, ts); +++ return clock_gettime(CLOCK_REALTIME, ts); ++ } ++ ++ #elif defined(HAVE_MACH_ABSOLUTE_TIME) +diff --git a/feeds/packages/net/btpd/patches/.svn/text-base/002-config.h.patch.svn-base b/feeds/packages/net/btpd/patches/.svn/text-base/002-config.h.patch.svn-base +new file mode 100644 +index 0000000..1950030 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/.svn/text-base/002-config.h.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/misc/sha1.c +++++ b/misc/sha1.c ++@@ -23,7 +23,9 @@ ++ Robert Klep -- Expansion function fix ++ */ ++ ++-#include +++#ifdef HAVE_CONFIG_H +++# include +++#endif ++ ++ #include "sha1.h" ++ +diff --git a/feeds/packages/net/btpd/patches/.svn/text-base/100-clock.diff.svn-base b/feeds/packages/net/btpd/patches/.svn/text-base/100-clock.diff.svn-base +new file mode 100644 +index 0000000..223ef06 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/.svn/text-base/100-clock.diff.svn-base +@@ -0,0 +1,4 @@ ++--- /dev/null +++++ b/config.cache ++@@ -0,0 +1 @@ +++ac_cv_func_clock_gettime=no +diff --git a/feeds/packages/net/btpd/patches/000-sha1.diff b/feeds/packages/net/btpd/patches/000-sha1.diff +new file mode 100644 +index 0000000..a6d8640 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/000-sha1.diff +@@ -0,0 +1,731 @@ ++--- a/btpd/btpd.c +++++ b/btpd/btpd.c ++@@ -1,6 +1,6 @@ ++ #include "btpd.h" ++ ++-#include +++#include "sha1.h" ++ #include ++ ++ static uint8_t m_peer_id[20]; ++@@ -114,7 +114,7 @@ btpd_init(void) ++ idcon[sizeof(idcon) - 1] = '\0'; ++ n = strlen(idcon); ++ ++- SHA1(idcon, n, m_peer_id); +++ sha1_buffer(idcon, n, m_peer_id); ++ bcopy(m_peer_id, &seed, sizeof(seed)); ++ bcopy(BTPD_VERSION, m_peer_id, sizeof(BTPD_VERSION) - 1); ++ m_peer_id[sizeof(BTPD_VERSION) - 1] = '|'; ++--- a/btpd/content.c +++++ b/btpd/content.c ++@@ -1,6 +1,6 @@ ++ #include "btpd.h" ++ ++-#include +++#include "sha1.h" ++ #include ++ ++ struct content { ++@@ -60,16 +60,16 @@ static struct timeout m_workev; ++ static int ++ test_hash(struct torrent *tp, uint8_t *hash, uint32_t piece) ++ { ++- char piece_hash[SHA_DIGEST_LENGTH]; +++ char piece_hash[SHA1_DIGEST_SIZE]; ++ tlib_read_hash(tp->tl, tp->pieces_off, piece, piece_hash); ++- return bcmp(hash, piece_hash, SHA_DIGEST_LENGTH); +++ return bcmp(hash, piece_hash, SHA1_DIGEST_SIZE); ++ } ++ ++ static int ++ test_piece(struct torrent *tp, uint32_t piece, int *ok) ++ { ++ int err; ++- uint8_t hash[SHA_DIGEST_LENGTH]; +++ uint8_t hash[SHA1_DIGEST_SIZE]; ++ if ((err = bts_sha(tp->cm->rds, piece * tp->piece_length, ++ torrent_piece_size(tp, piece), hash)) != 0) { ++ btpd_log(BTPD_L_ERROR, "io error on '%s' (%s).\n", ++--- a/btpd/download_subr.c +++++ b/btpd/download_subr.c ++@@ -21,7 +21,7 @@ ++ ++ #include "btpd.h" ++ ++-#include +++#include "sha1.h" ++ #include ++ ++ static void ++@@ -42,7 +42,7 @@ piece_log_hashes(struct piece *pc) ++ for (unsigned i = 0; i < pc->nblocks; i++) { ++ uint32_t bsize = torrent_block_size(tp, pc->index, pc->nblocks, i); ++ cm_get_bytes(tp, pc->index, i * PIECE_BLOCKLEN, bsize, &buf); ++- SHA1(buf, bsize, &log->hashes[i * 20]); +++ sha1_buffer(buf, bsize, &log->hashes[i * 20]); ++ free(buf); ++ } ++ } ++--- a/btpd/torrent.c +++++ b/btpd/torrent.c ++@@ -1,7 +1,5 @@ ++ #include "btpd.h" ++ ++-#include ++- ++ #define SAVE_INTERVAL 300 ++ ++ static unsigned m_nghosts; ++--- a/configure.ac +++++ b/configure.ac ++@@ -29,13 +29,6 @@ rm -f conftest.c conftest.$OBJEXT ++ rm -f conftest.c conftest.$OBJEXT ++ [$3])) ++ ++-AC_ARG_WITH(openssl, ++-[ --with-openssl=dir use openssl installed in dir], ++-[ ++- AC_SUBST(openssl_LDFLAGS,["-L${withval}/lib -Wl,-R,${withval}/lib"]) ++- AC_SUBST(openssl_CPPFLAGS,"-I${withval}/include") ++-]) ++- ++ AC_ARG_WITH(evloop-method, ++ [ --with-evloop-method select evloop method (epoll,poll,kqueue)], ++ evloop_methods=$withval, ++@@ -76,11 +69,6 @@ CC_ARGS_OK_IFELSE(-Wno-pointer-sign, ++ , ++ AC_MSG_RESULT(no)) ++ ++-old_LDFLAGS="$LDFLAGS" ++-LDFLAGS="$LDFLAGS $openssl_LDFLAGS" ++-AC_CHECK_LIB(crypto, SHA1_Final,:,AC_MSG_FAILURE(btpd needs openssl's libraries and headers)) ++-LDFLAGS=$old_LDFLAGS ++- ++ for m in $evloop_methods; do ++ case $m in ++ epoll) ++--- a/misc/metainfo.c +++++ b/misc/metainfo.c ++@@ -6,8 +6,7 @@ ++ #include ++ #include ++ ++-#include ++- +++#include "sha1.h" ++ #include "benc.h" ++ #include "metainfo.h" ++ #include "subr.h" ++@@ -159,7 +158,7 @@ mi_info_hash(const char *p, uint8_t *has ++ if (hash == NULL) ++ if ((hash = malloc(20)) == NULL) ++ return NULL; ++- return SHA1(info, benc_length(info), hash); +++ return (uint8_t *)sha1_buffer(info, benc_length(info), hash); ++ } ++ ++ char * ++--- /dev/null +++++ b/misc/sha1.c ++@@ -0,0 +1,428 @@ +++/* sha1.c - Functions to compute SHA1 message digest of files or +++ memory blocks according to the NIST specification FIPS-180-1. +++ +++ Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free +++ Software Foundation, 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, 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. */ +++ +++/* Written by Scott G. Miller +++ Credits: +++ Robert Klep -- Expansion function fix +++*/ +++ +++#include +++ +++#include "sha1.h" +++ +++#include +++#include +++#include +++ +++#if USE_UNLOCKED_IO +++# include "unlocked-io.h" +++#endif +++ +++#ifdef WORDS_BIGENDIAN +++# define SWAP(n) (n) +++#else +++# define SWAP(n) \ +++ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) +++#endif +++ +++#define BLOCKSIZE 32768 +++#if BLOCKSIZE % 64 != 0 +++# error "invalid BLOCKSIZE" +++#endif +++ +++/* This array contains the bytes used to pad the buffer to the next +++ 64-byte boundary. (RFC 1321, 3.1: Step 1) */ +++static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; +++ +++ +++/* Take a pointer to a 160 bit block of data (five 32 bit ints) and +++ initialize it to the start constants of the SHA1 algorithm. This +++ must be called before using hash in the call to sha1_hash. */ +++void +++sha1_init_ctx (struct sha1_ctx *ctx) +++{ +++ ctx->A = 0x67452301; +++ ctx->B = 0xefcdab89; +++ ctx->C = 0x98badcfe; +++ ctx->D = 0x10325476; +++ ctx->E = 0xc3d2e1f0; +++ +++ ctx->total[0] = ctx->total[1] = 0; +++ ctx->buflen = 0; +++} +++ +++/* Copy the 4 byte value from v into the memory location pointed to by *cp, +++ If your architecture allows unaligned access this is equivalent to +++ * (uint32_t *) cp = v */ +++static inline void +++set_uint32 (char *cp, uint32_t v) +++{ +++ memcpy (cp, &v, sizeof v); +++} +++ +++/* Put result from CTX in first 20 bytes following RESBUF. The result +++ must be in little endian byte order. */ +++void * +++sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf) +++{ +++ char *r = resbuf; +++ set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A)); +++ set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B)); +++ set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C)); +++ set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D)); +++ set_uint32 (r + 4 * sizeof ctx->E, SWAP (ctx->E)); +++ +++ return resbuf; +++} +++ +++/* Process the remaining bytes in the internal buffer and the usual +++ prolog according to the standard and write the result to RESBUF. */ +++void * +++sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf) +++{ +++ /* Take yet unprocessed bytes into account. */ +++ uint32_t bytes = ctx->buflen; +++ size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4; +++ +++ /* Now count remaining bytes. */ +++ ctx->total[0] += bytes; +++ if (ctx->total[0] < bytes) +++ ++ctx->total[1]; +++ +++ /* Put the 64-bit file length in *bits* at the end of the buffer. */ +++ ctx->buffer[size - 2] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29)); +++ ctx->buffer[size - 1] = SWAP (ctx->total[0] << 3); +++ +++ memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes); +++ +++ /* Process last bytes. */ +++ sha1_process_block (ctx->buffer, size * 4, ctx); +++ +++ return sha1_read_ctx (ctx, resbuf); +++} +++ +++/* Compute SHA1 message digest for bytes read from STREAM. The +++ resulting message digest number will be written into the 16 bytes +++ beginning at RESBLOCK. */ +++int +++sha1_stream (FILE *stream, void *resblock) +++{ +++ struct sha1_ctx ctx; +++ size_t sum; +++ +++ char *buffer = malloc (BLOCKSIZE + 72); +++ if (!buffer) +++ return 1; +++ +++ /* Initialize the computation context. */ +++ sha1_init_ctx (&ctx); +++ +++ /* Iterate over full file contents. */ +++ while (1) +++ { +++ /* We read the file in blocks of BLOCKSIZE bytes. One call of the +++ computation function processes the whole buffer so that with the +++ next round of the loop another block can be read. */ +++ size_t n; +++ sum = 0; +++ +++ /* Read block. Take care for partial reads. */ +++ while (1) +++ { +++ n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); +++ +++ sum += n; +++ +++ if (sum == BLOCKSIZE) +++ break; +++ +++ if (n == 0) +++ { +++ /* Check for the error flag IFF N == 0, so that we don't +++ exit the loop after a partial read due to e.g., EAGAIN +++ or EWOULDBLOCK. */ +++ if (ferror (stream)) +++ { +++ free (buffer); +++ return 1; +++ } +++ goto process_partial_block; +++ } +++ +++ /* We've read at least one byte, so ignore errors. But always +++ check for EOF, since feof may be true even though N > 0. +++ Otherwise, we could end up calling fread after EOF. */ +++ if (feof (stream)) +++ goto process_partial_block; +++ } +++ +++ /* Process buffer with BLOCKSIZE bytes. Note that +++ BLOCKSIZE % 64 == 0 +++ */ +++ sha1_process_block (buffer, BLOCKSIZE, &ctx); +++ } +++ +++ process_partial_block:; +++ +++ /* Process any remaining bytes. */ +++ if (sum > 0) +++ sha1_process_bytes (buffer, sum, &ctx); +++ +++ /* Construct result in desired memory. */ +++ sha1_finish_ctx (&ctx, resblock); +++ free (buffer); +++ return 0; +++} +++ +++/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The +++ result is always in little endian byte order, so that a byte-wise +++ output yields to the wanted ASCII representation of the message +++ digest. */ +++void * +++sha1_buffer (const char *buffer, size_t len, void *resblock) +++{ +++ struct sha1_ctx ctx; +++ +++ /* Initialize the computation context. */ +++ sha1_init_ctx (&ctx); +++ +++ /* Process whole buffer but last len % 64 bytes. */ +++ sha1_process_bytes (buffer, len, &ctx); +++ +++ /* Put result in desired memory area. */ +++ return sha1_finish_ctx (&ctx, resblock); +++} +++ +++void +++sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) +++{ +++ /* When we already have some bits in our internal buffer concatenate +++ both inputs first. */ +++ if (ctx->buflen != 0) +++ { +++ size_t left_over = ctx->buflen; +++ size_t add = 128 - left_over > len ? len : 128 - left_over; +++ +++ memcpy (&((char *) ctx->buffer)[left_over], buffer, add); +++ ctx->buflen += add; +++ +++ if (ctx->buflen > 64) +++ { +++ sha1_process_block (ctx->buffer, ctx->buflen & ~63, ctx); +++ +++ ctx->buflen &= 63; +++ /* The regions in the following copy operation cannot overlap. */ +++ memcpy (ctx->buffer, +++ &((char *) ctx->buffer)[(left_over + add) & ~63], +++ ctx->buflen); +++ } +++ +++ buffer = (const char *) buffer + add; +++ len -= add; +++ } +++ +++ /* Process available complete blocks. */ +++ if (len >= 64) +++ { +++#if !_STRING_ARCH_unaligned +++# define alignof(type) offsetof (struct { char c; type x; }, x) +++# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) +++ if (UNALIGNED_P (buffer)) +++ while (len > 64) +++ { +++ sha1_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx); +++ buffer = (const char *) buffer + 64; +++ len -= 64; +++ } +++ else +++#endif +++ { +++ sha1_process_block (buffer, len & ~63, ctx); +++ buffer = (const char *) buffer + (len & ~63); +++ len &= 63; +++ } +++ } +++ +++ /* Move remaining bytes in internal buffer. */ +++ if (len > 0) +++ { +++ size_t left_over = ctx->buflen; +++ +++ memcpy (&((char *) ctx->buffer)[left_over], buffer, len); +++ left_over += len; +++ if (left_over >= 64) +++ { +++ sha1_process_block (ctx->buffer, 64, ctx); +++ left_over -= 64; +++ memcpy (ctx->buffer, &ctx->buffer[16], left_over); +++ } +++ ctx->buflen = left_over; +++ } +++} +++ +++/* --- Code below is the primary difference between md5.c and sha1.c --- */ +++ +++/* SHA1 round constants */ +++#define K1 0x5a827999 +++#define K2 0x6ed9eba1 +++#define K3 0x8f1bbcdc +++#define K4 0xca62c1d6 +++ +++/* Round functions. Note that F2 is the same as F4. */ +++#define F1(B,C,D) ( D ^ ( B & ( C ^ D ) ) ) +++#define F2(B,C,D) (B ^ C ^ D) +++#define F3(B,C,D) ( ( B & C ) | ( D & ( B | C ) ) ) +++#define F4(B,C,D) (B ^ C ^ D) +++ +++/* Process LEN bytes of BUFFER, accumulating context into CTX. +++ It is assumed that LEN % 64 == 0. +++ Most of this code comes from GnuPG's cipher/sha1.c. */ +++ +++void +++sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx) +++{ +++ const uint32_t *words = buffer; +++ size_t nwords = len / sizeof (uint32_t); +++ const uint32_t *endp = words + nwords; +++ uint32_t x[16]; +++ uint32_t a = ctx->A; +++ uint32_t b = ctx->B; +++ uint32_t c = ctx->C; +++ uint32_t d = ctx->D; +++ uint32_t e = ctx->E; +++ +++ /* First increment the byte count. RFC 1321 specifies the possible +++ length of the file up to 2^64 bits. Here we only compute the +++ number of bytes. Do a double word increment. */ +++ ctx->total[0] += len; +++ if (ctx->total[0] < len) +++ ++ctx->total[1]; +++ +++#define rol(x, n) (((x) << (n)) | ((uint32_t) (x) >> (32 - (n)))) +++ +++#define M(I) ( tm = x[I&0x0f] ^ x[(I-14)&0x0f] \ +++ ^ x[(I-8)&0x0f] ^ x[(I-3)&0x0f] \ +++ , (x[I&0x0f] = rol(tm, 1)) ) +++ +++#define R(A,B,C,D,E,F,K,M) do { E += rol( A, 5 ) \ +++ + F( B, C, D ) \ +++ + K \ +++ + M; \ +++ B = rol( B, 30 ); \ +++ } while(0) +++ +++ while (words < endp) +++ { +++ uint32_t tm; +++ int t; +++ for (t = 0; t < 16; t++) +++ { +++ x[t] = SWAP (*words); +++ words++; +++ } +++ +++ R( a, b, c, d, e, F1, K1, x[ 0] ); +++ R( e, a, b, c, d, F1, K1, x[ 1] ); +++ R( d, e, a, b, c, F1, K1, x[ 2] ); +++ R( c, d, e, a, b, F1, K1, x[ 3] ); +++ R( b, c, d, e, a, F1, K1, x[ 4] ); +++ R( a, b, c, d, e, F1, K1, x[ 5] ); +++ R( e, a, b, c, d, F1, K1, x[ 6] ); +++ R( d, e, a, b, c, F1, K1, x[ 7] ); +++ R( c, d, e, a, b, F1, K1, x[ 8] ); +++ R( b, c, d, e, a, F1, K1, x[ 9] ); +++ R( a, b, c, d, e, F1, K1, x[10] ); +++ R( e, a, b, c, d, F1, K1, x[11] ); +++ R( d, e, a, b, c, F1, K1, x[12] ); +++ R( c, d, e, a, b, F1, K1, x[13] ); +++ R( b, c, d, e, a, F1, K1, x[14] ); +++ R( a, b, c, d, e, F1, K1, x[15] ); +++ R( e, a, b, c, d, F1, K1, M(16) ); +++ R( d, e, a, b, c, F1, K1, M(17) ); +++ R( c, d, e, a, b, F1, K1, M(18) ); +++ R( b, c, d, e, a, F1, K1, M(19) ); +++ R( a, b, c, d, e, F2, K2, M(20) ); +++ R( e, a, b, c, d, F2, K2, M(21) ); +++ R( d, e, a, b, c, F2, K2, M(22) ); +++ R( c, d, e, a, b, F2, K2, M(23) ); +++ R( b, c, d, e, a, F2, K2, M(24) ); +++ R( a, b, c, d, e, F2, K2, M(25) ); +++ R( e, a, b, c, d, F2, K2, M(26) ); +++ R( d, e, a, b, c, F2, K2, M(27) ); +++ R( c, d, e, a, b, F2, K2, M(28) ); +++ R( b, c, d, e, a, F2, K2, M(29) ); +++ R( a, b, c, d, e, F2, K2, M(30) ); +++ R( e, a, b, c, d, F2, K2, M(31) ); +++ R( d, e, a, b, c, F2, K2, M(32) ); +++ R( c, d, e, a, b, F2, K2, M(33) ); +++ R( b, c, d, e, a, F2, K2, M(34) ); +++ R( a, b, c, d, e, F2, K2, M(35) ); +++ R( e, a, b, c, d, F2, K2, M(36) ); +++ R( d, e, a, b, c, F2, K2, M(37) ); +++ R( c, d, e, a, b, F2, K2, M(38) ); +++ R( b, c, d, e, a, F2, K2, M(39) ); +++ R( a, b, c, d, e, F3, K3, M(40) ); +++ R( e, a, b, c, d, F3, K3, M(41) ); +++ R( d, e, a, b, c, F3, K3, M(42) ); +++ R( c, d, e, a, b, F3, K3, M(43) ); +++ R( b, c, d, e, a, F3, K3, M(44) ); +++ R( a, b, c, d, e, F3, K3, M(45) ); +++ R( e, a, b, c, d, F3, K3, M(46) ); +++ R( d, e, a, b, c, F3, K3, M(47) ); +++ R( c, d, e, a, b, F3, K3, M(48) ); +++ R( b, c, d, e, a, F3, K3, M(49) ); +++ R( a, b, c, d, e, F3, K3, M(50) ); +++ R( e, a, b, c, d, F3, K3, M(51) ); +++ R( d, e, a, b, c, F3, K3, M(52) ); +++ R( c, d, e, a, b, F3, K3, M(53) ); +++ R( b, c, d, e, a, F3, K3, M(54) ); +++ R( a, b, c, d, e, F3, K3, M(55) ); +++ R( e, a, b, c, d, F3, K3, M(56) ); +++ R( d, e, a, b, c, F3, K3, M(57) ); +++ R( c, d, e, a, b, F3, K3, M(58) ); +++ R( b, c, d, e, a, F3, K3, M(59) ); +++ R( a, b, c, d, e, F4, K4, M(60) ); +++ R( e, a, b, c, d, F4, K4, M(61) ); +++ R( d, e, a, b, c, F4, K4, M(62) ); +++ R( c, d, e, a, b, F4, K4, M(63) ); +++ R( b, c, d, e, a, F4, K4, M(64) ); +++ R( a, b, c, d, e, F4, K4, M(65) ); +++ R( e, a, b, c, d, F4, K4, M(66) ); +++ R( d, e, a, b, c, F4, K4, M(67) ); +++ R( c, d, e, a, b, F4, K4, M(68) ); +++ R( b, c, d, e, a, F4, K4, M(69) ); +++ R( a, b, c, d, e, F4, K4, M(70) ); +++ R( e, a, b, c, d, F4, K4, M(71) ); +++ R( d, e, a, b, c, F4, K4, M(72) ); +++ R( c, d, e, a, b, F4, K4, M(73) ); +++ R( b, c, d, e, a, F4, K4, M(74) ); +++ R( a, b, c, d, e, F4, K4, M(75) ); +++ R( e, a, b, c, d, F4, K4, M(76) ); +++ R( d, e, a, b, c, F4, K4, M(77) ); +++ R( c, d, e, a, b, F4, K4, M(78) ); +++ R( b, c, d, e, a, F4, K4, M(79) ); +++ +++ a = ctx->A += a; +++ b = ctx->B += b; +++ c = ctx->C += c; +++ d = ctx->D += d; +++ e = ctx->E += e; +++ } +++} ++--- /dev/null +++++ b/misc/sha1.h ++@@ -0,0 +1,92 @@ +++/* Declarations of functions and data types used for SHA1 sum +++ library functions. +++ Copyright (C) 2000, 2001, 2003, 2005, 2006, 2008, 2009, 2010 Free Software +++ Foundation, 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, 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. */ +++ +++#ifndef SHA1_H +++# define SHA1_H 1 +++ +++# include +++# include +++ +++# ifdef __cplusplus +++extern "C" { +++# endif +++ +++#define SHA1_DIGEST_SIZE 20 +++ +++/* Structure to save state of computation between the single steps. */ +++struct sha1_ctx +++{ +++ uint32_t A; +++ uint32_t B; +++ uint32_t C; +++ uint32_t D; +++ uint32_t E; +++ +++ uint32_t total[2]; +++ uint32_t buflen; +++ uint32_t buffer[32]; +++}; +++ +++ +++/* Initialize structure containing state of computation. */ +++extern void sha1_init_ctx (struct sha1_ctx *ctx); +++ +++/* Starting with the result of former calls of this function (or the +++ initialization function update the context for the next LEN bytes +++ starting at BUFFER. +++ It is necessary that LEN is a multiple of 64!!! */ +++extern void sha1_process_block (const void *buffer, size_t len, +++ struct sha1_ctx *ctx); +++ +++/* Starting with the result of former calls of this function (or the +++ initialization function update the context for the next LEN bytes +++ starting at BUFFER. +++ It is NOT required that LEN is a multiple of 64. */ +++extern void sha1_process_bytes (const void *buffer, size_t len, +++ struct sha1_ctx *ctx); +++ +++/* Process the remaining bytes in the buffer and put result from CTX +++ in first 20 bytes following RESBUF. The result is always in little +++ endian byte order, so that a byte-wise output yields to the wanted +++ ASCII representation of the message digest. */ +++extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf); +++ +++ +++/* Put result from CTX in first 20 bytes following RESBUF. The result is +++ always in little endian byte order, so that a byte-wise output yields +++ to the wanted ASCII representation of the message digest. */ +++extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf); +++ +++ +++/* Compute SHA1 message digest for bytes read from STREAM. The +++ resulting message digest number will be written into the 20 bytes +++ beginning at RESBLOCK. */ +++extern int sha1_stream (FILE *stream, void *resblock); +++ +++/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The +++ result is always in little endian byte order, so that a byte-wise +++ output yields to the wanted ASCII representation of the message +++ digest. */ +++extern void *sha1_buffer (const char *buffer, size_t len, void *resblock); +++ +++# ifdef __cplusplus +++} +++# endif +++ +++#endif ++--- a/misc/stream.c +++++ b/misc/stream.c ++@@ -5,7 +5,7 @@ ++ #include ++ #include ++ ++-#include +++#include "sha1.h" ++ ++ #include "metainfo.h" ++ #include "subr.h" ++@@ -161,21 +161,21 @@ bts_put(struct bt_stream *bts, off_t off ++ int ++ bts_sha(struct bt_stream *bts, off_t start, off_t length, uint8_t *hash) ++ { ++- SHA_CTX ctx; +++ struct sha1_ctx ctx; ++ char buf[SHAFILEBUF]; ++ size_t wantread; ++ int err = 0; ++ ++- SHA1_Init(&ctx); +++ sha1_init_ctx(&ctx); ++ while (length > 0) { ++ wantread = min(length, SHAFILEBUF); ++ if ((err = bts_get(bts, start, buf, wantread)) != 0) ++ break; ++ length -= wantread; ++ start += wantread; ++- SHA1_Update(&ctx, buf, wantread); +++ sha1_process_bytes(buf, wantread, &ctx); ++ } ++- SHA1_Final(hash, &ctx); +++ sha1_finish_ctx(&ctx, hash); ++ return err; ++ } ++ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,6 +1,6 @@ ++ AM_CFLAGS=-std=c99 -Wall @WARNNPS@ ++-AM_CPPFLAGS=-D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop @openssl_CPPFLAGS@ ++-AM_LDFLAGS=@openssl_LDFLAGS@ +++AM_CPPFLAGS=-D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop +++AM_LDFLAGS= ++ ++ bin_PROGRAMS=btpd/btpd cli/btcli cli/btinfo ++ noinst_LIBRARIES=misc/libmisc.a evloop/libevloop.a ++@@ -25,15 +25,15 @@ btpd_btpd_SOURCES=\ ++ btpd/upload.c btpd/upload.h\ ++ btpd/util.c ++ btpd_btpd_CFLAGS=@TD_CFLAGS@ $(AM_CFLAGS) ++-btpd_btpd_LDADD=@TD_LIBS@ misc/libmisc.a evloop/libevloop.a -lcrypto -lm @CLOCKLIB@ @INETLIBS@ +++btpd_btpd_LDADD=@TD_LIBS@ misc/libmisc.a evloop/libevloop.a -lm @CLOCKLIB@ @INETLIBS@ ++ ++ # btinfo ++ cli_btinfo_SOURCES=cli/btinfo.c ++-cli_btinfo_LDADD=misc/libmisc.a -lcrypto -lm +++cli_btinfo_LDADD=misc/libmisc.a -lm ++ ++ # btcli ++ cli_btcli_SOURCES=cli/btcli.c cli/btcli.h cli/add.c cli/del.c cli/list.c cli/kill.c cli/start.c cli/stop.c cli/stat.c ++-cli_btcli_LDADD=misc/libmisc.a -lcrypto -lm @INETLIBS@ +++cli_btcli_LDADD=misc/libmisc.a -lm @INETLIBS@ ++ ++ # libmisc ++ misc_libmisc_a_SOURCES=\ ++@@ -45,7 +45,8 @@ misc_libmisc_a_SOURCES=\ ++ misc/iobuf.c misc/iobuf.h\ ++ misc/queue.h\ ++ misc/stream.c misc/stream.h\ ++- misc/subr.c misc/subr.h +++ misc/subr.c misc/subr.h\ +++ misc/sha1.c misc/sha1.h ++ ++ # evloop ++ EXTRA_evloop_libevloop_a_SOURCES=evloop/epoll.c evloop/kqueue.c evloop/poll.c +diff --git a/feeds/packages/net/btpd/patches/001-gettime.patch b/feeds/packages/net/btpd/patches/001-gettime.patch +new file mode 100644 +index 0000000..012b95d +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/001-gettime.patch +@@ -0,0 +1,11 @@ ++--- a/evloop/timer.c +++++ b/evloop/timer.c ++@@ -14,7 +14,7 @@ ++ int ++ evtimer_gettime(struct timespec *ts) ++ { ++- return clock_gettime(TIMER_CLOCK, ts); +++ return clock_gettime(CLOCK_REALTIME, ts); ++ } ++ ++ #elif defined(HAVE_MACH_ABSOLUTE_TIME) +diff --git a/feeds/packages/net/btpd/patches/002-config.h.patch b/feeds/packages/net/btpd/patches/002-config.h.patch +new file mode 100644 +index 0000000..1950030 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/002-config.h.patch +@@ -0,0 +1,13 @@ ++--- a/misc/sha1.c +++++ b/misc/sha1.c ++@@ -23,7 +23,9 @@ ++ Robert Klep -- Expansion function fix ++ */ ++ ++-#include +++#ifdef HAVE_CONFIG_H +++# include +++#endif ++ ++ #include "sha1.h" ++ +diff --git a/feeds/packages/net/btpd/patches/100-clock.diff b/feeds/packages/net/btpd/patches/100-clock.diff +new file mode 100644 +index 0000000..223ef06 +--- /dev/null ++++ b/feeds/packages/net/btpd/patches/100-clock.diff +@@ -0,0 +1,4 @@ ++--- /dev/null +++++ b/config.cache ++@@ -0,0 +1 @@ +++ac_cv_func_clock_gettime=no +diff --git a/feeds/packages/net/bwm/.svn/entries b/feeds/packages/net/bwm/.svn/entries +new file mode 100644 +index 0000000..017b3ab +--- /dev/null ++++ b/feeds/packages/net/bwm/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bwm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-26T14:21:59.110511Z ++16080 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++e2b7a18310dd3f99561b7e34df2ba9dd ++2009-05-26T14:21:59.110511Z ++16080 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++888 ++ +diff --git a/feeds/packages/net/bwm/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/bwm/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/bwm/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/bwm/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bwm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..17d2c30 +--- /dev/null ++++ b/feeds/packages/net/bwm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,38 @@ ++# ++# 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:=bwm ++PKG_VERSION:=1.1.0 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/bwm ++PKG_MD5SUM:=51021a036acb92d2bda0c0c0483f9552 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bwm ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A very tiny bandwidth monitor ++ URL:=http://ftp.debian.org/debian/pool/main/b/bwm ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(PKG_BUILD_DIR)/bwm.c -o $(PKG_BUILD_DIR)/bwm ++endef ++ ++define Package/bwm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bwm $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bwm)) +diff --git a/feeds/packages/net/bwm/Makefile b/feeds/packages/net/bwm/Makefile +new file mode 100644 +index 0000000..17d2c30 +--- /dev/null ++++ b/feeds/packages/net/bwm/Makefile +@@ -0,0 +1,38 @@ ++# ++# 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:=bwm ++PKG_VERSION:=1.1.0 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/bwm ++PKG_MD5SUM:=51021a036acb92d2bda0c0c0483f9552 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bwm ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A very tiny bandwidth monitor ++ URL:=http://ftp.debian.org/debian/pool/main/b/bwm ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(PKG_BUILD_DIR)/bwm.c -o $(PKG_BUILD_DIR)/bwm ++endef ++ ++define Package/bwm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bwm $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bwm)) +diff --git a/feeds/packages/net/bwm/patches/.svn/entries b/feeds/packages/net/bwm/patches/.svn/entries +new file mode 100644 +index 0000000..7acacae +--- /dev/null ++++ b/feeds/packages/net/bwm/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bwm/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-26T14:21:59.110511Z ++16080 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-debian.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++53ac041ed6599b8318b25fc9119d8600 ++2009-05-26T14:21:59.110511Z ++16080 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1342 ++ +diff --git a/feeds/packages/net/bwm/patches/.svn/text-base/001-debian.patch.svn-base b/feeds/packages/net/bwm/patches/.svn/text-base/001-debian.patch.svn-base +new file mode 100644 +index 0000000..043d862 +--- /dev/null ++++ b/feeds/packages/net/bwm/patches/.svn/text-base/001-debian.patch.svn-base +@@ -0,0 +1,45 @@ ++--- a/bwm.c +++++ b/bwm.c ++@@ -57,7 +57,8 @@ int main(int argc, char *argv[]) ++ char buffer[256]; ++ char *buffer_pointer; ++ ++- int inum; +++ int inum = -1; +++ int oldinum = -1; ++ int field_number; ++ int total_counter; ++ int sleep_time = 2; ++@@ -90,7 +91,13 @@ int main(int argc, char *argv[]) ++ ++ while(1) ++ { ++- printf("%c[H",27); +++ if (inum==oldinum) +++ { +++ printf("%c[H",27); +++ } else { +++ printf("%c[H%c[J",27,27); +++ oldinum = inum; +++ } ++ printf("Bandwidth Monitor 1.1.0\n\n"); ++ printf(" Iface RX(KB/sec) TX(KB/sec) Total(KB/sec)\n\n"); ++ ++@@ -138,7 +145,7 @@ int main(int argc, char *argv[]) ++ ++ interface[inum].rx_kbytes_dif = ++ (interface[inum].rx_bytes_new - ++- interface[inum].rx_bytes_old) * 1000 / 1024; +++ interface[inum].rx_bytes_old) / 1024 * 1000; ++ ++ interface[inum].rx_rate_whole = ++ interface[inum].rx_kbytes_dif / ++@@ -157,7 +164,7 @@ int main(int argc, char *argv[]) ++ ++ interface[inum].tx_kbytes_dif = ++ (interface[inum].tx_bytes_new - ++- interface[inum].tx_bytes_old) * 1000 / 1024; +++ interface[inum].tx_bytes_old) / 1024 * 1000; ++ ++ interface[inum].tx_rate_whole = ++ interface[inum].tx_kbytes_dif / +diff --git a/feeds/packages/net/bwm/patches/001-debian.patch b/feeds/packages/net/bwm/patches/001-debian.patch +new file mode 100644 +index 0000000..043d862 +--- /dev/null ++++ b/feeds/packages/net/bwm/patches/001-debian.patch +@@ -0,0 +1,45 @@ ++--- a/bwm.c +++++ b/bwm.c ++@@ -57,7 +57,8 @@ int main(int argc, char *argv[]) ++ char buffer[256]; ++ char *buffer_pointer; ++ ++- int inum; +++ int inum = -1; +++ int oldinum = -1; ++ int field_number; ++ int total_counter; ++ int sleep_time = 2; ++@@ -90,7 +91,13 @@ int main(int argc, char *argv[]) ++ ++ while(1) ++ { ++- printf("%c[H",27); +++ if (inum==oldinum) +++ { +++ printf("%c[H",27); +++ } else { +++ printf("%c[H%c[J",27,27); +++ oldinum = inum; +++ } ++ printf("Bandwidth Monitor 1.1.0\n\n"); ++ printf(" Iface RX(KB/sec) TX(KB/sec) Total(KB/sec)\n\n"); ++ ++@@ -138,7 +145,7 @@ int main(int argc, char *argv[]) ++ ++ interface[inum].rx_kbytes_dif = ++ (interface[inum].rx_bytes_new - ++- interface[inum].rx_bytes_old) * 1000 / 1024; +++ interface[inum].rx_bytes_old) / 1024 * 1000; ++ ++ interface[inum].rx_rate_whole = ++ interface[inum].rx_kbytes_dif / ++@@ -157,7 +164,7 @@ int main(int argc, char *argv[]) ++ ++ interface[inum].tx_kbytes_dif = ++ (interface[inum].tx_bytes_new - ++- interface[inum].tx_bytes_old) * 1000 / 1024; +++ interface[inum].tx_bytes_old) / 1024 * 1000; ++ ++ interface[inum].tx_rate_whole = ++ interface[inum].tx_kbytes_dif / +diff --git a/feeds/packages/net/bwping/.svn/entries b/feeds/packages/net/bwping/.svn/entries +new file mode 100644 +index 0000000..a28ac5e +--- /dev/null ++++ b/feeds/packages/net/bwping/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/bwping ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-03T21:05:42.202565Z ++27420 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++3860be026388c57c60dbcfa7c00c5b63 ++2011-07-03T21:05:42.202565Z ++27420 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1012 ++ +diff --git a/feeds/packages/net/bwping/.svn/text-base/Makefile.svn-base b/feeds/packages/net/bwping/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c63c46a +--- /dev/null ++++ b/feeds/packages/net/bwping/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=bwping ++PKG_VERSION:=1.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/bwping ++PKG_MD5SUM:=e5d2de8cf61791ad16713bd86609368f ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bwping ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Open Source bandwidth measurement tool ++ URL:=http://bwping.sourceforge.net ++endef ++ ++define Package/bwping/description ++ BWPing is a bandwidth measurement tool based on ICMP echo ++ request/reply. It is especially well suited for lossy links. BWPing ++ does not not require any special software on the remote host (only ++ the ability to respond on ICMP echo request messages). ++endef ++ ++define Package/bwping/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,bwping)) +diff --git a/feeds/packages/net/bwping/Makefile b/feeds/packages/net/bwping/Makefile +new file mode 100644 +index 0000000..c63c46a +--- /dev/null ++++ b/feeds/packages/net/bwping/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=bwping ++PKG_VERSION:=1.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/bwping ++PKG_MD5SUM:=e5d2de8cf61791ad16713bd86609368f ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bwping ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Open Source bandwidth measurement tool ++ URL:=http://bwping.sourceforge.net ++endef ++ ++define Package/bwping/description ++ BWPing is a bandwidth measurement tool based on ICMP echo ++ request/reply. It is especially well suited for lossy links. BWPing ++ does not not require any special software on the remote host (only ++ the ability to respond on ICMP echo request messages). ++endef ++ ++define Package/bwping/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,bwping)) +diff --git a/feeds/packages/net/cbtt/.svn/entries b/feeds/packages/net/cbtt/.svn/entries +new file mode 100644 +index 0000000..deeaa53 +--- /dev/null ++++ b/feeds/packages/net/cbtt/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cbtt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-04T17:01:59.563149Z ++32975 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++43a2db84cda832debd798e3771c43a31 ++2012-08-04T17:01:59.563149Z ++32975 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1815 ++ +diff --git a/feeds/packages/net/cbtt/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/cbtt/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/cbtt/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cbtt/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cbtt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..19f259b +--- /dev/null ++++ b/feeds/packages/net/cbtt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,84 @@ ++# 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:=cbtt ++PKG_VERSION:=20060727 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)80-$(PKG_VERSION)-src.tar.gz ++PKG_SOURCE_URL:=@SF/bnbtusermods ++PKG_MD5SUM:=d6edf0a11d7e68fa3d121e91308f22f5 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)80-$(PKG_VERSION)-src ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cbtt/Default ++ SUBMENU:=BitTorrent ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib ++ TITLE:=Bittorrent tracker ++ URL:=http://bnbtusermods.sourceforge.net/ ++endef ++ ++define Package/cbtt ++$(call Package/cbtt/Default) ++endef ++ ++define Package/cbtt-mysql ++$(call Package/cbtt/Default) ++ DEPENDS+= +libmysqlclient ++ TITLE+= (with mysql support) ++endef ++ ++ ++define Build/Template ++ ++$(STAMP_BUILT)-$(2): $(STAMP_PREPARED) ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LFLAGS="$(TARGET_LDFLAGS) -L. $(4) -lz -lm -lpthread" \ ++ $(3) ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(2) ++ ++define Package/$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(3) $$(1)/usr/bin/ ++endef ++ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_cbtt),) ++ define Build/without-mysql ++ $(call Build/Template,cbtt,without-mysql,bnbt,) ++ endef ++endif ++$(eval $(Build/without-mysql)) ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_cbtt-mysql),) ++ define Build/with-mysql ++ $(call Build/Template,cbtt-mysql,with-mysql,bnbtmysql, \ ++ -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient \ ++ ) ++ endef ++endif ++$(eval $(Build/with-mysql)) ++ ++$(eval $(call BuildPackage,cbtt)) ++$(eval $(call BuildPackage,cbtt-mysql)) +diff --git a/feeds/packages/net/cbtt/Makefile b/feeds/packages/net/cbtt/Makefile +new file mode 100644 +index 0000000..19f259b +--- /dev/null ++++ b/feeds/packages/net/cbtt/Makefile +@@ -0,0 +1,84 @@ ++# 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:=cbtt ++PKG_VERSION:=20060727 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)80-$(PKG_VERSION)-src.tar.gz ++PKG_SOURCE_URL:=@SF/bnbtusermods ++PKG_MD5SUM:=d6edf0a11d7e68fa3d121e91308f22f5 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)80-$(PKG_VERSION)-src ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cbtt/Default ++ SUBMENU:=BitTorrent ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib ++ TITLE:=Bittorrent tracker ++ URL:=http://bnbtusermods.sourceforge.net/ ++endef ++ ++define Package/cbtt ++$(call Package/cbtt/Default) ++endef ++ ++define Package/cbtt-mysql ++$(call Package/cbtt/Default) ++ DEPENDS+= +libmysqlclient ++ TITLE+= (with mysql support) ++endef ++ ++ ++define Build/Template ++ ++$(STAMP_BUILT)-$(2): $(STAMP_PREPARED) ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LFLAGS="$(TARGET_LDFLAGS) -L. $(4) -lz -lm -lpthread" \ ++ $(3) ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(2) ++ ++define Package/$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(3) $$(1)/usr/bin/ ++endef ++ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_cbtt),) ++ define Build/without-mysql ++ $(call Build/Template,cbtt,without-mysql,bnbt,) ++ endef ++endif ++$(eval $(Build/without-mysql)) ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_cbtt-mysql),) ++ define Build/with-mysql ++ $(call Build/Template,cbtt-mysql,with-mysql,bnbtmysql, \ ++ -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient \ ++ ) ++ endef ++endif ++$(eval $(Build/with-mysql)) ++ ++$(eval $(call BuildPackage,cbtt)) ++$(eval $(call BuildPackage,cbtt-mysql)) +diff --git a/feeds/packages/net/cbtt/patches/.svn/entries b/feeds/packages/net/cbtt/patches/.svn/entries +new file mode 100644 +index 0000000..202da1f +--- /dev/null ++++ b/feeds/packages/net/cbtt/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cbtt/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-08-27T21:45:30.269058Z ++8510 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++d65f5b41ca43d6de76c3f22b521bd001 ++2007-08-27T21:45:30.269058Z ++8510 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1044 ++ +diff --git a/feeds/packages/net/cbtt/patches/.svn/prop-base/100-compile.patch.svn-base b/feeds/packages/net/cbtt/patches/.svn/prop-base/100-compile.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cbtt/patches/.svn/prop-base/100-compile.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cbtt/patches/.svn/text-base/100-compile.patch.svn-base b/feeds/packages/net/cbtt/patches/.svn/text-base/100-compile.patch.svn-base +new file mode 100644 +index 0000000..4181d8d +--- /dev/null ++++ b/feeds/packages/net/cbtt/patches/.svn/text-base/100-compile.patch.svn-base +@@ -0,0 +1,35 @@ ++Index: cbtt80-20060727-src/Makefile ++=================================================================== ++--- cbtt80-20060727-src.orig/Makefile 2007-08-27 23:41:22.000000000 +0200 +++++ cbtt80-20060727-src/Makefile 2007-08-27 23:41:22.000000000 +0200 ++@@ -1,6 +1,5 @@ ++ SHELL = /bin/sh ++ SYSTEM = $(shell uname) ++-C++ = g++ ++ DFLAGS = ++ OFLAGS = -O2 -w ++ LFLAGS = -L. -lz ++@@ -42,19 +41,19 @@ ++ all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) ++ ++ ./bnbt: $(OBJS) $(OBJS_BNBT) ++- $(C++) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS) +++ $(CXX) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS) ++ ++ ./bnbtmysql: $(OBJS) $(OBJS_BNBTMYSQL) ++- $(C++) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) -L/usr/lib/mysql -lmysqlclient +++ $(CXX) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) ++ ++ clean: ++ rm -f $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) ++ ++ %.o: %.cpp ++- $(C++) -o $@ $(CFLAGS) -c $< +++ $(CXX) -o $@ $(CFLAGS) -c $< ++ ++ %.mysql.o: %.cpp ++- $(C++) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $< +++ $(CXX) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $< ++ ++ ./bnbt: $(OBJS) $(OBJS_BNBT) ++ +diff --git a/feeds/packages/net/cbtt/patches/100-compile.patch b/feeds/packages/net/cbtt/patches/100-compile.patch +new file mode 100644 +index 0000000..4181d8d +--- /dev/null ++++ b/feeds/packages/net/cbtt/patches/100-compile.patch +@@ -0,0 +1,35 @@ ++Index: cbtt80-20060727-src/Makefile ++=================================================================== ++--- cbtt80-20060727-src.orig/Makefile 2007-08-27 23:41:22.000000000 +0200 +++++ cbtt80-20060727-src/Makefile 2007-08-27 23:41:22.000000000 +0200 ++@@ -1,6 +1,5 @@ ++ SHELL = /bin/sh ++ SYSTEM = $(shell uname) ++-C++ = g++ ++ DFLAGS = ++ OFLAGS = -O2 -w ++ LFLAGS = -L. -lz ++@@ -42,19 +41,19 @@ ++ all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) ++ ++ ./bnbt: $(OBJS) $(OBJS_BNBT) ++- $(C++) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS) +++ $(CXX) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS) ++ ++ ./bnbtmysql: $(OBJS) $(OBJS_BNBTMYSQL) ++- $(C++) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) -L/usr/lib/mysql -lmysqlclient +++ $(CXX) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) ++ ++ clean: ++ rm -f $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) ++ ++ %.o: %.cpp ++- $(C++) -o $@ $(CFLAGS) -c $< +++ $(CXX) -o $@ $(CFLAGS) -c $< ++ ++ %.mysql.o: %.cpp ++- $(C++) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $< +++ $(CXX) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $< ++ ++ ./bnbt: $(OBJS) $(OBJS_BNBT) ++ +diff --git a/feeds/packages/net/cdp/.svn/entries b/feeds/packages/net/cdp/.svn/entries +new file mode 100644 +index 0000000..d814fd8 +--- /dev/null ++++ b/feeds/packages/net/cdp/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cdp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-28T14:20:22.248808Z ++16138 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++b3b65d10ff61d7aaf7f0a00d2f4cd9ec ++2009-05-28T14:20:22.248808Z ++16138 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1254 ++ +diff --git a/feeds/packages/net/cdp/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cdp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..676a3b6 +--- /dev/null ++++ b/feeds/packages/net/cdp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=cdp-tools ++PKG_VERSION:=20070302 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=cdp-tools.tar.gz ++PKG_SOURCE_URL:=http://gpl.internetconnection.net/files/ ++PKG_MD5SUM:=94e3a355a5c82a2a5b14114d1f9b0599 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_BUILD_DEPENDS:=+libpcap +libnet1 ++ ++ ++define Package/cdp-tools ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=CDP tools (CISCO) ++ URL:=http://gpl.internetconnection.net ++ DEPENDS:=+libpcap ++endef ++ ++define Package/dhcpcd/description ++ Tools to work with the Cisco Discovery Protocol (CDP) ++endef ++ ++define Build/Compile ++ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/pcap -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ all ++endef ++ ++ ++define Package/cdp-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/{cdp-send,cdp-listen,cdp-routemgr} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,cdp-tools)) +diff --git a/feeds/packages/net/cdp/Makefile b/feeds/packages/net/cdp/Makefile +new file mode 100644 +index 0000000..676a3b6 +--- /dev/null ++++ b/feeds/packages/net/cdp/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=cdp-tools ++PKG_VERSION:=20070302 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=cdp-tools.tar.gz ++PKG_SOURCE_URL:=http://gpl.internetconnection.net/files/ ++PKG_MD5SUM:=94e3a355a5c82a2a5b14114d1f9b0599 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_BUILD_DEPENDS:=+libpcap +libnet1 ++ ++ ++define Package/cdp-tools ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=CDP tools (CISCO) ++ URL:=http://gpl.internetconnection.net ++ DEPENDS:=+libpcap ++endef ++ ++define Package/dhcpcd/description ++ Tools to work with the Cisco Discovery Protocol (CDP) ++endef ++ ++define Build/Compile ++ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/pcap -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ all ++endef ++ ++ ++define Package/cdp-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/{cdp-send,cdp-listen,cdp-routemgr} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,cdp-tools)) +diff --git a/feeds/packages/net/cdp/patches/.svn/entries b/feeds/packages/net/cdp/patches/.svn/entries +new file mode 100644 +index 0000000..3fb5964 +--- /dev/null ++++ b/feeds/packages/net/cdp/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cdp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-28T14:20:22.248808Z ++16138 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-compile_fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++9255fb9b6dc46b903b71600df2d4b855 ++2009-05-28T14:20:22.248808Z ++16138 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++507 ++ +diff --git a/feeds/packages/net/cdp/patches/.svn/text-base/001-compile_fixes.patch.svn-base b/feeds/packages/net/cdp/patches/.svn/text-base/001-compile_fixes.patch.svn-base +new file mode 100644 +index 0000000..90be6df +--- /dev/null ++++ b/feeds/packages/net/cdp/patches/.svn/text-base/001-compile_fixes.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/Makefile.orig 2006-10-26 20:58:35.000000000 +0300 +++++ b/Makefile 2009-05-22 18:20:44.000000000 +0300 ++@@ -1,7 +1,6 @@ ++-CFLAGS += $(shell libnet-config --cflags --defines) ++-all: cdp-listen cdp-send +++all: cdp-send cdp-listen ++ ++-cdp-listen: cdp-listen.o -lpcap ++-cdp-send: cdp-send.o $(shell libnet-config --libs) +++cdp-listen: cdp-listen.o $(STAGING_DIR)/usr/lib/libpcap.so +++cdp-send: cdp-send.o $(STAGING_DIR)/usr/lib/libnet-1.1.x/lib/libnet.a ++ ++ clean:; rm -f cdp-send.o cdp-send cdp-listen.o cdp-listen +diff --git a/feeds/packages/net/cdp/patches/001-compile_fixes.patch b/feeds/packages/net/cdp/patches/001-compile_fixes.patch +new file mode 100644 +index 0000000..90be6df +--- /dev/null ++++ b/feeds/packages/net/cdp/patches/001-compile_fixes.patch +@@ -0,0 +1,13 @@ ++--- a/Makefile.orig 2006-10-26 20:58:35.000000000 +0300 +++++ b/Makefile 2009-05-22 18:20:44.000000000 +0300 ++@@ -1,7 +1,6 @@ ++-CFLAGS += $(shell libnet-config --cflags --defines) ++-all: cdp-listen cdp-send +++all: cdp-send cdp-listen ++ ++-cdp-listen: cdp-listen.o -lpcap ++-cdp-send: cdp-send.o $(shell libnet-config --libs) +++cdp-listen: cdp-listen.o $(STAGING_DIR)/usr/lib/libpcap.so +++cdp-send: cdp-send.o $(STAGING_DIR)/usr/lib/libnet-1.1.x/lib/libnet.a ++ ++ clean:; rm -f cdp-send.o cdp-send cdp-listen.o cdp-listen +diff --git a/feeds/packages/net/chaosvpn/.svn/entries b/feeds/packages/net/chaosvpn/.svn/entries +new file mode 100644 +index 0000000..f76c984 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chaosvpn ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:15:40.084804Z ++29056 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++d162642d4093b222463a77a6d71d4b12 ++2011-11-13T22:15:40.084804Z ++29056 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1469 ++ +diff --git a/feeds/packages/net/chaosvpn/.svn/text-base/Makefile.svn-base b/feeds/packages/net/chaosvpn/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..48e79a8 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 2010-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:=chaosvpn ++PKG_VERSION:=2.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz ++PKG_SOURCE_URL:=http://github.com/downloads/ryd/chaosvpn/ ++PKG_MD5SUM:=4263202d65bf4ab0d1356b149d7c53af ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/chaosvpn ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Config generator for chaos vpn ++ SUBMENU:=VPN ++ DEPENDS:=+ip +tinc +kmod-tun +libopenssl ++ URL:=https://wiki.hamburg.ccc.de/index.php/ChaosVPN::DebianHowto ++ MAINTAINER:=Christopher J. Pilkington ++endef ++ ++define Package/chaosvpn/description ++ Configure tincd for the chaosvpn network ++endef ++ ++MAKE_FLAGS += \ ++ COPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" ++ ++define Package/chaosvpn/install ++ $(INSTALL_DIR) $(1)/etc/tinc/chaos/ $(1)/usr/sbin/ $(1)/etc/init.d/ $(1)/etc/hotplug.d/iface/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/chaosvpn $(1)/usr/sbin/ ++ #$(INSTALL_DATA) $(PKG_BUILD_DIR)/chaosvpn.conf $(1)/etc/tinc/ ++ sed -e 's/"\/sbin\/ip /"\/usr\/sbin\/ip /' <$(PKG_BUILD_DIR)/chaosvpn.conf >$(1)/etc/tinc/chaosvpn.conf ++ $(INSTALL_BIN) ./files/chaosvpn_config.sh $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/chaosvpn.init $(1)/etc/init.d/chaosvpn ++ $(INSTALL_BIN) ./files/chaosvpn.hotplug $(1)/etc/hotplug.d/iface/40-chaosvpn ++endef ++ ++$(eval $(call BuildPackage,chaosvpn)) ++ +diff --git a/feeds/packages/net/chaosvpn/Makefile b/feeds/packages/net/chaosvpn/Makefile +new file mode 100644 +index 0000000..48e79a8 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/Makefile +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 2010-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:=chaosvpn ++PKG_VERSION:=2.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz ++PKG_SOURCE_URL:=http://github.com/downloads/ryd/chaosvpn/ ++PKG_MD5SUM:=4263202d65bf4ab0d1356b149d7c53af ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/chaosvpn ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Config generator for chaos vpn ++ SUBMENU:=VPN ++ DEPENDS:=+ip +tinc +kmod-tun +libopenssl ++ URL:=https://wiki.hamburg.ccc.de/index.php/ChaosVPN::DebianHowto ++ MAINTAINER:=Christopher J. Pilkington ++endef ++ ++define Package/chaosvpn/description ++ Configure tincd for the chaosvpn network ++endef ++ ++MAKE_FLAGS += \ ++ COPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" ++ ++define Package/chaosvpn/install ++ $(INSTALL_DIR) $(1)/etc/tinc/chaos/ $(1)/usr/sbin/ $(1)/etc/init.d/ $(1)/etc/hotplug.d/iface/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/chaosvpn $(1)/usr/sbin/ ++ #$(INSTALL_DATA) $(PKG_BUILD_DIR)/chaosvpn.conf $(1)/etc/tinc/ ++ sed -e 's/"\/sbin\/ip /"\/usr\/sbin\/ip /' <$(PKG_BUILD_DIR)/chaosvpn.conf >$(1)/etc/tinc/chaosvpn.conf ++ $(INSTALL_BIN) ./files/chaosvpn_config.sh $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/chaosvpn.init $(1)/etc/init.d/chaosvpn ++ $(INSTALL_BIN) ./files/chaosvpn.hotplug $(1)/etc/hotplug.d/iface/40-chaosvpn ++endef ++ ++$(eval $(call BuildPackage,chaosvpn)) ++ +diff --git a/feeds/packages/net/chaosvpn/files/.svn/entries b/feeds/packages/net/chaosvpn/files/.svn/entries +new file mode 100644 +index 0000000..d2aafe2 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chaosvpn/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:15:40.084804Z ++29056 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++chaosvpn_config.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++cfb7b419c2e0b24420ff5cdb7c1c6e2a ++2010-08-29T12:38:00.611371Z ++22831 ++ryd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++345 ++ ++chaosvpn.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++443d9f3d0cb5912938797486ab61ec85 ++2010-08-29T12:38:00.611371Z ++22831 ++ryd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++93 ++ ++chaosvpn.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++faeca0480de2ce94fd8af64166f00446 ++2011-11-13T22:15:40.084804Z ++29056 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++327 ++ +diff --git a/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn.hotplug.svn-base b/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn.hotplug.svn-base +new file mode 100644 +index 0000000..3044e53 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn.hotplug.svn-base +@@ -0,0 +1,3 @@ ++[ "$INTERFACE" == "wan" ] || return ++[ "$ACTION" == "ifup" ] && /etc/init.d/chaosvpn restart ++ +diff --git a/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn.init.svn-base b/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn.init.svn-base +new file mode 100644 +index 0000000..d415f5d +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn.init.svn-base +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++ ++START=99 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() ++{ ++ /usr/sbin/chaosvpn_config.sh ++ [ $? = 0 ] || { ++ logger "not starting chaosvpn, check your config" ++ exit 1 ++ } ++ service_start /usr/sbin/chaosvpn -f -c /etc/tinc/chaosvpn.conf ++} ++ ++stop() ++{ ++ service_stop /usr/sbin/chaosvpn ++} +diff --git a/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn_config.sh.svn-base b/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn_config.sh.svn-base +new file mode 100644 +index 0000000..6b3b273 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/.svn/text-base/chaosvpn_config.sh.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++[ -f "/etc/tinc/chaos/rsa_key.pub" -a -f "/etc/tinc/chaos/rsa_key.priv" ] || { ++ echo "please generate rsa key pair" ++ echo "tincd -n chaos --generate-keys=2048" ++ exit 1 ++} ++ ++C=`grep unconfigured_please_change_me /etc/tinc/chaosvpn.conf | wc -l` ++[ "$C" = "0" ] || { ++ echo "/etc/tinc/chaosvpn.conf is not configured yet" ++ exit 1 ++} ++exit 0 +diff --git a/feeds/packages/net/chaosvpn/files/chaosvpn.hotplug b/feeds/packages/net/chaosvpn/files/chaosvpn.hotplug +new file mode 100644 +index 0000000..3044e53 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/chaosvpn.hotplug +@@ -0,0 +1,3 @@ ++[ "$INTERFACE" == "wan" ] || return ++[ "$ACTION" == "ifup" ] && /etc/init.d/chaosvpn restart ++ +diff --git a/feeds/packages/net/chaosvpn/files/chaosvpn.init b/feeds/packages/net/chaosvpn/files/chaosvpn.init +new file mode 100644 +index 0000000..d415f5d +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/chaosvpn.init +@@ -0,0 +1,21 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++ ++START=99 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() ++{ ++ /usr/sbin/chaosvpn_config.sh ++ [ $? = 0 ] || { ++ logger "not starting chaosvpn, check your config" ++ exit 1 ++ } ++ service_start /usr/sbin/chaosvpn -f -c /etc/tinc/chaosvpn.conf ++} ++ ++stop() ++{ ++ service_stop /usr/sbin/chaosvpn ++} +diff --git a/feeds/packages/net/chaosvpn/files/chaosvpn_config.sh b/feeds/packages/net/chaosvpn/files/chaosvpn_config.sh +new file mode 100644 +index 0000000..6b3b273 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/files/chaosvpn_config.sh +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++[ -f "/etc/tinc/chaos/rsa_key.pub" -a -f "/etc/tinc/chaos/rsa_key.priv" ] || { ++ echo "please generate rsa key pair" ++ echo "tincd -n chaos --generate-keys=2048" ++ exit 1 ++} ++ ++C=`grep unconfigured_please_change_me /etc/tinc/chaosvpn.conf | wc -l` ++[ "$C" = "0" ] || { ++ echo "/etc/tinc/chaosvpn.conf is not configured yet" ++ exit 1 ++} ++exit 0 +diff --git a/feeds/packages/net/chaosvpn/patches/.svn/entries b/feeds/packages/net/chaosvpn/patches/.svn/entries +new file mode 100644 +index 0000000..232af8d +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chaosvpn/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-08-26T22:27:08.482651Z ++22820 ++ryd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-dist-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++19b36a082c3ae3fcad7892e83e9a8b1b ++2010-08-26T22:27:08.482651Z ++22820 ++ryd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++793 ++ +diff --git a/feeds/packages/net/chaosvpn/patches/.svn/text-base/001-dist-makefile.patch.svn-base b/feeds/packages/net/chaosvpn/patches/.svn/text-base/001-dist-makefile.patch.svn-base +new file mode 100644 +index 0000000..00b1d88 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/patches/.svn/text-base/001-dist-makefile.patch.svn-base +@@ -0,0 +1,30 @@ ++--- a/Makefile 2010-07-17 14:20:07.000000000 -0400 +++++ b/Makefile 2010-07-17 18:50:30.000000000 -0400 ++@@ -1,10 +1,7 @@ ++-CC?=gcc ++-INCLUDES?=-I/usr/local/include ++-LIBDIRS?=-L/usr/local/lib ++-CFLAGS?=-std=c99 -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -Wall -g $(INCLUDES) ++-LIB?=-lz -lcrypto ++-LEX?=flex ++-YACC?=yacc +++CC := gcc +++LIBS := -lssl -lz -lcrypto +++LEX := flex +++YACC := yacc ++ ++ PREFIX?=/usr ++ TINCDIR?=/etc/tinc ++@@ -21,10 +18,10 @@ ++ GITDEBVERSION=$(shell debian/scripts/calcdebversion ) ++ ++ $(NAME): main.o $(OBJ) $(HEADERS) ++- $(CC) -o $@ main.o $(OBJ) $(LIB) $(LIBDIRS) +++ $(CC) $(COPT) -o $@ main.o $(OBJ) $(LIBS) $(LIB) ++ ++ %.o: %.c $(HEADERS) ++- $(CC) $(CFLAGS) -o $(patsubst %.c,%.o,$<) -c $< +++ $(CC) $(COPT) -o $(patsubst %.c,%.o,$<) -c $< ++ ++ lex.yy.o: lex.yy.c y.tab.h ++ +diff --git a/feeds/packages/net/chaosvpn/patches/001-dist-makefile.patch b/feeds/packages/net/chaosvpn/patches/001-dist-makefile.patch +new file mode 100644 +index 0000000..00b1d88 +--- /dev/null ++++ b/feeds/packages/net/chaosvpn/patches/001-dist-makefile.patch +@@ -0,0 +1,30 @@ ++--- a/Makefile 2010-07-17 14:20:07.000000000 -0400 +++++ b/Makefile 2010-07-17 18:50:30.000000000 -0400 ++@@ -1,10 +1,7 @@ ++-CC?=gcc ++-INCLUDES?=-I/usr/local/include ++-LIBDIRS?=-L/usr/local/lib ++-CFLAGS?=-std=c99 -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -Wall -g $(INCLUDES) ++-LIB?=-lz -lcrypto ++-LEX?=flex ++-YACC?=yacc +++CC := gcc +++LIBS := -lssl -lz -lcrypto +++LEX := flex +++YACC := yacc ++ ++ PREFIX?=/usr ++ TINCDIR?=/etc/tinc ++@@ -21,10 +18,10 @@ ++ GITDEBVERSION=$(shell debian/scripts/calcdebversion ) ++ ++ $(NAME): main.o $(OBJ) $(HEADERS) ++- $(CC) -o $@ main.o $(OBJ) $(LIB) $(LIBDIRS) +++ $(CC) $(COPT) -o $@ main.o $(OBJ) $(LIBS) $(LIB) ++ ++ %.o: %.c $(HEADERS) ++- $(CC) $(CFLAGS) -o $(patsubst %.c,%.o,$<) -c $< +++ $(CC) $(COPT) -o $(patsubst %.c,%.o,$<) -c $< ++ ++ lex.yy.o: lex.yy.c y.tab.h ++ +diff --git a/feeds/packages/net/chillispot/.svn/entries b/feeds/packages/net/chillispot/.svn/entries +new file mode 100644 +index 0000000..1507eb2 +--- /dev/null ++++ b/feeds/packages/net/chillispot/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chillispot ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3a5fdf75182448f552d1b36925102c1d ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1541 ++ +diff --git a/feeds/packages/net/chillispot/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/chillispot/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/chillispot/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/chillispot/.svn/text-base/Makefile.svn-base b/feeds/packages/net/chillispot/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..42769b2 +--- /dev/null ++++ b/feeds/packages/net/chillispot/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=chillispot ++PKG_VERSION:=1.1.0 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.chillispot.info/download ++PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/chillispot ++ SUBMENU:=Captive Portals ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-tun ++ TITLE:=Wireless LAN HotSpot controller ++ URL:=http://www.chillispot.info/ ++endef ++ ++define Package/chillispot/description ++ ChilliSpot is an open source captive portal or wireless LAN ++ access point controller. It is used for authenticating users ++ of a wireless LAN. It supports web based login 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/chillispot/conffiles ++/etc/chilli.conf ++endef ++ ++# uses GNU configure ++ ++define Package/chillispot/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,chillispot)) +diff --git a/feeds/packages/net/chillispot/Makefile b/feeds/packages/net/chillispot/Makefile +new file mode 100644 +index 0000000..42769b2 +--- /dev/null ++++ b/feeds/packages/net/chillispot/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=chillispot ++PKG_VERSION:=1.1.0 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.chillispot.info/download ++PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/chillispot ++ SUBMENU:=Captive Portals ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-tun ++ TITLE:=Wireless LAN HotSpot controller ++ URL:=http://www.chillispot.info/ ++endef ++ ++define Package/chillispot/description ++ ChilliSpot is an open source captive portal or wireless LAN ++ access point controller. It is used for authenticating users ++ of a wireless LAN. It supports web based login 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/chillispot/conffiles ++/etc/chilli.conf ++endef ++ ++# uses GNU configure ++ ++define Package/chillispot/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/chilli ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/chilli.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,chillispot)) +diff --git a/feeds/packages/net/chillispot/files/.svn/entries b/feeds/packages/net/chillispot/files/.svn/entries +new file mode 100644 +index 0000000..d08d270 +--- /dev/null ++++ b/feeds/packages/net/chillispot/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chillispot/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T15:45:55.253911Z ++31951 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++chillispot.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++5ae129e67b57493245b2110512cd594a ++2012-05-28T15:45:55.253911Z ++31951 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++315 ++ +diff --git a/feeds/packages/net/chillispot/files/.svn/prop-base/chillispot.init.svn-base b/feeds/packages/net/chillispot/files/.svn/prop-base/chillispot.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/chillispot/files/.svn/prop-base/chillispot.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/chillispot/files/.svn/text-base/chillispot.init.svn-base b/feeds/packages/net/chillispot/files/.svn/text-base/chillispot.init.svn-base +new file mode 100644 +index 0000000..3fbba8d +--- /dev/null ++++ b/feeds/packages/net/chillispot/files/.svn/text-base/chillispot.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2012 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++SERVICE_PID_FILE=/var/run/chilli.pid ++ ++start() { ++ . /lib/functions/network.sh ++ ++ local ipaddr ++ network_get_ipaddr ipaddr lan && \ ++ service_start /usr/sbin/chilli --dns1="$ipaddr" ++} ++ ++stop() { ++ service_stop /usr/sbin/chilli ++} +diff --git a/feeds/packages/net/chillispot/files/chillispot.init b/feeds/packages/net/chillispot/files/chillispot.init +new file mode 100644 +index 0000000..3fbba8d +--- /dev/null ++++ b/feeds/packages/net/chillispot/files/chillispot.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2012 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++SERVICE_PID_FILE=/var/run/chilli.pid ++ ++start() { ++ . /lib/functions/network.sh ++ ++ local ipaddr ++ network_get_ipaddr ipaddr lan && \ ++ service_start /usr/sbin/chilli --dns1="$ipaddr" ++} ++ ++stop() { ++ service_stop /usr/sbin/chilli ++} +diff --git a/feeds/packages/net/chillispot/patches/.svn/entries b/feeds/packages/net/chillispot/patches/.svn/entries +new file mode 100644 +index 0000000..46acd65 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chillispot/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-27T12:53:12.789771Z ++25751 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-gcc_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d2f6f5925a115bc007d77664288f2f47 ++2009-10-20T09:12:21.143708Z ++18096 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2373 ++ ++001-endian_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9811ffab06f719c0efcabed2c58bce3e ++2007-09-26T21:34:16.383817Z ++9041 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3779 ++ ++150-chillispot-rmtctrl.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d1a2fcae38090f62b940513265fa42be ++2011-02-27T12:53:12.789771Z ++25751 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++58717 ++ ++120-fix_bufferoverflow.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3751dc54366557aa9d946f943efdcf50 ++2009-01-31T03:23:21.225402Z ++14295 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++266 ++ ++110-macallowed_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++aef17e4a5b96786a175d87c9e0e24a98 ++2008-12-11T11:31:23.817221Z ++13592 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++820 ++ ++102-less_memory-footprint.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++80d9fe3248dcf16f6cd2f6b607db228c ++2007-07-03T00:53:27.437485Z ++7859 ++epilog ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++768 ++ +diff --git a/feeds/packages/net/chillispot/patches/.svn/text-base/001-endian_fix.patch.svn-base b/feeds/packages/net/chillispot/patches/.svn/text-base/001-endian_fix.patch.svn-base +new file mode 100644 +index 0000000..7bc100e +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/text-base/001-endian_fix.patch.svn-base +@@ -0,0 +1,135 @@ ++Index: chillispot-1.1.0/src/dhcp.c ++=================================================================== ++--- chillispot-1.1.0.orig/src/dhcp.c 2006-09-24 19:48:25.000000000 +0200 +++++ chillispot-1.1.0/src/dhcp.c 2007-09-25 15:35:12.521055038 +0200 ++@@ -116,6 +116,24 @@ ++ #endif ++ ++ +++/* +++ * BrainSlayer: +++ * wrapper for fixing the big endian bugs within dhcp server code.its surelly not the best. +++ * all dhcp packet fields must be handled in little endian +++ */ +++ +++static uint16_t swap16(uint16_t word) { +++#if __BYTE_ORDER == __BIG_ENDIAN +++ unsigned char low = word>>8; +++ unsigned char high = word&0xff; +++ return ((uint16_t)(high<<8))|low; +++#elif __BYTE_ORDER == __LITTLE_ENDIAN +++ return word; +++#else +++#error "Could not determine the system's endianness" +++#endif +++} +++ ++ /** ++ * dhcp_ip_check() ++ * Generates an IPv4 header checksum. ++@@ -125,11 +143,11 @@ ++ uint32_t sum = 0; ++ pack->iph.check = 0; ++ for (i=0; i<(pack->iph.ihl * 2); i++) { ++- sum += ((uint16_t*) &pack->iph)[i]; +++ sum += swap16(((uint16_t*) &pack->iph)[i]); /* brainslayer */ ++ } ++ while (sum>>16) ++ sum = (sum & 0xFFFF)+(sum >> 16); ++- pack->iph.check = ~sum; +++ pack->iph.check = swap16(~sum); /* brainslayer */ ++ return 0; ++ } ++ ++@@ -152,27 +170,28 @@ ++ } ++ ++ /* Sum UDP header and payload */ +++ ++ for (i=0; i<(udp_len/2); i++) { ++- sum += ((uint16_t*) &pack->udph)[i]; +++ sum += swap16(((uint16_t*) &pack->udph)[i]); /* brainslayer */ ++ } ++ ++- /* Sum any uneven payload octet */ +++ ++ if (udp_len & 0x01) { ++ sum += ((uint8_t*) &pack->udph)[udp_len-1]; ++ } ++ ++ /* Sum both source and destination address */ ++ for (i=0; i<4; i++) { ++- sum += ((uint16_t*) &pack->iph.saddr)[i]; +++ sum += swap16(((uint16_t*) &pack->iph.saddr)[i]); /* brainslayer */ ++ } ++ ++ /* Sum both protocol and udp_len (again) */ ++- sum = sum + pack->udph.len + ((pack->iph.protocol<<8)&0xFF00); +++ sum = sum + swap16(pack->udph.len) + ((pack->iph.protocol<<8)&0xFF00); /* brainslayer */ ++ ++ while (sum>>16) ++ sum = (sum & 0xFFFF)+(sum >> 16); ++ ++- pack->udph.check = ~sum; +++ pack->udph.check = swap16(~sum); /* brainslayer */ ++ ++ return 0; ++ } ++@@ -201,7 +220,7 @@ ++ ++ /* Sum TCP header and payload */ ++ for (i=0; i<(tcp_len/2); i++) { ++- sum += ((uint16_t*) pack->payload)[i]; +++ sum += swap16(((uint16_t*) pack->payload)[i]); /* brainslayer */ ++ } ++ ++ /* Sum any uneven payload octet */ ++@@ -211,16 +230,16 @@ ++ ++ /* Sum both source and destination address */ ++ for (i=0; i<4; i++) { ++- sum += ((uint16_t*) &pack->iph.saddr)[i]; +++ sum += swap16(((uint16_t*) &pack->iph.saddr)[i]); /* brainslayer */ ++ } ++ ++ /* Sum both protocol and tcp_len */ ++- sum = sum + htons(tcp_len) + ((pack->iph.protocol<<8)&0xFF00); +++ sum = sum + swap16(htons(tcp_len)) + ((pack->iph.protocol<<8)&0xFF00); /* brainslayer */ ++ ++ while (sum>>16) ++ sum = (sum & 0xFFFF)+(sum >> 16); ++ ++- tcph->check = ~sum; +++ tcph->check = swap16(~sum); /* brainslayer */ ++ ++ return 0; ++ } ++Index: chillispot-1.1.0/src/dhcp.h ++=================================================================== ++--- chillispot-1.1.0.orig/src/dhcp.h 2006-09-24 19:48:25.000000000 +0200 +++++ chillispot-1.1.0/src/dhcp.h 2007-09-25 15:35:12.533055724 +0200 ++@@ -119,6 +119,8 @@ ++ uint16_t prot; ++ }; ++ +++#include +++ ++ /* Constants for IP packet */ ++ #define DHCP_IP_ALEN 4 ++ #define DHCP_IP_HLEN 20 ++@@ -127,8 +129,15 @@ ++ #define DHCP_IP_UDP 17 /* UDP Protocol number */ ++ ++ struct dhcp_iphdr_t { +++#if __BYTE_ORDER == __LITTLE_ENDIAN /* nbd fix for swapped version and length field */ ++ uint8_t ihl:4; ++ uint8_t version:4; +++#elif __BYTE_ORDER == __BIG_ENDIAN +++ uint8_t version:4; +++ uint8_t ihl:4; +++#else +++#error "Could not determine the system's endianness" +++#endif ++ uint8_t tos; ++ uint16_t tot_len; ++ uint16_t id; +diff --git a/feeds/packages/net/chillispot/patches/.svn/text-base/102-less_memory-footprint.patch.svn-base b/feeds/packages/net/chillispot/patches/.svn/text-base/102-less_memory-footprint.patch.svn-base +new file mode 100644 +index 0000000..b0a6c9c +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/text-base/102-less_memory-footprint.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -baurN --exclude='*~' --exclude='.#*' --exclude='.svn*' --exclude='.conf*' --exclude=dl --exclude=bin --exclude=build_mipsel --exclude=staging_dir_mipsel --exclude=toolchain_build_mipsel --exclude=package/config --exclude=autom4te.cache --exclude='*.tgz' --exclude='*.zip' --exclude='*.tar' --exclude='*.gz' --exclude='.tmp*' chillispot-1.1.0.orig/src/chilli.h chillispot-1.1.0/src/chilli.h ++--- chillispot-1.1.0.orig/src/chilli.h 2006-10-19 00:01:55.000000000 +0100 +++++ chillispot-1.1.0/src/chilli.h 2006-12-19 00:02:16.000000000 +0100 ++@@ -53,7 +53,7 @@ ++ /* #define COUNT_DOWNLINK_DROP 1 */ ++ /* #define COUNT_UPLINK_DROP 1 */ ++ ++-#define APP_NUM_CONN 1024 +++#define APP_NUM_CONN 128 ++ #define EAP_LEN 2048 /* TODO: Rather large */ ++ ++ #define MACOK_MAX 16 +diff --git a/feeds/packages/net/chillispot/patches/.svn/text-base/110-macallowed_fix.patch.svn-base b/feeds/packages/net/chillispot/patches/.svn/text-base/110-macallowed_fix.patch.svn-base +new file mode 100644 +index 0000000..8567fc8 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/text-base/110-macallowed_fix.patch.svn-base +@@ -0,0 +1,21 @@ ++diff -r -u chillispot-1.1.0/src/chilli.c chillispot-1.1.0-macallowed/src/chilli.c ++--- chillispot-1.1.0/src/chilli.c 2006-09-24 19:48:25.000000000 +0200 +++++ chillispot-1.1.0-macallowed/src/chilli.c 2008-07-18 07:58:03.000000000 +0200 ++@@ -534,6 +534,8 @@ ++ } ++ } ++ free(p3); +++ +++ return 0; ++ } ++ ++ int static process_options(int argc, char **argv, int firsttime) { ++@@ -2991,7 +2993,7 @@ ++ ++ /* Get Service Type */ ++ if (!radius_getattr(pack, &stateattr, RADIUS_ATTR_SERVICE_TYPE, 0, 0, 0)) { ++- if(ntohl(attr->v.i) == RADIUS_SERVICE_TYPE_CHILLISPOT_AUTHORIZE_ONLY) { +++ if(ntohl(stateattr->v.i) == RADIUS_SERVICE_TYPE_CHILLISPOT_AUTHORIZE_ONLY) { ++ sys_err(LOG_ERR, __FILE__, __LINE__, 0, ++ "Chillispot-Authorize-Only Service-Type in Access-Accept"); ++ return dnprot_reject(appconn); +diff --git a/feeds/packages/net/chillispot/patches/.svn/text-base/120-fix_bufferoverflow.patch.svn-base b/feeds/packages/net/chillispot/patches/.svn/text-base/120-fix_bufferoverflow.patch.svn-base +new file mode 100644 +index 0000000..abc293b +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/text-base/120-fix_bufferoverflow.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/src/radius.c +++++ b/src/radius.c ++@@ -1002,7 +1002,7 @@ int radius_pwencode(struct radius_t *thi ++ } ++ ++ /* Copy first 128 octets of src into dst */ ++- if (srclen <= 128) +++ if (srclen > 128) ++ memcpy(dst, src, 128); ++ else ++ memcpy(dst, src, srclen); +diff --git a/feeds/packages/net/chillispot/patches/.svn/text-base/150-chillispot-rmtctrl.patch.svn-base b/feeds/packages/net/chillispot/patches/.svn/text-base/150-chillispot-rmtctrl.patch.svn-base +new file mode 100644 +index 0000000..db5df95 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/text-base/150-chillispot-rmtctrl.patch.svn-base +@@ -0,0 +1,1529 @@ ++--- a/src/chilli.c +++++ b/src/chilli.c ++@@ -102,6 +102,7 @@ ++ #include "dhcp.h" ++ #include "cmdline.h" ++ #include "chilli.h" +++#include "remotectrl.h" ++ ++ struct options_t options; ++ ++@@ -127,6 +128,12 @@ static int do_sighup = 0; ++ /* Forward declarations */ ++ int static acct_req(struct app_conn_t *conn, int status_type); ++ int static config_radius(); +++void admin_disconnect(struct app_conn_t *appconn, int terminateCause); +++void admin_authorize(struct app_conn_t *appconn); +++int send_acct_head( struct rmt_socket_t *client, struct app_conn_t *appconn); +++int send_Connection( struct rmt_socket_t *client, struct app_conn_t *appconn ); +++int send_Acct_Setting ( struct rmt_socket_t *client, struct app_conn_t *appconn ); +++int send_Accounting( struct rmt_socket_t *client, struct app_conn_t *appconn ); ++ ++ /* Fireman catches falling childs and eliminates zombies */ ++ void static fireman(int signum) { ++@@ -180,19 +187,18 @@ int static leaky_bucket(struct app_conn_ ++ struct timeval timenow; ++ uint64_t timediff; /* In microseconds */ ++ int result = 0; ++- ++ ++ gettimeofday(&timenow, NULL); ++ ++ timediff = (timenow.tv_sec - conn->last_time.tv_sec) * ((uint64_t) 1000000); ++ timediff += (timenow.tv_usec - conn->last_time.tv_usec); ++ ++- /* if (options.debug) printf("Leaky bucket timediff: %lld, bucketup: %d, bucketdown: %d %d %d\n", ++- timediff, conn->bucketup, conn->bucketdown, ++- octetsup, octetsdown);*/ ++- ++- if (conn->bandwidthmaxup) { +++/* if (options.debug) +++ printf("Leaky bucket timediff: %lld, bucketup: %d, bucketdown: %d %d %d\n", +++ timediff, conn->bucketup, conn->bucketdown, octetsup, octetsdown); +++*/ ++ +++ if (conn->bandwidthmaxup) { ++ /* Subtract what the leak since last time we visited */ ++ if (conn->bucketup > ((timediff * conn->bandwidthmaxup)/8000000)) { ++ conn->bucketup -= (timediff * conn->bandwidthmaxup) / 8000000; ++@@ -200,9 +206,9 @@ int static leaky_bucket(struct app_conn_ ++ else { ++ conn->bucketup = 0; ++ } ++- +++// printf("octetsup: %d -> conn->bucketup+octetsup: %d > conn->bucketupsize: %d \n", octetsup, conn->bucketup + octetsup, conn->bucketupsize); ++ if ((conn->bucketup + octetsup) > conn->bucketupsize) { ++- /*if (options.debug) printf("Leaky bucket deleting uplink packet\n");*/ +++ if (options.debug) printf("Leaky bucket deleting uplink packet\n"); ++ result = -1; ++ } ++ else { ++@@ -217,9 +223,10 @@ int static leaky_bucket(struct app_conn_ ++ else { ++ conn->bucketdown = 0; ++ } +++// printf("octetsdown: %d -> conn->bucketdown+octetsdown: %d > conn->bucketdownsize: %d \n", octetsdown, conn->bucketdown + octetsdown, conn->bucketdownsize); ++ ++ if ((conn->bucketdown + octetsdown) > conn->bucketdownsize) { ++- /*if (options.debug) printf("Leaky bucket deleting downlink packet\n");*/ +++ if (options.debug) printf("Leaky bucket deleting downlink packet\n"); ++ result = -1; ++ } ++ else { ++@@ -233,6 +240,7 @@ int static leaky_bucket(struct app_conn_ ++ } ++ #endif /* ifndef NO_LEAKY_BUCKET */ ++ +++ ++ /* Run external script */ ++ ++ int set_env(char *name, char *value, int len, struct in_addr *addr, ++@@ -550,7 +558,7 @@ int static process_options(int argc, cha ++ return -1; ++ } ++ ++- if (cmdline_parser_configfile (args_info.conf_arg, &args_info, 0, 0, 0)) { +++ if (cmdline_parser_configfile (args_info.conf_arg, &args_info, 0, 0, 0)) { ++ sys_err(LOG_ERR, __FILE__, __LINE__, 0, ++ "Failed to parse configuration file: %s!", ++ args_info.conf_arg); ++@@ -1056,7 +1064,21 @@ int static process_options(int argc, cha ++ strlen(args_info.macallowed_arg[numargs]))) ++ return -1; ++ } ++- +++ /* remote monitor */ +++ /* Defaults to net plus 1 */ +++ if (!args_info.rmtlisten_arg) +++ options.rmtlisten.s_addr = options.uamlisten.s_addr; +++ else +++ if (!inet_aton(args_info.rmtlisten_arg, &options.rmtlisten)){ +++ sys_err(LOG_ERR, __FILE__, __LINE__, 0, +++ "Invalid Remote monitor IP address: %s!", args_info.rmtlisten_arg); +++ return -1; +++ } +++ /* rmtport */ +++ options.rmtport = args_info.rmtport_arg; +++ options.rmtpasswd = args_info.rmtpasswd_arg; +++ options.bandwidthmaxup = args_info.bandwidthmaxup_arg; +++ options.bandwidthmaxdown = args_info.bandwidthmaxdown_arg; ++ ++ /* foreground */ ++ /* If flag not given run as a daemon */ ++@@ -1095,7 +1117,6 @@ void static reprocess_options(int argc, ++ memcpy(&options, &options2, sizeof(options)); ++ return; ++ } ++- ++ /* Options which we do not allow to be affected */ ++ /* fg, conf and statedir are not stored in options */ ++ options.net = options2.net; /* net */ ++@@ -1123,6 +1144,13 @@ void static reprocess_options(int argc, ++ options.eapolenable = options2.eapolenable; /* eapolenable */ ++ options.pidfile = options2.pidfile; /* pidfile */ ++ +++ options.rmtlisten = options2.rmtlisten; /* remote listen */ +++ options.rmtport = options2.rmtport; /* remote port */ +++ options.rmtpasswd = options2.rmtpasswd; /* remote password */ +++ +++// options.bandwidthmaxup = options2.bandwidthmaxup; /* remote password */ +++// options.bandwidthmaxdown = options2.bandwidthmaxdown; /* remote password */ +++ ++ /* Reinit DHCP parameters */ ++ (void) dhcp_set(dhcp, (options.debug & DEBUG_DHCP), ++ options.uamserver, options.uamserverlen, options.uamanydns, ++@@ -3099,9 +3127,8 @@ int cb_radius_auth_conf(struct radius_t ++ appconn->bucketupsize = BUCKET_SIZE_MIN; ++ #endif ++ } ++- else { +++ else ++ appconn->bandwidthmaxup = 0; ++- } ++ ++ /* Bandwidth down */ ++ if (!radius_getattr(pack, &attr, RADIUS_ATTR_VENDOR_SPECIFIC, ++@@ -3116,9 +3143,8 @@ int cb_radius_auth_conf(struct radius_t ++ appconn->bucketdownsize = BUCKET_SIZE_MIN; ++ #endif ++ } ++- else { +++ else ++ appconn->bandwidthmaxdown = 0; ++- } ++ ++ #ifdef RADIUS_ATTR_CHILLISPOT_BANDWIDTH_MAX_UP ++ /* Bandwidth up */ ++@@ -3623,7 +3649,7 @@ int cb_dhcp_data_ind(struct dhcp_conn_t ++ appconn->input_octets +=len; ++ #ifndef NO_LEAKY_BUCKET ++ #ifdef COUNT_UPLINK_DROP ++- if (leaky_bucket(appconn, len, 0)) return 0; +++ if (leaky_bucket(appconn, len, 0)==-1) return 0; ++ #endif /* ifdef COUNT_UPLINK_DROP */ ++ #endif /* ifndef NO_LEAKY_BUCKET */ ++ } ++@@ -3889,6 +3915,10 @@ int main(int argc, char **argv) ++ struct sigaction act; ++ struct itimerval itval; ++ +++ struct rmt_socket_t srv; +++ struct rmt_socket_t client[MAX_CLIENTS]; +++ int activeClients = 0; /* Número clientes conectados */ +++ ++ /* open a connection to the syslog daemon */ ++ /*openlog(PACKAGE, LOG_PID, LOG_DAEMON);*/ ++ openlog(PACKAGE, (LOG_PID | LOG_PERROR), LOG_DAEMON); ++@@ -4046,6 +4076,8 @@ int main(int argc, char **argv) ++ if (options.debug) ++ printf("Waiting for client request...\n"); ++ +++ +++ srv = rmtctrl_initSrv(options.rmtlisten, options.rmtport); ++ ++ /******************************************************************/ ++ /* Main select loop */ ++@@ -4053,6 +4085,8 @@ int main(int argc, char **argv) ++ ++ while (keep_going) { ++ +++ rmtctrl_srv(srv,client,&activeClients); +++ ++ if (do_timeouts) { ++ /*if (options.debug) printf("Do timeouts!\n");*/ ++ (void) radius_timeout(radius); ++@@ -4178,3 +4212,487 @@ int main(int argc, char **argv) ++ return 0; ++ ++ } +++ +++void rmtctrl_msg_proccess(struct rmt_socket_t *client) +++{ +++ msg_head_t header; +++ char *msg=NULL; +++ char *reg=NULL; +++ struct app_conn_t *appconn; +++ struct dhcp_conn_t *dhcpconn; +++ char str[2048]; +++ int found=0; +++ int rslt=0; +++ int n; +++ uint64_t l; +++ rslt = rmtctrl_read_msg(client,&header,&msg); +++ if (rslt > 0) +++ { +++ switch (header.id) +++ { +++ case QRY_CONNECTED_LIST: +++ rslt += send_srvData(client); +++ rslt += rmtctrl_write_msg(client,MSG_START,0, "\n" ); +++ rslt += rmtctrl_write_msg(client,MSG_PART,0, "Ord ---------- User Name ----------- -- MAC Address -- -- IP Address - -- Input - - Output - Sta\n" ); +++ for (n=0; ninuse != 0)){ +++ dhcpconn = (struct dhcp_conn_t*) appconn->dnlink; +++ found++; +++ l = found; +++ rslt += send_number(client, MSG_PART, 0, "%3s ", l); +++ rslt += send_line(client,MSG_PART,0, "%-32s ",appconn->proxyuser); +++ rslt += send_mac(client,MSG_PART,0, "%17s ",appconn->hismac); +++ rslt += send_line(client,MSG_PART,0, "%15s ",inet_ntoa(appconn->hisip)); +++ rslt += send_number(client,MSG_PART,0, "%10s ",appconn->input_octets); +++ rslt += send_number(client,MSG_PART,0, "%10s ",appconn->output_octets); +++ rslt += send_number(client, MSG_PART, 0, " %s ",appconn->authenticated); +++ rslt += send_number(client, MSG_PART, 0, " %s \n",dhcpconn->authstate); +++ } +++ } +++ rslt += send_number(client,MSG_END,found, "Total of connected device(s) %s\n",found); +++ break; +++ case QRY_CONNECTED_FULL_LIST: +++ rslt += send_srvData(client); +++ rslt += rmtctrl_write_msg(client,MSG_START,0, "\n" ); +++ for (n=0; ninuse != 0)){ +++ found++; +++ l = found; +++ rslt += send_number(client, MSG_PART, 0, "Connection : %s\n{\n", l); +++ rslt += send_acct_head( client, appconn); +++ rslt += send_line(client, MSG_PART, 0, "%s\n", "}"); +++ } +++ } +++ rslt += send_number(client, MSG_END, found, "Total of connected device(s) %s\n",found); +++ break; +++ case QRY_STATUS: +++ /// +++ rslt += send_Status(client, appconn); +++ break; +++ case CMD_AUTHORIZE: +++ for (n=0; ninuse != 0) && (appconn->authenticated == 0)) +++ { +++ switch (header.extra) +++ { +++ case EXTRA_MAC_OP: +++ if ( strcmp(msg,mac2str(appconn->hismac)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_IP_OP: +++ if ( strcmp(msg,inet_ntoa(appconn->hisip)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_USER_OP: +++ if ( strcmp(msg,appconn->proxyuser) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ default: +++ found++; +++ l=1; +++ break; +++ } +++ if ( l == 1 ){ +++ admin_authorize(appconn); +++ rslt += send_srvData( client ); +++ rslt += rmtctrl_write_msg(client,MSG_PART,0, " \n" ); +++ rslt += send_acct_head( client, appconn); +++ sys_err(LOG_NOTICE, __FILE__, __LINE__, 0, +++ "Admin Authorize MAC=%s IP=%s", +++ mac2str(appconn->hismac), inet_ntoa(appconn->hisip)); +++ } +++ } +++ } +++ if (found == 0) +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "Not device found to Authorze\n" ); +++ else +++ { +++ rslt += send_number(client, MSG_END, found, "Autorized %s device(s)\n",found); +++ } +++ break; +++ case CMD_DISCONNECT: +++ for (n=0; ninuse != 0) && (appconn->authenticated == 1)) +++ { +++ if (dhcpconn = (struct dhcp_conn_t*) appconn->dnlink) { +++ switch (header.extra) +++ { +++ case EXTRA_MAC_OP: +++ if ( strcmp(msg,mac2str(appconn->hismac)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_IP_OP: +++ if ( strcmp(msg,inet_ntoa(appconn->hisip)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_USER_OP: +++ if ( strcmp(msg,appconn->proxyuser) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ default: +++ found++; +++ l=1; +++ break; +++ } +++ if ( l == 1 ) { +++ rslt += send_srvData( client ); +++ rslt += rmtctrl_write_msg(client,MSG_PART,0, " \n" ); +++ rslt += send_acct_head( client, appconn); +++ admin_disconnect(appconn, RADIUS_TERMINATE_CAUSE_ADMIN_RESET); +++ sys_err(LOG_NOTICE, __FILE__, __LINE__, 0, +++ "Admin Disconnect username=%s IP=%s", +++ appconn->user, inet_ntoa(appconn->hisip)); +++ } +++ } +++ } +++ } +++ if (found == 0) +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "Not decice found to Disconnect\n" ); +++ else +++ { +++ rslt += send_number(client, MSG_END, found, "Disconnect %s device(s)\n",found); +++ } +++ break; +++ default: +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "Unknow command.\n" ); +++ break; +++ } +++ } +++ else +++ { +++ printf("Desde %s se recibieron %d bytes y se enviaron %d bytes\n",inet_ntoa(client->addr.sin_addr),client->Rx,client->Tx); +++ close(client->fd); /* cierra fd_rmt_client */ +++ printf("Client cerro conexión desde %s\n",inet_ntoa(client->addr.sin_addr) ); +++ client->fd = -1; +++ } +++ if(msg) +++ free(msg); +++} +++ +++void admin_authorize(struct app_conn_t *appconn) +++{ +++ struct radius_packet_t radius_pack; +++ strcpy(appconn->user,"Admin-Authorize"); +++ strcpy(appconn->proxyuser,"Admin-Authorize"); +++ appconn->proxyuserlen = strlen(appconn->proxyuser); +++ appconn->interim_interval = 600; +++ appconn->terminate_cause = 0; +++ appconn->idletimeout = 300; +++ +++ radius_default_pack(radius, &radius_pack, RADIUS_CODE_ACCESS_REQUEST); +++ radius_pack.code = RADIUS_CODE_ACCESS_REQUEST; +++// (void) radius_addattr(radius, &radius_pack, RADIUS_ATTR_USER_NAME, 0, 0, 0, +++// (uint8_t*) appconn->proxyuser, appconn->proxyuserlen); +++ +++ if ( options.bandwidthmaxup > 0 ){ +++ appconn->bandwidthmaxup = options.bandwidthmaxup * 1024; +++ appconn->bucketupsize = BUCKET_TIME * appconn->bandwidthmaxup / 8000; +++ if (appconn->bucketupsize < BUCKET_SIZE_MIN) +++ appconn->bucketupsize = BUCKET_SIZE_MIN; +++ } +++ if ( options.bandwidthmaxdown > 0 ){ +++ appconn->bandwidthmaxdown = options.bandwidthmaxdown * 1024; +++ appconn->bucketdownsize = BUCKET_TIME * appconn->bandwidthmaxdown / 8000; +++ if (appconn->bucketdownsize < BUCKET_SIZE_MIN) +++ appconn->bucketdownsize = BUCKET_SIZE_MIN; +++ } +++ dnprot_accept(appconn); +++} +++ +++void admin_disconnect(struct app_conn_t *appconn, int terminateCause) +++{ +++ dnprot_terminate(appconn); +++ (void) acct_req(appconn, RADIUS_STATUS_TYPE_STOP); +++ set_sessionid(appconn); +++} +++ +++int send_acct_head( struct rmt_socket_t *client, struct app_conn_t *appconn) +++{ +++ int rslt; +++ rslt += send_Connection( client, appconn ); +++ rslt += send_Acct_Setting( client, appconn ); +++ rslt += send_Accounting( client, appconn ); +++ return rslt; +++} +++ +++int send_Connection( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ int rslt; +++ uint64_t l; +++ rslt += send_line(client, MSG_PART, 0, "\tSession-Id = %s\n",appconn->sessionid); +++ rslt += send_line(client, MSG_PART, 0, "\tUser-Name = %s\n",appconn->user); +++// rslt = send_line(client, MSG_PART, 0, "\tnasip=%s\n",appconn->nasip); +++ rslt += send_mac(client, MSG_PART, 0, "\tClient-Mac-Address = %s\n",appconn->hismac); +++ rslt += send_mac(client, MSG_PART, 0, "\tNas-Mac-Address = %s\n",appconn->ourmac); +++// rslt += send_line(client, MSG_PART, 0, "\tourip=%s\n",inet_ntoa(appconn->ourip)); +++ rslt += send_line(client, MSG_PART, 0, "\tClient-Ip = %s\n",inet_ntoa(appconn->hisip)); +++ rslt += send_line(client, MSG_PART, 0, "\tClient-Require-Ip = %s\n",inet_ntoa(appconn->reqip)); +++ rslt += send_number(client, MSG_PART, 0, "\tAutheticated = %s\n",appconn->authenticated); +++ l = appconn->uamtime; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tUAM-Time = %s\n",l); +++ if (strlen(appconn->userurl)>0) +++ rslt = send_line(client, MSG_PART, 0, "\tUser-URL = %s\n",appconn->userurl); +++ return rslt; +++} +++ +++int send_Acct_Setting ( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ int rslt = 0; +++ uint64_t l; +++ if (appconn->authenticated == 0 ) return 0; +++ /* Account Settings */ +++ l = appconn->sessionterminatetime; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tSession-Terminate-Time = %s\n",l); +++ l = appconn->sessiontimeout; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tSession-Timeout = %s\n",l); +++ l = appconn->idletimeout; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tIdle-Timeout = %s\n",l); +++ l = appconn->bandwidthmaxup; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBandwidth-Max-Up = %s\n",l); +++ l = appconn->bandwidthmaxdown; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBandwidth-Max-Down = %s\n",l); +++ l = appconn->maxinputoctets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tMax-Input-Octets = %s\n",l); +++ l = appconn->maxoutputoctets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tMax-Output-Octets = %s\n",l); +++ l = appconn->maxtotaloctets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tMax-Total-Octets = %s\n",l); +++ return rslt; +++} +++ +++int send_Accounting( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ if (appconn->authenticated == 0 ) return 0; +++ int rslt = 0; +++ uint64_t l; +++ l = appconn->start_time.tv_sec; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tStart-Time = %s\n",l); +++ l = appconn->interim_time.tv_sec; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInterim-Time = %s\n",l); +++ l = appconn->interim_interval; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInterim-Interval = %s\n",l); +++ l = appconn->last_time.tv_sec; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tLast-Time = %s\n",l); +++ l = appconn->input_packets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInput-Packets = %s\n",l); +++ l = appconn->output_packets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tOutput-Packets = %s\n",l); +++ l = appconn->input_octets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInput-Octets = %s\n",l); +++ l = appconn->output_octets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tOutput-Octets = %s\n",l); +++ l = appconn->terminate_cause; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tTerminate-Cause = %s\n",l); +++ l = appconn->bucketup; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Up = %s\n",l); +++ l = appconn->bucketdown; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Down = %s\n",l); +++ l = appconn->bucketupsize; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Up-Size = %s\n",l); +++ l = appconn->bucketdownsize; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Down-Size = %s\n",l); +++ return rslt; +++} +++ +++int send_srvData( struct rmt_socket_t *client) +++{ +++ int rslt=0; +++ rslt += send_line(client, MSG_PART, 0, "%s\n",options.radiusnasid); +++ if (options.radiuslocationid) +++ rslt += send_line(client, MSG_PART, 0, "\tLOCATION ID:%s\n",options.radiuslocationid); +++ if (options.radiuslocationname) +++ rslt += send_line(client, MSG_PART, 0, "\tLOCATION NAME:%s\n",options.radiuslocationname); +++// rslt += send_line(client, MSG_PART, 0, "\tDEVICE: %s ",tun->devname); +++// rslt += send_line(client, MSG_PART, 0, "INTERFACE: %s\n",options.dhcpif); +++// rslt += send_line(client, MSG_PART, 0, "\tIP ADDR: %s ",inet_ntoa(options.dhcplisten)); +++// rslt += send_line(client, MSG_PART, 0, "NETWORK: %s ",inet_ntoa(options.net)); +++// rslt += send_line(client, MSG_PART, 0, "MASK: %s\n",inet_ntoa(options.mask)); +++ if (options.dns1.s_addr) +++ rslt += send_line(client, MSG_PART, 0, "\tDNS SERVERS: %s - ",inet_ntoa(options.dns1)); +++ if (options.dns2.s_addr) +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.dns2)); +++ rslt += send_line(client, MSG_PART, 0, "\tRADIUS SERVERS: %s - ",inet_ntoa(options.radiusserver1)); +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.radiusserver2)); +++ return rslt; +++} +++ +++int send_Status( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ int rslt = 0; +++ int n; +++ uint64_t l; +++ l = options.debug; +++ rslt += send_number(client, MSG_PART, 0, "\tdebug=%s\n",l); +++ /* conf */ +++ l = options.interval; +++ rslt += send_number(client, MSG_PART, 0, "\tinterval=%s\n",l); +++ rslt += send_line(client, MSG_PART, 0, "\tpidfile=%s\n",options.pidfile); +++ /* TUN parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tnet=%s\n",inet_ntoa(options.net)); /* Network IP address */ +++ rslt += send_line(client, MSG_PART, 0, "\tmask=%s\n",inet_ntoa(options.mask)); /* Network mask */ +++ rslt += send_line(client, MSG_PART, 0, "\tnetc=%s\n",options.netc); +++ rslt += send_line(client, MSG_PART, 0, "\tmaskc=%s\n",options.maskc); +++ l = options.allowdyn; +++ rslt += send_number(client, MSG_PART, 0, "\tallowdyn=%s\n",l); /* Allow dynamic address allocation */ +++ rslt += send_line(client, MSG_PART, 0, "\tdynip=%s\n",options.dynip); /* Dynamic IP address pool */ +++ +++ l = options.allowstat; +++ rslt += send_number(client, MSG_PART, 0, "\tallowstat=%s\n",l); /* Allow static address allocation */ +++ rslt += send_line(client, MSG_PART, 0, "\tstatip=%s\n",options.statip); /* Static IP address pool */ +++ +++ rslt += send_line(client, MSG_PART, 0, "\tdns1=%s\n",inet_ntoa(options.dns1)); /* Primary DNS server IP address */ +++ rslt += send_line(client, MSG_PART, 0, "\tdns2=%s\n",inet_ntoa(options.dns2)); /* Secondary DNS server IP address */ +++ rslt += send_line(client, MSG_PART, 0, "\tdomain=%s\n",options.domain); /* Domain to use for DNS lookups */ +++ rslt += send_line(client, MSG_PART, 0, "\tipup=%s\n",options.ipup); /* Script to run after link-up */ +++ rslt += send_line(client, MSG_PART, 0, "\tipdown=%s\n",options.ipdown); /* Script to run after link-down */ +++ rslt += send_line(client, MSG_PART, 0, "\tconup=%s\n",options.conup); /* Script to run after user logon */ +++ rslt += send_line(client, MSG_PART, 0, "\tcondown=%s\n",options.condown); /* Script to run after user logoff */ +++ /* Radius parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuslisten=%s\n",inet_ntoa(options.radiuslisten)); /* IP address to listen to */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusserver1=%s\n",inet_ntoa(options.radiusserver1)); /* IP address of radius server 1 */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusserver2=%s\n",inet_ntoa(options.radiusserver2)); /* IP address of radius server 2 */ +++ l = options.radiusauthport; +++ rslt += send_number(client, MSG_PART, 0, "\tradiusauthport=%s\n",l); /* Authentication UDP port */ +++ l = options.radiusacctport; +++ rslt += send_number(client, MSG_PART, 0, "\tradiusacctport=%s\n",l); /* Accounting UDP port */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiussecret=%s\n",options.radiussecret); /* Radius shared secret */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusnasid=%s\n",options.radiusnasid); /* Radius NAS-Identifier */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuscalled=%s\n",options.radiuscalled); /* Radius Called-Station-ID */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusnasip=%s\n",inet_ntoa(options.radiusnasip)); /* Radius NAS-IP-Address */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuslocationid=%s\n",options.radiuslocationid); /* WISPr location ID */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuslocationname=%s\n",options.radiuslocationname); /* WISPr location name */ +++ l = options.radiusnasporttype; +++ rslt += send_number(client, MSG_PART, 0, "\tradiusnasporttype=%s\n",l); /* NAS-Port-Type */ +++ l = options.coaport; +++ rslt += send_number(client, MSG_PART, 0, "\tcoaport=%s\n",l); /* UDP port to listen to */ +++ l = options.coanoipcheck; +++ rslt += send_number(client, MSG_PART, 0, "\tcoaipcheck=%s\n",l); /* Allow disconnect from any IP */ +++ /* Radius proxy parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxylisten=%s\n",inet_ntoa(options.proxylisten)); /* IP address to listen to */ +++ l = options.proxyport; +++ rslt += send_number(client, MSG_PART, 0, "\tproxyport=%s\n",l); /* UDP port to listen to */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxyaddr=%s\n",inet_ntoa(options.proxyaddr)); /* IP address of proxy client(s) */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxymask=%s\n",inet_ntoa(options.proxymask)); /* IP mask of proxy client(s) */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxysecret=%s\n",options.proxysecret); /* Proxy shared secret */ +++ /* Radius configuration management parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tconfusername=%s\n",options.confusername); /* Username for remote config */ +++ rslt += send_line(client, MSG_PART, 0, "\tconfpassword=%s\n",options.confpassword); /* Password for remote config */ +++ /* DHCP parameters */ +++ l = options.nodhcp; +++ rslt += send_number(client, MSG_PART, 0, "\tnodhcp=%s\n",l); /* Do not use DHCP */ +++ rslt += send_line(client, MSG_PART, 0, "\tdhcpif=%s\n",options.dhcpif); /* Interface: eth0 */ +++ rslt += send_mac(client, MSG_PART, 0, "\tdhcpmac=%s\n",options.dhcpmac); /* Interface MAC address */ +++ l = options.dhcpusemac; +++ rslt += send_number(client, MSG_PART, 0, "\tdhcpusemac=%s\n",l); /* Use given MAC or interface default */ +++ rslt += send_line(client, MSG_PART, 0, "\tdhcplisten=%s\n",inet_ntoa(options.dhcplisten)); /* IP address to listen to */ +++ l = options.lease; +++ rslt += send_number(client, MSG_PART, 0, "\tlease=%s\n",l); /* DHCP lease time */ +++ /* EAPOL parameters */ +++ l = options.eapolenable; +++ rslt += send_number(client, MSG_PART, 0, "\teapolenable=%s\n",l); /* Use eapol */ +++ /* UAM parameters */ +++ l = options.uamserverlen; +++ rslt += send_number(client, MSG_PART, 0, "\tuamserverlen=%s\n",l); /* Number of UAM servers */ +++ for (n = 0; n < options.uamserverlen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tuamokip[%s]=",n); +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.uamserver[n])); /* IP address of UAM server */ +++ } +++ l = options.uamserverport; +++ rslt += send_number(client, MSG_PART, 0, "\tuamserverport=%s\n",l); /* Port of UAM server */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamsecret=%s\n",options.uamsecret); /* Shared secret */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamurl=%s\n",options.uamurl); /* URL of authentication server */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamhomepage=%s\n",options.uamhomepage); /* URL of redirection homepage */ +++ l = options.uamhomepageport; +++ rslt += send_number(client, MSG_PART, 0, "\tuamhomepageport=%s\n",l); /* Port of redirection homepage */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamlisten=%s\n",inet_ntoa(options.uamlisten)); /* IP address of local authentication */ +++ l = options.uamport; +++ rslt += send_number(client, MSG_PART, 0, "\tuamport=%s\n",l); /* TCP port to listen to */ +++ l = options.uamokiplen; +++ rslt += send_number(client, MSG_PART, 0, "\tuamokiplen=%s\n",l); /* Number of allowed IP addresses */ +++ for (n=0; n < options.uamokiplen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tuamokip[%s]=",n); +++ rslt = send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.uamokip[n])); /* List of allowed IP addresses */ +++ } +++ l = options.uamoknetlen; +++ rslt += send_number(client, MSG_PART, 0, "\tuamoknetlen=%s\n",l); /* Number of networks */ +++ for (n=0; n < options.uamoknetlen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tuamoknet[%s]=",n); +++ rslt += send_line(client, MSG_PART, 0, "%s/",inet_ntoa(options.uamokaddr[n])); /* List of allowed network IP */ +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.uamokmask[n])); /* List of allowed network mask */ +++ } +++ l = options.uamanydns; +++ rslt += send_number(client, MSG_PART, 0, "\tuamanydns=%s\n",l); /* Allow client to use any DNS server */ +++ /* MAC Authentication */ +++ l = options.macauth; +++ rslt += send_number(client, MSG_PART, 0, "\tmacauth=%s\n",l); /* Use MAC authentication */ +++ l = options.macoklen; +++ rslt += send_number(client, MSG_PART, 0, "\tmacoklen=%s\n",l); /* Number of MAC addresses */ +++ for (n=0; n < options.macoklen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tmacok[%s]=",n); +++ rslt += send_mac(client, MSG_PART, 0, "\%s\n",options.macok[n]); /* Allowed MACs */ +++ } +++ rslt += send_line(client, MSG_PART, 0, "\tmacsuffix=%s\n",options.macsuffix); +++ rslt += send_line(client, MSG_PART, 0, "\tmacpasswd=%s\n",options.macpasswd); +++ +++ rslt += send_line(client, MSG_PART, 0, "\trmtlisten=%s\n",inet_ntoa(options.rmtlisten)); +++ l = options.rmtport; +++ rslt += send_number(client, MSG_PART, 0, "\trmtport=%s\n",l); /* Number of MAC addresses */ +++ rslt += send_line(client, MSG_PART, 0, "\trmtpasswd=%s\n",options.rmtpasswd); +++ rslt += send_number(client, MSG_PART, 0, "\tbandwidthmaxup=%s\n",options.bandwidthmaxup); +++ rslt += send_number(client, MSG_PART, 0, "\tbandwidthmaxdown=%s\n",options.bandwidthmaxdown); +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "End of configuration\n"); +++} ++--- a/src/chilli.h +++++ b/src/chilli.h ++@@ -50,8 +50,8 @@ ++ /* If the constants below are defined packets which have been dropped ++ by the traffic shaper will be counted towards accounting and ++ volume limitation */ ++-/* #define COUNT_DOWNLINK_DROP 1 */ ++-/* #define COUNT_UPLINK_DROP 1 */ +++#define COUNT_DOWNLINK_DROP 1 +++#define COUNT_UPLINK_DROP 1 ++ ++ #define APP_NUM_CONN 128 ++ #define EAP_LEN 2048 /* TODO: Rather large */ ++@@ -68,7 +68,7 @@ ++ #define CHALLENGESIZE 24 /* From chap.h MAX_CHALLENGE_LENGTH */ ++ #define USERURLSIZE 256 /* Max length of URL requested by user */ ++ ++-#define BUCKET_SIZE 300000 /* Size of leaky bucket (~200 packets) */ +++//#define BUCKET_SIZE 300000 /* Size of leaky bucket (~200 packets) */ ++ ++ /* Time length of leaky bucket in milliseconds */ ++ /* Bucket size = BUCKET_TIME * Bandwidth-Max radius attribute */ ++@@ -194,12 +194,14 @@ struct app_conn_t { ++ struct in_addr dns1; ++ struct in_addr dns2; ++ struct timeval last_time; /* Last time a packet was received or sent */ +++ struct timeval last_up_time; /* Last time a packet was received or sent */ +++ struct timeval last_down_time; /* Last time a packet was received or sent */ ++ ++ /* Leaky bucket */ ++- uint32_t bucketup; ++- uint32_t bucketdown; ++- uint32_t bucketupsize; ++- uint32_t bucketdownsize; +++ uint64_t bucketup; +++ uint64_t bucketdown; +++ uint64_t bucketupsize; +++ uint64_t bucketdownsize; ++ ++ /* UAM information */ ++ uint8_t uamchal[REDIR_MD5LEN]; ++@@ -305,6 +307,11 @@ struct options_t { ++ int macoklen; /* Number of MAC addresses */ ++ char* macsuffix; /* Suffix to add to MAC address */ ++ char* macpasswd; /* Password to use for MAC authentication */ +++ struct in_addr rmtlisten; /* IP address of remote monitor and config */ +++ int rmtport; /* TCP port to listen to monitor and config*/ +++ char* rmtpasswd; /* Password to use for MAC authentication */ +++ int bandwidthmaxup; /* Default Max Up Bandwith setting */ +++ int bandwidthmaxdown; /* Default Max Up Bandwith setting */ ++ }; ++ ++ extern struct app_conn_t connection[APP_NUM_CONN]; ++--- a/src/cmdline.c +++++ b/src/cmdline.c ++@@ -113,6 +113,11 @@ void clear_given (struct gengetopt_args_ ++ args_info->macallowed_given = 0 ; ++ args_info->macsuffix_given = 0 ; ++ args_info->macpasswd_given = 0 ; +++ args_info->rmtlisten_given = 0 ; +++ args_info->rmtport_given = 0 ; +++ args_info->rmtpasswd_given = 0 ; +++ args_info->bandwidthmaxup_given = 0 ; +++ args_info->bandwidthmaxdown_given = 0 ; ++ } ++ ++ static ++@@ -216,7 +221,19 @@ void clear_args (struct gengetopt_args_i ++ args_info->macsuffix_orig = NULL; ++ args_info->macpasswd_arg = gengetopt_strdup ("password"); ++ args_info->macpasswd_orig = NULL; ++- +++ args_info->rmtport_arg = 3991; +++ args_info->rmtport_orig = NULL; +++ args_info->rmtlisten_arg = gengetopt_strdup("127.0.0.1"); +++ args_info->rmtlisten_orig = NULL; +++ args_info->rmtport_orig = NULL; +++ args_info->rmtpasswd_arg = NULL; +++ args_info->rmtpasswd_orig = NULL; +++ +++ args_info->bandwidthmaxup_arg = 0; +++ args_info->bandwidthmaxup_orig = NULL; +++ args_info->bandwidthmaxdown_arg = 0; +++ args_info->bandwidthmaxdown_orig = NULL; +++ ++ } ++ ++ void ++@@ -284,7 +301,12 @@ cmdline_parser_print_help (void) ++ printf("%s\n"," --macauth Authenticate based on MAC address \n (default=off)"); ++ printf("%s\n"," --macallowed=STRING List of allowed MAC addresses"); ++ printf("%s\n"," --macsuffix=STRING Suffix to add to the MAC address"); ++- printf("%s\n"," --macpasswd=STRING Password used when performing MAC \n authentication (default=`password')"); +++ printf("%s\n"," --macpasswd=STRING Password used when performing MAC \n authentication (default='password')"); +++ printf("%s\n"," --rmtlisten=STRING IP address to listen to for monitor and \n configuration (default=`127.0.0.1')"); +++ printf("%s\n"," --rmtport=INT TCP port to bind to for monitor and \n configuration (default=`3991')"); +++ printf("%s\n"," --rmtpasswd=STRING Password used for remote monitor and \n configuration\n"); +++ printf("%s\n"," --bandwidthmaxup=INT Deafaul Max Up Setting in Kilobits\n"); +++ printf("%s\n"," --bandwidthmaxdown=INT Deafaul Max Down Setting in Kilobits\n"); ++ ++ } ++ ++@@ -675,6 +697,11 @@ cmdline_parser_release (struct gengetopt ++ free (args_info->uamport_orig); /* free previous argument */ ++ args_info->uamport_orig = 0; ++ } +++ if (args_info->macpasswd_orig) +++ { +++ free (args_info->macpasswd_orig); /* free previous argument */ +++ args_info->macpasswd_orig = 0; +++ } ++ if (args_info->uamallowed_arg) ++ { ++ for (i = 0; i < args_info->uamallowed_given; ++i) ++@@ -739,6 +766,34 @@ cmdline_parser_release (struct gengetopt ++ free (args_info->macpasswd_orig); /* free previous argument */ ++ args_info->macpasswd_orig = 0; ++ } +++ if (args_info->rmtlisten_orig) +++ { +++ free (args_info->rmtlisten_orig); /* free previous argument */ +++ args_info->rmtlisten_orig = 0; +++ } +++ if (args_info->rmtport_orig) +++ { +++ free (args_info->rmtport_orig); /* free previous argument */ +++ args_info->rmtport_orig = 0; +++ } +++ +++ if (args_info->rmtpasswd_orig) +++ { +++ free (args_info->rmtpasswd_orig); // free previous argument +++ args_info->rmtpasswd_orig = 0; +++ } +++ +++ if (args_info->bandwidthmaxup_orig) +++ { +++ free (args_info->bandwidthmaxup_orig); // free previous argument +++ args_info->bandwidthmaxup_orig = 0; +++ } +++ +++ if (args_info->bandwidthmaxdown_orig) +++ { +++ free (args_info->bandwidthmaxdown_orig); // free previous argument +++ args_info->bandwidthmaxdown_orig = 0; +++ } ++ ++ clear_given (args_info); ++ } ++@@ -1109,7 +1164,41 @@ cmdline_parser_file_save(const char *fil ++ fprintf(outfile, "%s\n", "macpasswd"); ++ } ++ } ++- +++ if (args_info->rmtlisten_given) { +++ if (args_info->rmtlisten_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "rmtlisten", args_info->rmtlisten_orig); +++ } else { +++ fprintf(outfile, "%s\n", "rmtlisten"); +++ } +++ } +++ if (args_info->rmtport_given) { +++ if (args_info->rmtport_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "rmtport", args_info->rmtport_orig); +++ } else { +++ fprintf(outfile, "%s\n", "rmtport"); +++ } +++ } +++ if (args_info->rmtpasswd_given) { +++ if (args_info->rmtpasswd_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "rmtpasswd", args_info->rmtpasswd_orig); +++ } else { +++ fprintf(outfile, "%s\n", "rmtpasswd"); +++ } +++ } +++ if (args_info->bandwidthmaxup_given) { +++ if (args_info->bandwidthmaxup_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "bandwidthmaxup", args_info->bandwidthmaxup_orig); +++ } else { +++ fprintf(outfile, "%s\n", "bandwidthmaxup"); +++ } +++ } +++ if (args_info->bandwidthmaxdown_given) { +++ if (args_info->bandwidthmaxdown_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "bandwidthmaxdown", args_info->bandwidthmaxdown_orig); +++ } else { +++ fprintf(outfile, "%s\n", "bandwidthmaxdown"); +++ } +++ } ++ fclose (outfile); ++ ++ i = EXIT_SUCCESS; ++@@ -1221,6 +1310,7 @@ cmdline_parser_internal (int argc, char ++ { ++ int c; /* Character of the parsed option. */ ++ char *multi_token, *multi_next; /* for multiple options */ +++ char quehace[100]; ++ ++ int i; /* Counter */ ++ ++@@ -1299,6 +1389,11 @@ cmdline_parser_internal (int argc, char ++ { "macallowed", 1, NULL, 0 }, ++ { "macsuffix", 1, NULL, 0 }, ++ { "macpasswd", 1, NULL, 0 }, +++ { "rmtport", 1, NULL, 0 }, +++ { "rmtlisten", 1, NULL, 0 }, +++ { "rmtpasswd", 1, NULL, 0 }, +++ { "bandwidthmaxup", 1, NULL, 0 }, +++ { "bandwidthmaxdown", 1, NULL, 0 }, ++ { NULL, 0, NULL, 0 } ++ }; ++ ++@@ -1380,8 +1475,6 @@ cmdline_parser_internal (int argc, char ++ free (args_info->net_orig); /* free previous string */ ++ args_info->net_orig = gengetopt_strdup (optarg); ++ break; ++- ++- ++ case 0: /* Long option with no short option */ ++ /* Which modules to print debug messages for. */ ++ if (strcmp (long_options[option_index].name, "debugfacility") == 0) ++@@ -2273,7 +2366,93 @@ cmdline_parser_internal (int argc, char ++ free (args_info->macpasswd_orig); /* free previous string */ ++ args_info->macpasswd_orig = gengetopt_strdup (optarg); ++ } ++- +++ /* IP address to listen to for remote monitor and config. */ +++ else if (strcmp (long_options[option_index].name, "rmtlisten") == 0) +++ { +++ if (local_args_info.rmtlisten_given) +++ { +++ fprintf (stderr, "%s: `--rmtlisten' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->rmtlisten_given && ! override) +++ continue; +++ local_args_info.rmtlisten_given = 1; +++ args_info->rmtlisten_given = 1; +++ if (args_info->rmtlisten_arg) +++ free (args_info->rmtlisten_arg); /* free previous string */ +++ args_info->rmtlisten_arg = gengetopt_strdup (optarg); +++ if (args_info->rmtlisten_orig) +++ free (args_info->rmtlisten_orig); /* free previous string */ +++ args_info->rmtlisten_orig = gengetopt_strdup (optarg); +++ } +++ /* TCP port to bind to for authentication requests. */ +++ else if (strcmp (long_options[option_index].name, "rmtport") == 0) +++ { +++ if (local_args_info.rmtport_given) +++ { +++ fprintf (stderr, "%s: `--rmtport' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->rmtport_given && ! override) +++ continue; +++ local_args_info.rmtport_given = 1; +++ args_info->rmtport_given = 1; +++ args_info->rmtport_arg = strtol (optarg,&stop_char,0); +++ if (args_info->rmtport_orig) +++ free (args_info->rmtport_orig); /* free previous string */ +++ args_info->rmtport_orig = gengetopt_strdup (optarg); +++ } +++ /* Password used when performing remote config. */ +++ else if (strcmp (long_options[option_index].name, "rmtpasswd") == 0) +++ { +++ if (local_args_info.rmtpasswd_given) +++ { +++ fprintf (stderr, "%s: `--rmtpasswd' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->rmtpasswd_given && ! override) +++ continue; +++ local_args_info.rmtpasswd_given = 1; +++ args_info->rmtpasswd_given = 1; +++ if (args_info->rmtpasswd_arg) +++ free (args_info->rmtpasswd_arg); // free previous string +++ args_info->rmtpasswd_arg = gengetopt_strdup (optarg); +++ if (args_info->rmtpasswd_orig) +++ free (args_info->rmtpasswd_orig); // free previous string +++ args_info->rmtpasswd_orig = gengetopt_strdup (optarg); +++ } +++ else if (strcmp (long_options[option_index].name, "bandwidthmaxup") == 0) +++ { +++ if (local_args_info.bandwidthmaxup_given) +++ { +++ fprintf (stderr, "%s: `--bandwidthmaxup' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->bandwidthmaxup_given && ! override) +++ continue; +++ local_args_info.bandwidthmaxup_given = 1; +++ args_info->bandwidthmaxup_given = 1; +++ args_info->bandwidthmaxup_arg = strtol (optarg,&stop_char,0); +++ if (args_info->bandwidthmaxup_orig) +++ free (args_info->bandwidthmaxup_orig); /* free previous string */ +++ args_info->bandwidthmaxup_orig = gengetopt_strdup (optarg); +++ } +++ else if (strcmp (long_options[option_index].name, "bandwidthmaxdown") == 0) +++ { +++ if (local_args_info.bandwidthmaxdown_given) +++ { +++ fprintf (stderr, "%s: `--bandwidthmaxdown' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->bandwidthmaxdown_given && ! override) +++ continue; +++ local_args_info.bandwidthmaxdown_given = 1; +++ args_info->bandwidthmaxdown_given = 1; +++ args_info->bandwidthmaxdown_arg = strtol (optarg,&stop_char,0); +++ if (args_info->bandwidthmaxdown_orig) +++ free (args_info->bandwidthmaxdown_orig); /* free previous string */ +++ args_info->bandwidthmaxdown_orig = gengetopt_strdup (optarg); +++ } ++ break; ++ case '?': /* Invalid option. */ ++ /* `getopt_long' already printed an error message. */ ++--- a/src/cmdline.ggo +++++ b/src/cmdline.ggo ++@@ -119,3 +119,12 @@ option "macallowed" - "List of allowed ++ option "macsuffix" - "Suffix to add to the MAC address" string no ++ option "macpasswd" - "Password used when performing MAC authentication" string default="password" no ++ +++# Remote Monitor and Config +++option "rmtlisten" - "IP address to listen to for authentication requests" string default="127.0.0.1" no +++option "rmtport" - "TCP port to bind to for authentication requests" int default="3991" no +++option "rmtpasswd" - "Password used when performing MAC authentication" string no +++ +++# Extra settings +++option "bandwidthmaxup" - "Default bandwidth control to apply when account don't have setting" int no +++option "bandwidthmaxdown" - "Default bandwidth control to apply when account don't have setting" int no +++ ++--- a/src/cmdline.h +++++ b/src/cmdline.h ++@@ -122,6 +122,17 @@ struct gengetopt_args_info ++ char * macsuffix_orig; /* Suffix to add to the MAC address original value given at command line. */ ++ char * macpasswd_arg; /* Password used when performing MAC authentication (default='password'). */ ++ char * macpasswd_orig; /* Password used when performing MAC authentication original value given at command line. */ +++ int rmtport_arg; /* TCP port to bind to for remote monitor and config (default='3991'). */ +++ char * rmtport_orig; /* TCP port to bind to for remote monitor and config original value given at command line. */ +++ char * rmtlisten_arg; /* IP address to listen to for remote monitor and config. */ +++ char * rmtlisten_orig; /* IP address to listen to for remote monitor and config original value given at command line. */ +++ char * rmtpasswd_arg; /* Password for remote monitor and config. */ +++ char * rmtpasswd_orig; /* Password for remote monitor and config original value given at command line. */ +++ int bandwidthmaxup_arg; /* Default Bandwidth Max Up. */ +++ char *bandwidthmaxup_orig; /* Default Bandwidth Max Up value given at command line. */ +++ int bandwidthmaxdown_arg; /* Default Bandwidth Max Down. */ +++ char *bandwidthmaxdown_orig; /* Default Bandwidth Max Down value given at command line. */ +++ ++ ++ int help_given ; /* Whether help was given. */ ++ int version_given ; /* Whether version was given. */ ++@@ -177,7 +188,11 @@ struct gengetopt_args_info ++ unsigned int macallowed_given ; /* Whether macallowed was given. */ ++ int macsuffix_given ; /* Whether macsuffix was given. */ ++ int macpasswd_given ; /* Whether macpasswd was given. */ ++- +++ int rmtport_given ; /* Whether uamport was given. */ +++ int rmtlisten_given ; /* Whether uamlisten was given. */ +++ int rmtpasswd_given ; /* Whether confpassword was given. */ +++ int bandwidthmaxup_given ; +++ int bandwidthmaxdown_given ; ++ } ; ++ ++ int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info); ++--- a/src/Makefile +++++ b/src/Makefile ++@@ -54,7 +54,7 @@ PROGRAMS = $(sbin_PROGRAMS) ++ am_chilli_OBJECTS = chilli.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT) \ ++ ippool.$(OBJEXT) radius.$(OBJEXT) md5.$(OBJEXT) \ ++ redir.$(OBJEXT) dhcp.$(OBJEXT) syserr.$(OBJEXT) \ ++- iphash.$(OBJEXT) lookup.$(OBJEXT) +++ iphash.$(OBJEXT) lookup.$(OBJEXT) remotectrl.$(OBJEXT) ++ chilli_OBJECTS = $(am_chilli_OBJECTS) ++ chilli_LDADD = $(LDADD) ++ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++@@ -172,7 +172,7 @@ target_alias = ++ ++ # add -pg to enable gprof ++ AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' ++-chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h +++chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h remotectrl.c remotectrl.h ++ all: all-am ++ ++ .SUFFIXES: ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -54,7 +54,7 @@ PROGRAMS = $(sbin_PROGRAMS) ++ am_chilli_OBJECTS = chilli.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT) \ ++ ippool.$(OBJEXT) radius.$(OBJEXT) md5.$(OBJEXT) \ ++ redir.$(OBJEXT) dhcp.$(OBJEXT) syserr.$(OBJEXT) \ ++- iphash.$(OBJEXT) lookup.$(OBJEXT) +++ iphash.$(OBJEXT) lookup.$(OBJEXT) remotectrl.$(OBJEXT) ++ chilli_OBJECTS = $(am_chilli_OBJECTS) ++ chilli_LDADD = $(LDADD) ++ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++@@ -172,7 +172,7 @@ target_alias = @target_alias@ ++ ++ # add -pg to enable gprof ++ AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' ++-chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h +++chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h remotectrl.c remotectrl.h ++ all: all-am ++ ++ .SUFFIXES: ++--- /dev/null +++++ b/src/remotectrl.c ++@@ -0,0 +1,340 @@ +++#include +++#include +++#include +++#include +++#include +++ +++#include "remotectrl.h" +++ +++/* +++char *vstrcat(char *first, ...) +++{ +++ size_t len = 0; +++ char *retbuf; +++ va_list argp; +++ char *p; +++ char *tmp=""; +++ if(first == NULL) +++ first=tmp; +++// return NULL; +++ +++ len = strlen(first); +++ +++ va_start(argp, first); +++ +++ while((p = va_arg(argp, char *)) != NULL) +++ len += strlen(p); +++ +++ va_end(argp); +++ retbuf = (char *)malloc(len + 1); // +1 for trailing \0 +++ +++ if(retbuf == NULL) +++ return NULL; // error +++ +++ (void)strcpy(retbuf, first); +++ +++ va_start(argp, first); +++ +++ while((p = va_arg(argp, char *)) != NULL) +++ (void)strcat(retbuf, p); +++ +++ va_end(argp); +++ +++ return retbuf; +++} +++*/ +++ +++int rmtctrl_write_msg( struct rmt_socket_t *sckHnd, uint32_t id, uint32_t extra, char *message ){ +++ msg_head_t header; +++ int rslt; +++ header.id = id; +++ header.len = strlen(message); +++ header.extra = extra; +++ rslt = send(sckHnd->fd,&header,sizeof(struct msg_head_t),0); +++ if (rslt != -1 && header.len > 0) { +++ sckHnd->Tx += rslt; +++ rslt = send(sckHnd->fd, message, header.len, 0); +++ if (rslt > 0) +++ { +++ sckHnd->Tx += rslt; +++ rslt += sizeof(struct msg_head_t); +++ } +++ } +++ return rslt; +++} +++ +++int rmtctrl_read_msg( struct rmt_socket_t *sckHnd, msg_head_t *head, char **message ) +++{ +++// msg_head_t header; +++ int rslt; +++ char *buffer; +++ int reading = 0; +++ int aux = 0; +++ rslt = recv(sckHnd->fd, head, sizeof(struct msg_head_t), 0); +++ if (rslt == sizeof(struct msg_head_t) ) { +++ sckHnd->Rx += rslt; +++ *message = (char *)malloc(head->len+1); +++ memset(*message,'\0', head->len+1); +++ while ( reading < head->len ){ +++ aux = recv(sckHnd->fd, *message, head->len, 0); +++ switch ( aux ) +++ { +++ case -1: +++ switch (errno) +++ { +++ case EINTR: +++ case EAGAIN: +++ usleep (100); +++ break; +++ default: +++ return -1; +++ } +++ break; +++ case 0: // mean socket was closed +++ sckHnd->Rx += reading; +++ return reading; +++ break; +++ break; +++ default: +++ reading+=aux; +++ break; +++ } +++ } +++/* +++ buffer = (char *)malloc(head->len+1); +++ while ( reading < head->len ){ +++ memset(buffer,'\0', head->len+1); +++ aux = recv(sckHnd->fd, buffer, head->len, 0); +++ switch ( aux ) { +++ case -1: +++ switch (errno){ +++ case EINTR: +++ case EAGAIN: +++ usleep (100); +++ break; +++ default: +++ return -1; +++ } +++ break; +++ case 0: // mean socket was closed +++ sckHnd->Rx += reading; +++ return reading; +++ break; +++ break; +++ default: +++ if (reading == 0) +++ *message=(char *)malloc(aux+1); +++ else +++ *message=(char*)realloc(*message,(reading+aux+1)*sizeof(char)); +++// strcat(*message, buffer); +++ memcpy(*message+reading, buffer, aux); +++ reading += aux; +++ *message[reading]=0; +++ } +++ } +++ free(buffer); +++*/ +++ sckHnd->Rx += reading; +++ reading += rslt; +++ return reading; +++ } +++ return rslt; +++} +++ +++void rmtctrl_newClient(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients) +++{ +++ int rslt; +++ int cli = (*activeClients); +++ rmtctrl_accept(srv,&client[cli]); +++ if (client[(*activeClients)].fd != -1) +++ { +++ (*activeClients)++; +++ } +++ if ((*activeClients) >= MAX_CLIENTS) +++ { +++ (*activeClients)--; +++ rslt = rmtctrl_write_msg(&client[(*activeClients)],MSG_END,0, "Sorry Server is too Busy\n Try more late\n" ); +++ if (rslt > 0) client[(*activeClients)].Tx += rslt; +++ rmtctrl_close(&client[(*activeClients)]); +++ } +++} +++ +++void rmtctrl_close ( struct rmt_socket_t *client ) +++{ +++ printf("Desde %s se recibieron %d bytes y se enviaron %d bytes\n",inet_ntoa(client->addr.sin_addr),client->Rx,client->Tx); +++ close(client->fd); /* cierra fd_rmt_client */ +++ printf("Se cerro conexión desde %s\n",inet_ntoa(client->addr.sin_addr) ); +++ client->fd = -1; +++} +++ +++void rmtctrl_accept (struct rmt_socket_t srv, struct rmt_socket_t *client ) +++{ +++ int sin_size=sizeof(struct sockaddr_in); +++ int int_Send; +++ struct sockaddr_in addr; +++ +++ if ((client->fd = accept(srv.fd,(struct sockaddr *)&client->addr,&sin_size))!=-1) +++ { +++ client->Rx = 0; +++ client->Tx = 0; +++ unsigned char c = sizeof(uint32_t); +++ int_Send = send(client->fd, &c, 1, 0); +++ if (int_Send > 0) client->Tx += int_Send; +++ printf("Se abrió una conexión desde %s\n", inet_ntoa(client->addr.sin_addr)); +++ } +++} +++ +++//void cleanClients (int *table, int *n) +++void rmtctrl_cleanClients (struct rmt_socket_t *client, int *n) +++{ +++ int i,j; +++ +++ if ((client == NULL) || ((*n) == 0)) +++ return; +++ +++ j=0; +++ for (i=0; i<(*n); i++) +++ { +++ if (client[i].fd != -1) +++ { +++ client[j].fd = client[i].fd; +++ client[j].addr = client[i].addr; +++ client[j].Rx = client[i].Rx; +++ client[j].Tx = client[i].Tx; +++ j++; +++ } +++ } +++ +++ *n = j; +++} +++ +++int rmtctrl_maxValue (struct rmt_socket_t *client, int n) +++{ +++ int i; +++ int max; +++ +++ if ((client == NULL) || (n<1)) +++ return 0; +++ +++ max = client[0].fd; +++ for (i=0; i max) +++ max = client[i].fd; +++ +++ return max; +++} +++ +++struct rmt_socket_t rmtctrl_initSrv(struct in_addr rmtlisten, int rmtport){ +++ struct rmt_socket_t srv; +++ if ((srv.fd=socket(AF_INET, SOCK_STREAM, 0)) == -1 ) { +++ printf("error en socket()\n"); +++ exit(1); +++ } +++ srv.addr.sin_family = AF_INET; +++ srv.addr.sin_port = htons(rmtport); +++ srv.addr.sin_addr.s_addr = rmtlisten.s_addr; +++ memset(&(srv.addr.sin_zero), 0, 8); +++ +++ if(bind(srv.fd,(struct sockaddr*)&srv.addr,sizeof(struct sockaddr))==-1) { +++ printf("error en bind() \n"); +++ exit(-1); +++ } +++ +++ if(listen(srv.fd,BACKLOG) == -1) { +++ printf("error en listen()\n"); +++ exit(-1); +++ } +++ return srv; +++} +++ +++void rmtctrl_srv(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients) +++{ +++ fd_set fdRead; +++ int maxHnd; +++ int i; +++ struct timeval nowait; +++ memset((char *)&nowait,0,sizeof(nowait)); +++ +++ rmtctrl_cleanClients(client, activeClients); +++ FD_ZERO (&fdRead); +++ FD_SET (srv.fd, &fdRead); +++ +++ for (i=0; i<*activeClients; i++) +++ FD_SET (client[i].fd, &fdRead); +++ +++ maxHnd = rmtctrl_maxValue (client, *activeClients); +++ +++ if (maxHnd < srv.fd) +++ maxHnd = srv.fd; +++ +++ select (maxHnd + 1, &fdRead, NULL, NULL,&nowait); +++ for (i=0; i<*activeClients; i++) +++ { +++ if (FD_ISSET (client[i].fd, &fdRead)) +++ { +++ rmtctrl_msg_proccess(&client[i]); +++ } +++ } +++ if (FD_ISSET (srv.fd, &fdRead)) +++ rmtctrl_newClient(srv,client, &(*activeClients)); +++} +++ +++int send_line( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, char *data) +++{ +++ char str[2048]; +++ memset(str,'\0',2048); +++ sprintf(str,fmt,data); +++ return rmtctrl_write_msg(client,msg_type,msg_extra, str); +++} +++ +++int send_octets( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value) +++{ +++ char *Buffer = (char *)octets2str(value); +++ int ret = send_line( client, msg_type, msg_extra, fmt, Buffer); +++ free(Buffer); +++ return ret; +++} +++ +++int send_mac( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint8_t *value) +++{ +++ char *Buffer = (char*)mac2str(value); +++ int ret = send_line( client, msg_type, msg_extra, fmt, Buffer); +++ free(Buffer); +++ return ret; +++} +++ +++int send_number( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value) +++{ +++ char Buffer[64]; +++ sprintf(Buffer,"%d", value); +++ return send_line( client, msg_type, msg_extra, fmt, Buffer); +++} +++ +++const char * mac2str(uint8_t *mac) +++{ +++ char *buffer; +++ buffer=(char*)malloc(18*sizeof(char)); +++ memset(buffer,'\0',18); +++ (void) sprintf(buffer,"%.2X-%.2X-%.2X-%.2X-%.2X-%.2X", +++ mac[0], mac[1], +++ mac[2], mac[3], +++ mac[4], mac[5]); +++ return buffer; +++} +++ +++const char * octets2str(uint64_t value) +++{ +++ char *buffer; +++ buffer=(char*)malloc(13*sizeof(char)); +++ memset(buffer,'\0',13); +++ if (value/8 > 1073741824){ // gigas +++ sprintf(buffer,"%.1f(GiB)",((value/8.0)/1073741824.0)); +++ }else if (value/8 > 1048576){ // megas +++ sprintf(buffer,"%.1f(MiB)",((value/8.0)/1048576.0)); +++ }else if (value/8 > 1024){ // KiloBytes +++ sprintf(buffer,"%.1f(KiB)",((value/8.0)/1024.0)); +++ }else // Bytes +++ sprintf(buffer,"%.1f(B)",(value/8)); +++ return buffer; +++} +++ ++--- /dev/null +++++ b/src/remotectrl.h ++@@ -0,0 +1,86 @@ +++#include +++#ifndef _RMTCTRL_H +++#define _RMTCTRL_H +++ +++enum +++{ +++ MSG_OK = 0, +++ MSG_START = 1, +++ MSG_PART = 2, +++ MSG_END = 3, +++ QRY_STATUS = 100, +++ QRY_CONNECTED_LIST = 101, +++ QRY_CONNECTED_FULL_LIST = 102, +++ QRY_MACADDR = 103, +++ QRY_IPADDR = 104, +++ QRY_USERNAME = 105, +++ +++ CMD_AUTHORIZE = 200, +++ CMD_DISCONNECT = 201, +++ +++ EXTRA_ALL_OP = 300, +++ EXTRA_MAC_OP = 301, +++ EXTRA_IP_OP = 302, +++ EXTRA_USER_OP = 303, +++}; +++ +++enum +++{ +++ STRING, +++ IP_ADDR, +++ MAC_ADDR, +++ NUMBER, +++ OCTETS, +++}; +++ +++#define PORT 15557 /* El puerto que ser? abierto */ +++#define BACKLOG 2 /* El n?mero de conexiones permitidas */ +++#define MAX_CLIENTS 10 +++static char CONVERT_BUFF[1024]; +++ +++typedef struct msg_head_t { +++ uint32_t id; +++ uint32_t extra; +++ uint32_t len; +++} msg_head_t; +++ +++typedef struct rmt_socket_t { +++ int fd; +++ struct sockaddr_in addr; +++ int Rx; +++ int Tx; +++} rmt_socket_t; +++ +++//char *vstrcat(char *first, ...); +++ +++ +++int rmtctrl_write_msg( struct rmt_socket_t *sckHnd, uint32_t id, uint32_t extra, char *message ); +++int rmtctrl_read_msg( struct rmt_socket_t *sckHnd, msg_head_t *head, char **message ); +++void rmtctrl_newClient(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients); +++void rmtctrl_close ( struct rmt_socket_t *client ); +++void rmtctrl_accept (struct rmt_socket_t srv, struct rmt_socket_t *client ); +++void rmtctrl_cleanClients (struct rmt_socket_t *client, int *n); +++ +++//inicializa las variables y arranca el servidor +++struct rmt_socket_t rmtctrl_initSrv(struct in_addr rmtlisten, int rmtport); +++//esta funcion es la que va dentro del loop del programa que lo utiliza +++void rmtctrl_srv(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients); +++//En esta funcion es donde se define como se procesan los mensajes +++void rmtctrl_msg_proccess(struct rmt_socket_t *client); +++ +++//char * pepe(char *dest, char *sep, char *src); +++ +++//char * send_value(char *name, char *value, int len, struct in_addr *addr, +++// uint8_t *mac, long int *integer); +++//int addfield(char* reg, char *field, char sep); +++//int addfield1(char** reg,int rlen, char *field, int flen, char sep); +++//int sendConnectedInfo(struct app_conn_t *appconn, struct rmt_socket_t *client); +++//const char * value2str( int type, void *value); +++const char * octets2str(uint64_t value); +++const char * mac2str(uint8_t *mac); +++int send_line( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, char *data); +++int send_octets( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value); +++int send_mac( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint8_t *value); +++int send_number( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value); +++ +++#endif /* !_RMTCTRL_H */ ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -3,7 +3,7 @@ sbin_PROGRAMS = chilli ++ # add -pg to enable gprof ++ AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' ++ ++-chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h +++chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h remotectrl.c remotectrl.h ++ ++ # chilli_LDFLAGS = -lcrypt ++ +diff --git a/feeds/packages/net/chillispot/patches/.svn/text-base/200-gcc_fix.patch.svn-base b/feeds/packages/net/chillispot/patches/.svn/text-base/200-gcc_fix.patch.svn-base +new file mode 100644 +index 0000000..a819216 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/.svn/text-base/200-gcc_fix.patch.svn-base +@@ -0,0 +1,57 @@ ++diff -Naur chillispot-1.1.0/src/tun.c chillispot-1.1.0.patched/src/tun.c ++--- chillispot-1.1.0/src/tun.c 2006-09-24 20:48:25.000000000 +0300 +++++ chillispot-1.1.0.patched/src/tun.c 2009-10-20 02:08:49.000000000 +0300 ++@@ -366,7 +366,7 @@ ++ this->addrs++; ++ return 0; ++ ++-#elif defined (__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ++ int fd; ++ struct ifaliasreq areq; ++@@ -445,7 +445,7 @@ ++ #if defined(__linux__) ++ ifr.ifr_netmask.sa_family = AF_INET; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_len = ++ sizeof (struct sockaddr_in); ++ ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_len = ++@@ -497,7 +497,7 @@ ++ ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = ++ netmask->s_addr; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = ++ netmask->s_addr; ++ ++@@ -585,7 +585,7 @@ ++ close(fd); ++ return 0; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ++ struct { ++ struct rt_msghdr rt; ++@@ -674,7 +674,7 @@ ++ #if defined(__linux__) ++ struct ifreq ifr; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ char devname[IFNAMSIZ+5]; /* "/dev/" + ifname */ ++ int devnum; ++ struct ifaliasreq areq; ++@@ -722,7 +722,7 @@ ++ ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */ ++ return 0; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ++ /* Find suitable device */ ++ for (devnum = 0; devnum < 255; devnum++) { /* TODO 255 */ +diff --git a/feeds/packages/net/chillispot/patches/001-endian_fix.patch b/feeds/packages/net/chillispot/patches/001-endian_fix.patch +new file mode 100644 +index 0000000..7bc100e +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/001-endian_fix.patch +@@ -0,0 +1,135 @@ ++Index: chillispot-1.1.0/src/dhcp.c ++=================================================================== ++--- chillispot-1.1.0.orig/src/dhcp.c 2006-09-24 19:48:25.000000000 +0200 +++++ chillispot-1.1.0/src/dhcp.c 2007-09-25 15:35:12.521055038 +0200 ++@@ -116,6 +116,24 @@ ++ #endif ++ ++ +++/* +++ * BrainSlayer: +++ * wrapper for fixing the big endian bugs within dhcp server code.its surelly not the best. +++ * all dhcp packet fields must be handled in little endian +++ */ +++ +++static uint16_t swap16(uint16_t word) { +++#if __BYTE_ORDER == __BIG_ENDIAN +++ unsigned char low = word>>8; +++ unsigned char high = word&0xff; +++ return ((uint16_t)(high<<8))|low; +++#elif __BYTE_ORDER == __LITTLE_ENDIAN +++ return word; +++#else +++#error "Could not determine the system's endianness" +++#endif +++} +++ ++ /** ++ * dhcp_ip_check() ++ * Generates an IPv4 header checksum. ++@@ -125,11 +143,11 @@ ++ uint32_t sum = 0; ++ pack->iph.check = 0; ++ for (i=0; i<(pack->iph.ihl * 2); i++) { ++- sum += ((uint16_t*) &pack->iph)[i]; +++ sum += swap16(((uint16_t*) &pack->iph)[i]); /* brainslayer */ ++ } ++ while (sum>>16) ++ sum = (sum & 0xFFFF)+(sum >> 16); ++- pack->iph.check = ~sum; +++ pack->iph.check = swap16(~sum); /* brainslayer */ ++ return 0; ++ } ++ ++@@ -152,27 +170,28 @@ ++ } ++ ++ /* Sum UDP header and payload */ +++ ++ for (i=0; i<(udp_len/2); i++) { ++- sum += ((uint16_t*) &pack->udph)[i]; +++ sum += swap16(((uint16_t*) &pack->udph)[i]); /* brainslayer */ ++ } ++ ++- /* Sum any uneven payload octet */ +++ ++ if (udp_len & 0x01) { ++ sum += ((uint8_t*) &pack->udph)[udp_len-1]; ++ } ++ ++ /* Sum both source and destination address */ ++ for (i=0; i<4; i++) { ++- sum += ((uint16_t*) &pack->iph.saddr)[i]; +++ sum += swap16(((uint16_t*) &pack->iph.saddr)[i]); /* brainslayer */ ++ } ++ ++ /* Sum both protocol and udp_len (again) */ ++- sum = sum + pack->udph.len + ((pack->iph.protocol<<8)&0xFF00); +++ sum = sum + swap16(pack->udph.len) + ((pack->iph.protocol<<8)&0xFF00); /* brainslayer */ ++ ++ while (sum>>16) ++ sum = (sum & 0xFFFF)+(sum >> 16); ++ ++- pack->udph.check = ~sum; +++ pack->udph.check = swap16(~sum); /* brainslayer */ ++ ++ return 0; ++ } ++@@ -201,7 +220,7 @@ ++ ++ /* Sum TCP header and payload */ ++ for (i=0; i<(tcp_len/2); i++) { ++- sum += ((uint16_t*) pack->payload)[i]; +++ sum += swap16(((uint16_t*) pack->payload)[i]); /* brainslayer */ ++ } ++ ++ /* Sum any uneven payload octet */ ++@@ -211,16 +230,16 @@ ++ ++ /* Sum both source and destination address */ ++ for (i=0; i<4; i++) { ++- sum += ((uint16_t*) &pack->iph.saddr)[i]; +++ sum += swap16(((uint16_t*) &pack->iph.saddr)[i]); /* brainslayer */ ++ } ++ ++ /* Sum both protocol and tcp_len */ ++- sum = sum + htons(tcp_len) + ((pack->iph.protocol<<8)&0xFF00); +++ sum = sum + swap16(htons(tcp_len)) + ((pack->iph.protocol<<8)&0xFF00); /* brainslayer */ ++ ++ while (sum>>16) ++ sum = (sum & 0xFFFF)+(sum >> 16); ++ ++- tcph->check = ~sum; +++ tcph->check = swap16(~sum); /* brainslayer */ ++ ++ return 0; ++ } ++Index: chillispot-1.1.0/src/dhcp.h ++=================================================================== ++--- chillispot-1.1.0.orig/src/dhcp.h 2006-09-24 19:48:25.000000000 +0200 +++++ chillispot-1.1.0/src/dhcp.h 2007-09-25 15:35:12.533055724 +0200 ++@@ -119,6 +119,8 @@ ++ uint16_t prot; ++ }; ++ +++#include +++ ++ /* Constants for IP packet */ ++ #define DHCP_IP_ALEN 4 ++ #define DHCP_IP_HLEN 20 ++@@ -127,8 +129,15 @@ ++ #define DHCP_IP_UDP 17 /* UDP Protocol number */ ++ ++ struct dhcp_iphdr_t { +++#if __BYTE_ORDER == __LITTLE_ENDIAN /* nbd fix for swapped version and length field */ ++ uint8_t ihl:4; ++ uint8_t version:4; +++#elif __BYTE_ORDER == __BIG_ENDIAN +++ uint8_t version:4; +++ uint8_t ihl:4; +++#else +++#error "Could not determine the system's endianness" +++#endif ++ uint8_t tos; ++ uint16_t tot_len; ++ uint16_t id; +diff --git a/feeds/packages/net/chillispot/patches/102-less_memory-footprint.patch b/feeds/packages/net/chillispot/patches/102-less_memory-footprint.patch +new file mode 100644 +index 0000000..b0a6c9c +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/102-less_memory-footprint.patch +@@ -0,0 +1,12 @@ ++diff -baurN --exclude='*~' --exclude='.#*' --exclude='.svn*' --exclude='.conf*' --exclude=dl --exclude=bin --exclude=build_mipsel --exclude=staging_dir_mipsel --exclude=toolchain_build_mipsel --exclude=package/config --exclude=autom4te.cache --exclude='*.tgz' --exclude='*.zip' --exclude='*.tar' --exclude='*.gz' --exclude='.tmp*' chillispot-1.1.0.orig/src/chilli.h chillispot-1.1.0/src/chilli.h ++--- chillispot-1.1.0.orig/src/chilli.h 2006-10-19 00:01:55.000000000 +0100 +++++ chillispot-1.1.0/src/chilli.h 2006-12-19 00:02:16.000000000 +0100 ++@@ -53,7 +53,7 @@ ++ /* #define COUNT_DOWNLINK_DROP 1 */ ++ /* #define COUNT_UPLINK_DROP 1 */ ++ ++-#define APP_NUM_CONN 1024 +++#define APP_NUM_CONN 128 ++ #define EAP_LEN 2048 /* TODO: Rather large */ ++ ++ #define MACOK_MAX 16 +diff --git a/feeds/packages/net/chillispot/patches/110-macallowed_fix.patch b/feeds/packages/net/chillispot/patches/110-macallowed_fix.patch +new file mode 100644 +index 0000000..8567fc8 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/110-macallowed_fix.patch +@@ -0,0 +1,21 @@ ++diff -r -u chillispot-1.1.0/src/chilli.c chillispot-1.1.0-macallowed/src/chilli.c ++--- chillispot-1.1.0/src/chilli.c 2006-09-24 19:48:25.000000000 +0200 +++++ chillispot-1.1.0-macallowed/src/chilli.c 2008-07-18 07:58:03.000000000 +0200 ++@@ -534,6 +534,8 @@ ++ } ++ } ++ free(p3); +++ +++ return 0; ++ } ++ ++ int static process_options(int argc, char **argv, int firsttime) { ++@@ -2991,7 +2993,7 @@ ++ ++ /* Get Service Type */ ++ if (!radius_getattr(pack, &stateattr, RADIUS_ATTR_SERVICE_TYPE, 0, 0, 0)) { ++- if(ntohl(attr->v.i) == RADIUS_SERVICE_TYPE_CHILLISPOT_AUTHORIZE_ONLY) { +++ if(ntohl(stateattr->v.i) == RADIUS_SERVICE_TYPE_CHILLISPOT_AUTHORIZE_ONLY) { ++ sys_err(LOG_ERR, __FILE__, __LINE__, 0, ++ "Chillispot-Authorize-Only Service-Type in Access-Accept"); ++ return dnprot_reject(appconn); +diff --git a/feeds/packages/net/chillispot/patches/120-fix_bufferoverflow.patch b/feeds/packages/net/chillispot/patches/120-fix_bufferoverflow.patch +new file mode 100644 +index 0000000..abc293b +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/120-fix_bufferoverflow.patch +@@ -0,0 +1,11 @@ ++--- a/src/radius.c +++++ b/src/radius.c ++@@ -1002,7 +1002,7 @@ int radius_pwencode(struct radius_t *thi ++ } ++ ++ /* Copy first 128 octets of src into dst */ ++- if (srclen <= 128) +++ if (srclen > 128) ++ memcpy(dst, src, 128); ++ else ++ memcpy(dst, src, srclen); +diff --git a/feeds/packages/net/chillispot/patches/150-chillispot-rmtctrl.patch b/feeds/packages/net/chillispot/patches/150-chillispot-rmtctrl.patch +new file mode 100644 +index 0000000..db5df95 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/150-chillispot-rmtctrl.patch +@@ -0,0 +1,1529 @@ ++--- a/src/chilli.c +++++ b/src/chilli.c ++@@ -102,6 +102,7 @@ ++ #include "dhcp.h" ++ #include "cmdline.h" ++ #include "chilli.h" +++#include "remotectrl.h" ++ ++ struct options_t options; ++ ++@@ -127,6 +128,12 @@ static int do_sighup = 0; ++ /* Forward declarations */ ++ int static acct_req(struct app_conn_t *conn, int status_type); ++ int static config_radius(); +++void admin_disconnect(struct app_conn_t *appconn, int terminateCause); +++void admin_authorize(struct app_conn_t *appconn); +++int send_acct_head( struct rmt_socket_t *client, struct app_conn_t *appconn); +++int send_Connection( struct rmt_socket_t *client, struct app_conn_t *appconn ); +++int send_Acct_Setting ( struct rmt_socket_t *client, struct app_conn_t *appconn ); +++int send_Accounting( struct rmt_socket_t *client, struct app_conn_t *appconn ); ++ ++ /* Fireman catches falling childs and eliminates zombies */ ++ void static fireman(int signum) { ++@@ -180,19 +187,18 @@ int static leaky_bucket(struct app_conn_ ++ struct timeval timenow; ++ uint64_t timediff; /* In microseconds */ ++ int result = 0; ++- ++ ++ gettimeofday(&timenow, NULL); ++ ++ timediff = (timenow.tv_sec - conn->last_time.tv_sec) * ((uint64_t) 1000000); ++ timediff += (timenow.tv_usec - conn->last_time.tv_usec); ++ ++- /* if (options.debug) printf("Leaky bucket timediff: %lld, bucketup: %d, bucketdown: %d %d %d\n", ++- timediff, conn->bucketup, conn->bucketdown, ++- octetsup, octetsdown);*/ ++- ++- if (conn->bandwidthmaxup) { +++/* if (options.debug) +++ printf("Leaky bucket timediff: %lld, bucketup: %d, bucketdown: %d %d %d\n", +++ timediff, conn->bucketup, conn->bucketdown, octetsup, octetsdown); +++*/ ++ +++ if (conn->bandwidthmaxup) { ++ /* Subtract what the leak since last time we visited */ ++ if (conn->bucketup > ((timediff * conn->bandwidthmaxup)/8000000)) { ++ conn->bucketup -= (timediff * conn->bandwidthmaxup) / 8000000; ++@@ -200,9 +206,9 @@ int static leaky_bucket(struct app_conn_ ++ else { ++ conn->bucketup = 0; ++ } ++- +++// printf("octetsup: %d -> conn->bucketup+octetsup: %d > conn->bucketupsize: %d \n", octetsup, conn->bucketup + octetsup, conn->bucketupsize); ++ if ((conn->bucketup + octetsup) > conn->bucketupsize) { ++- /*if (options.debug) printf("Leaky bucket deleting uplink packet\n");*/ +++ if (options.debug) printf("Leaky bucket deleting uplink packet\n"); ++ result = -1; ++ } ++ else { ++@@ -217,9 +223,10 @@ int static leaky_bucket(struct app_conn_ ++ else { ++ conn->bucketdown = 0; ++ } +++// printf("octetsdown: %d -> conn->bucketdown+octetsdown: %d > conn->bucketdownsize: %d \n", octetsdown, conn->bucketdown + octetsdown, conn->bucketdownsize); ++ ++ if ((conn->bucketdown + octetsdown) > conn->bucketdownsize) { ++- /*if (options.debug) printf("Leaky bucket deleting downlink packet\n");*/ +++ if (options.debug) printf("Leaky bucket deleting downlink packet\n"); ++ result = -1; ++ } ++ else { ++@@ -233,6 +240,7 @@ int static leaky_bucket(struct app_conn_ ++ } ++ #endif /* ifndef NO_LEAKY_BUCKET */ ++ +++ ++ /* Run external script */ ++ ++ int set_env(char *name, char *value, int len, struct in_addr *addr, ++@@ -550,7 +558,7 @@ int static process_options(int argc, cha ++ return -1; ++ } ++ ++- if (cmdline_parser_configfile (args_info.conf_arg, &args_info, 0, 0, 0)) { +++ if (cmdline_parser_configfile (args_info.conf_arg, &args_info, 0, 0, 0)) { ++ sys_err(LOG_ERR, __FILE__, __LINE__, 0, ++ "Failed to parse configuration file: %s!", ++ args_info.conf_arg); ++@@ -1056,7 +1064,21 @@ int static process_options(int argc, cha ++ strlen(args_info.macallowed_arg[numargs]))) ++ return -1; ++ } ++- +++ /* remote monitor */ +++ /* Defaults to net plus 1 */ +++ if (!args_info.rmtlisten_arg) +++ options.rmtlisten.s_addr = options.uamlisten.s_addr; +++ else +++ if (!inet_aton(args_info.rmtlisten_arg, &options.rmtlisten)){ +++ sys_err(LOG_ERR, __FILE__, __LINE__, 0, +++ "Invalid Remote monitor IP address: %s!", args_info.rmtlisten_arg); +++ return -1; +++ } +++ /* rmtport */ +++ options.rmtport = args_info.rmtport_arg; +++ options.rmtpasswd = args_info.rmtpasswd_arg; +++ options.bandwidthmaxup = args_info.bandwidthmaxup_arg; +++ options.bandwidthmaxdown = args_info.bandwidthmaxdown_arg; ++ ++ /* foreground */ ++ /* If flag not given run as a daemon */ ++@@ -1095,7 +1117,6 @@ void static reprocess_options(int argc, ++ memcpy(&options, &options2, sizeof(options)); ++ return; ++ } ++- ++ /* Options which we do not allow to be affected */ ++ /* fg, conf and statedir are not stored in options */ ++ options.net = options2.net; /* net */ ++@@ -1123,6 +1144,13 @@ void static reprocess_options(int argc, ++ options.eapolenable = options2.eapolenable; /* eapolenable */ ++ options.pidfile = options2.pidfile; /* pidfile */ ++ +++ options.rmtlisten = options2.rmtlisten; /* remote listen */ +++ options.rmtport = options2.rmtport; /* remote port */ +++ options.rmtpasswd = options2.rmtpasswd; /* remote password */ +++ +++// options.bandwidthmaxup = options2.bandwidthmaxup; /* remote password */ +++// options.bandwidthmaxdown = options2.bandwidthmaxdown; /* remote password */ +++ ++ /* Reinit DHCP parameters */ ++ (void) dhcp_set(dhcp, (options.debug & DEBUG_DHCP), ++ options.uamserver, options.uamserverlen, options.uamanydns, ++@@ -3099,9 +3127,8 @@ int cb_radius_auth_conf(struct radius_t ++ appconn->bucketupsize = BUCKET_SIZE_MIN; ++ #endif ++ } ++- else { +++ else ++ appconn->bandwidthmaxup = 0; ++- } ++ ++ /* Bandwidth down */ ++ if (!radius_getattr(pack, &attr, RADIUS_ATTR_VENDOR_SPECIFIC, ++@@ -3116,9 +3143,8 @@ int cb_radius_auth_conf(struct radius_t ++ appconn->bucketdownsize = BUCKET_SIZE_MIN; ++ #endif ++ } ++- else { +++ else ++ appconn->bandwidthmaxdown = 0; ++- } ++ ++ #ifdef RADIUS_ATTR_CHILLISPOT_BANDWIDTH_MAX_UP ++ /* Bandwidth up */ ++@@ -3623,7 +3649,7 @@ int cb_dhcp_data_ind(struct dhcp_conn_t ++ appconn->input_octets +=len; ++ #ifndef NO_LEAKY_BUCKET ++ #ifdef COUNT_UPLINK_DROP ++- if (leaky_bucket(appconn, len, 0)) return 0; +++ if (leaky_bucket(appconn, len, 0)==-1) return 0; ++ #endif /* ifdef COUNT_UPLINK_DROP */ ++ #endif /* ifndef NO_LEAKY_BUCKET */ ++ } ++@@ -3889,6 +3915,10 @@ int main(int argc, char **argv) ++ struct sigaction act; ++ struct itimerval itval; ++ +++ struct rmt_socket_t srv; +++ struct rmt_socket_t client[MAX_CLIENTS]; +++ int activeClients = 0; /* Número clientes conectados */ +++ ++ /* open a connection to the syslog daemon */ ++ /*openlog(PACKAGE, LOG_PID, LOG_DAEMON);*/ ++ openlog(PACKAGE, (LOG_PID | LOG_PERROR), LOG_DAEMON); ++@@ -4046,6 +4076,8 @@ int main(int argc, char **argv) ++ if (options.debug) ++ printf("Waiting for client request...\n"); ++ +++ +++ srv = rmtctrl_initSrv(options.rmtlisten, options.rmtport); ++ ++ /******************************************************************/ ++ /* Main select loop */ ++@@ -4053,6 +4085,8 @@ int main(int argc, char **argv) ++ ++ while (keep_going) { ++ +++ rmtctrl_srv(srv,client,&activeClients); +++ ++ if (do_timeouts) { ++ /*if (options.debug) printf("Do timeouts!\n");*/ ++ (void) radius_timeout(radius); ++@@ -4178,3 +4212,487 @@ int main(int argc, char **argv) ++ return 0; ++ ++ } +++ +++void rmtctrl_msg_proccess(struct rmt_socket_t *client) +++{ +++ msg_head_t header; +++ char *msg=NULL; +++ char *reg=NULL; +++ struct app_conn_t *appconn; +++ struct dhcp_conn_t *dhcpconn; +++ char str[2048]; +++ int found=0; +++ int rslt=0; +++ int n; +++ uint64_t l; +++ rslt = rmtctrl_read_msg(client,&header,&msg); +++ if (rslt > 0) +++ { +++ switch (header.id) +++ { +++ case QRY_CONNECTED_LIST: +++ rslt += send_srvData(client); +++ rslt += rmtctrl_write_msg(client,MSG_START,0, "\n" ); +++ rslt += rmtctrl_write_msg(client,MSG_PART,0, "Ord ---------- User Name ----------- -- MAC Address -- -- IP Address - -- Input - - Output - Sta\n" ); +++ for (n=0; ninuse != 0)){ +++ dhcpconn = (struct dhcp_conn_t*) appconn->dnlink; +++ found++; +++ l = found; +++ rslt += send_number(client, MSG_PART, 0, "%3s ", l); +++ rslt += send_line(client,MSG_PART,0, "%-32s ",appconn->proxyuser); +++ rslt += send_mac(client,MSG_PART,0, "%17s ",appconn->hismac); +++ rslt += send_line(client,MSG_PART,0, "%15s ",inet_ntoa(appconn->hisip)); +++ rslt += send_number(client,MSG_PART,0, "%10s ",appconn->input_octets); +++ rslt += send_number(client,MSG_PART,0, "%10s ",appconn->output_octets); +++ rslt += send_number(client, MSG_PART, 0, " %s ",appconn->authenticated); +++ rslt += send_number(client, MSG_PART, 0, " %s \n",dhcpconn->authstate); +++ } +++ } +++ rslt += send_number(client,MSG_END,found, "Total of connected device(s) %s\n",found); +++ break; +++ case QRY_CONNECTED_FULL_LIST: +++ rslt += send_srvData(client); +++ rslt += rmtctrl_write_msg(client,MSG_START,0, "\n" ); +++ for (n=0; ninuse != 0)){ +++ found++; +++ l = found; +++ rslt += send_number(client, MSG_PART, 0, "Connection : %s\n{\n", l); +++ rslt += send_acct_head( client, appconn); +++ rslt += send_line(client, MSG_PART, 0, "%s\n", "}"); +++ } +++ } +++ rslt += send_number(client, MSG_END, found, "Total of connected device(s) %s\n",found); +++ break; +++ case QRY_STATUS: +++ /// +++ rslt += send_Status(client, appconn); +++ break; +++ case CMD_AUTHORIZE: +++ for (n=0; ninuse != 0) && (appconn->authenticated == 0)) +++ { +++ switch (header.extra) +++ { +++ case EXTRA_MAC_OP: +++ if ( strcmp(msg,mac2str(appconn->hismac)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_IP_OP: +++ if ( strcmp(msg,inet_ntoa(appconn->hisip)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_USER_OP: +++ if ( strcmp(msg,appconn->proxyuser) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ default: +++ found++; +++ l=1; +++ break; +++ } +++ if ( l == 1 ){ +++ admin_authorize(appconn); +++ rslt += send_srvData( client ); +++ rslt += rmtctrl_write_msg(client,MSG_PART,0, " \n" ); +++ rslt += send_acct_head( client, appconn); +++ sys_err(LOG_NOTICE, __FILE__, __LINE__, 0, +++ "Admin Authorize MAC=%s IP=%s", +++ mac2str(appconn->hismac), inet_ntoa(appconn->hisip)); +++ } +++ } +++ } +++ if (found == 0) +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "Not device found to Authorze\n" ); +++ else +++ { +++ rslt += send_number(client, MSG_END, found, "Autorized %s device(s)\n",found); +++ } +++ break; +++ case CMD_DISCONNECT: +++ for (n=0; ninuse != 0) && (appconn->authenticated == 1)) +++ { +++ if (dhcpconn = (struct dhcp_conn_t*) appconn->dnlink) { +++ switch (header.extra) +++ { +++ case EXTRA_MAC_OP: +++ if ( strcmp(msg,mac2str(appconn->hismac)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_IP_OP: +++ if ( strcmp(msg,inet_ntoa(appconn->hisip)) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ case EXTRA_USER_OP: +++ if ( strcmp(msg,appconn->proxyuser) == 0) +++ { +++ found++; +++ l=1; +++ break; +++ } +++ break; +++ default: +++ found++; +++ l=1; +++ break; +++ } +++ if ( l == 1 ) { +++ rslt += send_srvData( client ); +++ rslt += rmtctrl_write_msg(client,MSG_PART,0, " \n" ); +++ rslt += send_acct_head( client, appconn); +++ admin_disconnect(appconn, RADIUS_TERMINATE_CAUSE_ADMIN_RESET); +++ sys_err(LOG_NOTICE, __FILE__, __LINE__, 0, +++ "Admin Disconnect username=%s IP=%s", +++ appconn->user, inet_ntoa(appconn->hisip)); +++ } +++ } +++ } +++ } +++ if (found == 0) +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "Not decice found to Disconnect\n" ); +++ else +++ { +++ rslt += send_number(client, MSG_END, found, "Disconnect %s device(s)\n",found); +++ } +++ break; +++ default: +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "Unknow command.\n" ); +++ break; +++ } +++ } +++ else +++ { +++ printf("Desde %s se recibieron %d bytes y se enviaron %d bytes\n",inet_ntoa(client->addr.sin_addr),client->Rx,client->Tx); +++ close(client->fd); /* cierra fd_rmt_client */ +++ printf("Client cerro conexión desde %s\n",inet_ntoa(client->addr.sin_addr) ); +++ client->fd = -1; +++ } +++ if(msg) +++ free(msg); +++} +++ +++void admin_authorize(struct app_conn_t *appconn) +++{ +++ struct radius_packet_t radius_pack; +++ strcpy(appconn->user,"Admin-Authorize"); +++ strcpy(appconn->proxyuser,"Admin-Authorize"); +++ appconn->proxyuserlen = strlen(appconn->proxyuser); +++ appconn->interim_interval = 600; +++ appconn->terminate_cause = 0; +++ appconn->idletimeout = 300; +++ +++ radius_default_pack(radius, &radius_pack, RADIUS_CODE_ACCESS_REQUEST); +++ radius_pack.code = RADIUS_CODE_ACCESS_REQUEST; +++// (void) radius_addattr(radius, &radius_pack, RADIUS_ATTR_USER_NAME, 0, 0, 0, +++// (uint8_t*) appconn->proxyuser, appconn->proxyuserlen); +++ +++ if ( options.bandwidthmaxup > 0 ){ +++ appconn->bandwidthmaxup = options.bandwidthmaxup * 1024; +++ appconn->bucketupsize = BUCKET_TIME * appconn->bandwidthmaxup / 8000; +++ if (appconn->bucketupsize < BUCKET_SIZE_MIN) +++ appconn->bucketupsize = BUCKET_SIZE_MIN; +++ } +++ if ( options.bandwidthmaxdown > 0 ){ +++ appconn->bandwidthmaxdown = options.bandwidthmaxdown * 1024; +++ appconn->bucketdownsize = BUCKET_TIME * appconn->bandwidthmaxdown / 8000; +++ if (appconn->bucketdownsize < BUCKET_SIZE_MIN) +++ appconn->bucketdownsize = BUCKET_SIZE_MIN; +++ } +++ dnprot_accept(appconn); +++} +++ +++void admin_disconnect(struct app_conn_t *appconn, int terminateCause) +++{ +++ dnprot_terminate(appconn); +++ (void) acct_req(appconn, RADIUS_STATUS_TYPE_STOP); +++ set_sessionid(appconn); +++} +++ +++int send_acct_head( struct rmt_socket_t *client, struct app_conn_t *appconn) +++{ +++ int rslt; +++ rslt += send_Connection( client, appconn ); +++ rslt += send_Acct_Setting( client, appconn ); +++ rslt += send_Accounting( client, appconn ); +++ return rslt; +++} +++ +++int send_Connection( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ int rslt; +++ uint64_t l; +++ rslt += send_line(client, MSG_PART, 0, "\tSession-Id = %s\n",appconn->sessionid); +++ rslt += send_line(client, MSG_PART, 0, "\tUser-Name = %s\n",appconn->user); +++// rslt = send_line(client, MSG_PART, 0, "\tnasip=%s\n",appconn->nasip); +++ rslt += send_mac(client, MSG_PART, 0, "\tClient-Mac-Address = %s\n",appconn->hismac); +++ rslt += send_mac(client, MSG_PART, 0, "\tNas-Mac-Address = %s\n",appconn->ourmac); +++// rslt += send_line(client, MSG_PART, 0, "\tourip=%s\n",inet_ntoa(appconn->ourip)); +++ rslt += send_line(client, MSG_PART, 0, "\tClient-Ip = %s\n",inet_ntoa(appconn->hisip)); +++ rslt += send_line(client, MSG_PART, 0, "\tClient-Require-Ip = %s\n",inet_ntoa(appconn->reqip)); +++ rslt += send_number(client, MSG_PART, 0, "\tAutheticated = %s\n",appconn->authenticated); +++ l = appconn->uamtime; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tUAM-Time = %s\n",l); +++ if (strlen(appconn->userurl)>0) +++ rslt = send_line(client, MSG_PART, 0, "\tUser-URL = %s\n",appconn->userurl); +++ return rslt; +++} +++ +++int send_Acct_Setting ( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ int rslt = 0; +++ uint64_t l; +++ if (appconn->authenticated == 0 ) return 0; +++ /* Account Settings */ +++ l = appconn->sessionterminatetime; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tSession-Terminate-Time = %s\n",l); +++ l = appconn->sessiontimeout; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tSession-Timeout = %s\n",l); +++ l = appconn->idletimeout; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tIdle-Timeout = %s\n",l); +++ l = appconn->bandwidthmaxup; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBandwidth-Max-Up = %s\n",l); +++ l = appconn->bandwidthmaxdown; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBandwidth-Max-Down = %s\n",l); +++ l = appconn->maxinputoctets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tMax-Input-Octets = %s\n",l); +++ l = appconn->maxoutputoctets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tMax-Output-Octets = %s\n",l); +++ l = appconn->maxtotaloctets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tMax-Total-Octets = %s\n",l); +++ return rslt; +++} +++ +++int send_Accounting( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ if (appconn->authenticated == 0 ) return 0; +++ int rslt = 0; +++ uint64_t l; +++ l = appconn->start_time.tv_sec; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tStart-Time = %s\n",l); +++ l = appconn->interim_time.tv_sec; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInterim-Time = %s\n",l); +++ l = appconn->interim_interval; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInterim-Interval = %s\n",l); +++ l = appconn->last_time.tv_sec; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tLast-Time = %s\n",l); +++ l = appconn->input_packets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInput-Packets = %s\n",l); +++ l = appconn->output_packets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tOutput-Packets = %s\n",l); +++ l = appconn->input_octets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tInput-Octets = %s\n",l); +++ l = appconn->output_octets; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tOutput-Octets = %s\n",l); +++ l = appconn->terminate_cause; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tTerminate-Cause = %s\n",l); +++ l = appconn->bucketup; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Up = %s\n",l); +++ l = appconn->bucketdown; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Down = %s\n",l); +++ l = appconn->bucketupsize; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Up-Size = %s\n",l); +++ l = appconn->bucketdownsize; +++ if (l > 0) +++ rslt += send_number(client, MSG_PART, 0, "\tBucket-Down-Size = %s\n",l); +++ return rslt; +++} +++ +++int send_srvData( struct rmt_socket_t *client) +++{ +++ int rslt=0; +++ rslt += send_line(client, MSG_PART, 0, "%s\n",options.radiusnasid); +++ if (options.radiuslocationid) +++ rslt += send_line(client, MSG_PART, 0, "\tLOCATION ID:%s\n",options.radiuslocationid); +++ if (options.radiuslocationname) +++ rslt += send_line(client, MSG_PART, 0, "\tLOCATION NAME:%s\n",options.radiuslocationname); +++// rslt += send_line(client, MSG_PART, 0, "\tDEVICE: %s ",tun->devname); +++// rslt += send_line(client, MSG_PART, 0, "INTERFACE: %s\n",options.dhcpif); +++// rslt += send_line(client, MSG_PART, 0, "\tIP ADDR: %s ",inet_ntoa(options.dhcplisten)); +++// rslt += send_line(client, MSG_PART, 0, "NETWORK: %s ",inet_ntoa(options.net)); +++// rslt += send_line(client, MSG_PART, 0, "MASK: %s\n",inet_ntoa(options.mask)); +++ if (options.dns1.s_addr) +++ rslt += send_line(client, MSG_PART, 0, "\tDNS SERVERS: %s - ",inet_ntoa(options.dns1)); +++ if (options.dns2.s_addr) +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.dns2)); +++ rslt += send_line(client, MSG_PART, 0, "\tRADIUS SERVERS: %s - ",inet_ntoa(options.radiusserver1)); +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.radiusserver2)); +++ return rslt; +++} +++ +++int send_Status( struct rmt_socket_t *client, struct app_conn_t *appconn ) +++{ +++ int rslt = 0; +++ int n; +++ uint64_t l; +++ l = options.debug; +++ rslt += send_number(client, MSG_PART, 0, "\tdebug=%s\n",l); +++ /* conf */ +++ l = options.interval; +++ rslt += send_number(client, MSG_PART, 0, "\tinterval=%s\n",l); +++ rslt += send_line(client, MSG_PART, 0, "\tpidfile=%s\n",options.pidfile); +++ /* TUN parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tnet=%s\n",inet_ntoa(options.net)); /* Network IP address */ +++ rslt += send_line(client, MSG_PART, 0, "\tmask=%s\n",inet_ntoa(options.mask)); /* Network mask */ +++ rslt += send_line(client, MSG_PART, 0, "\tnetc=%s\n",options.netc); +++ rslt += send_line(client, MSG_PART, 0, "\tmaskc=%s\n",options.maskc); +++ l = options.allowdyn; +++ rslt += send_number(client, MSG_PART, 0, "\tallowdyn=%s\n",l); /* Allow dynamic address allocation */ +++ rslt += send_line(client, MSG_PART, 0, "\tdynip=%s\n",options.dynip); /* Dynamic IP address pool */ +++ +++ l = options.allowstat; +++ rslt += send_number(client, MSG_PART, 0, "\tallowstat=%s\n",l); /* Allow static address allocation */ +++ rslt += send_line(client, MSG_PART, 0, "\tstatip=%s\n",options.statip); /* Static IP address pool */ +++ +++ rslt += send_line(client, MSG_PART, 0, "\tdns1=%s\n",inet_ntoa(options.dns1)); /* Primary DNS server IP address */ +++ rslt += send_line(client, MSG_PART, 0, "\tdns2=%s\n",inet_ntoa(options.dns2)); /* Secondary DNS server IP address */ +++ rslt += send_line(client, MSG_PART, 0, "\tdomain=%s\n",options.domain); /* Domain to use for DNS lookups */ +++ rslt += send_line(client, MSG_PART, 0, "\tipup=%s\n",options.ipup); /* Script to run after link-up */ +++ rslt += send_line(client, MSG_PART, 0, "\tipdown=%s\n",options.ipdown); /* Script to run after link-down */ +++ rslt += send_line(client, MSG_PART, 0, "\tconup=%s\n",options.conup); /* Script to run after user logon */ +++ rslt += send_line(client, MSG_PART, 0, "\tcondown=%s\n",options.condown); /* Script to run after user logoff */ +++ /* Radius parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuslisten=%s\n",inet_ntoa(options.radiuslisten)); /* IP address to listen to */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusserver1=%s\n",inet_ntoa(options.radiusserver1)); /* IP address of radius server 1 */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusserver2=%s\n",inet_ntoa(options.radiusserver2)); /* IP address of radius server 2 */ +++ l = options.radiusauthport; +++ rslt += send_number(client, MSG_PART, 0, "\tradiusauthport=%s\n",l); /* Authentication UDP port */ +++ l = options.radiusacctport; +++ rslt += send_number(client, MSG_PART, 0, "\tradiusacctport=%s\n",l); /* Accounting UDP port */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiussecret=%s\n",options.radiussecret); /* Radius shared secret */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusnasid=%s\n",options.radiusnasid); /* Radius NAS-Identifier */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuscalled=%s\n",options.radiuscalled); /* Radius Called-Station-ID */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiusnasip=%s\n",inet_ntoa(options.radiusnasip)); /* Radius NAS-IP-Address */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuslocationid=%s\n",options.radiuslocationid); /* WISPr location ID */ +++ rslt += send_line(client, MSG_PART, 0, "\tradiuslocationname=%s\n",options.radiuslocationname); /* WISPr location name */ +++ l = options.radiusnasporttype; +++ rslt += send_number(client, MSG_PART, 0, "\tradiusnasporttype=%s\n",l); /* NAS-Port-Type */ +++ l = options.coaport; +++ rslt += send_number(client, MSG_PART, 0, "\tcoaport=%s\n",l); /* UDP port to listen to */ +++ l = options.coanoipcheck; +++ rslt += send_number(client, MSG_PART, 0, "\tcoaipcheck=%s\n",l); /* Allow disconnect from any IP */ +++ /* Radius proxy parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxylisten=%s\n",inet_ntoa(options.proxylisten)); /* IP address to listen to */ +++ l = options.proxyport; +++ rslt += send_number(client, MSG_PART, 0, "\tproxyport=%s\n",l); /* UDP port to listen to */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxyaddr=%s\n",inet_ntoa(options.proxyaddr)); /* IP address of proxy client(s) */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxymask=%s\n",inet_ntoa(options.proxymask)); /* IP mask of proxy client(s) */ +++ rslt += send_line(client, MSG_PART, 0, "\tproxysecret=%s\n",options.proxysecret); /* Proxy shared secret */ +++ /* Radius configuration management parameters */ +++ rslt += send_line(client, MSG_PART, 0, "\tconfusername=%s\n",options.confusername); /* Username for remote config */ +++ rslt += send_line(client, MSG_PART, 0, "\tconfpassword=%s\n",options.confpassword); /* Password for remote config */ +++ /* DHCP parameters */ +++ l = options.nodhcp; +++ rslt += send_number(client, MSG_PART, 0, "\tnodhcp=%s\n",l); /* Do not use DHCP */ +++ rslt += send_line(client, MSG_PART, 0, "\tdhcpif=%s\n",options.dhcpif); /* Interface: eth0 */ +++ rslt += send_mac(client, MSG_PART, 0, "\tdhcpmac=%s\n",options.dhcpmac); /* Interface MAC address */ +++ l = options.dhcpusemac; +++ rslt += send_number(client, MSG_PART, 0, "\tdhcpusemac=%s\n",l); /* Use given MAC or interface default */ +++ rslt += send_line(client, MSG_PART, 0, "\tdhcplisten=%s\n",inet_ntoa(options.dhcplisten)); /* IP address to listen to */ +++ l = options.lease; +++ rslt += send_number(client, MSG_PART, 0, "\tlease=%s\n",l); /* DHCP lease time */ +++ /* EAPOL parameters */ +++ l = options.eapolenable; +++ rslt += send_number(client, MSG_PART, 0, "\teapolenable=%s\n",l); /* Use eapol */ +++ /* UAM parameters */ +++ l = options.uamserverlen; +++ rslt += send_number(client, MSG_PART, 0, "\tuamserverlen=%s\n",l); /* Number of UAM servers */ +++ for (n = 0; n < options.uamserverlen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tuamokip[%s]=",n); +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.uamserver[n])); /* IP address of UAM server */ +++ } +++ l = options.uamserverport; +++ rslt += send_number(client, MSG_PART, 0, "\tuamserverport=%s\n",l); /* Port of UAM server */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamsecret=%s\n",options.uamsecret); /* Shared secret */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamurl=%s\n",options.uamurl); /* URL of authentication server */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamhomepage=%s\n",options.uamhomepage); /* URL of redirection homepage */ +++ l = options.uamhomepageport; +++ rslt += send_number(client, MSG_PART, 0, "\tuamhomepageport=%s\n",l); /* Port of redirection homepage */ +++ rslt += send_line(client, MSG_PART, 0, "\tuamlisten=%s\n",inet_ntoa(options.uamlisten)); /* IP address of local authentication */ +++ l = options.uamport; +++ rslt += send_number(client, MSG_PART, 0, "\tuamport=%s\n",l); /* TCP port to listen to */ +++ l = options.uamokiplen; +++ rslt += send_number(client, MSG_PART, 0, "\tuamokiplen=%s\n",l); /* Number of allowed IP addresses */ +++ for (n=0; n < options.uamokiplen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tuamokip[%s]=",n); +++ rslt = send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.uamokip[n])); /* List of allowed IP addresses */ +++ } +++ l = options.uamoknetlen; +++ rslt += send_number(client, MSG_PART, 0, "\tuamoknetlen=%s\n",l); /* Number of networks */ +++ for (n=0; n < options.uamoknetlen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tuamoknet[%s]=",n); +++ rslt += send_line(client, MSG_PART, 0, "%s/",inet_ntoa(options.uamokaddr[n])); /* List of allowed network IP */ +++ rslt += send_line(client, MSG_PART, 0, "%s\n",inet_ntoa(options.uamokmask[n])); /* List of allowed network mask */ +++ } +++ l = options.uamanydns; +++ rslt += send_number(client, MSG_PART, 0, "\tuamanydns=%s\n",l); /* Allow client to use any DNS server */ +++ /* MAC Authentication */ +++ l = options.macauth; +++ rslt += send_number(client, MSG_PART, 0, "\tmacauth=%s\n",l); /* Use MAC authentication */ +++ l = options.macoklen; +++ rslt += send_number(client, MSG_PART, 0, "\tmacoklen=%s\n",l); /* Number of MAC addresses */ +++ for (n=0; n < options.macoklen; n++){ +++ rslt += send_number(client, MSG_PART, 0, "\tmacok[%s]=",n); +++ rslt += send_mac(client, MSG_PART, 0, "\%s\n",options.macok[n]); /* Allowed MACs */ +++ } +++ rslt += send_line(client, MSG_PART, 0, "\tmacsuffix=%s\n",options.macsuffix); +++ rslt += send_line(client, MSG_PART, 0, "\tmacpasswd=%s\n",options.macpasswd); +++ +++ rslt += send_line(client, MSG_PART, 0, "\trmtlisten=%s\n",inet_ntoa(options.rmtlisten)); +++ l = options.rmtport; +++ rslt += send_number(client, MSG_PART, 0, "\trmtport=%s\n",l); /* Number of MAC addresses */ +++ rslt += send_line(client, MSG_PART, 0, "\trmtpasswd=%s\n",options.rmtpasswd); +++ rslt += send_number(client, MSG_PART, 0, "\tbandwidthmaxup=%s\n",options.bandwidthmaxup); +++ rslt += send_number(client, MSG_PART, 0, "\tbandwidthmaxdown=%s\n",options.bandwidthmaxdown); +++ rslt += rmtctrl_write_msg(client,MSG_END,0, "End of configuration\n"); +++} ++--- a/src/chilli.h +++++ b/src/chilli.h ++@@ -50,8 +50,8 @@ ++ /* If the constants below are defined packets which have been dropped ++ by the traffic shaper will be counted towards accounting and ++ volume limitation */ ++-/* #define COUNT_DOWNLINK_DROP 1 */ ++-/* #define COUNT_UPLINK_DROP 1 */ +++#define COUNT_DOWNLINK_DROP 1 +++#define COUNT_UPLINK_DROP 1 ++ ++ #define APP_NUM_CONN 128 ++ #define EAP_LEN 2048 /* TODO: Rather large */ ++@@ -68,7 +68,7 @@ ++ #define CHALLENGESIZE 24 /* From chap.h MAX_CHALLENGE_LENGTH */ ++ #define USERURLSIZE 256 /* Max length of URL requested by user */ ++ ++-#define BUCKET_SIZE 300000 /* Size of leaky bucket (~200 packets) */ +++//#define BUCKET_SIZE 300000 /* Size of leaky bucket (~200 packets) */ ++ ++ /* Time length of leaky bucket in milliseconds */ ++ /* Bucket size = BUCKET_TIME * Bandwidth-Max radius attribute */ ++@@ -194,12 +194,14 @@ struct app_conn_t { ++ struct in_addr dns1; ++ struct in_addr dns2; ++ struct timeval last_time; /* Last time a packet was received or sent */ +++ struct timeval last_up_time; /* Last time a packet was received or sent */ +++ struct timeval last_down_time; /* Last time a packet was received or sent */ ++ ++ /* Leaky bucket */ ++- uint32_t bucketup; ++- uint32_t bucketdown; ++- uint32_t bucketupsize; ++- uint32_t bucketdownsize; +++ uint64_t bucketup; +++ uint64_t bucketdown; +++ uint64_t bucketupsize; +++ uint64_t bucketdownsize; ++ ++ /* UAM information */ ++ uint8_t uamchal[REDIR_MD5LEN]; ++@@ -305,6 +307,11 @@ struct options_t { ++ int macoklen; /* Number of MAC addresses */ ++ char* macsuffix; /* Suffix to add to MAC address */ ++ char* macpasswd; /* Password to use for MAC authentication */ +++ struct in_addr rmtlisten; /* IP address of remote monitor and config */ +++ int rmtport; /* TCP port to listen to monitor and config*/ +++ char* rmtpasswd; /* Password to use for MAC authentication */ +++ int bandwidthmaxup; /* Default Max Up Bandwith setting */ +++ int bandwidthmaxdown; /* Default Max Up Bandwith setting */ ++ }; ++ ++ extern struct app_conn_t connection[APP_NUM_CONN]; ++--- a/src/cmdline.c +++++ b/src/cmdline.c ++@@ -113,6 +113,11 @@ void clear_given (struct gengetopt_args_ ++ args_info->macallowed_given = 0 ; ++ args_info->macsuffix_given = 0 ; ++ args_info->macpasswd_given = 0 ; +++ args_info->rmtlisten_given = 0 ; +++ args_info->rmtport_given = 0 ; +++ args_info->rmtpasswd_given = 0 ; +++ args_info->bandwidthmaxup_given = 0 ; +++ args_info->bandwidthmaxdown_given = 0 ; ++ } ++ ++ static ++@@ -216,7 +221,19 @@ void clear_args (struct gengetopt_args_i ++ args_info->macsuffix_orig = NULL; ++ args_info->macpasswd_arg = gengetopt_strdup ("password"); ++ args_info->macpasswd_orig = NULL; ++- +++ args_info->rmtport_arg = 3991; +++ args_info->rmtport_orig = NULL; +++ args_info->rmtlisten_arg = gengetopt_strdup("127.0.0.1"); +++ args_info->rmtlisten_orig = NULL; +++ args_info->rmtport_orig = NULL; +++ args_info->rmtpasswd_arg = NULL; +++ args_info->rmtpasswd_orig = NULL; +++ +++ args_info->bandwidthmaxup_arg = 0; +++ args_info->bandwidthmaxup_orig = NULL; +++ args_info->bandwidthmaxdown_arg = 0; +++ args_info->bandwidthmaxdown_orig = NULL; +++ ++ } ++ ++ void ++@@ -284,7 +301,12 @@ cmdline_parser_print_help (void) ++ printf("%s\n"," --macauth Authenticate based on MAC address \n (default=off)"); ++ printf("%s\n"," --macallowed=STRING List of allowed MAC addresses"); ++ printf("%s\n"," --macsuffix=STRING Suffix to add to the MAC address"); ++- printf("%s\n"," --macpasswd=STRING Password used when performing MAC \n authentication (default=`password')"); +++ printf("%s\n"," --macpasswd=STRING Password used when performing MAC \n authentication (default='password')"); +++ printf("%s\n"," --rmtlisten=STRING IP address to listen to for monitor and \n configuration (default=`127.0.0.1')"); +++ printf("%s\n"," --rmtport=INT TCP port to bind to for monitor and \n configuration (default=`3991')"); +++ printf("%s\n"," --rmtpasswd=STRING Password used for remote monitor and \n configuration\n"); +++ printf("%s\n"," --bandwidthmaxup=INT Deafaul Max Up Setting in Kilobits\n"); +++ printf("%s\n"," --bandwidthmaxdown=INT Deafaul Max Down Setting in Kilobits\n"); ++ ++ } ++ ++@@ -675,6 +697,11 @@ cmdline_parser_release (struct gengetopt ++ free (args_info->uamport_orig); /* free previous argument */ ++ args_info->uamport_orig = 0; ++ } +++ if (args_info->macpasswd_orig) +++ { +++ free (args_info->macpasswd_orig); /* free previous argument */ +++ args_info->macpasswd_orig = 0; +++ } ++ if (args_info->uamallowed_arg) ++ { ++ for (i = 0; i < args_info->uamallowed_given; ++i) ++@@ -739,6 +766,34 @@ cmdline_parser_release (struct gengetopt ++ free (args_info->macpasswd_orig); /* free previous argument */ ++ args_info->macpasswd_orig = 0; ++ } +++ if (args_info->rmtlisten_orig) +++ { +++ free (args_info->rmtlisten_orig); /* free previous argument */ +++ args_info->rmtlisten_orig = 0; +++ } +++ if (args_info->rmtport_orig) +++ { +++ free (args_info->rmtport_orig); /* free previous argument */ +++ args_info->rmtport_orig = 0; +++ } +++ +++ if (args_info->rmtpasswd_orig) +++ { +++ free (args_info->rmtpasswd_orig); // free previous argument +++ args_info->rmtpasswd_orig = 0; +++ } +++ +++ if (args_info->bandwidthmaxup_orig) +++ { +++ free (args_info->bandwidthmaxup_orig); // free previous argument +++ args_info->bandwidthmaxup_orig = 0; +++ } +++ +++ if (args_info->bandwidthmaxdown_orig) +++ { +++ free (args_info->bandwidthmaxdown_orig); // free previous argument +++ args_info->bandwidthmaxdown_orig = 0; +++ } ++ ++ clear_given (args_info); ++ } ++@@ -1109,7 +1164,41 @@ cmdline_parser_file_save(const char *fil ++ fprintf(outfile, "%s\n", "macpasswd"); ++ } ++ } ++- +++ if (args_info->rmtlisten_given) { +++ if (args_info->rmtlisten_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "rmtlisten", args_info->rmtlisten_orig); +++ } else { +++ fprintf(outfile, "%s\n", "rmtlisten"); +++ } +++ } +++ if (args_info->rmtport_given) { +++ if (args_info->rmtport_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "rmtport", args_info->rmtport_orig); +++ } else { +++ fprintf(outfile, "%s\n", "rmtport"); +++ } +++ } +++ if (args_info->rmtpasswd_given) { +++ if (args_info->rmtpasswd_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "rmtpasswd", args_info->rmtpasswd_orig); +++ } else { +++ fprintf(outfile, "%s\n", "rmtpasswd"); +++ } +++ } +++ if (args_info->bandwidthmaxup_given) { +++ if (args_info->bandwidthmaxup_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "bandwidthmaxup", args_info->bandwidthmaxup_orig); +++ } else { +++ fprintf(outfile, "%s\n", "bandwidthmaxup"); +++ } +++ } +++ if (args_info->bandwidthmaxdown_given) { +++ if (args_info->bandwidthmaxdown_orig) { +++ fprintf(outfile, "%s=\"%s\"\n", "bandwidthmaxdown", args_info->bandwidthmaxdown_orig); +++ } else { +++ fprintf(outfile, "%s\n", "bandwidthmaxdown"); +++ } +++ } ++ fclose (outfile); ++ ++ i = EXIT_SUCCESS; ++@@ -1221,6 +1310,7 @@ cmdline_parser_internal (int argc, char ++ { ++ int c; /* Character of the parsed option. */ ++ char *multi_token, *multi_next; /* for multiple options */ +++ char quehace[100]; ++ ++ int i; /* Counter */ ++ ++@@ -1299,6 +1389,11 @@ cmdline_parser_internal (int argc, char ++ { "macallowed", 1, NULL, 0 }, ++ { "macsuffix", 1, NULL, 0 }, ++ { "macpasswd", 1, NULL, 0 }, +++ { "rmtport", 1, NULL, 0 }, +++ { "rmtlisten", 1, NULL, 0 }, +++ { "rmtpasswd", 1, NULL, 0 }, +++ { "bandwidthmaxup", 1, NULL, 0 }, +++ { "bandwidthmaxdown", 1, NULL, 0 }, ++ { NULL, 0, NULL, 0 } ++ }; ++ ++@@ -1380,8 +1475,6 @@ cmdline_parser_internal (int argc, char ++ free (args_info->net_orig); /* free previous string */ ++ args_info->net_orig = gengetopt_strdup (optarg); ++ break; ++- ++- ++ case 0: /* Long option with no short option */ ++ /* Which modules to print debug messages for. */ ++ if (strcmp (long_options[option_index].name, "debugfacility") == 0) ++@@ -2273,7 +2366,93 @@ cmdline_parser_internal (int argc, char ++ free (args_info->macpasswd_orig); /* free previous string */ ++ args_info->macpasswd_orig = gengetopt_strdup (optarg); ++ } ++- +++ /* IP address to listen to for remote monitor and config. */ +++ else if (strcmp (long_options[option_index].name, "rmtlisten") == 0) +++ { +++ if (local_args_info.rmtlisten_given) +++ { +++ fprintf (stderr, "%s: `--rmtlisten' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->rmtlisten_given && ! override) +++ continue; +++ local_args_info.rmtlisten_given = 1; +++ args_info->rmtlisten_given = 1; +++ if (args_info->rmtlisten_arg) +++ free (args_info->rmtlisten_arg); /* free previous string */ +++ args_info->rmtlisten_arg = gengetopt_strdup (optarg); +++ if (args_info->rmtlisten_orig) +++ free (args_info->rmtlisten_orig); /* free previous string */ +++ args_info->rmtlisten_orig = gengetopt_strdup (optarg); +++ } +++ /* TCP port to bind to for authentication requests. */ +++ else if (strcmp (long_options[option_index].name, "rmtport") == 0) +++ { +++ if (local_args_info.rmtport_given) +++ { +++ fprintf (stderr, "%s: `--rmtport' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->rmtport_given && ! override) +++ continue; +++ local_args_info.rmtport_given = 1; +++ args_info->rmtport_given = 1; +++ args_info->rmtport_arg = strtol (optarg,&stop_char,0); +++ if (args_info->rmtport_orig) +++ free (args_info->rmtport_orig); /* free previous string */ +++ args_info->rmtport_orig = gengetopt_strdup (optarg); +++ } +++ /* Password used when performing remote config. */ +++ else if (strcmp (long_options[option_index].name, "rmtpasswd") == 0) +++ { +++ if (local_args_info.rmtpasswd_given) +++ { +++ fprintf (stderr, "%s: `--rmtpasswd' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->rmtpasswd_given && ! override) +++ continue; +++ local_args_info.rmtpasswd_given = 1; +++ args_info->rmtpasswd_given = 1; +++ if (args_info->rmtpasswd_arg) +++ free (args_info->rmtpasswd_arg); // free previous string +++ args_info->rmtpasswd_arg = gengetopt_strdup (optarg); +++ if (args_info->rmtpasswd_orig) +++ free (args_info->rmtpasswd_orig); // free previous string +++ args_info->rmtpasswd_orig = gengetopt_strdup (optarg); +++ } +++ else if (strcmp (long_options[option_index].name, "bandwidthmaxup") == 0) +++ { +++ if (local_args_info.bandwidthmaxup_given) +++ { +++ fprintf (stderr, "%s: `--bandwidthmaxup' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->bandwidthmaxup_given && ! override) +++ continue; +++ local_args_info.bandwidthmaxup_given = 1; +++ args_info->bandwidthmaxup_given = 1; +++ args_info->bandwidthmaxup_arg = strtol (optarg,&stop_char,0); +++ if (args_info->bandwidthmaxup_orig) +++ free (args_info->bandwidthmaxup_orig); /* free previous string */ +++ args_info->bandwidthmaxup_orig = gengetopt_strdup (optarg); +++ } +++ else if (strcmp (long_options[option_index].name, "bandwidthmaxdown") == 0) +++ { +++ if (local_args_info.bandwidthmaxdown_given) +++ { +++ fprintf (stderr, "%s: `--bandwidthmaxdown' option given more than once%s\n", argv[0], (additional_error ? additional_error : "")); +++ goto failure; +++ } +++ if (args_info->bandwidthmaxdown_given && ! override) +++ continue; +++ local_args_info.bandwidthmaxdown_given = 1; +++ args_info->bandwidthmaxdown_given = 1; +++ args_info->bandwidthmaxdown_arg = strtol (optarg,&stop_char,0); +++ if (args_info->bandwidthmaxdown_orig) +++ free (args_info->bandwidthmaxdown_orig); /* free previous string */ +++ args_info->bandwidthmaxdown_orig = gengetopt_strdup (optarg); +++ } ++ break; ++ case '?': /* Invalid option. */ ++ /* `getopt_long' already printed an error message. */ ++--- a/src/cmdline.ggo +++++ b/src/cmdline.ggo ++@@ -119,3 +119,12 @@ option "macallowed" - "List of allowed ++ option "macsuffix" - "Suffix to add to the MAC address" string no ++ option "macpasswd" - "Password used when performing MAC authentication" string default="password" no ++ +++# Remote Monitor and Config +++option "rmtlisten" - "IP address to listen to for authentication requests" string default="127.0.0.1" no +++option "rmtport" - "TCP port to bind to for authentication requests" int default="3991" no +++option "rmtpasswd" - "Password used when performing MAC authentication" string no +++ +++# Extra settings +++option "bandwidthmaxup" - "Default bandwidth control to apply when account don't have setting" int no +++option "bandwidthmaxdown" - "Default bandwidth control to apply when account don't have setting" int no +++ ++--- a/src/cmdline.h +++++ b/src/cmdline.h ++@@ -122,6 +122,17 @@ struct gengetopt_args_info ++ char * macsuffix_orig; /* Suffix to add to the MAC address original value given at command line. */ ++ char * macpasswd_arg; /* Password used when performing MAC authentication (default='password'). */ ++ char * macpasswd_orig; /* Password used when performing MAC authentication original value given at command line. */ +++ int rmtport_arg; /* TCP port to bind to for remote monitor and config (default='3991'). */ +++ char * rmtport_orig; /* TCP port to bind to for remote monitor and config original value given at command line. */ +++ char * rmtlisten_arg; /* IP address to listen to for remote monitor and config. */ +++ char * rmtlisten_orig; /* IP address to listen to for remote monitor and config original value given at command line. */ +++ char * rmtpasswd_arg; /* Password for remote monitor and config. */ +++ char * rmtpasswd_orig; /* Password for remote monitor and config original value given at command line. */ +++ int bandwidthmaxup_arg; /* Default Bandwidth Max Up. */ +++ char *bandwidthmaxup_orig; /* Default Bandwidth Max Up value given at command line. */ +++ int bandwidthmaxdown_arg; /* Default Bandwidth Max Down. */ +++ char *bandwidthmaxdown_orig; /* Default Bandwidth Max Down value given at command line. */ +++ ++ ++ int help_given ; /* Whether help was given. */ ++ int version_given ; /* Whether version was given. */ ++@@ -177,7 +188,11 @@ struct gengetopt_args_info ++ unsigned int macallowed_given ; /* Whether macallowed was given. */ ++ int macsuffix_given ; /* Whether macsuffix was given. */ ++ int macpasswd_given ; /* Whether macpasswd was given. */ ++- +++ int rmtport_given ; /* Whether uamport was given. */ +++ int rmtlisten_given ; /* Whether uamlisten was given. */ +++ int rmtpasswd_given ; /* Whether confpassword was given. */ +++ int bandwidthmaxup_given ; +++ int bandwidthmaxdown_given ; ++ } ; ++ ++ int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info); ++--- a/src/Makefile +++++ b/src/Makefile ++@@ -54,7 +54,7 @@ PROGRAMS = $(sbin_PROGRAMS) ++ am_chilli_OBJECTS = chilli.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT) \ ++ ippool.$(OBJEXT) radius.$(OBJEXT) md5.$(OBJEXT) \ ++ redir.$(OBJEXT) dhcp.$(OBJEXT) syserr.$(OBJEXT) \ ++- iphash.$(OBJEXT) lookup.$(OBJEXT) +++ iphash.$(OBJEXT) lookup.$(OBJEXT) remotectrl.$(OBJEXT) ++ chilli_OBJECTS = $(am_chilli_OBJECTS) ++ chilli_LDADD = $(LDADD) ++ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++@@ -172,7 +172,7 @@ target_alias = ++ ++ # add -pg to enable gprof ++ AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' ++-chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h +++chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h remotectrl.c remotectrl.h ++ all: all-am ++ ++ .SUFFIXES: ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -54,7 +54,7 @@ PROGRAMS = $(sbin_PROGRAMS) ++ am_chilli_OBJECTS = chilli.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT) \ ++ ippool.$(OBJEXT) radius.$(OBJEXT) md5.$(OBJEXT) \ ++ redir.$(OBJEXT) dhcp.$(OBJEXT) syserr.$(OBJEXT) \ ++- iphash.$(OBJEXT) lookup.$(OBJEXT) +++ iphash.$(OBJEXT) lookup.$(OBJEXT) remotectrl.$(OBJEXT) ++ chilli_OBJECTS = $(am_chilli_OBJECTS) ++ chilli_LDADD = $(LDADD) ++ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++@@ -172,7 +172,7 @@ target_alias = @target_alias@ ++ ++ # add -pg to enable gprof ++ AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' ++-chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h +++chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h remotectrl.c remotectrl.h ++ all: all-am ++ ++ .SUFFIXES: ++--- /dev/null +++++ b/src/remotectrl.c ++@@ -0,0 +1,340 @@ +++#include +++#include +++#include +++#include +++#include +++ +++#include "remotectrl.h" +++ +++/* +++char *vstrcat(char *first, ...) +++{ +++ size_t len = 0; +++ char *retbuf; +++ va_list argp; +++ char *p; +++ char *tmp=""; +++ if(first == NULL) +++ first=tmp; +++// return NULL; +++ +++ len = strlen(first); +++ +++ va_start(argp, first); +++ +++ while((p = va_arg(argp, char *)) != NULL) +++ len += strlen(p); +++ +++ va_end(argp); +++ retbuf = (char *)malloc(len + 1); // +1 for trailing \0 +++ +++ if(retbuf == NULL) +++ return NULL; // error +++ +++ (void)strcpy(retbuf, first); +++ +++ va_start(argp, first); +++ +++ while((p = va_arg(argp, char *)) != NULL) +++ (void)strcat(retbuf, p); +++ +++ va_end(argp); +++ +++ return retbuf; +++} +++*/ +++ +++int rmtctrl_write_msg( struct rmt_socket_t *sckHnd, uint32_t id, uint32_t extra, char *message ){ +++ msg_head_t header; +++ int rslt; +++ header.id = id; +++ header.len = strlen(message); +++ header.extra = extra; +++ rslt = send(sckHnd->fd,&header,sizeof(struct msg_head_t),0); +++ if (rslt != -1 && header.len > 0) { +++ sckHnd->Tx += rslt; +++ rslt = send(sckHnd->fd, message, header.len, 0); +++ if (rslt > 0) +++ { +++ sckHnd->Tx += rslt; +++ rslt += sizeof(struct msg_head_t); +++ } +++ } +++ return rslt; +++} +++ +++int rmtctrl_read_msg( struct rmt_socket_t *sckHnd, msg_head_t *head, char **message ) +++{ +++// msg_head_t header; +++ int rslt; +++ char *buffer; +++ int reading = 0; +++ int aux = 0; +++ rslt = recv(sckHnd->fd, head, sizeof(struct msg_head_t), 0); +++ if (rslt == sizeof(struct msg_head_t) ) { +++ sckHnd->Rx += rslt; +++ *message = (char *)malloc(head->len+1); +++ memset(*message,'\0', head->len+1); +++ while ( reading < head->len ){ +++ aux = recv(sckHnd->fd, *message, head->len, 0); +++ switch ( aux ) +++ { +++ case -1: +++ switch (errno) +++ { +++ case EINTR: +++ case EAGAIN: +++ usleep (100); +++ break; +++ default: +++ return -1; +++ } +++ break; +++ case 0: // mean socket was closed +++ sckHnd->Rx += reading; +++ return reading; +++ break; +++ break; +++ default: +++ reading+=aux; +++ break; +++ } +++ } +++/* +++ buffer = (char *)malloc(head->len+1); +++ while ( reading < head->len ){ +++ memset(buffer,'\0', head->len+1); +++ aux = recv(sckHnd->fd, buffer, head->len, 0); +++ switch ( aux ) { +++ case -1: +++ switch (errno){ +++ case EINTR: +++ case EAGAIN: +++ usleep (100); +++ break; +++ default: +++ return -1; +++ } +++ break; +++ case 0: // mean socket was closed +++ sckHnd->Rx += reading; +++ return reading; +++ break; +++ break; +++ default: +++ if (reading == 0) +++ *message=(char *)malloc(aux+1); +++ else +++ *message=(char*)realloc(*message,(reading+aux+1)*sizeof(char)); +++// strcat(*message, buffer); +++ memcpy(*message+reading, buffer, aux); +++ reading += aux; +++ *message[reading]=0; +++ } +++ } +++ free(buffer); +++*/ +++ sckHnd->Rx += reading; +++ reading += rslt; +++ return reading; +++ } +++ return rslt; +++} +++ +++void rmtctrl_newClient(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients) +++{ +++ int rslt; +++ int cli = (*activeClients); +++ rmtctrl_accept(srv,&client[cli]); +++ if (client[(*activeClients)].fd != -1) +++ { +++ (*activeClients)++; +++ } +++ if ((*activeClients) >= MAX_CLIENTS) +++ { +++ (*activeClients)--; +++ rslt = rmtctrl_write_msg(&client[(*activeClients)],MSG_END,0, "Sorry Server is too Busy\n Try more late\n" ); +++ if (rslt > 0) client[(*activeClients)].Tx += rslt; +++ rmtctrl_close(&client[(*activeClients)]); +++ } +++} +++ +++void rmtctrl_close ( struct rmt_socket_t *client ) +++{ +++ printf("Desde %s se recibieron %d bytes y se enviaron %d bytes\n",inet_ntoa(client->addr.sin_addr),client->Rx,client->Tx); +++ close(client->fd); /* cierra fd_rmt_client */ +++ printf("Se cerro conexión desde %s\n",inet_ntoa(client->addr.sin_addr) ); +++ client->fd = -1; +++} +++ +++void rmtctrl_accept (struct rmt_socket_t srv, struct rmt_socket_t *client ) +++{ +++ int sin_size=sizeof(struct sockaddr_in); +++ int int_Send; +++ struct sockaddr_in addr; +++ +++ if ((client->fd = accept(srv.fd,(struct sockaddr *)&client->addr,&sin_size))!=-1) +++ { +++ client->Rx = 0; +++ client->Tx = 0; +++ unsigned char c = sizeof(uint32_t); +++ int_Send = send(client->fd, &c, 1, 0); +++ if (int_Send > 0) client->Tx += int_Send; +++ printf("Se abrió una conexión desde %s\n", inet_ntoa(client->addr.sin_addr)); +++ } +++} +++ +++//void cleanClients (int *table, int *n) +++void rmtctrl_cleanClients (struct rmt_socket_t *client, int *n) +++{ +++ int i,j; +++ +++ if ((client == NULL) || ((*n) == 0)) +++ return; +++ +++ j=0; +++ for (i=0; i<(*n); i++) +++ { +++ if (client[i].fd != -1) +++ { +++ client[j].fd = client[i].fd; +++ client[j].addr = client[i].addr; +++ client[j].Rx = client[i].Rx; +++ client[j].Tx = client[i].Tx; +++ j++; +++ } +++ } +++ +++ *n = j; +++} +++ +++int rmtctrl_maxValue (struct rmt_socket_t *client, int n) +++{ +++ int i; +++ int max; +++ +++ if ((client == NULL) || (n<1)) +++ return 0; +++ +++ max = client[0].fd; +++ for (i=0; i max) +++ max = client[i].fd; +++ +++ return max; +++} +++ +++struct rmt_socket_t rmtctrl_initSrv(struct in_addr rmtlisten, int rmtport){ +++ struct rmt_socket_t srv; +++ if ((srv.fd=socket(AF_INET, SOCK_STREAM, 0)) == -1 ) { +++ printf("error en socket()\n"); +++ exit(1); +++ } +++ srv.addr.sin_family = AF_INET; +++ srv.addr.sin_port = htons(rmtport); +++ srv.addr.sin_addr.s_addr = rmtlisten.s_addr; +++ memset(&(srv.addr.sin_zero), 0, 8); +++ +++ if(bind(srv.fd,(struct sockaddr*)&srv.addr,sizeof(struct sockaddr))==-1) { +++ printf("error en bind() \n"); +++ exit(-1); +++ } +++ +++ if(listen(srv.fd,BACKLOG) == -1) { +++ printf("error en listen()\n"); +++ exit(-1); +++ } +++ return srv; +++} +++ +++void rmtctrl_srv(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients) +++{ +++ fd_set fdRead; +++ int maxHnd; +++ int i; +++ struct timeval nowait; +++ memset((char *)&nowait,0,sizeof(nowait)); +++ +++ rmtctrl_cleanClients(client, activeClients); +++ FD_ZERO (&fdRead); +++ FD_SET (srv.fd, &fdRead); +++ +++ for (i=0; i<*activeClients; i++) +++ FD_SET (client[i].fd, &fdRead); +++ +++ maxHnd = rmtctrl_maxValue (client, *activeClients); +++ +++ if (maxHnd < srv.fd) +++ maxHnd = srv.fd; +++ +++ select (maxHnd + 1, &fdRead, NULL, NULL,&nowait); +++ for (i=0; i<*activeClients; i++) +++ { +++ if (FD_ISSET (client[i].fd, &fdRead)) +++ { +++ rmtctrl_msg_proccess(&client[i]); +++ } +++ } +++ if (FD_ISSET (srv.fd, &fdRead)) +++ rmtctrl_newClient(srv,client, &(*activeClients)); +++} +++ +++int send_line( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, char *data) +++{ +++ char str[2048]; +++ memset(str,'\0',2048); +++ sprintf(str,fmt,data); +++ return rmtctrl_write_msg(client,msg_type,msg_extra, str); +++} +++ +++int send_octets( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value) +++{ +++ char *Buffer = (char *)octets2str(value); +++ int ret = send_line( client, msg_type, msg_extra, fmt, Buffer); +++ free(Buffer); +++ return ret; +++} +++ +++int send_mac( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint8_t *value) +++{ +++ char *Buffer = (char*)mac2str(value); +++ int ret = send_line( client, msg_type, msg_extra, fmt, Buffer); +++ free(Buffer); +++ return ret; +++} +++ +++int send_number( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value) +++{ +++ char Buffer[64]; +++ sprintf(Buffer,"%d", value); +++ return send_line( client, msg_type, msg_extra, fmt, Buffer); +++} +++ +++const char * mac2str(uint8_t *mac) +++{ +++ char *buffer; +++ buffer=(char*)malloc(18*sizeof(char)); +++ memset(buffer,'\0',18); +++ (void) sprintf(buffer,"%.2X-%.2X-%.2X-%.2X-%.2X-%.2X", +++ mac[0], mac[1], +++ mac[2], mac[3], +++ mac[4], mac[5]); +++ return buffer; +++} +++ +++const char * octets2str(uint64_t value) +++{ +++ char *buffer; +++ buffer=(char*)malloc(13*sizeof(char)); +++ memset(buffer,'\0',13); +++ if (value/8 > 1073741824){ // gigas +++ sprintf(buffer,"%.1f(GiB)",((value/8.0)/1073741824.0)); +++ }else if (value/8 > 1048576){ // megas +++ sprintf(buffer,"%.1f(MiB)",((value/8.0)/1048576.0)); +++ }else if (value/8 > 1024){ // KiloBytes +++ sprintf(buffer,"%.1f(KiB)",((value/8.0)/1024.0)); +++ }else // Bytes +++ sprintf(buffer,"%.1f(B)",(value/8)); +++ return buffer; +++} +++ ++--- /dev/null +++++ b/src/remotectrl.h ++@@ -0,0 +1,86 @@ +++#include +++#ifndef _RMTCTRL_H +++#define _RMTCTRL_H +++ +++enum +++{ +++ MSG_OK = 0, +++ MSG_START = 1, +++ MSG_PART = 2, +++ MSG_END = 3, +++ QRY_STATUS = 100, +++ QRY_CONNECTED_LIST = 101, +++ QRY_CONNECTED_FULL_LIST = 102, +++ QRY_MACADDR = 103, +++ QRY_IPADDR = 104, +++ QRY_USERNAME = 105, +++ +++ CMD_AUTHORIZE = 200, +++ CMD_DISCONNECT = 201, +++ +++ EXTRA_ALL_OP = 300, +++ EXTRA_MAC_OP = 301, +++ EXTRA_IP_OP = 302, +++ EXTRA_USER_OP = 303, +++}; +++ +++enum +++{ +++ STRING, +++ IP_ADDR, +++ MAC_ADDR, +++ NUMBER, +++ OCTETS, +++}; +++ +++#define PORT 15557 /* El puerto que ser? abierto */ +++#define BACKLOG 2 /* El n?mero de conexiones permitidas */ +++#define MAX_CLIENTS 10 +++static char CONVERT_BUFF[1024]; +++ +++typedef struct msg_head_t { +++ uint32_t id; +++ uint32_t extra; +++ uint32_t len; +++} msg_head_t; +++ +++typedef struct rmt_socket_t { +++ int fd; +++ struct sockaddr_in addr; +++ int Rx; +++ int Tx; +++} rmt_socket_t; +++ +++//char *vstrcat(char *first, ...); +++ +++ +++int rmtctrl_write_msg( struct rmt_socket_t *sckHnd, uint32_t id, uint32_t extra, char *message ); +++int rmtctrl_read_msg( struct rmt_socket_t *sckHnd, msg_head_t *head, char **message ); +++void rmtctrl_newClient(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients); +++void rmtctrl_close ( struct rmt_socket_t *client ); +++void rmtctrl_accept (struct rmt_socket_t srv, struct rmt_socket_t *client ); +++void rmtctrl_cleanClients (struct rmt_socket_t *client, int *n); +++ +++//inicializa las variables y arranca el servidor +++struct rmt_socket_t rmtctrl_initSrv(struct in_addr rmtlisten, int rmtport); +++//esta funcion es la que va dentro del loop del programa que lo utiliza +++void rmtctrl_srv(struct rmt_socket_t srv, struct rmt_socket_t *client, int *activeClients); +++//En esta funcion es donde se define como se procesan los mensajes +++void rmtctrl_msg_proccess(struct rmt_socket_t *client); +++ +++//char * pepe(char *dest, char *sep, char *src); +++ +++//char * send_value(char *name, char *value, int len, struct in_addr *addr, +++// uint8_t *mac, long int *integer); +++//int addfield(char* reg, char *field, char sep); +++//int addfield1(char** reg,int rlen, char *field, int flen, char sep); +++//int sendConnectedInfo(struct app_conn_t *appconn, struct rmt_socket_t *client); +++//const char * value2str( int type, void *value); +++const char * octets2str(uint64_t value); +++const char * mac2str(uint8_t *mac); +++int send_line( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, char *data); +++int send_octets( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value); +++int send_mac( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint8_t *value); +++int send_number( struct rmt_socket_t *client, int msg_type, int msg_extra, char *fmt, uint64_t value); +++ +++#endif /* !_RMTCTRL_H */ ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -3,7 +3,7 @@ sbin_PROGRAMS = chilli ++ # add -pg to enable gprof ++ AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' ++ ++-chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h +++chilli_SOURCES = chilli.c defs.h tun.c tun.h cmdline.c cmdline.h ippool.c ippool.h radius.h radius.c md5.c md5.h redir.h redir.c dhcp.c dhcp.h syserr.c syserr.h iphash.c iphash.h lookup.c lookup.h remotectrl.c remotectrl.h ++ ++ # chilli_LDFLAGS = -lcrypt ++ +diff --git a/feeds/packages/net/chillispot/patches/200-gcc_fix.patch b/feeds/packages/net/chillispot/patches/200-gcc_fix.patch +new file mode 100644 +index 0000000..a819216 +--- /dev/null ++++ b/feeds/packages/net/chillispot/patches/200-gcc_fix.patch +@@ -0,0 +1,57 @@ ++diff -Naur chillispot-1.1.0/src/tun.c chillispot-1.1.0.patched/src/tun.c ++--- chillispot-1.1.0/src/tun.c 2006-09-24 20:48:25.000000000 +0300 +++++ chillispot-1.1.0.patched/src/tun.c 2009-10-20 02:08:49.000000000 +0300 ++@@ -366,7 +366,7 @@ ++ this->addrs++; ++ return 0; ++ ++-#elif defined (__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ++ int fd; ++ struct ifaliasreq areq; ++@@ -445,7 +445,7 @@ ++ #if defined(__linux__) ++ ifr.ifr_netmask.sa_family = AF_INET; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_len = ++ sizeof (struct sockaddr_in); ++ ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_len = ++@@ -497,7 +497,7 @@ ++ ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = ++ netmask->s_addr; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = ++ netmask->s_addr; ++ ++@@ -585,7 +585,7 @@ ++ close(fd); ++ return 0; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ++ struct { ++ struct rt_msghdr rt; ++@@ -674,7 +674,7 @@ ++ #if defined(__linux__) ++ struct ifreq ifr; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ char devname[IFNAMSIZ+5]; /* "/dev/" + ifname */ ++ int devnum; ++ struct ifaliasreq areq; ++@@ -722,7 +722,7 @@ ++ ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */ ++ return 0; ++ ++-#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) +++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__) ++ ++ /* Find suitable device */ ++ for (devnum = 0; devnum < 255; devnum++) { /* TODO 255 */ +diff --git a/feeds/packages/net/chrony/.svn/entries b/feeds/packages/net/chrony/.svn/entries +new file mode 100644 +index 0000000..b1113d6 +--- /dev/null ++++ b/feeds/packages/net/chrony/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chrony ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:19.975318Z ++33046 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++58049fd6fbc9d19b1378e4d87021fbc5 ++2012-06-12T01:56:55.371712Z ++32256 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2062 ++ +diff --git a/feeds/packages/net/chrony/.svn/text-base/Makefile.svn-base b/feeds/packages/net/chrony/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..55f81ca +--- /dev/null ++++ b/feeds/packages/net/chrony/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,72 @@ ++# ++# 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:=chrony ++PKG_VERSION:=1.26 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:= ftp://download.tuxfamily.org/projects/chrony/ \ ++ http://download.tuxfamily.org/chrony/ ++PKG_MD5SUM:=ad6dd619ff1986e4ff780363c64e2246 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/chrony ++ SUBMENU:=Time Synchronization ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libreadline +libncurses @!TARGET_avr32 @!powerpc ++ TITLE:=NTP client/server for on-demand connections ++ URL:=http://chrony.sunsite.dk/ ++endef ++ ++define Package/chrony/description ++ A NTP implementation that has been specifically written to work ++ well in the case of an intermittent (e.g. dial-on-demand) ++ connection to the network where your NTP servers are. ++endef ++ ++define Package/chrony/conffiles ++/etc/chrony/chrony.conf ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --target=$(GNU_TARGET_NAME) \ ++ --prefix=/usr \ ++ --with-readline-includes=$(STAGING_DIR)/usr/include \ ++ --with-readline-library=$(STAGING_DIR)/usr/lib \ ++ --disable-linuxcaps \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ prefix="$(PKG_INSTALL_DIR)/usr" ++endef ++ ++define Package/chrony/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/chronyd $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/chronyc $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/chrony ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd ++ $(INSTALL_BIN) ./files/ntpd.init $(1)/etc/init.d/ntpd ++ $(INSTALL_CONF) ./files/ntpd.config $(1)/etc/config/ntpd ++ $(INSTALL_CONF) ./files/chrony.conf $(1)/etc/chrony/chrony.conf ++ $(INSTALL_CONF) ./files/chrony.keys $(1)/etc/chrony/chrony.keys ++endef ++ ++$(eval $(call BuildPackage,chrony)) +diff --git a/feeds/packages/net/chrony/Makefile b/feeds/packages/net/chrony/Makefile +new file mode 100644 +index 0000000..55f81ca +--- /dev/null ++++ b/feeds/packages/net/chrony/Makefile +@@ -0,0 +1,72 @@ ++# ++# 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:=chrony ++PKG_VERSION:=1.26 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:= ftp://download.tuxfamily.org/projects/chrony/ \ ++ http://download.tuxfamily.org/chrony/ ++PKG_MD5SUM:=ad6dd619ff1986e4ff780363c64e2246 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/chrony ++ SUBMENU:=Time Synchronization ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libreadline +libncurses @!TARGET_avr32 @!powerpc ++ TITLE:=NTP client/server for on-demand connections ++ URL:=http://chrony.sunsite.dk/ ++endef ++ ++define Package/chrony/description ++ A NTP implementation that has been specifically written to work ++ well in the case of an intermittent (e.g. dial-on-demand) ++ connection to the network where your NTP servers are. ++endef ++ ++define Package/chrony/conffiles ++/etc/chrony/chrony.conf ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --target=$(GNU_TARGET_NAME) \ ++ --prefix=/usr \ ++ --with-readline-includes=$(STAGING_DIR)/usr/include \ ++ --with-readline-library=$(STAGING_DIR)/usr/lib \ ++ --disable-linuxcaps \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ prefix="$(PKG_INSTALL_DIR)/usr" ++endef ++ ++define Package/chrony/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/chronyd $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/chronyc $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/chrony ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd ++ $(INSTALL_BIN) ./files/ntpd.init $(1)/etc/init.d/ntpd ++ $(INSTALL_CONF) ./files/ntpd.config $(1)/etc/config/ntpd ++ $(INSTALL_CONF) ./files/chrony.conf $(1)/etc/chrony/chrony.conf ++ $(INSTALL_CONF) ./files/chrony.keys $(1)/etc/chrony/chrony.keys ++endef ++ ++$(eval $(call BuildPackage,chrony)) +diff --git a/feeds/packages/net/chrony/files/.svn/entries b/feeds/packages/net/chrony/files/.svn/entries +new file mode 100644 +index 0000000..fe86a72 +--- /dev/null ++++ b/feeds/packages/net/chrony/files/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chrony/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-29T01:47:55.567612Z ++31975 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++chrony.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++093a3378f0c8e462fb6b7dfb99946adc ++2007-03-17T11:34:51.893899Z ++6593 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++443 ++ ++ntpd.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++eead0f26de58751be644f3862b4fe45d ++2008-01-14T10:38:27.402791Z ++10189 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++412 ++ ++ntpd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++073d8c775c2c927533a9259974c6c067 ++2012-05-29T01:47:55.567612Z ++31975 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1365 ++ ++ntpd.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++8085a0f10f519a000c65bebe73681117 ++2008-01-14T10:38:27.402791Z ++10189 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++249 ++ ++chrony.keys ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++09ecf6f4860f34249b188e20fac04986 ++2007-03-17T11:34:51.893899Z ++6593 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10 ++ +diff --git a/feeds/packages/net/chrony/files/.svn/text-base/chrony.conf.svn-base b/feeds/packages/net/chrony/files/.svn/text-base/chrony.conf.svn-base +new file mode 100644 +index 0000000..508fdfb +--- /dev/null ++++ b/feeds/packages/net/chrony/files/.svn/text-base/chrony.conf.svn-base +@@ -0,0 +1,17 @@ ++# Chrony configuration ++ ++# Note: time servers and ntp client access is configured in /etc/config/ntpd ++# and automatically set at startup ++ ++# Log clock errors above 0.5 seconds ++logchange 0.5 ++ ++# Allow command access only from localhost ++cmdallow localhost ++cmddeny ++ ++# Password config for chronyc ++# Note: Using a command key other than "1" will break ++# /etc/init.d/ntpd and /etc/hotplug.d/iface/20-ntpd ++keyfile /etc/chrony/chrony.keys ++commandkey 1 +diff --git a/feeds/packages/net/chrony/files/.svn/text-base/chrony.keys.svn-base b/feeds/packages/net/chrony/files/.svn/text-base/chrony.keys.svn-base +new file mode 100644 +index 0000000..c2d429e +--- /dev/null ++++ b/feeds/packages/net/chrony/files/.svn/text-base/chrony.keys.svn-base +@@ -0,0 +1 @@ ++1 chronyc +diff --git a/feeds/packages/net/chrony/files/.svn/text-base/ntpd.config.svn-base b/feeds/packages/net/chrony/files/.svn/text-base/ntpd.config.svn-base +new file mode 100644 +index 0000000..7a3b6fd +--- /dev/null ++++ b/feeds/packages/net/chrony/files/.svn/text-base/ntpd.config.svn-base +@@ -0,0 +1,6 @@ ++# Generic NTP configuration ++# Time servers and network(s) that may access the time service ++ ++config ntpd ++ option TimeServers "0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org 3.openwrt.pool.ntp.org" ++ option ClientAccessFrom "lan" +diff --git a/feeds/packages/net/chrony/files/.svn/text-base/ntpd.hotplug.svn-base b/feeds/packages/net/chrony/files/.svn/text-base/ntpd.hotplug.svn-base +new file mode 100644 +index 0000000..e2e5adf +--- /dev/null ++++ b/feeds/packages/net/chrony/files/.svn/text-base/ntpd.hotplug.svn-base +@@ -0,0 +1,21 @@ ++COMMAND=/usr/bin/chronyc ++CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys) ++ ++chrony_control() { ++$COMMAND << EOF ++password $CHRONY_KEY ++$1 ++EOF ++} ++ ++[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && { ++ [ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{ ++ chrony_control online ++ } ++} ++ ++[ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && { ++ [ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{ ++ chrony_control offline ++ } ++} +diff --git a/feeds/packages/net/chrony/files/.svn/text-base/ntpd.init.svn-base b/feeds/packages/net/chrony/files/.svn/text-base/ntpd.init.svn-base +new file mode 100644 +index 0000000..6e742fa +--- /dev/null ++++ b/feeds/packages/net/chrony/files/.svn/text-base/ntpd.init.svn-base +@@ -0,0 +1,56 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=60 ++ ++start() { ++ [ ! -f /var/run/chronyd.pid ] && ( ++ /usr/sbin/chronyd -f /etc/chrony/chrony.conf ++ ++ local NTP_SERVERS ++ local NTP_SERVER ++ local CLIENT_NETWORKS ++ local NETNAME ++ config_load ntpd ++ config_get NTP_SERVERS $CONFIG_SECTION TimeServers ++ config_get CLIENT_NETWORKS $CONFIG_SECTION ClientAccessFrom ++ CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys) ++ ++ . /lib/functions/network.sh ++ ++ # Define servers and do a rapid series of time measurements ++ # to get up to date ++ ( ++ echo password $CHRONY_KEY ++ for NTP_SERVER in $NTP_SERVERS; do ++ echo add server $NTP_SERVER ++ done ++ echo burst 5/5 ++ ) | chronyc > /dev/null 2>&1 ++ # ... wait until a reference ID is found ... ++ while chronyc tracking | grep 'Reference ID.*0.0.0.0' >/dev/null ; do sleep 1; done ++ # ... and finally, adjust the time in a single step ++ # and allow clients to access the server ++ ( ++ echo password $CHRONY_KEY ++ echo makestep ++ for NETNAME in $CLIENT_NETWORKS; do ++ local subnet ++ if network_get_subnet subnet "$NETNAME"; then ++ echo allow $subnet ++ fi ++ done ++ ) | chronyc > /dev/null 2>&1 ++ ) ++} ++ ++stop() { ++ [ -r /var/run/chronyd.pid ] && PID=$(cat /var/run/chronyd.pid) ++ [ -n "$PID" ] && kill $PID ++} ++ ++restart() { ++ stop ++ while [ -r /var/run/chronyd.pid ] ; do sleep 1; done ++ start ++} +diff --git a/feeds/packages/net/chrony/files/chrony.conf b/feeds/packages/net/chrony/files/chrony.conf +new file mode 100644 +index 0000000..508fdfb +--- /dev/null ++++ b/feeds/packages/net/chrony/files/chrony.conf +@@ -0,0 +1,17 @@ ++# Chrony configuration ++ ++# Note: time servers and ntp client access is configured in /etc/config/ntpd ++# and automatically set at startup ++ ++# Log clock errors above 0.5 seconds ++logchange 0.5 ++ ++# Allow command access only from localhost ++cmdallow localhost ++cmddeny ++ ++# Password config for chronyc ++# Note: Using a command key other than "1" will break ++# /etc/init.d/ntpd and /etc/hotplug.d/iface/20-ntpd ++keyfile /etc/chrony/chrony.keys ++commandkey 1 +diff --git a/feeds/packages/net/chrony/files/chrony.keys b/feeds/packages/net/chrony/files/chrony.keys +new file mode 100644 +index 0000000..c2d429e +--- /dev/null ++++ b/feeds/packages/net/chrony/files/chrony.keys +@@ -0,0 +1 @@ ++1 chronyc +diff --git a/feeds/packages/net/chrony/files/ntpd.config b/feeds/packages/net/chrony/files/ntpd.config +new file mode 100644 +index 0000000..7a3b6fd +--- /dev/null ++++ b/feeds/packages/net/chrony/files/ntpd.config +@@ -0,0 +1,6 @@ ++# Generic NTP configuration ++# Time servers and network(s) that may access the time service ++ ++config ntpd ++ option TimeServers "0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org 3.openwrt.pool.ntp.org" ++ option ClientAccessFrom "lan" +diff --git a/feeds/packages/net/chrony/files/ntpd.hotplug b/feeds/packages/net/chrony/files/ntpd.hotplug +new file mode 100644 +index 0000000..e2e5adf +--- /dev/null ++++ b/feeds/packages/net/chrony/files/ntpd.hotplug +@@ -0,0 +1,21 @@ ++COMMAND=/usr/bin/chronyc ++CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys) ++ ++chrony_control() { ++$COMMAND << EOF ++password $CHRONY_KEY ++$1 ++EOF ++} ++ ++[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && { ++ [ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{ ++ chrony_control online ++ } ++} ++ ++[ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && { ++ [ -x $COMMAND ] && [ -n "$CHRONY_KEY" ] &&{ ++ chrony_control offline ++ } ++} +diff --git a/feeds/packages/net/chrony/files/ntpd.init b/feeds/packages/net/chrony/files/ntpd.init +new file mode 100644 +index 0000000..6e742fa +--- /dev/null ++++ b/feeds/packages/net/chrony/files/ntpd.init +@@ -0,0 +1,56 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=60 ++ ++start() { ++ [ ! -f /var/run/chronyd.pid ] && ( ++ /usr/sbin/chronyd -f /etc/chrony/chrony.conf ++ ++ local NTP_SERVERS ++ local NTP_SERVER ++ local CLIENT_NETWORKS ++ local NETNAME ++ config_load ntpd ++ config_get NTP_SERVERS $CONFIG_SECTION TimeServers ++ config_get CLIENT_NETWORKS $CONFIG_SECTION ClientAccessFrom ++ CHRONY_KEY=$(awk '/^1 / { print $2; }' /etc/chrony/chrony.keys) ++ ++ . /lib/functions/network.sh ++ ++ # Define servers and do a rapid series of time measurements ++ # to get up to date ++ ( ++ echo password $CHRONY_KEY ++ for NTP_SERVER in $NTP_SERVERS; do ++ echo add server $NTP_SERVER ++ done ++ echo burst 5/5 ++ ) | chronyc > /dev/null 2>&1 ++ # ... wait until a reference ID is found ... ++ while chronyc tracking | grep 'Reference ID.*0.0.0.0' >/dev/null ; do sleep 1; done ++ # ... and finally, adjust the time in a single step ++ # and allow clients to access the server ++ ( ++ echo password $CHRONY_KEY ++ echo makestep ++ for NETNAME in $CLIENT_NETWORKS; do ++ local subnet ++ if network_get_subnet subnet "$NETNAME"; then ++ echo allow $subnet ++ fi ++ done ++ ) | chronyc > /dev/null 2>&1 ++ ) ++} ++ ++stop() { ++ [ -r /var/run/chronyd.pid ] && PID=$(cat /var/run/chronyd.pid) ++ [ -n "$PID" ] && kill $PID ++} ++ ++restart() { ++ stop ++ while [ -r /var/run/chronyd.pid ] ; do sleep 1; done ++ start ++} +diff --git a/feeds/packages/net/chrony/patches/.svn/entries b/feeds/packages/net/chrony/patches/.svn/entries +new file mode 100644 +index 0000000..566289e +--- /dev/null ++++ b/feeds/packages/net/chrony/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/chrony/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:19.975318Z ++33046 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-ipv6_disabled_fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++ee4475a8df44bd8cbd5f1ec5b8590cfc ++2012-08-07T16:09:19.975318Z ++33046 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++890 ++ ++001-crosscompile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++6190644b3e53d29ac4dd676d2d5e4b31 ++2011-09-30T12:49:08.590693Z ++28330 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++633 ++ +diff --git a/feeds/packages/net/chrony/patches/.svn/text-base/001-crosscompile.patch.svn-base b/feeds/packages/net/chrony/patches/.svn/text-base/001-crosscompile.patch.svn-base +new file mode 100644 +index 0000000..d712e06 +--- /dev/null ++++ b/feeds/packages/net/chrony/patches/.svn/text-base/001-crosscompile.patch.svn-base +@@ -0,0 +1,25 @@ ++--- a/configure +++++ b/configure ++@@ -254,6 +254,13 @@ do ++ --host-machine=* ) ++ MACHINE=`echo $option | sed -e 's/^.*=//;'` ++ ;; +++ --target=* ) +++ TARGET=`echo $option | sed -e 's/[^=]*=//;'` +++ OPERATINGSYSTEM=`echo $TARGET | sed -e 's/.*-//;'` +++ MACHINE=`echo $TARGET | sed -e 's/-.*//;'` +++ VERSION="" +++ SYSTEM=${OPERATINGSYSTEM}-${MACHINE} +++ ;; ++ --help | -h ) ++ usage ++ exit 0 ++@@ -287,7 +294,7 @@ case $SYSTEM in ++ ;; ++ esac ++ ;; ++- Linux* ) +++ Linux* | linux* ) ++ EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o" ++ try_linuxcaps=1 ++ try_rtc=1 +diff --git a/feeds/packages/net/chrony/patches/.svn/text-base/002-ipv6_disabled_fixes.patch.svn-base b/feeds/packages/net/chrony/patches/.svn/text-base/002-ipv6_disabled_fixes.patch.svn-base +new file mode 100644 +index 0000000..629d2c7 +--- /dev/null ++++ b/feeds/packages/net/chrony/patches/.svn/text-base/002-ipv6_disabled_fixes.patch.svn-base +@@ -0,0 +1,34 @@ ++--- a/ntp_io.c +++++ b/ntp_io.c ++@@ -355,6 +355,7 @@ read_from_socket(void *anything) ++ } ++ #endif ++ +++#ifdef HAVE_IPV6 ++ #ifdef IPV6_PKTINFO ++ if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) { ++ struct in6_pktinfo ipi; ++@@ -365,6 +366,7 @@ read_from_socket(void *anything) ++ remote_addr.local_ip_addr.family = IPADDR_INET6; ++ } ++ #endif +++#endif ++ ++ #ifdef SO_TIMESTAMP ++ if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP) { ++@@ -466,6 +468,7 @@ send_packet(void *packet, int packetlen, ++ } ++ #endif ++ +++#ifdef HAVE_IPV6 ++ #ifdef IPV6_PKTINFO ++ if (remote_addr->local_ip_addr.family == IPADDR_INET6) { ++ struct cmsghdr *cmsg; ++@@ -484,6 +487,7 @@ send_packet(void *packet, int packetlen, ++ sizeof(ipi->ipi6_addr.s6_addr)); ++ } ++ #endif +++#endif ++ ++ #if 0 ++ LOG(LOGS_INFO, LOGF_NtpIO, "sending to %s:%d from %s", +diff --git a/feeds/packages/net/chrony/patches/001-crosscompile.patch b/feeds/packages/net/chrony/patches/001-crosscompile.patch +new file mode 100644 +index 0000000..d712e06 +--- /dev/null ++++ b/feeds/packages/net/chrony/patches/001-crosscompile.patch +@@ -0,0 +1,25 @@ ++--- a/configure +++++ b/configure ++@@ -254,6 +254,13 @@ do ++ --host-machine=* ) ++ MACHINE=`echo $option | sed -e 's/^.*=//;'` ++ ;; +++ --target=* ) +++ TARGET=`echo $option | sed -e 's/[^=]*=//;'` +++ OPERATINGSYSTEM=`echo $TARGET | sed -e 's/.*-//;'` +++ MACHINE=`echo $TARGET | sed -e 's/-.*//;'` +++ VERSION="" +++ SYSTEM=${OPERATINGSYSTEM}-${MACHINE} +++ ;; ++ --help | -h ) ++ usage ++ exit 0 ++@@ -287,7 +294,7 @@ case $SYSTEM in ++ ;; ++ esac ++ ;; ++- Linux* ) +++ Linux* | linux* ) ++ EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o" ++ try_linuxcaps=1 ++ try_rtc=1 +diff --git a/feeds/packages/net/chrony/patches/002-ipv6_disabled_fixes.patch b/feeds/packages/net/chrony/patches/002-ipv6_disabled_fixes.patch +new file mode 100644 +index 0000000..629d2c7 +--- /dev/null ++++ b/feeds/packages/net/chrony/patches/002-ipv6_disabled_fixes.patch +@@ -0,0 +1,34 @@ ++--- a/ntp_io.c +++++ b/ntp_io.c ++@@ -355,6 +355,7 @@ read_from_socket(void *anything) ++ } ++ #endif ++ +++#ifdef HAVE_IPV6 ++ #ifdef IPV6_PKTINFO ++ if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) { ++ struct in6_pktinfo ipi; ++@@ -365,6 +366,7 @@ read_from_socket(void *anything) ++ remote_addr.local_ip_addr.family = IPADDR_INET6; ++ } ++ #endif +++#endif ++ ++ #ifdef SO_TIMESTAMP ++ if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP) { ++@@ -466,6 +468,7 @@ send_packet(void *packet, int packetlen, ++ } ++ #endif ++ +++#ifdef HAVE_IPV6 ++ #ifdef IPV6_PKTINFO ++ if (remote_addr->local_ip_addr.family == IPADDR_INET6) { ++ struct cmsghdr *cmsg; ++@@ -484,6 +487,7 @@ send_packet(void *packet, int packetlen, ++ sizeof(ipi->ipi6_addr.s6_addr)); ++ } ++ #endif +++#endif ++ ++ #if 0 ++ LOG(LOGS_INFO, LOGF_NtpIO, "sending to %s:%d from %s", +diff --git a/feeds/packages/net/cifs-utils/.svn/entries b/feeds/packages/net/cifs-utils/.svn/entries +new file mode 100644 +index 0000000..0bc5ea3 +--- /dev/null ++++ b/feeds/packages/net/cifs-utils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cifs-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:57:36.248285Z ++32212 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++b1594ec6d916e529906845a146b66011 ++2012-06-11T21:57:36.248285Z ++32212 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++877 ++ +diff --git a/feeds/packages/net/cifs-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cifs-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..743e12b +--- /dev/null ++++ b/feeds/packages/net/cifs-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# Copyright (C) 2007-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:=cifs-utils ++PKG_VERSION:=5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://ftp.samba.org/pub/linux-cifs/cifs-utils ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=dde98336c833b59777114145cb8f3c64 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cifsmount ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=CIFS mount utilities ++ URL:=http://wiki.samba.org/index.php/LinuxCIFS_utils ++endef ++ ++TARGET_CFLAGS += -Wno-error ++ ++CONFIGURE_ARGS += \ ++ --exec-prefix=/usr \ ++ --prefix=/ \ ++ --with-libcap-ng=no \ ++ --with-libcap=no ++ ++define Package/cifsmount/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount.cifs $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,cifsmount)) +diff --git a/feeds/packages/net/cifs-utils/Makefile b/feeds/packages/net/cifs-utils/Makefile +new file mode 100644 +index 0000000..743e12b +--- /dev/null ++++ b/feeds/packages/net/cifs-utils/Makefile +@@ -0,0 +1,40 @@ ++# ++# Copyright (C) 2007-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:=cifs-utils ++PKG_VERSION:=5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://ftp.samba.org/pub/linux-cifs/cifs-utils ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=dde98336c833b59777114145cb8f3c64 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cifsmount ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=CIFS mount utilities ++ URL:=http://wiki.samba.org/index.php/LinuxCIFS_utils ++endef ++ ++TARGET_CFLAGS += -Wno-error ++ ++CONFIGURE_ARGS += \ ++ --exec-prefix=/usr \ ++ --prefix=/ \ ++ --with-libcap-ng=no \ ++ --with-libcap=no ++ ++define Package/cifsmount/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount.cifs $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,cifsmount)) +diff --git a/feeds/packages/net/click/.svn/entries b/feeds/packages/net/click/.svn/entries +new file mode 100644 +index 0000000..1e68dc7 +--- /dev/null ++++ b/feeds/packages/net/click/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/click ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-20T16:20:17.654285Z ++23550 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++001c3d35ed0fbb20953d39a38fa33a0f ++2010-10-20T16:20:17.654285Z ++23550 ++acoul ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1914 ++ +diff --git a/feeds/packages/net/click/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/click/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/click/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/click/.svn/text-base/Makefile.svn-base b/feeds/packages/net/click/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ef48d79 +--- /dev/null ++++ b/feeds/packages/net/click/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=click ++PKG_VERSION:=20101020 ++PKG_RELEASE:=1 ++PKG_REV:=8f521a2dcd58ea8205b3b6070be605a21fb9154b ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://read.cs.ucla.edu/git/click ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_MD5SUM:=c3cba1c923d0a034cc518720b5ba7b40 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/click ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=@BROKEN ++ TITLE:=Click Modular Router ++ URL:=http://read.cs.ucla.edu/click ++endef ++ ++define Package/click/Description ++ The Click Modular Router userspace package ++endef ++ ++TARGET_CFLAGS += "-static -O2 -MD" ++TARGET_CXXFLAGS += "-static -O2 -MD" ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ rm -rf config.{cache,status} ; \ ++ ./configure \ ++ --prefix=/usr \ ++ --target=$(GNU_TARGET_NAME) \ ++ --host=$(GNU_HOST_NAME) \ ++ --build=$(GNU_BUILD_NAME) \ ++ --enable-tools=mixed \ ++ --enable-userlevel \ ++ --enable-wifi \ ++ --enable-fixincludes \ ++ --disable-linuxmodule \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ tools elementmap.xml ++ (cd $(PKG_BUILD_DIR)/userlevel; \ ++ ../tools/click-mkmindriver/click-mkmindriver -p $(PKG_NAME) -C .. \ ++ -f $(PKG_BUILD_DIR)/conf/wifi/dump.click \ ++ -A --all -E Discard -E Print; \ ++ ) ++ $(MAKE) -C $(PKG_BUILD_DIR) MINDRIVER=$(PKG_NAME) ++endef ++ ++define Package/click/install ++ $(INSTALL_DIR) $(1)/usr ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/share/click ++ $(CP) $(PKG_BUILD_DIR)/userlevel/$(PKG_NAME)click $(1)/usr/bin/click ++ $(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(1)/usr/bin/click-align ++ $(CP) $(PKG_BUILD_DIR)/elementmap.xml $(1)/usr/share/click/elementmap.xml ++endef ++ ++$(eval $(call BuildPackage,click)) +diff --git a/feeds/packages/net/click/Makefile b/feeds/packages/net/click/Makefile +new file mode 100644 +index 0000000..ef48d79 +--- /dev/null ++++ b/feeds/packages/net/click/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=click ++PKG_VERSION:=20101020 ++PKG_RELEASE:=1 ++PKG_REV:=8f521a2dcd58ea8205b3b6070be605a21fb9154b ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://read.cs.ucla.edu/git/click ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_MD5SUM:=c3cba1c923d0a034cc518720b5ba7b40 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/click ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=@BROKEN ++ TITLE:=Click Modular Router ++ URL:=http://read.cs.ucla.edu/click ++endef ++ ++define Package/click/Description ++ The Click Modular Router userspace package ++endef ++ ++TARGET_CFLAGS += "-static -O2 -MD" ++TARGET_CXXFLAGS += "-static -O2 -MD" ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ rm -rf config.{cache,status} ; \ ++ ./configure \ ++ --prefix=/usr \ ++ --target=$(GNU_TARGET_NAME) \ ++ --host=$(GNU_HOST_NAME) \ ++ --build=$(GNU_BUILD_NAME) \ ++ --enable-tools=mixed \ ++ --enable-userlevel \ ++ --enable-wifi \ ++ --enable-fixincludes \ ++ --disable-linuxmodule \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ tools elementmap.xml ++ (cd $(PKG_BUILD_DIR)/userlevel; \ ++ ../tools/click-mkmindriver/click-mkmindriver -p $(PKG_NAME) -C .. \ ++ -f $(PKG_BUILD_DIR)/conf/wifi/dump.click \ ++ -A --all -E Discard -E Print; \ ++ ) ++ $(MAKE) -C $(PKG_BUILD_DIR) MINDRIVER=$(PKG_NAME) ++endef ++ ++define Package/click/install ++ $(INSTALL_DIR) $(1)/usr ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/share/click ++ $(CP) $(PKG_BUILD_DIR)/userlevel/$(PKG_NAME)click $(1)/usr/bin/click ++ $(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(1)/usr/bin/click-align ++ $(CP) $(PKG_BUILD_DIR)/elementmap.xml $(1)/usr/share/click/elementmap.xml ++endef ++ ++$(eval $(call BuildPackage,click)) +diff --git a/feeds/packages/net/click/files/.svn/entries b/feeds/packages/net/click/files/.svn/entries +new file mode 100644 +index 0000000..060dd3e +--- /dev/null ++++ b/feeds/packages/net/click/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/click/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-04-05T09:31:20.567810Z ++10734 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++roofnet.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++81939b163214e1f6b87e7eb34df2b27c ++2008-04-05T09:31:20.567810Z ++10734 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++328 ++ +diff --git a/feeds/packages/net/click/files/.svn/prop-base/roofnet.init.svn-base b/feeds/packages/net/click/files/.svn/prop-base/roofnet.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/click/files/.svn/prop-base/roofnet.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/click/files/.svn/text-base/roofnet.init.svn-base b/feeds/packages/net/click/files/.svn/text-base/roofnet.init.svn-base +new file mode 100644 +index 0000000..bc36394 +--- /dev/null ++++ b/feeds/packages/net/click/files/.svn/text-base/roofnet.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++start() { ++ killall -q click ++ cp /usr/bin/srcr.click /tmp ++ sh /usr/bin/gen_config_roofnet.sh > /tmp/unaligned.click ++ click-align /tmp/unaligned.click > /tmp/roofnet.click ++ /usr/bin/click /tmp/roofnet.click > /tmp/roofnet.log 2>&1 & ++} ++ ++stop() { ++ killall click ++} +diff --git a/feeds/packages/net/click/files/roofnet.init b/feeds/packages/net/click/files/roofnet.init +new file mode 100644 +index 0000000..bc36394 +--- /dev/null ++++ b/feeds/packages/net/click/files/roofnet.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++start() { ++ killall -q click ++ cp /usr/bin/srcr.click /tmp ++ sh /usr/bin/gen_config_roofnet.sh > /tmp/unaligned.click ++ click-align /tmp/unaligned.click > /tmp/roofnet.click ++ /usr/bin/click /tmp/roofnet.click > /tmp/roofnet.log 2>&1 & ++} ++ ++stop() { ++ killall click ++} +diff --git a/feeds/packages/net/click/patches/.svn/entries b/feeds/packages/net/click/patches/.svn/entries +new file mode 100644 +index 0000000..27c3e49 +--- /dev/null ++++ b/feeds/packages/net/click/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/click/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-20T16:20:17.654285Z ++23550 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-multithread_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++40e4f12d3d539f76a5e3f55ff440a04e ++2010-10-20T16:20:17.654285Z ++23550 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++316 ++ ++100-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++1b8399564fbe8d0f12a90ae4389ebc65 ++2010-10-12T13:26:27.531265Z ++23411 ++acoul ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++696 ++ +diff --git a/feeds/packages/net/click/patches/.svn/prop-base/100-compile_fix.patch.svn-base b/feeds/packages/net/click/patches/.svn/prop-base/100-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/click/patches/.svn/prop-base/100-compile_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/click/patches/.svn/text-base/100-compile_fix.patch.svn-base b/feeds/packages/net/click/patches/.svn/text-base/100-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..f798254 +--- /dev/null ++++ b/feeds/packages/net/click/patches/.svn/text-base/100-compile_fix.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/tools/click-mkmindriver/Makefile.in +++++ b/tools/click-mkmindriver/Makefile.in ++@@ -60,7 +60,7 @@ DEPCFLAGS = @DEPCFLAGS@ ++ DEFS = @DEFS@ ++ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ ++ -I$(top_srcdir)/tools/lib -I$(srcdir) ++-LDFLAGS = @LDFLAGS@ +++LDFLAGS = @LDFLAGS@ -lrt ++ LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) ++ ++ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) ++--- a/configure +++++ b/configure ++@@ -7135,7 +7135,7 @@ fi ++ $as_echo "$ac_cv_va_list_addr" >&6; } ++ if test "x$ac_cv_va_list_addr" = xyes; then ++ ++-$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 1" >>confdefs.h +++$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 0" >>confdefs.h ++ ++ fi ++ +diff --git a/feeds/packages/net/click/patches/.svn/text-base/110-multithread_fix.patch.svn-base b/feeds/packages/net/click/patches/.svn/text-base/110-multithread_fix.patch.svn-base +new file mode 100644 +index 0000000..b875758 +--- /dev/null ++++ b/feeds/packages/net/click/patches/.svn/text-base/110-multithread_fix.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/lib/master.cc +++++ b/lib/master.cc ++@@ -409,7 +409,9 @@ Master::process_pending(RouterThread *th ++ while (Task *t = Task::pending_to_task(my_pending)) { ++ my_pending = t->_pending_nextptr; ++ t->_pending_nextptr = 0; +++# if HAVE_MULTITHREAD ++ click_master_mb(); +++# endif ++ t->process_pending(thread); ++ } ++ } +diff --git a/feeds/packages/net/click/patches/100-compile_fix.patch b/feeds/packages/net/click/patches/100-compile_fix.patch +new file mode 100644 +index 0000000..f798254 +--- /dev/null ++++ b/feeds/packages/net/click/patches/100-compile_fix.patch +@@ -0,0 +1,22 @@ ++--- a/tools/click-mkmindriver/Makefile.in +++++ b/tools/click-mkmindriver/Makefile.in ++@@ -60,7 +60,7 @@ DEPCFLAGS = @DEPCFLAGS@ ++ DEFS = @DEFS@ ++ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ ++ -I$(top_srcdir)/tools/lib -I$(srcdir) ++-LDFLAGS = @LDFLAGS@ +++LDFLAGS = @LDFLAGS@ -lrt ++ LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS) ++ ++ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS) ++--- a/configure +++++ b/configure ++@@ -7135,7 +7135,7 @@ fi ++ $as_echo "$ac_cv_va_list_addr" >&6; } ++ if test "x$ac_cv_va_list_addr" = xyes; then ++ ++-$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 1" >>confdefs.h +++$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 0" >>confdefs.h ++ ++ fi ++ +diff --git a/feeds/packages/net/click/patches/110-multithread_fix.patch b/feeds/packages/net/click/patches/110-multithread_fix.patch +new file mode 100644 +index 0000000..b875758 +--- /dev/null ++++ b/feeds/packages/net/click/patches/110-multithread_fix.patch +@@ -0,0 +1,12 @@ ++--- a/lib/master.cc +++++ b/lib/master.cc ++@@ -409,7 +409,9 @@ Master::process_pending(RouterThread *th ++ while (Task *t = Task::pending_to_task(my_pending)) { ++ my_pending = t->_pending_nextptr; ++ t->_pending_nextptr = 0; +++# if HAVE_MULTITHREAD ++ click_master_mb(); +++# endif ++ t->process_pending(thread); ++ } ++ } +diff --git a/feeds/packages/net/cmdftp/.svn/entries b/feeds/packages/net/cmdftp/.svn/entries +new file mode 100644 +index 0000000..072e41e +--- /dev/null ++++ b/feeds/packages/net/cmdftp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cmdftp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T05:50:28.247069Z ++26066 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++a8f33c416822506e0f8c561241292e3a ++2011-03-12T05:50:28.247069Z ++26066 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1371 ++ +diff --git a/feeds/packages/net/cmdftp/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/cmdftp/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/cmdftp/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cmdftp/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cmdftp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8e99238 +--- /dev/null ++++ b/feeds/packages/net/cmdftp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=cmdftp ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.savannah.nongnu.org/releases/$(PKG_NAME) ++PKG_MD5SUM:=9bd0741bbb1f218be95c089dc06b2777 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cmdftp ++ SUBMENU:=File Transfer ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=cmdftp is a tiny command line FTP client for Unix systems ++ URL:=http://www.nongnu.org/cmdftp/ ++endef ++ ++define Package/cmdftp/description ++ Features include passive mode for all data transfers, shell ++ like transparent syntax for local and remote modes, multiple ++ and recursive file transfers using wildcards, recursive copy and ++ move commands, remote and local text file viewing and editing, ++ network errors detection and resuming of currently executing ++ command, partial download resuming (if server accepts REST ++ command), tab completion for both local and remote names, ++ autologin using classic ~/.netrc approach, large file support. ++ ++ cmdftp is aimed at being small and simple. ++endef ++ ++define Package/cmdftp/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,cmdftp)) +diff --git a/feeds/packages/net/cmdftp/Makefile b/feeds/packages/net/cmdftp/Makefile +new file mode 100644 +index 0000000..8e99238 +--- /dev/null ++++ b/feeds/packages/net/cmdftp/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=cmdftp ++PKG_VERSION:=0.9.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.savannah.nongnu.org/releases/$(PKG_NAME) ++PKG_MD5SUM:=9bd0741bbb1f218be95c089dc06b2777 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cmdftp ++ SUBMENU:=File Transfer ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=cmdftp is a tiny command line FTP client for Unix systems ++ URL:=http://www.nongnu.org/cmdftp/ ++endef ++ ++define Package/cmdftp/description ++ Features include passive mode for all data transfers, shell ++ like transparent syntax for local and remote modes, multiple ++ and recursive file transfers using wildcards, recursive copy and ++ move commands, remote and local text file viewing and editing, ++ network errors detection and resuming of currently executing ++ command, partial download resuming (if server accepts REST ++ command), tab completion for both local and remote names, ++ autologin using classic ~/.netrc approach, large file support. ++ ++ cmdftp is aimed at being small and simple. ++endef ++ ++define Package/cmdftp/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,cmdftp)) +diff --git a/feeds/packages/net/coova-chilli/.svn/entries b/feeds/packages/net/coova-chilli/.svn/entries +new file mode 100644 +index 0000000..5b89369 +--- /dev/null ++++ b/feeds/packages/net/coova-chilli/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/coova-chilli ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++9df6fce65211a4cb67483381caf5b8e6 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1673 ++ +diff --git a/feeds/packages/net/coova-chilli/.svn/text-base/Makefile.svn-base b/feeds/packages/net/coova-chilli/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3b350cb +--- /dev/null ++++ b/feeds/packages/net/coova-chilli/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=coova-chilli ++PKG_VERSION:=1.2.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ap.coova.org/chilli ++PKG_MD5SUM:=a493d0562fc3b05fe86d8ad65f7f2dc0 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/coova-chilli ++ SUBMENU:=Captive Portals ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-tun +librt ++ TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version) ++ URL:=http://www.coova.org/CoovaChilli ++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/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)/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/feeds/packages/net/coova-chilli/Makefile b/feeds/packages/net/coova-chilli/Makefile +new file mode 100644 +index 0000000..3b350cb +--- /dev/null ++++ b/feeds/packages/net/coova-chilli/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=coova-chilli ++PKG_VERSION:=1.2.9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ap.coova.org/chilli ++PKG_MD5SUM:=a493d0562fc3b05fe86d8ad65f7f2dc0 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/coova-chilli ++ SUBMENU:=Captive Portals ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-tun +librt ++ TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version) ++ URL:=http://www.coova.org/CoovaChilli ++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/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)/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/feeds/packages/net/corkscrew/.svn/entries b/feeds/packages/net/corkscrew/.svn/entries +new file mode 100644 +index 0000000..e88acea +--- /dev/null ++++ b/feeds/packages/net/corkscrew/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/corkscrew ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T01:37:47.001597Z ++26057 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++4efe01c467e505311f107dcb5e9a123d ++2011-03-12T01:37:47.001597Z ++26057 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++807 ++ +diff --git a/feeds/packages/net/corkscrew/.svn/text-base/Makefile.svn-base b/feeds/packages/net/corkscrew/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7cc697a +--- /dev/null ++++ b/feeds/packages/net/corkscrew/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=corkscrew ++PKG_VERSION:=2.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.agroman.net/corkscrew/ ++PKG_MD5SUM:=35df77e7f0e59c0ec4f80313be52c10a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/corkscrew ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=SSH ++ TITLE:=Tunneling SSH through HTTP proxies. ++ URL:=http://www.agroman.net/corkscrew/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default,) ++endef ++ ++define Package/corkscrew/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/corkscrew $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,corkscrew)) +diff --git a/feeds/packages/net/corkscrew/Makefile b/feeds/packages/net/corkscrew/Makefile +new file mode 100644 +index 0000000..7cc697a +--- /dev/null ++++ b/feeds/packages/net/corkscrew/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=corkscrew ++PKG_VERSION:=2.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.agroman.net/corkscrew/ ++PKG_MD5SUM:=35df77e7f0e59c0ec4f80313be52c10a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/corkscrew ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=SSH ++ TITLE:=Tunneling SSH through HTTP proxies. ++ URL:=http://www.agroman.net/corkscrew/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default,) ++endef ++ ++define Package/corkscrew/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/corkscrew $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,corkscrew)) +diff --git a/feeds/packages/net/crda/.svn/entries b/feeds/packages/net/crda/.svn/entries +new file mode 100644 +index 0000000..28fbd94 +--- /dev/null ++++ b/feeds/packages/net/crda/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/crda ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-07T12:50:15.917460Z ++33634 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++b709fbd5c428b1c9e682db3beb3f5918 ++2012-04-02T16:25:40.902502Z ++31177 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2243 ++ +diff --git a/feeds/packages/net/crda/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/crda/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/crda/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/crda/.svn/text-base/Makefile.svn-base b/feeds/packages/net/crda/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0d075f1 +--- /dev/null ++++ b/feeds/packages/net/crda/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,74 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=crda ++PKG_RELEASE:=1 ++PKG_VERSION:=1.1.2 ++PKG_SOURCE_URL:=http://wireless.kernel.org/download/crda ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=5226f65aebacf94baaf820f8b4e06df4 ++ ++PKG_REGULATORY_NAME:=regulatory ++PKG_REGULATORY_VERSION:=2011.04.28 ++PKG_REGULATORY_SOURCE_URL:=http://wireless.kernel.org/download/wireless-regdb/regulatory.bins ++PKG_REGULATORY_SOURCE:=$(PKG_REGULATORY_VERSION)-$(PKG_REGULATORY_NAME).bin ++PKG_REGULATORY_MD5SUM:=1535e98bcaba732e2f8e8f62dac6f369 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/crda ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Central Regulatory Domain Agent (CRDA) ++ DEPENDS:=+libnl-tiny ++ URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA ++endef ++ ++define Download/wireless-regdb ++ FILE:=$(PKG_REGULATORY_SOURCE) ++ URL:=$(PKG_REGULATORY_SOURCE_URL) ++ VERSION:=$(PKG_REGULATORY_VERSION) ++ MD5SUM:=$(PKG_REGULATORY_MD5SUM) ++endef ++$(eval $(call Download,wireless-regdb)) ++ ++define Package/crda/description ++ This is the Central Regulatory Domain Agent for Linux. It serves one ++ purpose: tell Linux kernel what to enforce. In essence it is a udev ++ helper for communication between the kernel and userspace. You only ++ need to run this manually for debugging purposes. For manual changing ++ of regulatory domains use iw (iw reg set) or wpa_supplicant (feature ++ yet to be added). ++endef ++ ++TARGET_CPPFLAGS := \ ++ -I$(STAGING_DIR)/usr/include/libnl-tiny \ ++ -D_GNU_SOURCE \ ++ $(TARGET_CPPFLAGS) ++ ++MAKE_FLAGS += \ ++ NL1FOUND="" NL2FOUND=Y \ ++ NLLIBNAME="libnl-tiny" \ ++ NLLIBS="-lnl-tiny -lm" \ ++ REG_BIN="$(DL_DIR)/$(PKG_REGULATORY_SOURCE)" \ ++ crda ++ ++define Package/crda/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_DIR) $(1)/etc/hotplug.d ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/platform ++ $(INSTALL_DIR) $(1)/usr/lib/crda ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/crda $(1)/sbin/ ++ $(INSTALL_DATA) ./files/hotplug.rule $(1)/etc/hotplug.d/platform/10-regulatory ++ $(INSTALL_DATA) $(DL_DIR)/$(PKG_REGULATORY_SOURCE) $(1)/usr/lib/crda/regulatory.bin ++endef ++ ++$(eval $(call BuildPackage,crda)) ++ +diff --git a/feeds/packages/net/crda/Makefile b/feeds/packages/net/crda/Makefile +new file mode 100644 +index 0000000..0d075f1 +--- /dev/null ++++ b/feeds/packages/net/crda/Makefile +@@ -0,0 +1,74 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=crda ++PKG_RELEASE:=1 ++PKG_VERSION:=1.1.2 ++PKG_SOURCE_URL:=http://wireless.kernel.org/download/crda ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_MD5SUM:=5226f65aebacf94baaf820f8b4e06df4 ++ ++PKG_REGULATORY_NAME:=regulatory ++PKG_REGULATORY_VERSION:=2011.04.28 ++PKG_REGULATORY_SOURCE_URL:=http://wireless.kernel.org/download/wireless-regdb/regulatory.bins ++PKG_REGULATORY_SOURCE:=$(PKG_REGULATORY_VERSION)-$(PKG_REGULATORY_NAME).bin ++PKG_REGULATORY_MD5SUM:=1535e98bcaba732e2f8e8f62dac6f369 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/crda ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Central Regulatory Domain Agent (CRDA) ++ DEPENDS:=+libnl-tiny ++ URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA ++endef ++ ++define Download/wireless-regdb ++ FILE:=$(PKG_REGULATORY_SOURCE) ++ URL:=$(PKG_REGULATORY_SOURCE_URL) ++ VERSION:=$(PKG_REGULATORY_VERSION) ++ MD5SUM:=$(PKG_REGULATORY_MD5SUM) ++endef ++$(eval $(call Download,wireless-regdb)) ++ ++define Package/crda/description ++ This is the Central Regulatory Domain Agent for Linux. It serves one ++ purpose: tell Linux kernel what to enforce. In essence it is a udev ++ helper for communication between the kernel and userspace. You only ++ need to run this manually for debugging purposes. For manual changing ++ of regulatory domains use iw (iw reg set) or wpa_supplicant (feature ++ yet to be added). ++endef ++ ++TARGET_CPPFLAGS := \ ++ -I$(STAGING_DIR)/usr/include/libnl-tiny \ ++ -D_GNU_SOURCE \ ++ $(TARGET_CPPFLAGS) ++ ++MAKE_FLAGS += \ ++ NL1FOUND="" NL2FOUND=Y \ ++ NLLIBNAME="libnl-tiny" \ ++ NLLIBS="-lnl-tiny -lm" \ ++ REG_BIN="$(DL_DIR)/$(PKG_REGULATORY_SOURCE)" \ ++ crda ++ ++define Package/crda/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_DIR) $(1)/etc/hotplug.d ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/platform ++ $(INSTALL_DIR) $(1)/usr/lib/crda ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/crda $(1)/sbin/ ++ $(INSTALL_DATA) ./files/hotplug.rule $(1)/etc/hotplug.d/platform/10-regulatory ++ $(INSTALL_DATA) $(DL_DIR)/$(PKG_REGULATORY_SOURCE) $(1)/usr/lib/crda/regulatory.bin ++endef ++ ++$(eval $(call BuildPackage,crda)) ++ +diff --git a/feeds/packages/net/crda/files/.svn/entries b/feeds/packages/net/crda/files/.svn/entries +new file mode 100644 +index 0000000..f8a5a41 +--- /dev/null ++++ b/feeds/packages/net/crda/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/crda/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-01-28T20:03:04.952245Z ++14249 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hotplug.rule ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++4d993d4c0bd1ef0020c14cdfa47aae97 ++2009-01-28T20:03:04.952245Z ++14249 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++118 ++ +diff --git a/feeds/packages/net/crda/files/.svn/text-base/hotplug.rule.svn-base b/feeds/packages/net/crda/files/.svn/text-base/hotplug.rule.svn-base +new file mode 100644 +index 0000000..1ec033f +--- /dev/null ++++ b/feeds/packages/net/crda/files/.svn/text-base/hotplug.rule.svn-base +@@ -0,0 +1,6 @@ ++#!/bin/sh ++# Copyright (C) 2009 OpenWrt.org ++ ++[ change = "$ACTION" -a regulatory.0 = "$DEVICENAME" ] && { ++ /sbin/crda ++} +diff --git a/feeds/packages/net/crda/files/hotplug.rule b/feeds/packages/net/crda/files/hotplug.rule +new file mode 100644 +index 0000000..1ec033f +--- /dev/null ++++ b/feeds/packages/net/crda/files/hotplug.rule +@@ -0,0 +1,6 @@ ++#!/bin/sh ++# Copyright (C) 2009 OpenWrt.org ++ ++[ change = "$ACTION" -a regulatory.0 = "$DEVICENAME" ] && { ++ /sbin/crda ++} +diff --git a/feeds/packages/net/crda/patches/.svn/entries b/feeds/packages/net/crda/patches/.svn/entries +new file mode 100644 +index 0000000..43b12fa +--- /dev/null ++++ b/feeds/packages/net/crda/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/crda/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T16:25:40.902502Z ++31177 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++101-make_crypto_use_optional.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++be4aceaad3b03cd90c1fc9ca6a91bb25 ++2012-04-02T16:25:40.902502Z ++31177 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++197 ++ +diff --git a/feeds/packages/net/crda/patches/.svn/text-base/101-make_crypto_use_optional.patch.svn-base b/feeds/packages/net/crda/patches/.svn/text-base/101-make_crypto_use_optional.patch.svn-base +new file mode 100644 +index 0000000..c7ace42 +--- /dev/null ++++ b/feeds/packages/net/crda/patches/.svn/text-base/101-make_crypto_use_optional.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -35,7 +35,9 @@ LDLIBS += `pkg-config --libs openssl` ++ ++ reglib.o: keys-ssl.c ++ ++-else +++endif +++ +++ifeq ($(USE_GCRYPT),1) ++ CFLAGS += -DUSE_GCRYPT ++ LDLIBS += -lgcrypt ++ +diff --git a/feeds/packages/net/crda/patches/101-make_crypto_use_optional.patch b/feeds/packages/net/crda/patches/101-make_crypto_use_optional.patch +new file mode 100644 +index 0000000..c7ace42 +--- /dev/null ++++ b/feeds/packages/net/crda/patches/101-make_crypto_use_optional.patch +@@ -0,0 +1,13 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -35,7 +35,9 @@ LDLIBS += `pkg-config --libs openssl` ++ ++ reglib.o: keys-ssl.c ++ ++-else +++endif +++ +++ifeq ($(USE_GCRYPT),1) ++ CFLAGS += -DUSE_GCRYPT ++ LDLIBS += -lgcrypt ++ +diff --git a/feeds/packages/net/crowdcontrol/.svn/entries b/feeds/packages/net/crowdcontrol/.svn/entries +new file mode 100644 +index 0000000..7987806 +--- /dev/null ++++ b/feeds/packages/net/crowdcontrol/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/crowdcontrol ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++1dc112e101587fa19ff0f470887fccee ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1616 ++ +diff --git a/feeds/packages/net/crowdcontrol/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/crowdcontrol/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/crowdcontrol/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/crowdcontrol/.svn/text-base/Makefile.svn-base b/feeds/packages/net/crowdcontrol/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bf5e18f +--- /dev/null ++++ b/feeds/packages/net/crowdcontrol/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=crowdcontrol ++PKG_VERSION:=0.4b ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ ++PKG_MD5SUM:=a0991ae3d1f1a361558bed1a4aa66a9c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/crowdcontrol ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Web Servers/Proxies ++ TITLE:=The extra-light http proxy server ++ URL:=http://sourceforge.net/projects/crowdcontrol/ ++endef ++ ++define Package/crowdcontrol/description ++ Crowd Control is an small, cross-platform HTTP proxy (a fork of the elhttp project) ++ designed for systems with little RAM, such as a home router. It can filter URLs using ++ SquidGuard blocklists, and has the unique ability to filter HTTPS domains as well. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/crowdcontrol $(PKG_BUILD_DIR)/crowdcontrol.c ++endef ++ ++define Package/crowdcontrol/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/crowdcontrol ++ $(CP) $(PKG_BUILD_DIR)/crowdcontrol $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/*-{domains,expressions,urls} $(1)/etc/crowdcontrol/ ++endef ++ ++define Package/crowdcontrol/conffiles ++/etc/crowdcontrol/blocked-domains ++/etc/crowdcontrol/blocked-expressions ++/etc/crowdcontrol/blocked-urls ++/etc/crowdcontrol/permitted-domains ++/etc/crowdcontrol/permitted-expressions ++/etc/crowdcontrol/permitted-urls ++endef ++ ++$(eval $(call BuildPackage,crowdcontrol)) +diff --git a/feeds/packages/net/crowdcontrol/Makefile b/feeds/packages/net/crowdcontrol/Makefile +new file mode 100644 +index 0000000..bf5e18f +--- /dev/null ++++ b/feeds/packages/net/crowdcontrol/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=crowdcontrol ++PKG_VERSION:=0.4b ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ ++PKG_MD5SUM:=a0991ae3d1f1a361558bed1a4aa66a9c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/crowdcontrol ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Web Servers/Proxies ++ TITLE:=The extra-light http proxy server ++ URL:=http://sourceforge.net/projects/crowdcontrol/ ++endef ++ ++define Package/crowdcontrol/description ++ Crowd Control is an small, cross-platform HTTP proxy (a fork of the elhttp project) ++ designed for systems with little RAM, such as a home router. It can filter URLs using ++ SquidGuard blocklists, and has the unique ability to filter HTTPS domains as well. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/crowdcontrol $(PKG_BUILD_DIR)/crowdcontrol.c ++endef ++ ++define Package/crowdcontrol/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/crowdcontrol ++ $(CP) $(PKG_BUILD_DIR)/crowdcontrol $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/*-{domains,expressions,urls} $(1)/etc/crowdcontrol/ ++endef ++ ++define Package/crowdcontrol/conffiles ++/etc/crowdcontrol/blocked-domains ++/etc/crowdcontrol/blocked-expressions ++/etc/crowdcontrol/blocked-urls ++/etc/crowdcontrol/permitted-domains ++/etc/crowdcontrol/permitted-expressions ++/etc/crowdcontrol/permitted-urls ++endef ++ ++$(eval $(call BuildPackage,crowdcontrol)) +diff --git a/feeds/packages/net/ctorrent/.svn/entries b/feeds/packages/net/ctorrent/.svn/entries +new file mode 100644 +index 0000000..c3258ab +--- /dev/null ++++ b/feeds/packages/net/ctorrent/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ctorrent ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-07T16:44:58.274475Z ++35041 ++tripolar ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++8ad96b167c693e645893119776aaa9c0 ++2013-01-07T16:44:58.274475Z ++35041 ++tripolar ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2106 ++ +diff --git a/feeds/packages/net/ctorrent/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/ctorrent/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/net/ctorrent/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ctorrent/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ctorrent/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..16504e2 +--- /dev/null ++++ b/feeds/packages/net/ctorrent/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,84 @@ ++# ++# 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 ++ 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/feeds/packages/net/ctorrent/Makefile b/feeds/packages/net/ctorrent/Makefile +new file mode 100644 +index 0000000..16504e2 +--- /dev/null ++++ b/feeds/packages/net/ctorrent/Makefile +@@ -0,0 +1,84 @@ ++# ++# 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 ++ 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/feeds/packages/net/ctorrent/patches/.svn/entries b/feeds/packages/net/ctorrent/patches/.svn/entries +new file mode 100644 +index 0000000..11a6835 +--- /dev/null ++++ b/feeds/packages/net/ctorrent/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ctorrent/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-07T16:44:58.274475Z ++35041 ++tripolar ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-CVE-2009-1759.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++514e49e4acf749e9ee1eae9f5ad7c005 ++2010-10-11T18:49:51.991834Z ++23404 ++tripolar ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10961 ++ ++100-negative-ints.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++469f5d752a079c871d0fa5d86d973e3c ++2013-01-07T16:44:58.274475Z ++35041 ++tripolar ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++284 ++ +diff --git a/feeds/packages/net/ctorrent/patches/.svn/text-base/100-CVE-2009-1759.patch.svn-base b/feeds/packages/net/ctorrent/patches/.svn/text-base/100-CVE-2009-1759.patch.svn-base +new file mode 100644 +index 0000000..86ae1d7 +--- /dev/null ++++ b/feeds/packages/net/ctorrent/patches/.svn/text-base/100-CVE-2009-1759.patch.svn-base +@@ -0,0 +1,364 @@ ++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/feeds/packages/net/ctorrent/patches/.svn/text-base/100-negative-ints.patch.svn-base b/feeds/packages/net/ctorrent/patches/.svn/text-base/100-negative-ints.patch.svn-base +new file mode 100644 +index 0000000..864ce1b +--- /dev/null ++++ b/feeds/packages/net/ctorrent/patches/.svn/text-base/100-negative-ints.patch.svn-base +@@ -0,0 +1,13 @@ ++--- 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/feeds/packages/net/ctorrent/patches/100-CVE-2009-1759.patch b/feeds/packages/net/ctorrent/patches/100-CVE-2009-1759.patch +new file mode 100644 +index 0000000..86ae1d7 +--- /dev/null ++++ b/feeds/packages/net/ctorrent/patches/100-CVE-2009-1759.patch +@@ -0,0 +1,364 @@ ++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/feeds/packages/net/ctorrent/patches/100-negative-ints.patch b/feeds/packages/net/ctorrent/patches/100-negative-ints.patch +new file mode 100644 +index 0000000..864ce1b +--- /dev/null ++++ b/feeds/packages/net/ctorrent/patches/100-negative-ints.patch +@@ -0,0 +1,13 @@ ++--- 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/feeds/packages/net/cups-bjnp/.svn/entries b/feeds/packages/net/cups-bjnp/.svn/entries +new file mode 100644 +index 0000000..6c417ea +--- /dev/null ++++ b/feeds/packages/net/cups-bjnp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cups-bjnp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-20T13:54:51.873780Z ++35697 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++575c650155c1e7b5d580dfd758e6ee7a ++2013-02-20T13:54:51.873780Z ++35697 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1207 ++ +diff --git a/feeds/packages/net/cups-bjnp/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cups-bjnp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f8d044c +--- /dev/null ++++ b/feeds/packages/net/cups-bjnp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=cups-bjnp ++PKG_VERSION:=1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/cups-bjnp ++PKG_MD5SUM:=8672b4585b71dee6dcefa00fbbbe7698 ++ ++PKG_BUILD_DEPENDS:=cups ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cups-bjnp ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Printing ++ TITLE:=BJNP protocol backend for CUPS ++ URL:=http://sourceforge.net/projects/cups-bjnp/ ++ DEPENDS:=cups ++endef ++ ++define Package/cups-bjnp/description ++CUPS backend for the canon printers using the proprietary USB over ++IP BJNP protocol. This backend allows Cups to print over the network ++to a Canon printer. It currently supports Cups 1.2 and Cups 1.3 and ++is designed by reverse engineering. ++endef ++ ++CONFIGURE_ARGS += --with-cupsbackenddir=$(STAGING_DIR)/usr/include/cups ++ ++TARGET_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/cups-bjnp/install ++ $(INSTALL_DIR) $(1)/usr/lib/cups/backend ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bjnp $(1)/usr/lib/cups/backend ++endef ++ ++ ++$(eval $(call BuildPackage,cups-bjnp)) +diff --git a/feeds/packages/net/cups-bjnp/Makefile b/feeds/packages/net/cups-bjnp/Makefile +new file mode 100644 +index 0000000..f8d044c +--- /dev/null ++++ b/feeds/packages/net/cups-bjnp/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=cups-bjnp ++PKG_VERSION:=1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/cups-bjnp ++PKG_MD5SUM:=8672b4585b71dee6dcefa00fbbbe7698 ++ ++PKG_BUILD_DEPENDS:=cups ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cups-bjnp ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Printing ++ TITLE:=BJNP protocol backend for CUPS ++ URL:=http://sourceforge.net/projects/cups-bjnp/ ++ DEPENDS:=cups ++endef ++ ++define Package/cups-bjnp/description ++CUPS backend for the canon printers using the proprietary USB over ++IP BJNP protocol. This backend allows Cups to print over the network ++to a Canon printer. It currently supports Cups 1.2 and Cups 1.3 and ++is designed by reverse engineering. ++endef ++ ++CONFIGURE_ARGS += --with-cupsbackenddir=$(STAGING_DIR)/usr/include/cups ++ ++TARGET_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/cups-bjnp/install ++ $(INSTALL_DIR) $(1)/usr/lib/cups/backend ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bjnp $(1)/usr/lib/cups/backend ++endef ++ ++ ++$(eval $(call BuildPackage,cups-bjnp)) +diff --git a/feeds/packages/net/cups/.svn/entries b/feeds/packages/net/cups/.svn/entries +new file mode 100644 +index 0000000..5a5a052 +--- /dev/null ++++ b/feeds/packages/net/cups/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cups ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-20T13:54:53.766963Z ++35698 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++04d40ee8c469ea0b88fbb59116fa0064 ++2013-02-20T13:54:53.766963Z ++35698 ++jogo ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++19317 ++ +diff --git a/feeds/packages/net/cups/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/cups/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/cups/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cups/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..550d00e +--- /dev/null ++++ b/feeds/packages/net/cups/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,703 @@ ++# ++# 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:=cups ++PKG_VERSION:=1.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 ++PKG_SOURCE_URL:= \ ++ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \ ++ ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \ ++ ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION) ++PKG_MD5SUM:=de3006e5cf1ee78a9c6145ce62c4e982 ++ ++TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cups/Default ++ URL:=http://www.cups.org/ ++ SUBMENU:=Printing ++endef ++ ++define Package/cups ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb-1.0 ++ TITLE:=Common UNIX Printing System (daemon) ++endef ++ ++define Package/cups/description ++ Common UNIX Printing System (daemon) ++endef ++ ++define Package/cups/conffiles ++/etc/cups/classes.conf ++/etc/cups/cupsd.conf ++/etc/cups/printers.conf ++endef ++ ++define Package/cups-bsd ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - BSD commands (old) ++endef ++ ++define Package/cups-bsd/description ++ Common UNIX Printing System - BSD commands (old) ++endef ++ ++define Package/cups-client ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcups +libcupsimage +libcupsmime ++ TITLE:=Common UNIX Printing System - Client commands ++endef ++ ++define Package/cups-client/conffiles ++/etc/cups/client.conf ++endef ++ ++define Package/cups-client/description ++ Common UNIX Printing System - Client commands ++endef ++ ++define Package/cups-filters ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcupsimage +libcupsdriver ++ TITLE:=Common UNIX Printing System - Filter ++endef ++ ++define Package/cups-filters/description ++ Common UNIX Printing System - Filter ++endef ++ ++define Package/cups-ppdc ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcupsppdc ++ TITLE:=Common UNIX Printing System - PPDC utils ++endef ++ ++define Package/cups-ppdc/description ++ Common UNIX Printing System - PPDC utils ++endef ++ ++define Package/libcups ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libpthread +libpng +libjpeg ++ TITLE:=Common UNIX Printing System - Core library ++endef ++ ++define Package/libcups/description ++ Common UNIX Printing System - Core library ++endef ++ ++define Package/libcupscgi ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - CGI library ++endef ++ ++define Package/libcupscgi/description ++ Common UNIX Printing System - CGI library ++endef ++ ++define Package/libcupsdriver ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - Driver library ++endef ++ ++define Package/libcupsdriver/description ++ Common UNIX Printing System - Driver library ++endef ++ ++define Package/libcupsimage ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups +libpng +libjpeg ++ TITLE:=Common UNIX Printing System - Image library ++endef ++ ++define Package/libcupsimage/description ++ Common UNIX Printing System - Image library ++endef ++ ++define Package/libcupsmime ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - MIME library ++endef ++ ++define Package/libcupsmime/description ++ Common UNIX Printing System - MIME library ++endef ++ ++define Package/libcupsppdc ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups +libstdcpp ++ TITLE:=Common UNIX Printing System - PPDC library ++endef ++ ++define Package/libcupsppdc/description ++ Common UNIX Printing System - PPDC library ++endef ++ ++define Package/cups-locale-de ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale de ++endef ++ ++define Package/cups-locale-de/description ++ Common UNIX Printing System - Locale de ++endef ++ ++define Package/cups-locale-nl ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale nl ++endef ++ ++define Package/cups-locale-nl/description ++ Common UNIX Printing System - Locale nl ++endef ++ ++define Package/cups-locale-hu ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale hu ++endef ++ ++define Package/cups-locale-hu/description ++ Common UNIX Printing System - Locale hu ++endef ++ ++define Package/cups-locale-pt ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale pt ++endef ++ ++define Package/cups-locale-pt/description ++ Common UNIX Printing System - Locale pt ++endef ++ ++define Package/cups-locale-pt_BR ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale pt_BR ++endef ++ ++define Package/cups-locale-pt_BR/description ++ Common UNIX Printing System - Locale pt_BR ++endef ++ ++define Package/cups-locale-fi ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale fi ++endef ++ ++define Package/cups-locale-fi/description ++ Common UNIX Printing System - Locale fi ++endef ++ ++define Package/cups-locale-sv ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale sv ++endef ++ ++define Package/cups-locale-sv/description ++ Common UNIX Printing System - Locale sv ++endef ++ ++define Package/cups-locale-da ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale da ++endef ++ ++define Package/cups-locale-da/description ++ Common UNIX Printing System - Locale da ++endef ++ ++define Package/cups-locale-ko ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale ko ++endef ++ ++define Package/cups-locale-ko/description ++ Common UNIX Printing System - Locale ko ++endef ++ ++define Package/cups-locale-zh ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale zh ++endef ++ ++define Package/cups-locale-zh/description ++ Common UNIX Printing System - Locale zh ++endef ++ ++define Package/cups-locale-ja ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale ja ++endef ++ ++define Package/cups-locale-ja/description ++ Common UNIX Printing System - Locale ja ++endef ++ ++define Package/cups-locale-es ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale es ++endef ++ ++define Package/cups-locale-es/description ++ Common UNIX Printing System - Locale es ++endef ++ ++define Package/cups-locale-zh_TW ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale zh_TW ++endef ++ ++define Package/cups-locale-zh_TW/description ++ Common UNIX Printing System - Locale zh_TW ++endef ++ ++define Package/cups-locale-pl ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale pl ++endef ++ ++define Package/cups-locale-pl/description ++ Common UNIX Printing System - Locale pl ++endef ++ ++define Package/cups-locale-no ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale no ++endef ++ ++define Package/cups-locale-no/description ++ Common UNIX Printing System - Locale no ++endef ++ ++define Package/cups-locale-ru ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale ru ++endef ++ ++define Package/cups-locale-ru/description ++ Common UNIX Printing System - Locale ru ++endef ++ ++define Package/cups-locale-eu ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale eu ++endef ++ ++define Package/cups-locale-eu/description ++ Common UNIX Printing System - Locale eu ++endef ++ ++define Package/cups-locale-fr ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale fr ++endef ++ ++define Package/cups-locale-fr/description ++ Common UNIX Printing System - Locale fr ++endef ++ ++define Package/cups-locale-it ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale it ++endef ++ ++define Package/cups-locale-it/description ++ Common UNIX Printing System - Locale it ++endef ++ ++define Package/cups-locale-id ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale id ++endef ++ ++define Package/cups-locale-id/description ++ Common UNIX Printing System - Locale id ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-cups-user="nobody" \ ++ --with-cups-group="nogroup" \ ++ --with-components="embedded" \ ++ --with-pdftops="none" \ ++ --without-perl \ ++ --without-python \ ++ --without-php \ ++ --enable-shared \ ++ --enable-image \ ++ --enable-libusb \ ++ --disable-dbus \ ++ --disable-dnssd \ ++ --disable-launchd \ ++ --disable-ldap \ ++ --disable-pam \ ++ --disable-slp \ ++ --disable-gnutls \ ++ --disable-openssl \ ++ --disable-cdsassl \ ++ --disable-ssl \ ++ --disable-gssapi \ ++ --disable-tiff, \ ++ UNAME="Linux" \ ++ LIBS="$(TARGET_LDFLAGS) -lz -lpng -ljpeg" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ DSTROOT="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ all install ++endef ++ ++define Package/cups/install ++ rm -rf $(1)/etc/cups ++ $(INSTALL_DIR) $(1)/etc/cups ++ $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(1)/etc/cups/ ++ rm -rf $(1)/etc/cups/certs ++ ln -sf /tmp $(1)/etc/cups/certs ++ rm -f $(1)/usr/bin/cups-config ++ $(INSTALL_DIR) $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/backend $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/cgi-bin $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/daemon $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/driver $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/monitor $(1)/usr/lib/cups ++ $(INSTALL_DIR) $(1)/usr/lib/cups/filter ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{commandtops,pstops} \ ++ $(PKG_INSTALL_DIR)/usr/lib/cups/filter/gziptoany \ ++ $(1)/usr/lib/cups/filter ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl \ ++ $(1)/usr/share/cups/templates/ ++ $(INSTALL_DIR) $(1)/usr/share/cups/mime ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/mime/* $(1)/usr/share/cups/mime/ ++ $(INSTALL_DIR) $(1)/usr/share/doc/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html \ ++ $(1)/usr/share/doc/cups/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css \ ++ $(1)/usr/share/doc/cups/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images \ ++ $(1)/usr/share/doc/cups/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ # overwrite default config with our own ++ $(CP) ./files/etc/cups/* $(1)/etc/cups/ ++ # install initscript with priority 60 ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/cupsd.init $(1)/etc/init.d/cupsd ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/{cupsctl,cupsd} \ ++ $(1)/usr/sbin/ ++endef ++ ++define Package/cups-bsd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{lprm,lpq,lpr} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lpc $(1)/usr/sbin/ ++endef ++ ++define Package/cups-client/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/{lp,cancel,cupstestppd,cupstestdsc} \ ++ $(PKG_INSTALL_DIR)/usr/bin/{ipptool,lpoptions,lpstat,lppasswd} \ ++ $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/{cupsaccept,cupsaddsmb,cupsfilter} \ ++ $(PKG_INSTALL_DIR)/usr/sbin/{lpadmin,lpinfo,lpmove} \ ++ $(1)/usr/sbin/ ++ (cd $(1)/usr/sbin; ln -sf cupsaccept accept; ln -sf cupsaccept cupsenable; ln -sf cupsaccept cupsdisable; ln -sf cupsaccept reject; ln -sf cupsaccept cupsreject;) ++endef ++ ++define Package/cups-filters/install ++ $(INSTALL_DIR) $(1)/usr/lib/cups/filter ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,rastertoepson,rastertopwg,rastertohp,rastertoescpx,rastertopclx,rastertolabel,texttops} \ ++ $(1)/usr/lib/cups/filter ++ (cd $(1)/usr/lib/cups/filter; ln -sf rastertolabel rastertodymo;) ++endef ++ ++define Package/cups-ppdc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/{ppdc,ppdhtml,ppdi,ppdmerge,ppdpo} \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/libcups/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupscgi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupscgi.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsdriver/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsdriver.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsimage/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsimage.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsmime/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsmime.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsppdc/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsppdc.so* $(1)/usr/lib/ ++endef ++ ++define Package/cups-locale-de/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/de $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/de \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-nl/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/nl $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-hu/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/hu $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/hu \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-pt/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pt $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-pt_BR/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pt_BR $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-fi/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/fi $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-sv/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/sv $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-da/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/da $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-ko/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ko $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-zh/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/zh $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-ja/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ja $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/ja \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-es/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/es $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/es \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-zh_TW/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/zh_TW $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-pl/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pl $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/pl \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-no/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/no $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-ru/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ru $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/ru \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-eu/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/eu $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/eu \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-fr/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/fr $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/fr \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-it/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/it $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/it \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-id/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/id $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/id \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(2)/bin/ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,cups)) ++$(eval $(call BuildPackage,libcups)) ++$(eval $(call BuildPackage,libcupscgi)) ++$(eval $(call BuildPackage,libcupsdriver)) ++$(eval $(call BuildPackage,libcupsimage)) ++$(eval $(call BuildPackage,libcupsmime)) ++$(eval $(call BuildPackage,libcupsppdc)) ++$(eval $(call BuildPackage,cups-bsd)) ++$(eval $(call BuildPackage,cups-client)) ++$(eval $(call BuildPackage,cups-filters)) ++$(eval $(call BuildPackage,cups-ppdc)) ++$(eval $(call BuildPackage,cups-locale-de)) ++$(eval $(call BuildPackage,cups-locale-nl)) ++$(eval $(call BuildPackage,cups-locale-hu)) ++$(eval $(call BuildPackage,cups-locale-pt)) ++$(eval $(call BuildPackage,cups-locale-pt_BR)) ++$(eval $(call BuildPackage,cups-locale-fi)) ++$(eval $(call BuildPackage,cups-locale-sv)) ++$(eval $(call BuildPackage,cups-locale-da)) ++$(eval $(call BuildPackage,cups-locale-ko)) ++$(eval $(call BuildPackage,cups-locale-zh)) ++$(eval $(call BuildPackage,cups-locale-ja)) ++$(eval $(call BuildPackage,cups-locale-es)) ++$(eval $(call BuildPackage,cups-locale-zh_TW)) ++$(eval $(call BuildPackage,cups-locale-pl)) ++$(eval $(call BuildPackage,cups-locale-no)) ++$(eval $(call BuildPackage,cups-locale-ru)) ++$(eval $(call BuildPackage,cups-locale-eu)) ++$(eval $(call BuildPackage,cups-locale-fr)) ++$(eval $(call BuildPackage,cups-locale-it)) ++$(eval $(call BuildPackage,cups-locale-id)) +diff --git a/feeds/packages/net/cups/Makefile b/feeds/packages/net/cups/Makefile +new file mode 100644 +index 0000000..550d00e +--- /dev/null ++++ b/feeds/packages/net/cups/Makefile +@@ -0,0 +1,703 @@ ++# ++# 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:=cups ++PKG_VERSION:=1.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 ++PKG_SOURCE_URL:= \ ++ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \ ++ ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \ ++ ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION) ++PKG_MD5SUM:=de3006e5cf1ee78a9c6145ce62c4e982 ++ ++TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cups/Default ++ URL:=http://www.cups.org/ ++ SUBMENU:=Printing ++endef ++ ++define Package/cups ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcups +libcupsmime +libcupscgi +libcupsppdc +libusb-1.0 ++ TITLE:=Common UNIX Printing System (daemon) ++endef ++ ++define Package/cups/description ++ Common UNIX Printing System (daemon) ++endef ++ ++define Package/cups/conffiles ++/etc/cups/classes.conf ++/etc/cups/cupsd.conf ++/etc/cups/printers.conf ++endef ++ ++define Package/cups-bsd ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - BSD commands (old) ++endef ++ ++define Package/cups-bsd/description ++ Common UNIX Printing System - BSD commands (old) ++endef ++ ++define Package/cups-client ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcups +libcupsimage +libcupsmime ++ TITLE:=Common UNIX Printing System - Client commands ++endef ++ ++define Package/cups-client/conffiles ++/etc/cups/client.conf ++endef ++ ++define Package/cups-client/description ++ Common UNIX Printing System - Client commands ++endef ++ ++define Package/cups-filters ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcupsimage +libcupsdriver ++ TITLE:=Common UNIX Printing System - Filter ++endef ++ ++define Package/cups-filters/description ++ Common UNIX Printing System - Filter ++endef ++ ++define Package/cups-ppdc ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libcupsppdc ++ TITLE:=Common UNIX Printing System - PPDC utils ++endef ++ ++define Package/cups-ppdc/description ++ Common UNIX Printing System - PPDC utils ++endef ++ ++define Package/libcups ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+zlib +libpthread +libpng +libjpeg ++ TITLE:=Common UNIX Printing System - Core library ++endef ++ ++define Package/libcups/description ++ Common UNIX Printing System - Core library ++endef ++ ++define Package/libcupscgi ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - CGI library ++endef ++ ++define Package/libcupscgi/description ++ Common UNIX Printing System - CGI library ++endef ++ ++define Package/libcupsdriver ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - Driver library ++endef ++ ++define Package/libcupsdriver/description ++ Common UNIX Printing System - Driver library ++endef ++ ++define Package/libcupsimage ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups +libpng +libjpeg ++ TITLE:=Common UNIX Printing System - Image library ++endef ++ ++define Package/libcupsimage/description ++ Common UNIX Printing System - Image library ++endef ++ ++define Package/libcupsmime ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups ++ TITLE:=Common UNIX Printing System - MIME library ++endef ++ ++define Package/libcupsmime/description ++ Common UNIX Printing System - MIME library ++endef ++ ++define Package/libcupsppdc ++$(call Package/cups/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libcups +libstdcpp ++ TITLE:=Common UNIX Printing System - PPDC library ++endef ++ ++define Package/libcupsppdc/description ++ Common UNIX Printing System - PPDC library ++endef ++ ++define Package/cups-locale-de ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale de ++endef ++ ++define Package/cups-locale-de/description ++ Common UNIX Printing System - Locale de ++endef ++ ++define Package/cups-locale-nl ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale nl ++endef ++ ++define Package/cups-locale-nl/description ++ Common UNIX Printing System - Locale nl ++endef ++ ++define Package/cups-locale-hu ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale hu ++endef ++ ++define Package/cups-locale-hu/description ++ Common UNIX Printing System - Locale hu ++endef ++ ++define Package/cups-locale-pt ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale pt ++endef ++ ++define Package/cups-locale-pt/description ++ Common UNIX Printing System - Locale pt ++endef ++ ++define Package/cups-locale-pt_BR ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale pt_BR ++endef ++ ++define Package/cups-locale-pt_BR/description ++ Common UNIX Printing System - Locale pt_BR ++endef ++ ++define Package/cups-locale-fi ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale fi ++endef ++ ++define Package/cups-locale-fi/description ++ Common UNIX Printing System - Locale fi ++endef ++ ++define Package/cups-locale-sv ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale sv ++endef ++ ++define Package/cups-locale-sv/description ++ Common UNIX Printing System - Locale sv ++endef ++ ++define Package/cups-locale-da ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale da ++endef ++ ++define Package/cups-locale-da/description ++ Common UNIX Printing System - Locale da ++endef ++ ++define Package/cups-locale-ko ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale ko ++endef ++ ++define Package/cups-locale-ko/description ++ Common UNIX Printing System - Locale ko ++endef ++ ++define Package/cups-locale-zh ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale zh ++endef ++ ++define Package/cups-locale-zh/description ++ Common UNIX Printing System - Locale zh ++endef ++ ++define Package/cups-locale-ja ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale ja ++endef ++ ++define Package/cups-locale-ja/description ++ Common UNIX Printing System - Locale ja ++endef ++ ++define Package/cups-locale-es ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale es ++endef ++ ++define Package/cups-locale-es/description ++ Common UNIX Printing System - Locale es ++endef ++ ++define Package/cups-locale-zh_TW ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale zh_TW ++endef ++ ++define Package/cups-locale-zh_TW/description ++ Common UNIX Printing System - Locale zh_TW ++endef ++ ++define Package/cups-locale-pl ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale pl ++endef ++ ++define Package/cups-locale-pl/description ++ Common UNIX Printing System - Locale pl ++endef ++ ++define Package/cups-locale-no ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale no ++endef ++ ++define Package/cups-locale-no/description ++ Common UNIX Printing System - Locale no ++endef ++ ++define Package/cups-locale-ru ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale ru ++endef ++ ++define Package/cups-locale-ru/description ++ Common UNIX Printing System - Locale ru ++endef ++ ++define Package/cups-locale-eu ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale eu ++endef ++ ++define Package/cups-locale-eu/description ++ Common UNIX Printing System - Locale eu ++endef ++ ++define Package/cups-locale-fr ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale fr ++endef ++ ++define Package/cups-locale-fr/description ++ Common UNIX Printing System - Locale fr ++endef ++ ++define Package/cups-locale-it ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale it ++endef ++ ++define Package/cups-locale-it/description ++ Common UNIX Printing System - Locale it ++endef ++ ++define Package/cups-locale-id ++$(call Package/cups/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Common UNIX Printing System - Locale id ++endef ++ ++define Package/cups-locale-id/description ++ Common UNIX Printing System - Locale id ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-cups-user="nobody" \ ++ --with-cups-group="nogroup" \ ++ --with-components="embedded" \ ++ --with-pdftops="none" \ ++ --without-perl \ ++ --without-python \ ++ --without-php \ ++ --enable-shared \ ++ --enable-image \ ++ --enable-libusb \ ++ --disable-dbus \ ++ --disable-dnssd \ ++ --disable-launchd \ ++ --disable-ldap \ ++ --disable-pam \ ++ --disable-slp \ ++ --disable-gnutls \ ++ --disable-openssl \ ++ --disable-cdsassl \ ++ --disable-ssl \ ++ --disable-gssapi \ ++ --disable-tiff, \ ++ UNAME="Linux" \ ++ LIBS="$(TARGET_LDFLAGS) -lz -lpng -ljpeg" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ DSTROOT="$(PKG_INSTALL_DIR)" \ ++ STRIP="/bin/true" \ ++ all install ++endef ++ ++define Package/cups/install ++ rm -rf $(1)/etc/cups ++ $(INSTALL_DIR) $(1)/etc/cups ++ $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(1)/etc/cups/ ++ rm -rf $(1)/etc/cups/certs ++ ln -sf /tmp $(1)/etc/cups/certs ++ rm -f $(1)/usr/bin/cups-config ++ $(INSTALL_DIR) $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/backend $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/cgi-bin $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/daemon $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/driver $(1)/usr/lib/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/monitor $(1)/usr/lib/cups ++ $(INSTALL_DIR) $(1)/usr/lib/cups/filter ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{commandtops,pstops} \ ++ $(PKG_INSTALL_DIR)/usr/lib/cups/filter/gziptoany \ ++ $(1)/usr/lib/cups/filter ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl \ ++ $(1)/usr/share/cups/templates/ ++ $(INSTALL_DIR) $(1)/usr/share/cups/mime ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/mime/* $(1)/usr/share/cups/mime/ ++ $(INSTALL_DIR) $(1)/usr/share/doc/cups ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html \ ++ $(1)/usr/share/doc/cups/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css \ ++ $(1)/usr/share/doc/cups/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images \ ++ $(1)/usr/share/doc/cups/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ # overwrite default config with our own ++ $(CP) ./files/etc/cups/* $(1)/etc/cups/ ++ # install initscript with priority 60 ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/cupsd.init $(1)/etc/init.d/cupsd ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/{cupsctl,cupsd} \ ++ $(1)/usr/sbin/ ++endef ++ ++define Package/cups-bsd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{lprm,lpq,lpr} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/lpc $(1)/usr/sbin/ ++endef ++ ++define Package/cups-client/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/{lp,cancel,cupstestppd,cupstestdsc} \ ++ $(PKG_INSTALL_DIR)/usr/bin/{ipptool,lpoptions,lpstat,lppasswd} \ ++ $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/{cupsaccept,cupsaddsmb,cupsfilter} \ ++ $(PKG_INSTALL_DIR)/usr/sbin/{lpadmin,lpinfo,lpmove} \ ++ $(1)/usr/sbin/ ++ (cd $(1)/usr/sbin; ln -sf cupsaccept accept; ln -sf cupsaccept cupsenable; ln -sf cupsaccept cupsdisable; ln -sf cupsaccept reject; ln -sf cupsaccept cupsreject;) ++endef ++ ++define Package/cups-filters/install ++ $(INSTALL_DIR) $(1)/usr/lib/cups/filter ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,rastertoepson,rastertopwg,rastertohp,rastertoescpx,rastertopclx,rastertolabel,texttops} \ ++ $(1)/usr/lib/cups/filter ++ (cd $(1)/usr/lib/cups/filter; ln -sf rastertolabel rastertodymo;) ++endef ++ ++define Package/cups-ppdc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/{ppdc,ppdhtml,ppdi,ppdmerge,ppdpo} \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/libcups/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupscgi/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupscgi.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsdriver/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsdriver.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsimage/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsimage.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsmime/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsmime.so* $(1)/usr/lib/ ++endef ++ ++define Package/libcupsppdc/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcupsppdc.so* $(1)/usr/lib/ ++endef ++ ++define Package/cups-locale-de/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/de $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/de \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-nl/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/nl $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-hu/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/hu $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/hu \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-pt/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pt $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-pt_BR/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pt_BR $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-fi/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/fi $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-sv/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/sv $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-da/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/da $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-ko/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ko $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-zh/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/zh $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-ja/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ja $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/ja \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-es/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/es $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/es \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-zh_TW/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/zh_TW $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-pl/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/pl $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/pl \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-no/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/no $(1)/usr/share/locale/ ++endef ++ ++define Package/cups-locale-ru/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/ru $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/ru \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-eu/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/eu $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/eu \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-fr/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/fr $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/fr \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-it/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/it $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/it \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Package/cups-locale-id/install ++ $(INSTALL_DIR) $(1)/usr/share/locale ++ $(INSTALL_DIR) $(1)/usr/share/cups/templates ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/locale/id $(1)/usr/share/locale/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/id \ ++ $(1)/usr/share/cups/templates/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(2)/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(2)/bin/ ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,cups)) ++$(eval $(call BuildPackage,libcups)) ++$(eval $(call BuildPackage,libcupscgi)) ++$(eval $(call BuildPackage,libcupsdriver)) ++$(eval $(call BuildPackage,libcupsimage)) ++$(eval $(call BuildPackage,libcupsmime)) ++$(eval $(call BuildPackage,libcupsppdc)) ++$(eval $(call BuildPackage,cups-bsd)) ++$(eval $(call BuildPackage,cups-client)) ++$(eval $(call BuildPackage,cups-filters)) ++$(eval $(call BuildPackage,cups-ppdc)) ++$(eval $(call BuildPackage,cups-locale-de)) ++$(eval $(call BuildPackage,cups-locale-nl)) ++$(eval $(call BuildPackage,cups-locale-hu)) ++$(eval $(call BuildPackage,cups-locale-pt)) ++$(eval $(call BuildPackage,cups-locale-pt_BR)) ++$(eval $(call BuildPackage,cups-locale-fi)) ++$(eval $(call BuildPackage,cups-locale-sv)) ++$(eval $(call BuildPackage,cups-locale-da)) ++$(eval $(call BuildPackage,cups-locale-ko)) ++$(eval $(call BuildPackage,cups-locale-zh)) ++$(eval $(call BuildPackage,cups-locale-ja)) ++$(eval $(call BuildPackage,cups-locale-es)) ++$(eval $(call BuildPackage,cups-locale-zh_TW)) ++$(eval $(call BuildPackage,cups-locale-pl)) ++$(eval $(call BuildPackage,cups-locale-no)) ++$(eval $(call BuildPackage,cups-locale-ru)) ++$(eval $(call BuildPackage,cups-locale-eu)) ++$(eval $(call BuildPackage,cups-locale-fr)) ++$(eval $(call BuildPackage,cups-locale-it)) ++$(eval $(call BuildPackage,cups-locale-id)) +diff --git a/feeds/packages/net/cups/files/.svn/entries b/feeds/packages/net/cups/files/.svn/entries +new file mode 100644 +index 0000000..a286ffd +--- /dev/null ++++ b/feeds/packages/net/cups/files/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cups/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:37:58.761995Z ++28910 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++cupsd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++005ae441672d460bdb7d297aec55467f ++2011-11-09T23:37:58.761995Z ++28910 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++305 ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/cups/files/.svn/prop-base/cupsd.init.svn-base b/feeds/packages/net/cups/files/.svn/prop-base/cupsd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/files/.svn/prop-base/cupsd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/files/.svn/text-base/cupsd.init.svn-base b/feeds/packages/net/cups/files/.svn/text-base/cupsd.init.svn-base +new file mode 100644 +index 0000000..e5f00da +--- /dev/null ++++ b/feeds/packages/net/cups/files/.svn/text-base/cupsd.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ mkdir -m 0755 -p /var/cache/cups ++ mkdir -m 0755 -p /var/cups ++ mkdir -m 0755 -p /var/spool/cups/tmp ++ service_start /usr/sbin/cupsd ++} ++ ++stop() { ++ service_stop /usr/sbin/cupsd ++} ++ ++reload() { ++ service_reload /usr/sbin/cupsd ++} +diff --git a/feeds/packages/net/cups/files/cupsd.init b/feeds/packages/net/cups/files/cupsd.init +new file mode 100644 +index 0000000..e5f00da +--- /dev/null ++++ b/feeds/packages/net/cups/files/cupsd.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=50 ++ ++start() { ++ mkdir -m 0755 -p /var/cache/cups ++ mkdir -m 0755 -p /var/cups ++ mkdir -m 0755 -p /var/spool/cups/tmp ++ service_start /usr/sbin/cupsd ++} ++ ++stop() { ++ service_stop /usr/sbin/cupsd ++} ++ ++reload() { ++ service_reload /usr/sbin/cupsd ++} +diff --git a/feeds/packages/net/cups/files/etc/.svn/entries b/feeds/packages/net/cups/files/etc/.svn/entries +new file mode 100644 +index 0000000..18e1a7d +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cups/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-18T12:37:48.563725Z ++20981 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++cups ++dir ++ +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/entries b/feeds/packages/net/cups/files/etc/cups/.svn/entries +new file mode 100644 +index 0000000..6699c46 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cups/files/etc/cups ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-18T12:37:48.563725Z ++20981 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++classes.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++60ce6622125a1e97d43b6dd65cb44a45 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++511 ++ ++client.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++37e0a97280029b0b35c912a49f5a38a1 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++529 ++ ++cupsd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++2f48b8da7daddec3593ae1c76fe7b73d ++2010-04-18T12:37:48.563725Z ++20981 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1290 ++ ++printers.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++97c13b61afd0d8b6c094b9dc73b7a73f ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++341 ++ +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/classes.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/classes.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/classes.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/client.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/client.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/client.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/cupsd.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/cupsd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/cupsd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/printers.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/printers.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/prop-base/printers.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/text-base/classes.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/classes.conf.svn-base +new file mode 100644 +index 0000000..15afda7 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/classes.conf.svn-base +@@ -0,0 +1,7 @@ ++######################################################################## ++# # ++# This is a sample class configuration file. This file is included # ++# from the main configuration file (cups.conf) and lists all of the # ++# printer classes known to the system. # ++# # ++######################################################################## +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/text-base/client.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/client.conf.svn-base +new file mode 100644 +index 0000000..c8d9f91 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/client.conf.svn-base +@@ -0,0 +1,9 @@ ++######################################################################## ++# # ++# This is the CUPS client configuration file. This file is used to # ++# define client-specific parameters, such as the default server or # ++# default encryption settings. # ++# # ++######################################################################## ++ ++Encryption Never +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/text-base/cupsd.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/cupsd.conf.svn-base +new file mode 100644 +index 0000000..79ad944 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/cupsd.conf.svn-base +@@ -0,0 +1,47 @@ ++######################################################################## ++# # ++# This is the CUPS configuration file. If you are familiar with # ++# Apache or any of the other popular web servers, we've followed the # ++# same format. Any configuration variable used here has the same # ++# semantics as the corresponding variable in Apache. If we need # ++# different functionality then a different name is used to avoid # ++# confusion... # ++# # ++######################################################################## ++ ++ ++AccessLog syslog ++ErrorLog syslog ++LogLevel info ++PageLog syslog ++PreserveJobHistory No ++PreserveJobFiles No ++AutoPurgeJobs Yes ++MaxJobs 25 ++MaxPrinterHistory 10 ++#Printcap /etc/printcap ++#PrintcapFormat BSD ++RequestRoot /var/cups ++#RemoteRoot remroot ++User nobody ++Group nogroup ++RIPCache 512k ++TempDir /var/cups ++Port 631 ++HostNameLookups Off ++KeepAlive On ++Browsing On ++BrowseProtocols cups ++ ++ ++Order Deny,Allow ++Allow From 127.0.0.1 ++Allow From 192.168.1.0/24 ++ ++ ++ ++AuthType Basic ++AuthClass System ++Order Allow,Deny ++Allow From All ++ +diff --git a/feeds/packages/net/cups/files/etc/cups/.svn/text-base/printers.conf.svn-base b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/printers.conf.svn-base +new file mode 100644 +index 0000000..88bba1b +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/.svn/text-base/printers.conf.svn-base +@@ -0,0 +1,23 @@ ++ ++Info USB Printer ++Location ++DeviceURI usb:/dev/usb/lp0 ++State Idle ++Accepting Yes ++JobSheets none none ++QuotaPeriod 0 ++PageLimit 0 ++KLimit 0 ++ ++ ++ ++Info Parallel Port Printer ++Location ++DeviceURI parallel:/dev/printers/0 ++State Idle ++Accepting Yes ++JobSheets none none ++QuotaPeriod 0 ++PageLimit 0 ++KLimit 0 ++ +diff --git a/feeds/packages/net/cups/files/etc/cups/classes.conf b/feeds/packages/net/cups/files/etc/cups/classes.conf +new file mode 100644 +index 0000000..15afda7 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/classes.conf +@@ -0,0 +1,7 @@ ++######################################################################## ++# # ++# This is a sample class configuration file. This file is included # ++# from the main configuration file (cups.conf) and lists all of the # ++# printer classes known to the system. # ++# # ++######################################################################## +diff --git a/feeds/packages/net/cups/files/etc/cups/client.conf b/feeds/packages/net/cups/files/etc/cups/client.conf +new file mode 100644 +index 0000000..c8d9f91 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/client.conf +@@ -0,0 +1,9 @@ ++######################################################################## ++# # ++# This is the CUPS client configuration file. This file is used to # ++# define client-specific parameters, such as the default server or # ++# default encryption settings. # ++# # ++######################################################################## ++ ++Encryption Never +diff --git a/feeds/packages/net/cups/files/etc/cups/cupsd.conf b/feeds/packages/net/cups/files/etc/cups/cupsd.conf +new file mode 100644 +index 0000000..79ad944 +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/cupsd.conf +@@ -0,0 +1,47 @@ ++######################################################################## ++# # ++# This is the CUPS configuration file. If you are familiar with # ++# Apache or any of the other popular web servers, we've followed the # ++# same format. Any configuration variable used here has the same # ++# semantics as the corresponding variable in Apache. If we need # ++# different functionality then a different name is used to avoid # ++# confusion... # ++# # ++######################################################################## ++ ++ ++AccessLog syslog ++ErrorLog syslog ++LogLevel info ++PageLog syslog ++PreserveJobHistory No ++PreserveJobFiles No ++AutoPurgeJobs Yes ++MaxJobs 25 ++MaxPrinterHistory 10 ++#Printcap /etc/printcap ++#PrintcapFormat BSD ++RequestRoot /var/cups ++#RemoteRoot remroot ++User nobody ++Group nogroup ++RIPCache 512k ++TempDir /var/cups ++Port 631 ++HostNameLookups Off ++KeepAlive On ++Browsing On ++BrowseProtocols cups ++ ++ ++Order Deny,Allow ++Allow From 127.0.0.1 ++Allow From 192.168.1.0/24 ++ ++ ++ ++AuthType Basic ++AuthClass System ++Order Allow,Deny ++Allow From All ++ +diff --git a/feeds/packages/net/cups/files/etc/cups/printers.conf b/feeds/packages/net/cups/files/etc/cups/printers.conf +new file mode 100644 +index 0000000..88bba1b +--- /dev/null ++++ b/feeds/packages/net/cups/files/etc/cups/printers.conf +@@ -0,0 +1,23 @@ ++ ++Info USB Printer ++Location ++DeviceURI usb:/dev/usb/lp0 ++State Idle ++Accepting Yes ++JobSheets none none ++QuotaPeriod 0 ++PageLimit 0 ++KLimit 0 ++ ++ ++ ++Info Parallel Port Printer ++Location ++DeviceURI parallel:/dev/printers/0 ++State Idle ++Accepting Yes ++JobSheets none none ++QuotaPeriod 0 ++PageLimit 0 ++KLimit 0 ++ +diff --git a/feeds/packages/net/cups/patches/.svn/entries b/feeds/packages/net/cups/patches/.svn/entries +new file mode 100644 +index 0000000..677fe52 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/entries +@@ -0,0 +1,266 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cups/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-29T18:00:01.439051Z ++34931 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-makefile-targets.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2012-12-29T17:59:58.278702Z ++34929 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ ++100-components.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++0bb7cde3988c8b700dd4cc6f284962d3 ++2012-12-29T17:59:58.278702Z ++34929 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1715 ++ ++200-str4181.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8ec24e44413e07a1d0779a84fa9a5a74 ++2012-12-29T18:00:00.165967Z ++34930 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++564 ++ ++140-uname.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++686adadedccf5c66c4a133f999b2f5d3 ++2012-06-28T14:47:02.898703Z ++32519 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++234 ++ ++160-ppdc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++f590da059f2bfe5cbebe2e1a6444ca50 ++2012-12-29T17:59:58.278702Z ++34929 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++543 ++ ++210-str4194.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++e19da31623d2a143a33319300829460e ++2012-12-29T18:00:01.439051Z ++34931 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++294 ++ ++150-64bit_host_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8c50e872d04ba735a35863224b198b88 ++2012-06-28T14:47:02.898703Z ++32519 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1691 ++ +diff --git a/feeds/packages/net/cups/patches/.svn/prop-base/100-makefile-targets.patch.svn-base b/feeds/packages/net/cups/patches/.svn/prop-base/100-makefile-targets.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/prop-base/100-makefile-targets.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/patches/.svn/prop-base/140-uname.patch.svn-base b/feeds/packages/net/cups/patches/.svn/prop-base/140-uname.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/prop-base/140-uname.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/100-components.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/100-components.patch.svn-base +new file mode 100644 +index 0000000..c4d6350 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/text-base/100-components.patch.svn-base +@@ -0,0 +1,42 @@ ++--- cups-1.5.4/configure 2012-10-09 09:22:45.000000000 +0200 +++++ cups-1.5.4/configure 2012-10-09 09:24:30.000000000 +0200 ++@@ -1619,6 +1619,7 @@ ++ --with-operkey set the default operator @AUTHKEY value ++ --with-components set components to build: ++ - "all" (default) builds everything +++ - "embedded" builds everything except man and notifier ++ - "core" builds libcups and ipptool ++ --with-privateinclude set path for private include files, default=none ++ --with-rcdir set path for rc scripts ++@@ -5861,6 +5862,10 @@ ++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ++ ;; ++ +++ embedded) +++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor ppdc scheduler systemv conf data locale doc examples templates" +++ ;; +++ ++ core) ++ BUILDDIRS="data locale" ++ ;; ++--- cups-1.5.4/config-scripts/cups-common.m4.orig 2012-10-09 09:17:08.000000000 +0200 +++++ cups-1.5.4/config-scripts/cups-common.m4 2012-10-09 09:24:42.000000000 +0200 ++@@ -414,6 +414,7 @@ ++ ++ AC_ARG_WITH(components, [ --with-components set components to build: ++ - "all" (default) builds everything +++ - "embedded" builds everything except locale, man and notifier ++ - "core" builds libcups and ipptool], ++ COMPONENTS="$withval") ++ ++@@ -422,6 +423,10 @@ ++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ++ ;; ++ +++ embedded) +++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor ppdc scheduler systemv conf data locale doc examples templates" +++ ;; +++ ++ core) ++ BUILDDIRS="data locale" ++ ;; +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/100-makefile-targets.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/100-makefile-targets.patch.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/140-uname.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/140-uname.patch.svn-base +new file mode 100644 +index 0000000..3261de6 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/text-base/140-uname.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++-uname=`uname` +++uname=${UNAME:-`uname`} ++ uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` ++ uarch=`uname -m` ++ +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/150-64bit_host_fix.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/150-64bit_host_fix.patch.svn-base +new file mode 100644 +index 0000000..5cfdba5 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/text-base/150-64bit_host_fix.patch.svn-base +@@ -0,0 +1,64 @@ ++--- a/cups-config.in +++++ b/cups-config.in ++@@ -54,7 +54,7 @@ else ++ CFLAGS="$CFLAGS -I$includedir" ++ fi ++ ++- if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then +++ if test $libdir != /usr/lib -a $libdir != /usr/lib -a $libdir != /usr/lib; then ++ LDFLAGS="$LDFLAGS -L$libdir" ++ fi ++ fi ++--- a/config-scripts/cups-3264.m4 +++++ b/config-scripts/cups-3264.m4 ++@@ -108,7 +108,7 @@ case "$uname" in ++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2" ++ LIB64DIR="$exec_prefix/lib" ++ if test -d /usr/lib64; then ++- LIB64DIR="${LIB64DIR}64" +++ LIB64DIR="${LIB64DIR}" ++ fi ++ UNINSTALL64="uninstall64bit" ++ fi ++--- a/config-scripts/cups-directories.m4 +++++ b/config-scripts/cups-directories.m4 ++@@ -107,7 +107,7 @@ if test "$libdir" = "\${exec_prefix}/lib ++ ;; ++ Linux*) ++ if test -d /usr/lib64; then ++- libdir="$exec_prefix/lib64" +++ libdir="$exec_prefix/lib" ++ fi ++ ;; ++ HP-UX*) ++--- a/configure +++++ b/configure ++@@ -10003,7 +10003,7 @@ if test "$libdir" = "\${exec_prefix}/lib ++ ;; ++ Linux*) ++ if test -d /usr/lib64; then ++- libdir="$exec_prefix/lib64" +++ libdir="$exec_prefix/lib" ++ fi ++ ;; ++ HP-UX*) ++@@ -10626,9 +10626,6 @@ case "$uname" in ++ LIB32CUPS="32bit/libcups.so.2" ++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2" ++ LIB32DIR="$exec_prefix/lib" ++- if test -d /usr/lib32; then ++- LIB32DIR="${LIB32DIR}32" ++- fi ++ UNINSTALL32="uninstall32bit" ++ fi ++ ++@@ -10638,9 +10635,6 @@ case "$uname" in ++ LIB64CUPS="64bit/libcups.so.2" ++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2" ++ LIB64DIR="$exec_prefix/lib" ++- if test -d /usr/lib64; then ++- LIB64DIR="${LIB64DIR}64" ++- fi ++ UNINSTALL64="uninstall64bit" ++ fi ++ ;; +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/160-ppdc.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/160-ppdc.patch.svn-base +new file mode 100644 +index 0000000..499ed28 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/text-base/160-ppdc.patch.svn-base +@@ -0,0 +1,16 @@ ++--- cups-1.5.4/ppdc/Makefile 2012-10-09 09:36:00.000000000 +0200 +++++ cups-1.5.4/ppdc/Makefile 2012-10-09 09:36:34.000000000 +0200 ++@@ -239,12 +239,7 @@ ++ ++ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ ++ sample.drv ../data/media.defs ++- echo Linking $@... ++- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ ++- libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ ++- $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) ++- echo Generating localization strings... ++- ./genstrings >sample.c +++ echo Not Linking $@... ++ ++ ++ # +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/200-str4181.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/200-str4181.patch.svn-base +new file mode 100644 +index 0000000..c8e73f7 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/text-base/200-str4181.patch.svn-base +@@ -0,0 +1,13 @@ ++--- cups-1.5.4/backend/ipp.c (revision 10596) +++++ cups-1.5.4/backend/ipp.c (working copy) ++@@ -1578,6 +1578,10 @@ ++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, ++ "document-format", NULL, document_format); ++ +++ if (compression) +++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, +++ "compression", NULL, compression); +++ ++ fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1); ++ http_status = cupsSendRequest(http, request, resource, 0); ++ if (http_status == HTTP_CONTINUE && request->state == IPP_DATA) +diff --git a/feeds/packages/net/cups/patches/.svn/text-base/210-str4194.patch.svn-base b/feeds/packages/net/cups/patches/.svn/text-base/210-str4194.patch.svn-base +new file mode 100644 +index 0000000..6784213 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/.svn/text-base/210-str4194.patch.svn-base +@@ -0,0 +1,11 @@ ++--- cups-1.5.4/backend/ipp.c (revision 10619) +++++ cups-1.5.4/backend/ipp.c (working copy) ++@@ -952,6 +952,8 @@ ++ _cupsLangPrintFilter(stderr, "ERROR", ++ _("Unable to get printer status.")); ++ sleep(10); +++ +++ httpReconnect(http); ++ } ++ ++ ippDelete(supported); +diff --git a/feeds/packages/net/cups/patches/100-components.patch b/feeds/packages/net/cups/patches/100-components.patch +new file mode 100644 +index 0000000..c4d6350 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/100-components.patch +@@ -0,0 +1,42 @@ ++--- cups-1.5.4/configure 2012-10-09 09:22:45.000000000 +0200 +++++ cups-1.5.4/configure 2012-10-09 09:24:30.000000000 +0200 ++@@ -1619,6 +1619,7 @@ ++ --with-operkey set the default operator @AUTHKEY value ++ --with-components set components to build: ++ - "all" (default) builds everything +++ - "embedded" builds everything except man and notifier ++ - "core" builds libcups and ipptool ++ --with-privateinclude set path for private include files, default=none ++ --with-rcdir set path for rc scripts ++@@ -5861,6 +5862,10 @@ ++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ++ ;; ++ +++ embedded) +++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor ppdc scheduler systemv conf data locale doc examples templates" +++ ;; +++ ++ core) ++ BUILDDIRS="data locale" ++ ;; ++--- cups-1.5.4/config-scripts/cups-common.m4.orig 2012-10-09 09:17:08.000000000 +0200 +++++ cups-1.5.4/config-scripts/cups-common.m4 2012-10-09 09:24:42.000000000 +0200 ++@@ -414,6 +414,7 @@ ++ ++ AC_ARG_WITH(components, [ --with-components set components to build: ++ - "all" (default) builds everything +++ - "embedded" builds everything except locale, man and notifier ++ - "core" builds libcups and ipptool], ++ COMPONENTS="$withval") ++ ++@@ -422,6 +423,10 @@ ++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ++ ;; ++ +++ embedded) +++ BUILDDIRS="filter backend berkeley cgi-bin driver monitor ppdc scheduler systemv conf data locale doc examples templates" +++ ;; +++ ++ core) ++ BUILDDIRS="data locale" ++ ;; +diff --git a/feeds/packages/net/cups/patches/100-makefile-targets.patch b/feeds/packages/net/cups/patches/100-makefile-targets.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/net/cups/patches/140-uname.patch b/feeds/packages/net/cups/patches/140-uname.patch +new file mode 100644 +index 0000000..3261de6 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/140-uname.patch +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++-uname=`uname` +++uname=${UNAME:-`uname`} ++ uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` ++ uarch=`uname -m` ++ +diff --git a/feeds/packages/net/cups/patches/150-64bit_host_fix.patch b/feeds/packages/net/cups/patches/150-64bit_host_fix.patch +new file mode 100644 +index 0000000..5cfdba5 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/150-64bit_host_fix.patch +@@ -0,0 +1,64 @@ ++--- a/cups-config.in +++++ b/cups-config.in ++@@ -54,7 +54,7 @@ else ++ CFLAGS="$CFLAGS -I$includedir" ++ fi ++ ++- if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then +++ if test $libdir != /usr/lib -a $libdir != /usr/lib -a $libdir != /usr/lib; then ++ LDFLAGS="$LDFLAGS -L$libdir" ++ fi ++ fi ++--- a/config-scripts/cups-3264.m4 +++++ b/config-scripts/cups-3264.m4 ++@@ -108,7 +108,7 @@ case "$uname" in ++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2" ++ LIB64DIR="$exec_prefix/lib" ++ if test -d /usr/lib64; then ++- LIB64DIR="${LIB64DIR}64" +++ LIB64DIR="${LIB64DIR}" ++ fi ++ UNINSTALL64="uninstall64bit" ++ fi ++--- a/config-scripts/cups-directories.m4 +++++ b/config-scripts/cups-directories.m4 ++@@ -107,7 +107,7 @@ if test "$libdir" = "\${exec_prefix}/lib ++ ;; ++ Linux*) ++ if test -d /usr/lib64; then ++- libdir="$exec_prefix/lib64" +++ libdir="$exec_prefix/lib" ++ fi ++ ;; ++ HP-UX*) ++--- a/configure +++++ b/configure ++@@ -10003,7 +10003,7 @@ if test "$libdir" = "\${exec_prefix}/lib ++ ;; ++ Linux*) ++ if test -d /usr/lib64; then ++- libdir="$exec_prefix/lib64" +++ libdir="$exec_prefix/lib" ++ fi ++ ;; ++ HP-UX*) ++@@ -10626,9 +10626,6 @@ case "$uname" in ++ LIB32CUPS="32bit/libcups.so.2" ++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2" ++ LIB32DIR="$exec_prefix/lib" ++- if test -d /usr/lib32; then ++- LIB32DIR="${LIB32DIR}32" ++- fi ++ UNINSTALL32="uninstall32bit" ++ fi ++ ++@@ -10638,9 +10635,6 @@ case "$uname" in ++ LIB64CUPS="64bit/libcups.so.2" ++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2" ++ LIB64DIR="$exec_prefix/lib" ++- if test -d /usr/lib64; then ++- LIB64DIR="${LIB64DIR}64" ++- fi ++ UNINSTALL64="uninstall64bit" ++ fi ++ ;; +diff --git a/feeds/packages/net/cups/patches/160-ppdc.patch b/feeds/packages/net/cups/patches/160-ppdc.patch +new file mode 100644 +index 0000000..499ed28 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/160-ppdc.patch +@@ -0,0 +1,16 @@ ++--- cups-1.5.4/ppdc/Makefile 2012-10-09 09:36:00.000000000 +0200 +++++ cups-1.5.4/ppdc/Makefile 2012-10-09 09:36:34.000000000 +0200 ++@@ -239,12 +239,7 @@ ++ ++ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ ++ sample.drv ../data/media.defs ++- echo Linking $@... ++- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ ++- libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ ++- $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) ++- echo Generating localization strings... ++- ./genstrings >sample.c +++ echo Not Linking $@... ++ ++ ++ # +diff --git a/feeds/packages/net/cups/patches/200-str4181.patch b/feeds/packages/net/cups/patches/200-str4181.patch +new file mode 100644 +index 0000000..c8e73f7 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/200-str4181.patch +@@ -0,0 +1,13 @@ ++--- cups-1.5.4/backend/ipp.c (revision 10596) +++++ cups-1.5.4/backend/ipp.c (working copy) ++@@ -1578,6 +1578,10 @@ ++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, ++ "document-format", NULL, document_format); ++ +++ if (compression) +++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, +++ "compression", NULL, compression); +++ ++ fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1); ++ http_status = cupsSendRequest(http, request, resource, 0); ++ if (http_status == HTTP_CONTINUE && request->state == IPP_DATA) +diff --git a/feeds/packages/net/cups/patches/210-str4194.patch b/feeds/packages/net/cups/patches/210-str4194.patch +new file mode 100644 +index 0000000..6784213 +--- /dev/null ++++ b/feeds/packages/net/cups/patches/210-str4194.patch +@@ -0,0 +1,11 @@ ++--- cups-1.5.4/backend/ipp.c (revision 10619) +++++ cups-1.5.4/backend/ipp.c (working copy) ++@@ -952,6 +952,8 @@ ++ _cupsLangPrintFilter(stderr, "ERROR", ++ _("Unable to get printer status.")); ++ sleep(10); +++ +++ httpReconnect(http); ++ } ++ ++ ippDelete(supported); +diff --git a/feeds/packages/net/curlftpfs/.svn/entries b/feeds/packages/net/curlftpfs/.svn/entries +new file mode 100644 +index 0000000..4d50c24 +--- /dev/null ++++ b/feeds/packages/net/curlftpfs/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/curlftpfs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-25T18:58:46.253490Z ++32867 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++ab5497f142315e0d9c30140043c8af2c ++2012-07-25T18:58:46.253490Z ++32867 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1096 ++ +diff --git a/feeds/packages/net/curlftpfs/.svn/text-base/Makefile.svn-base b/feeds/packages/net/curlftpfs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cdeaa6a +--- /dev/null ++++ b/feeds/packages/net/curlftpfs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=curlftpfs ++PKG_VERSION:=0.9.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/curlftpfs ++PKG_MD5SUM:=b452123f755114cd4461d56c648d9f12 ++ ++PKG_BUILD_DEPENDS:=libiconv ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/curlftpfs ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Filesystem ++ DEPENDS:=+libcurl +libfuse +glib2 ++ TITLE:=CurlFtpFS ++ URL:=http://curlftpfs.sourceforge.net/ ++endef ++ ++define Package/curlftpfs/description ++ CurlFtpFS is a filesystem for accessing FTP hosts ++ based on FUSE and libcurl. ++endef ++ ++EXTRA_CFLAGS += \ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(STAGING_DIR)/usr/include/fuse \ ++ -DICONV_CONST=const ++ ++EXTRA_LDFLAGS += \ ++ -L$(INTL_PREFIX)/lib \ ++ -L$(ICONV_PREFIX)/lib \ ++ -lpthread ++ ++define Package/curlftpfs/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/curlftpfs $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,curlftpfs)) ++ +diff --git a/feeds/packages/net/curlftpfs/Makefile b/feeds/packages/net/curlftpfs/Makefile +new file mode 100644 +index 0000000..cdeaa6a +--- /dev/null ++++ b/feeds/packages/net/curlftpfs/Makefile +@@ -0,0 +1,50 @@ ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=curlftpfs ++PKG_VERSION:=0.9.2 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/curlftpfs ++PKG_MD5SUM:=b452123f755114cd4461d56c648d9f12 ++ ++PKG_BUILD_DEPENDS:=libiconv ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/curlftpfs ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Filesystem ++ DEPENDS:=+libcurl +libfuse +glib2 ++ TITLE:=CurlFtpFS ++ URL:=http://curlftpfs.sourceforge.net/ ++endef ++ ++define Package/curlftpfs/description ++ CurlFtpFS is a filesystem for accessing FTP hosts ++ based on FUSE and libcurl. ++endef ++ ++EXTRA_CFLAGS += \ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(STAGING_DIR)/usr/include/fuse \ ++ -DICONV_CONST=const ++ ++EXTRA_LDFLAGS += \ ++ -L$(INTL_PREFIX)/lib \ ++ -L$(ICONV_PREFIX)/lib \ ++ -lpthread ++ ++define Package/curlftpfs/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/curlftpfs $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,curlftpfs)) ++ +diff --git a/feeds/packages/net/curlftpfs/patches/.svn/entries b/feeds/packages/net/curlftpfs/patches/.svn/entries +new file mode 100644 +index 0000000..307cf17 +--- /dev/null ++++ b/feeds/packages/net/curlftpfs/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/curlftpfs/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-01-02T16:02:08.072341Z ++19006 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-uclibc_mod.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0c5c3bab3ab8c1cff577bfa6ecc66020 ++2010-01-02T16:02:08.072341Z ++19006 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1133 ++ +diff --git a/feeds/packages/net/curlftpfs/patches/.svn/text-base/001-uclibc_mod.patch.svn-base b/feeds/packages/net/curlftpfs/patches/.svn/text-base/001-uclibc_mod.patch.svn-base +new file mode 100644 +index 0000000..8eb1556 +--- /dev/null ++++ b/feeds/packages/net/curlftpfs/patches/.svn/text-base/001-uclibc_mod.patch.svn-base +@@ -0,0 +1,37 @@ ++diff -cr curlftpfs-0.9.2/ftpfs-ls.c curlftpfs-0.9.2-1/ftpfs-ls.c ++*** curlftpfs-0.9.2/ftpfs-ls.c 2008-04-23 12:55:41.000000000 +0200 ++--- curlftpfs-0.9.2-1/ftpfs-ls.c 2009-09-24 23:19:03.000000000 +0200 ++*************** ++*** 58,64 **** ++ "%5s" "%*c" ++ "%1023c", ++ mode, &nlink, user, group, &size, month, day, year, file); ++! if (res < 9) { ++ res = sscanf(line, ++ "%11s" ++ "%32s" SPACES ++--- 58,64 ---- ++ "%5s" "%*c" ++ "%1023c", ++ mode, &nlink, user, group, &size, month, day, year, file); ++! if (res < 8) { ++ res = sscanf(line, ++ "%11s" ++ "%32s" SPACES ++*************** ++*** 69,75 **** ++ "%5s" "%*c" ++ "%1023c", ++ mode, user, group, &size, month, day, year, file); ++! if (res < 8) { ++ return 0; ++ } ++ } ++--- 69,75 ---- ++ "%5s" "%*c" ++ "%1023c", ++ mode, user, group, &size, month, day, year, file); ++! if (res < 7) { ++ return 0; ++ } ++ } +diff --git a/feeds/packages/net/curlftpfs/patches/001-uclibc_mod.patch b/feeds/packages/net/curlftpfs/patches/001-uclibc_mod.patch +new file mode 100644 +index 0000000..8eb1556 +--- /dev/null ++++ b/feeds/packages/net/curlftpfs/patches/001-uclibc_mod.patch +@@ -0,0 +1,37 @@ ++diff -cr curlftpfs-0.9.2/ftpfs-ls.c curlftpfs-0.9.2-1/ftpfs-ls.c ++*** curlftpfs-0.9.2/ftpfs-ls.c 2008-04-23 12:55:41.000000000 +0200 ++--- curlftpfs-0.9.2-1/ftpfs-ls.c 2009-09-24 23:19:03.000000000 +0200 ++*************** ++*** 58,64 **** ++ "%5s" "%*c" ++ "%1023c", ++ mode, &nlink, user, group, &size, month, day, year, file); ++! if (res < 9) { ++ res = sscanf(line, ++ "%11s" ++ "%32s" SPACES ++--- 58,64 ---- ++ "%5s" "%*c" ++ "%1023c", ++ mode, &nlink, user, group, &size, month, day, year, file); ++! if (res < 8) { ++ res = sscanf(line, ++ "%11s" ++ "%32s" SPACES ++*************** ++*** 69,75 **** ++ "%5s" "%*c" ++ "%1023c", ++ mode, user, group, &size, month, day, year, file); ++! if (res < 8) { ++ return 0; ++ } ++ } ++--- 69,75 ---- ++ "%5s" "%*c" ++ "%1023c", ++ mode, user, group, &size, month, day, year, file); ++! if (res < 7) { ++ return 0; ++ } ++ } +diff --git a/feeds/packages/net/cutter/.svn/entries b/feeds/packages/net/cutter/.svn/entries +new file mode 100644 +index 0000000..46bbc0f +--- /dev/null ++++ b/feeds/packages/net/cutter/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/cutter ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-24T07:02:29.408434Z ++33268 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++ad94a095e21ae8b4843a9cb3229f0caa ++2012-08-24T07:02:29.408434Z ++33268 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1039 ++ +diff --git a/feeds/packages/net/cutter/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/cutter/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/cutter/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/cutter/.svn/text-base/Makefile.svn-base b/feeds/packages/net/cutter/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f9830b4 +--- /dev/null ++++ b/feeds/packages/net/cutter/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=cutter ++PKG_VERSION:=1.03 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.lowth.com/cutter/software/ ++PKG_MD5SUM:=50093db9b64277643969ee75b83ebbd1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cutter ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=allows an user to abort TCP/IP connections ++ URL:=http://www.lowth.com/cutter/ ++ DEPENDS:=@BROKEN ++endef ++ ++define Package/cutter/description ++ Cutter is an open source program that allows Linux firewall ++ administrators to abort TCP/IP connections routed over the ++ firewall or router on which it is run. ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(PKG_BUILD_DIR)/cutter.c -o $(PKG_BUILD_DIR)/cutter ++endef ++ ++define Package/cutter/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cutter $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,cutter)) +diff --git a/feeds/packages/net/cutter/Makefile b/feeds/packages/net/cutter/Makefile +new file mode 100644 +index 0000000..f9830b4 +--- /dev/null ++++ b/feeds/packages/net/cutter/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=cutter ++PKG_VERSION:=1.03 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.lowth.com/cutter/software/ ++PKG_MD5SUM:=50093db9b64277643969ee75b83ebbd1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cutter ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=allows an user to abort TCP/IP connections ++ URL:=http://www.lowth.com/cutter/ ++ DEPENDS:=@BROKEN ++endef ++ ++define Package/cutter/description ++ Cutter is an open source program that allows Linux firewall ++ administrators to abort TCP/IP connections routed over the ++ firewall or router on which it is run. ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(PKG_BUILD_DIR)/cutter.c -o $(PKG_BUILD_DIR)/cutter ++endef ++ ++define Package/cutter/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cutter $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,cutter)) +diff --git a/feeds/packages/net/daemonlogger/.svn/entries b/feeds/packages/net/daemonlogger/.svn/entries +new file mode 100644 +index 0000000..0cb44ec +--- /dev/null ++++ b/feeds/packages/net/daemonlogger/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/daemonlogger ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-21T12:18:55.166380Z ++31836 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++3830ec9042e62bf55f832502b28b5139 ++2012-05-21T12:18:55.166380Z ++31836 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1003 ++ +diff --git a/feeds/packages/net/daemonlogger/.svn/text-base/Makefile.svn-base b/feeds/packages/net/daemonlogger/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3d7a9bf +--- /dev/null ++++ b/feeds/packages/net/daemonlogger/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=daemonlogger ++PKG_VERSION:=1.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=463 ++PKG_SOURCE_URL:=http://www.snort.org/downloads/ ++PKG_CAT:=zcat ++PKG_MD5SUM:=acb64aa6cd5777e297569f100b5c39ee ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/daemonlogger ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libdnet ++ TITLE:=Software Network Tap ++ URL:=http://www.snort.org/snort-downloads/additional-downloads ++endef ++ ++CONFIGURE_VARS += \ ++ BUILD_CC="$(TARGET_CC)" \ ++ HOSTCC="$(HOSTCC)" ++ ++MAKE_FLAGS := CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)" ++ ++define Package/daemonlogger/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daemonlogger $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,daemonlogger)) +diff --git a/feeds/packages/net/daemonlogger/Makefile b/feeds/packages/net/daemonlogger/Makefile +new file mode 100644 +index 0000000..3d7a9bf +--- /dev/null ++++ b/feeds/packages/net/daemonlogger/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=daemonlogger ++PKG_VERSION:=1.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=463 ++PKG_SOURCE_URL:=http://www.snort.org/downloads/ ++PKG_CAT:=zcat ++PKG_MD5SUM:=acb64aa6cd5777e297569f100b5c39ee ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/daemonlogger ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libdnet ++ TITLE:=Software Network Tap ++ URL:=http://www.snort.org/snort-downloads/additional-downloads ++endef ++ ++CONFIGURE_VARS += \ ++ BUILD_CC="$(TARGET_CC)" \ ++ HOSTCC="$(HOSTCC)" ++ ++MAKE_FLAGS := CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)" ++ ++define Package/daemonlogger/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daemonlogger $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,daemonlogger)) +diff --git a/feeds/packages/net/dansguardian/.svn/entries b/feeds/packages/net/dansguardian/.svn/entries +new file mode 100644 +index 0000000..049b54b +--- /dev/null ++++ b/feeds/packages/net/dansguardian/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dansguardian ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-04T17:02:11.858278Z ++32982 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++3fef447c87a383f285bcb27f802d9b22 ++2012-08-04T17:02:11.858278Z ++32982 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1653 ++ +diff --git a/feeds/packages/net/dansguardian/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dansguardian/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bba2d8b +--- /dev/null ++++ b/feeds/packages/net/dansguardian/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2008-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:=dansguardian ++PKG_VERSION:=2.10.1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable ++PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a ++ ++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/dansguardian.conf ++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_DIR) $(1)/usr/share/dansguardian ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/transparent1x1.gif $(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/ ++endef ++ ++$(eval $(call BuildPackage,dansguardian)) +diff --git a/feeds/packages/net/dansguardian/Makefile b/feeds/packages/net/dansguardian/Makefile +new file mode 100644 +index 0000000..bba2d8b +--- /dev/null ++++ b/feeds/packages/net/dansguardian/Makefile +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2008-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:=dansguardian ++PKG_VERSION:=2.10.1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable ++PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a ++ ++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/dansguardian.conf ++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_DIR) $(1)/usr/share/dansguardian ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/transparent1x1.gif $(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/ ++endef ++ ++$(eval $(call BuildPackage,dansguardian)) +diff --git a/feeds/packages/net/dansguardian/patches/.svn/entries b/feeds/packages/net/dansguardian/patches/.svn/entries +new file mode 100644 +index 0000000..143451e +--- /dev/null ++++ b/feeds/packages/net/dansguardian/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dansguardian/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-08-11T04:45:10.261654Z ++17223 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-include_dir.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++9816b13bb808a2462f927d34f71c18b2 ++2009-07-17T11:17:53.385563Z ++16874 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1092 ++ +diff --git a/feeds/packages/net/dansguardian/patches/.svn/text-base/001-include_dir.patch.svn-base b/feeds/packages/net/dansguardian/patches/.svn/text-base/001-include_dir.patch.svn-base +new file mode 100644 +index 0000000..8a619f0 +--- /dev/null ++++ b/feeds/packages/net/dansguardian/patches/.svn/text-base/001-include_dir.patch.svn-base +@@ -0,0 +1,29 @@ ++--- a/configure +++++ b/configure ++@@ -861,7 +861,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}' ++@@ -6317,7 +6317,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 ++@@ -10042,7 +10042,7 @@ _ACEOF ++ 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/feeds/packages/net/dansguardian/patches/001-include_dir.patch b/feeds/packages/net/dansguardian/patches/001-include_dir.patch +new file mode 100644 +index 0000000..8a619f0 +--- /dev/null ++++ b/feeds/packages/net/dansguardian/patches/001-include_dir.patch +@@ -0,0 +1,29 @@ ++--- a/configure +++++ b/configure ++@@ -861,7 +861,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}' ++@@ -6317,7 +6317,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 ++@@ -10042,7 +10042,7 @@ _ACEOF ++ 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/feeds/packages/net/darkstat/.svn/entries b/feeds/packages/net/darkstat/.svn/entries +new file mode 100644 +index 0000000..a715b30 +--- /dev/null ++++ b/feeds/packages/net/darkstat/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/darkstat ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-29T01:15:35.695925Z ++31969 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++4e9728529cd5cb2a9be0daa789a914e5 ++2012-05-29T01:15:35.695925Z ++31969 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1466 ++ +diff --git a/feeds/packages/net/darkstat/.svn/text-base/Makefile.svn-base b/feeds/packages/net/darkstat/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f0013c9 +--- /dev/null ++++ b/feeds/packages/net/darkstat/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2007-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:=darkstat ++PKG_VERSION:=3.0.715 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://unix4lyfe.org/darkstat ++PKG_MD5SUM:=5b7abc7538dcd8e30667dac150e81d77 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/darkstat ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +zlib ++ TITLE:=Network bandwidth monitor ++ URL:=http://unix4lyfe.org/darkstat/ ++endef ++ ++define Package/darkstat/description ++darkstat is a packet sniffer that runs as a background process on a cable/DSL ++router, gathers all sorts of statistics about network usage, and serves them ++over HTTP. ++endef ++ ++define Package/darkstat/conffiles ++/etc/config/darkstat ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-debug \ ++ --with-chroot-dir=/var/empty ++ ++TARGET_CFLAGS += -std=gnu99 ++ ++define Build/Compile ++ $(HOSTCC) $(PKG_BUILD_DIR)/static/c-ify.c \ ++ -o $(PKG_BUILD_DIR)/c-ify ++ $(call Build/Compile/Default) ++endef ++ ++define Package/darkstat/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/darkstat $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/darkstat.init $(1)/etc/init.d/darkstat ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/darkstat.config $(1)/etc/config/darkstat ++endef ++ ++$(eval $(call BuildPackage,darkstat)) +diff --git a/feeds/packages/net/darkstat/Makefile b/feeds/packages/net/darkstat/Makefile +new file mode 100644 +index 0000000..f0013c9 +--- /dev/null ++++ b/feeds/packages/net/darkstat/Makefile +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2007-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:=darkstat ++PKG_VERSION:=3.0.715 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://unix4lyfe.org/darkstat ++PKG_MD5SUM:=5b7abc7538dcd8e30667dac150e81d77 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/darkstat ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +zlib ++ TITLE:=Network bandwidth monitor ++ URL:=http://unix4lyfe.org/darkstat/ ++endef ++ ++define Package/darkstat/description ++darkstat is a packet sniffer that runs as a background process on a cable/DSL ++router, gathers all sorts of statistics about network usage, and serves them ++over HTTP. ++endef ++ ++define Package/darkstat/conffiles ++/etc/config/darkstat ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-debug \ ++ --with-chroot-dir=/var/empty ++ ++TARGET_CFLAGS += -std=gnu99 ++ ++define Build/Compile ++ $(HOSTCC) $(PKG_BUILD_DIR)/static/c-ify.c \ ++ -o $(PKG_BUILD_DIR)/c-ify ++ $(call Build/Compile/Default) ++endef ++ ++define Package/darkstat/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/darkstat $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/darkstat.init $(1)/etc/init.d/darkstat ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/darkstat.config $(1)/etc/config/darkstat ++endef ++ ++$(eval $(call BuildPackage,darkstat)) +diff --git a/feeds/packages/net/darkstat/files/.svn/entries b/feeds/packages/net/darkstat/files/.svn/entries +new file mode 100644 +index 0000000..36af0cc +--- /dev/null ++++ b/feeds/packages/net/darkstat/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/darkstat/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-29T01:15:35.695925Z ++31969 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++darkstat.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++f67c3f9168bb5fe87debfcc62a644da1 ++2012-05-29T01:15:35.695925Z ++31969 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++651 ++ ++darkstat.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++00889aea525ffc725035569f2aa2cbee ++2011-11-17T11:48:55.705600Z ++29224 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++94 ++ +diff --git a/feeds/packages/net/darkstat/files/.svn/text-base/darkstat.config.svn-base b/feeds/packages/net/darkstat/files/.svn/text-base/darkstat.config.svn-base +new file mode 100644 +index 0000000..f83760e +--- /dev/null ++++ b/feeds/packages/net/darkstat/files/.svn/text-base/darkstat.config.svn-base +@@ -0,0 +1,4 @@ ++config darkstat ++ option interface 'lan' ++# option httpaddr '0.0.0.0' ++# option httpport '667' +diff --git a/feeds/packages/net/darkstat/files/.svn/text-base/darkstat.init.svn-base b/feeds/packages/net/darkstat/files/.svn/text-base/darkstat.init.svn-base +new file mode 100644 +index 0000000..8499e3e +--- /dev/null ++++ b/feeds/packages/net/darkstat/files/.svn/text-base/darkstat.init.svn-base +@@ -0,0 +1,34 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++ ++START=60 ++RUN_D=/var/empty ++PID_F=$RUN_D/darkstat.pid ++ ++start() { ++ mkdir -p $RUN_D ++ . /lib/functions/network.sh ++ config_load darkstat ++ config_foreach start_darkstat darkstat ++} ++ ++start_darkstat() { ++ local cfg="$1" ++ config_get interface "$cfg" interface ++ config_get httpaddr "$cfg" httpaddr ++ config_get httpport "$cfg" httpport ++ ++ network_get_device ifname "$interface" && { ++ /usr/sbin/darkstat --verbose \ ++ -i "$ifname" \ ++ ${httpaddr:+-b "$httpaddr"} \ ++ ${httpport:+-p "$httpport"} \ ++ --chroot $RUN_D \ ++ --pidfile $PID_F ++ } ++} ++ ++stop() { ++ service_kill darkstat $PID_F ++ rm -f $PID_F ++} +diff --git a/feeds/packages/net/darkstat/files/darkstat.config b/feeds/packages/net/darkstat/files/darkstat.config +new file mode 100644 +index 0000000..f83760e +--- /dev/null ++++ b/feeds/packages/net/darkstat/files/darkstat.config +@@ -0,0 +1,4 @@ ++config darkstat ++ option interface 'lan' ++# option httpaddr '0.0.0.0' ++# option httpport '667' +diff --git a/feeds/packages/net/darkstat/files/darkstat.init b/feeds/packages/net/darkstat/files/darkstat.init +new file mode 100644 +index 0000000..8499e3e +--- /dev/null ++++ b/feeds/packages/net/darkstat/files/darkstat.init +@@ -0,0 +1,34 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++ ++START=60 ++RUN_D=/var/empty ++PID_F=$RUN_D/darkstat.pid ++ ++start() { ++ mkdir -p $RUN_D ++ . /lib/functions/network.sh ++ config_load darkstat ++ config_foreach start_darkstat darkstat ++} ++ ++start_darkstat() { ++ local cfg="$1" ++ config_get interface "$cfg" interface ++ config_get httpaddr "$cfg" httpaddr ++ config_get httpport "$cfg" httpport ++ ++ network_get_device ifname "$interface" && { ++ /usr/sbin/darkstat --verbose \ ++ -i "$ifname" \ ++ ${httpaddr:+-b "$httpaddr"} \ ++ ${httpport:+-p "$httpport"} \ ++ --chroot $RUN_D \ ++ --pidfile $PID_F ++ } ++} ++ ++stop() { ++ service_kill darkstat $PID_F ++ rm -f $PID_F ++} +diff --git a/feeds/packages/net/ddns-scripts/.svn/entries b/feeds/packages/net/ddns-scripts/.svn/entries +new file mode 100644 +index 0000000..97b3f62 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++1131cf276063530f2f2527f891872f22 ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++708 ++ +diff --git a/feeds/packages/net/ddns-scripts/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ddns-scripts/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..651c623 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=ddns-scripts ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=21 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ddns-scripts ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=Dynamic DNS Scripts ++ PKGARCH:=all ++endef ++ ++define Package/ddns-scripts/description ++ A highly configurable set of scripts for doing ++ dynamic dns updates ++endef ++ ++define Build/Prepare ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/ddns-scripts/conffiles ++/etc/config/ddns ++endef ++ ++define Package/ddns-scripts/install ++ $(INSTALL_DIR) $(1) ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,ddns-scripts)) +diff --git a/feeds/packages/net/ddns-scripts/Makefile b/feeds/packages/net/ddns-scripts/Makefile +new file mode 100644 +index 0000000..651c623 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/Makefile +@@ -0,0 +1,42 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=ddns-scripts ++PKG_VERSION:=1.0.0 ++PKG_RELEASE:=21 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ddns-scripts ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=Dynamic DNS Scripts ++ PKGARCH:=all ++endef ++ ++define Package/ddns-scripts/description ++ A highly configurable set of scripts for doing ++ dynamic dns updates ++endef ++ ++define Build/Prepare ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++define Package/ddns-scripts/conffiles ++/etc/config/ddns ++endef ++ ++define Package/ddns-scripts/install ++ $(INSTALL_DIR) $(1) ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,ddns-scripts)) +diff --git a/feeds/packages/net/ddns-scripts/files/.svn/entries b/feeds/packages/net/ddns-scripts/files/.svn/entries +new file mode 100644 +index 0000000..ccb4b13 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++usr ++dir ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/.svn/entries b/feeds/packages/net/ddns-scripts/files/etc/.svn/entries +new file mode 100644 +index 0000000..651334f +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-04T09:22:16.617898Z ++32598 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hotplug.d ++dir ++ ++config ++dir ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/config/.svn/entries b/feeds/packages/net/ddns-scripts/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..208272b +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-04T09:22:16.617898Z ++32598 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ddns ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++e42d8465078ba249a24f73e975e096c0 ++2012-07-04T09:22:16.617898Z ++32598 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4045 ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/config/.svn/text-base/ddns.svn-base b/feeds/packages/net/ddns-scripts/files/etc/config/.svn/text-base/ddns.svn-base +new file mode 100644 +index 0000000..740f87f +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/config/.svn/text-base/ddns.svn-base +@@ -0,0 +1,95 @@ ++################################################################# ++# In order to enable dynamic dns you need at least one section, ++# and in that seciton the "enabled" option must be set to one ++# ++# Each section represents an update to a different service ++# ++# You specify your domain name, your username and your password ++# with the optins "domain", "username" and "password" respectively ++# ++# 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. 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 file or specify this with ++# the "update_url" option. ++# ++# We also need to specify the source of the ip address to associate with ++# your domain. The "ip_source" option can be "network", "interface" ++# or "web", with "network" as the default. ++# ++# If "ip_source" is "network" you specify a network section in your ++# /etc/network config file (e.g. "wan", which is the default) with ++# the "ip_network" option. If you specify "wan", you will update ++# with whatever the ip for your wan is. ++# ++# If "ip_source" is "interface" you specify a hardware interface ++# (e.g. "eth1") and whatever the current ip of this interface is ++# will be associated with the domain when an update is performed. ++# ++# If "ip_source" is "script" you specify a script to obtain ip address. ++# The "ip_script" option should contain path to your script. ++# ++# The last possibility is that "ip_source" is "web", which means ++# that in order to obtain our ip address we will connect to a ++# website, and the first valid ip address listed on that page ++# will be assumed to be ours. If you are behind another firewall ++# this is the best option since none of the local networks or ++# interfaces will have the external ip. The website to connect ++# to is specified by the "ip_url" option. You may specify multiple ++# urls in the option, separated by whitespace. ++# ++# Finally we need to specify how often to check whether we need ++# to check whether the ip address has changed (and if so update ++# it) and how often we need to force an update ( many services ++# will expire your domain if you don't connect and do an update ++# every so often). Use the "check_interval" to specify how ++# often to check whether an update is necessary, the "retry_interval" ++# to specify how often to retry in case the update has failed, and ++# the "force_interval" option to specify how often to force an ++# update. Specify the units for these values with the "check_unit", ++# the "retry_init" and the "force_unit" options. Units can be ++# "days", "hours", "minutes" or "seconds". The default force_unit ++# is hours, the default retry_unit is seconds and the default ++# check_unit is seconds. The default check_interval is 600 seconds, ++# or ten minutes. The default retry_interval is 60 seconds, or one ++# minute. The default force_interval is 72 hours or 3 days. ++# ++# ++######################################################### ++ ++config service "myddns" ++ option enabled "0" ++ option interface "wan" ++ ++ option service_name "dyndns.org" ++ option domain "mypersonaldomain.dyndns.org" ++ option username "myusername" ++ option password "mypassword" ++ ++ option force_interval "72" ++ option force_unit "hours" ++ option check_interval "10" ++ option check_unit "minutes" ++ option retry_interval "60" ++ option retry_unit "seconds" ++ ++ #option ip_source "network" ++ #option ip_network "wan" ++ ++ #option ip_source "interface" ++ #option ip_interface "eth0.1" ++ ++ #option ip_source "script" ++ #option ip_script "path to your scrip" ++ ++ option ip_source "web" ++ option ip_url "http://checkip.dyndns.com/" ++ ++ #option update_url "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]" ++ ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/config/ddns b/feeds/packages/net/ddns-scripts/files/etc/config/ddns +new file mode 100644 +index 0000000..740f87f +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/config/ddns +@@ -0,0 +1,95 @@ ++################################################################# ++# In order to enable dynamic dns you need at least one section, ++# and in that seciton the "enabled" option must be set to one ++# ++# Each section represents an update to a different service ++# ++# You specify your domain name, your username and your password ++# with the optins "domain", "username" and "password" respectively ++# ++# 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. 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 file or specify this with ++# the "update_url" option. ++# ++# We also need to specify the source of the ip address to associate with ++# your domain. The "ip_source" option can be "network", "interface" ++# or "web", with "network" as the default. ++# ++# If "ip_source" is "network" you specify a network section in your ++# /etc/network config file (e.g. "wan", which is the default) with ++# the "ip_network" option. If you specify "wan", you will update ++# with whatever the ip for your wan is. ++# ++# If "ip_source" is "interface" you specify a hardware interface ++# (e.g. "eth1") and whatever the current ip of this interface is ++# will be associated with the domain when an update is performed. ++# ++# If "ip_source" is "script" you specify a script to obtain ip address. ++# The "ip_script" option should contain path to your script. ++# ++# The last possibility is that "ip_source" is "web", which means ++# that in order to obtain our ip address we will connect to a ++# website, and the first valid ip address listed on that page ++# will be assumed to be ours. If you are behind another firewall ++# this is the best option since none of the local networks or ++# interfaces will have the external ip. The website to connect ++# to is specified by the "ip_url" option. You may specify multiple ++# urls in the option, separated by whitespace. ++# ++# Finally we need to specify how often to check whether we need ++# to check whether the ip address has changed (and if so update ++# it) and how often we need to force an update ( many services ++# will expire your domain if you don't connect and do an update ++# every so often). Use the "check_interval" to specify how ++# often to check whether an update is necessary, the "retry_interval" ++# to specify how often to retry in case the update has failed, and ++# the "force_interval" option to specify how often to force an ++# update. Specify the units for these values with the "check_unit", ++# the "retry_init" and the "force_unit" options. Units can be ++# "days", "hours", "minutes" or "seconds". The default force_unit ++# is hours, the default retry_unit is seconds and the default ++# check_unit is seconds. The default check_interval is 600 seconds, ++# or ten minutes. The default retry_interval is 60 seconds, or one ++# minute. The default force_interval is 72 hours or 3 days. ++# ++# ++######################################################### ++ ++config service "myddns" ++ option enabled "0" ++ option interface "wan" ++ ++ option service_name "dyndns.org" ++ option domain "mypersonaldomain.dyndns.org" ++ option username "myusername" ++ option password "mypassword" ++ ++ option force_interval "72" ++ option force_unit "hours" ++ option check_interval "10" ++ option check_unit "minutes" ++ option retry_interval "60" ++ option retry_unit "seconds" ++ ++ #option ip_source "network" ++ #option ip_network "wan" ++ ++ #option ip_source "interface" ++ #option ip_interface "eth0.1" ++ ++ #option ip_source "script" ++ #option ip_script "path to your scrip" ++ ++ option ip_source "web" ++ option ip_url "http://checkip.dyndns.com/" ++ ++ #option update_url "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]" ++ ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/.svn/entries b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..963c8ee +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/etc/hotplug.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-17T17:56:04.684081Z ++27657 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++iface ++dir ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/.svn/entries b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/.svn/entries +new file mode 100644 +index 0000000..c0d7181 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/etc/hotplug.d/iface ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-17T17:56:04.684081Z ++27657 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++25-ddns ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++ce3e7985ef3cb68bc2ee76f18c4cf493 ++2011-07-17T17:56:04.684081Z ++27657 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++139 ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/.svn/text-base/25-ddns.svn-base b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/.svn/text-base/25-ddns.svn-base +new file mode 100644 +index 0000000..4495b5d +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/.svn/text-base/25-ddns.svn-base +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++. /usr/lib/ddns/dynamic_dns_functions.sh ++ ++if [ "$ACTION" = "ifup" ]; then ++ start_daemon_for_all_ddns_sections "$INTERFACE" ++fi ++ ++ +diff --git a/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns +new file mode 100644 +index 0000000..4495b5d +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++. /usr/lib/ddns/dynamic_dns_functions.sh ++ ++if [ "$ACTION" = "ifup" ]; then ++ start_daemon_for_all_ddns_sections "$INTERFACE" ++fi ++ ++ +diff --git a/feeds/packages/net/ddns-scripts/files/usr/.svn/entries b/feeds/packages/net/ddns-scripts/files/usr/.svn/entries +new file mode 100644 +index 0000000..467bd0b +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/usr ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lib ++dir ++ +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/.svn/entries b/feeds/packages/net/ddns-scripts/files/usr/lib/.svn/entries +new file mode 100644 +index 0000000..640eb78 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/usr/lib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ddns ++dir ++ +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/entries b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/entries +new file mode 100644 +index 0000000..963124e +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ddns-scripts/files/usr/lib/ddns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++services ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++9eeef7d566cfa3378c4f284ddcb1d9c7 ++2012-02-25T23:58:55.103002Z ++30729 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4016 ++ ++dynamic_dns_updater.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++b3588590615ef253da15894963e867ee ++2012-09-10T10:03:39.330238Z ++33358 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8226 ++ ++dynamic_dns_functions.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++4e4d7ed58d697bedffbccdafc1abc28f ++2012-05-28T03:38:44.911804Z ++31939 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2955 ++ ++url_escape.sed ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++6a8b65af4845531ba97347e2674fe8a6 ++2011-01-10T16:04:56.045605Z ++24958 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++266 ++ +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/prop-base/dynamic_dns_updater.sh.svn-base b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/prop-base/dynamic_dns_updater.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/prop-base/dynamic_dns_updater.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/dynamic_dns_functions.sh.svn-base b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/dynamic_dns_functions.sh.svn-base +new file mode 100644 +index 0000000..3d435d3 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/dynamic_dns_functions.sh.svn-base +@@ -0,0 +1,136 @@ ++# /usr/lib/dynamic_dns/dynamic_dns_functions.sh ++# ++# Written by Eric Paul Bishop, Janary 2008 ++# Distributed under the terms of the GNU General Public License (GPL) version 2.0 ++# ++# This script is (loosely) based on the one posted by exobyte in the forums here: ++# http://forum.openwrt.org/viewtopic.php?id=14040 ++ ++ ++ ++. /lib/functions.sh ++. /lib/functions/network.sh ++ ++ ++#loads all options for a given package and section ++#also, sets all_option_variables to a list of the variable names ++load_all_config_options() ++{ ++ pkg_name="$1" ++ section_id="$2" ++ ++ ALL_OPTION_VARIABLES="" ++ # this callback loads all the variables ++ # in the section_id 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" = ."$section_id" ]; then ++ option_cb() ++ { ++ ALL_OPTION_VARIABLES="$ALL_OPTION_VARIABLES $1" ++ } ++ else ++ option_cb() { return 0; } ++ fi ++ } ++ ++ ++ config_load "$pkg_name" ++ for var in $ALL_OPTION_VARIABLES ++ do ++ config_get "$var" "$section_id" "$var" ++ done ++} ++ ++ ++get_current_ip() ++{ ++ ++ #if ip source is not defined, assume we want to get ip from wan ++ if [ "$ip_source" != "interface" ] && [ "$ip_source" != "web" ] && [ "$ip_source" != "script" ] ++ then ++ ip_source="network" ++ fi ++ ++ if [ "$ip_source" = "network" ] ++ then ++ if [ -z "$ip_network" ] ++ then ++ ip_network="wan" ++ fi ++ fi ++ ++ current_ip=''; ++ if [ "$ip_source" = "network" ] ++ then ++ network_get_ipaddr current_ip "$ip_network" || return ++ elif [ "$ip_source" = "interface" ] ++ then ++ current_ip=$(ifconfig $ip_interface | grep -o 'inet addr:[0-9.]*' | grep -o "$ip_regex") ++ elif [ "$ip_source" = "script" ] ++ then ++ # get ip from script ++ current_ip=$($ip_script) ++ else ++ # get ip from web ++ # we check each url in order in ip_url variable, and if no ips are found we use dyndns ip checker ++ # ip is set to FIRST expression in page that matches the ip_regex regular expression ++ for addr in $ip_url ++ do ++ if [ -z "$current_ip" ] ++ then ++ current_ip=$(echo $( wget -O - $addr 2>/dev/null) | grep -o "$ip_regex") ++ fi ++ done ++ ++ #here we hard-code the dyndns checkip url in case no url was specified ++ if [ -z "$current_ip" ] ++ then ++ current_ip=$(echo $( wget -O - http://checkip.dyndns.org 2>/dev/null) | grep -o "$ip_regex") ++ fi ++ fi ++ ++ echo "$current_ip" ++} ++ ++ ++verbose_echo() ++{ ++ if [ "$verbose_mode" = 1 ] ++ then ++ echo $1 ++ fi ++} ++ ++start_daemon_for_all_ddns_sections() ++{ ++ local event_interface="$1" ++ ++ SECTIONS="" ++ config_cb() ++ { ++ SECTIONS="$SECTIONS $2" ++ } ++ config_load "ddns" ++ ++ for section in $SECTIONS ++ do ++ local iface ++ config_get iface "$section" interface "wan" ++ [ "$iface" = "$event_interface" ] || continue ++ /usr/lib/ddns/dynamic_dns_updater.sh $section 0 > /dev/null 2>&1 & ++ done ++} ++ ++monotonic_time() ++{ ++ local uptime ++ read uptime < /proc/uptime ++ echo "${uptime%%.*}" ++} +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/dynamic_dns_updater.sh.svn-base b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/dynamic_dns_updater.sh.svn-base +new file mode 100644 +index 0000000..580bed8 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/dynamic_dns_updater.sh.svn-base +@@ -0,0 +1,354 @@ ++#!/bin/sh ++# /usr/lib/dynamic_dns/dynamic_dns_updater.sh ++# ++# Written by Eric Paul Bishop, Janary 2008 ++# Distributed under the terms of the GNU General Public License (GPL) version 2.0 ++# ++# This script is (loosely) based on the one posted by exobyte in the forums here: ++# http://forum.openwrt.org/viewtopic.php?id=14040 ++# ++ ++. /usr/lib/ddns/dynamic_dns_functions.sh ++ ++ ++service_id=$1 ++if [ -z "$service_id" ] ++then ++ echo "ERRROR: You must specify a service id (the section name in the /etc/config/ddns file) to initialize dynamic DNS." ++ return 1 ++fi ++ ++#default mode is verbose_mode, but easily turned off with second parameter ++verbose_mode="1" ++if [ -n "$2" ] ++then ++ verbose_mode="$2" ++fi ++ ++############################################################### ++# Leave this comment here, to clearly document variable names ++# that are expected/possible ++# ++# Now use load_all_config_options to load config ++# options, which is a much more flexible solution. ++# ++# ++#config_load "ddns" ++# ++#config_get enabled $service_id enabled ++#config_get service_name $service_id service_name ++#config_get update_url $service_id update_url ++# ++# ++#config_get username $service_id username ++#config_get password $service_id password ++#config_get domain $service_id domain ++# ++# ++#config_get use_https $service_id use_https ++#config_get cacert $service_id cacert ++# ++#config_get ip_source $service_id ip_source ++#config_get ip_interface $service_id ip_interface ++#config_get ip_network $service_id ip_network ++#config_get ip_url $service_id ip_url ++# ++#config_get force_interval $service_id force_interval ++#config_get force_unit $service_id force_unit ++# ++#config_get check_interval $service_id check_interval ++#config_get check_unit $service_id check_unit ++######################################################### ++load_all_config_options "ddns" "$service_id" ++ ++ ++#some defaults ++if [ -z "$check_interval" ] ++then ++ check_interval=600 ++fi ++ ++if [ -z "$retry_interval" ] ++then ++ retry_interval=60 ++fi ++ ++if [ -z "$check_unit" ] ++then ++ check_unit="seconds" ++fi ++ ++ ++if [ -z "$force_interval" ] ++then ++ force_interval=72 ++fi ++ ++if [ -z "$force_unit" ] ++then ++ force_unit="hours" ++fi ++ ++if [ -z "$use_https" ] ++then ++ use_https=0 ++fi ++ ++ ++ ++#some constants ++ ++if [ "x$use_https" = "x1" ] ++then ++ retrieve_prog="/usr/bin/curl " ++ if [ -f "$cacert" ] ++ then ++ retrieve_prog="${retrieve_prog}--cacert $cacert " ++ elif [ -d "$cacert" ] ++ then ++ retrieve_prog="${retrieve_prog}--capath $cacert " ++ fi ++else ++ retrieve_prog="/usr/bin/wget -O - "; ++fi ++ ++service_file="/usr/lib/ddns/services" ++ ++ip_regex="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}" ++ ++NEWLINE_IFS=' ++' ++ ++ ++#determine what update url we're using if the service_name is supplied ++if [ -n "$service_name" ] ++then ++ #remove any lines not containing data, and then make sure fields are enclosed in double quotes ++ quoted_services=$(cat $service_file | grep "^[\t ]*[^#]" | awk ' gsub("\x27", "\"") { if ($1~/^[^\"]*$/) $1="\""$1"\"" }; { if ( $NF~/^[^\"]*$/) $NF="\""$NF"\"" }; { print $0 }' ) ++ ++ ++ #echo "quoted_services = $quoted_services" ++ OLD_IFS=$IFS ++ IFS=$NEWLINE_IFS ++ for service_line in $quoted_services ++ do ++ #grep out proper parts of data and use echo to remove quotes ++ next_name=$(echo $service_line | grep -o "^[\t ]*\"[^\"]*\"" | xargs -r -n1 echo) ++ next_url=$(echo $service_line | grep -o "\"[^\"]*\"[\t ]*$" | xargs -r -n1 echo) ++ ++ if [ "$next_name" = "$service_name" ] ++ then ++ update_url=$next_url ++ fi ++ done ++ IFS=$OLD_IFS ++fi ++ ++if [ "x$use_https" = x1 ] ++then ++ update_url=$(echo $update_url | sed -e 's/^http:/https:/') ++fi ++ ++ ++verbose_echo "update_url=$update_url" ++ ++ ++ ++#if this service isn't enabled then quit ++if [ "$enabled" != "1" ] ++then ++ return 0 ++fi ++ ++ ++ ++ ++ ++#compute update interval in seconds ++case "$force_unit" in ++ "days" ) ++ force_interval_seconds=$(($force_interval*60*60*24)) ++ ;; ++ "hours" ) ++ force_interval_seconds=$(($force_interval*60*60)) ++ ;; ++ "minutes" ) ++ force_interval_seconds=$(($force_interval*60)) ++ ;; ++ "seconds" ) ++ force_interval_seconds=$force_interval ++ ;; ++ * ) ++ #default is hours ++ force_interval_seconds=$(($force_interval*60*60)) ++ ;; ++esac ++ ++ ++ ++#compute check interval in seconds ++case "$check_unit" in ++ "days" ) ++ check_interval_seconds=$(($check_interval*60*60*24)) ++ ;; ++ "hours" ) ++ check_interval_seconds=$(($check_interval*60*60)) ++ ;; ++ "minutes" ) ++ check_interval_seconds=$(($check_interval*60)) ++ ;; ++ "seconds" ) ++ check_interval_seconds=$check_interval ++ ;; ++ * ) ++ #default is seconds ++ check_interval_seconds=$check_interval ++ ;; ++esac ++ ++ ++ ++#compute retry interval in seconds ++case "$retry_unit" in ++ "days" ) ++ retry_interval_seconds=$(($retry_interval*60*60*24)) ++ ;; ++ "hours" ) ++ retry_interval_seconds=$(($retry_interval*60*60)) ++ ;; ++ "minutes" ) ++ retry_interval_seconds=$(($retry_interval*60)) ++ ;; ++ "seconds" ) ++ retry_interval_seconds=$retry_interval ++ ;; ++ * ) ++ #default is seconds ++ retry_interval_seconds=$retry_interval ++ ;; ++esac ++ ++ ++ ++verbose_echo "force seconds = $force_interval_seconds" ++verbose_echo "check seconds = $check_interval_seconds" ++ ++#kill old process if it exists & set new pid file ++if [ -d /var/run/dynamic_dns ] ++then ++ #if process is already running, stop it ++ if [ -e "/var/run/dynamic_dns/$service_id.pid" ] ++ then ++ old_pid=$(cat /var/run/dynamic_dns/$service_id.pid) ++ test_match=$(ps | grep "^[\t ]*$old_pid") ++ verbose_echo "old process id (if it exists) = \"$test_match\"" ++ if [ -n "$test_match" ] ++ then ++ kill $old_pid ++ fi ++ fi ++ ++else ++ #make dir since it doesn't exist ++ mkdir /var/run/dynamic_dns ++fi ++echo $$ > /var/run/dynamic_dns/$service_id.pid ++ ++ ++ ++ ++#determine when the last update was ++current_time=$(monotonic_time) ++last_update=$(( $current_time - (2*$force_interval_seconds) )) ++if [ -e "/var/run/dynamic_dns/$service_id.update" ] ++then ++ last_update=$(cat /var/run/dynamic_dns/$service_id.update) ++fi ++time_since_update=$(($current_time - $last_update)) ++ ++ ++human_time_since_update=$(( $time_since_update / ( 60 * 60 ) )) ++verbose_echo "time_since_update = $human_time_since_update hours" ++ ++ ++ ++#do update and then loop endlessly, checking ip every check_interval and forcing an updating once every force_interval ++ ++while [ true ] ++do ++ registered_ip=$(echo $(nslookup "$domain" 2>/dev/null) | grep -o "Name:.*" | grep -o "$ip_regex") ++ current_ip=$(get_current_ip) ++ ++ ++ current_time=$(monotonic_time) ++ time_since_update=$(($current_time - $last_update)) ++ ++ ++ verbose_echo "Running IP check..." ++ verbose_echo "current system ip = $current_ip" ++ verbose_echo "registered domain ip = $registered_ip" ++ ++ ++ if [ "$current_ip" != "$registered_ip" ] || [ $force_interval_seconds -lt $time_since_update ] ++ then ++ verbose_echo "update necessary, performing update ..." ++ ++ #do replacement ++ final_url=$update_url ++ for option_var in $ALL_OPTION_VARIABLES ++ do ++ if [ "$option_var" != "update_url" ] ++ then ++ replace_name=$(echo "\[$option_var\]" | tr 'a-z' 'A-Z') ++ replace_value=$(eval echo "\$$option_var") ++ replace_value=$(echo $replace_value | sed -f /usr/lib/ddns/url_escape.sed) ++ final_url=$(echo $final_url | sed s^"$replace_name"^"$replace_value"^g ) ++ fi ++ done ++ final_url=$(echo $final_url | sed s^"\[HTTPAUTH\]"^"${username//^/\\^}${password:+:${password//^/\\^}}"^g ) ++ final_url=$(echo $final_url | sed s/"\[IP\]"/"$current_ip"/g ) ++ ++ ++ verbose_echo "updating with url=\"$final_url\"" ++ ++ #here we actually connect, and perform the update ++ update_output=$( $retrieve_prog "$final_url" ) ++ if [ $? -gt 0 ] ++ then ++ verbose_echo "update failed" ++ sleep $retry_interval_seconds ++ continue ++ fi ++ ++ verbose_echo "Update Output:" ++ verbose_echo "$update_output" ++ verbose_echo "" ++ ++ #save the time of the update ++ current_time=$(monotonic_time) ++ last_update=$current_time ++ time_since_update='0' ++ registered_ip=$current_ip ++ ++ human_time=$(date) ++ verbose_echo "update complete, time is: $human_time" ++ ++ echo "$last_update" > "/var/run/dynamic_dns/$service_id.update" ++ else ++ human_time=$(date) ++ human_time_since_update=$(( $time_since_update / ( 60 * 60 ) )) ++ verbose_echo "update unnecessary" ++ verbose_echo "time since last update = $human_time_since_update hours" ++ verbose_echo "the time is now $human_time" ++ fi ++ ++ #sleep for 10 minutes, then re-check ip && time since last update ++ sleep $check_interval_seconds ++done ++ ++#should never get here since we're a daemon, but I'll throw it in anyway ++return 0 ++ ++ ++ ++ +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/services.svn-base b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/services.svn-base +new file mode 100644 +index 0000000..1e6b6b9 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/services.svn-base +@@ -0,0 +1,59 @@ ++# 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 ++ ++"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]" ++ ++#noip is an alias of no-ip, so allow both names for the same service ++"no-ip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]" ++"noip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]" ++ ++#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]" ++ ++#### ADD YOURS HERE! ###################################################################################### ++# # ++# 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 # ++# # ++########################################################################################################### ++ ++# 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]" +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/url_escape.sed.svn-base b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/url_escape.sed.svn-base +new file mode 100644 +index 0000000..eac4002 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/.svn/text-base/url_escape.sed.svn-base +@@ -0,0 +1,25 @@ ++# sed url escaping ++s:%:%25:g ++s: :%20:g ++s:<:%3C:g ++s:>:%3E:g ++s:#:%23:g ++s:{:%7B:g ++s:}:%7D:g ++s:|:%7C:g ++s:\\:%5C:g ++s:\^:%5E:g ++s:~:%7E:g ++s:\[:%5B:g ++s:\]:%5D:g ++s:`:%60:g ++s:;:%3B:g ++s:/:%2F:g ++s:?:%3F:g ++s^:^%3A^g ++s:@:%40:g ++s:=:%3D:g ++s:&:%26:g ++s:\$:%24:g ++s:\!:%21:g ++s:\*:%2A:g +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +new file mode 100644 +index 0000000..3d435d3 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +@@ -0,0 +1,136 @@ ++# /usr/lib/dynamic_dns/dynamic_dns_functions.sh ++# ++# Written by Eric Paul Bishop, Janary 2008 ++# Distributed under the terms of the GNU General Public License (GPL) version 2.0 ++# ++# This script is (loosely) based on the one posted by exobyte in the forums here: ++# http://forum.openwrt.org/viewtopic.php?id=14040 ++ ++ ++ ++. /lib/functions.sh ++. /lib/functions/network.sh ++ ++ ++#loads all options for a given package and section ++#also, sets all_option_variables to a list of the variable names ++load_all_config_options() ++{ ++ pkg_name="$1" ++ section_id="$2" ++ ++ ALL_OPTION_VARIABLES="" ++ # this callback loads all the variables ++ # in the section_id 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" = ."$section_id" ]; then ++ option_cb() ++ { ++ ALL_OPTION_VARIABLES="$ALL_OPTION_VARIABLES $1" ++ } ++ else ++ option_cb() { return 0; } ++ fi ++ } ++ ++ ++ config_load "$pkg_name" ++ for var in $ALL_OPTION_VARIABLES ++ do ++ config_get "$var" "$section_id" "$var" ++ done ++} ++ ++ ++get_current_ip() ++{ ++ ++ #if ip source is not defined, assume we want to get ip from wan ++ if [ "$ip_source" != "interface" ] && [ "$ip_source" != "web" ] && [ "$ip_source" != "script" ] ++ then ++ ip_source="network" ++ fi ++ ++ if [ "$ip_source" = "network" ] ++ then ++ if [ -z "$ip_network" ] ++ then ++ ip_network="wan" ++ fi ++ fi ++ ++ current_ip=''; ++ if [ "$ip_source" = "network" ] ++ then ++ network_get_ipaddr current_ip "$ip_network" || return ++ elif [ "$ip_source" = "interface" ] ++ then ++ current_ip=$(ifconfig $ip_interface | grep -o 'inet addr:[0-9.]*' | grep -o "$ip_regex") ++ elif [ "$ip_source" = "script" ] ++ then ++ # get ip from script ++ current_ip=$($ip_script) ++ else ++ # get ip from web ++ # we check each url in order in ip_url variable, and if no ips are found we use dyndns ip checker ++ # ip is set to FIRST expression in page that matches the ip_regex regular expression ++ for addr in $ip_url ++ do ++ if [ -z "$current_ip" ] ++ then ++ current_ip=$(echo $( wget -O - $addr 2>/dev/null) | grep -o "$ip_regex") ++ fi ++ done ++ ++ #here we hard-code the dyndns checkip url in case no url was specified ++ if [ -z "$current_ip" ] ++ then ++ current_ip=$(echo $( wget -O - http://checkip.dyndns.org 2>/dev/null) | grep -o "$ip_regex") ++ fi ++ fi ++ ++ echo "$current_ip" ++} ++ ++ ++verbose_echo() ++{ ++ if [ "$verbose_mode" = 1 ] ++ then ++ echo $1 ++ fi ++} ++ ++start_daemon_for_all_ddns_sections() ++{ ++ local event_interface="$1" ++ ++ SECTIONS="" ++ config_cb() ++ { ++ SECTIONS="$SECTIONS $2" ++ } ++ config_load "ddns" ++ ++ for section in $SECTIONS ++ do ++ local iface ++ config_get iface "$section" interface "wan" ++ [ "$iface" = "$event_interface" ] || continue ++ /usr/lib/ddns/dynamic_dns_updater.sh $section 0 > /dev/null 2>&1 & ++ done ++} ++ ++monotonic_time() ++{ ++ local uptime ++ read uptime < /proc/uptime ++ echo "${uptime%%.*}" ++} +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh +new file mode 100755 +index 0000000..580bed8 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh +@@ -0,0 +1,354 @@ ++#!/bin/sh ++# /usr/lib/dynamic_dns/dynamic_dns_updater.sh ++# ++# Written by Eric Paul Bishop, Janary 2008 ++# Distributed under the terms of the GNU General Public License (GPL) version 2.0 ++# ++# This script is (loosely) based on the one posted by exobyte in the forums here: ++# http://forum.openwrt.org/viewtopic.php?id=14040 ++# ++ ++. /usr/lib/ddns/dynamic_dns_functions.sh ++ ++ ++service_id=$1 ++if [ -z "$service_id" ] ++then ++ echo "ERRROR: You must specify a service id (the section name in the /etc/config/ddns file) to initialize dynamic DNS." ++ return 1 ++fi ++ ++#default mode is verbose_mode, but easily turned off with second parameter ++verbose_mode="1" ++if [ -n "$2" ] ++then ++ verbose_mode="$2" ++fi ++ ++############################################################### ++# Leave this comment here, to clearly document variable names ++# that are expected/possible ++# ++# Now use load_all_config_options to load config ++# options, which is a much more flexible solution. ++# ++# ++#config_load "ddns" ++# ++#config_get enabled $service_id enabled ++#config_get service_name $service_id service_name ++#config_get update_url $service_id update_url ++# ++# ++#config_get username $service_id username ++#config_get password $service_id password ++#config_get domain $service_id domain ++# ++# ++#config_get use_https $service_id use_https ++#config_get cacert $service_id cacert ++# ++#config_get ip_source $service_id ip_source ++#config_get ip_interface $service_id ip_interface ++#config_get ip_network $service_id ip_network ++#config_get ip_url $service_id ip_url ++# ++#config_get force_interval $service_id force_interval ++#config_get force_unit $service_id force_unit ++# ++#config_get check_interval $service_id check_interval ++#config_get check_unit $service_id check_unit ++######################################################### ++load_all_config_options "ddns" "$service_id" ++ ++ ++#some defaults ++if [ -z "$check_interval" ] ++then ++ check_interval=600 ++fi ++ ++if [ -z "$retry_interval" ] ++then ++ retry_interval=60 ++fi ++ ++if [ -z "$check_unit" ] ++then ++ check_unit="seconds" ++fi ++ ++ ++if [ -z "$force_interval" ] ++then ++ force_interval=72 ++fi ++ ++if [ -z "$force_unit" ] ++then ++ force_unit="hours" ++fi ++ ++if [ -z "$use_https" ] ++then ++ use_https=0 ++fi ++ ++ ++ ++#some constants ++ ++if [ "x$use_https" = "x1" ] ++then ++ retrieve_prog="/usr/bin/curl " ++ if [ -f "$cacert" ] ++ then ++ retrieve_prog="${retrieve_prog}--cacert $cacert " ++ elif [ -d "$cacert" ] ++ then ++ retrieve_prog="${retrieve_prog}--capath $cacert " ++ fi ++else ++ retrieve_prog="/usr/bin/wget -O - "; ++fi ++ ++service_file="/usr/lib/ddns/services" ++ ++ip_regex="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}" ++ ++NEWLINE_IFS=' ++' ++ ++ ++#determine what update url we're using if the service_name is supplied ++if [ -n "$service_name" ] ++then ++ #remove any lines not containing data, and then make sure fields are enclosed in double quotes ++ quoted_services=$(cat $service_file | grep "^[\t ]*[^#]" | awk ' gsub("\x27", "\"") { if ($1~/^[^\"]*$/) $1="\""$1"\"" }; { if ( $NF~/^[^\"]*$/) $NF="\""$NF"\"" }; { print $0 }' ) ++ ++ ++ #echo "quoted_services = $quoted_services" ++ OLD_IFS=$IFS ++ IFS=$NEWLINE_IFS ++ for service_line in $quoted_services ++ do ++ #grep out proper parts of data and use echo to remove quotes ++ next_name=$(echo $service_line | grep -o "^[\t ]*\"[^\"]*\"" | xargs -r -n1 echo) ++ next_url=$(echo $service_line | grep -o "\"[^\"]*\"[\t ]*$" | xargs -r -n1 echo) ++ ++ if [ "$next_name" = "$service_name" ] ++ then ++ update_url=$next_url ++ fi ++ done ++ IFS=$OLD_IFS ++fi ++ ++if [ "x$use_https" = x1 ] ++then ++ update_url=$(echo $update_url | sed -e 's/^http:/https:/') ++fi ++ ++ ++verbose_echo "update_url=$update_url" ++ ++ ++ ++#if this service isn't enabled then quit ++if [ "$enabled" != "1" ] ++then ++ return 0 ++fi ++ ++ ++ ++ ++ ++#compute update interval in seconds ++case "$force_unit" in ++ "days" ) ++ force_interval_seconds=$(($force_interval*60*60*24)) ++ ;; ++ "hours" ) ++ force_interval_seconds=$(($force_interval*60*60)) ++ ;; ++ "minutes" ) ++ force_interval_seconds=$(($force_interval*60)) ++ ;; ++ "seconds" ) ++ force_interval_seconds=$force_interval ++ ;; ++ * ) ++ #default is hours ++ force_interval_seconds=$(($force_interval*60*60)) ++ ;; ++esac ++ ++ ++ ++#compute check interval in seconds ++case "$check_unit" in ++ "days" ) ++ check_interval_seconds=$(($check_interval*60*60*24)) ++ ;; ++ "hours" ) ++ check_interval_seconds=$(($check_interval*60*60)) ++ ;; ++ "minutes" ) ++ check_interval_seconds=$(($check_interval*60)) ++ ;; ++ "seconds" ) ++ check_interval_seconds=$check_interval ++ ;; ++ * ) ++ #default is seconds ++ check_interval_seconds=$check_interval ++ ;; ++esac ++ ++ ++ ++#compute retry interval in seconds ++case "$retry_unit" in ++ "days" ) ++ retry_interval_seconds=$(($retry_interval*60*60*24)) ++ ;; ++ "hours" ) ++ retry_interval_seconds=$(($retry_interval*60*60)) ++ ;; ++ "minutes" ) ++ retry_interval_seconds=$(($retry_interval*60)) ++ ;; ++ "seconds" ) ++ retry_interval_seconds=$retry_interval ++ ;; ++ * ) ++ #default is seconds ++ retry_interval_seconds=$retry_interval ++ ;; ++esac ++ ++ ++ ++verbose_echo "force seconds = $force_interval_seconds" ++verbose_echo "check seconds = $check_interval_seconds" ++ ++#kill old process if it exists & set new pid file ++if [ -d /var/run/dynamic_dns ] ++then ++ #if process is already running, stop it ++ if [ -e "/var/run/dynamic_dns/$service_id.pid" ] ++ then ++ old_pid=$(cat /var/run/dynamic_dns/$service_id.pid) ++ test_match=$(ps | grep "^[\t ]*$old_pid") ++ verbose_echo "old process id (if it exists) = \"$test_match\"" ++ if [ -n "$test_match" ] ++ then ++ kill $old_pid ++ fi ++ fi ++ ++else ++ #make dir since it doesn't exist ++ mkdir /var/run/dynamic_dns ++fi ++echo $$ > /var/run/dynamic_dns/$service_id.pid ++ ++ ++ ++ ++#determine when the last update was ++current_time=$(monotonic_time) ++last_update=$(( $current_time - (2*$force_interval_seconds) )) ++if [ -e "/var/run/dynamic_dns/$service_id.update" ] ++then ++ last_update=$(cat /var/run/dynamic_dns/$service_id.update) ++fi ++time_since_update=$(($current_time - $last_update)) ++ ++ ++human_time_since_update=$(( $time_since_update / ( 60 * 60 ) )) ++verbose_echo "time_since_update = $human_time_since_update hours" ++ ++ ++ ++#do update and then loop endlessly, checking ip every check_interval and forcing an updating once every force_interval ++ ++while [ true ] ++do ++ registered_ip=$(echo $(nslookup "$domain" 2>/dev/null) | grep -o "Name:.*" | grep -o "$ip_regex") ++ current_ip=$(get_current_ip) ++ ++ ++ current_time=$(monotonic_time) ++ time_since_update=$(($current_time - $last_update)) ++ ++ ++ verbose_echo "Running IP check..." ++ verbose_echo "current system ip = $current_ip" ++ verbose_echo "registered domain ip = $registered_ip" ++ ++ ++ if [ "$current_ip" != "$registered_ip" ] || [ $force_interval_seconds -lt $time_since_update ] ++ then ++ verbose_echo "update necessary, performing update ..." ++ ++ #do replacement ++ final_url=$update_url ++ for option_var in $ALL_OPTION_VARIABLES ++ do ++ if [ "$option_var" != "update_url" ] ++ then ++ replace_name=$(echo "\[$option_var\]" | tr 'a-z' 'A-Z') ++ replace_value=$(eval echo "\$$option_var") ++ replace_value=$(echo $replace_value | sed -f /usr/lib/ddns/url_escape.sed) ++ final_url=$(echo $final_url | sed s^"$replace_name"^"$replace_value"^g ) ++ fi ++ done ++ final_url=$(echo $final_url | sed s^"\[HTTPAUTH\]"^"${username//^/\\^}${password:+:${password//^/\\^}}"^g ) ++ final_url=$(echo $final_url | sed s/"\[IP\]"/"$current_ip"/g ) ++ ++ ++ verbose_echo "updating with url=\"$final_url\"" ++ ++ #here we actually connect, and perform the update ++ update_output=$( $retrieve_prog "$final_url" ) ++ if [ $? -gt 0 ] ++ then ++ verbose_echo "update failed" ++ sleep $retry_interval_seconds ++ continue ++ fi ++ ++ verbose_echo "Update Output:" ++ verbose_echo "$update_output" ++ verbose_echo "" ++ ++ #save the time of the update ++ current_time=$(monotonic_time) ++ last_update=$current_time ++ time_since_update='0' ++ registered_ip=$current_ip ++ ++ human_time=$(date) ++ verbose_echo "update complete, time is: $human_time" ++ ++ echo "$last_update" > "/var/run/dynamic_dns/$service_id.update" ++ else ++ human_time=$(date) ++ human_time_since_update=$(( $time_since_update / ( 60 * 60 ) )) ++ verbose_echo "update unnecessary" ++ verbose_echo "time since last update = $human_time_since_update hours" ++ verbose_echo "the time is now $human_time" ++ fi ++ ++ #sleep for 10 minutes, then re-check ip && time since last update ++ sleep $check_interval_seconds ++done ++ ++#should never get here since we're a daemon, but I'll throw it in anyway ++return 0 ++ ++ ++ ++ +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/services b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/services +new file mode 100644 +index 0000000..1e6b6b9 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/services +@@ -0,0 +1,59 @@ ++# 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 ++ ++"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]" ++ ++#noip is an alias of no-ip, so allow both names for the same service ++"no-ip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]" ++"noip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]" ++ ++#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]" ++ ++#### ADD YOURS HERE! ###################################################################################### ++# # ++# 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 # ++# # ++########################################################################################################### ++ ++# 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]" +diff --git a/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed +new file mode 100644 +index 0000000..eac4002 +--- /dev/null ++++ b/feeds/packages/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed +@@ -0,0 +1,25 @@ ++# sed url escaping ++s:%:%25:g ++s: :%20:g ++s:<:%3C:g ++s:>:%3E:g ++s:#:%23:g ++s:{:%7B:g ++s:}:%7D:g ++s:|:%7C:g ++s:\\:%5C:g ++s:\^:%5E:g ++s:~:%7E:g ++s:\[:%5B:g ++s:\]:%5D:g ++s:`:%60:g ++s:;:%3B:g ++s:/:%2F:g ++s:?:%3F:g ++s^:^%3A^g ++s:@:%40:g ++s:=:%3D:g ++s:&:%26:g ++s:\$:%24:g ++s:\!:%21:g ++s:\*:%2A:g +diff --git a/feeds/packages/net/deluge/.svn/entries b/feeds/packages/net/deluge/.svn/entries +new file mode 100644 +index 0000000..d00aa84 +--- /dev/null ++++ b/feeds/packages/net/deluge/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/deluge ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T09:44:27.292359Z ++29180 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++34e260f51d5353353cfb82c354c1e3a9 ++2011-11-16T09:44:27.292359Z ++29180 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2742 ++ +diff --git a/feeds/packages/net/deluge/.svn/text-base/Makefile.svn-base b/feeds/packages/net/deluge/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6e658d3 +--- /dev/null ++++ b/feeds/packages/net/deluge/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,111 @@ ++# ++# 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:=deluge ++PKG_VERSION:=1.2.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.deluge-torrent.org/source/ ++PKG_MD5SUM:=cec6b48f0abd79ea2cff3815a1124192 ++ ++PKG_BUILD_DEPENDS:=distribute/host ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/deluge/Default ++ SUBMENU:=BitTorrent ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A lightweight BitTorrent client ++ URL:=http://deluge-torrent.org/ ++endef ++ ++define Package/deluge ++$(call Package/deluge/Default) ++ TITLE+= (console UI & daemon) ++ DEPENDS+=+python +rblibtorrent +python2-chardet +pyxdg +twisted +twisted-web +pyopenssl ++endef ++ ++define Package/deluge-ui-gtk ++$(call Package/deluge/Default) ++ TITLE+= (GTK+ UI) ++ DEPENDS+=deluge +python-gtk ++endef ++ ++define Package/deluge-ui-web ++$(call Package/deluge/Default) ++ TITLE+= (Web UI) ++ DEPENDS+=deluge +mako ++endef ++ ++define Package/deluge/description ++ BitTorrent client with a client/server model. ++endef ++ ++define Package/deluge/conffiles ++/etc/config/deluge ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++ ++ $(SED) 's,#!$(STAGING_DIR)/host/bin/$(PYTHON),#!/usr/bin/$(PYTHON),' $(PKG_INSTALL_DIR)/usr/bin/* ++endef ++ ++define Package/deluge/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR)/ ++ rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/gtkui ++ rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/web ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin/ ++ rm -rf $(1)/usr/bin/deluge-gtk ++ rm -rf $(1)/usr/bin/deluge-web ++ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/deluge.config $(1)/etc/config/deluge ++ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/deluge.init $(1)/etc/init.d/deluge ++endef ++ ++define Package/deluge-ui-gtk/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/gtkui \ ++ $(1)$(PYTHON_PKG_DIR)/deluge/ui/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/deluge-gtk \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/deluge-ui-web/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/web \ ++ $(1)$(PYTHON_PKG_DIR)/deluge/ui/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/deluge-web \ ++ $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,deluge)) ++$(eval $(call BuildPackage,deluge-ui-gtk)) ++$(eval $(call BuildPackage,deluge-ui-web)) +diff --git a/feeds/packages/net/deluge/Makefile b/feeds/packages/net/deluge/Makefile +new file mode 100644 +index 0000000..6e658d3 +--- /dev/null ++++ b/feeds/packages/net/deluge/Makefile +@@ -0,0 +1,111 @@ ++# ++# 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:=deluge ++PKG_VERSION:=1.2.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.deluge-torrent.org/source/ ++PKG_MD5SUM:=cec6b48f0abd79ea2cff3815a1124192 ++ ++PKG_BUILD_DEPENDS:=distribute/host ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/deluge/Default ++ SUBMENU:=BitTorrent ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A lightweight BitTorrent client ++ URL:=http://deluge-torrent.org/ ++endef ++ ++define Package/deluge ++$(call Package/deluge/Default) ++ TITLE+= (console UI & daemon) ++ DEPENDS+=+python +rblibtorrent +python2-chardet +pyxdg +twisted +twisted-web +pyopenssl ++endef ++ ++define Package/deluge-ui-gtk ++$(call Package/deluge/Default) ++ TITLE+= (GTK+ UI) ++ DEPENDS+=deluge +python-gtk ++endef ++ ++define Package/deluge-ui-web ++$(call Package/deluge/Default) ++ TITLE+= (Web UI) ++ DEPENDS+=deluge +mako ++endef ++ ++define Package/deluge/description ++ BitTorrent client with a client/server model. ++endef ++ ++define Package/deluge/conffiles ++/etc/config/deluge ++endef ++ ++define Build/Compile ++ $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) ++ ++ $(SED) 's,#!$(STAGING_DIR)/host/bin/$(PYTHON),#!/usr/bin/$(PYTHON),' $(PKG_INSTALL_DIR)/usr/bin/* ++endef ++ ++define Package/deluge/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ ++ $(1)$(PYTHON_PKG_DIR)/ ++ rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/gtkui ++ rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/web ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin/ ++ rm -rf $(1)/usr/bin/deluge-gtk ++ rm -rf $(1)/usr/bin/deluge-web ++ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/deluge.config $(1)/etc/config/deluge ++ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/deluge.init $(1)/etc/init.d/deluge ++endef ++ ++define Package/deluge-ui-gtk/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/gtkui \ ++ $(1)$(PYTHON_PKG_DIR)/deluge/ui/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/deluge-gtk \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/deluge-ui-web/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui ++ $(CP) \ ++ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/web \ ++ $(1)$(PYTHON_PKG_DIR)/deluge/ui/ ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/deluge-web \ ++ $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,deluge)) ++$(eval $(call BuildPackage,deluge-ui-gtk)) ++$(eval $(call BuildPackage,deluge-ui-web)) +diff --git a/feeds/packages/net/deluge/files/.svn/entries b/feeds/packages/net/deluge/files/.svn/entries +new file mode 100644 +index 0000000..dc6505a +--- /dev/null ++++ b/feeds/packages/net/deluge/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/deluge/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T09:44:27.292359Z ++29180 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++deluge.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++3a5084674e6597692bdd6b188335f2c9 ++2011-11-16T09:44:27.292359Z ++29180 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1476 ++ ++deluge.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8839737d025756e0b2cf8450a0fddcac ++2011-11-16T09:44:27.292359Z ++29180 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++130 ++ +diff --git a/feeds/packages/net/deluge/files/.svn/text-base/deluge.config.svn-base b/feeds/packages/net/deluge/files/.svn/text-base/deluge.config.svn-base +new file mode 100644 +index 0000000..3d41776 +--- /dev/null ++++ b/feeds/packages/net/deluge/files/.svn/text-base/deluge.config.svn-base +@@ -0,0 +1,6 @@ ++config global deluged ++ option 'user' 'deluge' ++ option 'group' 'deluge' ++ option 'home' '' ++ option 'options' '' ++ option 'enabled' 1 +diff --git a/feeds/packages/net/deluge/files/.svn/text-base/deluge.init.svn-base b/feeds/packages/net/deluge/files/.svn/text-base/deluge.init.svn-base +new file mode 100644 +index 0000000..50afc26 +--- /dev/null ++++ b/feeds/packages/net/deluge/files/.svn/text-base/deluge.init.svn-base +@@ -0,0 +1,86 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alexander Sulfrian ++ ++START=50 ++STOP=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++SERVICE_PID_FILE="/var/run/deluged.pid" ++ ++error() { ++ echo "${initscript}:" "$@" 1>&2 ++} ++ ++section_enabled() { ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ config_get uid "$s" 'user' ++ [ -n "$uid" ] || { ++ error "user is not set" ++ return 1 ++ } ++ user_exists $uid || { ++ error "user '$uid' dos not exist" ++ return 1 ++ } ++ ++ config_get gid "$s" 'group' ++ [ -n "$gid" ] || { ++ error "group is not set" ++ return 1 ++ } ++ group_exists $gid || { ++ error "group '$gid' dos not exist" ++ return 1 ++ } ++ ++ config_get home "$s" 'home' ++ [ -n "$home" ] || { ++ home=$(grep "^${user}:" /etc/passwd | cut -d ':' -f 6) ++ fi ++ [ -d "$home" ] || { ++ error "home directory '$home' for user '$uid' dos not exist" ++ return 1 ++ } ++ ++ config_get options "$s" 'options' ++ ++ HOME="$home" \ ++ SERVICE_UID="$uid" \ ++ SERVICE_GID="$gid" \ ++ service_start /usr/bin/python2.6 /usr/bin/deluged --do-not-daemonize $options ++} ++ ++stop_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ config_get uid "$s" 'user' ++ config_get gid "$s" 'group' ++ ++ SERVICE_UID="$uid" \ ++ SERVICE_GID="$gid" \ ++ service_stop /usr/bin/python2.6 ++} ++ ++start() ++{ ++ config_load 'deluged' ++ config_foreach start_instance 'deluged' ++} ++ ++stop() ++{ ++ config_load 'deluged' ++ config_foreach stop_instance 'deluged' ++} +diff --git a/feeds/packages/net/deluge/files/deluge.config b/feeds/packages/net/deluge/files/deluge.config +new file mode 100644 +index 0000000..3d41776 +--- /dev/null ++++ b/feeds/packages/net/deluge/files/deluge.config +@@ -0,0 +1,6 @@ ++config global deluged ++ option 'user' 'deluge' ++ option 'group' 'deluge' ++ option 'home' '' ++ option 'options' '' ++ option 'enabled' 1 +diff --git a/feeds/packages/net/deluge/files/deluge.init b/feeds/packages/net/deluge/files/deluge.init +new file mode 100644 +index 0000000..50afc26 +--- /dev/null ++++ b/feeds/packages/net/deluge/files/deluge.init +@@ -0,0 +1,86 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Alexander Sulfrian ++ ++START=50 ++STOP=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++SERVICE_PID_FILE="/var/run/deluged.pid" ++ ++error() { ++ echo "${initscript}:" "$@" 1>&2 ++} ++ ++section_enabled() { ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ config_get uid "$s" 'user' ++ [ -n "$uid" ] || { ++ error "user is not set" ++ return 1 ++ } ++ user_exists $uid || { ++ error "user '$uid' dos not exist" ++ return 1 ++ } ++ ++ config_get gid "$s" 'group' ++ [ -n "$gid" ] || { ++ error "group is not set" ++ return 1 ++ } ++ group_exists $gid || { ++ error "group '$gid' dos not exist" ++ return 1 ++ } ++ ++ config_get home "$s" 'home' ++ [ -n "$home" ] || { ++ home=$(grep "^${user}:" /etc/passwd | cut -d ':' -f 6) ++ fi ++ [ -d "$home" ] || { ++ error "home directory '$home' for user '$uid' dos not exist" ++ return 1 ++ } ++ ++ config_get options "$s" 'options' ++ ++ HOME="$home" \ ++ SERVICE_UID="$uid" \ ++ SERVICE_GID="$gid" \ ++ service_start /usr/bin/python2.6 /usr/bin/deluged --do-not-daemonize $options ++} ++ ++stop_instance() { ++ local s="$1" ++ ++ section_enabled "$s" || return 1 ++ ++ config_get uid "$s" 'user' ++ config_get gid "$s" 'group' ++ ++ SERVICE_UID="$uid" \ ++ SERVICE_GID="$gid" \ ++ service_stop /usr/bin/python2.6 ++} ++ ++start() ++{ ++ config_load 'deluged' ++ config_foreach start_instance 'deluged' ++} ++ ++stop() ++{ ++ config_load 'deluged' ++ config_foreach stop_instance 'deluged' ++} +diff --git a/feeds/packages/net/dhcp-forwarder/.svn/entries b/feeds/packages/net/dhcp-forwarder/.svn/entries +new file mode 100644 +index 0000000..b9fe0ef +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcp-forwarder ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-20T22:40:16.126409Z ++32478 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++a6c36788b30775eb66fdde5e11416ea8 ++2012-06-20T22:40:16.126409Z ++32478 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1193 ++ +diff --git a/feeds/packages/net/dhcp-forwarder/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/dhcp-forwarder/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dhcp-forwarder/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dhcp-forwarder/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..aa6dc3d +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=dhcp-forwarder ++PKG_VERSION:=0.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd ++PKG_MD5SUM:=3b96dd27f6d05502d4048acab453808d ++ ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_ARGS += \ ++ --disable-dietlibc ++ ++define Package/dhcp-forwarder ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=DHCP relay agent ++ URL:=http://www.nongnu.org/dhcp-fwd/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ cfg_filename="/etc/dhcp-fwd.conf" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/dhcp-forwarder/conffiles ++/etc/dhcp-fwd.conf ++endef ++ ++define Package/dhcp-forwarder/install ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/etc $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/ ++ $(INSTALL_BIN) ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd ++endef ++ ++$(eval $(call BuildPackage,dhcp-forwarder)) +diff --git a/feeds/packages/net/dhcp-forwarder/Makefile b/feeds/packages/net/dhcp-forwarder/Makefile +new file mode 100644 +index 0000000..aa6dc3d +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=dhcp-forwarder ++PKG_VERSION:=0.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd ++PKG_MD5SUM:=3b96dd27f6d05502d4048acab453808d ++ ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_ARGS += \ ++ --disable-dietlibc ++ ++define Package/dhcp-forwarder ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=DHCP relay agent ++ URL:=http://www.nongnu.org/dhcp-fwd/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ cfg_filename="/etc/dhcp-fwd.conf" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/dhcp-forwarder/conffiles ++/etc/dhcp-fwd.conf ++endef ++ ++define Package/dhcp-forwarder/install ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/etc $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(1)/usr/bin/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(1)/etc/ ++ $(INSTALL_BIN) ./files/dhcp-fwd.init $(1)/etc/init.d/dhcp-fwd ++endef ++ ++$(eval $(call BuildPackage,dhcp-forwarder)) +diff --git a/feeds/packages/net/dhcp-forwarder/files/.svn/entries b/feeds/packages/net/dhcp-forwarder/files/.svn/entries +new file mode 100644 +index 0000000..5f9e40e +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcp-forwarder/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-20T22:40:16.126409Z ++32478 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dhcp-fwd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++a71e41a504de0312b12e88ac635df93a ++2012-06-20T22:40:16.126409Z ++32478 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++232 ++ +diff --git a/feeds/packages/net/dhcp-forwarder/files/.svn/prop-base/dhcp-fwd.init.svn-base b/feeds/packages/net/dhcp-forwarder/files/.svn/prop-base/dhcp-fwd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/files/.svn/prop-base/dhcp-fwd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dhcp-forwarder/files/.svn/text-base/dhcp-fwd.init.svn-base b/feeds/packages/net/dhcp-forwarder/files/.svn/text-base/dhcp-fwd.init.svn-base +new file mode 100644 +index 0000000..b3d2375 +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/files/.svn/text-base/dhcp-fwd.init.svn-base +@@ -0,0 +1,17 @@ ++#!/bin/sh /etc/rc.common ++ ++START=50 ++ ++LOG_D=/var/log ++RUN_D=/var/run ++PID_F=$RUN_D/dhcp-fwd.pid ++ ++start() { ++ [ -d $LOG_D ] || mkdir -p $LOG_D ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ dhcp-fwd ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} +diff --git a/feeds/packages/net/dhcp-forwarder/files/dhcp-fwd.init b/feeds/packages/net/dhcp-forwarder/files/dhcp-fwd.init +new file mode 100644 +index 0000000..b3d2375 +--- /dev/null ++++ b/feeds/packages/net/dhcp-forwarder/files/dhcp-fwd.init +@@ -0,0 +1,17 @@ ++#!/bin/sh /etc/rc.common ++ ++START=50 ++ ++LOG_D=/var/log ++RUN_D=/var/run ++PID_F=$RUN_D/dhcp-fwd.pid ++ ++start() { ++ [ -d $LOG_D ] || mkdir -p $LOG_D ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ dhcp-fwd ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} +diff --git a/feeds/packages/net/dhcp/.svn/entries b/feeds/packages/net/dhcp/.svn/entries +new file mode 100644 +index 0000000..a58ca6b +--- /dev/null ++++ b/feeds/packages/net/dhcp/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-27T20:59:55.912556Z ++32897 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ +diff --git a/feeds/packages/net/dhcp/files/.svn/entries b/feeds/packages/net/dhcp/files/.svn/entries +new file mode 100644 +index 0000000..1cc1aff +--- /dev/null ++++ b/feeds/packages/net/dhcp/files/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcp/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-27T20:59:55.912556Z ++32897 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ +diff --git a/feeds/packages/net/dhcp/patches/.svn/entries b/feeds/packages/net/dhcp/patches/.svn/entries +new file mode 100644 +index 0000000..0fe5311 +--- /dev/null ++++ b/feeds/packages/net/dhcp/patches/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-27T20:59:55.912556Z ++32897 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ +diff --git a/feeds/packages/net/dhcpcd/.svn/entries b/feeds/packages/net/dhcpcd/.svn/entries +new file mode 100644 +index 0000000..640816b +--- /dev/null ++++ b/feeds/packages/net/dhcpcd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcpcd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T06:16:47.094947Z ++26068 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++1c7b5529d291833f60e289546f735feb ++2011-03-12T06:16:47.094947Z ++26068 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++915 ++ +diff --git a/feeds/packages/net/dhcpcd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dhcpcd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..572f9a3 +--- /dev/null ++++ b/feeds/packages/net/dhcpcd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=dhcpcd ++PKG_VERSION:=3.0.17 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.berlios.de/dhcpcd/ ++PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dhcpcd ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=DHCP client for automatically configuring IPv4 networking ++ URL:=http://roy.marples.name/projects/dhcpcd ++endef ++ ++define Package/dhcpcd/description ++ Simple configuration: supports executions of a script when the ++ IP address changes. ++endef ++ ++define Package/dhcpcd/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(CP) $(PKG_INSTALL_DIR)/sbin/* $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,dhcpcd)) ++ +diff --git a/feeds/packages/net/dhcpcd/Makefile b/feeds/packages/net/dhcpcd/Makefile +new file mode 100644 +index 0000000..572f9a3 +--- /dev/null ++++ b/feeds/packages/net/dhcpcd/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=dhcpcd ++PKG_VERSION:=3.0.17 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.berlios.de/dhcpcd/ ++PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dhcpcd ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=DHCP client for automatically configuring IPv4 networking ++ URL:=http://roy.marples.name/projects/dhcpcd ++endef ++ ++define Package/dhcpcd/description ++ Simple configuration: supports executions of a script when the ++ IP address changes. ++endef ++ ++define Package/dhcpcd/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(CP) $(PKG_INSTALL_DIR)/sbin/* $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,dhcpcd)) ++ +diff --git a/feeds/packages/net/dhcpcd/patches/.svn/entries b/feeds/packages/net/dhcpcd/patches/.svn/entries +new file mode 100644 +index 0000000..ea79add +--- /dev/null ++++ b/feeds/packages/net/dhcpcd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dhcpcd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-12-16T13:41:53.160837Z ++9778 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-run_dir.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8bf7bc181a885a37aa8bd86295c571d7 ++2007-12-16T13:41:53.160837Z ++9778 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++437 ++ +diff --git a/feeds/packages/net/dhcpcd/patches/.svn/text-base/001-run_dir.patch.svn-base b/feeds/packages/net/dhcpcd/patches/.svn/text-base/001-run_dir.patch.svn-base +new file mode 100644 +index 0000000..cbb26ff +--- /dev/null ++++ b/feeds/packages/net/dhcpcd/patches/.svn/text-base/001-run_dir.patch.svn-base +@@ -0,0 +1,11 @@ ++--- dhcpcd-3.0.17/pathnames.h.orig 2007-05-31 15:28:04.000000000 -0700 +++++ dhcpcd-3.0.17/pathnames.h 2007-05-31 15:28:16.000000000 -0700 ++@@ -48,7 +48,7 @@ ++ #define STATEDIR "/var" ++ #define PIDFILE STATEDIR "/run/" PACKAGE "-%s.pid" ++ ++-#define CONFIGDIR STATEDIR "/lib/" PACKAGE +++#define CONFIGDIR STATEDIR "/run/" PACKAGE ++ #define INFOFILE CONFIGDIR "/" PACKAGE "-%s.info" ++ ++ #endif +diff --git a/feeds/packages/net/dhcpcd/patches/001-run_dir.patch b/feeds/packages/net/dhcpcd/patches/001-run_dir.patch +new file mode 100644 +index 0000000..cbb26ff +--- /dev/null ++++ b/feeds/packages/net/dhcpcd/patches/001-run_dir.patch +@@ -0,0 +1,11 @@ ++--- dhcpcd-3.0.17/pathnames.h.orig 2007-05-31 15:28:04.000000000 -0700 +++++ dhcpcd-3.0.17/pathnames.h 2007-05-31 15:28:16.000000000 -0700 ++@@ -48,7 +48,7 @@ ++ #define STATEDIR "/var" ++ #define PIDFILE STATEDIR "/run/" PACKAGE "-%s.pid" ++ ++-#define CONFIGDIR STATEDIR "/lib/" PACKAGE +++#define CONFIGDIR STATEDIR "/run/" PACKAGE ++ #define INFOFILE CONFIGDIR "/" PACKAGE "-%s.info" ++ ++ #endif +diff --git a/feeds/packages/net/dircproxy/.svn/entries b/feeds/packages/net/dircproxy/.svn/entries +new file mode 100644 +index 0000000..fa21bc7 +--- /dev/null ++++ b/feeds/packages/net/dircproxy/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dircproxy ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++bacb84989bc2af2cf8e01b8bffdb8ad5 ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++823 ++ +diff --git a/feeds/packages/net/dircproxy/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/dircproxy/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8bedfa3 +--- /dev/null ++++ b/feeds/packages/net/dircproxy/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006,2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/net/dircproxy/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dircproxy/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6896637 +--- /dev/null ++++ b/feeds/packages/net/dircproxy/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# Copyright (C) 2006,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:=dircproxy ++PKG_VERSION:=1.2.0-RC1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dircproxy.googlecode.com/files/ ++PKG_MD5SUM:=4fe2e82619c7b575599bfb236adbd872 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dircproxy ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=An IRC proxy server ++ URL:=http://dircproxy.googlecode.com/ ++endef ++ ++# uses Build/Configure/Default ++ ++define Package/dircproxy/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dircproxy{,-crypt} $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dircproxy)) +diff --git a/feeds/packages/net/dircproxy/Makefile b/feeds/packages/net/dircproxy/Makefile +new file mode 100644 +index 0000000..6896637 +--- /dev/null ++++ b/feeds/packages/net/dircproxy/Makefile +@@ -0,0 +1,37 @@ ++# ++# Copyright (C) 2006,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:=dircproxy ++PKG_VERSION:=1.2.0-RC1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dircproxy.googlecode.com/files/ ++PKG_MD5SUM:=4fe2e82619c7b575599bfb236adbd872 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dircproxy ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=An IRC proxy server ++ URL:=http://dircproxy.googlecode.com/ ++endef ++ ++# uses Build/Configure/Default ++ ++define Package/dircproxy/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dircproxy{,-crypt} $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dircproxy)) +diff --git a/feeds/packages/net/ditg/.svn/entries b/feeds/packages/net/ditg/.svn/entries +new file mode 100644 +index 0000000..f4b3a20 +--- /dev/null ++++ b/feeds/packages/net/ditg/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ditg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-03T21:35:40.239752Z ++32966 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++89d5eaae53a31d7a38a1172f71e63074 ++2012-08-03T21:35:40.239752Z ++32966 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1609 ++ +diff --git a/feeds/packages/net/ditg/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ditg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4470672 +--- /dev/null ++++ b/feeds/packages/net/ditg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2010-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:=ditg ++PKG_VERSION:=2.8.0-rc1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=D-ITG-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.grid.unina.it/software/ITG/codice ++PKG_MD5SUM:=609736113de729df833ac691d1c44ead ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/D-ITG-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ditg ++ TITLE:=D-ITG (Distributed Internet Traffic Generator) ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://www.grid.unina.it/software/ITG/ ++ MAINTAINER:=Giovanni Di Stasi ++ DEPENDS:=+libpthread $(CXX_DEPENDS) ++endef ++ ++define Package/ditg/description ++ D-ITG (Distributed Internet Traffic Generator) is a platform capable ++ to produce traffic at packet level accurately replicating appropriate ++ stochastic processes for both IDT (Inter Departure Time) and PS ++ (Packet Size) random variables (exponential, uniform, cauchy, normal, ++ pareto, ...). D-ITG supports both IPv4 and IPv6 traffic generation and ++ it is capable to generate traffic at network, transport, and ++ application layer. We believe that D-ITG shows interesting properties ++ when compared to other traffic generators. ++endef ++ ++MAKE_PATH := src ++ ++MAKE_FLAGS += \ ++ CXXOPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DMULTIPORT -DARM" ++ ++define Package/ditg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/ITG{Send,Recv,Log,Dec} $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,ditg)) +diff --git a/feeds/packages/net/ditg/Makefile b/feeds/packages/net/ditg/Makefile +new file mode 100644 +index 0000000..4470672 +--- /dev/null ++++ b/feeds/packages/net/ditg/Makefile +@@ -0,0 +1,53 @@ ++# ++# Copyright (C) 2010-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:=ditg ++PKG_VERSION:=2.8.0-rc1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=D-ITG-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.grid.unina.it/software/ITG/codice ++PKG_MD5SUM:=609736113de729df833ac691d1c44ead ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/D-ITG-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ditg ++ TITLE:=D-ITG (Distributed Internet Traffic Generator) ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://www.grid.unina.it/software/ITG/ ++ MAINTAINER:=Giovanni Di Stasi ++ DEPENDS:=+libpthread $(CXX_DEPENDS) ++endef ++ ++define Package/ditg/description ++ D-ITG (Distributed Internet Traffic Generator) is a platform capable ++ to produce traffic at packet level accurately replicating appropriate ++ stochastic processes for both IDT (Inter Departure Time) and PS ++ (Packet Size) random variables (exponential, uniform, cauchy, normal, ++ pareto, ...). D-ITG supports both IPv4 and IPv6 traffic generation and ++ it is capable to generate traffic at network, transport, and ++ application layer. We believe that D-ITG shows interesting properties ++ when compared to other traffic generators. ++endef ++ ++MAKE_PATH := src ++ ++MAKE_FLAGS += \ ++ CXXOPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DMULTIPORT -DARM" ++ ++define Package/ditg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/ITG{Send,Recv,Log,Dec} $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,ditg)) +diff --git a/feeds/packages/net/djbdns/.svn/entries b/feeds/packages/net/djbdns/.svn/entries +new file mode 100644 +index 0000000..c04df77 +--- /dev/null ++++ b/feeds/packages/net/djbdns/.svn/entries +@@ -0,0 +1,136 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Changelog ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++caa6d374641330f03ecc907b1e5a50c8 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2588 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++c6bf9e85b4c7976edc6c2ff70a5299b1 ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6388 ++ ++README ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++eece48f0d6a58435ba37c2a11432bdf3 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24537 ++ +diff --git a/feeds/packages/net/djbdns/.svn/text-base/Changelog.svn-base b/feeds/packages/net/djbdns/.svn/text-base/Changelog.svn-base +new file mode 100644 +index 0000000..2fcd471 +--- /dev/null ++++ b/feeds/packages/net/djbdns/.svn/text-base/Changelog.svn-base +@@ -0,0 +1,43 @@ ++#Changelog for the djbdns port for OpenWRT ++ ++5 20090522 jhalfmoon ++enhancement - added patch: dnsroots_updated ++enhancement - added patch: tinydns_one_second ++enhancement - added patch: srv-records-and-axfrget ++enhancement - added patch: dnscache_less_chatty_log ++enhancement - added patch: tinydns_mmap_leak ++enhancement - added patch: dnscache_dpos_tcp_servfail ++enhancement - added patch: dnscache_negative_ttls ++enhancement - added patch: dnscache_sigpipe_fix ++enhancement - added patch: dnscache_big_udp_packets ++enhancement - added patch: dnscache_ignoreip2 (Note: disabled in config by default!) ++enhancement - added HIDETTL config option ++change - Corrected a typo in the axfrdns description in the Makefile. ++change - Cleaned up some lines in the Makefile ++change - dnsroots.global now gets copied from the djbdns source folder instead of from the package/files folder. ++change - The dnscache-multiple-ip patch was removed as it served no purpose ++change - Renamed a few patches to be more consistent with the other patches ++change - Updated the README file to reflect the changes ++ ++4 20090418 jhalfmoon ++bugfix - The dnscache postinst script had a bug that prevented djbdns from being compiled into a firmware image. ++bugfix - The dnscache startup script now uses /dev/urandom instead of /dev/random as a source of randomness. Using /dev/random does not work on 2.6 kernels. ++bugfix - dnscache no longer tries to use /tmp/resolv.conf.auto but /etc/resolv.conf instead. This only applies when useresolvconf==1. ++change - In menuconfig: djbdns moved from network to network/DNS ++change - Removed the dnscache postinst script to the dnscache startup script. The script configures dnscache to accept connections from certain local network adresses. ++change - The dnscache startup script was cleaned up a bit. ++change - default logging level is now info instead of notice. ++enhancement - Added option to add list of resolvers to UCI config for use in forwardonly mode. Two OpenDNS example addresses are added as a default. ++ ++3 20090409 jhalfmoon ++bugfix - The restart routines of all scripts were broken causing restart to fail ++bugfix - dnsqrx was broken, script accidentally relied on bash instead of sh ++ ++2 20090406 jhalfmoon ++bugfix - dnscache init script did not correctly handle /tmp/resolv.conf.auto ++enhancement - Addded the dnsqr command from http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/dnsqrx ++change - Default dnscache CACHESIZE was set too low, was 200KB, is now 1MB ++change - Added list of patches and made some overall adjustments to the README ++ ++1 20090404 jhalfmoon ++Initial release +diff --git a/feeds/packages/net/djbdns/.svn/text-base/Makefile.svn-base b/feeds/packages/net/djbdns/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b47450c +--- /dev/null ++++ b/feeds/packages/net/djbdns/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,209 @@ ++# ++# Copyright (C) 2007-2012 OpenWrt.org ++# Original port by FreeWRT project. ++# ++# 2007 Alexander Tsvyashchenko Adapted FreeWRT port for OpenWRT (Trac ticket 2497) ++# 2008 Some Danish guy Created a port for OpenWRT 7.09 ++# 20090403 jhalfmoon Modified and augmented existing packages to work on OpenWRT buildroot (v8.09) ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=djbdns ++PKG_VERSION:=1.05 ++PKG_RELEASE:=7 ++ ++PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz ++PKG_SOURCE_URL:=http://cr.yp.to/djbdns/ ++PKG_MD5SUM:=3147c5cd56832aa3b41955c7a51cbeb2 ++PKG_BUILD_DEPENDS:=daemontools ucspi-tcp ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/djbdns/Default ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://cr.yp.to/djbdns.html ++ SUBMENU:=IP Addresses and Names ++# SUBMENU:=djbdns ++endef ++ ++define Package/djbdns-base ++ $(call Package/djbdns/Default) ++ TITLE:=djbdns base configuration file ++endef ++ ++define Package/djbdns-dnscache ++ $(call Package/djbdns/Default) ++ TITLE:=Recursive and forwarding caching name server ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-tinydns ++ $(call Package/djbdns/Default) ++ TITLE:=Authoritative name server ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-axfrdns ++ $(call Package/djbdns/Default) ++ TITLE:=Zone transfer server ++ DEPENDS:= +djbdns-base +djbdns-tinydns +ucspi-tcp ++endef ++ ++define Package/djbdns-rbldns ++ $(call Package/djbdns/Default) ++ TITLE:=Real-time Block List name server ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-walldns ++ $(call Package/djbdns/Default) ++ TITLE:=Reverse DNS wall ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-tools ++ $(call Package/djbdns/Default) ++ TITLE:=Tools for testing and debugging DNS issues ++endef ++ ++define Package/djdbns/description ++ djbdns is a collection of Domain Name System tools. ++ It includes software for all the fundamental DNS operations: ++ * DNS server: publishing addresses of Internet hosts. ++ * DNS cache: finding addresses of Internet hosts. ++ * DNS client: talking to a DNS cache. ++ ++ Also included is a DNS client C library, several command-line ++ DNS client utilities, several DNS debugging tools. ++endef ++ ++define Package/djbdns-base/description ++ The shared config file for the djbdns daemons. ++endef ++ ++define Package/djbdns-dnscache/description ++ dnscache is a DNS cache. ++ It accepts recursive DNS queries from local clients such as web ++ browsers and mail transfer agents. It collects responses from ++ remote DNS servers. It caches the responses to save time later. ++endef ++ ++define Package/djbdns-tinydns/description ++ tinydns is a DNS server. ++ It accepts iterative DNS queries from hosts around the Internet ++ and responds with locally configured information. ++endef ++ ++define Package/djbdns-axfrdns/description ++ axfrdns is a DNS zone-transfer server. ++ It reads a zone-transfer request in DNS-over-TCP format ++ from its standard input and responds with locally configured ++ information. ++endef ++ ++define Package/djbdns-rbldns/description ++ rbldns is an IP-address-listing DNS server. ++ It accepts iterative DNS queries from hosts around the Internet asking ++ about various IP addresses. It provides responses showing whether the ++ addresses are on a locally configured list, such as RBL or DUL. ++endef ++ ++define Package/djbdns-walldns/description ++ walldns is a reverse DNS wall. ++ It accepts iterative DNS queries for in-addr.arpa domains from hosts ++ around the Internet and supplies generic responses that avoid ++ revealing local host information. ++endef ++ ++define Package/djbdns-tools/description ++ Several command-line DNS client utilities and DNS debugging tools. ++endef ++ ++define Build/Compile ++ TARGET_CC="$(TARGET_CC)" \ ++ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ ++ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ ++ TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/djbdns-base/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/djbdns.conf $(1)/etc/config/djbdns ++endef ++ ++define Package/djbdns-base/conffiles ++/etc/config/djbdns ++endef ++ ++define Package/djbdns-dnscache/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) dnscache pickdns pickdns-data $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/dnscache.init $(1)/etc/init.d/dnscache ++ $(CP) -r ./files/dnscache $(1)/etc/ ++ $(CP) $(PKG_BUILD_DIR)/dnsroots.global $(1)/etc/dnscache/ ++ $(INSTALL_DIR) $(1)/etc/dnscache/ip ++ $(INSTALL_DIR) $(1)/etc/dnscache/servers ++ $(CP) $(PKG_BUILD_DIR)/dnsroots.global $(1)/etc/dnscache/servers/@ ++endef ++ ++define Package/djbdns-tinydns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) tinydns tinydns-data tinydns-edit tinydns-get $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/tinydns.init $(1)/etc/init.d/tinydns ++ $(CP) -r ./files/tinydns $(1)/etc/ ++endef ++ ++define Package/djbdns-axfrdns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) axfrdns axfr-get $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/axfrdns.init $(1)/etc/init.d/axfrdns ++ $(CP) -r ./files/axfrdns $(1)/etc/ ++endef ++ ++define Package/djbdns-rbldns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) rbldns rbldns-data $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/rbldns.init $(1)/etc/init.d/rbldns ++ $(CP) -r ./files/rbldns $(1)/etc/ ++endef ++ ++define Package/djbdns-walldns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) walldns $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/walldns.init $(1)/etc/init.d/walldns ++endef ++ ++define Package/djbdns-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) dnsfilter dnsip dnsipq dnsmx dnsname dnsnamex dnsq \ ++ dnsqr dnstrace dnstracesort dnstxt random-ip \ ++ $(1)/usr/bin) ++ $(INSTALL_BIN) ./files/dnsroots-update $(1)/usr/bin/ ++ $(INSTALL_BIN) ./files/dnsqrx $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,djbdns-base)) ++$(eval $(call BuildPackage,djbdns-tinydns)) ++$(eval $(call BuildPackage,djbdns-dnscache)) ++$(eval $(call BuildPackage,djbdns-axfrdns)) ++$(eval $(call BuildPackage,djbdns-rbldns)) ++$(eval $(call BuildPackage,djbdns-walldns)) ++$(eval $(call BuildPackage,djbdns-tools)) ++ +diff --git a/feeds/packages/net/djbdns/.svn/text-base/README.svn-base b/feeds/packages/net/djbdns/.svn/text-base/README.svn-base +new file mode 100644 +index 0000000..a6e5921 +--- /dev/null ++++ b/feeds/packages/net/djbdns/.svn/text-base/README.svn-base +@@ -0,0 +1,319 @@ ++ ++# 20090409 jhalfmoon@milksnot.com - Don't hesitate to let me know if you decide to use it and/or what you think of it. ++ ++This is a port of djbdns for OpenWRT (>= v8.09). Features: ++ ++- works with the most current buildroot ++- makes use of the UCI configuration system ++- components are seperately packaged to minimize package footprint ++- most of the popular and necessary available patches are applied ++- documentation available (you're reading it) ++ ++The djbdns package is a set of compact, reliable and fast DNS daemons and tools. This port is based on the work done by a few other people: ++ ++- The FreeWRT project ++- Alexander Tsvyashchenko - https://dev.openwrt.org/ticket/2497 ++- Some anonymous (Danish?) person - https://dev.openwrt.org/ticket/3837 ++ ++Using the previous work as a base, time went into rewriting the Make file, adding patches, adding the config system and writing this documentation. The ucspi-tcp and daemontools packages were not touched; they work just fine in the state they were found on OpenWRT TRAC. ++ ++The following document meant to give some useful information about this package. You do not need to know all of the following to install or compile this package; it is only meant as an addition to help potential users on their way. An installation could theoretically be as simple as: "opkg install dnscache.ipk ; /etc/init.d/dnscache start". To find more about the workings of djbdns, visit: ++ ++http://cr.yp.to/djbdns.html ++ ++On the following sites you can find even more info, including text about the patches included in this package: ++ ++http://www.lifewithdjbdns.com/ ++http://www.thedjbway.org/djbdns/resources.html ++http://www.fefe.de/djbdns/ ++http://homepages.tesco.net/~J.deBoynePollard/FGA/#DNS ++http://binarios.com/miscnotes/djbdns.html ++http://web.archive.org/web/20061013054303/http://ezine.daemonnews.org/200210/ezdjbdns.html ++ ++Some info about the bugfixes: ++ ++http://www.securityfocus.com/archive/1/501294/30/0/threaded ++http://www.your.org/dnscache/ ++ ++How to build ++============ ++- copy the folders djbdns, ucspi-tcp (and optionally daemontools) to your buildroot/package directory ++- make menuconfig ++- select the packages under network/DNS/djbdns and network/ucspi-tcp (and optionally network/daemontools) ++- make ++- after compilation, the package can be found at bin/packages/ ++- now do what you normally do to install self-compiled packages on your OpenWRT machine ++ ++If you wish to tinker with the code, then here are some useful commands to run in the buildroot: ++ rm -rf build_dir//djbdns-1.05 ++ make package/cleanup ++ make package/djbdns/compile V=99 ++ make package/index ++Once you have done a "make menuconfig;make" you can use these commands to quickly rebuild only the djbdns package. ++ ++Usage pointers ++============== ++- After installation, you can make the servers start automatically on boot by running "/etc/init.d/ enable" . The script will then appear in the /etc/rc.d directory. This is standard OpenWRT functionality. ++- All djbdns parameters are stored in the UCI configuration system. Run "uci show djbdns" to see the settings. Data files are not implemented in the UCI system, so these files must be manually backed up when and if you intend to do a sysupgrade (=reflash the firmware). Those files include: dnscache dnsroot.global, dnscache @ file, tinydns data file, axfrdns tcp file, rbldns data file, each in their individual directories in /etc. ++- Each package is ready to run out-of-the-box, once installed. The default settings allow you to start playing immediately. The defaults are reasonably secure, but do not take my word for it. Verify it. Note: dnscache has two default example resolver IP addresses. The two default addresses are the OpenDNS resolvers, which might work at the moment, but this may change in the future. ++- You will most likely want to customize the settings for each seperate service you wish to use. Read the docs on the weblinks listed above for pointers on how to do so. ++- The ucspi-tcp package is only needed if you wish to install and run axfrdns. ++- The daemontools package is strictly optional. It is in no way linked to the djbdns package (yet). It is just there for you to play with. ++- Starting the init.d scripts from the command line with the environment variable DEBUG set to 1 will prevent the servers from daemonizing and show the servers's log dumped to stdout / stderr instead of /dev/null. Example: "DEBUG=1 /etc/init.d/dnscache start" ++- By default, all logging is disabled. Each daemon has a seperate option to activate logging. When logging activated the daemon logs to syslog using facility local1.info. ++- Each djbdns server requires an IP address on which to listen on. This port of djbdns allows you to define an interface on which to listen instead of an IP address. The advantage of this is that an interface can get a different IP address assigned, the djbdns stuff will not break. The dnscache server has a patch applied so that it is possible to define multiple interfaces on which to listen, separated by slashes. Example: wan/lan . ++- By default, dnscache acts as a recursive name server. If you wish to operate in forwardonly mode, then you need to set the forwardonly flag to '1'. Then you need to do either one of the following: Put the ip addresses of the name servers you wish to use as resolvers in the UCI config (djbdns.dnscache.resolver) or alternatively you can set the useresolvconf flag which will cause the dns servers assigned by dhcp to be used. That last option is a so called set-and-forget mode which will work quite well in most home environments. ++- If you want your OpenWRT machine to make use of its own dnscache, then you must make /etc/resolv.conf reflect this. One way of doin this is as follows: uci set network.wan.dns=127.0.0.1 . If you have dnscache listening on some other interface, you would naturally replace 127.0.0.1 by the address of that interface. ++- OpenWRT has several applications that can do DNS serving in one way or another (dnsmasq, Maradns, Bind). Make sure you have none of these apps running when you start running a djbdns name server because having two DNS apps listening on the same address is not something you would usually want. A patch for the dnsmasq configuration script and its config file is included with this package. The patch will allow you to configure dnsmasq to listen only on certain interfaces, instead of on all them as it does by default on OpenWRT. Alternatively, you could completely disable and / or remove dnsmasq, if you do not intend to use any of its functionality (which is serving DNS and DHCP). ++- The ignoreip patch also has a script supplied along with it, with which you can update the ignorelist. The script contains an explanation of why you might want to do this. ++- The ignoreip functionality is disabled by default. If you want to activate it, you need to set the flag 'useignore' flag to '1' in the config. You might also want to check if you are really blocking what you want to block. Be careful with this feature. Think twice before using it. ++ ++To apply the dnsmasq patch ++========================== ++NOTE: This patch has been incorporated into OpenWRT trunk per 20090409 as seen in https://dev.openwrt.org/ticket/4900 and https://dev.openwrt.org/changeset/15172. ++ ++This is a patch to allow you to use dnsmasq alongside dnscache. It will allow you to configure dnsmasq to listen only on certain interfaces, instead of on all them as it does by default on OpenWRT. It only patches the startup script and configuration file of dnsmasq, not dnsmasq itself. If you need or desire to apply the patch yourself, then there are two possible ways to go about it: ++ ++Patch the dnsmasq package source: ++- cd to svn/openwrt/branches/8.09/packages/dnsmasq/files ++- do 'patch < dnsmasq.patch ++- if all went well you can now compile the package as you nomally would ++- you can now either reinstall dnsmasq on your router or re-flash the firmware image. If you reinstall the dnsmasq package then you waste some flash memory, as dnsmasq is usually already included as a part of the firmware image. One way to reinstall the dnsmasq package is to use SSH to upload the image to the router and do: opkg update ; opgk install -force-reinstall dnsmasq.ipk . Or you could configure your OpenWRT build machine as an http server that serves OpenWRT packages and then configure opkg to use your server as an ipkg repository. This is generally a pretty good idea if you are building your own firmware and packages. ++ ++Alternatively, you can patch the dnsmasq files on the router itself: ++Look at the patch file and manually patch the files on the router. There are only four lines to modify, so it is not hard. ++ ++NOTE: The dnsmasq paramaters added by this patch are not shown on the Luci webinterface. You will manually have to configure dnsmasq. An example of how to make dnsmasq serve DNS and DHCP only on the lan: ++uci set dhcp.@dnsmasq[0].nonwildcard=1 ++uci set dhcp.@dnsmasq[0].interfaces=br-lan ++uci commit ++This will prevent dnsmasq from binding to the wildcard IP address and instead make it listen on the designated (lan) interface. You are then free to run a DNS server on, for example, the loopback and/or the wan interface. ++ ++Assorted notes ++============== ++- This port was put together with reasonable care. It is not a dirty hack, but that is ofcourse a very subjective statement. ++- It was created on and for Kamikaze 8.09 with both a 2.4 and a 2.6 kernel. It was not tested to work on older versions of OpenWRT, but it might. ++- This package will build into several packages. Most of the packages rely on the package djbdnsbase. It contains the shared config data for all daemons. It should automatically get installed along with the daemons by opkg. ++- The ucspi-tcp package is a requirement for installing axfrdns. If you don't user afrxdns, you won't need to install ucspi-tcp. ++- The daemontool package is supplied as a part of this port, but it is not needed or used by anything in the djbdns packages. It is included in case anyone feels the want or need to make use of it. ++- Among the applied patches are the latest (as of the 2nd of april 2009) notorious bug fixes for dnscache. ++- Most patches are vanilla, ie. unmodified as they can be found on the net. The only patch modified is the djbdns-1.05-slogging patch, which was merged with the server-1.05-nxdomain-logging patch. ++- The dnscache gets a patch applied to be able to listen on multiple IP addresses. Tinydns is not patched to have that functionality, although the patch for that is available on the net. ++- dnscache is also patched to deliver additional statistics in its log files, including hits/misses and what types of records were queried. These can be used to monitor and/or graph the behaviour of your dnscache server. ++- The dnscache package gets configured to listen to 127.0.0.1 and the lan subnet by default. See "ls /etc/dnscache/ip" and "uci show djbdns|grep dnscache" . ++- tinydns, axfrdns and rbldns include example data files that are installed by default. Their purpose is to ease installation and testing of the packages and to act as a guide to people who are not familiar with these applications. ++- The dnstools part of this package contains a script called dnsroots-update with which you can update the global root file. This is quite useful because IP addresses of the root servers change now and then, although not very often. I seems that few people actually bother to update the global roots file once they have installed dnscache. It is important to run the update script every now and them, or at least at installation time. Do the following to update the list: dnsroots-update > /etc/dnscache/dnsroots.global and then copy the file dnsroots.global to /etc/dnscache/server/@ . The dnstools package is quite large (400K installed) for an embedded system. What you could do instead of running the update script on the router, is to install the djbdns package on some big machine and run the script on there and then copy the output to the dnsroots file on the router. The dnsroots.global file included in this package is up to date as per the date of this writing (2nd of april 2009). ++ ++Testing the installation ++======================== ++The following may ease any debugging you might wish/need to do: ++- Set the syslog buffer to something like 64K or more and make it log to IP address localhost (reboot to activate the changes): ++ uci set system.@system[0].log_ip=127.0.0.1 ++ uci set system.@system[0].log_size=64 ++ uci commit ++- Use "logread|less" to browse through the buffered syslog output. ++- For realtime log monitoring: Install netcat and make it listen to the syslog output: ++ opkg install netcat ++ netcat -ulp 514 ++ ++This paragraph gives a few brief pointers on how to test your installation. The general idea is as follows: Log in to the OpenWRT machine using two seperate SSH sessions or a single session and then use 'screen' to gain multiple sessions. In the first session you have to start the daemon you wish to test. In the second session you run the diagnostic commands. In the following examples, for each daemon and each diagnostic tool, I have supplied the commandline and the expected, approximate output. ++ ++NOTE1: Make sure no other DNS servers are running. Check with "netstat -an|grep 53" and/or do a "killall dnsmasq" just to be sure. ++NOTE2: dnscache requires an active internet connection it to work ++NOTE3: In the following examples, the servers were running on IP address 10.1.1.2 ++NOTE4: Most of these tests require the dnstools package to be installed ++ ++-dnscache ++session1 "DEBUG=1 /etc/init.d/dnscache start" ++ Starting Caching nameserver: dnscachelistening on 0a010102 ++ starting ++ ++session2 "DNSCACHEIP=$yourwanip dnsqr a example.com" (note: you do no have to modify /etc/resolv.conf to use this command) ++ 1 example.com: ++ 45 bytes, 1+1+0+0 records, response, noerror ++ query: 1 example.com ++ answer: example.com 172800 A 208.77.188.166 ++session2 "dnsip example.com" (note: /etc/resolv.conf must point to the address on which dnscache is listening) ++ 208.77.188.166 ++session2 "nslookup example.com" (note: /etc/resolv.conf must point to the address on which dnscache is listening) ++ Server: 10.1.1.2 ++ Address 1: 10.1.1.2 ++ Name: example.com ++ Address 1: 208.77.188.166 www.example.com ++ ++-tinydns ++session1 "DEBUG=1 /etc/init.d/tinydns start" ++ Starting Authoritative nameserver: tinydnsstarting tinydns ++ 0a010102:4eee:fdd8 + 0001 example.net ++ stats 1 1 0 0 0 0 0 ++session2 "dnsq a example.net $yourwanip" ++ 1 example.net: ++ 79 bytes, 1+0+1+0 records, response, authoritative, noerror ++ query: 1 example.net ++ authority: example.net 2560 SOA ns.example.net hostmaster.example.net 1238703484 16384 2048 1048576 2560 ++ ++-axfrdns ++session1 "DEBUG=1 /etc/init.d/axfrdns start" ++ Starting Zone transfer name server: tcpservertcpserver: status: 0/10 ++ tcpserver: status: 1/10 ++ tcpserver: pid 1140 from 10.1.1.2 ++ tcpserver: ok 1140 0:10.1.1.2:53 :10.1.1.2::1034 ++ 0a010102:040a:0000 0006 example.net ++ tcpserver: end 1140 status 0 ++ tcpserver: status: 0/10 ++session2 "tcpclient -RHl0 $yourwanip 53 axfr-get example.net /tmp/zone /tmp/zone.tmp" ++ The file /tmp/zone should now contain the example.net zone in tinydns-data format. ++ ++-rbldns ++session1 "DEBUG=1 /etc/init.d/rbldns start" ++ Starting Reverse DNS wall: rbldnsstarting rbldns ++ 0a010102:881d:01ca + 0010 8.4.2.1.test ++ stats 1 1 0 0 0 0 0 ++ 0a010102:674a:e70f N 0010 9.4.2.1.test ++session2 "dnsq txt 8.4.2.1.test $yourwanip" ++ 16 8.4.2.1.test: ++ 59 bytes, 1+1+0+0 records, response, authoritative, noerror ++ query: 16 8.4.2.1.test ++ answer: 8.4.2.1.test 2048 16 \020www.somesite.com ++session2 "dnsq txt 9.4.2.1.test $yourwanip" ++ 16 9.4.2.1.test: ++ 30 bytes, 1+0+0+0 records, response, authoritative, nxdomain ++ query: 16 9.4.2.1.test ++ ++-walldns ++session1 "DEBUG=1 /etc/init.d/walldns start" ++ Starting Reverse DNS wall: walldnsstarting walldns ++ 0a010102:7b76:3d97 + 0001 4.3.2.1.in-addr.arpa ++ stats 1 1 0 0 0 0 0 ++session2 "dnsq a 4.3.2.1.in-addr.arpa $yourwanip" ++ 1 4.3.2.1.in-addr.arpa: ++ 54 bytes, 1+1+0+0 records, response, authoritative, noerror ++ query: 1 4.3.2.1.in-addr.arpa ++ answer: 4.3.2.1.in-addr.arpa 655360 A 1.2.3.4 ++ ++axfrdns defaults ++================ ++axfrdns is run using tcpserver from the ucspi-tcp package. The following parameters are used to start the tcpserver daemon (which runs as root BTW): ++-D: Never delay sending data; enable TCP_NODELAY. ++-R: Do not attempt to obtain $TCPREMOTEINFO from the remote host. To avoid loops, you must use this option for servers on TCP ports 53 and 113. ++-H: Do not look up the remote host name in DNS; remove the environment variable $TCPREMOTEHOST. To avoid loops, you must use this option for servers on TCP port 53. ++-l localname: Do not look up the local host name in DNS; use localname for the environment variable $TCPLOCALHOST. A common choice for localname is 0. To avoid loops, you must use this option for servers on TCP port 53. ++-c n (=40): Do not handle more than n simultaneous connections. If there are n simultaneous copies of prog running, defer acceptance of a new connection until one copy finishes. n must be a positive integer. Default: 40. ++-b n (=10): Allow a backlog of approximately n TCP SYNs. On some systems, n is silently limited to 5. On systems supporting SYN cookies, the backlog is irrelevant. ++ ++In debug mode and when logging is activated, the following parameter is also active: ++-v: Verbose. Print error messages and status messages. ++ ++Applied patches ++=============== ++crosscompile.patch ++https://dev.openwrt.org/ticket/2497 ++Patch to make djbdns compile correctly for OpenWRT. I understand that the original patch comes from FreeWRT and was adapted for OpenWRT by Alexander Tsvyashchenko. ++ ++dnsroots-update.patch ++Update the dnsroots.global file to be current. ++ ++srv-records-and-axfrget.patch ++http://sol.truespace.ca/Files/djbdns/srv.patch ++Adds native support for srv records (not really necessary) and also patches axfr-get to decompose SRV and PTR records and write them out in native format, rather than opaque. This last thing is needed to fix a possible problem with tinydns-data. ++ ++dnscache_less_chatty_log ++http://sol.truespace.ca/Files/djbdns/log.patch ++Makes dnscache log "stat" entries no more than once per 5 seconds. ++ ++tinydns_mmap_leak ++http://marc.info/?l=djbdns&m=116399640808774&w=2 ++This fixes the following: In the original code if cdb_read encountered an error it returned an error code and the calling function exited without closing the cdb data file resulting in an fd leak, eventually leading to a 'too many files open' error. ++ ++dnscache_big_udp_packets ++http://marc.info/?l=djbdns&m=122368590802063&w=2 ++Patch to support oversized UDP packets up to 4096 bytes in length, while still correctly truncating responses over 512 bytes when sending them to stub resolvers. ++ ++dnscache_dpos_tcp_servfail ++http://marc.info/?l=djbdns&m=119998909915985&w=3 ++Fixes broken tcp dns queries in certain situations. For example: A vanilla 1.05 will fail on "dnstxt aol.com aol.com". ++ ++dnscache-cache-negatives ++http://sol.truespace.ca/Files/djbdns/nxdomain.patch ++Add support for caching of unsuccessful lookup results. ++ ++tinydns_one_second ++http://www.tinydns.org/one-second.patch ++Causes tinydns to keep its mmap() of the data.cdb file open for at most one second, instead of the default one hundred queries. This improves throughput on high traffic machines. ++ ++dnscache-cachestats.patch ++http://romana.now.ie/#djbdns-cachestats ++This patch modifies the dnscache program to keep a counter of cache hits and cache misses. Two new fields are added to the stats output line: the fifth number is the number of cache hits; the sixth number is the number of cache misses. ++ ++compiler-temporary-filename.patch ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#compiler-temporary-filename ++A bit of a nit-picky patch that adjusts the names of generated temorary files to be more 'correct'. A bit silly really. ++ ++dnscache-multiple-ip.patch ++http://danp.net/djbdns/patches.html ++When applied, dnscache will accept a /-delimited list of IP address in $IP and bind to each in turn. NOTE: This patch is only really useful on embedded systems with very limited memory. On big systems, ther are other ways to achieve listening on multiple IP adresses. You can read more on that over here: http://www.faqts.com/knowledge_base/view.phtml/aid/9644/fid/699 ++ ++dnsnamex-extra-command.patch ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#dnsnamex ++Not really a patch, but an extra command. dnsnamex prints all of the domain names that the IP address supplied to it maps to, on a single line. ++ ++dnscache-cname-handling.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/#DNS ++Fixes mis-handling of client-side aliases ++ ++dnscache-strict-forwardonly.patch ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#dnscache-strict-forwardonly ++This patch modifies the behaviour of dnscache such that "forwardonly" mode is fully enforced. ++ ++dnscacheip-space-separator.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#dnscacheip-separator-character ++Patch to change the separator in ${DNSCACHEIP} to the space character ++ ++tinydns-data-semantic-error.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#tinydns-data-semantic-error ++Fixes the fact that stock tinydns-data doesn't handle semantic errors in its input ++ ++tinydns-alias-chain-truncation.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#tinydns-alias-chain-truncation ++Fixes truncation of alias chains by tinydns and axfrdns ++ ++dnscache-slogging.patch ++http://www.ohse.de/uwe/patches.html ++Patch to enable statistics logging of queried resource records. ++This patch is merged with the patch server-1.05-nxdomain-logging.patch that logs nxdomain queries. ++http://danp.net/djbdns/ ++ ++dnsfilter-replace.patch ++http://www.ohse.de/uwe/patches.html ++This patch adds an option to the dnsfilter program (-r). It's use makes dnsfilter simply replace the IP address by the host name if possible. If the IP address cannot be determined for whatever reason then it will be left alone. -r stands for replace. ++ ++dnscache_sigpipe_fix ++http://marc.info/?l=djbdns&m=104804013229536&w=2 ++This patch tells dnscache to ignore the SIGPIPE signal. ++ ++ignoreip2.patch ++http://tinydns.org/djbdns-1.05-ignoreip2.patch ++This patch change djbdns's dnscache so that it will ignore thex IP addresses given in the ignoreip file. This patch was made to boycott Verisign, amongst others, who decided to start supplying replies to non-existant and wildcard domains. NOTE: This feature is disabled in the config file by default. Be careful with this one. ++ ++bugfix-dnscache-dempsky-poison.patch ++http://www.securityfocus.com/archive/1/501294/30/0/threaded ++Patch to fix a potential cache-poisoning attack. This bug only affects domains that serve DNS content using tinydns and axfrdns (only for DNS queries over TCP; clients do not need AXFR permissions) from djbdns 1.05 and allow untrusted users to include arbitrary records. ++ ++bugfix-dnscache-merge-outgoing-requests.patch ++http://www.your.org/dnscache/ ++This patch prevents a class of poisoning attack by combining identical requests from clients into one outgoing query. Without this patch, an attacker can coerce dnscache into launching hundreds of identical queries at once, making a specific type of attack several orders of magnitude easier. ++ ++bugfix-dnscache-cache-soa-records.patch ++http://www.your.org/dnscache/ ++This patch allows dnscache to store the responses of "SOA" type queries in its cache. SOA responses are the only type of response unconditionally uncached. dnscache uses its internal cache to prevent certain classes of poisoning attack. Attackers may choose to send floods of SOA requests to bypass these protections. ++ ++dnrqx ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/dnsqrx ++Not really a patch, but a handy script to make dnsq query a given name server instead of the one in /etc/resolv.conf. ++ ++Possible future enhancements to this package ++============================================ ++- add a Luci webinterface ++- add scripts to make the DNS daemons run using daemontools to increase the reliability of the services ++- ipv6 support ++ +diff --git a/feeds/packages/net/djbdns/Changelog b/feeds/packages/net/djbdns/Changelog +new file mode 100644 +index 0000000..2fcd471 +--- /dev/null ++++ b/feeds/packages/net/djbdns/Changelog +@@ -0,0 +1,43 @@ ++#Changelog for the djbdns port for OpenWRT ++ ++5 20090522 jhalfmoon ++enhancement - added patch: dnsroots_updated ++enhancement - added patch: tinydns_one_second ++enhancement - added patch: srv-records-and-axfrget ++enhancement - added patch: dnscache_less_chatty_log ++enhancement - added patch: tinydns_mmap_leak ++enhancement - added patch: dnscache_dpos_tcp_servfail ++enhancement - added patch: dnscache_negative_ttls ++enhancement - added patch: dnscache_sigpipe_fix ++enhancement - added patch: dnscache_big_udp_packets ++enhancement - added patch: dnscache_ignoreip2 (Note: disabled in config by default!) ++enhancement - added HIDETTL config option ++change - Corrected a typo in the axfrdns description in the Makefile. ++change - Cleaned up some lines in the Makefile ++change - dnsroots.global now gets copied from the djbdns source folder instead of from the package/files folder. ++change - The dnscache-multiple-ip patch was removed as it served no purpose ++change - Renamed a few patches to be more consistent with the other patches ++change - Updated the README file to reflect the changes ++ ++4 20090418 jhalfmoon ++bugfix - The dnscache postinst script had a bug that prevented djbdns from being compiled into a firmware image. ++bugfix - The dnscache startup script now uses /dev/urandom instead of /dev/random as a source of randomness. Using /dev/random does not work on 2.6 kernels. ++bugfix - dnscache no longer tries to use /tmp/resolv.conf.auto but /etc/resolv.conf instead. This only applies when useresolvconf==1. ++change - In menuconfig: djbdns moved from network to network/DNS ++change - Removed the dnscache postinst script to the dnscache startup script. The script configures dnscache to accept connections from certain local network adresses. ++change - The dnscache startup script was cleaned up a bit. ++change - default logging level is now info instead of notice. ++enhancement - Added option to add list of resolvers to UCI config for use in forwardonly mode. Two OpenDNS example addresses are added as a default. ++ ++3 20090409 jhalfmoon ++bugfix - The restart routines of all scripts were broken causing restart to fail ++bugfix - dnsqrx was broken, script accidentally relied on bash instead of sh ++ ++2 20090406 jhalfmoon ++bugfix - dnscache init script did not correctly handle /tmp/resolv.conf.auto ++enhancement - Addded the dnsqr command from http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/dnsqrx ++change - Default dnscache CACHESIZE was set too low, was 200KB, is now 1MB ++change - Added list of patches and made some overall adjustments to the README ++ ++1 20090404 jhalfmoon ++Initial release +diff --git a/feeds/packages/net/djbdns/Makefile b/feeds/packages/net/djbdns/Makefile +new file mode 100644 +index 0000000..b47450c +--- /dev/null ++++ b/feeds/packages/net/djbdns/Makefile +@@ -0,0 +1,209 @@ ++# ++# Copyright (C) 2007-2012 OpenWrt.org ++# Original port by FreeWRT project. ++# ++# 2007 Alexander Tsvyashchenko Adapted FreeWRT port for OpenWRT (Trac ticket 2497) ++# 2008 Some Danish guy Created a port for OpenWRT 7.09 ++# 20090403 jhalfmoon Modified and augmented existing packages to work on OpenWRT buildroot (v8.09) ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=djbdns ++PKG_VERSION:=1.05 ++PKG_RELEASE:=7 ++ ++PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz ++PKG_SOURCE_URL:=http://cr.yp.to/djbdns/ ++PKG_MD5SUM:=3147c5cd56832aa3b41955c7a51cbeb2 ++PKG_BUILD_DEPENDS:=daemontools ucspi-tcp ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/djbdns/Default ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://cr.yp.to/djbdns.html ++ SUBMENU:=IP Addresses and Names ++# SUBMENU:=djbdns ++endef ++ ++define Package/djbdns-base ++ $(call Package/djbdns/Default) ++ TITLE:=djbdns base configuration file ++endef ++ ++define Package/djbdns-dnscache ++ $(call Package/djbdns/Default) ++ TITLE:=Recursive and forwarding caching name server ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-tinydns ++ $(call Package/djbdns/Default) ++ TITLE:=Authoritative name server ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-axfrdns ++ $(call Package/djbdns/Default) ++ TITLE:=Zone transfer server ++ DEPENDS:= +djbdns-base +djbdns-tinydns +ucspi-tcp ++endef ++ ++define Package/djbdns-rbldns ++ $(call Package/djbdns/Default) ++ TITLE:=Real-time Block List name server ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-walldns ++ $(call Package/djbdns/Default) ++ TITLE:=Reverse DNS wall ++ DEPENDS:= +djbdns-base ++endef ++ ++define Package/djbdns-tools ++ $(call Package/djbdns/Default) ++ TITLE:=Tools for testing and debugging DNS issues ++endef ++ ++define Package/djdbns/description ++ djbdns is a collection of Domain Name System tools. ++ It includes software for all the fundamental DNS operations: ++ * DNS server: publishing addresses of Internet hosts. ++ * DNS cache: finding addresses of Internet hosts. ++ * DNS client: talking to a DNS cache. ++ ++ Also included is a DNS client C library, several command-line ++ DNS client utilities, several DNS debugging tools. ++endef ++ ++define Package/djbdns-base/description ++ The shared config file for the djbdns daemons. ++endef ++ ++define Package/djbdns-dnscache/description ++ dnscache is a DNS cache. ++ It accepts recursive DNS queries from local clients such as web ++ browsers and mail transfer agents. It collects responses from ++ remote DNS servers. It caches the responses to save time later. ++endef ++ ++define Package/djbdns-tinydns/description ++ tinydns is a DNS server. ++ It accepts iterative DNS queries from hosts around the Internet ++ and responds with locally configured information. ++endef ++ ++define Package/djbdns-axfrdns/description ++ axfrdns is a DNS zone-transfer server. ++ It reads a zone-transfer request in DNS-over-TCP format ++ from its standard input and responds with locally configured ++ information. ++endef ++ ++define Package/djbdns-rbldns/description ++ rbldns is an IP-address-listing DNS server. ++ It accepts iterative DNS queries from hosts around the Internet asking ++ about various IP addresses. It provides responses showing whether the ++ addresses are on a locally configured list, such as RBL or DUL. ++endef ++ ++define Package/djbdns-walldns/description ++ walldns is a reverse DNS wall. ++ It accepts iterative DNS queries for in-addr.arpa domains from hosts ++ around the Internet and supplies generic responses that avoid ++ revealing local host information. ++endef ++ ++define Package/djbdns-tools/description ++ Several command-line DNS client utilities and DNS debugging tools. ++endef ++ ++define Build/Compile ++ TARGET_CC="$(TARGET_CC)" \ ++ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ ++ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ ++ TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/djbdns-base/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/djbdns.conf $(1)/etc/config/djbdns ++endef ++ ++define Package/djbdns-base/conffiles ++/etc/config/djbdns ++endef ++ ++define Package/djbdns-dnscache/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) dnscache pickdns pickdns-data $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/dnscache.init $(1)/etc/init.d/dnscache ++ $(CP) -r ./files/dnscache $(1)/etc/ ++ $(CP) $(PKG_BUILD_DIR)/dnsroots.global $(1)/etc/dnscache/ ++ $(INSTALL_DIR) $(1)/etc/dnscache/ip ++ $(INSTALL_DIR) $(1)/etc/dnscache/servers ++ $(CP) $(PKG_BUILD_DIR)/dnsroots.global $(1)/etc/dnscache/servers/@ ++endef ++ ++define Package/djbdns-tinydns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) tinydns tinydns-data tinydns-edit tinydns-get $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/tinydns.init $(1)/etc/init.d/tinydns ++ $(CP) -r ./files/tinydns $(1)/etc/ ++endef ++ ++define Package/djbdns-axfrdns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) axfrdns axfr-get $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/axfrdns.init $(1)/etc/init.d/axfrdns ++ $(CP) -r ./files/axfrdns $(1)/etc/ ++endef ++ ++define Package/djbdns-rbldns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) rbldns rbldns-data $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/rbldns.init $(1)/etc/init.d/rbldns ++ $(CP) -r ./files/rbldns $(1)/etc/ ++endef ++ ++define Package/djbdns-walldns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) walldns $(1)/usr/bin) ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/walldns.init $(1)/etc/init.d/walldns ++endef ++ ++define Package/djbdns-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ (cd $(PKG_BUILD_DIR); \ ++ $(INSTALL_BIN) dnsfilter dnsip dnsipq dnsmx dnsname dnsnamex dnsq \ ++ dnsqr dnstrace dnstracesort dnstxt random-ip \ ++ $(1)/usr/bin) ++ $(INSTALL_BIN) ./files/dnsroots-update $(1)/usr/bin/ ++ $(INSTALL_BIN) ./files/dnsqrx $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,djbdns-base)) ++$(eval $(call BuildPackage,djbdns-tinydns)) ++$(eval $(call BuildPackage,djbdns-dnscache)) ++$(eval $(call BuildPackage,djbdns-axfrdns)) ++$(eval $(call BuildPackage,djbdns-rbldns)) ++$(eval $(call BuildPackage,djbdns-walldns)) ++$(eval $(call BuildPackage,djbdns-tools)) ++ +diff --git a/feeds/packages/net/djbdns/README b/feeds/packages/net/djbdns/README +new file mode 100644 +index 0000000..a6e5921 +--- /dev/null ++++ b/feeds/packages/net/djbdns/README +@@ -0,0 +1,319 @@ ++ ++# 20090409 jhalfmoon@milksnot.com - Don't hesitate to let me know if you decide to use it and/or what you think of it. ++ ++This is a port of djbdns for OpenWRT (>= v8.09). Features: ++ ++- works with the most current buildroot ++- makes use of the UCI configuration system ++- components are seperately packaged to minimize package footprint ++- most of the popular and necessary available patches are applied ++- documentation available (you're reading it) ++ ++The djbdns package is a set of compact, reliable and fast DNS daemons and tools. This port is based on the work done by a few other people: ++ ++- The FreeWRT project ++- Alexander Tsvyashchenko - https://dev.openwrt.org/ticket/2497 ++- Some anonymous (Danish?) person - https://dev.openwrt.org/ticket/3837 ++ ++Using the previous work as a base, time went into rewriting the Make file, adding patches, adding the config system and writing this documentation. The ucspi-tcp and daemontools packages were not touched; they work just fine in the state they were found on OpenWRT TRAC. ++ ++The following document meant to give some useful information about this package. You do not need to know all of the following to install or compile this package; it is only meant as an addition to help potential users on their way. An installation could theoretically be as simple as: "opkg install dnscache.ipk ; /etc/init.d/dnscache start". To find more about the workings of djbdns, visit: ++ ++http://cr.yp.to/djbdns.html ++ ++On the following sites you can find even more info, including text about the patches included in this package: ++ ++http://www.lifewithdjbdns.com/ ++http://www.thedjbway.org/djbdns/resources.html ++http://www.fefe.de/djbdns/ ++http://homepages.tesco.net/~J.deBoynePollard/FGA/#DNS ++http://binarios.com/miscnotes/djbdns.html ++http://web.archive.org/web/20061013054303/http://ezine.daemonnews.org/200210/ezdjbdns.html ++ ++Some info about the bugfixes: ++ ++http://www.securityfocus.com/archive/1/501294/30/0/threaded ++http://www.your.org/dnscache/ ++ ++How to build ++============ ++- copy the folders djbdns, ucspi-tcp (and optionally daemontools) to your buildroot/package directory ++- make menuconfig ++- select the packages under network/DNS/djbdns and network/ucspi-tcp (and optionally network/daemontools) ++- make ++- after compilation, the package can be found at bin/packages/ ++- now do what you normally do to install self-compiled packages on your OpenWRT machine ++ ++If you wish to tinker with the code, then here are some useful commands to run in the buildroot: ++ rm -rf build_dir//djbdns-1.05 ++ make package/cleanup ++ make package/djbdns/compile V=99 ++ make package/index ++Once you have done a "make menuconfig;make" you can use these commands to quickly rebuild only the djbdns package. ++ ++Usage pointers ++============== ++- After installation, you can make the servers start automatically on boot by running "/etc/init.d/ enable" . The script will then appear in the /etc/rc.d directory. This is standard OpenWRT functionality. ++- All djbdns parameters are stored in the UCI configuration system. Run "uci show djbdns" to see the settings. Data files are not implemented in the UCI system, so these files must be manually backed up when and if you intend to do a sysupgrade (=reflash the firmware). Those files include: dnscache dnsroot.global, dnscache @ file, tinydns data file, axfrdns tcp file, rbldns data file, each in their individual directories in /etc. ++- Each package is ready to run out-of-the-box, once installed. The default settings allow you to start playing immediately. The defaults are reasonably secure, but do not take my word for it. Verify it. Note: dnscache has two default example resolver IP addresses. The two default addresses are the OpenDNS resolvers, which might work at the moment, but this may change in the future. ++- You will most likely want to customize the settings for each seperate service you wish to use. Read the docs on the weblinks listed above for pointers on how to do so. ++- The ucspi-tcp package is only needed if you wish to install and run axfrdns. ++- The daemontools package is strictly optional. It is in no way linked to the djbdns package (yet). It is just there for you to play with. ++- Starting the init.d scripts from the command line with the environment variable DEBUG set to 1 will prevent the servers from daemonizing and show the servers's log dumped to stdout / stderr instead of /dev/null. Example: "DEBUG=1 /etc/init.d/dnscache start" ++- By default, all logging is disabled. Each daemon has a seperate option to activate logging. When logging activated the daemon logs to syslog using facility local1.info. ++- Each djbdns server requires an IP address on which to listen on. This port of djbdns allows you to define an interface on which to listen instead of an IP address. The advantage of this is that an interface can get a different IP address assigned, the djbdns stuff will not break. The dnscache server has a patch applied so that it is possible to define multiple interfaces on which to listen, separated by slashes. Example: wan/lan . ++- By default, dnscache acts as a recursive name server. If you wish to operate in forwardonly mode, then you need to set the forwardonly flag to '1'. Then you need to do either one of the following: Put the ip addresses of the name servers you wish to use as resolvers in the UCI config (djbdns.dnscache.resolver) or alternatively you can set the useresolvconf flag which will cause the dns servers assigned by dhcp to be used. That last option is a so called set-and-forget mode which will work quite well in most home environments. ++- If you want your OpenWRT machine to make use of its own dnscache, then you must make /etc/resolv.conf reflect this. One way of doin this is as follows: uci set network.wan.dns=127.0.0.1 . If you have dnscache listening on some other interface, you would naturally replace 127.0.0.1 by the address of that interface. ++- OpenWRT has several applications that can do DNS serving in one way or another (dnsmasq, Maradns, Bind). Make sure you have none of these apps running when you start running a djbdns name server because having two DNS apps listening on the same address is not something you would usually want. A patch for the dnsmasq configuration script and its config file is included with this package. The patch will allow you to configure dnsmasq to listen only on certain interfaces, instead of on all them as it does by default on OpenWRT. Alternatively, you could completely disable and / or remove dnsmasq, if you do not intend to use any of its functionality (which is serving DNS and DHCP). ++- The ignoreip patch also has a script supplied along with it, with which you can update the ignorelist. The script contains an explanation of why you might want to do this. ++- The ignoreip functionality is disabled by default. If you want to activate it, you need to set the flag 'useignore' flag to '1' in the config. You might also want to check if you are really blocking what you want to block. Be careful with this feature. Think twice before using it. ++ ++To apply the dnsmasq patch ++========================== ++NOTE: This patch has been incorporated into OpenWRT trunk per 20090409 as seen in https://dev.openwrt.org/ticket/4900 and https://dev.openwrt.org/changeset/15172. ++ ++This is a patch to allow you to use dnsmasq alongside dnscache. It will allow you to configure dnsmasq to listen only on certain interfaces, instead of on all them as it does by default on OpenWRT. It only patches the startup script and configuration file of dnsmasq, not dnsmasq itself. If you need or desire to apply the patch yourself, then there are two possible ways to go about it: ++ ++Patch the dnsmasq package source: ++- cd to svn/openwrt/branches/8.09/packages/dnsmasq/files ++- do 'patch < dnsmasq.patch ++- if all went well you can now compile the package as you nomally would ++- you can now either reinstall dnsmasq on your router or re-flash the firmware image. If you reinstall the dnsmasq package then you waste some flash memory, as dnsmasq is usually already included as a part of the firmware image. One way to reinstall the dnsmasq package is to use SSH to upload the image to the router and do: opkg update ; opgk install -force-reinstall dnsmasq.ipk . Or you could configure your OpenWRT build machine as an http server that serves OpenWRT packages and then configure opkg to use your server as an ipkg repository. This is generally a pretty good idea if you are building your own firmware and packages. ++ ++Alternatively, you can patch the dnsmasq files on the router itself: ++Look at the patch file and manually patch the files on the router. There are only four lines to modify, so it is not hard. ++ ++NOTE: The dnsmasq paramaters added by this patch are not shown on the Luci webinterface. You will manually have to configure dnsmasq. An example of how to make dnsmasq serve DNS and DHCP only on the lan: ++uci set dhcp.@dnsmasq[0].nonwildcard=1 ++uci set dhcp.@dnsmasq[0].interfaces=br-lan ++uci commit ++This will prevent dnsmasq from binding to the wildcard IP address and instead make it listen on the designated (lan) interface. You are then free to run a DNS server on, for example, the loopback and/or the wan interface. ++ ++Assorted notes ++============== ++- This port was put together with reasonable care. It is not a dirty hack, but that is ofcourse a very subjective statement. ++- It was created on and for Kamikaze 8.09 with both a 2.4 and a 2.6 kernel. It was not tested to work on older versions of OpenWRT, but it might. ++- This package will build into several packages. Most of the packages rely on the package djbdnsbase. It contains the shared config data for all daemons. It should automatically get installed along with the daemons by opkg. ++- The ucspi-tcp package is a requirement for installing axfrdns. If you don't user afrxdns, you won't need to install ucspi-tcp. ++- The daemontool package is supplied as a part of this port, but it is not needed or used by anything in the djbdns packages. It is included in case anyone feels the want or need to make use of it. ++- Among the applied patches are the latest (as of the 2nd of april 2009) notorious bug fixes for dnscache. ++- Most patches are vanilla, ie. unmodified as they can be found on the net. The only patch modified is the djbdns-1.05-slogging patch, which was merged with the server-1.05-nxdomain-logging patch. ++- The dnscache gets a patch applied to be able to listen on multiple IP addresses. Tinydns is not patched to have that functionality, although the patch for that is available on the net. ++- dnscache is also patched to deliver additional statistics in its log files, including hits/misses and what types of records were queried. These can be used to monitor and/or graph the behaviour of your dnscache server. ++- The dnscache package gets configured to listen to 127.0.0.1 and the lan subnet by default. See "ls /etc/dnscache/ip" and "uci show djbdns|grep dnscache" . ++- tinydns, axfrdns and rbldns include example data files that are installed by default. Their purpose is to ease installation and testing of the packages and to act as a guide to people who are not familiar with these applications. ++- The dnstools part of this package contains a script called dnsroots-update with which you can update the global root file. This is quite useful because IP addresses of the root servers change now and then, although not very often. I seems that few people actually bother to update the global roots file once they have installed dnscache. It is important to run the update script every now and them, or at least at installation time. Do the following to update the list: dnsroots-update > /etc/dnscache/dnsroots.global and then copy the file dnsroots.global to /etc/dnscache/server/@ . The dnstools package is quite large (400K installed) for an embedded system. What you could do instead of running the update script on the router, is to install the djbdns package on some big machine and run the script on there and then copy the output to the dnsroots file on the router. The dnsroots.global file included in this package is up to date as per the date of this writing (2nd of april 2009). ++ ++Testing the installation ++======================== ++The following may ease any debugging you might wish/need to do: ++- Set the syslog buffer to something like 64K or more and make it log to IP address localhost (reboot to activate the changes): ++ uci set system.@system[0].log_ip=127.0.0.1 ++ uci set system.@system[0].log_size=64 ++ uci commit ++- Use "logread|less" to browse through the buffered syslog output. ++- For realtime log monitoring: Install netcat and make it listen to the syslog output: ++ opkg install netcat ++ netcat -ulp 514 ++ ++This paragraph gives a few brief pointers on how to test your installation. The general idea is as follows: Log in to the OpenWRT machine using two seperate SSH sessions or a single session and then use 'screen' to gain multiple sessions. In the first session you have to start the daemon you wish to test. In the second session you run the diagnostic commands. In the following examples, for each daemon and each diagnostic tool, I have supplied the commandline and the expected, approximate output. ++ ++NOTE1: Make sure no other DNS servers are running. Check with "netstat -an|grep 53" and/or do a "killall dnsmasq" just to be sure. ++NOTE2: dnscache requires an active internet connection it to work ++NOTE3: In the following examples, the servers were running on IP address 10.1.1.2 ++NOTE4: Most of these tests require the dnstools package to be installed ++ ++-dnscache ++session1 "DEBUG=1 /etc/init.d/dnscache start" ++ Starting Caching nameserver: dnscachelistening on 0a010102 ++ starting ++ ++session2 "DNSCACHEIP=$yourwanip dnsqr a example.com" (note: you do no have to modify /etc/resolv.conf to use this command) ++ 1 example.com: ++ 45 bytes, 1+1+0+0 records, response, noerror ++ query: 1 example.com ++ answer: example.com 172800 A 208.77.188.166 ++session2 "dnsip example.com" (note: /etc/resolv.conf must point to the address on which dnscache is listening) ++ 208.77.188.166 ++session2 "nslookup example.com" (note: /etc/resolv.conf must point to the address on which dnscache is listening) ++ Server: 10.1.1.2 ++ Address 1: 10.1.1.2 ++ Name: example.com ++ Address 1: 208.77.188.166 www.example.com ++ ++-tinydns ++session1 "DEBUG=1 /etc/init.d/tinydns start" ++ Starting Authoritative nameserver: tinydnsstarting tinydns ++ 0a010102:4eee:fdd8 + 0001 example.net ++ stats 1 1 0 0 0 0 0 ++session2 "dnsq a example.net $yourwanip" ++ 1 example.net: ++ 79 bytes, 1+0+1+0 records, response, authoritative, noerror ++ query: 1 example.net ++ authority: example.net 2560 SOA ns.example.net hostmaster.example.net 1238703484 16384 2048 1048576 2560 ++ ++-axfrdns ++session1 "DEBUG=1 /etc/init.d/axfrdns start" ++ Starting Zone transfer name server: tcpservertcpserver: status: 0/10 ++ tcpserver: status: 1/10 ++ tcpserver: pid 1140 from 10.1.1.2 ++ tcpserver: ok 1140 0:10.1.1.2:53 :10.1.1.2::1034 ++ 0a010102:040a:0000 0006 example.net ++ tcpserver: end 1140 status 0 ++ tcpserver: status: 0/10 ++session2 "tcpclient -RHl0 $yourwanip 53 axfr-get example.net /tmp/zone /tmp/zone.tmp" ++ The file /tmp/zone should now contain the example.net zone in tinydns-data format. ++ ++-rbldns ++session1 "DEBUG=1 /etc/init.d/rbldns start" ++ Starting Reverse DNS wall: rbldnsstarting rbldns ++ 0a010102:881d:01ca + 0010 8.4.2.1.test ++ stats 1 1 0 0 0 0 0 ++ 0a010102:674a:e70f N 0010 9.4.2.1.test ++session2 "dnsq txt 8.4.2.1.test $yourwanip" ++ 16 8.4.2.1.test: ++ 59 bytes, 1+1+0+0 records, response, authoritative, noerror ++ query: 16 8.4.2.1.test ++ answer: 8.4.2.1.test 2048 16 \020www.somesite.com ++session2 "dnsq txt 9.4.2.1.test $yourwanip" ++ 16 9.4.2.1.test: ++ 30 bytes, 1+0+0+0 records, response, authoritative, nxdomain ++ query: 16 9.4.2.1.test ++ ++-walldns ++session1 "DEBUG=1 /etc/init.d/walldns start" ++ Starting Reverse DNS wall: walldnsstarting walldns ++ 0a010102:7b76:3d97 + 0001 4.3.2.1.in-addr.arpa ++ stats 1 1 0 0 0 0 0 ++session2 "dnsq a 4.3.2.1.in-addr.arpa $yourwanip" ++ 1 4.3.2.1.in-addr.arpa: ++ 54 bytes, 1+1+0+0 records, response, authoritative, noerror ++ query: 1 4.3.2.1.in-addr.arpa ++ answer: 4.3.2.1.in-addr.arpa 655360 A 1.2.3.4 ++ ++axfrdns defaults ++================ ++axfrdns is run using tcpserver from the ucspi-tcp package. The following parameters are used to start the tcpserver daemon (which runs as root BTW): ++-D: Never delay sending data; enable TCP_NODELAY. ++-R: Do not attempt to obtain $TCPREMOTEINFO from the remote host. To avoid loops, you must use this option for servers on TCP ports 53 and 113. ++-H: Do not look up the remote host name in DNS; remove the environment variable $TCPREMOTEHOST. To avoid loops, you must use this option for servers on TCP port 53. ++-l localname: Do not look up the local host name in DNS; use localname for the environment variable $TCPLOCALHOST. A common choice for localname is 0. To avoid loops, you must use this option for servers on TCP port 53. ++-c n (=40): Do not handle more than n simultaneous connections. If there are n simultaneous copies of prog running, defer acceptance of a new connection until one copy finishes. n must be a positive integer. Default: 40. ++-b n (=10): Allow a backlog of approximately n TCP SYNs. On some systems, n is silently limited to 5. On systems supporting SYN cookies, the backlog is irrelevant. ++ ++In debug mode and when logging is activated, the following parameter is also active: ++-v: Verbose. Print error messages and status messages. ++ ++Applied patches ++=============== ++crosscompile.patch ++https://dev.openwrt.org/ticket/2497 ++Patch to make djbdns compile correctly for OpenWRT. I understand that the original patch comes from FreeWRT and was adapted for OpenWRT by Alexander Tsvyashchenko. ++ ++dnsroots-update.patch ++Update the dnsroots.global file to be current. ++ ++srv-records-and-axfrget.patch ++http://sol.truespace.ca/Files/djbdns/srv.patch ++Adds native support for srv records (not really necessary) and also patches axfr-get to decompose SRV and PTR records and write them out in native format, rather than opaque. This last thing is needed to fix a possible problem with tinydns-data. ++ ++dnscache_less_chatty_log ++http://sol.truespace.ca/Files/djbdns/log.patch ++Makes dnscache log "stat" entries no more than once per 5 seconds. ++ ++tinydns_mmap_leak ++http://marc.info/?l=djbdns&m=116399640808774&w=2 ++This fixes the following: In the original code if cdb_read encountered an error it returned an error code and the calling function exited without closing the cdb data file resulting in an fd leak, eventually leading to a 'too many files open' error. ++ ++dnscache_big_udp_packets ++http://marc.info/?l=djbdns&m=122368590802063&w=2 ++Patch to support oversized UDP packets up to 4096 bytes in length, while still correctly truncating responses over 512 bytes when sending them to stub resolvers. ++ ++dnscache_dpos_tcp_servfail ++http://marc.info/?l=djbdns&m=119998909915985&w=3 ++Fixes broken tcp dns queries in certain situations. For example: A vanilla 1.05 will fail on "dnstxt aol.com aol.com". ++ ++dnscache-cache-negatives ++http://sol.truespace.ca/Files/djbdns/nxdomain.patch ++Add support for caching of unsuccessful lookup results. ++ ++tinydns_one_second ++http://www.tinydns.org/one-second.patch ++Causes tinydns to keep its mmap() of the data.cdb file open for at most one second, instead of the default one hundred queries. This improves throughput on high traffic machines. ++ ++dnscache-cachestats.patch ++http://romana.now.ie/#djbdns-cachestats ++This patch modifies the dnscache program to keep a counter of cache hits and cache misses. Two new fields are added to the stats output line: the fifth number is the number of cache hits; the sixth number is the number of cache misses. ++ ++compiler-temporary-filename.patch ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#compiler-temporary-filename ++A bit of a nit-picky patch that adjusts the names of generated temorary files to be more 'correct'. A bit silly really. ++ ++dnscache-multiple-ip.patch ++http://danp.net/djbdns/patches.html ++When applied, dnscache will accept a /-delimited list of IP address in $IP and bind to each in turn. NOTE: This patch is only really useful on embedded systems with very limited memory. On big systems, ther are other ways to achieve listening on multiple IP adresses. You can read more on that over here: http://www.faqts.com/knowledge_base/view.phtml/aid/9644/fid/699 ++ ++dnsnamex-extra-command.patch ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#dnsnamex ++Not really a patch, but an extra command. dnsnamex prints all of the domain names that the IP address supplied to it maps to, on a single line. ++ ++dnscache-cname-handling.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/#DNS ++Fixes mis-handling of client-side aliases ++ ++dnscache-strict-forwardonly.patch ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/#dnscache-strict-forwardonly ++This patch modifies the behaviour of dnscache such that "forwardonly" mode is fully enforced. ++ ++dnscacheip-space-separator.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#dnscacheip-separator-character ++Patch to change the separator in ${DNSCACHEIP} to the space character ++ ++tinydns-data-semantic-error.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#tinydns-data-semantic-error ++Fixes the fact that stock tinydns-data doesn't handle semantic errors in its input ++ ++tinydns-alias-chain-truncation.patch ++http://homepages.tesco.net/~J.deBoynePollard/FGA/djbdns-problems.html#tinydns-alias-chain-truncation ++Fixes truncation of alias chains by tinydns and axfrdns ++ ++dnscache-slogging.patch ++http://www.ohse.de/uwe/patches.html ++Patch to enable statistics logging of queried resource records. ++This patch is merged with the patch server-1.05-nxdomain-logging.patch that logs nxdomain queries. ++http://danp.net/djbdns/ ++ ++dnsfilter-replace.patch ++http://www.ohse.de/uwe/patches.html ++This patch adds an option to the dnsfilter program (-r). It's use makes dnsfilter simply replace the IP address by the host name if possible. If the IP address cannot be determined for whatever reason then it will be left alone. -r stands for replace. ++ ++dnscache_sigpipe_fix ++http://marc.info/?l=djbdns&m=104804013229536&w=2 ++This patch tells dnscache to ignore the SIGPIPE signal. ++ ++ignoreip2.patch ++http://tinydns.org/djbdns-1.05-ignoreip2.patch ++This patch change djbdns's dnscache so that it will ignore thex IP addresses given in the ignoreip file. This patch was made to boycott Verisign, amongst others, who decided to start supplying replies to non-existant and wildcard domains. NOTE: This feature is disabled in the config file by default. Be careful with this one. ++ ++bugfix-dnscache-dempsky-poison.patch ++http://www.securityfocus.com/archive/1/501294/30/0/threaded ++Patch to fix a potential cache-poisoning attack. This bug only affects domains that serve DNS content using tinydns and axfrdns (only for DNS queries over TCP; clients do not need AXFR permissions) from djbdns 1.05 and allow untrusted users to include arbitrary records. ++ ++bugfix-dnscache-merge-outgoing-requests.patch ++http://www.your.org/dnscache/ ++This patch prevents a class of poisoning attack by combining identical requests from clients into one outgoing query. Without this patch, an attacker can coerce dnscache into launching hundreds of identical queries at once, making a specific type of attack several orders of magnitude easier. ++ ++bugfix-dnscache-cache-soa-records.patch ++http://www.your.org/dnscache/ ++This patch allows dnscache to store the responses of "SOA" type queries in its cache. SOA responses are the only type of response unconditionally uncached. dnscache uses its internal cache to prevent certain classes of poisoning attack. Attackers may choose to send floods of SOA requests to bypass these protections. ++ ++dnrqx ++http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns/dnsqrx ++Not really a patch, but a handy script to make dnsq query a given name server instead of the one in /etc/resolv.conf. ++ ++Possible future enhancements to this package ++============================================ ++- add a Luci webinterface ++- add scripts to make the DNS daemons run using daemontools to increase the reliability of the services ++- ipv6 support ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/entries b/feeds/packages/net/djbdns/files/.svn/entries +new file mode 100644 +index 0000000..93e7218 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/entries +@@ -0,0 +1,312 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dnsqrx ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++45e095d54ac5954cd9b97ebdb23f4e51 ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++470 ++ ++rbldns ++dir ++ ++axfrdns ++dir ++ ++rbldns.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0b2b70f2b66ec66b471a4d6a25bdd5e1 ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1425 ++ ++walldns.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++59ebddca4a986ba2c005eaef929643e6 ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1259 ++ ++axfrdns.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++6fdbdecf7213a8c9a1f23cc51fe917e3 ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1784 ++ ++dnscache ++dir ++ ++tinydns ++dir ++ ++djbdns.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2fc3baa4d358de09f92934a4f2b864d9 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++875 ++ ++dnscache.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d88f78dd8e8add92843e7d3ed188e421 ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3851 ++ ++tinydns.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++63e9828603979803ca18f936dcdad4ef ++2012-05-29T00:54:02.236028Z ++31965 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1320 ++ ++dnsroots-update ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++792e868259e681247675511d5859f9dd ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++364 ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/axfrdns.init.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/axfrdns.init.svn-base +new file mode 100644 +index 0000000..a40f93a +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/axfrdns.init.svn-base +@@ -0,0 +1,73 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=47 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/tcpserver ++NAME=tcpserver ++DESC="Zone transfer name server" ++ ++APP=/usr/bin/axfrdns ++ROOT=/tmp/tinydns ++ ++if [ ! -e /etc/tinydns/data ] ; then ++ echo Error: Dependency tinydns not found. ++ exit 111 ++fi ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ mkdir -p $ROOT ++ ln -sf /etc/tinydns/data $ROOT/data ++ cd $ROOT ++ tinydns-data ++ chown -R $UID:$GID $ROOT ++ tcprules $ROOT/tcp.cdb $ROOT/tcp.cdb.tmp < /etc/axfrdns/tcp ++ config_foreach get_userids global ++ config_foreach start_daemon axfrdns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++ config_get AXFR "$cfg" allowedzones ++# Unset AXFR if it is empty ++ [ -z $AXFR ] && export -n AXFR ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" || return 1 ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON -vDRHl0 -c40 -b10 -x $ROOT/tcp.cdb -- $IP 53 $APP ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON -vDRHl0 -c40 -b10 -x $ROOT/tcp.cdb -- $IP 53 $APP 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON -DRHl0 -c40 -b10 -x $ROOT/tcp.cdb -- $IP 53 $APP > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/djbdns.conf.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/djbdns.conf.svn-base +new file mode 100644 +index 0000000..9541142 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/djbdns.conf.svn-base +@@ -0,0 +1,41 @@ ++ ++config 'global' ++ option 'runasuser' 'nobody' ++ option 'runasgroup' 'nobody' ++ ++config 'dnscache' ++ option 'interface' 'wan' ++ option 'interfacesend' 'wan' ++ option 'defaultallowif' 'lan wan' ++ option 'cachesize' '1000000' ++ option 'hidettl' '0' ++ option 'forwardonly' '1' ++ option 'useresolvconf' '1' ++ list 'resolver' '208.67.222.222' ++ list 'resolver' '208.67.220.220' ++ option 'useignore' '0' ++ list 'ignoreip' '203.119.4.28' ++ list 'ignoreip' '212.181.91.6' ++ list 'ignoreip' '62.4.64.119' ++ list 'ignoreip' '64.70.19.33' ++ list 'ignoreip' '69.25.75.72' ++ option 'logging' '0' ++ ++config 'tinydns' ++ option 'interface' 'wan' ++ option 'logging' '0' ++ ++config 'axfrdns' ++ option 'interface' 'wan' ++ option 'allowedzones' '' ++ option 'logging' '0' ++ ++config 'rbldns' ++ option 'interface' 'wan' ++ option 'base' 'test' ++ option 'logging' '0' ++ ++config 'walldns' ++ option 'interface' 'wan' ++ option 'logging' '0' ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/dnscache.init.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/dnscache.init.svn-base +new file mode 100644 +index 0000000..97f8ee9 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/dnscache.init.svn-base +@@ -0,0 +1,122 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++ ++# Preferably start dnscache after udhcpd/dnsmasq, to be sure /etc/resolv.conf is set correctly. dnsmasq is at S60, so dnscache is put at S65 as seen below. If /etc/resolv.conf is not used, then dnscache may be started at S47, just after the firewall has been set up. ++START=65 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/dnscache ++NAME=dnscache ++DESC="Caching name server" ++ ++ROOT="/tmp/dnscache" ++resolvfile="/etc/resolv.conf" ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ mkdir -p $ROOT ++ cp -fa /etc/dnscache/* $ROOT ++ rm -f $ROOT/resolvers ++ rm -f $ROOT/ignoreip ++ chown -R $UID:$GID $ROOT ++ config_foreach start_dnscache dnscache ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++append_server() { ++ echo $1 >> $ROOT/resolvers ++} ++ ++append_ignore() { ++ echo $1 >> $ROOT/ignoreip ++} ++ ++start_dnscache() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get useresolvconf "$cfg" useresolvconf ++ config_get iface "$cfg" interface ++ config_get ifacesend "$cfg" interfacesend ++ config_get defaultallowif "$cfg" defaultallowif ++ config_get CACHESIZE "$cfg" cachesize ++ config_get FORWARDONLY "$cfg" forwardonly ++ config_get HIDETTL "$cfg" hidettl ++ config_list_foreach "$cfg" "resolver" append_server ++ config_get useignore "$cfg" useignore ++ if [ "$useignore" == "1" ] ; then ++ config_list_foreach "$cfg" "ignoreip" append_ignore ++ fi ++# Add some interface network addresses to list of allowed IP addresses (assumes /24 networks) ++ . /lib/functions/network.sh ++ if [ -n "$defaultallowif" ] ; then ++ for myinterface in `echo $defaultallowif`; do ++ network_get_ipaddr addr $myinterface || continue ++ # the next line strips the last octet from the ip address ++ addr=`echo $addr|sed 's/.[0-9]\+$//'` ++ touch $ROOT/ip/$addr ++ echo Adding $ROOT/ip/$addr ++ done ++ fi ++# Translate listen interface names to IP addresses ++ network_get_ipaddr IP "$iface" ++# Translate send interface name to an IP address ++ network_get_ipaddr IPSEND "$ifacesend" ++# Unset HIDETTL if equal to 0 ++ if [ "$HIDETTL" == "0" ] ; then ++ export -n HIDETTL ++ fi ++# If forwardingonly set then activate list of resolvers ++ if [ "$FORWARDONLY" == "0" ] ; then ++ # Unset FORWARDONLY if equal to '0' ++ export -n FORWARDONLY ++ else ++# Use either fixed list of dnsservers or resolv.conf data ++ if [ "$useresolvconf" == "1" ] ; then ++ if [ -s "$resolvfile" ] ; then ++ cat $resolvfile|grep nameserver|sed 's/nameserver //g' > $ROOT/resolvers ++ else ++ echo Error: $resolvfile does not exist. ++ exit 1 ++ fi ++ fi ++ if [ ! "`cat $ROOT/resolvers|wc -L`" == "0" ] ; then ++ cp -f $ROOT/resolvers $ROOT/servers/@ > /dev/null 2>&1 ++ else ++ echo Error: No resolvers are defined. ++ exit 1 ++ fi ++ fi ++ export IP ++ export ROOT ++# dnscache likes to receive a 128 byte random seed ++ dd if=/dev/urandom of=$ROOT/randomseed bs=128 count=1 > /dev/null 2>&1 ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON < /$ROOT/randomseed ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 < /$ROOT/randomseed | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 < /$ROOT/randomseed & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/dnsqrx.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/dnsqrx.svn-base +new file mode 100644 +index 0000000..3202e94 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/dnsqrx.svn-base +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# (c) Copyright 2003-2003 Jonathan de Boyne Pollard. All rights reserved. "Moral" rights asserted. ++# Permission is hereby granted to distribute this script unmodified. ++# This script requires the patch that changes the ${DNSCACHEIP} separator, which can be found at . ++t=${1?Missing type} ++n=${2?Missing name} ++s=${3?Missing server} ++i=`dnsip $s` ++DNSCACHEIP=${i:?Bad server name} dnsqr $t $n +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/dnsroots-update.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/dnsroots-update.svn-base +new file mode 100644 +index 0000000..29ffc16 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/dnsroots-update.svn-base +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++# This is a script that outputs the current list of active DNS ++# root servers. To run, it requires an active internet connection ++# and a working resolving DNS server. It also requires that the ++# djbdns dnstools be installed, or at least the tools dnsqr and ++# dnsip. ++ ++dnsqr ns .|grep answer|cut -f 5 -d " "|sort|while read server; do dnsip $server; done +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/rbldns.init.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/rbldns.init.svn-base +new file mode 100644 +index 0000000..dfe98f4 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/rbldns.init.svn-base +@@ -0,0 +1,67 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=46 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/rbldns ++NAME=rbldns ++DESC="Reverse DNS wall" ++ ++ROOT=/tmp/rbldns ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ rm -rf $ROOT ++ mkdir -p $ROOT ++ ln -fs /etc/rbldns/data $ROOT/data ++ cd $ROOT ++ rbldns-data ++ chown -R $UID:$GID $ROOT ++ config_foreach start_daemon rbldns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++ config_get BASE "$cfg" base ++# Unset BASE if it is empty ++ [ -z $BASE ] && export -n BASE ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/tinydns.init.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/tinydns.init.svn-base +new file mode 100644 +index 0000000..bff119d +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/tinydns.init.svn-base +@@ -0,0 +1,63 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=46 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/tinydns ++NAME=tinydns ++DESC="Authoritative nameserver" ++ ++ROOT=/tmp/tinydns ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ mkdir -p $ROOT ++ ln -sf /etc/tinydns/data $ROOT/data ++ cd $ROOT ++ tinydns-data ++ chown -R $UID:$GID $ROOT ++ config_foreach start_daemon tinydns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/.svn/text-base/walldns.init.svn-base b/feeds/packages/net/djbdns/files/.svn/text-base/walldns.init.svn-base +new file mode 100644 +index 0000000..9d4f773 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/.svn/text-base/walldns.init.svn-base +@@ -0,0 +1,61 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=46 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/walldns ++NAME=walldns ++DESC="Reverse DNS wall" ++ ++ROOT=/tmp/walldns ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ rm -rf $ROOT ++ mkdir -p $ROOT ++ chown -R $UID:$GID $ROOT ++ config_foreach start_daemon walldns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/axfrdns.init b/feeds/packages/net/djbdns/files/axfrdns.init +new file mode 100644 +index 0000000..a40f93a +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/axfrdns.init +@@ -0,0 +1,73 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=47 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/tcpserver ++NAME=tcpserver ++DESC="Zone transfer name server" ++ ++APP=/usr/bin/axfrdns ++ROOT=/tmp/tinydns ++ ++if [ ! -e /etc/tinydns/data ] ; then ++ echo Error: Dependency tinydns not found. ++ exit 111 ++fi ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ mkdir -p $ROOT ++ ln -sf /etc/tinydns/data $ROOT/data ++ cd $ROOT ++ tinydns-data ++ chown -R $UID:$GID $ROOT ++ tcprules $ROOT/tcp.cdb $ROOT/tcp.cdb.tmp < /etc/axfrdns/tcp ++ config_foreach get_userids global ++ config_foreach start_daemon axfrdns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++ config_get AXFR "$cfg" allowedzones ++# Unset AXFR if it is empty ++ [ -z $AXFR ] && export -n AXFR ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" || return 1 ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON -vDRHl0 -c40 -b10 -x $ROOT/tcp.cdb -- $IP 53 $APP ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON -vDRHl0 -c40 -b10 -x $ROOT/tcp.cdb -- $IP 53 $APP 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON -DRHl0 -c40 -b10 -x $ROOT/tcp.cdb -- $IP 53 $APP > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/axfrdns/.svn/entries b/feeds/packages/net/djbdns/files/axfrdns/.svn/entries +new file mode 100644 +index 0000000..6853020 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/axfrdns/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/files/axfrdns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++tcp ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++33dd3bf1413cc86e67ff8560b3bf94e4 ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++87 ++ +diff --git a/feeds/packages/net/djbdns/files/axfrdns/.svn/text-base/tcp.svn-base b/feeds/packages/net/djbdns/files/axfrdns/.svn/text-base/tcp.svn-base +new file mode 100644 +index 0000000..1dc715b +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/axfrdns/.svn/text-base/tcp.svn-base +@@ -0,0 +1,5 @@ ++#Example rules for djb's tcpserver ++127.0.0.:allow ++10.1.1.:allow ++192.168.1.:allow ++:deny +diff --git a/feeds/packages/net/djbdns/files/axfrdns/tcp b/feeds/packages/net/djbdns/files/axfrdns/tcp +new file mode 100644 +index 0000000..1dc715b +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/axfrdns/tcp +@@ -0,0 +1,5 @@ ++#Example rules for djb's tcpserver ++127.0.0.:allow ++10.1.1.:allow ++192.168.1.:allow ++:deny +diff --git a/feeds/packages/net/djbdns/files/djbdns.conf b/feeds/packages/net/djbdns/files/djbdns.conf +new file mode 100644 +index 0000000..9541142 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/djbdns.conf +@@ -0,0 +1,41 @@ ++ ++config 'global' ++ option 'runasuser' 'nobody' ++ option 'runasgroup' 'nobody' ++ ++config 'dnscache' ++ option 'interface' 'wan' ++ option 'interfacesend' 'wan' ++ option 'defaultallowif' 'lan wan' ++ option 'cachesize' '1000000' ++ option 'hidettl' '0' ++ option 'forwardonly' '1' ++ option 'useresolvconf' '1' ++ list 'resolver' '208.67.222.222' ++ list 'resolver' '208.67.220.220' ++ option 'useignore' '0' ++ list 'ignoreip' '203.119.4.28' ++ list 'ignoreip' '212.181.91.6' ++ list 'ignoreip' '62.4.64.119' ++ list 'ignoreip' '64.70.19.33' ++ list 'ignoreip' '69.25.75.72' ++ option 'logging' '0' ++ ++config 'tinydns' ++ option 'interface' 'wan' ++ option 'logging' '0' ++ ++config 'axfrdns' ++ option 'interface' 'wan' ++ option 'allowedzones' '' ++ option 'logging' '0' ++ ++config 'rbldns' ++ option 'interface' 'wan' ++ option 'base' 'test' ++ option 'logging' '0' ++ ++config 'walldns' ++ option 'interface' 'wan' ++ option 'logging' '0' ++ +diff --git a/feeds/packages/net/djbdns/files/dnscache.init b/feeds/packages/net/djbdns/files/dnscache.init +new file mode 100644 +index 0000000..97f8ee9 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnscache.init +@@ -0,0 +1,122 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++ ++# Preferably start dnscache after udhcpd/dnsmasq, to be sure /etc/resolv.conf is set correctly. dnsmasq is at S60, so dnscache is put at S65 as seen below. If /etc/resolv.conf is not used, then dnscache may be started at S47, just after the firewall has been set up. ++START=65 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/dnscache ++NAME=dnscache ++DESC="Caching name server" ++ ++ROOT="/tmp/dnscache" ++resolvfile="/etc/resolv.conf" ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ mkdir -p $ROOT ++ cp -fa /etc/dnscache/* $ROOT ++ rm -f $ROOT/resolvers ++ rm -f $ROOT/ignoreip ++ chown -R $UID:$GID $ROOT ++ config_foreach start_dnscache dnscache ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++append_server() { ++ echo $1 >> $ROOT/resolvers ++} ++ ++append_ignore() { ++ echo $1 >> $ROOT/ignoreip ++} ++ ++start_dnscache() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get useresolvconf "$cfg" useresolvconf ++ config_get iface "$cfg" interface ++ config_get ifacesend "$cfg" interfacesend ++ config_get defaultallowif "$cfg" defaultallowif ++ config_get CACHESIZE "$cfg" cachesize ++ config_get FORWARDONLY "$cfg" forwardonly ++ config_get HIDETTL "$cfg" hidettl ++ config_list_foreach "$cfg" "resolver" append_server ++ config_get useignore "$cfg" useignore ++ if [ "$useignore" == "1" ] ; then ++ config_list_foreach "$cfg" "ignoreip" append_ignore ++ fi ++# Add some interface network addresses to list of allowed IP addresses (assumes /24 networks) ++ . /lib/functions/network.sh ++ if [ -n "$defaultallowif" ] ; then ++ for myinterface in `echo $defaultallowif`; do ++ network_get_ipaddr addr $myinterface || continue ++ # the next line strips the last octet from the ip address ++ addr=`echo $addr|sed 's/.[0-9]\+$//'` ++ touch $ROOT/ip/$addr ++ echo Adding $ROOT/ip/$addr ++ done ++ fi ++# Translate listen interface names to IP addresses ++ network_get_ipaddr IP "$iface" ++# Translate send interface name to an IP address ++ network_get_ipaddr IPSEND "$ifacesend" ++# Unset HIDETTL if equal to 0 ++ if [ "$HIDETTL" == "0" ] ; then ++ export -n HIDETTL ++ fi ++# If forwardingonly set then activate list of resolvers ++ if [ "$FORWARDONLY" == "0" ] ; then ++ # Unset FORWARDONLY if equal to '0' ++ export -n FORWARDONLY ++ else ++# Use either fixed list of dnsservers or resolv.conf data ++ if [ "$useresolvconf" == "1" ] ; then ++ if [ -s "$resolvfile" ] ; then ++ cat $resolvfile|grep nameserver|sed 's/nameserver //g' > $ROOT/resolvers ++ else ++ echo Error: $resolvfile does not exist. ++ exit 1 ++ fi ++ fi ++ if [ ! "`cat $ROOT/resolvers|wc -L`" == "0" ] ; then ++ cp -f $ROOT/resolvers $ROOT/servers/@ > /dev/null 2>&1 ++ else ++ echo Error: No resolvers are defined. ++ exit 1 ++ fi ++ fi ++ export IP ++ export ROOT ++# dnscache likes to receive a 128 byte random seed ++ dd if=/dev/urandom of=$ROOT/randomseed bs=128 count=1 > /dev/null 2>&1 ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON < /$ROOT/randomseed ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 < /$ROOT/randomseed | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 < /$ROOT/randomseed & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/dnscache/.svn/entries b/feeds/packages/net/djbdns/files/dnscache/.svn/entries +new file mode 100644 +index 0000000..629ac55 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnscache/.svn/entries +@@ -0,0 +1,99 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/files/dnscache ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++servers ++dir ++ ++dnsroots.global ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ ++ignoreip-update ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0299861e4f7cb061567e88d71b56304d ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2966 ++ +diff --git a/feeds/packages/net/djbdns/files/dnscache/.svn/text-base/dnsroots.global.svn-base b/feeds/packages/net/djbdns/files/dnscache/.svn/text-base/dnsroots.global.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/net/djbdns/files/dnscache/.svn/text-base/ignoreip-update.svn-base b/feeds/packages/net/djbdns/files/dnscache/.svn/text-base/ignoreip-update.svn-base +new file mode 100644 +index 0000000..98a2c38 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnscache/.svn/text-base/ignoreip-update.svn-base +@@ -0,0 +1,95 @@ ++#!/bin/sh ++# ++# update-ignoreip version 0.1 ++# Written by J.P. Larocque, , OpenPGP 0x0c14cdda ++# This software is in the public domain. ++# ++# This script is intended for djbdns users that have applied Russell ++# Nelson's patch to circumvent wildcard A records in TLDs: ++# ++# http://tinydns.org/djbdns-1.05-ignoreip2.patch ++# ++# This script will try the wildcard name for each TLD in the ++# 'stupid_tlds' variable (eg, '*.com', '*.cx', etc.). For those ++# addresses that resolve, they get added to your dnscache ++# 'root/ignoreip' file, and dnscache is restarted. ++# ++# Run this script from your dnscache directory. This script depends ++# on a proper PATH. Old 'root/ignoreips' entries are kept (and dups ++# removed), so you can add this program to a cron job to keep ahead ++# of new bogus redirection addresses added by Verisign and other TLD ++# operators. ++# ++# Adding this script to a cron job was its intended purpose, but ++# please don't do so without understanding how it works and what could ++# happen if it breaks. ++# ++# The latest version of this program can be found at the URL: ++# http://ely.ath.cx/~piranha/software/ignoreip-update/ ++# This program has been signed with my public key. Its fingerprint is: ++# 810B A0AC A7F7 2899 46D2 F2F6 3E7D 5279 0C14 CDDA ++# The detached signature can be found at the URL: ++# http://ely.ath.cx/~piranha/software/ignoreip-update/ignoreip-update-0.1.asc ++# ++# Changelog: ++# version 0.1 (2003/Sep/17) ++# Initially written and released. ++ ++stupid_tlds='ac cc com cx museum net nu ph sh tm ws' ++ignoreip='root/ignoreip' ++ ++set -e ++ ++me="`basename "$0"`" ++ ++if [ ! -d 'root' ]; then ++ echo "$me: run me from the dnscache directory" >&2 ++ exit 1 ++fi ++ ++# I originally implemented this with random names, then realized all ++# the current $stupid_tlds answer to "*.$stupid_tld" just like any ++# other random name. This code may be useful in the future, if an ++# arms race of sorts develops. (Sigh.) ++ ++if which md5sum > /dev/null 2>&1; then ++ hash_prog=md5sum ++elif which md5 > /dev/null 2>&1; then ++ hash_prog=md5 ++else ++ echo "$me: can't find a suitable hash program" >&2 ++ exit 1 ++fi ++ ++[ "$1" = '-v' ] && verbose=1 || verbose='' ++ ++temp1="`mktemp "ignoreip-update-$$-1-XXXXXX"`" ++temp2="`mktemp "ignoreip-update-$$-2-XXXXXX"`" ++trap 'rm -f "$temp1" "$temp2"' EXIT ++ ++## Generate random name ++#rand="`dd if=/dev/urandom bs=16 count=1 2> /dev/null | "$hash_prog"`" ++ ++# Do lookups on random addresses; break into one addres/line; remove ++# empty lines ++for stupid_tld in $stupid_tlds; do ++ dnsip "$rand.$stupid_tld" ++ #dnsip "*.$stupid_tld" ++done | xargs -n 1 echo | grep '.' > "$temp1" ++ ++# Abort if there were no new bogus addresses ++[ ! -s "$temp1" ] && exit ++ ++# Remove duplicates (from old list and, eg, .sh/.tm) ++touch "$ignoreip" ++sort "$ignoreip" "$temp1" | uniq > "$temp2" ++ ++if [ "$verbose" ]; then ++ diff -u "$ignoreip" "$temp2" || true ++fi ++ ++# Update list and restart dnscache ++chmod 644 "$temp2" ++mv "$temp2" "$ignoreip" ++#svc -t . ++ +diff --git a/feeds/packages/net/djbdns/files/dnscache/dnsroots.global b/feeds/packages/net/djbdns/files/dnscache/dnsroots.global +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/net/djbdns/files/dnscache/ignoreip-update b/feeds/packages/net/djbdns/files/dnscache/ignoreip-update +new file mode 100644 +index 0000000..98a2c38 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnscache/ignoreip-update +@@ -0,0 +1,95 @@ ++#!/bin/sh ++# ++# update-ignoreip version 0.1 ++# Written by J.P. Larocque, , OpenPGP 0x0c14cdda ++# This software is in the public domain. ++# ++# This script is intended for djbdns users that have applied Russell ++# Nelson's patch to circumvent wildcard A records in TLDs: ++# ++# http://tinydns.org/djbdns-1.05-ignoreip2.patch ++# ++# This script will try the wildcard name for each TLD in the ++# 'stupid_tlds' variable (eg, '*.com', '*.cx', etc.). For those ++# addresses that resolve, they get added to your dnscache ++# 'root/ignoreip' file, and dnscache is restarted. ++# ++# Run this script from your dnscache directory. This script depends ++# on a proper PATH. Old 'root/ignoreips' entries are kept (and dups ++# removed), so you can add this program to a cron job to keep ahead ++# of new bogus redirection addresses added by Verisign and other TLD ++# operators. ++# ++# Adding this script to a cron job was its intended purpose, but ++# please don't do so without understanding how it works and what could ++# happen if it breaks. ++# ++# The latest version of this program can be found at the URL: ++# http://ely.ath.cx/~piranha/software/ignoreip-update/ ++# This program has been signed with my public key. Its fingerprint is: ++# 810B A0AC A7F7 2899 46D2 F2F6 3E7D 5279 0C14 CDDA ++# The detached signature can be found at the URL: ++# http://ely.ath.cx/~piranha/software/ignoreip-update/ignoreip-update-0.1.asc ++# ++# Changelog: ++# version 0.1 (2003/Sep/17) ++# Initially written and released. ++ ++stupid_tlds='ac cc com cx museum net nu ph sh tm ws' ++ignoreip='root/ignoreip' ++ ++set -e ++ ++me="`basename "$0"`" ++ ++if [ ! -d 'root' ]; then ++ echo "$me: run me from the dnscache directory" >&2 ++ exit 1 ++fi ++ ++# I originally implemented this with random names, then realized all ++# the current $stupid_tlds answer to "*.$stupid_tld" just like any ++# other random name. This code may be useful in the future, if an ++# arms race of sorts develops. (Sigh.) ++ ++if which md5sum > /dev/null 2>&1; then ++ hash_prog=md5sum ++elif which md5 > /dev/null 2>&1; then ++ hash_prog=md5 ++else ++ echo "$me: can't find a suitable hash program" >&2 ++ exit 1 ++fi ++ ++[ "$1" = '-v' ] && verbose=1 || verbose='' ++ ++temp1="`mktemp "ignoreip-update-$$-1-XXXXXX"`" ++temp2="`mktemp "ignoreip-update-$$-2-XXXXXX"`" ++trap 'rm -f "$temp1" "$temp2"' EXIT ++ ++## Generate random name ++#rand="`dd if=/dev/urandom bs=16 count=1 2> /dev/null | "$hash_prog"`" ++ ++# Do lookups on random addresses; break into one addres/line; remove ++# empty lines ++for stupid_tld in $stupid_tlds; do ++ dnsip "$rand.$stupid_tld" ++ #dnsip "*.$stupid_tld" ++done | xargs -n 1 echo | grep '.' > "$temp1" ++ ++# Abort if there were no new bogus addresses ++[ ! -s "$temp1" ] && exit ++ ++# Remove duplicates (from old list and, eg, .sh/.tm) ++touch "$ignoreip" ++sort "$ignoreip" "$temp1" | uniq > "$temp2" ++ ++if [ "$verbose" ]; then ++ diff -u "$ignoreip" "$temp2" || true ++fi ++ ++# Update list and restart dnscache ++chmod 644 "$temp2" ++mv "$temp2" "$ignoreip" ++#svc -t . ++ +diff --git a/feeds/packages/net/djbdns/files/dnscache/servers/.svn/entries b/feeds/packages/net/djbdns/files/dnscache/servers/.svn/entries +new file mode 100644 +index 0000000..480e381 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnscache/servers/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/files/dnscache/servers ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++@ ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d41d8cd98f00b204e9800998ecf8427e ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++0 ++ +diff --git a/feeds/packages/net/djbdns/files/dnscache/servers/.svn/text-base/@.svn-base b/feeds/packages/net/djbdns/files/dnscache/servers/.svn/text-base/@.svn-base +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/net/djbdns/files/dnscache/servers/@ b/feeds/packages/net/djbdns/files/dnscache/servers/@ +new file mode 100644 +index 0000000..e69de29 +diff --git a/feeds/packages/net/djbdns/files/dnsqrx b/feeds/packages/net/djbdns/files/dnsqrx +new file mode 100644 +index 0000000..3202e94 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnsqrx +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# (c) Copyright 2003-2003 Jonathan de Boyne Pollard. All rights reserved. "Moral" rights asserted. ++# Permission is hereby granted to distribute this script unmodified. ++# This script requires the patch that changes the ${DNSCACHEIP} separator, which can be found at . ++t=${1?Missing type} ++n=${2?Missing name} ++s=${3?Missing server} ++i=`dnsip $s` ++DNSCACHEIP=${i:?Bad server name} dnsqr $t $n +diff --git a/feeds/packages/net/djbdns/files/dnsroots-update b/feeds/packages/net/djbdns/files/dnsroots-update +new file mode 100644 +index 0000000..29ffc16 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/dnsroots-update +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++# This is a script that outputs the current list of active DNS ++# root servers. To run, it requires an active internet connection ++# and a working resolving DNS server. It also requires that the ++# djbdns dnstools be installed, or at least the tools dnsqr and ++# dnsip. ++ ++dnsqr ns .|grep answer|cut -f 5 -d " "|sort|while read server; do dnsip $server; done +diff --git a/feeds/packages/net/djbdns/files/rbldns.init b/feeds/packages/net/djbdns/files/rbldns.init +new file mode 100644 +index 0000000..dfe98f4 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/rbldns.init +@@ -0,0 +1,67 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=46 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/rbldns ++NAME=rbldns ++DESC="Reverse DNS wall" ++ ++ROOT=/tmp/rbldns ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ rm -rf $ROOT ++ mkdir -p $ROOT ++ ln -fs /etc/rbldns/data $ROOT/data ++ cd $ROOT ++ rbldns-data ++ chown -R $UID:$GID $ROOT ++ config_foreach start_daemon rbldns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++ config_get BASE "$cfg" base ++# Unset BASE if it is empty ++ [ -z $BASE ] && export -n BASE ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/rbldns/.svn/entries b/feeds/packages/net/djbdns/files/rbldns/.svn/entries +new file mode 100644 +index 0000000..b00b582 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/rbldns/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/files/rbldns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++data ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++fb7b28617a52ae57f659609dfccf545f ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++86 ++ +diff --git a/feeds/packages/net/djbdns/files/rbldns/.svn/text-base/data.svn-base b/feeds/packages/net/djbdns/files/rbldns/.svn/text-base/data.svn-base +new file mode 100644 +index 0000000..85aae01 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/rbldns/.svn/text-base/data.svn-base +@@ -0,0 +1,5 @@ ++#example rdldns data file ++1.2.4.8 ++10.0.0.1 ++192.168.0.0/16 ++:127.0.0.1:www.somesite.com +diff --git a/feeds/packages/net/djbdns/files/rbldns/data b/feeds/packages/net/djbdns/files/rbldns/data +new file mode 100644 +index 0000000..85aae01 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/rbldns/data +@@ -0,0 +1,5 @@ ++#example rdldns data file ++1.2.4.8 ++10.0.0.1 ++192.168.0.0/16 ++:127.0.0.1:www.somesite.com +diff --git a/feeds/packages/net/djbdns/files/tinydns.init b/feeds/packages/net/djbdns/files/tinydns.init +new file mode 100644 +index 0000000..bff119d +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns.init +@@ -0,0 +1,63 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=46 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/tinydns ++NAME=tinydns ++DESC="Authoritative nameserver" ++ ++ROOT=/tmp/tinydns ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ mkdir -p $ROOT ++ ln -sf /etc/tinydns/data $ROOT/data ++ cd $ROOT ++ tinydns-data ++ chown -R $UID:$GID $ROOT ++ config_foreach start_daemon tinydns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/entries b/feeds/packages/net/djbdns/files/tinydns/.svn/entries +new file mode 100644 +index 0000000..55565b6 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/files/tinydns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++add-alias ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++31e23a60c93482ed84570996b6f9a9fe ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++77 ++ ++add-host ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9983da06a562848b3e37901a4aef8295 ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++76 ++ ++add-ns ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++b026831b490ed3da70432b5dd7a63196 ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++74 ++ ++data ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9bdfdd90a89dffdca621d82f27dcdd38 ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1722 ++ ++add-childns ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++a9c2a60fa8b368bcea7eefedc5f6de35 ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++79 ++ ++add-mx ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++1d3590c103f60092b628e2aa91b001bf ++2009-05-05T09:27:07.854461Z ++15612 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++74 ++ +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-alias.svn-base b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-alias.svn-base +new file mode 100644 +index 0000000..eada7a0 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-alias.svn-base +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add alias ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-childns.svn-base b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-childns.svn-base +new file mode 100644 +index 0000000..4114b3e +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-childns.svn-base +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add childns ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-host.svn-base b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-host.svn-base +new file mode 100644 +index 0000000..9c61b4e +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-host.svn-base +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add host ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-mx.svn-base b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-mx.svn-base +new file mode 100644 +index 0000000..c31a37f +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-mx.svn-base +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add mx ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-ns.svn-base b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-ns.svn-base +new file mode 100644 +index 0000000..b35d2b0 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/add-ns.svn-base +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add ns ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/data.svn-base b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/data.svn-base +new file mode 100644 +index 0000000..001311e +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/.svn/text-base/data.svn-base +@@ -0,0 +1,59 @@ ++# example verbose tinydns data file ++# from http://www.pjvenda.org/linux/doc/tinydns/ ++# Copyright (C) 2001-2009 by Pedro Venda ++# licensed under a Creative Commons Attribution 2.5 License ++# ++# REVERSE ZONE ++# ++# (reverse) dns servers: primary and secondary ++Z45.168.192.in-addr.arpa:ns.example.net:hostmaster.example.net:::::::: ++ ++# NS records ++&45.168.192.in-addr.arpa::ns.example.net::: ++&45.168.192.in-addr.arpa::ns2.example.net::: ++ ++# MX handlers ++@45.168.192.in-addr.arpa::relay.example.net:10 ++@45.168.192.in-addr.arpa::relay2.example.net:20 ++ ++# ++# FORWARD ZONE: ++# ++# SOA record: primary nameserver is ns.example.net and hostmaster ++# mail address is hostmaster@example.net ++# (the 'Z' configuration line is the only one that ++# allows specifying the hostmaster mail address) ++Zexample.net:ns.example.net:hostmaster.example.net:::::::: ++ ++# NS records: primary and secondary nameservers ++&example.net::ns.example.net::: ++&example.net::ns2.example.net::: ++ ++# MX records: relay.example.net, distance = 10 ++# relay2.example.net, distance = 20 ++@example.net::relay.example.net:10 ++@example.net::relay2.example.net:20 ++ ++# A records: ns.example.net, ns2.example.net ++=ns.example.net:192.168.45.1::: ++=ns2.example.net:192.168.45.2::: ++ ++# PTR records: relays are in the same hosts as dns servers +++relay.example.net:192.168.45.1::: +++relay2.example.net:192.168.45.2::: ++ ++# more A records: gateway.example.net ++=gateway.example.net:192.168.45.254::: ++ ++# CNAME record: nscache.example.net is alias to gateway.example.net ++Cnscache.example.net:gateway.example.net::: ++ ++# ++# SUB DOMAIN DELEGATION ++# ++ ++# NS record ++&dmz.example.net::ns.dmz.example.net::: ++ ++# A/PTR record for nameserver ++=ns.dmz.example.net:192.168.90.1::: +diff --git a/feeds/packages/net/djbdns/files/tinydns/add-alias b/feeds/packages/net/djbdns/files/tinydns/add-alias +new file mode 100644 +index 0000000..eada7a0 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/add-alias +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add alias ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/add-childns b/feeds/packages/net/djbdns/files/tinydns/add-childns +new file mode 100644 +index 0000000..4114b3e +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/add-childns +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add childns ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/add-host b/feeds/packages/net/djbdns/files/tinydns/add-host +new file mode 100644 +index 0000000..9c61b4e +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/add-host +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add host ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/add-mx b/feeds/packages/net/djbdns/files/tinydns/add-mx +new file mode 100644 +index 0000000..c31a37f +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/add-mx +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add mx ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/add-ns b/feeds/packages/net/djbdns/files/tinydns/add-ns +new file mode 100644 +index 0000000..b35d2b0 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/add-ns +@@ -0,0 +1,2 @@ ++#!/bin/sh ++exec /usr/local/bin/tinydns-edit data data.new add ns ${1+"$@"} +diff --git a/feeds/packages/net/djbdns/files/tinydns/data b/feeds/packages/net/djbdns/files/tinydns/data +new file mode 100644 +index 0000000..001311e +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/tinydns/data +@@ -0,0 +1,59 @@ ++# example verbose tinydns data file ++# from http://www.pjvenda.org/linux/doc/tinydns/ ++# Copyright (C) 2001-2009 by Pedro Venda ++# licensed under a Creative Commons Attribution 2.5 License ++# ++# REVERSE ZONE ++# ++# (reverse) dns servers: primary and secondary ++Z45.168.192.in-addr.arpa:ns.example.net:hostmaster.example.net:::::::: ++ ++# NS records ++&45.168.192.in-addr.arpa::ns.example.net::: ++&45.168.192.in-addr.arpa::ns2.example.net::: ++ ++# MX handlers ++@45.168.192.in-addr.arpa::relay.example.net:10 ++@45.168.192.in-addr.arpa::relay2.example.net:20 ++ ++# ++# FORWARD ZONE: ++# ++# SOA record: primary nameserver is ns.example.net and hostmaster ++# mail address is hostmaster@example.net ++# (the 'Z' configuration line is the only one that ++# allows specifying the hostmaster mail address) ++Zexample.net:ns.example.net:hostmaster.example.net:::::::: ++ ++# NS records: primary and secondary nameservers ++&example.net::ns.example.net::: ++&example.net::ns2.example.net::: ++ ++# MX records: relay.example.net, distance = 10 ++# relay2.example.net, distance = 20 ++@example.net::relay.example.net:10 ++@example.net::relay2.example.net:20 ++ ++# A records: ns.example.net, ns2.example.net ++=ns.example.net:192.168.45.1::: ++=ns2.example.net:192.168.45.2::: ++ ++# PTR records: relays are in the same hosts as dns servers +++relay.example.net:192.168.45.1::: +++relay2.example.net:192.168.45.2::: ++ ++# more A records: gateway.example.net ++=gateway.example.net:192.168.45.254::: ++ ++# CNAME record: nscache.example.net is alias to gateway.example.net ++Cnscache.example.net:gateway.example.net::: ++ ++# ++# SUB DOMAIN DELEGATION ++# ++ ++# NS record ++&dmz.example.net::ns.dmz.example.net::: ++ ++# A/PTR record for nameserver ++=ns.dmz.example.net:192.168.90.1::: +diff --git a/feeds/packages/net/djbdns/files/walldns.init b/feeds/packages/net/djbdns/files/walldns.init +new file mode 100644 +index 0000000..9d4f773 +--- /dev/null ++++ b/feeds/packages/net/djbdns/files/walldns.init +@@ -0,0 +1,61 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2012 OpenWrt.org ++# ++# version 20090401 jhalfmoon ++ ++START=46 ++PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++DAEMON=/usr/bin/walldns ++NAME=walldns ++DESC="Reverse DNS wall" ++ ++ROOT=/tmp/walldns ++ ++start() { ++ echo "Starting $DESC: $NAME" ++ config_load djbdns ++ config_foreach get_userids global ++ rm -rf $ROOT ++ mkdir -p $ROOT ++ chown -R $UID:$GID $ROOT ++ config_foreach start_daemon walldns ++} ++ ++get_userids() { ++ local cfg="$1" ++ config_get UID "$cfg" runasuser ++ config_get GID "$cfg" runasgroup ++ UID=`id -u $UID` ++ GID=`id -g $GID` ++} ++ ++start_daemon() { ++ local cfg="$1" ++ config_get logging "$cfg" logging ++ config_get iface "$cfg" interface ++# Translate listening interfaces to ip addresses ++ . /lib/functions/network.sh ++ network_get_ipaddr IP "$iface" ++ export ROOT ++ if [ "$DEBUG" == 1 ] ; then ++ $DAEMON ++ elif [ "$logging" == '1' ] ; then ++ $DAEMON 2>&1 | logger -p local1.info -t $NAME & ++ else ++ $DAEMON > /dev/null 2>&1 & ++ fi ++} ++ ++stop() { ++ echo -n "Stopping $DESC: $NAME" ++ kill `pidof $NAME|sed "s/$$//g"` > /dev/null 2>&1 ++ echo " ." ++} ++ ++restart() { ++ echo "Restarting $DESC: $NAME... " ++ stop ++ sleep 2 ++ start ++} ++ +diff --git a/feeds/packages/net/djbdns/patches/.svn/entries b/feeds/packages/net/djbdns/patches/.svn/entries +new file mode 100644 +index 0000000..4536840 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/entries +@@ -0,0 +1,844 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/djbdns/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++210-dnscache-strict-forwardonly.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++6b53395d4288198e18596b860ddb4c2d ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1588 ++ ++250-dnscache-slogging.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9207f4ee546a576a4f6bd6f6a2c51259 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2462 ++ ++090-tinydns-one-second.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++27ed2a79f18a9dc5b9cfc9f4869b6046 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++835 ++ ++040-dnscache-less-chatty-log.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++6f5d46c13d86832a800f6e672f5bd991 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++786 ++ ++240-tinydns-alias-chain-truncation.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9d193fbcd060f95a5b2f6b03ff10c85a ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2151 ++ ++110-dnscache-cachestats.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++76fc578c620c7a28b388edff2325bb71 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2224 ++ ++060-dnscache-big-udp-packets.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++a891abbe5c364b0c5601a94cfae977e5 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++283 ++ ++230-tinydns-data-semantic-error.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f1fb243c9ddcce96a1fd3d49132a7fd8 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5172 ++ ++220-dnscacheip-space-separator.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++7049762cd4d9356d9d8b770890d50b09 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++278 ++ ++020-dnsroots-update.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++6ed586e02cd79846f0bbaf027627cbf3 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++284 ++ ++310-bugfix-dnscache-merge-outgoing-requests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++76bfd45287b6f57a7a1c88cdaf3a338a ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9125 ++ ++050-tinydns-mmap-leak.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++a52210e057456d9efdf71c76a1c54a30 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++551 ++ ++270-dnscache-sigpipe-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++22aedc57e0e07f69da8012636644bb05 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++327 ++ ++010-crosscompile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++edf3fb7324389c7d17f6c645ba81eb03 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4126 ++ ++080-dnscache-cache-negatives.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++700bd8b63a6cee124f2fcb1b36a455de ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1041 ++ ++030-srv-records-and-axfrget.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++bde02db5a579d863bee419224c0a8e78 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4191 ++ ++120-compiler-temporary-filename.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++49cd1726667f67bf262ce3e4cc218851 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3019 ++ ++260-dnsfilter-replace.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++5235cd15c35d3d1fceb194288dd4a3ee ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1917 ++ ++300-bugfix-dnscache-dempsky-poison.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++25fc1ac8ca418261ac7a852d4f7aa8a3 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++366 ++ ++200-dnscache-cname-handling.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f524b7fc4238c880a3237934b63129bb ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7656 ++ ++280-dnscache-ignoreip2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9339dad7b6e1c9cff63e9a94e4d33a7d ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3810 ++ ++320-bugfix-dnscache-cache-soa-records.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++1f5de709a3bdcc3d2e61a8f70ab02037 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2810 ++ ++070-dnscache-dpos-tcp-servfail.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3aed4b0f3761f6c12de1563157113a1d ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++314 ++ ++140-dnsnamex-extra-command.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++060b21889235590cabe12952379b8b85 ++2009-09-22T08:45:48.796446Z ++17673 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4964 ++ +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/010-crosscompile.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/010-crosscompile.patch.svn-base +new file mode 100644 +index 0000000..68ce1c3 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/010-crosscompile.patch.svn-base +@@ -0,0 +1,170 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -29,10 +29,6 @@ auto-str.o: \ ++ compile auto-str.c buffer.h exit.h ++ ./compile auto-str.c ++ ++-auto_home.c: \ ++-auto-str conf-home ++- ./auto-str auto_home `head -1 conf-home` > auto_home.c ++- ++ auto_home.o: \ ++ compile auto_home.c ++ ./compile auto_home.c ++@@ -221,10 +217,6 @@ compile dd.c dns.h stralloc.h gen_alloc. ++ uint64.h taia.h dd.h ++ ./compile dd.c ++ ++-direntry.h: \ ++-choose compile trydrent.c direntry.h1 direntry.h2 ++- ./choose c trydrent direntry.h1 direntry.h2 > direntry.h ++- ++ dns.a: \ ++ makelib dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ipq.o dns_mx.o \ ++ dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ ++@@ -508,12 +500,6 @@ systype hasdevtcp.h1 hasdevtcp.h2 ++ *) cat hasdevtcp.h1 ;; \ ++ esac ) > hasdevtcp.h ++ ++-hasshsgr.h: \ ++-choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 chkshsgr \ ++-warn-shsgr ++- ./chkshsgr || ( cat warn-shsgr; exit 1 ) ++- ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h ++- ++ hier.o: \ ++ compile hier.c auto_home.h ++ ./compile hier.c ++@@ -534,10 +520,6 @@ instcheck.o: \ ++ compile instcheck.c strerr.h error.h exit.h ++ ./compile instcheck.c ++ ++-iopause.h: \ ++-choose compile load trypoll.c iopause.h1 iopause.h2 ++- ./choose clr trypoll iopause.h1 iopause.h2 > iopause.h ++- ++ iopause.o: \ ++ compile iopause.c taia.h tai.h uint64.h select.h iopause.h taia.h ++ ./compile iopause.c ++@@ -590,7 +572,7 @@ warn-auto.sh systype ++ dgux-*) ;; \ ++ hp-ux-*) ;; \ ++ sco*) ;; \ ++- *) echo 'ranlib "$$main"' ;; \ +++ *) echo '$(if $(TARGET_RANLIB),$(TARGET_RANLIB),ranlib) "$$main"' ;; \ ++ esac \ ++ ) > makelib ++ chmod 755 makelib ++@@ -766,10 +748,6 @@ seek_set.o: \ ++ compile seek_set.c seek.h ++ ./compile seek_set.c ++ ++-select.h: \ ++-choose compile trysysel.c select.h1 select.h2 ++- ./choose c trysysel select.h1 select.h2 > select.h ++- ++ server.o: \ ++ compile server.c byte.h case.h env.h buffer.h strerr.h ip4.h uint16.h \ ++ ndelay.h socket.h uint16.h droproot.h qlog.h uint16.h response.h \ ++@@ -1060,10 +1038,6 @@ uint32_unpack.o: \ ++ compile uint32_unpack.c uint32.h ++ ./compile uint32_unpack.c ++ ++-uint64.h: \ ++-choose compile load tryulong64.c uint64.h1 uint64.h2 ++- ./choose clr tryulong64 uint64.h1 uint64.h2 > uint64.h ++- ++ unix.a: \ ++ makelib buffer_read.o buffer_write.o error.o error_str.o ndelay_off.o \ ++ ndelay_on.o open_read.o open_trunc.o openreadclose.o readclose.o \ ++--- /dev/null +++++ b/auto_home.c ++@@ -0,0 +1,3 @@ +++const char auto_home[] = "\ +++\057\165\163\162\ +++"; ++--- a/conf-cc +++++ b/conf-cc ++@@ -1,3 +1,3 @@ ++-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings +++$TARGET_CC $TARGET_CFLAGS -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h ++ ++ This will be used to compile .c files. ++--- a/conf-home +++++ b/conf-home ++@@ -1,4 +1,4 @@ ++-/usr/local +++/usr ++ ++ This is the dnscache home directory. Programs will be installed in ++ .../bin. ++--- a/conf-ld +++++ b/conf-ld ++@@ -1,3 +1,3 @@ ++-gcc -s +++$TARGET_CC -s $TARGET_LDFLAGS ++ ++ This will be used to link .o files into an executable. ++--- /dev/null +++++ b/direntry.h ++@@ -0,0 +1,10 @@ +++#ifndef DIRENTRY_H +++#define DIRENTRY_H +++ +++/* sysdep: +dirent */ +++ +++#include +++#include +++#define direntry struct dirent +++ +++#endif ++--- /dev/null +++++ b/hasshsgr.h ++@@ -0,0 +1 @@ +++/* sysdep: -shortsetgroups */ ++--- /dev/null +++++ b/iopause.h ++@@ -0,0 +1,18 @@ +++#ifndef IOPAUSE_H +++#define IOPAUSE_H +++ +++/* sysdep: +poll */ +++#define IOPAUSE_POLL +++ +++#include +++#include +++ +++typedef struct pollfd iopause_fd; +++#define IOPAUSE_READ POLLIN +++#define IOPAUSE_WRITE POLLOUT +++ +++#include "taia.h" +++ +++extern void iopause(iopause_fd *,unsigned int,struct taia *,struct taia *); +++ +++#endif ++--- /dev/null +++++ b/select.h ++@@ -0,0 +1,11 @@ +++#ifndef SELECT_H +++#define SELECT_H +++ +++/* sysdep: +sysselect */ +++ +++#include +++#include +++#include +++extern int select(); +++ +++#endif ++--- /dev/null +++++ b/uint64.h ++@@ -0,0 +1,8 @@ +++#ifndef UINT64_H +++#define UINT64_H +++ +++/* sysdep: -ulong64 */ +++ +++typedef unsigned long long uint64; +++ +++#endif +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/020-dnsroots-update.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/020-dnsroots-update.patch.svn-base +new file mode 100644 +index 0000000..ce5b863 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/020-dnsroots-update.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/dnsroots.global +++++ b/dnsroots.global ++@@ -1,5 +1,5 @@ ++ 198.41.0.4 ++-128.9.0.107 +++192.228.79.201 ++ 192.33.4.12 ++ 128.8.10.90 ++ 192.203.230.10 ++@@ -7,7 +7,7 @@ ++ 192.112.36.4 ++ 128.63.2.53 ++ 192.36.148.17 ++-198.41.0.10 +++192.58.128.30 ++ 193.0.14.129 ++-198.32.64.12 +++199.7.83.42 ++ 202.12.27.33 +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/030-srv-records-and-axfrget.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/030-srv-records-and-axfrget.patch.svn-base +new file mode 100644 +index 0000000..1d16380 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/030-srv-records-and-axfrget.patch.svn-base +@@ -0,0 +1,135 @@ ++From: Michael Handler ++To: dns@list.cr.yp.to ++Subject: tinydns-data SRV & axfr-get SRV/PTR patches ++Date: Thu, 14 Sep 2000 20:37:50 -0400 ++ ++Here's a combined patch that: ++ ++a) adds a native SRV type to tinydns-data ++ ++Sfqdn:ip:x:port:weight:priority:ttl:timestamp ++ ++Standard rules for ip, x, ttl, and timestamp apply. Port, weight, and ++priority all range from 0-65535. Weight and priority are optional; they ++default to zero if not provided. ++ ++Sconsole.zoinks.example.com:1.2.3.4:rack102-con1:2001:69:7:300: ++ ++b) makes axfr-get decompose SRV and PTR records and write them out in ++native format, rather than opaque. Again, this is necessary because if the ++DNAME fields in the records reference the same zone as fqdn, they can have ++compression pointers that are bogus outside the context of that specific ++packet, and which can't be correctly loaded into data.cdb by tinydns-data. ++ ++--michael ++ ++Laurent G. Bercot updated it for djbdns-1.05: ++ ++--- a/axfr-get.c +++++ b/axfr-get.c ++@@ -209,6 +209,26 @@ unsigned int doit(char *buf,unsigned int ++ if (!stralloc_cats(&line,".:")) return 0; ++ if (!stralloc_catulong0(&line,dist,0)) return 0; ++ } +++ else if (byte_equal(data,2,DNS_T_SRV)) { +++ uint16 dist, weight, port; +++ if (!stralloc_copys(&line,"S")) return 0; +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,"::")) return 0; +++ pos = x_copy(buf,len,pos,data,2); +++ uint16_unpack_big(data,&dist); +++ pos = x_copy(buf,len,pos,data,2); +++ uint16_unpack_big(data,&weight); +++ pos = x_copy(buf,len,pos,data,2); +++ uint16_unpack_big(data,&port); +++ x_getname(buf,len,pos,&d1); +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,".:")) return 0; +++ if (!stralloc_catulong0(&line,dist,0)) return 0; +++ if (!stralloc_cats(&line,":")) return 0; +++ if (!stralloc_catulong0(&line,weight,0)) return 0; +++ if (!stralloc_cats(&line,":")) return 0; +++ if (!stralloc_catulong0(&line,port,0)) return 0; +++ } ++ else if (byte_equal(data,2,DNS_T_A) && (dlen == 4)) { ++ char ipstr[IP4_FMT]; ++ if (!stralloc_copys(&line,"+")) return 0; ++@@ -217,6 +237,14 @@ unsigned int doit(char *buf,unsigned int ++ x_copy(buf,len,pos,data,4); ++ if (!stralloc_catb(&line,ipstr,ip4_fmt(ipstr,data))) return 0; ++ } +++ else if (byte_equal(data,2,DNS_T_PTR)) { +++ if (!stralloc_copys(&line,"^")) return 0; +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,":")) return 0; +++ x_getname(buf,len,pos,&d1); +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,".")) return 0; +++ } ++ else { ++ unsigned char ch; ++ unsigned char ch2; ++--- a/dns.h +++++ b/dns.h ++@@ -20,6 +20,7 @@ ++ #define DNS_T_SIG "\0\30" ++ #define DNS_T_KEY "\0\31" ++ #define DNS_T_AAAA "\0\34" +++#define DNS_T_SRV "\0\41" ++ #define DNS_T_AXFR "\0\374" ++ #define DNS_T_ANY "\0\377" ++ ++--- a/tinydns-data.c +++++ b/tinydns-data.c ++@@ -196,6 +196,7 @@ int main() ++ char type[2]; ++ char soa[20]; ++ char buf[4]; +++ char srv[6]; ++ ++ umask(022); ++ ++@@ -369,6 +370,43 @@ int main() ++ rr_finish(d2); ++ } ++ break; +++ +++ case 'S': +++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); +++ if (!stralloc_0(&f[6])) nomem(); +++ if (!scan_ulong(f[6].s,&ttl)) ttl = TTL_POSITIVE; +++ ttdparse(&f[7],ttd); +++ locparse(&f[8],loc); +++ +++ if (!stralloc_0(&f[1])) nomem(); +++ +++ if (byte_chr(f[2].s,f[2].len,'.') >= f[2].len) { +++ if (!stralloc_cats(&f[2],".srv.")) nomem(); +++ if (!stralloc_catb(&f[2],f[0].s,f[0].len)) nomem(); +++ } +++ if (!dns_domain_fromdot(&d2,f[2].s,f[2].len)) nomem(); +++ +++ if (!stralloc_0(&f[4])) nomem(); +++ if (!scan_ulong(f[4].s,&u)) u = 0; +++ uint16_pack_big(srv,u); +++ if (!stralloc_0(&f[5])) nomem(); +++ if (!scan_ulong(f[5].s,&u)) u = 0; +++ uint16_pack_big(srv + 2,u); +++ if (!stralloc_0(&f[3])) nomem(); +++ if (!scan_ulong(f[3].s,&u)) nomem(); +++ uint16_pack_big(srv + 4,u); +++ +++ rr_start(DNS_T_SRV,ttl,ttd,loc); +++ rr_add(srv,6); +++ rr_addname(d2); +++ rr_finish(d1); +++ +++ if (ip4_scan(f[1].s,ip)) { +++ rr_start(DNS_T_A,ttl,ttd,loc); +++ rr_add(ip,4); +++ rr_finish(d2); +++ } +++ break; ++ ++ case '^': case 'C': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/040-dnscache-less-chatty-log.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/040-dnscache-less-chatty-log.patch.svn-base +new file mode 100644 +index 0000000..9a881c9 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/040-dnscache-less-chatty-log.patch.svn-base +@@ -0,0 +1,39 @@ ++--- a/log.h +++++ b/log.h ++@@ -1,6 +1,8 @@ ++ #ifndef LOG_H ++ #define LOG_H ++ +++#define STATS_DISPLAY_INTERVAL 5 +++ ++ #include "uint64.h" ++ ++ extern void log_startup(void); ++--- a/log.c +++++ b/log.c ++@@ -1,6 +1,7 @@ ++ #include "buffer.h" ++ #include "uint32.h" ++ #include "uint16.h" +++#include "time.h" ++ #include "error.h" ++ #include "byte.h" ++ #include "log.h" ++@@ -274,11 +275,17 @@ void log_rrsoa(const char server[4],cons ++ ++ void log_stats(void) ++ { +++ static time_t prev = 0; +++ time_t cur = time(NULL); ++ extern uint64 numqueries; ++ extern uint64 cache_motion; ++ extern int uactive; ++ extern int tactive; ++ +++ if(prev == 0) prev = time(NULL); +++ if(cur - prev < STATS_DISPLAY_INTERVAL) return; +++ prev = cur; +++ ++ string("stats "); ++ number(numqueries); space(); ++ number(cache_motion); space(); +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/050-tinydns-mmap-leak.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/050-tinydns-mmap-leak.patch.svn-base +new file mode 100644 +index 0000000..1885612 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/050-tinydns-mmap-leak.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/tdlookup.c +++++ b/tdlookup.c ++@@ -298,9 +298,17 @@ int respond(char *q,char qtype[2],char i ++ if (!r) r = cdb_find(&c,key,4); ++ if (!r) r = cdb_find(&c,key,3); ++ if (!r) r = cdb_find(&c,key,2); ++- if (r == -1) return 0; +++ if (r == -1) { +++ cdb_free(&c); +++ close(fd); +++ return 0; +++ } ++ if (r && (cdb_datalen(&c) == 2)) ++- if (cdb_read(&c,clientloc,2,cdb_datapos(&c)) == -1) return 0; +++ if (cdb_read(&c,clientloc,2,cdb_datapos(&c)) == -1) { +++ cdb_free(&c); +++ close(fd); +++ return 0; +++ } ++ ++ r = doit(q,qtype); ++ +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/060-dnscache-big-udp-packets.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/060-dnscache-big-udp-packets.patch.svn-base +new file mode 100644 +index 0000000..8f2c142 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/060-dnscache-big-udp-packets.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/dns_transmit.c +++++ b/dns_transmit.c ++@@ -240,7 +240,7 @@ void dns_transmit_io(struct dns_transmit ++ ++ int dns_transmit_get(struct dns_transmit *d,const iopause_fd *x,const struct taia *when) ++ { ++- char udpbuf[513]; +++ char udpbuf[4097]; ++ unsigned char ch; ++ int r; ++ int fd; +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/070-dnscache-dpos-tcp-servfail.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/070-dnscache-dpos-tcp-servfail.patch.svn-base +new file mode 100644 +index 0000000..8d30d5e +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/070-dnscache-dpos-tcp-servfail.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/dns_transmit.c +++++ b/dns_transmit.c ++@@ -166,6 +166,7 @@ static int thistcp(struct dns_transmit * ++ taia_uint(&d->deadline,10); ++ taia_add(&d->deadline,&d->deadline,&now); ++ if (socket_connect4(d->s1 - 1,ip,53) == 0) { +++ d->pos = 0; ++ d->tcpstate = 2; ++ return 0; ++ } +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/080-dnscache-cache-negatives.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/080-dnscache-cache-negatives.patch.svn-base +new file mode 100644 +index 0000000..793ac87 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/080-dnscache-cache-negatives.patch.svn-base +@@ -0,0 +1,41 @@ ++--- a/query.c +++++ b/query.c ++@@ -193,6 +193,7 @@ static int doit(struct query *z,int stat ++ int k; ++ int p; ++ int q; +++ uint32 cachettl; ++ ++ errno = error_io; ++ if (state == 1) goto HAVEPACKET; ++@@ -470,6 +471,7 @@ static int doit(struct query *z,int stat ++ rcode = header[3] & 15; ++ if (rcode && (rcode != 3)) goto DIE; /* impossible; see irrelevant() */ ++ +++ cachettl = 0; ++ flagout = 0; ++ flagcname = 0; ++ flagreferral = 0; ++@@ -512,6 +514,11 @@ static int doit(struct query *z,int stat ++ ++ uint16_unpack_big(header + 8,&datalen); ++ pos += datalen; +++ +++ if (flagsoa && (pos <= len)) { +++ cachettl = ttlget(buf + pos - 4); +++ if (soattl < cachettl) cachettl = soattl; +++ } ++ } ++ posglue = pos; ++ ++@@ -689,8 +696,8 @@ static int doit(struct query *z,int stat ++ } ++ ++ if (rcode == 3) { ++- log_nxdomain(whichserver,d,soattl); ++- cachegeneric(DNS_T_ANY,d,"",0,soattl); +++ log_nxdomain(whichserver,d,cachettl); +++ cachegeneric(DNS_T_ANY,d,"",0,cachettl); ++ ++ NXDOMAIN: ++ if (z->level) goto LOWERLEVEL; +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/090-tinydns-one-second.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/090-tinydns-one-second.patch.svn-base +new file mode 100644 +index 0000000..660bbcb +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/090-tinydns-one-second.patch.svn-base +@@ -0,0 +1,40 @@ ++--- a/tdlookup.c +++++ b/tdlookup.c ++@@ -280,15 +280,24 @@ static int doit(char *q,char qtype[2]) ++ ++ int respond(char *q,char qtype[2],char ip[4]) ++ { ++- int fd; +++ static struct tai cdb_valid = { 0 }; +++ static int fd = -1; +++ struct tai one_second; ++ int r; ++ char key[6]; ++ ++ tai_now(&now); ++- fd = open_read("data.cdb"); ++- if (fd == -1) return 0; ++- cdb_init(&c,fd); ++- +++ if (tai_less(&cdb_valid, &now)) { +++ if (fd != -1) { +++ cdb_free(&c); +++ close(fd); +++ } +++ fd = open_read("data.cdb"); +++ if (fd == -1) return 0; +++ cdb_init(&c,fd); +++ tai_uint(&one_second, 1); +++ tai_add(&cdb_valid, &now, &one_second); +++ } ++ byte_zero(clientloc,2); ++ key[0] = 0; ++ key[1] = '%'; ++@@ -312,7 +321,5 @@ int respond(char *q,char qtype[2],char i ++ ++ r = doit(q,qtype); ++ ++- cdb_free(&c); ++- close(fd); ++ return r; ++ } +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/110-dnscache-cachestats.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/110-dnscache-cachestats.patch.svn-base +new file mode 100644 +index 0000000..5404719 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/110-dnscache-cachestats.patch.svn-base +@@ -0,0 +1,89 @@ ++# ++# This patch to djbdns 1.05 modifies the dnscache program to keep a ++# counter of cache hits and cache misses. ++# ++# Two new fields are added to the ``stats'' output line: ++# . the fifth number is the number of cache hits ++# . the sixth number is the number of cache misses ++# e.g. ++# @400000003fa92ccc317d70f4 stats 3 1201 1 0 21 49 ++# indicates 21 hits and 49 misses. ++# ++# James Raftery 6 Nov. 2003 ++# ++--- a/cache.c +++++ b/cache.c ++@@ -7,6 +7,11 @@ ++ ++ uint64 cache_motion = 0; ++ +++/* record cache stats */ +++/* James Raftery 6 Nov. 2003 */ +++uint64 cache_hit = 0; +++uint64 cache_miss = 0; +++ ++ static char *x = 0; ++ static uint32 size; ++ static uint32 hsize; ++@@ -112,15 +117,20 @@ char *cache_get(const char *key,unsigned ++ if (u > size - pos - 20 - keylen) cache_impossible(); ++ *datalen = u; ++ +++ cache_hit++; ++ return x + pos + 20 + keylen; ++ } ++ } ++ nextpos = prevpos ^ get4(pos); ++ prevpos = pos; ++ pos = nextpos; ++- if (++loop > 100) return 0; /* to protect against hash flooding */ +++ if (++loop > 100) { /* to protect against hash flooding */ +++ cache_miss++; +++ return 0; +++ } ++ } ++ +++ cache_miss++; ++ return 0; ++ } ++ ++--- a/cache.h +++++ b/cache.h ++@@ -5,6 +5,12 @@ ++ #include "uint64.h" ++ ++ extern uint64 cache_motion; +++ +++/* record cache stats */ +++/* James Raftery 6 Nov. 2003 */ +++extern uint64 cache_hit; +++extern uint64 cache_miss; +++ ++ extern int cache_init(unsigned int); ++ extern void cache_set(const char *,unsigned int,const char *,unsigned int,uint32); ++ extern char *cache_get(const char *,unsigned int,unsigned int *,uint32 *); ++--- a/log.c +++++ b/log.c ++@@ -279,6 +279,12 @@ void log_stats(void) ++ time_t cur = time(NULL); ++ extern uint64 numqueries; ++ extern uint64 cache_motion; +++ +++ /* record cache stats */ +++ /* James Raftery 6 Nov. 2003 */ +++ extern uint64 cache_hit; +++ extern uint64 cache_miss; +++ ++ extern int uactive; ++ extern int tactive; ++ ++@@ -290,6 +296,8 @@ void log_stats(void) ++ number(numqueries); space(); ++ number(cache_motion); space(); ++ number(uactive); space(); ++- number(tactive); +++ number(tactive); space(); +++ number(cache_hit); space(); +++ number(cache_miss); ++ line(); ++ } +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/120-compiler-temporary-filename.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/120-compiler-temporary-filename.patch.svn-base +new file mode 100644 +index 0000000..324116d +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/120-compiler-temporary-filename.patch.svn-base +@@ -0,0 +1,93 @@ ++--- a/pickdns-data.c +++++ b/pickdns-data.c ++@@ -123,7 +123,7 @@ void syntaxerror(const char *why) ++ } ++ void die_datatmp(void) ++ { ++- strerr_die2sys(111,FATAL,"unable to create data.tmp: "); +++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++ } ++ ++ int main() ++@@ -142,7 +142,7 @@ int main() ++ if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: "); ++ buffer_init(&b,buffer_unixread,fd,bspace,sizeof bspace); ++ ++- fdcdb = open_trunc("data.tmp"); +++ fdcdb = open_trunc("data.cdb.tmp"); ++ if (fdcdb == -1) die_datatmp(); ++ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); ++ ++@@ -223,8 +223,8 @@ int main() ++ if (cdb_make_finish(&cdb) == -1) die_datatmp(); ++ if (fsync(fdcdb) == -1) die_datatmp(); ++ if (close(fdcdb) == -1) die_datatmp(); /* NFS stupidity */ ++- if (rename("data.tmp","data.cdb") == -1) ++- strerr_die2sys(111,FATAL,"unable to move data.tmp to data.cdb: "); +++ if (rename("data.cdb.tmp","data.cdb") == -1) +++ strerr_die2sys(111,FATAL,"unable to move data.cdb.tmp to data.cdb: "); ++ ++ _exit(0); ++ } ++--- a/rbldns-data.c +++++ b/rbldns-data.c ++@@ -42,7 +42,7 @@ void syntaxerror(const char *why) ++ } ++ void die_datatmp(void) ++ { ++- strerr_die2sys(111,FATAL,"unable to create data.tmp: "); +++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++ } ++ ++ int main() ++@@ -59,7 +59,7 @@ int main() ++ if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: "); ++ buffer_init(&b,buffer_unixread,fd,bspace,sizeof bspace); ++ ++- fdcdb = open_trunc("data.tmp"); +++ fdcdb = open_trunc("data.cdb.tmp"); ++ if (fdcdb == -1) die_datatmp(); ++ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); ++ ++@@ -121,8 +121,8 @@ int main() ++ if (cdb_make_finish(&cdb) == -1) die_datatmp(); ++ if (fsync(fdcdb) == -1) die_datatmp(); ++ if (close(fdcdb) == -1) die_datatmp(); /* NFS stupidity */ ++- if (rename("data.tmp","data.cdb") == -1) ++- strerr_die2sys(111,FATAL,"unable to move data.tmp to data.cdb: "); +++ if (rename("data.cdb.tmp","data.cdb") == -1) +++ strerr_die2sys(111,FATAL,"unable to move data.cdb.tmp to data.cdb: "); ++ ++ _exit(0); ++ } ++--- a/tinydns-data.c +++++ b/tinydns-data.c ++@@ -27,7 +27,7 @@ ++ ++ void die_datatmp(void) ++ { ++- strerr_die2sys(111,FATAL,"unable to create data.tmp: "); +++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++ } ++ void nomem(void) ++ { ++@@ -207,7 +207,7 @@ int main() ++ ++ buffer_init(&b,buffer_unixread,fddata,bspace,sizeof bspace); ++ ++- fdcdb = open_trunc("data.tmp"); +++ fdcdb = open_trunc("data.cdb.tmp"); ++ if (fdcdb == -1) die_datatmp(); ++ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); ++ ++@@ -487,8 +487,8 @@ int main() ++ if (cdb_make_finish(&cdb) == -1) die_datatmp(); ++ if (fsync(fdcdb) == -1) die_datatmp(); ++ if (close(fdcdb) == -1) die_datatmp(); /* NFS stupidity */ ++- if (rename("data.tmp","data.cdb") == -1) ++- strerr_die2sys(111,FATAL,"unable to move data.tmp to data.cdb: "); +++ if (rename("data.cdb.tmp","data.cdb") == -1) +++ strerr_die2sys(111,FATAL,"unable to move data.cdb.tmp to data.cdb: "); ++ ++ _exit(0); ++ } +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/140-dnsnamex-extra-command.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/140-dnsnamex-extra-command.patch.svn-base +new file mode 100644 +index 0000000..6a8cafe +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/140-dnsnamex-extra-command.patch.svn-base +@@ -0,0 +1,156 @@ ++--- /dev/null +++++ b/dnsnamex.c ++@@ -0,0 +1,34 @@ +++#include "buffer.h" +++#include "exit.h" +++#include "strerr.h" +++#include "ip4.h" +++#include "dns.h" +++ +++#define FATAL "dnsnamex: fatal: " +++ +++static char seed[128]; +++ +++char ip[4]; +++static stralloc out; +++ +++int main(int argc,char **argv) +++{ +++ dns_random_init(seed); +++ +++ if (*argv) ++argv; +++ +++ while (*argv) { +++ if (!ip4_scan(*argv,ip)) +++ strerr_die3x(111,FATAL,"unable to parse IP address ",*argv); +++ if (dns_name4_multi(&out,ip) == -1) +++ strerr_die4sys(111,FATAL,"unable to find host name for ",*argv,": "); +++ +++ buffer_put(buffer_1,out.s,out.len); +++ buffer_puts(buffer_1,"\n"); +++ +++ ++argv; +++ } +++ +++ buffer_flush(buffer_1); +++ _exit(0); +++} ++--- /dev/null +++++ b/dns_namex.c ++@@ -0,0 +1,48 @@ +++#include "stralloc.h" +++#include "uint16.h" +++#include "byte.h" +++#include "dns.h" +++ +++static char *q = 0; +++ +++int dns_name_packet_multi(stralloc *out,const char *buf,unsigned int len) +++{ +++ unsigned int pos; +++ char header[12]; +++ uint16 numanswers; +++ uint16 datalen; +++ +++ if (!stralloc_copys(out,"")) return -1; +++ +++ pos = dns_packet_copy(buf,len,0,header,12); if (!pos) return -1; +++ uint16_unpack_big(header + 6,&numanswers); +++ pos = dns_packet_skipname(buf,len,pos); if (!pos) return -1; +++ pos += 4; +++ +++ while (numanswers--) { +++ pos = dns_packet_skipname(buf,len,pos); if (!pos) return -1; +++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) return -1; +++ uint16_unpack_big(header + 8,&datalen); +++ if (byte_equal(header,2,DNS_T_PTR)) +++ if (byte_equal(header + 2,2,DNS_C_IN)) { +++ if (!dns_packet_getname(buf,len,pos,&q)) return -1; +++ if (!dns_domain_todot_cat(out,q)) return -1; +++ if (!stralloc_cats(out, " ")) return -1 ; +++ } +++ pos += datalen; +++ } +++ +++ return 0; +++} +++ +++int dns_name4_multi(stralloc *out,const char ip[4]) +++{ +++ char name[DNS_NAME4_DOMAIN]; +++ +++ dns_name4_domain(name,ip); +++ if (dns_resolve(name,DNS_T_PTR) == -1) return -1; +++ if (dns_name_packet_multi(out,dns_resolve_tx.packet,dns_resolve_tx.packetlen) == -1) return -1; +++ dns_transmit_free(&dns_resolve_tx); +++ dns_domain_free(&q); +++ return 0; +++} ++--- a/dns.h +++++ b/dns.h ++@@ -70,9 +70,11 @@ extern struct dns_transmit dns_resolve_t ++ extern int dns_ip4_packet(stralloc *,const char *,unsigned int); ++ extern int dns_ip4(stralloc *,const stralloc *); ++ extern int dns_name_packet(stralloc *,const char *,unsigned int); +++extern int dns_name_packet_multi(stralloc *,const char *,unsigned int); ++ extern void dns_name4_domain(char *,const char *); ++ #define DNS_NAME4_DOMAIN 31 ++ extern int dns_name4(stralloc *,const char *); +++extern int dns_name4_multi(stralloc *,const char *); ++ extern int dns_txt_packet(stralloc *,const char *,unsigned int); ++ extern int dns_txt(stralloc *,const stralloc *); ++ extern int dns_mx_packet(stralloc *,const char *,unsigned int); ++--- a/Makefile +++++ b/Makefile ++@@ -219,10 +219,10 @@ uint64.h taia.h dd.h ++ ++ dns.a: \ ++ makelib dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ipq.o dns_mx.o \ ++-dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ +++dns_name.o dns_namex.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ ++ dns_resolve.o dns_sortip.o dns_transmit.o dns_txt.o ++ ./makelib dns.a dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o \ ++- dns_ipq.o dns_mx.o dns_name.o dns_nd.o dns_packet.o \ +++ dns_ipq.o dns_mx.o dns_name.o dns_namex.o dns_nd.o dns_packet.o \ ++ dns_random.o dns_rcip.o dns_rcrw.o dns_resolve.o \ ++ dns_sortip.o dns_transmit.o dns_txt.o ++ ++@@ -261,6 +261,11 @@ compile dns_name.c stralloc.h gen_alloc. ++ stralloc.h iopause.h taia.h tai.h uint64.h taia.h ++ ./compile dns_name.c ++ +++dns_namex.o: \ +++compile dns_namex.c stralloc.h gen_alloc.h uint16.h byte.h dns.h \ +++stralloc.h iopause.h taia.h tai.h uint64.h taia.h +++ ./compile dns_namex.c +++ ++ dns_nd.o: \ ++ compile dns_nd.c byte.h fmt.h dns.h stralloc.h gen_alloc.h iopause.h \ ++ taia.h tai.h uint64.h taia.h ++@@ -394,6 +399,17 @@ compile dnsname.c buffer.h exit.h strerr ++ gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h ++ ./compile dnsname.c ++ +++dnsnamex: \ +++load dnsnamex.o iopause.o dns.a env.a libtai.a alloc.a buffer.a unix.a \ +++byte.a socket.lib +++ ./load dnsnamex iopause.o dns.a env.a libtai.a alloc.a \ +++ buffer.a unix.a byte.a `cat socket.lib` +++ +++dnsnamex.o: \ +++compile dnsnamex.c buffer.h exit.h strerr.h ip4.h dns.h stralloc.h \ +++gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h +++ ./compile dnsnamex.c +++ ++ dnsq: \ ++ load dnsq.o iopause.o printrecord.o printpacket.o parsetype.o dns.a \ ++ env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib ++@@ -658,7 +674,7 @@ prog: \ ++ dnscache-conf dnscache walldns-conf walldns rbldns-conf rbldns \ ++ rbldns-data pickdns-conf pickdns pickdns-data tinydns-conf tinydns \ ++ tinydns-data tinydns-get tinydns-edit axfr-get axfrdns-conf axfrdns \ ++-dnsip dnsipq dnsname dnstxt dnsmx dnsfilter random-ip dnsqr dnsq \ +++dnsip dnsipq dnsname dnsnamex dnstxt dnsmx dnsfilter random-ip dnsqr dnsq \ ++ dnstrace dnstracesort cachetest utime rts ++ ++ prot.o: \ +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/200-dnscache-cname-handling.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/200-dnscache-cname-handling.patch.svn-base +new file mode 100644 +index 0000000..ed96ac9 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/200-dnscache-cname-handling.patch.svn-base +@@ -0,0 +1,226 @@ ++--- a/query.c +++++ b/query.c ++@@ -91,6 +91,21 @@ static void cleanup(struct query *z) ++ } ++ } ++ +++static int move_name_to_alias(struct query *z,uint32 ttl) +++{ +++ int j ; +++ +++ if (z->alias[QUERY_MAXALIAS - 1]) return 0 ; +++ for (j = QUERY_MAXALIAS - 1;j > 0;--j) +++ z->alias[j] = z->alias[j - 1]; +++ for (j = QUERY_MAXALIAS - 1;j > 0;--j) +++ z->aliasttl[j] = z->aliasttl[j - 1]; +++ z->alias[0] = z->name[0]; +++ z->aliasttl[0] = ttl; +++ z->name[0] = 0; +++ return 1 ; +++} +++ ++ static int rqa(struct query *z) ++ { ++ int i; ++@@ -123,7 +138,6 @@ static int globalip(char *d,char ip[4]) ++ static char *t1 = 0; ++ static char *t2 = 0; ++ static char *t3 = 0; ++-static char *cname = 0; ++ static char *referral = 0; ++ static unsigned int *records = 0; ++ ++@@ -179,15 +193,14 @@ static int doit(struct query *z,int stat ++ uint16 datalen; ++ char *control; ++ char *d; +++ char *owner_name = 0 ; ++ const char *dtype; ++ unsigned int dlen; ++ int flagout; ++- int flagcname; ++ int flagreferral; ++ int flagsoa; ++ uint32 ttl; ++ uint32 soattl; ++- uint32 cnamettl; ++ int i; ++ int j; ++ int k; ++@@ -253,7 +266,10 @@ static int doit(struct query *z,int stat ++ ++ byte_copy(key,2,DNS_T_CNAME); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++- if (cached) { +++ /* A previous explicit query might have caused an empty RRSet to have been +++ ** cached. Take care to ignore such a thing. +++ */ +++ if (cached && cachedlen) { ++ if (typematch(DNS_T_CNAME,dtype)) { ++ log_cachedanswer(d,DNS_T_CNAME); ++ if (!rqa(z)) goto DIE; ++@@ -262,8 +278,11 @@ static int doit(struct query *z,int stat ++ return 1; ++ } ++ log_cachedcname(d,cached); ++- if (!dns_domain_copy(&cname,cached)) goto DIE; ++- goto CNAME; +++ if (!z->level) { +++ if (!move_name_to_alias(z,ttl)) goto DIE ; +++ } +++ if (!dns_domain_copy(&z->name[z->level],cached)) goto DIE; +++ goto NEWNAME; ++ } ++ ++ if (typematch(DNS_T_NS,dtype)) { ++@@ -352,7 +371,7 @@ static int doit(struct query *z,int stat ++ } ++ } ++ ++- if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_CNAME,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) { +++ if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) { ++ byte_copy(key,2,dtype); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { ++@@ -473,29 +492,31 @@ static int doit(struct query *z,int stat ++ ++ cachettl = 0; ++ flagout = 0; ++- flagcname = 0; ++ flagreferral = 0; ++ flagsoa = 0; ++ soattl = 0; ++- cnamettl = 0; +++ if (!dns_domain_copy(&owner_name,d)) goto DIE; +++ /* This code assumes that the CNAME chain is presented in the correct +++ ** order. The example algorithm in RFC 1034 will actually result in this +++ ** being the case, but the words do not require it to be so. +++ */ ++ for (j = 0;j < numanswers;++j) { ++ pos = dns_packet_getname(buf,len,pos,&t1); if (!pos) goto DIE; ++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; ++ ++- if (dns_domain_equal(t1,d)) +++ if (dns_domain_equal(t1,owner_name)) ++ if (byte_equal(header + 2,2,DNS_C_IN)) { /* should always be true */ ++ if (typematch(header,dtype)) ++ flagout = 1; ++ else if (typematch(header,DNS_T_CNAME)) { ++- if (!dns_packet_getname(buf,len,pos,&cname)) goto DIE; ++- flagcname = 1; ++- cnamettl = ttlget(header + 4); +++ if (!dns_packet_getname(buf,len,pos,&owner_name)) goto DIE; ++ } ++ } ++ ++ uint16_unpack_big(header + 8,&datalen); ++ pos += datalen; ++ } +++ dns_domain_free(&owner_name) ; ++ posauthority = pos; ++ ++ for (j = 0;j < numauthority;++j) { ++@@ -522,15 +543,6 @@ static int doit(struct query *z,int stat ++ } ++ posglue = pos; ++ ++- ++- if (!flagcname && !rcode && !flagout && flagreferral && !flagsoa) ++- if (dns_domain_equal(referral,control) || !dns_domain_suffix(referral,control)) { ++- log_lame(whichserver,control,referral); ++- byte_zero(whichserver,4); ++- goto HAVENS; ++- } ++- ++- ++ if (records) { alloc_free(records); records = 0; } ++ ++ k = numanswers + numauthority + numglue; ++@@ -677,24 +689,36 @@ static int doit(struct query *z,int stat ++ ++ alloc_free(records); records = 0; ++ +++ if (byte_diff(DNS_T_CNAME,2,dtype)) { +++ /* This code assumes that the CNAME chain is presented in the correct +++ ** order. The example algorithm in RFC 1034 will actually result in this +++ ** being the case, but the words do not require it to be so. +++ */ +++ pos = posanswers; +++ for (j = 0;j < numanswers;++j) { +++ pos = dns_packet_getname(buf,len,pos,&t1); if (!pos) goto DIE; +++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; +++ +++ if (dns_domain_equal(t1,d)) +++ if (byte_equal(header + 2,2,DNS_C_IN)) { /* should always be true */ +++ if (typematch(header,DNS_T_CNAME)) { +++ ttl = ttlget(header + 4); +++ if (z->level == 0) { +++ if (!move_name_to_alias(z,ttl)) goto DIE ; +++ } +++ if (!dns_packet_getname(buf,len,pos,&z->name[z->level])) goto DIE; +++ d = z->name[z->level]; +++ if (!dns_domain_suffix(d,control) || !roots_same(d,control)) +++ goto NEWNAME ; /* Cannot trust the chain further - restart using current name */ +++ } +++ } ++ ++- if (flagcname) { ++- ttl = cnamettl; ++- CNAME: ++- if (!z->level) { ++- if (z->alias[QUERY_MAXALIAS - 1]) goto DIE; ++- for (j = QUERY_MAXALIAS - 1;j > 0;--j) ++- z->alias[j] = z->alias[j - 1]; ++- for (j = QUERY_MAXALIAS - 1;j > 0;--j) ++- z->aliasttl[j] = z->aliasttl[j - 1]; ++- z->alias[0] = z->name[0]; ++- z->aliasttl[0] = ttl; ++- z->name[0] = 0; +++ uint16_unpack_big(header + 8,&datalen); +++ pos += datalen; ++ } ++- if (!dns_domain_copy(&z->name[z->level],cname)) goto DIE; ++- goto NEWNAME; ++ } ++ +++ /* A "no such name" error applies to the end of any CNAME chain, not to the start. */ ++ if (rcode == 3) { ++ log_nxdomain(whichserver,d,cachettl); ++ cachegeneric(DNS_T_ANY,d,"",0,cachettl); ++@@ -707,10 +731,26 @@ static int doit(struct query *z,int stat ++ return 1; ++ } ++ +++ /* We check for a lame server _after_ we have cached any records that it +++ ** might have returned to us. This copes better with the incorrect +++ ** behaviour of one content DNS server software that doesn't return +++ ** complete CNAME chains but instead returns only the first link in a +++ ** chain followed by a lame delegation to the same server. +++ ** Also: We check for a lame server _after_ following the CNAME chain. The +++ ** delegation in a referral answer applies to the _end_ of the chain, not +++ ** to the beginning. +++ */ +++ if (!rcode && !flagout && flagreferral && !flagsoa) +++ if (dns_domain_equal(referral,control) || !dns_domain_suffix(referral,control)) { +++ log_lame(whichserver,control,referral); +++ byte_zero(whichserver,4); +++ goto HAVENS; +++ } +++ ++ if (!flagout && flagsoa) +++ /* Don't save empty RRSets for those types that we use as special markers. */ ++ if (byte_diff(DNS_T_ANY,2,dtype)) ++- if (byte_diff(DNS_T_AXFR,2,dtype)) ++- if (byte_diff(DNS_T_CNAME,2,dtype)) { +++ if (byte_diff(DNS_T_AXFR,2,dtype)) { ++ save_start(); ++ save_finish(dtype,d,soattl); ++ log_nodata(whichserver,d,dtype,soattl); ++@@ -822,6 +862,7 @@ static int doit(struct query *z,int stat ++ DIE: ++ cleanup(z); ++ if (records) { alloc_free(records); records = 0; } +++ dns_domain_free(&owner_name) ; ++ return -1; ++ } ++ +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/210-dnscache-strict-forwardonly.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/210-dnscache-strict-forwardonly.patch.svn-base +new file mode 100644 +index 0000000..b64e4a4 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/210-dnscache-strict-forwardonly.patch.svn-base +@@ -0,0 +1,47 @@ ++--- a/log.h +++++ b/log.h ++@@ -25,6 +25,7 @@ extern void log_nxdomain(const char *,co ++ extern void log_nodata(const char *,const char *,const char *,unsigned int); ++ extern void log_servfail(const char *); ++ extern void log_lame(const char *,const char *,const char *); +++extern void log_ignore_referral(const char *,const char *,const char *); ++ ++ extern void log_rr(const char *,const char *,const char *,const char *,unsigned int,unsigned int); ++ extern void log_rrns(const char *,const char *,const char *,unsigned int); ++--- a/log.c +++++ b/log.c ++@@ -197,6 +197,13 @@ void log_lame(const char server[4],const ++ line(); ++ } ++ +++void log_ignore_referral(const char server[4],const char * control, const char *referral) +++{ +++ string("ignored referral "); ip(server); space(); +++ name(control); space(); name(referral); +++ line(); +++} +++ ++ void log_servfail(const char *dn) ++ { ++ const char *x = error_str(errno); ++--- a/query.c +++++ b/query.c ++@@ -828,6 +828,18 @@ static int doit(struct query *z,int stat ++ ++ ++ if (!dns_domain_suffix(d,referral)) goto DIE; +++ +++ /* In strict "forwardonly" mode, we don't, as the manual states, +++ ** contact a chain of servers according to "NS" resource records. +++ ** We don't obey any referral responses, therefore. Instead, we +++ ** eliminate the server from the list and try the next one. +++ */ +++ if (flagforwardonly) { +++ log_ignore_referral(whichserver,control,referral); +++ byte_zero(whichserver,4); +++ goto HAVENS; +++ } +++ ++ control = d + dns_domain_suffixpos(d,referral); ++ z->control[z->level] = control; ++ byte_zero(z->servers[z->level],64); +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/220-dnscacheip-space-separator.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/220-dnscacheip-space-separator.patch.svn-base +new file mode 100644 +index 0000000..2e73ffe +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/220-dnscacheip-space-separator.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/dns_rcip.c +++++ b/dns_rcip.c ++@@ -17,7 +17,7 @@ static int init(char ip[64]) ++ x = env_get("DNSCACHEIP"); ++ if (x) ++ while (iplen <= 60) { ++- if (*x == '.') +++ if (*x == ' ' || *x == '\t' || *x == '\n') ++ ++x; ++ else { ++ i = ip4_scan(x,ip + iplen); +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/230-tinydns-data-semantic-error.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/230-tinydns-data-semantic-error.patch.svn-base +new file mode 100644 +index 0000000..69b9441 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/230-tinydns-data-semantic-error.patch.svn-base +@@ -0,0 +1,194 @@ ++--- a/tinydns-data.c +++++ b/tinydns-data.c ++@@ -25,6 +25,14 @@ ++ ++ #define FATAL "tinydns-data: fatal: " ++ +++void die_semantic2(const char * s1, const char * s2) +++{ +++ strerr_die3x(111,FATAL,s1,s2) ; +++} +++void die_semantic4(const char * s1, const char * s2,const char * s3, const char * s4) +++{ +++ strerr_die5x(111,FATAL,s1,s2,s3,s4) ; +++} ++ void die_datatmp(void) ++ { ++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++@@ -34,20 +42,39 @@ void nomem(void) ++ strerr_die1sys(111,FATAL); ++ } ++ +++void ttlparse(stralloc *sa,unsigned long * ttl, unsigned long defttl, const char * ltype) +++{ +++ int ttllen ; +++ +++ if (sa->len > 0) { +++ if (!stralloc_0(sa)) nomem(); +++ ttllen = scan_ulong(sa->s,ttl) ; +++ if (ttllen + 1 != sa->len) +++ die_semantic4("unparseable TTL in ",ltype," line: ", sa->s) ; +++ } else +++ *ttl = defttl; +++} +++ ++ void ttdparse(stralloc *sa,char ttd[8]) ++ { ++ unsigned int i; ++ char ch; ++ ++ byte_zero(ttd,8); ++- for (i = 0;(i < 16) && (i < sa->len);++i) { +++ for (i = 0;i < sa->len;++i) { +++ if (i >= 16) { +++ if (!stralloc_0(sa)) nomem() ; +++ die_semantic2("timestamp is too long: ", sa->s) ; +++ } ++ ch = sa->s[i]; ++ if ((ch >= '0') && (ch <= '9')) ++ ch -= '0'; ++ else if ((ch >= 'a') && (ch <= 'f')) ++ ch -= 'a' - 10; ++- else ++- ch = 0; +++ else { +++ if (!stralloc_0(sa)) nomem() ; +++ die_semantic2("timestamp contains an invalid character: ", sa->s) ; +++ } ++ if (!(i & 1)) ch <<= 4; ++ ttd[i >> 1] |= ch; ++ } ++@@ -55,6 +82,10 @@ void ttdparse(stralloc *sa,char ttd[8]) ++ ++ void locparse(stralloc *sa,char loc[2]) ++ { +++ if (sa->len > 2) { +++ if (!stralloc_0(sa)) nomem() ; +++ die_semantic2("location code longer than two characters: ", sa->s) ; +++ } ++ loc[0] = (sa->len > 0) ? sa->s[0] : 0; ++ loc[1] = (sa->len > 1) ? sa->s[1] : 0; ++ } ++@@ -187,6 +218,7 @@ int main() ++ int i; ++ int j; ++ int k; +++ int iplen ; ++ char ch; ++ unsigned long ttl; ++ char ttd[8]; ++@@ -267,8 +299,7 @@ int main() ++ if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u); ++ uint32_pack_big(soa + 16,u); ++ ++- if (!stralloc_0(&f[8])) nomem(); ++- if (!scan_ulong(f[8].s,&ttl)) ttl = TTL_NEGATIVE; +++ ttlparse(&f[8],&ttl,TTL_NEGATIVE,"Z"); ++ ttdparse(&f[9],ttd); ++ locparse(&f[10],loc); ++ ++@@ -283,8 +314,7 @@ int main() ++ ++ case '.': case '&': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[3])) nomem(); ++- if (!scan_ulong(f[3].s,&ttl)) ttl = TTL_NS; +++ ttlparse(&f[3],&ttl,TTL_NS,". or &"); ++ ttdparse(&f[4],ttd); ++ locparse(&f[5],loc); ++ ++@@ -309,24 +339,26 @@ int main() ++ rr_addname(d2); ++ rr_finish(d1); ++ ++- if (ip4_scan(f[1].s,ip)) { +++ iplen = ip4_scan(f[1].s,ip) ; +++ if (iplen != 0 && iplen + 1 == f[1].len) { ++ rr_start(DNS_T_A,ttl,ttd,loc); ++ rr_add(ip,4); ++ rr_finish(d2); ++- } +++ } else if (f[1].len > 1) +++ die_semantic4("unparseable IP address in ","& or ."," line: ", f[1].s) ; ++ ++ break; ++ ++ case '+': case '=': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[2])) nomem(); ++- if (!scan_ulong(f[2].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[2],&ttl,TTL_POSITIVE,"+ or ="); ++ ttdparse(&f[3],ttd); ++ locparse(&f[4],loc); ++ ++ if (!stralloc_0(&f[1])) nomem(); ++ ++- if (ip4_scan(f[1].s,ip)) { +++ iplen = ip4_scan(f[1].s,ip) ; +++ if (iplen != 0 && iplen + 1 == f[1].len) { ++ rr_start(DNS_T_A,ttl,ttd,loc); ++ rr_add(ip,4); ++ rr_finish(d1); ++@@ -337,13 +369,15 @@ int main() ++ rr_addname(d1); ++ rr_finish(dptr); ++ } ++- } +++ } else if (f[1].len > 1) +++ die_semantic4("unparseable IP address in ","+ or ="," line: ", f[1].s) ; +++ else +++ die_semantic4("missing IP address in ","+ or ="," line: ", f[1].s) ; ++ break; ++ ++ case '@': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[4])) nomem(); ++- if (!scan_ulong(f[4].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[4],&ttl,TTL_POSITIVE,"@"); ++ ttdparse(&f[5],ttd); ++ locparse(&f[6],loc); ++ ++@@ -401,18 +435,19 @@ int main() ++ rr_addname(d2); ++ rr_finish(d1); ++ ++- if (ip4_scan(f[1].s,ip)) { +++ iplen = ip4_scan(f[1].s,ip) ; +++ if (iplen != 0 && iplen + 1 == f[1].len) { ++ rr_start(DNS_T_A,ttl,ttd,loc); ++ rr_add(ip,4); ++ rr_finish(d2); ++- } +++ } else if (f[1].len > 1) +++ die_semantic4("unparseable IP address in ","@"," line: ", f[1].s) ; ++ break; ++ ++ case '^': case 'C': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++ if (!dns_domain_fromdot(&d2,f[1].s,f[1].len)) nomem(); ++- if (!stralloc_0(&f[2])) nomem(); ++- if (!scan_ulong(f[2].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[2],&ttl,TTL_POSITIVE,"^ or C"); ++ ttdparse(&f[3],ttd); ++ locparse(&f[4],loc); ++ ++@@ -426,8 +461,7 @@ int main() ++ ++ case '\'': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[2])) nomem(); ++- if (!scan_ulong(f[2].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[2],&ttl,TTL_POSITIVE,"\'"); ++ ttdparse(&f[3],ttd); ++ locparse(&f[4],loc); ++ ++@@ -449,8 +483,7 @@ int main() ++ ++ case ':': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[3])) nomem(); ++- if (!scan_ulong(f[3].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[3],&ttl,TTL_POSITIVE,":"); ++ ttdparse(&f[4],ttd); ++ locparse(&f[5],loc); ++ +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/240-tinydns-alias-chain-truncation.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/240-tinydns-alias-chain-truncation.patch.svn-base +new file mode 100644 +index 0000000..f94399e +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/240-tinydns-alias-chain-truncation.patch.svn-base +@@ -0,0 +1,87 @@ ++--- a/tdlookup.c +++++ b/tdlookup.c ++@@ -103,12 +103,13 @@ static int doname(void) ++ return response_addname(d1); ++ } ++ ++-static int doit(char *q,char qtype[2]) +++static int doit1(char **pqname,char qtype[2]) ++ { ++ unsigned int bpos; ++ unsigned int anpos; ++ unsigned int aupos; ++ unsigned int arpos; +++ char *q; ++ char *control; ++ char *wild; ++ int flaggavesoa; ++@@ -122,6 +123,12 @@ static int doit(char *q,char qtype[2]) ++ int addrnum; ++ uint32 addrttl; ++ int i; +++ int loop = 0 ; +++ +++RESTART: +++ if (loop++ >= 100) return 0 ; +++ +++ q = *pqname ; ++ ++ anpos = response_len; ++ ++@@ -136,7 +143,14 @@ static int doit(char *q,char qtype[2]) ++ if (byte_equal(type,2,DNS_T_NS)) flagns = 1; ++ } ++ if (flagns) break; ++- if (!*control) return 0; /* q is not within our bailiwick */ +++ if (!*control) { /* q is not within our bailiwick */ +++ if (loop <= 1) +++ return 0 ; +++ else { +++ response[2] &= ~4; +++ goto DONE; /* The administrator has issued contradictory instructions */ +++ } +++ } ++ control += *control; ++ control += 1; ++ } ++@@ -172,9 +186,17 @@ static int doit(char *q,char qtype[2]) ++ continue; ++ } ++ if (!response_rstart(q,type,ttl)) return 0; ++- if (byte_equal(type,2,DNS_T_NS) || byte_equal(type,2,DNS_T_CNAME) || byte_equal(type,2,DNS_T_PTR)) { +++ if (byte_equal(type,2,DNS_T_NS) || byte_equal(type,2,DNS_T_PTR)) { ++ if (!doname()) return 0; ++ } +++ else if (byte_equal(type,2,DNS_T_CNAME)) { +++ if (!doname()) return 0; +++ if (byte_diff(type,2,qtype)) { +++ response_rfinish(RESPONSE_ANSWER); +++ if (!dns_domain_copy(pqname,d1)) return 0 ; +++ goto RESTART ; +++ } +++ } ++ else if (byte_equal(type,2,DNS_T_MX)) { ++ if (!dobytes(2)) return 0; ++ if (!doname()) return 0; ++@@ -275,9 +297,21 @@ static int doit(char *q,char qtype[2]) ++ } ++ } ++ +++DONE: ++ return 1; ++ } ++ +++static int doit(char *qname,char qtype[2]) +++{ +++ int r ; +++ char * q = 0 ; +++ +++ if (!dns_domain_copy(&q, qname)) return 0 ; +++ r = doit1(&q, qtype) ; +++ dns_domain_free(&q) ; +++ return r ; +++} +++ ++ int respond(char *q,char qtype[2],char ip[4]) ++ { ++ static struct tai cdb_valid = { 0 }; +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/250-dnscache-slogging.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/250-dnscache-slogging.patch.svn-base +new file mode 100644 +index 0000000..5a2eaa1 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/250-dnscache-slogging.patch.svn-base +@@ -0,0 +1,122 @@ ++--- a/server.c +++++ b/server.c ++@@ -25,12 +25,63 @@ static int len; ++ ++ static char *q; ++ +++static uint64 stats_numq; +++static uint64 stats_plus; +++static uint64 stats_minus; +++static uint64 stats_nx; +++static uint64 stats_notimp; +++static uint64 stats_weird; +++static uint64 stats_noq; +++ +++/* work around gcc 2.95.2 bug */ +++#define number(x) ( (u64 = (x)), u64_print() ) +++static uint64 u64; +++static void u64_print(void) +++{ +++ char ubuf[20]; +++ unsigned int pos; +++ +++ pos = sizeof ubuf; +++ do { +++ if (!pos) break; +++ ubuf[--pos] = '0' + (u64 % 10); +++ u64 /= 10; +++ } while(u64); +++ +++ buffer_put(buffer_2,ubuf + pos,sizeof ubuf - pos); +++} +++ +++static void string(const char *s) +++{ +++ buffer_puts(buffer_2,s); +++} +++ +++static void line(void) +++{ +++ string("\n"); +++ buffer_flush(buffer_2); +++} +++ +++static void log_stats(void) +++{ +++ string("stats "); +++ number(stats_numq); string(" "); +++ number(stats_plus); string(" "); +++ number(stats_minus); string(" "); +++ number(stats_nx); string(" "); +++ number(stats_notimp); string(" "); +++ number(stats_weird); string(" "); +++ number(stats_noq); +++ line(); +++} +++ ++ static int doit(void) ++ { ++ unsigned int pos; ++ char header[12]; ++ char qtype[2]; ++ char qclass[2]; +++ stats_numq++; ++ ++ if (len >= sizeof buf) goto NOQ; ++ pos = dns_packet_copy(buf,len,0,header,12); if (!pos) goto NOQ; ++@@ -56,25 +107,37 @@ static int doit(void) ++ ++ case_lowerb(q,dns_domain_length(q)); ++ if (!respond(q,qtype,ip)) { +++ stats_minus++; ++ qlog(ip,port,header,q,qtype," - "); ++ return 0; ++ } ++- qlog(ip,port,header,q,qtype," + "); +++ +++ if ((response[2] & 4) && (response[3] & 3)) { +++ stats_nx++; +++ qlog(ip,port,header,q,qtype," N "); +++ } +++ else { +++ stats_plus++; +++ qlog(ip,port,header,q,qtype," + "); +++ } ++ return 1; ++ ++ NOTIMP: +++ stats_notimp++; ++ response[3] &= ~15; ++ response[3] |= 4; ++ qlog(ip,port,header,q,qtype," I "); ++ return 1; ++ ++ WEIRDCLASS: +++ stats_weird++; ++ response[3] &= ~15; ++ response[3] |= 1; ++ qlog(ip,port,header,q,qtype," C "); ++ return 1; ++ ++ NOQ: +++ stats_noq++; ++ qlog(ip,port,"\0\0","","\0\0"," / "); ++ return 0; ++ } ++@@ -83,6 +146,7 @@ int main() ++ { ++ char *x; ++ int udp53; +++ unsigned char flag=0; ++ ++ x = env_get("IP"); ++ if (!x) ++@@ -106,6 +170,8 @@ int main() ++ buffer_putsflush(buffer_2,starting); ++ ++ for (;;) { +++ if ((flag++)%32==1) +++ log_stats(); ++ len = socket_recv4(udp53,buf,sizeof buf,ip,&port); ++ if (len < 0) continue; ++ if (!doit()) continue; +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/260-dnsfilter-replace.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/260-dnsfilter-replace.patch.svn-base +new file mode 100644 +index 0000000..b352f1c +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/260-dnsfilter-replace.patch.svn-base +@@ -0,0 +1,71 @@ ++--- a/dnsfilter.c +++++ b/dnsfilter.c ++@@ -41,6 +41,7 @@ int inbuflen = 0; ++ iopause_fd *inio; ++ int flag0 = 1; ++ +++int opt_replace = 0; ++ iopause_fd *io; ++ int iolen; ++ ++@@ -51,12 +52,16 @@ char name[DNS_NAME4_DOMAIN]; ++ void errout(int i) ++ { ++ int j; ++- ++- if (!stralloc_copys(&x[i].middle,":")) nomem(); ++- if (!stralloc_cats(&x[i].middle,error_str(errno))) nomem(); ++- for (j = 0;j < x[i].middle.len;++j) ++- if (x[i].middle.s[j] == ' ') ++- x[i].middle.s[j] = '-'; +++ +++ if (opt_replace) +++ x[i].middle.len=0; +++ else { +++ if (!stralloc_copys(&x[i].middle,":")) nomem(); +++ if (!stralloc_cats(&x[i].middle,error_str(errno))) nomem(); +++ for (j = 0;j < x[i].middle.len;++j) +++ if (x[i].middle.s[j] == ' ') +++ x[i].middle.s[j] = '-'; +++ } ++ } ++ ++ int main(int argc,char **argv) ++@@ -69,7 +74,7 @@ int main(int argc,char **argv) ++ int j; ++ int r; ++ ++- while ((opt = getopt(argc,argv,"c:l:")) != opteof) +++ while ((opt = getopt(argc,argv,"c:l:r")) != opteof) ++ switch(opt) { ++ case 'c': ++ scan_ulong(optarg,&u); ++@@ -83,8 +88,11 @@ int main(int argc,char **argv) ++ if (u > 1000000) u = 1000000; ++ xmax = u; ++ break; +++ case 'r': +++ opt_replace = 1; +++ break; ++ default: ++- strerr_die1x(111,"dnsfilter: usage: dnsfilter [ -c concurrency ] [ -l lines ]"); +++ strerr_die1x(111,"dnsfilter: usage: dnsfilter [ -c concurrency ] [ -l lines ] [-r]"); ++ } ++ ++ x = (struct line *) alloc(xmax * sizeof(struct line)); ++@@ -140,8 +148,13 @@ int main(int argc,char **argv) ++ else if (r == 1) { ++ if (dns_name_packet(&x[i].middle,x[i].dt.packet,x[i].dt.packetlen) == -1) ++ errout(i); ++- if (x[i].middle.len) ++- if (!stralloc_cats(&x[i].left,"=")) nomem(); +++ if (x[i].middle.len) { +++ if (opt_replace) { +++ if (!stralloc_copys(&x[i].left, "")) nomem(); +++ } else { +++ if (!stralloc_cats(&x[i].left, "=")) nomem(); +++ } +++ } ++ x[i].flagactive = 0; ++ --numactive; ++ } +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/270-dnscache-sigpipe-fix.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/270-dnscache-sigpipe-fix.patch.svn-base +new file mode 100644 +index 0000000..17a739a +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/270-dnscache-sigpipe-fix.patch.svn-base +@@ -0,0 +1,16 @@ ++--- a/dnscache.c +++++ b/dnscache.c ++@@ -1,4 +1,5 @@ ++ #include +++#include ++ #include "env.h" ++ #include "exit.h" ++ #include "scan.h" ++@@ -391,6 +392,7 @@ int main() ++ char *x; ++ unsigned long cachesize; ++ +++ signal(SIGPIPE, SIG_IGN); ++ x = env_get("IP"); ++ if (!x) ++ strerr_die2x(111,FATAL,"$IP not set"); +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/280-dnscache-ignoreip2.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/280-dnscache-ignoreip2.patch.svn-base +new file mode 100644 +index 0000000..0a8bfad +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/280-dnscache-ignoreip2.patch.svn-base +@@ -0,0 +1,117 @@ ++This patch change djbdns's dnscache program so that it will ignore the ++IP address given in the ignoreip file. I wrote this patch because of ++Verisign's oh-so helpful wildcard A record for *.COM and *.NET. ++ ++If you have djbdns-1.05-ignoreip.patch installed, back it out like this: ++ cd /usr/local/src/djbdns-1.05 ++ patch -R /service/dnscache/root/ignoreip ++ svc -t /service/dnscache ++ ++Configure it to ignore all the cretins like this: ++awk '{print $2}' </service/dnscache/root/ignoreip ++ *.ac 194.205.62.122 ++ *.cc 206.253.214.102 ++ *.com 64.94.110.11 ++ *.cx 219.88.106.80 ++ *.museum 195.7.77.20 ++ *.net 64.94.110.11 ++ *.nu 64.55.105.9 ++ and 212.181.91.6 ++ *.ph 203.119.4.6 ++ *.sh 194.205.62.62 ++ *.tm 194.205.62.62 ++ *.ws 216.35.187.246 ++EOF ++ svc -t /service/dnscache ++ ++J.P. Larocque contributes a script which updates root/ignoreip: ++ http://ely.ath.cx/~piranha/software/ignoreip-update/ignoreip-update-0.1 ++ ++If root/ignoreip is not present, no addresses will be ignored. ++ ++-- ++--My blog is at angry-economist.russnelson.com | Free markets express in the ++Crynwr sells support for free software | PGPok | practical world our belief ++521 Pleasant Valley Rd. | +1 315 268 1925 voice | that there is that of God ++Potsdam, NY 13676-3213 | +1 315 268 9201 FAX | in all people. -Chris V. ++ ++ ++--- a/dnscache.c +++++ b/dnscache.c ++@@ -24,6 +24,8 @@ ++ #include "okclient.h" ++ #include "droproot.h" ++ +++stralloc ignoreip = {0}; +++ ++ static int packetquery(char *buf,unsigned int len,char **q,char qtype[2],char qclass[2],char id[2]) ++ { ++ unsigned int pos; ++@@ -390,6 +392,7 @@ char seed[128]; ++ int main() ++ { ++ char *x; +++ unsigned int i, j, k; ++ unsigned long cachesize; ++ ++ signal(SIGPIPE, SIG_IGN); ++@@ -433,6 +436,20 @@ int main() ++ if (!cache_init(cachesize)) ++ strerr_die3x(111,FATAL,"not enough memory for cache of size ",x); ++ +++ if (openreadclose("ignoreip",&ignoreip,64) < 0) +++ strerr_die2x(111,FATAL,"trouble reading ignoreip"); +++ for(j = k = i = 0; i < ignoreip.len; i++) +++ if (ignoreip.s[i] == '\n') { +++ ignoreip.s[i] = '\0'; +++ if (j + 4 > i) +++ strerr_die3x(111,FATAL,"badly malformed ip4 address ",ignoreip.s+k); +++ if (!ip4_scan(ignoreip.s+k,ignoreip.s+j)) +++ strerr_die3x(111,FATAL,"unable to parse address in ignoreip ",ignoreip.s+k); +++ j += 4; +++ k = i + 1; +++ } +++ ignoreip.len = j; +++ ++ if (env_get("HIDETTL")) ++ response_hidettl(); ++ if (env_get("FORWARDONLY")) ++--- a/query.c +++++ b/query.c ++@@ -13,6 +13,8 @@ ++ #include "response.h" ++ #include "query.h" ++ +++extern stralloc ignoreip; +++ ++ static int flagforwardonly = 0; ++ ++ void query_forwardonly(void) ++@@ -173,6 +175,7 @@ static int smaller(char *buf,unsigned in ++ ++ static int doit(struct query *z,int state) ++ { +++ unsigned int ii; ++ char key[257]; ++ char *cached; ++ unsigned int cachedlen; ++@@ -662,6 +665,9 @@ static int doit(struct query *z,int stat ++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; ++ if (byte_equal(header + 8,2,"\0\4")) { ++ pos = dns_packet_copy(buf,len,pos,header,4); if (!pos) goto DIE; +++ if (ignoreip.len) +++ for(ii = 0; ii < ignoreip.len; ii+= 4) +++ if (byte_equal(header,4,ignoreip.s+ii)) goto NXDOMAIN; ++ save_data(header,4); ++ log_rr(whichserver,t1,DNS_T_A,header,4,ttl); ++ } +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/300-bugfix-dnscache-dempsky-poison.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/300-bugfix-dnscache-dempsky-poison.patch.svn-base +new file mode 100644 +index 0000000..23d8e9f +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/300-bugfix-dnscache-dempsky-poison.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/response.c +++++ b/response.c ++@@ -34,7 +34,7 @@ int response_addname(const char *d) ++ uint16_pack_big(buf,49152 + name_ptr[i]); ++ return response_addbytes(buf,2); ++ } ++- if (dlen <= 128) +++ if ((dlen <= 128) && (response_len < 16384)) ++ if (name_num < NAMES) { ++ byte_copy(name[name_num],dlen,d); ++ name_ptr[name_num] = response_len; +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/310-bugfix-dnscache-merge-outgoing-requests.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/310-bugfix-dnscache-merge-outgoing-requests.patch.svn-base +new file mode 100644 +index 0000000..bb3a4e2 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/310-bugfix-dnscache-merge-outgoing-requests.patch.svn-base +@@ -0,0 +1,328 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -315,11 +315,11 @@ stralloc.h iopause.h taia.h tai.h uint64 ++ ./compile dns_txt.c ++ ++ dnscache: \ ++-load dnscache.o droproot.o okclient.o log.o cache.o query.o \ +++load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \ ++ response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \ ++ libtai.a unix.a byte.a socket.lib ++ ./load dnscache droproot.o okclient.o log.o cache.o \ ++- query.o response.o dd.o roots.o iopause.o prot.o dns.a \ +++ query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \ ++ env.a alloc.a buffer.a libtai.a unix.a byte.a `cat \ ++ socket.lib` ++ ++@@ -340,7 +340,7 @@ compile dnscache.c env.h exit.h scan.h s ++ uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \ ++ iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \ ++ iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \ ++-uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h +++uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h ++ ./compile dnscache.c ++ ++ dnsfilter: \ ++@@ -685,11 +685,16 @@ qlog.o: \ ++ compile qlog.c buffer.h qlog.h uint16.h ++ ./compile qlog.c ++ +++qmerge.o: \ +++compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \ +++taia.h tai.h uint64.h log.h maxclient.h +++ ./compile qmerge.c +++ ++ query.o: \ ++ compile query.c error.h roots.h log.h uint64.h case.h cache.h \ ++ uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \ ++ taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \ ++-response.h uint32.h query.h dns.h uint32.h +++response.h uint32.h query.h dns.h uint32.h qmerge.h ++ ./compile query.c ++ ++ random-ip: \ ++--- a/dnscache.c +++++ b/dnscache.c ++@@ -20,6 +20,7 @@ ++ #include "response.h" ++ #include "cache.h" ++ #include "ndelay.h" +++#include "maxclient.h" ++ #include "log.h" ++ #include "okclient.h" ++ #include "droproot.h" ++@@ -57,7 +58,6 @@ uint64 numqueries = 0; ++ ++ static int udp53; ++ ++-#define MAXUDP 200 ++ static struct udpclient { ++ struct query q; ++ struct taia start; ++@@ -134,7 +134,6 @@ void u_new(void) ++ ++ static int tcp53; ++ ++-#define MAXTCP 20 ++ struct tcpclient { ++ struct query q; ++ struct taia start; ++--- a/log.c +++++ b/log.c ++@@ -151,6 +151,13 @@ void log_tx(const char *q,const char qty ++ line(); ++ } ++ +++void log_tx_piggyback(const char *q, const char qtype[2], const char *control) +++{ +++ string("txpb "); +++ logtype(qtype); space(); name(q); space(); name(control); +++ line(); +++} +++ ++ void log_cachedanswer(const char *q,const char type[2]) ++ { ++ string("cached "); logtype(type); space(); ++--- a/log.h +++++ b/log.h ++@@ -20,6 +20,7 @@ extern void log_cachednxdomain(const cha ++ extern void log_cachedns(const char *,const char *); ++ ++ extern void log_tx(const char *,const char *,const char *,const char *,unsigned int); +++extern void log_tx_piggyback(const char *,const char *,const char *); ++ ++ extern void log_nxdomain(const char *,const char *,unsigned int); ++ extern void log_nodata(const char *,const char *,const char *,unsigned int); ++--- /dev/null +++++ b/maxclient.h ++@@ -0,0 +1,7 @@ +++#ifndef MAXCLIENT_H +++#define MAXCLIENT_H +++ +++#define MAXUDP 200 +++#define MAXTCP 20 +++ +++#endif /* MAXCLIENT_H */ ++--- /dev/null +++++ b/qmerge.c ++@@ -0,0 +1,115 @@ +++#include "qmerge.h" +++#include "byte.h" +++#include "log.h" +++#include "maxclient.h" +++ +++#define QMERGE_MAX (MAXUDP+MAXTCP) +++struct qmerge inprogress[QMERGE_MAX]; +++ +++static +++int qmerge_key_init(struct qmerge_key *qmk, const char *q, const char qtype[2], +++ const char *control) +++{ +++ if (!dns_domain_copy(&qmk->q, q)) return 0; +++ byte_copy(qmk->qtype, 2, qtype); +++ if (!dns_domain_copy(&qmk->control, control)) return 0; +++ return 1; +++} +++ +++static +++int qmerge_key_equal(struct qmerge_key *a, struct qmerge_key *b) +++{ +++ return +++ byte_equal(a->qtype, 2, b->qtype) && +++ dns_domain_equal(a->q, b->q) && +++ dns_domain_equal(a->control, b->control); +++} +++ +++static +++void qmerge_key_free(struct qmerge_key *qmk) +++{ +++ dns_domain_free(&qmk->q); +++ dns_domain_free(&qmk->control); +++} +++ +++void qmerge_free(struct qmerge **x) +++{ +++ struct qmerge *qm; +++ +++ qm = *x; +++ *x = 0; +++ if (!qm || !qm->active) return; +++ +++ qm->active--; +++ if (!qm->active) { +++ qmerge_key_free(&qm->key); +++ dns_transmit_free(&qm->dt); +++ } +++} +++ +++int qmerge_start(struct qmerge **qm, const char servers[64], int flagrecursive, +++ const char *q, const char qtype[2], const char localip[4], +++ const char *control) +++{ +++ struct qmerge_key k; +++ int i; +++ int r; +++ +++ qmerge_free(qm); +++ +++ byte_zero(&k, sizeof k); +++ if (!qmerge_key_init(&k, q, qtype, control)) return -1; +++ for (i = 0; i < QMERGE_MAX; i++) { +++ if (!inprogress[i].active) continue; +++ if (!qmerge_key_equal(&k, &inprogress[i].key)) continue; +++ log_tx_piggyback(q, qtype, control); +++ inprogress[i].active++; +++ *qm = &inprogress[i]; +++ qmerge_key_free(&k); +++ return 0; +++ } +++ +++ for (i = 0; i < QMERGE_MAX; i++) +++ if (!inprogress[i].active) +++ break; +++ if (i == QMERGE_MAX) return -1; +++ +++ log_tx(q, qtype, control, servers, 0); +++ r = dns_transmit_start(&inprogress[i].dt, servers, flagrecursive, q, qtype, localip); +++ if (r == -1) { qmerge_key_free(&k); return -1; } +++ inprogress[i].active++; +++ inprogress[i].state = 0; +++ qmerge_key_free(&inprogress[i].key); +++ byte_copy(&inprogress[i].key, sizeof k, &k); +++ *qm = &inprogress[i]; +++ return 0; +++} +++ +++void qmerge_io(struct qmerge *qm, iopause_fd *io, struct taia *deadline) +++{ +++ if (qm->state == 0) { +++ dns_transmit_io(&qm->dt, io, deadline); +++ qm->state = 1; +++ } +++ else { +++ io->fd = -1; +++ io->events = 0; +++ } +++} +++ +++int qmerge_get(struct qmerge **x, const iopause_fd *io, const struct taia *when) +++{ +++ int r; +++ struct qmerge *qm; +++ +++ qm = *x; +++ if (qm->state == -1) return -1; /* previous error */ +++ if (qm->state == 0) return 0; /* no packet */ +++ if (qm->state == 2) return 1; /* already got packet */ +++ +++ r = dns_transmit_get(&qm->dt, io, when); +++ if (r == -1) { qm->state = -1; return -1; } /* error */ +++ if (r == 0) { qm->state = 0; return 0; } /* must wait for i/o */ +++ if (r == 1) { qm->state = 2; return 1; } /* got packet */ +++ return -1; /* bug */ +++} ++--- /dev/null +++++ b/qmerge.h ++@@ -0,0 +1,24 @@ +++#ifndef QMERGE_H +++#define QMERGE_H +++ +++#include "dns.h" +++ +++struct qmerge_key { +++ char *q; +++ char qtype[2]; +++ char *control; +++}; +++ +++struct qmerge { +++ int active; +++ struct qmerge_key key; +++ struct dns_transmit dt; +++ int state; /* -1 = error, 0 = need io, 1 = need get, 2 = got packet */ +++}; +++ +++extern int qmerge_start(struct qmerge **,const char *,int,const char *,const char *,const char *,const char *); +++extern void qmerge_io(struct qmerge *,iopause_fd *,struct taia *); +++extern int qmerge_get(struct qmerge **,const iopause_fd *,const struct taia *); +++extern void qmerge_free(struct qmerge **); +++ +++#endif /* QMERGE_H */ ++--- a/query.c +++++ b/query.c ++@@ -83,7 +83,7 @@ static void cleanup(struct query *z) ++ int j; ++ int k; ++ ++- dns_transmit_free(&z->dt); +++ qmerge_free(&z->qm); ++ for (j = 0;j < QUERY_MAXALIAS;++j) ++ dns_domain_free(&z->alias[j]); ++ for (j = 0;j < QUERY_MAXLEVEL;++j) { ++@@ -452,14 +452,8 @@ static int doit(struct query *z,int stat ++ if (j == 64) goto SERVFAIL; ++ ++ dns_sortip(z->servers[z->level],64); ++- if (z->level) { ++- log_tx(z->name[z->level],DNS_T_A,z->control[z->level],z->servers[z->level],z->level); ++- if (dns_transmit_start(&z->dt,z->servers[z->level],flagforwardonly,z->name[z->level],DNS_T_A,z->localip) == -1) goto DIE; ++- } ++- else { ++- log_tx(z->name[0],z->type,z->control[0],z->servers[0],0); ++- if (dns_transmit_start(&z->dt,z->servers[0],flagforwardonly,z->name[0],z->type,z->localip) == -1) goto DIE; ++- } +++ dtype = z->level ? DNS_T_A : z->type; +++ if (qmerge_start(&z->qm,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip,z->control[z->level]) == -1) goto DIE; ++ return 0; ++ ++ ++@@ -473,10 +467,10 @@ static int doit(struct query *z,int stat ++ ++ HAVEPACKET: ++ if (++z->loop == 100) goto DIE; ++- buf = z->dt.packet; ++- len = z->dt.packetlen; +++ buf = z->qm->dt.packet; +++ len = z->qm->dt.packetlen; ++ ++- whichserver = z->dt.servers + 4 * z->dt.curserver; +++ whichserver = z->qm->dt.servers + 4 * z->qm->dt.curserver; ++ control = z->control[z->level]; ++ d = z->name[z->level]; ++ dtype = z->level ? DNS_T_A : z->type; ++@@ -902,7 +896,7 @@ int query_start(struct query *z,char *dn ++ ++ int query_get(struct query *z,iopause_fd *x,struct taia *stamp) ++ { ++- switch(dns_transmit_get(&z->dt,x,stamp)) { +++ switch(qmerge_get(&z->qm,x,stamp)) { ++ case 1: ++ return doit(z,1); ++ case -1: ++@@ -913,5 +907,5 @@ int query_get(struct query *z,iopause_fd ++ ++ void query_io(struct query *z,iopause_fd *x,struct taia *deadline) ++ { ++- dns_transmit_io(&z->dt,x,deadline); +++ qmerge_io(z->qm,x,deadline); ++ } ++--- a/query.h +++++ b/query.h ++@@ -1,7 +1,7 @@ ++ #ifndef QUERY_H ++ #define QUERY_H ++ ++-#include "dns.h" +++#include "qmerge.h" ++ #include "uint32.h" ++ ++ #define QUERY_MAXLEVEL 5 ++@@ -20,7 +20,7 @@ struct query { ++ char localip[4]; ++ char type[2]; ++ char class[2]; ++- struct dns_transmit dt; +++ struct qmerge *qm; ++ } ; ++ ++ extern int query_start(struct query *,char *,char *,char *,char *); +diff --git a/feeds/packages/net/djbdns/patches/.svn/text-base/320-bugfix-dnscache-cache-soa-records.patch.svn-base b/feeds/packages/net/djbdns/patches/.svn/text-base/320-bugfix-dnscache-cache-soa-records.patch.svn-base +new file mode 100644 +index 0000000..f2b72a3 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/.svn/text-base/320-bugfix-dnscache-cache-soa-records.patch.svn-base +@@ -0,0 +1,67 @@ ++--- a/query.c +++++ b/query.c ++@@ -342,6 +342,29 @@ static int doit(struct query *z,int stat ++ } ++ } ++ +++ if (typematch(DNS_T_SOA,dtype)) { +++ byte_copy(key,2,DNS_T_SOA); +++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); +++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { +++ log_cachedanswer(d,DNS_T_SOA); +++ if (!rqa(z)) goto DIE; +++ pos = 0; +++ while (pos = dns_packet_copy(cached,cachedlen,pos,misc,20)) { +++ pos = dns_packet_getname(cached,cachedlen,pos,&t2); +++ if (!pos) break; +++ pos = dns_packet_getname(cached,cachedlen,pos,&t3); +++ if (!pos) break; +++ if (!response_rstart(d,DNS_T_SOA,ttl)) goto DIE; +++ if (!response_addname(t2)) goto DIE; +++ if (!response_addname(t3)) goto DIE; +++ if (!response_addbytes(misc,20)) goto DIE; +++ response_rfinish(RESPONSE_ANSWER); +++ } +++ cleanup(z); +++ return 1; +++ } +++ } +++ ++ if (typematch(DNS_T_A,dtype)) { ++ byte_copy(key,2,DNS_T_A); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++@@ -374,7 +397,7 @@ static int doit(struct query *z,int stat ++ } ++ } ++ ++- if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) { +++ if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_SOA,dtype)) { ++ byte_copy(key,2,dtype); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { ++@@ -601,15 +624,24 @@ static int doit(struct query *z,int stat ++ else if (byte_equal(type,2,DNS_T_AXFR)) ++ ; ++ else if (byte_equal(type,2,DNS_T_SOA)) { +++ int non_authority = 0; +++ save_start(); ++ while (i < j) { ++ pos = dns_packet_skipname(buf,len,records[i]); if (!pos) goto DIE; ++ pos = dns_packet_getname(buf,len,pos + 10,&t2); if (!pos) goto DIE; ++ pos = dns_packet_getname(buf,len,pos,&t3); if (!pos) goto DIE; ++ pos = dns_packet_copy(buf,len,pos,misc,20); if (!pos) goto DIE; ++- if (records[i] < posauthority) +++ if (records[i] < posauthority) { ++ log_rrsoa(whichserver,t1,t2,t3,misc,ttl); +++ save_data(misc,20); +++ save_data(t2,dns_domain_length(t2)); +++ save_data(t3,dns_domain_length(t3)); +++ non_authority++; +++ } ++ ++i; ++ } +++ if (non_authority) +++ save_finish(DNS_T_SOA,t1,ttl); ++ } ++ else if (byte_equal(type,2,DNS_T_CNAME)) { ++ pos = dns_packet_skipname(buf,len,records[j - 1]); if (!pos) goto DIE; +diff --git a/feeds/packages/net/djbdns/patches/010-crosscompile.patch b/feeds/packages/net/djbdns/patches/010-crosscompile.patch +new file mode 100644 +index 0000000..68ce1c3 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/010-crosscompile.patch +@@ -0,0 +1,170 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -29,10 +29,6 @@ auto-str.o: \ ++ compile auto-str.c buffer.h exit.h ++ ./compile auto-str.c ++ ++-auto_home.c: \ ++-auto-str conf-home ++- ./auto-str auto_home `head -1 conf-home` > auto_home.c ++- ++ auto_home.o: \ ++ compile auto_home.c ++ ./compile auto_home.c ++@@ -221,10 +217,6 @@ compile dd.c dns.h stralloc.h gen_alloc. ++ uint64.h taia.h dd.h ++ ./compile dd.c ++ ++-direntry.h: \ ++-choose compile trydrent.c direntry.h1 direntry.h2 ++- ./choose c trydrent direntry.h1 direntry.h2 > direntry.h ++- ++ dns.a: \ ++ makelib dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ipq.o dns_mx.o \ ++ dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ ++@@ -508,12 +500,6 @@ systype hasdevtcp.h1 hasdevtcp.h2 ++ *) cat hasdevtcp.h1 ;; \ ++ esac ) > hasdevtcp.h ++ ++-hasshsgr.h: \ ++-choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 chkshsgr \ ++-warn-shsgr ++- ./chkshsgr || ( cat warn-shsgr; exit 1 ) ++- ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h ++- ++ hier.o: \ ++ compile hier.c auto_home.h ++ ./compile hier.c ++@@ -534,10 +520,6 @@ instcheck.o: \ ++ compile instcheck.c strerr.h error.h exit.h ++ ./compile instcheck.c ++ ++-iopause.h: \ ++-choose compile load trypoll.c iopause.h1 iopause.h2 ++- ./choose clr trypoll iopause.h1 iopause.h2 > iopause.h ++- ++ iopause.o: \ ++ compile iopause.c taia.h tai.h uint64.h select.h iopause.h taia.h ++ ./compile iopause.c ++@@ -590,7 +572,7 @@ warn-auto.sh systype ++ dgux-*) ;; \ ++ hp-ux-*) ;; \ ++ sco*) ;; \ ++- *) echo 'ranlib "$$main"' ;; \ +++ *) echo '$(if $(TARGET_RANLIB),$(TARGET_RANLIB),ranlib) "$$main"' ;; \ ++ esac \ ++ ) > makelib ++ chmod 755 makelib ++@@ -766,10 +748,6 @@ seek_set.o: \ ++ compile seek_set.c seek.h ++ ./compile seek_set.c ++ ++-select.h: \ ++-choose compile trysysel.c select.h1 select.h2 ++- ./choose c trysysel select.h1 select.h2 > select.h ++- ++ server.o: \ ++ compile server.c byte.h case.h env.h buffer.h strerr.h ip4.h uint16.h \ ++ ndelay.h socket.h uint16.h droproot.h qlog.h uint16.h response.h \ ++@@ -1060,10 +1038,6 @@ uint32_unpack.o: \ ++ compile uint32_unpack.c uint32.h ++ ./compile uint32_unpack.c ++ ++-uint64.h: \ ++-choose compile load tryulong64.c uint64.h1 uint64.h2 ++- ./choose clr tryulong64 uint64.h1 uint64.h2 > uint64.h ++- ++ unix.a: \ ++ makelib buffer_read.o buffer_write.o error.o error_str.o ndelay_off.o \ ++ ndelay_on.o open_read.o open_trunc.o openreadclose.o readclose.o \ ++--- /dev/null +++++ b/auto_home.c ++@@ -0,0 +1,3 @@ +++const char auto_home[] = "\ +++\057\165\163\162\ +++"; ++--- a/conf-cc +++++ b/conf-cc ++@@ -1,3 +1,3 @@ ++-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings +++$TARGET_CC $TARGET_CFLAGS -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h ++ ++ This will be used to compile .c files. ++--- a/conf-home +++++ b/conf-home ++@@ -1,4 +1,4 @@ ++-/usr/local +++/usr ++ ++ This is the dnscache home directory. Programs will be installed in ++ .../bin. ++--- a/conf-ld +++++ b/conf-ld ++@@ -1,3 +1,3 @@ ++-gcc -s +++$TARGET_CC -s $TARGET_LDFLAGS ++ ++ This will be used to link .o files into an executable. ++--- /dev/null +++++ b/direntry.h ++@@ -0,0 +1,10 @@ +++#ifndef DIRENTRY_H +++#define DIRENTRY_H +++ +++/* sysdep: +dirent */ +++ +++#include +++#include +++#define direntry struct dirent +++ +++#endif ++--- /dev/null +++++ b/hasshsgr.h ++@@ -0,0 +1 @@ +++/* sysdep: -shortsetgroups */ ++--- /dev/null +++++ b/iopause.h ++@@ -0,0 +1,18 @@ +++#ifndef IOPAUSE_H +++#define IOPAUSE_H +++ +++/* sysdep: +poll */ +++#define IOPAUSE_POLL +++ +++#include +++#include +++ +++typedef struct pollfd iopause_fd; +++#define IOPAUSE_READ POLLIN +++#define IOPAUSE_WRITE POLLOUT +++ +++#include "taia.h" +++ +++extern void iopause(iopause_fd *,unsigned int,struct taia *,struct taia *); +++ +++#endif ++--- /dev/null +++++ b/select.h ++@@ -0,0 +1,11 @@ +++#ifndef SELECT_H +++#define SELECT_H +++ +++/* sysdep: +sysselect */ +++ +++#include +++#include +++#include +++extern int select(); +++ +++#endif ++--- /dev/null +++++ b/uint64.h ++@@ -0,0 +1,8 @@ +++#ifndef UINT64_H +++#define UINT64_H +++ +++/* sysdep: -ulong64 */ +++ +++typedef unsigned long long uint64; +++ +++#endif +diff --git a/feeds/packages/net/djbdns/patches/020-dnsroots-update.patch b/feeds/packages/net/djbdns/patches/020-dnsroots-update.patch +new file mode 100644 +index 0000000..ce5b863 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/020-dnsroots-update.patch +@@ -0,0 +1,19 @@ ++--- a/dnsroots.global +++++ b/dnsroots.global ++@@ -1,5 +1,5 @@ ++ 198.41.0.4 ++-128.9.0.107 +++192.228.79.201 ++ 192.33.4.12 ++ 128.8.10.90 ++ 192.203.230.10 ++@@ -7,7 +7,7 @@ ++ 192.112.36.4 ++ 128.63.2.53 ++ 192.36.148.17 ++-198.41.0.10 +++192.58.128.30 ++ 193.0.14.129 ++-198.32.64.12 +++199.7.83.42 ++ 202.12.27.33 +diff --git a/feeds/packages/net/djbdns/patches/030-srv-records-and-axfrget.patch b/feeds/packages/net/djbdns/patches/030-srv-records-and-axfrget.patch +new file mode 100644 +index 0000000..1d16380 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/030-srv-records-and-axfrget.patch +@@ -0,0 +1,135 @@ ++From: Michael Handler ++To: dns@list.cr.yp.to ++Subject: tinydns-data SRV & axfr-get SRV/PTR patches ++Date: Thu, 14 Sep 2000 20:37:50 -0400 ++ ++Here's a combined patch that: ++ ++a) adds a native SRV type to tinydns-data ++ ++Sfqdn:ip:x:port:weight:priority:ttl:timestamp ++ ++Standard rules for ip, x, ttl, and timestamp apply. Port, weight, and ++priority all range from 0-65535. Weight and priority are optional; they ++default to zero if not provided. ++ ++Sconsole.zoinks.example.com:1.2.3.4:rack102-con1:2001:69:7:300: ++ ++b) makes axfr-get decompose SRV and PTR records and write them out in ++native format, rather than opaque. Again, this is necessary because if the ++DNAME fields in the records reference the same zone as fqdn, they can have ++compression pointers that are bogus outside the context of that specific ++packet, and which can't be correctly loaded into data.cdb by tinydns-data. ++ ++--michael ++ ++Laurent G. Bercot updated it for djbdns-1.05: ++ ++--- a/axfr-get.c +++++ b/axfr-get.c ++@@ -209,6 +209,26 @@ unsigned int doit(char *buf,unsigned int ++ if (!stralloc_cats(&line,".:")) return 0; ++ if (!stralloc_catulong0(&line,dist,0)) return 0; ++ } +++ else if (byte_equal(data,2,DNS_T_SRV)) { +++ uint16 dist, weight, port; +++ if (!stralloc_copys(&line,"S")) return 0; +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,"::")) return 0; +++ pos = x_copy(buf,len,pos,data,2); +++ uint16_unpack_big(data,&dist); +++ pos = x_copy(buf,len,pos,data,2); +++ uint16_unpack_big(data,&weight); +++ pos = x_copy(buf,len,pos,data,2); +++ uint16_unpack_big(data,&port); +++ x_getname(buf,len,pos,&d1); +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,".:")) return 0; +++ if (!stralloc_catulong0(&line,dist,0)) return 0; +++ if (!stralloc_cats(&line,":")) return 0; +++ if (!stralloc_catulong0(&line,weight,0)) return 0; +++ if (!stralloc_cats(&line,":")) return 0; +++ if (!stralloc_catulong0(&line,port,0)) return 0; +++ } ++ else if (byte_equal(data,2,DNS_T_A) && (dlen == 4)) { ++ char ipstr[IP4_FMT]; ++ if (!stralloc_copys(&line,"+")) return 0; ++@@ -217,6 +237,14 @@ unsigned int doit(char *buf,unsigned int ++ x_copy(buf,len,pos,data,4); ++ if (!stralloc_catb(&line,ipstr,ip4_fmt(ipstr,data))) return 0; ++ } +++ else if (byte_equal(data,2,DNS_T_PTR)) { +++ if (!stralloc_copys(&line,"^")) return 0; +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,":")) return 0; +++ x_getname(buf,len,pos,&d1); +++ if (!dns_domain_todot_cat(&line,d1)) return 0; +++ if (!stralloc_cats(&line,".")) return 0; +++ } ++ else { ++ unsigned char ch; ++ unsigned char ch2; ++--- a/dns.h +++++ b/dns.h ++@@ -20,6 +20,7 @@ ++ #define DNS_T_SIG "\0\30" ++ #define DNS_T_KEY "\0\31" ++ #define DNS_T_AAAA "\0\34" +++#define DNS_T_SRV "\0\41" ++ #define DNS_T_AXFR "\0\374" ++ #define DNS_T_ANY "\0\377" ++ ++--- a/tinydns-data.c +++++ b/tinydns-data.c ++@@ -196,6 +196,7 @@ int main() ++ char type[2]; ++ char soa[20]; ++ char buf[4]; +++ char srv[6]; ++ ++ umask(022); ++ ++@@ -369,6 +370,43 @@ int main() ++ rr_finish(d2); ++ } ++ break; +++ +++ case 'S': +++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); +++ if (!stralloc_0(&f[6])) nomem(); +++ if (!scan_ulong(f[6].s,&ttl)) ttl = TTL_POSITIVE; +++ ttdparse(&f[7],ttd); +++ locparse(&f[8],loc); +++ +++ if (!stralloc_0(&f[1])) nomem(); +++ +++ if (byte_chr(f[2].s,f[2].len,'.') >= f[2].len) { +++ if (!stralloc_cats(&f[2],".srv.")) nomem(); +++ if (!stralloc_catb(&f[2],f[0].s,f[0].len)) nomem(); +++ } +++ if (!dns_domain_fromdot(&d2,f[2].s,f[2].len)) nomem(); +++ +++ if (!stralloc_0(&f[4])) nomem(); +++ if (!scan_ulong(f[4].s,&u)) u = 0; +++ uint16_pack_big(srv,u); +++ if (!stralloc_0(&f[5])) nomem(); +++ if (!scan_ulong(f[5].s,&u)) u = 0; +++ uint16_pack_big(srv + 2,u); +++ if (!stralloc_0(&f[3])) nomem(); +++ if (!scan_ulong(f[3].s,&u)) nomem(); +++ uint16_pack_big(srv + 4,u); +++ +++ rr_start(DNS_T_SRV,ttl,ttd,loc); +++ rr_add(srv,6); +++ rr_addname(d2); +++ rr_finish(d1); +++ +++ if (ip4_scan(f[1].s,ip)) { +++ rr_start(DNS_T_A,ttl,ttd,loc); +++ rr_add(ip,4); +++ rr_finish(d2); +++ } +++ break; ++ ++ case '^': case 'C': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); +diff --git a/feeds/packages/net/djbdns/patches/040-dnscache-less-chatty-log.patch b/feeds/packages/net/djbdns/patches/040-dnscache-less-chatty-log.patch +new file mode 100644 +index 0000000..9a881c9 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/040-dnscache-less-chatty-log.patch +@@ -0,0 +1,39 @@ ++--- a/log.h +++++ b/log.h ++@@ -1,6 +1,8 @@ ++ #ifndef LOG_H ++ #define LOG_H ++ +++#define STATS_DISPLAY_INTERVAL 5 +++ ++ #include "uint64.h" ++ ++ extern void log_startup(void); ++--- a/log.c +++++ b/log.c ++@@ -1,6 +1,7 @@ ++ #include "buffer.h" ++ #include "uint32.h" ++ #include "uint16.h" +++#include "time.h" ++ #include "error.h" ++ #include "byte.h" ++ #include "log.h" ++@@ -274,11 +275,17 @@ void log_rrsoa(const char server[4],cons ++ ++ void log_stats(void) ++ { +++ static time_t prev = 0; +++ time_t cur = time(NULL); ++ extern uint64 numqueries; ++ extern uint64 cache_motion; ++ extern int uactive; ++ extern int tactive; ++ +++ if(prev == 0) prev = time(NULL); +++ if(cur - prev < STATS_DISPLAY_INTERVAL) return; +++ prev = cur; +++ ++ string("stats "); ++ number(numqueries); space(); ++ number(cache_motion); space(); +diff --git a/feeds/packages/net/djbdns/patches/050-tinydns-mmap-leak.patch b/feeds/packages/net/djbdns/patches/050-tinydns-mmap-leak.patch +new file mode 100644 +index 0000000..1885612 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/050-tinydns-mmap-leak.patch +@@ -0,0 +1,22 @@ ++--- a/tdlookup.c +++++ b/tdlookup.c ++@@ -298,9 +298,17 @@ int respond(char *q,char qtype[2],char i ++ if (!r) r = cdb_find(&c,key,4); ++ if (!r) r = cdb_find(&c,key,3); ++ if (!r) r = cdb_find(&c,key,2); ++- if (r == -1) return 0; +++ if (r == -1) { +++ cdb_free(&c); +++ close(fd); +++ return 0; +++ } ++ if (r && (cdb_datalen(&c) == 2)) ++- if (cdb_read(&c,clientloc,2,cdb_datapos(&c)) == -1) return 0; +++ if (cdb_read(&c,clientloc,2,cdb_datapos(&c)) == -1) { +++ cdb_free(&c); +++ close(fd); +++ return 0; +++ } ++ ++ r = doit(q,qtype); ++ +diff --git a/feeds/packages/net/djbdns/patches/060-dnscache-big-udp-packets.patch b/feeds/packages/net/djbdns/patches/060-dnscache-big-udp-packets.patch +new file mode 100644 +index 0000000..8f2c142 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/060-dnscache-big-udp-packets.patch +@@ -0,0 +1,11 @@ ++--- a/dns_transmit.c +++++ b/dns_transmit.c ++@@ -240,7 +240,7 @@ void dns_transmit_io(struct dns_transmit ++ ++ int dns_transmit_get(struct dns_transmit *d,const iopause_fd *x,const struct taia *when) ++ { ++- char udpbuf[513]; +++ char udpbuf[4097]; ++ unsigned char ch; ++ int r; ++ int fd; +diff --git a/feeds/packages/net/djbdns/patches/070-dnscache-dpos-tcp-servfail.patch b/feeds/packages/net/djbdns/patches/070-dnscache-dpos-tcp-servfail.patch +new file mode 100644 +index 0000000..8d30d5e +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/070-dnscache-dpos-tcp-servfail.patch +@@ -0,0 +1,10 @@ ++--- a/dns_transmit.c +++++ b/dns_transmit.c ++@@ -166,6 +166,7 @@ static int thistcp(struct dns_transmit * ++ taia_uint(&d->deadline,10); ++ taia_add(&d->deadline,&d->deadline,&now); ++ if (socket_connect4(d->s1 - 1,ip,53) == 0) { +++ d->pos = 0; ++ d->tcpstate = 2; ++ return 0; ++ } +diff --git a/feeds/packages/net/djbdns/patches/080-dnscache-cache-negatives.patch b/feeds/packages/net/djbdns/patches/080-dnscache-cache-negatives.patch +new file mode 100644 +index 0000000..793ac87 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/080-dnscache-cache-negatives.patch +@@ -0,0 +1,41 @@ ++--- a/query.c +++++ b/query.c ++@@ -193,6 +193,7 @@ static int doit(struct query *z,int stat ++ int k; ++ int p; ++ int q; +++ uint32 cachettl; ++ ++ errno = error_io; ++ if (state == 1) goto HAVEPACKET; ++@@ -470,6 +471,7 @@ static int doit(struct query *z,int stat ++ rcode = header[3] & 15; ++ if (rcode && (rcode != 3)) goto DIE; /* impossible; see irrelevant() */ ++ +++ cachettl = 0; ++ flagout = 0; ++ flagcname = 0; ++ flagreferral = 0; ++@@ -512,6 +514,11 @@ static int doit(struct query *z,int stat ++ ++ uint16_unpack_big(header + 8,&datalen); ++ pos += datalen; +++ +++ if (flagsoa && (pos <= len)) { +++ cachettl = ttlget(buf + pos - 4); +++ if (soattl < cachettl) cachettl = soattl; +++ } ++ } ++ posglue = pos; ++ ++@@ -689,8 +696,8 @@ static int doit(struct query *z,int stat ++ } ++ ++ if (rcode == 3) { ++- log_nxdomain(whichserver,d,soattl); ++- cachegeneric(DNS_T_ANY,d,"",0,soattl); +++ log_nxdomain(whichserver,d,cachettl); +++ cachegeneric(DNS_T_ANY,d,"",0,cachettl); ++ ++ NXDOMAIN: ++ if (z->level) goto LOWERLEVEL; +diff --git a/feeds/packages/net/djbdns/patches/090-tinydns-one-second.patch b/feeds/packages/net/djbdns/patches/090-tinydns-one-second.patch +new file mode 100644 +index 0000000..660bbcb +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/090-tinydns-one-second.patch +@@ -0,0 +1,40 @@ ++--- a/tdlookup.c +++++ b/tdlookup.c ++@@ -280,15 +280,24 @@ static int doit(char *q,char qtype[2]) ++ ++ int respond(char *q,char qtype[2],char ip[4]) ++ { ++- int fd; +++ static struct tai cdb_valid = { 0 }; +++ static int fd = -1; +++ struct tai one_second; ++ int r; ++ char key[6]; ++ ++ tai_now(&now); ++- fd = open_read("data.cdb"); ++- if (fd == -1) return 0; ++- cdb_init(&c,fd); ++- +++ if (tai_less(&cdb_valid, &now)) { +++ if (fd != -1) { +++ cdb_free(&c); +++ close(fd); +++ } +++ fd = open_read("data.cdb"); +++ if (fd == -1) return 0; +++ cdb_init(&c,fd); +++ tai_uint(&one_second, 1); +++ tai_add(&cdb_valid, &now, &one_second); +++ } ++ byte_zero(clientloc,2); ++ key[0] = 0; ++ key[1] = '%'; ++@@ -312,7 +321,5 @@ int respond(char *q,char qtype[2],char i ++ ++ r = doit(q,qtype); ++ ++- cdb_free(&c); ++- close(fd); ++ return r; ++ } +diff --git a/feeds/packages/net/djbdns/patches/110-dnscache-cachestats.patch b/feeds/packages/net/djbdns/patches/110-dnscache-cachestats.patch +new file mode 100644 +index 0000000..5404719 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/110-dnscache-cachestats.patch +@@ -0,0 +1,89 @@ ++# ++# This patch to djbdns 1.05 modifies the dnscache program to keep a ++# counter of cache hits and cache misses. ++# ++# Two new fields are added to the ``stats'' output line: ++# . the fifth number is the number of cache hits ++# . the sixth number is the number of cache misses ++# e.g. ++# @400000003fa92ccc317d70f4 stats 3 1201 1 0 21 49 ++# indicates 21 hits and 49 misses. ++# ++# James Raftery 6 Nov. 2003 ++# ++--- a/cache.c +++++ b/cache.c ++@@ -7,6 +7,11 @@ ++ ++ uint64 cache_motion = 0; ++ +++/* record cache stats */ +++/* James Raftery 6 Nov. 2003 */ +++uint64 cache_hit = 0; +++uint64 cache_miss = 0; +++ ++ static char *x = 0; ++ static uint32 size; ++ static uint32 hsize; ++@@ -112,15 +117,20 @@ char *cache_get(const char *key,unsigned ++ if (u > size - pos - 20 - keylen) cache_impossible(); ++ *datalen = u; ++ +++ cache_hit++; ++ return x + pos + 20 + keylen; ++ } ++ } ++ nextpos = prevpos ^ get4(pos); ++ prevpos = pos; ++ pos = nextpos; ++- if (++loop > 100) return 0; /* to protect against hash flooding */ +++ if (++loop > 100) { /* to protect against hash flooding */ +++ cache_miss++; +++ return 0; +++ } ++ } ++ +++ cache_miss++; ++ return 0; ++ } ++ ++--- a/cache.h +++++ b/cache.h ++@@ -5,6 +5,12 @@ ++ #include "uint64.h" ++ ++ extern uint64 cache_motion; +++ +++/* record cache stats */ +++/* James Raftery 6 Nov. 2003 */ +++extern uint64 cache_hit; +++extern uint64 cache_miss; +++ ++ extern int cache_init(unsigned int); ++ extern void cache_set(const char *,unsigned int,const char *,unsigned int,uint32); ++ extern char *cache_get(const char *,unsigned int,unsigned int *,uint32 *); ++--- a/log.c +++++ b/log.c ++@@ -279,6 +279,12 @@ void log_stats(void) ++ time_t cur = time(NULL); ++ extern uint64 numqueries; ++ extern uint64 cache_motion; +++ +++ /* record cache stats */ +++ /* James Raftery 6 Nov. 2003 */ +++ extern uint64 cache_hit; +++ extern uint64 cache_miss; +++ ++ extern int uactive; ++ extern int tactive; ++ ++@@ -290,6 +296,8 @@ void log_stats(void) ++ number(numqueries); space(); ++ number(cache_motion); space(); ++ number(uactive); space(); ++- number(tactive); +++ number(tactive); space(); +++ number(cache_hit); space(); +++ number(cache_miss); ++ line(); ++ } +diff --git a/feeds/packages/net/djbdns/patches/120-compiler-temporary-filename.patch b/feeds/packages/net/djbdns/patches/120-compiler-temporary-filename.patch +new file mode 100644 +index 0000000..324116d +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/120-compiler-temporary-filename.patch +@@ -0,0 +1,93 @@ ++--- a/pickdns-data.c +++++ b/pickdns-data.c ++@@ -123,7 +123,7 @@ void syntaxerror(const char *why) ++ } ++ void die_datatmp(void) ++ { ++- strerr_die2sys(111,FATAL,"unable to create data.tmp: "); +++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++ } ++ ++ int main() ++@@ -142,7 +142,7 @@ int main() ++ if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: "); ++ buffer_init(&b,buffer_unixread,fd,bspace,sizeof bspace); ++ ++- fdcdb = open_trunc("data.tmp"); +++ fdcdb = open_trunc("data.cdb.tmp"); ++ if (fdcdb == -1) die_datatmp(); ++ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); ++ ++@@ -223,8 +223,8 @@ int main() ++ if (cdb_make_finish(&cdb) == -1) die_datatmp(); ++ if (fsync(fdcdb) == -1) die_datatmp(); ++ if (close(fdcdb) == -1) die_datatmp(); /* NFS stupidity */ ++- if (rename("data.tmp","data.cdb") == -1) ++- strerr_die2sys(111,FATAL,"unable to move data.tmp to data.cdb: "); +++ if (rename("data.cdb.tmp","data.cdb") == -1) +++ strerr_die2sys(111,FATAL,"unable to move data.cdb.tmp to data.cdb: "); ++ ++ _exit(0); ++ } ++--- a/rbldns-data.c +++++ b/rbldns-data.c ++@@ -42,7 +42,7 @@ void syntaxerror(const char *why) ++ } ++ void die_datatmp(void) ++ { ++- strerr_die2sys(111,FATAL,"unable to create data.tmp: "); +++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++ } ++ ++ int main() ++@@ -59,7 +59,7 @@ int main() ++ if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: "); ++ buffer_init(&b,buffer_unixread,fd,bspace,sizeof bspace); ++ ++- fdcdb = open_trunc("data.tmp"); +++ fdcdb = open_trunc("data.cdb.tmp"); ++ if (fdcdb == -1) die_datatmp(); ++ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); ++ ++@@ -121,8 +121,8 @@ int main() ++ if (cdb_make_finish(&cdb) == -1) die_datatmp(); ++ if (fsync(fdcdb) == -1) die_datatmp(); ++ if (close(fdcdb) == -1) die_datatmp(); /* NFS stupidity */ ++- if (rename("data.tmp","data.cdb") == -1) ++- strerr_die2sys(111,FATAL,"unable to move data.tmp to data.cdb: "); +++ if (rename("data.cdb.tmp","data.cdb") == -1) +++ strerr_die2sys(111,FATAL,"unable to move data.cdb.tmp to data.cdb: "); ++ ++ _exit(0); ++ } ++--- a/tinydns-data.c +++++ b/tinydns-data.c ++@@ -27,7 +27,7 @@ ++ ++ void die_datatmp(void) ++ { ++- strerr_die2sys(111,FATAL,"unable to create data.tmp: "); +++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++ } ++ void nomem(void) ++ { ++@@ -207,7 +207,7 @@ int main() ++ ++ buffer_init(&b,buffer_unixread,fddata,bspace,sizeof bspace); ++ ++- fdcdb = open_trunc("data.tmp"); +++ fdcdb = open_trunc("data.cdb.tmp"); ++ if (fdcdb == -1) die_datatmp(); ++ if (cdb_make_start(&cdb,fdcdb) == -1) die_datatmp(); ++ ++@@ -487,8 +487,8 @@ int main() ++ if (cdb_make_finish(&cdb) == -1) die_datatmp(); ++ if (fsync(fdcdb) == -1) die_datatmp(); ++ if (close(fdcdb) == -1) die_datatmp(); /* NFS stupidity */ ++- if (rename("data.tmp","data.cdb") == -1) ++- strerr_die2sys(111,FATAL,"unable to move data.tmp to data.cdb: "); +++ if (rename("data.cdb.tmp","data.cdb") == -1) +++ strerr_die2sys(111,FATAL,"unable to move data.cdb.tmp to data.cdb: "); ++ ++ _exit(0); ++ } +diff --git a/feeds/packages/net/djbdns/patches/140-dnsnamex-extra-command.patch b/feeds/packages/net/djbdns/patches/140-dnsnamex-extra-command.patch +new file mode 100644 +index 0000000..6a8cafe +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/140-dnsnamex-extra-command.patch +@@ -0,0 +1,156 @@ ++--- /dev/null +++++ b/dnsnamex.c ++@@ -0,0 +1,34 @@ +++#include "buffer.h" +++#include "exit.h" +++#include "strerr.h" +++#include "ip4.h" +++#include "dns.h" +++ +++#define FATAL "dnsnamex: fatal: " +++ +++static char seed[128]; +++ +++char ip[4]; +++static stralloc out; +++ +++int main(int argc,char **argv) +++{ +++ dns_random_init(seed); +++ +++ if (*argv) ++argv; +++ +++ while (*argv) { +++ if (!ip4_scan(*argv,ip)) +++ strerr_die3x(111,FATAL,"unable to parse IP address ",*argv); +++ if (dns_name4_multi(&out,ip) == -1) +++ strerr_die4sys(111,FATAL,"unable to find host name for ",*argv,": "); +++ +++ buffer_put(buffer_1,out.s,out.len); +++ buffer_puts(buffer_1,"\n"); +++ +++ ++argv; +++ } +++ +++ buffer_flush(buffer_1); +++ _exit(0); +++} ++--- /dev/null +++++ b/dns_namex.c ++@@ -0,0 +1,48 @@ +++#include "stralloc.h" +++#include "uint16.h" +++#include "byte.h" +++#include "dns.h" +++ +++static char *q = 0; +++ +++int dns_name_packet_multi(stralloc *out,const char *buf,unsigned int len) +++{ +++ unsigned int pos; +++ char header[12]; +++ uint16 numanswers; +++ uint16 datalen; +++ +++ if (!stralloc_copys(out,"")) return -1; +++ +++ pos = dns_packet_copy(buf,len,0,header,12); if (!pos) return -1; +++ uint16_unpack_big(header + 6,&numanswers); +++ pos = dns_packet_skipname(buf,len,pos); if (!pos) return -1; +++ pos += 4; +++ +++ while (numanswers--) { +++ pos = dns_packet_skipname(buf,len,pos); if (!pos) return -1; +++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) return -1; +++ uint16_unpack_big(header + 8,&datalen); +++ if (byte_equal(header,2,DNS_T_PTR)) +++ if (byte_equal(header + 2,2,DNS_C_IN)) { +++ if (!dns_packet_getname(buf,len,pos,&q)) return -1; +++ if (!dns_domain_todot_cat(out,q)) return -1; +++ if (!stralloc_cats(out, " ")) return -1 ; +++ } +++ pos += datalen; +++ } +++ +++ return 0; +++} +++ +++int dns_name4_multi(stralloc *out,const char ip[4]) +++{ +++ char name[DNS_NAME4_DOMAIN]; +++ +++ dns_name4_domain(name,ip); +++ if (dns_resolve(name,DNS_T_PTR) == -1) return -1; +++ if (dns_name_packet_multi(out,dns_resolve_tx.packet,dns_resolve_tx.packetlen) == -1) return -1; +++ dns_transmit_free(&dns_resolve_tx); +++ dns_domain_free(&q); +++ return 0; +++} ++--- a/dns.h +++++ b/dns.h ++@@ -70,9 +70,11 @@ extern struct dns_transmit dns_resolve_t ++ extern int dns_ip4_packet(stralloc *,const char *,unsigned int); ++ extern int dns_ip4(stralloc *,const stralloc *); ++ extern int dns_name_packet(stralloc *,const char *,unsigned int); +++extern int dns_name_packet_multi(stralloc *,const char *,unsigned int); ++ extern void dns_name4_domain(char *,const char *); ++ #define DNS_NAME4_DOMAIN 31 ++ extern int dns_name4(stralloc *,const char *); +++extern int dns_name4_multi(stralloc *,const char *); ++ extern int dns_txt_packet(stralloc *,const char *,unsigned int); ++ extern int dns_txt(stralloc *,const stralloc *); ++ extern int dns_mx_packet(stralloc *,const char *,unsigned int); ++--- a/Makefile +++++ b/Makefile ++@@ -219,10 +219,10 @@ uint64.h taia.h dd.h ++ ++ dns.a: \ ++ makelib dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ipq.o dns_mx.o \ ++-dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ +++dns_name.o dns_namex.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ ++ dns_resolve.o dns_sortip.o dns_transmit.o dns_txt.o ++ ./makelib dns.a dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o \ ++- dns_ipq.o dns_mx.o dns_name.o dns_nd.o dns_packet.o \ +++ dns_ipq.o dns_mx.o dns_name.o dns_namex.o dns_nd.o dns_packet.o \ ++ dns_random.o dns_rcip.o dns_rcrw.o dns_resolve.o \ ++ dns_sortip.o dns_transmit.o dns_txt.o ++ ++@@ -261,6 +261,11 @@ compile dns_name.c stralloc.h gen_alloc. ++ stralloc.h iopause.h taia.h tai.h uint64.h taia.h ++ ./compile dns_name.c ++ +++dns_namex.o: \ +++compile dns_namex.c stralloc.h gen_alloc.h uint16.h byte.h dns.h \ +++stralloc.h iopause.h taia.h tai.h uint64.h taia.h +++ ./compile dns_namex.c +++ ++ dns_nd.o: \ ++ compile dns_nd.c byte.h fmt.h dns.h stralloc.h gen_alloc.h iopause.h \ ++ taia.h tai.h uint64.h taia.h ++@@ -394,6 +399,17 @@ compile dnsname.c buffer.h exit.h strerr ++ gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h ++ ./compile dnsname.c ++ +++dnsnamex: \ +++load dnsnamex.o iopause.o dns.a env.a libtai.a alloc.a buffer.a unix.a \ +++byte.a socket.lib +++ ./load dnsnamex iopause.o dns.a env.a libtai.a alloc.a \ +++ buffer.a unix.a byte.a `cat socket.lib` +++ +++dnsnamex.o: \ +++compile dnsnamex.c buffer.h exit.h strerr.h ip4.h dns.h stralloc.h \ +++gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h +++ ./compile dnsnamex.c +++ ++ dnsq: \ ++ load dnsq.o iopause.o printrecord.o printpacket.o parsetype.o dns.a \ ++ env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib ++@@ -658,7 +674,7 @@ prog: \ ++ dnscache-conf dnscache walldns-conf walldns rbldns-conf rbldns \ ++ rbldns-data pickdns-conf pickdns pickdns-data tinydns-conf tinydns \ ++ tinydns-data tinydns-get tinydns-edit axfr-get axfrdns-conf axfrdns \ ++-dnsip dnsipq dnsname dnstxt dnsmx dnsfilter random-ip dnsqr dnsq \ +++dnsip dnsipq dnsname dnsnamex dnstxt dnsmx dnsfilter random-ip dnsqr dnsq \ ++ dnstrace dnstracesort cachetest utime rts ++ ++ prot.o: \ +diff --git a/feeds/packages/net/djbdns/patches/200-dnscache-cname-handling.patch b/feeds/packages/net/djbdns/patches/200-dnscache-cname-handling.patch +new file mode 100644 +index 0000000..ed96ac9 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/200-dnscache-cname-handling.patch +@@ -0,0 +1,226 @@ ++--- a/query.c +++++ b/query.c ++@@ -91,6 +91,21 @@ static void cleanup(struct query *z) ++ } ++ } ++ +++static int move_name_to_alias(struct query *z,uint32 ttl) +++{ +++ int j ; +++ +++ if (z->alias[QUERY_MAXALIAS - 1]) return 0 ; +++ for (j = QUERY_MAXALIAS - 1;j > 0;--j) +++ z->alias[j] = z->alias[j - 1]; +++ for (j = QUERY_MAXALIAS - 1;j > 0;--j) +++ z->aliasttl[j] = z->aliasttl[j - 1]; +++ z->alias[0] = z->name[0]; +++ z->aliasttl[0] = ttl; +++ z->name[0] = 0; +++ return 1 ; +++} +++ ++ static int rqa(struct query *z) ++ { ++ int i; ++@@ -123,7 +138,6 @@ static int globalip(char *d,char ip[4]) ++ static char *t1 = 0; ++ static char *t2 = 0; ++ static char *t3 = 0; ++-static char *cname = 0; ++ static char *referral = 0; ++ static unsigned int *records = 0; ++ ++@@ -179,15 +193,14 @@ static int doit(struct query *z,int stat ++ uint16 datalen; ++ char *control; ++ char *d; +++ char *owner_name = 0 ; ++ const char *dtype; ++ unsigned int dlen; ++ int flagout; ++- int flagcname; ++ int flagreferral; ++ int flagsoa; ++ uint32 ttl; ++ uint32 soattl; ++- uint32 cnamettl; ++ int i; ++ int j; ++ int k; ++@@ -253,7 +266,10 @@ static int doit(struct query *z,int stat ++ ++ byte_copy(key,2,DNS_T_CNAME); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++- if (cached) { +++ /* A previous explicit query might have caused an empty RRSet to have been +++ ** cached. Take care to ignore such a thing. +++ */ +++ if (cached && cachedlen) { ++ if (typematch(DNS_T_CNAME,dtype)) { ++ log_cachedanswer(d,DNS_T_CNAME); ++ if (!rqa(z)) goto DIE; ++@@ -262,8 +278,11 @@ static int doit(struct query *z,int stat ++ return 1; ++ } ++ log_cachedcname(d,cached); ++- if (!dns_domain_copy(&cname,cached)) goto DIE; ++- goto CNAME; +++ if (!z->level) { +++ if (!move_name_to_alias(z,ttl)) goto DIE ; +++ } +++ if (!dns_domain_copy(&z->name[z->level],cached)) goto DIE; +++ goto NEWNAME; ++ } ++ ++ if (typematch(DNS_T_NS,dtype)) { ++@@ -352,7 +371,7 @@ static int doit(struct query *z,int stat ++ } ++ } ++ ++- if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_CNAME,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) { +++ if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) { ++ byte_copy(key,2,dtype); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { ++@@ -473,29 +492,31 @@ static int doit(struct query *z,int stat ++ ++ cachettl = 0; ++ flagout = 0; ++- flagcname = 0; ++ flagreferral = 0; ++ flagsoa = 0; ++ soattl = 0; ++- cnamettl = 0; +++ if (!dns_domain_copy(&owner_name,d)) goto DIE; +++ /* This code assumes that the CNAME chain is presented in the correct +++ ** order. The example algorithm in RFC 1034 will actually result in this +++ ** being the case, but the words do not require it to be so. +++ */ ++ for (j = 0;j < numanswers;++j) { ++ pos = dns_packet_getname(buf,len,pos,&t1); if (!pos) goto DIE; ++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; ++ ++- if (dns_domain_equal(t1,d)) +++ if (dns_domain_equal(t1,owner_name)) ++ if (byte_equal(header + 2,2,DNS_C_IN)) { /* should always be true */ ++ if (typematch(header,dtype)) ++ flagout = 1; ++ else if (typematch(header,DNS_T_CNAME)) { ++- if (!dns_packet_getname(buf,len,pos,&cname)) goto DIE; ++- flagcname = 1; ++- cnamettl = ttlget(header + 4); +++ if (!dns_packet_getname(buf,len,pos,&owner_name)) goto DIE; ++ } ++ } ++ ++ uint16_unpack_big(header + 8,&datalen); ++ pos += datalen; ++ } +++ dns_domain_free(&owner_name) ; ++ posauthority = pos; ++ ++ for (j = 0;j < numauthority;++j) { ++@@ -522,15 +543,6 @@ static int doit(struct query *z,int stat ++ } ++ posglue = pos; ++ ++- ++- if (!flagcname && !rcode && !flagout && flagreferral && !flagsoa) ++- if (dns_domain_equal(referral,control) || !dns_domain_suffix(referral,control)) { ++- log_lame(whichserver,control,referral); ++- byte_zero(whichserver,4); ++- goto HAVENS; ++- } ++- ++- ++ if (records) { alloc_free(records); records = 0; } ++ ++ k = numanswers + numauthority + numglue; ++@@ -677,24 +689,36 @@ static int doit(struct query *z,int stat ++ ++ alloc_free(records); records = 0; ++ +++ if (byte_diff(DNS_T_CNAME,2,dtype)) { +++ /* This code assumes that the CNAME chain is presented in the correct +++ ** order. The example algorithm in RFC 1034 will actually result in this +++ ** being the case, but the words do not require it to be so. +++ */ +++ pos = posanswers; +++ for (j = 0;j < numanswers;++j) { +++ pos = dns_packet_getname(buf,len,pos,&t1); if (!pos) goto DIE; +++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; +++ +++ if (dns_domain_equal(t1,d)) +++ if (byte_equal(header + 2,2,DNS_C_IN)) { /* should always be true */ +++ if (typematch(header,DNS_T_CNAME)) { +++ ttl = ttlget(header + 4); +++ if (z->level == 0) { +++ if (!move_name_to_alias(z,ttl)) goto DIE ; +++ } +++ if (!dns_packet_getname(buf,len,pos,&z->name[z->level])) goto DIE; +++ d = z->name[z->level]; +++ if (!dns_domain_suffix(d,control) || !roots_same(d,control)) +++ goto NEWNAME ; /* Cannot trust the chain further - restart using current name */ +++ } +++ } ++ ++- if (flagcname) { ++- ttl = cnamettl; ++- CNAME: ++- if (!z->level) { ++- if (z->alias[QUERY_MAXALIAS - 1]) goto DIE; ++- for (j = QUERY_MAXALIAS - 1;j > 0;--j) ++- z->alias[j] = z->alias[j - 1]; ++- for (j = QUERY_MAXALIAS - 1;j > 0;--j) ++- z->aliasttl[j] = z->aliasttl[j - 1]; ++- z->alias[0] = z->name[0]; ++- z->aliasttl[0] = ttl; ++- z->name[0] = 0; +++ uint16_unpack_big(header + 8,&datalen); +++ pos += datalen; ++ } ++- if (!dns_domain_copy(&z->name[z->level],cname)) goto DIE; ++- goto NEWNAME; ++ } ++ +++ /* A "no such name" error applies to the end of any CNAME chain, not to the start. */ ++ if (rcode == 3) { ++ log_nxdomain(whichserver,d,cachettl); ++ cachegeneric(DNS_T_ANY,d,"",0,cachettl); ++@@ -707,10 +731,26 @@ static int doit(struct query *z,int stat ++ return 1; ++ } ++ +++ /* We check for a lame server _after_ we have cached any records that it +++ ** might have returned to us. This copes better with the incorrect +++ ** behaviour of one content DNS server software that doesn't return +++ ** complete CNAME chains but instead returns only the first link in a +++ ** chain followed by a lame delegation to the same server. +++ ** Also: We check for a lame server _after_ following the CNAME chain. The +++ ** delegation in a referral answer applies to the _end_ of the chain, not +++ ** to the beginning. +++ */ +++ if (!rcode && !flagout && flagreferral && !flagsoa) +++ if (dns_domain_equal(referral,control) || !dns_domain_suffix(referral,control)) { +++ log_lame(whichserver,control,referral); +++ byte_zero(whichserver,4); +++ goto HAVENS; +++ } +++ ++ if (!flagout && flagsoa) +++ /* Don't save empty RRSets for those types that we use as special markers. */ ++ if (byte_diff(DNS_T_ANY,2,dtype)) ++- if (byte_diff(DNS_T_AXFR,2,dtype)) ++- if (byte_diff(DNS_T_CNAME,2,dtype)) { +++ if (byte_diff(DNS_T_AXFR,2,dtype)) { ++ save_start(); ++ save_finish(dtype,d,soattl); ++ log_nodata(whichserver,d,dtype,soattl); ++@@ -822,6 +862,7 @@ static int doit(struct query *z,int stat ++ DIE: ++ cleanup(z); ++ if (records) { alloc_free(records); records = 0; } +++ dns_domain_free(&owner_name) ; ++ return -1; ++ } ++ +diff --git a/feeds/packages/net/djbdns/patches/210-dnscache-strict-forwardonly.patch b/feeds/packages/net/djbdns/patches/210-dnscache-strict-forwardonly.patch +new file mode 100644 +index 0000000..b64e4a4 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/210-dnscache-strict-forwardonly.patch +@@ -0,0 +1,47 @@ ++--- a/log.h +++++ b/log.h ++@@ -25,6 +25,7 @@ extern void log_nxdomain(const char *,co ++ extern void log_nodata(const char *,const char *,const char *,unsigned int); ++ extern void log_servfail(const char *); ++ extern void log_lame(const char *,const char *,const char *); +++extern void log_ignore_referral(const char *,const char *,const char *); ++ ++ extern void log_rr(const char *,const char *,const char *,const char *,unsigned int,unsigned int); ++ extern void log_rrns(const char *,const char *,const char *,unsigned int); ++--- a/log.c +++++ b/log.c ++@@ -197,6 +197,13 @@ void log_lame(const char server[4],const ++ line(); ++ } ++ +++void log_ignore_referral(const char server[4],const char * control, const char *referral) +++{ +++ string("ignored referral "); ip(server); space(); +++ name(control); space(); name(referral); +++ line(); +++} +++ ++ void log_servfail(const char *dn) ++ { ++ const char *x = error_str(errno); ++--- a/query.c +++++ b/query.c ++@@ -828,6 +828,18 @@ static int doit(struct query *z,int stat ++ ++ ++ if (!dns_domain_suffix(d,referral)) goto DIE; +++ +++ /* In strict "forwardonly" mode, we don't, as the manual states, +++ ** contact a chain of servers according to "NS" resource records. +++ ** We don't obey any referral responses, therefore. Instead, we +++ ** eliminate the server from the list and try the next one. +++ */ +++ if (flagforwardonly) { +++ log_ignore_referral(whichserver,control,referral); +++ byte_zero(whichserver,4); +++ goto HAVENS; +++ } +++ ++ control = d + dns_domain_suffixpos(d,referral); ++ z->control[z->level] = control; ++ byte_zero(z->servers[z->level],64); +diff --git a/feeds/packages/net/djbdns/patches/220-dnscacheip-space-separator.patch b/feeds/packages/net/djbdns/patches/220-dnscacheip-space-separator.patch +new file mode 100644 +index 0000000..2e73ffe +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/220-dnscacheip-space-separator.patch +@@ -0,0 +1,11 @@ ++--- a/dns_rcip.c +++++ b/dns_rcip.c ++@@ -17,7 +17,7 @@ static int init(char ip[64]) ++ x = env_get("DNSCACHEIP"); ++ if (x) ++ while (iplen <= 60) { ++- if (*x == '.') +++ if (*x == ' ' || *x == '\t' || *x == '\n') ++ ++x; ++ else { ++ i = ip4_scan(x,ip + iplen); +diff --git a/feeds/packages/net/djbdns/patches/230-tinydns-data-semantic-error.patch b/feeds/packages/net/djbdns/patches/230-tinydns-data-semantic-error.patch +new file mode 100644 +index 0000000..69b9441 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/230-tinydns-data-semantic-error.patch +@@ -0,0 +1,194 @@ ++--- a/tinydns-data.c +++++ b/tinydns-data.c ++@@ -25,6 +25,14 @@ ++ ++ #define FATAL "tinydns-data: fatal: " ++ +++void die_semantic2(const char * s1, const char * s2) +++{ +++ strerr_die3x(111,FATAL,s1,s2) ; +++} +++void die_semantic4(const char * s1, const char * s2,const char * s3, const char * s4) +++{ +++ strerr_die5x(111,FATAL,s1,s2,s3,s4) ; +++} ++ void die_datatmp(void) ++ { ++ strerr_die2sys(111,FATAL,"unable to create data.cdb.tmp: "); ++@@ -34,20 +42,39 @@ void nomem(void) ++ strerr_die1sys(111,FATAL); ++ } ++ +++void ttlparse(stralloc *sa,unsigned long * ttl, unsigned long defttl, const char * ltype) +++{ +++ int ttllen ; +++ +++ if (sa->len > 0) { +++ if (!stralloc_0(sa)) nomem(); +++ ttllen = scan_ulong(sa->s,ttl) ; +++ if (ttllen + 1 != sa->len) +++ die_semantic4("unparseable TTL in ",ltype," line: ", sa->s) ; +++ } else +++ *ttl = defttl; +++} +++ ++ void ttdparse(stralloc *sa,char ttd[8]) ++ { ++ unsigned int i; ++ char ch; ++ ++ byte_zero(ttd,8); ++- for (i = 0;(i < 16) && (i < sa->len);++i) { +++ for (i = 0;i < sa->len;++i) { +++ if (i >= 16) { +++ if (!stralloc_0(sa)) nomem() ; +++ die_semantic2("timestamp is too long: ", sa->s) ; +++ } ++ ch = sa->s[i]; ++ if ((ch >= '0') && (ch <= '9')) ++ ch -= '0'; ++ else if ((ch >= 'a') && (ch <= 'f')) ++ ch -= 'a' - 10; ++- else ++- ch = 0; +++ else { +++ if (!stralloc_0(sa)) nomem() ; +++ die_semantic2("timestamp contains an invalid character: ", sa->s) ; +++ } ++ if (!(i & 1)) ch <<= 4; ++ ttd[i >> 1] |= ch; ++ } ++@@ -55,6 +82,10 @@ void ttdparse(stralloc *sa,char ttd[8]) ++ ++ void locparse(stralloc *sa,char loc[2]) ++ { +++ if (sa->len > 2) { +++ if (!stralloc_0(sa)) nomem() ; +++ die_semantic2("location code longer than two characters: ", sa->s) ; +++ } ++ loc[0] = (sa->len > 0) ? sa->s[0] : 0; ++ loc[1] = (sa->len > 1) ? sa->s[1] : 0; ++ } ++@@ -187,6 +218,7 @@ int main() ++ int i; ++ int j; ++ int k; +++ int iplen ; ++ char ch; ++ unsigned long ttl; ++ char ttd[8]; ++@@ -267,8 +299,7 @@ int main() ++ if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u); ++ uint32_pack_big(soa + 16,u); ++ ++- if (!stralloc_0(&f[8])) nomem(); ++- if (!scan_ulong(f[8].s,&ttl)) ttl = TTL_NEGATIVE; +++ ttlparse(&f[8],&ttl,TTL_NEGATIVE,"Z"); ++ ttdparse(&f[9],ttd); ++ locparse(&f[10],loc); ++ ++@@ -283,8 +314,7 @@ int main() ++ ++ case '.': case '&': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[3])) nomem(); ++- if (!scan_ulong(f[3].s,&ttl)) ttl = TTL_NS; +++ ttlparse(&f[3],&ttl,TTL_NS,". or &"); ++ ttdparse(&f[4],ttd); ++ locparse(&f[5],loc); ++ ++@@ -309,24 +339,26 @@ int main() ++ rr_addname(d2); ++ rr_finish(d1); ++ ++- if (ip4_scan(f[1].s,ip)) { +++ iplen = ip4_scan(f[1].s,ip) ; +++ if (iplen != 0 && iplen + 1 == f[1].len) { ++ rr_start(DNS_T_A,ttl,ttd,loc); ++ rr_add(ip,4); ++ rr_finish(d2); ++- } +++ } else if (f[1].len > 1) +++ die_semantic4("unparseable IP address in ","& or ."," line: ", f[1].s) ; ++ ++ break; ++ ++ case '+': case '=': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[2])) nomem(); ++- if (!scan_ulong(f[2].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[2],&ttl,TTL_POSITIVE,"+ or ="); ++ ttdparse(&f[3],ttd); ++ locparse(&f[4],loc); ++ ++ if (!stralloc_0(&f[1])) nomem(); ++ ++- if (ip4_scan(f[1].s,ip)) { +++ iplen = ip4_scan(f[1].s,ip) ; +++ if (iplen != 0 && iplen + 1 == f[1].len) { ++ rr_start(DNS_T_A,ttl,ttd,loc); ++ rr_add(ip,4); ++ rr_finish(d1); ++@@ -337,13 +369,15 @@ int main() ++ rr_addname(d1); ++ rr_finish(dptr); ++ } ++- } +++ } else if (f[1].len > 1) +++ die_semantic4("unparseable IP address in ","+ or ="," line: ", f[1].s) ; +++ else +++ die_semantic4("missing IP address in ","+ or ="," line: ", f[1].s) ; ++ break; ++ ++ case '@': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[4])) nomem(); ++- if (!scan_ulong(f[4].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[4],&ttl,TTL_POSITIVE,"@"); ++ ttdparse(&f[5],ttd); ++ locparse(&f[6],loc); ++ ++@@ -401,18 +435,19 @@ int main() ++ rr_addname(d2); ++ rr_finish(d1); ++ ++- if (ip4_scan(f[1].s,ip)) { +++ iplen = ip4_scan(f[1].s,ip) ; +++ if (iplen != 0 && iplen + 1 == f[1].len) { ++ rr_start(DNS_T_A,ttl,ttd,loc); ++ rr_add(ip,4); ++ rr_finish(d2); ++- } +++ } else if (f[1].len > 1) +++ die_semantic4("unparseable IP address in ","@"," line: ", f[1].s) ; ++ break; ++ ++ case '^': case 'C': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++ if (!dns_domain_fromdot(&d2,f[1].s,f[1].len)) nomem(); ++- if (!stralloc_0(&f[2])) nomem(); ++- if (!scan_ulong(f[2].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[2],&ttl,TTL_POSITIVE,"^ or C"); ++ ttdparse(&f[3],ttd); ++ locparse(&f[4],loc); ++ ++@@ -426,8 +461,7 @@ int main() ++ ++ case '\'': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[2])) nomem(); ++- if (!scan_ulong(f[2].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[2],&ttl,TTL_POSITIVE,"\'"); ++ ttdparse(&f[3],ttd); ++ locparse(&f[4],loc); ++ ++@@ -449,8 +483,7 @@ int main() ++ ++ case ':': ++ if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); ++- if (!stralloc_0(&f[3])) nomem(); ++- if (!scan_ulong(f[3].s,&ttl)) ttl = TTL_POSITIVE; +++ ttlparse(&f[3],&ttl,TTL_POSITIVE,":"); ++ ttdparse(&f[4],ttd); ++ locparse(&f[5],loc); ++ +diff --git a/feeds/packages/net/djbdns/patches/240-tinydns-alias-chain-truncation.patch b/feeds/packages/net/djbdns/patches/240-tinydns-alias-chain-truncation.patch +new file mode 100644 +index 0000000..f94399e +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/240-tinydns-alias-chain-truncation.patch +@@ -0,0 +1,87 @@ ++--- a/tdlookup.c +++++ b/tdlookup.c ++@@ -103,12 +103,13 @@ static int doname(void) ++ return response_addname(d1); ++ } ++ ++-static int doit(char *q,char qtype[2]) +++static int doit1(char **pqname,char qtype[2]) ++ { ++ unsigned int bpos; ++ unsigned int anpos; ++ unsigned int aupos; ++ unsigned int arpos; +++ char *q; ++ char *control; ++ char *wild; ++ int flaggavesoa; ++@@ -122,6 +123,12 @@ static int doit(char *q,char qtype[2]) ++ int addrnum; ++ uint32 addrttl; ++ int i; +++ int loop = 0 ; +++ +++RESTART: +++ if (loop++ >= 100) return 0 ; +++ +++ q = *pqname ; ++ ++ anpos = response_len; ++ ++@@ -136,7 +143,14 @@ static int doit(char *q,char qtype[2]) ++ if (byte_equal(type,2,DNS_T_NS)) flagns = 1; ++ } ++ if (flagns) break; ++- if (!*control) return 0; /* q is not within our bailiwick */ +++ if (!*control) { /* q is not within our bailiwick */ +++ if (loop <= 1) +++ return 0 ; +++ else { +++ response[2] &= ~4; +++ goto DONE; /* The administrator has issued contradictory instructions */ +++ } +++ } ++ control += *control; ++ control += 1; ++ } ++@@ -172,9 +186,17 @@ static int doit(char *q,char qtype[2]) ++ continue; ++ } ++ if (!response_rstart(q,type,ttl)) return 0; ++- if (byte_equal(type,2,DNS_T_NS) || byte_equal(type,2,DNS_T_CNAME) || byte_equal(type,2,DNS_T_PTR)) { +++ if (byte_equal(type,2,DNS_T_NS) || byte_equal(type,2,DNS_T_PTR)) { ++ if (!doname()) return 0; ++ } +++ else if (byte_equal(type,2,DNS_T_CNAME)) { +++ if (!doname()) return 0; +++ if (byte_diff(type,2,qtype)) { +++ response_rfinish(RESPONSE_ANSWER); +++ if (!dns_domain_copy(pqname,d1)) return 0 ; +++ goto RESTART ; +++ } +++ } ++ else if (byte_equal(type,2,DNS_T_MX)) { ++ if (!dobytes(2)) return 0; ++ if (!doname()) return 0; ++@@ -275,9 +297,21 @@ static int doit(char *q,char qtype[2]) ++ } ++ } ++ +++DONE: ++ return 1; ++ } ++ +++static int doit(char *qname,char qtype[2]) +++{ +++ int r ; +++ char * q = 0 ; +++ +++ if (!dns_domain_copy(&q, qname)) return 0 ; +++ r = doit1(&q, qtype) ; +++ dns_domain_free(&q) ; +++ return r ; +++} +++ ++ int respond(char *q,char qtype[2],char ip[4]) ++ { ++ static struct tai cdb_valid = { 0 }; +diff --git a/feeds/packages/net/djbdns/patches/250-dnscache-slogging.patch b/feeds/packages/net/djbdns/patches/250-dnscache-slogging.patch +new file mode 100644 +index 0000000..5a2eaa1 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/250-dnscache-slogging.patch +@@ -0,0 +1,122 @@ ++--- a/server.c +++++ b/server.c ++@@ -25,12 +25,63 @@ static int len; ++ ++ static char *q; ++ +++static uint64 stats_numq; +++static uint64 stats_plus; +++static uint64 stats_minus; +++static uint64 stats_nx; +++static uint64 stats_notimp; +++static uint64 stats_weird; +++static uint64 stats_noq; +++ +++/* work around gcc 2.95.2 bug */ +++#define number(x) ( (u64 = (x)), u64_print() ) +++static uint64 u64; +++static void u64_print(void) +++{ +++ char ubuf[20]; +++ unsigned int pos; +++ +++ pos = sizeof ubuf; +++ do { +++ if (!pos) break; +++ ubuf[--pos] = '0' + (u64 % 10); +++ u64 /= 10; +++ } while(u64); +++ +++ buffer_put(buffer_2,ubuf + pos,sizeof ubuf - pos); +++} +++ +++static void string(const char *s) +++{ +++ buffer_puts(buffer_2,s); +++} +++ +++static void line(void) +++{ +++ string("\n"); +++ buffer_flush(buffer_2); +++} +++ +++static void log_stats(void) +++{ +++ string("stats "); +++ number(stats_numq); string(" "); +++ number(stats_plus); string(" "); +++ number(stats_minus); string(" "); +++ number(stats_nx); string(" "); +++ number(stats_notimp); string(" "); +++ number(stats_weird); string(" "); +++ number(stats_noq); +++ line(); +++} +++ ++ static int doit(void) ++ { ++ unsigned int pos; ++ char header[12]; ++ char qtype[2]; ++ char qclass[2]; +++ stats_numq++; ++ ++ if (len >= sizeof buf) goto NOQ; ++ pos = dns_packet_copy(buf,len,0,header,12); if (!pos) goto NOQ; ++@@ -56,25 +107,37 @@ static int doit(void) ++ ++ case_lowerb(q,dns_domain_length(q)); ++ if (!respond(q,qtype,ip)) { +++ stats_minus++; ++ qlog(ip,port,header,q,qtype," - "); ++ return 0; ++ } ++- qlog(ip,port,header,q,qtype," + "); +++ +++ if ((response[2] & 4) && (response[3] & 3)) { +++ stats_nx++; +++ qlog(ip,port,header,q,qtype," N "); +++ } +++ else { +++ stats_plus++; +++ qlog(ip,port,header,q,qtype," + "); +++ } ++ return 1; ++ ++ NOTIMP: +++ stats_notimp++; ++ response[3] &= ~15; ++ response[3] |= 4; ++ qlog(ip,port,header,q,qtype," I "); ++ return 1; ++ ++ WEIRDCLASS: +++ stats_weird++; ++ response[3] &= ~15; ++ response[3] |= 1; ++ qlog(ip,port,header,q,qtype," C "); ++ return 1; ++ ++ NOQ: +++ stats_noq++; ++ qlog(ip,port,"\0\0","","\0\0"," / "); ++ return 0; ++ } ++@@ -83,6 +146,7 @@ int main() ++ { ++ char *x; ++ int udp53; +++ unsigned char flag=0; ++ ++ x = env_get("IP"); ++ if (!x) ++@@ -106,6 +170,8 @@ int main() ++ buffer_putsflush(buffer_2,starting); ++ ++ for (;;) { +++ if ((flag++)%32==1) +++ log_stats(); ++ len = socket_recv4(udp53,buf,sizeof buf,ip,&port); ++ if (len < 0) continue; ++ if (!doit()) continue; +diff --git a/feeds/packages/net/djbdns/patches/260-dnsfilter-replace.patch b/feeds/packages/net/djbdns/patches/260-dnsfilter-replace.patch +new file mode 100644 +index 0000000..b352f1c +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/260-dnsfilter-replace.patch +@@ -0,0 +1,71 @@ ++--- a/dnsfilter.c +++++ b/dnsfilter.c ++@@ -41,6 +41,7 @@ int inbuflen = 0; ++ iopause_fd *inio; ++ int flag0 = 1; ++ +++int opt_replace = 0; ++ iopause_fd *io; ++ int iolen; ++ ++@@ -51,12 +52,16 @@ char name[DNS_NAME4_DOMAIN]; ++ void errout(int i) ++ { ++ int j; ++- ++- if (!stralloc_copys(&x[i].middle,":")) nomem(); ++- if (!stralloc_cats(&x[i].middle,error_str(errno))) nomem(); ++- for (j = 0;j < x[i].middle.len;++j) ++- if (x[i].middle.s[j] == ' ') ++- x[i].middle.s[j] = '-'; +++ +++ if (opt_replace) +++ x[i].middle.len=0; +++ else { +++ if (!stralloc_copys(&x[i].middle,":")) nomem(); +++ if (!stralloc_cats(&x[i].middle,error_str(errno))) nomem(); +++ for (j = 0;j < x[i].middle.len;++j) +++ if (x[i].middle.s[j] == ' ') +++ x[i].middle.s[j] = '-'; +++ } ++ } ++ ++ int main(int argc,char **argv) ++@@ -69,7 +74,7 @@ int main(int argc,char **argv) ++ int j; ++ int r; ++ ++- while ((opt = getopt(argc,argv,"c:l:")) != opteof) +++ while ((opt = getopt(argc,argv,"c:l:r")) != opteof) ++ switch(opt) { ++ case 'c': ++ scan_ulong(optarg,&u); ++@@ -83,8 +88,11 @@ int main(int argc,char **argv) ++ if (u > 1000000) u = 1000000; ++ xmax = u; ++ break; +++ case 'r': +++ opt_replace = 1; +++ break; ++ default: ++- strerr_die1x(111,"dnsfilter: usage: dnsfilter [ -c concurrency ] [ -l lines ]"); +++ strerr_die1x(111,"dnsfilter: usage: dnsfilter [ -c concurrency ] [ -l lines ] [-r]"); ++ } ++ ++ x = (struct line *) alloc(xmax * sizeof(struct line)); ++@@ -140,8 +148,13 @@ int main(int argc,char **argv) ++ else if (r == 1) { ++ if (dns_name_packet(&x[i].middle,x[i].dt.packet,x[i].dt.packetlen) == -1) ++ errout(i); ++- if (x[i].middle.len) ++- if (!stralloc_cats(&x[i].left,"=")) nomem(); +++ if (x[i].middle.len) { +++ if (opt_replace) { +++ if (!stralloc_copys(&x[i].left, "")) nomem(); +++ } else { +++ if (!stralloc_cats(&x[i].left, "=")) nomem(); +++ } +++ } ++ x[i].flagactive = 0; ++ --numactive; ++ } +diff --git a/feeds/packages/net/djbdns/patches/270-dnscache-sigpipe-fix.patch b/feeds/packages/net/djbdns/patches/270-dnscache-sigpipe-fix.patch +new file mode 100644 +index 0000000..17a739a +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/270-dnscache-sigpipe-fix.patch +@@ -0,0 +1,16 @@ ++--- a/dnscache.c +++++ b/dnscache.c ++@@ -1,4 +1,5 @@ ++ #include +++#include ++ #include "env.h" ++ #include "exit.h" ++ #include "scan.h" ++@@ -391,6 +392,7 @@ int main() ++ char *x; ++ unsigned long cachesize; ++ +++ signal(SIGPIPE, SIG_IGN); ++ x = env_get("IP"); ++ if (!x) ++ strerr_die2x(111,FATAL,"$IP not set"); +diff --git a/feeds/packages/net/djbdns/patches/280-dnscache-ignoreip2.patch b/feeds/packages/net/djbdns/patches/280-dnscache-ignoreip2.patch +new file mode 100644 +index 0000000..0a8bfad +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/280-dnscache-ignoreip2.patch +@@ -0,0 +1,117 @@ ++This patch change djbdns's dnscache program so that it will ignore the ++IP address given in the ignoreip file. I wrote this patch because of ++Verisign's oh-so helpful wildcard A record for *.COM and *.NET. ++ ++If you have djbdns-1.05-ignoreip.patch installed, back it out like this: ++ cd /usr/local/src/djbdns-1.05 ++ patch -R /service/dnscache/root/ignoreip ++ svc -t /service/dnscache ++ ++Configure it to ignore all the cretins like this: ++awk '{print $2}' </service/dnscache/root/ignoreip ++ *.ac 194.205.62.122 ++ *.cc 206.253.214.102 ++ *.com 64.94.110.11 ++ *.cx 219.88.106.80 ++ *.museum 195.7.77.20 ++ *.net 64.94.110.11 ++ *.nu 64.55.105.9 ++ and 212.181.91.6 ++ *.ph 203.119.4.6 ++ *.sh 194.205.62.62 ++ *.tm 194.205.62.62 ++ *.ws 216.35.187.246 ++EOF ++ svc -t /service/dnscache ++ ++J.P. Larocque contributes a script which updates root/ignoreip: ++ http://ely.ath.cx/~piranha/software/ignoreip-update/ignoreip-update-0.1 ++ ++If root/ignoreip is not present, no addresses will be ignored. ++ ++-- ++--My blog is at angry-economist.russnelson.com | Free markets express in the ++Crynwr sells support for free software | PGPok | practical world our belief ++521 Pleasant Valley Rd. | +1 315 268 1925 voice | that there is that of God ++Potsdam, NY 13676-3213 | +1 315 268 9201 FAX | in all people. -Chris V. ++ ++ ++--- a/dnscache.c +++++ b/dnscache.c ++@@ -24,6 +24,8 @@ ++ #include "okclient.h" ++ #include "droproot.h" ++ +++stralloc ignoreip = {0}; +++ ++ static int packetquery(char *buf,unsigned int len,char **q,char qtype[2],char qclass[2],char id[2]) ++ { ++ unsigned int pos; ++@@ -390,6 +392,7 @@ char seed[128]; ++ int main() ++ { ++ char *x; +++ unsigned int i, j, k; ++ unsigned long cachesize; ++ ++ signal(SIGPIPE, SIG_IGN); ++@@ -433,6 +436,20 @@ int main() ++ if (!cache_init(cachesize)) ++ strerr_die3x(111,FATAL,"not enough memory for cache of size ",x); ++ +++ if (openreadclose("ignoreip",&ignoreip,64) < 0) +++ strerr_die2x(111,FATAL,"trouble reading ignoreip"); +++ for(j = k = i = 0; i < ignoreip.len; i++) +++ if (ignoreip.s[i] == '\n') { +++ ignoreip.s[i] = '\0'; +++ if (j + 4 > i) +++ strerr_die3x(111,FATAL,"badly malformed ip4 address ",ignoreip.s+k); +++ if (!ip4_scan(ignoreip.s+k,ignoreip.s+j)) +++ strerr_die3x(111,FATAL,"unable to parse address in ignoreip ",ignoreip.s+k); +++ j += 4; +++ k = i + 1; +++ } +++ ignoreip.len = j; +++ ++ if (env_get("HIDETTL")) ++ response_hidettl(); ++ if (env_get("FORWARDONLY")) ++--- a/query.c +++++ b/query.c ++@@ -13,6 +13,8 @@ ++ #include "response.h" ++ #include "query.h" ++ +++extern stralloc ignoreip; +++ ++ static int flagforwardonly = 0; ++ ++ void query_forwardonly(void) ++@@ -173,6 +175,7 @@ static int smaller(char *buf,unsigned in ++ ++ static int doit(struct query *z,int state) ++ { +++ unsigned int ii; ++ char key[257]; ++ char *cached; ++ unsigned int cachedlen; ++@@ -662,6 +665,9 @@ static int doit(struct query *z,int stat ++ pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE; ++ if (byte_equal(header + 8,2,"\0\4")) { ++ pos = dns_packet_copy(buf,len,pos,header,4); if (!pos) goto DIE; +++ if (ignoreip.len) +++ for(ii = 0; ii < ignoreip.len; ii+= 4) +++ if (byte_equal(header,4,ignoreip.s+ii)) goto NXDOMAIN; ++ save_data(header,4); ++ log_rr(whichserver,t1,DNS_T_A,header,4,ttl); ++ } +diff --git a/feeds/packages/net/djbdns/patches/300-bugfix-dnscache-dempsky-poison.patch b/feeds/packages/net/djbdns/patches/300-bugfix-dnscache-dempsky-poison.patch +new file mode 100644 +index 0000000..23d8e9f +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/300-bugfix-dnscache-dempsky-poison.patch +@@ -0,0 +1,11 @@ ++--- a/response.c +++++ b/response.c ++@@ -34,7 +34,7 @@ int response_addname(const char *d) ++ uint16_pack_big(buf,49152 + name_ptr[i]); ++ return response_addbytes(buf,2); ++ } ++- if (dlen <= 128) +++ if ((dlen <= 128) && (response_len < 16384)) ++ if (name_num < NAMES) { ++ byte_copy(name[name_num],dlen,d); ++ name_ptr[name_num] = response_len; +diff --git a/feeds/packages/net/djbdns/patches/310-bugfix-dnscache-merge-outgoing-requests.patch b/feeds/packages/net/djbdns/patches/310-bugfix-dnscache-merge-outgoing-requests.patch +new file mode 100644 +index 0000000..bb3a4e2 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/310-bugfix-dnscache-merge-outgoing-requests.patch +@@ -0,0 +1,328 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -315,11 +315,11 @@ stralloc.h iopause.h taia.h tai.h uint64 ++ ./compile dns_txt.c ++ ++ dnscache: \ ++-load dnscache.o droproot.o okclient.o log.o cache.o query.o \ +++load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \ ++ response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \ ++ libtai.a unix.a byte.a socket.lib ++ ./load dnscache droproot.o okclient.o log.o cache.o \ ++- query.o response.o dd.o roots.o iopause.o prot.o dns.a \ +++ query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \ ++ env.a alloc.a buffer.a libtai.a unix.a byte.a `cat \ ++ socket.lib` ++ ++@@ -340,7 +340,7 @@ compile dnscache.c env.h exit.h scan.h s ++ uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \ ++ iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \ ++ iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \ ++-uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h +++uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h ++ ./compile dnscache.c ++ ++ dnsfilter: \ ++@@ -685,11 +685,16 @@ qlog.o: \ ++ compile qlog.c buffer.h qlog.h uint16.h ++ ./compile qlog.c ++ +++qmerge.o: \ +++compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \ +++taia.h tai.h uint64.h log.h maxclient.h +++ ./compile qmerge.c +++ ++ query.o: \ ++ compile query.c error.h roots.h log.h uint64.h case.h cache.h \ ++ uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \ ++ taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \ ++-response.h uint32.h query.h dns.h uint32.h +++response.h uint32.h query.h dns.h uint32.h qmerge.h ++ ./compile query.c ++ ++ random-ip: \ ++--- a/dnscache.c +++++ b/dnscache.c ++@@ -20,6 +20,7 @@ ++ #include "response.h" ++ #include "cache.h" ++ #include "ndelay.h" +++#include "maxclient.h" ++ #include "log.h" ++ #include "okclient.h" ++ #include "droproot.h" ++@@ -57,7 +58,6 @@ uint64 numqueries = 0; ++ ++ static int udp53; ++ ++-#define MAXUDP 200 ++ static struct udpclient { ++ struct query q; ++ struct taia start; ++@@ -134,7 +134,6 @@ void u_new(void) ++ ++ static int tcp53; ++ ++-#define MAXTCP 20 ++ struct tcpclient { ++ struct query q; ++ struct taia start; ++--- a/log.c +++++ b/log.c ++@@ -151,6 +151,13 @@ void log_tx(const char *q,const char qty ++ line(); ++ } ++ +++void log_tx_piggyback(const char *q, const char qtype[2], const char *control) +++{ +++ string("txpb "); +++ logtype(qtype); space(); name(q); space(); name(control); +++ line(); +++} +++ ++ void log_cachedanswer(const char *q,const char type[2]) ++ { ++ string("cached "); logtype(type); space(); ++--- a/log.h +++++ b/log.h ++@@ -20,6 +20,7 @@ extern void log_cachednxdomain(const cha ++ extern void log_cachedns(const char *,const char *); ++ ++ extern void log_tx(const char *,const char *,const char *,const char *,unsigned int); +++extern void log_tx_piggyback(const char *,const char *,const char *); ++ ++ extern void log_nxdomain(const char *,const char *,unsigned int); ++ extern void log_nodata(const char *,const char *,const char *,unsigned int); ++--- /dev/null +++++ b/maxclient.h ++@@ -0,0 +1,7 @@ +++#ifndef MAXCLIENT_H +++#define MAXCLIENT_H +++ +++#define MAXUDP 200 +++#define MAXTCP 20 +++ +++#endif /* MAXCLIENT_H */ ++--- /dev/null +++++ b/qmerge.c ++@@ -0,0 +1,115 @@ +++#include "qmerge.h" +++#include "byte.h" +++#include "log.h" +++#include "maxclient.h" +++ +++#define QMERGE_MAX (MAXUDP+MAXTCP) +++struct qmerge inprogress[QMERGE_MAX]; +++ +++static +++int qmerge_key_init(struct qmerge_key *qmk, const char *q, const char qtype[2], +++ const char *control) +++{ +++ if (!dns_domain_copy(&qmk->q, q)) return 0; +++ byte_copy(qmk->qtype, 2, qtype); +++ if (!dns_domain_copy(&qmk->control, control)) return 0; +++ return 1; +++} +++ +++static +++int qmerge_key_equal(struct qmerge_key *a, struct qmerge_key *b) +++{ +++ return +++ byte_equal(a->qtype, 2, b->qtype) && +++ dns_domain_equal(a->q, b->q) && +++ dns_domain_equal(a->control, b->control); +++} +++ +++static +++void qmerge_key_free(struct qmerge_key *qmk) +++{ +++ dns_domain_free(&qmk->q); +++ dns_domain_free(&qmk->control); +++} +++ +++void qmerge_free(struct qmerge **x) +++{ +++ struct qmerge *qm; +++ +++ qm = *x; +++ *x = 0; +++ if (!qm || !qm->active) return; +++ +++ qm->active--; +++ if (!qm->active) { +++ qmerge_key_free(&qm->key); +++ dns_transmit_free(&qm->dt); +++ } +++} +++ +++int qmerge_start(struct qmerge **qm, const char servers[64], int flagrecursive, +++ const char *q, const char qtype[2], const char localip[4], +++ const char *control) +++{ +++ struct qmerge_key k; +++ int i; +++ int r; +++ +++ qmerge_free(qm); +++ +++ byte_zero(&k, sizeof k); +++ if (!qmerge_key_init(&k, q, qtype, control)) return -1; +++ for (i = 0; i < QMERGE_MAX; i++) { +++ if (!inprogress[i].active) continue; +++ if (!qmerge_key_equal(&k, &inprogress[i].key)) continue; +++ log_tx_piggyback(q, qtype, control); +++ inprogress[i].active++; +++ *qm = &inprogress[i]; +++ qmerge_key_free(&k); +++ return 0; +++ } +++ +++ for (i = 0; i < QMERGE_MAX; i++) +++ if (!inprogress[i].active) +++ break; +++ if (i == QMERGE_MAX) return -1; +++ +++ log_tx(q, qtype, control, servers, 0); +++ r = dns_transmit_start(&inprogress[i].dt, servers, flagrecursive, q, qtype, localip); +++ if (r == -1) { qmerge_key_free(&k); return -1; } +++ inprogress[i].active++; +++ inprogress[i].state = 0; +++ qmerge_key_free(&inprogress[i].key); +++ byte_copy(&inprogress[i].key, sizeof k, &k); +++ *qm = &inprogress[i]; +++ return 0; +++} +++ +++void qmerge_io(struct qmerge *qm, iopause_fd *io, struct taia *deadline) +++{ +++ if (qm->state == 0) { +++ dns_transmit_io(&qm->dt, io, deadline); +++ qm->state = 1; +++ } +++ else { +++ io->fd = -1; +++ io->events = 0; +++ } +++} +++ +++int qmerge_get(struct qmerge **x, const iopause_fd *io, const struct taia *when) +++{ +++ int r; +++ struct qmerge *qm; +++ +++ qm = *x; +++ if (qm->state == -1) return -1; /* previous error */ +++ if (qm->state == 0) return 0; /* no packet */ +++ if (qm->state == 2) return 1; /* already got packet */ +++ +++ r = dns_transmit_get(&qm->dt, io, when); +++ if (r == -1) { qm->state = -1; return -1; } /* error */ +++ if (r == 0) { qm->state = 0; return 0; } /* must wait for i/o */ +++ if (r == 1) { qm->state = 2; return 1; } /* got packet */ +++ return -1; /* bug */ +++} ++--- /dev/null +++++ b/qmerge.h ++@@ -0,0 +1,24 @@ +++#ifndef QMERGE_H +++#define QMERGE_H +++ +++#include "dns.h" +++ +++struct qmerge_key { +++ char *q; +++ char qtype[2]; +++ char *control; +++}; +++ +++struct qmerge { +++ int active; +++ struct qmerge_key key; +++ struct dns_transmit dt; +++ int state; /* -1 = error, 0 = need io, 1 = need get, 2 = got packet */ +++}; +++ +++extern int qmerge_start(struct qmerge **,const char *,int,const char *,const char *,const char *,const char *); +++extern void qmerge_io(struct qmerge *,iopause_fd *,struct taia *); +++extern int qmerge_get(struct qmerge **,const iopause_fd *,const struct taia *); +++extern void qmerge_free(struct qmerge **); +++ +++#endif /* QMERGE_H */ ++--- a/query.c +++++ b/query.c ++@@ -83,7 +83,7 @@ static void cleanup(struct query *z) ++ int j; ++ int k; ++ ++- dns_transmit_free(&z->dt); +++ qmerge_free(&z->qm); ++ for (j = 0;j < QUERY_MAXALIAS;++j) ++ dns_domain_free(&z->alias[j]); ++ for (j = 0;j < QUERY_MAXLEVEL;++j) { ++@@ -452,14 +452,8 @@ static int doit(struct query *z,int stat ++ if (j == 64) goto SERVFAIL; ++ ++ dns_sortip(z->servers[z->level],64); ++- if (z->level) { ++- log_tx(z->name[z->level],DNS_T_A,z->control[z->level],z->servers[z->level],z->level); ++- if (dns_transmit_start(&z->dt,z->servers[z->level],flagforwardonly,z->name[z->level],DNS_T_A,z->localip) == -1) goto DIE; ++- } ++- else { ++- log_tx(z->name[0],z->type,z->control[0],z->servers[0],0); ++- if (dns_transmit_start(&z->dt,z->servers[0],flagforwardonly,z->name[0],z->type,z->localip) == -1) goto DIE; ++- } +++ dtype = z->level ? DNS_T_A : z->type; +++ if (qmerge_start(&z->qm,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip,z->control[z->level]) == -1) goto DIE; ++ return 0; ++ ++ ++@@ -473,10 +467,10 @@ static int doit(struct query *z,int stat ++ ++ HAVEPACKET: ++ if (++z->loop == 100) goto DIE; ++- buf = z->dt.packet; ++- len = z->dt.packetlen; +++ buf = z->qm->dt.packet; +++ len = z->qm->dt.packetlen; ++ ++- whichserver = z->dt.servers + 4 * z->dt.curserver; +++ whichserver = z->qm->dt.servers + 4 * z->qm->dt.curserver; ++ control = z->control[z->level]; ++ d = z->name[z->level]; ++ dtype = z->level ? DNS_T_A : z->type; ++@@ -902,7 +896,7 @@ int query_start(struct query *z,char *dn ++ ++ int query_get(struct query *z,iopause_fd *x,struct taia *stamp) ++ { ++- switch(dns_transmit_get(&z->dt,x,stamp)) { +++ switch(qmerge_get(&z->qm,x,stamp)) { ++ case 1: ++ return doit(z,1); ++ case -1: ++@@ -913,5 +907,5 @@ int query_get(struct query *z,iopause_fd ++ ++ void query_io(struct query *z,iopause_fd *x,struct taia *deadline) ++ { ++- dns_transmit_io(&z->dt,x,deadline); +++ qmerge_io(z->qm,x,deadline); ++ } ++--- a/query.h +++++ b/query.h ++@@ -1,7 +1,7 @@ ++ #ifndef QUERY_H ++ #define QUERY_H ++ ++-#include "dns.h" +++#include "qmerge.h" ++ #include "uint32.h" ++ ++ #define QUERY_MAXLEVEL 5 ++@@ -20,7 +20,7 @@ struct query { ++ char localip[4]; ++ char type[2]; ++ char class[2]; ++- struct dns_transmit dt; +++ struct qmerge *qm; ++ } ; ++ ++ extern int query_start(struct query *,char *,char *,char *,char *); +diff --git a/feeds/packages/net/djbdns/patches/320-bugfix-dnscache-cache-soa-records.patch b/feeds/packages/net/djbdns/patches/320-bugfix-dnscache-cache-soa-records.patch +new file mode 100644 +index 0000000..f2b72a3 +--- /dev/null ++++ b/feeds/packages/net/djbdns/patches/320-bugfix-dnscache-cache-soa-records.patch +@@ -0,0 +1,67 @@ ++--- a/query.c +++++ b/query.c ++@@ -342,6 +342,29 @@ static int doit(struct query *z,int stat ++ } ++ } ++ +++ if (typematch(DNS_T_SOA,dtype)) { +++ byte_copy(key,2,DNS_T_SOA); +++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); +++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { +++ log_cachedanswer(d,DNS_T_SOA); +++ if (!rqa(z)) goto DIE; +++ pos = 0; +++ while (pos = dns_packet_copy(cached,cachedlen,pos,misc,20)) { +++ pos = dns_packet_getname(cached,cachedlen,pos,&t2); +++ if (!pos) break; +++ pos = dns_packet_getname(cached,cachedlen,pos,&t3); +++ if (!pos) break; +++ if (!response_rstart(d,DNS_T_SOA,ttl)) goto DIE; +++ if (!response_addname(t2)) goto DIE; +++ if (!response_addname(t3)) goto DIE; +++ if (!response_addbytes(misc,20)) goto DIE; +++ response_rfinish(RESPONSE_ANSWER); +++ } +++ cleanup(z); +++ return 1; +++ } +++ } +++ ++ if (typematch(DNS_T_A,dtype)) { ++ byte_copy(key,2,DNS_T_A); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++@@ -374,7 +397,7 @@ static int doit(struct query *z,int stat ++ } ++ } ++ ++- if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) { +++ if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_SOA,dtype)) { ++ byte_copy(key,2,dtype); ++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl); ++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { ++@@ -601,15 +624,24 @@ static int doit(struct query *z,int stat ++ else if (byte_equal(type,2,DNS_T_AXFR)) ++ ; ++ else if (byte_equal(type,2,DNS_T_SOA)) { +++ int non_authority = 0; +++ save_start(); ++ while (i < j) { ++ pos = dns_packet_skipname(buf,len,records[i]); if (!pos) goto DIE; ++ pos = dns_packet_getname(buf,len,pos + 10,&t2); if (!pos) goto DIE; ++ pos = dns_packet_getname(buf,len,pos,&t3); if (!pos) goto DIE; ++ pos = dns_packet_copy(buf,len,pos,misc,20); if (!pos) goto DIE; ++- if (records[i] < posauthority) +++ if (records[i] < posauthority) { ++ log_rrsoa(whichserver,t1,t2,t3,misc,ttl); +++ save_data(misc,20); +++ save_data(t2,dns_domain_length(t2)); +++ save_data(t3,dns_domain_length(t3)); +++ non_authority++; +++ } ++ ++i; ++ } +++ if (non_authority) +++ save_finish(DNS_T_SOA,t1,ttl); ++ } ++ else if (byte_equal(type,2,DNS_T_CNAME)) { ++ pos = dns_packet_skipname(buf,len,records[j - 1]); if (!pos) goto DIE; +diff --git a/feeds/packages/net/dmapd/.svn/entries b/feeds/packages/net/dmapd/.svn/entries +new file mode 100644 +index 0000000..b47a4f7 +--- /dev/null ++++ b/feeds/packages/net/dmapd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dmapd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T12:30:00.380506Z ++32746 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e0c1a44e2c191688a2523f74fb94d0a1 ++2012-07-16T12:30:00.380506Z ++32746 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1452 ++ +diff --git a/feeds/packages/net/dmapd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dmapd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5dd12df +--- /dev/null ++++ b/feeds/packages/net/dmapd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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.50 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd ++PKG_MD5SUM:=2e04d7fb8437f9e7bd370dc3af450aae ++ ++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 +GraphicsMagick ++ TITLE:= dmapd ++ URL:=http://www.flyn.org/projects/dmapd/ ++ MAINTAINER:=W. Michael Petullo ++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/feeds/packages/net/dmapd/Makefile b/feeds/packages/net/dmapd/Makefile +new file mode 100644 +index 0000000..5dd12df +--- /dev/null ++++ b/feeds/packages/net/dmapd/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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.50 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd ++PKG_MD5SUM:=2e04d7fb8437f9e7bd370dc3af450aae ++ ++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 +GraphicsMagick ++ TITLE:= dmapd ++ URL:=http://www.flyn.org/projects/dmapd/ ++ MAINTAINER:=W. Michael Petullo ++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/feeds/packages/net/dmapd/files/.svn/entries b/feeds/packages/net/dmapd/files/.svn/entries +new file mode 100644 +index 0000000..6c086fb +--- /dev/null ++++ b/feeds/packages/net/dmapd/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dmapd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-23T12:26:58.080838Z ++29872 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dmapd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++db131e468013fd0d5d3bdd0773e52d7c ++2012-01-23T12:26:58.080838Z ++29872 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++749 ++ +diff --git a/feeds/packages/net/dmapd/files/.svn/text-base/dmapd.init.svn-base b/feeds/packages/net/dmapd/files/.svn/text-base/dmapd.init.svn-base +new file mode 100644 +index 0000000..e76b0ef +--- /dev/null ++++ b/feeds/packages/net/dmapd/files/.svn/text-base/dmapd.init.svn-base +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2012 OpenWrt.org ++ ++START=60 ++ ++start() { ++ user_exists dmapd 56 || user_add dmapd 56 ++ group_exists dmapd 56 || group_add dmapd 56 ++ [ -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 -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k ++} ++ ++stop() { ++ service_stop /usr/sbin/dmapd ++} +diff --git a/feeds/packages/net/dmapd/files/dmapd.init b/feeds/packages/net/dmapd/files/dmapd.init +new file mode 100644 +index 0000000..e76b0ef +--- /dev/null ++++ b/feeds/packages/net/dmapd/files/dmapd.init +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2012 OpenWrt.org ++ ++START=60 ++ ++start() { ++ user_exists dmapd 56 || user_add dmapd 56 ++ group_exists dmapd 56 || group_add dmapd 56 ++ [ -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 -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k ++} ++ ++stop() { ++ service_stop /usr/sbin/dmapd ++} +diff --git a/feeds/packages/net/dmapd/patches/.svn/entries b/feeds/packages/net/dmapd/patches/.svn/entries +new file mode 100644 +index 0000000..621353a +--- /dev/null ++++ b/feeds/packages/net/dmapd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dmapd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-23T12:26:58.080838Z ++29872 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-dmapd_conf.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++cd1132e28fe2255031a9a5e631d4171c ++2012-01-23T12:26:58.080838Z ++29872 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++250 ++ +diff --git a/feeds/packages/net/dmapd/patches/.svn/text-base/001-dmapd_conf.patch.svn-base b/feeds/packages/net/dmapd/patches/.svn/text-base/001-dmapd_conf.patch.svn-base +new file mode 100644 +index 0000000..9c1e60a +--- /dev/null ++++ b/feeds/packages/net/dmapd/patches/.svn/text-base/001-dmapd_conf.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/net/dmapd/patches/001-dmapd_conf.patch b/feeds/packages/net/dmapd/patches/001-dmapd_conf.patch +new file mode 100644 +index 0000000..9c1e60a +--- /dev/null ++++ b/feeds/packages/net/dmapd/patches/001-dmapd_conf.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/net/dns2tcp/.svn/entries b/feeds/packages/net/dns2tcp/.svn/entries +new file mode 100644 +index 0000000..1696972 +--- /dev/null ++++ b/feeds/packages/net/dns2tcp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dns2tcp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:26.303593Z ++33051 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++a092a74afbc5d757ba0422181a8017ac ++2012-08-07T16:09:26.303593Z ++33051 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1084 ++ +diff --git a/feeds/packages/net/dns2tcp/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dns2tcp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4f038e8 +--- /dev/null ++++ b/feeds/packages/net/dns2tcp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# Copyright (C) 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:=dns2tcp ++PKG_VERSION:=0.5.2 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=51c5dc69f5814c2936ce6832217d292d ++ ++PKG_SOURCE_URL:=http://www.hsc.fr/ressources/outils/dns2tcp/download/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dns2tcp/Default ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=TCP over DNS tunnel ++ URL:=http://www.hsc.fr/ressources/outils/dns2tcp/ ++endef ++ ++define Package/dns2tcp ++ $(call Package/dns2tcp/Default) ++ TITLE+= (client) ++endef ++ ++define Package/dns2tcpd ++ $(call Package/dns2tcp/Default) ++ TITLE+= (server) ++endef ++ ++define Package/dns2tcp/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/dns2tcpc $(1)/usr/bin ++endef ++ ++define Package/dns2tcpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/dns2tcpd $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,dns2tcp)) ++$(eval $(call BuildPackage,dns2tcpd)) +diff --git a/feeds/packages/net/dns2tcp/Makefile b/feeds/packages/net/dns2tcp/Makefile +new file mode 100644 +index 0000000..4f038e8 +--- /dev/null ++++ b/feeds/packages/net/dns2tcp/Makefile +@@ -0,0 +1,47 @@ ++# ++# Copyright (C) 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:=dns2tcp ++PKG_VERSION:=0.5.2 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=51c5dc69f5814c2936ce6832217d292d ++ ++PKG_SOURCE_URL:=http://www.hsc.fr/ressources/outils/dns2tcp/download/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dns2tcp/Default ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=TCP over DNS tunnel ++ URL:=http://www.hsc.fr/ressources/outils/dns2tcp/ ++endef ++ ++define Package/dns2tcp ++ $(call Package/dns2tcp/Default) ++ TITLE+= (client) ++endef ++ ++define Package/dns2tcpd ++ $(call Package/dns2tcp/Default) ++ TITLE+= (server) ++endef ++ ++define Package/dns2tcp/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/client/dns2tcpc $(1)/usr/bin ++endef ++ ++define Package/dns2tcpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/dns2tcpd $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,dns2tcp)) ++$(eval $(call BuildPackage,dns2tcpd)) +diff --git a/feeds/packages/net/dsl-qos-queue/.svn/entries b/feeds/packages/net/dsl-qos-queue/.svn/entries +new file mode 100644 +index 0000000..4de9e2d +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dsl-qos-queue ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-18T19:04:00.320957Z ++31799 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++c786f69a3e1fad3a7a2485b20ae100b5 ++2012-05-18T19:04:00.320957Z ++31799 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1224 ++ +diff --git a/feeds/packages/net/dsl-qos-queue/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/dsl-qos-queue/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsl-qos-queue/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dsl-qos-queue/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..30d0f9a +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=dsl_qos_queue ++PKG_VERSION:=0.9.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sonicspike.net/software/download/ ++PKG_MD5SUM:=ccbe8d28c3508c67f669fe98532533be ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dsl-qos-queue ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+iptables +kmod-ipt-queue +iptables-mod-ipopt +libipq ++ TITLE:=ADSL/ATM Bandwith management ++ URL:=http://www.sonicspike.net/software/ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libipq $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ LIBIPQ="-lipq" \ ++ all \ ++ ) ++endef ++ ++define Package/dsl-qos-queue/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dsl_qos_train $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ipt_rules $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,dsl-qos-queue)) +diff --git a/feeds/packages/net/dsl-qos-queue/Makefile b/feeds/packages/net/dsl-qos-queue/Makefile +new file mode 100644 +index 0000000..30d0f9a +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=dsl_qos_queue ++PKG_VERSION:=0.9.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.sonicspike.net/software/download/ ++PKG_MD5SUM:=ccbe8d28c3508c67f669fe98532533be ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dsl-qos-queue ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+iptables +kmod-ipt-queue +iptables-mod-ipopt +libipq ++ TITLE:=ADSL/ATM Bandwith management ++ URL:=http://www.sonicspike.net/software/ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libipq $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ LIBIPQ="-lipq" \ ++ all \ ++ ) ++endef ++ ++define Package/dsl-qos-queue/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dsl_qos_train $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ipt_rules $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,dsl-qos-queue)) +diff --git a/feeds/packages/net/dsl-qos-queue/patches/.svn/entries b/feeds/packages/net/dsl-qos-queue/patches/.svn/entries +new file mode 100644 +index 0000000..bd6c559 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dsl-qos-queue/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-05-02T20:24:56.106346Z ++21317 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++b81a21a9ae24e1945a83e899816c9aac ++2009-05-29T12:01:14.173520Z ++16181 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++443 ++ ++020-fix_shebang_line.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++7ad73f460318dfe1f54018f302a50c23 ++2010-05-02T20:24:56.106346Z ++21317 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++251 ++ ++010-ports_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++62c456113ae8abc1659b7d7067bf3693 ++2010-05-02T20:24:44.991648Z ++21315 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2049 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++d4e8dc65c24b301360097a2695d27932 ++2009-05-29T12:01:14.173520Z ++16181 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1088 ++ +diff --git a/feeds/packages/net/dsl-qos-queue/patches/.svn/prop-base/001-cross_compile.patch.svn-base b/feeds/packages/net/dsl-qos-queue/patches/.svn/prop-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/.svn/prop-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..43a9094 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,40 @@ ++--- a/dsl_qos_queue.c +++++ b/dsl_qos_queue.c ++@@ -552,12 +552,12 @@ ++ ++ syslog(LOG_INFO, "setup()"); ++ ++- rval=system("modprobe ip_queue"); +++/* rval=system("modprobe ip_queue"); ++ if (WEXITSTATUS(rval)!=0) ++ { ++ printf("Unable to install ip_queue module.\n"); ++ exit(1); ++- } +++ }*/ ++ ++ for (i=0;i ++-#include ++ #include ++ #include ++ #include ++@@ -25,6 +23,8 @@ ++ #include ++ #include ++ #include +++#include +++#include ++ ++ #include "daemon.h" ++ +diff --git a/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/010-ports_fix.patch.svn-base b/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/010-ports_fix.patch.svn-base +new file mode 100644 +index 0000000..4280a11 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/010-ports_fix.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/ipt_rules +++++ b/ipt_rules ++@@ -26,14 +26,14 @@ iptables -t mangle -A MYSHAPER-OUT -p tc ++ iptables -t mangle -A MYSHAPER-OUT -p icmp -j MARK --set-mark 20 # ICMP (ping) - high prio, impress friends ++ iptables -t mangle -A MYSHAPER-OUT -p udp --dport 123 -j MARK --set-mark 20 # NTP should be low-lag ++ iptables -t mangle -A MYSHAPER-OUT -p udp --dport 53 -j MARK --set-mark 21 # DNS name resolution (small packets) ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --dport ssh -j MARK --set-mark 22 # secure shell ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --sport ssh -j MARK --set-mark 22 # secure shell ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --dport telnet -j MARK --set-mark 22 # telnet (ew...) ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --sport telnet -j MARK --set-mark 22 # telnet (ew...) +++iptables -t mangle -A MYSHAPER-OUT -p tcp --dport 22 -j MARK --set-mark 22 # secure shell +++iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 22 -j MARK --set-mark 22 # secure shell +++iptables -t mangle -A MYSHAPER-OUT -p tcp --dport 23 -j MARK --set-mark 22 # telnet (ew...) +++iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 23 -j MARK --set-mark 22 # telnet (ew...) ++ iptables -t mangle -A MYSHAPER-OUT -p ipv6-crypt -j MARK --set-mark 24 # IPSec - we dont know what the payload is though... ++ iptables -t mangle -A MYSHAPER-OUT -p udp --dport 10000 -j MARK --set-mark 24 # IPSec (udp tunnel) - we dont know what the payload is though... ++ ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --sport http -j MARK --set-mark 25 # Local web server +++iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 80 -j MARK --set-mark 25 # Local web server ++ iptables -t mangle -A MYSHAPER-OUT -p tcp -m length --length :64 -j MARK --set-mark 21 # small packets (probably just ACKs) ++ iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 3389 -j MARK --set-mark 23 # windows remote computer connection ++ iptables -t mangle -A MYSHAPER-OUT -m mark --mark 0 -j MARK --set-mark 26 # redundant- mark any unmarked packets as 26 (low pri +diff --git a/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/020-fix_shebang_line.patch.svn-base b/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/020-fix_shebang_line.patch.svn-base +new file mode 100644 +index 0000000..1a95300 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/.svn/text-base/020-fix_shebang_line.patch.svn-base +@@ -0,0 +1,8 @@ ++--- a/ipt_rules +++++ b/ipt_rules ++@@ -1,4 +1,4 @@ ++-#!/bin/bash +++#!/bin/sh ++ # add MYSHAPER-OUT chain to the mangle table in iptables - this sets up the table we'll use ++ # to filter and mark packets. ++ +diff --git a/feeds/packages/net/dsl-qos-queue/patches/001-cross_compile.patch b/feeds/packages/net/dsl-qos-queue/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..43a9094 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/001-cross_compile.patch +@@ -0,0 +1,40 @@ ++--- a/dsl_qos_queue.c +++++ b/dsl_qos_queue.c ++@@ -552,12 +552,12 @@ ++ ++ syslog(LOG_INFO, "setup()"); ++ ++- rval=system("modprobe ip_queue"); +++/* rval=system("modprobe ip_queue"); ++ if (WEXITSTATUS(rval)!=0) ++ { ++ printf("Unable to install ip_queue module.\n"); ++ exit(1); ++- } +++ }*/ ++ ++ for (i=0;i ++-#include ++ #include ++ #include ++ #include ++@@ -25,6 +23,8 @@ ++ #include ++ #include ++ #include +++#include +++#include ++ ++ #include "daemon.h" ++ +diff --git a/feeds/packages/net/dsl-qos-queue/patches/010-ports_fix.patch b/feeds/packages/net/dsl-qos-queue/patches/010-ports_fix.patch +new file mode 100644 +index 0000000..4280a11 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/010-ports_fix.patch +@@ -0,0 +1,22 @@ ++--- a/ipt_rules +++++ b/ipt_rules ++@@ -26,14 +26,14 @@ iptables -t mangle -A MYSHAPER-OUT -p tc ++ iptables -t mangle -A MYSHAPER-OUT -p icmp -j MARK --set-mark 20 # ICMP (ping) - high prio, impress friends ++ iptables -t mangle -A MYSHAPER-OUT -p udp --dport 123 -j MARK --set-mark 20 # NTP should be low-lag ++ iptables -t mangle -A MYSHAPER-OUT -p udp --dport 53 -j MARK --set-mark 21 # DNS name resolution (small packets) ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --dport ssh -j MARK --set-mark 22 # secure shell ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --sport ssh -j MARK --set-mark 22 # secure shell ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --dport telnet -j MARK --set-mark 22 # telnet (ew...) ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --sport telnet -j MARK --set-mark 22 # telnet (ew...) +++iptables -t mangle -A MYSHAPER-OUT -p tcp --dport 22 -j MARK --set-mark 22 # secure shell +++iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 22 -j MARK --set-mark 22 # secure shell +++iptables -t mangle -A MYSHAPER-OUT -p tcp --dport 23 -j MARK --set-mark 22 # telnet (ew...) +++iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 23 -j MARK --set-mark 22 # telnet (ew...) ++ iptables -t mangle -A MYSHAPER-OUT -p ipv6-crypt -j MARK --set-mark 24 # IPSec - we dont know what the payload is though... ++ iptables -t mangle -A MYSHAPER-OUT -p udp --dport 10000 -j MARK --set-mark 24 # IPSec (udp tunnel) - we dont know what the payload is though... ++ ++-iptables -t mangle -A MYSHAPER-OUT -p tcp --sport http -j MARK --set-mark 25 # Local web server +++iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 80 -j MARK --set-mark 25 # Local web server ++ iptables -t mangle -A MYSHAPER-OUT -p tcp -m length --length :64 -j MARK --set-mark 21 # small packets (probably just ACKs) ++ iptables -t mangle -A MYSHAPER-OUT -p tcp --sport 3389 -j MARK --set-mark 23 # windows remote computer connection ++ iptables -t mangle -A MYSHAPER-OUT -m mark --mark 0 -j MARK --set-mark 26 # redundant- mark any unmarked packets as 26 (low pri +diff --git a/feeds/packages/net/dsl-qos-queue/patches/020-fix_shebang_line.patch b/feeds/packages/net/dsl-qos-queue/patches/020-fix_shebang_line.patch +new file mode 100644 +index 0000000..1a95300 +--- /dev/null ++++ b/feeds/packages/net/dsl-qos-queue/patches/020-fix_shebang_line.patch +@@ -0,0 +1,8 @@ ++--- a/ipt_rules +++++ b/ipt_rules ++@@ -1,4 +1,4 @@ ++-#!/bin/bash +++#!/bin/sh ++ # add MYSHAPER-OUT chain to the mangle table in iptables - this sets up the table we'll use ++ # to filter and mark packets. ++ +diff --git a/feeds/packages/net/dsniff/.svn/entries b/feeds/packages/net/dsniff/.svn/entries +new file mode 100644 +index 0000000..0763ca1 +--- /dev/null ++++ b/feeds/packages/net/dsniff/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dsniff ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-22T10:02:33.328012Z ++33222 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++656372842dd84d6e9d80b04226c04c79 ++2012-08-22T10:02:33.328012Z ++33222 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1575 ++ +diff --git a/feeds/packages/net/dsniff/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/dsniff/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/dsniff/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dsniff/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1c07c34 +--- /dev/null ++++ b/feeds/packages/net/dsniff/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=dsniff ++PKG_VERSION:=2.4b1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/beta ++PKG_MD5SUM:=2f761fa3475682a7512b0b43568ee7d6 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2.4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dsniff ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libnids +libnet0 +libopenssl +libgdbm $(LIBRPC_DEPENDS) @BROKEN ++ TITLE:=A collection of tools for network auditing and penetration testing ++ URL:=http://www.monkey.org/~dugsong/dsniff/ ++endef ++ ++define Package/dsniff/description ++ A collection of tools for network auditing and penetration testing. ++endef ++ ++TARGET_LDFLAGS += $(LIBRPC) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-gdbm="$(STAGING_DIR)/usr" \ ++ --with-libnids="$(STAGING_DIR)/usr" \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --without-db \ ++ --without-x \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ install_prefix="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/dsniff/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,dsniff)) +diff --git a/feeds/packages/net/dsniff/Makefile b/feeds/packages/net/dsniff/Makefile +new file mode 100644 +index 0000000..1c07c34 +--- /dev/null ++++ b/feeds/packages/net/dsniff/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=dsniff ++PKG_VERSION:=2.4b1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/beta ++PKG_MD5SUM:=2f761fa3475682a7512b0b43568ee7d6 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2.4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dsniff ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libnids +libnet0 +libopenssl +libgdbm $(LIBRPC_DEPENDS) @BROKEN ++ TITLE:=A collection of tools for network auditing and penetration testing ++ URL:=http://www.monkey.org/~dugsong/dsniff/ ++endef ++ ++define Package/dsniff/description ++ A collection of tools for network auditing and penetration testing. ++endef ++ ++TARGET_LDFLAGS += $(LIBRPC) ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-gdbm="$(STAGING_DIR)/usr" \ ++ --with-libnids="$(STAGING_DIR)/usr" \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --without-db \ ++ --without-x \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ install_prefix="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/dsniff/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,dsniff)) +diff --git a/feeds/packages/net/dsniff/patches/.svn/entries b/feeds/packages/net/dsniff/patches/.svn/entries +new file mode 100644 +index 0000000..3c39aea +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/entries +@@ -0,0 +1,368 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dsniff/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-04T14:13:47.355334Z ++31187 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-dns.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++e22b305144086e239fb564ca6c392ac7 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++19045 ++ ++004-no_yp.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++5f9929f0e370fdd73127f5a1a2cb358a ++2010-11-03T22:45:51.346103Z ++23845 ++mb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1733 ++ ++003-gdbm.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++9b2acc9dd71f2f1489ac97716d63341b ++2010-11-03T22:45:51.346103Z ++23845 ++mb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4646 ++ ++007-time_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++b23501ce2fd5d9a822358039c2e229fa ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++706 ++ ++010-clk-tck-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++72abdf1a9a24707737020758d8eebd56 ++2010-11-03T22:45:51.346103Z ++23845 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++373 ++ ++005-openssl_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++8afbe9e1730313fab9d5b3e124b7f915 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++230 ++ ++001-arpspoof_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++c3d0f0948ec924672a8cf1ef85a96f19 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1591 ++ ++008-md5_include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++8992c95794f26c30dc938b703d11cb3b ++2010-11-03T22:45:51.346103Z ++23845 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++365 ++ ++006-pcap_header.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++90390245c9f82d458ebc5d42f6692f3e ++2010-11-03T22:45:51.346103Z ++23845 ++mb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++553 ++ ++001-decode_pop.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++0a1a02cf42d4873ba37604784981b5f7 ++2012-04-04T14:13:47.355334Z ++31187 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2811 ++ +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/001-arpspoof_fix.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/001-arpspoof_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/001-arpspoof_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/001-dns.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/001-dns.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/001-dns.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/003-gdbm.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/003-gdbm.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/003-gdbm.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/004-no_yp.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/004-no_yp.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/004-no_yp.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/005-openssl_fix.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/005-openssl_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/005-openssl_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/006-pcap_header.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/006-pcap_header.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/006-pcap_header.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/prop-base/007-time_h.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/prop-base/007-time_h.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/prop-base/007-time_h.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/001-arpspoof_fix.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/001-arpspoof_fix.patch.svn-base +new file mode 100644 +index 0000000..fd29227 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/001-arpspoof_fix.patch.svn-base +@@ -0,0 +1,53 @@ ++diff -urN dsniff.old/arp.c dsniff.dev/arp.c ++--- dsniff.old/arp.c 2001-03-15 09:32:58.000000000 +0100 +++++ dsniff.dev/arp.c 2006-03-03 01:41:10.000000000 +0100 ++@@ -39,7 +39,7 @@ ++ ++ #ifdef BSD ++ int ++-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) +++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif) ++ { ++ int mib[6]; ++ size_t len; ++@@ -91,7 +91,7 @@ ++ #endif ++ ++ int ++-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) +++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif) ++ { ++ int sock; ++ struct arpreq ar; ++@@ -99,7 +99,7 @@ ++ ++ memset((char *)&ar, 0, sizeof(ar)); ++ #ifdef __linux__ ++- strncpy(ar.arp_dev, "eth0", sizeof(ar.arp_dev)); /* XXX - *sigh* */ +++ strncpy(ar.arp_dev, lif, strlen(lif)); ++ #endif ++ sin = (struct sockaddr_in *)&ar.arp_pa; ++ sin->sin_family = AF_INET; ++diff -urN dsniff.old/arp.h dsniff.dev/arp.h ++--- dsniff.old/arp.h 2001-03-15 09:27:08.000000000 +0100 +++++ dsniff.dev/arp.h 2006-03-03 01:42:23.000000000 +0100 ++@@ -11,6 +11,6 @@ ++ #ifndef _ARP_H_ ++ #define _ARP_H_ ++ ++-int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether); +++int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif); ++ ++ #endif /* _ARP_H_ */ ++diff -urN dsniff.old/arpspoof.c dsniff.dev/arpspoof.c ++--- dsniff.old/arpspoof.c 2001-03-15 09:32:58.000000000 +0100 +++++ dsniff.dev/arpspoof.c 2006-03-03 01:42:00.000000000 +0100 ++@@ -113,7 +113,7 @@ ++ int i = 0; ++ ++ do { ++- if (arp_cache_lookup(ip, mac) == 0) +++ if (arp_cache_lookup(ip, mac, intf) == 0) ++ return (1); ++ #ifdef __linux__ ++ /* XXX - force the kernel to arp. feh. */ +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/001-decode_pop.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/001-decode_pop.patch.svn-base +new file mode 100644 +index 0000000..24e1a47 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/001-decode_pop.patch.svn-base +@@ -0,0 +1,122 @@ ++diff --git a/decode_pop.c b/decode_pop.c ++index 04044f5..767da41 100644 ++--- a/decode_pop.c +++++ b/decode_pop.c ++@@ -6,6 +6,8 @@ ++ * Copyright (c) 2000 Dug Song ++ * ++ * $Id: decode_pop.c,v 1.4 2001/03/15 08:33:02 dugsong Exp $ +++ * +++ * Rewritten by Stefan Tomanek 2011 ++ */ ++ ++ #include "config.h" ++@@ -45,32 +47,88 @@ int ++ decode_pop(u_char *buf, int len, u_char *obuf, int olen) ++ { ++ char *p; +++ char *s; +++ int n; ++ int i, j; +++ char *user; +++ char *password; +++ enum { +++ NONE, +++ AUTHPLAIN, +++ AUTHLOGIN, +++ USERPASS +++ } mode = NONE; +++ ++ ++ obuf[0] = '\0'; ++ ++ for (p = strtok(buf, "\r\n"); p != NULL; p = strtok(NULL, "\r\n")) { ++- if (strncasecmp(p, "AUTH PLAIN", 10) == 0 || ++- strncasecmp(p, "AUTH LOGIN", 10) == 0) { ++- strlcat(obuf, p, olen); ++- strlcat(obuf, "\n", olen); ++- ++- /* Decode SASL auth. */ ++- for (i = 0; i < 2 && (p = strtok(NULL, "\r\n")); i++) { ++- strlcat(obuf, p, olen); ++- j = base64_pton(p, p, strlen(p)); ++- p[j] = '\0'; ++- strlcat(obuf, " [", olen); ++- strlcat(obuf, p, olen); ++- strlcat(obuf, "]\n", olen); +++ if (mode == NONE) { +++ user = NULL; +++ password = NULL; +++ if (strncasecmp(p, "AUTH PLAIN", 10) == 0) { +++ mode = AUTHPLAIN; +++ continue; +++ } +++ if (strncasecmp(p, "AUTH LOGIN", 10) == 0) { +++ mode = AUTHLOGIN; +++ continue; +++ } +++ if (strncasecmp(p, "USER ", 5) == 0) { +++ mode = USERPASS; +++ /* the traditional login cuts right to the case, +++ * so no continue here +++ */ ++ } ++ } ++- /* Save regular POP2, POP3 auth info. */ ++- else if (strncasecmp(p, "USER ", 5) == 0 || ++- strncasecmp(p, "PASS ", 5) == 0 || ++- strncasecmp(p, "HELO ", 5) == 0) { ++- strlcat(obuf, p, olen); ++- strlcat(obuf, "\n", olen); +++ printf("(%d) %s\n", mode, p); +++ if (mode == USERPASS) { +++ if (strncasecmp(p, "USER ", 5) == 0) { +++ user = &p[5]; +++ } else if (strncasecmp(p, "PASS ", 5) == 0) { +++ password = &p[5]; +++ } +++ } +++ +++ if (mode == AUTHPLAIN) { +++ j = base64_pton(p, p, strlen(p)); +++ p[j] = '\0'; +++ n = 0; +++ s = p; +++ /* p consists of three parts, divided by \0 */ +++ while (s <= &p[j] && n<=3) { +++ if (n == 0) { +++ /* we do not process this portion yet */ +++ } else if (n == 1) { +++ user = s; +++ } else if (n == 2) { +++ password = s; +++ } +++ n++; +++ while (*s) s++; +++ s++; +++ } +++ } +++ +++ if (mode == AUTHLOGIN) { +++ j = base64_pton(p, p, strlen(p)); +++ p[j] = '\0'; +++ if (! user) { +++ user = p; +++ } else { +++ password = p; +++ /* got everything we need :-) */ +++ } +++ } +++ +++ if (user && password) { +++ strlcat(obuf, "\nusername [", olen); +++ strlcat(obuf, user, olen); +++ strlcat(obuf, "] password [", olen); +++ strlcat(obuf, password, olen); +++ strlcat(obuf, "]\n", olen); +++ +++ mode = NONE; ++ } ++ } ++ return (strlen(obuf)); ++ +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/001-dns.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/001-dns.patch.svn-base +new file mode 100644 +index 0000000..e5cf8b2 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/001-dns.patch.svn-base +@@ -0,0 +1,704 @@ ++diff -Nur dsniff-2.3/dns.c dsniff-2.3.patched/dns.c ++--- dsniff-2.3/dns.c 1970-01-01 01:00:00.000000000 +0100 +++++ dsniff-2.3.patched/dns.c 2005-06-09 14:06:36.000000000 +0200 ++@@ -0,0 +1,677 @@ +++/* +++ * Copyright (c) 1985, 1993 +++ * The Regents of the University of California. All rights reserved. +++ * +++ * 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. +++ * 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. +++ */ +++ +++/* +++ * Portions Copyright (c) 1993 by Digital Equipment Corporation. +++ * +++ * 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, and that +++ * the name of Digital Equipment Corporation not be used in advertising or +++ * publicity pertaining to distribution of the document or software without +++ * specific, written prior permission. +++ * +++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL +++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES +++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +++ * CORPORATION 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) 1996-1999 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. +++ */ +++ +++/* +++ * Copyright (c) 1996,1999 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. +++ */ +++ +++/* +++ * +++ * DNS helper functions not implemented in uclibc +++ * +++ */ +++ +++ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++static const char digits[] = "0123456789"; +++ +++/* Forward. */ +++ +++static int special(int); +++static int printable(int); +++static int dn_find(const u_char *, const u_char *, +++ const u_char * const *, +++ const u_char * const *); +++ +++ +++/* +++ * ns_name_ntop(src, dst, dstsiz) +++ * Convert an encoded domain name to printable ascii as per RFC1035. +++ * return: +++ * Number of bytes written to buffer, or -1 (with errno set) +++ * notes: +++ * The root is returned as "." +++ * All other domains are returned in non absolute form +++ */ +++int +++ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { +++ const u_char *cp; +++ char *dn, *eom; +++ u_char c; +++ u_int n; +++ +++ cp = src; +++ dn = dst; +++ eom = dst + dstsiz; +++ +++ while ((n = *cp++) != 0) { +++ if ((n & NS_CMPRSFLGS) != 0) { +++ /* Some kind of compression pointer. */ +++ return (-1); +++ } +++ if (dn != dst) { +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = '.'; +++ } +++ if (dn + n >= eom) { +++ return (-1); +++ } +++ for ((void)NULL; n > 0; n--) { +++ c = *cp++; +++ if (special(c)) { +++ if (dn + 1 >= eom) { +++ return (-1); +++ } +++ *dn++ = '\\'; +++ *dn++ = (char)c; +++ } else if (!printable(c)) { +++ if (dn + 3 >= eom) { +++ return (-1); +++ } +++ *dn++ = '\\'; +++ *dn++ = digits[c / 100]; +++ *dn++ = digits[(c % 100) / 10]; +++ *dn++ = digits[c % 10]; +++ } else { +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = (char)c; +++ } +++ } +++ } +++ if (dn == dst) { +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = '.'; +++ } +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = '\0'; +++ return (dn - dst); +++} +++ +++/* +++ * ns_name_pton(src, dst, dstsiz) +++ * Convert a ascii string into an encoded domain name as per RFC1035. +++ * return: +++ * -1 if it fails +++ * 1 if string was fully qualified +++ * 0 is string was not fully qualified +++ * notes: +++ * Enforces label and domain length limits. +++ */ +++ +++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) { +++ return (-1); +++ } +++ n += (cp - digits) * 10; +++ if ((c = *src++) == 0 || +++ (cp = strchr(digits, c)) == NULL) { +++ return (-1); +++ } +++ n += (cp - digits); +++ if (n > 255) { +++ return (-1); +++ } +++ c = n; +++ } +++ escaped = 0; +++ } else if (c == '\\') { +++ escaped = 1; +++ continue; +++ } else if (c == '.') { +++ c = (bp - label - 1); +++ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ +++ return (-1); +++ } +++ if (label >= eom) { +++ return (-1); +++ } +++ *label = c; +++ /* Fully qualified ? */ +++ if (*src == '\0') { +++ if (c != 0) { +++ if (bp >= eom) { +++ return (-1); +++ } +++ *bp++ = '\0'; +++ } +++ if ((bp - dst) > MAXCDNAME) { +++ return (-1); +++ } +++ return (1); +++ } +++ if (c == 0 || *src == '.') { +++ return (-1); +++ } +++ label = bp++; +++ continue; +++ } +++ if (bp >= eom) { +++ return (-1); +++ } +++ *bp++ = (u_char)c; +++ } +++ c = (bp - label - 1); +++ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ +++ return (-1); +++ } +++ if (label >= eom) { +++ return (-1); +++ } +++ *label = c; +++ if (c != 0) { +++ if (bp >= eom) { +++ return (-1); +++ } +++ *bp++ = 0; +++ } +++ if ((bp - dst) > MAXCDNAME) { /* src too big */ +++ return (-1); +++ } +++ return (0); +++} +++ +++/* +++ * ns_name_ntol(src, dst, dstsiz) +++ * Convert a network strings labels into all lowercase. +++ * return: +++ * Number of bytes written to buffer, or -1 (with errno set) +++ * notes: +++ * Enforces label and domain length limits. +++ */ +++ +++int +++ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) { +++ const u_char *cp; +++ u_char *dn, *eom; +++ u_char c; +++ u_int n; +++ +++ cp = src; +++ dn = dst; +++ eom = dst + dstsiz; +++ +++ while ((n = *cp++) != 0) { +++ if ((n & NS_CMPRSFLGS) != 0) { +++ /* Some kind of compression pointer. */ +++ return (-1); +++ } +++ *dn++ = n; +++ if (dn + n >= eom) { +++ return (-1); +++ } +++ for ((void)NULL; n > 0; n--) { +++ c = *cp++; +++ if (isupper(c)) +++ *dn++ = tolower(c); +++ else +++ *dn++ = c; +++ } +++ } +++ *dn++ = '\0'; +++ return (dn - dst); +++} +++ +++/* +++ * ns_name_unpack(msg, eom, src, dst, dstsiz) +++ * Unpack a domain name from a message, source may be compressed. +++ * return: +++ * -1 if it fails, or consumed octets if it succeeds. +++ */ +++int +++ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, +++ u_char *dst, size_t dstsiz) +++{ +++ const u_char *srcp, *dstlim; +++ u_char *dstp; +++ int n, len, checked; +++ +++ len = -1; +++ checked = 0; +++ dstp = dst; +++ srcp = src; +++ dstlim = dst + dstsiz; +++ if (srcp < msg || srcp >= eom) { +++ return (-1); +++ } +++ /* Fetch next label in domain name. */ +++ while ((n = *srcp++) != 0) { +++ /* Check for indirection. */ +++ switch (n & NS_CMPRSFLGS) { +++ case 0: +++ /* Limit checks. */ +++ if (dstp + n + 1 >= dstlim || srcp + n >= eom) { +++ return (-1); +++ } +++ checked += n + 1; +++ *dstp++ = n; +++ memcpy(dstp, srcp, n); +++ dstp += n; +++ srcp += n; +++ break; +++ +++ case NS_CMPRSFLGS: +++ if (srcp >= eom) { +++ return (-1); +++ } +++ if (len < 0) +++ len = srcp - src + 1; +++ srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); +++ if (srcp < msg || srcp >= eom) { /* Out of range. */ +++ return (-1); +++ } +++ checked += 2; +++ /* +++ * Check for loops in the compressed name; +++ * if we've looked at the whole message, +++ * there must be a loop. +++ */ +++ if (checked >= eom - msg) { +++ return (-1); +++ } +++ break; +++ +++ default: +++ return (-1); /* flag error */ +++ } +++ } +++ *dstp = '\0'; +++ if (len < 0) +++ len = srcp - src; +++ return (len); +++} +++ +++/* +++ * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr) +++ * Pack domain name 'domain' into 'comp_dn'. +++ * return: +++ * Size of the compressed name, or -1. +++ * notes: +++ * 'dnptrs' is an array of pointers to previous compressed names. +++ * dnptrs[0] is a pointer to the beginning of the message. The array +++ * ends with NULL. +++ * 'lastdnptr' is a pointer to the end of the array pointed to +++ * by 'dnptrs'. +++ * Side effects: +++ * The list of pointers in dnptrs is updated for labels inserted into +++ * the message as we compress the name. If 'dnptr' is NULL, we don't +++ * try to compress names. If 'lastdnptr' is NULL, we don't update the +++ * list. +++ */ +++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) { +++ return (-1); +++ } +++ l += n + 1; +++ if (l > MAXCDNAME) { +++ 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 && 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) { /* Should not happen. */ +++ goto cleanup; +++ } +++ 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; +++ return (-1); +++ } +++ return (dstp - dst); +++} +++ +++/* +++ * ns_name_uncompress(msg, eom, src, dst, dstsiz) +++ * Expand compressed domain name to presentation format. +++ * return: +++ * Number of bytes read out of `src', or -1 (with errno set). +++ * note: +++ * Root domain returns as "." not "". +++ */ +++int +++ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, +++ char *dst, size_t dstsiz) +++{ +++ u_char tmp[NS_MAXCDNAME]; +++ int n; +++ +++ if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) +++ return (-1); +++ if (ns_name_ntop(tmp, dst, dstsiz) == -1) +++ return (-1); +++ return (n); +++} +++ +++/* +++ * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr) +++ * Compress a domain name into wire format, using compression pointers. +++ * return: +++ * Number of bytes consumed in `dst' or -1 (with errno set). +++ * notes: +++ * 'dnptrs' is an array of pointers to previous compressed names. +++ * dnptrs[0] is a pointer to the beginning of the message. +++ * The list ends with NULL. 'lastdnptr' is a pointer to the end of the +++ * array pointed to by 'dnptrs'. Side effect is to update the list of +++ * pointers for labels inserted into the message as we compress the name. +++ * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' +++ * is NULL, we don't update the list. +++ */ +++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)); +++} +++ +++/* +++ * special(ch) +++ * Thinking in noninternationalized USASCII (per the DNS spec), +++ * is this characted special ("in need of quoting") ? +++ * return: +++ * boolean. +++ */ +++static int +++special(int ch) { +++ switch (ch) { +++ case 0x22: /* '"' */ +++ case 0x2E: /* '.' */ +++ case 0x3B: /* ';' */ +++ case 0x5C: /* '\\' */ +++ /* Special modifiers in zone files. */ +++ case 0x40: /* '@' */ +++ case 0x24: /* '$' */ +++ return (1); +++ default: +++ return (0); +++ } +++} +++ +++/* +++ * printable(ch) +++ * Thinking in noninternationalized USASCII (per the DNS spec), +++ * is this character visible and not a space when printed ? +++ * return: +++ * boolean. +++ */ +++static int +++printable(int ch) { +++ return (ch > 0x20 && ch < 0x7f); +++} +++ +++/* +++ * Thinking in noninternationalized USASCII (per the DNS spec), +++ * convert this character to lower case if it's upper case. +++ */ +++static int +++mklower(int ch) { +++ if (ch >= 0x41 && ch <= 0x5A) +++ return (ch + 0x20); +++ return (ch); +++} +++ +++/* +++ * dn_find(domain, msg, dnptrs, lastdnptr) +++ * Search for the counted-label name in an array of compressed names. +++ * return: +++ * offset from msg if found, or -1. +++ * notes: +++ * dnptrs is the pointer to the first name on the list, +++ * not the pointer to the start of the message. +++ */ +++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 */ +++ return (-1); +++ } +++ } +++ next: +++ sp += *sp + 1; +++ } +++ } +++ return (-1); +++} +++ +++/* +++ * Expand compressed domain name 'comp_dn' to full domain name. +++ * 'msg' is a pointer to the begining of the message, +++ * 'eomorig' points to the first location after the message, +++ * 'exp_dn' is a pointer to a buffer of size 'length' for the result. +++ * Return size of compressed name or -1 if there was an error. +++ */ +++int +++dn_expand(const u_char *msg, const u_char *eom, const u_char *src, +++ char *dst, int dstsiz) +++{ +++ int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); +++ +++ if (n > 0 && dst[0] == '.') +++ dst[0] = '\0'; +++ return (n); +++} +++ +++/* +++ * Pack domain name 'exp_dn' in presentation form into 'comp_dn'. +++ * Return the size of the compressed name or -1. +++ * 'length' is the size of the array pointed to by 'comp_dn'. +++ */ +++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)); +++} +++ ++diff -Nur dsniff-2.3/Makefile.in dsniff-2.3.patched/Makefile.in ++--- dsniff-2.3/Makefile.in 2000-12-15 21:03:26.000000000 +0100 +++++ dsniff-2.3.patched/Makefile.in 2005-06-09 14:03:18.000000000 +0200 ++@@ -51,7 +51,7 @@ ++ pathnames.h pcaputil.h record.h rpc.h tcp_raw.h trigger.h \ ++ version.h vroot.h ++ ++-SRCS = asn1.c base64.c buf.c hex.c magic.c mount.c pcaputil.c rpc.c \ +++SRCS = asn1.c base64.c buf.c dns.c hex.c magic.c mount.c pcaputil.c rpc.c \ ++ tcp_raw.c trigger.c record.c dsniff.c decode.c decode_aim.c \ ++ decode_citrix.c decode_cvs.c decode_ftp.c decode_hex.c \ ++ decode_http.c decode_icq.c decode_imap.c decode_irc.c \ ++@@ -99,8 +99,8 @@ ++ arpspoof: arpspoof.o arp.o ++ $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB) ++ ++-dnsspoof: dnsspoof.o pcaputil.o ++- $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) +++dnsspoof: dnsspoof.o pcaputil.o dns.o +++ $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o dns.o $(LIBS) $(PCAPLIB) $(LNETLIB) ++ ++ filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o ++ $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/003-gdbm.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/003-gdbm.patch.svn-base +new file mode 100644 +index 0000000..67be3e5 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/003-gdbm.patch.svn-base +@@ -0,0 +1,206 @@ ++Index: dsniff-2.4/configure ++=================================================================== ++--- dsniff-2.4.orig/configure 2010-11-03 23:42:49.466000001 +0100 +++++ dsniff-2.4/configure 2010-11-03 23:42:52.921000006 +0100 ++@@ -16,6 +16,8 @@ ++ ac_help="$ac_help ++ --with-db=DIR use Berkeley DB (with --enable-compat185) in DIR" ++ ac_help="$ac_help +++ --with-gdbm=DIR use GNU DBM in DIR" +++ac_help="$ac_help ++ --with-libpcap=DIR use libpcap in DIR" ++ ac_help="$ac_help ++ --with-libnet=DIR use libnet in DIR" ++@@ -3059,7 +3061,40 @@ ++ ++ fi ++ +++echo $ac_n "checking for libgdbm""... $ac_c" 1>&6 +++echo "configure:3059: checking for libgdbm" >&5 +++# Check whether --with-gdbm or --without-gdbm was given. +++if test "${with_gdbm+set}" = set; then +++ withval="$with_gdbm" +++ case "$withval" in +++ yes|no) +++ echo "$ac_t""no" 1>&6 +++ ;; +++ *) +++ echo "$ac_t""$withval" 1>&6 +++ if test -f $withval/include/gdbm.h -a -f $withval/lib/libgdbm.a; then +++ owd=`pwd` +++ if cd $withval; then withval=`pwd`; cd $owd; fi +++ DBINC="-I$withval/include" +++ DBLIB="-L$withval/lib -lgdbm" +++ else +++ { echo "configure: error: gdbm.h or libgdbm.a not found in $withval" 1>&2; exit 1; } +++ fi +++ ;; +++ esac +++else +++ if test -f ${prefix}/include/gdbm.h; then +++ LNETINC="-I${prefix}/include" +++ LNETLIB="-L${prefix}/lib -lgdbm" +++ elif test -f /usr/include/gdbm.h; then +++ LNETLIB="-lgdbm" +++ else +++ echo "$ac_t""no" 1>&6 +++ { echo "configure: error: libgdbm not found" 1>&2; exit 1; } +++ fi +++ echo "$ac_t""yes" 1>&6 ++ +++fi ++ ++ ++ echo $ac_n "checking for libnet""... $ac_c" 1>&6 ++Index: dsniff-2.4/record.c ++=================================================================== ++--- dsniff-2.4.orig/record.c 2010-11-03 23:42:49.471000001 +0100 +++++ dsniff-2.4/record.c 2010-11-03 23:42:52.922000005 +0100 ++@@ -15,12 +15,7 @@ ++ #include ++ #include ++ #include ++-#ifdef HAVE_DB_185_H ++-#define DB_LIBRARY_COMPATIBILITY_API ++-#include ++-#elif HAVE_DB_H ++-#include ++-#endif +++#include ++ #include ++ ++ #include "options.h" ++@@ -37,7 +32,7 @@ ++ struct netobj data; ++ }; ++ ++-static DB *db; +++GDBM_FILE dbf; ++ ++ static int ++ xdr_rec(XDR *xdrs, struct rec *rec) ++@@ -64,7 +59,6 @@ ++ ++ tm = localtime(&rec->time); ++ strftime(tstr, sizeof(tstr), "%x %X", tm); ++- ++ srcp = libnet_host_lookup(rec->src, Opt_dns); ++ dstp = libnet_host_lookup(rec->dst, Opt_dns); ++ ++@@ -89,10 +83,10 @@ ++ fflush(stdout); ++ } ++ ++-static DBT * +++static datum ++ record_hash(struct rec *rec) ++ { ++- static DBT key; +++ static datum key; ++ static u_char hash[16]; ++ MD5_CTX ctx; ++ ++@@ -105,16 +99,16 @@ ++ MD5Update(&ctx, rec->data.n_bytes, rec->data.n_len); ++ MD5Final(hash, &ctx); ++ ++- key.data = hash; ++- key.size = sizeof(hash); +++ key.dptr = hash; +++ key.dsize = sizeof(hash); ++ ++- return (&key); +++ return (key); ++ } ++ ++ static int ++ record_save(struct rec *rec) ++ { ++- DBT *key, data; +++ datum key, data; ++ XDR xdrs; ++ u_char buf[2048]; ++ ++@@ -123,15 +117,15 @@ ++ if (!xdr_rec(&xdrs, rec)) ++ return (0); ++ ++- data.data = buf; ++- data.size = xdr_getpos(&xdrs); +++ data.dptr = buf; +++ data.dsize = xdr_getpos(&xdrs); ++ ++ xdr_destroy(&xdrs); ++ ++ key = record_hash(rec); ++ ++- if (db->put(db, key, &data, R_NOOVERWRITE) == 0) ++- db->sync(db, 0); +++ if (gdbm_store(dbf, key, data, GDBM_INSERT) == 0) +++ gdbm_sync(dbf); ++ ++ return (1); ++ } ++@@ -139,18 +133,22 @@ ++ void ++ record_dump(void) ++ { ++- DBT key, data; +++ datum nextkey, key, content; ++ XDR xdrs; ++ struct rec rec; ++ ++- while (db->seq(db, &key, &data, R_NEXT) == 0) { +++ key = gdbm_firstkey(dbf); +++ while (key.dptr) { +++ nextkey = gdbm_nextkey(dbf, key); +++ content = gdbm_fetch(dbf, key); ++ memset(&rec, 0, sizeof(rec)); ++- xdrmem_create(&xdrs, data.data, data.size, XDR_DECODE); ++- +++ xdrmem_create(&xdrs, content.dptr, content.dsize, XDR_DECODE); ++ if (xdr_rec(&xdrs, &rec)) { ++ record_print(&rec); ++ } ++ xdr_destroy(&xdrs); +++ free(key.dptr); +++ key = nextkey; ++ } ++ } ++ ++@@ -158,16 +156,23 @@ ++ record_init(char *file) ++ { ++ int flags, mode; ++- +++ // needed for gdbm_open, which does not have the option to create +++ // a database in memory +++ if(file == NULL) { +++ char *record_file = "/tmp/.dsniff.db"; +++ file = record_file; +++ } +++ ++ if (Opt_read) { ++- flags = O_RDONLY; +++ flags = GDBM_READER; ++ mode = 0; ++ } ++ else { ++- flags = O_RDWR|O_CREAT; +++ flags = GDBM_WRCREAT; ++ mode = S_IRUSR|S_IWUSR; ++ } ++- if ((db = dbopen(file, flags, mode, DB_BTREE, NULL)) == NULL) +++ +++ if ((dbf = gdbm_open(file, 1024, flags, mode, NULL)) == NULL) ++ return (0); ++ ++ return (1); ++@@ -206,6 +211,6 @@ ++ void ++ record_close(void) ++ { ++- db->close(db); +++ gdbm_close(dbf); ++ } ++ +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/004-no_yp.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/004-no_yp.patch.svn-base +new file mode 100644 +index 0000000..774e04e +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/004-no_yp.patch.svn-base +@@ -0,0 +1,45 @@ ++Index: dsniff-2.4/decode.c ++=================================================================== ++--- dsniff-2.4.orig/decode.c 2010-11-03 23:42:49.419000001 +0100 +++++ dsniff-2.4/decode.c 2010-11-03 23:42:56.481000002 +0100 ++@@ -51,8 +51,6 @@ ++ extern int decode_portmap(u_char *, int, u_char *, int); ++ extern int decode_mountd(u_char *, int, u_char *, int); ++ extern int decode_vrrp(u_char *, int, u_char *, int); ++-extern int decode_ypserv(u_char *, int, u_char *, int); ++-extern int decode_yppasswd(u_char *, int, u_char *, int); ++ ++ static struct decode decodes[] = { ++ { "hex", decode_hex }, ++@@ -88,8 +86,6 @@ ++ { "irc", decode_irc }, ++ { "portmap", decode_portmap }, ++ { "mountd", decode_mountd }, ++- { "ypserv", decode_ypserv }, ++- { "yppasswd", decode_yppasswd }, ++ { NULL } ++ }; ++ ++Index: dsniff-2.4/dsniff.services ++=================================================================== ++--- dsniff-2.4.orig/dsniff.services 2010-11-03 23:42:49.429000001 +0100 +++++ dsniff-2.4/dsniff.services 2010-11-03 23:42:56.481000002 +0100 ++@@ -66,5 +66,3 @@ ++ aim 9898/tcp ++ pcanywhere 65301/tcp ++ mountd 100005/rpc ++-ypserv 100004/rpc ++-yppasswd 100009/rpc ++Index: dsniff-2.4/Makefile.in ++=================================================================== ++--- dsniff-2.4.orig/Makefile.in 2010-11-03 23:42:51.736998874 +0100 +++++ dsniff-2.4/Makefile.in 2010-11-03 23:42:56.481000002 +0100 ++@@ -60,7 +60,7 @@ ++ decode_pop.c decode_portmap.c decode_postgresql.c decode_pptp.c \ ++ decode_rip.c decode_rlogin.c decode_smb.c decode_smtp.c \ ++ decode_sniffer.c decode_snmp.c decode_socks.c decode_tds.c \ ++- decode_telnet.c decode_vrrp.c decode_yp.c decode_x11.c +++ decode_telnet.c decode_vrrp.c decode_x11.c ++ ++ GEN = mount.h mount.c nfs_prot.h nfs_prot.c ++ +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/005-openssl_fix.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/005-openssl_fix.patch.svn-base +new file mode 100644 +index 0000000..1b2f9e7 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/005-openssl_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- dsniff-2.4b1.orig/sshcrypto.c +++++ dsniff-2.4b1/sshcrypto.c ++@@ -14,6 +14,8 @@ ++ ++ #include ++ #include +++#include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/006-pcap_header.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/006-pcap_header.patch.svn-base +new file mode 100644 +index 0000000..6836557 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/006-pcap_header.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: dsniff-2.4/configure ++=================================================================== ++--- dsniff-2.4.orig/configure 2010-11-03 23:42:52.921000006 +0100 +++++ dsniff-2.4/configure 2010-11-03 23:43:00.504000001 +0100 ++@@ -3033,7 +3033,7 @@ ++ PCAPINC="-I$withval -I$withval/bpf" ++ PCAPLIB="-L$withval -lpcap" ++ elif test -f $withval/include/pcap.h -a \ ++- -f $withval/include/net/bpf.h -a \ +++ -f $withval/include/pcap-bpf.h -a \ ++ -f $withval/lib/libpcap.a; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/007-time_h.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/007-time_h.patch.svn-base +new file mode 100644 +index 0000000..280b8c1 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/007-time_h.patch.svn-base +@@ -0,0 +1,22 @@ ++diff -urNad --exclude=CVS --exclude=.svn dsniff-2.4b1/msgsnarf.c dsniff-2.4b1/msgsnarf.c ++--- dsniff-2.4b1/msgsnarf.c 2001-03-15 08:33:04.000000000 +0000 +++++ dsniff-2.4b1/msgsnarf.c 2005-07-11 20:15:50.000000000 +0000 ++@@ -23,6 +23,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include "buf.h" ++ #include "decode.h" ++diff -urNad --exclude=CVS --exclude=.svn dsniff-2.4b1/sshow.c dsniff-2.4b1/sshow.c ++--- dsniff-2.4b1/sshow.c 2005-07-11 20:14:19.000000000 +0000 +++++ dsniff-2.4b1/sshow.c 2005-07-11 20:15:26.000000000 +0000 ++@@ -15,6 +15,7 @@ ++ ++ #include ++ #include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/008-md5_include.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/008-md5_include.patch.svn-base +new file mode 100644 +index 0000000..f8d3829 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/008-md5_include.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: dsniff-2.4/record.c ++=================================================================== ++--- dsniff-2.4.orig/record.c 2010-11-03 23:43:14.268000004 +0100 +++++ dsniff-2.4/record.c 2010-11-03 23:43:16.947000004 +0100 ++@@ -14,7 +14,7 @@ ++ ++ #include ++ #include ++-#include +++#include "missing/md5.h" ++ #include ++ #include ++ +diff --git a/feeds/packages/net/dsniff/patches/.svn/text-base/010-clk-tck-fix.patch.svn-base b/feeds/packages/net/dsniff/patches/.svn/text-base/010-clk-tck-fix.patch.svn-base +new file mode 100644 +index 0000000..cc15bef +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/.svn/text-base/010-clk-tck-fix.patch.svn-base +@@ -0,0 +1,15 @@ ++Index: dsniff-2.4/sshow.c ++=================================================================== ++--- dsniff-2.4.orig/sshow.c 2010-11-03 23:41:56.335999997 +0100 +++++ dsniff-2.4/sshow.c 2010-11-03 23:42:10.981000001 +0100 ++@@ -42,6 +42,10 @@ ++ ++ #define HISTORY_SIZE 16 ++ +++#ifndef CLK_TCK +++# define CLK_TCK CLOCKS_PER_SEC +++#endif +++ ++ typedef struct { ++ u_int min, max; ++ } range; +diff --git a/feeds/packages/net/dsniff/patches/001-arpspoof_fix.patch b/feeds/packages/net/dsniff/patches/001-arpspoof_fix.patch +new file mode 100644 +index 0000000..fd29227 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/001-arpspoof_fix.patch +@@ -0,0 +1,53 @@ ++diff -urN dsniff.old/arp.c dsniff.dev/arp.c ++--- dsniff.old/arp.c 2001-03-15 09:32:58.000000000 +0100 +++++ dsniff.dev/arp.c 2006-03-03 01:41:10.000000000 +0100 ++@@ -39,7 +39,7 @@ ++ ++ #ifdef BSD ++ int ++-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) +++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif) ++ { ++ int mib[6]; ++ size_t len; ++@@ -91,7 +91,7 @@ ++ #endif ++ ++ int ++-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) +++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif) ++ { ++ int sock; ++ struct arpreq ar; ++@@ -99,7 +99,7 @@ ++ ++ memset((char *)&ar, 0, sizeof(ar)); ++ #ifdef __linux__ ++- strncpy(ar.arp_dev, "eth0", sizeof(ar.arp_dev)); /* XXX - *sigh* */ +++ strncpy(ar.arp_dev, lif, strlen(lif)); ++ #endif ++ sin = (struct sockaddr_in *)&ar.arp_pa; ++ sin->sin_family = AF_INET; ++diff -urN dsniff.old/arp.h dsniff.dev/arp.h ++--- dsniff.old/arp.h 2001-03-15 09:27:08.000000000 +0100 +++++ dsniff.dev/arp.h 2006-03-03 01:42:23.000000000 +0100 ++@@ -11,6 +11,6 @@ ++ #ifndef _ARP_H_ ++ #define _ARP_H_ ++ ++-int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether); +++int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif); ++ ++ #endif /* _ARP_H_ */ ++diff -urN dsniff.old/arpspoof.c dsniff.dev/arpspoof.c ++--- dsniff.old/arpspoof.c 2001-03-15 09:32:58.000000000 +0100 +++++ dsniff.dev/arpspoof.c 2006-03-03 01:42:00.000000000 +0100 ++@@ -113,7 +113,7 @@ ++ int i = 0; ++ ++ do { ++- if (arp_cache_lookup(ip, mac) == 0) +++ if (arp_cache_lookup(ip, mac, intf) == 0) ++ return (1); ++ #ifdef __linux__ ++ /* XXX - force the kernel to arp. feh. */ +diff --git a/feeds/packages/net/dsniff/patches/001-decode_pop.patch b/feeds/packages/net/dsniff/patches/001-decode_pop.patch +new file mode 100644 +index 0000000..24e1a47 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/001-decode_pop.patch +@@ -0,0 +1,122 @@ ++diff --git a/decode_pop.c b/decode_pop.c ++index 04044f5..767da41 100644 ++--- a/decode_pop.c +++++ b/decode_pop.c ++@@ -6,6 +6,8 @@ ++ * Copyright (c) 2000 Dug Song ++ * ++ * $Id: decode_pop.c,v 1.4 2001/03/15 08:33:02 dugsong Exp $ +++ * +++ * Rewritten by Stefan Tomanek 2011 ++ */ ++ ++ #include "config.h" ++@@ -45,32 +47,88 @@ int ++ decode_pop(u_char *buf, int len, u_char *obuf, int olen) ++ { ++ char *p; +++ char *s; +++ int n; ++ int i, j; +++ char *user; +++ char *password; +++ enum { +++ NONE, +++ AUTHPLAIN, +++ AUTHLOGIN, +++ USERPASS +++ } mode = NONE; +++ ++ ++ obuf[0] = '\0'; ++ ++ for (p = strtok(buf, "\r\n"); p != NULL; p = strtok(NULL, "\r\n")) { ++- if (strncasecmp(p, "AUTH PLAIN", 10) == 0 || ++- strncasecmp(p, "AUTH LOGIN", 10) == 0) { ++- strlcat(obuf, p, olen); ++- strlcat(obuf, "\n", olen); ++- ++- /* Decode SASL auth. */ ++- for (i = 0; i < 2 && (p = strtok(NULL, "\r\n")); i++) { ++- strlcat(obuf, p, olen); ++- j = base64_pton(p, p, strlen(p)); ++- p[j] = '\0'; ++- strlcat(obuf, " [", olen); ++- strlcat(obuf, p, olen); ++- strlcat(obuf, "]\n", olen); +++ if (mode == NONE) { +++ user = NULL; +++ password = NULL; +++ if (strncasecmp(p, "AUTH PLAIN", 10) == 0) { +++ mode = AUTHPLAIN; +++ continue; +++ } +++ if (strncasecmp(p, "AUTH LOGIN", 10) == 0) { +++ mode = AUTHLOGIN; +++ continue; +++ } +++ if (strncasecmp(p, "USER ", 5) == 0) { +++ mode = USERPASS; +++ /* the traditional login cuts right to the case, +++ * so no continue here +++ */ ++ } ++ } ++- /* Save regular POP2, POP3 auth info. */ ++- else if (strncasecmp(p, "USER ", 5) == 0 || ++- strncasecmp(p, "PASS ", 5) == 0 || ++- strncasecmp(p, "HELO ", 5) == 0) { ++- strlcat(obuf, p, olen); ++- strlcat(obuf, "\n", olen); +++ printf("(%d) %s\n", mode, p); +++ if (mode == USERPASS) { +++ if (strncasecmp(p, "USER ", 5) == 0) { +++ user = &p[5]; +++ } else if (strncasecmp(p, "PASS ", 5) == 0) { +++ password = &p[5]; +++ } +++ } +++ +++ if (mode == AUTHPLAIN) { +++ j = base64_pton(p, p, strlen(p)); +++ p[j] = '\0'; +++ n = 0; +++ s = p; +++ /* p consists of three parts, divided by \0 */ +++ while (s <= &p[j] && n<=3) { +++ if (n == 0) { +++ /* we do not process this portion yet */ +++ } else if (n == 1) { +++ user = s; +++ } else if (n == 2) { +++ password = s; +++ } +++ n++; +++ while (*s) s++; +++ s++; +++ } +++ } +++ +++ if (mode == AUTHLOGIN) { +++ j = base64_pton(p, p, strlen(p)); +++ p[j] = '\0'; +++ if (! user) { +++ user = p; +++ } else { +++ password = p; +++ /* got everything we need :-) */ +++ } +++ } +++ +++ if (user && password) { +++ strlcat(obuf, "\nusername [", olen); +++ strlcat(obuf, user, olen); +++ strlcat(obuf, "] password [", olen); +++ strlcat(obuf, password, olen); +++ strlcat(obuf, "]\n", olen); +++ +++ mode = NONE; ++ } ++ } ++ return (strlen(obuf)); ++ +diff --git a/feeds/packages/net/dsniff/patches/001-dns.patch b/feeds/packages/net/dsniff/patches/001-dns.patch +new file mode 100644 +index 0000000..e5cf8b2 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/001-dns.patch +@@ -0,0 +1,704 @@ ++diff -Nur dsniff-2.3/dns.c dsniff-2.3.patched/dns.c ++--- dsniff-2.3/dns.c 1970-01-01 01:00:00.000000000 +0100 +++++ dsniff-2.3.patched/dns.c 2005-06-09 14:06:36.000000000 +0200 ++@@ -0,0 +1,677 @@ +++/* +++ * Copyright (c) 1985, 1993 +++ * The Regents of the University of California. All rights reserved. +++ * +++ * 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. +++ * 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. +++ */ +++ +++/* +++ * Portions Copyright (c) 1993 by Digital Equipment Corporation. +++ * +++ * 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, and that +++ * the name of Digital Equipment Corporation not be used in advertising or +++ * publicity pertaining to distribution of the document or software without +++ * specific, written prior permission. +++ * +++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL +++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES +++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +++ * CORPORATION 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) 1996-1999 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. +++ */ +++ +++/* +++ * Copyright (c) 1996,1999 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. +++ */ +++ +++/* +++ * +++ * DNS helper functions not implemented in uclibc +++ * +++ */ +++ +++ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++static const char digits[] = "0123456789"; +++ +++/* Forward. */ +++ +++static int special(int); +++static int printable(int); +++static int dn_find(const u_char *, const u_char *, +++ const u_char * const *, +++ const u_char * const *); +++ +++ +++/* +++ * ns_name_ntop(src, dst, dstsiz) +++ * Convert an encoded domain name to printable ascii as per RFC1035. +++ * return: +++ * Number of bytes written to buffer, or -1 (with errno set) +++ * notes: +++ * The root is returned as "." +++ * All other domains are returned in non absolute form +++ */ +++int +++ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { +++ const u_char *cp; +++ char *dn, *eom; +++ u_char c; +++ u_int n; +++ +++ cp = src; +++ dn = dst; +++ eom = dst + dstsiz; +++ +++ while ((n = *cp++) != 0) { +++ if ((n & NS_CMPRSFLGS) != 0) { +++ /* Some kind of compression pointer. */ +++ return (-1); +++ } +++ if (dn != dst) { +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = '.'; +++ } +++ if (dn + n >= eom) { +++ return (-1); +++ } +++ for ((void)NULL; n > 0; n--) { +++ c = *cp++; +++ if (special(c)) { +++ if (dn + 1 >= eom) { +++ return (-1); +++ } +++ *dn++ = '\\'; +++ *dn++ = (char)c; +++ } else if (!printable(c)) { +++ if (dn + 3 >= eom) { +++ return (-1); +++ } +++ *dn++ = '\\'; +++ *dn++ = digits[c / 100]; +++ *dn++ = digits[(c % 100) / 10]; +++ *dn++ = digits[c % 10]; +++ } else { +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = (char)c; +++ } +++ } +++ } +++ if (dn == dst) { +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = '.'; +++ } +++ if (dn >= eom) { +++ return (-1); +++ } +++ *dn++ = '\0'; +++ return (dn - dst); +++} +++ +++/* +++ * ns_name_pton(src, dst, dstsiz) +++ * Convert a ascii string into an encoded domain name as per RFC1035. +++ * return: +++ * -1 if it fails +++ * 1 if string was fully qualified +++ * 0 is string was not fully qualified +++ * notes: +++ * Enforces label and domain length limits. +++ */ +++ +++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) { +++ return (-1); +++ } +++ n += (cp - digits) * 10; +++ if ((c = *src++) == 0 || +++ (cp = strchr(digits, c)) == NULL) { +++ return (-1); +++ } +++ n += (cp - digits); +++ if (n > 255) { +++ return (-1); +++ } +++ c = n; +++ } +++ escaped = 0; +++ } else if (c == '\\') { +++ escaped = 1; +++ continue; +++ } else if (c == '.') { +++ c = (bp - label - 1); +++ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ +++ return (-1); +++ } +++ if (label >= eom) { +++ return (-1); +++ } +++ *label = c; +++ /* Fully qualified ? */ +++ if (*src == '\0') { +++ if (c != 0) { +++ if (bp >= eom) { +++ return (-1); +++ } +++ *bp++ = '\0'; +++ } +++ if ((bp - dst) > MAXCDNAME) { +++ return (-1); +++ } +++ return (1); +++ } +++ if (c == 0 || *src == '.') { +++ return (-1); +++ } +++ label = bp++; +++ continue; +++ } +++ if (bp >= eom) { +++ return (-1); +++ } +++ *bp++ = (u_char)c; +++ } +++ c = (bp - label - 1); +++ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ +++ return (-1); +++ } +++ if (label >= eom) { +++ return (-1); +++ } +++ *label = c; +++ if (c != 0) { +++ if (bp >= eom) { +++ return (-1); +++ } +++ *bp++ = 0; +++ } +++ if ((bp - dst) > MAXCDNAME) { /* src too big */ +++ return (-1); +++ } +++ return (0); +++} +++ +++/* +++ * ns_name_ntol(src, dst, dstsiz) +++ * Convert a network strings labels into all lowercase. +++ * return: +++ * Number of bytes written to buffer, or -1 (with errno set) +++ * notes: +++ * Enforces label and domain length limits. +++ */ +++ +++int +++ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) { +++ const u_char *cp; +++ u_char *dn, *eom; +++ u_char c; +++ u_int n; +++ +++ cp = src; +++ dn = dst; +++ eom = dst + dstsiz; +++ +++ while ((n = *cp++) != 0) { +++ if ((n & NS_CMPRSFLGS) != 0) { +++ /* Some kind of compression pointer. */ +++ return (-1); +++ } +++ *dn++ = n; +++ if (dn + n >= eom) { +++ return (-1); +++ } +++ for ((void)NULL; n > 0; n--) { +++ c = *cp++; +++ if (isupper(c)) +++ *dn++ = tolower(c); +++ else +++ *dn++ = c; +++ } +++ } +++ *dn++ = '\0'; +++ return (dn - dst); +++} +++ +++/* +++ * ns_name_unpack(msg, eom, src, dst, dstsiz) +++ * Unpack a domain name from a message, source may be compressed. +++ * return: +++ * -1 if it fails, or consumed octets if it succeeds. +++ */ +++int +++ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, +++ u_char *dst, size_t dstsiz) +++{ +++ const u_char *srcp, *dstlim; +++ u_char *dstp; +++ int n, len, checked; +++ +++ len = -1; +++ checked = 0; +++ dstp = dst; +++ srcp = src; +++ dstlim = dst + dstsiz; +++ if (srcp < msg || srcp >= eom) { +++ return (-1); +++ } +++ /* Fetch next label in domain name. */ +++ while ((n = *srcp++) != 0) { +++ /* Check for indirection. */ +++ switch (n & NS_CMPRSFLGS) { +++ case 0: +++ /* Limit checks. */ +++ if (dstp + n + 1 >= dstlim || srcp + n >= eom) { +++ return (-1); +++ } +++ checked += n + 1; +++ *dstp++ = n; +++ memcpy(dstp, srcp, n); +++ dstp += n; +++ srcp += n; +++ break; +++ +++ case NS_CMPRSFLGS: +++ if (srcp >= eom) { +++ return (-1); +++ } +++ if (len < 0) +++ len = srcp - src + 1; +++ srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); +++ if (srcp < msg || srcp >= eom) { /* Out of range. */ +++ return (-1); +++ } +++ checked += 2; +++ /* +++ * Check for loops in the compressed name; +++ * if we've looked at the whole message, +++ * there must be a loop. +++ */ +++ if (checked >= eom - msg) { +++ return (-1); +++ } +++ break; +++ +++ default: +++ return (-1); /* flag error */ +++ } +++ } +++ *dstp = '\0'; +++ if (len < 0) +++ len = srcp - src; +++ return (len); +++} +++ +++/* +++ * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr) +++ * Pack domain name 'domain' into 'comp_dn'. +++ * return: +++ * Size of the compressed name, or -1. +++ * notes: +++ * 'dnptrs' is an array of pointers to previous compressed names. +++ * dnptrs[0] is a pointer to the beginning of the message. The array +++ * ends with NULL. +++ * 'lastdnptr' is a pointer to the end of the array pointed to +++ * by 'dnptrs'. +++ * Side effects: +++ * The list of pointers in dnptrs is updated for labels inserted into +++ * the message as we compress the name. If 'dnptr' is NULL, we don't +++ * try to compress names. If 'lastdnptr' is NULL, we don't update the +++ * list. +++ */ +++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) { +++ return (-1); +++ } +++ l += n + 1; +++ if (l > MAXCDNAME) { +++ 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 && 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) { /* Should not happen. */ +++ goto cleanup; +++ } +++ 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; +++ return (-1); +++ } +++ return (dstp - dst); +++} +++ +++/* +++ * ns_name_uncompress(msg, eom, src, dst, dstsiz) +++ * Expand compressed domain name to presentation format. +++ * return: +++ * Number of bytes read out of `src', or -1 (with errno set). +++ * note: +++ * Root domain returns as "." not "". +++ */ +++int +++ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, +++ char *dst, size_t dstsiz) +++{ +++ u_char tmp[NS_MAXCDNAME]; +++ int n; +++ +++ if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) +++ return (-1); +++ if (ns_name_ntop(tmp, dst, dstsiz) == -1) +++ return (-1); +++ return (n); +++} +++ +++/* +++ * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr) +++ * Compress a domain name into wire format, using compression pointers. +++ * return: +++ * Number of bytes consumed in `dst' or -1 (with errno set). +++ * notes: +++ * 'dnptrs' is an array of pointers to previous compressed names. +++ * dnptrs[0] is a pointer to the beginning of the message. +++ * The list ends with NULL. 'lastdnptr' is a pointer to the end of the +++ * array pointed to by 'dnptrs'. Side effect is to update the list of +++ * pointers for labels inserted into the message as we compress the name. +++ * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' +++ * is NULL, we don't update the list. +++ */ +++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)); +++} +++ +++/* +++ * special(ch) +++ * Thinking in noninternationalized USASCII (per the DNS spec), +++ * is this characted special ("in need of quoting") ? +++ * return: +++ * boolean. +++ */ +++static int +++special(int ch) { +++ switch (ch) { +++ case 0x22: /* '"' */ +++ case 0x2E: /* '.' */ +++ case 0x3B: /* ';' */ +++ case 0x5C: /* '\\' */ +++ /* Special modifiers in zone files. */ +++ case 0x40: /* '@' */ +++ case 0x24: /* '$' */ +++ return (1); +++ default: +++ return (0); +++ } +++} +++ +++/* +++ * printable(ch) +++ * Thinking in noninternationalized USASCII (per the DNS spec), +++ * is this character visible and not a space when printed ? +++ * return: +++ * boolean. +++ */ +++static int +++printable(int ch) { +++ return (ch > 0x20 && ch < 0x7f); +++} +++ +++/* +++ * Thinking in noninternationalized USASCII (per the DNS spec), +++ * convert this character to lower case if it's upper case. +++ */ +++static int +++mklower(int ch) { +++ if (ch >= 0x41 && ch <= 0x5A) +++ return (ch + 0x20); +++ return (ch); +++} +++ +++/* +++ * dn_find(domain, msg, dnptrs, lastdnptr) +++ * Search for the counted-label name in an array of compressed names. +++ * return: +++ * offset from msg if found, or -1. +++ * notes: +++ * dnptrs is the pointer to the first name on the list, +++ * not the pointer to the start of the message. +++ */ +++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 */ +++ return (-1); +++ } +++ } +++ next: +++ sp += *sp + 1; +++ } +++ } +++ return (-1); +++} +++ +++/* +++ * Expand compressed domain name 'comp_dn' to full domain name. +++ * 'msg' is a pointer to the begining of the message, +++ * 'eomorig' points to the first location after the message, +++ * 'exp_dn' is a pointer to a buffer of size 'length' for the result. +++ * Return size of compressed name or -1 if there was an error. +++ */ +++int +++dn_expand(const u_char *msg, const u_char *eom, const u_char *src, +++ char *dst, int dstsiz) +++{ +++ int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); +++ +++ if (n > 0 && dst[0] == '.') +++ dst[0] = '\0'; +++ return (n); +++} +++ +++/* +++ * Pack domain name 'exp_dn' in presentation form into 'comp_dn'. +++ * Return the size of the compressed name or -1. +++ * 'length' is the size of the array pointed to by 'comp_dn'. +++ */ +++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)); +++} +++ ++diff -Nur dsniff-2.3/Makefile.in dsniff-2.3.patched/Makefile.in ++--- dsniff-2.3/Makefile.in 2000-12-15 21:03:26.000000000 +0100 +++++ dsniff-2.3.patched/Makefile.in 2005-06-09 14:03:18.000000000 +0200 ++@@ -51,7 +51,7 @@ ++ pathnames.h pcaputil.h record.h rpc.h tcp_raw.h trigger.h \ ++ version.h vroot.h ++ ++-SRCS = asn1.c base64.c buf.c hex.c magic.c mount.c pcaputil.c rpc.c \ +++SRCS = asn1.c base64.c buf.c dns.c hex.c magic.c mount.c pcaputil.c rpc.c \ ++ tcp_raw.c trigger.c record.c dsniff.c decode.c decode_aim.c \ ++ decode_citrix.c decode_cvs.c decode_ftp.c decode_hex.c \ ++ decode_http.c decode_icq.c decode_imap.c decode_irc.c \ ++@@ -99,8 +99,8 @@ ++ arpspoof: arpspoof.o arp.o ++ $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB) ++ ++-dnsspoof: dnsspoof.o pcaputil.o ++- $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) +++dnsspoof: dnsspoof.o pcaputil.o dns.o +++ $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o dns.o $(LIBS) $(PCAPLIB) $(LNETLIB) ++ ++ filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o ++ $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) +diff --git a/feeds/packages/net/dsniff/patches/003-gdbm.patch b/feeds/packages/net/dsniff/patches/003-gdbm.patch +new file mode 100644 +index 0000000..67be3e5 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/003-gdbm.patch +@@ -0,0 +1,206 @@ ++Index: dsniff-2.4/configure ++=================================================================== ++--- dsniff-2.4.orig/configure 2010-11-03 23:42:49.466000001 +0100 +++++ dsniff-2.4/configure 2010-11-03 23:42:52.921000006 +0100 ++@@ -16,6 +16,8 @@ ++ ac_help="$ac_help ++ --with-db=DIR use Berkeley DB (with --enable-compat185) in DIR" ++ ac_help="$ac_help +++ --with-gdbm=DIR use GNU DBM in DIR" +++ac_help="$ac_help ++ --with-libpcap=DIR use libpcap in DIR" ++ ac_help="$ac_help ++ --with-libnet=DIR use libnet in DIR" ++@@ -3059,7 +3061,40 @@ ++ ++ fi ++ +++echo $ac_n "checking for libgdbm""... $ac_c" 1>&6 +++echo "configure:3059: checking for libgdbm" >&5 +++# Check whether --with-gdbm or --without-gdbm was given. +++if test "${with_gdbm+set}" = set; then +++ withval="$with_gdbm" +++ case "$withval" in +++ yes|no) +++ echo "$ac_t""no" 1>&6 +++ ;; +++ *) +++ echo "$ac_t""$withval" 1>&6 +++ if test -f $withval/include/gdbm.h -a -f $withval/lib/libgdbm.a; then +++ owd=`pwd` +++ if cd $withval; then withval=`pwd`; cd $owd; fi +++ DBINC="-I$withval/include" +++ DBLIB="-L$withval/lib -lgdbm" +++ else +++ { echo "configure: error: gdbm.h or libgdbm.a not found in $withval" 1>&2; exit 1; } +++ fi +++ ;; +++ esac +++else +++ if test -f ${prefix}/include/gdbm.h; then +++ LNETINC="-I${prefix}/include" +++ LNETLIB="-L${prefix}/lib -lgdbm" +++ elif test -f /usr/include/gdbm.h; then +++ LNETLIB="-lgdbm" +++ else +++ echo "$ac_t""no" 1>&6 +++ { echo "configure: error: libgdbm not found" 1>&2; exit 1; } +++ fi +++ echo "$ac_t""yes" 1>&6 ++ +++fi ++ ++ ++ echo $ac_n "checking for libnet""... $ac_c" 1>&6 ++Index: dsniff-2.4/record.c ++=================================================================== ++--- dsniff-2.4.orig/record.c 2010-11-03 23:42:49.471000001 +0100 +++++ dsniff-2.4/record.c 2010-11-03 23:42:52.922000005 +0100 ++@@ -15,12 +15,7 @@ ++ #include ++ #include ++ #include ++-#ifdef HAVE_DB_185_H ++-#define DB_LIBRARY_COMPATIBILITY_API ++-#include ++-#elif HAVE_DB_H ++-#include ++-#endif +++#include ++ #include ++ ++ #include "options.h" ++@@ -37,7 +32,7 @@ ++ struct netobj data; ++ }; ++ ++-static DB *db; +++GDBM_FILE dbf; ++ ++ static int ++ xdr_rec(XDR *xdrs, struct rec *rec) ++@@ -64,7 +59,6 @@ ++ ++ tm = localtime(&rec->time); ++ strftime(tstr, sizeof(tstr), "%x %X", tm); ++- ++ srcp = libnet_host_lookup(rec->src, Opt_dns); ++ dstp = libnet_host_lookup(rec->dst, Opt_dns); ++ ++@@ -89,10 +83,10 @@ ++ fflush(stdout); ++ } ++ ++-static DBT * +++static datum ++ record_hash(struct rec *rec) ++ { ++- static DBT key; +++ static datum key; ++ static u_char hash[16]; ++ MD5_CTX ctx; ++ ++@@ -105,16 +99,16 @@ ++ MD5Update(&ctx, rec->data.n_bytes, rec->data.n_len); ++ MD5Final(hash, &ctx); ++ ++- key.data = hash; ++- key.size = sizeof(hash); +++ key.dptr = hash; +++ key.dsize = sizeof(hash); ++ ++- return (&key); +++ return (key); ++ } ++ ++ static int ++ record_save(struct rec *rec) ++ { ++- DBT *key, data; +++ datum key, data; ++ XDR xdrs; ++ u_char buf[2048]; ++ ++@@ -123,15 +117,15 @@ ++ if (!xdr_rec(&xdrs, rec)) ++ return (0); ++ ++- data.data = buf; ++- data.size = xdr_getpos(&xdrs); +++ data.dptr = buf; +++ data.dsize = xdr_getpos(&xdrs); ++ ++ xdr_destroy(&xdrs); ++ ++ key = record_hash(rec); ++ ++- if (db->put(db, key, &data, R_NOOVERWRITE) == 0) ++- db->sync(db, 0); +++ if (gdbm_store(dbf, key, data, GDBM_INSERT) == 0) +++ gdbm_sync(dbf); ++ ++ return (1); ++ } ++@@ -139,18 +133,22 @@ ++ void ++ record_dump(void) ++ { ++- DBT key, data; +++ datum nextkey, key, content; ++ XDR xdrs; ++ struct rec rec; ++ ++- while (db->seq(db, &key, &data, R_NEXT) == 0) { +++ key = gdbm_firstkey(dbf); +++ while (key.dptr) { +++ nextkey = gdbm_nextkey(dbf, key); +++ content = gdbm_fetch(dbf, key); ++ memset(&rec, 0, sizeof(rec)); ++- xdrmem_create(&xdrs, data.data, data.size, XDR_DECODE); ++- +++ xdrmem_create(&xdrs, content.dptr, content.dsize, XDR_DECODE); ++ if (xdr_rec(&xdrs, &rec)) { ++ record_print(&rec); ++ } ++ xdr_destroy(&xdrs); +++ free(key.dptr); +++ key = nextkey; ++ } ++ } ++ ++@@ -158,16 +156,23 @@ ++ record_init(char *file) ++ { ++ int flags, mode; ++- +++ // needed for gdbm_open, which does not have the option to create +++ // a database in memory +++ if(file == NULL) { +++ char *record_file = "/tmp/.dsniff.db"; +++ file = record_file; +++ } +++ ++ if (Opt_read) { ++- flags = O_RDONLY; +++ flags = GDBM_READER; ++ mode = 0; ++ } ++ else { ++- flags = O_RDWR|O_CREAT; +++ flags = GDBM_WRCREAT; ++ mode = S_IRUSR|S_IWUSR; ++ } ++- if ((db = dbopen(file, flags, mode, DB_BTREE, NULL)) == NULL) +++ +++ if ((dbf = gdbm_open(file, 1024, flags, mode, NULL)) == NULL) ++ return (0); ++ ++ return (1); ++@@ -206,6 +211,6 @@ ++ void ++ record_close(void) ++ { ++- db->close(db); +++ gdbm_close(dbf); ++ } ++ +diff --git a/feeds/packages/net/dsniff/patches/004-no_yp.patch b/feeds/packages/net/dsniff/patches/004-no_yp.patch +new file mode 100644 +index 0000000..774e04e +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/004-no_yp.patch +@@ -0,0 +1,45 @@ ++Index: dsniff-2.4/decode.c ++=================================================================== ++--- dsniff-2.4.orig/decode.c 2010-11-03 23:42:49.419000001 +0100 +++++ dsniff-2.4/decode.c 2010-11-03 23:42:56.481000002 +0100 ++@@ -51,8 +51,6 @@ ++ extern int decode_portmap(u_char *, int, u_char *, int); ++ extern int decode_mountd(u_char *, int, u_char *, int); ++ extern int decode_vrrp(u_char *, int, u_char *, int); ++-extern int decode_ypserv(u_char *, int, u_char *, int); ++-extern int decode_yppasswd(u_char *, int, u_char *, int); ++ ++ static struct decode decodes[] = { ++ { "hex", decode_hex }, ++@@ -88,8 +86,6 @@ ++ { "irc", decode_irc }, ++ { "portmap", decode_portmap }, ++ { "mountd", decode_mountd }, ++- { "ypserv", decode_ypserv }, ++- { "yppasswd", decode_yppasswd }, ++ { NULL } ++ }; ++ ++Index: dsniff-2.4/dsniff.services ++=================================================================== ++--- dsniff-2.4.orig/dsniff.services 2010-11-03 23:42:49.429000001 +0100 +++++ dsniff-2.4/dsniff.services 2010-11-03 23:42:56.481000002 +0100 ++@@ -66,5 +66,3 @@ ++ aim 9898/tcp ++ pcanywhere 65301/tcp ++ mountd 100005/rpc ++-ypserv 100004/rpc ++-yppasswd 100009/rpc ++Index: dsniff-2.4/Makefile.in ++=================================================================== ++--- dsniff-2.4.orig/Makefile.in 2010-11-03 23:42:51.736998874 +0100 +++++ dsniff-2.4/Makefile.in 2010-11-03 23:42:56.481000002 +0100 ++@@ -60,7 +60,7 @@ ++ decode_pop.c decode_portmap.c decode_postgresql.c decode_pptp.c \ ++ decode_rip.c decode_rlogin.c decode_smb.c decode_smtp.c \ ++ decode_sniffer.c decode_snmp.c decode_socks.c decode_tds.c \ ++- decode_telnet.c decode_vrrp.c decode_yp.c decode_x11.c +++ decode_telnet.c decode_vrrp.c decode_x11.c ++ ++ GEN = mount.h mount.c nfs_prot.h nfs_prot.c ++ +diff --git a/feeds/packages/net/dsniff/patches/005-openssl_fix.patch b/feeds/packages/net/dsniff/patches/005-openssl_fix.patch +new file mode 100644 +index 0000000..1b2f9e7 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/005-openssl_fix.patch +@@ -0,0 +1,11 @@ ++--- dsniff-2.4b1.orig/sshcrypto.c +++++ dsniff-2.4b1/sshcrypto.c ++@@ -14,6 +14,8 @@ ++ ++ #include ++ #include +++#include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/net/dsniff/patches/006-pcap_header.patch b/feeds/packages/net/dsniff/patches/006-pcap_header.patch +new file mode 100644 +index 0000000..6836557 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/006-pcap_header.patch +@@ -0,0 +1,13 @@ ++Index: dsniff-2.4/configure ++=================================================================== ++--- dsniff-2.4.orig/configure 2010-11-03 23:42:52.921000006 +0100 +++++ dsniff-2.4/configure 2010-11-03 23:43:00.504000001 +0100 ++@@ -3033,7 +3033,7 @@ ++ PCAPINC="-I$withval -I$withval/bpf" ++ PCAPLIB="-L$withval -lpcap" ++ elif test -f $withval/include/pcap.h -a \ ++- -f $withval/include/net/bpf.h -a \ +++ -f $withval/include/pcap-bpf.h -a \ ++ -f $withval/lib/libpcap.a; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi +diff --git a/feeds/packages/net/dsniff/patches/007-time_h.patch b/feeds/packages/net/dsniff/patches/007-time_h.patch +new file mode 100644 +index 0000000..280b8c1 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/007-time_h.patch +@@ -0,0 +1,22 @@ ++diff -urNad --exclude=CVS --exclude=.svn dsniff-2.4b1/msgsnarf.c dsniff-2.4b1/msgsnarf.c ++--- dsniff-2.4b1/msgsnarf.c 2001-03-15 08:33:04.000000000 +0000 +++++ dsniff-2.4b1/msgsnarf.c 2005-07-11 20:15:50.000000000 +0000 ++@@ -23,6 +23,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include "buf.h" ++ #include "decode.h" ++diff -urNad --exclude=CVS --exclude=.svn dsniff-2.4b1/sshow.c dsniff-2.4b1/sshow.c ++--- dsniff-2.4b1/sshow.c 2005-07-11 20:14:19.000000000 +0000 +++++ dsniff-2.4b1/sshow.c 2005-07-11 20:15:26.000000000 +0000 ++@@ -15,6 +15,7 @@ ++ ++ #include ++ #include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/net/dsniff/patches/008-md5_include.patch b/feeds/packages/net/dsniff/patches/008-md5_include.patch +new file mode 100644 +index 0000000..f8d3829 +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/008-md5_include.patch +@@ -0,0 +1,13 @@ ++Index: dsniff-2.4/record.c ++=================================================================== ++--- dsniff-2.4.orig/record.c 2010-11-03 23:43:14.268000004 +0100 +++++ dsniff-2.4/record.c 2010-11-03 23:43:16.947000004 +0100 ++@@ -14,7 +14,7 @@ ++ ++ #include ++ #include ++-#include +++#include "missing/md5.h" ++ #include ++ #include ++ +diff --git a/feeds/packages/net/dsniff/patches/010-clk-tck-fix.patch b/feeds/packages/net/dsniff/patches/010-clk-tck-fix.patch +new file mode 100644 +index 0000000..cc15bef +--- /dev/null ++++ b/feeds/packages/net/dsniff/patches/010-clk-tck-fix.patch +@@ -0,0 +1,15 @@ ++Index: dsniff-2.4/sshow.c ++=================================================================== ++--- dsniff-2.4.orig/sshow.c 2010-11-03 23:41:56.335999997 +0100 +++++ dsniff-2.4/sshow.c 2010-11-03 23:42:10.981000001 +0100 ++@@ -42,6 +42,10 @@ ++ ++ #define HISTORY_SIZE 16 ++ +++#ifndef CLK_TCK +++# define CLK_TCK CLOCKS_PER_SEC +++#endif +++ ++ typedef struct { ++ u_int min, max; ++ } range; +diff --git a/feeds/packages/net/dudders/.svn/entries b/feeds/packages/net/dudders/.svn/entries +new file mode 100644 +index 0000000..8c863aa +--- /dev/null ++++ b/feeds/packages/net/dudders/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dudders ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:33.645483Z ++32280 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++739e8311f2877319c36a8f8e47e23678 ++2012-06-12T23:47:33.645483Z ++32280 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1859 ++ +diff --git a/feeds/packages/net/dudders/.svn/text-base/Makefile.svn-base b/feeds/packages/net/dudders/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..02549d8 +--- /dev/null ++++ b/feeds/packages/net/dudders/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2010-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:=dudders ++PKG_VERSION:=1.04 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=1d368a86f3c284e95d260a94767a8ded ++ ++PKG_BUILD_DEPENDS:=+libopenssl +libgcrypt ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dudders ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ DEPENDS:=+libopenssl +libgcrypt +libgpg-error ++ TITLE:=DNS Update SIG(0) client ++ MAINTAINER:=Dean Scarff ++ URL:=http://dudders.sourceforge.net/ ++endef ++ ++define Package/dudders/description ++ Dudders is a utility for updating DNS records. It points ++ a domain name to a given IP address, using the RFC2136 DNS ++ UPDATE protocol and a SIG(0) signature. It is designed with ++ embedded systems in mind. ++ ++ You must have either libopenssl or libgcrypt installed to ++ use this package. ++endef ++ ++define Package/dudders/conffiles ++/etc/config/dudders ++endef ++ ++EXTRA_CFLAGS:= -DNDEBUG -std=gnu99 ++ ++CONFIGURE_ARGS+= \ ++ --with-libgcrypt-prefix="$(STAGING_DIR)/usr" ++ ++define Package/dudders/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dudders $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/dudders ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dudders/crypt_gcrypt.so \ ++ $(1)/usr/lib/dudders/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dudders/crypt_openssl.so \ ++ $(1)/usr/lib/dudders/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/dudders.config $(1)/etc/config/dudders ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_BIN) ./files/dudders.hotplug $(1)/etc/hotplug.d/iface/50-dudders ++endef ++ ++$(eval $(call BuildPackage,dudders)) +diff --git a/feeds/packages/net/dudders/Makefile b/feeds/packages/net/dudders/Makefile +new file mode 100644 +index 0000000..02549d8 +--- /dev/null ++++ b/feeds/packages/net/dudders/Makefile +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2010-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:=dudders ++PKG_VERSION:=1.04 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=1d368a86f3c284e95d260a94767a8ded ++ ++PKG_BUILD_DEPENDS:=+libopenssl +libgcrypt ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dudders ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ DEPENDS:=+libopenssl +libgcrypt +libgpg-error ++ TITLE:=DNS Update SIG(0) client ++ MAINTAINER:=Dean Scarff ++ URL:=http://dudders.sourceforge.net/ ++endef ++ ++define Package/dudders/description ++ Dudders is a utility for updating DNS records. It points ++ a domain name to a given IP address, using the RFC2136 DNS ++ UPDATE protocol and a SIG(0) signature. It is designed with ++ embedded systems in mind. ++ ++ You must have either libopenssl or libgcrypt installed to ++ use this package. ++endef ++ ++define Package/dudders/conffiles ++/etc/config/dudders ++endef ++ ++EXTRA_CFLAGS:= -DNDEBUG -std=gnu99 ++ ++CONFIGURE_ARGS+= \ ++ --with-libgcrypt-prefix="$(STAGING_DIR)/usr" ++ ++define Package/dudders/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dudders $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/dudders ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dudders/crypt_gcrypt.so \ ++ $(1)/usr/lib/dudders/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dudders/crypt_openssl.so \ ++ $(1)/usr/lib/dudders/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/dudders.config $(1)/etc/config/dudders ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_BIN) ./files/dudders.hotplug $(1)/etc/hotplug.d/iface/50-dudders ++endef ++ ++$(eval $(call BuildPackage,dudders)) +diff --git a/feeds/packages/net/dudders/files/.svn/entries b/feeds/packages/net/dudders/files/.svn/entries +new file mode 100644 +index 0000000..6c05160 +--- /dev/null ++++ b/feeds/packages/net/dudders/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/dudders/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dudders.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++63458dadf48f66817d26dd4f3188d114 ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1778 ++ ++dudders.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++2e0593844553cb883e2020d77e991f7e ++2011-11-17T11:48:57.451334Z ++29225 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++237 ++ +diff --git a/feeds/packages/net/dudders/files/.svn/text-base/dudders.config.svn-base b/feeds/packages/net/dudders/files/.svn/text-base/dudders.config.svn-base +new file mode 100644 +index 0000000..27dc4b6 +--- /dev/null ++++ b/feeds/packages/net/dudders/files/.svn/text-base/dudders.config.svn-base +@@ -0,0 +1,7 @@ ++config dudders ++ option enabled 'no' ++ option tcp 'yes' ++ option keyfile '/tmp/dudders.private' ++ option keyname 'owner.example.com' ++ option hostname 'test.example.com' ++ option ttl 86400 +diff --git a/feeds/packages/net/dudders/files/.svn/text-base/dudders.hotplug.svn-base b/feeds/packages/net/dudders/files/.svn/text-base/dudders.hotplug.svn-base +new file mode 100644 +index 0000000..7e3026f +--- /dev/null ++++ b/feeds/packages/net/dudders/files/.svn/text-base/dudders.hotplug.svn-base +@@ -0,0 +1,46 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++config_cb() { ++ local cfg="$CONFIG_SECTION" ++ local cfgtype ++ config_get cfgtype "$cfg" TYPE ++ dudders=/usr/bin/dudders ++ ++ case "$cfgtype" in ++ dudders) ++ config_get enabled $cfg enabled ++ [ "$enabled" = "yes" ] || return 0 ++ ++ config_get tcp $cfg tcp ++ config_get keyname $cfg keyname ++ config_get mname $cfg mname ++ config_get zone $cfg zone ++ config_get keyfile $cfg keyfile ++ config_get hostname $cfg hostname ++ config_get ttl $cfg ttl ++ ++ [ -r "$keyfile" ] || return 1 ++ sleep 1 ++ interface=$(route -n 2>&- \ ++ |grep '^0.0.0.0' \ ++ |sed -e 's/.* \([^ ]\+\)$/\1/') ++ [ -z "$interface" ] && return 0 ++ [ "$DEVICE" = "$interface" -o \ ++ "$IFNAME" = "$interface" -o \ ++ "$PPP_IFACE" = "$interface" ] || return 0 ++ ipaddr=${PPP_LOCAL:-${IPLOCAL:-$(ifconfig "$interface" \ ++ |grep -o 'addr:[^ ]\+' \ ++ |sed -e 's/addr://')}} ++ OPTS=${keyname:+" -k '$keyname'"} ++ [ "$tcp" = "yes" ] && OPTS=$OPTS" -T" ++ OPTS=$OPTS${mname:+" -m '$mname'"} ++ OPTS=$OPTS${zone:+" -z '$zone'"} ++ eval $dudders -k $keyfile $OPTS $hostname $ttl $ipaddr ++ ;; ++ esac ++} ++case "${ACTION:-ifup}" in ++ ifup) config_load dudders ;; ++esac +diff --git a/feeds/packages/net/dudders/files/dudders.config b/feeds/packages/net/dudders/files/dudders.config +new file mode 100644 +index 0000000..27dc4b6 +--- /dev/null ++++ b/feeds/packages/net/dudders/files/dudders.config +@@ -0,0 +1,7 @@ ++config dudders ++ option enabled 'no' ++ option tcp 'yes' ++ option keyfile '/tmp/dudders.private' ++ option keyname 'owner.example.com' ++ option hostname 'test.example.com' ++ option ttl 86400 +diff --git a/feeds/packages/net/dudders/files/dudders.hotplug b/feeds/packages/net/dudders/files/dudders.hotplug +new file mode 100644 +index 0000000..7e3026f +--- /dev/null ++++ b/feeds/packages/net/dudders/files/dudders.hotplug +@@ -0,0 +1,46 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++config_cb() { ++ local cfg="$CONFIG_SECTION" ++ local cfgtype ++ config_get cfgtype "$cfg" TYPE ++ dudders=/usr/bin/dudders ++ ++ case "$cfgtype" in ++ dudders) ++ config_get enabled $cfg enabled ++ [ "$enabled" = "yes" ] || return 0 ++ ++ config_get tcp $cfg tcp ++ config_get keyname $cfg keyname ++ config_get mname $cfg mname ++ config_get zone $cfg zone ++ config_get keyfile $cfg keyfile ++ config_get hostname $cfg hostname ++ config_get ttl $cfg ttl ++ ++ [ -r "$keyfile" ] || return 1 ++ sleep 1 ++ interface=$(route -n 2>&- \ ++ |grep '^0.0.0.0' \ ++ |sed -e 's/.* \([^ ]\+\)$/\1/') ++ [ -z "$interface" ] && return 0 ++ [ "$DEVICE" = "$interface" -o \ ++ "$IFNAME" = "$interface" -o \ ++ "$PPP_IFACE" = "$interface" ] || return 0 ++ ipaddr=${PPP_LOCAL:-${IPLOCAL:-$(ifconfig "$interface" \ ++ |grep -o 'addr:[^ ]\+' \ ++ |sed -e 's/addr://')}} ++ OPTS=${keyname:+" -k '$keyname'"} ++ [ "$tcp" = "yes" ] && OPTS=$OPTS" -T" ++ OPTS=$OPTS${mname:+" -m '$mname'"} ++ OPTS=$OPTS${zone:+" -z '$zone'"} ++ eval $dudders -k $keyfile $OPTS $hostname $ttl $ipaddr ++ ;; ++ esac ++} ++case "${ACTION:-ifup}" in ++ ifup) config_load dudders ;; ++esac +diff --git a/feeds/packages/net/e169-stats/.svn/entries b/feeds/packages/net/e169-stats/.svn/entries +new file mode 100644 +index 0000000..fd2affa +--- /dev/null ++++ b/feeds/packages/net/e169-stats/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/e169-stats ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-15T08:23:01.531557Z ++26892 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++8244fe3e38514ab3cdaea89be3111abb ++2011-05-15T08:23:01.531557Z ++26892 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++869 ++ +diff --git a/feeds/packages/net/e169-stats/.svn/text-base/Makefile.svn-base b/feeds/packages/net/e169-stats/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cac9d12 +--- /dev/null ++++ b/feeds/packages/net/e169-stats/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# Copyright (C) 2010-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:=e169-stats ++PKG_VERSION:=0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.mavetju.org/download ++PKG_MD5SUM:=2f6f5b984faeec368a867e59cd2cc36d ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/e169-stats ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Huawei USB modem statistics ++ URL:=http://www.mavetju.org/weblog/html/00282.html ++ DEPENDS:=+libncurses ++endef ++ ++define Package/e169-stats/description ++ Huawei E169 statistics, works with other Huawei's devices. ++endef ++ ++define Package/e169-stats/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/e169-stats $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,e169-stats)) +diff --git a/feeds/packages/net/e169-stats/Makefile b/feeds/packages/net/e169-stats/Makefile +new file mode 100644 +index 0000000..cac9d12 +--- /dev/null ++++ b/feeds/packages/net/e169-stats/Makefile +@@ -0,0 +1,37 @@ ++# ++# Copyright (C) 2010-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:=e169-stats ++PKG_VERSION:=0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.mavetju.org/download ++PKG_MD5SUM:=2f6f5b984faeec368a867e59cd2cc36d ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/e169-stats ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Huawei USB modem statistics ++ URL:=http://www.mavetju.org/weblog/html/00282.html ++ DEPENDS:=+libncurses ++endef ++ ++define Package/e169-stats/description ++ Huawei E169 statistics, works with other Huawei's devices. ++endef ++ ++define Package/e169-stats/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/e169-stats $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,e169-stats)) +diff --git a/feeds/packages/net/e169-stats/patches/.svn/entries b/feeds/packages/net/e169-stats/patches/.svn/entries +new file mode 100644 +index 0000000..7f25ea8 +--- /dev/null ++++ b/feeds/packages/net/e169-stats/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/e169-stats/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-05-15T08:23:01.531557Z ++26892 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++01-make.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++bd293274ab310e6e1b969b81a2a081ac ++2011-05-15T08:23:01.531557Z ++26892 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++277 ++ +diff --git a/feeds/packages/net/e169-stats/patches/.svn/text-base/01-make.patch.svn-base b/feeds/packages/net/e169-stats/patches/.svn/text-base/01-make.patch.svn-base +new file mode 100644 +index 0000000..28a56c5 +--- /dev/null ++++ b/feeds/packages/net/e169-stats/patches/.svn/text-base/01-make.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -1,7 +1,7 @@ ++ all: e169-stats ++ ++ e169-stats: e169-stats.c ++- gcc -Wall -o e169-stats e169-stats.c -lcurses +++ $(CC) -Wall -o e169-stats e169-stats.c -lcurses -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib ++ ++ clean: ++ -rm e169-stats *.core +diff --git a/feeds/packages/net/e169-stats/patches/01-make.patch b/feeds/packages/net/e169-stats/patches/01-make.patch +new file mode 100644 +index 0000000..28a56c5 +--- /dev/null ++++ b/feeds/packages/net/e169-stats/patches/01-make.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -1,7 +1,7 @@ ++ all: e169-stats ++ ++ e169-stats: e169-stats.c ++- gcc -Wall -o e169-stats e169-stats.c -lcurses +++ $(CC) -Wall -o e169-stats e169-stats.c -lcurses -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib ++ ++ clean: ++ -rm e169-stats *.core +diff --git a/feeds/packages/net/ekg/.svn/entries b/feeds/packages/net/ekg/.svn/entries +new file mode 100644 +index 0000000..8356742 +--- /dev/null ++++ b/feeds/packages/net/ekg/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ekg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T07:11:21.724887Z ++26076 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++6b2f1a554c4532ec09f8b5d1ceedf2c0 ++2011-03-12T07:11:21.724887Z ++26076 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1125 ++ +diff --git a/feeds/packages/net/ekg/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ekg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..772e811 +--- /dev/null ++++ b/feeds/packages/net/ekg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=ekg ++PKG_VERSION:=1.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ekg.chmurka.net/ ++PKG_MD5SUM:=2aa92b56517fdf09d75519a105772b74 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ekg ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Instant Messaging ++ TITLE:=Eksperymentalny Klient Gadu-Gadu (Polish IM) ++ URL:=http://ekg.chmurka.net ++ DEPENDS:=+zlib +libncurses ++endef ++ ++CONFIGURE_ARGS+= \ ++ --without-c99-vsnprintf \ ++ --without-bind \ ++ --without-libgsm \ ++ --without-libjpeg \ ++ --without-libungif \ ++ --without-openssl \ ++ --disable-libgadu-openssl \ ++ --enable-ui-ncurses \ ++ --disable-ui-readline \ ++ ++CONFIGURE_VARS+= \ ++ CFLAGS="$$$$CFLAGS $(TARGET_CPPFLAGS)" \ ++ CFLAGS_LIBGADU="$$$$CFLAGS $(TARGET_CPPFLAGS)" \ ++ ++define Package/ekg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ekg $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,ekg)) +diff --git a/feeds/packages/net/ekg/Makefile b/feeds/packages/net/ekg/Makefile +new file mode 100644 +index 0000000..772e811 +--- /dev/null ++++ b/feeds/packages/net/ekg/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=ekg ++PKG_VERSION:=1.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ekg.chmurka.net/ ++PKG_MD5SUM:=2aa92b56517fdf09d75519a105772b74 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ekg ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Instant Messaging ++ TITLE:=Eksperymentalny Klient Gadu-Gadu (Polish IM) ++ URL:=http://ekg.chmurka.net ++ DEPENDS:=+zlib +libncurses ++endef ++ ++CONFIGURE_ARGS+= \ ++ --without-c99-vsnprintf \ ++ --without-bind \ ++ --without-libgsm \ ++ --without-libjpeg \ ++ --without-libungif \ ++ --without-openssl \ ++ --disable-libgadu-openssl \ ++ --enable-ui-ncurses \ ++ --disable-ui-readline \ ++ ++CONFIGURE_VARS+= \ ++ CFLAGS="$$$$CFLAGS $(TARGET_CPPFLAGS)" \ ++ CFLAGS_LIBGADU="$$$$CFLAGS $(TARGET_CPPFLAGS)" \ ++ ++define Package/ekg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ekg $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,ekg)) +diff --git a/feeds/packages/net/ekg/patches/.svn/entries b/feeds/packages/net/ekg/patches/.svn/entries +new file mode 100644 +index 0000000..4d8197c +--- /dev/null ++++ b/feeds/packages/net/ekg/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ekg/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-11-02T16:05:19.495348Z ++23784 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++339db90f073f6afedd81ea265d21a924 ++2010-11-02T16:05:19.495348Z ++23784 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1183 ++ +diff --git a/feeds/packages/net/ekg/patches/.svn/text-base/100-compile-fixes.patch.svn-base b/feeds/packages/net/ekg/patches/.svn/text-base/100-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..2f9ccbd +--- /dev/null ++++ b/feeds/packages/net/ekg/patches/.svn/text-base/100-compile-fixes.patch.svn-base +@@ -0,0 +1,62 @@ ++Index: ekg-1.7/Makefile.in ++=================================================================== ++--- ekg-1.7.orig/Makefile.in 2010-11-02 16:55:11.021994526 +0100 +++++ ekg-1.7/Makefile.in 2010-11-02 16:59:57.189994991 +0100 ++@@ -15,29 +15,31 @@ ++ ++ # ++ ++-all: configure libgadu @ekg@ @make_ekgwap@ +++libgadu:=lib/libgadu.a ++ ++-libgadu: ++- cd lib && $(MAKE) all +++all: @ekg@ @make_ekgwap@ ++ ++-ekg: ++- cd src && $(MAKE) all +++$(libgadu): dep +++ $(MAKE) -C lib ++ ++-make-ekgwap: ++- cd ekgwap && $(MAKE) all +++ekg: $(libgadu) +++ $(MAKE) -C src ++ ++-examples: ++- cd examples && $(MAKE) all +++make-ekgwap: $(libgadu) +++ $(MAKE) -C ekgwap +++ +++examples: $(libgadu) +++ $(MAKE) -C examples ++ ++ # ++ ++ dep: dep-libgadu @dep_ekg@ ++ ++-dep-libgadu: ++- cd lib && $(MAKE) dep +++dep-libgadu: configure +++ $(MAKE) -C lib dep ++ ++-dep-ekg: ++- cd src && $(MAKE) dep +++dep-ekg: configure +++ $(MAKE) -C src dep ++ ++ # ++ ++@@ -49,10 +51,10 @@ ++ install: all install-libgadu @install_ekg@ @install_ekgwap@ ++ ++ install-libgadu: ++- cd lib && $(MAKE) install +++ $(MAKE) -C lib install ++ ++ install-ekg: install-ekg-data install-ekg-man ++- cd src && $(MAKE) install +++ $(MAKE) -C src install ++ ++ install-ekg-data: ++ $(INSTALL) -d $(DESTDIR)$(datadir)/ekg/themes +diff --git a/feeds/packages/net/ekg/patches/100-compile-fixes.patch b/feeds/packages/net/ekg/patches/100-compile-fixes.patch +new file mode 100644 +index 0000000..2f9ccbd +--- /dev/null ++++ b/feeds/packages/net/ekg/patches/100-compile-fixes.patch +@@ -0,0 +1,62 @@ ++Index: ekg-1.7/Makefile.in ++=================================================================== ++--- ekg-1.7.orig/Makefile.in 2010-11-02 16:55:11.021994526 +0100 +++++ ekg-1.7/Makefile.in 2010-11-02 16:59:57.189994991 +0100 ++@@ -15,29 +15,31 @@ ++ ++ # ++ ++-all: configure libgadu @ekg@ @make_ekgwap@ +++libgadu:=lib/libgadu.a ++ ++-libgadu: ++- cd lib && $(MAKE) all +++all: @ekg@ @make_ekgwap@ ++ ++-ekg: ++- cd src && $(MAKE) all +++$(libgadu): dep +++ $(MAKE) -C lib ++ ++-make-ekgwap: ++- cd ekgwap && $(MAKE) all +++ekg: $(libgadu) +++ $(MAKE) -C src ++ ++-examples: ++- cd examples && $(MAKE) all +++make-ekgwap: $(libgadu) +++ $(MAKE) -C ekgwap +++ +++examples: $(libgadu) +++ $(MAKE) -C examples ++ ++ # ++ ++ dep: dep-libgadu @dep_ekg@ ++ ++-dep-libgadu: ++- cd lib && $(MAKE) dep +++dep-libgadu: configure +++ $(MAKE) -C lib dep ++ ++-dep-ekg: ++- cd src && $(MAKE) dep +++dep-ekg: configure +++ $(MAKE) -C src dep ++ ++ # ++ ++@@ -49,10 +51,10 @@ ++ install: all install-libgadu @install_ekg@ @install_ekgwap@ ++ ++ install-libgadu: ++- cd lib && $(MAKE) install +++ $(MAKE) -C lib install ++ ++ install-ekg: install-ekg-data install-ekg-man ++- cd src && $(MAKE) install +++ $(MAKE) -C src install ++ ++ install-ekg-data: ++ $(INSTALL) -d $(DESTDIR)$(datadir)/ekg/themes +diff --git a/feeds/packages/net/elinks/.svn/entries b/feeds/packages/net/elinks/.svn/entries +new file mode 100644 +index 0000000..4b551cf +--- /dev/null ++++ b/feeds/packages/net/elinks/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/elinks ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T06:20:08.031784Z ++26069 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++474a37ab9eb11f844db32e142e25282e ++2011-03-12T06:20:08.031784Z ++26069 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3197 ++ +diff --git a/feeds/packages/net/elinks/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/elinks/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/elinks/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/elinks/.svn/text-base/Makefile.svn-base b/feeds/packages/net/elinks/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..af26ac1 +--- /dev/null ++++ b/feeds/packages/net/elinks/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,92 @@ ++# ++# Copyright (C) 2006-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:=elinks ++PKG_VERSION:=0.11.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://elinks.or.cz/download ++PKG_MD5SUM:=fcd087a6d2415cd4c6fd1db53dceb646 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/elinks ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libopenssl ++ TITLE:=A text based web browser ++ URL:=http://elinks.or.cz/ ++endef ++ ++define Package/elinks/description ++An advanced text based web browser ++endef ++ ++SHVAR_TRANS:= \ ++ $(STAGING_DIR_HOST)/bin/sed -e \ ++ 'y%*+%pp%;s%[^_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]%_%g' ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ ++ x=`echo ac_cv_file_./features.conf | $(SHVAR_TRANS)` && export $$$${x}=yes && \ ++ x=`echo ac_cv_file_$(abspath $(PKG_BUILD_DIR)/features.conf) | $(SHVAR_TRANS)` && export $$$${x}=yes && \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ 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) \ ++ --enable-small\ ++ --enable-256-colors\ ++ --disable-backtrace\ ++ --disable-data\ ++ --disable-formhist\ ++ --disable-leds \ ++ --disable-mailcap\ ++ --disable-mouse \ ++ --disable-smb \ ++ --disable-uri-rewrite\ ++ --disable-xbel \ ++ --without-bzlib \ ++ --without-gpm \ ++ --without-idn \ ++ --without-gnutls \ ++ --without-libiconv \ ++ --without-lua \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --without-spidermonkey\ ++ --without-x\ ++ --without-zlib \ ++ ); ++endef ++ ++define Package/elinks/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/elinks $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,elinks)) +diff --git a/feeds/packages/net/elinks/Makefile b/feeds/packages/net/elinks/Makefile +new file mode 100644 +index 0000000..af26ac1 +--- /dev/null ++++ b/feeds/packages/net/elinks/Makefile +@@ -0,0 +1,92 @@ ++# ++# Copyright (C) 2006-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:=elinks ++PKG_VERSION:=0.11.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://elinks.or.cz/download ++PKG_MD5SUM:=fcd087a6d2415cd4c6fd1db53dceb646 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/elinks ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libopenssl ++ TITLE:=A text based web browser ++ URL:=http://elinks.or.cz/ ++endef ++ ++define Package/elinks/description ++An advanced text based web browser ++endef ++ ++SHVAR_TRANS:= \ ++ $(STAGING_DIR_HOST)/bin/sed -e \ ++ 'y%*+%pp%;s%[^_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]%_%g' ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ ++ x=`echo ac_cv_file_./features.conf | $(SHVAR_TRANS)` && export $$$${x}=yes && \ ++ x=`echo ac_cv_file_$(abspath $(PKG_BUILD_DIR)/features.conf) | $(SHVAR_TRANS)` && export $$$${x}=yes && \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ 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) \ ++ --enable-small\ ++ --enable-256-colors\ ++ --disable-backtrace\ ++ --disable-data\ ++ --disable-formhist\ ++ --disable-leds \ ++ --disable-mailcap\ ++ --disable-mouse \ ++ --disable-smb \ ++ --disable-uri-rewrite\ ++ --disable-xbel \ ++ --without-bzlib \ ++ --without-gpm \ ++ --without-idn \ ++ --without-gnutls \ ++ --without-libiconv \ ++ --without-lua \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --without-spidermonkey\ ++ --without-x\ ++ --without-zlib \ ++ ); ++endef ++ ++define Package/elinks/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/elinks $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,elinks)) +diff --git a/feeds/packages/net/elinks/patches/.svn/entries b/feeds/packages/net/elinks/patches/.svn/entries +new file mode 100644 +index 0000000..bafa175 +--- /dev/null ++++ b/feeds/packages/net/elinks/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/elinks/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-17T11:06:14.470224Z ++16872 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-fix_avr32_compile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++ec442c615fd6757feda94172604660cb ++2009-07-17T11:06:14.470224Z ++16872 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++854 ++ +diff --git a/feeds/packages/net/elinks/patches/.svn/text-base/002-fix_avr32_compile.svn-base b/feeds/packages/net/elinks/patches/.svn/text-base/002-fix_avr32_compile.svn-base +new file mode 100644 +index 0000000..99a8874 +--- /dev/null ++++ b/feeds/packages/net/elinks/patches/.svn/text-base/002-fix_avr32_compile.svn-base +@@ -0,0 +1,20 @@ ++--- a/config/config.sub +++++ b/config/config.sub ++@@ -239,7 +239,7 @@ case $basic_machine in ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++- | 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 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++@@ -313,7 +313,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-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ +diff --git a/feeds/packages/net/elinks/patches/002-fix_avr32_compile b/feeds/packages/net/elinks/patches/002-fix_avr32_compile +new file mode 100644 +index 0000000..99a8874 +--- /dev/null ++++ b/feeds/packages/net/elinks/patches/002-fix_avr32_compile +@@ -0,0 +1,20 @@ ++--- a/config/config.sub +++++ b/config/config.sub ++@@ -239,7 +239,7 @@ case $basic_machine in ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++- | 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 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++@@ -313,7 +313,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-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ +diff --git a/feeds/packages/net/etherpuppet/.svn/entries b/feeds/packages/net/etherpuppet/.svn/entries +new file mode 100644 +index 0000000..9bca42f +--- /dev/null ++++ b/feeds/packages/net/etherpuppet/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/etherpuppet ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-23T06:41:28.452248Z ++25665 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++a42b047c17697954ca49fb21eeb7afb3 ++2011-02-23T06:41:28.452248Z ++25665 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1261 ++ +diff --git a/feeds/packages/net/etherpuppet/.svn/text-base/Makefile.svn-base b/feeds/packages/net/etherpuppet/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f85f9d2 +--- /dev/null ++++ b/feeds/packages/net/etherpuppet/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=etherpuppet ++PKG_REV:=90decf83d1d4 ++PKG_VERSION:=0.3_r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://hg.secdev.org/etherpuppet ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=hg ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/etherpuppet ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-tun ++ TITLE:=A voodoo doll for an Ethernet interface ++ URL:=http://www.secdev.org/projects/etherpuppet/ ++ SUBMENU:=VPN ++endef ++ ++define Package/etherpuppet/description ++ Etherpuppet is a small program for Linux that will create a virtual interface ++ (TUN/TAP) on one machine from the ethernet interface of another machine ++ through a TCP connection. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(PKG_BUILD_DIR)/$(PKG_NAME).c -o $(PKG_BUILD_DIR)/$(PKG_NAME) ++endef ++ ++define Package/etherpuppet/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,etherpuppet)) +diff --git a/feeds/packages/net/etherpuppet/Makefile b/feeds/packages/net/etherpuppet/Makefile +new file mode 100644 +index 0000000..f85f9d2 +--- /dev/null ++++ b/feeds/packages/net/etherpuppet/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=etherpuppet ++PKG_REV:=90decf83d1d4 ++PKG_VERSION:=0.3_r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://hg.secdev.org/etherpuppet ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=hg ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/etherpuppet ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-tun ++ TITLE:=A voodoo doll for an Ethernet interface ++ URL:=http://www.secdev.org/projects/etherpuppet/ ++ SUBMENU:=VPN ++endef ++ ++define Package/etherpuppet/description ++ Etherpuppet is a small program for Linux that will create a virtual interface ++ (TUN/TAP) on one machine from the ethernet interface of another machine ++ through a TCP connection. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(PKG_BUILD_DIR)/$(PKG_NAME).c -o $(PKG_BUILD_DIR)/$(PKG_NAME) ++endef ++ ++define Package/etherpuppet/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,etherpuppet)) +diff --git a/feeds/packages/net/etherwake/.svn/entries b/feeds/packages/net/etherwake/.svn/entries +new file mode 100644 +index 0000000..33edfff +--- /dev/null ++++ b/feeds/packages/net/etherwake/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/etherwake ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++64f74e2e77e3f507d57bfa15d6db0452 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1616 ++ +diff --git a/feeds/packages/net/etherwake/.svn/text-base/Makefile.svn-base b/feeds/packages/net/etherwake/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d654390 +--- /dev/null ++++ b/feeds/packages/net/etherwake/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# 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 ++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/feeds/packages/net/etherwake/Makefile b/feeds/packages/net/etherwake/Makefile +new file mode 100644 +index 0000000..d654390 +--- /dev/null ++++ b/feeds/packages/net/etherwake/Makefile +@@ -0,0 +1,54 @@ ++# ++# 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 ++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/feeds/packages/net/etherwake/files/.svn/entries b/feeds/packages/net/etherwake/files/.svn/entries +new file mode 100644 +index 0000000..1f710ef +--- /dev/null ++++ b/feeds/packages/net/etherwake/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/etherwake/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-20T12:16:09.775283Z ++20321 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etherwake.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++db96e26de9b23b332898a265cebb26af ++2010-03-20T12:16:09.775283Z ++20321 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2459 ++ ++etherwake.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++91f3ffa11a68f6619a2ea527f0aef9a0 ++2010-03-20T12:16:09.775283Z ++20321 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++862 ++ +diff --git a/feeds/packages/net/etherwake/files/.svn/text-base/etherwake.config.svn-base b/feeds/packages/net/etherwake/files/.svn/text-base/etherwake.config.svn-base +new file mode 100644 +index 0000000..3d8e515 +--- /dev/null ++++ b/feeds/packages/net/etherwake/files/.svn/text-base/etherwake.config.svn-base +@@ -0,0 +1,28 @@ ++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 ++ 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/feeds/packages/net/etherwake/files/.svn/text-base/etherwake.init.svn-base b/feeds/packages/net/etherwake/files/.svn/text-base/etherwake.init.svn-base +new file mode 100644 +index 0000000..0504cf1 +--- /dev/null ++++ b/feeds/packages/net/etherwake/files/.svn/text-base/etherwake.init.svn-base +@@ -0,0 +1,132 @@ ++#!/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/feeds/packages/net/etherwake/files/etherwake.config b/feeds/packages/net/etherwake/files/etherwake.config +new file mode 100644 +index 0000000..3d8e515 +--- /dev/null ++++ b/feeds/packages/net/etherwake/files/etherwake.config +@@ -0,0 +1,28 @@ ++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 ++ 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/feeds/packages/net/etherwake/files/etherwake.init b/feeds/packages/net/etherwake/files/etherwake.init +new file mode 100644 +index 0000000..0504cf1 +--- /dev/null ++++ b/feeds/packages/net/etherwake/files/etherwake.init +@@ -0,0 +1,132 @@ ++#!/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/feeds/packages/net/etherwake/patches/.svn/entries b/feeds/packages/net/etherwake/patches/.svn/entries +new file mode 100644 +index 0000000..f71ec7d +--- /dev/null ++++ b/feeds/packages/net/etherwake/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/etherwake/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-10-08T22:30:28.845332Z ++9204 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-no_ether_hostton.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++861d344a4a598f546f217e1a64f4193b ++2007-10-08T22:30:28.845332Z ++9204 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1228 ++ +diff --git a/feeds/packages/net/etherwake/patches/.svn/text-base/100-no_ether_hostton.patch.svn-base b/feeds/packages/net/etherwake/patches/.svn/text-base/100-no_ether_hostton.patch.svn-base +new file mode 100644 +index 0000000..e33c06b +--- /dev/null ++++ b/feeds/packages/net/etherwake/patches/.svn/text-base/100-no_ether_hostton.patch.svn-base +@@ -0,0 +1,37 @@ ++--- 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/feeds/packages/net/etherwake/patches/100-no_ether_hostton.patch b/feeds/packages/net/etherwake/patches/100-no_ether_hostton.patch +new file mode 100644 +index 0000000..e33c06b +--- /dev/null ++++ b/feeds/packages/net/etherwake/patches/100-no_ether_hostton.patch +@@ -0,0 +1,37 @@ ++--- 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/feeds/packages/net/ethtool/.svn/entries b/feeds/packages/net/ethtool/.svn/entries +new file mode 100644 +index 0000000..68f7ca1 +--- /dev/null ++++ b/feeds/packages/net/ethtool/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ethtool ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-22T19:38:22.952992Z ++35301 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++2568f874ea7638e7a4539831e3a926a0 ++2013-01-22T19:38:22.952992Z ++35301 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++918 ++ +diff --git a/feeds/packages/net/ethtool/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/ethtool/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/ethtool/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ethtool/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ethtool/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5d1c5d3 +--- /dev/null ++++ b/feeds/packages/net/ethtool/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# 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:=ethtool ++PKG_VERSION:=3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@KERNEL/software/network/ethtool ++PKG_MD5SUM:=f16c8416e6ec917e5753918dc23a60bd ++ ++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/feeds/packages/net/ethtool/Makefile b/feeds/packages/net/ethtool/Makefile +new file mode 100644 +index 0000000..5d1c5d3 +--- /dev/null ++++ b/feeds/packages/net/ethtool/Makefile +@@ -0,0 +1,40 @@ ++# ++# 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:=ethtool ++PKG_VERSION:=3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@KERNEL/software/network/ethtool ++PKG_MD5SUM:=f16c8416e6ec917e5753918dc23a60bd ++ ++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/feeds/packages/net/ethtool/patches/.svn/entries b/feeds/packages/net/ethtool/patches/.svn/entries +new file mode 100644 +index 0000000..c84fb75 +--- /dev/null ++++ b/feeds/packages/net/ethtool/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ethtool/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-22T19:38:22.952992Z ++35301 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-ixp4xx.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++24ff9ef4c8227728c729652adfbdc7a5 ++2013-01-22T19:38:22.952992Z ++35301 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6641 ++ +diff --git a/feeds/packages/net/ethtool/patches/.svn/text-base/100-ixp4xx.patch.svn-base b/feeds/packages/net/ethtool/patches/.svn/text-base/100-ixp4xx.patch.svn-base +new file mode 100644 +index 0000000..ad3f3c5 +--- /dev/null ++++ b/feeds/packages/net/ethtool/patches/.svn/text-base/100-ixp4xx.patch.svn-base +@@ -0,0 +1,194 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -10,7 +10,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy ++ fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ ++ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ ++ smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ ++- rxclass.c sfpid.c sfpdiag.c +++ rxclass.c sfpid.c sfpdiag.c ixp4xx.c ++ ++ TESTS = test-cmdline test-features ++ check_PROGRAMS = test-cmdline test-features ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -78,7 +78,7 @@ am_ethtool_OBJECTS = ethtool.$(OBJEXT) a ++ tg3.$(OBJEXT) marvell.$(OBJEXT) vioc.$(OBJEXT) \ ++ smsc911x.$(OBJEXT) at76c50x-usb.$(OBJEXT) sfc.$(OBJEXT) \ ++ stmmac.$(OBJEXT) rxclass.$(OBJEXT) sfpid.$(OBJEXT) \ ++- sfpdiag.$(OBJEXT) +++ sfpdiag.$(OBJEXT) ixp4xx.$(OBJEXT) ++ ethtool_OBJECTS = $(am_ethtool_OBJECTS) ++ ethtool_LDADD = $(LDADD) ++ ethtool_DEPENDENCIES = ++@@ -286,7 +286,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy ++ fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ ++ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ ++ smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ ++- rxclass.c sfpid.c sfpdiag.c +++ rxclass.c sfpid.c sfpdiag.c ixp4xx.c ++ ++ test_cmdline_SOURCES = test-cmdline.c test-common.c $(ethtool_SOURCES) ++ test_cmdline_CFLAGS = -DTEST_ETHTOOL ++@@ -431,6 +431,7 @@ distclean-compile: ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfpid.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smsc911x.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stmmac.Po@am__quote@ +++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixp4xx.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-amd8111e.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-at76c50x-usb.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-de2104x.Po@am__quote@ ++--- a/ethtool.c +++++ b/ethtool.c ++@@ -873,6 +873,7 @@ static const struct { ++ { "igb", igb_dump_regs }, ++ { "ixgb", ixgb_dump_regs }, ++ { "ixgbe", ixgbe_dump_regs }, +++ { "ixp4xx", ixp4xx_dump_regs }, ++ { "natsemi", natsemi_dump_regs }, ++ { "e100", e100_dump_regs }, ++ { "amd8111e", amd8111e_dump_regs }, ++--- a/internal.h +++++ b/internal.h ++@@ -241,6 +241,9 @@ int st_gmac_dump_regs(struct ethtool_drv ++ /* Et131x ethernet controller */ ++ int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); ++ +++/* Intel IXP4xx internal MAC */ +++int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); +++ ++ /* Rx flow classification */ ++ int rxclass_parse_ruleopts(struct cmd_context *ctx, ++ struct ethtool_rx_flow_spec *fsp); ++--- /dev/null +++++ b/ixp4xx.c ++@@ -0,0 +1,130 @@ +++/* +++ * Copyright (c) 2006 Christian Hohnstaed +++ * This file is released under the GPLv2 +++ */ +++ +++#include +++#include "internal.h" +++ +++#ifndef BIT +++#define BIT(x) (1<data; +++ +++ fprintf(stdout, +++ "TXctrl: 0x%02x:0x%02x\n" +++ " Enable: %s\n" +++ " Duplex: %s\n" +++ " Retry: %s (%d)\n" +++ " Padding: %s\n" +++ " Frame check: %s\n" +++ " TX deferral: %s\n" +++ " Connection: %s\n" +++ "\n", +++ data[0], data[1], +++ data[0] & TX_CNTRL1_TX_EN ? "yes" : "no", +++ data[0] & TX_CNTRL1_DUPLEX ? "half" : "full", +++ data[0] & TX_CNTRL1_RETRY ? "enabled" : "disabled", +++ data[1] & TX_CNTRL2_RETRIES_MASK, +++ data[0] & TX_CNTRL1_PAD_EN ? "enabled" : "disabled", +++ data[0] & TX_CNTRL1_FCS_EN ? "enabled" : "disabled", +++ data[0] & TX_CNTRL1_2DEFER ? "two-part" : "one-part", +++ data[0] & TX_CNTRL1_RMII ? "RMII" : "Full MII" +++ ); +++ +++ fprintf(stdout, +++ "RXctrl: 0x%02x\n" +++ " Enable: %s\n" +++ " Pad strip: %s\n" +++ " CRC check: %s\n" +++ " Pause: %s\n" +++ " Loop: %s\n" +++ " Promiscous: %s\n" +++ " Runt frames: %s\n" +++ " Broadcast: %s\n" +++ "\n", +++ data[2], +++ data[2] & RX_CNTRL1_RX_EN ? "yes" : "no", +++ data[2] & RX_CNTRL1_PADSTRIP_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_CRC_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_PAUSE_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_LOOP_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_ADDR_FLTR_EN ? "disabled" : "enabled", +++ data[2] & RX_CNTRL1_RX_RUNT_EN ? "forward" : "discard", +++ data[2] & RX_CNTRL1_BCAST_DIS ? "disabled" : "enabled" +++ ); +++ fprintf(stdout, +++ "Core control: 0x%02x\n" +++ " Core state: %s\n" +++ " RX fifo: %s\n" +++ " TX fifo: %s\n" +++ " Send jam: %s\n" +++ " MDC clock %s\n" +++ "\n", +++ data[32], +++ data[32] & CORE_RESET ? "reset" : "normal operation", +++ data[32] & CORE_RX_FIFO_FLUSH ? "flush" : "ok", +++ data[32] & CORE_TX_FIFO_FLUSH ? "flush" : "ok", +++ data[32] & CORE_SEND_JAM ? "yes" : "no", +++ data[32] & CORE_MDC_EN ? "output" : "input" +++ ); +++ fprintf(stdout, +++ "MAC addresses: \n" +++ " Multicast mask: " MAC "\n" +++ " Multicast address: " MAC "\n" +++ " Unicast address: " MAC "\n" +++ "\n", +++ MAC_DATA(data+13), MAC_DATA(data+19), MAC_DATA(data+26) +++ ); +++ fprintf(stdout, +++ "Random seed: 0x%02x\n" +++ "Threshold empty: %3d\n" +++ "Threshold full: %3d\n" +++ "TX buffer size: %3d\n" +++ "TX deferral: %3d\n" +++ "RX deferral: %3d\n" +++ "TX two deferral 1: %3d\n" +++ "TX two deferral 2: %3d\n" +++ "Slot time: %3d\n" +++ "Internal clock: %3d\n" +++ "\n", +++ data[4], data[5], data[6], data[7], data[8], data[9], +++ data[10], data[11], data[12], data[25] +++ ); +++ +++ return 0; +++} +diff --git a/feeds/packages/net/ethtool/patches/100-ixp4xx.patch b/feeds/packages/net/ethtool/patches/100-ixp4xx.patch +new file mode 100644 +index 0000000..ad3f3c5 +--- /dev/null ++++ b/feeds/packages/net/ethtool/patches/100-ixp4xx.patch +@@ -0,0 +1,194 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -10,7 +10,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy ++ fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ ++ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ ++ smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ ++- rxclass.c sfpid.c sfpdiag.c +++ rxclass.c sfpid.c sfpdiag.c ixp4xx.c ++ ++ TESTS = test-cmdline test-features ++ check_PROGRAMS = test-cmdline test-features ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -78,7 +78,7 @@ am_ethtool_OBJECTS = ethtool.$(OBJEXT) a ++ tg3.$(OBJEXT) marvell.$(OBJEXT) vioc.$(OBJEXT) \ ++ smsc911x.$(OBJEXT) at76c50x-usb.$(OBJEXT) sfc.$(OBJEXT) \ ++ stmmac.$(OBJEXT) rxclass.$(OBJEXT) sfpid.$(OBJEXT) \ ++- sfpdiag.$(OBJEXT) +++ sfpdiag.$(OBJEXT) ixp4xx.$(OBJEXT) ++ ethtool_OBJECTS = $(am_ethtool_OBJECTS) ++ ethtool_LDADD = $(LDADD) ++ ethtool_DEPENDENCIES = ++@@ -286,7 +286,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy ++ fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ ++ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ ++ smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ ++- rxclass.c sfpid.c sfpdiag.c +++ rxclass.c sfpid.c sfpdiag.c ixp4xx.c ++ ++ test_cmdline_SOURCES = test-cmdline.c test-common.c $(ethtool_SOURCES) ++ test_cmdline_CFLAGS = -DTEST_ETHTOOL ++@@ -431,6 +431,7 @@ distclean-compile: ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfpid.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smsc911x.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stmmac.Po@am__quote@ +++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixp4xx.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-amd8111e.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-at76c50x-usb.Po@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-de2104x.Po@am__quote@ ++--- a/ethtool.c +++++ b/ethtool.c ++@@ -873,6 +873,7 @@ static const struct { ++ { "igb", igb_dump_regs }, ++ { "ixgb", ixgb_dump_regs }, ++ { "ixgbe", ixgbe_dump_regs }, +++ { "ixp4xx", ixp4xx_dump_regs }, ++ { "natsemi", natsemi_dump_regs }, ++ { "e100", e100_dump_regs }, ++ { "amd8111e", amd8111e_dump_regs }, ++--- a/internal.h +++++ b/internal.h ++@@ -241,6 +241,9 @@ int st_gmac_dump_regs(struct ethtool_drv ++ /* Et131x ethernet controller */ ++ int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); ++ +++/* Intel IXP4xx internal MAC */ +++int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); +++ ++ /* Rx flow classification */ ++ int rxclass_parse_ruleopts(struct cmd_context *ctx, ++ struct ethtool_rx_flow_spec *fsp); ++--- /dev/null +++++ b/ixp4xx.c ++@@ -0,0 +1,130 @@ +++/* +++ * Copyright (c) 2006 Christian Hohnstaed +++ * This file is released under the GPLv2 +++ */ +++ +++#include +++#include "internal.h" +++ +++#ifndef BIT +++#define BIT(x) (1<data; +++ +++ fprintf(stdout, +++ "TXctrl: 0x%02x:0x%02x\n" +++ " Enable: %s\n" +++ " Duplex: %s\n" +++ " Retry: %s (%d)\n" +++ " Padding: %s\n" +++ " Frame check: %s\n" +++ " TX deferral: %s\n" +++ " Connection: %s\n" +++ "\n", +++ data[0], data[1], +++ data[0] & TX_CNTRL1_TX_EN ? "yes" : "no", +++ data[0] & TX_CNTRL1_DUPLEX ? "half" : "full", +++ data[0] & TX_CNTRL1_RETRY ? "enabled" : "disabled", +++ data[1] & TX_CNTRL2_RETRIES_MASK, +++ data[0] & TX_CNTRL1_PAD_EN ? "enabled" : "disabled", +++ data[0] & TX_CNTRL1_FCS_EN ? "enabled" : "disabled", +++ data[0] & TX_CNTRL1_2DEFER ? "two-part" : "one-part", +++ data[0] & TX_CNTRL1_RMII ? "RMII" : "Full MII" +++ ); +++ +++ fprintf(stdout, +++ "RXctrl: 0x%02x\n" +++ " Enable: %s\n" +++ " Pad strip: %s\n" +++ " CRC check: %s\n" +++ " Pause: %s\n" +++ " Loop: %s\n" +++ " Promiscous: %s\n" +++ " Runt frames: %s\n" +++ " Broadcast: %s\n" +++ "\n", +++ data[2], +++ data[2] & RX_CNTRL1_RX_EN ? "yes" : "no", +++ data[2] & RX_CNTRL1_PADSTRIP_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_CRC_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_PAUSE_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_LOOP_EN ? "enabled" : "disabled", +++ data[2] & RX_CNTRL1_ADDR_FLTR_EN ? "disabled" : "enabled", +++ data[2] & RX_CNTRL1_RX_RUNT_EN ? "forward" : "discard", +++ data[2] & RX_CNTRL1_BCAST_DIS ? "disabled" : "enabled" +++ ); +++ fprintf(stdout, +++ "Core control: 0x%02x\n" +++ " Core state: %s\n" +++ " RX fifo: %s\n" +++ " TX fifo: %s\n" +++ " Send jam: %s\n" +++ " MDC clock %s\n" +++ "\n", +++ data[32], +++ data[32] & CORE_RESET ? "reset" : "normal operation", +++ data[32] & CORE_RX_FIFO_FLUSH ? "flush" : "ok", +++ data[32] & CORE_TX_FIFO_FLUSH ? "flush" : "ok", +++ data[32] & CORE_SEND_JAM ? "yes" : "no", +++ data[32] & CORE_MDC_EN ? "output" : "input" +++ ); +++ fprintf(stdout, +++ "MAC addresses: \n" +++ " Multicast mask: " MAC "\n" +++ " Multicast address: " MAC "\n" +++ " Unicast address: " MAC "\n" +++ "\n", +++ MAC_DATA(data+13), MAC_DATA(data+19), MAC_DATA(data+26) +++ ); +++ fprintf(stdout, +++ "Random seed: 0x%02x\n" +++ "Threshold empty: %3d\n" +++ "Threshold full: %3d\n" +++ "TX buffer size: %3d\n" +++ "TX deferral: %3d\n" +++ "RX deferral: %3d\n" +++ "TX two deferral 1: %3d\n" +++ "TX two deferral 2: %3d\n" +++ "Slot time: %3d\n" +++ "Internal clock: %3d\n" +++ "\n", +++ data[4], data[5], data[6], data[7], data[8], data[9], +++ data[10], data[11], data[12], data[25] +++ ); +++ +++ return 0; +++} +diff --git a/feeds/packages/net/ettercap/.svn/entries b/feeds/packages/net/ettercap/.svn/entries +new file mode 100644 +index 0000000..b7c87db +--- /dev/null ++++ b/feeds/packages/net/ettercap/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ettercap ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++09dbecf9e5e370d3d913a5c5fcf86029 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2163 ++ +diff --git a/feeds/packages/net/ettercap/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/ettercap/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/ettercap/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ettercap/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ettercap/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9b21045 +--- /dev/null ++++ b/feeds/packages/net/ettercap/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=ettercap ++PKG_VERSION:=NG-0.7.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ettercap ++PKG_MD5SUM:=28fb15cd024162c55249888fe1b97820 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/ettercap ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libnet1 +libopenssl +libpcre +libncurses +libltdl +libpthread +zlib ++ TITLE:=Ettercap is a suite for man in the middle attacks on LAN. ++ URL:=http://ettercap.sourceforge.net ++endef ++ ++define Package/ettercap/description ++ It features sniffing of live connections, content filtering on the fly ++ and many other interesting tricks. ++ It supports active and passive dissection of many protocols (even ++ ciphered ones) and includes many feature for network and host analysis. ++endef ++ ++define Package/ettercap/conffiles ++/etc/etter.conf ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ # remove default optimization flags set by configure ++ $(SED) 's,DEBUG_FLAGS=.*,DEBUG_FLAGS=,g' $(PKG_BUILD_DIR)/configure ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-libpcre="$(STAGING_DIR)/usr" \ ++ --with-iconv="$(ICONV_PREFIX)" \ ++ --with-libncurses="$(STAGING_DIR)/usr" \ ++ --disable-gtk \ ++ --disable-debug \ ++ --enable-plugins ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Package/ettercap/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/etter.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/etter{cap,filter,log} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/ettercap ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ettercap/*.so $(1)/usr/lib/ettercap/ ++ $(INSTALL_DIR) $(1)/usr/share/ettercap ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ettercap/* $(1)/usr/share/ettercap/ ++endef ++ ++$(eval $(call BuildPackage,ettercap)) +diff --git a/feeds/packages/net/ettercap/Makefile b/feeds/packages/net/ettercap/Makefile +new file mode 100644 +index 0000000..9b21045 +--- /dev/null ++++ b/feeds/packages/net/ettercap/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=ettercap ++PKG_VERSION:=NG-0.7.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ettercap ++PKG_MD5SUM:=28fb15cd024162c55249888fe1b97820 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/ettercap ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libnet1 +libopenssl +libpcre +libncurses +libltdl +libpthread +zlib ++ TITLE:=Ettercap is a suite for man in the middle attacks on LAN. ++ URL:=http://ettercap.sourceforge.net ++endef ++ ++define Package/ettercap/description ++ It features sniffing of live connections, content filtering on the fly ++ and many other interesting tricks. ++ It supports active and passive dissection of many protocols (even ++ ciphered ones) and includes many feature for network and host analysis. ++endef ++ ++define Package/ettercap/conffiles ++/etc/etter.conf ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ # remove default optimization flags set by configure ++ $(SED) 's,DEBUG_FLAGS=.*,DEBUG_FLAGS=,g' $(PKG_BUILD_DIR)/configure ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-libpcap="$(STAGING_DIR)/usr" \ ++ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-libpcre="$(STAGING_DIR)/usr" \ ++ --with-iconv="$(ICONV_PREFIX)" \ ++ --with-libncurses="$(STAGING_DIR)/usr" \ ++ --disable-gtk \ ++ --disable-debug \ ++ --enable-plugins ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" ++ ++define Package/ettercap/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/etter.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/etter{cap,filter,log} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/ettercap ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ettercap/*.so $(1)/usr/lib/ettercap/ ++ $(INSTALL_DIR) $(1)/usr/share/ettercap ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ettercap/* $(1)/usr/share/ettercap/ ++endef ++ ++$(eval $(call BuildPackage,ettercap)) +diff --git a/feeds/packages/net/ettercap/patches/.svn/entries b/feeds/packages/net/ettercap/patches/.svn/entries +new file mode 100644 +index 0000000..ad7b816 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ettercap/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T01:46:52.444134Z ++24575 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++003-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++02d2143808d14ca30f177d13863fcb13 ++2010-12-15T01:46:52.444134Z ++24575 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++946 ++ ++001-cross_compiling.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++51bafdae745610f3e02c08dea633cb94 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1058 ++ ++002-libnet_check_honor_ldflags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++3172c8e500f5a4a539021bc87b78c74b ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1022 ++ +diff --git a/feeds/packages/net/ettercap/patches/.svn/prop-base/001-cross_compiling.patch.svn-base b/feeds/packages/net/ettercap/patches/.svn/prop-base/001-cross_compiling.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/.svn/prop-base/001-cross_compiling.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ettercap/patches/.svn/prop-base/002-libnet_check_honor_ldflags.patch.svn-base b/feeds/packages/net/ettercap/patches/.svn/prop-base/002-libnet_check_honor_ldflags.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/.svn/prop-base/002-libnet_check_honor_ldflags.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ettercap/patches/.svn/text-base/001-cross_compiling.patch.svn-base b/feeds/packages/net/ettercap/patches/.svn/text-base/001-cross_compiling.patch.svn-base +new file mode 100644 +index 0000000..8c95397 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/.svn/text-base/001-cross_compiling.patch.svn-base +@@ -0,0 +1,23 @@ ++diff -urN ettercap-NG-0.7.3/configure ettercap-NG-0.7.3.new/configure ++--- ettercap-NG-0.7.3/configure 2005-05-27 17:11:45.000000000 +0200 +++++ ettercap-NG-0.7.3.new/configure 2006-08-21 20:15:07.000000000 +0200 ++@@ -27354,6 +27354,7 @@ ++ ++ echo "$as_me:$LINENO: checking for NS_GET32" >&5 ++ echo $ECHO_N "checking for NS_GET32... $ECHO_C" >&6 +++cross_compiling=no ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++diff -urN ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3.new/configure.in ++--- ettercap-NG-0.7.3/configure.in 2005-01-13 10:24:28.000000000 +0100 +++++ ettercap-NG-0.7.3.new/configure.in 2006-08-21 20:13:29.000000000 +0200 ++@@ -236,7 +236,7 @@ ++ AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h) ++ AC_CHECK_HEADERS(sys/cdefs.h) ++ dnl nameser NS_GET32 and so on... ++-EC_NS_GET() +++#EC_NS_GET() ++ ++ dnl ================================================================== ++ dnl Checks for typedefs, structures, and compiler characteristics. +diff --git a/feeds/packages/net/ettercap/patches/.svn/text-base/002-libnet_check_honor_ldflags.patch.svn-base b/feeds/packages/net/ettercap/patches/.svn/text-base/002-libnet_check_honor_ldflags.patch.svn-base +new file mode 100644 +index 0000000..55b00a7 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/.svn/text-base/002-libnet_check_honor_ldflags.patch.svn-base +@@ -0,0 +1,24 @@ ++diff -ruN ettercap-NG-0.7.3-old/configure ettercap-NG-0.7.3-new/configure ++--- ettercap-NG-0.7.3-old/configure 2006-10-03 18:24:09.000000000 +0200 +++++ ettercap-NG-0.7.3-new/configure 2006-10-03 18:28:57.000000000 +0200 ++@@ -31759,7 +31759,7 @@ ++ ++ OLDLDFLAGS="${LDFLAGS}" ++ OLDLIBS="${LIBS}" ++- LDFLAGS="$LNETLIB" +++ LDFLAGS="$LDFLAGS $LNETLIB" ++ LIBS="$LIBS" ++ ++ echo "$as_me:$LINENO: checking for libnet_adv_free_packet in -lnet" >&5 ++diff -ruN ettercap-NG-0.7.3-old/configure.in ettercap-NG-0.7.3-new/configure.in ++--- ettercap-NG-0.7.3-old/configure.in 2006-10-03 18:24:09.000000000 +0200 +++++ ettercap-NG-0.7.3-new/configure.in 2006-10-03 18:26:45.000000000 +0200 ++@@ -500,7 +500,7 @@ ++ ] ++ ) ++ ++-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) +++EC_CHECK_FUNC(net, libnet_adv_free_packet, $LDFLAGS $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) ++ ++ dnl ------------------ ++ dnl Checks for openssl +diff --git a/feeds/packages/net/ettercap/patches/.svn/text-base/003-automake-compat.patch.svn-base b/feeds/packages/net/ettercap/patches/.svn/text-base/003-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..eea45f2 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/.svn/text-base/003-automake-compat.patch.svn-base +@@ -0,0 +1,34 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -197,6 +197,9 @@ dnl ======================== ++ dnl Libtool related... ++ dnl ======================== ++ +++LT_INIT +++LTDL_INIT +++LT_CONFIG_LTDL_DIR([libltdl]) ++ AC_DISABLE_STATIC ++ AC_LIBTOOL_WIN32_DLL ++ AC_LIBTOOL_DLOPEN ++--- a/include/ec_os_mingw.h +++++ b/include/ec_os_mingw.h ++@@ -163,7 +163,7 @@ EC_API_EXTERN const char *ec_win_get_ec_ ++ */ ++ #if !defined(HAVE_DLOPEN) ++ #define RTLD_NOW 0 ++- #define LTDL_SHLIB_EXT "*.dll" +++ #define LT_MODULE_EXT ".dll" ++ ++ #define dlopen(dll,flg) ec_win_dlopen (dll, flg) ++ #define lt_dlopen(dll) ec_win_dlopen (dll, 0) ++--- a/src/ec_plugins.c +++++ b/src/ec_plugins.c ++@@ -131,7 +131,7 @@ int plugin_filter(struct dirent *d) ++ int plugin_filter(const struct dirent *d) ++ #endif ++ { ++- if ( match_pattern(d->d_name, PLUGIN_PATTERN LTDL_SHLIB_EXT) ) +++ if ( match_pattern(d->d_name, PLUGIN_PATTERN LT_MODULE_EXT) ) ++ return 1; ++ ++ return 0; +diff --git a/feeds/packages/net/ettercap/patches/001-cross_compiling.patch b/feeds/packages/net/ettercap/patches/001-cross_compiling.patch +new file mode 100644 +index 0000000..8c95397 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/001-cross_compiling.patch +@@ -0,0 +1,23 @@ ++diff -urN ettercap-NG-0.7.3/configure ettercap-NG-0.7.3.new/configure ++--- ettercap-NG-0.7.3/configure 2005-05-27 17:11:45.000000000 +0200 +++++ ettercap-NG-0.7.3.new/configure 2006-08-21 20:15:07.000000000 +0200 ++@@ -27354,6 +27354,7 @@ ++ ++ echo "$as_me:$LINENO: checking for NS_GET32" >&5 ++ echo $ECHO_N "checking for NS_GET32... $ECHO_C" >&6 +++cross_compiling=no ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++diff -urN ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3.new/configure.in ++--- ettercap-NG-0.7.3/configure.in 2005-01-13 10:24:28.000000000 +0100 +++++ ettercap-NG-0.7.3.new/configure.in 2006-08-21 20:13:29.000000000 +0200 ++@@ -236,7 +236,7 @@ ++ AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h) ++ AC_CHECK_HEADERS(sys/cdefs.h) ++ dnl nameser NS_GET32 and so on... ++-EC_NS_GET() +++#EC_NS_GET() ++ ++ dnl ================================================================== ++ dnl Checks for typedefs, structures, and compiler characteristics. +diff --git a/feeds/packages/net/ettercap/patches/002-libnet_check_honor_ldflags.patch b/feeds/packages/net/ettercap/patches/002-libnet_check_honor_ldflags.patch +new file mode 100644 +index 0000000..55b00a7 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/002-libnet_check_honor_ldflags.patch +@@ -0,0 +1,24 @@ ++diff -ruN ettercap-NG-0.7.3-old/configure ettercap-NG-0.7.3-new/configure ++--- ettercap-NG-0.7.3-old/configure 2006-10-03 18:24:09.000000000 +0200 +++++ ettercap-NG-0.7.3-new/configure 2006-10-03 18:28:57.000000000 +0200 ++@@ -31759,7 +31759,7 @@ ++ ++ OLDLDFLAGS="${LDFLAGS}" ++ OLDLIBS="${LIBS}" ++- LDFLAGS="$LNETLIB" +++ LDFLAGS="$LDFLAGS $LNETLIB" ++ LIBS="$LIBS" ++ ++ echo "$as_me:$LINENO: checking for libnet_adv_free_packet in -lnet" >&5 ++diff -ruN ettercap-NG-0.7.3-old/configure.in ettercap-NG-0.7.3-new/configure.in ++--- ettercap-NG-0.7.3-old/configure.in 2006-10-03 18:24:09.000000000 +0200 +++++ ettercap-NG-0.7.3-new/configure.in 2006-10-03 18:26:45.000000000 +0200 ++@@ -500,7 +500,7 @@ ++ ] ++ ) ++ ++-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) +++EC_CHECK_FUNC(net, libnet_adv_free_packet, $LDFLAGS $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) ++ ++ dnl ------------------ ++ dnl Checks for openssl +diff --git a/feeds/packages/net/ettercap/patches/003-automake-compat.patch b/feeds/packages/net/ettercap/patches/003-automake-compat.patch +new file mode 100644 +index 0000000..eea45f2 +--- /dev/null ++++ b/feeds/packages/net/ettercap/patches/003-automake-compat.patch +@@ -0,0 +1,34 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -197,6 +197,9 @@ dnl ======================== ++ dnl Libtool related... ++ dnl ======================== ++ +++LT_INIT +++LTDL_INIT +++LT_CONFIG_LTDL_DIR([libltdl]) ++ AC_DISABLE_STATIC ++ AC_LIBTOOL_WIN32_DLL ++ AC_LIBTOOL_DLOPEN ++--- a/include/ec_os_mingw.h +++++ b/include/ec_os_mingw.h ++@@ -163,7 +163,7 @@ EC_API_EXTERN const char *ec_win_get_ec_ ++ */ ++ #if !defined(HAVE_DLOPEN) ++ #define RTLD_NOW 0 ++- #define LTDL_SHLIB_EXT "*.dll" +++ #define LT_MODULE_EXT ".dll" ++ ++ #define dlopen(dll,flg) ec_win_dlopen (dll, flg) ++ #define lt_dlopen(dll) ec_win_dlopen (dll, 0) ++--- a/src/ec_plugins.c +++++ b/src/ec_plugins.c ++@@ -131,7 +131,7 @@ int plugin_filter(struct dirent *d) ++ int plugin_filter(const struct dirent *d) ++ #endif ++ { ++- if ( match_pattern(d->d_name, PLUGIN_PATTERN LTDL_SHLIB_EXT) ) +++ if ( match_pattern(d->d_name, PLUGIN_PATTERN LT_MODULE_EXT) ) ++ return 1; ++ ++ return 0; +diff --git a/feeds/packages/net/ez-ipupdate/.svn/entries b/feeds/packages/net/ez-ipupdate/.svn/entries +new file mode 100644 +index 0000000..525e312 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ez-ipupdate ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-02T12:01:33.268743Z ++34057 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++6e1ec8a63f851478ae66f5213fffef0f ++2012-11-02T12:01:33.268743Z ++34057 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1213 ++ +diff --git a/feeds/packages/net/ez-ipupdate/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/ez-ipupdate/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ez-ipupdate/.svn/text-base/Makefile.svn-base b/feeds/packages/net/ez-ipupdate/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..795dc1c +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=ez-ipupdate ++PKG_VERSION:=3.0.11b8 ++PKG_RELEASE:=8 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \ ++ http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate ++PKG_MD5SUM:=000211add4c4845ffa4211841bff4fb0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ez-ipupdate ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=Dynamic DNS services client ++ URL:=http://ez-ipupdate.com/ ++endef ++ ++# uses GNU configure ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/ez-ipupdate/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ez-ipupdate $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config/ ++ $(INSTALL_CONF) ./files/ez-ipupdate.config $(1)/etc/config/ddns ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_BIN) ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/30-ez-ipupdate ++endef ++ ++define Package/ez-ipupdate/conffiles ++/etc/config/ddns ++endef ++ ++$(eval $(call BuildPackage,ez-ipupdate)) +diff --git a/feeds/packages/net/ez-ipupdate/Makefile b/feeds/packages/net/ez-ipupdate/Makefile +new file mode 100644 +index 0000000..795dc1c +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=ez-ipupdate ++PKG_VERSION:=3.0.11b8 ++PKG_RELEASE:=8 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \ ++ http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate ++PKG_MD5SUM:=000211add4c4845ffa4211841bff4fb0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ez-ipupdate ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=IP Addresses and Names ++ TITLE:=Dynamic DNS services client ++ URL:=http://ez-ipupdate.com/ ++endef ++ ++# uses GNU configure ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/ez-ipupdate/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ez-ipupdate $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config/ ++ $(INSTALL_CONF) ./files/ez-ipupdate.config $(1)/etc/config/ddns ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_BIN) ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/30-ez-ipupdate ++endef ++ ++define Package/ez-ipupdate/conffiles ++/etc/config/ddns ++endef ++ ++$(eval $(call BuildPackage,ez-ipupdate)) +diff --git a/feeds/packages/net/ez-ipupdate/files/.svn/entries b/feeds/packages/net/ez-ipupdate/files/.svn/entries +new file mode 100644 +index 0000000..a1b959d +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ez-ipupdate/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T15:08:19.611766Z ++31944 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ez-ipupdate.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++d15aac9997809707cd601ab023cb74e0 ++2012-05-28T15:08:19.611766Z ++31944 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1660 ++ ++ez-ipupdate.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++c04dccfd60e22c91e0d2a7b4f5a34306 ++2007-05-10T10:38:53.347939Z ++7164 ++mbm ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++257 ++ ++ez-ipupdate.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++c4c980d76878ce07b92fa0544006f231 ++2008-06-06T07:56:31.162717Z ++11373 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++360 ++ +diff --git a/feeds/packages/net/ez-ipupdate/files/.svn/prop-base/ez-ipupdate.hotplug.svn-base b/feeds/packages/net/ez-ipupdate/files/.svn/prop-base/ez-ipupdate.hotplug.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/.svn/prop-base/ez-ipupdate.hotplug.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ez-ipupdate/files/.svn/prop-base/ez-ipupdate.init.svn-base b/feeds/packages/net/ez-ipupdate/files/.svn/prop-base/ez-ipupdate.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/.svn/prop-base/ez-ipupdate.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.config.svn-base b/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.config.svn-base +new file mode 100644 +index 0000000..bc9ee6f +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.config.svn-base +@@ -0,0 +1,14 @@ ++ ++config ddns ++ option enabled 0 ++ option interface wan ++ option program ez-ipupdate ++ option service zoneedit ++ option username myname ++ option password mypassword ++ option hostname mydomain.com ++ ++# config ddns ++# option interface wan ++# option program ez-ipupdate ++# option config /etc/ez-ipupdate.conf +diff --git a/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.hotplug.svn-base b/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.hotplug.svn-base +new file mode 100644 +index 0000000..3359c6a +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.hotplug.svn-base +@@ -0,0 +1,81 @@ ++NAME=ez-ipupdate ++COMMAND=/usr/sbin/$NAME ++ ++case "$ACTION" in ++ ifup|ifdown) ++ cleanup() { ++ [ -e $1 ] && { ++ kill -9 $(cat $1) ++ rm $1 ++ } ++ } ++ ++ ddns() { ++ local cfg="$1" ++ config_get program $cfg program ++ [ "$program" = "$NAME" ] && { ++ config_get interface $cfg interface ++ [ "$interface" = "$INTERFACE" ] && { ++ network_get_device dev "$INTERFACE" || return ++ ++ config_get enabled $cfg enabled ++ enabled=${enabled:-1} ++ ++ config_get service $cfg service ++ ++ config_get pidfile $cfg pidfile ++ pidfile=${pidfile:-/var/run/$NAME-$service-$dev.pid} ++ ++ case "$ACTION" in ++ ifdown) ++ cleanup $pidfile ++ ;; ++ *) ++ case "$enabled" in ++ 1|yes|true) ++ [ ! -e $pidfile ] && { ++ config_get cache $cfg cache ++ [ -z "$cache" ] && cache=/tmp/$NAME-$service-$dev.cache ++ ++ config_get config $cfg config ++ [ -z "$config" ] && { ++ config=/var/run/$NAME-$service-$dev.conf ++ config_get username $cfg username ++ config_get password $cfg password ++ config_get hostname $cfg hostname ++ service=${service:-"dyndns"} ++ config_get server $cfg server ++ server_line="" ++ [ -n "$server" ] && { ++ server_line="server=$server" ++ } ++ cat > $config <&1 | logger -t $NAME & ++ } ++ ;; ++ *) ++ cleanup $pidfile ++ ;; ++ esac ++ esac ++ } ++ } ++ } ++ ++ . /lib/functions/network.sh ++ ++ config_load ddns ++ config_foreach ddns ddns ++ ;; ++esac +diff --git a/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.init.svn-base b/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.init.svn-base +new file mode 100644 +index 0000000..0cea301 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/.svn/text-base/ez-ipupdate.init.svn-base +@@ -0,0 +1,18 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++BIN=ez-ipupdate ++CONF=/etc/$BIN.conf ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ [ -f $CONF ] || exit ++ mkdir -p $RUN_D ++ $BIN -c $CONF ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} +diff --git a/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.config b/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.config +new file mode 100644 +index 0000000..bc9ee6f +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.config +@@ -0,0 +1,14 @@ ++ ++config ddns ++ option enabled 0 ++ option interface wan ++ option program ez-ipupdate ++ option service zoneedit ++ option username myname ++ option password mypassword ++ option hostname mydomain.com ++ ++# config ddns ++# option interface wan ++# option program ez-ipupdate ++# option config /etc/ez-ipupdate.conf +diff --git a/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.hotplug b/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.hotplug +new file mode 100644 +index 0000000..3359c6a +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.hotplug +@@ -0,0 +1,81 @@ ++NAME=ez-ipupdate ++COMMAND=/usr/sbin/$NAME ++ ++case "$ACTION" in ++ ifup|ifdown) ++ cleanup() { ++ [ -e $1 ] && { ++ kill -9 $(cat $1) ++ rm $1 ++ } ++ } ++ ++ ddns() { ++ local cfg="$1" ++ config_get program $cfg program ++ [ "$program" = "$NAME" ] && { ++ config_get interface $cfg interface ++ [ "$interface" = "$INTERFACE" ] && { ++ network_get_device dev "$INTERFACE" || return ++ ++ config_get enabled $cfg enabled ++ enabled=${enabled:-1} ++ ++ config_get service $cfg service ++ ++ config_get pidfile $cfg pidfile ++ pidfile=${pidfile:-/var/run/$NAME-$service-$dev.pid} ++ ++ case "$ACTION" in ++ ifdown) ++ cleanup $pidfile ++ ;; ++ *) ++ case "$enabled" in ++ 1|yes|true) ++ [ ! -e $pidfile ] && { ++ config_get cache $cfg cache ++ [ -z "$cache" ] && cache=/tmp/$NAME-$service-$dev.cache ++ ++ config_get config $cfg config ++ [ -z "$config" ] && { ++ config=/var/run/$NAME-$service-$dev.conf ++ config_get username $cfg username ++ config_get password $cfg password ++ config_get hostname $cfg hostname ++ service=${service:-"dyndns"} ++ config_get server $cfg server ++ server_line="" ++ [ -n "$server" ] && { ++ server_line="server=$server" ++ } ++ cat > $config <&1 | logger -t $NAME & ++ } ++ ;; ++ *) ++ cleanup $pidfile ++ ;; ++ esac ++ esac ++ } ++ } ++ } ++ ++ . /lib/functions/network.sh ++ ++ config_load ddns ++ config_foreach ddns ddns ++ ;; ++esac +diff --git a/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.init b/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.init +new file mode 100644 +index 0000000..0cea301 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/files/ez-ipupdate.init +@@ -0,0 +1,18 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++BIN=ez-ipupdate ++CONF=/etc/$BIN.conf ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ [ -f $CONF ] || exit ++ mkdir -p $RUN_D ++ $BIN -c $CONF ++} ++ ++stop() { ++ [ -f $PID_F ] && kill $(cat $PID_F) ++} +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/entries b/feeds/packages/net/ez-ipupdate/patches/.svn/entries +new file mode 100644 +index 0000000..85a7db0 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/ez-ipupdate/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-02T12:01:33.268743Z ++34057 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++004-zoneedit.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++ecfd7fb307b6c8c223bb80626bf56f48 ++2009-03-29T20:48:55.934000Z ++15073 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++362 ++ ++001-debian_subset.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++50789ddbaf16203115be4cb868e5eb44 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++18973 ++ ++002-ez_ipupdate_everydns.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++a33765957fd9c6fb569a510864def471 ++2009-03-29T20:48:55.934000Z ++15073 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5143 ++ ++005-endian-detection.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++bf7aea11135067bdc8e3938bb9dce85b ++2012-11-02T12:01:33.268743Z ++34057 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++207 ++ ++003-dnsexit.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++22e47de03935ec44b8670ed475c09052 ++2009-03-29T20:48:55.934000Z ++15073 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6842 ++ +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/prop-base/001-debian_subset.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/prop-base/001-debian_subset.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/prop-base/001-debian_subset.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/prop-base/002-ez_ipupdate_everydns.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/prop-base/002-ez_ipupdate_everydns.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/prop-base/002-ez_ipupdate_everydns.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/001-debian_subset.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/001-debian_subset.patch.svn-base +new file mode 100644 +index 0000000..c24b3ea +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/001-debian_subset.patch.svn-base +@@ -0,0 +1,568 @@ ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c ++@@ -139,6 +139,9 @@ ++ #if HAVE_SIGNAL_H ++ # include ++ #endif +++#if HAVE_TIME_H +++# include +++#endif ++ #if HAVE_SYS_TIME_H ++ # include ++ #endif ++@@ -165,7 +168,7 @@ ++ #endif ++ ++ ++-#if __linux__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__ +++#if __GLIBC__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__ ++ # define IF_LOOKUP 1 ++ # include ++ # include ++@@ -640,7 +643,7 @@ ++ fprintf(stdout, " -q, --quiet \t\t\tbe quiet\n"); ++ fprintf(stdout, " -r, --retrys \t\tnumber of trys (default: 1)\n"); ++ fprintf(stdout, " -R, --run-as-user \tchange to for running, be ware\n\t\t\t\tthat this can cause problems with handeling\n\t\t\t\tSIGHUP properly if that user can't read the\n\t\t\t\tconfig file. also it can't write it's pid file \n\t\t\t\tto a root directory\n"); ++- fprintf(stdout, " -Q, --run-as-euser \tchange to effective for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files.\n"); +++ fprintf(stdout, " -Q, --run-as-euser \tchange to effective for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files\n"); ++ fprintf(stdout, " -s, --server \tthe server to connect to\n"); ++ fprintf(stdout, " -S, --service-type \tthe type of service that you are using\n"); ++ width = fprintf(stdout, "\t\t\t\ttry one of: ") + 4*7; ++@@ -682,7 +685,7 @@ ++ ++ void print_signalhelp( void ) ++ { ++- fprintf(stdout, "\nsignals are only really used when in daemon mode.\n\n"); +++ fprintf(stdout, "\nsignals are only really used when in daemon mode\n\n"); ++ fprintf(stdout, "signals: \n"); ++ fprintf(stdout, " HUP\t\tcauses it to re-read its config file\n"); ++ fprintf(stdout, " TERM\t\twake up and possibly perform an update\n"); ++@@ -693,7 +696,7 @@ ++ #if HAVE_SIGNAL_H ++ RETSIGTYPE sigint_handler(int sig) ++ { ++- char message[] = "interupted.\n"; +++ char message[] = "interrupted\n"; ++ close(client_sockfd); ++ write(2, message, sizeof(message)-1); ++ ++@@ -704,6 +707,10 @@ ++ } ++ #endif ++ +++#if HAVE_SYSLOG_H +++ closelog(); +++#endif +++ ++ exit(1); ++ } ++ RETSIGTYPE generic_sig_handler(int sig) ++@@ -798,7 +805,7 @@ ++ sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); ++ #endif ++ ++- syslog(LOG_NOTICE, buf); +++ syslog(LOG_NOTICE, "%s", buf); ++ } ++ else ++ { ++@@ -1439,7 +1446,7 @@ ++ if(!(options & OPT_QUIET)) ++ { ++ fprintf(stderr, ++- "connected to %s (%s) on port %d.\n", +++ "connected to %s (%s) on port %d\n", ++ host, ++ inet_ntoa(address.sin_addr), ++ ntohs(address.sin_port)); ++@@ -1683,7 +1690,7 @@ ++ close(client_sockfd); ++ return(-1); ++ } ++- if(strstr(buf, "\r\n") > 0) +++ if(strstr(buf, "\n") != NULL) ++ { ++ break; ++ } ++@@ -1702,8 +1709,8 @@ ++ ++ if(options & OPT_DAEMON) ++ { ++- fprintf(stderr, "no compile time default service was set therefor you must " ++- "specify a service type.\n"); +++ fprintf(stderr, "no compile time default service was set, you must " +++ "specify a service type\n"); ++ ++ return(-1); ++ } ++@@ -2039,7 +2046,7 @@ ++ } ++ else if(strstr(buf, "\nnumhost") != NULL) ++ { ++- show_message("Too many or too few hosts found\n"); +++ show_message("too many or too few hosts found\n"); ++ retval = UPDATERES_SHUTDOWN; ++ } ++ else if(strstr(buf, "\ndnserr") != NULL) ++@@ -2051,17 +2058,17 @@ ++ } ++ else if(strstr(buf, "\n911") != NULL) ++ { ++- show_message("Ahhhh! call 911!\n"); +++ show_message("ahhhh! call 911!\n"); ++ retval = UPDATERES_SHUTDOWN; ++ } ++ else if(strstr(buf, "\n999") != NULL) ++ { ++- show_message("Ahhhh! call 999!\n"); +++ show_message("ahhhh! call 999!\n"); ++ retval = UPDATERES_SHUTDOWN; ++ } ++ else if(strstr(buf, "\n!donator") != NULL) ++ { ++- show_message("a feature requested is only available to donators, please donate.\n", host); +++ show_message("a feature requested is only available to donators, please donate\n", host); ++ retval = UPDATERES_OK; ++ } ++ // this one should be last as it is a stupid string to signify waits ++@@ -2095,9 +2102,9 @@ ++ sprintf(reason, "problem parsing reason for wait response"); ++ } ++ ++- show_message("Wait response received, waiting for %s before next update.\n", +++ show_message("wait response received, waiting for %s before next update\n", ++ format_time(howlong)); ++- show_message("Wait response reason: %d\n", N_STR(reason)); +++ show_message("wait response reason: %d\n", N_STR(reason)); ++ sleep(howlong); ++ retval = UPDATERES_ERROR; ++ } ++@@ -3370,7 +3377,7 @@ ++ { ++ if(!(options & OPT_QUIET)) ++ { ++- fprintf(stderr, "warning: for GNUDIP the \"address\" parpameter is only used if set to \"0.0.0.0\" thus making an offline request.\n"); +++ fprintf(stderr, "warning: for GNUDIP the \"address\" parameter is only used if set to \"0.0.0.0\" thus making an offline request\n"); ++ } ++ } ++ ++@@ -3392,7 +3399,7 @@ ++ ++ // send an offline request if address 0.0.0.0 is used ++ // otherwise, we ignore the address and send an update request ++- gnudip_request[0] = strcmp(address, "0.0.0.0") == 0 ? '1' : '0'; +++ gnudip_request[0] = address && strcmp(address, "0.0.0.0") == 0 ? '1' : '0'; ++ gnudip_request[1] = '\0'; ++ ++ // find domainname ++@@ -3943,22 +3950,22 @@ ++ break; ++ ++ case 201: ++- show_message("Last update was less than %d seconds ago.\n", 300); +++ show_message("last update was less than %d seconds ago\n", 300); ++ return(UPDATERES_ERROR); ++ break; ++ ++ case 202: ++- show_message("Server error.\n"); +++ show_message("server error\n"); ++ return(UPDATERES_ERROR); ++ break; ++ ++ case 203: ++- show_message("Failure because account is frozen (by admin).\n"); +++ show_message("failure because account is frozen (by admin)\n"); ++ return(UPDATERES_SHUTDOWN); ++ break; ++ ++ case 204: ++- show_message("Failure because account is locked (by user).\n"); +++ show_message("failure because account is locked (by user)\n"); ++ return(UPDATERES_SHUTDOWN); ++ break; ++ ++@@ -4215,8 +4222,6 @@ ++ ++ switch(ret) ++ { ++- char *p; ++- ++ case -1: ++ if(!(options & OPT_QUIET)) ++ { ++@@ -4349,7 +4354,7 @@ ++ case SIGHUP: ++ if(config_file) ++ { ++- show_message("SIGHUP recieved, re-reading config file\n"); +++ show_message("SIGHUP received, re-reading config file\n"); ++ if(parse_conf_file(config_file, conf_commands) != 0) ++ { ++ show_message("error parsing config file \"%s\"\n", config_file); ++@@ -4384,6 +4389,7 @@ ++ ++ int main(int argc, char **argv) ++ { +++ char *tmp; ++ int ifresolve_warned = 0; ++ int i; ++ int retval = 1; ++@@ -4395,9 +4401,10 @@ ++ mcheck(NULL); ++ #endif ++ ++- dprintf((stderr, "staring...\n")); +++ dprintf((stderr, "starting...\n")); ++ ++- program_name = argv[0]; +++ tmp = strrchr(argv[0], '/'); +++ program_name = tmp ? tmp + 1 : argv[0]; ++ options = 0; ++ *user = '\0'; ++ timeout.tv_sec = DEFAULT_TIMEOUT; ++@@ -4417,7 +4424,7 @@ ++ ++ if(!(options & OPT_QUIET) && !(options & OPT_DAEMON)) ++ { ++- fprintf(stderr, "ez-ipupdate Version %s\nCopyright (C) 1998-2001 Angus Mackay.\n", VERSION); +++ fprintf(stderr, "%s Version %s\nCopyright (C) 1998-2001 Angus Mackay\n", program_name, VERSION); ++ } ++ ++ dprintf((stderr, "options: 0x%04X\n", options)); ++@@ -4434,7 +4441,7 @@ ++ { ++ if(service->check_info() != 0) ++ { ++- fprintf(stderr, "invalid data to perform requested action.\n"); +++ fprintf(stderr, "invalid data to perform requested action\n"); ++ exit(1); ++ } ++ } ++@@ -4456,13 +4463,13 @@ ++ dprintf((stderr, "user_name: %s\n", user_name)); ++ dprintf((stderr, "password: %s\n", password)); ++ } ++- if(*user_name == '\0') +++ if(*user_name == '\0' && !(options & OPT_DAEMON)) ++ { ++ printf("user name: "); ++ fgets(user_name, sizeof(user_name), stdin); ++ chomp(user_name); ++ } ++- if(*password == '\0') +++ if(*password == '\0' && !(options & OPT_DAEMON)) ++ { ++ strncpy(password, getpass("password: "), sizeof(password)); ++ } ++@@ -4480,7 +4487,7 @@ ++ ++ if(service->check_info() != 0) ++ { ++- fprintf(stderr, "invalid data to perform requested action.\n"); +++ fprintf(stderr, "invalid data to perform requested action\n"); ++ exit(1); ++ } ++ ++@@ -4503,7 +4510,7 @@ ++ ++ if(interface == NULL) ++ { ++- fprintf(stderr, "invalid data to perform requested action.\n"); +++ fprintf(stderr, "invalid data to perform requested action\n"); ++ fprintf(stderr, "you must provide an interface for daemon mode"); ++ exit(1); ++ } ++@@ -4519,23 +4526,25 @@ ++ if(fork() > 0) { exit(0); } /* parent */ ++ } ++ +++# if HAVE_SYSLOG_H +++ openlog(program_name, LOG_PID, LOG_DAEMON ); +++ //options |= OPT_QUIET; +++# endif +++ show_message("version %s, interface %s, host %s, server %s, service %s\n", +++ VERSION, N_STR(interface), N_STR(host), server, service->title); +++ ++ #if HAVE_GETPID ++ if(pid_file && pid_file_create(pid_file) != 0) ++ { ++- fprintf(stderr, "exiting...\n"); +++ show_message("could not create pid file %s (%s), exiting\n", +++ pid_file, strerror(errno)); +++#if HAVE_SYSLOG_H +++ closelog(); +++#endif ++ exit(1); ++ } ++ #endif ++ ++-# if HAVE_SYSLOG_H ++- openlog(program_name, LOG_PID, LOG_USER ); ++- options |= OPT_QUIET; ++-# endif ++- show_message("ez-ipupdate Version %s, Copyright (C) 1998-2001 Angus Mackay.\n", ++- VERSION); ++- show_message("%s started for interface %s host %s using server %s and service %s\n", ++- program_name, N_STR(interface), N_STR(host), server, service->title); ++- ++ memset(&sin, 0, sizeof(sin)); ++ ++ if(cache_file) ++@@ -4560,7 +4569,7 @@ ++ strftime(timebuf, sizeof(timebuf), "%Y/%m/%d %H:%M", ts); ++ show_message("got last update %s on %s from cache file\n", ipstr, timebuf); ++ } ++- else +++ else if(ipstr||ipdate) ++ { ++ show_message("malformed cache file: %s\n", cache_file); ++ } ++@@ -4647,7 +4656,7 @@ ++ } ++ else ++ { ++- show_message("failure to update %s->%s (%s)\n", +++ show_message("failed to update %s->%s (%s)\n", ++ interface, inet_ntoa(sin.sin_addr), N_STR(host)); ++ memset(&sin, 0, sizeof(sin)); ++ ++@@ -4671,7 +4680,7 @@ ++ dprintf((stderr, "updateres: %d\n", updateres)); ++ if(updateres == UPDATERES_SHUTDOWN) ++ { ++- show_message("shuting down updater for %s due to fatal error\n", +++ show_message("shutting down updater for %s due to fatal error\n", ++ N_STR(host)); ++ ++ if(notify_email && *notify_email != '\0') ++@@ -4711,7 +4720,7 @@ ++ #endif ++ ++ #else ++- fprintf(stderr, "sorry, this mode is only available on platforms that the "); +++ fprintf(stderr, "sorry, this mode is only available on platforms where the "); ++ fprintf(stderr, "IP address \ncan be determined. feel free to hack the code"); ++ fprintf(stderr, " though.\n"); ++ exit(1); ++@@ -4799,7 +4808,7 @@ ++ } ++ else ++ { ++- show_message("could not resolve ip address for %s.\n", interface); +++ show_message("could not resolve ip address for %s\n", interface); ++ exit(1); ++ } ++ close(sock); ++--- ez-ipupdate-3.0.11b8.orig/example.conf +++++ ez-ipupdate-3.0.11b8/example.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++--- ez-ipupdate-3.0.11b8.orig/example-pgpow.conf +++++ ez-ipupdate-3.0.11b8/example-pgpow.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.penguinpowered.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-dhs.conf +++++ ez-ipupdate-3.0.11b8/example-dhs.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.whatever.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-dyndns.conf +++++ ez-ipupdate-3.0.11b8/example-dyndns.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -12,14 +12,9 @@ ++ interface=eth1 ++ max-interval=2073600 ++ ++-# please create this file and ensure that the user that ez-ipupdate is running ++-# as has write permissions to it then uncomment this line, if you don't your ++-# dyndns account will probably get banned. if you run ez-ipupdate as root (bad ++-# idea, use "run-as-user") then you can just uncomment this line. ++-#cache-file=/etc/ez-ipupdate.cache.eth1 ++- ++-# for the mean time we'll just use a cache file in the temp directory ++-cache-file=/tmp/ez-ipupdate.cache +++# if you don't use a cache file your dyndns account will probably get banned. +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-ods.conf +++++ ez-ipupdate-3.0.11b8/example-ods.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.ods.org ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-tzo.conf +++++ ez-ipupdate-3.0.11b8/example-tzo.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -14,8 +14,8 @@ ++ max-interval=2073600 ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-gnudip.conf +++++ ez-ipupdate-3.0.11b8/example-gnudip.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -14,8 +14,8 @@ ++ # any other value is ignored ++ #address=0.0.0.0 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-easydns.conf +++++ ez-ipupdate-3.0.11b8/example-easydns.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.whatever.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-justlinux.conf +++++ ez-ipupdate-3.0.11b8/example-justlinux.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.penguinpowered.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-dyns.conf +++++ ez-ipupdate-3.0.11b8/example-dyns.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=myhost ++ #interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-#cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-heipv6tb.conf +++++ ez-ipupdate-3.0.11b8/example-heipv6tb.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -11,14 +11,9 @@ ++ interface=eth1 ++ max-interval=2073600 ++ ++-# please create this file and ensure that the user that ez-ipupdate is running ++-# as has write permissions to it then uncomment this line, if you don't your ++-# dyndns account will probably get banned. if you run ez-ipupdate as root (bad ++-# idea, use "run-as-user") then you can just uncomment this line. ++-#cache-file=/etc/ez-ipupdate.cache.eth1 ++- ++-# for the mean time we'll just use a cache file in the temp directory ++-cache-file=/tmp/ez-ipupdate.cache +++# if you don't use a cache file your account will probably get banned. +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/002-ez_ipupdate_everydns.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/002-ez_ipupdate_everydns.patch.svn-base +new file mode 100644 +index 0000000..74bce56 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/002-ez_ipupdate_everydns.patch.svn-base +@@ -0,0 +1,209 @@ ++diff -ur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c 2009-03-29 22:37:09.000000000 +0200 +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c 2009-03-29 22:37:20.000000000 +0200 ++@@ -103,6 +103,11 @@ ++ #define HEIPV6TB_DEFAULT_PORT "80" ++ #define HEIPV6TB_REQUEST "/index.cgi" ++ +++#define EVERYDNS_DEFAULT_SERVER "dyn.everydns.net" +++#define EVERYDNS_DEFAULT_PORT "80" +++#define EVERYDNS_REQUEST "/index.php" +++#define EVERYDNS_VERSION "0.1" +++ ++ #define DEFAULT_TIMEOUT 120 ++ #define DEFAULT_UPDATE_PERIOD 120 ++ #define DEFAULT_RESOLV_PERIOD 30 ++@@ -344,6 +349,10 @@ ++ int HEIPV6TB_check_info(void); ++ static char *HEIPV6TB_fields_used[] = { "server", "user", NULL }; ++ +++int EVERYDNS_update_entry(void); +++int EVERYDNS_check_info(void); +++static char *EVERYDNS_fields_used[] = { "server", "user", "host", "address", NULL }; +++ ++ struct service_t services[] = { ++ { "NULL", ++ { "null", "NULL", 0, }, ++@@ -517,6 +526,16 @@ ++ HEIPV6TB_DEFAULT_PORT, ++ HEIPV6TB_REQUEST ++ }, +++ { "everydns", +++ { "everydns", 0, 0, }, +++ NULL, +++ EVERYDNS_update_entry, +++ EVERYDNS_check_info, +++ EVERYDNS_fields_used, +++ EVERYDNS_DEFAULT_SERVER, +++ EVERYDNS_DEFAULT_PORT, +++ EVERYDNS_REQUEST +++ }, ++ }; ++ ++ static struct service_t *service = NULL; ++@@ -4251,6 +4270,165 @@ ++ return(UPDATERES_OK); ++ } ++ +++int EVERYDNS_check_info(void) +++{ +++ warn_fields(service->fields_used); +++ +++ return 0; +++} +++ +++int EVERYDNS_update_entry(void) +++{ +++ char buf[BUFFER_SIZE+1]; +++ char *bp = buf; +++ int bytes; +++ int btot; +++ int ret; +++ +++ buf[BUFFER_SIZE] = '\0'; +++ +++ if(do_connect((int*)&client_sockfd, server, port) != 0) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("error connecting to %s:%s\n", server, port); +++ } +++ return(UPDATERES_ERROR); +++ } +++ +++ snprintf(buf, BUFFER_SIZE, "GET %s?ver=%s&", request, EVERYDNS_VERSION); +++ output(buf); +++ if(address) +++ { +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "ip", address); +++ output(buf); +++ } +++ if((host != NULL) && (*host == '\0')) +++ { +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "domain", host); +++ output(buf); +++ } +++ snprintf(buf, BUFFER_SIZE, " HTTP/1.0\015\012"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Authorization: Basic %s\015\012", auth); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "User-Agent: %s-%s %s [%s] (%s)\015\012", +++ "ez-update", VERSION, OS, (options & OPT_DAEMON) ? "daemon" : "", "by Angus Mackay"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Host: %s\015\012", server); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "\015\012"); +++ output(buf); +++ +++ bp = buf; +++ bytes = 0; +++ btot = 0; +++ while((bytes=read_input(bp, BUFFER_SIZE-btot)) > 0) +++ { +++ bp += bytes; +++ btot += bytes; +++ dprintf((stderr, "btot: %d\n", btot)); +++ } +++ close(client_sockfd); +++ buf[btot] = '\0'; +++ +++ dprintf((stderr, "server output: %s\n", buf)); +++ +++ if(sscanf(buf, " HTTP/1.%*c %3d", &ret) != 1) +++ { +++ ret = -1; +++ } +++ +++ switch(ret) +++ { +++ char *p; +++ +++ case -1: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("strange server response, are you connecting to the right server?\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ case 200: +++ ret = -1; +++ if((p=strstr(buf, "Exit code: ")) != NULL) +++ { +++ sscanf(p, "Exit code: %d", &ret); +++ } +++ +++ /* +++ * 0 - Successfully Updated +++ */ +++ switch(ret) +++ { +++ case -1: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("strange server response, are you connecting to the right server?\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ case 0: +++ if(!(options & OPT_QUIET)) +++ { +++ printf("request successful\n"); +++ } +++ break; +++ +++ case 2: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("Bad Username/password\n"); +++ } +++ return(UPDATERES_SHUTDOWN); +++ break; +++ +++ case 5: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("Last update too recent, please wait...\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ default: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("unknown return code: %d\n", ret); +++ fprintf(stderr, "server response: %s\n", buf); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ } +++ break; +++ +++ case 401: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("authentication failure\n"); +++ } +++ return(UPDATERES_SHUTDOWN); +++ break; +++ +++ default: +++ if(!(options & OPT_QUIET)) +++ { +++ // reuse the auth buffer +++ *auth = '\0'; +++ sscanf(buf, " HTTP/1.%*c %*3d %255[^\r\n]", auth); +++ show_message("unknown return code: %d\n", ret); +++ fprintf(stderr, "server response: %s\n", auth); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ } +++ +++ return(UPDATERES_OK); +++} +++ ++ static int is_in_list(char *needle, char **haystack) ++ { ++ char **p; +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/003-dnsexit.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/003-dnsexit.patch.svn-base +new file mode 100644 +index 0000000..edfd61d +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/003-dnsexit.patch.svn-base +@@ -0,0 +1,263 @@ ++diff -Nur ez-ipupdate-3.0.11b8.orig/example-dnsexit.conf ez-ipupdate-3.0.11b8/example-dnsexit.conf ++--- ez-ipupdate-3.0.11b8.orig/example-dnsexit.conf 1970-01-01 01:00:00.000000000 +0100 +++++ ez-ipupdate-3.0.11b8/example-dnsexit.conf 2009-03-29 22:40:07.000000000 +0200 ++@@ -0,0 +1,20 @@ +++#!/usr/sbin/ez-ipupdate -c +++# +++# example config file for ez-ipupdate +++# +++# this file is actually executable! +++# +++ +++service-type=dnsexit +++user=loginname:password +++host=www.yourdomain.com +++interface=eth0 +++ +++# please ensure the user has permission to write this file +++cache-file=/tmp/ez-ipupdate.cache +++ +++run-as-user=ez-ipupd +++# uncomment this once you have everything working how you want and you are +++# ready to have ez-ipupdate running in the background all the time. to stop it +++# you can use "killall -QUIT ez-ipupdate" under linux. +++#daemon ++diff -Nur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c 2009-03-29 22:39:46.000000000 +0200 +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c 2009-03-29 22:40:07.000000000 +0200 ++@@ -108,6 +108,10 @@ ++ #define EVERYDNS_REQUEST "/index.php" ++ #define EVERYDNS_VERSION "0.1" ++ +++#define DNSEXIT_DEFAULT_SERVER "www.dnsexit.com" +++#define DNSEXIT_DEFAULT_PORT "80" +++#define DNSEXIT_REQUEST "/RemoteUpdate.sv" +++ ++ #define DEFAULT_TIMEOUT 120 ++ #define DEFAULT_UPDATE_PERIOD 120 ++ #define DEFAULT_RESOLV_PERIOD 30 ++@@ -353,6 +357,11 @@ ++ int EVERYDNS_check_info(void); ++ static char *EVERYDNS_fields_used[] = { "server", "user", "host", "address", NULL }; ++ +++int DNSEXIT_update_entry(void); +++int DNSEXIT_check_info(void); +++static char *DNSEXIT_fields_used[] = { "server", "user", "address", "wildcard", "mx", "host", NULL }; +++ +++ ++ struct service_t services[] = { ++ { "NULL", ++ { "null", "NULL", 0, }, ++@@ -536,6 +545,16 @@ ++ EVERYDNS_DEFAULT_PORT, ++ EVERYDNS_REQUEST ++ }, +++ { "dnsexit", +++ { "dnsexit", 0, 0, }, +++ NULL, +++ DNSEXIT_update_entry, +++ DNSEXIT_check_info, +++ DNSEXIT_fields_used, +++ DNSEXIT_DEFAULT_SERVER, +++ DNSEXIT_DEFAULT_PORT, +++ DNSEXIT_REQUEST +++ }, ++ }; ++ ++ static struct service_t *service = NULL; ++@@ -4429,6 +4448,195 @@ ++ return(UPDATERES_OK); ++ } ++ +++int DNSEXIT_check_info(void) +++{ +++ char buf[BUFSIZ+1]; +++ +++ if((host == NULL) || (*host == '\0')) +++ { +++ if(options & OPT_DAEMON) +++ { +++ return(-1); +++ } +++ if(host) { free(host); } +++ printf("host: "); +++ *buf = '\0'; +++ fgets(buf, BUFSIZ, stdin); +++ host = strdup(buf); +++ chomp(host); +++ } +++ +++ if(interface == NULL && address == NULL) +++ { +++ if(options & OPT_DAEMON) +++ { +++ fprintf(stderr, "you must provide either an interface or an address\n"); +++ return(-1); +++ } +++ if(interface) { free(interface); } +++ printf("interface: "); +++ *buf = '\0'; +++ fgets(buf, BUFSIZ, stdin); +++ chomp(buf); +++ option_handler(CMD_interface, buf); +++ } +++ +++ warn_fields(service->fields_used); +++ +++ return 0; +++} +++ +++int DNSEXIT_update_entry(void) +++{ +++ char buf[BUFFER_SIZE+1]; +++ char *bp = buf; +++ int bytes; +++ int btot; +++ int ret; +++ +++ buf[BUFFER_SIZE] = '\0'; +++ +++ if(do_connect((int*)&client_sockfd, server, port) != 0) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("error connecting to %s:%s\n", server, port); +++ } +++ return(UPDATERES_ERROR); +++ } +++ +++ snprintf(buf, BUFFER_SIZE, "GET %s?action=edit&", request); +++ output(buf); +++ if(address != NULL && *address != '\0') +++ { +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "myip", address); +++ output(buf); +++ } +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "wildcard", wildcard ? "ON" : "OFF"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "mx", mx); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "backmx", *mx == '\0' ? "NO" : "YES"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "host", host); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "login", user_name); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "password", password); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, " HTTP/1.0\015\012"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Authorization: Basic %s\015\012", auth); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "User-Agent: %s-%s %s [%s] (%s)\015\012", +++ "ez-update", VERSION, OS, (options & OPT_DAEMON) ? "daemon" : "", "by Angus Mackay"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Host: %s\015\012", server); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "\015\012"); +++ output(buf); +++ +++ bp = buf; +++ bytes = 0; +++ btot = 0; +++ while((bytes=read_input(bp, BUFFER_SIZE-btot)) > 0) +++ { +++ bp += bytes; +++ btot += bytes; +++ dprintf((stderr, "btot: %d\n", btot)); +++ } +++ close(client_sockfd); +++ buf[btot] = '\0'; +++ +++ dprintf((stderr, "server output: %s\n", buf)); +++ +++ if(sscanf(buf, " HTTP/1.%*c %3d", &ret) != 1) +++ { +++ ret = -1; +++ } +++ +++ switch(ret) +++ { +++ case -1: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("strange server response, are you connecting to the right server?\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ case 200: +++ +++ if(strstr(buf, "0=Success") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Request successful\n"); +++ } +++ } +++ else if(strstr(buf, "1=IP is the same as the IP on the system") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Request successful but the IP is the same as previous update\n"); +++ } +++ } +++ else if(strstr(buf, "2=Invalid passwords") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Invalid Password\n"); +++ } +++ } +++ else if(strstr(buf, "3=User not found") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Username not found\n"); +++ } +++ } +++ else if(strstr(buf, "4=Update too often") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Updatting too often\n"); +++ } +++ } +++ else +++ { +++ show_message("Errors return from server\n"); +++ if(!(options & OPT_QUIET)) +++ { +++ fprintf(stderr, "server output: %s\n", buf); +++ } +++ return(UPDATERES_ERROR); +++ } +++ break; +++ +++ case 401: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("authentication failure\n"); +++ } +++ return(UPDATERES_SHUTDOWN); +++ break; +++ +++ default: +++ if(!(options & OPT_QUIET)) +++ { +++ // reuse the auth buffer +++ *auth = '\0'; +++ sscanf(buf, " HTTP/1.%*c %*3d %255[^\r\n]", auth); +++ show_message("unknown return code: %d\n", ret); +++ show_message("server response: %s\n", auth); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ } +++ +++ return(UPDATERES_OK); +++} +++ ++ static int is_in_list(char *needle, char **haystack) ++ { ++ char **p; +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/004-zoneedit.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/004-zoneedit.patch.svn-base +new file mode 100644 +index 0000000..acc2b5f +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/004-zoneedit.patch.svn-base +@@ -0,0 +1,12 @@ ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c ++@@ -95,7 +95,7 @@ ++ #define HN_DEFAULT_PORT "80" ++ #define HN_REQUEST "/vanity/update" ++ ++-#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com" +++#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com" ++ #define ZONEEDIT_DEFAULT_PORT "80" ++ #define ZONEEDIT_REQUEST "/auth/dynamic.html" ++ ++ +diff --git a/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/005-endian-detection.patch.svn-base b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/005-endian-detection.patch.svn-base +new file mode 100644 +index 0000000..9efabc6 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/.svn/text-base/005-endian-detection.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/md5.c +++++ b/md5.c ++@@ -35,7 +35,7 @@ ++ ++ #include "md5.h" ++ ++-#ifdef _LIBC +++#if defined(_LIBC) || defined(__UCLIBC__) ++ # include ++ # if __BYTE_ORDER == __BIG_ENDIAN ++ # define WORDS_BIGENDIAN 1 +diff --git a/feeds/packages/net/ez-ipupdate/patches/001-debian_subset.patch b/feeds/packages/net/ez-ipupdate/patches/001-debian_subset.patch +new file mode 100644 +index 0000000..c24b3ea +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/001-debian_subset.patch +@@ -0,0 +1,568 @@ ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c ++@@ -139,6 +139,9 @@ ++ #if HAVE_SIGNAL_H ++ # include ++ #endif +++#if HAVE_TIME_H +++# include +++#endif ++ #if HAVE_SYS_TIME_H ++ # include ++ #endif ++@@ -165,7 +168,7 @@ ++ #endif ++ ++ ++-#if __linux__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__ +++#if __GLIBC__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__ ++ # define IF_LOOKUP 1 ++ # include ++ # include ++@@ -640,7 +643,7 @@ ++ fprintf(stdout, " -q, --quiet \t\t\tbe quiet\n"); ++ fprintf(stdout, " -r, --retrys \t\tnumber of trys (default: 1)\n"); ++ fprintf(stdout, " -R, --run-as-user \tchange to for running, be ware\n\t\t\t\tthat this can cause problems with handeling\n\t\t\t\tSIGHUP properly if that user can't read the\n\t\t\t\tconfig file. also it can't write it's pid file \n\t\t\t\tto a root directory\n"); ++- fprintf(stdout, " -Q, --run-as-euser \tchange to effective for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files.\n"); +++ fprintf(stdout, " -Q, --run-as-euser \tchange to effective for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files\n"); ++ fprintf(stdout, " -s, --server \tthe server to connect to\n"); ++ fprintf(stdout, " -S, --service-type \tthe type of service that you are using\n"); ++ width = fprintf(stdout, "\t\t\t\ttry one of: ") + 4*7; ++@@ -682,7 +685,7 @@ ++ ++ void print_signalhelp( void ) ++ { ++- fprintf(stdout, "\nsignals are only really used when in daemon mode.\n\n"); +++ fprintf(stdout, "\nsignals are only really used when in daemon mode\n\n"); ++ fprintf(stdout, "signals: \n"); ++ fprintf(stdout, " HUP\t\tcauses it to re-read its config file\n"); ++ fprintf(stdout, " TERM\t\twake up and possibly perform an update\n"); ++@@ -693,7 +696,7 @@ ++ #if HAVE_SIGNAL_H ++ RETSIGTYPE sigint_handler(int sig) ++ { ++- char message[] = "interupted.\n"; +++ char message[] = "interrupted\n"; ++ close(client_sockfd); ++ write(2, message, sizeof(message)-1); ++ ++@@ -704,6 +707,10 @@ ++ } ++ #endif ++ +++#if HAVE_SYSLOG_H +++ closelog(); +++#endif +++ ++ exit(1); ++ } ++ RETSIGTYPE generic_sig_handler(int sig) ++@@ -798,7 +805,7 @@ ++ sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); ++ #endif ++ ++- syslog(LOG_NOTICE, buf); +++ syslog(LOG_NOTICE, "%s", buf); ++ } ++ else ++ { ++@@ -1439,7 +1446,7 @@ ++ if(!(options & OPT_QUIET)) ++ { ++ fprintf(stderr, ++- "connected to %s (%s) on port %d.\n", +++ "connected to %s (%s) on port %d\n", ++ host, ++ inet_ntoa(address.sin_addr), ++ ntohs(address.sin_port)); ++@@ -1683,7 +1690,7 @@ ++ close(client_sockfd); ++ return(-1); ++ } ++- if(strstr(buf, "\r\n") > 0) +++ if(strstr(buf, "\n") != NULL) ++ { ++ break; ++ } ++@@ -1702,8 +1709,8 @@ ++ ++ if(options & OPT_DAEMON) ++ { ++- fprintf(stderr, "no compile time default service was set therefor you must " ++- "specify a service type.\n"); +++ fprintf(stderr, "no compile time default service was set, you must " +++ "specify a service type\n"); ++ ++ return(-1); ++ } ++@@ -2039,7 +2046,7 @@ ++ } ++ else if(strstr(buf, "\nnumhost") != NULL) ++ { ++- show_message("Too many or too few hosts found\n"); +++ show_message("too many or too few hosts found\n"); ++ retval = UPDATERES_SHUTDOWN; ++ } ++ else if(strstr(buf, "\ndnserr") != NULL) ++@@ -2051,17 +2058,17 @@ ++ } ++ else if(strstr(buf, "\n911") != NULL) ++ { ++- show_message("Ahhhh! call 911!\n"); +++ show_message("ahhhh! call 911!\n"); ++ retval = UPDATERES_SHUTDOWN; ++ } ++ else if(strstr(buf, "\n999") != NULL) ++ { ++- show_message("Ahhhh! call 999!\n"); +++ show_message("ahhhh! call 999!\n"); ++ retval = UPDATERES_SHUTDOWN; ++ } ++ else if(strstr(buf, "\n!donator") != NULL) ++ { ++- show_message("a feature requested is only available to donators, please donate.\n", host); +++ show_message("a feature requested is only available to donators, please donate\n", host); ++ retval = UPDATERES_OK; ++ } ++ // this one should be last as it is a stupid string to signify waits ++@@ -2095,9 +2102,9 @@ ++ sprintf(reason, "problem parsing reason for wait response"); ++ } ++ ++- show_message("Wait response received, waiting for %s before next update.\n", +++ show_message("wait response received, waiting for %s before next update\n", ++ format_time(howlong)); ++- show_message("Wait response reason: %d\n", N_STR(reason)); +++ show_message("wait response reason: %d\n", N_STR(reason)); ++ sleep(howlong); ++ retval = UPDATERES_ERROR; ++ } ++@@ -3370,7 +3377,7 @@ ++ { ++ if(!(options & OPT_QUIET)) ++ { ++- fprintf(stderr, "warning: for GNUDIP the \"address\" parpameter is only used if set to \"0.0.0.0\" thus making an offline request.\n"); +++ fprintf(stderr, "warning: for GNUDIP the \"address\" parameter is only used if set to \"0.0.0.0\" thus making an offline request\n"); ++ } ++ } ++ ++@@ -3392,7 +3399,7 @@ ++ ++ // send an offline request if address 0.0.0.0 is used ++ // otherwise, we ignore the address and send an update request ++- gnudip_request[0] = strcmp(address, "0.0.0.0") == 0 ? '1' : '0'; +++ gnudip_request[0] = address && strcmp(address, "0.0.0.0") == 0 ? '1' : '0'; ++ gnudip_request[1] = '\0'; ++ ++ // find domainname ++@@ -3943,22 +3950,22 @@ ++ break; ++ ++ case 201: ++- show_message("Last update was less than %d seconds ago.\n", 300); +++ show_message("last update was less than %d seconds ago\n", 300); ++ return(UPDATERES_ERROR); ++ break; ++ ++ case 202: ++- show_message("Server error.\n"); +++ show_message("server error\n"); ++ return(UPDATERES_ERROR); ++ break; ++ ++ case 203: ++- show_message("Failure because account is frozen (by admin).\n"); +++ show_message("failure because account is frozen (by admin)\n"); ++ return(UPDATERES_SHUTDOWN); ++ break; ++ ++ case 204: ++- show_message("Failure because account is locked (by user).\n"); +++ show_message("failure because account is locked (by user)\n"); ++ return(UPDATERES_SHUTDOWN); ++ break; ++ ++@@ -4215,8 +4222,6 @@ ++ ++ switch(ret) ++ { ++- char *p; ++- ++ case -1: ++ if(!(options & OPT_QUIET)) ++ { ++@@ -4349,7 +4354,7 @@ ++ case SIGHUP: ++ if(config_file) ++ { ++- show_message("SIGHUP recieved, re-reading config file\n"); +++ show_message("SIGHUP received, re-reading config file\n"); ++ if(parse_conf_file(config_file, conf_commands) != 0) ++ { ++ show_message("error parsing config file \"%s\"\n", config_file); ++@@ -4384,6 +4389,7 @@ ++ ++ int main(int argc, char **argv) ++ { +++ char *tmp; ++ int ifresolve_warned = 0; ++ int i; ++ int retval = 1; ++@@ -4395,9 +4401,10 @@ ++ mcheck(NULL); ++ #endif ++ ++- dprintf((stderr, "staring...\n")); +++ dprintf((stderr, "starting...\n")); ++ ++- program_name = argv[0]; +++ tmp = strrchr(argv[0], '/'); +++ program_name = tmp ? tmp + 1 : argv[0]; ++ options = 0; ++ *user = '\0'; ++ timeout.tv_sec = DEFAULT_TIMEOUT; ++@@ -4417,7 +4424,7 @@ ++ ++ if(!(options & OPT_QUIET) && !(options & OPT_DAEMON)) ++ { ++- fprintf(stderr, "ez-ipupdate Version %s\nCopyright (C) 1998-2001 Angus Mackay.\n", VERSION); +++ fprintf(stderr, "%s Version %s\nCopyright (C) 1998-2001 Angus Mackay\n", program_name, VERSION); ++ } ++ ++ dprintf((stderr, "options: 0x%04X\n", options)); ++@@ -4434,7 +4441,7 @@ ++ { ++ if(service->check_info() != 0) ++ { ++- fprintf(stderr, "invalid data to perform requested action.\n"); +++ fprintf(stderr, "invalid data to perform requested action\n"); ++ exit(1); ++ } ++ } ++@@ -4456,13 +4463,13 @@ ++ dprintf((stderr, "user_name: %s\n", user_name)); ++ dprintf((stderr, "password: %s\n", password)); ++ } ++- if(*user_name == '\0') +++ if(*user_name == '\0' && !(options & OPT_DAEMON)) ++ { ++ printf("user name: "); ++ fgets(user_name, sizeof(user_name), stdin); ++ chomp(user_name); ++ } ++- if(*password == '\0') +++ if(*password == '\0' && !(options & OPT_DAEMON)) ++ { ++ strncpy(password, getpass("password: "), sizeof(password)); ++ } ++@@ -4480,7 +4487,7 @@ ++ ++ if(service->check_info() != 0) ++ { ++- fprintf(stderr, "invalid data to perform requested action.\n"); +++ fprintf(stderr, "invalid data to perform requested action\n"); ++ exit(1); ++ } ++ ++@@ -4503,7 +4510,7 @@ ++ ++ if(interface == NULL) ++ { ++- fprintf(stderr, "invalid data to perform requested action.\n"); +++ fprintf(stderr, "invalid data to perform requested action\n"); ++ fprintf(stderr, "you must provide an interface for daemon mode"); ++ exit(1); ++ } ++@@ -4519,23 +4526,25 @@ ++ if(fork() > 0) { exit(0); } /* parent */ ++ } ++ +++# if HAVE_SYSLOG_H +++ openlog(program_name, LOG_PID, LOG_DAEMON ); +++ //options |= OPT_QUIET; +++# endif +++ show_message("version %s, interface %s, host %s, server %s, service %s\n", +++ VERSION, N_STR(interface), N_STR(host), server, service->title); +++ ++ #if HAVE_GETPID ++ if(pid_file && pid_file_create(pid_file) != 0) ++ { ++- fprintf(stderr, "exiting...\n"); +++ show_message("could not create pid file %s (%s), exiting\n", +++ pid_file, strerror(errno)); +++#if HAVE_SYSLOG_H +++ closelog(); +++#endif ++ exit(1); ++ } ++ #endif ++ ++-# if HAVE_SYSLOG_H ++- openlog(program_name, LOG_PID, LOG_USER ); ++- options |= OPT_QUIET; ++-# endif ++- show_message("ez-ipupdate Version %s, Copyright (C) 1998-2001 Angus Mackay.\n", ++- VERSION); ++- show_message("%s started for interface %s host %s using server %s and service %s\n", ++- program_name, N_STR(interface), N_STR(host), server, service->title); ++- ++ memset(&sin, 0, sizeof(sin)); ++ ++ if(cache_file) ++@@ -4560,7 +4569,7 @@ ++ strftime(timebuf, sizeof(timebuf), "%Y/%m/%d %H:%M", ts); ++ show_message("got last update %s on %s from cache file\n", ipstr, timebuf); ++ } ++- else +++ else if(ipstr||ipdate) ++ { ++ show_message("malformed cache file: %s\n", cache_file); ++ } ++@@ -4647,7 +4656,7 @@ ++ } ++ else ++ { ++- show_message("failure to update %s->%s (%s)\n", +++ show_message("failed to update %s->%s (%s)\n", ++ interface, inet_ntoa(sin.sin_addr), N_STR(host)); ++ memset(&sin, 0, sizeof(sin)); ++ ++@@ -4671,7 +4680,7 @@ ++ dprintf((stderr, "updateres: %d\n", updateres)); ++ if(updateres == UPDATERES_SHUTDOWN) ++ { ++- show_message("shuting down updater for %s due to fatal error\n", +++ show_message("shutting down updater for %s due to fatal error\n", ++ N_STR(host)); ++ ++ if(notify_email && *notify_email != '\0') ++@@ -4711,7 +4720,7 @@ ++ #endif ++ ++ #else ++- fprintf(stderr, "sorry, this mode is only available on platforms that the "); +++ fprintf(stderr, "sorry, this mode is only available on platforms where the "); ++ fprintf(stderr, "IP address \ncan be determined. feel free to hack the code"); ++ fprintf(stderr, " though.\n"); ++ exit(1); ++@@ -4799,7 +4808,7 @@ ++ } ++ else ++ { ++- show_message("could not resolve ip address for %s.\n", interface); +++ show_message("could not resolve ip address for %s\n", interface); ++ exit(1); ++ } ++ close(sock); ++--- ez-ipupdate-3.0.11b8.orig/example.conf +++++ ez-ipupdate-3.0.11b8/example.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++--- ez-ipupdate-3.0.11b8.orig/example-pgpow.conf +++++ ez-ipupdate-3.0.11b8/example-pgpow.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.penguinpowered.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-dhs.conf +++++ ez-ipupdate-3.0.11b8/example-dhs.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.whatever.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-dyndns.conf +++++ ez-ipupdate-3.0.11b8/example-dyndns.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -12,14 +12,9 @@ ++ interface=eth1 ++ max-interval=2073600 ++ ++-# please create this file and ensure that the user that ez-ipupdate is running ++-# as has write permissions to it then uncomment this line, if you don't your ++-# dyndns account will probably get banned. if you run ez-ipupdate as root (bad ++-# idea, use "run-as-user") then you can just uncomment this line. ++-#cache-file=/etc/ez-ipupdate.cache.eth1 ++- ++-# for the mean time we'll just use a cache file in the temp directory ++-cache-file=/tmp/ez-ipupdate.cache +++# if you don't use a cache file your dyndns account will probably get banned. +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-ods.conf +++++ ez-ipupdate-3.0.11b8/example-ods.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.ods.org ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-tzo.conf +++++ ez-ipupdate-3.0.11b8/example-tzo.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -14,8 +14,8 @@ ++ max-interval=2073600 ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-gnudip.conf +++++ ez-ipupdate-3.0.11b8/example-gnudip.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -14,8 +14,8 @@ ++ # any other value is ignored ++ #address=0.0.0.0 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-easydns.conf +++++ ez-ipupdate-3.0.11b8/example-easydns.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.whatever.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-justlinux.conf +++++ ez-ipupdate-3.0.11b8/example-justlinux.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=mydomain.penguinpowered.com ++ interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-dyns.conf +++++ ez-ipupdate-3.0.11b8/example-dyns.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -10,8 +10,8 @@ ++ host=myhost ++ #interface=eth1 ++ ++-# if you use run-as ensure the user has permission to write this file ++-#cache-file=/tmp/ez-ipupdate.cache +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it ++--- ez-ipupdate-3.0.11b8.orig/example-heipv6tb.conf +++++ ez-ipupdate-3.0.11b8/example-heipv6tb.conf ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/ez-ipupdate -c +++#!/usr/sbin/ez-ipupdate -c ++ # ++ # example config file for ez-ipupdate ++ # ++@@ -11,14 +11,9 @@ ++ interface=eth1 ++ max-interval=2073600 ++ ++-# please create this file and ensure that the user that ez-ipupdate is running ++-# as has write permissions to it then uncomment this line, if you don't your ++-# dyndns account will probably get banned. if you run ez-ipupdate as root (bad ++-# idea, use "run-as-user") then you can just uncomment this line. ++-#cache-file=/etc/ez-ipupdate.cache.eth1 ++- ++-# for the mean time we'll just use a cache file in the temp directory ++-cache-file=/tmp/ez-ipupdate.cache +++# if you don't use a cache file your account will probably get banned. +++run-as-user=ez-ipupd +++cache-file=/var/cache/ez-ipupdate/default-cache ++ ++ # uncomment this once you have everything working how you want and you are ++ # ready to have ez-ipupdate running in the background all the time. to stop it +diff --git a/feeds/packages/net/ez-ipupdate/patches/002-ez_ipupdate_everydns.patch b/feeds/packages/net/ez-ipupdate/patches/002-ez_ipupdate_everydns.patch +new file mode 100644 +index 0000000..74bce56 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/002-ez_ipupdate_everydns.patch +@@ -0,0 +1,209 @@ ++diff -ur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c 2009-03-29 22:37:09.000000000 +0200 +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c 2009-03-29 22:37:20.000000000 +0200 ++@@ -103,6 +103,11 @@ ++ #define HEIPV6TB_DEFAULT_PORT "80" ++ #define HEIPV6TB_REQUEST "/index.cgi" ++ +++#define EVERYDNS_DEFAULT_SERVER "dyn.everydns.net" +++#define EVERYDNS_DEFAULT_PORT "80" +++#define EVERYDNS_REQUEST "/index.php" +++#define EVERYDNS_VERSION "0.1" +++ ++ #define DEFAULT_TIMEOUT 120 ++ #define DEFAULT_UPDATE_PERIOD 120 ++ #define DEFAULT_RESOLV_PERIOD 30 ++@@ -344,6 +349,10 @@ ++ int HEIPV6TB_check_info(void); ++ static char *HEIPV6TB_fields_used[] = { "server", "user", NULL }; ++ +++int EVERYDNS_update_entry(void); +++int EVERYDNS_check_info(void); +++static char *EVERYDNS_fields_used[] = { "server", "user", "host", "address", NULL }; +++ ++ struct service_t services[] = { ++ { "NULL", ++ { "null", "NULL", 0, }, ++@@ -517,6 +526,16 @@ ++ HEIPV6TB_DEFAULT_PORT, ++ HEIPV6TB_REQUEST ++ }, +++ { "everydns", +++ { "everydns", 0, 0, }, +++ NULL, +++ EVERYDNS_update_entry, +++ EVERYDNS_check_info, +++ EVERYDNS_fields_used, +++ EVERYDNS_DEFAULT_SERVER, +++ EVERYDNS_DEFAULT_PORT, +++ EVERYDNS_REQUEST +++ }, ++ }; ++ ++ static struct service_t *service = NULL; ++@@ -4251,6 +4270,165 @@ ++ return(UPDATERES_OK); ++ } ++ +++int EVERYDNS_check_info(void) +++{ +++ warn_fields(service->fields_used); +++ +++ return 0; +++} +++ +++int EVERYDNS_update_entry(void) +++{ +++ char buf[BUFFER_SIZE+1]; +++ char *bp = buf; +++ int bytes; +++ int btot; +++ int ret; +++ +++ buf[BUFFER_SIZE] = '\0'; +++ +++ if(do_connect((int*)&client_sockfd, server, port) != 0) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("error connecting to %s:%s\n", server, port); +++ } +++ return(UPDATERES_ERROR); +++ } +++ +++ snprintf(buf, BUFFER_SIZE, "GET %s?ver=%s&", request, EVERYDNS_VERSION); +++ output(buf); +++ if(address) +++ { +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "ip", address); +++ output(buf); +++ } +++ if((host != NULL) && (*host == '\0')) +++ { +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "domain", host); +++ output(buf); +++ } +++ snprintf(buf, BUFFER_SIZE, " HTTP/1.0\015\012"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Authorization: Basic %s\015\012", auth); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "User-Agent: %s-%s %s [%s] (%s)\015\012", +++ "ez-update", VERSION, OS, (options & OPT_DAEMON) ? "daemon" : "", "by Angus Mackay"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Host: %s\015\012", server); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "\015\012"); +++ output(buf); +++ +++ bp = buf; +++ bytes = 0; +++ btot = 0; +++ while((bytes=read_input(bp, BUFFER_SIZE-btot)) > 0) +++ { +++ bp += bytes; +++ btot += bytes; +++ dprintf((stderr, "btot: %d\n", btot)); +++ } +++ close(client_sockfd); +++ buf[btot] = '\0'; +++ +++ dprintf((stderr, "server output: %s\n", buf)); +++ +++ if(sscanf(buf, " HTTP/1.%*c %3d", &ret) != 1) +++ { +++ ret = -1; +++ } +++ +++ switch(ret) +++ { +++ char *p; +++ +++ case -1: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("strange server response, are you connecting to the right server?\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ case 200: +++ ret = -1; +++ if((p=strstr(buf, "Exit code: ")) != NULL) +++ { +++ sscanf(p, "Exit code: %d", &ret); +++ } +++ +++ /* +++ * 0 - Successfully Updated +++ */ +++ switch(ret) +++ { +++ case -1: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("strange server response, are you connecting to the right server?\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ case 0: +++ if(!(options & OPT_QUIET)) +++ { +++ printf("request successful\n"); +++ } +++ break; +++ +++ case 2: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("Bad Username/password\n"); +++ } +++ return(UPDATERES_SHUTDOWN); +++ break; +++ +++ case 5: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("Last update too recent, please wait...\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ default: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("unknown return code: %d\n", ret); +++ fprintf(stderr, "server response: %s\n", buf); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ } +++ break; +++ +++ case 401: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("authentication failure\n"); +++ } +++ return(UPDATERES_SHUTDOWN); +++ break; +++ +++ default: +++ if(!(options & OPT_QUIET)) +++ { +++ // reuse the auth buffer +++ *auth = '\0'; +++ sscanf(buf, " HTTP/1.%*c %*3d %255[^\r\n]", auth); +++ show_message("unknown return code: %d\n", ret); +++ fprintf(stderr, "server response: %s\n", auth); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ } +++ +++ return(UPDATERES_OK); +++} +++ ++ static int is_in_list(char *needle, char **haystack) ++ { ++ char **p; +diff --git a/feeds/packages/net/ez-ipupdate/patches/003-dnsexit.patch b/feeds/packages/net/ez-ipupdate/patches/003-dnsexit.patch +new file mode 100644 +index 0000000..edfd61d +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/003-dnsexit.patch +@@ -0,0 +1,263 @@ ++diff -Nur ez-ipupdate-3.0.11b8.orig/example-dnsexit.conf ez-ipupdate-3.0.11b8/example-dnsexit.conf ++--- ez-ipupdate-3.0.11b8.orig/example-dnsexit.conf 1970-01-01 01:00:00.000000000 +0100 +++++ ez-ipupdate-3.0.11b8/example-dnsexit.conf 2009-03-29 22:40:07.000000000 +0200 ++@@ -0,0 +1,20 @@ +++#!/usr/sbin/ez-ipupdate -c +++# +++# example config file for ez-ipupdate +++# +++# this file is actually executable! +++# +++ +++service-type=dnsexit +++user=loginname:password +++host=www.yourdomain.com +++interface=eth0 +++ +++# please ensure the user has permission to write this file +++cache-file=/tmp/ez-ipupdate.cache +++ +++run-as-user=ez-ipupd +++# uncomment this once you have everything working how you want and you are +++# ready to have ez-ipupdate running in the background all the time. to stop it +++# you can use "killall -QUIT ez-ipupdate" under linux. +++#daemon ++diff -Nur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c 2009-03-29 22:39:46.000000000 +0200 +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c 2009-03-29 22:40:07.000000000 +0200 ++@@ -108,6 +108,10 @@ ++ #define EVERYDNS_REQUEST "/index.php" ++ #define EVERYDNS_VERSION "0.1" ++ +++#define DNSEXIT_DEFAULT_SERVER "www.dnsexit.com" +++#define DNSEXIT_DEFAULT_PORT "80" +++#define DNSEXIT_REQUEST "/RemoteUpdate.sv" +++ ++ #define DEFAULT_TIMEOUT 120 ++ #define DEFAULT_UPDATE_PERIOD 120 ++ #define DEFAULT_RESOLV_PERIOD 30 ++@@ -353,6 +357,11 @@ ++ int EVERYDNS_check_info(void); ++ static char *EVERYDNS_fields_used[] = { "server", "user", "host", "address", NULL }; ++ +++int DNSEXIT_update_entry(void); +++int DNSEXIT_check_info(void); +++static char *DNSEXIT_fields_used[] = { "server", "user", "address", "wildcard", "mx", "host", NULL }; +++ +++ ++ struct service_t services[] = { ++ { "NULL", ++ { "null", "NULL", 0, }, ++@@ -536,6 +545,16 @@ ++ EVERYDNS_DEFAULT_PORT, ++ EVERYDNS_REQUEST ++ }, +++ { "dnsexit", +++ { "dnsexit", 0, 0, }, +++ NULL, +++ DNSEXIT_update_entry, +++ DNSEXIT_check_info, +++ DNSEXIT_fields_used, +++ DNSEXIT_DEFAULT_SERVER, +++ DNSEXIT_DEFAULT_PORT, +++ DNSEXIT_REQUEST +++ }, ++ }; ++ ++ static struct service_t *service = NULL; ++@@ -4429,6 +4448,195 @@ ++ return(UPDATERES_OK); ++ } ++ +++int DNSEXIT_check_info(void) +++{ +++ char buf[BUFSIZ+1]; +++ +++ if((host == NULL) || (*host == '\0')) +++ { +++ if(options & OPT_DAEMON) +++ { +++ return(-1); +++ } +++ if(host) { free(host); } +++ printf("host: "); +++ *buf = '\0'; +++ fgets(buf, BUFSIZ, stdin); +++ host = strdup(buf); +++ chomp(host); +++ } +++ +++ if(interface == NULL && address == NULL) +++ { +++ if(options & OPT_DAEMON) +++ { +++ fprintf(stderr, "you must provide either an interface or an address\n"); +++ return(-1); +++ } +++ if(interface) { free(interface); } +++ printf("interface: "); +++ *buf = '\0'; +++ fgets(buf, BUFSIZ, stdin); +++ chomp(buf); +++ option_handler(CMD_interface, buf); +++ } +++ +++ warn_fields(service->fields_used); +++ +++ return 0; +++} +++ +++int DNSEXIT_update_entry(void) +++{ +++ char buf[BUFFER_SIZE+1]; +++ char *bp = buf; +++ int bytes; +++ int btot; +++ int ret; +++ +++ buf[BUFFER_SIZE] = '\0'; +++ +++ if(do_connect((int*)&client_sockfd, server, port) != 0) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("error connecting to %s:%s\n", server, port); +++ } +++ return(UPDATERES_ERROR); +++ } +++ +++ snprintf(buf, BUFFER_SIZE, "GET %s?action=edit&", request); +++ output(buf); +++ if(address != NULL && *address != '\0') +++ { +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "myip", address); +++ output(buf); +++ } +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "wildcard", wildcard ? "ON" : "OFF"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "mx", mx); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "backmx", *mx == '\0' ? "NO" : "YES"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "host", host); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "login", user_name); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "%s=%s&", "password", password); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, " HTTP/1.0\015\012"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Authorization: Basic %s\015\012", auth); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "User-Agent: %s-%s %s [%s] (%s)\015\012", +++ "ez-update", VERSION, OS, (options & OPT_DAEMON) ? "daemon" : "", "by Angus Mackay"); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "Host: %s\015\012", server); +++ output(buf); +++ snprintf(buf, BUFFER_SIZE, "\015\012"); +++ output(buf); +++ +++ bp = buf; +++ bytes = 0; +++ btot = 0; +++ while((bytes=read_input(bp, BUFFER_SIZE-btot)) > 0) +++ { +++ bp += bytes; +++ btot += bytes; +++ dprintf((stderr, "btot: %d\n", btot)); +++ } +++ close(client_sockfd); +++ buf[btot] = '\0'; +++ +++ dprintf((stderr, "server output: %s\n", buf)); +++ +++ if(sscanf(buf, " HTTP/1.%*c %3d", &ret) != 1) +++ { +++ ret = -1; +++ } +++ +++ switch(ret) +++ { +++ case -1: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("strange server response, are you connecting to the right server?\n"); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ +++ case 200: +++ +++ if(strstr(buf, "0=Success") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Request successful\n"); +++ } +++ } +++ else if(strstr(buf, "1=IP is the same as the IP on the system") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Request successful but the IP is the same as previous update\n"); +++ } +++ } +++ else if(strstr(buf, "2=Invalid passwords") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Invalid Password\n"); +++ } +++ } +++ else if(strstr(buf, "3=User not found") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Username not found\n"); +++ } +++ } +++ else if(strstr(buf, "4=Update too often") != NULL) +++ { +++ if(!(options & OPT_QUIET)) +++ { +++ printf("Updatting too often\n"); +++ } +++ } +++ else +++ { +++ show_message("Errors return from server\n"); +++ if(!(options & OPT_QUIET)) +++ { +++ fprintf(stderr, "server output: %s\n", buf); +++ } +++ return(UPDATERES_ERROR); +++ } +++ break; +++ +++ case 401: +++ if(!(options & OPT_QUIET)) +++ { +++ show_message("authentication failure\n"); +++ } +++ return(UPDATERES_SHUTDOWN); +++ break; +++ +++ default: +++ if(!(options & OPT_QUIET)) +++ { +++ // reuse the auth buffer +++ *auth = '\0'; +++ sscanf(buf, " HTTP/1.%*c %*3d %255[^\r\n]", auth); +++ show_message("unknown return code: %d\n", ret); +++ show_message("server response: %s\n", auth); +++ } +++ return(UPDATERES_ERROR); +++ break; +++ } +++ +++ return(UPDATERES_OK); +++} +++ ++ static int is_in_list(char *needle, char **haystack) ++ { ++ char **p; +diff --git a/feeds/packages/net/ez-ipupdate/patches/004-zoneedit.patch b/feeds/packages/net/ez-ipupdate/patches/004-zoneedit.patch +new file mode 100644 +index 0000000..acc2b5f +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/004-zoneedit.patch +@@ -0,0 +1,12 @@ ++--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c +++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c ++@@ -95,7 +95,7 @@ ++ #define HN_DEFAULT_PORT "80" ++ #define HN_REQUEST "/vanity/update" ++ ++-#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com" +++#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com" ++ #define ZONEEDIT_DEFAULT_PORT "80" ++ #define ZONEEDIT_REQUEST "/auth/dynamic.html" ++ ++ +diff --git a/feeds/packages/net/ez-ipupdate/patches/005-endian-detection.patch b/feeds/packages/net/ez-ipupdate/patches/005-endian-detection.patch +new file mode 100644 +index 0000000..9efabc6 +--- /dev/null ++++ b/feeds/packages/net/ez-ipupdate/patches/005-endian-detection.patch +@@ -0,0 +1,11 @@ ++--- a/md5.c +++++ b/md5.c ++@@ -35,7 +35,7 @@ ++ ++ #include "md5.h" ++ ++-#ifdef _LIBC +++#if defined(_LIBC) || defined(__UCLIBC__) ++ # include ++ # if __BYTE_ORDER == __BIG_ENDIAN ++ # define WORDS_BIGENDIAN 1 +diff --git a/feeds/packages/net/faifa/.svn/entries b/feeds/packages/net/faifa/.svn/entries +new file mode 100644 +index 0000000..ea70418 +--- /dev/null ++++ b/feeds/packages/net/faifa/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/faifa ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-13T17:28:44.057291Z ++33397 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++978af783bf6bcdd22baf175640db3dc5 ++2012-09-13T17:28:44.057291Z ++33397 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2342 ++ +diff --git a/feeds/packages/net/faifa/.svn/text-base/Makefile.svn-base b/feeds/packages/net/faifa/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b36e98b +--- /dev/null ++++ b/feeds/packages/net/faifa/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# 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:=faifa ++PKG_VERSION:=2012-09-13 ++PKG_RELEASE:=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/ffainelli/faifa.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=2842afc90bd9ca08ed2a6c83c04f4015982e6007 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/faifa/Default ++ TITLE:=configure HomePlug 1.0/AV PLC devices ++ URL:=http://open-plc.org/ ++endef ++ ++define Package/libfaifa ++ $(call Package/faifa/Default) ++ TITLE+= (library) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpcap +libpthread ++endef ++ ++define Package/libfaifa/description ++ Faifa companion library. ++endef ++ ++define Package/faifa ++ $(call Package/faifa/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread +libpcap +libfaifa ++ TITLE+= (command line) ++endef ++ ++define Package/faifa/description ++ Faifa can configure any Intellon-based Power Line Communication device using ++ Intellon INT5000 and INT6000 series chips (6000 and 6300 chips). It supports all ++ Intellon-specific management and control frames as well as standard management ++ frames. ++endef ++ ++define Package/hpavcfg ++ $(call Package/faifa/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=HomePlug AV lightweight configurator ++endef ++ ++define Package/hpavcfg/description ++ Lightweight configuration tool, only capable of setting a local device key (NMK) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++MAKE_FLAGS += \ ++ OS=LINUX \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); ./autogen.sh) ++ $(call Build/Configure/Default) ++endef ++ ++define Package/faifa/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/faifa $(1)/usr/bin/ ++endef ++ ++define Package/libfaifa/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfaifa.so* $(1)/usr/lib ++endef ++ ++define Package/hpavcfg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/hpav_cfg $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,faifa)) ++$(eval $(call BuildPackage,libfaifa)) ++$(eval $(call BuildPackage,hpavcfg)) +diff --git a/feeds/packages/net/faifa/Makefile b/feeds/packages/net/faifa/Makefile +new file mode 100644 +index 0000000..b36e98b +--- /dev/null ++++ b/feeds/packages/net/faifa/Makefile +@@ -0,0 +1,96 @@ ++# ++# 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:=faifa ++PKG_VERSION:=2012-09-13 ++PKG_RELEASE:=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/ffainelli/faifa.git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=2842afc90bd9ca08ed2a6c83c04f4015982e6007 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/faifa/Default ++ TITLE:=configure HomePlug 1.0/AV PLC devices ++ URL:=http://open-plc.org/ ++endef ++ ++define Package/libfaifa ++ $(call Package/faifa/Default) ++ TITLE+= (library) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libpcap +libpthread ++endef ++ ++define Package/libfaifa/description ++ Faifa companion library. ++endef ++ ++define Package/faifa ++ $(call Package/faifa/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread +libpcap +libfaifa ++ TITLE+= (command line) ++endef ++ ++define Package/faifa/description ++ Faifa can configure any Intellon-based Power Line Communication device using ++ Intellon INT5000 and INT6000 series chips (6000 and 6300 chips). It supports all ++ Intellon-specific management and control frames as well as standard management ++ frames. ++endef ++ ++define Package/hpavcfg ++ $(call Package/faifa/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=HomePlug AV lightweight configurator ++endef ++ ++define Package/hpavcfg/description ++ Lightweight configuration tool, only capable of setting a local device key (NMK) ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++MAKE_FLAGS += \ ++ OS=LINUX \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); ./autogen.sh) ++ $(call Build/Configure/Default) ++endef ++ ++define Package/faifa/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/faifa $(1)/usr/bin/ ++endef ++ ++define Package/libfaifa/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfaifa.so* $(1)/usr/lib ++endef ++ ++define Package/hpavcfg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/hpav_cfg $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,faifa)) ++$(eval $(call BuildPackage,libfaifa)) ++$(eval $(call BuildPackage,hpavcfg)) +diff --git a/feeds/packages/net/fakeidentd/.svn/entries b/feeds/packages/net/fakeidentd/.svn/entries +new file mode 100644 +index 0000000..c4e6ee2 +--- /dev/null ++++ b/feeds/packages/net/fakeidentd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fakeidentd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-01T11:04:16.466678Z ++32566 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++61fa9cf40c97abe06ccf19aca6ab5ea1 ++2012-07-01T11:04:16.466678Z ++32566 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1250 ++ +diff --git a/feeds/packages/net/fakeidentd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/fakeidentd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0061078 +--- /dev/null ++++ b/feeds/packages/net/fakeidentd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=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 ++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/feeds/packages/net/fakeidentd/Makefile b/feeds/packages/net/fakeidentd/Makefile +new file mode 100644 +index 0000000..0061078 +--- /dev/null ++++ b/feeds/packages/net/fakeidentd/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=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 ++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/feeds/packages/net/fakeidentd/files/.svn/entries b/feeds/packages/net/fakeidentd/files/.svn/entries +new file mode 100644 +index 0000000..2dec15b +--- /dev/null ++++ b/feeds/packages/net/fakeidentd/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fakeidentd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-01T11:04:16.466678Z ++32566 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++fakeidentd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++7ab624a3122532845102a25b57f6119f ++2012-07-01T11:04:16.466678Z ++32566 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++172 ++ +diff --git a/feeds/packages/net/fakeidentd/files/.svn/text-base/fakeidentd.init.svn-base b/feeds/packages/net/fakeidentd/files/.svn/text-base/fakeidentd.init.svn-base +new file mode 100644 +index 0000000..4959ef2 +--- /dev/null ++++ b/feeds/packages/net/fakeidentd/files/.svn/text-base/fakeidentd.init.svn-base +@@ -0,0 +1,12 @@ ++#!/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/feeds/packages/net/fakeidentd/files/fakeidentd.init b/feeds/packages/net/fakeidentd/files/fakeidentd.init +new file mode 100644 +index 0000000..4959ef2 +--- /dev/null ++++ b/feeds/packages/net/fakeidentd/files/fakeidentd.init +@@ -0,0 +1,12 @@ ++#!/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/feeds/packages/net/flow-tools/.svn/entries b/feeds/packages/net/flow-tools/.svn/entries +new file mode 100644 +index 0000000..28703cd +--- /dev/null ++++ b/feeds/packages/net/flow-tools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/flow-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:30:29.468213Z ++32239 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++03e9c48db876d5486f975c18e57cf0c5 ++2012-06-11T23:30:29.468213Z ++32239 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++975 ++ +diff --git a/feeds/packages/net/flow-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/net/flow-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1874f5b +--- /dev/null ++++ b/feeds/packages/net/flow-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=flow-tools ++PKG_VERSION:=0.68 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.eng.oar.net/pub/flow-tools/ ++PKG_MD5SUM:=c9e0a8b53c79611b6bffcb9d510a5a38 ++ ++PKG_BUILD_DEPENDS:=+zlib ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/flow-tools ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=flow-tools ++ URL:=http://www.splintered.net/sw/flow-tools/ ++ DEPENDS:=+zlib ++endef ++ ++define Package/flow-tools/description ++ Flow-tools is a software package for collecting and processing ++ NetFlow data from Cisco and Juniper routers. ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,all) ++endef ++ ++define Package/flow-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/src/flow-* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,flow-tools)) +diff --git a/feeds/packages/net/flow-tools/Makefile b/feeds/packages/net/flow-tools/Makefile +new file mode 100644 +index 0000000..1874f5b +--- /dev/null ++++ b/feeds/packages/net/flow-tools/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=flow-tools ++PKG_VERSION:=0.68 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.eng.oar.net/pub/flow-tools/ ++PKG_MD5SUM:=c9e0a8b53c79611b6bffcb9d510a5a38 ++ ++PKG_BUILD_DEPENDS:=+zlib ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/flow-tools ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=flow-tools ++ URL:=http://www.splintered.net/sw/flow-tools/ ++ DEPENDS:=+zlib ++endef ++ ++define Package/flow-tools/description ++ Flow-tools is a software package for collecting and processing ++ NetFlow data from Cisco and Juniper routers. ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,all) ++endef ++ ++define Package/flow-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/src/flow-* $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,flow-tools)) +diff --git a/feeds/packages/net/flow-tools/patches/.svn/entries b/feeds/packages/net/flow-tools/patches/.svn/entries +new file mode 100644 +index 0000000..f932635 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/entries +@@ -0,0 +1,334 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/flow-tools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-python_script_location_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++9a7ef31f2e4b3ed2d738215ea73ec462 ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++636 ++ ++030-avoid_external_debug_var.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++04fecd1cd15b1677ebe0ef27a2bb60ac ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++291 ++ ++002-flex_lib.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++d75bdc67c14e04e9cacb13ccd0b9a1f9 ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1419 ++ ++050-fix-64bit_temp_time_t.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++588fc7345b1e6870276db3cb39c597f8 ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1000 ++ ++001-cross_compile_configure_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++0a37b8d62735011ca915e9b9d99ad503 ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++418 ++ ++070-extra_ftpdu_verify_debugging.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++ad911c0b8acac2246dd1e1b8714abf2c ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1430 ++ ++080-fix_uninitialized_var_in_flow_export.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++06ff5659c89af8c9397061f4a2611eaa ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++273 ++ ++020-invalid_lvalue_in_assignment.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++e993c270fddb2e3d155d39bf3e8789e1 ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4047 ++ ++060-fix_uninitialized_var_in_flow_send.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++c09de483c465a03df8f96c2e8777a891 ++2007-05-15T08:35:25.559178Z ++7248 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++363 ++ +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/001-cross_compile_configure_fix.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/001-cross_compile_configure_fix.patch.svn-base +new file mode 100644 +index 0000000..01a3724 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/001-cross_compile_configure_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++-- flow-tools-0.68.orig/configure 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/configure 2007-02-08 07:53:42.000000000 -0500 ++@@ -6308,7 +6308,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++} ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/002-flex_lib.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/002-flex_lib.patch.svn-base +new file mode 100644 +index 0000000..f6b9877 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/002-flex_lib.patch.svn-base +@@ -0,0 +1,46 @@ ++--- flow-tools-0.68.orig/Makefile.in 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/Makefile.in 2007-02-08 08:18:36.000000000 -0500 ++@@ -70,7 +70,7 @@ ++ DEPDIR = @DEPDIR@ ++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++ LEX = @LEX@ ++-LEXLIB = @LEXLIB@ +++LEXLIB = ++ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ++ MYSQLCFLAGS = @MYSQLCFLAGS@ ++ MYSQLINCLUDE = @MYSQLINCLUDE@ ++--- flow-tools-0.68.orig/src/Makefile.in 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/src/Makefile.in 2007-02-08 08:18:31.000000000 -0500 ++@@ -70,7 +70,7 @@ ++ DEPDIR = @DEPDIR@ ++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++ LEX = @LEX@ ++-LEXLIB = @LEXLIB@ +++LEXLIB = ++ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ++ MYSQLCFLAGS = @MYSQLCFLAGS@ ++ MYSQLINCLUDE = @MYSQLINCLUDE@ ++--- flow-tools-0.68.orig/src/acllex.c 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/src/acllex.c 2007-02-08 08:25:10.000000000 -0500 ++@@ -503,7 +503,9 @@ ++ #ifdef __cplusplus ++ extern "C" int yywrap YY_PROTO(( void )); ++ #else ++-extern int yywrap YY_PROTO(( void )); +++int yywrap (void ) { +++ return 1; +++} ++ #endif ++ #endif ++ ++--- flow-tools-0.68.orig/configure 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/configure 2007-02-08 08:19:30.000000000 -0500 ++@@ -2952,7 +2952,7 @@ ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ ac_check_lib_save_LIBS=$LIBS ++-LIBS="-lfl $LIBS" +++LIBS="$LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++ /* confdefs.h. */ +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/010-python_script_location_fix.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/010-python_script_location_fix.patch.svn-base +new file mode 100644 +index 0000000..5806732 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/010-python_script_location_fix.patch.svn-base +@@ -0,0 +1,30 @@ ++diff --git a/bin/flow-log2rrd b/bin/flow-log2rrd ++index 0567ba5..db4fdda 100755 ++--- a/bin/flow-log2rrd +++++ b/bin/flow-log2rrd ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/python +++#!/bin/env python ++ ++ import getopt ++ import os ++diff --git a/bin/flow-rpt2rrd b/bin/flow-rpt2rrd ++index 72a74c7..7698f2b 100755 ++--- a/bin/flow-rpt2rrd +++++ b/bin/flow-rpt2rrd ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/python +++#!/bin/env python ++ ++ import getopt ++ import os ++diff --git a/bin/flow-rptfmt b/bin/flow-rptfmt ++index 047d1ba..f663fae 100755 ++--- a/bin/flow-rptfmt +++++ b/bin/flow-rptfmt ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/python +++#!/bin/env python ++ ++ import sys ++ import string +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/020-invalid_lvalue_in_assignment.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/020-invalid_lvalue_in_assignment.patch.svn-base +new file mode 100644 +index 0000000..aeda139 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/020-invalid_lvalue_in_assignment.patch.svn-base +@@ -0,0 +1,171 @@ ++diff --git a/lib/ftchash.c b/lib/ftchash.c ++index 9cc7efa..28bafbf 100644 ++--- a/lib/ftchash.c +++++ b/lib/ftchash.c ++@@ -326,7 +326,7 @@ void *ftchash_foreach(struct ftchash *ft ++ (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) { ++ ++ ret = ftch->traverse_rec; ++- (char*)ftch->traverse_rec += ftch->d_size; +++ ftch->traverse_rec = vpadd(ftch->traverse_rec, ftch->d_size); ++ return ret; ++ ++ } else { ++diff --git a/lib/ftio.c b/lib/ftio.c ++index f6c739c..1082416 100644 ++--- a/lib/ftio.c +++++ b/lib/ftio.c ++@@ -2267,7 +2267,7 @@ int readn(register int fd, register void ++ break; ++ ++ nleft -= nread; ++- (char*)ptr += nread; +++ ptr = vpadd(ptr, nread); ++ } ++ return (nbytes - nleft); ++ } /* readn */ ++@@ -2292,7 +2292,7 @@ int writen(register int fd, register voi ++ return(nwritten); /* error */ ++ ++ nleft -= nwritten; ++- (char*)ptr += nwritten; +++ ptr = vpadd(ptr,nwritten); ++ } ++ return(nbytes - nleft); ++ } /* writen */ ++diff --git a/lib/ftlib.h b/lib/ftlib.h ++index f91ad0a..66bf2f3 100644 ++--- a/lib/ftlib.h +++++ b/lib/ftlib.h ++@@ -152,7 +152,6 @@ #define FT_PDU_V8_11_MAXFLOWS 44 /* max ++ #define FT_PDU_V8_12_MAXFLOWS 44 /* max records in V8 DST_PREFIX_TOS packet */ ++ #define FT_PDU_V8_13_MAXFLOWS 35 /* max records in V8 PREFIX_TOS packet */ ++ #define FT_PDU_V8_14_MAXFLOWS 35 /* max records in V8 PREFIX_PORT_TOS packet */ ++- ++ #define FT_PDU_V8_1_VERSION 2 /* version of AS packet */ ++ #define FT_PDU_V8_2_VERSION 2 /* version of PROTO PORT packet */ ++ #define FT_PDU_V8_3_VERSION 2 /* version of SRC PREFIX packet */ ++@@ -3029,6 +3028,8 @@ #ifndef IN_CLASSD_SSM ++ #define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000) ++ #endif /* IN_CLASSD_SSM */ ++ +++void *vpadd(const void* v, const int change); +++ ++ /* MACHINE DEPENDANT */ ++ #define fmt_uint fmt_uint32 ++ ++diff --git a/lib/fttlv.c b/lib/fttlv.c ++index 7035813..330a783 100644 ++--- a/lib/fttlv.c +++++ b/lib/fttlv.c ++@@ -68,10 +68,10 @@ int fttlv_enc_uint32(void *buf, int buf_ ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&v, buf, 4); ++ ++@@ -107,10 +107,10 @@ int fttlv_enc_uint16(void *buf, int buf_ ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&v, buf, 2); ++ ++@@ -145,10 +145,10 @@ int fttlv_enc_uint8(void *buf, int buf_s ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&v, buf, 1); ++ ++@@ -183,10 +183,10 @@ int fttlv_enc_str(void *buf, int buf_siz ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(v, buf, len); ++ ++@@ -230,16 +230,16 @@ int fttlv_enc_ifname(void *buf, int buf_ ++ return -1; ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&ip, buf, 4); ++- (char*)buf += 4; +++ buf = vpadd(buf, 4); ++ ++ bcopy(&ifIndex, buf, 2); ++- (char*)buf += 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(name, buf, n); ++ ++@@ -287,19 +287,19 @@ int fttlv_enc_ifalias(void *buf, int buf ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&ip, buf, 4); ++- (char*)buf += 4; +++ buf = vpadd(buf, 4); ++ ++ bcopy(&entries, buf, 2); ++- (char*)buf += 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(ifIndex_list, buf, esize); ++- (char*)buf += esize; +++ buf = vpadd(buf, esize); ++ ++ bcopy(name, buf, n); ++ ++diff --git a/lib/support.c b/lib/support.c ++index a32ffe7..2e1db9f 100644 ++--- a/lib/support.c +++++ b/lib/support.c ++@@ -736,3 +736,8 @@ int udp_cksum(struct ip *ip, struct udph ++ return sum; ++ } /* udp_cksum */ ++ +++// void pointer add +++ +++void * vpadd(const void *v, const int change) { +++ return (void *) (((char*) v) + change); +++} +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/030-avoid_external_debug_var.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/030-avoid_external_debug_var.patch.svn-base +new file mode 100644 +index 0000000..6ca5740 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/030-avoid_external_debug_var.patch.svn-base +@@ -0,0 +1,13 @@ ++diff --git a/lib/ftfile.c b/lib/ftfile.c ++index 2f3ae76..f25e849 100644 ++--- a/lib/ftfile.c +++++ b/lib/ftfile.c ++@@ -53,7 +53,7 @@ #endif ++ ++ int load_dir(char *prefix, struct ftfile_entries *fte, int flags, int *depth); ++ ++-extern int debug; +++#define debug 0 ++ ++ /* ++ * function: ftfile_entry_new +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/050-fix-64bit_temp_time_t.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/050-fix-64bit_temp_time_t.patch.svn-base +new file mode 100644 +index 0000000..99a06f7 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/050-fix-64bit_temp_time_t.patch.svn-base +@@ -0,0 +1,41 @@ ++diff --git a/lib/ftfile.c b/lib/ftfile.c ++index f25e849..ec17771 100644 ++--- a/lib/ftfile.c +++++ b/lib/ftfile.c ++@@ -413,16 +413,17 @@ void ftfile_pathname(char *buf, int bsiz ++ int done, u_int32 ftime) ++ { ++ struct tm *tm; +++ time_t _t = (time_t) ftime; ++ char *prefix, dbuf[64]; ++ long gmt_val; ++ char gmt_sign; ++ int tm_gmtoff; ++ ++- if (!(tm = localtime ((time_t*)&ftime))) { +++ if (!(tm = localtime (&_t))) { ++ snprintf(buf, bsize, "."); ++ } ++ ++- tm_gmtoff = get_gmtoff(ftime); +++ tm_gmtoff = get_gmtoff(_t); ++ ++ /* compute GMT offset */ ++ if (tm_gmtoff >= 0) { ++@@ -502,6 +503,7 @@ void ftfile_pathname(char *buf, int bsiz ++ int ftfile_mkpath(u_int32 ftime, int nest) ++ { ++ struct tm *tm; +++ time_t _t = (time_t) ftime; ++ char buf[32]; ++ ++ /* no directories */ ++@@ -512,7 +514,7 @@ int ftfile_mkpath(u_int32 ftime, int nes ++ if ((nest > 3) || (nest < -3)) ++ return -1; ++ ++- if (!(tm = localtime ((time_t*)&ftime))) +++ if (!(tm = localtime (&_t))) ++ return -1; ++ ++ if (nest == -1) +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/060-fix_uninitialized_var_in_flow_send.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/060-fix_uninitialized_var_in_flow_send.patch.svn-base +new file mode 100644 +index 0000000..2240537 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/060-fix_uninitialized_var_in_flow_send.patch.svn-base +@@ -0,0 +1,13 @@ ++diff --git a/src/flow-send.c b/src/flow-send.c ++index 83ca926..ad87024 100644 ++--- a/src/flow-send.c +++++ b/src/flow-send.c ++@@ -76,7 +76,7 @@ int main(int argc, char **argv) ++ u_int32 privacy_mask; ++ unsigned int v1, v2, one; ++ int i, n, ret, tx_delay, udp_sock; ++- int src_ip_spoof, hdr_len; +++ int src_ip_spoof, hdr_len = 0; ++ void *rec; ++ ++ /* init fterr */ +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/070-extra_ftpdu_verify_debugging.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/070-extra_ftpdu_verify_debugging.patch.svn-base +new file mode 100644 +index 0000000..911d369 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/070-extra_ftpdu_verify_debugging.patch.svn-base +@@ -0,0 +1,49 @@ ++diff --git a/lib/ftdecode.c b/lib/ftdecode.c ++index ff6b0cf..8884db9 100644 ++--- a/lib/ftdecode.c +++++ b/lib/ftdecode.c ++@@ -122,8 +122,10 @@ int ftpdu_verify(struct ftpdu *ftpdu) ++ ret = -1; ++ ++ /* enough bytes to decode the count and version? */ ++- if (ftpdu->bused < 4) +++ if (ftpdu->bused < 4) { +++ fterr_warnx("not enough bytes to decode the count and version."); ++ goto ftpdu_verify_out_quick; +++ } ++ ++ ph = (struct ftpdu_header*)&ftpdu->buf; ++ ++@@ -158,15 +160,22 @@ #endif /* LITTLE_ENDIAN */ ++ case 5: ++ ++ /* max PDU's in record */ ++- if (ph->count > FT_PDU_V5_MAXFLOWS) +++ if (ph->count > FT_PDU_V5_MAXFLOWS) { +++ fterr_warnx("too many pdus (%d) in record, max %d", ph->count, +++ FT_PDU_V5_MAXFLOWS); ++ goto ftpdu_verify_out; +++ } +++ ++ ++ size = offsetof(struct ftpdu_v5, records) + ++ ph->count * sizeof (struct ftrec_v5); ++ ++ /* PDU received size == PDU expected size? */ ++- if (size != ftpdu->bused) +++ if (size != ftpdu->bused) { +++ fterr_warnx("pdu received size was wrong. expected %d got %d", +++ ftpdu->bused, size); ++ goto ftpdu_verify_out; +++ } ++ ++ ftpdu->ftv.d_version = 5; ++ ftpdu->decodef = fts3rec_pdu_v5_decode; ++@@ -516,6 +525,7 @@ #endif /* LITTLE_ENDIAN */ ++ break; /* 8 */ ++ ++ default: +++ fterr_warnx("ftpdu version not set."); ++ goto ftpdu_verify_out; ++ ++ } /* switch ph->version */ +diff --git a/feeds/packages/net/flow-tools/patches/.svn/text-base/080-fix_uninitialized_var_in_flow_export.patch.svn-base b/feeds/packages/net/flow-tools/patches/.svn/text-base/080-fix_uninitialized_var_in_flow_export.patch.svn-base +new file mode 100644 +index 0000000..bd88403 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/.svn/text-base/080-fix_uninitialized_var_in_flow_export.patch.svn-base +@@ -0,0 +1,13 @@ ++diff --git a/src/flow-export.c b/src/flow-export.c ++index 52ae4d2..22b0330 100644 ++--- a/src/flow-export.c +++++ b/src/flow-export.c ++@@ -961,7 +961,7 @@ #endif /* PGSQL */ ++ ++ int fmt_xfields_type(char *buf, u_int64 xfield) ++ { ++- int comma; +++ int comma = 0; ++ ++ buf[0] = 0; ++ +diff --git a/feeds/packages/net/flow-tools/patches/001-cross_compile_configure_fix.patch b/feeds/packages/net/flow-tools/patches/001-cross_compile_configure_fix.patch +new file mode 100644 +index 0000000..01a3724 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/001-cross_compile_configure_fix.patch +@@ -0,0 +1,11 @@ ++-- flow-tools-0.68.orig/configure 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/configure 2007-02-08 07:53:42.000000000 -0500 ++@@ -6308,7 +6308,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++} ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" +diff --git a/feeds/packages/net/flow-tools/patches/002-flex_lib.patch b/feeds/packages/net/flow-tools/patches/002-flex_lib.patch +new file mode 100644 +index 0000000..f6b9877 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/002-flex_lib.patch +@@ -0,0 +1,46 @@ ++--- flow-tools-0.68.orig/Makefile.in 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/Makefile.in 2007-02-08 08:18:36.000000000 -0500 ++@@ -70,7 +70,7 @@ ++ DEPDIR = @DEPDIR@ ++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++ LEX = @LEX@ ++-LEXLIB = @LEXLIB@ +++LEXLIB = ++ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ++ MYSQLCFLAGS = @MYSQLCFLAGS@ ++ MYSQLINCLUDE = @MYSQLINCLUDE@ ++--- flow-tools-0.68.orig/src/Makefile.in 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/src/Makefile.in 2007-02-08 08:18:31.000000000 -0500 ++@@ -70,7 +70,7 @@ ++ DEPDIR = @DEPDIR@ ++ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++ LEX = @LEX@ ++-LEXLIB = @LEXLIB@ +++LEXLIB = ++ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ ++ MYSQLCFLAGS = @MYSQLCFLAGS@ ++ MYSQLINCLUDE = @MYSQLINCLUDE@ ++--- flow-tools-0.68.orig/src/acllex.c 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/src/acllex.c 2007-02-08 08:25:10.000000000 -0500 ++@@ -503,7 +503,9 @@ ++ #ifdef __cplusplus ++ extern "C" int yywrap YY_PROTO(( void )); ++ #else ++-extern int yywrap YY_PROTO(( void )); +++int yywrap (void ) { +++ return 1; +++} ++ #endif ++ #endif ++ ++--- flow-tools-0.68.orig/configure 2007-02-08 07:21:42.000000000 -0500 +++++ flow-tools-0.68/configure 2007-02-08 08:19:30.000000000 -0500 ++@@ -2952,7 +2952,7 @@ ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ ac_check_lib_save_LIBS=$LIBS ++-LIBS="-lfl $LIBS" +++LIBS="$LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++ /* confdefs.h. */ +diff --git a/feeds/packages/net/flow-tools/patches/010-python_script_location_fix.patch b/feeds/packages/net/flow-tools/patches/010-python_script_location_fix.patch +new file mode 100644 +index 0000000..5806732 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/010-python_script_location_fix.patch +@@ -0,0 +1,30 @@ ++diff --git a/bin/flow-log2rrd b/bin/flow-log2rrd ++index 0567ba5..db4fdda 100755 ++--- a/bin/flow-log2rrd +++++ b/bin/flow-log2rrd ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/python +++#!/bin/env python ++ ++ import getopt ++ import os ++diff --git a/bin/flow-rpt2rrd b/bin/flow-rpt2rrd ++index 72a74c7..7698f2b 100755 ++--- a/bin/flow-rpt2rrd +++++ b/bin/flow-rpt2rrd ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/python +++#!/bin/env python ++ ++ import getopt ++ import os ++diff --git a/bin/flow-rptfmt b/bin/flow-rptfmt ++index 047d1ba..f663fae 100755 ++--- a/bin/flow-rptfmt +++++ b/bin/flow-rptfmt ++@@ -1,4 +1,4 @@ ++-#!/usr/local/bin/python +++#!/bin/env python ++ ++ import sys ++ import string +diff --git a/feeds/packages/net/flow-tools/patches/020-invalid_lvalue_in_assignment.patch b/feeds/packages/net/flow-tools/patches/020-invalid_lvalue_in_assignment.patch +new file mode 100644 +index 0000000..aeda139 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/020-invalid_lvalue_in_assignment.patch +@@ -0,0 +1,171 @@ ++diff --git a/lib/ftchash.c b/lib/ftchash.c ++index 9cc7efa..28bafbf 100644 ++--- a/lib/ftchash.c +++++ b/lib/ftchash.c ++@@ -326,7 +326,7 @@ void *ftchash_foreach(struct ftchash *ft ++ (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) { ++ ++ ret = ftch->traverse_rec; ++- (char*)ftch->traverse_rec += ftch->d_size; +++ ftch->traverse_rec = vpadd(ftch->traverse_rec, ftch->d_size); ++ return ret; ++ ++ } else { ++diff --git a/lib/ftio.c b/lib/ftio.c ++index f6c739c..1082416 100644 ++--- a/lib/ftio.c +++++ b/lib/ftio.c ++@@ -2267,7 +2267,7 @@ int readn(register int fd, register void ++ break; ++ ++ nleft -= nread; ++- (char*)ptr += nread; +++ ptr = vpadd(ptr, nread); ++ } ++ return (nbytes - nleft); ++ } /* readn */ ++@@ -2292,7 +2292,7 @@ int writen(register int fd, register voi ++ return(nwritten); /* error */ ++ ++ nleft -= nwritten; ++- (char*)ptr += nwritten; +++ ptr = vpadd(ptr,nwritten); ++ } ++ return(nbytes - nleft); ++ } /* writen */ ++diff --git a/lib/ftlib.h b/lib/ftlib.h ++index f91ad0a..66bf2f3 100644 ++--- a/lib/ftlib.h +++++ b/lib/ftlib.h ++@@ -152,7 +152,6 @@ #define FT_PDU_V8_11_MAXFLOWS 44 /* max ++ #define FT_PDU_V8_12_MAXFLOWS 44 /* max records in V8 DST_PREFIX_TOS packet */ ++ #define FT_PDU_V8_13_MAXFLOWS 35 /* max records in V8 PREFIX_TOS packet */ ++ #define FT_PDU_V8_14_MAXFLOWS 35 /* max records in V8 PREFIX_PORT_TOS packet */ ++- ++ #define FT_PDU_V8_1_VERSION 2 /* version of AS packet */ ++ #define FT_PDU_V8_2_VERSION 2 /* version of PROTO PORT packet */ ++ #define FT_PDU_V8_3_VERSION 2 /* version of SRC PREFIX packet */ ++@@ -3029,6 +3028,8 @@ #ifndef IN_CLASSD_SSM ++ #define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000) ++ #endif /* IN_CLASSD_SSM */ ++ +++void *vpadd(const void* v, const int change); +++ ++ /* MACHINE DEPENDANT */ ++ #define fmt_uint fmt_uint32 ++ ++diff --git a/lib/fttlv.c b/lib/fttlv.c ++index 7035813..330a783 100644 ++--- a/lib/fttlv.c +++++ b/lib/fttlv.c ++@@ -68,10 +68,10 @@ int fttlv_enc_uint32(void *buf, int buf_ ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&v, buf, 4); ++ ++@@ -107,10 +107,10 @@ int fttlv_enc_uint16(void *buf, int buf_ ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&v, buf, 2); ++ ++@@ -145,10 +145,10 @@ int fttlv_enc_uint8(void *buf, int buf_s ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&v, buf, 1); ++ ++@@ -183,10 +183,10 @@ int fttlv_enc_str(void *buf, int buf_siz ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(v, buf, len); ++ ++@@ -230,16 +230,16 @@ int fttlv_enc_ifname(void *buf, int buf_ ++ return -1; ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&ip, buf, 4); ++- (char*)buf += 4; +++ buf = vpadd(buf, 4); ++ ++ bcopy(&ifIndex, buf, 2); ++- (char*)buf += 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(name, buf, n); ++ ++@@ -287,19 +287,19 @@ int fttlv_enc_ifalias(void *buf, int buf ++ } ++ ++ bcopy(&t, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&len, buf, 2); ++- (char*)buf+= 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(&ip, buf, 4); ++- (char*)buf += 4; +++ buf = vpadd(buf, 4); ++ ++ bcopy(&entries, buf, 2); ++- (char*)buf += 2; +++ buf = vpadd(buf, 2); ++ ++ bcopy(ifIndex_list, buf, esize); ++- (char*)buf += esize; +++ buf = vpadd(buf, esize); ++ ++ bcopy(name, buf, n); ++ ++diff --git a/lib/support.c b/lib/support.c ++index a32ffe7..2e1db9f 100644 ++--- a/lib/support.c +++++ b/lib/support.c ++@@ -736,3 +736,8 @@ int udp_cksum(struct ip *ip, struct udph ++ return sum; ++ } /* udp_cksum */ ++ +++// void pointer add +++ +++void * vpadd(const void *v, const int change) { +++ return (void *) (((char*) v) + change); +++} +diff --git a/feeds/packages/net/flow-tools/patches/030-avoid_external_debug_var.patch b/feeds/packages/net/flow-tools/patches/030-avoid_external_debug_var.patch +new file mode 100644 +index 0000000..6ca5740 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/030-avoid_external_debug_var.patch +@@ -0,0 +1,13 @@ ++diff --git a/lib/ftfile.c b/lib/ftfile.c ++index 2f3ae76..f25e849 100644 ++--- a/lib/ftfile.c +++++ b/lib/ftfile.c ++@@ -53,7 +53,7 @@ #endif ++ ++ int load_dir(char *prefix, struct ftfile_entries *fte, int flags, int *depth); ++ ++-extern int debug; +++#define debug 0 ++ ++ /* ++ * function: ftfile_entry_new +diff --git a/feeds/packages/net/flow-tools/patches/050-fix-64bit_temp_time_t.patch b/feeds/packages/net/flow-tools/patches/050-fix-64bit_temp_time_t.patch +new file mode 100644 +index 0000000..99a06f7 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/050-fix-64bit_temp_time_t.patch +@@ -0,0 +1,41 @@ ++diff --git a/lib/ftfile.c b/lib/ftfile.c ++index f25e849..ec17771 100644 ++--- a/lib/ftfile.c +++++ b/lib/ftfile.c ++@@ -413,16 +413,17 @@ void ftfile_pathname(char *buf, int bsiz ++ int done, u_int32 ftime) ++ { ++ struct tm *tm; +++ time_t _t = (time_t) ftime; ++ char *prefix, dbuf[64]; ++ long gmt_val; ++ char gmt_sign; ++ int tm_gmtoff; ++ ++- if (!(tm = localtime ((time_t*)&ftime))) { +++ if (!(tm = localtime (&_t))) { ++ snprintf(buf, bsize, "."); ++ } ++ ++- tm_gmtoff = get_gmtoff(ftime); +++ tm_gmtoff = get_gmtoff(_t); ++ ++ /* compute GMT offset */ ++ if (tm_gmtoff >= 0) { ++@@ -502,6 +503,7 @@ void ftfile_pathname(char *buf, int bsiz ++ int ftfile_mkpath(u_int32 ftime, int nest) ++ { ++ struct tm *tm; +++ time_t _t = (time_t) ftime; ++ char buf[32]; ++ ++ /* no directories */ ++@@ -512,7 +514,7 @@ int ftfile_mkpath(u_int32 ftime, int nes ++ if ((nest > 3) || (nest < -3)) ++ return -1; ++ ++- if (!(tm = localtime ((time_t*)&ftime))) +++ if (!(tm = localtime (&_t))) ++ return -1; ++ ++ if (nest == -1) +diff --git a/feeds/packages/net/flow-tools/patches/060-fix_uninitialized_var_in_flow_send.patch b/feeds/packages/net/flow-tools/patches/060-fix_uninitialized_var_in_flow_send.patch +new file mode 100644 +index 0000000..2240537 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/060-fix_uninitialized_var_in_flow_send.patch +@@ -0,0 +1,13 @@ ++diff --git a/src/flow-send.c b/src/flow-send.c ++index 83ca926..ad87024 100644 ++--- a/src/flow-send.c +++++ b/src/flow-send.c ++@@ -76,7 +76,7 @@ int main(int argc, char **argv) ++ u_int32 privacy_mask; ++ unsigned int v1, v2, one; ++ int i, n, ret, tx_delay, udp_sock; ++- int src_ip_spoof, hdr_len; +++ int src_ip_spoof, hdr_len = 0; ++ void *rec; ++ ++ /* init fterr */ +diff --git a/feeds/packages/net/flow-tools/patches/070-extra_ftpdu_verify_debugging.patch b/feeds/packages/net/flow-tools/patches/070-extra_ftpdu_verify_debugging.patch +new file mode 100644 +index 0000000..911d369 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/070-extra_ftpdu_verify_debugging.patch +@@ -0,0 +1,49 @@ ++diff --git a/lib/ftdecode.c b/lib/ftdecode.c ++index ff6b0cf..8884db9 100644 ++--- a/lib/ftdecode.c +++++ b/lib/ftdecode.c ++@@ -122,8 +122,10 @@ int ftpdu_verify(struct ftpdu *ftpdu) ++ ret = -1; ++ ++ /* enough bytes to decode the count and version? */ ++- if (ftpdu->bused < 4) +++ if (ftpdu->bused < 4) { +++ fterr_warnx("not enough bytes to decode the count and version."); ++ goto ftpdu_verify_out_quick; +++ } ++ ++ ph = (struct ftpdu_header*)&ftpdu->buf; ++ ++@@ -158,15 +160,22 @@ #endif /* LITTLE_ENDIAN */ ++ case 5: ++ ++ /* max PDU's in record */ ++- if (ph->count > FT_PDU_V5_MAXFLOWS) +++ if (ph->count > FT_PDU_V5_MAXFLOWS) { +++ fterr_warnx("too many pdus (%d) in record, max %d", ph->count, +++ FT_PDU_V5_MAXFLOWS); ++ goto ftpdu_verify_out; +++ } +++ ++ ++ size = offsetof(struct ftpdu_v5, records) + ++ ph->count * sizeof (struct ftrec_v5); ++ ++ /* PDU received size == PDU expected size? */ ++- if (size != ftpdu->bused) +++ if (size != ftpdu->bused) { +++ fterr_warnx("pdu received size was wrong. expected %d got %d", +++ ftpdu->bused, size); ++ goto ftpdu_verify_out; +++ } ++ ++ ftpdu->ftv.d_version = 5; ++ ftpdu->decodef = fts3rec_pdu_v5_decode; ++@@ -516,6 +525,7 @@ #endif /* LITTLE_ENDIAN */ ++ break; /* 8 */ ++ ++ default: +++ fterr_warnx("ftpdu version not set."); ++ goto ftpdu_verify_out; ++ ++ } /* switch ph->version */ +diff --git a/feeds/packages/net/flow-tools/patches/080-fix_uninitialized_var_in_flow_export.patch b/feeds/packages/net/flow-tools/patches/080-fix_uninitialized_var_in_flow_export.patch +new file mode 100644 +index 0000000..bd88403 +--- /dev/null ++++ b/feeds/packages/net/flow-tools/patches/080-fix_uninitialized_var_in_flow_export.patch +@@ -0,0 +1,13 @@ ++diff --git a/src/flow-export.c b/src/flow-export.c ++index 52ae4d2..22b0330 100644 ++--- a/src/flow-export.c +++++ b/src/flow-export.c ++@@ -961,7 +961,7 @@ #endif /* PGSQL */ ++ ++ int fmt_xfields_type(char *buf, u_int64 xfield) ++ { ++- int comma; +++ int comma = 0; ++ ++ buf[0] = 0; ++ +diff --git a/feeds/packages/net/fping/.svn/entries b/feeds/packages/net/fping/.svn/entries +new file mode 100644 +index 0000000..ca315d2 +--- /dev/null ++++ b/feeds/packages/net/fping/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fping ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++04662328e70267cf24785880b41a128e ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1950 ++ +diff --git a/feeds/packages/net/fping/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/fping/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/fping/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/fping/.svn/text-base/Makefile.svn-base b/feeds/packages/net/fping/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..93f1bc5 +--- /dev/null ++++ b/feeds/packages/net/fping/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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:=fping ++PKG_VERSION:=2.4b2_to-ipv6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.fping.com/download/ ++PKG_MD5SUM:=3ad516765514249a40d3c5b6caab812a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fping ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A program to ping multiple hosts in parallel ++ URL:=http://www.fping.com ++endef ++ ++define Package/fping/description ++ fping is a ping(1) like program which uses the Internet Control Message Protocol ++ (ICMP) echo request to determine if a host is up. fping is different from ping in ++ that you can specify any number of hosts on the command line, or specify a file ++ containing the lists of hosts to ping. Instead of trying one host until it timeouts ++ or replies, fping will send out a ping packet and move on to the next host in a ++ round-robin fashion. If a host replies, it is noted and removed from the list of ++ hosts to check. If a host does not respond within a certain time limit and/or retry ++ limit it will be considered unreachable. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure \ ++ stamp-h.in \ ++ config.h.in \ ++ ); ++ $(call Build/Configure/Default,) ++endef ++ ++define Build/Compile ++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) clean $(PKG_NAME) ++ mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)4 ++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -DIPV6=1" -C $(PKG_BUILD_DIR) clean $(PKG_NAME) ++ mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)6 ++endef ++ ++define Package/fping/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fping4 $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/fping6 $(1)/usr/bin/ ++ ln -sf fping4 $(1)/usr/bin/fping ++endef ++ ++$(eval $(call BuildPackage,fping)) +diff --git a/feeds/packages/net/fping/Makefile b/feeds/packages/net/fping/Makefile +new file mode 100644 +index 0000000..93f1bc5 +--- /dev/null ++++ b/feeds/packages/net/fping/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=fping ++PKG_VERSION:=2.4b2_to-ipv6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.fping.com/download/ ++PKG_MD5SUM:=3ad516765514249a40d3c5b6caab812a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fping ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A program to ping multiple hosts in parallel ++ URL:=http://www.fping.com ++endef ++ ++define Package/fping/description ++ fping is a ping(1) like program which uses the Internet Control Message Protocol ++ (ICMP) echo request to determine if a host is up. fping is different from ping in ++ that you can specify any number of hosts on the command line, or specify a file ++ containing the lists of hosts to ping. Instead of trying one host until it timeouts ++ or replies, fping will send out a ping packet and move on to the next host in a ++ round-robin fashion. If a host replies, it is noted and removed from the list of ++ hosts to check. If a host does not respond within a certain time limit and/or retry ++ limit it will be considered unreachable. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure \ ++ stamp-h.in \ ++ config.h.in \ ++ ); ++ $(call Build/Configure/Default,) ++endef ++ ++define Build/Compile ++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) clean $(PKG_NAME) ++ mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)4 ++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -DIPV6=1" -C $(PKG_BUILD_DIR) clean $(PKG_NAME) ++ mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)6 ++endef ++ ++define Package/fping/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fping4 $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/fping6 $(1)/usr/bin/ ++ ln -sf fping4 $(1)/usr/bin/fping ++endef ++ ++$(eval $(call BuildPackage,fping)) +diff --git a/feeds/packages/net/fping/patches/.svn/entries b/feeds/packages/net/fping/patches/.svn/entries +new file mode 100644 +index 0000000..620dadf +--- /dev/null ++++ b/feeds/packages/net/fping/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fping/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-debian.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++b6a4cbc909e9774903f7117d4db344b0 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4716 ++ +diff --git a/feeds/packages/net/fping/patches/.svn/prop-base/001-debian.patch.svn-base b/feeds/packages/net/fping/patches/.svn/prop-base/001-debian.patch.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/packages/net/fping/patches/.svn/prop-base/001-debian.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/packages/net/fping/patches/.svn/text-base/001-debian.patch.svn-base b/feeds/packages/net/fping/patches/.svn/text-base/001-debian.patch.svn-base +new file mode 100644 +index 0000000..a24dabb +--- /dev/null ++++ b/feeds/packages/net/fping/patches/.svn/text-base/001-debian.patch.svn-base +@@ -0,0 +1,165 @@ ++--- fping-2.4b2-to-ipv6.orig/fping.8 +++++ fping-2.4b2-to-ipv6/fping.8 ++@@ -1,4 +1,4 @@ ++-.TH fping l +++.TH fping 8 ++ .SH NAME ++ fping \- send ICMP ECHO_REQUEST packets to network hosts ++ .SH SYNOPSIS ++@@ -152,7 +152,7 @@ ++ example none the less. ++ .nf ++ ++-#!/usr/local/bin/perl +++#!/usr/bin/perl ++ require 'open2.pl'; ++ ++ $MAILTO = "root"; ++@@ -178,7 +178,7 @@ ++ that are currently reachable. ++ .nf ++ ++-#!/usr/local/bin/perl +++#!/usr/bin/perl ++ ++ $hosts_to_backup = `cat /etc/hosts.backup | fping -a`; ++ ++--- fping-2.4b2-to-ipv6.orig/fping.c +++++ fping-2.4b2-to-ipv6/fping.c ++@@ -42,7 +42,6 @@ ++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED ++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. ++ */ ++-#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */ ++ ++ #ifndef _NO_PROTO ++ #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \ ++@@ -101,13 +100,8 @@ ++ #endif ++ #include ++ ++-/* Linux has bizarre ip.h and ip_icmp.h */ ++-#if defined( __linux__ ) ++-#include "linux.h" ++-#else ++ #include ++ #include ++-#endif /* defined(__linux__) */ ++ ++ #include ++ #include ++@@ -150,7 +144,11 @@ ++ #define MIN_PING_DATA sizeof( PING_DATA ) ++ #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */ ++ #define SIZE_IP_HDR 20 +++#ifndef IPV6 ++ #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */ +++#else +++#define SIZE_ICMP_HDR sizeof(FPING_ICMPHDR) +++#endif ++ #define MAX_PING_DATA ( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR ) ++ ++ /* sized so as to be like traditional ping */ ++@@ -474,6 +472,35 @@ ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RTHDR)"); ++ #endif +++#ifndef USE_SIN6_SCOPE_ID +++#ifdef IPV6_RECVPKTINFO +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_RECVPKTINFO)"); +++#else /* old adv. API */ +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_PKTINFO)"); +++#endif +++#endif /* USE_SIN6_SCOPE_ID */ +++#ifdef IPV6_RECVHOPLIMIT +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_RECVHOPLIMIT)"); +++#else /* old adv. API */ +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_HOPLIMIT)"); +++#endif +++#ifdef IPV6_CHECKSUM +++#ifndef SOL_RAW +++#define SOL_RAW IPPROTO_IPV6 +++#endif +++ opton = 2; +++ if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)"); +++#endif ++ #endif ++ ++ if( ( uid = getuid() ) ) ++@@ -1112,7 +1139,7 @@ ++ /* but allow time for the last one to come in */ ++ if( count_flag ) ++ { ++- if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) ) +++ if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) ) ++ { ++ remove_job( cursor ); ++ continue; ++@@ -1382,15 +1409,15 @@ ++ if( h->num_recv_i <= h->num_sent_i ) ++ { ++ fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%", ++- h->num_sent_i, h->num_recv_i, ++- ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i ); +++ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? +++ ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 ); ++ ++ }/* IF */ ++ else ++ { ++ fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%", ++- h->num_sent_i, h->num_recv_i, ++- ( ( h->num_recv_i * 100 ) / h->num_sent_i ) ); +++ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? +++ ( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 ); ++ ++ }/* ELSE */ ++ ++@@ -2165,20 +2192,33 @@ ++ struct addrinfo *res, hints; ++ int ret_ga; ++ char *hostname; +++ size_t len; ++ ++ /* getaddrinfo */ ++ bzero(&hints, sizeof(struct addrinfo)); ++- hints.ai_flags = AI_CANONNAME; +++ hints.ai_flags = name_flag ? AI_CANONNAME : 0; ++ hints.ai_family = AF_INET6; ++ hints.ai_socktype = SOCK_RAW; ++ hints.ai_protocol = IPPROTO_ICMPV6; ++ ++ ret_ga = getaddrinfo(name, NULL, &hints, &res); ++- if (ret_ga) errx(1, "%s", gai_strerror(ret_ga)); +++ if (ret_ga) { +++ if(!quiet_flag) +++ warnx("%s", gai_strerror(ret_ga)); +++ num_noaddress++; +++ return; +++ } ++ if (res->ai_canonname) hostname = res->ai_canonname; ++ else hostname = name; ++- if (!res->ai_addr) errx(1, "getaddrinfo failed"); ++- (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/ +++ if (!res->ai_addr) { +++ if(!quiet_flag) +++ warnx("getaddrinfo failed"); +++ num_noaddress++; +++ return; +++ } +++ len = res->ai_addrlen; +++ if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR); +++ (void)memcpy(&dst, res->ai_addr, len); ++ add_addr(name, name, &dst); ++ #endif ++ } /* add_name() */ +diff --git a/feeds/packages/net/fping/patches/001-debian.patch b/feeds/packages/net/fping/patches/001-debian.patch +new file mode 100644 +index 0000000..a24dabb +--- /dev/null ++++ b/feeds/packages/net/fping/patches/001-debian.patch +@@ -0,0 +1,165 @@ ++--- fping-2.4b2-to-ipv6.orig/fping.8 +++++ fping-2.4b2-to-ipv6/fping.8 ++@@ -1,4 +1,4 @@ ++-.TH fping l +++.TH fping 8 ++ .SH NAME ++ fping \- send ICMP ECHO_REQUEST packets to network hosts ++ .SH SYNOPSIS ++@@ -152,7 +152,7 @@ ++ example none the less. ++ .nf ++ ++-#!/usr/local/bin/perl +++#!/usr/bin/perl ++ require 'open2.pl'; ++ ++ $MAILTO = "root"; ++@@ -178,7 +178,7 @@ ++ that are currently reachable. ++ .nf ++ ++-#!/usr/local/bin/perl +++#!/usr/bin/perl ++ ++ $hosts_to_backup = `cat /etc/hosts.backup | fping -a`; ++ ++--- fping-2.4b2-to-ipv6.orig/fping.c +++++ fping-2.4b2-to-ipv6/fping.c ++@@ -42,7 +42,6 @@ ++ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED ++ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. ++ */ ++-#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */ ++ ++ #ifndef _NO_PROTO ++ #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \ ++@@ -101,13 +100,8 @@ ++ #endif ++ #include ++ ++-/* Linux has bizarre ip.h and ip_icmp.h */ ++-#if defined( __linux__ ) ++-#include "linux.h" ++-#else ++ #include ++ #include ++-#endif /* defined(__linux__) */ ++ ++ #include ++ #include ++@@ -150,7 +144,11 @@ ++ #define MIN_PING_DATA sizeof( PING_DATA ) ++ #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */ ++ #define SIZE_IP_HDR 20 +++#ifndef IPV6 ++ #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */ +++#else +++#define SIZE_ICMP_HDR sizeof(FPING_ICMPHDR) +++#endif ++ #define MAX_PING_DATA ( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR ) ++ ++ /* sized so as to be like traditional ping */ ++@@ -474,6 +472,35 @@ ++ sizeof(opton))) ++ err(1, "setsockopt(IPV6_RTHDR)"); ++ #endif +++#ifndef USE_SIN6_SCOPE_ID +++#ifdef IPV6_RECVPKTINFO +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_RECVPKTINFO)"); +++#else /* old adv. API */ +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_PKTINFO)"); +++#endif +++#endif /* USE_SIN6_SCOPE_ID */ +++#ifdef IPV6_RECVHOPLIMIT +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_RECVHOPLIMIT)"); +++#else /* old adv. API */ +++ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(IPV6_HOPLIMIT)"); +++#endif +++#ifdef IPV6_CHECKSUM +++#ifndef SOL_RAW +++#define SOL_RAW IPPROTO_IPV6 +++#endif +++ opton = 2; +++ if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton, +++ sizeof(opton))) +++ err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)"); +++#endif ++ #endif ++ ++ if( ( uid = getuid() ) ) ++@@ -1112,7 +1139,7 @@ ++ /* but allow time for the last one to come in */ ++ if( count_flag ) ++ { ++- if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) ) +++ if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) ) ++ { ++ remove_job( cursor ); ++ continue; ++@@ -1382,15 +1409,15 @@ ++ if( h->num_recv_i <= h->num_sent_i ) ++ { ++ fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%", ++- h->num_sent_i, h->num_recv_i, ++- ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i ); +++ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? +++ ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 ); ++ ++ }/* IF */ ++ else ++ { ++ fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%", ++- h->num_sent_i, h->num_recv_i, ++- ( ( h->num_recv_i * 100 ) / h->num_sent_i ) ); +++ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? +++ ( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 ); ++ ++ }/* ELSE */ ++ ++@@ -2165,20 +2192,33 @@ ++ struct addrinfo *res, hints; ++ int ret_ga; ++ char *hostname; +++ size_t len; ++ ++ /* getaddrinfo */ ++ bzero(&hints, sizeof(struct addrinfo)); ++- hints.ai_flags = AI_CANONNAME; +++ hints.ai_flags = name_flag ? AI_CANONNAME : 0; ++ hints.ai_family = AF_INET6; ++ hints.ai_socktype = SOCK_RAW; ++ hints.ai_protocol = IPPROTO_ICMPV6; ++ ++ ret_ga = getaddrinfo(name, NULL, &hints, &res); ++- if (ret_ga) errx(1, "%s", gai_strerror(ret_ga)); +++ if (ret_ga) { +++ if(!quiet_flag) +++ warnx("%s", gai_strerror(ret_ga)); +++ num_noaddress++; +++ return; +++ } ++ if (res->ai_canonname) hostname = res->ai_canonname; ++ else hostname = name; ++- if (!res->ai_addr) errx(1, "getaddrinfo failed"); ++- (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/ +++ if (!res->ai_addr) { +++ if(!quiet_flag) +++ warnx("getaddrinfo failed"); +++ num_noaddress++; +++ return; +++ } +++ len = res->ai_addrlen; +++ if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR); +++ (void)memcpy(&dst, res->ai_addr, len); ++ add_addr(name, name, &dst); ++ #endif ++ } /* add_name() */ +diff --git a/feeds/packages/net/fprobe-ulog/.svn/entries b/feeds/packages/net/fprobe-ulog/.svn/entries +new file mode 100644 +index 0000000..b09b4c0 +--- /dev/null ++++ b/feeds/packages/net/fprobe-ulog/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fprobe-ulog ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++c5ac1b4e539da215d8c85acbb2d1643b ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1063 ++ +diff --git a/feeds/packages/net/fprobe-ulog/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/fprobe-ulog/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/fprobe-ulog/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/fprobe-ulog/.svn/text-base/Makefile.svn-base b/feeds/packages/net/fprobe-ulog/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..64c02fb +--- /dev/null ++++ b/feeds/packages/net/fprobe-ulog/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=fprobe-ulog ++PKG_VERSION:=1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/fprobe ++PKG_MD5SUM:=cdb2e4edc47e8a3d5479eeabfb979ebc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fprobe-ulog ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread ++ TITLE:=NetFlow probe (ulog-based) ++ URL:=http://fprobe.sourceforge.net ++endef ++ ++define Package/fprobe-ulog/description ++ A NetFlow probe obtaining packets through linux netfilter code ++ (iptables ULOG target). ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-piddir=/var \ ++ --with-membulk=index8 \ ++ --with-hash=xor8 \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/fprobe-ulog/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fprobe-ulog $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,fprobe-ulog)) +diff --git a/feeds/packages/net/fprobe-ulog/Makefile b/feeds/packages/net/fprobe-ulog/Makefile +new file mode 100644 +index 0000000..64c02fb +--- /dev/null ++++ b/feeds/packages/net/fprobe-ulog/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=fprobe-ulog ++PKG_VERSION:=1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/fprobe ++PKG_MD5SUM:=cdb2e4edc47e8a3d5479eeabfb979ebc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fprobe-ulog ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpthread ++ TITLE:=NetFlow probe (ulog-based) ++ URL:=http://fprobe.sourceforge.net ++endef ++ ++define Package/fprobe-ulog/description ++ A NetFlow probe obtaining packets through linux netfilter code ++ (iptables ULOG target). ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-piddir=/var \ ++ --with-membulk=index8 \ ++ --with-hash=xor8 \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/fprobe-ulog/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fprobe-ulog $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,fprobe-ulog)) +diff --git a/feeds/packages/net/fprobe/.svn/entries b/feeds/packages/net/fprobe/.svn/entries +new file mode 100644 +index 0000000..cda545b +--- /dev/null ++++ b/feeds/packages/net/fprobe/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fprobe ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++9880257b7dbf9c4d12dbabb33544a604 ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1002 ++ +diff --git a/feeds/packages/net/fprobe/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/fprobe/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/fprobe/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/fprobe/.svn/text-base/Makefile.svn-base b/feeds/packages/net/fprobe/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f6be152 +--- /dev/null ++++ b/feeds/packages/net/fprobe/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=fprobe ++PKG_VERSION:=1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/fprobe ++PKG_MD5SUM:=65850d0470078269b33eee58cba77ac2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fprobe ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libpthread ++ TITLE:=NetFlow probe (libpcap-based) ++ URL:=http://fprobe.sourceforge.net/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-piddir=/var \ ++ --with-pcap="$(STAGING_DIR)/usr/include" \ ++ --with-libpcap="$(STAGING_DIR)/usr/lib" \ ++ --with-membulk=index8 \ ++ --with-hash=xor8 \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/fprobe/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fprobe $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,fprobe)) +diff --git a/feeds/packages/net/fprobe/Makefile b/feeds/packages/net/fprobe/Makefile +new file mode 100644 +index 0000000..f6be152 +--- /dev/null ++++ b/feeds/packages/net/fprobe/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=fprobe ++PKG_VERSION:=1.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/fprobe ++PKG_MD5SUM:=65850d0470078269b33eee58cba77ac2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fprobe ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libpcap +libpthread ++ TITLE:=NetFlow probe (libpcap-based) ++ URL:=http://fprobe.sourceforge.net/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-piddir=/var \ ++ --with-pcap="$(STAGING_DIR)/usr/include" \ ++ --with-libpcap="$(STAGING_DIR)/usr/lib" \ ++ --with-membulk=index8 \ ++ --with-hash=xor8 \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/fprobe/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fprobe $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,fprobe)) +diff --git a/feeds/packages/net/freepops/.svn/entries b/feeds/packages/net/freepops/.svn/entries +new file mode 100644 +index 0000000..3d26655 +--- /dev/null ++++ b/feeds/packages/net/freepops/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freepops ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:06:54.402040Z ++28958 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0d8876d2b12d854b6bb1128f42875590 ++2011-11-11T18:06:54.402040Z ++28958 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2081 ++ +diff --git a/feeds/packages/net/freepops/.svn/text-base/Makefile.svn-base b/feeds/packages/net/freepops/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d1ca8a6 +--- /dev/null ++++ b/feeds/packages/net/freepops/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freepops ++PKG_VERSION:=0.2.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/freepops ++PKG_MD5SUM:=d18848b903ceb68a53ded6b6d9e33047 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freepops ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=POP3 interface to several webmails ++ DEPENDS:=+libpthread +liblua +luafilesystem +luaexpat @BROKEN # +luacurl ++ URL:=http://www.freepops.org ++endef ++ ++define Package/freepops/description ++ FreePOPs is a POP3 daemon that translates local POP3 commands ++ to remote HTTP requests to the supported webmail sites. ++ ++ FreePOPs can also be used as RSS aggregator and POP3 forwarder. ++endef ++ ++define Build/Configure ++ cd $(PKG_BUILD_DIR) && \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) -DHAVE_CONFIG_H -I$(PKG_BUILD_DIR)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -llua -llua-filesystem -llua-curl -llua-expat" \ ++ PKGCONFIG=true \ ++ ./configure.sh openwrt -lua -luafilesystem -luacurl -luaexpat ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) WHERE=/usr/ all ++ $(TARGET_CROSS)strip $(PKG_BUILD_DIR)/src/freepopsd ++endef ++ ++define Package/freepops/install ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR)/ WHERE=/usr/ install ++ mkdir -p $(PKG_INSTALL_DIR)/etc/init.d ++ $(CP) $(PKG_BUILD_DIR)/buildfactory/openwrt/S50freepopsd \ ++ $(PKG_INSTALL_DIR)/etc/init.d ++ chmod a+x $(PKG_INSTALL_DIR)/etc/init.d/* ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/doc ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/man ++ rm -rf $(PKG_INSTALL_DIR)/usr/bin/freepops-updater-dialog ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/freepops/lua/foo.lua ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/freepops/lua/skeleton.lua ++ cp -r $(PKG_INSTALL_DIR)/* $(1) ++endef ++ ++$(eval $(call BuildPackage,freepops)) +diff --git a/feeds/packages/net/freepops/Makefile b/feeds/packages/net/freepops/Makefile +new file mode 100644 +index 0000000..d1ca8a6 +--- /dev/null ++++ b/feeds/packages/net/freepops/Makefile +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=freepops ++PKG_VERSION:=0.2.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/freepops ++PKG_MD5SUM:=d18848b903ceb68a53ded6b6d9e33047 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freepops ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=POP3 interface to several webmails ++ DEPENDS:=+libpthread +liblua +luafilesystem +luaexpat @BROKEN # +luacurl ++ URL:=http://www.freepops.org ++endef ++ ++define Package/freepops/description ++ FreePOPs is a POP3 daemon that translates local POP3 commands ++ to remote HTTP requests to the supported webmail sites. ++ ++ FreePOPs can also be used as RSS aggregator and POP3 forwarder. ++endef ++ ++define Build/Configure ++ cd $(PKG_BUILD_DIR) && \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) -DHAVE_CONFIG_H -I$(PKG_BUILD_DIR)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -llua -llua-filesystem -llua-curl -llua-expat" \ ++ PKGCONFIG=true \ ++ ./configure.sh openwrt -lua -luafilesystem -luacurl -luaexpat ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) WHERE=/usr/ all ++ $(TARGET_CROSS)strip $(PKG_BUILD_DIR)/src/freepopsd ++endef ++ ++define Package/freepops/install ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR)/ WHERE=/usr/ install ++ mkdir -p $(PKG_INSTALL_DIR)/etc/init.d ++ $(CP) $(PKG_BUILD_DIR)/buildfactory/openwrt/S50freepopsd \ ++ $(PKG_INSTALL_DIR)/etc/init.d ++ chmod a+x $(PKG_INSTALL_DIR)/etc/init.d/* ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/doc ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/man ++ rm -rf $(PKG_INSTALL_DIR)/usr/bin/freepops-updater-dialog ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/freepops/lua/foo.lua ++ rm -rf $(PKG_INSTALL_DIR)/usr/share/freepops/lua/skeleton.lua ++ cp -r $(PKG_INSTALL_DIR)/* $(1) ++endef ++ ++$(eval $(call BuildPackage,freepops)) +diff --git a/feeds/packages/net/freeradius2/.svn/entries b/feeds/packages/net/freeradius2/.svn/entries +new file mode 100644 +index 0000000..120c80f +--- /dev/null ++++ b/feeds/packages/net/freeradius2/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freeradius2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-10T21:39:02.068776Z ++33365 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++e217d6652ca3cb97c1de670ef69426cc ++2012-09-10T21:39:02.068776Z ++33365 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++17946 ++ +diff --git a/feeds/packages/net/freeradius2/.svn/text-base/Makefile.svn-base b/feeds/packages/net/freeradius2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..28955f7 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,612 @@ ++# ++# 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:=freeradius2 ++PKG_VERSION:=2.2.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/ ++PKG_MD5SUM:=0fb333fe6a64eb2b1dd6ef67f7bca119 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION) ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freeradius2/Default ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://freeradius.org/ ++endef ++ ++define Package/freeradius2 ++ $(call Package/freeradius2/Default) ++ DEPENDS:=+libltdl +libopenssl +libpthread +libreadline ++ TITLE:=A flexible RADIUS server (version 2) ++ MENU:=1 ++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-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 ++ TITLE:=EAP/PEAP module ++endef ++ ++define Package/freeradius2-mod-eap-tls ++ $(call Package/freeradius2/Default) ++ DEPENDS:=freeradius2-mod-eap ++ 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 +PACKAGE_freeradius2-mod-ldap: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 \ ++ +PACKAGE_freeradius2-mod-sql-mysql:libmysqlclient-r ++ TITLE:=MySQL module ++endef ++ ++define Package/freeradius2-mod-sql-pgsql ++ $(call Package/freeradius2/Default) ++ DEPENDS:=freeradius2-mod-sql \ ++ +PACKAGE_freeradius2-mod-sql-pgsql:libpq ++ TITLE:=PostgreSQL module ++endef ++ ++define Package/freeradius2-mod-sql-sqlite ++ $(call Package/freeradius2/Default) ++ DEPENDS:=freeradius2-mod-sql \ ++ +PACKAGE_freeradius2-mod-sql-sqlite: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 ++ 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 \ ++ --with-openssl-includes="$(STAGING_DIR)/usr/include" \ ++ --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/install ++ $(INSTALL_DIR) $(1)/etc/freeradius2 ++ $(INSTALL_DIR) $(1)/etc/freeradius2/modules ++ $(INSTALL_DIR) $(1)/etc/freeradius2/sites ++ chmod 771 $(1)/etc/freeradius2 ++ for f in clients.conf dictionary 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/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 ++ $(INSTALL_DIR) $(1)/usr/lib/freeradius2 ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-radius{,-*}.so $(1)/usr/lib/freeradius2 ++ ln -s freeradius2/libfreeradius-radius-$(PKG_VERSION).so $(1)/usr/lib/ ++ ln -s freeradius2/libfreeradius-eap-$(PKG_VERSION).so $(1)/usr/lib/ ++ $(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-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,libfreeradius-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/feeds/packages/net/freeradius2/Makefile b/feeds/packages/net/freeradius2/Makefile +new file mode 100644 +index 0000000..28955f7 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/Makefile +@@ -0,0 +1,612 @@ ++# ++# 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:=freeradius2 ++PKG_VERSION:=2.2.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/ ++PKG_MD5SUM:=0fb333fe6a64eb2b1dd6ef67f7bca119 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION) ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freeradius2/Default ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://freeradius.org/ ++endef ++ ++define Package/freeradius2 ++ $(call Package/freeradius2/Default) ++ DEPENDS:=+libltdl +libopenssl +libpthread +libreadline ++ TITLE:=A flexible RADIUS server (version 2) ++ MENU:=1 ++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-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 ++ TITLE:=EAP/PEAP module ++endef ++ ++define Package/freeradius2-mod-eap-tls ++ $(call Package/freeradius2/Default) ++ DEPENDS:=freeradius2-mod-eap ++ 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 +PACKAGE_freeradius2-mod-ldap: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 \ ++ +PACKAGE_freeradius2-mod-sql-mysql:libmysqlclient-r ++ TITLE:=MySQL module ++endef ++ ++define Package/freeradius2-mod-sql-pgsql ++ $(call Package/freeradius2/Default) ++ DEPENDS:=freeradius2-mod-sql \ ++ +PACKAGE_freeradius2-mod-sql-pgsql:libpq ++ TITLE:=PostgreSQL module ++endef ++ ++define Package/freeradius2-mod-sql-sqlite ++ $(call Package/freeradius2/Default) ++ DEPENDS:=freeradius2-mod-sql \ ++ +PACKAGE_freeradius2-mod-sql-sqlite: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 ++ 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 \ ++ --with-openssl-includes="$(STAGING_DIR)/usr/include" \ ++ --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/install ++ $(INSTALL_DIR) $(1)/etc/freeradius2 ++ $(INSTALL_DIR) $(1)/etc/freeradius2/modules ++ $(INSTALL_DIR) $(1)/etc/freeradius2/sites ++ chmod 771 $(1)/etc/freeradius2 ++ for f in clients.conf dictionary 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/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 ++ $(INSTALL_DIR) $(1)/usr/lib/freeradius2 ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-radius{,-*}.so $(1)/usr/lib/freeradius2 ++ ln -s freeradius2/libfreeradius-radius-$(PKG_VERSION).so $(1)/usr/lib/ ++ ln -s freeradius2/libfreeradius-eap-$(PKG_VERSION).so $(1)/usr/lib/ ++ $(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-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,libfreeradius-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/feeds/packages/net/freeradius2/files/.svn/entries b/feeds/packages/net/freeradius2/files/.svn/entries +new file mode 100644 +index 0000000..570d9a3 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freeradius2/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-12T09:40:31.908340Z ++15791 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++radiusd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++97082c6ace8b8c1c32aca0953615a0f6 ++2009-05-12T09:40:31.908340Z ++15791 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++428 ++ +diff --git a/feeds/packages/net/freeradius2/files/.svn/text-base/radiusd.init.svn-base b/feeds/packages/net/freeradius2/files/.svn/text-base/radiusd.init.svn-base +new file mode 100644 +index 0000000..27f75c6 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/files/.svn/text-base/radiusd.init.svn-base +@@ -0,0 +1,22 @@ ++#!/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/feeds/packages/net/freeradius2/files/radiusd.init b/feeds/packages/net/freeradius2/files/radiusd.init +new file mode 100644 +index 0000000..27f75c6 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/files/radiusd.init +@@ -0,0 +1,22 @@ ++#!/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/feeds/packages/net/freeradius2/patches/.svn/entries b/feeds/packages/net/freeradius2/patches/.svn/entries +new file mode 100644 +index 0000000..a4f6aa9 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freeradius2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-12T08:31:02.732620Z ++30465 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++004-ldap_configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++3e1263d9ebfd4d9ff505a637b8a11496 ++2010-11-21T14:24:49.404405Z ++24059 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++141256 ++ ++002-config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++1e5b5321652a536c2612422bbb96c63b ++2012-02-12T08:31:02.732620Z ++30465 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++14567 ++ ++008-honor_ccpflags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++0f15bef4070e028aa4c5d389855eac21 ++2009-10-07T22:33:27.050835Z ++17987 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++585 ++ ++001-fix-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++13df06b830b81dfcb2013050b129d78e ++2012-02-12T08:31:02.732620Z ++30465 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++173 ++ +diff --git a/feeds/packages/net/freeradius2/patches/.svn/prop-base/002-config.patch.svn-base b/feeds/packages/net/freeradius2/patches/.svn/prop-base/002-config.patch.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/prop-base/002-config.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/net/freeradius2/patches/.svn/prop-base/004-ldap_configure.patch.svn-base b/feeds/packages/net/freeradius2/patches/.svn/prop-base/004-ldap_configure.patch.svn-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/prop-base/004-ldap_configure.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/net/freeradius2/patches/.svn/text-base/001-fix-makefile.patch.svn-base b/feeds/packages/net/freeradius2/patches/.svn/text-base/001-fix-makefile.patch.svn-base +new file mode 100644 +index 0000000..2daaec8 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/text-base/001-fix-makefile.patch.svn-base +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/net/freeradius2/patches/.svn/text-base/002-config.patch.svn-base b/feeds/packages/net/freeradius2/patches/.svn/text-base/002-config.patch.svn-base +new file mode 100644 +index 0000000..4eb48b7 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/text-base/002-config.patch.svn-base +@@ -0,0 +1,588 @@ ++--- a/raddb/dictionary.in +++++ b/raddb/dictionary.in ++@@ -23,7 +23,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 ++ # ++@@ -205,7 +205,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 ++@@ -215,7 +215,7 @@ ++ # message is included ONLY in the ++ # First packet of a fragment series. ++ # ++- # include_length = yes +++ include_length = yes ++ ++ # Check the Certificate Revocation List ++ # ++@@ -281,7 +281,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 ++@@ -316,7 +316,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 ++@@ -332,14 +332,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 ++@@ -348,8 +348,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 ++@@ -449,7 +449,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 ++@@ -457,7 +457,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 ++@@ -473,7 +473,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 ++@@ -486,7 +486,7 @@ ++ # the tunneled request. ++ # ++ # allowed values: {no, yes} ++- use_tunneled_reply = no +++# use_tunneled_reply = no ++ ++ # ++ # The inner tunneled request can be sent ++@@ -498,13 +498,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 ++- } +++# } ++ ++ ################################################## ++ # ++@@ -573,14 +573,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 ++@@ -592,7 +592,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} ++@@ -290,7 +290,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. ++ # ++@@ -317,7 +317,7 @@ listen { ++ # ipv6addr = :: ++ port = 0 ++ type = acct ++-# interface = eth0 +++ interface = br-lan ++ # clients = per_socket_clients ++ } ++ ++@@ -541,8 +541,8 @@ security { ++ # ++ # allowed values: {no, yes} ++ # ++-proxy_requests = yes ++-$INCLUDE proxy.conf +++proxy_requests = no +++#$INCLUDE proxy.conf ++ ++ ++ # CLIENTS CONFIGURATION ++@@ -739,7 +739,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, ++@@ -752,15 +752,15 @@ instantiate { ++ # listed in any other section. See 'doc/rlm_expr' for ++ # more information. ++ # ++- 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. ++ # ++@@ -784,7 +784,7 @@ instantiate { ++ # to multiple times. ++ # ++ ###################################################################### ++-$INCLUDE policy.conf +++#$INCLUDE policy.conf ++ ++ ###################################################################### ++ # ++@@ -794,9 +794,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/ ++ ++ ###################################################################### ++ # ++@@ -804,7 +804,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, ++@@ -558,12 +558,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, ++@@ -573,7 +573,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 ++@@ -589,14 +589,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' ++@@ -620,7 +620,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 ++@@ -642,5 +642,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/feeds/packages/net/freeradius2/patches/.svn/text-base/004-ldap_configure.patch.svn-base b/feeds/packages/net/freeradius2/patches/.svn/text-base/004-ldap_configure.patch.svn-base +new file mode 100644 +index 0000000..7f3e240 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/text-base/004-ldap_configure.patch.svn-base +@@ -0,0 +1,4253 @@ ++--- 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 +++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 +++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 +++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 +++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 ." ++ ++ _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` +++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 >$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 +++' >$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/feeds/packages/net/freeradius2/patches/.svn/text-base/008-honor_ccpflags.patch.svn-base b/feeds/packages/net/freeradius2/patches/.svn/text-base/008-honor_ccpflags.patch.svn-base +new file mode 100644 +index 0000000..bb5f81a +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/.svn/text-base/008-honor_ccpflags.patch.svn-base +@@ -0,0 +1,15 @@ ++--- a/src/modules/rules.mak +++++ b/src/modules/rules.mak ++@@ -63,10 +63,10 @@ $(LT_OBJS): $(SERVER_HEADERS) ++ # ++ ####################################################################### ++ %.lo: %.c ++- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c $< +++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $< ++ ++ %.lo: %.cpp ++- $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(RLM_CFLAGS) -c $< +++ $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $< ++ ++ ifneq ($(TARGET),) ++ ####################################################################### +diff --git a/feeds/packages/net/freeradius2/patches/001-fix-makefile.patch b/feeds/packages/net/freeradius2/patches/001-fix-makefile.patch +new file mode 100644 +index 0000000..2daaec8 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/001-fix-makefile.patch +@@ -0,0 +1,10 @@ ++--- 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/feeds/packages/net/freeradius2/patches/002-config.patch b/feeds/packages/net/freeradius2/patches/002-config.patch +new file mode 100644 +index 0000000..4eb48b7 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/002-config.patch +@@ -0,0 +1,588 @@ ++--- a/raddb/dictionary.in +++++ b/raddb/dictionary.in ++@@ -23,7 +23,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 ++ # ++@@ -205,7 +205,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 ++@@ -215,7 +215,7 @@ ++ # message is included ONLY in the ++ # First packet of a fragment series. ++ # ++- # include_length = yes +++ include_length = yes ++ ++ # Check the Certificate Revocation List ++ # ++@@ -281,7 +281,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 ++@@ -316,7 +316,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 ++@@ -332,14 +332,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 ++@@ -348,8 +348,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 ++@@ -449,7 +449,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 ++@@ -457,7 +457,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 ++@@ -473,7 +473,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 ++@@ -486,7 +486,7 @@ ++ # the tunneled request. ++ # ++ # allowed values: {no, yes} ++- use_tunneled_reply = no +++# use_tunneled_reply = no ++ ++ # ++ # The inner tunneled request can be sent ++@@ -498,13 +498,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 ++- } +++# } ++ ++ ################################################## ++ # ++@@ -573,14 +573,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 ++@@ -592,7 +592,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} ++@@ -290,7 +290,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. ++ # ++@@ -317,7 +317,7 @@ listen { ++ # ipv6addr = :: ++ port = 0 ++ type = acct ++-# interface = eth0 +++ interface = br-lan ++ # clients = per_socket_clients ++ } ++ ++@@ -541,8 +541,8 @@ security { ++ # ++ # allowed values: {no, yes} ++ # ++-proxy_requests = yes ++-$INCLUDE proxy.conf +++proxy_requests = no +++#$INCLUDE proxy.conf ++ ++ ++ # CLIENTS CONFIGURATION ++@@ -739,7 +739,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, ++@@ -752,15 +752,15 @@ instantiate { ++ # listed in any other section. See 'doc/rlm_expr' for ++ # more information. ++ # ++- 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. ++ # ++@@ -784,7 +784,7 @@ instantiate { ++ # to multiple times. ++ # ++ ###################################################################### ++-$INCLUDE policy.conf +++#$INCLUDE policy.conf ++ ++ ###################################################################### ++ # ++@@ -794,9 +794,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/ ++ ++ ###################################################################### ++ # ++@@ -804,7 +804,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, ++@@ -558,12 +558,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, ++@@ -573,7 +573,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 ++@@ -589,14 +589,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' ++@@ -620,7 +620,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 ++@@ -642,5 +642,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/feeds/packages/net/freeradius2/patches/004-ldap_configure.patch b/feeds/packages/net/freeradius2/patches/004-ldap_configure.patch +new file mode 100644 +index 0000000..7f3e240 +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/004-ldap_configure.patch +@@ -0,0 +1,4253 @@ ++--- 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 +++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 +++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 +++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 +++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 ." ++ ++ _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` +++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 >$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 +++' >$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/feeds/packages/net/freeradius2/patches/008-honor_ccpflags.patch b/feeds/packages/net/freeradius2/patches/008-honor_ccpflags.patch +new file mode 100644 +index 0000000..bb5f81a +--- /dev/null ++++ b/feeds/packages/net/freeradius2/patches/008-honor_ccpflags.patch +@@ -0,0 +1,15 @@ ++--- a/src/modules/rules.mak +++++ b/src/modules/rules.mak ++@@ -63,10 +63,10 @@ $(LT_OBJS): $(SERVER_HEADERS) ++ # ++ ####################################################################### ++ %.lo: %.c ++- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c $< +++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $< ++ ++ %.lo: %.cpp ++- $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(RLM_CFLAGS) -c $< +++ $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $< ++ ++ ifneq ($(TARGET),) ++ ####################################################################### +diff --git a/feeds/packages/net/freeswitch/.svn/entries b/feeds/packages/net/freeswitch/.svn/entries +new file mode 100644 +index 0000000..9e327d1 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freeswitch ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-16T22:10:20.308945Z ++36058 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++b8072e4a16628431b4aa8126eafdad8f ++2013-03-16T22:10:20.308945Z ++36058 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++41907 ++ +diff --git a/feeds/packages/net/freeswitch/.svn/text-base/Makefile.svn-base b/feeds/packages/net/freeswitch/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ab66c45 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,1086 @@ ++# ++# 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:=freeswitch ++PKG_DISTNAME:=$(PKG_NAME)_git ++PKG_VERSION:=1.3.17 ++ ++ ++# ++# The latest FS git hash in PKG_SOURCE_VERSION can be obtained from http://fisheye.freeswitch.org ++# ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git ++FS_DEFAULT_HEAD:=6af84a870c21836e20077f27a85d94fd382a02be ++FS_LATEST_HEAD:=$(if $(DUMP),$(FS_DEFAULT_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1)) ++PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_SOFIA_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD)) ++PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7) ++PKG_RELEASE:=$(PKG_SOURCE_VERSION_SHORT) ++PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME) ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION_SHORT).tar.bz2 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++ ++PKG_FIXUP:=autoreconf ++PKG_BUILD_PARALLEL:=1 ++ ++ ++FS_MOD_AVAILABLE:= \ ++ abstraction \ ++ alsa \ ++ amr \ ++ amrwb \ ++ avmd \ ++ blacklist \ ++ bv \ ++ callcenter \ ++ cdr-csv \ ++ cdr-pg-csv \ ++ cdr-sqlite \ ++ celt \ ++ cepstral \ ++ cidlookup \ ++ cluechoo \ ++ codec2 \ ++ commands \ ++ conference \ ++ console \ ++ curl \ ++ dahdi-codec \ ++ db \ ++ dialplan-asterisk \ ++ dialplan-directory \ ++ dialplan-xml \ ++ dingaling \ ++ directory \ ++ distributor \ ++ dptools \ ++ easyroute \ ++ enum \ ++ erlang-event \ ++ esf \ ++ event-multicast \ ++ event-socket \ ++ event-zmq \ ++ expr \ ++ fifo \ ++ file-string \ ++ flite \ ++ fsk \ ++ fsv \ ++ g723-1 \ ++ g729 \ ++ gsmopen \ ++ h26x \ ++ h323 \ ++ hash \ ++ html5 \ ++ httapi \ ++ http-cache \ ++ ilbc \ ++ isac \ ++ java \ ++ json-cdr \ ++ lcr \ ++ local-stream \ ++ logfile \ ++ loopback \ ++ lua \ ++ managed \ ++ mp4 \ ++ mp4v \ ++ native-file \ ++ nibblebill \ ++ openzap \ ++ opus \ ++ oreka \ ++ portaudio \ ++ portaudio-stream \ ++ posix-timer \ ++ radius-cdr \ ++ redis \ ++ rss \ ++ rtmp \ ++ sangoma-codec \ ++ say-de \ ++ say-en \ ++ say-es \ ++ say-fa \ ++ say-fr \ ++ say-hu \ ++ say-it \ ++ say-nl \ ++ say-pt \ ++ say-ru \ ++ say-th \ ++ say-zh \ ++ shell-stream \ ++ silk \ ++ siren \ ++ skel \ ++ skinny \ ++ skypopen \ ++ sms \ ++ snapshot \ ++ snipe-hunt \ ++ sndfile \ ++ snmp \ ++ snom \ ++ sofia \ ++ sonar \ ++ spandsp \ ++ speex \ ++ spidermonkey \ ++ spidermonkey-core-db \ ++ spidermonkey-curl \ ++ spidermonkey-odbc \ ++ spidermonkey-socket \ ++ spidermonkey-teletone \ ++ spy \ ++ stress \ ++ syslog \ ++ timerfd \ ++ tone-stream \ ++ tts-commandline \ ++ unimrcp \ ++ valet-parking \ ++ vmd \ ++ voicemail \ ++ voicemail-ivr \ ++ vp8 \ ++ xml-cdr \ ++ xml-curl \ ++ xml-rpc \ ++ xml-scgi \ ++ yaml \ ++ ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_FS_SOFIA_WITH_BUILTIN_ZRTP \ ++ CONFIG_FS_SOFIA_WITH_IPV6 \ ++ CONFIG_FS_SOFIA_WITH_MYSQL \ ++ CONFIG_FS_SOFIA_WITH_ODBC \ ++ CONFIG_FS_SOFIA_WITH_OPT \ ++ CONFIG_FS_SOFIA_WITH_PULL_CURRENT \ ++ CONFIG_FS_SOFIA_WITH_SCTP \ ++ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \ ++ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++ ++TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR) ++ ++ ++define Package/$(PKG_NAME)/Default ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Telephony ++ URL:=http://www.$(PKG_NAME).org/ ++ MAINTAINER:=Mazilo ++endef ++ ++ ++define Package/$(PKG_NAME) ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT)) ++ DEPENDS:=+libcurl +libiconv-full +libjpeg +libncurses +libpq +libpthread +librt +libstdcpp ++ MENU:=1 ++endef ++ ++ ++define Package/$(PKG_NAME)/description ++ FreeSWITCH is an open source telephony platform designed to ++ facilitate the creation of voice and chat driven products scaling ++ from a soft-phone up to a soft-switch. See http://wiki.$(PKG_NAME).org ++endef ++ ++ ++define Package/$(PKG_NAME)/config ++ config FS_SOFIA_WITH_PULL_CURRENT ++ depends on DEVEL ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Pull the latest git HEAD - $(PKG_SOURCE_VERSION_SHORT) (Press < Help > for more information)" ++ default n ++ help ++ This existing git HEAD ($(FS_DEFAULT_HEAD)) is probably outdated. ++ Enable this option for the latest git HEAD ($(FS_LATEST_HEAD)). ++ Enable this option ONLY if you know what you are doing. It may and/or may not be cleanly ++ compiled and may require some intervension to create new patches. If you take this route ++ and come up with some patches, please contemplate to contribute or send in your patches. ++ ++ config FS_SOFIA_WITH_IPV6 ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Compile with IPV6 support" ++ default y ++ help ++ Compile $(PKG_NAME) with IPV6 Support. ++ ++ config FS_SOFIA_WITH_OPT ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Compile with optimization" ++ default y ++ help ++ Compile $(PKG_NAME) with optimization enabled. ++ ++ config FS_SOFIA_WITH_BUILTIN_ZRTP ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Compile with built-in ZRTP support" ++ default y ++ help ++ Compile $(PKG_NAME)-mod-sofia with ZRTP Support. ++endef ++ ++ ++define Package/$(PKG_NAME)-mod-sofia/config ++ config FS_SOFIA_WITH_MYSQL ++ depends on PACKAGE_$(PKG_NAME)-mod-sofia ++ bool "Compile with MySQL" ++ default n ++ select PACKAGE_libmysqlclient ++ help ++ Compile $(PKG_NAME) with MySQL. ++ ++ config FS_SOFIA_WITH_ODBC ++ depends on PACKAGE_$(PKG_NAME)-mod-sofia ++ depends on PACKAGE_sqliteodbc ++ depends on PACKAGE_unixodbc_svn ++ bool "Compile with ODBC support (Requires unixodbc_svn NOT YET AVAILABLE)" ++ default n ++ help ++ Compile $(PKG_NAME)-mod-sofia with ODBC Support. Since both sqliteodbc and unixodbc_svn packages are not yet available on OpenWRT, $(PKG_NAME)-mod-sofia CAN NOT be compiled with ODBC support. ++ ++ config FS_SOFIA_WITH_SCTP ++ depends on PACKAGE_$(PKG_NAME)-mod-sofia ++ depends on PACKAGE_sctp ++ bool "Compile with SCTP (Stream Control Transfer Protocol) support" ++ default y ++ help ++ Compile $(PKG_NAME)-mod-sofia with SCTP support. ++endef ++ ++ ++define Package/$(PKG_NAME)-example-config ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH example config (commented) ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-example-config/description ++ The default configuration included with FreeSWITCH. It is not intended to be ++ a final product, and is thus moved to /usr/share/$(PKG_NAME)/examples/conf to ++ be an example of how FreeSWITCH can be configured. ++endef ++ ++ ++define Package/$(PKG_NAME)-config-upstream-defaults ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH upstream config ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-config-upstream-defaults/description ++ The default configuration included with FreeSWITCH. It is not intended to be ++ a final product, and but is included for those who don't want to use the ++ OpenWRT configuration and/or want to try things as prepared by upstream. ++endef ++ ++ ++define Package/$(PKG_NAME)-config-minimal ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH minimal config ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-config-minimal/description ++ A minimal configuration of FreeSWITCH for OpenWRT devices. Is what the UCI ++ configuration began with. ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-upstream-defaults ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FS upstream def sample conf ++ DEPENDS:= $(PKG_NAME) \ ++ +$(PKG_NAME)-config-upstream-defaults \ ++ +$(PKG_NAME)-mod-callcenter \ ++ +$(PKG_NAME)-mod-codec2 \ ++ +$(PKG_NAME)-mod-commands \ ++ +$(PKG_NAME)-mod-conference \ ++ +$(PKG_NAME)-mod-curl \ ++ +$(PKG_NAME)-mod-dialplan-xml \ ++ +$(PKG_NAME)-mod-dingaling \ ++ +$(PKG_NAME)-mod-dptools \ ++ +$(PKG_NAME)-mod-event-socket \ ++ +$(PKG_NAME)-mod-g723-1 \ ++ +$(PKG_NAME)-mod-g729 \ ++ +$(PKG_NAME)-mod-hash \ ++ +$(PKG_NAME)-mod-http-cache \ ++ +$(PKG_NAME)-mod-ilbc \ ++ +$(PKG_NAME)-mod-local-stream \ ++ +$(PKG_NAME)-mod-lua \ ++ +$(PKG_NAME)-mod-native-file \ ++ +$(PKG_NAME)-mod-sndfile \ ++ +$(PKG_NAME)-mod-sofia \ ++ +$(PKG_NAME)-mod-spandsp \ ++ +$(PKG_NAME)-mod-speex \ ++ +$(PKG_NAME)-mod-syslog \ ++ +$(PKG_NAME)-mod-tone-stream \ ++ +$(PKG_NAME)-mod-xml-curl \ ++ +$(PKG_NAME)-mod-xml-rpc \ ++ +$(PKG_NAME)-tools ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-minimal ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH minimal package collection ++ DEFAULT:=y ++ DEPENDS:= $(PKG_NAME) \ ++ +$(PKG_NAME)-config-minimal \ ++ +$(PKG_NAME)-mod-codec2 \ ++ +$(PKG_NAME)-mod-commands \ ++ +$(PKG_NAME)-mod-dialplan-xml \ ++ +$(PKG_NAME)-mod-dptools \ ++ +$(PKG_NAME)-mod-event-socket \ ++ +$(PKG_NAME)-mod-hash \ ++ +$(PKG_NAME)-mod-local-stream \ ++ +$(PKG_NAME)-mod-sndfile \ ++ +$(PKG_NAME)-mod-sofia \ ++ +$(PKG_NAME)-mod-syslog \ ++ +$(PKG_NAME)-mod-tone-stream \ ++ +$(PKG_NAME)-tools ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-08KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 8KHz english sounds ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-16KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 16KHz english sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-en-08KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-32KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 32KHz english sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-en-16KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-48KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 48KHz english sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-en-32KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-08KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 8KHz music-on-hold sounds ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-16KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 16KHz music-on-hold sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-moh-08KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-32KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 32KHz music-on-hold sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-moh-16KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-48KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 48KHz music-on-hold sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-moh-32KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-tools ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH control tools ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Download/files ++ define Download/$(1) ++ FILE:=$(2) ++ URL:=$(if $(4),$(4),http://files.$(PKG_NAME).org)/$(5) ++ MD5SUM:=$(3) ++ endef ++ define Prepare/$(1) ++ $(LN) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(6) ++ endef ++ $$(eval $$(call Download,$(1))) ++endef ++ ++ ++MAKE_INSTALL_TARGETS:=install ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),) ++ $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),) ++ $(eval $(call Download/files,json-cdr,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event-zmq),) ++ $(eval $(call Download/files,event-zmq,zeromq-2.1.9.tar.gz,94c5e0262a79c5f82bc0b178c1f8a33d,http://download.zeromq.org http://download.zeromq.org/historic,,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) ++ $(eval $(call Download/files,flite,flite-1.5.4-current.tar.bz2,f3a2d88b1059f6f4ff3c20a8169bc0f4,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-opus),) ++ $(eval $(call Download/files,opus,opus-1.0.2.tar.gz,c503ad05a59ddb44deab96204401be03,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),) ++ $(eval $(call Download/files,sounds-en-08KHz,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.24.tar.gz,6c0a8ec292e444dff10b652644f4fc54,,,)) ++ MAKE_INSTALL_TARGETS+= sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-16KHz),) ++ $(eval $(call Download/files,sounds-en-16KHz,$(PKG_NAME)-sounds-en-us-callie-16000-1.0.24.tar.gz,e9b5c1cdd393660d0cdf7de6b7e03c45,,,)) ++ MAKE_INSTALL_TARGETS+= hd-sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-32KHz),) ++ $(eval $(call Download/files,sounds-en-32KHz,$(PKG_NAME)-sounds-en-us-callie-32000-1.0.24.tar.gz,fa110675de07ca5f6d85646f3093b0ce,,,)) ++ MAKE_INSTALL_TARGETS+= uhd-sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-48KHz),) ++ $(eval $(call Download/files,sounds-en-48KHz,$(PKG_NAME)-sounds-en-us-callie-48000-1.0.24.tar.gz,813ea6eeae5545bb6e11664189691f8b,,,)) ++ MAKE_INSTALL_TARGETS+= cd-sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-08KHz),) ++ $(eval $(call Download/files,sounds-moh-08KHz,$(PKG_NAME)-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,,)) ++ MAKE_INSTALL_TARGETS+= moh-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-16KHz),) ++ $(eval $(call Download/files,sounds-moh-16KHz,$(PKG_NAME)-sounds-music-16000-1.0.8.tar.gz,7fd0ca9a9e3878783baa39b8187743bf,,,)) ++ MAKE_INSTALL_TARGETS+= hd-moh-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-32KHz),) ++ $(eval $(call Download/files,sounds-moh-32KHz,$(PKG_NAME)-sounds-music-32000-1.0.8.tar.gz,7e03932ea81b8d0bf6d686f838b060b4,,,)) ++ MAKE_INSTALL_TARGETS+= uhd-moh-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-48KHz),) ++ $(eval $(call Download/files,sounds-moh-48KHz,$(PKG_NAME)-sounds-music-48000-1.0.8.tar.gz,d06cd2a80379f224affab21f5180e4c6,,,)) ++ MAKE_INSTALL_TARGETS+= cd-moh-install ++endif ++ ++ ++# ++# XXX: -fgnu89-inline is not supported on all compiler versions, so only enable it on avr32 where it solves build issues ++# ++ifneq ($(CONFIG_avr32),) ++ TARGET_CFLAGS += -fgnu89-inline ++ TARGET_CXXFLAGS += -fgnu89-inline ++endif ++ ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++ ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) ++ TARGET_CFLAGS += -DNO_GETLOGIN ++ endif ++endif ++ ++ ++FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format ++FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS) -DLUA_USE_LINUX $(FPIC) -Wno-format ++FS_TARGET_CPPFLAGS:= -I. -I./lua $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),-I$(STAGING_DIR_HOST)/lib/erlang/lib/erl_interface-3.6/include) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) $(TARGET_CPPFLAGS) ++ ++ ++CONFIGURE_ARGS+= \ ++ --host=$(GNU_TARGET_NAME) \ ++ --build=$(GNU_HOST_NAME) \ ++ --prefix="/usr/share/$(PKG_NAME)" \ ++ --bindir="/usr/bin" \ ++ --libdir="/usr/lib" \ ++ --srcdir="$(PKG_BUILD_DIR)" \ ++ --sysconfdir="/etc/$(PKG_NAME)" \ ++ --with-modinstdir="/usr/lib/$(PKG_NAME)" \ ++ --with-random="/dev/urandom" \ ++ $(if $(CONFIG_FS_SOFIA_WITH_MYSQL),--with-mysql,--without-mysql) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_IPV6,ipv6) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_OPT,optimization) \ ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-iogg) \ ++ $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \ ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \ ++ $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \ ++ $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-timerfd,timerfd-wrapper) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_BUILTIN_ZRTP,zrtp) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ODBC,core-odbc-support) \ ++ $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ ++ $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \ ++ ++ ++CONFIGURE_VARS+= \ ++ config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ ++ config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ ++ config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ ++ config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ ++ config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ ++ config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \ ++ config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \ ++ config_TARGET_LIBS="$(TARGET_LDFLAGS) -lpthread -ldl" \ ++ config_BUILD_CC="$(HOSTCC)" \ ++ config_BUILD_CFLAGS="$(HOST_CFLAGS)" \ ++ CC_FOR_BUILD="$(HOSTCC)" \ ++ BUILDTOOL_CC="$(HOSTCC)" \ ++ BUILDTOOL_CCLD="$(HOSTCC)" \ ++ LDFLAGS="$$$$LDFLAGS" \ ++ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ ++ CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ ++ CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ ++ AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ ++ RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ ++ CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ ++ CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ ++ CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\"" \ ++ PATH="$(PATH):$(STAGING_DIR)" \ ++ HOST_CC="/usr/bin/cc" \ ++ HOST_CXX="/usr/bin/g++" \ ++ CROSS_COMPILE="1" \ ++ PKG_CONFIG="$(STAGING_DIR_HOST)/bin/pkg-config" \ ++ PKG_CONFIG_PATH="$(STAGING_DIR_HOST)/lib/pkgconfig" \ ++ ax_cv_c_compiler_vendor="gnu" \ ++ ac_cv_dev_urandom="yes" \ ++ ac_cv_file_dbd_apr_dbd_mysql_c="no" \ ++ ac_cv_file__dev_random="no" \ ++ ac_cv_file__dev_urandom="yes" \ ++ ac_cv_file___dev_urandom_="yes" \ ++ ac_cv_func_mmap_fixed_mapped="yes" \ ++ ac_cv_func_pthread_rwlock_init="yes" \ ++ ac_cv_struct_rlimit="yes" \ ++ apr_cv_mutex_recursive="yes" \ ++ apr_cv_process_shared_works="no" \ ++ apr_cv_tcp_nodelay_with_cork="yes" \ ++ apr_cv_type_rwlock_t="yes" \ ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes",) \ ++ libzmq_cv_cxx_werror_flag="" \ ++ ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(call Prepare/celt) ++ $(call Prepare/event-zmq) ++ $(call Prepare/flite) ++ $(call Prepare/json-cdr) ++ $(call Prepare/opus) ++ $(call Prepare/sounds-en-08KHz) ++ $(call Prepare/sounds-en-16KHz) ++ $(call Prepare/sounds-en-32KHz) ++ $(call Prepare/sounds-en-48KHz) ++ $(call Prepare/sounds-moh-08KHz) ++ $(call Prepare/sounds-moh-16KHz) ++ $(call Prepare/sounds-moh-32KHz) ++ $(call Prepare/sounds-moh-48KHz) ++endef ++ ++ ++define Build/Configure ++ if [ -d $(PKG_BUILD_DIR)/libs/libcodec2/src ]; then \ ++ (cd $(PKG_BUILD_DIR)/libs/libcodec2/src; $(HOSTCC) -c generate_codebook.c; $(HOSTCC) -o generate_codebook generate_codebook.o -lm) \ ++ fi ++ (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) ++ $(call Build/Configure/Default,) ++ $(foreach m,$(FS_MOD_AVAILABLE), ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), ++ $(SED) 's|^[ #]*\([^#]*/mod_$(subst -,_,$(m))\)$$$$|\1|g' $(PKG_BUILD_DIR)/modules.conf ++ , ++ $(SED) 's|^\([^#]*/mod_$(subst -,_,$(m))\)$$$$|#\1|g' $(PKG_BUILD_DIR)/modules.conf ++ ) ++ ) ++endef ++ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ ++ RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ ++ CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ ++ CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ ++ all $(MAKE_INSTALL_TARGETS) ++ $(SED) 's|^\([ \t]*\)\(.*\)"mod_console"\(.*\)$$$$|\1|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++ $(SED) 's|^\([ \t]*\)\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++endef ++ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME) ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/include/* $(1)/usr/include/$(PKG_NAME)/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).{a,so*} $(1)/usr/lib/ ++endef ++ ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/default ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/scripts ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/$(PKG_NAME).hotplug $(1)/etc/hotplug.d/iface/90-$(PKG_NAME) ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/ ++ $(if $(1)/usr/lib/lib$(PKG_NAME).la,sed -i -e "s#-lcurl -lz\(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#-L/usr/lib -lcurl -lz /usr/lib/libexpat.la\2/usr\3#g" $(1)/usr/lib/lib$(PKG_NAME).la) ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-upstream-defaults/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-example-config/install ++ $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/examples/conf ++ $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)/examples/conf/ ++endef ++ ++ ++define Package/$(PKG_NAME)-config-upstream-defaults/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME) $(1)/etc ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-minimal/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-uci-minimal/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-config-minimal/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/autoload_configs ++ ++ # ++ # Copying dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml ++ # fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml ++ # ++ $(foreach f,dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml,$(if $(PKG_BUILD_DIR)/conf/vanilla/$(f),$(CP) $(PKG_BUILD_DIR)/conf/vanilla/$(f) $(1)/etc/$(PKG_NAME);)) ++ ++ # ++ # Copying acl ivr modules post_load_modules switch timezones ++ # ++ $(foreach f,acl ivr modules post_load_modules switch timezones,$(if $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml,$(CP) $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml $(1)/etc/$(PKG_NAME)/autoload_configs;)) ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-08KHz/install ++ # ++ # sounds-en-8KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-16KHz/install ++ # ++ # sounds-en-16KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-32KHz/install ++ # ++ # sounds-en-32KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-48KHz/install ++ # ++ # sounds-en-48KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-08KHz/install ++ # ++ # sounds-moh-8KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/8000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/8000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-16KHz/install ++ # ++ # sounds-moh-16KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/16000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/16000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-32KHz/install ++ # ++ # sounds-moh-32KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/32000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/32000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-48KHz/install ++ # ++ # sounds-moh-48KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/48000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/48000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_cli $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_encode $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_ivrd $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fsxs $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/gentls_cert $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/tone2wav $(1)/usr/bin/ ++endef ++ ++ ++# ++# 1. Name ++# 2. Title ++# 3. Package configuration files ++# 4. Inter module depends ++# 5. Extra depends ++# ++define BuildLib ++ define Package/$(PKG_NAME)-$(1) ++ $$(call Package/$(PKG_NAME)/Default) ++ TITLE:= FS $(2) library and pkgconfig files ++ DEPENDS:= $(PKG_NAME) $(foreach l,$(4),+$(PKG_NAME)-$(l)) $(5) ++ endef ++ ++ define Package/$(PKG_NAME)-$(1)/install ++ [ -d "$$(1)/usr/lib/pkgconfig" ] || $(INSTALL_DIR) $$(1)/usr/lib/pkgconfig ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(patsubst lib%,%,$(3)).pc $$(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(1)* $$(1)/usr/lib/ ++ $(if $$(1)/usr/lib/$(1).la,sed -i -e "s#\(^.*\)=' \(.*\)-lm\(.*\)#\1=' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib -lm\3#g" $$(1)/usr/lib/$(1).la) ++ endef ++ ++ $$(eval $$(call BuildPackage,$(PKG_NAME)-$(1))) ++endef ++ ++ ++# ++# 1. Name ++# 2. Title ++# 3. Selection on module configuration file ++# 4. Files (module files include different names) ++# 5. Files (supporting files include different names) ++# 6. Inter module depends ++# 7. Extra depends ++# ++define BuildPlugin ++ define Package/$(PKG_NAME)-mod-$(1) ++ $$(call Package/$(PKG_NAME)/Default) ++ TITLE:= FS $(2) module ++ DEPENDS:= $(PKG_NAME) $(foreach m,$(6),+$(PKG_NAME)-mod-$(m)) $(7) ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/install ++ [ -z "mod_$(subst -,_,$(1))" ] || $(INSTALL_DIR) $$(1)/usr/lib/$(PKG_NAME) ++ ++ for f in $$$$(realpath $$$$(wildcard $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/mod_$(subst -,_,$(1)).*)) $$$$(wildcard $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/$(4)_*); \ ++ do \ ++ $(CP) $$$$$$$${f} $$(1)/usr/lib/$(PKG_NAME)/; \ ++ done ++ ++ # ++ # mod_$(subst -,_,$(1)): $(5) ++ # ++ $(foreach f,$(5),[ -d $(dir $$(1)/usr/${f}) ] || $(INSTALL_DIR) $(dir $$(1)/usr/${f});$(CP) $(PKG_INSTALL_DIR)/usr/${f} $$(1)/usr;) ++ ++ # ++ # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH. ++ # ++ for f in `ls $$(1)/usr/lib/$(PKG_NAME)/*.la`; \ ++ do \ ++ sed -i -e "s#' \(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib /usr/lib/lib$(PKG_NAME).la /usr/lib/libexpat.la\2/usr\3#g;s#' \(.*\)/usr/lib/libintl-full/lib#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib#g;s#-L\.\.##g;s#$(PKG_BUILD_DIR)\(.*\)/usr/lib/libtiff.la\(.*\)#/usr/lib/libtiff.la\2#g" $$$$$$$${f}; \ ++ done ++ ++ # ++ # 1. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 2. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 3. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 4. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 5. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 6. Additional configuration files for mod_$(subst -,_,$(1)) from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1)))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1))),[ -d $$(1)/etc/$(PKG_NAME)/$(1) ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/$(1);$(CP) $(PKG_BUILD_DIR)/conf/$(3)/$(1) $$(1)/etc/$(PKG_NAME)) ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/postinst ++#!/bin/sh ++sed -i -e 's|^\([ \t]*\)\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/prerm ++#!/bin/sh ++sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++ endef ++ ++ $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1))) ++endef ++ ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) ++$(eval $(call BuildPackage,$(PKG_NAME)-collection-upstream-defaults)) ++$(eval $(call BuildPackage,$(PKG_NAME)-collection-minimal)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-08KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-16KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-32KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-48KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-08KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-16KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-32KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-48KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-tools)) ++$(eval $(call BuildPackage,$(PKG_NAME)-example-config)) ++$(eval $(call BuildPackage,$(PKG_NAME)-config-upstream-defaults)) ++$(eval $(call BuildPackage,$(PKG_NAME)-config-minimal)) ++ ++ ++# ++# $(eval $(call BuildLib,Name,Title,Package Configuration Files,Inter Depends,Extra Depends)) ++# ++$(eval $(call BuildLib,libopenzap,OpenZAP,openzap,,)) ++ ++ ++# ++# $(eval $(call BuildPlugin,Name,Title,Selection on module Conf File,Files,Inter Depends,Extra Depends)) ++# ++$(eval $(call BuildPlugin,abstraction,An Abstraction To API Call,vanilla,,,,)) ++$(eval $(call BuildPlugin,alsa,Alsa Endpoint,vanilla,,,,+alsa-lib)) ++$(eval $(call BuildPlugin,amr,Adaptive Multi-Rate On Bandwidth Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,amrwb,Wide Band AMR,vanilla,,,,)) ++$(eval $(call BuildPlugin,avmd,Advanced Voice Mail Detection,vanilla,,,,)) ++$(eval $(call BuildPlugin,blacklist,Blacklist,vanilla,,,,)) ++$(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,callcenter,Call Center,vanilla,,,,)) ++$(eval $(call BuildPlugin,cdr-csv,CSV-CDR Handler,mod,,,,)) # ~/conf ++$(eval $(call BuildPlugin,cdr-pg-csv,Postgress CDR Handler,vanilla,,,,+coreutils +libpq)) ++$(eval $(call BuildPlugin,cdr-sqlite,SQLite3 CDR Handler,vanilla,,,,+libsqlite3)) ++$(eval $(call BuildPlugin,celt,CELT Ultra-Low Delay Codec,vanilla,,,,+libogg)) ++$(eval $(call BuildPlugin,cepstral,Cepstral Interface,vanilla,,,,@BROKEN)) # needs ++$(eval $(call BuildPlugin,cidlookup,Data Query For CID->NAME Services,mod,,,,+libcurl)) # ~/conf ++$(eval $(call BuildPlugin,cluechoo,Framework Demo,vanilla,,,,)) ++$(eval $(call BuildPlugin,codec2,CoDec 2,,,,,)) ++$(eval $(call BuildPlugin,commands,API Commands,vanilla,,,,)) ++$(eval $(call BuildPlugin,conference,Conference Room,vanilla,,,,)) ++$(eval $(call BuildPlugin,console,Console Logger,vanilla,,,,)) ++$(eval $(call BuildPlugin,curl,HTTP Request,vanilla,,,,+libcurl)) ++$(eval $(call BuildPlugin,dahdi-codec,DAHDI Codecs,vanilla,,,,)) ++$(eval $(call BuildPlugin,db,Database Backend,vanilla,,,,)) ++$(eval $(call BuildPlugin,dialplan-asterisk,Asterisk Dialplan Parser,vanilla,,,,)) ++$(eval $(call BuildPlugin,dialplan-directory,Dialplan Directory,vanilla,,,,)) ++$(eval $(call BuildPlugin,dialplan-xml,Dialplan-XML Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,dingaling,Jabber Interface,vanilla,,,,+libgcrypt +libopenssl)) ++$(eval $(call BuildPlugin,directory,Search By Name Directory IVR,vanilla,,,,)) ++$(eval $(call BuildPlugin,distributor,Simple Robin-Round Load to Gateway,vanilla,,,,)) ++$(eval $(call BuildPlugin,dptools,Dialplan Tools,vanilla,,,,)) ++$(eval $(call BuildPlugin,easyroute,Simple DID Routing,vanilla,,,,)) ++$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,)) ++$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang)) ++$(eval $(call BuildPlugin,esf,Extra SIP Functionality,vanilla,,,,)) ++$(eval $(call BuildPlugin,event-multicast,Multicast Event Handler,vanilla,,,,)) ++$(eval $(call BuildPlugin,event-socket,Socket Event Handler,vanilla,,,,)) ++$(eval $(call BuildPlugin,event-zmq,Socket Event Handler By Zero MQ,vanilla,,,,+libuuid)) ++$(eval $(call BuildPlugin,expr,Expression Evaluation,vanilla,,,,)) ++$(eval $(call BuildPlugin,fifo,FIFO,vanilla,,,,)) ++$(eval $(call BuildPlugin,file-string,Streaming Multiple Sound Files Sequentially,vanilla,,,,@OBSOLETE)) # merged into dptools ++$(eval $(call BuildPlugin,flite,Festival TTS,vanilla,,,,@(!(armeb||avr32)||BROKEN))) ++$(eval $(call BuildPlugin,fsk,Bell-202 1200-Baud FSK Decoder,vanilla,,,,)) ++$(eval $(call BuildPlugin,fsv,Video Player / Recorder,vanilla,,,,)) ++$(eval $(call BuildPlugin,g723-1,G.723.1 Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,g729,G.729 Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,gsmopen,GSM Modem compatible Endpoint,mod,,,,+alsa-lib @BROKEN)) # needs gsmlib ++$(eval $(call BuildPlugin,h26x,H26X Linear Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,h323,H323 Endpoint,mod,,,,@BROKEN)) # Req. H323Plus v1.24.x or newer ++$(eval $(call BuildPlugin,hash,API For Manipulating A Hash Table,vanilla,,,,)) ++$(eval $(call BuildPlugin,html5,HTML5 Endpoint Module,vanilla,,,,)) ++$(eval $(call BuildPlugin,httapi,HT Telephony API and HTTP Caching,mod,,,,)) # ~/conf ++$(eval $(call BuildPlugin,http-cache,HTTP GET With Caching,mod,,,,+libcurl)) # ~/conf ++$(eval $(call BuildPlugin,ilbc,ILBC Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,isac,iSAC Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,java,Java Language Interface,vanilla,,,,@BROKEN)) # needs java ++$(eval $(call BuildPlugin,json-cdr,JSon-CDR Interface,mod,,,,+libcurl)) ++$(eval $(call BuildPlugin,lcr,Least Cost Routing,vanilla,,,,)) ++$(eval $(call BuildPlugin,local-stream,Multi-Channel On Same Stream,vanilla,,,,)) ++$(eval $(call BuildPlugin,logfile,File Logger,vanilla,,,,)) ++$(eval $(call BuildPlugin,loopback,Loopback to Dialplan Endpoint,vanilla,,,,)) ++$(eval $(call BuildPlugin,lua,LUA Language Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,managed,Media Switching Software Library,vanilla,,,,+glib2 @BROKEN)) # needs Mono ++$(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROKEN)) # needs libmp4v2 ++$(eval $(call BuildPlugin,mp4v,MP4 CoDec Support For Video,vanilla,,,,)) ++$(eval $(call BuildPlugin,native-file,WAV Format Sound Player,vanilla,,,,)) ++$(eval $(call BuildPlugin,nibblebill,Credit / Debit Billing,vanilla,,,,)) ++$(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,)) ++$(eval $(call BuildPlugin,openzap,Zaptel (Superseded by FreeTDM),libs,ozmod,,,+$(PKG_NAME)-libopenzap +libpcap)) ++$(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,)) ++$(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,,+alsa-lib)) ++$(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,,+alsa-lib)) ++$(eval $(call BuildPlugin,posix-timer,POSIX Compliant Soft Timer,vanilla,,,,)) ++$(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,vanilla,,,,+freeradius2 @BROKEN)) # fails in freeradius-client ++$(eval $(call BuildPlugin,redis,Redis Limited Backend,vanilla,,,,)) ++$(eval $(call BuildPlugin,rss,RRS Feeds via TTS,vanilla,,,,)) ++$(eval $(call BuildPlugin,rtmp,RTMP Protocol Handler,vanilla,,,,)) ++$(eval $(call BuildPlugin,sangoma-codec,Sangoma Codec,vanilla,,,,@BROKEN)) # Req. Sangoma CoDec source ++$(eval $(call BuildPlugin,say-de,German Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-en,English Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-es,Spanish Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-fa,Persian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-fr,French Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-hu,Hungarian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-it,Italian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-nl,Dutch Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-pt,Portugeese Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-ru,Russian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-th,Thai Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-zh,Chineese Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,shell-stream,Streaming Audio Through CLI,vanilla,,,,)) ++$(eval $(call BuildPlugin,silk,Skype(TM) SILK Codec Module,vanilla,,,,)) ++$(eval $(call BuildPlugin,siren,G.722.1 Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,skel,Template For New Module,vanilla,,,,)) ++$(eval $(call BuildPlugin,skinny,Skinny Call Control Protocol (SCCP),vanilla,,,,)) ++$(eval $(call BuildPlugin,skypopen,Skype Compatible Endpoint,mod,,,,@FEATURE_drawing-backend_libX11)) ++$(eval $(call BuildPlugin,sms,SMS,vanilla,,,,)) ++$(eval $(call BuildPlugin,snapshot,Record Audio Snapshot to File,vanilla,,,,)) ++$(eval $(call BuildPlugin,sndfile,Multi-Format Sound File,vanilla,,,,)) ++$(eval $(call BuildPlugin,snipe-hunt,Snipe Hunt (Simple Example Module),vanilla,,,,)) ++$(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp)) ++$(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,)) ++$(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf ++$(eval $(call BuildPlugin,sonar,Sonar Ping Timer,vanilla,,,,)) ++$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg)) # ~/conf ++$(eval $(call BuildPlugin,speex,Speex codec,mod,,,,)) ++$(eval $(call BuildPlugin,spidermonkey,JavaScript,vanilla,,,,@BROKEN)) # fails in js ++$(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-curl,JavaScript Curl,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-odbc,JavaScript ODBC,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-socket,JavaScript Socket,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-teletone,JavaScript Teletone,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spy,User Spy,vanilla,,,,)) ++$(eval $(call BuildPlugin,stress,Voice Stress Detection,vanilla,,,,)) ++$(eval $(call BuildPlugin,syslog,SysLog logger,vanilla,,,,)) ++$(eval $(call BuildPlugin,timerfd,Linux Kernel timerfd API,vanilla,,,,)) ++$(eval $(call BuildPlugin,tone-stream,Tone Generation Stream,vanilla,,,,)) ++$(eval $(call BuildPlugin,tts-commandline,ASR TTS Command Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,unimrcp,UniMRCP (MRCP Client),vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,valet-parking,Valet Parking Application,vanilla,,,,)) ++$(eval $(call BuildPlugin,vmd,VoiceMail Beep Detection,vanilla,,,,)) ++$(eval $(call BuildPlugin,voicemail,VoiceMail,vanilla,,,,)) ++$(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,)) ++$(eval $(call BuildPlugin,vp8,VP8 Video Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,xml-cdr,XML-CDR Handler,vanilla,,,,+libcurl)) ++$(eval $(call BuildPlugin,xml-curl,XML-Curl Gateway,vanilla,,,,+libcurl)) ++$(eval $(call BuildPlugin,xml-rpc,XML-RPC Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,vanilla,,,,)) ++$(eval $(call BuildPlugin,yaml,YAML langunage,vanilla,,,,)) +diff --git a/feeds/packages/net/freeswitch/Makefile b/feeds/packages/net/freeswitch/Makefile +new file mode 100644 +index 0000000..ab66c45 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/Makefile +@@ -0,0 +1,1086 @@ ++# ++# 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:=freeswitch ++PKG_DISTNAME:=$(PKG_NAME)_git ++PKG_VERSION:=1.3.17 ++ ++ ++# ++# The latest FS git hash in PKG_SOURCE_VERSION can be obtained from http://fisheye.freeswitch.org ++# ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git ++FS_DEFAULT_HEAD:=6af84a870c21836e20077f27a85d94fd382a02be ++FS_LATEST_HEAD:=$(if $(DUMP),$(FS_DEFAULT_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1)) ++PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_SOFIA_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD)) ++PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7) ++PKG_RELEASE:=$(PKG_SOURCE_VERSION_SHORT) ++PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME) ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION_SHORT).tar.bz2 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++ ++PKG_FIXUP:=autoreconf ++PKG_BUILD_PARALLEL:=1 ++ ++ ++FS_MOD_AVAILABLE:= \ ++ abstraction \ ++ alsa \ ++ amr \ ++ amrwb \ ++ avmd \ ++ blacklist \ ++ bv \ ++ callcenter \ ++ cdr-csv \ ++ cdr-pg-csv \ ++ cdr-sqlite \ ++ celt \ ++ cepstral \ ++ cidlookup \ ++ cluechoo \ ++ codec2 \ ++ commands \ ++ conference \ ++ console \ ++ curl \ ++ dahdi-codec \ ++ db \ ++ dialplan-asterisk \ ++ dialplan-directory \ ++ dialplan-xml \ ++ dingaling \ ++ directory \ ++ distributor \ ++ dptools \ ++ easyroute \ ++ enum \ ++ erlang-event \ ++ esf \ ++ event-multicast \ ++ event-socket \ ++ event-zmq \ ++ expr \ ++ fifo \ ++ file-string \ ++ flite \ ++ fsk \ ++ fsv \ ++ g723-1 \ ++ g729 \ ++ gsmopen \ ++ h26x \ ++ h323 \ ++ hash \ ++ html5 \ ++ httapi \ ++ http-cache \ ++ ilbc \ ++ isac \ ++ java \ ++ json-cdr \ ++ lcr \ ++ local-stream \ ++ logfile \ ++ loopback \ ++ lua \ ++ managed \ ++ mp4 \ ++ mp4v \ ++ native-file \ ++ nibblebill \ ++ openzap \ ++ opus \ ++ oreka \ ++ portaudio \ ++ portaudio-stream \ ++ posix-timer \ ++ radius-cdr \ ++ redis \ ++ rss \ ++ rtmp \ ++ sangoma-codec \ ++ say-de \ ++ say-en \ ++ say-es \ ++ say-fa \ ++ say-fr \ ++ say-hu \ ++ say-it \ ++ say-nl \ ++ say-pt \ ++ say-ru \ ++ say-th \ ++ say-zh \ ++ shell-stream \ ++ silk \ ++ siren \ ++ skel \ ++ skinny \ ++ skypopen \ ++ sms \ ++ snapshot \ ++ snipe-hunt \ ++ sndfile \ ++ snmp \ ++ snom \ ++ sofia \ ++ sonar \ ++ spandsp \ ++ speex \ ++ spidermonkey \ ++ spidermonkey-core-db \ ++ spidermonkey-curl \ ++ spidermonkey-odbc \ ++ spidermonkey-socket \ ++ spidermonkey-teletone \ ++ spy \ ++ stress \ ++ syslog \ ++ timerfd \ ++ tone-stream \ ++ tts-commandline \ ++ unimrcp \ ++ valet-parking \ ++ vmd \ ++ voicemail \ ++ voicemail-ivr \ ++ vp8 \ ++ xml-cdr \ ++ xml-curl \ ++ xml-rpc \ ++ xml-scgi \ ++ yaml \ ++ ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_FS_SOFIA_WITH_BUILTIN_ZRTP \ ++ CONFIG_FS_SOFIA_WITH_IPV6 \ ++ CONFIG_FS_SOFIA_WITH_MYSQL \ ++ CONFIG_FS_SOFIA_WITH_ODBC \ ++ CONFIG_FS_SOFIA_WITH_OPT \ ++ CONFIG_FS_SOFIA_WITH_PULL_CURRENT \ ++ CONFIG_FS_SOFIA_WITH_SCTP \ ++ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \ ++ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++ ++TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR) ++ ++ ++define Package/$(PKG_NAME)/Default ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Telephony ++ URL:=http://www.$(PKG_NAME).org/ ++ MAINTAINER:=Mazilo ++endef ++ ++ ++define Package/$(PKG_NAME) ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT)) ++ DEPENDS:=+libcurl +libiconv-full +libjpeg +libncurses +libpq +libpthread +librt +libstdcpp ++ MENU:=1 ++endef ++ ++ ++define Package/$(PKG_NAME)/description ++ FreeSWITCH is an open source telephony platform designed to ++ facilitate the creation of voice and chat driven products scaling ++ from a soft-phone up to a soft-switch. See http://wiki.$(PKG_NAME).org ++endef ++ ++ ++define Package/$(PKG_NAME)/config ++ config FS_SOFIA_WITH_PULL_CURRENT ++ depends on DEVEL ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Pull the latest git HEAD - $(PKG_SOURCE_VERSION_SHORT) (Press < Help > for more information)" ++ default n ++ help ++ This existing git HEAD ($(FS_DEFAULT_HEAD)) is probably outdated. ++ Enable this option for the latest git HEAD ($(FS_LATEST_HEAD)). ++ Enable this option ONLY if you know what you are doing. It may and/or may not be cleanly ++ compiled and may require some intervension to create new patches. If you take this route ++ and come up with some patches, please contemplate to contribute or send in your patches. ++ ++ config FS_SOFIA_WITH_IPV6 ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Compile with IPV6 support" ++ default y ++ help ++ Compile $(PKG_NAME) with IPV6 Support. ++ ++ config FS_SOFIA_WITH_OPT ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Compile with optimization" ++ default y ++ help ++ Compile $(PKG_NAME) with optimization enabled. ++ ++ config FS_SOFIA_WITH_BUILTIN_ZRTP ++ depends on PACKAGE_$(PKG_NAME) ++ bool "Compile with built-in ZRTP support" ++ default y ++ help ++ Compile $(PKG_NAME)-mod-sofia with ZRTP Support. ++endef ++ ++ ++define Package/$(PKG_NAME)-mod-sofia/config ++ config FS_SOFIA_WITH_MYSQL ++ depends on PACKAGE_$(PKG_NAME)-mod-sofia ++ bool "Compile with MySQL" ++ default n ++ select PACKAGE_libmysqlclient ++ help ++ Compile $(PKG_NAME) with MySQL. ++ ++ config FS_SOFIA_WITH_ODBC ++ depends on PACKAGE_$(PKG_NAME)-mod-sofia ++ depends on PACKAGE_sqliteodbc ++ depends on PACKAGE_unixodbc_svn ++ bool "Compile with ODBC support (Requires unixodbc_svn NOT YET AVAILABLE)" ++ default n ++ help ++ Compile $(PKG_NAME)-mod-sofia with ODBC Support. Since both sqliteodbc and unixodbc_svn packages are not yet available on OpenWRT, $(PKG_NAME)-mod-sofia CAN NOT be compiled with ODBC support. ++ ++ config FS_SOFIA_WITH_SCTP ++ depends on PACKAGE_$(PKG_NAME)-mod-sofia ++ depends on PACKAGE_sctp ++ bool "Compile with SCTP (Stream Control Transfer Protocol) support" ++ default y ++ help ++ Compile $(PKG_NAME)-mod-sofia with SCTP support. ++endef ++ ++ ++define Package/$(PKG_NAME)-example-config ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH example config (commented) ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-example-config/description ++ The default configuration included with FreeSWITCH. It is not intended to be ++ a final product, and is thus moved to /usr/share/$(PKG_NAME)/examples/conf to ++ be an example of how FreeSWITCH can be configured. ++endef ++ ++ ++define Package/$(PKG_NAME)-config-upstream-defaults ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH upstream config ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-config-upstream-defaults/description ++ The default configuration included with FreeSWITCH. It is not intended to be ++ a final product, and but is included for those who don't want to use the ++ OpenWRT configuration and/or want to try things as prepared by upstream. ++endef ++ ++ ++define Package/$(PKG_NAME)-config-minimal ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH minimal config ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-config-minimal/description ++ A minimal configuration of FreeSWITCH for OpenWRT devices. Is what the UCI ++ configuration began with. ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-upstream-defaults ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FS upstream def sample conf ++ DEPENDS:= $(PKG_NAME) \ ++ +$(PKG_NAME)-config-upstream-defaults \ ++ +$(PKG_NAME)-mod-callcenter \ ++ +$(PKG_NAME)-mod-codec2 \ ++ +$(PKG_NAME)-mod-commands \ ++ +$(PKG_NAME)-mod-conference \ ++ +$(PKG_NAME)-mod-curl \ ++ +$(PKG_NAME)-mod-dialplan-xml \ ++ +$(PKG_NAME)-mod-dingaling \ ++ +$(PKG_NAME)-mod-dptools \ ++ +$(PKG_NAME)-mod-event-socket \ ++ +$(PKG_NAME)-mod-g723-1 \ ++ +$(PKG_NAME)-mod-g729 \ ++ +$(PKG_NAME)-mod-hash \ ++ +$(PKG_NAME)-mod-http-cache \ ++ +$(PKG_NAME)-mod-ilbc \ ++ +$(PKG_NAME)-mod-local-stream \ ++ +$(PKG_NAME)-mod-lua \ ++ +$(PKG_NAME)-mod-native-file \ ++ +$(PKG_NAME)-mod-sndfile \ ++ +$(PKG_NAME)-mod-sofia \ ++ +$(PKG_NAME)-mod-spandsp \ ++ +$(PKG_NAME)-mod-speex \ ++ +$(PKG_NAME)-mod-syslog \ ++ +$(PKG_NAME)-mod-tone-stream \ ++ +$(PKG_NAME)-mod-xml-curl \ ++ +$(PKG_NAME)-mod-xml-rpc \ ++ +$(PKG_NAME)-tools ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-minimal ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH minimal package collection ++ DEFAULT:=y ++ DEPENDS:= $(PKG_NAME) \ ++ +$(PKG_NAME)-config-minimal \ ++ +$(PKG_NAME)-mod-codec2 \ ++ +$(PKG_NAME)-mod-commands \ ++ +$(PKG_NAME)-mod-dialplan-xml \ ++ +$(PKG_NAME)-mod-dptools \ ++ +$(PKG_NAME)-mod-event-socket \ ++ +$(PKG_NAME)-mod-hash \ ++ +$(PKG_NAME)-mod-local-stream \ ++ +$(PKG_NAME)-mod-sndfile \ ++ +$(PKG_NAME)-mod-sofia \ ++ +$(PKG_NAME)-mod-syslog \ ++ +$(PKG_NAME)-mod-tone-stream \ ++ +$(PKG_NAME)-tools ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-08KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 8KHz english sounds ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-16KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 16KHz english sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-en-08KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-32KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 32KHz english sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-en-16KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-48KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 48KHz english sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-en-32KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-08KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 8KHz music-on-hold sounds ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-16KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 16KHz music-on-hold sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-moh-08KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-32KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 32KHz music-on-hold sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-moh-16KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-48KHz ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH 48KHz music-on-hold sounds ++ DEPENDS:= +$(PKG_NAME)-sounds-moh-32KHz ++endef ++ ++ ++define Package/$(PKG_NAME)-tools ++$(call Package/$(PKG_NAME)/Default) ++ TITLE:=FreeSWITCH control tools ++ DEPENDS:= $(PKG_NAME) ++endef ++ ++ ++define Download/files ++ define Download/$(1) ++ FILE:=$(2) ++ URL:=$(if $(4),$(4),http://files.$(PKG_NAME).org)/$(5) ++ MD5SUM:=$(3) ++ endef ++ define Prepare/$(1) ++ $(LN) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(6) ++ endef ++ $$(eval $$(call Download,$(1))) ++endef ++ ++ ++MAKE_INSTALL_TARGETS:=install ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),) ++ $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),) ++ $(eval $(call Download/files,json-cdr,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event-zmq),) ++ $(eval $(call Download/files,event-zmq,zeromq-2.1.9.tar.gz,94c5e0262a79c5f82bc0b178c1f8a33d,http://download.zeromq.org http://download.zeromq.org/historic,,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) ++ $(eval $(call Download/files,flite,flite-1.5.4-current.tar.bz2,f3a2d88b1059f6f4ff3c20a8169bc0f4,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-opus),) ++ $(eval $(call Download/files,opus,opus-1.0.2.tar.gz,c503ad05a59ddb44deab96204401be03,,downloads/libs/,libs/)) ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),) ++ $(eval $(call Download/files,sounds-en-08KHz,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.24.tar.gz,6c0a8ec292e444dff10b652644f4fc54,,,)) ++ MAKE_INSTALL_TARGETS+= sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-16KHz),) ++ $(eval $(call Download/files,sounds-en-16KHz,$(PKG_NAME)-sounds-en-us-callie-16000-1.0.24.tar.gz,e9b5c1cdd393660d0cdf7de6b7e03c45,,,)) ++ MAKE_INSTALL_TARGETS+= hd-sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-32KHz),) ++ $(eval $(call Download/files,sounds-en-32KHz,$(PKG_NAME)-sounds-en-us-callie-32000-1.0.24.tar.gz,fa110675de07ca5f6d85646f3093b0ce,,,)) ++ MAKE_INSTALL_TARGETS+= uhd-sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-48KHz),) ++ $(eval $(call Download/files,sounds-en-48KHz,$(PKG_NAME)-sounds-en-us-callie-48000-1.0.24.tar.gz,813ea6eeae5545bb6e11664189691f8b,,,)) ++ MAKE_INSTALL_TARGETS+= cd-sounds-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-08KHz),) ++ $(eval $(call Download/files,sounds-moh-08KHz,$(PKG_NAME)-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,,)) ++ MAKE_INSTALL_TARGETS+= moh-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-16KHz),) ++ $(eval $(call Download/files,sounds-moh-16KHz,$(PKG_NAME)-sounds-music-16000-1.0.8.tar.gz,7fd0ca9a9e3878783baa39b8187743bf,,,)) ++ MAKE_INSTALL_TARGETS+= hd-moh-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-32KHz),) ++ $(eval $(call Download/files,sounds-moh-32KHz,$(PKG_NAME)-sounds-music-32000-1.0.8.tar.gz,7e03932ea81b8d0bf6d686f838b060b4,,,)) ++ MAKE_INSTALL_TARGETS+= uhd-moh-install ++endif ++ ++ ++ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-48KHz),) ++ $(eval $(call Download/files,sounds-moh-48KHz,$(PKG_NAME)-sounds-music-48000-1.0.8.tar.gz,d06cd2a80379f224affab21f5180e4c6,,,)) ++ MAKE_INSTALL_TARGETS+= cd-moh-install ++endif ++ ++ ++# ++# XXX: -fgnu89-inline is not supported on all compiler versions, so only enable it on avr32 where it solves build issues ++# ++ifneq ($(CONFIG_avr32),) ++ TARGET_CFLAGS += -fgnu89-inline ++ TARGET_CXXFLAGS += -fgnu89-inline ++endif ++ ++ ++ifneq ($(CONFIG_USE_EGLIBC),) ++ ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) ++ TARGET_CFLAGS += -DNO_GETLOGIN ++ endif ++endif ++ ++ ++FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format ++FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS) -DLUA_USE_LINUX $(FPIC) -Wno-format ++FS_TARGET_CPPFLAGS:= -I. -I./lua $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),-I$(STAGING_DIR_HOST)/lib/erlang/lib/erl_interface-3.6/include) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) $(TARGET_CPPFLAGS) ++ ++ ++CONFIGURE_ARGS+= \ ++ --host=$(GNU_TARGET_NAME) \ ++ --build=$(GNU_HOST_NAME) \ ++ --prefix="/usr/share/$(PKG_NAME)" \ ++ --bindir="/usr/bin" \ ++ --libdir="/usr/lib" \ ++ --srcdir="$(PKG_BUILD_DIR)" \ ++ --sysconfdir="/etc/$(PKG_NAME)" \ ++ --with-modinstdir="/usr/lib/$(PKG_NAME)" \ ++ --with-random="/dev/urandom" \ ++ $(if $(CONFIG_FS_SOFIA_WITH_MYSQL),--with-mysql,--without-mysql) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_IPV6,ipv6) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_OPT,optimization) \ ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-iogg) \ ++ $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \ ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \ ++ $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \ ++ $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-timerfd,timerfd-wrapper) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_BUILTIN_ZRTP,zrtp) \ ++ $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ODBC,core-odbc-support) \ ++ $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ ++ $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \ ++ ++ ++CONFIGURE_VARS+= \ ++ config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ ++ config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ ++ config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ ++ config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ ++ config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ ++ config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \ ++ config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \ ++ config_TARGET_LIBS="$(TARGET_LDFLAGS) -lpthread -ldl" \ ++ config_BUILD_CC="$(HOSTCC)" \ ++ config_BUILD_CFLAGS="$(HOST_CFLAGS)" \ ++ CC_FOR_BUILD="$(HOSTCC)" \ ++ BUILDTOOL_CC="$(HOSTCC)" \ ++ BUILDTOOL_CCLD="$(HOSTCC)" \ ++ LDFLAGS="$$$$LDFLAGS" \ ++ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ ++ CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ ++ CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ ++ AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ ++ RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ ++ CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ ++ CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ ++ CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\"" \ ++ PATH="$(PATH):$(STAGING_DIR)" \ ++ HOST_CC="/usr/bin/cc" \ ++ HOST_CXX="/usr/bin/g++" \ ++ CROSS_COMPILE="1" \ ++ PKG_CONFIG="$(STAGING_DIR_HOST)/bin/pkg-config" \ ++ PKG_CONFIG_PATH="$(STAGING_DIR_HOST)/lib/pkgconfig" \ ++ ax_cv_c_compiler_vendor="gnu" \ ++ ac_cv_dev_urandom="yes" \ ++ ac_cv_file_dbd_apr_dbd_mysql_c="no" \ ++ ac_cv_file__dev_random="no" \ ++ ac_cv_file__dev_urandom="yes" \ ++ ac_cv_file___dev_urandom_="yes" \ ++ ac_cv_func_mmap_fixed_mapped="yes" \ ++ ac_cv_func_pthread_rwlock_init="yes" \ ++ ac_cv_struct_rlimit="yes" \ ++ apr_cv_mutex_recursive="yes" \ ++ apr_cv_process_shared_works="no" \ ++ apr_cv_tcp_nodelay_with_cork="yes" \ ++ apr_cv_type_rwlock_t="yes" \ ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes",) \ ++ libzmq_cv_cxx_werror_flag="" \ ++ ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(call Prepare/celt) ++ $(call Prepare/event-zmq) ++ $(call Prepare/flite) ++ $(call Prepare/json-cdr) ++ $(call Prepare/opus) ++ $(call Prepare/sounds-en-08KHz) ++ $(call Prepare/sounds-en-16KHz) ++ $(call Prepare/sounds-en-32KHz) ++ $(call Prepare/sounds-en-48KHz) ++ $(call Prepare/sounds-moh-08KHz) ++ $(call Prepare/sounds-moh-16KHz) ++ $(call Prepare/sounds-moh-32KHz) ++ $(call Prepare/sounds-moh-48KHz) ++endef ++ ++ ++define Build/Configure ++ if [ -d $(PKG_BUILD_DIR)/libs/libcodec2/src ]; then \ ++ (cd $(PKG_BUILD_DIR)/libs/libcodec2/src; $(HOSTCC) -c generate_codebook.c; $(HOSTCC) -o generate_codebook generate_codebook.o -lm) \ ++ fi ++ (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) ++ $(call Build/Configure/Default,) ++ $(foreach m,$(FS_MOD_AVAILABLE), ++ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), ++ $(SED) 's|^[ #]*\([^#]*/mod_$(subst -,_,$(m))\)$$$$|\1|g' $(PKG_BUILD_DIR)/modules.conf ++ , ++ $(SED) 's|^\([^#]*/mod_$(subst -,_,$(m))\)$$$$|#\1|g' $(PKG_BUILD_DIR)/modules.conf ++ ) ++ ) ++endef ++ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ ++ RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ ++ CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ ++ CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ ++ all $(MAKE_INSTALL_TARGETS) ++ $(SED) 's|^\([ \t]*\)\(.*\)"mod_console"\(.*\)$$$$|\1|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++ $(SED) 's|^\([ \t]*\)\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++endef ++ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME) ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/include/* $(1)/usr/include/$(PKG_NAME)/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).{a,so*} $(1)/usr/lib/ ++endef ++ ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/default ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/scripts ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/$(PKG_NAME).hotplug $(1)/etc/hotplug.d/iface/90-$(PKG_NAME) ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/ ++ $(if $(1)/usr/lib/lib$(PKG_NAME).la,sed -i -e "s#-lcurl -lz\(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#-L/usr/lib -lcurl -lz /usr/lib/libexpat.la\2/usr\3#g" $(1)/usr/lib/lib$(PKG_NAME).la) ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-upstream-defaults/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-example-config/install ++ $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/examples/conf ++ $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)/examples/conf/ ++endef ++ ++ ++define Package/$(PKG_NAME)-config-upstream-defaults/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME) $(1)/etc ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-minimal/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-collection-uci-minimal/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++endef ++ ++ ++define Package/$(PKG_NAME)-config-minimal/install ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/autoload_configs ++ ++ # ++ # Copying dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml ++ # fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml ++ # ++ $(foreach f,dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml,$(if $(PKG_BUILD_DIR)/conf/vanilla/$(f),$(CP) $(PKG_BUILD_DIR)/conf/vanilla/$(f) $(1)/etc/$(PKG_NAME);)) ++ ++ # ++ # Copying acl ivr modules post_load_modules switch timezones ++ # ++ $(foreach f,acl ivr modules post_load_modules switch timezones,$(if $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml,$(CP) $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml $(1)/etc/$(PKG_NAME)/autoload_configs;)) ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-08KHz/install ++ # ++ # sounds-en-8KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-16KHz/install ++ # ++ # sounds-en-16KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-32KHz/install ++ # ++ # sounds-en-32KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-en-48KHz/install ++ # ++ # sounds-en-48KHz ++ # ++ for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ ++ do \ ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \ ++ done ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-08KHz/install ++ # ++ # sounds-moh-8KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/8000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/8000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-16KHz/install ++ # ++ # sounds-moh-16KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/16000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/16000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-32KHz/install ++ # ++ # sounds-moh-32KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/32000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/32000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-sounds-moh-48KHz/install ++ # ++ # sounds-moh-48KHz ++ # ++ [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/48000; ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/48000 $(1)/usr/share/$(PKG_NAME)/sounds/music; ++endef ++ ++ ++define Package/$(PKG_NAME)-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_cli $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_encode $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_ivrd $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/fsxs $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/gentls_cert $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/tone2wav $(1)/usr/bin/ ++endef ++ ++ ++# ++# 1. Name ++# 2. Title ++# 3. Package configuration files ++# 4. Inter module depends ++# 5. Extra depends ++# ++define BuildLib ++ define Package/$(PKG_NAME)-$(1) ++ $$(call Package/$(PKG_NAME)/Default) ++ TITLE:= FS $(2) library and pkgconfig files ++ DEPENDS:= $(PKG_NAME) $(foreach l,$(4),+$(PKG_NAME)-$(l)) $(5) ++ endef ++ ++ define Package/$(PKG_NAME)-$(1)/install ++ [ -d "$$(1)/usr/lib/pkgconfig" ] || $(INSTALL_DIR) $$(1)/usr/lib/pkgconfig ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(patsubst lib%,%,$(3)).pc $$(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(1)* $$(1)/usr/lib/ ++ $(if $$(1)/usr/lib/$(1).la,sed -i -e "s#\(^.*\)=' \(.*\)-lm\(.*\)#\1=' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib -lm\3#g" $$(1)/usr/lib/$(1).la) ++ endef ++ ++ $$(eval $$(call BuildPackage,$(PKG_NAME)-$(1))) ++endef ++ ++ ++# ++# 1. Name ++# 2. Title ++# 3. Selection on module configuration file ++# 4. Files (module files include different names) ++# 5. Files (supporting files include different names) ++# 6. Inter module depends ++# 7. Extra depends ++# ++define BuildPlugin ++ define Package/$(PKG_NAME)-mod-$(1) ++ $$(call Package/$(PKG_NAME)/Default) ++ TITLE:= FS $(2) module ++ DEPENDS:= $(PKG_NAME) $(foreach m,$(6),+$(PKG_NAME)-mod-$(m)) $(7) ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/install ++ [ -z "mod_$(subst -,_,$(1))" ] || $(INSTALL_DIR) $$(1)/usr/lib/$(PKG_NAME) ++ ++ for f in $$$$(realpath $$$$(wildcard $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/mod_$(subst -,_,$(1)).*)) $$$$(wildcard $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/$(4)_*); \ ++ do \ ++ $(CP) $$$$$$$${f} $$(1)/usr/lib/$(PKG_NAME)/; \ ++ done ++ ++ # ++ # mod_$(subst -,_,$(1)): $(5) ++ # ++ $(foreach f,$(5),[ -d $(dir $$(1)/usr/${f}) ] || $(INSTALL_DIR) $(dir $$(1)/usr/${f});$(CP) $(PKG_INSTALL_DIR)/usr/${f} $$(1)/usr;) ++ ++ # ++ # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH. ++ # ++ for f in `ls $$(1)/usr/lib/$(PKG_NAME)/*.la`; \ ++ do \ ++ sed -i -e "s#' \(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib /usr/lib/lib$(PKG_NAME).la /usr/lib/libexpat.la\2/usr\3#g;s#' \(.*\)/usr/lib/libintl-full/lib#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib#g;s#-L\.\.##g;s#$(PKG_BUILD_DIR)\(.*\)/usr/lib/libtiff.la\(.*\)#/usr/lib/libtiff.la\2#g" $$$$$$$${f}; \ ++ done ++ ++ # ++ # 1. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 2. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 3. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 4. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 5. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) ++ ++ # ++ # 6. Additional configuration files for mod_$(subst -,_,$(1)) from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1)))) ++ # ++ $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1))),[ -d $$(1)/etc/$(PKG_NAME)/$(1) ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/$(1);$(CP) $(PKG_BUILD_DIR)/conf/$(3)/$(1) $$(1)/etc/$(PKG_NAME)) ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/postinst ++#!/bin/sh ++sed -i -e 's|^\([ \t]*\)\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/prerm ++#!/bin/sh ++sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml ++ endef ++ ++ $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1))) ++endef ++ ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) ++$(eval $(call BuildPackage,$(PKG_NAME)-collection-upstream-defaults)) ++$(eval $(call BuildPackage,$(PKG_NAME)-collection-minimal)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-08KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-16KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-32KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-48KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-08KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-16KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-32KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-48KHz)) ++$(eval $(call BuildPackage,$(PKG_NAME)-tools)) ++$(eval $(call BuildPackage,$(PKG_NAME)-example-config)) ++$(eval $(call BuildPackage,$(PKG_NAME)-config-upstream-defaults)) ++$(eval $(call BuildPackage,$(PKG_NAME)-config-minimal)) ++ ++ ++# ++# $(eval $(call BuildLib,Name,Title,Package Configuration Files,Inter Depends,Extra Depends)) ++# ++$(eval $(call BuildLib,libopenzap,OpenZAP,openzap,,)) ++ ++ ++# ++# $(eval $(call BuildPlugin,Name,Title,Selection on module Conf File,Files,Inter Depends,Extra Depends)) ++# ++$(eval $(call BuildPlugin,abstraction,An Abstraction To API Call,vanilla,,,,)) ++$(eval $(call BuildPlugin,alsa,Alsa Endpoint,vanilla,,,,+alsa-lib)) ++$(eval $(call BuildPlugin,amr,Adaptive Multi-Rate On Bandwidth Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,amrwb,Wide Band AMR,vanilla,,,,)) ++$(eval $(call BuildPlugin,avmd,Advanced Voice Mail Detection,vanilla,,,,)) ++$(eval $(call BuildPlugin,blacklist,Blacklist,vanilla,,,,)) ++$(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,callcenter,Call Center,vanilla,,,,)) ++$(eval $(call BuildPlugin,cdr-csv,CSV-CDR Handler,mod,,,,)) # ~/conf ++$(eval $(call BuildPlugin,cdr-pg-csv,Postgress CDR Handler,vanilla,,,,+coreutils +libpq)) ++$(eval $(call BuildPlugin,cdr-sqlite,SQLite3 CDR Handler,vanilla,,,,+libsqlite3)) ++$(eval $(call BuildPlugin,celt,CELT Ultra-Low Delay Codec,vanilla,,,,+libogg)) ++$(eval $(call BuildPlugin,cepstral,Cepstral Interface,vanilla,,,,@BROKEN)) # needs ++$(eval $(call BuildPlugin,cidlookup,Data Query For CID->NAME Services,mod,,,,+libcurl)) # ~/conf ++$(eval $(call BuildPlugin,cluechoo,Framework Demo,vanilla,,,,)) ++$(eval $(call BuildPlugin,codec2,CoDec 2,,,,,)) ++$(eval $(call BuildPlugin,commands,API Commands,vanilla,,,,)) ++$(eval $(call BuildPlugin,conference,Conference Room,vanilla,,,,)) ++$(eval $(call BuildPlugin,console,Console Logger,vanilla,,,,)) ++$(eval $(call BuildPlugin,curl,HTTP Request,vanilla,,,,+libcurl)) ++$(eval $(call BuildPlugin,dahdi-codec,DAHDI Codecs,vanilla,,,,)) ++$(eval $(call BuildPlugin,db,Database Backend,vanilla,,,,)) ++$(eval $(call BuildPlugin,dialplan-asterisk,Asterisk Dialplan Parser,vanilla,,,,)) ++$(eval $(call BuildPlugin,dialplan-directory,Dialplan Directory,vanilla,,,,)) ++$(eval $(call BuildPlugin,dialplan-xml,Dialplan-XML Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,dingaling,Jabber Interface,vanilla,,,,+libgcrypt +libopenssl)) ++$(eval $(call BuildPlugin,directory,Search By Name Directory IVR,vanilla,,,,)) ++$(eval $(call BuildPlugin,distributor,Simple Robin-Round Load to Gateway,vanilla,,,,)) ++$(eval $(call BuildPlugin,dptools,Dialplan Tools,vanilla,,,,)) ++$(eval $(call BuildPlugin,easyroute,Simple DID Routing,vanilla,,,,)) ++$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,)) ++$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang)) ++$(eval $(call BuildPlugin,esf,Extra SIP Functionality,vanilla,,,,)) ++$(eval $(call BuildPlugin,event-multicast,Multicast Event Handler,vanilla,,,,)) ++$(eval $(call BuildPlugin,event-socket,Socket Event Handler,vanilla,,,,)) ++$(eval $(call BuildPlugin,event-zmq,Socket Event Handler By Zero MQ,vanilla,,,,+libuuid)) ++$(eval $(call BuildPlugin,expr,Expression Evaluation,vanilla,,,,)) ++$(eval $(call BuildPlugin,fifo,FIFO,vanilla,,,,)) ++$(eval $(call BuildPlugin,file-string,Streaming Multiple Sound Files Sequentially,vanilla,,,,@OBSOLETE)) # merged into dptools ++$(eval $(call BuildPlugin,flite,Festival TTS,vanilla,,,,@(!(armeb||avr32)||BROKEN))) ++$(eval $(call BuildPlugin,fsk,Bell-202 1200-Baud FSK Decoder,vanilla,,,,)) ++$(eval $(call BuildPlugin,fsv,Video Player / Recorder,vanilla,,,,)) ++$(eval $(call BuildPlugin,g723-1,G.723.1 Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,g729,G.729 Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,gsmopen,GSM Modem compatible Endpoint,mod,,,,+alsa-lib @BROKEN)) # needs gsmlib ++$(eval $(call BuildPlugin,h26x,H26X Linear Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,h323,H323 Endpoint,mod,,,,@BROKEN)) # Req. H323Plus v1.24.x or newer ++$(eval $(call BuildPlugin,hash,API For Manipulating A Hash Table,vanilla,,,,)) ++$(eval $(call BuildPlugin,html5,HTML5 Endpoint Module,vanilla,,,,)) ++$(eval $(call BuildPlugin,httapi,HT Telephony API and HTTP Caching,mod,,,,)) # ~/conf ++$(eval $(call BuildPlugin,http-cache,HTTP GET With Caching,mod,,,,+libcurl)) # ~/conf ++$(eval $(call BuildPlugin,ilbc,ILBC Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,isac,iSAC Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,java,Java Language Interface,vanilla,,,,@BROKEN)) # needs java ++$(eval $(call BuildPlugin,json-cdr,JSon-CDR Interface,mod,,,,+libcurl)) ++$(eval $(call BuildPlugin,lcr,Least Cost Routing,vanilla,,,,)) ++$(eval $(call BuildPlugin,local-stream,Multi-Channel On Same Stream,vanilla,,,,)) ++$(eval $(call BuildPlugin,logfile,File Logger,vanilla,,,,)) ++$(eval $(call BuildPlugin,loopback,Loopback to Dialplan Endpoint,vanilla,,,,)) ++$(eval $(call BuildPlugin,lua,LUA Language Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,managed,Media Switching Software Library,vanilla,,,,+glib2 @BROKEN)) # needs Mono ++$(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROKEN)) # needs libmp4v2 ++$(eval $(call BuildPlugin,mp4v,MP4 CoDec Support For Video,vanilla,,,,)) ++$(eval $(call BuildPlugin,native-file,WAV Format Sound Player,vanilla,,,,)) ++$(eval $(call BuildPlugin,nibblebill,Credit / Debit Billing,vanilla,,,,)) ++$(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,)) ++$(eval $(call BuildPlugin,openzap,Zaptel (Superseded by FreeTDM),libs,ozmod,,,+$(PKG_NAME)-libopenzap +libpcap)) ++$(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,)) ++$(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,,+alsa-lib)) ++$(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,,+alsa-lib)) ++$(eval $(call BuildPlugin,posix-timer,POSIX Compliant Soft Timer,vanilla,,,,)) ++$(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,vanilla,,,,+freeradius2 @BROKEN)) # fails in freeradius-client ++$(eval $(call BuildPlugin,redis,Redis Limited Backend,vanilla,,,,)) ++$(eval $(call BuildPlugin,rss,RRS Feeds via TTS,vanilla,,,,)) ++$(eval $(call BuildPlugin,rtmp,RTMP Protocol Handler,vanilla,,,,)) ++$(eval $(call BuildPlugin,sangoma-codec,Sangoma Codec,vanilla,,,,@BROKEN)) # Req. Sangoma CoDec source ++$(eval $(call BuildPlugin,say-de,German Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-en,English Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-es,Spanish Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-fa,Persian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-fr,French Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-hu,Hungarian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-it,Italian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-nl,Dutch Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-pt,Portugeese Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-ru,Russian Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-th,Thai Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,say-zh,Chineese Say,vanilla,,,,)) ++$(eval $(call BuildPlugin,shell-stream,Streaming Audio Through CLI,vanilla,,,,)) ++$(eval $(call BuildPlugin,silk,Skype(TM) SILK Codec Module,vanilla,,,,)) ++$(eval $(call BuildPlugin,siren,G.722.1 Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,skel,Template For New Module,vanilla,,,,)) ++$(eval $(call BuildPlugin,skinny,Skinny Call Control Protocol (SCCP),vanilla,,,,)) ++$(eval $(call BuildPlugin,skypopen,Skype Compatible Endpoint,mod,,,,@FEATURE_drawing-backend_libX11)) ++$(eval $(call BuildPlugin,sms,SMS,vanilla,,,,)) ++$(eval $(call BuildPlugin,snapshot,Record Audio Snapshot to File,vanilla,,,,)) ++$(eval $(call BuildPlugin,sndfile,Multi-Format Sound File,vanilla,,,,)) ++$(eval $(call BuildPlugin,snipe-hunt,Snipe Hunt (Simple Example Module),vanilla,,,,)) ++$(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp)) ++$(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,)) ++$(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf ++$(eval $(call BuildPlugin,sonar,Sonar Ping Timer,vanilla,,,,)) ++$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg)) # ~/conf ++$(eval $(call BuildPlugin,speex,Speex codec,mod,,,,)) ++$(eval $(call BuildPlugin,spidermonkey,JavaScript,vanilla,,,,@BROKEN)) # fails in js ++$(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-curl,JavaScript Curl,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-odbc,JavaScript ODBC,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-socket,JavaScript Socket,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spidermonkey-teletone,JavaScript Teletone,vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,spy,User Spy,vanilla,,,,)) ++$(eval $(call BuildPlugin,stress,Voice Stress Detection,vanilla,,,,)) ++$(eval $(call BuildPlugin,syslog,SysLog logger,vanilla,,,,)) ++$(eval $(call BuildPlugin,timerfd,Linux Kernel timerfd API,vanilla,,,,)) ++$(eval $(call BuildPlugin,tone-stream,Tone Generation Stream,vanilla,,,,)) ++$(eval $(call BuildPlugin,tts-commandline,ASR TTS Command Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,unimrcp,UniMRCP (MRCP Client),vanilla,,,,@BROKEN)) ++$(eval $(call BuildPlugin,valet-parking,Valet Parking Application,vanilla,,,,)) ++$(eval $(call BuildPlugin,vmd,VoiceMail Beep Detection,vanilla,,,,)) ++$(eval $(call BuildPlugin,voicemail,VoiceMail,vanilla,,,,)) ++$(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,)) ++$(eval $(call BuildPlugin,vp8,VP8 Video Codec,vanilla,,,,)) ++$(eval $(call BuildPlugin,xml-cdr,XML-CDR Handler,vanilla,,,,+libcurl)) ++$(eval $(call BuildPlugin,xml-curl,XML-Curl Gateway,vanilla,,,,+libcurl)) ++$(eval $(call BuildPlugin,xml-rpc,XML-RPC Interface,vanilla,,,,)) ++$(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,vanilla,,,,)) ++$(eval $(call BuildPlugin,yaml,YAML langunage,vanilla,,,,)) +diff --git a/feeds/packages/net/freeswitch/files/.svn/entries b/feeds/packages/net/freeswitch/files/.svn/entries +new file mode 100644 +index 0000000..172440e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freeswitch/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-02T17:15:23.346029Z ++35465 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++freeswitch.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7a526dada30bb23c1851abd3ba7443ba ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1361 ++ ++freeswitch.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++bd33ed75c5501f3dee6b7e7179104d57 ++2010-08-24T13:21:35.203988Z ++22782 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++841 ++ ++freeswitch.default ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7c0ea7ff385605a7c2a39d889a9c6c47 ++2010-08-24T13:21:35.203988Z ++22782 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++584 ++ ++freeswitch.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++9ae3174b9018c6fcf61f8af02a57dacb ++2010-07-07T11:18:11.773162Z ++22084 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++169 ++ +diff --git a/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.config.svn-base b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.config.svn-base +new file mode 100644 +index 0000000..9b4ab84 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.config.svn-base +@@ -0,0 +1,11 @@ ++ ++config 'global' 'state' ++ option 'started' '0' ++ ++config 'profile_top' 'internal_top' ++ ++config 'profile_top' 'external_top' ++ ++config 'external_gateway' 'external_example' ++ ++ +diff --git a/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.default.svn-base b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.default.svn-base +new file mode 100644 +index 0000000..079c314 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.default.svn-base +@@ -0,0 +1,11 @@ ++#FS_DIR="/opt" ++FS_DIR_ETC="$FS_DIR/etc/freeswitch" ++FS_DIR_MOD="$FS_DIR/usr/lib/freeswitch" ++FS_DIR_DB="$FS_DIR/tmp/freeswitch/db" ++FS_DIR_LOG="$FS_DIR/tmp/freeswitch/log" ++FS_DIR_SCRIPTS="$FS_DIR/usr/share/freeswitch/scripts" ++FS_DIR_HTDOCS="$FS_DIR/usr/share/freeswitch/htdocs" ++FS_DIR_RECORDINGS="/var/lib/freeswitch/recordings" # NOTE: must be changed in config as well ++FS_DIR_VM_STORAGE="/var/lib/freeswitch/storage" # NOTE: must be changed in config as well ++ ++OPTIONS="-conf $FS_DIR_ETC -log $FS_DIR_LOG -db $FS_DIR_DB -mod $FS_DIR_MOD -htdocs $FS_DIR_HTDOCS -scripts $FS_DIR_SCRIPTS" +diff --git a/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.hotplug.svn-base b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.hotplug.svn-base +new file mode 100644 +index 0000000..ef9656c +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.hotplug.svn-base +@@ -0,0 +1,65 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++LOAD_STATE=1 ++ ++if [ "$ACTION" = "ifup" ]; then ++ /etc/init.d/freeswitch enabled && { ++ local not_all_up="$(sh -c ' ++ . /lib/functions.sh ++ ++ LOAD_STATE=1 ++ local if_is_down=0 ++ local network_ignore="" ++ ++ check_if_down () { ++ local cfg="$1" ++ local up ++ local proto ++ config_get_bool up "$1" up 0 ++ config_get proto "$1" proto ++ if [ "$proto" != "none" ] && [ "$up" -ne 1 ]; then ++ local new_down=1 ++ local oIFS="$IFS" ++ local ignore ++ IFS=" " ++ for ignore in $network_ignore; do ++ [ "$cfg" = "$ignore" ] && new_down=0 ++ done ++ IFS="$oIFS" ++ [ "$new_down" = "1" ] && if_is_down=1 ++ fi ++ } ++ ++ append_ignore() { ++ local cfg="$1" ++ local network ++ config_get network "$1" network ++ append network_ignore "$network" ++ } ++ ++ LOAD_STATE=1 ++ config_load freeswitch ++ config_foreach append_ignore network_ignore ++ config_load network ++ config_foreach check_if_down interface ++ ++ echo "$if_is_down" ++ ')" ++ [ "$not_all_up" = "0" ] && { ++ local started ++ { ++ mkdir -p /tmp/freeswitch ++ lock /tmp/freeswitch/.start.lck ++ config_load freeswitch ++ config_get started "state" started ++ [ "$started" != "1" ] && { ++ /etc/init.d/freeswitch start ++ uci_set_state freeswitch global state started 1 ++ } ++ lock -u /tmp/freeswitch/.start.lck ++ } & ++ } ++ } ++fi ++ +diff --git a/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.init.svn-base b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.init.svn-base +new file mode 100644 +index 0000000..4476b47 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/.svn/text-base/freeswitch.init.svn-base +@@ -0,0 +1,40 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=90 ++ ++DEFAULT=/etc/default/freeswitch ++OPTIONS="" ++ ++boot() { ++ # Do nothing on boot ++ exit 0 ++} ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ mkdir -p $FS_DIR_DB ++ mkdir -p $FS_DIR_LOG ++ mkdir -p $FS_DIR_RECORDINGS ++ mkdir -p $FS_DIR_VM_STORAGE ++ ulimit -s 240 ++ $FS_DIR/usr/bin/freeswitch $OPTIONS -nc ++} ++ ++stop() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ $FS_DIR/usr/bin/freeswitch $OPTIONS -stop ++} ++ ++restart() { ++ # stopping freeswitch is non-blocking, so we wait until freeswitch's ++ # event socket is down, and then wait an additional ten seconds so that ++ # freeswitch should be completely shutdown before we start it again ++ local retval ++ stop ++ fs_cli -x status >/dev/null 2>&1 ++ retval=$? ++ while [ $retval -eq 0 ]; do sleep 1; fs_cli -x status >/dev/null 2>&1; retval=$?; done ++ sleep 10 ++ start ++} ++ +diff --git a/feeds/packages/net/freeswitch/files/freeswitch.config b/feeds/packages/net/freeswitch/files/freeswitch.config +new file mode 100644 +index 0000000..9b4ab84 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/freeswitch.config +@@ -0,0 +1,11 @@ ++ ++config 'global' 'state' ++ option 'started' '0' ++ ++config 'profile_top' 'internal_top' ++ ++config 'profile_top' 'external_top' ++ ++config 'external_gateway' 'external_example' ++ ++ +diff --git a/feeds/packages/net/freeswitch/files/freeswitch.default b/feeds/packages/net/freeswitch/files/freeswitch.default +new file mode 100644 +index 0000000..079c314 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/freeswitch.default +@@ -0,0 +1,11 @@ ++#FS_DIR="/opt" ++FS_DIR_ETC="$FS_DIR/etc/freeswitch" ++FS_DIR_MOD="$FS_DIR/usr/lib/freeswitch" ++FS_DIR_DB="$FS_DIR/tmp/freeswitch/db" ++FS_DIR_LOG="$FS_DIR/tmp/freeswitch/log" ++FS_DIR_SCRIPTS="$FS_DIR/usr/share/freeswitch/scripts" ++FS_DIR_HTDOCS="$FS_DIR/usr/share/freeswitch/htdocs" ++FS_DIR_RECORDINGS="/var/lib/freeswitch/recordings" # NOTE: must be changed in config as well ++FS_DIR_VM_STORAGE="/var/lib/freeswitch/storage" # NOTE: must be changed in config as well ++ ++OPTIONS="-conf $FS_DIR_ETC -log $FS_DIR_LOG -db $FS_DIR_DB -mod $FS_DIR_MOD -htdocs $FS_DIR_HTDOCS -scripts $FS_DIR_SCRIPTS" +diff --git a/feeds/packages/net/freeswitch/files/freeswitch.hotplug b/feeds/packages/net/freeswitch/files/freeswitch.hotplug +new file mode 100644 +index 0000000..ef9656c +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/freeswitch.hotplug +@@ -0,0 +1,65 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++LOAD_STATE=1 ++ ++if [ "$ACTION" = "ifup" ]; then ++ /etc/init.d/freeswitch enabled && { ++ local not_all_up="$(sh -c ' ++ . /lib/functions.sh ++ ++ LOAD_STATE=1 ++ local if_is_down=0 ++ local network_ignore="" ++ ++ check_if_down () { ++ local cfg="$1" ++ local up ++ local proto ++ config_get_bool up "$1" up 0 ++ config_get proto "$1" proto ++ if [ "$proto" != "none" ] && [ "$up" -ne 1 ]; then ++ local new_down=1 ++ local oIFS="$IFS" ++ local ignore ++ IFS=" " ++ for ignore in $network_ignore; do ++ [ "$cfg" = "$ignore" ] && new_down=0 ++ done ++ IFS="$oIFS" ++ [ "$new_down" = "1" ] && if_is_down=1 ++ fi ++ } ++ ++ append_ignore() { ++ local cfg="$1" ++ local network ++ config_get network "$1" network ++ append network_ignore "$network" ++ } ++ ++ LOAD_STATE=1 ++ config_load freeswitch ++ config_foreach append_ignore network_ignore ++ config_load network ++ config_foreach check_if_down interface ++ ++ echo "$if_is_down" ++ ')" ++ [ "$not_all_up" = "0" ] && { ++ local started ++ { ++ mkdir -p /tmp/freeswitch ++ lock /tmp/freeswitch/.start.lck ++ config_load freeswitch ++ config_get started "state" started ++ [ "$started" != "1" ] && { ++ /etc/init.d/freeswitch start ++ uci_set_state freeswitch global state started 1 ++ } ++ lock -u /tmp/freeswitch/.start.lck ++ } & ++ } ++ } ++fi ++ +diff --git a/feeds/packages/net/freeswitch/files/freeswitch.init b/feeds/packages/net/freeswitch/files/freeswitch.init +new file mode 100644 +index 0000000..4476b47 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/files/freeswitch.init +@@ -0,0 +1,40 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=90 ++ ++DEFAULT=/etc/default/freeswitch ++OPTIONS="" ++ ++boot() { ++ # Do nothing on boot ++ exit 0 ++} ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ mkdir -p $FS_DIR_DB ++ mkdir -p $FS_DIR_LOG ++ mkdir -p $FS_DIR_RECORDINGS ++ mkdir -p $FS_DIR_VM_STORAGE ++ ulimit -s 240 ++ $FS_DIR/usr/bin/freeswitch $OPTIONS -nc ++} ++ ++stop() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ $FS_DIR/usr/bin/freeswitch $OPTIONS -stop ++} ++ ++restart() { ++ # stopping freeswitch is non-blocking, so we wait until freeswitch's ++ # event socket is down, and then wait an additional ten seconds so that ++ # freeswitch should be completely shutdown before we start it again ++ local retval ++ stop ++ fs_cli -x status >/dev/null 2>&1 ++ retval=$? ++ while [ $retval -eq 0 ]; do sleep 1; fs_cli -x status >/dev/null 2>&1; retval=$?; done ++ sleep 10 ++ start ++} ++ +diff --git a/feeds/packages/net/freeswitch/patches/.svn/entries b/feeds/packages/net/freeswitch/patches/.svn/entries +new file mode 100644 +index 0000000..97bf00e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/entries +@@ -0,0 +1,776 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/freeswitch/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-03-01T22:39:28.827278Z ++35841 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-libs-esl-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++fc016e2fe272d99df507763864e21e85 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++827 ++ ++103-libs-spandsp-src-t4_rx_c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++cea3cd41ea527edbb71b6e80a582d1f4 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++243 ++ ++104-libs-spandsp-src-t4_tx_c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++d9c5736e78d8837c2abacd1378ea3fa0 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++243 ++ ++201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++daf2f6f1a67d4dc9df159ff8299069ef ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++336 ++ ++205-src-mod-endpoints-mod_gsmopen-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++0ada972ef174b3948633d50d3710ac7b ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1118 ++ ++207-src-mod-xml_int-mod_xml_ldap-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++dbcce2acd2e2ea1bc167855213d145de ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++444 ++ ++101-libs-spandsp-src-spandsp-fast_convert_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++f8bd00a12dd71524f6e97510a1887290 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++368 ++ ++107-libs-libzrtp-include-zrtp_config_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++ad0070598042b2386d940e52b8763267 ++2013-03-01T22:39:28.827278Z ++35841 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++782 ++ ++206-src-mod-event_handlers-mod_snmp-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++2daa32f73e8a74881c114c04a83ea36c ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++499 ++ ++001-build-modules_conf_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++b77111136d780441dc2d6ca669e33c93 ++2013-01-14T00:15:24.701940Z ++35146 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1674 ++ ++208-src-mod-xml_int-mod_xml_rpc-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++6aaf411af67161aa8a9008165d94fd09 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++400 ++ ++105-libs-xmlrpc-c-config_mk_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++2a161d61f571940e85ad0dd3ed7a24a7 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++376 ++ ++200-src-include-timerfd_wrap_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e8e7798b6432beb2104dedb74c83dc31 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++608 ++ ++202-src-mod-codecs-mod_opus-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e129c4fc38db4f104bdb3202165fd64c ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++627 ++ ++002-configure_in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++a8da8fe9038dcb4640846fd52f9166fc ++2013-02-11T14:25:49.475574Z ++35556 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++802 ++ ++106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7328e28becd6e909ef767c54ce977c2a ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++428 ++ ++000-build-openwrt_rules.mk.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++9155fab0cf82324dc5fd66045f14ee8e ++2013-02-02T17:15:23.346029Z ++35465 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++384 ++ ++210-src-mod-endpoints-mod_dingaling-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e32d4a29f60c1e8de4c2c3f1fa0a2cc9 ++2013-02-11T14:25:49.475574Z ++35556 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++463 ++ ++003-Makefile.am.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++19c3e42b549fec584f65291fcf45827b ++2013-02-28T03:00:42.006017Z ++35829 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1579 ++ ++204-src-mod-directories-mod_ldap-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++14b18386e015fb8c453da2bc141dbbb1 ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++487 ++ ++203-src-mod-codecs-mod_silk-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7511690d4babdbe0111d143b42d6280c ++2013-01-07T14:25:52.396536Z ++35036 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++617 ++ ++209-src-mod-codecs-mod_isac-typedefs_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++4993f340c7be86fa978667020c793344 ++2013-02-05T20:20:05.884289Z ++35502 ++mazilo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++441 ++ +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/000-build-openwrt_rules.mk.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/000-build-openwrt_rules.mk.patch.svn-base +new file mode 100644 +index 0000000..31fb16f +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/000-build-openwrt_rules.mk.patch.svn-base +@@ -0,0 +1,10 @@ ++--- /dev/null +++++ b/build/openwrt_rules.mk ++@@ -0,0 +1,7 @@ +++OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd)) +++STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host +++STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`)) +++ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)" +++GNU_TARGET_NAME=$(ARCH)-openwrt-linux +++ +++include $(OPENWRT_DIR)/rules.mk +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/001-build-modules_conf_in.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/001-build-modules_conf_in.patch.svn-base +new file mode 100644 +index 0000000..736d9a4 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/001-build-modules_conf_in.patch.svn-base +@@ -0,0 +1,65 @@ ++--- a/build/modules.conf.in +++++ b/build/modules.conf.in ++@@ -3,6 +3,9 @@ ++ #applications/mod_blacklist ++ #applications/mod_callcenter ++ #applications/mod_cidlookup +++#applications/mod_skel +++#applications/mod_mp4 +++#applications/mod_protovm ++ applications/mod_cluechoo ++ applications/mod_commands ++ applications/mod_conference ++@@ -27,6 +30,7 @@ applications/mod_httapi ++ #applications/mod_memcache ++ #applications/mod_mongo ++ #applications/mod_nibblebill +++#applications/mod_oreka ++ #applications/mod_osp ++ #applications/mod_redis ++ #applications/mod_rss ++@@ -34,6 +38,7 @@ applications/mod_sms ++ #applications/mod_snapshot ++ #applications/mod_snipe_hunt ++ #applications/mod_snom +++#applications/mod_sonar ++ #applications/mod_soundtouch ++ applications/mod_spandsp ++ #applications/mod_spy ++@@ -61,17 +66,20 @@ codecs/mod_h26x ++ codecs/mod_vp8 ++ #codecs/mod_ilbc ++ #codecs/mod_isac +++#codecs/mod_mp4v ++ #codecs/mod_opus ++ #codecs/mod_sangoma_codec ++ #codecs/mod_silk ++ #codecs/mod_siren ++ codecs/mod_speex +++#codecs/mod_theora ++ dialplans/mod_dialplan_asterisk ++ #dialplans/mod_dialplan_directory ++ dialplans/mod_dialplan_xml ++ #directories/mod_ldap ++ #endpoints/mod_alsa ++ #endpoints/mod_dingaling +++#endpoints/mod_gsmopen ++ #endpoints/mod_h323 ++ #endpoints/mod_html5 ++ #endpoints/mod_khomp ++@@ -88,6 +96,7 @@ event_handlers/mod_cdr_csv ++ event_handlers/mod_cdr_sqlite ++ #event_handlers/mod_erlang_event ++ #event_handlers/mod_event_multicast +++#event_handlers/mod_json_cdr ++ event_handlers/mod_event_socket ++ #event_handlers/mod_event_zmq ++ #event_handlers/mod_radius_cdr ++@@ -113,6 +122,7 @@ loggers/mod_syslog ++ #say/mod_say_de ++ say/mod_say_en ++ #say/mod_say_es +++#say/mod_say_fa ++ #say/mod_say_fr ++ #say/mod_say_he ++ #say/mod_say_hu +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/002-configure_in.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/002-configure_in.patch.svn-base +new file mode 100644 +index 0000000..326112c +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/002-configure_in.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -152,7 +152,7 @@ if test "${enable_optimizer}" = "yes" ; ++ AX_CC_MAXOPT ++ fi ++ ++-AX_PATH_LIBGNUTLS() +++#AX_PATH_LIBGNUTLS() ++ ++ # set defaults for use on all platforms ++ SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu" ++@@ -581,7 +581,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa ++ ++ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) ++ ++-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])]) +++# AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])]) ++ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) ++ ++ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/003-Makefile.am.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/003-Makefile.am.patch.svn-base +new file mode 100644 +index 0000000..af128f9 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/003-Makefile.am.patch.svn-base +@@ -0,0 +1,48 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,3 +1,7 @@ +++BASE=. +++ +++include $(BASE)/build/openwrt_rules.mk +++ ++ EXTRA_DIST = ++ SUBDIRS = . src ++ AUTOMAKE_OPTIONS = foreign ++@@ -164,7 +168,6 @@ ZRTP_LIBS = -lbn -lzrtp ++ libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS) ++ libfreeswitch_la_LIBADD += $(ZRTP_LIBS) ++ CORE_LIBS += libs/libzrtp/libzrtp.a ++-LIBS += libs/libzrtp/third_party/bnlib/libbn.a ++ endif ++ ++ library_includedir = $(includedir) ++@@ -422,7 +425,7 @@ $(switch_builddir)/quiet_libtool: $(swit ++ @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool ++ ++ build/print_git_revision: build/print_git_revision.c ++- $(CC) -o $@ $< +++ $(HOSTCC) -o $@ $< ++ ++ src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) ++ @cat $< > $@; \ ++@@ -648,7 +651,9 @@ sndfile-reconf: ++ ++ tiff-reconf: ++ cd libs/tiff-4.0.2 && autoreconf -fi ++- cd libs/tiff-4.0.2 && sh ./configure.gnu +++ cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr" +++ cd libs/spandsp && autoreconf -fi +++ cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr" ++ cd libs/tiff-4.0.2 && make ++ ++ python-reconf: ++@@ -673,9 +678,6 @@ iks-reconf: ++ $(MAKE) mod_dingaling-clean ++ ++ spandsp-reconf: tiff-reconf ++- cd libs/spandsp && $(MAKE) clean || echo ++- cd libs/spandsp && autoreconf -fi ++- cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix) ++ cd libs/spandsp && $(MAKE) ++ ++ sofia-reconf: +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/100-libs-esl-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/100-libs-esl-Makefile.patch.svn-base +new file mode 100644 +index 0000000..c0034ec +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/100-libs-esl-Makefile.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/libs/esl/Makefile +++++ b/libs/esl/Makefile ++@@ -7,7 +7,7 @@ PICKY=-O2 ++ CFLAGS=$(BASE_FLAGS) $(PICKY) ++ CXXFLAGS=$(BASE_FLAGS) ++ MYLIB=libesl.a ++-LIBS=-lncurses -lesl -lpthread -lm +++LIBS=-L$(STAGING_DIR)/usr/lib -lncurses -lesl -lpthread -lm ++ LDFLAGS=-L. ++ OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o src/esl_json.o src/esl_buffer.o ++ SRC=src/esl.c src/esl_json.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c src/esl_oop.cpp src/esl_json.c src/esl_buffer.c ++@@ -19,8 +19,8 @@ OBJS += src/esl_oop.o ++ all: $(MYLIB) fs_cli testclient testserver ivrd ++ ++ $(MYLIB): $(OBJS) $(HEADERS) $(SRC) ++- ar rcs $(MYLIB) $(OBJS) ++- ranlib $(MYLIB) +++ $(AR) rcs $(MYLIB) $(OBJS) +++ $(RANLIB) $(MYLIB) ++ ++ testserver: $(MYLIB) testserver.c ++ $(CC) $(CC_CFLAGS) $(CFLAGS) testserver.c -o testserver $(LDFLAGS) $(LIBS) +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/101-libs-spandsp-src-spandsp-fast_convert_h.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/101-libs-spandsp-src-spandsp-fast_convert_h.patch.svn-base +new file mode 100644 +index 0000000..e2fb3da +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/101-libs-spandsp-src-spandsp-fast_convert_h.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/libs/spandsp/src/spandsp/fast_convert.h +++++ b/libs/spandsp/src/spandsp/fast_convert.h ++@@ -195,7 +195,7 @@ extern "C" ++ { ++ return (long int) (x); ++ } ++-#elif defined(__ppc__) || defined(__powerpc__) +++#elif 0 /* defined(__ppc__) || defined(__powerpc__) */ ++ static __inline__ long int lfastrint(register double x) ++ { ++ int res[2]; +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/103-libs-spandsp-src-t4_rx_c.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/103-libs-spandsp-src-t4_rx_c.patch.svn-base +new file mode 100644 +index 0000000..b7057ca +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/103-libs-spandsp-src-t4_rx_c.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/libs/spandsp/src/t4_rx.c +++++ b/libs/spandsp/src/t4_rx.c ++@@ -45,7 +45,7 @@ ++ #include ++ #endif ++ #include "floating_fudge.h" ++-#include +++#include ++ ++ #include "spandsp/telephony.h" ++ #include "spandsp/logging.h" +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/104-libs-spandsp-src-t4_tx_c.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/104-libs-spandsp-src-t4_tx_c.patch.svn-base +new file mode 100644 +index 0000000..31264ae +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/104-libs-spandsp-src-t4_tx_c.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/libs/spandsp/src/t4_tx.c +++++ b/libs/spandsp/src/t4_tx.c ++@@ -45,7 +45,7 @@ ++ #include ++ #endif ++ #include "floating_fudge.h" ++-#include +++#include ++ ++ #include "spandsp/telephony.h" ++ #include "spandsp/logging.h" +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/105-libs-xmlrpc-c-config_mk_in.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/105-libs-xmlrpc-c-config_mk_in.patch.svn-base +new file mode 100644 +index 0000000..79cb33e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/105-libs-xmlrpc-c-config_mk_in.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/libs/xmlrpc-c/config.mk.in +++++ b/libs/xmlrpc-c/config.mk.in ++@@ -335,8 +335,8 @@ endif ++ # The cross compiling user can update config.mk or override ++ # BUILDTOOL_CC on a make command. ++ ++-BUILDTOOL_CC = $(CC) ++-BUILDTOOL_CCLD = $(CCLD) +++BUILDTOOL_CC = $(HOSTCC) +++BUILDTOOL_CCLD = $(HOSTCC) ++ ++ # Here are the commands 'make install' uses to install various kinds of files: ++ +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch.svn-base +new file mode 100644 +index 0000000..d50d200 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch.svn-base +@@ -0,0 +1,16 @@ ++--- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile +++++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile ++@@ -1,3 +1,5 @@ +++TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd)) +++ ++ ifeq ($(SRCDIR),) ++ updir = $(shell echo $(dir $(1)) | sed 's/.$$//') ++ EXPATDIR := $(call updir,$(CURDIR)) ++@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),) ++ endif ++ SUBDIR := lib/expat/gennmtab ++ +++include $(TOPDIR)/rules.mk ++ include $(BLDDIR)/config.mk ++ ++ LDFLAGS = $(LADD) +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/107-libs-libzrtp-include-zrtp_config_h.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/107-libs-libzrtp-include-zrtp_config_h.patch.svn-base +new file mode 100644 +index 0000000..e460bc4 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/107-libs-libzrtp-include-zrtp_config_h.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/libs/libzrtp/include/zrtp_config.h +++++ b/libs/libzrtp/include/zrtp_config.h ++@@ -66,8 +66,16 @@ ++ * If the byte order is not specified manually in zrtp_config_user.h - try to detect it automatically ++ */ ++ #if !defined(ZRTP_BYTE_ORDER) +++#if defined(linux) || defined(__linux) ++ ++-#if defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \ +++#include +++#if __BYTE_ORDER == __LITTLE_ENDIAN +++#define ZRTP_BYTE_ORDER ZBO_LITTLE_ENDIAN +++#elif __BYTE_ORDER == __BIG_ENDIAN +++#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN +++#endif +++ +++#elif defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \ ++ defined(__i386) || defined(_M_IX86) || defined(__I86__) ++ /* ++ * Generic i386 processor family, little-endian +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/200-src-include-timerfd_wrap_h.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/200-src-include-timerfd_wrap_h.patch.svn-base +new file mode 100644 +index 0000000..dbf995e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/200-src-include-timerfd_wrap_h.patch.svn-base +@@ -0,0 +1,27 @@ ++--- a/src/include/timerfd_wrap.h +++++ b/src/include/timerfd_wrap.h ++@@ -55,20 +55,12 @@ SWITCH_BEGIN_EXTERN_C ++ ++ ++ #ifndef __NR_timerfd ++-#if defined(__x86_64__) ++-#define __NR_timerfd_create 283 ++-#define __NR_timerfd_settime 286 ++-#define __NR_timerfd_gettime 287 ++-#elif defined(__i386__) ++-#define __NR_timerfd_create 322 ++-#define __NR_timerfd_settime 325 ++-#define __NR_timerfd_gettime 326 ++-#else ++-#error invalid system ++-#endif +++#include ++ #endif ++ ++-#define TFD_TIMER_ABSTIME (1 << 0) +++#ifndef TFD_TIMER_ABSTIME +++#include +++#endif ++ ++ int timerfd_create(int clockid, int flags) ++ { +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch.svn-base +new file mode 100644 +index 0000000..ac81dd0 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/src/mod/applications/mod_mp4/mp4_helper.hpp +++++ b/src/mod/applications/mod_mp4/mp4_helper.hpp ++@@ -22,8 +22,9 @@ the Initial Developer. All Rights Reserv ++ #ifndef MP4_HELPER_HPP_ ++ #define MP4_HELPER_HPP_ ++ +++#include +++#include ++ #include ++-#include ++ #include ++ #include ++ +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/202-src-mod-codecs-mod_opus-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/202-src-mod-codecs-mod_opus-Makefile.patch.svn-base +new file mode 100644 +index 0000000..cdf710a +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/202-src-mod-codecs-mod_opus-Makefile.patch.svn-base +@@ -0,0 +1,17 @@ ++--- a/src/mod/codecs/mod_opus/Makefile +++++ b/src/mod/codecs/mod_opus/Makefile ++@@ -12,12 +12,13 @@ OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.l ++ LOCAL_LIBADD=$(OPUS_LA) ++ ++ include $(BASE)/build/modmake.rules +++include $(BASE)/build/openwrt_rules.mk ++ ++ $(OPUS_DIR): ++ $(GETLIB) $(OPUS).tar.gz ++ ++ $(OPUS_DIR)/Makefile: $(OPUS_DIR) ++- cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR) +++ cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(GNU_TARGET_NAME) --disable-shared --with-pic --srcdir=$(OPUS_DIR) ++ $(TOUCH_TARGET) ++ ++ $(OPUS_LA): $(OPUS_DIR)/Makefile +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/203-src-mod-codecs-mod_silk-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/203-src-mod-codecs-mod_silk-Makefile.patch.svn-base +new file mode 100644 +index 0000000..1d4341e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/203-src-mod-codecs-mod_silk-Makefile.patch.svn-base +@@ -0,0 +1,15 @@ ++--- a/src/mod/codecs/mod_silk/Makefile +++++ b/src/mod/codecs/mod_silk/Makefile ++@@ -1,4 +1,5 @@ ++ BASE=../../../.. +++include $(BASE)/build/openwrt_rules.mk ++ SILK_DIR=$(switch_srcdir)/libs/silk ++ SILK_BUILDDIR=$(switch_builddir)/libs/silk ++ LOCAL_CFLAGS=-I$(SILK_DIR)/src -I$(SILK_DIR)/interface ++@@ -8,5 +9,5 @@ LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o ++ include $(BASE)/build/modmake.rules ++ ++ $(SILK_LA): $(SILK_DIR)/.update ++- cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE) +++ cd $(SILK_BUILDDIR) && ./configure --host=$(GNU_TARGET_NAME) --disable-shared && make clean && $(MAKE) ++ $(TOUCH_TARGET) +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/204-src-mod-directories-mod_ldap-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/204-src-mod-directories-mod_ldap-Makefile.patch.svn-base +new file mode 100644 +index 0000000..92741d1 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/204-src-mod-directories-mod_ldap-Makefile.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/src/mod/directories/mod_ldap/Makefile +++++ b/src/mod/directories/mod_ldap/Makefile ++@@ -21,7 +21,7 @@ $(LDAP_DIR): ++ ++ $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR) ++ mkdir -p $(LDAP_BUILDDIR) ++- cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) +++ cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) --with-yielding_select=yes ++ $(TOUCH_TARGET) ++ ++ $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/205-src-mod-endpoints-mod_gsmopen-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/205-src-mod-endpoints-mod_gsmopen-Makefile.patch.svn-base +new file mode 100644 +index 0000000..3b24669 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/205-src-mod-endpoints-mod_gsmopen-Makefile.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/src/mod/endpoints/mod_gsmopen/Makefile +++++ b/src/mod/endpoints/mod_gsmopen/Makefile ++@@ -1,5 +1,15 @@ +++BASE=../../../.. ++ MODNAME=mod_gsmopen ++-LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\" ++-LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme +++SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"' +++ +++TIFF_DIR="$(shell ls -d $(switch_srcdir)/libs/tiff*)" +++TIFF_BUILDDIR=$(TIFF_DIR) +++TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la +++ +++SPANDSP_DIR=$(switch_srcdir)/libs/spandsp +++SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp +++SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la +++LOCAL_CFLAGS += $(SVNDEF) -I$(BASE)/libs/spandsp/src -I$(TIFF_DIR)/libtiff -I$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/include -fpermissive +++LOCAL_LDFLAGS=-L$(BASE)/libs/spandsp/src -lspandsp -L$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib -lctb-0.16 ++ LOCAL_OBJS=gsmopen_protocol.o ++ include ../../../../build/modmake.rules +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/206-src-mod-event_handlers-mod_snmp-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/206-src-mod-event_handlers-mod_snmp-Makefile.patch.svn-base +new file mode 100644 +index 0000000..c85f62c +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/206-src-mod-event_handlers-mod_snmp-Makefile.patch.svn-base +@@ -0,0 +1,16 @@ ++--- a/src/mod/event_handlers/mod_snmp/Makefile +++++ b/src/mod/event_handlers/mod_snmp/Makefile ++@@ -1,7 +1,10 @@ ++-include ../../../../build/modmake.rules +++BASE=../../../.. +++ +++include $(BASE)/build/modmake.rules +++include $(BASE)/build/openwrt_rules.mk +++ +++LOCAL_CFLAGS=$(shell $(STAGING_DIR)/host/bin/net-snmp-config --cflags --agent-libs) -DNETSNMP_NO_INLINE ++ ++-LOCAL_CFLAGS=`net-snmp-config --cflags` ++-LOCAL_LDFLAGS=`net-snmp-config --agent-libs` ++ LOCAL_OBJS=subagent.o ++ ++ local_depend: $(LOCAL_OBJS) +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch.svn-base +new file mode 100644 +index 0000000..0734887 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/src/mod/xml_int/mod_xml_ldap/Makefile +++++ b/src/mod/xml_int/mod_xml_ldap/Makefile ++@@ -14,7 +14,7 @@ LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LI ++ ++ include $(BASE)/build/modmake.rules ++ ++-DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb +++DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb --with-yielding_select=yes ++ ++ $(LDAP_DIR): ++ $(GETLIB) $(LDAP).tar.gz +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch.svn-base +new file mode 100644 +index 0000000..7691d3e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/src/mod/xml_int/mod_xml_rpc/Makefile +++++ b/src/mod/xml_int/mod_xml_rpc/Makefile ++@@ -14,7 +14,6 @@ $(XMLRPC_DIR)/lib/abyss/src/date.o\ ++ $(XMLRPC_DIR)/src/double.o\ ++ $(XMLRPC_DIR)/lib/libutil/error.o\ ++ $(XMLRPC_DIR)/lib/abyss/src/file.o\ ++-$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\ ++ $(XMLRPC_DIR)/lib/util/getoptx.o\ ++ $(XMLRPC_DIR)/lib/abyss/src/handler.o\ ++ $(XMLRPC_DIR)/lib/abyss/src/http.o\ +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/209-src-mod-codecs-mod_isac-typedefs_h.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/209-src-mod-codecs-mod_isac-typedefs_h.patch.svn-base +new file mode 100644 +index 0000000..84de2af +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/209-src-mod-codecs-mod_isac-typedefs_h.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/src/mod/codecs/mod_isac/typedefs.h +++++ b/src/mod/codecs/mod_isac/typedefs.h ++@@ -66,7 +66,7 @@ ++ #define WEBRTC_ARCH_X86 ++ #define WEBRTC_ARCH_32_BITS ++ #define WEBRTC_ARCH_LITTLE_ENDIAN ++-#elif defined(__ARMEL__) +++#elif defined(__ARMEL__) || defined(__mips__) ++ // TODO(andrew): We'd prefer to control platform defines here, but this is ++ // currently provided by the Android makefiles. Commented to avoid duplicate ++ // definition warnings. +diff --git a/feeds/packages/net/freeswitch/patches/.svn/text-base/210-src-mod-endpoints-mod_dingaling-Makefile.patch.svn-base b/feeds/packages/net/freeswitch/patches/.svn/text-base/210-src-mod-endpoints-mod_dingaling-Makefile.patch.svn-base +new file mode 100644 +index 0000000..0b56586 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/.svn/text-base/210-src-mod-endpoints-mod_dingaling-Makefile.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/src/mod/endpoints/mod_dingaling/Makefile +++++ b/src/mod/endpoints/mod_dingaling/Makefile ++@@ -10,7 +10,6 @@ DING_DIR=$(BASE)/libs/libdingaling ++ LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include ++ LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) ++ LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h ++-LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS) ++ include $(BASE)/build/modmake.rules ++ ++ +diff --git a/feeds/packages/net/freeswitch/patches/000-build-openwrt_rules.mk.patch b/feeds/packages/net/freeswitch/patches/000-build-openwrt_rules.mk.patch +new file mode 100644 +index 0000000..31fb16f +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/000-build-openwrt_rules.mk.patch +@@ -0,0 +1,10 @@ ++--- /dev/null +++++ b/build/openwrt_rules.mk ++@@ -0,0 +1,7 @@ +++OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd)) +++STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host +++STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`)) +++ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)" +++GNU_TARGET_NAME=$(ARCH)-openwrt-linux +++ +++include $(OPENWRT_DIR)/rules.mk +diff --git a/feeds/packages/net/freeswitch/patches/001-build-modules_conf_in.patch b/feeds/packages/net/freeswitch/patches/001-build-modules_conf_in.patch +new file mode 100644 +index 0000000..736d9a4 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/001-build-modules_conf_in.patch +@@ -0,0 +1,65 @@ ++--- a/build/modules.conf.in +++++ b/build/modules.conf.in ++@@ -3,6 +3,9 @@ ++ #applications/mod_blacklist ++ #applications/mod_callcenter ++ #applications/mod_cidlookup +++#applications/mod_skel +++#applications/mod_mp4 +++#applications/mod_protovm ++ applications/mod_cluechoo ++ applications/mod_commands ++ applications/mod_conference ++@@ -27,6 +30,7 @@ applications/mod_httapi ++ #applications/mod_memcache ++ #applications/mod_mongo ++ #applications/mod_nibblebill +++#applications/mod_oreka ++ #applications/mod_osp ++ #applications/mod_redis ++ #applications/mod_rss ++@@ -34,6 +38,7 @@ applications/mod_sms ++ #applications/mod_snapshot ++ #applications/mod_snipe_hunt ++ #applications/mod_snom +++#applications/mod_sonar ++ #applications/mod_soundtouch ++ applications/mod_spandsp ++ #applications/mod_spy ++@@ -61,17 +66,20 @@ codecs/mod_h26x ++ codecs/mod_vp8 ++ #codecs/mod_ilbc ++ #codecs/mod_isac +++#codecs/mod_mp4v ++ #codecs/mod_opus ++ #codecs/mod_sangoma_codec ++ #codecs/mod_silk ++ #codecs/mod_siren ++ codecs/mod_speex +++#codecs/mod_theora ++ dialplans/mod_dialplan_asterisk ++ #dialplans/mod_dialplan_directory ++ dialplans/mod_dialplan_xml ++ #directories/mod_ldap ++ #endpoints/mod_alsa ++ #endpoints/mod_dingaling +++#endpoints/mod_gsmopen ++ #endpoints/mod_h323 ++ #endpoints/mod_html5 ++ #endpoints/mod_khomp ++@@ -88,6 +96,7 @@ event_handlers/mod_cdr_csv ++ event_handlers/mod_cdr_sqlite ++ #event_handlers/mod_erlang_event ++ #event_handlers/mod_event_multicast +++#event_handlers/mod_json_cdr ++ event_handlers/mod_event_socket ++ #event_handlers/mod_event_zmq ++ #event_handlers/mod_radius_cdr ++@@ -113,6 +122,7 @@ loggers/mod_syslog ++ #say/mod_say_de ++ say/mod_say_en ++ #say/mod_say_es +++#say/mod_say_fa ++ #say/mod_say_fr ++ #say/mod_say_he ++ #say/mod_say_hu +diff --git a/feeds/packages/net/freeswitch/patches/002-configure_in.patch b/feeds/packages/net/freeswitch/patches/002-configure_in.patch +new file mode 100644 +index 0000000..326112c +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/002-configure_in.patch +@@ -0,0 +1,20 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -152,7 +152,7 @@ if test "${enable_optimizer}" = "yes" ; ++ AX_CC_MAXOPT ++ fi ++ ++-AX_PATH_LIBGNUTLS() +++#AX_PATH_LIBGNUTLS() ++ ++ # set defaults for use on all platforms ++ SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu" ++@@ -581,7 +581,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa ++ ++ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) ++ ++-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])]) +++# AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])]) ++ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) ++ ++ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ +diff --git a/feeds/packages/net/freeswitch/patches/003-Makefile.am.patch b/feeds/packages/net/freeswitch/patches/003-Makefile.am.patch +new file mode 100644 +index 0000000..af128f9 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/003-Makefile.am.patch +@@ -0,0 +1,48 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -1,3 +1,7 @@ +++BASE=. +++ +++include $(BASE)/build/openwrt_rules.mk +++ ++ EXTRA_DIST = ++ SUBDIRS = . src ++ AUTOMAKE_OPTIONS = foreign ++@@ -164,7 +168,6 @@ ZRTP_LIBS = -lbn -lzrtp ++ libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS) ++ libfreeswitch_la_LIBADD += $(ZRTP_LIBS) ++ CORE_LIBS += libs/libzrtp/libzrtp.a ++-LIBS += libs/libzrtp/third_party/bnlib/libbn.a ++ endif ++ ++ library_includedir = $(includedir) ++@@ -422,7 +425,7 @@ $(switch_builddir)/quiet_libtool: $(swit ++ @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool ++ ++ build/print_git_revision: build/print_git_revision.c ++- $(CC) -o $@ $< +++ $(HOSTCC) -o $@ $< ++ ++ src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) ++ @cat $< > $@; \ ++@@ -648,7 +651,9 @@ sndfile-reconf: ++ ++ tiff-reconf: ++ cd libs/tiff-4.0.2 && autoreconf -fi ++- cd libs/tiff-4.0.2 && sh ./configure.gnu +++ cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr" +++ cd libs/spandsp && autoreconf -fi +++ cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr" ++ cd libs/tiff-4.0.2 && make ++ ++ python-reconf: ++@@ -673,9 +678,6 @@ iks-reconf: ++ $(MAKE) mod_dingaling-clean ++ ++ spandsp-reconf: tiff-reconf ++- cd libs/spandsp && $(MAKE) clean || echo ++- cd libs/spandsp && autoreconf -fi ++- cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix) ++ cd libs/spandsp && $(MAKE) ++ ++ sofia-reconf: +diff --git a/feeds/packages/net/freeswitch/patches/100-libs-esl-Makefile.patch b/feeds/packages/net/freeswitch/patches/100-libs-esl-Makefile.patch +new file mode 100644 +index 0000000..c0034ec +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/100-libs-esl-Makefile.patch +@@ -0,0 +1,22 @@ ++--- a/libs/esl/Makefile +++++ b/libs/esl/Makefile ++@@ -7,7 +7,7 @@ PICKY=-O2 ++ CFLAGS=$(BASE_FLAGS) $(PICKY) ++ CXXFLAGS=$(BASE_FLAGS) ++ MYLIB=libesl.a ++-LIBS=-lncurses -lesl -lpthread -lm +++LIBS=-L$(STAGING_DIR)/usr/lib -lncurses -lesl -lpthread -lm ++ LDFLAGS=-L. ++ OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o src/esl_json.o src/esl_buffer.o ++ SRC=src/esl.c src/esl_json.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c src/esl_oop.cpp src/esl_json.c src/esl_buffer.c ++@@ -19,8 +19,8 @@ OBJS += src/esl_oop.o ++ all: $(MYLIB) fs_cli testclient testserver ivrd ++ ++ $(MYLIB): $(OBJS) $(HEADERS) $(SRC) ++- ar rcs $(MYLIB) $(OBJS) ++- ranlib $(MYLIB) +++ $(AR) rcs $(MYLIB) $(OBJS) +++ $(RANLIB) $(MYLIB) ++ ++ testserver: $(MYLIB) testserver.c ++ $(CC) $(CC_CFLAGS) $(CFLAGS) testserver.c -o testserver $(LDFLAGS) $(LIBS) +diff --git a/feeds/packages/net/freeswitch/patches/101-libs-spandsp-src-spandsp-fast_convert_h.patch b/feeds/packages/net/freeswitch/patches/101-libs-spandsp-src-spandsp-fast_convert_h.patch +new file mode 100644 +index 0000000..e2fb3da +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/101-libs-spandsp-src-spandsp-fast_convert_h.patch +@@ -0,0 +1,11 @@ ++--- a/libs/spandsp/src/spandsp/fast_convert.h +++++ b/libs/spandsp/src/spandsp/fast_convert.h ++@@ -195,7 +195,7 @@ extern "C" ++ { ++ return (long int) (x); ++ } ++-#elif defined(__ppc__) || defined(__powerpc__) +++#elif 0 /* defined(__ppc__) || defined(__powerpc__) */ ++ static __inline__ long int lfastrint(register double x) ++ { ++ int res[2]; +diff --git a/feeds/packages/net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch b/feeds/packages/net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch +new file mode 100644 +index 0000000..b7057ca +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch +@@ -0,0 +1,11 @@ ++--- a/libs/spandsp/src/t4_rx.c +++++ b/libs/spandsp/src/t4_rx.c ++@@ -45,7 +45,7 @@ ++ #include ++ #endif ++ #include "floating_fudge.h" ++-#include +++#include ++ ++ #include "spandsp/telephony.h" ++ #include "spandsp/logging.h" +diff --git a/feeds/packages/net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch b/feeds/packages/net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch +new file mode 100644 +index 0000000..31264ae +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch +@@ -0,0 +1,11 @@ ++--- a/libs/spandsp/src/t4_tx.c +++++ b/libs/spandsp/src/t4_tx.c ++@@ -45,7 +45,7 @@ ++ #include ++ #endif ++ #include "floating_fudge.h" ++-#include +++#include ++ ++ #include "spandsp/telephony.h" ++ #include "spandsp/logging.h" +diff --git a/feeds/packages/net/freeswitch/patches/105-libs-xmlrpc-c-config_mk_in.patch b/feeds/packages/net/freeswitch/patches/105-libs-xmlrpc-c-config_mk_in.patch +new file mode 100644 +index 0000000..79cb33e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/105-libs-xmlrpc-c-config_mk_in.patch +@@ -0,0 +1,13 @@ ++--- a/libs/xmlrpc-c/config.mk.in +++++ b/libs/xmlrpc-c/config.mk.in ++@@ -335,8 +335,8 @@ endif ++ # The cross compiling user can update config.mk or override ++ # BUILDTOOL_CC on a make command. ++ ++-BUILDTOOL_CC = $(CC) ++-BUILDTOOL_CCLD = $(CCLD) +++BUILDTOOL_CC = $(HOSTCC) +++BUILDTOOL_CCLD = $(HOSTCC) ++ ++ # Here are the commands 'make install' uses to install various kinds of files: ++ +diff --git a/feeds/packages/net/freeswitch/patches/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch b/feeds/packages/net/freeswitch/patches/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch +new file mode 100644 +index 0000000..d50d200 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch +@@ -0,0 +1,16 @@ ++--- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile +++++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile ++@@ -1,3 +1,5 @@ +++TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd)) +++ ++ ifeq ($(SRCDIR),) ++ updir = $(shell echo $(dir $(1)) | sed 's/.$$//') ++ EXPATDIR := $(call updir,$(CURDIR)) ++@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),) ++ endif ++ SUBDIR := lib/expat/gennmtab ++ +++include $(TOPDIR)/rules.mk ++ include $(BLDDIR)/config.mk ++ ++ LDFLAGS = $(LADD) +diff --git a/feeds/packages/net/freeswitch/patches/107-libs-libzrtp-include-zrtp_config_h.patch b/feeds/packages/net/freeswitch/patches/107-libs-libzrtp-include-zrtp_config_h.patch +new file mode 100644 +index 0000000..e460bc4 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/107-libs-libzrtp-include-zrtp_config_h.patch +@@ -0,0 +1,20 @@ ++--- a/libs/libzrtp/include/zrtp_config.h +++++ b/libs/libzrtp/include/zrtp_config.h ++@@ -66,8 +66,16 @@ ++ * If the byte order is not specified manually in zrtp_config_user.h - try to detect it automatically ++ */ ++ #if !defined(ZRTP_BYTE_ORDER) +++#if defined(linux) || defined(__linux) ++ ++-#if defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \ +++#include +++#if __BYTE_ORDER == __LITTLE_ENDIAN +++#define ZRTP_BYTE_ORDER ZBO_LITTLE_ENDIAN +++#elif __BYTE_ORDER == __BIG_ENDIAN +++#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN +++#endif +++ +++#elif defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \ ++ defined(__i386) || defined(_M_IX86) || defined(__I86__) ++ /* ++ * Generic i386 processor family, little-endian +diff --git a/feeds/packages/net/freeswitch/patches/200-src-include-timerfd_wrap_h.patch b/feeds/packages/net/freeswitch/patches/200-src-include-timerfd_wrap_h.patch +new file mode 100644 +index 0000000..dbf995e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/200-src-include-timerfd_wrap_h.patch +@@ -0,0 +1,27 @@ ++--- a/src/include/timerfd_wrap.h +++++ b/src/include/timerfd_wrap.h ++@@ -55,20 +55,12 @@ SWITCH_BEGIN_EXTERN_C ++ ++ ++ #ifndef __NR_timerfd ++-#if defined(__x86_64__) ++-#define __NR_timerfd_create 283 ++-#define __NR_timerfd_settime 286 ++-#define __NR_timerfd_gettime 287 ++-#elif defined(__i386__) ++-#define __NR_timerfd_create 322 ++-#define __NR_timerfd_settime 325 ++-#define __NR_timerfd_gettime 326 ++-#else ++-#error invalid system ++-#endif +++#include ++ #endif ++ ++-#define TFD_TIMER_ABSTIME (1 << 0) +++#ifndef TFD_TIMER_ABSTIME +++#include +++#endif ++ ++ int timerfd_create(int clockid, int flags) ++ { +diff --git a/feeds/packages/net/freeswitch/patches/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch b/feeds/packages/net/freeswitch/patches/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch +new file mode 100644 +index 0000000..ac81dd0 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch +@@ -0,0 +1,13 @@ ++--- a/src/mod/applications/mod_mp4/mp4_helper.hpp +++++ b/src/mod/applications/mod_mp4/mp4_helper.hpp ++@@ -22,8 +22,9 @@ the Initial Developer. All Rights Reserv ++ #ifndef MP4_HELPER_HPP_ ++ #define MP4_HELPER_HPP_ ++ +++#include +++#include ++ #include ++-#include ++ #include ++ #include ++ +diff --git a/feeds/packages/net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch b/feeds/packages/net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch +new file mode 100644 +index 0000000..cdf710a +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch +@@ -0,0 +1,17 @@ ++--- a/src/mod/codecs/mod_opus/Makefile +++++ b/src/mod/codecs/mod_opus/Makefile ++@@ -12,12 +12,13 @@ OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.l ++ LOCAL_LIBADD=$(OPUS_LA) ++ ++ include $(BASE)/build/modmake.rules +++include $(BASE)/build/openwrt_rules.mk ++ ++ $(OPUS_DIR): ++ $(GETLIB) $(OPUS).tar.gz ++ ++ $(OPUS_DIR)/Makefile: $(OPUS_DIR) ++- cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR) +++ cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(GNU_TARGET_NAME) --disable-shared --with-pic --srcdir=$(OPUS_DIR) ++ $(TOUCH_TARGET) ++ ++ $(OPUS_LA): $(OPUS_DIR)/Makefile +diff --git a/feeds/packages/net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch b/feeds/packages/net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch +new file mode 100644 +index 0000000..1d4341e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch +@@ -0,0 +1,15 @@ ++--- a/src/mod/codecs/mod_silk/Makefile +++++ b/src/mod/codecs/mod_silk/Makefile ++@@ -1,4 +1,5 @@ ++ BASE=../../../.. +++include $(BASE)/build/openwrt_rules.mk ++ SILK_DIR=$(switch_srcdir)/libs/silk ++ SILK_BUILDDIR=$(switch_builddir)/libs/silk ++ LOCAL_CFLAGS=-I$(SILK_DIR)/src -I$(SILK_DIR)/interface ++@@ -8,5 +9,5 @@ LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o ++ include $(BASE)/build/modmake.rules ++ ++ $(SILK_LA): $(SILK_DIR)/.update ++- cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE) +++ cd $(SILK_BUILDDIR) && ./configure --host=$(GNU_TARGET_NAME) --disable-shared && make clean && $(MAKE) ++ $(TOUCH_TARGET) +diff --git a/feeds/packages/net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch b/feeds/packages/net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch +new file mode 100644 +index 0000000..92741d1 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch +@@ -0,0 +1,11 @@ ++--- a/src/mod/directories/mod_ldap/Makefile +++++ b/src/mod/directories/mod_ldap/Makefile ++@@ -21,7 +21,7 @@ $(LDAP_DIR): ++ ++ $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR) ++ mkdir -p $(LDAP_BUILDDIR) ++- cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) +++ cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) --with-yielding_select=yes ++ $(TOUCH_TARGET) ++ ++ $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile +diff --git a/feeds/packages/net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch b/feeds/packages/net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch +new file mode 100644 +index 0000000..3b24669 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch +@@ -0,0 +1,20 @@ ++--- a/src/mod/endpoints/mod_gsmopen/Makefile +++++ b/src/mod/endpoints/mod_gsmopen/Makefile ++@@ -1,5 +1,15 @@ +++BASE=../../../.. ++ MODNAME=mod_gsmopen ++-LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\" ++-LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme +++SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"' +++ +++TIFF_DIR="$(shell ls -d $(switch_srcdir)/libs/tiff*)" +++TIFF_BUILDDIR=$(TIFF_DIR) +++TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la +++ +++SPANDSP_DIR=$(switch_srcdir)/libs/spandsp +++SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp +++SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la +++LOCAL_CFLAGS += $(SVNDEF) -I$(BASE)/libs/spandsp/src -I$(TIFF_DIR)/libtiff -I$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/include -fpermissive +++LOCAL_LDFLAGS=-L$(BASE)/libs/spandsp/src -lspandsp -L$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib -lctb-0.16 ++ LOCAL_OBJS=gsmopen_protocol.o ++ include ../../../../build/modmake.rules +diff --git a/feeds/packages/net/freeswitch/patches/206-src-mod-event_handlers-mod_snmp-Makefile.patch b/feeds/packages/net/freeswitch/patches/206-src-mod-event_handlers-mod_snmp-Makefile.patch +new file mode 100644 +index 0000000..c85f62c +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/206-src-mod-event_handlers-mod_snmp-Makefile.patch +@@ -0,0 +1,16 @@ ++--- a/src/mod/event_handlers/mod_snmp/Makefile +++++ b/src/mod/event_handlers/mod_snmp/Makefile ++@@ -1,7 +1,10 @@ ++-include ../../../../build/modmake.rules +++BASE=../../../.. +++ +++include $(BASE)/build/modmake.rules +++include $(BASE)/build/openwrt_rules.mk +++ +++LOCAL_CFLAGS=$(shell $(STAGING_DIR)/host/bin/net-snmp-config --cflags --agent-libs) -DNETSNMP_NO_INLINE ++ ++-LOCAL_CFLAGS=`net-snmp-config --cflags` ++-LOCAL_LDFLAGS=`net-snmp-config --agent-libs` ++ LOCAL_OBJS=subagent.o ++ ++ local_depend: $(LOCAL_OBJS) +diff --git a/feeds/packages/net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch b/feeds/packages/net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch +new file mode 100644 +index 0000000..0734887 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch +@@ -0,0 +1,11 @@ ++--- a/src/mod/xml_int/mod_xml_ldap/Makefile +++++ b/src/mod/xml_int/mod_xml_ldap/Makefile ++@@ -14,7 +14,7 @@ LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LI ++ ++ include $(BASE)/build/modmake.rules ++ ++-DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb +++DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb --with-yielding_select=yes ++ ++ $(LDAP_DIR): ++ $(GETLIB) $(LDAP).tar.gz +diff --git a/feeds/packages/net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch b/feeds/packages/net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch +new file mode 100644 +index 0000000..7691d3e +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch +@@ -0,0 +1,10 @@ ++--- a/src/mod/xml_int/mod_xml_rpc/Makefile +++++ b/src/mod/xml_int/mod_xml_rpc/Makefile ++@@ -14,7 +14,6 @@ $(XMLRPC_DIR)/lib/abyss/src/date.o\ ++ $(XMLRPC_DIR)/src/double.o\ ++ $(XMLRPC_DIR)/lib/libutil/error.o\ ++ $(XMLRPC_DIR)/lib/abyss/src/file.o\ ++-$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\ ++ $(XMLRPC_DIR)/lib/util/getoptx.o\ ++ $(XMLRPC_DIR)/lib/abyss/src/handler.o\ ++ $(XMLRPC_DIR)/lib/abyss/src/http.o\ +diff --git a/feeds/packages/net/freeswitch/patches/209-src-mod-codecs-mod_isac-typedefs_h.patch b/feeds/packages/net/freeswitch/patches/209-src-mod-codecs-mod_isac-typedefs_h.patch +new file mode 100644 +index 0000000..84de2af +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/209-src-mod-codecs-mod_isac-typedefs_h.patch +@@ -0,0 +1,11 @@ ++--- a/src/mod/codecs/mod_isac/typedefs.h +++++ b/src/mod/codecs/mod_isac/typedefs.h ++@@ -66,7 +66,7 @@ ++ #define WEBRTC_ARCH_X86 ++ #define WEBRTC_ARCH_32_BITS ++ #define WEBRTC_ARCH_LITTLE_ENDIAN ++-#elif defined(__ARMEL__) +++#elif defined(__ARMEL__) || defined(__mips__) ++ // TODO(andrew): We'd prefer to control platform defines here, but this is ++ // currently provided by the Android makefiles. Commented to avoid duplicate ++ // definition warnings. +diff --git a/feeds/packages/net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch b/feeds/packages/net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch +new file mode 100644 +index 0000000..0b56586 +--- /dev/null ++++ b/feeds/packages/net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch +@@ -0,0 +1,10 @@ ++--- a/src/mod/endpoints/mod_dingaling/Makefile +++++ b/src/mod/endpoints/mod_dingaling/Makefile ++@@ -10,7 +10,6 @@ DING_DIR=$(BASE)/libs/libdingaling ++ LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include ++ LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) ++ LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h ++-LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS) ++ include $(BASE)/build/modmake.rules ++ ++ +diff --git a/feeds/packages/net/frickin/.svn/entries b/feeds/packages/net/frickin/.svn/entries +new file mode 100644 +index 0000000..cb7b195 +--- /dev/null ++++ b/feeds/packages/net/frickin/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/frickin ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T23:30:12.316406Z ++31959 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++10d947a63c3cffd80455ddb40d57239c ++2012-05-28T23:30:12.316406Z ++31959 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1305 ++ +diff --git a/feeds/packages/net/frickin/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/frickin/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/frickin/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/frickin/.svn/text-base/Makefile.svn-base b/feeds/packages/net/frickin/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b5220fd +--- /dev/null ++++ b/feeds/packages/net/frickin/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# 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:=frickin ++PKG_VERSION:=1.3 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/frickin ++PKG_MD5SUM:=5b2e98da2310c71c703d4617b88a173f ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/frickin ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=PPTP (Point-to-Point Tunneling Protocol) proxy ++ URL:=http://sourceforge.net/projects/frickin/ ++ SUBMENU:=VPN ++endef ++ ++define Package/frickin/description ++ Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) ++ client to connect to a PPTP server through Network Address ++ Translation (NAT). ++endef ++ ++define Build/Configure ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ all ++endef ++ ++define Package/frickin/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/frickin.config $(1)/etc/config/frickin ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/frickin.init $(1)/etc/init.d/frickin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/frickin $(1)/usr/sbin/ ++endef ++ ++define Package/frickin/conffiles ++/etc/config/frickin ++endef ++ ++$(eval $(call BuildPackage,frickin)) +diff --git a/feeds/packages/net/frickin/Makefile b/feeds/packages/net/frickin/Makefile +new file mode 100644 +index 0000000..b5220fd +--- /dev/null ++++ b/feeds/packages/net/frickin/Makefile +@@ -0,0 +1,54 @@ ++# ++# 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:=frickin ++PKG_VERSION:=1.3 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/frickin ++PKG_MD5SUM:=5b2e98da2310c71c703d4617b88a173f ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/frickin ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=PPTP (Point-to-Point Tunneling Protocol) proxy ++ URL:=http://sourceforge.net/projects/frickin/ ++ SUBMENU:=VPN ++endef ++ ++define Package/frickin/description ++ Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) ++ client to connect to a PPTP server through Network Address ++ Translation (NAT). ++endef ++ ++define Build/Configure ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ all ++endef ++ ++define Package/frickin/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/frickin.config $(1)/etc/config/frickin ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/frickin.init $(1)/etc/init.d/frickin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/frickin $(1)/usr/sbin/ ++endef ++ ++define Package/frickin/conffiles ++/etc/config/frickin ++endef ++ ++$(eval $(call BuildPackage,frickin)) +diff --git a/feeds/packages/net/frickin/files/.svn/entries b/feeds/packages/net/frickin/files/.svn/entries +new file mode 100644 +index 0000000..48de481 +--- /dev/null ++++ b/feeds/packages/net/frickin/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/frickin/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T23:30:12.316406Z ++31959 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++frickin.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++0ad642c69cb5e531c033259fe4c6936d ++2012-05-28T23:30:12.316406Z ++31959 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1074 ++ ++frickin.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++8da4e11dc0b10b2c4b9fb2c634ea0330 ++2011-11-17T10:47:26.032597Z ++29216 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++277 ++ +diff --git a/feeds/packages/net/frickin/files/.svn/prop-base/frickin.init.svn-base b/feeds/packages/net/frickin/files/.svn/prop-base/frickin.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/frickin/files/.svn/prop-base/frickin.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/frickin/files/.svn/text-base/frickin.config.svn-base b/feeds/packages/net/frickin/files/.svn/text-base/frickin.config.svn-base +new file mode 100644 +index 0000000..32141cd +--- /dev/null ++++ b/feeds/packages/net/frickin/files/.svn/text-base/frickin.config.svn-base +@@ -0,0 +1,13 @@ ++package 'frickin' ++ ++config 'frickin' ++ option enabled 0 ++ ++ # listen on the specified IP address ++ option listen_ip '192.168.1.1' ++ ++ # connect to the specified IP address ++ option server_ip '192.168.1.253' ++ ++ # set the maximum number of simultaneous connections ++# option conn_limit 20 +diff --git a/feeds/packages/net/frickin/files/.svn/text-base/frickin.init.svn-base b/feeds/packages/net/frickin/files/.svn/text-base/frickin.init.svn-base +new file mode 100644 +index 0000000..7f96acf +--- /dev/null ++++ b/feeds/packages/net/frickin/files/.svn/text-base/frickin.init.svn-base +@@ -0,0 +1,58 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2012 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++append_string() { ++ local var="$1" ++ local section="$2" ++ local option="$3" ++ local val="$4" ++ local _val ++ config_get _val "$section" "$option" ++ [ -n "$_val" ] && append "$var" "$val $_val" ++} ++ ++section_enabled() { ++ local enabled ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local section="$1" ++ local args ++ ++ section_enabled "$section" || return 1 ++ ++ append_string args "$section" 'listen_ip' '-l' ++ append_string args "$section" 'server_ip' '-s' ++ append_string args "$section" 'conn_limit' '-c' ++ ++ SERVICE_PID_FILE="/var/run/frickin-${section}.pid" ++ service_start /usr/sbin/frickin $args ++} ++ ++stop_instance() { ++ local section="$1" ++ local id ++ local if ++ ++ section_enabled "$section" || return 1 ++ ++ SERVICE_PID_FILE="/var/run/frickin-${section}.pid" ++ service_stop /usr/sbin/frickin ++} ++ ++start() { ++ config_load 'frickin' ++ config_foreach start_instance 'frickin' ++} ++ ++stop() { ++ config_load 'frickin' ++ config_foreach stop_instance 'frickin' ++} +diff --git a/feeds/packages/net/frickin/files/frickin.config b/feeds/packages/net/frickin/files/frickin.config +new file mode 100644 +index 0000000..32141cd +--- /dev/null ++++ b/feeds/packages/net/frickin/files/frickin.config +@@ -0,0 +1,13 @@ ++package 'frickin' ++ ++config 'frickin' ++ option enabled 0 ++ ++ # listen on the specified IP address ++ option listen_ip '192.168.1.1' ++ ++ # connect to the specified IP address ++ option server_ip '192.168.1.253' ++ ++ # set the maximum number of simultaneous connections ++# option conn_limit 20 +diff --git a/feeds/packages/net/frickin/files/frickin.init b/feeds/packages/net/frickin/files/frickin.init +new file mode 100644 +index 0000000..7f96acf +--- /dev/null ++++ b/feeds/packages/net/frickin/files/frickin.init +@@ -0,0 +1,58 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2012 OpenWrt.org ++ ++START=50 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++append_string() { ++ local var="$1" ++ local section="$2" ++ local option="$3" ++ local val="$4" ++ local _val ++ config_get _val "$section" "$option" ++ [ -n "$_val" ] && append "$var" "$val $_val" ++} ++ ++section_enabled() { ++ local enabled ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] ++} ++ ++start_instance() { ++ local section="$1" ++ local args ++ ++ section_enabled "$section" || return 1 ++ ++ append_string args "$section" 'listen_ip' '-l' ++ append_string args "$section" 'server_ip' '-s' ++ append_string args "$section" 'conn_limit' '-c' ++ ++ SERVICE_PID_FILE="/var/run/frickin-${section}.pid" ++ service_start /usr/sbin/frickin $args ++} ++ ++stop_instance() { ++ local section="$1" ++ local id ++ local if ++ ++ section_enabled "$section" || return 1 ++ ++ SERVICE_PID_FILE="/var/run/frickin-${section}.pid" ++ service_stop /usr/sbin/frickin ++} ++ ++start() { ++ config_load 'frickin' ++ config_foreach start_instance 'frickin' ++} ++ ++stop() { ++ config_load 'frickin' ++ config_foreach stop_instance 'frickin' ++} +diff --git a/feeds/packages/net/fwknop/.svn/entries b/feeds/packages/net/fwknop/.svn/entries +new file mode 100644 +index 0000000..1a5830e +--- /dev/null ++++ b/feeds/packages/net/fwknop/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fwknop ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-20T01:45:42.699341Z ++31824 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++a3dc21b054ef0b21c0cdcbf58bffe3e6 ++2012-05-20T01:45:42.699341Z ++31824 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3204 ++ +diff --git a/feeds/packages/net/fwknop/.svn/text-base/Makefile.svn-base b/feeds/packages/net/fwknop/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..24d7385 +--- /dev/null ++++ b/feeds/packages/net/fwknop/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,119 @@ ++# ++# 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.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download ++PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fwknop/Default ++ TITLE:=FireWall KNock OPerator ++ URL:=http://www.cipherdyne.org/fwknop/ ++ MAINTAINER:=Jonathan Bennett ++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/feeds/packages/net/fwknop/Makefile b/feeds/packages/net/fwknop/Makefile +new file mode 100644 +index 0000000..24d7385 +--- /dev/null ++++ b/feeds/packages/net/fwknop/Makefile +@@ -0,0 +1,119 @@ ++# ++# 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.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download ++PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fwknop/Default ++ TITLE:=FireWall KNock OPerator ++ URL:=http://www.cipherdyne.org/fwknop/ ++ MAINTAINER:=Jonathan Bennett ++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/feeds/packages/net/fwknop/patches/.svn/entries b/feeds/packages/net/fwknop/patches/.svn/entries +new file mode 100644 +index 0000000..3cc0ff7 +--- /dev/null ++++ b/feeds/packages/net/fwknop/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/fwknop/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-20T01:45:42.699341Z ++31824 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-fix_init.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++ffebfd426441de1535508c7451c27979 ++2012-05-20T01:45:42.699341Z ++31824 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++297 ++ ++001-fix_config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++85b1d2a263d9f7c160e7f63363348328 ++2012-05-20T01:45:42.699341Z ++31824 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1319 ++ +diff --git a/feeds/packages/net/fwknop/patches/.svn/text-base/001-fix_config.patch.svn-base b/feeds/packages/net/fwknop/patches/.svn/text-base/001-fix_config.patch.svn-base +new file mode 100644 +index 0000000..5ae4a94 +--- /dev/null ++++ b/feeds/packages/net/fwknop/patches/.svn/text-base/001-fix_config.patch.svn-base +@@ -0,0 +1,32 @@ ++--- a/server/fwknopd.conf +++++ b/server/fwknopd.conf ++@@ -29,7 +29,12 @@ ++ # Define the ethernet interface on which we will sniff packets. ++ # Default if not set is eth0. ++ # ++-#PCAP_INTF eth0; +++ +++# The following line is changed specifically for Openwrt. +++# Openwrt defaults to using eth1 as its wan port. If using PPPoE, +++# Then this needs to be set to pppoe-wan. +++ +++PCAP_INTF eth1; ++ ++ # By default fwknopd does not put the pcap interface into promiscuous mode. ++ # Set this to 'Y' to enable promiscuous sniffing. ++@@ -252,8 +257,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/feeds/packages/net/fwknop/patches/.svn/text-base/002-fix_init.patch.svn-base b/feeds/packages/net/fwknop/patches/.svn/text-base/002-fix_init.patch.svn-base +new file mode 100644 +index 0000000..9efda57 +--- /dev/null ++++ b/feeds/packages/net/fwknop/patches/.svn/text-base/002-fix_init.patch.svn-base +@@ -0,0 +1,17 @@ ++--- a/extras/openwrt/package/fwknop/files/fwknopd.init +++++ b/extras/openwrt/package/fwknop/files/fwknopd.init ++@@ -8,12 +8,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/feeds/packages/net/fwknop/patches/001-fix_config.patch b/feeds/packages/net/fwknop/patches/001-fix_config.patch +new file mode 100644 +index 0000000..5ae4a94 +--- /dev/null ++++ b/feeds/packages/net/fwknop/patches/001-fix_config.patch +@@ -0,0 +1,32 @@ ++--- a/server/fwknopd.conf +++++ b/server/fwknopd.conf ++@@ -29,7 +29,12 @@ ++ # Define the ethernet interface on which we will sniff packets. ++ # Default if not set is eth0. ++ # ++-#PCAP_INTF eth0; +++ +++# The following line is changed specifically for Openwrt. +++# Openwrt defaults to using eth1 as its wan port. If using PPPoE, +++# Then this needs to be set to pppoe-wan. +++ +++PCAP_INTF eth1; ++ ++ # By default fwknopd does not put the pcap interface into promiscuous mode. ++ # Set this to 'Y' to enable promiscuous sniffing. ++@@ -252,8 +257,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/feeds/packages/net/fwknop/patches/002-fix_init.patch b/feeds/packages/net/fwknop/patches/002-fix_init.patch +new file mode 100644 +index 0000000..9efda57 +--- /dev/null ++++ b/feeds/packages/net/fwknop/patches/002-fix_init.patch +@@ -0,0 +1,17 @@ ++--- a/extras/openwrt/package/fwknop/files/fwknopd.init +++++ b/extras/openwrt/package/fwknop/files/fwknopd.init ++@@ -8,12 +8,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/feeds/packages/net/gatling/.svn/entries b/feeds/packages/net/gatling/.svn/entries +new file mode 100644 +index 0000000..6cbb8f2 +--- /dev/null ++++ b/feeds/packages/net/gatling/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/gatling ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-16T15:55:27.009528Z ++33784 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e5d8d8c42b39fd6209925ebc9fd84999 ++2012-10-16T15:55:27.009528Z ++33784 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1046 ++ +diff --git a/feeds/packages/net/gatling/.svn/text-base/Makefile.svn-base b/feeds/packages/net/gatling/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f5e083 +--- /dev/null ++++ b/feeds/packages/net/gatling/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=gatling ++PKG_VERSION:=0.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.fefe.de ++PKG_MD5SUM:=a0fb49ccb6b910bdbd7e76a9960394e3 ++ ++include $(INCLUDE_DIR)/nls.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gatling ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Web Servers/Proxies ++ TITLE:=gatling - a high performance web server ++ VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) ++ URL:=http://www.fefe.de/gatling/ ++ DEPENDS:=$(ICONV_DEPENDS) +zlib +libowfat +libopenssl ++endef ++ ++TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libowfat \ ++ -I$(ICONV_PREFIX)/include ++ ++TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib \ ++ -L$(ICONV_PREFIX)/lib \ ++ -Wl,-Bdynamic,$(LIBGCC_S) ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/gatling $(1)/bin ++endef ++ ++$(eval $(call BuildPackage,gatling)) +diff --git a/feeds/packages/net/gatling/Makefile b/feeds/packages/net/gatling/Makefile +new file mode 100644 +index 0000000..0f5e083 +--- /dev/null ++++ b/feeds/packages/net/gatling/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=gatling ++PKG_VERSION:=0.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.fefe.de ++PKG_MD5SUM:=a0fb49ccb6b910bdbd7e76a9960394e3 ++ ++include $(INCLUDE_DIR)/nls.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gatling ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Web Servers/Proxies ++ TITLE:=gatling - a high performance web server ++ VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) ++ URL:=http://www.fefe.de/gatling/ ++ DEPENDS:=$(ICONV_DEPENDS) +zlib +libowfat +libopenssl ++endef ++ ++TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libowfat \ ++ -I$(ICONV_PREFIX)/include ++ ++TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib \ ++ -L$(ICONV_PREFIX)/lib \ ++ -Wl,-Bdynamic,$(LIBGCC_S) ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/gatling $(1)/bin ++endef ++ ++$(eval $(call BuildPackage,gatling)) +diff --git a/feeds/packages/net/gatling/patches/.svn/entries b/feeds/packages/net/gatling/patches/.svn/entries +new file mode 100644 +index 0000000..f903ad6 +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/gatling/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-07T16:09:16.992438Z ++33044 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-fix_flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++5562e86e95852ab8dab42ae4cb271a90 ++2012-08-07T16:09:16.992438Z ++33044 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++415 ++ ++001-fix_ld_libs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++b12aafde72c062c094d45465525a31c2 ++2012-08-07T16:09:16.992438Z ++33044 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++334 ++ ++010-add_semicolon.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e1447988671f12d11f3b85b06398f0fb ++2012-08-07T16:09:16.992438Z ++33044 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++377 ++ +diff --git a/feeds/packages/net/gatling/patches/.svn/text-base/001-fix_ld_libs.patch.svn-base b/feeds/packages/net/gatling/patches/.svn/text-base/001-fix_ld_libs.patch.svn-base +new file mode 100644 +index 0000000..3112f9f +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/.svn/text-base/001-fix_ld_libs.patch.svn-base +@@ -0,0 +1,11 @@ ++--- gatling-0.11/GNUmakefile 2010-02-09 21:49:18.448989774 +0000 +++++ gatling-0.11_new/GNUmakefile 2010-02-09 21:52:44.821469886 +0000 ++@@ -151,7 +151,7 @@ ++ ar q $@ dummy.o ++ -ranlib $@ ++ ++-LDLIBS+=`cat libsocket libiconv libcrypt` +++LDLIBS+=-lcrypto -liconv -lcrypt ++ ++ $(TARGETS): libsocketkludge.a libsocket libiconv libcrypt md5lib ++ +diff --git a/feeds/packages/net/gatling/patches/.svn/text-base/002-fix_flags.patch.svn-base b/feeds/packages/net/gatling/patches/.svn/text-base/002-fix_flags.patch.svn-base +new file mode 100644 +index 0000000..b956664 +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/.svn/text-base/002-fix_flags.patch.svn-base +@@ -0,0 +1,14 @@ ++diff -ruN gatling-0.11/GNUmakefile gatling-0.11_new/GNUmakefile ++--- gatling-0.11/GNUmakefile 2008-12-05 12:31:01.000000000 +0000 +++++ gatling-0.11_new/GNUmakefile 2010-02-05 23:33:08.242872096 +0000 ++@@ -16,8 +16,8 @@ ++ CROSS= ++ #CROSS=i686-mingw32- ++ CC=$(CROSS)gcc ++-CFLAGS=-pipe -Wall ++-LDFLAGS= +++CFLAGS+=-pipe -Wall +++LDFLAGS+= ++ ++ path = $(subst :, ,$(PATH)) ++ diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) +diff --git a/feeds/packages/net/gatling/patches/.svn/text-base/010-add_semicolon.patch.svn-base b/feeds/packages/net/gatling/patches/.svn/text-base/010-add_semicolon.patch.svn-base +new file mode 100644 +index 0000000..cbc943c +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/.svn/text-base/010-add_semicolon.patch.svn-base +@@ -0,0 +1,11 @@ ++--- gatling-0.11/acc.c 2010-02-05 23:47:29.252861541 +0000 +++++ gatling-0.11_new/acc.c 2010-02-05 23:47:54.025348536 +0000 ++@@ -47,7 +47,7 @@ ++ #if defined(__i386__) || defined(__x86_64__) ++ return a[0]==b[0] && a[1]==b[1] && a[2]==b[2]; ++ #else ++- return ((*(uint32_t*)a ^ *(uint32_t*)b) & 0xffffff) == 0 +++ return ((*(uint32_t*)a ^ *(uint32_t*)b) & 0xffffff) == 0; ++ #endif ++ } ++ +diff --git a/feeds/packages/net/gatling/patches/001-fix_ld_libs.patch b/feeds/packages/net/gatling/patches/001-fix_ld_libs.patch +new file mode 100644 +index 0000000..3112f9f +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/001-fix_ld_libs.patch +@@ -0,0 +1,11 @@ ++--- gatling-0.11/GNUmakefile 2010-02-09 21:49:18.448989774 +0000 +++++ gatling-0.11_new/GNUmakefile 2010-02-09 21:52:44.821469886 +0000 ++@@ -151,7 +151,7 @@ ++ ar q $@ dummy.o ++ -ranlib $@ ++ ++-LDLIBS+=`cat libsocket libiconv libcrypt` +++LDLIBS+=-lcrypto -liconv -lcrypt ++ ++ $(TARGETS): libsocketkludge.a libsocket libiconv libcrypt md5lib ++ +diff --git a/feeds/packages/net/gatling/patches/002-fix_flags.patch b/feeds/packages/net/gatling/patches/002-fix_flags.patch +new file mode 100644 +index 0000000..b956664 +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/002-fix_flags.patch +@@ -0,0 +1,14 @@ ++diff -ruN gatling-0.11/GNUmakefile gatling-0.11_new/GNUmakefile ++--- gatling-0.11/GNUmakefile 2008-12-05 12:31:01.000000000 +0000 +++++ gatling-0.11_new/GNUmakefile 2010-02-05 23:33:08.242872096 +0000 ++@@ -16,8 +16,8 @@ ++ CROSS= ++ #CROSS=i686-mingw32- ++ CC=$(CROSS)gcc ++-CFLAGS=-pipe -Wall ++-LDFLAGS= +++CFLAGS+=-pipe -Wall +++LDFLAGS+= ++ ++ path = $(subst :, ,$(PATH)) ++ diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) +diff --git a/feeds/packages/net/gatling/patches/010-add_semicolon.patch b/feeds/packages/net/gatling/patches/010-add_semicolon.patch +new file mode 100644 +index 0000000..cbc943c +--- /dev/null ++++ b/feeds/packages/net/gatling/patches/010-add_semicolon.patch +@@ -0,0 +1,11 @@ ++--- gatling-0.11/acc.c 2010-02-05 23:47:29.252861541 +0000 +++++ gatling-0.11_new/acc.c 2010-02-05 23:47:54.025348536 +0000 ++@@ -47,7 +47,7 @@ ++ #if defined(__i386__) || defined(__x86_64__) ++ return a[0]==b[0] && a[1]==b[1] && a[2]==b[2]; ++ #else ++- return ((*(uint32_t*)a ^ *(uint32_t*)b) & 0xffffff) == 0 +++ return ((*(uint32_t*)a ^ *(uint32_t*)b) & 0xffffff) == 0; ++ #endif ++ } ++ +diff --git a/feeds/packages/net/gesftpserver/.svn/entries b/feeds/packages/net/gesftpserver/.svn/entries +new file mode 100644 +index 0000000..f568061 +--- /dev/null ++++ b/feeds/packages/net/gesftpserver/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/gesftpserver ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T07:14:13.362026Z ++26077 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++6b1f840185e62b3a2c153ba72c23d6db ++2011-03-12T07:14:13.362026Z ++26077 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1391 ++ +diff --git a/feeds/packages/net/gesftpserver/.svn/text-base/Makefile.svn-base b/feeds/packages/net/gesftpserver/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eb5b830 +--- /dev/null ++++ b/feeds/packages/net/gesftpserver/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=sftpserver ++PKG_REV:=228 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.greenend.org.uk/rjk/bzr/sftpserver.dev ++PKG_SOURCE_PROTO:=bzr ++PKG_SOURCE_SUBDIR:=$(PKG_NAME) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gesftpserver ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=SSH ++ DEPENDS:=+libpthread $(ICONV_DEPENDS) ++ TITLE:=SFTP server ++ URL:=http://www.greenend.org.uk/rjk/sftpserver/ ++endef ++ ++define Package/gesftpserver/description ++This is an experimental free SFTP server. It is currently still under development ++(so don't trust it with critical data). It should be possible to use it as a ++drop-in replacement for the widely-used OpenSSH SFTP server. It does not include ++an SSH server, but rather runs as a subsystem of one. ++endef ++ ++CONFIGURE_CMD:=./prepare ++ ++TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) ++ ++TARGET_LDFLAGS+=-lpthread ++ ++define Package/gesftpserver/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/gesftpserver $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,gesftpserver)) +diff --git a/feeds/packages/net/gesftpserver/Makefile b/feeds/packages/net/gesftpserver/Makefile +new file mode 100644 +index 0000000..eb5b830 +--- /dev/null ++++ b/feeds/packages/net/gesftpserver/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=sftpserver ++PKG_REV:=228 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.greenend.org.uk/rjk/bzr/sftpserver.dev ++PKG_SOURCE_PROTO:=bzr ++PKG_SOURCE_SUBDIR:=$(PKG_NAME) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/gesftpserver ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=SSH ++ DEPENDS:=+libpthread $(ICONV_DEPENDS) ++ TITLE:=SFTP server ++ URL:=http://www.greenend.org.uk/rjk/sftpserver/ ++endef ++ ++define Package/gesftpserver/description ++This is an experimental free SFTP server. It is currently still under development ++(so don't trust it with critical data). It should be possible to use it as a ++drop-in replacement for the widely-used OpenSSH SFTP server. It does not include ++an SSH server, but rather runs as a subsystem of one. ++endef ++ ++CONFIGURE_CMD:=./prepare ++ ++TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) ++ ++TARGET_LDFLAGS+=-lpthread ++ ++define Package/gesftpserver/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/gesftpserver $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,gesftpserver)) +diff --git a/feeds/packages/net/git/.svn/entries b/feeds/packages/net/git/.svn/entries +new file mode 100644 +index 0000000..231c4bb +--- /dev/null ++++ b/feeds/packages/net/git/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/git ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-15T14:55:24.439207Z ++32733 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++7c6972011fb191591a0c95ea45523bfe ++2012-07-15T14:55:24.439207Z ++32733 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1556 ++ +diff --git a/feeds/packages/net/git/.svn/text-base/Makefile.svn-base b/feeds/packages/net/git/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3373941 +--- /dev/null ++++ b/feeds/packages/net/git/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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:=git ++PKG_VERSION:=1.7.11.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://git-core.googlecode.com/files/ ++PKG_MD5SUM:=91e01a22032f5d0ca2941ae7fd49d587 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/git ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Version Control Systems ++ DEPENDS:=+libopenssl +libpthread ++ TITLE:=The fast version control system ++ URL:=http://git-scm.com ++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 ++ ++MAKE_FLAGS := \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ NO_CURL="YesPlease" \ ++ 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" ++ ++define Build/Configure ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ configure ++ ++ ( cd $(PKG_BUILD_DIR); \ ++ ./configure --prefix=/usr \ ++ ); ++endef ++ ++define Package/git/install ++ $(INSTALL_DIR) $(1) ++ $(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,git)) +diff --git a/feeds/packages/net/git/Makefile b/feeds/packages/net/git/Makefile +new file mode 100644 +index 0000000..3373941 +--- /dev/null ++++ b/feeds/packages/net/git/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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:=git ++PKG_VERSION:=1.7.11.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://git-core.googlecode.com/files/ ++PKG_MD5SUM:=91e01a22032f5d0ca2941ae7fd49d587 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/git ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=Version Control Systems ++ DEPENDS:=+libopenssl +libpthread ++ TITLE:=The fast version control system ++ URL:=http://git-scm.com ++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 ++ ++MAKE_FLAGS := \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ NO_CURL="YesPlease" \ ++ 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" ++ ++define Build/Configure ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ configure ++ ++ ( cd $(PKG_BUILD_DIR); \ ++ ./configure --prefix=/usr \ ++ ); ++endef ++ ++define Package/git/install ++ $(INSTALL_DIR) $(1) ++ $(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,git)) +diff --git a/feeds/packages/net/git/patches/.svn/entries b/feeds/packages/net/git/patches/.svn/entries +new file mode 100644 +index 0000000..5f7fb74 +--- /dev/null ++++ b/feeds/packages/net/git/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/git/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-15T14:55:24.439207Z ++32733 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-convert_builtin.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++b3f64f41a549bd79ff95ce06960fa7e4 ++2012-07-15T14:55:24.439207Z ++32733 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8265 ++ +diff --git a/feeds/packages/net/git/patches/.svn/text-base/100-convert_builtin.patch.svn-base b/feeds/packages/net/git/patches/.svn/text-base/100-convert_builtin.patch.svn-base +new file mode 100644 +index 0000000..21a6a72 +--- /dev/null ++++ b/feeds/packages/net/git/patches/.svn/text-base/100-convert_builtin.patch.svn-base +@@ -0,0 +1,248 @@ ++--- /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/http-backend.c ++@@ -0,0 +1 @@ +++#include "../http-backend.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/builtin.h +++++ b/builtin.h ++@@ -153,5 +153,11 @@ 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, const char **argv, const char *prefix); +++extern int cmd_http_backend(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 ++--- a/daemon.c +++++ b/daemon.c ++@@ -1091,7 +1091,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; ++--- a/fast-import.c +++++ b/fast-import.c ++@@ -3347,7 +3347,7 @@ static void parse_argv(void) ++ read_marks(); ++ } ++ ++-int main(int argc, const char **argv) +++int cmd_fast_import(int argc, const char **argv, const char *prefix) ++ { ++ unsigned int i; ++ ++--- a/http-backend.c +++++ b/http-backend.c ++@@ -533,7 +533,7 @@ static struct service_cmd { ++ {"POST", "/git-receive-pack$", service_rpc} ++ }; ++ ++-int main(int argc, char **argv) +++int cmd_http_backend(int argc, char **argv, const char *prefix) ++ { ++ char *method = getenv("REQUEST_METHOD"); ++ char *dir; ++--- a/imap-send.c +++++ b/imap-send.c ++@@ -1502,7 +1502,7 @@ static int git_imap_config(const char *k ++ return 0; ++ } ++ ++-int main(int argc, char **argv) +++int cmd_imap_send(int argc, char **argv, const char *prefix) ++ { ++ struct msg_data all_msgs, msg; ++ struct store *ctx = NULL; ++--- a/shell.c +++++ b/shell.c ++@@ -129,7 +129,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 ++@@ -785,7 +785,7 @@ static void upload_pack(void) ++ } ++ } ++ ++-int main(int argc, char **argv) +++int cmd_upload_pack(int argc, char **argv, const char *prefix) ++ { ++ char *dir; ++ int i; ++--- a/git.c +++++ b/git.c ++@@ -269,11 +269,11 @@ const char git_version_string[] = GIT_VE ++ ++ 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; ++@@ -326,7 +326,7 @@ static int run_builtin(struct cmd_struct ++ return 0; ++ } ++ ++-static void handle_internal_command(int argc, const char **argv) +++static void handle_internal_command(int argc, char **argv) ++ { ++ const char *cmd = argv[0]; ++ static struct cmd_struct commands[] = { ++@@ -353,12 +353,14 @@ static void handle_internal_command(int ++ { "commit-tree", cmd_commit_tree, RUN_SETUP }, ++ { "config", cmd_config, RUN_SETUP_GENTLY }, ++ { "count-objects", cmd_count_objects, RUN_SETUP }, +++ { "daemon", cmd_daemon }, ++ { "describe", cmd_describe, RUN_SETUP }, ++ { "diff", cmd_diff }, ++ { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, ++ { "diff-index", cmd_diff_index, RUN_SETUP }, ++ { "diff-tree", cmd_diff_tree, RUN_SETUP }, ++ { "fast-export", cmd_fast_export, RUN_SETUP }, +++ { "fast-import", cmd_fast_import }, ++ { "fetch", cmd_fetch, RUN_SETUP }, ++ { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, ++ { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, ++@@ -371,6 +373,8 @@ static void handle_internal_command(int ++ { "grep", cmd_grep, RUN_SETUP_GENTLY }, ++ { "hash-object", cmd_hash_object }, ++ { "help", cmd_help }, +++ { "http-backend", cmd_http_backend }, +++ { "imap-send", cmd_imap_send }, ++ { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY }, ++ { "init", cmd_init_db }, ++ { "init-db", cmd_init_db }, ++@@ -419,6 +423,7 @@ static void handle_internal_command(int ++ { "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 }, ++@@ -436,6 +441,7 @@ static void handle_internal_command(int ++ { "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-pack", cmd_verify_pack }, ++ { "verify-tag", cmd_verify_tag, RUN_SETUP }, ++--- a/Makefile +++++ b/Makefile ++@@ -467,15 +467,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 = ++ ++ # Binary suffix, set to .exe for Windows builds ++ X = ++@@ -903,6 +895,12 @@ BUILTIN_OBJS += builtin/var.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/http-backend.o +++BUILTIN_OBJS += builtin/imap-send.o +++BUILTIN_OBJS += builtin/shell.o +++BUILTIN_OBJS += builtin/upload-pack.o ++ ++ GITLIBS = $(LIB_FILE) $(XDIFF_LIB) ++ EXTLIBS = ++@@ -1502,7 +1500,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) ++@@ -2287,10 +2285,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 GIT-LDFLAGS $(GITLIBS) ++- $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ ++- $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO) ++- ++ git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS) ++ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ ++ $(LIBS) $(CURL_LIBCURL) ++@@ -2587,24 +2581,22 @@ 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; \ ++ } && \ ++ for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ ++ $(RM) "$$bindir/$$p" && \ ++ test -z "$(NO_INSTALL_HARDLINKS)" && \ ++- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ ++ ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ ++ cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ ++ done && \ ++ for p in $(BUILT_INS); do \ ++ $(RM) "$$execdir/$$p" && \ ++ test -z "$(NO_INSTALL_HARDLINKS)" && \ ++- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ ++ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ ++ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ ++ done && \ +diff --git a/feeds/packages/net/git/patches/100-convert_builtin.patch b/feeds/packages/net/git/patches/100-convert_builtin.patch +new file mode 100644 +index 0000000..21a6a72 +--- /dev/null ++++ b/feeds/packages/net/git/patches/100-convert_builtin.patch +@@ -0,0 +1,248 @@ ++--- /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/http-backend.c ++@@ -0,0 +1 @@ +++#include "../http-backend.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/builtin.h +++++ b/builtin.h ++@@ -153,5 +153,11 @@ 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, const char **argv, const char *prefix); +++extern int cmd_http_backend(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 ++--- a/daemon.c +++++ b/daemon.c ++@@ -1091,7 +1091,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; ++--- a/fast-import.c +++++ b/fast-import.c ++@@ -3347,7 +3347,7 @@ static void parse_argv(void) ++ read_marks(); ++ } ++ ++-int main(int argc, const char **argv) +++int cmd_fast_import(int argc, const char **argv, const char *prefix) ++ { ++ unsigned int i; ++ ++--- a/http-backend.c +++++ b/http-backend.c ++@@ -533,7 +533,7 @@ static struct service_cmd { ++ {"POST", "/git-receive-pack$", service_rpc} ++ }; ++ ++-int main(int argc, char **argv) +++int cmd_http_backend(int argc, char **argv, const char *prefix) ++ { ++ char *method = getenv("REQUEST_METHOD"); ++ char *dir; ++--- a/imap-send.c +++++ b/imap-send.c ++@@ -1502,7 +1502,7 @@ static int git_imap_config(const char *k ++ return 0; ++ } ++ ++-int main(int argc, char **argv) +++int cmd_imap_send(int argc, char **argv, const char *prefix) ++ { ++ struct msg_data all_msgs, msg; ++ struct store *ctx = NULL; ++--- a/shell.c +++++ b/shell.c ++@@ -129,7 +129,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 ++@@ -785,7 +785,7 @@ static void upload_pack(void) ++ } ++ } ++ ++-int main(int argc, char **argv) +++int cmd_upload_pack(int argc, char **argv, const char *prefix) ++ { ++ char *dir; ++ int i; ++--- a/git.c +++++ b/git.c ++@@ -269,11 +269,11 @@ const char git_version_string[] = GIT_VE ++ ++ 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; ++@@ -326,7 +326,7 @@ static int run_builtin(struct cmd_struct ++ return 0; ++ } ++ ++-static void handle_internal_command(int argc, const char **argv) +++static void handle_internal_command(int argc, char **argv) ++ { ++ const char *cmd = argv[0]; ++ static struct cmd_struct commands[] = { ++@@ -353,12 +353,14 @@ static void handle_internal_command(int ++ { "commit-tree", cmd_commit_tree, RUN_SETUP }, ++ { "config", cmd_config, RUN_SETUP_GENTLY }, ++ { "count-objects", cmd_count_objects, RUN_SETUP }, +++ { "daemon", cmd_daemon }, ++ { "describe", cmd_describe, RUN_SETUP }, ++ { "diff", cmd_diff }, ++ { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE }, ++ { "diff-index", cmd_diff_index, RUN_SETUP }, ++ { "diff-tree", cmd_diff_tree, RUN_SETUP }, ++ { "fast-export", cmd_fast_export, RUN_SETUP }, +++ { "fast-import", cmd_fast_import }, ++ { "fetch", cmd_fetch, RUN_SETUP }, ++ { "fetch-pack", cmd_fetch_pack, RUN_SETUP }, ++ { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, ++@@ -371,6 +373,8 @@ static void handle_internal_command(int ++ { "grep", cmd_grep, RUN_SETUP_GENTLY }, ++ { "hash-object", cmd_hash_object }, ++ { "help", cmd_help }, +++ { "http-backend", cmd_http_backend }, +++ { "imap-send", cmd_imap_send }, ++ { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY }, ++ { "init", cmd_init_db }, ++ { "init-db", cmd_init_db }, ++@@ -419,6 +423,7 @@ static void handle_internal_command(int ++ { "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 }, ++@@ -436,6 +441,7 @@ static void handle_internal_command(int ++ { "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-pack", cmd_verify_pack }, ++ { "verify-tag", cmd_verify_tag, RUN_SETUP }, ++--- a/Makefile +++++ b/Makefile ++@@ -467,15 +467,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 = ++ ++ # Binary suffix, set to .exe for Windows builds ++ X = ++@@ -903,6 +895,12 @@ BUILTIN_OBJS += builtin/var.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/http-backend.o +++BUILTIN_OBJS += builtin/imap-send.o +++BUILTIN_OBJS += builtin/shell.o +++BUILTIN_OBJS += builtin/upload-pack.o ++ ++ GITLIBS = $(LIB_FILE) $(XDIFF_LIB) ++ EXTLIBS = ++@@ -1502,7 +1500,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) ++@@ -2287,10 +2285,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 GIT-LDFLAGS $(GITLIBS) ++- $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ ++- $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO) ++- ++ git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS) ++ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ ++ $(LIBS) $(CURL_LIBCURL) ++@@ -2587,24 +2581,22 @@ 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; \ ++ } && \ ++ for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ ++ $(RM) "$$bindir/$$p" && \ ++ test -z "$(NO_INSTALL_HARDLINKS)" && \ ++- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ ++ ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ ++ cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ ++ done && \ ++ for p in $(BUILT_INS); do \ ++ $(RM) "$$execdir/$$p" && \ ++ test -z "$(NO_INSTALL_HARDLINKS)" && \ ++- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ ++ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ ++ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ ++ done && \ +diff --git a/feeds/packages/net/gpsd/.svn/entries b/feeds/packages/net/gpsd/.svn/entries +new file mode 100644 +index 0000000..ae21dab +--- /dev/null ++++ b/feeds/packages/net/gpsd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/gpsd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-12T18:33:45.429003Z ++32688 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++2810934f678cda4cdc94dafb60b51dcb ++2012-07-12T18:33:45.429003Z ++32688 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4169 ++ +diff --git a/feeds/packages/net/gpsd/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/gpsd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/gpsd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/gpsd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/gpsd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ca4983a +--- /dev/null ++++ b/feeds/packages/net/gpsd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,159 @@ ++# ++# 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:=gpsd ++PKG_VERSION:=3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd ++PKG_MD5SUM:=52d9785eaf1a51298bb8900dbde88f98 ++ ++PKG_BUILD_DEPENDS:=libncurses libusb-1.0 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/scons.mk ++ ++define Package/gpsd/Default ++ DEPENDS:=+librt ++ URL:=http://catb.org/gpsd/ ++endef ++ ++define Package/gpsd/Default/description ++ gpsd is a userland daemon acting as a translator between GPS and AIS receivers ++ and their clients. gpsd listens on port 2947 for clients requesting ++ position/time/velocity information. The receivers are expected to generate ++ position information in a well-known format -- as NMEA-0183 sentences, SiRF ++ binary, Rockwell binary, Garmin binary format, or other vendor binary ++ protocols. gpsd takes this information from the GPS and translates it into ++ something uniform and easier to understand for clients. ++endef ++ ++define Package/gpsd ++ $(call Package/gpsd/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+= +libgps +libgpsd ++ TITLE:=An interface daemon for GPS receivers ++endef ++ ++define Package/gpsd/conffiles ++/etc/config/gpsd ++endef ++ ++define Package/gpsd/description ++ $(call Package/gpsd/Default/description) ++ This package contains the GPS daemon. ++endef ++ ++define Package/gpsd-clients ++ $(call Package/gpsd/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+= +libgps +libgpsd +libncurses ++ TITLE:=GPS tools and clients ++endef ++ ++define Package/gpsd-clients/description ++ $(call Package/gpsd/Default/description) ++ This package contains auxiliary tools and example clients for monitoring and ++ testing the GPS daemon. ++endef ++ ++define Package/libgps ++ $(call Package/gpsd/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS+= +libcap ++ TITLE:=C service library for communicating with the GPS daemon ++endef ++ ++define Package/libgps/description ++ $(call Package/gpsd/Default/description) ++ This package contains the libgps library. ++endef ++ ++define Package/libgpsd ++ $(call Package/gpsd/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS+= +libcap +libusb-1.0 ++ TITLE:=C service library for GPS applications ++endef ++ ++define Package/libgpsd/description ++ $(call Package/gpsd/Default/description) ++ This package contains the libgpsd library. ++endef ++ ++SCONS_OPTIONS += \ ++ dbus_export=no \ ++ tsip=no \ ++ fv18=no \ ++ tripmate=no \ ++ earthmate=no \ ++ itrax=no \ ++ navcom=no \ ++ ubx=no \ ++ evermore=no \ ++ ntrip=no \ ++ libgpsmm=no \ ++ libQgpsmm=no \ ++ bluez=no \ ++ strip=no \ ++ python=no \ ++ implicit_link=no \ ++ chrpath=no ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gps.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps*.so* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgps*.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/gpsd/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/gpsd.config $(1)/etc/config/gpsd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/gpsd.init $(1)/etc/init.d/gpsd ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb ++ $(INSTALL_DATA) ./files/gpsd.hotplug $(1)/etc/hotplug.d/usb/20-gpsd ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/ ++endef ++ ++define Package/gpsd-clients/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/cgps \ ++ $(PKG_INSTALL_DIR)/usr/bin/gps{ctl,decode,mon,pipe} \ ++ $(PKG_INSTALL_DIR)/usr/bin/gpxlogger \ ++ $(PKG_INSTALL_DIR)/usr/bin/lcdgps \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/libgps/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libgpsd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpsd.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,gpsd)) ++$(eval $(call BuildPackage,gpsd-clients)) ++$(eval $(call BuildPackage,libgps)) ++$(eval $(call BuildPackage,libgpsd)) +diff --git a/feeds/packages/net/gpsd/Makefile b/feeds/packages/net/gpsd/Makefile +new file mode 100644 +index 0000000..ca4983a +--- /dev/null ++++ b/feeds/packages/net/gpsd/Makefile +@@ -0,0 +1,159 @@ ++# ++# 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:=gpsd ++PKG_VERSION:=3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd ++PKG_MD5SUM:=52d9785eaf1a51298bb8900dbde88f98 ++ ++PKG_BUILD_DEPENDS:=libncurses libusb-1.0 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/scons.mk ++ ++define Package/gpsd/Default ++ DEPENDS:=+librt ++ URL:=http://catb.org/gpsd/ ++endef ++ ++define Package/gpsd/Default/description ++ gpsd is a userland daemon acting as a translator between GPS and AIS receivers ++ and their clients. gpsd listens on port 2947 for clients requesting ++ position/time/velocity information. The receivers are expected to generate ++ position information in a well-known format -- as NMEA-0183 sentences, SiRF ++ binary, Rockwell binary, Garmin binary format, or other vendor binary ++ protocols. gpsd takes this information from the GPS and translates it into ++ something uniform and easier to understand for clients. ++endef ++ ++define Package/gpsd ++ $(call Package/gpsd/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+= +libgps +libgpsd ++ TITLE:=An interface daemon for GPS receivers ++endef ++ ++define Package/gpsd/conffiles ++/etc/config/gpsd ++endef ++ ++define Package/gpsd/description ++ $(call Package/gpsd/Default/description) ++ This package contains the GPS daemon. ++endef ++ ++define Package/gpsd-clients ++ $(call Package/gpsd/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+= +libgps +libgpsd +libncurses ++ TITLE:=GPS tools and clients ++endef ++ ++define Package/gpsd-clients/description ++ $(call Package/gpsd/Default/description) ++ This package contains auxiliary tools and example clients for monitoring and ++ testing the GPS daemon. ++endef ++ ++define Package/libgps ++ $(call Package/gpsd/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS+= +libcap ++ TITLE:=C service library for communicating with the GPS daemon ++endef ++ ++define Package/libgps/description ++ $(call Package/gpsd/Default/description) ++ This package contains the libgps library. ++endef ++ ++define Package/libgpsd ++ $(call Package/gpsd/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS+= +libcap +libusb-1.0 ++ TITLE:=C service library for GPS applications ++endef ++ ++define Package/libgpsd/description ++ $(call Package/gpsd/Default/description) ++ This package contains the libgpsd library. ++endef ++ ++SCONS_OPTIONS += \ ++ dbus_export=no \ ++ tsip=no \ ++ fv18=no \ ++ tripmate=no \ ++ earthmate=no \ ++ itrax=no \ ++ navcom=no \ ++ ubx=no \ ++ evermore=no \ ++ ntrip=no \ ++ libgpsmm=no \ ++ libQgpsmm=no \ ++ bluez=no \ ++ strip=no \ ++ python=no \ ++ implicit_link=no \ ++ chrpath=no ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/gps.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps*.so* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgps*.pc \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/gpsd/install ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) ./files/gpsd.config $(1)/etc/config/gpsd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/gpsd.init $(1)/etc/init.d/gpsd ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb ++ $(INSTALL_DATA) ./files/gpsd.hotplug $(1)/etc/hotplug.d/usb/20-gpsd ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/ ++endef ++ ++define Package/gpsd-clients/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/cgps \ ++ $(PKG_INSTALL_DIR)/usr/bin/gps{ctl,decode,mon,pipe} \ ++ $(PKG_INSTALL_DIR)/usr/bin/gpxlogger \ ++ $(PKG_INSTALL_DIR)/usr/bin/lcdgps \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/libgps/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ ++endef ++ ++define Package/libgpsd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpsd.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,gpsd)) ++$(eval $(call BuildPackage,gpsd-clients)) ++$(eval $(call BuildPackage,libgps)) ++$(eval $(call BuildPackage,libgpsd)) +diff --git a/feeds/packages/net/gpsd/files/.svn/entries b/feeds/packages/net/gpsd/files/.svn/entries +new file mode 100644 +index 0000000..c600d0b +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/gpsd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-05T21:02:59.958911Z ++31621 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++gpsd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++72f801312e17d7836625032be1c8a559 ++2012-05-05T21:02:59.958911Z ++31621 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++753 ++ ++gpsd.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++b67a349f97ff3e189a743bde3f5fa222 ++2012-05-05T21:02:59.958911Z ++31621 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++146 ++ ++gpsd.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:36.000000Z ++6da1d408f2f8493c5c4568a937a1d307 ++2010-07-31T22:33:32.205484Z ++22447 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++511 ++ +diff --git a/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.config.svn-base b/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.config.svn-base +new file mode 100644 +index 0000000..ef19202 +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.config.svn-base +@@ -0,0 +1,5 @@ ++config gpsd core ++ option device "/dev/ttyUSB0" ++ option port "2947" ++ option listen_globally "false" ++ option enabled "true" +diff --git a/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.hotplug.svn-base b/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.hotplug.svn-base +new file mode 100644 +index 0000000..fc15dda +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.hotplug.svn-base +@@ -0,0 +1,16 @@ ++case "$ACTION" in ++ add) ++ # start process ++ # only pl2303 devices are handled ++ if [ "$PRODUCT" = "67b/2303/300" ] && [ "$TYPE" = "0/0/0" ] && [ "$INTERFACE" = "255/0/0" ]; then ++ sleep 3 && /etc/init.d/gpsd start ++ fi ++ ;; ++ remove) ++ # stop process ++ # only pl2303 devices are handled ++ if [ "$PRODUCT" = "67b/2303/300" ] && [ "$TYPE" = "0/0/0" ] && [ "$INTERFACE" = "255/0/0" ]; then ++ /etc/init.d/gpsd stop ++ fi ++ ;; ++esac +diff --git a/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.init.svn-base b/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.init.svn-base +new file mode 100644 +index 0000000..96cee78 +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/.svn/text-base/gpsd.init.svn-base +@@ -0,0 +1,32 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2011 OpenWrt.org ++START=50 ++ ++NAME=gpsd ++PIDF=/var/run/$NAME.pid ++PROG=/usr/sbin/$NAME ++ ++start() { ++ config_load gpsd ++ config_get device core device ++ config_get port core port ++ config_get_bool listen_globally core listen_globally ++ config_get_bool enabled core enabled ++ [ "$enabled" != "1" ] && exit ++ logger -t "$NAME" "Starting..." ++ [ ! -c "$device" ] && { ++ logger -t "$NAME" "Unable to find device $device. Exiting." ++ exit 1 ++ } ++ [ "$listen_globally" != "0" ] && append args "-G" ++ $PROG -n -P $PIDF -S $port $args $device ++} ++ ++stop() { ++ logger -t "$NAME" "Stopping..." ++ [ -f "$PIDF" ] && { ++ read PID < "$PIDF" ++ kill -9 $PID ++ rm $PIDF ++ } ++} +diff --git a/feeds/packages/net/gpsd/files/gpsd.config b/feeds/packages/net/gpsd/files/gpsd.config +new file mode 100644 +index 0000000..ef19202 +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/gpsd.config +@@ -0,0 +1,5 @@ ++config gpsd core ++ option device "/dev/ttyUSB0" ++ option port "2947" ++ option listen_globally "false" ++ option enabled "true" +diff --git a/feeds/packages/net/gpsd/files/gpsd.hotplug b/feeds/packages/net/gpsd/files/gpsd.hotplug +new file mode 100644 +index 0000000..fc15dda +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/gpsd.hotplug +@@ -0,0 +1,16 @@ ++case "$ACTION" in ++ add) ++ # start process ++ # only pl2303 devices are handled ++ if [ "$PRODUCT" = "67b/2303/300" ] && [ "$TYPE" = "0/0/0" ] && [ "$INTERFACE" = "255/0/0" ]; then ++ sleep 3 && /etc/init.d/gpsd start ++ fi ++ ;; ++ remove) ++ # stop process ++ # only pl2303 devices are handled ++ if [ "$PRODUCT" = "67b/2303/300" ] && [ "$TYPE" = "0/0/0" ] && [ "$INTERFACE" = "255/0/0" ]; then ++ /etc/init.d/gpsd stop ++ fi ++ ;; ++esac +diff --git a/feeds/packages/net/gpsd/files/gpsd.init b/feeds/packages/net/gpsd/files/gpsd.init +new file mode 100644 +index 0000000..96cee78 +--- /dev/null ++++ b/feeds/packages/net/gpsd/files/gpsd.init +@@ -0,0 +1,32 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2011 OpenWrt.org ++START=50 ++ ++NAME=gpsd ++PIDF=/var/run/$NAME.pid ++PROG=/usr/sbin/$NAME ++ ++start() { ++ config_load gpsd ++ config_get device core device ++ config_get port core port ++ config_get_bool listen_globally core listen_globally ++ config_get_bool enabled core enabled ++ [ "$enabled" != "1" ] && exit ++ logger -t "$NAME" "Starting..." ++ [ ! -c "$device" ] && { ++ logger -t "$NAME" "Unable to find device $device. Exiting." ++ exit 1 ++ } ++ [ "$listen_globally" != "0" ] && append args "-G" ++ $PROG -n -P $PIDF -S $port $args $device ++} ++ ++stop() { ++ logger -t "$NAME" "Stopping..." ++ [ -f "$PIDF" ] && { ++ read PID < "$PIDF" ++ kill -9 $PID ++ rm $PIDF ++ } ++} +diff --git a/feeds/packages/net/haproxy/.svn/entries b/feeds/packages/net/haproxy/.svn/entries +new file mode 100644 +index 0000000..58b9dca +--- /dev/null ++++ b/feeds/packages/net/haproxy/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/haproxy ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-10T23:49:52.982218Z ++35092 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++8c97c5b808daca75d03d9c674f4b3f0d ++2013-01-10T23:49:52.982218Z ++35092 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1745 ++ +diff --git a/feeds/packages/net/haproxy/.svn/text-base/Makefile.svn-base b/feeds/packages/net/haproxy/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..85f7a4d +--- /dev/null ++++ b/feeds/packages/net/haproxy/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2009-2010 Thomas Heil ++# ++# 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.4.22 ++PKG_RELEASE:=24 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src ++PKG_MD5SUM:=a0b007c76f6a78524f3b3dd5e704979c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/haproxy ++ SUBMENU:=Web Servers/Proxies ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer ++ URL:=http://haproxy.1wt.eu/ ++ DEPENDS:=+libpcre +libltdl ++ MAINTAINER:=Thomas Heil ++endef ++ ++define Package/haproxy/conffiles ++/etc/haproxy.cfg ++endef ++ ++define Package/haproxy/description ++ Open source High Performance TCP/HTTP Load Balancer ++endef ++ ++define Build/Compile ++ $(MAKE) TARGET=linux26 -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LD="$(TARGET_CC)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=8192 -DSYSTEM_MAXCONN=65530" USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 \ ++ VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \ ++ all install ++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 ++ ++$(eval $(call BuildPackage,haproxy)) +diff --git a/feeds/packages/net/haproxy/Makefile b/feeds/packages/net/haproxy/Makefile +new file mode 100644 +index 0000000..85f7a4d +--- /dev/null ++++ b/feeds/packages/net/haproxy/Makefile +@@ -0,0 +1,62 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2009-2010 Thomas Heil ++# ++# 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.4.22 ++PKG_RELEASE:=24 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src ++PKG_MD5SUM:=a0b007c76f6a78524f3b3dd5e704979c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/haproxy ++ SUBMENU:=Web Servers/Proxies ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer ++ URL:=http://haproxy.1wt.eu/ ++ DEPENDS:=+libpcre +libltdl ++ MAINTAINER:=Thomas Heil ++endef ++ ++define Package/haproxy/conffiles ++/etc/haproxy.cfg ++endef ++ ++define Package/haproxy/description ++ Open source High Performance TCP/HTTP Load Balancer ++endef ++ ++define Build/Compile ++ $(MAKE) TARGET=linux26 -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LD="$(TARGET_CC)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=8192 -DSYSTEM_MAXCONN=65530" USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 \ ++ VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \ ++ all install ++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 ++ ++$(eval $(call BuildPackage,haproxy)) +diff --git a/feeds/packages/net/haproxy/files/.svn/entries b/feeds/packages/net/haproxy/files/.svn/entries +new file mode 100644 +index 0000000..9c2cbed +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/haproxy/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-18T23:30:23.514565Z ++31013 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++haproxy.cfg ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++1d33fdd2b1fa85d12ca58568395256b9 ++2012-01-10T10:52:44.994695Z ++29703 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2609 ++ ++haproxy.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++75e877de3c2b27bfd4b2c1d430ac15c0 ++2010-03-19T21:02:23.088730Z ++20309 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++107 ++ ++haproxy.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7ec8fb5f59450d95bb4c36c5ea23d5b9 ++2012-03-18T23:30:23.514565Z ++31013 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++420 ++ +diff --git a/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.cfg.svn-base b/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.cfg.svn-base +new file mode 100644 +index 0000000..a54f5f5 +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.cfg.svn-base +@@ -0,0 +1,100 @@ ++# 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/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.hotplug.svn-base b/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.hotplug.svn-base +new file mode 100644 +index 0000000..d14b5bf +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.hotplug.svn-base +@@ -0,0 +1,8 @@ ++#!/bin/sh ++ ++if [ "$ACTION" = add ]; then ++ ++ /etc/init.d/haproxy enabled && \ ++ /etc/init.d/haproxy start ++fi ++ +diff --git a/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.init.svn-base b/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.init.svn-base +new file mode 100644 +index 0000000..96b13ba +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/.svn/text-base/haproxy.init.svn-base +@@ -0,0 +1,23 @@ ++#!/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() { ++ service_stop $HAPROXY_BIN ++} ++ ++reload() { ++ $HAPROXY_BIN -D -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(cat $HAPROXY_PID) ++} +diff --git a/feeds/packages/net/haproxy/files/haproxy.cfg b/feeds/packages/net/haproxy/files/haproxy.cfg +new file mode 100644 +index 0000000..a54f5f5 +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/haproxy.cfg +@@ -0,0 +1,100 @@ ++# 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/feeds/packages/net/haproxy/files/haproxy.hotplug b/feeds/packages/net/haproxy/files/haproxy.hotplug +new file mode 100644 +index 0000000..d14b5bf +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/haproxy.hotplug +@@ -0,0 +1,8 @@ ++#!/bin/sh ++ ++if [ "$ACTION" = add ]; then ++ ++ /etc/init.d/haproxy enabled && \ ++ /etc/init.d/haproxy start ++fi ++ +diff --git a/feeds/packages/net/haproxy/files/haproxy.init b/feeds/packages/net/haproxy/files/haproxy.init +new file mode 100644 +index 0000000..96b13ba +--- /dev/null ++++ b/feeds/packages/net/haproxy/files/haproxy.init +@@ -0,0 +1,23 @@ ++#!/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() { ++ service_stop $HAPROXY_BIN ++} ++ ++reload() { ++ $HAPROXY_BIN -D -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(cat $HAPROXY_PID) ++} +diff --git a/feeds/packages/net/haproxy/patches/.svn/entries b/feeds/packages/net/haproxy/patches/.svn/entries +new file mode 100644 +index 0000000..5da388e +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/.svn/entries +@@ -0,0 +1,844 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/haproxy/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-10T23:49:52.982218Z ++35092 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++0020-BUILD-no-need-to-clean-up-when-making-git-tar-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++414f10854cea4d93ea885a1629df1c0d ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++818 ++ ++0019-BUG-MINOR-http-don-t-abort-client-connection-o-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++fbba0c8385d47e594c3cd8c1d8b9c3f3 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1776 ++ ++001-haproxy-1.4.x-sendproxy.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7ece79a7dfd957206bb42c11e071c2d6 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++15657 ++ ++0012-BUG-halog-fix-broken-output-limitation-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++8281842bffddc0454dd0c9517e656e53 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3719 ++ ++0016-BUG-MINOR-http-don-t-report-client-aborts-as-s-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++17348c6e84a6fcd8a01cec91a318336e ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3096 ++ ++0017-BUG-MINOR-http-don-t-log-a-503-on-client-error-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++3f6e9efe4febab88778a8e531eed4125 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1135 ++ ++0018-BUG-MEDIUM-tcp-process-could-theorically-crash-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++4f538e06cafea5ae28f4c398f7f9a2ab ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2354 ++ ++0003-CONTRIB-halog-sort-URLs-by-avg-bytes_read-or-t-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++daf2171510359209c64232ada84febd4 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8743 ++ ++0001-BUG-MINOR-config-use-a-copy-of-the-file-name-i-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++1df3232d02b9956fb4166cda2a2c7958 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2633 ++ ++0008-BUG-MEDIUM-command-line-option-D-must-have-pre-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++2a2f91da037745c7abee28be1def5530 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1660 ++ ++0005-BUG-MINOR-halog-ad-ac-report-the-correct-numbe-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++c5c3a0cf5a9f1989bc68c820af773af7 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++882 ++ ++0004-MINOR-halog-sort-output-by-cookie-code-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++744b67e87472e2ebbdcea1eafa1281b2 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4720 ++ ++0009-BUG-fix-garbage-data-when-http-send-name-heade-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++08674acc7092cd9e8d409bea89876224 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1857 ++ ++0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++962f7479b71221847c30985cf5c70ba8 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4382 ++ ++0002-BUG-MINOR-epoll-correctly-disable-FD-polling-i-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++72fb6aed89bf1fdd36c3555ce5eff65b ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1750 ++ ++0015-BUG-MAJOR-cli-show-sess-id-may-randomly-corrup-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++6a6336a545b9c02b4125fa5977caf1cd ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2022 ++ ++0007-BUG-MEDIUM-http-set-DONTWAIT-on-data-when-swit-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++304481acf241e32c03f6187db6b0d7ec ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2586 ++ ++0023-BUG-MINOR-http-don-t-process-abortonclose-when-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++d18d300ebdba2f727368af49387ce2d4 ++2013-01-10T23:49:52.982218Z ++35092 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1328 ++ ++0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++d5cc7e4c0eb7db2980d0257b6d6231ab ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1839 ++ ++0014-MEDIUM-checks-prevent-TIME_WAITs-from-appearin-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++9b0689afd637304a1eeca9676481424c ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++885 ++ ++0013-MEDIUM-checks-avoid-accumulating-TIME_WAITs-du-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++69827fce427867e312386aa0fba7f750 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3442 ++ ++0022-BUG-MINOR-time-frequency-counters-are-not-tota-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++60d3380b7b5ec2cdfcbb055cef35051c ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5217 ++ ++0021-MINOR-http-always-report-PR-flags-for-redirect-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++a96ba9d079072519060ec1672eb8cce4 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1082 ++ ++0006-BUG-MINOR-halog-fix-help-message-for-ut-uto-1.4.22.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++b9176e653424d996a8951eaa3c8731b3 ++2013-01-10T23:47:03.147636Z ++35091 ++heil ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1126 ++ +diff --git a/feeds/packages/net/haproxy/patches/.svn/text-base/0001-BUG-MINOR-config-use-a-copy-of-the-file-name-i-1.4.22.diff.svn-base b/feeds/packages/net/haproxy/patches/.svn/text-base/0001-BUG-MINOR-config-use-a-copy-of-the-file-name-i-1.4.22.diff.svn-base +new file mode 100644 +index 0000000..d77d4ce +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/.svn/text-base/0001-BUG-MINOR-config-use-a-copy-of-the-file-name-i-1.4.22.diff.svn-base +@@ -0,0 +1,75 @@ ++From 60f05a8eae1afda44d62066445a0c072659a1aa1 Mon Sep 17 00:00:00 2001 ++From: Willy Tarreau ++Date: Thu, 4 Oct 2012 08:01:43 +0200 ++Subject: BUG/MINOR: config: use a copy of the file name in proxy configurations ++ ++Each proxy contains a reference to the original config file and line ++number where it was declared. The pointer used is just a reference to ++the one passed to the function instead of being duplicated. The effect ++is that it is not valid anymore at the end of the parsing and that all ++proxies will be enumerated as coming from the same file on some late ++configuration errors. This may happen for exmaple when reporting SSL ++certificate issues. ++ ++By copying using strdup(), we avoid this issue. ++ ++1.4 has the same issue, though no report of the proxy file name is done ++out of the config section. Anyway a backport is recommended to ease ++post-mortem analysis. ++(cherry picked from commit 8113a5d78f2d2abe942f88a3a4df9f8bb5e535ba) ++--- ++ include/types/proxy.h | 2 +- ++ src/cfgparse.c | 4 ++-- ++ src/haproxy.c | 1 + ++ 3 files changed, 4 insertions(+), 3 deletions(-) ++ ++diff --git a/include/types/proxy.h b/include/types/proxy.h ++index 1773658..a06078a 100644 ++--- a/include/types/proxy.h +++++ b/include/types/proxy.h ++@@ -320,7 +320,7 @@ struct proxy { ++ int no_options2; /* PR_O2_* */ ++ ++ struct { ++- const char *file; /* file where the section appears */ +++ char *file; /* file where the section appears */ ++ int line; /* line where the section appears */ ++ struct eb32_node id; /* place in the tree of used IDs */ ++ struct eb_root used_listener_id;/* list of listener IDs in use */ ++diff --git a/src/cfgparse.c b/src/cfgparse.c ++index 643f065..90fdbff 100644 ++--- a/src/cfgparse.c +++++ b/src/cfgparse.c ++@@ -1136,7 +1136,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) ++ init_new_proxy(curproxy); ++ curproxy->next = proxy; ++ proxy = curproxy; ++- curproxy->conf.file = file; +++ curproxy->conf.file = strdup(file); ++ curproxy->conf.line = linenum; ++ curproxy->last_change = now.tv_sec; ++ curproxy->id = strdup(args[1]); ++@@ -3425,7 +3425,7 @@ stats_error_parsing: ++ newsrv->next = curproxy->srv; ++ curproxy->srv = newsrv; ++ newsrv->proxy = curproxy; ++- newsrv->conf.file = file; +++ newsrv->conf.file = strdup(file); ++ newsrv->conf.line = linenum; ++ ++ LIST_INIT(&newsrv->pendconns); ++diff --git a/src/haproxy.c b/src/haproxy.c ++index 6141a5b..2944462 100644 ++--- a/src/haproxy.c +++++ b/src/haproxy.c ++@@ -732,6 +732,7 @@ void deinit(void) ++ int i; ++ ++ while (p) { +++ free(p->conf.file); ++ free(p->id); ++ free(p->check_req); ++ free(p->cookie_name); ++-- ++1.7.1 ++ +diff --git a/feeds/packages/net/haproxy/patches/.svn/text-base/0002-BUG-MINOR-epoll-correctly-disable-FD-polling-i-1.4.22.diff.svn-base b/feeds/packages/net/haproxy/patches/.svn/text-base/0002-BUG-MINOR-epoll-correctly-disable-FD-polling-i-1.4.22.diff.svn-base +new file mode 100644 +index 0000000..e02cf47 +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/.svn/text-base/0002-BUG-MINOR-epoll-correctly-disable-FD-polling-i-1.4.22.diff.svn-base +@@ -0,0 +1,53 @@ ++From 72ce4c8f4e0531c50b3a0914d77858440d16d914 Mon Sep 17 00:00:00 2001 ++From: Willy Tarreau ++Date: Thu, 4 Oct 2012 21:54:41 +0200 ++Subject: BUG/MINOR: epoll: correctly disable FD polling in fd_rem() ++ ++When calling fd_rem(), the polling was not correctly disabled because the ++->prev state was set to zero instead of the previous value. fd_rem() is ++very rarely used, only just before closing a socket. ++ ++The effect is that upon an error reported at the connection level, if the ++task assigned to the connection was too slow to be woken up because of too ++many other tasks in the run queue, the FD was still not disabled and caused ++the connection handler to be called again with the same event until the task ++was finally executed to close the fd. ++ ++This issue only affects the epoll poller, not the sepoll variant nor any of ++the other ones. ++ ++It was already present in 1.4 and even 1.3 with the same almost unnoticeable ++effects. The bug can in fact only be discovered during development where it ++emphasizes other bugs. ++ ++It should be backported anyway. ++(cherry picked from commit f8cfa447c676849e1d1b007353d4ea2f7231e4a0) ++--- ++ src/ev_epoll.c | 8 ++++++-- ++ 1 files changed, 6 insertions(+), 2 deletions(-) ++ ++diff --git a/src/ev_epoll.c b/src/ev_epoll.c ++index b976868..0b22da6 100644 ++--- a/src/ev_epoll.c +++++ b/src/ev_epoll.c ++@@ -194,11 +194,15 @@ REGPRM2 static int __fd_clr(const int fd, int dir) ++ REGPRM1 static void __fd_rem(int fd) ++ { ++ uint32_t ofs = FD2OFS(fd); +++ uint32_t old_evt; ++ ++- if (unlikely(!((fd_evts[ofs] >> FD2BIT(fd)) & 3))) +++ old_evt = fd_evts[ofs] >> FD2BIT(fd); +++ old_evt &= 3; +++ +++ if (unlikely(!old_evt)) ++ return; ++ ++- alloc_chg_list(fd, 0); +++ alloc_chg_list(fd, old_evt); ++ fd_evts[ofs] &= ~FD2MSK(fd); ++ return; ++ } ++-- ++1.7.1 ++ +diff --git a/feeds/packages/net/haproxy/patches/.svn/text-base/0003-CONTRIB-halog-sort-URLs-by-avg-bytes_read-or-t-1.4.22.diff.svn-base b/feeds/packages/net/haproxy/patches/.svn/text-base/0003-CONTRIB-halog-sort-URLs-by-avg-bytes_read-or-t-1.4.22.diff.svn-base +new file mode 100644 +index 0000000..fa63d87 +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/.svn/text-base/0003-CONTRIB-halog-sort-URLs-by-avg-bytes_read-or-t-1.4.22.diff.svn-base +@@ -0,0 +1,191 @@ ++From 69eeb17615cd032ec7b3a9496ddb811095e92cb4 Mon Sep 17 00:00:00 2001 ++From: Baptiste ++Date: Sat, 8 Sep 2012 23:10:03 +0200 ++Subject: CONTRIB: halog: sort URLs by avg bytes_read or total bytes_read ++ ++The patch attached to this mail brings ability to sort URLs by ++averaged bytes read and total bytes read in HALog tool. ++In most cases, bytes read is also the object size. ++The purpose of this patch is to know which URL consume the most ++bandwith, in average or in total. ++It may be interesting as well to know the standard deviation (ecart ++type in french) for some counters (like bytes_read). ++ ++The results: ++- Sorting by average bytes read per URL: ++./halog -uba <~/tmp/haproxy.log | column -t | head ++2246 lines in, 302 lines out, 194 parsing errors ++18 0 5101 283 5101 283 126573 2278327 /lib/exe/js.php ++1 0 1 1 1 1 106734 106734 /wp-admin/images/screenshots/theme-customizer.png ++2 0 2 1 2 1 106511 213022 /wp-admin/css/wp-admin.css ++1 0 1 1 1 1 96698 96698 /wp-admin/images/screenshots/captions-1.png ++1 0 1 1 1 1 73165 73165 /wp-admin/images/screenshots/flex-header-1.png ++4 0 0 0 0 0 64832 259328 /cuisine/wp-content/plugins/stats/open-flash-chart.swf ++1 0 0 0 0 0 48647 48647 /wp-admin/images/screenshots/flex-header-3.png ++1 0 0 0 0 0 44046 44046 /wp-admin/images/screenshots/captions-2.png ++1 0 1 1 1 1 38830 38830 /wp-admin/images/screenshots/flex-header-2.png ++ ++- Sorting by total bytes read per URL: ++./halog -ubt <~/tmp/haproxy.log | column -t | head ++2246 lines in, 302 lines out, 194 parsing errors ++18 0 5101 283 5101 283 126573 2278327 /lib/exe/js.php ++60 0 14387 239 14387 239 10081 604865 /lib/exe/css.php ++64 2 8820 137 8819 142 7742 495524 /doku.php ++14 0 250 17 250 17 24045 336632 /wp-admin/load-scripts.php ++71 0 6422 90 6422 90 4048 287419 /wp-admin/ ++4 0 0 0 0 0 64832 259328 /cuisine/wp-content/plugins/stats/open-flash-chart.swf ++2 0 2 1 2 1 106511 213022 /wp-admin/css/wp-admin.css ++31 3 5423 174 5040 180 6804 210931 /index ++10 0 429 42 429 42 18009 180093 /cuisine/files/2011/10/tarte_figue_amande-e1318281546905-225x300.jpg ++(cherry picked from commit 61aaad06e85ae7f46cf5589bce8bc7f9331e7962) ++--- ++ contrib/halog/halog.c | 39 ++++++++++++++++++++++++++++++++------- ++ 1 files changed, 32 insertions(+), 7 deletions(-) ++ ++diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c ++index f19be0b..274b7f3 100644 ++--- a/contrib/halog/halog.c +++++ b/contrib/halog/halog.c ++@@ -29,6 +29,7 @@ ++ #define SERVER_FIELD 8 ++ #define TIME_FIELD 9 ++ #define STATUS_FIELD 10 +++#define BYTES_SENT_FIELD 11 ++ #define TERM_CODES_FIELD 14 ++ #define CONN_FIELD 15 ++ #define QUEUE_LEN_FIELD 16 ++@@ -67,6 +68,7 @@ struct url_stat { ++ char *url; ++ unsigned long long total_time; /* sum(all reqs' times) */ ++ unsigned long long total_time_ok; /* sum(all OK reqs' times) */ +++ unsigned long long total_bytes_sent; /* sum(all bytes sent) */ ++ unsigned int nb_err, nb_req; ++ }; ++ ++@@ -94,8 +96,6 @@ struct url_stat { ++ #define FILT_COUNT_URL_TAVG 0x040000 ++ #define FILT_COUNT_URL_TTOTO 0x080000 ++ #define FILT_COUNT_URL_TAVGO 0x100000 ++-#define FILT_COUNT_URL_ANY (FILT_COUNT_URL_ONLY|FILT_COUNT_URL_COUNT|FILT_COUNT_URL_ERR| \ ++- FILT_COUNT_URL_TTOT|FILT_COUNT_URL_TAVG|FILT_COUNT_URL_TTOTO|FILT_COUNT_URL_TAVGO) ++ ++ #define FILT_HTTP_ONLY 0x200000 ++ #define FILT_TERM_CODE_NAME 0x400000 ++@@ -106,6 +106,13 @@ struct url_stat { ++ #define FILT_QUEUE_ONLY 0x4000000 ++ #define FILT_QUEUE_SRV_ONLY 0x8000000 ++ +++#define FILT_COUNT_URL_BAVG 0x10000000 +++#define FILT_COUNT_URL_BTOT 0x20000000 +++ +++#define FILT_COUNT_URL_ANY (FILT_COUNT_URL_ONLY|FILT_COUNT_URL_COUNT|FILT_COUNT_URL_ERR| \ +++ FILT_COUNT_URL_TTOT|FILT_COUNT_URL_TAVG|FILT_COUNT_URL_TTOTO|FILT_COUNT_URL_TAVGO| \ +++ FILT_COUNT_URL_BAVG|FILT_COUNT_URL_BTOT) +++ ++ unsigned int filter = 0; ++ unsigned int filter_invert = 0; ++ const char *line; ++@@ -128,9 +135,10 @@ void usage(FILE *output, const char *msg) ++ fprintf(output, ++ "%s" ++ "Usage: halog [-h|--help] for long help\n" ++- " halog [-q] [-c] [-v] {-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto}\n" +++ " halog [-q] [-c]\n" +++ " {-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt}\n" ++ " [-s ] [-e|-E] [-H] [-rt|-RT
]: [, ...] tr ++ bind [
]: [, ...] id ++ bind [
]: [, ...] name ++ bind [
]: [, ...] defer-accept +++bind [
]: [, ...] accept-proxy ++ Define one or several listening addresses and/or ports in a frontend. ++ May be used in sections : defaults | frontend | listen | backend ++ no | yes | yes | no ++@@ -1419,6 +1420,19 @@ bind [
]: [, ...] de ++ with front firewalls which would see an established ++ connection while the proxy will only see it in SYN_RECV. ++ +++ accept-proxy is an optional keyword which enforces use of the PROXY +++ protocol over any connection accepted by this listener. The +++ PROXY protocol dictates the layer 3/4 addresses of the +++ incoming connection to be used everywhere an address is used, +++ with the only exception of "tcp-request connection" rules +++ which will only see the real connection address. Logs will +++ reflect the addresses indicated in the protocol, unless it is +++ violated, in which case the real address will still be used. +++ This keyword combined with support from external components +++ can be used as an efficient and reliable alternative to the +++ X-Forwarded-For mechanism which is not always reliable and +++ not even always usable. +++ ++ It is possible to specify a list of address:port combinations delimited by ++ commas. The frontend will then listen on all of these addresses. There is no ++ fixed limit to the number of addresses and ports which can be listened on in ++@@ -1429,8 +1443,10 @@ bind [
]: [, ...] de ++ listen http_proxy ++ bind :80,:443 ++ bind 10.0.0.1:10080,10.0.0.1:10443 +++ bind 127.0.0.1:8443 accept-proxy ++ ++- See also : "source". +++ See also : "source", "option forwardfor" and the PROXY protocol +++ documentation. ++ ++ ++ bind-process [ all | odd | even | ] ... ++@@ -7231,7 +7247,9 @@ marked with a star ('*') after the field ++ ++ Detailed fields description : ++ - "client_ip" is the IP address of the client which initiated the TCP ++- connection to haproxy. +++ connection to haproxy. Note that when the connection is accepted on a +++ socket configured with "accept-proxy" and the PROXY protocol is correctly +++ used, then the logs will reflect the forwarded connection's information. ++ ++ - "client_port" is the TCP port of the client which initiated the connection. ++ ++@@ -7404,7 +7422,9 @@ with a star ('*') after the field name b ++ ++ Detailed fields description : ++ - "client_ip" is the IP address of the client which initiated the TCP ++- connection to haproxy. +++ connection to haproxy. Note that when the connection is accepted on a +++ socket configured with "accept-proxy" and the PROXY protocol is correctly +++ used, then the logs will reflect the forwarded connection's information. ++ ++ - "client_port" is the TCP port of the client which initiated the connection. ++ ++--- a/include/common/standard.h +++++ b/include/common/standard.h ++@@ -269,6 +269,28 @@ static inline unsigned int __strl2uic(co ++ return i; ++ } ++ +++/* This function reads an unsigned integer from the string pointed to by +++ * and returns it. The pointer is adjusted to point to the first unread +++ * char. The function automatically stops at . +++ */ +++static inline unsigned int __read_uint(const char **s, const char *end) +++{ +++ const char *ptr = *s; +++ unsigned int i = 0; +++ unsigned int j, k; +++ +++ while (ptr < end) { +++ j = *ptr - '0'; +++ k = i * 10; +++ if (j > 9) +++ break; +++ i = k + j; +++ ptr++; +++ } +++ *s = ptr; +++ return i; +++} +++ ++ extern unsigned int str2ui(const char *s); ++ extern unsigned int str2uic(const char *s); ++ extern unsigned int strl2ui(const char *s, int len); ++@@ -276,6 +298,7 @@ extern unsigned int strl2uic(const char ++ extern int strl2ic(const char *s, int len); ++ extern int strl2irc(const char *s, int len, int *ret); ++ extern int strl2llrc(const char *s, int len, long long *ret); +++extern unsigned int read_uint(const char **s, const char *end); ++ unsigned int inetaddr_host(const char *text); ++ unsigned int inetaddr_host_lim(const char *text, const char *stop); ++ unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret); ++--- a/include/proto/client.h +++++ b/include/proto/client.h ++@@ -25,6 +25,7 @@ ++ #include ++ #include ++ +++int frontend_decode_proxy_request(struct session *s, struct buffer *req, int an_bit); ++ void get_frt_addr(struct session *s); ++ int event_accept(int fd); ++ ++--- a/include/types/buffers.h +++++ b/include/types/buffers.h ++@@ -135,16 +135,16 @@ ++ * The field is blanked by buffer_init() and only by analysers themselves ++ * afterwards. ++ */ ++-#define AN_REQ_INSPECT 0x00000001 /* inspect request contents */ ++-#define AN_REQ_WAIT_HTTP 0x00000002 /* wait for an HTTP request */ ++-#define AN_REQ_HTTP_PROCESS_FE 0x00000004 /* process the frontend's HTTP part */ ++-#define AN_REQ_SWITCHING_RULES 0x00000008 /* apply the switching rules */ ++-#define AN_REQ_HTTP_PROCESS_BE 0x00000010 /* process the backend's HTTP part */ ++-#define AN_REQ_HTTP_INNER 0x00000020 /* inner processing of HTTP request */ ++-#define AN_REQ_HTTP_TARPIT 0x00000040 /* wait for end of HTTP tarpit */ ++-#define AN_REQ_HTTP_BODY 0x00000080 /* inspect HTTP request body */ ++-#define AN_REQ_STICKING_RULES 0x00000100 /* table persistence matching */ ++-/* unused: 0x200 */ +++#define AN_REQ_DECODE_PROXY 0x00000001 /* take the proxied address from a 'PROXY' line */ +++#define AN_REQ_INSPECT 0x00000002 /* inspect request contents */ +++#define AN_REQ_WAIT_HTTP 0x00000004 /* wait for an HTTP request */ +++#define AN_REQ_HTTP_PROCESS_FE 0x00000008 /* process the frontend's HTTP part */ +++#define AN_REQ_SWITCHING_RULES 0x00000010 /* apply the switching rules */ +++#define AN_REQ_HTTP_PROCESS_BE 0x00000020 /* process the backend's HTTP part */ +++#define AN_REQ_HTTP_INNER 0x00000040 /* inner processing of HTTP request */ +++#define AN_REQ_HTTP_TARPIT 0x00000080 /* wait for end of HTTP tarpit */ +++#define AN_REQ_HTTP_BODY 0x00000100 /* inspect HTTP request body */ +++#define AN_REQ_STICKING_RULES 0x00000200 /* table persistence matching */ ++ #define AN_REQ_PRST_RDP_COOKIE 0x00000400 /* persistence on rdp cookie */ ++ #define AN_REQ_HTTP_XFER_BODY 0x00000800 /* forward request body */ ++ ++--- a/include/types/protocols.h +++++ b/include/types/protocols.h ++@@ -72,6 +72,7 @@ ++ #define LI_O_FOREIGN 0x0002 /* permit listening on foreing addresses */ ++ #define LI_O_NOQUICKACK 0x0004 /* disable quick ack of immediate data (linux) */ ++ #define LI_O_DEF_ACCEPT 0x0008 /* wait up to 1 second for data before accepting */ +++#define LI_O_ACC_PROXY 0x0010 /* find the proxied address in the first request line */ ++ ++ /* The listener will be directly referenced by the fdtab[] which holds its ++ * socket. The listener provides the protocol-specific accept() function to ++--- a/src/cfgparse.c +++++ b/src/cfgparse.c ++@@ -1467,6 +1467,16 @@ int cfg_parse_listen(const char *file, i ++ #endif ++ } ++ +++ if (!strcmp(args[cur_arg], "accept-proxy")) { /* expect a 'PROXY' line first */ +++ struct listener *l; +++ +++ for (l = curproxy->listen; l != last_listen; l = l->next) +++ l->options |= LI_O_ACC_PROXY; +++ +++ cur_arg ++; +++ continue; +++ } +++ ++ if (!strcmp(args[cur_arg], "name")) { ++ struct listener *l; ++ ++@@ -1519,7 +1529,7 @@ int cfg_parse_listen(const char *file, i ++ continue; ++ } ++ ++- Alert("parsing [%s:%d] : '%s' only supports the 'transparent', 'defer-accept', 'name', 'id', 'mss' and 'interface' options.\n", +++ Alert("parsing [%s:%d] : '%s' only supports the 'transparent', 'accept-proxy', 'defer-accept', 'name', 'id', 'mss' and 'interface' options.\n", ++ file, linenum, args[0]); ++ err_code |= ERR_ALERT | ERR_FATAL; ++ goto out; ++@@ -5732,6 +5742,9 @@ out_uri_auth_compat: ++ listener->handler = process_session; ++ listener->analysers |= curproxy->fe_req_ana; ++ +++ if (listener->options & LI_O_ACC_PROXY) +++ listener->analysers |= AN_REQ_DECODE_PROXY; +++ ++ /* smart accept mode is automatic in HTTP mode */ ++ if ((curproxy->options2 & PR_O2_SMARTACC) || ++ (curproxy->mode == PR_MODE_HTTP && ++--- a/src/client.c +++++ b/src/client.c ++@@ -22,6 +22,7 @@ ++ ++ #include ++ #include +++#include ++ #include ++ ++ #include ++@@ -43,6 +44,191 @@ ++ #include ++ ++ +++/* This analyser tries to fetch a line from the request buffer which looks like : +++ * +++ * "PROXY" PROTO SRC3 DST3 SRC4 "\r\n" +++ * +++ * There must be exactly one space between each field. Fields are : +++ * - PROTO : layer 4 protocol, which must be "TCP4" or "TCP6". +++ * - SRC3 : layer 3 (eg: IP) source address in standard text form +++ * - DST3 : layer 3 (eg: IP) destination address in standard text form +++ * - SRC4 : layer 4 (eg: TCP port) source address in standard text form +++ * - DST4 : layer 4 (eg: TCP port) destination address in standard text form +++ * +++ * This line MUST be at the beginning of the buffer and MUST NOT wrap. +++ * +++ * Once the data is fetched, the values are set in the session's field and data +++ * are removed from the buffer. The function returns zero if it needs to wait +++ * for more data (max: timeout_client), or 1 if it has finished and removed itself. +++ */ +++int frontend_decode_proxy_request(struct session *s, struct buffer *req, int an_bit) +++{ +++ char *line = req->data; +++ char *end = req->data + req->l; +++ int len; +++ +++ DPRINTF(stderr,"[%u] %s: session=%p b=%p, exp(r,w)=%u,%u bf=%08x bl=%d analysers=%02x\n", +++ now_ms, __FUNCTION__, +++ s, +++ req, +++ req->rex, req->wex, +++ req->flags, +++ req->l, +++ req->analysers); +++ +++ if (req->flags & (BF_READ_ERROR|BF_READ_TIMEOUT)) +++ goto fail; +++ +++ len = MIN(req->l, 6); +++ if (!len) +++ goto missing; +++ +++ /* Decode a possible proxy request, fail early if it does not match */ +++ if (strncmp(line, "PROXY ", len) != 0) +++ goto fail; +++ +++ line += 6; +++ if (req->l < 18) /* shortest possible line */ +++ goto missing; +++ +++ if (!memcmp(line, "TCP4 ", 5) != 0) { +++ u32 src3, dst3, sport, dport; +++ +++ line += 5; +++ +++ src3 = inetaddr_host_lim_ret(line, end, &line); +++ if (line == end) +++ goto missing; +++ if (*line++ != ' ') +++ goto fail; +++ +++ dst3 = inetaddr_host_lim_ret(line, end, &line); +++ if (line == end) +++ goto missing; +++ if (*line++ != ' ') +++ goto fail; +++ +++ sport = read_uint((const char **)&line, end); +++ if (line == end) +++ goto missing; +++ if (*line++ != ' ') +++ goto fail; +++ +++ dport = read_uint((const char **)&line, end); +++ if (line > end - 2) +++ goto missing; +++ if (*line++ != '\r') +++ goto fail; +++ if (*line++ != '\n') +++ goto fail; +++ +++ /* update the session's addresses and mark them set */ +++ ((struct sockaddr_in *)&s->cli_addr)->sin_family = AF_INET; +++ ((struct sockaddr_in *)&s->cli_addr)->sin_addr.s_addr = htonl(src3); +++ ((struct sockaddr_in *)&s->cli_addr)->sin_port = htons(sport); +++ +++ ((struct sockaddr_in *)&s->frt_addr)->sin_family = AF_INET; +++ ((struct sockaddr_in *)&s->frt_addr)->sin_addr.s_addr = htonl(dst3); +++ ((struct sockaddr_in *)&s->frt_addr)->sin_port = htons(dport); +++ s->flags |= SN_FRT_ADDR_SET; +++ +++ } +++ else if (!memcmp(line, "TCP6 ", 5) != 0) { +++ u32 sport, dport; +++ char *src_s; +++ char *dst_s, *sport_s, *dport_s; +++ struct in6_addr src3, dst3; +++ +++ line+=5; +++ +++ src_s = line; +++ dst_s = sport_s = dport_s = NULL; +++ while (1) { +++ if (line > end - 2) { +++ goto missing; +++ } +++ else if (*line == '\r') { +++ *line = 0; +++ line++; +++ if (*line++ != '\n') +++ goto fail; +++ break; +++ } +++ +++ if (*line == ' ') { +++ *line = 0; +++ if (!dst_s) +++ dst_s = line+1; +++ else if (!sport_s) +++ sport_s = line+1; +++ else if (!dport_s) +++ dport_s = line+1; +++ } +++ line++; +++ } +++ +++ if (!dst_s || !sport_s || !dport_s) +++ goto fail; +++ +++ sport = read_uint((const char **)&sport_s,dport_s-1); +++ if ( *sport_s != 0 ) +++ goto fail; +++ +++ dport = read_uint((const char **)&dport_s,line-2); +++ if ( *dport_s != 0 ) +++ goto fail; +++ +++ if (inet_pton(AF_INET6, src_s, (void *)&src3) != 1) +++ goto fail; +++ +++ if (inet_pton(AF_INET6, dst_s, (void *)&dst3) != 1) +++ goto fail; +++ +++ /* update the session's addresses and mark them set */ +++ ((struct sockaddr_in6 *)&s->cli_addr)->sin6_family = AF_INET6; +++ memcpy(&((struct sockaddr_in6 *)&s->cli_addr)->sin6_addr, &src3, sizeof(struct in6_addr)); +++ ((struct sockaddr_in6 *)&s->cli_addr)->sin6_port = htons(sport); +++ +++ ((struct sockaddr_in6 *)&s->frt_addr)->sin6_family = AF_INET6; +++ memcpy(&((struct sockaddr_in6 *)&s->frt_addr)->sin6_addr, &dst3, sizeof(struct in6_addr)); +++ ((struct sockaddr_in6 *)&s->frt_addr)->sin6_port = htons(dport); +++ s->flags |= SN_FRT_ADDR_SET; +++ } +++ else { +++ goto fail; +++ } +++ +++ /* remove the PROXY line from the request */ +++ len = line - req->data; +++ buffer_replace2(req, req->data, line, NULL, 0); +++ req->total -= len; /* don't count the header line */ +++ +++ req->analysers &= ~an_bit; +++ return 1; +++ +++ missing: +++ if (!(req->flags & (BF_SHUTR|BF_FULL))) { +++ buffer_dont_connect(s->req); +++ return 0; +++ } +++ /* missing data and buffer is either full or shutdown => fail */ +++ +++ fail: +++ buffer_abort(req); +++ buffer_abort(s->rep); +++ req->analysers = 0; +++ +++ s->fe->counters.failed_req++; +++ if (s->listener->counters) +++ s->listener->counters->failed_req++; +++ +++ if (!(s->flags & SN_ERR_MASK)) +++ s->flags |= SN_ERR_PRXCOND; +++ if (!(s->flags & SN_FINST_MASK)) +++ s->flags |= SN_FINST_R; +++ return 0; +++} +++ ++ /* Retrieves the original destination address used by the client, and sets the ++ * SN_FRT_ADDR_SET flag. ++ */ ++--- a/src/proto_http.c +++++ b/src/proto_http.c ++@@ -4127,7 +4127,8 @@ void http_end_txn_clean_session(struct s ++ if (s->rep->lr >= s->rep->data + s->rep->size) ++ s->rep->lr -= s->req->size; ++ ++- s->req->analysers |= s->fe->fe_req_ana; +++ s->req->analysers = s->fe->fe_req_ana; +++ s->req->analysers &= ~AN_REQ_DECODE_PROXY; ++ s->rep->analysers = 0; ++ ++ http_silent_debug(__LINE__, s); ++@@ -7670,7 +7671,6 @@ void http_reset_txn(struct session *s) ++ http_init_txn(s); ++ ++ s->be = s->fe; ++- s->req->analysers = s->listener->analysers; ++ s->logs.logwait = s->fe->to_log; ++ s->srv = s->prev_srv = s->srv_conn = NULL; ++ /* re-init store persistence */ ++--- a/src/session.c +++++ b/src/session.c ++@@ -1055,6 +1055,12 @@ resync_stream_interface: ++ while (ana_list && max_loops--) { ++ /* Warning! ensure that analysers are always placed in ascending order! */ ++ +++ if (ana_list & AN_REQ_DECODE_PROXY) { +++ if (!frontend_decode_proxy_request(s, s->req, AN_REQ_DECODE_PROXY)) +++ break; +++ UPDATE_ANALYSERS(s->req->analysers, ana_list, ana_back, AN_REQ_DECODE_PROXY); +++ } +++ ++ if (ana_list & AN_REQ_INSPECT) { ++ if (!tcp_inspect_request(s, s->req, AN_REQ_INSPECT)) ++ break; ++--- a/src/standard.c +++++ b/src/standard.c ++@@ -569,6 +569,11 @@ unsigned int strl2uic(const char *s, int ++ return __strl2uic(s, len); ++ } ++ +++unsigned int read_uint(const char **s, const char *end) +++{ +++ return __read_uint(s, end); +++} +++ ++ /* This one is 7 times faster than strtol() on athlon with checks. ++ * It returns the value of the number composed of all valid digits read, ++ * and can process negative numbers too. +diff --git a/feeds/packages/net/haproxy/patches/.svn/text-base/0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff.svn-base b/feeds/packages/net/haproxy/patches/.svn/text-base/0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff.svn-base +new file mode 100644 +index 0000000..dcab974 +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/.svn/text-base/0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff.svn-base +@@ -0,0 +1,54 @@ ++From c998e6347e6e6940263157fb341a8444d789aa5f Mon Sep 17 00:00:00 2001 ++From: Willy Tarreau ++Date: Tue, 3 Jan 2012 09:23:03 +0100 ++Subject: OPTIM: halog: keep a fast path for the lines-count only ++ ++[ note: this backport is not absolutely required for 1.4 but it eases ++ further backports ] ++ ++Using "halog -c" is still something quite common to perform on logs, ++but unfortunately since the recent added controls, it was sensibly ++slowed down due to the parsing of the accept date field. ++ ++Now we use a specific loop for the case where nothing is needed from ++the input, and this sped up the line counting by 2.5x. A 2.4 GHz Xeon ++now counts lines at a rate of 2 GB of logs per second. ++ ++(cherry picked from commit e1a908c369ab988448c6672066ad1d09b6919d02) ++--- ++ contrib/halog/halog.c | 12 +++++++++++- ++ 1 files changed, 11 insertions(+), 1 deletions(-) ++ ++diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c ++index 4e3cfc4..3912807 100644 ++--- a/contrib/halog/halog.c +++++ b/contrib/halog/halog.c ++@@ -702,6 +702,16 @@ int main(int argc, char **argv) ++ posix_fadvise(0, 0, 0, POSIX_FADV_SEQUENTIAL); ++ #endif ++ +++ if (!line_filter && +++ !(filter & (FILT_HTTP_ONLY|FILT_TIME_RESP|FILT_ERRORS_ONLY|FILT_HTTP_STATUS|FILT_QUEUE_ONLY|FILT_QUEUE_SRV_ONLY|FILT_TERM_CODE_NAME))) { +++ /* read the whole file at once first */ +++ if (!filter_invert) +++ while (fgets2(stdin) != NULL) +++ lines_out++; +++ +++ goto skip_filters; +++ } +++ ++ while ((line = fgets2(stdin)) != NULL) { ++ linenum++; ++ time_field = NULL; accept_field = NULL; ++@@ -859,7 +869,7 @@ int main(int argc, char **argv) ++ lines_out++; /* we're just counting lines */ ++ } ++ ++- +++ skip_filters: ++ /***************************************************** ++ * Here we've finished reading all input. Depending on the ++ * filters, we may still have some analysis to run on the ++-- ++1.7.1 ++ +diff --git a/feeds/packages/net/haproxy/patches/.svn/text-base/0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff.svn-base b/feeds/packages/net/haproxy/patches/.svn/text-base/0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff.svn-base +new file mode 100644 +index 0000000..d1bb4d8 +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/.svn/text-base/0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff.svn-base +@@ -0,0 +1,134 @@ ++From 9f03ab8e3ec603f2aed944a7887bcdf7be52009a Mon Sep 17 00:00:00 2001 ++From: Willy Tarreau ++Date: Wed, 10 Oct 2012 16:49:28 +0200 ++Subject: MINOR: halog: add a parameter to limit output line count ++ ++Sometimes it's useful to limit the output to a number of lines, for ++example when output is already sorted (eg: 10 slowest URLs, ...). Now ++we can use -m for this. ++(cherry picked from commit 667c905fe5153a8754bd8177c80dd9e6c245a0b0) ++[ this patch introduces a but that is fixed by commit a1629a59 ] ++--- ++ contrib/halog/halog.c | 28 ++++++++++++++++++++++++---- ++ 1 files changed, 24 insertions(+), 4 deletions(-) ++ ++diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c ++index 3912807..7e16cd5 100644 ++--- a/contrib/halog/halog.c +++++ b/contrib/halog/halog.c ++@@ -121,6 +121,7 @@ const char *line; ++ int linenum = 0; ++ int parse_err = 0; ++ int lines_out = 0; +++int lines_max = -1; ++ ++ const char *fgets2(FILE *stream); ++ ++@@ -138,7 +139,7 @@ void usage(FILE *output, const char *msg) ++ fprintf(output, ++ "%s" ++ "Usage: halog [-h|--help] for long help\n" ++- " halog [-q] [-c]\n" +++ " halog [-q] [-c] [-m ]\n" ++ " {-cc|-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt}\n" ++ " [-s ] [-e|-E] [-H] [-rt|-RT
]: [, ...] tr ++ bind [
]: [, ...] id ++ bind [
]: [, ...] name ++ bind [
]: [, ...] defer-accept +++bind [
]: [, ...] accept-proxy ++ Define one or several listening addresses and/or ports in a frontend. ++ May be used in sections : defaults | frontend | listen | backend ++ no | yes | yes | no ++@@ -1419,6 +1420,19 @@ bind [
]: [, ...] de ++ with front firewalls which would see an established ++ connection while the proxy will only see it in SYN_RECV. ++ +++ accept-proxy is an optional keyword which enforces use of the PROXY +++ protocol over any connection accepted by this listener. The +++ PROXY protocol dictates the layer 3/4 addresses of the +++ incoming connection to be used everywhere an address is used, +++ with the only exception of "tcp-request connection" rules +++ which will only see the real connection address. Logs will +++ reflect the addresses indicated in the protocol, unless it is +++ violated, in which case the real address will still be used. +++ This keyword combined with support from external components +++ can be used as an efficient and reliable alternative to the +++ X-Forwarded-For mechanism which is not always reliable and +++ not even always usable. +++ ++ It is possible to specify a list of address:port combinations delimited by ++ commas. The frontend will then listen on all of these addresses. There is no ++ fixed limit to the number of addresses and ports which can be listened on in ++@@ -1429,8 +1443,10 @@ bind [
]: [, ...] de ++ listen http_proxy ++ bind :80,:443 ++ bind 10.0.0.1:10080,10.0.0.1:10443 +++ bind 127.0.0.1:8443 accept-proxy ++ ++- See also : "source". +++ See also : "source", "option forwardfor" and the PROXY protocol +++ documentation. ++ ++ ++ bind-process [ all | odd | even | ] ... ++@@ -7231,7 +7247,9 @@ marked with a star ('*') after the field ++ ++ Detailed fields description : ++ - "client_ip" is the IP address of the client which initiated the TCP ++- connection to haproxy. +++ connection to haproxy. Note that when the connection is accepted on a +++ socket configured with "accept-proxy" and the PROXY protocol is correctly +++ used, then the logs will reflect the forwarded connection's information. ++ ++ - "client_port" is the TCP port of the client which initiated the connection. ++ ++@@ -7404,7 +7422,9 @@ with a star ('*') after the field name b ++ ++ Detailed fields description : ++ - "client_ip" is the IP address of the client which initiated the TCP ++- connection to haproxy. +++ connection to haproxy. Note that when the connection is accepted on a +++ socket configured with "accept-proxy" and the PROXY protocol is correctly +++ used, then the logs will reflect the forwarded connection's information. ++ ++ - "client_port" is the TCP port of the client which initiated the connection. ++ ++--- a/include/common/standard.h +++++ b/include/common/standard.h ++@@ -269,6 +269,28 @@ static inline unsigned int __strl2uic(co ++ return i; ++ } ++ +++/* This function reads an unsigned integer from the string pointed to by +++ * and returns it. The pointer is adjusted to point to the first unread +++ * char. The function automatically stops at . +++ */ +++static inline unsigned int __read_uint(const char **s, const char *end) +++{ +++ const char *ptr = *s; +++ unsigned int i = 0; +++ unsigned int j, k; +++ +++ while (ptr < end) { +++ j = *ptr - '0'; +++ k = i * 10; +++ if (j > 9) +++ break; +++ i = k + j; +++ ptr++; +++ } +++ *s = ptr; +++ return i; +++} +++ ++ extern unsigned int str2ui(const char *s); ++ extern unsigned int str2uic(const char *s); ++ extern unsigned int strl2ui(const char *s, int len); ++@@ -276,6 +298,7 @@ extern unsigned int strl2uic(const char ++ extern int strl2ic(const char *s, int len); ++ extern int strl2irc(const char *s, int len, int *ret); ++ extern int strl2llrc(const char *s, int len, long long *ret); +++extern unsigned int read_uint(const char **s, const char *end); ++ unsigned int inetaddr_host(const char *text); ++ unsigned int inetaddr_host_lim(const char *text, const char *stop); ++ unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret); ++--- a/include/proto/client.h +++++ b/include/proto/client.h ++@@ -25,6 +25,7 @@ ++ #include ++ #include ++ +++int frontend_decode_proxy_request(struct session *s, struct buffer *req, int an_bit); ++ void get_frt_addr(struct session *s); ++ int event_accept(int fd); ++ ++--- a/include/types/buffers.h +++++ b/include/types/buffers.h ++@@ -135,16 +135,16 @@ ++ * The field is blanked by buffer_init() and only by analysers themselves ++ * afterwards. ++ */ ++-#define AN_REQ_INSPECT 0x00000001 /* inspect request contents */ ++-#define AN_REQ_WAIT_HTTP 0x00000002 /* wait for an HTTP request */ ++-#define AN_REQ_HTTP_PROCESS_FE 0x00000004 /* process the frontend's HTTP part */ ++-#define AN_REQ_SWITCHING_RULES 0x00000008 /* apply the switching rules */ ++-#define AN_REQ_HTTP_PROCESS_BE 0x00000010 /* process the backend's HTTP part */ ++-#define AN_REQ_HTTP_INNER 0x00000020 /* inner processing of HTTP request */ ++-#define AN_REQ_HTTP_TARPIT 0x00000040 /* wait for end of HTTP tarpit */ ++-#define AN_REQ_HTTP_BODY 0x00000080 /* inspect HTTP request body */ ++-#define AN_REQ_STICKING_RULES 0x00000100 /* table persistence matching */ ++-/* unused: 0x200 */ +++#define AN_REQ_DECODE_PROXY 0x00000001 /* take the proxied address from a 'PROXY' line */ +++#define AN_REQ_INSPECT 0x00000002 /* inspect request contents */ +++#define AN_REQ_WAIT_HTTP 0x00000004 /* wait for an HTTP request */ +++#define AN_REQ_HTTP_PROCESS_FE 0x00000008 /* process the frontend's HTTP part */ +++#define AN_REQ_SWITCHING_RULES 0x00000010 /* apply the switching rules */ +++#define AN_REQ_HTTP_PROCESS_BE 0x00000020 /* process the backend's HTTP part */ +++#define AN_REQ_HTTP_INNER 0x00000040 /* inner processing of HTTP request */ +++#define AN_REQ_HTTP_TARPIT 0x00000080 /* wait for end of HTTP tarpit */ +++#define AN_REQ_HTTP_BODY 0x00000100 /* inspect HTTP request body */ +++#define AN_REQ_STICKING_RULES 0x00000200 /* table persistence matching */ ++ #define AN_REQ_PRST_RDP_COOKIE 0x00000400 /* persistence on rdp cookie */ ++ #define AN_REQ_HTTP_XFER_BODY 0x00000800 /* forward request body */ ++ ++--- a/include/types/protocols.h +++++ b/include/types/protocols.h ++@@ -72,6 +72,7 @@ ++ #define LI_O_FOREIGN 0x0002 /* permit listening on foreing addresses */ ++ #define LI_O_NOQUICKACK 0x0004 /* disable quick ack of immediate data (linux) */ ++ #define LI_O_DEF_ACCEPT 0x0008 /* wait up to 1 second for data before accepting */ +++#define LI_O_ACC_PROXY 0x0010 /* find the proxied address in the first request line */ ++ ++ /* The listener will be directly referenced by the fdtab[] which holds its ++ * socket. The listener provides the protocol-specific accept() function to ++--- a/src/cfgparse.c +++++ b/src/cfgparse.c ++@@ -1467,6 +1467,16 @@ int cfg_parse_listen(const char *file, i ++ #endif ++ } ++ +++ if (!strcmp(args[cur_arg], "accept-proxy")) { /* expect a 'PROXY' line first */ +++ struct listener *l; +++ +++ for (l = curproxy->listen; l != last_listen; l = l->next) +++ l->options |= LI_O_ACC_PROXY; +++ +++ cur_arg ++; +++ continue; +++ } +++ ++ if (!strcmp(args[cur_arg], "name")) { ++ struct listener *l; ++ ++@@ -1519,7 +1529,7 @@ int cfg_parse_listen(const char *file, i ++ continue; ++ } ++ ++- Alert("parsing [%s:%d] : '%s' only supports the 'transparent', 'defer-accept', 'name', 'id', 'mss' and 'interface' options.\n", +++ Alert("parsing [%s:%d] : '%s' only supports the 'transparent', 'accept-proxy', 'defer-accept', 'name', 'id', 'mss' and 'interface' options.\n", ++ file, linenum, args[0]); ++ err_code |= ERR_ALERT | ERR_FATAL; ++ goto out; ++@@ -5732,6 +5742,9 @@ out_uri_auth_compat: ++ listener->handler = process_session; ++ listener->analysers |= curproxy->fe_req_ana; ++ +++ if (listener->options & LI_O_ACC_PROXY) +++ listener->analysers |= AN_REQ_DECODE_PROXY; +++ ++ /* smart accept mode is automatic in HTTP mode */ ++ if ((curproxy->options2 & PR_O2_SMARTACC) || ++ (curproxy->mode == PR_MODE_HTTP && ++--- a/src/client.c +++++ b/src/client.c ++@@ -22,6 +22,7 @@ ++ ++ #include ++ #include +++#include ++ #include ++ ++ #include ++@@ -43,6 +44,191 @@ ++ #include ++ ++ +++/* This analyser tries to fetch a line from the request buffer which looks like : +++ * +++ * "PROXY" PROTO SRC3 DST3 SRC4 "\r\n" +++ * +++ * There must be exactly one space between each field. Fields are : +++ * - PROTO : layer 4 protocol, which must be "TCP4" or "TCP6". +++ * - SRC3 : layer 3 (eg: IP) source address in standard text form +++ * - DST3 : layer 3 (eg: IP) destination address in standard text form +++ * - SRC4 : layer 4 (eg: TCP port) source address in standard text form +++ * - DST4 : layer 4 (eg: TCP port) destination address in standard text form +++ * +++ * This line MUST be at the beginning of the buffer and MUST NOT wrap. +++ * +++ * Once the data is fetched, the values are set in the session's field and data +++ * are removed from the buffer. The function returns zero if it needs to wait +++ * for more data (max: timeout_client), or 1 if it has finished and removed itself. +++ */ +++int frontend_decode_proxy_request(struct session *s, struct buffer *req, int an_bit) +++{ +++ char *line = req->data; +++ char *end = req->data + req->l; +++ int len; +++ +++ DPRINTF(stderr,"[%u] %s: session=%p b=%p, exp(r,w)=%u,%u bf=%08x bl=%d analysers=%02x\n", +++ now_ms, __FUNCTION__, +++ s, +++ req, +++ req->rex, req->wex, +++ req->flags, +++ req->l, +++ req->analysers); +++ +++ if (req->flags & (BF_READ_ERROR|BF_READ_TIMEOUT)) +++ goto fail; +++ +++ len = MIN(req->l, 6); +++ if (!len) +++ goto missing; +++ +++ /* Decode a possible proxy request, fail early if it does not match */ +++ if (strncmp(line, "PROXY ", len) != 0) +++ goto fail; +++ +++ line += 6; +++ if (req->l < 18) /* shortest possible line */ +++ goto missing; +++ +++ if (!memcmp(line, "TCP4 ", 5) != 0) { +++ u32 src3, dst3, sport, dport; +++ +++ line += 5; +++ +++ src3 = inetaddr_host_lim_ret(line, end, &line); +++ if (line == end) +++ goto missing; +++ if (*line++ != ' ') +++ goto fail; +++ +++ dst3 = inetaddr_host_lim_ret(line, end, &line); +++ if (line == end) +++ goto missing; +++ if (*line++ != ' ') +++ goto fail; +++ +++ sport = read_uint((const char **)&line, end); +++ if (line == end) +++ goto missing; +++ if (*line++ != ' ') +++ goto fail; +++ +++ dport = read_uint((const char **)&line, end); +++ if (line > end - 2) +++ goto missing; +++ if (*line++ != '\r') +++ goto fail; +++ if (*line++ != '\n') +++ goto fail; +++ +++ /* update the session's addresses and mark them set */ +++ ((struct sockaddr_in *)&s->cli_addr)->sin_family = AF_INET; +++ ((struct sockaddr_in *)&s->cli_addr)->sin_addr.s_addr = htonl(src3); +++ ((struct sockaddr_in *)&s->cli_addr)->sin_port = htons(sport); +++ +++ ((struct sockaddr_in *)&s->frt_addr)->sin_family = AF_INET; +++ ((struct sockaddr_in *)&s->frt_addr)->sin_addr.s_addr = htonl(dst3); +++ ((struct sockaddr_in *)&s->frt_addr)->sin_port = htons(dport); +++ s->flags |= SN_FRT_ADDR_SET; +++ +++ } +++ else if (!memcmp(line, "TCP6 ", 5) != 0) { +++ u32 sport, dport; +++ char *src_s; +++ char *dst_s, *sport_s, *dport_s; +++ struct in6_addr src3, dst3; +++ +++ line+=5; +++ +++ src_s = line; +++ dst_s = sport_s = dport_s = NULL; +++ while (1) { +++ if (line > end - 2) { +++ goto missing; +++ } +++ else if (*line == '\r') { +++ *line = 0; +++ line++; +++ if (*line++ != '\n') +++ goto fail; +++ break; +++ } +++ +++ if (*line == ' ') { +++ *line = 0; +++ if (!dst_s) +++ dst_s = line+1; +++ else if (!sport_s) +++ sport_s = line+1; +++ else if (!dport_s) +++ dport_s = line+1; +++ } +++ line++; +++ } +++ +++ if (!dst_s || !sport_s || !dport_s) +++ goto fail; +++ +++ sport = read_uint((const char **)&sport_s,dport_s-1); +++ if ( *sport_s != 0 ) +++ goto fail; +++ +++ dport = read_uint((const char **)&dport_s,line-2); +++ if ( *dport_s != 0 ) +++ goto fail; +++ +++ if (inet_pton(AF_INET6, src_s, (void *)&src3) != 1) +++ goto fail; +++ +++ if (inet_pton(AF_INET6, dst_s, (void *)&dst3) != 1) +++ goto fail; +++ +++ /* update the session's addresses and mark them set */ +++ ((struct sockaddr_in6 *)&s->cli_addr)->sin6_family = AF_INET6; +++ memcpy(&((struct sockaddr_in6 *)&s->cli_addr)->sin6_addr, &src3, sizeof(struct in6_addr)); +++ ((struct sockaddr_in6 *)&s->cli_addr)->sin6_port = htons(sport); +++ +++ ((struct sockaddr_in6 *)&s->frt_addr)->sin6_family = AF_INET6; +++ memcpy(&((struct sockaddr_in6 *)&s->frt_addr)->sin6_addr, &dst3, sizeof(struct in6_addr)); +++ ((struct sockaddr_in6 *)&s->frt_addr)->sin6_port = htons(dport); +++ s->flags |= SN_FRT_ADDR_SET; +++ } +++ else { +++ goto fail; +++ } +++ +++ /* remove the PROXY line from the request */ +++ len = line - req->data; +++ buffer_replace2(req, req->data, line, NULL, 0); +++ req->total -= len; /* don't count the header line */ +++ +++ req->analysers &= ~an_bit; +++ return 1; +++ +++ missing: +++ if (!(req->flags & (BF_SHUTR|BF_FULL))) { +++ buffer_dont_connect(s->req); +++ return 0; +++ } +++ /* missing data and buffer is either full or shutdown => fail */ +++ +++ fail: +++ buffer_abort(req); +++ buffer_abort(s->rep); +++ req->analysers = 0; +++ +++ s->fe->counters.failed_req++; +++ if (s->listener->counters) +++ s->listener->counters->failed_req++; +++ +++ if (!(s->flags & SN_ERR_MASK)) +++ s->flags |= SN_ERR_PRXCOND; +++ if (!(s->flags & SN_FINST_MASK)) +++ s->flags |= SN_FINST_R; +++ return 0; +++} +++ ++ /* Retrieves the original destination address used by the client, and sets the ++ * SN_FRT_ADDR_SET flag. ++ */ ++--- a/src/proto_http.c +++++ b/src/proto_http.c ++@@ -4127,7 +4127,8 @@ void http_end_txn_clean_session(struct s ++ if (s->rep->lr >= s->rep->data + s->rep->size) ++ s->rep->lr -= s->req->size; ++ ++- s->req->analysers |= s->fe->fe_req_ana; +++ s->req->analysers = s->fe->fe_req_ana; +++ s->req->analysers &= ~AN_REQ_DECODE_PROXY; ++ s->rep->analysers = 0; ++ ++ http_silent_debug(__LINE__, s); ++@@ -7670,7 +7671,6 @@ void http_reset_txn(struct session *s) ++ http_init_txn(s); ++ ++ s->be = s->fe; ++- s->req->analysers = s->listener->analysers; ++ s->logs.logwait = s->fe->to_log; ++ s->srv = s->prev_srv = s->srv_conn = NULL; ++ /* re-init store persistence */ ++--- a/src/session.c +++++ b/src/session.c ++@@ -1055,6 +1055,12 @@ resync_stream_interface: ++ while (ana_list && max_loops--) { ++ /* Warning! ensure that analysers are always placed in ascending order! */ ++ +++ if (ana_list & AN_REQ_DECODE_PROXY) { +++ if (!frontend_decode_proxy_request(s, s->req, AN_REQ_DECODE_PROXY)) +++ break; +++ UPDATE_ANALYSERS(s->req->analysers, ana_list, ana_back, AN_REQ_DECODE_PROXY); +++ } +++ ++ if (ana_list & AN_REQ_INSPECT) { ++ if (!tcp_inspect_request(s, s->req, AN_REQ_INSPECT)) ++ break; ++--- a/src/standard.c +++++ b/src/standard.c ++@@ -569,6 +569,11 @@ unsigned int strl2uic(const char *s, int ++ return __strl2uic(s, len); ++ } ++ +++unsigned int read_uint(const char **s, const char *end) +++{ +++ return __read_uint(s, end); +++} +++ ++ /* This one is 7 times faster than strtol() on athlon with checks. ++ * It returns the value of the number composed of all valid digits read, ++ * and can process negative numbers too. +diff --git a/feeds/packages/net/haproxy/patches/0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff b/feeds/packages/net/haproxy/patches/0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff +new file mode 100644 +index 0000000..dcab974 +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/0010-OPTIM-halog-keep-a-fast-path-for-the-lines-cou-1.4.22.diff +@@ -0,0 +1,54 @@ ++From c998e6347e6e6940263157fb341a8444d789aa5f Mon Sep 17 00:00:00 2001 ++From: Willy Tarreau ++Date: Tue, 3 Jan 2012 09:23:03 +0100 ++Subject: OPTIM: halog: keep a fast path for the lines-count only ++ ++[ note: this backport is not absolutely required for 1.4 but it eases ++ further backports ] ++ ++Using "halog -c" is still something quite common to perform on logs, ++but unfortunately since the recent added controls, it was sensibly ++slowed down due to the parsing of the accept date field. ++ ++Now we use a specific loop for the case where nothing is needed from ++the input, and this sped up the line counting by 2.5x. A 2.4 GHz Xeon ++now counts lines at a rate of 2 GB of logs per second. ++ ++(cherry picked from commit e1a908c369ab988448c6672066ad1d09b6919d02) ++--- ++ contrib/halog/halog.c | 12 +++++++++++- ++ 1 files changed, 11 insertions(+), 1 deletions(-) ++ ++diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c ++index 4e3cfc4..3912807 100644 ++--- a/contrib/halog/halog.c +++++ b/contrib/halog/halog.c ++@@ -702,6 +702,16 @@ int main(int argc, char **argv) ++ posix_fadvise(0, 0, 0, POSIX_FADV_SEQUENTIAL); ++ #endif ++ +++ if (!line_filter && +++ !(filter & (FILT_HTTP_ONLY|FILT_TIME_RESP|FILT_ERRORS_ONLY|FILT_HTTP_STATUS|FILT_QUEUE_ONLY|FILT_QUEUE_SRV_ONLY|FILT_TERM_CODE_NAME))) { +++ /* read the whole file at once first */ +++ if (!filter_invert) +++ while (fgets2(stdin) != NULL) +++ lines_out++; +++ +++ goto skip_filters; +++ } +++ ++ while ((line = fgets2(stdin)) != NULL) { ++ linenum++; ++ time_field = NULL; accept_field = NULL; ++@@ -859,7 +869,7 @@ int main(int argc, char **argv) ++ lines_out++; /* we're just counting lines */ ++ } ++ ++- +++ skip_filters: ++ /***************************************************** ++ * Here we've finished reading all input. Depending on the ++ * filters, we may still have some analysis to run on the ++-- ++1.7.1 ++ +diff --git a/feeds/packages/net/haproxy/patches/0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff b/feeds/packages/net/haproxy/patches/0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff +new file mode 100644 +index 0000000..d1bb4d8 +--- /dev/null ++++ b/feeds/packages/net/haproxy/patches/0011-MINOR-halog-add-a-parameter-to-limit-output-li-1.4.22.diff +@@ -0,0 +1,134 @@ ++From 9f03ab8e3ec603f2aed944a7887bcdf7be52009a Mon Sep 17 00:00:00 2001 ++From: Willy Tarreau ++Date: Wed, 10 Oct 2012 16:49:28 +0200 ++Subject: MINOR: halog: add a parameter to limit output line count ++ ++Sometimes it's useful to limit the output to a number of lines, for ++example when output is already sorted (eg: 10 slowest URLs, ...). Now ++we can use -m for this. ++(cherry picked from commit 667c905fe5153a8754bd8177c80dd9e6c245a0b0) ++[ this patch introduces a but that is fixed by commit a1629a59 ] ++--- ++ contrib/halog/halog.c | 28 ++++++++++++++++++++++++---- ++ 1 files changed, 24 insertions(+), 4 deletions(-) ++ ++diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c ++index 3912807..7e16cd5 100644 ++--- a/contrib/halog/halog.c +++++ b/contrib/halog/halog.c ++@@ -121,6 +121,7 @@ const char *line; ++ int linenum = 0; ++ int parse_err = 0; ++ int lines_out = 0; +++int lines_max = -1; ++ ++ const char *fgets2(FILE *stream); ++ ++@@ -138,7 +139,7 @@ void usage(FILE *output, const char *msg) ++ fprintf(output, ++ "%s" ++ "Usage: halog [-h|--help] for long help\n" ++- " halog [-q] [-c]\n" +++ " halog [-q] [-c] [-m ]\n" ++ " {-cc|-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt}\n" ++ " [-s ] [-e|-E] [-H] [-rt|-RT
OperationMilliseconds/Operation" << (g_hertz ? "Megacycles/Operation" : "") << endl; ++ ++ cout << "\n
OperationMilliseconds/Operation" << (g_hertz ? "Megacycles/Operation" : "") << endl; ++ ++ cout << "\n
++ ++ ++
++ ++ ++ ++ ++ ++ ++ +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/.svn/text-base/wiviz.js.svn-base b/feeds/packages/net/wiviz/files/www/wiviz/.svn/text-base/wiviz.js.svn-base +new file mode 100644 +index 0000000..dc67d8f +--- /dev/null ++++ b/feeds/packages/net/wiviz/files/www/wiviz/.svn/text-base/wiviz.js.svn-base +@@ -0,0 +1,291 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++var mv = 353; ++var stupid = eval('window.attachEvent') ? 1 : 0; ++var hosts; ++var idle_timeout = 20; ++var erase_timeout = 35; ++var skew_x = 0; skew_y = 0; ++var listening = 1; ++var wiviz_cgi_url = "/cgi-bin/wiviz/get.cgi"; ++ ++//What? You mean the POSIX thread API hasn't been ported to Javascript? Bugger. ++function scan_thread() { ++ var loc = document.getElementById('wivizGetFrame').contentWindow.location; ++ if (!listening) return; ++ if (loc.href != wiviz_cgi_url) { ++ loc.replace(wiviz_cgi_url); ++ } ++ else { ++ loc.reload(true); ++ } ++ setTimeout("scan_thread()", 5000); ++} ++ ++function toggleListen() { ++ statusel = document.getElementById('status'); ++ statusbutton = document.getElementById('togglelisten'); ++ listening = 1 - listening; ++ if (listening) { ++ statusel.innerHTML = "Monitoring"; ++ statusbutton.value = "Stop monitoring"; ++ document.getElementById('content').innerHTML = ''; ++ scan_thread(); ++ } ++ else { ++ statusel.innerHTML = "Stopped"; ++ statusbutton.value = "Start monitoring"; ++ } ++} ++ ++function channelSet() { ++ channelset = document.getElementById('channelsel').value; ++ if (channelset == 'hop') { ++ document.getElementById('hopoptions').style.display = 'inline'; ++ } ++ else { ++ document.getElementById('hopoptions').style.display = 'none'; ++ if (channelset != 'nochange') document.forms[0].submit(); ++ } ++} ++ ++function mousenter(e) { ++ if (stupid) e = event; ++ el = stupid ? e.srcElement : e.currentTarget; ++ el.parentNode.parentNode.className = 'hostdiv_hov'; ++ el.nextSibling.nextSibling.nextSibling.style.visibility = 'visible'; ++} ++ ++function mouseout(e) { ++ if (stupid) e = event; ++ el = stupid ? e.srcElement : e.currentTarget; ++ el.parentNode.parentNode.className = 'hostdiv'; ++ el.nextSibling.nextSibling.nextSibling.style.visibility = 'hidden'; ++} ++ ++function generate_mnemonic(hash) { ++ c = new Array('b','c','d','f','g','h','j','k','l','m','n','p','qu','r','s', ++ 't','v','w','y','z','th','ch','sh','cc','rr'); ++ v = new Array('a','e','i','o','u','ae','ai','ao','au','eo','ei','eu','iu','oa','oe'); ++ var i, a; ++ var p = hash & 1; ++ var n = ''; ++ for (i = 0; i < 4; i++) { ++ a = p ? c : v; ++ n += a[hash % a.length]; ++ hash += a.length << 3 + a.length / 2; ++ hash *= hash; ++ p = 1 - p; ++ } ++ return n; ++} ++ ++function mkhash(mac) { ++ var macarr = mac.split(/:/); ++ var hash = 0; ++ for (j = 0; j < 6; j++) { ++ hash += parseInt(macarr[j]) * j << j; ++ hash += 11; ++ } ++ if (hash < 0) hash = -hash; ++ return hash; ++} ++ ++function wiviz_callback(mhosts, cfgstring) { ++ var nh = ''; ++ hosts = mhosts; ++ for (i = 0; i < hosts.length; i++) { ++ hs = hosts[i]; ++ if (hs.length == 0) break; ++ hs.mac = hs[0]; ++ hs.rssi = hs[1]; ++ hs.desc = hs[2]; ++ hs.descarr = hs.desc.split(/-/) ++ hs.age = hs[3]; ++ hs.hash = mkhash(hs.mac); ++ hs.mnem = generate_mnemonic(hs.hash) ++ hs.name = hs.mnem; ++ el = document.getElementById(hs.mnem); ++ if (el) { ++ if (hs.age > erase_timeout) { ++ el.parentNode.removeChild(el); ++ continue; ++ } ++ el.innerHTML = genHTML(hs); ++ } ++ else { ++ if (hs.age > erase_timeout) continue; ++ hs.x = Math.sin(hs.hash / mv) * hs.rssi * 2 - 67; ++ hs.y = Math.cos(hs.hash / mv) * hs.rssi * 2; ++ nh += "

"; ++ } ++ } ++ document.getElementById('content').innerHTML += nh; ++ ++ cfgarr = cfgstring.split(/-/); ++ if (cfgarr[1]) { ++ if (cfgarr[1] == 'hopping') cfgarr[1] = 'hop'; ++ document.getElementById('channelsel').value = cfgarr[1]; ++ if (cfgarr[1] == 'hop') channelSet(); ++ } ++ ++ //repip(); ++ setTimeout("declump(); repip();", 250); ++} ++ ++function repip() { ++ var nh = ""; ++ if (!hosts) return; ++ for (i = 0; i < hosts.length; i++) { ++ hs = hosts[i]; ++ if (hs.length == 0) break; ++ mac = hs[0]; ++ rssi = hs[1]; ++ desc = hs[2].split(/-/); ++ if (desc[0] == 'sta' && desc[1] == 'assoc') { ++ bss = desc[2]; ++ hs.apmnem = generate_mnemonic(mkhash(bss)); ++ ap = document.getElementById(hs.apmnem); ++ sta = document.getElementById(hs.mnem); ++ if (ap && sta) { ++ x = parseInt(sta.style.left); ++ y = parseInt(sta.style.top); ++ dx = parseInt(ap.style.left) - x; ++ dy = parseInt(ap.style.top) - y; ++ x += 67; ++ y += 10; ++ d = Math.sqrt(dx*dx+dy*dy); ++ for (j = 0; j < d; j += 15) { ++ nh += ""; ++ } ++ } ++ } ++ } ++ document.getElementById('pips').innerHTML = nh; ++} ++ ++function declump() { ++ var c = 0; ++ var top = 30000,left = 30000,right = -30000,bottom = -30000; ++ for (i = 0; i < hosts.length; i++) { ++ for (j = 0; j < hosts.length; j++) { ++ if (i == j) continue; ++ e1 = document.getElementById(hosts[i].mnem); ++ e2 = document.getElementById(hosts[j].mnem); ++ if (!e1 || !e2) continue; ++ x1 = parseInt(e1.style.left); ++ x2 = parseInt(e2.style.left); ++ y1 = parseInt(e1.style.top); ++ y2 = parseInt(e2.style.top); ++ if (x1 < left) left = x1; ++ if (y1 < top) top = y1; ++ if (x1 > right) right = x1; ++ if (y1 > bottom) bottom = y1; ++ ox = x2; ++ oy = y2; ++ dist = Math.sqrt(Math.pow((x1-x2), 2) + Math.pow((y1-y2), 2)); ++ if (dist == 0) { ++ x2 += Math.random() * 5; ++ y2 += Math.random() * 5; ++ dist = 10; ++ } ++ if (dist < 100) { ++ cx = (x1-x2) * 5 / (dist / 3); ++ cy = (y1-y2) * 5 / (dist / 3); ++ x2 -= cx; ++ y2 -= cy; ++ } ++ if (hosts[j].apmnem == hosts[i].mnem ++ || hosts[i].apmnem == hosts[j].mnem) { ++ cx = (x1-x2) * 5 / (dist / 3); ++ cy = (y1-y2) * 5 / (dist / 3); ++ if (dist > 150) { ++ x2 += cx; ++ y2 += cy; ++ } ++ } ++ if (Math.abs(ox-x2) > 2 || Math.abs(oy-y2) > 2) { ++ e2.style.left = parseInt(x2); ++ e2.style.top = parseInt(y2); ++ c++; ++ } ++ } ++ } ++ if (top < bottom && left < right) { ++ document.getElementById('debug').innerHTML = left + "," + right + "," + top + "," +bottom; ++ document.getElementById('content').style.left = ++ document.getElementById('pips').style.left = ++ -(right - left) / 2 - left - 67; ++ document.getElementById('content').style.top = ++ document.getElementById('pips').style.top = ++ -(bottom - top) / 2 - top - 25; ++ } ++ repip(); ++ if (c) setTimeout("declump()", 100); ++} ++ ++function genHTML(hs) { ++ var nh = ''; ++ nh += "

" + hs.mac + "
'" + hs.name; ++ nh += "'"; ++ if (hs.channel) { ++ nh += " ch" + hs.channel; ++ } ++ nh += "
"; ++ if (a[0] == 'ap') nh += "Access point"; ++ if (a[0] == 'sta') nh += "Station"; ++ if (a[0] == 'adhoc') nh += "Logical ad-hoc entity"; ++ if (a[0] == 'ap' || a[0] == 'adhoc') { ++ nh += "
"; ++ if (a[5] == '?enc') nh += "Encryption unknown"; ++ if (a[5] == 'enc') nh += "Encrypted"; ++ if (a[5] == 'unenc') nh += "Unencrypted"; ++ if (a[6] == 'wep') nh += "-WEP"; ++ if (a[6] == 'wpa') nh += "-WPA"; ++ } ++ nh += "
RSSI: " + hs.rssi + " dBm
" ++ + "Seen " + hs.age + " seconds ago
"; ++ nh += "
"; ++ return nh; ++} +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/adhoc-idle.gif b/feeds/packages/net/wiviz/files/www/wiviz/adhoc-idle.gif +new file mode 100755 +index 0000000000000000000000000000000000000000..05e479f78bed9f924ccdc093afe0ee94158d44ed +GIT binary patch +literal 332 +zcmV-S0ki%`Nk%w1VKM+R0K@hY%Z-IFWY}8JstsRTLJYHejSl +z7!#;At4a?Y5U(|{Nfa2iHL8&h91?JWqz@XWSW2~25*!!2l?@Ob9U2wa6&f26&^k{K +e6WA5p-EmaIP3h|E?CtLF@bU8V^!4^SApkpU)sKz< + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/adhoc-idle.png b/feeds/packages/net/wiviz/files/www/wiviz/adhoc-idle.png +new file mode 100755 +index 0000000000000000000000000000000000000000..b10b102ec9fc7e6ad2fadb6de7a27e4ca51064ac +GIT binary patch +literal 730 +zcmV<00ww*4P)l&H6vzLsVoa1uW=R$^WlEH;u#}06DnR(!O +z-Zzu^OA+Gx{sj?Du(6FC$3d-DOWR=>B97y2ZaO9_V=N>Hf+J?W%Wfyvb!0_>v$>UoBmdR$aRreDn*Pm&(F`DY`b2suk}AYJwXV8D2jIW$;=%9Kk~+6 +zv?9#h)X$FNpjxe_eNsw{$KzZggb*O2TEE|S^TuK%gov8@St$jjRN8lce~-mtk;|V> +z1WA(A^2TDcwX)3Ta}0;WH03@%KIXEQQsUs?pz!>q3DLxH{MNf-D^kk8X1ZN5O}{fk +z`;<72)AXDqNp8QUhyBjPKFf4EO@(-#_dBn>>5AMM+5=c7iYSV3a&l7Gr;(6KrBaHJ +zhldBauB*?;zZY_Kbrmu5z{H1A3PK2+pPz%7!=i<{!KdS)NGR=E+)pR<=Xf%T3IJ!RT6glLY(k@onJBgGMqtOV!>pKasyq74Y +z&}y|%tyX8u+%ypZ?B}Z6)1`}23Sk&xKA*3Rb6r>0Wp~VMv=W-Ve0;dMx%te@*8rM$ +z{qX^-Gu0!a!D?$7vlk(nAPA0#=u`H$BuQpvtboO0u~;k?i^Y!|NnnuV`Cu6Km(xolZBCiL771ZWH!i83~Ub$Of2xwk?KFO +zr08Uh)%*)9O1#!at-rCR?DX5J{SP)&_~`kwH#SPy8gMhd{vqYicKZFRk5P#)TmDHG +zF(zgUD%5w#mN&V4}hN;6Q85e*+th2Wc%0CWU^cb38UK +WI@&E^oOS2K#>L0`6=nndYYhO(uccxD + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/adhoc.png b/feeds/packages/net/wiviz/files/www/wiviz/adhoc.png +new file mode 100755 +index 0000000000000000000000000000000000000000..57db25c28a95ebefeaebb9ffe5c44bd081caf14d +GIT binary patch +literal 714 +zcmV;*0yX`KP)W7!zoT&%kg+*%f7VJ4Bq?RAmq +zg&L1Uv=l&NhLT0w2T=)WXMMjX6{yu2km*DJxXIpZy^;6+anaeJ=k@4x+|Q=F{m +z&cjHEE7keVjr|VK#2vugq^wTq7~U`&SBgn=&fr`aP67J>_=Fd`YDTahq1tZ0kE{9K@xQ(J~*}iWm_cwL^>1TUsu( +zh3u%;1D`Ax62zw(ZdTj3>59}Z@6rc;7?*AiIuh(4m~g!pyHih?v{|19qRhLb^FPK4^ocp*@wpC;oE^{G24 +zl?er#s&SBKc{@&WNq*?W$-s;QPsi)0>D$GB>Z#jF9BNV&RN?%e4-miA6{-wunyy5` +wl?X|2r8?GqZ%T!_uRx2%VzF2(7K_D*UmNVr>*VI!-v9sr07*qoM6N<$f|Dp!RR910 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/ap-idle.gif b/feeds/packages/net/wiviz/files/www/wiviz/ap-idle.gif +new file mode 100755 +index 0000000000000000000000000000000000000000..a9296961126dba336d6d7497a0046391ce7bc904 +GIT binary patch +literal 812 +zcmZ?wbhEHbG-5Dfc*ejmefsoi)22;H#N7kwzYS3c6Imk_VrJg +zIBD{fsne#WQeCvTU73%Ajg^g)S4do5OLu*%Iv+bT +z0|O%qC!eUa(w==y+Jc;ij~rp;7Lrg<)79ChD|e9T$`NKRfnBP1_Gybge9Z9lx%^9m +zed=QTm)>8yaZA^5uiMlE3W<%4na3uCUQl2<$}M%*ZSI2v#zRajtXX$YJ#B31lCV%J +z^I~*rZsp(;(@9wHiiurNJ?6p<#Yw{4Lh@!YD-0GcXXTM`+A^u}u=@c&osbC}7ZaP? +zc%&?91QL^2d8BPBDvB3AV&N22Jk+Pr*u>f+W!-S1;2M)#x2Q&^-yDaDO-H#U&C34V +zc<2+*EoqdnM?xmqtyjjj;f=+s*Oz%^%yMk5U3~05VL~nE#*T@H+xz7m>Rwb#{3)#v^|v%C2Hg@fMW{&V+~KAOVB$Y2cs(m)5Y + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/ap-idle.png b/feeds/packages/net/wiviz/files/www/wiviz/ap-idle.png +new file mode 100755 +index 0000000000000000000000000000000000000000..a6e6fb3202556994679a960597c983ac8d135397 +GIT binary patch +literal 814 +zcmV+}1JV46P)3`ER47LQ(Iu)V)D2;GiA5r8j7S +z43hZQp`l_29*R&wgn}-Em!IL7YoF5)Ao|^*!CvZ%ZaE-kD5*f?-jIk5O7_`<+ +zQc6K7)zq=pLP`mxR8z+RxumrQ5uN#X@!o#j8R6D|d#AN-K(y8yFfMl>>)7vDSX`@#3{cT)b4* +z^+u|y3T0VtK^G2!#A7rtD~jT$kB?TO-;0Zj4@9)A>l#GVoZe3B +zTkZOk5<(zN(?wAfAALQv5;Wf3-TfGiM*C3|y(`NSN~vZ#ts8fvptVMlBuLZrswj$2 +zZFp$)K9XhGB@taoDN&Xsq?7=#5%CHku(!8&Pejw3o13p~_1*dnG0*e9wRQ|(OhhNo +z%dNFjB3iU{p>leatFBX?=XSMPHP5G~r;H#N7kwzYS3c6Imk_VrJg +zIBD{fsne#WQeCvTU73%Ajg^g)S4do5OLu*%Iv+bT +z0|O%qC!eUa(w==y+Jc;ij~rp;7Lrg<)79ChD|e9T$`NKRfnBP1_Gybge9Z9lx%^9m +zed=QTm)>8yaZA^5uiMlE3W<%4na3uCUQl2<$}M%*ZSI2v#zRajtXX$YJ#B31lCV%J +z^I~*rZsp(;(@9wHiiurNJ?6p<#Yw{4Lh@!YD-0GcXXTM`+A^u}u=@c&osbC}7ZaP? +zc%&?91QL^2d8BPBDvB3AV&N22Jk+Pr*u>f+W!-S1;2M)#x2Q&^-yDaDO-H#U&C34V +zc<2+*EoqdnM?xmqtyjjj;f=+s*Oz%^%yMk5U3~05VL~nE#*T@H+xz7m>Rwb#{3)#v^|v%C2Hg@fMW{&V+~KAOVB$Y2cs(m)5Y + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/ap-wep-idle.png b/feeds/packages/net/wiviz/files/www/wiviz/ap-wep-idle.png +new file mode 100755 +index 0000000000000000000000000000000000000000..a6e6fb3202556994679a960597c983ac8d135397 +GIT binary patch +literal 814 +zcmV+}1JV46P)3`ER47LQ(Iu)V)D2;GiA5r8j7S +z43hZQp`l_29*R&wgn}-Em!IL7YoF5)Ao|^*!CvZ%ZaE-kD5*f?-jIk5O7_`<+ +zQc6K7)zq=pLP`mxR8z+RxumrQ5uN#X@!o#j8R6D|d#AN-K(y8yFfMl>>)7vDSX`@#3{cT)b4* +z^+u|y3T0VtK^G2!#A7rtD~jT$kB?TO-;0Zj4@9)A>l#GVoZe3B +zTkZOk5<(zN(?wAfAALQv5;Wf3-TfGiM*C3|y(`NSN~vZ#ts8fvptVMlBuLZrswj$2 +zZFp$)K9XhGB@taoDN&Xsq?7=#5%CHku(!8&Pejw3o13p~_1*dnG0*e9wRQ|(OhhNo +z%dNFjB3iU{p>leatFBX?=XSMPHP5G~rLh1t?N)UMJavJmaWw_xnyinl#J9Rgm{TI +z(IVbX2yMzjl4BPmBa%i+5wEk%lyD;iVWmxPH(URS{j|?N@Z3Gmea>Hq2n2>>G4--~?vHrn#;;-)ETdn@M6n{NyTidam3 +z|6aDRApB$S!k8o`^V>TXi)DX*e{XMZcXxMZXJ>nRduwZJb92*VGHq;Z7>&lYwYAmN +z)s>Z%<>h6A!LYQnw79tV`t|FDg$2D{KQ}iwJ3Bi)Jv}uwH90vsF)^Xj>Bh&$$HvA+ +zM@L`1dNndKGCVx2)oO=^hBO+DTCG;8R7$0?zrSChQ1tcn_4fAm^z_K(^6u{LuC6Yb +zOeU2|B@#(zXJ_Uzfyr%zj3TU%OMghF9+b8}NulRzM7 +zY;0_3XsEBRudA!8t*x!8sp0ea)z#HiRaKRhm5(1kuBfQs@pz9OJ$m@?VR?Buhr=l= +zD=R4}DK0K%v)L>bD?dM<$z(DZjJ&+O2M-?5>Ga&(+?<>o8jY5not>4Hm6@5Dk&%&} +zo=&AwQ&Uq@Qc@@s3YknMkw`=$@#M*q2M7OF`G5a~0h|Q}0e}sBKEOVF0w4~64bq(; +z5hx1~cK9T%q)Ej_AB(IHv;{8;9WghP(rj@<9Moz28qF+JmBT_JV1h|6%{g}~87GL# +z9jyyEf+y(WAtTkth#m;MIo8cLG-*H-5_SN%X(%c^mneFuH0s#`+}|0Y9(|6mm&pmse0(7igJE`ArD= +z^QnS}vfe=I`iVhxsp~xT;_6qCpS*nXJB|!^=TN?)U@aVd${Y;0MW?InZWKeXSD~(2 +zJ{_v?W7!00&4+M~fjR)Szaob@Bt4Nfk*^_HSJR+-_tfYwOblo#UgoXD#ND+$>{jqA +zVVQb^>5ax+!^VZ76K``3rS{Q_haGS69%y6~}+qj-0$CO`M332Fk>UGGRJW#uXA0gVeZ4Sc!Q9fc!P6yBN=%ej?N&t#TbL%+}T%zN;i^0B#YlnjO0Be +zlF#^nD2trrz1PQb6Nqw(D7TQDLh>b&?yu)aavjMTqFhJiT%E1^>pN~b-$s8?ZlQ9< +z=F$Y7mpDBE1UW+v2mtAk8h!KrACy4`blI(TZ27w%ZCc{4nI&G?|b}NdK*|lp|sK39TJ$v@Bd-rat)hd-r +zg@uI$?%cV$1@(M~oE@ktB!24`epj{zL)DIYf-? +z+_^J8IyxHg`~4`2LPtjj9UUFCx3{Ax3azcJ_FeHAnlk_EyDvKwrFG5<5So5$mcA3l88-`3V<6ST-)xpIZ8 +zSFdvI+BK%9r@49aCLWImkH>=$0wDzZ_wNUYjg5^Bnv4=an1ac{2}zcDLcnajt&xx* +z|00LLPt763xLN(CkPH~f?eqB}LqkLMFd>Yz%jfgt^LY*(I>gztXYu>}JbwIm!(@u0 +zuw%y#JRXlhY@FLbj=$N9x(;JugJA!CsSrOoGqjVglObd}2w0KQbv@MI-;b{A_EW7^ +zsaC7_d_Dm7?b}DST4iWxi23<>dz_Tgep*{w-J~U1J|pK?KWZZJ;^*w#d6SPnUbMy6YBk#1+Z)or$b}%7mt&G5s?E=ZdLah+Uf|#E +z(9s~Ax~|WbN+p*FDJ9iv6@YK|R%mZ;L6@K?l5cf&Q!X37wZvP3n!t~9L9KGA*TL0< +zJ4XaY*>D69?qtGR9l3r0c)i}-!omWYrco-DD3waAuCB7Wy4s8w`Mg9?6f{k<#gs}V +zq?GQhyq?(W@1@D@7i|%1Yir!SdzY@( +z#;g4K=aPYe0W?iR(=^KEGA~}dKnRg>3=8tEz2Z5CxPZ;0E+UO`B+J|QkreO}0=qoP +z0s%(Ik|hpCp(v$H-@ku9GCVwNZZ6TVbkZ%=o>kpLpRV^+n$hhR4bsYx|W-CFbYnSzKI9 +zr&6i&j%bAW9kXB-juw8!2LOBs7?E +zwOTE4@7_J0J$vRN-blpK(h_rXa})}NL@Je9?=2)521u}n1V#Z_bj)oy}iA3b#>Xdx324~tgNuSyv*|Q +za;{pf#wI2voXyh+f&k-$FbmX@__n$Z?Vak{~IEW25q% +z#pvWNIe(_AYPXa!0z`xm^+z~T%9s!$Z8uczInQCN_&QNzyXBBXNRgnvPkAM*FDMTf +zu|EK~?XT?BRaKP-4<581RaNCC=5_mxa-Ap_?Jp@!(EQ_rkxVhZOPY7g4*<@4r7pCu +z4Nku*CjdXcB@JeI-vo_ot#zm8k%ak(2!fv1!}Kd4$t5HijH5PQe^NQoJR<8bI>tAP +zSLVgbBLY^a&%biqe+!$Oe=`yJpTM?|t%hwOTMgSnwi>pDY&C2P*=pDpvemFHWUFCY +f$X3JujgbEUE)R2=gkRs*00000NkvXXu0mjf(9*hj + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/ap.gif b/feeds/packages/net/wiviz/files/www/wiviz/ap.gif +new file mode 100755 +index 0000000000000000000000000000000000000000..7eb5b3a6bb5234b9822b2a01e0eddb3169cd1cf4 +GIT binary patch +literal 1468 +zcmeH`c{AI20EfQ_rA0#Psw<&ut!itvW7%yrLC{ub!y0y4x~Z8MmKkx3?FuH5#4(bV +zsyf2>MZ|r@vF?&Y4p+sI4pntm)RmZVuBqL=iT!IoZ{V4Ep85FP^LBN6>I|I0ApqbE +z03`ss0LTFl0MG(J1puW0&;UpSARGV!I6XZ*IXO8#K0Z1+Iy^i)I5^nf-{0HYQ>j!+ +zrE+(7cV}m3dwY9pYio0Jb7Nyep-`-^udl7Gt*)-FtgI|AFE1@EEiNuDEG&Hd_;G%I +zer|5={rmT`v$HcZGwuYfDQDkH>3nZfPD|>N9J}A#%>$5NHBDCWM^%U;0>_k_ +zUAaZR#`1M~Tqhmt4vorYeOqM}am)C=|uCFLA42Op&GVgEhWgaCZyWG!c{1#~Qe +zPu06oPgXzwT{BWc|1MGmGsZ(~c0`a4O-|HMv0(;x7I9Qv=TSUWA8j$=WfYpD660Ma +zO+$jL&)>>4eqdohgWuj75W+o?OE9CynYm(1^+&-gq)-u7YWd4;Hq6l5G}g<|5ACmM +z@)S~OAvJ0a=Zah$(1DTZ2!Yrr&`V8J9uSyIHwlB5(yg|6A`}H@Y>z`mKjYDjp*R)R +zG`w1sZsk`SjD#X8FL6;W{31-cX&3_|Hv7E|t3T%z8s5sZPN?U5o5xJ^GLXTR +z;##JX`zHeBy78%&JDxZrL(&tX8hrZgDr-DGB#q!Yvj|rS9rWbvobHSHbJy=#4sBlV +zgU@E)z@F?}_3!`U0V59R>-jl(YFYbT?>Tfx#tHQAjuHp8fA&)eK0PTx3|?+x#Y(hd +TKk%fN^OAW(mpJt}H2CQswVNTv + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/ap.png b/feeds/packages/net/wiviz/files/www/wiviz/ap.png +new file mode 100755 +index 0000000000000000000000000000000000000000..ccfc86431c5669cdf583f9be708d23b37a5384c9 +GIT binary patch +literal 1825 +zcmV++2j2LJP) +z|DJo!J!fEuA>JS)*WcjWlSpQdLeUbEd(1QQ{gr)7XiOrRL9+S%$VlErBKd;%NV3TS +z?;f3%hd`1=lH5bGh~z6Iliy8|WEII0NmkLg(IcDu?urM_w^v`1duS{M0<577S8IQhZ4PNF)1iaWPP_)0X{)7{8?iL=ZeZ43Sl!!~zM6$ZeObMwLGi +z1LEYl1CUH67cXACn3|iLi%d*R;PrYDLLj9?*LB+MHqB;}Mx#NkR^#s7yR5CPmGk-h +zFBGpVA&HSA0u&JZ)#Vkyl9gOC`o)O3;xTemkc5Ha9@!^Ufr>(6_SC6U>AAVNNH`oO +z6bdmmHpbZ47^9=3ghC;L!61P^fIuL?*w`3XuU_TSrAyIdGI>kWG&{~R2x9z`5|HSz +ztN_G$MX`^pZ?MOKGXEh46v)-F`(Ql>qjKYf2kk{V<<$-lQnD+DS{c?fj}T};lc&yF(HKO_aKBq +zAx@k)fyd)94a;&LsPGSK;Z&Fl8wKZgUm{^DmTOmBnIUE=h}fR$cDu3Z>1n#%t}{BF +zjx%&!$1n^!oeqX!xSo?zIwKeix{a2U_=1XcJ*)g*0U|&ZEF1e0v0wTZASv%52vr0z +zOCcVQCptMf=`!5TPOVmpR;%S)x7%%WU3W;?#0OpmsSlrP$h+ +zh~PdFxC(sk4kpaii6M6rfY(`BBFwr^T`6VZ(W6H+ +z8V!epJ=8eqN5)PF8yg!{!!Qbf-Au)J->M$eno2rnh@FBDAYvYd1=N&iDlGDQE1M+E +z4A<>;)6btjuReSB%n9;-B>ItQwOYJ-^@?`8onBd4u?On!AcU))5zC?;Z +zgkM{yr@P@*V*11E!~3ZNOe4=E|4&9Z@T=Q;O^kQ04(6p%)^HddGX?f +z%kX|AwzjrdTU(=At!DE1{BCa{De_}7oF#)D}#i+1c4)dwZMh?d?jZ(@8BaFRRVd +zEP@DGVwg$gSB^~MI+6?@k>(_6ORg5P`*w({K!pXWNTTEw#b)JM#_Z&7tFLLAHYue{ +z00|*PZwg0BnG!-2oQBFh=MBsi-!;_SZWSa6@?_}kQx1gv1?4fb&IbUu{J>sa(=>Vc +z@?~denkEl1uUl`DRg&CtzN8Gm;ExYxFs1kz1>Uwk0I26mk86(%s$PxjK$s6HfK}cP +zKyQiCtMn$4I3JKe@S~%#^jjduZ6rmoPWhfprDCv0c42mmZx#o}#r_@v+toJ@eC~(B +zA?H7gNB$=;By!v^By!v^By!v^By!v^By!v^By!v^By!v^By!yFe?#OOx4X)2eI!jG +P00000NkvXXu0mjf4Ax%f + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/pip-idle.gif b/feeds/packages/net/wiviz/files/www/wiviz/pip-idle.gif +new file mode 100755 +index 0000000000000000000000000000000000000000..fa923bdf162888c0df687cfd53cc96ef0b9ba2a4 +GIT binary patch +literal 190 +zcmZ?wbhEHbnkfO%gf74OG}H2it_XGb8>PrGc*7H +z|IdH~6o0ZXGB8Lp=zzpPb~3P9KTzvSIjQsF&=id%8O@y{jS5E|6*06-T+r+8XXvm* +kY=ZZ@8MAz*ondt|>hdx&Vn3RB(Zy?a*Jn<>ZYKt70J>FCssI20 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/pip-idle.png b/feeds/packages/net/wiviz/files/www/wiviz/pip-idle.png +new file mode 100755 +index 0000000000000000000000000000000000000000..3fe25fe333553b289a11a54d04a9a4c7f5b51e78 +GIT binary patch +literal 331 +zcmV-R0kr;!P)aCk08sqFf1hxm`?9 +zNCN$)^XEI~eCHhaC&bZ6lH|@9vl2qQPYK4DjSwRAeg7BWc9Po&AzmEEK}w0%n!2tT +z8{7l0rwK`tya5}}^RR6jtu+8?nocK$K@fc1jDG04F0SjMl%gz4@;pD0hhab|6;35R +zDy3+ehN`OA@AtDs`@W|v%ZJ$xUDuIi+1bmqZHsN&030Q4&oW0eO@owjdnz!-#Fxms +z-43laj^o5I|HJ3ua0siaLP`mMQi`tYST2{VD2hI21pw>y`l%?2*s`qWG4!)oEMnjH +dzpqKYia)m{a|fqo=sf@c002ovPDHLkV1lhjlN0~| + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/pip.gif b/feeds/packages/net/wiviz/files/www/wiviz/pip.gif +new file mode 100755 +index 0000000000000000000000000000000000000000..1c566e9aa2d2085ed1c5f71a544fe470c39e19ef +GIT binary patch +literal 190 +zcmZ?wbhEHb-|G|I(2`K(# +zVPs&CX3znNf$U^pwSJ)1mm-Gv$S`kff80i(xBdH?_b + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/pip.png b/feeds/packages/net/wiviz/files/www/wiviz/pip.png +new file mode 100755 +index 0000000000000000000000000000000000000000..5c05a737ae4ac87ecadf78df815281fc6663e270 +GIT binary patch +literal 323 +zcmV-J0lfZ+P)(3`2IR2+|(_KcIi$E=$0ys;V_C +zfm}mF#zoMUE*Sz|b@SfmocEl2;g6E);F_RqFhfDSCSWk3Aik2`8^CJgE)?YCkPbF2 +zGBl4Qlnpk3(>lR5!37ZBbB2QjK!)assF~#}xxB3s{ByQ(ueNY-CiV36bar;Owzf7kHPzSGS5{V*mX;P373JsW=j7yMW@e_P +zr6naL#mC1-Mn(n&1^M{+czSxexw+Zf+gn;%8XFrM85#Zm|DS;xK=CIFBLjm5gAT|r +zke?XX{yR)5@X(R!Ke43fWRBJR3oA;z)<&(rv8L?w+p7H!HdOfN&EC0u^2;2PsdiI^ +zqG!k@DoOFC=a$v0iOQ=rixnl8mP@HL_b65;)-^QsOi^o%>!|3SI#oqNJ$ho}oF&Z? +zDp6_*0?U`Ko3|iRRX}y!HklQXYE|3TsY-2(P}#C~sf==zy2Rw8bLK}W3Z7jeuXu9t +z<*DZ*6+~~|y0%MD@%}1N0r{+hA?osCH{}Hdn-s-GrQ{T6*92_-y;RlWgz%T;huHX} +z3_=zNG&-^JUCrW+N@`+m3zty{QTTqGiJg^|iASS=;UE*AjGRTp%LPsDogQ8m6Fg2% +zX69C8^7}9&!J*;*dN^PBjt4`jmNcj)0F@wmzJq(7tAo&HQD*| +z^NY)~<0BhcIM3+1pGh;SvpxOk`9kmeKeC^;2z)jzbmEXJNSIOkq>`nHQ?9|ZzbM4O +niK&t8(Dr*3ovbrXDRk9t;GfUD`-)M!z?2M&N1YMCLQ +zH`#^W(yqLzvWZr&?aO%M0n-V&Xi}lcbs`~0(~PDI+Y^7uaa`4KLBEYg8qGQHb3R_3 +z8Npa%jWyO-V~sV|SYwU#Gm|nZL*;ULPEnLa;E|#z8&b-ulgUg@PU8Fi$eehd$E{npa9wxa +zvaCOQp4T6l@qHc62#TUCJC1`8V$^={JP*sVGEo#Qj@&rMK!9h>W^5$LoN9xFN +zoCBMS`#-oN)e#UW<$GY+w(XIF9O(a*m5JjY%*@QVA3l6o6hh$p{z$gsY&OfCJ9n@w +zi&m?J@B8zXW&PGP&3VhRels&ObHy}G-oAbN{-QokowX{J%3lhF!joJs$Li|pg#q&U +zeB5tRN*u?*G)-n_XGx_}_`Xl4(}`dAgSG+eL{U^%6vZ7325use*x0X@uLCKU%X3$* +zT-jJySm4Er7hjbXRaGgKN^xl(0Oa%ec=TztT7+SUs;a1}il%8yOiYkUrReo~gkgy1 +zd2~9R7&Hh1fcie<#$YhmP!wh7;5K3C7%znQrx2o+PN&Z`Z>7^|3WWm2ViDi>ky7G$ +zUJTIfcJY0mow=+0``$0<7Btj$AJq@goDLJckkpSoG-oepb8~Y{PEH>2(QGyef&kz5 +zv2FVRZbM30KG7ownwgn#-@SYH0W)hc)I-X#bE8jS{u-b +z$L8iH0JU0;?d|Ou&-4Cx=8aXQQu$Y{R?Bs}U8Iyp&Y7l3sZ=7D%dxe!6`wB@3S_g{ +zz37L#_*I?Oz0Zq3F8x&-^B*2sXRj=SARr7wW@l$fCO==(>2!GY>J^^nQ7V<<-dkB& +zK}xAio@#wxilQt@DW5%l{5Vc!Hk+kXDxvE-j^ptB`Evk-5a_y&=Xq?mex!A8n%2GR +zgsIbAoB$xePX>68O{U)LqBgdEmHm&>uRun+^b+wIS5JqrY&QmOp( +z@ZrOZs;VTDNmNyh4ePqj_3PJ}o}S)oP7S=@nfSMjq4rM8!13#*-t;K_$zf`03MnO; +zrXhsDvaBQ7ab0%@SYBIOJG->@LB6#tYpGVNVcRy2q(M+KL#*O6T>iYUH8+7!%Uwf{{K|+W~2tm8uj<-==*GZ?-7={raCzDCS +zFr?S(5d;DK{@#$Q>pF%pJX^4L-y)^NG)->bzKy170P#lB?RM*f!C-0FhGCG)2%_8CW@jZMNyW&G+%u+NV#0j0=YyYF&{-yMp2X+kOAh?=`@`t$z}fiFxF-1zv-!< +UzT-5&xc~qF07*qoM6N<$f;oeKE&u=k + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/station.gif b/feeds/packages/net/wiviz/files/www/wiviz/station.gif +new file mode 100755 +index 0000000000000000000000000000000000000000..c8a075f4200ea05bbffbe1ebddfb65ab61c4227e +GIT binary patch +literal 929 +zcmV;S177?`Nk%w1VKM+R0M!5h05kssGx7#ARlatt%f4>P|RGnpJS +zj2|<9CNpL!Gg&M%OfNG(VsB|P|Cu)Rl{xE@KiG^$#f40=e^01`2^ASJ`d%mV0E&nPj58EIW01K4+Lxk~uFZF)=fgk3^!Gn<^|eJPZ#lo_!ugid3biF**+l0ssj(tArtk +zB%?~2HnOw~1OV0m0k^rlhp$b)sKUh8g=XyM@G0Rud2pg=(jhYJ=lYT(epqpp;OI^xYkz+lIWwX~wKkTE013l=L- +ztY9&t=Z?CplJJ=EqO3du4s^^o!2(BG6)k3Dpb%jK1q&B6%$Q-KgzFM4LO%w}u*8l7 +z)&eBR{Gvn)9DYI1z%U_#@#7UZ#8C12HH#cNT0}0=FrXoOq4mhF{myi;#Sb^hB_8Dq=veAfdc@07HHQ`u87t8A^b@0cASiz=CV-(N=^_HB`vLU>j7RVFc&7AfSs8SO5VHIqcBe +zfwY)dL|r<>;93hW5T-!}7F0mNdCY~j+G;U)w%LIRI>^rqH{`%W4mZruf`lo=_QDIy +zHTPN!JKTVRYxYxx)DGyZcu&5W1RcJ$@CGdb|ri=&y84shjD(kF81OWg$ +DNjHN2 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/station.png b/feeds/packages/net/wiviz/files/www/wiviz/station.png +new file mode 100755 +index 0000000000000000000000000000000000000000..8daf8df35abb3d9d3fa957748a0846dafb6e93cf +GIT binary patch +literal 2476 +zcmV;d2~+loP)?{99XTghf$3_ZV-oV +zZ!7g+538UgeOLm6Qg_LdVT-Z{>t)w*kjJnf%?%B@t)?40k+7?~N@ovNR4bDI#ctAv +zd|xczd+zW2KEL1jo%=f%p6j`u>)Ais$rECX-;e;UDrG;6Y^z@o!o?U0SpbHZ<{kV% +z7C48(Cr`zXebpPBCBq#ixz4|sK(dVF{Ihneza%3_LR*f>aGpt)`6F*3xryZBQ}S*X +zlDya6tz^5%PxKx424|UMncsF`-g?TOZlet6$uQC0vEFJ!UGJNvHyL4)Wj^UFv;NTA +z$hBvuHhjJ#nO +zC;J+hEo!XnocH@C;Dauruc#x9x%foS>VEkdoxrRV||A^fkMCMd$esvwu*kSSY)LRHfN|X +zj)P8+93prXUDvnHN`{XSm}E$!knCJv@5>g*aS2#K>4Mx;eKWGt=-a%F&6%!eD~$7* +zb(wfvLsivuB9S<|u&~gtDV)Jz3P*~54cN)6&5jxk=_YJ56GkFODTJzKRY|S +zA^Ly7LGNp@i4Thmb8|UHM@Px$^V86$yKR!k#Wauy63_+#keK`%h!NfuNHUo`;c~gA +zcN_i9RN?0g)vo~H^ZCL;hzY|mKI|Iw0e6|i#K4ar(FLopz(4TwGZMQ3ak*UCP$-m0 +zr_;NN{#LTcU>NTrgdm^KPXQnH8MZ))a2sT!R(3m|3!v3%O-A1ndIl+&JOsesbv?%ga$JC&*GOmA5<*-b9UVYh(9&saPx$i^b5?B8OPoi(LTf2y7>g<2VEY +zfp997>OBc6JlHD)z`&y)mSx@2H0_+<@An@#aDe-^#e|ehR5T9jtTN`+>#iK?oo +zs*2C&V_;wakH^F6>MG4<6U(xw)oLA3$8li2FI$mPF0@*$1w~O-9zkx}#tR{?3n9{8 +zub0^yrA@Py{pK3>s7B?~*UtB3bgoM9nuV_hs;c5R4$WqhW51#2dDK-DWy&y&ORvBFI>q7@e9lh@g+j#RX*5lvR4Q@#@?`*o5NMi)Wm(*= +z+@o@8h{~y>G(G*N=mEgNb~{+F2RZcF8fxJ-FTeaUjYfmT#YKw6BH?hD@$vBvV6|HP +z+Sjc>+F4mXbLNa+RaM+>H>#?33~QRk(W6Hh8X8(JP9Io54q_h-BuA)tcJm^U|)qYjyp<5o&2^X-mMZAj;)3`FtLL)2B~&>Y!XMQz#Uu +zR;y-v)9H6q-aW|U3IqZK0s+F|@Dl;5s)}J4*tU%jqO)A9)hdNTfpWRrDde5_v!kVz +zN~M-{UH5C6hTH8X7!0DS>bA>eGr(%K%H6wniN#_FA#l6h)M~X(J0qo>QWRx+yZ&m| +zAjxDh1cY5KS3*kZR}>}9`UiuA*XzaS^RW>U=q!=Vl*{GFWHMca+-Ni|NhzluFXVj# +z*-D#00;E+{Mbk8VK3@k`RaJCdCzo6QfM*y6j^k`u$WH}iD+wV6Tdh{Y<#L6klwn0t +q60B!34Irg7rIhFP0`OelR{bBXvzd#1Uw6p>0000 ++ ++ ++Wi-viz wireless network environment visualization ++ ++ ++ ++ ++

OpenWRT Wi-viz network visualization

++
++Status: Monitoring
++ ++

++Channel setting: ++
++
++
++
++
++
++ ++ ++
++
++
++ ++ ++ ++ ++ +diff --git a/feeds/packages/net/wiviz/files/www/wiviz/wiviz.js b/feeds/packages/net/wiviz/files/www/wiviz/wiviz.js +new file mode 100755 +index 0000000..dc67d8f +--- /dev/null ++++ b/feeds/packages/net/wiviz/files/www/wiviz/wiviz.js +@@ -0,0 +1,291 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++var mv = 353; ++var stupid = eval('window.attachEvent') ? 1 : 0; ++var hosts; ++var idle_timeout = 20; ++var erase_timeout = 35; ++var skew_x = 0; skew_y = 0; ++var listening = 1; ++var wiviz_cgi_url = "/cgi-bin/wiviz/get.cgi"; ++ ++//What? You mean the POSIX thread API hasn't been ported to Javascript? Bugger. ++function scan_thread() { ++ var loc = document.getElementById('wivizGetFrame').contentWindow.location; ++ if (!listening) return; ++ if (loc.href != wiviz_cgi_url) { ++ loc.replace(wiviz_cgi_url); ++ } ++ else { ++ loc.reload(true); ++ } ++ setTimeout("scan_thread()", 5000); ++} ++ ++function toggleListen() { ++ statusel = document.getElementById('status'); ++ statusbutton = document.getElementById('togglelisten'); ++ listening = 1 - listening; ++ if (listening) { ++ statusel.innerHTML = "Monitoring"; ++ statusbutton.value = "Stop monitoring"; ++ document.getElementById('content').innerHTML = ''; ++ scan_thread(); ++ } ++ else { ++ statusel.innerHTML = "Stopped"; ++ statusbutton.value = "Start monitoring"; ++ } ++} ++ ++function channelSet() { ++ channelset = document.getElementById('channelsel').value; ++ if (channelset == 'hop') { ++ document.getElementById('hopoptions').style.display = 'inline'; ++ } ++ else { ++ document.getElementById('hopoptions').style.display = 'none'; ++ if (channelset != 'nochange') document.forms[0].submit(); ++ } ++} ++ ++function mousenter(e) { ++ if (stupid) e = event; ++ el = stupid ? e.srcElement : e.currentTarget; ++ el.parentNode.parentNode.className = 'hostdiv_hov'; ++ el.nextSibling.nextSibling.nextSibling.style.visibility = 'visible'; ++} ++ ++function mouseout(e) { ++ if (stupid) e = event; ++ el = stupid ? e.srcElement : e.currentTarget; ++ el.parentNode.parentNode.className = 'hostdiv'; ++ el.nextSibling.nextSibling.nextSibling.style.visibility = 'hidden'; ++} ++ ++function generate_mnemonic(hash) { ++ c = new Array('b','c','d','f','g','h','j','k','l','m','n','p','qu','r','s', ++ 't','v','w','y','z','th','ch','sh','cc','rr'); ++ v = new Array('a','e','i','o','u','ae','ai','ao','au','eo','ei','eu','iu','oa','oe'); ++ var i, a; ++ var p = hash & 1; ++ var n = ''; ++ for (i = 0; i < 4; i++) { ++ a = p ? c : v; ++ n += a[hash % a.length]; ++ hash += a.length << 3 + a.length / 2; ++ hash *= hash; ++ p = 1 - p; ++ } ++ return n; ++} ++ ++function mkhash(mac) { ++ var macarr = mac.split(/:/); ++ var hash = 0; ++ for (j = 0; j < 6; j++) { ++ hash += parseInt(macarr[j]) * j << j; ++ hash += 11; ++ } ++ if (hash < 0) hash = -hash; ++ return hash; ++} ++ ++function wiviz_callback(mhosts, cfgstring) { ++ var nh = ''; ++ hosts = mhosts; ++ for (i = 0; i < hosts.length; i++) { ++ hs = hosts[i]; ++ if (hs.length == 0) break; ++ hs.mac = hs[0]; ++ hs.rssi = hs[1]; ++ hs.desc = hs[2]; ++ hs.descarr = hs.desc.split(/-/) ++ hs.age = hs[3]; ++ hs.hash = mkhash(hs.mac); ++ hs.mnem = generate_mnemonic(hs.hash) ++ hs.name = hs.mnem; ++ el = document.getElementById(hs.mnem); ++ if (el) { ++ if (hs.age > erase_timeout) { ++ el.parentNode.removeChild(el); ++ continue; ++ } ++ el.innerHTML = genHTML(hs); ++ } ++ else { ++ if (hs.age > erase_timeout) continue; ++ hs.x = Math.sin(hs.hash / mv) * hs.rssi * 2 - 67; ++ hs.y = Math.cos(hs.hash / mv) * hs.rssi * 2; ++ nh += "
"; ++ nh += genHTML(hs) + "
"; ++ } ++ } ++ document.getElementById('content').innerHTML += nh; ++ ++ cfgarr = cfgstring.split(/-/); ++ if (cfgarr[1]) { ++ if (cfgarr[1] == 'hopping') cfgarr[1] = 'hop'; ++ document.getElementById('channelsel').value = cfgarr[1]; ++ if (cfgarr[1] == 'hop') channelSet(); ++ } ++ ++ //repip(); ++ setTimeout("declump(); repip();", 250); ++} ++ ++function repip() { ++ var nh = ""; ++ if (!hosts) return; ++ for (i = 0; i < hosts.length; i++) { ++ hs = hosts[i]; ++ if (hs.length == 0) break; ++ mac = hs[0]; ++ rssi = hs[1]; ++ desc = hs[2].split(/-/); ++ if (desc[0] == 'sta' && desc[1] == 'assoc') { ++ bss = desc[2]; ++ hs.apmnem = generate_mnemonic(mkhash(bss)); ++ ap = document.getElementById(hs.apmnem); ++ sta = document.getElementById(hs.mnem); ++ if (ap && sta) { ++ x = parseInt(sta.style.left); ++ y = parseInt(sta.style.top); ++ dx = parseInt(ap.style.left) - x; ++ dy = parseInt(ap.style.top) - y; ++ x += 67; ++ y += 10; ++ d = Math.sqrt(dx*dx+dy*dy); ++ for (j = 0; j < d; j += 15) { ++ nh += ""; ++ } ++ } ++ } ++ } ++ document.getElementById('pips').innerHTML = nh; ++} ++ ++function declump() { ++ var c = 0; ++ var top = 30000,left = 30000,right = -30000,bottom = -30000; ++ for (i = 0; i < hosts.length; i++) { ++ for (j = 0; j < hosts.length; j++) { ++ if (i == j) continue; ++ e1 = document.getElementById(hosts[i].mnem); ++ e2 = document.getElementById(hosts[j].mnem); ++ if (!e1 || !e2) continue; ++ x1 = parseInt(e1.style.left); ++ x2 = parseInt(e2.style.left); ++ y1 = parseInt(e1.style.top); ++ y2 = parseInt(e2.style.top); ++ if (x1 < left) left = x1; ++ if (y1 < top) top = y1; ++ if (x1 > right) right = x1; ++ if (y1 > bottom) bottom = y1; ++ ox = x2; ++ oy = y2; ++ dist = Math.sqrt(Math.pow((x1-x2), 2) + Math.pow((y1-y2), 2)); ++ if (dist == 0) { ++ x2 += Math.random() * 5; ++ y2 += Math.random() * 5; ++ dist = 10; ++ } ++ if (dist < 100) { ++ cx = (x1-x2) * 5 / (dist / 3); ++ cy = (y1-y2) * 5 / (dist / 3); ++ x2 -= cx; ++ y2 -= cy; ++ } ++ if (hosts[j].apmnem == hosts[i].mnem ++ || hosts[i].apmnem == hosts[j].mnem) { ++ cx = (x1-x2) * 5 / (dist / 3); ++ cy = (y1-y2) * 5 / (dist / 3); ++ if (dist > 150) { ++ x2 += cx; ++ y2 += cy; ++ } ++ } ++ if (Math.abs(ox-x2) > 2 || Math.abs(oy-y2) > 2) { ++ e2.style.left = parseInt(x2); ++ e2.style.top = parseInt(y2); ++ c++; ++ } ++ } ++ } ++ if (top < bottom && left < right) { ++ document.getElementById('debug').innerHTML = left + "," + right + "," + top + "," +bottom; ++ document.getElementById('content').style.left = ++ document.getElementById('pips').style.left = ++ -(right - left) / 2 - left - 67; ++ document.getElementById('content').style.top = ++ document.getElementById('pips').style.top = ++ -(bottom - top) / 2 - top - 25; ++ } ++ repip(); ++ if (c) setTimeout("declump()", 100); ++} ++ ++function genHTML(hs) { ++ var nh = ''; ++ nh += "

" + hs.mac + "
'" + hs.name; ++ nh += "'"; ++ if (hs.channel) { ++ nh += " ch" + hs.channel; ++ } ++ nh += "
"; ++ if (a[0] == 'ap') nh += "Access point"; ++ if (a[0] == 'sta') nh += "Station"; ++ if (a[0] == 'adhoc') nh += "Logical ad-hoc entity"; ++ if (a[0] == 'ap' || a[0] == 'adhoc') { ++ nh += "
"; ++ if (a[5] == '?enc') nh += "Encryption unknown"; ++ if (a[5] == 'enc') nh += "Encrypted"; ++ if (a[5] == 'unenc') nh += "Unencrypted"; ++ if (a[6] == 'wep') nh += "-WEP"; ++ if (a[6] == 'wpa') nh += "-WPA"; ++ } ++ nh += "
RSSI: " + hs.rssi + " dBm
" ++ + "Seen " + hs.age + " seconds ago
"; ++ nh += "
"; ++ return nh; ++} +diff --git a/feeds/packages/net/wiviz/src/.svn/entries b/feeds/packages/net/wiviz/src/.svn/entries +new file mode 100644 +index 0000000..a897c2a +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/entries +@@ -0,0 +1,266 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wiviz/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wl_access.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++76f286c8a412da983e5b5ef36b1b75ae ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1676 ++ ++channelhopper.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++ab15ef7016e0fc2976a03298e6213911 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1351 ++ ++wiviz.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++6b2ff9fc631253ac6df16b935067d3e9 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++17144 ++ ++wl_access.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++86858fe491d98d8a2de70c80413529b5 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2300 ++ ++channelhopper.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++c6fc593807dd1b99a84f963303432095 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++705 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++2030fb4f6e140751d1f194ed49c2acbb ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++824 ++ ++structs.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++e94ef2293ceb6d3eaec0f1be5aa8b5c9 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3336 ++ +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/channelhopper.c.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/channelhopper.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/channelhopper.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/channelhopper.h.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/channelhopper.h.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/channelhopper.h.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/structs.h.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/structs.h.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/structs.h.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/wiviz.c.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/wiviz.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/wiviz.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/wl_access.c.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/wl_access.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/wl_access.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/prop-base/wl_access.h.svn-base b/feeds/packages/net/wiviz/src/.svn/prop-base/wl_access.h.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/prop-base/wl_access.h.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6f23035 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,25 @@ ++## Wi-viz makefile ++# Supply your own C cross-compiler; I recommend the one from the OpenWRT buildroot ++# Also requires a libpcap to link with, use libpcap.a for static, .so for shared ++CC=~/buildroot/staging_dir_mipsel/bin/mipsel-linux-gcc ++LDFLAGS=-L~/buildroot/staging_dir_mipsel/lib ++LIBS=-lpcap ++ ++CCOPTS=-O2 -Os -pipe -mips32 -mtune=mips32 ++INCLUDE=-I~/buildroot/staging_dir_mipsel/include ++SOURCES=wiviz.c wl_access.c channelhopper.c ++OBJS=wiviz.o wl_access.o channelhopper.o ++TARGET=wiviz ++ ++wiviz: ${OBJS} ++ ${CC} ${CCOPTS} ${INCLUDE} -o ${TARGET} ${OBJS} ${LDFLAGS} ${LIBS} ++ ++wiviz.o: wiviz.c ++ ${CC} ${CCOPTS} ${INCLUDE} -c ${SOURCES} ++wl_access.o: wl_access.c ++ ${CC} ${CCOPTS} ${INCLUDE} -c ${SOURCES} ++channelhopper.o: channelhopper.c ++ ${CC} ${CCOPTS} ${INCLUDE} -c ${SOURCES} ++ ++remake: ++ touch wiviz.c wl_access.c channelhopper.c +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/channelhopper.c.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/channelhopper.c.svn-base +new file mode 100644 +index 0000000..0a3e6fe +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/channelhopper.c.svn-base +@@ -0,0 +1,48 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++#include ++#include "wl_access.h" ++#include "channelhopper.h" ++#include "structs.h" ++ ++void ch_sig_handler(int i) { ++ ++ } ++ ++void channelHopper(wiviz_cfg * cfg) { ++ int hopPos; ++ int nc; ++ ++ //Turn off signal handling from parent process ++ signal(SIGUSR1, &ch_sig_handler); ++ signal(SIGUSR2, &ch_sig_handler); ++ ++ //Start hoppin'! ++ hopPos = 0; ++ while (1) { ++ nc = cfg->channelHopSeq[hopPos]; ++ hopPos = (hopPos + 1) % cfg->channelHopSeqLen; ++ //Set the channel ++ fprintf(stderr, "It sets the channel to %i\n", nc); ++ wl_ioctl(WL_DEVICE, WLC_SET_CHANNEL, &nc, 4); ++ //Sleep ++ usleep(cfg->channelDwellTime * 1000); ++ } ++ } +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/channelhopper.h.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/channelhopper.h.svn-base +new file mode 100644 +index 0000000..6ab63af +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/channelhopper.h.svn-base +@@ -0,0 +1,19 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++// Channel hopper definition ++ ++void channelHopper(); +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/structs.h.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/structs.h.svn-base +new file mode 100644 +index 0000000..10f80f3 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/structs.h.svn-base +@@ -0,0 +1,169 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++//Structure definitions for wireless packets ++ ++#define MAX_HOSTS 257 ++ ++#ifdef DEFINE_TYPES ++typedef unsigned short u_short; ++typedef unsigned char u_char; ++typedef unsigned int u_int; ++#endif ++ ++typedef enum { ++ mgt_assocRequest = 0, ++ mgt_assocResponse = 1, ++ mgt_reassocRequest = 2, ++ mgt_reassocResponse = 3, ++ mgt_probeRequest = 4, ++ mgt_probeResponse = 5, ++ mgt_beacon = 8, ++ mgt_disassoc = 10, ++ mgt_auth = 11, ++ mgt_deauth = 12 ++ } wifi_frametype; ++ ++typedef struct ieee802_11_hdr { ++ u_char frame_control; ++ u_char flags; ++#define IEEE80211_TO_DS 0x01 ++#define IEEE80211_FROM_DS 0x02 ++#define IEEE80211_MORE_FRAG 0x04 ++#define IEEE80211_RETRY 0x08 ++#define IEEE80211_PWR_MGT 0x10 ++#define IEEE80211_MORE_DATA 0x20 ++#define IEEE80211_WEP_FLAG 0x40 ++#define IEEE80211_ORDER_FLAG 0x80 ++ u_short duration; ++ u_char addr1[6]; ++ u_char addr2[6]; ++ u_char addr3[6]; ++ u_short frag_and_seq; ++ } ieee802_11_hdr; ++ ++typedef struct { ++ u_char timestamp[8]; ++ u_short bcn_interval; ++ u_short caps; ++#define MGT_CAPS_AP 0x1 ++#define MGT_CAPS_IBSS 0x2 ++#define MGT_CAPS_WEP 0x10 ++ } ieee_802_11_mgt_frame; ++ ++typedef struct { ++ u_char tag; ++ u_char length; ++ } ieee_802_11_tag; ++ ++typedef enum { ++ tagSSID = 0, ++ tagRates = 1, ++ tagChannel = 3, ++ tagVendorSpecific = 0xDD ++ } i81tag; ++ ++typedef struct prism_hdr { ++ u_int msg_code; ++ u_int msg_length; ++ char cap_device[16]; ++ //char dids[0]; ++ } prism_hdr; ++ ++typedef struct prism_did { ++ u_short did; ++ u_short status1; ++ u_short status2; ++ u_short length; ++ //int value[0]; ++ } prism_did; ++ ++typedef enum prism_did_num { ++ pdn_host_time = 0x1041, ++ pdn_mac_time = 0x2041, ++ pdn_rssi = 0x4041, ++ pdn_sq = 0x5041, ++ pdn_datarate = 0x8041, ++ pdn_framelen = 0xa041 ++ } prism_did_num; ++ ++ ++ ++//Structure definitions for data collection ++ ++typedef enum { ++ typeUnknown, ++ typeAP, ++ typeSta, ++ typeAdhocHub ++ } host_type; ++ ++typedef enum { ++ ssUnknown, ++ ssUnassociated, ++ ssAssociated ++ } sta_state; ++ ++typedef enum { ++ aetUnknown, ++ aetUnencrypted, ++ aetEncUnknown, ++ aetEncWEP, ++ aetEncWPA ++ } ap_enc_type; ++ ++typedef struct { ++ u_char bssid[6]; ++ char * ssid[32]; ++ u_char ssidlen; ++ u_char channel; ++ u_short flags; ++ ap_enc_type encryption; ++ } ap_info; ++ ++typedef struct { ++ sta_state state; ++ u_char connectedBSSID[6]; ++ } sta_info; ++ ++typedef struct { ++ u_char occupied; ++ u_char mac[6]; ++ host_type type; ++ time_t lastSeen; ++ int RSSI; ++ ap_info * apInfo; ++ sta_info * staInfo; ++ } wiviz_host; ++ ++//Primary config struct ++typedef struct { ++ wiviz_host hosts[MAX_HOSTS]; ++ int numHosts; ++ int readFromWl; ++ time_t lastKeepAlive; ++ int channelHopping; ++ int channelDwellTime; ++ int channelHopSeq[14]; ++ int channelHopSeqLen; ++ int curChannel; ++ int channelHopperPID; ++ } wiviz_cfg; ++ ++ ++ ++ ++ +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/wiviz.c.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/wiviz.c.svn-base +new file mode 100644 +index 0000000..d2ad9f2 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/wiviz.c.svn-base +@@ -0,0 +1,572 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++ ++#define HOST_TIMEOUT 300 ++ ++#include "wl_access.h" ++#include "structs.h" ++#include "channelhopper.h" ++ ++#ifdef WIN32 ++#define OFFLINE ++#endif ++#ifndef __cplusplus ++#define __cdecl ++#endif ++ ++#define nonzeromac(x) memcmp(x, "\0\0\0\0\0\0", 6) ++ ++void dealWithPacket(wiviz_cfg * cfg, struct pcap_pkthdr * header, const u_char * packet); ++wiviz_host * gotHost(wiviz_cfg * cfg, u_char * mac, host_type type); ++void fprint_mac(FILE * outf, u_char * mac, char * extra); ++void print_mac(u_char * mac, char * extra); ++void print_host(FILE * outf, wiviz_host * host); ++void __cdecl signal_handler(int); ++void readWL(wiviz_cfg * cfg); ++void reloadConfig(); ++ ++wiviz_cfg * global_cfg; ++ ++//////////////////////////////////////////////////////////////////////////////// ++int main(int argc, char * * argv) { ++ pcap_t *handle; ++ char *dev; ++ char errbuf[PCAP_ERRBUF_SIZE]; ++ int stop = 0; ++ int oldMonitor, newMonitor; ++ struct pcap_pkthdr header; ++ const u_char *packet; ++ wiviz_cfg cfg; ++ int i; ++ int defaultHopSeq[] = { 1, 3, 6, 8, 11 }; ++ ++ global_cfg = &cfg; ++ signal(SIGUSR1, &signal_handler); ++ signal(SIGUSR2, &signal_handler); ++ ++ fprintf(stderr, "Wi-Viz infogathering daemon by Nathan True\n"); ++ ++ memset(&cfg, 0, sizeof(wiviz_cfg)); ++ cfg.numHosts = 0; ++ cfg.lastKeepAlive = time(NULL); ++ cfg.channelHopping = 0; ++ cfg.channelDwellTime = 1000; ++ cfg.channelHopSeqLen = 5; ++ memcpy(cfg.channelHopSeq, defaultHopSeq, sizeof(defaultHopSeq)); ++ ++ wl_ioctl(WL_DEVICE, WLC_GET_MAGIC, &i, 4); ++ if (i != WLC_IOCTL_MAGIC) { ++ fprintf(stderr, "Wireless magic not correct, not querying wl for info\n"); ++ cfg.readFromWl = 0; ++ } ++ else { ++ cfg.readFromWl = 1; ++ wl_ioctl(WL_DEVICE, WLC_GET_MONITOR, &oldMonitor, 4); ++ newMonitor = 1; ++ wl_ioctl(WL_DEVICE, WLC_SET_MONITOR, &newMonitor, 4); ++ } ++ ++ reloadConfig(); ++ ++#ifndef OFFLINE ++ dev = "prism0"; ++ handle = pcap_open_live(dev, BUFSIZ, 1, 0, errbuf); ++#else ++ dev = "c:\\cifsroot\\wdump2.pcap"; ++ handle = pcap_open_offline(dev, errbuf); ++#endif ++ ++ if (cfg.readFromWl) { ++ readWL(&cfg); ++ } ++ ++ if (!handle) { ++ fprintf(stderr, "Failure to open pcap!\nErr=%s\n", errbuf); ++ return -1; ++ } ++ while (!stop) { ++ packet = pcap_next(handle, &header); ++ if (!packet) break; ++ dealWithPacket(&cfg, &header, packet); ++ if (time(NULL) - cfg.lastKeepAlive > 30) stop = 1; ++ } ++ ++ signal_handler(SIGUSR1); ++ ++ if (cfg.channelHopperPID) kill(cfg.channelHopperPID, SIGKILL); ++ ++ for (i = 0; i < MAX_HOSTS; i++) { ++ print_host(stderr, cfg.hosts + i); ++ if (cfg.hosts[i].occupied) printf("\n"); ++ if (cfg.hosts[i].apInfo) free(cfg.hosts[i].apInfo); ++ if (cfg.hosts[i].staInfo) free(cfg.hosts[i].staInfo); ++ } ++ ++ wl_ioctl(WL_DEVICE, WLC_SET_MONITOR, &oldMonitor, 4); ++ ++ pcap_close(handle); ++ return 0; ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void writeJavascript() { ++ int i; ++ FILE * outf; ++ wiviz_host * h; ++ ++ outf = fopen("/tmp/wiviz-pipe", "w"); ++ if (!outf) { ++ fprintf(stderr, "Failure to open output file\n"); ++ return; ++ } ++ ++ global_cfg->lastKeepAlive = time(NULL); ++ ++ if(global_cfg->readFromWl) readWL(global_cfg); ++ ++ fprintf(outf, "top.hosts = new Array(\n"); ++ for (i = 0; i < MAX_HOSTS; i++) { ++ h = global_cfg->hosts + i; ++ if (h->occupied == 0) continue; ++ if (time(NULL) - h->lastSeen > HOST_TIMEOUT) { ++ h->occupied = 0; ++ } ++ fprintf(outf, " new Array("); ++ print_host(outf, h); ++ fprintf(outf, "),\n"); ++ } ++ fprintf(outf, "new Array());\n"); ++ fprintf(outf, "var cfg_string = 'channel-"); ++ if (global_cfg->channelHopping) { ++ fprintf(outf, "hopping"); ++ } ++ else { ++ fprintf(outf, "%i", global_cfg->curChannel); ++ } ++ fprintf(outf, "';\ntop.wiviz_callback(top.hosts, cfg_string);\n"); ++ fclose(outf); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void reloadConfig() { ++ FILE * cnf; ++ wiviz_cfg * cfg = global_cfg; ++ char filebuffer[512]; ++ char * fbptr, * p, * v, * vv; ++ int fblen, val; ++ int hopCfgChanged = 0; ++ int newHopSeq[12]; ++ int newHopSeqLen = 0; ++ ++ fprintf(stderr, "Loading config file\n"); ++ ++ cnf = fopen("/tmp/wiviz-cfg", "r"); ++ if (!cnf) { ++ fprintf(stderr, "Wiviz: No config file (/tmp/wiviz-cfg) present, using defaults\n"); ++ return; ++ } ++ ++ fblen = fread(filebuffer, 1, 512, cnf); ++ fclose(cnf); ++ if (fblen >= 512) { ++ fprintf(stderr, "Error reading config file\n"); ++ return; ++ } ++ filebuffer[fblen] = 0; ++ fprintf(stderr, "Read %i bytes from config file\n", fblen); ++ ++ fbptr = filebuffer; ++ ++ while (fbptr < filebuffer + fblen && *fbptr != 0) { ++ p = fbptr; ++ //Find end of parameter ++ for (; *fbptr != '=' && *fbptr != 0; fbptr++); ++ *fbptr = 0; ++ v = ++fbptr; ++ //Find end of value ++ for (; *fbptr != '&' && *fbptr != 0; fbptr++); ++ *(fbptr++) = 0; ++ fprintf(stderr, "Config: %s=%s\n", p, v); ++ //Apply configuration ++ if (!strcmp(p, "channelsel")) { ++ //Channel selector ++ cfg->channelHopping = 0; ++ if (!strcmp(v, "hop")) { ++ //Set channel hopping ++ cfg->channelHopping = 1; ++ hopCfgChanged = 1; ++ } ++ else if (!strcmp(v, "nochange")) { ++ //Don't change anything, read channel from wireless card ++ readWL(cfg); ++ } ++ else { ++ val = atoi(v); ++ if (val < 1 || val > 14) { ++ fprintf(stderr, "Channel setting in config file invalid (%i)\n", cfg->curChannel); ++ } ++ else { ++ cfg->curChannel = val; ++ if (cfg->readFromWl) { ++ if (wl_ioctl(WL_DEVICE, WLC_SET_CHANNEL, &cfg->curChannel, 4) < 0) { ++ fprintf(stderr, "Channel set to %i failed\n", cfg->curChannel); ++ } ++ } ++ else { ++ fprintf(stderr, "Can't set channel, no Broadcom wireless device present\n"); ++ } ++ } ++ } ++ } ++ if (!strcmp(p, "hopdwell")) { ++ val = atoi(v); ++ if (val < 100) val = 100; ++ if (val > 30000) val = 30000; ++ if (cfg->channelDwellTime != val) hopCfgChanged = 1; ++ cfg->channelDwellTime = val; ++ } ++ if (!strcmp(p, "hopseq")) { ++ cfg->channelHopSeqLen = 0; ++ while (v < fbptr) { ++ for (vv = v; *vv != ',' && *vv != 0; vv++); ++ if (*vv == 0) { ++ cfg->channelHopSeq[cfg->channelHopSeqLen++] = atoi(v); ++ break; ++ } ++ *vv = 0; ++ cfg->channelHopSeq[cfg->channelHopSeqLen++] = atoi(v); ++ v = vv + 1; ++ } ++ } ++ /* ++ if (!strcmp(p, "")) { ++ } ++ */ ++ } ++ //Apply channel hopper settings ++ if (cfg->channelHopping == 0 && cfg->channelHopperPID) { ++ kill(cfg->channelHopperPID, SIGKILL); ++ cfg->channelHopperPID = 0; ++ } ++ if (cfg->channelHopping == 1 && hopCfgChanged) { ++ if (cfg->channelHopperPID) kill(cfg->channelHopperPID, SIGKILL); ++ if ((cfg->channelHopperPID = fork()) == 0) { ++ channelHopper(cfg); ++ } ++ } ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void __cdecl signal_handler(int signum) { ++ if (signum == SIGUSR1) writeJavascript(); ++ if (signum == SIGUSR2) reloadConfig(); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void dealWithPacket(wiviz_cfg * cfg, struct pcap_pkthdr * header, const u_char * packet) { ++ ieee802_11_hdr * hWifi; ++ prism_hdr * hPrism; ++ wiviz_host * host; ++ wiviz_host * emergebss; ++ host_type type = typeUnknown; ++ int wfType; ++ int rssi = 0; ++ int to_ds, from_ds; ++ prism_did * i; ++ ieee_802_11_tag * e; ++ ieee_802_11_mgt_frame * m; ++ char * src = "\0\0\0\0\0\0"; ++ char * dst = "\0\0\0\0\0\0"; ++ char * bss = "\0\0\0\0\0\0"; ++ char * ssid = ""; ++ int channel = 0; ++ int adhocbeacon = 0; ++ u_char ssidlen = 0; ++ ap_enc_type encType = aetUnknown; ++ ++ if (!packet) return; ++ if (header->len < sizeof(prism_hdr) + sizeof(ieee802_11_hdr)) return; ++ hPrism = (prism_hdr *) packet; ++ hWifi = (ieee802_11_hdr *) (packet + (hPrism->msg_length)); ++ ++ //Parse the prism DIDs ++ i = (prism_did *)((char *)hPrism + sizeof(prism_hdr)); ++ while ((int)i < (int)hWifi) { ++ if (i->did == pdn_rssi) rssi = *(int *)(i+1); ++ i = (prism_did *) ((int)(i+1) + i->length); ++ } ++ ++ //Establish the frame type ++ wfType = ((hWifi->frame_control & 0xF0) >> 4) + ((hWifi->frame_control & 0xC) << 2); ++ switch (wfType) { ++ case mgt_assocRequest: ++ case mgt_reassocRequest: ++ case mgt_probeRequest: ++ type = typeSta; ++ src=hWifi->addr2; ++ dst=hWifi->addr1; ++ break; ++ case mgt_assocResponse: ++ case mgt_reassocResponse: ++ case mgt_probeResponse: ++ case mgt_beacon: ++ src=hWifi->addr2; ++ dst=hWifi->addr1; ++ bss=hWifi->addr3; ++ type = typeAP; ++ break; ++ } ++ to_ds = hWifi->flags & IEEE80211_TO_DS; ++ from_ds = hWifi->flags & IEEE80211_FROM_DS; ++ if ((wfType & 0xF0) == 0x20 && (wfType & 0xF) < 4) { ++ //Data frame ++ src=hWifi->addr2; ++ dst=hWifi->addr1; ++ if (!from_ds) type = typeSta; ++ else type = typeAP; ++ if (!to_ds && !from_ds) bss = hWifi->addr3; ++ if (to_ds && !from_ds) bss = hWifi->addr1; ++ if (!to_ds && from_ds) bss = hWifi->addr2; ++ } ++ if (type == typeUnknown) return; ++ ++ //Parse the 802.11 tags ++ if (wfType == mgt_probeResponse || wfType == mgt_beacon) { ++ m = (ieee_802_11_mgt_frame *) (hWifi + 1); ++ if (m->caps & MGT_CAPS_IBSS) { ++ type = typeSta; ++ adhocbeacon = 1; ++ } ++ if (m->caps & MGT_CAPS_WEP) encType = aetEncWEP; ++ else encType = aetUnencrypted; ++ e = (ieee_802_11_tag *) ((int) m + sizeof(ieee_802_11_mgt_frame)); ++ while ((u_int)e < (u_int)packet + header->len) { ++ if (e->tag == tagSSID) { ++ ssidlen = e->length; ++ ssid = (char *)(e + 1); ++ } ++ if (e->tag == tagChannel) { ++ channel = *(char *)(e + 1); ++ } ++ if (e->tag == tagVendorSpecific) { ++ if (e->length >= 4 && memcmp(e + 1, "\x00\x50\xf2\x01", 4) == 0) { ++ //WPA encryption ++ encType = aetEncWPA; ++ } ++ } ++ e = (ieee_802_11_tag *) ((int)(e + 1) + e->length); ++ } ++ } ++ ++ //Look up the host in the hash table ++ host = gotHost(cfg, src, type); ++ ++ //Add any info we received ++ if (host->RSSI) { ++ host->RSSI = host->RSSI * 9 / 10 + (-rssi * 10); ++ } ++ else { ++ host->RSSI = -rssi * 100; ++ } ++ if (type == typeSta) { ++ if (nonzeromac(bss)) { ++ memcpy(host->staInfo->connectedBSSID, bss, 6); ++ host->staInfo->state = ssAssociated; ++ emergebss = gotHost(cfg, bss, typeAP); ++ if (emergebss->RSSI == 0) emergebss->RSSI = 10000; ++ memcpy(emergebss->apInfo->bssid, bss, 6); ++ if (adhocbeacon) { ++ emergebss->type = typeAdhocHub; ++ if (ssidlen > 0 && ssidlen <= 32) { ++ memcpy(emergebss->apInfo->ssid, ssid, ssidlen); ++ emergebss->apInfo->ssidlen = ssidlen; ++ } ++ if (channel) emergebss->apInfo->channel = channel; ++ emergebss->apInfo->flags = hWifi->flags; ++ emergebss->RSSI = host->RSSI; ++ if (encType != aetUnknown) emergebss->apInfo->encryption = encType; ++ } ++ } ++ if (wfType == mgt_probeRequest && host->staInfo->state == ssUnknown) host->staInfo->state = ssUnassociated; ++ } ++ if (type == typeAP) { ++ if (nonzeromac(bss)) { ++ memcpy(host->apInfo->bssid, bss, 6); ++ } ++ if (ssidlen > 0 && ssidlen <= 32) { ++ memcpy(host->apInfo->ssid, ssid, ssidlen); ++ host->apInfo->ssidlen = ssidlen; ++ } ++ if (channel) host->apInfo->channel = channel; ++ host->apInfo->flags = hWifi->flags; ++ if (encType != aetUnknown) host->apInfo->encryption = encType; ++ } ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void print_mac(u_char * mac, char * extra) { ++ fprint_mac(stdout, mac, extra); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void fprint_mac(FILE * outf, u_char * mac, char * extra) { ++ fprintf(outf, "%02X:%02X:%02X:%02X:%02X:%02X%s", ++ mac[0] & 0xFF, ++ mac[1] & 0xFF, ++ mac[2] & 0xFF, ++ mac[3] & 0xFF, ++ mac[4] & 0xFF, ++ mac[5] & 0xFF, ++ extra); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++#define MAX_PROBES MAX_HOSTS/2 ++wiviz_host * gotHost(wiviz_cfg * cfg, u_char * mac, host_type type) { ++ int i = (mac[5] + (mac[4] << 8)) % MAX_HOSTS; ++ int c = 0; ++ wiviz_host * h = cfg->hosts + i; ++ while (h->occupied && memcmp(h->mac, mac, 6)) { ++ i++; h++; c++; ++ if (i >= MAX_HOSTS) { ++ i = 0; ++ h = cfg->hosts; ++ } ++ if (c > MAX_PROBES) break; ++ } ++ if (!h->occupied) { ++ fprintf(stderr, "New host, "); ++ fprint_mac(stderr, mac, ", type="); ++ fprintf(stderr, "%s\n", (type==typeAP) ? "AP" : ((type==typeSta) ? "Sta" : "Unk")); ++ } ++ h->occupied = 1; ++ h->lastSeen = time(NULL); ++ h->type = type; ++ memcpy(h->mac, mac, 6); ++ if (h->type == typeAP && !h->apInfo) { ++ h->apInfo = (ap_info *) malloc(sizeof(ap_info)); ++ memset(h->apInfo, 0, sizeof(ap_info)); ++ } ++ if (h->type == typeSta && !h->staInfo) { ++ h->staInfo = (sta_info *) malloc(sizeof(sta_info)); ++ memset(h->staInfo, 0, sizeof(sta_info)); ++ } ++ return h; ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void print_host(FILE * outf, wiviz_host * host) { ++ int i; ++ ++ if (!host->occupied) return; ++ fprintf(outf, "'"); ++ fprint_mac(outf, host->mac, "'"); ++ fprintf(outf, ", -%i, '", host->RSSI / 100); ++ switch (host->type) { ++ case typeAP: fprintf(outf, "ap"); break; ++ case typeSta: fprintf(outf, "sta"); break; ++ case typeAdhocHub: fprintf(outf, "adhoc"); break; ++ } ++ if (host->type == typeSta) { ++ switch(host->staInfo->state) { ++ case ssAssociated: ++ fprintf(outf, "-assoc-"); ++ fprint_mac(outf, host->staInfo->connectedBSSID, ""); ++ break; ++ case ssUnassociated: ++ fprintf(outf, "-unassoc"); ++ } ++ } ++ if (host->type == typeAP || host->type == typeAdhocHub) { ++ fprintf(outf, "-channel-%i-ssid-", host->apInfo->channel & 0xFF); ++ for (i = 0; i < host->apInfo->ssidlen; i++) { ++ fprintf(outf, "\\x%02X", *((char *)host->apInfo->ssid + i) & 0xFF); ++ } ++ switch (host->apInfo->encryption) { ++ case aetUnknown: fprintf(outf, "-?enc-?alg"); break; ++ case aetUnencrypted: fprintf(outf, "-unenc-na"); break; ++ case aetEncUnknown: fprintf(outf, "-enc-unknown"); break; ++ case aetEncWEP: fprintf(outf, "-enc-wep"); break; ++ case aetEncWPA: fprintf(outf, "-enc-wpa"); break; ++ } ++ } ++ fprintf(outf, "', %i", time(0) - host->lastSeen); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++#define MAX_STA_COUNT 64 ++void readWL(wiviz_cfg * cfg) { ++ int ap, i; ++ wiviz_host * host, * sta; ++ uchar mac[6]; ++ wlc_ssid_t ssid; ++ channel_info_t channel; ++ maclist_t * macs; ++ sta_rssi_t starssi; ++ ++ get_mac(WL_DEVICE, mac); ++ printf("AP mac: "); ++ print_mac(mac, "\n"); ++ if (!nonzeromac(mac)) return; ++ wl_ioctl(WL_DEVICE, WLC_GET_AP, &ap, 4); ++ if (ap) { ++ host = gotHost(cfg, mac, typeAP); ++ wl_ioctl(WL_DEVICE, WLC_GET_BSSID, host->apInfo->bssid, 6); ++ wl_ioctl(WL_DEVICE, WLC_GET_SSID, &ssid, sizeof(wlc_ssid_t)); ++ memcpy(host->apInfo->ssid, ssid.SSID, 32); ++ host->apInfo->ssidlen = ssid.SSID_len; ++ host->RSSI = 0; ++ wl_ioctl(WL_DEVICE, WLC_GET_CHANNEL, &channel, sizeof(channel_info_t)); ++ host->apInfo->channel = channel.hw_channel; ++ macs = (maclist_t *) malloc(4 + MAX_STA_COUNT * sizeof(ether_addr_t)); ++ macs->count = MAX_STA_COUNT; ++ if (wl_ioctl(WL_DEVICE, WLC_GET_ASSOCLIST, macs, 4 + MAX_STA_COUNT * sizeof(ether_addr_t)) > -1) { ++ for (i = 0; i < macs->count; i++) { ++ sta = gotHost(cfg, (char *)&macs->ea[i], typeSta); ++ memcpy(starssi.mac, &macs->ea[i], 6); ++ starssi.RSSI = 3000; ++ starssi.zero_ex_forty_one = 0x41; ++ if (wl_ioctl(WL_DEVICE, WLC_GET_RSSI, &starssi, 12) < 0) printf("rssifail\n"); ++ sta->RSSI = -starssi.RSSI * 100; ++ sta->staInfo->state = ssAssociated; ++ memcpy(sta->staInfo->connectedBSSID, host->apInfo->bssid, 6); ++ } ++ } ++ } ++ else { ++ host = gotHost(cfg, mac, typeSta); ++ host->RSSI = 0; ++ if (wl_ioctl(WL_DEVICE, WLC_GET_BSSID, &host->staInfo->connectedBSSID, 6) < 0) { ++ host->staInfo->state = ssUnassociated; ++ } ++ else { ++ host->staInfo->state = ssAssociated; ++ } ++ } ++ if (wl_ioctl(WL_DEVICE, WLC_GET_CHANNEL, &channel, sizeof(channel_info_t)) >= 0) { ++ cfg->curChannel = channel.hw_channel; ++ fprintf(stderr, "Current channel is %i\n", cfg->curChannel); ++ } ++} ++ ++ ++ ++ ++ +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/wl_access.c.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/wl_access.c.svn-base +new file mode 100644 +index 0000000..a5172c3 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/wl_access.c.svn-base +@@ -0,0 +1,73 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "wl_access.h" ++ ++int wl_ioctl(char *name, int cmd, void *buf, int len) ++{ ++ struct ifreq ifr; ++ wl_ioctl_t ioc; ++ int ret = 0; ++ int s; ++ ++ /* open socket to kernel */ ++ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ++ perror("socket"); ++ return errno; ++ } ++ ++ /* do it */ ++ ioc.cmd = cmd; ++ ioc.buf = buf; ++ ioc.len = len; ++ strncpy(ifr.ifr_name, name, IFNAMSIZ); ++ ifr.ifr_data = (caddr_t) &ioc; ++ ret = ioctl(s, SIOCDEVPRIVATE, &ifr); ++ ++ /* cleanup */ ++ close(s); ++ return ret; ++} ++ ++int get_mac(char *name, void *buf) ++{ ++ struct ifreq ifr; ++ int ret = 0; ++ int s; ++ ++ /* open socket to kernel */ ++ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ++ perror("socket"); ++ return errno; ++ } ++ ++ strncpy(ifr.ifr_name, name, IFNAMSIZ); ++ //ifr.ifr_data = (caddr_t) buf; ++ if ((ret = ioctl(s, SIOCGIFHWADDR, &ifr)) < 0) ++ perror(ifr.ifr_name); ++ ++ /* cleanup */ ++ close(s); ++ memcpy(buf, &ifr.ifr_hwaddr.sa_data, 6); ++ return ret; ++} +diff --git a/feeds/packages/net/wiviz/src/.svn/text-base/wl_access.h.svn-base b/feeds/packages/net/wiviz/src/.svn/text-base/wl_access.h.svn-base +new file mode 100644 +index 0000000..96f239d +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/.svn/text-base/wl_access.h.svn-base +@@ -0,0 +1,77 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++//wl_access.h - functions for accessing broadcom crap ++ ++#define WL_DEVICE "eth1" ++ ++typedef unsigned int uint32; ++typedef unsigned char uchar; ++typedef int bool; ++ ++typedef struct ether_addr { ++ uchar addr[6]; ++} ether_addr_t; ++ ++typedef struct wlc_ssid { ++ uint32 SSID_len; ++ uchar SSID[32]; ++} wlc_ssid_t; ++/* For ioctls that take a list of MAC addresses */ ++typedef struct maclist { ++ uint count; /* number of MAC addresses */ ++ struct ether_addr ea[1]; /* variable length array of MAC addresses */ ++} maclist_t; ++/* Linux network driver ioctl encoding */ ++typedef struct wl_ioctl { ++ uint cmd; /* common ioctl definition */ ++ void *buf; /* pointer to user buffer */ ++ uint len; /* length of user buffer */ ++ bool set; /* get or set request (optional) */ ++ uint used; /* bytes read or written (optional) */ ++ uint needed; /* bytes needed (optional) */ ++} wl_ioctl_t; ++/* channel encoding */ ++typedef struct channel_info { ++ int hw_channel; ++ int target_channel; ++ int scan_channel; ++} channel_info_t; ++/* RSSI info for sta */ ++typedef struct sta_rssi { ++ int RSSI; ++ char mac[6]; ++ u_short zero_ex_forty_one; ++ } sta_rssi_t; ++/* check this magic number */ ++#define WLC_IOCTL_MAGIC 0x14e46c77 ++ ++#define WLC_GET_MAGIC 0 ++#define WLC_GET_BSSID 23 ++#define WLC_SET_BSSID 24 ++#define WLC_GET_SSID 25 ++#define WLC_SET_SSID 26 ++#define WLC_GET_CHANNEL 29 ++#define WLC_SET_CHANNEL 30 ++#define WLC_GET_MONITOR 107 /* discovered by nbd */ ++#define WLC_SET_MONITOR 108 /* discovered by nbd */ ++#define WLC_GET_AP 117 ++#define WLC_SET_AP 118 ++#define WLC_GET_RSSI 127 ++#define WLC_GET_ASSOCLIST 159 ++ ++ ++int wl_ioctl(char *name, int cmd, void *buf, int len); +diff --git a/feeds/packages/net/wiviz/src/Makefile b/feeds/packages/net/wiviz/src/Makefile +new file mode 100644 +index 0000000..6f23035 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/Makefile +@@ -0,0 +1,25 @@ ++## Wi-viz makefile ++# Supply your own C cross-compiler; I recommend the one from the OpenWRT buildroot ++# Also requires a libpcap to link with, use libpcap.a for static, .so for shared ++CC=~/buildroot/staging_dir_mipsel/bin/mipsel-linux-gcc ++LDFLAGS=-L~/buildroot/staging_dir_mipsel/lib ++LIBS=-lpcap ++ ++CCOPTS=-O2 -Os -pipe -mips32 -mtune=mips32 ++INCLUDE=-I~/buildroot/staging_dir_mipsel/include ++SOURCES=wiviz.c wl_access.c channelhopper.c ++OBJS=wiviz.o wl_access.o channelhopper.o ++TARGET=wiviz ++ ++wiviz: ${OBJS} ++ ${CC} ${CCOPTS} ${INCLUDE} -o ${TARGET} ${OBJS} ${LDFLAGS} ${LIBS} ++ ++wiviz.o: wiviz.c ++ ${CC} ${CCOPTS} ${INCLUDE} -c ${SOURCES} ++wl_access.o: wl_access.c ++ ${CC} ${CCOPTS} ${INCLUDE} -c ${SOURCES} ++channelhopper.o: channelhopper.c ++ ${CC} ${CCOPTS} ${INCLUDE} -c ${SOURCES} ++ ++remake: ++ touch wiviz.c wl_access.c channelhopper.c +diff --git a/feeds/packages/net/wiviz/src/channelhopper.c b/feeds/packages/net/wiviz/src/channelhopper.c +new file mode 100644 +index 0000000..0a3e6fe +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/channelhopper.c +@@ -0,0 +1,48 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++#include ++#include "wl_access.h" ++#include "channelhopper.h" ++#include "structs.h" ++ ++void ch_sig_handler(int i) { ++ ++ } ++ ++void channelHopper(wiviz_cfg * cfg) { ++ int hopPos; ++ int nc; ++ ++ //Turn off signal handling from parent process ++ signal(SIGUSR1, &ch_sig_handler); ++ signal(SIGUSR2, &ch_sig_handler); ++ ++ //Start hoppin'! ++ hopPos = 0; ++ while (1) { ++ nc = cfg->channelHopSeq[hopPos]; ++ hopPos = (hopPos + 1) % cfg->channelHopSeqLen; ++ //Set the channel ++ fprintf(stderr, "It sets the channel to %i\n", nc); ++ wl_ioctl(WL_DEVICE, WLC_SET_CHANNEL, &nc, 4); ++ //Sleep ++ usleep(cfg->channelDwellTime * 1000); ++ } ++ } +diff --git a/feeds/packages/net/wiviz/src/channelhopper.h b/feeds/packages/net/wiviz/src/channelhopper.h +new file mode 100644 +index 0000000..6ab63af +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/channelhopper.h +@@ -0,0 +1,19 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++// Channel hopper definition ++ ++void channelHopper(); +diff --git a/feeds/packages/net/wiviz/src/structs.h b/feeds/packages/net/wiviz/src/structs.h +new file mode 100644 +index 0000000..10f80f3 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/structs.h +@@ -0,0 +1,169 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++//Structure definitions for wireless packets ++ ++#define MAX_HOSTS 257 ++ ++#ifdef DEFINE_TYPES ++typedef unsigned short u_short; ++typedef unsigned char u_char; ++typedef unsigned int u_int; ++#endif ++ ++typedef enum { ++ mgt_assocRequest = 0, ++ mgt_assocResponse = 1, ++ mgt_reassocRequest = 2, ++ mgt_reassocResponse = 3, ++ mgt_probeRequest = 4, ++ mgt_probeResponse = 5, ++ mgt_beacon = 8, ++ mgt_disassoc = 10, ++ mgt_auth = 11, ++ mgt_deauth = 12 ++ } wifi_frametype; ++ ++typedef struct ieee802_11_hdr { ++ u_char frame_control; ++ u_char flags; ++#define IEEE80211_TO_DS 0x01 ++#define IEEE80211_FROM_DS 0x02 ++#define IEEE80211_MORE_FRAG 0x04 ++#define IEEE80211_RETRY 0x08 ++#define IEEE80211_PWR_MGT 0x10 ++#define IEEE80211_MORE_DATA 0x20 ++#define IEEE80211_WEP_FLAG 0x40 ++#define IEEE80211_ORDER_FLAG 0x80 ++ u_short duration; ++ u_char addr1[6]; ++ u_char addr2[6]; ++ u_char addr3[6]; ++ u_short frag_and_seq; ++ } ieee802_11_hdr; ++ ++typedef struct { ++ u_char timestamp[8]; ++ u_short bcn_interval; ++ u_short caps; ++#define MGT_CAPS_AP 0x1 ++#define MGT_CAPS_IBSS 0x2 ++#define MGT_CAPS_WEP 0x10 ++ } ieee_802_11_mgt_frame; ++ ++typedef struct { ++ u_char tag; ++ u_char length; ++ } ieee_802_11_tag; ++ ++typedef enum { ++ tagSSID = 0, ++ tagRates = 1, ++ tagChannel = 3, ++ tagVendorSpecific = 0xDD ++ } i81tag; ++ ++typedef struct prism_hdr { ++ u_int msg_code; ++ u_int msg_length; ++ char cap_device[16]; ++ //char dids[0]; ++ } prism_hdr; ++ ++typedef struct prism_did { ++ u_short did; ++ u_short status1; ++ u_short status2; ++ u_short length; ++ //int value[0]; ++ } prism_did; ++ ++typedef enum prism_did_num { ++ pdn_host_time = 0x1041, ++ pdn_mac_time = 0x2041, ++ pdn_rssi = 0x4041, ++ pdn_sq = 0x5041, ++ pdn_datarate = 0x8041, ++ pdn_framelen = 0xa041 ++ } prism_did_num; ++ ++ ++ ++//Structure definitions for data collection ++ ++typedef enum { ++ typeUnknown, ++ typeAP, ++ typeSta, ++ typeAdhocHub ++ } host_type; ++ ++typedef enum { ++ ssUnknown, ++ ssUnassociated, ++ ssAssociated ++ } sta_state; ++ ++typedef enum { ++ aetUnknown, ++ aetUnencrypted, ++ aetEncUnknown, ++ aetEncWEP, ++ aetEncWPA ++ } ap_enc_type; ++ ++typedef struct { ++ u_char bssid[6]; ++ char * ssid[32]; ++ u_char ssidlen; ++ u_char channel; ++ u_short flags; ++ ap_enc_type encryption; ++ } ap_info; ++ ++typedef struct { ++ sta_state state; ++ u_char connectedBSSID[6]; ++ } sta_info; ++ ++typedef struct { ++ u_char occupied; ++ u_char mac[6]; ++ host_type type; ++ time_t lastSeen; ++ int RSSI; ++ ap_info * apInfo; ++ sta_info * staInfo; ++ } wiviz_host; ++ ++//Primary config struct ++typedef struct { ++ wiviz_host hosts[MAX_HOSTS]; ++ int numHosts; ++ int readFromWl; ++ time_t lastKeepAlive; ++ int channelHopping; ++ int channelDwellTime; ++ int channelHopSeq[14]; ++ int channelHopSeqLen; ++ int curChannel; ++ int channelHopperPID; ++ } wiviz_cfg; ++ ++ ++ ++ ++ +diff --git a/feeds/packages/net/wiviz/src/wiviz.c b/feeds/packages/net/wiviz/src/wiviz.c +new file mode 100644 +index 0000000..d2ad9f2 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/wiviz.c +@@ -0,0 +1,572 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++ ++#define HOST_TIMEOUT 300 ++ ++#include "wl_access.h" ++#include "structs.h" ++#include "channelhopper.h" ++ ++#ifdef WIN32 ++#define OFFLINE ++#endif ++#ifndef __cplusplus ++#define __cdecl ++#endif ++ ++#define nonzeromac(x) memcmp(x, "\0\0\0\0\0\0", 6) ++ ++void dealWithPacket(wiviz_cfg * cfg, struct pcap_pkthdr * header, const u_char * packet); ++wiviz_host * gotHost(wiviz_cfg * cfg, u_char * mac, host_type type); ++void fprint_mac(FILE * outf, u_char * mac, char * extra); ++void print_mac(u_char * mac, char * extra); ++void print_host(FILE * outf, wiviz_host * host); ++void __cdecl signal_handler(int); ++void readWL(wiviz_cfg * cfg); ++void reloadConfig(); ++ ++wiviz_cfg * global_cfg; ++ ++//////////////////////////////////////////////////////////////////////////////// ++int main(int argc, char * * argv) { ++ pcap_t *handle; ++ char *dev; ++ char errbuf[PCAP_ERRBUF_SIZE]; ++ int stop = 0; ++ int oldMonitor, newMonitor; ++ struct pcap_pkthdr header; ++ const u_char *packet; ++ wiviz_cfg cfg; ++ int i; ++ int defaultHopSeq[] = { 1, 3, 6, 8, 11 }; ++ ++ global_cfg = &cfg; ++ signal(SIGUSR1, &signal_handler); ++ signal(SIGUSR2, &signal_handler); ++ ++ fprintf(stderr, "Wi-Viz infogathering daemon by Nathan True\n"); ++ ++ memset(&cfg, 0, sizeof(wiviz_cfg)); ++ cfg.numHosts = 0; ++ cfg.lastKeepAlive = time(NULL); ++ cfg.channelHopping = 0; ++ cfg.channelDwellTime = 1000; ++ cfg.channelHopSeqLen = 5; ++ memcpy(cfg.channelHopSeq, defaultHopSeq, sizeof(defaultHopSeq)); ++ ++ wl_ioctl(WL_DEVICE, WLC_GET_MAGIC, &i, 4); ++ if (i != WLC_IOCTL_MAGIC) { ++ fprintf(stderr, "Wireless magic not correct, not querying wl for info\n"); ++ cfg.readFromWl = 0; ++ } ++ else { ++ cfg.readFromWl = 1; ++ wl_ioctl(WL_DEVICE, WLC_GET_MONITOR, &oldMonitor, 4); ++ newMonitor = 1; ++ wl_ioctl(WL_DEVICE, WLC_SET_MONITOR, &newMonitor, 4); ++ } ++ ++ reloadConfig(); ++ ++#ifndef OFFLINE ++ dev = "prism0"; ++ handle = pcap_open_live(dev, BUFSIZ, 1, 0, errbuf); ++#else ++ dev = "c:\\cifsroot\\wdump2.pcap"; ++ handle = pcap_open_offline(dev, errbuf); ++#endif ++ ++ if (cfg.readFromWl) { ++ readWL(&cfg); ++ } ++ ++ if (!handle) { ++ fprintf(stderr, "Failure to open pcap!\nErr=%s\n", errbuf); ++ return -1; ++ } ++ while (!stop) { ++ packet = pcap_next(handle, &header); ++ if (!packet) break; ++ dealWithPacket(&cfg, &header, packet); ++ if (time(NULL) - cfg.lastKeepAlive > 30) stop = 1; ++ } ++ ++ signal_handler(SIGUSR1); ++ ++ if (cfg.channelHopperPID) kill(cfg.channelHopperPID, SIGKILL); ++ ++ for (i = 0; i < MAX_HOSTS; i++) { ++ print_host(stderr, cfg.hosts + i); ++ if (cfg.hosts[i].occupied) printf("\n"); ++ if (cfg.hosts[i].apInfo) free(cfg.hosts[i].apInfo); ++ if (cfg.hosts[i].staInfo) free(cfg.hosts[i].staInfo); ++ } ++ ++ wl_ioctl(WL_DEVICE, WLC_SET_MONITOR, &oldMonitor, 4); ++ ++ pcap_close(handle); ++ return 0; ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void writeJavascript() { ++ int i; ++ FILE * outf; ++ wiviz_host * h; ++ ++ outf = fopen("/tmp/wiviz-pipe", "w"); ++ if (!outf) { ++ fprintf(stderr, "Failure to open output file\n"); ++ return; ++ } ++ ++ global_cfg->lastKeepAlive = time(NULL); ++ ++ if(global_cfg->readFromWl) readWL(global_cfg); ++ ++ fprintf(outf, "top.hosts = new Array(\n"); ++ for (i = 0; i < MAX_HOSTS; i++) { ++ h = global_cfg->hosts + i; ++ if (h->occupied == 0) continue; ++ if (time(NULL) - h->lastSeen > HOST_TIMEOUT) { ++ h->occupied = 0; ++ } ++ fprintf(outf, " new Array("); ++ print_host(outf, h); ++ fprintf(outf, "),\n"); ++ } ++ fprintf(outf, "new Array());\n"); ++ fprintf(outf, "var cfg_string = 'channel-"); ++ if (global_cfg->channelHopping) { ++ fprintf(outf, "hopping"); ++ } ++ else { ++ fprintf(outf, "%i", global_cfg->curChannel); ++ } ++ fprintf(outf, "';\ntop.wiviz_callback(top.hosts, cfg_string);\n"); ++ fclose(outf); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void reloadConfig() { ++ FILE * cnf; ++ wiviz_cfg * cfg = global_cfg; ++ char filebuffer[512]; ++ char * fbptr, * p, * v, * vv; ++ int fblen, val; ++ int hopCfgChanged = 0; ++ int newHopSeq[12]; ++ int newHopSeqLen = 0; ++ ++ fprintf(stderr, "Loading config file\n"); ++ ++ cnf = fopen("/tmp/wiviz-cfg", "r"); ++ if (!cnf) { ++ fprintf(stderr, "Wiviz: No config file (/tmp/wiviz-cfg) present, using defaults\n"); ++ return; ++ } ++ ++ fblen = fread(filebuffer, 1, 512, cnf); ++ fclose(cnf); ++ if (fblen >= 512) { ++ fprintf(stderr, "Error reading config file\n"); ++ return; ++ } ++ filebuffer[fblen] = 0; ++ fprintf(stderr, "Read %i bytes from config file\n", fblen); ++ ++ fbptr = filebuffer; ++ ++ while (fbptr < filebuffer + fblen && *fbptr != 0) { ++ p = fbptr; ++ //Find end of parameter ++ for (; *fbptr != '=' && *fbptr != 0; fbptr++); ++ *fbptr = 0; ++ v = ++fbptr; ++ //Find end of value ++ for (; *fbptr != '&' && *fbptr != 0; fbptr++); ++ *(fbptr++) = 0; ++ fprintf(stderr, "Config: %s=%s\n", p, v); ++ //Apply configuration ++ if (!strcmp(p, "channelsel")) { ++ //Channel selector ++ cfg->channelHopping = 0; ++ if (!strcmp(v, "hop")) { ++ //Set channel hopping ++ cfg->channelHopping = 1; ++ hopCfgChanged = 1; ++ } ++ else if (!strcmp(v, "nochange")) { ++ //Don't change anything, read channel from wireless card ++ readWL(cfg); ++ } ++ else { ++ val = atoi(v); ++ if (val < 1 || val > 14) { ++ fprintf(stderr, "Channel setting in config file invalid (%i)\n", cfg->curChannel); ++ } ++ else { ++ cfg->curChannel = val; ++ if (cfg->readFromWl) { ++ if (wl_ioctl(WL_DEVICE, WLC_SET_CHANNEL, &cfg->curChannel, 4) < 0) { ++ fprintf(stderr, "Channel set to %i failed\n", cfg->curChannel); ++ } ++ } ++ else { ++ fprintf(stderr, "Can't set channel, no Broadcom wireless device present\n"); ++ } ++ } ++ } ++ } ++ if (!strcmp(p, "hopdwell")) { ++ val = atoi(v); ++ if (val < 100) val = 100; ++ if (val > 30000) val = 30000; ++ if (cfg->channelDwellTime != val) hopCfgChanged = 1; ++ cfg->channelDwellTime = val; ++ } ++ if (!strcmp(p, "hopseq")) { ++ cfg->channelHopSeqLen = 0; ++ while (v < fbptr) { ++ for (vv = v; *vv != ',' && *vv != 0; vv++); ++ if (*vv == 0) { ++ cfg->channelHopSeq[cfg->channelHopSeqLen++] = atoi(v); ++ break; ++ } ++ *vv = 0; ++ cfg->channelHopSeq[cfg->channelHopSeqLen++] = atoi(v); ++ v = vv + 1; ++ } ++ } ++ /* ++ if (!strcmp(p, "")) { ++ } ++ */ ++ } ++ //Apply channel hopper settings ++ if (cfg->channelHopping == 0 && cfg->channelHopperPID) { ++ kill(cfg->channelHopperPID, SIGKILL); ++ cfg->channelHopperPID = 0; ++ } ++ if (cfg->channelHopping == 1 && hopCfgChanged) { ++ if (cfg->channelHopperPID) kill(cfg->channelHopperPID, SIGKILL); ++ if ((cfg->channelHopperPID = fork()) == 0) { ++ channelHopper(cfg); ++ } ++ } ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void __cdecl signal_handler(int signum) { ++ if (signum == SIGUSR1) writeJavascript(); ++ if (signum == SIGUSR2) reloadConfig(); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void dealWithPacket(wiviz_cfg * cfg, struct pcap_pkthdr * header, const u_char * packet) { ++ ieee802_11_hdr * hWifi; ++ prism_hdr * hPrism; ++ wiviz_host * host; ++ wiviz_host * emergebss; ++ host_type type = typeUnknown; ++ int wfType; ++ int rssi = 0; ++ int to_ds, from_ds; ++ prism_did * i; ++ ieee_802_11_tag * e; ++ ieee_802_11_mgt_frame * m; ++ char * src = "\0\0\0\0\0\0"; ++ char * dst = "\0\0\0\0\0\0"; ++ char * bss = "\0\0\0\0\0\0"; ++ char * ssid = ""; ++ int channel = 0; ++ int adhocbeacon = 0; ++ u_char ssidlen = 0; ++ ap_enc_type encType = aetUnknown; ++ ++ if (!packet) return; ++ if (header->len < sizeof(prism_hdr) + sizeof(ieee802_11_hdr)) return; ++ hPrism = (prism_hdr *) packet; ++ hWifi = (ieee802_11_hdr *) (packet + (hPrism->msg_length)); ++ ++ //Parse the prism DIDs ++ i = (prism_did *)((char *)hPrism + sizeof(prism_hdr)); ++ while ((int)i < (int)hWifi) { ++ if (i->did == pdn_rssi) rssi = *(int *)(i+1); ++ i = (prism_did *) ((int)(i+1) + i->length); ++ } ++ ++ //Establish the frame type ++ wfType = ((hWifi->frame_control & 0xF0) >> 4) + ((hWifi->frame_control & 0xC) << 2); ++ switch (wfType) { ++ case mgt_assocRequest: ++ case mgt_reassocRequest: ++ case mgt_probeRequest: ++ type = typeSta; ++ src=hWifi->addr2; ++ dst=hWifi->addr1; ++ break; ++ case mgt_assocResponse: ++ case mgt_reassocResponse: ++ case mgt_probeResponse: ++ case mgt_beacon: ++ src=hWifi->addr2; ++ dst=hWifi->addr1; ++ bss=hWifi->addr3; ++ type = typeAP; ++ break; ++ } ++ to_ds = hWifi->flags & IEEE80211_TO_DS; ++ from_ds = hWifi->flags & IEEE80211_FROM_DS; ++ if ((wfType & 0xF0) == 0x20 && (wfType & 0xF) < 4) { ++ //Data frame ++ src=hWifi->addr2; ++ dst=hWifi->addr1; ++ if (!from_ds) type = typeSta; ++ else type = typeAP; ++ if (!to_ds && !from_ds) bss = hWifi->addr3; ++ if (to_ds && !from_ds) bss = hWifi->addr1; ++ if (!to_ds && from_ds) bss = hWifi->addr2; ++ } ++ if (type == typeUnknown) return; ++ ++ //Parse the 802.11 tags ++ if (wfType == mgt_probeResponse || wfType == mgt_beacon) { ++ m = (ieee_802_11_mgt_frame *) (hWifi + 1); ++ if (m->caps & MGT_CAPS_IBSS) { ++ type = typeSta; ++ adhocbeacon = 1; ++ } ++ if (m->caps & MGT_CAPS_WEP) encType = aetEncWEP; ++ else encType = aetUnencrypted; ++ e = (ieee_802_11_tag *) ((int) m + sizeof(ieee_802_11_mgt_frame)); ++ while ((u_int)e < (u_int)packet + header->len) { ++ if (e->tag == tagSSID) { ++ ssidlen = e->length; ++ ssid = (char *)(e + 1); ++ } ++ if (e->tag == tagChannel) { ++ channel = *(char *)(e + 1); ++ } ++ if (e->tag == tagVendorSpecific) { ++ if (e->length >= 4 && memcmp(e + 1, "\x00\x50\xf2\x01", 4) == 0) { ++ //WPA encryption ++ encType = aetEncWPA; ++ } ++ } ++ e = (ieee_802_11_tag *) ((int)(e + 1) + e->length); ++ } ++ } ++ ++ //Look up the host in the hash table ++ host = gotHost(cfg, src, type); ++ ++ //Add any info we received ++ if (host->RSSI) { ++ host->RSSI = host->RSSI * 9 / 10 + (-rssi * 10); ++ } ++ else { ++ host->RSSI = -rssi * 100; ++ } ++ if (type == typeSta) { ++ if (nonzeromac(bss)) { ++ memcpy(host->staInfo->connectedBSSID, bss, 6); ++ host->staInfo->state = ssAssociated; ++ emergebss = gotHost(cfg, bss, typeAP); ++ if (emergebss->RSSI == 0) emergebss->RSSI = 10000; ++ memcpy(emergebss->apInfo->bssid, bss, 6); ++ if (adhocbeacon) { ++ emergebss->type = typeAdhocHub; ++ if (ssidlen > 0 && ssidlen <= 32) { ++ memcpy(emergebss->apInfo->ssid, ssid, ssidlen); ++ emergebss->apInfo->ssidlen = ssidlen; ++ } ++ if (channel) emergebss->apInfo->channel = channel; ++ emergebss->apInfo->flags = hWifi->flags; ++ emergebss->RSSI = host->RSSI; ++ if (encType != aetUnknown) emergebss->apInfo->encryption = encType; ++ } ++ } ++ if (wfType == mgt_probeRequest && host->staInfo->state == ssUnknown) host->staInfo->state = ssUnassociated; ++ } ++ if (type == typeAP) { ++ if (nonzeromac(bss)) { ++ memcpy(host->apInfo->bssid, bss, 6); ++ } ++ if (ssidlen > 0 && ssidlen <= 32) { ++ memcpy(host->apInfo->ssid, ssid, ssidlen); ++ host->apInfo->ssidlen = ssidlen; ++ } ++ if (channel) host->apInfo->channel = channel; ++ host->apInfo->flags = hWifi->flags; ++ if (encType != aetUnknown) host->apInfo->encryption = encType; ++ } ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void print_mac(u_char * mac, char * extra) { ++ fprint_mac(stdout, mac, extra); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void fprint_mac(FILE * outf, u_char * mac, char * extra) { ++ fprintf(outf, "%02X:%02X:%02X:%02X:%02X:%02X%s", ++ mac[0] & 0xFF, ++ mac[1] & 0xFF, ++ mac[2] & 0xFF, ++ mac[3] & 0xFF, ++ mac[4] & 0xFF, ++ mac[5] & 0xFF, ++ extra); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++#define MAX_PROBES MAX_HOSTS/2 ++wiviz_host * gotHost(wiviz_cfg * cfg, u_char * mac, host_type type) { ++ int i = (mac[5] + (mac[4] << 8)) % MAX_HOSTS; ++ int c = 0; ++ wiviz_host * h = cfg->hosts + i; ++ while (h->occupied && memcmp(h->mac, mac, 6)) { ++ i++; h++; c++; ++ if (i >= MAX_HOSTS) { ++ i = 0; ++ h = cfg->hosts; ++ } ++ if (c > MAX_PROBES) break; ++ } ++ if (!h->occupied) { ++ fprintf(stderr, "New host, "); ++ fprint_mac(stderr, mac, ", type="); ++ fprintf(stderr, "%s\n", (type==typeAP) ? "AP" : ((type==typeSta) ? "Sta" : "Unk")); ++ } ++ h->occupied = 1; ++ h->lastSeen = time(NULL); ++ h->type = type; ++ memcpy(h->mac, mac, 6); ++ if (h->type == typeAP && !h->apInfo) { ++ h->apInfo = (ap_info *) malloc(sizeof(ap_info)); ++ memset(h->apInfo, 0, sizeof(ap_info)); ++ } ++ if (h->type == typeSta && !h->staInfo) { ++ h->staInfo = (sta_info *) malloc(sizeof(sta_info)); ++ memset(h->staInfo, 0, sizeof(sta_info)); ++ } ++ return h; ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++void print_host(FILE * outf, wiviz_host * host) { ++ int i; ++ ++ if (!host->occupied) return; ++ fprintf(outf, "'"); ++ fprint_mac(outf, host->mac, "'"); ++ fprintf(outf, ", -%i, '", host->RSSI / 100); ++ switch (host->type) { ++ case typeAP: fprintf(outf, "ap"); break; ++ case typeSta: fprintf(outf, "sta"); break; ++ case typeAdhocHub: fprintf(outf, "adhoc"); break; ++ } ++ if (host->type == typeSta) { ++ switch(host->staInfo->state) { ++ case ssAssociated: ++ fprintf(outf, "-assoc-"); ++ fprint_mac(outf, host->staInfo->connectedBSSID, ""); ++ break; ++ case ssUnassociated: ++ fprintf(outf, "-unassoc"); ++ } ++ } ++ if (host->type == typeAP || host->type == typeAdhocHub) { ++ fprintf(outf, "-channel-%i-ssid-", host->apInfo->channel & 0xFF); ++ for (i = 0; i < host->apInfo->ssidlen; i++) { ++ fprintf(outf, "\\x%02X", *((char *)host->apInfo->ssid + i) & 0xFF); ++ } ++ switch (host->apInfo->encryption) { ++ case aetUnknown: fprintf(outf, "-?enc-?alg"); break; ++ case aetUnencrypted: fprintf(outf, "-unenc-na"); break; ++ case aetEncUnknown: fprintf(outf, "-enc-unknown"); break; ++ case aetEncWEP: fprintf(outf, "-enc-wep"); break; ++ case aetEncWPA: fprintf(outf, "-enc-wpa"); break; ++ } ++ } ++ fprintf(outf, "', %i", time(0) - host->lastSeen); ++ } ++ ++//////////////////////////////////////////////////////////////////////////////// ++#define MAX_STA_COUNT 64 ++void readWL(wiviz_cfg * cfg) { ++ int ap, i; ++ wiviz_host * host, * sta; ++ uchar mac[6]; ++ wlc_ssid_t ssid; ++ channel_info_t channel; ++ maclist_t * macs; ++ sta_rssi_t starssi; ++ ++ get_mac(WL_DEVICE, mac); ++ printf("AP mac: "); ++ print_mac(mac, "\n"); ++ if (!nonzeromac(mac)) return; ++ wl_ioctl(WL_DEVICE, WLC_GET_AP, &ap, 4); ++ if (ap) { ++ host = gotHost(cfg, mac, typeAP); ++ wl_ioctl(WL_DEVICE, WLC_GET_BSSID, host->apInfo->bssid, 6); ++ wl_ioctl(WL_DEVICE, WLC_GET_SSID, &ssid, sizeof(wlc_ssid_t)); ++ memcpy(host->apInfo->ssid, ssid.SSID, 32); ++ host->apInfo->ssidlen = ssid.SSID_len; ++ host->RSSI = 0; ++ wl_ioctl(WL_DEVICE, WLC_GET_CHANNEL, &channel, sizeof(channel_info_t)); ++ host->apInfo->channel = channel.hw_channel; ++ macs = (maclist_t *) malloc(4 + MAX_STA_COUNT * sizeof(ether_addr_t)); ++ macs->count = MAX_STA_COUNT; ++ if (wl_ioctl(WL_DEVICE, WLC_GET_ASSOCLIST, macs, 4 + MAX_STA_COUNT * sizeof(ether_addr_t)) > -1) { ++ for (i = 0; i < macs->count; i++) { ++ sta = gotHost(cfg, (char *)&macs->ea[i], typeSta); ++ memcpy(starssi.mac, &macs->ea[i], 6); ++ starssi.RSSI = 3000; ++ starssi.zero_ex_forty_one = 0x41; ++ if (wl_ioctl(WL_DEVICE, WLC_GET_RSSI, &starssi, 12) < 0) printf("rssifail\n"); ++ sta->RSSI = -starssi.RSSI * 100; ++ sta->staInfo->state = ssAssociated; ++ memcpy(sta->staInfo->connectedBSSID, host->apInfo->bssid, 6); ++ } ++ } ++ } ++ else { ++ host = gotHost(cfg, mac, typeSta); ++ host->RSSI = 0; ++ if (wl_ioctl(WL_DEVICE, WLC_GET_BSSID, &host->staInfo->connectedBSSID, 6) < 0) { ++ host->staInfo->state = ssUnassociated; ++ } ++ else { ++ host->staInfo->state = ssAssociated; ++ } ++ } ++ if (wl_ioctl(WL_DEVICE, WLC_GET_CHANNEL, &channel, sizeof(channel_info_t)) >= 0) { ++ cfg->curChannel = channel.hw_channel; ++ fprintf(stderr, "Current channel is %i\n", cfg->curChannel); ++ } ++} ++ ++ ++ ++ ++ +diff --git a/feeds/packages/net/wiviz/src/wl_access.c b/feeds/packages/net/wiviz/src/wl_access.c +new file mode 100644 +index 0000000..a5172c3 +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/wl_access.c +@@ -0,0 +1,73 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "wl_access.h" ++ ++int wl_ioctl(char *name, int cmd, void *buf, int len) ++{ ++ struct ifreq ifr; ++ wl_ioctl_t ioc; ++ int ret = 0; ++ int s; ++ ++ /* open socket to kernel */ ++ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ++ perror("socket"); ++ return errno; ++ } ++ ++ /* do it */ ++ ioc.cmd = cmd; ++ ioc.buf = buf; ++ ioc.len = len; ++ strncpy(ifr.ifr_name, name, IFNAMSIZ); ++ ifr.ifr_data = (caddr_t) &ioc; ++ ret = ioctl(s, SIOCDEVPRIVATE, &ifr); ++ ++ /* cleanup */ ++ close(s); ++ return ret; ++} ++ ++int get_mac(char *name, void *buf) ++{ ++ struct ifreq ifr; ++ int ret = 0; ++ int s; ++ ++ /* open socket to kernel */ ++ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ++ perror("socket"); ++ return errno; ++ } ++ ++ strncpy(ifr.ifr_name, name, IFNAMSIZ); ++ //ifr.ifr_data = (caddr_t) buf; ++ if ((ret = ioctl(s, SIOCGIFHWADDR, &ifr)) < 0) ++ perror(ifr.ifr_name); ++ ++ /* cleanup */ ++ close(s); ++ memcpy(buf, &ifr.ifr_hwaddr.sa_data, 6); ++ return ret; ++} +diff --git a/feeds/packages/net/wiviz/src/wl_access.h b/feeds/packages/net/wiviz/src/wl_access.h +new file mode 100644 +index 0000000..96f239d +--- /dev/null ++++ b/feeds/packages/net/wiviz/src/wl_access.h +@@ -0,0 +1,77 @@ ++/* ++This file is part of Wi-viz (http://wiviz.natetrue.com). ++ ++Wi-viz is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License v2 as published by ++the Free Software Foundation. ++ ++Wi-viz 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 Wi-viz; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++//wl_access.h - functions for accessing broadcom crap ++ ++#define WL_DEVICE "eth1" ++ ++typedef unsigned int uint32; ++typedef unsigned char uchar; ++typedef int bool; ++ ++typedef struct ether_addr { ++ uchar addr[6]; ++} ether_addr_t; ++ ++typedef struct wlc_ssid { ++ uint32 SSID_len; ++ uchar SSID[32]; ++} wlc_ssid_t; ++/* For ioctls that take a list of MAC addresses */ ++typedef struct maclist { ++ uint count; /* number of MAC addresses */ ++ struct ether_addr ea[1]; /* variable length array of MAC addresses */ ++} maclist_t; ++/* Linux network driver ioctl encoding */ ++typedef struct wl_ioctl { ++ uint cmd; /* common ioctl definition */ ++ void *buf; /* pointer to user buffer */ ++ uint len; /* length of user buffer */ ++ bool set; /* get or set request (optional) */ ++ uint used; /* bytes read or written (optional) */ ++ uint needed; /* bytes needed (optional) */ ++} wl_ioctl_t; ++/* channel encoding */ ++typedef struct channel_info { ++ int hw_channel; ++ int target_channel; ++ int scan_channel; ++} channel_info_t; ++/* RSSI info for sta */ ++typedef struct sta_rssi { ++ int RSSI; ++ char mac[6]; ++ u_short zero_ex_forty_one; ++ } sta_rssi_t; ++/* check this magic number */ ++#define WLC_IOCTL_MAGIC 0x14e46c77 ++ ++#define WLC_GET_MAGIC 0 ++#define WLC_GET_BSSID 23 ++#define WLC_SET_BSSID 24 ++#define WLC_GET_SSID 25 ++#define WLC_SET_SSID 26 ++#define WLC_GET_CHANNEL 29 ++#define WLC_SET_CHANNEL 30 ++#define WLC_GET_MONITOR 107 /* discovered by nbd */ ++#define WLC_SET_MONITOR 108 /* discovered by nbd */ ++#define WLC_GET_AP 117 ++#define WLC_SET_AP 118 ++#define WLC_GET_RSSI 127 ++#define WLC_GET_ASSOCLIST 159 ++ ++ ++int wl_ioctl(char *name, int cmd, void *buf, int len); +diff --git a/feeds/packages/net/wknock/.svn/entries b/feeds/packages/net/wknock/.svn/entries +new file mode 100644 +index 0000000..400aa89 +--- /dev/null ++++ b/feeds/packages/net/wknock/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wknock ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-29T12:56:17.373975Z ++15480 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++10e7b92ee2b16de8e7c05666aa8752c4 ++2009-04-29T12:56:17.373975Z ++15480 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1178 ++ +diff --git a/feeds/packages/net/wknock/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/wknock/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/wknock/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wknock/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wknock/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..96cd269 +--- /dev/null ++++ b/feeds/packages/net/wknock/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 2006-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:=wknock ++PKG_VERSION:=1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).tar.gz ++PKG_SOURCE_URL:=http://blackhat.com/presentations/bh-europe-05/BH_EU_05-Oudot/ ++PKG_MD5SUM:=6b7a1f3cbb0af88da02e5d30cefd8e7f ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wknock ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=kmod-brcm-wl +libpcap ++ TITLE:=A tool to hide your Access Point against opportunistic attackers. ++ URL:=http://www.rstack.org/oudot/wknock/ ++endef ++ ++define Package/wknock/description ++tool to hide your Access Point against opportunistic attackers. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lpcap" \ ++ all ++endef ++ ++define Package/wknock/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wknock $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wknock-ng $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,wknock)) +diff --git a/feeds/packages/net/wknock/Makefile b/feeds/packages/net/wknock/Makefile +new file mode 100644 +index 0000000..96cd269 +--- /dev/null ++++ b/feeds/packages/net/wknock/Makefile +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 2006-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:=wknock ++PKG_VERSION:=1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).tar.gz ++PKG_SOURCE_URL:=http://blackhat.com/presentations/bh-europe-05/BH_EU_05-Oudot/ ++PKG_MD5SUM:=6b7a1f3cbb0af88da02e5d30cefd8e7f ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wknock ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=kmod-brcm-wl +libpcap ++ TITLE:=A tool to hide your Access Point against opportunistic attackers. ++ URL:=http://www.rstack.org/oudot/wknock/ ++endef ++ ++define Package/wknock/description ++tool to hide your Access Point against opportunistic attackers. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lpcap" \ ++ all ++endef ++ ++define Package/wknock/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wknock $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wknock-ng $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,wknock)) +diff --git a/feeds/packages/net/wol/.svn/entries b/feeds/packages/net/wol/.svn/entries +new file mode 100644 +index 0000000..315fc96 +--- /dev/null ++++ b/feeds/packages/net/wol/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wol ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++dac10943b556b1efae54bcb4785a0125 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1299 ++ +diff --git a/feeds/packages/net/wol/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/wol/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ac8620 +--- /dev/null ++++ b/feeds/packages/net/wol/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wol/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wol/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..286442c +--- /dev/null ++++ b/feeds/packages/net/wol/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# 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:=wol ++PKG_VERSION:=0.7.1 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_URL:=@SF/ahh ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=c2fa9d7e771134ac8c89d56b8197d4ca ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wol ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Wake On LAN client ++ URL:=http://ahh.sourceforge.net/wol/ ++endef ++ ++define Package/wol/description ++ wol implements Wake On LAN functionality in a small program. ++ It wakes up hardware that is Magic Packet compliant. ++endef ++ ++CONFIGURE_VARS += \ ++ ac_cv_func_malloc_0_nonnull=yes \ ++ ac_cv_func_realloc_0_nonnull=yes \ ++ ac_cv_func_mmap_fixed_mapped=yes \ ++ jm_cv_func_working_malloc=yes \ ++ ac_cv_func_alloca_works=yes \ ++ ++define Package/wol/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(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 ++ ++define Package/wol/conffiles ++/etc/config/wol ++endef ++ ++$(eval $(call BuildPackage,wol)) +diff --git a/feeds/packages/net/wol/Makefile b/feeds/packages/net/wol/Makefile +new file mode 100644 +index 0000000..286442c +--- /dev/null ++++ b/feeds/packages/net/wol/Makefile +@@ -0,0 +1,54 @@ ++# ++# 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:=wol ++PKG_VERSION:=0.7.1 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_URL:=@SF/ahh ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=c2fa9d7e771134ac8c89d56b8197d4ca ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wol ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=Wake On LAN client ++ URL:=http://ahh.sourceforge.net/wol/ ++endef ++ ++define Package/wol/description ++ wol implements Wake On LAN functionality in a small program. ++ It wakes up hardware that is Magic Packet compliant. ++endef ++ ++CONFIGURE_VARS += \ ++ ac_cv_func_malloc_0_nonnull=yes \ ++ ac_cv_func_realloc_0_nonnull=yes \ ++ ac_cv_func_mmap_fixed_mapped=yes \ ++ jm_cv_func_working_malloc=yes \ ++ ac_cv_func_alloca_works=yes \ ++ ++define Package/wol/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(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 ++ ++define Package/wol/conffiles ++/etc/config/wol ++endef ++ ++$(eval $(call BuildPackage,wol)) +diff --git a/feeds/packages/net/wol/files/.svn/entries b/feeds/packages/net/wol/files/.svn/entries +new file mode 100644 +index 0000000..a4ccd9f +--- /dev/null ++++ b/feeds/packages/net/wol/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wol/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-09-19T21:31:51.998613Z ++8850 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wol.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++71760302ebaa3a5b685a0fc4ede56592 ++2007-09-19T21:31:51.998613Z ++8850 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++596 ++ ++wol.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++beef919a0cef38215f37fdfe4db1a5fe ++2007-09-19T21:31:51.998613Z ++8850 ++olli ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++61 ++ +diff --git a/feeds/packages/net/wol/files/.svn/prop-base/wol.config.svn-base b/feeds/packages/net/wol/files/.svn/prop-base/wol.config.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wol/files/.svn/prop-base/wol.config.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wol/files/.svn/prop-base/wol.init.svn-base b/feeds/packages/net/wol/files/.svn/prop-base/wol.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/wol/files/.svn/prop-base/wol.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wol/files/.svn/text-base/wol.config.svn-base b/feeds/packages/net/wol/files/.svn/text-base/wol.config.svn-base +new file mode 100644 +index 0000000..f49c96f +--- /dev/null ++++ b/feeds/packages/net/wol/files/.svn/text-base/wol.config.svn-base +@@ -0,0 +1,3 @@ ++config wol-target ++ option mac '' ++ option enabled '0' +diff --git a/feeds/packages/net/wol/files/.svn/text-base/wol.init.svn-base b/feeds/packages/net/wol/files/.svn/text-base/wol.init.svn-base +new file mode 100644 +index 0000000..18be829 +--- /dev/null ++++ b/feeds/packages/net/wol/files/.svn/text-base/wol.init.svn-base +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007 OpenWrt.org ++ ++START=60 ++ ++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 cfg="$1" ++ args="" ++ ++ append_string "$cfg" broadcast "--host=" ++ append_string "$cfg" port "--port=" ++ append_string "$cfg" password "--passwd=" ++ append_string "$cfg" mac "" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ "$enabled" -gt 0 ] && /usr/bin/wol $args ++} ++ ++start() { ++ config_load wol ++ config_foreach start_service wol-target ++} +diff --git a/feeds/packages/net/wol/files/wol.config b/feeds/packages/net/wol/files/wol.config +new file mode 100644 +index 0000000..f49c96f +--- /dev/null ++++ b/feeds/packages/net/wol/files/wol.config +@@ -0,0 +1,3 @@ ++config wol-target ++ option mac '' ++ option enabled '0' +diff --git a/feeds/packages/net/wol/files/wol.init b/feeds/packages/net/wol/files/wol.init +new file mode 100644 +index 0000000..18be829 +--- /dev/null ++++ b/feeds/packages/net/wol/files/wol.init +@@ -0,0 +1,30 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007 OpenWrt.org ++ ++START=60 ++ ++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 cfg="$1" ++ args="" ++ ++ append_string "$cfg" broadcast "--host=" ++ append_string "$cfg" port "--port=" ++ append_string "$cfg" password "--passwd=" ++ append_string "$cfg" mac "" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ "$enabled" -gt 0 ] && /usr/bin/wol $args ++} ++ ++start() { ++ config_load wol ++ config_foreach start_service wol-target ++} +diff --git a/feeds/packages/net/wprobe/.svn/entries b/feeds/packages/net/wprobe/.svn/entries +new file mode 100644 +index 0000000..1dd01fd +--- /dev/null ++++ b/feeds/packages/net/wprobe/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-16T14:05:21.128793Z ++35185 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++0120a992f810dafab99cf5f84fbed575 ++2013-01-16T14:05:21.128793Z ++35185 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3813 ++ +diff --git a/feeds/packages/net/wprobe/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wprobe/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fe80453 +--- /dev/null ++++ b/feeds/packages/net/wprobe/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,143 @@ ++# ++# Copyright (C) 2008-2013 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:=wprobe ++PKG_VERSION:=1 ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix ++ ++PKG_CONFIG_DEPENDS = \ ++ CONFIG_PACKAGE_kmod-wprobe \ ++ CONFIG_PACKAGE_wprobe-export \ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++# XXX: build failure on cris ++# wprobe-lib.c:145: error: 'packed' attribute ignored for field of type 'struct ' ++# wprobe-lib.c:149: error: 'packed' attribute ignored for field of type 'struct ' ++ ++define Package/wprobe/Default ++ DEPENDS:=@(!(TARGET_ps3||TARGET_pxcab||cris)||BROKEN) ++endef ++ ++define KernelPackage/wprobe ++$(call Package/wprobe/Default) ++ SUBMENU:=Network Support ++ TITLE:=Wireless driver probe infrastructure ++ MAINTAINER:=Felix Fietkau ++ FILES:= \ ++ $(PKG_BUILD_DIR)/kernel/wprobe.ko ++ AUTOLOAD:=$(call AutoLoad,01,wprobe) ++endef ++ ++define KernelPackage/wprobe/description ++ A module that exports measurement data from wireless driver to user space ++endef ++ ++define Package/wprobe-util ++$(call Package/wprobe/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+=+kmod-wprobe +libnl-tiny ++ TITLE:=Wireless measurement utility ++endef ++ ++define Package/wprobe-util/description ++ wprobe-util uses the wprobe kernel module to query ++ wireless driver measurement data from an interface ++endef ++ ++define Package/wprobe-export ++$(call Package/wprobe/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+=+wprobe-util ++ TITLE:=Wireless measurement data exporter ++endef ++ ++define Package/wprobe-export/description ++ wprobe-export uses the wprobe kernel module to export ++ wireless driver measurement data via the IPFIX protocol ++endef ++ ++define Package/wprobe-export/conffiles ++/etc/config/wprobe ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) src/* $(PKG_BUILD_DIR)/ ++endef ++ ++TARGET_CPPFLAGS := \ ++ -D_GNU_SOURCE \ ++ -I$(STAGING_DIR)/usr/include/libnl-tiny \ ++ $(TARGET_CPPFLAGS) ++ ++ifdef CONFIG_PACKAGE_kmod-wprobe ++ define Build/Compile/kmod ++ $(MAKE) -C $(LINUX_DIR) \ ++ CROSS_COMPILE="$(KERNEL_CROSS)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ SUBDIRS="$(PKG_BUILD_DIR)/kernel" \ ++ KERNELDIR=$(LINUX_DIR) \ ++ CC="$(TARGET_CC)" \ ++ EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/kernel" \ ++ modules ++ endef ++endif ++ ++define Build/Compile/lib ++ $(MAKE) -C $(PKG_BUILD_DIR)/user \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ HOST_OS=Linux \ ++ LIBNL="-lnl-tiny" ++endef ++ ++ifdef CONFIG_PACKAGE_wprobe-export ++ define Build/Compile/exporter ++ $(MAKE) -C $(PKG_BUILD_DIR)/exporter \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libipfixmisc.a -lnl-tiny -lm" ++ endef ++endif ++ ++define Build/Compile ++ $(Build/Compile/kmod) ++ $(Build/Compile/lib) ++ $(Build/Compile/exporter) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/wprobe ++ $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include/wprobe ++endef ++ ++define Package/wprobe-util/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/user/wprobe-util $(1)/sbin/ ++endef ++ ++define Package/wprobe-export/install ++ $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config ++ $(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/wprobe ++ $(INSTALL_BIN) ./files/wprobe.config $(1)/etc/config/wprobe ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/exporter/wprobe-export $(1)/sbin/ ++endef ++ ++$(eval $(call KernelPackage,wprobe)) ++$(eval $(call BuildPackage,wprobe-util)) ++$(eval $(call BuildPackage,wprobe-export)) +diff --git a/feeds/packages/net/wprobe/Makefile b/feeds/packages/net/wprobe/Makefile +new file mode 100644 +index 0000000..fe80453 +--- /dev/null ++++ b/feeds/packages/net/wprobe/Makefile +@@ -0,0 +1,143 @@ ++# ++# Copyright (C) 2008-2013 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:=wprobe ++PKG_VERSION:=1 ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix ++ ++PKG_CONFIG_DEPENDS = \ ++ CONFIG_PACKAGE_kmod-wprobe \ ++ CONFIG_PACKAGE_wprobe-export \ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++# XXX: build failure on cris ++# wprobe-lib.c:145: error: 'packed' attribute ignored for field of type 'struct ' ++# wprobe-lib.c:149: error: 'packed' attribute ignored for field of type 'struct ' ++ ++define Package/wprobe/Default ++ DEPENDS:=@(!(TARGET_ps3||TARGET_pxcab||cris)||BROKEN) ++endef ++ ++define KernelPackage/wprobe ++$(call Package/wprobe/Default) ++ SUBMENU:=Network Support ++ TITLE:=Wireless driver probe infrastructure ++ MAINTAINER:=Felix Fietkau ++ FILES:= \ ++ $(PKG_BUILD_DIR)/kernel/wprobe.ko ++ AUTOLOAD:=$(call AutoLoad,01,wprobe) ++endef ++ ++define KernelPackage/wprobe/description ++ A module that exports measurement data from wireless driver to user space ++endef ++ ++define Package/wprobe-util ++$(call Package/wprobe/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+=+kmod-wprobe +libnl-tiny ++ TITLE:=Wireless measurement utility ++endef ++ ++define Package/wprobe-util/description ++ wprobe-util uses the wprobe kernel module to query ++ wireless driver measurement data from an interface ++endef ++ ++define Package/wprobe-export ++$(call Package/wprobe/Default) ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS+=+wprobe-util ++ TITLE:=Wireless measurement data exporter ++endef ++ ++define Package/wprobe-export/description ++ wprobe-export uses the wprobe kernel module to export ++ wireless driver measurement data via the IPFIX protocol ++endef ++ ++define Package/wprobe-export/conffiles ++/etc/config/wprobe ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) src/* $(PKG_BUILD_DIR)/ ++endef ++ ++TARGET_CPPFLAGS := \ ++ -D_GNU_SOURCE \ ++ -I$(STAGING_DIR)/usr/include/libnl-tiny \ ++ $(TARGET_CPPFLAGS) ++ ++ifdef CONFIG_PACKAGE_kmod-wprobe ++ define Build/Compile/kmod ++ $(MAKE) -C $(LINUX_DIR) \ ++ CROSS_COMPILE="$(KERNEL_CROSS)" \ ++ ARCH="$(LINUX_KARCH)" \ ++ SUBDIRS="$(PKG_BUILD_DIR)/kernel" \ ++ KERNELDIR=$(LINUX_DIR) \ ++ CC="$(TARGET_CC)" \ ++ EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/kernel" \ ++ modules ++ endef ++endif ++ ++define Build/Compile/lib ++ $(MAKE) -C $(PKG_BUILD_DIR)/user \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ HOST_OS=Linux \ ++ LIBNL="-lnl-tiny" ++endef ++ ++ifdef CONFIG_PACKAGE_wprobe-export ++ define Build/Compile/exporter ++ $(MAKE) -C $(PKG_BUILD_DIR)/exporter \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libipfixmisc.a -lnl-tiny -lm" ++ endef ++endif ++ ++define Build/Compile ++ $(Build/Compile/kmod) ++ $(Build/Compile/lib) ++ $(Build/Compile/exporter) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/wprobe ++ $(CP) $(PKG_BUILD_DIR)/kernel/linux $(1)/usr/include/wprobe ++endef ++ ++define Package/wprobe-util/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/user/wprobe-util $(1)/sbin/ ++endef ++ ++define Package/wprobe-export/install ++ $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config ++ $(INSTALL_BIN) ./files/wprobe.init $(1)/etc/init.d/wprobe ++ $(INSTALL_BIN) ./files/wprobe.config $(1)/etc/config/wprobe ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/exporter/wprobe-export $(1)/sbin/ ++endef ++ ++$(eval $(call KernelPackage,wprobe)) ++$(eval $(call BuildPackage,wprobe-util)) ++$(eval $(call BuildPackage,wprobe-export)) +diff --git a/feeds/packages/net/wprobe/files/.svn/entries b/feeds/packages/net/wprobe/files/.svn/entries +new file mode 100644 +index 0000000..f0839ba +--- /dev/null ++++ b/feeds/packages/net/wprobe/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-26T19:21:10.171591Z ++18946 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wprobe.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++90c3c13846f1e97d5a480630846e4a36 ++2009-12-26T19:21:10.171591Z ++18946 ++agb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1593 ++ ++wprobe.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++13c41428860cb86b1ecabdf779f6c4d5 ++2009-07-07T00:38:42.886260Z ++16724 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++217 ++ +diff --git a/feeds/packages/net/wprobe/files/.svn/prop-base/wprobe.init.svn-base b/feeds/packages/net/wprobe/files/.svn/prop-base/wprobe.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/net/wprobe/files/.svn/prop-base/wprobe.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/net/wprobe/files/.svn/text-base/wprobe.config.svn-base b/feeds/packages/net/wprobe/files/.svn/text-base/wprobe.config.svn-base +new file mode 100644 +index 0000000..63518ef +--- /dev/null ++++ b/feeds/packages/net/wprobe/files/.svn/text-base/wprobe.config.svn-base +@@ -0,0 +1,10 @@ ++config export ++ # uncomment this line to enable ipfix export: ++ # option type ipfix ++ option ifname ath0 ++ option host ipfix-col ++ option proto tcp ++ ++# enable public wprobe protocol access ++config export ++ option type wprobe +diff --git a/feeds/packages/net/wprobe/files/.svn/text-base/wprobe.init.svn-base b/feeds/packages/net/wprobe/files/.svn/text-base/wprobe.init.svn-base +new file mode 100644 +index 0000000..b35246d +--- /dev/null ++++ b/feeds/packages/net/wprobe/files/.svn/text-base/wprobe.init.svn-base +@@ -0,0 +1,72 @@ ++#!/bin/sh /etc/rc.common ++START=90 ++EXPORTER=/sbin/wprobe-export ++UTIL=/sbin/wprobe-util ++ ++wprobe_ssd() { ++ local cmd="$1"; shift ++ local type="$1"; shift ++ local app="$1"; shift ++ start-stop-daemon "$cmd" -p "/var/run/wprobe-$type.pid" -b ${app:+-x "$app"} -m -- "$@" ++} ++ ++stop_wprobe() { ++ local type="$1" ++ [ -f "/var/run/wprobe-$type.pid" ] && wprobe_ssd -K "$type" ++ rm -f "/var/run/wprobe-$type.pid" ++} ++ ++config_wprobe() { ++ config_get ifname "$cfg" ifname ++ config_get interval "$cfg" interval ++ [ -n "$interval" ] || interval=100 ++ $UTIL "$ifname" -i "$interval" 2>/dev/null >/dev/null ++} ++ ++start_proxy() { ++ config_get port "$cfg" port ++ wprobe_ssd -S proxy "$UTIL" -P -p "${port:-17990}" ++} ++ ++start_ipfix() { ++ local cfg="$1" ++ config_get ifname "$cfg" ifname ++ config_get host "$cfg" host ++ config_get port "$cfg" port ++ config_get proto "$cfg" proto ++ case "$proto" in ++ sctp) proto="-s";; ++ tcp) proto="-t";; ++ udp) proto="-u";; ++ *) proto="-t";; ++ esac ++ [ -z "$ifname" -o -z "$host" ] && { ++ echo "wprobe-export: missing host or interface name in config $cfg" ++ return ++ } ++ config_wprobe "$cfg" ++ wprobe_ssd -S "export-$cfg" "$EXPORTER" "$proto" -i "$ifname" -c "$host" -p "${port:-4739}" ++} ++ ++start_export() { ++ local cfg="$1" ++ config_get export_type "$cfg" type ++ case "$export_type" in ++ ipfix) [ -x "$EXPORTER" ] && start_ipfix "$cfg";; ++ wprobe) start_proxy "$cfg";; ++ esac ++} ++ ++stop() { ++ for f in /var/run/wprobe-*.pid; do ++ CFG="${f%%.pid}" ++ CFG="${CFG##/var/run/wprobe-}" ++ stop_wprobe "$CFG" ++ done ++} ++ ++start() { ++ config_load wprobe ++ config_foreach config_wprobe interface ++ config_foreach start_export export ++} +diff --git a/feeds/packages/net/wprobe/files/wprobe.config b/feeds/packages/net/wprobe/files/wprobe.config +new file mode 100644 +index 0000000..63518ef +--- /dev/null ++++ b/feeds/packages/net/wprobe/files/wprobe.config +@@ -0,0 +1,10 @@ ++config export ++ # uncomment this line to enable ipfix export: ++ # option type ipfix ++ option ifname ath0 ++ option host ipfix-col ++ option proto tcp ++ ++# enable public wprobe protocol access ++config export ++ option type wprobe +diff --git a/feeds/packages/net/wprobe/files/wprobe.init b/feeds/packages/net/wprobe/files/wprobe.init +new file mode 100755 +index 0000000..b35246d +--- /dev/null ++++ b/feeds/packages/net/wprobe/files/wprobe.init +@@ -0,0 +1,72 @@ ++#!/bin/sh /etc/rc.common ++START=90 ++EXPORTER=/sbin/wprobe-export ++UTIL=/sbin/wprobe-util ++ ++wprobe_ssd() { ++ local cmd="$1"; shift ++ local type="$1"; shift ++ local app="$1"; shift ++ start-stop-daemon "$cmd" -p "/var/run/wprobe-$type.pid" -b ${app:+-x "$app"} -m -- "$@" ++} ++ ++stop_wprobe() { ++ local type="$1" ++ [ -f "/var/run/wprobe-$type.pid" ] && wprobe_ssd -K "$type" ++ rm -f "/var/run/wprobe-$type.pid" ++} ++ ++config_wprobe() { ++ config_get ifname "$cfg" ifname ++ config_get interval "$cfg" interval ++ [ -n "$interval" ] || interval=100 ++ $UTIL "$ifname" -i "$interval" 2>/dev/null >/dev/null ++} ++ ++start_proxy() { ++ config_get port "$cfg" port ++ wprobe_ssd -S proxy "$UTIL" -P -p "${port:-17990}" ++} ++ ++start_ipfix() { ++ local cfg="$1" ++ config_get ifname "$cfg" ifname ++ config_get host "$cfg" host ++ config_get port "$cfg" port ++ config_get proto "$cfg" proto ++ case "$proto" in ++ sctp) proto="-s";; ++ tcp) proto="-t";; ++ udp) proto="-u";; ++ *) proto="-t";; ++ esac ++ [ -z "$ifname" -o -z "$host" ] && { ++ echo "wprobe-export: missing host or interface name in config $cfg" ++ return ++ } ++ config_wprobe "$cfg" ++ wprobe_ssd -S "export-$cfg" "$EXPORTER" "$proto" -i "$ifname" -c "$host" -p "${port:-4739}" ++} ++ ++start_export() { ++ local cfg="$1" ++ config_get export_type "$cfg" type ++ case "$export_type" in ++ ipfix) [ -x "$EXPORTER" ] && start_ipfix "$cfg";; ++ wprobe) start_proxy "$cfg";; ++ esac ++} ++ ++stop() { ++ for f in /var/run/wprobe-*.pid; do ++ CFG="${f%%.pid}" ++ CFG="${CFG##/var/run/wprobe-}" ++ stop_wprobe "$CFG" ++ done ++} ++ ++start() { ++ config_load wprobe ++ config_foreach config_wprobe interface ++ config_foreach start_export export ++} +diff --git a/feeds/packages/net/wprobe/src/.svn/entries b/feeds/packages/net/wprobe/src/.svn/entries +new file mode 100644 +index 0000000..e4e4691 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/.svn/entries +@@ -0,0 +1,74 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-16T14:05:21.128793Z ++35185 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++kernel ++dir ++ ++filter ++dir ++ ++Makefile.inc ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++71da27827c3449bb1b6e61c902e10a3f ++2009-08-16T10:26:22.877176Z ++17287 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++125 ++ ++exporter ++dir ++ ++user ++dir ++ +diff --git a/feeds/packages/net/wprobe/src/.svn/text-base/Makefile.inc.svn-base b/feeds/packages/net/wprobe/src/.svn/text-base/Makefile.inc.svn-base +new file mode 100644 +index 0000000..5044c0a +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/.svn/text-base/Makefile.inc.svn-base +@@ -0,0 +1,12 @@ ++HOST_OS=$(shell uname) ++ ++CC=gcc ++AR=ar ++RANLIB=ranlib ++ ++WFLAGS = -Wall -Werror -Wno-format ++CFLAGS?=-O2 ++CPPFLAGS= ++LDFLAGS= ++LIBS= ++ +diff --git a/feeds/packages/net/wprobe/src/Makefile.inc b/feeds/packages/net/wprobe/src/Makefile.inc +new file mode 100644 +index 0000000..5044c0a +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/Makefile.inc +@@ -0,0 +1,12 @@ ++HOST_OS=$(shell uname) ++ ++CC=gcc ++AR=ar ++RANLIB=ranlib ++ ++WFLAGS = -Wall -Werror -Wno-format ++CFLAGS?=-O2 ++CPPFLAGS= ++LDFLAGS= ++LIBS= ++ +diff --git a/feeds/packages/net/wprobe/src/exporter/.svn/entries b/feeds/packages/net/wprobe/src/exporter/.svn/entries +new file mode 100644 +index 0000000..68714bc +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/src/exporter ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-24T10:34:29.081156Z ++18919 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wprobe-export.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++621e8571f3f303c53789361fbe6fc39e ++2009-03-26T20:56:47.167064Z ++15050 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++676 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++5f6ec001241250b1c6f68f3959490604 ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++147 ++ ++wprobe-export.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++9c9dd91c918b307a6842b4a1d2f7dbaa ++2009-12-24T10:34:29.081156Z ++18919 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7377 ++ +diff --git a/feeds/packages/net/wprobe/src/exporter/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wprobe/src/exporter/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9f81507 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++include ../Makefile.inc ++CPPFLAGS += -I../kernel -I../user ++ ++wprobe-export: wprobe-export.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) +diff --git a/feeds/packages/net/wprobe/src/exporter/.svn/text-base/wprobe-export.c.svn-base b/feeds/packages/net/wprobe/src/exporter/.svn/text-base/wprobe-export.c.svn-base +new file mode 100644 +index 0000000..a0e52e2 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/.svn/text-base/wprobe-export.c.svn-base +@@ -0,0 +1,304 @@ ++/* ++** exporter.c - example exporter ++** ++** Copyright Fraunhofer FOKUS ++** ++*/ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++static ipfix_datarecord_t g_data = { NULL, NULL, 0 }; ++static int do_close = 0; ++ ++struct wprobe_mapping { ++ int id; ++ bool counter; ++ const char *wprobe_id; ++ struct wprobe_value *val; ++}; ++ ++#ifndef ARRAY_SIZE ++#define ARRAY_SIZE(_array) (sizeof(_array) / sizeof((_array)[0])) ++#endif ++ ++#define WMAP(_id, _name, ...) \ ++ { \ ++ .counter = false, \ ++ .id = IPFIX_FT_WPROBE_##_id##_N, \ ++ .wprobe_id = _name \ ++ , ## __VA_ARGS__ \ ++ } ++ ++#define WMAP_COUNTER(_id, _name, ...) \ ++ { \ ++ .counter = true, \ ++ .id = IPFIX_FT_WPROBE_##_id, \ ++ .wprobe_id = _name \ ++ , ## __VA_ARGS__ \ ++ } ++ ++ ++#define WPROBE_OFFSET 2 ++ ++static struct wprobe_mapping map_globals[] = { ++ WMAP(NOISE, "noise"), ++ WMAP(PHY_BUSY, "phy_busy"), ++ WMAP(PHY_RX, "phy_rx"), ++ WMAP(PHY_TX, "phy_tx"), ++ WMAP_COUNTER(FRAMES, "frames"), ++ WMAP_COUNTER(PROBEREQ, "probereq"), ++}; ++ ++static struct wprobe_mapping map_perlink[] = { ++ WMAP(IEEE_TX_RATE, "tx_rate"), ++ WMAP(IEEE_RX_RATE, "rx_rate"), ++ WMAP(RSSI, "rssi"), ++ WMAP(SIGNAL, "signal"), ++ WMAP(RETRANSMIT_200, "retransmit_200"), ++ WMAP(RETRANSMIT_400, "retransmit_400"), ++ WMAP(RETRANSMIT_800, "retransmit_800"), ++ WMAP(RETRANSMIT_1600, "retransmit_1600"), ++}; ++ ++static unsigned char link_local[6]; ++static char link_default[6]; ++static int nfields = 0; ++ ++#define FOKUS_USERID 12325 ++ ++static void ++match_template(struct wprobe_mapping *map, int n, struct list_head *list) ++{ ++ struct wprobe_attribute *attr; ++ int i, j, last = -1; ++ ++ list_for_each_entry(attr, list, list) { ++ for (i = 0; i < n; i++) { ++ j = (last + 1 + i) % n; ++ if (!strcmp(attr->name, map[j].wprobe_id)) ++ goto found; ++ } ++ continue; ++found: ++ last = j; ++ map[j].val = &attr->val; ++ memset(&attr->val, 0, sizeof(attr->val)); ++ nfields++; ++ } ++} ++ ++/* name: export_ipfix_get_template() ++ */ ++static ipfix_template_t * ++prepare_template(ipfix_t *handle) ++{ ++ ipfix_template_t *t = NULL; ++ int size = 3 * nfields + WPROBE_OFFSET; ++ int i; ++ ++ if (ipfix_new_data_template( handle, &t, size) < 0) { ++ mlogf( 0, "ipfix_new_template() failed: %s\n", strerror(errno) ); ++ exit(1); ++ } ++ ++ ipfix_add_field(handle, t, 0, IPFIX_FT_SOURCEMACADDRESS, 6); ++ ipfix_add_field(handle, t, 0, IPFIX_FT_DESTINATIONMACADDRESS, 6); ++ ++ g_data.lens = calloc(size, sizeof(g_data.lens[0])); ++ g_data.lens[0] = 6; ++ g_data.lens[1] = 6; ++ for (i = WPROBE_OFFSET; i < size; i++) ++ g_data.lens[i] = 4; ++ ++ g_data.addrs = calloc(size, sizeof(g_data.addrs[0])); ++ g_data.addrs[0] = link_local; ++ g_data.maxfields = WPROBE_OFFSET; ++ return t; ++} ++ ++static void ++add_template_fields(ipfix_t *handle, ipfix_template_t *t, struct wprobe_mapping *map, int n) ++{ ++ int f = g_data.maxfields; ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if (!map[i].val) ++ continue; ++ ++ if (map[i].counter) ++ g_data.addrs[f++] = &map[i].val->U32; ++ else ++ g_data.addrs[f++] = &map[i].val->n; ++ ++ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 0, 4) < 0) ++ exit(1); ++ ++ if (map[i].counter) ++ continue; ++ ++ g_data.lens[f] = 8; ++ g_data.addrs[f++] = &map[i].val->s; ++ ++ g_data.lens[f] = 8; ++ g_data.addrs[f++] = &map[i].val->ss; ++ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 1, 8) < 0) ++ exit(1); ++ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 2, 8) < 0) ++ exit(1); ++ } ++ g_data.maxfields = f; ++} ++ ++static void ++wprobe_dump_data(ipfix_t *ipfixh, ipfix_template_t *ipfixt, struct wprobe_iface *dev) ++{ ++ struct wprobe_link *link; ++ ++ wprobe_update_links(dev); ++ wprobe_request_data(dev, NULL); ++ if (list_empty(&dev->links)) { ++ g_data.addrs[1] = link_default; ++ ipfix_export_array(ipfixh, ipfixt, g_data.maxfields, g_data.addrs, g_data.lens); ++ ipfix_export_flush(ipfixh); ++ } ++ list_for_each_entry(link, &dev->links, list) { ++ g_data.addrs[1] = link->addr; ++ wprobe_request_data(dev, link->addr); ++ ipfix_export_array(ipfixh, ipfixt, g_data.maxfields, g_data.addrs, g_data.lens); ++ ipfix_export_flush(ipfixh); ++ } ++} ++ ++int main ( int argc, char **argv ) ++{ ++ struct wprobe_iface *dev = NULL; ++ ipfix_template_t *ipfixt = NULL; ++ ipfix_t *ipfixh = NULL; ++ int protocol = IPFIX_PROTO_TCP; ++ char *chost = NULL; ++ char *ifname = NULL; ++ int sourceid = 12345; ++ int port = IPFIX_PORTNO; ++ int verbose_level = 0; ++ int opt, i = 10; ++ char *err = NULL; ++ ++ while ((opt = getopt(argc, argv, "hi:c:p:vstu")) != EOF) { ++ switch (opt) { ++ case 'p': ++ if ((port=atoi(optarg)) <0) { ++ fprintf( stderr, "Invalid -p argument!\n" ); ++ exit(1); ++ } ++ break; ++ case 'i': ++ ifname = optarg; ++ break; ++ case 'c': ++ chost = optarg; ++ break; ++ ++ case 's': ++ protocol = IPFIX_PROTO_SCTP; ++ break; ++ ++ case 't': ++ protocol = IPFIX_PROTO_TCP; ++ break; ++ ++ case 'u': ++ protocol = IPFIX_PROTO_UDP; ++ break; ++ ++ case 'v': ++ verbose_level ++; ++ break; ++ ++ case 'h': ++ default: ++ fprintf(stderr, "usage: %s [-hstuv] -i -c [-p portno]\n" ++ " -h this help\n" ++ " -i wprobe interface\n" ++ " -c collector address\n" ++ " -p collector port number (default=%d)\n" ++ " -s send data via SCTP\n" ++ " -t send data via TCP (default)\n" ++ " -u send data via UDP\n" ++ " -v increase verbose level\n\n", ++ argv[0], IPFIX_PORTNO ); ++ exit(1); ++ } ++ } ++ ++ if (!ifname) { ++ fprintf(stderr, "No interface specified\n"); ++ return -1; ++ } ++ ++ if (!chost) { ++ fprintf(stderr, "No collector specified\n"); ++ return -1; ++ } ++ ++ dev = wprobe_get_auto(ifname, &err); ++ if (!dev || (list_empty(&dev->global_attr) && list_empty(&dev->link_attr))) { ++ fprintf(stderr, "Cannot connect to wprobe on interface '%s': %s\n", ifname, (err ? err : "Unknown error")); ++ return -1; ++ } ++ ++ match_template(map_globals, ARRAY_SIZE(map_globals), &dev->global_attr); ++ match_template(map_perlink, ARRAY_SIZE(map_perlink), &dev->link_attr); ++ if (nfields == 0) { ++ fprintf(stderr, "No usable attributes found\n"); ++ return -1; ++ } ++ ++ mlog_set_vlevel( verbose_level ); ++ if (ipfix_init() < 0) { ++ fprintf( stderr, "cannot init ipfix module: %s\n", strerror(errno) ); ++ exit(1); ++ } ++ ++ ipfix_add_vendor_information_elements(ipfix_ft_fokus); ++ if (ipfix_open(&ipfixh, sourceid, IPFIX_VERSION) < 0) { ++ fprintf( stderr, "ipfix_open() failed: %s\n", strerror(errno) ); ++ exit(1); ++ } ++ ++ if (ipfix_add_collector( ipfixh, chost, port, protocol ) < 0) { ++ fprintf( stderr, "ipfix_add_collector(%s,%d) failed: %s\n", ++ chost, port, strerror(errno)); ++ exit(1); ++ } ++ ++ fprintf(stderr, "Local link address: %02x:%02x:%02x:%02x:%02x:%02x\n", ++ link_local[0], link_local[1], link_local[2], ++ link_local[3], link_local[4], link_local[5]); ++ ++ ipfixt = prepare_template(ipfixh); ++ add_template_fields(ipfixh, ipfixt, map_globals, ARRAY_SIZE(map_globals)); ++ add_template_fields(ipfixh, ipfixt, map_perlink, ARRAY_SIZE(map_perlink)); ++ ++ while (!do_close) { ++ sleep(1); ++ wprobe_dump_data(ipfixh, ipfixt, dev); ++ } ++ ++ ipfix_delete_template( ipfixh, ipfixt ); ++ ipfix_close( ipfixh ); ++ ipfix_cleanup(); ++ exit(0); ++} +diff --git a/feeds/packages/net/wprobe/src/exporter/.svn/text-base/wprobe-export.h.svn-base b/feeds/packages/net/wprobe/src/exporter/.svn/text-base/wprobe-export.h.svn-base +new file mode 100644 +index 0000000..89da9e8 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/.svn/text-base/wprobe-export.h.svn-base +@@ -0,0 +1,34 @@ ++#include ++#include ++#include ++ ++/** ++ * struct wprobe_value: data structure for attribute values ++ * see kernel api netlink attributes for more information ++ */ ++struct wprobe_value { ++ /* attribute value */ ++ union data { ++ const char *STRING; ++ uint8_t U8; ++ uint16_t U16; ++ uint32_t U32; ++ uint64_t U64; ++ int8_t S8; ++ int16_t S16; ++ int32_t S32; ++ int64_t S64; ++ } data; ++ /* statistics */ ++ int64_t s, ss; ++ double avg, stdev; ++ unsigned int n; ++ void *usedata; /* Pointer to used data.something */ ++}; ++ ++struct exporter_data { ++ int id; /* ipfix id */ ++ int userid; /* focus or global */ ++ int size; /* size in byte*/ ++ struct wprobe_value val; ++}; +diff --git a/feeds/packages/net/wprobe/src/exporter/Makefile b/feeds/packages/net/wprobe/src/exporter/Makefile +new file mode 100644 +index 0000000..9f81507 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/Makefile +@@ -0,0 +1,5 @@ ++include ../Makefile.inc ++CPPFLAGS += -I../kernel -I../user ++ ++wprobe-export: wprobe-export.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) +diff --git a/feeds/packages/net/wprobe/src/exporter/wprobe-export.c b/feeds/packages/net/wprobe/src/exporter/wprobe-export.c +new file mode 100644 +index 0000000..a0e52e2 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/wprobe-export.c +@@ -0,0 +1,304 @@ ++/* ++** exporter.c - example exporter ++** ++** Copyright Fraunhofer FOKUS ++** ++*/ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++static ipfix_datarecord_t g_data = { NULL, NULL, 0 }; ++static int do_close = 0; ++ ++struct wprobe_mapping { ++ int id; ++ bool counter; ++ const char *wprobe_id; ++ struct wprobe_value *val; ++}; ++ ++#ifndef ARRAY_SIZE ++#define ARRAY_SIZE(_array) (sizeof(_array) / sizeof((_array)[0])) ++#endif ++ ++#define WMAP(_id, _name, ...) \ ++ { \ ++ .counter = false, \ ++ .id = IPFIX_FT_WPROBE_##_id##_N, \ ++ .wprobe_id = _name \ ++ , ## __VA_ARGS__ \ ++ } ++ ++#define WMAP_COUNTER(_id, _name, ...) \ ++ { \ ++ .counter = true, \ ++ .id = IPFIX_FT_WPROBE_##_id, \ ++ .wprobe_id = _name \ ++ , ## __VA_ARGS__ \ ++ } ++ ++ ++#define WPROBE_OFFSET 2 ++ ++static struct wprobe_mapping map_globals[] = { ++ WMAP(NOISE, "noise"), ++ WMAP(PHY_BUSY, "phy_busy"), ++ WMAP(PHY_RX, "phy_rx"), ++ WMAP(PHY_TX, "phy_tx"), ++ WMAP_COUNTER(FRAMES, "frames"), ++ WMAP_COUNTER(PROBEREQ, "probereq"), ++}; ++ ++static struct wprobe_mapping map_perlink[] = { ++ WMAP(IEEE_TX_RATE, "tx_rate"), ++ WMAP(IEEE_RX_RATE, "rx_rate"), ++ WMAP(RSSI, "rssi"), ++ WMAP(SIGNAL, "signal"), ++ WMAP(RETRANSMIT_200, "retransmit_200"), ++ WMAP(RETRANSMIT_400, "retransmit_400"), ++ WMAP(RETRANSMIT_800, "retransmit_800"), ++ WMAP(RETRANSMIT_1600, "retransmit_1600"), ++}; ++ ++static unsigned char link_local[6]; ++static char link_default[6]; ++static int nfields = 0; ++ ++#define FOKUS_USERID 12325 ++ ++static void ++match_template(struct wprobe_mapping *map, int n, struct list_head *list) ++{ ++ struct wprobe_attribute *attr; ++ int i, j, last = -1; ++ ++ list_for_each_entry(attr, list, list) { ++ for (i = 0; i < n; i++) { ++ j = (last + 1 + i) % n; ++ if (!strcmp(attr->name, map[j].wprobe_id)) ++ goto found; ++ } ++ continue; ++found: ++ last = j; ++ map[j].val = &attr->val; ++ memset(&attr->val, 0, sizeof(attr->val)); ++ nfields++; ++ } ++} ++ ++/* name: export_ipfix_get_template() ++ */ ++static ipfix_template_t * ++prepare_template(ipfix_t *handle) ++{ ++ ipfix_template_t *t = NULL; ++ int size = 3 * nfields + WPROBE_OFFSET; ++ int i; ++ ++ if (ipfix_new_data_template( handle, &t, size) < 0) { ++ mlogf( 0, "ipfix_new_template() failed: %s\n", strerror(errno) ); ++ exit(1); ++ } ++ ++ ipfix_add_field(handle, t, 0, IPFIX_FT_SOURCEMACADDRESS, 6); ++ ipfix_add_field(handle, t, 0, IPFIX_FT_DESTINATIONMACADDRESS, 6); ++ ++ g_data.lens = calloc(size, sizeof(g_data.lens[0])); ++ g_data.lens[0] = 6; ++ g_data.lens[1] = 6; ++ for (i = WPROBE_OFFSET; i < size; i++) ++ g_data.lens[i] = 4; ++ ++ g_data.addrs = calloc(size, sizeof(g_data.addrs[0])); ++ g_data.addrs[0] = link_local; ++ g_data.maxfields = WPROBE_OFFSET; ++ return t; ++} ++ ++static void ++add_template_fields(ipfix_t *handle, ipfix_template_t *t, struct wprobe_mapping *map, int n) ++{ ++ int f = g_data.maxfields; ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if (!map[i].val) ++ continue; ++ ++ if (map[i].counter) ++ g_data.addrs[f++] = &map[i].val->U32; ++ else ++ g_data.addrs[f++] = &map[i].val->n; ++ ++ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 0, 4) < 0) ++ exit(1); ++ ++ if (map[i].counter) ++ continue; ++ ++ g_data.lens[f] = 8; ++ g_data.addrs[f++] = &map[i].val->s; ++ ++ g_data.lens[f] = 8; ++ g_data.addrs[f++] = &map[i].val->ss; ++ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 1, 8) < 0) ++ exit(1); ++ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 2, 8) < 0) ++ exit(1); ++ } ++ g_data.maxfields = f; ++} ++ ++static void ++wprobe_dump_data(ipfix_t *ipfixh, ipfix_template_t *ipfixt, struct wprobe_iface *dev) ++{ ++ struct wprobe_link *link; ++ ++ wprobe_update_links(dev); ++ wprobe_request_data(dev, NULL); ++ if (list_empty(&dev->links)) { ++ g_data.addrs[1] = link_default; ++ ipfix_export_array(ipfixh, ipfixt, g_data.maxfields, g_data.addrs, g_data.lens); ++ ipfix_export_flush(ipfixh); ++ } ++ list_for_each_entry(link, &dev->links, list) { ++ g_data.addrs[1] = link->addr; ++ wprobe_request_data(dev, link->addr); ++ ipfix_export_array(ipfixh, ipfixt, g_data.maxfields, g_data.addrs, g_data.lens); ++ ipfix_export_flush(ipfixh); ++ } ++} ++ ++int main ( int argc, char **argv ) ++{ ++ struct wprobe_iface *dev = NULL; ++ ipfix_template_t *ipfixt = NULL; ++ ipfix_t *ipfixh = NULL; ++ int protocol = IPFIX_PROTO_TCP; ++ char *chost = NULL; ++ char *ifname = NULL; ++ int sourceid = 12345; ++ int port = IPFIX_PORTNO; ++ int verbose_level = 0; ++ int opt, i = 10; ++ char *err = NULL; ++ ++ while ((opt = getopt(argc, argv, "hi:c:p:vstu")) != EOF) { ++ switch (opt) { ++ case 'p': ++ if ((port=atoi(optarg)) <0) { ++ fprintf( stderr, "Invalid -p argument!\n" ); ++ exit(1); ++ } ++ break; ++ case 'i': ++ ifname = optarg; ++ break; ++ case 'c': ++ chost = optarg; ++ break; ++ ++ case 's': ++ protocol = IPFIX_PROTO_SCTP; ++ break; ++ ++ case 't': ++ protocol = IPFIX_PROTO_TCP; ++ break; ++ ++ case 'u': ++ protocol = IPFIX_PROTO_UDP; ++ break; ++ ++ case 'v': ++ verbose_level ++; ++ break; ++ ++ case 'h': ++ default: ++ fprintf(stderr, "usage: %s [-hstuv] -i -c [-p portno]\n" ++ " -h this help\n" ++ " -i wprobe interface\n" ++ " -c collector address\n" ++ " -p collector port number (default=%d)\n" ++ " -s send data via SCTP\n" ++ " -t send data via TCP (default)\n" ++ " -u send data via UDP\n" ++ " -v increase verbose level\n\n", ++ argv[0], IPFIX_PORTNO ); ++ exit(1); ++ } ++ } ++ ++ if (!ifname) { ++ fprintf(stderr, "No interface specified\n"); ++ return -1; ++ } ++ ++ if (!chost) { ++ fprintf(stderr, "No collector specified\n"); ++ return -1; ++ } ++ ++ dev = wprobe_get_auto(ifname, &err); ++ if (!dev || (list_empty(&dev->global_attr) && list_empty(&dev->link_attr))) { ++ fprintf(stderr, "Cannot connect to wprobe on interface '%s': %s\n", ifname, (err ? err : "Unknown error")); ++ return -1; ++ } ++ ++ match_template(map_globals, ARRAY_SIZE(map_globals), &dev->global_attr); ++ match_template(map_perlink, ARRAY_SIZE(map_perlink), &dev->link_attr); ++ if (nfields == 0) { ++ fprintf(stderr, "No usable attributes found\n"); ++ return -1; ++ } ++ ++ mlog_set_vlevel( verbose_level ); ++ if (ipfix_init() < 0) { ++ fprintf( stderr, "cannot init ipfix module: %s\n", strerror(errno) ); ++ exit(1); ++ } ++ ++ ipfix_add_vendor_information_elements(ipfix_ft_fokus); ++ if (ipfix_open(&ipfixh, sourceid, IPFIX_VERSION) < 0) { ++ fprintf( stderr, "ipfix_open() failed: %s\n", strerror(errno) ); ++ exit(1); ++ } ++ ++ if (ipfix_add_collector( ipfixh, chost, port, protocol ) < 0) { ++ fprintf( stderr, "ipfix_add_collector(%s,%d) failed: %s\n", ++ chost, port, strerror(errno)); ++ exit(1); ++ } ++ ++ fprintf(stderr, "Local link address: %02x:%02x:%02x:%02x:%02x:%02x\n", ++ link_local[0], link_local[1], link_local[2], ++ link_local[3], link_local[4], link_local[5]); ++ ++ ipfixt = prepare_template(ipfixh); ++ add_template_fields(ipfixh, ipfixt, map_globals, ARRAY_SIZE(map_globals)); ++ add_template_fields(ipfixh, ipfixt, map_perlink, ARRAY_SIZE(map_perlink)); ++ ++ while (!do_close) { ++ sleep(1); ++ wprobe_dump_data(ipfixh, ipfixt, dev); ++ } ++ ++ ipfix_delete_template( ipfixh, ipfixt ); ++ ipfix_close( ipfixh ); ++ ipfix_cleanup(); ++ exit(0); ++} +diff --git a/feeds/packages/net/wprobe/src/exporter/wprobe-export.h b/feeds/packages/net/wprobe/src/exporter/wprobe-export.h +new file mode 100644 +index 0000000..89da9e8 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/exporter/wprobe-export.h +@@ -0,0 +1,34 @@ ++#include ++#include ++#include ++ ++/** ++ * struct wprobe_value: data structure for attribute values ++ * see kernel api netlink attributes for more information ++ */ ++struct wprobe_value { ++ /* attribute value */ ++ union data { ++ const char *STRING; ++ uint8_t U8; ++ uint16_t U16; ++ uint32_t U32; ++ uint64_t U64; ++ int8_t S8; ++ int16_t S16; ++ int32_t S32; ++ int64_t S64; ++ } data; ++ /* statistics */ ++ int64_t s, ss; ++ double avg, stdev; ++ unsigned int n; ++ void *usedata; /* Pointer to used data.something */ ++}; ++ ++struct exporter_data { ++ int id; /* ipfix id */ ++ int userid; /* focus or global */ ++ int size; /* size in byte*/ ++ struct wprobe_value val; ++}; +diff --git a/feeds/packages/net/wprobe/src/filter/.svn/entries b/feeds/packages/net/wprobe/src/filter/.svn/entries +new file mode 100644 +index 0000000..59b5856 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/src/filter ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++gen_filter.pl ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++09a2922e20a9d26457ca783daea8cb0a ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1667 ++ ++pfc.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++c69c5d92030bf4f15fe958bc28ba3ffb ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1137 ++ ++README.txt ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++f7cb185421784e360fe6736018dbab8e ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++100 ++ +diff --git a/feeds/packages/net/wprobe/src/filter/.svn/prop-base/gen_filter.pl.svn-base b/feeds/packages/net/wprobe/src/filter/.svn/prop-base/gen_filter.pl.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/.svn/prop-base/gen_filter.pl.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/net/wprobe/src/filter/.svn/text-base/README.txt.svn-base b/feeds/packages/net/wprobe/src/filter/.svn/text-base/README.txt.svn-base +new file mode 100644 +index 0000000..6fa265e +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/.svn/text-base/README.txt.svn-base +@@ -0,0 +1 @@ ++To compile pfc you need at least libpcap version 1.0, as it requires proper radiotap header support +diff --git a/feeds/packages/net/wprobe/src/filter/.svn/text-base/gen_filter.pl.svn-base b/feeds/packages/net/wprobe/src/filter/.svn/text-base/gen_filter.pl.svn-base +new file mode 100644 +index 0000000..f03f477 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/.svn/text-base/gen_filter.pl.svn-base +@@ -0,0 +1,63 @@ ++#!/usr/bin/perl ++use strict; ++ ++# helpers for custom packet format ++# bytes 0-7 are used by a dummy radiotap header ++my $WLAN_LEN = "radio[8:2]"; ++my $SNR = "radio[10:1]"; ++my $DEFAULT = undef; ++ ++my $MAGIC = "WPFF"; ++my $VERSION = 1; # filter binary format version ++my $HDRLEN = 3; # assumed storage space for custom fields ++ ++my $output = "filter.bin"; ++my $config = { ++ "packetsize" => [ ++ [ "small", "$WLAN_LEN < 250" ], ++ [ "medium", "$WLAN_LEN < 800" ], ++ [ "big", $DEFAULT ], ++ ], ++ "snr" => [ ++ [ "low", "$SNR < 10" ], ++ [ "medium", "$SNR < 20" ], ++ [ "high", $DEFAULT ], ++ ], ++ "type" => [ ++ [ "beacon", "type mgt subtype beacon" ], ++ [ "data", "type data subtype data" ], ++ [ "qosdata", "type data subtype qos-data" ], ++ [ "other", "$DEFAULT" ] ++ ] ++}; ++ ++sub escape_q($) { ++ my $str = shift; ++ $str =~ s/'/'\\''/g; ++ return $str; ++} ++ ++my $GROUPS = scalar(keys %$config); ++open OUTPUT, ">$output" or die "Cannot open output file: $!\n"; ++print OUTPUT pack("a4CCn", $MAGIC, $VERSION, $HDRLEN, $GROUPS); ++ ++foreach my $groupname (keys %$config) { ++ my $default = 0; ++ my $group = $config->{$groupname}; ++ print OUTPUT pack("a32N", $groupname, scalar(@$group)); ++ foreach my $filter (@$group) { ++ if (!$filter->[1]) { ++ $default > 0 and print "Cannot add more than one default filter per group: $groupname -> ".$filter->[0]."\n"; ++ print OUTPUT pack("a32N", $filter->[0], 0); ++ $default++; ++ } else { ++ open FILTER, "./pfc '".escape_q($filter->[0])."' '".escape_q($filter->[1])."' |" ++ or die "Failed to run filter command for '".$filter->[0]."': $!\n"; ++ while () { ++ print OUTPUT $_; ++ } ++ close FILTER; ++ $? and die "Filter '".$filter->[0]."' did not compile.\n"; ++ } ++ } ++} +diff --git a/feeds/packages/net/wprobe/src/filter/.svn/text-base/pfc.c.svn-base b/feeds/packages/net/wprobe/src/filter/.svn/text-base/pfc.c.svn-base +new file mode 100644 +index 0000000..76fb141 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/.svn/text-base/pfc.c.svn-base +@@ -0,0 +1,58 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++struct wprobe_filter_hdr { ++ char name[32]; ++ uint32_t len; ++} hdr; ++ ++int main (int argc, char ** argv) ++{ ++ struct bpf_program filter; ++ pcap_t *pc; ++ int i; ++ ++ if (argc != 3) ++ { ++ fprintf(stderr, "Usage: %s \n", argv[0]); ++ return 1; ++ } ++ ++ pc = pcap_open_dead(DLT_IEEE802_11_RADIO, 256); ++ if (pcap_compile(pc, &filter, argv[2], 1, 0) != 0) ++ { ++ pcap_perror(pc, argv[0]); ++ exit(1); ++ } ++ ++ /* fix up for linux */ ++ for (i = 0; i < filter.bf_len; i++) { ++ struct bpf_insn *bi = &filter.bf_insns[i]; ++ switch(BPF_CLASS(bi->code)) { ++ case BPF_RET: ++ if (BPF_MODE(bi->code) == BPF_K) { ++ if (bi->k != 0) ++ bi->k = 65535; ++ } ++ break; ++ } ++ bi->code = ntohs(bi->code); ++ bi->k = ntohl(bi->k); ++ } ++ ++ memset(&hdr, 0, sizeof(hdr)); ++ strncpy(hdr.name, argv[1], sizeof(hdr.name)); ++ hdr.len = htonl(filter.bf_len); ++ fwrite(&hdr, sizeof(hdr), 1, stdout); ++ fwrite(filter.bf_insns, 8, filter.bf_len, stdout); ++ fflush(stdout); ++ ++ return 0; ++} +diff --git a/feeds/packages/net/wprobe/src/filter/README.txt b/feeds/packages/net/wprobe/src/filter/README.txt +new file mode 100644 +index 0000000..6fa265e +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/README.txt +@@ -0,0 +1 @@ ++To compile pfc you need at least libpcap version 1.0, as it requires proper radiotap header support +diff --git a/feeds/packages/net/wprobe/src/filter/gen_filter.pl b/feeds/packages/net/wprobe/src/filter/gen_filter.pl +new file mode 100755 +index 0000000..f03f477 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/gen_filter.pl +@@ -0,0 +1,63 @@ ++#!/usr/bin/perl ++use strict; ++ ++# helpers for custom packet format ++# bytes 0-7 are used by a dummy radiotap header ++my $WLAN_LEN = "radio[8:2]"; ++my $SNR = "radio[10:1]"; ++my $DEFAULT = undef; ++ ++my $MAGIC = "WPFF"; ++my $VERSION = 1; # filter binary format version ++my $HDRLEN = 3; # assumed storage space for custom fields ++ ++my $output = "filter.bin"; ++my $config = { ++ "packetsize" => [ ++ [ "small", "$WLAN_LEN < 250" ], ++ [ "medium", "$WLAN_LEN < 800" ], ++ [ "big", $DEFAULT ], ++ ], ++ "snr" => [ ++ [ "low", "$SNR < 10" ], ++ [ "medium", "$SNR < 20" ], ++ [ "high", $DEFAULT ], ++ ], ++ "type" => [ ++ [ "beacon", "type mgt subtype beacon" ], ++ [ "data", "type data subtype data" ], ++ [ "qosdata", "type data subtype qos-data" ], ++ [ "other", "$DEFAULT" ] ++ ] ++}; ++ ++sub escape_q($) { ++ my $str = shift; ++ $str =~ s/'/'\\''/g; ++ return $str; ++} ++ ++my $GROUPS = scalar(keys %$config); ++open OUTPUT, ">$output" or die "Cannot open output file: $!\n"; ++print OUTPUT pack("a4CCn", $MAGIC, $VERSION, $HDRLEN, $GROUPS); ++ ++foreach my $groupname (keys %$config) { ++ my $default = 0; ++ my $group = $config->{$groupname}; ++ print OUTPUT pack("a32N", $groupname, scalar(@$group)); ++ foreach my $filter (@$group) { ++ if (!$filter->[1]) { ++ $default > 0 and print "Cannot add more than one default filter per group: $groupname -> ".$filter->[0]."\n"; ++ print OUTPUT pack("a32N", $filter->[0], 0); ++ $default++; ++ } else { ++ open FILTER, "./pfc '".escape_q($filter->[0])."' '".escape_q($filter->[1])."' |" ++ or die "Failed to run filter command for '".$filter->[0]."': $!\n"; ++ while () { ++ print OUTPUT $_; ++ } ++ close FILTER; ++ $? and die "Filter '".$filter->[0]."' did not compile.\n"; ++ } ++ } ++} +diff --git a/feeds/packages/net/wprobe/src/filter/pfc.c b/feeds/packages/net/wprobe/src/filter/pfc.c +new file mode 100644 +index 0000000..76fb141 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/filter/pfc.c +@@ -0,0 +1,58 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++struct wprobe_filter_hdr { ++ char name[32]; ++ uint32_t len; ++} hdr; ++ ++int main (int argc, char ** argv) ++{ ++ struct bpf_program filter; ++ pcap_t *pc; ++ int i; ++ ++ if (argc != 3) ++ { ++ fprintf(stderr, "Usage: %s \n", argv[0]); ++ return 1; ++ } ++ ++ pc = pcap_open_dead(DLT_IEEE802_11_RADIO, 256); ++ if (pcap_compile(pc, &filter, argv[2], 1, 0) != 0) ++ { ++ pcap_perror(pc, argv[0]); ++ exit(1); ++ } ++ ++ /* fix up for linux */ ++ for (i = 0; i < filter.bf_len; i++) { ++ struct bpf_insn *bi = &filter.bf_insns[i]; ++ switch(BPF_CLASS(bi->code)) { ++ case BPF_RET: ++ if (BPF_MODE(bi->code) == BPF_K) { ++ if (bi->k != 0) ++ bi->k = 65535; ++ } ++ break; ++ } ++ bi->code = ntohs(bi->code); ++ bi->k = ntohl(bi->k); ++ } ++ ++ memset(&hdr, 0, sizeof(hdr)); ++ strncpy(hdr.name, argv[1], sizeof(hdr.name)); ++ hdr.len = htonl(filter.bf_len); ++ fwrite(&hdr, sizeof(hdr), 1, stdout); ++ fwrite(filter.bf_insns, 8, filter.bf_len, stdout); ++ fflush(stdout); ++ ++ return 0; ++} +diff --git a/feeds/packages/net/wprobe/src/kernel/.svn/entries b/feeds/packages/net/wprobe/src/kernel/.svn/entries +new file mode 100644 +index 0000000..6e7c233 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/.svn/entries +@@ -0,0 +1,133 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/src/kernel ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-16T14:05:21.128793Z ++35185 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++linux ++dir ++ ++wprobe-core.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++3b815ade28d9df0cc19fc9775019b7d0 ++2013-01-16T14:05:21.128793Z ++35185 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++27301 ++ ++wprobe-dummy.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++dcea2424f97f2d9607d5f7c78e0003b1 ++2009-03-26T20:56:47.167064Z ++15050 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2375 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++3655dd25d81e8a23b4b503885e983c6e ++2009-03-26T20:56:47.167064Z ++15050 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++84 ++ +diff --git a/feeds/packages/net/wprobe/src/kernel/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wprobe/src/kernel/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2a98753 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++EXTRA_CFLAGS += -I. ++ ++obj-m := wprobe.o wprobe-dummy.o ++ ++wprobe-objs := wprobe-core.o +diff --git a/feeds/packages/net/wprobe/src/kernel/.svn/text-base/wprobe-core.c.svn-base b/feeds/packages/net/wprobe/src/kernel/.svn/text-base/wprobe-core.c.svn-base +new file mode 100644 +index 0000000..27bc366 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/.svn/text-base/wprobe-core.c.svn-base +@@ -0,0 +1,1196 @@ ++/* ++ * wprobe-core.c: Wireless probe interface core ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#include ++#else ++#include ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) ++#include ++#endif ++#include ++#include ++#include ++ ++#define static ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++#define list_for_each_rcu(pos, head) \ ++for (pos = rcu_dereference((head)->next); \ ++prefetch(pos->next), pos != (head); \ ++pos = rcu_dereference(pos->next)) ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#define SKB_PORTID(x) NETLINK_CB(x).portid ++#else ++#define SKB_PORTID(x) NETLINK_CB(x).pid ++#endif ++ ++#define WPROBE_MIN_INTERVAL 100 /* minimum measurement interval in msecs */ ++#define WPROBE_MAX_FILTER_SIZE 1024 ++#define WPROBE_MAX_FRAME_SIZE 1900 ++ ++static struct list_head wprobe_if; ++static spinlock_t wprobe_lock; ++ ++static struct genl_family wprobe_fam = { ++ .id = GENL_ID_GENERATE, ++ .name = "wprobe", ++ .hdrsize = 0, ++ .version = 1, ++ /* only the first set of attributes is used for queries */ ++ .maxattr = WPROBE_ATTR_LAST, ++}; ++ ++/* fake radiotap header */ ++struct wprobe_rtap_hdr { ++ __u8 version; ++ __u8 padding; ++ __le16 len; ++ __le32 present; ++}; ++ ++static void wprobe_update_stats(struct wprobe_iface *dev, struct wprobe_link *l); ++static int wprobe_sync_data(struct wprobe_iface *dev, struct wprobe_link *l, bool query); ++static void wprobe_free_filter(struct wprobe_filter *f); ++ ++int ++wprobe_add_link(struct wprobe_iface *s, struct wprobe_link *l, const char *addr) ++{ ++ unsigned long flags; ++ ++ INIT_LIST_HEAD(&l->list); ++ l->val = kzalloc(sizeof(struct wprobe_value) * s->n_link_items, GFP_ATOMIC); ++ if (!l->val) ++ return -ENOMEM; ++ ++ l->iface = s; ++ memcpy(&l->addr, addr, ETH_ALEN); ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_add_tail_rcu(&l->list, &s->links); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ ++ return 0; ++} ++EXPORT_SYMBOL(wprobe_add_link); ++ ++void ++wprobe_remove_link(struct wprobe_iface *s, struct wprobe_link *l) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_del_rcu(&l->list); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ synchronize_rcu(); ++ kfree(l->val); ++} ++EXPORT_SYMBOL(wprobe_remove_link); ++ ++static void ++wprobe_measure_timer(unsigned long data) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *) data; ++ ++ /* set next measurement interval */ ++ mod_timer(&dev->measure_timer, jiffies + ++ msecs_to_jiffies(dev->measure_interval)); ++ ++ /* perform measurement */ ++ wprobe_sync_data(dev, NULL, false); ++} ++ ++int ++wprobe_add_iface(struct wprobe_iface *s) ++{ ++ unsigned long flags; ++ int vsize; ++ ++ /* reset only wprobe private area */ ++ memset(&s->list, 0, sizeof(struct wprobe_iface) - offsetof(struct wprobe_iface, list)); ++ ++ BUG_ON(!s->name); ++ INIT_LIST_HEAD(&s->list); ++ INIT_LIST_HEAD(&s->links); ++ setup_timer(&s->measure_timer, wprobe_measure_timer, (unsigned long) s); ++ ++ s->val = kzalloc(sizeof(struct wprobe_value) * s->n_global_items, GFP_ATOMIC); ++ if (!s->val) ++ goto error; ++ ++ vsize = max(s->n_link_items, s->n_global_items); ++ s->query_val = kzalloc(sizeof(struct wprobe_value) * vsize, GFP_ATOMIC); ++ if (!s->query_val) ++ goto error; ++ ++ /* initialize defaults to be able to handle overflow, ++ * user space will need to handle this if it keeps an ++ * internal histogram */ ++ s->scale_min = 20; ++ s->scale_max = (1 << 31); ++ ++ s->scale_m = 1; ++ s->scale_d = 10; ++ ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_add_rcu(&s->list, &wprobe_if); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ ++ return 0; ++ ++error: ++ if (s->val) ++ kfree(s->val); ++ return -ENOMEM; ++} ++EXPORT_SYMBOL(wprobe_add_iface); ++ ++void ++wprobe_remove_iface(struct wprobe_iface *s) ++{ ++ unsigned long flags; ++ ++ BUG_ON(!list_empty(&s->links)); ++ ++ del_timer_sync(&s->measure_timer); ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_del_rcu(&s->list); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ ++ /* wait for all queries to finish before freeing the ++ * temporary value storage buffer */ ++ synchronize_rcu(); ++ ++ kfree(s->val); ++ kfree(s->query_val); ++ if (s->active_filter) ++ wprobe_free_filter(s->active_filter); ++} ++EXPORT_SYMBOL(wprobe_remove_iface); ++ ++static struct wprobe_iface * ++wprobe_get_dev(struct nlattr *attr) ++{ ++ struct wprobe_iface *dev = NULL; ++ struct wprobe_iface *p; ++ const char *name; ++ int i = 0; ++ ++ if (!attr) ++ return NULL; ++ ++ name = nla_data(attr); ++ list_for_each_entry_rcu(p, &wprobe_if, list) { ++ i++; ++ if (strcmp(name, p->name) != 0) ++ continue; ++ ++ dev = p; ++ break; ++ } ++ ++ return dev; ++} ++ ++int ++wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, void *data, int len) ++{ ++ struct wprobe_wlan_hdr *new_hdr; ++ struct wprobe_filter *f; ++ struct sk_buff *skb; ++ unsigned long flags; ++ int i, j; ++ ++ rcu_read_lock(); ++ f = rcu_dereference(dev->active_filter); ++ if (!f) ++ goto out; ++ ++ spin_lock_irqsave(&f->lock, flags); ++ ++ skb = f->skb; ++ skb->len = sizeof(struct wprobe_rtap_hdr); ++ skb->tail = skb->data + skb->len; ++ if (len + skb->len > WPROBE_MAX_FRAME_SIZE) ++ len = WPROBE_MAX_FRAME_SIZE - skb->len; ++ ++ new_hdr = (struct wprobe_wlan_hdr *) skb_put(skb, f->hdrlen); ++ memcpy(new_hdr, hdr, sizeof(struct wprobe_wlan_hdr)); ++ new_hdr->len = cpu_to_be16(new_hdr->len); ++ ++ memcpy(skb_put(skb, len), data, len); ++ ++ for(i = 0; i < f->n_groups; i++) { ++ struct wprobe_filter_group *fg = &f->groups[i]; ++ bool found = false; ++ int def = -1; ++ ++ for (j = 0; j < fg->n_items; j++) { ++ struct wprobe_filter_item *fi = fg->items[j]; ++ ++ if (!fi->hdr.n_items) { ++ def = j; ++ continue; ++ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ if (sk_run_filter(skb, fi->filter) == 0) ++ continue; ++#else ++ if (sk_run_filter(skb, fi->filter, fi->hdr.n_items) == 0) ++ continue; ++#endif ++ ++ found = true; ++ break; ++ } ++ if (!found && def >= 0) { ++ j = def; ++ found = true; ++ } ++ if (found) { ++ struct wprobe_filter_counter *c = &fg->counters[j]; ++ ++ if (hdr->type >= WPROBE_PKT_TX) ++ c->tx++; ++ else ++ c->rx++; ++ } ++ } ++ ++ spin_unlock_irqrestore(&f->lock, flags); ++out: ++ rcu_read_unlock(); ++ return 0; ++} ++EXPORT_SYMBOL(wprobe_add_frame); ++ ++static int ++wprobe_sync_data(struct wprobe_iface *dev, struct wprobe_link *l, bool query) ++{ ++ struct wprobe_value *val; ++ unsigned long flags; ++ int n, err; ++ ++ if (l) { ++ n = dev->n_link_items; ++ val = l->val; ++ } else { ++ n = dev->n_global_items; ++ val = dev->val; ++ } ++ ++ spin_lock_irqsave(&dev->lock, flags); ++ err = dev->sync_data(dev, l, val, !query); ++ if (err) ++ goto done; ++ ++ if (query) ++ memcpy(dev->query_val, val, sizeof(struct wprobe_value) * n); ++ ++ wprobe_update_stats(dev, l); ++done: ++ spin_unlock_irqrestore(&dev->lock, flags); ++ return 0; ++} ++EXPORT_SYMBOL(wprobe_sync_data); ++ ++static void ++wprobe_scale_stats(struct wprobe_iface *dev, const struct wprobe_item *item, ++ struct wprobe_value *val, int n) ++{ ++ u64 scale_ts = jiffies_64; ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if (!(item[i].flags & WPROBE_F_KEEPSTAT)) ++ continue; ++ ++ if (val[i].n <= dev->scale_min) ++ continue; ++ ++ /* FIXME: div_s64 seems to be very imprecise here, even when ++ * the values are scaled up */ ++ val[i].s *= dev->scale_m; ++ val[i].s = div_s64(val[i].s, dev->scale_d); ++ ++ val[i].ss *= dev->scale_m; ++ val[i].ss = div_s64(val[i].ss, dev->scale_d); ++ ++ val[i].n = (val[i].n * dev->scale_m) / dev->scale_d; ++ val[i].scale_timestamp = scale_ts; ++ } ++} ++ ++ ++void ++wprobe_update_stats(struct wprobe_iface *dev, struct wprobe_link *l) ++{ ++ const struct wprobe_item *item; ++ struct wprobe_value *val; ++ bool scale_stats = false; ++ int i, n; ++ ++ if (l) { ++ n = dev->n_link_items; ++ item = dev->link_items; ++ val = l->val; ++ } else { ++ n = dev->n_global_items; ++ item = dev->global_items; ++ val = dev->val; ++ } ++ ++ /* process statistics */ ++ for (i = 0; i < n; i++) { ++ s64 v; ++ ++ if (!val[i].pending) ++ continue; ++ ++ val[i].n++; ++ if ((item[i].flags & WPROBE_F_KEEPSTAT) && ++ (dev->scale_max > 0) && (val[i].n > dev->scale_max)) { ++ scale_stats = true; ++ } ++ ++ switch(item[i].type) { ++ case WPROBE_VAL_S8: ++ v = val[i].S8; ++ break; ++ case WPROBE_VAL_S16: ++ v = val[i].S16; ++ break; ++ case WPROBE_VAL_S32: ++ v = val[i].S32; ++ break; ++ case WPROBE_VAL_S64: ++ v = val[i].S64; ++ break; ++ case WPROBE_VAL_U8: ++ v = val[i].U8; ++ break; ++ case WPROBE_VAL_U16: ++ v = val[i].U16; ++ break; ++ case WPROBE_VAL_U32: ++ v = val[i].U32; ++ break; ++ case WPROBE_VAL_U64: ++ v = val[i].U64; ++ break; ++ default: ++ continue; ++ } ++ ++ val[i].s += v; ++ val[i].ss += v * v; ++ val[i].pending = false; ++ } ++ if (scale_stats) ++ wprobe_scale_stats(dev, item, val, n); ++} ++EXPORT_SYMBOL(wprobe_update_stats); ++ ++static const struct nla_policy wprobe_policy[WPROBE_ATTR_LAST+1] = { ++ [WPROBE_ATTR_INTERFACE] = { .type = NLA_NUL_STRING }, ++ [WPROBE_ATTR_MAC] = { .type = NLA_STRING }, ++ [WPROBE_ATTR_FLAGS] = { .type = NLA_U32 }, ++ ++ /* config */ ++ [WPROBE_ATTR_INTERVAL] = { .type = NLA_MSECS }, ++ [WPROBE_ATTR_SAMPLES_MIN] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_MAX] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_M] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_D] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_FILTER] = { .type = NLA_BINARY, .len = 32768 }, ++}; ++ ++static bool ++wprobe_check_ptr(struct list_head *list, struct list_head *ptr) ++{ ++ struct list_head *p; ++ ++ list_for_each_rcu(p, list) { ++ if (ptr == p) ++ return true; ++ } ++ return false; ++} ++ ++static bool ++wprobe_send_item_value(struct sk_buff *msg, struct netlink_callback *cb, ++ struct wprobe_iface *dev, struct wprobe_link *l, ++ const struct wprobe_item *item, ++ int i, u32 flags) ++{ ++ struct genlmsghdr *hdr; ++ struct wprobe_value *val = dev->query_val; ++ u64 time = val[i].last - val[i].first; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_INFO); ++ ++ if (nla_put_u32(msg, WPROBE_ATTR_ID, i)) ++ goto nla_put_failure; ++ if (nla_put_u32(msg, WPROBE_ATTR_FLAGS, flags)) ++ goto nla_put_failure; ++ if (nla_put_u8(msg, WPROBE_ATTR_TYPE, item[i].type)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_ATTR_DURATION, time)) ++ goto nla_put_failure; ++ ++ switch(item[i].type) { ++ case WPROBE_VAL_S8: ++ case WPROBE_VAL_U8: ++ if (nla_put_u8(msg, item[i].type, val[i].U8)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_S16: ++ case WPROBE_VAL_U16: ++ if (nla_put_u16(msg, item[i].type, val[i].U16)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_S32: ++ case WPROBE_VAL_U32: ++ if (nla_put_u32(msg, item[i].type, val[i].U32)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_S64: ++ case WPROBE_VAL_U64: ++ if (nla_put_u64(msg, item[i].type, val[i].U64)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_STRING: ++ if (val[i].STRING) { ++ if (nla_put_string(msg, item[i].type, val[i].STRING)) ++ goto nla_put_failure; ++ } else { ++ if (nla_put_string(msg, item[i].type, "")) ++ goto nla_put_failure; ++ } ++ /* bypass avg/stdev */ ++ goto done; ++ default: ++ /* skip unknown values */ ++ goto done; ++ } ++ if (item[i].flags & WPROBE_F_KEEPSTAT) { ++ if (nla_put_u64(msg, WPROBE_VAL_SUM, val[i].s)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_VAL_SUM_SQ, val[i].ss)) ++ goto nla_put_failure; ++ if (nla_put_u32(msg, WPROBE_VAL_SAMPLES, (u32) val[i].n)) ++ goto nla_put_failure; ++ if (nla_put_msecs(msg, WPROBE_VAL_SCALE_TIME, val[i].scale_timestamp)) ++ goto nla_put_failure; ++ } ++done: ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++static bool ++wprobe_send_item_info(struct sk_buff *msg, struct netlink_callback *cb, ++ struct wprobe_iface *dev, ++ const struct wprobe_item *item, int i) ++{ ++ struct genlmsghdr *hdr; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_LIST); ++ ++ if ((i == 0) && (dev->addr != NULL)) { ++ if (nla_put(msg, WPROBE_ATTR_MAC, 6, dev->addr)) ++ goto nla_put_failure; ++ } ++ if (nla_put_u32(msg, WPROBE_ATTR_ID, (u32) i)) ++ goto nla_put_failure; ++ if (nla_put_string(msg, WPROBE_ATTR_NAME, item[i].name)) ++ goto nla_put_failure; ++ if (nla_put_u8(msg, WPROBE_ATTR_TYPE, item[i].type)) ++ goto nla_put_failure; ++ if (nla_put_u32(msg, WPROBE_ATTR_FLAGS, item[i].flags)) ++ goto nla_put_failure; ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++ ++static struct wprobe_link * ++wprobe_find_link(struct wprobe_iface *dev, const char *mac) ++{ ++ struct wprobe_link *l; ++ ++ list_for_each_entry_rcu(l, &dev->links, list) { ++ if (!memcmp(l->addr, mac, 6)) ++ return l; ++ } ++ return NULL; ++} ++ ++static bool ++wprobe_dump_filter_group(struct sk_buff *msg, struct wprobe_filter_group *fg, struct netlink_callback *cb) ++{ ++ struct genlmsghdr *hdr; ++ struct nlattr *group, *item; ++ int i; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_FILTER); ++ if (!hdr) ++ return false; ++ ++ if (nla_put_string(msg, WPROBE_ATTR_NAME, fg->name)) ++ goto nla_put_failure; ++ group = nla_nest_start(msg, WPROBE_ATTR_FILTER_GROUP); ++ for (i = 0; i < fg->n_items; i++) { ++ struct wprobe_filter_item *fi = fg->items[i]; ++ struct wprobe_filter_counter *fc = &fg->counters[i]; ++ ++ item = nla_nest_start(msg, WPROBE_ATTR_FILTER_GROUP); ++ if (nla_put_string(msg, WPROBE_ATTR_NAME, fi->hdr.name)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_ATTR_RXCOUNT, fc->rx)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_ATTR_TXCOUNT, fc->tx)) ++ goto nla_put_failure; ++ nla_nest_end(msg, item); ++ } ++ ++ nla_nest_end(msg, group); ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++static int ++wprobe_dump_filters(struct sk_buff *skb, struct netlink_callback *cb) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *)cb->args[0]; ++ struct wprobe_filter *f; ++ int err = 0; ++ int i = 0; ++ ++ if (!dev) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + wprobe_fam.hdrsize, ++ wprobe_fam.attrbuf, wprobe_fam.maxattr, wprobe_policy); ++ if (err) ++ goto done; ++ ++ dev = wprobe_get_dev(wprobe_fam.attrbuf[WPROBE_ATTR_INTERFACE]); ++ if (!dev) { ++ err = -ENODEV; ++ goto done; ++ } ++ ++ cb->args[0] = (long) dev; ++ cb->args[1] = 0; ++ } else { ++ if (!wprobe_check_ptr(&wprobe_if, &dev->list)) { ++ err = -ENODEV; ++ goto done; ++ } ++ } ++ ++ rcu_read_lock(); ++ f = rcu_dereference(dev->active_filter); ++ if (!f) ++ goto abort; ++ ++ for (i = cb->args[1]; i < f->n_groups; i++) { ++ if (unlikely(!wprobe_dump_filter_group(skb, &f->groups[i], cb))) ++ break; ++ } ++ cb->args[1] = i; ++abort: ++ rcu_read_unlock(); ++ err = skb->len; ++done: ++ return err; ++} ++ ++static bool ++wprobe_dump_link(struct sk_buff *msg, struct wprobe_link *l, struct netlink_callback *cb) ++{ ++ struct genlmsghdr *hdr; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_LINKS); ++ if (!hdr) ++ return false; ++ ++ if (nla_put(msg, WPROBE_ATTR_MAC, 6, l->addr)) ++ goto nla_put_failure; ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++static int ++wprobe_dump_links(struct sk_buff *skb, struct netlink_callback *cb) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *)cb->args[0]; ++ struct wprobe_link *l; ++ int err = 0; ++ int i = 0; ++ ++ if (!dev) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + wprobe_fam.hdrsize, ++ wprobe_fam.attrbuf, wprobe_fam.maxattr, wprobe_policy); ++ if (err) ++ goto done; ++ ++ dev = wprobe_get_dev(wprobe_fam.attrbuf[WPROBE_ATTR_INTERFACE]); ++ if (!dev) { ++ err = -ENODEV; ++ goto done; ++ } ++ ++ cb->args[0] = (long) dev; ++ } else { ++ if (!wprobe_check_ptr(&wprobe_if, &dev->list)) { ++ err = -ENODEV; ++ goto done; ++ } ++ } ++ ++ rcu_read_lock(); ++ list_for_each_entry_rcu(l, &dev->links, list) { ++ if (i < cb->args[1]) ++ continue; ++ ++ if (unlikely(!wprobe_dump_link(skb, l, cb))) ++ break; ++ ++ i++; ++ } ++ cb->args[1] = i; ++ rcu_read_unlock(); ++ err = skb->len; ++done: ++ return err; ++} ++ ++#define WPROBE_F_LINK (1 << 31) /* for internal use */ ++static int ++wprobe_dump_info(struct sk_buff *skb, struct netlink_callback *cb) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *)cb->args[0]; ++ struct wprobe_link *l = (struct wprobe_link *)cb->args[1]; ++ struct wprobe_value *val; ++ const struct wprobe_item *item; ++ struct genlmsghdr *hdr; ++ unsigned long flags; ++ int cmd, n, i = cb->args[3]; ++ u32 vflags = cb->args[2]; ++ int err = 0; ++ ++ hdr = (struct genlmsghdr *)nlmsg_data(cb->nlh); ++ cmd = hdr->cmd; ++ ++ /* since the attribute value list might be too big for a single netlink ++ * message, the device, link and offset get stored in the netlink callback. ++ * if this is the first request, we need to do the full lookup for the device. ++ * ++ * access to the device and link structure is synchronized through rcu. ++ */ ++ rcu_read_lock(); ++ if (!dev) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + wprobe_fam.hdrsize, ++ wprobe_fam.attrbuf, wprobe_fam.maxattr, wprobe_policy); ++ if (err) ++ goto done; ++ ++ err = -ENOENT; ++ dev = wprobe_get_dev(wprobe_fam.attrbuf[WPROBE_ATTR_INTERFACE]); ++ if (!dev) ++ goto done; ++ ++ if (cmd == WPROBE_CMD_GET_INFO) { ++ if (wprobe_fam.attrbuf[WPROBE_ATTR_MAC]) { ++ l = wprobe_find_link(dev, nla_data(wprobe_fam.attrbuf[WPROBE_ATTR_MAC])); ++ if (!l) ++ goto done; ++ ++ vflags = l->flags; ++ } ++ ++ if (l) { ++ item = dev->link_items; ++ n = dev->n_link_items; ++ val = l->val; ++ } else { ++ item = dev->global_items; ++ n = dev->n_global_items; ++ val = dev->val; ++ } ++ ++ /* sync data and move to temp storage for the query */ ++ spin_lock_irqsave(&dev->lock, flags); ++ err = wprobe_sync_data(dev, l, true); ++ if (!err) ++ memcpy(dev->query_val, val, n * sizeof(struct wprobe_value)); ++ spin_unlock_irqrestore(&dev->lock, flags); ++ ++ if (err) ++ goto done; ++ } ++ ++ if (wprobe_fam.attrbuf[WPROBE_ATTR_FLAGS]) ++ vflags |= nla_get_u32(wprobe_fam.attrbuf[WPROBE_ATTR_FLAGS]); ++ ++ if (wprobe_fam.attrbuf[WPROBE_ATTR_MAC]) ++ vflags |= WPROBE_F_LINK; ++ ++ cb->args[0] = (long) dev; ++ cb->args[1] = (long) l; ++ cb->args[2] = vflags; ++ cb->args[3] = 0; ++ } else { ++ /* when pulling pointers from the callback, validate them ++ * against the list using rcu to make sure that we won't ++ * dereference pointers to free'd memory after the last ++ * grace period */ ++ err = -ENOENT; ++ if (!wprobe_check_ptr(&wprobe_if, &dev->list)) ++ goto done; ++ ++ if (l && !wprobe_check_ptr(&dev->links, &l->list)) ++ goto done; ++ } ++ ++ if (vflags & WPROBE_F_LINK) { ++ item = dev->link_items; ++ n = dev->n_link_items; ++ } else { ++ item = dev->global_items; ++ n = dev->n_global_items; ++ } ++ ++ err = 0; ++ switch(cmd) { ++ case WPROBE_CMD_GET_INFO: ++ while (i < n) { ++ if (!wprobe_send_item_value(skb, cb, dev, l, item, i, vflags)) ++ break; ++ i++; ++ } ++ break; ++ case WPROBE_CMD_GET_LIST: ++ while (i < n) { ++ if (!wprobe_send_item_info(skb, cb, dev, item, i)) ++ break; ++ i++; ++ } ++ break; ++ default: ++ err = -EINVAL; ++ goto done; ++ } ++ cb->args[3] = i; ++ err = skb->len; ++ ++done: ++ rcu_read_unlock(); ++ return err; ++} ++#undef WPROBE_F_LINK ++ ++static int ++wprobe_update_auto_measurement(struct wprobe_iface *dev, u32 interval) ++{ ++ if (interval && (interval < WPROBE_MIN_INTERVAL)) ++ return -EINVAL; ++ ++ if (!interval && dev->measure_interval) ++ del_timer_sync(&dev->measure_timer); ++ ++ dev->measure_interval = interval; ++ if (!interval) ++ return 0; ++ ++ /* kick of a new measurement immediately */ ++ mod_timer(&dev->measure_timer, jiffies + 1); ++ ++ return 0; ++} ++ ++static int ++wprobe_measure(struct sk_buff *skb, struct genl_info *info) ++{ ++ struct wprobe_iface *dev; ++ struct wprobe_link *l = NULL; ++ int err = -ENOENT; ++ ++ rcu_read_lock(); ++ dev = wprobe_get_dev(info->attrs[WPROBE_ATTR_INTERFACE]); ++ if (!dev) ++ goto done; ++ ++ if (info->attrs[WPROBE_ATTR_MAC]) { ++ l = wprobe_find_link(dev, nla_data(wprobe_fam.attrbuf[WPROBE_ATTR_MAC])); ++ if (!l) ++ goto done; ++ } ++ ++ err = wprobe_sync_data(dev, l, false); ++ ++done: ++ rcu_read_unlock(); ++ return err; ++} ++ ++static int ++wprobe_check_filter(void *data, int datalen, int gs) ++{ ++ struct wprobe_filter_item_hdr *hdr; ++ void *orig_data = data; ++ void *end = data + datalen; ++ int i, j, k, is, cur_is; ++ ++ for (i = j = is = 0; i < gs; i++) { ++ hdr = data; ++ data += sizeof(*hdr); ++ ++ if (data > end) ++ goto overrun; ++ ++ hdr->name[31] = 0; ++ cur_is = be32_to_cpu(hdr->n_items); ++ hdr->n_items = cur_is; ++ is += cur_is; ++ for (j = 0; j < cur_is; j++) { ++ struct sock_filter *sf; ++ int n_items; ++ ++ hdr = data; ++ data += sizeof(*hdr); ++ if (data > end) ++ goto overrun; ++ ++ hdr->name[31] = 0; ++ n_items = be32_to_cpu(hdr->n_items); ++ hdr->n_items = n_items; ++ ++ if (n_items > 1024) ++ goto overrun; ++ ++ sf = data; ++ if (n_items > 0) { ++ for (k = 0; k < n_items; k++) { ++ sf->code = be16_to_cpu(sf->code); ++ sf->k = be32_to_cpu(sf->k); ++ sf++; ++ } ++ if (sk_chk_filter(data, n_items) != 0) { ++ printk("%s: filter check failed at group %d, item %d\n", __func__, i, j); ++ return 0; ++ } ++ } ++ data += n_items * sizeof(struct sock_filter); ++ } ++ } ++ return is; ++ ++overrun: ++ printk(KERN_ERR "%s: overrun during filter check at group %d, item %d, offset=%d, len=%d\n", __func__, i, j, (data - orig_data), datalen); ++ return 0; ++} ++ ++static void ++wprobe_free_filter(struct wprobe_filter *f) ++{ ++ if (f->skb) ++ kfree_skb(f->skb); ++ if (f->data) ++ kfree(f->data); ++ if (f->items) ++ kfree(f->items); ++ if (f->counters) ++ kfree(f->counters); ++ kfree(f); ++} ++ ++ ++static int ++wprobe_set_filter(struct wprobe_iface *dev, void *data, int len) ++{ ++ struct wprobe_filter_hdr *fhdr; ++ struct wprobe_rtap_hdr *rtap; ++ struct wprobe_filter *f; ++ int i, j, cur_is, is, gs; ++ ++ if (len < sizeof(*fhdr)) ++ return -EINVAL; ++ ++ fhdr = data; ++ data += sizeof(*fhdr); ++ len -= sizeof(*fhdr); ++ ++ if (memcmp(fhdr->magic, "WPFF", 4) != 0) { ++ printk(KERN_ERR "%s: filter rejected (invalid magic)\n", __func__); ++ return -EINVAL; ++ } ++ ++ gs = be16_to_cpu(fhdr->n_groups); ++ is = wprobe_check_filter(data, len, gs); ++ if (is == 0) ++ return -EINVAL; ++ ++ f = kzalloc(sizeof(struct wprobe_filter) + ++ gs * sizeof(struct wprobe_filter_group), GFP_ATOMIC); ++ if (!f) ++ return -ENOMEM; ++ ++ f->skb = alloc_skb(WPROBE_MAX_FRAME_SIZE, GFP_ATOMIC); ++ if (!f->skb) ++ goto error; ++ ++ f->data = kmalloc(len, GFP_ATOMIC); ++ if (!f->data) ++ goto error; ++ ++ f->items = kzalloc(sizeof(struct wprobe_filter_item *) * is, GFP_ATOMIC); ++ if (!f->items) ++ goto error; ++ ++ f->counters = kzalloc(sizeof(struct wprobe_filter_counter) * is, GFP_ATOMIC); ++ if (!f->counters) ++ goto error; ++ ++ spin_lock_init(&f->lock); ++ memcpy(f->data, data, len); ++ f->n_groups = gs; ++ ++ if (f->hdrlen < sizeof(struct wprobe_wlan_hdr)) ++ f->hdrlen = sizeof(struct wprobe_wlan_hdr); ++ ++ rtap = (struct wprobe_rtap_hdr *)skb_put(f->skb, sizeof(*rtap)); ++ memset(rtap, 0, sizeof(*rtap)); ++ rtap->len = cpu_to_le16(sizeof(struct wprobe_rtap_hdr) + f->hdrlen); ++ data = f->data; ++ ++ cur_is = 0; ++ for (i = 0; i < gs; i++) { ++ struct wprobe_filter_item_hdr *hdr = data; ++ struct wprobe_filter_group *g = &f->groups[i]; ++ ++ data += sizeof(*hdr); ++ g->name = hdr->name; ++ g->items = &f->items[cur_is]; ++ g->counters = &f->counters[cur_is]; ++ g->n_items = hdr->n_items; ++ ++ for (j = 0; j < g->n_items; j++) { ++ hdr = data; ++ f->items[cur_is++] = data; ++ data += sizeof(*hdr) + hdr->n_items * sizeof(struct sock_filter); ++ } ++ } ++ rcu_assign_pointer(dev->active_filter, f); ++ return 0; ++ ++error: ++ wprobe_free_filter(f); ++ return -ENOMEM; ++} ++ ++static int ++wprobe_set_config(struct sk_buff *skb, struct genl_info *info) ++{ ++ struct wprobe_iface *dev; ++ unsigned long flags; ++ int err = -ENOENT; ++ u32 scale_min, scale_max; ++ u32 scale_m, scale_d; ++ struct nlattr *attr; ++ struct wprobe_filter *filter_free = NULL; ++ ++ rcu_read_lock(); ++ dev = wprobe_get_dev(info->attrs[WPROBE_ATTR_INTERFACE]); ++ if (!dev) ++ goto done_unlocked; ++ ++ err = -EINVAL; ++ spin_lock_irqsave(&dev->lock, flags); ++ if (info->attrs[WPROBE_ATTR_MAC]) { ++ /* not supported yet */ ++ goto done; ++ } ++ ++ if (info->attrs[WPROBE_ATTR_FLAGS]) { ++ u32 flags = nla_get_u32(info->attrs[WPROBE_ATTR_FLAGS]); ++ ++ if (flags & BIT(WPROBE_F_RESET)) { ++ struct wprobe_link *l; ++ ++ memset(dev->val, 0, sizeof(struct wprobe_value) * dev->n_global_items); ++ list_for_each_entry_rcu(l, &dev->links, list) { ++ memset(l->val, 0, sizeof(struct wprobe_value) * dev->n_link_items); ++ } ++ } ++ } ++ ++ if (info->attrs[WPROBE_ATTR_SAMPLES_MIN] || ++ info->attrs[WPROBE_ATTR_SAMPLES_MAX]) { ++ if ((attr = info->attrs[WPROBE_ATTR_SAMPLES_MIN])) ++ scale_min = nla_get_u32(attr); ++ else ++ scale_min = dev->scale_min; ++ ++ if ((attr = info->attrs[WPROBE_ATTR_SAMPLES_MAX])) ++ scale_max = nla_get_u32(attr); ++ else ++ scale_max = dev->scale_max; ++ ++ if ((!scale_min && !scale_max) || ++ (scale_min && scale_max && (scale_min < scale_max))) { ++ dev->scale_min = scale_min; ++ dev->scale_max = scale_max; ++ } else { ++ goto done; ++ } ++ } ++ ++ if (info->attrs[WPROBE_ATTR_SAMPLES_SCALE_M] && ++ info->attrs[WPROBE_ATTR_SAMPLES_SCALE_D]) { ++ ++ scale_m = nla_get_u32(info->attrs[WPROBE_ATTR_SAMPLES_SCALE_M]); ++ scale_d = nla_get_u32(info->attrs[WPROBE_ATTR_SAMPLES_SCALE_D]); ++ ++ if (!scale_d || (scale_m > scale_d)) ++ goto done; ++ ++ dev->scale_m = scale_m; ++ dev->scale_d = scale_d; ++ } ++ ++ if ((attr = info->attrs[WPROBE_ATTR_FILTER])) { ++ filter_free = rcu_dereference(dev->active_filter); ++ rcu_assign_pointer(dev->active_filter, NULL); ++ if (nla_len(attr) > 0) ++ wprobe_set_filter(dev, nla_data(attr), nla_len(attr)); ++ } ++ ++ err = 0; ++ if (info->attrs[WPROBE_ATTR_INTERVAL]) { ++ /* change of measurement interval requested */ ++ err = wprobe_update_auto_measurement(dev, ++ (u32) nla_get_u64(info->attrs[WPROBE_ATTR_INTERVAL])); ++ } ++ ++done: ++ spin_unlock_irqrestore(&dev->lock, flags); ++done_unlocked: ++ rcu_read_unlock(); ++ if (filter_free) { ++ synchronize_rcu(); ++ wprobe_free_filter(filter_free); ++ } ++ return err; ++} ++ ++static struct genl_ops wprobe_ops[] = { ++ { ++ .cmd = WPROBE_CMD_GET_INFO, ++ .dumpit = wprobe_dump_info, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_GET_LIST, ++ .dumpit = wprobe_dump_info, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_MEASURE, ++ .doit = wprobe_measure, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_GET_LINKS, ++ .dumpit = wprobe_dump_links, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_CONFIG, ++ .doit = wprobe_set_config, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_GET_FILTER, ++ .dumpit = wprobe_dump_filters, ++ .policy = wprobe_policy, ++ }, ++}; ++ ++static void __exit ++wprobe_exit(void) ++{ ++ BUG_ON(!list_empty(&wprobe_if)); ++ genl_unregister_family(&wprobe_fam); ++} ++ ++ ++static int __init ++wprobe_init(void) ++{ ++ int i, err; ++ ++ spin_lock_init(&wprobe_lock); ++ INIT_LIST_HEAD(&wprobe_if); ++ ++ err = genl_register_family(&wprobe_fam); ++ if (err) ++ return err; ++ ++ for (i = 0; i < ARRAY_SIZE(wprobe_ops); i++) { ++ err = genl_register_ops(&wprobe_fam, &wprobe_ops[i]); ++ if (err) ++ goto error; ++ } ++ ++ return 0; ++ ++error: ++ genl_unregister_family(&wprobe_fam); ++ return err; ++} ++ ++module_init(wprobe_init); ++module_exit(wprobe_exit); ++MODULE_LICENSE("GPL"); ++ +diff --git a/feeds/packages/net/wprobe/src/kernel/.svn/text-base/wprobe-dummy.c.svn-base b/feeds/packages/net/wprobe/src/kernel/.svn/text-base/wprobe-dummy.c.svn-base +new file mode 100644 +index 0000000..4231223 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/.svn/text-base/wprobe-dummy.c.svn-base +@@ -0,0 +1,96 @@ ++/* ++ * wprobe-core.c: Wireless probe interface dummy driver ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static const char local_addr[] = "\x00\x13\x37\xba\xbe\x00"; ++ ++enum dummy_global_values { ++ DUMMY_GLOBAL_MEDIUM_BUSY ++}; ++enum dummy_link_values { ++ DUMMY_LINK_SNR ++}; ++ ++struct wprobe_item dummy_perlink[] = { ++ [DUMMY_LINK_SNR] = { ++ .name = "snr", ++ .type = WPROBE_VAL_U8, ++ .flags = WPROBE_F_KEEPSTAT, ++ }, ++}; ++ ++struct wprobe_item dummy_globals[] = { ++ [DUMMY_GLOBAL_MEDIUM_BUSY] = { ++ .name = "medium_busy", ++ .type = WPROBE_VAL_U8, ++ .flags = WPROBE_F_KEEPSTAT, ++ } ++}; ++ ++int dummy_sync(struct wprobe_iface *dev, struct wprobe_link *l, struct wprobe_value *val, bool measure) ++{ ++ u8 intval = 0; ++ ++ get_random_bytes(&intval, 1); ++ if (l) { ++ WPROBE_FILL_BEGIN(val, dummy_perlink); ++ WPROBE_SET(DUMMY_LINK_SNR, U8, (intval % 40)); ++ WPROBE_FILL_END(); ++ } else { ++ WPROBE_FILL_BEGIN(val, dummy_globals); ++ WPROBE_SET(DUMMY_GLOBAL_MEDIUM_BUSY, U8, (intval % 100)); ++ WPROBE_FILL_END(); ++ } ++ return 0; ++} ++ ++static struct wprobe_iface dummy_dev = { ++ .name = "dummy", ++ .addr = local_addr, ++ .link_items = dummy_perlink, ++ .n_link_items = ARRAY_SIZE(dummy_perlink), ++ .global_items = dummy_globals, ++ .n_global_items = ARRAY_SIZE(dummy_globals), ++ .sync_data = dummy_sync, ++}; ++ ++static struct wprobe_link dummy_link; ++ ++static int __init ++wprobe_dummy_init(void) ++{ ++ wprobe_add_iface(&dummy_dev); ++ wprobe_add_link(&dummy_dev, &dummy_link, "\x00\x13\x37\xda\xda\x00"); ++ return 0; ++} ++ ++static void __exit ++wprobe_dummy_exit(void) ++{ ++ wprobe_remove_link(&dummy_dev, &dummy_link); ++ wprobe_remove_iface(&dummy_dev); ++} ++ ++module_init(wprobe_dummy_init); ++module_exit(wprobe_dummy_exit); ++ ++MODULE_LICENSE("GPL"); +diff --git a/feeds/packages/net/wprobe/src/kernel/Makefile b/feeds/packages/net/wprobe/src/kernel/Makefile +new file mode 100644 +index 0000000..2a98753 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/Makefile +@@ -0,0 +1,5 @@ ++EXTRA_CFLAGS += -I. ++ ++obj-m := wprobe.o wprobe-dummy.o ++ ++wprobe-objs := wprobe-core.o +diff --git a/feeds/packages/net/wprobe/src/kernel/linux/.svn/entries b/feeds/packages/net/wprobe/src/kernel/linux/.svn/entries +new file mode 100644 +index 0000000..5e6512f +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/linux/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/src/kernel/linux ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wprobe.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++783a94c405883c5189afb06c2f74e774 ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10617 ++ +diff --git a/feeds/packages/net/wprobe/src/kernel/linux/.svn/text-base/wprobe.h.svn-base b/feeds/packages/net/wprobe/src/kernel/linux/.svn/text-base/wprobe.h.svn-base +new file mode 100644 +index 0000000..901daf3 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/linux/.svn/text-base/wprobe.h.svn-base +@@ -0,0 +1,397 @@ ++/* ++ * wprobe.h: API for the wireless probe interface ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#ifndef __WPROBE_H ++#define __WPROBE_H ++ ++#ifdef __KERNEL__ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#endif ++ ++/** ++ * enum wprobe_attr: netlink attribute list ++ * ++ * @WPROBE_ATTR_UNSPEC: unused ++ * ++ * @WPROBE_ATTR_INTERFACE: interface name to process query on (NLA_STRING) ++ * @WPROBE_ATTR_MAC: mac address (used for wireless links) (NLA_STRING) ++ * @WPROBE_ATTR_FLAGS: interface/link/attribute flags (see enum wprobe_flags) (NLA_U32)a ++ * @WPROBE_ATTR_DURATION: sampling duration (in milliseconds) (NLA_MSECS) ++ * ++ * @WPROBE_ATTR_ID: attribute id (NLA_U32) ++ * @WPROBE_ATTR_NAME: attribute name (NLA_STRING) ++ * @WPROBE_ATTR_TYPE: attribute type (NLA_U8) ++ * ++ * attribute values: ++ * ++ * @WPROBE_VAL_STRING: string value (NLA_STRING) ++ * @WPROBE_VAL_S8: signed 8-bit integer (NLA_U8) ++ * @WPROBE_VAL_S16: signed 16-bit integer (NLA_U16) ++ * @WPROBE_VAL_S32: signed 32-bit integer (NLA_U32) ++ * @WPROBE_VAL_S64: signed 64-bit integer (NLA_U64) ++ * @WPROBE_VAL_U8: unsigned 8-bit integer (NLA_U8) ++ * @WPROBE_VAL_U16: unsigned 16-bit integer (NLA_U16) ++ * @WPROBE_VAL_U32: unsigned 32-bit integer (NLA_U32) ++ * @WPROBE_VAL_U64: unsigned 64-bit integer (NLA_U64) ++ * ++ * statistics: ++ * @WPROBE_VAL_SUM: sum of all samples ++ * @WPROBE_VAL_SUM_SQ: sum of all samples^2 ++ * @WPROBE_VAL_SAMPLES: number of samples ++ * @WPROBE_VAL_SCALE_TIME: last time the samples were scaled down ++ * ++ * configuration: ++ * @WPROBE_ATTR_INTERVAL: (measurement interval in milliseconds) (NLA_MSECS) ++ * @WPROBE_ATTR_SAMPLES_MIN: minimum samples to keep during inactivity (NLA_U32) ++ * @WPROBE_ATTR_SAMPLES_MAX: maximum samples to keep before scaling down (NLA_U32) ++ * @WPROBE_ATTR_SAMPLES_SCALE_M: multiplier for scaling down samples (NLA_U32) ++ * @WPROBE_ATTR_SAMPLES_SCALE_D: divisor for scaling down samples (NLA_U32) ++ * ++ * @WPROBE_ATTR_LAST: unused ++ */ ++enum wprobe_attr { ++ /* query attributes */ ++ WPROBE_ATTR_UNSPEC, ++ WPROBE_ATTR_INTERFACE, ++ WPROBE_ATTR_MAC, ++ WPROBE_ATTR_FLAGS, ++ ++ /* response data */ ++ WPROBE_ATTR_ID, ++ WPROBE_ATTR_NAME, ++ WPROBE_ATTR_TYPE, ++ WPROBE_ATTR_DURATION, ++ ++ /* value type attributes */ ++ WPROBE_VAL_STRING, ++ WPROBE_VAL_S8, ++ WPROBE_VAL_S16, ++ WPROBE_VAL_S32, ++ WPROBE_VAL_S64, ++ WPROBE_VAL_U8, ++ WPROBE_VAL_U16, ++ WPROBE_VAL_U32, ++ WPROBE_VAL_U64, ++ ++ /* aggregates for statistics */ ++ WPROBE_VAL_SUM, ++ WPROBE_VAL_SUM_SQ, ++ WPROBE_VAL_SAMPLES, ++ WPROBE_VAL_SCALE_TIME, ++ ++ /* config attributes */ ++ WPROBE_ATTR_INTERVAL, ++ WPROBE_ATTR_SAMPLES_MIN, ++ WPROBE_ATTR_SAMPLES_MAX, ++ WPROBE_ATTR_SAMPLES_SCALE_M, ++ WPROBE_ATTR_SAMPLES_SCALE_D, ++ WPROBE_ATTR_FILTER, ++ ++ WPROBE_ATTR_FILTER_GROUP, ++ WPROBE_ATTR_RXCOUNT, ++ WPROBE_ATTR_TXCOUNT, ++ ++ WPROBE_ATTR_LAST ++}; ++ ++ ++/** ++ * enum wprobe_cmd: netlink commands for interacting with wprobe ++ * ++ * @WPROBE_CMD_UNSPEC: unused ++ * ++ * @WPROBE_CMD_GET_LIST: get global/link property list ++ * @WPROBE_CMD_GET_INFO: get global/link properties ++ * @WPROBE_CMD_SET_FLAGS: set global/link flags ++ * @WPROBE_CMD_MEASURE: take a snapshot of the current data ++ * @WPROBE_CMD_GET_LINKS: get a list of links ++ * @WPROBE_CMD_CONFIG: set config options ++ * @WPROBE_CMD_GET_FILTER: get counters for active filters ++ * ++ * @WPROBE_CMD_LAST: unused ++ * ++ * options for GET_INFO and SET_FLAGS: ++ * - mac address set: per-link ++ * - mac address unset: globalsa ++ */ ++enum wprobe_cmd { ++ WPROBE_CMD_UNSPEC, ++ WPROBE_CMD_GET_LIST, ++ WPROBE_CMD_GET_INFO, ++ WPROBE_CMD_SET_FLAGS, ++ WPROBE_CMD_MEASURE, ++ WPROBE_CMD_GET_LINKS, ++ WPROBE_CMD_CONFIG, ++ WPROBE_CMD_GET_FILTER, ++ WPROBE_CMD_LAST ++}; ++ ++/** ++ * enum wprobe_flags: flags for wprobe links and items ++ * @WPROBE_F_KEEPSTAT: keep statistics for this link/device ++ * @WPROBE_F_RESET: reset statistics now ++ * @WPROBE_F_NEWDATA: used to indicate that a value has been updated ++ */ ++enum wprobe_flags { ++ WPROBE_F_KEEPSTAT = (1 << 0), ++ WPROBE_F_RESET = (1 << 1), ++ WPROBE_F_NEWDATA = (1 << 2), ++}; ++ ++#ifdef __KERNEL__ ++ ++struct wprobe_link; ++struct wprobe_item; ++struct wprobe_source; ++struct wprobe_value; ++ ++/** ++ * struct wprobe_link - data structure describing a wireless link ++ * @iface: pointer to the wprobe_iface that this link belongs to ++ * @addr: BSSID of the remote link partner ++ * @flags: link flags (see wprobe_flags) ++ * @priv: user pointer ++ * ++ * @list: for internal use ++ * @val: for internal use ++ */ ++struct wprobe_link { ++ struct list_head list; ++ struct wprobe_iface *iface; ++ char addr[ETH_ALEN]; ++ u32 flags; ++ void *priv; ++ struct wprobe_value *val; ++}; ++ ++/** ++ * struct wprobe_item - data structure describing the format of wprobe_link::data or wprobe_iface::data ++ * @name: name of the field ++ * @type: data type of this field ++ * @flags: measurement item flags (see wprobe_flags) ++ */ ++struct wprobe_item { ++ const char *name; ++ enum wprobe_attr type; ++ u32 flags; ++}; ++ ++struct wprobe_value { ++ bool pending; ++ union { ++ /* ++ * the following are kept uppercase to allow ++ * for automated checking against WPROBE_VAL_* ++ * via BUG_ON() ++ */ ++ const char *STRING; ++ u8 U8; ++ u16 U16; ++ u32 U32; ++ u64 U64; ++ s8 S8; ++ s16 S16; ++ s32 S32; ++ s64 S64; ++ }; ++ s64 s, ss; ++ unsigned int n; ++ ++ /* timestamps */ ++ u64 first, last; ++ u64 scale_timestamp; ++}; ++ ++struct wprobe_filter_item_hdr { ++ char name[32]; ++ __be32 n_items; ++} __attribute__((packed)); ++ ++struct wprobe_filter_item { ++ struct wprobe_filter_item_hdr hdr; ++ struct sock_filter filter[]; ++} __attribute__((packed)); ++ ++struct wprobe_filter_counter { ++ u64 tx; ++ u64 rx; ++}; ++ ++struct wprobe_filter_group { ++ const char *name; ++ int n_items; ++ struct wprobe_filter_item **items; ++ struct wprobe_filter_counter *counters; ++}; ++ ++struct wprobe_filter_hdr { ++ __u8 magic[4]; ++ __u8 version; ++ __u8 hdrlen; ++ __u16 n_groups; ++} __attribute__((packed)); ++ ++struct wprobe_filter { ++ spinlock_t lock; ++ struct sk_buff *skb; ++ void *data; ++ int n_groups; ++ int hdrlen; ++ struct wprobe_filter_item **items; ++ struct wprobe_filter_counter *counters; ++ struct wprobe_filter_group groups[]; ++}; ++ ++enum { ++ WPROBE_PKT_RX = 0x00, ++ WPROBE_PKT_TX = 0x10, ++}; ++ ++struct wprobe_wlan_hdr { ++ u16 len; ++ u8 snr; ++ u8 type; ++} __attribute__((packed)); ++ ++ ++/** ++ * struct wprobe_source - data structure describing a wireless interface ++ * ++ * @name: name of the interface ++ * @addr: local mac address of the interface ++ * @links: list of wireless links to poll ++ * @link_items: description of the per-link data structure ++ * @n_link_items: number of link description items ++ * @global_items: description of the per-interface data structure ++ * @n_global_items: number of per-interface description items ++ * @sync_data: callback allowing the driver to prepare data for the wprobe poll ++ * ++ * @list: head for the list of interfaces ++ * @priv: user pointer ++ * @lock: spinlock protecting value data access ++ * @val: internal use ++ * @query_val: internal use ++ * ++ * if sync_data is NULL, wprobe assumes that it can access the data structure ++ * at any time (in atomic context). if sync_data returns a negative error code, ++ * the poll request will not be handled for the given link ++ */ ++struct wprobe_iface { ++ /* to be filled in by wprobe source drivers */ ++ const char *name; ++ const char *addr; ++ const struct wprobe_item *link_items; ++ int n_link_items; ++ const struct wprobe_item *global_items; ++ int n_global_items; ++ ++ int (*sync_data)(struct wprobe_iface *dev, struct wprobe_link *l, ++ struct wprobe_value *val, bool measure); ++ void *priv; ++ ++ /* handled by the wprobe core */ ++ struct list_head list; ++ struct list_head links; ++ spinlock_t lock; ++ struct wprobe_value *val; ++ struct wprobe_value *query_val; ++ struct wprobe_filter *active_filter; ++ ++ u32 measure_interval; ++ struct timer_list measure_timer; ++ ++ u32 scale_min; ++ u32 scale_max; ++ u32 scale_m; ++ u32 scale_d; ++}; ++ ++ ++#define WPROBE_FILL_BEGIN(_ptr, _list) do { \ ++ struct wprobe_value *__val = (_ptr); \ ++ const struct wprobe_item *__item = _list; \ ++ u64 __msecs = jiffies_to_msecs(jiffies) ++ ++#define WPROBE_SET(_idx, _type, _value) \ ++ if (__item[_idx].type != WPROBE_VAL_##_type) { \ ++ printk("ERROR: invalid data type at %s:%d\n", __FILE__, __LINE__); \ ++ break; \ ++ } \ ++ __val[_idx].pending = true; \ ++ __val[_idx]._type = _value; \ ++ if (!__val[_idx].first) \ ++ __val[_idx].first = __msecs; \ ++ __val[_idx].first = __msecs ++ ++#define WPROBE_FILL_END() \ ++} while(0) ++ ++/** ++ * wprobe_add_iface: register an interface with the wireless probe subsystem ++ * @dev: wprobe_iface structure describing the interface ++ */ ++extern int __weak wprobe_add_iface(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_remove_iface: deregister an interface from the wireless probe subsystem ++ * @dev: wprobe_iface structure describing the interface ++ */ ++extern void __weak wprobe_remove_iface(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_add_link: register a new wireless link ++ * @dev: wprobe_iface structure describing the interface ++ * @l: storage space for the wprobe_link structure ++ * @addr: mac address of the new link ++ * ++ * the entire wprobe_link structure is overwritten by this function call ++ */ ++extern int __weak wprobe_add_link(struct wprobe_iface *dev, struct wprobe_link *l, const char *addr); ++ ++/** ++ * wprobe_remove_link: deregister a previously registered wireless link ++ * @dev: wprobe_iface structure describing the interface ++ * @l: wprobe_link data structure ++ */ ++extern void __weak wprobe_remove_link(struct wprobe_iface *dev, struct wprobe_link *l); ++ ++/** ++ * wprobe_update_stats: update statistics after sampling values ++ * @dev: wprobe_iface structure describing the interface ++ * @l: wprobe_link data structure ++ * ++ * if l == NULL, then the stats for globals are updated ++ */ ++extern void __weak wprobe_update_stats(struct wprobe_iface *dev, struct wprobe_link *l); ++ ++/** ++ * wprobe_add_frame: add frame for layer 2 analysis ++ * @dev: wprobe_iface structure describing the interface ++ * @hdr: metadata for the frame ++ * @data: 802.11 header pointer ++ * @len: length of the 802.11 header ++ */ ++extern int __weak wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, void *data, int len); ++ ++#endif /* __KERNEL__ */ ++ ++#endif +diff --git a/feeds/packages/net/wprobe/src/kernel/linux/wprobe.h b/feeds/packages/net/wprobe/src/kernel/linux/wprobe.h +new file mode 100644 +index 0000000..901daf3 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/linux/wprobe.h +@@ -0,0 +1,397 @@ ++/* ++ * wprobe.h: API for the wireless probe interface ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#ifndef __WPROBE_H ++#define __WPROBE_H ++ ++#ifdef __KERNEL__ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#endif ++ ++/** ++ * enum wprobe_attr: netlink attribute list ++ * ++ * @WPROBE_ATTR_UNSPEC: unused ++ * ++ * @WPROBE_ATTR_INTERFACE: interface name to process query on (NLA_STRING) ++ * @WPROBE_ATTR_MAC: mac address (used for wireless links) (NLA_STRING) ++ * @WPROBE_ATTR_FLAGS: interface/link/attribute flags (see enum wprobe_flags) (NLA_U32)a ++ * @WPROBE_ATTR_DURATION: sampling duration (in milliseconds) (NLA_MSECS) ++ * ++ * @WPROBE_ATTR_ID: attribute id (NLA_U32) ++ * @WPROBE_ATTR_NAME: attribute name (NLA_STRING) ++ * @WPROBE_ATTR_TYPE: attribute type (NLA_U8) ++ * ++ * attribute values: ++ * ++ * @WPROBE_VAL_STRING: string value (NLA_STRING) ++ * @WPROBE_VAL_S8: signed 8-bit integer (NLA_U8) ++ * @WPROBE_VAL_S16: signed 16-bit integer (NLA_U16) ++ * @WPROBE_VAL_S32: signed 32-bit integer (NLA_U32) ++ * @WPROBE_VAL_S64: signed 64-bit integer (NLA_U64) ++ * @WPROBE_VAL_U8: unsigned 8-bit integer (NLA_U8) ++ * @WPROBE_VAL_U16: unsigned 16-bit integer (NLA_U16) ++ * @WPROBE_VAL_U32: unsigned 32-bit integer (NLA_U32) ++ * @WPROBE_VAL_U64: unsigned 64-bit integer (NLA_U64) ++ * ++ * statistics: ++ * @WPROBE_VAL_SUM: sum of all samples ++ * @WPROBE_VAL_SUM_SQ: sum of all samples^2 ++ * @WPROBE_VAL_SAMPLES: number of samples ++ * @WPROBE_VAL_SCALE_TIME: last time the samples were scaled down ++ * ++ * configuration: ++ * @WPROBE_ATTR_INTERVAL: (measurement interval in milliseconds) (NLA_MSECS) ++ * @WPROBE_ATTR_SAMPLES_MIN: minimum samples to keep during inactivity (NLA_U32) ++ * @WPROBE_ATTR_SAMPLES_MAX: maximum samples to keep before scaling down (NLA_U32) ++ * @WPROBE_ATTR_SAMPLES_SCALE_M: multiplier for scaling down samples (NLA_U32) ++ * @WPROBE_ATTR_SAMPLES_SCALE_D: divisor for scaling down samples (NLA_U32) ++ * ++ * @WPROBE_ATTR_LAST: unused ++ */ ++enum wprobe_attr { ++ /* query attributes */ ++ WPROBE_ATTR_UNSPEC, ++ WPROBE_ATTR_INTERFACE, ++ WPROBE_ATTR_MAC, ++ WPROBE_ATTR_FLAGS, ++ ++ /* response data */ ++ WPROBE_ATTR_ID, ++ WPROBE_ATTR_NAME, ++ WPROBE_ATTR_TYPE, ++ WPROBE_ATTR_DURATION, ++ ++ /* value type attributes */ ++ WPROBE_VAL_STRING, ++ WPROBE_VAL_S8, ++ WPROBE_VAL_S16, ++ WPROBE_VAL_S32, ++ WPROBE_VAL_S64, ++ WPROBE_VAL_U8, ++ WPROBE_VAL_U16, ++ WPROBE_VAL_U32, ++ WPROBE_VAL_U64, ++ ++ /* aggregates for statistics */ ++ WPROBE_VAL_SUM, ++ WPROBE_VAL_SUM_SQ, ++ WPROBE_VAL_SAMPLES, ++ WPROBE_VAL_SCALE_TIME, ++ ++ /* config attributes */ ++ WPROBE_ATTR_INTERVAL, ++ WPROBE_ATTR_SAMPLES_MIN, ++ WPROBE_ATTR_SAMPLES_MAX, ++ WPROBE_ATTR_SAMPLES_SCALE_M, ++ WPROBE_ATTR_SAMPLES_SCALE_D, ++ WPROBE_ATTR_FILTER, ++ ++ WPROBE_ATTR_FILTER_GROUP, ++ WPROBE_ATTR_RXCOUNT, ++ WPROBE_ATTR_TXCOUNT, ++ ++ WPROBE_ATTR_LAST ++}; ++ ++ ++/** ++ * enum wprobe_cmd: netlink commands for interacting with wprobe ++ * ++ * @WPROBE_CMD_UNSPEC: unused ++ * ++ * @WPROBE_CMD_GET_LIST: get global/link property list ++ * @WPROBE_CMD_GET_INFO: get global/link properties ++ * @WPROBE_CMD_SET_FLAGS: set global/link flags ++ * @WPROBE_CMD_MEASURE: take a snapshot of the current data ++ * @WPROBE_CMD_GET_LINKS: get a list of links ++ * @WPROBE_CMD_CONFIG: set config options ++ * @WPROBE_CMD_GET_FILTER: get counters for active filters ++ * ++ * @WPROBE_CMD_LAST: unused ++ * ++ * options for GET_INFO and SET_FLAGS: ++ * - mac address set: per-link ++ * - mac address unset: globalsa ++ */ ++enum wprobe_cmd { ++ WPROBE_CMD_UNSPEC, ++ WPROBE_CMD_GET_LIST, ++ WPROBE_CMD_GET_INFO, ++ WPROBE_CMD_SET_FLAGS, ++ WPROBE_CMD_MEASURE, ++ WPROBE_CMD_GET_LINKS, ++ WPROBE_CMD_CONFIG, ++ WPROBE_CMD_GET_FILTER, ++ WPROBE_CMD_LAST ++}; ++ ++/** ++ * enum wprobe_flags: flags for wprobe links and items ++ * @WPROBE_F_KEEPSTAT: keep statistics for this link/device ++ * @WPROBE_F_RESET: reset statistics now ++ * @WPROBE_F_NEWDATA: used to indicate that a value has been updated ++ */ ++enum wprobe_flags { ++ WPROBE_F_KEEPSTAT = (1 << 0), ++ WPROBE_F_RESET = (1 << 1), ++ WPROBE_F_NEWDATA = (1 << 2), ++}; ++ ++#ifdef __KERNEL__ ++ ++struct wprobe_link; ++struct wprobe_item; ++struct wprobe_source; ++struct wprobe_value; ++ ++/** ++ * struct wprobe_link - data structure describing a wireless link ++ * @iface: pointer to the wprobe_iface that this link belongs to ++ * @addr: BSSID of the remote link partner ++ * @flags: link flags (see wprobe_flags) ++ * @priv: user pointer ++ * ++ * @list: for internal use ++ * @val: for internal use ++ */ ++struct wprobe_link { ++ struct list_head list; ++ struct wprobe_iface *iface; ++ char addr[ETH_ALEN]; ++ u32 flags; ++ void *priv; ++ struct wprobe_value *val; ++}; ++ ++/** ++ * struct wprobe_item - data structure describing the format of wprobe_link::data or wprobe_iface::data ++ * @name: name of the field ++ * @type: data type of this field ++ * @flags: measurement item flags (see wprobe_flags) ++ */ ++struct wprobe_item { ++ const char *name; ++ enum wprobe_attr type; ++ u32 flags; ++}; ++ ++struct wprobe_value { ++ bool pending; ++ union { ++ /* ++ * the following are kept uppercase to allow ++ * for automated checking against WPROBE_VAL_* ++ * via BUG_ON() ++ */ ++ const char *STRING; ++ u8 U8; ++ u16 U16; ++ u32 U32; ++ u64 U64; ++ s8 S8; ++ s16 S16; ++ s32 S32; ++ s64 S64; ++ }; ++ s64 s, ss; ++ unsigned int n; ++ ++ /* timestamps */ ++ u64 first, last; ++ u64 scale_timestamp; ++}; ++ ++struct wprobe_filter_item_hdr { ++ char name[32]; ++ __be32 n_items; ++} __attribute__((packed)); ++ ++struct wprobe_filter_item { ++ struct wprobe_filter_item_hdr hdr; ++ struct sock_filter filter[]; ++} __attribute__((packed)); ++ ++struct wprobe_filter_counter { ++ u64 tx; ++ u64 rx; ++}; ++ ++struct wprobe_filter_group { ++ const char *name; ++ int n_items; ++ struct wprobe_filter_item **items; ++ struct wprobe_filter_counter *counters; ++}; ++ ++struct wprobe_filter_hdr { ++ __u8 magic[4]; ++ __u8 version; ++ __u8 hdrlen; ++ __u16 n_groups; ++} __attribute__((packed)); ++ ++struct wprobe_filter { ++ spinlock_t lock; ++ struct sk_buff *skb; ++ void *data; ++ int n_groups; ++ int hdrlen; ++ struct wprobe_filter_item **items; ++ struct wprobe_filter_counter *counters; ++ struct wprobe_filter_group groups[]; ++}; ++ ++enum { ++ WPROBE_PKT_RX = 0x00, ++ WPROBE_PKT_TX = 0x10, ++}; ++ ++struct wprobe_wlan_hdr { ++ u16 len; ++ u8 snr; ++ u8 type; ++} __attribute__((packed)); ++ ++ ++/** ++ * struct wprobe_source - data structure describing a wireless interface ++ * ++ * @name: name of the interface ++ * @addr: local mac address of the interface ++ * @links: list of wireless links to poll ++ * @link_items: description of the per-link data structure ++ * @n_link_items: number of link description items ++ * @global_items: description of the per-interface data structure ++ * @n_global_items: number of per-interface description items ++ * @sync_data: callback allowing the driver to prepare data for the wprobe poll ++ * ++ * @list: head for the list of interfaces ++ * @priv: user pointer ++ * @lock: spinlock protecting value data access ++ * @val: internal use ++ * @query_val: internal use ++ * ++ * if sync_data is NULL, wprobe assumes that it can access the data structure ++ * at any time (in atomic context). if sync_data returns a negative error code, ++ * the poll request will not be handled for the given link ++ */ ++struct wprobe_iface { ++ /* to be filled in by wprobe source drivers */ ++ const char *name; ++ const char *addr; ++ const struct wprobe_item *link_items; ++ int n_link_items; ++ const struct wprobe_item *global_items; ++ int n_global_items; ++ ++ int (*sync_data)(struct wprobe_iface *dev, struct wprobe_link *l, ++ struct wprobe_value *val, bool measure); ++ void *priv; ++ ++ /* handled by the wprobe core */ ++ struct list_head list; ++ struct list_head links; ++ spinlock_t lock; ++ struct wprobe_value *val; ++ struct wprobe_value *query_val; ++ struct wprobe_filter *active_filter; ++ ++ u32 measure_interval; ++ struct timer_list measure_timer; ++ ++ u32 scale_min; ++ u32 scale_max; ++ u32 scale_m; ++ u32 scale_d; ++}; ++ ++ ++#define WPROBE_FILL_BEGIN(_ptr, _list) do { \ ++ struct wprobe_value *__val = (_ptr); \ ++ const struct wprobe_item *__item = _list; \ ++ u64 __msecs = jiffies_to_msecs(jiffies) ++ ++#define WPROBE_SET(_idx, _type, _value) \ ++ if (__item[_idx].type != WPROBE_VAL_##_type) { \ ++ printk("ERROR: invalid data type at %s:%d\n", __FILE__, __LINE__); \ ++ break; \ ++ } \ ++ __val[_idx].pending = true; \ ++ __val[_idx]._type = _value; \ ++ if (!__val[_idx].first) \ ++ __val[_idx].first = __msecs; \ ++ __val[_idx].first = __msecs ++ ++#define WPROBE_FILL_END() \ ++} while(0) ++ ++/** ++ * wprobe_add_iface: register an interface with the wireless probe subsystem ++ * @dev: wprobe_iface structure describing the interface ++ */ ++extern int __weak wprobe_add_iface(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_remove_iface: deregister an interface from the wireless probe subsystem ++ * @dev: wprobe_iface structure describing the interface ++ */ ++extern void __weak wprobe_remove_iface(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_add_link: register a new wireless link ++ * @dev: wprobe_iface structure describing the interface ++ * @l: storage space for the wprobe_link structure ++ * @addr: mac address of the new link ++ * ++ * the entire wprobe_link structure is overwritten by this function call ++ */ ++extern int __weak wprobe_add_link(struct wprobe_iface *dev, struct wprobe_link *l, const char *addr); ++ ++/** ++ * wprobe_remove_link: deregister a previously registered wireless link ++ * @dev: wprobe_iface structure describing the interface ++ * @l: wprobe_link data structure ++ */ ++extern void __weak wprobe_remove_link(struct wprobe_iface *dev, struct wprobe_link *l); ++ ++/** ++ * wprobe_update_stats: update statistics after sampling values ++ * @dev: wprobe_iface structure describing the interface ++ * @l: wprobe_link data structure ++ * ++ * if l == NULL, then the stats for globals are updated ++ */ ++extern void __weak wprobe_update_stats(struct wprobe_iface *dev, struct wprobe_link *l); ++ ++/** ++ * wprobe_add_frame: add frame for layer 2 analysis ++ * @dev: wprobe_iface structure describing the interface ++ * @hdr: metadata for the frame ++ * @data: 802.11 header pointer ++ * @len: length of the 802.11 header ++ */ ++extern int __weak wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, void *data, int len); ++ ++#endif /* __KERNEL__ */ ++ ++#endif +diff --git a/feeds/packages/net/wprobe/src/kernel/wprobe-core.c b/feeds/packages/net/wprobe/src/kernel/wprobe-core.c +new file mode 100644 +index 0000000..27bc366 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/wprobe-core.c +@@ -0,0 +1,1196 @@ ++/* ++ * wprobe-core.c: Wireless probe interface core ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#include ++#else ++#include ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) ++#include ++#endif ++#include ++#include ++#include ++ ++#define static ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++#define list_for_each_rcu(pos, head) \ ++for (pos = rcu_dereference((head)->next); \ ++prefetch(pos->next), pos != (head); \ ++pos = rcu_dereference(pos->next)) ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#define SKB_PORTID(x) NETLINK_CB(x).portid ++#else ++#define SKB_PORTID(x) NETLINK_CB(x).pid ++#endif ++ ++#define WPROBE_MIN_INTERVAL 100 /* minimum measurement interval in msecs */ ++#define WPROBE_MAX_FILTER_SIZE 1024 ++#define WPROBE_MAX_FRAME_SIZE 1900 ++ ++static struct list_head wprobe_if; ++static spinlock_t wprobe_lock; ++ ++static struct genl_family wprobe_fam = { ++ .id = GENL_ID_GENERATE, ++ .name = "wprobe", ++ .hdrsize = 0, ++ .version = 1, ++ /* only the first set of attributes is used for queries */ ++ .maxattr = WPROBE_ATTR_LAST, ++}; ++ ++/* fake radiotap header */ ++struct wprobe_rtap_hdr { ++ __u8 version; ++ __u8 padding; ++ __le16 len; ++ __le32 present; ++}; ++ ++static void wprobe_update_stats(struct wprobe_iface *dev, struct wprobe_link *l); ++static int wprobe_sync_data(struct wprobe_iface *dev, struct wprobe_link *l, bool query); ++static void wprobe_free_filter(struct wprobe_filter *f); ++ ++int ++wprobe_add_link(struct wprobe_iface *s, struct wprobe_link *l, const char *addr) ++{ ++ unsigned long flags; ++ ++ INIT_LIST_HEAD(&l->list); ++ l->val = kzalloc(sizeof(struct wprobe_value) * s->n_link_items, GFP_ATOMIC); ++ if (!l->val) ++ return -ENOMEM; ++ ++ l->iface = s; ++ memcpy(&l->addr, addr, ETH_ALEN); ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_add_tail_rcu(&l->list, &s->links); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ ++ return 0; ++} ++EXPORT_SYMBOL(wprobe_add_link); ++ ++void ++wprobe_remove_link(struct wprobe_iface *s, struct wprobe_link *l) ++{ ++ unsigned long flags; ++ ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_del_rcu(&l->list); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ synchronize_rcu(); ++ kfree(l->val); ++} ++EXPORT_SYMBOL(wprobe_remove_link); ++ ++static void ++wprobe_measure_timer(unsigned long data) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *) data; ++ ++ /* set next measurement interval */ ++ mod_timer(&dev->measure_timer, jiffies + ++ msecs_to_jiffies(dev->measure_interval)); ++ ++ /* perform measurement */ ++ wprobe_sync_data(dev, NULL, false); ++} ++ ++int ++wprobe_add_iface(struct wprobe_iface *s) ++{ ++ unsigned long flags; ++ int vsize; ++ ++ /* reset only wprobe private area */ ++ memset(&s->list, 0, sizeof(struct wprobe_iface) - offsetof(struct wprobe_iface, list)); ++ ++ BUG_ON(!s->name); ++ INIT_LIST_HEAD(&s->list); ++ INIT_LIST_HEAD(&s->links); ++ setup_timer(&s->measure_timer, wprobe_measure_timer, (unsigned long) s); ++ ++ s->val = kzalloc(sizeof(struct wprobe_value) * s->n_global_items, GFP_ATOMIC); ++ if (!s->val) ++ goto error; ++ ++ vsize = max(s->n_link_items, s->n_global_items); ++ s->query_val = kzalloc(sizeof(struct wprobe_value) * vsize, GFP_ATOMIC); ++ if (!s->query_val) ++ goto error; ++ ++ /* initialize defaults to be able to handle overflow, ++ * user space will need to handle this if it keeps an ++ * internal histogram */ ++ s->scale_min = 20; ++ s->scale_max = (1 << 31); ++ ++ s->scale_m = 1; ++ s->scale_d = 10; ++ ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_add_rcu(&s->list, &wprobe_if); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ ++ return 0; ++ ++error: ++ if (s->val) ++ kfree(s->val); ++ return -ENOMEM; ++} ++EXPORT_SYMBOL(wprobe_add_iface); ++ ++void ++wprobe_remove_iface(struct wprobe_iface *s) ++{ ++ unsigned long flags; ++ ++ BUG_ON(!list_empty(&s->links)); ++ ++ del_timer_sync(&s->measure_timer); ++ spin_lock_irqsave(&wprobe_lock, flags); ++ list_del_rcu(&s->list); ++ spin_unlock_irqrestore(&wprobe_lock, flags); ++ ++ /* wait for all queries to finish before freeing the ++ * temporary value storage buffer */ ++ synchronize_rcu(); ++ ++ kfree(s->val); ++ kfree(s->query_val); ++ if (s->active_filter) ++ wprobe_free_filter(s->active_filter); ++} ++EXPORT_SYMBOL(wprobe_remove_iface); ++ ++static struct wprobe_iface * ++wprobe_get_dev(struct nlattr *attr) ++{ ++ struct wprobe_iface *dev = NULL; ++ struct wprobe_iface *p; ++ const char *name; ++ int i = 0; ++ ++ if (!attr) ++ return NULL; ++ ++ name = nla_data(attr); ++ list_for_each_entry_rcu(p, &wprobe_if, list) { ++ i++; ++ if (strcmp(name, p->name) != 0) ++ continue; ++ ++ dev = p; ++ break; ++ } ++ ++ return dev; ++} ++ ++int ++wprobe_add_frame(struct wprobe_iface *dev, const struct wprobe_wlan_hdr *hdr, void *data, int len) ++{ ++ struct wprobe_wlan_hdr *new_hdr; ++ struct wprobe_filter *f; ++ struct sk_buff *skb; ++ unsigned long flags; ++ int i, j; ++ ++ rcu_read_lock(); ++ f = rcu_dereference(dev->active_filter); ++ if (!f) ++ goto out; ++ ++ spin_lock_irqsave(&f->lock, flags); ++ ++ skb = f->skb; ++ skb->len = sizeof(struct wprobe_rtap_hdr); ++ skb->tail = skb->data + skb->len; ++ if (len + skb->len > WPROBE_MAX_FRAME_SIZE) ++ len = WPROBE_MAX_FRAME_SIZE - skb->len; ++ ++ new_hdr = (struct wprobe_wlan_hdr *) skb_put(skb, f->hdrlen); ++ memcpy(new_hdr, hdr, sizeof(struct wprobe_wlan_hdr)); ++ new_hdr->len = cpu_to_be16(new_hdr->len); ++ ++ memcpy(skb_put(skb, len), data, len); ++ ++ for(i = 0; i < f->n_groups; i++) { ++ struct wprobe_filter_group *fg = &f->groups[i]; ++ bool found = false; ++ int def = -1; ++ ++ for (j = 0; j < fg->n_items; j++) { ++ struct wprobe_filter_item *fi = fg->items[j]; ++ ++ if (!fi->hdr.n_items) { ++ def = j; ++ continue; ++ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) ++ if (sk_run_filter(skb, fi->filter) == 0) ++ continue; ++#else ++ if (sk_run_filter(skb, fi->filter, fi->hdr.n_items) == 0) ++ continue; ++#endif ++ ++ found = true; ++ break; ++ } ++ if (!found && def >= 0) { ++ j = def; ++ found = true; ++ } ++ if (found) { ++ struct wprobe_filter_counter *c = &fg->counters[j]; ++ ++ if (hdr->type >= WPROBE_PKT_TX) ++ c->tx++; ++ else ++ c->rx++; ++ } ++ } ++ ++ spin_unlock_irqrestore(&f->lock, flags); ++out: ++ rcu_read_unlock(); ++ return 0; ++} ++EXPORT_SYMBOL(wprobe_add_frame); ++ ++static int ++wprobe_sync_data(struct wprobe_iface *dev, struct wprobe_link *l, bool query) ++{ ++ struct wprobe_value *val; ++ unsigned long flags; ++ int n, err; ++ ++ if (l) { ++ n = dev->n_link_items; ++ val = l->val; ++ } else { ++ n = dev->n_global_items; ++ val = dev->val; ++ } ++ ++ spin_lock_irqsave(&dev->lock, flags); ++ err = dev->sync_data(dev, l, val, !query); ++ if (err) ++ goto done; ++ ++ if (query) ++ memcpy(dev->query_val, val, sizeof(struct wprobe_value) * n); ++ ++ wprobe_update_stats(dev, l); ++done: ++ spin_unlock_irqrestore(&dev->lock, flags); ++ return 0; ++} ++EXPORT_SYMBOL(wprobe_sync_data); ++ ++static void ++wprobe_scale_stats(struct wprobe_iface *dev, const struct wprobe_item *item, ++ struct wprobe_value *val, int n) ++{ ++ u64 scale_ts = jiffies_64; ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if (!(item[i].flags & WPROBE_F_KEEPSTAT)) ++ continue; ++ ++ if (val[i].n <= dev->scale_min) ++ continue; ++ ++ /* FIXME: div_s64 seems to be very imprecise here, even when ++ * the values are scaled up */ ++ val[i].s *= dev->scale_m; ++ val[i].s = div_s64(val[i].s, dev->scale_d); ++ ++ val[i].ss *= dev->scale_m; ++ val[i].ss = div_s64(val[i].ss, dev->scale_d); ++ ++ val[i].n = (val[i].n * dev->scale_m) / dev->scale_d; ++ val[i].scale_timestamp = scale_ts; ++ } ++} ++ ++ ++void ++wprobe_update_stats(struct wprobe_iface *dev, struct wprobe_link *l) ++{ ++ const struct wprobe_item *item; ++ struct wprobe_value *val; ++ bool scale_stats = false; ++ int i, n; ++ ++ if (l) { ++ n = dev->n_link_items; ++ item = dev->link_items; ++ val = l->val; ++ } else { ++ n = dev->n_global_items; ++ item = dev->global_items; ++ val = dev->val; ++ } ++ ++ /* process statistics */ ++ for (i = 0; i < n; i++) { ++ s64 v; ++ ++ if (!val[i].pending) ++ continue; ++ ++ val[i].n++; ++ if ((item[i].flags & WPROBE_F_KEEPSTAT) && ++ (dev->scale_max > 0) && (val[i].n > dev->scale_max)) { ++ scale_stats = true; ++ } ++ ++ switch(item[i].type) { ++ case WPROBE_VAL_S8: ++ v = val[i].S8; ++ break; ++ case WPROBE_VAL_S16: ++ v = val[i].S16; ++ break; ++ case WPROBE_VAL_S32: ++ v = val[i].S32; ++ break; ++ case WPROBE_VAL_S64: ++ v = val[i].S64; ++ break; ++ case WPROBE_VAL_U8: ++ v = val[i].U8; ++ break; ++ case WPROBE_VAL_U16: ++ v = val[i].U16; ++ break; ++ case WPROBE_VAL_U32: ++ v = val[i].U32; ++ break; ++ case WPROBE_VAL_U64: ++ v = val[i].U64; ++ break; ++ default: ++ continue; ++ } ++ ++ val[i].s += v; ++ val[i].ss += v * v; ++ val[i].pending = false; ++ } ++ if (scale_stats) ++ wprobe_scale_stats(dev, item, val, n); ++} ++EXPORT_SYMBOL(wprobe_update_stats); ++ ++static const struct nla_policy wprobe_policy[WPROBE_ATTR_LAST+1] = { ++ [WPROBE_ATTR_INTERFACE] = { .type = NLA_NUL_STRING }, ++ [WPROBE_ATTR_MAC] = { .type = NLA_STRING }, ++ [WPROBE_ATTR_FLAGS] = { .type = NLA_U32 }, ++ ++ /* config */ ++ [WPROBE_ATTR_INTERVAL] = { .type = NLA_MSECS }, ++ [WPROBE_ATTR_SAMPLES_MIN] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_MAX] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_M] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_D] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_FILTER] = { .type = NLA_BINARY, .len = 32768 }, ++}; ++ ++static bool ++wprobe_check_ptr(struct list_head *list, struct list_head *ptr) ++{ ++ struct list_head *p; ++ ++ list_for_each_rcu(p, list) { ++ if (ptr == p) ++ return true; ++ } ++ return false; ++} ++ ++static bool ++wprobe_send_item_value(struct sk_buff *msg, struct netlink_callback *cb, ++ struct wprobe_iface *dev, struct wprobe_link *l, ++ const struct wprobe_item *item, ++ int i, u32 flags) ++{ ++ struct genlmsghdr *hdr; ++ struct wprobe_value *val = dev->query_val; ++ u64 time = val[i].last - val[i].first; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_INFO); ++ ++ if (nla_put_u32(msg, WPROBE_ATTR_ID, i)) ++ goto nla_put_failure; ++ if (nla_put_u32(msg, WPROBE_ATTR_FLAGS, flags)) ++ goto nla_put_failure; ++ if (nla_put_u8(msg, WPROBE_ATTR_TYPE, item[i].type)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_ATTR_DURATION, time)) ++ goto nla_put_failure; ++ ++ switch(item[i].type) { ++ case WPROBE_VAL_S8: ++ case WPROBE_VAL_U8: ++ if (nla_put_u8(msg, item[i].type, val[i].U8)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_S16: ++ case WPROBE_VAL_U16: ++ if (nla_put_u16(msg, item[i].type, val[i].U16)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_S32: ++ case WPROBE_VAL_U32: ++ if (nla_put_u32(msg, item[i].type, val[i].U32)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_S64: ++ case WPROBE_VAL_U64: ++ if (nla_put_u64(msg, item[i].type, val[i].U64)) ++ goto nla_put_failure; ++ break; ++ case WPROBE_VAL_STRING: ++ if (val[i].STRING) { ++ if (nla_put_string(msg, item[i].type, val[i].STRING)) ++ goto nla_put_failure; ++ } else { ++ if (nla_put_string(msg, item[i].type, "")) ++ goto nla_put_failure; ++ } ++ /* bypass avg/stdev */ ++ goto done; ++ default: ++ /* skip unknown values */ ++ goto done; ++ } ++ if (item[i].flags & WPROBE_F_KEEPSTAT) { ++ if (nla_put_u64(msg, WPROBE_VAL_SUM, val[i].s)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_VAL_SUM_SQ, val[i].ss)) ++ goto nla_put_failure; ++ if (nla_put_u32(msg, WPROBE_VAL_SAMPLES, (u32) val[i].n)) ++ goto nla_put_failure; ++ if (nla_put_msecs(msg, WPROBE_VAL_SCALE_TIME, val[i].scale_timestamp)) ++ goto nla_put_failure; ++ } ++done: ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++static bool ++wprobe_send_item_info(struct sk_buff *msg, struct netlink_callback *cb, ++ struct wprobe_iface *dev, ++ const struct wprobe_item *item, int i) ++{ ++ struct genlmsghdr *hdr; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_LIST); ++ ++ if ((i == 0) && (dev->addr != NULL)) { ++ if (nla_put(msg, WPROBE_ATTR_MAC, 6, dev->addr)) ++ goto nla_put_failure; ++ } ++ if (nla_put_u32(msg, WPROBE_ATTR_ID, (u32) i)) ++ goto nla_put_failure; ++ if (nla_put_string(msg, WPROBE_ATTR_NAME, item[i].name)) ++ goto nla_put_failure; ++ if (nla_put_u8(msg, WPROBE_ATTR_TYPE, item[i].type)) ++ goto nla_put_failure; ++ if (nla_put_u32(msg, WPROBE_ATTR_FLAGS, item[i].flags)) ++ goto nla_put_failure; ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++ ++static struct wprobe_link * ++wprobe_find_link(struct wprobe_iface *dev, const char *mac) ++{ ++ struct wprobe_link *l; ++ ++ list_for_each_entry_rcu(l, &dev->links, list) { ++ if (!memcmp(l->addr, mac, 6)) ++ return l; ++ } ++ return NULL; ++} ++ ++static bool ++wprobe_dump_filter_group(struct sk_buff *msg, struct wprobe_filter_group *fg, struct netlink_callback *cb) ++{ ++ struct genlmsghdr *hdr; ++ struct nlattr *group, *item; ++ int i; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_FILTER); ++ if (!hdr) ++ return false; ++ ++ if (nla_put_string(msg, WPROBE_ATTR_NAME, fg->name)) ++ goto nla_put_failure; ++ group = nla_nest_start(msg, WPROBE_ATTR_FILTER_GROUP); ++ for (i = 0; i < fg->n_items; i++) { ++ struct wprobe_filter_item *fi = fg->items[i]; ++ struct wprobe_filter_counter *fc = &fg->counters[i]; ++ ++ item = nla_nest_start(msg, WPROBE_ATTR_FILTER_GROUP); ++ if (nla_put_string(msg, WPROBE_ATTR_NAME, fi->hdr.name)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_ATTR_RXCOUNT, fc->rx)) ++ goto nla_put_failure; ++ if (nla_put_u64(msg, WPROBE_ATTR_TXCOUNT, fc->tx)) ++ goto nla_put_failure; ++ nla_nest_end(msg, item); ++ } ++ ++ nla_nest_end(msg, group); ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++static int ++wprobe_dump_filters(struct sk_buff *skb, struct netlink_callback *cb) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *)cb->args[0]; ++ struct wprobe_filter *f; ++ int err = 0; ++ int i = 0; ++ ++ if (!dev) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + wprobe_fam.hdrsize, ++ wprobe_fam.attrbuf, wprobe_fam.maxattr, wprobe_policy); ++ if (err) ++ goto done; ++ ++ dev = wprobe_get_dev(wprobe_fam.attrbuf[WPROBE_ATTR_INTERFACE]); ++ if (!dev) { ++ err = -ENODEV; ++ goto done; ++ } ++ ++ cb->args[0] = (long) dev; ++ cb->args[1] = 0; ++ } else { ++ if (!wprobe_check_ptr(&wprobe_if, &dev->list)) { ++ err = -ENODEV; ++ goto done; ++ } ++ } ++ ++ rcu_read_lock(); ++ f = rcu_dereference(dev->active_filter); ++ if (!f) ++ goto abort; ++ ++ for (i = cb->args[1]; i < f->n_groups; i++) { ++ if (unlikely(!wprobe_dump_filter_group(skb, &f->groups[i], cb))) ++ break; ++ } ++ cb->args[1] = i; ++abort: ++ rcu_read_unlock(); ++ err = skb->len; ++done: ++ return err; ++} ++ ++static bool ++wprobe_dump_link(struct sk_buff *msg, struct wprobe_link *l, struct netlink_callback *cb) ++{ ++ struct genlmsghdr *hdr; ++ ++ hdr = genlmsg_put(msg, SKB_PORTID(cb->skb), cb->nlh->nlmsg_seq, ++ &wprobe_fam, NLM_F_MULTI, WPROBE_CMD_GET_LINKS); ++ if (!hdr) ++ return false; ++ ++ if (nla_put(msg, WPROBE_ATTR_MAC, 6, l->addr)) ++ goto nla_put_failure; ++ genlmsg_end(msg, hdr); ++ return true; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ return false; ++} ++ ++static int ++wprobe_dump_links(struct sk_buff *skb, struct netlink_callback *cb) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *)cb->args[0]; ++ struct wprobe_link *l; ++ int err = 0; ++ int i = 0; ++ ++ if (!dev) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + wprobe_fam.hdrsize, ++ wprobe_fam.attrbuf, wprobe_fam.maxattr, wprobe_policy); ++ if (err) ++ goto done; ++ ++ dev = wprobe_get_dev(wprobe_fam.attrbuf[WPROBE_ATTR_INTERFACE]); ++ if (!dev) { ++ err = -ENODEV; ++ goto done; ++ } ++ ++ cb->args[0] = (long) dev; ++ } else { ++ if (!wprobe_check_ptr(&wprobe_if, &dev->list)) { ++ err = -ENODEV; ++ goto done; ++ } ++ } ++ ++ rcu_read_lock(); ++ list_for_each_entry_rcu(l, &dev->links, list) { ++ if (i < cb->args[1]) ++ continue; ++ ++ if (unlikely(!wprobe_dump_link(skb, l, cb))) ++ break; ++ ++ i++; ++ } ++ cb->args[1] = i; ++ rcu_read_unlock(); ++ err = skb->len; ++done: ++ return err; ++} ++ ++#define WPROBE_F_LINK (1 << 31) /* for internal use */ ++static int ++wprobe_dump_info(struct sk_buff *skb, struct netlink_callback *cb) ++{ ++ struct wprobe_iface *dev = (struct wprobe_iface *)cb->args[0]; ++ struct wprobe_link *l = (struct wprobe_link *)cb->args[1]; ++ struct wprobe_value *val; ++ const struct wprobe_item *item; ++ struct genlmsghdr *hdr; ++ unsigned long flags; ++ int cmd, n, i = cb->args[3]; ++ u32 vflags = cb->args[2]; ++ int err = 0; ++ ++ hdr = (struct genlmsghdr *)nlmsg_data(cb->nlh); ++ cmd = hdr->cmd; ++ ++ /* since the attribute value list might be too big for a single netlink ++ * message, the device, link and offset get stored in the netlink callback. ++ * if this is the first request, we need to do the full lookup for the device. ++ * ++ * access to the device and link structure is synchronized through rcu. ++ */ ++ rcu_read_lock(); ++ if (!dev) { ++ err = nlmsg_parse(cb->nlh, GENL_HDRLEN + wprobe_fam.hdrsize, ++ wprobe_fam.attrbuf, wprobe_fam.maxattr, wprobe_policy); ++ if (err) ++ goto done; ++ ++ err = -ENOENT; ++ dev = wprobe_get_dev(wprobe_fam.attrbuf[WPROBE_ATTR_INTERFACE]); ++ if (!dev) ++ goto done; ++ ++ if (cmd == WPROBE_CMD_GET_INFO) { ++ if (wprobe_fam.attrbuf[WPROBE_ATTR_MAC]) { ++ l = wprobe_find_link(dev, nla_data(wprobe_fam.attrbuf[WPROBE_ATTR_MAC])); ++ if (!l) ++ goto done; ++ ++ vflags = l->flags; ++ } ++ ++ if (l) { ++ item = dev->link_items; ++ n = dev->n_link_items; ++ val = l->val; ++ } else { ++ item = dev->global_items; ++ n = dev->n_global_items; ++ val = dev->val; ++ } ++ ++ /* sync data and move to temp storage for the query */ ++ spin_lock_irqsave(&dev->lock, flags); ++ err = wprobe_sync_data(dev, l, true); ++ if (!err) ++ memcpy(dev->query_val, val, n * sizeof(struct wprobe_value)); ++ spin_unlock_irqrestore(&dev->lock, flags); ++ ++ if (err) ++ goto done; ++ } ++ ++ if (wprobe_fam.attrbuf[WPROBE_ATTR_FLAGS]) ++ vflags |= nla_get_u32(wprobe_fam.attrbuf[WPROBE_ATTR_FLAGS]); ++ ++ if (wprobe_fam.attrbuf[WPROBE_ATTR_MAC]) ++ vflags |= WPROBE_F_LINK; ++ ++ cb->args[0] = (long) dev; ++ cb->args[1] = (long) l; ++ cb->args[2] = vflags; ++ cb->args[3] = 0; ++ } else { ++ /* when pulling pointers from the callback, validate them ++ * against the list using rcu to make sure that we won't ++ * dereference pointers to free'd memory after the last ++ * grace period */ ++ err = -ENOENT; ++ if (!wprobe_check_ptr(&wprobe_if, &dev->list)) ++ goto done; ++ ++ if (l && !wprobe_check_ptr(&dev->links, &l->list)) ++ goto done; ++ } ++ ++ if (vflags & WPROBE_F_LINK) { ++ item = dev->link_items; ++ n = dev->n_link_items; ++ } else { ++ item = dev->global_items; ++ n = dev->n_global_items; ++ } ++ ++ err = 0; ++ switch(cmd) { ++ case WPROBE_CMD_GET_INFO: ++ while (i < n) { ++ if (!wprobe_send_item_value(skb, cb, dev, l, item, i, vflags)) ++ break; ++ i++; ++ } ++ break; ++ case WPROBE_CMD_GET_LIST: ++ while (i < n) { ++ if (!wprobe_send_item_info(skb, cb, dev, item, i)) ++ break; ++ i++; ++ } ++ break; ++ default: ++ err = -EINVAL; ++ goto done; ++ } ++ cb->args[3] = i; ++ err = skb->len; ++ ++done: ++ rcu_read_unlock(); ++ return err; ++} ++#undef WPROBE_F_LINK ++ ++static int ++wprobe_update_auto_measurement(struct wprobe_iface *dev, u32 interval) ++{ ++ if (interval && (interval < WPROBE_MIN_INTERVAL)) ++ return -EINVAL; ++ ++ if (!interval && dev->measure_interval) ++ del_timer_sync(&dev->measure_timer); ++ ++ dev->measure_interval = interval; ++ if (!interval) ++ return 0; ++ ++ /* kick of a new measurement immediately */ ++ mod_timer(&dev->measure_timer, jiffies + 1); ++ ++ return 0; ++} ++ ++static int ++wprobe_measure(struct sk_buff *skb, struct genl_info *info) ++{ ++ struct wprobe_iface *dev; ++ struct wprobe_link *l = NULL; ++ int err = -ENOENT; ++ ++ rcu_read_lock(); ++ dev = wprobe_get_dev(info->attrs[WPROBE_ATTR_INTERFACE]); ++ if (!dev) ++ goto done; ++ ++ if (info->attrs[WPROBE_ATTR_MAC]) { ++ l = wprobe_find_link(dev, nla_data(wprobe_fam.attrbuf[WPROBE_ATTR_MAC])); ++ if (!l) ++ goto done; ++ } ++ ++ err = wprobe_sync_data(dev, l, false); ++ ++done: ++ rcu_read_unlock(); ++ return err; ++} ++ ++static int ++wprobe_check_filter(void *data, int datalen, int gs) ++{ ++ struct wprobe_filter_item_hdr *hdr; ++ void *orig_data = data; ++ void *end = data + datalen; ++ int i, j, k, is, cur_is; ++ ++ for (i = j = is = 0; i < gs; i++) { ++ hdr = data; ++ data += sizeof(*hdr); ++ ++ if (data > end) ++ goto overrun; ++ ++ hdr->name[31] = 0; ++ cur_is = be32_to_cpu(hdr->n_items); ++ hdr->n_items = cur_is; ++ is += cur_is; ++ for (j = 0; j < cur_is; j++) { ++ struct sock_filter *sf; ++ int n_items; ++ ++ hdr = data; ++ data += sizeof(*hdr); ++ if (data > end) ++ goto overrun; ++ ++ hdr->name[31] = 0; ++ n_items = be32_to_cpu(hdr->n_items); ++ hdr->n_items = n_items; ++ ++ if (n_items > 1024) ++ goto overrun; ++ ++ sf = data; ++ if (n_items > 0) { ++ for (k = 0; k < n_items; k++) { ++ sf->code = be16_to_cpu(sf->code); ++ sf->k = be32_to_cpu(sf->k); ++ sf++; ++ } ++ if (sk_chk_filter(data, n_items) != 0) { ++ printk("%s: filter check failed at group %d, item %d\n", __func__, i, j); ++ return 0; ++ } ++ } ++ data += n_items * sizeof(struct sock_filter); ++ } ++ } ++ return is; ++ ++overrun: ++ printk(KERN_ERR "%s: overrun during filter check at group %d, item %d, offset=%d, len=%d\n", __func__, i, j, (data - orig_data), datalen); ++ return 0; ++} ++ ++static void ++wprobe_free_filter(struct wprobe_filter *f) ++{ ++ if (f->skb) ++ kfree_skb(f->skb); ++ if (f->data) ++ kfree(f->data); ++ if (f->items) ++ kfree(f->items); ++ if (f->counters) ++ kfree(f->counters); ++ kfree(f); ++} ++ ++ ++static int ++wprobe_set_filter(struct wprobe_iface *dev, void *data, int len) ++{ ++ struct wprobe_filter_hdr *fhdr; ++ struct wprobe_rtap_hdr *rtap; ++ struct wprobe_filter *f; ++ int i, j, cur_is, is, gs; ++ ++ if (len < sizeof(*fhdr)) ++ return -EINVAL; ++ ++ fhdr = data; ++ data += sizeof(*fhdr); ++ len -= sizeof(*fhdr); ++ ++ if (memcmp(fhdr->magic, "WPFF", 4) != 0) { ++ printk(KERN_ERR "%s: filter rejected (invalid magic)\n", __func__); ++ return -EINVAL; ++ } ++ ++ gs = be16_to_cpu(fhdr->n_groups); ++ is = wprobe_check_filter(data, len, gs); ++ if (is == 0) ++ return -EINVAL; ++ ++ f = kzalloc(sizeof(struct wprobe_filter) + ++ gs * sizeof(struct wprobe_filter_group), GFP_ATOMIC); ++ if (!f) ++ return -ENOMEM; ++ ++ f->skb = alloc_skb(WPROBE_MAX_FRAME_SIZE, GFP_ATOMIC); ++ if (!f->skb) ++ goto error; ++ ++ f->data = kmalloc(len, GFP_ATOMIC); ++ if (!f->data) ++ goto error; ++ ++ f->items = kzalloc(sizeof(struct wprobe_filter_item *) * is, GFP_ATOMIC); ++ if (!f->items) ++ goto error; ++ ++ f->counters = kzalloc(sizeof(struct wprobe_filter_counter) * is, GFP_ATOMIC); ++ if (!f->counters) ++ goto error; ++ ++ spin_lock_init(&f->lock); ++ memcpy(f->data, data, len); ++ f->n_groups = gs; ++ ++ if (f->hdrlen < sizeof(struct wprobe_wlan_hdr)) ++ f->hdrlen = sizeof(struct wprobe_wlan_hdr); ++ ++ rtap = (struct wprobe_rtap_hdr *)skb_put(f->skb, sizeof(*rtap)); ++ memset(rtap, 0, sizeof(*rtap)); ++ rtap->len = cpu_to_le16(sizeof(struct wprobe_rtap_hdr) + f->hdrlen); ++ data = f->data; ++ ++ cur_is = 0; ++ for (i = 0; i < gs; i++) { ++ struct wprobe_filter_item_hdr *hdr = data; ++ struct wprobe_filter_group *g = &f->groups[i]; ++ ++ data += sizeof(*hdr); ++ g->name = hdr->name; ++ g->items = &f->items[cur_is]; ++ g->counters = &f->counters[cur_is]; ++ g->n_items = hdr->n_items; ++ ++ for (j = 0; j < g->n_items; j++) { ++ hdr = data; ++ f->items[cur_is++] = data; ++ data += sizeof(*hdr) + hdr->n_items * sizeof(struct sock_filter); ++ } ++ } ++ rcu_assign_pointer(dev->active_filter, f); ++ return 0; ++ ++error: ++ wprobe_free_filter(f); ++ return -ENOMEM; ++} ++ ++static int ++wprobe_set_config(struct sk_buff *skb, struct genl_info *info) ++{ ++ struct wprobe_iface *dev; ++ unsigned long flags; ++ int err = -ENOENT; ++ u32 scale_min, scale_max; ++ u32 scale_m, scale_d; ++ struct nlattr *attr; ++ struct wprobe_filter *filter_free = NULL; ++ ++ rcu_read_lock(); ++ dev = wprobe_get_dev(info->attrs[WPROBE_ATTR_INTERFACE]); ++ if (!dev) ++ goto done_unlocked; ++ ++ err = -EINVAL; ++ spin_lock_irqsave(&dev->lock, flags); ++ if (info->attrs[WPROBE_ATTR_MAC]) { ++ /* not supported yet */ ++ goto done; ++ } ++ ++ if (info->attrs[WPROBE_ATTR_FLAGS]) { ++ u32 flags = nla_get_u32(info->attrs[WPROBE_ATTR_FLAGS]); ++ ++ if (flags & BIT(WPROBE_F_RESET)) { ++ struct wprobe_link *l; ++ ++ memset(dev->val, 0, sizeof(struct wprobe_value) * dev->n_global_items); ++ list_for_each_entry_rcu(l, &dev->links, list) { ++ memset(l->val, 0, sizeof(struct wprobe_value) * dev->n_link_items); ++ } ++ } ++ } ++ ++ if (info->attrs[WPROBE_ATTR_SAMPLES_MIN] || ++ info->attrs[WPROBE_ATTR_SAMPLES_MAX]) { ++ if ((attr = info->attrs[WPROBE_ATTR_SAMPLES_MIN])) ++ scale_min = nla_get_u32(attr); ++ else ++ scale_min = dev->scale_min; ++ ++ if ((attr = info->attrs[WPROBE_ATTR_SAMPLES_MAX])) ++ scale_max = nla_get_u32(attr); ++ else ++ scale_max = dev->scale_max; ++ ++ if ((!scale_min && !scale_max) || ++ (scale_min && scale_max && (scale_min < scale_max))) { ++ dev->scale_min = scale_min; ++ dev->scale_max = scale_max; ++ } else { ++ goto done; ++ } ++ } ++ ++ if (info->attrs[WPROBE_ATTR_SAMPLES_SCALE_M] && ++ info->attrs[WPROBE_ATTR_SAMPLES_SCALE_D]) { ++ ++ scale_m = nla_get_u32(info->attrs[WPROBE_ATTR_SAMPLES_SCALE_M]); ++ scale_d = nla_get_u32(info->attrs[WPROBE_ATTR_SAMPLES_SCALE_D]); ++ ++ if (!scale_d || (scale_m > scale_d)) ++ goto done; ++ ++ dev->scale_m = scale_m; ++ dev->scale_d = scale_d; ++ } ++ ++ if ((attr = info->attrs[WPROBE_ATTR_FILTER])) { ++ filter_free = rcu_dereference(dev->active_filter); ++ rcu_assign_pointer(dev->active_filter, NULL); ++ if (nla_len(attr) > 0) ++ wprobe_set_filter(dev, nla_data(attr), nla_len(attr)); ++ } ++ ++ err = 0; ++ if (info->attrs[WPROBE_ATTR_INTERVAL]) { ++ /* change of measurement interval requested */ ++ err = wprobe_update_auto_measurement(dev, ++ (u32) nla_get_u64(info->attrs[WPROBE_ATTR_INTERVAL])); ++ } ++ ++done: ++ spin_unlock_irqrestore(&dev->lock, flags); ++done_unlocked: ++ rcu_read_unlock(); ++ if (filter_free) { ++ synchronize_rcu(); ++ wprobe_free_filter(filter_free); ++ } ++ return err; ++} ++ ++static struct genl_ops wprobe_ops[] = { ++ { ++ .cmd = WPROBE_CMD_GET_INFO, ++ .dumpit = wprobe_dump_info, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_GET_LIST, ++ .dumpit = wprobe_dump_info, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_MEASURE, ++ .doit = wprobe_measure, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_GET_LINKS, ++ .dumpit = wprobe_dump_links, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_CONFIG, ++ .doit = wprobe_set_config, ++ .policy = wprobe_policy, ++ }, ++ { ++ .cmd = WPROBE_CMD_GET_FILTER, ++ .dumpit = wprobe_dump_filters, ++ .policy = wprobe_policy, ++ }, ++}; ++ ++static void __exit ++wprobe_exit(void) ++{ ++ BUG_ON(!list_empty(&wprobe_if)); ++ genl_unregister_family(&wprobe_fam); ++} ++ ++ ++static int __init ++wprobe_init(void) ++{ ++ int i, err; ++ ++ spin_lock_init(&wprobe_lock); ++ INIT_LIST_HEAD(&wprobe_if); ++ ++ err = genl_register_family(&wprobe_fam); ++ if (err) ++ return err; ++ ++ for (i = 0; i < ARRAY_SIZE(wprobe_ops); i++) { ++ err = genl_register_ops(&wprobe_fam, &wprobe_ops[i]); ++ if (err) ++ goto error; ++ } ++ ++ return 0; ++ ++error: ++ genl_unregister_family(&wprobe_fam); ++ return err; ++} ++ ++module_init(wprobe_init); ++module_exit(wprobe_exit); ++MODULE_LICENSE("GPL"); ++ +diff --git a/feeds/packages/net/wprobe/src/kernel/wprobe-dummy.c b/feeds/packages/net/wprobe/src/kernel/wprobe-dummy.c +new file mode 100644 +index 0000000..4231223 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/kernel/wprobe-dummy.c +@@ -0,0 +1,96 @@ ++/* ++ * wprobe-core.c: Wireless probe interface dummy driver ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static const char local_addr[] = "\x00\x13\x37\xba\xbe\x00"; ++ ++enum dummy_global_values { ++ DUMMY_GLOBAL_MEDIUM_BUSY ++}; ++enum dummy_link_values { ++ DUMMY_LINK_SNR ++}; ++ ++struct wprobe_item dummy_perlink[] = { ++ [DUMMY_LINK_SNR] = { ++ .name = "snr", ++ .type = WPROBE_VAL_U8, ++ .flags = WPROBE_F_KEEPSTAT, ++ }, ++}; ++ ++struct wprobe_item dummy_globals[] = { ++ [DUMMY_GLOBAL_MEDIUM_BUSY] = { ++ .name = "medium_busy", ++ .type = WPROBE_VAL_U8, ++ .flags = WPROBE_F_KEEPSTAT, ++ } ++}; ++ ++int dummy_sync(struct wprobe_iface *dev, struct wprobe_link *l, struct wprobe_value *val, bool measure) ++{ ++ u8 intval = 0; ++ ++ get_random_bytes(&intval, 1); ++ if (l) { ++ WPROBE_FILL_BEGIN(val, dummy_perlink); ++ WPROBE_SET(DUMMY_LINK_SNR, U8, (intval % 40)); ++ WPROBE_FILL_END(); ++ } else { ++ WPROBE_FILL_BEGIN(val, dummy_globals); ++ WPROBE_SET(DUMMY_GLOBAL_MEDIUM_BUSY, U8, (intval % 100)); ++ WPROBE_FILL_END(); ++ } ++ return 0; ++} ++ ++static struct wprobe_iface dummy_dev = { ++ .name = "dummy", ++ .addr = local_addr, ++ .link_items = dummy_perlink, ++ .n_link_items = ARRAY_SIZE(dummy_perlink), ++ .global_items = dummy_globals, ++ .n_global_items = ARRAY_SIZE(dummy_globals), ++ .sync_data = dummy_sync, ++}; ++ ++static struct wprobe_link dummy_link; ++ ++static int __init ++wprobe_dummy_init(void) ++{ ++ wprobe_add_iface(&dummy_dev); ++ wprobe_add_link(&dummy_dev, &dummy_link, "\x00\x13\x37\xda\xda\x00"); ++ return 0; ++} ++ ++static void __exit ++wprobe_dummy_exit(void) ++{ ++ wprobe_remove_link(&dummy_dev, &dummy_link); ++ wprobe_remove_iface(&dummy_dev); ++} ++ ++module_init(wprobe_dummy_init); ++module_exit(wprobe_dummy_exit); ++ ++MODULE_LICENSE("GPL"); +diff --git a/feeds/packages/net/wprobe/src/user/.svn/entries b/feeds/packages/net/wprobe/src/user/.svn/entries +new file mode 100644 +index 0000000..4bee7b8 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wprobe/src/user ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-03T16:37:07.414642Z ++24892 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++list.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++fceb40d4dad9806b34e8fe462c57b5c0 ++2009-03-26T20:56:47.167064Z ++15050 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++17600 ++ ++wprobe-lib.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++27ecf885c498e3021428ac0d4131acf7 ++2010-02-01T00:35:00.131745Z ++19483 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24795 ++ ++wprobe.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++96a69f111e2181df6e78893558704073 ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6012 ++ ++wprobe-util.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++749c1e3ff54cc2ba768624de5ff781c4 ++2011-01-03T16:37:07.414642Z ++24892 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10015 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++ab5d9015012754ab17bd88af82662e16 ++2009-07-06T19:05:24.113282Z ++16719 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++658 ++ +diff --git a/feeds/packages/net/wprobe/src/user/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wprobe/src/user/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..01e83da +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,38 @@ ++include ../Makefile.inc ++ ++CPPFLAGS += -I../kernel ++LDFLAGS = ++ ++ifneq ($(HOST_OS),Linux) ++USE_LIBNL_MICRO=1 ++else ++USE_LIBNL_MICRO= ++endif ++ ++ifeq ($(USE_LIBNL_MICRO),1) ++LIBNL_PREFIX = /usr/local ++LIBNL = $(LIBNL_PREFIX)/lib/libnl-micro.a ++CPPFLAGS += -I$(LIBNL_PREFIX)/include/libnl-micro ++EXTRA_CFLAGS += -DNO_LOCAL_ACCESS ++else ++LIBNL = -lnl ++endif ++ ++LIBM = -lm ++LIBS = $(LIBNL) $(LIBM) ++ ++all: libwprobe.a wprobe-util ++ ++libwprobe.a: wprobe-lib.o ++ rm -f $@ ++ $(AR) rcu $@ $^ ++ $(RANLIB) $@ ++ ++%.o: %.c ++ $(CC) $(WFLAGS) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $< ++ ++wprobe-util: wprobe-util.o wprobe-lib.o ++ $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) ++ ++clean: ++ rm -f *.o *.a wprobe-util +diff --git a/feeds/packages/net/wprobe/src/user/.svn/text-base/list.h.svn-base b/feeds/packages/net/wprobe/src/user/.svn/text-base/list.h.svn-base +new file mode 100644 +index 0000000..2959a06 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/.svn/text-base/list.h.svn-base +@@ -0,0 +1,601 @@ ++#ifndef _LINUX_LIST_H ++#define _LINUX_LIST_H ++ ++#include ++/** ++ * container_of - cast a member of a structure out to the containing structure ++ * @ptr: the pointer to the member. ++ * @type: the type of the container struct this is embedded in. ++ * @member: the name of the member within the struct. ++ * ++ */ ++#ifndef container_of ++#define container_of(ptr, type, member) ( \ ++ (type *)( (char *)ptr - offsetof(type,member) )) ++#endif ++ ++ ++/* ++ * Simple doubly linked list implementation. ++ * ++ * Some of the internal functions ("__xxx") are useful when ++ * manipulating whole lists rather than single entries, as ++ * sometimes we already know the next/prev entries and we can ++ * generate better code by using them directly rather than ++ * using the generic single-entry routines. ++ */ ++ ++struct list_head { ++ struct list_head *next, *prev; ++}; ++ ++#define LIST_HEAD_INIT(name) { &(name), &(name) } ++ ++#define LIST_HEAD(name) \ ++ struct list_head name = LIST_HEAD_INIT(name) ++ ++static inline void INIT_LIST_HEAD(struct list_head *list) ++{ ++ list->next = list; ++ list->prev = list; ++} ++ ++/* ++ * Insert a new entry between two known consecutive entries. ++ * ++ * This is only for internal list manipulation where we know ++ * the prev/next entries already! ++ */ ++static inline void __list_add(struct list_head *new, ++ struct list_head *prev, ++ struct list_head *next) ++{ ++ next->prev = new; ++ new->next = next; ++ new->prev = prev; ++ prev->next = new; ++} ++ ++/** ++ * list_add - add a new entry ++ * @new: new entry to be added ++ * @head: list head to add it after ++ * ++ * Insert a new entry after the specified head. ++ * This is good for implementing stacks. ++ */ ++static inline void list_add(struct list_head *new, struct list_head *head) ++{ ++ __list_add(new, head, head->next); ++} ++ ++ ++/** ++ * list_add_tail - add a new entry ++ * @new: new entry to be added ++ * @head: list head to add it before ++ * ++ * Insert a new entry before the specified head. ++ * This is useful for implementing queues. ++ */ ++static inline void list_add_tail(struct list_head *new, struct list_head *head) ++{ ++ __list_add(new, head->prev, head); ++} ++ ++ ++/* ++ * Delete a list entry by making the prev/next entries ++ * point to each other. ++ * ++ * This is only for internal list manipulation where we know ++ * the prev/next entries already! ++ */ ++static inline void __list_del(struct list_head * prev, struct list_head * next) ++{ ++ next->prev = prev; ++ prev->next = next; ++} ++ ++/** ++ * list_del - deletes entry from list. ++ * @entry: the element to delete from the list. ++ * Note: list_empty() on entry does not return true after this, the entry is ++ * in an undefined state. ++ */ ++static inline void list_del(struct list_head *entry) ++{ ++ __list_del(entry->prev, entry->next); ++ entry->next = NULL; ++ entry->prev = NULL; ++} ++ ++/** ++ * list_replace - replace old entry by new one ++ * @old : the element to be replaced ++ * @new : the new element to insert ++ * ++ * If @old was empty, it will be overwritten. ++ */ ++static inline void list_replace(struct list_head *old, ++ struct list_head *new) ++{ ++ new->next = old->next; ++ new->next->prev = new; ++ new->prev = old->prev; ++ new->prev->next = new; ++} ++ ++static inline void list_replace_init(struct list_head *old, ++ struct list_head *new) ++{ ++ list_replace(old, new); ++ INIT_LIST_HEAD(old); ++} ++ ++/** ++ * list_del_init - deletes entry from list and reinitialize it. ++ * @entry: the element to delete from the list. ++ */ ++static inline void list_del_init(struct list_head *entry) ++{ ++ __list_del(entry->prev, entry->next); ++ INIT_LIST_HEAD(entry); ++} ++ ++/** ++ * list_move - delete from one list and add as another's head ++ * @list: the entry to move ++ * @head: the head that will precede our entry ++ */ ++static inline void list_move(struct list_head *list, struct list_head *head) ++{ ++ __list_del(list->prev, list->next); ++ list_add(list, head); ++} ++ ++/** ++ * list_move_tail - delete from one list and add as another's tail ++ * @list: the entry to move ++ * @head: the head that will follow our entry ++ */ ++static inline void list_move_tail(struct list_head *list, ++ struct list_head *head) ++{ ++ __list_del(list->prev, list->next); ++ list_add_tail(list, head); ++} ++ ++/** ++ * list_is_last - tests whether @list is the last entry in list @head ++ * @list: the entry to test ++ * @head: the head of the list ++ */ ++static inline int list_is_last(const struct list_head *list, ++ const struct list_head *head) ++{ ++ return list->next == head; ++} ++ ++/** ++ * list_empty - tests whether a list is empty ++ * @head: the list to test. ++ */ ++static inline int list_empty(const struct list_head *head) ++{ ++ return head->next == head; ++} ++ ++/** ++ * list_empty_careful - tests whether a list is empty and not being modified ++ * @head: the list to test ++ * ++ * Description: ++ * tests whether a list is empty _and_ checks that no other CPU might be ++ * in the process of modifying either member (next or prev) ++ * ++ * NOTE: using list_empty_careful() without synchronization ++ * can only be safe if the only activity that can happen ++ * to the list entry is list_del_init(). Eg. it cannot be used ++ * if another CPU could re-list_add() it. ++ */ ++static inline int list_empty_careful(const struct list_head *head) ++{ ++ struct list_head *next = head->next; ++ return (next == head) && (next == head->prev); ++} ++ ++static inline void __list_splice(struct list_head *list, ++ struct list_head *head) ++{ ++ struct list_head *first = list->next; ++ struct list_head *last = list->prev; ++ struct list_head *at = head->next; ++ ++ first->prev = head; ++ head->next = first; ++ ++ last->next = at; ++ at->prev = last; ++} ++ ++/** ++ * list_splice - join two lists ++ * @list: the new list to add. ++ * @head: the place to add it in the first list. ++ */ ++static inline void list_splice(struct list_head *list, struct list_head *head) ++{ ++ if (!list_empty(list)) ++ __list_splice(list, head); ++} ++ ++/** ++ * list_splice_init - join two lists and reinitialise the emptied list. ++ * @list: the new list to add. ++ * @head: the place to add it in the first list. ++ * ++ * The list at @list is reinitialised ++ */ ++static inline void list_splice_init(struct list_head *list, ++ struct list_head *head) ++{ ++ if (!list_empty(list)) { ++ __list_splice(list, head); ++ INIT_LIST_HEAD(list); ++ } ++} ++ ++/** ++ * list_entry - get the struct for this entry ++ * @ptr: the &struct list_head pointer. ++ * @type: the type of the struct this is embedded in. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_entry(ptr, type, member) \ ++ container_of(ptr, type, member) ++ ++/** ++ * list_first_entry - get the first element from a list ++ * @ptr: the list head to take the element from. ++ * @type: the type of the struct this is embedded in. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Note, that list is expected to be not empty. ++ */ ++#define list_first_entry(ptr, type, member) \ ++ list_entry((ptr)->next, type, member) ++ ++/** ++ * list_for_each - iterate over a list ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @head: the head for your list. ++ */ ++#define list_for_each(pos, head) \ ++ for (pos = (head)->next; pos != (head); \ ++ pos = pos->next) ++ ++/** ++ * __list_for_each - iterate over a list ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @head: the head for your list. ++ * ++ * This variant differs from list_for_each() in that it's the ++ * simplest possible list iteration code, no prefetching is done. ++ * Use this for code that knows the list to be very short (empty ++ * or 1 entry) most of the time. ++ */ ++#define __list_for_each(pos, head) \ ++ for (pos = (head)->next; pos != (head); pos = pos->next) ++ ++/** ++ * list_for_each_prev - iterate over a list backwards ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @head: the head for your list. ++ */ ++#define list_for_each_prev(pos, head) \ ++ for (pos = (head)->prev; pos != (head); \ ++ pos = pos->prev) ++ ++/** ++ * list_for_each_safe - iterate over a list safe against removal of list entry ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @n: another &struct list_head to use as temporary storage ++ * @head: the head for your list. ++ */ ++#define list_for_each_safe(pos, n, head) \ ++ for (pos = (head)->next, n = pos->next; pos != (head); \ ++ pos = n, n = pos->next) ++ ++/** ++ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @n: another &struct list_head to use as temporary storage ++ * @head: the head for your list. ++ */ ++#define list_for_each_prev_safe(pos, n, head) \ ++ for (pos = (head)->prev, n = pos->prev; \ ++ pos != (head); \ ++ pos = n, n = pos->prev) ++ ++/** ++ * list_for_each_entry - iterate over list of given type ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_for_each_entry(pos, head, member) \ ++ for (pos = list_entry((head)->next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.next, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_reverse - iterate backwards over list of given type. ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_for_each_entry_reverse(pos, head, member) \ ++ for (pos = list_entry((head)->prev, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.prev, typeof(*pos), member)) ++ ++/** ++ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() ++ * @pos: the type * to use as a start point ++ * @head: the head of the list ++ * @member: the name of the list_struct within the struct. ++ * ++ * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). ++ */ ++#define list_prepare_entry(pos, head, member) \ ++ ((pos) ? : list_entry(head, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_continue - continue iteration over list of given type ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Continue to iterate over list of given type, continuing after ++ * the current position. ++ */ ++#define list_for_each_entry_continue(pos, head, member) \ ++ for (pos = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.next, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_continue_reverse - iterate backwards from the given point ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Start to iterate over list of given type backwards, continuing after ++ * the current position. ++ */ ++#define list_for_each_entry_continue_reverse(pos, head, member) \ ++ for (pos = list_entry(pos->member.prev, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.prev, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_from - iterate over list of given type from the current point ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate over list of given type, continuing from current position. ++ */ ++#define list_for_each_entry_from(pos, head, member) \ ++ for (; &pos->member != (head); \ ++ pos = list_entry(pos->member.next, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_for_each_entry_safe(pos, n, head, member) \ ++ for (pos = list_entry((head)->next, typeof(*pos), member), \ ++ n = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.next, typeof(*n), member)) ++ ++/** ++ * list_for_each_entry_safe_continue ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate over list of given type, continuing after current point, ++ * safe against removal of list entry. ++ */ ++#define list_for_each_entry_safe_continue(pos, n, head, member) \ ++ for (pos = list_entry(pos->member.next, typeof(*pos), member), \ ++ n = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.next, typeof(*n), member)) ++ ++/** ++ * list_for_each_entry_safe_from ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate over list of given type from current point, safe against ++ * removal of list entry. ++ */ ++#define list_for_each_entry_safe_from(pos, n, head, member) \ ++ for (n = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.next, typeof(*n), member)) ++ ++/** ++ * list_for_each_entry_safe_reverse ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate backwards over list of given type, safe against removal ++ * of list entry. ++ */ ++#define list_for_each_entry_safe_reverse(pos, n, head, member) \ ++ for (pos = list_entry((head)->prev, typeof(*pos), member), \ ++ n = list_entry(pos->member.prev, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.prev, typeof(*n), member)) ++ ++/* ++ * Double linked lists with a single pointer list head. ++ * Mostly useful for hash tables where the two pointer list head is ++ * too wasteful. ++ * You lose the ability to access the tail in O(1). ++ */ ++ ++struct hlist_head { ++ struct hlist_node *first; ++}; ++ ++struct hlist_node { ++ struct hlist_node *next, **pprev; ++}; ++ ++#define HLIST_HEAD_INIT { .first = NULL } ++#define HLIST_HEAD(name) struct hlist_head name = { .first = NULL } ++#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL) ++static inline void INIT_HLIST_NODE(struct hlist_node *h) ++{ ++ h->next = NULL; ++ h->pprev = NULL; ++} ++ ++static inline int hlist_unhashed(const struct hlist_node *h) ++{ ++ return !h->pprev; ++} ++ ++static inline int hlist_empty(const struct hlist_head *h) ++{ ++ return !h->first; ++} ++ ++static inline void __hlist_del(struct hlist_node *n) ++{ ++ struct hlist_node *next = n->next; ++ struct hlist_node **pprev = n->pprev; ++ *pprev = next; ++ if (next) ++ next->pprev = pprev; ++} ++ ++static inline void hlist_del(struct hlist_node *n) ++{ ++ __hlist_del(n); ++ n->next = NULL; ++ n->pprev = NULL; ++} ++ ++static inline void hlist_del_init(struct hlist_node *n) ++{ ++ if (!hlist_unhashed(n)) { ++ __hlist_del(n); ++ INIT_HLIST_NODE(n); ++ } ++} ++ ++ ++static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h) ++{ ++ struct hlist_node *first = h->first; ++ n->next = first; ++ if (first) ++ first->pprev = &n->next; ++ h->first = n; ++ n->pprev = &h->first; ++} ++ ++ ++/* next must be != NULL */ ++static inline void hlist_add_before(struct hlist_node *n, ++ struct hlist_node *next) ++{ ++ n->pprev = next->pprev; ++ n->next = next; ++ next->pprev = &n->next; ++ *(n->pprev) = n; ++} ++ ++static inline void hlist_add_after(struct hlist_node *n, ++ struct hlist_node *next) ++{ ++ next->next = n->next; ++ n->next = next; ++ next->pprev = &n->next; ++ ++ if(next->next) ++ next->next->pprev = &next->next; ++} ++ ++#define hlist_entry(ptr, type, member) container_of(ptr,type,member) ++ ++#define hlist_for_each(pos, head) \ ++ for (pos = (head)->first; pos; pos = pos->next) ++ ++#define hlist_for_each_safe(pos, n, head) \ ++ for (pos = (head)->first; pos; pos = n) ++ ++/** ++ * hlist_for_each_entry - iterate over list of given type ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry(tpos, pos, head, member) \ ++ for (pos = (head)->first; pos && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = pos->next) ++ ++/** ++ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry_continue(tpos, pos, member) \ ++ for (pos = (pos)->next; pos && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = pos->next) ++ ++/** ++ * hlist_for_each_entry_from - iterate over a hlist continuing from current point ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry_from(tpos, pos, member) \ ++ for (; pos && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = pos->next) ++ ++/** ++ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @n: another &struct hlist_node to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \ ++ for (pos = (head)->first; \ ++ pos && ({ n = pos->next; 1; }) && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = n) ++ ++#endif +diff --git a/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe-lib.c.svn-base b/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe-lib.c.svn-base +new file mode 100644 +index 0000000..7a5460b +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe-lib.c.svn-base +@@ -0,0 +1,1210 @@ ++/* ++ * wprobe.c: Wireless probe user space library ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#define _ISOC99_SOURCE ++#define _BSD_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifndef NO_LOCAL_ACCESS ++#include ++#include ++#include ++#endif ++#include "wprobe.h" ++ ++#define DEBUG 1 ++#ifdef DEBUG ++#define DPRINTF(fmt, ...) fprintf(stderr, "%s(%d): " fmt, __func__, __LINE__, ##__VA_ARGS__) ++#else ++#define DPRINTF(fmt, ...) do {} while (0) ++#endif ++ ++#if defined(BYTE_ORDER) && !defined(__BYTE_ORDER) ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#define __BIG_ENDIAN BIG_ENDIAN ++#define __BYTE_ORDER BYTE_ORDER ++#endif ++ ++#ifndef __BYTE_ORDER ++#error Unknown endian type ++#endif ++ ++#define WPROBE_MAX_MSGLEN 65536 ++ ++static inline __u16 __swab16(__u16 x) ++{ ++ return x<<8 | x>>8; ++} ++ ++static inline __u32 __swab32(__u32 x) ++{ ++ return x<<24 | x>>24 | ++ (x & (__u32)0x0000ff00UL)<<8 | ++ (x & (__u32)0x00ff0000UL)>>8; ++} ++ ++static inline __u64 __swab64(__u64 x) ++{ ++ return x<<56 | x>>56 | ++ (x & (__u64)0x000000000000ff00ULL)<<40 | ++ (x & (__u64)0x0000000000ff0000ULL)<<24 | ++ (x & (__u64)0x00000000ff000000ULL)<< 8 | ++ (x & (__u64)0x000000ff00000000ULL)>> 8 | ++ (x & (__u64)0x0000ff0000000000ULL)>>24 | ++ (x & (__u64)0x00ff000000000000ULL)>>40; ++} ++ ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++#define SWAP16(var) var = __swab16(var) ++#define SWAP32(var) var = __swab32(var) ++#define SWAP64(var) var = __swab64(var) ++#else ++#define SWAP16(var) do {} while(0) ++#define SWAP32(var) do {} while(0) ++#define SWAP64(var) do {} while(0) ++#endif ++ ++int wprobe_port = 17990; ++static struct nlattr *tb[WPROBE_ATTR_LAST+1]; ++static struct nla_policy attribute_policy[WPROBE_ATTR_LAST+1] = { ++ [WPROBE_ATTR_ID] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_MAC] = { .type = NLA_UNSPEC, .minlen = 6, .maxlen = 6 }, ++ [WPROBE_ATTR_NAME] = { .type = NLA_STRING }, ++ [WPROBE_ATTR_FLAGS] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_TYPE] = { .type = NLA_U8 }, ++ [WPROBE_ATTR_FLAGS] = { .type = NLA_U32 }, ++ [WPROBE_VAL_S8] = { .type = NLA_U8 }, ++ [WPROBE_VAL_S16] = { .type = NLA_U16 }, ++ [WPROBE_VAL_S32] = { .type = NLA_U32 }, ++ [WPROBE_VAL_S64] = { .type = NLA_U64 }, ++ [WPROBE_VAL_U8] = { .type = NLA_U8 }, ++ [WPROBE_VAL_U16] = { .type = NLA_U16 }, ++ [WPROBE_VAL_U32] = { .type = NLA_U32 }, ++ [WPROBE_VAL_U64] = { .type = NLA_U64 }, ++ [WPROBE_VAL_SUM] = { .type = NLA_U64 }, ++ [WPROBE_VAL_SUM_SQ] = { .type = NLA_U64 }, ++ [WPROBE_VAL_SAMPLES] = { .type = NLA_U32 }, ++ [WPROBE_VAL_SCALE_TIME] = { .type = NLA_U64 }, ++ [WPROBE_ATTR_INTERVAL] = { .type = NLA_U64 }, ++ [WPROBE_ATTR_SAMPLES_MIN] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_MAX] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_M] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_D] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_FILTER_GROUP] = { .type = NLA_NESTED }, ++ [WPROBE_ATTR_RXCOUNT] = { .type = NLA_U64 }, ++ [WPROBE_ATTR_TXCOUNT] = { .type = NLA_U64 }, ++}; ++ ++typedef int (*wprobe_cb_t)(struct nl_msg *, void *); ++ ++struct wprobe_iface_ops { ++ int (*send_msg)(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t cb, void *arg); ++ void (*free)(struct wprobe_iface *dev); ++}; ++ ++struct wprobe_attr_cb { ++ struct list_head *list; ++ char *addr; ++}; ++ ++#define WPROBE_MAGIC_STR "WPROBE" ++struct wprobe_init_hdr { ++ struct { ++ char magic[sizeof(WPROBE_MAGIC_STR)]; ++ ++ /* protocol version */ ++ uint8_t version; ++ ++ /* extra header length (unused for now) */ ++ uint16_t extra; ++ } pre __attribute__((packed)); ++ union { ++ struct { ++ uint16_t genl_family; ++ } v0 __attribute__((packed)); ++ }; ++} __attribute__((packed)); ++ ++struct wprobe_msg_hdr { ++ __u16 status; ++ __u16 error; ++ __u32 len; ++}; ++ ++enum wprobe_resp_status { ++ WPROBE_MSG_DONE = 0, ++ WPROBE_MSG_DATA = 1, ++}; ++ ++static inline void ++wprobe_swap_msg_hdr(struct wprobe_msg_hdr *mhdr) ++{ ++ SWAP16(mhdr->status); ++ SWAP16(mhdr->error); ++ SWAP32(mhdr->len); ++} ++ ++static int ++save_attribute_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ const char *name = "N/A"; ++ struct wprobe_attribute *attr; ++ int type = 0; ++ struct wprobe_attr_cb *cb = arg; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (tb[WPROBE_ATTR_NAME]) ++ name = nla_data(tb[WPROBE_ATTR_NAME]); ++ ++ attr = malloc(sizeof(struct wprobe_attribute) + strlen(name) + 1); ++ if (!attr) ++ return -1; ++ ++ memset(attr, 0, sizeof(struct wprobe_attribute)); ++ ++ if (tb[WPROBE_ATTR_ID]) ++ attr->id = nla_get_u32(tb[WPROBE_ATTR_ID]); ++ ++ if (tb[WPROBE_ATTR_MAC] && cb->addr) ++ memcpy(cb->addr, nla_data(tb[WPROBE_ATTR_MAC]), 6); ++ ++ if (tb[WPROBE_ATTR_FLAGS]) ++ attr->flags = nla_get_u32(tb[WPROBE_ATTR_FLAGS]); ++ ++ if (tb[WPROBE_ATTR_TYPE]) ++ type = nla_get_u8(tb[WPROBE_ATTR_TYPE]); ++ ++ if ((type < WPROBE_VAL_STRING) || ++ (type > WPROBE_VAL_U64)) ++ type = 0; ++ ++ attr->type = type; ++ strcpy(attr->name, name); ++ INIT_LIST_HEAD(&attr->list); ++ list_add(&attr->list, cb->list); ++ return 0; ++} ++ ++static struct nl_msg * ++wprobe_new_msg(struct wprobe_iface *dev, int cmd, bool dump) ++{ ++ struct nl_msg *msg; ++ uint32_t flags = 0; ++ ++ msg = nlmsg_alloc_size(65536); ++ if (!msg) ++ return NULL; ++ ++ if (dump) ++ flags |= NLM_F_DUMP; ++ ++ genlmsg_put(msg, 0, 0, dev->genl_family, ++ 0, flags, cmd, 0); ++ ++ NLA_PUT_STRING(msg, WPROBE_ATTR_INTERFACE, dev->ifname); ++nla_put_failure: ++ return msg; ++} ++ ++ ++static int ++dump_attributes(struct wprobe_iface *dev, bool link, struct list_head *list, char *addr) ++{ ++ struct nl_msg *msg; ++ struct wprobe_attr_cb cb; ++ ++ cb.list = list; ++ cb.addr = addr; ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_LIST, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ if (link) ++ NLA_PUT(msg, WPROBE_ATTR_MAC, 6, "\x00\x00\x00\x00\x00\x00"); ++ ++ return dev->ops->send_msg(dev, msg, save_attribute_handler, &cb); ++ ++nla_put_failure: ++ nlmsg_free(msg); ++ return -EINVAL; ++} ++ ++static struct wprobe_iface * ++wprobe_alloc_dev(void) ++{ ++ struct wprobe_iface *dev; ++ ++ dev = malloc(sizeof(struct wprobe_iface)); ++ if (!dev) ++ return NULL; ++ ++ memset(dev, 0, sizeof(struct wprobe_iface)); ++ ++ dev->interval = -1; ++ dev->scale_min = -1; ++ dev->scale_max = -1; ++ dev->scale_m = -1; ++ dev->scale_d = -1; ++ dev->sockfd = -1; ++ ++ INIT_LIST_HEAD(&dev->global_attr); ++ INIT_LIST_HEAD(&dev->link_attr); ++ INIT_LIST_HEAD(&dev->links); ++ return dev; ++} ++ ++static int ++wprobe_init_dev(struct wprobe_iface *dev) ++{ ++ dump_attributes(dev, false, &dev->global_attr, NULL); ++ dump_attributes(dev, true, &dev->link_attr, NULL); ++ return 0; ++} ++ ++#ifndef NO_LOCAL_ACCESS ++static int n_devs = 0; ++static struct nl_sock *handle = NULL; ++static struct nl_cache *cache = NULL; ++static struct genl_family *family = NULL; ++ ++static int ++error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg) ++{ ++ int *ret = arg; ++ *ret = err->error; ++ return NL_STOP; ++} ++ ++static int ++finish_handler(struct nl_msg *msg, void *arg) ++{ ++ int *ret = arg; ++ *ret = 0; ++ return NL_SKIP; ++} ++ ++static int ++ack_handler(struct nl_msg *msg, void *arg) ++{ ++ int *ret = arg; ++ *ret = 0; ++ return NL_STOP; ++} ++ ++static void ++wprobe_local_free(struct wprobe_iface *dev) ++{ ++ /* should not happen */ ++ if (n_devs == 0) ++ return; ++ ++ if (--n_devs != 0) ++ return; ++ ++ if (cache) ++ nl_cache_free(cache); ++ if (handle) ++ nl_socket_free(handle); ++ handle = NULL; ++ cache = NULL; ++} ++ ++static int ++wprobe_local_init(void) ++{ ++ int ret; ++ ++ if (n_devs++ > 0) ++ return 0; ++ ++ handle = nl_socket_alloc(); ++ if (!handle) { ++ DPRINTF("Failed to create handle\n"); ++ goto err; ++ } ++ ++ if (genl_connect(handle)) { ++ DPRINTF("Failed to connect to generic netlink\n"); ++ goto err; ++ } ++ ++ ret = genl_ctrl_alloc_cache(handle, &cache); ++ if (ret < 0) { ++ DPRINTF("Failed to allocate netlink cache\n"); ++ goto err; ++ } ++ ++ family = genl_ctrl_search_by_name(cache, "wprobe"); ++ if (!family) { ++ DPRINTF("wprobe API not present\n"); ++ goto err; ++ } ++ return 0; ++ ++err: ++ wprobe_local_free(NULL); ++ return -EINVAL; ++} ++ ++ ++static int ++wprobe_local_send_msg(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t callback, void *arg) ++{ ++ struct nl_cb *cb; ++ int err = 0; ++ ++ cb = nl_cb_alloc(NL_CB_DEFAULT); ++ if (!cb) ++ goto out_no_cb; ++ ++ if (callback) ++ nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, callback, arg); ++ ++ err = nl_send_auto_complete(handle, msg); ++ if (err < 0) ++ goto out; ++ ++ err = 1; ++ ++ nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err); ++ nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err); ++ nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err); ++ ++ while (err > 0) ++ nl_recvmsgs(handle, cb); ++ ++out: ++ nl_cb_put(cb); ++out_no_cb: ++ nlmsg_free(msg); ++ return err; ++} ++ ++static const struct wprobe_iface_ops wprobe_local_ops = { ++ .send_msg = wprobe_local_send_msg, ++ .free = wprobe_local_free, ++}; ++ ++struct wprobe_iface * ++wprobe_get_dev(const char *ifname) ++{ ++ struct wprobe_iface *dev; ++ ++ if (wprobe_local_init() != 0) ++ return NULL; ++ ++ dev = wprobe_alloc_dev(); ++ if (!dev) ++ goto error_alloc; ++ ++ dev->ifname = strdup(ifname); ++ dev->ops = &wprobe_local_ops; ++ dev->genl_family = genl_family_get_id(family); ++ ++ if (wprobe_init_dev(dev) < 0) ++ goto error; ++ ++ return dev; ++ ++error: ++ free(dev); ++error_alloc: ++ wprobe_local_free(NULL); ++ return NULL; ++} ++ ++#endif ++ ++static void swap_nlmsghdr(struct nlmsghdr *nlh) ++{ ++ SWAP32(nlh->nlmsg_len); ++ SWAP16(nlh->nlmsg_type); ++ SWAP16(nlh->nlmsg_flags); ++ SWAP32(nlh->nlmsg_seq); ++ SWAP32(nlh->nlmsg_pid); ++} ++ ++static void swap_genlmsghdr(struct genlmsghdr *gnlh) ++{ ++#if 0 /* probably unnecessary */ ++ SWAP16(gnlh->reserved); ++#endif ++} ++ ++static void ++wprobe_swap_nested(void *data, int len, bool outgoing) ++{ ++ void *end = data + len; ++ ++ while (data < end) { ++ struct nlattr *nla = data; ++ unsigned int type, len; ++ ++ if (!outgoing) { ++ SWAP16(nla->nla_len); ++ SWAP16(nla->nla_type); ++ ++ /* required for further sanity checks */ ++ if (data + nla->nla_len > end) ++ nla->nla_len = end - data; ++ } ++ ++ len = NLA_ALIGN(nla->nla_len); ++ type = nla->nla_type & NLA_TYPE_MASK; ++ ++ if (type <= WPROBE_ATTR_LAST) { ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++ switch(attribute_policy[type].type) { ++ case NLA_U16: ++ SWAP16(*(__u16 *)nla_data(nla)); ++ break; ++ case NLA_U32: ++ SWAP32(*(__u32 *)nla_data(nla)); ++ break; ++ case NLA_U64: ++ SWAP64(*(__u64 *)nla_data(nla)); ++ break; ++ case NLA_NESTED: ++ wprobe_swap_nested(nla_data(nla), nla_len(nla), outgoing); ++ break; ++ } ++#endif ++ } ++ data += len; ++ ++ if (outgoing) { ++ SWAP16(nla->nla_len); ++ SWAP16(nla->nla_type); ++ } ++ if (!nla->nla_len) ++ break; ++ } ++} ++ ++static struct nl_msg * ++wprobe_msg_from_network(int socket, int len) ++{ ++ struct genlmsghdr *gnlh; ++ struct nlmsghdr *nlh; ++ struct nl_msg *msg; ++ void *data; ++ ++ msg = nlmsg_alloc_size(len + 32); ++ if (!msg) ++ return NULL; ++ ++ nlh = nlmsg_hdr(msg); ++ if (read(socket, nlh, len) != len) ++ goto free; ++ ++ swap_nlmsghdr(nlh); ++ if (nlh->nlmsg_len > len) ++ goto free; ++ ++ gnlh = nlmsg_data(nlh); ++ swap_genlmsghdr(gnlh); ++ ++ data = genlmsg_data(gnlh); ++ wprobe_swap_nested(data, genlmsg_len(gnlh), false); ++ ++ return msg; ++free: ++ nlmsg_free(msg); ++ return NULL; ++} ++ ++static int ++wprobe_msg_to_network(int socket, struct nl_msg *msg) ++{ ++ struct nlmsghdr *nlh = nlmsg_hdr(msg); ++ struct wprobe_msg_hdr mhdr; ++ struct genlmsghdr *gnlh; ++ void *buf, *data; ++ int buflen, datalen; ++ int ret; ++ ++ buflen = nlh->nlmsg_len; ++ buf = malloc(buflen); ++ if (!buf) ++ return -ENOMEM; ++ ++ memset(&mhdr, 0, sizeof(mhdr)); ++ mhdr.status = WPROBE_MSG_DATA; ++ mhdr.len = buflen; ++ wprobe_swap_msg_hdr(&mhdr); ++ ret = write(socket, &mhdr, sizeof(mhdr)); ++ if (ret < 0) ++ goto out; ++ ++ memcpy(buf, nlh, buflen); ++ nlh = buf; ++ gnlh = nlmsg_data(nlh); ++ data = genlmsg_data(gnlh); ++ datalen = genlmsg_len(gnlh); ++ ++ wprobe_swap_nested(data, datalen, true); ++ swap_genlmsghdr(gnlh); ++ swap_nlmsghdr(nlh); ++ ret = write(socket, buf, buflen); ++ ++out: ++ free(buf); ++ ++ return ret; ++} ++ ++static int ++wprobe_remote_send_msg(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t callback, void *arg) ++{ ++ struct wprobe_msg_hdr mhdr; ++ int msgs = 0; ++ ++ wprobe_msg_to_network(dev->sockfd, msg); ++ nlmsg_free(msg); ++ do { ++ if (read(dev->sockfd, &mhdr, sizeof(mhdr)) != sizeof(mhdr)) { ++ DPRINTF("Failed to read response header\n"); ++ return -1; ++ } ++ wprobe_swap_msg_hdr(&mhdr); ++ ++ switch(mhdr.status) { ++ case WPROBE_MSG_DATA: ++ if (mhdr.len > WPROBE_MAX_MSGLEN) { ++ fprintf(stderr, "Invalid length in received response message.\n"); ++ exit(1); ++ } ++ ++ msg = wprobe_msg_from_network(dev->sockfd, mhdr.len); ++ if (!msg) ++ return -EINVAL; ++ ++ msgs++; ++ callback(msg, arg); ++ nlmsg_free(msg); ++ break; ++ } ++ } while (mhdr.status != WPROBE_MSG_DONE); ++ ++ if (mhdr.error) ++ return -mhdr.error; ++ else ++ return msgs; ++} ++ ++ ++static void ++wprobe_socket_dev_free(struct wprobe_iface *dev) ++{ ++ if (dev->sockfd >= 0) ++ close(dev->sockfd); ++} ++ ++static const struct wprobe_iface_ops wprobe_remote_ops = { ++ .send_msg = wprobe_remote_send_msg, ++ .free = wprobe_socket_dev_free, ++}; ++ ++ ++#ifndef NO_LOCAL_ACCESS ++int ++wprobe_server_init(int socket) ++{ ++ struct wprobe_init_hdr hdr; ++ int ret; ++ ++ ret = wprobe_local_init(); ++ if (ret != 0) ++ return ret; ++ ++ memset(&hdr, 0, sizeof(hdr)); ++ memcpy(hdr.pre.magic, WPROBE_MAGIC_STR, sizeof(WPROBE_MAGIC_STR)); ++ hdr.pre.version = 0; ++ hdr.v0.genl_family = genl_family_get_id(family); ++ SWAP16(hdr.v0.genl_family); ++ write(socket, (unsigned char *)&hdr, sizeof(hdr)); ++ ++ return 0; ++} ++ ++static int ++wprobe_server_cb(struct nl_msg *msg, void *arg) ++{ ++ int *socket = arg; ++ int ret; ++ ++ ret = wprobe_msg_to_network(*socket, msg); ++ if (ret > 0) ++ ret = 0; ++ ++ return ret; ++} ++ ++ ++int ++wprobe_server_handle(int socket) ++{ ++ struct wprobe_msg_hdr mhdr; ++ struct nl_msg *msg; ++ int ret; ++ ++ ret = read(socket, &mhdr, sizeof(mhdr)); ++ if (ret != sizeof(mhdr)) { ++ if (ret <= 0) ++ return -1; ++ ++ DPRINTF("Failed to read request header\n"); ++ return -EINVAL; ++ } ++ wprobe_swap_msg_hdr(&mhdr); ++ ++ switch(mhdr.status) { ++ case WPROBE_MSG_DATA: ++ if (mhdr.len > WPROBE_MAX_MSGLEN) { ++ DPRINTF("Invalid length in received response message.\n"); ++ return -EINVAL; ++ } ++ msg = wprobe_msg_from_network(socket, mhdr.len); ++ break; ++ default: ++ DPRINTF("Invalid request header type\n"); ++ return -ENOENT; ++ } ++ ++ if (!msg) { ++ DPRINTF("Failed to get message\n"); ++ return -EINVAL; ++ } ++ ++ ret = wprobe_local_send_msg(NULL, msg, wprobe_server_cb, &socket); ++ ++ memset(&mhdr, 0, sizeof(mhdr)); ++ mhdr.status = WPROBE_MSG_DONE; ++ if (ret < 0) ++ mhdr.error = (uint16_t) -ret; ++ ++ ret = write(socket, (unsigned char *)&mhdr, sizeof(mhdr)); ++ if (ret > 0) ++ ret = 0; ++ ++ return ret; ++} ++ ++void ++wprobe_server_done(void) ++{ ++ wprobe_local_free(NULL); ++} ++#endif ++ ++struct wprobe_iface * ++wprobe_get_from_socket(int socket, const char *name) ++{ ++ struct wprobe_iface *dev; ++ struct wprobe_init_hdr hdr; ++ ++ dev = wprobe_alloc_dev(); ++ if (!dev) ++ goto out; ++ ++ dev->ops = &wprobe_remote_ops; ++ dev->sockfd = socket; ++ dev->ifname = strdup(name); ++ ++ /* read version and header length */ ++ if (read(socket, &hdr.pre, sizeof(hdr.pre)) != sizeof(hdr.pre)) { ++ DPRINTF("Could not read header\n"); ++ goto error; ++ } ++ ++ /* magic not found */ ++ if (memcmp(hdr.pre.magic, WPROBE_MAGIC_STR, sizeof(hdr.pre.magic)) != 0) { ++ DPRINTF("Magic does not match\n"); ++ goto error; ++ } ++ ++ /* unsupported version */ ++ if (hdr.pre.version != 0) { ++ DPRINTF("Protocol version does not match\n"); ++ goto error; ++ } ++ ++ if (read(socket, &hdr.v0, sizeof(hdr.v0)) != sizeof(hdr.v0)) { ++ DPRINTF("Could not read header data\n"); ++ goto error; ++ } ++ ++ SWAP16(hdr.pre.extra); ++ SWAP16(hdr.v0.genl_family); ++ dev->genl_family = hdr.v0.genl_family; ++ ++ if (wprobe_init_dev(dev) < 0) { ++ DPRINTF("Could not initialize device\n"); ++ goto error; ++ } ++ ++out: ++ return dev; ++ ++error: ++ wprobe_free_dev(dev); ++ return NULL; ++} ++ ++struct wprobe_iface * ++wprobe_get_auto(const char *arg, char **err) ++{ ++ static struct sockaddr_in sa; ++ static char errbuf[512]; ++ ++ struct wprobe_iface *dev = NULL; ++ struct hostent *h; ++ char *devstr = strdup(arg); ++ char *sep = NULL; ++ int sock = -1; ++ int len; ++ ++ if (err) ++ *err = NULL; ++ ++ sep = strchr(devstr, ':'); ++ if (!sep) { ++#ifndef NO_LOCAL_ACCESS ++ free(devstr); ++ return wprobe_get_dev(arg); ++#else ++ if (err) ++ *err = "Invalid argument"; ++ goto out; ++#endif ++ } ++ ++ *sep = 0; ++ sep++; ++ ++ sock = socket(AF_INET, SOCK_STREAM, 0); ++ if (sock < 0) ++ goto syserr; ++ ++ h = gethostbyname(devstr); ++ if (!h) { ++ sprintf(errbuf, "Host not found"); ++ goto out_err; ++ } ++ ++ memcpy(&sa.sin_addr, h->h_addr, h->h_length); ++ sa.sin_family = AF_INET; ++ sa.sin_port = htons(wprobe_port); ++ if (connect(sock, (struct sockaddr *)&sa, sizeof(sa)) < 0) ++ goto syserr; ++ ++ dev = wprobe_get_from_socket(sock, sep); ++ if (!dev) { ++ sprintf(errbuf, "wprobe connection initialization failed"); ++ goto out_err; ++ } ++ goto out; ++ ++syserr: ++ if (err) { ++ strcpy(errbuf, "Connection failed: "); ++ len = strlen(errbuf); ++ strerror_r(errno, errbuf + len, sizeof(errbuf) - len - 1); ++ } ++out_err: ++ if (err) ++ *err = errbuf; ++ if (sock >= 0) ++ close(sock); ++out: ++ if (devstr) ++ free(devstr); ++ return dev; ++} ++ ++static void ++free_attr_list(struct list_head *list) ++{ ++ struct wprobe_attribute *attr, *tmp; ++ ++ list_for_each_entry_safe(attr, tmp, list, list) { ++ list_del(&attr->list); ++ free(attr); ++ } ++} ++ ++void ++wprobe_free_dev(struct wprobe_iface *dev) ++{ ++ if (dev->ops->free) ++ dev->ops->free(dev); ++ free_attr_list(&dev->global_attr); ++ free_attr_list(&dev->link_attr); ++ free((void *)dev->ifname); ++ free(dev); ++} ++ ++static struct wprobe_link * ++get_link(struct list_head *list, const char *addr) ++{ ++ struct wprobe_link *l; ++ ++ list_for_each_entry(l, list, list) { ++ if (!memcmp(l->addr, addr, 6)) { ++ list_del_init(&l->list); ++ goto out; ++ } ++ } ++ ++ /* no previous link found, allocate a new one */ ++ l = malloc(sizeof(struct wprobe_link)); ++ if (!l) ++ goto out; ++ ++ memset(l, 0, sizeof(struct wprobe_link)); ++ memcpy(l->addr, addr, sizeof(l->addr)); ++ INIT_LIST_HEAD(&l->list); ++ ++out: ++ return l; ++} ++ ++struct wprobe_save_cb { ++ struct list_head *list; ++ struct list_head old_list; ++}; ++ ++static int ++save_link_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ struct wprobe_link *link; ++ struct wprobe_save_cb *cb = arg; ++ const char *addr; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_MAC] || (nla_len(tb[WPROBE_ATTR_MAC]) != 6)) ++ return -1; ++ ++ addr = nla_data(tb[WPROBE_ATTR_MAC]); ++ link = get_link(&cb->old_list, addr); ++ if (!link) ++ return -1; ++ ++ if (tb[WPROBE_ATTR_FLAGS]) ++ link->flags = nla_get_u32(tb[WPROBE_ATTR_FLAGS]); ++ ++ list_add_tail(&link->list, cb->list); ++ return 0; ++} ++ ++ ++int ++wprobe_update_links(struct wprobe_iface *dev) ++{ ++ struct wprobe_link *l, *tmp; ++ struct nl_msg *msg; ++ struct wprobe_save_cb cb; ++ int err; ++ ++ INIT_LIST_HEAD(&cb.old_list); ++ list_splice_init(&dev->links, &cb.old_list); ++ cb.list = &dev->links; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_LINKS, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ err = dev->ops->send_msg(dev, msg, save_link_handler, &cb); ++ if (err < 0) ++ return err; ++ ++ list_for_each_entry_safe(l, tmp, &cb.old_list, list) { ++ list_del(&l->list); ++ free(l); ++ } ++ ++ return 0; ++} ++ ++ ++struct wprobe_filter_data ++{ ++ wprobe_filter_cb cb; ++ void *arg; ++ struct wprobe_filter_item *buf; ++ int buflen; ++}; ++ ++static int ++dump_filter_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ struct wprobe_filter_data *data = arg; ++ struct nlattr *p; ++ const char *name; ++ int count = 0; ++ int len; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_NAME] || !tb[WPROBE_ATTR_FILTER_GROUP]) ++ return -1; ++ ++ name = nla_data(tb[WPROBE_ATTR_NAME]); ++ nla_for_each_nested(p, tb[WPROBE_ATTR_FILTER_GROUP], len) { ++ count++; ++ } ++ ++ if (data->buflen < count) { ++ if (data->buf) ++ free(data->buf); ++ data->buflen = count; ++ data->buf = malloc(sizeof(struct wprobe_filter_item) * count); ++ memset(data->buf, 0, sizeof(struct wprobe_filter_item) * count); ++ } ++ ++ count = 0; ++ nla_for_each_nested(p, tb[WPROBE_ATTR_FILTER_GROUP], len) { ++ struct wprobe_filter_item *fi; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, nla_data(p), ++ nla_len(p), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_NAME] || !tb[WPROBE_ATTR_RXCOUNT] ++ || !tb[WPROBE_ATTR_TXCOUNT]) ++ continue; ++ ++ fi = &data->buf[count++]; ++ strncpy(fi->name, nla_data(tb[WPROBE_ATTR_NAME]), sizeof(fi->name) - 1); ++ fi->name[sizeof(fi->name) - 1] = 0; ++ fi->rx = nla_get_u64(tb[WPROBE_ATTR_RXCOUNT]); ++ fi->tx = nla_get_u64(tb[WPROBE_ATTR_TXCOUNT]); ++ } ++ data->cb(data->arg, name, data->buf, count); ++ ++ return 0; ++} ++ ++int ++wprobe_dump_filters(struct wprobe_iface *dev, wprobe_filter_cb cb, void *arg) ++{ ++ struct wprobe_filter_data data; ++ struct nl_msg *msg; ++ int err; ++ ++ data.buf = 0; ++ data.buflen = 0; ++ data.cb = cb; ++ data.arg = arg; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_FILTER, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ err = dev->ops->send_msg(dev, msg, dump_filter_handler, &data); ++ if (err < 0) ++ return err; ++ ++ return 0; ++} ++ ++int ++wprobe_apply_config(struct wprobe_iface *dev) ++{ ++ struct nl_msg *msg; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_CONFIG, false); ++ if (!msg) ++ return -ENOMEM; ++ ++ if (dev->interval >= 0) ++ NLA_PUT_MSECS(msg, WPROBE_ATTR_INTERVAL, dev->interval); ++ ++ if (dev->filter_len < 0) { ++ NLA_PUT(msg, WPROBE_ATTR_FILTER, 0, NULL); ++ dev->filter_len = 0; ++ } else if (dev->filter && dev->filter_len > 0) { ++ NLA_PUT(msg, WPROBE_ATTR_FILTER, dev->filter_len, dev->filter); ++ } ++ dev->filter = NULL; ++ ++ dev->ops->send_msg(dev, msg, NULL, NULL); ++ return 0; ++ ++nla_put_failure: ++ nlmsg_free(msg); ++ return -ENOMEM; ++} ++ ++int ++wprobe_measure(struct wprobe_iface *dev) ++{ ++ struct nl_msg *msg; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_MEASURE, false); ++ if (!msg) ++ return -ENOMEM; ++ ++ dev->ops->send_msg(dev, msg, NULL, NULL); ++ return 0; ++} ++ ++struct wprobe_request_cb { ++ struct list_head *list; ++ struct list_head old_list; ++ char *addr; ++}; ++ ++static int ++save_attrdata_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ struct wprobe_request_cb *cb = arg; ++ struct wprobe_attribute *attr; ++ int type, id; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_ID]) ++ return -1; ++ ++ if (!tb[WPROBE_ATTR_TYPE]) ++ return -1; ++ ++ id = nla_get_u32(tb[WPROBE_ATTR_ID]); ++ list_for_each_entry(attr, &cb->old_list, list) { ++ if (attr->id == id) ++ goto found; ++ } ++ /* not found */ ++ return -1; ++ ++found: ++ list_del_init(&attr->list); ++ ++ type = nla_get_u8(tb[WPROBE_ATTR_TYPE]); ++ if (type != attr->type) { ++ DPRINTF("WARNING: type mismatch for %s attribute '%s' (%d != %d)\n", ++ (cb->addr ? "link" : "global"), ++ attr->name, ++ type, attr->type); ++ goto out; ++ } ++ ++ if ((type < WPROBE_VAL_STRING) || ++ (type > WPROBE_VAL_U64)) ++ goto out; ++ ++ memset(&attr->val, 0, sizeof(attr->val)); ++ ++#define HANDLE_INT_TYPE(_idx, _type) \ ++ case WPROBE_VAL_S##_type: \ ++ case WPROBE_VAL_U##_type: \ ++ attr->val.U##_type = nla_get_u##_type(tb[_idx]); \ ++ break ++ ++ switch(type) { ++ HANDLE_INT_TYPE(type, 8); ++ HANDLE_INT_TYPE(type, 16); ++ HANDLE_INT_TYPE(type, 32); ++ HANDLE_INT_TYPE(type, 64); ++ case WPROBE_VAL_STRING: ++ /* unimplemented */ ++ break; ++ } ++#undef HANDLE_TYPE ++ ++ if (attr->flags & WPROBE_F_KEEPSTAT) { ++ if (tb[WPROBE_VAL_SUM]) ++ attr->val.s = nla_get_u64(tb[WPROBE_VAL_SUM]); ++ ++ if (tb[WPROBE_VAL_SUM_SQ]) ++ attr->val.ss = nla_get_u64(tb[WPROBE_VAL_SUM_SQ]); ++ ++ if (tb[WPROBE_VAL_SAMPLES]) ++ attr->val.n = nla_get_u32(tb[WPROBE_VAL_SAMPLES]); ++ ++ if (attr->val.n > 0) { ++ float avg = ((float) attr->val.s) / attr->val.n; ++ float stdev = sqrt((((float) attr->val.ss) / attr->val.n) - (avg * avg)); ++ if (isnan(stdev)) ++ stdev = 0.0f; ++ if (isnan(avg)) ++ avg = 0.0f; ++ attr->val.avg = avg; ++ attr->val.stdev = stdev; ++ } ++ } ++ ++out: ++ list_add_tail(&attr->list, cb->list); ++ return 0; ++} ++ ++ ++int ++wprobe_request_data(struct wprobe_iface *dev, const unsigned char *addr) ++{ ++ struct wprobe_request_cb cb; ++ struct list_head *attrs; ++ struct nl_msg *msg; ++ int err; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_INFO, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ if (addr) { ++ attrs = &dev->link_attr; ++ NLA_PUT(msg, WPROBE_ATTR_MAC, 6, addr); ++ } else { ++ attrs = &dev->global_attr; ++ } ++ ++ INIT_LIST_HEAD(&cb.old_list); ++ list_splice_init(attrs, &cb.old_list); ++ cb.list = attrs; ++ ++ err = dev->ops->send_msg(dev, msg, save_attrdata_handler, &cb); ++ list_splice(&cb.old_list, attrs->prev); ++ return err; ++ ++nla_put_failure: ++ nlmsg_free(msg); ++ return -ENOMEM; ++} ++ ++ +diff --git a/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe-util.c.svn-base b/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe-util.c.svn-base +new file mode 100644 +index 0000000..654442f +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe-util.c.svn-base +@@ -0,0 +1,450 @@ ++/* ++ * wprobe-test.c: Wireless probe user space test code ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include "wprobe.h" ++ ++static bool simple_mode = false; ++ ++static const char * ++wprobe_dump_value(struct wprobe_attribute *attr) ++{ ++ static char buf[128]; ++ ++#define HANDLE_TYPE(_type, _format) \ ++ case WPROBE_VAL_##_type: \ ++ snprintf(buf, sizeof(buf), _format, attr->val._type); \ ++ break ++ ++ switch(attr->type) { ++ HANDLE_TYPE(S8, "%d"); ++ HANDLE_TYPE(S16, "%d"); ++ HANDLE_TYPE(S32, "%d"); ++ HANDLE_TYPE(S64, "%lld"); ++ HANDLE_TYPE(U8, "%d"); ++ HANDLE_TYPE(U16, "%d"); ++ HANDLE_TYPE(U32, "%d"); ++ HANDLE_TYPE(U64, "%lld"); ++ case WPROBE_VAL_STRING: ++ /* FIXME: implement this */ ++ default: ++ strncpy(buf, "", sizeof(buf)); ++ break; ++ } ++ if ((attr->flags & WPROBE_F_KEEPSTAT) && ++ (attr->val.n > 0)) { ++ int len = strlen(buf); ++ if (simple_mode) ++ snprintf(buf + len, sizeof(buf) - len, ";%.02f;%.02f;%d;%lld;%lld", attr->val.avg, attr->val.stdev, attr->val.n, attr->val.s, attr->val.ss); ++ else ++ snprintf(buf + len, sizeof(buf) - len, " (avg: %.02f; stdev: %.02f, n=%d)", attr->val.avg, attr->val.stdev, attr->val.n); ++ } ++#undef HANDLE_TYPE ++ ++ return buf; ++} ++ ++ ++static void ++wprobe_dump_data(struct wprobe_iface *dev) ++{ ++ struct wprobe_attribute *attr; ++ struct wprobe_link *link; ++ bool first = true; ++ ++ if (!simple_mode) ++ fprintf(stdout, "\n"); ++ wprobe_request_data(dev, NULL); ++ list_for_each_entry(attr, &dev->global_attr, list) { ++ if (simple_mode) { ++ if (first) ++ fprintf(stdout, "[global]\n"); ++ fprintf(stdout, "%s=%s\n", attr->name, wprobe_dump_value(attr)); ++ } else { ++ fprintf(stdout, (first ? ++ "Global: %s=%s\n" : ++ " %s=%s\n"), ++ attr->name, ++ wprobe_dump_value(attr) ++ ); ++ } ++ first = false; ++ } ++ ++ list_for_each_entry(link, &dev->links, list) { ++ first = true; ++ wprobe_request_data(dev, link->addr); ++ list_for_each_entry(attr, &dev->link_attr, list) { ++ if (first) { ++ fprintf(stdout, ++ (simple_mode ? ++ "[%02x:%02x:%02x:%02x:%02x:%02x]\n%s=%s\n" : ++ "%02x:%02x:%02x:%02x:%02x:%02x: %s=%s\n"), ++ link->addr[0], link->addr[1], link->addr[2], ++ link->addr[3], link->addr[4], link->addr[5], ++ attr->name, ++ wprobe_dump_value(attr)); ++ first = false; ++ } else { ++ fprintf(stdout, ++ (simple_mode ? "%s=%s\n" : ++ " %s=%s\n"), ++ attr->name, ++ wprobe_dump_value(attr)); ++ } ++ } ++ } ++ fflush(stdout); ++} ++ ++static const char *attr_typestr[] = { ++ [0] = "Unknown", ++ [WPROBE_VAL_STRING] = "String", ++ [WPROBE_VAL_U8] = "Unsigned 8 bit", ++ [WPROBE_VAL_U16] = "Unsigned 16 bit", ++ [WPROBE_VAL_U32] = "Unsigned 32 bit", ++ [WPROBE_VAL_U64] = "Unsigned 64 bit", ++ [WPROBE_VAL_S8] = "Signed 8 bit", ++ [WPROBE_VAL_S16] = "Signed 16 bit", ++ [WPROBE_VAL_S32] = "Signed 32 bit", ++ [WPROBE_VAL_S64] = "Signed 64 bit", ++}; ++ ++static int usage(const char *prog) ++{ ++ fprintf(stderr, ++#ifndef NO_LOCAL_ACCESS ++ "Usage: %s |:|-P [options]\n" ++#else ++ "Usage: %s : [options]\n" ++#endif ++ "\n" ++ "Options:\n" ++ " -a: Print attributes\n" ++ " -c: Only apply configuration\n" ++ " -d: Delay between measurement dumps (in milliseconds, default: 1000)\n" ++ " A value of 0 (zero) prints once and exits; useful for scripts\n" ++ " -f: Dump contents of layer 2 filter counters during measurement\n" ++ " -F : Apply layer 2 filters from \n" ++ " -h: This help text\n" ++ " -i : Set measurement interval\n" ++ " -m: Run measurement loop\n" ++ " -p: Set the TCP port for server/client (default: 17990)\n" ++#ifndef NO_LOCAL_ACCESS ++ " -P: Run in proxy mode (listen on network)\n" ++#endif ++ "\n" ++ , prog); ++ exit(1); ++} ++ ++static void show_attributes(struct wprobe_iface *dev) ++{ ++ struct wprobe_attribute *attr; ++ if (simple_mode) ++ return; ++ list_for_each_entry(attr, &dev->global_attr, list) { ++ fprintf(stdout, "Global attribute: '%s' (%s)\n", ++ attr->name, attr_typestr[attr->type]); ++ } ++ list_for_each_entry(attr, &dev->link_attr, list) { ++ fprintf(stdout, "Link attribute: '%s' (%s)\n", ++ attr->name, attr_typestr[attr->type]); ++ } ++} ++ ++static void show_filter_simple(void *arg, const char *group, struct wprobe_filter_item *items, int n_items) ++{ ++ int i; ++ ++ fprintf(stdout, "[filter:%s]\n", group); ++ for (i = 0; i < n_items; i++) { ++ fprintf(stdout, "%s=%lld;%lld\n", ++ items[i].name, items[i].tx, items[i].rx); ++ } ++ fflush(stdout); ++} ++ ++ ++static void show_filter(void *arg, const char *group, struct wprobe_filter_item *items, int n_items) ++{ ++ int i; ++ fprintf(stdout, "Filter group: '%s' (tx/rx)\n", group); ++ for (i = 0; i < n_items; i++) { ++ fprintf(stdout, " - %s (%lld/%lld)\n", ++ items[i].name, items[i].tx, items[i].rx); ++ } ++} ++ ++static void loop_measurement(struct wprobe_iface *dev, bool print_filters, unsigned long delay) ++{ ++ do { ++ wprobe_update_links(dev); ++ wprobe_dump_data(dev); ++ if (print_filters) ++ wprobe_dump_filters(dev, simple_mode ? show_filter_simple : show_filter, NULL); ++ usleep(delay * 1000); ++ } ++ while (delay); ++} ++ ++static void set_filter(struct wprobe_iface *dev, const char *filename) ++{ ++ unsigned char *buf = NULL; ++ unsigned int buflen = 0; ++ unsigned int len = 0; ++ int fd; ++ ++ /* clear filter */ ++ if (filename[0] == 0) { ++ dev->filter_len = -1; ++ return; ++ } ++ ++ fd = open(filename, O_RDONLY); ++ if (fd < 0) { ++ perror("open filter"); ++ return; ++ } ++ ++ do { ++ int rlen; ++ ++ if (!buf) { ++ len = 0; ++ buflen = 1024; ++ buf = malloc(1024); ++ } else { ++ buflen *= 2; ++ buf = realloc(buf, buflen); ++ } ++ rlen = read(fd, buf + len, buflen - len); ++ if (rlen < 0) ++ break; ++ ++ len += rlen; ++ } while (len == buflen); ++ ++ dev->filter = buf; ++ dev->filter_len = len; ++ close(fd); ++} ++ ++#ifndef NO_LOCAL_ACCESS ++ ++static void sigchld_handler(int s) ++{ ++ while (waitpid(-1, NULL, WNOHANG) > 0); ++} ++ ++static int run_proxy(int port) ++{ ++ struct sockaddr_in sa; ++ struct sigaction sig; ++ int v = 1; ++ int s; ++ ++ s = socket(AF_INET, SOCK_STREAM, 0); ++ if (s < 0) { ++ perror("socket"); ++ return 1; ++ } ++ ++ sig.sa_handler = sigchld_handler; // Signal Handler fuer Zombie Prozesse ++ sigemptyset(&sig.sa_mask); ++ sig.sa_flags = SA_RESTART; ++ sigaction(SIGCHLD, &sig, NULL); ++ ++ memset(&sa, 0, sizeof(sa)); ++ sa.sin_family = AF_INET; ++ sa.sin_addr.s_addr = htonl(INADDR_ANY); ++ sa.sin_port = htons(wprobe_port); ++ ++ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(v)); ++ if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) { ++ perror("bind"); ++ return 1; ++ } ++ if (listen(s, 10)) { ++ perror("listen"); ++ return 1; ++ } ++ while(1) { ++ unsigned int addrlen = sizeof(struct sockaddr_in); ++ int ret, c; ++ ++ c = accept(s, (struct sockaddr *)&sa, &addrlen); ++ if (c < 0) { ++ if (errno == EINTR) ++ continue; ++ ++ perror("accept"); ++ return 1; ++ } ++ if (fork() == 0) { ++ /* close server socket, stdin, stdout, stderr */ ++ close(s); ++ close(0); ++ close(1); ++ close(2); ++ ++ wprobe_server_init(c); ++ do { ++ ret = wprobe_server_handle(c); ++ } while (ret >= 0); ++ wprobe_server_done(); ++ close(c); ++ exit(0); ++ } ++ close(c); ++ } ++ ++ return 0; ++} ++#endif ++ ++int main(int argc, char **argv) ++{ ++ struct wprobe_iface *dev = NULL; ++ const char *ifname; ++ const char *prog = argv[0]; ++ char *err = NULL; ++ enum { ++ CMD_NONE, ++ CMD_CONFIG, ++ CMD_MEASURE, ++ CMD_PROXY, ++ } cmd = CMD_NONE; ++ const char *filter = NULL; ++ bool print_attributes = false; ++ bool print_filters = false; ++ unsigned long delay = 1000; ++ int interval = -1; ++ int ch; ++ ++ if (argc < 2) ++ return usage(prog); ++ ++#ifndef NO_LOCAL_ACCESS ++ if (!strcmp(argv[1], "-P")) { ++ while ((ch = getopt(argc - 1, argv + 1, "p:")) != -1) { ++ switch(ch) { ++ case 'p': ++ /* set port */ ++ wprobe_port = strtoul(optarg, NULL, 0); ++ break; ++ default: ++ return usage(prog); ++ } ++ } ++ return run_proxy(wprobe_port); ++ } ++#endif ++ ++ if (argv[1][0] == '-') ++ return usage(prog); ++ ++ ifname = argv[1]; ++ argv++; ++ argc--; ++ ++ while ((ch = getopt(argc, argv, "acd:fF:hi:msp:")) != -1) { ++ switch(ch) { ++ case 'a': ++ print_attributes = true; ++ break; ++ case 'c': ++ cmd = CMD_CONFIG; ++ break; ++ case 'd': ++ delay = strtoul(optarg, NULL, 10); ++ break; ++ case 'm': ++ cmd = CMD_MEASURE; ++ break; ++ case 'i': ++ interval = strtoul(optarg, NULL, 10); ++ break; ++ case 'f': ++ print_filters = true; ++ break; ++ case 'F': ++ if (filter) { ++ fprintf(stderr, "Cannot set multiple filters\n"); ++ return usage(prog); ++ } ++ filter = optarg; ++ break; ++ case 's': ++ simple_mode = true; ++ break; ++ case 'p': ++ /* set port */ ++ wprobe_port = strtoul(optarg, NULL, 0); ++ break; ++ case 'h': ++ default: ++ usage(prog); ++ break; ++ } ++ } ++ ++ dev = wprobe_get_auto(ifname, &err); ++ if (!dev || (list_empty(&dev->global_attr) && ++ list_empty(&dev->link_attr))) { ++ if (err) ++ fprintf(stdout, "%s\n", err); ++ else ++ fprintf(stderr, "Interface '%s' not found\n", ifname); ++ return 1; ++ } ++ ++ if (filter || interval >= 0) { ++ if (filter) ++ set_filter(dev, filter); ++ if (interval >= 0) ++ dev->interval = interval; ++ ++ wprobe_apply_config(dev); ++ } ++ ++ if (cmd != CMD_CONFIG) { ++ if (print_attributes) ++ show_attributes(dev); ++ } ++ if (cmd == CMD_MEASURE) ++ loop_measurement(dev, print_filters, delay); ++ ++ wprobe_free_dev(dev); ++ ++ return 0; ++} +diff --git a/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe.h.svn-base b/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe.h.svn-base +new file mode 100644 +index 0000000..706facc +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/.svn/text-base/wprobe.h.svn-base +@@ -0,0 +1,213 @@ ++/* ++ * wprobe.h: Wireless probe user space library ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#ifndef __WPROBE_USER_H ++#define __WPROBE_USER_H ++#include ++#include ++#include ++#include "list.h" ++ ++/** ++ * struct wprobe_value: data structure for attribute values ++ * @STRING: string value (currently unsupported) ++ * @U8: unsigned 8-bit integer value ++ * @U16: unsigned 16-bit integer value ++ * @U32: unsigned 32-bit integer value ++ * @U64: unsigned 64-bit integer value ++ * @S8: signed 8-bit integer value ++ * @S16: signed 16-bit integer value ++ * @S32: signed 32-bit integer value ++ * @S64: signed 64-bit integer value ++ * ++ * @n: number of sample values ++ * @avg: average value ++ * @stdev: standard deviation ++ * @s: sum of all sample values (internal use) ++ * @ss: sum of all sample values squared (internal use) ++ */ ++struct wprobe_value { ++ /* attribute value */ ++ union { ++ const char *STRING; ++ uint8_t U8; ++ uint16_t U16; ++ uint32_t U32; ++ uint64_t U64; ++ int8_t S8; ++ int16_t S16; ++ int32_t S32; ++ int64_t S64; ++ }; ++ /* statistics */ ++ int64_t s, ss; ++ float avg, stdev; ++ unsigned int n; ++}; ++ ++/** ++ * struct wprobe_attribute: data structures for attribute descriptions ++ * @list: linked list data structure for a list of attributes ++ * @id: attribute id ++ * @type: netlink type for the attribute (see kernel api documentation) ++ * @flags: attribute flags (see kernel api documentation) ++ * @val: cached version of the last netlink query, will be overwritten on each request ++ * @name: attribute name ++ */ ++struct wprobe_attribute { ++ struct list_head list; ++ int id; ++ int type; ++ uint32_t flags; ++ struct wprobe_value val; ++ char name[]; ++}; ++ ++/** ++ * struct wprobe_link: data structure for the link description ++ * @list: linked list data structure for a list of links ++ * @flags: link flags (see kernel api documentation) ++ * @addr: mac address of the remote link partner ++ */ ++struct wprobe_link { ++ struct list_head list; ++ uint32_t flags; ++ unsigned char addr[6]; ++}; ++ ++struct wprobe_filter_item { ++ char name[32]; ++ uint64_t rx; ++ uint64_t tx; ++}; ++ ++struct wprobe_iface_ops; ++struct wprobe_iface { ++ const struct wprobe_iface_ops *ops; ++ ++ int sockfd; ++ const char *ifname; ++ unsigned int genl_family; ++ char addr[6]; ++ ++ struct list_head global_attr; ++ struct list_head link_attr; ++ struct list_head links; ++ ++ /* config */ ++ int interval; ++ int scale_min; ++ int scale_max; ++ int scale_m; ++ int scale_d; ++ ++ /* filter */ ++ void *filter; ++ ++ /* filter_len: ++ * set to -1 to drop the current filter ++ * automatically reset to 0 after config apply ++ */ ++ int filter_len; ++}; ++ ++typedef void (*wprobe_filter_cb)(void *arg, const char *group, struct wprobe_filter_item *items, int n_items); ++extern int wprobe_port; ++ ++/** ++ * wprobe_update_links: get a list of all link partners ++ * @dev: wprobe device structure ++ * @list: linked list for storing link descriptions ++ * ++ * when wprobe_update_links is called multiple times, the linked list ++ * is updated with new link partners, old entries are automatically expired ++ */ ++extern int wprobe_update_links(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_dump_filters: dump all layer 2 filter counters ++ * @dev: wprobe device structure ++ * @cb: callback (called once per filter group) ++ * @arg: user argument for the callback ++ */ ++extern int wprobe_dump_filters(struct wprobe_iface *dev, wprobe_filter_cb cb, void *arg); ++ ++/** ++ * wprobe_measure: start a measurement request for all global attributes ++ * @dev: wprobe device structure ++ * ++ * not all attributes are automatically filled with data, since for some ++ * it may be desirable to control the sampling interval from user space ++ * you can use this function to do that. ++ */ ++extern int wprobe_measure(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_get_dev: get a handle to a local wprobe device ++ * @ifname: name of the wprobe interface ++ * ++ * queries the wprobe interface for all attributes ++ * must be freed with wprobe_free_dev ++ */ ++extern struct wprobe_iface *wprobe_get_dev(const char *ifname); ++ ++/** ++ * wprobe_get_auto: get a handle to a local or remote wprobe device ++ * @arg: pointer to the wprobe device, either (local) or : (remote) ++ */ ++extern struct wprobe_iface *wprobe_get_auto(const char *arg, char **err); ++ ++/** ++ * wprobe_get_dev: free all device information ++ * @dev: wprobe device structure ++ */ ++extern void wprobe_free_dev(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_apply_config: apply configuration data ++ * @dev: wprobe device structure ++ * ++ * uploads all configuration values from @dev that are not set to -1 ++ */ ++extern int wprobe_apply_config(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_request_data: request new sampling values for the given list of attributes ++ * @dev: wprobe device structure ++ * @addr: (optional) mac address of the link partner ++ * ++ * if addr is unset, global values are stored in the global attributes list ++ * if addr is set, per-link values for the given address are stored in the link attributes list ++ */ ++extern int wprobe_request_data(struct wprobe_iface *dev, const unsigned char *addr); ++ ++/** ++ * wprobe_server_init: send a wprobe server init message to a server's client socket ++ * @socket: socket of the connection to the client ++ */ ++extern int wprobe_server_init(int socket); ++ ++/** ++ * wprobe_server_handle: read a request from the client socket, process it, send the response ++ * @socket: socket of the connection to the client ++ */ ++extern int wprobe_server_handle(int socket); ++ ++/** ++ * wprobe_server_done: release memory allocated for the server connection ++ */ ++extern void wprobe_server_done(void); ++ ++#endif +diff --git a/feeds/packages/net/wprobe/src/user/Makefile b/feeds/packages/net/wprobe/src/user/Makefile +new file mode 100644 +index 0000000..01e83da +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/Makefile +@@ -0,0 +1,38 @@ ++include ../Makefile.inc ++ ++CPPFLAGS += -I../kernel ++LDFLAGS = ++ ++ifneq ($(HOST_OS),Linux) ++USE_LIBNL_MICRO=1 ++else ++USE_LIBNL_MICRO= ++endif ++ ++ifeq ($(USE_LIBNL_MICRO),1) ++LIBNL_PREFIX = /usr/local ++LIBNL = $(LIBNL_PREFIX)/lib/libnl-micro.a ++CPPFLAGS += -I$(LIBNL_PREFIX)/include/libnl-micro ++EXTRA_CFLAGS += -DNO_LOCAL_ACCESS ++else ++LIBNL = -lnl ++endif ++ ++LIBM = -lm ++LIBS = $(LIBNL) $(LIBM) ++ ++all: libwprobe.a wprobe-util ++ ++libwprobe.a: wprobe-lib.o ++ rm -f $@ ++ $(AR) rcu $@ $^ ++ $(RANLIB) $@ ++ ++%.o: %.c ++ $(CC) $(WFLAGS) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $< ++ ++wprobe-util: wprobe-util.o wprobe-lib.o ++ $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) ++ ++clean: ++ rm -f *.o *.a wprobe-util +diff --git a/feeds/packages/net/wprobe/src/user/list.h b/feeds/packages/net/wprobe/src/user/list.h +new file mode 100644 +index 0000000..2959a06 +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/list.h +@@ -0,0 +1,601 @@ ++#ifndef _LINUX_LIST_H ++#define _LINUX_LIST_H ++ ++#include ++/** ++ * container_of - cast a member of a structure out to the containing structure ++ * @ptr: the pointer to the member. ++ * @type: the type of the container struct this is embedded in. ++ * @member: the name of the member within the struct. ++ * ++ */ ++#ifndef container_of ++#define container_of(ptr, type, member) ( \ ++ (type *)( (char *)ptr - offsetof(type,member) )) ++#endif ++ ++ ++/* ++ * Simple doubly linked list implementation. ++ * ++ * Some of the internal functions ("__xxx") are useful when ++ * manipulating whole lists rather than single entries, as ++ * sometimes we already know the next/prev entries and we can ++ * generate better code by using them directly rather than ++ * using the generic single-entry routines. ++ */ ++ ++struct list_head { ++ struct list_head *next, *prev; ++}; ++ ++#define LIST_HEAD_INIT(name) { &(name), &(name) } ++ ++#define LIST_HEAD(name) \ ++ struct list_head name = LIST_HEAD_INIT(name) ++ ++static inline void INIT_LIST_HEAD(struct list_head *list) ++{ ++ list->next = list; ++ list->prev = list; ++} ++ ++/* ++ * Insert a new entry between two known consecutive entries. ++ * ++ * This is only for internal list manipulation where we know ++ * the prev/next entries already! ++ */ ++static inline void __list_add(struct list_head *new, ++ struct list_head *prev, ++ struct list_head *next) ++{ ++ next->prev = new; ++ new->next = next; ++ new->prev = prev; ++ prev->next = new; ++} ++ ++/** ++ * list_add - add a new entry ++ * @new: new entry to be added ++ * @head: list head to add it after ++ * ++ * Insert a new entry after the specified head. ++ * This is good for implementing stacks. ++ */ ++static inline void list_add(struct list_head *new, struct list_head *head) ++{ ++ __list_add(new, head, head->next); ++} ++ ++ ++/** ++ * list_add_tail - add a new entry ++ * @new: new entry to be added ++ * @head: list head to add it before ++ * ++ * Insert a new entry before the specified head. ++ * This is useful for implementing queues. ++ */ ++static inline void list_add_tail(struct list_head *new, struct list_head *head) ++{ ++ __list_add(new, head->prev, head); ++} ++ ++ ++/* ++ * Delete a list entry by making the prev/next entries ++ * point to each other. ++ * ++ * This is only for internal list manipulation where we know ++ * the prev/next entries already! ++ */ ++static inline void __list_del(struct list_head * prev, struct list_head * next) ++{ ++ next->prev = prev; ++ prev->next = next; ++} ++ ++/** ++ * list_del - deletes entry from list. ++ * @entry: the element to delete from the list. ++ * Note: list_empty() on entry does not return true after this, the entry is ++ * in an undefined state. ++ */ ++static inline void list_del(struct list_head *entry) ++{ ++ __list_del(entry->prev, entry->next); ++ entry->next = NULL; ++ entry->prev = NULL; ++} ++ ++/** ++ * list_replace - replace old entry by new one ++ * @old : the element to be replaced ++ * @new : the new element to insert ++ * ++ * If @old was empty, it will be overwritten. ++ */ ++static inline void list_replace(struct list_head *old, ++ struct list_head *new) ++{ ++ new->next = old->next; ++ new->next->prev = new; ++ new->prev = old->prev; ++ new->prev->next = new; ++} ++ ++static inline void list_replace_init(struct list_head *old, ++ struct list_head *new) ++{ ++ list_replace(old, new); ++ INIT_LIST_HEAD(old); ++} ++ ++/** ++ * list_del_init - deletes entry from list and reinitialize it. ++ * @entry: the element to delete from the list. ++ */ ++static inline void list_del_init(struct list_head *entry) ++{ ++ __list_del(entry->prev, entry->next); ++ INIT_LIST_HEAD(entry); ++} ++ ++/** ++ * list_move - delete from one list and add as another's head ++ * @list: the entry to move ++ * @head: the head that will precede our entry ++ */ ++static inline void list_move(struct list_head *list, struct list_head *head) ++{ ++ __list_del(list->prev, list->next); ++ list_add(list, head); ++} ++ ++/** ++ * list_move_tail - delete from one list and add as another's tail ++ * @list: the entry to move ++ * @head: the head that will follow our entry ++ */ ++static inline void list_move_tail(struct list_head *list, ++ struct list_head *head) ++{ ++ __list_del(list->prev, list->next); ++ list_add_tail(list, head); ++} ++ ++/** ++ * list_is_last - tests whether @list is the last entry in list @head ++ * @list: the entry to test ++ * @head: the head of the list ++ */ ++static inline int list_is_last(const struct list_head *list, ++ const struct list_head *head) ++{ ++ return list->next == head; ++} ++ ++/** ++ * list_empty - tests whether a list is empty ++ * @head: the list to test. ++ */ ++static inline int list_empty(const struct list_head *head) ++{ ++ return head->next == head; ++} ++ ++/** ++ * list_empty_careful - tests whether a list is empty and not being modified ++ * @head: the list to test ++ * ++ * Description: ++ * tests whether a list is empty _and_ checks that no other CPU might be ++ * in the process of modifying either member (next or prev) ++ * ++ * NOTE: using list_empty_careful() without synchronization ++ * can only be safe if the only activity that can happen ++ * to the list entry is list_del_init(). Eg. it cannot be used ++ * if another CPU could re-list_add() it. ++ */ ++static inline int list_empty_careful(const struct list_head *head) ++{ ++ struct list_head *next = head->next; ++ return (next == head) && (next == head->prev); ++} ++ ++static inline void __list_splice(struct list_head *list, ++ struct list_head *head) ++{ ++ struct list_head *first = list->next; ++ struct list_head *last = list->prev; ++ struct list_head *at = head->next; ++ ++ first->prev = head; ++ head->next = first; ++ ++ last->next = at; ++ at->prev = last; ++} ++ ++/** ++ * list_splice - join two lists ++ * @list: the new list to add. ++ * @head: the place to add it in the first list. ++ */ ++static inline void list_splice(struct list_head *list, struct list_head *head) ++{ ++ if (!list_empty(list)) ++ __list_splice(list, head); ++} ++ ++/** ++ * list_splice_init - join two lists and reinitialise the emptied list. ++ * @list: the new list to add. ++ * @head: the place to add it in the first list. ++ * ++ * The list at @list is reinitialised ++ */ ++static inline void list_splice_init(struct list_head *list, ++ struct list_head *head) ++{ ++ if (!list_empty(list)) { ++ __list_splice(list, head); ++ INIT_LIST_HEAD(list); ++ } ++} ++ ++/** ++ * list_entry - get the struct for this entry ++ * @ptr: the &struct list_head pointer. ++ * @type: the type of the struct this is embedded in. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_entry(ptr, type, member) \ ++ container_of(ptr, type, member) ++ ++/** ++ * list_first_entry - get the first element from a list ++ * @ptr: the list head to take the element from. ++ * @type: the type of the struct this is embedded in. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Note, that list is expected to be not empty. ++ */ ++#define list_first_entry(ptr, type, member) \ ++ list_entry((ptr)->next, type, member) ++ ++/** ++ * list_for_each - iterate over a list ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @head: the head for your list. ++ */ ++#define list_for_each(pos, head) \ ++ for (pos = (head)->next; pos != (head); \ ++ pos = pos->next) ++ ++/** ++ * __list_for_each - iterate over a list ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @head: the head for your list. ++ * ++ * This variant differs from list_for_each() in that it's the ++ * simplest possible list iteration code, no prefetching is done. ++ * Use this for code that knows the list to be very short (empty ++ * or 1 entry) most of the time. ++ */ ++#define __list_for_each(pos, head) \ ++ for (pos = (head)->next; pos != (head); pos = pos->next) ++ ++/** ++ * list_for_each_prev - iterate over a list backwards ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @head: the head for your list. ++ */ ++#define list_for_each_prev(pos, head) \ ++ for (pos = (head)->prev; pos != (head); \ ++ pos = pos->prev) ++ ++/** ++ * list_for_each_safe - iterate over a list safe against removal of list entry ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @n: another &struct list_head to use as temporary storage ++ * @head: the head for your list. ++ */ ++#define list_for_each_safe(pos, n, head) \ ++ for (pos = (head)->next, n = pos->next; pos != (head); \ ++ pos = n, n = pos->next) ++ ++/** ++ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry ++ * @pos: the &struct list_head to use as a loop cursor. ++ * @n: another &struct list_head to use as temporary storage ++ * @head: the head for your list. ++ */ ++#define list_for_each_prev_safe(pos, n, head) \ ++ for (pos = (head)->prev, n = pos->prev; \ ++ pos != (head); \ ++ pos = n, n = pos->prev) ++ ++/** ++ * list_for_each_entry - iterate over list of given type ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_for_each_entry(pos, head, member) \ ++ for (pos = list_entry((head)->next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.next, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_reverse - iterate backwards over list of given type. ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_for_each_entry_reverse(pos, head, member) \ ++ for (pos = list_entry((head)->prev, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.prev, typeof(*pos), member)) ++ ++/** ++ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() ++ * @pos: the type * to use as a start point ++ * @head: the head of the list ++ * @member: the name of the list_struct within the struct. ++ * ++ * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). ++ */ ++#define list_prepare_entry(pos, head, member) \ ++ ((pos) ? : list_entry(head, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_continue - continue iteration over list of given type ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Continue to iterate over list of given type, continuing after ++ * the current position. ++ */ ++#define list_for_each_entry_continue(pos, head, member) \ ++ for (pos = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.next, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_continue_reverse - iterate backwards from the given point ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Start to iterate over list of given type backwards, continuing after ++ * the current position. ++ */ ++#define list_for_each_entry_continue_reverse(pos, head, member) \ ++ for (pos = list_entry(pos->member.prev, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = list_entry(pos->member.prev, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_from - iterate over list of given type from the current point ++ * @pos: the type * to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate over list of given type, continuing from current position. ++ */ ++#define list_for_each_entry_from(pos, head, member) \ ++ for (; &pos->member != (head); \ ++ pos = list_entry(pos->member.next, typeof(*pos), member)) ++ ++/** ++ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ */ ++#define list_for_each_entry_safe(pos, n, head, member) \ ++ for (pos = list_entry((head)->next, typeof(*pos), member), \ ++ n = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.next, typeof(*n), member)) ++ ++/** ++ * list_for_each_entry_safe_continue ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate over list of given type, continuing after current point, ++ * safe against removal of list entry. ++ */ ++#define list_for_each_entry_safe_continue(pos, n, head, member) \ ++ for (pos = list_entry(pos->member.next, typeof(*pos), member), \ ++ n = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.next, typeof(*n), member)) ++ ++/** ++ * list_for_each_entry_safe_from ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate over list of given type from current point, safe against ++ * removal of list entry. ++ */ ++#define list_for_each_entry_safe_from(pos, n, head, member) \ ++ for (n = list_entry(pos->member.next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.next, typeof(*n), member)) ++ ++/** ++ * list_for_each_entry_safe_reverse ++ * @pos: the type * to use as a loop cursor. ++ * @n: another type * to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the list_struct within the struct. ++ * ++ * Iterate backwards over list of given type, safe against removal ++ * of list entry. ++ */ ++#define list_for_each_entry_safe_reverse(pos, n, head, member) \ ++ for (pos = list_entry((head)->prev, typeof(*pos), member), \ ++ n = list_entry(pos->member.prev, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = n, n = list_entry(n->member.prev, typeof(*n), member)) ++ ++/* ++ * Double linked lists with a single pointer list head. ++ * Mostly useful for hash tables where the two pointer list head is ++ * too wasteful. ++ * You lose the ability to access the tail in O(1). ++ */ ++ ++struct hlist_head { ++ struct hlist_node *first; ++}; ++ ++struct hlist_node { ++ struct hlist_node *next, **pprev; ++}; ++ ++#define HLIST_HEAD_INIT { .first = NULL } ++#define HLIST_HEAD(name) struct hlist_head name = { .first = NULL } ++#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL) ++static inline void INIT_HLIST_NODE(struct hlist_node *h) ++{ ++ h->next = NULL; ++ h->pprev = NULL; ++} ++ ++static inline int hlist_unhashed(const struct hlist_node *h) ++{ ++ return !h->pprev; ++} ++ ++static inline int hlist_empty(const struct hlist_head *h) ++{ ++ return !h->first; ++} ++ ++static inline void __hlist_del(struct hlist_node *n) ++{ ++ struct hlist_node *next = n->next; ++ struct hlist_node **pprev = n->pprev; ++ *pprev = next; ++ if (next) ++ next->pprev = pprev; ++} ++ ++static inline void hlist_del(struct hlist_node *n) ++{ ++ __hlist_del(n); ++ n->next = NULL; ++ n->pprev = NULL; ++} ++ ++static inline void hlist_del_init(struct hlist_node *n) ++{ ++ if (!hlist_unhashed(n)) { ++ __hlist_del(n); ++ INIT_HLIST_NODE(n); ++ } ++} ++ ++ ++static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h) ++{ ++ struct hlist_node *first = h->first; ++ n->next = first; ++ if (first) ++ first->pprev = &n->next; ++ h->first = n; ++ n->pprev = &h->first; ++} ++ ++ ++/* next must be != NULL */ ++static inline void hlist_add_before(struct hlist_node *n, ++ struct hlist_node *next) ++{ ++ n->pprev = next->pprev; ++ n->next = next; ++ next->pprev = &n->next; ++ *(n->pprev) = n; ++} ++ ++static inline void hlist_add_after(struct hlist_node *n, ++ struct hlist_node *next) ++{ ++ next->next = n->next; ++ n->next = next; ++ next->pprev = &n->next; ++ ++ if(next->next) ++ next->next->pprev = &next->next; ++} ++ ++#define hlist_entry(ptr, type, member) container_of(ptr,type,member) ++ ++#define hlist_for_each(pos, head) \ ++ for (pos = (head)->first; pos; pos = pos->next) ++ ++#define hlist_for_each_safe(pos, n, head) \ ++ for (pos = (head)->first; pos; pos = n) ++ ++/** ++ * hlist_for_each_entry - iterate over list of given type ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @head: the head for your list. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry(tpos, pos, head, member) \ ++ for (pos = (head)->first; pos && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = pos->next) ++ ++/** ++ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry_continue(tpos, pos, member) \ ++ for (pos = (pos)->next; pos && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = pos->next) ++ ++/** ++ * hlist_for_each_entry_from - iterate over a hlist continuing from current point ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry_from(tpos, pos, member) \ ++ for (; pos && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = pos->next) ++ ++/** ++ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry ++ * @tpos: the type * to use as a loop cursor. ++ * @pos: the &struct hlist_node to use as a loop cursor. ++ * @n: another &struct hlist_node to use as temporary storage ++ * @head: the head for your list. ++ * @member: the name of the hlist_node within the struct. ++ */ ++#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \ ++ for (pos = (head)->first; \ ++ pos && ({ n = pos->next; 1; }) && \ ++ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ ++ pos = n) ++ ++#endif +diff --git a/feeds/packages/net/wprobe/src/user/wprobe-lib.c b/feeds/packages/net/wprobe/src/user/wprobe-lib.c +new file mode 100644 +index 0000000..7a5460b +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/wprobe-lib.c +@@ -0,0 +1,1210 @@ ++/* ++ * wprobe.c: Wireless probe user space library ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#define _ISOC99_SOURCE ++#define _BSD_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifndef NO_LOCAL_ACCESS ++#include ++#include ++#include ++#endif ++#include "wprobe.h" ++ ++#define DEBUG 1 ++#ifdef DEBUG ++#define DPRINTF(fmt, ...) fprintf(stderr, "%s(%d): " fmt, __func__, __LINE__, ##__VA_ARGS__) ++#else ++#define DPRINTF(fmt, ...) do {} while (0) ++#endif ++ ++#if defined(BYTE_ORDER) && !defined(__BYTE_ORDER) ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#define __BIG_ENDIAN BIG_ENDIAN ++#define __BYTE_ORDER BYTE_ORDER ++#endif ++ ++#ifndef __BYTE_ORDER ++#error Unknown endian type ++#endif ++ ++#define WPROBE_MAX_MSGLEN 65536 ++ ++static inline __u16 __swab16(__u16 x) ++{ ++ return x<<8 | x>>8; ++} ++ ++static inline __u32 __swab32(__u32 x) ++{ ++ return x<<24 | x>>24 | ++ (x & (__u32)0x0000ff00UL)<<8 | ++ (x & (__u32)0x00ff0000UL)>>8; ++} ++ ++static inline __u64 __swab64(__u64 x) ++{ ++ return x<<56 | x>>56 | ++ (x & (__u64)0x000000000000ff00ULL)<<40 | ++ (x & (__u64)0x0000000000ff0000ULL)<<24 | ++ (x & (__u64)0x00000000ff000000ULL)<< 8 | ++ (x & (__u64)0x000000ff00000000ULL)>> 8 | ++ (x & (__u64)0x0000ff0000000000ULL)>>24 | ++ (x & (__u64)0x00ff000000000000ULL)>>40; ++} ++ ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++#define SWAP16(var) var = __swab16(var) ++#define SWAP32(var) var = __swab32(var) ++#define SWAP64(var) var = __swab64(var) ++#else ++#define SWAP16(var) do {} while(0) ++#define SWAP32(var) do {} while(0) ++#define SWAP64(var) do {} while(0) ++#endif ++ ++int wprobe_port = 17990; ++static struct nlattr *tb[WPROBE_ATTR_LAST+1]; ++static struct nla_policy attribute_policy[WPROBE_ATTR_LAST+1] = { ++ [WPROBE_ATTR_ID] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_MAC] = { .type = NLA_UNSPEC, .minlen = 6, .maxlen = 6 }, ++ [WPROBE_ATTR_NAME] = { .type = NLA_STRING }, ++ [WPROBE_ATTR_FLAGS] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_TYPE] = { .type = NLA_U8 }, ++ [WPROBE_ATTR_FLAGS] = { .type = NLA_U32 }, ++ [WPROBE_VAL_S8] = { .type = NLA_U8 }, ++ [WPROBE_VAL_S16] = { .type = NLA_U16 }, ++ [WPROBE_VAL_S32] = { .type = NLA_U32 }, ++ [WPROBE_VAL_S64] = { .type = NLA_U64 }, ++ [WPROBE_VAL_U8] = { .type = NLA_U8 }, ++ [WPROBE_VAL_U16] = { .type = NLA_U16 }, ++ [WPROBE_VAL_U32] = { .type = NLA_U32 }, ++ [WPROBE_VAL_U64] = { .type = NLA_U64 }, ++ [WPROBE_VAL_SUM] = { .type = NLA_U64 }, ++ [WPROBE_VAL_SUM_SQ] = { .type = NLA_U64 }, ++ [WPROBE_VAL_SAMPLES] = { .type = NLA_U32 }, ++ [WPROBE_VAL_SCALE_TIME] = { .type = NLA_U64 }, ++ [WPROBE_ATTR_INTERVAL] = { .type = NLA_U64 }, ++ [WPROBE_ATTR_SAMPLES_MIN] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_MAX] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_M] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_SAMPLES_SCALE_D] = { .type = NLA_U32 }, ++ [WPROBE_ATTR_FILTER_GROUP] = { .type = NLA_NESTED }, ++ [WPROBE_ATTR_RXCOUNT] = { .type = NLA_U64 }, ++ [WPROBE_ATTR_TXCOUNT] = { .type = NLA_U64 }, ++}; ++ ++typedef int (*wprobe_cb_t)(struct nl_msg *, void *); ++ ++struct wprobe_iface_ops { ++ int (*send_msg)(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t cb, void *arg); ++ void (*free)(struct wprobe_iface *dev); ++}; ++ ++struct wprobe_attr_cb { ++ struct list_head *list; ++ char *addr; ++}; ++ ++#define WPROBE_MAGIC_STR "WPROBE" ++struct wprobe_init_hdr { ++ struct { ++ char magic[sizeof(WPROBE_MAGIC_STR)]; ++ ++ /* protocol version */ ++ uint8_t version; ++ ++ /* extra header length (unused for now) */ ++ uint16_t extra; ++ } pre __attribute__((packed)); ++ union { ++ struct { ++ uint16_t genl_family; ++ } v0 __attribute__((packed)); ++ }; ++} __attribute__((packed)); ++ ++struct wprobe_msg_hdr { ++ __u16 status; ++ __u16 error; ++ __u32 len; ++}; ++ ++enum wprobe_resp_status { ++ WPROBE_MSG_DONE = 0, ++ WPROBE_MSG_DATA = 1, ++}; ++ ++static inline void ++wprobe_swap_msg_hdr(struct wprobe_msg_hdr *mhdr) ++{ ++ SWAP16(mhdr->status); ++ SWAP16(mhdr->error); ++ SWAP32(mhdr->len); ++} ++ ++static int ++save_attribute_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ const char *name = "N/A"; ++ struct wprobe_attribute *attr; ++ int type = 0; ++ struct wprobe_attr_cb *cb = arg; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (tb[WPROBE_ATTR_NAME]) ++ name = nla_data(tb[WPROBE_ATTR_NAME]); ++ ++ attr = malloc(sizeof(struct wprobe_attribute) + strlen(name) + 1); ++ if (!attr) ++ return -1; ++ ++ memset(attr, 0, sizeof(struct wprobe_attribute)); ++ ++ if (tb[WPROBE_ATTR_ID]) ++ attr->id = nla_get_u32(tb[WPROBE_ATTR_ID]); ++ ++ if (tb[WPROBE_ATTR_MAC] && cb->addr) ++ memcpy(cb->addr, nla_data(tb[WPROBE_ATTR_MAC]), 6); ++ ++ if (tb[WPROBE_ATTR_FLAGS]) ++ attr->flags = nla_get_u32(tb[WPROBE_ATTR_FLAGS]); ++ ++ if (tb[WPROBE_ATTR_TYPE]) ++ type = nla_get_u8(tb[WPROBE_ATTR_TYPE]); ++ ++ if ((type < WPROBE_VAL_STRING) || ++ (type > WPROBE_VAL_U64)) ++ type = 0; ++ ++ attr->type = type; ++ strcpy(attr->name, name); ++ INIT_LIST_HEAD(&attr->list); ++ list_add(&attr->list, cb->list); ++ return 0; ++} ++ ++static struct nl_msg * ++wprobe_new_msg(struct wprobe_iface *dev, int cmd, bool dump) ++{ ++ struct nl_msg *msg; ++ uint32_t flags = 0; ++ ++ msg = nlmsg_alloc_size(65536); ++ if (!msg) ++ return NULL; ++ ++ if (dump) ++ flags |= NLM_F_DUMP; ++ ++ genlmsg_put(msg, 0, 0, dev->genl_family, ++ 0, flags, cmd, 0); ++ ++ NLA_PUT_STRING(msg, WPROBE_ATTR_INTERFACE, dev->ifname); ++nla_put_failure: ++ return msg; ++} ++ ++ ++static int ++dump_attributes(struct wprobe_iface *dev, bool link, struct list_head *list, char *addr) ++{ ++ struct nl_msg *msg; ++ struct wprobe_attr_cb cb; ++ ++ cb.list = list; ++ cb.addr = addr; ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_LIST, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ if (link) ++ NLA_PUT(msg, WPROBE_ATTR_MAC, 6, "\x00\x00\x00\x00\x00\x00"); ++ ++ return dev->ops->send_msg(dev, msg, save_attribute_handler, &cb); ++ ++nla_put_failure: ++ nlmsg_free(msg); ++ return -EINVAL; ++} ++ ++static struct wprobe_iface * ++wprobe_alloc_dev(void) ++{ ++ struct wprobe_iface *dev; ++ ++ dev = malloc(sizeof(struct wprobe_iface)); ++ if (!dev) ++ return NULL; ++ ++ memset(dev, 0, sizeof(struct wprobe_iface)); ++ ++ dev->interval = -1; ++ dev->scale_min = -1; ++ dev->scale_max = -1; ++ dev->scale_m = -1; ++ dev->scale_d = -1; ++ dev->sockfd = -1; ++ ++ INIT_LIST_HEAD(&dev->global_attr); ++ INIT_LIST_HEAD(&dev->link_attr); ++ INIT_LIST_HEAD(&dev->links); ++ return dev; ++} ++ ++static int ++wprobe_init_dev(struct wprobe_iface *dev) ++{ ++ dump_attributes(dev, false, &dev->global_attr, NULL); ++ dump_attributes(dev, true, &dev->link_attr, NULL); ++ return 0; ++} ++ ++#ifndef NO_LOCAL_ACCESS ++static int n_devs = 0; ++static struct nl_sock *handle = NULL; ++static struct nl_cache *cache = NULL; ++static struct genl_family *family = NULL; ++ ++static int ++error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg) ++{ ++ int *ret = arg; ++ *ret = err->error; ++ return NL_STOP; ++} ++ ++static int ++finish_handler(struct nl_msg *msg, void *arg) ++{ ++ int *ret = arg; ++ *ret = 0; ++ return NL_SKIP; ++} ++ ++static int ++ack_handler(struct nl_msg *msg, void *arg) ++{ ++ int *ret = arg; ++ *ret = 0; ++ return NL_STOP; ++} ++ ++static void ++wprobe_local_free(struct wprobe_iface *dev) ++{ ++ /* should not happen */ ++ if (n_devs == 0) ++ return; ++ ++ if (--n_devs != 0) ++ return; ++ ++ if (cache) ++ nl_cache_free(cache); ++ if (handle) ++ nl_socket_free(handle); ++ handle = NULL; ++ cache = NULL; ++} ++ ++static int ++wprobe_local_init(void) ++{ ++ int ret; ++ ++ if (n_devs++ > 0) ++ return 0; ++ ++ handle = nl_socket_alloc(); ++ if (!handle) { ++ DPRINTF("Failed to create handle\n"); ++ goto err; ++ } ++ ++ if (genl_connect(handle)) { ++ DPRINTF("Failed to connect to generic netlink\n"); ++ goto err; ++ } ++ ++ ret = genl_ctrl_alloc_cache(handle, &cache); ++ if (ret < 0) { ++ DPRINTF("Failed to allocate netlink cache\n"); ++ goto err; ++ } ++ ++ family = genl_ctrl_search_by_name(cache, "wprobe"); ++ if (!family) { ++ DPRINTF("wprobe API not present\n"); ++ goto err; ++ } ++ return 0; ++ ++err: ++ wprobe_local_free(NULL); ++ return -EINVAL; ++} ++ ++ ++static int ++wprobe_local_send_msg(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t callback, void *arg) ++{ ++ struct nl_cb *cb; ++ int err = 0; ++ ++ cb = nl_cb_alloc(NL_CB_DEFAULT); ++ if (!cb) ++ goto out_no_cb; ++ ++ if (callback) ++ nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, callback, arg); ++ ++ err = nl_send_auto_complete(handle, msg); ++ if (err < 0) ++ goto out; ++ ++ err = 1; ++ ++ nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err); ++ nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err); ++ nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err); ++ ++ while (err > 0) ++ nl_recvmsgs(handle, cb); ++ ++out: ++ nl_cb_put(cb); ++out_no_cb: ++ nlmsg_free(msg); ++ return err; ++} ++ ++static const struct wprobe_iface_ops wprobe_local_ops = { ++ .send_msg = wprobe_local_send_msg, ++ .free = wprobe_local_free, ++}; ++ ++struct wprobe_iface * ++wprobe_get_dev(const char *ifname) ++{ ++ struct wprobe_iface *dev; ++ ++ if (wprobe_local_init() != 0) ++ return NULL; ++ ++ dev = wprobe_alloc_dev(); ++ if (!dev) ++ goto error_alloc; ++ ++ dev->ifname = strdup(ifname); ++ dev->ops = &wprobe_local_ops; ++ dev->genl_family = genl_family_get_id(family); ++ ++ if (wprobe_init_dev(dev) < 0) ++ goto error; ++ ++ return dev; ++ ++error: ++ free(dev); ++error_alloc: ++ wprobe_local_free(NULL); ++ return NULL; ++} ++ ++#endif ++ ++static void swap_nlmsghdr(struct nlmsghdr *nlh) ++{ ++ SWAP32(nlh->nlmsg_len); ++ SWAP16(nlh->nlmsg_type); ++ SWAP16(nlh->nlmsg_flags); ++ SWAP32(nlh->nlmsg_seq); ++ SWAP32(nlh->nlmsg_pid); ++} ++ ++static void swap_genlmsghdr(struct genlmsghdr *gnlh) ++{ ++#if 0 /* probably unnecessary */ ++ SWAP16(gnlh->reserved); ++#endif ++} ++ ++static void ++wprobe_swap_nested(void *data, int len, bool outgoing) ++{ ++ void *end = data + len; ++ ++ while (data < end) { ++ struct nlattr *nla = data; ++ unsigned int type, len; ++ ++ if (!outgoing) { ++ SWAP16(nla->nla_len); ++ SWAP16(nla->nla_type); ++ ++ /* required for further sanity checks */ ++ if (data + nla->nla_len > end) ++ nla->nla_len = end - data; ++ } ++ ++ len = NLA_ALIGN(nla->nla_len); ++ type = nla->nla_type & NLA_TYPE_MASK; ++ ++ if (type <= WPROBE_ATTR_LAST) { ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++ switch(attribute_policy[type].type) { ++ case NLA_U16: ++ SWAP16(*(__u16 *)nla_data(nla)); ++ break; ++ case NLA_U32: ++ SWAP32(*(__u32 *)nla_data(nla)); ++ break; ++ case NLA_U64: ++ SWAP64(*(__u64 *)nla_data(nla)); ++ break; ++ case NLA_NESTED: ++ wprobe_swap_nested(nla_data(nla), nla_len(nla), outgoing); ++ break; ++ } ++#endif ++ } ++ data += len; ++ ++ if (outgoing) { ++ SWAP16(nla->nla_len); ++ SWAP16(nla->nla_type); ++ } ++ if (!nla->nla_len) ++ break; ++ } ++} ++ ++static struct nl_msg * ++wprobe_msg_from_network(int socket, int len) ++{ ++ struct genlmsghdr *gnlh; ++ struct nlmsghdr *nlh; ++ struct nl_msg *msg; ++ void *data; ++ ++ msg = nlmsg_alloc_size(len + 32); ++ if (!msg) ++ return NULL; ++ ++ nlh = nlmsg_hdr(msg); ++ if (read(socket, nlh, len) != len) ++ goto free; ++ ++ swap_nlmsghdr(nlh); ++ if (nlh->nlmsg_len > len) ++ goto free; ++ ++ gnlh = nlmsg_data(nlh); ++ swap_genlmsghdr(gnlh); ++ ++ data = genlmsg_data(gnlh); ++ wprobe_swap_nested(data, genlmsg_len(gnlh), false); ++ ++ return msg; ++free: ++ nlmsg_free(msg); ++ return NULL; ++} ++ ++static int ++wprobe_msg_to_network(int socket, struct nl_msg *msg) ++{ ++ struct nlmsghdr *nlh = nlmsg_hdr(msg); ++ struct wprobe_msg_hdr mhdr; ++ struct genlmsghdr *gnlh; ++ void *buf, *data; ++ int buflen, datalen; ++ int ret; ++ ++ buflen = nlh->nlmsg_len; ++ buf = malloc(buflen); ++ if (!buf) ++ return -ENOMEM; ++ ++ memset(&mhdr, 0, sizeof(mhdr)); ++ mhdr.status = WPROBE_MSG_DATA; ++ mhdr.len = buflen; ++ wprobe_swap_msg_hdr(&mhdr); ++ ret = write(socket, &mhdr, sizeof(mhdr)); ++ if (ret < 0) ++ goto out; ++ ++ memcpy(buf, nlh, buflen); ++ nlh = buf; ++ gnlh = nlmsg_data(nlh); ++ data = genlmsg_data(gnlh); ++ datalen = genlmsg_len(gnlh); ++ ++ wprobe_swap_nested(data, datalen, true); ++ swap_genlmsghdr(gnlh); ++ swap_nlmsghdr(nlh); ++ ret = write(socket, buf, buflen); ++ ++out: ++ free(buf); ++ ++ return ret; ++} ++ ++static int ++wprobe_remote_send_msg(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t callback, void *arg) ++{ ++ struct wprobe_msg_hdr mhdr; ++ int msgs = 0; ++ ++ wprobe_msg_to_network(dev->sockfd, msg); ++ nlmsg_free(msg); ++ do { ++ if (read(dev->sockfd, &mhdr, sizeof(mhdr)) != sizeof(mhdr)) { ++ DPRINTF("Failed to read response header\n"); ++ return -1; ++ } ++ wprobe_swap_msg_hdr(&mhdr); ++ ++ switch(mhdr.status) { ++ case WPROBE_MSG_DATA: ++ if (mhdr.len > WPROBE_MAX_MSGLEN) { ++ fprintf(stderr, "Invalid length in received response message.\n"); ++ exit(1); ++ } ++ ++ msg = wprobe_msg_from_network(dev->sockfd, mhdr.len); ++ if (!msg) ++ return -EINVAL; ++ ++ msgs++; ++ callback(msg, arg); ++ nlmsg_free(msg); ++ break; ++ } ++ } while (mhdr.status != WPROBE_MSG_DONE); ++ ++ if (mhdr.error) ++ return -mhdr.error; ++ else ++ return msgs; ++} ++ ++ ++static void ++wprobe_socket_dev_free(struct wprobe_iface *dev) ++{ ++ if (dev->sockfd >= 0) ++ close(dev->sockfd); ++} ++ ++static const struct wprobe_iface_ops wprobe_remote_ops = { ++ .send_msg = wprobe_remote_send_msg, ++ .free = wprobe_socket_dev_free, ++}; ++ ++ ++#ifndef NO_LOCAL_ACCESS ++int ++wprobe_server_init(int socket) ++{ ++ struct wprobe_init_hdr hdr; ++ int ret; ++ ++ ret = wprobe_local_init(); ++ if (ret != 0) ++ return ret; ++ ++ memset(&hdr, 0, sizeof(hdr)); ++ memcpy(hdr.pre.magic, WPROBE_MAGIC_STR, sizeof(WPROBE_MAGIC_STR)); ++ hdr.pre.version = 0; ++ hdr.v0.genl_family = genl_family_get_id(family); ++ SWAP16(hdr.v0.genl_family); ++ write(socket, (unsigned char *)&hdr, sizeof(hdr)); ++ ++ return 0; ++} ++ ++static int ++wprobe_server_cb(struct nl_msg *msg, void *arg) ++{ ++ int *socket = arg; ++ int ret; ++ ++ ret = wprobe_msg_to_network(*socket, msg); ++ if (ret > 0) ++ ret = 0; ++ ++ return ret; ++} ++ ++ ++int ++wprobe_server_handle(int socket) ++{ ++ struct wprobe_msg_hdr mhdr; ++ struct nl_msg *msg; ++ int ret; ++ ++ ret = read(socket, &mhdr, sizeof(mhdr)); ++ if (ret != sizeof(mhdr)) { ++ if (ret <= 0) ++ return -1; ++ ++ DPRINTF("Failed to read request header\n"); ++ return -EINVAL; ++ } ++ wprobe_swap_msg_hdr(&mhdr); ++ ++ switch(mhdr.status) { ++ case WPROBE_MSG_DATA: ++ if (mhdr.len > WPROBE_MAX_MSGLEN) { ++ DPRINTF("Invalid length in received response message.\n"); ++ return -EINVAL; ++ } ++ msg = wprobe_msg_from_network(socket, mhdr.len); ++ break; ++ default: ++ DPRINTF("Invalid request header type\n"); ++ return -ENOENT; ++ } ++ ++ if (!msg) { ++ DPRINTF("Failed to get message\n"); ++ return -EINVAL; ++ } ++ ++ ret = wprobe_local_send_msg(NULL, msg, wprobe_server_cb, &socket); ++ ++ memset(&mhdr, 0, sizeof(mhdr)); ++ mhdr.status = WPROBE_MSG_DONE; ++ if (ret < 0) ++ mhdr.error = (uint16_t) -ret; ++ ++ ret = write(socket, (unsigned char *)&mhdr, sizeof(mhdr)); ++ if (ret > 0) ++ ret = 0; ++ ++ return ret; ++} ++ ++void ++wprobe_server_done(void) ++{ ++ wprobe_local_free(NULL); ++} ++#endif ++ ++struct wprobe_iface * ++wprobe_get_from_socket(int socket, const char *name) ++{ ++ struct wprobe_iface *dev; ++ struct wprobe_init_hdr hdr; ++ ++ dev = wprobe_alloc_dev(); ++ if (!dev) ++ goto out; ++ ++ dev->ops = &wprobe_remote_ops; ++ dev->sockfd = socket; ++ dev->ifname = strdup(name); ++ ++ /* read version and header length */ ++ if (read(socket, &hdr.pre, sizeof(hdr.pre)) != sizeof(hdr.pre)) { ++ DPRINTF("Could not read header\n"); ++ goto error; ++ } ++ ++ /* magic not found */ ++ if (memcmp(hdr.pre.magic, WPROBE_MAGIC_STR, sizeof(hdr.pre.magic)) != 0) { ++ DPRINTF("Magic does not match\n"); ++ goto error; ++ } ++ ++ /* unsupported version */ ++ if (hdr.pre.version != 0) { ++ DPRINTF("Protocol version does not match\n"); ++ goto error; ++ } ++ ++ if (read(socket, &hdr.v0, sizeof(hdr.v0)) != sizeof(hdr.v0)) { ++ DPRINTF("Could not read header data\n"); ++ goto error; ++ } ++ ++ SWAP16(hdr.pre.extra); ++ SWAP16(hdr.v0.genl_family); ++ dev->genl_family = hdr.v0.genl_family; ++ ++ if (wprobe_init_dev(dev) < 0) { ++ DPRINTF("Could not initialize device\n"); ++ goto error; ++ } ++ ++out: ++ return dev; ++ ++error: ++ wprobe_free_dev(dev); ++ return NULL; ++} ++ ++struct wprobe_iface * ++wprobe_get_auto(const char *arg, char **err) ++{ ++ static struct sockaddr_in sa; ++ static char errbuf[512]; ++ ++ struct wprobe_iface *dev = NULL; ++ struct hostent *h; ++ char *devstr = strdup(arg); ++ char *sep = NULL; ++ int sock = -1; ++ int len; ++ ++ if (err) ++ *err = NULL; ++ ++ sep = strchr(devstr, ':'); ++ if (!sep) { ++#ifndef NO_LOCAL_ACCESS ++ free(devstr); ++ return wprobe_get_dev(arg); ++#else ++ if (err) ++ *err = "Invalid argument"; ++ goto out; ++#endif ++ } ++ ++ *sep = 0; ++ sep++; ++ ++ sock = socket(AF_INET, SOCK_STREAM, 0); ++ if (sock < 0) ++ goto syserr; ++ ++ h = gethostbyname(devstr); ++ if (!h) { ++ sprintf(errbuf, "Host not found"); ++ goto out_err; ++ } ++ ++ memcpy(&sa.sin_addr, h->h_addr, h->h_length); ++ sa.sin_family = AF_INET; ++ sa.sin_port = htons(wprobe_port); ++ if (connect(sock, (struct sockaddr *)&sa, sizeof(sa)) < 0) ++ goto syserr; ++ ++ dev = wprobe_get_from_socket(sock, sep); ++ if (!dev) { ++ sprintf(errbuf, "wprobe connection initialization failed"); ++ goto out_err; ++ } ++ goto out; ++ ++syserr: ++ if (err) { ++ strcpy(errbuf, "Connection failed: "); ++ len = strlen(errbuf); ++ strerror_r(errno, errbuf + len, sizeof(errbuf) - len - 1); ++ } ++out_err: ++ if (err) ++ *err = errbuf; ++ if (sock >= 0) ++ close(sock); ++out: ++ if (devstr) ++ free(devstr); ++ return dev; ++} ++ ++static void ++free_attr_list(struct list_head *list) ++{ ++ struct wprobe_attribute *attr, *tmp; ++ ++ list_for_each_entry_safe(attr, tmp, list, list) { ++ list_del(&attr->list); ++ free(attr); ++ } ++} ++ ++void ++wprobe_free_dev(struct wprobe_iface *dev) ++{ ++ if (dev->ops->free) ++ dev->ops->free(dev); ++ free_attr_list(&dev->global_attr); ++ free_attr_list(&dev->link_attr); ++ free((void *)dev->ifname); ++ free(dev); ++} ++ ++static struct wprobe_link * ++get_link(struct list_head *list, const char *addr) ++{ ++ struct wprobe_link *l; ++ ++ list_for_each_entry(l, list, list) { ++ if (!memcmp(l->addr, addr, 6)) { ++ list_del_init(&l->list); ++ goto out; ++ } ++ } ++ ++ /* no previous link found, allocate a new one */ ++ l = malloc(sizeof(struct wprobe_link)); ++ if (!l) ++ goto out; ++ ++ memset(l, 0, sizeof(struct wprobe_link)); ++ memcpy(l->addr, addr, sizeof(l->addr)); ++ INIT_LIST_HEAD(&l->list); ++ ++out: ++ return l; ++} ++ ++struct wprobe_save_cb { ++ struct list_head *list; ++ struct list_head old_list; ++}; ++ ++static int ++save_link_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ struct wprobe_link *link; ++ struct wprobe_save_cb *cb = arg; ++ const char *addr; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_MAC] || (nla_len(tb[WPROBE_ATTR_MAC]) != 6)) ++ return -1; ++ ++ addr = nla_data(tb[WPROBE_ATTR_MAC]); ++ link = get_link(&cb->old_list, addr); ++ if (!link) ++ return -1; ++ ++ if (tb[WPROBE_ATTR_FLAGS]) ++ link->flags = nla_get_u32(tb[WPROBE_ATTR_FLAGS]); ++ ++ list_add_tail(&link->list, cb->list); ++ return 0; ++} ++ ++ ++int ++wprobe_update_links(struct wprobe_iface *dev) ++{ ++ struct wprobe_link *l, *tmp; ++ struct nl_msg *msg; ++ struct wprobe_save_cb cb; ++ int err; ++ ++ INIT_LIST_HEAD(&cb.old_list); ++ list_splice_init(&dev->links, &cb.old_list); ++ cb.list = &dev->links; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_LINKS, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ err = dev->ops->send_msg(dev, msg, save_link_handler, &cb); ++ if (err < 0) ++ return err; ++ ++ list_for_each_entry_safe(l, tmp, &cb.old_list, list) { ++ list_del(&l->list); ++ free(l); ++ } ++ ++ return 0; ++} ++ ++ ++struct wprobe_filter_data ++{ ++ wprobe_filter_cb cb; ++ void *arg; ++ struct wprobe_filter_item *buf; ++ int buflen; ++}; ++ ++static int ++dump_filter_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ struct wprobe_filter_data *data = arg; ++ struct nlattr *p; ++ const char *name; ++ int count = 0; ++ int len; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_NAME] || !tb[WPROBE_ATTR_FILTER_GROUP]) ++ return -1; ++ ++ name = nla_data(tb[WPROBE_ATTR_NAME]); ++ nla_for_each_nested(p, tb[WPROBE_ATTR_FILTER_GROUP], len) { ++ count++; ++ } ++ ++ if (data->buflen < count) { ++ if (data->buf) ++ free(data->buf); ++ data->buflen = count; ++ data->buf = malloc(sizeof(struct wprobe_filter_item) * count); ++ memset(data->buf, 0, sizeof(struct wprobe_filter_item) * count); ++ } ++ ++ count = 0; ++ nla_for_each_nested(p, tb[WPROBE_ATTR_FILTER_GROUP], len) { ++ struct wprobe_filter_item *fi; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, nla_data(p), ++ nla_len(p), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_NAME] || !tb[WPROBE_ATTR_RXCOUNT] ++ || !tb[WPROBE_ATTR_TXCOUNT]) ++ continue; ++ ++ fi = &data->buf[count++]; ++ strncpy(fi->name, nla_data(tb[WPROBE_ATTR_NAME]), sizeof(fi->name) - 1); ++ fi->name[sizeof(fi->name) - 1] = 0; ++ fi->rx = nla_get_u64(tb[WPROBE_ATTR_RXCOUNT]); ++ fi->tx = nla_get_u64(tb[WPROBE_ATTR_TXCOUNT]); ++ } ++ data->cb(data->arg, name, data->buf, count); ++ ++ return 0; ++} ++ ++int ++wprobe_dump_filters(struct wprobe_iface *dev, wprobe_filter_cb cb, void *arg) ++{ ++ struct wprobe_filter_data data; ++ struct nl_msg *msg; ++ int err; ++ ++ data.buf = 0; ++ data.buflen = 0; ++ data.cb = cb; ++ data.arg = arg; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_FILTER, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ err = dev->ops->send_msg(dev, msg, dump_filter_handler, &data); ++ if (err < 0) ++ return err; ++ ++ return 0; ++} ++ ++int ++wprobe_apply_config(struct wprobe_iface *dev) ++{ ++ struct nl_msg *msg; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_CONFIG, false); ++ if (!msg) ++ return -ENOMEM; ++ ++ if (dev->interval >= 0) ++ NLA_PUT_MSECS(msg, WPROBE_ATTR_INTERVAL, dev->interval); ++ ++ if (dev->filter_len < 0) { ++ NLA_PUT(msg, WPROBE_ATTR_FILTER, 0, NULL); ++ dev->filter_len = 0; ++ } else if (dev->filter && dev->filter_len > 0) { ++ NLA_PUT(msg, WPROBE_ATTR_FILTER, dev->filter_len, dev->filter); ++ } ++ dev->filter = NULL; ++ ++ dev->ops->send_msg(dev, msg, NULL, NULL); ++ return 0; ++ ++nla_put_failure: ++ nlmsg_free(msg); ++ return -ENOMEM; ++} ++ ++int ++wprobe_measure(struct wprobe_iface *dev) ++{ ++ struct nl_msg *msg; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_MEASURE, false); ++ if (!msg) ++ return -ENOMEM; ++ ++ dev->ops->send_msg(dev, msg, NULL, NULL); ++ return 0; ++} ++ ++struct wprobe_request_cb { ++ struct list_head *list; ++ struct list_head old_list; ++ char *addr; ++}; ++ ++static int ++save_attrdata_handler(struct nl_msg *msg, void *arg) ++{ ++ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); ++ struct wprobe_request_cb *cb = arg; ++ struct wprobe_attribute *attr; ++ int type, id; ++ ++ nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0), ++ genlmsg_attrlen(gnlh, 0), attribute_policy); ++ ++ if (!tb[WPROBE_ATTR_ID]) ++ return -1; ++ ++ if (!tb[WPROBE_ATTR_TYPE]) ++ return -1; ++ ++ id = nla_get_u32(tb[WPROBE_ATTR_ID]); ++ list_for_each_entry(attr, &cb->old_list, list) { ++ if (attr->id == id) ++ goto found; ++ } ++ /* not found */ ++ return -1; ++ ++found: ++ list_del_init(&attr->list); ++ ++ type = nla_get_u8(tb[WPROBE_ATTR_TYPE]); ++ if (type != attr->type) { ++ DPRINTF("WARNING: type mismatch for %s attribute '%s' (%d != %d)\n", ++ (cb->addr ? "link" : "global"), ++ attr->name, ++ type, attr->type); ++ goto out; ++ } ++ ++ if ((type < WPROBE_VAL_STRING) || ++ (type > WPROBE_VAL_U64)) ++ goto out; ++ ++ memset(&attr->val, 0, sizeof(attr->val)); ++ ++#define HANDLE_INT_TYPE(_idx, _type) \ ++ case WPROBE_VAL_S##_type: \ ++ case WPROBE_VAL_U##_type: \ ++ attr->val.U##_type = nla_get_u##_type(tb[_idx]); \ ++ break ++ ++ switch(type) { ++ HANDLE_INT_TYPE(type, 8); ++ HANDLE_INT_TYPE(type, 16); ++ HANDLE_INT_TYPE(type, 32); ++ HANDLE_INT_TYPE(type, 64); ++ case WPROBE_VAL_STRING: ++ /* unimplemented */ ++ break; ++ } ++#undef HANDLE_TYPE ++ ++ if (attr->flags & WPROBE_F_KEEPSTAT) { ++ if (tb[WPROBE_VAL_SUM]) ++ attr->val.s = nla_get_u64(tb[WPROBE_VAL_SUM]); ++ ++ if (tb[WPROBE_VAL_SUM_SQ]) ++ attr->val.ss = nla_get_u64(tb[WPROBE_VAL_SUM_SQ]); ++ ++ if (tb[WPROBE_VAL_SAMPLES]) ++ attr->val.n = nla_get_u32(tb[WPROBE_VAL_SAMPLES]); ++ ++ if (attr->val.n > 0) { ++ float avg = ((float) attr->val.s) / attr->val.n; ++ float stdev = sqrt((((float) attr->val.ss) / attr->val.n) - (avg * avg)); ++ if (isnan(stdev)) ++ stdev = 0.0f; ++ if (isnan(avg)) ++ avg = 0.0f; ++ attr->val.avg = avg; ++ attr->val.stdev = stdev; ++ } ++ } ++ ++out: ++ list_add_tail(&attr->list, cb->list); ++ return 0; ++} ++ ++ ++int ++wprobe_request_data(struct wprobe_iface *dev, const unsigned char *addr) ++{ ++ struct wprobe_request_cb cb; ++ struct list_head *attrs; ++ struct nl_msg *msg; ++ int err; ++ ++ msg = wprobe_new_msg(dev, WPROBE_CMD_GET_INFO, true); ++ if (!msg) ++ return -ENOMEM; ++ ++ if (addr) { ++ attrs = &dev->link_attr; ++ NLA_PUT(msg, WPROBE_ATTR_MAC, 6, addr); ++ } else { ++ attrs = &dev->global_attr; ++ } ++ ++ INIT_LIST_HEAD(&cb.old_list); ++ list_splice_init(attrs, &cb.old_list); ++ cb.list = attrs; ++ ++ err = dev->ops->send_msg(dev, msg, save_attrdata_handler, &cb); ++ list_splice(&cb.old_list, attrs->prev); ++ return err; ++ ++nla_put_failure: ++ nlmsg_free(msg); ++ return -ENOMEM; ++} ++ ++ +diff --git a/feeds/packages/net/wprobe/src/user/wprobe-util.c b/feeds/packages/net/wprobe/src/user/wprobe-util.c +new file mode 100644 +index 0000000..654442f +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/wprobe-util.c +@@ -0,0 +1,450 @@ ++/* ++ * wprobe-test.c: Wireless probe user space test code ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include "wprobe.h" ++ ++static bool simple_mode = false; ++ ++static const char * ++wprobe_dump_value(struct wprobe_attribute *attr) ++{ ++ static char buf[128]; ++ ++#define HANDLE_TYPE(_type, _format) \ ++ case WPROBE_VAL_##_type: \ ++ snprintf(buf, sizeof(buf), _format, attr->val._type); \ ++ break ++ ++ switch(attr->type) { ++ HANDLE_TYPE(S8, "%d"); ++ HANDLE_TYPE(S16, "%d"); ++ HANDLE_TYPE(S32, "%d"); ++ HANDLE_TYPE(S64, "%lld"); ++ HANDLE_TYPE(U8, "%d"); ++ HANDLE_TYPE(U16, "%d"); ++ HANDLE_TYPE(U32, "%d"); ++ HANDLE_TYPE(U64, "%lld"); ++ case WPROBE_VAL_STRING: ++ /* FIXME: implement this */ ++ default: ++ strncpy(buf, "", sizeof(buf)); ++ break; ++ } ++ if ((attr->flags & WPROBE_F_KEEPSTAT) && ++ (attr->val.n > 0)) { ++ int len = strlen(buf); ++ if (simple_mode) ++ snprintf(buf + len, sizeof(buf) - len, ";%.02f;%.02f;%d;%lld;%lld", attr->val.avg, attr->val.stdev, attr->val.n, attr->val.s, attr->val.ss); ++ else ++ snprintf(buf + len, sizeof(buf) - len, " (avg: %.02f; stdev: %.02f, n=%d)", attr->val.avg, attr->val.stdev, attr->val.n); ++ } ++#undef HANDLE_TYPE ++ ++ return buf; ++} ++ ++ ++static void ++wprobe_dump_data(struct wprobe_iface *dev) ++{ ++ struct wprobe_attribute *attr; ++ struct wprobe_link *link; ++ bool first = true; ++ ++ if (!simple_mode) ++ fprintf(stdout, "\n"); ++ wprobe_request_data(dev, NULL); ++ list_for_each_entry(attr, &dev->global_attr, list) { ++ if (simple_mode) { ++ if (first) ++ fprintf(stdout, "[global]\n"); ++ fprintf(stdout, "%s=%s\n", attr->name, wprobe_dump_value(attr)); ++ } else { ++ fprintf(stdout, (first ? ++ "Global: %s=%s\n" : ++ " %s=%s\n"), ++ attr->name, ++ wprobe_dump_value(attr) ++ ); ++ } ++ first = false; ++ } ++ ++ list_for_each_entry(link, &dev->links, list) { ++ first = true; ++ wprobe_request_data(dev, link->addr); ++ list_for_each_entry(attr, &dev->link_attr, list) { ++ if (first) { ++ fprintf(stdout, ++ (simple_mode ? ++ "[%02x:%02x:%02x:%02x:%02x:%02x]\n%s=%s\n" : ++ "%02x:%02x:%02x:%02x:%02x:%02x: %s=%s\n"), ++ link->addr[0], link->addr[1], link->addr[2], ++ link->addr[3], link->addr[4], link->addr[5], ++ attr->name, ++ wprobe_dump_value(attr)); ++ first = false; ++ } else { ++ fprintf(stdout, ++ (simple_mode ? "%s=%s\n" : ++ " %s=%s\n"), ++ attr->name, ++ wprobe_dump_value(attr)); ++ } ++ } ++ } ++ fflush(stdout); ++} ++ ++static const char *attr_typestr[] = { ++ [0] = "Unknown", ++ [WPROBE_VAL_STRING] = "String", ++ [WPROBE_VAL_U8] = "Unsigned 8 bit", ++ [WPROBE_VAL_U16] = "Unsigned 16 bit", ++ [WPROBE_VAL_U32] = "Unsigned 32 bit", ++ [WPROBE_VAL_U64] = "Unsigned 64 bit", ++ [WPROBE_VAL_S8] = "Signed 8 bit", ++ [WPROBE_VAL_S16] = "Signed 16 bit", ++ [WPROBE_VAL_S32] = "Signed 32 bit", ++ [WPROBE_VAL_S64] = "Signed 64 bit", ++}; ++ ++static int usage(const char *prog) ++{ ++ fprintf(stderr, ++#ifndef NO_LOCAL_ACCESS ++ "Usage: %s |:|-P [options]\n" ++#else ++ "Usage: %s : [options]\n" ++#endif ++ "\n" ++ "Options:\n" ++ " -a: Print attributes\n" ++ " -c: Only apply configuration\n" ++ " -d: Delay between measurement dumps (in milliseconds, default: 1000)\n" ++ " A value of 0 (zero) prints once and exits; useful for scripts\n" ++ " -f: Dump contents of layer 2 filter counters during measurement\n" ++ " -F : Apply layer 2 filters from \n" ++ " -h: This help text\n" ++ " -i : Set measurement interval\n" ++ " -m: Run measurement loop\n" ++ " -p: Set the TCP port for server/client (default: 17990)\n" ++#ifndef NO_LOCAL_ACCESS ++ " -P: Run in proxy mode (listen on network)\n" ++#endif ++ "\n" ++ , prog); ++ exit(1); ++} ++ ++static void show_attributes(struct wprobe_iface *dev) ++{ ++ struct wprobe_attribute *attr; ++ if (simple_mode) ++ return; ++ list_for_each_entry(attr, &dev->global_attr, list) { ++ fprintf(stdout, "Global attribute: '%s' (%s)\n", ++ attr->name, attr_typestr[attr->type]); ++ } ++ list_for_each_entry(attr, &dev->link_attr, list) { ++ fprintf(stdout, "Link attribute: '%s' (%s)\n", ++ attr->name, attr_typestr[attr->type]); ++ } ++} ++ ++static void show_filter_simple(void *arg, const char *group, struct wprobe_filter_item *items, int n_items) ++{ ++ int i; ++ ++ fprintf(stdout, "[filter:%s]\n", group); ++ for (i = 0; i < n_items; i++) { ++ fprintf(stdout, "%s=%lld;%lld\n", ++ items[i].name, items[i].tx, items[i].rx); ++ } ++ fflush(stdout); ++} ++ ++ ++static void show_filter(void *arg, const char *group, struct wprobe_filter_item *items, int n_items) ++{ ++ int i; ++ fprintf(stdout, "Filter group: '%s' (tx/rx)\n", group); ++ for (i = 0; i < n_items; i++) { ++ fprintf(stdout, " - %s (%lld/%lld)\n", ++ items[i].name, items[i].tx, items[i].rx); ++ } ++} ++ ++static void loop_measurement(struct wprobe_iface *dev, bool print_filters, unsigned long delay) ++{ ++ do { ++ wprobe_update_links(dev); ++ wprobe_dump_data(dev); ++ if (print_filters) ++ wprobe_dump_filters(dev, simple_mode ? show_filter_simple : show_filter, NULL); ++ usleep(delay * 1000); ++ } ++ while (delay); ++} ++ ++static void set_filter(struct wprobe_iface *dev, const char *filename) ++{ ++ unsigned char *buf = NULL; ++ unsigned int buflen = 0; ++ unsigned int len = 0; ++ int fd; ++ ++ /* clear filter */ ++ if (filename[0] == 0) { ++ dev->filter_len = -1; ++ return; ++ } ++ ++ fd = open(filename, O_RDONLY); ++ if (fd < 0) { ++ perror("open filter"); ++ return; ++ } ++ ++ do { ++ int rlen; ++ ++ if (!buf) { ++ len = 0; ++ buflen = 1024; ++ buf = malloc(1024); ++ } else { ++ buflen *= 2; ++ buf = realloc(buf, buflen); ++ } ++ rlen = read(fd, buf + len, buflen - len); ++ if (rlen < 0) ++ break; ++ ++ len += rlen; ++ } while (len == buflen); ++ ++ dev->filter = buf; ++ dev->filter_len = len; ++ close(fd); ++} ++ ++#ifndef NO_LOCAL_ACCESS ++ ++static void sigchld_handler(int s) ++{ ++ while (waitpid(-1, NULL, WNOHANG) > 0); ++} ++ ++static int run_proxy(int port) ++{ ++ struct sockaddr_in sa; ++ struct sigaction sig; ++ int v = 1; ++ int s; ++ ++ s = socket(AF_INET, SOCK_STREAM, 0); ++ if (s < 0) { ++ perror("socket"); ++ return 1; ++ } ++ ++ sig.sa_handler = sigchld_handler; // Signal Handler fuer Zombie Prozesse ++ sigemptyset(&sig.sa_mask); ++ sig.sa_flags = SA_RESTART; ++ sigaction(SIGCHLD, &sig, NULL); ++ ++ memset(&sa, 0, sizeof(sa)); ++ sa.sin_family = AF_INET; ++ sa.sin_addr.s_addr = htonl(INADDR_ANY); ++ sa.sin_port = htons(wprobe_port); ++ ++ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(v)); ++ if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) { ++ perror("bind"); ++ return 1; ++ } ++ if (listen(s, 10)) { ++ perror("listen"); ++ return 1; ++ } ++ while(1) { ++ unsigned int addrlen = sizeof(struct sockaddr_in); ++ int ret, c; ++ ++ c = accept(s, (struct sockaddr *)&sa, &addrlen); ++ if (c < 0) { ++ if (errno == EINTR) ++ continue; ++ ++ perror("accept"); ++ return 1; ++ } ++ if (fork() == 0) { ++ /* close server socket, stdin, stdout, stderr */ ++ close(s); ++ close(0); ++ close(1); ++ close(2); ++ ++ wprobe_server_init(c); ++ do { ++ ret = wprobe_server_handle(c); ++ } while (ret >= 0); ++ wprobe_server_done(); ++ close(c); ++ exit(0); ++ } ++ close(c); ++ } ++ ++ return 0; ++} ++#endif ++ ++int main(int argc, char **argv) ++{ ++ struct wprobe_iface *dev = NULL; ++ const char *ifname; ++ const char *prog = argv[0]; ++ char *err = NULL; ++ enum { ++ CMD_NONE, ++ CMD_CONFIG, ++ CMD_MEASURE, ++ CMD_PROXY, ++ } cmd = CMD_NONE; ++ const char *filter = NULL; ++ bool print_attributes = false; ++ bool print_filters = false; ++ unsigned long delay = 1000; ++ int interval = -1; ++ int ch; ++ ++ if (argc < 2) ++ return usage(prog); ++ ++#ifndef NO_LOCAL_ACCESS ++ if (!strcmp(argv[1], "-P")) { ++ while ((ch = getopt(argc - 1, argv + 1, "p:")) != -1) { ++ switch(ch) { ++ case 'p': ++ /* set port */ ++ wprobe_port = strtoul(optarg, NULL, 0); ++ break; ++ default: ++ return usage(prog); ++ } ++ } ++ return run_proxy(wprobe_port); ++ } ++#endif ++ ++ if (argv[1][0] == '-') ++ return usage(prog); ++ ++ ifname = argv[1]; ++ argv++; ++ argc--; ++ ++ while ((ch = getopt(argc, argv, "acd:fF:hi:msp:")) != -1) { ++ switch(ch) { ++ case 'a': ++ print_attributes = true; ++ break; ++ case 'c': ++ cmd = CMD_CONFIG; ++ break; ++ case 'd': ++ delay = strtoul(optarg, NULL, 10); ++ break; ++ case 'm': ++ cmd = CMD_MEASURE; ++ break; ++ case 'i': ++ interval = strtoul(optarg, NULL, 10); ++ break; ++ case 'f': ++ print_filters = true; ++ break; ++ case 'F': ++ if (filter) { ++ fprintf(stderr, "Cannot set multiple filters\n"); ++ return usage(prog); ++ } ++ filter = optarg; ++ break; ++ case 's': ++ simple_mode = true; ++ break; ++ case 'p': ++ /* set port */ ++ wprobe_port = strtoul(optarg, NULL, 0); ++ break; ++ case 'h': ++ default: ++ usage(prog); ++ break; ++ } ++ } ++ ++ dev = wprobe_get_auto(ifname, &err); ++ if (!dev || (list_empty(&dev->global_attr) && ++ list_empty(&dev->link_attr))) { ++ if (err) ++ fprintf(stdout, "%s\n", err); ++ else ++ fprintf(stderr, "Interface '%s' not found\n", ifname); ++ return 1; ++ } ++ ++ if (filter || interval >= 0) { ++ if (filter) ++ set_filter(dev, filter); ++ if (interval >= 0) ++ dev->interval = interval; ++ ++ wprobe_apply_config(dev); ++ } ++ ++ if (cmd != CMD_CONFIG) { ++ if (print_attributes) ++ show_attributes(dev); ++ } ++ if (cmd == CMD_MEASURE) ++ loop_measurement(dev, print_filters, delay); ++ ++ wprobe_free_dev(dev); ++ ++ return 0; ++} +diff --git a/feeds/packages/net/wprobe/src/user/wprobe.h b/feeds/packages/net/wprobe/src/user/wprobe.h +new file mode 100644 +index 0000000..706facc +--- /dev/null ++++ b/feeds/packages/net/wprobe/src/user/wprobe.h +@@ -0,0 +1,213 @@ ++/* ++ * wprobe.h: Wireless probe user space library ++ * Copyright (C) 2008-2009 Felix Fietkau ++ * ++ * 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. ++ */ ++ ++#ifndef __WPROBE_USER_H ++#define __WPROBE_USER_H ++#include ++#include ++#include ++#include "list.h" ++ ++/** ++ * struct wprobe_value: data structure for attribute values ++ * @STRING: string value (currently unsupported) ++ * @U8: unsigned 8-bit integer value ++ * @U16: unsigned 16-bit integer value ++ * @U32: unsigned 32-bit integer value ++ * @U64: unsigned 64-bit integer value ++ * @S8: signed 8-bit integer value ++ * @S16: signed 16-bit integer value ++ * @S32: signed 32-bit integer value ++ * @S64: signed 64-bit integer value ++ * ++ * @n: number of sample values ++ * @avg: average value ++ * @stdev: standard deviation ++ * @s: sum of all sample values (internal use) ++ * @ss: sum of all sample values squared (internal use) ++ */ ++struct wprobe_value { ++ /* attribute value */ ++ union { ++ const char *STRING; ++ uint8_t U8; ++ uint16_t U16; ++ uint32_t U32; ++ uint64_t U64; ++ int8_t S8; ++ int16_t S16; ++ int32_t S32; ++ int64_t S64; ++ }; ++ /* statistics */ ++ int64_t s, ss; ++ float avg, stdev; ++ unsigned int n; ++}; ++ ++/** ++ * struct wprobe_attribute: data structures for attribute descriptions ++ * @list: linked list data structure for a list of attributes ++ * @id: attribute id ++ * @type: netlink type for the attribute (see kernel api documentation) ++ * @flags: attribute flags (see kernel api documentation) ++ * @val: cached version of the last netlink query, will be overwritten on each request ++ * @name: attribute name ++ */ ++struct wprobe_attribute { ++ struct list_head list; ++ int id; ++ int type; ++ uint32_t flags; ++ struct wprobe_value val; ++ char name[]; ++}; ++ ++/** ++ * struct wprobe_link: data structure for the link description ++ * @list: linked list data structure for a list of links ++ * @flags: link flags (see kernel api documentation) ++ * @addr: mac address of the remote link partner ++ */ ++struct wprobe_link { ++ struct list_head list; ++ uint32_t flags; ++ unsigned char addr[6]; ++}; ++ ++struct wprobe_filter_item { ++ char name[32]; ++ uint64_t rx; ++ uint64_t tx; ++}; ++ ++struct wprobe_iface_ops; ++struct wprobe_iface { ++ const struct wprobe_iface_ops *ops; ++ ++ int sockfd; ++ const char *ifname; ++ unsigned int genl_family; ++ char addr[6]; ++ ++ struct list_head global_attr; ++ struct list_head link_attr; ++ struct list_head links; ++ ++ /* config */ ++ int interval; ++ int scale_min; ++ int scale_max; ++ int scale_m; ++ int scale_d; ++ ++ /* filter */ ++ void *filter; ++ ++ /* filter_len: ++ * set to -1 to drop the current filter ++ * automatically reset to 0 after config apply ++ */ ++ int filter_len; ++}; ++ ++typedef void (*wprobe_filter_cb)(void *arg, const char *group, struct wprobe_filter_item *items, int n_items); ++extern int wprobe_port; ++ ++/** ++ * wprobe_update_links: get a list of all link partners ++ * @dev: wprobe device structure ++ * @list: linked list for storing link descriptions ++ * ++ * when wprobe_update_links is called multiple times, the linked list ++ * is updated with new link partners, old entries are automatically expired ++ */ ++extern int wprobe_update_links(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_dump_filters: dump all layer 2 filter counters ++ * @dev: wprobe device structure ++ * @cb: callback (called once per filter group) ++ * @arg: user argument for the callback ++ */ ++extern int wprobe_dump_filters(struct wprobe_iface *dev, wprobe_filter_cb cb, void *arg); ++ ++/** ++ * wprobe_measure: start a measurement request for all global attributes ++ * @dev: wprobe device structure ++ * ++ * not all attributes are automatically filled with data, since for some ++ * it may be desirable to control the sampling interval from user space ++ * you can use this function to do that. ++ */ ++extern int wprobe_measure(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_get_dev: get a handle to a local wprobe device ++ * @ifname: name of the wprobe interface ++ * ++ * queries the wprobe interface for all attributes ++ * must be freed with wprobe_free_dev ++ */ ++extern struct wprobe_iface *wprobe_get_dev(const char *ifname); ++ ++/** ++ * wprobe_get_auto: get a handle to a local or remote wprobe device ++ * @arg: pointer to the wprobe device, either (local) or : (remote) ++ */ ++extern struct wprobe_iface *wprobe_get_auto(const char *arg, char **err); ++ ++/** ++ * wprobe_get_dev: free all device information ++ * @dev: wprobe device structure ++ */ ++extern void wprobe_free_dev(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_apply_config: apply configuration data ++ * @dev: wprobe device structure ++ * ++ * uploads all configuration values from @dev that are not set to -1 ++ */ ++extern int wprobe_apply_config(struct wprobe_iface *dev); ++ ++/** ++ * wprobe_request_data: request new sampling values for the given list of attributes ++ * @dev: wprobe device structure ++ * @addr: (optional) mac address of the link partner ++ * ++ * if addr is unset, global values are stored in the global attributes list ++ * if addr is set, per-link values for the given address are stored in the link attributes list ++ */ ++extern int wprobe_request_data(struct wprobe_iface *dev, const unsigned char *addr); ++ ++/** ++ * wprobe_server_init: send a wprobe server init message to a server's client socket ++ * @socket: socket of the connection to the client ++ */ ++extern int wprobe_server_init(int socket); ++ ++/** ++ * wprobe_server_handle: read a request from the client socket, process it, send the response ++ * @socket: socket of the connection to the client ++ */ ++extern int wprobe_server_handle(int socket); ++ ++/** ++ * wprobe_server_done: release memory allocated for the server connection ++ */ ++extern void wprobe_server_done(void); ++ ++#endif +diff --git a/feeds/packages/net/wput/.svn/entries b/feeds/packages/net/wput/.svn/entries +new file mode 100644 +index 0000000..bd19dc6 +--- /dev/null ++++ b/feeds/packages/net/wput/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wput ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T05:50:28.247069Z ++26066 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++5b4b668455591f6d74f726e2dabed012 ++2011-03-12T05:50:28.247069Z ++26066 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++999 ++ +diff --git a/feeds/packages/net/wput/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/wput/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/wput/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wput/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wput/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d25dd74 +--- /dev/null ++++ b/feeds/packages/net/wput/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=wput ++PKG_VERSION:=0.6.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/wput ++PKG_MD5SUM:=a14c4c13d91d04d6119bdc977e8a8bdf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wput ++ SUBMENU:=File Transfer ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A tiny wget-like ftp-client for uploading files ++ URL:=http://wput.sourceforge.net/ ++endef ++ ++define Package/wput/description ++ Wput is a tiny ftp-client, that uploads files or directories ++ to a remote ftp-server. Main features are: resuming, ++ time-stamping, wget-like interface, proxy-support and ++ speed-limit. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-g-switch \ ++ --without-ssl \ ++ ++define Package/wput/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wput $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,wput)) +diff --git a/feeds/packages/net/wput/Makefile b/feeds/packages/net/wput/Makefile +new file mode 100644 +index 0000000..d25dd74 +--- /dev/null ++++ b/feeds/packages/net/wput/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=wput ++PKG_VERSION:=0.6.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/wput ++PKG_MD5SUM:=a14c4c13d91d04d6119bdc977e8a8bdf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wput ++ SUBMENU:=File Transfer ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=A tiny wget-like ftp-client for uploading files ++ URL:=http://wput.sourceforge.net/ ++endef ++ ++define Package/wput/description ++ Wput is a tiny ftp-client, that uploads files or directories ++ to a remote ftp-server. Main features are: resuming, ++ time-stamping, wget-like interface, proxy-support and ++ speed-limit. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-g-switch \ ++ --without-ssl \ ++ ++define Package/wput/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wput $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,wput)) +diff --git a/feeds/packages/net/wput/patches/.svn/entries b/feeds/packages/net/wput/patches/.svn/entries +new file mode 100644 +index 0000000..1fcda7c +--- /dev/null ++++ b/feeds/packages/net/wput/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wput/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-29T18:59:53.318110Z ++18964 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-socketlib.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++f2e7e9a42275b317b2094017c8fab3c7 ++2009-12-29T18:59:53.318110Z ++18964 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++896 ++ ++102-wput.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++53b0e9c7f8203cf980c5d829d62ff345 ++2009-12-29T18:59:53.318110Z ++18964 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2056 ++ +diff --git a/feeds/packages/net/wput/patches/.svn/text-base/100-socketlib.diff.svn-base b/feeds/packages/net/wput/patches/.svn/text-base/100-socketlib.diff.svn-base +new file mode 100644 +index 0000000..b5acafe +--- /dev/null ++++ b/feeds/packages/net/wput/patches/.svn/text-base/100-socketlib.diff.svn-base +@@ -0,0 +1,22 @@ ++--- a/src/socketlib.c +++++ b/src/socketlib.c ++@@ -392,17 +392,15 @@ int socket_is_data_readable(int s, int t ++ wput_socket * socket_timeout_connect(wput_socket * sock, struct sockaddr *remote_addr, size_t size, int timeout) { ++ int c = 0; ++ printout(vDEBUG, "initiating timeout connect (%d)\n", timeout); ++-#ifdef WIN32 ++ /* reset errno before connecting. otherwise connection might "fail" for: ++ * no such file or directory ;) */ ++ errno = 0; ++-#endif ++- socket_set_blocking(sock->fd, 0); +++ socket_set_blocking(sock->fd, 1); ++ c = connect(sock->fd,remote_addr,size); ++ /* here was a check also for errno != 36 (FILENAMETOOLONG) ++ * maybe this was EINPROGRESS on another system? */ ++ if(errno > 0 && errno != EINPROGRESS) { ++- printout(vMORE, "[%s]", strerror(errno)); +++ printout(vMORE, "[%d:%s] ", errno, strerror(errno)); ++ return NULL; ++ } ++ /* DEBUG if(c == -1) perror("connect"); */ +diff --git a/feeds/packages/net/wput/patches/.svn/text-base/102-wput.diff.svn-base b/feeds/packages/net/wput/patches/.svn/text-base/102-wput.diff.svn-base +new file mode 100644 +index 0000000..19629b5 +--- /dev/null ++++ b/feeds/packages/net/wput/patches/.svn/text-base/102-wput.diff.svn-base +@@ -0,0 +1,48 @@ ++--- a/src/wput.c +++++ b/src/wput.c ++@@ -621,8 +621,8 @@ void commandlineoptions(int argc, char * ++ {"output-file", 1, 0, 'o'}, ++ {"port-mode", 0, 0, 'p'}, ++ {"proxy", 1, 0, 'Y'}, ++- {"proxy-user", 1, 0, 0}, ++- {"proxy-pass", 1, 0, 0}, //20 +++ {"proxy_user", 1, 0, 0}, +++ {"proxy_pass", 1, 0, 0}, //20 ++ {"quiet", 0, 0, 'q'}, ++ {"random-wait", 0, 0, 0}, ++ {"remove-source-files", 0, 0, 'R'}, ++@@ -642,7 +642,9 @@ void commandlineoptions(int argc, char * ++ {"waitretry", 1, 0, 0}, ++ {"chmod", 1, 0, 'm'}, ++ {"disable-tls", 0, 0, 0}, ++- {0, 0, 0, 0} //40 +++ {"proxy_host", 1, 0, 0}, //40 +++ {"proxy_port", 1, 0, 0}, +++ {0, 0, 0, 0} ++ }; ++ while (1) ++ { ++@@ -699,6 +701,10 @@ void commandlineoptions(int argc, char * ++ opt.retry_interval = atoi(optarg); break; ++ case 39: //disable-tls ++ opt.tls = 2; break; +++ case 40: //proxy_host +++ set_option("proxy_host", optarg); break; +++ case 41: //proxy_port +++ set_option("proxy_port", optarg); break; ++ default: ++ fprintf(stderr, _("Option %s should not appear here :|\n"), long_options[option_index].name); ++ } ++@@ -806,8 +812,10 @@ void commandlineoptions(int argc, char * ++ " -l, --limit-rate=RATE limit upload rate to RATE\n" ++ " -nd, --no-directories do not create any directories\n" ++ " -Y, --proxy=http/socks/off set proxy type or turn off\n" ++-" --proxy-user=NAME set the proxy-username to NAME\n" ++-" --proxy-pass=PASS set the proxy-password to PASS\n" +++" --proxy_user=NAME set the proxy-username to NAME\n" +++" --proxy_pass=PASS set the proxy-password to PASS\n" +++" --proxy_port=PORT set the proxy port to PORT\n" +++" --proxy_host=HOST set the proxy host to HOST\n" ++ "\n")); ++ fprintf(stderr, _( ++ "FTP-Options:\n" +diff --git a/feeds/packages/net/wput/patches/100-socketlib.diff b/feeds/packages/net/wput/patches/100-socketlib.diff +new file mode 100644 +index 0000000..b5acafe +--- /dev/null ++++ b/feeds/packages/net/wput/patches/100-socketlib.diff +@@ -0,0 +1,22 @@ ++--- a/src/socketlib.c +++++ b/src/socketlib.c ++@@ -392,17 +392,15 @@ int socket_is_data_readable(int s, int t ++ wput_socket * socket_timeout_connect(wput_socket * sock, struct sockaddr *remote_addr, size_t size, int timeout) { ++ int c = 0; ++ printout(vDEBUG, "initiating timeout connect (%d)\n", timeout); ++-#ifdef WIN32 ++ /* reset errno before connecting. otherwise connection might "fail" for: ++ * no such file or directory ;) */ ++ errno = 0; ++-#endif ++- socket_set_blocking(sock->fd, 0); +++ socket_set_blocking(sock->fd, 1); ++ c = connect(sock->fd,remote_addr,size); ++ /* here was a check also for errno != 36 (FILENAMETOOLONG) ++ * maybe this was EINPROGRESS on another system? */ ++ if(errno > 0 && errno != EINPROGRESS) { ++- printout(vMORE, "[%s]", strerror(errno)); +++ printout(vMORE, "[%d:%s] ", errno, strerror(errno)); ++ return NULL; ++ } ++ /* DEBUG if(c == -1) perror("connect"); */ +diff --git a/feeds/packages/net/wput/patches/102-wput.diff b/feeds/packages/net/wput/patches/102-wput.diff +new file mode 100644 +index 0000000..19629b5 +--- /dev/null ++++ b/feeds/packages/net/wput/patches/102-wput.diff +@@ -0,0 +1,48 @@ ++--- a/src/wput.c +++++ b/src/wput.c ++@@ -621,8 +621,8 @@ void commandlineoptions(int argc, char * ++ {"output-file", 1, 0, 'o'}, ++ {"port-mode", 0, 0, 'p'}, ++ {"proxy", 1, 0, 'Y'}, ++- {"proxy-user", 1, 0, 0}, ++- {"proxy-pass", 1, 0, 0}, //20 +++ {"proxy_user", 1, 0, 0}, +++ {"proxy_pass", 1, 0, 0}, //20 ++ {"quiet", 0, 0, 'q'}, ++ {"random-wait", 0, 0, 0}, ++ {"remove-source-files", 0, 0, 'R'}, ++@@ -642,7 +642,9 @@ void commandlineoptions(int argc, char * ++ {"waitretry", 1, 0, 0}, ++ {"chmod", 1, 0, 'm'}, ++ {"disable-tls", 0, 0, 0}, ++- {0, 0, 0, 0} //40 +++ {"proxy_host", 1, 0, 0}, //40 +++ {"proxy_port", 1, 0, 0}, +++ {0, 0, 0, 0} ++ }; ++ while (1) ++ { ++@@ -699,6 +701,10 @@ void commandlineoptions(int argc, char * ++ opt.retry_interval = atoi(optarg); break; ++ case 39: //disable-tls ++ opt.tls = 2; break; +++ case 40: //proxy_host +++ set_option("proxy_host", optarg); break; +++ case 41: //proxy_port +++ set_option("proxy_port", optarg); break; ++ default: ++ fprintf(stderr, _("Option %s should not appear here :|\n"), long_options[option_index].name); ++ } ++@@ -806,8 +812,10 @@ void commandlineoptions(int argc, char * ++ " -l, --limit-rate=RATE limit upload rate to RATE\n" ++ " -nd, --no-directories do not create any directories\n" ++ " -Y, --proxy=http/socks/off set proxy type or turn off\n" ++-" --proxy-user=NAME set the proxy-username to NAME\n" ++-" --proxy-pass=PASS set the proxy-password to PASS\n" +++" --proxy_user=NAME set the proxy-username to NAME\n" +++" --proxy_pass=PASS set the proxy-password to PASS\n" +++" --proxy_port=PORT set the proxy port to PORT\n" +++" --proxy_host=HOST set the proxy host to HOST\n" ++ "\n")); ++ fprintf(stderr, _( ++ "FTP-Options:\n" +diff --git a/feeds/packages/net/wrt-radauth/.svn/entries b/feeds/packages/net/wrt-radauth/.svn/entries +new file mode 100644 +index 0000000..292c6a9 +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wrt-radauth ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++fe48926d48cb3c08d53000466cdd84f4 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1290 ++ +diff --git a/feeds/packages/net/wrt-radauth/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/wrt-radauth/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/wrt-radauth/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wrt-radauth/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..57b5781 +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=wrt-radauth ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.zerfleddert.de/wrt54g/ ++PKG_MD5SUM:=1713b96a157f9e209cf7986f38ef57d9 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wrt-radauth ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-brcm-wl +nvram ++ TITLE:=A Radius MAC authenticator for Broadcom based access points ++ URL:=http://www.zerfleddert.de/wrt54g/ ++endef ++ ++define Package/wrt-radauth/description ++ This software watches the stations associating to a broadcom based ++ AccessPoint (e.g. Linksys WRT54G) and sends an authentication request ++ to the radius-server specified in nvram. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(EXTRA_CFLAGS)" \ ++ LDFLAGS="$(EXTRA_LDFLAGS)" \ ++ ) ++endef ++ ++define Package/wrt-radauth/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/radius-client $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wrt-radauth $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,wrt-radauth)) +diff --git a/feeds/packages/net/wrt-radauth/Makefile b/feeds/packages/net/wrt-radauth/Makefile +new file mode 100644 +index 0000000..57b5781 +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=wrt-radauth ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.zerfleddert.de/wrt54g/ ++PKG_MD5SUM:=1713b96a157f9e209cf7986f38ef57d9 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wrt-radauth ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+kmod-brcm-wl +nvram ++ TITLE:=A Radius MAC authenticator for Broadcom based access points ++ URL:=http://www.zerfleddert.de/wrt54g/ ++endef ++ ++define Package/wrt-radauth/description ++ This software watches the stations associating to a broadcom based ++ AccessPoint (e.g. Linksys WRT54G) and sends an authentication request ++ to the radius-server specified in nvram. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(EXTRA_CFLAGS)" \ ++ LDFLAGS="$(EXTRA_LDFLAGS)" \ ++ ) ++endef ++ ++define Package/wrt-radauth/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/radius-client $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wrt-radauth $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,wrt-radauth)) +diff --git a/feeds/packages/net/wrt-radauth/patches/.svn/entries b/feeds/packages/net/wrt-radauth/patches/.svn/entries +new file mode 100644 +index 0000000..918ac5d +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wrt-radauth/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-08-05T22:40:17.185897Z ++12182 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-ldpath.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++f647655c581e53e761f1f0f89d05514a ++2008-08-05T22:40:17.185897Z ++12182 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++533 ++ +diff --git a/feeds/packages/net/wrt-radauth/patches/.svn/text-base/001-ldpath.patch.svn-base b/feeds/packages/net/wrt-radauth/patches/.svn/text-base/001-ldpath.patch.svn-base +new file mode 100644 +index 0000000..c740c3f +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/patches/.svn/text-base/001-ldpath.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -urN wrt-radauth/Makefile wrt-radauth.new/Makefile ++--- wrt-radauth/Makefile 2007-01-07 20:05:21.000000000 +0100 +++++ wrt-radauth.new/Makefile 2008-04-01 22:50:09.000000000 +0200 ++@@ -7,7 +7,7 @@ ++ all: wrt-radauth radius-client ++ ++ wrt-radauth: wrt-radauth.o md5.o wireless.o radius.o ++- $(CC) $(LDFLAGS) -L$(WRT_BUILDROOT)/build_mipsel/root/usr/lib -lshared -lnvram $^ -o $@ +++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L$(STAGING_DIR)/usr/lib -lnvram $(STAGING_DIR)/usr/lib/libshared.a ++ ++ ++ radius-client: radius-client.o md5.o radius.o +diff --git a/feeds/packages/net/wrt-radauth/patches/001-ldpath.patch b/feeds/packages/net/wrt-radauth/patches/001-ldpath.patch +new file mode 100644 +index 0000000..c740c3f +--- /dev/null ++++ b/feeds/packages/net/wrt-radauth/patches/001-ldpath.patch +@@ -0,0 +1,12 @@ ++diff -urN wrt-radauth/Makefile wrt-radauth.new/Makefile ++--- wrt-radauth/Makefile 2007-01-07 20:05:21.000000000 +0100 +++++ wrt-radauth.new/Makefile 2008-04-01 22:50:09.000000000 +0200 ++@@ -7,7 +7,7 @@ ++ all: wrt-radauth radius-client ++ ++ wrt-radauth: wrt-radauth.o md5.o wireless.o radius.o ++- $(CC) $(LDFLAGS) -L$(WRT_BUILDROOT)/build_mipsel/root/usr/lib -lshared -lnvram $^ -o $@ +++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L$(STAGING_DIR)/usr/lib -lnvram $(STAGING_DIR)/usr/lib/libshared.a ++ ++ ++ radius-client: radius-client.o md5.o radius.o +diff --git a/feeds/packages/net/wshaper/.svn/entries b/feeds/packages/net/wshaper/.svn/entries +new file mode 100644 +index 0000000..5e6f008 +--- /dev/null ++++ b/feeds/packages/net/wshaper/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wshaper ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++b74fabf674dc41216366b64d35fc41cf ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1253 ++ +diff --git a/feeds/packages/net/wshaper/.svn/text-base/Makefile.svn-base b/feeds/packages/net/wshaper/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2c73705 +--- /dev/null ++++ b/feeds/packages/net/wshaper/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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:=wshaper ++PKG_VERSION:=0.2 ++PKG_RELEASE:=2 ++ ++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 ++ $(INSTALL_BIN) ./files/wshaper.htb $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/wshaper.init $(1)/etc/init.d/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/feeds/packages/net/wshaper/Makefile b/feeds/packages/net/wshaper/Makefile +new file mode 100644 +index 0000000..2c73705 +--- /dev/null ++++ b/feeds/packages/net/wshaper/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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:=wshaper ++PKG_VERSION:=0.2 ++PKG_RELEASE:=2 ++ ++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 ++ $(INSTALL_BIN) ./files/wshaper.htb $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/wshaper.init $(1)/etc/init.d/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/feeds/packages/net/wshaper/files/.svn/entries b/feeds/packages/net/wshaper/files/.svn/entries +new file mode 100644 +index 0000000..9e1f4e7 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/wshaper/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wshaper.htb ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++6dd2f0d61abd0b32e1b05d5d516530f6 ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4601 ++ ++wshaper.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++07789690cb6a2fc9c73ff9c886071db4 ++2008-03-11T17:42:28.895832Z ++10591 ++matteo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++90 ++ ++wshaper.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++6de6f1171e8db8425cdcdae58bf98813 ++2011-10-14T12:35:19.631435Z ++28454 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++101 ++ +diff --git a/feeds/packages/net/wshaper/files/.svn/prop-base/wshaper.htb.svn-base b/feeds/packages/net/wshaper/files/.svn/prop-base/wshaper.htb.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/.svn/prop-base/wshaper.htb.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.config.svn-base b/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.config.svn-base +new file mode 100644 +index 0000000..ed857c5 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.config.svn-base +@@ -0,0 +1,4 @@ ++config 'wshaper' 'settings' ++ option 'network' 'wan' ++ option 'downlink' '2000' ++ option 'uplink' '240' +diff --git a/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.htb.svn-base b/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.htb.svn-base +new file mode 100644 +index 0000000..0729fb7 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.htb.svn-base +@@ -0,0 +1,161 @@ ++#!/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 ++config_load wshaper ++for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do ++ config_get $s settings $s ++done ++ ++device=$(uci_get_state network "$network" ifname "$network") ++[ -z "$device" ] && logger -t wondershaper "Error: Could not find the device for network $network, aborting." && exit 1 ++[ -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/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.init.svn-base b/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.init.svn-base +new file mode 100644 +index 0000000..638cef2 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/.svn/text-base/wshaper.init.svn-base +@@ -0,0 +1,10 @@ ++#!/bin/sh /etc/rc.common ++ ++START=45 ++start() { ++ wshaper.htb ++} ++ ++stop() { ++ wshaper.htb stop ++} +diff --git a/feeds/packages/net/wshaper/files/wshaper.config b/feeds/packages/net/wshaper/files/wshaper.config +new file mode 100644 +index 0000000..ed857c5 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/wshaper.config +@@ -0,0 +1,4 @@ ++config 'wshaper' 'settings' ++ option 'network' 'wan' ++ option 'downlink' '2000' ++ option 'uplink' '240' +diff --git a/feeds/packages/net/wshaper/files/wshaper.htb b/feeds/packages/net/wshaper/files/wshaper.htb +new file mode 100755 +index 0000000..0729fb7 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/wshaper.htb +@@ -0,0 +1,161 @@ ++#!/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 ++config_load wshaper ++for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do ++ config_get $s settings $s ++done ++ ++device=$(uci_get_state network "$network" ifname "$network") ++[ -z "$device" ] && logger -t wondershaper "Error: Could not find the device for network $network, aborting." && exit 1 ++[ -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/feeds/packages/net/wshaper/files/wshaper.init b/feeds/packages/net/wshaper/files/wshaper.init +new file mode 100644 +index 0000000..638cef2 +--- /dev/null ++++ b/feeds/packages/net/wshaper/files/wshaper.init +@@ -0,0 +1,10 @@ ++#!/bin/sh /etc/rc.common ++ ++START=45 ++start() { ++ wshaper.htb ++} ++ ++stop() { ++ wshaper.htb stop ++} +diff --git a/feeds/packages/net/xinetd/.svn/entries b/feeds/packages/net/xinetd/.svn/entries +new file mode 100644 +index 0000000..ed45132 +--- /dev/null ++++ b/feeds/packages/net/xinetd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xinetd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-27T00:09:00.258530Z ++31866 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++4811954c2550cc20cd2098b02561e319 ++2012-05-27T00:09:00.258530Z ++31866 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1515 ++ +diff --git a/feeds/packages/net/xinetd/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/xinetd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/xinetd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xinetd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/xinetd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c2bd6e0 +--- /dev/null ++++ b/feeds/packages/net/xinetd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=xinetd ++PKG_VERSION:=2.3.15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.xinetd.org ++PKG_MD5SUM:=77358478fd58efa6366accae99b8b04c ++ ++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/ ++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/feeds/packages/net/xinetd/Makefile b/feeds/packages/net/xinetd/Makefile +new file mode 100644 +index 0000000..c2bd6e0 +--- /dev/null ++++ b/feeds/packages/net/xinetd/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=xinetd ++PKG_VERSION:=2.3.15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.xinetd.org ++PKG_MD5SUM:=77358478fd58efa6366accae99b8b04c ++ ++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/ ++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/feeds/packages/net/xinetd/files/.svn/entries b/feeds/packages/net/xinetd/files/.svn/entries +new file mode 100644 +index 0000000..caccd62 +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xinetd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:29:31.683544Z ++28908 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++xinetd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++53eb6775224248877a7051f3d12d3403 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++40 ++ ++xinetd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++183c3003673e2a76dc4ba80a54ac2072 ++2011-11-09T23:29:31.683544Z ++28908 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++210 ++ +diff --git a/feeds/packages/net/xinetd/files/.svn/prop-base/xinetd.conf.svn-base b/feeds/packages/net/xinetd/files/.svn/prop-base/xinetd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/.svn/prop-base/xinetd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xinetd/files/.svn/prop-base/xinetd.init.svn-base b/feeds/packages/net/xinetd/files/.svn/prop-base/xinetd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/.svn/prop-base/xinetd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xinetd/files/.svn/text-base/xinetd.conf.svn-base b/feeds/packages/net/xinetd/files/.svn/text-base/xinetd.conf.svn-base +new file mode 100644 +index 0000000..bd473ed +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/.svn/text-base/xinetd.conf.svn-base +@@ -0,0 +1,6 @@ ++defaults ++{ ++ ++} ++ ++includedir /etc/xinetd.d +diff --git a/feeds/packages/net/xinetd/files/.svn/text-base/xinetd.init.svn-base b/feeds/packages/net/xinetd/files/.svn/text-base/xinetd.init.svn-base +new file mode 100644 +index 0000000..1437f58 +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/.svn/text-base/xinetd.init.svn-base +@@ -0,0 +1,15 @@ ++#!/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/feeds/packages/net/xinetd/files/xinetd.conf b/feeds/packages/net/xinetd/files/xinetd.conf +new file mode 100644 +index 0000000..bd473ed +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/xinetd.conf +@@ -0,0 +1,6 @@ ++defaults ++{ ++ ++} ++ ++includedir /etc/xinetd.d +diff --git a/feeds/packages/net/xinetd/files/xinetd.init b/feeds/packages/net/xinetd/files/xinetd.init +new file mode 100644 +index 0000000..1437f58 +--- /dev/null ++++ b/feeds/packages/net/xinetd/files/xinetd.init +@@ -0,0 +1,15 @@ ++#!/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/feeds/packages/net/xinetd/patches/.svn/entries b/feeds/packages/net/xinetd/patches/.svn/entries +new file mode 100644 +index 0000000..ace3054 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xinetd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-27T00:09:00.258530Z ++31866 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++003-rpc_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++99dc126114a0cfad70bcdacf92911795 ++2012-05-27T00:09:00.258530Z ++31866 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++497 ++ ++002-destdir.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++c795e9dbf29e32523381cb5443638f1d ++2012-05-27T00:09:00.258530Z ++31866 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1678 ++ ++001-ar.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++e317a8217ff758e2528c88b695b32f96 ++2012-05-27T00:09:00.258530Z ++31866 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1361 ++ +diff --git a/feeds/packages/net/xinetd/patches/.svn/prop-base/001-ar.patch.svn-base b/feeds/packages/net/xinetd/patches/.svn/prop-base/001-ar.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/.svn/prop-base/001-ar.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xinetd/patches/.svn/prop-base/002-destdir.patch.svn-base b/feeds/packages/net/xinetd/patches/.svn/prop-base/002-destdir.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/.svn/prop-base/002-destdir.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xinetd/patches/.svn/text-base/001-ar.patch.svn-base b/feeds/packages/net/xinetd/patches/.svn/text-base/001-ar.patch.svn-base +new file mode 100644 +index 0000000..4d961ba +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/.svn/text-base/001-ar.patch.svn-base +@@ -0,0 +1,66 @@ ++--- 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/feeds/packages/net/xinetd/patches/.svn/text-base/002-destdir.patch.svn-base b/feeds/packages/net/xinetd/patches/.svn/text-base/002-destdir.patch.svn-base +new file mode 100644 +index 0000000..89075c8 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/.svn/text-base/002-destdir.patch.svn-base +@@ -0,0 +1,27 @@ ++--- 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/feeds/packages/net/xinetd/patches/.svn/text-base/003-rpc_fix.patch.svn-base b/feeds/packages/net/xinetd/patches/.svn/text-base/003-rpc_fix.patch.svn-base +new file mode 100644 +index 0000000..11f47e7 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/.svn/text-base/003-rpc_fix.patch.svn-base +@@ -0,0 +1,19 @@ ++--- 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/feeds/packages/net/xinetd/patches/001-ar.patch b/feeds/packages/net/xinetd/patches/001-ar.patch +new file mode 100644 +index 0000000..4d961ba +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/001-ar.patch +@@ -0,0 +1,66 @@ ++--- 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/feeds/packages/net/xinetd/patches/002-destdir.patch b/feeds/packages/net/xinetd/patches/002-destdir.patch +new file mode 100644 +index 0000000..89075c8 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/002-destdir.patch +@@ -0,0 +1,27 @@ ++--- 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/feeds/packages/net/xinetd/patches/003-rpc_fix.patch b/feeds/packages/net/xinetd/patches/003-rpc_fix.patch +new file mode 100644 +index 0000000..11f47e7 +--- /dev/null ++++ b/feeds/packages/net/xinetd/patches/003-rpc_fix.patch +@@ -0,0 +1,19 @@ ++--- 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/feeds/packages/net/xl2tpd/.svn/entries b/feeds/packages/net/xl2tpd/.svn/entries +new file mode 100644 +index 0000000..150c1ed +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/.svn/entries +@@ -0,0 +1,102 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xl2tpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-05T19:46:05.348165Z ++35017 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++f511629627f06dc1c42e5138d6327173 ++2012-07-01T10:38:45.397445Z ++32563 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1927 ++ ++README ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++7f5fb38e9a8161e9b03c237d2bd237b3 ++2007-05-03T02:51:36.216082Z ++7082 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++827 ++ +diff --git a/feeds/packages/net/xl2tpd/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/xl2tpd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/net/xl2tpd/.svn/text-base/Makefile.svn-base b/feeds/packages/net/xl2tpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d197d6 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,68 @@ ++# ++# 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:=xl2tpd ++PKG_VERSION:=1.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++# Host seems to be down. ++#PKG_SOURCE_URL:=ftp://ftp.xelerance.com/xl2tpd/ ++PKG_MD5SUM:=cf61576fef5c2d6c68279a408ec1f0d5 ++PKG_SOURCE_URL:=http://pkgs.fedoraproject.org/lookaside/pkgs/xl2tpd/xl2tpd-$(PKG_VERSION).tar.gz/$(PKG_MD5SUM)/ ++ ++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/feeds/packages/net/xl2tpd/.svn/text-base/README.svn-base b/feeds/packages/net/xl2tpd/.svn/text-base/README.svn-base +new file mode 100644 +index 0000000..aadc26e +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/.svn/text-base/README.svn-base +@@ -0,0 +1,23 @@ ++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/feeds/packages/net/xl2tpd/Makefile b/feeds/packages/net/xl2tpd/Makefile +new file mode 100644 +index 0000000..6d197d6 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/Makefile +@@ -0,0 +1,68 @@ ++# ++# 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:=xl2tpd ++PKG_VERSION:=1.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++# Host seems to be down. ++#PKG_SOURCE_URL:=ftp://ftp.xelerance.com/xl2tpd/ ++PKG_MD5SUM:=cf61576fef5c2d6c68279a408ec1f0d5 ++PKG_SOURCE_URL:=http://pkgs.fedoraproject.org/lookaside/pkgs/xl2tpd/xl2tpd-$(PKG_VERSION).tar.gz/$(PKG_MD5SUM)/ ++ ++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/feeds/packages/net/xl2tpd/README b/feeds/packages/net/xl2tpd/README +new file mode 100644 +index 0000000..aadc26e +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/README +@@ -0,0 +1,23 @@ ++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/feeds/packages/net/xl2tpd/files/.svn/entries b/feeds/packages/net/xl2tpd/files/.svn/entries +new file mode 100644 +index 0000000..0d9b50e +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xl2tpd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-06T18:17:41.562848Z ++34537 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++xl2tp-secrets ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++dc2b1ed627a89d3debb3c731da45d47b ++2010-03-18T16:01:35.890904Z ++20276 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++115 ++ ++xl2tpd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++2bfbb59915457daa0f84673348d1c442 ++2012-07-01T12:59:32.278574Z ++32574 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++277 ++ ++xl2tpd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++2b7437f34b14c70b6b29383d0a6197ed ++2012-05-02T19:28:10.685324Z ++31561 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++468 ++ ++xl2tpd.conf.sample ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++5c9c14ad419159ff1d96d831b5d184ea ++2010-03-18T16:01:35.890904Z ++20276 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3849 ++ ++options.xl2tpd ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++bbfab931864b3db617c38e96071cf4b6 ++2010-03-18T16:01:35.890904Z ++20276 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++100 ++ ++l2tp.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++664b809805041c889128aef63213d5c0 ++2012-12-06T18:17:41.562848Z ++34537 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2823 ++ +diff --git a/feeds/packages/net/xl2tpd/files/.svn/prop-base/l2tp.sh.svn-base b/feeds/packages/net/xl2tpd/files/.svn/prop-base/l2tp.sh.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/prop-base/l2tp.sh.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xl2tpd/files/.svn/text-base/l2tp.sh.svn-base b/feeds/packages/net/xl2tpd/files/.svn/text-base/l2tp.sh.svn-base +new file mode 100644 +index 0000000..867234d +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/text-base/l2tp.sh.svn-base +@@ -0,0 +1,107 @@ ++#!/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/feeds/packages/net/xl2tpd/files/.svn/text-base/options.xl2tpd.svn-base b/feeds/packages/net/xl2tpd/files/.svn/text-base/options.xl2tpd.svn-base +new file mode 100644 +index 0000000..f0fc4f4 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/text-base/options.xl2tpd.svn-base +@@ -0,0 +1,13 @@ ++# ++ ++lock ++noauth ++debug ++dump ++logfd 2 ++logfile /var/log/xl2tpd.log ++noccp ++novj ++novjccomp ++nopcomp ++noaccomp +diff --git a/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tp-secrets.svn-base b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tp-secrets.svn-base +new file mode 100644 +index 0000000..0fb513f +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tp-secrets.svn-base +@@ -0,0 +1,5 @@ ++# Secrets for authenticating l2tp tunnels ++# us them secret ++# * marko blah2 ++# zeus marko blah ++# * * interop +diff --git a/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.conf.sample.svn-base b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.conf.sample.svn-base +new file mode 100644 +index 0000000..477afa5 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.conf.sample.svn-base +@@ -0,0 +1,73 @@ ++; ++; 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/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.conf.svn-base b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.conf.svn-base +new file mode 100644 +index 0000000..2423ff6 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.conf.svn-base +@@ -0,0 +1,23 @@ ++[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/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.init.svn-base b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.init.svn-base +new file mode 100644 +index 0000000..22e8459 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/.svn/text-base/xl2tpd.init.svn-base +@@ -0,0 +1,18 @@ ++#!/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/feeds/packages/net/xl2tpd/files/l2tp.sh b/feeds/packages/net/xl2tpd/files/l2tp.sh +new file mode 100644 +index 0000000..867234d +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/l2tp.sh +@@ -0,0 +1,107 @@ ++#!/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/feeds/packages/net/xl2tpd/files/options.xl2tpd b/feeds/packages/net/xl2tpd/files/options.xl2tpd +new file mode 100644 +index 0000000..f0fc4f4 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/options.xl2tpd +@@ -0,0 +1,13 @@ ++# ++ ++lock ++noauth ++debug ++dump ++logfd 2 ++logfile /var/log/xl2tpd.log ++noccp ++novj ++novjccomp ++nopcomp ++noaccomp +diff --git a/feeds/packages/net/xl2tpd/files/xl2tp-secrets b/feeds/packages/net/xl2tpd/files/xl2tp-secrets +new file mode 100644 +index 0000000..0fb513f +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/xl2tp-secrets +@@ -0,0 +1,5 @@ ++# Secrets for authenticating l2tp tunnels ++# us them secret ++# * marko blah2 ++# zeus marko blah ++# * * interop +diff --git a/feeds/packages/net/xl2tpd/files/xl2tpd.conf b/feeds/packages/net/xl2tpd/files/xl2tpd.conf +new file mode 100644 +index 0000000..2423ff6 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/xl2tpd.conf +@@ -0,0 +1,23 @@ ++[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/feeds/packages/net/xl2tpd/files/xl2tpd.conf.sample b/feeds/packages/net/xl2tpd/files/xl2tpd.conf.sample +new file mode 100644 +index 0000000..477afa5 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/xl2tpd.conf.sample +@@ -0,0 +1,73 @@ ++; ++; 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/feeds/packages/net/xl2tpd/files/xl2tpd.init b/feeds/packages/net/xl2tpd/files/xl2tpd.init +new file mode 100644 +index 0000000..22e8459 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/files/xl2tpd.init +@@ -0,0 +1,18 @@ ++#!/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/feeds/packages/net/xl2tpd/patches/.svn/entries b/feeds/packages/net/xl2tpd/patches/.svn/entries +new file mode 100644 +index 0000000..6ce8e82 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xl2tpd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-05T19:46:05.348165Z ++35017 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++120-kernel-mode-l2tp.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++9529652e70b1a521c016545b2f3f7c64 ++2013-01-05T19:46:05.348165Z ++35017 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++13067 ++ ++110-makefile_dont_build_pfc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++717cf53f2bf92b367cc8eac6423d9a6c ++2011-08-16T20:34:10.503073Z ++28012 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1219 ++ ++100-makefile_opt_flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++de28f2865b423d461e428e3840fb0a93 ++2011-03-11T20:04:43.693850Z ++26040 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++490 ++ ++130-no-kill-ipparam.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:38.000000Z ++379295d8d7e51ac35a6d582d11dc6f61 ++2012-05-02T19:28:10.685324Z ++31561 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++439 ++ +diff --git a/feeds/packages/net/xl2tpd/patches/.svn/text-base/100-makefile_opt_flags.patch.svn-base b/feeds/packages/net/xl2tpd/patches/.svn/text-base/100-makefile_opt_flags.patch.svn-base +new file mode 100644 +index 0000000..400bdf1 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/.svn/text-base/100-makefile_opt_flags.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -90,7 +90,8 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include ++ ++ 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/feeds/packages/net/xl2tpd/patches/.svn/text-base/110-makefile_dont_build_pfc.patch.svn-base b/feeds/packages/net/xl2tpd/patches/.svn/text-base/110-makefile_dont_build_pfc.patch.svn-base +new file mode 100644 +index 0000000..90b320f +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/.svn/text-base/110-makefile_dont_build_pfc.patch.svn-base +@@ -0,0 +1,43 @@ ++--- a/Makefile 2011-08-16 20:28:19.968069040 +0200 +++++ b/Makefile 2011-08-16 20:27:57.968069032 +0200 ++@@ -106,10 +106,10 @@ ++ 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) ++@@ -117,14 +117,10 @@ ++ $(CONTROL_EXEC): $(CONTROL_SRCS) ++ $(CC) $(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 ++@@ -132,11 +128,6 @@ ++ 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/feeds/packages/net/xl2tpd/patches/.svn/text-base/120-kernel-mode-l2tp.patch.svn-base b/feeds/packages/net/xl2tpd/patches/.svn/text-base/120-kernel-mode-l2tp.patch.svn-base +new file mode 100644 +index 0000000..7a136d6 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/.svn/text-base/120-kernel-mode-l2tp.patch.svn-base +@@ -0,0 +1,417 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -62,8 +62,8 @@ ++ # are packages seperately (eg kernel-headers on Fedora) ++ # Note: 2.6.23+ support still needs some changes in the xl2tpd source ++ # ++-#OSFLAGS+= -DUSE_KERNEL ++-# +++# Kernel mode fixed by sigwall +++OSFLAGS+= -DUSE_KERNEL ++ # ++ # Uncomment the next line for FreeBSD ++ # ++--- a/call.c +++++ b/call.c ++@@ -680,6 +680,8 @@ ++ st->peer.sin_port = port; ++ st->refme = refme; ++ st->refhim = refhim; +++ st->udp_fd = -1; +++ st->pppox_fd = -1; ++ bcopy (&addr, &st->peer.sin_addr, sizeof (addr)); ++ st->next = tunnels.head; ++ tunnels.head = st; ++--- a/control.c +++++ b/control.c ++@@ -596,6 +596,9 @@ ++ if (gconfig.debug_state) ++ l2tp_log (LOG_DEBUG, "%s: sending SCCCN\n", __FUNCTION__); ++ control_xmit (buf); +++ +++ connect_pppol2tp(t); +++ ++ /* Schedule a HELLO */ ++ tv.tv_sec = HELLO_DELAY; ++ tv.tv_usec = 0; ++@@ -608,6 +611,7 @@ ++ "Connection established to %s, %d. Local: %d, Remote: %d (ref=%u/%u).\n", ++ IPADDY (t->peer.sin_addr), ++ ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim); +++ ++ if (t->lac) ++ { ++ /* This is part of a LAC, so we want to go ahead ++@@ -635,6 +639,9 @@ ++ IPADDY (t->peer.sin_addr), ++ ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim, ++ t->lns->entname); +++ +++ connect_pppol2tp(t); +++ ++ /* Schedule a HELLO */ ++ tv.tv_sec = HELLO_DELAY; ++ tv.tv_usec = 0; ++--- a/l2tp.h +++++ b/l2tp.h ++@@ -167,6 +167,8 @@ ++ int ourrws; /* Receive Window Size */ ++ int rxspeed; /* Receive bps */ ++ int txspeed; /* Transmit bps */ +++ int udp_fd; /* UDP fd */ +++ int pppox_fd; /* PPPOX tunnel fd */ ++ struct call *self; ++ struct lns *lns; /* LNS that owns us */ ++ struct lac *lac; /* LAC that owns us */ ++@@ -220,6 +222,7 @@ ++ extern int ppd; ++ extern int switch_io; /* jz */ ++ extern int control_fd; +++extern int connect_pppol2tp(struct tunnel *t); ++ extern int start_pppd (struct call *c, struct ppp_opts *); ++ extern void magic_lac_dial (void *); ++ extern int get_entropy (unsigned char *, int); ++--- a/linux/include/linux/if_pppol2tp.h +++++ b/linux/include/linux/if_pppol2tp.h ++@@ -2,7 +2,7 @@ ++ * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661) ++ * ++ * This file supplies definitions required by the PPP over L2TP driver ++- * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c +++ * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c ++ * ++ * License: ++ * This program is free software; you can redistribute it and/or ++@@ -15,18 +15,13 @@ ++ #ifndef __LINUX_IF_PPPOL2TP_H ++ #define __LINUX_IF_PPPOL2TP_H ++ ++-#include ++- ++-#ifdef __KERNEL__ ++-#include ++-#endif +++#include ++ ++ /* Structure used to connect() the socket to a particular tunnel UDP ++- * socket. +++ * socket over IPv4. ++ */ ++-struct pppol2tp_addr ++-{ ++- pid_t pid; /* pid that owns the fd. +++struct pppol2tp_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP socket to use */ ++ ++@@ -36,6 +31,45 @@ ++ __u16 d_tunnel, d_session; /* For sending outgoing packets */ ++ }; ++ +++/* Structure used to connect() the socket to a particular tunnel UDP +++ * socket over IPv6. +++ */ +++struct pppol2tpin6_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. +++ * 0 => current */ +++ int fd; /* FD of UDP socket to use */ +++ +++ __u16 s_tunnel, s_session; /* For matching incoming packets */ +++ __u16 d_tunnel, d_session; /* For sending outgoing packets */ +++ +++ struct sockaddr_in6 addr; /* IP address and port to send to */ +++}; +++ +++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 +++ * bits. So we need a different sockaddr structure. +++ */ +++struct pppol2tpv3_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. +++ * 0 => current */ +++ int fd; /* FD of UDP or IP socket to use */ +++ +++ struct sockaddr_in addr; /* IP address and port to send to */ +++ +++ __u32 s_tunnel, s_session; /* For matching incoming packets */ +++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ +++}; +++ +++struct pppol2tpv3in6_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. +++ * 0 => current */ +++ int fd; /* FD of UDP or IP socket to use */ +++ +++ __u32 s_tunnel, s_session; /* For matching incoming packets */ +++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ +++ +++ struct sockaddr_in6 addr; /* IP address and port to send to */ +++}; +++ ++ /* Socket options: ++ * DEBUG - bitmask of debug message categories ++ * SENDSEQ - 0 => don't send packets with sequence numbers ++@@ -66,4 +100,4 @@ ++ ++ ++ ++-#endif +++#endif /* __LINUX_IF_PPPOL2TP_H */ ++--- a/network.c +++++ b/network.c ++@@ -45,6 +45,7 @@ ++ server.sin_family = AF_INET; ++ server.sin_addr.s_addr = gconfig.listenaddr; ++ server.sin_port = htons (gconfig.port); +++ int flags; ++ if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0) ++ { ++ l2tp_log (LOG_CRIT, "%s: Unable to allocate socket. Terminating.\n", ++@@ -52,6 +53,10 @@ ++ return -EINVAL; ++ }; ++ +++ flags = 1; +++ setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)); +++ setsockopt(server_socket, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags)); +++ ++ if (bind (server_socket, (struct sockaddr *) &server, sizeof (server))) ++ { ++ close (server_socket); ++@@ -321,6 +326,11 @@ ++ ++ while (tun) ++ { +++ if (tun->udp_fd > -1) { +++ if (tun->udp_fd > max) +++ max = tun->udp_fd; +++ FD_SET (tun->udp_fd, readfds); +++ } ++ call = tun->call_head; ++ while (call) ++ { ++@@ -390,6 +400,8 @@ ++ struct iovec iov; ++ char cbuf[256]; ++ unsigned int refme, refhim; +++ int * currentfd; +++ int server_socket_processed; ++ ++ /* This one buffer can be recycled for everything except control packets */ ++ buf = new_buf (MAX_RECV_SIZE); ++@@ -428,7 +440,21 @@ ++ { ++ do_control (); ++ } ++- if (FD_ISSET (server_socket, &readfds)) +++ server_socket_processed = 0; +++ currentfd = NULL; +++ st = tunnels.head; +++ while (st || !server_socket_processed) { +++ if (st && (st->udp_fd == -1)) { +++ st=st->next; +++ continue; +++ } +++ if (st) { +++ currentfd = &st->udp_fd; +++ } else { +++ currentfd = &server_socket; +++ server_socket_processed = 1; +++ } +++ if (FD_ISSET (*currentfd, &readfds)) ++ { ++ /* ++ * Okay, now we're ready for reading and processing new data. ++@@ -457,12 +483,19 @@ ++ msgh.msg_flags = 0; ++ ++ /* Receive one packet. */ ++- recvsize = recvmsg(server_socket, &msgh, 0); +++ recvsize = recvmsg(*currentfd, &msgh, 0); ++ ++ if (recvsize < MIN_PAYLOAD_HDR_LEN) ++ { ++ if (recvsize < 0) ++ { +++ if (errno == ECONNREFUSED) { +++ close(*currentfd); +++ } +++ if ((errno == ECONNREFUSED) || +++ (errno == EBADF)) { +++ *currentfd = -1; +++ } ++ if (errno != EAGAIN) ++ l2tp_log (LOG_WARNING, ++ "%s: recvfrom returned error %d (%s)\n", ++@@ -567,6 +600,8 @@ ++ } ++ }; ++ } +++ if (st) st=st->next; +++ } ++ ++ /* ++ * finished obvious sources, look for data from PPP connections. ++@@ -639,3 +674,82 @@ ++ } ++ ++ } +++ +++int connect_pppol2tp(struct tunnel *t) { +++#ifdef USE_KERNEL +++ if (kernel_support) { +++ int ufd = -1, fd2 = -1; +++ int flags; +++ struct sockaddr_pppol2tp sax; +++ +++ struct sockaddr_in server; +++ server.sin_family = AF_INET; +++ server.sin_addr.s_addr = gconfig.listenaddr; +++ server.sin_port = htons (gconfig.port); +++ if ((ufd = socket (PF_INET, SOCK_DGRAM, 0)) < 0) +++ { +++ l2tp_log (LOG_CRIT, "%s: Unable to allocate UDP socket. Terminating.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ }; +++ +++ flags=1; +++ setsockopt(ufd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)); +++ setsockopt(ufd, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags)); +++ +++ if (bind (ufd, (struct sockaddr *) &server, sizeof (server))) +++ { +++ close (ufd); +++ l2tp_log (LOG_CRIT, "%s: Unable to bind UDP socket: %s. Terminating.\n", +++ __FUNCTION__, strerror(errno), errno); +++ return -EINVAL; +++ }; +++ server = t->peer; +++ flags = fcntl(ufd, F_GETFL); +++ if (flags == -1 || fcntl(ufd, F_SETFL, flags | O_NONBLOCK) == -1) { +++ l2tp_log (LOG_WARNING, "%s: Unable to set UDP socket nonblock.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ if (connect (ufd, (struct sockaddr *) &server, sizeof(server)) < 0) { +++ l2tp_log (LOG_CRIT, "%s: Unable to connect UDP peer. Terminating.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ +++ t->udp_fd=ufd; +++ +++ fd2 = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); +++ if (fd2 < 0) { +++ l2tp_log (LOG_WARNING, "%s: Unable to allocate PPPoL2TP socket.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ flags = fcntl(fd2, F_GETFL); +++ if (flags == -1 || fcntl(fd2, F_SETFL, flags | O_NONBLOCK) == -1) { +++ l2tp_log (LOG_WARNING, "%s: Unable to set PPPoL2TP socket nonblock.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ sax.sa_family = AF_PPPOX; +++ sax.sa_protocol = PX_PROTO_OL2TP; +++ sax.pppol2tp.pid = 0; +++ sax.pppol2tp.fd = t->udp_fd; +++ sax.pppol2tp.addr.sin_addr.s_addr = t->peer.sin_addr.s_addr; +++ sax.pppol2tp.addr.sin_port = t->peer.sin_port; +++ sax.pppol2tp.addr.sin_family = AF_INET; +++ sax.pppol2tp.s_tunnel = t->ourtid; +++ sax.pppol2tp.s_session = 0; +++ sax.pppol2tp.d_tunnel = t->tid; +++ sax.pppol2tp.d_session = 0; +++ if ((connect(fd2, (struct sockaddr *)&sax, sizeof(sax))) < 0) { +++ l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket. %d %s\n", +++ __FUNCTION__, errno, strerror(errno)); +++ close(fd2); +++ return -EINVAL; +++ } +++ t->pppox_fd = fd2; +++ } +++#endif +++ return 0; +++} ++--- a/xl2tpd.c +++++ b/xl2tpd.c ++@@ -278,7 +278,11 @@ ++ struct tunnel *st, *st2; ++ int sec; ++ l2tp_log (LOG_CRIT, "%s: Fatal signal %d received\n", __FUNCTION__, signal); +++#ifdef USE_KERNEL +++ if (kernel_support || signal != SIGTERM) { +++#else ++ if (signal != SIGTERM) { +++#endif ++ st = tunnels.head; ++ while (st) ++ { ++@@ -349,7 +353,7 @@ ++ int flags; ++ #endif ++ int pos = 1; ++- int fd2; +++ int fd2 = -1; ++ #ifdef DEBUG_PPPD ++ int x; ++ #endif ++@@ -397,7 +401,7 @@ ++ sax.sa_family = AF_PPPOX; ++ sax.sa_protocol = PX_PROTO_OL2TP; ++ sax.pppol2tp.pid = 0; ++- sax.pppol2tp.fd = server_socket; +++ sax.pppol2tp.fd = c->container->udp_fd; ++ sax.pppol2tp.addr.sin_addr.s_addr = c->container->peer.sin_addr.s_addr; ++ sax.pppol2tp.addr.sin_port = c->container->peer.sin_port; ++ sax.pppol2tp.addr.sin_family = AF_INET; ++@@ -408,6 +412,7 @@ ++ if (connect(fd2, (struct sockaddr *)&sax, sizeof(sax)) < 0) { ++ l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket.\n", ++ __FUNCTION__); +++ close(fd2); ++ return -EINVAL; ++ } ++ stropt[pos++] = strdup ("plugin"); ++@@ -484,7 +489,7 @@ ++ dup2 (fd2, 0); ++ dup2 (fd2, 1); ++ close(fd2); ++- +++ } ++ /* close all the calls pty fds */ ++ st = tunnels.head; ++ while (st) ++@@ -492,12 +497,17 @@ ++ sc = st->call_head; ++ while (sc) ++ { ++- close (sc->fd); +++#ifdef USE_KERNEL +++ if (kernel_support) { +++ close(st->udp_fd); /* tunnel UDP fd */ +++ close(st->pppox_fd); /* tunnel PPPoX fd */ +++ } else +++#endif +++ close (sc->fd); /* call pty fd */ ++ sc = sc->next; ++ } ++ st = st->next; ++ } ++- } ++ ++ /* close the UDP socket fd */ ++ close (server_socket); ++@@ -615,6 +625,10 @@ ++ the memory pointed to by t->chal_us.vector at some other place */ ++ if (t->chal_them.vector) ++ free (t->chal_them.vector); +++ if (t->pppox_fd > -1 ) +++ close (t->pppox_fd); +++ if (t->udp_fd > -1 ) +++ close (t->udp_fd); ++ free (t); ++ free (me); ++ } +diff --git a/feeds/packages/net/xl2tpd/patches/.svn/text-base/130-no-kill-ipparam.patch.svn-base b/feeds/packages/net/xl2tpd/patches/.svn/text-base/130-no-kill-ipparam.patch.svn-base +new file mode 100644 +index 0000000..896d391 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/.svn/text-base/130-no-kill-ipparam.patch.svn-base +@@ -0,0 +1,11 @@ ++--- xl2tpd-1.3.1/control.c.orig 2012-04-25 12:59:28.718825985 +0100 +++++ xl2tpd-1.3.1/control.c 2012-04-25 12:59:37.063916785 +0100 ++@@ -905,8 +905,6 @@ int control_finish (struct tunnel *t, st ++ po = add_opt (po, c->lac->pppoptfile); ++ } ++ }; ++- po = add_opt (po, "ipparam"); ++- po = add_opt (po, IPADDY (t->peer.sin_addr)); ++ start_pppd (c, po); ++ opt_destroy (po); ++ if (c->lac) +diff --git a/feeds/packages/net/xl2tpd/patches/100-makefile_opt_flags.patch b/feeds/packages/net/xl2tpd/patches/100-makefile_opt_flags.patch +new file mode 100644 +index 0000000..400bdf1 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/100-makefile_opt_flags.patch +@@ -0,0 +1,12 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -90,7 +90,8 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include ++ ++ 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/feeds/packages/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch b/feeds/packages/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch +new file mode 100644 +index 0000000..90b320f +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch +@@ -0,0 +1,43 @@ ++--- a/Makefile 2011-08-16 20:28:19.968069040 +0200 +++++ b/Makefile 2011-08-16 20:27:57.968069032 +0200 ++@@ -106,10 +106,10 @@ ++ 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) ++@@ -117,14 +117,10 @@ ++ $(CONTROL_EXEC): $(CONTROL_SRCS) ++ $(CC) $(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 ++@@ -132,11 +128,6 @@ ++ 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/feeds/packages/net/xl2tpd/patches/120-kernel-mode-l2tp.patch b/feeds/packages/net/xl2tpd/patches/120-kernel-mode-l2tp.patch +new file mode 100644 +index 0000000..7a136d6 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/120-kernel-mode-l2tp.patch +@@ -0,0 +1,417 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -62,8 +62,8 @@ ++ # are packages seperately (eg kernel-headers on Fedora) ++ # Note: 2.6.23+ support still needs some changes in the xl2tpd source ++ # ++-#OSFLAGS+= -DUSE_KERNEL ++-# +++# Kernel mode fixed by sigwall +++OSFLAGS+= -DUSE_KERNEL ++ # ++ # Uncomment the next line for FreeBSD ++ # ++--- a/call.c +++++ b/call.c ++@@ -680,6 +680,8 @@ ++ st->peer.sin_port = port; ++ st->refme = refme; ++ st->refhim = refhim; +++ st->udp_fd = -1; +++ st->pppox_fd = -1; ++ bcopy (&addr, &st->peer.sin_addr, sizeof (addr)); ++ st->next = tunnels.head; ++ tunnels.head = st; ++--- a/control.c +++++ b/control.c ++@@ -596,6 +596,9 @@ ++ if (gconfig.debug_state) ++ l2tp_log (LOG_DEBUG, "%s: sending SCCCN\n", __FUNCTION__); ++ control_xmit (buf); +++ +++ connect_pppol2tp(t); +++ ++ /* Schedule a HELLO */ ++ tv.tv_sec = HELLO_DELAY; ++ tv.tv_usec = 0; ++@@ -608,6 +611,7 @@ ++ "Connection established to %s, %d. Local: %d, Remote: %d (ref=%u/%u).\n", ++ IPADDY (t->peer.sin_addr), ++ ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim); +++ ++ if (t->lac) ++ { ++ /* This is part of a LAC, so we want to go ahead ++@@ -635,6 +639,9 @@ ++ IPADDY (t->peer.sin_addr), ++ ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim, ++ t->lns->entname); +++ +++ connect_pppol2tp(t); +++ ++ /* Schedule a HELLO */ ++ tv.tv_sec = HELLO_DELAY; ++ tv.tv_usec = 0; ++--- a/l2tp.h +++++ b/l2tp.h ++@@ -167,6 +167,8 @@ ++ int ourrws; /* Receive Window Size */ ++ int rxspeed; /* Receive bps */ ++ int txspeed; /* Transmit bps */ +++ int udp_fd; /* UDP fd */ +++ int pppox_fd; /* PPPOX tunnel fd */ ++ struct call *self; ++ struct lns *lns; /* LNS that owns us */ ++ struct lac *lac; /* LAC that owns us */ ++@@ -220,6 +222,7 @@ ++ extern int ppd; ++ extern int switch_io; /* jz */ ++ extern int control_fd; +++extern int connect_pppol2tp(struct tunnel *t); ++ extern int start_pppd (struct call *c, struct ppp_opts *); ++ extern void magic_lac_dial (void *); ++ extern int get_entropy (unsigned char *, int); ++--- a/linux/include/linux/if_pppol2tp.h +++++ b/linux/include/linux/if_pppol2tp.h ++@@ -2,7 +2,7 @@ ++ * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661) ++ * ++ * This file supplies definitions required by the PPP over L2TP driver ++- * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c +++ * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c ++ * ++ * License: ++ * This program is free software; you can redistribute it and/or ++@@ -15,18 +15,13 @@ ++ #ifndef __LINUX_IF_PPPOL2TP_H ++ #define __LINUX_IF_PPPOL2TP_H ++ ++-#include ++- ++-#ifdef __KERNEL__ ++-#include ++-#endif +++#include ++ ++ /* Structure used to connect() the socket to a particular tunnel UDP ++- * socket. +++ * socket over IPv4. ++ */ ++-struct pppol2tp_addr ++-{ ++- pid_t pid; /* pid that owns the fd. +++struct pppol2tp_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP socket to use */ ++ ++@@ -36,6 +31,45 @@ ++ __u16 d_tunnel, d_session; /* For sending outgoing packets */ ++ }; ++ +++/* Structure used to connect() the socket to a particular tunnel UDP +++ * socket over IPv6. +++ */ +++struct pppol2tpin6_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. +++ * 0 => current */ +++ int fd; /* FD of UDP socket to use */ +++ +++ __u16 s_tunnel, s_session; /* For matching incoming packets */ +++ __u16 d_tunnel, d_session; /* For sending outgoing packets */ +++ +++ struct sockaddr_in6 addr; /* IP address and port to send to */ +++}; +++ +++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 +++ * bits. So we need a different sockaddr structure. +++ */ +++struct pppol2tpv3_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. +++ * 0 => current */ +++ int fd; /* FD of UDP or IP socket to use */ +++ +++ struct sockaddr_in addr; /* IP address and port to send to */ +++ +++ __u32 s_tunnel, s_session; /* For matching incoming packets */ +++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ +++}; +++ +++struct pppol2tpv3in6_addr { +++ __kernel_pid_t pid; /* pid that owns the fd. +++ * 0 => current */ +++ int fd; /* FD of UDP or IP socket to use */ +++ +++ __u32 s_tunnel, s_session; /* For matching incoming packets */ +++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ +++ +++ struct sockaddr_in6 addr; /* IP address and port to send to */ +++}; +++ ++ /* Socket options: ++ * DEBUG - bitmask of debug message categories ++ * SENDSEQ - 0 => don't send packets with sequence numbers ++@@ -66,4 +100,4 @@ ++ ++ ++ ++-#endif +++#endif /* __LINUX_IF_PPPOL2TP_H */ ++--- a/network.c +++++ b/network.c ++@@ -45,6 +45,7 @@ ++ server.sin_family = AF_INET; ++ server.sin_addr.s_addr = gconfig.listenaddr; ++ server.sin_port = htons (gconfig.port); +++ int flags; ++ if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0) ++ { ++ l2tp_log (LOG_CRIT, "%s: Unable to allocate socket. Terminating.\n", ++@@ -52,6 +53,10 @@ ++ return -EINVAL; ++ }; ++ +++ flags = 1; +++ setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)); +++ setsockopt(server_socket, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags)); +++ ++ if (bind (server_socket, (struct sockaddr *) &server, sizeof (server))) ++ { ++ close (server_socket); ++@@ -321,6 +326,11 @@ ++ ++ while (tun) ++ { +++ if (tun->udp_fd > -1) { +++ if (tun->udp_fd > max) +++ max = tun->udp_fd; +++ FD_SET (tun->udp_fd, readfds); +++ } ++ call = tun->call_head; ++ while (call) ++ { ++@@ -390,6 +400,8 @@ ++ struct iovec iov; ++ char cbuf[256]; ++ unsigned int refme, refhim; +++ int * currentfd; +++ int server_socket_processed; ++ ++ /* This one buffer can be recycled for everything except control packets */ ++ buf = new_buf (MAX_RECV_SIZE); ++@@ -428,7 +440,21 @@ ++ { ++ do_control (); ++ } ++- if (FD_ISSET (server_socket, &readfds)) +++ server_socket_processed = 0; +++ currentfd = NULL; +++ st = tunnels.head; +++ while (st || !server_socket_processed) { +++ if (st && (st->udp_fd == -1)) { +++ st=st->next; +++ continue; +++ } +++ if (st) { +++ currentfd = &st->udp_fd; +++ } else { +++ currentfd = &server_socket; +++ server_socket_processed = 1; +++ } +++ if (FD_ISSET (*currentfd, &readfds)) ++ { ++ /* ++ * Okay, now we're ready for reading and processing new data. ++@@ -457,12 +483,19 @@ ++ msgh.msg_flags = 0; ++ ++ /* Receive one packet. */ ++- recvsize = recvmsg(server_socket, &msgh, 0); +++ recvsize = recvmsg(*currentfd, &msgh, 0); ++ ++ if (recvsize < MIN_PAYLOAD_HDR_LEN) ++ { ++ if (recvsize < 0) ++ { +++ if (errno == ECONNREFUSED) { +++ close(*currentfd); +++ } +++ if ((errno == ECONNREFUSED) || +++ (errno == EBADF)) { +++ *currentfd = -1; +++ } ++ if (errno != EAGAIN) ++ l2tp_log (LOG_WARNING, ++ "%s: recvfrom returned error %d (%s)\n", ++@@ -567,6 +600,8 @@ ++ } ++ }; ++ } +++ if (st) st=st->next; +++ } ++ ++ /* ++ * finished obvious sources, look for data from PPP connections. ++@@ -639,3 +674,82 @@ ++ } ++ ++ } +++ +++int connect_pppol2tp(struct tunnel *t) { +++#ifdef USE_KERNEL +++ if (kernel_support) { +++ int ufd = -1, fd2 = -1; +++ int flags; +++ struct sockaddr_pppol2tp sax; +++ +++ struct sockaddr_in server; +++ server.sin_family = AF_INET; +++ server.sin_addr.s_addr = gconfig.listenaddr; +++ server.sin_port = htons (gconfig.port); +++ if ((ufd = socket (PF_INET, SOCK_DGRAM, 0)) < 0) +++ { +++ l2tp_log (LOG_CRIT, "%s: Unable to allocate UDP socket. Terminating.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ }; +++ +++ flags=1; +++ setsockopt(ufd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)); +++ setsockopt(ufd, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags)); +++ +++ if (bind (ufd, (struct sockaddr *) &server, sizeof (server))) +++ { +++ close (ufd); +++ l2tp_log (LOG_CRIT, "%s: Unable to bind UDP socket: %s. Terminating.\n", +++ __FUNCTION__, strerror(errno), errno); +++ return -EINVAL; +++ }; +++ server = t->peer; +++ flags = fcntl(ufd, F_GETFL); +++ if (flags == -1 || fcntl(ufd, F_SETFL, flags | O_NONBLOCK) == -1) { +++ l2tp_log (LOG_WARNING, "%s: Unable to set UDP socket nonblock.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ if (connect (ufd, (struct sockaddr *) &server, sizeof(server)) < 0) { +++ l2tp_log (LOG_CRIT, "%s: Unable to connect UDP peer. Terminating.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ +++ t->udp_fd=ufd; +++ +++ fd2 = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP); +++ if (fd2 < 0) { +++ l2tp_log (LOG_WARNING, "%s: Unable to allocate PPPoL2TP socket.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ flags = fcntl(fd2, F_GETFL); +++ if (flags == -1 || fcntl(fd2, F_SETFL, flags | O_NONBLOCK) == -1) { +++ l2tp_log (LOG_WARNING, "%s: Unable to set PPPoL2TP socket nonblock.\n", +++ __FUNCTION__); +++ return -EINVAL; +++ } +++ sax.sa_family = AF_PPPOX; +++ sax.sa_protocol = PX_PROTO_OL2TP; +++ sax.pppol2tp.pid = 0; +++ sax.pppol2tp.fd = t->udp_fd; +++ sax.pppol2tp.addr.sin_addr.s_addr = t->peer.sin_addr.s_addr; +++ sax.pppol2tp.addr.sin_port = t->peer.sin_port; +++ sax.pppol2tp.addr.sin_family = AF_INET; +++ sax.pppol2tp.s_tunnel = t->ourtid; +++ sax.pppol2tp.s_session = 0; +++ sax.pppol2tp.d_tunnel = t->tid; +++ sax.pppol2tp.d_session = 0; +++ if ((connect(fd2, (struct sockaddr *)&sax, sizeof(sax))) < 0) { +++ l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket. %d %s\n", +++ __FUNCTION__, errno, strerror(errno)); +++ close(fd2); +++ return -EINVAL; +++ } +++ t->pppox_fd = fd2; +++ } +++#endif +++ return 0; +++} ++--- a/xl2tpd.c +++++ b/xl2tpd.c ++@@ -278,7 +278,11 @@ ++ struct tunnel *st, *st2; ++ int sec; ++ l2tp_log (LOG_CRIT, "%s: Fatal signal %d received\n", __FUNCTION__, signal); +++#ifdef USE_KERNEL +++ if (kernel_support || signal != SIGTERM) { +++#else ++ if (signal != SIGTERM) { +++#endif ++ st = tunnels.head; ++ while (st) ++ { ++@@ -349,7 +353,7 @@ ++ int flags; ++ #endif ++ int pos = 1; ++- int fd2; +++ int fd2 = -1; ++ #ifdef DEBUG_PPPD ++ int x; ++ #endif ++@@ -397,7 +401,7 @@ ++ sax.sa_family = AF_PPPOX; ++ sax.sa_protocol = PX_PROTO_OL2TP; ++ sax.pppol2tp.pid = 0; ++- sax.pppol2tp.fd = server_socket; +++ sax.pppol2tp.fd = c->container->udp_fd; ++ sax.pppol2tp.addr.sin_addr.s_addr = c->container->peer.sin_addr.s_addr; ++ sax.pppol2tp.addr.sin_port = c->container->peer.sin_port; ++ sax.pppol2tp.addr.sin_family = AF_INET; ++@@ -408,6 +412,7 @@ ++ if (connect(fd2, (struct sockaddr *)&sax, sizeof(sax)) < 0) { ++ l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket.\n", ++ __FUNCTION__); +++ close(fd2); ++ return -EINVAL; ++ } ++ stropt[pos++] = strdup ("plugin"); ++@@ -484,7 +489,7 @@ ++ dup2 (fd2, 0); ++ dup2 (fd2, 1); ++ close(fd2); ++- +++ } ++ /* close all the calls pty fds */ ++ st = tunnels.head; ++ while (st) ++@@ -492,12 +497,17 @@ ++ sc = st->call_head; ++ while (sc) ++ { ++- close (sc->fd); +++#ifdef USE_KERNEL +++ if (kernel_support) { +++ close(st->udp_fd); /* tunnel UDP fd */ +++ close(st->pppox_fd); /* tunnel PPPoX fd */ +++ } else +++#endif +++ close (sc->fd); /* call pty fd */ ++ sc = sc->next; ++ } ++ st = st->next; ++ } ++- } ++ ++ /* close the UDP socket fd */ ++ close (server_socket); ++@@ -615,6 +625,10 @@ ++ the memory pointed to by t->chal_us.vector at some other place */ ++ if (t->chal_them.vector) ++ free (t->chal_them.vector); +++ if (t->pppox_fd > -1 ) +++ close (t->pppox_fd); +++ if (t->udp_fd > -1 ) +++ close (t->udp_fd); ++ free (t); ++ free (me); ++ } +diff --git a/feeds/packages/net/xl2tpd/patches/130-no-kill-ipparam.patch b/feeds/packages/net/xl2tpd/patches/130-no-kill-ipparam.patch +new file mode 100644 +index 0000000..896d391 +--- /dev/null ++++ b/feeds/packages/net/xl2tpd/patches/130-no-kill-ipparam.patch +@@ -0,0 +1,11 @@ ++--- xl2tpd-1.3.1/control.c.orig 2012-04-25 12:59:28.718825985 +0100 +++++ xl2tpd-1.3.1/control.c 2012-04-25 12:59:37.063916785 +0100 ++@@ -905,8 +905,6 @@ int control_finish (struct tunnel *t, st ++ po = add_opt (po, c->lac->pppoptfile); ++ } ++ }; ++- po = add_opt (po, "ipparam"); ++- po = add_opt (po, IPADDY (t->peer.sin_addr)); ++ start_pppd (c, po); ++ opt_destroy (po); ++ if (c->lac) +diff --git a/feeds/packages/net/xsupplicant/.svn/entries b/feeds/packages/net/xsupplicant/.svn/entries +new file mode 100644 +index 0000000..55ba710 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xsupplicant ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T08:26:12.011482Z ++26102 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++11497e7766588b50dad09ec0f3b55b86 ++2011-03-12T08:26:12.011482Z ++26102 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1687 ++ +diff --git a/feeds/packages/net/xsupplicant/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/xsupplicant/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xsupplicant/.svn/text-base/Makefile.svn-base b/feeds/packages/net/xsupplicant/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e9efc2b +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# Copyright (C) 2006-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:=xsupplicant ++PKG_VERSION:=1.2.8 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/open1x ++PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226 ++ ++PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xsupplicant ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=wireless ++ DEPENDS:=+libopenssl +libiw ++ TITLE:=A fully compliant 802.1x authenticator ++ URL:=http://open1x.sourceforge.net/ ++endef ++ ++define Package/xsupplicant/description ++ This software allows a GNU/Linux or BSD workstation to authenticate with ++ a RADIUS server using 802.1x and various EAP protocols. ++endef ++ ++define Package/xsupplicant/conffiles ++/etc/xsupplicant.conf ++endef ++ ++TARGET_CFLAGS += --std=gnu99 ++ ++CONFIGURE_ARGS+= \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \ ++ ++CONFIGURE_VARS+= \ ++ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/madwifi" \ ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure.in \ ++ aclocal.m4 \ ++ Makefile.in \ ++ configure \ ++ ); ++endef ++ ++define Package/xsupplicant/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,xsupplicant)) +diff --git a/feeds/packages/net/xsupplicant/Makefile b/feeds/packages/net/xsupplicant/Makefile +new file mode 100644 +index 0000000..e9efc2b +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/Makefile +@@ -0,0 +1,70 @@ ++# ++# Copyright (C) 2006-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:=xsupplicant ++PKG_VERSION:=1.2.8 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/open1x ++PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226 ++ ++PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xsupplicant ++ SECTION:=net ++ CATEGORY:=Network ++ SUBMENU:=wireless ++ DEPENDS:=+libopenssl +libiw ++ TITLE:=A fully compliant 802.1x authenticator ++ URL:=http://open1x.sourceforge.net/ ++endef ++ ++define Package/xsupplicant/description ++ This software allows a GNU/Linux or BSD workstation to authenticate with ++ a RADIUS server using 802.1x and various EAP protocols. ++endef ++ ++define Package/xsupplicant/conffiles ++/etc/xsupplicant.conf ++endef ++ ++TARGET_CFLAGS += --std=gnu99 ++ ++CONFIGURE_ARGS+= \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \ ++ ++CONFIGURE_VARS+= \ ++ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/madwifi" \ ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ (cd $(PKG_BUILD_DIR); touch \ ++ configure.in \ ++ aclocal.m4 \ ++ Makefile.in \ ++ configure \ ++ ); ++endef ++ ++define Package/xsupplicant/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,xsupplicant)) +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/entries b/feeds/packages/net/xsupplicant/patches/.svn/entries +new file mode 100644 +index 0000000..5e1f1c1 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/xsupplicant/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-05T16:50:13.862165Z ++17896 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++006-no_wireless_h.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++b43aba0c852683a3dfe554a463369bd1 ++2009-10-05T16:50:13.862165Z ++17896 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1526 ++ ++001-no-lfl.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++13a78b7dbeac9c2bc216e75895d08788 ++2009-01-11T01:55:25.313485Z ++13971 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++390 ++ ++005-no_private_linux_header_includes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++5e9b022c7c64be50c67b381e1cd61a43 ++2009-10-05T16:50:13.862165Z ++17896 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2060 ++ ++002-disable-procfs-check.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++0c43ebb552467ee7e14bd41d354fa58e ++2009-01-11T01:55:25.313485Z ++13971 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++613 ++ ++003-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++5a22bb3e360f4783f375f5a0fd1f5ced ++2009-01-11T01:55:25.313485Z ++13971 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++320 ++ +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/prop-base/001-no-lfl.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/prop-base/001-no-lfl.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/prop-base/001-no-lfl.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/prop-base/002-disable-procfs-check.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/prop-base/002-disable-procfs-check.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/prop-base/002-disable-procfs-check.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/prop-base/003-compile_fix.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/prop-base/003-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/prop-base/003-compile_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/text-base/001-no-lfl.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/text-base/001-no-lfl.patch.svn-base +new file mode 100644 +index 0000000..7110814 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/text-base/001-no-lfl.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/configure +++++ b/configure ++@@ -3259,7 +3259,7 @@ if test "$LEX" = :; then ++ fi ++ if test -n "$LEX"; then ++ LFLAGS="$LFLAGS -i" ++- MORELIBS="${MORELIBS} -lfl" +++ ++ fi ++ ++ ac_ext=c ++--- a/configure.in +++++ b/configure.in ++@@ -18,7 +18,7 @@ AC_PROG_YACC ++ AM_PROG_LEX ++ if test -n "$LEX"; then ++ LFLAGS="$LFLAGS -i" ++- MORELIBS="${MORELIBS} -lfl" +++ ++ fi ++ ++ AC_HEADER_STDC +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/text-base/002-disable-procfs-check.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/text-base/002-disable-procfs-check.patch.svn-base +new file mode 100644 +index 0000000..2c7177a +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/text-base/002-disable-procfs-check.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/configure +++++ b/configure ++@@ -5362,19 +5362,6 @@ _ACEOF ++ FRAMER="generic" ++ fi ++ ++-if test $FRAMER = "linux"; then ++- echo "$as_me:$LINENO: checking for procfs support" >&5 ++-echo $ECHO_N "checking for procfs support... $ECHO_C" >&6 ++- if test -r /proc/net/dev; then ++- echo "$as_me:$LINENO: result: okay" >&5 ++-echo "${ECHO_T}okay" >&6 ++- else ++- { { echo "$as_me:$LINENO: error: You must have ProcFS enabled in your kernel!" >&5 ++-echo "$as_me: error: You must have ProcFS enabled in your kernel!" >&2;} ++- { (exit 1); exit 1; }; }; ++- fi ++-fi ++- ++ CFLAGS="$GGDBFLAGS $CFLAGS" ++ ++ touch Makefile.in +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/text-base/003-compile_fix.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/text-base/003-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..30fe2c6 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/text-base/003-compile_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/lib/libxsupgui/Makefile.in +++++ b/lib/libxsupgui/Makefile.in ++@@ -91,7 +91,7 @@ install_sh = @install_sh@ ++ with_openssl_libs = @with_openssl_libs@ ++ AUTOMAKE_OPTIONS = foreign no-dependencies ++ ++-INCLUDES = ${top_srcdir}/src +++INCLUDES = -I${top_srcdir}/src ++ ++ include_HEADERS = xsupgui.h ++ lib_LIBRARIES = libxsupgui.a +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/text-base/005-no_private_linux_header_includes.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/text-base/005-no_private_linux_header_includes.patch.svn-base +new file mode 100644 +index 0000000..3caf928 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/text-base/005-no_private_linux_header_includes.patch.svn-base +@@ -0,0 +1,48 @@ ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_atmel_driver.c 2006-10-08 05:42:53.000000000 +0200 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c 2009-01-11 02:59:46.998587770 +0100 ++@@ -103,7 +103,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_linux.c 2006-10-08 05:42:53.000000000 +0200 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c 2009-01-11 03:00:04.496300396 +0100 ++@@ -174,7 +174,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_linux_rtnetlink.c 2006-10-08 05:42:53.000000000 +0200 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c 2009-01-11 03:00:14.997328194 +0100 ++@@ -203,7 +203,6 @@ ++ ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include "netlink.h" ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_linux_wext.c 2009-01-11 02:58:02.000000000 +0100 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c 2009-01-11 03:00:26.230427636 +0100 ++@@ -203,7 +203,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/net/xsupplicant/patches/.svn/text-base/006-no_wireless_h.patch.svn-base b/feeds/packages/net/xsupplicant/patches/.svn/text-base/006-no_wireless_h.patch.svn-base +new file mode 100644 +index 0000000..378e21f +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/.svn/text-base/006-no_wireless_h.patch.svn-base +@@ -0,0 +1,61 @@ ++--- a/src/cardif/linux/cardif_atmel_driver.c +++++ b/src/cardif/linux/cardif_atmel_driver.c ++@@ -109,7 +109,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ #ifdef USE_EFENCE ++ #include ++--- a/src/cardif/linux/cardif_linux.c +++++ b/src/cardif/linux/cardif_linux.c ++@@ -180,7 +180,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ #include "xsupconfig.h" ++ #include "profile.h" ++--- a/src/cardif/linux/cardif_linux_rtnetlink.c +++++ b/src/cardif/linux/cardif_linux_rtnetlink.c ++@@ -207,10 +207,8 @@ ++ #include ++ #include "netlink.h" ++ #include "rtnetlink.h" ++-#include ++ #include ++ #include ++-#include ++ ++ #include "profile.h" ++ #include "xsupconfig.h" ++--- a/src/cardif/linux/cardif_linux_wext.c +++++ b/src/cardif/linux/cardif_linux_wext.c ++@@ -203,7 +203,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include ++--- a/configure +++++ b/configure ++@@ -4759,7 +4759,6 @@ cat >>conftest.$ac_ext <<_ACEOF ++ #ifndef __user ++ #define __user ++ #endif ++- #include ++ ++ #include <$ac_header> ++ _ACEOF ++@@ -4823,7 +4822,6 @@ cat >>conftest.$ac_ext <<_ACEOF ++ #ifndef __user ++ #define __user ++ #endif ++- #include ++ #include ++ int ++ main () +diff --git a/feeds/packages/net/xsupplicant/patches/001-no-lfl.patch b/feeds/packages/net/xsupplicant/patches/001-no-lfl.patch +new file mode 100644 +index 0000000..7110814 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/001-no-lfl.patch +@@ -0,0 +1,22 @@ ++--- a/configure +++++ b/configure ++@@ -3259,7 +3259,7 @@ if test "$LEX" = :; then ++ fi ++ if test -n "$LEX"; then ++ LFLAGS="$LFLAGS -i" ++- MORELIBS="${MORELIBS} -lfl" +++ ++ fi ++ ++ ac_ext=c ++--- a/configure.in +++++ b/configure.in ++@@ -18,7 +18,7 @@ AC_PROG_YACC ++ AM_PROG_LEX ++ if test -n "$LEX"; then ++ LFLAGS="$LFLAGS -i" ++- MORELIBS="${MORELIBS} -lfl" +++ ++ fi ++ ++ AC_HEADER_STDC +diff --git a/feeds/packages/net/xsupplicant/patches/002-disable-procfs-check.patch b/feeds/packages/net/xsupplicant/patches/002-disable-procfs-check.patch +new file mode 100644 +index 0000000..2c7177a +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/002-disable-procfs-check.patch +@@ -0,0 +1,22 @@ ++--- a/configure +++++ b/configure ++@@ -5362,19 +5362,6 @@ _ACEOF ++ FRAMER="generic" ++ fi ++ ++-if test $FRAMER = "linux"; then ++- echo "$as_me:$LINENO: checking for procfs support" >&5 ++-echo $ECHO_N "checking for procfs support... $ECHO_C" >&6 ++- if test -r /proc/net/dev; then ++- echo "$as_me:$LINENO: result: okay" >&5 ++-echo "${ECHO_T}okay" >&6 ++- else ++- { { echo "$as_me:$LINENO: error: You must have ProcFS enabled in your kernel!" >&5 ++-echo "$as_me: error: You must have ProcFS enabled in your kernel!" >&2;} ++- { (exit 1); exit 1; }; }; ++- fi ++-fi ++- ++ CFLAGS="$GGDBFLAGS $CFLAGS" ++ ++ touch Makefile.in +diff --git a/feeds/packages/net/xsupplicant/patches/003-compile_fix.patch b/feeds/packages/net/xsupplicant/patches/003-compile_fix.patch +new file mode 100644 +index 0000000..30fe2c6 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/003-compile_fix.patch +@@ -0,0 +1,11 @@ ++--- a/lib/libxsupgui/Makefile.in +++++ b/lib/libxsupgui/Makefile.in ++@@ -91,7 +91,7 @@ install_sh = @install_sh@ ++ with_openssl_libs = @with_openssl_libs@ ++ AUTOMAKE_OPTIONS = foreign no-dependencies ++ ++-INCLUDES = ${top_srcdir}/src +++INCLUDES = -I${top_srcdir}/src ++ ++ include_HEADERS = xsupgui.h ++ lib_LIBRARIES = libxsupgui.a +diff --git a/feeds/packages/net/xsupplicant/patches/005-no_private_linux_header_includes.patch b/feeds/packages/net/xsupplicant/patches/005-no_private_linux_header_includes.patch +new file mode 100644 +index 0000000..3caf928 +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/005-no_private_linux_header_includes.patch +@@ -0,0 +1,48 @@ ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_atmel_driver.c 2006-10-08 05:42:53.000000000 +0200 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c 2009-01-11 02:59:46.998587770 +0100 ++@@ -103,7 +103,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_linux.c 2006-10-08 05:42:53.000000000 +0200 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c 2009-01-11 03:00:04.496300396 +0100 ++@@ -174,7 +174,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_linux_rtnetlink.c 2006-10-08 05:42:53.000000000 +0200 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c 2009-01-11 03:00:14.997328194 +0100 ++@@ -203,7 +203,6 @@ ++ ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include "netlink.h" ++Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c ++=================================================================== ++--- xsupplicant-1.2.8.orig/src/cardif/linux/cardif_linux_wext.c 2009-01-11 02:58:02.000000000 +0100 +++++ xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c 2009-01-11 03:00:26.230427636 +0100 ++@@ -203,7 +203,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include +diff --git a/feeds/packages/net/xsupplicant/patches/006-no_wireless_h.patch b/feeds/packages/net/xsupplicant/patches/006-no_wireless_h.patch +new file mode 100644 +index 0000000..378e21f +--- /dev/null ++++ b/feeds/packages/net/xsupplicant/patches/006-no_wireless_h.patch +@@ -0,0 +1,61 @@ ++--- a/src/cardif/linux/cardif_atmel_driver.c +++++ b/src/cardif/linux/cardif_atmel_driver.c ++@@ -109,7 +109,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ #ifdef USE_EFENCE ++ #include ++--- a/src/cardif/linux/cardif_linux.c +++++ b/src/cardif/linux/cardif_linux.c ++@@ -180,7 +180,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ #include "xsupconfig.h" ++ #include "profile.h" ++--- a/src/cardif/linux/cardif_linux_rtnetlink.c +++++ b/src/cardif/linux/cardif_linux_rtnetlink.c ++@@ -207,10 +207,8 @@ ++ #include ++ #include "netlink.h" ++ #include "rtnetlink.h" ++-#include ++ #include ++ #include ++-#include ++ ++ #include "profile.h" ++ #include "xsupconfig.h" ++--- a/src/cardif/linux/cardif_linux_wext.c +++++ b/src/cardif/linux/cardif_linux_wext.c ++@@ -203,7 +203,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ #include ++ #include ++--- a/configure +++++ b/configure ++@@ -4759,7 +4759,6 @@ cat >>conftest.$ac_ext <<_ACEOF ++ #ifndef __user ++ #define __user ++ #endif ++- #include ++ ++ #include <$ac_header> ++ _ACEOF ++@@ -4823,7 +4822,6 @@ cat >>conftest.$ac_ext <<_ACEOF ++ #ifndef __user ++ #define __user ++ #endif ++- #include ++ #include ++ int ++ main () +diff --git a/feeds/packages/net/yaddns/.svn/entries b/feeds/packages/net/yaddns/.svn/entries +new file mode 100644 +index 0000000..62cb56a +--- /dev/null ++++ b/feeds/packages/net/yaddns/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-04T09:22:14.189389Z ++32597 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++3589222268c6d5934ec70836e250d4a3 ++2012-06-29T21:56:29.738968Z ++32545 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1067 ++ +diff --git a/feeds/packages/net/yaddns/.svn/text-base/Makefile.svn-base b/feeds/packages/net/yaddns/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f3d8b1 +--- /dev/null ++++ b/feeds/packages/net/yaddns/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# 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:=yaddns ++PKG_VERSION:=1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.gna.org/yaddns/ ++PKG_MD5SUM:=d8b6ed9bed61dabaa17188d831e352d1 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/yaddns ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+USE_EGLIBC:librt ++ SUBMENU:=IP Addresses and Names ++ TITLE:=Yet Another DDNS client ++ URL:=http://patatrac.info/yaddns ++endef ++ ++define Package/yaddns/description ++Yaddns is a small ddns client with multiple ddns server supports (dyndns, ...) ++and a high flexibility. Yaddns is particularly appropriate for embedded systems. ++endef ++ ++define Package/yaddns/conffiles ++/etc/config/ddns ++endef ++ ++define Package/yaddns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yaddns $(1)/usr/bin/ ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,yaddns)) +diff --git a/feeds/packages/net/yaddns/Makefile b/feeds/packages/net/yaddns/Makefile +new file mode 100644 +index 0000000..0f3d8b1 +--- /dev/null ++++ b/feeds/packages/net/yaddns/Makefile +@@ -0,0 +1,46 @@ ++# ++# 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:=yaddns ++PKG_VERSION:=1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.gna.org/yaddns/ ++PKG_MD5SUM:=d8b6ed9bed61dabaa17188d831e352d1 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/yaddns ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+USE_EGLIBC:librt ++ SUBMENU:=IP Addresses and Names ++ TITLE:=Yet Another DDNS client ++ URL:=http://patatrac.info/yaddns ++endef ++ ++define Package/yaddns/description ++Yaddns is a small ddns client with multiple ddns server supports (dyndns, ...) ++and a high flexibility. Yaddns is particularly appropriate for embedded systems. ++endef ++ ++define Package/yaddns/conffiles ++/etc/config/ddns ++endef ++ ++define Package/yaddns/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yaddns $(1)/usr/bin/ ++ $(CP) ./files/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,yaddns)) +diff --git a/feeds/packages/net/yaddns/files/.svn/entries b/feeds/packages/net/yaddns/files/.svn/entries +new file mode 100644 +index 0000000..9ad4dd6 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-04T09:22:14.189389Z ++32597 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++usr ++dir ++ ++etc ++dir ++ +diff --git a/feeds/packages/net/yaddns/files/etc/.svn/entries b/feeds/packages/net/yaddns/files/etc/.svn/entries +new file mode 100644 +index 0000000..55a251e +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-04T09:22:14.189389Z ++32597 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hotplug.d ++dir ++ ++config ++dir ++ +diff --git a/feeds/packages/net/yaddns/files/etc/config/.svn/entries b/feeds/packages/net/yaddns/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..d4b7a8c +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/etc/config ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-04T09:22:14.189389Z ++32597 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ddns ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++1100f532394a9ace0dfb3b3313d22bd4 ++2012-07-04T09:22:14.189389Z ++32597 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2795 ++ +diff --git a/feeds/packages/net/yaddns/files/etc/config/.svn/text-base/ddns.svn-base b/feeds/packages/net/yaddns/files/etc/config/.svn/text-base/ddns.svn-base +new file mode 100644 +index 0000000..2fac1de +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/config/.svn/text-base/ddns.svn-base +@@ -0,0 +1,67 @@ ++################################################################# ++# In order to enable dynamic dns you need at least one section, and in that ++# seciton the "enabled" option must be set to one ++# ++# Each section represents an update to a different service ++# ++# You specify your domain name, your username and your password with the optins ++# "domain", "username" and "password" respectively ++# ++# Next you need to specify the name of the service you are connecting to "eg. ++# dyndns". The list of the available dns services is specified in the ++# /usr/lib/ddns/services file. ++# ++# We also need to specify the source of the ip address to associate with your ++# domain. The "ip_source" option can be "network", "interface" or "web", with ++# "network" as the default. ++# ++# If "ip_source" is "network" you specify a network section in your ++# /etc/network config file (e.g. "wan", which is the default) with the ++# "ip_network" option. If you specify "wan", you will update with whatever the ++# ip for your wan is. ++# ++# If "ip_source" is "interface" you specify a hardware interface (e.g. "eth1") ++# and whatever the current ip of this interface is will be associated with the ++# domain when an update is performed. ++# ++# If "ip_source" is "script" you specify a script to obtain ip address. The ++# "ip_script" option should contain path to your script. ++# ++# The last possibility is that "ip_source" is "web", which means that in order ++# to obtain our ip address we will connect to a website, and the first valid ip ++# address listed on that page will be assumed to be ours. If you are behind ++# another firewall this is the best option since none of the local networks or ++# interfaces will have the external ip. The website to connect to is specified ++# by the "ip_url" option. ++# ++# Finally we need to specify how often to check whether we need to check ++# whether the ip address has changed (and if so update it), this is only valid ++# for the "web" method. Use the "check_interval" to specify how often to check ++# whether an update is necessary. Specify the units for this value with the ++# "check_unit" option. Units can be "days", "hours", "minutes" or "seconds". ++# The default check_interval is 600 seconds, or ten minutes. ++# ++# For yaddns all ip_* options are system-wide and are taken from the first ++# enabled section. ++# ++######################################################### ++ ++config service "myddns" ++ option enabled "0" ++ ++ option service_name "dyndns" ++ option domain "mypersonaldomain.dyndns.org" ++ option username "myusername" ++ option password "mypassword" ++ ++ #option ip_source "network" ++ #option ip_network "wan" ++ ++ #option ip_source "interface" ++ #option ip_interface "eth0.1" ++ ++ option ip_source "web" ++ option ip_url "http://checkip.dyndns.org" ++ option check_interval "10" ++ option check_unit "minutes" ++ +diff --git a/feeds/packages/net/yaddns/files/etc/config/ddns b/feeds/packages/net/yaddns/files/etc/config/ddns +new file mode 100644 +index 0000000..2fac1de +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/config/ddns +@@ -0,0 +1,67 @@ ++################################################################# ++# In order to enable dynamic dns you need at least one section, and in that ++# seciton the "enabled" option must be set to one ++# ++# Each section represents an update to a different service ++# ++# You specify your domain name, your username and your password with the optins ++# "domain", "username" and "password" respectively ++# ++# Next you need to specify the name of the service you are connecting to "eg. ++# dyndns". The list of the available dns services is specified in the ++# /usr/lib/ddns/services file. ++# ++# We also need to specify the source of the ip address to associate with your ++# domain. The "ip_source" option can be "network", "interface" or "web", with ++# "network" as the default. ++# ++# If "ip_source" is "network" you specify a network section in your ++# /etc/network config file (e.g. "wan", which is the default) with the ++# "ip_network" option. If you specify "wan", you will update with whatever the ++# ip for your wan is. ++# ++# If "ip_source" is "interface" you specify a hardware interface (e.g. "eth1") ++# and whatever the current ip of this interface is will be associated with the ++# domain when an update is performed. ++# ++# If "ip_source" is "script" you specify a script to obtain ip address. The ++# "ip_script" option should contain path to your script. ++# ++# The last possibility is that "ip_source" is "web", which means that in order ++# to obtain our ip address we will connect to a website, and the first valid ip ++# address listed on that page will be assumed to be ours. If you are behind ++# another firewall this is the best option since none of the local networks or ++# interfaces will have the external ip. The website to connect to is specified ++# by the "ip_url" option. ++# ++# Finally we need to specify how often to check whether we need to check ++# whether the ip address has changed (and if so update it), this is only valid ++# for the "web" method. Use the "check_interval" to specify how often to check ++# whether an update is necessary. Specify the units for this value with the ++# "check_unit" option. Units can be "days", "hours", "minutes" or "seconds". ++# The default check_interval is 600 seconds, or ten minutes. ++# ++# For yaddns all ip_* options are system-wide and are taken from the first ++# enabled section. ++# ++######################################################### ++ ++config service "myddns" ++ option enabled "0" ++ ++ option service_name "dyndns" ++ option domain "mypersonaldomain.dyndns.org" ++ option username "myusername" ++ option password "mypassword" ++ ++ #option ip_source "network" ++ #option ip_network "wan" ++ ++ #option ip_source "interface" ++ #option ip_interface "eth0.1" ++ ++ option ip_source "web" ++ option ip_url "http://checkip.dyndns.org" ++ option check_interval "10" ++ option check_unit "minutes" ++ +diff --git a/feeds/packages/net/yaddns/files/etc/hotplug.d/.svn/entries b/feeds/packages/net/yaddns/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..07d100a +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/etc/hotplug.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T15:04:30.674555Z ++31943 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++iface ++dir ++ +diff --git a/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/.svn/entries b/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/.svn/entries +new file mode 100644 +index 0000000..e4e1987 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/etc/hotplug.d/iface ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-28T15:04:30.674555Z ++31943 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++25-ddns ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++181aa395811c4d0afc93e0b23a169252 ++2012-05-28T15:04:30.674555Z ++31943 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3222 ++ +diff --git a/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/.svn/text-base/25-ddns.svn-base b/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/.svn/text-base/25-ddns.svn-base +new file mode 100644 +index 0000000..2aefc18 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/.svn/text-base/25-ddns.svn-base +@@ -0,0 +1,115 @@ ++#!/bin/sh ++ ++YADDNS_CONF=/tmp/yaddns.conf ++YADDNS_PID=/var/run/yaddns.pid ++ ++prepare_yaddns_conf () ++{ ++ . /lib/functions.sh ++ . /lib/functions/network.sh ++ ++ > $YADDNS_CONF ++ ++ SECTIONS="" ++ config_cb() ++ { ++ SECTIONS="$SECTIONS $2" ++ } ++ config_load "ddns" ++ ++ for section in $SECTIONS; do ++ config_get enabled $section enabled ++ if [ "$enabled" = "1" ]; then ++ if [ -z "$header_filled" ]; then ++ config_get ip_source $section ip_source ++ #if ip source is not defined, assume we want to get ip from wan ++ if [ "$ip_source" != "interface" ] && [ "$ip_source" != "web" ]; then ++ ip_source="network" ++ fi ++ if [ "$ip_source" = "interface" ]; then ++ config_get ip_interface $section ip_interface ++ fi ++ if [ "$ip_source" = "network" ]; then ++ if [ -z "$ip_network" ]; then ++ ip_network="wan" ++ fi ++ network_get_device ip_interface $ip_network ++ fi ++ if [ "$ip_source" = "web" ]; then ++ config_get ip_url $section ip_url ++ config_get check_interval $section check_interval ++ config_get check_unit $section check_unit ++ if [ -z "$check_interval" ]; then ++ check_interval=600 ++ fi ++ if [ -z "$check_unit" ]; then ++ check_unit="seconds" ++ fi ++ if [ -z "$ip_url" ]; then ++ ip_url="http://checkip.dyndns.org/" ++ fi ++ case "$check_unit" in ++ "days" ) ++ check_interval_seconds=$(($check_interval*60*60*24)) ++ ;; ++ "hours" ) ++ check_interval_seconds=$(($check_interval*60*60)) ++ ;; ++ "minutes" ) ++ check_interval_seconds=$(($check_interval*60)) ++ ;; ++ "seconds" ) ++ check_interval_seconds=$check_interval ++ ;; ++ * ) ++ #default is hours ++ check_interval_seconds=$(($check_interval*60*60)) ++ ;; ++ esac ++ myip_host="`echo $ip_url | sed 's%.*//\([^:/]*\).*%\1%'`" ++ myip_port="`echo $ip_url | sed -n 's%.*//[^:]*:\([0-9]\+\).*%\1%; t m; b; :m p'`" ++ if [ -z "$myip_port" ]; then ++ myip_port=80 ++ fi ++ myip_path="`echo $ip_url | sed 's%.*//[^/]*\(.*\)%\1%'`" ++ if [ -z "$myip_path" ]; then ++ myip_path="/" ++ fi ++ echo mode = \"indirect\" >> $YADDNS_CONF ++ echo myip_host = \"$myip_host\" >> $YADDNS_CONF ++ echo myip_path = \"$myip_path\" >> $YADDNS_CONF ++ echo myip_port = \"$myip_port\" >> $YADDNS_CONF ++ echo myip_upint = \"$check_interval_seconds\" >> $YADDNS_CONF ++ else ++ echo mode = \"direct\" >> $YADDNS_CONF ++ echo wanifname = \"$ip_interface\" >> $YADDNS_CONF ++ fi ++ echo >> $YADDNS_CONF ++ header_filled=1 ++ fi ++ config_get service_name $section service_name ++ config_get domain $section domain ++ config_get username $section username ++ config_get password $section password ++ echo account \{ >> $YADDNS_CONF ++ echo -e '\tname = '\"$section\" >> $YADDNS_CONF ++ echo -e '\tservice = '\"$service_name\" >> $YADDNS_CONF ++ echo -e '\tusername = '\"$username\" >> $YADDNS_CONF ++ echo -e '\tpassword = '\"$password\" >> $YADDNS_CONF ++ echo -e '\thostname = '\"$domain\" >> $YADDNS_CONF ++ echo \} >> $YADDNS_CONF ++ fi ++ done ++} ++ ++if [ "$INTERFACE" = "wan" ] && [ "$ACTION" = "ifup" ] ++then ++ prepare_yaddns_conf ++ pid=`pidof yaddns` ++ if [ -z "$pid" ]; then ++ yaddns -f $YADDNS_CONF -p $YADDNS_PID -D ++ else ++ kill -HUP $pid ++ fi ++fi ++ +diff --git a/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/25-ddns b/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/25-ddns +new file mode 100644 +index 0000000..2aefc18 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/etc/hotplug.d/iface/25-ddns +@@ -0,0 +1,115 @@ ++#!/bin/sh ++ ++YADDNS_CONF=/tmp/yaddns.conf ++YADDNS_PID=/var/run/yaddns.pid ++ ++prepare_yaddns_conf () ++{ ++ . /lib/functions.sh ++ . /lib/functions/network.sh ++ ++ > $YADDNS_CONF ++ ++ SECTIONS="" ++ config_cb() ++ { ++ SECTIONS="$SECTIONS $2" ++ } ++ config_load "ddns" ++ ++ for section in $SECTIONS; do ++ config_get enabled $section enabled ++ if [ "$enabled" = "1" ]; then ++ if [ -z "$header_filled" ]; then ++ config_get ip_source $section ip_source ++ #if ip source is not defined, assume we want to get ip from wan ++ if [ "$ip_source" != "interface" ] && [ "$ip_source" != "web" ]; then ++ ip_source="network" ++ fi ++ if [ "$ip_source" = "interface" ]; then ++ config_get ip_interface $section ip_interface ++ fi ++ if [ "$ip_source" = "network" ]; then ++ if [ -z "$ip_network" ]; then ++ ip_network="wan" ++ fi ++ network_get_device ip_interface $ip_network ++ fi ++ if [ "$ip_source" = "web" ]; then ++ config_get ip_url $section ip_url ++ config_get check_interval $section check_interval ++ config_get check_unit $section check_unit ++ if [ -z "$check_interval" ]; then ++ check_interval=600 ++ fi ++ if [ -z "$check_unit" ]; then ++ check_unit="seconds" ++ fi ++ if [ -z "$ip_url" ]; then ++ ip_url="http://checkip.dyndns.org/" ++ fi ++ case "$check_unit" in ++ "days" ) ++ check_interval_seconds=$(($check_interval*60*60*24)) ++ ;; ++ "hours" ) ++ check_interval_seconds=$(($check_interval*60*60)) ++ ;; ++ "minutes" ) ++ check_interval_seconds=$(($check_interval*60)) ++ ;; ++ "seconds" ) ++ check_interval_seconds=$check_interval ++ ;; ++ * ) ++ #default is hours ++ check_interval_seconds=$(($check_interval*60*60)) ++ ;; ++ esac ++ myip_host="`echo $ip_url | sed 's%.*//\([^:/]*\).*%\1%'`" ++ myip_port="`echo $ip_url | sed -n 's%.*//[^:]*:\([0-9]\+\).*%\1%; t m; b; :m p'`" ++ if [ -z "$myip_port" ]; then ++ myip_port=80 ++ fi ++ myip_path="`echo $ip_url | sed 's%.*//[^/]*\(.*\)%\1%'`" ++ if [ -z "$myip_path" ]; then ++ myip_path="/" ++ fi ++ echo mode = \"indirect\" >> $YADDNS_CONF ++ echo myip_host = \"$myip_host\" >> $YADDNS_CONF ++ echo myip_path = \"$myip_path\" >> $YADDNS_CONF ++ echo myip_port = \"$myip_port\" >> $YADDNS_CONF ++ echo myip_upint = \"$check_interval_seconds\" >> $YADDNS_CONF ++ else ++ echo mode = \"direct\" >> $YADDNS_CONF ++ echo wanifname = \"$ip_interface\" >> $YADDNS_CONF ++ fi ++ echo >> $YADDNS_CONF ++ header_filled=1 ++ fi ++ config_get service_name $section service_name ++ config_get domain $section domain ++ config_get username $section username ++ config_get password $section password ++ echo account \{ >> $YADDNS_CONF ++ echo -e '\tname = '\"$section\" >> $YADDNS_CONF ++ echo -e '\tservice = '\"$service_name\" >> $YADDNS_CONF ++ echo -e '\tusername = '\"$username\" >> $YADDNS_CONF ++ echo -e '\tpassword = '\"$password\" >> $YADDNS_CONF ++ echo -e '\thostname = '\"$domain\" >> $YADDNS_CONF ++ echo \} >> $YADDNS_CONF ++ fi ++ done ++} ++ ++if [ "$INTERFACE" = "wan" ] && [ "$ACTION" = "ifup" ] ++then ++ prepare_yaddns_conf ++ pid=`pidof yaddns` ++ if [ -z "$pid" ]; then ++ yaddns -f $YADDNS_CONF -p $YADDNS_PID -D ++ else ++ kill -HUP $pid ++ fi ++fi ++ +diff --git a/feeds/packages/net/yaddns/files/usr/.svn/entries b/feeds/packages/net/yaddns/files/usr/.svn/entries +new file mode 100644 +index 0000000..46b90fb +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/usr/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/usr ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-10T16:10:04.271183Z ++24959 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lib ++dir ++ +diff --git a/feeds/packages/net/yaddns/files/usr/lib/.svn/entries b/feeds/packages/net/yaddns/files/usr/lib/.svn/entries +new file mode 100644 +index 0000000..df39343 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/usr/lib/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/usr/lib ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-10T16:10:04.271183Z ++24959 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ddns ++dir ++ +diff --git a/feeds/packages/net/yaddns/files/usr/lib/ddns/.svn/entries b/feeds/packages/net/yaddns/files/usr/lib/ddns/.svn/entries +new file mode 100644 +index 0000000..e40477c +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/usr/lib/ddns/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yaddns/files/usr/lib/ddns ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-10T16:10:04.271183Z ++24959 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++services ++file ++ ++ ++ ++ ++2013-03-17T12:17:37.000000Z ++b0d89abfc6d0d1944d892211e4b51038 ++2011-01-10T16:10:04.271183Z ++24959 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++45 ++ +diff --git a/feeds/packages/net/yaddns/files/usr/lib/ddns/.svn/text-base/services.svn-base b/feeds/packages/net/yaddns/files/usr/lib/ddns/.svn/text-base/services.svn-base +new file mode 100644 +index 0000000..0bed6e1 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/usr/lib/ddns/.svn/text-base/services.svn-base +@@ -0,0 +1,5 @@ ++"changeip" ++"dyndns" ++"dyndnsit" ++"no-ip" ++"ovh" +diff --git a/feeds/packages/net/yaddns/files/usr/lib/ddns/services b/feeds/packages/net/yaddns/files/usr/lib/ddns/services +new file mode 100644 +index 0000000..0bed6e1 +--- /dev/null ++++ b/feeds/packages/net/yaddns/files/usr/lib/ddns/services +@@ -0,0 +1,5 @@ ++"changeip" ++"dyndns" ++"dyndnsit" ++"no-ip" ++"ovh" +diff --git a/feeds/packages/net/yafc/.svn/entries b/feeds/packages/net/yafc/.svn/entries +new file mode 100644 +index 0000000..5e8b3c0 +--- /dev/null ++++ b/feeds/packages/net/yafc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yafc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:35.000000Z ++7e7bc791e85b8dab5338a0d72bf2a287 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1050 ++ +diff --git a/feeds/packages/net/yafc/.svn/prop-base/Makefile.svn-base b/feeds/packages/net/yafc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/net/yafc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/net/yafc/.svn/text-base/Makefile.svn-base b/feeds/packages/net/yafc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f440f2b +--- /dev/null ++++ b/feeds/packages/net/yafc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=yafc ++PKG_VERSION:=1.1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=832d074183a36ee15b47553ed5962fce ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=autogen.sh aclocal.m4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/yafc ++ SUBMENU:=File Transfer ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libncurses +libreadline ++ TITLE:=Yafc is yet another ftp client. ++ URL:=http://yafc.sourceforge.net/ ++endef ++ ++# uses GNU configure ++CONFIGURE_ARGS += \ ++ --with-socks=no \ ++ --with-socks5=no \ ++ --with-krb4=no \ ++ --with-krb5=no \ ++ --with-gssapi=no ++ ++CONFIGURE_VARS += \ ++ bash_cv_func_sigsetjmp=missing ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/yafc/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/src/yafc $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,yafc)) +diff --git a/feeds/packages/net/yafc/Makefile b/feeds/packages/net/yafc/Makefile +new file mode 100644 +index 0000000..f440f2b +--- /dev/null ++++ b/feeds/packages/net/yafc/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=yafc ++PKG_VERSION:=1.1.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=832d074183a36ee15b47553ed5962fce ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=autogen.sh aclocal.m4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/yafc ++ SUBMENU:=File Transfer ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=+libncurses +libreadline ++ TITLE:=Yafc is yet another ftp client. ++ URL:=http://yafc.sourceforge.net/ ++endef ++ ++# uses GNU configure ++CONFIGURE_ARGS += \ ++ --with-socks=no \ ++ --with-socks5=no \ ++ --with-krb4=no \ ++ --with-krb5=no \ ++ --with-gssapi=no ++ ++CONFIGURE_VARS += \ ++ bash_cv_func_sigsetjmp=missing ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/yafc/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/src/yafc $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,yafc)) +diff --git a/feeds/packages/net/yate/.svn/entries b/feeds/packages/net/yate/.svn/entries +new file mode 100644 +index 0000000..8198ae1 +--- /dev/null ++++ b/feeds/packages/net/yate/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yate ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-30T16:57:58.271760Z ++34016 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++4e0c9aca77ba4f7ac192c208989a881d ++2012-10-30T16:57:58.271760Z ++34016 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++12105 ++ +diff --git a/feeds/packages/net/yate/.svn/text-base/Makefile.svn-base b/feeds/packages/net/yate/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..27f2c28 +--- /dev/null ++++ b/feeds/packages/net/yate/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,277 @@ ++# ++# Copyright (C) 2006-2011 OpenWrt.org ++# Copyright (C) 2006-2011 SMBPhone ++# ++# 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 ++ ++RELEASEVER:=3.2.0 ++ ++PKG_NAME:=yate ++PKG_VERSION:=$(RELEASEVER)-1 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate3/ ++PKG_MD5SUM:=8ef5f0c420cb41ad2b5828fdba28c4ee ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/$(PKG_NAME)/Default ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://yate.null.ro/ ++ MAINTAINER:=Daniel Dickinson ++endef ++ ++define Package/$(PKG_NAME) ++ $(call Package/yate/Default) ++ DEPENDS:=+libpthread $(CXX_DEPENDS) ++ TITLE:=Yet Another Telphony Engine ++ MENU:=1 ++endef ++ ++define Package/$(PKG_NAME)/conffiles ++/etc/yate/yate.conf ++endef ++ ++define Package/$(PKG_NAME)/Default/description ++ Is a next-generation telephony engine focused on the VoIP and PSTN. It does ++ SIP, H.323, IAX, PSTN, and more. ++endef ++ ++define Package/$(PKG_NAME)-scripts-php ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +php5 +php5-cli ++ TITLE:= PHP Scripts and script libraries for Yate ++endef ++ ++define Package/$(PKG_NAME)-scripts-perl ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +microperl ++ TITLE:= Perl module for Yate ++endef ++ ++define Package/$(PKG_NAME)-scripts-python ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +python-mini ++ TITLE:= Python module for Yate ++endef ++ ++define Package/$(PKG_NAME)-sounds ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) ++ TITLE := Sounds for Yate ++endef ++ ++define Package/$(PKG_NAME)-collection-basic ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) \ ++ +$(PKG_NAME)-sounds \ ++ +$(PKG_NAME)-mod-dumbchan \ ++ +$(PKG_NAME)-mod-regfile \ ++ +$(PKG_NAME)-mod-regexroute \ ++ +$(PKG_NAME)-mod-rmanager \ ++ +$(PKG_NAME)-mod-tonegen \ ++ +$(PKG_NAME)-mod-yrtpchan \ ++ +$(PKG_NAME)-mod-ysipchan ++ TITLE := Basic Yate Server ++endef ++ ++TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include $(if $(CONFIG_BIG_ENDIAN),-DBIGENDIAN,) ++ ++CONFIGURE_ARGS+= \ ++ --without-libqt4 \ ++ --without-qtstatic \ ++ --without-pwlib \ ++ --without-coredumper \ ++ --without-doxygen \ ++ --without-kdoc \ ++ --with-spandsp="$(STAGING_DIR)/usr/include" \ ++ --with-libgsm="$(STAGING_DIR)/usr/include/gsm" \ ++ --with-mysql="$(STAGING_DIR)/usr" \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-libpq="$(STAGING_DIR)/usr" \ ++ --with-libspeex="$(STAGING_DIR)/usr/include/speex" \ ++ --with-zaptel="$(STAGING_DIR)/usr/include" \ ++ --with-zlib="$(STAGING_DIR)/usr" ++ ++CONFIGURE_VARS+= \ ++ CFLAGS="$$$$CFLAGS -nostdinc++" \ ++ LDFLAGS="$$$$LDFLAGS -nodefaultlibs" \ ++ LIBS="-lc -luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S)" ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ ++ for yatelib in "" sig mgcp jabber; do \ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\ ++ $(LN) ./libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib/libyate$$$${yatelib}.so ;\ ++ done ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yate $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/yate/yate.conf $(1)/etc/$(PKG_NAME)/yate.conf ++endef ++ ++define Package/$(PKG_NAME)-scripts-php/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/scripts ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/leavemail.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/queue_in.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/queue_out.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/route.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/voicemail.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libvoicemail.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyatechan.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyateivr.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyate.php $(1)/usr/share/yate/scripts/ ++endef ++ ++define Package/$(PKG_NAME)-scripts-perl/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/scripts ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/Yate.pm $(1)/usr/share/yate/scripts/ ++endef ++ ++define Package/$(PKG_NAME)-scripts-python/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/scripts ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyate.py $(1)/usr/share/yate/scripts/ ++endef ++ ++define Package/$(PKG_NAME)-sounds/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/sounds ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/yate/sounds/ $(1)/usr/share/yate/ ++endef ++ ++define Package/$(PKG_NAME)-collection-basic/install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/ ++endef ++ ++define BuildPlugin ++ define Package/$(PKG_NAME)-mod-$(1) ++ $(call Package/yate/Default) ++ DEPENDS:= $(PKG_NAME) $(4) ++ TITLE:=$(3) ++ endef ++ ++ $(if $(PKG_BUILD_DIR)/conf.d/$(1).conf.sample, ++ define Package/$(PKG_NAME)-mod-$(1)/conffiles ++ /etc/yate/$(1).conf ++ endef ++ ,) ++ ++ define Package/$(PKG_NAME)-mod-$(1)/description ++ $(3) module for $(PKG_NAME) ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/install ++ $$(INSTALL_DIR) $$(1)/usr/lib/yate/$(2) ++ $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/yate/$(2)/$(1).yate $$(1)/usr/lib/yate/$(2)/$(1).yate ++ if [ -f $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf ]; then \ ++ $$(INSTALL_DIR) $$(1)/etc/yate ;\ ++ $$(INSTALL_DATA) $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf $$(1)/etc/yate/ ;\ ++ fi ++ $(if $(5),$(foreach extra_file,$(5),\ ++ $(INSTALL_DIR) $$(1)$(dir $(extra_file)) ; \ ++ $(CP) $(PKG_INSTALL_DIR)$(extra_file) $$(1)$(extra_file) ; \ ++ ),) ++ endef ++ ++ $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1))) ++endef ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) ++$(eval $(call BuildPackage,$(PKG_NAME)-collection-basic)) ++$(eval $(call BuildPackage,$(PKG_NAME)-scripts-php)) ++$(eval $(call BuildPackage,$(PKG_NAME)-scripts-perl)) ++$(eval $(call BuildPackage,$(PKG_NAME)-scripts-python)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds)) ++$(eval $(call BuildPlugin,accfile,server,SIP or H.323 client (from file),)) ++$(eval $(call BuildPlugin,alsachan,client,ALSA Sound Channel,+alsa-lib)) ++$(eval $(call BuildPlugin,amrnbcodec,,AMR-NB Codec,@BROKEN)) # Missing amr-nb library ++$(eval $(call BuildPlugin,analog,server,Analog (e.g. POTS) Channel,)) ++$(eval $(call BuildPlugin,analogdetect,server,Analog Data Detector,)) ++$(eval $(call BuildPlugin,analyzer,,Test Call Generator and AQ Analyzer,)) ++$(eval $(call BuildPlugin,callcounters,server,Count Active Call Legs,)) ++$(eval $(call BuildPlugin,callfork,,Call Forker,)) ++$(eval $(call BuildPlugin,callgen,,Call Generator,)) ++$(eval $(call BuildPlugin,ccongestion,server,Accept Status from Installed Engine Monitors,)) ++$(eval $(call BuildPlugin,cdrbuild,,Call Detail Record Builder,)) ++$(eval $(call BuildPlugin,cdrfile,,Call Detail Record to File,)) ++$(eval $(call BuildPlugin,ciscosm,server,SS7 Support,)) ++$(eval $(call BuildPlugin,clustering,server,Clustering Server Support,)) ++$(eval $(call BuildPlugin,conference,,Conference Room Mixer,)) ++$(eval $(call BuildPlugin,cpuload,server,Monitor CPU load and Inform Yate,)) ++$(eval $(call BuildPlugin,dbpbx,server,PBX IVR and Multi-routing from Database,)) ++$(eval $(call BuildPlugin,dbwave,server,Wav Media for DB Storage,+$(PKG_NAME)-mod-wavefile)) ++$(eval $(call BuildPlugin,dumbchan,,Dummy Channel,)) ++$(eval $(call BuildPlugin,enumroute,,ENUM Routing,)) ++$(eval $(call BuildPlugin,extmodule,,External Module Handler,)) ++$(eval $(call BuildPlugin,faxchan,,Spandsp Fax Channel,+libspandsp)) ++$(eval $(call BuildPlugin,filetransfer,,File Transfer Driver,)) ++$(eval $(call BuildPlugin,gsmcodec,,GSM Codec,+libgsm)) ++$(eval $(call BuildPlugin,h323chan,,Open H.323 Channel,+libopenh323 @BROKEN)) # libopenh323 doesn't create package or stagin_dir includes or libs ++$(eval $(call BuildPlugin,heartbeat,server,Linux-HA compatible heartbeat,)) ++$(eval $(call BuildPlugin,ilbccodec,,iLBC Codec,)) ++$(eval $(call BuildPlugin,isupmangler,server,ISUP paramter mangling in a STP,)) ++$(eval $(call BuildPlugin,jabberclient,client,Jabber Client,)) ++$(eval $(call BuildPlugin,jabberserver,jabber,Jabber Server,)) ++$(eval $(call BuildPlugin,jbfeatures,jabber,Jabber Server Features,)) ++$(eval $(call BuildPlugin,lateroute,server,Last Chance Routing,)) ++$(eval $(call BuildPlugin,lksctp,server,SCTP sockets using linux kernel,@BROKEN)) # Missing libraries/header files ++$(eval $(call BuildPlugin,mgcpca,server,Media Gateway Control Protocol Agent,)) ++$(eval $(call BuildPlugin,mgcpgw,server,Media Gateway Control Protocol Gateway,)) ++$(eval $(call BuildPlugin,moh,,On Hold (music) Generator,)) ++$(eval $(call BuildPlugin,monitoring,server,Monitoring/gathering Information,)) ++$(eval $(call BuildPlugin,mrcpspeech,server,MRCP v2 Voice/Tone Detector and Synthesizer,)) ++$(eval $(call BuildPlugin,msgsniff,,Sample Message Sniffer,)) ++$(eval $(call BuildPlugin,mux,,Data Multiplexor,)) ++$(eval $(call BuildPlugin,mysqldb,server,MySQL Backend DB,+libmysqlclient-r)) ++$(eval $(call BuildPlugin,openssl,,Encrypted transport (OpenSSL),+libopenssl)) ++$(eval $(call BuildPlugin,osschan,client,OSS Sound Channel,)) ++$(eval $(call BuildPlugin,park,server,Call Parking,)) ++$(eval $(call BuildPlugin,pbx,,PBX Message Handlers,)) ++$(eval $(call BuildPlugin,pbxassist,server,Full featured PBX and IVR,)) ++$(eval $(call BuildPlugin,pgsqldb,server,PostgrestSQL Backend DB,+libpq)) ++$(eval $(call BuildPlugin,presence,server,Presence,)) ++$(eval $(call BuildPlugin,regfile,server,Registration based on users in file,)) ++$(eval $(call BuildPlugin,queues,server,Call Distribution and Queues from Database,)) ++$(eval $(call BuildPlugin,queuesnotify,server,Notify when queued call status changes,)) ++$(eval $(call BuildPlugin,regexroute,,Regular Expression Based Routing,)) ++$(eval $(call BuildPlugin,rmanager,,Yate Remote Management,)) ++$(eval $(call BuildPlugin,sip_cnam_lnp,sip,Query CNAM and LNP databases using SIP INVITE,)) ++$(eval $(call BuildPlugin,sigtransport,server,SIGTRAN (SS7 over IP) connection provider,)) ++$(eval $(call BuildPlugin,sipfeatures,server,SIP Features (SUBSCRIBE/NOTIFY),)) ++$(eval $(call BuildPlugin,speexcodec,,Speex Codec,+libspeex)) ++$(eval $(call BuildPlugin,subscription,server,Subcription handler and presence notifier,)) ++$(eval $(call BuildPlugin,tdmcard,server,TDM Cards Signalling and Data Driver,@BROKEN)) # Missing TDM libraries ++$(eval $(call BuildPlugin,tonedetect,,Detectors for Various Tones,)) ++$(eval $(call BuildPlugin,tonegen,,Tones Generator,)) ++$(eval $(call BuildPlugin,users,server,Users,)) ++$(eval $(call BuildPlugin,wavefile,,Wav file Record and Playback,)) ++$(eval $(call BuildPlugin,wpcard,server,Wanpipe PRI cards Signalling and Data Driver,@BROKEN)) # Mising wanpipe and PRI libraries ++$(eval $(call BuildPlugin,yiaxchan,,IAX Channel,)) ++$(eval $(call BuildPlugin,yjinglechan,,Jingle Channel,)) ++$(eval $(call BuildPlugin,yrtpchan,,RTP Channel and Other Data Helper,)) ++$(eval $(call BuildPlugin,yradius,server,RADIUS Client,)) ++$(eval $(call BuildPlugin,ysigchan,server,SS7/ISDN Protocols - Yate Signalling Library,)) ++$(eval $(call BuildPlugin,ysipchan,,SIP Channel,)) ++$(eval $(call BuildPlugin,ysockschan,,SOCKS Channel,)) ++$(eval $(call BuildPlugin,ysnmpagent,server,SNMP Protocol Agent,,/usr/share/yate/data/NULL-TEAM-MIB.txt /usr/share/yate/data/snmp_mib.conf /usr/share/yate/data/YATE-MIB.txt)) ++$(eval $(call BuildPlugin,ystunchan,,STUN Support,)) ++$(eval $(call BuildPlugin,zapcard,server,Zaptel Card Signalling and Data Driver,+zaptel14-libtonezone)) ++$(eval $(call BuildPlugin,zlibcompress,,Zlib Compression,+zlib)) +diff --git a/feeds/packages/net/yate/Makefile b/feeds/packages/net/yate/Makefile +new file mode 100644 +index 0000000..27f2c28 +--- /dev/null ++++ b/feeds/packages/net/yate/Makefile +@@ -0,0 +1,277 @@ ++# ++# Copyright (C) 2006-2011 OpenWrt.org ++# Copyright (C) 2006-2011 SMBPhone ++# ++# 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 ++ ++RELEASEVER:=3.2.0 ++ ++PKG_NAME:=yate ++PKG_VERSION:=$(RELEASEVER)-1 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate3/ ++PKG_MD5SUM:=8ef5f0c420cb41ad2b5828fdba28c4ee ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/$(PKG_NAME)/Default ++ SUBMENU:=Telephony ++ SECTION:=net ++ CATEGORY:=Network ++ URL:=http://yate.null.ro/ ++ MAINTAINER:=Daniel Dickinson ++endef ++ ++define Package/$(PKG_NAME) ++ $(call Package/yate/Default) ++ DEPENDS:=+libpthread $(CXX_DEPENDS) ++ TITLE:=Yet Another Telphony Engine ++ MENU:=1 ++endef ++ ++define Package/$(PKG_NAME)/conffiles ++/etc/yate/yate.conf ++endef ++ ++define Package/$(PKG_NAME)/Default/description ++ Is a next-generation telephony engine focused on the VoIP and PSTN. It does ++ SIP, H.323, IAX, PSTN, and more. ++endef ++ ++define Package/$(PKG_NAME)-scripts-php ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +php5 +php5-cli ++ TITLE:= PHP Scripts and script libraries for Yate ++endef ++ ++define Package/$(PKG_NAME)-scripts-perl ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +microperl ++ TITLE:= Perl module for Yate ++endef ++ ++define Package/$(PKG_NAME)-scripts-python ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +python-mini ++ TITLE:= Python module for Yate ++endef ++ ++define Package/$(PKG_NAME)-sounds ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) ++ TITLE := Sounds for Yate ++endef ++ ++define Package/$(PKG_NAME)-collection-basic ++ $(call Package/yate/Default) ++ DEPENDS += $(PKG_NAME) \ ++ +$(PKG_NAME)-sounds \ ++ +$(PKG_NAME)-mod-dumbchan \ ++ +$(PKG_NAME)-mod-regfile \ ++ +$(PKG_NAME)-mod-regexroute \ ++ +$(PKG_NAME)-mod-rmanager \ ++ +$(PKG_NAME)-mod-tonegen \ ++ +$(PKG_NAME)-mod-yrtpchan \ ++ +$(PKG_NAME)-mod-ysipchan ++ TITLE := Basic Yate Server ++endef ++ ++TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include $(if $(CONFIG_BIG_ENDIAN),-DBIGENDIAN,) ++ ++CONFIGURE_ARGS+= \ ++ --without-libqt4 \ ++ --without-qtstatic \ ++ --without-pwlib \ ++ --without-coredumper \ ++ --without-doxygen \ ++ --without-kdoc \ ++ --with-spandsp="$(STAGING_DIR)/usr/include" \ ++ --with-libgsm="$(STAGING_DIR)/usr/include/gsm" \ ++ --with-mysql="$(STAGING_DIR)/usr" \ ++ --with-openssl="$(STAGING_DIR)/usr" \ ++ --with-libpq="$(STAGING_DIR)/usr" \ ++ --with-libspeex="$(STAGING_DIR)/usr/include/speex" \ ++ --with-zaptel="$(STAGING_DIR)/usr/include" \ ++ --with-zlib="$(STAGING_DIR)/usr" ++ ++CONFIGURE_VARS+= \ ++ CFLAGS="$$$$CFLAGS -nostdinc++" \ ++ LDFLAGS="$$$$LDFLAGS -nodefaultlibs" \ ++ LIBS="-lc -luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S)" ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ ++ for yatelib in "" sig mgcp jabber; do \ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\ ++ $(LN) ./libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib/libyate$$$${yatelib}.so ;\ ++ done ++ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yate $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/yate/yate.conf $(1)/etc/$(PKG_NAME)/yate.conf ++endef ++ ++define Package/$(PKG_NAME)-scripts-php/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/scripts ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/leavemail.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/queue_in.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/queue_out.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/route.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/voicemail.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libvoicemail.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyatechan.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyateivr.php $(1)/usr/share/yate/scripts/ ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyate.php $(1)/usr/share/yate/scripts/ ++endef ++ ++define Package/$(PKG_NAME)-scripts-perl/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/scripts ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/Yate.pm $(1)/usr/share/yate/scripts/ ++endef ++ ++define Package/$(PKG_NAME)-scripts-python/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/scripts ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/yate/scripts/libyate.py $(1)/usr/share/yate/scripts/ ++endef ++ ++define Package/$(PKG_NAME)-sounds/install ++ $(INSTALL_DIR) $(1)/usr/share/yate/sounds ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/yate/sounds/ $(1)/usr/share/yate/ ++endef ++ ++define Package/$(PKG_NAME)-collection-basic/install ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ ++ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/ ++endef ++ ++define BuildPlugin ++ define Package/$(PKG_NAME)-mod-$(1) ++ $(call Package/yate/Default) ++ DEPENDS:= $(PKG_NAME) $(4) ++ TITLE:=$(3) ++ endef ++ ++ $(if $(PKG_BUILD_DIR)/conf.d/$(1).conf.sample, ++ define Package/$(PKG_NAME)-mod-$(1)/conffiles ++ /etc/yate/$(1).conf ++ endef ++ ,) ++ ++ define Package/$(PKG_NAME)-mod-$(1)/description ++ $(3) module for $(PKG_NAME) ++ endef ++ ++ define Package/$(PKG_NAME)-mod-$(1)/install ++ $$(INSTALL_DIR) $$(1)/usr/lib/yate/$(2) ++ $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/yate/$(2)/$(1).yate $$(1)/usr/lib/yate/$(2)/$(1).yate ++ if [ -f $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf ]; then \ ++ $$(INSTALL_DIR) $$(1)/etc/yate ;\ ++ $$(INSTALL_DATA) $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf $$(1)/etc/yate/ ;\ ++ fi ++ $(if $(5),$(foreach extra_file,$(5),\ ++ $(INSTALL_DIR) $$(1)$(dir $(extra_file)) ; \ ++ $(CP) $(PKG_INSTALL_DIR)$(extra_file) $$(1)$(extra_file) ; \ ++ ),) ++ endef ++ ++ $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1))) ++endef ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) ++$(eval $(call BuildPackage,$(PKG_NAME)-collection-basic)) ++$(eval $(call BuildPackage,$(PKG_NAME)-scripts-php)) ++$(eval $(call BuildPackage,$(PKG_NAME)-scripts-perl)) ++$(eval $(call BuildPackage,$(PKG_NAME)-scripts-python)) ++$(eval $(call BuildPackage,$(PKG_NAME)-sounds)) ++$(eval $(call BuildPlugin,accfile,server,SIP or H.323 client (from file),)) ++$(eval $(call BuildPlugin,alsachan,client,ALSA Sound Channel,+alsa-lib)) ++$(eval $(call BuildPlugin,amrnbcodec,,AMR-NB Codec,@BROKEN)) # Missing amr-nb library ++$(eval $(call BuildPlugin,analog,server,Analog (e.g. POTS) Channel,)) ++$(eval $(call BuildPlugin,analogdetect,server,Analog Data Detector,)) ++$(eval $(call BuildPlugin,analyzer,,Test Call Generator and AQ Analyzer,)) ++$(eval $(call BuildPlugin,callcounters,server,Count Active Call Legs,)) ++$(eval $(call BuildPlugin,callfork,,Call Forker,)) ++$(eval $(call BuildPlugin,callgen,,Call Generator,)) ++$(eval $(call BuildPlugin,ccongestion,server,Accept Status from Installed Engine Monitors,)) ++$(eval $(call BuildPlugin,cdrbuild,,Call Detail Record Builder,)) ++$(eval $(call BuildPlugin,cdrfile,,Call Detail Record to File,)) ++$(eval $(call BuildPlugin,ciscosm,server,SS7 Support,)) ++$(eval $(call BuildPlugin,clustering,server,Clustering Server Support,)) ++$(eval $(call BuildPlugin,conference,,Conference Room Mixer,)) ++$(eval $(call BuildPlugin,cpuload,server,Monitor CPU load and Inform Yate,)) ++$(eval $(call BuildPlugin,dbpbx,server,PBX IVR and Multi-routing from Database,)) ++$(eval $(call BuildPlugin,dbwave,server,Wav Media for DB Storage,+$(PKG_NAME)-mod-wavefile)) ++$(eval $(call BuildPlugin,dumbchan,,Dummy Channel,)) ++$(eval $(call BuildPlugin,enumroute,,ENUM Routing,)) ++$(eval $(call BuildPlugin,extmodule,,External Module Handler,)) ++$(eval $(call BuildPlugin,faxchan,,Spandsp Fax Channel,+libspandsp)) ++$(eval $(call BuildPlugin,filetransfer,,File Transfer Driver,)) ++$(eval $(call BuildPlugin,gsmcodec,,GSM Codec,+libgsm)) ++$(eval $(call BuildPlugin,h323chan,,Open H.323 Channel,+libopenh323 @BROKEN)) # libopenh323 doesn't create package or stagin_dir includes or libs ++$(eval $(call BuildPlugin,heartbeat,server,Linux-HA compatible heartbeat,)) ++$(eval $(call BuildPlugin,ilbccodec,,iLBC Codec,)) ++$(eval $(call BuildPlugin,isupmangler,server,ISUP paramter mangling in a STP,)) ++$(eval $(call BuildPlugin,jabberclient,client,Jabber Client,)) ++$(eval $(call BuildPlugin,jabberserver,jabber,Jabber Server,)) ++$(eval $(call BuildPlugin,jbfeatures,jabber,Jabber Server Features,)) ++$(eval $(call BuildPlugin,lateroute,server,Last Chance Routing,)) ++$(eval $(call BuildPlugin,lksctp,server,SCTP sockets using linux kernel,@BROKEN)) # Missing libraries/header files ++$(eval $(call BuildPlugin,mgcpca,server,Media Gateway Control Protocol Agent,)) ++$(eval $(call BuildPlugin,mgcpgw,server,Media Gateway Control Protocol Gateway,)) ++$(eval $(call BuildPlugin,moh,,On Hold (music) Generator,)) ++$(eval $(call BuildPlugin,monitoring,server,Monitoring/gathering Information,)) ++$(eval $(call BuildPlugin,mrcpspeech,server,MRCP v2 Voice/Tone Detector and Synthesizer,)) ++$(eval $(call BuildPlugin,msgsniff,,Sample Message Sniffer,)) ++$(eval $(call BuildPlugin,mux,,Data Multiplexor,)) ++$(eval $(call BuildPlugin,mysqldb,server,MySQL Backend DB,+libmysqlclient-r)) ++$(eval $(call BuildPlugin,openssl,,Encrypted transport (OpenSSL),+libopenssl)) ++$(eval $(call BuildPlugin,osschan,client,OSS Sound Channel,)) ++$(eval $(call BuildPlugin,park,server,Call Parking,)) ++$(eval $(call BuildPlugin,pbx,,PBX Message Handlers,)) ++$(eval $(call BuildPlugin,pbxassist,server,Full featured PBX and IVR,)) ++$(eval $(call BuildPlugin,pgsqldb,server,PostgrestSQL Backend DB,+libpq)) ++$(eval $(call BuildPlugin,presence,server,Presence,)) ++$(eval $(call BuildPlugin,regfile,server,Registration based on users in file,)) ++$(eval $(call BuildPlugin,queues,server,Call Distribution and Queues from Database,)) ++$(eval $(call BuildPlugin,queuesnotify,server,Notify when queued call status changes,)) ++$(eval $(call BuildPlugin,regexroute,,Regular Expression Based Routing,)) ++$(eval $(call BuildPlugin,rmanager,,Yate Remote Management,)) ++$(eval $(call BuildPlugin,sip_cnam_lnp,sip,Query CNAM and LNP databases using SIP INVITE,)) ++$(eval $(call BuildPlugin,sigtransport,server,SIGTRAN (SS7 over IP) connection provider,)) ++$(eval $(call BuildPlugin,sipfeatures,server,SIP Features (SUBSCRIBE/NOTIFY),)) ++$(eval $(call BuildPlugin,speexcodec,,Speex Codec,+libspeex)) ++$(eval $(call BuildPlugin,subscription,server,Subcription handler and presence notifier,)) ++$(eval $(call BuildPlugin,tdmcard,server,TDM Cards Signalling and Data Driver,@BROKEN)) # Missing TDM libraries ++$(eval $(call BuildPlugin,tonedetect,,Detectors for Various Tones,)) ++$(eval $(call BuildPlugin,tonegen,,Tones Generator,)) ++$(eval $(call BuildPlugin,users,server,Users,)) ++$(eval $(call BuildPlugin,wavefile,,Wav file Record and Playback,)) ++$(eval $(call BuildPlugin,wpcard,server,Wanpipe PRI cards Signalling and Data Driver,@BROKEN)) # Mising wanpipe and PRI libraries ++$(eval $(call BuildPlugin,yiaxchan,,IAX Channel,)) ++$(eval $(call BuildPlugin,yjinglechan,,Jingle Channel,)) ++$(eval $(call BuildPlugin,yrtpchan,,RTP Channel and Other Data Helper,)) ++$(eval $(call BuildPlugin,yradius,server,RADIUS Client,)) ++$(eval $(call BuildPlugin,ysigchan,server,SS7/ISDN Protocols - Yate Signalling Library,)) ++$(eval $(call BuildPlugin,ysipchan,,SIP Channel,)) ++$(eval $(call BuildPlugin,ysockschan,,SOCKS Channel,)) ++$(eval $(call BuildPlugin,ysnmpagent,server,SNMP Protocol Agent,,/usr/share/yate/data/NULL-TEAM-MIB.txt /usr/share/yate/data/snmp_mib.conf /usr/share/yate/data/YATE-MIB.txt)) ++$(eval $(call BuildPlugin,ystunchan,,STUN Support,)) ++$(eval $(call BuildPlugin,zapcard,server,Zaptel Card Signalling and Data Driver,+zaptel14-libtonezone)) ++$(eval $(call BuildPlugin,zlibcompress,,Zlib Compression,+zlib)) +diff --git a/feeds/packages/net/yate/patches/.svn/entries b/feeds/packages/net/yate/patches/.svn/entries +new file mode 100644 +index 0000000..ee3c341 +--- /dev/null ++++ b/feeds/packages/net/yate/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/yate/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-12T00:03:37.253130Z ++26047 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-add_dn_skipname_missing_from_many_libresolv.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:34.000000Z ++0b6f0daeb3798d889b8a4a8c4f585e0b ++2011-03-12T00:03:37.253130Z ++26047 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4436 ++ +diff --git a/feeds/packages/net/yate/patches/.svn/text-base/100-add_dn_skipname_missing_from_many_libresolv.patch.svn-base b/feeds/packages/net/yate/patches/.svn/text-base/100-add_dn_skipname_missing_from_many_libresolv.patch.svn-base +new file mode 100644 +index 0000000..bc61df0 +--- /dev/null ++++ b/feeds/packages/net/yate/patches/.svn/text-base/100-add_dn_skipname_missing_from_many_libresolv.patch.svn-base +@@ -0,0 +1,111 @@ ++--- a/engine/Makefile.in +++++ b/engine/Makefile.in ++@@ -31,8 +31,9 @@ CLSOBJS := TelEngine.o ObjList.o HashLis ++ ENGOBJS := Configuration.o Message.o Engine.o Plugin.o ++ TELOBJS := DataFormat.o Channel.o ++ CLIOBJS := Client.o ClientLogic.o +++MISCOBJS := dn_skipname.o ++ ++-LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS) +++LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS) $(MISCOBJS) ++ CLEANS = $(LIBOBJS) core ++ CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS) ++ COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS) ++@@ -109,6 +110,9 @@ String.o: @srcdir@/String.cpp $(MKDEPS) ++ regex.o: @top_srcdir@/engine/regex/regex.c $(MKDEPS) ++ $(CCOMPILE) -DSTDC_HEADERS $(REGEX_INC) -c $< ++ +++dn_skipname.o: @srcdir@/dn_skipname.c $(MKDEPS) +++ $(CCOMPILE) -DSTDC_HEADERS -c $< +++ ++ %.o: @srcdir@/%.cpp $(MKDEPS) $(EINC) ++ $(COMPILE) -c $< ++ ++--- /dev/null +++++ b/engine/dn_skipname.c ++@@ -0,0 +1,85 @@ +++/* Taken from patch by Natanael Copa for uClibc in message +++ * http://lists.busybox.net/pipermail/uclibc/2009-September/042971.html +++ * Turned into yate patch by Daniel Dickinson , Mar 11, 2011 +++*/ +++#include +++#include +++ +++/* taken from OpenBSD source */ +++/* +++ * Copyright (c) 1985, 1993 +++ * The Regents of the University of California. All rights reserved. +++ * +++ * 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. 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. +++ * - +++ * Portions Copyright (c) 1993 by Digital Equipment Corporation. +++ * +++ * 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, and that +++ * the name of Digital Equipment Corporation not be used in advertising or +++ * publicity pertaining to distribution of the document or software without +++ * specific, written prior permission. +++ * +++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL +++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES +++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +++ * CORPORATION 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. +++ */ +++ +++/* +++ * Skip over a compressed domain name. Return the size or -1. +++ */ +++int +++__dn_skipname(const u_char *comp_dn, const u_char *eom) +++{ +++ const u_char *cp; +++ int n; +++ +++ cp = comp_dn; +++ while (cp < eom && (n = *cp++)) { +++ /* +++ * check for indirection +++ */ +++ switch (n & INDIR_MASK) { +++ case 0: /* normal case, n == len */ +++ cp += n; +++ continue; +++ case INDIR_MASK: /* indirection */ +++ cp++; +++ break; +++ default: /* illegal type */ +++ return (-1); +++ } +++ break; +++ } +++ if (cp > eom) +++ return (-1); +++ return (cp - comp_dn); +++} +diff --git a/feeds/packages/net/yate/patches/100-add_dn_skipname_missing_from_many_libresolv.patch b/feeds/packages/net/yate/patches/100-add_dn_skipname_missing_from_many_libresolv.patch +new file mode 100644 +index 0000000..bc61df0 +--- /dev/null ++++ b/feeds/packages/net/yate/patches/100-add_dn_skipname_missing_from_many_libresolv.patch +@@ -0,0 +1,111 @@ ++--- a/engine/Makefile.in +++++ b/engine/Makefile.in ++@@ -31,8 +31,9 @@ CLSOBJS := TelEngine.o ObjList.o HashLis ++ ENGOBJS := Configuration.o Message.o Engine.o Plugin.o ++ TELOBJS := DataFormat.o Channel.o ++ CLIOBJS := Client.o ClientLogic.o +++MISCOBJS := dn_skipname.o ++ ++-LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS) +++LIBOBJS := $(CLSOBJS) $(ENGOBJS) $(TELOBJS) $(CLIOBJS) $(MISCOBJS) ++ CLEANS = $(LIBOBJS) core ++ CCOMPILE = $(CC) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS) ++ COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CPPFLAGS) ++@@ -109,6 +110,9 @@ String.o: @srcdir@/String.cpp $(MKDEPS) ++ regex.o: @top_srcdir@/engine/regex/regex.c $(MKDEPS) ++ $(CCOMPILE) -DSTDC_HEADERS $(REGEX_INC) -c $< ++ +++dn_skipname.o: @srcdir@/dn_skipname.c $(MKDEPS) +++ $(CCOMPILE) -DSTDC_HEADERS -c $< +++ ++ %.o: @srcdir@/%.cpp $(MKDEPS) $(EINC) ++ $(COMPILE) -c $< ++ ++--- /dev/null +++++ b/engine/dn_skipname.c ++@@ -0,0 +1,85 @@ +++/* Taken from patch by Natanael Copa for uClibc in message +++ * http://lists.busybox.net/pipermail/uclibc/2009-September/042971.html +++ * Turned into yate patch by Daniel Dickinson , Mar 11, 2011 +++*/ +++#include +++#include +++ +++/* taken from OpenBSD source */ +++/* +++ * Copyright (c) 1985, 1993 +++ * The Regents of the University of California. All rights reserved. +++ * +++ * 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. 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. +++ * - +++ * Portions Copyright (c) 1993 by Digital Equipment Corporation. +++ * +++ * 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, and that +++ * the name of Digital Equipment Corporation not be used in advertising or +++ * publicity pertaining to distribution of the document or software without +++ * specific, written prior permission. +++ * +++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL +++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES +++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +++ * CORPORATION 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. +++ */ +++ +++/* +++ * Skip over a compressed domain name. Return the size or -1. +++ */ +++int +++__dn_skipname(const u_char *comp_dn, const u_char *eom) +++{ +++ const u_char *cp; +++ int n; +++ +++ cp = comp_dn; +++ while (cp < eom && (n = *cp++)) { +++ /* +++ * check for indirection +++ */ +++ switch (n & INDIR_MASK) { +++ case 0: /* normal case, n == len */ +++ cp += n; +++ continue; +++ case INDIR_MASK: /* indirection */ +++ cp++; +++ break; +++ default: /* illegal type */ +++ return (-1); +++ } +++ break; +++ } +++ if (cp > eom) +++ return (-1); +++ return (cp - comp_dn); +++} +diff --git a/feeds/packages/net/znc/.svn/entries b/feeds/packages/net/znc/.svn/entries +new file mode 100644 +index 0000000..0144607 +--- /dev/null ++++ b/feeds/packages/net/znc/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/znc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2d9f9aebb10f81cda3cf93b5e451529c ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8820 ++ +diff --git a/feeds/packages/net/znc/.svn/text-base/Makefile.svn-base b/feeds/packages/net/znc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6de485d +--- /dev/null ++++ b/feeds/packages/net/znc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,283 @@ ++# ++# 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.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://znc.in/releases \ ++ http://znc.in/releases/archive ++PKG_MD5SUM:=23807ca830c27392cccb6774f542df6e ++ ++PKG_BUILD_PARALLEL:=1 ++ ++ ++define Package/znc/default ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=ZNC ++ URL:=http://en.znc.in/ ++ MAINTAINER:=Jonas Gorski ++endef ++ ++define Package/znc ++ $(Package/znc/default) ++ DEPENDS:=+libopenssl +libpthread $(CXX_DEPENDS) ++ 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,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)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ ++ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ ++ LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ ++ LIBS="-luClibc++ -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/feeds/packages/net/znc/Makefile b/feeds/packages/net/znc/Makefile +new file mode 100644 +index 0000000..6de485d +--- /dev/null ++++ b/feeds/packages/net/znc/Makefile +@@ -0,0 +1,283 @@ ++# ++# 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.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://znc.in/releases \ ++ http://znc.in/releases/archive ++PKG_MD5SUM:=23807ca830c27392cccb6774f542df6e ++ ++PKG_BUILD_PARALLEL:=1 ++ ++ ++define Package/znc/default ++ SUBMENU:=Instant Messaging ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=ZNC ++ URL:=http://en.znc.in/ ++ MAINTAINER:=Jonas Gorski ++endef ++ ++define Package/znc ++ $(Package/znc/default) ++ DEPENDS:=+libopenssl +libpthread $(CXX_DEPENDS) ++ 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,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)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \ ++ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ ++ LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ ++ LIBS="-luClibc++ -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/feeds/packages/net/znc/files/.svn/entries b/feeds/packages/net/znc/files/.svn/entries +new file mode 100644 +index 0000000..3cc5df5 +--- /dev/null ++++ b/feeds/packages/net/znc/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/znc/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++znc.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++36a7ba25ff9de0baf4e3999020eaee32 ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4478 ++ ++znc.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2bc4bce43a0bbc77b6078c6e8787302c ++2012-12-13T14:07:55.136389Z ++34658 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++859 ++ +diff --git a/feeds/packages/net/znc/files/.svn/text-base/znc.conf.svn-base b/feeds/packages/net/znc/files/.svn/text-base/znc.conf.svn-base +new file mode 100644 +index 0000000..1b0d842 +--- /dev/null ++++ b/feeds/packages/net/znc/files/.svn/text-base/znc.conf.svn-base +@@ -0,0 +1,29 @@ ++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 (' [params...]'): ++ # list module 'simple_away -timer 10 disconnected' +diff --git a/feeds/packages/net/znc/files/.svn/text-base/znc.init.svn-base b/feeds/packages/net/znc/files/.svn/text-base/znc.init.svn-base +new file mode 100644 +index 0000000..7cc7fa7 +--- /dev/null ++++ b/feeds/packages/net/znc/files/.svn/text-base/znc.init.svn-base +@@ -0,0 +1,194 @@ ++#!/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 " " >> $ZNC_CONFIG ++ [ "$chan" != "$pass" ] && echo " Key = $pass" >> $ZNC_CONFIG ++ echo " " >> $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 " " >> $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 "" >> $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 " " >> $ZNC_CONFIG ++ config_list_foreach "$user" server "add_param \" Server\"" ++ config_list_foreach "$user" channel "add_chan" ++ echo " " >> $ZNC_CONFIG ++ fi ++ ++ config_foreach "add_network \"$user\"" network ++ ++ echo "" >> $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/feeds/packages/net/znc/files/znc.conf b/feeds/packages/net/znc/files/znc.conf +new file mode 100644 +index 0000000..1b0d842 +--- /dev/null ++++ b/feeds/packages/net/znc/files/znc.conf +@@ -0,0 +1,29 @@ ++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 (' [params...]'): ++ # list module 'simple_away -timer 10 disconnected' +diff --git a/feeds/packages/net/znc/files/znc.init b/feeds/packages/net/znc/files/znc.init +new file mode 100644 +index 0000000..7cc7fa7 +--- /dev/null ++++ b/feeds/packages/net/znc/files/znc.init +@@ -0,0 +1,194 @@ ++#!/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 " " >> $ZNC_CONFIG ++ [ "$chan" != "$pass" ] && echo " Key = $pass" >> $ZNC_CONFIG ++ echo " " >> $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 " " >> $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 "" >> $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 " " >> $ZNC_CONFIG ++ config_list_foreach "$user" server "add_param \" Server\"" ++ config_list_foreach "$user" channel "add_chan" ++ echo " " >> $ZNC_CONFIG ++ fi ++ ++ config_foreach "add_network \"$user\"" network ++ ++ echo "" >> $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/feeds/packages/net/znc/patches/.svn/entries b/feeds/packages/net/znc/patches/.svn/entries +new file mode 100644 +index 0000000..70370f1 +--- /dev/null ++++ b/feeds/packages/net/znc/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/net/znc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-Uclibcpp_build_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++df466ae85625a837c4a72f86ebbeeafc ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1068 ++ ++001-move_rootcheck_after_config.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3c51634ab271c1c1d12fa437af38d7ba ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1637 ++ ++003-Reduce_rebuild_time.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++b7d66120c3f28e15661e60190b3d0bf2 ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1149 ++ ++004-restore_droproot.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4278c19bc59a29f9343a89c4fcd89f62 ++2012-12-13T14:07:57.446479Z ++34659 ++jogo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3354 ++ +diff --git a/feeds/packages/net/znc/patches/.svn/text-base/001-move_rootcheck_after_config.patch.svn-base b/feeds/packages/net/znc/patches/.svn/text-base/001-move_rootcheck_after_config.patch.svn-base +new file mode 100644 +index 0000000..f3f129c +--- /dev/null ++++ b/feeds/packages/net/znc/patches/.svn/text-base/001-move_rootcheck_after_config.patch.svn-base +@@ -0,0 +1,52 @@ ++From 5f655f9a25a377c01cb15517859eb514628a43d4 Mon Sep 17 00:00:00 2001 ++From: Jonas Gorski ++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 ++@@ -211,19 +211,6 @@ int main(int argc, char** argv) { ++ } ++ #endif ++ ++- 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; ++@@ -244,6 +231,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/feeds/packages/net/znc/patches/.svn/text-base/002-Uclibcpp_build_fix.patch.svn-base b/feeds/packages/net/znc/patches/.svn/text-base/002-Uclibcpp_build_fix.patch.svn-base +new file mode 100644 +index 0000000..a33707e +--- /dev/null ++++ b/feeds/packages/net/znc/patches/.svn/text-base/002-Uclibcpp_build_fix.patch.svn-base +@@ -0,0 +1,32 @@ ++From fa14938321eda39f16bee6068296e6abc9df7b85 Mon Sep 17 00:00:00 2001 ++From: Jonas Gorski ++Date: Wed, 6 Apr 2011 04:11:48 +0200 ++Subject: [PATCH] Add a uClibc++ build workaround ++ ++--- ++ modules/webadmin.cpp | 4 +++- ++ 1 files changed, 3 insertions(+), 1 deletions(-) ++ ++--- a/modules/webadmin.cpp +++++ b/modules/webadmin.cpp ++@@ -15,9 +15,11 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ +++using std::string; ++ using std::stringstream; ++ using std::make_pair; ++ using std::set; ++@@ -55,7 +57,7 @@ class CWebAdminMod : public CGlobalModul ++ public: ++ GLOBALMODCONSTRUCTOR(CWebAdminMod) { ++ VPair vParams; ++- vParams.push_back(make_pair("user", "")); +++ vParams.push_back(make_pair((string)"user", (string)"")); ++ AddSubPage(new CWebSubPage("settings", "Global Settings", CWebSubPage::F_ADMIN)); ++ AddSubPage(new CWebSubPage("edituser", "Your Settings", vParams)); ++ AddSubPage(new CWebSubPage("traffic", "Traffic Info", CWebSubPage::F_ADMIN)); +diff --git a/feeds/packages/net/znc/patches/.svn/text-base/003-Reduce_rebuild_time.patch.svn-base b/feeds/packages/net/znc/patches/.svn/text-base/003-Reduce_rebuild_time.patch.svn-base +new file mode 100644 +index 0000000..d4ea4cd +--- /dev/null ++++ b/feeds/packages/net/znc/patches/.svn/text-base/003-Reduce_rebuild_time.patch.svn-base +@@ -0,0 +1,38 @@ ++From 94aff4c3389111fc85054eb06b40bea26a216d0c Mon Sep 17 00:00:00 2001 ++From: Jonas Gorski ++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 ++@@ -96,7 +96,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 ++@@ -114,12 +114,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/feeds/packages/net/znc/patches/.svn/text-base/004-restore_droproot.patch.svn-base b/feeds/packages/net/znc/patches/.svn/text-base/004-restore_droproot.patch.svn-base +new file mode 100644 +index 0000000..2c7cefe +--- /dev/null ++++ b/feeds/packages/net/znc/patches/.svn/text-base/004-restore_droproot.patch.svn-base +@@ -0,0 +1,147 @@ ++--- /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 +++#include +++#include +++#include +++ +++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 "; +++ return false; +++ } +++ +++ m_user = GetUser(sUser, sMessage); +++ +++ if (m_user == 0) { +++ sMessage +++ = "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot "; +++ return false; +++ } +++ +++ m_group = GetGroup(sGroup, sMessage); +++ +++ if (m_group == 0) { +++ sMessage +++ = "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot "; +++ 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/feeds/packages/net/znc/patches/001-move_rootcheck_after_config.patch b/feeds/packages/net/znc/patches/001-move_rootcheck_after_config.patch +new file mode 100644 +index 0000000..f3f129c +--- /dev/null ++++ b/feeds/packages/net/znc/patches/001-move_rootcheck_after_config.patch +@@ -0,0 +1,52 @@ ++From 5f655f9a25a377c01cb15517859eb514628a43d4 Mon Sep 17 00:00:00 2001 ++From: Jonas Gorski ++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 ++@@ -211,19 +211,6 @@ int main(int argc, char** argv) { ++ } ++ #endif ++ ++- 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; ++@@ -244,6 +231,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/feeds/packages/net/znc/patches/002-Uclibcpp_build_fix.patch b/feeds/packages/net/znc/patches/002-Uclibcpp_build_fix.patch +new file mode 100644 +index 0000000..a33707e +--- /dev/null ++++ b/feeds/packages/net/znc/patches/002-Uclibcpp_build_fix.patch +@@ -0,0 +1,32 @@ ++From fa14938321eda39f16bee6068296e6abc9df7b85 Mon Sep 17 00:00:00 2001 ++From: Jonas Gorski ++Date: Wed, 6 Apr 2011 04:11:48 +0200 ++Subject: [PATCH] Add a uClibc++ build workaround ++ ++--- ++ modules/webadmin.cpp | 4 +++- ++ 1 files changed, 3 insertions(+), 1 deletions(-) ++ ++--- a/modules/webadmin.cpp +++++ b/modules/webadmin.cpp ++@@ -15,9 +15,11 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ +++using std::string; ++ using std::stringstream; ++ using std::make_pair; ++ using std::set; ++@@ -55,7 +57,7 @@ class CWebAdminMod : public CGlobalModul ++ public: ++ GLOBALMODCONSTRUCTOR(CWebAdminMod) { ++ VPair vParams; ++- vParams.push_back(make_pair("user", "")); +++ vParams.push_back(make_pair((string)"user", (string)"")); ++ AddSubPage(new CWebSubPage("settings", "Global Settings", CWebSubPage::F_ADMIN)); ++ AddSubPage(new CWebSubPage("edituser", "Your Settings", vParams)); ++ AddSubPage(new CWebSubPage("traffic", "Traffic Info", CWebSubPage::F_ADMIN)); +diff --git a/feeds/packages/net/znc/patches/003-Reduce_rebuild_time.patch b/feeds/packages/net/znc/patches/003-Reduce_rebuild_time.patch +new file mode 100644 +index 0000000..d4ea4cd +--- /dev/null ++++ b/feeds/packages/net/znc/patches/003-Reduce_rebuild_time.patch +@@ -0,0 +1,38 @@ ++From 94aff4c3389111fc85054eb06b40bea26a216d0c Mon Sep 17 00:00:00 2001 ++From: Jonas Gorski ++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 ++@@ -96,7 +96,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 ++@@ -114,12 +114,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/feeds/packages/net/znc/patches/004-restore_droproot.patch b/feeds/packages/net/znc/patches/004-restore_droproot.patch +new file mode 100644 +index 0000000..2c7cefe +--- /dev/null ++++ b/feeds/packages/net/znc/patches/004-restore_droproot.patch +@@ -0,0 +1,147 @@ ++--- /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 +++#include +++#include +++#include +++ +++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 "; +++ return false; +++ } +++ +++ m_user = GetUser(sUser, sMessage); +++ +++ if (m_user == 0) { +++ sMessage +++ = "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot "; +++ return false; +++ } +++ +++ m_group = GetGroup(sGroup, sMessage); +++ +++ if (m_group == 0) { +++ sMessage +++ = "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot "; +++ 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/feeds/packages/skels/.svn/entries b/feeds/packages/skels/.svn/entries +new file mode 100644 +index 0000000..632b830 +--- /dev/null ++++ b/feeds/packages/skels/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/skels ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-14T20:26:27.048072Z ++32374 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile.template ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++77dd83e508303eaef4c8640734067a15 ++2012-06-14T20:26:27.048072Z ++32374 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1033 ++ +diff --git a/feeds/packages/skels/.svn/text-base/Makefile.template.svn-base b/feeds/packages/skels/.svn/text-base/Makefile.template.svn-base +new file mode 100644 +index 0000000..893fb54 +--- /dev/null ++++ b/feeds/packages/skels/.svn/text-base/Makefile.template.svn-base +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 2008 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:= ++PKG_VERSION:= ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:= ++PKG_MD5SUM:= ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/package ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=package ++ URL:= ++endef ++ ++define Package/package/description ++endef ++ ++# add extra configure flags here ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared ++ ++# add make variable overrides here ++MAKE_FLAGS += ++ ++define Build/InstallDev ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++define Package/package/install ++ $(INSTALL_DIR) $(1)/usr/package ++ $(CP) $(PKG_INSTALL_DIR)/usr/package/package.so.* $(1)/usr/package/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/package.init $(1)/etc/init.d/package ++ $(INSTALL_DIR) $(1)/etc/config/ ++ $(INSTALL_CONF) $(1)/etc/config/package ++endef ++ ++$(eval $(call BuildPackage,package)) +diff --git a/feeds/packages/skels/Makefile.template b/feeds/packages/skels/Makefile.template +new file mode 100644 +index 0000000..893fb54 +--- /dev/null ++++ b/feeds/packages/skels/Makefile.template +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 2008 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:= ++PKG_VERSION:= ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:= ++PKG_MD5SUM:= ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/package ++ SECTION:=net ++ CATEGORY:=Network ++ TITLE:=package ++ URL:= ++endef ++ ++define Package/package/description ++endef ++ ++# add extra configure flags here ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared ++ ++# add make variable overrides here ++MAKE_FLAGS += ++ ++define Build/InstallDev ++ $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++endef ++ ++define Package/package/install ++ $(INSTALL_DIR) $(1)/usr/package ++ $(CP) $(PKG_INSTALL_DIR)/usr/package/package.so.* $(1)/usr/package/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/package.init $(1)/etc/init.d/package ++ $(INSTALL_DIR) $(1)/etc/config/ ++ $(INSTALL_CONF) $(1)/etc/config/package ++endef ++ ++$(eval $(call BuildPackage,package)) +diff --git a/feeds/packages/skels/files/.svn/entries b/feeds/packages/skels/files/.svn/entries +new file mode 100644 +index 0000000..be860de +--- /dev/null ++++ b/feeds/packages/skels/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/skels/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-29T01:47:52.701729Z ++31973 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++package.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++8a8c555f8b37b0237eaef770ae545f25 ++2007-12-16T16:14:20.118939Z ++9780 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++117 ++ ++package.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:33.000000Z ++83463f06668a17ef32ce8ce4751eb016 ++2012-05-29T01:47:52.701729Z ++31973 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++756 ++ +diff --git a/feeds/packages/skels/files/.svn/prop-base/package.init.svn-base b/feeds/packages/skels/files/.svn/prop-base/package.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/skels/files/.svn/prop-base/package.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/skels/files/.svn/text-base/package.conf.svn-base b/feeds/packages/skels/files/.svn/text-base/package.conf.svn-base +new file mode 100644 +index 0000000..db3bc4d +--- /dev/null ++++ b/feeds/packages/skels/files/.svn/text-base/package.conf.svn-base +@@ -0,0 +1,4 @@ ++# Sample configuration file ++config package ++ option option1 'some default value' ++ option option2 '' +diff --git a/feeds/packages/skels/files/.svn/text-base/package.init.svn-base b/feeds/packages/skels/files/.svn/text-base/package.init.svn-base +new file mode 100644 +index 0000000..b0de442 +--- /dev/null ++++ b/feeds/packages/skels/files/.svn/text-base/package.init.svn-base +@@ -0,0 +1,40 @@ ++#!/bin/sh /etc/rc.common ++# Sample init script reading its ++# configuration from /etc/config/package ++ ++START=46 ++STOP=46 ++ ++start_service() { ++ local section="$1" ++ ++ . /lib/functions/network.sh ++ ++ network_get_device LAN lan ifname ++ config_get option1 "$section" option1 ++ config_get option2 "$section" option2 ++ ++ # Do some action with the variables ++ echo "option1 = $option1" ++} ++ ++stop_service() { ++ local section="$1" ++ ++ . /lib/functions/network.sh ++ ++ network_get_device LAN lan ifname ++ config_get option1 "$section" option1 ++ config_get option2 "$section" option2 ++} ++start() { ++ # Do some optionnal testing ++ # before starting the program ++ config_load "package" ++ config_foreach start_service package ++} ++ ++stop() { ++ config_load "package" ++ config_foreach stop_service package ++} +diff --git a/feeds/packages/skels/files/package.conf b/feeds/packages/skels/files/package.conf +new file mode 100644 +index 0000000..db3bc4d +--- /dev/null ++++ b/feeds/packages/skels/files/package.conf +@@ -0,0 +1,4 @@ ++# Sample configuration file ++config package ++ option option1 'some default value' ++ option option2 '' +diff --git a/feeds/packages/skels/files/package.init b/feeds/packages/skels/files/package.init +new file mode 100755 +index 0000000..b0de442 +--- /dev/null ++++ b/feeds/packages/skels/files/package.init +@@ -0,0 +1,40 @@ ++#!/bin/sh /etc/rc.common ++# Sample init script reading its ++# configuration from /etc/config/package ++ ++START=46 ++STOP=46 ++ ++start_service() { ++ local section="$1" ++ ++ . /lib/functions/network.sh ++ ++ network_get_device LAN lan ifname ++ config_get option1 "$section" option1 ++ config_get option2 "$section" option2 ++ ++ # Do some action with the variables ++ echo "option1 = $option1" ++} ++ ++stop_service() { ++ local section="$1" ++ ++ . /lib/functions/network.sh ++ ++ network_get_device LAN lan ifname ++ config_get option1 "$section" option1 ++ config_get option2 "$section" option2 ++} ++start() { ++ # Do some optionnal testing ++ # before starting the program ++ config_load "package" ++ config_foreach start_service package ++} ++ ++stop() { ++ config_load "package" ++ config_foreach stop_service package ++} +diff --git a/feeds/packages/sound/.svn/entries b/feeds/packages/sound/.svn/entries +new file mode 100644 +index 0000000..e2cb8f3 +--- /dev/null ++++ b/feeds/packages/sound/.svn/entries +@@ -0,0 +1,82 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-17T15:51:44.137162Z ++35202 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mpc ++dir ++ ++mpd ++dir ++ ++ices ++dir ++ ++listener ++dir ++ ++madplay ++dir ++ ++mt-daapd ++dir ++ ++empcd ++dir ++ ++pianobar ++dir ++ ++mocp ++dir ++ ++flite ++dir ++ ++mpdas ++dir ++ ++scmpc ++dir ++ ++cmus ++dir ++ ++shell-fm ++dir ++ ++sox ++dir ++ ++pulseaudio ++dir ++ ++streamripper ++dir ++ ++lame ++dir ++ +diff --git a/feeds/packages/sound/cmus/.svn/entries b/feeds/packages/sound/cmus/.svn/entries +new file mode 100644 +index 0000000..0ece315 +--- /dev/null ++++ b/feeds/packages/sound/cmus/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/cmus ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T22:46:27.235647Z ++32223 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++92766bcdab380248bb7d1593af23ad8d ++2012-06-11T22:46:27.235647Z ++32223 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2589 ++ +diff --git a/feeds/packages/sound/cmus/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/cmus/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..336bd80 +--- /dev/null ++++ b/feeds/packages/sound/cmus/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# Copyright (C) 2011 Johannes Weißl ++# 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:=cmus ++PKG_VERSION:=2.4.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/cmus ++PKG_MD5SUM:=0c5a9f4032e632e5f6b6a49f53df1e7e ++ ++PKG_INSTALL:=1 ++PKG_BUILD_DIR:=$(BUILD_DIR)/cmus-v$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/cmus ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:= \ ++ +libpthread +librt +libncursesw $(ICONV_DEPENDS) \ ++ +AUDIO_SUPPORT:alsa-lib \ ++ +BUILD_PATENTED:libmad +libvorbisidec +libflac ++ TITLE:=C* Music Player ++ URL:=http://cmus.sourceforge.net/ ++endef ++ ++define Package/cmus/description ++ C* Music Player is a modular and very configurable ncurses-based ++ audio player. It has some interesting features like configurable ++ colorscheme, mp3 and ogg streaming, it can be controlled with an ++ UNIX socket, filters, album/artists sorting and a vi-like ++ configuration interface. ++endef ++ ++define Build/Configure ++ # this is *NOT* GNU configure ++ ( cd $(PKG_BUILD_DIR); \ ++ CROSS="$(TARGET_CROSS)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(ICONV_PREFIX)/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(ICONV_PREFIX)/lib" \ ++ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ ./configure \ ++ prefix="/usr" \ ++ CONFIG_FLAC=a \ ++ CONFIG_MAD=$(if $(CONFIG_BUILD_PATENTED),a,n) \ ++ CONFIG_MODPLUG=n \ ++ CONFIG_MIKMOD=n \ ++ CONFIG_MPC=n \ ++ CONFIG_VORBIS=a \ ++ CONFIG_TREMOR=y \ ++ CONFIG_WAVPACK=n \ ++ CONFIG_MP4=n \ ++ CONFIG_AAC=n \ ++ CONFIG_FFMPEG=n \ ++ CONFIG_ROAR=n \ ++ CONFIG_PULSE=n \ ++ CONFIG_ALSA=$(if $(CONFIG_AUDIO_SUPPORT),a,n) \ ++ CONFIG_AO=n \ ++ CONFIG_ARTS=n \ ++ CONFIG_OSS=y \ ++ CONFIG_SUN=n \ ++ CONFIG_WAVEOUT=n \ ++ DEBUG=0 \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ V=$(V) \ ++ install ++endef ++ ++define Package/cmus/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib/cmus/ip ++ $(INSTALL_DIR) $(1)/usr/lib/cmus/op ++ $(INSTALL_DIR) $(1)/usr/share/cmus ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmus $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmus/ip/*.so $(1)/usr/lib/cmus/ip/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmus/op/*.so $(1)/usr/lib/cmus/op/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cmus/{rc,default.theme} $(1)/usr/share/cmus/ ++endef ++ ++$(eval $(call BuildPackage,cmus)) ++ +diff --git a/feeds/packages/sound/cmus/Makefile b/feeds/packages/sound/cmus/Makefile +new file mode 100644 +index 0000000..336bd80 +--- /dev/null ++++ b/feeds/packages/sound/cmus/Makefile +@@ -0,0 +1,96 @@ ++# ++# Copyright (C) 2011 Johannes Weißl ++# 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:=cmus ++PKG_VERSION:=2.4.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/cmus ++PKG_MD5SUM:=0c5a9f4032e632e5f6b6a49f53df1e7e ++ ++PKG_INSTALL:=1 ++PKG_BUILD_DIR:=$(BUILD_DIR)/cmus-v$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/cmus ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:= \ ++ +libpthread +librt +libncursesw $(ICONV_DEPENDS) \ ++ +AUDIO_SUPPORT:alsa-lib \ ++ +BUILD_PATENTED:libmad +libvorbisidec +libflac ++ TITLE:=C* Music Player ++ URL:=http://cmus.sourceforge.net/ ++endef ++ ++define Package/cmus/description ++ C* Music Player is a modular and very configurable ncurses-based ++ audio player. It has some interesting features like configurable ++ colorscheme, mp3 and ogg streaming, it can be controlled with an ++ UNIX socket, filters, album/artists sorting and a vi-like ++ configuration interface. ++endef ++ ++define Build/Configure ++ # this is *NOT* GNU configure ++ ( cd $(PKG_BUILD_DIR); \ ++ CROSS="$(TARGET_CROSS)" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(ICONV_PREFIX)/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(ICONV_PREFIX)/lib" \ ++ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ ++ ./configure \ ++ prefix="/usr" \ ++ CONFIG_FLAC=a \ ++ CONFIG_MAD=$(if $(CONFIG_BUILD_PATENTED),a,n) \ ++ CONFIG_MODPLUG=n \ ++ CONFIG_MIKMOD=n \ ++ CONFIG_MPC=n \ ++ CONFIG_VORBIS=a \ ++ CONFIG_TREMOR=y \ ++ CONFIG_WAVPACK=n \ ++ CONFIG_MP4=n \ ++ CONFIG_AAC=n \ ++ CONFIG_FFMPEG=n \ ++ CONFIG_ROAR=n \ ++ CONFIG_PULSE=n \ ++ CONFIG_ALSA=$(if $(CONFIG_AUDIO_SUPPORT),a,n) \ ++ CONFIG_AO=n \ ++ CONFIG_ARTS=n \ ++ CONFIG_OSS=y \ ++ CONFIG_SUN=n \ ++ CONFIG_WAVEOUT=n \ ++ DEBUG=0 \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ V=$(V) \ ++ install ++endef ++ ++define Package/cmus/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib/cmus/ip ++ $(INSTALL_DIR) $(1)/usr/lib/cmus/op ++ $(INSTALL_DIR) $(1)/usr/share/cmus ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmus $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmus/ip/*.so $(1)/usr/lib/cmus/ip/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmus/op/*.so $(1)/usr/lib/cmus/op/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/cmus/{rc,default.theme} $(1)/usr/share/cmus/ ++endef ++ ++$(eval $(call BuildPackage,cmus)) ++ +diff --git a/feeds/packages/sound/cmus/patches/.svn/entries b/feeds/packages/sound/cmus/patches/.svn/entries +new file mode 100644 +index 0000000..70061a9 +--- /dev/null ++++ b/feeds/packages/sound/cmus/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/cmus/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-04-29T15:09:16.491670Z ++26784 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-do_not_use_ACS_VLINE.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++01b79f38d241e53a51f8cbdd43ee30ab ++2011-04-29T15:09:16.491670Z ++26784 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++334 ++ +diff --git a/feeds/packages/sound/cmus/patches/.svn/text-base/010-do_not_use_ACS_VLINE.patch.svn-base b/feeds/packages/sound/cmus/patches/.svn/text-base/010-do_not_use_ACS_VLINE.patch.svn-base +new file mode 100644 +index 0000000..aaeb34e +--- /dev/null ++++ b/feeds/packages/sound/cmus/patches/.svn/text-base/010-do_not_use_ACS_VLINE.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/ui_curses.c +++++ b/ui_curses.c ++@@ -928,7 +928,7 @@ static void draw_separator(void) ++ (void) mvaddch(0, tree_win_w, ' '); ++ bkgdset(pairs[CURSED_SEPARATOR]); ++ for (row = 1; row < LINES - 3; row++) ++- (void) mvaddch(row, tree_win_w, ACS_VLINE); +++ (void) mvaddch(row, tree_win_w, '|'); ++ } ++ ++ static void do_update_view(int full) +diff --git a/feeds/packages/sound/cmus/patches/010-do_not_use_ACS_VLINE.patch b/feeds/packages/sound/cmus/patches/010-do_not_use_ACS_VLINE.patch +new file mode 100644 +index 0000000..aaeb34e +--- /dev/null ++++ b/feeds/packages/sound/cmus/patches/010-do_not_use_ACS_VLINE.patch +@@ -0,0 +1,11 @@ ++--- a/ui_curses.c +++++ b/ui_curses.c ++@@ -928,7 +928,7 @@ static void draw_separator(void) ++ (void) mvaddch(0, tree_win_w, ' '); ++ bkgdset(pairs[CURSED_SEPARATOR]); ++ for (row = 1; row < LINES - 3; row++) ++- (void) mvaddch(row, tree_win_w, ACS_VLINE); +++ (void) mvaddch(row, tree_win_w, '|'); ++ } ++ ++ static void do_update_view(int full) +diff --git a/feeds/packages/sound/empcd/.svn/entries b/feeds/packages/sound/empcd/.svn/entries +new file mode 100644 +index 0000000..84144df +--- /dev/null ++++ b/feeds/packages/sound/empcd/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/empcd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-25T12:24:19.045048Z ++18930 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++0fa9444e7200c08d7bf6445f7e148918 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1170 ++ +diff --git a/feeds/packages/sound/empcd/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/empcd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8b0c15d +--- /dev/null ++++ b/feeds/packages/sound/empcd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=empcd ++PKG_VERSION:=2008.02.16 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://unfix.org/projects/empcd ++PKG_MD5SUM:=c3209f6bf8eb6e8ea9638601e1cd04a4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/empcd ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=EMPCd can control the MPD ++ URL:=http://unfix.org/projects/empcd ++endef ++ ++define Package/empcd/description ++ This is EMPCd which can use /dev/input/event0 or other event devices ++ to control MPD (Music Player Daemon), directly using libmpdclient ++ and other programs, currently using system(2). ++endef ++ ++define Package/empcd/conffiles ++/etc/empcd.conf ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,\ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all \ ++ ) ++endef ++ ++define Package/empcd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/empcd $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/empcd.conf $(1)/etc/ ++endef ++ ++$(eval $(call BuildPackage,empcd)) +diff --git a/feeds/packages/sound/empcd/Makefile b/feeds/packages/sound/empcd/Makefile +new file mode 100644 +index 0000000..8b0c15d +--- /dev/null ++++ b/feeds/packages/sound/empcd/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=empcd ++PKG_VERSION:=2008.02.16 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://unfix.org/projects/empcd ++PKG_MD5SUM:=c3209f6bf8eb6e8ea9638601e1cd04a4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/empcd ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=EMPCd can control the MPD ++ URL:=http://unfix.org/projects/empcd ++endef ++ ++define Package/empcd/description ++ This is EMPCd which can use /dev/input/event0 or other event devices ++ to control MPD (Music Player Daemon), directly using libmpdclient ++ and other programs, currently using system(2). ++endef ++ ++define Package/empcd/conffiles ++/etc/empcd.conf ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default,\ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all \ ++ ) ++endef ++ ++define Package/empcd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/empcd $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/empcd.conf $(1)/etc/ ++endef ++ ++$(eval $(call BuildPackage,empcd)) +diff --git a/feeds/packages/sound/flite/.svn/entries b/feeds/packages/sound/flite/.svn/entries +new file mode 100644 +index 0000000..44cd2e3 +--- /dev/null ++++ b/feeds/packages/sound/flite/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/flite ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-15T20:38:22.091399Z ++30559 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++4f9c6b8901b4b9581f89780310a730f3 ++2012-02-15T20:38:22.091399Z ++30559 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1663 ++ +diff --git a/feeds/packages/sound/flite/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/flite/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/sound/flite/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/flite/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/flite/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4325e7f +--- /dev/null ++++ b/feeds/packages/sound/flite/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=flite ++PKG_VERSION:=1.3-release ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/ ++PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/flite ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=@!GCC_VERSION_3_4_6 ++ TITLE:=Text-to-speech for embedded systems ++ URL:=http://www.speech.cs.cmu.edu/flite/index.html ++endef ++ ++define Package/flite/description ++Festival Lite is a stripped down version of Festival, ++ the well-developed text-to-speech program written in C++. ++ This program is written in C to keep memory usage low. ++endef ++ ++TARGET_LDFLAGS += -lm ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --with-audio="oss" \ ++ --with-vox="cmu_us_kal16" \ ++ --prefix="$(PKG_INSTALL_DIR)/usr" \ ++ --exec-prefix="$(PKG_INSTALL_DIR)/usr" \ ++ --bindir="$(PKG_INSTALL_DIR)/usr/bin" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/flite ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(1)/usr/include/flite/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/ ++endef ++ ++define Package/flite/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/flite $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,flite)) +diff --git a/feeds/packages/sound/flite/Makefile b/feeds/packages/sound/flite/Makefile +new file mode 100644 +index 0000000..4325e7f +--- /dev/null ++++ b/feeds/packages/sound/flite/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=flite ++PKG_VERSION:=1.3-release ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/ ++PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/flite ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=@!GCC_VERSION_3_4_6 ++ TITLE:=Text-to-speech for embedded systems ++ URL:=http://www.speech.cs.cmu.edu/flite/index.html ++endef ++ ++define Package/flite/description ++Festival Lite is a stripped down version of Festival, ++ the well-developed text-to-speech program written in C++. ++ This program is written in C to keep memory usage low. ++endef ++ ++TARGET_LDFLAGS += -lm ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --enable-shared \ ++ --with-audio="oss" \ ++ --with-vox="cmu_us_kal16" \ ++ --prefix="$(PKG_INSTALL_DIR)/usr" \ ++ --exec-prefix="$(PKG_INSTALL_DIR)/usr" \ ++ --bindir="$(PKG_INSTALL_DIR)/usr/bin" \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/flite ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(1)/usr/include/flite/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/ ++endef ++ ++define Package/flite/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/flite $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,flite)) +diff --git a/feeds/packages/sound/flite/patches/.svn/entries b/feeds/packages/sound/flite/patches/.svn/entries +new file mode 100644 +index 0000000..3b96f3e +--- /dev/null ++++ b/feeds/packages/sound/flite/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/flite/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-08T11:52:40.783975Z ++23316 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-shared_libs ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++69cf2140acddae6f8b3b22c9d72cdd51 ++2010-10-08T11:52:40.783975Z ++23316 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7834 ++ +diff --git a/feeds/packages/sound/flite/patches/.svn/text-base/100-shared_libs.svn-base b/feeds/packages/sound/flite/patches/.svn/text-base/100-shared_libs.svn-base +new file mode 100644 +index 0000000..47254b0 +--- /dev/null ++++ b/feeds/packages/sound/flite/patches/.svn/text-base/100-shared_libs.svn-base +@@ -0,0 +1,182 @@ ++--- ++ Makefile | 2 - ++ config/common_make_rules | 34 ++++++++++++-------- ++ lib/Makefile | 78 +++++++++++++++++++++++++++++++++++++++++++++++ ++ main/Makefile | 4 +- ++ 4 files changed, 102 insertions(+), 16 deletions(-) ++ ++--- flite-1.3-release.orig/config/common_make_rules +++++ flite-1.3-release/config/common_make_rules ++@@ -59,27 +59,35 @@ BUILDDIR=$(TOP)/build/$(TARGET_PLATFORM) ++ endif ++ OBJDIR=$(BUILDDIR)/obj/$(DIRNAME) ++ BINDIR=$(BUILDDIR)/bin +++LIBDIR=$(BUILDDIR)/lib ++ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) ++ BINDIR=$(TOP)/bin +++LIBDIR=$(TOP)/lib ++ endif ++ ++-LIBDIR=$(BUILDDIR)/lib ++ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) ++ ++-FLITELIBS = $(BUILDDIR)/lib/libflite.a ++-LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) +++ifdef SHFLAGS +++FLITELIBS = $(LIBDIR)/libflite.so +++LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS) +++else +++FLITELIBS = $(LIBDIR)/libflite.a +++LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) +++endif ++ ++ FULLOBJS = $(OBJS:%=$(OBJDIR)/%) ++ ifdef SHFLAGS ++ SOOBJS = $(OBJS:.o=.os) ++-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) +++FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%) ++ ifdef LIBNAME ++ ALL += $(OBJDIR)/.build_so ++ endif ++-endif +++else ++ ifdef LIBNAME ++ ALL += $(OBJDIR)/.build_lib ++ endif +++endif +++ ++ # Only do some directories when you are not cross compiling ++ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) ++ OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS) ++@@ -117,15 +125,15 @@ $(OBJDIR)/.build_so: $(FULLSOOBJS) ++ @ touch $(OBJDIR)/.build_so ++ ++ # Used in the lib/ directory and in building new voices ++-$(OBJDIR)/%.so: %.shared.a +++%.so: %.shared.a ++ @ echo making $@ ++- @ rm -rf shared_os && mkdir shared_os ++- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} ++- @ (cd shared_os && ar x ../$<) ++- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) ++- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} ++- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ ++- @ rm -rf shared_os +++ @ rm -rf shared_os-$@ && mkdir shared_os-$@ +++ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} +++ @ (cd shared_os-$@ && ar x ../$<) +++ @ (cd shared_os-$@ && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS))) +++ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} +++ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ +++ @ rm -rf shared_os-$@ ++ ++ $(OBJDIR)/.make_build_dirs: ++ @ echo making in $(DIRNAME) ... ++--- /dev/null +++++ flite-1.3-release/lib/Makefile ++@@ -0,0 +1,78 @@ +++########################################################################### +++## ## +++## Language Technologies Institute ## +++## Carnegie Mellon University ## +++## Copyright (c) 1999 ## +++## All Rights Reserved. ## +++## ## +++## Permission is hereby granted, free of charge, to use and distribute ## +++## this software and its documentation without restriction, including ## +++## without limitation the rights to use, copy, modify, merge, publish, ## +++## distribute, sublicense, and/or sell copies of this work, and to ## +++## permit persons to whom this work is furnished to do so, subject to ## +++## the following conditions: ## +++## 1. The code must retain the above copyright notice, this list of ## +++## conditions and the following disclaimer. ## +++## 2. Any modifications must be clearly marked as such. ## +++## 3. Original authors' names are not deleted. ## +++## 4. The authors' names are not used to endorse or promote products ## +++## derived from this software without specific prior written ## +++## permission. ## +++## ## +++## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## +++## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## +++## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## +++## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## +++## FOR ANY SPECIAL, 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. ## +++## ## +++########################################################################### +++## ## +++## FLITE libraries ## +++## ## +++########################################################################### +++TOP=.. +++DIRNAME=lib +++BUILD_DIRS = +++ALL_DIRS= +++FILES = Makefile +++LIBNAMES = flite flite_cmulex flite_usenglish \ +++ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb +++ +++STATICLIBS= $(LIBNAMES:%=lib%.a) +++SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) +++#SHAREDLIBS = $(LIBNAMES:%=lib%.so) +++SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) +++VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ +++ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) +++ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS) +++ +++ALL = shared_libs +++ +++LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} +++ +++include $(TOP)/config/common_make_rules +++ +++ifdef SHFLAGS +++shared_libs: $(SHAREDLIBS) +++libflite_LDLIBS = -lm $(AUDIOLIBS) +++libflite_cmulex_LDLIBS = -lflite +++libflite_cmulex.so: libflite.so +++libflite_usenglish_LDLIBS = -lflite +++libflite_usenglish.so: libflite.so +++libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish +++libflite_cmu_us_kal.so: libflite_cmulex.so libflite_usenglish.so +++libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish +++libflite_cmu_us_kal16.so: libflite_cmulex.so libflite_usenglish.so +++libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish +++libflite_cmu_time_awb.so: libflite.so libflite_cmulex.so libflite_usenglish.so +++else +++shared_libs: nothing +++endif +++ +++install: +++ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) +++ ++--- flite-1.3-release.orig/main/Makefile +++++ flite-1.3-release/main/Makefile ++@@ -50,11 +50,11 @@ ALL = $(BINDIR)/flite$(EXEEXT) $(BINDIR) ++ ++ flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) ++ flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) ++-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) +++flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so) ++ ++ flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX) ++ flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%) ++-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a) +++flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so) ++ ++ include $(TOP)/config/common_make_rules ++ ++--- flite-1.3-release.orig/Makefile +++++ flite-1.3-release/Makefile ++@@ -41,7 +41,7 @@ ++ ########################################################################### ++ TOP=. ++ DIRNAME= ++-BUILD_DIRS = include src lang doc +++BUILD_DIRS = include src lang lib ++ ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main ++ CONFIG=configure configure.in config.sub config.guess \ ++ missing install-sh mkinstalldirs +diff --git a/feeds/packages/sound/flite/patches/100-shared_libs b/feeds/packages/sound/flite/patches/100-shared_libs +new file mode 100644 +index 0000000..47254b0 +--- /dev/null ++++ b/feeds/packages/sound/flite/patches/100-shared_libs +@@ -0,0 +1,182 @@ ++--- ++ Makefile | 2 - ++ config/common_make_rules | 34 ++++++++++++-------- ++ lib/Makefile | 78 +++++++++++++++++++++++++++++++++++++++++++++++ ++ main/Makefile | 4 +- ++ 4 files changed, 102 insertions(+), 16 deletions(-) ++ ++--- flite-1.3-release.orig/config/common_make_rules +++++ flite-1.3-release/config/common_make_rules ++@@ -59,27 +59,35 @@ BUILDDIR=$(TOP)/build/$(TARGET_PLATFORM) ++ endif ++ OBJDIR=$(BUILDDIR)/obj/$(DIRNAME) ++ BINDIR=$(BUILDDIR)/bin +++LIBDIR=$(BUILDDIR)/lib ++ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) ++ BINDIR=$(TOP)/bin +++LIBDIR=$(TOP)/lib ++ endif ++ ++-LIBDIR=$(BUILDDIR)/lib ++ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) ++ ++-FLITELIBS = $(BUILDDIR)/lib/libflite.a ++-LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) +++ifdef SHFLAGS +++FLITELIBS = $(LIBDIR)/libflite.so +++LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS) +++else +++FLITELIBS = $(LIBDIR)/libflite.a +++LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) +++endif ++ ++ FULLOBJS = $(OBJS:%=$(OBJDIR)/%) ++ ifdef SHFLAGS ++ SOOBJS = $(OBJS:.o=.os) ++-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) +++FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%) ++ ifdef LIBNAME ++ ALL += $(OBJDIR)/.build_so ++ endif ++-endif +++else ++ ifdef LIBNAME ++ ALL += $(OBJDIR)/.build_lib ++ endif +++endif +++ ++ # Only do some directories when you are not cross compiling ++ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) ++ OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS) ++@@ -117,15 +125,15 @@ $(OBJDIR)/.build_so: $(FULLSOOBJS) ++ @ touch $(OBJDIR)/.build_so ++ ++ # Used in the lib/ directory and in building new voices ++-$(OBJDIR)/%.so: %.shared.a +++%.so: %.shared.a ++ @ echo making $@ ++- @ rm -rf shared_os && mkdir shared_os ++- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} ++- @ (cd shared_os && ar x ../$<) ++- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) ++- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} ++- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ ++- @ rm -rf shared_os +++ @ rm -rf shared_os-$@ && mkdir shared_os-$@ +++ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} +++ @ (cd shared_os-$@ && ar x ../$<) +++ @ (cd shared_os-$@ && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS))) +++ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} +++ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ +++ @ rm -rf shared_os-$@ ++ ++ $(OBJDIR)/.make_build_dirs: ++ @ echo making in $(DIRNAME) ... ++--- /dev/null +++++ flite-1.3-release/lib/Makefile ++@@ -0,0 +1,78 @@ +++########################################################################### +++## ## +++## Language Technologies Institute ## +++## Carnegie Mellon University ## +++## Copyright (c) 1999 ## +++## All Rights Reserved. ## +++## ## +++## Permission is hereby granted, free of charge, to use and distribute ## +++## this software and its documentation without restriction, including ## +++## without limitation the rights to use, copy, modify, merge, publish, ## +++## distribute, sublicense, and/or sell copies of this work, and to ## +++## permit persons to whom this work is furnished to do so, subject to ## +++## the following conditions: ## +++## 1. The code must retain the above copyright notice, this list of ## +++## conditions and the following disclaimer. ## +++## 2. Any modifications must be clearly marked as such. ## +++## 3. Original authors' names are not deleted. ## +++## 4. The authors' names are not used to endorse or promote products ## +++## derived from this software without specific prior written ## +++## permission. ## +++## ## +++## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## +++## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## +++## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## +++## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## +++## FOR ANY SPECIAL, 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. ## +++## ## +++########################################################################### +++## ## +++## FLITE libraries ## +++## ## +++########################################################################### +++TOP=.. +++DIRNAME=lib +++BUILD_DIRS = +++ALL_DIRS= +++FILES = Makefile +++LIBNAMES = flite flite_cmulex flite_usenglish \ +++ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb +++ +++STATICLIBS= $(LIBNAMES:%=lib%.a) +++SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) +++#SHAREDLIBS = $(LIBNAMES:%=lib%.so) +++SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) +++VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ +++ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) +++ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS) +++ +++ALL = shared_libs +++ +++LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} +++ +++include $(TOP)/config/common_make_rules +++ +++ifdef SHFLAGS +++shared_libs: $(SHAREDLIBS) +++libflite_LDLIBS = -lm $(AUDIOLIBS) +++libflite_cmulex_LDLIBS = -lflite +++libflite_cmulex.so: libflite.so +++libflite_usenglish_LDLIBS = -lflite +++libflite_usenglish.so: libflite.so +++libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish +++libflite_cmu_us_kal.so: libflite_cmulex.so libflite_usenglish.so +++libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish +++libflite_cmu_us_kal16.so: libflite_cmulex.so libflite_usenglish.so +++libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish +++libflite_cmu_time_awb.so: libflite.so libflite_cmulex.so libflite_usenglish.so +++else +++shared_libs: nothing +++endif +++ +++install: +++ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) +++ ++--- flite-1.3-release.orig/main/Makefile +++++ flite-1.3-release/main/Makefile ++@@ -50,11 +50,11 @@ ALL = $(BINDIR)/flite$(EXEEXT) $(BINDIR) ++ ++ flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) ++ flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) ++-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) +++flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so) ++ ++ flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX) ++ flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%) ++-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a) +++flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so) ++ ++ include $(TOP)/config/common_make_rules ++ ++--- flite-1.3-release.orig/Makefile +++++ flite-1.3-release/Makefile ++@@ -41,7 +41,7 @@ ++ ########################################################################### ++ TOP=. ++ DIRNAME= ++-BUILD_DIRS = include src lang doc +++BUILD_DIRS = include src lang lib ++ ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main ++ CONFIG=configure configure.in config.sub config.guess \ ++ missing install-sh mkinstalldirs +diff --git a/feeds/packages/sound/ices/.svn/dir-prop-base b/feeds/packages/sound/ices/.svn/dir-prop-base +new file mode 100644 +index 0000000..3160658 +--- /dev/null ++++ b/feeds/packages/sound/ices/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mergeinfo ++V 0 ++ ++END +diff --git a/feeds/packages/sound/ices/.svn/entries b/feeds/packages/sound/ices/.svn/entries +new file mode 100644 +index 0000000..2ed3852 +--- /dev/null ++++ b/feeds/packages/sound/ices/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/ices ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:37.447915Z ++32283 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++ea2df46e8305d3868c8ecc46aa74063d ++2012-06-12T23:47:37.447915Z ++32283 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1499 ++ +diff --git a/feeds/packages/sound/ices/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/ices/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4f375b7 +--- /dev/null ++++ b/feeds/packages/sound/ices/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ices/ ++PKG_MD5SUM:=0d95ac34d59fed337028d5e7771076d8 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ices ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=ices client for Icecast media streaming servers ++ URL:=http://xiph.org/ ++ 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 ++ ++define Package/ices/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++CONFIGURE_ARGS+= \ ++ --with-ogg="$(STAGING_DIR)/usr/include" \ ++ --with-vorbis="$(STAGING_DIR)/usr/include" \ ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" ++endef ++ ++$(eval $(call BuildPackage,ices)) +diff --git a/feeds/packages/sound/ices/Makefile b/feeds/packages/sound/ices/Makefile +new file mode 100644 +index 0000000..4f375b7 +--- /dev/null ++++ b/feeds/packages/sound/ices/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ices/ ++PKG_MD5SUM:=0d95ac34d59fed337028d5e7771076d8 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ices ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=ices client for Icecast media streaming servers ++ URL:=http://xiph.org/ ++ 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 ++ ++define Package/ices/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++CONFIGURE_ARGS+= \ ++ --with-ogg="$(STAGING_DIR)/usr/include" \ ++ --with-vorbis="$(STAGING_DIR)/usr/include" \ ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" ++endef ++ ++$(eval $(call BuildPackage,ices)) +diff --git a/feeds/packages/sound/lame/.svn/entries b/feeds/packages/sound/lame/.svn/entries +new file mode 100644 +index 0000000..2b40d62 +--- /dev/null ++++ b/feeds/packages/sound/lame/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/lame ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++d46995af5b42cf40cfd6ce3664ea26a4 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1607 ++ +diff --git a/feeds/packages/sound/lame/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/lame/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/sound/lame/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/lame/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/lame/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5695dd8 +--- /dev/null ++++ b/feeds/packages/sound/lame/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,82 @@ ++# ++# Copyright (C) 2007-2008 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:=398-2 ++PKG_RELEASE:=3 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/lame ++PKG_MD5SUM:=719dae0ee675d0c16e0e89952930ed35 ++PKG_FIXUP:=autoreconf ++ ++PKG_LICENSE:=LGPLv2 ++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/feeds/packages/sound/lame/Makefile b/feeds/packages/sound/lame/Makefile +new file mode 100644 +index 0000000..5695dd8 +--- /dev/null ++++ b/feeds/packages/sound/lame/Makefile +@@ -0,0 +1,82 @@ ++# ++# Copyright (C) 2007-2008 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:=398-2 ++PKG_RELEASE:=3 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/lame ++PKG_MD5SUM:=719dae0ee675d0c16e0e89952930ed35 ++PKG_FIXUP:=autoreconf ++ ++PKG_LICENSE:=LGPLv2 ++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/feeds/packages/sound/lame/patches/.svn/entries b/feeds/packages/sound/lame/patches/.svn/entries +new file mode 100644 +index 0000000..87578bc +--- /dev/null ++++ b/feeds/packages/sound/lame/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/lame/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-12T18:00:15.811794Z ++24518 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++f3987e98dcc9f8743fa411a6a9dcb1fd ++2010-12-12T18:00:15.811794Z ++24518 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1082 ++ +diff --git a/feeds/packages/sound/lame/patches/.svn/text-base/001-automake-compat.patch.svn-base b/feeds/packages/sound/lame/patches/.svn/text-base/001-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..a2ba61a +--- /dev/null ++++ b/feeds/packages/sound/lame/patches/.svn/text-base/001-automake-compat.patch.svn-base +@@ -0,0 +1,33 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -385,7 +385,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 ++@@ -51,7 +51,7 @@ mp3rtp_SOURCES = mp3rtp.c rtp.c rtp.h $( ++ mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) ++ endif ++ ++-CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ +++CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ ++ LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++ ++ INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) ++--- a/frontend/Makefile.in +++++ b/frontend/Makefile.in ++@@ -113,7 +113,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/feeds/packages/sound/lame/patches/001-automake-compat.patch b/feeds/packages/sound/lame/patches/001-automake-compat.patch +new file mode 100644 +index 0000000..a2ba61a +--- /dev/null ++++ b/feeds/packages/sound/lame/patches/001-automake-compat.patch +@@ -0,0 +1,33 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -385,7 +385,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 ++@@ -51,7 +51,7 @@ mp3rtp_SOURCES = mp3rtp.c rtp.c rtp.h $( ++ mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) ++ endif ++ ++-CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ +++CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ ++ LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++ ++ INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) ++--- a/frontend/Makefile.in +++++ b/frontend/Makefile.in ++@@ -113,7 +113,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/feeds/packages/sound/listener/.svn/entries b/feeds/packages/sound/listener/.svn/entries +new file mode 100644 +index 0000000..833242d +--- /dev/null ++++ b/feeds/packages/sound/listener/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/listener ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-26T00:42:35.564826Z ++28594 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++3cb55f4d0fccf68a33326205002ac385 ++2011-10-26T00:42:35.564826Z ++28594 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1176 ++ +diff --git a/feeds/packages/sound/listener/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/listener/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7bb41a8 +--- /dev/null ++++ b/feeds/packages/sound/listener/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=listener ++PKG_VERSION:=1.7.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.vanheusden.com/listener/ ++PKG_MD5SUM:=8ad9c24c45c7d28aed606304a2bf80bf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/listener ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+libncurses +libsndfile ++ TITLE:=Listener automatically records when sound is detected ++ URL:=http://www.vanheusden.com/listener/ ++endef ++ ++define Package/listener/description ++ This program listens for sound. If it detects any, it starts recording ++ automatically and also automatically stops when things become silent ++ again. ++endef ++ ++MAKE_FLAGS+= \ ++ INSTALL_PREFIX= \ ++ ++define Package/listener/conffiles ++/etc/listener.conf ++endef ++ ++define Package/listener/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/{listener,listenersoundpipe,setlistener} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/listener.conf $(1)/etc/ ++endef ++ ++$(eval $(call BuildPackage,listener)) +diff --git a/feeds/packages/sound/listener/Makefile b/feeds/packages/sound/listener/Makefile +new file mode 100644 +index 0000000..7bb41a8 +--- /dev/null ++++ b/feeds/packages/sound/listener/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=listener ++PKG_VERSION:=1.7.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.vanheusden.com/listener/ ++PKG_MD5SUM:=8ad9c24c45c7d28aed606304a2bf80bf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/listener ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+libncurses +libsndfile ++ TITLE:=Listener automatically records when sound is detected ++ URL:=http://www.vanheusden.com/listener/ ++endef ++ ++define Package/listener/description ++ This program listens for sound. If it detects any, it starts recording ++ automatically and also automatically stops when things become silent ++ again. ++endef ++ ++MAKE_FLAGS+= \ ++ INSTALL_PREFIX= \ ++ ++define Package/listener/conffiles ++/etc/listener.conf ++endef ++ ++define Package/listener/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/{listener,listenersoundpipe,setlistener} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/listener.conf $(1)/etc/ ++endef ++ ++$(eval $(call BuildPackage,listener)) +diff --git a/feeds/packages/sound/listener/files/.svn/entries b/feeds/packages/sound/listener/files/.svn/entries +new file mode 100644 +index 0000000..122ec14 +--- /dev/null ++++ b/feeds/packages/sound/listener/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/listener/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-26T00:42:35.564826Z ++28594 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++listener.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++1e2ed49d08477c73ab0370850db1be64 ++2011-10-26T00:42:35.564826Z ++28594 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++386 ++ +diff --git a/feeds/packages/sound/listener/files/.svn/text-base/listener.conf.svn-base b/feeds/packages/sound/listener/files/.svn/text-base/listener.conf.svn-base +new file mode 100644 +index 0000000..aeafd44 +--- /dev/null ++++ b/feeds/packages/sound/listener/files/.svn/text-base/listener.conf.svn-base +@@ -0,0 +1,20 @@ ++wav_path = /tmp/ ++fname_template = listener-%h-%y%m%d-%H%M%S.wav ++devname = /dev/dsp ++detect_level = 1 ++min_duration = 10 ++rec_silence = 5 ++max_duration = 60 ++min_triggers = 2 ++sample_rate = 8000 ++channels = 1 ++format=wav ++amplify = off ++start_amplify = 1.5 ++max_amplify = 10.0 ++fixed_amplify = no ++safe_after_filter = no ++one_shot = no ++ ++#compression = a-law ++#filter = ./my_filter2.so.0.1 0 3000.0 1.0 +diff --git a/feeds/packages/sound/listener/files/listener.conf b/feeds/packages/sound/listener/files/listener.conf +new file mode 100644 +index 0000000..aeafd44 +--- /dev/null ++++ b/feeds/packages/sound/listener/files/listener.conf +@@ -0,0 +1,20 @@ ++wav_path = /tmp/ ++fname_template = listener-%h-%y%m%d-%H%M%S.wav ++devname = /dev/dsp ++detect_level = 1 ++min_duration = 10 ++rec_silence = 5 ++max_duration = 60 ++min_triggers = 2 ++sample_rate = 8000 ++channels = 1 ++format=wav ++amplify = off ++start_amplify = 1.5 ++max_amplify = 10.0 ++fixed_amplify = no ++safe_after_filter = no ++one_shot = no ++ ++#compression = a-law ++#filter = ./my_filter2.so.0.1 0 3000.0 1.0 +diff --git a/feeds/packages/sound/listener/patches/.svn/entries b/feeds/packages/sound/listener/patches/.svn/entries +new file mode 100644 +index 0000000..24d21b4 +--- /dev/null ++++ b/feeds/packages/sound/listener/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/listener/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-10-25T22:05:06.773129Z ++28592 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4b65a60703f5e48bbfff885249a22ff9 ++2011-10-25T22:05:06.773129Z ++28592 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1048 ++ +diff --git a/feeds/packages/sound/listener/patches/.svn/text-base/100-makefile.patch.svn-base b/feeds/packages/sound/listener/patches/.svn/text-base/100-makefile.patch.svn-base +new file mode 100644 +index 0000000..bd254b8 +--- /dev/null ++++ b/feeds/packages/sound/listener/patches/.svn/text-base/100-makefile.patch.svn-base +@@ -0,0 +1,31 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -2,7 +2,10 @@ VERSION=1.7.2 ++ ++ INSTALL_PREFIX=/usr/local ++ ++-CFLAGS+=-g -O2 -Wall -DVERSION=\"$(VERSION)\" +++ifeq ($(CFLAGS),) +++ CFLAGS:=-g -O2 +++endif +++CFLAGS+=-Wall -DVERSION=\"$(VERSION)\" ++ ++ OBJSsl=sl.o snd_dev.o error.o utils.o ++ OBJSli=listener.o snd_dev.o error.o utils.o lib.o ++@@ -11,13 +14,13 @@ OBJSsp=snd_dev.o lsp.o error.o utils.o ++ all: setlistener listener listenersoundpipe ++ ++ setlistener: $(OBJSsl) ++- $(CC) -g -Wall -W $(OBJSsl) -ldl -lncurses -o setlistener +++ $(CC) $(CFLAGS) $(OBJSsl) $(LDFLAGS) -ldl -lncurses -o setlistener ++ ++ listener: $(OBJSli) ++- $(CC) -g -Wall -W $(OBJSli) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf +++ $(CC) $(CFLAGS) $(OBJSli) $(LDFLAGS) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf ++ ++ listenersoundpipe: $(OBJSsp) ++- $(CC) -g -Wall -W $(OBJSsp) -o listenersoundpipe +++ $(CC) $(CFLAGS) $(OBJSsp) -o listenersoundpipe ++ ++ install: setlistener listener listenersoundpipe ++ cp setlistener $(INSTALL_PREFIX)/bin +diff --git a/feeds/packages/sound/listener/patches/100-makefile.patch b/feeds/packages/sound/listener/patches/100-makefile.patch +new file mode 100644 +index 0000000..bd254b8 +--- /dev/null ++++ b/feeds/packages/sound/listener/patches/100-makefile.patch +@@ -0,0 +1,31 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -2,7 +2,10 @@ VERSION=1.7.2 ++ ++ INSTALL_PREFIX=/usr/local ++ ++-CFLAGS+=-g -O2 -Wall -DVERSION=\"$(VERSION)\" +++ifeq ($(CFLAGS),) +++ CFLAGS:=-g -O2 +++endif +++CFLAGS+=-Wall -DVERSION=\"$(VERSION)\" ++ ++ OBJSsl=sl.o snd_dev.o error.o utils.o ++ OBJSli=listener.o snd_dev.o error.o utils.o lib.o ++@@ -11,13 +14,13 @@ OBJSsp=snd_dev.o lsp.o error.o utils.o ++ all: setlistener listener listenersoundpipe ++ ++ setlistener: $(OBJSsl) ++- $(CC) -g -Wall -W $(OBJSsl) -ldl -lncurses -o setlistener +++ $(CC) $(CFLAGS) $(OBJSsl) $(LDFLAGS) -ldl -lncurses -o setlistener ++ ++ listener: $(OBJSli) ++- $(CC) -g -Wall -W $(OBJSli) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf +++ $(CC) $(CFLAGS) $(OBJSli) $(LDFLAGS) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf ++ ++ listenersoundpipe: $(OBJSsp) ++- $(CC) -g -Wall -W $(OBJSsp) -o listenersoundpipe +++ $(CC) $(CFLAGS) $(OBJSsp) -o listenersoundpipe ++ ++ install: setlistener listener listenersoundpipe ++ cp setlistener $(INSTALL_PREFIX)/bin +diff --git a/feeds/packages/sound/madplay/.svn/entries b/feeds/packages/sound/madplay/.svn/entries +new file mode 100644 +index 0000000..c3da8d9 +--- /dev/null ++++ b/feeds/packages/sound/madplay/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/madplay ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4f62fcd9754cff4ce90a762fc88a3a53 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1404 ++ +diff --git a/feeds/packages/sound/madplay/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/madplay/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/sound/madplay/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/madplay/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/madplay/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bf0b93c +--- /dev/null ++++ b/feeds/packages/sound/madplay/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=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_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/feeds/packages/sound/madplay/Makefile b/feeds/packages/sound/madplay/Makefile +new file mode 100644 +index 0000000..bf0b93c +--- /dev/null ++++ b/feeds/packages/sound/madplay/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=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_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/feeds/packages/sound/mocp/.svn/entries b/feeds/packages/sound/mocp/.svn/entries +new file mode 100644 +index 0000000..2268e38 +--- /dev/null ++++ b/feeds/packages/sound/mocp/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mocp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-17T11:58:43.821857Z ++32399 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++9c3b40c340350b49fe0dd4994bf91494 ++2012-06-17T11:58:43.821857Z ++32399 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1557 ++ +diff --git a/feeds/packages/sound/mocp/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/mocp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8cb333c +--- /dev/null ++++ b/feeds/packages/sound/mocp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=moc ++PKG_VERSION:=2.4.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.daper.net/pub/soft/moc/stable/ ++PKG_MD5SUM:=647c770a5542a4ae5437386807a89796 ++ ++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-utils +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg +libltdl ++ 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 \ ++ ) ++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/feeds/packages/sound/mocp/Makefile b/feeds/packages/sound/mocp/Makefile +new file mode 100644 +index 0000000..8cb333c +--- /dev/null ++++ b/feeds/packages/sound/mocp/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=moc ++PKG_VERSION:=2.4.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.daper.net/pub/soft/moc/stable/ ++PKG_MD5SUM:=647c770a5542a4ae5437386807a89796 ++ ++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-utils +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg +libltdl ++ 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 \ ++ ) ++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/feeds/packages/sound/mocp/patches/.svn/entries b/feeds/packages/sound/mocp/patches/.svn/entries +new file mode 100644 +index 0000000..b8a134e +--- /dev/null ++++ b/feeds/packages/sound/mocp/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mocp/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-11T08:33:26.870086Z ++28210 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-moc-ffmpeg-update.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++cc5013ebddb4fc066d72477872333b92 ++2011-09-11T08:33:26.870086Z ++28210 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1378 ++ +diff --git a/feeds/packages/sound/mocp/patches/.svn/text-base/001-moc-ffmpeg-update.patch.svn-base b/feeds/packages/sound/mocp/patches/.svn/text-base/001-moc-ffmpeg-update.patch.svn-base +new file mode 100644 +index 0000000..a9c5615 +--- /dev/null ++++ b/feeds/packages/sound/mocp/patches/.svn/text-base/001-moc-ffmpeg-update.patch.svn-base +@@ -0,0 +1,34 @@ ++--- a/decoder_plugins/ffmpeg/ffmpeg.c +++++ b/decoder_plugins/ffmpeg/ffmpeg.c ++@@ -81,14 +81,14 @@ static void ffmpeg_info (const char *fil ++ } ++ ++ if (tags_sel & TAGS_COMMENTS) { ++- if (ic->track != 0) ++- info->track = ic->track; ++- if (ic->title[0] != 0) ++- info->title = xstrdup (ic->title); ++- if (ic->author[0] != 0) ++- info->artist = xstrdup (ic->author); ++- if (ic->album[0] != 0) ++- info->album = xstrdup (ic->album); +++ if (av_metadata_get(ic->metadata, "track", NULL, 0) != NULL) +++ info->track = atoi(av_metadata_get(ic->metadata, "track", NULL, 0)->value); +++ if (av_metadata_get(ic->metadata, "title", NULL, 0) != NULL) +++ info->title = xstrdup (av_metadata_get(ic->metadata, "title", NULL, 0)->value); +++ if (av_metadata_get(ic->metadata, "author", NULL, 0) != NULL) +++ info->artist = xstrdup (av_metadata_get(ic->metadata, "author", NULL, 0)->value); +++ if (av_metadata_get(ic->metadata, "album", NULL, 0) != NULL) +++ info->album = xstrdup (av_metadata_get(ic->metadata, "album", NULL, 0)->value); ++ } ++ ++ if (tags_sel & TAGS_TIME) ++@@ -127,7 +127,7 @@ static void *ffmpeg_open (const char *fi ++ av_read_play (data->ic); ++ for (i = 0; i < data->ic->nb_streams; i++) { ++ data->enc = data->ic->streams[i]->codec; ++- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { +++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { ++ audio_index = i; ++ break; ++ } +diff --git a/feeds/packages/sound/mocp/patches/001-moc-ffmpeg-update.patch b/feeds/packages/sound/mocp/patches/001-moc-ffmpeg-update.patch +new file mode 100644 +index 0000000..a9c5615 +--- /dev/null ++++ b/feeds/packages/sound/mocp/patches/001-moc-ffmpeg-update.patch +@@ -0,0 +1,34 @@ ++--- a/decoder_plugins/ffmpeg/ffmpeg.c +++++ b/decoder_plugins/ffmpeg/ffmpeg.c ++@@ -81,14 +81,14 @@ static void ffmpeg_info (const char *fil ++ } ++ ++ if (tags_sel & TAGS_COMMENTS) { ++- if (ic->track != 0) ++- info->track = ic->track; ++- if (ic->title[0] != 0) ++- info->title = xstrdup (ic->title); ++- if (ic->author[0] != 0) ++- info->artist = xstrdup (ic->author); ++- if (ic->album[0] != 0) ++- info->album = xstrdup (ic->album); +++ if (av_metadata_get(ic->metadata, "track", NULL, 0) != NULL) +++ info->track = atoi(av_metadata_get(ic->metadata, "track", NULL, 0)->value); +++ if (av_metadata_get(ic->metadata, "title", NULL, 0) != NULL) +++ info->title = xstrdup (av_metadata_get(ic->metadata, "title", NULL, 0)->value); +++ if (av_metadata_get(ic->metadata, "author", NULL, 0) != NULL) +++ info->artist = xstrdup (av_metadata_get(ic->metadata, "author", NULL, 0)->value); +++ if (av_metadata_get(ic->metadata, "album", NULL, 0) != NULL) +++ info->album = xstrdup (av_metadata_get(ic->metadata, "album", NULL, 0)->value); ++ } ++ ++ if (tags_sel & TAGS_TIME) ++@@ -127,7 +127,7 @@ static void *ffmpeg_open (const char *fi ++ av_read_play (data->ic); ++ for (i = 0; i < data->ic->nb_streams; i++) { ++ data->enc = data->ic->streams[i]->codec; ++- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { +++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { ++ audio_index = i; ++ break; ++ } +diff --git a/feeds/packages/sound/mpc/.svn/entries b/feeds/packages/sound/mpc/.svn/entries +new file mode 100644 +index 0000000..1bce9d2 +--- /dev/null ++++ b/feeds/packages/sound/mpc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-11T11:30:20.412829Z ++26032 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++e9aa64f7e6dbfbf480fd0c9e5015143b ++2011-03-11T11:30:20.412829Z ++26032 ++loswillios ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1205 ++ +diff --git a/feeds/packages/sound/mpc/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/mpc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/sound/mpc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/mpc/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/mpc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4bf7308 +--- /dev/null ++++ b/feeds/packages/sound/mpc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2006-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:=mpc ++PKG_VERSION:=0.20 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/musicpd ++PKG_MD5SUM:=24c81ad6afe6099e8d7a6826ef4b7105 ++ ++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/feeds/packages/sound/mpc/Makefile b/feeds/packages/sound/mpc/Makefile +new file mode 100644 +index 0000000..4bf7308 +--- /dev/null ++++ b/feeds/packages/sound/mpc/Makefile +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2006-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:=mpc ++PKG_VERSION:=0.20 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/musicpd ++PKG_MD5SUM:=24c81ad6afe6099e8d7a6826ef4b7105 ++ ++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/feeds/packages/sound/mpc/files/.svn/entries b/feeds/packages/sound/mpc/files/.svn/entries +new file mode 100644 +index 0000000..580e464 +--- /dev/null ++++ b/feeds/packages/sound/mpc/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpc/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-02-02T01:48:25.153413Z ++10352 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pls-handler.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++14aa0bb7008f65aac308002d492cf3a3 ++2008-02-02T01:48:25.153413Z ++10352 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++121 ++ +diff --git a/feeds/packages/sound/mpc/files/.svn/text-base/pls-handler.sh.svn-base b/feeds/packages/sound/mpc/files/.svn/text-base/pls-handler.sh.svn-base +new file mode 100644 +index 0000000..9394417 +--- /dev/null ++++ b/feeds/packages/sound/mpc/files/.svn/text-base/pls-handler.sh.svn-base +@@ -0,0 +1,5 @@ ++#!/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/feeds/packages/sound/mpc/files/pls-handler.sh b/feeds/packages/sound/mpc/files/pls-handler.sh +new file mode 100644 +index 0000000..9394417 +--- /dev/null ++++ b/feeds/packages/sound/mpc/files/pls-handler.sh +@@ -0,0 +1,5 @@ ++#!/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/feeds/packages/sound/mpd/.svn/entries b/feeds/packages/sound/mpd/.svn/entries +new file mode 100644 +index 0000000..72753e3 +--- /dev/null ++++ b/feeds/packages/sound/mpd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:16:27.036361Z ++29080 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++37ee517d5904cdb50b7ada2af1a1686c ++2011-11-13T22:16:27.036361Z ++29080 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4874 ++ +diff --git a/feeds/packages/sound/mpd/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/mpd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/sound/mpd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/mpd/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/mpd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..19f9b06 +--- /dev/null ++++ b/feeds/packages/sound/mpd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,211 @@ ++# ++# 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:=mpd ++PKG_VERSION:=0.16.5 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/musicpd ++PKG_MD5SUM:=f7564cff12035f6a1112cce770655df7 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_IPV6 \ ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/mpd/Default ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=Music Player Daemon ++ URL:=http://www.musicpd.org/ ++ DEPENDS:= +glib2 +libcurl +libpthread \ ++ +libflac +BUILD_PATENTED:libmad +libvorbisidec ++endef ++ ++define Package/mpd/Default/description ++ Music Player Daemon (MPD) is a flexible, powerful, server-side ++ application for playing music. It is typically controlled over a ++ network using one of it's many clients including mpc (console), ++ gmpc (gnome), phpmp (php), etc... ++endef ++ ++ ++define Package/mpd-full ++$(call Package/mpd/Default) ++ TITLE+= (full) ++ DEPENDS+= \ ++ +AUDIO_SUPPORT:alsa-lib \ ++ +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \ ++ +libmms +libogg +libshout +libsndfile +libvorbis ++ PROVIDES:=mpd ++ VARIANT:=full ++endef ++ ++define Package/mpd-full/description ++$(call Package/mpd/Default/description) ++ . ++ This package contains a full-blown Music Player Daemon. ++endef ++ ++define Package/mpd-full/conffiles ++/etc/avahi/services/mpd.service ++/etc/mpd.conf ++endef ++ ++ ++define Package/mpd-mini ++$(call Package/mpd/Default) ++ TITLE+= (mini) ++ PROVIDES:=mpd ++ VARIANT:=mini ++endef ++ ++define Package/mpd-mini/description ++$(call Package/mpd/Default/description) ++ . ++ This package contains a minimal Music Player Daemon, with support for ++ only Flac, MP3 & OGG media types & only file: & http: protocols. ++endef ++ ++define Package/mpd-mini/conffiles ++/etc/mpd.conf ++endef ++ ++ ++CONFIGURE_ARGS += \ ++ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ ++ --disable-debug \ ++ --disable-documentation \ ++ --disable-gprof \ ++ --disable-test \ ++ --disable-werror \ ++ \ ++ --disable-ao \ ++ --disable-bzip2 \ ++ --disable-cue \ ++ --disable-ffado \ ++ --disable-fluidsynth \ ++ --disable-gme \ ++ --disable-inotify \ ++ --disable-iso9660 \ ++ --disable-jack \ ++ --disable-lame-encoder \ ++ --disable-libwrap \ ++ --disable-lsr \ ++ --disable-mikmod \ ++ --disable-modplug \ ++ --disable-mpc \ ++ --disable-mpg123 \ ++ --disable-mvp \ ++ --disable-openal \ ++ --disable-pulse \ ++ --disable-sidplay \ ++ --disable-solaris-output \ ++ --disable-sqlite \ ++ --disable-twolame-encoder \ ++ --disable-wave-encoder \ ++ --disable-wavpack \ ++ --disable-wildmidi \ ++ --disable-zzip \ ++ --with-zeroconf=no \ ++ \ ++ --enable-curl \ ++ --enable-flac \ ++ --enable-httpd-output \ ++ $(call autoconf_bool,CONFIG_BUILD_PATENTED,mad) \ ++ $(call autoconf_bool,CONFIG_AUDIO_SUPPORT,oss) \ ++ --enable-tcp \ ++ --enable-un \ ++ ++CONFIGURE_VARS += \ ++ FLAC_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/FLAC" \ ++ FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \ ++ $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ ++ $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ ++ ++TARGET_CFLAGS += -std=gnu99 ++TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++# use gcc instead of g++ to avoid unnecessary linking against libstdc++ ++TARGET_CXX:=$(TARGET_CC) ++ ++ifeq ($(BUILD_VARIANT),full) ++ ++ CONFIGURE_ARGS += \ ++ $(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \ ++ $(call autoconf_bool,CONFIG_AUDIO_SUPPORT,alsa) \ ++ --enable-audiofile \ ++ --enable-fifo \ ++ --enable-ffmpeg \ ++ --enable-id3 \ ++ --enable-lastfm \ ++ --enable-mms \ ++ --enable-oggflac \ ++ --enable-pipe-output \ ++ --enable-recorder-output \ ++ --enable-shout \ ++ --enable-sndfile \ ++ --enable-vorbis \ ++ --enable-vorbis-encoder \ ++ --with-faad="$(STAGING_DIR)/usr" \ ++ --with-tremor=no \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),mini) ++ ++ # oggflac is not compatible with tremor ++ CONFIGURE_ARGS += \ ++ --disable-aac \ ++ --disable-alsa \ ++ --disable-audiofile \ ++ --disable-fifo \ ++ --disable-ffmpeg \ ++ --disable-id3 \ ++ --disable-lastfm \ ++ --disable-mms \ ++ --disable-oggflac \ ++ --disable-pipe-output \ ++ --disable-recorder-output \ ++ --disable-shout \ ++ --disable-sndfile \ ++ --disable-vorbis \ ++ --disable-vorbis-encoder \ ++ --with-tremor=yes \ ++ ++endif ++ ++define Package/mpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/mpd.init $(1)/etc/init.d/mpd ++endef ++ ++define Package/mpd-full/install ++$(call Package/mpd/install,$1) ++ $(INSTALL_DIR) $(1)/etc/avahi/services ++ $(INSTALL_DATA) ./files/mpd.service $(1)/etc/avahi/services/ ++endef ++ ++define Package/mpd-mini/install ++$(call Package/mpd/install,$1) ++endef ++ ++$(eval $(call BuildPackage,mpd-full)) ++$(eval $(call BuildPackage,mpd-mini)) +diff --git a/feeds/packages/sound/mpd/Makefile b/feeds/packages/sound/mpd/Makefile +new file mode 100644 +index 0000000..19f9b06 +--- /dev/null ++++ b/feeds/packages/sound/mpd/Makefile +@@ -0,0 +1,211 @@ ++# ++# 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:=mpd ++PKG_VERSION:=0.16.5 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/musicpd ++PKG_MD5SUM:=f7564cff12035f6a1112cce770655df7 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_IPV6 \ ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/mpd/Default ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=Music Player Daemon ++ URL:=http://www.musicpd.org/ ++ DEPENDS:= +glib2 +libcurl +libpthread \ ++ +libflac +BUILD_PATENTED:libmad +libvorbisidec ++endef ++ ++define Package/mpd/Default/description ++ Music Player Daemon (MPD) is a flexible, powerful, server-side ++ application for playing music. It is typically controlled over a ++ network using one of it's many clients including mpc (console), ++ gmpc (gnome), phpmp (php), etc... ++endef ++ ++ ++define Package/mpd-full ++$(call Package/mpd/Default) ++ TITLE+= (full) ++ DEPENDS+= \ ++ +AUDIO_SUPPORT:alsa-lib \ ++ +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \ ++ +libmms +libogg +libshout +libsndfile +libvorbis ++ PROVIDES:=mpd ++ VARIANT:=full ++endef ++ ++define Package/mpd-full/description ++$(call Package/mpd/Default/description) ++ . ++ This package contains a full-blown Music Player Daemon. ++endef ++ ++define Package/mpd-full/conffiles ++/etc/avahi/services/mpd.service ++/etc/mpd.conf ++endef ++ ++ ++define Package/mpd-mini ++$(call Package/mpd/Default) ++ TITLE+= (mini) ++ PROVIDES:=mpd ++ VARIANT:=mini ++endef ++ ++define Package/mpd-mini/description ++$(call Package/mpd/Default/description) ++ . ++ This package contains a minimal Music Player Daemon, with support for ++ only Flac, MP3 & OGG media types & only file: & http: protocols. ++endef ++ ++define Package/mpd-mini/conffiles ++/etc/mpd.conf ++endef ++ ++ ++CONFIGURE_ARGS += \ ++ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ ++ --disable-debug \ ++ --disable-documentation \ ++ --disable-gprof \ ++ --disable-test \ ++ --disable-werror \ ++ \ ++ --disable-ao \ ++ --disable-bzip2 \ ++ --disable-cue \ ++ --disable-ffado \ ++ --disable-fluidsynth \ ++ --disable-gme \ ++ --disable-inotify \ ++ --disable-iso9660 \ ++ --disable-jack \ ++ --disable-lame-encoder \ ++ --disable-libwrap \ ++ --disable-lsr \ ++ --disable-mikmod \ ++ --disable-modplug \ ++ --disable-mpc \ ++ --disable-mpg123 \ ++ --disable-mvp \ ++ --disable-openal \ ++ --disable-pulse \ ++ --disable-sidplay \ ++ --disable-solaris-output \ ++ --disable-sqlite \ ++ --disable-twolame-encoder \ ++ --disable-wave-encoder \ ++ --disable-wavpack \ ++ --disable-wildmidi \ ++ --disable-zzip \ ++ --with-zeroconf=no \ ++ \ ++ --enable-curl \ ++ --enable-flac \ ++ --enable-httpd-output \ ++ $(call autoconf_bool,CONFIG_BUILD_PATENTED,mad) \ ++ $(call autoconf_bool,CONFIG_AUDIO_SUPPORT,oss) \ ++ --enable-tcp \ ++ --enable-un \ ++ ++CONFIGURE_VARS += \ ++ FLAC_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/FLAC" \ ++ FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \ ++ $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ ++ $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ ++ ++TARGET_CFLAGS += -std=gnu99 ++TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++# use gcc instead of g++ to avoid unnecessary linking against libstdc++ ++TARGET_CXX:=$(TARGET_CC) ++ ++ifeq ($(BUILD_VARIANT),full) ++ ++ CONFIGURE_ARGS += \ ++ $(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \ ++ $(call autoconf_bool,CONFIG_AUDIO_SUPPORT,alsa) \ ++ --enable-audiofile \ ++ --enable-fifo \ ++ --enable-ffmpeg \ ++ --enable-id3 \ ++ --enable-lastfm \ ++ --enable-mms \ ++ --enable-oggflac \ ++ --enable-pipe-output \ ++ --enable-recorder-output \ ++ --enable-shout \ ++ --enable-sndfile \ ++ --enable-vorbis \ ++ --enable-vorbis-encoder \ ++ --with-faad="$(STAGING_DIR)/usr" \ ++ --with-tremor=no \ ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),mini) ++ ++ # oggflac is not compatible with tremor ++ CONFIGURE_ARGS += \ ++ --disable-aac \ ++ --disable-alsa \ ++ --disable-audiofile \ ++ --disable-fifo \ ++ --disable-ffmpeg \ ++ --disable-id3 \ ++ --disable-lastfm \ ++ --disable-mms \ ++ --disable-oggflac \ ++ --disable-pipe-output \ ++ --disable-recorder-output \ ++ --disable-shout \ ++ --disable-sndfile \ ++ --disable-vorbis \ ++ --disable-vorbis-encoder \ ++ --with-tremor=yes \ ++ ++endif ++ ++define Package/mpd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(1)/etc/mpd.conf ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/mpd.init $(1)/etc/init.d/mpd ++endef ++ ++define Package/mpd-full/install ++$(call Package/mpd/install,$1) ++ $(INSTALL_DIR) $(1)/etc/avahi/services ++ $(INSTALL_DATA) ./files/mpd.service $(1)/etc/avahi/services/ ++endef ++ ++define Package/mpd-mini/install ++$(call Package/mpd/install,$1) ++endef ++ ++$(eval $(call BuildPackage,mpd-full)) ++$(eval $(call BuildPackage,mpd-mini)) +diff --git a/feeds/packages/sound/mpd/files/.svn/entries b/feeds/packages/sound/mpd/files/.svn/entries +new file mode 100644 +index 0000000..9ec1252 +--- /dev/null ++++ b/feeds/packages/sound/mpd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:16:27.036361Z ++29080 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mpd.service ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++4bbc2a4ff3ec62e06cc67b85bdae8319 ++2010-04-20T17:20:04.996382Z ++21054 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++274 ++ ++mpd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2f351fd9d7b12156e21ff0172c0c7382 ++2011-11-13T22:16:27.036361Z ++29080 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++641 ++ +diff --git a/feeds/packages/sound/mpd/files/.svn/text-base/mpd.init.svn-base b/feeds/packages/sound/mpd/files/.svn/text-base/mpd.init.svn-base +new file mode 100644 +index 0000000..707564b +--- /dev/null ++++ b/feeds/packages/sound/mpd/files/.svn/text-base/mpd.init.svn-base +@@ -0,0 +1,28 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=93 ++ ++start() { ++ #create mpd directories ++ pld=`grep ^playlist_directory /etc/mpd.conf | cut -d "\"" -f 2 | sed "s/~/\/root/g"` ++ if [ ! -d $pld ]; then ++ mkdir -m 0755 -p $pld ++ fi ++ ++ # Set the initial volume to something manageable ++ [ -x /usr/bin/amixer ] && /usr/bin/amixer set PCM 40 ++ ++ if [ -x /bin/nice ]; then ++ # This has real-time constraints, so let's at least tell the OS ++ # that this should have higher priority to avoid skipping ++ # when doing other things in the background. ++ nice -n -10 ++ fi ++ ++ service_start /usr/bin/mpd ++} ++ ++stop() { ++ service_stop /usr/bin/mpd ++} +diff --git a/feeds/packages/sound/mpd/files/.svn/text-base/mpd.service.svn-base b/feeds/packages/sound/mpd/files/.svn/text-base/mpd.service.svn-base +new file mode 100644 +index 0000000..086a2bb +--- /dev/null ++++ b/feeds/packages/sound/mpd/files/.svn/text-base/mpd.service.svn-base +@@ -0,0 +1,9 @@ ++ ++ ++ ++ Music Player Daemon on %h ++ ++ _mpd._tcp ++ 6600 ++ ++ +diff --git a/feeds/packages/sound/mpd/files/mpd.init b/feeds/packages/sound/mpd/files/mpd.init +new file mode 100644 +index 0000000..707564b +--- /dev/null ++++ b/feeds/packages/sound/mpd/files/mpd.init +@@ -0,0 +1,28 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=93 ++ ++start() { ++ #create mpd directories ++ pld=`grep ^playlist_directory /etc/mpd.conf | cut -d "\"" -f 2 | sed "s/~/\/root/g"` ++ if [ ! -d $pld ]; then ++ mkdir -m 0755 -p $pld ++ fi ++ ++ # Set the initial volume to something manageable ++ [ -x /usr/bin/amixer ] && /usr/bin/amixer set PCM 40 ++ ++ if [ -x /bin/nice ]; then ++ # This has real-time constraints, so let's at least tell the OS ++ # that this should have higher priority to avoid skipping ++ # when doing other things in the background. ++ nice -n -10 ++ fi ++ ++ service_start /usr/bin/mpd ++} ++ ++stop() { ++ service_stop /usr/bin/mpd ++} +diff --git a/feeds/packages/sound/mpd/files/mpd.service b/feeds/packages/sound/mpd/files/mpd.service +new file mode 100644 +index 0000000..086a2bb +--- /dev/null ++++ b/feeds/packages/sound/mpd/files/mpd.service +@@ -0,0 +1,9 @@ ++ ++ ++ ++ Music Player Daemon on %h ++ ++ _mpd._tcp ++ 6600 ++ ++ +diff --git a/feeds/packages/sound/mpd/patches/.svn/entries b/feeds/packages/sound/mpd/patches/.svn/entries +new file mode 100644 +index 0000000..5875e8a +--- /dev/null ++++ b/feeds/packages/sound/mpd/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-10T16:57:22.240319Z ++26014 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++eba186b8c802f33cb87edcf3ee0ba789 ++2011-03-10T16:57:22.240319Z ++26014 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++945 ++ +diff --git a/feeds/packages/sound/mpd/patches/.svn/text-base/100-compile-fixes.patch.svn-base b/feeds/packages/sound/mpd/patches/.svn/text-base/100-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..cd05159 +--- /dev/null ++++ b/feeds/packages/sound/mpd/patches/.svn/text-base/100-compile-fixes.patch.svn-base +@@ -0,0 +1,27 @@ ++Index: mpd-0.16.1/configure ++=================================================================== ++--- mpd-0.16.1.orig/configure 2011-01-10 02:58:36.000000000 +0100 +++++ mpd-0.16.1/configure 2011-03-10 13:01:31.000000000 +0100 ++@@ -8718,6 +8718,7 @@ ++ # Check whether --with-faad was given. ++ if test "${with_faad+set}" = set; then : ++ withval=$with_faad; +++ faad_prefix=$with_faad; ++ else ++ faad_prefix="" ++ fi ++Index: mpd-0.16.1/src/input/file_input_plugin.c ++=================================================================== ++--- mpd-0.16.1.orig/src/input/file_input_plugin.c 2011-01-10 02:58:08.000000000 +0100 +++++ mpd-0.16.1/src/input/file_input_plugin.c 2011-03-10 13:02:15.000000000 +0100 ++@@ -79,10 +79,6 @@ ++ return false; ++ } ++ ++-#ifdef POSIX_FADV_SEQUENTIAL ++- posix_fadvise(fd, (off_t)0, st.st_size, POSIX_FADV_SEQUENTIAL); ++-#endif ++- ++ fis = g_new(struct file_input_stream, 1); ++ input_stream_init(&fis->base, &input_plugin_file, filename); ++ +diff --git a/feeds/packages/sound/mpd/patches/100-compile-fixes.patch b/feeds/packages/sound/mpd/patches/100-compile-fixes.patch +new file mode 100644 +index 0000000..cd05159 +--- /dev/null ++++ b/feeds/packages/sound/mpd/patches/100-compile-fixes.patch +@@ -0,0 +1,27 @@ ++Index: mpd-0.16.1/configure ++=================================================================== ++--- mpd-0.16.1.orig/configure 2011-01-10 02:58:36.000000000 +0100 +++++ mpd-0.16.1/configure 2011-03-10 13:01:31.000000000 +0100 ++@@ -8718,6 +8718,7 @@ ++ # Check whether --with-faad was given. ++ if test "${with_faad+set}" = set; then : ++ withval=$with_faad; +++ faad_prefix=$with_faad; ++ else ++ faad_prefix="" ++ fi ++Index: mpd-0.16.1/src/input/file_input_plugin.c ++=================================================================== ++--- mpd-0.16.1.orig/src/input/file_input_plugin.c 2011-01-10 02:58:08.000000000 +0100 +++++ mpd-0.16.1/src/input/file_input_plugin.c 2011-03-10 13:02:15.000000000 +0100 ++@@ -79,10 +79,6 @@ ++ return false; ++ } ++ ++-#ifdef POSIX_FADV_SEQUENTIAL ++- posix_fadvise(fd, (off_t)0, st.st_size, POSIX_FADV_SEQUENTIAL); ++-#endif ++- ++ fis = g_new(struct file_input_stream, 1); ++ input_stream_init(&fis->base, &input_plugin_file, filename); ++ +diff --git a/feeds/packages/sound/mpdas/.svn/entries b/feeds/packages/sound/mpdas/.svn/entries +new file mode 100644 +index 0000000..d774bc1 +--- /dev/null ++++ b/feeds/packages/sound/mpdas/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpdas ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-12T01:30:30.780047Z ++28969 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++213908a3315f2b32096a23c90a6ba9cc ++2011-11-12T01:30:30.780047Z ++28969 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1556 ++ +diff --git a/feeds/packages/sound/mpdas/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/mpdas/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b0b1f1f +--- /dev/null ++++ b/feeds/packages/sound/mpdas/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=mpdas ++PKG_VERSION:=0.3.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://50hz.ws/mpdas ++PKG_MD5SUM:=d9f6e4d3b000d95835f39fb1aa3f4b28 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/mpdas ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=A MPD client which submits your tracks to Last.Fm ++ DEPENDS:=+libcurl +libmpd +libstdcpp ++ URL:=http://50hz.ws/mpdas/ ++endef ++ ++define Package/mpdas/description ++ mpdas is an AudioScrobbler client for MPD written in C++. ++ It supports the latest AudioScrobbler protocol (2.0). ++ In case of a downtime or connectivity problems, mpdas will ++ cache the played songs to ~/.mpdascache. ++endef ++ ++define Package/mpdas/conffiles ++/etc/mpdasrc ++endef ++ ++EXTRA_CPPFLAGS:=\ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(INTL_PREFIX)/include \ ++ ++EXTRA_LDFLAGS:=\ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/lib \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++MAKE_FLAGS += \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDPFLAGS) $(EXTRA_LDFLAGS)" ++ ++define Package/mpdas/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/mpdasrc $(1)/etc/mpdasrc ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mpdas $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/mpdas.init $(1)/etc/init.d/mpdas ++endef ++ ++$(eval $(call BuildPackage,mpdas)) +diff --git a/feeds/packages/sound/mpdas/Makefile b/feeds/packages/sound/mpdas/Makefile +new file mode 100644 +index 0000000..b0b1f1f +--- /dev/null ++++ b/feeds/packages/sound/mpdas/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=mpdas ++PKG_VERSION:=0.3.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://50hz.ws/mpdas ++PKG_MD5SUM:=d9f6e4d3b000d95835f39fb1aa3f4b28 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/mpdas ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=A MPD client which submits your tracks to Last.Fm ++ DEPENDS:=+libcurl +libmpd +libstdcpp ++ URL:=http://50hz.ws/mpdas/ ++endef ++ ++define Package/mpdas/description ++ mpdas is an AudioScrobbler client for MPD written in C++. ++ It supports the latest AudioScrobbler protocol (2.0). ++ In case of a downtime or connectivity problems, mpdas will ++ cache the played songs to ~/.mpdascache. ++endef ++ ++define Package/mpdas/conffiles ++/etc/mpdasrc ++endef ++ ++EXTRA_CPPFLAGS:=\ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(INTL_PREFIX)/include \ ++ ++EXTRA_LDFLAGS:=\ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/lib \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++MAKE_FLAGS += \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDPFLAGS) $(EXTRA_LDFLAGS)" ++ ++define Package/mpdas/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/mpdasrc $(1)/etc/mpdasrc ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mpdas $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/mpdas.init $(1)/etc/init.d/mpdas ++endef ++ ++$(eval $(call BuildPackage,mpdas)) +diff --git a/feeds/packages/sound/mpdas/files/.svn/entries b/feeds/packages/sound/mpdas/files/.svn/entries +new file mode 100644 +index 0000000..2fa534f +--- /dev/null ++++ b/feeds/packages/sound/mpdas/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpdas/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-12T01:30:30.780047Z ++28969 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mpdas.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++7c9eb380534e1f11a977dcd423068c08 ++2011-11-12T01:30:30.780047Z ++28969 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++208 ++ ++mpdasrc ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++21deed16ab2977c3956a16cbf3e268a6 ++2009-05-21T09:08:58.166377Z ++15956 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++111 ++ +diff --git a/feeds/packages/sound/mpdas/files/.svn/text-base/mpdas.init.svn-base b/feeds/packages/sound/mpdas/files/.svn/text-base/mpdas.init.svn-base +new file mode 100644 +index 0000000..ba64d95 +--- /dev/null ++++ b/feeds/packages/sound/mpdas/files/.svn/text-base/mpdas.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2011 OpenWrt.org ++ ++START=94 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() { ++ HOME=/root \ ++ service_start /usr/bin/mpdas -c /etc/mpdasrc ++} ++ ++stop() { ++ service_stop /usr/bin/mpdas ++} +diff --git a/feeds/packages/sound/mpdas/files/.svn/text-base/mpdasrc.svn-base b/feeds/packages/sound/mpdas/files/.svn/text-base/mpdasrc.svn-base +new file mode 100644 +index 0000000..34af9a7 +--- /dev/null ++++ b/feeds/packages/sound/mpdas/files/.svn/text-base/mpdasrc.svn-base +@@ -0,0 +1,5 @@ ++username = username_here ++# create md5 password: ++# echo -n password | md5sum ++password = md5_hash_here ++debug = 0 +diff --git a/feeds/packages/sound/mpdas/files/mpdas.init b/feeds/packages/sound/mpdas/files/mpdas.init +new file mode 100644 +index 0000000..ba64d95 +--- /dev/null ++++ b/feeds/packages/sound/mpdas/files/mpdas.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009-2011 OpenWrt.org ++ ++START=94 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() { ++ HOME=/root \ ++ service_start /usr/bin/mpdas -c /etc/mpdasrc ++} ++ ++stop() { ++ service_stop /usr/bin/mpdas ++} +diff --git a/feeds/packages/sound/mpdas/files/mpdasrc b/feeds/packages/sound/mpdas/files/mpdasrc +new file mode 100644 +index 0000000..34af9a7 +--- /dev/null ++++ b/feeds/packages/sound/mpdas/files/mpdasrc +@@ -0,0 +1,5 @@ ++username = username_here ++# create md5 password: ++# echo -n password | md5sum ++password = md5_hash_here ++debug = 0 +diff --git a/feeds/packages/sound/mpdas/patches/.svn/entries b/feeds/packages/sound/mpdas/patches/.svn/entries +new file mode 100644 +index 0000000..08ff0fd +--- /dev/null ++++ b/feeds/packages/sound/mpdas/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mpdas/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-20T15:13:14.510387Z ++27709 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++975910b14c1247a365576a26531b84a5 ++2011-07-20T15:13:14.510387Z ++27709 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++711 ++ +diff --git a/feeds/packages/sound/mpdas/patches/.svn/text-base/001-flags.patch.svn-base b/feeds/packages/sound/mpdas/patches/.svn/text-base/001-flags.patch.svn-base +new file mode 100644 +index 0000000..11a6a6d +--- /dev/null ++++ b/feeds/packages/sound/mpdas/patches/.svn/text-base/001-flags.patch.svn-base +@@ -0,0 +1,20 @@ ++Index: mpdas-0.3.0/Makefile ++=================================================================== ++--- mpdas-0.3.0.orig/Makefile 2010-11-22 02:15:12.000000000 +0100 +++++ mpdas-0.3.0/Makefile 2011-07-20 16:53:31.000000000 +0200 ++@@ -3,12 +3,12 @@ ++ CXX ?= g++ ++ OBJ = main.o md5.o utils.o mpd.o audioscrobbler.o cache.o config.o ++ OUT = mpdas ++-PREFIX ?= /usr/local +++PREFIX ?= / ++ MANPREFIX ?= ${PREFIX}/man/man1 ++ CONFIG ?= $(PREFIX)/etc ++ ++-CXXFLAGS += `pkg-config --cflags libmpd libcurl` ++-LIBS = `pkg-config --libs libmpd libcurl` +++CXXFLAGS += $(CPPFLAGS) `pkg-config --cflags libmpd libcurl` +++LIBS = $(LDFLAGS) `pkg-config --libs libmpd libcurl` ++ ++ CXXFLAGS += -DCONFDIR="\"$(CONFIG)\"" -DVERSION="\"$(VERSION)\"" ++ +diff --git a/feeds/packages/sound/mpdas/patches/001-flags.patch b/feeds/packages/sound/mpdas/patches/001-flags.patch +new file mode 100644 +index 0000000..11a6a6d +--- /dev/null ++++ b/feeds/packages/sound/mpdas/patches/001-flags.patch +@@ -0,0 +1,20 @@ ++Index: mpdas-0.3.0/Makefile ++=================================================================== ++--- mpdas-0.3.0.orig/Makefile 2010-11-22 02:15:12.000000000 +0100 +++++ mpdas-0.3.0/Makefile 2011-07-20 16:53:31.000000000 +0200 ++@@ -3,12 +3,12 @@ ++ CXX ?= g++ ++ OBJ = main.o md5.o utils.o mpd.o audioscrobbler.o cache.o config.o ++ OUT = mpdas ++-PREFIX ?= /usr/local +++PREFIX ?= / ++ MANPREFIX ?= ${PREFIX}/man/man1 ++ CONFIG ?= $(PREFIX)/etc ++ ++-CXXFLAGS += `pkg-config --cflags libmpd libcurl` ++-LIBS = `pkg-config --libs libmpd libcurl` +++CXXFLAGS += $(CPPFLAGS) `pkg-config --cflags libmpd libcurl` +++LIBS = $(LDFLAGS) `pkg-config --libs libmpd libcurl` ++ ++ CXXFLAGS += -DCONFDIR="\"$(CONFIG)\"" -DVERSION="\"$(VERSION)\"" ++ +diff --git a/feeds/packages/sound/mt-daapd/.svn/entries b/feeds/packages/sound/mt-daapd/.svn/entries +new file mode 100644 +index 0000000..3476f76 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mt-daapd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-19T07:56:16.526085Z ++23536 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++7161535c465c3a65954eab3a47740062 ++2010-10-19T07:56:16.526085Z ++23536 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1686 ++ +diff --git a/feeds/packages/sound/mt-daapd/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/mt-daapd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d93d84 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2005-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/mt-daapd/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/mt-daapd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..75e1664 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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:=mt-daapd ++PKG_VERSION:=0.2.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=67bef9fb14d487693b0dfb792c3f1b05 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mt-daapd ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+libgdbm +libhowl +libid3tag +libpthread ++ TITLE:=A multi-threaded DAAP (Digital Audio Access Protocol) daemon ++ URL:=http://www.fireflymediaserver.org/ ++endef ++ ++define Package/mt-daapd/description ++ mt-daapd is a program which acts as an iTunes (DAAP) server for Linux. ++endef ++ ++define Package/mt-daapd/conffiles ++/etc/mt-daapd.conf ++/etc/mt-daapd.playlist ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-mdns \ ++ --enable-howl \ ++ --with-id3tag="$(STAGING_DIR)/usr" \ ++ --with-gdbm-includes="$(STAGING_DIR)/usr/include" \ ++ --with-gdbm-libs="$(STAGING_DIR)/usr/lib" \ ++ --with-howl-includes="$(STAGING_DIR)/usr/include/howl" \ ++ --with-howl-libs="$(STAGING_DIR)/usr/lib" \ ++ --without-static-libs \ ++ ++define Package/mt-daapd/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/ ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.playlist $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(1)/usr/share/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd ++endef ++ ++$(eval $(call BuildPackage,mt-daapd)) +diff --git a/feeds/packages/sound/mt-daapd/Makefile b/feeds/packages/sound/mt-daapd/Makefile +new file mode 100644 +index 0000000..75e1664 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=mt-daapd ++PKG_VERSION:=0.2.4.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=67bef9fb14d487693b0dfb792c3f1b05 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mt-daapd ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+libgdbm +libhowl +libid3tag +libpthread ++ TITLE:=A multi-threaded DAAP (Digital Audio Access Protocol) daemon ++ URL:=http://www.fireflymediaserver.org/ ++endef ++ ++define Package/mt-daapd/description ++ mt-daapd is a program which acts as an iTunes (DAAP) server for Linux. ++endef ++ ++define Package/mt-daapd/conffiles ++/etc/mt-daapd.conf ++/etc/mt-daapd.playlist ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-mdns \ ++ --enable-howl \ ++ --with-id3tag="$(STAGING_DIR)/usr" \ ++ --with-gdbm-includes="$(STAGING_DIR)/usr/include" \ ++ --with-gdbm-libs="$(STAGING_DIR)/usr/lib" \ ++ --with-howl-includes="$(STAGING_DIR)/usr/include/howl" \ ++ --with-howl-libs="$(STAGING_DIR)/usr/lib" \ ++ --without-static-libs \ ++ ++define Package/mt-daapd/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.conf $(1)/etc/ ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/contrib/mt-daapd.playlist $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(1)/usr/share/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/mt-daapd.init $(1)/etc/init.d/mt-daapd ++endef ++ ++$(eval $(call BuildPackage,mt-daapd)) +diff --git a/feeds/packages/sound/mt-daapd/files/.svn/entries b/feeds/packages/sound/mt-daapd/files/.svn/entries +new file mode 100644 +index 0000000..97eb49b +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/mt-daapd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mt-daapd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++509d5c191db7d9015a09b7f97d2168bf ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++292 ++ +diff --git a/feeds/packages/sound/mt-daapd/files/.svn/prop-base/mt-daapd.init.svn-base b/feeds/packages/sound/mt-daapd/files/.svn/prop-base/mt-daapd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/files/.svn/prop-base/mt-daapd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/mt-daapd/files/.svn/text-base/mt-daapd.init.svn-base b/feeds/packages/sound/mt-daapd/files/.svn/text-base/mt-daapd.init.svn-base +new file mode 100644 +index 0000000..720c7d8 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/files/.svn/text-base/mt-daapd.init.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++BIN=mt-daapd ++DEFAULT=/etc/default/$BIN ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ $BIN $OPTIONS ++} ++ ++stop() { ++ [ -f $PID_F ] && kill -INT $(cat $PID_F) ++} ++ +diff --git a/feeds/packages/sound/mt-daapd/files/mt-daapd.init b/feeds/packages/sound/mt-daapd/files/mt-daapd.init +new file mode 100644 +index 0000000..720c7d8 +--- /dev/null ++++ b/feeds/packages/sound/mt-daapd/files/mt-daapd.init +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++START=50 ++ ++BIN=mt-daapd ++DEFAULT=/etc/default/$BIN ++RUN_D=/var/run ++PID_F=$RUN_D/$BIN.pid ++ ++start() { ++ [ -f $DEFAULT ] && . $DEFAULT ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ $BIN $OPTIONS ++} ++ ++stop() { ++ [ -f $PID_F ] && kill -INT $(cat $PID_F) ++} ++ +diff --git a/feeds/packages/sound/pianobar/.svn/entries b/feeds/packages/sound/pianobar/.svn/entries +new file mode 100644 +index 0000000..3f93d22 +--- /dev/null ++++ b/feeds/packages/sound/pianobar/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/pianobar ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-17T04:00:16.300671Z ++30609 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++2277af95ee3c69de5185a19b5bc729e0 ++2012-02-17T03:12:05.434270Z ++30607 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1920 ++ +diff --git a/feeds/packages/sound/pianobar/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/pianobar/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e9c3e8e +--- /dev/null ++++ b/feeds/packages/sound/pianobar/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,82 @@ ++# ++# Copyright (C) 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:=pianobar ++PKG_VERSION:=2012.01.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://6xq.net/static/projects/pianobar ++PKG_MD5SUM:=448c57d65c71158674e8b30a8cfa217e ++ ++PKG_BUILD_DEPENDS:=libao libfaad2 libmad ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pianobar/Default ++ DEPENDS:=+libgnutls ++ TITLE:=Pandora radio ++ URL:=http://6xq.net/projects/pianobar/ ++endef ++ ++define Package/pianobar/Default/description ++ Pianobar is a free/open-source, console-based replacement for Pandora’s flash ++ player. ++endef ++ ++define Package/pianobar ++ $(call Package/pianobar/Default) ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS+= +libao +libfaad2 +libmad +libpiano +libpthread ++ TITLE+= console client ++endef ++ ++define Package/pianobar/description ++ $(call Package/pianobar/Default/description) ++endef ++ ++define Package/libpiano ++ $(call Package/pianobar/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= library ++endef ++ ++define Package/libpiano/description ++ $(call Package/pianobar/Default/description) ++ This package contains the libpiano shared library. ++endef ++ ++TARGET_CFLAGS += -std=c99 ++ ++MAKE_FLAGS += \ ++ DYNLINK="1" \ ++ PREFIX="/usr" ++ ++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/libpiano.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/pianobar/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pianobar $(1)/usr/bin/ ++endef ++ ++define Package/libpiano/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpiano.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,pianobar)) ++$(eval $(call BuildPackage,libpiano)) +diff --git a/feeds/packages/sound/pianobar/Makefile b/feeds/packages/sound/pianobar/Makefile +new file mode 100644 +index 0000000..e9c3e8e +--- /dev/null ++++ b/feeds/packages/sound/pianobar/Makefile +@@ -0,0 +1,82 @@ ++# ++# Copyright (C) 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:=pianobar ++PKG_VERSION:=2012.01.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://6xq.net/static/projects/pianobar ++PKG_MD5SUM:=448c57d65c71158674e8b30a8cfa217e ++ ++PKG_BUILD_DEPENDS:=libao libfaad2 libmad ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pianobar/Default ++ DEPENDS:=+libgnutls ++ TITLE:=Pandora radio ++ URL:=http://6xq.net/projects/pianobar/ ++endef ++ ++define Package/pianobar/Default/description ++ Pianobar is a free/open-source, console-based replacement for Pandora’s flash ++ player. ++endef ++ ++define Package/pianobar ++ $(call Package/pianobar/Default) ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS+= +libao +libfaad2 +libmad +libpiano +libpthread ++ TITLE+= console client ++endef ++ ++define Package/pianobar/description ++ $(call Package/pianobar/Default/description) ++endef ++ ++define Package/libpiano ++ $(call Package/pianobar/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= library ++endef ++ ++define Package/libpiano/description ++ $(call Package/pianobar/Default/description) ++ This package contains the libpiano shared library. ++endef ++ ++TARGET_CFLAGS += -std=c99 ++ ++MAKE_FLAGS += \ ++ DYNLINK="1" \ ++ PREFIX="/usr" ++ ++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/libpiano.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/pianobar/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pianobar $(1)/usr/bin/ ++endef ++ ++define Package/libpiano/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpiano.so.* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,pianobar)) ++$(eval $(call BuildPackage,libpiano)) +diff --git a/feeds/packages/sound/pianobar/patches/.svn/entries b/feeds/packages/sound/pianobar/patches/.svn/entries +new file mode 100644 +index 0000000..45edf06 +--- /dev/null ++++ b/feeds/packages/sound/pianobar/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/pianobar/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-17T04:00:16.300671Z ++30609 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-verbose.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++7bdf0d754065a827ca6f18333674bd6e ++2012-02-17T03:12:05.434270Z ++30607 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2549 ++ ++002-force-symlinks.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++276d464411393d67805c339a4bac7bb7 ++2012-02-17T04:00:16.300671Z ++30609 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1017 ++ +diff --git a/feeds/packages/sound/pianobar/patches/.svn/text-base/001-verbose.patch.svn-base b/feeds/packages/sound/pianobar/patches/.svn/text-base/001-verbose.patch.svn-base +new file mode 100644 +index 0000000..ae4c4b5 +--- /dev/null ++++ b/feeds/packages/sound/pianobar/patches/.svn/text-base/001-verbose.patch.svn-base +@@ -0,0 +1,57 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -91,14 +91,12 @@ LIBGNUTLS_LDFLAGS=-lgnutls ++ # build pianobar ++ ifeq (${DYNLINK},1) ++ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0 ++- @echo " LINK $@" ++- @${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \ +++ ${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \ ++ ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} ++ else ++ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \ ++ ${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR} ++- @echo " LINK $@" ++- @${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \ +++ ${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \ ++ ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -lpthread -lm \ ++ ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} -o $@ ++ endif ++@@ -107,30 +105,25 @@ endif ++ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \ ++ ${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR} \ ++ ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} ++- @echo " LINK $@" ++- @${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \ +++ ${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \ ++ -o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \ ++ ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ} ++- @ln -s libpiano.so.0.0.0 libpiano.so.0 ++- @ln -s libpiano.so.0 libpiano.so ++- @echo " AR libpiano.a" ++- @${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} +++ ln -s libpiano.so.0.0.0 libpiano.so.0 +++ ln -s libpiano.so.0 libpiano.so +++ ${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} ++ ++ %.o: %.c ++- @echo " CC $<" ++- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ +++ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ ++ -I ${LIBEZXML_INCLUDE} ${LIBFAAD_CFLAGS} \ ++ ${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} -c -o $@ $< ++ ++ # create position independent code (for shared libraries) ++ %.lo: %.c ++- @echo " CC $< (PIC)" ++- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ +++ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ ++ -I ${LIBEZXML_INCLUDE} -c -fPIC -o $@ $< ++ ++ clean: ++- @echo " CLEAN" ++- @${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \ +++ ${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \ ++ ${LIBEZXML_OBJ} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \ ++ ${LIBEZXML_RELOBJ} pianobar libpiano.so* libpiano.a waitress-test ++ +diff --git a/feeds/packages/sound/pianobar/patches/.svn/text-base/002-force-symlinks.patch.svn-base b/feeds/packages/sound/pianobar/patches/.svn/text-base/002-force-symlinks.patch.svn-base +new file mode 100644 +index 0000000..cacaa49 +--- /dev/null ++++ b/feeds/packages/sound/pianobar/patches/.svn/text-base/002-force-symlinks.patch.svn-base +@@ -0,0 +1,24 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -108,8 +108,8 @@ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBP ++ ${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \ ++ -o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \ ++ ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ} ++- ln -s libpiano.so.0.0.0 libpiano.so.0 ++- ln -s libpiano.so.0 libpiano.so +++ ln -sf libpiano.so.0.0.0 libpiano.so.0 +++ ln -sf libpiano.so.0 libpiano.so ++ ${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} ++ ++ %.o: %.c ++@@ -177,8 +177,8 @@ endif ++ install-libpiano: ++ install -d ${DESTDIR}/${LIBDIR}/ ++ install -m644 libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/ ++- ln -s libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/libpiano.so.0 ++- ln -s libpiano.so.0 ${DESTDIR}/${LIBDIR}/libpiano.so +++ ln -sf libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/libpiano.so.0 +++ ln -sf libpiano.so.0 ${DESTDIR}/${LIBDIR}/libpiano.so ++ install -m644 libpiano.a ${DESTDIR}/${LIBDIR}/ ++ install -d ${DESTDIR}/${INCDIR}/ ++ install -m644 src/libpiano/piano.h ${DESTDIR}/${INCDIR}/ +diff --git a/feeds/packages/sound/pianobar/patches/001-verbose.patch b/feeds/packages/sound/pianobar/patches/001-verbose.patch +new file mode 100644 +index 0000000..ae4c4b5 +--- /dev/null ++++ b/feeds/packages/sound/pianobar/patches/001-verbose.patch +@@ -0,0 +1,57 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -91,14 +91,12 @@ LIBGNUTLS_LDFLAGS=-lgnutls ++ # build pianobar ++ ifeq (${DYNLINK},1) ++ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0 ++- @echo " LINK $@" ++- @${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \ +++ ${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \ ++ ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} ++ else ++ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \ ++ ${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR} ++- @echo " LINK $@" ++- @${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \ +++ ${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \ ++ ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -lpthread -lm \ ++ ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} -o $@ ++ endif ++@@ -107,30 +105,25 @@ endif ++ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \ ++ ${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR} \ ++ ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} ++- @echo " LINK $@" ++- @${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \ +++ ${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \ ++ -o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \ ++ ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ} ++- @ln -s libpiano.so.0.0.0 libpiano.so.0 ++- @ln -s libpiano.so.0 libpiano.so ++- @echo " AR libpiano.a" ++- @${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} +++ ln -s libpiano.so.0.0.0 libpiano.so.0 +++ ln -s libpiano.so.0 libpiano.so +++ ${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} ++ ++ %.o: %.c ++- @echo " CC $<" ++- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ +++ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ ++ -I ${LIBEZXML_INCLUDE} ${LIBFAAD_CFLAGS} \ ++ ${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} -c -o $@ $< ++ ++ # create position independent code (for shared libraries) ++ %.lo: %.c ++- @echo " CC $< (PIC)" ++- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ +++ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \ ++ -I ${LIBEZXML_INCLUDE} -c -fPIC -o $@ $< ++ ++ clean: ++- @echo " CLEAN" ++- @${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \ +++ ${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \ ++ ${LIBEZXML_OBJ} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \ ++ ${LIBEZXML_RELOBJ} pianobar libpiano.so* libpiano.a waitress-test ++ +diff --git a/feeds/packages/sound/pianobar/patches/002-force-symlinks.patch b/feeds/packages/sound/pianobar/patches/002-force-symlinks.patch +new file mode 100644 +index 0000000..cacaa49 +--- /dev/null ++++ b/feeds/packages/sound/pianobar/patches/002-force-symlinks.patch +@@ -0,0 +1,24 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -108,8 +108,8 @@ libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBP ++ ${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \ ++ -o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \ ++ ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ} ++- ln -s libpiano.so.0.0.0 libpiano.so.0 ++- ln -s libpiano.so.0 libpiano.so +++ ln -sf libpiano.so.0.0.0 libpiano.so.0 +++ ln -sf libpiano.so.0 libpiano.so ++ ${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} ++ ++ %.o: %.c ++@@ -177,8 +177,8 @@ endif ++ install-libpiano: ++ install -d ${DESTDIR}/${LIBDIR}/ ++ install -m644 libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/ ++- ln -s libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/libpiano.so.0 ++- ln -s libpiano.so.0 ${DESTDIR}/${LIBDIR}/libpiano.so +++ ln -sf libpiano.so.0.0.0 ${DESTDIR}/${LIBDIR}/libpiano.so.0 +++ ln -sf libpiano.so.0 ${DESTDIR}/${LIBDIR}/libpiano.so ++ install -m644 libpiano.a ${DESTDIR}/${LIBDIR}/ ++ install -d ${DESTDIR}/${INCDIR}/ ++ install -m644 src/libpiano/piano.h ${DESTDIR}/${INCDIR}/ +diff --git a/feeds/packages/sound/pulseaudio/.svn/entries b/feeds/packages/sound/pulseaudio/.svn/entries +new file mode 100644 +index 0000000..803dd30 +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/pulseaudio ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-02T10:48:27.747844Z ++34965 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++9a684a368380761947e43512b23a611f ++2013-01-02T10:48:27.747844Z ++34965 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6246 ++ +diff --git a/feeds/packages/sound/pulseaudio/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/pulseaudio/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/pulseaudio/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/pulseaudio/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2f52415 +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,265 @@ ++# ++# 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:=pulseaudio ++PKG_VERSION:=3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/ ++PKG_MD5SUM:=47fd7eca8479c757822bee68a1feef25 ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_BUILD_DEPENDS:=intltool/host ++ ++PKG_FIXUP:=autoreconf ++ ++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 +udev $(ICONV_DEPENDS) $(INTL_DEPENDS) ++ TITLE:=Network sound server ++ URL:=http://www.pulseaudio.org ++ PROVIDES:=pulseaudio ++endef ++ ++define Package/pulseaudio-daemon ++ $(call Package/pulseaudio/Default) ++ VARIANT:=noavahi ++endef ++ ++define Package/pulseaudio-daemon-avahi ++ $(call Package/pulseaudio/Default) ++ DEPENDS+=+dbus +libavahi-client +avahi-daemon ++ TITLE+= (avahi) ++ VARIANT:=avahi ++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-avahi/description ++ $(call Package/pulseaudio/Default/description) ++ This package is compiled against dbus and avahi. ++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-daemon-avahi/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 ++ VARIANT:=noavahi ++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-tcpwrap \ ++ --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 \ ++ --without-caps \ ++ --without-fftw ++ ++ifeq ($(BUILD_VARIANT),avahi) ++CONFIGURE_ARGS += \ ++ --enable-avahi \ ++ --enable-dbus ++endif ++ ++ifeq ($(BUILD_VARIANT),noavahi) ++CONFIGURE_ARGS += \ ++ --disable-avahi \ ++ --disable-dbus ++endif ++ ++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 ++ $(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/ ++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-daemon-avahi/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 \ ++ $(1)/etc/dbus-1/system.d ++ ++ $(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/ ++ ++ $(INSTALL_CONF) \ ++ $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/pulseaudio-system.conf \ ++ $(1)/etc/dbus-1/system.d/pulseaudio-system.conf ++ ++ chmod -R 0644 $(1)/etc/pulse/* $(1)/etc/dbus-1/system.d/pulseaudio-system.conf ++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-daemon-avahi)) ++$(eval $(call BuildPackage,pulseaudio-tools)) ++$(eval $(call BuildPackage,pulseaudio-profiles)) +diff --git a/feeds/packages/sound/pulseaudio/Makefile b/feeds/packages/sound/pulseaudio/Makefile +new file mode 100644 +index 0000000..2f52415 +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/Makefile +@@ -0,0 +1,265 @@ ++# ++# 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:=pulseaudio ++PKG_VERSION:=3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/ ++PKG_MD5SUM:=47fd7eca8479c757822bee68a1feef25 ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_BUILD_DEPENDS:=intltool/host ++ ++PKG_FIXUP:=autoreconf ++ ++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 +udev $(ICONV_DEPENDS) $(INTL_DEPENDS) ++ TITLE:=Network sound server ++ URL:=http://www.pulseaudio.org ++ PROVIDES:=pulseaudio ++endef ++ ++define Package/pulseaudio-daemon ++ $(call Package/pulseaudio/Default) ++ VARIANT:=noavahi ++endef ++ ++define Package/pulseaudio-daemon-avahi ++ $(call Package/pulseaudio/Default) ++ DEPENDS+=+dbus +libavahi-client +avahi-daemon ++ TITLE+= (avahi) ++ VARIANT:=avahi ++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-avahi/description ++ $(call Package/pulseaudio/Default/description) ++ This package is compiled against dbus and avahi. ++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-daemon-avahi/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 ++ VARIANT:=noavahi ++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-tcpwrap \ ++ --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 \ ++ --without-caps \ ++ --without-fftw ++ ++ifeq ($(BUILD_VARIANT),avahi) ++CONFIGURE_ARGS += \ ++ --enable-avahi \ ++ --enable-dbus ++endif ++ ++ifeq ($(BUILD_VARIANT),noavahi) ++CONFIGURE_ARGS += \ ++ --disable-avahi \ ++ --disable-dbus ++endif ++ ++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 ++ $(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/ ++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-daemon-avahi/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 \ ++ $(1)/etc/dbus-1/system.d ++ ++ $(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/ ++ ++ $(INSTALL_CONF) \ ++ $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/pulseaudio-system.conf \ ++ $(1)/etc/dbus-1/system.d/pulseaudio-system.conf ++ ++ chmod -R 0644 $(1)/etc/pulse/* $(1)/etc/dbus-1/system.d/pulseaudio-system.conf ++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-daemon-avahi)) ++$(eval $(call BuildPackage,pulseaudio-tools)) ++$(eval $(call BuildPackage,pulseaudio-profiles)) +diff --git a/feeds/packages/sound/pulseaudio/files/.svn/entries b/feeds/packages/sound/pulseaudio/files/.svn/entries +new file mode 100644 +index 0000000..701173b +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/pulseaudio/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-13T22:16:21.946406Z ++29077 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pulseaudio.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++d419bc6b2d36964cbc30ab34e16d5e22 ++2011-11-13T22:16:21.946406Z ++29077 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++658 ++ +diff --git a/feeds/packages/sound/pulseaudio/files/.svn/text-base/pulseaudio.init.svn-base b/feeds/packages/sound/pulseaudio/files/.svn/text-base/pulseaudio.init.svn-base +new file mode 100644 +index 0000000..0ae8f1b +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/files/.svn/text-base/pulseaudio.init.svn-base +@@ -0,0 +1,27 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 OpenWrt.org ++ ++START=65 ++ ++SERVICE_USE_PID=1 ++SERVICE_PID_FILE=/var/run/pulse/pid ++ ++start() { ++ user_exists pulse 51 || user_add pulse 51 ++ group_exists pulse 51 || group_add pulse 51 ++ [ -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 ++ } ++ service_start /usr/bin/pulseaudio --daemonize --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 ++} ++ ++stop() { ++ service_stop /usr/bin/pulseaudio ++} +diff --git a/feeds/packages/sound/pulseaudio/files/pulseaudio.init b/feeds/packages/sound/pulseaudio/files/pulseaudio.init +new file mode 100644 +index 0000000..0ae8f1b +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/files/pulseaudio.init +@@ -0,0 +1,27 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 OpenWrt.org ++ ++START=65 ++ ++SERVICE_USE_PID=1 ++SERVICE_PID_FILE=/var/run/pulse/pid ++ ++start() { ++ user_exists pulse 51 || user_add pulse 51 ++ group_exists pulse 51 || group_add pulse 51 ++ [ -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 ++ } ++ service_start /usr/bin/pulseaudio --daemonize --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 ++} ++ ++stop() { ++ service_stop /usr/bin/pulseaudio ++} +diff --git a/feeds/packages/sound/pulseaudio/patches/.svn/entries b/feeds/packages/sound/pulseaudio/patches/.svn/entries +new file mode 100644 +index 0000000..85d0f9b +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/pulseaudio/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-08-18T13:44:20.541923Z ++28044 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_default_64mb_alloc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++928f0912d78d6af197e8b3de6838f06a ++2011-08-18T13:44:20.541923Z ++28044 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++555 ++ +diff --git a/feeds/packages/sound/pulseaudio/patches/.svn/text-base/001-no_default_64mb_alloc.patch.svn-base b/feeds/packages/sound/pulseaudio/patches/.svn/text-base/001-no_default_64mb_alloc.patch.svn-base +new file mode 100644 +index 0000000..8762554 +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/patches/.svn/text-base/001-no_default_64mb_alloc.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: pulseaudio-0.99.2/src/pulsecore/memblock.c ++=================================================================== ++--- pulseaudio-0.99.2.orig/src/pulsecore/memblock.c 2011-08-15 10:41:56.000000000 +0200 +++++ pulseaudio-0.99.2/src/pulsecore/memblock.c 2011-08-18 13:54:53.000000000 +0200 ++@@ -57,7 +57,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/feeds/packages/sound/pulseaudio/patches/001-no_default_64mb_alloc.patch b/feeds/packages/sound/pulseaudio/patches/001-no_default_64mb_alloc.patch +new file mode 100644 +index 0000000..8762554 +--- /dev/null ++++ b/feeds/packages/sound/pulseaudio/patches/001-no_default_64mb_alloc.patch +@@ -0,0 +1,13 @@ ++Index: pulseaudio-0.99.2/src/pulsecore/memblock.c ++=================================================================== ++--- pulseaudio-0.99.2.orig/src/pulsecore/memblock.c 2011-08-15 10:41:56.000000000 +0200 +++++ pulseaudio-0.99.2/src/pulsecore/memblock.c 2011-08-18 13:54:53.000000000 +0200 ++@@ -57,7 +57,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/feeds/packages/sound/scmpc/.svn/entries b/feeds/packages/sound/scmpc/.svn/entries +new file mode 100644 +index 0000000..9dab3a6 +--- /dev/null ++++ b/feeds/packages/sound/scmpc/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/scmpc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++3deb818c885f96f54270b18831e2e1fa ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1384 ++ +diff --git a/feeds/packages/sound/scmpc/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/scmpc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a067f82 +--- /dev/null ++++ b/feeds/packages/sound/scmpc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=scmpc ++PKG_VERSION:=0.2.2 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.berlios.de/scmpc ++PKG_MD5SUM:=f42482e4dbf398df92a36d5610b403e5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/scmpc ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=A MPD client which submits your tracks to Last.Fm ++ DEPENDS:=+libcurl +libdaemon +argtable +confuse +libpthread ++ URL:=http://scmpc.berlios.de/ ++endef ++ ++define Package/scmpc/description ++ scmpc is a multithreaded, robust client for MPD to submit tracks to Audioscrobbler (Last.fm). ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-rpath \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++MAKE_FLAGS += \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ $(1) \ ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/scmpc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/src/scmpc $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/scmpc.init $(1)/etc/init.d/scmpc ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_BUILD_DIR)/examples/scmpc.conf $(1)/etc/ ++endef ++ ++define Package/scmpc/conffiles ++/etc/scmpc.conf ++endef ++ ++$(eval $(call BuildPackage,scmpc)) +diff --git a/feeds/packages/sound/scmpc/Makefile b/feeds/packages/sound/scmpc/Makefile +new file mode 100644 +index 0000000..a067f82 +--- /dev/null ++++ b/feeds/packages/sound/scmpc/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=scmpc ++PKG_VERSION:=0.2.2 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.berlios.de/scmpc ++PKG_MD5SUM:=f42482e4dbf398df92a36d5610b403e5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/scmpc ++ SECTION:=sound ++ CATEGORY:=Sound ++ TITLE:=A MPD client which submits your tracks to Last.Fm ++ DEPENDS:=+libcurl +libdaemon +argtable +confuse +libpthread ++ URL:=http://scmpc.berlios.de/ ++endef ++ ++define Package/scmpc/description ++ scmpc is a multithreaded, robust client for MPD to submit tracks to Audioscrobbler (Last.fm). ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-rpath \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ ++MAKE_FLAGS += \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ $(1) \ ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/scmpc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/src/scmpc $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/scmpc.init $(1)/etc/init.d/scmpc ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) $(PKG_BUILD_DIR)/examples/scmpc.conf $(1)/etc/ ++endef ++ ++define Package/scmpc/conffiles ++/etc/scmpc.conf ++endef ++ ++$(eval $(call BuildPackage,scmpc)) +diff --git a/feeds/packages/sound/scmpc/files/.svn/entries b/feeds/packages/sound/scmpc/files/.svn/entries +new file mode 100644 +index 0000000..391838f +--- /dev/null ++++ b/feeds/packages/sound/scmpc/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/scmpc/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-12T01:30:27.971624Z ++28968 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++scmpc.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++eb725b7129c9302aec2f3daa2ae7981a ++2011-11-12T01:30:27.971624Z ++28968 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++209 ++ +diff --git a/feeds/packages/sound/scmpc/files/.svn/text-base/scmpc.init.svn-base b/feeds/packages/sound/scmpc/files/.svn/text-base/scmpc.init.svn-base +new file mode 100644 +index 0000000..5327b6b +--- /dev/null ++++ b/feeds/packages/sound/scmpc/files/.svn/text-base/scmpc.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=94 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ mkdir -m 0755 -p /var/lib/scmpc ++ service_start /usr/bin/scmpc ++} ++ ++stop() { ++ service_stop /usr/bin/scmpc ++} +diff --git a/feeds/packages/sound/scmpc/files/scmpc.init b/feeds/packages/sound/scmpc/files/scmpc.init +new file mode 100644 +index 0000000..5327b6b +--- /dev/null ++++ b/feeds/packages/sound/scmpc/files/scmpc.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=94 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ mkdir -m 0755 -p /var/lib/scmpc ++ service_start /usr/bin/scmpc ++} ++ ++stop() { ++ service_stop /usr/bin/scmpc ++} +diff --git a/feeds/packages/sound/scmpc/patches/.svn/entries b/feeds/packages/sound/scmpc/patches/.svn/entries +new file mode 100644 +index 0000000..1b3c83c +--- /dev/null ++++ b/feeds/packages/sound/scmpc/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/scmpc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-12-28T14:58:56.403443Z ++9981 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-Rules.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++8fc2898ab93d1ae00a0776ad97a9f0e3 ++2007-12-28T14:58:56.403443Z ++9981 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++391 ++ +diff --git a/feeds/packages/sound/scmpc/patches/.svn/text-base/100-Rules.patch.svn-base b/feeds/packages/sound/scmpc/patches/.svn/text-base/100-Rules.patch.svn-base +new file mode 100644 +index 0000000..f9ad44d +--- /dev/null ++++ b/feeds/packages/sound/scmpc/patches/.svn/text-base/100-Rules.patch.svn-base +@@ -0,0 +1,11 @@ ++--- scmpc-0.2.2/src/Rules.mkorig 2007-10-31 23:32:48.000000000 +0100 +++++ scmpc-0.2.2/src/Rules.mk 2007-10-31 23:19:00.000000000 +0100 ++@@ -16,7 +16,7 @@ ++ -include $(DEPENDS) ++ ++ DEFINES := -DHAVE_CONFIG_H -D_GNU_SOURCE ++-INCLUDES := -I$(src_d) -I$(src_b) +++INCLUDES := -I$(src_d) -I$(src_b) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include ++ LDLIBS := $(LIBS) ++ ++ CLEAN += $(OBJS) $(PROGRAM) +diff --git a/feeds/packages/sound/scmpc/patches/100-Rules.patch b/feeds/packages/sound/scmpc/patches/100-Rules.patch +new file mode 100644 +index 0000000..f9ad44d +--- /dev/null ++++ b/feeds/packages/sound/scmpc/patches/100-Rules.patch +@@ -0,0 +1,11 @@ ++--- scmpc-0.2.2/src/Rules.mkorig 2007-10-31 23:32:48.000000000 +0100 +++++ scmpc-0.2.2/src/Rules.mk 2007-10-31 23:19:00.000000000 +0100 ++@@ -16,7 +16,7 @@ ++ -include $(DEPENDS) ++ ++ DEFINES := -DHAVE_CONFIG_H -D_GNU_SOURCE ++-INCLUDES := -I$(src_d) -I$(src_b) +++INCLUDES := -I$(src_d) -I$(src_b) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include ++ LDLIBS := $(LIBS) ++ ++ CLEAN += $(OBJS) $(PROGRAM) +diff --git a/feeds/packages/sound/shell-fm/.svn/entries b/feeds/packages/sound/shell-fm/.svn/entries +new file mode 100644 +index 0000000..e9f26ab +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/shell-fm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T16:20:00.681331Z ++31162 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++4e33701f6ac1dffde0ac6e1ed3ba64df ++2012-04-02T16:20:00.681331Z ++31162 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1572 ++ +diff --git a/feeds/packages/sound/shell-fm/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/shell-fm/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/shell-fm/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/shell-fm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2c08ca4 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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:=shell-fm ++PKG_REV:=c274aa51b52185b289ac22f0cb95420a1c19868b ++PKG_VERSION:=0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/jkramer/shell-fm.git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shell-fm ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+libao +libpthread +libmad ++ TITLE:=Console Based Last.FM Radio Player ++ URL:=http://nex.scrapping.cc ++endef ++ ++define Package/shell-fm/description ++ Shell.FM is a console based player for the streams provided ++ by Last.FM for the Linux platform. It's lightweight and easy to use. ++endef ++ ++define Package/shell-fm/conffiles ++/etc/shell-fm.rc ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -I./include/ -DLIBAO $(TARGET_CPPFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lmad -lao -lpthread" \ ++ all install ++endef ++ ++define Package/shell-fm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/shell-fm $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/shell-fm.rc $(1)/etc/shell-fm.rc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/shell-fm.init $(1)/etc/init.d/shell-fm ++endef ++ ++$(eval $(call BuildPackage,shell-fm)) +diff --git a/feeds/packages/sound/shell-fm/Makefile b/feeds/packages/sound/shell-fm/Makefile +new file mode 100644 +index 0000000..2c08ca4 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=shell-fm ++PKG_REV:=c274aa51b52185b289ac22f0cb95420a1c19868b ++PKG_VERSION:=0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://github.com/jkramer/shell-fm.git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/shell-fm ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+libao +libpthread +libmad ++ TITLE:=Console Based Last.FM Radio Player ++ URL:=http://nex.scrapping.cc ++endef ++ ++define Package/shell-fm/description ++ Shell.FM is a console based player for the streams provided ++ by Last.FM for the Linux platform. It's lightweight and easy to use. ++endef ++ ++define Package/shell-fm/conffiles ++/etc/shell-fm.rc ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -I./include/ -DLIBAO $(TARGET_CPPFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lmad -lao -lpthread" \ ++ all install ++endef ++ ++define Package/shell-fm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/shell-fm $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/shell-fm.rc $(1)/etc/shell-fm.rc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/shell-fm.init $(1)/etc/init.d/shell-fm ++endef ++ ++$(eval $(call BuildPackage,shell-fm)) +diff --git a/feeds/packages/sound/shell-fm/files/.svn/entries b/feeds/packages/sound/shell-fm/files/.svn/entries +new file mode 100644 +index 0000000..6126186 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/shell-fm/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T16:20:00.681331Z ++31162 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++shell-fm.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++e5bd700492123f277d9deeb2439cf16c ++2012-04-02T16:20:00.681331Z ++31162 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++345 ++ ++shell-fm.rc ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++ff69914e6e5026f1cbed261e65d1b7ab ++2012-04-02T16:20:00.681331Z ++31162 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++325 ++ +diff --git a/feeds/packages/sound/shell-fm/files/.svn/prop-base/shell-fm.init.svn-base b/feeds/packages/sound/shell-fm/files/.svn/prop-base/shell-fm.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/.svn/prop-base/shell-fm.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/shell-fm/files/.svn/prop-base/shell-fm.rc.svn-base b/feeds/packages/sound/shell-fm/files/.svn/prop-base/shell-fm.rc.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/.svn/prop-base/shell-fm.rc.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/shell-fm/files/.svn/text-base/shell-fm.init.svn-base b/feeds/packages/sound/shell-fm/files/.svn/text-base/shell-fm.init.svn-base +new file mode 100644 +index 0000000..f0403b6 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/.svn/text-base/shell-fm.init.svn-base +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=99 ++start() { ++ [ -d /tmp/.shell-fm ] || mkdir /tmp/.shell-fm ++ [ -L /tmp/.shell-fm/shell-fm.rc ] || ln -s /etc/shell-fm.rc /tmp/.shell-fm/shell-fm.rc ++ [ -L /tmp/.libao ] || ln -s /etc/libao.conf /tmp/.libao ++ HOME=/tmp shell-fm -d ++} ++ ++stop() { ++ echo "quit" | telnet localhost 54311 ++} +diff --git a/feeds/packages/sound/shell-fm/files/.svn/text-base/shell-fm.rc.svn-base b/feeds/packages/sound/shell-fm/files/.svn/text-base/shell-fm.rc.svn-base +new file mode 100644 +index 0000000..b3f6a2d +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/.svn/text-base/shell-fm.rc.svn-base +@@ -0,0 +1,9 @@ ++username = username ++password = password ++#np-cmd = netmsg "%a - %t" ++default-radio = lastfm://artist/Nightwish/similarartists ++t-color = 1;32 # light green track titles ++a-color = 0;32 # dark green track artist names ++s-color = 1;37 # white station names ++bind = 0.0.0.0 ++#extern = madplay -q - +diff --git a/feeds/packages/sound/shell-fm/files/shell-fm.init b/feeds/packages/sound/shell-fm/files/shell-fm.init +new file mode 100644 +index 0000000..f0403b6 +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/shell-fm.init +@@ -0,0 +1,14 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=99 ++start() { ++ [ -d /tmp/.shell-fm ] || mkdir /tmp/.shell-fm ++ [ -L /tmp/.shell-fm/shell-fm.rc ] || ln -s /etc/shell-fm.rc /tmp/.shell-fm/shell-fm.rc ++ [ -L /tmp/.libao ] || ln -s /etc/libao.conf /tmp/.libao ++ HOME=/tmp shell-fm -d ++} ++ ++stop() { ++ echo "quit" | telnet localhost 54311 ++} +diff --git a/feeds/packages/sound/shell-fm/files/shell-fm.rc b/feeds/packages/sound/shell-fm/files/shell-fm.rc +new file mode 100644 +index 0000000..b3f6a2d +--- /dev/null ++++ b/feeds/packages/sound/shell-fm/files/shell-fm.rc +@@ -0,0 +1,9 @@ ++username = username ++password = password ++#np-cmd = netmsg "%a - %t" ++default-radio = lastfm://artist/Nightwish/similarartists ++t-color = 1;32 # light green track titles ++a-color = 0;32 # dark green track artist names ++s-color = 1;37 # white station names ++bind = 0.0.0.0 ++#extern = madplay -q - +diff --git a/feeds/packages/sound/sox/.svn/entries b/feeds/packages/sound/sox/.svn/entries +new file mode 100644 +index 0000000..a579f54 +--- /dev/null ++++ b/feeds/packages/sound/sox/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/sox ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-17T15:51:44.137162Z ++35202 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++153ef233927ffa74b5fc73dfb67a4524 ++2013-01-17T15:51:44.137162Z ++35202 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2475 ++ +diff --git a/feeds/packages/sound/sox/.svn/prop-base/Makefile.svn-base b/feeds/packages/sound/sox/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/sound/sox/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/sound/sox/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/sox/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..614ae3b +--- /dev/null ++++ b/feeds/packages/sound/sox/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,92 @@ ++# ++# Copyright (C) 2008 David Cooper ++# 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:=sox ++PKG_VERSION:=14.4.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/sox ++PKG_MD5SUM:=813807c6d6fcd4b0af5c995e61f46687 ++ ++PKG_LICENSE:=LGPLv2.1 GPLv2 ++PKG_LICENSE_FILES:=COPYING LICENSE.LGPL LICENSE.GPL ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++# NOTE: libflac is out of date for 8.09's freeze and can't be compiled in ++ ++define Package/sox ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+BUILD_PATENTED:lame-lib +BUILD_PATENTED:libmad +BUILD_PATENTED:libid3tag +libvorbis +libvorbisidec +libgsm +alsa-lib +libsndfile +libflac +ffmpeg +libmagic +libpng +libao ++ TITLE:=Sox is a general purpose sound converter/player/recorder ++ URL:=http://sox.sourceforge.net/ ++ MAINTAINER:=Hamish Guthrie ++endef ++ ++define Package/sox/description ++ SoX is a command line utility that can convert various formats ++ of computer audio files in to other formats. It can also apply ++ various effects to these sound files during the conversion. ++ As an added bonus, SoX can play and record audio files on ++ several unix-style platforms. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-external-gsm \ ++ --disable-oss \ ++ --enable-alsa \ ++ --disable-libao \ ++ --without-libltdl \ ++ --with-ogg \ ++ --with-flac \ ++ --with-ffmpeg \ ++ --without-amr-wb \ ++ --without-amr-nb \ ++ --without-samplerate \ ++ --without-ladspa \ ++ --$(if $(CONFIG_BUILD_PATENTED),with-mad,without-mad) \ ++ --$(if $(CONFIG_BUILD_PATENTED),with-lame,without-lame) \ ++ --$(if $(CONFIG_BUILD_PATENTED),with-id3tag,without-id3tag) \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include \ ++ $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libsox.{a,so*,la} \ ++ $(1)/usr/lib/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/sox/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/{play,rec,sox} $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsox.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,sox)) ++ +diff --git a/feeds/packages/sound/sox/Makefile b/feeds/packages/sound/sox/Makefile +new file mode 100644 +index 0000000..614ae3b +--- /dev/null ++++ b/feeds/packages/sound/sox/Makefile +@@ -0,0 +1,92 @@ ++# ++# Copyright (C) 2008 David Cooper ++# 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:=sox ++PKG_VERSION:=14.4.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/sox ++PKG_MD5SUM:=813807c6d6fcd4b0af5c995e61f46687 ++ ++PKG_LICENSE:=LGPLv2.1 GPLv2 ++PKG_LICENSE_FILES:=COPYING LICENSE.LGPL LICENSE.GPL ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++# NOTE: libflac is out of date for 8.09's freeze and can't be compiled in ++ ++define Package/sox ++ SECTION:=sound ++ CATEGORY:=Sound ++ DEPENDS:=+BUILD_PATENTED:lame-lib +BUILD_PATENTED:libmad +BUILD_PATENTED:libid3tag +libvorbis +libvorbisidec +libgsm +alsa-lib +libsndfile +libflac +ffmpeg +libmagic +libpng +libao ++ TITLE:=Sox is a general purpose sound converter/player/recorder ++ URL:=http://sox.sourceforge.net/ ++ MAINTAINER:=Hamish Guthrie ++endef ++ ++define Package/sox/description ++ SoX is a command line utility that can convert various formats ++ of computer audio files in to other formats. It can also apply ++ various effects to these sound files during the conversion. ++ As an added bonus, SoX can play and record audio files on ++ several unix-style platforms. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-external-gsm \ ++ --disable-oss \ ++ --enable-alsa \ ++ --disable-libao \ ++ --without-libltdl \ ++ --with-ogg \ ++ --with-flac \ ++ --with-ffmpeg \ ++ --without-amr-wb \ ++ --without-amr-nb \ ++ --without-samplerate \ ++ --without-ladspa \ ++ --$(if $(CONFIG_BUILD_PATENTED),with-mad,without-mad) \ ++ --$(if $(CONFIG_BUILD_PATENTED),with-lame,without-lame) \ ++ --$(if $(CONFIG_BUILD_PATENTED),with-id3tag,without-id3tag) \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/include \ ++ $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libsox.{a,so*,la} \ ++ $(1)/usr/lib/ ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ ++ $(1)/usr/lib/pkgconfig/ ++endef ++ ++define Package/sox/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/{play,rec,sox} $(1)/usr/bin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsox.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,sox)) ++ +diff --git a/feeds/packages/sound/sox/patches/.svn/entries b/feeds/packages/sound/sox/patches/.svn/entries +new file mode 100644 +index 0000000..377fc75 +--- /dev/null ++++ b/feeds/packages/sound/sox/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/sox/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-12T14:06:21.676161Z ++33379 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix_uclibc_build_issue.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++c87c3451c1a07a8dc26a4847566c5787 ++2012-09-12T14:06:21.676161Z ++33379 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++832 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:40.000000Z ++7477b10ead5663eeda1cf9df94c8c327 ++2012-09-12T14:06:21.676161Z ++33379 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++881 ++ +diff --git a/feeds/packages/sound/sox/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/sound/sox/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..2d7fe5d +--- /dev/null ++++ b/feeds/packages/sound/sox/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -144,7 +144,7 @@ EXTRA_DIST = monkey.wav optional-fmts.am ++ CMakeLists.txt soxconfig.h.cmake \ ++ tests.sh testall.sh tests.bat testall.bat test-comments ++ ++-all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT) +++all: sox$(EXEEXT) play rec ++ ++ play rec: sox$(EXEEXT) ++ if test "$(PLAYRECLINKS)" = "yes"; then \ ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -2849,7 +2849,7 @@ uninstall-am: uninstall-binPROGRAMS unin ++ uninstall-pkglibLTLIBRARIES ++ ++ ++-all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT) +++all: sox$(EXEEXT) play rec ++ ++ play rec: sox$(EXEEXT) ++ if test "$(PLAYRECLINKS)" = "yes"; then \ +diff --git a/feeds/packages/sound/sox/patches/.svn/text-base/010-fix_uclibc_build_issue.patch.svn-base b/feeds/packages/sound/sox/patches/.svn/text-base/010-fix_uclibc_build_issue.patch.svn-base +new file mode 100644 +index 0000000..410d295 +--- /dev/null ++++ b/feeds/packages/sound/sox/patches/.svn/text-base/010-fix_uclibc_build_issue.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/src/formats.c +++++ b/src/formats.c ++@@ -408,7 +408,7 @@ static void UNUSED rewind_pipe(FILE * fp ++ #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ ++ fp->_p -= AUTO_DETECT_SIZE; ++ fp->_r += AUTO_DETECT_SIZE; ++-#elif defined __GLIBC__ +++#elif defined __GLIBC__ && ! defined __UCLIBC__ ++ fp->_IO_read_ptr = fp->_IO_read_base; ++ #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H ++ fp->_ptr = fp->_base; ++@@ -416,7 +416,7 @@ static void UNUSED rewind_pipe(FILE * fp ++ /* To fix this #error, either simply remove the #error line and live without ++ * file-type detection with pipes, or add support for your compiler in the ++ * lines above. Test with cat monkey.au | ./sox --info - */ ++- #error FIX NEEDED HERE +++/* #error FIX NEEDED HERE */ ++ #define NO_REWIND_PIPE ++ (void)fp; ++ #endif +diff --git a/feeds/packages/sound/sox/patches/001-cross_compile.patch b/feeds/packages/sound/sox/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..2d7fe5d +--- /dev/null ++++ b/feeds/packages/sound/sox/patches/001-cross_compile.patch +@@ -0,0 +1,22 @@ ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -144,7 +144,7 @@ EXTRA_DIST = monkey.wav optional-fmts.am ++ CMakeLists.txt soxconfig.h.cmake \ ++ tests.sh testall.sh tests.bat testall.bat test-comments ++ ++-all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT) +++all: sox$(EXEEXT) play rec ++ ++ play rec: sox$(EXEEXT) ++ if test "$(PLAYRECLINKS)" = "yes"; then \ ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -2849,7 +2849,7 @@ uninstall-am: uninstall-binPROGRAMS unin ++ uninstall-pkglibLTLIBRARIES ++ ++ ++-all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) example3$(EXEEXT) example4$(EXEEXT) example5$(EXEEXT) +++all: sox$(EXEEXT) play rec ++ ++ play rec: sox$(EXEEXT) ++ if test "$(PLAYRECLINKS)" = "yes"; then \ +diff --git a/feeds/packages/sound/sox/patches/010-fix_uclibc_build_issue.patch b/feeds/packages/sound/sox/patches/010-fix_uclibc_build_issue.patch +new file mode 100644 +index 0000000..410d295 +--- /dev/null ++++ b/feeds/packages/sound/sox/patches/010-fix_uclibc_build_issue.patch +@@ -0,0 +1,20 @@ ++--- a/src/formats.c +++++ b/src/formats.c ++@@ -408,7 +408,7 @@ static void UNUSED rewind_pipe(FILE * fp ++ #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ ++ fp->_p -= AUTO_DETECT_SIZE; ++ fp->_r += AUTO_DETECT_SIZE; ++-#elif defined __GLIBC__ +++#elif defined __GLIBC__ && ! defined __UCLIBC__ ++ fp->_IO_read_ptr = fp->_IO_read_base; ++ #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H ++ fp->_ptr = fp->_base; ++@@ -416,7 +416,7 @@ static void UNUSED rewind_pipe(FILE * fp ++ /* To fix this #error, either simply remove the #error line and live without ++ * file-type detection with pipes, or add support for your compiler in the ++ * lines above. Test with cat monkey.au | ./sox --info - */ ++- #error FIX NEEDED HERE +++/* #error FIX NEEDED HERE */ ++ #define NO_REWIND_PIPE ++ (void)fp; ++ #endif +diff --git a/feeds/packages/sound/streamripper/.svn/entries b/feeds/packages/sound/streamripper/.svn/entries +new file mode 100644 +index 0000000..f8694bc +--- /dev/null ++++ b/feeds/packages/sound/streamripper/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/sound/streamripper ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:51.264911Z ++32293 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:39.000000Z ++8c7c09549f9b590f56b58c67941ff215 ++2012-06-12T23:47:51.264911Z ++32293 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1336 ++ +diff --git a/feeds/packages/sound/streamripper/.svn/text-base/Makefile.svn-base b/feeds/packages/sound/streamripper/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf238ab +--- /dev/null ++++ b/feeds/packages/sound/streamripper/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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:=streamripper ++PKG_VERSION:=1.62.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=1a8353af3c36d56f2d8ee8552f632071 ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=. tre-0.7.2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/streamripper ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libmad +libfaad2 +libpthread ++ TITLE:=streamripper ++ URL:=http://streamripper.sourceforge.net/ ++endef ++ ++define Package/streamripper/description ++ Streamripper is an Open Source application that lets you record streaming mp3 to your hard drive. ++endef ++ ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++ ++CONFIGURE_ARGS+= \ ++ --without-ogg \ ++ --with-included-argv \ ++ --without-included-libmad \ ++ --without-libiconv-prefix \ ++ --with-included-tre \ ++ --with-gnu-ld \ ++ ++define Package/streamripper/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/streamripper $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/agrep $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtre.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,streamripper)) +diff --git a/feeds/packages/sound/streamripper/Makefile b/feeds/packages/sound/streamripper/Makefile +new file mode 100644 +index 0000000..cf238ab +--- /dev/null ++++ b/feeds/packages/sound/streamripper/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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:=streamripper ++PKG_VERSION:=1.62.0 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=1a8353af3c36d56f2d8ee8552f632071 ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++PKG_LIBTOOL_PATHS:=. tre-0.7.2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/streamripper ++ SECTION:=multimedia ++ CATEGORY:=Multimedia ++ DEPENDS:=+libmad +libfaad2 +libpthread ++ TITLE:=streamripper ++ URL:=http://streamripper.sourceforge.net/ ++endef ++ ++define Package/streamripper/description ++ Streamripper is an Open Source application that lets you record streaming mp3 to your hard drive. ++endef ++ ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++ ++CONFIGURE_ARGS+= \ ++ --without-ogg \ ++ --with-included-argv \ ++ --without-included-libmad \ ++ --without-libiconv-prefix \ ++ --with-included-tre \ ++ --with-gnu-ld \ ++ ++define Package/streamripper/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/streamripper $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/agrep $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtre.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,streamripper)) +diff --git a/feeds/packages/utils/.svn/entries b/feeds/packages/utils/.svn/entries +new file mode 100644 +index 0000000..65539f4 +--- /dev/null ++++ b/feeds/packages/utils/.svn/entries +@@ -0,0 +1,601 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-28T21:27:08.248731Z ++35837 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++loop-aes ++dir ++ ++lcd4linux-tew673gru ++dir ++ ++mtd-utils ++dir ++ ++pcsc-lite ++dir ++ ++wx200d ++dir ++ ++daemontools ++dir ++ ++bc ++dir ++ ++ipmitool ++dir ++ ++pciutils ++dir ++ ++time ++dir ++ ++empty ++dir ++ ++watchcat ++dir ++ ++cdparanoia ++dir ++ ++heyu ++dir ++ ++flashrom ++dir ++ ++redboot-ar231x ++dir ++ ++dmidecode ++dir ++ ++remind ++dir ++ ++boxbackup ++dir ++ ++gnupg ++dir ++ ++pwgen ++dir ++ ++lvm2 ++dir ++ ++calvaria ++dir ++ ++cryptsetup ++dir ++ ++dtach ++dir ++ ++rng-tools ++dir ++ ++ntfsprogs ++dir ++ ++lcdproc ++dir ++ ++stm32flash ++dir ++ ++avrusbboot ++dir ++ ++rcs ++dir ++ ++bluelog ++dir ++ ++tesseract ++dir ++ ++tmux ++dir ++ ++logrotate ++dir ++ ++iioutils ++dir ++ ++ps3-utils ++dir ++ ++zile ++dir ++ ++zsh ++dir ++ ++lcd4linux ++dir ++ ++open2300 ++dir ++ ++freecwmp ++dir ++ ++taskwarrior ++dir ++ ++petitboot ++dir ++ ++restorefactory ++dir ++ ++hplip ++dir ++ ++cksfv ++dir ++ ++powertop ++dir ++ ++bluez-utils ++dir ++ ++ntfs-3g ++dir ++ ++ink ++dir ++ ++bash-completion ++dir ++ ++bemused ++dir ++ ++zoneinfo ++dir ++ ++picocom ++dir ++ ++minicom ++dir ++ ++dir300-flash ++dir ++ ++dbus ++dir ++ ++fortune-mod ++dir ++ ++tcsh ++dir ++ ++xdelta3 ++dir ++ ++setpwc ++dir ++ ++dt ++dir ++ ++coreutils ++dir ++ ++i2c-tools ++dir ++ ++alsa-utils ++dir ++ ++dstat ++dir ++ ++sierra-pcmcia ++dir ++ ++gnokii ++dir ++ ++tar ++dir ++ ++gnuplot ++dir ++ ++cmdpad ++dir ++ ++gawk ++dir ++ ++maemo-kexec ++dir ++ ++mc ++dir ++ ++calcurse ++dir ++ ++gadgetfs-test ++dir ++ ++lm-sensors ++dir ++ ++mg ++dir ++ ++hd-idle ++dir ++ ++nut ++dir ++ ++btrfs-progs ++dir ++ ++uboot-envtools-mmc ++dir ++ ++open-plc-utils ++dir ++ ++crypto-tools ++dir ++ ++screen ++dir ++ ++byobu ++dir ++ ++ssldump ++dir ++ ++unrar ++dir ++ ++reiserfsprogs ++dir ++ ++psmisc ++dir ++ ++cwiid ++dir ++ ++devmem2 ++dir ++ ++bonnie++ ++dir ++ ++ccid ++dir ++ ++unzip ++dir ++ ++devio ++dir ++ ++microcom ++dir ++ ++mgetty ++dir ++ ++sed ++dir ++ ++upx ++dir ++ ++joe ++dir ++ ++fxload ++dir ++ ++fancontroled ++dir ++ ++haserl ++dir ++ ++firmwarehotplug ++dir ++ ++pipacs ++dir ++ ++rsnapshot ++dir ++ ++kmemtrace-user ++dir ++ ++shadow ++dir ++ ++macchanger ++dir ++ ++lirc ++dir ++ ++sg3-utils ++dir ++ ++boblight ++dir ++ ++avrdude ++dir ++ ++setserial ++dir ++ ++rrdcollect ++dir ++ ++bsdiff ++dir ++ ++dosfstools ++dir ++ ++dialog ++dir ++ ++clish ++dir ++ ++mksh ++dir ++ ++anyremote ++dir ++ ++haveged ++dir ++ ++goldfish-qemu ++dir ++ ++memtester ++dir ++ ++triggerhappy ++dir ++ ++schedtools ++dir ++ ++bluez-hcidump ++dir ++ ++lmbench ++dir ++ ++deco ++dir ++ ++klish ++dir ++ ++sysstat ++dir ++ ++pcmciautils ++dir ++ ++dash ++dir ++ ++acpid ++dir ++ ++strace ++dir ++ ++smartmontools ++dir ++ ++mdadm ++dir ++ ++md5deep ++dir ++ ++scponly ++dir ++ ++usbmuxd ++dir ++ ++testusb ++dir ++ ++dfu-util ++dir ++ ++collectd ++dir ++ ++rsyncrypto ++dir ++ ++disktype ++dir ++ ++input-utils ++dir ++ ++rdiff-backup ++dir ++ ++sane-backends ++dir ++ ++sispmctl ++dir ++ ++msr-tools ++dir ++ ++wview ++dir ++ ++digitemp ++dir ++ ++lsof ++dir ++ ++huaweiaktbbo ++dir ++ ++less ++dir ++ ++wattsup ++dir ++ ++owfs ++dir ++ ++event_test ++dir ++ ++nvramtool ++dir ++ ++stress ++dir ++ ++lrzsz ++dir ++ ++rrdtool ++dir ++ ++pv ++dir ++ ++bzip2 ++dir ++ ++sdparm ++dir ++ ++rtl-sdr ++dir ++ ++cpusage ++dir ++ ++gpiotoggling ++dir ++ ++vim ++dir ++ ++nano ++dir ++ ++lilo ++dir ++ ++fowsr ++dir ++ ++tcpser ++dir ++ ++wifitoggle ++dir ++ ++pps-tools ++dir ++ ++ap51-flash ++dir ++ ++zip ++dir ++ ++foxboard-utils ++dir ++ ++ccrypt ++dir ++ ++at ++dir ++ ++procps ++dir ++ ++io ++dir ++ ++pwcrypt ++dir ++ ++bandwidthd ++dir ++ ++gzip ++dir ++ ++psplash ++dir ++ ++hdparm ++dir ++ ++oww ++dir ++ ++bash ++dir ++ +diff --git a/feeds/packages/utils/acpid/.svn/entries b/feeds/packages/utils/acpid/.svn/entries +new file mode 100644 +index 0000000..8e09565 +--- /dev/null ++++ b/feeds/packages/utils/acpid/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/acpid ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++34fb74179428abd5391ef276cff89484 ++2012-03-19T23:50:43.301984Z ++31038 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1626 ++ +diff --git a/feeds/packages/utils/acpid/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/acpid/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..23a07ec +--- /dev/null ++++ b/feeds/packages/utils/acpid/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# Copyright (C) 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:=acpid ++PKG_VERSION:=2.0.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://tedfelix.com/linux/ ++PKG_MD5SUM:=d5dd88bcfaa4a0bf51905e95115da6df ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/acpid ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The ACPI Daemon (acpid) With Netlink Support ++ URL:=http://tedfelix.com/linux/acpid-netlink.html ++ DEPENDS:=+kmod-input-evdev +kmod-acpi-button ++endef ++ ++define Package/acpid/description ++ The ACPI Daemon (acpid) With Netlink Support ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ LD="$(TARGET_CC)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ all ++endef ++ ++define Package/acpid/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/acpid $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/acpi_listen $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/acpi/events ++ $(INSTALL_CONF) ./files/default $(1)/etc/acpi/events/default ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_CONF) ./files/acpid.init $(1)/etc/init.d/acpid ++ chmod 0750 $(1)/etc/init.d/acpid ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/input/ ++ $(INSTALL_CONF) ./files/acpid.hotplug $(1)/etc/hotplug.d/input/ ++endef ++ ++define Package/acpid/postinst ++#!/bin/sh ++[ -n "$${IPKG_INSTROOT}" ] || { ++ echo "waiting for input devices to come up" ++ /etc/init.d/acpid enable ++ sleep 5 ++ /etc/init.d/acpid start ++ echo "please try the power button" ++ exit 0 ++} ++endef ++ ++$(eval $(call BuildPackage,acpid)) +diff --git a/feeds/packages/utils/acpid/Makefile b/feeds/packages/utils/acpid/Makefile +new file mode 100644 +index 0000000..23a07ec +--- /dev/null ++++ b/feeds/packages/utils/acpid/Makefile +@@ -0,0 +1,65 @@ ++# ++# Copyright (C) 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:=acpid ++PKG_VERSION:=2.0.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://tedfelix.com/linux/ ++PKG_MD5SUM:=d5dd88bcfaa4a0bf51905e95115da6df ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/acpid ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The ACPI Daemon (acpid) With Netlink Support ++ URL:=http://tedfelix.com/linux/acpid-netlink.html ++ DEPENDS:=+kmod-input-evdev +kmod-acpi-button ++endef ++ ++define Package/acpid/description ++ The ACPI Daemon (acpid) With Netlink Support ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ LD="$(TARGET_CC)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ all ++endef ++ ++define Package/acpid/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/acpid $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/acpi_listen $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/acpi/events ++ $(INSTALL_CONF) ./files/default $(1)/etc/acpi/events/default ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_CONF) ./files/acpid.init $(1)/etc/init.d/acpid ++ chmod 0750 $(1)/etc/init.d/acpid ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/input/ ++ $(INSTALL_CONF) ./files/acpid.hotplug $(1)/etc/hotplug.d/input/ ++endef ++ ++define Package/acpid/postinst ++#!/bin/sh ++[ -n "$${IPKG_INSTROOT}" ] || { ++ echo "waiting for input devices to come up" ++ /etc/init.d/acpid enable ++ sleep 5 ++ /etc/init.d/acpid start ++ echo "please try the power button" ++ exit 0 ++} ++endef ++ ++$(eval $(call BuildPackage,acpid)) +diff --git a/feeds/packages/utils/acpid/files/.svn/entries b/feeds/packages/utils/acpid/files/.svn/entries +new file mode 100644 +index 0000000..870ccd8 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/acpid/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++acpid.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++4ab8e732b20f714a79ba74106d1262cc ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++156 ++ ++acpid.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++7675829bf3c330b689fa49cebd60ee0a ++2012-03-18T20:48:24.253401Z ++30991 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++445 ++ ++default ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++1b8ec056a5a72764894fdbcf5cd86576 ++2012-03-18T20:48:24.253401Z ++30991 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++85 ++ +diff --git a/feeds/packages/utils/acpid/files/.svn/text-base/acpid.hotplug.svn-base b/feeds/packages/utils/acpid/files/.svn/text-base/acpid.hotplug.svn-base +new file mode 100644 +index 0000000..6e08d01 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/.svn/text-base/acpid.hotplug.svn-base +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++if [ "$ACTION" = add ] && [ "$DEVICENAME" = event0 ]; then ++ ( /etc/init.d/acpid/stop; sleep 3; /usr/sbin/acpid )& ++fi +diff --git a/feeds/packages/utils/acpid/files/.svn/text-base/acpid.init.svn-base b/feeds/packages/utils/acpid/files/.svn/text-base/acpid.init.svn-base +new file mode 100644 +index 0000000..3365aa0 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/.svn/text-base/acpid.init.svn-base +@@ -0,0 +1,25 @@ ++#!/bin/ash /etc/rc.common ++# Copyright (C) 2009-2010 OpenWrt.org ++ ++START=99 ++STOP=80 ++ ++ACPID_BIN="/usr/sbin/acpid" ++ACPID_PID="/var/run/acpid.pid" ++ ++start() { ++ [ -x "$ACPID_BIN" ] || return 1 ++ start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID ++} ++ ++boot() { ++ # Do nothing on boot ++ [ -x "$ACPID_BIN" ] || return 1 ++ start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID ++ exit 0 ++} ++ ++stop() { ++ service_kill ${ACPID_BIN##*/} $ACPID_PID ++ rm -f $ACPID_PID ++} +diff --git a/feeds/packages/utils/acpid/files/.svn/text-base/default.svn-base b/feeds/packages/utils/acpid/files/.svn/text-base/default.svn-base +new file mode 100644 +index 0000000..cf8d9a3 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/.svn/text-base/default.svn-base +@@ -0,0 +1,5 @@ ++# This is a sample ACPID configuration ++ ++event=button/power.* ++action=/sbin/poweroff ++ +diff --git a/feeds/packages/utils/acpid/files/acpid.hotplug b/feeds/packages/utils/acpid/files/acpid.hotplug +new file mode 100644 +index 0000000..6e08d01 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/acpid.hotplug +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++ ++if [ "$ACTION" = add ] && [ "$DEVICENAME" = event0 ]; then ++ ( /etc/init.d/acpid/stop; sleep 3; /usr/sbin/acpid )& ++fi +diff --git a/feeds/packages/utils/acpid/files/acpid.init b/feeds/packages/utils/acpid/files/acpid.init +new file mode 100644 +index 0000000..3365aa0 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/acpid.init +@@ -0,0 +1,25 @@ ++#!/bin/ash /etc/rc.common ++# Copyright (C) 2009-2010 OpenWrt.org ++ ++START=99 ++STOP=80 ++ ++ACPID_BIN="/usr/sbin/acpid" ++ACPID_PID="/var/run/acpid.pid" ++ ++start() { ++ [ -x "$ACPID_BIN" ] || return 1 ++ start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID ++} ++ ++boot() { ++ # Do nothing on boot ++ [ -x "$ACPID_BIN" ] || return 1 ++ start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID ++ exit 0 ++} ++ ++stop() { ++ service_kill ${ACPID_BIN##*/} $ACPID_PID ++ rm -f $ACPID_PID ++} +diff --git a/feeds/packages/utils/acpid/files/default b/feeds/packages/utils/acpid/files/default +new file mode 100644 +index 0000000..cf8d9a3 +--- /dev/null ++++ b/feeds/packages/utils/acpid/files/default +@@ -0,0 +1,5 @@ ++# This is a sample ACPID configuration ++ ++event=button/power.* ++action=/sbin/poweroff ++ +diff --git a/feeds/packages/utils/alsa-utils/.svn/entries b/feeds/packages/utils/alsa-utils/.svn/entries +new file mode 100644 +index 0000000..161c80b +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/alsa-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-14T20:19:08.058116Z ++32713 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d46b64511adcf155de5c6933aeea12c6 ++2012-07-14T20:19:08.058116Z ++32713 ++acinonyx ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2717 ++ +diff --git a/feeds/packages/utils/alsa-utils/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/alsa-utils/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/alsa-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/alsa-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f203ecb +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,92 @@ ++# ++# 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:=alsa-utils ++PKG_VERSION:=1.0.24.2 ++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:=8238cd57cb301d1c36bcf0ecb59ce6b2 ++PKG_INSTALL:=1 ++ ++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/feeds/packages/utils/alsa-utils/Makefile b/feeds/packages/utils/alsa-utils/Makefile +new file mode 100644 +index 0000000..f203ecb +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/Makefile +@@ -0,0 +1,92 @@ ++# ++# 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:=alsa-utils ++PKG_VERSION:=1.0.24.2 ++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:=8238cd57cb301d1c36bcf0ecb59ce6b2 ++PKG_INSTALL:=1 ++ ++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/feeds/packages/utils/alsa-utils/patches/.svn/entries b/feeds/packages/utils/alsa-utils/patches/.svn/entries +new file mode 100644 +index 0000000..d25eb4a +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/alsa-utils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-11T13:51:48.669211Z ++26035 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-uClibc-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9971e80e6f8b283fc15ea9645a0083ac ++2011-03-11T13:51:48.669211Z ++26035 ++loswillios ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++957 ++ +diff --git a/feeds/packages/utils/alsa-utils/patches/.svn/text-base/100-uClibc-compat.patch.svn-base b/feeds/packages/utils/alsa-utils/patches/.svn/text-base/100-uClibc-compat.patch.svn-base +new file mode 100644 +index 0000000..9766125 +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/patches/.svn/text-base/100-uClibc-compat.patch.svn-base +@@ -0,0 +1,25 @@ ++Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c ++=================================================================== ++--- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c 2011-03-11 13:26:29.000000000 +0100 +++++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c 2011-03-11 13:27:58.000000000 +0100 ++@@ -109,9 +109,9 @@ ++ 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); ++ } ++ ++@@ -144,7 +144,7 @@ ++ } ++ ++ 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/feeds/packages/utils/alsa-utils/patches/100-uClibc-compat.patch b/feeds/packages/utils/alsa-utils/patches/100-uClibc-compat.patch +new file mode 100644 +index 0000000..9766125 +--- /dev/null ++++ b/feeds/packages/utils/alsa-utils/patches/100-uClibc-compat.patch +@@ -0,0 +1,25 @@ ++Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c ++=================================================================== ++--- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c 2011-03-11 13:26:29.000000000 +0100 +++++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c 2011-03-11 13:27:58.000000000 +0100 ++@@ -109,9 +109,9 @@ ++ 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); ++ } ++ ++@@ -144,7 +144,7 @@ ++ } ++ ++ 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/feeds/packages/utils/anyremote/.svn/entries b/feeds/packages/utils/anyremote/.svn/entries +new file mode 100644 +index 0000000..b9aade0 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/anyremote ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-11T10:47:00.463065Z ++35550 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++cf9ee8a3c8593dcf8c72fe8f4547cff7 ++2013-02-11T10:47:00.463065Z ++35550 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1217 ++ +diff --git a/feeds/packages/utils/anyremote/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/anyremote/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..79bda63 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2008-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:=anyremote ++PKG_VERSION:=6.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/${PKG_NAME} ++PKG_MD5SUM:=130369d8f632127b20de67930386e9ca ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/anyremote ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A bluetooth remote control app ++ DEPENDS:=+bluez-libs +libpthread ++ URL:=http://anyremote.sourceforge.net/ ++endef ++ ++define Package/anyremote/description ++ Remote control your machine via bluetooth ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-xtest --disable-glib --disable-iconv \ ++ ) ++endef ++ ++define Package/anyremote/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/anyremote.cfg $(1)/etc/anyremote.cfg ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/anyremote.init $(1)/etc/init.d/anyremote ++endef ++ ++define Package/anyremote/conffiles ++/etc/anyremote.cfg ++endef ++ ++$(eval $(call BuildPackage,anyremote)) +diff --git a/feeds/packages/utils/anyremote/Makefile b/feeds/packages/utils/anyremote/Makefile +new file mode 100644 +index 0000000..79bda63 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/Makefile +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2008-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:=anyremote ++PKG_VERSION:=6.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/${PKG_NAME} ++PKG_MD5SUM:=130369d8f632127b20de67930386e9ca ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/anyremote ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A bluetooth remote control app ++ DEPENDS:=+bluez-libs +libpthread ++ URL:=http://anyremote.sourceforge.net/ ++endef ++ ++define Package/anyremote/description ++ Remote control your machine via bluetooth ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --disable-xtest --disable-glib --disable-iconv \ ++ ) ++endef ++ ++define Package/anyremote/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/anyremote.cfg $(1)/etc/anyremote.cfg ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/anyremote.init $(1)/etc/init.d/anyremote ++endef ++ ++define Package/anyremote/conffiles ++/etc/anyremote.cfg ++endef ++ ++$(eval $(call BuildPackage,anyremote)) +diff --git a/feeds/packages/utils/anyremote/files/.svn/entries b/feeds/packages/utils/anyremote/files/.svn/entries +new file mode 100644 +index 0000000..4324b50 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/anyremote/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-11T10:47:00.463065Z ++35550 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++anyremote.cfg ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++6f846f196030601c1bee02652040bb30 ++2013-02-11T10:47:00.463065Z ++35550 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1586 ++ ++anyremote.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++13942c1d958eec13ec58a041eda27198 ++2011-11-11T15:46:27.554070Z ++28945 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++230 ++ +diff --git a/feeds/packages/utils/anyremote/files/.svn/text-base/anyremote.cfg.svn-base b/feeds/packages/utils/anyremote/files/.svn/text-base/anyremote.cfg.svn-base +new file mode 100644 +index 0000000..13ee8f4 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/files/.svn/text-base/anyremote.cfg.svn-base +@@ -0,0 +1,105 @@ ++% ++% anyremote configuration file. (Server-mode) ++% ++ ++% STATUS unknown ++% XTEST no ++% SOUND no ++% ENV no ++ ++GuiAppName=Admin ++GuiAppType=Example ++GuiAppBinary=true ++GuiAppProtocols=Server ++GuiAppDesc=Show free space on disks, system uptime, dmesg output. Allows to reboot PC. ++ ++[Protocol]=Server ++ ++(Connect)=\ ++ ExecAndSet(status,uname -n);\ ++ ExecAndSet(title,whoami);\ ++ Set(icons,ADMIN,1,plus,2,default,3,default,4,default,5,default,6,default,7,default,8,default,9,default,*,question,0,no,#,default); ++ ++* *=\ ++ Set(text,replace,Help,1 - Show list of features) ++ ++Back=\ ++ Set(text,close); ++ ++1=\ ++ Make(mode,LIST); ++ ++ ++[Mode]=LIST ++ ++(EnterMode)=\ ++ Macro(ADM_LIST);\ ++ Set(menu,replace,Choose); ++ ++ADM_LIST=\ ++ Set(list,replace,Admin,Disk space,Uptime,Dmesg,Reboot,Shutdown); ++ ++DISK_SPACE=\ ++ ExecAndSet(text,replace,Free Space,df -kl|tr -s ' '|cut -f 1,4 -d ' ');\ ++ Make(mode,TXT); ++ ++UPTIME=\ ++ Set(list,close);\ ++ ExecAndSet(title,uptime|tr -s ' '|cut -d ' ' -f 3,4,5);\ ++ Make(mode,default); ++ ++DMESG=\ ++ ExecAndSet(text,replace,Dmesg output, dmesg|tail -50);\ ++ Make(mode,TXT); ++ ++REBOOT=\ ++ Exec(reboot); ++ ++SHUTDOWN=\ ++ Exec(poweroff); ++ ++Back($$)=\ ++ Set(list,close);\ ++ Make(mode,default); ++ ++Choose(Disk space)=\ ++ Macro(DISK_SPACE); ++ ++Choose(Uptime)=\ ++ Macro(UPTIME); ++ ++Choose(Dmesg)=\ ++ Macro(DMESG); ++ ++Choose(Reboot)=\ ++ Macro(REBOOT); ++ ++Choose(Shutdown)=\ ++ Macro(SHUTDOWN); ++ ++Push(Disk space)=\ ++ Macro(DISK_SPACE); ++ ++Push(Uptime)=\ ++ Macro(UPTIME); ++ ++Push(Dmesg)=\ ++ Macro(DMESG); ++ ++Push(Reboot)=\ ++ Macro(REBOOT); ++ ++Push(Shutdown)=\ ++ Macro(SHUTDOWN); ++ ++[ModeEnd] ++ ++[Mode]=TXT ++ ++Back=\ ++ Set(text,close);\ ++ Make(mode,LIST); ++ ++[ModeEnd] ++ ++[End] +diff --git a/feeds/packages/utils/anyremote/files/.svn/text-base/anyremote.init.svn-base b/feeds/packages/utils/anyremote/files/.svn/text-base/anyremote.init.svn-base +new file mode 100644 +index 0000000..af05f49 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/files/.svn/text-base/anyremote.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=95 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++start() { ++ service_start /usr/sbin/anyremote -f /etc/anyremote.cfg ++} ++ ++stop() { ++ service_stop /usr/sbin/anyremote ++} +diff --git a/feeds/packages/utils/anyremote/files/anyremote.cfg b/feeds/packages/utils/anyremote/files/anyremote.cfg +new file mode 100644 +index 0000000..13ee8f4 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/files/anyremote.cfg +@@ -0,0 +1,105 @@ ++% ++% anyremote configuration file. (Server-mode) ++% ++ ++% STATUS unknown ++% XTEST no ++% SOUND no ++% ENV no ++ ++GuiAppName=Admin ++GuiAppType=Example ++GuiAppBinary=true ++GuiAppProtocols=Server ++GuiAppDesc=Show free space on disks, system uptime, dmesg output. Allows to reboot PC. ++ ++[Protocol]=Server ++ ++(Connect)=\ ++ ExecAndSet(status,uname -n);\ ++ ExecAndSet(title,whoami);\ ++ Set(icons,ADMIN,1,plus,2,default,3,default,4,default,5,default,6,default,7,default,8,default,9,default,*,question,0,no,#,default); ++ ++* *=\ ++ Set(text,replace,Help,1 - Show list of features) ++ ++Back=\ ++ Set(text,close); ++ ++1=\ ++ Make(mode,LIST); ++ ++ ++[Mode]=LIST ++ ++(EnterMode)=\ ++ Macro(ADM_LIST);\ ++ Set(menu,replace,Choose); ++ ++ADM_LIST=\ ++ Set(list,replace,Admin,Disk space,Uptime,Dmesg,Reboot,Shutdown); ++ ++DISK_SPACE=\ ++ ExecAndSet(text,replace,Free Space,df -kl|tr -s ' '|cut -f 1,4 -d ' ');\ ++ Make(mode,TXT); ++ ++UPTIME=\ ++ Set(list,close);\ ++ ExecAndSet(title,uptime|tr -s ' '|cut -d ' ' -f 3,4,5);\ ++ Make(mode,default); ++ ++DMESG=\ ++ ExecAndSet(text,replace,Dmesg output, dmesg|tail -50);\ ++ Make(mode,TXT); ++ ++REBOOT=\ ++ Exec(reboot); ++ ++SHUTDOWN=\ ++ Exec(poweroff); ++ ++Back($$)=\ ++ Set(list,close);\ ++ Make(mode,default); ++ ++Choose(Disk space)=\ ++ Macro(DISK_SPACE); ++ ++Choose(Uptime)=\ ++ Macro(UPTIME); ++ ++Choose(Dmesg)=\ ++ Macro(DMESG); ++ ++Choose(Reboot)=\ ++ Macro(REBOOT); ++ ++Choose(Shutdown)=\ ++ Macro(SHUTDOWN); ++ ++Push(Disk space)=\ ++ Macro(DISK_SPACE); ++ ++Push(Uptime)=\ ++ Macro(UPTIME); ++ ++Push(Dmesg)=\ ++ Macro(DMESG); ++ ++Push(Reboot)=\ ++ Macro(REBOOT); ++ ++Push(Shutdown)=\ ++ Macro(SHUTDOWN); ++ ++[ModeEnd] ++ ++[Mode]=TXT ++ ++Back=\ ++ Set(text,close);\ ++ Make(mode,LIST); ++ ++[ModeEnd] ++ ++[End] +diff --git a/feeds/packages/utils/anyremote/files/anyremote.init b/feeds/packages/utils/anyremote/files/anyremote.init +new file mode 100644 +index 0000000..af05f49 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/files/anyremote.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=95 ++ ++SERVICE_DAEMONIZE=1 ++SERVICE_WRITE_PID=1 ++ ++start() { ++ service_start /usr/sbin/anyremote -f /etc/anyremote.cfg ++} ++ ++stop() { ++ service_stop /usr/sbin/anyremote ++} +diff --git a/feeds/packages/utils/anyremote/patches/.svn/entries b/feeds/packages/utils/anyremote/patches/.svn/entries +new file mode 100644 +index 0000000..6993bb6 +--- /dev/null ++++ b/feeds/packages/utils/anyremote/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/anyremote/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-11T10:47:00.463065Z ++35550 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-dont-add-host-includes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d76e82baf0c88e4f739b444b452d51bd ++2013-02-11T10:47:00.463065Z ++35550 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++352 ++ +diff --git a/feeds/packages/utils/anyremote/patches/.svn/text-base/010-dont-add-host-includes.patch.svn-base b/feeds/packages/utils/anyremote/patches/.svn/text-base/010-dont-add-host-includes.patch.svn-base +new file mode 100644 +index 0000000..56ef80f +--- /dev/null ++++ b/feeds/packages/utils/anyremote/patches/.svn/text-base/010-dont-add-host-includes.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -4135,7 +4135,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>c ++ fi ++ ++ ++-CFLAGS="$CFLAGS -I/usr/local/include -Wall -D_REENTRANT -O2 -g" +++CFLAGS="$CFLAGS -Wall -D_REENTRANT -O2 -g" ++ ++ # On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +diff --git a/feeds/packages/utils/anyremote/patches/010-dont-add-host-includes.patch b/feeds/packages/utils/anyremote/patches/010-dont-add-host-includes.patch +new file mode 100644 +index 0000000..56ef80f +--- /dev/null ++++ b/feeds/packages/utils/anyremote/patches/010-dont-add-host-includes.patch +@@ -0,0 +1,11 @@ ++--- a/configure +++++ b/configure ++@@ -4135,7 +4135,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>c ++ fi ++ ++ ++-CFLAGS="$CFLAGS -I/usr/local/include -Wall -D_REENTRANT -O2 -g" +++CFLAGS="$CFLAGS -Wall -D_REENTRANT -O2 -g" ++ ++ # On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +diff --git a/feeds/packages/utils/ap51-flash/.svn/entries b/feeds/packages/utils/ap51-flash/.svn/entries +new file mode 100644 +index 0000000..5b71db9 +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ap51-flash ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-24T15:42:02.678830Z ++32496 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f627d2e6dc654bf739067cc8b7a58d27 ++2012-06-24T15:42:02.678830Z ++32496 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1635 ++ +diff --git a/feeds/packages/utils/ap51-flash/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ap51-flash/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..30868ae +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2010-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:=ap51-flash ++PKG_REV:=232 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=ap51-flash-$(PKG_VERSION) ++PKG_SOURCE_URL:=http://dev.cloudtrax.com/downloads/svn/ap51-flash/trunk ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_MIRROR_MD5SUM:=3bff5b2ffa77ee80a807f3d24165b7cf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ STAMP_BUILT:=$(STAMP_BUILT)_big ++endif ++ ++define Package/ap51-flash ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A tool for flashing (nearly) all ap51/ap61 based routers ++ URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station ++endef ++ ++TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ TARGET_EXTRA_CFLAGS:=$(TARGET_EXTRA_CFLAGS) -DUIP_CONF_BYTE_ORDER=1234 ++endif ++ ++# pass optimization flags ++MAKE_FLAGS += \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS)" \ ++ REVISION="$(PKG_VERSION)" \ ++ ++define Package/ap51-flash/install ++ $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin \ ++ $(1)/usr/lib/ap51-flash ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ap51-flash $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/ap51-flash.init $(1)/etc/init.d/ap51-flash ++ $(INSTALL_BIN) ./files/ap51-flash.sh $(1)/usr/lib/ap51-flash/ap51-flash.sh ++ $(INSTALL_DATA) ./files/ap51-flash.config $(1)/etc/config/ap51-flash ++endef ++ ++define Package/ap51-flash/conffiles ++/etc/config/ap51-flash ++endef ++ ++$(eval $(call BuildPackage,ap51-flash)) +diff --git a/feeds/packages/utils/ap51-flash/Makefile b/feeds/packages/utils/ap51-flash/Makefile +new file mode 100644 +index 0000000..30868ae +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/Makefile +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2010-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:=ap51-flash ++PKG_REV:=232 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=ap51-flash-$(PKG_VERSION) ++PKG_SOURCE_URL:=http://dev.cloudtrax.com/downloads/svn/ap51-flash/trunk ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++PKG_MIRROR_MD5SUM:=3bff5b2ffa77ee80a807f3d24165b7cf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ STAMP_BUILT:=$(STAMP_BUILT)_big ++endif ++ ++define Package/ap51-flash ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A tool for flashing (nearly) all ap51/ap61 based routers ++ URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station ++endef ++ ++TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP ++ifeq ($(CONFIG_BIG_ENDIAN),y) ++ TARGET_EXTRA_CFLAGS:=$(TARGET_EXTRA_CFLAGS) -DUIP_CONF_BYTE_ORDER=1234 ++endif ++ ++# pass optimization flags ++MAKE_FLAGS += \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS)" \ ++ REVISION="$(PKG_VERSION)" \ ++ ++define Package/ap51-flash/install ++ $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin \ ++ $(1)/usr/lib/ap51-flash ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ap51-flash $(1)/usr/sbin/ ++ $(INSTALL_BIN) ./files/ap51-flash.init $(1)/etc/init.d/ap51-flash ++ $(INSTALL_BIN) ./files/ap51-flash.sh $(1)/usr/lib/ap51-flash/ap51-flash.sh ++ $(INSTALL_DATA) ./files/ap51-flash.config $(1)/etc/config/ap51-flash ++endef ++ ++define Package/ap51-flash/conffiles ++/etc/config/ap51-flash ++endef ++ ++$(eval $(call BuildPackage,ap51-flash)) +diff --git a/feeds/packages/utils/ap51-flash/files/.svn/entries b/feeds/packages/utils/ap51-flash/files/.svn/entries +new file mode 100644 +index 0000000..c46364f +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ap51-flash/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-17T11:49:06.854906Z ++29230 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++ap51-flash.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++78f63adefd1cbb883a22fe5e3a287d8d ++2010-03-22T23:17:07.455072Z ++20374 ++linus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1521 ++ ++ap51-flash.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f626aaddaaaf55837f8a705bb52c2a35 ++2011-11-17T11:49:06.854906Z ++29230 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++232 ++ ++ap51-flash.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++122c2d4c7211c3eaae3a492c64e8861c ++2010-03-22T23:17:07.455072Z ++20374 ++linus ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++431 ++ +diff --git a/feeds/packages/utils/ap51-flash/files/.svn/prop-base/ap51-flash.sh.svn-base b/feeds/packages/utils/ap51-flash/files/.svn/prop-base/ap51-flash.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/.svn/prop-base/ap51-flash.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.config.svn-base b/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.config.svn-base +new file mode 100644 +index 0000000..f66973f +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.config.svn-base +@@ -0,0 +1,6 @@ ++#config flash ++# option ifname eth0.1 ++# option rootfs /tmp/images/openwrt-atheros-root.squashfs ++# option kernel /tmp/images/openwrt-atheros-vmlinux.lzma ++# option ubnt /tmp/images/openwrt-atheros-ubnt5-squashfs.bin ++## option loop '1' +diff --git a/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.init.svn-base b/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.init.svn-base +new file mode 100644 +index 0000000..1633ac4 +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.init.svn-base +@@ -0,0 +1,50 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010 OpenWrt.org ++ ++START=20 ++ ++NAME=ap51-flash ++ ++start_daemon() { ++ local cfg="$1" ++ ++ config_get_bool loop "$cfg" loop ++ config_get ifname "$cfg" ifname ++ config_get rootfs "$cfg" rootfs ++ config_get kernel "$cfg" kernel ++ config_get ubnt "$cfg" ubnt ++ [ "$loop" != "1" ] && loop=0 ++ if [ -n "$ifname" -a -n "$rootfs" -a -n "$kernel" ] || \ ++ [ -n "$ifname" -a -n "$ubnt" ]; then ++ PID="`cat /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ++ [ -z "`ps | grep "^.[ ]*$PID "`" ] && \ ++ rm /var/run/$NAME.sh-$ifname.pid ++ [ -n "`ls /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ] && { ++ echo "Can't start more than one ap51-flash for interface $ifname!" ++ return 0 ++ } ++ start-stop-daemon -S -b -m -p /var/run/$NAME.sh-$ifname.pid -n $NAME.sh \ ++ -x /usr/lib/ap51-flash/$NAME.sh -- "$loop" "$ifname" "$rootfs" "$kernel" "$ubnt" ++ fi ++} ++ ++start() { ++ config_load ap51-flash ++ config_foreach start_daemon flash ++} ++ ++stop() { ++ # Terminating all ap51-flash processes ++ echo "WARNING: Going to teminate all ap51-flash processes! (hope you made sure that they're not flashing right now)" ++ echo "OR you can stop this with Ctrl+c within 10 seconds" ++ sleep 10 ++ local pidfile ++ for pidfile in `ls /var/run/${NAME}.sh-*.pid 2> /dev/null`; do ++ start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}.sh" >/dev/null ++ rm -f "${pidfile}" ++ done ++ for pidfile in `ls /var/run/${NAME}-*.pid 2> /dev/null`; do ++ start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}" >/dev/null ++ rm -f "${pidfile}" ++ done ++} +diff --git a/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.sh.svn-base b/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.sh.svn-base +new file mode 100644 +index 0000000..9ac33ee +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/.svn/text-base/ap51-flash.sh.svn-base +@@ -0,0 +1,21 @@ ++#!/bin/sh ++ ++NAME=ap51-flash ++rootfs="" ++kernel="" ++ubnt="" ++ ++[ $1 -eq "1" ] && loop="1" ++ifname="$2" ++[ -n "$3" ] && rootfs="--rootfs $3" ++[ -n "$4" ] && kernel="--kernel $4" ++[ -n "$5" ] && ubnt="--ubnt $5" ++ ++while [ 1 ]; do ++ start-stop-daemon -S -m -p /var/run/$NAME-$ifname.pid -n $NAME \ ++ -x /usr/sbin/$NAME -- --flash-from-file $rootfs $kernel $ubnt $ifname ++ ++ rm /var/run/$NAME-$ifname.pid ++ [ "$loop" != "1" ] && break ++ sleep 15 ++done +diff --git a/feeds/packages/utils/ap51-flash/files/ap51-flash.config b/feeds/packages/utils/ap51-flash/files/ap51-flash.config +new file mode 100644 +index 0000000..f66973f +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/ap51-flash.config +@@ -0,0 +1,6 @@ ++#config flash ++# option ifname eth0.1 ++# option rootfs /tmp/images/openwrt-atheros-root.squashfs ++# option kernel /tmp/images/openwrt-atheros-vmlinux.lzma ++# option ubnt /tmp/images/openwrt-atheros-ubnt5-squashfs.bin ++## option loop '1' +diff --git a/feeds/packages/utils/ap51-flash/files/ap51-flash.init b/feeds/packages/utils/ap51-flash/files/ap51-flash.init +new file mode 100644 +index 0000000..1633ac4 +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/ap51-flash.init +@@ -0,0 +1,50 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010 OpenWrt.org ++ ++START=20 ++ ++NAME=ap51-flash ++ ++start_daemon() { ++ local cfg="$1" ++ ++ config_get_bool loop "$cfg" loop ++ config_get ifname "$cfg" ifname ++ config_get rootfs "$cfg" rootfs ++ config_get kernel "$cfg" kernel ++ config_get ubnt "$cfg" ubnt ++ [ "$loop" != "1" ] && loop=0 ++ if [ -n "$ifname" -a -n "$rootfs" -a -n "$kernel" ] || \ ++ [ -n "$ifname" -a -n "$ubnt" ]; then ++ PID="`cat /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ++ [ -z "`ps | grep "^.[ ]*$PID "`" ] && \ ++ rm /var/run/$NAME.sh-$ifname.pid ++ [ -n "`ls /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ] && { ++ echo "Can't start more than one ap51-flash for interface $ifname!" ++ return 0 ++ } ++ start-stop-daemon -S -b -m -p /var/run/$NAME.sh-$ifname.pid -n $NAME.sh \ ++ -x /usr/lib/ap51-flash/$NAME.sh -- "$loop" "$ifname" "$rootfs" "$kernel" "$ubnt" ++ fi ++} ++ ++start() { ++ config_load ap51-flash ++ config_foreach start_daemon flash ++} ++ ++stop() { ++ # Terminating all ap51-flash processes ++ echo "WARNING: Going to teminate all ap51-flash processes! (hope you made sure that they're not flashing right now)" ++ echo "OR you can stop this with Ctrl+c within 10 seconds" ++ sleep 10 ++ local pidfile ++ for pidfile in `ls /var/run/${NAME}.sh-*.pid 2> /dev/null`; do ++ start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}.sh" >/dev/null ++ rm -f "${pidfile}" ++ done ++ for pidfile in `ls /var/run/${NAME}-*.pid 2> /dev/null`; do ++ start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}" >/dev/null ++ rm -f "${pidfile}" ++ done ++} +diff --git a/feeds/packages/utils/ap51-flash/files/ap51-flash.sh b/feeds/packages/utils/ap51-flash/files/ap51-flash.sh +new file mode 100755 +index 0000000..9ac33ee +--- /dev/null ++++ b/feeds/packages/utils/ap51-flash/files/ap51-flash.sh +@@ -0,0 +1,21 @@ ++#!/bin/sh ++ ++NAME=ap51-flash ++rootfs="" ++kernel="" ++ubnt="" ++ ++[ $1 -eq "1" ] && loop="1" ++ifname="$2" ++[ -n "$3" ] && rootfs="--rootfs $3" ++[ -n "$4" ] && kernel="--kernel $4" ++[ -n "$5" ] && ubnt="--ubnt $5" ++ ++while [ 1 ]; do ++ start-stop-daemon -S -m -p /var/run/$NAME-$ifname.pid -n $NAME \ ++ -x /usr/sbin/$NAME -- --flash-from-file $rootfs $kernel $ubnt $ifname ++ ++ rm /var/run/$NAME-$ifname.pid ++ [ "$loop" != "1" ] && break ++ sleep 15 ++done +diff --git a/feeds/packages/utils/at/.svn/entries b/feeds/packages/utils/at/.svn/entries +new file mode 100644 +index 0000000..808dc61 +--- /dev/null ++++ b/feeds/packages/utils/at/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/at ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-28T09:42:41.962281Z ++34905 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++0adc6df4be2e73ebb0e4e5c94a77728a ++2012-12-28T09:42:41.962281Z ++34905 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1431 ++ +diff --git a/feeds/packages/utils/at/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/at/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7c02fb8 +--- /dev/null ++++ b/feeds/packages/utils/at/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=at ++PKG_VERSION:=3.1.13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/a/at ++PKG_MD5SUM:=1da61af6c29e323abaaf13ee1a8dad79 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/at ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libelf1 ++ TITLE:=Delayed job execution and batch processing ++ URL:=http://packages.debian.org/stable/at ++ MAINTAINER:=Luka Perkov ++endef ++ ++define Package/at/description ++ At and batch read shell commands from standard input storing them as a job to ++ be scheduled for execution in the future. ++endef ++ ++export SENDMAIL=/bin/true ++EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) \ ++ $(TARGET_LDFLAGS) ++ ++CONFIGURE_ARGS+=--prefix=/usr \ ++ --with-daemon_username=nobody \ ++ --with-daemon_groupname=nogroup \ ++ --with-jobdir=/var/spool/cron/atjobs \ ++ --with-atspool=/var/spool/cron/atspool ++ ++define Package/at/install ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/sbin $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/atd.init $(1)/etc/init.d/atd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/at $(1)/usr/bin ++ ln -sf at $(1)/usr/bin/atq ++ ln -sf at $(1)/usr/bin/atrm ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/atd $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,at)) +diff --git a/feeds/packages/utils/at/Makefile b/feeds/packages/utils/at/Makefile +new file mode 100644 +index 0000000..7c02fb8 +--- /dev/null ++++ b/feeds/packages/utils/at/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=at ++PKG_VERSION:=3.1.13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/a/at ++PKG_MD5SUM:=1da61af6c29e323abaaf13ee1a8dad79 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/at ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libelf1 ++ TITLE:=Delayed job execution and batch processing ++ URL:=http://packages.debian.org/stable/at ++ MAINTAINER:=Luka Perkov ++endef ++ ++define Package/at/description ++ At and batch read shell commands from standard input storing them as a job to ++ be scheduled for execution in the future. ++endef ++ ++export SENDMAIL=/bin/true ++EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) \ ++ $(TARGET_LDFLAGS) ++ ++CONFIGURE_ARGS+=--prefix=/usr \ ++ --with-daemon_username=nobody \ ++ --with-daemon_groupname=nogroup \ ++ --with-jobdir=/var/spool/cron/atjobs \ ++ --with-atspool=/var/spool/cron/atspool ++ ++define Package/at/install ++ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/sbin $(1)/etc/init.d/ ++ $(INSTALL_BIN) ./files/atd.init $(1)/etc/init.d/atd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/at $(1)/usr/bin ++ ln -sf at $(1)/usr/bin/atq ++ ln -sf at $(1)/usr/bin/atrm ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/atd $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,at)) +diff --git a/feeds/packages/utils/at/files/.svn/entries b/feeds/packages/utils/at/files/.svn/entries +new file mode 100644 +index 0000000..b3fe896 +--- /dev/null ++++ b/feeds/packages/utils/at/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/at/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:37:56.632075Z ++28909 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++atd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++91105b6d59e6b4d481b00c9a987c58f4 ++2011-11-09T23:37:56.632075Z ++28909 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++468 ++ +diff --git a/feeds/packages/utils/at/files/.svn/prop-base/atd.init.svn-base b/feeds/packages/utils/at/files/.svn/prop-base/atd.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/at/files/.svn/prop-base/atd.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/at/files/.svn/text-base/atd.init.svn-base b/feeds/packages/utils/at/files/.svn/text-base/atd.init.svn-base +new file mode 100644 +index 0000000..6254d29 +--- /dev/null ++++ b/feeds/packages/utils/at/files/.svn/text-base/atd.init.svn-base +@@ -0,0 +1,23 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ -d /var/spool/cron/atjobs ] || { ++ mkdir -m 0755 -p /var/spool/cron/atjobs ++ touch /var/spool/cron/atjobs/.SEQ ++ chown -R nobody:nogroup /var/spool/cron/atjobs ++ } ++ [ -d /var/spool/cron/atspool ] || { ++ mkdir -m 0755 -p /var/spool/cron/atspool ++ chown -R nobody:nogroup /var/spool/cron/atspool ++ } ++ service_start /usr/sbin/atd ++} ++ ++stop() { ++ service_stop /usr/sbin/atd ++} +diff --git a/feeds/packages/utils/at/files/atd.init b/feeds/packages/utils/at/files/atd.init +new file mode 100755 +index 0000000..6254d29 +--- /dev/null ++++ b/feeds/packages/utils/at/files/atd.init +@@ -0,0 +1,23 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 OpenWrt.org ++ ++START=50 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ [ -d /var/spool/cron/atjobs ] || { ++ mkdir -m 0755 -p /var/spool/cron/atjobs ++ touch /var/spool/cron/atjobs/.SEQ ++ chown -R nobody:nogroup /var/spool/cron/atjobs ++ } ++ [ -d /var/spool/cron/atspool ] || { ++ mkdir -m 0755 -p /var/spool/cron/atspool ++ chown -R nobody:nogroup /var/spool/cron/atspool ++ } ++ service_start /usr/sbin/atd ++} ++ ++stop() { ++ service_stop /usr/sbin/atd ++} +diff --git a/feeds/packages/utils/at/patches/.svn/entries b/feeds/packages/utils/at/patches/.svn/entries +new file mode 100644 +index 0000000..e36a13f +--- /dev/null ++++ b/feeds/packages/utils/at/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/at/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-18T23:26:17.081226Z ++30640 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-getloadavg.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f1aecb4eb026b77c1b8a80a5669687d6 ++2012-02-18T23:26:17.081226Z ++30640 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++303 ++ ++100-cross-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d6c0cc4ea23b62e99516d349436ea7ce ++2012-02-18T23:26:17.081226Z ++30640 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1148 ++ +diff --git a/feeds/packages/utils/at/patches/.svn/text-base/100-cross-compile.patch.svn-base b/feeds/packages/utils/at/patches/.svn/text-base/100-cross-compile.patch.svn-base +new file mode 100644 +index 0000000..fbbc7e4 +--- /dev/null ++++ b/feeds/packages/utils/at/patches/.svn/text-base/100-cross-compile.patch.svn-base +@@ -0,0 +1,30 @@ ++--- a/configure +++++ b/configure ++@@ -3458,27 +3458,6 @@ $as_echo "yes" >&6; } ++ $as_echo "no" >&6; } ++ ;; ++ esac ++-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Trying to compile a trivial ANSI C program" >&5 ++-$as_echo_n "checking Trying to compile a trivial ANSI C program... " >&6; } ++-if test "$cross_compiling" = yes; then : ++- as_fn_error $? "Could not compile and run even a trivial ANSI C program - check CC." "$LINENO" 5 ++-else ++- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++-/* end confdefs.h. */ ++- main(int ac, char **av) { return 0; } ++-_ACEOF ++-if ac_fn_c_try_run "$LINENO"; then : ++- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++-$as_echo "yes" >&6; } ++-else ++- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++-$as_echo "no" >&6; } ++- as_fn_error $? "Could not compile and run even a trivial ANSI C program - check CC." "$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 ++- ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking __attribute__((noreturn))" >&5 ++ $as_echo_n "checking __attribute__((noreturn))... " >&6; } +diff --git a/feeds/packages/utils/at/patches/.svn/text-base/110-getloadavg.patch.svn-base b/feeds/packages/utils/at/patches/.svn/text-base/110-getloadavg.patch.svn-base +new file mode 100644 +index 0000000..0faef97 +--- /dev/null ++++ b/feeds/packages/utils/at/patches/.svn/text-base/110-getloadavg.patch.svn-base +@@ -0,0 +1,14 @@ ++--- a/getloadavg.c +++++ b/getloadavg.c ++@@ -69,8 +69,9 @@ Boston, MA 02110-1301 USA */ ++ #include ++ #endif ++ ++-#include "lisp.h" ++-#include "sysfile.h" /* for encapsulated open, close, read, write */ +++#include +++#include +++#include ++ ++ #ifndef HAVE_GETLOADAVG ++ +diff --git a/feeds/packages/utils/at/patches/100-cross-compile.patch b/feeds/packages/utils/at/patches/100-cross-compile.patch +new file mode 100644 +index 0000000..fbbc7e4 +--- /dev/null ++++ b/feeds/packages/utils/at/patches/100-cross-compile.patch +@@ -0,0 +1,30 @@ ++--- a/configure +++++ b/configure ++@@ -3458,27 +3458,6 @@ $as_echo "yes" >&6; } ++ $as_echo "no" >&6; } ++ ;; ++ esac ++-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Trying to compile a trivial ANSI C program" >&5 ++-$as_echo_n "checking Trying to compile a trivial ANSI C program... " >&6; } ++-if test "$cross_compiling" = yes; then : ++- as_fn_error $? "Could not compile and run even a trivial ANSI C program - check CC." "$LINENO" 5 ++-else ++- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++-/* end confdefs.h. */ ++- main(int ac, char **av) { return 0; } ++-_ACEOF ++-if ac_fn_c_try_run "$LINENO"; then : ++- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++-$as_echo "yes" >&6; } ++-else ++- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++-$as_echo "no" >&6; } ++- as_fn_error $? "Could not compile and run even a trivial ANSI C program - check CC." "$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 ++- ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking __attribute__((noreturn))" >&5 ++ $as_echo_n "checking __attribute__((noreturn))... " >&6; } +diff --git a/feeds/packages/utils/at/patches/110-getloadavg.patch b/feeds/packages/utils/at/patches/110-getloadavg.patch +new file mode 100644 +index 0000000..0faef97 +--- /dev/null ++++ b/feeds/packages/utils/at/patches/110-getloadavg.patch +@@ -0,0 +1,14 @@ ++--- a/getloadavg.c +++++ b/getloadavg.c ++@@ -69,8 +69,9 @@ Boston, MA 02110-1301 USA */ ++ #include ++ #endif ++ ++-#include "lisp.h" ++-#include "sysfile.h" /* for encapsulated open, close, read, write */ +++#include +++#include +++#include ++ ++ #ifndef HAVE_GETLOADAVG ++ +diff --git a/feeds/packages/utils/avrdude/.svn/entries b/feeds/packages/utils/avrdude/.svn/entries +new file mode 100644 +index 0000000..7de22a6 +--- /dev/null ++++ b/feeds/packages/utils/avrdude/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/avrdude ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++b6de5d37ae822bbab257b45fdf2a740a ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1321 ++ +diff --git a/feeds/packages/utils/avrdude/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/avrdude/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..323a7d8 +--- /dev/null ++++ b/feeds/packages/utils/avrdude/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/utils/avrdude/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/avrdude/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b70c83e +--- /dev/null ++++ b/feeds/packages/utils/avrdude/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=avrdude ++PKG_VERSION:=5.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/avrdude ++PKG_MD5SUM:=d459dcf47fa7fc2a29a70d68ebff4886 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/avrdude ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=AVR Downloader/UploaDEr ++ URL:=http://www.bsdhome.com/avrdude/ ++ DEPENDS:=+libncurses +libreadline +libusb-compat ++endef ++ ++define Package/avrdude/description ++ AVRDUDE is a full featured program for programming Atmel's AVR CPU's. ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ chmod -R u+w $(PKG_BUILD_DIR) ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-parport \ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install-exec ++endef ++ ++define Package/avrdude/conffiles ++/etc/avrdude.conf ++endef ++ ++define Package/avrdude/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/avrdude.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/avrdude $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,avrdude)) +diff --git a/feeds/packages/utils/avrdude/Makefile b/feeds/packages/utils/avrdude/Makefile +new file mode 100644 +index 0000000..b70c83e +--- /dev/null ++++ b/feeds/packages/utils/avrdude/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=avrdude ++PKG_VERSION:=5.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/avrdude ++PKG_MD5SUM:=d459dcf47fa7fc2a29a70d68ebff4886 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/avrdude ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=AVR Downloader/UploaDEr ++ URL:=http://www.bsdhome.com/avrdude/ ++ DEPENDS:=+libncurses +libreadline +libusb-compat ++endef ++ ++define Package/avrdude/description ++ AVRDUDE is a full featured program for programming Atmel's AVR CPU's. ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ chmod -R u+w $(PKG_BUILD_DIR) ++endef ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-parport \ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install-exec ++endef ++ ++define Package/avrdude/conffiles ++/etc/avrdude.conf ++endef ++ ++define Package/avrdude/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/avrdude.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/avrdude $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,avrdude)) +diff --git a/feeds/packages/utils/avrusbboot/.svn/entries b/feeds/packages/utils/avrusbboot/.svn/entries +new file mode 100644 +index 0000000..d30eb93 +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/avrusbboot ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9337336aadf578894404ca77a8c3f26f ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1455 ++ +diff --git a/feeds/packages/utils/avrusbboot/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/avrusbboot/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..91ea97e +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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:=avrusbboot ++PKG_VERSION:=2006-06-25 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.fischl.de/avrusbboot/ ++PKG_MD5SUM:=3e2f5e2c257918410a66c3463f583fdf ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/avrusbboot ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat $(CXX_DEPENDS) ++ TITLE:=USB bootloader for Atmel AVR controllers ++ URL:=http://www.fischl.de/avrusbboot/ ++endef ++ ++define Package/avrusbboot/description ++ AVRUSBBoot is a bootloader for the Atmel AVR controllers. ++ It uses a firmware-only USB driver to transfer binary data ++ from the PC to the flash of the controller. Once the AVR ++ is flashed with the bootloader, no other ISP programmer is ++ needed; then the microcontroller can be reprogrammed over USB. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/software \ ++ CXX="$(TARGET_CXX)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) -fno-rtti" \ ++ LFLAGS="$(TARGET_LDFLAGS) -lusb" \ ++ all ++endef ++ ++define Package/avrusbboot/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/software/avrusbboot $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,avrusbboot)) +diff --git a/feeds/packages/utils/avrusbboot/Makefile b/feeds/packages/utils/avrusbboot/Makefile +new file mode 100644 +index 0000000..91ea97e +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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:=avrusbboot ++PKG_VERSION:=2006-06-25 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.fischl.de/avrusbboot/ ++PKG_MD5SUM:=3e2f5e2c257918410a66c3463f583fdf ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/avrusbboot ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat $(CXX_DEPENDS) ++ TITLE:=USB bootloader for Atmel AVR controllers ++ URL:=http://www.fischl.de/avrusbboot/ ++endef ++ ++define Package/avrusbboot/description ++ AVRUSBBoot is a bootloader for the Atmel AVR controllers. ++ It uses a firmware-only USB driver to transfer binary data ++ from the PC to the flash of the controller. Once the AVR ++ is flashed with the bootloader, no other ISP programmer is ++ needed; then the microcontroller can be reprogrammed over USB. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/software \ ++ CXX="$(TARGET_CXX)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) -fno-rtti" \ ++ LFLAGS="$(TARGET_LDFLAGS) -lusb" \ ++ all ++endef ++ ++define Package/avrusbboot/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/software/avrusbboot $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,avrusbboot)) +diff --git a/feeds/packages/utils/avrusbboot/patches/.svn/entries b/feeds/packages/utils/avrusbboot/patches/.svn/entries +new file mode 100644 +index 0000000..64b5631 +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/avrusbboot/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-05-20T11:00:58.610512Z ++11220 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-fix_makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ba2efd61bbf182270b60dcaeea4fbddc ++2008-05-20T11:00:58.610512Z ++11220 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++766 ++ ++002-fix_compilation.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++492f7eefb22183b6794b87686c649e07 ++2008-05-20T11:00:58.610512Z ++11220 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++316 ++ +diff --git a/feeds/packages/utils/avrusbboot/patches/.svn/text-base/001-fix_makefile.patch.svn-base b/feeds/packages/utils/avrusbboot/patches/.svn/text-base/001-fix_makefile.patch.svn-base +new file mode 100644 +index 0000000..4439b62 +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/patches/.svn/text-base/001-fix_makefile.patch.svn-base +@@ -0,0 +1,18 @@ ++diff -urN avrusbboot.2006-06-25/software/Makefile avrusbboot.2006-06-25.new/software/Makefile ++--- avrusbboot.2006-06-25/software/Makefile 2006-06-25 11:09:03.000000000 +0200 +++++ avrusbboot.2006-06-25.new/software/Makefile 2008-05-20 12:54:22.000000000 +0200 ++@@ -1,6 +1,5 @@ ++-LIBUSB_CONFIG = libusb-config ++-CFLAGS+=-g -Wall -pedantic `$(LIBUSB_CONFIG) --cflags` ++-LFLAGS+=`$(LIBUSB_CONFIG) --libs` -lusb +++CFLAGS=-I$(STAGING_DIR)/usr/include +++LFLAGS=-L$(STAGING_DIR)/usr/lib -lusb ++ ++ all: ++ make avrusbboot ++@@ -10,4 +9,4 @@ ++ rm avrusbboot ++ ++ avrusbboot: main.cpp cflashmem.o cpage.o cbootloader.o ++- g++ $(CFLAGS) main.cpp cflashmem.o cpage.o cbootloader.o -o avrusbboot $(LFLAGS) +++ $(CXX) $(CFLAGS) main.cpp cflashmem.o cpage.o cbootloader.o -o avrusbboot $(LFLAGS) +diff --git a/feeds/packages/utils/avrusbboot/patches/.svn/text-base/002-fix_compilation.patch.svn-base b/feeds/packages/utils/avrusbboot/patches/.svn/text-base/002-fix_compilation.patch.svn-base +new file mode 100644 +index 0000000..bd8bcd9 +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/patches/.svn/text-base/002-fix_compilation.patch.svn-base +@@ -0,0 +1,9 @@ ++diff -ruN avrusbboot.2006-06-25-orig/software/main.cpp avrusbboot.2006-06-25-work/software/main.cpp ++--- avrusbboot.2006-06-25-orig/software/main.cpp 2006-06-25 09:33:13.000000000 +0200 +++++ avrusbboot.2006-06-25-work/software/main.cpp 2008-05-01 17:25:30.000000000 +0200 ++@@ -39,4 +39,4 @@ ++ } ++ ++ return 0; ++-}; +++} +diff --git a/feeds/packages/utils/avrusbboot/patches/001-fix_makefile.patch b/feeds/packages/utils/avrusbboot/patches/001-fix_makefile.patch +new file mode 100644 +index 0000000..4439b62 +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/patches/001-fix_makefile.patch +@@ -0,0 +1,18 @@ ++diff -urN avrusbboot.2006-06-25/software/Makefile avrusbboot.2006-06-25.new/software/Makefile ++--- avrusbboot.2006-06-25/software/Makefile 2006-06-25 11:09:03.000000000 +0200 +++++ avrusbboot.2006-06-25.new/software/Makefile 2008-05-20 12:54:22.000000000 +0200 ++@@ -1,6 +1,5 @@ ++-LIBUSB_CONFIG = libusb-config ++-CFLAGS+=-g -Wall -pedantic `$(LIBUSB_CONFIG) --cflags` ++-LFLAGS+=`$(LIBUSB_CONFIG) --libs` -lusb +++CFLAGS=-I$(STAGING_DIR)/usr/include +++LFLAGS=-L$(STAGING_DIR)/usr/lib -lusb ++ ++ all: ++ make avrusbboot ++@@ -10,4 +9,4 @@ ++ rm avrusbboot ++ ++ avrusbboot: main.cpp cflashmem.o cpage.o cbootloader.o ++- g++ $(CFLAGS) main.cpp cflashmem.o cpage.o cbootloader.o -o avrusbboot $(LFLAGS) +++ $(CXX) $(CFLAGS) main.cpp cflashmem.o cpage.o cbootloader.o -o avrusbboot $(LFLAGS) +diff --git a/feeds/packages/utils/avrusbboot/patches/002-fix_compilation.patch b/feeds/packages/utils/avrusbboot/patches/002-fix_compilation.patch +new file mode 100644 +index 0000000..bd8bcd9 +--- /dev/null ++++ b/feeds/packages/utils/avrusbboot/patches/002-fix_compilation.patch +@@ -0,0 +1,9 @@ ++diff -ruN avrusbboot.2006-06-25-orig/software/main.cpp avrusbboot.2006-06-25-work/software/main.cpp ++--- avrusbboot.2006-06-25-orig/software/main.cpp 2006-06-25 09:33:13.000000000 +0200 +++++ avrusbboot.2006-06-25-work/software/main.cpp 2008-05-01 17:25:30.000000000 +0200 ++@@ -39,4 +39,4 @@ ++ } ++ ++ return 0; ++-}; +++} +diff --git a/feeds/packages/utils/bandwidthd/.svn/entries b/feeds/packages/utils/bandwidthd/.svn/entries +new file mode 100644 +index 0000000..bf0934d +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bandwidthd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++975c12d67af5f15a32bc4a76f48c6bae ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1603 ++ +diff --git a/feeds/packages/utils/bandwidthd/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bandwidthd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3ae7d51 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=bandwidthd ++PKG_VERSION:=2.0.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/bandwidthd ++PKG_MD5SUM:=aa79aad7bd489fd2cae1f7dc086ca8b6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bandwidthd ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Bandwidthd ++ URL:=http://bandwidthd.sourceforge.net/ ++ DEPENDS:=+libgd +libpcap ++endef ++ ++define Package/bandwidthd/daemon ++ This package contains bandwidthd a bandwith tracking utility. ++endef ++ ++CONFIGURE_ARGS += \ ++ ac_cv_file__sw_lib=no \ ++ ac_cv_file__sw_include=no \ ++ ac_cv_file__usr_pkg_lib=no \ ++ ac_cv_file__usr_pkg_include=no \ ++ ac_cv_file__usr_local_pgsql_lib=no \ ++ ac_cv_file__usr_local_pgsql_include=no \ ++ ac_cv_lib_pq_PQconnectdb=no \ ++ ++EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++define Package/bandwidthd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bandwidthd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/bandwidthd.config $(1)/etc/config/bandwidthd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bandwidthd.init $(1)/etc/init.d/bandwidthd ++ $(INSTALL_DIR) $(1)/www ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/ ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/logo.gif $(1)/www/ ++endef ++ ++define Package/bandwidthd/conffiles ++/etc/config/bandwidthd ++endef ++ ++$(eval $(call BuildPackage,bandwidthd)) +diff --git a/feeds/packages/utils/bandwidthd/Makefile b/feeds/packages/utils/bandwidthd/Makefile +new file mode 100644 +index 0000000..3ae7d51 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=bandwidthd ++PKG_VERSION:=2.0.1 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/bandwidthd ++PKG_MD5SUM:=aa79aad7bd489fd2cae1f7dc086ca8b6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bandwidthd ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Bandwidthd ++ URL:=http://bandwidthd.sourceforge.net/ ++ DEPENDS:=+libgd +libpcap ++endef ++ ++define Package/bandwidthd/daemon ++ This package contains bandwidthd a bandwith tracking utility. ++endef ++ ++CONFIGURE_ARGS += \ ++ ac_cv_file__sw_lib=no \ ++ ac_cv_file__sw_include=no \ ++ ac_cv_file__usr_pkg_lib=no \ ++ ac_cv_file__usr_pkg_include=no \ ++ ac_cv_file__usr_local_pgsql_lib=no \ ++ ac_cv_file__usr_local_pgsql_include=no \ ++ ac_cv_lib_pq_PQconnectdb=no \ ++ ++EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++define Package/bandwidthd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bandwidthd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/bandwidthd.config $(1)/etc/config/bandwidthd ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bandwidthd.init $(1)/etc/init.d/bandwidthd ++ $(INSTALL_DIR) $(1)/www ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/ ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/logo.gif $(1)/www/ ++endef ++ ++define Package/bandwidthd/conffiles ++/etc/config/bandwidthd ++endef ++ ++$(eval $(call BuildPackage,bandwidthd)) +diff --git a/feeds/packages/utils/bandwidthd/files/.svn/entries b/feeds/packages/utils/bandwidthd/files/.svn/entries +new file mode 100644 +index 0000000..84c42cd +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bandwidthd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:29.213221Z ++28946 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++logo.gif ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f7fed5fca05ba335f30fa994a55ccad2 ++2010-09-11T18:38:34.198817Z ++23013 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7573 ++ ++bandwidthd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++0bec123c95b2757bbdd431e5c70e0248 ++2011-11-11T15:46:29.213221Z ++28946 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1952 ++ ++bandwidthd.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ae694dc62b7359feeb25e3aa72aa611d ++2008-06-20T17:06:20.010822Z ++11547 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++287 ++ +diff --git a/feeds/packages/utils/bandwidthd/files/.svn/text-base/bandwidthd.config.svn-base b/feeds/packages/utils/bandwidthd/files/.svn/text-base/bandwidthd.config.svn-base +new file mode 100644 +index 0000000..4bb18cf +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/files/.svn/text-base/bandwidthd.config.svn-base +@@ -0,0 +1,11 @@ ++config bandwidthd ++ option dev br-lan ++ option subnets "192.168.0.0/16 10.0.0.0/8 172.16.0.0/12" ++ option skip_intervals 0 ++ option graph_cutoff 1024 ++ option promiscuous true ++ option output_cdf false ++ option recover_cdf false ++ option filter ip ++ option graph true ++ option meta_refresh 150 +diff --git a/feeds/packages/utils/bandwidthd/files/.svn/text-base/bandwidthd.init.svn-base b/feeds/packages/utils/bandwidthd/files/.svn/text-base/bandwidthd.init.svn-base +new file mode 100644 +index 0000000..6483daa +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/files/.svn/text-base/bandwidthd.init.svn-base +@@ -0,0 +1,88 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=99 ++ ++config_cb() { ++ local cfg_type="$1" ++ local cfg_name="$2" ++ ++ case "$cfg_type" in ++ bandwidthd) ++ append cfgs "$cfg_name" ++ ;; ++ esac ++} ++ ++export_bool() { ++ local option="$1" ++ local section="$2" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" ++ if [ -n "$_loctmp" ]; then ++ conffile="${conffile}$option " ++ if [ 1 -eq "$_loctmp" ]; then ++ conffile="${conffile}true" ++ else ++ conffile="${conffile}false" ++ fi ++ conffile="${conffile}\n" ++ fi ++} ++ ++export_number() { ++ local option="$1" ++ local section="$2" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ if [ -n "$_loctmp" ]; then ++ conffile="${conffile}$option ${_loctmp}\n" ++ fi ++} ++ ++export_string() { ++ local option="$1" ++ local section="$2" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ if [ -n "$_loctmp" ]; then ++ conffile="${conffile}$option \"${_loctmp}\"\n" ++ fi ++} ++ ++start() { ++ local subnet conffile ++ ++ [ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /www/logo.gif /tmp/bandwidthd/ ++ [ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs ++ [ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd ++ rm -f /tmp/bandwidthd.conf ++ touch /tmp/bandwidthd.conf ++ [ -e /etc/bandwidthd.conf ] || ln -s /tmp/bandwidthd.conf /etc/bandwidthd.conf ++ ++ ++ config_load bandwidthd ++ for cfg in $cfgs; do ++ config_get subnets $cfg subnets ++ for subnet in $subnets; do ++ conffile="${conffile}subnet ${subnet}\n" ++ done ++ export_string dev $cfg ++ export_number skip_intervals $cfg ++ export_number graph_cutoff $cfg ++ export_bool promiscuous $cfg ++ export_bool output_cdf $cfg ++ export_bool recover_cdf $cfg ++ export_string filter $cfg ++ export_bool graph $cfg ++ export_number meta_refresh $cfg ++ [ -n "$conffile" ] && echo -e "$conffile" >>/tmp/bandwidthd.conf ++ unset conffile ++ done ++ cd / ++ service_start /usr/sbin/bandwidthd ++} ++ ++stop() { ++ service_stop /usr/sbin/bandwidthd ++} +diff --git a/feeds/packages/utils/bandwidthd/files/.svn/text-base/logo.gif.svn-base b/feeds/packages/utils/bandwidthd/files/.svn/text-base/logo.gif.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..7b17cc6cbc70b45aa4b21bcf6bb3f6d6462760e7 +GIT binary patch +literal 7573 +zcmYLq2{@GB7ymm8hS1AcvovGNl6?&^Gj`c!DU`8iDP&*A5<_+(`&hE?TT;qSB1@9B +zLe@l5AvAw|fB*mUKhJaSIp;m+^EvOi_qos2($Q3q$J0Wyfdk;5kjVh-H?_1=c6i~d +zk^esE1wJ8@$?VN~BO@b%3BI!!Ok82xhYugfzc-Dj@`MrKx}rO7v< +zLZr#kuVQk`*p5g`M@B|^HJ1vJh0@EO9ew&l +zCSL%_Aen5=L&9Uom@abHf{_uK+;nho5KWFYH#euHrS(g%S4@bhudiPtukF^?V>}D# +zW(95%GkOPJXE%=^$OyG+O6z?ik&1EHu8C$du;xeXwn?Q?d+vtI8<&thIQWi=0HXJ=2MP(`MP +z{waGW{xN43^_3X_&NRcD^}mDpw_N_i2s{!w^w++A=zn%5WaYCM0FVIHzvNjR;Y=ZC +zF2ofHfZtF2OOF@noDOf=06|!d>W1euz&%e +z{vYSRn!K|j?K2$hncqNW1kBmC{B6%T{{6>4UTX`r|7!mq59%N2j2{}-3(VD7po|u9=5aW|Lgs)@BbI|Idvf5jIVT_83;MEAu-x#n@=YH>rwE3 +zbN9#9fqyaj2>u`N^1t=poxmW-00V+kyMfdlg+K~h4>c6^#)7=MdD@M|{SVosT^EKL +zO9qosYVn*pO{K5X1x>50UpGB@lOV35(yIkn7FJ`*lwzsDg!jv#mW%XR~>Ki%qY@w5vtLMb@id8FY +zd0HcfrTzoaJ$~Ryutn{y+zT{)bG%F5)AKYJC*DkE~-9G0L +zYZ1))j8G6@j6g@9ljRgF2u4s77o!bY4`8fJPKVdAjIKkoln9%RqFAVYcQ*AQwNGJ4 +zu^cWw0AyT^}iRq6*3P>+D0I1zzs+=)K36coc4I(idev*PM +z?0#N0uWvk}HkLrg&TOWD>;Qe~6Gv;FFOJ##-U2ZgX4LnnSR9RylZ6AV4;55ar9URYM!MMHq%cK1yvR<= +zwK7kWkY8SWlicQ7S?4`{r>3cCZmYT=tb3MK=QDp)db?l$11PI@CcL75S=O!j?ben< +zZDuG9q`n3>|GtJ~B9dM1tzI>A@piz42kr4X)ne7?Rf$|T8a{vHVgoMHxbF-d|9JFo +zf#~`Y)wD7&*$qvI;zH;VDX`k8u09O;W=u*P_vB{@?70Ai!7y0A&aR;+D1$FRlzJNV +zrLn6wm`ZC7ee81QR)+>`uo%IqA8|i6JI5SK%V%^~uw`LPa{uTD2G2A_;THfW42G#8 +zJ+ea#s})iJCK}T6JCWt3eM9QcTE2jgcYdQI^}@PLn7lTf1ePs8yJ-R{Z6*`V;rm@3 +zA@s9D)Chs_?1CWi(cQA|?W{(BVfD|ew}m*IZ@IW^u4OPD?^u4wFv#f^7KlCK3TuB? +zoOSolW<`13pRJ1Yw|~Ai48CmNbTkwjU!nA^Yya{{y!7}R!qVVqwOwQiuGwK#VDy8o +z(gqBXfS^u)PFdVL{WarUfBJjDfA{p@bFBE^!!KF){vK_V*Z=*q{dD*5fqBC?mP!ah +zI5<6AuP6UKIXHV!09q12rQHR+@ST9rBSBf&kcE~B5g<8%1b>Jt9M}6E$u>gLG5?LE +z3zCS$B6_G~d%Cw1jHG##mn=JQC}x$?Xfb6SyZ|rjz(N8+#SKr}>MbABrz3zRc2i2U +zM6i*xQFQx6!^pNY&NV(~#Bw3hUz>qV6HX_7G}n`{kwvBWg-XW7xO>|4X)b0Ddz`xr +z(Lgb#)AhxJI?KI2&)zC&du8^!;pZtv~ab-otZD0FRLylY+aW_-ep=7ik`K!KYQ=j4 +zzrhfO_i_@!xtO#qt!wB9DaJXB58BBXfc7y!d+O?!;5ObcdO;3q!ht9eUMWLvSdCql)DjRhLk67&{ERjCniA{ku7c;wy2vcwl&~ +z4XrDf97HJuI`MR!fAivzL*00#h5_-}@JXa_p^~WkFDZ+fNq&n`ej6H_BI~(O8vl3C +z>MRvC9(PEI8#&EZZ`!Rtf7BvY@e+V&dY8fTOm+=t<}1G|@;?LU8wiQPj3P`sT}{`% +zZ}G`1_hAh*O5fx~F`zofMj!cG<+{DE7+4xvN@{JL&xzC;k=;x^>=QJQ+|nCSY%~+~ +zLVj!@My=yV_1Om4UM_6&ZC}adyw7&tyaD$u#vfdbNE(!S%bBb?D7iFyIAqC*=&3ML +zjkw;9wiswS;u7b!H;@psDof{7_kYQ#W-OyC}Gm(WWe?Iv2$~MH- +zg0!C4*z}l{hQ!2eo3V!3RP(mF!c+Br^$0jk9{z!{=(iY`BEcfZhi!LU2BxNL5zvGS +z{_Tss54Ph384nQ^R>eCIvtvwpknk;~MUNQU-~5Rt*RHS4q}GmH;O~?jz4&g(O#dJl +zt>gas1B>U^a?c`17KlCJf&ucSn3HV%oy7FwS?MIhAc=eKPjM1o=N_fJH)I|>hddt% +zfx=sA92O3AVp1q6Pa-5~JtOQ9%X|ExiVYE>4uoGyz+d{qO{3(FsluJxB)!wE7@u8J +z(!*aiv%{ucC+0z+v%UuWmE?Ms0IbxTq>N}J7=%JAK)LI{kiRj7kYzqEfwKMVVVM(VxB#~nwYFq}3N}OxTmAi!B~An-$ByXo6cKRJWpz$*c8(2- +z7{v|cHK8heRK?#P2^R0Zijt#7$HHJ37sTeN_jbnpm>*e&Ar^{-WgjDNNp)HbvGn=w +zL`nE8X;GKDGokns4!8F%EaSH6q;{w~LlPj(`Uk69ET~20mkrQ4zq^v-2I~I +z^4&C(!IeVNjIy0TPGgXQdtCw#nGP`-+By^R?rHT;7DxmX=eW3?JbR={I(}T2$=nwqt +z3r*2^MGp#oMF048&0Zlo4-H$ji`H(p$-_x&EJL@7{d7(I-~&jNUJ6==m^6lICRg<>j|1I7Et=dR1~A3vJU~@=?7N$M+SiY +zmP9~}PuB!Si$}p+m_$GGsbT`AoxLfrreP60x1-!A*ZlU41p>SLVQK6XsWLBF;}M^U +z241}6079q%76N}KHN3$TKBV+x{b5YETf$JRuskvJ!1!KsBt4WM#Y?ERWTOAfM=ufj +zUS7PZ{h_1x!|4sybjJWKUqQP25AFJs`YaPl@vwj*+54B+iI+^CsU=#cn!;Z*w| +zYy^EhOb%KNC$JjReh8!4OR(uyKc-^35CFO%!l<5kbZ43fHNe@AkTw`lr}-jRAUhR4 +zVQBpd{{|DK4tRT2TAl~wzXJT>NuX>@TUH18XK@`03FoeWcV{e?H!QRwgc|YIP^T!E +z1oX~^5X&sHMg?Ftqi;GZbnDRfNW*WD=k|?k1FP3jI7?xZ3QK$?npMJYW|hxg$jH}m +zlh5XcXc-Re;0ZZ2gBJAp7+BccsuU6T%vd&ti+2fmTk`p|GrpB%5UfByGy~13Blg$&paqKwCI3fuBoE^{zc{XIm*_&h9tkAWe$BU!H +zbjg&ODjU9&%PWG}l;i{$;e5yOhAWDOyt!eia$*8SUS> +zpMeKZD4xoXkPXF?5P*Wtb!B*?9PG}eN@p()63oNV;Z@X?01!@%LRm``&Brom#(;S% +z3b9CKRr6xC0a=k0VCM)a=m|r1$uhLzQ%dYASL`aHN~%gqs(K5WO%+?4p|<12FalJv +zA(b`LUTYc@7%w$YWO`-laJ4Ngqq|VN8ycDZrDWO?*Wf1R6B2+5m*5Ww0VD1%j1@K(jDRq&>ooNtt!>68Humy$*CE+ +zS@UYEW^$|MeNOG5Yt3uj+BuqW1n2Jj8(H-aI->g +zv*Pn+<@sin<7Ny;3r?v;-Ks@1xJ5g+MfZ7&-h7L}af=a0tBF!;f)kWpyVWunqwm#v +zW4;y0V0pCBYWGH!6j5p)+_r<|s*P!Lzs7#*<>^7@cFvwVG|z0<&BG +z+$=W{vFD-QU1=xz;?;9D*#-(|OL*UNmvWA~%6knr(4C_XFQ|P`eR<p +zREN$n8lB`SScA(}{UVat#!vc#e2D^l@dgPD+@H19o%*&phEAjhFGBq3vy;z3t}>4> +zVgX7H45cImr3driNm0t*?E9J2j8UAaI+fC7^vP?==uR%LSBcgc=One1Hp8)3hhG-5zNRbhaz8<@k8R?5hqd&J5ga8Jl96EGfB|G0 +zUNK`Km06Y?wxePU@cC_~#RSN!%M6n*APerJ-PVIFEKj7C-ZpE$-rOcEYQFJz90udx +zE?ZmDr@q-RhJ6+U`93E;4`HHDfr+N{93;oWbz%=VYg^aIco&Y +zUj-acI0=VBnRNX;aD1H5v? +zWWx3CuJk+TyQxK{iK{kz>?Ba_^YteQx!m~{-lJ*U8?0QlEco1PUs2Gs6K$wz&o2~6 +z6)|nt%`eK;-_D*s5%?h>^@9yVTbU(aMLT$0 +z=tXu9FPk4}a}_L(wqWr$xrAC4r^VTXSUn9!3fjhy6-%Zjs{mdYrR`_R%0=cz=NTUU +zg+9?63GZjgrB=u$svbI6f2|qf`-dY>3U&aqmkrMN#z~YWW*wibKBBSn894>L(7LkA4`i^3`|Zn +zY3d?Vai0+QPf8FjD$%K~(O|>G#F+>$l`FuxTcF6t*Sm|%Lz`Cjq`znwfLdbxeB4Y% +zoNNfAEY9_8p`RXT1JIxjG#2Z_>4imCuD^U0z7t_PcFB?bJ_^*4{$h<5tmMkpu}?2c +z3O@(=+WB_aQ6<7>lvq^5SDXu~ewbI^o2T`76Pm=z^CjtO;}l(``%|_zRSO>DS9k+3 +z<~^e9Z}&nU1(@dHQ>JchYpbmF6nrt9z)cE>X^_DDoz0rZz? +z&HFT;TK4G9d6?d!LJ(wK@v!4%Rx_zfTpQ-=D%%L^@9Fg0uW7$kzu0j_iG_PUr%2s= +zoIe1K70=q)GtXfE%~lcbv536O&SsS3ni^a$#*QU?RGr9MOOj(D +z@31BBZ@=6jXC#eLOnA78am%JatVobM4ci+(My$Jowss0{_x8JlB|>it$i{KOJ(K0h +z{f%|J4k;G}1ld35^SnEhwI(b5a(`i8XyvdlQhKtv*#|a$;|;5MAMf&Q_+&%qfkssF +zZz#i>tKpm?4sx_K7|^5efWK$Z2`j+D5VA*KJf&xF%#@nIZlpXssK4Y3x>RJ{};+}m7+C^2Lh>k#&nZ%cy5pcphW +z(Fy!CkYp%}3@1jni +zmZ&O@X_IpiVjB;IpX@c@TyU{<9Em-WMr&kwCS;@xpbVf+!-_FCS1hM)yJUybS5Wqut7IkvXVEH +z*Yj0{U>7d{U8g}2mKttO4)Lz*rd4QPq9Ymh=w_rBJrWF%t|BQv|AAU#-10$*TR58W +zXAh{8%Ayh!i1Ac6JHDZq!W6sI;Y@TriKV|uK#7u-&zor7`*XHa*ZXx{bYtqCOB)qC +zT%VF>e{MNlOwr*Y0=R|eWK57xT85}mZ}QJ66t78Sz2<%1x-qE}y3(fQY^KaoB;+y! +z8_sJdW@^B0)2CfpVm8HIDG&+hn`0ZKZALP3w9XJ=oW@g#s$ExIPc&E$x8|O!%OkO5` +z%b2x%rDN3}j~KmSghee}iv(f#iuooLP{IZpM4 +zVhyWd?CJpBo1KI}r`}UjMX!EV=NDds7e8fhzI1kY=2m<9(e!H_e~*&2hsD|j-tK3} +zD{j^LpK_NQ&6*;qKg_;NwjW~Mee5)1zjLw=g#d)D^j!nNdH2|J@`JbQ#k^hTo$uxO +zuNB4?1g<~WQJz>*nqFK{-)~!Z`Zbx{sgZm9_eFnZHfA|axJp9x=fIGBf!MaMyfWGG +zEp;dIJ5kt@iy%=PUJ#z5^)h$jomdy}&2)w%2OKUg#h5!SJyn@s_-gjBPE%7_UHJ>X%aSI# +z@Qk#~rx~jP7Fjx`a#C5OlP7{vI>Y$ilUdd3PM4CO={d^nr}o$I%XkRsy9&I^u5wtD +zZjKvuYxB+`$&|@G-5m9LIhnJ(?R0tUwZ2bVdj2k7xzdV|;r&e0{NH(wl3vf=28JPX +zKEYiu6pBWXEK?*Z4Hq19hf$2&RMGhdF6#V>#_{G;#jO1;Y&{{v&Vf3W}n + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/bandwidthd/files/bandwidthd.config b/feeds/packages/utils/bandwidthd/files/bandwidthd.config +new file mode 100644 +index 0000000..4bb18cf +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/files/bandwidthd.config +@@ -0,0 +1,11 @@ ++config bandwidthd ++ option dev br-lan ++ option subnets "192.168.0.0/16 10.0.0.0/8 172.16.0.0/12" ++ option skip_intervals 0 ++ option graph_cutoff 1024 ++ option promiscuous true ++ option output_cdf false ++ option recover_cdf false ++ option filter ip ++ option graph true ++ option meta_refresh 150 +diff --git a/feeds/packages/utils/bandwidthd/files/bandwidthd.init b/feeds/packages/utils/bandwidthd/files/bandwidthd.init +new file mode 100644 +index 0000000..6483daa +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/files/bandwidthd.init +@@ -0,0 +1,88 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=99 ++ ++config_cb() { ++ local cfg_type="$1" ++ local cfg_name="$2" ++ ++ case "$cfg_type" in ++ bandwidthd) ++ append cfgs "$cfg_name" ++ ;; ++ esac ++} ++ ++export_bool() { ++ local option="$1" ++ local section="$2" ++ local _loctmp ++ config_get_bool _loctmp "$section" "$option" ++ if [ -n "$_loctmp" ]; then ++ conffile="${conffile}$option " ++ if [ 1 -eq "$_loctmp" ]; then ++ conffile="${conffile}true" ++ else ++ conffile="${conffile}false" ++ fi ++ conffile="${conffile}\n" ++ fi ++} ++ ++export_number() { ++ local option="$1" ++ local section="$2" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ if [ -n "$_loctmp" ]; then ++ conffile="${conffile}$option ${_loctmp}\n" ++ fi ++} ++ ++export_string() { ++ local option="$1" ++ local section="$2" ++ local _loctmp ++ config_get _loctmp "$section" "$option" ++ if [ -n "$_loctmp" ]; then ++ conffile="${conffile}$option \"${_loctmp}\"\n" ++ fi ++} ++ ++start() { ++ local subnet conffile ++ ++ [ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /www/logo.gif /tmp/bandwidthd/ ++ [ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs ++ [ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd ++ rm -f /tmp/bandwidthd.conf ++ touch /tmp/bandwidthd.conf ++ [ -e /etc/bandwidthd.conf ] || ln -s /tmp/bandwidthd.conf /etc/bandwidthd.conf ++ ++ ++ config_load bandwidthd ++ for cfg in $cfgs; do ++ config_get subnets $cfg subnets ++ for subnet in $subnets; do ++ conffile="${conffile}subnet ${subnet}\n" ++ done ++ export_string dev $cfg ++ export_number skip_intervals $cfg ++ export_number graph_cutoff $cfg ++ export_bool promiscuous $cfg ++ export_bool output_cdf $cfg ++ export_bool recover_cdf $cfg ++ export_string filter $cfg ++ export_bool graph $cfg ++ export_number meta_refresh $cfg ++ [ -n "$conffile" ] && echo -e "$conffile" >>/tmp/bandwidthd.conf ++ unset conffile ++ done ++ cd / ++ service_start /usr/sbin/bandwidthd ++} ++ ++stop() { ++ service_stop /usr/sbin/bandwidthd ++} +diff --git a/feeds/packages/utils/bandwidthd/files/logo.gif b/feeds/packages/utils/bandwidthd/files/logo.gif +new file mode 100644 +index 0000000000000000000000000000000000000000..7b17cc6cbc70b45aa4b21bcf6bb3f6d6462760e7 +GIT binary patch +literal 7573 +zcmYLq2{@GB7ymm8hS1AcvovGNl6?&^Gj`c!DU`8iDP&*A5<_+(`&hE?TT;qSB1@9B +zLe@l5AvAw|fB*mUKhJaSIp;m+^EvOi_qos2($Q3q$J0Wyfdk;5kjVh-H?_1=c6i~d +zk^esE1wJ8@$?VN~BO@b%3BI!!Ok82xhYugfzc-Dj@`MrKx}rO7v< +zLZr#kuVQk`*p5g`M@B|^HJ1vJh0@EO9ew&l +zCSL%_Aen5=L&9Uom@abHf{_uK+;nho5KWFYH#euHrS(g%S4@bhudiPtukF^?V>}D# +zW(95%GkOPJXE%=^$OyG+O6z?ik&1EHu8C$du;xeXwn?Q?d+vtI8<&thIQWi=0HXJ=2MP(`MP +z{waGW{xN43^_3X_&NRcD^}mDpw_N_i2s{!w^w++A=zn%5WaYCM0FVIHzvNjR;Y=ZC +zF2ofHfZtF2OOF@noDOf=06|!d>W1euz&%e +z{vYSRn!K|j?K2$hncqNW1kBmC{B6%T{{6>4UTX`r|7!mq59%N2j2{}-3(VD7po|u9=5aW|Lgs)@BbI|Idvf5jIVT_83;MEAu-x#n@=YH>rwE3 +zbN9#9fqyaj2>u`N^1t=poxmW-00V+kyMfdlg+K~h4>c6^#)7=MdD@M|{SVosT^EKL +zO9qosYVn*pO{K5X1x>50UpGB@lOV35(yIkn7FJ`*lwzsDg!jv#mW%XR~>Ki%qY@w5vtLMb@id8FY +zd0HcfrTzoaJ$~Ryutn{y+zT{)bG%F5)AKYJC*DkE~-9G0L +zYZ1))j8G6@j6g@9ljRgF2u4s77o!bY4`8fJPKVdAjIKkoln9%RqFAVYcQ*AQwNGJ4 +zu^cWw0AyT^}iRq6*3P>+D0I1zzs+=)K36coc4I(idev*PM +z?0#N0uWvk}HkLrg&TOWD>;Qe~6Gv;FFOJ##-U2ZgX4LnnSR9RylZ6AV4;55ar9URYM!MMHq%cK1yvR<= +zwK7kWkY8SWlicQ7S?4`{r>3cCZmYT=tb3MK=QDp)db?l$11PI@CcL75S=O!j?ben< +zZDuG9q`n3>|GtJ~B9dM1tzI>A@piz42kr4X)ne7?Rf$|T8a{vHVgoMHxbF-d|9JFo +zf#~`Y)wD7&*$qvI;zH;VDX`k8u09O;W=u*P_vB{@?70Ai!7y0A&aR;+D1$FRlzJNV +zrLn6wm`ZC7ee81QR)+>`uo%IqA8|i6JI5SK%V%^~uw`LPa{uTD2G2A_;THfW42G#8 +zJ+ea#s})iJCK}T6JCWt3eM9QcTE2jgcYdQI^}@PLn7lTf1ePs8yJ-R{Z6*`V;rm@3 +zA@s9D)Chs_?1CWi(cQA|?W{(BVfD|ew}m*IZ@IW^u4OPD?^u4wFv#f^7KlCK3TuB? +zoOSolW<`13pRJ1Yw|~Ai48CmNbTkwjU!nA^Yya{{y!7}R!qVVqwOwQiuGwK#VDy8o +z(gqBXfS^u)PFdVL{WarUfBJjDfA{p@bFBE^!!KF){vK_V*Z=*q{dD*5fqBC?mP!ah +zI5<6AuP6UKIXHV!09q12rQHR+@ST9rBSBf&kcE~B5g<8%1b>Jt9M}6E$u>gLG5?LE +z3zCS$B6_G~d%Cw1jHG##mn=JQC}x$?Xfb6SyZ|rjz(N8+#SKr}>MbABrz3zRc2i2U +zM6i*xQFQx6!^pNY&NV(~#Bw3hUz>qV6HX_7G}n`{kwvBWg-XW7xO>|4X)b0Ddz`xr +z(Lgb#)AhxJI?KI2&)zC&du8^!;pZtv~ab-otZD0FRLylY+aW_-ep=7ik`K!KYQ=j4 +zzrhfO_i_@!xtO#qt!wB9DaJXB58BBXfc7y!d+O?!;5ObcdO;3q!ht9eUMWLvSdCql)DjRhLk67&{ERjCniA{ku7c;wy2vcwl&~ +z4XrDf97HJuI`MR!fAivzL*00#h5_-}@JXa_p^~WkFDZ+fNq&n`ej6H_BI~(O8vl3C +z>MRvC9(PEI8#&EZZ`!Rtf7BvY@e+V&dY8fTOm+=t<}1G|@;?LU8wiQPj3P`sT}{`% +zZ}G`1_hAh*O5fx~F`zofMj!cG<+{DE7+4xvN@{JL&xzC;k=;x^>=QJQ+|nCSY%~+~ +zLVj!@My=yV_1Om4UM_6&ZC}adyw7&tyaD$u#vfdbNE(!S%bBb?D7iFyIAqC*=&3ML +zjkw;9wiswS;u7b!H;@psDof{7_kYQ#W-OyC}Gm(WWe?Iv2$~MH- +zg0!C4*z}l{hQ!2eo3V!3RP(mF!c+Br^$0jk9{z!{=(iY`BEcfZhi!LU2BxNL5zvGS +z{_Tss54Ph384nQ^R>eCIvtvwpknk;~MUNQU-~5Rt*RHS4q}GmH;O~?jz4&g(O#dJl +zt>gas1B>U^a?c`17KlCJf&ucSn3HV%oy7FwS?MIhAc=eKPjM1o=N_fJH)I|>hddt% +zfx=sA92O3AVp1q6Pa-5~JtOQ9%X|ExiVYE>4uoGyz+d{qO{3(FsluJxB)!wE7@u8J +z(!*aiv%{ucC+0z+v%UuWmE?Ms0IbxTq>N}J7=%JAK)LI{kiRj7kYzqEfwKMVVVM(VxB#~nwYFq}3N}OxTmAi!B~An-$ByXo6cKRJWpz$*c8(2- +z7{v|cHK8heRK?#P2^R0Zijt#7$HHJ37sTeN_jbnpm>*e&Ar^{-WgjDNNp)HbvGn=w +zL`nE8X;GKDGokns4!8F%EaSH6q;{w~LlPj(`Uk69ET~20mkrQ4zq^v-2I~I +z^4&C(!IeVNjIy0TPGgXQdtCw#nGP`-+By^R?rHT;7DxmX=eW3?JbR={I(}T2$=nwqt +z3r*2^MGp#oMF048&0Zlo4-H$ji`H(p$-_x&EJL@7{d7(I-~&jNUJ6==m^6lICRg<>j|1I7Et=dR1~A3vJU~@=?7N$M+SiY +zmP9~}PuB!Si$}p+m_$GGsbT`AoxLfrreP60x1-!A*ZlU41p>SLVQK6XsWLBF;}M^U +z241}6079q%76N}KHN3$TKBV+x{b5YETf$JRuskvJ!1!KsBt4WM#Y?ERWTOAfM=ufj +zUS7PZ{h_1x!|4sybjJWKUqQP25AFJs`YaPl@vwj*+54B+iI+^CsU=#cn!;Z*w| +zYy^EhOb%KNC$JjReh8!4OR(uyKc-^35CFO%!l<5kbZ43fHNe@AkTw`lr}-jRAUhR4 +zVQBpd{{|DK4tRT2TAl~wzXJT>NuX>@TUH18XK@`03FoeWcV{e?H!QRwgc|YIP^T!E +z1oX~^5X&sHMg?Ftqi;GZbnDRfNW*WD=k|?k1FP3jI7?xZ3QK$?npMJYW|hxg$jH}m +zlh5XcXc-Re;0ZZ2gBJAp7+BccsuU6T%vd&ti+2fmTk`p|GrpB%5UfByGy~13Blg$&paqKwCI3fuBoE^{zc{XIm*_&h9tkAWe$BU!H +zbjg&ODjU9&%PWG}l;i{$;e5yOhAWDOyt!eia$*8SUS> +zpMeKZD4xoXkPXF?5P*Wtb!B*?9PG}eN@p()63oNV;Z@X?01!@%LRm``&Brom#(;S% +z3b9CKRr6xC0a=k0VCM)a=m|r1$uhLzQ%dYASL`aHN~%gqs(K5WO%+?4p|<12FalJv +zA(b`LUTYc@7%w$YWO`-laJ4Ngqq|VN8ycDZrDWO?*Wf1R6B2+5m*5Ww0VD1%j1@K(jDRq&>ooNtt!>68Humy$*CE+ +zS@UYEW^$|MeNOG5Yt3uj+BuqW1n2Jj8(H-aI->g +zv*Pn+<@sin<7Ny;3r?v;-Ks@1xJ5g+MfZ7&-h7L}af=a0tBF!;f)kWpyVWunqwm#v +zW4;y0V0pCBYWGH!6j5p)+_r<|s*P!Lzs7#*<>^7@cFvwVG|z0<&BG +z+$=W{vFD-QU1=xz;?;9D*#-(|OL*UNmvWA~%6knr(4C_XFQ|P`eR<p +zREN$n8lB`SScA(}{UVat#!vc#e2D^l@dgPD+@H19o%*&phEAjhFGBq3vy;z3t}>4> +zVgX7H45cImr3driNm0t*?E9J2j8UAaI+fC7^vP?==uR%LSBcgc=One1Hp8)3hhG-5zNRbhaz8<@k8R?5hqd&J5ga8Jl96EGfB|G0 +zUNK`Km06Y?wxePU@cC_~#RSN!%M6n*APerJ-PVIFEKj7C-ZpE$-rOcEYQFJz90udx +zE?ZmDr@q-RhJ6+U`93E;4`HHDfr+N{93;oWbz%=VYg^aIco&Y +zUj-acI0=VBnRNX;aD1H5v? +zWWx3CuJk+TyQxK{iK{kz>?Ba_^YteQx!m~{-lJ*U8?0QlEco1PUs2Gs6K$wz&o2~6 +z6)|nt%`eK;-_D*s5%?h>^@9yVTbU(aMLT$0 +z=tXu9FPk4}a}_L(wqWr$xrAC4r^VTXSUn9!3fjhy6-%Zjs{mdYrR`_R%0=cz=NTUU +zg+9?63GZjgrB=u$svbI6f2|qf`-dY>3U&aqmkrMN#z~YWW*wibKBBSn894>L(7LkA4`i^3`|Zn +zY3d?Vai0+QPf8FjD$%K~(O|>G#F+>$l`FuxTcF6t*Sm|%Lz`Cjq`znwfLdbxeB4Y% +zoNNfAEY9_8p`RXT1JIxjG#2Z_>4imCuD^U0z7t_PcFB?bJ_^*4{$h<5tmMkpu}?2c +z3O@(=+WB_aQ6<7>lvq^5SDXu~ewbI^o2T`76Pm=z^CjtO;}l(``%|_zRSO>DS9k+3 +z<~^e9Z}&nU1(@dHQ>JchYpbmF6nrt9z)cE>X^_DDoz0rZz? +z&HFT;TK4G9d6?d!LJ(wK@v!4%Rx_zfTpQ-=D%%L^@9Fg0uW7$kzu0j_iG_PUr%2s= +zoIe1K70=q)GtXfE%~lcbv536O&SsS3ni^a$#*QU?RGr9MOOj(D +z@31BBZ@=6jXC#eLOnA78am%JatVobM4ci+(My$Jowss0{_x8JlB|>it$i{KOJ(K0h +z{f%|J4k;G}1ld35^SnEhwI(b5a(`i8XyvdlQhKtv*#|a$;|;5MAMf&Q_+&%qfkssF +zZz#i>tKpm?4sx_K7|^5efWK$Z2`j+D5VA*KJf&xF%#@nIZlpXssK4Y3x>RJ{};+}m7+C^2Lh>k#&nZ%cy5pcphW +z(Fy!CkYp%}3@1jni +zmZ&O@X_IpiVjB;IpX@c@TyU{<9Em-WMr&kwCS;@xpbVf+!-_FCS1hM)yJUybS5Wqut7IkvXVEH +z*Yj0{U>7d{U8g}2mKttO4)Lz*rd4QPq9Ymh=w_rBJrWF%t|BQv|AAU#-10$*TR58W +zXAh{8%Ayh!i1Ac6JHDZq!W6sI;Y@TriKV|uK#7u-&zor7`*XHa*ZXx{bYtqCOB)qC +zT%VF>e{MNlOwr*Y0=R|eWK57xT85}mZ}QJ66t78Sz2<%1x-qE}y3(fQY^KaoB;+y! +z8_sJdW@^B0)2CfpVm8HIDG&+hn`0ZKZALP3w9XJ=oW@g#s$ExIPc&E$x8|O!%OkO5` +z%b2x%rDN3}j~KmSghee}iv(f#iuooLP{IZpM4 +zVhyWd?CJpBo1KI}r`}UjMX!EV=NDds7e8fhzI1kY=2m<9(e!H_e~*&2hsD|j-tK3} +zD{j^LpK_NQ&6*;qKg_;NwjW~Mee5)1zjLw=g#d)D^j!nNdH2|J@`JbQ#k^hTo$uxO +zuNB4?1g<~WQJz>*nqFK{-)~!Z`Zbx{sgZm9_eFnZHfA|axJp9x=fIGBf!MaMyfWGG +zEp;dIJ5kt@iy%=PUJ#z5^)h$jomdy}&2)w%2OKUg#h5!SJyn@s_-gjBPE%7_UHJ>X%aSI# +z@Qk#~rx~jP7Fjx`a#C5OlP7{vI>Y$ilUdd3PM4CO={d^nr}o$I%XkRsy9&I^u5wtD +zZjKvuYxB+`$&|@G-5m9LIhnJ(?R0tUwZ2bVdj2k7xzdV|;r&e0{NH(wl3vf=28JPX +zKEYiu6pBWXEK?*Z4Hq19hf$2&RMGhdF6#V>#_{G;#jO1;Y&{{v&Vf3W}n + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/bandwidthd/patches/.svn/entries b/feeds/packages/utils/bandwidthd/patches/.svn/entries +new file mode 100644 +index 0000000..a4421d5 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bandwidthd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-22T23:15:25.434522Z ++19818 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-fix_config_file_location ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++417f0265f7a99479027f209fd51d17b4 ++2008-05-09T18:46:16.972111Z ++11099 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1157 ++ ++010-dont-add-host-paths.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f9847beefe034b5c3006f84d9c6e012c ++2010-02-22T23:15:25.434522Z ++19818 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1192 ++ +diff --git a/feeds/packages/utils/bandwidthd/patches/.svn/text-base/010-dont-add-host-paths.patch.svn-base b/feeds/packages/utils/bandwidthd/patches/.svn/text-base/010-dont-add-host-paths.patch.svn-base +new file mode 100644 +index 0000000..59a5737 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/patches/.svn/text-base/010-dont-add-host-paths.patch.svn-base +@@ -0,0 +1,36 @@ ++diff --git a/configure b/configure ++index 4c2546e..e516137 100755 ++--- a/configure +++++ b/configure ++@@ -2439,11 +2439,6 @@ if test -n "$x_libraries" && test "x$x_libraries" != xNONE ; then ++ LDFLAGS="$LDFLAGS -L$x_libraries" ++ fi ++ ++-# May be equired for BSD ++-LDFLAGS="$LDFLAGS -L/usr/local/lib" ++- ++-CPPFLAGS="$CPPFLAGS -I/usr/local/include" ++- ++ #Check for Darwin sw directory ++ echo "$as_me:2448: checking for /sw/lib" >&5 ++ echo $ECHO_N "checking for /sw/lib... $ECHO_C" >&6 ++@@ -2505,9 +2500,6 @@ fi ++ fi ++ echo "$as_me:2506: result: $ac_cv_file__usr_pkg_lib" >&5 ++ echo "${ECHO_T}$ac_cv_file__usr_pkg_lib" >&6 ++-if test $ac_cv_file__usr_pkg_lib = yes; then ++- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" ++-fi ++ ++ echo "$as_me:2512: checking for /usr/pkg/include" >&5 ++ echo $ECHO_N "checking for /usr/pkg/include... $ECHO_C" >&6 ++@@ -3092,9 +3084,6 @@ fi ++ fi ++ echo "$as_me:3093: result: $ac_cv_file__usr_local_pgsql_lib" >&5 ++ echo "${ECHO_T}$ac_cv_file__usr_local_pgsql_lib" >&6 ++-if test $ac_cv_file__usr_local_pgsql_lib = yes; then ++- LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib" ++-fi ++ ++ echo "$as_me:3099: checking for /usr/local/pgsql/include" >&5 ++ echo $ECHO_N "checking for /usr/local/pgsql/include... $ECHO_C" >&6 +diff --git a/feeds/packages/utils/bandwidthd/patches/.svn/text-base/100-fix_config_file_location.svn-base b/feeds/packages/utils/bandwidthd/patches/.svn/text-base/100-fix_config_file_location.svn-base +new file mode 100644 +index 0000000..ae44cd2 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/patches/.svn/text-base/100-fix_config_file_location.svn-base +@@ -0,0 +1,31 @@ ++--- bandwidthd-2.0.1/bandwidthd.c.orig 2008-05-09 10:06:37.000000000 -0500 +++++ bandwidthd-2.0.1/bandwidthd.c 2008-05-09 10:32:54.000000000 -0500 ++@@ -255,22 +255,22 @@ ++ ++ openlog("bandwidthd", LOG_CONS, LOG_DAEMON); ++ ++- if (stat("./etc/bandwidthd.conf", &StatBuf)) +++ if (stat("/etc/bandwidthd.conf", &StatBuf)) ++ { ++ chdir(INSTALL_DIR); ++- if (stat("./etc/bandwidthd.conf", &StatBuf)) +++ if (stat("/etc/bandwidthd.conf", &StatBuf)) ++ { ++- printf("Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR); ++- syslog(LOG_ERR, "Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR); +++ printf("Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR); +++ syslog(LOG_ERR, "Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR); ++ exit(1); ++ } ++ } ++ ++- bdconfig_in = fopen("./etc/bandwidthd.conf", "rt"); +++ bdconfig_in = fopen("/etc/bandwidthd.conf", "rt"); ++ if (!bdconfig_in) ++ { ++ syslog(LOG_ERR, "Cannot open bandwidthd.conf"); ++- printf("Cannot open ./etc/bandwidthd.conf\n"); +++ printf("Cannot open /etc/bandwidthd.conf\n"); ++ exit(1); ++ } ++ bdconfig_parse(); +diff --git a/feeds/packages/utils/bandwidthd/patches/010-dont-add-host-paths.patch b/feeds/packages/utils/bandwidthd/patches/010-dont-add-host-paths.patch +new file mode 100644 +index 0000000..59a5737 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/patches/010-dont-add-host-paths.patch +@@ -0,0 +1,36 @@ ++diff --git a/configure b/configure ++index 4c2546e..e516137 100755 ++--- a/configure +++++ b/configure ++@@ -2439,11 +2439,6 @@ if test -n "$x_libraries" && test "x$x_libraries" != xNONE ; then ++ LDFLAGS="$LDFLAGS -L$x_libraries" ++ fi ++ ++-# May be equired for BSD ++-LDFLAGS="$LDFLAGS -L/usr/local/lib" ++- ++-CPPFLAGS="$CPPFLAGS -I/usr/local/include" ++- ++ #Check for Darwin sw directory ++ echo "$as_me:2448: checking for /sw/lib" >&5 ++ echo $ECHO_N "checking for /sw/lib... $ECHO_C" >&6 ++@@ -2505,9 +2500,6 @@ fi ++ fi ++ echo "$as_me:2506: result: $ac_cv_file__usr_pkg_lib" >&5 ++ echo "${ECHO_T}$ac_cv_file__usr_pkg_lib" >&6 ++-if test $ac_cv_file__usr_pkg_lib = yes; then ++- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" ++-fi ++ ++ echo "$as_me:2512: checking for /usr/pkg/include" >&5 ++ echo $ECHO_N "checking for /usr/pkg/include... $ECHO_C" >&6 ++@@ -3092,9 +3084,6 @@ fi ++ fi ++ echo "$as_me:3093: result: $ac_cv_file__usr_local_pgsql_lib" >&5 ++ echo "${ECHO_T}$ac_cv_file__usr_local_pgsql_lib" >&6 ++-if test $ac_cv_file__usr_local_pgsql_lib = yes; then ++- LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib" ++-fi ++ ++ echo "$as_me:3099: checking for /usr/local/pgsql/include" >&5 ++ echo $ECHO_N "checking for /usr/local/pgsql/include... $ECHO_C" >&6 +diff --git a/feeds/packages/utils/bandwidthd/patches/100-fix_config_file_location b/feeds/packages/utils/bandwidthd/patches/100-fix_config_file_location +new file mode 100644 +index 0000000..ae44cd2 +--- /dev/null ++++ b/feeds/packages/utils/bandwidthd/patches/100-fix_config_file_location +@@ -0,0 +1,31 @@ ++--- bandwidthd-2.0.1/bandwidthd.c.orig 2008-05-09 10:06:37.000000000 -0500 +++++ bandwidthd-2.0.1/bandwidthd.c 2008-05-09 10:32:54.000000000 -0500 ++@@ -255,22 +255,22 @@ ++ ++ openlog("bandwidthd", LOG_CONS, LOG_DAEMON); ++ ++- if (stat("./etc/bandwidthd.conf", &StatBuf)) +++ if (stat("/etc/bandwidthd.conf", &StatBuf)) ++ { ++ chdir(INSTALL_DIR); ++- if (stat("./etc/bandwidthd.conf", &StatBuf)) +++ if (stat("/etc/bandwidthd.conf", &StatBuf)) ++ { ++- printf("Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR); ++- syslog(LOG_ERR, "Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR); +++ printf("Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR); +++ syslog(LOG_ERR, "Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR); ++ exit(1); ++ } ++ } ++ ++- bdconfig_in = fopen("./etc/bandwidthd.conf", "rt"); +++ bdconfig_in = fopen("/etc/bandwidthd.conf", "rt"); ++ if (!bdconfig_in) ++ { ++ syslog(LOG_ERR, "Cannot open bandwidthd.conf"); ++- printf("Cannot open ./etc/bandwidthd.conf\n"); +++ printf("Cannot open /etc/bandwidthd.conf\n"); ++ exit(1); ++ } ++ bdconfig_parse(); +diff --git a/feeds/packages/utils/bash-completion/.svn/entries b/feeds/packages/utils/bash-completion/.svn/entries +new file mode 100644 +index 0000000..5d2aa46 +--- /dev/null ++++ b/feeds/packages/utils/bash-completion/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bash-completion ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++fa79e36c7896941c40f4b3e15cb2ef7c ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1162 ++ +diff --git a/feeds/packages/utils/bash-completion/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bash-completion/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f5c4392 +--- /dev/null ++++ b/feeds/packages/utils/bash-completion/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=bash-completion ++PKG_VERSION:=20080705 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/b/bash-completion/ ++PKG_MD5SUM:=8bc36281bb0567bc67a9083c4c5595a9 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bash-completion ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=bash completion scripts ++ DEPENDS:=+libncurses +bash ++ URL:=http://www.caliban.org/bash/ ++ PKGARCH:=all ++endef ++ ++define Package/bash-completion/description ++ bash completion extends bashs standard completion behavior ++ to achieve complex command lines with just a few keystrokes. ++endef ++ ++ ++define Build/Configure ++endef ++ ++ ++define Build/Compile ++endef ++ ++define Package/bash-completion/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bash_completion $(1)/etc/ ++endef ++ ++define Package/bash-completion/conffiles ++/etc/bash_completion ++endef ++ ++$(eval $(call BuildPackage,bash-completion)) +diff --git a/feeds/packages/utils/bash-completion/Makefile b/feeds/packages/utils/bash-completion/Makefile +new file mode 100644 +index 0000000..f5c4392 +--- /dev/null ++++ b/feeds/packages/utils/bash-completion/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=bash-completion ++PKG_VERSION:=20080705 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/b/bash-completion/ ++PKG_MD5SUM:=8bc36281bb0567bc67a9083c4c5595a9 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bash-completion ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=bash completion scripts ++ DEPENDS:=+libncurses +bash ++ URL:=http://www.caliban.org/bash/ ++ PKGARCH:=all ++endef ++ ++define Package/bash-completion/description ++ bash completion extends bashs standard completion behavior ++ to achieve complex command lines with just a few keystrokes. ++endef ++ ++ ++define Build/Configure ++endef ++ ++ ++define Build/Compile ++endef ++ ++define Package/bash-completion/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bash_completion $(1)/etc/ ++endef ++ ++define Package/bash-completion/conffiles ++/etc/bash_completion ++endef ++ ++$(eval $(call BuildPackage,bash-completion)) +diff --git a/feeds/packages/utils/bash/.svn/entries b/feeds/packages/utils/bash/.svn/entries +new file mode 100644 +index 0000000..f424653 +--- /dev/null ++++ b/feeds/packages/utils/bash/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bash ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-30T15:40:19.972061Z ++32919 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f79ba9dcd140462608bf32d38c83cf68 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1491 ++ +diff --git a/feeds/packages/utils/bash/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bash/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d877441 +--- /dev/null ++++ b/feeds/packages/utils/bash/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# Copyright (C) 2007-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:=bash ++PKG_VERSION:=4.2 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/bash ++PKG_MD5SUM:=3fb927c7c33022f1c327f14a81c0d4b0 ++ ++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/feeds/packages/utils/bash/Makefile b/feeds/packages/utils/bash/Makefile +new file mode 100644 +index 0000000..d877441 +--- /dev/null ++++ b/feeds/packages/utils/bash/Makefile +@@ -0,0 +1,65 @@ ++# ++# Copyright (C) 2007-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:=bash ++PKG_VERSION:=4.2 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/bash ++PKG_MD5SUM:=3fb927c7c33022f1c327f14a81c0d4b0 ++ ++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/feeds/packages/utils/bash/patches/.svn/entries b/feeds/packages/utils/bash/patches/.svn/entries +new file mode 100644 +index 0000000..03a1625 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/entries +@@ -0,0 +1,1082 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bash/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-30T15:40:19.972061Z ++32919 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++121-upstream-bash42-021.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++865b8e0a50c6538e06a0b417fac7396b ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1245 ++ ++103-upstream-bash42-003.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++58912ded63bc49e0b7c186191bfe1ef7 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5433 ++ ++112-upstream-bash42-012.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++73bc0718e0dfd9fda3d624d88879bf2c ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4139 ++ ++122-upstream-bash42-022.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ba2a31849e78a7fbe68c540fa5f9d57d ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1036 ++ ++104-upstream-bash42-004.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0411fc37a2e59c12a3e6393efd90d59c ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1262 ++ ++113-upstream-bash42-013.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++186f29fbb89f6b7097a0d7334c3394ac ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1095 ++ ++123-upstream-bash42-023.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++365a25ec20492234ab69a7966f98d6c4 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1369 ++ ++105-upstream-bash42-005.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++bf3eac552eda388fcf6f52b76243a973 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2942 ++ ++114-upstream-bash42-014.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++6045fce9068bfd0deca8eb5d175ce823 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1115 ++ ++124-upstream-bash42-024.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++02cf70490b9037ac3429fe3deed0cac8 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1153 ++ ++115-upstream-bash42-015.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++2ae2c9a37f90efbffedda210cc32bb5c ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1668 ++ ++002-force-internal-readline.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++048d83d123b3950b1f55668652dfef84 ++2012-02-19T18:33:26.044924Z ++30653 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++685 ++ ++106-upstream-bash42-006.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8820922223b771c48f2efb9e8d50f389 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++923 ++ ++125-upstream-bash42-025.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++764ca3a927e705861d84fadebf99d60c ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3416 ++ ++116-upstream-bash42-016.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++3b3d82f39360e5d18ae3d2543f2ff9c7 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1119 ++ ++107-upstream-bash42-007.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c877894f0f2d398f820b643530352358 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1170 ++ ++126-upstream-bash42-026.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++bdb623daecce790b1089dd441c418a2d ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1272 ++ ++117-upstream-bash42-017.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++161e49d9b8cc007e148dc492bd12fd4c ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1236 ++ ++108-upstream-bash42-008.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++05b8e3b4c32b8e51f3cc79a9dd99315d ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1887 ++ ++127-upstream-bash42-027.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f5a6735eb8386e2db7349ec1e12a7897 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1340 ++ ++118-upstream-bash42-018.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c3c6ab5e8aa71ba74a93fb58d56e775d ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1530 ++ ++109-upstream-bash42-009.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++31e65cb7f61f190579dd2a4c08d9358b ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1979 ++ ++128-upstream-bash42-028.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++87272b3e77060e2c807ca486a9a77f54 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1738 ++ ++119-upstream-bash42-019.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++50592b61cf0c67cf0498fa38889418c7 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1240 ++ ++001-compile-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c83a5e836a47da903d5f5592e98f4c79 ++2012-02-19T18:33:26.044924Z ++30653 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++619 ++ ++129-no_doc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++a99e87664fc8226c73dfb6a312ecb5e4 ++2012-07-30T15:40:19.972061Z ++32919 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++427 ++ ++101-upstream-bash42-001.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d3c11bcfa71ebba526248186f08a789a ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2552 ++ ++110-upstream-bash42-010.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++cf2abed0b721db57dfa47668f8a5c2a0 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1687 ++ ++120-upstream-bash42-020.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++6856259e785ef7f2e8dbd117c7a63672 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1367 ++ ++102-upstream-bash42-002.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++578a80f2f3a4d650f1599d036dfc45aa ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1484 ++ ++111-upstream-bash42-011.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++060b492c4b345df862844caecb3ad554 ++2012-05-16T01:36:48.983691Z ++31746 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1262 ++ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/001-compile-fix.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/001-compile-fix.patch.svn-base +new file mode 100644 +index 0000000..8f4090b +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/001-compile-fix.patch.svn-base +@@ -0,0 +1,15 @@ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -2202,7 +2202,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, 0, 255); ++ if (lstdin > 0) +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/002-force-internal-readline.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/002-force-internal-readline.patch.svn-base +new file mode 100644 +index 0000000..ecb8375 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/002-force-internal-readline.patch.svn-base +@@ -0,0 +1,24 @@ ++--- a/configure +++++ b/configure ++@@ -5748,8 +5748,7 @@ _ACEOF ++ # 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.in +++++ b/configure.in ++@@ -540,8 +540,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/feeds/packages/utils/bash/patches/.svn/text-base/101-upstream-bash42-001.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/101-upstream-bash42-001.patch.svn-base +new file mode 100644 +index 0000000..8aca815 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/101-upstream-bash42-001.patch.svn-base +@@ -0,0 +1,65 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-001 ++ ++Bug-Reported-by: Juergen Daubert ++Bug-Reference-ID: <20110214175132.GA19813@jue.netz> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html ++ ++Bug-Description: ++ ++When running in Posix mode, bash does not correctly expand the right-hand ++side of a double-quoted word expansion containing single quotes. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -1379,10 +1379,12 @@ extract_dollar_brace_string (string, sin ++ slen = strlen (string + *sindex) + *sindex; ++ ++ /* The handling of dolbrace_state needs to agree with the code in parse.y: ++- parse_matched_pair() */ ++- dolbrace_state = 0; ++- if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ++- dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; +++ parse_matched_pair(). The different initial value is to handle the +++ case where this function is called to parse the word in +++ ${param op word} (SX_WORD). */ +++ dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; +++ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) +++ dolbrace_state = DOLBRACE_QUOTE; ++ ++ i = *sindex; ++ while (c = string[i]) ++@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, ++ { ++ /* Extract the contents of the ${ ... } expansion ++ according to the Posix.2 rules. */ ++- value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); +++ value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); ++ if (string[sindex] == RBRACE) ++ sindex++; ++ else ++--- a/subst.h +++++ b/subst.h ++@@ -56,6 +56,7 @@ ++ #define SX_NOLONGJMP 0x0040 /* don't longjmp on fatal error */ ++ #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ ++ #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ +++#define SX_WORD 0x0200 /* extracting word in ${param op word} */ ++ ++ /* Remove backslashes which are quoting backquotes from STRING. Modifies ++ STRING, and returns a pointer to it. */ ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/102-upstream-bash42-002.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/102-upstream-bash42-002.patch.svn-base +new file mode 100644 +index 0000000..3756ac1 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/102-upstream-bash42-002.patch.svn-base +@@ -0,0 +1,50 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-002 ++ ++Bug-Reported-by: Clark J. Wang ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html ++ ++Bug-Description: ++ ++The readline vi-mode `cc', `dd', and `yy' commands failed to modify the ++entire line. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/lib/readline/vi_mode.c +++++ b/lib/readline/vi_mode.c ++@@ -1114,7 +1114,7 @@ rl_domove_read_callback (m) ++ rl_beg_of_line (1, c); ++ _rl_vi_last_motion = c; ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++- return (0); +++ return (vidomove_dispatch (m)); ++ } ++ #if defined (READLINE_CALLBACKS) ++ /* XXX - these need to handle rl_universal_argument bindings */ ++--- a/lib/readline/callback.c +++++ b/lib/readline/callback.c ++@@ -148,6 +148,9 @@ rl_callback_read_char () ++ eof = _rl_vi_domove_callback (_rl_vimvcxt); ++ /* Should handle everything, including cleanup, numeric arguments, ++ and turning off RL_STATE_VIMOTION */ +++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) +++ _rl_internal_char_cleanup (); +++ ++ return; ++ } ++ #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 1 +++#define PATCHLEVEL 2 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/103-upstream-bash42-003.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/103-upstream-bash42-003.patch.svn-base +new file mode 100644 +index 0000000..ad82635 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/103-upstream-bash42-003.patch.svn-base +@@ -0,0 +1,231 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-003 ++ ++Bug-Reported-by: Clark J. Wang ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html ++ ++Bug-Description: ++ ++When using the pattern replacement and pattern removal word expansions, bash ++miscalculates the possible match length in the presence of an unescaped left ++bracket without a closing right bracket, resulting in a failure to match ++the pattern. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/lib/glob/gmisc.c +++++ b/lib/glob/gmisc.c ++@@ -77,8 +77,8 @@ wmatchlen (wpat, wmax) ++ wchar_t *wpat; ++ size_t wmax; ++ { ++- wchar_t wc, *wbrack; ++- int matlen, t, in_cclass, in_collsym, in_equiv; +++ wchar_t wc; +++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; ++ ++ if (*wpat == 0) ++ return (0); ++@@ -118,58 +118,80 @@ wmatchlen (wpat, wmax) ++ break; ++ case L'[': ++ /* scan for ending `]', skipping over embedded [:...:] */ ++- wbrack = wpat; +++ bracklen = 1; ++ wc = *wpat++; ++ do ++ { ++ if (wc == 0) ++ { ++- matlen += wpat - wbrack - 1; /* incremented below */ ++- break; +++ wpat--; /* back up to NUL */ +++ matlen += bracklen; +++ goto bad_bracket; ++ } ++ else if (wc == L'\\') ++ { ++- wc = *wpat++; ++- if (*wpat == 0) ++- break; +++ /* *wpat == backslash-escaped character */ +++ bracklen++; +++ /* If the backslash or backslash-escape ends the string, +++ bail. The ++wpat skips over the backslash escape */ +++ if (*wpat == 0 || *++wpat == 0) +++ { +++ matlen += bracklen; +++ goto bad_bracket; +++ } ++ } ++ else if (wc == L'[' && *wpat == L':') /* character class */ ++ { ++ wpat++; +++ bracklen++; ++ in_cclass = 1; ++ } ++ else if (in_cclass && wc == L':' && *wpat == L']') ++ { ++ wpat++; +++ bracklen++; ++ in_cclass = 0; ++ } ++ else if (wc == L'[' && *wpat == L'.') /* collating symbol */ ++ { ++ wpat++; +++ bracklen++; ++ if (*wpat == L']') /* right bracket can appear as collating symbol */ ++- wpat++; +++ { +++ wpat++; +++ bracklen++; +++ } ++ in_collsym = 1; ++ } ++ else if (in_collsym && wc == L'.' && *wpat == L']') ++ { ++ wpat++; +++ bracklen++; ++ in_collsym = 0; ++ } ++ else if (wc == L'[' && *wpat == L'=') /* equivalence class */ ++ { ++ wpat++; +++ bracklen++; ++ if (*wpat == L']') /* right bracket can appear as equivalence class */ ++- wpat++; +++ { +++ wpat++; +++ bracklen++; +++ } ++ in_equiv = 1; ++ } ++ else if (in_equiv && wc == L'=' && *wpat == L']') ++ { ++ wpat++; +++ bracklen++; ++ in_equiv = 0; ++ } +++ else +++ bracklen++; ++ } ++ while ((wc = *wpat++) != L']'); ++ matlen++; /* bracket expression can only match one char */ +++bad_bracket: ++ break; ++ } ++ } ++@@ -213,8 +235,8 @@ umatchlen (pat, max) ++ char *pat; ++ size_t max; ++ { ++- char c, *brack; ++- int matlen, t, in_cclass, in_collsym, in_equiv; +++ char c; +++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; ++ ++ if (*pat == 0) ++ return (0); ++@@ -254,58 +276,80 @@ umatchlen (pat, max) ++ break; ++ case '[': ++ /* scan for ending `]', skipping over embedded [:...:] */ ++- brack = pat; +++ bracklen = 1; ++ c = *pat++; ++ do ++ { ++ if (c == 0) ++ { ++- matlen += pat - brack - 1; /* incremented below */ ++- break; +++ pat--; /* back up to NUL */ +++ matlen += bracklen; +++ goto bad_bracket; ++ } ++ else if (c == '\\') ++ { ++- c = *pat++; ++- if (*pat == 0) ++- break; +++ /* *pat == backslash-escaped character */ +++ bracklen++; +++ /* If the backslash or backslash-escape ends the string, +++ bail. The ++pat skips over the backslash escape */ +++ if (*pat == 0 || *++pat == 0) +++ { +++ matlen += bracklen; +++ goto bad_bracket; +++ } ++ } ++ else if (c == '[' && *pat == ':') /* character class */ ++ { ++ pat++; +++ bracklen++; ++ in_cclass = 1; ++ } ++ else if (in_cclass && c == ':' && *pat == ']') ++ { ++ pat++; +++ bracklen++; ++ in_cclass = 0; ++ } ++ else if (c == '[' && *pat == '.') /* collating symbol */ ++ { ++ pat++; +++ bracklen++; ++ if (*pat == ']') /* right bracket can appear as collating symbol */ ++- pat++; +++ { +++ pat++; +++ bracklen++; +++ } ++ in_collsym = 1; ++ } ++ else if (in_collsym && c == '.' && *pat == ']') ++ { ++ pat++; +++ bracklen++; ++ in_collsym = 0; ++ } ++ else if (c == '[' && *pat == '=') /* equivalence class */ ++ { ++ pat++; +++ bracklen++; ++ if (*pat == ']') /* right bracket can appear as equivalence class */ ++- pat++; +++ { +++ pat++; +++ bracklen++; +++ } ++ in_equiv = 1; ++ } ++ else if (in_equiv && c == '=' && *pat == ']') ++ { ++ pat++; +++ bracklen++; ++ in_equiv = 0; ++ } +++ else +++ bracklen++; ++ } ++ while ((c = *pat++) != ']'); ++ matlen++; /* bracket expression can only match one char */ +++bad_bracket: ++ break; ++ } ++ } ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/104-upstream-bash42-004.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/104-upstream-bash42-004.patch.svn-base +new file mode 100644 +index 0000000..e353c5b +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/104-upstream-bash42-004.patch.svn-base +@@ -0,0 +1,40 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-004 ++ ++Bug-Reported-by: Mike Frysinger ++Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html ++ ++Bug-Description: ++ ++When used in contexts where word splitting and quote removal were not ++performed, such as pattern removal or pattern substitution, empty strings ++(either literal or resulting from quoted variables that were unset or ++null) were not matched correctly, resulting in failure. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -3373,7 +3373,7 @@ expand_string_for_rhs (string, quoted, d ++ if (string == 0 || *string == '\0') ++ return (WORD_LIST *)NULL; ++ ++- td.flags = 0; +++ td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ ++ td.word = string; ++ tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); ++ return (tresult); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/105-upstream-bash42-005.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/105-upstream-bash42-005.patch.svn-base +new file mode 100644 +index 0000000..5df63c7 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/105-upstream-bash42-005.patch.svn-base +@@ -0,0 +1,114 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-005 ++ ++Bug-Reported-by: Dennis Williamson ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html ++ ++Bug-Description: ++ ++Systems that use tzset() to set the local timezone require the TZ variable ++to be in the environment. Bash must make sure the environment has been ++modified with any updated value for TZ before calling tzset(). This ++affects prompt string expansions and the `%T' printf conversion specification ++on systems that do not allow bash to supply a replacement for getenv(3). ++ ++Patch (apply with `patch -p0'): ++ ++--- a/variables.h +++++ b/variables.h ++@@ -313,6 +313,7 @@ extern void set_func_auto_export __P((co ++ ++ extern void sort_variables __P((SHELL_VAR **)); ++ +++extern int chkexport __P((char *)); ++ extern void maybe_make_export_env __P((void)); ++ extern void update_export_env_inplace __P((char *, int, char *)); ++ extern void put_command_name_into_env __P((char *)); ++--- a/variables.c +++++ b/variables.c ++@@ -3653,6 +3653,22 @@ n_shell_variables () ++ return n; ++ } ++ +++int +++chkexport (name) +++ char *name; +++{ +++ SHELL_VAR *v; +++ +++ v = find_variable (name); +++ if (exported_p (v)) +++ { +++ array_needs_making = 1; +++ maybe_make_export_env (); +++ return 1; +++ } +++ return 0; +++} +++ ++ void ++ maybe_make_export_env () ++ { ++@@ -4214,7 +4230,7 @@ static struct name_and_function special_ ++ { "TEXTDOMAIN", sv_locale }, ++ { "TEXTDOMAINDIR", sv_locale }, ++ ++-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) +++#if defined (HAVE_TZSET) ++ { "TZ", sv_tz }, ++ #endif ++ ++@@ -4558,12 +4574,13 @@ sv_histtimefmt (name) ++ } ++ #endif /* HISTORY */ ++ ++-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) +++#if defined (HAVE_TZSET) ++ void ++ sv_tz (name) ++ char *name; ++ { ++- tzset (); +++ if (chkexport (name)) +++ tzset (); ++ } ++ #endif ++ ++--- a/parse.y +++++ b/parse.y ++@@ -5135,6 +5135,9 @@ decode_prompt_string (string) ++ case 'A': ++ /* Make the current time/date into a string. */ ++ (void) time (&the_time); +++#if defined (HAVE_TZSET) +++ sv_tz ("TZ"); /* XXX -- just make sure */ +++#endif ++ tm = localtime (&the_time); ++ ++ if (c == 'd') ++--- a/builtins/printf.def +++++ b/builtins/printf.def ++@@ -465,6 +465,9 @@ printf_builtin (list) ++ secs = shell_start_time; /* roughly $SECONDS */ ++ else ++ secs = arg; +++#if defined (HAVE_TZSET) +++ sv_tz ("TZ"); /* XXX -- just make sure */ +++#endif ++ tm = localtime (&secs); ++ n = strftime (timebuf, sizeof (timebuf), timefmt, tm); ++ free (timefmt); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/106-upstream-bash42-006.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/106-upstream-bash42-006.patch.svn-base +new file mode 100644 +index 0000000..89c887e +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/106-upstream-bash42-006.patch.svn-base +@@ -0,0 +1,37 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-006 ++ ++Bug-Reported-by: Allan McRae ++Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html ++ ++Bug-Description: ++ ++A problem with bash42-005 caused it to dump core if TZ was unset. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/variables.c +++++ b/variables.c ++@@ -3660,7 +3660,7 @@ chkexport (name) ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++- if (exported_p (v)) +++ if (v && exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_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 5 +++#define PATCHLEVEL 6 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/107-upstream-bash42-007.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/107-upstream-bash42-007.patch.svn-base +new file mode 100644 +index 0000000..7587195 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/107-upstream-bash42-007.patch.svn-base +@@ -0,0 +1,39 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-007 ++ ++Bug-Reported-by: Matthias Klose ++Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html ++ ++Bug-Description: ++ ++When used in contexts where word splitting and quote removal were not ++performed, such as case statement word expansion, empty strings ++(either literal or resulting from quoted variables that were unset or ++null) were not expanded correctly, resulting in failure. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -4609,6 +4609,7 @@ expand_word_unsplit (word, quoted) ++ if (ifs_firstc == 0) ++ #endif ++ word->flags |= W_NOSPLIT; +++ word->flags |= W_NOSPLIT2; ++ result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); ++ expand_no_split_dollar_star = 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 6 +++#define PATCHLEVEL 7 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/108-upstream-bash42-008.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/108-upstream-bash42-008.patch.svn-base +new file mode 100644 +index 0000000..29493b5 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/108-upstream-bash42-008.patch.svn-base +@@ -0,0 +1,65 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-008 ++ ++Bug-Reported-by: Doug McMahon ++Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html ++ ++Bug-Description: ++ ++Bash-4.2 does not attempt to save the shell history on receipt of a ++terminating signal that is handled synchronously. Unfortunately, the ++`close' button on most X11 terminal emulators sends SIGHUP, which ++kills the shell. ++ ++This is a very small patch to save the history in the case that an ++interactive shell receives a SIGHUP or SIGTERM while in readline and ++reading a command. ++ ++The next version of bash will do this differently. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/sig.c +++++ b/sig.c ++@@ -46,6 +46,7 @@ ++ ++ #if defined (READLINE) ++ # include "bashline.h" +++# include ++ #endif ++ ++ #if defined (HISTORY) ++@@ -62,6 +63,7 @@ extern int parse_and_execute_level, shel ++ #if defined (HISTORY) ++ extern int history_lines_this_session; ++ #endif +++extern int no_line_editing; ++ ++ extern void initialize_siglist (); ++ ++@@ -505,7 +507,10 @@ termsig_sighandler (sig) ++ { ++ #if defined (HISTORY) ++ /* XXX - will inhibit history file being written */ ++- history_lines_this_session = 0; +++# if defined (READLINE) +++ if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) +++# endif +++ history_lines_this_session = 0; ++ #endif ++ terminate_immediately = 0; ++ termsig_handler (sig); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/109-upstream-bash42-009.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/109-upstream-bash42-009.patch.svn-base +new file mode 100644 +index 0000000..d05f499 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/109-upstream-bash42-009.patch.svn-base +@@ -0,0 +1,65 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-009 ++ ++Bug-Reported-by: ++Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html ++ ++Bug-Description: ++ ++Under certain circumstances, running `fc -l' two times in succession with a ++relative history offset at the end of the history will result in an incorrect ++calculation of the last history entry and a seg fault. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/fc.def +++++ b/builtins/fc.def ++@@ -304,7 +304,7 @@ fc_builtin (list) ++ last_hist = i - rh - hist_last_line_added; ++ ++ /* XXX */ ++- if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) +++ if (i == last_hist && hlist[last_hist] == 0) ++ while (last_hist >= 0 && hlist[last_hist] == 0) ++ last_hist--; ++ if (last_hist < 0) ++@@ -475,7 +475,7 @@ fc_gethnum (command, hlist) ++ HIST_ENTRY **hlist; ++ { ++ int sign, n, clen, rh; ++- register int i, j; +++ register int i, j, last_hist; ++ register char *s; ++ ++ sign = 1; ++@@ -495,7 +495,15 @@ fc_gethnum (command, hlist) ++ has been enabled (interactive or not) should use it in the last_hist ++ calculation as if it were on. */ ++ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); ++- i -= rh + hist_last_line_added; +++ last_hist = i - rh - hist_last_line_added; +++ +++ if (i == last_hist && hlist[last_hist] == 0) +++ while (last_hist >= 0 && hlist[last_hist] == 0) +++ last_hist--; +++ if (last_hist < 0) +++ return (-1); +++ +++ i = last_hist; ++ ++ /* No specification defaults to most recent command. */ ++ if (command == NULL) ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/110-upstream-bash42-010.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/110-upstream-bash42-010.patch.svn-base +new file mode 100644 +index 0000000..06cdb61 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/110-upstream-bash42-010.patch.svn-base +@@ -0,0 +1,56 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-010 ++ ++Bug-Reported-by: Mike Frysinger ++Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html ++ ++Bug-Description: ++ ++Bash did not correctly print/reproduce here documents attached to commands ++inside compound commands such as arithmetic for loops and user-specified ++subshells. This affected the execution of such commands inside a shell ++function when the function definition is saved and later restored using ++`.' or `eval'. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/print_cmd.c +++++ b/print_cmd.c ++@@ -315,6 +315,7 @@ make_command_string_internal (command) ++ cprintf ("( "); ++ skip_this_indent++; ++ make_command_string_internal (command->value.Subshell->command); +++ PRINT_DEFERRED_HEREDOCS (""); ++ cprintf (" )"); ++ break; ++ ++@@ -592,6 +593,7 @@ print_arith_for_command (arith_for_comma ++ newline ("do\n"); ++ indentation += indentation_amount; ++ make_command_string_internal (arith_for_command->action); +++ PRINT_DEFERRED_HEREDOCS (""); ++ semicolon (); ++ indentation -= indentation_amount; ++ newline ("done"); ++@@ -653,6 +655,7 @@ print_group_command (group_command) ++ } ++ ++ make_command_string_internal (group_command->command); +++ PRINT_DEFERRED_HEREDOCS (""); ++ ++ if (inside_function_def) ++ { ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/111-upstream-bash42-011.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/111-upstream-bash42-011.patch.svn-base +new file mode 100644 +index 0000000..bb84a8d +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/111-upstream-bash42-011.patch.svn-base +@@ -0,0 +1,41 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-011 ++ ++Bug-Reported-by: "David Parks" ++Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html ++ ++Bug-Description: ++ ++Overwriting a value in an associative array causes the memory allocated to ++store the key on the second and subsequent assignments to leak. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/assoc.c +++++ b/assoc.c ++@@ -77,6 +77,11 @@ assoc_insert (hash, key, value) ++ b = hash_search (key, hash, HASH_CREATE); ++ if (b == 0) ++ return -1; +++ /* If we are overwriting an existing element's value, we're not going to +++ use the key. Nothing in the array assignment code path frees the key +++ string, so we can free it here to avoid a memory leak. */ +++ if (b->key != key) +++ free (key); ++ FREE (b->data); ++ b->data = value ? savestring (value) : (char *)0; ++ return (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/feeds/packages/utils/bash/patches/.svn/text-base/112-upstream-bash42-012.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/112-upstream-bash42-012.patch.svn-base +new file mode 100644 +index 0000000..697ed1a +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/112-upstream-bash42-012.patch.svn-base +@@ -0,0 +1,145 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-012 ++ ++Bug-Reported-by: Rui Santos ++Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html ++ ++Bug-Description: ++ ++When calling the parser to recursively parse a command substitution within ++an arithmetic expansion, the shell overwrote the saved shell input line and ++associated state, resulting in a garbled command. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/parse.y +++++ b/parse.y ++@@ -3842,6 +3842,7 @@ xparse_dolparen (base, string, indp, fla ++ int flags; ++ { ++ sh_parser_state_t ps; +++ sh_input_line_state_t ls; ++ int orig_ind, nc, sflags; ++ char *ret, *s, *ep, *ostring; ++ ++@@ -3849,10 +3850,12 @@ xparse_dolparen (base, string, indp, fla ++ orig_ind = *indp; ++ ostring = string; ++ +++/*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ ++ sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; ++ if (flags & SX_NOLONGJMP) ++ sflags |= SEVAL_NOLONGJMP; ++ save_parser_state (&ps); +++ save_input_line_state (&ls); ++ ++ /*(*/ ++ parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/ ++@@ -3861,6 +3864,8 @@ xparse_dolparen (base, string, indp, fla ++ ++ restore_parser_state (&ps); ++ reset_parser (); +++ /* reset_parser clears shell_input_line and associated variables */ +++ restore_input_line_state (&ls); ++ if (interactive) ++ token_to_read = 0; ++ ++@@ -5908,6 +5913,12 @@ save_parser_state (ps) ++ ps->expand_aliases = expand_aliases; ++ ps->echo_input_at_read = echo_input_at_read; ++ +++ ps->token = token; +++ ps->token_buffer_size = token_buffer_size; +++ /* Force reallocation on next call to read_token_word */ +++ token = 0; +++ token_buffer_size = 0; +++ ++ return (ps); ++ } ++ ++@@ -5949,6 +5960,42 @@ restore_parser_state (ps) ++ ++ expand_aliases = ps->expand_aliases; ++ echo_input_at_read = ps->echo_input_at_read; +++ +++ FREE (token); +++ token = ps->token; +++ token_buffer_size = ps->token_buffer_size; +++} +++ +++sh_input_line_state_t * +++save_input_line_state (ls) +++ sh_input_line_state_t *ls; +++{ +++ if (ls == 0) +++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); +++ if (ls == 0) +++ return ((sh_input_line_state_t *)NULL); +++ +++ ls->input_line = shell_input_line; +++ ls->input_line_size = shell_input_line_size; +++ ls->input_line_len = shell_input_line_len; +++ ls->input_line_index = shell_input_line_index; +++ +++ /* force reallocation */ +++ shell_input_line = 0; +++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; +++} +++ +++void +++restore_input_line_state (ls) +++ sh_input_line_state_t *ls; +++{ +++ FREE (shell_input_line); +++ shell_input_line = ls->input_line; +++ shell_input_line_size = ls->input_line_size; +++ shell_input_line_len = ls->input_line_len; +++ shell_input_line_index = ls->input_line_index; +++ +++ set_line_mbstate (); ++ } ++ ++ /************************************************ ++--- a/shell.h +++++ b/shell.h ++@@ -136,6 +136,9 @@ typedef struct _sh_parser_state_t { ++ int parser_state; ++ int *token_state; ++ +++ char *token; +++ int token_buffer_size; +++ ++ /* input line state -- line number saved elsewhere */ ++ int input_line_terminator; ++ int eof_encountered; ++@@ -166,6 +169,16 @@ typedef struct _sh_parser_state_t { ++ ++ } sh_parser_state_t; ++ +++typedef struct _sh_input_line_state_t { +++ char *input_line; +++ int input_line_index; +++ int input_line_size; +++ int input_line_len; +++} sh_input_line_state_t; +++ ++ /* Let's try declaring these here. */ ++ extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); ++ extern void restore_parser_state __P((sh_parser_state_t *)); +++ +++extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); +++extern void restore_input_line_state __P((sh_input_line_state_t *)); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/113-upstream-bash42-013.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/113-upstream-bash42-013.patch.svn-base +new file mode 100644 +index 0000000..aee78a2 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/113-upstream-bash42-013.patch.svn-base +@@ -0,0 +1,43 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-013 ++ ++Bug-Reported-by: Marten Wikstrom ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html ++ ++Bug-Description: ++ ++An off-by-one error caused the shell to skip over CTLNUL characters, ++which are used internally to mark quoted null strings. The effect ++was to have stray 0x7f characters left after expanding words like ++""""""""aa. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -3706,7 +3706,10 @@ remove_quoted_nulls (string) ++ break; ++ } ++ else if (string[i] == CTLNUL) ++- i++; +++ { +++ i++; +++ continue; +++ } ++ ++ prev_i = i; ++ ADVANCE_CHAR (string, slen, i); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/114-upstream-bash42-014.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/114-upstream-bash42-014.patch.svn-base +new file mode 100644 +index 0000000..dfbc990 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/114-upstream-bash42-014.patch.svn-base +@@ -0,0 +1,38 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-014 ++ ++Bug-Reported-by: Shawn Bohrer ++Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html ++ ++Bug-Description: ++ ++The regular expression matching operator did not correctly match ++expressions with an embedded ^A. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/pathexp.c +++++ b/pathexp.c ++@@ -196,7 +196,7 @@ quote_string_for_globbing (pathname, qfl ++ { ++ if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') ++ continue; ++- if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) +++ if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) ++ continue; ++ temp[j++] = '\\'; ++ i++; ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/115-upstream-bash42-015.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/115-upstream-bash42-015.patch.svn-base +new file mode 100644 +index 0000000..49c7a82 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/115-upstream-bash42-015.patch.svn-base +@@ -0,0 +1,71 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-015 ++ ++Bug-Reported-by: ++Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html ++ ++Bug-Description: ++ ++When in a context where arithmetic evaluation is not taking place, the ++evaluator should not check for division by 0. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/expr.c +++++ b/expr.c ++@@ -476,19 +476,23 @@ expassign () ++ ++ if (special) ++ { +++ if ((op == DIV || op == MOD) && value == 0) +++ { +++ if (noeval == 0) +++ evalerror (_("division by 0")); +++ else +++ value = 1; +++ } +++ ++ switch (op) ++ { ++ case MUL: ++ lvalue *= value; ++ break; ++ case DIV: ++- if (value == 0) ++- evalerror (_("division by 0")); ++ lvalue /= value; ++ break; ++ case MOD: ++- if (value == 0) ++- evalerror (_("division by 0")); ++ lvalue %= value; ++ break; ++ case PLUS: ++@@ -804,7 +808,12 @@ exp2 () ++ val2 = exppower (); ++ ++ if (((op == DIV) || (op == MOD)) && (val2 == 0)) ++- evalerror (_("division by 0")); +++ { +++ if (noeval == 0) +++ evalerror (_("division by 0")); +++ else +++ val2 = 1; +++ } ++ ++ if (op == MUL) ++ val1 *= val2; ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/116-upstream-bash42-016.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/116-upstream-bash42-016.patch.svn-base +new file mode 100644 +index 0000000..0848cfc +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/116-upstream-bash42-016.patch.svn-base +@@ -0,0 +1,37 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-016 ++ ++Bug-Reported-by: Martin von Gagern ++Bug-Reference-ID: <4E43AD9E.8060501@gmx.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html ++ ++Bug-Description: ++ ++Bash should not check for mail while executing the `eval' builtin. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/parse.y +++++ b/parse.y ++@@ -2499,7 +2499,7 @@ yylex () ++ We do this only if it is time to do so. Notice that only here ++ is the mail alarm reset; nothing takes place in check_mail () ++ except the checking of mail. Please don't change this. */ ++- if (prompt_is_ps1 && time_to_check_mail ()) +++ if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) ++ { ++ check_mail (); ++ reset_mail_timer (); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/117-upstream-bash42-017.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/117-upstream-bash42-017.patch.svn-base +new file mode 100644 +index 0000000..90f71c6 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/117-upstream-bash42-017.patch.svn-base +@@ -0,0 +1,42 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-017 ++ ++Bug-Reported-by: Curtis Doty ++Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html ++ ++Bug-Description: ++ ++Using `read -a foo' where foo was an already-declared associative array ++caused the shell to die with a segmentation fault. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/read.def +++++ b/builtins/read.def ++@@ -642,6 +642,12 @@ assign_vars: ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* readonly or noassign */ ++ } +++ if (assoc_p (var)) +++ { +++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); +++ xfree (input_string); +++ return EXECUTION_FAILURE; /* existing associative array */ +++ } ++ array_flush (array_cell (var)); ++ ++ alist = list_string (input_string, ifs_chars, 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 16 +++#define PATCHLEVEL 17 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/118-upstream-bash42-018.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/118-upstream-bash42-018.patch.svn-base +new file mode 100644 +index 0000000..82654c8 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/118-upstream-bash42-018.patch.svn-base +@@ -0,0 +1,57 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-018 ++ ++Bug-Reported-by: Thomas Cort ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html ++ ++Bug-Description: ++ ++Bash fails to compile unless JOB_CONTROL is defined. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -2196,6 +2196,7 @@ execute_pipeline (command, asynchronous, ++ if (ignore_return && cmd) ++ cmd->flags |= CMD_IGNORE_RETURN; ++ +++#if defined (JOB_CONTROL) ++ lastpipe_flag = 0; ++ begin_unwind_frame ("lastpipe-exec"); ++ lstdin = -1; ++@@ -2219,15 +2220,19 @@ execute_pipeline (command, asynchronous, ++ lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL); /* XXX */ ++ add_unwind_protect (lastpipe_cleanup, lastpipe_jid); ++ } ++- cmd->flags |= CMD_LASTPIPE; +++ if (cmd) +++ cmd->flags |= CMD_LASTPIPE; ++ } ++ if (prev >= 0) ++ add_unwind_protect (close, prev); +++#endif ++ ++ exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); ++ +++#if defined (JOB_CONTROL) ++ if (lstdin > 0) ++ restore_stdin (lstdin); +++#endif ++ ++ if (prev >= 0) ++ close (prev); ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/119-upstream-bash42-019.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/119-upstream-bash42-019.patch.svn-base +new file mode 100644 +index 0000000..215ae67 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/119-upstream-bash42-019.patch.svn-base +@@ -0,0 +1,42 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-019 ++ ++Bug-Reported-by: Diego Augusto Molina ++Bug-Reference-ID: ++Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html ++ ++Bug-Description: ++ ++Using `declare' with attributes and an invalid array variable name or ++assignment reference resulted in a segmentation fault instead of a ++declaration error. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/declare.def +++++ b/builtins/declare.def ++@@ -513,6 +513,11 @@ declare_internal (list, local_var) ++ *subscript_start = '['; /* ] */ ++ var = assign_array_element (name, value, 0); /* XXX - not aflags */ ++ *subscript_start = '\0'; +++ if (var == 0) /* some kind of assignment error */ +++ { +++ assign_error++; +++ NEXT_VARIABLE (); +++ } ++ } ++ else if (simple_array_assign) ++ { ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/120-upstream-bash42-020.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/120-upstream-bash42-020.patch.svn-base +new file mode 100644 +index 0000000..a91c950 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/120-upstream-bash42-020.patch.svn-base +@@ -0,0 +1,47 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-020 ++ ++Bug-Reported-by: Vincent Sheffer ++Bug-Reference-ID: ++Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html ++ ++Bug-Description: ++ ++The shared object helper script needs to be updated for Mac OS X 10.7 ++(Lion, darwin11). ++ ++Patch (apply with `patch -p0'): ++ ++--- a/support/shobj-conf +++++ b/support/shobj-conf ++@@ -157,7 +157,7 @@ freebsd[4-9]*|freebsdelf*|dragonfly*) ++ ;; ++ ++ # Darwin/MacOS X ++-darwin[89]*|darwin10*) +++darwin[89]*|darwin1[012]*) ++ SHOBJ_STATUS=supported ++ SHLIB_STATUS=supported ++ ++@@ -186,7 +186,7 @@ darwin*|macosx*) ++ SHLIB_LIBSUFF='dylib' ++ ++ case "${host_os}" in ++- darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' +++ darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' ++ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ++ ;; ++ *) SHOBJ_LDFLAGS='-dynamic' ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/121-upstream-bash42-021.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/121-upstream-bash42-021.patch.svn-base +new file mode 100644 +index 0000000..38c3ae4 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/121-upstream-bash42-021.patch.svn-base +@@ -0,0 +1,48 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-021 ++ ++Bug-Reported-by: Dan Douglas ++Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html ++ ++Bug-Description: ++ ++Using `read -N' to assign values to an array can result in NUL values being ++assigned to some array elements. These values cause seg faults when referenced ++later. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/read.def +++++ b/builtins/read.def ++@@ -737,7 +737,7 @@ assign_vars: ++ xfree (t1); ++ } ++ else ++- var = bind_read_variable (varname, t); +++ var = bind_read_variable (varname, t ? t : ""); ++ } ++ else ++ { ++@@ -798,7 +798,7 @@ assign_vars: ++ xfree (t); ++ } ++ else ++- var = bind_read_variable (list->word->word, input_string); +++ var = bind_read_variable (list->word->word, input_string ? input_string : ""); ++ ++ if (var) ++ { ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/122-upstream-bash42-022.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/122-upstream-bash42-022.patch.svn-base +new file mode 100644 +index 0000000..30020ba +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/122-upstream-bash42-022.patch.svn-base +@@ -0,0 +1,46 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-022 ++ ++Bug-Reported-by: Gregory Margo ++Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html ++ ++Bug-Description: ++ ++The return value from lseek is `off_t'. This can cause corrupted return ++values when the file offset is greater than 2**31 - 1. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/lib/sh/zread.c +++++ b/lib/sh/zread.c ++@@ -160,14 +160,13 @@ void ++ zsyncfd (fd) ++ int fd; ++ { ++- off_t off; ++- int r; +++ off_t off, r; ++ ++ off = lused - lind; ++ r = 0; ++ if (off > 0) ++ r = lseek (fd, -off, SEEK_CUR); ++ ++- if (r >= 0) +++ if (r != -1) ++ lused = lind = 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 21 +++#define PATCHLEVEL 22 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/123-upstream-bash42-023.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/123-upstream-bash42-023.patch.svn-base +new file mode 100644 +index 0000000..6c6fdb3 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/123-upstream-bash42-023.patch.svn-base +@@ -0,0 +1,53 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-023 ++ ++Bug-Reported-by: Ewan Mellor ++Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> ++Bug-Reference-URL: ++ ++Bug-Description: ++ ++Under some circumstances, an exit trap triggered by a bad substitution ++error when errexit is enabled will cause the shell to exit with an ++incorrect exit status (0). ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp, ++ default: ++ case '\0': ++ bad_substitution: +++ last_command_exit_value = EXECUTION_FAILURE; ++ report_error (_("%s: bad substitution"), string ? string : "??"); ++ FREE (value); ++ FREE (temp); ++--- a/error.c +++++ b/error.c ++@@ -200,7 +200,11 @@ report_error (format, va_alist) ++ ++ va_end (args); ++ if (exit_immediately_on_error) ++- exit_shell (1); +++ { +++ if (last_command_exit_value == 0) +++ last_command_exit_value = 1; +++ exit_shell (last_command_exit_value); +++ } ++ } ++ ++ void ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/124-upstream-bash42-024.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/124-upstream-bash42-024.patch.svn-base +new file mode 100644 +index 0000000..2137c02 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/124-upstream-bash42-024.patch.svn-base +@@ -0,0 +1,40 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-024 ++ ++Bug-Reported-by: Jim Avera ++Bug-Reference-ID: <4F29E07A.80405@yahoo.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html ++ ++Bug-Description: ++ ++When `printf -v' is used to set an array element, the format string contains ++`%b', and the corresponding argument is the empty string, the buffer used ++to store the value to be assigned can be NULL, which results in NUL being ++assigned to the array element. This causes a seg fault when it's used later. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/printf.def +++++ b/builtins/printf.def ++@@ -255,6 +255,8 @@ printf_builtin (list) ++ #endif ++ { ++ vflag = 1; +++ if (vbsize == 0) +++ vbuf = xmalloc (vbsize = 16); ++ vblen = 0; ++ if (vbuf) ++ vbuf[0] = 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 23 +++#define PATCHLEVEL 24 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/.svn/text-base/125-upstream-bash42-025.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/125-upstream-bash42-025.patch.svn-base +new file mode 100644 +index 0000000..3983ff5 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/125-upstream-bash42-025.patch.svn-base +@@ -0,0 +1,111 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-025 ++ ++Bug-Reported-by: Bill Gradwohl ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html ++ ++Bug-Description: ++ ++When used in a shell function, `declare -g -a array=(compound assignment)' ++creates a local variable instead of a global one. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/command.h +++++ b/command.h ++@@ -97,6 +97,7 @@ enum command_type { cm_for, cm_case, cm_ ++ #define W_HASCTLESC 0x200000 /* word contains literal CTLESC characters */ ++ #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ ++ #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ +++#define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ ++ ++ /* Possible values for subshell_environment */ ++ #define SUBSHELL_ASYNC 0x01 /* subshell caused by `command &' */ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -3584,13 +3584,13 @@ fix_assignment_words (words) ++ { ++ WORD_LIST *w; ++ struct builtin *b; ++- int assoc; +++ int assoc, global; ++ ++ if (words == 0) ++ return; ++ ++ b = 0; ++- assoc = 0; +++ assoc = global = 0; ++ ++ for (w = words; w; w = w->next) ++ if (w->word->flags & W_ASSIGNMENT) ++@@ -3607,12 +3607,17 @@ fix_assignment_words (words) ++ #if defined (ARRAY_VARS) ++ if (assoc) ++ w->word->flags |= W_ASSIGNASSOC; +++ if (global) +++ w->word->flags |= W_ASSNGLOBAL; ++ #endif ++ } ++ #if defined (ARRAY_VARS) ++ /* Note that we saw an associative array option to a builtin that takes ++ assignment statements. This is a bit of a kludge. */ ++- else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) +++ else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) +++#else +++ else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) +++#endif ++ { ++ if (b == 0) ++ { ++@@ -3622,10 +3627,11 @@ fix_assignment_words (words) ++ else if (b && (b->flags & ASSIGNMENT_BUILTIN)) ++ words->word->flags |= W_ASSNBLTIN; ++ } ++- if (words->word->flags & W_ASSNBLTIN) +++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) ++ assoc = 1; +++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) +++ global = 1; ++ } ++-#endif ++ } ++ ++ /* Return 1 if the file found by searching $PATH for PATHNAME, defaulting ++--- a/subst.c +++++ b/subst.c ++@@ -366,6 +366,11 @@ dump_word_flags (flags) ++ f &= ~W_ASSNBLTIN; ++ fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); ++ } +++ if (f & W_ASSNGLOBAL) +++ { +++ f &= ~W_ASSNGLOBAL; +++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); +++ } ++ if (f & W_COMPASSIGN) ++ { ++ f &= ~W_COMPASSIGN; ++@@ -2803,7 +2808,7 @@ do_assignment_internal (word, expand) ++ } ++ else if (assign_list) ++ { ++- if (word->flags & W_ASSIGNARG) +++ if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) ++ aflags |= ASS_MKLOCAL; ++ if (word->flags & W_ASSIGNASSOC) ++ aflags |= ASS_MKASSOC; ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/126-upstream-bash42-026.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/126-upstream-bash42-026.patch.svn-base +new file mode 100644 +index 0000000..b0efc0c +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/126-upstream-bash42-026.patch.svn-base +@@ -0,0 +1,48 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-026 ++ ++Bug-Reported-by: Greg Wooledge ++Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html ++ ++Bug-Description: ++ ++The `lastpipe' option does not behave correctly on machines where the ++open file limit is less than 256. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -2209,7 +2209,7 @@ execute_pipeline (command, asynchronous, ++ #endif ++ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) ++ { ++- lstdin = move_to_high_fd (0, 0, 255); +++ lstdin = move_to_high_fd (0, 1, -1); ++ if (lstdin > 0) ++ { ++ do_piping (prev, pipe_out); ++@@ -2255,7 +2255,9 @@ execute_pipeline (command, asynchronous, ++ unfreeze_jobs_list (); ++ } ++ +++#if defined (JOB_CONTROL) ++ discard_unwind_frame ("lastpipe-exec"); +++#endif ++ ++ return (exec_result); ++ } ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/127-upstream-bash42-027.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/127-upstream-bash42-027.patch.svn-base +new file mode 100644 +index 0000000..525abe0 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/127-upstream-bash42-027.patch.svn-base +@@ -0,0 +1,38 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-027 ++ ++Bug-Reported-by: Mike Frysinger ++Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html ++ ++Bug-Description: ++ ++When the `extglob' shell option is enabled, pattern substitution does not ++work correctly in the presence of multibyte characters. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -4166,7 +4166,7 @@ match_wpattern (wstring, indices, wstrle ++ simple = (wpat[0] != L'\\' && wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'['); ++ #if defined (EXTENDED_GLOB) ++ if (extended_glob) ++- simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ +++ simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ ++ #endif ++ ++ /* If the pattern doesn't match anywhere in the string, go ahead and ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/128-upstream-bash42-028.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/128-upstream-bash42-028.patch.svn-base +new file mode 100644 +index 0000000..8b5b1b2 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/128-upstream-bash42-028.patch.svn-base +@@ -0,0 +1,46 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-028 ++ ++Bug-Reported-by: Mark Edgar ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html ++ ++Bug-Description: ++ ++When using a word expansion for which the right hand side is evaluated, ++certain expansions of quoted null strings include spurious ^? characters. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -5809,6 +5809,16 @@ parameter_brace_expand_rhs (name, value, ++ is the only expansion that creates more than one word. */ ++ if (qdollaratp && ((hasdol && quoted) || l->next)) ++ *qdollaratp = 1; +++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is +++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the +++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the +++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +++ (which is more paranoia than anything else), we need to return the +++ quoted null string and set the flags to indicate it. */ +++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) +++ { +++ w->flags |= W_HASQUOTEDNULL; +++ } ++ dispose_words (l); ++ } ++ else if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && hasdol) ++--- 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/feeds/packages/utils/bash/patches/.svn/text-base/129-no_doc.patch.svn-base b/feeds/packages/utils/bash/patches/.svn/text-base/129-no_doc.patch.svn-base +new file mode 100644 +index 0000000..442cd22 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/.svn/text-base/129-no_doc.patch.svn-base +@@ -0,0 +1,14 @@ ++diff -urN bash-4.2/Makefile.in bash-4.2.new/Makefile.in ++--- bash-4.2/Makefile.in 2010-12-01 01:22:42.000000000 +0100 +++++ bash-4.2.new/Makefile.in 2012-07-30 16:24:01.325057998 +0200 ++@@ -724,10 +724,8 @@ ++ # $(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/feeds/packages/utils/bash/patches/001-compile-fix.patch b/feeds/packages/utils/bash/patches/001-compile-fix.patch +new file mode 100644 +index 0000000..8f4090b +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/001-compile-fix.patch +@@ -0,0 +1,15 @@ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -2202,7 +2202,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, 0, 255); ++ if (lstdin > 0) +diff --git a/feeds/packages/utils/bash/patches/002-force-internal-readline.patch b/feeds/packages/utils/bash/patches/002-force-internal-readline.patch +new file mode 100644 +index 0000000..ecb8375 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/002-force-internal-readline.patch +@@ -0,0 +1,24 @@ ++--- a/configure +++++ b/configure ++@@ -5748,8 +5748,7 @@ _ACEOF ++ # 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.in +++++ b/configure.in ++@@ -540,8 +540,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/feeds/packages/utils/bash/patches/101-upstream-bash42-001.patch b/feeds/packages/utils/bash/patches/101-upstream-bash42-001.patch +new file mode 100644 +index 0000000..8aca815 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/101-upstream-bash42-001.patch +@@ -0,0 +1,65 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-001 ++ ++Bug-Reported-by: Juergen Daubert ++Bug-Reference-ID: <20110214175132.GA19813@jue.netz> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html ++ ++Bug-Description: ++ ++When running in Posix mode, bash does not correctly expand the right-hand ++side of a double-quoted word expansion containing single quotes. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -1379,10 +1379,12 @@ extract_dollar_brace_string (string, sin ++ slen = strlen (string + *sindex) + *sindex; ++ ++ /* The handling of dolbrace_state needs to agree with the code in parse.y: ++- parse_matched_pair() */ ++- dolbrace_state = 0; ++- if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ++- dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; +++ parse_matched_pair(). The different initial value is to handle the +++ case where this function is called to parse the word in +++ ${param op word} (SX_WORD). */ +++ dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; +++ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) +++ dolbrace_state = DOLBRACE_QUOTE; ++ ++ i = *sindex; ++ while (c = string[i]) ++@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, ++ { ++ /* Extract the contents of the ${ ... } expansion ++ according to the Posix.2 rules. */ ++- value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); +++ value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); ++ if (string[sindex] == RBRACE) ++ sindex++; ++ else ++--- a/subst.h +++++ b/subst.h ++@@ -56,6 +56,7 @@ ++ #define SX_NOLONGJMP 0x0040 /* don't longjmp on fatal error */ ++ #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ ++ #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ +++#define SX_WORD 0x0200 /* extracting word in ${param op word} */ ++ ++ /* Remove backslashes which are quoting backquotes from STRING. Modifies ++ STRING, and returns a pointer to it. */ ++--- 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/feeds/packages/utils/bash/patches/102-upstream-bash42-002.patch b/feeds/packages/utils/bash/patches/102-upstream-bash42-002.patch +new file mode 100644 +index 0000000..3756ac1 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/102-upstream-bash42-002.patch +@@ -0,0 +1,50 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-002 ++ ++Bug-Reported-by: Clark J. Wang ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html ++ ++Bug-Description: ++ ++The readline vi-mode `cc', `dd', and `yy' commands failed to modify the ++entire line. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/lib/readline/vi_mode.c +++++ b/lib/readline/vi_mode.c ++@@ -1114,7 +1114,7 @@ rl_domove_read_callback (m) ++ rl_beg_of_line (1, c); ++ _rl_vi_last_motion = c; ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++- return (0); +++ return (vidomove_dispatch (m)); ++ } ++ #if defined (READLINE_CALLBACKS) ++ /* XXX - these need to handle rl_universal_argument bindings */ ++--- a/lib/readline/callback.c +++++ b/lib/readline/callback.c ++@@ -148,6 +148,9 @@ rl_callback_read_char () ++ eof = _rl_vi_domove_callback (_rl_vimvcxt); ++ /* Should handle everything, including cleanup, numeric arguments, ++ and turning off RL_STATE_VIMOTION */ +++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) +++ _rl_internal_char_cleanup (); +++ ++ return; ++ } ++ #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 1 +++#define PATCHLEVEL 2 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/103-upstream-bash42-003.patch b/feeds/packages/utils/bash/patches/103-upstream-bash42-003.patch +new file mode 100644 +index 0000000..ad82635 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/103-upstream-bash42-003.patch +@@ -0,0 +1,231 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-003 ++ ++Bug-Reported-by: Clark J. Wang ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html ++ ++Bug-Description: ++ ++When using the pattern replacement and pattern removal word expansions, bash ++miscalculates the possible match length in the presence of an unescaped left ++bracket without a closing right bracket, resulting in a failure to match ++the pattern. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/lib/glob/gmisc.c +++++ b/lib/glob/gmisc.c ++@@ -77,8 +77,8 @@ wmatchlen (wpat, wmax) ++ wchar_t *wpat; ++ size_t wmax; ++ { ++- wchar_t wc, *wbrack; ++- int matlen, t, in_cclass, in_collsym, in_equiv; +++ wchar_t wc; +++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; ++ ++ if (*wpat == 0) ++ return (0); ++@@ -118,58 +118,80 @@ wmatchlen (wpat, wmax) ++ break; ++ case L'[': ++ /* scan for ending `]', skipping over embedded [:...:] */ ++- wbrack = wpat; +++ bracklen = 1; ++ wc = *wpat++; ++ do ++ { ++ if (wc == 0) ++ { ++- matlen += wpat - wbrack - 1; /* incremented below */ ++- break; +++ wpat--; /* back up to NUL */ +++ matlen += bracklen; +++ goto bad_bracket; ++ } ++ else if (wc == L'\\') ++ { ++- wc = *wpat++; ++- if (*wpat == 0) ++- break; +++ /* *wpat == backslash-escaped character */ +++ bracklen++; +++ /* If the backslash or backslash-escape ends the string, +++ bail. The ++wpat skips over the backslash escape */ +++ if (*wpat == 0 || *++wpat == 0) +++ { +++ matlen += bracklen; +++ goto bad_bracket; +++ } ++ } ++ else if (wc == L'[' && *wpat == L':') /* character class */ ++ { ++ wpat++; +++ bracklen++; ++ in_cclass = 1; ++ } ++ else if (in_cclass && wc == L':' && *wpat == L']') ++ { ++ wpat++; +++ bracklen++; ++ in_cclass = 0; ++ } ++ else if (wc == L'[' && *wpat == L'.') /* collating symbol */ ++ { ++ wpat++; +++ bracklen++; ++ if (*wpat == L']') /* right bracket can appear as collating symbol */ ++- wpat++; +++ { +++ wpat++; +++ bracklen++; +++ } ++ in_collsym = 1; ++ } ++ else if (in_collsym && wc == L'.' && *wpat == L']') ++ { ++ wpat++; +++ bracklen++; ++ in_collsym = 0; ++ } ++ else if (wc == L'[' && *wpat == L'=') /* equivalence class */ ++ { ++ wpat++; +++ bracklen++; ++ if (*wpat == L']') /* right bracket can appear as equivalence class */ ++- wpat++; +++ { +++ wpat++; +++ bracklen++; +++ } ++ in_equiv = 1; ++ } ++ else if (in_equiv && wc == L'=' && *wpat == L']') ++ { ++ wpat++; +++ bracklen++; ++ in_equiv = 0; ++ } +++ else +++ bracklen++; ++ } ++ while ((wc = *wpat++) != L']'); ++ matlen++; /* bracket expression can only match one char */ +++bad_bracket: ++ break; ++ } ++ } ++@@ -213,8 +235,8 @@ umatchlen (pat, max) ++ char *pat; ++ size_t max; ++ { ++- char c, *brack; ++- int matlen, t, in_cclass, in_collsym, in_equiv; +++ char c; +++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; ++ ++ if (*pat == 0) ++ return (0); ++@@ -254,58 +276,80 @@ umatchlen (pat, max) ++ break; ++ case '[': ++ /* scan for ending `]', skipping over embedded [:...:] */ ++- brack = pat; +++ bracklen = 1; ++ c = *pat++; ++ do ++ { ++ if (c == 0) ++ { ++- matlen += pat - brack - 1; /* incremented below */ ++- break; +++ pat--; /* back up to NUL */ +++ matlen += bracklen; +++ goto bad_bracket; ++ } ++ else if (c == '\\') ++ { ++- c = *pat++; ++- if (*pat == 0) ++- break; +++ /* *pat == backslash-escaped character */ +++ bracklen++; +++ /* If the backslash or backslash-escape ends the string, +++ bail. The ++pat skips over the backslash escape */ +++ if (*pat == 0 || *++pat == 0) +++ { +++ matlen += bracklen; +++ goto bad_bracket; +++ } ++ } ++ else if (c == '[' && *pat == ':') /* character class */ ++ { ++ pat++; +++ bracklen++; ++ in_cclass = 1; ++ } ++ else if (in_cclass && c == ':' && *pat == ']') ++ { ++ pat++; +++ bracklen++; ++ in_cclass = 0; ++ } ++ else if (c == '[' && *pat == '.') /* collating symbol */ ++ { ++ pat++; +++ bracklen++; ++ if (*pat == ']') /* right bracket can appear as collating symbol */ ++- pat++; +++ { +++ pat++; +++ bracklen++; +++ } ++ in_collsym = 1; ++ } ++ else if (in_collsym && c == '.' && *pat == ']') ++ { ++ pat++; +++ bracklen++; ++ in_collsym = 0; ++ } ++ else if (c == '[' && *pat == '=') /* equivalence class */ ++ { ++ pat++; +++ bracklen++; ++ if (*pat == ']') /* right bracket can appear as equivalence class */ ++- pat++; +++ { +++ pat++; +++ bracklen++; +++ } ++ in_equiv = 1; ++ } ++ else if (in_equiv && c == '=' && *pat == ']') ++ { ++ pat++; +++ bracklen++; ++ in_equiv = 0; ++ } +++ else +++ bracklen++; ++ } ++ while ((c = *pat++) != ']'); ++ matlen++; /* bracket expression can only match one char */ +++bad_bracket: ++ break; ++ } ++ } ++--- 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/feeds/packages/utils/bash/patches/104-upstream-bash42-004.patch b/feeds/packages/utils/bash/patches/104-upstream-bash42-004.patch +new file mode 100644 +index 0000000..e353c5b +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/104-upstream-bash42-004.patch +@@ -0,0 +1,40 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-004 ++ ++Bug-Reported-by: Mike Frysinger ++Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html ++ ++Bug-Description: ++ ++When used in contexts where word splitting and quote removal were not ++performed, such as pattern removal or pattern substitution, empty strings ++(either literal or resulting from quoted variables that were unset or ++null) were not matched correctly, resulting in failure. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -3373,7 +3373,7 @@ expand_string_for_rhs (string, quoted, d ++ if (string == 0 || *string == '\0') ++ return (WORD_LIST *)NULL; ++ ++- td.flags = 0; +++ td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ ++ td.word = string; ++ tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); ++ return (tresult); ++--- 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/feeds/packages/utils/bash/patches/105-upstream-bash42-005.patch b/feeds/packages/utils/bash/patches/105-upstream-bash42-005.patch +new file mode 100644 +index 0000000..5df63c7 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/105-upstream-bash42-005.patch +@@ -0,0 +1,114 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-005 ++ ++Bug-Reported-by: Dennis Williamson ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html ++ ++Bug-Description: ++ ++Systems that use tzset() to set the local timezone require the TZ variable ++to be in the environment. Bash must make sure the environment has been ++modified with any updated value for TZ before calling tzset(). This ++affects prompt string expansions and the `%T' printf conversion specification ++on systems that do not allow bash to supply a replacement for getenv(3). ++ ++Patch (apply with `patch -p0'): ++ ++--- a/variables.h +++++ b/variables.h ++@@ -313,6 +313,7 @@ extern void set_func_auto_export __P((co ++ ++ extern void sort_variables __P((SHELL_VAR **)); ++ +++extern int chkexport __P((char *)); ++ extern void maybe_make_export_env __P((void)); ++ extern void update_export_env_inplace __P((char *, int, char *)); ++ extern void put_command_name_into_env __P((char *)); ++--- a/variables.c +++++ b/variables.c ++@@ -3653,6 +3653,22 @@ n_shell_variables () ++ return n; ++ } ++ +++int +++chkexport (name) +++ char *name; +++{ +++ SHELL_VAR *v; +++ +++ v = find_variable (name); +++ if (exported_p (v)) +++ { +++ array_needs_making = 1; +++ maybe_make_export_env (); +++ return 1; +++ } +++ return 0; +++} +++ ++ void ++ maybe_make_export_env () ++ { ++@@ -4214,7 +4230,7 @@ static struct name_and_function special_ ++ { "TEXTDOMAIN", sv_locale }, ++ { "TEXTDOMAINDIR", sv_locale }, ++ ++-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) +++#if defined (HAVE_TZSET) ++ { "TZ", sv_tz }, ++ #endif ++ ++@@ -4558,12 +4574,13 @@ sv_histtimefmt (name) ++ } ++ #endif /* HISTORY */ ++ ++-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) +++#if defined (HAVE_TZSET) ++ void ++ sv_tz (name) ++ char *name; ++ { ++- tzset (); +++ if (chkexport (name)) +++ tzset (); ++ } ++ #endif ++ ++--- a/parse.y +++++ b/parse.y ++@@ -5135,6 +5135,9 @@ decode_prompt_string (string) ++ case 'A': ++ /* Make the current time/date into a string. */ ++ (void) time (&the_time); +++#if defined (HAVE_TZSET) +++ sv_tz ("TZ"); /* XXX -- just make sure */ +++#endif ++ tm = localtime (&the_time); ++ ++ if (c == 'd') ++--- a/builtins/printf.def +++++ b/builtins/printf.def ++@@ -465,6 +465,9 @@ printf_builtin (list) ++ secs = shell_start_time; /* roughly $SECONDS */ ++ else ++ secs = arg; +++#if defined (HAVE_TZSET) +++ sv_tz ("TZ"); /* XXX -- just make sure */ +++#endif ++ tm = localtime (&secs); ++ n = strftime (timebuf, sizeof (timebuf), timefmt, tm); ++ free (timefmt); ++--- 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/feeds/packages/utils/bash/patches/106-upstream-bash42-006.patch b/feeds/packages/utils/bash/patches/106-upstream-bash42-006.patch +new file mode 100644 +index 0000000..89c887e +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/106-upstream-bash42-006.patch +@@ -0,0 +1,37 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-006 ++ ++Bug-Reported-by: Allan McRae ++Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html ++ ++Bug-Description: ++ ++A problem with bash42-005 caused it to dump core if TZ was unset. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/variables.c +++++ b/variables.c ++@@ -3660,7 +3660,7 @@ chkexport (name) ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++- if (exported_p (v)) +++ if (v && exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_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 5 +++#define PATCHLEVEL 6 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/107-upstream-bash42-007.patch b/feeds/packages/utils/bash/patches/107-upstream-bash42-007.patch +new file mode 100644 +index 0000000..7587195 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/107-upstream-bash42-007.patch +@@ -0,0 +1,39 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-007 ++ ++Bug-Reported-by: Matthias Klose ++Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html ++ ++Bug-Description: ++ ++When used in contexts where word splitting and quote removal were not ++performed, such as case statement word expansion, empty strings ++(either literal or resulting from quoted variables that were unset or ++null) were not expanded correctly, resulting in failure. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -4609,6 +4609,7 @@ expand_word_unsplit (word, quoted) ++ if (ifs_firstc == 0) ++ #endif ++ word->flags |= W_NOSPLIT; +++ word->flags |= W_NOSPLIT2; ++ result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); ++ expand_no_split_dollar_star = 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 6 +++#define PATCHLEVEL 7 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/108-upstream-bash42-008.patch b/feeds/packages/utils/bash/patches/108-upstream-bash42-008.patch +new file mode 100644 +index 0000000..29493b5 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/108-upstream-bash42-008.patch +@@ -0,0 +1,65 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-008 ++ ++Bug-Reported-by: Doug McMahon ++Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html ++ ++Bug-Description: ++ ++Bash-4.2 does not attempt to save the shell history on receipt of a ++terminating signal that is handled synchronously. Unfortunately, the ++`close' button on most X11 terminal emulators sends SIGHUP, which ++kills the shell. ++ ++This is a very small patch to save the history in the case that an ++interactive shell receives a SIGHUP or SIGTERM while in readline and ++reading a command. ++ ++The next version of bash will do this differently. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/sig.c +++++ b/sig.c ++@@ -46,6 +46,7 @@ ++ ++ #if defined (READLINE) ++ # include "bashline.h" +++# include ++ #endif ++ ++ #if defined (HISTORY) ++@@ -62,6 +63,7 @@ extern int parse_and_execute_level, shel ++ #if defined (HISTORY) ++ extern int history_lines_this_session; ++ #endif +++extern int no_line_editing; ++ ++ extern void initialize_siglist (); ++ ++@@ -505,7 +507,10 @@ termsig_sighandler (sig) ++ { ++ #if defined (HISTORY) ++ /* XXX - will inhibit history file being written */ ++- history_lines_this_session = 0; +++# if defined (READLINE) +++ if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) +++# endif +++ history_lines_this_session = 0; ++ #endif ++ terminate_immediately = 0; ++ termsig_handler (sig); ++--- 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/feeds/packages/utils/bash/patches/109-upstream-bash42-009.patch b/feeds/packages/utils/bash/patches/109-upstream-bash42-009.patch +new file mode 100644 +index 0000000..d05f499 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/109-upstream-bash42-009.patch +@@ -0,0 +1,65 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-009 ++ ++Bug-Reported-by: ++Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html ++ ++Bug-Description: ++ ++Under certain circumstances, running `fc -l' two times in succession with a ++relative history offset at the end of the history will result in an incorrect ++calculation of the last history entry and a seg fault. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/fc.def +++++ b/builtins/fc.def ++@@ -304,7 +304,7 @@ fc_builtin (list) ++ last_hist = i - rh - hist_last_line_added; ++ ++ /* XXX */ ++- if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) +++ if (i == last_hist && hlist[last_hist] == 0) ++ while (last_hist >= 0 && hlist[last_hist] == 0) ++ last_hist--; ++ if (last_hist < 0) ++@@ -475,7 +475,7 @@ fc_gethnum (command, hlist) ++ HIST_ENTRY **hlist; ++ { ++ int sign, n, clen, rh; ++- register int i, j; +++ register int i, j, last_hist; ++ register char *s; ++ ++ sign = 1; ++@@ -495,7 +495,15 @@ fc_gethnum (command, hlist) ++ has been enabled (interactive or not) should use it in the last_hist ++ calculation as if it were on. */ ++ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); ++- i -= rh + hist_last_line_added; +++ last_hist = i - rh - hist_last_line_added; +++ +++ if (i == last_hist && hlist[last_hist] == 0) +++ while (last_hist >= 0 && hlist[last_hist] == 0) +++ last_hist--; +++ if (last_hist < 0) +++ return (-1); +++ +++ i = last_hist; ++ ++ /* No specification defaults to most recent command. */ ++ if (command == NULL) ++--- 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/feeds/packages/utils/bash/patches/110-upstream-bash42-010.patch b/feeds/packages/utils/bash/patches/110-upstream-bash42-010.patch +new file mode 100644 +index 0000000..06cdb61 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/110-upstream-bash42-010.patch +@@ -0,0 +1,56 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-010 ++ ++Bug-Reported-by: Mike Frysinger ++Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html ++ ++Bug-Description: ++ ++Bash did not correctly print/reproduce here documents attached to commands ++inside compound commands such as arithmetic for loops and user-specified ++subshells. This affected the execution of such commands inside a shell ++function when the function definition is saved and later restored using ++`.' or `eval'. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/print_cmd.c +++++ b/print_cmd.c ++@@ -315,6 +315,7 @@ make_command_string_internal (command) ++ cprintf ("( "); ++ skip_this_indent++; ++ make_command_string_internal (command->value.Subshell->command); +++ PRINT_DEFERRED_HEREDOCS (""); ++ cprintf (" )"); ++ break; ++ ++@@ -592,6 +593,7 @@ print_arith_for_command (arith_for_comma ++ newline ("do\n"); ++ indentation += indentation_amount; ++ make_command_string_internal (arith_for_command->action); +++ PRINT_DEFERRED_HEREDOCS (""); ++ semicolon (); ++ indentation -= indentation_amount; ++ newline ("done"); ++@@ -653,6 +655,7 @@ print_group_command (group_command) ++ } ++ ++ make_command_string_internal (group_command->command); +++ PRINT_DEFERRED_HEREDOCS (""); ++ ++ if (inside_function_def) ++ { ++--- 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/feeds/packages/utils/bash/patches/111-upstream-bash42-011.patch b/feeds/packages/utils/bash/patches/111-upstream-bash42-011.patch +new file mode 100644 +index 0000000..bb84a8d +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/111-upstream-bash42-011.patch +@@ -0,0 +1,41 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-011 ++ ++Bug-Reported-by: "David Parks" ++Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html ++ ++Bug-Description: ++ ++Overwriting a value in an associative array causes the memory allocated to ++store the key on the second and subsequent assignments to leak. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/assoc.c +++++ b/assoc.c ++@@ -77,6 +77,11 @@ assoc_insert (hash, key, value) ++ b = hash_search (key, hash, HASH_CREATE); ++ if (b == 0) ++ return -1; +++ /* If we are overwriting an existing element's value, we're not going to +++ use the key. Nothing in the array assignment code path frees the key +++ string, so we can free it here to avoid a memory leak. */ +++ if (b->key != key) +++ free (key); ++ FREE (b->data); ++ b->data = value ? savestring (value) : (char *)0; ++ return (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/feeds/packages/utils/bash/patches/112-upstream-bash42-012.patch b/feeds/packages/utils/bash/patches/112-upstream-bash42-012.patch +new file mode 100644 +index 0000000..697ed1a +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/112-upstream-bash42-012.patch +@@ -0,0 +1,145 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-012 ++ ++Bug-Reported-by: Rui Santos ++Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html ++ ++Bug-Description: ++ ++When calling the parser to recursively parse a command substitution within ++an arithmetic expansion, the shell overwrote the saved shell input line and ++associated state, resulting in a garbled command. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/parse.y +++++ b/parse.y ++@@ -3842,6 +3842,7 @@ xparse_dolparen (base, string, indp, fla ++ int flags; ++ { ++ sh_parser_state_t ps; +++ sh_input_line_state_t ls; ++ int orig_ind, nc, sflags; ++ char *ret, *s, *ep, *ostring; ++ ++@@ -3849,10 +3850,12 @@ xparse_dolparen (base, string, indp, fla ++ orig_ind = *indp; ++ ostring = string; ++ +++/*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ ++ sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; ++ if (flags & SX_NOLONGJMP) ++ sflags |= SEVAL_NOLONGJMP; ++ save_parser_state (&ps); +++ save_input_line_state (&ls); ++ ++ /*(*/ ++ parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/ ++@@ -3861,6 +3864,8 @@ xparse_dolparen (base, string, indp, fla ++ ++ restore_parser_state (&ps); ++ reset_parser (); +++ /* reset_parser clears shell_input_line and associated variables */ +++ restore_input_line_state (&ls); ++ if (interactive) ++ token_to_read = 0; ++ ++@@ -5908,6 +5913,12 @@ save_parser_state (ps) ++ ps->expand_aliases = expand_aliases; ++ ps->echo_input_at_read = echo_input_at_read; ++ +++ ps->token = token; +++ ps->token_buffer_size = token_buffer_size; +++ /* Force reallocation on next call to read_token_word */ +++ token = 0; +++ token_buffer_size = 0; +++ ++ return (ps); ++ } ++ ++@@ -5949,6 +5960,42 @@ restore_parser_state (ps) ++ ++ expand_aliases = ps->expand_aliases; ++ echo_input_at_read = ps->echo_input_at_read; +++ +++ FREE (token); +++ token = ps->token; +++ token_buffer_size = ps->token_buffer_size; +++} +++ +++sh_input_line_state_t * +++save_input_line_state (ls) +++ sh_input_line_state_t *ls; +++{ +++ if (ls == 0) +++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); +++ if (ls == 0) +++ return ((sh_input_line_state_t *)NULL); +++ +++ ls->input_line = shell_input_line; +++ ls->input_line_size = shell_input_line_size; +++ ls->input_line_len = shell_input_line_len; +++ ls->input_line_index = shell_input_line_index; +++ +++ /* force reallocation */ +++ shell_input_line = 0; +++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; +++} +++ +++void +++restore_input_line_state (ls) +++ sh_input_line_state_t *ls; +++{ +++ FREE (shell_input_line); +++ shell_input_line = ls->input_line; +++ shell_input_line_size = ls->input_line_size; +++ shell_input_line_len = ls->input_line_len; +++ shell_input_line_index = ls->input_line_index; +++ +++ set_line_mbstate (); ++ } ++ ++ /************************************************ ++--- a/shell.h +++++ b/shell.h ++@@ -136,6 +136,9 @@ typedef struct _sh_parser_state_t { ++ int parser_state; ++ int *token_state; ++ +++ char *token; +++ int token_buffer_size; +++ ++ /* input line state -- line number saved elsewhere */ ++ int input_line_terminator; ++ int eof_encountered; ++@@ -166,6 +169,16 @@ typedef struct _sh_parser_state_t { ++ ++ } sh_parser_state_t; ++ +++typedef struct _sh_input_line_state_t { +++ char *input_line; +++ int input_line_index; +++ int input_line_size; +++ int input_line_len; +++} sh_input_line_state_t; +++ ++ /* Let's try declaring these here. */ ++ extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); ++ extern void restore_parser_state __P((sh_parser_state_t *)); +++ +++extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); +++extern void restore_input_line_state __P((sh_input_line_state_t *)); ++--- 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/feeds/packages/utils/bash/patches/113-upstream-bash42-013.patch b/feeds/packages/utils/bash/patches/113-upstream-bash42-013.patch +new file mode 100644 +index 0000000..aee78a2 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/113-upstream-bash42-013.patch +@@ -0,0 +1,43 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-013 ++ ++Bug-Reported-by: Marten Wikstrom ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html ++ ++Bug-Description: ++ ++An off-by-one error caused the shell to skip over CTLNUL characters, ++which are used internally to mark quoted null strings. The effect ++was to have stray 0x7f characters left after expanding words like ++""""""""aa. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -3706,7 +3706,10 @@ remove_quoted_nulls (string) ++ break; ++ } ++ else if (string[i] == CTLNUL) ++- i++; +++ { +++ i++; +++ continue; +++ } ++ ++ prev_i = i; ++ ADVANCE_CHAR (string, slen, i); ++--- 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/feeds/packages/utils/bash/patches/114-upstream-bash42-014.patch b/feeds/packages/utils/bash/patches/114-upstream-bash42-014.patch +new file mode 100644 +index 0000000..dfbc990 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/114-upstream-bash42-014.patch +@@ -0,0 +1,38 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-014 ++ ++Bug-Reported-by: Shawn Bohrer ++Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html ++ ++Bug-Description: ++ ++The regular expression matching operator did not correctly match ++expressions with an embedded ^A. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/pathexp.c +++++ b/pathexp.c ++@@ -196,7 +196,7 @@ quote_string_for_globbing (pathname, qfl ++ { ++ if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') ++ continue; ++- if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) +++ if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) ++ continue; ++ temp[j++] = '\\'; ++ i++; ++--- 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/feeds/packages/utils/bash/patches/115-upstream-bash42-015.patch b/feeds/packages/utils/bash/patches/115-upstream-bash42-015.patch +new file mode 100644 +index 0000000..49c7a82 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/115-upstream-bash42-015.patch +@@ -0,0 +1,71 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-015 ++ ++Bug-Reported-by: ++Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html ++ ++Bug-Description: ++ ++When in a context where arithmetic evaluation is not taking place, the ++evaluator should not check for division by 0. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/expr.c +++++ b/expr.c ++@@ -476,19 +476,23 @@ expassign () ++ ++ if (special) ++ { +++ if ((op == DIV || op == MOD) && value == 0) +++ { +++ if (noeval == 0) +++ evalerror (_("division by 0")); +++ else +++ value = 1; +++ } +++ ++ switch (op) ++ { ++ case MUL: ++ lvalue *= value; ++ break; ++ case DIV: ++- if (value == 0) ++- evalerror (_("division by 0")); ++ lvalue /= value; ++ break; ++ case MOD: ++- if (value == 0) ++- evalerror (_("division by 0")); ++ lvalue %= value; ++ break; ++ case PLUS: ++@@ -804,7 +808,12 @@ exp2 () ++ val2 = exppower (); ++ ++ if (((op == DIV) || (op == MOD)) && (val2 == 0)) ++- evalerror (_("division by 0")); +++ { +++ if (noeval == 0) +++ evalerror (_("division by 0")); +++ else +++ val2 = 1; +++ } ++ ++ if (op == MUL) ++ val1 *= val2; ++--- 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/feeds/packages/utils/bash/patches/116-upstream-bash42-016.patch b/feeds/packages/utils/bash/patches/116-upstream-bash42-016.patch +new file mode 100644 +index 0000000..0848cfc +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/116-upstream-bash42-016.patch +@@ -0,0 +1,37 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-016 ++ ++Bug-Reported-by: Martin von Gagern ++Bug-Reference-ID: <4E43AD9E.8060501@gmx.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html ++ ++Bug-Description: ++ ++Bash should not check for mail while executing the `eval' builtin. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/parse.y +++++ b/parse.y ++@@ -2499,7 +2499,7 @@ yylex () ++ We do this only if it is time to do so. Notice that only here ++ is the mail alarm reset; nothing takes place in check_mail () ++ except the checking of mail. Please don't change this. */ ++- if (prompt_is_ps1 && time_to_check_mail ()) +++ if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) ++ { ++ check_mail (); ++ reset_mail_timer (); ++--- 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/feeds/packages/utils/bash/patches/117-upstream-bash42-017.patch b/feeds/packages/utils/bash/patches/117-upstream-bash42-017.patch +new file mode 100644 +index 0000000..90f71c6 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/117-upstream-bash42-017.patch +@@ -0,0 +1,42 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-017 ++ ++Bug-Reported-by: Curtis Doty ++Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html ++ ++Bug-Description: ++ ++Using `read -a foo' where foo was an already-declared associative array ++caused the shell to die with a segmentation fault. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/read.def +++++ b/builtins/read.def ++@@ -642,6 +642,12 @@ assign_vars: ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* readonly or noassign */ ++ } +++ if (assoc_p (var)) +++ { +++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); +++ xfree (input_string); +++ return EXECUTION_FAILURE; /* existing associative array */ +++ } ++ array_flush (array_cell (var)); ++ ++ alist = list_string (input_string, ifs_chars, 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 16 +++#define PATCHLEVEL 17 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/118-upstream-bash42-018.patch b/feeds/packages/utils/bash/patches/118-upstream-bash42-018.patch +new file mode 100644 +index 0000000..82654c8 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/118-upstream-bash42-018.patch +@@ -0,0 +1,57 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-018 ++ ++Bug-Reported-by: Thomas Cort ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html ++ ++Bug-Description: ++ ++Bash fails to compile unless JOB_CONTROL is defined. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -2196,6 +2196,7 @@ execute_pipeline (command, asynchronous, ++ if (ignore_return && cmd) ++ cmd->flags |= CMD_IGNORE_RETURN; ++ +++#if defined (JOB_CONTROL) ++ lastpipe_flag = 0; ++ begin_unwind_frame ("lastpipe-exec"); ++ lstdin = -1; ++@@ -2219,15 +2220,19 @@ execute_pipeline (command, asynchronous, ++ lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL); /* XXX */ ++ add_unwind_protect (lastpipe_cleanup, lastpipe_jid); ++ } ++- cmd->flags |= CMD_LASTPIPE; +++ if (cmd) +++ cmd->flags |= CMD_LASTPIPE; ++ } ++ if (prev >= 0) ++ add_unwind_protect (close, prev); +++#endif ++ ++ exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); ++ +++#if defined (JOB_CONTROL) ++ if (lstdin > 0) ++ restore_stdin (lstdin); +++#endif ++ ++ if (prev >= 0) ++ close (prev); ++--- 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/feeds/packages/utils/bash/patches/119-upstream-bash42-019.patch b/feeds/packages/utils/bash/patches/119-upstream-bash42-019.patch +new file mode 100644 +index 0000000..215ae67 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/119-upstream-bash42-019.patch +@@ -0,0 +1,42 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-019 ++ ++Bug-Reported-by: Diego Augusto Molina ++Bug-Reference-ID: ++Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html ++ ++Bug-Description: ++ ++Using `declare' with attributes and an invalid array variable name or ++assignment reference resulted in a segmentation fault instead of a ++declaration error. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/declare.def +++++ b/builtins/declare.def ++@@ -513,6 +513,11 @@ declare_internal (list, local_var) ++ *subscript_start = '['; /* ] */ ++ var = assign_array_element (name, value, 0); /* XXX - not aflags */ ++ *subscript_start = '\0'; +++ if (var == 0) /* some kind of assignment error */ +++ { +++ assign_error++; +++ NEXT_VARIABLE (); +++ } ++ } ++ else if (simple_array_assign) ++ { ++--- 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/feeds/packages/utils/bash/patches/120-upstream-bash42-020.patch b/feeds/packages/utils/bash/patches/120-upstream-bash42-020.patch +new file mode 100644 +index 0000000..a91c950 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/120-upstream-bash42-020.patch +@@ -0,0 +1,47 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-020 ++ ++Bug-Reported-by: Vincent Sheffer ++Bug-Reference-ID: ++Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html ++ ++Bug-Description: ++ ++The shared object helper script needs to be updated for Mac OS X 10.7 ++(Lion, darwin11). ++ ++Patch (apply with `patch -p0'): ++ ++--- a/support/shobj-conf +++++ b/support/shobj-conf ++@@ -157,7 +157,7 @@ freebsd[4-9]*|freebsdelf*|dragonfly*) ++ ;; ++ ++ # Darwin/MacOS X ++-darwin[89]*|darwin10*) +++darwin[89]*|darwin1[012]*) ++ SHOBJ_STATUS=supported ++ SHLIB_STATUS=supported ++ ++@@ -186,7 +186,7 @@ darwin*|macosx*) ++ SHLIB_LIBSUFF='dylib' ++ ++ case "${host_os}" in ++- darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' +++ darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' ++ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ++ ;; ++ *) SHOBJ_LDFLAGS='-dynamic' ++--- 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/feeds/packages/utils/bash/patches/121-upstream-bash42-021.patch b/feeds/packages/utils/bash/patches/121-upstream-bash42-021.patch +new file mode 100644 +index 0000000..38c3ae4 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/121-upstream-bash42-021.patch +@@ -0,0 +1,48 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-021 ++ ++Bug-Reported-by: Dan Douglas ++Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html ++ ++Bug-Description: ++ ++Using `read -N' to assign values to an array can result in NUL values being ++assigned to some array elements. These values cause seg faults when referenced ++later. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/read.def +++++ b/builtins/read.def ++@@ -737,7 +737,7 @@ assign_vars: ++ xfree (t1); ++ } ++ else ++- var = bind_read_variable (varname, t); +++ var = bind_read_variable (varname, t ? t : ""); ++ } ++ else ++ { ++@@ -798,7 +798,7 @@ assign_vars: ++ xfree (t); ++ } ++ else ++- var = bind_read_variable (list->word->word, input_string); +++ var = bind_read_variable (list->word->word, input_string ? input_string : ""); ++ ++ if (var) ++ { ++--- 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/feeds/packages/utils/bash/patches/122-upstream-bash42-022.patch b/feeds/packages/utils/bash/patches/122-upstream-bash42-022.patch +new file mode 100644 +index 0000000..30020ba +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/122-upstream-bash42-022.patch +@@ -0,0 +1,46 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-022 ++ ++Bug-Reported-by: Gregory Margo ++Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html ++ ++Bug-Description: ++ ++The return value from lseek is `off_t'. This can cause corrupted return ++values when the file offset is greater than 2**31 - 1. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/lib/sh/zread.c +++++ b/lib/sh/zread.c ++@@ -160,14 +160,13 @@ void ++ zsyncfd (fd) ++ int fd; ++ { ++- off_t off; ++- int r; +++ off_t off, r; ++ ++ off = lused - lind; ++ r = 0; ++ if (off > 0) ++ r = lseek (fd, -off, SEEK_CUR); ++ ++- if (r >= 0) +++ if (r != -1) ++ lused = lind = 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 21 +++#define PATCHLEVEL 22 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/123-upstream-bash42-023.patch b/feeds/packages/utils/bash/patches/123-upstream-bash42-023.patch +new file mode 100644 +index 0000000..6c6fdb3 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/123-upstream-bash42-023.patch +@@ -0,0 +1,53 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-023 ++ ++Bug-Reported-by: Ewan Mellor ++Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> ++Bug-Reference-URL: ++ ++Bug-Description: ++ ++Under some circumstances, an exit trap triggered by a bad substitution ++error when errexit is enabled will cause the shell to exit with an ++incorrect exit status (0). ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp, ++ default: ++ case '\0': ++ bad_substitution: +++ last_command_exit_value = EXECUTION_FAILURE; ++ report_error (_("%s: bad substitution"), string ? string : "??"); ++ FREE (value); ++ FREE (temp); ++--- a/error.c +++++ b/error.c ++@@ -200,7 +200,11 @@ report_error (format, va_alist) ++ ++ va_end (args); ++ if (exit_immediately_on_error) ++- exit_shell (1); +++ { +++ if (last_command_exit_value == 0) +++ last_command_exit_value = 1; +++ exit_shell (last_command_exit_value); +++ } ++ } ++ ++ void ++--- 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/feeds/packages/utils/bash/patches/124-upstream-bash42-024.patch b/feeds/packages/utils/bash/patches/124-upstream-bash42-024.patch +new file mode 100644 +index 0000000..2137c02 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/124-upstream-bash42-024.patch +@@ -0,0 +1,40 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-024 ++ ++Bug-Reported-by: Jim Avera ++Bug-Reference-ID: <4F29E07A.80405@yahoo.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html ++ ++Bug-Description: ++ ++When `printf -v' is used to set an array element, the format string contains ++`%b', and the corresponding argument is the empty string, the buffer used ++to store the value to be assigned can be NULL, which results in NUL being ++assigned to the array element. This causes a seg fault when it's used later. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/builtins/printf.def +++++ b/builtins/printf.def ++@@ -255,6 +255,8 @@ printf_builtin (list) ++ #endif ++ { ++ vflag = 1; +++ if (vbsize == 0) +++ vbuf = xmalloc (vbsize = 16); ++ vblen = 0; ++ if (vbuf) ++ vbuf[0] = 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 23 +++#define PATCHLEVEL 24 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff --git a/feeds/packages/utils/bash/patches/125-upstream-bash42-025.patch b/feeds/packages/utils/bash/patches/125-upstream-bash42-025.patch +new file mode 100644 +index 0000000..3983ff5 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/125-upstream-bash42-025.patch +@@ -0,0 +1,111 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-025 ++ ++Bug-Reported-by: Bill Gradwohl ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html ++ ++Bug-Description: ++ ++When used in a shell function, `declare -g -a array=(compound assignment)' ++creates a local variable instead of a global one. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/command.h +++++ b/command.h ++@@ -97,6 +97,7 @@ enum command_type { cm_for, cm_case, cm_ ++ #define W_HASCTLESC 0x200000 /* word contains literal CTLESC characters */ ++ #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ ++ #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ +++#define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ ++ ++ /* Possible values for subshell_environment */ ++ #define SUBSHELL_ASYNC 0x01 /* subshell caused by `command &' */ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -3584,13 +3584,13 @@ fix_assignment_words (words) ++ { ++ WORD_LIST *w; ++ struct builtin *b; ++- int assoc; +++ int assoc, global; ++ ++ if (words == 0) ++ return; ++ ++ b = 0; ++- assoc = 0; +++ assoc = global = 0; ++ ++ for (w = words; w; w = w->next) ++ if (w->word->flags & W_ASSIGNMENT) ++@@ -3607,12 +3607,17 @@ fix_assignment_words (words) ++ #if defined (ARRAY_VARS) ++ if (assoc) ++ w->word->flags |= W_ASSIGNASSOC; +++ if (global) +++ w->word->flags |= W_ASSNGLOBAL; ++ #endif ++ } ++ #if defined (ARRAY_VARS) ++ /* Note that we saw an associative array option to a builtin that takes ++ assignment statements. This is a bit of a kludge. */ ++- else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) +++ else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) +++#else +++ else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) +++#endif ++ { ++ if (b == 0) ++ { ++@@ -3622,10 +3627,11 @@ fix_assignment_words (words) ++ else if (b && (b->flags & ASSIGNMENT_BUILTIN)) ++ words->word->flags |= W_ASSNBLTIN; ++ } ++- if (words->word->flags & W_ASSNBLTIN) +++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) ++ assoc = 1; +++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) +++ global = 1; ++ } ++-#endif ++ } ++ ++ /* Return 1 if the file found by searching $PATH for PATHNAME, defaulting ++--- a/subst.c +++++ b/subst.c ++@@ -366,6 +366,11 @@ dump_word_flags (flags) ++ f &= ~W_ASSNBLTIN; ++ fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); ++ } +++ if (f & W_ASSNGLOBAL) +++ { +++ f &= ~W_ASSNGLOBAL; +++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); +++ } ++ if (f & W_COMPASSIGN) ++ { ++ f &= ~W_COMPASSIGN; ++@@ -2803,7 +2808,7 @@ do_assignment_internal (word, expand) ++ } ++ else if (assign_list) ++ { ++- if (word->flags & W_ASSIGNARG) +++ if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) ++ aflags |= ASS_MKLOCAL; ++ if (word->flags & W_ASSIGNASSOC) ++ aflags |= ASS_MKASSOC; ++--- 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/feeds/packages/utils/bash/patches/126-upstream-bash42-026.patch b/feeds/packages/utils/bash/patches/126-upstream-bash42-026.patch +new file mode 100644 +index 0000000..b0efc0c +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/126-upstream-bash42-026.patch +@@ -0,0 +1,48 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-026 ++ ++Bug-Reported-by: Greg Wooledge ++Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html ++ ++Bug-Description: ++ ++The `lastpipe' option does not behave correctly on machines where the ++open file limit is less than 256. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/execute_cmd.c +++++ b/execute_cmd.c ++@@ -2209,7 +2209,7 @@ execute_pipeline (command, asynchronous, ++ #endif ++ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) ++ { ++- lstdin = move_to_high_fd (0, 0, 255); +++ lstdin = move_to_high_fd (0, 1, -1); ++ if (lstdin > 0) ++ { ++ do_piping (prev, pipe_out); ++@@ -2255,7 +2255,9 @@ execute_pipeline (command, asynchronous, ++ unfreeze_jobs_list (); ++ } ++ +++#if defined (JOB_CONTROL) ++ discard_unwind_frame ("lastpipe-exec"); +++#endif ++ ++ return (exec_result); ++ } ++--- 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/feeds/packages/utils/bash/patches/127-upstream-bash42-027.patch b/feeds/packages/utils/bash/patches/127-upstream-bash42-027.patch +new file mode 100644 +index 0000000..525abe0 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/127-upstream-bash42-027.patch +@@ -0,0 +1,38 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-027 ++ ++Bug-Reported-by: Mike Frysinger ++Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html ++ ++Bug-Description: ++ ++When the `extglob' shell option is enabled, pattern substitution does not ++work correctly in the presence of multibyte characters. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -4166,7 +4166,7 @@ match_wpattern (wstring, indices, wstrle ++ simple = (wpat[0] != L'\\' && wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'['); ++ #if defined (EXTENDED_GLOB) ++ if (extended_glob) ++- simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ +++ simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ ++ #endif ++ ++ /* If the pattern doesn't match anywhere in the string, go ahead and ++--- 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/feeds/packages/utils/bash/patches/128-upstream-bash42-028.patch b/feeds/packages/utils/bash/patches/128-upstream-bash42-028.patch +new file mode 100644 +index 0000000..8b5b1b2 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/128-upstream-bash42-028.patch +@@ -0,0 +1,46 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 4.2 ++Patch-ID: bash42-028 ++ ++Bug-Reported-by: Mark Edgar ++Bug-Reference-ID: ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html ++ ++Bug-Description: ++ ++When using a word expansion for which the right hand side is evaluated, ++certain expansions of quoted null strings include spurious ^? characters. ++ ++Patch (apply with `patch -p0'): ++ ++--- a/subst.c +++++ b/subst.c ++@@ -5809,6 +5809,16 @@ parameter_brace_expand_rhs (name, value, ++ is the only expansion that creates more than one word. */ ++ if (qdollaratp && ((hasdol && quoted) || l->next)) ++ *qdollaratp = 1; +++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is +++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the +++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the +++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +++ (which is more paranoia than anything else), we need to return the +++ quoted null string and set the flags to indicate it. */ +++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) +++ { +++ w->flags |= W_HASQUOTEDNULL; +++ } ++ dispose_words (l); ++ } ++ else if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && hasdol) ++--- 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/feeds/packages/utils/bash/patches/129-no_doc.patch b/feeds/packages/utils/bash/patches/129-no_doc.patch +new file mode 100644 +index 0000000..442cd22 +--- /dev/null ++++ b/feeds/packages/utils/bash/patches/129-no_doc.patch +@@ -0,0 +1,14 @@ ++diff -urN bash-4.2/Makefile.in bash-4.2.new/Makefile.in ++--- bash-4.2/Makefile.in 2010-12-01 01:22:42.000000000 +0100 +++++ bash-4.2.new/Makefile.in 2012-07-30 16:24:01.325057998 +0200 ++@@ -724,10 +724,8 @@ ++ # $(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/feeds/packages/utils/bc/.svn/entries b/feeds/packages/utils/bc/.svn/entries +new file mode 100644 +index 0000000..91a4a55 +--- /dev/null ++++ b/feeds/packages/utils/bc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T22:19:34.307561Z ++32217 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++0aa1b1f08baba6527613348a91dc37d7 ++2012-06-11T22:19:34.307561Z ++32217 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1393 ++ +diff --git a/feeds/packages/utils/bc/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/bc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/bc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9f59be3 +--- /dev/null ++++ b/feeds/packages/utils/bc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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:=bc ++PKG_VERSION:=1.06.95 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=ftp://ftp.debian.org/debian/pool/main/b/bc ++PKG_MD5SUM:=24d0831812d8262b6cac8316b0bac483 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bc/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://packages.debian.org/bc ++endef ++ ++define Package/bc ++ $(call Package/bc/Default) ++ TITLE:=Arbitrary precision calculator language ++ DEPENDS:=+libreadline +libncurses ++endef ++ ++define Package/bc/description ++ bc is a language that supports arbitrary precision numbers with ++ interactive execution of statements. ++endef ++ ++define Package/dc ++ $(call Package/bc/Default) ++ TITLE:=Arbitrary precision reverse-polish calculator ++ DEPENDS:=bc ++endef ++ ++define Package/dc/description ++ dc is a reverse-polish desk calculator which supports unlimited ++ precision arithmetic. ++endef ++ ++CONFIGURE_ARGS += --with-readline ++ ++define Package/bc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bc/bc $(1)/usr/bin/ ++endef ++ ++define Package/dc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dc/dc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bc)) ++$(eval $(call BuildPackage,dc)) +diff --git a/feeds/packages/utils/bc/Makefile b/feeds/packages/utils/bc/Makefile +new file mode 100644 +index 0000000..9f59be3 +--- /dev/null ++++ b/feeds/packages/utils/bc/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=bc ++PKG_VERSION:=1.06.95 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=ftp://ftp.debian.org/debian/pool/main/b/bc ++PKG_MD5SUM:=24d0831812d8262b6cac8316b0bac483 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bc/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://packages.debian.org/bc ++endef ++ ++define Package/bc ++ $(call Package/bc/Default) ++ TITLE:=Arbitrary precision calculator language ++ DEPENDS:=+libreadline +libncurses ++endef ++ ++define Package/bc/description ++ bc is a language that supports arbitrary precision numbers with ++ interactive execution of statements. ++endef ++ ++define Package/dc ++ $(call Package/bc/Default) ++ TITLE:=Arbitrary precision reverse-polish calculator ++ DEPENDS:=bc ++endef ++ ++define Package/dc/description ++ dc is a reverse-polish desk calculator which supports unlimited ++ precision arithmetic. ++endef ++ ++CONFIGURE_ARGS += --with-readline ++ ++define Package/bc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bc/bc $(1)/usr/bin/ ++endef ++ ++define Package/dc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dc/dc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bc)) ++$(eval $(call BuildPackage,dc)) +diff --git a/feeds/packages/utils/bc/patches/.svn/entries b/feeds/packages/utils/bc/patches/.svn/entries +new file mode 100644 +index 0000000..835fcda +--- /dev/null ++++ b/feeds/packages/utils/bc/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-07-03T11:00:29.662030Z ++22050 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-disable-doc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c0f5758d2dc6769160e9706007e25f88 ++2010-07-03T11:00:29.662030Z ++22050 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++795 ++ +diff --git a/feeds/packages/utils/bc/patches/.svn/text-base/001-disable-doc.patch.svn-base b/feeds/packages/utils/bc/patches/.svn/text-base/001-disable-doc.patch.svn-base +new file mode 100644 +index 0000000..a6ecd6e +--- /dev/null ++++ b/feeds/packages/utils/bc/patches/.svn/text-base/001-disable-doc.patch.svn-base +@@ -0,0 +1,21 @@ ++--- bc-1.06.95/Makefile.in 2010-07-03 10:48:13.422725147 +0000 +++++ bc-1.06.95/Makefile.in 2010-07-03 10:50:09.714725197 +0000 ++@@ -149,7 +149,7 @@ ++ sharedstatedir = @sharedstatedir@ ++ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++-SUBDIRS = lib bc dc doc +++SUBDIRS = lib bc dc ++ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ ++ stamp-h $(distdir).tar.gz h/number.h depcomp missing ++ ++--- bc-1.06.95/Makefile.am 2010-07-03 10:48:32.522725037 +0000 +++++ bc-1.06.95/Makefile.am 2010-07-03 10:48:38.114725024 +0000 ++@@ -1,6 +1,6 @@ ++ ## Process this file with automake to produce Makefile.in ++ ++-SUBDIRS = lib bc dc doc +++SUBDIRS = lib bc dc ++ ++ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ ++ stamp-h $(distdir).tar.gz h/number.h depcomp missing +diff --git a/feeds/packages/utils/bc/patches/001-disable-doc.patch b/feeds/packages/utils/bc/patches/001-disable-doc.patch +new file mode 100644 +index 0000000..a6ecd6e +--- /dev/null ++++ b/feeds/packages/utils/bc/patches/001-disable-doc.patch +@@ -0,0 +1,21 @@ ++--- bc-1.06.95/Makefile.in 2010-07-03 10:48:13.422725147 +0000 +++++ bc-1.06.95/Makefile.in 2010-07-03 10:50:09.714725197 +0000 ++@@ -149,7 +149,7 @@ ++ sharedstatedir = @sharedstatedir@ ++ sysconfdir = @sysconfdir@ ++ target_alias = @target_alias@ ++-SUBDIRS = lib bc dc doc +++SUBDIRS = lib bc dc ++ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ ++ stamp-h $(distdir).tar.gz h/number.h depcomp missing ++ ++--- bc-1.06.95/Makefile.am 2010-07-03 10:48:32.522725037 +0000 +++++ bc-1.06.95/Makefile.am 2010-07-03 10:48:38.114725024 +0000 ++@@ -1,6 +1,6 @@ ++ ## Process this file with automake to produce Makefile.in ++ ++-SUBDIRS = lib bc dc doc +++SUBDIRS = lib bc dc ++ ++ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ ++ stamp-h $(distdir).tar.gz h/number.h depcomp missing +diff --git a/feeds/packages/utils/bemused/.svn/entries b/feeds/packages/utils/bemused/.svn/entries +new file mode 100644 +index 0000000..a000da8 +--- /dev/null ++++ b/feeds/packages/utils/bemused/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bemused ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d86cc7f47edb7b029059b961bf96b26b ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1947 ++ +diff --git a/feeds/packages/utils/bemused/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bemused/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..61cc101 +--- /dev/null ++++ b/feeds/packages/utils/bemused/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# 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:=bemused-mpd ++PKG_VERSION:=r062 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526 ++PKG_MD5SUM:=aed8b41aed530e9177e43d9bebad10b7 ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/bemusedlinuxserver ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp $(ICONV_DEPENDS) ++ TITLE:=Bemused linux server ++ URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/ ++endef ++ ++define Package/bemusedlinuxserver/description ++ Bemused is a system which allows you to control your music collection ++ from your phone, using Bluetooth. ++ This is the MPD hack version. ++ Check http://jamse.sourceforge.net/ for a mobile phone client. ++endef ++ ++EXTRA_CPPFLAGS:= \ ++ -I$(STAGING_DIR)/usr/include/glib-1.2 \ ++ -I$(STAGING_DIR)/usr/lib/glib/include ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ ++ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDLIBS="-lbluetooth -lglib -liconv" ++endef ++ ++define Package/bemusedlinuxserver/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bemusedlinuxserver $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/bemused.conf $(1)/etc/bemused.conf ++ $(INSTALL_CONF) ./files/bemused-bookmarks $(1)/etc/bemused-bookmarks ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bemused.init $(1)/etc/init.d/bemused ++endef ++ ++define Package/bemusedlinuxserver/conffiles ++/etc/bemused.conf ++/etc/bemused-bookmarks ++endef ++ ++$(eval $(call BuildPackage,bemusedlinuxserver)) +diff --git a/feeds/packages/utils/bemused/Makefile b/feeds/packages/utils/bemused/Makefile +new file mode 100644 +index 0000000..61cc101 +--- /dev/null ++++ b/feeds/packages/utils/bemused/Makefile +@@ -0,0 +1,67 @@ ++# ++# 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:=bemused-mpd ++PKG_VERSION:=r062 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526 ++PKG_MD5SUM:=aed8b41aed530e9177e43d9bebad10b7 ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/bemusedlinuxserver ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp $(ICONV_DEPENDS) ++ TITLE:=Bemused linux server ++ URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/ ++endef ++ ++define Package/bemusedlinuxserver/description ++ Bemused is a system which allows you to control your music collection ++ from your phone, using Bluetooth. ++ This is the MPD hack version. ++ Check http://jamse.sourceforge.net/ for a mobile phone client. ++endef ++ ++EXTRA_CPPFLAGS:= \ ++ -I$(STAGING_DIR)/usr/include/glib-1.2 \ ++ -I$(STAGING_DIR)/usr/lib/glib/include ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ ++ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDLIBS="-lbluetooth -lglib -liconv" ++endef ++ ++define Package/bemusedlinuxserver/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bemusedlinuxserver $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) ./files/bemused.conf $(1)/etc/bemused.conf ++ $(INSTALL_CONF) ./files/bemused-bookmarks $(1)/etc/bemused-bookmarks ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bemused.init $(1)/etc/init.d/bemused ++endef ++ ++define Package/bemusedlinuxserver/conffiles ++/etc/bemused.conf ++/etc/bemused-bookmarks ++endef ++ ++$(eval $(call BuildPackage,bemusedlinuxserver)) +diff --git a/feeds/packages/utils/bemused/files/.svn/entries b/feeds/packages/utils/bemused/files/.svn/entries +new file mode 100644 +index 0000000..860b8bc +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bemused/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:06:48.972554Z ++28955 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bemused.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d36928195a1e227e81e08c6442338ebe ++2011-11-11T18:06:48.972554Z ++28955 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++188 ++ ++bemused.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++2c8c5d1a903578d89e908382b37d67d1 ++2008-05-08T01:01:45.697758Z ++11066 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1526 ++ ++bemused-bookmarks ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ff385f68d24c8343806d0b3a304ce99a ++2008-03-07T10:55:22.664828Z ++10559 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++266 ++ +diff --git a/feeds/packages/utils/bemused/files/.svn/text-base/bemused-bookmarks.svn-base b/feeds/packages/utils/bemused/files/.svn/text-base/bemused-bookmarks.svn-base +new file mode 100644 +index 0000000..5f132b5 +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/.svn/text-base/bemused-bookmarks.svn-base +@@ -0,0 +1,8 @@ ++# Bemused stream file ++# This is quite a simple format file ++# Stream Title = URL ++# ++# IMPORTANT: stream name MUST contain the ".mp3" extension, else jamse will not display the file! ++ ++UnitedBreaks.mp3 = http://74.52.13.138:8000 ++nubreaks.mp3 = http://208.100.38.52:8419 +diff --git a/feeds/packages/utils/bemused/files/.svn/text-base/bemused.conf.svn-base b/feeds/packages/utils/bemused/files/.svn/text-base/bemused.conf.svn-base +new file mode 100644 +index 0000000..95acd46 +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/.svn/text-base/bemused.conf.svn-base +@@ -0,0 +1,43 @@ ++# bemused config file Version 1.73 (no changes since 1.71) ++# lines with a # at the beinning are for comments and not readen by the bemusedserver ++# You only need to set up options which have no default and which ware not optinal ++ ++# this is a mpd-hack version by michu@neophob.com ++ ++# Path to mpd (if mpd is in path only mpd) (default is mpd) ++mpddir=/usr/local/bin/mpd ++ ++# channel for what the serial port service is registered (with sdptool look in README) (default 10) ++# example: ++# root@OpenWrt:~# sdptool browse ++# Inquiring ... ++# <...> ++# Service Name: COM 1 ++# Service RecHandle: 0x10005 ++# Service Class ID List: ++# "Serial Port" (0x1101) ++# Protocol Descriptor List: ++# "L2CAP" (0x0100) ++# "RFCOMM" (0x0003) ++# Channel: 3 <<< ++# Language Base Attr List: ++# code_ISO639: 0x656e ++# encoding: 0x6a ++# base_offset: 0x100 ++channel=3 ++ ++# directorys where the mp3s are. If more than one seperate them by a m semicolon (must be set) ++# point this directory to the mpd music directory! ++mp3dir=/ ++ ++# bookmarks file for URLs of net radio stations (optional) ++bookmarkfile=/etc/bemused-bookmarks ++ ++# speed setting for fast forward and rewind. time for every jump in milliseconds 10000 is default ++#fastforbackspeed=10000 ++ ++# set to 1 to use connection over TCP/IP (for bluetooth pan or maybe LAN oder internet) set to 0 for normal rfcomm bluetooth (default) ++#tcp=1 ++ ++# port to use if you set tcp to 1 for your incomming TCP/IP Connection. (default is 7654 and at the moment the only one useable by the client on the phone) ++#tcpport=7654 +diff --git a/feeds/packages/utils/bemused/files/.svn/text-base/bemused.init.svn-base b/feeds/packages/utils/bemused/files/.svn/text-base/bemused.init.svn-base +new file mode 100644 +index 0000000..a4ab2c7 +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/.svn/text-base/bemused.init.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=95 ++ ++start() { ++ service_start /usr/sbin/bemusedlinuxserver -d ++} ++ ++stop() { ++ service_stop /usr/sbin/bemusedlinuxserver ++} +diff --git a/feeds/packages/utils/bemused/files/bemused-bookmarks b/feeds/packages/utils/bemused/files/bemused-bookmarks +new file mode 100644 +index 0000000..5f132b5 +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/bemused-bookmarks +@@ -0,0 +1,8 @@ ++# Bemused stream file ++# This is quite a simple format file ++# Stream Title = URL ++# ++# IMPORTANT: stream name MUST contain the ".mp3" extension, else jamse will not display the file! ++ ++UnitedBreaks.mp3 = http://74.52.13.138:8000 ++nubreaks.mp3 = http://208.100.38.52:8419 +diff --git a/feeds/packages/utils/bemused/files/bemused.conf b/feeds/packages/utils/bemused/files/bemused.conf +new file mode 100644 +index 0000000..95acd46 +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/bemused.conf +@@ -0,0 +1,43 @@ ++# bemused config file Version 1.73 (no changes since 1.71) ++# lines with a # at the beinning are for comments and not readen by the bemusedserver ++# You only need to set up options which have no default and which ware not optinal ++ ++# this is a mpd-hack version by michu@neophob.com ++ ++# Path to mpd (if mpd is in path only mpd) (default is mpd) ++mpddir=/usr/local/bin/mpd ++ ++# channel for what the serial port service is registered (with sdptool look in README) (default 10) ++# example: ++# root@OpenWrt:~# sdptool browse ++# Inquiring ... ++# <...> ++# Service Name: COM 1 ++# Service RecHandle: 0x10005 ++# Service Class ID List: ++# "Serial Port" (0x1101) ++# Protocol Descriptor List: ++# "L2CAP" (0x0100) ++# "RFCOMM" (0x0003) ++# Channel: 3 <<< ++# Language Base Attr List: ++# code_ISO639: 0x656e ++# encoding: 0x6a ++# base_offset: 0x100 ++channel=3 ++ ++# directorys where the mp3s are. If more than one seperate them by a m semicolon (must be set) ++# point this directory to the mpd music directory! ++mp3dir=/ ++ ++# bookmarks file for URLs of net radio stations (optional) ++bookmarkfile=/etc/bemused-bookmarks ++ ++# speed setting for fast forward and rewind. time for every jump in milliseconds 10000 is default ++#fastforbackspeed=10000 ++ ++# set to 1 to use connection over TCP/IP (for bluetooth pan or maybe LAN oder internet) set to 0 for normal rfcomm bluetooth (default) ++#tcp=1 ++ ++# port to use if you set tcp to 1 for your incomming TCP/IP Connection. (default is 7654 and at the moment the only one useable by the client on the phone) ++#tcpport=7654 +diff --git a/feeds/packages/utils/bemused/files/bemused.init b/feeds/packages/utils/bemused/files/bemused.init +new file mode 100644 +index 0000000..a4ab2c7 +--- /dev/null ++++ b/feeds/packages/utils/bemused/files/bemused.init +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008-2011 OpenWrt.org ++ ++START=95 ++ ++start() { ++ service_start /usr/sbin/bemusedlinuxserver -d ++} ++ ++stop() { ++ service_stop /usr/sbin/bemusedlinuxserver ++} +diff --git a/feeds/packages/utils/bemused/patches/.svn/entries b/feeds/packages/utils/bemused/patches/.svn/entries +new file mode 100644 +index 0000000..86546e3 +--- /dev/null ++++ b/feeds/packages/utils/bemused/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bemused/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-06T13:21:09.522309Z ++25885 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-cxx-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++bbd38e21eea37cd23ceff1852a8aa24f ++2011-03-06T13:21:09.522309Z ++25885 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2313 ++ ++110-missing_includes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0a23626942d5a10aefb39e2c3e1d3c77 ++2010-03-29T11:03:32.148498Z ++20579 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++396 ++ +diff --git a/feeds/packages/utils/bemused/patches/.svn/text-base/110-missing_includes.patch.svn-base b/feeds/packages/utils/bemused/patches/.svn/text-base/110-missing_includes.patch.svn-base +new file mode 100644 +index 0000000..c049e36 +--- /dev/null ++++ b/feeds/packages/utils/bemused/patches/.svn/text-base/110-missing_includes.patch.svn-base +@@ -0,0 +1,11 @@ ++diff -urN bemused-mpd-r062/main.cpp bemused-mpd-r062.new/main.cpp ++--- bemused-mpd-r062/main.cpp 2008-02-23 08:01:38.000000000 +0100 +++++ bemused-mpd-r062.new/main.cpp 2010-03-29 13:00:07.000000000 +0200 ++@@ -16,6 +16,7 @@ ++ ***************************************************************************/ ++ ++ #include +++#include ++ #include ++ ++ #include "BemusedServerDlg.h" +diff --git a/feeds/packages/utils/bemused/patches/.svn/text-base/200-cxx-compile-fixes.patch.svn-base b/feeds/packages/utils/bemused/patches/.svn/text-base/200-cxx-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..4a6ef0e +--- /dev/null ++++ b/feeds/packages/utils/bemused/patches/.svn/text-base/200-cxx-compile-fixes.patch.svn-base +@@ -0,0 +1,71 @@ ++Index: bemused-mpd-r062/Makefile ++=================================================================== ++--- bemused-mpd-r062.orig/Makefile 2008-03-31 09:43:54.000000000 +0200 +++++ bemused-mpd-r062/Makefile 2011-03-06 14:19:07.933096517 +0100 ++@@ -1,8 +1,15 @@ ++-SHELL = /bin/sh +++LDLIBS = -lbluetooth -lglib -liconv +++CPPFLAGS = -I/usr/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I./ +++CFLAGS = -Os +++CXXFLAGS = -Os ++ ++-#optimized for openwrt use! mylibs should be -lbluetooth, liconv and -lglib ++-MYLIBS = -lbluetooth -lglib -liconv ++-INCL = -I/usr/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I./ +++%.o: %.c +++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ ++ ++-bemusedlinuxserver: main.cpp BemusedServerDlg.cpp mpdctrl.c ++- $(CXX) -Os -o bemusedlinuxserver $(INCL) $(LDFLAGS) $(MYLIBS) main.cpp BemusedServerDlg.cpp mpdctrl.c libmpdclient.c +++%.o: %.cpp +++ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $^ -o $@ +++ +++bemusedlinuxserver: main.o BemusedServerDlg.o mpdctrl.o libmpdclient.o +++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ +++ +++all: bemusedlinuxserver ++Index: bemused-mpd-r062/libmpdclient.h ++=================================================================== ++--- bemused-mpd-r062.orig/libmpdclient.h 2008-04-28 23:03:52.000000000 +0200 +++++ bemused-mpd-r062/libmpdclient.h 2011-03-06 14:15:34.821307043 +0100 ++@@ -68,11 +68,10 @@ ++ #define MPD_ACK_ERROR_EXIST 56 ++ ++ #include ++-#include ++ ++-//#ifdef __cplusplus ++-//extern "C" { ++-//#endif +++#ifdef __cplusplus +++extern "C" { +++#endif ++ ++ typedef enum mpd_TagItems { ++ MPD_TAG_ITEM_ARTIST, ++@@ -654,8 +653,8 @@ void mpd_sendPlaylistAddCommand(mpd_Conn ++ void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to); ++ ++ void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos); ++-//#ifdef __cplusplus ++-//} ++-//#endif +++#ifdef __cplusplus +++} +++#endif ++ ++ #endif ++Index: bemused-mpd-r062/mpdctrl.c ++=================================================================== ++--- bemused-mpd-r062.orig/mpdctrl.c 2008-04-28 23:03:52.000000000 +0200 +++++ bemused-mpd-r062/mpdctrl.c 2011-03-06 14:15:34.821307043 +0100 ++@@ -59,6 +59,9 @@ ++ ++ #define ERROR_DISPLAY 5 ++ +++#define false 0 +++#define true (!false) +++ ++ static int l_totalTimeSec; ++ static int l_elapsedTimeSec; ++ static int l_bitRate; +diff --git a/feeds/packages/utils/bemused/patches/110-missing_includes.patch b/feeds/packages/utils/bemused/patches/110-missing_includes.patch +new file mode 100644 +index 0000000..c049e36 +--- /dev/null ++++ b/feeds/packages/utils/bemused/patches/110-missing_includes.patch +@@ -0,0 +1,11 @@ ++diff -urN bemused-mpd-r062/main.cpp bemused-mpd-r062.new/main.cpp ++--- bemused-mpd-r062/main.cpp 2008-02-23 08:01:38.000000000 +0100 +++++ bemused-mpd-r062.new/main.cpp 2010-03-29 13:00:07.000000000 +0200 ++@@ -16,6 +16,7 @@ ++ ***************************************************************************/ ++ ++ #include +++#include ++ #include ++ ++ #include "BemusedServerDlg.h" +diff --git a/feeds/packages/utils/bemused/patches/200-cxx-compile-fixes.patch b/feeds/packages/utils/bemused/patches/200-cxx-compile-fixes.patch +new file mode 100644 +index 0000000..4a6ef0e +--- /dev/null ++++ b/feeds/packages/utils/bemused/patches/200-cxx-compile-fixes.patch +@@ -0,0 +1,71 @@ ++Index: bemused-mpd-r062/Makefile ++=================================================================== ++--- bemused-mpd-r062.orig/Makefile 2008-03-31 09:43:54.000000000 +0200 +++++ bemused-mpd-r062/Makefile 2011-03-06 14:19:07.933096517 +0100 ++@@ -1,8 +1,15 @@ ++-SHELL = /bin/sh +++LDLIBS = -lbluetooth -lglib -liconv +++CPPFLAGS = -I/usr/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I./ +++CFLAGS = -Os +++CXXFLAGS = -Os ++ ++-#optimized for openwrt use! mylibs should be -lbluetooth, liconv and -lglib ++-MYLIBS = -lbluetooth -lglib -liconv ++-INCL = -I/usr/include -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I./ +++%.o: %.c +++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ ++ ++-bemusedlinuxserver: main.cpp BemusedServerDlg.cpp mpdctrl.c ++- $(CXX) -Os -o bemusedlinuxserver $(INCL) $(LDFLAGS) $(MYLIBS) main.cpp BemusedServerDlg.cpp mpdctrl.c libmpdclient.c +++%.o: %.cpp +++ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $^ -o $@ +++ +++bemusedlinuxserver: main.o BemusedServerDlg.o mpdctrl.o libmpdclient.o +++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ +++ +++all: bemusedlinuxserver ++Index: bemused-mpd-r062/libmpdclient.h ++=================================================================== ++--- bemused-mpd-r062.orig/libmpdclient.h 2008-04-28 23:03:52.000000000 +0200 +++++ bemused-mpd-r062/libmpdclient.h 2011-03-06 14:15:34.821307043 +0100 ++@@ -68,11 +68,10 @@ ++ #define MPD_ACK_ERROR_EXIST 56 ++ ++ #include ++-#include ++ ++-//#ifdef __cplusplus ++-//extern "C" { ++-//#endif +++#ifdef __cplusplus +++extern "C" { +++#endif ++ ++ typedef enum mpd_TagItems { ++ MPD_TAG_ITEM_ARTIST, ++@@ -654,8 +653,8 @@ void mpd_sendPlaylistAddCommand(mpd_Conn ++ void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to); ++ ++ void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos); ++-//#ifdef __cplusplus ++-//} ++-//#endif +++#ifdef __cplusplus +++} +++#endif ++ ++ #endif ++Index: bemused-mpd-r062/mpdctrl.c ++=================================================================== ++--- bemused-mpd-r062.orig/mpdctrl.c 2008-04-28 23:03:52.000000000 +0200 +++++ bemused-mpd-r062/mpdctrl.c 2011-03-06 14:15:34.821307043 +0100 ++@@ -59,6 +59,9 @@ ++ ++ #define ERROR_DISPLAY 5 ++ +++#define false 0 +++#define true (!false) +++ ++ static int l_totalTimeSec; ++ static int l_elapsedTimeSec; ++ static int l_bitRate; +diff --git a/feeds/packages/utils/bluelog/.svn/entries b/feeds/packages/utils/bluelog/.svn/entries +new file mode 100644 +index 0000000..02c05a6 +--- /dev/null ++++ b/feeds/packages/utils/bluelog/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bluelog ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-20T20:57:23.233027Z ++35256 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ee8603b43e7998c66168685665851997 ++2013-01-20T20:57:23.233027Z ++35256 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2621 ++ +diff --git a/feeds/packages/utils/bluelog/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bluelog/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ac9b150 +--- /dev/null ++++ b/feeds/packages/utils/bluelog/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,88 @@ ++# ++# 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.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.digifail.com/downloads/software/bluelog ++PKG_MD5SUM:=a5327d64731cd45debb57ab1edbe6e43 ++ ++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-utils +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/feeds/packages/utils/bluelog/Makefile b/feeds/packages/utils/bluelog/Makefile +new file mode 100644 +index 0000000..ac9b150 +--- /dev/null ++++ b/feeds/packages/utils/bluelog/Makefile +@@ -0,0 +1,88 @@ ++# ++# 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.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.digifail.com/downloads/software/bluelog ++PKG_MD5SUM:=a5327d64731cd45debb57ab1edbe6e43 ++ ++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-utils +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/feeds/packages/utils/bluelog/files/.svn/entries b/feeds/packages/utils/bluelog/files/.svn/entries +new file mode 100644 +index 0000000..9c1fc4d +--- /dev/null ++++ b/feeds/packages/utils/bluelog/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bluelog/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-11T05:37:31.422367Z ++30431 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bluelog.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++730f8f753881f8c1a79e42b8baa4ffc7 ++2012-02-11T05:37:31.422367Z ++30431 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++144 ++ +diff --git a/feeds/packages/utils/bluelog/files/.svn/text-base/bluelog.init.svn-base b/feeds/packages/utils/bluelog/files/.svn/text-base/bluelog.init.svn-base +new file mode 100644 +index 0000000..efae288 +--- /dev/null ++++ b/feeds/packages/utils/bluelog/files/.svn/text-base/bluelog.init.svn-base +@@ -0,0 +1,13 @@ ++#!/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/feeds/packages/utils/bluelog/files/bluelog.init b/feeds/packages/utils/bluelog/files/bluelog.init +new file mode 100644 +index 0000000..efae288 +--- /dev/null ++++ b/feeds/packages/utils/bluelog/files/bluelog.init +@@ -0,0 +1,13 @@ ++#!/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/feeds/packages/utils/bluez-hcidump/.svn/entries b/feeds/packages/utils/bluez-hcidump/.svn/entries +new file mode 100644 +index 0000000..142a1d8 +--- /dev/null ++++ b/feeds/packages/utils/bluez-hcidump/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bluez-hcidump ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++0cf74f42bf28406ecc178262354be86a ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++900 ++ +diff --git a/feeds/packages/utils/bluez-hcidump/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bluez-hcidump/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0385553 +--- /dev/null ++++ b/feeds/packages/utils/bluez-hcidump/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=bluez-hcidump ++PKG_VERSION:=1.42 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://bluez.sourceforge.net/download ++PKG_MD5SUM:=5704737aaf72104eeaf77335218a1827 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bluez-hcidump ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bluez-libs ++ TITLE:=Bluetooth packet analyzer ++ URL:=http://www.bluez.org/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-bluez="$(STAGING_DIR)/usr/include" \ ++ ) ++endef ++ ++define Package/bluez-hcidump/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hcidump $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,bluez-hcidump)) +diff --git a/feeds/packages/utils/bluez-hcidump/Makefile b/feeds/packages/utils/bluez-hcidump/Makefile +new file mode 100644 +index 0000000..0385553 +--- /dev/null ++++ b/feeds/packages/utils/bluez-hcidump/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=bluez-hcidump ++PKG_VERSION:=1.42 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://bluez.sourceforge.net/download ++PKG_MD5SUM:=5704737aaf72104eeaf77335218a1827 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bluez-hcidump ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bluez-libs ++ TITLE:=Bluetooth packet analyzer ++ URL:=http://www.bluez.org/ ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --with-bluez="$(STAGING_DIR)/usr/include" \ ++ ) ++endef ++ ++define Package/bluez-hcidump/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hcidump $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,bluez-hcidump)) +diff --git a/feeds/packages/utils/bluez-utils/.svn/entries b/feeds/packages/utils/bluez-utils/.svn/entries +new file mode 100644 +index 0000000..7c615a2 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bluez-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1ebf3c7e0cca23cdc091bcba32c418d5 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1985 ++ +diff --git a/feeds/packages/utils/bluez-utils/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/bluez-utils/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bluez-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bluez-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4f3f787 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,75 @@ ++# ++# 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:=bluez-utils ++PKG_VERSION:=3.36 ++PKG_RELEASE:=12 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://bluez.sourceforge.net/download ++PKG_MD5SUM:=4fc292b635ba7b442c7aaf5680199012 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/bluez-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bluez-libs +libpthread +dbus $(INTL_DEPENDS) $(ICONV_DEPENDS) ++ TITLE:=Bluetooth utilities ++ URL:=http://www.bluez.org/ ++endef ++ ++define Package/bluez-utils/conffiles ++/etc/bluetooth/hcid.conf ++/etc/bluetooth/rfcomm.conf ++/etc/config/bluetooth ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-glib \ ++ --enable-pand \ ++ --enable-rfcomm \ ++ --enable-dund \ ++ --enable-serial \ ++ --enable-network \ ++ --enable-usb \ ++ --enable-input \ ++ --disable-audio \ ++ --with-bluez="$(STAGING_DIR)/usr/include" \ ++ --with-usb=yes \ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LDFLAGS="$(TARGET_LDFLAGS) \ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/lib -lm" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/bluez-utils/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/ ++ $(INSTALL_DIR) $(1)/etc/bluetooth ++ $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/hcid.conf $(1)/etc/bluetooth/ ++ $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/rfcomm.conf $(1)/etc/bluetooth/ ++ $(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/init.d ++ $(INSTALL_BIN) ./files/bluez-utils.init $(1)/etc/init.d/bluez-utils ++endef ++ ++$(eval $(call BuildPackage,bluez-utils)) +diff --git a/feeds/packages/utils/bluez-utils/Makefile b/feeds/packages/utils/bluez-utils/Makefile +new file mode 100644 +index 0000000..4f3f787 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/Makefile +@@ -0,0 +1,75 @@ ++# ++# 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:=bluez-utils ++PKG_VERSION:=3.36 ++PKG_RELEASE:=12 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://bluez.sourceforge.net/download ++PKG_MD5SUM:=4fc292b635ba7b442c7aaf5680199012 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/bluez-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bluez-libs +libpthread +dbus $(INTL_DEPENDS) $(ICONV_DEPENDS) ++ TITLE:=Bluetooth utilities ++ URL:=http://www.bluez.org/ ++endef ++ ++define Package/bluez-utils/conffiles ++/etc/bluetooth/hcid.conf ++/etc/bluetooth/rfcomm.conf ++/etc/config/bluetooth ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-glib \ ++ --enable-pand \ ++ --enable-rfcomm \ ++ --enable-dund \ ++ --enable-serial \ ++ --enable-network \ ++ --enable-usb \ ++ --enable-input \ ++ --disable-audio \ ++ --with-bluez="$(STAGING_DIR)/usr/include" \ ++ --with-usb=yes \ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LDFLAGS="$(TARGET_LDFLAGS) \ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/lib -lm" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all install ++endef ++ ++define Package/bluez-utils/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/ ++ $(INSTALL_DIR) $(1)/etc/bluetooth ++ $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/hcid.conf $(1)/etc/bluetooth/ ++ $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/rfcomm.conf $(1)/etc/bluetooth/ ++ $(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/init.d ++ $(INSTALL_BIN) ./files/bluez-utils.init $(1)/etc/init.d/bluez-utils ++endef ++ ++$(eval $(call BuildPackage,bluez-utils)) +diff --git a/feeds/packages/utils/bluez-utils/files/.svn/entries b/feeds/packages/utils/bluez-utils/files/.svn/entries +new file mode 100644 +index 0000000..6b0042e +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bluez-utils/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T06:36:54.128249Z ++32054 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bluetooth.dbus ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c5e0cfe9297afa4ce7c76fa2acc78cb6 ++2008-08-30T20:59:40.414510Z ++12440 ++rwhitby ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1131 ++ ++bluez-utils.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7509a359089b316d0204c70e73212c5a ++2012-06-05T06:36:54.128249Z ++32054 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3432 ++ ++givepin ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++821f891f13c992671e0d19d1e85f3bed ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++227 ++ ++bluetooth.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++51db1ecc934d9b086f27a9625bf2f451 ++2011-11-17T11:49:08.570136Z ++29231 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++623 ++ +diff --git a/feeds/packages/utils/bluez-utils/files/.svn/prop-base/givepin.svn-base b/feeds/packages/utils/bluez-utils/files/.svn/prop-base/givepin.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/.svn/prop-base/givepin.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluetooth.config.svn-base b/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluetooth.config.svn-base +new file mode 100644 +index 0000000..42f390c +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluetooth.config.svn-base +@@ -0,0 +1,32 @@ ++config hcid ++# option config /etc/bluetooth/hcid.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 ++ ++config dund ++ option listen true ++ option persist true ++ option msdun true ++ option interface dund ++ option unit 1 ++ option pppdopts "ktune proxyarp 192.168.1.1:192.168.1.2 ms-dns 192.168.1.1" ++ option enabled 0 ++ ++config pand ++ option listen true ++ option autozap true ++ option role "NAP" ++ option master true ++ option persist true ++ option enabled 0 +diff --git a/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluetooth.dbus.svn-base b/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluetooth.dbus.svn-base +new file mode 100644 +index 0000000..88545fa +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluetooth.dbus.svn-base +@@ -0,0 +1,37 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluez-utils.init.svn-base b/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluez-utils.init.svn-base +new file mode 100644 +index 0000000..e9320ae +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/.svn/text-base/bluez-utils.init.svn-base +@@ -0,0 +1,131 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007 OpenWrt.org ++ ++#start after dbus (60) ++START=62 ++ ++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 default="$4" ++ local _val ++ config_get _val "$section" "$option" "$default" ++ [ -n "$_val" ] && append args "$3 $_val" ++} ++ ++hcid_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_bool "$cfg" nodaemon "-n" ++ append_string "$cfg" config "-f" ++ service_start /usr/sbin/hcid $args ++} ++ ++hciattach_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_string "$cfg" initspeed "-s" "115200" ++ append_string "$cfg" tty " " "ttyS1" ++ append_string "$cfg" type " " "csr" ++ append_string "$cfg" speed " " "115200" ++ append_string "$cfg" flow " " "noflow" ++ service_start /usr/sbin/hciattach $args ++} ++ ++rfcomm_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_string "$cfg" config "-f" ++ /usr/bin/rfcomm $args bind all ++} ++ ++dund_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_bool "$cfg" listen "--listen" ++ append_string "$cfg" connect "--connect" ++ append_string "$cfg" mrouter "--mrouter" ++ append_bool "$cfg" search "--search" ++ append_string "$cfg" channel "--channel" ++ append_string "$cfg" device "--device" ++ append_bool "$cfg" nosdp "--nosdp" ++ append_bool "$cfg" auth "--auth" ++ append_bool "$cfg" encrypt "--encrypt" ++ append_bool "$cfg" secure "--secure" ++ append_bool "$cfg" master "--master" ++ append_bool "$cfg" nodetach "--nodetach" ++ append_bool "$cfg" persist "--persist" ++ append_string "$cfg" pppd "--pppd" ++ append_bool "$cfg" msdun "--msdun" ++ append_bool "$cfg" activesync "--activesync" ++ append_bool "$cfg" cache "--cache" ++ ++ append_string "$cfg" pppdopts "" ++ config_get ifn "$cfg" interface ++ if [ -n "$ifn" ]; then ++ config_get unit "$cfg" unit ++ [ -z "$unit" ] || append args "unit $unit ipparam $ifn linkname $ifn" ++ fi ++ ++ service_start /usr/bin/dund $args ++} ++ ++pand_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_bool "$cfg" listen "--listen" ++ append_string "$cfg" connect "--connect" ++ append_bool "$cfg" autozap "--autozap" ++ append_bool "$cfg" search "--search" ++ append_string "$cfg" role "--role" ++ append_string "$cfg" service "--service" ++ append_string "$cfg" ethernet "--ethernet" ++ append_string "$cfg" device "--device" ++ append_bool "$cfg" nosdp "-D" ++ append_bool "$cfg" auth "-A" ++ append_bool "$cfg" encrypt "-E" ++ append_bool "$cfg" secure "-S" ++ append_bool "$cfg" master "-M" ++ append_bool "$cfg" nodetach "-n" ++ append_bool "$cfg" persist "--persist" ++ append_bool "$cfg" cache "--cache" ++ append_string "$cfg" pidfile "--pidfile" ++ service_start /usr/bin/pand $args ++} ++ ++start() { ++ config_load bluetooth ++ config_foreach hcid_config hcid ++ config_foreach hciattach_config hciattach ++ config_foreach rfcomm_config rfcomm ++ config_foreach dund_config dund ++ config_foreach pand_config pand ++} ++ ++stop() { ++ service_stop /usr/bin/dund ++ service_stop /usr/bin/pand ++ /usr/bin/rfcomm release all ++ service_stop /usr/sbin/hciattach ++ service_stop /usr/sbin/hcid ++} +diff --git a/feeds/packages/utils/bluez-utils/files/.svn/text-base/givepin.svn-base b/feeds/packages/utils/bluez-utils/files/.svn/text-base/givepin.svn-base +new file mode 100644 +index 0000000..e52a338 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/.svn/text-base/givepin.svn-base +@@ -0,0 +1,14 @@ ++#!/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/feeds/packages/utils/bluez-utils/files/bluetooth.config b/feeds/packages/utils/bluez-utils/files/bluetooth.config +new file mode 100644 +index 0000000..42f390c +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/bluetooth.config +@@ -0,0 +1,32 @@ ++config hcid ++# option config /etc/bluetooth/hcid.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 ++ ++config dund ++ option listen true ++ option persist true ++ option msdun true ++ option interface dund ++ option unit 1 ++ option pppdopts "ktune proxyarp 192.168.1.1:192.168.1.2 ms-dns 192.168.1.1" ++ option enabled 0 ++ ++config pand ++ option listen true ++ option autozap true ++ option role "NAP" ++ option master true ++ option persist true ++ option enabled 0 +diff --git a/feeds/packages/utils/bluez-utils/files/bluetooth.dbus b/feeds/packages/utils/bluez-utils/files/bluetooth.dbus +new file mode 100644 +index 0000000..88545fa +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/bluetooth.dbus +@@ -0,0 +1,37 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/feeds/packages/utils/bluez-utils/files/bluez-utils.init b/feeds/packages/utils/bluez-utils/files/bluez-utils.init +new file mode 100644 +index 0000000..e9320ae +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/bluez-utils.init +@@ -0,0 +1,131 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007 OpenWrt.org ++ ++#start after dbus (60) ++START=62 ++ ++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 default="$4" ++ local _val ++ config_get _val "$section" "$option" "$default" ++ [ -n "$_val" ] && append args "$3 $_val" ++} ++ ++hcid_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_bool "$cfg" nodaemon "-n" ++ append_string "$cfg" config "-f" ++ service_start /usr/sbin/hcid $args ++} ++ ++hciattach_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_string "$cfg" initspeed "-s" "115200" ++ append_string "$cfg" tty " " "ttyS1" ++ append_string "$cfg" type " " "csr" ++ append_string "$cfg" speed " " "115200" ++ append_string "$cfg" flow " " "noflow" ++ service_start /usr/sbin/hciattach $args ++} ++ ++rfcomm_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_string "$cfg" config "-f" ++ /usr/bin/rfcomm $args bind all ++} ++ ++dund_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_bool "$cfg" listen "--listen" ++ append_string "$cfg" connect "--connect" ++ append_string "$cfg" mrouter "--mrouter" ++ append_bool "$cfg" search "--search" ++ append_string "$cfg" channel "--channel" ++ append_string "$cfg" device "--device" ++ append_bool "$cfg" nosdp "--nosdp" ++ append_bool "$cfg" auth "--auth" ++ append_bool "$cfg" encrypt "--encrypt" ++ append_bool "$cfg" secure "--secure" ++ append_bool "$cfg" master "--master" ++ append_bool "$cfg" nodetach "--nodetach" ++ append_bool "$cfg" persist "--persist" ++ append_string "$cfg" pppd "--pppd" ++ append_bool "$cfg" msdun "--msdun" ++ append_bool "$cfg" activesync "--activesync" ++ append_bool "$cfg" cache "--cache" ++ ++ append_string "$cfg" pppdopts "" ++ config_get ifn "$cfg" interface ++ if [ -n "$ifn" ]; then ++ config_get unit "$cfg" unit ++ [ -z "$unit" ] || append args "unit $unit ipparam $ifn linkname $ifn" ++ fi ++ ++ service_start /usr/bin/dund $args ++} ++ ++pand_config() { ++ local cfg="$1" ++ config_get_bool enabled "$cfg" "enabled" '1' ++ [ $enabled -gt 0 ] || return 1 ++ args="" ++ append_bool "$cfg" listen "--listen" ++ append_string "$cfg" connect "--connect" ++ append_bool "$cfg" autozap "--autozap" ++ append_bool "$cfg" search "--search" ++ append_string "$cfg" role "--role" ++ append_string "$cfg" service "--service" ++ append_string "$cfg" ethernet "--ethernet" ++ append_string "$cfg" device "--device" ++ append_bool "$cfg" nosdp "-D" ++ append_bool "$cfg" auth "-A" ++ append_bool "$cfg" encrypt "-E" ++ append_bool "$cfg" secure "-S" ++ append_bool "$cfg" master "-M" ++ append_bool "$cfg" nodetach "-n" ++ append_bool "$cfg" persist "--persist" ++ append_bool "$cfg" cache "--cache" ++ append_string "$cfg" pidfile "--pidfile" ++ service_start /usr/bin/pand $args ++} ++ ++start() { ++ config_load bluetooth ++ config_foreach hcid_config hcid ++ config_foreach hciattach_config hciattach ++ config_foreach rfcomm_config rfcomm ++ config_foreach dund_config dund ++ config_foreach pand_config pand ++} ++ ++stop() { ++ service_stop /usr/bin/dund ++ service_stop /usr/bin/pand ++ /usr/bin/rfcomm release all ++ service_stop /usr/sbin/hciattach ++ service_stop /usr/sbin/hcid ++} +diff --git a/feeds/packages/utils/bluez-utils/files/givepin b/feeds/packages/utils/bluez-utils/files/givepin +new file mode 100644 +index 0000000..e52a338 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/files/givepin +@@ -0,0 +1,14 @@ ++#!/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/feeds/packages/utils/bluez-utils/patches/.svn/entries b/feeds/packages/utils/bluez-utils/patches/.svn/entries +new file mode 100644 +index 0000000..17c9088 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bluez-utils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-include_limits.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++17b6a5b28521276d9d4b6ad55249085e ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++447 ++ ++100-enokey.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a3030eec9474148d0f079f43b3fda959 ++2008-07-19T18:00:19.140621Z ++11879 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++441 ++ ++200-uart-speed.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a31b97ed109a1e161beeb47034fa63f1 ++2008-07-19T18:00:19.140621Z ++11879 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++681 ++ ++002-hcid_pin_helper.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++b70d7c0ac27295a966f42fa27275ea0e ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++398 ++ +diff --git a/feeds/packages/utils/bluez-utils/patches/.svn/prop-base/001-include_limits.patch.svn-base b/feeds/packages/utils/bluez-utils/patches/.svn/prop-base/001-include_limits.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/prop-base/001-include_limits.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bluez-utils/patches/.svn/prop-base/002-hcid_pin_helper.patch.svn-base b/feeds/packages/utils/bluez-utils/patches/.svn/prop-base/002-hcid_pin_helper.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/prop-base/002-hcid_pin_helper.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bluez-utils/patches/.svn/text-base/001-include_limits.patch.svn-base b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/001-include_limits.patch.svn-base +new file mode 100644 +index 0000000..2617306 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/001-include_limits.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/hidd/sdp.c +++++ b/hidd/sdp.c ++@@ -34,6 +34,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #include ++--- a/tools/hciconfig.c +++++ b/tools/hciconfig.c ++@@ -37,6 +37,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/utils/bluez-utils/patches/.svn/text-base/002-hcid_pin_helper.patch.svn-base b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/002-hcid_pin_helper.patch.svn-base +new file mode 100644 +index 0000000..c236e4d +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/002-hcid_pin_helper.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/hcid/hcid.conf +++++ b/hcid/hcid.conf ++@@ -12,7 +12,7 @@ ++ # auto - Use local PIN for incoming connections ++ # user - Always ask user for a PIN ++ # ++- security user; +++ security auto; ++ ++ # Pairing mode ++ # none - Pairing disabled ++@@ -29,7 +29,7 @@ ++ # Local device name ++ # %d - device id ++ # %h - host name ++- name "BlueZ (%d)"; +++ name "%h"; ++ ++ # Local device class ++ class 0x000100; +diff --git a/feeds/packages/utils/bluez-utils/patches/.svn/text-base/100-enokey.patch.svn-base b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/100-enokey.patch.svn-base +new file mode 100644 +index 0000000..6273e17 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/100-enokey.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/input/device.c +++++ b/input/device.c ++@@ -25,6 +25,8 @@ ++ #include ++ #endif ++ +++#define ENOKEY 161 /* Required key not available */ +++ ++ #include ++ #include ++ #include ++--- a/input/storage.c +++++ b/input/storage.c ++@@ -25,6 +25,8 @@ ++ #include ++ #endif ++ +++#define ENOKEY 161 /* Required key not available */ +++ ++ #include ++ #include ++ #include +diff --git a/feeds/packages/utils/bluez-utils/patches/.svn/text-base/200-uart-speed.patch.svn-base b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/200-uart-speed.patch.svn-base +new file mode 100644 +index 0000000..cb7d0e8 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/.svn/text-base/200-uart-speed.patch.svn-base +@@ -0,0 +1,40 @@ ++--- a/tools/hciattach.c +++++ b/tools/hciattach.c ++@@ -111,20 +111,37 @@ ++ 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/feeds/packages/utils/bluez-utils/patches/001-include_limits.patch b/feeds/packages/utils/bluez-utils/patches/001-include_limits.patch +new file mode 100644 +index 0000000..2617306 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/001-include_limits.patch +@@ -0,0 +1,20 @@ ++--- a/hidd/sdp.c +++++ b/hidd/sdp.c ++@@ -34,6 +34,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #include ++--- a/tools/hciconfig.c +++++ b/tools/hciconfig.c ++@@ -37,6 +37,7 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include ++ #include +diff --git a/feeds/packages/utils/bluez-utils/patches/002-hcid_pin_helper.patch b/feeds/packages/utils/bluez-utils/patches/002-hcid_pin_helper.patch +new file mode 100644 +index 0000000..c236e4d +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/002-hcid_pin_helper.patch +@@ -0,0 +1,20 @@ ++--- a/hcid/hcid.conf +++++ b/hcid/hcid.conf ++@@ -12,7 +12,7 @@ ++ # auto - Use local PIN for incoming connections ++ # user - Always ask user for a PIN ++ # ++- security user; +++ security auto; ++ ++ # Pairing mode ++ # none - Pairing disabled ++@@ -29,7 +29,7 @@ ++ # Local device name ++ # %d - device id ++ # %h - host name ++- name "BlueZ (%d)"; +++ name "%h"; ++ ++ # Local device class ++ class 0x000100; +diff --git a/feeds/packages/utils/bluez-utils/patches/100-enokey.patch b/feeds/packages/utils/bluez-utils/patches/100-enokey.patch +new file mode 100644 +index 0000000..6273e17 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/100-enokey.patch +@@ -0,0 +1,22 @@ ++--- a/input/device.c +++++ b/input/device.c ++@@ -25,6 +25,8 @@ ++ #include ++ #endif ++ +++#define ENOKEY 161 /* Required key not available */ +++ ++ #include ++ #include ++ #include ++--- a/input/storage.c +++++ b/input/storage.c ++@@ -25,6 +25,8 @@ ++ #include ++ #endif ++ +++#define ENOKEY 161 /* Required key not available */ +++ ++ #include ++ #include ++ #include +diff --git a/feeds/packages/utils/bluez-utils/patches/200-uart-speed.patch b/feeds/packages/utils/bluez-utils/patches/200-uart-speed.patch +new file mode 100644 +index 0000000..cb7d0e8 +--- /dev/null ++++ b/feeds/packages/utils/bluez-utils/patches/200-uart-speed.patch +@@ -0,0 +1,40 @@ ++--- a/tools/hciattach.c +++++ b/tools/hciattach.c ++@@ -111,20 +111,37 @@ ++ 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/feeds/packages/utils/boblight/.svn/entries b/feeds/packages/utils/boblight/.svn/entries +new file mode 100644 +index 0000000..62288da +--- /dev/null ++++ b/feeds/packages/utils/boblight/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/boblight ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-06T19:41:39.335058Z ++35027 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++6e1df2022b1b803cddd2999082d338b4 ++2013-01-06T19:41:39.335058Z ++35027 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3384 ++ +diff --git a/feeds/packages/utils/boblight/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/boblight/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..410a132 +--- /dev/null ++++ b/feeds/packages/utils/boblight/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,123 @@ ++# ++# Copyright (C) 2011-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:=boblight ++PKG_REV:=412 ++PKG_VERSION:=$(PKG_REV) ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://boblight.googlecode.com/svn/trunk ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/boblight/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Tools for driving lights connected to an external controller ++ URL:=http://code.google.com/p/boblight/ ++ DEPENDS:=+librt +libstdcpp ++endef ++ ++define Package/boblight/Default/description ++ Its main purpose is to create light effects from an external input, such as a ++ video stream (desktop capture, video player, tv card), an audio stream (jack, ++ alsa), or user input (lirc, http). Currently it only handles video input by ++ desktop capture with xlib, video capture from v4l/v4l2 devices and user input ++ from the commandline with boblight-constant. ++ ++ Boblight uses a client/server model, where clients are responsible for ++ translating an external input to light data, and boblightd is responsible for ++ translating the light data into commands for external light controllers. ++endef ++ ++define Package/boblight-client ++ $(call Package/boblight/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= (constant color client) ++ DEPENDS+= +libboblight ++endef ++ ++define Package/boblight-client/description ++ $(call Package/boblight/Default/description) ++ ++ This package contains the boblight constant color client. ++endef ++ ++define Package/boblight-daemon ++ $(call Package/boblight/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= (daemon) ++ DEPENDS+= +libboblight ++endef ++ ++define Package/boblight-daemon/conffiles ++/etc/boblight.conf ++endef ++ ++define Package/boblight-daemon/description ++ $(call Package/boblight/Default/description) ++ ++ This package contains the boblight daemon. ++endef ++ ++define Package/libboblight ++ $(call Package/boblight/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++endef ++ ++define Package/libboblight/description ++ $(call Package/boblight/Default/description) ++ ++ This package contains the libboblight shared library. ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-portaudio \ ++ --without-x11 ++ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libboblight ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libboblight $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libboblight.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/boblight-client/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/boblight-constant $(1)/usr/bin/ ++endef ++ ++define Package/boblight-daemon/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/boblight.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/boblight.init $(1)/etc/init.d/boblight ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/boblightd $(1)/usr/bin/ ++endef ++ ++define Package/libboblight/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libboblight.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,boblight-client)) ++$(eval $(call BuildPackage,boblight-daemon)) ++$(eval $(call BuildPackage,libboblight)) +diff --git a/feeds/packages/utils/boblight/Makefile b/feeds/packages/utils/boblight/Makefile +new file mode 100644 +index 0000000..410a132 +--- /dev/null ++++ b/feeds/packages/utils/boblight/Makefile +@@ -0,0 +1,123 @@ ++# ++# Copyright (C) 2011-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:=boblight ++PKG_REV:=412 ++PKG_VERSION:=$(PKG_REV) ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://boblight.googlecode.com/svn/trunk ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/boblight/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Tools for driving lights connected to an external controller ++ URL:=http://code.google.com/p/boblight/ ++ DEPENDS:=+librt +libstdcpp ++endef ++ ++define Package/boblight/Default/description ++ Its main purpose is to create light effects from an external input, such as a ++ video stream (desktop capture, video player, tv card), an audio stream (jack, ++ alsa), or user input (lirc, http). Currently it only handles video input by ++ desktop capture with xlib, video capture from v4l/v4l2 devices and user input ++ from the commandline with boblight-constant. ++ ++ Boblight uses a client/server model, where clients are responsible for ++ translating an external input to light data, and boblightd is responsible for ++ translating the light data into commands for external light controllers. ++endef ++ ++define Package/boblight-client ++ $(call Package/boblight/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= (constant color client) ++ DEPENDS+= +libboblight ++endef ++ ++define Package/boblight-client/description ++ $(call Package/boblight/Default/description) ++ ++ This package contains the boblight constant color client. ++endef ++ ++define Package/boblight-daemon ++ $(call Package/boblight/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= (daemon) ++ DEPENDS+= +libboblight ++endef ++ ++define Package/boblight-daemon/conffiles ++/etc/boblight.conf ++endef ++ ++define Package/boblight-daemon/description ++ $(call Package/boblight/Default/description) ++ ++ This package contains the boblight daemon. ++endef ++ ++define Package/libboblight ++ $(call Package/boblight/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++endef ++ ++define Package/libboblight/description ++ $(call Package/boblight/Default/description) ++ ++ This package contains the libboblight shared library. ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-portaudio \ ++ --without-x11 ++ ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include/libboblight ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/libboblight $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libboblight.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/boblight-client/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/boblight-constant $(1)/usr/bin/ ++endef ++ ++define Package/boblight-daemon/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/boblight.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/boblight.init $(1)/etc/init.d/boblight ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/boblightd $(1)/usr/bin/ ++endef ++ ++define Package/libboblight/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libboblight.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,boblight-client)) ++$(eval $(call BuildPackage,boblight-daemon)) ++$(eval $(call BuildPackage,libboblight)) +diff --git a/feeds/packages/utils/boblight/files/.svn/entries b/feeds/packages/utils/boblight/files/.svn/entries +new file mode 100644 +index 0000000..899ba15 +--- /dev/null ++++ b/feeds/packages/utils/boblight/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/boblight/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-17T03:12:26.061439Z ++30608 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++boblight.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++b93ef7891762740f9b5706577c2122fb ++2012-02-17T03:12:26.061439Z ++30608 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++148 ++ +diff --git a/feeds/packages/utils/boblight/files/.svn/text-base/boblight.init.svn-base b/feeds/packages/utils/boblight/files/.svn/text-base/boblight.init.svn-base +new file mode 100644 +index 0000000..73705e7 +--- /dev/null ++++ b/feeds/packages/utils/boblight/files/.svn/text-base/boblight.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=65 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() { ++ service_start /usr/bin/boblightd ++} ++ ++stop() { ++ service_stop /usr/bin/boblightd ++} +diff --git a/feeds/packages/utils/boblight/files/boblight.init b/feeds/packages/utils/boblight/files/boblight.init +new file mode 100644 +index 0000000..73705e7 +--- /dev/null ++++ b/feeds/packages/utils/boblight/files/boblight.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=65 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() { ++ service_start /usr/bin/boblightd ++} ++ ++stop() { ++ service_stop /usr/bin/boblightd ++} +diff --git a/feeds/packages/utils/bonnie++/.svn/entries b/feeds/packages/utils/bonnie++/.svn/entries +new file mode 100644 +index 0000000..f2d70b9 +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bonnie++ ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-08T16:39:24.481869Z ++30384 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1ccb1b5856aa3a5984f4625318f411af ++2012-02-08T16:39:24.481869Z ++30384 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1218 ++ +diff --git a/feeds/packages/utils/bonnie++/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/bonnie++/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bonnie++/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bonnie++/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bb77113 +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# 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:=bonnie++ ++PKG_VERSION:=1.96 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.coker.com.au/bonnie++/experimental/ ++PKG_MD5SUM:=7b8594559f00887d2865de1838328b35 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bonniexx ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libstdcpp +libpthread ++ TITLE:=Bonnie++ - hard drive bottleneck testing program. ++ URL:=http://www.coker.com.au/bonnie++/ ++endef ++ ++define Package/bonniexx/description ++ Bonnie++ is a benchmark suite that is aimed at performing a number of simple ++ tests of hard drive and file system performance. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ TARGET_CXX="$(TARGET_CXX)" \ ++ TARGET_LINK="$(TARGET_CXX)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all ++endef ++ ++define Package/bonniexx/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/bonnie++ $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/bon_csv2html $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bonniexx)) +diff --git a/feeds/packages/utils/bonnie++/Makefile b/feeds/packages/utils/bonnie++/Makefile +new file mode 100644 +index 0000000..bb77113 +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/Makefile +@@ -0,0 +1,49 @@ ++# ++# 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:=bonnie++ ++PKG_VERSION:=1.96 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.coker.com.au/bonnie++/experimental/ ++PKG_MD5SUM:=7b8594559f00887d2865de1838328b35 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bonniexx ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libstdcpp +libpthread ++ TITLE:=Bonnie++ - hard drive bottleneck testing program. ++ URL:=http://www.coker.com.au/bonnie++/ ++endef ++ ++define Package/bonniexx/description ++ Bonnie++ is a benchmark suite that is aimed at performing a number of simple ++ tests of hard drive and file system performance. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ TARGET_CXX="$(TARGET_CXX)" \ ++ TARGET_LINK="$(TARGET_CXX)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all ++endef ++ ++define Package/bonniexx/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/bonnie++ $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/bon_csv2html $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bonniexx)) +diff --git a/feeds/packages/utils/bonnie++/patches/.svn/entries b/feeds/packages/utils/bonnie++/patches/.svn/entries +new file mode 100644 +index 0000000..e047e7b +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bonnie++/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-08T16:39:24.481869Z ++30384 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross_compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7abf84adf9a2f115963d343081642f72 ++2012-02-08T16:39:24.481869Z ++30384 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++995 ++ ++002-add-verbose-error-messages.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++5061b3f7c0f8e8f08e2e03935ee12849 ++2012-02-08T16:39:24.481869Z ++30384 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1125 ++ +diff --git a/feeds/packages/utils/bonnie++/patches/.svn/text-base/001-cross_compile_fix.patch.svn-base b/feeds/packages/utils/bonnie++/patches/.svn/text-base/001-cross_compile_fix.patch.svn-base +new file mode 100644 +index 0000000..98a933a +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/patches/.svn/text-base/001-cross_compile_fix.patch.svn-base +@@ -0,0 +1,32 @@ ++--- a/configure +++++ b/configure ++@@ -4372,7 +4372,7 @@ if test "$cross_compiling" = yes; then ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ { (exit 0); exit 0; }; } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/Makefile +++++ b/Makefile ++@@ -1,5 +1,7 @@ ++ EXES=bonnie++ zcav getc_putc getc_putc_helper ++ EXE=bon_csv2html generate_randfile +++TARGET_CXX=g++ +++TARGET_LINK=g++ ++ ++ all: $(EXE) $(EXES) ++ ++@@ -10,8 +12,8 @@ eprefix=${prefix} ++ #MORE_WARNINGS=-Weffc++ ++ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) ++ CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS) ++-CXX=g++ $(CFLAGS) ++-LINK=g++ +++CXX=$(TARGET_CXX) $(CFLAGS) +++LINK=$(TARGET_LINK) ++ THREAD_LFLAGS=-lpthread ++ ++ INSTALL=/usr/bin/install -c +diff --git a/feeds/packages/utils/bonnie++/patches/.svn/text-base/002-add-verbose-error-messages.patch.svn-base b/feeds/packages/utils/bonnie++/patches/.svn/text-base/002-add-verbose-error-messages.patch.svn-base +new file mode 100644 +index 0000000..ccec8e8 +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/patches/.svn/text-base/002-add-verbose-error-messages.patch.svn-base +@@ -0,0 +1,47 @@ ++--- a/bon_file.cpp +++++ b/bon_file.cpp ++@@ -464,25 +464,37 @@ int COpenTest::delete_sequential(BonTime ++ } ++ if(m_number_directories != 1) ++ { ++- if(chdir("..") || rmdir(buf)) +++ if(chdir("..")) ++ { +++ io_error("chdir"); +++ return -1; +++ } +++ if(rmdir(buf)) +++ { +++ fprintf(stderr, "Unable to delete directory '%s'\n", buf); ++ io_error("rmdir"); ++ return -1; ++ } ++ } ++ } ++- if(chdir("..") || rmdir(m_dirname)) +++ if(count != m_number) ++ { ++- io_error("rmdir"); +++ fprintf(stderr, "Expected %d files but only got %d\n", m_number, count); ++ return -1; ++ } ++- delete m_dirname; ++- m_dirname = NULL; ++- if(count != m_number) +++ if(chdir("..")) ++ { ++- fprintf(stderr, "Expected %d files but only got %d\n", m_number, count); +++ io_error("chdir"); +++ return -1; +++ } +++ if(rmdir(m_dirname)) +++ { +++ fprintf(stderr, "Unable to delete directory '%s'\n", m_dirname); +++ io_error("rmdir"); ++ return -1; ++ } +++ delete m_dirname; +++ m_dirname = NULL; ++ sync(); ++ timer.stop_and_record(DelSeq); ++ timer.add_latency(DelSeq, dur.getMax()); +diff --git a/feeds/packages/utils/bonnie++/patches/001-cross_compile_fix.patch b/feeds/packages/utils/bonnie++/patches/001-cross_compile_fix.patch +new file mode 100644 +index 0000000..98a933a +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/patches/001-cross_compile_fix.patch +@@ -0,0 +1,32 @@ ++--- a/configure +++++ b/configure ++@@ -4372,7 +4372,7 @@ if test "$cross_compiling" = yes; then ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ { (exit 0); exit 0; }; } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/Makefile +++++ b/Makefile ++@@ -1,5 +1,7 @@ ++ EXES=bonnie++ zcav getc_putc getc_putc_helper ++ EXE=bon_csv2html generate_randfile +++TARGET_CXX=g++ +++TARGET_LINK=g++ ++ ++ all: $(EXE) $(EXES) ++ ++@@ -10,8 +12,8 @@ eprefix=${prefix} ++ #MORE_WARNINGS=-Weffc++ ++ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) ++ CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS) ++-CXX=g++ $(CFLAGS) ++-LINK=g++ +++CXX=$(TARGET_CXX) $(CFLAGS) +++LINK=$(TARGET_LINK) ++ THREAD_LFLAGS=-lpthread ++ ++ INSTALL=/usr/bin/install -c +diff --git a/feeds/packages/utils/bonnie++/patches/002-add-verbose-error-messages.patch b/feeds/packages/utils/bonnie++/patches/002-add-verbose-error-messages.patch +new file mode 100644 +index 0000000..ccec8e8 +--- /dev/null ++++ b/feeds/packages/utils/bonnie++/patches/002-add-verbose-error-messages.patch +@@ -0,0 +1,47 @@ ++--- a/bon_file.cpp +++++ b/bon_file.cpp ++@@ -464,25 +464,37 @@ int COpenTest::delete_sequential(BonTime ++ } ++ if(m_number_directories != 1) ++ { ++- if(chdir("..") || rmdir(buf)) +++ if(chdir("..")) ++ { +++ io_error("chdir"); +++ return -1; +++ } +++ if(rmdir(buf)) +++ { +++ fprintf(stderr, "Unable to delete directory '%s'\n", buf); ++ io_error("rmdir"); ++ return -1; ++ } ++ } ++ } ++- if(chdir("..") || rmdir(m_dirname)) +++ if(count != m_number) ++ { ++- io_error("rmdir"); +++ fprintf(stderr, "Expected %d files but only got %d\n", m_number, count); ++ return -1; ++ } ++- delete m_dirname; ++- m_dirname = NULL; ++- if(count != m_number) +++ if(chdir("..")) ++ { ++- fprintf(stderr, "Expected %d files but only got %d\n", m_number, count); +++ io_error("chdir"); +++ return -1; +++ } +++ if(rmdir(m_dirname)) +++ { +++ fprintf(stderr, "Unable to delete directory '%s'\n", m_dirname); +++ io_error("rmdir"); ++ return -1; ++ } +++ delete m_dirname; +++ m_dirname = NULL; ++ sync(); ++ timer.stop_and_record(DelSeq); ++ timer.add_latency(DelSeq, dur.getMax()); +diff --git a/feeds/packages/utils/boxbackup/.svn/entries b/feeds/packages/utils/boxbackup/.svn/entries +new file mode 100644 +index 0000000..382faf9 +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/boxbackup ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++1c450bb7446dad600bae78e932448383 ++2011-11-13T22:16:19.904883Z ++29076 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4461 ++ +diff --git a/feeds/packages/utils/boxbackup/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/boxbackup/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..15c2cdb +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,140 @@ ++# ++# 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:=boxbackup ++PKG_VERSION:=0.11.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.boxbackup.org/trac/export/2998/box/packages ++PKG_MD5SUM:=c4c4786a918a9c026f80833614c40a6b ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/boxbackup/Default ++ SUBMENU:=backup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.boxbackup.org/ ++ MAINTAINER:=Daniel Dickinson ++endef ++ ++define Package/boxbackup ++ $(call Package/boxbackup/Default) ++ TITLE:=Secure network backup ++ MENU:=1 ++endef ++ ++define Package/bbstored ++ $(call Package/boxbackup/Default) ++ TITLE:=Server for secure network backup ++ DEPENDS:=boxbackup +libopenssl +zlib +libdb47 +libopenssl +libstdcpp +libreadline +libncurses ++endef ++ ++define Package/bbstored/description ++ Boxbackup is an open source, completely automatic, on-line backup system. ++ This package is for the server (where the backups are stored). The ++ server is known as bbstored. ++endef ++ ++define Package/bbstored/conffiles ++/etc/config/bbbstored ++endef ++ ++ ++define Package/bbstored-config-external ++ $(call Package/boxbackup/Default) ++ TITLE:=Configure network backup server ++ DEPENDS:=boxbackup +openssl-util +microperl ++endef ++ ++define Package/boxbackup-certs ++ $(call Package/boxbackup/Default) ++ TITLE:=Manage network backup security certificates ++ DEPENDS:=boxbackup +openssl-util +microperl ++endef ++ ++define Package/bbackupd ++ $(call Package/boxbackup/Default) ++ TITLE:=Client for secure network backup ++ DEPENDS:=boxbackup +libopenssl +zlib +libdb47 +libopenssl +libreadline +libstdcpp +libncurses +openssl-util +microperl ++endef ++ ++define Package/bbackupd/description ++ Box Backup is an open source, completely automatic, on-line backup system. ++ This package is for the client (host to be backed up). ++endef ++ ++ ++TARGET_CFLAGS += $(FPIC) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_ARGS += \ ++ --sysconfdir=/var/etc \ ++ --enable-gnu-readline \ ++ --with-bdb-headers=$(STAGING_DIR)/usr/include \ ++ --with-bdb-lib=$(STAGING_DIR)/usr/lib \ ++ --with-ssl-header=$(STAGING_DIR)/usr/include \ ++ --with-ssl-lib=$(STAGING_DIR)/usr/lib \ ++ --with-random=/dev/urandom \ ++ --disable-static-bin ++ ++define Build/Install ++ mkdir -p $(PKG_INSTALL_DIR) ++ tar -C $(PKG_INSTALL_DIR) -xzf $(PKG_BUILD_DIR)/parcels/$(PKG_NAME)-$(PKG_VERSION)-backup-server-linux-gnu.tgz ++ tar -C $(PKG_INSTALL_DIR) -xzf $(PKG_BUILD_DIR)/parcels/$(PKG_NAME)-$(PKG_VERSION)-backup-client-linux-gnu.tgz ++endef ++ ++BXBK_SRV_INSTALL_DIR = $(PKG_INSTALL_DIR)/$(PKG_NAME)-$(PKG_VERSION)-backup-server-linux-gnu ++BXBK_CLIENT_INSTALL_DIR = $(PKG_INSTALL_DIR)/$(PKG_NAME)-$(PKG_VERSION)-backup-client-linux-gnu ++ ++define Package/boxbackup/install ++ true ++endef ++ ++define Package/bbstored/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstored $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib/boxbackup ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstoreaccounts $(1)/usr/lib/boxbackup/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bbstored.init $(1)/etc/init.d/bbstored ++ $(INSTALL_DIR) $(1)/lib/functions ++ $(INSTALL_DATA) ./files/bbstored.sh $(1)/lib/functions/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/bbstored.config $(1)/etc/config/bbstored ++ $(INSTALL_BIN) ./files/bbstoreaccounts $(1)/usr/sbin/ ++endef ++ ++define Package/bbstored-config-external/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstored-config $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/raidfile-config $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/bbstored ++endef ++ ++define Package/boxbackup-certs/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstored-certs $(1)/usr/sbin/ ++endef ++ ++define Package/bbackupd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupd $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupquery $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupctl $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupd-config $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,boxbackup)) ++$(eval $(call BuildPackage,bbstored)) ++$(eval $(call BuildPackage,boxbackup-certs)) ++$(eval $(call BuildPackage,bbstored-config-external)) ++$(eval $(call BuildPackage,bbackupd)) +diff --git a/feeds/packages/utils/boxbackup/Makefile b/feeds/packages/utils/boxbackup/Makefile +new file mode 100644 +index 0000000..15c2cdb +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/Makefile +@@ -0,0 +1,140 @@ ++# ++# 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:=boxbackup ++PKG_VERSION:=0.11.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.boxbackup.org/trac/export/2998/box/packages ++PKG_MD5SUM:=c4c4786a918a9c026f80833614c40a6b ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/boxbackup/Default ++ SUBMENU:=backup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.boxbackup.org/ ++ MAINTAINER:=Daniel Dickinson ++endef ++ ++define Package/boxbackup ++ $(call Package/boxbackup/Default) ++ TITLE:=Secure network backup ++ MENU:=1 ++endef ++ ++define Package/bbstored ++ $(call Package/boxbackup/Default) ++ TITLE:=Server for secure network backup ++ DEPENDS:=boxbackup +libopenssl +zlib +libdb47 +libopenssl +libstdcpp +libreadline +libncurses ++endef ++ ++define Package/bbstored/description ++ Boxbackup is an open source, completely automatic, on-line backup system. ++ This package is for the server (where the backups are stored). The ++ server is known as bbstored. ++endef ++ ++define Package/bbstored/conffiles ++/etc/config/bbbstored ++endef ++ ++ ++define Package/bbstored-config-external ++ $(call Package/boxbackup/Default) ++ TITLE:=Configure network backup server ++ DEPENDS:=boxbackup +openssl-util +microperl ++endef ++ ++define Package/boxbackup-certs ++ $(call Package/boxbackup/Default) ++ TITLE:=Manage network backup security certificates ++ DEPENDS:=boxbackup +openssl-util +microperl ++endef ++ ++define Package/bbackupd ++ $(call Package/boxbackup/Default) ++ TITLE:=Client for secure network backup ++ DEPENDS:=boxbackup +libopenssl +zlib +libdb47 +libopenssl +libreadline +libstdcpp +libncurses +openssl-util +microperl ++endef ++ ++define Package/bbackupd/description ++ Box Backup is an open source, completely automatic, on-line backup system. ++ This package is for the client (host to be backed up). ++endef ++ ++ ++TARGET_CFLAGS += $(FPIC) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_ARGS += \ ++ --sysconfdir=/var/etc \ ++ --enable-gnu-readline \ ++ --with-bdb-headers=$(STAGING_DIR)/usr/include \ ++ --with-bdb-lib=$(STAGING_DIR)/usr/lib \ ++ --with-ssl-header=$(STAGING_DIR)/usr/include \ ++ --with-ssl-lib=$(STAGING_DIR)/usr/lib \ ++ --with-random=/dev/urandom \ ++ --disable-static-bin ++ ++define Build/Install ++ mkdir -p $(PKG_INSTALL_DIR) ++ tar -C $(PKG_INSTALL_DIR) -xzf $(PKG_BUILD_DIR)/parcels/$(PKG_NAME)-$(PKG_VERSION)-backup-server-linux-gnu.tgz ++ tar -C $(PKG_INSTALL_DIR) -xzf $(PKG_BUILD_DIR)/parcels/$(PKG_NAME)-$(PKG_VERSION)-backup-client-linux-gnu.tgz ++endef ++ ++BXBK_SRV_INSTALL_DIR = $(PKG_INSTALL_DIR)/$(PKG_NAME)-$(PKG_VERSION)-backup-server-linux-gnu ++BXBK_CLIENT_INSTALL_DIR = $(PKG_INSTALL_DIR)/$(PKG_NAME)-$(PKG_VERSION)-backup-client-linux-gnu ++ ++define Package/boxbackup/install ++ true ++endef ++ ++define Package/bbstored/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstored $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib/boxbackup ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstoreaccounts $(1)/usr/lib/boxbackup/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/bbstored.init $(1)/etc/init.d/bbstored ++ $(INSTALL_DIR) $(1)/lib/functions ++ $(INSTALL_DATA) ./files/bbstored.sh $(1)/lib/functions/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/bbstored.config $(1)/etc/config/bbstored ++ $(INSTALL_BIN) ./files/bbstoreaccounts $(1)/usr/sbin/ ++endef ++ ++define Package/bbstored-config-external/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstored-config $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/raidfile-config $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/bbstored ++endef ++ ++define Package/boxbackup-certs/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_SRV_INSTALL_DIR)/bbstored-certs $(1)/usr/sbin/ ++endef ++ ++define Package/bbackupd/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupd $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupquery $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupctl $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(BXBK_CLIENT_INSTALL_DIR)/bbackupd-config $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,boxbackup)) ++$(eval $(call BuildPackage,bbstored)) ++$(eval $(call BuildPackage,boxbackup-certs)) ++$(eval $(call BuildPackage,bbstored-config-external)) ++$(eval $(call BuildPackage,bbackupd)) +diff --git a/feeds/packages/utils/boxbackup/files/.svn/entries b/feeds/packages/utils/boxbackup/files/.svn/entries +new file mode 100644 +index 0000000..afebb7e +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/boxbackup/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bbstoreaccounts ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++e0d18f346eb5356d3284a44aa9ccd0d9 ++2012-06-05T15:54:57.057367Z ++32061 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++763 ++ ++bbstored.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++f0301792e472137cf3eb3e46b2b653a9 ++2011-11-13T22:16:19.904883Z ++29076 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++347 ++ ++bbstored.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++2dd0806239a56a17f211934eb48f3ada ++2011-08-16T22:10:23.431167Z ++28023 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++845 ++ ++bbstored.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++f55cd315c40eac7a89b638ad4847e9a4 ++2011-08-18T08:57:52.350253Z ++28035 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3755 ++ +diff --git a/feeds/packages/utils/boxbackup/files/.svn/prop-base/bbstoreaccounts.svn-base b/feeds/packages/utils/boxbackup/files/.svn/prop-base/bbstoreaccounts.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/.svn/prop-base/bbstoreaccounts.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstoreaccounts.svn-base b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstoreaccounts.svn-base +new file mode 100644 +index 0000000..ec38fc0 +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstoreaccounts.svn-base +@@ -0,0 +1,34 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++. /lib/functions/bbstored.sh ++ ++bxbk_config_file= ++NORUN= ++ ++if [ "$1" = "-c" ]; then ++ shift ++ bxbk_config_file="$1" ++ shift ++else ++ if [ -z "$1" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then ++ /usr/lib/boxbackup/bbstoreaccounts -h ++ exit 1 ++ fi ++ if [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -z "$5" ]; then ++ /usr/lib/boxbackup/bbstoreaccounts -h ++ exit 1 ++ fi ++ config_load bbstored ++ create_config ++ if [ "$EXTERNAL_CONFIG" = "1" ]; then ++ bxbk_config_file="$EXTERNAL_CONF_FILE" ++ else ++ bxbk_config_file="$BXBK_CONFIG_PATH/bbstored.conf" ++ fi ++fi ++ ++[ "$NORUN" != "1" ] && [ -n "$bxbk_config_file" ] && /usr/lib/boxbackup/bbstoreaccounts -c "$bxbk_config_file" "$@" || { ++ echo "Error managing account using '$bxbk_config_file'" ++ exit 1 ++} +diff --git a/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.config.svn-base b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.config.svn-base +new file mode 100644 +index 0000000..d53a4b9 +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.config.svn-base +@@ -0,0 +1,26 @@ ++ ++# Example config using defaults used of no option supplied ++# or for values that have no default....the <> would ++# need to be removed. ++ ++# config bbstored ++# option config_path '/var/etc/boxbackup' ++# option raidfileconf '/var/etc/boxbackup/raidfile.conf' ++# option accountdb 'etc/bbstored/accounts.txt' ++# option extlog 1 ++# option housekeep_time 900 ++# option user nobody ++# option group nogroup ++# option address <192.168.1.1> ++# OR option address ++# option certfile ++# option keyfile ++# option cafile ++# option pidfile /var/run/bbstored.pid ++ ++#config raidfile ++# option setnum <0> ++# option blocksize 1024 ++# option path ++ ++# There can be many raidfile section, but each must have a unique setnum +diff --git a/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.init.svn-base b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.init.svn-base +new file mode 100644 +index 0000000..91e677e +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.init.svn-base +@@ -0,0 +1,22 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 Openwrt.org ++ ++START=90 ++ ++start() { ++ . /lib/functions/bbstored.sh ++ ++ create_config ++ ++ if [ "$EXTERNAL_CONFIG" -eq 1 ] ++ then ++ BXBK_CONFIG_FILE="$EXTERNAL_CONF_FILE" ++ fi ++ service_start /usr/sbin/bbstored "$BXBK_CONFIG_FILE" ++} ++ ++stop() { ++ . /lib/functions/bbstored.sh ++ ++ service_stop /usr/sbin/bbstored ++} +diff --git a/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.sh.svn-base b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.sh.svn-base +new file mode 100644 +index 0000000..91bc1ad +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/.svn/text-base/bbstored.sh.svn-base +@@ -0,0 +1,164 @@ ++#!/bin/sh ++# Copyright (C) 2011 Openwrt.org ++# Copyright (C) 2011 Daniel Dickinson ++ ++BXBK_CONFIG_PATH=/var/etc/boxbackup ++PID_FILE=/var/run/bbstored.pid ++ ++EXTERNAL_CONFIG=0 ++ ++EXTERNAL_CONF_FILE= ++RUNAS_USER= ++RUNAS_GROUP= ++BXBK_RAIDFILE_CONF= ++ ++bbstored_global() { ++ local cfg="$1" ++ local get_config="$2" ++ ++ local external_config ++ local raidfileconf ++ local user ++ local group ++ local config_path ++ local pidfile ++ local accountdb ++ local extended_logging ++ local housekeep_time ++ local address ++ local certfile ++ local keyfile ++ local cafile ++ ++ config_get external_config "$cfg" external_config ++ if [ -n "$external_config" ]; then ++ EXTERNAL_CONFIG=1 ++ EXTERNAL_CONF_FILE="$external_config" ++ fi ++ ++ config_get config_path "$cfg" config_path ++ [ -n "$config_path" ] && { ++ BXBK_CONFIG_PATH="$config_path" ++ } ++ ++ [ "$get_config" = "1" ] && return 0 ++ [ -z "$BXBK_CONFIG_FILE" ] && return 1 ++ ++ rm -f "$BXBK_CONFIG_FILE" ++ touch "$BXBK_CONFIG_FILE" ++ ++ config_get raidfileconf "$cfg" raidfileconf "$BXBK_CONFIG_PATH/raidfile.conf" ++ echo "RaidFileConf = $raidfileconf" >>$BXBK_CONFIG_FILE ++ BXBK_RAIDFILE_CONF="$raidfileconf" ++ ++ config_get accountdb "$cfg" accountdb "/etc/bbstored/accounts.txt" ++ echo "AccountDatabase = $accountdb" >>$BXBK_CONFIG_FILE ++ [ ! -r "$accountdb" ] && { ++ echo "Account database missing" ++ NORUN=1 ++ return 1 ++ } ++ ++ local extlog ++ config_get extended_logging "$cfg" extended_logging 1 ++ if [ "$extended_logging" = "1" ]; then ++ extlog=yes ++ else ++ extlog=no ++ fi ++ echo "ExtendedLogging = $extlog" >>$BXBK_CONFIG_FILE ++ ++ config_get housekeep_time "$cfg" housekeep_time 900 ++ echo "TimeBetweenHousekeeping = $housekeep_time" >>$BXBK_CONFIG_FILE ++ ++ echo "" >>$BXBK_CONFIG_FILE ++ echo "Server" >>$BXBK_CONFIG_FILE ++ echo "{" >>$BXBK_CONFIG_FILE ++ ++ config_get user "$cfg" user ++ config_get group "$cfg" group ++ [ -n "$user" ] && [ "$group" ] && { ++ RUNAS_USER=$user ++ RUNAS_GROUP=$group ++ } ++ echo " User = ${RUNAS_USER:-nobody}" >>$BXBK_CONFIG_FILE ++ ++ config_get address "$cfg" address ++ [ -z "$address" ] && NORUN=1 ++ ++ echo " ListenAddresses = inet:$address" >>$BXBK_CONFIG_FILE ++ ++ config_get certfile "$cfg" certfile ++ [ -z "$certfile" ] && NORUN=1 ++ ++ echo " CertificateFile = $certfile" >>$BXBK_CONFIG_FILE ++ ++ config_get keyfile "$cfg" keyfile ++ [ -z "$keyfile" ] && NORUN=1 ++ ++ echo " PrivateKeyFile = $keyfile" >>$BXBK_CONFIG_FILE ++ ++ config_get cafile "$cfg" cafile ++ [ -z "$cafile" ] && NORUN=1 ++ ++ echo " TrustedCAsFile = $cafile" >>$BXBK_CONFIG_FILE ++ ++ config_get pidfile "$cfg" pidfile ++ [ -n "$pidfile" ] && { ++ PID_FILE="$pidfile" ++ } ++ echo " PidFile = $PID_FILE" >>$BXBK_CONFIG_FILE ++ ++ echo "}" >>$BXBK_CONFIG_FILE ++} ++ ++raidfile_section() { ++ local cfg="$1" ++ ++ local setnum ++ local blocksize ++ local path ++ ++ config_get setnum "$cfg" setnum ++ [ -z "$setnum" ] && return 1 ++ ++ config_get blocksize "$cfg" blocksize ++ ++ config_get path "$cfg" path ++ [ -z "$path" ] && return 1 ++ ++ echo "disc${setnum}" >>$BXBK_RAIDFILE_CONF ++ echo "{" >>$BXBK_RAIDFILE_CONF ++ echo " SetNumber = ${setnum}" >>$BXBK_RAIDFILE_CONF ++ [ -n "$blocksize" ] && echo " BlockSize = ${blocksize}" >>$BXBK_RAIDFILE_CONF ++ for i in 0 1 2; do ++ echo " Dir${i} = $path" >>$BXBK_RAIDFILE_CONF ++ done ++ ++ echo "}" >>$BXBK_RAIDFILE_CONF ++ ++} ++ ++create_config() { ++ config_load bbstored ++ config_foreach bbstored_global bbstored 1 ++ ++ if [ "$EXTERNAL_CONFIG" -eq 0 ] ++ then ++ mkdir -p "$BXBK_CONFIG_PATH/bbstored" ++ BXBK_CONFIG_FILE="$BXBK_CONFIG_PATH/bbstored.conf" ++ touch "$BXBK_CONFIG_FILE" ++ ++ config_load bbstored ++ config_foreach bbstored_global bbstored ++ ++ [ -z "$BXBK_RAIDFILE_CONF" ] && return 1 ++ rm -f "$BXBK_RAIDFILE_CONF" ++ touch "$BXBK_RAIDFILE_CONF" ++ ++ config_foreach raidfile_section raidfile ++ ++ chown -R ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} "$BXBK_CONFIG_PATH" ++ fi ++} ++ +diff --git a/feeds/packages/utils/boxbackup/files/bbstoreaccounts b/feeds/packages/utils/boxbackup/files/bbstoreaccounts +new file mode 100755 +index 0000000..ec38fc0 +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/bbstoreaccounts +@@ -0,0 +1,34 @@ ++#!/bin/sh ++ ++. /lib/functions.sh ++. /lib/functions/bbstored.sh ++ ++bxbk_config_file= ++NORUN= ++ ++if [ "$1" = "-c" ]; then ++ shift ++ bxbk_config_file="$1" ++ shift ++else ++ if [ -z "$1" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then ++ /usr/lib/boxbackup/bbstoreaccounts -h ++ exit 1 ++ fi ++ if [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -z "$5" ]; then ++ /usr/lib/boxbackup/bbstoreaccounts -h ++ exit 1 ++ fi ++ config_load bbstored ++ create_config ++ if [ "$EXTERNAL_CONFIG" = "1" ]; then ++ bxbk_config_file="$EXTERNAL_CONF_FILE" ++ else ++ bxbk_config_file="$BXBK_CONFIG_PATH/bbstored.conf" ++ fi ++fi ++ ++[ "$NORUN" != "1" ] && [ -n "$bxbk_config_file" ] && /usr/lib/boxbackup/bbstoreaccounts -c "$bxbk_config_file" "$@" || { ++ echo "Error managing account using '$bxbk_config_file'" ++ exit 1 ++} +diff --git a/feeds/packages/utils/boxbackup/files/bbstored.config b/feeds/packages/utils/boxbackup/files/bbstored.config +new file mode 100644 +index 0000000..d53a4b9 +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/bbstored.config +@@ -0,0 +1,26 @@ ++ ++# Example config using defaults used of no option supplied ++# or for values that have no default....the <> would ++# need to be removed. ++ ++# config bbstored ++# option config_path '/var/etc/boxbackup' ++# option raidfileconf '/var/etc/boxbackup/raidfile.conf' ++# option accountdb 'etc/bbstored/accounts.txt' ++# option extlog 1 ++# option housekeep_time 900 ++# option user nobody ++# option group nogroup ++# option address <192.168.1.1> ++# OR option address ++# option certfile ++# option keyfile ++# option cafile ++# option pidfile /var/run/bbstored.pid ++ ++#config raidfile ++# option setnum <0> ++# option blocksize 1024 ++# option path ++ ++# There can be many raidfile section, but each must have a unique setnum +diff --git a/feeds/packages/utils/boxbackup/files/bbstored.init b/feeds/packages/utils/boxbackup/files/bbstored.init +new file mode 100644 +index 0000000..91e677e +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/bbstored.init +@@ -0,0 +1,22 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2010-2011 Openwrt.org ++ ++START=90 ++ ++start() { ++ . /lib/functions/bbstored.sh ++ ++ create_config ++ ++ if [ "$EXTERNAL_CONFIG" -eq 1 ] ++ then ++ BXBK_CONFIG_FILE="$EXTERNAL_CONF_FILE" ++ fi ++ service_start /usr/sbin/bbstored "$BXBK_CONFIG_FILE" ++} ++ ++stop() { ++ . /lib/functions/bbstored.sh ++ ++ service_stop /usr/sbin/bbstored ++} +diff --git a/feeds/packages/utils/boxbackup/files/bbstored.sh b/feeds/packages/utils/boxbackup/files/bbstored.sh +new file mode 100644 +index 0000000..91bc1ad +--- /dev/null ++++ b/feeds/packages/utils/boxbackup/files/bbstored.sh +@@ -0,0 +1,164 @@ ++#!/bin/sh ++# Copyright (C) 2011 Openwrt.org ++# Copyright (C) 2011 Daniel Dickinson ++ ++BXBK_CONFIG_PATH=/var/etc/boxbackup ++PID_FILE=/var/run/bbstored.pid ++ ++EXTERNAL_CONFIG=0 ++ ++EXTERNAL_CONF_FILE= ++RUNAS_USER= ++RUNAS_GROUP= ++BXBK_RAIDFILE_CONF= ++ ++bbstored_global() { ++ local cfg="$1" ++ local get_config="$2" ++ ++ local external_config ++ local raidfileconf ++ local user ++ local group ++ local config_path ++ local pidfile ++ local accountdb ++ local extended_logging ++ local housekeep_time ++ local address ++ local certfile ++ local keyfile ++ local cafile ++ ++ config_get external_config "$cfg" external_config ++ if [ -n "$external_config" ]; then ++ EXTERNAL_CONFIG=1 ++ EXTERNAL_CONF_FILE="$external_config" ++ fi ++ ++ config_get config_path "$cfg" config_path ++ [ -n "$config_path" ] && { ++ BXBK_CONFIG_PATH="$config_path" ++ } ++ ++ [ "$get_config" = "1" ] && return 0 ++ [ -z "$BXBK_CONFIG_FILE" ] && return 1 ++ ++ rm -f "$BXBK_CONFIG_FILE" ++ touch "$BXBK_CONFIG_FILE" ++ ++ config_get raidfileconf "$cfg" raidfileconf "$BXBK_CONFIG_PATH/raidfile.conf" ++ echo "RaidFileConf = $raidfileconf" >>$BXBK_CONFIG_FILE ++ BXBK_RAIDFILE_CONF="$raidfileconf" ++ ++ config_get accountdb "$cfg" accountdb "/etc/bbstored/accounts.txt" ++ echo "AccountDatabase = $accountdb" >>$BXBK_CONFIG_FILE ++ [ ! -r "$accountdb" ] && { ++ echo "Account database missing" ++ NORUN=1 ++ return 1 ++ } ++ ++ local extlog ++ config_get extended_logging "$cfg" extended_logging 1 ++ if [ "$extended_logging" = "1" ]; then ++ extlog=yes ++ else ++ extlog=no ++ fi ++ echo "ExtendedLogging = $extlog" >>$BXBK_CONFIG_FILE ++ ++ config_get housekeep_time "$cfg" housekeep_time 900 ++ echo "TimeBetweenHousekeeping = $housekeep_time" >>$BXBK_CONFIG_FILE ++ ++ echo "" >>$BXBK_CONFIG_FILE ++ echo "Server" >>$BXBK_CONFIG_FILE ++ echo "{" >>$BXBK_CONFIG_FILE ++ ++ config_get user "$cfg" user ++ config_get group "$cfg" group ++ [ -n "$user" ] && [ "$group" ] && { ++ RUNAS_USER=$user ++ RUNAS_GROUP=$group ++ } ++ echo " User = ${RUNAS_USER:-nobody}" >>$BXBK_CONFIG_FILE ++ ++ config_get address "$cfg" address ++ [ -z "$address" ] && NORUN=1 ++ ++ echo " ListenAddresses = inet:$address" >>$BXBK_CONFIG_FILE ++ ++ config_get certfile "$cfg" certfile ++ [ -z "$certfile" ] && NORUN=1 ++ ++ echo " CertificateFile = $certfile" >>$BXBK_CONFIG_FILE ++ ++ config_get keyfile "$cfg" keyfile ++ [ -z "$keyfile" ] && NORUN=1 ++ ++ echo " PrivateKeyFile = $keyfile" >>$BXBK_CONFIG_FILE ++ ++ config_get cafile "$cfg" cafile ++ [ -z "$cafile" ] && NORUN=1 ++ ++ echo " TrustedCAsFile = $cafile" >>$BXBK_CONFIG_FILE ++ ++ config_get pidfile "$cfg" pidfile ++ [ -n "$pidfile" ] && { ++ PID_FILE="$pidfile" ++ } ++ echo " PidFile = $PID_FILE" >>$BXBK_CONFIG_FILE ++ ++ echo "}" >>$BXBK_CONFIG_FILE ++} ++ ++raidfile_section() { ++ local cfg="$1" ++ ++ local setnum ++ local blocksize ++ local path ++ ++ config_get setnum "$cfg" setnum ++ [ -z "$setnum" ] && return 1 ++ ++ config_get blocksize "$cfg" blocksize ++ ++ config_get path "$cfg" path ++ [ -z "$path" ] && return 1 ++ ++ echo "disc${setnum}" >>$BXBK_RAIDFILE_CONF ++ echo "{" >>$BXBK_RAIDFILE_CONF ++ echo " SetNumber = ${setnum}" >>$BXBK_RAIDFILE_CONF ++ [ -n "$blocksize" ] && echo " BlockSize = ${blocksize}" >>$BXBK_RAIDFILE_CONF ++ for i in 0 1 2; do ++ echo " Dir${i} = $path" >>$BXBK_RAIDFILE_CONF ++ done ++ ++ echo "}" >>$BXBK_RAIDFILE_CONF ++ ++} ++ ++create_config() { ++ config_load bbstored ++ config_foreach bbstored_global bbstored 1 ++ ++ if [ "$EXTERNAL_CONFIG" -eq 0 ] ++ then ++ mkdir -p "$BXBK_CONFIG_PATH/bbstored" ++ BXBK_CONFIG_FILE="$BXBK_CONFIG_PATH/bbstored.conf" ++ touch "$BXBK_CONFIG_FILE" ++ ++ config_load bbstored ++ config_foreach bbstored_global bbstored ++ ++ [ -z "$BXBK_RAIDFILE_CONF" ] && return 1 ++ rm -f "$BXBK_RAIDFILE_CONF" ++ touch "$BXBK_RAIDFILE_CONF" ++ ++ config_foreach raidfile_section raidfile ++ ++ chown -R ${RUNAS_USER:-nobody}:${RUNAS_GROUP:-nogroup} "$BXBK_CONFIG_PATH" ++ fi ++} ++ +diff --git a/feeds/packages/utils/bsdiff/.svn/entries b/feeds/packages/utils/bsdiff/.svn/entries +new file mode 100644 +index 0000000..2eba1ec +--- /dev/null ++++ b/feeds/packages/utils/bsdiff/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bsdiff ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-13T17:29:24.470446Z ++28230 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a9a6991635bd42feb40887ed55f6585b ++2011-09-13T17:29:24.470446Z ++28230 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1236 ++ +diff --git a/feeds/packages/utils/bsdiff/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bsdiff/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2dab0ac +--- /dev/null ++++ b/feeds/packages/utils/bsdiff/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# ++# Copyright (C) 2011 Alexander Gordeev ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=bsdiff ++PKG_VERSION:=4.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.daemonology.net/bsdiff ++PKG_MD5SUM:=e6d812394f0e0ecc8d5df255aa1db22a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bsdiff ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libbz2 ++ URL:=http://www.daemonology.net/bsdiff ++ TITLE:=Tools for building and applying patches to binary files ++endef ++ ++define Package/bsdiff/description ++ bsdiff and bspatch are tools for building and applying patches to binary ++ files. By using suffix sorting (specifically, Larsson and Sadakane's ++ qsufsort) and taking advantage of how executable files change, bsdiff ++ routinely produces binary patches 50-80% smaller than those produced by ++ Xdelta, and 15% smaller than those produced by .RTPatch (a $2750/seat ++ commercial patch tool). ++endef ++ ++define Package/bsdiff/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bsdiff $(PKG_BUILD_DIR)/bspatch $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bsdiff)) +diff --git a/feeds/packages/utils/bsdiff/Makefile b/feeds/packages/utils/bsdiff/Makefile +new file mode 100644 +index 0000000..2dab0ac +--- /dev/null ++++ b/feeds/packages/utils/bsdiff/Makefile +@@ -0,0 +1,42 @@ ++# ++# Copyright (C) 2011 Alexander Gordeev ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=bsdiff ++PKG_VERSION:=4.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.daemonology.net/bsdiff ++PKG_MD5SUM:=e6d812394f0e0ecc8d5df255aa1db22a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/bsdiff ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libbz2 ++ URL:=http://www.daemonology.net/bsdiff ++ TITLE:=Tools for building and applying patches to binary files ++endef ++ ++define Package/bsdiff/description ++ bsdiff and bspatch are tools for building and applying patches to binary ++ files. By using suffix sorting (specifically, Larsson and Sadakane's ++ qsufsort) and taking advantage of how executable files change, bsdiff ++ routinely produces binary patches 50-80% smaller than those produced by ++ Xdelta, and 15% smaller than those produced by .RTPatch (a $2750/seat ++ commercial patch tool). ++endef ++ ++define Package/bsdiff/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bsdiff $(PKG_BUILD_DIR)/bspatch $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,bsdiff)) +diff --git a/feeds/packages/utils/bsdiff/patches/.svn/entries b/feeds/packages/utils/bsdiff/patches/.svn/entries +new file mode 100644 +index 0000000..92a539b +--- /dev/null ++++ b/feeds/packages/utils/bsdiff/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bsdiff/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-13T17:29:24.470446Z ++28230 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++43322aff6a6372d857313fc63a7be5be ++2011-09-13T17:29:24.470446Z ++28230 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++276 ++ +diff --git a/feeds/packages/utils/bsdiff/patches/.svn/text-base/001-makefile.patch.svn-base b/feeds/packages/utils/bsdiff/patches/.svn/text-base/001-makefile.patch.svn-base +new file mode 100644 +index 0000000..45f3d6a +--- /dev/null ++++ b/feeds/packages/utils/bsdiff/patches/.svn/text-base/001-makefile.patch.svn-base +@@ -0,0 +1,11 @@ ++diff --git a/Makefile b/Makefile ++index a522607..7da4463 100644 ++--- a/Makefile +++++ b/Makefile ++@@ -10,6 +10,3 @@ bspatch: bspatch.c ++ ++ install: ++ ${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin ++-.ifndef WITHOUT_MAN ++- ${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1 ++-.endif +diff --git a/feeds/packages/utils/bsdiff/patches/001-makefile.patch b/feeds/packages/utils/bsdiff/patches/001-makefile.patch +new file mode 100644 +index 0000000..45f3d6a +--- /dev/null ++++ b/feeds/packages/utils/bsdiff/patches/001-makefile.patch +@@ -0,0 +1,11 @@ ++diff --git a/Makefile b/Makefile ++index a522607..7da4463 100644 ++--- a/Makefile +++++ b/Makefile ++@@ -10,6 +10,3 @@ bspatch: bspatch.c ++ ++ install: ++ ${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin ++-.ifndef WITHOUT_MAN ++- ${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1 ++-.endif +diff --git a/feeds/packages/utils/btrfs-progs/.svn/entries b/feeds/packages/utils/btrfs-progs/.svn/entries +new file mode 100644 +index 0000000..b3dc66a +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/btrfs-progs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3ca12c4690cf949f2ad6f46746064ac6 ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1506 ++ +diff --git a/feeds/packages/utils/btrfs-progs/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/btrfs-progs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4ee46c1 +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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:=btrfs-progs ++PKG_VERSION:=0.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/ ++PKG_MD5SUM:=69e29ecd922e3f9dcb74a3a8f80b4f68 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/btrfs-progs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ DEPENDS:=+libuuid +zlib ++ 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 = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck ++ ++MAKE_FLAGS+=\ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ prefix=/usr \ ++ DESTDIR=$(PKG_INSTALL_DIR) ++ ++define Package/btrfs-progs/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(addprefix $(PKG_INSTALL_DIR)/usr/bin/, $(progs)) $(1)/usr/bin/ ++ $(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/feeds/packages/utils/btrfs-progs/Makefile b/feeds/packages/utils/btrfs-progs/Makefile +new file mode 100644 +index 0000000..4ee46c1 +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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:=btrfs-progs ++PKG_VERSION:=0.19 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/ ++PKG_MD5SUM:=69e29ecd922e3f9dcb74a3a8f80b4f68 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/btrfs-progs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ DEPENDS:=+libuuid +zlib ++ 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 = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck ++ ++MAKE_FLAGS+=\ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ prefix=/usr \ ++ DESTDIR=$(PKG_INSTALL_DIR) ++ ++define Package/btrfs-progs/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(addprefix $(PKG_INSTALL_DIR)/usr/bin/, $(progs)) $(1)/usr/bin/ ++ $(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/feeds/packages/utils/btrfs-progs/files/.svn/entries b/feeds/packages/utils/btrfs-progs/files/.svn/entries +new file mode 100644 +index 0000000..4158dfb +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/btrfs-progs/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-20T10:29:31.006655Z ++20313 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++btrfs-scan.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3a4143aba45be1aaac9b984c8e759d63 ++2010-03-20T10:29:31.006655Z ++20313 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++135 ++ +diff --git a/feeds/packages/utils/btrfs-progs/files/.svn/text-base/btrfs-scan.init.svn-base b/feeds/packages/utils/btrfs-progs/files/.svn/text-base/btrfs-scan.init.svn-base +new file mode 100644 +index 0000000..f1264ee +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/files/.svn/text-base/btrfs-scan.init.svn-base +@@ -0,0 +1,9 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009 OpenWrt.org ++ ++START=19 ++ ++start() { ++ grep -q btrfs /proc/modules && /usr/bin/btrfsctl -a ++} ++ +diff --git a/feeds/packages/utils/btrfs-progs/files/btrfs-scan.init b/feeds/packages/utils/btrfs-progs/files/btrfs-scan.init +new file mode 100644 +index 0000000..f1264ee +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/files/btrfs-scan.init +@@ -0,0 +1,9 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009 OpenWrt.org ++ ++START=19 ++ ++start() { ++ grep -q btrfs /proc/modules && /usr/bin/btrfsctl -a ++} ++ +diff --git a/feeds/packages/utils/btrfs-progs/patches/.svn/entries b/feeds/packages/utils/btrfs-progs/patches/.svn/entries +new file mode 100644 +index 0000000..6296f7d +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/btrfs-progs/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-20T10:29:31.006655Z ++20313 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-Makefile-gcc-fix ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++81bce8a8d9c185d1ab9ebdca8afa3ce1 ++2010-03-20T10:29:31.006655Z ++20313 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2217 ++ +diff --git a/feeds/packages/utils/btrfs-progs/patches/.svn/text-base/001-Makefile-gcc-fix.svn-base b/feeds/packages/utils/btrfs-progs/patches/.svn/text-base/001-Makefile-gcc-fix.svn-base +new file mode 100644 +index 0000000..37da622 +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/patches/.svn/text-base/001-Makefile-gcc-fix.svn-base +@@ -0,0 +1,53 @@ ++diff --git a/Makefile b/Makefile ++index 8097b5a..63a734b 100644 ++--- a/Makefile +++++ b/Makefile ++@@ -36,37 +36,37 @@ version: ++ bash version.sh ++ ++ btrfsctl: $(objects) btrfsctl.o ++- gcc $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ btrfs-vol: $(objects) btrfs-vol.o ++- gcc $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ btrfs-show: $(objects) btrfs-show.o ++- gcc $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ btrfsck: $(objects) btrfsck.o ++- gcc $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ mkfs.btrfs: $(objects) mkfs.o ++- gcc $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) ++ ++ btrfs-debug-tree: $(objects) debug-tree.o ++- gcc $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) ++ ++ btrfstune: $(objects) btrfstune.o ++- gcc $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) ++ ++ btrfs-image: $(objects) btrfs-image.o ++- gcc $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) ++ ++ dir-test: $(objects) dir-test.o ++- gcc $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) ++ ++ quick-test: $(objects) quick-test.o ++- gcc $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) ++ ++ convert: $(objects) convert.o ++- gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS) ++ ++ manpages: ++ cd man; make +diff --git a/feeds/packages/utils/btrfs-progs/patches/001-Makefile-gcc-fix b/feeds/packages/utils/btrfs-progs/patches/001-Makefile-gcc-fix +new file mode 100644 +index 0000000..37da622 +--- /dev/null ++++ b/feeds/packages/utils/btrfs-progs/patches/001-Makefile-gcc-fix +@@ -0,0 +1,53 @@ ++diff --git a/Makefile b/Makefile ++index 8097b5a..63a734b 100644 ++--- a/Makefile +++++ b/Makefile ++@@ -36,37 +36,37 @@ version: ++ bash version.sh ++ ++ btrfsctl: $(objects) btrfsctl.o ++- gcc $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ btrfs-vol: $(objects) btrfs-vol.o ++- gcc $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ btrfs-show: $(objects) btrfs-show.o ++- gcc $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ btrfsck: $(objects) btrfsck.o ++- gcc $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) ++ ++ mkfs.btrfs: $(objects) mkfs.o ++- gcc $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) ++ ++ btrfs-debug-tree: $(objects) debug-tree.o ++- gcc $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) ++ ++ btrfstune: $(objects) btrfstune.o ++- gcc $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) ++ ++ btrfs-image: $(objects) btrfs-image.o ++- gcc $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) ++ ++ dir-test: $(objects) dir-test.o ++- gcc $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) ++ ++ quick-test: $(objects) quick-test.o ++- gcc $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) ++ ++ convert: $(objects) convert.o ++- gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS) +++ $(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS) ++ ++ manpages: ++ cd man; make +diff --git a/feeds/packages/utils/byobu/.svn/entries b/feeds/packages/utils/byobu/.svn/entries +new file mode 100644 +index 0000000..33df289 +--- /dev/null ++++ b/feeds/packages/utils/byobu/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/byobu ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-13T19:41:20.621287Z ++30930 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1f57acdea78a2f0d535366458cfa2cc2 ++2012-03-13T19:41:20.621287Z ++30930 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1501 ++ +diff --git a/feeds/packages/utils/byobu/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/byobu/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/byobu/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/byobu/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/byobu/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5d046db +--- /dev/null ++++ b/feeds/packages/utils/byobu/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2009 Sharim At Work, Ltd. ++# Author: Xiangfu Liu ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=byobu ++PKG_VERSION:=3.6 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://launchpad.net/byobu/trunk/3.6/+download/ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/byobu ++ MAINTAINER:="Xiangfu Liu" ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=a Japanese term for decorative, multi-panel screens that serve as folding room dividers ++ URL:=https://launchpad.net/byobu ++endef ++ ++define Package/byobu/description ++ Byobu is a Japanese term for decorative, multi-panel screens that serve ++ as folding room dividers. As an open source project, Byobu is an elegant ++ enhancement of the otherwise functional, plain, practical GNU Screen. ++ Byobu includes an enhanced profile and configuration utilities for the ++ GNU screen window manager, such as toggle-able system status notifications. ++endef ++ ++define Package/byobu/install ++ $(INSTALL_DIR) \ ++ $(1)/usr/bin \ ++ $(1)/usr/lib/byobu \ ++ $(1)/usr/share ++ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin/ ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/byobu \ ++ $(1)/usr/lib/ ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/share/byobu \ ++ $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,byobu)) +diff --git a/feeds/packages/utils/byobu/Makefile b/feeds/packages/utils/byobu/Makefile +new file mode 100644 +index 0000000..5d046db +--- /dev/null ++++ b/feeds/packages/utils/byobu/Makefile +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2009 Sharim At Work, Ltd. ++# Author: Xiangfu Liu ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=byobu ++PKG_VERSION:=3.6 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://launchpad.net/byobu/trunk/3.6/+download/ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/byobu ++ MAINTAINER:="Xiangfu Liu" ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=a Japanese term for decorative, multi-panel screens that serve as folding room dividers ++ URL:=https://launchpad.net/byobu ++endef ++ ++define Package/byobu/description ++ Byobu is a Japanese term for decorative, multi-panel screens that serve ++ as folding room dividers. As an open source project, Byobu is an elegant ++ enhancement of the otherwise functional, plain, practical GNU Screen. ++ Byobu includes an enhanced profile and configuration utilities for the ++ GNU screen window manager, such as toggle-able system status notifications. ++endef ++ ++define Package/byobu/install ++ $(INSTALL_DIR) \ ++ $(1)/usr/bin \ ++ $(1)/usr/lib/byobu \ ++ $(1)/usr/share ++ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/* \ ++ $(1)/usr/bin/ ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/lib/byobu \ ++ $(1)/usr/lib/ ++ ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/share/byobu \ ++ $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,byobu)) +diff --git a/feeds/packages/utils/bzip2/.svn/entries b/feeds/packages/utils/bzip2/.svn/entries +new file mode 100644 +index 0000000..e179850 +--- /dev/null ++++ b/feeds/packages/utils/bzip2/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/bzip2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++5700c25f86e8e66e2ed72b347da5e953 ++2012-10-19T15:36:24.699492Z ++33862 ++hcg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1924 ++ +diff --git a/feeds/packages/utils/bzip2/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/bzip2/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/utils/bzip2/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/bzip2/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/bzip2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9ee09f9 +--- /dev/null ++++ b/feeds/packages/utils/bzip2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,79 @@ ++# ++# 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_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/feeds/packages/utils/bzip2/Makefile b/feeds/packages/utils/bzip2/Makefile +new file mode 100644 +index 0000000..9ee09f9 +--- /dev/null ++++ b/feeds/packages/utils/bzip2/Makefile +@@ -0,0 +1,79 @@ ++# ++# 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_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/feeds/packages/utils/calcurse/.svn/entries b/feeds/packages/utils/calcurse/.svn/entries +new file mode 100644 +index 0000000..e8996d6 +--- /dev/null ++++ b/feeds/packages/utils/calcurse/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/calcurse ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:30:38.855492Z ++32243 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0dbcffad5a06527a195a6cecf9970a69 ++2012-06-11T23:30:38.855492Z ++32243 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++821 ++ +diff --git a/feeds/packages/utils/calcurse/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/calcurse/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/calcurse/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/calcurse/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/calcurse/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4295ade +--- /dev/null ++++ b/feeds/packages/utils/calcurse/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=calcurse ++PKG_VERSION:=2.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=get.cgi?calcurse-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://culot.org/cgi-bin ++PKG_MD5SUM:=124d40c0912b12021996220f02b759cc ++PKG_CAT:=zcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/calcurse-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/calcurse ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Calcurse ++ DEPENDS:=+libncursesw +libreadline +libpthread ++ URL:=http://culot.org/calcurse ++endef ++ ++define Package/calcurse/description ++ Fullscreen curses based calendar. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --prefix=/usr \ ++ ) ++endef ++ ++define Package/calcurse/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/calcurse $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,calcurse)) +diff --git a/feeds/packages/utils/calcurse/Makefile b/feeds/packages/utils/calcurse/Makefile +new file mode 100644 +index 0000000..4295ade +--- /dev/null ++++ b/feeds/packages/utils/calcurse/Makefile +@@ -0,0 +1,39 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=calcurse ++PKG_VERSION:=2.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=get.cgi?calcurse-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://culot.org/cgi-bin ++PKG_MD5SUM:=124d40c0912b12021996220f02b759cc ++PKG_CAT:=zcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/calcurse-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/calcurse ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Calcurse ++ DEPENDS:=+libncursesw +libreadline +libpthread ++ URL:=http://culot.org/calcurse ++endef ++ ++define Package/calcurse/description ++ Fullscreen curses based calendar. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --prefix=/usr \ ++ ) ++endef ++ ++define Package/calcurse/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/calcurse $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,calcurse)) +diff --git a/feeds/packages/utils/calvaria/.svn/entries b/feeds/packages/utils/calvaria/.svn/entries +new file mode 100644 +index 0000000..14a322a +--- /dev/null ++++ b/feeds/packages/utils/calvaria/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/calvaria ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-04T16:49:40.621815Z ++25864 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++87326f9c09c623fa9165cdf9f71382d2 ++2011-01-29T18:14:17.101476Z ++25240 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++934 ++ +diff --git a/feeds/packages/utils/calvaria/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/calvaria/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f8574fa +--- /dev/null ++++ b/feeds/packages/utils/calvaria/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# 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:=calvaria ++PKG_RELEASE:=1 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/calvaria ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Maemo CAL partition access tool ++ MAINTAINER:=Michael Buesch ++endef ++ ++define Package/calvaria/description ++ Calvaria - Maemo CAL partition variable access tool ++ The CAL partition (/dev/mtdblock1) is used to store configuration ++ and calibration data. ++endef ++ ++define Build/Prepare ++ $(CP) ./files/src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/calvaria/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/calvaria $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cal2p54 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,calvaria)) +diff --git a/feeds/packages/utils/calvaria/Makefile b/feeds/packages/utils/calvaria/Makefile +new file mode 100644 +index 0000000..f8574fa +--- /dev/null ++++ b/feeds/packages/utils/calvaria/Makefile +@@ -0,0 +1,40 @@ ++# ++# 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:=calvaria ++PKG_RELEASE:=1 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/calvaria ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Maemo CAL partition access tool ++ MAINTAINER:=Michael Buesch ++endef ++ ++define Package/calvaria/description ++ Calvaria - Maemo CAL partition variable access tool ++ The CAL partition (/dev/mtdblock1) is used to store configuration ++ and calibration data. ++endef ++ ++define Build/Prepare ++ $(CP) ./files/src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/calvaria/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/calvaria $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cal2p54 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,calvaria)) +diff --git a/feeds/packages/utils/calvaria/files/.svn/entries b/feeds/packages/utils/calvaria/files/.svn/entries +new file mode 100644 +index 0000000..89e3fd6 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/calvaria/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-04T16:49:40.621815Z ++25864 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ +diff --git a/feeds/packages/utils/calvaria/files/src/.svn/entries b/feeds/packages/utils/calvaria/files/src/.svn/entries +new file mode 100644 +index 0000000..35cada3 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/calvaria/files/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-04T16:49:40.621815Z ++25864 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++calvaria.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f1dcd0b964187f4907b32688e5661422 ++2011-02-03T01:26:40.832036Z ++25334 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11938 ++ ++cal2p54.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f58c49b4cf200efae8b8572851d5cec3 ++2011-03-04T16:49:40.621815Z ++25864 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++34942 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++eff2a220af33bed3e7fdf1a0383c9b16 ++2011-01-29T18:14:17.101476Z ++25240 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++664 ++ +diff --git a/feeds/packages/utils/calvaria/files/src/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/calvaria/files/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d42bf1 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,32 @@ ++DESTDIR ?= ++PREFIX ?= /usr ++CFLAGS ?= -O2 -Wall ++LDFLAGS ?= ++LDLIBS ?= ++ ++STRIP ?= strip ++INSTALL ?= install ++ ++CALVARIA_BIN := calvaria ++CAL2P54_BIN := cal2p54 ++ ++all: $(CALVARIA_BIN) $(CAL2P54_BIN) ++ ++$(CALVARIA_BIN): calvaria.o ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ ++ $(STRIP) $@ ++ ++$(CAL2P54_BIN): cal2p54.o ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ ++ $(STRIP) $@ ++ ++%.o: %.c ++ $(CC) -c $(CFLAGS) $^ -o $@ ++ ++install: $(CALVARIA_BIN) $(CAL2P54_BIN) ++ $(INSTALL) -d $(DESTDIR)/$(PREFIX)/bin ++ $(INSTALL) -m 0755 $(CALVARIA_BIN) $(DESTDIR)/$(PREFIX)/bin/ ++ $(INSTALL) -m 0755 $(CAL2P54_BIN) $(DESTDIR)/$(PREFIX)/bin/ ++ ++clean: ++ rm -f $(CALVARIA_BIN) $(CAL2P54_BIN) *.o +diff --git a/feeds/packages/utils/calvaria/files/src/.svn/text-base/cal2p54.c.svn-base b/feeds/packages/utils/calvaria/files/src/.svn/text-base/cal2p54.c.svn-base +new file mode 100644 +index 0000000..cac4436 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/.svn/text-base/cal2p54.c.svn-base +@@ -0,0 +1,940 @@ ++/* ++ * cal2p54 - CAL to p54spi EEPROM converter ++ * ++ * Copyright (c) 2011 Michael Buesch ++ * ++ * Licensed under the GNU General Public License version 2. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++/* Template data from Linux p54spi_eeprom.h: ++ * ++ * Copyright (C) 2003 Conexant Americas Inc. All Rights Reserved. ++ * Copyright (C) 2004, 2005, 2006 Nokia Corporation ++ * Copyright 2008 Johannes Berg ++ * Copyright 2008 Christian Lamparter ++ * ++ * based on: ++ * - cx3110x's pda.h from Nokia ++ * - cx3110-transfer.log by Johannes Berg ++ */ ++ ++static const uint8_t template_eeprom_pda_wrap[] = { ++ /* struct eeprom_pda_wrap */ ++ 0x47, 0x4d, 0x55, 0xaa, /* magic */ ++ 0x00, 0x00, /* pad */ ++ 0x00, 0x00, /* eeprom_pda_data_wrap length */ ++ 0x00, 0x00, 0x00, 0x00, /* arm opcode */ ++}; ++ ++static const uint8_t template_mac_address[] = { ++ /* bogus MAC address */ ++ 0x04, 0x00, 0x01, 0x01, /* PDR_MAC_ADDRESS */ ++ 0x00, 0x02, 0xee, 0xc0, 0xff, 0xee, ++}; ++ ++static const uint8_t template_bootrec_exp_if[] = { ++ /* struct bootrec_exp_if */ ++ 0x06, 0x00, 0x01, 0x10, /* PDR_INTERFACE_LIST */ ++ 0x00, 0x00, /* role */ ++ 0x0f, 0x00, /* if_id */ ++ 0x85, 0x00, /* variant = Longbow RF, 2GHz */ ++ 0x01, 0x00, /* btm_compat */ ++ 0x1f, 0x00, /* top_compat */ ++ ++ 0x03, 0x00, 0x02, 0x10, /* PDR_HARDWARE_PLATFORM_COMPONENT_ID */ ++ 0x03, 0x20, 0x00, 0x43, ++}; ++ ++static const uint8_t template_pda_country_list[] = { ++ /* struct pda_country[6] */ ++ 0x0d, 0x00, 0x07, 0x10, /* PDR_COUNTRY_LIST */ ++ 0x10, 0x00, 0x00, 0x00, ++ 0x20, 0x00, 0x00, 0x00, ++ 0x30, 0x00, 0x00, 0x00, ++ 0x31, 0x00, 0x00, 0x00, ++ 0x32, 0x00, 0x00, 0x00, ++ 0x40, 0x00, 0x00, 0x00, ++}; ++ ++static const uint8_t template_pda_country[] = { ++ /* struct pda_country */ ++ 0x03, 0x00, 0x08, 0x10, /* PDR_DEFAULT_COUNTRY */ ++ 0x30, 0x00, 0x00, 0x00, /* ETSI */ ++}; ++ ++static const uint8_t template_antenna_gain[] = { ++ 0x03, 0x00, 0x00, 0x11, /* PDR_ANTENNA_GAIN */ ++ 0x08, 0x08, 0x08, 0x08, ++}; ++ ++static const uint8_t template_rssi_linear_approx_custom2[] = { ++ 0x0a, 0x00, 0xff, 0xca, /* PDR_RSSI_LINEAR_APPROXIMATION_CUSTOMV2 */ ++ 0x01, 0x00, 0x0a, 0x00, ++ 0x00, 0x00, 0x0a, 0x00, ++ 0x85, 0x09, 0x0a, 0x01, 0x72, 0xfe, 0x1a, 0x00, 0x00, 0x00, ++}; ++ ++static const uint8_t template_pa_cal_curve[] = { ++ /* struct pda_custom_wrapper */ ++ 0x10, 0x06, 0x5d, 0xb0, /* PDR_PRISM_PA_CAL_CURVE_DATA_CUSTOM */ ++ 0x0d, 0x00, 0xee, 0x00, /* 13 entries, 238 bytes per entry */ ++ 0x00, 0x00, 0x16, 0x0c, /* no offset, 3094 total len */ ++ /* 2412 MHz */ ++ 0x6c, 0x09, ++ 0x10, 0x01, 0x9a, 0x84, ++ 0xaa, 0x8a, 0xaa, 0x8a, 0xaa, 0x8a, 0xaa, 0x8a, ++ 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, ++ 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, ++ 0xf0, 0x00, 0x94, 0x6c, ++ 0x99, 0x82, 0x99, 0x82, 0x99, 0x82, 0x99, 0x82, ++ 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, ++ 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, ++ 0xd0, 0x00, 0xaa, 0x5a, ++ 0x88, 0x7a, 0x88, 0x7a, 0x88, 0x7a, 0x88, 0x7a, ++ 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, ++ 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, ++ 0xa0, 0x00, 0xf3, 0x47, ++ 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, ++ 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, ++ 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, ++ 0x50, 0x00, 0x59, 0x36, ++ 0x43, 0x5a, 0x43, 0x5a, 0x43, 0x5a, 0x43, 0x5a, ++ 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, ++ 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, ++ 0x00, 0x00, 0xe4, 0x2d, ++ 0x18, 0x46, 0x18, 0x46, 0x18, 0x46, 0x18, 0x46, ++ 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, ++ 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2417 MHz */ ++ 0x71, 0x09, ++ 0x10, 0x01, 0xb9, 0x83, ++ 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0xf0, 0x00, 0x2e, 0x6c, ++ 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xd0, 0x00, 0x8d, 0x5a, ++ 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xa0, 0x00, 0x0a, 0x48, ++ 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0x50, 0x00, 0x7c, 0x36, ++ 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x00, 0x00, 0xf5, 0x2d, ++ 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2422 MHz */ ++ 0x76, 0x09, ++ 0x10, 0x01, 0xb9, 0x83, ++ 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0xf0, 0x00, 0x2e, 0x6c, ++ 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xd0, 0x00, 0x8d, 0x5a, ++ 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xa0, 0x00, 0x0a, 0x48, ++ 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0x50, 0x00, 0x7c, 0x36, ++ 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x00, 0x00, 0xf5, 0x2d, ++ 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2427 MHz */ ++ 0x7b, 0x09, ++ 0x10, 0x01, 0x48, 0x83, ++ 0x67, 0x8a, 0x67, 0x8a, 0x67, 0x8a, 0x67, 0x8a, ++ 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, ++ 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, ++ 0xf0, 0x00, 0xfb, 0x6b, ++ 0x50, 0x82, 0x50, 0x82, 0x50, 0x82, 0x50, 0x82, ++ 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, ++ 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, ++ 0xd0, 0x00, 0x7e, 0x5a, ++ 0x38, 0x7a, 0x38, 0x7a, 0x38, 0x7a, 0x38, 0x7a, ++ 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, ++ 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, ++ 0xa0, 0x00, 0x15, 0x48, ++ 0x14, 0x6e, 0x14, 0x6e, 0x14, 0x6e, 0x14, 0x6e, ++ 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, ++ 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, ++ 0x50, 0x00, 0x8e, 0x36, ++ 0xd9, 0x59, 0xd9, 0x59, 0xd9, 0x59, 0xd9, 0x59, ++ 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, ++ 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, ++ 0x00, 0x00, 0xfe, 0x2d, ++ 0x9d, 0x45, 0x9d, 0x45, 0x9d, 0x45, 0x9d, 0x45, ++ 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, ++ 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2432 MHz */ ++ 0x80, 0x09, ++ 0x10, 0x01, 0xd7, 0x82, ++ 0x51, 0x8a, 0x51, 0x8a, 0x51, 0x8a, 0x51, 0x8a, ++ 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, ++ 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, ++ 0xf0, 0x00, 0xc8, 0x6b, ++ 0x37, 0x82, 0x37, 0x82, 0x37, 0x82, 0x37, 0x82, ++ 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, ++ 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, ++ 0xd0, 0x00, 0x6f, 0x5a, ++ 0x1d, 0x7a, 0x1d, 0x7a, 0x1d, 0x7a, 0x1d, 0x7a, ++ 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, ++ 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, ++ 0xa0, 0x00, 0x20, 0x48, ++ 0xf6, 0x6d, 0xf6, 0x6d, 0xf6, 0x6d, 0xf6, 0x6d, ++ 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, ++ 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, ++ 0x50, 0x00, 0x9f, 0x36, ++ 0xb5, 0x59, 0xb5, 0x59, 0xb5, 0x59, 0xb5, 0x59, ++ 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, ++ 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, ++ 0x00, 0x00, 0x06, 0x2e, ++ 0x74, 0x45, 0x74, 0x45, 0x74, 0x45, 0x74, 0x45, ++ 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, ++ 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2437 MHz */ ++ 0x85, 0x09, ++ 0x10, 0x01, 0x67, 0x82, ++ 0x3a, 0x8a, 0x3a, 0x8a, 0x3a, 0x8a, 0x3a, 0x8a, ++ 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, ++ 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, ++ 0xf0, 0x00, 0x95, 0x6b, ++ 0x1f, 0x82, 0x1f, 0x82, 0x1f, 0x82, 0x1f, 0x82, ++ 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, ++ 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, ++ 0xd0, 0x00, 0x61, 0x5a, ++ 0x02, 0x7a, 0x02, 0x7a, 0x02, 0x7a, 0x02, 0x7a, ++ 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, ++ 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, ++ 0xa0, 0x00, 0x2c, 0x48, ++ 0xd8, 0x6d, 0xd8, 0x6d, 0xd8, 0x6d, 0xd8, 0x6d, ++ 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, ++ 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, ++ 0x50, 0x00, 0xb1, 0x36, ++ 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x00, 0x00, 0x0f, 0x2e, ++ 0x4b, 0x45, 0x4b, 0x45, 0x4b, 0x45, 0x4b, 0x45, ++ 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, ++ 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2442 MHz */ ++ 0x8a, 0x09, ++ 0x10, 0x01, 0xf6, 0x81, ++ 0x24, 0x8a, 0x24, 0x8a, 0x24, 0x8a, 0x24, 0x8a, ++ 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, ++ 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, ++ 0xf0, 0x00, 0x62, 0x6b, ++ 0x06, 0x82, 0x06, 0x82, 0x06, 0x82, 0x06, 0x82, ++ 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, ++ 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, ++ 0xd0, 0x00, 0x52, 0x5a, ++ 0xe7, 0x79, 0xe7, 0x79, 0xe7, 0x79, 0xe7, 0x79, ++ 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, ++ 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, ++ 0xa0, 0x00, 0x37, 0x48, ++ 0xba, 0x6d, 0xba, 0x6d, 0xba, 0x6d, 0xba, 0x6d, ++ 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, ++ 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, ++ 0x50, 0x00, 0xc2, 0x36, ++ 0x6e, 0x59, 0x6e, 0x59, 0x6e, 0x59, 0x6e, 0x59, ++ 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, ++ 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, ++ 0x00, 0x00, 0x17, 0x2e, ++ 0x22, 0x45, 0x22, 0x45, 0x22, 0x45, 0x22, 0x45, ++ 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, ++ 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2447 MHz */ ++ 0x8f, 0x09, ++ 0x10, 0x01, 0x75, 0x83, ++ 0x61, 0x8a, 0x61, 0x8a, 0x61, 0x8a, 0x61, 0x8a, ++ 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, ++ 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, ++ 0xf0, 0x00, 0x4b, 0x6c, ++ 0x3f, 0x82, 0x3f, 0x82, 0x3f, 0x82, 0x3f, 0x82, ++ 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, ++ 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, ++ 0xd0, 0x00, 0xda, 0x5a, ++ 0x1c, 0x7a, 0x1c, 0x7a, 0x1c, 0x7a, 0x1c, 0x7a, ++ 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, ++ 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, ++ 0xa0, 0x00, 0x6d, 0x48, ++ 0xe9, 0x6d, 0xe9, 0x6d, 0xe9, 0x6d, 0xe9, 0x6d, ++ 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, ++ 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, ++ 0x50, 0x00, 0xc6, 0x36, ++ 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x00, 0x00, 0x15, 0x2e, ++ 0x3c, 0x45, 0x3c, 0x45, 0x3c, 0x45, 0x3c, 0x45, ++ 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, ++ 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2452 MHz */ ++ 0x94, 0x09, ++ 0x10, 0x01, 0xf4, 0x84, ++ 0x9e, 0x8a, 0x9e, 0x8a, 0x9e, 0x8a, 0x9e, 0x8a, ++ 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, ++ 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, ++ 0xf0, 0x00, 0x34, 0x6d, ++ 0x77, 0x82, 0x77, 0x82, 0x77, 0x82, 0x77, 0x82, ++ 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, ++ 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, ++ 0xd0, 0x00, 0x62, 0x5b, ++ 0x50, 0x7a, 0x50, 0x7a, 0x50, 0x7a, 0x50, 0x7a, ++ 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, ++ 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, ++ 0xa0, 0x00, 0xa2, 0x48, ++ 0x17, 0x6e, 0x17, 0x6e, 0x17, 0x6e, 0x17, 0x6e, ++ 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, ++ 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, ++ 0x50, 0x00, 0xc9, 0x36, ++ 0xb7, 0x59, 0xb7, 0x59, 0xb7, 0x59, 0xb7, 0x59, ++ 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, ++ 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, ++ 0x00, 0x00, 0x12, 0x2e, ++ 0x57, 0x45, 0x57, 0x45, 0x57, 0x45, 0x57, 0x45, ++ 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, ++ 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2452 MHz */ ++ 0x99, 0x09, ++ 0x10, 0x01, 0x74, 0x86, ++ 0xdb, 0x8a, 0xdb, 0x8a, 0xdb, 0x8a, 0xdb, 0x8a, ++ 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, ++ 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, ++ 0xf0, 0x00, 0x1e, 0x6e, ++ 0xb0, 0x82, 0xb0, 0x82, 0xb0, 0x82, 0xb0, 0x82, ++ 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, ++ 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, ++ 0xd0, 0x00, 0xeb, 0x5b, ++ 0x85, 0x7a, 0x85, 0x7a, 0x85, 0x7a, 0x85, 0x7a, ++ 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, ++ 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, ++ 0xa0, 0x00, 0xd8, 0x48, ++ 0x46, 0x6e, 0x46, 0x6e, 0x46, 0x6e, 0x46, 0x6e, ++ 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, ++ 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, ++ 0x50, 0x00, 0xcd, 0x36, ++ 0xdb, 0x59, 0xdb, 0x59, 0xdb, 0x59, 0xdb, 0x59, ++ 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, ++ 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, ++ 0x00, 0x00, 0x10, 0x2e, ++ 0x71, 0x45, 0x71, 0x45, 0x71, 0x45, 0x71, 0x45, ++ 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, ++ 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2557 MHz */ ++ 0x9e, 0x09, ++ 0x10, 0x01, 0xf3, 0x87, ++ 0x17, 0x8b, 0x17, 0x8b, 0x17, 0x8b, 0x17, 0x8b, ++ 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, ++ 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, ++ 0xf0, 0x00, 0x07, 0x6f, ++ 0xe9, 0x82, 0xe9, 0x82, 0xe9, 0x82, 0xe9, 0x82, ++ 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, ++ 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, ++ 0xd0, 0x00, 0x73, 0x5c, ++ 0xba, 0x7a, 0xba, 0x7a, 0xba, 0x7a, 0xba, 0x7a, ++ 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, ++ 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, ++ 0xa0, 0x00, 0x0d, 0x49, ++ 0x74, 0x6e, 0x74, 0x6e, 0x74, 0x6e, 0x74, 0x6e, ++ 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, ++ 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, ++ 0x50, 0x00, 0xd1, 0x36, ++ 0xff, 0x59, 0xff, 0x59, 0xff, 0x59, 0xff, 0x59, ++ 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, ++ 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, ++ 0x00, 0x00, 0x0e, 0x2e, ++ 0x8b, 0x45, 0x8b, 0x45, 0x8b, 0x45, 0x8b, 0x45, ++ 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, ++ 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2562 MHz */ ++ 0xa3, 0x09, ++ 0x10, 0x01, 0x72, 0x89, ++ 0x54, 0x8b, 0x54, 0x8b, 0x54, 0x8b, 0x54, 0x8b, ++ 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, ++ 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, ++ 0xf0, 0x00, 0xf0, 0x6f, ++ 0x21, 0x83, 0x21, 0x83, 0x21, 0x83, 0x21, 0x83, ++ 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, ++ 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, ++ 0xd0, 0x00, 0xfb, 0x5c, ++ 0xee, 0x7a, 0xee, 0x7a, 0xee, 0x7a, 0xee, 0x7a, ++ 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, ++ 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, ++ 0xa0, 0x00, 0x43, 0x49, ++ 0xa3, 0x6e, 0xa3, 0x6e, 0xa3, 0x6e, 0xa3, 0x6e, ++ 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, ++ 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, ++ 0x50, 0x00, 0xd4, 0x36, ++ 0x24, 0x5a, 0x24, 0x5a, 0x24, 0x5a, 0x24, 0x5a, ++ 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, ++ 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, ++ 0x00, 0x00, 0x0b, 0x2e, ++ 0xa6, 0x45, 0xa6, 0x45, 0xa6, 0x45, 0xa6, 0x45, ++ 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, ++ 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2572 MHz */ ++ 0xa8, 0x09, ++ 0x10, 0x01, 0xf1, 0x8a, ++ 0x91, 0x8b, 0x91, 0x8b, 0x91, 0x8b, 0x91, 0x8b, ++ 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, ++ 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, ++ 0xf0, 0x00, 0xd9, 0x70, ++ 0x5a, 0x83, 0x5a, 0x83, 0x5a, 0x83, 0x5a, 0x83, ++ 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, ++ 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, ++ 0xd0, 0x00, 0x83, 0x5d, ++ 0x23, 0x7b, 0x23, 0x7b, 0x23, 0x7b, 0x23, 0x7b, ++ 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, ++ 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, ++ 0xa0, 0x00, 0x78, 0x49, ++ 0xd1, 0x6e, 0xd1, 0x6e, 0xd1, 0x6e, 0xd1, 0x6e, ++ 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, ++ 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, ++ 0x50, 0x00, 0xd8, 0x36, ++ 0x48, 0x5a, 0x48, 0x5a, 0x48, 0x5a, 0x48, 0x5a, ++ 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, ++ 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, ++ 0x00, 0x00, 0x09, 0x2e, ++ 0xc0, 0x45, 0xc0, 0x45, 0xc0, 0x45, 0xc0, 0x45, ++ 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, ++ 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++}; ++ ++/* ++ * Not really sure if this is actually the power_limit database, ++ * it looks a bit "related" to PDR_PRISM_ZIF_TX_IQ_CALIBRATION ++ */ ++static const uint8_t template_pa_cal_output_power_limits[] = { ++ /* struct pda_custom_wrapper */ ++ 0xae, 0x00, 0xef, 0xbe, /* PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS_CUSTOM */ ++ 0x0d, 0x00, 0x1a, 0x00, /* 13 entries, 26 bytes per entry */ ++ 0x00, 0x00, 0x52, 0x01, /* no offset, 338 bytes total */ ++ ++ /* 2412 MHz */ ++ 0x6c, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2417 MHz */ ++ 0x71, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2422 MHz */ ++ 0x76, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2427 MHz */ ++ 0x7b, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2432 MHz */ ++ 0x80, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2437 MHz */ ++ 0x85, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2442 MHz */ ++ 0x8a, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2447 MHz */ ++ 0x8f, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2452 MHz */ ++ 0x94, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2457 MHz */ ++ 0x99, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2462 MHz */ ++ 0x9e, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2467 MHz */ ++ 0xa3, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2472 MHz */ ++ 0xa8, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++}; ++ ++static const uint8_t template_pda_iq_autocal[] = { ++ /* struct pda_iq_autocal_entry[13] */ ++ 0x42, 0x00, 0x06, 0x19, /* PDR_PRISM_ZIF_TX_IQ_CALIBRATION */ ++ /* 2412 MHz */ ++ 0x6c, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2417 MHz */ ++ 0x71, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2422 MHz */ ++ 0x76, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2427 MHz */ ++ 0x7b, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2432 MHz */ ++ 0x80, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2437 MHz */ ++ 0x85, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2442 MHz */ ++ 0x8a, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2447 MHz */ ++ 0x8f, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2452 MHz */ ++ 0x94, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2457 MHz */ ++ 0x99, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++ /* 2462 MHz */ ++ 0x9e, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++ /* 2467 MHz */ ++ 0xa3, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++ /* 2472 MHz */ ++ 0xa8, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++}; ++ ++static const uint8_t template_pdr_end[] = { ++ 0x02, 0x00, 0x00, 0x00, /* PDR_END */ ++}; ++ ++/* linux/lib/crc-ccitt.c ++ * ++ * This mysterious table is just the CRC of each possible byte. It can be ++ * computed using the standard bit-at-a-time methods. The polynomial can ++ * be seen in entry 128, 0x8408. This corresponds to x^0 + x^5 + x^12. ++ * Add the implicit x^16, and you have the standard CRC-CCITT. ++ */ ++static uint16_t const crc_ccitt_table[256] = { ++ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, ++ 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, ++ 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, ++ 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, ++ 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, ++ 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, ++ 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, ++ 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, ++ 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, ++ 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, ++ 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, ++ 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, ++ 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, ++ 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, ++ 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, ++ 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, ++ 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, ++ 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, ++ 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, ++ 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, ++ 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, ++ 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, ++ 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, ++ 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, ++ 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, ++ 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, ++ 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, ++ 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, ++ 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, ++ 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, ++ 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, ++ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 ++}; ++ ++static inline uint16_t crc_ccitt_byte(uint16_t crc, const uint8_t c) ++{ ++ return (crc >> 8) ^ crc_ccitt_table[(crc ^ c) & 0xff]; ++} ++ ++static uint16_t crc_ccitt(uint16_t crc, uint8_t const *buffer, size_t len) ++{ ++ while (len--) ++ crc = crc_ccitt_byte(crc, *buffer++); ++ return crc; ++} ++ ++static int generate_pa_cal_curve(uint8_t *buffer, ++ const uint8_t *txgen_image, ++ size_t txgen_image_size) ++{ ++ memcpy(buffer, template_pa_cal_curve, sizeof(template_pa_cal_curve)); ++ ++ //TODO ++ ++ return 0; ++} ++ ++static int generate_iq_autocal(uint8_t *buffer, ++ const uint8_t *iqalign_image, ++ size_t iqalign_image_size) ++{ ++ unsigned int expected_size; ++ uint8_t *out; ++ const uint8_t *in; ++ unsigned int i; ++ ++ expected_size = 13 * 8 + 4; ++ if (iqalign_image_size != expected_size) { ++ fprintf(stderr, "ERROR: Unknown wlan-iq-align image size. " ++ "Got %u, but expected %u\n", ++ (unsigned int)iqalign_image_size, expected_size); ++ return -EINVAL; ++ } ++ ++ in = iqalign_image; ++ out = buffer; ++ ++ memcpy(out, template_pda_iq_autocal, sizeof(template_pda_iq_autocal)); ++ ++ in += 4; /* Skip zero padding */ ++ out += 4; /* Skip header */ ++ for (i = 0; i < 13; i++) { ++ out += 2; /* Skip little endian 16bit Mhz number */ ++ memcpy(out, in, 8); ++ out += 8; /* Next element */ ++ in += 8; /* Next element */ ++ } ++ ++ return 0; ++} ++ ++static int generate_eeprom(FILE *outstream, ++ const uint8_t *txgen_image, ++ size_t txgen_image_size, ++ const uint8_t *iqalign_image, ++ size_t iqalign_image_size) ++{ ++ int err, res = 0; ++ uint16_t crc = ~0; ++ uint8_t crc_buf[2]; ++ uint8_t gen_pda_iq_autocal[sizeof(template_pda_iq_autocal)]; ++ uint8_t gen_pa_cal_curve[sizeof(template_pa_cal_curve)]; ++ ++ err = generate_iq_autocal(gen_pda_iq_autocal, ++ iqalign_image, iqalign_image_size); ++ if (err) ++ return err; ++ err = generate_pa_cal_curve(gen_pa_cal_curve, ++ txgen_image, txgen_image_size); ++ if (err) ++ return err; ++ ++#define writebuf(buffer, do_crc) do { \ ++ if (do_crc) \ ++ crc = crc_ccitt(crc, buffer, sizeof(buffer)); \ ++ res = fwrite(buffer, sizeof(buffer), 1, outstream); \ ++ if (res != 1) { \ ++ fprintf(stderr, "Failed to write output data\n"); \ ++ return -EIO; \ ++ } \ ++ } while (0) ++ ++ writebuf(template_eeprom_pda_wrap, 0); ++ writebuf(template_mac_address, 1); ++ writebuf(template_bootrec_exp_if, 1); ++ writebuf(template_pda_country_list, 1); ++ writebuf(template_pda_country, 1); ++ writebuf(template_antenna_gain, 1); ++ writebuf(template_rssi_linear_approx_custom2, 1); ++ writebuf(gen_pa_cal_curve, 1); ++ writebuf(template_pa_cal_output_power_limits, 1); ++ writebuf(gen_pda_iq_autocal, 1); ++ writebuf(template_pdr_end, 1); ++ ++ crc = ~crc; ++ crc_buf[0] = crc & 0xFF; ++ crc_buf[1] = (crc >> 8) & 0xFF; ++ res = fwrite(crc_buf, sizeof(crc_buf), 1, outstream); ++ if (res != 1) { ++ fprintf(stderr, "Failed to write CRC\n"); ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++static void * map_file(const char *filepath, int readonly, ++ uint64_t *filelen) ++{ ++ int fd; ++ off_t len; ++ void *data; ++ ++ fd = open(filepath, readonly ? O_RDONLY : O_RDWR); ++ if (fd < 0) { ++ fprintf(stderr, "Failed to open file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ len = lseek(fd, 0, SEEK_END); ++ if (len < 0 || lseek(fd, 0, SEEK_SET)) { ++ fprintf(stderr, "Failed to calculate file length of %s: %s\n", ++ filepath, strerror(errno)); ++ close(fd); ++ return NULL; ++ } ++ ++ data = mmap(NULL, len, ++ readonly ? PROT_READ : (PROT_READ | PROT_WRITE), ++ readonly ? MAP_PRIVATE : 0, ++ fd, 0); ++ close(fd); ++ if (data == MAP_FAILED) { ++ fprintf(stderr, "Failed to MMAP file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ madvise(data, len, MADV_SEQUENTIAL); ++ ++ *filelen = len; ++ ++ return data; ++} ++ ++static void unmap_file(void *mapping, uint64_t len) ++{ ++ if (mapping) ++ munmap(mapping, len); ++} ++ ++static void usage(FILE *fd) ++{ ++ fprintf(fd, "cal2p54 - CAL to p54spi EEPROM converter\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Usage: cal2p54 WLAN-TX-GEN2-IMAGE WLAN-IQ-ALIGN-IMAGE\n"); ++} ++ ++int main(int argc, char **argv) ++{ ++ int err, ret = 0; ++ uint8_t *txgen_image = NULL; ++ uint64_t txgen_image_len = 0; ++ uint8_t *iqalign_image = NULL; ++ uint64_t iqalign_image_len = 0; ++ ++ const char *txgen_filepath; ++ const char *iqalign_filepath; ++ ++ if (argc != 3) { ++ usage(stderr); ++ return 1; ++ } ++ txgen_filepath = argv[1]; ++ iqalign_filepath = argv[2]; ++ ++ txgen_image = map_file(txgen_filepath, 1, &txgen_image_len); ++ iqalign_image = map_file(iqalign_filepath, 1, &iqalign_image_len); ++ if (!txgen_image || !iqalign_image) { ++ ret = 1; ++ goto out; ++ } ++ ++ err = generate_eeprom(stdout, txgen_image, txgen_image_len, ++ iqalign_image, iqalign_image_len); ++ if (err) { ++ ret = 1; ++ goto out; ++ } ++ ++out: ++ unmap_file(txgen_image, txgen_image_len); ++ unmap_file(iqalign_image, iqalign_image_len); ++ ++ return ret; ++} +diff --git a/feeds/packages/utils/calvaria/files/src/.svn/text-base/calvaria.c.svn-base b/feeds/packages/utils/calvaria/files/src/.svn/text-base/calvaria.c.svn-base +new file mode 100644 +index 0000000..2438e34 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/.svn/text-base/calvaria.c.svn-base +@@ -0,0 +1,514 @@ ++/* ++ * Calvaria - Maemo CAL partition variable access tool. ++ * ++ * Copyright (c) 2011 Michael Buesch ++ * ++ * Licensed under the GNU General Public License version 2. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++#define _packed __attribute__((__packed__)) ++ ++typedef uint16_t le16_t; ++typedef uint32_t le32_t; ++ ++struct header { ++ char magic[4]; /* Magic sequence */ ++ uint8_t type; /* Type number */ ++ uint8_t index; /* Index number */ ++ le16_t flags; /* Flags */ ++ char name[16]; /* Human readable section name */ ++ le32_t length; /* Payload length */ ++ le32_t datasum; /* Data CRC32 checksum */ ++ le32_t hdrsum; /* Header CRC32 checksum */ ++} _packed; ++ ++#define HDR_MAGIC "ConF" ++ ++#define INDEX_LAST (0xFF + 1) ++ ++ ++static char toAscii(char c) ++{ ++ if (c >= 32 && c <= 126) ++ return c; ++ return '.'; ++} ++ ++static void dump_bytes(FILE *outstream, const void *_buf, size_t size) ++{ ++ const char *buf = _buf; ++ size_t i, ascii_cnt = 0; ++ char ascii[17] = { 0, }; ++ ++ for (i = 0; i < size; i++) { ++ if (i % 16 == 0) { ++ if (i != 0) { ++ fprintf(outstream, " |%s|\n", ascii); ++ ascii[0] = 0; ++ ascii_cnt = 0; ++ } ++ fprintf(outstream, "[%04X]: ", (unsigned int)i); ++ } ++ fprintf(outstream, " %02X", buf[i] & 0xFF); ++ ascii[ascii_cnt] = toAscii(buf[i]); ++ ascii[ascii_cnt + 1] = 0; ++ ascii_cnt++; ++ } ++ if (ascii[0]) { ++ if (size % 16) { ++ for (i = 0; i < 16 - (size % 16); i++) ++ fprintf(outstream, " "); ++ } ++ fprintf(outstream, " |%s|\n", ascii); ++ } ++} ++ ++static uint32_t crc32(uint32_t crc, const void *_data, size_t size) ++{ ++ const uint8_t *data = _data; ++ uint8_t value; ++ unsigned int bit; ++ size_t i; ++ const uint32_t poly = 0xEDB88320; ++ ++ for (i = 0; i < size; i++) { ++ value = data[i]; ++ for (bit = 8; bit; bit--) { ++ if ((crc & 1) != (value & 1)) ++ crc = (crc >> 1) ^ poly; ++ else ++ crc >>= 1; ++ value >>= 1; ++ } ++ } ++ ++ return crc; ++} ++ ++static inline uint16_t le16_to_cpu(le16_t x) ++{ ++ uint8_t *bytes = (uint8_t *)&x; ++ uint16_t ret; ++ ++ ret = bytes[0]; ++ ret |= (uint16_t)(bytes[1]) << 8; ++ ++ return ret; ++} ++ ++static inline uint32_t le32_to_cpu(le32_t x) ++{ ++ uint8_t *bytes = (uint8_t *)&x; ++ uint32_t ret; ++ ++ ret = bytes[0]; ++ ret |= (uint32_t)(bytes[1]) << 8; ++ ret |= (uint32_t)(bytes[2]) << 16; ++ ret |= (uint32_t)(bytes[3]) << 24; ++ ++ return ret; ++} ++ ++static int is_header(void *data, size_t size) ++{ ++ struct header *hdr = data; ++ ++ if (size < sizeof(struct header)) ++ return 0; ++ if (memcmp(hdr->magic, HDR_MAGIC, sizeof(hdr->magic)) != 0) ++ return 0; ++ return 1; ++} ++ ++void dump_bme_payload(FILE *outstream, const void *payload, size_t len) ++{ ++ const uint8_t *pmm_area = payload; ++ unsigned int group, element, pmm_offset; ++ uint8_t active_group_mask; ++ static const uint8_t zero_element[16] = { 0, }; ++ ++ if (len != 0x600 || memcmp(payload, "BME-PMM-BLOCK01", 15) != 0) { ++ fprintf(outstream, "ERROR: The section payload is not " ++ "a BME PMM block\n"); ++ return; ++ } ++ ++ active_group_mask = pmm_area[16]; ++ ++ for (group = 0; group < 3; group++) { ++ for (element = 0; element < 32; element++) { ++ pmm_offset = group * 512 + element * 16; ++ if (memcmp(pmm_area + pmm_offset, zero_element, 16) == 0) ++ continue; ++ fprintf(outstream, "-- BME-PMM area -- group %u%s, element %u:\n", ++ group, ++ (active_group_mask & (1 << group)) ? "" : " (INACTIVE)", ++ element); ++ dump_bytes(outstream, pmm_area + pmm_offset, 16); ++ } ++ } ++} ++ ++typedef void (*payload_dumper_t)(FILE *, const void *payload, size_t len); ++ ++static payload_dumper_t get_payload_dumper(const char *section_name, int raw) ++{ ++ if (!raw) { ++ if (strcmp(section_name, "bme") == 0) ++ return dump_bme_payload; ++ } ++ ++ return dump_bytes; ++} ++ ++static int dump_section(const struct header *hdr, ++ const void *payload, size_t payload_len, ++ int dump_payload, ++ int dump_raw_payload, ++ FILE *outstream) ++{ ++ char name[sizeof(hdr->name) + 1] = { 0, }; ++ int hdrsum_ok, datasum_ok; ++ payload_dumper_t dumper; ++ ++ memcpy(name, hdr->name, sizeof(hdr->name)); ++ hdrsum_ok = (crc32(0, hdr, sizeof(*hdr) - 4) == le32_to_cpu(hdr->hdrsum)); ++ datasum_ok = (crc32(0, payload, payload_len) == le32_to_cpu(hdr->datasum)); ++ ++ fprintf(outstream, "Section: %s\n", name); ++ fprintf(outstream, "Type: %u (0x%X)\n", hdr->type, hdr->type); ++ fprintf(outstream, "Index: %u (0x%X)\n", hdr->index, hdr->index); ++ fprintf(outstream, "Flags: 0x%04X\n", le16_to_cpu(hdr->flags)); ++ fprintf(outstream, "Length: %u (0x%X)\n", ++ le32_to_cpu(hdr->length), le32_to_cpu(hdr->length)); ++ fprintf(outstream, "Data CRC32: 0x%08X (%s)\n", le32_to_cpu(hdr->datasum), ++ datasum_ok ? "Ok" : "MISMATCH"); ++ fprintf(outstream, "Header CRC32: 0x%08X (%s)\n", le32_to_cpu(hdr->hdrsum), ++ hdrsum_ok ? "Ok" : "MISMATCH"); ++ if (dump_payload) { ++ dumper = get_payload_dumper(name, dump_raw_payload); ++ dumper(outstream, payload, payload_len); ++ } ++ fprintf(outstream, "\n"); ++ ++ return 0; ++} ++ ++static void * map_file(const char *filepath, int readonly, ++ uint64_t *filelen) ++{ ++ int fd; ++ off_t len; ++ void *data; ++ ++ fd = open(filepath, readonly ? O_RDONLY : O_RDWR); ++ if (fd < 0) { ++ fprintf(stderr, "Failed to open file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ len = lseek(fd, 0, SEEK_END); ++ if (len < 0 || lseek(fd, 0, SEEK_SET)) { ++ fprintf(stderr, "Failed to calculate file length of %s: %s\n", ++ filepath, strerror(errno)); ++ close(fd); ++ return NULL; ++ } ++ ++ data = mmap(NULL, len, ++ readonly ? PROT_READ : (PROT_READ | PROT_WRITE), ++ readonly ? MAP_PRIVATE : 0, ++ fd, 0); ++ close(fd); ++ if (data == MAP_FAILED) { ++ fprintf(stderr, "Failed to MMAP file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ madvise(data, len, MADV_SEQUENTIAL); ++ ++ *filelen = len; ++ ++ return data; ++} ++ ++static void unmap_file(void *mapping, uint64_t len) ++{ ++ if (mapping) ++ munmap(mapping, len); ++} ++ ++static int64_t find_section(void *start, uint64_t count, ++ int want_index, const char *want_name) ++{ ++ int64_t offset = 0, found_offset = -1; ++ uint8_t *data = start; ++ struct header *hdr; ++ char sectname[sizeof(hdr->name) + 1] = { 0, }; ++ uint32_t payload_len; ++ int previous_index = -1; ++ ++ while (1) { ++ /* Find header start */ ++ if (count < sizeof(struct header)) ++ break; ++ if (!is_header(data + offset, count)) { ++ count--; ++ offset++; ++ continue; ++ } ++ hdr = (struct header *)(data + offset); ++ payload_len = le32_to_cpu(hdr->length); ++ if (count - sizeof(struct header) < payload_len) { ++ fprintf(stderr, "Premature EOF\n"); ++ return -1; ++ } ++ memcpy(sectname, hdr->name, sizeof(hdr->name)); ++ ++ if (want_index == INDEX_LAST) { ++ if ((int)hdr->index <= previous_index) ++ goto next; ++ } else { ++ if (want_index >= 0 && want_index != hdr->index) ++ goto next; ++ } ++ if (want_name && strcmp(sectname, want_name) != 0) ++ goto next; ++ ++ /* Found it */ ++ found_offset = offset; ++ if (want_index == INDEX_LAST) ++ previous_index = hdr->index; ++ else ++ break; ++ ++next: ++ count -= sizeof(struct header) + payload_len; ++ offset += sizeof(struct header) + payload_len; ++ } ++ ++ return found_offset; ++} ++ ++static int dump_image(const char *filepath, ++ int want_section_index, const char *want_section_name, ++ int want_headers_only, ++ int dump_raw_payload, ++ FILE *outstream) ++{ ++ int err, ret = 0; ++ uint64_t filelen; ++ uint64_t count, offset; ++ int64_t find_offset; ++ uint8_t *data, *section; ++ struct header *hdr; ++ uint32_t payload_len; ++ ++ data = map_file(filepath, 1, &filelen); ++ if (!data) ++ return -EIO; ++ ++ count = filelen; ++ offset = 0; ++ while (1) { ++ find_offset = find_section(data + offset, count, ++ want_section_index, want_section_name); ++ if (find_offset < 0) ++ break; ++ offset += find_offset; ++ count -= find_offset; ++ ++ section = data + offset; ++ hdr = (struct header *)section; ++ payload_len = le32_to_cpu(hdr->length); ++ ++ err = dump_section(hdr, section + sizeof(struct header), ++ payload_len, ++ !want_headers_only, ++ dump_raw_payload, ++ outstream); ++ if (err) { ++ ret = err; ++ goto out; ++ } ++ ++ count -= sizeof(struct header) + payload_len; ++ offset += sizeof(struct header) + payload_len; ++ } ++out: ++ unmap_file(data, filelen); ++ ++ return ret; ++} ++ ++static int write_payload(const char *filepath, ++ int want_section_index, const char *want_section_name, ++ FILE *outstream) ++{ ++ int64_t find_offset; ++ uint64_t filelen; ++ uint8_t *data; ++ struct header *hdr; ++ ++ data = map_file(filepath, 1, &filelen); ++ if (!data) ++ return -EIO; ++ ++ find_offset = find_section(data, filelen, ++ want_section_index, want_section_name); ++ if (find_offset < 0) { ++ fprintf(stderr, "Section %s, index %d not found\n", ++ want_section_name, want_section_index); ++ unmap_file(data, filelen); ++ return -ESRCH; ++ } ++ ++ hdr = (struct header *)(data + find_offset); ++ if (fwrite(data + find_offset + sizeof(struct header), ++ le32_to_cpu(hdr->length), 1, outstream) != 1) { ++ fprintf(stderr, "Could not write output data\n"); ++ unmap_file(data, filelen); ++ return -EIO; ++ } ++ ++ unmap_file(data, filelen); ++ ++ return 0; ++} ++ ++static void usage(FILE *fd) ++{ ++ fprintf(fd, "Calvaria - Maemo CAL partition variable access tool\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Usage: calvaria [OPTIONS] FILE\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Actions:\n"); ++ fprintf(fd, " -d|--dump Dump the contents of the image\n"); ++ fprintf(fd, " -H|--headers Dump the headers of the image, only\n"); ++ fprintf(fd, " -p|--payload Write the binary payload to stdout.\n"); ++ fprintf(fd, " Requires -i and -n to be set, too\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Options:\n"); ++ fprintf(fd, " -i|--index NUMBER Use this section index number\n"); ++ fprintf(fd, " -n|--name STRING Use this section name\n"); ++ fprintf(fd, " -r|--raw Dump raw data (for -d|--dump only)\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, " -h|--help Print this help text\n"); ++} ++ ++enum action { ++ ACTION_NONE, ++ ACTION_DUMP, ++ ACTION_DUMPHDRS, ++ ACTION_GETPAYLOAD, ++}; ++ ++int main(int argc, char **argv) ++{ ++ int err, c, idx = 0; ++ const char *filepath; ++ enum action action = ACTION_NONE; ++ int opt_index = -1; ++ const char *opt_name = NULL; ++ int opt_raw_payload = 0; ++ ++ static struct option long_options[] = { ++ { "dump", no_argument, 0, 'd', }, ++ { "headers", no_argument, 0, 'H', }, ++ { "payload", no_argument, 0, 'p', }, ++ { "index", required_argument, 0, 'i', }, ++ { "name", required_argument, 0, 'n', }, ++ { "raw", no_argument, 0, 'r', }, ++ { "help", no_argument, 0, 'h', }, ++ { }, ++ }; ++ ++ while (1) { ++ c = getopt_long(argc, argv, "dHphi:n:r", ++ long_options, &idx); ++ if (c == -1) ++ break; ++ switch (c) { ++ case 'h': ++ usage(stdout); ++ return 0; ++ case 'd': ++ action = ACTION_DUMP; ++ break; ++ case 'H': ++ action = ACTION_DUMPHDRS; ++ break; ++ case 'p': ++ action = ACTION_GETPAYLOAD; ++ break; ++ case 'i': ++ if (strcasecmp(optarg, "last") == 0) { ++ opt_index = INDEX_LAST; ++ } else { ++ if (sscanf(optarg, "%d", &opt_index) != 1 || opt_index < 0) { ++ fprintf(stderr, "-i|--index is not a positive integer\n"); ++ return 1; ++ } ++ } ++ break; ++ case 'n': ++ opt_name = optarg; ++ break; ++ case 'r': ++ opt_raw_payload = 1; ++ break; ++ default: ++ return 1; ++ } ++ } ++ argc -= optind; ++ argv += optind; ++ if (action == ACTION_NONE) { ++ fprintf(stderr, "No action specified.\n"); ++ return 1; ++ } ++ if (action == ACTION_GETPAYLOAD) { ++ if (opt_index < 0 || !opt_name) { ++ fprintf(stderr, "Required options -i|--index or -n|--name " ++ "not specified for action -p|--payload\n"); ++ return 1; ++ } ++ } ++ if (argc != 1) { ++ usage(stderr); ++ return 1; ++ } ++ filepath = argv[0]; ++ ++ switch (action) { ++ case ACTION_NONE: ++ break; ++ case ACTION_DUMP: ++ case ACTION_DUMPHDRS: ++ err = dump_image(filepath, opt_index, opt_name, ++ (action == ACTION_DUMPHDRS), ++ opt_raw_payload, ++ stdout); ++ if (err) ++ return 1; ++ break; ++ case ACTION_GETPAYLOAD: ++ err = write_payload(filepath, opt_index, opt_name, stdout); ++ if (err) ++ return 1; ++ break; ++ } ++ ++ return 0; ++} +diff --git a/feeds/packages/utils/calvaria/files/src/Makefile b/feeds/packages/utils/calvaria/files/src/Makefile +new file mode 100644 +index 0000000..6d42bf1 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/Makefile +@@ -0,0 +1,32 @@ ++DESTDIR ?= ++PREFIX ?= /usr ++CFLAGS ?= -O2 -Wall ++LDFLAGS ?= ++LDLIBS ?= ++ ++STRIP ?= strip ++INSTALL ?= install ++ ++CALVARIA_BIN := calvaria ++CAL2P54_BIN := cal2p54 ++ ++all: $(CALVARIA_BIN) $(CAL2P54_BIN) ++ ++$(CALVARIA_BIN): calvaria.o ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ ++ $(STRIP) $@ ++ ++$(CAL2P54_BIN): cal2p54.o ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ ++ $(STRIP) $@ ++ ++%.o: %.c ++ $(CC) -c $(CFLAGS) $^ -o $@ ++ ++install: $(CALVARIA_BIN) $(CAL2P54_BIN) ++ $(INSTALL) -d $(DESTDIR)/$(PREFIX)/bin ++ $(INSTALL) -m 0755 $(CALVARIA_BIN) $(DESTDIR)/$(PREFIX)/bin/ ++ $(INSTALL) -m 0755 $(CAL2P54_BIN) $(DESTDIR)/$(PREFIX)/bin/ ++ ++clean: ++ rm -f $(CALVARIA_BIN) $(CAL2P54_BIN) *.o +diff --git a/feeds/packages/utils/calvaria/files/src/cal2p54.c b/feeds/packages/utils/calvaria/files/src/cal2p54.c +new file mode 100644 +index 0000000..cac4436 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/cal2p54.c +@@ -0,0 +1,940 @@ ++/* ++ * cal2p54 - CAL to p54spi EEPROM converter ++ * ++ * Copyright (c) 2011 Michael Buesch ++ * ++ * Licensed under the GNU General Public License version 2. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++/* Template data from Linux p54spi_eeprom.h: ++ * ++ * Copyright (C) 2003 Conexant Americas Inc. All Rights Reserved. ++ * Copyright (C) 2004, 2005, 2006 Nokia Corporation ++ * Copyright 2008 Johannes Berg ++ * Copyright 2008 Christian Lamparter ++ * ++ * based on: ++ * - cx3110x's pda.h from Nokia ++ * - cx3110-transfer.log by Johannes Berg ++ */ ++ ++static const uint8_t template_eeprom_pda_wrap[] = { ++ /* struct eeprom_pda_wrap */ ++ 0x47, 0x4d, 0x55, 0xaa, /* magic */ ++ 0x00, 0x00, /* pad */ ++ 0x00, 0x00, /* eeprom_pda_data_wrap length */ ++ 0x00, 0x00, 0x00, 0x00, /* arm opcode */ ++}; ++ ++static const uint8_t template_mac_address[] = { ++ /* bogus MAC address */ ++ 0x04, 0x00, 0x01, 0x01, /* PDR_MAC_ADDRESS */ ++ 0x00, 0x02, 0xee, 0xc0, 0xff, 0xee, ++}; ++ ++static const uint8_t template_bootrec_exp_if[] = { ++ /* struct bootrec_exp_if */ ++ 0x06, 0x00, 0x01, 0x10, /* PDR_INTERFACE_LIST */ ++ 0x00, 0x00, /* role */ ++ 0x0f, 0x00, /* if_id */ ++ 0x85, 0x00, /* variant = Longbow RF, 2GHz */ ++ 0x01, 0x00, /* btm_compat */ ++ 0x1f, 0x00, /* top_compat */ ++ ++ 0x03, 0x00, 0x02, 0x10, /* PDR_HARDWARE_PLATFORM_COMPONENT_ID */ ++ 0x03, 0x20, 0x00, 0x43, ++}; ++ ++static const uint8_t template_pda_country_list[] = { ++ /* struct pda_country[6] */ ++ 0x0d, 0x00, 0x07, 0x10, /* PDR_COUNTRY_LIST */ ++ 0x10, 0x00, 0x00, 0x00, ++ 0x20, 0x00, 0x00, 0x00, ++ 0x30, 0x00, 0x00, 0x00, ++ 0x31, 0x00, 0x00, 0x00, ++ 0x32, 0x00, 0x00, 0x00, ++ 0x40, 0x00, 0x00, 0x00, ++}; ++ ++static const uint8_t template_pda_country[] = { ++ /* struct pda_country */ ++ 0x03, 0x00, 0x08, 0x10, /* PDR_DEFAULT_COUNTRY */ ++ 0x30, 0x00, 0x00, 0x00, /* ETSI */ ++}; ++ ++static const uint8_t template_antenna_gain[] = { ++ 0x03, 0x00, 0x00, 0x11, /* PDR_ANTENNA_GAIN */ ++ 0x08, 0x08, 0x08, 0x08, ++}; ++ ++static const uint8_t template_rssi_linear_approx_custom2[] = { ++ 0x0a, 0x00, 0xff, 0xca, /* PDR_RSSI_LINEAR_APPROXIMATION_CUSTOMV2 */ ++ 0x01, 0x00, 0x0a, 0x00, ++ 0x00, 0x00, 0x0a, 0x00, ++ 0x85, 0x09, 0x0a, 0x01, 0x72, 0xfe, 0x1a, 0x00, 0x00, 0x00, ++}; ++ ++static const uint8_t template_pa_cal_curve[] = { ++ /* struct pda_custom_wrapper */ ++ 0x10, 0x06, 0x5d, 0xb0, /* PDR_PRISM_PA_CAL_CURVE_DATA_CUSTOM */ ++ 0x0d, 0x00, 0xee, 0x00, /* 13 entries, 238 bytes per entry */ ++ 0x00, 0x00, 0x16, 0x0c, /* no offset, 3094 total len */ ++ /* 2412 MHz */ ++ 0x6c, 0x09, ++ 0x10, 0x01, 0x9a, 0x84, ++ 0xaa, 0x8a, 0xaa, 0x8a, 0xaa, 0x8a, 0xaa, 0x8a, ++ 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, ++ 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, 0x3c, 0xb6, ++ 0xf0, 0x00, 0x94, 0x6c, ++ 0x99, 0x82, 0x99, 0x82, 0x99, 0x82, 0x99, 0x82, ++ 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, ++ 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, 0x2b, 0xae, ++ 0xd0, 0x00, 0xaa, 0x5a, ++ 0x88, 0x7a, 0x88, 0x7a, 0x88, 0x7a, 0x88, 0x7a, ++ 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, ++ 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, 0x1a, 0xa6, ++ 0xa0, 0x00, 0xf3, 0x47, ++ 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, ++ 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, ++ 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, 0x00, 0x9a, ++ 0x50, 0x00, 0x59, 0x36, ++ 0x43, 0x5a, 0x43, 0x5a, 0x43, 0x5a, 0x43, 0x5a, ++ 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, ++ 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, 0xd5, 0x85, ++ 0x00, 0x00, 0xe4, 0x2d, ++ 0x18, 0x46, 0x18, 0x46, 0x18, 0x46, 0x18, 0x46, ++ 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, ++ 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, 0xaa, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2417 MHz */ ++ 0x71, 0x09, ++ 0x10, 0x01, 0xb9, 0x83, ++ 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0xf0, 0x00, 0x2e, 0x6c, ++ 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xd0, 0x00, 0x8d, 0x5a, ++ 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xa0, 0x00, 0x0a, 0x48, ++ 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0x50, 0x00, 0x7c, 0x36, ++ 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x00, 0x00, 0xf5, 0x2d, ++ 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2422 MHz */ ++ 0x76, 0x09, ++ 0x10, 0x01, 0xb9, 0x83, ++ 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, 0x7d, 0x8a, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, 0x0f, 0xb6, ++ 0xf0, 0x00, 0x2e, 0x6c, ++ 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, 0x68, 0x82, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, 0xfa, 0xad, ++ 0xd0, 0x00, 0x8d, 0x5a, ++ 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, 0x52, 0x7a, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, 0xe4, 0xa5, ++ 0xa0, 0x00, 0x0a, 0x48, ++ 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, 0x32, 0x6e, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, 0xc4, 0x99, ++ 0x50, 0x00, 0x7c, 0x36, ++ 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, 0xfc, 0x59, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, 0x8e, 0x85, ++ 0x00, 0x00, 0xf5, 0x2d, ++ 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, 0xc6, 0x45, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, 0x58, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2427 MHz */ ++ 0x7b, 0x09, ++ 0x10, 0x01, 0x48, 0x83, ++ 0x67, 0x8a, 0x67, 0x8a, 0x67, 0x8a, 0x67, 0x8a, ++ 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, ++ 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, 0xf9, 0xb5, ++ 0xf0, 0x00, 0xfb, 0x6b, ++ 0x50, 0x82, 0x50, 0x82, 0x50, 0x82, 0x50, 0x82, ++ 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, ++ 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, 0xe2, 0xad, ++ 0xd0, 0x00, 0x7e, 0x5a, ++ 0x38, 0x7a, 0x38, 0x7a, 0x38, 0x7a, 0x38, 0x7a, ++ 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, ++ 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, 0xca, 0xa5, ++ 0xa0, 0x00, 0x15, 0x48, ++ 0x14, 0x6e, 0x14, 0x6e, 0x14, 0x6e, 0x14, 0x6e, ++ 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, ++ 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, 0xa6, 0x99, ++ 0x50, 0x00, 0x8e, 0x36, ++ 0xd9, 0x59, 0xd9, 0x59, 0xd9, 0x59, 0xd9, 0x59, ++ 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, ++ 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, 0x6b, 0x85, ++ 0x00, 0x00, 0xfe, 0x2d, ++ 0x9d, 0x45, 0x9d, 0x45, 0x9d, 0x45, 0x9d, 0x45, ++ 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, ++ 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, 0x2f, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2432 MHz */ ++ 0x80, 0x09, ++ 0x10, 0x01, 0xd7, 0x82, ++ 0x51, 0x8a, 0x51, 0x8a, 0x51, 0x8a, 0x51, 0x8a, ++ 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, ++ 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, 0xe3, 0xb5, ++ 0xf0, 0x00, 0xc8, 0x6b, ++ 0x37, 0x82, 0x37, 0x82, 0x37, 0x82, 0x37, 0x82, ++ 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, ++ 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, 0xc9, 0xad, ++ 0xd0, 0x00, 0x6f, 0x5a, ++ 0x1d, 0x7a, 0x1d, 0x7a, 0x1d, 0x7a, 0x1d, 0x7a, ++ 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, ++ 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, 0xaf, 0xa5, ++ 0xa0, 0x00, 0x20, 0x48, ++ 0xf6, 0x6d, 0xf6, 0x6d, 0xf6, 0x6d, 0xf6, 0x6d, ++ 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, ++ 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, 0x88, 0x99, ++ 0x50, 0x00, 0x9f, 0x36, ++ 0xb5, 0x59, 0xb5, 0x59, 0xb5, 0x59, 0xb5, 0x59, ++ 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, ++ 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, 0x47, 0x85, ++ 0x00, 0x00, 0x06, 0x2e, ++ 0x74, 0x45, 0x74, 0x45, 0x74, 0x45, 0x74, 0x45, ++ 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, ++ 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, 0x06, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2437 MHz */ ++ 0x85, 0x09, ++ 0x10, 0x01, 0x67, 0x82, ++ 0x3a, 0x8a, 0x3a, 0x8a, 0x3a, 0x8a, 0x3a, 0x8a, ++ 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, ++ 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, 0xcc, 0xb5, ++ 0xf0, 0x00, 0x95, 0x6b, ++ 0x1f, 0x82, 0x1f, 0x82, 0x1f, 0x82, 0x1f, 0x82, ++ 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, ++ 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, 0xb1, 0xad, ++ 0xd0, 0x00, 0x61, 0x5a, ++ 0x02, 0x7a, 0x02, 0x7a, 0x02, 0x7a, 0x02, 0x7a, ++ 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, ++ 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, 0x94, 0xa5, ++ 0xa0, 0x00, 0x2c, 0x48, ++ 0xd8, 0x6d, 0xd8, 0x6d, 0xd8, 0x6d, 0xd8, 0x6d, ++ 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, ++ 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, 0x6a, 0x99, ++ 0x50, 0x00, 0xb1, 0x36, ++ 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x00, 0x00, 0x0f, 0x2e, ++ 0x4b, 0x45, 0x4b, 0x45, 0x4b, 0x45, 0x4b, 0x45, ++ 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, ++ 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, 0xdd, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2442 MHz */ ++ 0x8a, 0x09, ++ 0x10, 0x01, 0xf6, 0x81, ++ 0x24, 0x8a, 0x24, 0x8a, 0x24, 0x8a, 0x24, 0x8a, ++ 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, ++ 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, 0xb6, 0xb5, ++ 0xf0, 0x00, 0x62, 0x6b, ++ 0x06, 0x82, 0x06, 0x82, 0x06, 0x82, 0x06, 0x82, ++ 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, ++ 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, 0x98, 0xad, ++ 0xd0, 0x00, 0x52, 0x5a, ++ 0xe7, 0x79, 0xe7, 0x79, 0xe7, 0x79, 0xe7, 0x79, ++ 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, ++ 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, 0x79, 0xa5, ++ 0xa0, 0x00, 0x37, 0x48, ++ 0xba, 0x6d, 0xba, 0x6d, 0xba, 0x6d, 0xba, 0x6d, ++ 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, ++ 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, 0x4c, 0x99, ++ 0x50, 0x00, 0xc2, 0x36, ++ 0x6e, 0x59, 0x6e, 0x59, 0x6e, 0x59, 0x6e, 0x59, ++ 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, ++ 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, 0x00, 0x85, ++ 0x00, 0x00, 0x17, 0x2e, ++ 0x22, 0x45, 0x22, 0x45, 0x22, 0x45, 0x22, 0x45, ++ 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, ++ 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, 0xb4, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2447 MHz */ ++ 0x8f, 0x09, ++ 0x10, 0x01, 0x75, 0x83, ++ 0x61, 0x8a, 0x61, 0x8a, 0x61, 0x8a, 0x61, 0x8a, ++ 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, ++ 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, 0xf3, 0xb5, ++ 0xf0, 0x00, 0x4b, 0x6c, ++ 0x3f, 0x82, 0x3f, 0x82, 0x3f, 0x82, 0x3f, 0x82, ++ 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, ++ 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, 0xd1, 0xad, ++ 0xd0, 0x00, 0xda, 0x5a, ++ 0x1c, 0x7a, 0x1c, 0x7a, 0x1c, 0x7a, 0x1c, 0x7a, ++ 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, ++ 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, 0xae, 0xa5, ++ 0xa0, 0x00, 0x6d, 0x48, ++ 0xe9, 0x6d, 0xe9, 0x6d, 0xe9, 0x6d, 0xe9, 0x6d, ++ 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, ++ 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, 0x7b, 0x99, ++ 0x50, 0x00, 0xc6, 0x36, ++ 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, 0x92, 0x59, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, 0x24, 0x85, ++ 0x00, 0x00, 0x15, 0x2e, ++ 0x3c, 0x45, 0x3c, 0x45, 0x3c, 0x45, 0x3c, 0x45, ++ 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, ++ 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, 0xce, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2452 MHz */ ++ 0x94, 0x09, ++ 0x10, 0x01, 0xf4, 0x84, ++ 0x9e, 0x8a, 0x9e, 0x8a, 0x9e, 0x8a, 0x9e, 0x8a, ++ 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, ++ 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, 0x30, 0xb6, ++ 0xf0, 0x00, 0x34, 0x6d, ++ 0x77, 0x82, 0x77, 0x82, 0x77, 0x82, 0x77, 0x82, ++ 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, ++ 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, 0x09, 0xae, ++ 0xd0, 0x00, 0x62, 0x5b, ++ 0x50, 0x7a, 0x50, 0x7a, 0x50, 0x7a, 0x50, 0x7a, ++ 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, ++ 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, 0xe2, 0xa5, ++ 0xa0, 0x00, 0xa2, 0x48, ++ 0x17, 0x6e, 0x17, 0x6e, 0x17, 0x6e, 0x17, 0x6e, ++ 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, ++ 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, 0xa9, 0x99, ++ 0x50, 0x00, 0xc9, 0x36, ++ 0xb7, 0x59, 0xb7, 0x59, 0xb7, 0x59, 0xb7, 0x59, ++ 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, ++ 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, 0x49, 0x85, ++ 0x00, 0x00, 0x12, 0x2e, ++ 0x57, 0x45, 0x57, 0x45, 0x57, 0x45, 0x57, 0x45, ++ 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, ++ 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, 0xe9, 0x70, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2452 MHz */ ++ 0x99, 0x09, ++ 0x10, 0x01, 0x74, 0x86, ++ 0xdb, 0x8a, 0xdb, 0x8a, 0xdb, 0x8a, 0xdb, 0x8a, ++ 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, ++ 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, 0x6d, 0xb6, ++ 0xf0, 0x00, 0x1e, 0x6e, ++ 0xb0, 0x82, 0xb0, 0x82, 0xb0, 0x82, 0xb0, 0x82, ++ 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, ++ 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, 0x42, 0xae, ++ 0xd0, 0x00, 0xeb, 0x5b, ++ 0x85, 0x7a, 0x85, 0x7a, 0x85, 0x7a, 0x85, 0x7a, ++ 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, ++ 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, 0x17, 0xa6, ++ 0xa0, 0x00, 0xd8, 0x48, ++ 0x46, 0x6e, 0x46, 0x6e, 0x46, 0x6e, 0x46, 0x6e, ++ 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, ++ 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, 0xd8, 0x99, ++ 0x50, 0x00, 0xcd, 0x36, ++ 0xdb, 0x59, 0xdb, 0x59, 0xdb, 0x59, 0xdb, 0x59, ++ 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, ++ 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, 0x6d, 0x85, ++ 0x00, 0x00, 0x10, 0x2e, ++ 0x71, 0x45, 0x71, 0x45, 0x71, 0x45, 0x71, 0x45, ++ 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, ++ 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, 0x03, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2557 MHz */ ++ 0x9e, 0x09, ++ 0x10, 0x01, 0xf3, 0x87, ++ 0x17, 0x8b, 0x17, 0x8b, 0x17, 0x8b, 0x17, 0x8b, ++ 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, ++ 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, 0xa9, 0xb6, ++ 0xf0, 0x00, 0x07, 0x6f, ++ 0xe9, 0x82, 0xe9, 0x82, 0xe9, 0x82, 0xe9, 0x82, ++ 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, ++ 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, 0x7b, 0xae, ++ 0xd0, 0x00, 0x73, 0x5c, ++ 0xba, 0x7a, 0xba, 0x7a, 0xba, 0x7a, 0xba, 0x7a, ++ 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, ++ 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, 0x4c, 0xa6, ++ 0xa0, 0x00, 0x0d, 0x49, ++ 0x74, 0x6e, 0x74, 0x6e, 0x74, 0x6e, 0x74, 0x6e, ++ 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, ++ 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, 0x06, 0x9a, ++ 0x50, 0x00, 0xd1, 0x36, ++ 0xff, 0x59, 0xff, 0x59, 0xff, 0x59, 0xff, 0x59, ++ 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, ++ 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, 0x91, 0x85, ++ 0x00, 0x00, 0x0e, 0x2e, ++ 0x8b, 0x45, 0x8b, 0x45, 0x8b, 0x45, 0x8b, 0x45, ++ 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, ++ 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, 0x1d, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2562 MHz */ ++ 0xa3, 0x09, ++ 0x10, 0x01, 0x72, 0x89, ++ 0x54, 0x8b, 0x54, 0x8b, 0x54, 0x8b, 0x54, 0x8b, ++ 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, ++ 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, 0xe6, 0xb6, ++ 0xf0, 0x00, 0xf0, 0x6f, ++ 0x21, 0x83, 0x21, 0x83, 0x21, 0x83, 0x21, 0x83, ++ 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, ++ 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, 0xb3, 0xae, ++ 0xd0, 0x00, 0xfb, 0x5c, ++ 0xee, 0x7a, 0xee, 0x7a, 0xee, 0x7a, 0xee, 0x7a, ++ 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, ++ 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, 0x80, 0xa6, ++ 0xa0, 0x00, 0x43, 0x49, ++ 0xa3, 0x6e, 0xa3, 0x6e, 0xa3, 0x6e, 0xa3, 0x6e, ++ 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, ++ 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, 0x35, 0x9a, ++ 0x50, 0x00, 0xd4, 0x36, ++ 0x24, 0x5a, 0x24, 0x5a, 0x24, 0x5a, 0x24, 0x5a, ++ 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, ++ 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, 0xb6, 0x85, ++ 0x00, 0x00, 0x0b, 0x2e, ++ 0xa6, 0x45, 0xa6, 0x45, 0xa6, 0x45, 0xa6, 0x45, ++ 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, ++ 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, 0x38, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++ ++ /* 2572 MHz */ ++ 0xa8, 0x09, ++ 0x10, 0x01, 0xf1, 0x8a, ++ 0x91, 0x8b, 0x91, 0x8b, 0x91, 0x8b, 0x91, 0x8b, ++ 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, ++ 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, 0x23, 0xb7, ++ 0xf0, 0x00, 0xd9, 0x70, ++ 0x5a, 0x83, 0x5a, 0x83, 0x5a, 0x83, 0x5a, 0x83, ++ 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, ++ 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, 0xec, 0xae, ++ 0xd0, 0x00, 0x83, 0x5d, ++ 0x23, 0x7b, 0x23, 0x7b, 0x23, 0x7b, 0x23, 0x7b, ++ 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, ++ 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, 0xb5, 0xa6, ++ 0xa0, 0x00, 0x78, 0x49, ++ 0xd1, 0x6e, 0xd1, 0x6e, 0xd1, 0x6e, 0xd1, 0x6e, ++ 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, ++ 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, 0x63, 0x9a, ++ 0x50, 0x00, 0xd8, 0x36, ++ 0x48, 0x5a, 0x48, 0x5a, 0x48, 0x5a, 0x48, 0x5a, ++ 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, ++ 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, 0xda, 0x85, ++ 0x00, 0x00, 0x09, 0x2e, ++ 0xc0, 0x45, 0xc0, 0x45, 0xc0, 0x45, 0xc0, 0x45, ++ 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, ++ 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, 0x52, 0x71, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x80, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x80, 0x00, ++}; ++ ++/* ++ * Not really sure if this is actually the power_limit database, ++ * it looks a bit "related" to PDR_PRISM_ZIF_TX_IQ_CALIBRATION ++ */ ++static const uint8_t template_pa_cal_output_power_limits[] = { ++ /* struct pda_custom_wrapper */ ++ 0xae, 0x00, 0xef, 0xbe, /* PDR_PRISM_PA_CAL_OUTPUT_POWER_LIMITS_CUSTOM */ ++ 0x0d, 0x00, 0x1a, 0x00, /* 13 entries, 26 bytes per entry */ ++ 0x00, 0x00, 0x52, 0x01, /* no offset, 338 bytes total */ ++ ++ /* 2412 MHz */ ++ 0x6c, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2417 MHz */ ++ 0x71, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2422 MHz */ ++ 0x76, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2427 MHz */ ++ 0x7b, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2432 MHz */ ++ 0x80, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2437 MHz */ ++ 0x85, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2442 MHz */ ++ 0x8a, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2447 MHz */ ++ 0x8f, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2452 MHz */ ++ 0x94, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2457 MHz */ ++ 0x99, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2462 MHz */ ++ 0x9e, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2467 MHz */ ++ 0xa3, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++ ++ /* 2472 MHz */ ++ 0xa8, 0x09, ++ 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, ++ 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xf0, 0x00, ++ 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, 0xd0, 0x00, ++}; ++ ++static const uint8_t template_pda_iq_autocal[] = { ++ /* struct pda_iq_autocal_entry[13] */ ++ 0x42, 0x00, 0x06, 0x19, /* PDR_PRISM_ZIF_TX_IQ_CALIBRATION */ ++ /* 2412 MHz */ ++ 0x6c, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2417 MHz */ ++ 0x71, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2422 MHz */ ++ 0x76, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2427 MHz */ ++ 0x7b, 0x09, 0x26, 0x00, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2432 MHz */ ++ 0x80, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2437 MHz */ ++ 0x85, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2442 MHz */ ++ 0x8a, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2447 MHz */ ++ 0x8f, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2452 MHz */ ++ 0x94, 0x09, 0x25, 0x00, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0x00, ++ /* 2457 MHz */ ++ 0x99, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++ /* 2462 MHz */ ++ 0x9e, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++ /* 2467 MHz */ ++ 0xa3, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++ /* 2472 MHz */ ++ 0xa8, 0x09, 0x25, 0x00, 0xf5, 0xff, 0xf9, 0xff, 0x00, 0x01, ++}; ++ ++static const uint8_t template_pdr_end[] = { ++ 0x02, 0x00, 0x00, 0x00, /* PDR_END */ ++}; ++ ++/* linux/lib/crc-ccitt.c ++ * ++ * This mysterious table is just the CRC of each possible byte. It can be ++ * computed using the standard bit-at-a-time methods. The polynomial can ++ * be seen in entry 128, 0x8408. This corresponds to x^0 + x^5 + x^12. ++ * Add the implicit x^16, and you have the standard CRC-CCITT. ++ */ ++static uint16_t const crc_ccitt_table[256] = { ++ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, ++ 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, ++ 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, ++ 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, ++ 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, ++ 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, ++ 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, ++ 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, ++ 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, ++ 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, ++ 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, ++ 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, ++ 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, ++ 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, ++ 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, ++ 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, ++ 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, ++ 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, ++ 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, ++ 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, ++ 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, ++ 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, ++ 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, ++ 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, ++ 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, ++ 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, ++ 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, ++ 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, ++ 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, ++ 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, ++ 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, ++ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 ++}; ++ ++static inline uint16_t crc_ccitt_byte(uint16_t crc, const uint8_t c) ++{ ++ return (crc >> 8) ^ crc_ccitt_table[(crc ^ c) & 0xff]; ++} ++ ++static uint16_t crc_ccitt(uint16_t crc, uint8_t const *buffer, size_t len) ++{ ++ while (len--) ++ crc = crc_ccitt_byte(crc, *buffer++); ++ return crc; ++} ++ ++static int generate_pa_cal_curve(uint8_t *buffer, ++ const uint8_t *txgen_image, ++ size_t txgen_image_size) ++{ ++ memcpy(buffer, template_pa_cal_curve, sizeof(template_pa_cal_curve)); ++ ++ //TODO ++ ++ return 0; ++} ++ ++static int generate_iq_autocal(uint8_t *buffer, ++ const uint8_t *iqalign_image, ++ size_t iqalign_image_size) ++{ ++ unsigned int expected_size; ++ uint8_t *out; ++ const uint8_t *in; ++ unsigned int i; ++ ++ expected_size = 13 * 8 + 4; ++ if (iqalign_image_size != expected_size) { ++ fprintf(stderr, "ERROR: Unknown wlan-iq-align image size. " ++ "Got %u, but expected %u\n", ++ (unsigned int)iqalign_image_size, expected_size); ++ return -EINVAL; ++ } ++ ++ in = iqalign_image; ++ out = buffer; ++ ++ memcpy(out, template_pda_iq_autocal, sizeof(template_pda_iq_autocal)); ++ ++ in += 4; /* Skip zero padding */ ++ out += 4; /* Skip header */ ++ for (i = 0; i < 13; i++) { ++ out += 2; /* Skip little endian 16bit Mhz number */ ++ memcpy(out, in, 8); ++ out += 8; /* Next element */ ++ in += 8; /* Next element */ ++ } ++ ++ return 0; ++} ++ ++static int generate_eeprom(FILE *outstream, ++ const uint8_t *txgen_image, ++ size_t txgen_image_size, ++ const uint8_t *iqalign_image, ++ size_t iqalign_image_size) ++{ ++ int err, res = 0; ++ uint16_t crc = ~0; ++ uint8_t crc_buf[2]; ++ uint8_t gen_pda_iq_autocal[sizeof(template_pda_iq_autocal)]; ++ uint8_t gen_pa_cal_curve[sizeof(template_pa_cal_curve)]; ++ ++ err = generate_iq_autocal(gen_pda_iq_autocal, ++ iqalign_image, iqalign_image_size); ++ if (err) ++ return err; ++ err = generate_pa_cal_curve(gen_pa_cal_curve, ++ txgen_image, txgen_image_size); ++ if (err) ++ return err; ++ ++#define writebuf(buffer, do_crc) do { \ ++ if (do_crc) \ ++ crc = crc_ccitt(crc, buffer, sizeof(buffer)); \ ++ res = fwrite(buffer, sizeof(buffer), 1, outstream); \ ++ if (res != 1) { \ ++ fprintf(stderr, "Failed to write output data\n"); \ ++ return -EIO; \ ++ } \ ++ } while (0) ++ ++ writebuf(template_eeprom_pda_wrap, 0); ++ writebuf(template_mac_address, 1); ++ writebuf(template_bootrec_exp_if, 1); ++ writebuf(template_pda_country_list, 1); ++ writebuf(template_pda_country, 1); ++ writebuf(template_antenna_gain, 1); ++ writebuf(template_rssi_linear_approx_custom2, 1); ++ writebuf(gen_pa_cal_curve, 1); ++ writebuf(template_pa_cal_output_power_limits, 1); ++ writebuf(gen_pda_iq_autocal, 1); ++ writebuf(template_pdr_end, 1); ++ ++ crc = ~crc; ++ crc_buf[0] = crc & 0xFF; ++ crc_buf[1] = (crc >> 8) & 0xFF; ++ res = fwrite(crc_buf, sizeof(crc_buf), 1, outstream); ++ if (res != 1) { ++ fprintf(stderr, "Failed to write CRC\n"); ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++static void * map_file(const char *filepath, int readonly, ++ uint64_t *filelen) ++{ ++ int fd; ++ off_t len; ++ void *data; ++ ++ fd = open(filepath, readonly ? O_RDONLY : O_RDWR); ++ if (fd < 0) { ++ fprintf(stderr, "Failed to open file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ len = lseek(fd, 0, SEEK_END); ++ if (len < 0 || lseek(fd, 0, SEEK_SET)) { ++ fprintf(stderr, "Failed to calculate file length of %s: %s\n", ++ filepath, strerror(errno)); ++ close(fd); ++ return NULL; ++ } ++ ++ data = mmap(NULL, len, ++ readonly ? PROT_READ : (PROT_READ | PROT_WRITE), ++ readonly ? MAP_PRIVATE : 0, ++ fd, 0); ++ close(fd); ++ if (data == MAP_FAILED) { ++ fprintf(stderr, "Failed to MMAP file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ madvise(data, len, MADV_SEQUENTIAL); ++ ++ *filelen = len; ++ ++ return data; ++} ++ ++static void unmap_file(void *mapping, uint64_t len) ++{ ++ if (mapping) ++ munmap(mapping, len); ++} ++ ++static void usage(FILE *fd) ++{ ++ fprintf(fd, "cal2p54 - CAL to p54spi EEPROM converter\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Usage: cal2p54 WLAN-TX-GEN2-IMAGE WLAN-IQ-ALIGN-IMAGE\n"); ++} ++ ++int main(int argc, char **argv) ++{ ++ int err, ret = 0; ++ uint8_t *txgen_image = NULL; ++ uint64_t txgen_image_len = 0; ++ uint8_t *iqalign_image = NULL; ++ uint64_t iqalign_image_len = 0; ++ ++ const char *txgen_filepath; ++ const char *iqalign_filepath; ++ ++ if (argc != 3) { ++ usage(stderr); ++ return 1; ++ } ++ txgen_filepath = argv[1]; ++ iqalign_filepath = argv[2]; ++ ++ txgen_image = map_file(txgen_filepath, 1, &txgen_image_len); ++ iqalign_image = map_file(iqalign_filepath, 1, &iqalign_image_len); ++ if (!txgen_image || !iqalign_image) { ++ ret = 1; ++ goto out; ++ } ++ ++ err = generate_eeprom(stdout, txgen_image, txgen_image_len, ++ iqalign_image, iqalign_image_len); ++ if (err) { ++ ret = 1; ++ goto out; ++ } ++ ++out: ++ unmap_file(txgen_image, txgen_image_len); ++ unmap_file(iqalign_image, iqalign_image_len); ++ ++ return ret; ++} +diff --git a/feeds/packages/utils/calvaria/files/src/calvaria.c b/feeds/packages/utils/calvaria/files/src/calvaria.c +new file mode 100644 +index 0000000..2438e34 +--- /dev/null ++++ b/feeds/packages/utils/calvaria/files/src/calvaria.c +@@ -0,0 +1,514 @@ ++/* ++ * Calvaria - Maemo CAL partition variable access tool. ++ * ++ * Copyright (c) 2011 Michael Buesch ++ * ++ * Licensed under the GNU General Public License version 2. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++#define _packed __attribute__((__packed__)) ++ ++typedef uint16_t le16_t; ++typedef uint32_t le32_t; ++ ++struct header { ++ char magic[4]; /* Magic sequence */ ++ uint8_t type; /* Type number */ ++ uint8_t index; /* Index number */ ++ le16_t flags; /* Flags */ ++ char name[16]; /* Human readable section name */ ++ le32_t length; /* Payload length */ ++ le32_t datasum; /* Data CRC32 checksum */ ++ le32_t hdrsum; /* Header CRC32 checksum */ ++} _packed; ++ ++#define HDR_MAGIC "ConF" ++ ++#define INDEX_LAST (0xFF + 1) ++ ++ ++static char toAscii(char c) ++{ ++ if (c >= 32 && c <= 126) ++ return c; ++ return '.'; ++} ++ ++static void dump_bytes(FILE *outstream, const void *_buf, size_t size) ++{ ++ const char *buf = _buf; ++ size_t i, ascii_cnt = 0; ++ char ascii[17] = { 0, }; ++ ++ for (i = 0; i < size; i++) { ++ if (i % 16 == 0) { ++ if (i != 0) { ++ fprintf(outstream, " |%s|\n", ascii); ++ ascii[0] = 0; ++ ascii_cnt = 0; ++ } ++ fprintf(outstream, "[%04X]: ", (unsigned int)i); ++ } ++ fprintf(outstream, " %02X", buf[i] & 0xFF); ++ ascii[ascii_cnt] = toAscii(buf[i]); ++ ascii[ascii_cnt + 1] = 0; ++ ascii_cnt++; ++ } ++ if (ascii[0]) { ++ if (size % 16) { ++ for (i = 0; i < 16 - (size % 16); i++) ++ fprintf(outstream, " "); ++ } ++ fprintf(outstream, " |%s|\n", ascii); ++ } ++} ++ ++static uint32_t crc32(uint32_t crc, const void *_data, size_t size) ++{ ++ const uint8_t *data = _data; ++ uint8_t value; ++ unsigned int bit; ++ size_t i; ++ const uint32_t poly = 0xEDB88320; ++ ++ for (i = 0; i < size; i++) { ++ value = data[i]; ++ for (bit = 8; bit; bit--) { ++ if ((crc & 1) != (value & 1)) ++ crc = (crc >> 1) ^ poly; ++ else ++ crc >>= 1; ++ value >>= 1; ++ } ++ } ++ ++ return crc; ++} ++ ++static inline uint16_t le16_to_cpu(le16_t x) ++{ ++ uint8_t *bytes = (uint8_t *)&x; ++ uint16_t ret; ++ ++ ret = bytes[0]; ++ ret |= (uint16_t)(bytes[1]) << 8; ++ ++ return ret; ++} ++ ++static inline uint32_t le32_to_cpu(le32_t x) ++{ ++ uint8_t *bytes = (uint8_t *)&x; ++ uint32_t ret; ++ ++ ret = bytes[0]; ++ ret |= (uint32_t)(bytes[1]) << 8; ++ ret |= (uint32_t)(bytes[2]) << 16; ++ ret |= (uint32_t)(bytes[3]) << 24; ++ ++ return ret; ++} ++ ++static int is_header(void *data, size_t size) ++{ ++ struct header *hdr = data; ++ ++ if (size < sizeof(struct header)) ++ return 0; ++ if (memcmp(hdr->magic, HDR_MAGIC, sizeof(hdr->magic)) != 0) ++ return 0; ++ return 1; ++} ++ ++void dump_bme_payload(FILE *outstream, const void *payload, size_t len) ++{ ++ const uint8_t *pmm_area = payload; ++ unsigned int group, element, pmm_offset; ++ uint8_t active_group_mask; ++ static const uint8_t zero_element[16] = { 0, }; ++ ++ if (len != 0x600 || memcmp(payload, "BME-PMM-BLOCK01", 15) != 0) { ++ fprintf(outstream, "ERROR: The section payload is not " ++ "a BME PMM block\n"); ++ return; ++ } ++ ++ active_group_mask = pmm_area[16]; ++ ++ for (group = 0; group < 3; group++) { ++ for (element = 0; element < 32; element++) { ++ pmm_offset = group * 512 + element * 16; ++ if (memcmp(pmm_area + pmm_offset, zero_element, 16) == 0) ++ continue; ++ fprintf(outstream, "-- BME-PMM area -- group %u%s, element %u:\n", ++ group, ++ (active_group_mask & (1 << group)) ? "" : " (INACTIVE)", ++ element); ++ dump_bytes(outstream, pmm_area + pmm_offset, 16); ++ } ++ } ++} ++ ++typedef void (*payload_dumper_t)(FILE *, const void *payload, size_t len); ++ ++static payload_dumper_t get_payload_dumper(const char *section_name, int raw) ++{ ++ if (!raw) { ++ if (strcmp(section_name, "bme") == 0) ++ return dump_bme_payload; ++ } ++ ++ return dump_bytes; ++} ++ ++static int dump_section(const struct header *hdr, ++ const void *payload, size_t payload_len, ++ int dump_payload, ++ int dump_raw_payload, ++ FILE *outstream) ++{ ++ char name[sizeof(hdr->name) + 1] = { 0, }; ++ int hdrsum_ok, datasum_ok; ++ payload_dumper_t dumper; ++ ++ memcpy(name, hdr->name, sizeof(hdr->name)); ++ hdrsum_ok = (crc32(0, hdr, sizeof(*hdr) - 4) == le32_to_cpu(hdr->hdrsum)); ++ datasum_ok = (crc32(0, payload, payload_len) == le32_to_cpu(hdr->datasum)); ++ ++ fprintf(outstream, "Section: %s\n", name); ++ fprintf(outstream, "Type: %u (0x%X)\n", hdr->type, hdr->type); ++ fprintf(outstream, "Index: %u (0x%X)\n", hdr->index, hdr->index); ++ fprintf(outstream, "Flags: 0x%04X\n", le16_to_cpu(hdr->flags)); ++ fprintf(outstream, "Length: %u (0x%X)\n", ++ le32_to_cpu(hdr->length), le32_to_cpu(hdr->length)); ++ fprintf(outstream, "Data CRC32: 0x%08X (%s)\n", le32_to_cpu(hdr->datasum), ++ datasum_ok ? "Ok" : "MISMATCH"); ++ fprintf(outstream, "Header CRC32: 0x%08X (%s)\n", le32_to_cpu(hdr->hdrsum), ++ hdrsum_ok ? "Ok" : "MISMATCH"); ++ if (dump_payload) { ++ dumper = get_payload_dumper(name, dump_raw_payload); ++ dumper(outstream, payload, payload_len); ++ } ++ fprintf(outstream, "\n"); ++ ++ return 0; ++} ++ ++static void * map_file(const char *filepath, int readonly, ++ uint64_t *filelen) ++{ ++ int fd; ++ off_t len; ++ void *data; ++ ++ fd = open(filepath, readonly ? O_RDONLY : O_RDWR); ++ if (fd < 0) { ++ fprintf(stderr, "Failed to open file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ len = lseek(fd, 0, SEEK_END); ++ if (len < 0 || lseek(fd, 0, SEEK_SET)) { ++ fprintf(stderr, "Failed to calculate file length of %s: %s\n", ++ filepath, strerror(errno)); ++ close(fd); ++ return NULL; ++ } ++ ++ data = mmap(NULL, len, ++ readonly ? PROT_READ : (PROT_READ | PROT_WRITE), ++ readonly ? MAP_PRIVATE : 0, ++ fd, 0); ++ close(fd); ++ if (data == MAP_FAILED) { ++ fprintf(stderr, "Failed to MMAP file %s: %s\n", ++ filepath, strerror(errno)); ++ return NULL; ++ } ++ madvise(data, len, MADV_SEQUENTIAL); ++ ++ *filelen = len; ++ ++ return data; ++} ++ ++static void unmap_file(void *mapping, uint64_t len) ++{ ++ if (mapping) ++ munmap(mapping, len); ++} ++ ++static int64_t find_section(void *start, uint64_t count, ++ int want_index, const char *want_name) ++{ ++ int64_t offset = 0, found_offset = -1; ++ uint8_t *data = start; ++ struct header *hdr; ++ char sectname[sizeof(hdr->name) + 1] = { 0, }; ++ uint32_t payload_len; ++ int previous_index = -1; ++ ++ while (1) { ++ /* Find header start */ ++ if (count < sizeof(struct header)) ++ break; ++ if (!is_header(data + offset, count)) { ++ count--; ++ offset++; ++ continue; ++ } ++ hdr = (struct header *)(data + offset); ++ payload_len = le32_to_cpu(hdr->length); ++ if (count - sizeof(struct header) < payload_len) { ++ fprintf(stderr, "Premature EOF\n"); ++ return -1; ++ } ++ memcpy(sectname, hdr->name, sizeof(hdr->name)); ++ ++ if (want_index == INDEX_LAST) { ++ if ((int)hdr->index <= previous_index) ++ goto next; ++ } else { ++ if (want_index >= 0 && want_index != hdr->index) ++ goto next; ++ } ++ if (want_name && strcmp(sectname, want_name) != 0) ++ goto next; ++ ++ /* Found it */ ++ found_offset = offset; ++ if (want_index == INDEX_LAST) ++ previous_index = hdr->index; ++ else ++ break; ++ ++next: ++ count -= sizeof(struct header) + payload_len; ++ offset += sizeof(struct header) + payload_len; ++ } ++ ++ return found_offset; ++} ++ ++static int dump_image(const char *filepath, ++ int want_section_index, const char *want_section_name, ++ int want_headers_only, ++ int dump_raw_payload, ++ FILE *outstream) ++{ ++ int err, ret = 0; ++ uint64_t filelen; ++ uint64_t count, offset; ++ int64_t find_offset; ++ uint8_t *data, *section; ++ struct header *hdr; ++ uint32_t payload_len; ++ ++ data = map_file(filepath, 1, &filelen); ++ if (!data) ++ return -EIO; ++ ++ count = filelen; ++ offset = 0; ++ while (1) { ++ find_offset = find_section(data + offset, count, ++ want_section_index, want_section_name); ++ if (find_offset < 0) ++ break; ++ offset += find_offset; ++ count -= find_offset; ++ ++ section = data + offset; ++ hdr = (struct header *)section; ++ payload_len = le32_to_cpu(hdr->length); ++ ++ err = dump_section(hdr, section + sizeof(struct header), ++ payload_len, ++ !want_headers_only, ++ dump_raw_payload, ++ outstream); ++ if (err) { ++ ret = err; ++ goto out; ++ } ++ ++ count -= sizeof(struct header) + payload_len; ++ offset += sizeof(struct header) + payload_len; ++ } ++out: ++ unmap_file(data, filelen); ++ ++ return ret; ++} ++ ++static int write_payload(const char *filepath, ++ int want_section_index, const char *want_section_name, ++ FILE *outstream) ++{ ++ int64_t find_offset; ++ uint64_t filelen; ++ uint8_t *data; ++ struct header *hdr; ++ ++ data = map_file(filepath, 1, &filelen); ++ if (!data) ++ return -EIO; ++ ++ find_offset = find_section(data, filelen, ++ want_section_index, want_section_name); ++ if (find_offset < 0) { ++ fprintf(stderr, "Section %s, index %d not found\n", ++ want_section_name, want_section_index); ++ unmap_file(data, filelen); ++ return -ESRCH; ++ } ++ ++ hdr = (struct header *)(data + find_offset); ++ if (fwrite(data + find_offset + sizeof(struct header), ++ le32_to_cpu(hdr->length), 1, outstream) != 1) { ++ fprintf(stderr, "Could not write output data\n"); ++ unmap_file(data, filelen); ++ return -EIO; ++ } ++ ++ unmap_file(data, filelen); ++ ++ return 0; ++} ++ ++static void usage(FILE *fd) ++{ ++ fprintf(fd, "Calvaria - Maemo CAL partition variable access tool\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Usage: calvaria [OPTIONS] FILE\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Actions:\n"); ++ fprintf(fd, " -d|--dump Dump the contents of the image\n"); ++ fprintf(fd, " -H|--headers Dump the headers of the image, only\n"); ++ fprintf(fd, " -p|--payload Write the binary payload to stdout.\n"); ++ fprintf(fd, " Requires -i and -n to be set, too\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, "Options:\n"); ++ fprintf(fd, " -i|--index NUMBER Use this section index number\n"); ++ fprintf(fd, " -n|--name STRING Use this section name\n"); ++ fprintf(fd, " -r|--raw Dump raw data (for -d|--dump only)\n"); ++ fprintf(fd, "\n"); ++ fprintf(fd, " -h|--help Print this help text\n"); ++} ++ ++enum action { ++ ACTION_NONE, ++ ACTION_DUMP, ++ ACTION_DUMPHDRS, ++ ACTION_GETPAYLOAD, ++}; ++ ++int main(int argc, char **argv) ++{ ++ int err, c, idx = 0; ++ const char *filepath; ++ enum action action = ACTION_NONE; ++ int opt_index = -1; ++ const char *opt_name = NULL; ++ int opt_raw_payload = 0; ++ ++ static struct option long_options[] = { ++ { "dump", no_argument, 0, 'd', }, ++ { "headers", no_argument, 0, 'H', }, ++ { "payload", no_argument, 0, 'p', }, ++ { "index", required_argument, 0, 'i', }, ++ { "name", required_argument, 0, 'n', }, ++ { "raw", no_argument, 0, 'r', }, ++ { "help", no_argument, 0, 'h', }, ++ { }, ++ }; ++ ++ while (1) { ++ c = getopt_long(argc, argv, "dHphi:n:r", ++ long_options, &idx); ++ if (c == -1) ++ break; ++ switch (c) { ++ case 'h': ++ usage(stdout); ++ return 0; ++ case 'd': ++ action = ACTION_DUMP; ++ break; ++ case 'H': ++ action = ACTION_DUMPHDRS; ++ break; ++ case 'p': ++ action = ACTION_GETPAYLOAD; ++ break; ++ case 'i': ++ if (strcasecmp(optarg, "last") == 0) { ++ opt_index = INDEX_LAST; ++ } else { ++ if (sscanf(optarg, "%d", &opt_index) != 1 || opt_index < 0) { ++ fprintf(stderr, "-i|--index is not a positive integer\n"); ++ return 1; ++ } ++ } ++ break; ++ case 'n': ++ opt_name = optarg; ++ break; ++ case 'r': ++ opt_raw_payload = 1; ++ break; ++ default: ++ return 1; ++ } ++ } ++ argc -= optind; ++ argv += optind; ++ if (action == ACTION_NONE) { ++ fprintf(stderr, "No action specified.\n"); ++ return 1; ++ } ++ if (action == ACTION_GETPAYLOAD) { ++ if (opt_index < 0 || !opt_name) { ++ fprintf(stderr, "Required options -i|--index or -n|--name " ++ "not specified for action -p|--payload\n"); ++ return 1; ++ } ++ } ++ if (argc != 1) { ++ usage(stderr); ++ return 1; ++ } ++ filepath = argv[0]; ++ ++ switch (action) { ++ case ACTION_NONE: ++ break; ++ case ACTION_DUMP: ++ case ACTION_DUMPHDRS: ++ err = dump_image(filepath, opt_index, opt_name, ++ (action == ACTION_DUMPHDRS), ++ opt_raw_payload, ++ stdout); ++ if (err) ++ return 1; ++ break; ++ case ACTION_GETPAYLOAD: ++ err = write_payload(filepath, opt_index, opt_name, stdout); ++ if (err) ++ return 1; ++ break; ++ } ++ ++ return 0; ++} +diff --git a/feeds/packages/utils/ccid/.svn/entries b/feeds/packages/utils/ccid/.svn/entries +new file mode 100644 +index 0000000..a72934a +--- /dev/null ++++ b/feeds/packages/utils/ccid/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ccid ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++ab9b09371aa09a7197474d92a76f1a18 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1097 ++ +diff --git a/feeds/packages/utils/ccid/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ccid/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..237b50a +--- /dev/null ++++ b/feeds/packages/utils/ccid/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3672 ++PKG_MD5SUM:=cb9a77194ac335c39b262ea83a5b7d2e ++ ++PKG_FIXUP:=autoreconf ++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) ++ ++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/feeds/packages/utils/ccid/Makefile b/feeds/packages/utils/ccid/Makefile +new file mode 100644 +index 0000000..237b50a +--- /dev/null ++++ b/feeds/packages/utils/ccid/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3672 ++PKG_MD5SUM:=cb9a77194ac335c39b262ea83a5b7d2e ++ ++PKG_FIXUP:=autoreconf ++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) ++ ++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/feeds/packages/utils/ccrypt/.svn/entries b/feeds/packages/utils/ccrypt/.svn/entries +new file mode 100644 +index 0000000..893beac +--- /dev/null ++++ b/feeds/packages/utils/ccrypt/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ccrypt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-17T11:24:25.949310Z ++35635 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++167db17041ed80e62351ca99ad477ba0 ++2013-02-17T11:24:25.949310Z ++35635 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++862 ++ +diff --git a/feeds/packages/utils/ccrypt/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ccrypt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0ad78fa +--- /dev/null ++++ b/feeds/packages/utils/ccrypt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=ccrypt ++PKG_VERSION:=1.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ccrypt ++PKG_MD5SUM:=44ddd763465c254df83f5d38851d04d7 ++ ++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/feeds/packages/utils/ccrypt/Makefile b/feeds/packages/utils/ccrypt/Makefile +new file mode 100644 +index 0000000..0ad78fa +--- /dev/null ++++ b/feeds/packages/utils/ccrypt/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=ccrypt ++PKG_VERSION:=1.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ccrypt ++PKG_MD5SUM:=44ddd763465c254df83f5d38851d04d7 ++ ++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/feeds/packages/utils/ccrypt/patches/.svn/entries b/feeds/packages/utils/ccrypt/patches/.svn/entries +new file mode 100644 +index 0000000..0861371 +--- /dev/null ++++ b/feeds/packages/utils/ccrypt/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ccrypt/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-17T11:24:25.949310Z ++35635 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no-intl.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ce23017700470d3c87a104accb9dc621 ++2013-02-17T11:24:25.949310Z ++35635 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2660 ++ +diff --git a/feeds/packages/utils/ccrypt/patches/.svn/text-base/001-no-intl.patch.svn-base b/feeds/packages/utils/ccrypt/patches/.svn/text-base/001-no-intl.patch.svn-base +new file mode 100644 +index 0000000..4ac9abb +--- /dev/null ++++ b/feeds/packages/utils/ccrypt/patches/.svn/text-base/001-no-intl.patch.svn-base +@@ -0,0 +1,89 @@ ++--- 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/feeds/packages/utils/ccrypt/patches/001-no-intl.patch b/feeds/packages/utils/ccrypt/patches/001-no-intl.patch +new file mode 100644 +index 0000000..4ac9abb +--- /dev/null ++++ b/feeds/packages/utils/ccrypt/patches/001-no-intl.patch +@@ -0,0 +1,89 @@ ++--- 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/feeds/packages/utils/cdparanoia/.svn/entries b/feeds/packages/utils/cdparanoia/.svn/entries +new file mode 100644 +index 0000000..787f719 +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cdparanoia ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T23:30:24.077232Z ++32237 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a6e57f9de26ad37dc48a215488321535 ++2012-06-11T23:30:24.077232Z ++32237 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1292 ++ +diff --git a/feeds/packages/utils/cdparanoia/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/cdparanoia/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..046e1b3 +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=cdparanoia-III ++PKG_VERSION:=10.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tgz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/cdparanoia/ ++PKG_SOURCE_TARGETDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_MD5SUM:=b304bbe8ab63373924a744eac9ebc652 ++ ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cdparanoia ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Cdparanoia ++ DEPENDS:=+librt ++ URL:=http://www.xiph.org/paranoia/index.html ++endef ++ ++#define Build/Configure ++# echo "Build/Configure" ++# $(call Build/Configure/Default) ++#endef ++ ++#define Build/Compile ++#endef ++ ++define Build/InstallDev ++ echo "Build/InstallDev" ++endef ++ ++define Package/cdparanoia/install ++ echo "package/cdparanoia/install" ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/cdparanoia $(1)/usr/bin ++# $(CP) $(PKG_BUILD_DIR)/paranoia/libcdda_paranoia.so.0.$(PKG_VERSION) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/paranoia/libcdda_paranoia.so.* $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/interface/libcdda_interface.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,cdparanoia)) +diff --git a/feeds/packages/utils/cdparanoia/Makefile b/feeds/packages/utils/cdparanoia/Makefile +new file mode 100644 +index 0000000..046e1b3 +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=cdparanoia-III ++PKG_VERSION:=10.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tgz ++PKG_SOURCE_URL:=http://downloads.xiph.org/releases/cdparanoia/ ++PKG_SOURCE_TARGETDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_MD5SUM:=b304bbe8ab63373924a744eac9ebc652 ++ ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cdparanoia ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Cdparanoia ++ DEPENDS:=+librt ++ URL:=http://www.xiph.org/paranoia/index.html ++endef ++ ++#define Build/Configure ++# echo "Build/Configure" ++# $(call Build/Configure/Default) ++#endef ++ ++#define Build/Compile ++#endef ++ ++define Build/InstallDev ++ echo "Build/InstallDev" ++endef ++ ++define Package/cdparanoia/install ++ echo "package/cdparanoia/install" ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/cdparanoia $(1)/usr/bin ++# $(CP) $(PKG_BUILD_DIR)/paranoia/libcdda_paranoia.so.0.$(PKG_VERSION) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/paranoia/libcdda_paranoia.so.* $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/interface/libcdda_interface.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,cdparanoia)) +diff --git a/feeds/packages/utils/cdparanoia/patches/.svn/entries b/feeds/packages/utils/cdparanoia/patches/.svn/entries +new file mode 100644 +index 0000000..7f29e85 +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cdparanoia/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-02-06T10:42:17.456752Z ++14421 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix_configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++77a6b5946594c57665b407aca294e95d ++2008-11-06T16:39:53.746162Z ++13132 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++997 ++ ++002-fixbecrash-private-keyword.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a7ec0476c73901b6a7b94196680e9128 ++2009-02-06T10:42:17.456752Z ++14421 ++hcg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++27189 ++ +diff --git a/feeds/packages/utils/cdparanoia/patches/.svn/text-base/002-fixbecrash-private-keyword.patch.svn-base b/feeds/packages/utils/cdparanoia/patches/.svn/text-base/002-fixbecrash-private-keyword.patch.svn-base +new file mode 100644 +index 0000000..9cf28fc +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/patches/.svn/text-base/002-fixbecrash-private-keyword.patch.svn-base +@@ -0,0 +1,908 @@ ++diff -ur cdparanoia-III-10.2/interface/cdda_interface.h cdparanoia/interface/cdda_interface.h ++--- cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-11 12:43:52.000000000 +0200 +++++ cdparanoia/interface/cdda_interface.h 2009-01-28 18:02:11.000000000 +0100 ++@@ -84,7 +84,7 @@ ++ int is_atapi; ++ int is_mmc; ++ ++- cdda_private_data_t *private; +++ cdda_private_data_t *private_data; ++ void *reserved; ++ unsigned char inqbytes[4]; ++ ++diff -ur cdparanoia-III-10.2/interface/cooked_interface.c cdparanoia/interface/cooked_interface.c ++--- cdparanoia-III-10.2/interface/cooked_interface.c 2008-08-26 11:55:22.000000000 +0200 +++++ cdparanoia/interface/cooked_interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -13,13 +13,13 @@ ++ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ ++ struct timespec tv1; ++ struct timespec tv2; ++- int ret1=clock_gettime(d->private->clock,&tv1); +++ int ret1=clock_gettime(d->private_data->clock,&tv1); ++ int ret2=ioctl(fd, command,arg); ++- int ret3=clock_gettime(d->private->clock,&tv2); +++ int ret3=clock_gettime(d->private_data->clock,&tv2); ++ if(ret1<0 || ret3<0){ ++- d->private->last_milliseconds=-1; +++ d->private_data->last_milliseconds=-1; ++ }else{ ++- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; +++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ } ++ return ret2; ++ } ++diff -ur cdparanoia-III-10.2/interface/interface.c cdparanoia/interface/interface.c ++--- cdparanoia-III-10.2/interface/interface.c 2008-09-11 12:43:52.000000000 +0200 +++++ cdparanoia/interface/interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -39,9 +39,9 @@ ++ if(d->drive_model)free(d->drive_model); ++ if(d->cdda_fd!=-1)close(d->cdda_fd); ++ if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); ++- if(d->private){ ++- if(d->private->sg_hd)free(d->private->sg_hd); ++- free(d->private); +++ if(d->private_data){ +++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); +++ free(d->private_data); ++ } ++ ++ free(d); ++@@ -90,11 +90,11 @@ ++ } ++ } ++ +++ if(d->bigendianp==-1)d->bigendianp=data_bigendianp(d); +++ ++ if((ret=d->enable_cdda(d,1))) ++ return(ret); ++ ++- /* d->select_speed(d,d->maxspeed); most drives are full speed by default */ ++- if(d->bigendianp==-1)d->bigendianp=data_bigendianp(d); ++ return(0); ++ } ++ ++@@ -118,7 +118,7 @@ ++ if(d->bigendianp==-1) /* not determined yet */ ++ d->bigendianp=data_bigendianp(d); ++ ++- if(d->bigendianp!=bigendianp()){ +++ if(buffer && d->bigendianp!=bigendianp()){ ++ int i; ++ u_int16_t *p=(u_int16_t *)buffer; ++ long els=sectors*CD_FRAMESIZE_RAW/2; ++@@ -127,7 +127,7 @@ ++ } ++ } ++ } ++- if(ms)*ms=d->private->last_milliseconds; +++ if(ms)*ms=d->private_data->last_milliseconds; ++ return(sectors); ++ } ++ ++diff -ur cdparanoia-III-10.2/interface/scan_devices.c cdparanoia/interface/scan_devices.c ++--- cdparanoia-III-10.2/interface/scan_devices.c 2008-08-26 11:55:22.000000000 +0200 +++++ cdparanoia/interface/scan_devices.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -264,11 +264,11 @@ ++ d->interface=COOKED_IOCTL; ++ d->bigendianp=-1; /* We don't know yet... */ ++ d->nsectors=-1; ++- d->private=calloc(1,sizeof(*d->private)); +++ d->private_data=calloc(1,sizeof(*d->private_data)); ++ { ++ /* goddamnit */ ++ struct timespec tv; ++- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); +++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ } ++ idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); ++ return(d); ++@@ -674,15 +674,15 @@ ++ d->bigendianp=-1; /* We don't know yet... */ ++ d->nsectors=-1; ++ d->messagedest = messagedest; ++- d->private=calloc(1,sizeof(*d->private)); +++ d->private_data=calloc(1,sizeof(*d->private_data)); ++ { ++ /* goddamnit */ ++ struct timespec tv; ++- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); +++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ } ++ if(use_sgio){ ++ d->interface=SGIO_SCSI; ++- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); +++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ g_fd=d->cdda_fd=dup(d->ioctl_fd); ++ }else{ ++ version=verify_SG_version(d,messagedest,messages); ++@@ -696,8 +696,8 @@ ++ } ++ ++ /* malloc our big buffer for scsi commands */ ++- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; +++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; ++ } ++ ++ { ++@@ -772,9 +772,9 @@ ++ if(i_fd!=-1)close(i_fd); ++ if(g_fd!=-1)close(g_fd); ++ if(d){ ++- if(d->private){ ++- if(d->private->sg_hd)free(d->private->sg_hd); ++- free(d->private); +++ if(d->private_data){ +++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); +++ free(d->private_data); ++ } ++ free(d); ++ } ++@@ -821,7 +821,7 @@ ++ d->interface=TEST_INTERFACE; ++ d->bigendianp=-1; /* We don't know yet... */ ++ d->nsectors=-1; ++- d->private=calloc(1,sizeof(*d->private)); +++ d->private_data=calloc(1,sizeof(*d->private_data)); ++ d->drive_model=copystring("File based test interface"); ++ idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); ++ ++diff -ur cdparanoia-III-10.2/interface/scsi_interface.c cdparanoia/interface/scsi_interface.c ++--- cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-11 22:33:30.000000000 +0200 +++++ cdparanoia/interface/scsi_interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -15,13 +15,13 @@ ++ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ ++ struct timespec tv1; ++ struct timespec tv2; ++- int ret1=clock_gettime(d->private->clock,&tv1); +++ int ret1=clock_gettime(d->private_data->clock,&tv1); ++ int ret2=ioctl(fd, command,arg); ++- int ret3=clock_gettime(d->private->clock,&tv2); +++ int ret3=clock_gettime(d->private_data->clock,&tv2); ++ if(ret1<0 || ret3<0){ ++- d->private->last_milliseconds=-1; +++ d->private_data->last_milliseconds=-1; ++ }else{ ++- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; +++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ } ++ return ret2; ++ } ++@@ -96,7 +96,7 @@ ++ static void clear_garbage(cdrom_drive *d){ ++ fd_set fdset; ++ struct timeval tv; ++- struct sg_header *sg_hd=d->private->sg_hd; +++ struct sg_header *sg_hd=d->private_data->sg_hd; ++ int flag=0; ++ ++ /* clear out any possibly preexisting garbage */ ++@@ -185,7 +185,7 @@ ++ struct timespec tv2; ++ int tret1,tret2; ++ int status = 0; ++- struct sg_header *sg_hd=d->private->sg_hd; +++ struct sg_header *sg_hd=d->private_data->sg_hd; ++ long writebytes=SG_OFF+cmd_len+in_size; ++ ++ /* generic scsi device services */ ++@@ -195,7 +195,7 @@ ++ ++ memset(sg_hd,0,sizeof(sg_hd)); ++ memset(sense_buffer,0,SG_MAX_SENSE); ++- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); +++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); ++ sg_hd->twelve_byte = cmd_len == 12; ++ sg_hd->result = 0; ++ sg_hd->reply_len = SG_OFF + out_size; ++@@ -209,7 +209,7 @@ ++ tell if the command failed. Scared yet? */ ++ ++ if(bytecheck && out_size>in_size){ ++- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); +++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ /* the size does not remove cmd_len due to the way the kernel ++ driver copies buffers */ ++ writebytes+=(out_size-in_size); ++@@ -243,7 +243,7 @@ ++ } ++ ++ sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); ++- tret1=clock_gettime(d->private->clock,&tv1); +++ tret1=clock_gettime(d->private_data->clock,&tv1); ++ errno=0; ++ status = write(d->cdda_fd, sg_hd, writebytes ); ++ ++@@ -289,7 +289,7 @@ ++ } ++ } ++ ++- tret2=clock_gettime(d->private->clock,&tv2); +++ tret2=clock_gettime(d->private_data->clock,&tv2); ++ errno=0; ++ status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); ++ sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); ++@@ -313,7 +313,7 @@ ++ if(bytecheck && in_size+cmd_lenprivate->sg_buffer[i]!=bytefill){ +++ if(d->private_data->sg_buffer[i]!=bytefill){ ++ flag=1; ++ break; ++ } ++@@ -326,9 +326,9 @@ ++ ++ errno=0; ++ if(tret1<0 || tret2<0){ ++- d->private->last_milliseconds=-1; +++ d->private_data->last_milliseconds=-1; ++ }else{ ++- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; +++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ } ++ return(0); ++ } ++@@ -347,7 +347,7 @@ ++ ++ memset(&hdr,0,sizeof(hdr)); ++ memset(sense,0,sizeof(sense)); ++- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); +++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); ++ ++ hdr.cmdp = cmd; ++ hdr.cmd_len = cmd_len; ++@@ -355,7 +355,7 @@ ++ hdr.mx_sb_len = SG_MAX_SENSE; ++ hdr.timeout = 50000; ++ hdr.interface_id = 'S'; ++- hdr.dxferp = d->private->sg_buffer; +++ hdr.dxferp = d->private_data->sg_buffer; ++ hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ ++ ++ /* scary buffer fill hack */ ++@@ -400,7 +400,7 @@ ++ if(bytecheck && in_sizeprivate->sg_buffer[i]!=bytefill){ +++ if(d->private_data->sg_buffer[i]!=bytefill){ ++ flag=1; ++ break; ++ } ++@@ -412,7 +412,7 @@ ++ } ++ ++ /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ ++- /* d->private->last_milliseconds = hdr.duration; */ +++ /* d->private_data->last_milliseconds = hdr.duration; */ ++ ++ errno = 0; ++ return 0; ++@@ -445,9 +445,9 @@ ++ ++ handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); ++ ++- key = d->private->sg_buffer[2] & 0xf; ++- ASC = d->private->sg_buffer[12]; ++- ASCQ = d->private->sg_buffer[13]; +++ key = d->private_data->sg_buffer[2] & 0xf; +++ ASC = d->private_data->sg_buffer[12]; +++ ASCQ = d->private_data->sg_buffer[13]; ++ ++ if(key == 2 && ASC == 4 && ASCQ == 1) return 0; ++ return 1; ++@@ -492,7 +492,7 @@ ++ if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); ++ ++ { ++- unsigned char *b=d->private->sg_buffer; +++ unsigned char *b=d->private_data->sg_buffer; ++ if(b[0])return(1); /* Handles only up to 256 bytes */ ++ if(b[6])return(1); /* Handles only up to 256 bytes */ ++ ++@@ -604,8 +604,8 @@ ++ static unsigned int get_orig_sectorsize(cdrom_drive *d){ ++ if(mode_sense(d,12,0x01))return(-1); ++ ++- d->orgdens = d->private->sg_buffer[4]; ++- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); +++ d->orgdens = d->private_data->sg_buffer[4]; +++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); ++ } ++ ++ /* switch CDROM scsi drives to given sector size */ ++@@ -664,8 +664,8 @@ ++ return(-4); ++ } ++ ++- first=d->private->sg_buffer[2]; ++- last=d->private->sg_buffer[3]; +++ first=d->private_data->sg_buffer[2]; +++ last=d->private_data->sg_buffer[3]; ++ tracks=last-first+1; ++ ++ if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { ++@@ -683,7 +683,7 @@ ++ return(-5); ++ } ++ { ++- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); +++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); ++ ++ d->disc_toc[i-first].bFlags=toc->bFlags; ++ d->disc_toc[i-first].bTrack=i; ++@@ -704,7 +704,7 @@ ++ return(-2); ++ } ++ { ++- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); +++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); ++ ++ d->disc_toc[i-first].bFlags=toc->bFlags; ++ d->disc_toc[i-first].bTrack=0xAA; ++@@ -738,7 +738,7 @@ ++ } ++ ++ /* copy to our structure and convert start sector */ ++- tracks = d->private->sg_buffer[1]; +++ tracks = d->private_data->sg_buffer[1]; ++ if (tracks > MAXTRK) { ++ cderror(d,"003: CDROM reporting illegal number of tracks\n"); ++ return(-3); ++@@ -754,33 +754,33 @@ ++ return(-5); ++ } ++ ++- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; +++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; ++ d->disc_toc[i].bTrack = i + 1; ++ ++ d->disc_toc[i].dwStartSector= d->adjust_ssize * ++- (((signed char)(d->private->sg_buffer[2])<<24) | ++- (d->private->sg_buffer[3]<<16)| ++- (d->private->sg_buffer[4]<<8)| ++- (d->private->sg_buffer[5])); +++ (((signed char)(d->private_data->sg_buffer[2])<<24) | +++ (d->private_data->sg_buffer[3]<<16)| +++ (d->private_data->sg_buffer[4]<<8)| +++ (d->private_data->sg_buffer[5])); ++ } ++ ++ d->disc_toc[i].bFlags = 0; ++ d->disc_toc[i].bTrack = i + 1; ++- memcpy (&foo, d->private->sg_buffer+2, 4); ++- memcpy (&bar, d->private->sg_buffer+6, 4); +++ memcpy (&foo, d->private_data->sg_buffer+2, 4); +++ memcpy (&bar, d->private_data->sg_buffer+6, 4); ++ d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + ++ be32_to_cpu(bar)); ++ ++ d->disc_toc[i].dwStartSector= d->adjust_ssize * ++- ((((signed char)(d->private->sg_buffer[2])<<24) | ++- (d->private->sg_buffer[3]<<16)| ++- (d->private->sg_buffer[4]<<8)| ++- (d->private->sg_buffer[5]))+ +++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | +++ (d->private_data->sg_buffer[3]<<16)| +++ (d->private_data->sg_buffer[4]<<8)| +++ (d->private_data->sg_buffer[5]))+ ++ ++- ((((signed char)(d->private->sg_buffer[6])<<24) | ++- (d->private->sg_buffer[7]<<16)| ++- (d->private->sg_buffer[8]<<8)| ++- (d->private->sg_buffer[9])))); +++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | +++ (d->private_data->sg_buffer[7]<<16)| +++ (d->private_data->sg_buffer[8]<<8)| +++ (d->private_data->sg_buffer[9])))); ++ ++ ++ d->cd_extra = FixupTOC(d,tracks+1); ++@@ -817,7 +817,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -836,7 +836,7 @@ ++ cmd[9] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -854,7 +854,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -872,7 +872,7 @@ ++ cmd[9] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -890,7 +890,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -908,7 +908,7 @@ ++ cmd[9] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -922,7 +922,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -936,7 +936,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -950,7 +950,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -964,7 +964,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -978,7 +978,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -992,7 +992,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1026,7 +1026,7 @@ ++ ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1039,7 +1039,7 @@ ++ ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1052,7 +1052,7 @@ ++ ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1275,7 +1275,7 @@ ++ static int count_2352_bytes(cdrom_drive *d){ ++ long i; ++ for(i=2351;i>=0;i--) ++- if(d->private->sg_buffer[i]!=(unsigned char)'\177') +++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') ++ return(((i+3)>>2)<<2); ++ ++ return(0); ++@@ -1284,7 +1284,7 @@ ++ static int verify_nonzero(cdrom_drive *d){ ++ long i,flag=0; ++ for(i=0;i<2352;i++) ++- if(d->private->sg_buffer[i]!=0){ +++ if(d->private_data->sg_buffer[i]!=0){ ++ flag=1; ++ break; ++ } ++@@ -1298,7 +1298,7 @@ ++ ++ static int verify_read_command(cdrom_drive *d){ ++ int i,j,k; ++- int audioflag=0; +++ int audioflag=1; ++ ++ int (*enablecommand) (struct cdrom_drive *d, int speed); ++ long (*readcommand) (struct cdrom_drive *d, void *p, long begin, ++@@ -1313,7 +1313,7 @@ ++ for data */ ++ ++ if(d->enable_cdda(d,1)==0){ ++- +++ audioflag=0; ++ for(i=1;i<=d->tracks;i++){ ++ if(cdda_track_audiop(d,i)==1){ ++ long firstsector=cdda_track_firstsector(d,i); ++@@ -1358,115 +1358,111 @@ ++ /* NEC test must come before sony; the nec drive expects d8 to be ++ 10 bytes, and a 12 byte verson (Sony) crashes the drive */ ++ ++- for(j=0;j<15;j++){ ++- int densitypossible=1; ++- ++- switch(j){ +++ for(i=0;i<5;i++){ +++ switch(i){ ++ case 0: ++- d->read_audio=scsi_read_28; ++- rs="28 0x,00"; +++ d->density=0; +++ d->enable_cdda=Dummy; +++ es="none "; ++ break; ++ case 1: ++- d->read_audio=scsi_read_A8; ++- rs="a8 0x,00"; +++ d->density=0; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x00"; ++ break; ++- ++ case 2: ++- d->read_audio=scsi_read_mmcB; ++- rs="be 02,10"; ++- densitypossible=0; +++ d->density=0x04; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x04"; ++ break; ++ case 3: ++- d->read_audio=scsi_read_mmc2B; ++- rs="be 02,f8"; ++- densitypossible=0; +++ d->density=0x82; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x82"; ++ break; ++ case 4: ++- d->read_audio=scsi_read_mmc3B; ++- rs="be 06,f8"; ++- densitypossible=0; ++- break; ++- ++- case 5: ++- d->read_audio=scsi_read_mmc; ++- rs="be 00,10"; ++- densitypossible=0; ++- break; ++- case 6: ++- d->read_audio=scsi_read_mmc2; ++- rs="be 00,f8"; ++- densitypossible=0; ++- break; ++- case 7: ++- d->read_audio=scsi_read_mmc3; ++- rs="be 04,f8"; ++- densitypossible=0; ++- break; ++- ++- case 8: ++- d->read_audio=scsi_read_msf; ++- rs="b9 00,10"; ++- densitypossible=0; ++- break; ++- case 9: ++- d->read_audio=scsi_read_msf2; ++- rs="b9 00,f8"; ++- densitypossible=0; ++- break; ++- case 10: ++- d->read_audio=scsi_read_msf3; ++- rs="b9 04,f8"; ++- densitypossible=0; ++- break; ++- ++- case 11: ++- d->read_audio=scsi_read_D4_10; ++- rs="d4(10)0x"; ++- break; ++- case 12: ++- d->read_audio=scsi_read_D4_12; ++- rs="d4(12)0x"; ++- break; ++- case 13: ++- d->read_audio=scsi_read_D5; ++- rs="d5 0x,00"; ++- break; ++- case 14: ++- d->read_audio=scsi_read_D8; ++- rs="d8 0x,00"; +++ d->density=0x81; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x81"; ++ break; ++ } ++- ++- for(i=0;i<5;i++){ ++- switch(i){ +++ +++ for(j=0;j<15;j++){ +++ +++ switch(j){ ++ case 0: ++- d->density=0; ++- d->enable_cdda=Dummy; ++- es="none "; ++- if(!densitypossible)i=5; /* short circuit MMC style commands */ +++ d->read_audio=scsi_read_28; +++ rs="28 0x,00"; ++ break; ++ case 1: ++- d->density=0; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x00"; +++ d->read_audio=scsi_read_A8; +++ rs="a8 0x,00"; ++ break; +++ +++ /* 2 through 10 do not allow/require density */ ++ case 2: ++- d->density=0x04; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x04"; ++- break; +++ d->read_audio=scsi_read_mmcB; +++ rs="be 02,10"; +++ if(i==0)break; ++ case 3: ++- d->density=0x82; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x82"; ++- break; +++ j=3; +++ d->read_audio=scsi_read_mmc2B; +++ rs="be 02,f8"; +++ if(i==0)break; ++ case 4: ++- d->density=0x81; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x81"; +++ j=4; +++ d->read_audio=scsi_read_mmc3B; +++ rs="be 06,f8"; +++ if(i==0)break; +++ case 5: +++ j=5; +++ d->read_audio=scsi_read_mmc; +++ rs="be 00,10"; +++ if(i==0)break; +++ case 6: +++ j=6; +++ d->read_audio=scsi_read_mmc2; +++ rs="be 00,f8"; +++ if(i==0)break; +++ case 7: +++ j=7; +++ d->read_audio=scsi_read_mmc3; +++ rs="be 04,f8"; +++ if(i==0)break; +++ case 8: +++ j=8; +++ d->read_audio=scsi_read_msf; +++ rs="b9 00,10"; +++ if(i==0)break; +++ case 9: +++ j=9; +++ d->read_audio=scsi_read_msf2; +++ rs="b9 00,f8"; +++ if(i==0)break; +++ case 10: +++ j=10; +++ d->read_audio=scsi_read_msf3; +++ rs="b9 04,f8"; +++ if(i==0)break; +++ +++ case 11: +++ d->read_audio=scsi_read_D4_10; +++ rs="d4(10)0x"; +++ break; +++ case 12: +++ d->read_audio=scsi_read_D4_12; +++ rs="d4(12)0x"; +++ break; +++ case 13: +++ d->read_audio=scsi_read_D5; +++ rs="d5 0x,00"; +++ break; +++ case 14: +++ d->read_audio=scsi_read_D8; +++ rs="d8 0x,00"; ++ break; ++ } ++- +++ ++ cdmessage(d,"\ttest -> density: ["); ++ cdmessage(d,es); ++ cdmessage(d,"] command: ["); ++@@ -1525,21 +1521,21 @@ ++ if(zeroflag){ ++ char buffer[256]; ++ sprintf(buffer,"\t\tDrive returned %d packet(s), but contents\n" ++- "\t\twere entirely zero\n",zeroflag); +++ "\t\twere entirely zero\n",zeroflag); ++ cdmessage(d,buffer); ++ } ++ } ++ } ++ } ++- +++ ++ /* D'oh. */ ++ d->density=density; ++ d->read_audio=readcommand; ++ d->enable_cdda=enablecommand; ++- +++ ++ cdmessage(d,"\tUnable to find any suitable command set from probe;\n" ++ "\tdrive probably not CDDA capable.\n"); ++- +++ ++ cderror(d,"006: Could not read any data from drive\n"); ++ ++ } ++@@ -1625,7 +1621,7 @@ ++ d->is_mmc=0; ++ if(mode_sense(d,22,0x2A)==0){ ++ ++- b=d->private->sg_buffer; +++ b=d->private_data->sg_buffer; ++ b+=b[3]+4; ++ ++ if((b[0]&0x3F)==0x2A){ ++@@ -1673,7 +1669,7 @@ ++ cderror(d,"008: Unable to identify CDROM model\n"); ++ return(NULL); ++ } ++- return (d->private->sg_buffer); +++ return (d->private_data->sg_buffer); ++ } ++ ++ int scsi_init_drive(cdrom_drive *d){ ++@@ -1690,33 +1686,20 @@ ++ if(d->is_atapi)d->lun=0; /* it should already be; just to make sure */ ++ ++ if(d->is_mmc){ ++- ++ d->read_audio = scsi_read_mmc2B; ++ d->bigendianp=0; ++- ++ check_exceptions(d,mmc_list); ++- ++ }else{ ++- ++ if(d->is_atapi){ ++ /* Not MMC maybe still uses 0xbe */ ++- ++ d->read_audio = scsi_read_mmc2B; ++ d->bigendianp=0; ++- ++ check_exceptions(d,atapi_list); ++- ++ }else{ ++- ++ check_exceptions(d,scsi_list); ++- ++ } ++ } ++ ++- if(!d->is_atapi)set_sectorsize(d,2048); /* we really do want the ++- sector size at 2048 to begin.*/ ++- d->enable_cdda(d,0); ++- ++ d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 : ++ scsi_read_toc; ++ d->set_speed = scsi_set_speed; ++@@ -1742,8 +1725,8 @@ ++ check_cache(d); ++ ++ d->error_retry=1; ++- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; +++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; ++ d->report_all=1; ++ return(0); ++ } ++diff -ur cdparanoia-III-10.2/interface/test_interface.c cdparanoia/interface/test_interface.c ++--- cdparanoia-III-10.2/interface/test_interface.c 2008-09-11 22:33:30.000000000 +0200 +++++ cdparanoia/interface/test_interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -66,9 +66,9 @@ ++ if(!fd)fd=fdopen(d->cdda_fd,"r"); ++ ++ if(beginprivate->last_milliseconds=20; +++ d->private_data->last_milliseconds=20; ++ else ++- d->private->last_milliseconds=sectors; +++ d->private_data->last_milliseconds=sectors; ++ ++ #ifdef CDDA_TEST_UNDERRUN ++ sectors-=1; ++diff -ur cdparanoia-III-10.2/main.c cdparanoia/main.c ++--- cdparanoia-III-10.2/main.c 2008-09-11 23:11:02.000000000 +0200 +++++ cdparanoia/main.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -746,7 +746,7 @@ ++ break; ++ case 'p': ++ output_type=0; ++- output_endian=-1; +++ output_endian=bigendianp(); ++ break; ++ case 'r': ++ output_type=0; ++diff -ur cdparanoia-III-10.2/version.h cdparanoia/version.h ++--- cdparanoia-III-10.2/version.h 2008-09-11 22:33:30.000000000 +0200 +++++ cdparanoia/version.h 2009-01-28 18:02:11.000000000 +0100 ++@@ -1,11 +1,11 @@ ++ /****************************************************************** ++ * CopyPolicy: GNU Public License 2 applies ++ * ++- * cdda_paranoia generation III release 10.2 +++ * cdda_paranoia generation III release 10.3 ++ * Copyright (C) 2008 Monty monty@xiph.org ++ * ++ ******************************************************************/ ++ ++ ++-#define VERSIONNUM "10.2" ++-#define VERSION "cdparanoia III release " VERSIONNUM " (September 11, 2008)\n" +++#define VERSIONNUM "10.3pre" +++#define VERSION "cdparanoia III release " VERSIONNUM " (September 16, 2008)\n" +diff --git a/feeds/packages/utils/cdparanoia/patches/.svn/text-base/010-fix_configure.patch.svn-base b/feeds/packages/utils/cdparanoia/patches/.svn/text-base/010-fix_configure.patch.svn-base +new file mode 100644 +index 0000000..3fa76a0 +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/patches/.svn/text-base/010-fix_configure.patch.svn-base +@@ -0,0 +1,40 @@ ++Index: cdparanoia-10.2/Makefile.in ++=================================================================== ++--- cdparanoia-10.2.orig/Makefile.in 2008-11-06 15:17:28.000000000 +0100 +++++ cdparanoia-10.2/Makefile.in 2008-11-06 15:19:12.000000000 +0100 ++@@ -8,12 +8,12 @@ ++ srcdir=@srcdir@ ++ ++ @SET_MAKE@ ++-FLAGS=@TYPESIZES@ @CFLAGS@ ++-OPT=@OPT@ $(FLAGS) ++-DEBUG=@DEBUG@ $(FLAGS) +++#FLAGS=@TYPESIZES@ @CFLAGS@ +++#OPT=@OPT@ $(FLAGS) +++#DEBUG=@DEBUG@ $(FLAGS) ++ CC=@CC@ ++ LD=@CC@ ++-LDFLAGS=@LDFLAGS@ $(FLAGS) +++LDFLAGS=@LDFLAGS@ ++ AR=@AR@ ++ RANLIB=@RANLIB@ ++ INSTALL=@INSTALL@ ++@@ -43,7 +43,8 @@ ++ all: ++ cd interface && $(MAKE) all ++ cd paranoia && $(MAKE) all ++- $(MAKE) cdparanoia CFLAGS="$(OPT)" +++ $(MAKE) cdparanoia +++#CFLAGS="$(OPT)" ++ ++ debug: ++ cd interface && $(MAKE) debug ++@@ -87,7 +88,7 @@ ++ $(LIBDIR)/libcdda_paranoia.so ++ ++ cdparanoia: $(OFILES) $(LIBDEP) ++- $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ +++ $(CC) $(CFLAGS) $(LDFLAGS) $(OFILES) \ ++ -L$(PWD)/paranoia -L$(PWD)/interface \ ++ -o cdparanoia $(LIBS) ++ +diff --git a/feeds/packages/utils/cdparanoia/patches/002-fixbecrash-private-keyword.patch b/feeds/packages/utils/cdparanoia/patches/002-fixbecrash-private-keyword.patch +new file mode 100644 +index 0000000..9cf28fc +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/patches/002-fixbecrash-private-keyword.patch +@@ -0,0 +1,908 @@ ++diff -ur cdparanoia-III-10.2/interface/cdda_interface.h cdparanoia/interface/cdda_interface.h ++--- cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-11 12:43:52.000000000 +0200 +++++ cdparanoia/interface/cdda_interface.h 2009-01-28 18:02:11.000000000 +0100 ++@@ -84,7 +84,7 @@ ++ int is_atapi; ++ int is_mmc; ++ ++- cdda_private_data_t *private; +++ cdda_private_data_t *private_data; ++ void *reserved; ++ unsigned char inqbytes[4]; ++ ++diff -ur cdparanoia-III-10.2/interface/cooked_interface.c cdparanoia/interface/cooked_interface.c ++--- cdparanoia-III-10.2/interface/cooked_interface.c 2008-08-26 11:55:22.000000000 +0200 +++++ cdparanoia/interface/cooked_interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -13,13 +13,13 @@ ++ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ ++ struct timespec tv1; ++ struct timespec tv2; ++- int ret1=clock_gettime(d->private->clock,&tv1); +++ int ret1=clock_gettime(d->private_data->clock,&tv1); ++ int ret2=ioctl(fd, command,arg); ++- int ret3=clock_gettime(d->private->clock,&tv2); +++ int ret3=clock_gettime(d->private_data->clock,&tv2); ++ if(ret1<0 || ret3<0){ ++- d->private->last_milliseconds=-1; +++ d->private_data->last_milliseconds=-1; ++ }else{ ++- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; +++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ } ++ return ret2; ++ } ++diff -ur cdparanoia-III-10.2/interface/interface.c cdparanoia/interface/interface.c ++--- cdparanoia-III-10.2/interface/interface.c 2008-09-11 12:43:52.000000000 +0200 +++++ cdparanoia/interface/interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -39,9 +39,9 @@ ++ if(d->drive_model)free(d->drive_model); ++ if(d->cdda_fd!=-1)close(d->cdda_fd); ++ if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); ++- if(d->private){ ++- if(d->private->sg_hd)free(d->private->sg_hd); ++- free(d->private); +++ if(d->private_data){ +++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); +++ free(d->private_data); ++ } ++ ++ free(d); ++@@ -90,11 +90,11 @@ ++ } ++ } ++ +++ if(d->bigendianp==-1)d->bigendianp=data_bigendianp(d); +++ ++ if((ret=d->enable_cdda(d,1))) ++ return(ret); ++ ++- /* d->select_speed(d,d->maxspeed); most drives are full speed by default */ ++- if(d->bigendianp==-1)d->bigendianp=data_bigendianp(d); ++ return(0); ++ } ++ ++@@ -118,7 +118,7 @@ ++ if(d->bigendianp==-1) /* not determined yet */ ++ d->bigendianp=data_bigendianp(d); ++ ++- if(d->bigendianp!=bigendianp()){ +++ if(buffer && d->bigendianp!=bigendianp()){ ++ int i; ++ u_int16_t *p=(u_int16_t *)buffer; ++ long els=sectors*CD_FRAMESIZE_RAW/2; ++@@ -127,7 +127,7 @@ ++ } ++ } ++ } ++- if(ms)*ms=d->private->last_milliseconds; +++ if(ms)*ms=d->private_data->last_milliseconds; ++ return(sectors); ++ } ++ ++diff -ur cdparanoia-III-10.2/interface/scan_devices.c cdparanoia/interface/scan_devices.c ++--- cdparanoia-III-10.2/interface/scan_devices.c 2008-08-26 11:55:22.000000000 +0200 +++++ cdparanoia/interface/scan_devices.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -264,11 +264,11 @@ ++ d->interface=COOKED_IOCTL; ++ d->bigendianp=-1; /* We don't know yet... */ ++ d->nsectors=-1; ++- d->private=calloc(1,sizeof(*d->private)); +++ d->private_data=calloc(1,sizeof(*d->private_data)); ++ { ++ /* goddamnit */ ++ struct timespec tv; ++- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); +++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ } ++ idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); ++ return(d); ++@@ -674,15 +674,15 @@ ++ d->bigendianp=-1; /* We don't know yet... */ ++ d->nsectors=-1; ++ d->messagedest = messagedest; ++- d->private=calloc(1,sizeof(*d->private)); +++ d->private_data=calloc(1,sizeof(*d->private_data)); ++ { ++ /* goddamnit */ ++ struct timespec tv; ++- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); +++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ } ++ if(use_sgio){ ++ d->interface=SGIO_SCSI; ++- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); +++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ g_fd=d->cdda_fd=dup(d->ioctl_fd); ++ }else{ ++ version=verify_SG_version(d,messagedest,messages); ++@@ -696,8 +696,8 @@ ++ } ++ ++ /* malloc our big buffer for scsi commands */ ++- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; +++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; ++ } ++ ++ { ++@@ -772,9 +772,9 @@ ++ if(i_fd!=-1)close(i_fd); ++ if(g_fd!=-1)close(g_fd); ++ if(d){ ++- if(d->private){ ++- if(d->private->sg_hd)free(d->private->sg_hd); ++- free(d->private); +++ if(d->private_data){ +++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); +++ free(d->private_data); ++ } ++ free(d); ++ } ++@@ -821,7 +821,7 @@ ++ d->interface=TEST_INTERFACE; ++ d->bigendianp=-1; /* We don't know yet... */ ++ d->nsectors=-1; ++- d->private=calloc(1,sizeof(*d->private)); +++ d->private_data=calloc(1,sizeof(*d->private_data)); ++ d->drive_model=copystring("File based test interface"); ++ idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); ++ ++diff -ur cdparanoia-III-10.2/interface/scsi_interface.c cdparanoia/interface/scsi_interface.c ++--- cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-11 22:33:30.000000000 +0200 +++++ cdparanoia/interface/scsi_interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -15,13 +15,13 @@ ++ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ ++ struct timespec tv1; ++ struct timespec tv2; ++- int ret1=clock_gettime(d->private->clock,&tv1); +++ int ret1=clock_gettime(d->private_data->clock,&tv1); ++ int ret2=ioctl(fd, command,arg); ++- int ret3=clock_gettime(d->private->clock,&tv2); +++ int ret3=clock_gettime(d->private_data->clock,&tv2); ++ if(ret1<0 || ret3<0){ ++- d->private->last_milliseconds=-1; +++ d->private_data->last_milliseconds=-1; ++ }else{ ++- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; +++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ } ++ return ret2; ++ } ++@@ -96,7 +96,7 @@ ++ static void clear_garbage(cdrom_drive *d){ ++ fd_set fdset; ++ struct timeval tv; ++- struct sg_header *sg_hd=d->private->sg_hd; +++ struct sg_header *sg_hd=d->private_data->sg_hd; ++ int flag=0; ++ ++ /* clear out any possibly preexisting garbage */ ++@@ -185,7 +185,7 @@ ++ struct timespec tv2; ++ int tret1,tret2; ++ int status = 0; ++- struct sg_header *sg_hd=d->private->sg_hd; +++ struct sg_header *sg_hd=d->private_data->sg_hd; ++ long writebytes=SG_OFF+cmd_len+in_size; ++ ++ /* generic scsi device services */ ++@@ -195,7 +195,7 @@ ++ ++ memset(sg_hd,0,sizeof(sg_hd)); ++ memset(sense_buffer,0,SG_MAX_SENSE); ++- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); +++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); ++ sg_hd->twelve_byte = cmd_len == 12; ++ sg_hd->result = 0; ++ sg_hd->reply_len = SG_OFF + out_size; ++@@ -209,7 +209,7 @@ ++ tell if the command failed. Scared yet? */ ++ ++ if(bytecheck && out_size>in_size){ ++- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); +++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ /* the size does not remove cmd_len due to the way the kernel ++ driver copies buffers */ ++ writebytes+=(out_size-in_size); ++@@ -243,7 +243,7 @@ ++ } ++ ++ sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); ++- tret1=clock_gettime(d->private->clock,&tv1); +++ tret1=clock_gettime(d->private_data->clock,&tv1); ++ errno=0; ++ status = write(d->cdda_fd, sg_hd, writebytes ); ++ ++@@ -289,7 +289,7 @@ ++ } ++ } ++ ++- tret2=clock_gettime(d->private->clock,&tv2); +++ tret2=clock_gettime(d->private_data->clock,&tv2); ++ errno=0; ++ status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); ++ sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); ++@@ -313,7 +313,7 @@ ++ if(bytecheck && in_size+cmd_lenprivate->sg_buffer[i]!=bytefill){ +++ if(d->private_data->sg_buffer[i]!=bytefill){ ++ flag=1; ++ break; ++ } ++@@ -326,9 +326,9 @@ ++ ++ errno=0; ++ if(tret1<0 || tret2<0){ ++- d->private->last_milliseconds=-1; +++ d->private_data->last_milliseconds=-1; ++ }else{ ++- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; +++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ } ++ return(0); ++ } ++@@ -347,7 +347,7 @@ ++ ++ memset(&hdr,0,sizeof(hdr)); ++ memset(sense,0,sizeof(sense)); ++- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); +++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); ++ ++ hdr.cmdp = cmd; ++ hdr.cmd_len = cmd_len; ++@@ -355,7 +355,7 @@ ++ hdr.mx_sb_len = SG_MAX_SENSE; ++ hdr.timeout = 50000; ++ hdr.interface_id = 'S'; ++- hdr.dxferp = d->private->sg_buffer; +++ hdr.dxferp = d->private_data->sg_buffer; ++ hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ ++ ++ /* scary buffer fill hack */ ++@@ -400,7 +400,7 @@ ++ if(bytecheck && in_sizeprivate->sg_buffer[i]!=bytefill){ +++ if(d->private_data->sg_buffer[i]!=bytefill){ ++ flag=1; ++ break; ++ } ++@@ -412,7 +412,7 @@ ++ } ++ ++ /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ ++- /* d->private->last_milliseconds = hdr.duration; */ +++ /* d->private_data->last_milliseconds = hdr.duration; */ ++ ++ errno = 0; ++ return 0; ++@@ -445,9 +445,9 @@ ++ ++ handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); ++ ++- key = d->private->sg_buffer[2] & 0xf; ++- ASC = d->private->sg_buffer[12]; ++- ASCQ = d->private->sg_buffer[13]; +++ key = d->private_data->sg_buffer[2] & 0xf; +++ ASC = d->private_data->sg_buffer[12]; +++ ASCQ = d->private_data->sg_buffer[13]; ++ ++ if(key == 2 && ASC == 4 && ASCQ == 1) return 0; ++ return 1; ++@@ -492,7 +492,7 @@ ++ if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); ++ ++ { ++- unsigned char *b=d->private->sg_buffer; +++ unsigned char *b=d->private_data->sg_buffer; ++ if(b[0])return(1); /* Handles only up to 256 bytes */ ++ if(b[6])return(1); /* Handles only up to 256 bytes */ ++ ++@@ -604,8 +604,8 @@ ++ static unsigned int get_orig_sectorsize(cdrom_drive *d){ ++ if(mode_sense(d,12,0x01))return(-1); ++ ++- d->orgdens = d->private->sg_buffer[4]; ++- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); +++ d->orgdens = d->private_data->sg_buffer[4]; +++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); ++ } ++ ++ /* switch CDROM scsi drives to given sector size */ ++@@ -664,8 +664,8 @@ ++ return(-4); ++ } ++ ++- first=d->private->sg_buffer[2]; ++- last=d->private->sg_buffer[3]; +++ first=d->private_data->sg_buffer[2]; +++ last=d->private_data->sg_buffer[3]; ++ tracks=last-first+1; ++ ++ if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { ++@@ -683,7 +683,7 @@ ++ return(-5); ++ } ++ { ++- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); +++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); ++ ++ d->disc_toc[i-first].bFlags=toc->bFlags; ++ d->disc_toc[i-first].bTrack=i; ++@@ -704,7 +704,7 @@ ++ return(-2); ++ } ++ { ++- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); +++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); ++ ++ d->disc_toc[i-first].bFlags=toc->bFlags; ++ d->disc_toc[i-first].bTrack=0xAA; ++@@ -738,7 +738,7 @@ ++ } ++ ++ /* copy to our structure and convert start sector */ ++- tracks = d->private->sg_buffer[1]; +++ tracks = d->private_data->sg_buffer[1]; ++ if (tracks > MAXTRK) { ++ cderror(d,"003: CDROM reporting illegal number of tracks\n"); ++ return(-3); ++@@ -754,33 +754,33 @@ ++ return(-5); ++ } ++ ++- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; +++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; ++ d->disc_toc[i].bTrack = i + 1; ++ ++ d->disc_toc[i].dwStartSector= d->adjust_ssize * ++- (((signed char)(d->private->sg_buffer[2])<<24) | ++- (d->private->sg_buffer[3]<<16)| ++- (d->private->sg_buffer[4]<<8)| ++- (d->private->sg_buffer[5])); +++ (((signed char)(d->private_data->sg_buffer[2])<<24) | +++ (d->private_data->sg_buffer[3]<<16)| +++ (d->private_data->sg_buffer[4]<<8)| +++ (d->private_data->sg_buffer[5])); ++ } ++ ++ d->disc_toc[i].bFlags = 0; ++ d->disc_toc[i].bTrack = i + 1; ++- memcpy (&foo, d->private->sg_buffer+2, 4); ++- memcpy (&bar, d->private->sg_buffer+6, 4); +++ memcpy (&foo, d->private_data->sg_buffer+2, 4); +++ memcpy (&bar, d->private_data->sg_buffer+6, 4); ++ d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + ++ be32_to_cpu(bar)); ++ ++ d->disc_toc[i].dwStartSector= d->adjust_ssize * ++- ((((signed char)(d->private->sg_buffer[2])<<24) | ++- (d->private->sg_buffer[3]<<16)| ++- (d->private->sg_buffer[4]<<8)| ++- (d->private->sg_buffer[5]))+ +++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | +++ (d->private_data->sg_buffer[3]<<16)| +++ (d->private_data->sg_buffer[4]<<8)| +++ (d->private_data->sg_buffer[5]))+ ++ ++- ((((signed char)(d->private->sg_buffer[6])<<24) | ++- (d->private->sg_buffer[7]<<16)| ++- (d->private->sg_buffer[8]<<8)| ++- (d->private->sg_buffer[9])))); +++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | +++ (d->private_data->sg_buffer[7]<<16)| +++ (d->private_data->sg_buffer[8]<<8)| +++ (d->private_data->sg_buffer[9])))); ++ ++ ++ d->cd_extra = FixupTOC(d,tracks+1); ++@@ -817,7 +817,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -836,7 +836,7 @@ ++ cmd[9] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -854,7 +854,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -872,7 +872,7 @@ ++ cmd[9] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -890,7 +890,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -908,7 +908,7 @@ ++ cmd[9] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -922,7 +922,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -936,7 +936,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -950,7 +950,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -964,7 +964,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -978,7 +978,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -992,7 +992,7 @@ ++ cmd[8] = sectors; ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1026,7 +1026,7 @@ ++ ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1039,7 +1039,7 @@ ++ ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1052,7 +1052,7 @@ ++ ++ if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) ++ return(ret); ++- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); +++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ return(0); ++ } ++ ++@@ -1275,7 +1275,7 @@ ++ static int count_2352_bytes(cdrom_drive *d){ ++ long i; ++ for(i=2351;i>=0;i--) ++- if(d->private->sg_buffer[i]!=(unsigned char)'\177') +++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') ++ return(((i+3)>>2)<<2); ++ ++ return(0); ++@@ -1284,7 +1284,7 @@ ++ static int verify_nonzero(cdrom_drive *d){ ++ long i,flag=0; ++ for(i=0;i<2352;i++) ++- if(d->private->sg_buffer[i]!=0){ +++ if(d->private_data->sg_buffer[i]!=0){ ++ flag=1; ++ break; ++ } ++@@ -1298,7 +1298,7 @@ ++ ++ static int verify_read_command(cdrom_drive *d){ ++ int i,j,k; ++- int audioflag=0; +++ int audioflag=1; ++ ++ int (*enablecommand) (struct cdrom_drive *d, int speed); ++ long (*readcommand) (struct cdrom_drive *d, void *p, long begin, ++@@ -1313,7 +1313,7 @@ ++ for data */ ++ ++ if(d->enable_cdda(d,1)==0){ ++- +++ audioflag=0; ++ for(i=1;i<=d->tracks;i++){ ++ if(cdda_track_audiop(d,i)==1){ ++ long firstsector=cdda_track_firstsector(d,i); ++@@ -1358,115 +1358,111 @@ ++ /* NEC test must come before sony; the nec drive expects d8 to be ++ 10 bytes, and a 12 byte verson (Sony) crashes the drive */ ++ ++- for(j=0;j<15;j++){ ++- int densitypossible=1; ++- ++- switch(j){ +++ for(i=0;i<5;i++){ +++ switch(i){ ++ case 0: ++- d->read_audio=scsi_read_28; ++- rs="28 0x,00"; +++ d->density=0; +++ d->enable_cdda=Dummy; +++ es="none "; ++ break; ++ case 1: ++- d->read_audio=scsi_read_A8; ++- rs="a8 0x,00"; +++ d->density=0; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x00"; ++ break; ++- ++ case 2: ++- d->read_audio=scsi_read_mmcB; ++- rs="be 02,10"; ++- densitypossible=0; +++ d->density=0x04; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x04"; ++ break; ++ case 3: ++- d->read_audio=scsi_read_mmc2B; ++- rs="be 02,f8"; ++- densitypossible=0; +++ d->density=0x82; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x82"; ++ break; ++ case 4: ++- d->read_audio=scsi_read_mmc3B; ++- rs="be 06,f8"; ++- densitypossible=0; ++- break; ++- ++- case 5: ++- d->read_audio=scsi_read_mmc; ++- rs="be 00,10"; ++- densitypossible=0; ++- break; ++- case 6: ++- d->read_audio=scsi_read_mmc2; ++- rs="be 00,f8"; ++- densitypossible=0; ++- break; ++- case 7: ++- d->read_audio=scsi_read_mmc3; ++- rs="be 04,f8"; ++- densitypossible=0; ++- break; ++- ++- case 8: ++- d->read_audio=scsi_read_msf; ++- rs="b9 00,10"; ++- densitypossible=0; ++- break; ++- case 9: ++- d->read_audio=scsi_read_msf2; ++- rs="b9 00,f8"; ++- densitypossible=0; ++- break; ++- case 10: ++- d->read_audio=scsi_read_msf3; ++- rs="b9 04,f8"; ++- densitypossible=0; ++- break; ++- ++- case 11: ++- d->read_audio=scsi_read_D4_10; ++- rs="d4(10)0x"; ++- break; ++- case 12: ++- d->read_audio=scsi_read_D4_12; ++- rs="d4(12)0x"; ++- break; ++- case 13: ++- d->read_audio=scsi_read_D5; ++- rs="d5 0x,00"; ++- break; ++- case 14: ++- d->read_audio=scsi_read_D8; ++- rs="d8 0x,00"; +++ d->density=0x81; +++ d->enable_cdda=scsi_enable_cdda; +++ es="yes/0x81"; ++ break; ++ } ++- ++- for(i=0;i<5;i++){ ++- switch(i){ +++ +++ for(j=0;j<15;j++){ +++ +++ switch(j){ ++ case 0: ++- d->density=0; ++- d->enable_cdda=Dummy; ++- es="none "; ++- if(!densitypossible)i=5; /* short circuit MMC style commands */ +++ d->read_audio=scsi_read_28; +++ rs="28 0x,00"; ++ break; ++ case 1: ++- d->density=0; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x00"; +++ d->read_audio=scsi_read_A8; +++ rs="a8 0x,00"; ++ break; +++ +++ /* 2 through 10 do not allow/require density */ ++ case 2: ++- d->density=0x04; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x04"; ++- break; +++ d->read_audio=scsi_read_mmcB; +++ rs="be 02,10"; +++ if(i==0)break; ++ case 3: ++- d->density=0x82; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x82"; ++- break; +++ j=3; +++ d->read_audio=scsi_read_mmc2B; +++ rs="be 02,f8"; +++ if(i==0)break; ++ case 4: ++- d->density=0x81; ++- d->enable_cdda=scsi_enable_cdda; ++- es="yes/0x81"; +++ j=4; +++ d->read_audio=scsi_read_mmc3B; +++ rs="be 06,f8"; +++ if(i==0)break; +++ case 5: +++ j=5; +++ d->read_audio=scsi_read_mmc; +++ rs="be 00,10"; +++ if(i==0)break; +++ case 6: +++ j=6; +++ d->read_audio=scsi_read_mmc2; +++ rs="be 00,f8"; +++ if(i==0)break; +++ case 7: +++ j=7; +++ d->read_audio=scsi_read_mmc3; +++ rs="be 04,f8"; +++ if(i==0)break; +++ case 8: +++ j=8; +++ d->read_audio=scsi_read_msf; +++ rs="b9 00,10"; +++ if(i==0)break; +++ case 9: +++ j=9; +++ d->read_audio=scsi_read_msf2; +++ rs="b9 00,f8"; +++ if(i==0)break; +++ case 10: +++ j=10; +++ d->read_audio=scsi_read_msf3; +++ rs="b9 04,f8"; +++ if(i==0)break; +++ +++ case 11: +++ d->read_audio=scsi_read_D4_10; +++ rs="d4(10)0x"; +++ break; +++ case 12: +++ d->read_audio=scsi_read_D4_12; +++ rs="d4(12)0x"; +++ break; +++ case 13: +++ d->read_audio=scsi_read_D5; +++ rs="d5 0x,00"; +++ break; +++ case 14: +++ d->read_audio=scsi_read_D8; +++ rs="d8 0x,00"; ++ break; ++ } ++- +++ ++ cdmessage(d,"\ttest -> density: ["); ++ cdmessage(d,es); ++ cdmessage(d,"] command: ["); ++@@ -1525,21 +1521,21 @@ ++ if(zeroflag){ ++ char buffer[256]; ++ sprintf(buffer,"\t\tDrive returned %d packet(s), but contents\n" ++- "\t\twere entirely zero\n",zeroflag); +++ "\t\twere entirely zero\n",zeroflag); ++ cdmessage(d,buffer); ++ } ++ } ++ } ++ } ++- +++ ++ /* D'oh. */ ++ d->density=density; ++ d->read_audio=readcommand; ++ d->enable_cdda=enablecommand; ++- +++ ++ cdmessage(d,"\tUnable to find any suitable command set from probe;\n" ++ "\tdrive probably not CDDA capable.\n"); ++- +++ ++ cderror(d,"006: Could not read any data from drive\n"); ++ ++ } ++@@ -1625,7 +1621,7 @@ ++ d->is_mmc=0; ++ if(mode_sense(d,22,0x2A)==0){ ++ ++- b=d->private->sg_buffer; +++ b=d->private_data->sg_buffer; ++ b+=b[3]+4; ++ ++ if((b[0]&0x3F)==0x2A){ ++@@ -1673,7 +1669,7 @@ ++ cderror(d,"008: Unable to identify CDROM model\n"); ++ return(NULL); ++ } ++- return (d->private->sg_buffer); +++ return (d->private_data->sg_buffer); ++ } ++ ++ int scsi_init_drive(cdrom_drive *d){ ++@@ -1690,33 +1686,20 @@ ++ if(d->is_atapi)d->lun=0; /* it should already be; just to make sure */ ++ ++ if(d->is_mmc){ ++- ++ d->read_audio = scsi_read_mmc2B; ++ d->bigendianp=0; ++- ++ check_exceptions(d,mmc_list); ++- ++ }else{ ++- ++ if(d->is_atapi){ ++ /* Not MMC maybe still uses 0xbe */ ++- ++ d->read_audio = scsi_read_mmc2B; ++ d->bigendianp=0; ++- ++ check_exceptions(d,atapi_list); ++- ++ }else{ ++- ++ check_exceptions(d,scsi_list); ++- ++ } ++ } ++ ++- if(!d->is_atapi)set_sectorsize(d,2048); /* we really do want the ++- sector size at 2048 to begin.*/ ++- d->enable_cdda(d,0); ++- ++ d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 : ++ scsi_read_toc; ++ d->set_speed = scsi_set_speed; ++@@ -1742,8 +1725,8 @@ ++ check_cache(d); ++ ++ d->error_retry=1; ++- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; +++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; ++ d->report_all=1; ++ return(0); ++ } ++diff -ur cdparanoia-III-10.2/interface/test_interface.c cdparanoia/interface/test_interface.c ++--- cdparanoia-III-10.2/interface/test_interface.c 2008-09-11 22:33:30.000000000 +0200 +++++ cdparanoia/interface/test_interface.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -66,9 +66,9 @@ ++ if(!fd)fd=fdopen(d->cdda_fd,"r"); ++ ++ if(beginprivate->last_milliseconds=20; +++ d->private_data->last_milliseconds=20; ++ else ++- d->private->last_milliseconds=sectors; +++ d->private_data->last_milliseconds=sectors; ++ ++ #ifdef CDDA_TEST_UNDERRUN ++ sectors-=1; ++diff -ur cdparanoia-III-10.2/main.c cdparanoia/main.c ++--- cdparanoia-III-10.2/main.c 2008-09-11 23:11:02.000000000 +0200 +++++ cdparanoia/main.c 2009-01-28 18:02:11.000000000 +0100 ++@@ -746,7 +746,7 @@ ++ break; ++ case 'p': ++ output_type=0; ++- output_endian=-1; +++ output_endian=bigendianp(); ++ break; ++ case 'r': ++ output_type=0; ++diff -ur cdparanoia-III-10.2/version.h cdparanoia/version.h ++--- cdparanoia-III-10.2/version.h 2008-09-11 22:33:30.000000000 +0200 +++++ cdparanoia/version.h 2009-01-28 18:02:11.000000000 +0100 ++@@ -1,11 +1,11 @@ ++ /****************************************************************** ++ * CopyPolicy: GNU Public License 2 applies ++ * ++- * cdda_paranoia generation III release 10.2 +++ * cdda_paranoia generation III release 10.3 ++ * Copyright (C) 2008 Monty monty@xiph.org ++ * ++ ******************************************************************/ ++ ++ ++-#define VERSIONNUM "10.2" ++-#define VERSION "cdparanoia III release " VERSIONNUM " (September 11, 2008)\n" +++#define VERSIONNUM "10.3pre" +++#define VERSION "cdparanoia III release " VERSIONNUM " (September 16, 2008)\n" +diff --git a/feeds/packages/utils/cdparanoia/patches/010-fix_configure.patch b/feeds/packages/utils/cdparanoia/patches/010-fix_configure.patch +new file mode 100644 +index 0000000..3fa76a0 +--- /dev/null ++++ b/feeds/packages/utils/cdparanoia/patches/010-fix_configure.patch +@@ -0,0 +1,40 @@ ++Index: cdparanoia-10.2/Makefile.in ++=================================================================== ++--- cdparanoia-10.2.orig/Makefile.in 2008-11-06 15:17:28.000000000 +0100 +++++ cdparanoia-10.2/Makefile.in 2008-11-06 15:19:12.000000000 +0100 ++@@ -8,12 +8,12 @@ ++ srcdir=@srcdir@ ++ ++ @SET_MAKE@ ++-FLAGS=@TYPESIZES@ @CFLAGS@ ++-OPT=@OPT@ $(FLAGS) ++-DEBUG=@DEBUG@ $(FLAGS) +++#FLAGS=@TYPESIZES@ @CFLAGS@ +++#OPT=@OPT@ $(FLAGS) +++#DEBUG=@DEBUG@ $(FLAGS) ++ CC=@CC@ ++ LD=@CC@ ++-LDFLAGS=@LDFLAGS@ $(FLAGS) +++LDFLAGS=@LDFLAGS@ ++ AR=@AR@ ++ RANLIB=@RANLIB@ ++ INSTALL=@INSTALL@ ++@@ -43,7 +43,8 @@ ++ all: ++ cd interface && $(MAKE) all ++ cd paranoia && $(MAKE) all ++- $(MAKE) cdparanoia CFLAGS="$(OPT)" +++ $(MAKE) cdparanoia +++#CFLAGS="$(OPT)" ++ ++ debug: ++ cd interface && $(MAKE) debug ++@@ -87,7 +88,7 @@ ++ $(LIBDIR)/libcdda_paranoia.so ++ ++ cdparanoia: $(OFILES) $(LIBDEP) ++- $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ +++ $(CC) $(CFLAGS) $(LDFLAGS) $(OFILES) \ ++ -L$(PWD)/paranoia -L$(PWD)/interface \ ++ -o cdparanoia $(LIBS) ++ +diff --git a/feeds/packages/utils/cksfv/.svn/entries b/feeds/packages/utils/cksfv/.svn/entries +new file mode 100644 +index 0000000..b71609a +--- /dev/null ++++ b/feeds/packages/utils/cksfv/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cksfv ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-06-16T11:08:07.662561Z ++21812 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++94c79ba8b6c65f6308e60d5905ed9369 ++2010-06-16T11:08:07.662561Z ++21812 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++825 ++ +diff --git a/feeds/packages/utils/cksfv/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/cksfv/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ca40189 +--- /dev/null ++++ b/feeds/packages/utils/cksfv/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,36 @@ ++# ++# 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:=cksfv ++PKG_VERSION:=1.3.14 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://zakalwe.fi/~shd/foss/cksfv/files ++PKG_MD5SUM:=2e15289753ea0b90b6ea86993f93b383 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cksfv ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=cksfv CRC32 checksum verification tool ++ URL:=http://zakalwe.fi/~shd/foss/cksfv/ ++endef ++ ++define Package/cksfv/description ++ cksfv is a tool for verifying CRC32 checksums. ++endef ++ ++define Package/cksfv/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cksfv $(1)/usr/sbin/cksfv ++endef ++ ++$(eval $(call BuildPackage,cksfv)) +diff --git a/feeds/packages/utils/cksfv/Makefile b/feeds/packages/utils/cksfv/Makefile +new file mode 100644 +index 0000000..ca40189 +--- /dev/null ++++ b/feeds/packages/utils/cksfv/Makefile +@@ -0,0 +1,36 @@ ++# ++# 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:=cksfv ++PKG_VERSION:=1.3.14 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://zakalwe.fi/~shd/foss/cksfv/files ++PKG_MD5SUM:=2e15289753ea0b90b6ea86993f93b383 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cksfv ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=cksfv CRC32 checksum verification tool ++ URL:=http://zakalwe.fi/~shd/foss/cksfv/ ++endef ++ ++define Package/cksfv/description ++ cksfv is a tool for verifying CRC32 checksums. ++endef ++ ++define Package/cksfv/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cksfv $(1)/usr/sbin/cksfv ++endef ++ ++$(eval $(call BuildPackage,cksfv)) +diff --git a/feeds/packages/utils/clish/.svn/entries b/feeds/packages/utils/clish/.svn/entries +new file mode 100644 +index 0000000..78f71f5 +--- /dev/null ++++ b/feeds/packages/utils/clish/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/clish ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T01:57:09.759942Z ++32260 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++216d8cd40a938f912bc3bcd0f5432d1a ++2012-06-12T01:57:09.759942Z ++32260 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1292 ++ +diff --git a/feeds/packages/utils/clish/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/clish/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f1774e5 +--- /dev/null ++++ b/feeds/packages/utils/clish/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 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:=clish ++PKG_VERSION:=0.7.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=81e20f7a888bcd8e2280e37804d342e4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/clish ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libstdcpp +libpthread ++ TITLE:=Command Line Interface SHell ++ URL:=http://clish.sourceforge.net/ ++endef ++ ++define Package/clish/description ++ A modular framework for implementing a CISCO-like CLI on a *NIX system. ++ Arbitary command menus and actions can be defined using XML files. ++ This software handles the user interaction, ++ and forks the appropriate system commands to perform any actions. ++endef ++ ++CONFIGURE_VARS += \ ++ ac_cv_header_bfd_h=no ++ ++MAKE_FLAGS += \ ++ bin_PROGRAMS=bin/clish ++ ++define Package/clish/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(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/clish ++ $(CP) $(PKG_BUILD_DIR)/xml-examples/*.xml $(1)/etc/clish/ ++endef ++ ++$(eval $(call BuildPackage,clish)) +diff --git a/feeds/packages/utils/clish/Makefile b/feeds/packages/utils/clish/Makefile +new file mode 100644 +index 0000000..f1774e5 +--- /dev/null ++++ b/feeds/packages/utils/clish/Makefile +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 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:=clish ++PKG_VERSION:=0.7.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=81e20f7a888bcd8e2280e37804d342e4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/clish ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libstdcpp +libpthread ++ TITLE:=Command Line Interface SHell ++ URL:=http://clish.sourceforge.net/ ++endef ++ ++define Package/clish/description ++ A modular framework for implementing a CISCO-like CLI on a *NIX system. ++ Arbitary command menus and actions can be defined using XML files. ++ This software handles the user interaction, ++ and forks the appropriate system commands to perform any actions. ++endef ++ ++CONFIGURE_VARS += \ ++ ac_cv_header_bfd_h=no ++ ++MAKE_FLAGS += \ ++ bin_PROGRAMS=bin/clish ++ ++define Package/clish/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(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/clish ++ $(CP) $(PKG_BUILD_DIR)/xml-examples/*.xml $(1)/etc/clish/ ++endef ++ ++$(eval $(call BuildPackage,clish)) +diff --git a/feeds/packages/utils/cmdpad/.svn/entries b/feeds/packages/utils/cmdpad/.svn/entries +new file mode 100644 +index 0000000..4b09a0b +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cmdpad ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d4ee2f93c0f4f2d103d4814d8c20c634 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1554 ++ +diff --git a/feeds/packages/utils/cmdpad/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/cmdpad/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6b33e8b +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=cmdpad ++PKG_VERSION:=0.0.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/cmdpad ++PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965 ++ ++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/feeds/packages/utils/cmdpad/Makefile b/feeds/packages/utils/cmdpad/Makefile +new file mode 100644 +index 0000000..6b33e8b +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=cmdpad ++PKG_VERSION:=0.0.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/cmdpad ++PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965 ++ ++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/feeds/packages/utils/cmdpad/files/.svn/entries b/feeds/packages/utils/cmdpad/files/.svn/entries +new file mode 100644 +index 0000000..005e86f +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cmdpad/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:49:29.782849Z ++28930 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++cmdpad.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9bf4aa5e14409c288d20f8ecac930a4e ++2011-11-09T23:49:29.782849Z ++28930 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++186 ++ +diff --git a/feeds/packages/utils/cmdpad/files/.svn/text-base/cmdpad.init.svn-base b/feeds/packages/utils/cmdpad/files/.svn/text-base/cmdpad.init.svn-base +new file mode 100644 +index 0000000..f612033 +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/files/.svn/text-base/cmdpad.init.svn-base +@@ -0,0 +1,14 @@ ++#!/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/feeds/packages/utils/cmdpad/files/cmdpad.init b/feeds/packages/utils/cmdpad/files/cmdpad.init +new file mode 100644 +index 0000000..f612033 +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/files/cmdpad.init +@@ -0,0 +1,14 @@ ++#!/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/feeds/packages/utils/cmdpad/patches/.svn/entries b/feeds/packages/utils/cmdpad/patches/.svn/entries +new file mode 100644 +index 0000000..757d3da +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cmdpad/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-19T07:08:00.251169Z ++18068 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++130-no_zombie.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++39732d25cf65d2e599d0a68597c1f56f ++2008-01-16T11:31:57.549521Z ++10211 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++393 ++ ++120-kernel26-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a10fee819204649e6b9fcd5ca54cb1fb ++2008-01-06T13:44:36.300415Z ++10135 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++503 ++ ++100-Makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9ecc7239092f990352274472677b1a20 ++2008-01-06T13:44:36.300415Z ++10135 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1021 ++ ++140-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++90e1b13c4e7b10a45c95f7c7d093fe5f ++2009-10-19T07:08:00.251169Z ++18068 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++386 ++ +diff --git a/feeds/packages/utils/cmdpad/patches/.svn/text-base/100-Makefile.patch.svn-base b/feeds/packages/utils/cmdpad/patches/.svn/text-base/100-Makefile.patch.svn-base +new file mode 100644 +index 0000000..61a6c8f +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/.svn/text-base/100-Makefile.patch.svn-base +@@ -0,0 +1,35 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/.svn/text-base/120-kernel26-compat.patch.svn-base b/feeds/packages/utils/cmdpad/patches/.svn/text-base/120-kernel26-compat.patch.svn-base +new file mode 100644 +index 0000000..eb7beeb +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/.svn/text-base/120-kernel26-compat.patch.svn-base +@@ -0,0 +1,15 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/.svn/text-base/130-no_zombie.patch.svn-base b/feeds/packages/utils/cmdpad/patches/.svn/text-base/130-no_zombie.patch.svn-base +new file mode 100644 +index 0000000..aa4fc6a +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/.svn/text-base/130-no_zombie.patch.svn-base +@@ -0,0 +1,18 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/.svn/text-base/140-compile_fix.patch.svn-base b/feeds/packages/utils/cmdpad/patches/.svn/text-base/140-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..c7a9bb3 +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/.svn/text-base/140-compile_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/100-Makefile.patch b/feeds/packages/utils/cmdpad/patches/100-Makefile.patch +new file mode 100644 +index 0000000..61a6c8f +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/100-Makefile.patch +@@ -0,0 +1,35 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/120-kernel26-compat.patch b/feeds/packages/utils/cmdpad/patches/120-kernel26-compat.patch +new file mode 100644 +index 0000000..eb7beeb +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/120-kernel26-compat.patch +@@ -0,0 +1,15 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/130-no_zombie.patch b/feeds/packages/utils/cmdpad/patches/130-no_zombie.patch +new file mode 100644 +index 0000000..aa4fc6a +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/130-no_zombie.patch +@@ -0,0 +1,18 @@ ++--- 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/feeds/packages/utils/cmdpad/patches/140-compile_fix.patch b/feeds/packages/utils/cmdpad/patches/140-compile_fix.patch +new file mode 100644 +index 0000000..c7a9bb3 +--- /dev/null ++++ b/feeds/packages/utils/cmdpad/patches/140-compile_fix.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/collectd/.svn/entries b/feeds/packages/utils/collectd/.svn/entries +new file mode 100644 +index 0000000..2f16115 +--- /dev/null ++++ b/feeds/packages/utils/collectd/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/collectd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-21T18:25:38.114159Z ++34831 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a24caabff4997312c85953671ab9e9b6 ++2012-12-21T18:25:38.114159Z ++34831 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9605 ++ +diff --git a/feeds/packages/utils/collectd/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/collectd/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/collectd/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/collectd/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/collectd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d923ab4 +--- /dev/null ++++ b/feeds/packages/utils/collectd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,310 @@ ++# ++# 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:=collectd ++PKG_VERSION:=4.10.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://collectd.org/files/ ++PKG_MD5SUM:=7a60495208b9383225493c6dd6abb2f0 ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++COLLECTD_PLUGINS_DISABLED:= \ ++ apple_sensors \ ++ battery \ ++ cpufreq \ ++ curl_json \ ++ entropy \ ++ genericjmx \ ++ gmond \ ++ hddtemp \ ++ ipmi \ ++ ipvs \ ++ java \ ++ libvirt \ ++ mbmon \ ++ memcachec \ ++ memcached \ ++ monitorus \ ++ multimeter \ ++ netapp \ ++ nfs \ ++ notify_desktop \ ++ notify_email \ ++ openvz \ ++ oracle \ ++ perl \ ++ pinba \ ++ python \ ++ routeros \ ++ rrdcached \ ++ serial \ ++ swap \ ++ tape \ ++ tokyotyrant \ ++ uuid \ ++ vserver \ ++ xmms \ ++ zfs_arc \ ++ ++COLLECTD_PLUGINS_SELECTED:= \ ++ apache \ ++ apcups \ ++ ascent \ ++ bind \ ++ conntrack \ ++ contextswitch \ ++ cpu \ ++ csv \ ++ curl \ ++ dbi \ ++ df \ ++ disk \ ++ dns \ ++ email \ ++ exec \ ++ filecount \ ++ fscache \ ++ interface \ ++ iptables \ ++ irq \ ++ iwinfo \ ++ load \ ++ logfile \ ++ madwifi \ ++ memory \ ++ modbus \ ++ mysql \ ++ netlink \ ++ network \ ++ nginx \ ++ ntpd \ ++ nut \ ++ olsrd \ ++ onewire \ ++ openvpn \ ++ ping \ ++ postgresql \ ++ powerdns \ ++ processes \ ++ protocols \ ++ rrdtool \ ++ sensors \ ++ snmp \ ++ syslog \ ++ tail \ ++ table \ ++ ted \ ++ tcpconns \ ++ teamspeak2 \ ++ 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 @BROKEN)) ++$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip)) ++$(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,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 @BROKEN)) ++$(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/feeds/packages/utils/collectd/Makefile b/feeds/packages/utils/collectd/Makefile +new file mode 100644 +index 0000000..d923ab4 +--- /dev/null ++++ b/feeds/packages/utils/collectd/Makefile +@@ -0,0 +1,310 @@ ++# ++# 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:=collectd ++PKG_VERSION:=4.10.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://collectd.org/files/ ++PKG_MD5SUM:=7a60495208b9383225493c6dd6abb2f0 ++ ++PKG_FIXUP:=autoreconf ++PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++COLLECTD_PLUGINS_DISABLED:= \ ++ apple_sensors \ ++ battery \ ++ cpufreq \ ++ curl_json \ ++ entropy \ ++ genericjmx \ ++ gmond \ ++ hddtemp \ ++ ipmi \ ++ ipvs \ ++ java \ ++ libvirt \ ++ mbmon \ ++ memcachec \ ++ memcached \ ++ monitorus \ ++ multimeter \ ++ netapp \ ++ nfs \ ++ notify_desktop \ ++ notify_email \ ++ openvz \ ++ oracle \ ++ perl \ ++ pinba \ ++ python \ ++ routeros \ ++ rrdcached \ ++ serial \ ++ swap \ ++ tape \ ++ tokyotyrant \ ++ uuid \ ++ vserver \ ++ xmms \ ++ zfs_arc \ ++ ++COLLECTD_PLUGINS_SELECTED:= \ ++ apache \ ++ apcups \ ++ ascent \ ++ bind \ ++ conntrack \ ++ contextswitch \ ++ cpu \ ++ csv \ ++ curl \ ++ dbi \ ++ df \ ++ disk \ ++ dns \ ++ email \ ++ exec \ ++ filecount \ ++ fscache \ ++ interface \ ++ iptables \ ++ irq \ ++ iwinfo \ ++ load \ ++ logfile \ ++ madwifi \ ++ memory \ ++ modbus \ ++ mysql \ ++ netlink \ ++ network \ ++ nginx \ ++ ntpd \ ++ nut \ ++ olsrd \ ++ onewire \ ++ openvpn \ ++ ping \ ++ postgresql \ ++ powerdns \ ++ processes \ ++ protocols \ ++ rrdtool \ ++ sensors \ ++ snmp \ ++ syslog \ ++ tail \ ++ table \ ++ ted \ ++ tcpconns \ ++ teamspeak2 \ ++ 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 @BROKEN)) ++$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip)) ++$(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,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 @BROKEN)) ++$(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/feeds/packages/utils/collectd/files/.svn/entries b/feeds/packages/utils/collectd/files/.svn/entries +new file mode 100644 +index 0000000..884680f +--- /dev/null ++++ b/feeds/packages/utils/collectd/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/collectd/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:32.720268Z ++28948 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++collectd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7241455d685184d6755119d72681a32f ++2011-11-11T15:46:32.720268Z ++28948 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++220 ++ ++collectd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a65ec05b19a963b15bcce65061210f2b ++2010-01-15T21:58:28.009670Z ++19154 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1551 ++ +diff --git a/feeds/packages/utils/collectd/files/.svn/prop-base/collectd.init.svn-base b/feeds/packages/utils/collectd/files/.svn/prop-base/collectd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/collectd/files/.svn/prop-base/collectd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/collectd/files/.svn/text-base/collectd.conf.svn-base b/feeds/packages/utils/collectd/files/.svn/text-base/collectd.conf.svn-base +new file mode 100644 +index 0000000..2ef78fe +--- /dev/null ++++ b/feeds/packages/utils/collectd/files/.svn/text-base/collectd.conf.svn-base +@@ -0,0 +1,90 @@ ++# ++# 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 ++ ++# ++# LogLevel info ++# ++ ++# ++# LogLevel info ++# File STDOUT ++# Timestamp true ++# ++ ++LoadPlugin cpu ++LoadPlugin df ++LoadPlugin disk ++LoadPlugin interface ++LoadPlugin load ++LoadPlugin memory ++LoadPlugin network ++#LoadPlugin ping ++#LoadPlugin processes ++#LoadPlugin rrdtool ++#LoadPlugin serial ++LoadPlugin wireless ++ ++# ++# FSType tmpfs ++# IgnoreSelected true ++# ReportByDevice false ++# ReportReserved false ++# ReportInodes false ++# ++ ++# ++# Disk "/^[hs]d[a-f][0-9]?$/" ++# IgnoreSelected false ++# ++ ++# ++# Interface "eth0" ++# Interface "br-lan" ++# IgnoreSelected false ++# ++ ++ ++# 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 ++ ++ ++# ++# Host "host.foo.bar" ++# Interval 1.0 ++# Timeout 0.9 ++# TTL 255 ++# SourceAddress "1.2.3.4" ++# Device "eth0" ++# MaxMissed -1 ++# ++ ++# ++# Process "name" ++# ++ ++# ++# DataDir "/var/lib/collectd/rrd" ++# CacheTimeout 120 ++# CacheFlush 900 ++# +diff --git a/feeds/packages/utils/collectd/files/.svn/text-base/collectd.init.svn-base b/feeds/packages/utils/collectd/files/.svn/text-base/collectd.init.svn-base +new file mode 100644 +index 0000000..8204c38 +--- /dev/null ++++ b/feeds/packages/utils/collectd/files/.svn/text-base/collectd.init.svn-base +@@ -0,0 +1,15 @@ ++#!/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/feeds/packages/utils/collectd/files/collectd.conf b/feeds/packages/utils/collectd/files/collectd.conf +new file mode 100644 +index 0000000..2ef78fe +--- /dev/null ++++ b/feeds/packages/utils/collectd/files/collectd.conf +@@ -0,0 +1,90 @@ ++# ++# 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 ++ ++# ++# LogLevel info ++# ++ ++# ++# LogLevel info ++# File STDOUT ++# Timestamp true ++# ++ ++LoadPlugin cpu ++LoadPlugin df ++LoadPlugin disk ++LoadPlugin interface ++LoadPlugin load ++LoadPlugin memory ++LoadPlugin network ++#LoadPlugin ping ++#LoadPlugin processes ++#LoadPlugin rrdtool ++#LoadPlugin serial ++LoadPlugin wireless ++ ++# ++# FSType tmpfs ++# IgnoreSelected true ++# ReportByDevice false ++# ReportReserved false ++# ReportInodes false ++# ++ ++# ++# Disk "/^[hs]d[a-f][0-9]?$/" ++# IgnoreSelected false ++# ++ ++# ++# Interface "eth0" ++# Interface "br-lan" ++# IgnoreSelected false ++# ++ ++ ++# 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 ++ ++ ++# ++# Host "host.foo.bar" ++# Interval 1.0 ++# Timeout 0.9 ++# TTL 255 ++# SourceAddress "1.2.3.4" ++# Device "eth0" ++# MaxMissed -1 ++# ++ ++# ++# Process "name" ++# ++ ++# ++# DataDir "/var/lib/collectd/rrd" ++# CacheTimeout 120 ++# CacheFlush 900 ++# +diff --git a/feeds/packages/utils/collectd/files/collectd.init b/feeds/packages/utils/collectd/files/collectd.init +new file mode 100644 +index 0000000..8204c38 +--- /dev/null ++++ b/feeds/packages/utils/collectd/files/collectd.init +@@ -0,0 +1,15 @@ ++#!/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/feeds/packages/utils/collectd/patches/.svn/entries b/feeds/packages/utils/collectd/patches/.svn/entries +new file mode 100644 +index 0000000..3efc8df +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/entries +@@ -0,0 +1,368 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/collectd/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-21T18:25:38.114159Z ++34831 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-rrdtool-add-rrasingle-option.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f19d8359921c64a16b0bbcbb6bc88711 ++2012-04-04T14:13:42.915634Z ++31184 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1364 ++ ++120-fix_kernel_2.6.37.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++6fa70118c57e2820065dce7436a396ca ++2010-12-04T04:29:09.052190Z ++24237 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2429 ++ ++900-add-iwinfo-plugin.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++24acd8da358c4017e129dc9da2f1ba9a ++2012-12-04T16:20:55.153346Z ++34487 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7859 ++ ++001-undefined-AM_PATH_LIBGCRYPT.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++5041e40d248048d697e79d7be4b06099 ++2010-12-08T00:57:10.590813Z ++24318 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++95 ++ ++920-fix-ping-droprate.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++98e5d1463513b5f6560cad56527b2a84 ++2012-12-04T16:20:55.153346Z ++34487 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++436 ++ ++003-remove-werror.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ada43fca79eaab9b48836c015283e0fd ++2012-12-04T16:20:55.153346Z ++34487 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2096 ++ ++200-fix-git-describe-error.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++23650abbf0236fdd02b2377df3b73350 ++2012-12-04T16:20:55.153346Z ++34487 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++283 ++ ++400-fix-olsrd-get-all.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++92e52f229227f2c6722c619937e88fcf ++2011-12-05T13:54:46.533947Z ++29435 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++258 ++ ++130-timeleft-max.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a4637055825a8989ad53754afd2272f9 ++2012-12-21T18:25:38.114159Z ++34831 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++447 ++ ++110-net-device-stats.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f449f22c087acd4b4faaf16a2236583a ++2010-12-04T04:29:09.052190Z ++24237 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1366 ++ +diff --git a/feeds/packages/utils/collectd/patches/.svn/text-base/001-undefined-AM_PATH_LIBGCRYPT.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/001-undefined-AM_PATH_LIBGCRYPT.patch.svn-base +new file mode 100644 +index 0000000..0e01744 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/001-undefined-AM_PATH_LIBGCRYPT.patch.svn-base +@@ -0,0 +1,4 @@ ++--- /dev/null +++++ b/fake-am_path_libgcrypt.m4 ++@@ -0,0 +1 @@ +++AC_DEFUN([AM_PATH_LIBGCRYPT],[:]) +diff --git a/feeds/packages/utils/collectd/patches/.svn/text-base/003-remove-werror.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/003-remove-werror.patch.svn-base +new file mode 100644 +index 0000000..0e572bf +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/003-remove-werror.patch.svn-base +@@ -0,0 +1,66 @@ ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -7,7 +7,7 @@ SUBDIRS += liboconfig ++ endif ++ ++ if COMPILER_IS_GCC ++-AM_CFLAGS = -Wall -Werror +++AM_CFLAGS = -Wall ++ endif ++ ++ AM_CPPFLAGS = -DPREFIX='"${prefix}"' ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -1833,7 +1833,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) ++-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall ++ AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ ++ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ ++ -DLOCALSTATEDIR='"${localstatedir}"' \ ++--- 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 = client.h lcc_features.h ++--- a/src/libcollectdclient/Makefile.in +++++ b/src/libcollectdclient/Makefile.in ++@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign no-dependencies ++-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall ++ pkginclude_HEADERS = client.h lcc_features.h ++ lib_LTLIBRARIES = libcollectdclient.la ++ nodist_pkgconfig_DATA = libcollectdclient.pc ++--- a/src/owniptc/Makefile.am +++++ b/src/owniptc/Makefile.am ++@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci ++ EXTRA_DIST = libiptc.c README.collectd ++ ++ if COMPILER_IS_GCC ++-AM_CFLAGS = -Wall -Werror +++AM_CFLAGS = -Wall ++ endif ++ ++ noinst_LTLIBRARIES = libiptc.la ++--- a/src/owniptc/Makefile.in +++++ b/src/owniptc/Makefile.in ++@@ -296,7 +296,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign no-dependencies ++ EXTRA_DIST = libiptc.c README.collectd ++-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall ++ noinst_LTLIBRARIES = libiptc.la ++ libiptc_la_SOURCES = libip4tc.c libip6tc.c \ ++ ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \ +diff --git a/feeds/packages/utils/collectd/patches/.svn/text-base/100-rrdtool-add-rrasingle-option.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/100-rrdtool-add-rrasingle-option.patch.svn-base +new file mode 100644 +index 0000000..ce1daa4 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/100-rrdtool-add-rrasingle-option.patch.svn-base +@@ -0,0 +1,57 @@ ++--- a/src/rrdtool.c +++++ b/src/rrdtool.c ++@@ -80,6 +80,7 @@ static const char *config_keys[] = ++ "HeartBeat", ++ "RRARows", ++ "RRATimespan", +++ "RRASingle", ++ "XFF", ++ "WritesPerSecond", ++ "RandomTimeout" ++@@ -101,6 +102,8 @@ static rrdcreate_config_t rrdcreate_conf ++ /* timespans = */ NULL, ++ /* timespans_num = */ 0, ++ +++ /* rrasingle = */ 0, +++ ++ /* consolidation_functions = */ NULL, ++ /* consolidation_functions_num = */ 0 ++ }; ++@@ -1027,6 +1030,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 ++@@ -122,6 +122,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/feeds/packages/utils/collectd/patches/.svn/text-base/110-net-device-stats.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/110-net-device-stats.patch.svn-base +new file mode 100644 +index 0000000..91e73aa +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/110-net-device-stats.patch.svn-base +@@ -0,0 +1,46 @@ ++--- ++ 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/feeds/packages/utils/collectd/patches/.svn/text-base/120-fix_kernel_2.6.37.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/120-fix_kernel_2.6.37.patch.svn-base +new file mode 100644 +index 0000000..cca445a +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/120-fix_kernel_2.6.37.patch.svn-base +@@ -0,0 +1,78 @@ ++--- a/src/owniptc/libiptc.c +++++ b/src/owniptc/libiptc.c ++@@ -81,11 +81,11 @@ static const char *hooknames[] = { ++ }; ++ ++ /* Convenience structures */ ++-struct ipt_error_target +++ struct ipt_error_target2 ++ { ++ STRUCT_ENTRY_TARGET t; ++ char error[TABLE_MAXNAMELEN]; ++-}; +++}; ++ ++ struct chain_head; ++ struct rule_head; ++@@ -1007,10 +1007,10 @@ static int parse_table(TC_HANDLE_T h) ++ /* Convenience structures */ ++ struct iptcb_chain_start{ ++ STRUCT_ENTRY e; ++- struct ipt_error_target name; +++ struct ipt_error_target2 name; ++ }; ++ #define IPTCB_CHAIN_START_SIZE (sizeof(STRUCT_ENTRY) + \ ++- ALIGN(sizeof(struct ipt_error_target))) +++ ALIGN(sizeof(struct ipt_error_target2))) ++ ++ struct iptcb_chain_foot { ++ STRUCT_ENTRY e; ++@@ -1021,10 +1021,10 @@ struct iptcb_chain_foot { ++ ++ struct iptcb_chain_error { ++ STRUCT_ENTRY entry; ++- struct ipt_error_target target; +++ struct ipt_error_target2 target; ++ }; ++ #define IPTCB_CHAIN_ERROR_SIZE (sizeof(STRUCT_ENTRY) + \ ++- ALIGN(sizeof(struct ipt_error_target))) +++ ALIGN(sizeof(struct ipt_error_target2))) ++ ++ ++ ++@@ -1069,7 +1069,7 @@ static int iptcc_compile_chain(TC_HANDLE ++ head->e.next_offset = IPTCB_CHAIN_START_SIZE; ++ strcpy(head->name.t.u.user.name, ERROR_TARGET); ++ head->name.t.u.target_size = ++- ALIGN(sizeof(struct ipt_error_target)); +++ ALIGN(sizeof(struct ipt_error_target2)); ++ strcpy(head->name.error, c->name); ++ } else { ++ repl->hook_entry[c->hooknum-1] = c->head_offset; ++@@ -1113,7 +1113,7 @@ static int iptcc_compile_chain_offsets(T ++ if (!iptcc_is_builtin(c)) { ++ /* Chain has header */ ++ *offset += sizeof(STRUCT_ENTRY) ++- + ALIGN(sizeof(struct ipt_error_target)); +++ + ALIGN(sizeof(struct ipt_error_target2)); ++ (*num)++; ++ } ++ ++@@ -1153,7 +1153,7 @@ static int iptcc_compile_table_prep(TC_H ++ /* Append one error rule at end of chain */ ++ num++; ++ offset += sizeof(STRUCT_ENTRY) ++- + ALIGN(sizeof(struct ipt_error_target)); +++ + ALIGN(sizeof(struct ipt_error_target2)); ++ ++ /* ruleset size is now in offset */ ++ *size = offset; ++@@ -1177,7 +1177,7 @@ static int iptcc_compile_table(TC_HANDLE ++ error->entry.target_offset = sizeof(STRUCT_ENTRY); ++ error->entry.next_offset = IPTCB_CHAIN_ERROR_SIZE; ++ error->target.t.u.user.target_size = ++- ALIGN(sizeof(struct ipt_error_target)); +++ ALIGN(sizeof(struct ipt_error_target2)); ++ strcpy((char *)&error->target.t.u.user.name, ERROR_TARGET); ++ strcpy((char *)&error->target.error, "ERROR"); ++ +diff --git a/feeds/packages/utils/collectd/patches/.svn/text-base/130-timeleft-max.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/130-timeleft-max.patch.svn-base +new file mode 100644 +index 0000000..f263152 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/130-timeleft-max.patch.svn-base +@@ -0,0 +1,14 @@ ++Derived from uptream commit d5b09f2b: http://octo.cx/d5b09f2 ++ ++--- a/src/types.db +++++ b/src/types.db ++@@ -152,7 +152,7 @@ tcp_connections value:GAUGE:0:429496729 ++ temperature value:GAUGE:-273.15:U ++ threads value:GAUGE:0:U ++ time_dispersion seconds:GAUGE:-1000000:1000000 ++-timeleft timeleft:GAUGE:0:3600 +++timeleft timeleft:GAUGE:0:U ++ time_offset seconds:GAUGE:-1000000:1000000 ++ total_bytes value:DERIVE:0:U ++ total_requests value:DERIVE:0:U ++ +diff --git a/feeds/packages/utils/collectd/patches/.svn/text-base/200-fix-git-describe-error.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/200-fix-git-describe-error.patch.svn-base +new file mode 100644 +index 0000000..1946650 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/200-fix-git-describe-error.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/version-gen.sh +++++ b/version-gen.sh ++@@ -2,7 +2,7 @@ ++ ++ DEFAULT_VERSION="4.10.8.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/feeds/packages/utils/collectd/patches/.svn/text-base/400-fix-olsrd-get-all.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/400-fix-olsrd-get-all.patch.svn-base +new file mode 100644 +index 0000000..b49a0e7 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/400-fix-olsrd-get-all.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/collectd/patches/.svn/text-base/900-add-iwinfo-plugin.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/900-add-iwinfo-plugin.patch.svn-base +new file mode 100644 +index 0000000..a635493 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/900-add-iwinfo-plugin.patch.svn-base +@@ -0,0 +1,275 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -490,6 +490,9 @@ AC_CHECK_HEADERS(netinet/if_ether.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. ++ # ++@@ -4081,6 +4084,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" ++@@ -4388,6 +4392,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]) ++@@ -4666,6 +4671,7 @@ Configuration: ++ protobuf-c . . . . . $have_protoc_c ++ oracle . . . . . . . $with_oracle ++ python . . . . . . . $with_python +++ iwinfo . . . . . . . $with_iwinfo ++ ++ Features: ++ daemon mode . . . . . $enable_daemon ++@@ -4705,6 +4711,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 ++@@ -82,6 +82,7 @@ FQDNLookup true ++ #@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 ++@@ -376,6 +377,12 @@ FQDNLookup true ++ # IgnoreSelected true ++ # ++ +++# +++# Interface "ath0" +++# Interface "ra0" +++# Interface "wlan0" +++# +++ ++ # ++ # JVMArg "-verbose:jni" ++ # JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar" ++--- a/src/collectd.conf.pod +++++ b/src/collectd.conf.pod ++@@ -1478,6 +1478,27 @@ and all other interrupts are collected. ++ ++ =back ++ +++=head2 Plugin C +++ +++=over 4 +++ +++=item B I +++ +++Select this interface. By default all detected wireless interfaces will be +++collected. For a more detailed description see B below. +++ +++=item B I|I +++ +++If no configuration if given, the B-plugin will collect data from all +++detected wireless interfaces. You can use the B-option to pick the +++interfaces you're interested in. Sometimes, however, it's easier/preferred to +++collect all interfaces I a few ones. This option enables you to do +++that: By setting B to I the effect of B is +++inverted: All selected interfaces are ignored and all other interfaces are +++collected. +++ +++=back +++ ++ =head2 Plugin C ++ ++ The I 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 +++#include +++ +++#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 ++@@ -453,6 +453,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 ++@@ -171,3 +171,4 @@ 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 +diff --git a/feeds/packages/utils/collectd/patches/.svn/text-base/920-fix-ping-droprate.patch.svn-base b/feeds/packages/utils/collectd/patches/.svn/text-base/920-fix-ping-droprate.patch.svn-base +new file mode 100644 +index 0000000..f743299 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/.svn/text-base/920-fix-ping-droprate.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch b/feeds/packages/utils/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch +new file mode 100644 +index 0000000..0e01744 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch +@@ -0,0 +1,4 @@ ++--- /dev/null +++++ b/fake-am_path_libgcrypt.m4 ++@@ -0,0 +1 @@ +++AC_DEFUN([AM_PATH_LIBGCRYPT],[:]) +diff --git a/feeds/packages/utils/collectd/patches/003-remove-werror.patch b/feeds/packages/utils/collectd/patches/003-remove-werror.patch +new file mode 100644 +index 0000000..0e572bf +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/003-remove-werror.patch +@@ -0,0 +1,66 @@ ++--- a/src/Makefile.am +++++ b/src/Makefile.am ++@@ -7,7 +7,7 @@ SUBDIRS += liboconfig ++ endif ++ ++ if COMPILER_IS_GCC ++-AM_CFLAGS = -Wall -Werror +++AM_CFLAGS = -Wall ++ endif ++ ++ AM_CPPFLAGS = -DPREFIX='"${prefix}"' ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -1833,7 +1833,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) ++-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall ++ AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ ++ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ ++ -DLOCALSTATEDIR='"${localstatedir}"' \ ++--- 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 = client.h lcc_features.h ++--- a/src/libcollectdclient/Makefile.in +++++ b/src/libcollectdclient/Makefile.in ++@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign no-dependencies ++-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall ++ pkginclude_HEADERS = client.h lcc_features.h ++ lib_LTLIBRARIES = libcollectdclient.la ++ nodist_pkgconfig_DATA = libcollectdclient.pc ++--- a/src/owniptc/Makefile.am +++++ b/src/owniptc/Makefile.am ++@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci ++ EXTRA_DIST = libiptc.c README.collectd ++ ++ if COMPILER_IS_GCC ++-AM_CFLAGS = -Wall -Werror +++AM_CFLAGS = -Wall ++ endif ++ ++ noinst_LTLIBRARIES = libiptc.la ++--- a/src/owniptc/Makefile.in +++++ b/src/owniptc/Makefile.in ++@@ -296,7 +296,7 @@ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign no-dependencies ++ EXTRA_DIST = libiptc.c README.collectd ++-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall ++ noinst_LTLIBRARIES = libiptc.la ++ libiptc_la_SOURCES = libip4tc.c libip6tc.c \ ++ ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \ +diff --git a/feeds/packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch b/feeds/packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch +new file mode 100644 +index 0000000..ce1daa4 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch +@@ -0,0 +1,57 @@ ++--- a/src/rrdtool.c +++++ b/src/rrdtool.c ++@@ -80,6 +80,7 @@ static const char *config_keys[] = ++ "HeartBeat", ++ "RRARows", ++ "RRATimespan", +++ "RRASingle", ++ "XFF", ++ "WritesPerSecond", ++ "RandomTimeout" ++@@ -101,6 +102,8 @@ static rrdcreate_config_t rrdcreate_conf ++ /* timespans = */ NULL, ++ /* timespans_num = */ 0, ++ +++ /* rrasingle = */ 0, +++ ++ /* consolidation_functions = */ NULL, ++ /* consolidation_functions_num = */ 0 ++ }; ++@@ -1027,6 +1030,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 ++@@ -122,6 +122,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/feeds/packages/utils/collectd/patches/110-net-device-stats.patch b/feeds/packages/utils/collectd/patches/110-net-device-stats.patch +new file mode 100644 +index 0000000..91e73aa +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/110-net-device-stats.patch +@@ -0,0 +1,46 @@ ++--- ++ 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/feeds/packages/utils/collectd/patches/120-fix_kernel_2.6.37.patch b/feeds/packages/utils/collectd/patches/120-fix_kernel_2.6.37.patch +new file mode 100644 +index 0000000..cca445a +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/120-fix_kernel_2.6.37.patch +@@ -0,0 +1,78 @@ ++--- a/src/owniptc/libiptc.c +++++ b/src/owniptc/libiptc.c ++@@ -81,11 +81,11 @@ static const char *hooknames[] = { ++ }; ++ ++ /* Convenience structures */ ++-struct ipt_error_target +++ struct ipt_error_target2 ++ { ++ STRUCT_ENTRY_TARGET t; ++ char error[TABLE_MAXNAMELEN]; ++-}; +++}; ++ ++ struct chain_head; ++ struct rule_head; ++@@ -1007,10 +1007,10 @@ static int parse_table(TC_HANDLE_T h) ++ /* Convenience structures */ ++ struct iptcb_chain_start{ ++ STRUCT_ENTRY e; ++- struct ipt_error_target name; +++ struct ipt_error_target2 name; ++ }; ++ #define IPTCB_CHAIN_START_SIZE (sizeof(STRUCT_ENTRY) + \ ++- ALIGN(sizeof(struct ipt_error_target))) +++ ALIGN(sizeof(struct ipt_error_target2))) ++ ++ struct iptcb_chain_foot { ++ STRUCT_ENTRY e; ++@@ -1021,10 +1021,10 @@ struct iptcb_chain_foot { ++ ++ struct iptcb_chain_error { ++ STRUCT_ENTRY entry; ++- struct ipt_error_target target; +++ struct ipt_error_target2 target; ++ }; ++ #define IPTCB_CHAIN_ERROR_SIZE (sizeof(STRUCT_ENTRY) + \ ++- ALIGN(sizeof(struct ipt_error_target))) +++ ALIGN(sizeof(struct ipt_error_target2))) ++ ++ ++ ++@@ -1069,7 +1069,7 @@ static int iptcc_compile_chain(TC_HANDLE ++ head->e.next_offset = IPTCB_CHAIN_START_SIZE; ++ strcpy(head->name.t.u.user.name, ERROR_TARGET); ++ head->name.t.u.target_size = ++- ALIGN(sizeof(struct ipt_error_target)); +++ ALIGN(sizeof(struct ipt_error_target2)); ++ strcpy(head->name.error, c->name); ++ } else { ++ repl->hook_entry[c->hooknum-1] = c->head_offset; ++@@ -1113,7 +1113,7 @@ static int iptcc_compile_chain_offsets(T ++ if (!iptcc_is_builtin(c)) { ++ /* Chain has header */ ++ *offset += sizeof(STRUCT_ENTRY) ++- + ALIGN(sizeof(struct ipt_error_target)); +++ + ALIGN(sizeof(struct ipt_error_target2)); ++ (*num)++; ++ } ++ ++@@ -1153,7 +1153,7 @@ static int iptcc_compile_table_prep(TC_H ++ /* Append one error rule at end of chain */ ++ num++; ++ offset += sizeof(STRUCT_ENTRY) ++- + ALIGN(sizeof(struct ipt_error_target)); +++ + ALIGN(sizeof(struct ipt_error_target2)); ++ ++ /* ruleset size is now in offset */ ++ *size = offset; ++@@ -1177,7 +1177,7 @@ static int iptcc_compile_table(TC_HANDLE ++ error->entry.target_offset = sizeof(STRUCT_ENTRY); ++ error->entry.next_offset = IPTCB_CHAIN_ERROR_SIZE; ++ error->target.t.u.user.target_size = ++- ALIGN(sizeof(struct ipt_error_target)); +++ ALIGN(sizeof(struct ipt_error_target2)); ++ strcpy((char *)&error->target.t.u.user.name, ERROR_TARGET); ++ strcpy((char *)&error->target.error, "ERROR"); ++ +diff --git a/feeds/packages/utils/collectd/patches/130-timeleft-max.patch b/feeds/packages/utils/collectd/patches/130-timeleft-max.patch +new file mode 100644 +index 0000000..f263152 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/130-timeleft-max.patch +@@ -0,0 +1,14 @@ ++Derived from uptream commit d5b09f2b: http://octo.cx/d5b09f2 ++ ++--- a/src/types.db +++++ b/src/types.db ++@@ -152,7 +152,7 @@ tcp_connections value:GAUGE:0:429496729 ++ temperature value:GAUGE:-273.15:U ++ threads value:GAUGE:0:U ++ time_dispersion seconds:GAUGE:-1000000:1000000 ++-timeleft timeleft:GAUGE:0:3600 +++timeleft timeleft:GAUGE:0:U ++ time_offset seconds:GAUGE:-1000000:1000000 ++ total_bytes value:DERIVE:0:U ++ total_requests value:DERIVE:0:U ++ +diff --git a/feeds/packages/utils/collectd/patches/200-fix-git-describe-error.patch b/feeds/packages/utils/collectd/patches/200-fix-git-describe-error.patch +new file mode 100644 +index 0000000..1946650 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/200-fix-git-describe-error.patch +@@ -0,0 +1,11 @@ ++--- a/version-gen.sh +++++ b/version-gen.sh ++@@ -2,7 +2,7 @@ ++ ++ DEFAULT_VERSION="4.10.8.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/feeds/packages/utils/collectd/patches/400-fix-olsrd-get-all.patch b/feeds/packages/utils/collectd/patches/400-fix-olsrd-get-all.patch +new file mode 100644 +index 0000000..b49a0e7 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/400-fix-olsrd-get-all.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/collectd/patches/900-add-iwinfo-plugin.patch b/feeds/packages/utils/collectd/patches/900-add-iwinfo-plugin.patch +new file mode 100644 +index 0000000..a635493 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/900-add-iwinfo-plugin.patch +@@ -0,0 +1,275 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -490,6 +490,9 @@ AC_CHECK_HEADERS(netinet/if_ether.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. ++ # ++@@ -4081,6 +4084,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" ++@@ -4388,6 +4392,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]) ++@@ -4666,6 +4671,7 @@ Configuration: ++ protobuf-c . . . . . $have_protoc_c ++ oracle . . . . . . . $with_oracle ++ python . . . . . . . $with_python +++ iwinfo . . . . . . . $with_iwinfo ++ ++ Features: ++ daemon mode . . . . . $enable_daemon ++@@ -4705,6 +4711,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 ++@@ -82,6 +82,7 @@ FQDNLookup true ++ #@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 ++@@ -376,6 +377,12 @@ FQDNLookup true ++ # IgnoreSelected true ++ # ++ +++# +++# Interface "ath0" +++# Interface "ra0" +++# Interface "wlan0" +++# +++ ++ # ++ # JVMArg "-verbose:jni" ++ # JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar" ++--- a/src/collectd.conf.pod +++++ b/src/collectd.conf.pod ++@@ -1478,6 +1478,27 @@ and all other interrupts are collected. ++ ++ =back ++ +++=head2 Plugin C +++ +++=over 4 +++ +++=item B I +++ +++Select this interface. By default all detected wireless interfaces will be +++collected. For a more detailed description see B below. +++ +++=item B I|I +++ +++If no configuration if given, the B-plugin will collect data from all +++detected wireless interfaces. You can use the B-option to pick the +++interfaces you're interested in. Sometimes, however, it's easier/preferred to +++collect all interfaces I a few ones. This option enables you to do +++that: By setting B to I the effect of B is +++inverted: All selected interfaces are ignored and all other interfaces are +++collected. +++ +++=back +++ ++ =head2 Plugin C ++ ++ The I 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 +++#include +++ +++#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 ++@@ -453,6 +453,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 ++@@ -171,3 +171,4 @@ 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 +diff --git a/feeds/packages/utils/collectd/patches/920-fix-ping-droprate.patch b/feeds/packages/utils/collectd/patches/920-fix-ping-droprate.patch +new file mode 100644 +index 0000000..f743299 +--- /dev/null ++++ b/feeds/packages/utils/collectd/patches/920-fix-ping-droprate.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/coreutils/.svn/entries b/feeds/packages/utils/coreutils/.svn/entries +new file mode 100644 +index 0000000..c5ac3fa +--- /dev/null ++++ b/feeds/packages/utils/coreutils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/coreutils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-28T09:42:41.962281Z ++34905 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f2fa250f0e56f00a29d0465ff1e2ab6a ++2012-12-28T09:42:41.962281Z ++34905 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2982 ++ +diff --git a/feeds/packages/utils/coreutils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/coreutils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2b284f5 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,109 @@ ++# ++# 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:=coreutils ++PKG_VERSION:=8.16 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNU/coreutils ++PKG_MD5SUM:=89b06f91634208dceba7b36ad1f9e8b9 ++PKG_BUILD_DEPENDS:=libpthread ++ ++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_uptime = +libelf1 ++DEPENDS_expr = +libgmp ++DEPENDS_factor = +libgmp ++ ++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 += \ ++ --enable-install-program=su ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SHELL="/bin/bash" \ ++ all install install-root ++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/feeds/packages/utils/coreutils/Makefile b/feeds/packages/utils/coreutils/Makefile +new file mode 100644 +index 0000000..2b284f5 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/Makefile +@@ -0,0 +1,109 @@ ++# ++# 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:=coreutils ++PKG_VERSION:=8.16 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@GNU/coreutils ++PKG_MD5SUM:=89b06f91634208dceba7b36ad1f9e8b9 ++PKG_BUILD_DEPENDS:=libpthread ++ ++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_uptime = +libelf1 ++DEPENDS_expr = +libgmp ++DEPENDS_factor = +libgmp ++ ++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 += \ ++ --enable-install-program=su ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SHELL="/bin/bash" \ ++ all install install-root ++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/feeds/packages/utils/coreutils/patches/.svn/entries b/feeds/packages/utils/coreutils/patches/.svn/entries +new file mode 100644 +index 0000000..c53d8e7 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/coreutils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-10T01:32:23.409680Z ++32156 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-fix_compile_with_uclibc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++a2c3e82b3cfb9871b73dd2fbbbcc5af6 ++2012-06-10T01:32:23.409680Z ++32156 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++304 ++ ++001-no_docs_man_tests.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++6668dba4e4d7d1858bf11e06d490e1eb ++2012-06-10T01:32:23.409680Z ++32156 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++560 ++ +diff --git a/feeds/packages/utils/coreutils/patches/.svn/text-base/001-no_docs_man_tests.patch.svn-base b/feeds/packages/utils/coreutils/patches/.svn/text-base/001-no_docs_man_tests.patch.svn-base +new file mode 100644 +index 0000000..2c04117 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/patches/.svn/text-base/001-no_docs_man_tests.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -17,7 +17,7 @@ ++ ++ ALL_RECURSIVE_TARGETS = ++ ++-SUBDIRS = lib src doc man po tests gnulib-tests +++SUBDIRS = lib src po ++ ++ changelog_etc = \ ++ ChangeLog-2005 \ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -1639,7 +1639,7 @@ top_srcdir = @top_srcdir@ ++ ++ # Some tests always need root privileges, others need them only sometimes. ++ ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook ++-SUBDIRS = lib src doc man po tests gnulib-tests +++SUBDIRS = lib src po ++ changelog_etc = \ ++ ChangeLog-2005 \ ++ ChangeLog-2006 \ +diff --git a/feeds/packages/utils/coreutils/patches/.svn/text-base/002-fix_compile_with_uclibc.patch.svn-base b/feeds/packages/utils/coreutils/patches/.svn/text-base/002-fix_compile_with_uclibc.patch.svn-base +new file mode 100644 +index 0000000..bee8a56 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/patches/.svn/text-base/002-fix_compile_with_uclibc.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/lib/pthread.in.h +++++ b/lib/pthread.in.h ++@@ -232,6 +232,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; ++ ++ static inline int +diff --git a/feeds/packages/utils/coreutils/patches/001-no_docs_man_tests.patch b/feeds/packages/utils/coreutils/patches/001-no_docs_man_tests.patch +new file mode 100644 +index 0000000..2c04117 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/patches/001-no_docs_man_tests.patch +@@ -0,0 +1,22 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -17,7 +17,7 @@ ++ ++ ALL_RECURSIVE_TARGETS = ++ ++-SUBDIRS = lib src doc man po tests gnulib-tests +++SUBDIRS = lib src po ++ ++ changelog_etc = \ ++ ChangeLog-2005 \ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -1639,7 +1639,7 @@ top_srcdir = @top_srcdir@ ++ ++ # Some tests always need root privileges, others need them only sometimes. ++ ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook ++-SUBDIRS = lib src doc man po tests gnulib-tests +++SUBDIRS = lib src po ++ changelog_etc = \ ++ ChangeLog-2005 \ ++ ChangeLog-2006 \ +diff --git a/feeds/packages/utils/coreutils/patches/002-fix_compile_with_uclibc.patch b/feeds/packages/utils/coreutils/patches/002-fix_compile_with_uclibc.patch +new file mode 100644 +index 0000000..bee8a56 +--- /dev/null ++++ b/feeds/packages/utils/coreutils/patches/002-fix_compile_with_uclibc.patch +@@ -0,0 +1,12 @@ ++--- a/lib/pthread.in.h +++++ b/lib/pthread.in.h ++@@ -232,6 +232,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; ++ ++ static inline int +diff --git a/feeds/packages/utils/cpusage/.svn/entries b/feeds/packages/utils/cpusage/.svn/entries +new file mode 100644 +index 0000000..47feb02 +--- /dev/null ++++ b/feeds/packages/utils/cpusage/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cpusage ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-06-19T17:16:26.633606Z ++27224 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++cdce71998c33389724c41ddab6a84821 ++2011-06-19T17:16:26.633606Z ++27224 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1364 ++ +diff --git a/feeds/packages/utils/cpusage/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/cpusage/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..10b5ec5 +--- /dev/null ++++ b/feeds/packages/utils/cpusage/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# Copyright (C) 2005 Fabian Schneider, 2010 Florian Sesser, TU Muenchen ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=cpusage ++PKG_VERSION:=0.31 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/cpusage ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cpusage ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Outputs CPU usage statistics once per second ++ URL:=http://www.net.t-labs.tu-berlin.de/~fabian/software_en.html\#cpusage ++endef ++ ++define Package/cpusage/description ++ CPUsage outputs CPU usage statistics once per second. ++ Optionally writes CSV output (see '-o' option). ++ Written by Fabian Schneider (TUM, TUB) in 2005. ++ Timestamp and CSV-compliance by Florian Sesser (TUM), 2010. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) src/* $(PKG_BUILD_DIR)/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -D__Linux26__ -D_BSD_SOURCE=1 -c -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include -o $(PKG_BUILD_DIR)/cpusage.o $(PKG_BUILD_DIR)/cpusage.c ++ $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/cpusage -L$(STAGING_DIR)/usr/lib $(PKG_BUILD_DIR)/cpusage.o ++endef ++ ++define Package/cpusage/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cpusage $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,cpusage)) +diff --git a/feeds/packages/utils/cpusage/Makefile b/feeds/packages/utils/cpusage/Makefile +new file mode 100644 +index 0000000..10b5ec5 +--- /dev/null ++++ b/feeds/packages/utils/cpusage/Makefile +@@ -0,0 +1,47 @@ ++# ++# Copyright (C) 2005 Fabian Schneider, 2010 Florian Sesser, TU Muenchen ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=cpusage ++PKG_VERSION:=0.31 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/cpusage ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/cpusage ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Outputs CPU usage statistics once per second ++ URL:=http://www.net.t-labs.tu-berlin.de/~fabian/software_en.html\#cpusage ++endef ++ ++define Package/cpusage/description ++ CPUsage outputs CPU usage statistics once per second. ++ Optionally writes CSV output (see '-o' option). ++ Written by Fabian Schneider (TUM, TUB) in 2005. ++ Timestamp and CSV-compliance by Florian Sesser (TUM), 2010. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) src/* $(PKG_BUILD_DIR)/ ++endef ++ ++TARGET_CFLAGS += $(FPIC) ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -D__Linux26__ -D_BSD_SOURCE=1 -c -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include -o $(PKG_BUILD_DIR)/cpusage.o $(PKG_BUILD_DIR)/cpusage.c ++ $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/cpusage -L$(STAGING_DIR)/usr/lib $(PKG_BUILD_DIR)/cpusage.o ++endef ++ ++define Package/cpusage/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cpusage $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,cpusage)) +diff --git a/feeds/packages/utils/cpusage/src/.svn/entries b/feeds/packages/utils/cpusage/src/.svn/entries +new file mode 100644 +index 0000000..814af36 +--- /dev/null ++++ b/feeds/packages/utils/cpusage/src/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cpusage/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-04-29T15:45:52.171397Z ++26792 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++cpusage.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++4ed60edd35af74871ee970fa2fdd5409 ++2011-04-29T15:45:52.171397Z ++26792 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9599 ++ +diff --git a/feeds/packages/utils/cpusage/src/.svn/text-base/cpusage.c.svn-base b/feeds/packages/utils/cpusage/src/.svn/text-base/cpusage.c.svn-base +new file mode 100644 +index 0000000..a027e4f +--- /dev/null ++++ b/feeds/packages/utils/cpusage/src/.svn/text-base/cpusage.c.svn-base +@@ -0,0 +1,426 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef __FreeBSD__ ++#include ++#else ++#include ++#include ++#include ++#endif ++ ++#ifdef __FreeBSD__ ++static void getsysctl(char *, void *, size_t); ++#define CPUSTATES 5 ++#define IDLEI 3 ++char *cpustatenames[] = { ++ "user", "nice", "system", "idle", "interrupt", NULL ++}; ++#endif ++ ++#ifdef __Linux24__ ++#define CPUSTATES 4 ++#define IDLEI 3 ++char *cpustatenames[] = { ++ "user", "nice", "system", "idle", NULL ++}; ++#endif ++ ++#ifdef __Linux26__ ++#define CPUSTATES 7 ++#define IDLEI 3 ++/* long names: ++ * user - nice - system - idle - iowait - irq - soft irq */ ++char *cpustatenames[] = { ++ "user", "nice", "system", "idle", "iowait", "irq", "softirq", NULL ++}; ++#endif ++ ++#define LIMIT 95 ++ ++static const char usage[] = ++ "\n usage: cpusage [ -hos ] [ -a | -l limit ] [ -c CPU ]\n"; ++ ++char* appname; ++ ++static float cpu_perc[CPUSTATES]; ++static float cpu_max[CPUSTATES]; ++static float cpu_min[CPUSTATES]; ++ ++int cpunum; /* -1 all, 0-n CPU/Core 0-n */ ++ ++int output; ++ ++int breakloop; ++ ++/* returns 1-n yielding the number of CPU's/Cores */ ++int getNumCPU() ++{ ++#ifdef __FreeBSD__ ++ return 0; ++#else ++ ++ char buffer[32768]; ++ int fd, len, i; ++ char * test; ++ ++ fd = open("/proc/stat", O_RDONLY); ++ if(fd<=0) ++ fprintf(stderr, "%s: cannot open /proc/stat \n", appname); ++ ++ len = read(fd, buffer, sizeof(buffer)-1); ++ close(fd); ++ buffer[len] = '\0'; ++ ++ i=0; ++ ++ test = strstr(buffer, "cpu"); ++ if (test != NULL ) { ++ test += sizeof("cpu"); ++ test = strstr(test, "cpu"); ++ } ++ ++ while ( test != NULL ) { ++ test += sizeof("cpu"); ++ /* fprintf(stderr, "%s: DEBUG: %s\n", appname, test); */ ++ i++; ++ test = strstr(test, "cpu"); ++ } ++ return i; ++#endif ++} ++ ++#ifdef __FreeBSD__ ++static void getsysctl (char *name, void *ptr, size_t len) { ++ size_t nlen = len; ++ long save; ++ ++ if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) { ++ fprintf(stderr, "%s: sysctl(%s...) failed: %s\n", ++ appname, name, strerror(errno)); ++ exit(1); ++ } ++ if (nlen != len) { ++ fprintf(stderr, "%s: sysctl(%s...) expected %lu, got %lu\n", ++ appname, name, (unsigned long)len, (unsigned long)nlen); ++ exit(1); ++ } ++ ++ /* swapping idle and interrupt to look like linux */ ++ save = ((long*) ptr)[4]; ++ ((long*) ptr)[4] = ((long*) ptr)[3]; ++ ((long*) ptr)[3] = save; ++} ++#else ++void getSysinfo(unsigned long *ptr, size_t size) ++{ ++ char buffer[4096]; ++ char match[100]; ++ char * start; ++ int fd, len, j; ++ ++ for (j = 0; j cpu_max[i] ) ++ cpu_max[i] = cpu_perc[i]; ++ /* new min ? */ ++ if ( cpu_perc[i] < cpu_min[i] ) ++ cpu_min[i] = cpu_perc[i]; ++ } ++ ++ return total; ++} ++ ++void print_perc(float *perc, const char *head){ ++ int i; ++ time_t Zeitstempel; ++ struct tm *now; ++ ++ /* human readable */ ++ if ( (output == 0) && (head != "")) ++ printf("%s: ", head); ++ ++ /* machine readable */ ++ if ( (output == 1) && (head != "")) ++ printf("%s;", head); ++ ++ /* timestamp */ ++ time(&Zeitstempel); ++ now = localtime(&Zeitstempel); ++ if ( output == 0 ) ++ printf("timestamp: %04d-%02d-%02d %02d.%02d.%02d, ", now->tm_year+1900, now->tm_mon+1, now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec); ++ else ++ printf("%04d-%02d-%02d;%02d:%02d:%02d;", now->tm_year+1900, now->tm_mon+1, now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec); ++ ++ if ( output == 0 ) ++ printf("%s: %5.1f%%, ", cpustatenames[0], perc[0]); ++ else ++ printf("%.1f", perc[0]); ++ ++ /* print out calculated information in percentages */ ++ for ( i = 1; i < CPUSTATES; i++) { ++ if ( output == 0 ) ++ printf("%s: %5.1f%%, ", cpustatenames[i], perc[i]); ++ else ++ printf(";%.1f", perc[i]); ++ } ++ printf("\n"); ++} ++ ++/* to catch Strg+C when looping */ ++void loop_term_handler (int signum) { ++ breakloop = 1; ++} ++ ++int main(int argc, char** argv) { ++ ++ appname = argv[0]; ++ ++ int i,c,limit; ++ int runonce; /* run just once and exit */ ++ int avg; /* is avg measurement allready running */ ++ int avg_run; /* did we allready had an avg measurement */ ++ static long cp_time1[CPUSTATES]; ++ static long cp_time2[CPUSTATES]; ++ static long cp_avg_start[CPUSTATES]; ++ static long cp_avg_stop[CPUSTATES]; ++ static long cp_diff[CPUSTATES]; ++ ++ struct sigaction sigold, signew; ++ ++ long *old = cp_time2; ++ long *new = cp_time1; ++ ++ long total; ++ limit = LIMIT; ++ output = 0; /* 0: human readable; 1: machine readable */ ++ runonce = 0; /* 0: run continuesly; 1: run once */ ++ ++ cpunum = -1; /* -1: all CPUs/Cores, 0-n: special CPU/Core */ ++ ++ /* reading commandline options */ ++ while (1) { ++ c = getopt(argc, argv, "saohl:c:"); ++ ++ if (c == -1){ ++ break; ++ } ++ ++ switch(c){ ++ /*run once and exit */ ++ case 's': ++ runonce = 1; ++ break; ++ /* use avg from begin to end -> same as "-l 100" */ ++ case 'a': ++ limit = 100; ++ break; ++ case 'o': ++ output = 1; /* machine readable */ ++ // header for CSV output ++ printf("date;time;user;nice;system;idle;iowait;irq;softirq\n"); ++ break; ++ /* print usage */ ++ case 'h': ++ fprintf(stderr, "%s: %s", appname, usage); ++ exit(0); ++ break; ++ /* set limit */ ++ case 'l': ++ if ( !(sscanf(optarg, "%d", &limit) == 1) ) { ++ fprintf(stderr, "%s: option for -l should be integer (is %s)\n", ++ appname, optarg); ++ exit(1); ++ } ++ break; ++ /* select CPU/Core */ ++ case 'c': ++ if ( !(sscanf(optarg, "%d", &cpunum) == 1) ) { ++ fprintf(stderr, "%s: option for -c should be integer (is %s)\n", ++ appname, optarg); ++ exit(1); ++ } ++ break; ++ ++ } ++ } ++ ++ if (cpunum != -1) { ++#ifdef __FreeBSD__ ++ fprintf(stderr, "%s: No CPU/Core selection available for FreeBSD\n", ++ appname); ++ exit (1); ++#else ++ int numcpu = getNumCPU(); ++ if ( cpunum < numcpu ) { ++ printf("-- Selected CPU %d\n", cpunum ); ++ } else { ++ if (numcpu == 1) { ++ fprintf(stderr, "%s: CPU %d not available (found %d CPU: [0])\n", ++ appname, cpunum, numcpu ); ++ } else { ++ fprintf(stderr, "%s: CPU %d not available (found %d CPU's: [0]-[%d])\n ", ++ appname, cpunum, numcpu, numcpu - 1 ); ++ } ++ exit(1); ++ } ++ ++#endif ++ } ++ ++ breakloop = 0; ++ ++ for (i=0; i < CPUSTATES; i++){ ++ cpu_max[i] = 0; ++ cpu_min[i] = 100; ++ } ++ ++ /* get information */ ++#ifdef __FreeBSD__ ++ getsysctl("kern.cp_time", new, sizeof(cp_time1)); ++#else ++ getSysinfo((unsigned long*)new, CPUSTATES); ++#endif ++ ++ /* catch Strg+C when capturing to call pcap_breakloop() */ ++ memset(&signew, 0, sizeof(signew)); ++ signew.sa_handler = loop_term_handler; ++ if (sigaction(SIGINT, &signew, &sigold) < 0 ){ ++ fprintf(stderr, "Could not set signal handler -> exiting"); ++ } ++ ++ avg = 0; ++ avg_run = 0; ++ ++ if ( runonce ) { ++ breakloop=1; ++ } ++ ++ while(1) { ++ usleep( 1000000 ); ++ ++ if ( new == cp_time1 ) { ++ new = cp_time2; ++ old = cp_time1; ++ } else{ ++ new = cp_time1; ++ old = cp_time2; ++ } ++ ++ /* get information again */ ++#ifdef __FreeBSD__ ++ getsysctl("kern.cp_time", new, sizeof(cp_time1)); ++#else ++ getSysinfo((unsigned long*)new, CPUSTATES); ++#endif ++ ++ /* convert cp_time counts to percentages */ ++ total = perc(CPUSTATES, new, old, cp_diff); ++ ++ /* check for avg measurement start */ ++ if ( !avg_run && !avg && (cpu_perc[IDLEI] <= limit) ){ ++ avg = 1; ++ for ( i = 0; i < CPUSTATES; i++ ) ++ cp_avg_start[i] = new[i]; ++ } ++ ++ /* check for avg measurement stop */ ++ if ( !avg_run && avg && (cpu_perc[IDLEI] > limit) ){ ++ avg = 0; ++ for ( i = 0; i < CPUSTATES; i++ ) ++ cp_avg_stop[i] = new[i]; ++ avg_run = 1; ++ } ++ ++ print_perc(cpu_perc, ""); ++ ++ if (breakloop) { ++ if (avg) { ++ avg = 0; ++ for ( i = 0; i < CPUSTATES; i++ ) ++ cp_avg_stop[i] = new[i]; ++ } ++ break; ++ } ++ } ++ ++ /* Set default behaviour when loop is done */ ++ if (sigaction(SIGINT, &sigold, &signew) < 0 ){ ++ fprintf(stderr, "%s: Could not restore signal handler -> exiting", appname); ++ } ++ ++ if ( ! runonce && output == 0) { ++ // print avg only when not making a one-shot msg and ++ // when not writing CSV output ++ printf("---Summary----\n"); ++ ++ print_perc(cpu_min, "Min"); ++ ++ print_perc(cpu_max, "Max"); ++ ++ perc(CPUSTATES, cp_avg_start, cp_avg_stop, cp_diff); ++ ++ print_perc(cpu_perc, "Avg"); ++ } ++ ++ return 0; ++} ++ ++ ++ +diff --git a/feeds/packages/utils/cpusage/src/cpusage.c b/feeds/packages/utils/cpusage/src/cpusage.c +new file mode 100644 +index 0000000..a027e4f +--- /dev/null ++++ b/feeds/packages/utils/cpusage/src/cpusage.c +@@ -0,0 +1,426 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef __FreeBSD__ ++#include ++#else ++#include ++#include ++#include ++#endif ++ ++#ifdef __FreeBSD__ ++static void getsysctl(char *, void *, size_t); ++#define CPUSTATES 5 ++#define IDLEI 3 ++char *cpustatenames[] = { ++ "user", "nice", "system", "idle", "interrupt", NULL ++}; ++#endif ++ ++#ifdef __Linux24__ ++#define CPUSTATES 4 ++#define IDLEI 3 ++char *cpustatenames[] = { ++ "user", "nice", "system", "idle", NULL ++}; ++#endif ++ ++#ifdef __Linux26__ ++#define CPUSTATES 7 ++#define IDLEI 3 ++/* long names: ++ * user - nice - system - idle - iowait - irq - soft irq */ ++char *cpustatenames[] = { ++ "user", "nice", "system", "idle", "iowait", "irq", "softirq", NULL ++}; ++#endif ++ ++#define LIMIT 95 ++ ++static const char usage[] = ++ "\n usage: cpusage [ -hos ] [ -a | -l limit ] [ -c CPU ]\n"; ++ ++char* appname; ++ ++static float cpu_perc[CPUSTATES]; ++static float cpu_max[CPUSTATES]; ++static float cpu_min[CPUSTATES]; ++ ++int cpunum; /* -1 all, 0-n CPU/Core 0-n */ ++ ++int output; ++ ++int breakloop; ++ ++/* returns 1-n yielding the number of CPU's/Cores */ ++int getNumCPU() ++{ ++#ifdef __FreeBSD__ ++ return 0; ++#else ++ ++ char buffer[32768]; ++ int fd, len, i; ++ char * test; ++ ++ fd = open("/proc/stat", O_RDONLY); ++ if(fd<=0) ++ fprintf(stderr, "%s: cannot open /proc/stat \n", appname); ++ ++ len = read(fd, buffer, sizeof(buffer)-1); ++ close(fd); ++ buffer[len] = '\0'; ++ ++ i=0; ++ ++ test = strstr(buffer, "cpu"); ++ if (test != NULL ) { ++ test += sizeof("cpu"); ++ test = strstr(test, "cpu"); ++ } ++ ++ while ( test != NULL ) { ++ test += sizeof("cpu"); ++ /* fprintf(stderr, "%s: DEBUG: %s\n", appname, test); */ ++ i++; ++ test = strstr(test, "cpu"); ++ } ++ return i; ++#endif ++} ++ ++#ifdef __FreeBSD__ ++static void getsysctl (char *name, void *ptr, size_t len) { ++ size_t nlen = len; ++ long save; ++ ++ if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) { ++ fprintf(stderr, "%s: sysctl(%s...) failed: %s\n", ++ appname, name, strerror(errno)); ++ exit(1); ++ } ++ if (nlen != len) { ++ fprintf(stderr, "%s: sysctl(%s...) expected %lu, got %lu\n", ++ appname, name, (unsigned long)len, (unsigned long)nlen); ++ exit(1); ++ } ++ ++ /* swapping idle and interrupt to look like linux */ ++ save = ((long*) ptr)[4]; ++ ((long*) ptr)[4] = ((long*) ptr)[3]; ++ ((long*) ptr)[3] = save; ++} ++#else ++void getSysinfo(unsigned long *ptr, size_t size) ++{ ++ char buffer[4096]; ++ char match[100]; ++ char * start; ++ int fd, len, j; ++ ++ for (j = 0; j cpu_max[i] ) ++ cpu_max[i] = cpu_perc[i]; ++ /* new min ? */ ++ if ( cpu_perc[i] < cpu_min[i] ) ++ cpu_min[i] = cpu_perc[i]; ++ } ++ ++ return total; ++} ++ ++void print_perc(float *perc, const char *head){ ++ int i; ++ time_t Zeitstempel; ++ struct tm *now; ++ ++ /* human readable */ ++ if ( (output == 0) && (head != "")) ++ printf("%s: ", head); ++ ++ /* machine readable */ ++ if ( (output == 1) && (head != "")) ++ printf("%s;", head); ++ ++ /* timestamp */ ++ time(&Zeitstempel); ++ now = localtime(&Zeitstempel); ++ if ( output == 0 ) ++ printf("timestamp: %04d-%02d-%02d %02d.%02d.%02d, ", now->tm_year+1900, now->tm_mon+1, now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec); ++ else ++ printf("%04d-%02d-%02d;%02d:%02d:%02d;", now->tm_year+1900, now->tm_mon+1, now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec); ++ ++ if ( output == 0 ) ++ printf("%s: %5.1f%%, ", cpustatenames[0], perc[0]); ++ else ++ printf("%.1f", perc[0]); ++ ++ /* print out calculated information in percentages */ ++ for ( i = 1; i < CPUSTATES; i++) { ++ if ( output == 0 ) ++ printf("%s: %5.1f%%, ", cpustatenames[i], perc[i]); ++ else ++ printf(";%.1f", perc[i]); ++ } ++ printf("\n"); ++} ++ ++/* to catch Strg+C when looping */ ++void loop_term_handler (int signum) { ++ breakloop = 1; ++} ++ ++int main(int argc, char** argv) { ++ ++ appname = argv[0]; ++ ++ int i,c,limit; ++ int runonce; /* run just once and exit */ ++ int avg; /* is avg measurement allready running */ ++ int avg_run; /* did we allready had an avg measurement */ ++ static long cp_time1[CPUSTATES]; ++ static long cp_time2[CPUSTATES]; ++ static long cp_avg_start[CPUSTATES]; ++ static long cp_avg_stop[CPUSTATES]; ++ static long cp_diff[CPUSTATES]; ++ ++ struct sigaction sigold, signew; ++ ++ long *old = cp_time2; ++ long *new = cp_time1; ++ ++ long total; ++ limit = LIMIT; ++ output = 0; /* 0: human readable; 1: machine readable */ ++ runonce = 0; /* 0: run continuesly; 1: run once */ ++ ++ cpunum = -1; /* -1: all CPUs/Cores, 0-n: special CPU/Core */ ++ ++ /* reading commandline options */ ++ while (1) { ++ c = getopt(argc, argv, "saohl:c:"); ++ ++ if (c == -1){ ++ break; ++ } ++ ++ switch(c){ ++ /*run once and exit */ ++ case 's': ++ runonce = 1; ++ break; ++ /* use avg from begin to end -> same as "-l 100" */ ++ case 'a': ++ limit = 100; ++ break; ++ case 'o': ++ output = 1; /* machine readable */ ++ // header for CSV output ++ printf("date;time;user;nice;system;idle;iowait;irq;softirq\n"); ++ break; ++ /* print usage */ ++ case 'h': ++ fprintf(stderr, "%s: %s", appname, usage); ++ exit(0); ++ break; ++ /* set limit */ ++ case 'l': ++ if ( !(sscanf(optarg, "%d", &limit) == 1) ) { ++ fprintf(stderr, "%s: option for -l should be integer (is %s)\n", ++ appname, optarg); ++ exit(1); ++ } ++ break; ++ /* select CPU/Core */ ++ case 'c': ++ if ( !(sscanf(optarg, "%d", &cpunum) == 1) ) { ++ fprintf(stderr, "%s: option for -c should be integer (is %s)\n", ++ appname, optarg); ++ exit(1); ++ } ++ break; ++ ++ } ++ } ++ ++ if (cpunum != -1) { ++#ifdef __FreeBSD__ ++ fprintf(stderr, "%s: No CPU/Core selection available for FreeBSD\n", ++ appname); ++ exit (1); ++#else ++ int numcpu = getNumCPU(); ++ if ( cpunum < numcpu ) { ++ printf("-- Selected CPU %d\n", cpunum ); ++ } else { ++ if (numcpu == 1) { ++ fprintf(stderr, "%s: CPU %d not available (found %d CPU: [0])\n", ++ appname, cpunum, numcpu ); ++ } else { ++ fprintf(stderr, "%s: CPU %d not available (found %d CPU's: [0]-[%d])\n ", ++ appname, cpunum, numcpu, numcpu - 1 ); ++ } ++ exit(1); ++ } ++ ++#endif ++ } ++ ++ breakloop = 0; ++ ++ for (i=0; i < CPUSTATES; i++){ ++ cpu_max[i] = 0; ++ cpu_min[i] = 100; ++ } ++ ++ /* get information */ ++#ifdef __FreeBSD__ ++ getsysctl("kern.cp_time", new, sizeof(cp_time1)); ++#else ++ getSysinfo((unsigned long*)new, CPUSTATES); ++#endif ++ ++ /* catch Strg+C when capturing to call pcap_breakloop() */ ++ memset(&signew, 0, sizeof(signew)); ++ signew.sa_handler = loop_term_handler; ++ if (sigaction(SIGINT, &signew, &sigold) < 0 ){ ++ fprintf(stderr, "Could not set signal handler -> exiting"); ++ } ++ ++ avg = 0; ++ avg_run = 0; ++ ++ if ( runonce ) { ++ breakloop=1; ++ } ++ ++ while(1) { ++ usleep( 1000000 ); ++ ++ if ( new == cp_time1 ) { ++ new = cp_time2; ++ old = cp_time1; ++ } else{ ++ new = cp_time1; ++ old = cp_time2; ++ } ++ ++ /* get information again */ ++#ifdef __FreeBSD__ ++ getsysctl("kern.cp_time", new, sizeof(cp_time1)); ++#else ++ getSysinfo((unsigned long*)new, CPUSTATES); ++#endif ++ ++ /* convert cp_time counts to percentages */ ++ total = perc(CPUSTATES, new, old, cp_diff); ++ ++ /* check for avg measurement start */ ++ if ( !avg_run && !avg && (cpu_perc[IDLEI] <= limit) ){ ++ avg = 1; ++ for ( i = 0; i < CPUSTATES; i++ ) ++ cp_avg_start[i] = new[i]; ++ } ++ ++ /* check for avg measurement stop */ ++ if ( !avg_run && avg && (cpu_perc[IDLEI] > limit) ){ ++ avg = 0; ++ for ( i = 0; i < CPUSTATES; i++ ) ++ cp_avg_stop[i] = new[i]; ++ avg_run = 1; ++ } ++ ++ print_perc(cpu_perc, ""); ++ ++ if (breakloop) { ++ if (avg) { ++ avg = 0; ++ for ( i = 0; i < CPUSTATES; i++ ) ++ cp_avg_stop[i] = new[i]; ++ } ++ break; ++ } ++ } ++ ++ /* Set default behaviour when loop is done */ ++ if (sigaction(SIGINT, &sigold, &signew) < 0 ){ ++ fprintf(stderr, "%s: Could not restore signal handler -> exiting", appname); ++ } ++ ++ if ( ! runonce && output == 0) { ++ // print avg only when not making a one-shot msg and ++ // when not writing CSV output ++ printf("---Summary----\n"); ++ ++ print_perc(cpu_min, "Min"); ++ ++ print_perc(cpu_max, "Max"); ++ ++ perc(CPUSTATES, cp_avg_start, cp_avg_stop, cp_diff); ++ ++ print_perc(cpu_perc, "Avg"); ++ } ++ ++ return 0; ++} ++ ++ ++ +diff --git a/feeds/packages/utils/crypto-tools/.svn/entries b/feeds/packages/utils/crypto-tools/.svn/entries +new file mode 100644 +index 0000000..70c0827 +--- /dev/null ++++ b/feeds/packages/utils/crypto-tools/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/crypto-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-07-04T21:19:24.784976Z ++22066 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++4f4c276fa8f6acbe97a2cfa12ea2dafa ++2010-07-04T21:19:24.784976Z ++22066 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++929 ++ +diff --git a/feeds/packages/utils/crypto-tools/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/crypto-tools/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/crypto-tools/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/crypto-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/crypto-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1bfcde4 +--- /dev/null ++++ b/feeds/packages/utils/crypto-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=crypto-tools ++PKG_VERSION:=20100325 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ocf-linux ++PKG_MD5SUM:=51e0ef8918a8cf15f78f0631341d826c ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_DEPENDS:=libopenssl ocf-crypto-headers ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/crypto-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libopenssl ++ TITLE:=OCF-Linux's crypto-tools ++ URL:=http://ocf-linux.sourceforge.net/ ++endef ++ ++define Package/crypto-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cryptotest $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cryptokeytest $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,crypto-tools)) +diff --git a/feeds/packages/utils/crypto-tools/Makefile b/feeds/packages/utils/crypto-tools/Makefile +new file mode 100644 +index 0000000..1bfcde4 +--- /dev/null ++++ b/feeds/packages/utils/crypto-tools/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=crypto-tools ++PKG_VERSION:=20100325 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ocf-linux ++PKG_MD5SUM:=51e0ef8918a8cf15f78f0631341d826c ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_DEPENDS:=libopenssl ocf-crypto-headers ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/crypto-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libopenssl ++ TITLE:=OCF-Linux's crypto-tools ++ URL:=http://ocf-linux.sourceforge.net/ ++endef ++ ++define Package/crypto-tools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cryptotest $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cryptokeytest $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,crypto-tools)) +diff --git a/feeds/packages/utils/cryptsetup/.svn/entries b/feeds/packages/utils/cryptsetup/.svn/entries +new file mode 100644 +index 0000000..f98e1ad +--- /dev/null ++++ b/feeds/packages/utils/cryptsetup/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cryptsetup ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-28T13:45:14.308221Z ++35343 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9dbfc289a913e88ebf59e8cf9b1646d3 ++2013-01-28T13:45:14.308221Z ++35343 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1237 ++ +diff --git a/feeds/packages/utils/cryptsetup/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/cryptsetup/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e8c0fc4 +--- /dev/null ++++ b/feeds/packages/utils/cryptsetup/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=cryptsetup ++PKG_VERSION:=1.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://cryptsetup.googlecode.com/files/ ++PKG_MD5SUM:=9253b3f29abf5c6f333eb74128b0df1c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/cryptsetup/Default ++ URL:=http://code.google.com/p/cryptsetup/ ++endef ++ ++define Package/cryptsetup ++$(call Package/cryptsetup/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Cryptsetup ++ DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libgcrypt +libdevmapper +@KERNEL_DIRECT_IO ++endef ++ ++define Package/cryptsetup/description ++ Cryptsetup-luks ++endef ++ ++define Build/Compile ++ $(call Build/Configure/Default) ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Package/cryptsetup/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cryptsetup $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptsetup.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,cryptsetup)) +diff --git a/feeds/packages/utils/cryptsetup/Makefile b/feeds/packages/utils/cryptsetup/Makefile +new file mode 100644 +index 0000000..e8c0fc4 +--- /dev/null ++++ b/feeds/packages/utils/cryptsetup/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=cryptsetup ++PKG_VERSION:=1.4.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://cryptsetup.googlecode.com/files/ ++PKG_MD5SUM:=9253b3f29abf5c6f333eb74128b0df1c ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Package/cryptsetup/Default ++ URL:=http://code.google.com/p/cryptsetup/ ++endef ++ ++define Package/cryptsetup ++$(call Package/cryptsetup/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Cryptsetup ++ DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libgcrypt +libdevmapper +@KERNEL_DIRECT_IO ++endef ++ ++define Package/cryptsetup/description ++ Cryptsetup-luks ++endef ++ ++define Build/Compile ++ $(call Build/Configure/Default) ++ $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Package/cryptsetup/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cryptsetup $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptsetup.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,cryptsetup)) +diff --git a/feeds/packages/utils/cwiid/.svn/entries b/feeds/packages/utils/cwiid/.svn/entries +new file mode 100644 +index 0000000..acc3594 +--- /dev/null ++++ b/feeds/packages/utils/cwiid/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cwiid ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:23.886856Z ++32315 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++4bd394c924441b0a19808ca5f23b905b ++2012-06-13T00:22:23.886856Z ++32315 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2557 ++ +diff --git a/feeds/packages/utils/cwiid/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/cwiid/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4a79f9d +--- /dev/null ++++ b/feeds/packages/utils/cwiid/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,108 @@ ++# ++# 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:=cwiid ++PKG_VERSION:=0.6.00 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://abstrakraft.org/cwiid/downloads/ ++PKG_SOURCE_VERSION:=2100f14c612471084434b364501e3818c7f4144e ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/cwiid/Default ++ TITLE:=Linux Nintendo Wiimote interface ++ URL:=http://abstrakraft.org/cwiid/ ++endef ++ ++define Package/libcwiid ++$(call Package/cwiid/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++ DEPENDS+= +bluez-libs +libpthread +librt ++endef ++ ++define Package/wminput ++$(call Package/cwiid/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= (utility) ++ DEPENDS+= +libcwiid ++endef ++ ++define Package/python-cwiid ++$(call Package/cwiid/Default) ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Python bindings for the cwiid libs ++ DEPENDS:= +python-mini +libcwiid ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-python \ ++ --disable-ldconfig \ ++ --enable-shared \ ++ --enable-static \ ++ ++TARGET_CFLAGS += $(FPIC) ++TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/libcwiid/ ++TARGET_LDFLAGS += -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ ( cd $(PKG_BUILD_DIR) ; \ ++ autoconf ; \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -L../libcwiid/" \ ++ all ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,./python/, \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/libcwiid/*.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libcwiid/*.so $(1)/usr/lib/ ++endef ++ ++define Package/libcwiid/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libcwiid/libcwiid.so.1.0 $(1)/usr/lib/ ++endef ++ ++define Package/wminput/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/wminput/wminput $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/lswm/lswm $(1)/usr/bin/ ++endef ++ ++define PyPackage/python-cwiid/filespec +++|$(PYTHON_PKG_DIR)/cwiid.so ++endef ++ ++$(eval $(call BuildPackage,libcwiid)) ++$(eval $(call BuildPackage,wminput)) ++$(eval $(call PyPackage,python-cwiid)) ++$(eval $(call BuildPackage,python-cwiid)) +diff --git a/feeds/packages/utils/cwiid/Makefile b/feeds/packages/utils/cwiid/Makefile +new file mode 100644 +index 0000000..4a79f9d +--- /dev/null ++++ b/feeds/packages/utils/cwiid/Makefile +@@ -0,0 +1,108 @@ ++# ++# 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:=cwiid ++PKG_VERSION:=0.6.00 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://abstrakraft.org/cwiid/downloads/ ++PKG_SOURCE_VERSION:=2100f14c612471084434b364501e3818c7f4144e ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/cwiid/Default ++ TITLE:=Linux Nintendo Wiimote interface ++ URL:=http://abstrakraft.org/cwiid/ ++endef ++ ++define Package/libcwiid ++$(call Package/cwiid/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= (library) ++ DEPENDS+= +bluez-libs +libpthread +librt ++endef ++ ++define Package/wminput ++$(call Package/cwiid/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE+= (utility) ++ DEPENDS+= +libcwiid ++endef ++ ++define Package/python-cwiid ++$(call Package/cwiid/Default) ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Python bindings for the cwiid libs ++ DEPENDS:= +python-mini +libcwiid ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-python \ ++ --disable-ldconfig \ ++ --enable-shared \ ++ --enable-static \ ++ ++TARGET_CFLAGS += $(FPIC) ++TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/libcwiid/ ++TARGET_LDFLAGS += -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ ( cd $(PKG_BUILD_DIR) ; \ ++ autoconf ; \ ++ ) ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ OFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS) -L../libcwiid/" \ ++ all ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,./python/, \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/libcwiid/*.h $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libcwiid/*.so $(1)/usr/lib/ ++endef ++ ++define Package/libcwiid/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/libcwiid/libcwiid.so.1.0 $(1)/usr/lib/ ++endef ++ ++define Package/wminput/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/wminput/wminput $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/lswm/lswm $(1)/usr/bin/ ++endef ++ ++define PyPackage/python-cwiid/filespec +++|$(PYTHON_PKG_DIR)/cwiid.so ++endef ++ ++$(eval $(call BuildPackage,libcwiid)) ++$(eval $(call BuildPackage,wminput)) ++$(eval $(call PyPackage,python-cwiid)) ++$(eval $(call BuildPackage,python-cwiid)) +diff --git a/feeds/packages/utils/cwiid/patches/.svn/entries b/feeds/packages/utils/cwiid/patches/.svn/entries +new file mode 100644 +index 0000000..361f262 +--- /dev/null ++++ b/feeds/packages/utils/cwiid/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/cwiid/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-06-20T18:06:06.481352Z ++21855 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-dump_gtk_wmdemo.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3ffc5bfe2ac140d8d2549da757a3274e ++2010-06-20T18:06:06.481352Z ++21855 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2310 ++ +diff --git a/feeds/packages/utils/cwiid/patches/.svn/text-base/100-dump_gtk_wmdemo.patch.svn-base b/feeds/packages/utils/cwiid/patches/.svn/text-base/100-dump_gtk_wmdemo.patch.svn-base +new file mode 100644 +index 0000000..ebfdeeb +--- /dev/null ++++ b/feeds/packages/utils/cwiid/patches/.svn/text-base/100-dump_gtk_wmdemo.patch.svn-base +@@ -0,0 +1,69 @@ ++Index: cwiid-0.6.00/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/Makefile.in 2010-06-20 19:32:38.000000000 +0200 +++++ cwiid-0.6.00/Makefile.in 2010-06-20 19:32:46.000000000 +0200 ++@@ -3,7 +3,7 @@ ++ include @top_builddir@/defs.mak ++ ++ LIB_DIRS = libcwiid ++-BIN_DIRS = wmgui wminput lswm +++BIN_DIRS = wminput lswm ++ DOC_DIRS = man doc ++ ifdef PYTHON ++ BIND_DIRS = python ++Index: cwiid-0.6.00/configure.ac ++=================================================================== ++--- cwiid-0.6.00.orig/configure.ac 2010-06-20 19:31:22.000000000 +0200 +++++ cwiid-0.6.00/configure.ac 2010-06-20 19:31:35.000000000 +0200 ++@@ -124,11 +124,6 @@ ++ fi ++ AC_SUBST(LDCONFIG) ++ ++-pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" ++-PKG_CHECK_MODULES([GTK], [$pkg_modules]) ++-AC_SUBST(GTK_CFLAGS) ++-AC_SUBST(GTK_LIBS) ++- ++ AC_OUTPUT( ++ [Makefile] ++ [defs.mak] ++Index: cwiid-0.6.00/wminput/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/wminput/Makefile.in 2010-06-20 19:47:06.000000000 +0200 +++++ cwiid-0.6.00/wminput/Makefile.in 2010-06-20 19:47:13.000000000 +0200 ++@@ -14,7 +14,7 @@ ++ -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \ ++ -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" ++ ++-LDLIBS += -lcwiid -ldl +++LDLIBS += -lcwiid -ldl -lbluetooth ++ LDFLAGS += -L@top_builddir@/libcwiid -rdynamic ++ INST_DIR = @bindir@ ++ ++Index: cwiid-0.6.00/lswm/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/lswm/Makefile.in 2010-06-20 19:50:13.000000000 +0200 +++++ cwiid-0.6.00/lswm/Makefile.in 2010-06-20 19:50:22.000000000 +0200 ++@@ -8,7 +8,7 @@ ++ ++ CFLAGS += -I@top_builddir@/libcwiid ++ LDFLAGS += -L@top_builddir@/libcwiid ++-LDLIBS += -lcwiid +++LDLIBS += -lcwiid -lbluetooth ++ INST_DIR = @bindir@ ++ ++ include $(COMMON)/include/app.mak ++Index: cwiid-0.6.00/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/Makefile.in 2010-06-20 19:53:45.000000000 +0200 +++++ cwiid-0.6.00/Makefile.in 2010-06-20 19:53:54.000000000 +0200 ++@@ -9,7 +9,7 @@ ++ BIND_DIRS = python ++ endif ++ ++-SUB_DIRS = $(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) $(BIND_DIRS) wmdemo +++SUB_DIRS = $(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) $(BIND_DIRS) ++ ++ all install clean distclean uninstall: TARGET += $(MAKECMDGOALS) ++ ++ +diff --git a/feeds/packages/utils/cwiid/patches/100-dump_gtk_wmdemo.patch b/feeds/packages/utils/cwiid/patches/100-dump_gtk_wmdemo.patch +new file mode 100644 +index 0000000..ebfdeeb +--- /dev/null ++++ b/feeds/packages/utils/cwiid/patches/100-dump_gtk_wmdemo.patch +@@ -0,0 +1,69 @@ ++Index: cwiid-0.6.00/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/Makefile.in 2010-06-20 19:32:38.000000000 +0200 +++++ cwiid-0.6.00/Makefile.in 2010-06-20 19:32:46.000000000 +0200 ++@@ -3,7 +3,7 @@ ++ include @top_builddir@/defs.mak ++ ++ LIB_DIRS = libcwiid ++-BIN_DIRS = wmgui wminput lswm +++BIN_DIRS = wminput lswm ++ DOC_DIRS = man doc ++ ifdef PYTHON ++ BIND_DIRS = python ++Index: cwiid-0.6.00/configure.ac ++=================================================================== ++--- cwiid-0.6.00.orig/configure.ac 2010-06-20 19:31:22.000000000 +0200 +++++ cwiid-0.6.00/configure.ac 2010-06-20 19:31:35.000000000 +0200 ++@@ -124,11 +124,6 @@ ++ fi ++ AC_SUBST(LDCONFIG) ++ ++-pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" ++-PKG_CHECK_MODULES([GTK], [$pkg_modules]) ++-AC_SUBST(GTK_CFLAGS) ++-AC_SUBST(GTK_LIBS) ++- ++ AC_OUTPUT( ++ [Makefile] ++ [defs.mak] ++Index: cwiid-0.6.00/wminput/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/wminput/Makefile.in 2010-06-20 19:47:06.000000000 +0200 +++++ cwiid-0.6.00/wminput/Makefile.in 2010-06-20 19:47:13.000000000 +0200 ++@@ -14,7 +14,7 @@ ++ -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \ ++ -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" ++ ++-LDLIBS += -lcwiid -ldl +++LDLIBS += -lcwiid -ldl -lbluetooth ++ LDFLAGS += -L@top_builddir@/libcwiid -rdynamic ++ INST_DIR = @bindir@ ++ ++Index: cwiid-0.6.00/lswm/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/lswm/Makefile.in 2010-06-20 19:50:13.000000000 +0200 +++++ cwiid-0.6.00/lswm/Makefile.in 2010-06-20 19:50:22.000000000 +0200 ++@@ -8,7 +8,7 @@ ++ ++ CFLAGS += -I@top_builddir@/libcwiid ++ LDFLAGS += -L@top_builddir@/libcwiid ++-LDLIBS += -lcwiid +++LDLIBS += -lcwiid -lbluetooth ++ INST_DIR = @bindir@ ++ ++ include $(COMMON)/include/app.mak ++Index: cwiid-0.6.00/Makefile.in ++=================================================================== ++--- cwiid-0.6.00.orig/Makefile.in 2010-06-20 19:53:45.000000000 +0200 +++++ cwiid-0.6.00/Makefile.in 2010-06-20 19:53:54.000000000 +0200 ++@@ -9,7 +9,7 @@ ++ BIND_DIRS = python ++ endif ++ ++-SUB_DIRS = $(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) $(BIND_DIRS) wmdemo +++SUB_DIRS = $(LIB_DIRS) $(BIN_DIRS) $(DOC_DIRS) $(BIND_DIRS) ++ ++ all install clean distclean uninstall: TARGET += $(MAKECMDGOALS) ++ ++ +diff --git a/feeds/packages/utils/daemontools/.svn/entries b/feeds/packages/utils/daemontools/.svn/entries +new file mode 100644 +index 0000000..01a3038 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/daemontools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++85987d03a7c5d9a285df9476c438bfff ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1279 ++ +diff --git a/feeds/packages/utils/daemontools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/daemontools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e667ce4 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2007 OpenWrt.org ++# Original port by FreeWRT project. ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# Alexander Tsvyashchenko Created OpenWRT package as per Trac ticket 2497 ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=daemontools ++PKG_VERSION:=0.76 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz ++PKG_SOURCE_URL:=http://cr.yp.to/daemontools/ ++PKG_MD5SUM:=1871af2453d6e464034968a0fbcb2bfc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK += && mv $(PKG_BUILD_DIR)/../admin/* $(PKG_BUILD_DIR)/.. && rmdir $(PKG_BUILD_DIR)/../admin ++ ++define Package/daemontools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:= ++ TITLE:=Tools for managing UNIX services ++ URL:=http://cr.yp.to/daemontools.html ++endef ++ ++define Package/daemontools/description ++ Daemontools is a collection of tools for managing UNIX services by DJ Bernstein. ++endef ++ ++define Build/Compile ++ cd $(PKG_BUILD_DIR) && \ ++ TARGET_CC="$(TARGET_CC)" \ ++ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ ++ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ ++ $(PKG_BUILD_DIR)/package/compile ++endef ++ ++define Package/daemontools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/command/* $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,daemontools)) ++ +diff --git a/feeds/packages/utils/daemontools/Makefile b/feeds/packages/utils/daemontools/Makefile +new file mode 100644 +index 0000000..e667ce4 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/Makefile +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2007 OpenWrt.org ++# Original port by FreeWRT project. ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# Alexander Tsvyashchenko Created OpenWRT package as per Trac ticket 2497 ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=daemontools ++PKG_VERSION:=0.76 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz ++PKG_SOURCE_URL:=http://cr.yp.to/daemontools/ ++PKG_MD5SUM:=1871af2453d6e464034968a0fbcb2bfc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK += && mv $(PKG_BUILD_DIR)/../admin/* $(PKG_BUILD_DIR)/.. && rmdir $(PKG_BUILD_DIR)/../admin ++ ++define Package/daemontools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:= ++ TITLE:=Tools for managing UNIX services ++ URL:=http://cr.yp.to/daemontools.html ++endef ++ ++define Package/daemontools/description ++ Daemontools is a collection of tools for managing UNIX services by DJ Bernstein. ++endef ++ ++define Build/Compile ++ cd $(PKG_BUILD_DIR) && \ ++ TARGET_CC="$(TARGET_CC)" \ ++ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ ++ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ ++ $(PKG_BUILD_DIR)/package/compile ++endef ++ ++define Package/daemontools/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/command/* $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,daemontools)) ++ +diff --git a/feeds/packages/utils/daemontools/patches/.svn/entries b/feeds/packages/utils/daemontools/patches/.svn/entries +new file mode 100644 +index 0000000..387baed +--- /dev/null ++++ b/feeds/packages/utils/daemontools/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/daemontools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-05-05T09:54:30.037312Z ++15615 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++svscanboot.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8305ad3b27414a9c0a9ae4e2196d17ba ++2009-05-05T09:54:30.037312Z ++15615 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++940 ++ ++crosscompile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++55e6fafae8ef22b260e265a378290f7d ++2009-05-05T09:54:30.037312Z ++15615 ++markus ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7199 ++ +diff --git a/feeds/packages/utils/daemontools/patches/.svn/text-base/crosscompile.patch.svn-base b/feeds/packages/utils/daemontools/patches/.svn/text-base/crosscompile.patch.svn-base +new file mode 100644 +index 0000000..2abb466 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/patches/.svn/text-base/crosscompile.patch.svn-base +@@ -0,0 +1,205 @@ ++diff -urN daemontools-0.76/src/Makefile daemontools-0.76.new/src/Makefile ++--- daemontools-0.76/src/Makefile 2001-07-12 19:49:49.000000000 +0300 +++++ daemontools-0.76.new/src/Makefile 2007-09-30 16:27:25.000000000 +0300 ++@@ -101,9 +101,6 @@ ++ uint64.h ++ ./compile deepsleep.c ++ ++-direntry.h: choose compile direntry.h1 direntry.h2 trydrent.c ++- ./choose c trydrent direntry.h1 direntry.h2 > direntry.h ++- ++ env.o: compile env.c env.h str.h ++ ./compile env.c ++ ++@@ -151,29 +148,6 @@ ++ fmt_ulong.o: compile fmt.h fmt_ulong.c ++ ./compile fmt_ulong.c ++ ++-hasflock.h: choose compile hasflock.h1 hasflock.h2 load tryflock.c ++- ./choose cl tryflock hasflock.h1 hasflock.h2 > hasflock.h ++- ++-hasmkffo.h: choose compile hasmkffo.h1 hasmkffo.h2 load trymkffo.c ++- ./choose cl trymkffo hasmkffo.h1 hasmkffo.h2 > hasmkffo.h ++- ++-hassgact.h: choose compile hassgact.h1 hassgact.h2 load trysgact.c ++- ./choose cl trysgact hassgact.h1 hassgact.h2 > hassgact.h ++- ++-hassgprm.h: choose compile hassgprm.h1 hassgprm.h2 load trysgprm.c ++- ./choose cl trysgprm hassgprm.h1 hassgprm.h2 > hassgprm.h ++- ++-hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ ++-tryshsgr.c warn-shsgr ++- ./chkshsgr || ( cat warn-shsgr; exit 1 ) ++- ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h ++- ++-haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c ++- ./choose cl trywaitp haswaitp.h1 haswaitp.h2 > haswaitp.h ++- ++-iopause.h: choose compile iopause.h1 iopause.h2 load trypoll.c ++- ./choose clr trypoll iopause.h1 iopause.h2 > iopause.h ++- ++ iopause.o: compile iopause.c iopause.h select.h tai.h taia.h uint64.h ++ ./compile iopause.c ++ ++@@ -265,7 +239,6 @@ ++ rts: envdir envuidgid fghack matchtest multilog pgrphack \ ++ readproctitle rts.tests setlock setuidgid softlimit supervise svc \ ++ svok svscan svscanboot svstat tai64n tai64nlocal ++- env - /bin/sh rts.tests 2>&1 | cat -v > rts ++ ++ scan_ulong.o: compile scan.h scan_ulong.c ++ ./compile scan_ulong.c ++@@ -273,9 +246,6 @@ ++ seek_set.o: compile seek.h seek_set.c ++ ./compile seek_set.c ++ ++-select.h: choose compile select.h1 select.h2 trysysel.c ++- ./choose c trysysel select.h1 select.h2 > select.h ++- ++ setlock: byte.a load setlock.o unix.a ++ ./load setlock unix.a byte.a ++ ++@@ -478,9 +448,6 @@ ++ timestamp.o: compile tai.h taia.h timestamp.c timestamp.h uint64.h ++ ./compile timestamp.c ++ ++-uint64.h: choose compile load tryulong64.c uint64.h1 uint64.h2 ++- ./choose clr tryulong64 uint64.h1 uint64.h2 > uint64.h ++- ++ unix.a: alloc.o alloc_re.o buffer.o buffer_0.o buffer_1.o buffer_2.o \ ++ buffer_get.o buffer_put.o buffer_read.o buffer_write.o coe.o env.o \ ++ error.o error_str.o fd_copy.o fd_move.o fifo.o lock_ex.o lock_exnb.o \ ++diff -urN daemontools-0.76/src/conf-cc daemontools-0.76.new/src/conf-cc ++--- daemontools-0.76/src/conf-cc 2007-09-30 13:58:40.000000000 +0300 +++++ daemontools-0.76.new/src/conf-cc 2007-09-30 15:15:32.000000000 +0300 ++@@ -1,3 +1,3 @@ ++-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings +++$TARGET_CC $TARGET_CFLAGS -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h ++ ++ This will be used to compile .c files. ++diff -urN daemontools-0.76/src/conf-ld daemontools-0.76.new/src/conf-ld ++--- daemontools-0.76/src/conf-ld 2001-07-12 19:49:49.000000000 +0300 +++++ daemontools-0.76.new/src/conf-ld 2007-09-30 15:15:42.000000000 +0300 ++@@ -1,3 +1,3 @@ ++-gcc -s +++$TARGET_CC -s $TARGET_LDFLAGS ++ ++ This will be used to link .o files into an executable. ++diff -urN daemontools-0.76/src/direntry.h daemontools-0.76.new/src/direntry.h ++--- daemontools-0.76/src/direntry.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/direntry.h 2007-09-30 13:52:11.000000000 +0300 ++@@ -0,0 +1,12 @@ +++/* Public domain. */ +++ +++#ifndef DIRENTRY_H +++#define DIRENTRY_H +++ +++/* sysdep: +dirent */ +++ +++#include +++#include +++#define direntry struct dirent +++ +++#endif ++diff -urN daemontools-0.76/src/hasflock.h daemontools-0.76.new/src/hasflock.h ++--- daemontools-0.76/src/hasflock.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hasflock.h 2007-09-30 13:52:55.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +flock */ +++#define HASFLOCK 1 ++diff -urN daemontools-0.76/src/hasmkffo.h daemontools-0.76.new/src/hasmkffo.h ++--- daemontools-0.76/src/hasmkffo.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hasmkffo.h 2007-09-30 13:53:16.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +mkfifo */ +++#define HASMKFIFO 1 ++diff -urN daemontools-0.76/src/hassgact.h daemontools-0.76.new/src/hassgact.h ++--- daemontools-0.76/src/hassgact.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hassgact.h 2007-09-30 13:53:47.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +sigaction */ +++#define HASSIGACTION 1 ++diff -urN daemontools-0.76/src/hassgprm.h daemontools-0.76.new/src/hassgprm.h ++--- daemontools-0.76/src/hassgprm.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hassgprm.h 2007-09-30 13:54:13.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +sigprocmask */ +++#define HASSIGPROCMASK 1 ++diff -urN daemontools-0.76/src/hasshsgr.h daemontools-0.76.new/src/hasshsgr.h ++--- daemontools-0.76/src/hasshsgr.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hasshsgr.h 2007-09-30 13:54:41.000000000 +0300 ++@@ -0,0 +1,3 @@ +++/* Public domain. */ +++ +++/* sysdep: -shortsetgroups */ ++diff -urN daemontools-0.76/src/haswaitp.h daemontools-0.76.new/src/haswaitp.h ++--- daemontools-0.76/src/haswaitp.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/haswaitp.h 2007-09-30 13:54:57.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +waitpid */ +++#define HASWAITPID 1 ++diff -urN daemontools-0.76/src/iopause.h daemontools-0.76.new/src/iopause.h ++--- daemontools-0.76/src/iopause.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/iopause.h 2007-09-30 13:55:14.000000000 +0300 ++@@ -0,0 +1,20 @@ +++/* Public domain. */ +++ +++#ifndef IOPAUSE_H +++#define IOPAUSE_H +++ +++/* sysdep: +poll */ +++#define IOPAUSE_POLL +++ +++#include +++#include +++ +++typedef struct pollfd iopause_fd; +++#define IOPAUSE_READ POLLIN +++#define IOPAUSE_WRITE POLLOUT +++ +++#include "taia.h" +++ +++extern void iopause(iopause_fd *,unsigned int,struct taia *,struct taia *); +++ +++#endif ++diff -urN daemontools-0.76/src/select.h daemontools-0.76.new/src/select.h ++--- daemontools-0.76/src/select.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/select.h 2007-09-30 13:55:32.000000000 +0300 ++@@ -0,0 +1,13 @@ +++/* Public domain. */ +++ +++#ifndef SELECT_H +++#define SELECT_H +++ +++/* sysdep: +sysselect */ +++ +++#include +++#include +++#include +++extern int select(); +++ +++#endif ++diff -urN daemontools-0.76/src/uint64.h daemontools-0.76.new/src/uint64.h ++--- daemontools-0.76/src/uint64.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/uint64.h 2007-09-30 13:55:54.000000000 +0300 ++@@ -0,0 +1,10 @@ +++/* Public domain. */ +++ +++#ifndef UINT64_H +++#define UINT64_H +++ +++/* sysdep: -ulong64 */ +++ +++typedef unsigned long long uint64; +++ +++#endif +diff --git a/feeds/packages/utils/daemontools/patches/.svn/text-base/svscanboot.patch.svn-base b/feeds/packages/utils/daemontools/patches/.svn/text-base/svscanboot.patch.svn-base +new file mode 100644 +index 0000000..ae59ea7 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/patches/.svn/text-base/svscanboot.patch.svn-base +@@ -0,0 +1,16 @@ ++--- daemontools-0.76/src/svscanboot.sh.orig 2007-01-27 11:49:38.000000000 +0100 +++++ daemontools-0.76/src/svscanboot.sh 2007-01-27 11:52:07.000000000 +0100 ++@@ -1,11 +1,11 @@ ++ ++-PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin +++PATH=/bin:/sbin:/usr/bin:/usr/sbin ++ ++ exec /dev/null ++ exec 2>/dev/null ++ ++-/command/svc -dx /service/* /service/*/log +++/usr/bin/svc -dx /service/* /service/*/log ++ ++ env - PATH=$PATH svscan /service 2>&1 | \ ++ env - PATH=$PATH readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ +diff --git a/feeds/packages/utils/daemontools/patches/crosscompile.patch b/feeds/packages/utils/daemontools/patches/crosscompile.patch +new file mode 100644 +index 0000000..2abb466 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/patches/crosscompile.patch +@@ -0,0 +1,205 @@ ++diff -urN daemontools-0.76/src/Makefile daemontools-0.76.new/src/Makefile ++--- daemontools-0.76/src/Makefile 2001-07-12 19:49:49.000000000 +0300 +++++ daemontools-0.76.new/src/Makefile 2007-09-30 16:27:25.000000000 +0300 ++@@ -101,9 +101,6 @@ ++ uint64.h ++ ./compile deepsleep.c ++ ++-direntry.h: choose compile direntry.h1 direntry.h2 trydrent.c ++- ./choose c trydrent direntry.h1 direntry.h2 > direntry.h ++- ++ env.o: compile env.c env.h str.h ++ ./compile env.c ++ ++@@ -151,29 +148,6 @@ ++ fmt_ulong.o: compile fmt.h fmt_ulong.c ++ ./compile fmt_ulong.c ++ ++-hasflock.h: choose compile hasflock.h1 hasflock.h2 load tryflock.c ++- ./choose cl tryflock hasflock.h1 hasflock.h2 > hasflock.h ++- ++-hasmkffo.h: choose compile hasmkffo.h1 hasmkffo.h2 load trymkffo.c ++- ./choose cl trymkffo hasmkffo.h1 hasmkffo.h2 > hasmkffo.h ++- ++-hassgact.h: choose compile hassgact.h1 hassgact.h2 load trysgact.c ++- ./choose cl trysgact hassgact.h1 hassgact.h2 > hassgact.h ++- ++-hassgprm.h: choose compile hassgprm.h1 hassgprm.h2 load trysgprm.c ++- ./choose cl trysgprm hassgprm.h1 hassgprm.h2 > hassgprm.h ++- ++-hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ ++-tryshsgr.c warn-shsgr ++- ./chkshsgr || ( cat warn-shsgr; exit 1 ) ++- ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h ++- ++-haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c ++- ./choose cl trywaitp haswaitp.h1 haswaitp.h2 > haswaitp.h ++- ++-iopause.h: choose compile iopause.h1 iopause.h2 load trypoll.c ++- ./choose clr trypoll iopause.h1 iopause.h2 > iopause.h ++- ++ iopause.o: compile iopause.c iopause.h select.h tai.h taia.h uint64.h ++ ./compile iopause.c ++ ++@@ -265,7 +239,6 @@ ++ rts: envdir envuidgid fghack matchtest multilog pgrphack \ ++ readproctitle rts.tests setlock setuidgid softlimit supervise svc \ ++ svok svscan svscanboot svstat tai64n tai64nlocal ++- env - /bin/sh rts.tests 2>&1 | cat -v > rts ++ ++ scan_ulong.o: compile scan.h scan_ulong.c ++ ./compile scan_ulong.c ++@@ -273,9 +246,6 @@ ++ seek_set.o: compile seek.h seek_set.c ++ ./compile seek_set.c ++ ++-select.h: choose compile select.h1 select.h2 trysysel.c ++- ./choose c trysysel select.h1 select.h2 > select.h ++- ++ setlock: byte.a load setlock.o unix.a ++ ./load setlock unix.a byte.a ++ ++@@ -478,9 +448,6 @@ ++ timestamp.o: compile tai.h taia.h timestamp.c timestamp.h uint64.h ++ ./compile timestamp.c ++ ++-uint64.h: choose compile load tryulong64.c uint64.h1 uint64.h2 ++- ./choose clr tryulong64 uint64.h1 uint64.h2 > uint64.h ++- ++ unix.a: alloc.o alloc_re.o buffer.o buffer_0.o buffer_1.o buffer_2.o \ ++ buffer_get.o buffer_put.o buffer_read.o buffer_write.o coe.o env.o \ ++ error.o error_str.o fd_copy.o fd_move.o fifo.o lock_ex.o lock_exnb.o \ ++diff -urN daemontools-0.76/src/conf-cc daemontools-0.76.new/src/conf-cc ++--- daemontools-0.76/src/conf-cc 2007-09-30 13:58:40.000000000 +0300 +++++ daemontools-0.76.new/src/conf-cc 2007-09-30 15:15:32.000000000 +0300 ++@@ -1,3 +1,3 @@ ++-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings +++$TARGET_CC $TARGET_CFLAGS -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h ++ ++ This will be used to compile .c files. ++diff -urN daemontools-0.76/src/conf-ld daemontools-0.76.new/src/conf-ld ++--- daemontools-0.76/src/conf-ld 2001-07-12 19:49:49.000000000 +0300 +++++ daemontools-0.76.new/src/conf-ld 2007-09-30 15:15:42.000000000 +0300 ++@@ -1,3 +1,3 @@ ++-gcc -s +++$TARGET_CC -s $TARGET_LDFLAGS ++ ++ This will be used to link .o files into an executable. ++diff -urN daemontools-0.76/src/direntry.h daemontools-0.76.new/src/direntry.h ++--- daemontools-0.76/src/direntry.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/direntry.h 2007-09-30 13:52:11.000000000 +0300 ++@@ -0,0 +1,12 @@ +++/* Public domain. */ +++ +++#ifndef DIRENTRY_H +++#define DIRENTRY_H +++ +++/* sysdep: +dirent */ +++ +++#include +++#include +++#define direntry struct dirent +++ +++#endif ++diff -urN daemontools-0.76/src/hasflock.h daemontools-0.76.new/src/hasflock.h ++--- daemontools-0.76/src/hasflock.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hasflock.h 2007-09-30 13:52:55.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +flock */ +++#define HASFLOCK 1 ++diff -urN daemontools-0.76/src/hasmkffo.h daemontools-0.76.new/src/hasmkffo.h ++--- daemontools-0.76/src/hasmkffo.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hasmkffo.h 2007-09-30 13:53:16.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +mkfifo */ +++#define HASMKFIFO 1 ++diff -urN daemontools-0.76/src/hassgact.h daemontools-0.76.new/src/hassgact.h ++--- daemontools-0.76/src/hassgact.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hassgact.h 2007-09-30 13:53:47.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +sigaction */ +++#define HASSIGACTION 1 ++diff -urN daemontools-0.76/src/hassgprm.h daemontools-0.76.new/src/hassgprm.h ++--- daemontools-0.76/src/hassgprm.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hassgprm.h 2007-09-30 13:54:13.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +sigprocmask */ +++#define HASSIGPROCMASK 1 ++diff -urN daemontools-0.76/src/hasshsgr.h daemontools-0.76.new/src/hasshsgr.h ++--- daemontools-0.76/src/hasshsgr.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/hasshsgr.h 2007-09-30 13:54:41.000000000 +0300 ++@@ -0,0 +1,3 @@ +++/* Public domain. */ +++ +++/* sysdep: -shortsetgroups */ ++diff -urN daemontools-0.76/src/haswaitp.h daemontools-0.76.new/src/haswaitp.h ++--- daemontools-0.76/src/haswaitp.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/haswaitp.h 2007-09-30 13:54:57.000000000 +0300 ++@@ -0,0 +1,4 @@ +++/* Public domain. */ +++ +++/* sysdep: +waitpid */ +++#define HASWAITPID 1 ++diff -urN daemontools-0.76/src/iopause.h daemontools-0.76.new/src/iopause.h ++--- daemontools-0.76/src/iopause.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/iopause.h 2007-09-30 13:55:14.000000000 +0300 ++@@ -0,0 +1,20 @@ +++/* Public domain. */ +++ +++#ifndef IOPAUSE_H +++#define IOPAUSE_H +++ +++/* sysdep: +poll */ +++#define IOPAUSE_POLL +++ +++#include +++#include +++ +++typedef struct pollfd iopause_fd; +++#define IOPAUSE_READ POLLIN +++#define IOPAUSE_WRITE POLLOUT +++ +++#include "taia.h" +++ +++extern void iopause(iopause_fd *,unsigned int,struct taia *,struct taia *); +++ +++#endif ++diff -urN daemontools-0.76/src/select.h daemontools-0.76.new/src/select.h ++--- daemontools-0.76/src/select.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/select.h 2007-09-30 13:55:32.000000000 +0300 ++@@ -0,0 +1,13 @@ +++/* Public domain. */ +++ +++#ifndef SELECT_H +++#define SELECT_H +++ +++/* sysdep: +sysselect */ +++ +++#include +++#include +++#include +++extern int select(); +++ +++#endif ++diff -urN daemontools-0.76/src/uint64.h daemontools-0.76.new/src/uint64.h ++--- daemontools-0.76/src/uint64.h 1970-01-01 03:00:00.000000000 +0300 +++++ daemontools-0.76.new/src/uint64.h 2007-09-30 13:55:54.000000000 +0300 ++@@ -0,0 +1,10 @@ +++/* Public domain. */ +++ +++#ifndef UINT64_H +++#define UINT64_H +++ +++/* sysdep: -ulong64 */ +++ +++typedef unsigned long long uint64; +++ +++#endif +diff --git a/feeds/packages/utils/daemontools/patches/svscanboot.patch b/feeds/packages/utils/daemontools/patches/svscanboot.patch +new file mode 100644 +index 0000000..ae59ea7 +--- /dev/null ++++ b/feeds/packages/utils/daemontools/patches/svscanboot.patch +@@ -0,0 +1,16 @@ ++--- daemontools-0.76/src/svscanboot.sh.orig 2007-01-27 11:49:38.000000000 +0100 +++++ daemontools-0.76/src/svscanboot.sh 2007-01-27 11:52:07.000000000 +0100 ++@@ -1,11 +1,11 @@ ++ ++-PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin +++PATH=/bin:/sbin:/usr/bin:/usr/sbin ++ ++ exec /dev/null ++ exec 2>/dev/null ++ ++-/command/svc -dx /service/* /service/*/log +++/usr/bin/svc -dx /service/* /service/*/log ++ ++ env - PATH=$PATH svscan /service 2>&1 | \ ++ env - PATH=$PATH readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ +diff --git a/feeds/packages/utils/dash/.svn/entries b/feeds/packages/utils/dash/.svn/entries +new file mode 100644 +index 0000000..2390f84 +--- /dev/null ++++ b/feeds/packages/utils/dash/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dash ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-03T22:51:52.811973Z ++28155 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++da689870e2ad59c4943329f36de6cecb ++2011-09-03T22:51:52.811973Z ++28155 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++853 ++ +diff --git a/feeds/packages/utils/dash/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dash/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1a88db4 +--- /dev/null ++++ b/feeds/packages/utils/dash/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=dash ++PKG_VERSION:=0.5.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gondor.apana.org.au/~herbert/dash/files ++PKG_MD5SUM:=f6cedb10ae7258adb5ab17a10ae80d51 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dash ++ SECTION:=base ++ CATEGORY:=Base system ++ TITLE:=Debian Almquist shell ++ URL:=http://gondor.apana.org.au/~herbert/dash/ ++endef ++ ++define Package/dash/description ++ A small footprint, POSIX complied unix shell ++endef ++ ++MAKE_FLAGS += \ ++ AWK="awk" ++ ++define Package/dash/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dash $(1)/bin/ ++endef ++ ++$(eval $(call BuildPackage,dash)) +diff --git a/feeds/packages/utils/dash/Makefile b/feeds/packages/utils/dash/Makefile +new file mode 100644 +index 0000000..1a88db4 +--- /dev/null ++++ b/feeds/packages/utils/dash/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=dash ++PKG_VERSION:=0.5.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gondor.apana.org.au/~herbert/dash/files ++PKG_MD5SUM:=f6cedb10ae7258adb5ab17a10ae80d51 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dash ++ SECTION:=base ++ CATEGORY:=Base system ++ TITLE:=Debian Almquist shell ++ URL:=http://gondor.apana.org.au/~herbert/dash/ ++endef ++ ++define Package/dash/description ++ A small footprint, POSIX complied unix shell ++endef ++ ++MAKE_FLAGS += \ ++ AWK="awk" ++ ++define Package/dash/install ++ $(INSTALL_DIR) $(1)/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dash $(1)/bin/ ++endef ++ ++$(eval $(call BuildPackage,dash)) +diff --git a/feeds/packages/utils/dbus/.svn/entries b/feeds/packages/utils/dbus/.svn/entries +new file mode 100644 +index 0000000..665a3f8 +--- /dev/null ++++ b/feeds/packages/utils/dbus/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dbus ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T22:46:32.189411Z ++32226 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++3ff7899a7cd7cc58ac0354a2a866902b ++2012-06-11T22:46:32.189411Z ++32226 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4451 ++ +diff --git a/feeds/packages/utils/dbus/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/dbus/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f07be99 +--- /dev/null ++++ b/feeds/packages/utils/dbus/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++END +diff --git a/feeds/packages/utils/dbus/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dbus/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..acaac2c +--- /dev/null ++++ b/feeds/packages/utils/dbus/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,187 @@ ++# ++# 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 ++ ++# Make sure to also update the dbus-x package ++PKG_NAME:=dbus ++PKG_VERSION:=1.4.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/ ++PKG_MD5SUM:=ae6de2562a57516cfabaf56903375ba9 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ -Wl,-rpath=/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:= +librt ++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" \ ++ ++ ++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 BuildPackage,libdbus)) ++$(eval $(call BuildPackage,dbus)) ++$(eval $(call BuildPackage,dbus-utils)) +diff --git a/feeds/packages/utils/dbus/Makefile b/feeds/packages/utils/dbus/Makefile +new file mode 100644 +index 0000000..acaac2c +--- /dev/null ++++ b/feeds/packages/utils/dbus/Makefile +@@ -0,0 +1,187 @@ ++# ++# 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 ++ ++# Make sure to also update the dbus-x package ++PKG_NAME:=dbus ++PKG_VERSION:=1.4.14 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/ ++PKG_MD5SUM:=ae6de2562a57516cfabaf56903375ba9 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ ++ -Wl,-rpath=/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:= +librt ++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" \ ++ ++ ++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 BuildPackage,libdbus)) ++$(eval $(call BuildPackage,dbus)) ++$(eval $(call BuildPackage,dbus-utils)) +diff --git a/feeds/packages/utils/dbus/files/.svn/entries b/feeds/packages/utils/dbus/files/.svn/entries +new file mode 100644 +index 0000000..8c45c0d +--- /dev/null ++++ b/feeds/packages/utils/dbus/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dbus/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:30.894802Z ++28947 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dbus.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++3dc1816ff1280ecc6cb63017eda45d17 ++2011-11-11T15:46:30.894802Z ++28947 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++368 ++ ++dbus-launch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++445a4db0b1f919a84de61a33068477d0 ++2009-03-09T14:17:36.373228Z ++14804 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++388 ++ +diff --git a/feeds/packages/utils/dbus/files/.svn/text-base/dbus-launch.svn-base b/feeds/packages/utils/dbus/files/.svn/text-base/dbus-launch.svn-base +new file mode 100644 +index 0000000..7c3f922 +--- /dev/null ++++ b/feeds/packages/utils/dbus/files/.svn/text-base/dbus-launch.svn-base +@@ -0,0 +1,12 @@ ++#!/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/feeds/packages/utils/dbus/files/.svn/text-base/dbus.init.svn-base b/feeds/packages/utils/dbus/files/.svn/text-base/dbus.init.svn-base +new file mode 100644 +index 0000000..4294083 +--- /dev/null ++++ b/feeds/packages/utils/dbus/files/.svn/text-base/dbus.init.svn-base +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/utils/dbus/files/dbus-launch b/feeds/packages/utils/dbus/files/dbus-launch +new file mode 100644 +index 0000000..7c3f922 +--- /dev/null ++++ b/feeds/packages/utils/dbus/files/dbus-launch +@@ -0,0 +1,12 @@ ++#!/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/feeds/packages/utils/dbus/files/dbus.init b/feeds/packages/utils/dbus/files/dbus.init +new file mode 100644 +index 0000000..4294083 +--- /dev/null ++++ b/feeds/packages/utils/dbus/files/dbus.init +@@ -0,0 +1,17 @@ ++#!/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/feeds/packages/utils/deco/.svn/entries b/feeds/packages/utils/deco/.svn/entries +new file mode 100644 +index 0000000..b2e9d71 +--- /dev/null ++++ b/feeds/packages/utils/deco/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/deco ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ceda8238c80e4711e90bbe4f94a28840 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1119 ++ +diff --git a/feeds/packages/utils/deco/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/deco/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/deco/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/deco/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/deco/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..70253ae +--- /dev/null ++++ b/feeds/packages/utils/deco/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=deco ++PKG_VERSION:=39 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/deco ++PKG_MD5SUM:=f77f60e8be0cae1f814cba1ef61bf4d0 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/deco ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=Text-based, full featured file manager ++ URL:=http://deco.sourceforge.net/ ++ SUBMENU:=filemanager ++endef ++ ++define Package/deco/description ++ A clone of Norton Commander for Unix. Text-based, full featured ++ file manager. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/deco/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/deco $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/deco ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/menu $(1)/usr/lib/deco/menu ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/profile $(1)/usr/lib/deco/profile ++endef ++ ++$(eval $(call BuildPackage,deco)) +diff --git a/feeds/packages/utils/deco/Makefile b/feeds/packages/utils/deco/Makefile +new file mode 100644 +index 0000000..70253ae +--- /dev/null ++++ b/feeds/packages/utils/deco/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=deco ++PKG_VERSION:=39 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/deco ++PKG_MD5SUM:=f77f60e8be0cae1f814cba1ef61bf4d0 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/deco ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=Text-based, full featured file manager ++ URL:=http://deco.sourceforge.net/ ++ SUBMENU:=filemanager ++endef ++ ++define Package/deco/description ++ A clone of Norton Commander for Unix. Text-based, full featured ++ file manager. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/deco/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/deco $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib/deco ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/menu $(1)/usr/lib/deco/menu ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/profile $(1)/usr/lib/deco/profile ++endef ++ ++$(eval $(call BuildPackage,deco)) +diff --git a/feeds/packages/utils/deco/patches/.svn/entries b/feeds/packages/utils/deco/patches/.svn/entries +new file mode 100644 +index 0000000..414b703 +--- /dev/null ++++ b/feeds/packages/utils/deco/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/deco/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-tty.c.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++fb87914b4abd03829874c52b28132161 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++326 ++ +diff --git a/feeds/packages/utils/deco/patches/.svn/prop-base/100-tty.c.patch.svn-base b/feeds/packages/utils/deco/patches/.svn/prop-base/100-tty.c.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/deco/patches/.svn/prop-base/100-tty.c.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/deco/patches/.svn/text-base/100-tty.c.patch.svn-base b/feeds/packages/utils/deco/patches/.svn/text-base/100-tty.c.patch.svn-base +new file mode 100644 +index 0000000..f37e4e2 +--- /dev/null ++++ b/feeds/packages/utils/deco/patches/.svn/text-base/100-tty.c.patch.svn-base +@@ -0,0 +1,11 @@ ++--- src/tty.c 2005-09-25 00:23:41.671022039 -0700 +++++ str_new/tty.c 2005-09-25 01:09:37.189119615 -0700 ++@@ -14,7 +14,7 @@ ++ #if HAVE_TERMIOS_H ++ # include ++ # if HAVE_SYS_IOCTL_H ++-# include +++/*# include */ ++ # endif ++ # define HAVE_TERMIO_H 1 ++ # define termio termios +diff --git a/feeds/packages/utils/deco/patches/100-tty.c.patch b/feeds/packages/utils/deco/patches/100-tty.c.patch +new file mode 100644 +index 0000000..f37e4e2 +--- /dev/null ++++ b/feeds/packages/utils/deco/patches/100-tty.c.patch +@@ -0,0 +1,11 @@ ++--- src/tty.c 2005-09-25 00:23:41.671022039 -0700 +++++ str_new/tty.c 2005-09-25 01:09:37.189119615 -0700 ++@@ -14,7 +14,7 @@ ++ #if HAVE_TERMIOS_H ++ # include ++ # if HAVE_SYS_IOCTL_H ++-# include +++/*# include */ ++ # endif ++ # define HAVE_TERMIO_H 1 ++ # define termio termios +diff --git a/feeds/packages/utils/devio/.svn/entries b/feeds/packages/utils/devio/.svn/entries +new file mode 100644 +index 0000000..1e843b4 +--- /dev/null ++++ b/feeds/packages/utils/devio/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/devio ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a2ab08eee741445145ba33df1a8db9a4 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++920 ++ +diff --git a/feeds/packages/utils/devio/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/devio/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9c0a974 +--- /dev/null ++++ b/feeds/packages/utils/devio/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,38 @@ ++# ++# 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:=devio ++PKG_VERSION:=1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/devio ++PKG_MD5SUM:=5d332c2bffc0791367bcf3368ba1a0d1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/devio ++ SUBMENU:=disc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=correctly read (or write) a region of a block device ++ URL:=http://sourceforge.net/projects/devio/ ++endef ++ ++define Package/devio/description ++ A command line program to correctly read (or write) a region of a block device. ++ Primary use is for extracting formatted data from MTD partitions. ++endef ++ ++define Package/devio/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/devio $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,devio)) +diff --git a/feeds/packages/utils/devio/Makefile b/feeds/packages/utils/devio/Makefile +new file mode 100644 +index 0000000..9c0a974 +--- /dev/null ++++ b/feeds/packages/utils/devio/Makefile +@@ -0,0 +1,38 @@ ++# ++# 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:=devio ++PKG_VERSION:=1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/devio ++PKG_MD5SUM:=5d332c2bffc0791367bcf3368ba1a0d1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/devio ++ SUBMENU:=disc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=correctly read (or write) a region of a block device ++ URL:=http://sourceforge.net/projects/devio/ ++endef ++ ++define Package/devio/description ++ A command line program to correctly read (or write) a region of a block device. ++ Primary use is for extracting formatted data from MTD partitions. ++endef ++ ++define Package/devio/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/devio $(1)/usr/sbin ++endef ++ ++$(eval $(call BuildPackage,devio)) +diff --git a/feeds/packages/utils/devmem2/.svn/entries b/feeds/packages/utils/devmem2/.svn/entries +new file mode 100644 +index 0000000..7e2e975 +--- /dev/null ++++ b/feeds/packages/utils/devmem2/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/devmem2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-07-23T13:53:05.055136Z ++22369 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ac858cb42b290902b5d996aac63c9031 ++2010-07-23T13:53:05.055136Z ++22369 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++773 ++ +diff --git a/feeds/packages/utils/devmem2/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/devmem2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..baa1337 +--- /dev/null ++++ b/feeds/packages/utils/devmem2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=devmem2 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/devmem2 ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Simple program to read/write from memory. ++endef ++ ++define Package/devmem2/description ++ Simple program to read/write from/to any location in memory. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/devmem2/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/devmem2 $(1)/usr/sbin/devmem2 ++endef ++ ++$(eval $(call BuildPackage,devmem2)) +diff --git a/feeds/packages/utils/devmem2/Makefile b/feeds/packages/utils/devmem2/Makefile +new file mode 100644 +index 0000000..baa1337 +--- /dev/null ++++ b/feeds/packages/utils/devmem2/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=devmem2 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/devmem2 ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Simple program to read/write from memory. ++endef ++ ++define Package/devmem2/description ++ Simple program to read/write from/to any location in memory. ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/devmem2/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/devmem2 $(1)/usr/sbin/devmem2 ++endef ++ ++$(eval $(call BuildPackage,devmem2)) +diff --git a/feeds/packages/utils/devmem2/src/.svn/entries b/feeds/packages/utils/devmem2/src/.svn/entries +new file mode 100644 +index 0000000..8db7c29 +--- /dev/null ++++ b/feeds/packages/utils/devmem2/src/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/devmem2/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-07-23T13:53:05.055136Z ++22369 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++devmem2.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d428789cad6f16bfeb4825b05254b3f4 ++2010-07-23T13:53:05.055136Z ++22369 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3752 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++6d02365f47946282267a2d8656aad7a4 ++2010-07-23T13:53:05.055136Z ++22369 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++155 ++ +diff --git a/feeds/packages/utils/devmem2/src/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/devmem2/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1db49ca +--- /dev/null ++++ b/feeds/packages/utils/devmem2/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++OBJ = devmem2.o ++ ++all: compile ++ ++%.o: %.c ++ $(CC) $(CFLAGS) -c -o $@ $< ++ ++compile: $(OBJ) ++ $(CC) -o devmem2 $(LDFLAGS) $(OBJ) ++ ++clean: ++ rm -f *.o *.so devmem2 ++ +diff --git a/feeds/packages/utils/devmem2/src/.svn/text-base/devmem2.c.svn-base b/feeds/packages/utils/devmem2/src/.svn/text-base/devmem2.c.svn-base +new file mode 100644 +index 0000000..0c1b5b3 +--- /dev/null ++++ b/feeds/packages/utils/devmem2/src/.svn/text-base/devmem2.c.svn-base +@@ -0,0 +1,132 @@ ++/* ++ * devmem2.c: Simple program to read/write from/to any location in memory. ++ * ++ * Copyright (C) 2000, Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) ++ * ++ * ++ * This software has been developed for the LART computing board ++ * (http://www.lart.tudelft.nl/). The development has been sponsored by ++ * the Mobile MultiMedia Communications (http://www.mmc.tudelft.nl/) ++ * and Ubiquitous Communications (http://www.ubicom.tudelft.nl/) ++ * projects. ++ * ++ * The author can be reached at: ++ * ++ * Jan-Derk Bakker ++ * Information and Communication Theory Group ++ * Faculty of Information Technology and Systems ++ * Delft University of Technology ++ * P.O. Box 5031 ++ * 2600 GA Delft ++ * The Netherlands ++ * ++ * ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \ ++ __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0) ++ ++#define MAP_SIZE 4096UL ++#define MAP_MASK (MAP_SIZE - 1) ++ ++int main(int argc, char **argv) { ++ int fd; ++ void *map_base, *virt_addr; ++ unsigned long read_result, writeval; ++ off_t target; ++ int access_type = 'w'; ++ ++ if(argc < 2) { ++ fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" ++ "\taddress : memory address to act upon\n" ++ "\ttype : access operation type : [b]yte, [h]alfword, [w]ord\n" ++ "\tdata : data to be written\n\n", ++ argv[0]); ++ exit(1); ++ } ++ target = strtoul(argv[1], 0, 0); ++ ++ if(argc > 2) ++ access_type = tolower(argv[2][0]); ++ ++ ++ if((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1) FATAL; ++ printf("/dev/mem opened.\n"); ++ fflush(stdout); ++ ++ /* Map one page */ ++ map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, target & ~MAP_MASK); ++ if(map_base == (void *) -1) FATAL; ++ printf("Memory mapped at address %p.\n", map_base); ++ fflush(stdout); ++ ++ virt_addr = map_base + (target & MAP_MASK); ++ switch(access_type) { ++ case 'b': ++ read_result = *((unsigned char *) virt_addr); ++ break; ++ case 'h': ++ read_result = *((unsigned short *) virt_addr); ++ break; ++ case 'w': ++ read_result = *((unsigned long *) virt_addr); ++ break; ++ default: ++ fprintf(stderr, "Illegal data type '%c'.\n", access_type); ++ exit(2); ++ } ++ printf("Value at address 0x%lX (%p): 0x%lX\n", target, virt_addr, read_result); ++ fflush(stdout); ++ ++ if(argc > 3) { ++ writeval = strtoul(argv[3], 0, 0); ++ switch(access_type) { ++ case 'b': ++ *((unsigned char *) virt_addr) = writeval; ++ read_result = *((unsigned char *) virt_addr); ++ break; ++ case 'h': ++ *((unsigned short *) virt_addr) = writeval; ++ read_result = *((unsigned short *) virt_addr); ++ break; ++ case 'w': ++ *((unsigned long *) virt_addr) = writeval; ++ read_result = *((unsigned long *) virt_addr); ++ break; ++ } ++ printf("Written 0x%lX; readback 0x%lX\n", writeval, read_result); ++ fflush(stdout); ++ } ++ ++ if(munmap(map_base, MAP_SIZE) == -1) FATAL; ++ close(fd); ++ return 0; ++} ++ ++ +diff --git a/feeds/packages/utils/devmem2/src/Makefile b/feeds/packages/utils/devmem2/src/Makefile +new file mode 100644 +index 0000000..1db49ca +--- /dev/null ++++ b/feeds/packages/utils/devmem2/src/Makefile +@@ -0,0 +1,13 @@ ++OBJ = devmem2.o ++ ++all: compile ++ ++%.o: %.c ++ $(CC) $(CFLAGS) -c -o $@ $< ++ ++compile: $(OBJ) ++ $(CC) -o devmem2 $(LDFLAGS) $(OBJ) ++ ++clean: ++ rm -f *.o *.so devmem2 ++ +diff --git a/feeds/packages/utils/devmem2/src/devmem2.c b/feeds/packages/utils/devmem2/src/devmem2.c +new file mode 100644 +index 0000000..0c1b5b3 +--- /dev/null ++++ b/feeds/packages/utils/devmem2/src/devmem2.c +@@ -0,0 +1,132 @@ ++/* ++ * devmem2.c: Simple program to read/write from/to any location in memory. ++ * ++ * Copyright (C) 2000, Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) ++ * ++ * ++ * This software has been developed for the LART computing board ++ * (http://www.lart.tudelft.nl/). The development has been sponsored by ++ * the Mobile MultiMedia Communications (http://www.mmc.tudelft.nl/) ++ * and Ubiquitous Communications (http://www.ubicom.tudelft.nl/) ++ * projects. ++ * ++ * The author can be reached at: ++ * ++ * Jan-Derk Bakker ++ * Information and Communication Theory Group ++ * Faculty of Information Technology and Systems ++ * Delft University of Technology ++ * P.O. Box 5031 ++ * 2600 GA Delft ++ * The Netherlands ++ * ++ * ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \ ++ __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0) ++ ++#define MAP_SIZE 4096UL ++#define MAP_MASK (MAP_SIZE - 1) ++ ++int main(int argc, char **argv) { ++ int fd; ++ void *map_base, *virt_addr; ++ unsigned long read_result, writeval; ++ off_t target; ++ int access_type = 'w'; ++ ++ if(argc < 2) { ++ fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" ++ "\taddress : memory address to act upon\n" ++ "\ttype : access operation type : [b]yte, [h]alfword, [w]ord\n" ++ "\tdata : data to be written\n\n", ++ argv[0]); ++ exit(1); ++ } ++ target = strtoul(argv[1], 0, 0); ++ ++ if(argc > 2) ++ access_type = tolower(argv[2][0]); ++ ++ ++ if((fd = open("/dev/mem", O_RDWR | O_SYNC)) == -1) FATAL; ++ printf("/dev/mem opened.\n"); ++ fflush(stdout); ++ ++ /* Map one page */ ++ map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, target & ~MAP_MASK); ++ if(map_base == (void *) -1) FATAL; ++ printf("Memory mapped at address %p.\n", map_base); ++ fflush(stdout); ++ ++ virt_addr = map_base + (target & MAP_MASK); ++ switch(access_type) { ++ case 'b': ++ read_result = *((unsigned char *) virt_addr); ++ break; ++ case 'h': ++ read_result = *((unsigned short *) virt_addr); ++ break; ++ case 'w': ++ read_result = *((unsigned long *) virt_addr); ++ break; ++ default: ++ fprintf(stderr, "Illegal data type '%c'.\n", access_type); ++ exit(2); ++ } ++ printf("Value at address 0x%lX (%p): 0x%lX\n", target, virt_addr, read_result); ++ fflush(stdout); ++ ++ if(argc > 3) { ++ writeval = strtoul(argv[3], 0, 0); ++ switch(access_type) { ++ case 'b': ++ *((unsigned char *) virt_addr) = writeval; ++ read_result = *((unsigned char *) virt_addr); ++ break; ++ case 'h': ++ *((unsigned short *) virt_addr) = writeval; ++ read_result = *((unsigned short *) virt_addr); ++ break; ++ case 'w': ++ *((unsigned long *) virt_addr) = writeval; ++ read_result = *((unsigned long *) virt_addr); ++ break; ++ } ++ printf("Written 0x%lX; readback 0x%lX\n", writeval, read_result); ++ fflush(stdout); ++ } ++ ++ if(munmap(map_base, MAP_SIZE) == -1) FATAL; ++ close(fd); ++ return 0; ++} ++ ++ +diff --git a/feeds/packages/utils/dfu-util/.svn/entries b/feeds/packages/utils/dfu-util/.svn/entries +new file mode 100644 +index 0000000..3df0ae1 +--- /dev/null ++++ b/feeds/packages/utils/dfu-util/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dfu-util ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++126aa3d0d038dd5df860c5124abcb0ea ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1296 ++ +diff --git a/feeds/packages/utils/dfu-util/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dfu-util/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f587934 +--- /dev/null ++++ b/feeds/packages/utils/dfu-util/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=dfu-util ++PKG_VERSION:=r3095 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://sources.nslu2-linux.org/sources ++PKG_MD5SUM:=2346dddceeab0e7090109f04d9c3a6be ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dfu-util ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=OpenMoko device flash utility ++ URL:=http://wiki.openmoko.org/wiki/Dfu-util ++ DEPENDS:=+libusb-compat ++endef ++ ++define Package/dfu-util/description ++ Dfu-util is a program that implements the host side of the USB DFU ++ (Universal Serial Bus Device Firmware Upgrade) protocol. ++ This version is specifically used to flash the FIC Neo 1973 mobile phone. ++endef ++ ++# CONFIGURE_VARS += USB_CFLAGS="-I $(STAGING_DIR)/usr/include" \ ++# USB_LIBS="-L $(STAGING_DIR)/usr/lib" ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ ++ ./autogen.sh \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Package/dfu-util/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dfu-util $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dfu-util)) +diff --git a/feeds/packages/utils/dfu-util/Makefile b/feeds/packages/utils/dfu-util/Makefile +new file mode 100644 +index 0000000..f587934 +--- /dev/null ++++ b/feeds/packages/utils/dfu-util/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=dfu-util ++PKG_VERSION:=r3095 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://sources.nslu2-linux.org/sources ++PKG_MD5SUM:=2346dddceeab0e7090109f04d9c3a6be ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dfu-util ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=OpenMoko device flash utility ++ URL:=http://wiki.openmoko.org/wiki/Dfu-util ++ DEPENDS:=+libusb-compat ++endef ++ ++define Package/dfu-util/description ++ Dfu-util is a program that implements the host side of the USB DFU ++ (Universal Serial Bus Device Firmware Upgrade) protocol. ++ This version is specifically used to flash the FIC Neo 1973 mobile phone. ++endef ++ ++# CONFIGURE_VARS += USB_CFLAGS="-I $(STAGING_DIR)/usr/include" \ ++# USB_LIBS="-L $(STAGING_DIR)/usr/lib" ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ ++ ./autogen.sh \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++define Package/dfu-util/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dfu-util $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dfu-util)) +diff --git a/feeds/packages/utils/dfu-util/patches/.svn/entries b/feeds/packages/utils/dfu-util/patches/.svn/entries +new file mode 100644 +index 0000000..ffc7519 +--- /dev/null ++++ b/feeds/packages/utils/dfu-util/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dfu-util/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-30T15:40:07.974808Z ++32914 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_static_binary.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++951ecb8bdc1829fb8de5b60c6815cdc7 ++2012-07-30T15:40:07.974808Z ++32914 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++449 ++ +diff --git a/feeds/packages/utils/dfu-util/patches/.svn/text-base/001-no_static_binary.patch.svn-base b/feeds/packages/utils/dfu-util/patches/.svn/text-base/001-no_static_binary.patch.svn-base +new file mode 100644 +index 0000000..2efa15e +--- /dev/null ++++ b/feeds/packages/utils/dfu-util/patches/.svn/text-base/001-no_static_binary.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -urN dfu-util/src/Makefile.am dfu-util.new/src/Makefile.am ++--- dfu-util/src/Makefile.am 2007-10-06 23:36:18.000000000 +0200 +++++ dfu-util.new/src/Makefile.am 2012-07-30 15:13:04.020948991 +0200 ++@@ -6,7 +6,7 @@ ++ '\n#endif' > dfu-version.h ++ BUILT_SOURCES = dfu-version.h ++ ++-bin_PROGRAMS = dfu-util dfu-util_static +++bin_PROGRAMS = dfu-util ++ dfu_util_SOURCES = main.c sam7dfu.c dfu.c dfu.h ++ ++ dfu_util_static_SOURCES = main.c sam7dfu.c dfu.c dfu.h +diff --git a/feeds/packages/utils/dfu-util/patches/001-no_static_binary.patch b/feeds/packages/utils/dfu-util/patches/001-no_static_binary.patch +new file mode 100644 +index 0000000..2efa15e +--- /dev/null ++++ b/feeds/packages/utils/dfu-util/patches/001-no_static_binary.patch +@@ -0,0 +1,12 @@ ++diff -urN dfu-util/src/Makefile.am dfu-util.new/src/Makefile.am ++--- dfu-util/src/Makefile.am 2007-10-06 23:36:18.000000000 +0200 +++++ dfu-util.new/src/Makefile.am 2012-07-30 15:13:04.020948991 +0200 ++@@ -6,7 +6,7 @@ ++ '\n#endif' > dfu-version.h ++ BUILT_SOURCES = dfu-version.h ++ ++-bin_PROGRAMS = dfu-util dfu-util_static +++bin_PROGRAMS = dfu-util ++ dfu_util_SOURCES = main.c sam7dfu.c dfu.c dfu.h ++ ++ dfu_util_static_SOURCES = main.c sam7dfu.c dfu.c dfu.h +diff --git a/feeds/packages/utils/dialog/.svn/entries b/feeds/packages/utils/dialog/.svn/entries +new file mode 100644 +index 0000000..8c171c5 +--- /dev/null ++++ b/feeds/packages/utils/dialog/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dialog ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:41.685907Z ++34480 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++404573cc48d1208464d922354a007236 ++2012-12-04T16:20:41.685907Z ++34480 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++826 ++ +diff --git a/feeds/packages/utils/dialog/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/dialog/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..0e9cd44 +--- /dev/null ++++ b/feeds/packages/utils/dialog/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++K 11 ++svn:licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/utils/dialog/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dialog/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..872ab83 +--- /dev/null ++++ b/feeds/packages/utils/dialog/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=dialog ++PKG_VERSION:=1.1-20120706 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=ftp://invisible-island.net/dialog ++PKG_MD5SUM:=2e538305977178eb085a9859511c299d ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dialog ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=Dialog ++ URL:=http://invisible-island.net/dialog/ ++endef ++ ++define Package/dialog/description ++ A script-interpreter which provides a set of curses widgets. ++endef ++ ++define Package/dialog/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dialog $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,dialog)) +diff --git a/feeds/packages/utils/dialog/Makefile b/feeds/packages/utils/dialog/Makefile +new file mode 100644 +index 0000000..872ab83 +--- /dev/null ++++ b/feeds/packages/utils/dialog/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=dialog ++PKG_VERSION:=1.1-20120706 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=ftp://invisible-island.net/dialog ++PKG_MD5SUM:=2e538305977178eb085a9859511c299d ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dialog ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=Dialog ++ URL:=http://invisible-island.net/dialog/ ++endef ++ ++define Package/dialog/description ++ A script-interpreter which provides a set of curses widgets. ++endef ++ ++define Package/dialog/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dialog $(1)/usr/bin ++endef ++ ++$(eval $(call BuildPackage,dialog)) +diff --git a/feeds/packages/utils/digitemp/.svn/entries b/feeds/packages/utils/digitemp/.svn/entries +new file mode 100644 +index 0000000..281e8ea +--- /dev/null ++++ b/feeds/packages/utils/digitemp/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/digitemp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f6c884fcef4102722a270f580f32636e ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2218 ++ +diff --git a/feeds/packages/utils/digitemp/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/digitemp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2381581 +--- /dev/null ++++ b/feeds/packages/utils/digitemp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,83 @@ ++# ++# 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:=digitemp ++PKG_VERSION:=3.6.0 ++PKG_RELEASE:=5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.digitemp.com/software/linux ++PKG_MD5SUM:=9be2e48db37920f21925ae6e88f83b84 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/digitemp/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=DigiTemp is a simple to use program for reading values from 1-wire devices. ++ URL:=http://www.digitemp.com ++endef ++ ++define Package/digitemp/Default/description ++ DigiTemp is a simple to use program for reading values from 1-wire devices. ++ Its main use is for reading temperature sensors, but it also reads counters, ++ and understands the 1-wire hubs with devices on different branches of the network. ++endef ++ ++define Package/digitemp ++$(call Package/digitemp/Default) ++ TITLE += (serial version) ++endef ++ ++define Package/digitemp/description ++$(call Package/digitemp/Default/description) ++ This package is build without USB support. ++endef ++ ++define Package/digitemp-usb ++$(call Package/digitemp/Default) ++ TITLE += (USB version) ++ DEPENDS += +libusb-compat ++endef ++ ++define Package/digitemp-usb/description ++$(call Package/digitemp/Default/description) ++ This package is build with USB support. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \ ++ -I./src -I./userial" \ ++ LIBS="$(TARGET_LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ ds9097 ds9097u ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \ ++ -I./src -I./userial -DOWUSB" \ ++ LIBS="$(TARGET_LDFLAGS) -lusb -lm -DOWUSB" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ clean ds2490 ++endef ++ ++define Package/digitemp/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/digitemp_{DS9097,DS9097U} $(1)/usr/bin/ ++endef ++ ++define Package/digitemp-usb/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/digitemp_DS2490 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,digitemp)) ++$(eval $(call BuildPackage,digitemp-usb)) +diff --git a/feeds/packages/utils/digitemp/Makefile b/feeds/packages/utils/digitemp/Makefile +new file mode 100644 +index 0000000..2381581 +--- /dev/null ++++ b/feeds/packages/utils/digitemp/Makefile +@@ -0,0 +1,83 @@ ++# ++# 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:=digitemp ++PKG_VERSION:=3.6.0 ++PKG_RELEASE:=5 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.digitemp.com/software/linux ++PKG_MD5SUM:=9be2e48db37920f21925ae6e88f83b84 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/digitemp/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=DigiTemp is a simple to use program for reading values from 1-wire devices. ++ URL:=http://www.digitemp.com ++endef ++ ++define Package/digitemp/Default/description ++ DigiTemp is a simple to use program for reading values from 1-wire devices. ++ Its main use is for reading temperature sensors, but it also reads counters, ++ and understands the 1-wire hubs with devices on different branches of the network. ++endef ++ ++define Package/digitemp ++$(call Package/digitemp/Default) ++ TITLE += (serial version) ++endef ++ ++define Package/digitemp/description ++$(call Package/digitemp/Default/description) ++ This package is build without USB support. ++endef ++ ++define Package/digitemp-usb ++$(call Package/digitemp/Default) ++ TITLE += (USB version) ++ DEPENDS += +libusb-compat ++endef ++ ++define Package/digitemp-usb/description ++$(call Package/digitemp/Default/description) ++ This package is build with USB support. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \ ++ -I./src -I./userial" \ ++ LIBS="$(TARGET_LDFLAGS)" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ ds9097 ds9097u ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \ ++ -I./src -I./userial -DOWUSB" \ ++ LIBS="$(TARGET_LDFLAGS) -lusb -lm -DOWUSB" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ clean ds2490 ++endef ++ ++define Package/digitemp/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/digitemp_{DS9097,DS9097U} $(1)/usr/bin/ ++endef ++ ++define Package/digitemp-usb/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(CP) $(PKG_BUILD_DIR)/digitemp_DS2490 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,digitemp)) ++$(eval $(call BuildPackage,digitemp-usb)) +diff --git a/feeds/packages/utils/dir300-flash/.svn/entries b/feeds/packages/utils/dir300-flash/.svn/entries +new file mode 100644 +index 0000000..b2d0259 +--- /dev/null ++++ b/feeds/packages/utils/dir300-flash/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dir300-flash ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-24T12:07:24.826573Z ++16965 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++045a05ef22c1cdd8a750ce6ae42794b2 ++2009-07-24T12:07:24.826573Z ++16965 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1890 ++ +diff --git a/feeds/packages/utils/dir300-flash/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dir300-flash/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c271212 +--- /dev/null ++++ b/feeds/packages/utils/dir300-flash/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,63 @@ ++# ++# 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:=dir300-flash ++PKG_VERSION:=0.9.9 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://x-alina.freifunk-potsdam.de/downloads/dir300-flash ++PKG_MD5SUM:=84ad98c36393d7d238a229da67e23903 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dir300-flash ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Flashes a custom firmware on the DIR-300 wireless router ++ URL:=http://x-alina.freifunk-potsdam.de/ ++ PKGARCH:=all ++endef ++ ++define Download/ap61.ram ++ URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W ++ FILE:=ap61.ram ++ MD5SUM:=4aaec2bff1edffe8c49003ed9363ad8b ++endef ++ ++define Download/ap61.rom ++ URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W ++ FILE:=ap61.rom ++ MD5SUM:=eb7817d202c297ae5dc6b6b897632601 ++endef ++ ++define Download/dir300redboot.zip ++ URL:=http://www.shadowandy.net/wp/wp-content/uploads ++ FILE:=dir300redboot.zip ++ MD5SUM:=5fdb24432aa200b508026215d821e126 ++endef ++ ++define Build/Compile ++ unzip -n '$(DL_DIR)/dir300redboot.zip' -d '$(PKG_BUILD_DIR)' ++endef ++ ++define Package/dir300-flash/install ++ $(INSTALL_DIR) -- '$(1)/usr/sbin' ++ $(INSTALL_BIN) -- '$(PKG_BUILD_DIR)/dir300-flash.sh' '$(1)/usr/sbin/dir300-flash' ++ $(INSTALL_DIR) -- '$(1)/usr/share/dir300-flash' ++ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.ram' '$(1)/usr/share/dir300-flash' ++ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.rom' '$(1)/usr/share/dir300-flash' ++ $(INSTALL_DATA) -- '$(PKG_BUILD_DIR)/dir300redboot.rom' '$(1)/usr/share/dir300-flash' ++endef ++ ++$(eval $(call BuildPackage,dir300-flash)) ++$(eval $(call Download,ap61.ram)) ++$(eval $(call Download,ap61.rom)) ++$(eval $(call Download,dir300redboot.zip)) +diff --git a/feeds/packages/utils/dir300-flash/Makefile b/feeds/packages/utils/dir300-flash/Makefile +new file mode 100644 +index 0000000..c271212 +--- /dev/null ++++ b/feeds/packages/utils/dir300-flash/Makefile +@@ -0,0 +1,63 @@ ++# ++# 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:=dir300-flash ++PKG_VERSION:=0.9.9 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://x-alina.freifunk-potsdam.de/downloads/dir300-flash ++PKG_MD5SUM:=84ad98c36393d7d238a229da67e23903 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dir300-flash ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Flashes a custom firmware on the DIR-300 wireless router ++ URL:=http://x-alina.freifunk-potsdam.de/ ++ PKGARCH:=all ++endef ++ ++define Download/ap61.ram ++ URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W ++ FILE:=ap61.ram ++ MD5SUM:=4aaec2bff1edffe8c49003ed9363ad8b ++endef ++ ++define Download/ap61.rom ++ URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W ++ FILE:=ap61.rom ++ MD5SUM:=eb7817d202c297ae5dc6b6b897632601 ++endef ++ ++define Download/dir300redboot.zip ++ URL:=http://www.shadowandy.net/wp/wp-content/uploads ++ FILE:=dir300redboot.zip ++ MD5SUM:=5fdb24432aa200b508026215d821e126 ++endef ++ ++define Build/Compile ++ unzip -n '$(DL_DIR)/dir300redboot.zip' -d '$(PKG_BUILD_DIR)' ++endef ++ ++define Package/dir300-flash/install ++ $(INSTALL_DIR) -- '$(1)/usr/sbin' ++ $(INSTALL_BIN) -- '$(PKG_BUILD_DIR)/dir300-flash.sh' '$(1)/usr/sbin/dir300-flash' ++ $(INSTALL_DIR) -- '$(1)/usr/share/dir300-flash' ++ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.ram' '$(1)/usr/share/dir300-flash' ++ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.rom' '$(1)/usr/share/dir300-flash' ++ $(INSTALL_DATA) -- '$(PKG_BUILD_DIR)/dir300redboot.rom' '$(1)/usr/share/dir300-flash' ++endef ++ ++$(eval $(call BuildPackage,dir300-flash)) ++$(eval $(call Download,ap61.ram)) ++$(eval $(call Download,ap61.rom)) ++$(eval $(call Download,dir300redboot.zip)) +diff --git a/feeds/packages/utils/disktype/.svn/entries b/feeds/packages/utils/disktype/.svn/entries +new file mode 100644 +index 0000000..10fad01 +--- /dev/null ++++ b/feeds/packages/utils/disktype/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/disktype ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-20T10:20:58.834732Z ++19774 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++fcb130e5a788fea970a05b2b5fee81ef ++2010-02-20T10:20:58.834732Z ++19774 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1206 ++ +diff --git a/feeds/packages/utils/disktype/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/disktype/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..667efde +--- /dev/null ++++ b/feeds/packages/utils/disktype/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=disktype ++PKG_VERSION:=9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME)/ ++PKG_MD5SUM:=25a673f162b9c01cd565109202559489 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/disktype ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Disk format detection ++ SUBMENU:=Filesystem ++ URL:=http://disktype.sourceforge.net ++endef ++ ++define Package/disktype/description ++ The purpose of disktype is to detect the content format of a disk or disk image. ++ It knows about common file systems, partition tables, and boot codes. ++ The program is written in C and is designed to compile on any modern Unix flavour. ++ It is self-contained and in general works without special libraries or headers. ++ Some system-dependant features can be used to gather additional information. ++endef ++ ++MAKE_FLAGS += CC="$(TARGET_CC) $(TARGET_CFLAGS)" ++ ++define Package/disktype/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,disktype)) +diff --git a/feeds/packages/utils/disktype/Makefile b/feeds/packages/utils/disktype/Makefile +new file mode 100644 +index 0000000..667efde +--- /dev/null ++++ b/feeds/packages/utils/disktype/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=disktype ++PKG_VERSION:=9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME)/ ++PKG_MD5SUM:=25a673f162b9c01cd565109202559489 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/disktype ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Disk format detection ++ SUBMENU:=Filesystem ++ URL:=http://disktype.sourceforge.net ++endef ++ ++define Package/disktype/description ++ The purpose of disktype is to detect the content format of a disk or disk image. ++ It knows about common file systems, partition tables, and boot codes. ++ The program is written in C and is designed to compile on any modern Unix flavour. ++ It is self-contained and in general works without special libraries or headers. ++ Some system-dependant features can be used to gather additional information. ++endef ++ ++MAKE_FLAGS += CC="$(TARGET_CC) $(TARGET_CFLAGS)" ++ ++define Package/disktype/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,disktype)) +diff --git a/feeds/packages/utils/dmidecode/.svn/entries b/feeds/packages/utils/dmidecode/.svn/entries +new file mode 100644 +index 0000000..f857d21 +--- /dev/null ++++ b/feeds/packages/utils/dmidecode/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dmidecode ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-20T04:56:15.001152Z ++25602 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++46afcae00e8414ba39818b975dda6d6d ++2011-02-20T04:56:15.001152Z ++25602 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1011 ++ +diff --git a/feeds/packages/utils/dmidecode/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dmidecode/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c1f4a9f +--- /dev/null ++++ b/feeds/packages/utils/dmidecode/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=dmidecode ++PKG_VERSION:=2.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/dmidecode ++PKG_MD5SUM:=535487cc041f2db746587cf40a2059f0 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dmidecode ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@TARGET_x86 ++ 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/feeds/packages/utils/dmidecode/Makefile b/feeds/packages/utils/dmidecode/Makefile +new file mode 100644 +index 0000000..c1f4a9f +--- /dev/null ++++ b/feeds/packages/utils/dmidecode/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=dmidecode ++PKG_VERSION:=2.11 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/dmidecode ++PKG_MD5SUM:=535487cc041f2db746587cf40a2059f0 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dmidecode ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@TARGET_x86 ++ 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/feeds/packages/utils/dosfstools/.svn/entries b/feeds/packages/utils/dosfstools/.svn/entries +new file mode 100644 +index 0000000..fa37beb +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dosfstools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-28T13:53:05.329350Z ++34399 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++b994924d3225ccfe8ddb13c4ef65564d ++2012-11-28T13:53:05.329350Z ++34399 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2505 ++ +diff --git a/feeds/packages/utils/dosfstools/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/dosfstools/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/dosfstools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dosfstools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f04c36 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# 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:=dosfstools ++PKG_VERSION:=3.0.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fossies.org/linux/misc ++PKG_MD5SUM:=4c1f1e72b82371704f93ebdd3c7b6259 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dosfstools/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.daniel-baumann.ch/software/dosfstools/ ++ SUBMENU:=Filesystem ++endef ++ ++define Package/dosfsck ++ $(call Package/dosfstools/Default) ++ TITLE:=dosfsck ++endef ++ ++define Package/dosfslabel ++ $(call Package/dosfstools/Default) ++ TITLE:=dosfslabel ++endef ++ ++define Package/mkdosfs ++ $(call Package/dosfstools/Default) ++ TITLE:=mkdosfs ++endef ++ ++define Package/dosfsck/description ++ Utilities to create and check MS-DOS FAT filesystems. ++ (fsck.vfat and fsck.msdos for checking integrity of FAT volumes) ++endef ++ ++define Package/dosfslabel/description ++ Utilities to create and check MS-DOS FAT filesystems. ++ (dosfslabel 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.msdos for creating FAT volumes) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \ ++ PREFIX="/usr" \ ++ SBINDIR="/usr/sbin" \ ++ 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/dosfsck $(1)/usr/sbin/ ++ (cd $(1)/usr/sbin; ln -sf dosfsck fsck.msdos; ln -sf dosfsck fsck.vfat) ++endef ++ ++define Package/dosfslabel/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfslabel $(1)/usr/sbin/ ++endef ++ ++define Package/mkdosfs/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ ++ (cd $(1)/usr/sbin; ln -sf mkdosfs mkfs.msdos; ln -sf mkdosfs mkfs.vfat) ++endef ++ ++$(eval $(call BuildPackage,dosfsck)) ++$(eval $(call BuildPackage,dosfslabel)) ++$(eval $(call BuildPackage,mkdosfs)) +diff --git a/feeds/packages/utils/dosfstools/Makefile b/feeds/packages/utils/dosfstools/Makefile +new file mode 100644 +index 0000000..0f04c36 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/Makefile +@@ -0,0 +1,96 @@ ++# ++# 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:=dosfstools ++PKG_VERSION:=3.0.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fossies.org/linux/misc ++PKG_MD5SUM:=4c1f1e72b82371704f93ebdd3c7b6259 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dosfstools/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.daniel-baumann.ch/software/dosfstools/ ++ SUBMENU:=Filesystem ++endef ++ ++define Package/dosfsck ++ $(call Package/dosfstools/Default) ++ TITLE:=dosfsck ++endef ++ ++define Package/dosfslabel ++ $(call Package/dosfstools/Default) ++ TITLE:=dosfslabel ++endef ++ ++define Package/mkdosfs ++ $(call Package/dosfstools/Default) ++ TITLE:=mkdosfs ++endef ++ ++define Package/dosfsck/description ++ Utilities to create and check MS-DOS FAT filesystems. ++ (fsck.vfat and fsck.msdos for checking integrity of FAT volumes) ++endef ++ ++define Package/dosfslabel/description ++ Utilities to create and check MS-DOS FAT filesystems. ++ (dosfslabel 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.msdos for creating FAT volumes) ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \ ++ PREFIX="/usr" \ ++ SBINDIR="/usr/sbin" \ ++ 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/dosfsck $(1)/usr/sbin/ ++ (cd $(1)/usr/sbin; ln -sf dosfsck fsck.msdos; ln -sf dosfsck fsck.vfat) ++endef ++ ++define Package/dosfslabel/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfslabel $(1)/usr/sbin/ ++endef ++ ++define Package/mkdosfs/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ ++ (cd $(1)/usr/sbin; ln -sf mkdosfs mkfs.msdos; ln -sf mkdosfs mkfs.vfat) ++endef ++ ++$(eval $(call BuildPackage,dosfsck)) ++$(eval $(call BuildPackage,dosfslabel)) ++$(eval $(call BuildPackage,mkdosfs)) +diff --git a/feeds/packages/utils/dosfstools/files/.svn/entries b/feeds/packages/utils/dosfstools/files/.svn/entries +new file mode 100644 +index 0000000..a5449ed +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dosfstools/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-09T01:11:17.372983Z ++30858 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++dosfsck.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++579562c45e380acbb2a9025157eb2da2 ++2012-03-09T01:11:17.372983Z ++30858 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++657 ++ +diff --git a/feeds/packages/utils/dosfstools/files/.svn/text-base/dosfsck.sh.svn-base b/feeds/packages/utils/dosfstools/files/.svn/text-base/dosfsck.sh.svn-base +new file mode 100644 +index 0000000..bcc29b9 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/files/.svn/text-base/dosfsck.sh.svn-base +@@ -0,0 +1,30 @@ ++#!/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/feeds/packages/utils/dosfstools/files/dosfsck.sh b/feeds/packages/utils/dosfstools/files/dosfsck.sh +new file mode 100644 +index 0000000..bcc29b9 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/files/dosfsck.sh +@@ -0,0 +1,30 @@ ++#!/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/feeds/packages/utils/dosfstools/patches/.svn/entries b/feeds/packages/utils/dosfstools/patches/.svn/entries +new file mode 100644 +index 0000000..348288e +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dosfstools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-09T01:11:17.372983Z ++30858 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-linux_26_headers.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ed3b75388d53e53fbee6e7eb26e745e6 ++2012-03-09T01:11:17.372983Z ++30858 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1177 ++ +diff --git a/feeds/packages/utils/dosfstools/patches/.svn/prop-base/002-linux_26_headers.patch.svn-base b/feeds/packages/utils/dosfstools/patches/.svn/prop-base/002-linux_26_headers.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/patches/.svn/prop-base/002-linux_26_headers.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/dosfstools/patches/.svn/text-base/002-linux_26_headers.patch.svn-base b/feeds/packages/utils/dosfstools/patches/.svn/text-base/002-linux_26_headers.patch.svn-base +new file mode 100644 +index 0000000..b55a7c8 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/patches/.svn/text-base/002-linux_26_headers.patch.svn-base +@@ -0,0 +1,54 @@ ++--- a/src/common.h +++++ b/src/common.h ++@@ -19,7 +19,7 @@ ++ can be found in /usr/share/common-licenses/GPL-3 file. ++ */ ++ ++-#include +++#include ++ ++ #ifndef _COMMON_H ++ #define _COMMON_H ++--- a/src/dosfsck.h +++++ b/src/dosfsck.h ++@@ -31,7 +31,7 @@ ++ #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ ++ #define _LINUX_FS_H /* hack to avoid inclusion of */ ++ ++-#include +++#include ++ #include ++ ++ #include ++--- a/src/file.c +++++ b/src/file.c ++@@ -33,7 +33,7 @@ ++ #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ ++ #define _LINUX_FS_H /* hack to avoid inclusion of */ ++ ++-#include +++#include ++ ++ #include ++ ++--- a/src/io.c +++++ b/src/io.c ++@@ -39,6 +39,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ ++ #include "dosfsck.h" ++--- a/src/mkdosfs.c +++++ b/src/mkdosfs.c ++@@ -63,7 +63,7 @@ ++ #include ++ #include ++ ++-#include +++#include ++ ++ #if __BYTE_ORDER == __BIG_ENDIAN ++ +diff --git a/feeds/packages/utils/dosfstools/patches/002-linux_26_headers.patch b/feeds/packages/utils/dosfstools/patches/002-linux_26_headers.patch +new file mode 100644 +index 0000000..b55a7c8 +--- /dev/null ++++ b/feeds/packages/utils/dosfstools/patches/002-linux_26_headers.patch +@@ -0,0 +1,54 @@ ++--- a/src/common.h +++++ b/src/common.h ++@@ -19,7 +19,7 @@ ++ can be found in /usr/share/common-licenses/GPL-3 file. ++ */ ++ ++-#include +++#include ++ ++ #ifndef _COMMON_H ++ #define _COMMON_H ++--- a/src/dosfsck.h +++++ b/src/dosfsck.h ++@@ -31,7 +31,7 @@ ++ #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ ++ #define _LINUX_FS_H /* hack to avoid inclusion of */ ++ ++-#include +++#include ++ #include ++ ++ #include ++--- a/src/file.c +++++ b/src/file.c ++@@ -33,7 +33,7 @@ ++ #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ ++ #define _LINUX_FS_H /* hack to avoid inclusion of */ ++ ++-#include +++#include ++ ++ #include ++ ++--- a/src/io.c +++++ b/src/io.c ++@@ -39,6 +39,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ ++ #include "dosfsck.h" ++--- a/src/mkdosfs.c +++++ b/src/mkdosfs.c ++@@ -63,7 +63,7 @@ ++ #include ++ #include ++ ++-#include +++#include ++ ++ #if __BYTE_ORDER == __BIG_ENDIAN ++ +diff --git a/feeds/packages/utils/dstat/.svn/entries b/feeds/packages/utils/dstat/.svn/entries +new file mode 100644 +index 0000000..351a6b7 +--- /dev/null ++++ b/feeds/packages/utils/dstat/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dstat ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-24T14:19:15.731671Z ++29888 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1bbe66b5901df29037a390cdcf595c0f ++2012-01-24T14:19:15.731671Z ++29888 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1281 ++ +diff --git a/feeds/packages/utils/dstat/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dstat/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c05d405 +--- /dev/null ++++ b/feeds/packages/utils/dstat/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# Copyright (C) 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:=dstat ++PKG_VERSION:=0.7.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dag.wieers.com/home-made/dstat/ ++PKG_MD5SUM:=bfea4dc8037a0b18fc40a4dfc104dcc8 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dstat ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Versatile resource statistics tool ++ URL:=http://dag.wieers.com/home-made/dstat/ ++ DEPENDS:=+python ++endef ++ ++define Package/dstat/description ++ Dstat is a versatile replacement for vmstat, iostat, netstat ++ and ifstat. Dstat overcomes some of their limitations and ++ adds some extra features, more counters and flexibility. ++ Dstat is handy for monitoring systems during performance ++ tuning tests, benchmarks or troubleshooting. ++endef ++ ++define Build/Compile ++endef ++ ++define Package/dstat/install ++ $(INSTALL_DIR) $(1)/usr/share/dstat ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dstat $(1)/usr/share/dstat/dstat.py ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/plugins/dstat_*.py $(1)/usr/share/dstat/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(LN) -sf ../share/dstat/dstat.py $(1)/usr/bin/dstat ++endef ++ ++$(eval $(call BuildPackage,dstat)) +diff --git a/feeds/packages/utils/dstat/Makefile b/feeds/packages/utils/dstat/Makefile +new file mode 100644 +index 0000000..c05d405 +--- /dev/null ++++ b/feeds/packages/utils/dstat/Makefile +@@ -0,0 +1,47 @@ ++# ++# Copyright (C) 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:=dstat ++PKG_VERSION:=0.7.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dag.wieers.com/home-made/dstat/ ++PKG_MD5SUM:=bfea4dc8037a0b18fc40a4dfc104dcc8 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dstat ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Versatile resource statistics tool ++ URL:=http://dag.wieers.com/home-made/dstat/ ++ DEPENDS:=+python ++endef ++ ++define Package/dstat/description ++ Dstat is a versatile replacement for vmstat, iostat, netstat ++ and ifstat. Dstat overcomes some of their limitations and ++ adds some extra features, more counters and flexibility. ++ Dstat is handy for monitoring systems during performance ++ tuning tests, benchmarks or troubleshooting. ++endef ++ ++define Build/Compile ++endef ++ ++define Package/dstat/install ++ $(INSTALL_DIR) $(1)/usr/share/dstat ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dstat $(1)/usr/share/dstat/dstat.py ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/plugins/dstat_*.py $(1)/usr/share/dstat/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(LN) -sf ../share/dstat/dstat.py $(1)/usr/bin/dstat ++endef ++ ++$(eval $(call BuildPackage,dstat)) +diff --git a/feeds/packages/utils/dt/.svn/entries b/feeds/packages/utils/dt/.svn/entries +new file mode 100644 +index 0000000..17301e6 +--- /dev/null ++++ b/feeds/packages/utils/dt/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T22:19:38.540891Z ++32218 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++1424e9d9d4c0897ac49e7491b9821e96 ++2012-06-11T22:19:38.540891Z ++32218 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1552 ++ +diff --git a/feeds/packages/utils/dt/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d3a0147 +--- /dev/null ++++ b/feeds/packages/utils/dt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=dt ++PKG_VERSION:=15.14 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-source.tar.gz ++PKG_SOURCE_URL:=http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/$(PKG_NAME)/ ++PKG_MD5SUM:=5776233a2d301a50b314306538257a45 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK= \ ++ zcat $(DL_DIR)/$(PKG_SOURCE) | \ ++ $(TAR) -C $(PKG_BUILD_DIR) --strip-components 2 $(TAR_OPTIONS); ++ ++define Package/dt ++ CATEGORY:=Utilities ++ SECTION:=utils ++ TITLE:=A generic data test program ++ URL:=http://www.scsifaq.org/RMiller_Tools/index.html ++ DEPENDS:=+libpthread +librt ++endef ++ ++define Package/dt/description ++ dt is a generic data test program used to verify proper operation of peripherals, ++ file systems, device drivers, or any data stream supported by the operating system. ++ In its' simplest mode of operation, dt writes and then verifys its' default data pattern, ++ then displays performance statisics and other test parameters before exiting. ++ Since verification of data is performed, dt can be thought of as a generic diagnostic tool. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.linux \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -DFIFO -DMMAP -DTTY -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ ++ dt ++endef ++ ++define Package/dt/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dt $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dt)) +diff --git a/feeds/packages/utils/dt/Makefile b/feeds/packages/utils/dt/Makefile +new file mode 100644 +index 0000000..d3a0147 +--- /dev/null ++++ b/feeds/packages/utils/dt/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=dt ++PKG_VERSION:=15.14 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-source.tar.gz ++PKG_SOURCE_URL:=http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/$(PKG_NAME)/ ++PKG_MD5SUM:=5776233a2d301a50b314306538257a45 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK= \ ++ zcat $(DL_DIR)/$(PKG_SOURCE) | \ ++ $(TAR) -C $(PKG_BUILD_DIR) --strip-components 2 $(TAR_OPTIONS); ++ ++define Package/dt ++ CATEGORY:=Utilities ++ SECTION:=utils ++ TITLE:=A generic data test program ++ URL:=http://www.scsifaq.org/RMiller_Tools/index.html ++ DEPENDS:=+libpthread +librt ++endef ++ ++define Package/dt/description ++ dt is a generic data test program used to verify proper operation of peripherals, ++ file systems, device drivers, or any data stream supported by the operating system. ++ In its' simplest mode of operation, dt writes and then verifys its' default data pattern, ++ then displays performance statisics and other test parameters before exiting. ++ Since verification of data is performed, dt can be thought of as a generic diagnostic tool. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.linux \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -DFIFO -DMMAP -DTTY -D__linux__ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ ++ dt ++endef ++ ++define Package/dt/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dt $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dt)) +diff --git a/feeds/packages/utils/dtach/.svn/entries b/feeds/packages/utils/dtach/.svn/entries +new file mode 100644 +index 0000000..e23a351 +--- /dev/null ++++ b/feeds/packages/utils/dtach/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/dtach ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++73545a471028a466dbd982e5a1099e23 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1184 ++ +diff --git a/feeds/packages/utils/dtach/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/dtach/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/dtach/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/dtach/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/dtach/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e027420 +--- /dev/null ++++ b/feeds/packages/utils/dtach/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=dtach ++PKG_VERSION:=0.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/dtach ++PKG_MD5SUM:=ec5999f3b6bb67da19754fcb2e5221f3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dtach ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A program that emulates the dtach feature of screen ++ URL:=http://dtach.sourceforge.net/ ++endef ++ ++define Package/dtach/description ++ dtach is a tiny program that emulates the detach feature of screen, ++ allowing you to run a program in an environment that is protected from ++ the controlling terminal and attach to it later. dtach does not keep ++ track of the contents of the screen, and thus works best with programs ++ that know how to redraw themselves. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/dtach/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dtach $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dtach)) +diff --git a/feeds/packages/utils/dtach/Makefile b/feeds/packages/utils/dtach/Makefile +new file mode 100644 +index 0000000..e027420 +--- /dev/null ++++ b/feeds/packages/utils/dtach/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=dtach ++PKG_VERSION:=0.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/dtach ++PKG_MD5SUM:=ec5999f3b6bb67da19754fcb2e5221f3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/dtach ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A program that emulates the dtach feature of screen ++ URL:=http://dtach.sourceforge.net/ ++endef ++ ++define Package/dtach/description ++ dtach is a tiny program that emulates the detach feature of screen, ++ allowing you to run a program in an environment that is protected from ++ the controlling terminal and attach to it later. dtach does not keep ++ track of the contents of the screen, and thus works best with programs ++ that know how to redraw themselves. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/dtach/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dtach $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,dtach)) +diff --git a/feeds/packages/utils/empty/.svn/entries b/feeds/packages/utils/empty/.svn/entries +new file mode 100644 +index 0000000..24613ae +--- /dev/null ++++ b/feeds/packages/utils/empty/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/empty ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-19T16:29:51.430787Z ++17610 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c2b414b5a61e6444fb33fbda8eec01eb ++2009-09-19T16:29:51.430787Z ++17610 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1123 ++ +diff --git a/feeds/packages/utils/empty/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/empty/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9c3b3c9 +--- /dev/null ++++ b/feeds/packages/utils/empty/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=empty ++PKG_VERSION:=0.6.18b ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/empty ++PKG_MD5SUM:=2cf5e1b8ff58c41b63738bdc7c24fbc2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/empty ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Run applications under pseudo-terminal sessions ++ URL:=http://empty.sourceforge.net ++endef ++ ++define Package/empty/description ++ empty is an utility that provides an interface to execute and/or interact ++ with processes under pseudo-terminal sessions (PTYs). This tool is ++ definitely useful in programming of shell scripts designed to communicate ++ with interactive programs like telnet, ssh, ftp, etc. In some cases, empty ++ can be the simplest replacement for TCL/expect or other similar ++ programming tools. ++endef ++ ++define Package/empty/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,empty)) +diff --git a/feeds/packages/utils/empty/Makefile b/feeds/packages/utils/empty/Makefile +new file mode 100644 +index 0000000..9c3b3c9 +--- /dev/null ++++ b/feeds/packages/utils/empty/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=empty ++PKG_VERSION:=0.6.18b ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/empty ++PKG_MD5SUM:=2cf5e1b8ff58c41b63738bdc7c24fbc2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/empty ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Run applications under pseudo-terminal sessions ++ URL:=http://empty.sourceforge.net ++endef ++ ++define Package/empty/description ++ empty is an utility that provides an interface to execute and/or interact ++ with processes under pseudo-terminal sessions (PTYs). This tool is ++ definitely useful in programming of shell scripts designed to communicate ++ with interactive programs like telnet, ssh, ftp, etc. In some cases, empty ++ can be the simplest replacement for TCL/expect or other similar ++ programming tools. ++endef ++ ++define Package/empty/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,empty)) +diff --git a/feeds/packages/utils/event_test/.svn/entries b/feeds/packages/utils/event_test/.svn/entries +new file mode 100644 +index 0000000..a580c82 +--- /dev/null ++++ b/feeds/packages/utils/event_test/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/event_test ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f893697f4b81fdbc13c0953aed4a323b ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++747 ++ +diff --git a/feeds/packages/utils/event_test/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/event_test/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/event_test/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/event_test/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/event_test/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c10fe4b +--- /dev/null ++++ b/feeds/packages/utils/event_test/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=event_test ++PKG_VERSION:=0.01 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/event_test ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/event_test ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Event device test program ++endef ++ ++define Package/event_test/description ++ This package contains an utility for testing event devices. ++endef ++ ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/event_test/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/event_test $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,event_test)) +diff --git a/feeds/packages/utils/event_test/Makefile b/feeds/packages/utils/event_test/Makefile +new file mode 100644 +index 0000000..c10fe4b +--- /dev/null ++++ b/feeds/packages/utils/event_test/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=event_test ++PKG_VERSION:=0.01 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/event_test ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/event_test ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Event device test program ++endef ++ ++define Package/event_test/description ++ This package contains an utility for testing event devices. ++endef ++ ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/event_test/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/event_test $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,event_test)) +diff --git a/feeds/packages/utils/event_test/src/.svn/entries b/feeds/packages/utils/event_test/src/.svn/entries +new file mode 100644 +index 0000000..250e638 +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/event_test/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++evtest.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++bfe4892f6ae87d5e0ec63de2fa81ad42 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++13683 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7866f3d089af703083471502a28e150b ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++286 ++ +diff --git a/feeds/packages/utils/event_test/src/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/event_test/src/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/event_test/src/.svn/prop-base/evtest.c.svn-base b/feeds/packages/utils/event_test/src/.svn/prop-base/evtest.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/.svn/prop-base/evtest.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/event_test/src/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/event_test/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..74eedbf +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,17 @@ ++# ++# Copyright (C) 2008 OpenWrt.org ++# ++# This is free software, licensed under GNU General Public Licese v2. ++# See /LICENSE for more information. ++# ++ ++all: event_test ++ ++%.o: %.c ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^ ++ ++event_test: evtest.o ++ $(CC) -o $@ $^ ++ ++clean: ++ rm -f *.o event_test +diff --git a/feeds/packages/utils/event_test/src/.svn/text-base/evtest.c.svn-base b/feeds/packages/utils/event_test/src/.svn/text-base/evtest.c.svn-base +new file mode 100644 +index 0000000..b62209b +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/.svn/text-base/evtest.c.svn-base +@@ -0,0 +1,309 @@ ++/* ++ * ++ * Copyright (c) 1999-2000 Vojtech Pavlik ++ * ++ * As modified by Rene van Paassen, May 19, 2005 ++ * Event device test program ++ */ ++ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Should you need to contact me, the author, you can do so either by ++ * e-mail - mail your message to , or by paper mail: ++ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++char *events[EV_MAX + 1] = { "Reset", "Key", "Relative", "Absolute", "MSC", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, NULL, "LED", "Sound", NULL, "Repeat", "ForceFeedback", "Power", "ForceFeedbackStatus"}; ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0) ++ ++/* Keys updated with version 2.6.11, am assuming this is 2.6 style */ ++char *keys[KEY_MAX + 1] = ++ { "Reserved", "Esc", /* 0, 1 */ ++ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", /* 2 - 11 */ ++ "Minus", "Equal", "Backspace", "Tab", /* 12 - 15 */ ++ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", /* 16 - 25 */ ++ "LeftBrace", "RightBrace", "Enter", "LeftControl", /* 26 - 29 */ ++ "A", "S", "D", "F", "G", "H", "J", "K", "L", /* 30 - 38 */ ++ "Semicolon", "Apostrophe", "Grave", "LeftShift", "BackSlash", /* 39 - 43 */ ++ "Z", "X", "C", "V", "B", "N", "M", /* 44 - 50 */ ++ "Comma", "Dot", "Slash", "RightShift", "KPAsterisk", ++ "LeftAlt", "Space", "CapsLock", /* 51 - 58 */ ++ "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", /* 59 - 68 */ ++ "NumLock", "ScrollLock", /* 69, 70 */ ++ "KP7", "KP8", "KP9", "KPMinus", /* 71 - 74 */ ++ "KP4", "KP5", "KP6", "KPPlus", /* 75 - 78 */ ++ "KP1", "KP2", "KP3", "KP0", "KPDot", /* 79 - 83 */ ++ NULL, ++ "ZENKAKUHANKAKU", /* 85 */ ++ "102nd", "F11", "F12", /* 86 - 88 */ ++ "R0", "KATAKANA", "HIRAGANA", "HENKAN", /* 89 - 92 */ ++ "KATAKANAHIRAGANA", "MUHENKAN", "KPJPCOMMA", /* 93 - 95 */ ++ "KPEnter", "RightCtrl", "KPSlash", "SysRq", /* 96 - 99 */ ++ "RightAlt", "LineFeed", /*100 - 101 */ ++ "Home", "Up", "PageUp", "Left", "Right", "End", "Down", ++ "PageDown", "Insert", "Delete", /* 102 - 111 */ ++ "Macro", "Mute", "VolumeDown", "VolumeUp", "Power", /* 112 - 116 */ ++ "KPEqual", "KPPlusMinus", "Pause", /* 117 - 119 */ ++ NULL, ++ "KPComma", /* 121 */ ++ "Hanguel", "Hanja", "Yen", /* 122 - 124 */ ++ "LeftMeta", "RightMeta", "Compose", /* 125 - 127 */ ++ "Stop", "Again", "Props", "Undo", "Front", "Copy", "Open", ++ "Paste", "Find", "Cut", "Help", "Menu", "Calc", "Setup", ++ "Sleep", "WakeUp", "File", "SendFile", "DeleteFile", "X-fer", ++ "Prog1", "Prog2", "WWW", "MSDOS", "Coffee", "Direction", ++ "CycleWindows", "Mail", "Bookmarks", "Computer", ++ "Back", "Forward", "CloseCD", "EjectCD", "EjectCloseCD", ++ "NextSong", "PlayPause", "PreviousSong", "StopCD", ++ "Record", "Rewind", "Phone", /* 128 - 169 */ ++ "ISOKey", "Config", "HomePage", "Refresh", "Exit", ++ "Move", "Edit", "ScrollUp", "ScrollDown", /* 170 - 178 */ ++ "KPLeftParenthesis", "KPRightParenthesis", /* 179 - 180 */ ++ NULL, NULL, ++ "F13", "F14", "F15", "F16", "F17", "F18", ++ "F19", "F20", "F21", "F22", "F23", "F24", /* 183 - 194 */ ++ NULL, NULL, NULL, NULL, NULL, ++ "PlayCD", "PauseCD", "Prog3", "Prog4", NULL, ++ "Suspend", "Close", /* 200 - 206 */ ++ "Play", "FastForward", "BassBoost", "Print", "HP", "Camera", ++ "Sound", "Question", "Email", "Chat", "Search", ++ "Connect", "Finance", "Sport", "Shop", "AltErase", ++ "Cancel", "BrightnessDown", "BrightnessUp", "Media", /* 207 - 226 */ ++ "SwitchVideoMode", ++ "KBDIllumToggle", "KBDIllumDown", "KBDIllumUp", /* 227 - 230 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Unknown", /* 240 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Btn0", "Btn1", "Btn2", "Btn3", "Btn4", ++ "Btn5", "Btn6", "Btn7", "Btn8", "Btn9", /* 256 - 265 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, ++ "LeftBtn", "RightBtn", "MiddleBtn", "SideBtn", ++ "ExtraBtn", "ForwardBtn", "BackBtn", "TaskBtn", /* 0x110 - 0x117 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Trigger", "ThumbBtn", "ThumbBtn2", "TopBtn", ++ "TopBtn2", "PinkieBtn", "BaseBtn", "BaseBtn2", ++ "BaseBtn3", "BaseBtn4", "BaseBtn5", "BaseBtn6", ++ NULL, NULL, NULL, "BtnDead", /* 0x120 - 0x12f */ ++ "BtnA", "BtnB", "BtnC", "BtnX", ++ "BtnY", "BtnZ", "BtnTL", "BtnTR", ++ "BtnTL2", "BtnTR2", "BtnSelect", "BtnStart", ++ "BtnMode", "BtnThumbL", "BtnThumbR", /* 0x130 - 0x13e */ NULL, ++ "ToolPen", "ToolRubber", "ToolBrush", "ToolPencil", ++ "ToolAirbrush", "ToolFinger", "ToolMouse", "ToolLens", /* 0x140-0x147 */ ++ NULL, NULL, "Touch", "Stylus", ++ "Stylus2", "DoubleTap", "TripleTap", /* 0x14a - 0x14e */ NULL, ++ "GearUp", "GearDown", /* 0x150, 0x151 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Ok", "Select", "Goto", "Clear", "Power2", "Option", "Info", "Time", ++ "Vendor", "Archive", "Program", "Channel", ++ "Favorites", "Epg", "Pvr", "Mhp", ++ "Language", "Title", "Subtitle", "Angle", ++ "Zoom", "Mode", "Keyboard", "Screen", ++ "Pc", "Tv", "Tv2", "Vcr", "Vcr2", "Sat", "Sat2", "Cd", ++ "Tape", "Radio", "Tuner", "Player", "Text", "Dvd", "Aux", "Mp3", ++ "Audio", "Video", "Directory", "List", ++ "Memo", "Calendar", "Red", "Green", ++ "Yellow", "Blue", "Channelup", "Channeldown", ++ "First", "Last", "Ab", "Next", ++ "Restart", "Slow", "Shuffle", "Break", ++ "Previous", "Digits", "Teen", "Twen", /* 160 - 19f */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "DelEol", "DelEos", "InsLine", "DelLine", /* 1c0 - 1c3 */ ++ NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "FN", "FN_ESC", ++ "FN_F1", "FN_F2", "FN_F3", "FN_F4", "FN_F5", ++ "FN_F6", "FN_F7", "FN_F8", "FN_F9", "FN_F10", ++ "FN_F11", "FN_F12", ++ "FN_1", "FN_2", "FN_D", "FN_E", "FN_F", "FN_S", "FN_B" /* 0x1d0 - 0x1e4 */ ++ }; ++ ++#else ++ ++/* Keys I used with 2.4 kernels. */ ++char *keys[KEY_MAX + 1] = { "Reserved", "Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Equal", "Backspace", ++"Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "LeftBrace", "RightBrace", "Enter", "LeftControl", "A", "S", "D", "F", "G", ++"H", "J", "K", "L", "Semicolon", "Apostrophe", "Grave", "LeftShift", "BackSlash", "Z", "X", "C", "V", "B", "N", "M", "Comma", "Dot", ++"Slash", "RightShift", "KPAsterisk", "LeftAlt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", ++"NumLock", "ScrollLock", "KP7", "KP8", "KP9", "KPMinus", "KP4", "KP5", "KP6", "KPPlus", "KP1", "KP2", "KP3", "KP0", "KPDot", "103rd", ++"F13", "102nd", "F11", "F12", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "KPEnter", "RightCtrl", "KPSlash", "SysRq", ++"RightAlt", "LineFeed", "Home", "Up", "PageUp", "Left", "Right", "End", "Down", "PageDown", "Insert", "Delete", "Macro", "Mute", ++"VolumeDown", "VolumeUp", "Power", "KPEqual", "KPPlusMinus", "Pause", "F21", "F22", "F23", "F24", "KPComma", "LeftMeta", "RightMeta", ++"Compose", "Stop", "Again", "Props", "Undo", "Front", "Copy", "Open", "Paste", "Find", "Cut", "Help", "Menu", "Calc", "Setup", ++"Sleep", "WakeUp", "File", "SendFile", "DeleteFile", "X-fer", "Prog1", "Prog2", "WWW", "MSDOS", "Coffee", "Direction", ++"CycleWindows", "Mail", "Bookmarks", "Computer", "Back", "Forward", "CloseCD", "EjectCD", "EjectCloseCD", "NextSong", "PlayPause", ++"PreviousSong", "StopCD", "Record", "Rewind", "Phone", "ISOKey", "Config", "HomePage", "Refresh", "Exit", "Move", "Edit", "ScrollUp", ++"ScrollDown", "KPLeftParenthesis", "KPRightParenthesis", ++"International1", "International2", "International3", "International4", "International5", ++"International6", "International7", "International8", "International9", ++"Language1", "Language2", "Language3", "Language4", "Language5", "Language6", "Language7", "Language8", "Language9", ++NULL, ++"PlayCD", "PauseCD", "Prog3", "Prog4", "Suspend", "Close", ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++"Btn0", "Btn1", "Btn2", "Btn3", "Btn4", "Btn5", "Btn6", "Btn7", "Btn8", "Btn9", ++NULL, NULL, NULL, NULL, NULL, NULL, ++"LeftBtn", "RightBtn", "MiddleBtn", "SideBtn", "ExtraBtn", "ForwardBtn", "BackBtn", ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++"Trigger", "ThumbBtn", "ThumbBtn2", "TopBtn", "TopBtn2", "PinkieBtn", ++"BaseBtn", "BaseBtn2", "BaseBtn3", "BaseBtn4", "BaseBtn5", "BaseBtn6", ++NULL, NULL, NULL, "BtnDead", ++"BtnA", "BtnB", "BtnC", "BtnX", "BtnY", "BtnZ", "BtnTL", "BtnTR", "BtnTL2", "BtnTR2", "BtnSelect", "BtnStart", "BtnMode", ++"BtnThumbL", "BtnThumbR", NULL, ++"ToolPen", "ToolRubber", "ToolBrush", "ToolPencil", "ToolAirbrush", "ToolFinger", "ToolMouse", "ToolLens", NULL, NULL, ++"Touch", "Stylus", "Stylus2" }; ++#endif ++ ++char *absval[5] = { "Value", "Min ", "Max ", "Fuzz ", "Flat " }; ++char *relatives[REL_MAX + 1] = ++ { "X", "Y", "Z", NULL, ++ NULL, NULL, "HWheel", "Dial", ++ /* 0x08: */ "Wheel", "MISC" }; ++char *absolutes[ABS_MAX + 1] = ++ { "X", "Y", "Z", "Rx", "Ry", "Rz", "Throttle", "Rudder", ++ "Wheel", "Gas", "Brake", NULL, NULL, NULL, NULL, NULL, ++ /* 0x10: */ "Hat0X", "Hat0Y", "Hat1X", "Hat1Y", ++ "Hat2X", "Hat2Y", "Hat3X", "Hat 3Y", ++ "Pressure", "Distance", "XTilt", "YTilt", ++ "ToolWidth", NULL, NULL, NULL, ++ /* 0x20: */ "Volume", NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, ++ /* 0x28: */ "Misc" }; ++char *leds[LED_MAX + 1] = { "NumLock", "CapsLock", "ScrollLock", "Compose", "Kana", "Sleep", "Suspend", "Mute" }; ++char *repeats[REP_MAX + 1] = { "Delay", "Period" }; ++char *sounds[SND_MAX + 1] = { "Bell", "Click" }; ++ ++char **names[EV_MAX + 1] = { events, keys, relatives, absolutes, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, leds, sounds, NULL, repeats, NULL, NULL, NULL }; ++ ++#define BITS_PER_LONG (sizeof(long) * 8) ++#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) ++#define OFF(x) ((x)%BITS_PER_LONG) ++#define BIT(x) (1UL<> OFF(bit)) & 1) ++ ++int main (int argc, char **argv) ++{ ++ int fd, rd, i, j, k; ++ struct input_event ev[64]; ++ int version; ++ unsigned short id[4]; ++ unsigned long bit[EV_MAX][NBITS(KEY_MAX)]; ++ char name[256] = "Unknown"; ++ int abs[5]; ++ ++#if 0 ++ for (i = 0; i < KEY_MAX; i++) { ++ printf("Key %d, name \"%s\"\n", i, keys[i] ? keys[i]: "?"); ++ } ++#endif ++ ++ if (argc < 2) { ++ printf ("Usage: evtest /dev/inputX\n"); ++ printf ("Where X = input device number\n"); ++ exit (1); ++ } ++ ++ if ((fd = open(argv[argc - 1], O_RDONLY)) < 0) { ++ perror("evtest"); ++ exit(1); ++ } ++ ++ ioctl(fd, EVIOCGVERSION, &version); ++ printf("Input driver version is %d.%d.%d\n", ++ version >> 16, (version >> 8) & 0xff, version & 0xff); ++ ++ ioctl(fd, EVIOCGID, id); ++ printf("Input device ID: bus 0x%x vendor 0x%x product 0x%x version 0x%x\n", ++ id[ID_BUS], id[ID_VENDOR], id[ID_PRODUCT], id[ID_VERSION]); ++ ++ ioctl(fd, EVIOCGNAME(sizeof(name)), name); ++ printf("Input device name: \"%s\"\n", name); ++ ++ memset(bit, 0, sizeof(bit)); ++ ioctl(fd, EVIOCGBIT(0, EV_MAX), bit[0]); ++ printf("Supported events:\n"); ++ ++ for (i = 0; i < EV_MAX; i++) ++ { ++ if (test_bit(i, bit[0])) ++ { ++ printf(" Event type %d (%s)\n", i, events[i] ? events[i] : "?"); ++ ioctl(fd, EVIOCGBIT(i, KEY_MAX), bit[i]); ++ for (j = 0; j < KEY_MAX; j++) ++ { ++ if (test_bit(j, bit[i])) ++ { ++ printf(" Event code %d (%s)\n", j, names[i] ? (names[i][j] ? names[i][j] : "?") : "?"); ++ if (i == EV_ABS) ++ { ++ ioctl(fd, EVIOCGABS(j), abs); ++ for (k = 0; k < 5; k++) ++ { ++ if ((k < 3) || abs[k]) ++ { ++ printf(" %s %6d\n", absval[k], abs[k]); ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ printf("Testing ... (interrupt to exit)\n"); ++ ++ while (1) ++ { ++ rd = read(fd, ev, sizeof(struct input_event) * 64); ++ ++ if (rd < (int) sizeof(struct input_event)) ++ { ++ printf("yyy\n"); ++ perror("\nevtest: error reading"); ++ exit (1); ++ } ++ ++ for (i = 0; i < rd / sizeof(struct input_event); i++) ++ { ++ printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n", ++ ev[i].time.tv_sec, ++ ev[i].time.tv_usec, ++ ev[i].type, ++ events[ev[i].type] ? events[ev[i].type] : "?", ++ ev[i].code, ++ names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?", ++ ev[i].value); ++ } ++ } ++} +diff --git a/feeds/packages/utils/event_test/src/Makefile b/feeds/packages/utils/event_test/src/Makefile +new file mode 100644 +index 0000000..74eedbf +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/Makefile +@@ -0,0 +1,17 @@ ++# ++# Copyright (C) 2008 OpenWrt.org ++# ++# This is free software, licensed under GNU General Public Licese v2. ++# See /LICENSE for more information. ++# ++ ++all: event_test ++ ++%.o: %.c ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^ ++ ++event_test: evtest.o ++ $(CC) -o $@ $^ ++ ++clean: ++ rm -f *.o event_test +diff --git a/feeds/packages/utils/event_test/src/evtest.c b/feeds/packages/utils/event_test/src/evtest.c +new file mode 100644 +index 0000000..b62209b +--- /dev/null ++++ b/feeds/packages/utils/event_test/src/evtest.c +@@ -0,0 +1,309 @@ ++/* ++ * ++ * Copyright (c) 1999-2000 Vojtech Pavlik ++ * ++ * As modified by Rene van Paassen, May 19, 2005 ++ * Event device test program ++ */ ++ ++/* ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Should you need to contact me, the author, you can do so either by ++ * e-mail - mail your message to , or by paper mail: ++ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++char *events[EV_MAX + 1] = { "Reset", "Key", "Relative", "Absolute", "MSC", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, NULL, "LED", "Sound", NULL, "Repeat", "ForceFeedback", "Power", "ForceFeedbackStatus"}; ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0) ++ ++/* Keys updated with version 2.6.11, am assuming this is 2.6 style */ ++char *keys[KEY_MAX + 1] = ++ { "Reserved", "Esc", /* 0, 1 */ ++ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", /* 2 - 11 */ ++ "Minus", "Equal", "Backspace", "Tab", /* 12 - 15 */ ++ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", /* 16 - 25 */ ++ "LeftBrace", "RightBrace", "Enter", "LeftControl", /* 26 - 29 */ ++ "A", "S", "D", "F", "G", "H", "J", "K", "L", /* 30 - 38 */ ++ "Semicolon", "Apostrophe", "Grave", "LeftShift", "BackSlash", /* 39 - 43 */ ++ "Z", "X", "C", "V", "B", "N", "M", /* 44 - 50 */ ++ "Comma", "Dot", "Slash", "RightShift", "KPAsterisk", ++ "LeftAlt", "Space", "CapsLock", /* 51 - 58 */ ++ "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", /* 59 - 68 */ ++ "NumLock", "ScrollLock", /* 69, 70 */ ++ "KP7", "KP8", "KP9", "KPMinus", /* 71 - 74 */ ++ "KP4", "KP5", "KP6", "KPPlus", /* 75 - 78 */ ++ "KP1", "KP2", "KP3", "KP0", "KPDot", /* 79 - 83 */ ++ NULL, ++ "ZENKAKUHANKAKU", /* 85 */ ++ "102nd", "F11", "F12", /* 86 - 88 */ ++ "R0", "KATAKANA", "HIRAGANA", "HENKAN", /* 89 - 92 */ ++ "KATAKANAHIRAGANA", "MUHENKAN", "KPJPCOMMA", /* 93 - 95 */ ++ "KPEnter", "RightCtrl", "KPSlash", "SysRq", /* 96 - 99 */ ++ "RightAlt", "LineFeed", /*100 - 101 */ ++ "Home", "Up", "PageUp", "Left", "Right", "End", "Down", ++ "PageDown", "Insert", "Delete", /* 102 - 111 */ ++ "Macro", "Mute", "VolumeDown", "VolumeUp", "Power", /* 112 - 116 */ ++ "KPEqual", "KPPlusMinus", "Pause", /* 117 - 119 */ ++ NULL, ++ "KPComma", /* 121 */ ++ "Hanguel", "Hanja", "Yen", /* 122 - 124 */ ++ "LeftMeta", "RightMeta", "Compose", /* 125 - 127 */ ++ "Stop", "Again", "Props", "Undo", "Front", "Copy", "Open", ++ "Paste", "Find", "Cut", "Help", "Menu", "Calc", "Setup", ++ "Sleep", "WakeUp", "File", "SendFile", "DeleteFile", "X-fer", ++ "Prog1", "Prog2", "WWW", "MSDOS", "Coffee", "Direction", ++ "CycleWindows", "Mail", "Bookmarks", "Computer", ++ "Back", "Forward", "CloseCD", "EjectCD", "EjectCloseCD", ++ "NextSong", "PlayPause", "PreviousSong", "StopCD", ++ "Record", "Rewind", "Phone", /* 128 - 169 */ ++ "ISOKey", "Config", "HomePage", "Refresh", "Exit", ++ "Move", "Edit", "ScrollUp", "ScrollDown", /* 170 - 178 */ ++ "KPLeftParenthesis", "KPRightParenthesis", /* 179 - 180 */ ++ NULL, NULL, ++ "F13", "F14", "F15", "F16", "F17", "F18", ++ "F19", "F20", "F21", "F22", "F23", "F24", /* 183 - 194 */ ++ NULL, NULL, NULL, NULL, NULL, ++ "PlayCD", "PauseCD", "Prog3", "Prog4", NULL, ++ "Suspend", "Close", /* 200 - 206 */ ++ "Play", "FastForward", "BassBoost", "Print", "HP", "Camera", ++ "Sound", "Question", "Email", "Chat", "Search", ++ "Connect", "Finance", "Sport", "Shop", "AltErase", ++ "Cancel", "BrightnessDown", "BrightnessUp", "Media", /* 207 - 226 */ ++ "SwitchVideoMode", ++ "KBDIllumToggle", "KBDIllumDown", "KBDIllumUp", /* 227 - 230 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Unknown", /* 240 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Btn0", "Btn1", "Btn2", "Btn3", "Btn4", ++ "Btn5", "Btn6", "Btn7", "Btn8", "Btn9", /* 256 - 265 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, ++ "LeftBtn", "RightBtn", "MiddleBtn", "SideBtn", ++ "ExtraBtn", "ForwardBtn", "BackBtn", "TaskBtn", /* 0x110 - 0x117 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Trigger", "ThumbBtn", "ThumbBtn2", "TopBtn", ++ "TopBtn2", "PinkieBtn", "BaseBtn", "BaseBtn2", ++ "BaseBtn3", "BaseBtn4", "BaseBtn5", "BaseBtn6", ++ NULL, NULL, NULL, "BtnDead", /* 0x120 - 0x12f */ ++ "BtnA", "BtnB", "BtnC", "BtnX", ++ "BtnY", "BtnZ", "BtnTL", "BtnTR", ++ "BtnTL2", "BtnTR2", "BtnSelect", "BtnStart", ++ "BtnMode", "BtnThumbL", "BtnThumbR", /* 0x130 - 0x13e */ NULL, ++ "ToolPen", "ToolRubber", "ToolBrush", "ToolPencil", ++ "ToolAirbrush", "ToolFinger", "ToolMouse", "ToolLens", /* 0x140-0x147 */ ++ NULL, NULL, "Touch", "Stylus", ++ "Stylus2", "DoubleTap", "TripleTap", /* 0x14a - 0x14e */ NULL, ++ "GearUp", "GearDown", /* 0x150, 0x151 */ ++ NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "Ok", "Select", "Goto", "Clear", "Power2", "Option", "Info", "Time", ++ "Vendor", "Archive", "Program", "Channel", ++ "Favorites", "Epg", "Pvr", "Mhp", ++ "Language", "Title", "Subtitle", "Angle", ++ "Zoom", "Mode", "Keyboard", "Screen", ++ "Pc", "Tv", "Tv2", "Vcr", "Vcr2", "Sat", "Sat2", "Cd", ++ "Tape", "Radio", "Tuner", "Player", "Text", "Dvd", "Aux", "Mp3", ++ "Audio", "Video", "Directory", "List", ++ "Memo", "Calendar", "Red", "Green", ++ "Yellow", "Blue", "Channelup", "Channeldown", ++ "First", "Last", "Ab", "Next", ++ "Restart", "Slow", "Shuffle", "Break", ++ "Previous", "Digits", "Teen", "Twen", /* 160 - 19f */ ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "DelEol", "DelEos", "InsLine", "DelLine", /* 1c0 - 1c3 */ ++ NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++ "FN", "FN_ESC", ++ "FN_F1", "FN_F2", "FN_F3", "FN_F4", "FN_F5", ++ "FN_F6", "FN_F7", "FN_F8", "FN_F9", "FN_F10", ++ "FN_F11", "FN_F12", ++ "FN_1", "FN_2", "FN_D", "FN_E", "FN_F", "FN_S", "FN_B" /* 0x1d0 - 0x1e4 */ ++ }; ++ ++#else ++ ++/* Keys I used with 2.4 kernels. */ ++char *keys[KEY_MAX + 1] = { "Reserved", "Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Equal", "Backspace", ++"Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "LeftBrace", "RightBrace", "Enter", "LeftControl", "A", "S", "D", "F", "G", ++"H", "J", "K", "L", "Semicolon", "Apostrophe", "Grave", "LeftShift", "BackSlash", "Z", "X", "C", "V", "B", "N", "M", "Comma", "Dot", ++"Slash", "RightShift", "KPAsterisk", "LeftAlt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", ++"NumLock", "ScrollLock", "KP7", "KP8", "KP9", "KPMinus", "KP4", "KP5", "KP6", "KPPlus", "KP1", "KP2", "KP3", "KP0", "KPDot", "103rd", ++"F13", "102nd", "F11", "F12", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "KPEnter", "RightCtrl", "KPSlash", "SysRq", ++"RightAlt", "LineFeed", "Home", "Up", "PageUp", "Left", "Right", "End", "Down", "PageDown", "Insert", "Delete", "Macro", "Mute", ++"VolumeDown", "VolumeUp", "Power", "KPEqual", "KPPlusMinus", "Pause", "F21", "F22", "F23", "F24", "KPComma", "LeftMeta", "RightMeta", ++"Compose", "Stop", "Again", "Props", "Undo", "Front", "Copy", "Open", "Paste", "Find", "Cut", "Help", "Menu", "Calc", "Setup", ++"Sleep", "WakeUp", "File", "SendFile", "DeleteFile", "X-fer", "Prog1", "Prog2", "WWW", "MSDOS", "Coffee", "Direction", ++"CycleWindows", "Mail", "Bookmarks", "Computer", "Back", "Forward", "CloseCD", "EjectCD", "EjectCloseCD", "NextSong", "PlayPause", ++"PreviousSong", "StopCD", "Record", "Rewind", "Phone", "ISOKey", "Config", "HomePage", "Refresh", "Exit", "Move", "Edit", "ScrollUp", ++"ScrollDown", "KPLeftParenthesis", "KPRightParenthesis", ++"International1", "International2", "International3", "International4", "International5", ++"International6", "International7", "International8", "International9", ++"Language1", "Language2", "Language3", "Language4", "Language5", "Language6", "Language7", "Language8", "Language9", ++NULL, ++"PlayCD", "PauseCD", "Prog3", "Prog4", "Suspend", "Close", ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++"Btn0", "Btn1", "Btn2", "Btn3", "Btn4", "Btn5", "Btn6", "Btn7", "Btn8", "Btn9", ++NULL, NULL, NULL, NULL, NULL, NULL, ++"LeftBtn", "RightBtn", "MiddleBtn", "SideBtn", "ExtraBtn", "ForwardBtn", "BackBtn", ++NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++"Trigger", "ThumbBtn", "ThumbBtn2", "TopBtn", "TopBtn2", "PinkieBtn", ++"BaseBtn", "BaseBtn2", "BaseBtn3", "BaseBtn4", "BaseBtn5", "BaseBtn6", ++NULL, NULL, NULL, "BtnDead", ++"BtnA", "BtnB", "BtnC", "BtnX", "BtnY", "BtnZ", "BtnTL", "BtnTR", "BtnTL2", "BtnTR2", "BtnSelect", "BtnStart", "BtnMode", ++"BtnThumbL", "BtnThumbR", NULL, ++"ToolPen", "ToolRubber", "ToolBrush", "ToolPencil", "ToolAirbrush", "ToolFinger", "ToolMouse", "ToolLens", NULL, NULL, ++"Touch", "Stylus", "Stylus2" }; ++#endif ++ ++char *absval[5] = { "Value", "Min ", "Max ", "Fuzz ", "Flat " }; ++char *relatives[REL_MAX + 1] = ++ { "X", "Y", "Z", NULL, ++ NULL, NULL, "HWheel", "Dial", ++ /* 0x08: */ "Wheel", "MISC" }; ++char *absolutes[ABS_MAX + 1] = ++ { "X", "Y", "Z", "Rx", "Ry", "Rz", "Throttle", "Rudder", ++ "Wheel", "Gas", "Brake", NULL, NULL, NULL, NULL, NULL, ++ /* 0x10: */ "Hat0X", "Hat0Y", "Hat1X", "Hat1Y", ++ "Hat2X", "Hat2Y", "Hat3X", "Hat 3Y", ++ "Pressure", "Distance", "XTilt", "YTilt", ++ "ToolWidth", NULL, NULL, NULL, ++ /* 0x20: */ "Volume", NULL, NULL, NULL, ++ NULL, NULL, NULL, NULL, ++ /* 0x28: */ "Misc" }; ++char *leds[LED_MAX + 1] = { "NumLock", "CapsLock", "ScrollLock", "Compose", "Kana", "Sleep", "Suspend", "Mute" }; ++char *repeats[REP_MAX + 1] = { "Delay", "Period" }; ++char *sounds[SND_MAX + 1] = { "Bell", "Click" }; ++ ++char **names[EV_MAX + 1] = { events, keys, relatives, absolutes, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ++NULL, NULL, leds, sounds, NULL, repeats, NULL, NULL, NULL }; ++ ++#define BITS_PER_LONG (sizeof(long) * 8) ++#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) ++#define OFF(x) ((x)%BITS_PER_LONG) ++#define BIT(x) (1UL<> OFF(bit)) & 1) ++ ++int main (int argc, char **argv) ++{ ++ int fd, rd, i, j, k; ++ struct input_event ev[64]; ++ int version; ++ unsigned short id[4]; ++ unsigned long bit[EV_MAX][NBITS(KEY_MAX)]; ++ char name[256] = "Unknown"; ++ int abs[5]; ++ ++#if 0 ++ for (i = 0; i < KEY_MAX; i++) { ++ printf("Key %d, name \"%s\"\n", i, keys[i] ? keys[i]: "?"); ++ } ++#endif ++ ++ if (argc < 2) { ++ printf ("Usage: evtest /dev/inputX\n"); ++ printf ("Where X = input device number\n"); ++ exit (1); ++ } ++ ++ if ((fd = open(argv[argc - 1], O_RDONLY)) < 0) { ++ perror("evtest"); ++ exit(1); ++ } ++ ++ ioctl(fd, EVIOCGVERSION, &version); ++ printf("Input driver version is %d.%d.%d\n", ++ version >> 16, (version >> 8) & 0xff, version & 0xff); ++ ++ ioctl(fd, EVIOCGID, id); ++ printf("Input device ID: bus 0x%x vendor 0x%x product 0x%x version 0x%x\n", ++ id[ID_BUS], id[ID_VENDOR], id[ID_PRODUCT], id[ID_VERSION]); ++ ++ ioctl(fd, EVIOCGNAME(sizeof(name)), name); ++ printf("Input device name: \"%s\"\n", name); ++ ++ memset(bit, 0, sizeof(bit)); ++ ioctl(fd, EVIOCGBIT(0, EV_MAX), bit[0]); ++ printf("Supported events:\n"); ++ ++ for (i = 0; i < EV_MAX; i++) ++ { ++ if (test_bit(i, bit[0])) ++ { ++ printf(" Event type %d (%s)\n", i, events[i] ? events[i] : "?"); ++ ioctl(fd, EVIOCGBIT(i, KEY_MAX), bit[i]); ++ for (j = 0; j < KEY_MAX; j++) ++ { ++ if (test_bit(j, bit[i])) ++ { ++ printf(" Event code %d (%s)\n", j, names[i] ? (names[i][j] ? names[i][j] : "?") : "?"); ++ if (i == EV_ABS) ++ { ++ ioctl(fd, EVIOCGABS(j), abs); ++ for (k = 0; k < 5; k++) ++ { ++ if ((k < 3) || abs[k]) ++ { ++ printf(" %s %6d\n", absval[k], abs[k]); ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ printf("Testing ... (interrupt to exit)\n"); ++ ++ while (1) ++ { ++ rd = read(fd, ev, sizeof(struct input_event) * 64); ++ ++ if (rd < (int) sizeof(struct input_event)) ++ { ++ printf("yyy\n"); ++ perror("\nevtest: error reading"); ++ exit (1); ++ } ++ ++ for (i = 0; i < rd / sizeof(struct input_event); i++) ++ { ++ printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n", ++ ev[i].time.tv_sec, ++ ev[i].time.tv_usec, ++ ev[i].type, ++ events[ev[i].type] ? events[ev[i].type] : "?", ++ ev[i].code, ++ names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?", ++ ev[i].value); ++ } ++ } ++} +diff --git a/feeds/packages/utils/fancontroled/.svn/entries b/feeds/packages/utils/fancontroled/.svn/entries +new file mode 100644 +index 0000000..dae358b +--- /dev/null ++++ b/feeds/packages/utils/fancontroled/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fancontroled ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:36.133298Z ++28950 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ca26b2b32e28b3e292f1377f49b8d4b3 ++2011-11-11T15:46:36.133298Z ++28950 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1403 ++ +diff --git a/feeds/packages/utils/fancontroled/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/fancontroled/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c308800 +--- /dev/null ++++ b/feeds/packages/utils/fancontroled/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2010-2011 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:=fancontroled ++PKG_VERSION:=0.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar ++PKG_SOURCE_URL:=http://code.lukaperkov.net/fancontroled/ ++PKG_MD5SUM:=8c3a7efa99e58216ad4633d1e6ed1358 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fancontroled ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=fancontroled ++ DEPENDS:=+libsensors ++ URL:=http://fancontroled.lukaperkov.net/ ++endef ++ ++define Package/fancontroled/description ++ fancontroled is linux daemon written in C implementing a temperature dependent fan speed control. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ INC_PATH="-I$(STAGING_DIR)/usr/include/ -I$(STAGING_DIR)/usr/lib/" ++ ++ $(STRIP) $(PKG_BUILD_DIR)/$(PKG_NAME) ++ ++ mkdir -p $(PKG_INSTALL_DIR)/usr/sbin ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install ++endef ++ ++define Package/fancontroled/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/fancontroled.init $(1)/etc/init.d/fancontroled ++endef ++ ++$(eval $(call BuildPackage,fancontroled)) +diff --git a/feeds/packages/utils/fancontroled/Makefile b/feeds/packages/utils/fancontroled/Makefile +new file mode 100644 +index 0000000..c308800 +--- /dev/null ++++ b/feeds/packages/utils/fancontroled/Makefile +@@ -0,0 +1,54 @@ ++# ++# Copyright (C) 2010-2011 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:=fancontroled ++PKG_VERSION:=0.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar ++PKG_SOURCE_URL:=http://code.lukaperkov.net/fancontroled/ ++PKG_MD5SUM:=8c3a7efa99e58216ad4633d1e6ed1358 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fancontroled ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=fancontroled ++ DEPENDS:=+libsensors ++ URL:=http://fancontroled.lukaperkov.net/ ++endef ++ ++define Package/fancontroled/description ++ fancontroled is linux daemon written in C implementing a temperature dependent fan speed control. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ INC_PATH="-I$(STAGING_DIR)/usr/include/ -I$(STAGING_DIR)/usr/lib/" ++ ++ $(STRIP) $(PKG_BUILD_DIR)/$(PKG_NAME) ++ ++ mkdir -p $(PKG_INSTALL_DIR)/usr/sbin ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install ++endef ++ ++define Package/fancontroled/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/fancontroled.init $(1)/etc/init.d/fancontroled ++endef ++ ++$(eval $(call BuildPackage,fancontroled)) +diff --git a/feeds/packages/utils/fancontroled/files/.svn/entries b/feeds/packages/utils/fancontroled/files/.svn/entries +new file mode 100644 +index 0000000..ae68f9c +--- /dev/null ++++ b/feeds/packages/utils/fancontroled/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fancontroled/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:36.133298Z ++28950 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++fancontroled.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++b38d02f50043a91ae9b61e025af1fc5a ++2011-11-11T15:46:36.133298Z ++28950 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++560 ++ +diff --git a/feeds/packages/utils/fancontroled/files/.svn/text-base/fancontroled.init.svn-base b/feeds/packages/utils/fancontroled/files/.svn/text-base/fancontroled.init.svn-base +new file mode 100644 +index 0000000..b872553 +--- /dev/null ++++ b/feeds/packages/utils/fancontroled/files/.svn/text-base/fancontroled.init.svn-base +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++ ++START=75 ++STOP=75 ++ ++SERVICE_NAME="fancontroled" ++SERVICE_COMMAND="/usr/sbin/$SERVICE_NAME" ++SERVICE_PID_FILE="/var/run/$SERVICE_NAME.pid" ++ ++TEMP_SENSOR_CHIP=lm75 ++TEMP_READ_FIELD=temp1_input ++MIN_TEMP=30 ++MAX_TEMP=50 ++FAN_SENSOR_CHIP=g760a ++FAN_CONTROL_FIELD=pwm1 ++PWM_FAN_MIN=1 ++PWM_FAN_MAX=180 ++ ++start() { ++ service_start $SERVICE_COMMAND -t $TEMP_SENSOR_CHIP -r $TEMP_READ_FIELD -m $MIN_TEMP -M $MAX_TEMP -f $FAN_SENSOR_CHIP -c $FAN_CONTROL_FIELD -p $PWM_FAN_MIN -P $PWM_FAN_MAX -z $SERVICE_PID_FILE ++} ++ ++stop() { ++ service_stop $SERVICE_COMMAND ++} +diff --git a/feeds/packages/utils/fancontroled/files/fancontroled.init b/feeds/packages/utils/fancontroled/files/fancontroled.init +new file mode 100644 +index 0000000..b872553 +--- /dev/null ++++ b/feeds/packages/utils/fancontroled/files/fancontroled.init +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++ ++START=75 ++STOP=75 ++ ++SERVICE_NAME="fancontroled" ++SERVICE_COMMAND="/usr/sbin/$SERVICE_NAME" ++SERVICE_PID_FILE="/var/run/$SERVICE_NAME.pid" ++ ++TEMP_SENSOR_CHIP=lm75 ++TEMP_READ_FIELD=temp1_input ++MIN_TEMP=30 ++MAX_TEMP=50 ++FAN_SENSOR_CHIP=g760a ++FAN_CONTROL_FIELD=pwm1 ++PWM_FAN_MIN=1 ++PWM_FAN_MAX=180 ++ ++start() { ++ service_start $SERVICE_COMMAND -t $TEMP_SENSOR_CHIP -r $TEMP_READ_FIELD -m $MIN_TEMP -M $MAX_TEMP -f $FAN_SENSOR_CHIP -c $FAN_CONTROL_FIELD -p $PWM_FAN_MIN -P $PWM_FAN_MAX -z $SERVICE_PID_FILE ++} ++ ++stop() { ++ service_stop $SERVICE_COMMAND ++} +diff --git a/feeds/packages/utils/firmwarehotplug/.svn/entries b/feeds/packages/utils/firmwarehotplug/.svn/entries +new file mode 100644 +index 0000000..abd8f77 +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/firmwarehotplug ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-09T15:23:58.401461Z ++31227 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++28a87536d6179fb3ba5098e016e94045 ++2012-04-09T15:23:58.401461Z ++31227 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1410 ++ +diff --git a/feeds/packages/utils/firmwarehotplug/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/firmwarehotplug/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/firmwarehotplug/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/firmwarehotplug/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..22756cc +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2006-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:=firmwarehotplug ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/linux-hotplug ++PKG_MD5SUM:=e5cf352b172f498e27b160167b981f24 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++# workaround for fedora sdcc naming changes ++ifneq ($(wildcard /usr/libexec/sdcc),) ++ export PATH:=$(PATH):/usr/libexec ++endif ++ ++define Package/firmwarehotplug ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@USB_SUPPORT +fxload ++ TITLE:=Hotplug firmware for EZ-USB microcontrollers ++ URL:=http://linux-hotplug.sourceforge.net/ ++endef ++ ++MAKE_PATH:=ezusb/midi/original ++ ++MAKE_FLAGS+=\ ++ OPT="$(TARGET_CFLAGS)" ++ ++define Package/firmwarehotplug/install ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb ++ install -m755 $(PKG_BUILD_DIR)/ezusb/midi/original/Hotplug/ezusbmidi $(1)/etc/hotplug.d/usb ++ install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/Hotplug/ezusbmidi.usermap $(1)/etc/hotplug.d ++ $(INSTALL_DIR) $(1)/usr/share/usb/ezusbmidi ++ install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/ezusbmidi1x1.ihx $(1)/usr/share/usb/ezusbmidi ++ install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/ezusbmidi2x2.ihx $(1)/usr/share/usb/ezusbmidi ++endef ++ ++$(eval $(call BuildPackage,firmwarehotplug)) ++ +diff --git a/feeds/packages/utils/firmwarehotplug/Makefile b/feeds/packages/utils/firmwarehotplug/Makefile +new file mode 100644 +index 0000000..22756cc +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/Makefile +@@ -0,0 +1,51 @@ ++# ++# Copyright (C) 2006-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:=firmwarehotplug ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/linux-hotplug ++PKG_MD5SUM:=e5cf352b172f498e27b160167b981f24 ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++# workaround for fedora sdcc naming changes ++ifneq ($(wildcard /usr/libexec/sdcc),) ++ export PATH:=$(PATH):/usr/libexec ++endif ++ ++define Package/firmwarehotplug ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@USB_SUPPORT +fxload ++ TITLE:=Hotplug firmware for EZ-USB microcontrollers ++ URL:=http://linux-hotplug.sourceforge.net/ ++endef ++ ++MAKE_PATH:=ezusb/midi/original ++ ++MAKE_FLAGS+=\ ++ OPT="$(TARGET_CFLAGS)" ++ ++define Package/firmwarehotplug/install ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb ++ install -m755 $(PKG_BUILD_DIR)/ezusb/midi/original/Hotplug/ezusbmidi $(1)/etc/hotplug.d/usb ++ install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/Hotplug/ezusbmidi.usermap $(1)/etc/hotplug.d ++ $(INSTALL_DIR) $(1)/usr/share/usb/ezusbmidi ++ install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/ezusbmidi1x1.ihx $(1)/usr/share/usb/ezusbmidi ++ install -m644 $(PKG_BUILD_DIR)/ezusb/midi/original/ezusbmidi2x2.ihx $(1)/usr/share/usb/ezusbmidi ++endef ++ ++$(eval $(call BuildPackage,firmwarehotplug)) ++ +diff --git a/feeds/packages/utils/firmwarehotplug/patches/.svn/entries b/feeds/packages/utils/firmwarehotplug/patches/.svn/entries +new file mode 100644 +index 0000000..b033049 +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/firmwarehotplug/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-29T17:29:36.902278Z ++23710 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9fb0e80040b35546e4cb554d81730bef ++2010-10-29T17:29:36.902278Z ++23710 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1404 ++ ++001-no_documentation.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f76744a44f5ac3f34d5640d10205e232 ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++585 ++ +diff --git a/feeds/packages/utils/firmwarehotplug/patches/.svn/prop-base/001-no_documentation.patch.svn-base b/feeds/packages/utils/firmwarehotplug/patches/.svn/prop-base/001-no_documentation.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/patches/.svn/prop-base/001-no_documentation.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/firmwarehotplug/patches/.svn/text-base/001-no_documentation.patch.svn-base b/feeds/packages/utils/firmwarehotplug/patches/.svn/text-base/001-no_documentation.patch.svn-base +new file mode 100644 +index 0000000..0079fdd +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/patches/.svn/text-base/001-no_documentation.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -urN firmwarehotplug-0.1/ezusb/midi/original/Makefile firmwarehotplug-0.1.new/ezusb/midi/original/Makefile ++--- firmwarehotplug-0.1/ezusb/midi/original/Makefile 2003-05-19 02:10:28.000000000 +0200 +++++ firmwarehotplug-0.1.new/ezusb/midi/original/Makefile 2007-01-01 23:07:42.000000000 +0100 ++@@ -1,7 +1,7 @@ ++ VERSION = $(shell date +%Y_%m_%d) ++ RELEASE_NAME = ezusbmidi-$(VERSION) ++ ++-all: ezusbmidi1x1.ihx ezusbmidi2x2.ihx ezusbmidi.html ezusbmidi.ps +++all: ezusbmidi1x1.ihx ezusbmidi2x2.ihx ++ ++ ezusbmidi1x1.ihx: ezusbmidi.c ezusb_reg.h bufsync.h ++ rm -rf sdcc; mkdir sdcc; cp $^ sdcc +diff --git a/feeds/packages/utils/firmwarehotplug/patches/.svn/text-base/100-compile-fixes.patch.svn-base b/feeds/packages/utils/firmwarehotplug/patches/.svn/text-base/100-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..056a9c6 +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/patches/.svn/text-base/100-compile-fixes.patch.svn-base +@@ -0,0 +1,36 @@ ++Index: firmwarehotplug-0.1/ezusb/midi/original/Makefile ++=================================================================== ++--- firmwarehotplug-0.1.orig/ezusb/midi/original/Makefile 2010-10-29 19:21:43.867000023 +0200 +++++ firmwarehotplug-0.1/ezusb/midi/original/Makefile 2010-10-29 19:27:09.590002911 +0200 ++@@ -1,15 +1,18 @@ ++ VERSION = $(shell date +%Y_%m_%d) ++ RELEASE_NAME = ezusbmidi-$(VERSION) ++ +++SDCC = sdcc +++PACKIHX = packihx +++ ++ all: ezusbmidi1x1.ihx ezusbmidi2x2.ihx ++ ++ ezusbmidi1x1.ihx: ezusbmidi.c ezusb_reg.h bufsync.h ++- rm -rf sdcc; mkdir sdcc; cp $^ sdcc ++- cd sdcc; sdcc -DCONFIG_MidiSport1x1 -I. $<; packihx ezusbmidi.ihx > ../$@ +++ rm -rf sdcc.1x1 && mkdir sdcc.1x1 && cp $^ sdcc.1x1/ +++ cd sdcc.1x1 && $(SDCC) -DCONFIG_MidiSport1x1 -I. $< && $(PACKIHX) ezusbmidi.ihx > ../$@ ++ ++ ezusbmidi2x2.ihx: ezusbmidi.c ezusb_reg.h bufsync.h ++- rm -rf sdcc; mkdir sdcc; cp $^ sdcc ++- cd sdcc; sdcc -DCONFIG_MidiSport2x2 -I. $<; packihx ezusbmidi.ihx > ../$@ +++ rm -rf sdcc.2x2 && mkdir sdcc.2x2 && cp $^ sdcc.2x2/ +++ cd sdcc.2x2 && $(SDCC) -DCONFIG_MidiSport2x2 -I. $< && $(PACKIHX) ezusbmidi.ihx > ../$@ ++ ++ ezusbmidi.ps: ezusbmidi.sgml descriptor.png ++ sgml2latex --output=ps $< ++@@ -27,7 +30,7 @@ ++ fakeroot dpkg-buildpackage ++ ++ clean: ++- rm -rf sdcc +++ rm -rf sdcc* ++ rm -f [1-9] *.pdf *.html *.ps *.ihx *.tar.gz *.tar.bz2 ezusbmidi.spec ++ rm -rf debian/ezusbmidi debian/files build-stamp configure-stamp ++ +diff --git a/feeds/packages/utils/firmwarehotplug/patches/001-no_documentation.patch b/feeds/packages/utils/firmwarehotplug/patches/001-no_documentation.patch +new file mode 100644 +index 0000000..0079fdd +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/patches/001-no_documentation.patch +@@ -0,0 +1,12 @@ ++diff -urN firmwarehotplug-0.1/ezusb/midi/original/Makefile firmwarehotplug-0.1.new/ezusb/midi/original/Makefile ++--- firmwarehotplug-0.1/ezusb/midi/original/Makefile 2003-05-19 02:10:28.000000000 +0200 +++++ firmwarehotplug-0.1.new/ezusb/midi/original/Makefile 2007-01-01 23:07:42.000000000 +0100 ++@@ -1,7 +1,7 @@ ++ VERSION = $(shell date +%Y_%m_%d) ++ RELEASE_NAME = ezusbmidi-$(VERSION) ++ ++-all: ezusbmidi1x1.ihx ezusbmidi2x2.ihx ezusbmidi.html ezusbmidi.ps +++all: ezusbmidi1x1.ihx ezusbmidi2x2.ihx ++ ++ ezusbmidi1x1.ihx: ezusbmidi.c ezusb_reg.h bufsync.h ++ rm -rf sdcc; mkdir sdcc; cp $^ sdcc +diff --git a/feeds/packages/utils/firmwarehotplug/patches/100-compile-fixes.patch b/feeds/packages/utils/firmwarehotplug/patches/100-compile-fixes.patch +new file mode 100644 +index 0000000..056a9c6 +--- /dev/null ++++ b/feeds/packages/utils/firmwarehotplug/patches/100-compile-fixes.patch +@@ -0,0 +1,36 @@ ++Index: firmwarehotplug-0.1/ezusb/midi/original/Makefile ++=================================================================== ++--- firmwarehotplug-0.1.orig/ezusb/midi/original/Makefile 2010-10-29 19:21:43.867000023 +0200 +++++ firmwarehotplug-0.1/ezusb/midi/original/Makefile 2010-10-29 19:27:09.590002911 +0200 ++@@ -1,15 +1,18 @@ ++ VERSION = $(shell date +%Y_%m_%d) ++ RELEASE_NAME = ezusbmidi-$(VERSION) ++ +++SDCC = sdcc +++PACKIHX = packihx +++ ++ all: ezusbmidi1x1.ihx ezusbmidi2x2.ihx ++ ++ ezusbmidi1x1.ihx: ezusbmidi.c ezusb_reg.h bufsync.h ++- rm -rf sdcc; mkdir sdcc; cp $^ sdcc ++- cd sdcc; sdcc -DCONFIG_MidiSport1x1 -I. $<; packihx ezusbmidi.ihx > ../$@ +++ rm -rf sdcc.1x1 && mkdir sdcc.1x1 && cp $^ sdcc.1x1/ +++ cd sdcc.1x1 && $(SDCC) -DCONFIG_MidiSport1x1 -I. $< && $(PACKIHX) ezusbmidi.ihx > ../$@ ++ ++ ezusbmidi2x2.ihx: ezusbmidi.c ezusb_reg.h bufsync.h ++- rm -rf sdcc; mkdir sdcc; cp $^ sdcc ++- cd sdcc; sdcc -DCONFIG_MidiSport2x2 -I. $<; packihx ezusbmidi.ihx > ../$@ +++ rm -rf sdcc.2x2 && mkdir sdcc.2x2 && cp $^ sdcc.2x2/ +++ cd sdcc.2x2 && $(SDCC) -DCONFIG_MidiSport2x2 -I. $< && $(PACKIHX) ezusbmidi.ihx > ../$@ ++ ++ ezusbmidi.ps: ezusbmidi.sgml descriptor.png ++ sgml2latex --output=ps $< ++@@ -27,7 +30,7 @@ ++ fakeroot dpkg-buildpackage ++ ++ clean: ++- rm -rf sdcc +++ rm -rf sdcc* ++ rm -f [1-9] *.pdf *.html *.ps *.ihx *.tar.gz *.tar.bz2 ezusbmidi.spec ++ rm -rf debian/ezusbmidi debian/files build-stamp configure-stamp ++ +diff --git a/feeds/packages/utils/flashrom/.svn/entries b/feeds/packages/utils/flashrom/.svn/entries +new file mode 100644 +index 0000000..cc881f0 +--- /dev/null ++++ b/feeds/packages/utils/flashrom/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/flashrom ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++2f8280e02830227adaf0b50a80888e19 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1131 ++ +diff --git a/feeds/packages/utils/flashrom/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/flashrom/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..89ce6ca +--- /dev/null ++++ b/feeds/packages/utils/flashrom/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# Copyright (C) 2010-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:=flashrom ++PKG_VERSION:=0.9.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.flashrom.org/releases ++PKG_MD5SUM:=d739a91aece12cc1e622038bb199541c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/flashrom ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=FlashROM Utility ++ URL:=http://www.flashrom.org/ ++# XXX: needs , only available on these arch right now ++ DEPENDS:=+zlib +pciutils +dmidecode +libftdi +libusb-compat @(arm||armeb||i386||i686||x86_64) ++endef ++ ++define Package/flashrom/description ++ flashrom is a 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/feeds/packages/utils/flashrom/Makefile b/feeds/packages/utils/flashrom/Makefile +new file mode 100644 +index 0000000..89ce6ca +--- /dev/null ++++ b/feeds/packages/utils/flashrom/Makefile +@@ -0,0 +1,45 @@ ++# ++# Copyright (C) 2010-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:=flashrom ++PKG_VERSION:=0.9.4 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://download.flashrom.org/releases ++PKG_MD5SUM:=d739a91aece12cc1e622038bb199541c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/flashrom ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=FlashROM Utility ++ URL:=http://www.flashrom.org/ ++# XXX: needs , only available on these arch right now ++ DEPENDS:=+zlib +pciutils +dmidecode +libftdi +libusb-compat @(arm||armeb||i386||i686||x86_64) ++endef ++ ++define Package/flashrom/description ++ flashrom is a 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/feeds/packages/utils/flashrom/patches/.svn/entries b/feeds/packages/utils/flashrom/patches/.svn/entries +new file mode 100644 +index 0000000..686c5c7 +--- /dev/null ++++ b/feeds/packages/utils/flashrom/patches/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/flashrom/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-21T18:25:40.135676Z ++34832 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ +diff --git a/feeds/packages/utils/fortune-mod/.svn/entries b/feeds/packages/utils/fortune-mod/.svn/entries +new file mode 100644 +index 0000000..e1a9be7 +--- /dev/null ++++ b/feeds/packages/utils/fortune-mod/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fortune-mod ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++6d66a463253a5986c005f1a679c27160 ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1357 ++ +diff --git a/feeds/packages/utils/fortune-mod/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/fortune-mod/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e3482c7 +--- /dev/null ++++ b/feeds/packages/utils/fortune-mod/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=fortune-mod ++PKG_VERSION:=1.2.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://freeware.sgi.com/source/fortune-mod ++PKG_MD5SUM:=383b1de06b35450235732c7ae7b5f0e3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fortune-mod ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=display fortune cookies on demand. ++ URL:=http://packages.debian.org/fortune-mod ++endef ++ ++define Package/fortune-mod/description ++Fortune mod displays fortune cookies on demand ++endef ++ ++define Build/Compile ++ $(HOSTCC) -Wall -o $(PKG_BUILD_DIR)/util/strfile-host $(PKG_BUILD_DIR)/util/strfile.c -DVERSION=\"$(PKG_VERSION)\" ++ $(PKG_BUILD_DIR)/util/strfile-host $(PKG_BUILD_DIR)/datfiles/fortunes $(PKG_BUILD_DIR)/datfiles/fortunes.dat ++ $(MAKE) -C $(PKG_BUILD_DIR)/fortune ++endef ++ ++define Package/fortune-mod/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fortune/fortune $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share/games/fortunes ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/datfiles/fortunes $(1)/usr/share/games/fortunes ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/datfiles/fortunes.dat $(1)/usr/share/games/fortunes ++endef ++ ++$(eval $(call BuildPackage,fortune-mod)) +diff --git a/feeds/packages/utils/fortune-mod/Makefile b/feeds/packages/utils/fortune-mod/Makefile +new file mode 100644 +index 0000000..e3482c7 +--- /dev/null ++++ b/feeds/packages/utils/fortune-mod/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=fortune-mod ++PKG_VERSION:=1.2.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://freeware.sgi.com/source/fortune-mod ++PKG_MD5SUM:=383b1de06b35450235732c7ae7b5f0e3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fortune-mod ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=display fortune cookies on demand. ++ URL:=http://packages.debian.org/fortune-mod ++endef ++ ++define Package/fortune-mod/description ++Fortune mod displays fortune cookies on demand ++endef ++ ++define Build/Compile ++ $(HOSTCC) -Wall -o $(PKG_BUILD_DIR)/util/strfile-host $(PKG_BUILD_DIR)/util/strfile.c -DVERSION=\"$(PKG_VERSION)\" ++ $(PKG_BUILD_DIR)/util/strfile-host $(PKG_BUILD_DIR)/datfiles/fortunes $(PKG_BUILD_DIR)/datfiles/fortunes.dat ++ $(MAKE) -C $(PKG_BUILD_DIR)/fortune ++endef ++ ++define Package/fortune-mod/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fortune/fortune $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share/games/fortunes ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/datfiles/fortunes $(1)/usr/share/games/fortunes ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/datfiles/fortunes.dat $(1)/usr/share/games/fortunes ++endef ++ ++$(eval $(call BuildPackage,fortune-mod)) +diff --git a/feeds/packages/utils/fortune-mod/patches/.svn/entries b/feeds/packages/utils/fortune-mod/patches/.svn/entries +new file mode 100644 +index 0000000..7c914dd +--- /dev/null ++++ b/feeds/packages/utils/fortune-mod/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fortune-mod/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-07-27T08:52:15.893876Z ++8192 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++01-strfile-64bit-fix ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++73e985016d7dd78be7a95918da75babc ++2007-07-27T08:52:15.893876Z ++8192 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4807 ++ +diff --git a/feeds/packages/utils/fortune-mod/patches/.svn/text-base/01-strfile-64bit-fix.svn-base b/feeds/packages/utils/fortune-mod/patches/.svn/text-base/01-strfile-64bit-fix.svn-base +new file mode 100644 +index 0000000..9bd3da9 +--- /dev/null ++++ b/feeds/packages/utils/fortune-mod/patches/.svn/text-base/01-strfile-64bit-fix.svn-base +@@ -0,0 +1,156 @@ ++--- fortune-mod-1.2.1/util/strfile.c.orig 2007-07-27 00:40:54.687140050 +0100 +++++ fortune-mod-1.2.1/util/strfile.c 2007-07-27 00:41:14.184165656 +0100 ++@@ -144,7 +135,7 @@ ++ typedef struct ++ { ++ char first; ++- off_t pos; +++ int32_t pos; ++ } ++ STR; ++ ++@@ -159,7 +150,7 @@ ++ int Xflag = FALSE; /* set rotated bit */ ++ long Num_pts = 0; /* number of pointers/strings */ ++ ++-off_t *Seekpts; +++int32_t *Seekpts; ++ ++ FILE *Sort_1, *Sort_2; /* pointers for sorting */ ++ ++@@ -237,9 +228,9 @@ ++ * add_offset: ++ * Add an offset to the list, or write it out, as appropriate. ++ */ ++-void add_offset(FILE * fp, off_t off) +++void add_offset(FILE * fp, int32_t off) ++ { ++- off_t net; +++ int32_t net; ++ ++ if (!STORING_PTRS) ++ { ++@@ -258,9 +249,9 @@ ++ * fix_last_offset: ++ * Used when we have two separators in a row. ++ */ ++-void fix_last_offset(FILE * fp, off_t off) +++void fix_last_offset(FILE * fp, int32_t off) ++ { ++- off_t net; +++ int32_t net; ++ ++ if (!STORING_PTRS) ++ { ++@@ -333,7 +324,7 @@ ++ do_order(void) ++ { ++ register long i; ++- register off_t *lp; +++ register int32_t *lp; ++ register STR *fp; ++ ++ Sort_1 = fopen(Infile, "r"); ++@@ -384,8 +375,8 @@ ++ void randomize(void) ++ { ++ register int cnt, i; ++- register off_t tmp; ++- register off_t *sp; +++ register int32_t tmp; +++ register int32_t *sp; ++ extern time_t time(time_t *); ++ ++ srandom((int) (time((time_t *) NULL) + getpid())); ++@@ -422,7 +413,7 @@ ++ { ++ register unsigned char *sp; ++ register FILE *inf, *outf; ++- register off_t last_off, length, pos, *p; +++ register int32_t last_off, length, pos, *p; ++ register int first, cnt; ++ register char *nsp; ++ register STR *fp; ++@@ -514,14 +505,19 @@ ++ if (!Sflag) ++ { ++ printf("\"%s\" created\n", Outfile); ++- if (Num_pts == 2) ++- puts("There was 1 string"); +++ if (Num_pts == 1) +++ puts("There was no string"); ++ else ++- printf("There were %ld strings\n", Num_pts - 1); ++- printf("Longest string: %lu byte%s\n", Tbl.str_longlen, ++- Tbl.str_longlen == 1 ? "" : "s"); ++- printf("Shortest string: %lu byte%s\n", Tbl.str_shortlen, ++- Tbl.str_shortlen == 1 ? "" : "s"); +++ { +++ if (Num_pts == 2) +++ puts("There was 1 string"); +++ else +++ printf("There were %ld strings\n", Num_pts - 1); +++ printf("Longest string: %lu byte%s\n", Tbl.str_longlen, +++ Tbl.str_longlen == 1 ? "" : "s"); +++ printf("Shortest string: %lu byte%s\n", Tbl.str_shortlen, +++ Tbl.str_shortlen == 1 ? "" : "s"); +++ } ++ } ++ ++ fseek(outf, (off_t) 0, 0); ++@@ -533,12 +529,19 @@ ++ Tbl.str_longlen = htonl(Tbl.str_longlen); ++ Tbl.str_shortlen = htonl(Tbl.str_shortlen); ++ Tbl.str_flags = htonl(Tbl.str_flags); ++- fwrite((char *) &Tbl, sizeof Tbl, 1, outf); +++ fwrite(&Tbl.str_version, sizeof Tbl.str_version, 1, outf); +++ fwrite(&Tbl.str_numstr, sizeof Tbl.str_numstr, 1, outf); +++ fwrite(&Tbl.str_longlen, sizeof Tbl.str_longlen, 1, outf); +++ fwrite(&Tbl.str_shortlen, sizeof Tbl.str_shortlen, 1, outf); +++ fwrite(&Tbl.str_flags, sizeof Tbl.str_flags, 1, outf); +++ fwrite( Tbl.stuff, sizeof Tbl.stuff, 1, outf); ++ if (STORING_PTRS) ++ { ++ for (p = Seekpts, cnt = Num_pts; cnt--; ++p) +++ { ++ *p = htonl(*p); ++- fwrite((char *) Seekpts, sizeof *Seekpts, (int) Num_pts, outf); +++ fwrite(p, sizeof *p, 1, outf); +++ } ++ } ++ fclose(outf); ++ exit(0); ++--- fortune-mod-1.2.1/util/strfile.h 2000-01-29 11:14:34.000000000 +0000 +++++ fortune-mod-1.2.1/util/strfile.h 2007-07-27 00:25:46.825640014 +0100 ++@@ -38,24 +38,19 @@ ++ * @(#)strfile.h 8.1 (Berkeley) 5/31/93 ++ */ ++ ++-/* Modified Jan 2000, Chris Ausbrooks ++- * + Changed VERSION to FILE_VERSION to avoid warnings caused by ++- * automake/autoconf. ++- */ ++- ++ #define STR_ENDSTRING(line,tbl) \ ++ ((line)[0] == (tbl).str_delim && (line)[1] == '\n') ++ ++ typedef struct { /* information table */ ++-#define FILE_VERSION 1 ++- unsigned long str_version; /* version number */ ++- unsigned long str_numstr; /* # of strings in the file */ ++- unsigned long str_longlen; /* length of longest string */ ++- unsigned long str_shortlen; /* length of shortest string */ +++#define FILE_VERSION 2 +++ u_int32_t str_version; /* version number */ +++ u_int32_t str_numstr; /* # of strings in the file */ +++ u_int32_t str_longlen; /* length of longest string */ +++ u_int32_t str_shortlen; /* length of shortest string */ ++ #define STR_RANDOM 0x1 /* randomized pointers */ ++ #define STR_ORDERED 0x2 /* ordered pointers */ ++ #define STR_ROTATED 0x4 /* rot-13'd text */ ++- unsigned long str_flags; /* bit field for flags */ ++- unsigned char stuff[4]; /* long aligned space */ +++ u_int32_t str_flags; /* bit field for flags */ +++ u_int8_t stuff[4]; /* long aligned space */ ++ #define str_delim stuff[0] /* delimiting character */ ++ } STRFILE; +diff --git a/feeds/packages/utils/fortune-mod/patches/01-strfile-64bit-fix b/feeds/packages/utils/fortune-mod/patches/01-strfile-64bit-fix +new file mode 100644 +index 0000000..9bd3da9 +--- /dev/null ++++ b/feeds/packages/utils/fortune-mod/patches/01-strfile-64bit-fix +@@ -0,0 +1,156 @@ ++--- fortune-mod-1.2.1/util/strfile.c.orig 2007-07-27 00:40:54.687140050 +0100 +++++ fortune-mod-1.2.1/util/strfile.c 2007-07-27 00:41:14.184165656 +0100 ++@@ -144,7 +135,7 @@ ++ typedef struct ++ { ++ char first; ++- off_t pos; +++ int32_t pos; ++ } ++ STR; ++ ++@@ -159,7 +150,7 @@ ++ int Xflag = FALSE; /* set rotated bit */ ++ long Num_pts = 0; /* number of pointers/strings */ ++ ++-off_t *Seekpts; +++int32_t *Seekpts; ++ ++ FILE *Sort_1, *Sort_2; /* pointers for sorting */ ++ ++@@ -237,9 +228,9 @@ ++ * add_offset: ++ * Add an offset to the list, or write it out, as appropriate. ++ */ ++-void add_offset(FILE * fp, off_t off) +++void add_offset(FILE * fp, int32_t off) ++ { ++- off_t net; +++ int32_t net; ++ ++ if (!STORING_PTRS) ++ { ++@@ -258,9 +249,9 @@ ++ * fix_last_offset: ++ * Used when we have two separators in a row. ++ */ ++-void fix_last_offset(FILE * fp, off_t off) +++void fix_last_offset(FILE * fp, int32_t off) ++ { ++- off_t net; +++ int32_t net; ++ ++ if (!STORING_PTRS) ++ { ++@@ -333,7 +324,7 @@ ++ do_order(void) ++ { ++ register long i; ++- register off_t *lp; +++ register int32_t *lp; ++ register STR *fp; ++ ++ Sort_1 = fopen(Infile, "r"); ++@@ -384,8 +375,8 @@ ++ void randomize(void) ++ { ++ register int cnt, i; ++- register off_t tmp; ++- register off_t *sp; +++ register int32_t tmp; +++ register int32_t *sp; ++ extern time_t time(time_t *); ++ ++ srandom((int) (time((time_t *) NULL) + getpid())); ++@@ -422,7 +413,7 @@ ++ { ++ register unsigned char *sp; ++ register FILE *inf, *outf; ++- register off_t last_off, length, pos, *p; +++ register int32_t last_off, length, pos, *p; ++ register int first, cnt; ++ register char *nsp; ++ register STR *fp; ++@@ -514,14 +505,19 @@ ++ if (!Sflag) ++ { ++ printf("\"%s\" created\n", Outfile); ++- if (Num_pts == 2) ++- puts("There was 1 string"); +++ if (Num_pts == 1) +++ puts("There was no string"); ++ else ++- printf("There were %ld strings\n", Num_pts - 1); ++- printf("Longest string: %lu byte%s\n", Tbl.str_longlen, ++- Tbl.str_longlen == 1 ? "" : "s"); ++- printf("Shortest string: %lu byte%s\n", Tbl.str_shortlen, ++- Tbl.str_shortlen == 1 ? "" : "s"); +++ { +++ if (Num_pts == 2) +++ puts("There was 1 string"); +++ else +++ printf("There were %ld strings\n", Num_pts - 1); +++ printf("Longest string: %lu byte%s\n", Tbl.str_longlen, +++ Tbl.str_longlen == 1 ? "" : "s"); +++ printf("Shortest string: %lu byte%s\n", Tbl.str_shortlen, +++ Tbl.str_shortlen == 1 ? "" : "s"); +++ } ++ } ++ ++ fseek(outf, (off_t) 0, 0); ++@@ -533,12 +529,19 @@ ++ Tbl.str_longlen = htonl(Tbl.str_longlen); ++ Tbl.str_shortlen = htonl(Tbl.str_shortlen); ++ Tbl.str_flags = htonl(Tbl.str_flags); ++- fwrite((char *) &Tbl, sizeof Tbl, 1, outf); +++ fwrite(&Tbl.str_version, sizeof Tbl.str_version, 1, outf); +++ fwrite(&Tbl.str_numstr, sizeof Tbl.str_numstr, 1, outf); +++ fwrite(&Tbl.str_longlen, sizeof Tbl.str_longlen, 1, outf); +++ fwrite(&Tbl.str_shortlen, sizeof Tbl.str_shortlen, 1, outf); +++ fwrite(&Tbl.str_flags, sizeof Tbl.str_flags, 1, outf); +++ fwrite( Tbl.stuff, sizeof Tbl.stuff, 1, outf); ++ if (STORING_PTRS) ++ { ++ for (p = Seekpts, cnt = Num_pts; cnt--; ++p) +++ { ++ *p = htonl(*p); ++- fwrite((char *) Seekpts, sizeof *Seekpts, (int) Num_pts, outf); +++ fwrite(p, sizeof *p, 1, outf); +++ } ++ } ++ fclose(outf); ++ exit(0); ++--- fortune-mod-1.2.1/util/strfile.h 2000-01-29 11:14:34.000000000 +0000 +++++ fortune-mod-1.2.1/util/strfile.h 2007-07-27 00:25:46.825640014 +0100 ++@@ -38,24 +38,19 @@ ++ * @(#)strfile.h 8.1 (Berkeley) 5/31/93 ++ */ ++ ++-/* Modified Jan 2000, Chris Ausbrooks ++- * + Changed VERSION to FILE_VERSION to avoid warnings caused by ++- * automake/autoconf. ++- */ ++- ++ #define STR_ENDSTRING(line,tbl) \ ++ ((line)[0] == (tbl).str_delim && (line)[1] == '\n') ++ ++ typedef struct { /* information table */ ++-#define FILE_VERSION 1 ++- unsigned long str_version; /* version number */ ++- unsigned long str_numstr; /* # of strings in the file */ ++- unsigned long str_longlen; /* length of longest string */ ++- unsigned long str_shortlen; /* length of shortest string */ +++#define FILE_VERSION 2 +++ u_int32_t str_version; /* version number */ +++ u_int32_t str_numstr; /* # of strings in the file */ +++ u_int32_t str_longlen; /* length of longest string */ +++ u_int32_t str_shortlen; /* length of shortest string */ ++ #define STR_RANDOM 0x1 /* randomized pointers */ ++ #define STR_ORDERED 0x2 /* ordered pointers */ ++ #define STR_ROTATED 0x4 /* rot-13'd text */ ++- unsigned long str_flags; /* bit field for flags */ ++- unsigned char stuff[4]; /* long aligned space */ +++ u_int32_t str_flags; /* bit field for flags */ +++ u_int8_t stuff[4]; /* long aligned space */ ++ #define str_delim stuff[0] /* delimiting character */ ++ } STRFILE; +diff --git a/feeds/packages/utils/fowsr/.svn/entries b/feeds/packages/utils/fowsr/.svn/entries +new file mode 100644 +index 0000000..838cd20 +--- /dev/null ++++ b/feeds/packages/utils/fowsr/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fowsr ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++702e6e00c91b8b7446dd6d4d121f3c35 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1085 ++ +diff --git a/feeds/packages/utils/fowsr/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/fowsr/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cda239b +--- /dev/null ++++ b/feeds/packages/utils/fowsr/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=fowsr ++PKG_VERSION:=1.0-20110904 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fowsr.googlecode.com/files ++PKG_MD5SUM:=3dbe93a59d85bf89f9c1d20d54f5e983 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fowsr ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat ++ TITLE:=Fine Offset Wireless Weather Station Reader ++ URL:=http://fowsr.googlecode.com/ ++endef ++ ++define Package/fowsr/description ++ fowsr is a USB Data Collector application for WH1080 compatible ++ weather stations. ++ Output formats includes XML, Wunderground.com and pywws. ++endef ++ ++define Package/fowsr/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fowsr $(1)/usr/bin/ ++ $(INSTALL_BIN) \ ++ $(PKG_BUILD_DIR)/{fowsr,pwsweather,pywws,wunderground,xml}.sh \ ++ $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,fowsr)) +diff --git a/feeds/packages/utils/fowsr/Makefile b/feeds/packages/utils/fowsr/Makefile +new file mode 100644 +index 0000000..cda239b +--- /dev/null ++++ b/feeds/packages/utils/fowsr/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=fowsr ++PKG_VERSION:=1.0-20110904 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fowsr.googlecode.com/files ++PKG_MD5SUM:=3dbe93a59d85bf89f9c1d20d54f5e983 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fowsr ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat ++ TITLE:=Fine Offset Wireless Weather Station Reader ++ URL:=http://fowsr.googlecode.com/ ++endef ++ ++define Package/fowsr/description ++ fowsr is a USB Data Collector application for WH1080 compatible ++ weather stations. ++ Output formats includes XML, Wunderground.com and pywws. ++endef ++ ++define Package/fowsr/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fowsr $(1)/usr/bin/ ++ $(INSTALL_BIN) \ ++ $(PKG_BUILD_DIR)/{fowsr,pwsweather,pywws,wunderground,xml}.sh \ ++ $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,fowsr)) +diff --git a/feeds/packages/utils/foxboard-utils/.svn/entries b/feeds/packages/utils/foxboard-utils/.svn/entries +new file mode 100644 +index 0000000..e3e75ff +--- /dev/null ++++ b/feeds/packages/utils/foxboard-utils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/foxboard-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-18T11:06:19.966693Z ++18816 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++72319de8bf2286a04fd6ad8cab67153a ++2009-12-18T11:06:19.966693Z ++18816 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1119 ++ +diff --git a/feeds/packages/utils/foxboard-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/foxboard-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fcdcef9 +--- /dev/null ++++ b/feeds/packages/utils/foxboard-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=foxboard-utils ++PKG_VERSION:=1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=foxboard-utils.tar.bz2 ++PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt ++PKG_MD5SUM:= ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/foxboard-utils ++ SECTION:=utils ++ CATEGORY:=Base system ++ TITLE:=Foxboard base tools ++ URL:=http://www.acmesystems.it ++ DEPENDS:=@TARGET_etrax ++endef ++ ++define Package/foxboard-utils/description ++ This package contains a collection of tools for configuring the foxboard ++ gpio pins/leds. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" ++ $(MAKE) -C $(PKG_BUILD_DIR) PREFIX="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Package/foxboard-utils/install ++ $(INSTALL_DIR) $(1)/ ++ $(CP) $(PKG_INSTALL_DIR)/* $(1) ++ $(INSTALL_DIR) $(1)/www/cgi-bin ++ cd $(1)/www/cgi-bin; ln -s ../../bin/editcgi.cgi . ++endef ++ ++$(eval $(call BuildPackage,foxboard-utils)) +diff --git a/feeds/packages/utils/foxboard-utils/Makefile b/feeds/packages/utils/foxboard-utils/Makefile +new file mode 100644 +index 0000000..fcdcef9 +--- /dev/null ++++ b/feeds/packages/utils/foxboard-utils/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=foxboard-utils ++PKG_VERSION:=1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=foxboard-utils.tar.bz2 ++PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt ++PKG_MD5SUM:= ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/foxboard-utils ++ SECTION:=utils ++ CATEGORY:=Base system ++ TITLE:=Foxboard base tools ++ URL:=http://www.acmesystems.it ++ DEPENDS:=@TARGET_etrax ++endef ++ ++define Package/foxboard-utils/description ++ This package contains a collection of tools for configuring the foxboard ++ gpio pins/leds. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" ++ $(MAKE) -C $(PKG_BUILD_DIR) PREFIX="$(PKG_INSTALL_DIR)" install ++endef ++ ++define Package/foxboard-utils/install ++ $(INSTALL_DIR) $(1)/ ++ $(CP) $(PKG_INSTALL_DIR)/* $(1) ++ $(INSTALL_DIR) $(1)/www/cgi-bin ++ cd $(1)/www/cgi-bin; ln -s ../../bin/editcgi.cgi . ++endef ++ ++$(eval $(call BuildPackage,foxboard-utils)) +diff --git a/feeds/packages/utils/freecwmp/.svn/entries b/feeds/packages/utils/freecwmp/.svn/entries +new file mode 100644 +index 0000000..7289c7f +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/.svn/entries +@@ -0,0 +1,99 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/freecwmp ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T16:24:49.085841Z ++35669 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++89ffae180db5b35fd00d7468caf8f458 ++2013-02-18T16:22:03.547002Z ++35668 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++460 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++11074948f23bd3a1d8f674fbe347495c ++2013-02-18T16:22:03.547002Z ++35668 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3342 ++ +diff --git a/feeds/packages/utils/freecwmp/.svn/text-base/Config.in.svn-base b/feeds/packages/utils/freecwmp/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..3b81e60 +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,26 @@ ++if PACKAGE_freecwmp-curl || PACKAGE_freecwmp-zstream ++ ++config FREECWMP_SCRIPTS_FULL ++ bool "Install all freecwmp scripts" ++ default y ++ ++choice ++ prompt "Select ACS sever" ++ default FREECWMP_ACS_MULTI ++ ++config FREECWMP_ACS_MULTI ++ bool "No specific ACS, follow standard" ++ ++config FREECWMP_ACS_HDM ++ bool "HDM" ++endchoice ++ ++config FREECWMP_DEBUG ++ bool "Compile with debug options" ++ default n ++ ++config FREECWMP_DEVEL ++ bool "Compile with development options" ++ default n ++ ++endif +diff --git a/feeds/packages/utils/freecwmp/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/freecwmp/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c0cfd0c +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,133 @@ ++# ++# 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:=freecwmp ++PKG_VERSION:=2013-02-18 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/freecwmp ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=c1a9c1883189fec77cba32c46bc26658ca3f8123 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_FREECWMP_ACS_MULTI \ ++ CONFIG_FREECWMP_ACS_HDM \ ++ CONFIG_FREECWMP_DEBUG \ ++ CONFIG_FREECWMP_DEVEL ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freecwmp/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=CWMP client ++ DEPENDS:=+libfreecwmp +libuci +libubox +libubus +libmicroxml +shflags ++endef ++ ++define Package/freecwmp/description ++ A free client implementation of CWMP (TR-069) protocol ++endef ++ ++define Package/freecwmp-curl ++ $(call Package/freecwmp/Default) ++ TITLE+= (using libcurl) ++ DEPENDS+= +libcurl ++ VARIANT:=curl ++endef ++ ++define Package/freecwmp-zstream ++ $(call Package/freecwmp/Default) ++ TITLE+= (using libzstream) ++ DEPENDS+= +libzstream ++ VARIANT:=zstream ++endef ++ ++define Package/freecwmp-zstream/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1) ++ifneq ($(USE_LOCAL),) ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++endif ++ ++TARGET_CFLAGS += \ ++ -D_GNU_SOURCE ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_ARGS += \ ++ --with-libfreecwmp-include-path=$(STAGING_DIR)/usr/include \ ++ --with-uci-include-path=$(STAGING_DIR)/usr/include \ ++ --with-libubox-include-path=$(STAGING_DIR)/usr/include \ ++ --with-libubus-include-path=$(STAGING_DIR)/usr/include ++ ++ifeq ($(BUILD_VARIANT),zstream) ++CONFIGURE_ARGS += \ ++ --enable-http=zstream \ ++ --with-zstream-include-path=$(STAGING_DIR)/usr/include ++endif ++ ++ifeq ($(BUILD_VARIANT),curl) ++CONFIGURE_ARGS += \ ++ --enable-http=curl ++endif ++ ++ifeq ($(CONFIG_FREECWMP_ACS_MULTI),y) ++CONFIGURE_ARGS += \ ++ --enable-acs=multi ++endif ++ ++ifeq ($(CONFIG_FREECWMP_ACS_HDM),y) ++CONFIGURE_ARGS += \ ++ --enable-acs=hdm ++endif ++ ++ifeq ($(CONFIG_FREECWMP_DEBUG),y) ++CONFIGURE_ARGS += \ ++ --enable-debug ++endif ++ ++ifeq ($(CONFIG_FREECWMP_DEVEL),y) ++CONFIGURE_ARGS += \ ++ --enable-devel ++endif ++ ++define Package/freecwmp-$(BUILD_VARIANT)/conffiles ++/etc/config/freecwmp ++/usr/share/freecwmp/defaults ++endef ++ ++define Package/freecwmp-$(BUILD_VARIANT)/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/bin/freecwmpd $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/ext/openwrt/config/freecwmp $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/freecwmpd.init $(1)/etc/init.d/freecwmpd ++ifeq ($(CONFIG_FREECWMP_SCRIPTS_FULL),y) ++ $(INSTALL_DIR) $(1)/usr/share/freecwmp ++ $(CP) $(PKG_BUILD_DIR)/ext/openwrt/scripts/defaults $(1)/usr/share/freecwmp ++ $(CP) $(PKG_BUILD_DIR)/ext/openwrt/scripts/functions $(1)/usr/share/freecwmp ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/openwrt/scripts/freecwmp.sh $(1)/usr/sbin/freecwmp ++endif ++endef ++ ++$(eval $(call BuildPackage,freecwmp-curl)) ++$(eval $(call BuildPackage,freecwmp-zstream)) +diff --git a/feeds/packages/utils/freecwmp/Config.in b/feeds/packages/utils/freecwmp/Config.in +new file mode 100644 +index 0000000..3b81e60 +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/Config.in +@@ -0,0 +1,26 @@ ++if PACKAGE_freecwmp-curl || PACKAGE_freecwmp-zstream ++ ++config FREECWMP_SCRIPTS_FULL ++ bool "Install all freecwmp scripts" ++ default y ++ ++choice ++ prompt "Select ACS sever" ++ default FREECWMP_ACS_MULTI ++ ++config FREECWMP_ACS_MULTI ++ bool "No specific ACS, follow standard" ++ ++config FREECWMP_ACS_HDM ++ bool "HDM" ++endchoice ++ ++config FREECWMP_DEBUG ++ bool "Compile with debug options" ++ default n ++ ++config FREECWMP_DEVEL ++ bool "Compile with development options" ++ default n ++ ++endif +diff --git a/feeds/packages/utils/freecwmp/Makefile b/feeds/packages/utils/freecwmp/Makefile +new file mode 100644 +index 0000000..c0cfd0c +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/Makefile +@@ -0,0 +1,133 @@ ++# ++# 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:=freecwmp ++PKG_VERSION:=2013-02-18 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://dev.freecwmp.org/freecwmp ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=c1a9c1883189fec77cba32c46bc26658ca3f8123 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_FREECWMP_ACS_MULTI \ ++ CONFIG_FREECWMP_ACS_HDM \ ++ CONFIG_FREECWMP_DEBUG \ ++ CONFIG_FREECWMP_DEVEL ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/freecwmp/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=CWMP client ++ DEPENDS:=+libfreecwmp +libuci +libubox +libubus +libmicroxml +shflags ++endef ++ ++define Package/freecwmp/description ++ A free client implementation of CWMP (TR-069) protocol ++endef ++ ++define Package/freecwmp-curl ++ $(call Package/freecwmp/Default) ++ TITLE+= (using libcurl) ++ DEPENDS+= +libcurl ++ VARIANT:=curl ++endef ++ ++define Package/freecwmp-zstream ++ $(call Package/freecwmp/Default) ++ TITLE+= (using libzstream) ++ DEPENDS+= +libzstream ++ VARIANT:=zstream ++endef ++ ++define Package/freecwmp-zstream/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1) ++ifneq ($(USE_LOCAL),) ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++endif ++ ++TARGET_CFLAGS += \ ++ -D_GNU_SOURCE ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_ARGS += \ ++ --with-libfreecwmp-include-path=$(STAGING_DIR)/usr/include \ ++ --with-uci-include-path=$(STAGING_DIR)/usr/include \ ++ --with-libubox-include-path=$(STAGING_DIR)/usr/include \ ++ --with-libubus-include-path=$(STAGING_DIR)/usr/include ++ ++ifeq ($(BUILD_VARIANT),zstream) ++CONFIGURE_ARGS += \ ++ --enable-http=zstream \ ++ --with-zstream-include-path=$(STAGING_DIR)/usr/include ++endif ++ ++ifeq ($(BUILD_VARIANT),curl) ++CONFIGURE_ARGS += \ ++ --enable-http=curl ++endif ++ ++ifeq ($(CONFIG_FREECWMP_ACS_MULTI),y) ++CONFIGURE_ARGS += \ ++ --enable-acs=multi ++endif ++ ++ifeq ($(CONFIG_FREECWMP_ACS_HDM),y) ++CONFIGURE_ARGS += \ ++ --enable-acs=hdm ++endif ++ ++ifeq ($(CONFIG_FREECWMP_DEBUG),y) ++CONFIGURE_ARGS += \ ++ --enable-debug ++endif ++ ++ifeq ($(CONFIG_FREECWMP_DEVEL),y) ++CONFIGURE_ARGS += \ ++ --enable-devel ++endif ++ ++define Package/freecwmp-$(BUILD_VARIANT)/conffiles ++/etc/config/freecwmp ++/usr/share/freecwmp/defaults ++endef ++ ++define Package/freecwmp-$(BUILD_VARIANT)/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/bin/freecwmpd $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/ext/openwrt/config/freecwmp $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/freecwmpd.init $(1)/etc/init.d/freecwmpd ++ifeq ($(CONFIG_FREECWMP_SCRIPTS_FULL),y) ++ $(INSTALL_DIR) $(1)/usr/share/freecwmp ++ $(CP) $(PKG_BUILD_DIR)/ext/openwrt/scripts/defaults $(1)/usr/share/freecwmp ++ $(CP) $(PKG_BUILD_DIR)/ext/openwrt/scripts/functions $(1)/usr/share/freecwmp ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/openwrt/scripts/freecwmp.sh $(1)/usr/sbin/freecwmp ++endif ++endef ++ ++$(eval $(call BuildPackage,freecwmp-curl)) ++$(eval $(call BuildPackage,freecwmp-zstream)) +diff --git a/feeds/packages/utils/freecwmp/files/.svn/entries b/feeds/packages/utils/freecwmp/files/.svn/entries +new file mode 100644 +index 0000000..e39f243 +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/freecwmp/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T16:24:49.085841Z ++35669 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++freecwmpd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++fffc620fe066ae83462290ae6913645c ++2013-02-18T16:24:49.085841Z ++35669 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++167 ++ +diff --git a/feeds/packages/utils/freecwmp/files/.svn/text-base/freecwmpd.init.svn-base b/feeds/packages/utils/freecwmp/files/.svn/text-base/freecwmpd.init.svn-base +new file mode 100644 +index 0000000..b9b7a0c +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/files/.svn/text-base/freecwmpd.init.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012-2013 OpenWrt.org ++ ++START=90 ++ ++start() { ++ service_start /usr/sbin/freecwmpd ++} ++ ++stop() { ++ service_stop /usr/sbin/freecwmpd ++} +diff --git a/feeds/packages/utils/freecwmp/files/freecwmpd.init b/feeds/packages/utils/freecwmp/files/freecwmpd.init +new file mode 100644 +index 0000000..b9b7a0c +--- /dev/null ++++ b/feeds/packages/utils/freecwmp/files/freecwmpd.init +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012-2013 OpenWrt.org ++ ++START=90 ++ ++start() { ++ service_start /usr/sbin/freecwmpd ++} ++ ++stop() { ++ service_stop /usr/sbin/freecwmpd ++} +diff --git a/feeds/packages/utils/fxload/.svn/entries b/feeds/packages/utils/fxload/.svn/entries +new file mode 100644 +index 0000000..b71a32f +--- /dev/null ++++ b/feeds/packages/utils/fxload/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fxload ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-12T13:02:20.147113Z ++16806 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7614832681d19c52fe457b293b274dc6 ++2009-07-12T13:02:20.147113Z ++16806 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1005 ++ +diff --git a/feeds/packages/utils/fxload/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/fxload/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/utils/fxload/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/fxload/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/fxload/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f961d52 +--- /dev/null ++++ b/feeds/packages/utils/fxload/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=fxload ++PKG_VERSION:=2008_10_13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/linux-hotplug ++PKG_MD5SUM:=4477a2457f064228bef4a93ba2f21692 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fxload ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@USB_SUPPORT +udev ++ TITLE:=Downloading firmware into EZ-USB microcontrollers ++ URL:=http://linux-hotplug.sourceforge.net/ ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" \ ++ ) ++endef ++ ++define Package/fxload/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin/ ++ $(INSTALL_DIR) $(1)/usr/share/usb ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/a3load.hex $(1)/usr/share/usb/ ++endef ++ ++$(eval $(call BuildPackage,fxload)) +diff --git a/feeds/packages/utils/fxload/Makefile b/feeds/packages/utils/fxload/Makefile +new file mode 100644 +index 0000000..f961d52 +--- /dev/null ++++ b/feeds/packages/utils/fxload/Makefile +@@ -0,0 +1,42 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=fxload ++PKG_VERSION:=2008_10_13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/linux-hotplug ++PKG_MD5SUM:=4477a2457f064228bef4a93ba2f21692 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/fxload ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@USB_SUPPORT +udev ++ TITLE:=Downloading firmware into EZ-USB microcontrollers ++ URL:=http://linux-hotplug.sourceforge.net/ ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" \ ++ ) ++endef ++ ++define Package/fxload/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin/ ++ $(INSTALL_DIR) $(1)/usr/share/usb ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/a3load.hex $(1)/usr/share/usb/ ++endef ++ ++$(eval $(call BuildPackage,fxload)) +diff --git a/feeds/packages/utils/fxload/patches/.svn/entries b/feeds/packages/utils/fxload/patches/.svn/entries +new file mode 100644 +index 0000000..965e504 +--- /dev/null ++++ b/feeds/packages/utils/fxload/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/fxload/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-12T13:02:20.147113Z ++16806 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c3849ba638e352e53dc4d05de389477a ++2009-07-12T13:02:20.147113Z ++16806 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++325 ++ +diff --git a/feeds/packages/utils/fxload/patches/.svn/prop-base/010-compile_fix.patch.svn-base b/feeds/packages/utils/fxload/patches/.svn/prop-base/010-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/fxload/patches/.svn/prop-base/010-compile_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/fxload/patches/.svn/text-base/010-compile_fix.patch.svn-base b/feeds/packages/utils/fxload/patches/.svn/text-base/010-compile_fix.patch.svn-base +new file mode 100644 +index 0000000..39ab9dc +--- /dev/null ++++ b/feeds/packages/utils/fxload/patches/.svn/text-base/010-compile_fix.patch.svn-base +@@ -0,0 +1,18 @@ ++--- a/ezusb.c +++++ b/ezusb.c ++@@ -30,8 +30,14 @@ ++ # include ++ ++ # include ++-# include +++typedef unsigned long kernel_ulong_t; +++ +++#ifndef BITS_PER_LONG +++#define BITS_PER_LONG 32 +++#endif +++ ++ # include +++# include ++ ++ # include "ezusb.h" ++ +diff --git a/feeds/packages/utils/fxload/patches/010-compile_fix.patch b/feeds/packages/utils/fxload/patches/010-compile_fix.patch +new file mode 100644 +index 0000000..39ab9dc +--- /dev/null ++++ b/feeds/packages/utils/fxload/patches/010-compile_fix.patch +@@ -0,0 +1,18 @@ ++--- a/ezusb.c +++++ b/ezusb.c ++@@ -30,8 +30,14 @@ ++ # include ++ ++ # include ++-# include +++typedef unsigned long kernel_ulong_t; +++ +++#ifndef BITS_PER_LONG +++#define BITS_PER_LONG 32 +++#endif +++ ++ # include +++# include ++ ++ # include "ezusb.h" ++ +diff --git a/feeds/packages/utils/gadgetfs-test/.svn/entries b/feeds/packages/utils/gadgetfs-test/.svn/entries +new file mode 100644 +index 0000000..a6a75ac +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gadgetfs-test ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d9a5d7aff33d940866deac43cadeab8b ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2565 ++ +diff --git a/feeds/packages/utils/gadgetfs-test/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/gadgetfs-test/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/gadgetfs-test/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/gadgetfs-test/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3dfc298 +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,112 @@ ++# ++# 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:=gadgetfs-test ++PKG_VERSION:=2007-11-29 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).tar.bz2 ++PKG_SOURCE_URL:=http://avr32linux.org/twiki/pub/Main/GadgetFsTest ++PKG_MD5SUM:=49476a74c29f1281c8a4c035aa57a5bd ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gadgetfs-test ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ TITLE:=Test program for gadgetfs ++ DEPENDS:=@DEVEL +libpthread ++ URL:=http://linux-usb.org/gadget ++endef ++ ++define Package/gadgetfs-test/description ++ Test program for gadgetfs from linux-usb.org. ++endef ++ ++define Package/gadgetfs-test-bulk ++$(call Package/gadgetfs-test) ++ TITLE+= (BULK transfer) ++endef ++ ++define Package/gadgetfs-test-bulk/description ++$(call Package/gadgetfs-test/description) ++ This package is built with BULK transfer support. ++endef ++ ++define Package/gadgetfs-test-isoc ++$(call Package/gadgetfs-test) ++ DEPENDS+= +libaio ++ TITLE+= (ISOCHRONOUS transfer) ++endef ++ ++define Package/gadgetfs-test-isoc/description ++$(call Package/gadgetfs-test/description) ++ This package is built with ISOCHRONOUS transfer support using libaio. ++endef ++ ++ ++GADGETFS_CFLAGS:=$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) ++GADGETFS_LDFLAGS:=$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) ++GADGETFS_LIBS:=-lpthread ++ ++define Build/Template ++ ++$(STAMP_BUILT)-$(1): $(STAMP_PREPARED) ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(MAKE_VARS) \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CC="$(TARGET_CC)" \ ++ LDFLAGS="$(GADGETFS_LDFLAGS)" \ ++ $(2) \ ++ all ++ mv -f $(PKG_BUILD_DIR)/gadgetfs-test $(PKG_BUILD_DIR)/gadgetfs-test-$(1) ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(1) ++ ++define Package/gadgetfs-test-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/gadgetfs-test-$(1) $$(1)/usr/sbin/ ++endef ++ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_gadgetfs-test-bulk),) ++ define Build/bulk ++ $(call Build/Template,bulk, \ ++ CFLAGS="$(GADGETFS_CFLAGS)" \ ++ LIBS="$(GADGETFS_LIBS)" \ ++ ) ++ endef ++endif ++$(eval $(Build/bulk)) ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_gadgetfs-test-isoc),) ++ define Build/isoc ++ $(call Build/Template,isoc, \ ++ CFLAGS="$(GADGETFS_CFLAGS) -DAIO" \ ++ LIBS="$(GADGETFS_LIBS) -laio" \ ++ ) ++ endef ++endif ++$(eval $(Build/isoc)) ++ ++$(eval $(call BuildPackage,gadgetfs-test-bulk)) ++$(eval $(call BuildPackage,gadgetfs-test-isoc)) ++ +diff --git a/feeds/packages/utils/gadgetfs-test/Makefile b/feeds/packages/utils/gadgetfs-test/Makefile +new file mode 100644 +index 0000000..3dfc298 +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/Makefile +@@ -0,0 +1,112 @@ ++# ++# 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:=gadgetfs-test ++PKG_VERSION:=2007-11-29 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).tar.bz2 ++PKG_SOURCE_URL:=http://avr32linux.org/twiki/pub/Main/GadgetFsTest ++PKG_MD5SUM:=49476a74c29f1281c8a4c035aa57a5bd ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gadgetfs-test ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ TITLE:=Test program for gadgetfs ++ DEPENDS:=@DEVEL +libpthread ++ URL:=http://linux-usb.org/gadget ++endef ++ ++define Package/gadgetfs-test/description ++ Test program for gadgetfs from linux-usb.org. ++endef ++ ++define Package/gadgetfs-test-bulk ++$(call Package/gadgetfs-test) ++ TITLE+= (BULK transfer) ++endef ++ ++define Package/gadgetfs-test-bulk/description ++$(call Package/gadgetfs-test/description) ++ This package is built with BULK transfer support. ++endef ++ ++define Package/gadgetfs-test-isoc ++$(call Package/gadgetfs-test) ++ DEPENDS+= +libaio ++ TITLE+= (ISOCHRONOUS transfer) ++endef ++ ++define Package/gadgetfs-test-isoc/description ++$(call Package/gadgetfs-test/description) ++ This package is built with ISOCHRONOUS transfer support using libaio. ++endef ++ ++ ++GADGETFS_CFLAGS:=$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) ++GADGETFS_LDFLAGS:=$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) ++GADGETFS_LIBS:=-lpthread ++ ++define Build/Template ++ ++$(STAMP_BUILT)-$(1): $(STAMP_PREPARED) ++ -$(MAKE) -C $(PKG_BUILD_DIR) clean ++ $(MAKE_VARS) \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CC="$(TARGET_CC)" \ ++ LDFLAGS="$(GADGETFS_LDFLAGS)" \ ++ $(2) \ ++ all ++ mv -f $(PKG_BUILD_DIR)/gadgetfs-test $(PKG_BUILD_DIR)/gadgetfs-test-$(1) ++ touch $$@ ++ ++$(STAMP_BUILT): $(STAMP_BUILT)-$(1) ++ ++define Package/gadgetfs-test-$(1)/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/gadgetfs-test-$(1) $$(1)/usr/sbin/ ++endef ++ ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_gadgetfs-test-bulk),) ++ define Build/bulk ++ $(call Build/Template,bulk, \ ++ CFLAGS="$(GADGETFS_CFLAGS)" \ ++ LIBS="$(GADGETFS_LIBS)" \ ++ ) ++ endef ++endif ++$(eval $(Build/bulk)) ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_gadgetfs-test-isoc),) ++ define Build/isoc ++ $(call Build/Template,isoc, \ ++ CFLAGS="$(GADGETFS_CFLAGS) -DAIO" \ ++ LIBS="$(GADGETFS_LIBS) -laio" \ ++ ) ++ endef ++endif ++$(eval $(Build/isoc)) ++ ++$(eval $(call BuildPackage,gadgetfs-test-bulk)) ++$(eval $(call BuildPackage,gadgetfs-test-isoc)) ++ +diff --git a/feeds/packages/utils/gadgetfs-test/patches/.svn/entries b/feeds/packages/utils/gadgetfs-test/patches/.svn/entries +new file mode 100644 +index 0000000..f31968f +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gadgetfs-test/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-11-29T08:27:09.210588Z ++9628 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-linux_usb_org_2007_11_29.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++eb16416b652b5de4731e373e8a15c929 ++2007-11-29T08:27:09.210588Z ++9628 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6099 ++ +diff --git a/feeds/packages/utils/gadgetfs-test/patches/.svn/text-base/001-linux_usb_org_2007_11_29.patch.svn-base b/feeds/packages/utils/gadgetfs-test/patches/.svn/text-base/001-linux_usb_org_2007_11_29.patch.svn-base +new file mode 100644 +index 0000000..fce5b68 +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/patches/.svn/text-base/001-linux_usb_org_2007_11_29.patch.svn-base +@@ -0,0 +1,214 @@ ++diff -Nur gadgetfs-test.orig/usb.c gadgetfs-test.2007-11-29/usb.c ++--- gadgetfs-test.orig/usb.c 2007-06-21 16:36:32.000000000 +0200 +++++ gadgetfs-test.2007-11-29/usb.c 2007-09-25 09:01:48.000000000 +0200 ++@@ -34,8 +34,8 @@ ++ #include ++ ++ #include ++-#include ++-#include +++#include +++#include ++ ++ #ifdef AIO ++ /* this aio code works with libaio-0.3.106 */ ++@@ -402,6 +402,26 @@ ++ fs_status_desc.bEndpointAddress = USB_DIR_IN | 3; ++ EP_STATUS_NAME = "ep3in-int"; ++ +++ /* Atmel AT32AP700x processors, high/full speed */ +++ } else if (stat (DEVNAME = "atmel_usba_udc", &statb) == 0) { +++ HIGHSPEED = 1; +++ device_desc.bcdDevice = __constant_cpu_to_le16 (0x0108); +++ +++ fs_source_desc.bEndpointAddress +++ = hs_source_desc.bEndpointAddress +++ = USB_DIR_IN | 1; +++ EP_IN_NAME = "ep1in-bulk"; +++ fs_sink_desc.bEndpointAddress +++ = hs_sink_desc.bEndpointAddress +++ = USB_DIR_OUT | 2; +++ EP_OUT_NAME = "ep2out-bulk"; +++ +++ source_sink_intf.bNumEndpoints = 3; +++ fs_status_desc.bEndpointAddress +++ = hs_status_desc.bEndpointAddress +++ = USB_DIR_IN | 3; +++ EP_STATUS_NAME = "ep3in-int"; +++ ++ } else { ++ DEVNAME = 0; ++ return -ENODEV; ++@@ -597,18 +617,58 @@ ++ fs_status_desc.bEndpointAddress = USB_DIR_IN | 3; ++ EP_STATUS_NAME = "ep3-int"; ++ +++ /* Atmel AT32AP700x processors, high/full speed */ +++ } else if (stat (DEVNAME = "atmel_usba_udc", &statb) == 0){ +++ HIGHSPEED = 1; +++ +++ device_desc.bcdDevice = __constant_cpu_to_le16 (0x0105); +++ +++ fs_source_desc.bEndpointAddress +++ = hs_source_desc.bEndpointAddress +++ = USB_DIR_IN | 5; +++ fs_source_desc.bmAttributes +++ = hs_source_desc.bmAttributes +++ = USB_ENDPOINT_XFER_ISOC; +++ fs_source_desc.wMaxPacketSize +++ = hs_source_desc.wMaxPacketSize +++ = __cpu_to_le16(min (bufsize, 1024)); +++ fs_source_desc.bInterval +++ = hs_source_desc.bInterval +++ = interval; +++ EP_IN_NAME = "ep5in-iso"; +++ +++ fs_sink_desc.bEndpointAddress +++ = hs_sink_desc.bEndpointAddress +++ = USB_DIR_OUT | 6; +++ fs_sink_desc.bmAttributes +++ = hs_sink_desc.bmAttributes +++ = USB_ENDPOINT_XFER_ISOC; +++ fs_sink_desc.wMaxPacketSize +++ = hs_sink_desc.wMaxPacketSize +++ = __cpu_to_le16(min (bufsize, 1024)); +++ fs_sink_desc.bInterval +++ = hs_sink_desc.bInterval +++ = interval; +++ EP_OUT_NAME = "ep6out-iso"; +++ +++ source_sink_intf.bNumEndpoints = 3; +++ fs_status_desc.bEndpointAddress +++ = hs_status_desc.bEndpointAddress +++ = USB_DIR_IN | 3; +++ EP_STATUS_NAME = "ep3in-int"; +++ ++ } else { ++ DEVNAME = 0; ++ return -ENODEV; ++ } ++ if (verbose) { ++ fprintf (stderr, "iso fs wMaxPacket %04x bInterval %02x\n", ++- fs_sink_desc.wMaxPacketSize, +++ __le16_to_cpu(fs_sink_desc.wMaxPacketSize), ++ fs_sink_desc.bInterval); ++ if (HIGHSPEED) ++ fprintf (stderr, ++ "iso hs wMaxPacket %04x bInterval %02x\n", ++- hs_sink_desc.wMaxPacketSize, +++ __le16_to_cpu(hs_sink_desc.wMaxPacketSize), ++ hs_sink_desc.bInterval); ++ } ++ return 0; ++@@ -1285,13 +1345,17 @@ ++ { ++ int status, tmp; ++ __u8 buf [256]; +++ __u16 value, index, length; +++ +++ value = __le16_to_cpu(setup->wValue); +++ index = __le16_to_cpu(setup->wIndex); +++ length = __le16_to_cpu(setup->wLength); ++ ++ if (verbose) ++ fprintf (stderr, "SETUP %02x.%02x " ++ "v%04x i%04x %d\n", ++ setup->bRequestType, setup->bRequest, ++- setup->wValue, setup->wIndex, ++- setup->wLength); +++ value, index, length); ++ ++ /* ++ if ((setup->bRequestType & USB_TYPE_MASK) != USB_TYPE_STANDARD) ++@@ -1302,21 +1366,21 @@ ++ case USB_REQ_GET_DESCRIPTOR: ++ if (setup->bRequestType != USB_DIR_IN) ++ goto stall; ++- switch (setup->wValue >> 8) { +++ switch (value >> 8) { ++ case USB_DT_STRING: ++- tmp = setup->wValue & 0x0ff; +++ tmp = value & 0x0ff; ++ if (verbose > 1) ++ fprintf (stderr, ++ "... get string %d lang %04x\n", ++- tmp, setup->wIndex); ++- if (tmp != 0 && setup->wIndex != strings.language) +++ tmp, index); +++ if (tmp != 0 && index != strings.language) ++ goto stall; ++ status = usb_gadget_get_string (&strings, tmp, buf); ++ if (status < 0) ++ goto stall; ++ tmp = status; ++- if (setup->wLength < tmp) ++- tmp = setup->wLength; +++ if (length < tmp) +++ tmp = length; ++ status = write (fd, buf, tmp); ++ if (status < 0) { ++ if (errno == EIDRM) ++@@ -1336,7 +1400,7 @@ ++ if (setup->bRequestType != USB_DIR_OUT) ++ goto stall; ++ if (verbose) ++- fprintf (stderr, "CONFIG #%d\n", setup->wValue); +++ fprintf (stderr, "CONFIG #%d\n", value); ++ ++ /* Kernel is normally waiting for us to finish reconfiguring ++ * the device. ++@@ -1349,7 +1413,7 @@ ++ * the endpoints always active and don't rely on seeing any ++ * config change events, either this or SET_INTERFACE. ++ */ ++- switch (setup->wValue) { +++ switch (value) { ++ case CONFIG_VALUE: ++ start_io (); ++ break; ++@@ -1369,27 +1433,27 @@ ++ return; ++ case USB_REQ_GET_INTERFACE: ++ if (setup->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE) ++- || setup->wIndex != 0 ++- || setup->wLength > 1) +++ || index != 0 +++ || length > 1) ++ goto stall; ++ ++ /* only one altsetting in this driver */ ++ buf [0] = 0; ++- status = write (fd, buf, setup->wLength); +++ status = write (fd, buf, length); ++ if (status < 0) { ++ if (errno == EIDRM) ++ fprintf (stderr, "GET_INTERFACE timeout\n"); ++ else ++ perror ("write GET_INTERFACE data"); ++- } else if (status != setup->wLength) { +++ } else if (status != length) { ++ fprintf (stderr, "short GET_INTERFACE write, %d\n", ++ status); ++ } ++ return; ++ case USB_REQ_SET_INTERFACE: ++ if (setup->bRequestType != USB_RECIP_INTERFACE ++- || setup->wIndex != 0 ++- || setup->wValue != 0) +++ || index != 0 +++ || value != 0) ++ goto stall; ++ ++ /* just reset toggle/halt for the interface's endpoints */ ++diff -Nur gadgetfs-test.orig/usbstring.c gadgetfs-test.2007-11-29/usbstring.c ++--- gadgetfs-test.orig/usbstring.c 2007-06-21 16:36:32.000000000 +0200 +++++ gadgetfs-test.2007-11-29/usbstring.c 2007-09-25 09:01:48.000000000 +0200 ++@@ -11,7 +11,7 @@ ++ #include ++ ++ #include ++-#include +++#include ++ ++ #include "usbstring.h" ++ +diff --git a/feeds/packages/utils/gadgetfs-test/patches/001-linux_usb_org_2007_11_29.patch b/feeds/packages/utils/gadgetfs-test/patches/001-linux_usb_org_2007_11_29.patch +new file mode 100644 +index 0000000..fce5b68 +--- /dev/null ++++ b/feeds/packages/utils/gadgetfs-test/patches/001-linux_usb_org_2007_11_29.patch +@@ -0,0 +1,214 @@ ++diff -Nur gadgetfs-test.orig/usb.c gadgetfs-test.2007-11-29/usb.c ++--- gadgetfs-test.orig/usb.c 2007-06-21 16:36:32.000000000 +0200 +++++ gadgetfs-test.2007-11-29/usb.c 2007-09-25 09:01:48.000000000 +0200 ++@@ -34,8 +34,8 @@ ++ #include ++ ++ #include ++-#include ++-#include +++#include +++#include ++ ++ #ifdef AIO ++ /* this aio code works with libaio-0.3.106 */ ++@@ -402,6 +402,26 @@ ++ fs_status_desc.bEndpointAddress = USB_DIR_IN | 3; ++ EP_STATUS_NAME = "ep3in-int"; ++ +++ /* Atmel AT32AP700x processors, high/full speed */ +++ } else if (stat (DEVNAME = "atmel_usba_udc", &statb) == 0) { +++ HIGHSPEED = 1; +++ device_desc.bcdDevice = __constant_cpu_to_le16 (0x0108); +++ +++ fs_source_desc.bEndpointAddress +++ = hs_source_desc.bEndpointAddress +++ = USB_DIR_IN | 1; +++ EP_IN_NAME = "ep1in-bulk"; +++ fs_sink_desc.bEndpointAddress +++ = hs_sink_desc.bEndpointAddress +++ = USB_DIR_OUT | 2; +++ EP_OUT_NAME = "ep2out-bulk"; +++ +++ source_sink_intf.bNumEndpoints = 3; +++ fs_status_desc.bEndpointAddress +++ = hs_status_desc.bEndpointAddress +++ = USB_DIR_IN | 3; +++ EP_STATUS_NAME = "ep3in-int"; +++ ++ } else { ++ DEVNAME = 0; ++ return -ENODEV; ++@@ -597,18 +617,58 @@ ++ fs_status_desc.bEndpointAddress = USB_DIR_IN | 3; ++ EP_STATUS_NAME = "ep3-int"; ++ +++ /* Atmel AT32AP700x processors, high/full speed */ +++ } else if (stat (DEVNAME = "atmel_usba_udc", &statb) == 0){ +++ HIGHSPEED = 1; +++ +++ device_desc.bcdDevice = __constant_cpu_to_le16 (0x0105); +++ +++ fs_source_desc.bEndpointAddress +++ = hs_source_desc.bEndpointAddress +++ = USB_DIR_IN | 5; +++ fs_source_desc.bmAttributes +++ = hs_source_desc.bmAttributes +++ = USB_ENDPOINT_XFER_ISOC; +++ fs_source_desc.wMaxPacketSize +++ = hs_source_desc.wMaxPacketSize +++ = __cpu_to_le16(min (bufsize, 1024)); +++ fs_source_desc.bInterval +++ = hs_source_desc.bInterval +++ = interval; +++ EP_IN_NAME = "ep5in-iso"; +++ +++ fs_sink_desc.bEndpointAddress +++ = hs_sink_desc.bEndpointAddress +++ = USB_DIR_OUT | 6; +++ fs_sink_desc.bmAttributes +++ = hs_sink_desc.bmAttributes +++ = USB_ENDPOINT_XFER_ISOC; +++ fs_sink_desc.wMaxPacketSize +++ = hs_sink_desc.wMaxPacketSize +++ = __cpu_to_le16(min (bufsize, 1024)); +++ fs_sink_desc.bInterval +++ = hs_sink_desc.bInterval +++ = interval; +++ EP_OUT_NAME = "ep6out-iso"; +++ +++ source_sink_intf.bNumEndpoints = 3; +++ fs_status_desc.bEndpointAddress +++ = hs_status_desc.bEndpointAddress +++ = USB_DIR_IN | 3; +++ EP_STATUS_NAME = "ep3in-int"; +++ ++ } else { ++ DEVNAME = 0; ++ return -ENODEV; ++ } ++ if (verbose) { ++ fprintf (stderr, "iso fs wMaxPacket %04x bInterval %02x\n", ++- fs_sink_desc.wMaxPacketSize, +++ __le16_to_cpu(fs_sink_desc.wMaxPacketSize), ++ fs_sink_desc.bInterval); ++ if (HIGHSPEED) ++ fprintf (stderr, ++ "iso hs wMaxPacket %04x bInterval %02x\n", ++- hs_sink_desc.wMaxPacketSize, +++ __le16_to_cpu(hs_sink_desc.wMaxPacketSize), ++ hs_sink_desc.bInterval); ++ } ++ return 0; ++@@ -1285,13 +1345,17 @@ ++ { ++ int status, tmp; ++ __u8 buf [256]; +++ __u16 value, index, length; +++ +++ value = __le16_to_cpu(setup->wValue); +++ index = __le16_to_cpu(setup->wIndex); +++ length = __le16_to_cpu(setup->wLength); ++ ++ if (verbose) ++ fprintf (stderr, "SETUP %02x.%02x " ++ "v%04x i%04x %d\n", ++ setup->bRequestType, setup->bRequest, ++- setup->wValue, setup->wIndex, ++- setup->wLength); +++ value, index, length); ++ ++ /* ++ if ((setup->bRequestType & USB_TYPE_MASK) != USB_TYPE_STANDARD) ++@@ -1302,21 +1366,21 @@ ++ case USB_REQ_GET_DESCRIPTOR: ++ if (setup->bRequestType != USB_DIR_IN) ++ goto stall; ++- switch (setup->wValue >> 8) { +++ switch (value >> 8) { ++ case USB_DT_STRING: ++- tmp = setup->wValue & 0x0ff; +++ tmp = value & 0x0ff; ++ if (verbose > 1) ++ fprintf (stderr, ++ "... get string %d lang %04x\n", ++- tmp, setup->wIndex); ++- if (tmp != 0 && setup->wIndex != strings.language) +++ tmp, index); +++ if (tmp != 0 && index != strings.language) ++ goto stall; ++ status = usb_gadget_get_string (&strings, tmp, buf); ++ if (status < 0) ++ goto stall; ++ tmp = status; ++- if (setup->wLength < tmp) ++- tmp = setup->wLength; +++ if (length < tmp) +++ tmp = length; ++ status = write (fd, buf, tmp); ++ if (status < 0) { ++ if (errno == EIDRM) ++@@ -1336,7 +1400,7 @@ ++ if (setup->bRequestType != USB_DIR_OUT) ++ goto stall; ++ if (verbose) ++- fprintf (stderr, "CONFIG #%d\n", setup->wValue); +++ fprintf (stderr, "CONFIG #%d\n", value); ++ ++ /* Kernel is normally waiting for us to finish reconfiguring ++ * the device. ++@@ -1349,7 +1413,7 @@ ++ * the endpoints always active and don't rely on seeing any ++ * config change events, either this or SET_INTERFACE. ++ */ ++- switch (setup->wValue) { +++ switch (value) { ++ case CONFIG_VALUE: ++ start_io (); ++ break; ++@@ -1369,27 +1433,27 @@ ++ return; ++ case USB_REQ_GET_INTERFACE: ++ if (setup->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE) ++- || setup->wIndex != 0 ++- || setup->wLength > 1) +++ || index != 0 +++ || length > 1) ++ goto stall; ++ ++ /* only one altsetting in this driver */ ++ buf [0] = 0; ++- status = write (fd, buf, setup->wLength); +++ status = write (fd, buf, length); ++ if (status < 0) { ++ if (errno == EIDRM) ++ fprintf (stderr, "GET_INTERFACE timeout\n"); ++ else ++ perror ("write GET_INTERFACE data"); ++- } else if (status != setup->wLength) { +++ } else if (status != length) { ++ fprintf (stderr, "short GET_INTERFACE write, %d\n", ++ status); ++ } ++ return; ++ case USB_REQ_SET_INTERFACE: ++ if (setup->bRequestType != USB_RECIP_INTERFACE ++- || setup->wIndex != 0 ++- || setup->wValue != 0) +++ || index != 0 +++ || value != 0) ++ goto stall; ++ ++ /* just reset toggle/halt for the interface's endpoints */ ++diff -Nur gadgetfs-test.orig/usbstring.c gadgetfs-test.2007-11-29/usbstring.c ++--- gadgetfs-test.orig/usbstring.c 2007-06-21 16:36:32.000000000 +0200 +++++ gadgetfs-test.2007-11-29/usbstring.c 2007-09-25 09:01:48.000000000 +0200 ++@@ -11,7 +11,7 @@ ++ #include ++ ++ #include ++-#include +++#include ++ ++ #include "usbstring.h" ++ +diff --git a/feeds/packages/utils/gawk/.svn/entries b/feeds/packages/utils/gawk/.svn/entries +new file mode 100644 +index 0000000..393c9af +--- /dev/null ++++ b/feeds/packages/utils/gawk/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gawk ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-10T11:37:29.860457Z ++31234 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++99f75e9167477428b0740bb4eea4fe6d ++2012-04-10T11:37:29.860457Z ++31234 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1314 ++ +diff --git a/feeds/packages/utils/gawk/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/gawk/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/gawk/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/gawk/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/gawk/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1105b39 +--- /dev/null ++++ b/feeds/packages/utils/gawk/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=gawk ++PKG_VERSION:=3.1.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=gawk-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gawk/ ++PKG_MD5SUM:=35937a0f83f0efe7a8c2dee635624784 ++PKG_CAT:=zcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/gawk-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gawk ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=GAWK ++ URL:=http://www.gnu.org/software/gawk/ ++endef ++ ++define Package/gawk/description ++ GNU version of AWK. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --prefix=/usr --with-linux-headers="$(LINUX_DIR)" \ ++ ) ++endef ++ ++define Package/gawk/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/gawk $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/igawk $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pgawk $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/libexec/ ++ $(INSTALL_DIR) $(1)/usr/libexec/awk/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/grcat $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/pwcat $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share/ ++ $(INSTALL_DIR) $(1)/usr/share/awk/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/eg/lib/* $(1)/usr/share/awk ++endef ++ ++$(eval $(call BuildPackage,gawk)) +diff --git a/feeds/packages/utils/gawk/Makefile b/feeds/packages/utils/gawk/Makefile +new file mode 100644 +index 0000000..1105b39 +--- /dev/null ++++ b/feeds/packages/utils/gawk/Makefile +@@ -0,0 +1,52 @@ ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=gawk ++PKG_VERSION:=3.1.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=gawk-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gawk/ ++PKG_MD5SUM:=35937a0f83f0efe7a8c2dee635624784 ++PKG_CAT:=zcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/gawk-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gawk ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=GAWK ++ URL:=http://www.gnu.org/software/gawk/ ++endef ++ ++define Package/gawk/description ++ GNU version of AWK. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --prefix=/usr --with-linux-headers="$(LINUX_DIR)" \ ++ ) ++endef ++ ++define Package/gawk/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/gawk $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/igawk $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pgawk $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/libexec/ ++ $(INSTALL_DIR) $(1)/usr/libexec/awk/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/grcat $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/pwcat $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/share/ ++ $(INSTALL_DIR) $(1)/usr/share/awk/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/awklib/eg/lib/* $(1)/usr/share/awk ++endef ++ ++$(eval $(call BuildPackage,gawk)) +diff --git a/feeds/packages/utils/gnokii/.svn/entries b/feeds/packages/utils/gnokii/.svn/entries +new file mode 100644 +index 0000000..d3b2f07 +--- /dev/null ++++ b/feeds/packages/utils/gnokii/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gnokii ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d3ea260282589f17172543853ebff159 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1789 ++ +diff --git a/feeds/packages/utils/gnokii/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/gnokii/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..45f8f91 +--- /dev/null ++++ b/feeds/packages/utils/gnokii/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,68 @@ ++# ++# 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:=gnokii ++PKG_VERSION:=0.6.21 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gnokii.org/download/gnokii/0.6.x ++PKG_MD5SUM:=bbf0aabe2436d8e927f3e2edb4efcac8 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gnokii ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat ++ TITLE:=Gnokii - Datasuite for the mobile phones ++ URL:=http://www.gnokii.org/ ++endef ++ ++define Package/gnokii/description ++ Gnokii is a suite of programs linked against a backend ++ library that allows communication with the phones. It ++ currently supports the most mobile phones, all AT ++ capable mobiles as well as Symbian phones. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ --disable-rlpdebug \ ++ --disable-xdebug \ ++ --disable-debug \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-libpcsclite \ ++ --disable-libical \ ++ --disable-irda \ ++ --disable-bluetooth \ ++ --without-x \ ++ ) ++endef ++ ++define Package/gnokii/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnokii $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gnokiid $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mgnokiidev $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so.3.5.0 $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so.3 $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,gnokii)) +diff --git a/feeds/packages/utils/gnokii/Makefile b/feeds/packages/utils/gnokii/Makefile +new file mode 100644 +index 0000000..45f8f91 +--- /dev/null ++++ b/feeds/packages/utils/gnokii/Makefile +@@ -0,0 +1,68 @@ ++# ++# 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:=gnokii ++PKG_VERSION:=0.6.21 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://gnokii.org/download/gnokii/0.6.x ++PKG_MD5SUM:=bbf0aabe2436d8e927f3e2edb4efcac8 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=0 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gnokii ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat ++ TITLE:=Gnokii - Datasuite for the mobile phones ++ URL:=http://www.gnokii.org/ ++endef ++ ++define Package/gnokii/description ++ Gnokii is a suite of programs linked against a backend ++ library that allows communication with the phones. It ++ currently supports the most mobile phones, all AT ++ capable mobiles as well as Symbian phones. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --without-libiconv-prefix \ ++ --without-libintl-prefix \ ++ --disable-rlpdebug \ ++ --disable-xdebug \ ++ --disable-debug \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-libpcsclite \ ++ --disable-libical \ ++ --disable-irda \ ++ --disable-bluetooth \ ++ --without-x \ ++ ) ++endef ++ ++define Package/gnokii/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnokii $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gnokiid $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mgnokiidev $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so.3.5.0 $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so.3 $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnokii.so $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,gnokii)) +diff --git a/feeds/packages/utils/gnupg/.svn/entries b/feeds/packages/utils/gnupg/.svn/entries +new file mode 100644 +index 0000000..5d6e914 +--- /dev/null ++++ b/feeds/packages/utils/gnupg/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gnupg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-20T04:36:59.636118Z ++31827 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9eb12c4b56a7c97c6ec3902944822e83 ++2012-05-20T04:36:59.636118Z ++31827 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1687 ++ +diff --git a/feeds/packages/utils/gnupg/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/gnupg/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..839381d +--- /dev/null ++++ b/feeds/packages/utils/gnupg/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,17 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/gnupg/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/gnupg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1782f01 +--- /dev/null ++++ b/feeds/packages/utils/gnupg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# 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:=gnupg ++PKG_VERSION:=1.4.12 ++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:=ce3742e5c7912559cab7894ad8ba7f6b ++ ++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/feeds/packages/utils/gnupg/Makefile b/feeds/packages/utils/gnupg/Makefile +new file mode 100644 +index 0000000..1782f01 +--- /dev/null ++++ b/feeds/packages/utils/gnupg/Makefile +@@ -0,0 +1,65 @@ ++# ++# 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:=gnupg ++PKG_VERSION:=1.4.12 ++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:=ce3742e5c7912559cab7894ad8ba7f6b ++ ++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/feeds/packages/utils/gnuplot/.svn/entries b/feeds/packages/utils/gnuplot/.svn/entries +new file mode 100644 +index 0000000..d30b337 +--- /dev/null ++++ b/feeds/packages/utils/gnuplot/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gnuplot ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-04T17:02:06.670867Z ++32979 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++4b564f4d496f6d0ed03dd6b2abf74bd5 ++2012-08-04T17:02:06.670867Z ++32979 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1436 ++ +diff --git a/feeds/packages/utils/gnuplot/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/gnuplot/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ec50a4e +--- /dev/null ++++ b/feeds/packages/utils/gnuplot/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=gnuplot ++PKG_VERSION:=4.6.0 ++PKG_RELEASE:=2 ++ ++PKG_INSTALL:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/gnuplot ++PKG_MD5SUM:=8e6e92b4596ea0eb75e16a57fc79efec ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++TARGET_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \ ++ LIBS="-lpthread" ++ ++define Package/gnuplot ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses $(CXX_DEPENDS) +zlib +libpng +libfreetype +libgd \ ++ $(INTL_DEPENDS) $(ICONV_DEPENDS) +libpthread +libreadline ++ TITLE:=A portable command-line driven graphing utility ++ URL:=http://sourceforge.net/projects/gnuplot/ ++endef ++ ++define Package/gnuplot/description ++ Gnuplot is a portable command-line driven graphing utility for linux, OS/2, ++ MS Windows, OSX, VMS, and many other platforms. ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-x \ ++ --disable-mouse \ ++ --without-tutorial \ ++ --without-row-help \ ++ --without-lisp-files \ ++ --disable-wxwidgets \ ++ --without-lua \ ++ --without-cairo ++ ++define Package/gnuplot/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnuplot $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,gnuplot)) +diff --git a/feeds/packages/utils/gnuplot/Makefile b/feeds/packages/utils/gnuplot/Makefile +new file mode 100644 +index 0000000..ec50a4e +--- /dev/null ++++ b/feeds/packages/utils/gnuplot/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=gnuplot ++PKG_VERSION:=4.6.0 ++PKG_RELEASE:=2 ++ ++PKG_INSTALL:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/gnuplot ++PKG_MD5SUM:=8e6e92b4596ea0eb75e16a57fc79efec ++ ++include $(INCLUDE_DIR)/uclibc++.mk ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++TARGET_LDFLAGS+= \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++CONFIGURE_VARS += \ ++ CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \ ++ LIBS="-lpthread" ++ ++define Package/gnuplot ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses $(CXX_DEPENDS) +zlib +libpng +libfreetype +libgd \ ++ $(INTL_DEPENDS) $(ICONV_DEPENDS) +libpthread +libreadline ++ TITLE:=A portable command-line driven graphing utility ++ URL:=http://sourceforge.net/projects/gnuplot/ ++endef ++ ++define Package/gnuplot/description ++ Gnuplot is a portable command-line driven graphing utility for linux, OS/2, ++ MS Windows, OSX, VMS, and many other platforms. ++endef ++ ++CONFIGURE_ARGS += \ ++ --without-x \ ++ --disable-mouse \ ++ --without-tutorial \ ++ --without-row-help \ ++ --without-lisp-files \ ++ --disable-wxwidgets \ ++ --without-lua \ ++ --without-cairo ++ ++define Package/gnuplot/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnuplot $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,gnuplot)) +diff --git a/feeds/packages/utils/gnuplot/patches/.svn/entries b/feeds/packages/utils/gnuplot/patches/.svn/entries +new file mode 100644 +index 0000000..8f2b0a7 +--- /dev/null ++++ b/feeds/packages/utils/gnuplot/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gnuplot/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-20T19:46:56.030788Z ++31832 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-Makefile.in.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++abbeee05537a01769cad45546f6c395b ++2012-05-20T19:46:56.030788Z ++31832 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++478 ++ +diff --git a/feeds/packages/utils/gnuplot/patches/.svn/text-base/010-Makefile.in.patch.svn-base b/feeds/packages/utils/gnuplot/patches/.svn/text-base/010-Makefile.in.patch.svn-base +new file mode 100644 +index 0000000..8a83fd6 +--- /dev/null ++++ b/feeds/packages/utils/gnuplot/patches/.svn/text-base/010-Makefile.in.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign 1.2h ++-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share +++SUBDIRS = config m4 term src $(LISPDIR) share ++ EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ ++ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ ++ VERSION configure.vms pm3d win +diff --git a/feeds/packages/utils/gnuplot/patches/010-Makefile.in.patch b/feeds/packages/utils/gnuplot/patches/010-Makefile.in.patch +new file mode 100644 +index 0000000..8a83fd6 +--- /dev/null ++++ b/feeds/packages/utils/gnuplot/patches/010-Makefile.in.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++ AUTOMAKE_OPTIONS = foreign 1.2h ++-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share +++SUBDIRS = config m4 term src $(LISPDIR) share ++ EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ ++ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ ++ VERSION configure.vms pm3d win +diff --git a/feeds/packages/utils/goldfish-qemu/.svn/entries b/feeds/packages/utils/goldfish-qemu/.svn/entries +new file mode 100644 +index 0000000..41017c1 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/goldfish-qemu ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-07T12:50:15.917460Z ++33634 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++skins ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++8f0ab69571d651aca5098c627236bdca ++2010-04-23T11:27:29.706738Z ++21107 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1739 ++ +diff --git a/feeds/packages/utils/goldfish-qemu/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/goldfish-qemu/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..e5b4083 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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:=goldfish-qemu ++PKG_REV:=2b8ea29e2bd12f876a4d06647e6077bf72de567e ++PKG_VERSION:=20090429 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://android.git.kernel.org/platform/external/qemu ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_TARGETS:=bin ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/goldfish-qemu ++ SECTION:=emulator ++ CATEGORY:=Emulators ++ DEPENDS:=@TARGET_goldfish ++ TITLE:=A modified version of the Google Android Emulator ++ URL:=http://www.android.com/ ++endef ++ ++LIBSDL_PATCHED:=sdl-1.2.12-android-20080919 ++ ++define Download/libsdl-patched ++ FILE:=$(LIBSDL_PATCHED).tar.gz ++ URL:=http://android.git.kernel.org/pub ++ MD5SUM:=22df8cbb2ecb811938eba8410e861650 ++endef ++$(eval $(call Download,libsdl-patched)) ++ ++Build/Exports= ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ zcat $(DL_DIR)/$(LIBSDL_PATCHED).tar.gz | tar x -C $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++ [ -x $(PKG_BUILD_DIR)/libsdl/bin/sdl-config ] || ( \ ++ cd $(PKG_BUILD_DIR)/$(LIBSDL_PATCHED); \ ++ ./android-configure --prefix=$(PKG_BUILD_DIR)/libsdl; \ ++ make all install; \ ++ ) ++endef ++ ++define Build/Compile ++ (cd $(PKG_BUILD_DIR); \ ++ [ -f $(PKG_BUILD_DIR)/objs/config.make ] || \ ++ ./android-configure.sh --sdl-config=$(PKG_BUILD_DIR)/libsdl/bin/sdl-config \ ++ ) ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/goldfish-qemu/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_BUILD_DIR)/objs/emulator $(1)/ ++ $(CP) ./skins $(1)/ ++endef ++ ++$(eval $(call BuildPackage,goldfish-qemu)) +diff --git a/feeds/packages/utils/goldfish-qemu/Makefile b/feeds/packages/utils/goldfish-qemu/Makefile +new file mode 100644 +index 0000000..e5b4083 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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:=goldfish-qemu ++PKG_REV:=2b8ea29e2bd12f876a4d06647e6077bf72de567e ++PKG_VERSION:=20090429 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://android.git.kernel.org/platform/external/qemu ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_TARGETS:=bin ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/goldfish-qemu ++ SECTION:=emulator ++ CATEGORY:=Emulators ++ DEPENDS:=@TARGET_goldfish ++ TITLE:=A modified version of the Google Android Emulator ++ URL:=http://www.android.com/ ++endef ++ ++LIBSDL_PATCHED:=sdl-1.2.12-android-20080919 ++ ++define Download/libsdl-patched ++ FILE:=$(LIBSDL_PATCHED).tar.gz ++ URL:=http://android.git.kernel.org/pub ++ MD5SUM:=22df8cbb2ecb811938eba8410e861650 ++endef ++$(eval $(call Download,libsdl-patched)) ++ ++Build/Exports= ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ zcat $(DL_DIR)/$(LIBSDL_PATCHED).tar.gz | tar x -C $(PKG_BUILD_DIR) ++endef ++ ++define Build/Configure ++ [ -x $(PKG_BUILD_DIR)/libsdl/bin/sdl-config ] || ( \ ++ cd $(PKG_BUILD_DIR)/$(LIBSDL_PATCHED); \ ++ ./android-configure --prefix=$(PKG_BUILD_DIR)/libsdl; \ ++ make all install; \ ++ ) ++endef ++ ++define Build/Compile ++ (cd $(PKG_BUILD_DIR); \ ++ [ -f $(PKG_BUILD_DIR)/objs/config.make ] || \ ++ ./android-configure.sh --sdl-config=$(PKG_BUILD_DIR)/libsdl/bin/sdl-config \ ++ ) ++ $(MAKE) -C $(PKG_BUILD_DIR) ++endef ++ ++define Package/goldfish-qemu/install ++ $(INSTALL_DIR) $(1) ++ $(CP) $(PKG_BUILD_DIR)/objs/emulator $(1)/ ++ $(CP) ./skins $(1)/ ++endef ++ ++$(eval $(call BuildPackage,goldfish-qemu)) +diff --git a/feeds/packages/utils/goldfish-qemu/patches/.svn/entries b/feeds/packages/utils/goldfish-qemu/patches/.svn/entries +new file mode 100644 +index 0000000..20b96a7 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/goldfish-qemu/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-14T20:42:33.301211Z ++16459 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++110-single_image.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a400df8d4afba5310e46bc4cd7a8de34 ++2009-06-14T20:42:33.301211Z ++16459 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9701 ++ ++100-darwin_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++fe00030c55a34bc0e8bf624f0c63e544 ++2009-06-14T20:42:33.301211Z ++16459 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++685 ++ +diff --git a/feeds/packages/utils/goldfish-qemu/patches/.svn/text-base/100-darwin_fix.patch.svn-base b/feeds/packages/utils/goldfish-qemu/patches/.svn/text-base/100-darwin_fix.patch.svn-base +new file mode 100644 +index 0000000..a5f56b3 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/patches/.svn/text-base/100-darwin_fix.patch.svn-base +@@ -0,0 +1,30 @@ ++--- a/android-configure.sh +++++ b/android-configure.sh ++@@ -656,6 +656,9 @@ case "$CPU" in ++ *) HOST_CPU=$CPU ++ ;; ++ esac +++case "$OS" in +++ darwin*) echo "#define _BSD 1" >> $config_h;; +++esac ++ echo "#define HOST_$HOST_CPU 1" >> $config_h ++ log "Generate : $config_h" ++ ++--- a/android/utils/display-quartz.m +++++ b/android/utils/display-quartz.m ++@@ -34,6 +34,7 @@ get_monitor_resolution( int *px_dpi, in ++ int ++ get_nearest_monitor_rect( int *x, int *y, int *width, int *height ) ++ { +++#if 0 ++ SDL_SysWMinfo info; ++ NSWindow* window; ++ ++@@ -108,4 +109,7 @@ get_nearest_monitor_rect( int *x, int ++ } ++ return 0; ++ } +++#else +++ return -1; +++#endif ++ }; +diff --git a/feeds/packages/utils/goldfish-qemu/patches/.svn/text-base/110-single_image.patch.svn-base b/feeds/packages/utils/goldfish-qemu/patches/.svn/text-base/110-single_image.patch.svn-base +new file mode 100644 +index 0000000..92a9e54 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/patches/.svn/text-base/110-single_image.patch.svn-base +@@ -0,0 +1,233 @@ ++--- a/android/cmdline-option.c +++++ b/android/cmdline-option.c ++@@ -50,16 +50,6 @@ android_parse_options( int *pargc, char ++ char arg2_tab[64], *arg2 = arg2_tab; ++ int nn; ++ ++- /* process @ as a special exception meaning ++- * '-avd ' ++- */ ++- if (aread[0][0] == '@') { ++- opt->avd = aread[0]+1; ++- nargs--; ++- aread++; ++- continue; ++- } ++- ++ /* anything that isn't an option past this points ++ * exits the loop ++ */ ++--- a/android/cmdline-options.h +++++ b/android/cmdline-options.h ++@@ -60,21 +60,16 @@ ++ */ ++ ++ CFG_PARAM( sysdir, "", "search for system disk images in " ) ++-CFG_PARAM( system, "", "read initial system image from " ) ++-CFG_PARAM( datadir, "", "write user data into " ) ++-CFG_PARAM( kernel, "", "use specific emulated kernel" ) ++-CFG_PARAM( ramdisk, "", "ramdisk image (default /ramdisk.img" ) ++-CFG_PARAM( image, "", "obsolete, use -system instead" ) ++-CFG_PARAM( init_data, "", "initial data image (default /userdata.img" ) ++-CFG_PARAM( initdata, "", "same as '-init-data '" ) ++-CFG_PARAM( data, "", "data image (default /userdata-qemu.img" ) +++CFG_PARAM( system, "", "read system image from , default: /system.img" ) +++CFG_PARAM( data, "", "data image, default: /data.img" ) +++CFG_PARAM( kernel, "", "use specific emulated kernel, default: kernel.bin" ) +++CFG_PARAM( ramdisk, "", "ramdisk image (default /ramdisk.bin" ) ++ CFG_PARAM( partition_size, "", "system/data partition size in MBs" ) ++ CFG_PARAM( cache, "", "cache partition image (default is temporary file)" ) ++ CFG_FLAG ( no_cache, "disable the cache partition" ) ++ CFG_FLAG ( nocache, "same as -no-cache" ) ++ OPT_PARAM( sdcard, "", "SD card image (default /sdcard.img") ++ OPT_FLAG ( wipe_data, "reset the use data image (copy it from initdata)" ) ++-CFG_PARAM( avd, "", "use a specific android virtual device" ) ++ CFG_PARAM( skindir, "", "search skins in (default /skins)" ) ++ CFG_PARAM( skin, "", "select a given skin" ) ++ CFG_FLAG ( no_skin, "don't use any emulator skin" ) ++--- a/android/main.c +++++ b/android/main.c ++@@ -1606,6 +1606,7 @@ report_console( const char* proto_port, ++ * containing 'fileName'. this is *not* the full ++ * path to 'fileName'. ++ */ +++ ++ static char* ++ _getSdkImagePath( const char* fileName ) ++ { ++@@ -1617,8 +1618,6 @@ _getSdkImagePath( const char* fileName ++ ++ static const char* const searchPaths[] = { ++ "", /* program's directory */ ++- "/lib/images", /* this is for SDK 1.0 */ ++- "/../platforms/android-1.1/images", /* this is for SDK 1.1 */ ++ NULL ++ }; ++ ++@@ -1841,25 +1840,7 @@ int main(int argc, char **argv) ++ } ++ } ++ ++- /* legacy support: we used to use -system and -image ++- * instead of -sysdir and -system , so handle this by checking ++- * whether the options point to directories or files. ++- */ ++- if (opts->image != NULL) { ++- if (opts->system != NULL) { ++- if (opts->sysdir != NULL) { ++- derror( "You can't use -sysdir, -system and -image at the same time.\n" ++- "You should probably use '-sysdir -system '.\n" ); ++- exit(2); ++- } ++- } ++- dwarning( "Please note that -image is obsolete and that -system is now used to point\n" ++- "to the system image. Next time, try using '-sysdir -system ' instead.\n" ); ++- opts->sysdir = opts->system; ++- opts->system = opts->image; ++- opts->image = NULL; ++- } ++- else if (opts->system != NULL && path_is_dir(opts->system)) { +++ if (opts->system != NULL && path_is_dir(opts->system)) { ++ if (opts->sysdir != NULL) { ++ derror( "Option -system should now be followed by a file path, not a directory one.\n" ++ "Please use '-sysdir ' to point to the system directory.\n" ); ++@@ -1885,49 +1866,11 @@ int main(int argc, char **argv) ++ if (opts->noskin) ++ opts->no_skin = opts->noskin; ++ ++- if (opts->initdata) { ++- opts->init_data = opts->initdata; ++- opts->initdata = NULL; ++- } ++- ++- /* If no AVD name was given, try to find the top of the ++- * Android build tree ++- */ ++- if (opts->avd == NULL) { ++- do { ++- char* out = getenv("ANDROID_PRODUCT_OUT"); ++- ++- if (out == NULL || out[0] == 0) ++- break; ++- ++- if (!path_exists(out)) { ++- derror("Can't access ANDROID_PRODUCT_OUT as '%s'\n" ++- "You need to build the Android system before launching the emulator", ++- out); ++- exit(2); ++- } ++- ++- android_build_root = path_parent( out, 4 ); ++- if (android_build_root == NULL || !path_exists(android_build_root)) { ++- derror("Can't find the Android build root from '%s'\n" ++- "Please check the definition of the ANDROID_PRODUCT_OUT variable.\n" ++- "It should point to your product-specific build output directory.\n", ++- out ); ++- exit(2); ++- } ++- android_build_out = out; ++- D( "found Android build root: %s", android_build_root ); ++- D( "found Android build out: %s", android_build_out ); ++- } while (0); ++- } ++ /* if no virtual device name is given, and we're not in the ++ * Android build system, we'll need to perform some auto-detection ++ * magic :-) ++ */ ++- if (opts->avd == NULL && !android_build_out) ++ { ++- char dataDirIsSystem = 0; ++- ++ if (!opts->sysdir) { ++ opts->sysdir = _getSdkImagePath("system.img"); ++ if (!opts->sysdir) { ++@@ -1945,47 +1888,30 @@ int main(int argc, char **argv) ++ } ++ ++ if (!opts->system) { ++- opts->system = _getSdkSystemImage(opts->sysdir, "-image", "system.img"); ++- D("autoconfig: -image %s", opts->image); +++ opts->system = _getSdkSystemImage(opts->sysdir, "-system", "system.img"); +++ D("autoconfig: -system %s", opts->system); ++ } ++ ++ if (!opts->kernel) { ++- opts->kernel = _getSdkSystemImage(opts->sysdir, "-kernel", "kernel-qemu"); +++ opts->kernel = _getSdkSystemImage(opts->sysdir, "-kernel", "kernel.bin"); ++ D("autoconfig: -kernel %s", opts->kernel); ++ } ++ ++ if (!opts->ramdisk) { ++- opts->ramdisk = _getSdkSystemImage(opts->sysdir, "-ramdisk", "ramdisk.img"); +++ opts->ramdisk = _getSdkSystemImage(opts->sysdir, "-ramdisk", "ramdisk.bin"); ++ D("autoconfig: -ramdisk %s", opts->ramdisk); ++ } ++ ++- /* if no data directory is specified, use the system directory */ ++- if (!opts->datadir) { ++- opts->datadir = qemu_strdup(opts->sysdir); ++- dataDirIsSystem = 1; ++- D("autoconfig: -datadir %s", opts->sysdir); ++- } ++- ++ if (!opts->data) { ++ /* check for userdata-qemu.img in the data directory */ ++- bufprint(tmp, tmpend, "%s/userdata-qemu.img", opts->datadir); ++- if (!path_exists(tmp)) { ++- derror( ++- "You did not provide the name of an Android Virtual Device\n" ++- "with the '-avd ' option. Read -help-avd for more information.\n\n" ++- ++- "If you *really* want to *NOT* run an AVD, consider using '-data '\n" ++- "to specify a data partition image file (I hope you know what you're doing).\n" ++- ); ++- exit(2); ++- } +++ bufprint(tmp, tmpend, "%s/data.img", opts->sysdir); ++ ++ opts->data = qemu_strdup(tmp); ++ D("autoconfig: -data %s", opts->data); ++ } ++ ++- if (!opts->sdcard && opts->datadir) { ++- bufprint(tmp, tmpend, "%s/sdcard.img", opts->datadir); +++ if (!opts->sdcard && opts->sysdir) { +++ bufprint(tmp, tmpend, "%s/sdcard.img", opts->sysdir); ++ if (path_exists(tmp)) { ++ opts->sdcard = qemu_strdup(tmp); ++ D("autoconfig: -sdcard %s", opts->sdcard); ++@@ -2029,19 +1955,6 @@ int main(int argc, char **argv) ++ android_avdParams->skinName = opts->skin; ++ android_avdParams->skinRootPath = opts->skindir; ++ ++- /* setup the virtual device differently depending on whether ++- * we are in the Android build system or not ++- */ ++- if (opts->avd != NULL) ++- { ++- android_avdInfo = avdInfo_new( opts->avd, android_avdParams ); ++- if (android_avdInfo == NULL) { ++- /* an error message has already been printed */ ++- dprint("could not find virtual device named '%s'", opts->avd); ++- exit(1); ++- } ++- } ++- else ++ { ++ if (!android_build_out) { ++ android_build_out = android_build_root = opts->sysdir; ++--- a/android/avd/info.c +++++ b/android/avd/info.c ++@@ -1233,10 +1233,8 @@ _getBuildImagePaths( AvdInfo* i, AvdInf ++ ** take care of checking the state ++ **/ ++ imageLoader_set ( l, AVD_IMAGE_INITSYSTEM ); ++- imageLoader_load( l, IMAGE_REQUIRED | IMAGE_DONT_LOCK ); ++- ++- /* force the system image to read-only status */ ++- l->pState[0] = IMAGE_STATE_READONLY; +++ l->pState[0] = IMAGE_STATE_MUSTLOCK; +++ imageLoader_load( l, IMAGE_REQUIRED ); ++ ++ /** cache partition handling ++ **/ +diff --git a/feeds/packages/utils/goldfish-qemu/patches/100-darwin_fix.patch b/feeds/packages/utils/goldfish-qemu/patches/100-darwin_fix.patch +new file mode 100644 +index 0000000..a5f56b3 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/patches/100-darwin_fix.patch +@@ -0,0 +1,30 @@ ++--- a/android-configure.sh +++++ b/android-configure.sh ++@@ -656,6 +656,9 @@ case "$CPU" in ++ *) HOST_CPU=$CPU ++ ;; ++ esac +++case "$OS" in +++ darwin*) echo "#define _BSD 1" >> $config_h;; +++esac ++ echo "#define HOST_$HOST_CPU 1" >> $config_h ++ log "Generate : $config_h" ++ ++--- a/android/utils/display-quartz.m +++++ b/android/utils/display-quartz.m ++@@ -34,6 +34,7 @@ get_monitor_resolution( int *px_dpi, in ++ int ++ get_nearest_monitor_rect( int *x, int *y, int *width, int *height ) ++ { +++#if 0 ++ SDL_SysWMinfo info; ++ NSWindow* window; ++ ++@@ -108,4 +109,7 @@ get_nearest_monitor_rect( int *x, int ++ } ++ return 0; ++ } +++#else +++ return -1; +++#endif ++ }; +diff --git a/feeds/packages/utils/goldfish-qemu/patches/110-single_image.patch b/feeds/packages/utils/goldfish-qemu/patches/110-single_image.patch +new file mode 100644 +index 0000000..92a9e54 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/patches/110-single_image.patch +@@ -0,0 +1,233 @@ ++--- a/android/cmdline-option.c +++++ b/android/cmdline-option.c ++@@ -50,16 +50,6 @@ android_parse_options( int *pargc, char ++ char arg2_tab[64], *arg2 = arg2_tab; ++ int nn; ++ ++- /* process @ as a special exception meaning ++- * '-avd ' ++- */ ++- if (aread[0][0] == '@') { ++- opt->avd = aread[0]+1; ++- nargs--; ++- aread++; ++- continue; ++- } ++- ++ /* anything that isn't an option past this points ++ * exits the loop ++ */ ++--- a/android/cmdline-options.h +++++ b/android/cmdline-options.h ++@@ -60,21 +60,16 @@ ++ */ ++ ++ CFG_PARAM( sysdir, "", "search for system disk images in " ) ++-CFG_PARAM( system, "", "read initial system image from " ) ++-CFG_PARAM( datadir, "", "write user data into " ) ++-CFG_PARAM( kernel, "", "use specific emulated kernel" ) ++-CFG_PARAM( ramdisk, "", "ramdisk image (default /ramdisk.img" ) ++-CFG_PARAM( image, "", "obsolete, use -system instead" ) ++-CFG_PARAM( init_data, "", "initial data image (default /userdata.img" ) ++-CFG_PARAM( initdata, "", "same as '-init-data '" ) ++-CFG_PARAM( data, "", "data image (default /userdata-qemu.img" ) +++CFG_PARAM( system, "", "read system image from , default: /system.img" ) +++CFG_PARAM( data, "", "data image, default: /data.img" ) +++CFG_PARAM( kernel, "", "use specific emulated kernel, default: kernel.bin" ) +++CFG_PARAM( ramdisk, "", "ramdisk image (default /ramdisk.bin" ) ++ CFG_PARAM( partition_size, "", "system/data partition size in MBs" ) ++ CFG_PARAM( cache, "", "cache partition image (default is temporary file)" ) ++ CFG_FLAG ( no_cache, "disable the cache partition" ) ++ CFG_FLAG ( nocache, "same as -no-cache" ) ++ OPT_PARAM( sdcard, "", "SD card image (default /sdcard.img") ++ OPT_FLAG ( wipe_data, "reset the use data image (copy it from initdata)" ) ++-CFG_PARAM( avd, "", "use a specific android virtual device" ) ++ CFG_PARAM( skindir, "", "search skins in (default /skins)" ) ++ CFG_PARAM( skin, "", "select a given skin" ) ++ CFG_FLAG ( no_skin, "don't use any emulator skin" ) ++--- a/android/main.c +++++ b/android/main.c ++@@ -1606,6 +1606,7 @@ report_console( const char* proto_port, ++ * containing 'fileName'. this is *not* the full ++ * path to 'fileName'. ++ */ +++ ++ static char* ++ _getSdkImagePath( const char* fileName ) ++ { ++@@ -1617,8 +1618,6 @@ _getSdkImagePath( const char* fileName ++ ++ static const char* const searchPaths[] = { ++ "", /* program's directory */ ++- "/lib/images", /* this is for SDK 1.0 */ ++- "/../platforms/android-1.1/images", /* this is for SDK 1.1 */ ++ NULL ++ }; ++ ++@@ -1841,25 +1840,7 @@ int main(int argc, char **argv) ++ } ++ } ++ ++- /* legacy support: we used to use -system and -image ++- * instead of -sysdir and -system , so handle this by checking ++- * whether the options point to directories or files. ++- */ ++- if (opts->image != NULL) { ++- if (opts->system != NULL) { ++- if (opts->sysdir != NULL) { ++- derror( "You can't use -sysdir, -system and -image at the same time.\n" ++- "You should probably use '-sysdir -system '.\n" ); ++- exit(2); ++- } ++- } ++- dwarning( "Please note that -image is obsolete and that -system is now used to point\n" ++- "to the system image. Next time, try using '-sysdir -system ' instead.\n" ); ++- opts->sysdir = opts->system; ++- opts->system = opts->image; ++- opts->image = NULL; ++- } ++- else if (opts->system != NULL && path_is_dir(opts->system)) { +++ if (opts->system != NULL && path_is_dir(opts->system)) { ++ if (opts->sysdir != NULL) { ++ derror( "Option -system should now be followed by a file path, not a directory one.\n" ++ "Please use '-sysdir ' to point to the system directory.\n" ); ++@@ -1885,49 +1866,11 @@ int main(int argc, char **argv) ++ if (opts->noskin) ++ opts->no_skin = opts->noskin; ++ ++- if (opts->initdata) { ++- opts->init_data = opts->initdata; ++- opts->initdata = NULL; ++- } ++- ++- /* If no AVD name was given, try to find the top of the ++- * Android build tree ++- */ ++- if (opts->avd == NULL) { ++- do { ++- char* out = getenv("ANDROID_PRODUCT_OUT"); ++- ++- if (out == NULL || out[0] == 0) ++- break; ++- ++- if (!path_exists(out)) { ++- derror("Can't access ANDROID_PRODUCT_OUT as '%s'\n" ++- "You need to build the Android system before launching the emulator", ++- out); ++- exit(2); ++- } ++- ++- android_build_root = path_parent( out, 4 ); ++- if (android_build_root == NULL || !path_exists(android_build_root)) { ++- derror("Can't find the Android build root from '%s'\n" ++- "Please check the definition of the ANDROID_PRODUCT_OUT variable.\n" ++- "It should point to your product-specific build output directory.\n", ++- out ); ++- exit(2); ++- } ++- android_build_out = out; ++- D( "found Android build root: %s", android_build_root ); ++- D( "found Android build out: %s", android_build_out ); ++- } while (0); ++- } ++ /* if no virtual device name is given, and we're not in the ++ * Android build system, we'll need to perform some auto-detection ++ * magic :-) ++ */ ++- if (opts->avd == NULL && !android_build_out) ++ { ++- char dataDirIsSystem = 0; ++- ++ if (!opts->sysdir) { ++ opts->sysdir = _getSdkImagePath("system.img"); ++ if (!opts->sysdir) { ++@@ -1945,47 +1888,30 @@ int main(int argc, char **argv) ++ } ++ ++ if (!opts->system) { ++- opts->system = _getSdkSystemImage(opts->sysdir, "-image", "system.img"); ++- D("autoconfig: -image %s", opts->image); +++ opts->system = _getSdkSystemImage(opts->sysdir, "-system", "system.img"); +++ D("autoconfig: -system %s", opts->system); ++ } ++ ++ if (!opts->kernel) { ++- opts->kernel = _getSdkSystemImage(opts->sysdir, "-kernel", "kernel-qemu"); +++ opts->kernel = _getSdkSystemImage(opts->sysdir, "-kernel", "kernel.bin"); ++ D("autoconfig: -kernel %s", opts->kernel); ++ } ++ ++ if (!opts->ramdisk) { ++- opts->ramdisk = _getSdkSystemImage(opts->sysdir, "-ramdisk", "ramdisk.img"); +++ opts->ramdisk = _getSdkSystemImage(opts->sysdir, "-ramdisk", "ramdisk.bin"); ++ D("autoconfig: -ramdisk %s", opts->ramdisk); ++ } ++ ++- /* if no data directory is specified, use the system directory */ ++- if (!opts->datadir) { ++- opts->datadir = qemu_strdup(opts->sysdir); ++- dataDirIsSystem = 1; ++- D("autoconfig: -datadir %s", opts->sysdir); ++- } ++- ++ if (!opts->data) { ++ /* check for userdata-qemu.img in the data directory */ ++- bufprint(tmp, tmpend, "%s/userdata-qemu.img", opts->datadir); ++- if (!path_exists(tmp)) { ++- derror( ++- "You did not provide the name of an Android Virtual Device\n" ++- "with the '-avd ' option. Read -help-avd for more information.\n\n" ++- ++- "If you *really* want to *NOT* run an AVD, consider using '-data '\n" ++- "to specify a data partition image file (I hope you know what you're doing).\n" ++- ); ++- exit(2); ++- } +++ bufprint(tmp, tmpend, "%s/data.img", opts->sysdir); ++ ++ opts->data = qemu_strdup(tmp); ++ D("autoconfig: -data %s", opts->data); ++ } ++ ++- if (!opts->sdcard && opts->datadir) { ++- bufprint(tmp, tmpend, "%s/sdcard.img", opts->datadir); +++ if (!opts->sdcard && opts->sysdir) { +++ bufprint(tmp, tmpend, "%s/sdcard.img", opts->sysdir); ++ if (path_exists(tmp)) { ++ opts->sdcard = qemu_strdup(tmp); ++ D("autoconfig: -sdcard %s", opts->sdcard); ++@@ -2029,19 +1955,6 @@ int main(int argc, char **argv) ++ android_avdParams->skinName = opts->skin; ++ android_avdParams->skinRootPath = opts->skindir; ++ ++- /* setup the virtual device differently depending on whether ++- * we are in the Android build system or not ++- */ ++- if (opts->avd != NULL) ++- { ++- android_avdInfo = avdInfo_new( opts->avd, android_avdParams ); ++- if (android_avdInfo == NULL) { ++- /* an error message has already been printed */ ++- dprint("could not find virtual device named '%s'", opts->avd); ++- exit(1); ++- } ++- } ++- else ++ { ++ if (!android_build_out) { ++ android_build_out = android_build_root = opts->sysdir; ++--- a/android/avd/info.c +++++ b/android/avd/info.c ++@@ -1233,10 +1233,8 @@ _getBuildImagePaths( AvdInfo* i, AvdInf ++ ** take care of checking the state ++ **/ ++ imageLoader_set ( l, AVD_IMAGE_INITSYSTEM ); ++- imageLoader_load( l, IMAGE_REQUIRED | IMAGE_DONT_LOCK ); ++- ++- /* force the system image to read-only status */ ++- l->pState[0] = IMAGE_STATE_READONLY; +++ l->pState[0] = IMAGE_STATE_MUSTLOCK; +++ imageLoader_load( l, IMAGE_REQUIRED ); ++ ++ /** cache partition handling ++ **/ +diff --git a/feeds/packages/utils/goldfish-qemu/skins/.svn/entries b/feeds/packages/utils/goldfish-qemu/skins/.svn/entries +new file mode 100644 +index 0000000..db076d0 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/skins/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/goldfish-qemu/skins ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++HVGA ++dir ++ +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/entries b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/entries +new file mode 100644 +index 0000000..4ce8437 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/entries +@@ -0,0 +1,640 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/goldfish-qemu/skins/HVGA ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++power.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++2d7f62d057ea72aed30dc73fa8ec86c5 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3782 ++ ++arrow_up.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++59d336ee7e719a5b4818c25a73319922 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3493 ++ ++volume_down.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++0d7a5d50c0f24ea7f127283ccb16f41b ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3586 ++ ++device.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++107fbf0f14a18d4bf1c2a799d442623e ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++45511 ++ ++keyboard.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++7f0a71691c38836b73c4d309c734ac0a ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11032 ++ ++back.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a9482b96815fef72f909a0787e0c26eb ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3564 ++ ++menu.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++b38067f79bd97dd2206d44f9883e63db ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3079 ++ ++arrow_left.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++dbd68f5049e782f1ffc3e97d07789b6d ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4122 ++ ++end.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++5060283ae9a9520c4372fa83da1722e9 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3562 ++ ++volume_up.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++b827d6719e4a0bd1896dfbfa50831df0 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3856 ++ ++select.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a91d7a2b8b3556919bd5427ef5405b1b ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3374 ++ ++spacebar.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3cbbf58302872626b9c826380dfbb122 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2916 ++ ++arrow_down.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++32d1fc42129e689fd190db18fba1441f ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3438 ++ ++arrow_right.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++57b0d81338c8f1deb67f5eed6955c937 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4147 ++ ++key.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++c44d6d018979789ffbce18a76e0c601e ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2857 ++ ++home.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++10005d4dd8aadfd9aa3db95e90405894 ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3578 ++ ++send.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++69b32a58db42af26d06e367d56d088ea ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3561 ++ ++layout ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++abc5110e038faedd236b9253b58d017a ++2009-06-14T21:17:50.232051Z ++16460 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7714 ++ +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/arrow_down.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/arrow_down.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..19b3764e8337ba08cc2910ce9a9b77cae0c29155 +GIT binary patch +literal 3438 +zcmV-!4UzJRP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0007+Nkl1*`XmJu0M2A|bqg}l%TAUitr7j)(4c-P9MMp2AvqC39 +zaPF#5M@1K_PP!;Ki8#jL%PS +zjW(nw)ummjy0lf#U!=Yc#(N#3A9`$2kt^ivtd>wA@`qA&Ypdcx($Tlnw}{0+Te6g~ +zf1t^Y2sx|Uxod1BY|CWs>A8gCjM6u?c~*CMM4$MIr`8@L4I^J_FUJ5JjF=jYJHJ&>F~LaVugW@Wni>8m<@=p}i(Y +z@Ei3%g(&k(QmA531T_TDX+R;+RxM0&u)`38BB%v9MQ)V~!IdFgF(^XZD@BV!pq(}P +z&cO{+42lpA$gO`{)<+1mugX~tDoMdgk#*+Ui_g&wbJxCeeRD8LdRAi7evo(G>I(7q +z_Jd6hB1s>}wYM$XM2OWJ4jM^6-kiI(OlVK#`NA-w0XPGd|B~9+aIFxlbq*5IaHXg> +z*)r`fOFf;DdV9ygBIyIUM$VCY&z9+@A{D~87YuBvCXS_!EJ;P5mxugFoZuzNuR~Jb +zE~P%MVN2xtg%h8@A^gAxHky6lg;N{=fe29n0`AUbQ(FE{x?cbQ0RR630Q0Y%YcH3| +Q^8f$<07*qoM6N<$f_jc(fdBvi + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/arrow_left.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/arrow_left.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..113e58427aca1ebce4bdc7bc671e8e4be09434ad +GIT binary patch +literal 4122 +zcmV+#5asWQP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000F=Nkl +zmSPD)BZ+|oDg`?ZN{BWdpv4i4CNzpiYccb!?s~`W?9Jcq%-0OCWPiSS`@Q#O-pros +zxV5mbzn3rsHJzkQe<5vtg|u7OWZy|eyoqj^CT-U<`g@Q2c%hNBJBy?}?X|>*LMlbt +zOcS;6YIFlqei$F +z$bch5eAEf|hMRaEZHb4|j5^`}S^ikLPFE1|PFPr#h$ZlRcSbcMeqc~;!lOFeWE~sg +zPCPPAUE*+Q;byZU;xV?ND$`Vr)D6~fvrOWh(ZbDy1(W5MNqpD18Co6`kXZk4GbHf{ +z6HS#CU(0Xw3pYa&FK@yi+D^B0xXDO7oCmKNpSa`hSgCN6k$8S%6=tD-+xwRaMoX`@ +zB!&SLqU9H9b0YyQ9tA)aWm^7LK#PYqAwjSx4^AapQ$?_h)PfBKT9KBc;r8K*`*?oH +zhxqgX{h`T{c^0yCYH)*w*@u3kvLh8|CrCBRmejL|UZa`&@k7=#lpwx!+FE)s>6o3R +z64GAo8B0VpsaKZlL?V&M*OB(|GQvP!XHK3ScbZQ4%n51vmv1MFCrYMEia5ec5a0SD +z8pIsG6LWrOxcCJM9^xDBX>N(XDe>?5o_}YTw}vwkuiJ!%m+-?{G1pnzm;Gc(J)Np7 +z!V!;)k}l?`Chmj-yMwBpG^s~4Bb#tX+jkTbZyMn_<#WYJvj}$*q*}v>S4}u@S}=@w +zBq)cH +zh?lodi(Va&-d9Y#lUUT5)d8p%lJDd_#LFM0Q`-T~MnU6>iT4)XXxjm=IZKY}je(9!P9v +z#p1NU36vkugNXAj-1u#)7LTlFP5<@&dxG0!-C&QgI +zTY6A^9K7tCb6w3`yO~kX8|G>S&cx#tdpT={_9I+mFTxd6NroFiiX7K)aVhjZK7vd5 +zkZ{52#4TJ5UkE0tb`s7PuV&Q4#nq#7&m_5Mb-q2?9l$SRS5z&G4v2~bAzT!`dxtDQ +zg629jxAdF5{q7U6{Rw1f^D{;OW%zd>i*j=5JAYqqi*VW_h)kD~Rc2p3n!MO{JD +zPtGAsoB2sv*<(Stp0xdHbOpk<=iOr81WeIwOp1P@h<#QRQiL}FPMO!xguLxjBK{#= +zIA!<*NCay~DBmb3s(=KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000GENklz)hnXmZ*2mAPav)^NO=DQO& +zZ@quNwn`L9^D@=-?NrY;P`&$^#9XS>oc81d)twiquFg{3!aiU5PWALN_H&;F&qdk> +z81Vh#pC^Z@?qxsk-lKYQo$6dJ>fjS{Pgir7jqGf&|Lg8%206`OH{w?aG%e3@STlv&Qm?%c1fL=bbS&8gKxXw_R+Ehv84C3 +z+Ut-89wY4bsvfslzeDwtDXQ!K#1wpIgZt6fMQ}Y&r`!cxWHF=b~Lt!T^Nb&%zZ=M?8XPTR(}FzyRWca7gfX9_f~*@s-|FqV6vs +zcwC4s>7ww0tVa{@s0gbkh!KK10QW5&JkrI~HDaWo5)MBXln6G`O_v9A?&Lxkc;^+} +zj)i{I#o~nycktdZ?qA{r9_eChzlG{6=@@n=AA!O1dPQfN +z_@Aq)DxNMT&sd0|M*cslOD{|DjQGrgg~ui6ZuoRHEis>Sku4}NOY>ylH*2Y$8FcI1 +zBGm_77G@AhFCXLM;fq$hpTBl%zay5(+FqqUV+Pc%--T}p0m&iAtd!iFnGuz8}Xxi)&NKI +zd*R?q8NhTGl%Gtt5mLTPM%S)nJ)78u8fOfo_>Eh;0>)c({=C +z4+fm|fviE#F}q2vX!^MIumpIgbbseA;p^G&F^QE#-reZYR*DMt7ZeHue?7(WYwYst +zw$OM8dL@&!5{xaIQn%D>UU=ad1` +z&G>(Jhd+S_m<;^t(kFN)-CVcO3CZt#4?YkpoFv1tYE#oqxR%+Wuty3wJNaSFEZ`W~ +z<7r+;3p~+V +zaY0itcqix%s7*KF^3b?QpRXsC)URe{Q0{Hve4~GP7d{aI4?%h+s#6n2_KObHzFRZ! +zPGQ1njt8y_K@uZ-tCmDWB(IN$kIk{J9e#I&9C#|^ucvf%A)12sj{H*Kop+cE9?)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0008eNklmHRFjb(Auv=Bu?(J5IBB2f`{{S08 +zS;zts42X{|ZNi#LT^a#Pt4dU5K?O!Lyn6yRauVC`#ZGd5%aNk^BiHBHe)rjVG?Wfs>2>(gE(dVy~v&r}D2_Ei3f(%fejTSpM?+J3?hC4~xW6oz$ +zZx9%aXf)cYXHnM>GY}Z0uq|sQ2nz_MPTH)M`r6?qU!a43ofT@LhZ|h79sj>8Cz9FqkhWtR=i7eKv0apIO>& +z)on97ihH^vPTUa#z*qXmthU)5-}$JNZCRoN_z1qzkKsU|{k6+ypoj)`+kPe~rGaQ% +z;`p>I(Qyl2G`%Ievp;NoiU*gZ**6^y1Yb=hVF-TJvqu5}_$LM=ojyq@5V$AgV4E}> +zJa>M~X(#)`@k$@tvgE!G4vR_cK_=M(pnbOD`)^LtpIj`8FB0oU-U0vs|NjF3ruWuc +TEP9sB00000NkvXXu0mjfMx=ux + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/back.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/back.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..41034d9105e4fc077ea8620862828cc0e76c7938 +GIT binary patch +literal 3564 +zcmVKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009QNkl299y*QtbSJJNx8&?5)rC{LLuw<9y%F{yTej +zb1HpxV`G0$L|m7ay}iG2UdH2m)Xrq2w}(HyDWhQ!*k3ZvtjKsa>+_5M$k3u#FHszm +zu~w7u=)-^mN2X>D2s8l^+qO4m)f_L50Zmb)|1Vsi0r)IqwJPJzy%&>K+#PU9XF6%wI;|-4?9>z`M_Q +zm%yrVdU~26`Vq?Fc8hTU +ze*F67c#%hM_}W@7o@esC|*qNHH9>RzitAYO7LeMTQfGkjQOiAs$|A +zaWYz-lR-# +zoMVVys*$z1E?fIJYwxqxq;@W~iM6>+Rm6;_+%BJZUY>kcAMUdW9Cp +z?`}Wg^YSbnKp$4{COuBFKIiq50k4Mx{L7oe;qgeYt$n}Wpy&n!3j4D>blj7I_0000g~bI$9W*NOK{=tmVl007YC<)qXB009aBFKLipfUhuH4~BrBP#ooST>tNKGdKUqo`1SC&SaL!dx^MP5|L&kX=nfV|WPjc*GFt-6lp+MYXC87>axI;cz< +z_~GW7v21al%?0#F?dv?lm!}h&=o_~jS?T5zX=I!O^O8?~h{1mKaYy53);oya_eswe@fP6&P#wLUj0Vr +zl~tQQbc3oR&EOqdRe83yH8jk9c^f#VXebe)S7ul;lZ*F5JYM4Wa(%Gy8YdV2ozCz` +zk$uesOH^c)lzAD-_y1=1iOu4aYvB)u6_kj5e+@{g)P*BNEr;t&aUh4zC7Nd~N_Ne! +z^HPs1IM{|v?8)4m3h{rIC}A5NUnER4lhV!WG3AJ;G3Aj>Cqc8}w(z}+dxi0{g~Lk; +zug*2d+=>{h~VxEeDIANVCXVkES_1scy0AU=gV8dw9$21m73qS9Q^v} +zjZ$ya&@oX%JXUF$V4M7owI!uAtC5Buw61B +zv-1UhunZb?=s>)>7i`|%D>JE~V#)rl?U%l)XXdfTh3C?lD794FO^8(6#tYbwc9oxL +z5mioP%w?Kn?!p;NVcARz^Yft_f^S}Cz0rltdrD+l*MGw0OGAsa-2M-4TB7OwCH%?7 +z5{rW3`;b0{-jC2;W38dX-aFC8$&6;qel{66;o(}24a$JmF%ISGAscD|+WO}sny0a^ +zMx0@{PM(dpK|gg+<<-M1TjyEZd&l|GMj8olnY@?!UTP +z!Avrw1F4Au#pzZlnA*RH>zUra2!xxLac}>bbUyX)F#pQexYRpS-7Bk|`wJQu+7P3{ +zK&36&0&yGs^Y%bNK%mO2)p60R+kz_>oBto~vbMqu`CLD*DI)91Z%aZG7C{1@u9wWSgRx+rmt^r +zdA7;&jEHGc8fGojk;12*5`TS|f9bPF%L=qruuT8hUF18{M;6$^6(rwK#ASOVTe5oo +z{6PE|)-^lQIH2VO{-I?Ks)_Z#)FNISUAp^RD8yxtdn(%Oajysd*DLsH+#LK{pK +z!iuIVx8lqiNQVA+6~ZI%uheeTek!=Fs1TgJA6t*jo@Ih&ngz!( +z{nRxZDA0McVo0Z2<+@{f)sNqN1TB20UW81J{BexFz^2Un??I3U(K!^}Du|&$_61*` +z_91oFro6N~Q^>{A!h-%puS_dmJ<(k~B5?un{;RXb%rR2N*jRTkrT{;`@Z#b-m!&I0 +zlF=Ybm#P`z<{E=5pIJ1GqL$NP`r`z8C}~*6;*J3GXC}lX-H@fQN-j%Jp*!mf800O- +zbie3aqcfdmTd>$(XJ=Z(mvXhmPt8q|2lPDJ+@>LIr(WfVZ+8^dyl<qb#?XiML^j-Jc^d=8P!SW +zXt^Z}asSOKEe;WpN}JR#F3ru&{ds=-hdwJ-vGgVVvtIe^eRv7PLj!xPzrm&uX3sMV +z3jcY)LBHu^grDF*S-NoSa2Ol2!$NX_~Smnt(4rQyr2raXwI%K=^?zR0nCO_r9kLxcN{;+s*s +zX8a(0Zs;p@=Xv87&cP7$p+YR>K^~e=&9Tw+bf^)BQo?eOBgGs!N1Av!69s)^QkQ== +zmiaASpxpjKm#aZjx<^^zN%)I|xyUK0D(=M(mE^Aiv;w$cGX}c)&5mnbH)n(dgoGfu +zIQ{qjP03f)>eQmT~{|M +zHAuvWUHDjW=)Cp2$}&eI0{Y@(0)$&_kh7f1K)P{IF5yg5*z*IPhrHnFkaE1wrzVCZ +zt+fwoO+x4f@%N01?)r`OunU+E!C1U2`A#wYpxOM^Ip4U#bl5~P6Wmh-Rp7RDAX(?* +z-N8^^KW9e!zk$vUQf6{I_DS#i>2v*JTitm!0qx5WxJO9w_R#DmD(fp@ +z?S9eHg)NiF#@4hiqMMc5{~*biin@1~jZ%4kv$GIvjJwsLNgi1V#go^(J<6J@dCtt) +z@mQLgLI~`nMvJzUyLyeNu)yRxe*5bUQ=!6y*5`*h>#YpsWA?xlmQWHN$pT1*@ +z{k?L_t}HR7m-hO4aSCN6wK9@mQ1QI~^+;WLiE=Tl6E0on0RidS(~qHDLeO*TQP}V8|fq +zX3RYLqo$!L)2x$4%J#OxW!6AwRBt*%#wQI17I)U6J?@Y7vpjTBk?Lkg4|N2RcUqE= +z_iBf=&7Br<7usJx3DGnX4C71E<+5=!G{tt+DmhumJ7Vyt>D1LazR@($ZbCu#Dz)*( +z&4%r$gzlZAO7lhs+IliDUmczKS>Lucw3yu0Qn8NAjin35?~bUS#!S1^p{Gb6 +zWRWQEV8QEARhw8^TckTjqTh6Ozn$l0Y&qQLEbTU*(eOx;x@7Q*@FwcDYhT{>g5jud +zf#!DIs>j?aCx!3ic$<|urEzYL{e%*76(l^rxH{lc%aBWWn?y;TK1=Wji>KXi+lc8b +zVS|l2kZuR&5)c@(iyoi$<`0+8@1ee%9IRLuToTx#F5ezOK{IJ&^?H1`iFZ2r<635z +zK=-N%*{wX42_^4_)K$P#}?cv0T@PF3dW*ubw?#ONr*)Z;ZAna?(;x;_63H;qsD@&a< +z&u`J-vp^VJ|L$6&>5b3xq-I@hYQ{YL9aqAW=PcE%{vi0q9xImUqyD;)^IPTKiQpDx +ztqI-RS$1(MXv>Nx%W_25s9>BTnyR7CZBdCTI~$we#+X~QCGR$D@H)J#R$pJ=q2;8n +z8wpcu;n0dxysECnKpFQ)wpATQtRJT#EjDPeVPLHwUfV}^WnE@rHZ)5Z$KnTZp($8gs{LV~2CA22~Rl@UoJ!oC^ +z@s?m&ZDQ#^!kgtFMh@|-KW8N+C4(U{)hD= +zOI}yDVsBn7R&&(TW^8Sj>@?0)DJ{lR;)=jcXlxIo+hRl9Y2c#&c$2k?rp_GuMQTD( +zG^|1bmAQ3YK~=cRxlOrrXAp$<4O3pOiA@QG4wlA*uCu59vf>z9;^S7W?VW;HNVi>Q +zwCKfVu=xEN6bcoMMQ^fg|H!aCXQV{-x--q8&Ep}%z5Jc?$zVSP7)`@t&Zml&>7v4o +zLQEIo+(laI+*N$SUq5EEo0V3lOr%EE!gb7GqmvG2B7>Vy1E$`p(ld(^_TtXesLSN5 +zAX!&r$|1hs65^e|1J_w+X+-kgrYo2Rc|nXnQO3jy^$;7UZSARdd$=q9rJnQTc&ICk +z*CwBfYWsO1bEvu`7&6&RmWDE%y=)li#j5t!F@yIgKmER{UHCZRHtMxaOWEdjs8=%M +zeEWb8)s#%Z!o{CYe(1Fo5D<8}^;#*3|F*VUFgsSNfw86;2AihpYw~2#WoRw6JDJhR +z@F|I`?X%(iS60Q)9Aos!vmpR=TI|K&x;{l;V&?gOh1lW!w*niva*)z1#;D5JxeB%= +zNyj6rrNgelbE5AFDr+fG-AN;+sWZ<=< +zHu#WQ?$0^LDGetBH@_Yatj06N^h3=o;-S*~MN<6ye!38lr!NF5+B}^u4pha?Y?rR$ +zeOvTV7CPxHA|{F;g1C_rO_i#q^k$`S8OH6Qx`_oFGbOh?uf_Eh=g+$o!eqA6hx5J* +z0`%l6@{D}%MzfHvGUq*Y-Ye{{ADWfBWAT*Ft?ZeZka^x> +z;GHtu(%F(oF5?)bfh?a*B%Pi?7ncs0P7UVR^3>;tMl@P!cw3(2jr&|q<_*u+5WnnK +z{K)`YQgKKn_v2o?yE^vUsd(I5*kYZ{{5DBW7Bg!hkIeHUTb@j#v9xw(!MuxSzP`>= +z*@mNES4CP^m?W9<8@1JIB#O_fqA;t~ocKeLs(n0|7vI%SPdmyYD5kCgGtwq~-j4jr +zRm&fv%=6Yi7NN(l71io1zm8%3*TNo05x-9NnaHjN-bYj|pWh5Szxm~J({+QUdpC|h +zzdEsERzHXR(E9HogMIQeyb6Rt=DxO7L`5A2!ZRtD?94={WYJ4Knf*wYF?us!vL)c} +zOEgk5cNA4U+c+OKVLLaO=joN(9=iIKVhG;XUe*pxx}S>Ou0 +zf;R$3d0 +zQ*n2GKP7$@-kzMnYDn(TENd-P9(IcLxL#IPru}$7-hO|Qlt@4j!bI+#Do~f8kb&PT +z9Hl|F&jfcW&DN1tbNPMXRqw*4&Y_SHL{;hMB9%Fh)Hi- +z6xhp5QITlYAB1&*boCtcnR(+Xp}(+$9!6%ISovKG={%z|vGFV1So({6?VhTZL?urX +zg%Uw6Co)+lvLeB-jU%%i@mt0AfA_)S2lAXE4xdql6v#x>u}Ei(MlQWp?v{C`g3Co? +z-%0Q&&=M74L( +zWzTtV*=5MNcacLCavOl!P4|Uhqwe)fLSS`3c(L1Jmn~ST3!fOJvk!(Pp##Z_k+EUU +zD-g@rELSpb%c;yw#7hja7~I6ZkszY^HCSKju;g?2bnlLahNk-NCO1JHW^T!xqASO& +z8{^7o=91*CFw;AN^l7dQjJ46x`lrj|cTW?)hPI^PdS%L`AWptm7e6Ye(3_Vk7tw{6 +z3Rj|UKad4F;S~w;DD2yMdpoU)l1==qho{V?fpN_T0GcR)c<8)yO +zMFTJ#Ed}e0y~GB`IS|x`=%*?1KO20Z8`r8&zn-pGIekUNJ}>F<^s(4w>mZr@*_X|* +zZ>Yw#Jw{wyd^lA3y&ITeKfT}o0V_Bw%q&O4&6C!}qEU-0#ht&Jo@c&8h})IC&zAp1 +zw{3EK`;uuA?+f;VGz-7LpAN}n5@S)r2PX}*hZIDghLr@@*sx_6zK$gt{}+HlI2n4w +zl*aort}fa{!7_?Fv9_v@E7oHDBC=it^Vj1*a30?7bm*3<_g8sQ7IsU4P1}ExTby<9 +z#{%)2_;Il-6G)j7W;SeQ!E%rlL|KJ#ZWl2F6!vGU;k0UP9#p|BX>?~NInBCAC8lwp +z5|Z@3W_&2XAj(#nP#JM^Is~H-+$f2!|MzIh;JFbgP+neM +zOZt^({?@E7Sto@_{lRy7Hz-4;vNisi_28nL&PBQkK15^|$p?4zkVhVX#1Yjkvb5n| +z@~=DcMu}3BWV+Y3dY4ZaobUTyBK_vMs%av;oXs)*6a*TgRW|KVHVuun)>G1Rmt|@s +zi|;CDRps~MM>X3>&P}~mr^ebEJ%<`mae)leX5wH<#D_@1zcz;`RT?E?6MA}(8UoRk +zVTxI<5)|Y@jlpy%1kKbicJV29I@_;^|g6Tg{8u`AfCR0Dax!2I?-pj +z{kLvv;4htdD;X3&z-!@^??djDBW+aN=?I-b$musZAgp>p;lv=p!ZHCtkfpU%($;)d;* +z$*?WE2fxs(^yF97#&J@aSeY?x#zuOh5=$$$os>@n{S;odCML1$)r|DjJ03kFn_J8g +zA-ORLb=~IDCU=)zo4>8B*!|8_pUw+@`6fnEL*~E07kY*QWA~7pDhR(enG}$^37Zt) +ze)W>?Htda6$q%n&Ag1~dGkadyBUUEN(uVEoB7&tRTk>?j`XiMIwR<4d4u1v1tFa|S +zuKHm=ct4hpCtNY?FiQO@+n1vvkkXxUIrP?7i^!(#a~c1}-A{OU3k&M*Gqkc(Ex*My^n9BwU^b +zw`Y(>(eSoHiDN)u*<&khMTtil)~aH;E}ws>h(tT*y&FTzJW`0QbnX+fba6F$=0tAU8^QNAfMN12J4y3w{I+ +ziuG?MWXO(?_iubpU(0*$V6IofbZrk8KNP?V8T+bsEhkpZ9txW^9r&jL7L{R>@3LXlrWpsZ$rhFyoohtS5s?)C?Yt;-*<7d{8u- +zff$1xQ648w0hQLQuI;Jb{diezum=BzPA{dyIs61G2wh*#L)?!Wo7k-VEXnU?gqAQq +zC(`x}#BNsBP3eyK`ysv?2Vt$BgWAsR?{S_o^G@CHH#ly73FFkuO+I0#NrO +zfBxB0>EPBa<+HF>4r0#NnOtxy2+nG +zqEx_siV%eUv+}dHR}8)f_e7b#04FDhz8SMnn%@3f@1QKyF3|iS +zeLS0dlHVjaZfl3jde#kIXI!@#mCy&*`A{d_uVu-}?aoXkZ=*D> +z&X7!!dIpbY`bphVpu|bBk2`pEM^lNp9DUcWh?N4;T#X{q=^v6O*YNn!cKcv!wzuw( +z`1{_Q4nhU|#7D(0T$XgNu$^?zmbq`-|l2z1`m|u-mIqlDpZJ +z$1y0hdUpWBPB5j9HS8-AG0Y1yXrB&!!XWU1VKIjE?*jlE2Gs#JEeKGfLRe|sOV%6O>zyxO +zq#~uaqrT{zo_!r+b)^y<2Imi(8Uvr}xHX&96JFk`Vf73Oa&EkX@$L~i1n;scz0G~< +znH=(ZP%)pBIIY@(8r>DC@~33`t}sCzE;rXxnw=UlYU@*L7yKToRNui3Bbvm>`>jp> +zdPLU{H0M8do&rZR#DN#q?w$cSbKYOx$f0UK5Bh+xLbSHembG*NYww( +zp_hi2i$307)8H*|bfw|>*SNOz-<9F5Z9MbAMTGh_y~<8Tyzkd-CHy?`$T4T~-LHc? +zOFRX&R{R7DIQ<_Sw|5!ACt((zeFwix*H-Tzhr`je6OoxI_<#A)h#g$}JvEEp?^Y8A +zVo{(BvXxroDdUw;g$OSh7fkszEUnC=G_^7zgRZQwOCv?__`St44{h7Sw^hrb)?T(V +zN)3V*u3AxL_qWj@q-MkO<;qss8B9Ai7D-HANjw%Se=#=Xl3cq3Nc@eIjm +z2QH=tozF37wJkld1J@rJD%p*j8O)-(khiuuby*wa_~LCaPbU-Ry^A{$5fNyF1J^F5NwxH0R+JMhQf0N0iEqWVOk&a94b4lMYMYky +z4CU`=yZ`@P00zicvOB40ev+hAH1onUu&l_^8Y)99txAnsf*9J*%7u*e$(+9a(UNbd +z7FZ5m%!9rp +zTZr5%1VXS9G-9hnri0%*xYn{6GO?Nn*CUnIW2U~92r)+~>s(>xWz4x>r;_tDO#kZ0 +znnuqXRmg=0BkB;7s_g6OEB^Lt>E$O49Va+l)u>8c9bAtYU6(rU!}-m^a>8gFZLZvS +zHrAEEiq~-~WL#{gB`f`_Yd9(_`CDvAUd_lPyB_O?&Vz0KC)mhw>jgYqv7{6oZCJ_t +z4I{*cE`B~(jVHc!%*wlt{}*z<7$TbGgjwP!vY{O2&*=Q#Sbjy7JIbk}0OnA(L6Z?S +zofu_?aw^zJT%dB_aZrh}>vqI@To#@`;NBmVW#Sj4uyZ3y?k-0_g+DT3?i~2+a(F +z=a=&ZM)EN=JJc^68o=8a^`Dod(iKs+FE#<3G`PR38 +zoJH+%^#^96&o54;h{81yw{fE5)VHCbv)t +z=hsb>v_NIG>@7+~d+~Brs-V(UFOBVc-om>1&mPyAMF~Xdhh*>OrAF}40By8r9ASz^ +zCXslf@i405_>j5$;PmVk^0v#ud8LT^F>yP6UX27Yg9%&SMNXZ9E_A!Xb!5SK7a0)T +zB~YAFv9EHym8X{0+Yw3=dD+0zY`64C^*A7_fOZt-TH^~lPsLJ~V~xPyrDuilF-gCZ +zON8abO8LS*so}xR?1JQ{sH$rcYpV2!^CI~Nzt8PDTlM-cwpd|85gdhSl6jd430<_2 +z#~9u)>lyd91QyLtZ+CMc{|TCjgT_pTs}Fhi(y*3RN`#qnz`Su*O0g3uLeAp@ZbU>x +zYID~t=23C@%P8$&rKNEAU+1mA>6-&g6bOQR*b$-9%OW^~1{?M$LjEoQRan!KeXC)T +zvm?}z{p%hVZC)imcQV#@p>X3a>p+z4gKJs`2M2+aQn;3aeAj}gAF&EsBKzB6ct#G= +z`is>X>B`b^sM3%kjiw?G`&NhT)zPR>NYm2M>8W#*oV)OELr98QTm?Tf#o>E=W~tbJ +z$@g@K_6`nckd!xzw!v|NmSGoFWrIlGhx}=;fYq9BBSoM?6XNHP{k%$;OE#>qs)6hN +zo1FI(RyD~?&{BYuLMKsK?f9d=s!4C}SlosxdM(*2>az|i)X^bU*DA@cDp*boYNvlS +zC1hYgTz$I`ezq0&}3b}?`V!y?4T7HkGkBBz!JfceeO?96hb176p +zPtCP+vQYLrV!_5SRQ+qtl(a+~fBNY56O2LEE=}3V6bbW)6j*hY;>`DMuz|I>AH7|R +z%46ZoPxDn%ATEnPtB&Lso=rNBc&n~p7Lkyd00(n1RLc^ZjZ!gIJGKk+$8RFsz^wKu +z`f)R6UAbYpQhKl&1jiEKs7Aetr;iTTtXjm1-$YFoP>JqBM5#+B>cK&Q#RbwcPu+AS +zf8}2>;bD&)-JTX0srNgD2WR?dDX>RQt1HGMR+wvf?-Gv_ZFux8C>h)4DQlgMSrW1h +zX~tn;0>*LXZIhNnaE6RaZ);4*nLLi7Vk$Q`xv8(yUkt$U8|GgnjqU^JLk~BR)zcf6 +zkzbG12*3!YtWjJCk(sC}$%edcs38OSo^e?fTv1!A+LnHJ6Y}nwx`?W(4Gl2P-rT4f +z!X8PzAJQ=PKy)eSWpq!8?7l+_Km#0!{I>8cvXwzvf#YkpHP}&eIq$R*n>{oHZ-fm5 +z8<7LNhD4U1M#8HU{&Pil>DANSc-LH9Nyvy+tUDIdI{a|yK}bp;-ex__ofcx(L59O>`okRw;N|4{uvuLg|0UKITRf+-CT$MXibO04usdN(svbLxVFA7ZPILh8J?)lGoci{?6ra +zX%xw@)%Q1SmIpGN#fLd>8`DaPB;MvldiugxrLpns9~5)B8UOOuc4NuvLfHJ#dEkdm +zF)Z8e*j_?qDS1Vn|8ZEaBwH>hR(4&fq!m}zFz4NRXK-$OVqgWwydCVS>v8ew=nLBp +zQio_x=>vQz?fAkSubLUL&ueJa|Mjrw)@9RcXKjuOSLUJnd+HQ4rdHbZEl){e_J`DS +zv8pE~ECv+}!G)MZjCuB)UOJ$OCt;bE^T +zc2l#-0GqgRdkCD2>RHW;4_=v_X*&n&f1qr)22>~nyhJXvKEdxz_~tvuCz&(Q6K1@1 +ze`OBQYEG3xcPdJ)q~EsP(}&Q-c5#F3L6bEB_Iw`8f@6%%JH6xMiTTdlDSpS>6?x3~V+JKBF=ddqf6rjwUUCbi)5R)bELYBXs`? +zNOrwnI9xC_(c8`vg9R)O6^SAMfT{L8nRf`WN^Cm-^v4)t;P)5DpL3x<5j?&CMrtsx +z2F!?_UI9dqb&@A#4;>!K=a&8HMwlFim}?O$Bw_;G`ZnYe~wy`tDG<|%+Em+08rgkxFdeb<@3Q3@b4xy +zKY08e2LQpBQxV&o0FXR;iwyuOA?+V6UjQ*6z5r->GLdRc&q0qr)&TGx{5GA;kJ}kE +z=na@p6jF4K0>EXAY<}c(znI=4yr0ZQ87B&PMq;**X6FF~06vO$DS-yQB%B1z?yI15 +z4zA~AEp)m;<9-8hnW@JxZh$+hP(K4z05=*i1Q(wX_JBK-qkI&90jStLgwTO%#4$Y! +zw2?TO%YzQ?FF1NZ3jjqBQ)$}g(^^JW!BA)^+?yL^u!6XQB29Vr(_nfGWFP?k)-F_j +zod$q^$`xVsCi`FTSOHLaz)h7CH~Q@aGzIftUBG4}g;k%&U$?k@L$Z*Y)%@_@UzhzMwzx(|Jh9ZRS2WZDL)aR4HFPQKc^-UF0Gkich +zRb4~yL^_QD|Cd&`?N^--|(~p+@y6{2Tywk5k$tQO`PXdv$^VZ^8p>$LNX@*fh3TekknVk(>VTv3IfJREzAG7fc5SU4F%k~;xTpi +z8W|MgKWd=k4?X^~V=%V(O0m5JM$+GGqWFNG5MLo6MA?i2ygwDrZeIm8JGhn@TfhL% +zD>SPB@$t_W9{yk4Ye#K!Cd32(8KkrObt(Y7ZN=6H<(RJNllB-?G#Mulhy08;H_Pb>A+qWsU_0N~|mW8*1k^DrQatNIdfTnOvWxei|g?c@64i2~qq +zXx!&|l$Zp?i+l4NHD@f<+}Gi;!ytYaglvdFa)pBW*ewQVi*Ng~Oy~gDSMh*ZYwb$6eGqi<0{=Xre+{G# +znwd@Bs6SWSF=YTS02-Bx*pJ#Bv{=?9nfBxNDbR<^5IqVXg8D%j2s5RgWn=ye(zpt= +zJvk&6ROwUs{IjURvv?xPCxfI)QL2T==0N(we|#Cy;-?@IhT)1rz5TC&_nQ3&oO2-A +z#sBAv2&60dQG0^t)Om|a{ogrjC_;)NF9AUIAE6Y8WD*erW)m(J8DK0k#3zI)f&vJ# +z=bOFrx8(AD0rC%ZgzV?Ammq9PzxCj#kgGrM#BkHE2ENQ|3yq1r1P}9?T>7)nSZ}}H +zpvQ!f7$r#=rih}fay1BY7QW1G8Rn5_gI6@`Sh13FyDY-sGiiL12vYlfXp{GPiclM| +zulY3>2qRaJMEty-nX}(Xr4V-f;T*P(v`I^I`$x1FK-7PQ;M|XhzVj%0E(H#a$B93) +z-p^3#1Fh&^)D*?b%#C?6pUJB+{No(~02~Q5Q6+~g5%rDa86=vsFW;GLc9y;ZS+37o +zs{C6JZpfc5?pjh!%uf`BzUDn|L4@C393WQExjPl1CkAniapDqcA0Bhcp#YAyVTCpS +z!cTBVg67hd8{hV=S8ix$fzjK!#pS4Frp25ne5Omu#!3+%4!z}$Pa*5~1>>$%a+z)7 +z6a0!Kv%Rp8OfY6+#W#=sF&admpEpZ;bm*hGe|#1tD!9g8$stZH_sIv1yn8+)0V72{*MAwz+@jerl&q6wDoM*;&HRZ +zjTDVlhs^@vutD%6sGnyLqjtZ{n+#JZYr*@b9PO**Ckov+fMW!ur{clQJ9K#TSO=#S +z>ir&%l*fl%N{bZ}uu2QqqNk7l2jQbAq|A6nw6jGA-JTNqbImDp3DQLGOC_*=u%1pD +zFOT|0_>xsTQ6)eM`c2g9Gt*uiCIp$pHYmZYaQHuT?U0y18ZBI|D&Y($v0m6o^4uP?ZD8 +zvD9<3HCv;WltH#p7OV?C5DqL|;jDu}TeJJS9SMl|tZzn`O!Yy^)ZLH#D={6=QRFt; +zX+R})0mI5JE<8u2emzYeA~!JM_67i=Sl5u9VVZkH4mUB3BIyC47>U2o}@y*l<9MjR>zLSjX3>mpTldg@9_bp?k3XF_fa7QzlFB!N_Xx0s686(YU$n!%RNy%ANU6?7$#Ztku6N# +z{a&glW&~4VdnP|H4*=q)GA1doxx*Edb@Adg?l~RY@w?9yt2GCzEZ9RZ0lcWYiKT@F +z@28(p+1b9X3{N!mp{l(~c-iaR63)EcP@BcJ^Y?Y{d`*w*enjBEO_8q1l*aT5b#5W+aHPDgclm+& +zpwR|(y>w&dnTdqRS5vPetD9oUEl$<;WE;TL_^z2-2+pFUb)q%#v@Ui^*!>aA*lt>{ +zw}Nuh+T&Qy?x7Cvb)kdLxh!AZ{eccNEX8W9FO +zpM>9({?l!;P$M~7d3r9b`V+^Khc{@`&!I_B4_>xmBb8U7C(q1(9XZV4f}~!_oBll< +z#!=vGl`$BvgxosIegv<-rT+ +zkcvwUuav5l>E0c5;qGW7Lf9s=bybaU9Scj?SY!kMg@L7Vj<)(X*-XZ~&8!PEX0t{d +zQl3YRs4Zf!$70GfX4YIX(iLf*we*^wV5hMX!e&hqYdDIt +z6+0b?-6I)=uJM~jFo3&KpineIjyGpvpZK@mvChPgZ5_Ne`@7Pu5BOs%Q{^&w4K*5M +ze1T^0HiON|&*-P`u^k*AA@kI*8ov_tHKJZwxI-GfFj)!VIEfE +zlG1Yq>eDwr`sFb+sE919Ah9`%Uz_ +z{!6VL!Mwpl0~Rz7anoV*?Ss%RW|scg_EiCZs!Gz1HgNF_N1|a?W3T_5aYjO&Y|to% +z09eJ^oE*~7Bq3H~A(Gzh$RQH^7Wya#81p;pr8dVs{fXmlU7lE0>-Reu5CK~ec7BpW +zGJ9%;C-=R6X9-r@EsU3}{CKDTiJ+Q+DbqmG(jrG+oM4c3*r=#1aDWqfv_W+feszmo +z^BUOeklZFK@H?(+4kR5pZBjGuXRx+?;QWgQd{pbQFL6)UA5edE#wCK@8TGEBIE6eC +zg1x4o=awAZpA(#}P`ypV_~wXHNXnxnFuuJ|gQLl;6Lzmj@q-hS +ziSZ}cVaUQ$h~nB|_DT92O|(ZPNKD+16oBKo)YqQf7t$C1<&rj{4y)am+dq?t^#%Id +zI)ywMd|skNtIzmjc$4!w|Esoi({-H!y@Yd^b~ss1lcs20XwryW9wj(I2l?~*PWkor +zn+T!-qwJ4baD?t#a=<^d0g_x{;DrC#n=wa?|E3jd^XJ=w5=;>Pd<|(!3f5oH!#9uF +zG;z?q{)5*!w9|`6*IOsJOki=3D{}xVw6nfXD&)xhd2@n#13FBk=hFfIDJh`UG){GEV|A}jB^v$uTuNG_C>`i)g^4+E_P2eXQIpGCLj25_|5?AWan>BI^4c@ +z0Pjs2yxxguNv~ehJ{M%0N}HUy%s@w0DL=Z0TtX1ohe2aD+9w+JW!WUbwj-_zV~vSO`^5bM9ESmQs~gy_z^Z?BHGe$?nbR3Bg~k~4 +z?Zj?|&5DQ17d&8(_!E1R+8vePCGamHZS9n*8Py34dt{Fx@VlY|3YXK;?3r* +z6TrW?-h3X6__t#<0q@J6CmVu;xuwo*iy +z!7i1{%TUCUdthVE3KZ6TmM)O0zrGm+OoQjt#6b|-j~i3;w(6G(2G~eFJH~(oZrS+r +z4%~`wKo#B_nf)WoK>#sA_}{z)-6%d>0EBk+TZG#^#dGT~JFI`ECZ4?uN=U!?@k68y +zOX)lUkZcH#t*#XT<#V4!vl56GGzJVXQEHYv#!AJ>A|p4VV{cR#Zd!u!`><3pVxrgXD)j3=YDPkQpJo7t}?5~Rh43Vc3d+hwf@w=XAMX2 +ze+FL>K4(({|L2Nq_6>s-8zxA^>>x%RgLSiiA0;TjV^c~0*Yw&5J#)mfdjsGXj_ZmY +z#E`&YCs9VA!x}c{eHTv64XjrFSTX&R{~nw>CTn9HaX#y%bc^N;4uO)*zwIr@$msz7 +zpFW9amm;oC%ajvW2Z(l+OX`B*M509DSU_|Hmc${iH#^->7G3~N!ZE1VMCdfKp5K;T +z3aI!1;~MK^;5jt^H*QIm6HQBRZ@9PUdM5D?<-+gG267I;v7!=t{9w-E%V`ia5*#5= +z=A4_oWYGD6gS?8+Z_lWXK!Es-Ic&U4phNA`zwd!y2kwIUTt&CQW1Ux!EX{d=jyH2Q +zr8nUwJU~YqiAbMh-02su*I--y>D4W0M2|vz%r(ws7k9M}FMuFrwWIn1u-*T^{|kU{ +z`k!wQ*w9q}YR52V`2qrE_B>mAwwvRh$Mvigo-iq(4=G2sMx +z2`*ce!-gd8_0x(`2fhWUV9YmYvx}t96lbEr!Jz0bEI^|~}M*?8iG4;=p!Ao6UM91x6F#ZPcS9gB>@JbhC6a*Am +z&|Q<%I5Z9&4||At3&JkS1hYa{#YZ(3iK=PaLFT|>!K(Jqev +zk}!c}ON(7fH%0|*v=83{I~>3y7*`dN|R4weV?<`Qe!s4mYlcaV}8+MRPl6^K^i-8eesg3poTQ^X`PnS_jZpr1BvwEkeu9V +z4PyDP-^(4Yha-X0Ug@?rG&Fx~_vc|PL;o8kXh841Jznv%gR>oiL}5&RVbU}wA{~fZ +z(rnD~&B*mW6)S_TnX8gS2yYpD_LuMDPPw7i{@RZW!R64dU=#oP-q=S`@Y&p1H?5Rw +zR&9svJda`Ur)%K|!Vfi*hC0@@T6%|s9G`V<-*($O?2j!OTQUAWn$7~Kt>*jtfl`XK +zxD<+|NYOxXm*P+;t|d4Wrxce^T#6UBr)Vh-1&XG)Lve@V65K+7ByakA=YN?YGt6-J +z?#bERbI=v;`VR^@h2~x-CoSExdd5R>(Lmye9>t%fE76<&d|NB*;St)*CEJt +z_+)gaw4T^w=p%gL6pYNG)_ZaAsvqV~0FJUoEL(gLQo8Przt7RGDeG3@>T@1SFc;Bu +zt=5I0xqZ)8Er3nwX|MZxBk);YLuxN1N~6CT(YwVLDJ`jGYN4h1{%5w)-)>gJk10#zGTY!Izu{lzKc5Yp +ze*zLCFbSg&ZB+HB1}d}{Gh_X45NRU&qA?5fqrfZnLfn7zw(2nWiv?!Li(S9W%vng7 +z$I4|0Y!?EMR++V2#jM}z1O0aj(1f$Z(fbi@fyi#p3D*t?>|j!~!1hc9OtvhO^v8Ll; +zi4ir)Akeq58mk3h-@iKd0GvFHOig(t#;LPa)kNCMjLQuB#49*);LOXCr{ +zBIwF<p6##?pFjDC=3RbVM+76DN+nEPiAVTX%FrW*jqTD@#5M? +z_sy+7WTSVi3u40FJ;wTJ5J+E|^Yd2LRBIIcXXYr_H9``z^Ehxrr{^*!_?Wu7 +zLsp(|c^V-ec>Z8L1UrjQY=5P>0|W4(oT?9%nH}@dlO@X1*E0f*cGI-^vpc4*eP0wVyelQcq$8uyO%GEh5!45MR8Gk>J-+$JbrH94oh;wPfUTtT@pd~ +zFOvUC$`X!=3v>e)2q3h3*tstRbx*6GBfKmg=2g!qGVJ-(pi&+eWQ%2NV)_yYDszc3 +z;V|g#g7Ii?uf|uig-JEz5rxmQUHG(L*Hg@=FLAWr4zogeqj6H1m~jZzcz@fLbq2qv +zBa_P#Q*>z=kF8pb?xC*|)~7Hbr}eZuu3Z04svU5k;bi$aYY(ES+BE0t6<`U~Qs7Kz +zgP)2>)o^sAnFI~hRL#-~9jLNpY5vG)B?3yYmatsR=N9wWsoP{Vdj(1yx%?2l=#9Ya +zE*5LPsf(k|IrjGaR`pd!&Dg1`QH`UjvC&h8^^t%&hf`zrp5Ks=C3OANn{f@|9uTm1 +z9slHQsXp}Fp~0)aMxB|3kVB=kAsm?e7F{I~1mWMD*L#$~dg9>qa=&`O($j0_kR2R& +zve_3QFrrOyeUITA`JB!v)yxxyG9_4Bf8keha;dbGScig`!%4a?CD-8{Uoeav45EoQ +zR|c|Ee|nG18^7uAcWRcYl`!2qj323rP^{Ty)unrx@OEBz0GdmCF<+Sj^Im{H|FmVW +z)lz`E9mx0XcA9C+8xO0hDrmnSzq#>lUOtB3m$&SKjqZUZ8WeNG4$aGi_UQ#Jx6#^% +z8+XXl_4Zle2j2#yL(wt*Mskuu?Sg8b%%DAi#*CR8+}ky>Lm<)oVS6Iz!_GrXUS8g^ +z&*@5=kDIl%bwEHHBMxT*7Z0z;luYqxWg~`}5%l-VIn}Y)Mm6rPY +z`oh9(7jdxr-gw^F*jO;Mrm-oPKAfWLG%@ZH^>fscLQ(tbY@PTz +z$)m0X-JV&}MEc2?|2ab!tWhV4#TJStU|36Y{ryw_yEgj>?RG}n;BzA4IT$&vz0*@F +z`IN7CR@T&WUq2=i%Z+Is-Ff)jr^iTN?|`I&ugkBmuMNRL*O=R5AOmXU#hRar9<`xm +zT%hb54~G4;sV{~X*4E5TOvEuDAk4xQ7PTz%E8z6pAGUb&@hw^Cf(J`=`QOBytWnwm +z)bY9*`dq6TdU5RM%UE0o>-Y}_ZoQ2!2x?h|b=)jD{i8FS{gtDMOh5jU@r$D4OpY5W +zm@Y>2rbG|A4mL42H!~6qxE{KefES+3?FdGzCaT0*X`nT<-I`_4#AwuE+6a1n9lhF8 +zH!t{gm+{?~$8((GKa9>9b!R%>M*&oj?vp!2Va|>~5=_$T?HY@1VAS +z46j#W>Pkm9n+2PGFMSd%#QHOXp^O6_e@;O>JdM1$Fz?nHS7+&Ilh!Gd@5xsxqZT~I +zZq3jOC~BfY%PfD{M%WPHgu6otzr!p^_Q8A2b_SNY&s29rT9;wcLDz=C#XYj5o5;b^GTU~y}JGg&9BgpenFQQ>0TOFhV-QbR49jFgw7l?zj(;g +z6nvh6uBeJ4UVoTOT*C;FHOq9L3(D-5zhSRQHMTveU|>!;>Eu`9!mu(9_vT&QoXbyo +z_NXUn&jM8$CStp#k;_oO{~s%;DtMB1mEJ3BCs^0mZJxGr)l|XV{zW9~hzxXW^uLC$ +zXQ-tmaxNSty>^_SH(c^yAwhEcIJVObOe?{ckb8R%sMg7g_ri0C#Z5Xe!M)13l$hoc@Dnu8uLKvmH5(!(c+HvfM0A+aBf +zeoA`6dgcP(Yk#zNo+02E6Drq0JA+U2HRlqjfF7x^%0s++OMh`J^0!|aELLoDuH3?Q +zUd3j%nAdo=`IRxgbGsuLS?_@$CeRT%?b3JgHPa%U`DUHhNXCD*Ywkq%wA}KXYapEL +zWEcYmok}Uv8C*2BueUMV95*gc*MFVg!D`mQ;Q2+f_boYU2q#QbkgO5VjyDU7U;>s< +zkP6X0U3FeLc{~$v`>;u1Or|p&!@ltCbc68$CSxSp+;q`v3v4}GX{a#d1!F?cVxgOV +zp;y)yYtJ;OFYZxOO}m|{rE}K$zN-&)w#Ja?Q#yNSs2{^XaO3WK*^X0b)+pg|{qhGbFYdxl?>nr}~(wwIJ +zyKeiMpyQocc3$*@3}WD)qd4+LiZF;=gp_8NZR=|n7dBBA;9bME4*+cs--Fc}m+=`8gUCR{$gXFzR19<)#=#OPOkbeL%T%~=MV7}bTg +z$f^NDPgafL;aA~F@+!dOgm?9G4n>UyYJGM5OS_&d6y(pfK5ISn*GS)AWRUssyC<@1`IL>h9d5C;5pPO9LXm!ewm*Gu%{@|m-`O}Py(bMr9{RvF +zi0%EeU!?SGbzDpQm~3Gd>UP6%jDg;5JDcL!bGPcJs1jo<(&jjD#l3$aD+UL +zl9v@L#MX^g)Mnv1f9p|dFFHLveR}fa(0_Ga%)Ta#`2NWAMtX1M$D#7|%As^yMFoa| +zq3;D-2?&Ox(Wi~`Yifmr9aV`zCk;iS!8>V&)$iNVSyUs7flWU&r;zyzJ8}xX4!ELd +zc<%+T3K#e|=+I104PPa+mOP%S+b%4+{`p!M#NWBytE9QrAlRhyYy|oVEJB4(L6D)?T40^dlR-I +z0$LY_=yjQn+iN%4HL1%iE#&P8M38?D?c!TaKX*4y6s80mYx-`}p-EULNlZYC}w~2N9lj +zmMdwef#?Cqtup&M`XN>3ax!Ma&~}qW2>R@tZ`?y7riP_R3wkBc?7I4z@&;gak)alg +zU|PO>;K(aWoUrz3to60Y~$#o#H0@R&#$ZKeUG~l +zvl$bv60&5K$yrMXCtljN>Cdh=%0@F>bL+~;t_T^#5*-*FM;(laE0w|mY5s-s<%hB +z<}j`yeeZ-4-GK_53(%L(G%pg!3_SkmfB!r7t>ES%<6O+>x@+Zqacd$r>4y^G)Z2as +z_xf3Vf}v<=lrT_26%(1GFea`64^MVj%; +zo+vHQ%g%Ag75Vb=GRCcF6}1U!LQ%sJxZ)Go6PgLhdIyiuJ-kGoKZ!Mg&3}9ncYibC +zF^N;Zek^Pdnil%7S_X`J@+De<<=M=bgM0DfGaP-B`}=o^!~e$1X0^z#>x&AvhedF2 +zqEAlj-~4>XRH5LjC@_cFbX$ivp*fN?u*7|*N4*o^s`#i;RHotA*=~-TtE-D`EYmdj +zgX5zU9T&cfLK_3lagoy=ny+sie6}4$j9p{xf3WjGnNpy*N4pFajZ?gyj1gPv3NeLa +zEavf%1KIQ?;ef|BQ_srqyB&k+sdV%chsiS64znfT58lx=YgzE1@AI&#>T0DT?cL`- +zF&*Cgezy8MAzU4JnRBoCbLto0FlyRCtPK*0pSORxX0ghtuHB +zPSD8lC$_3?t$)@-@j-4Y3f3j_5&O^dkmeg6dI|rX;k2JQ$n>J>817TRA8i*TP&4E`8}2SHQn5~Hot`ZnT%7cj=wvV +z3Gxs4cjXw@0|CvNjaEPE_8GYZK3MWg(re`CtWEfd# +zJ7ypyoyALjo~C0tI4Yi?Tog@VOF`$v;PR=-kig)5k`)y-d+gliB>5<9jNqxwQat6b@qA8glMl)Fp)L3~#2V>~6^BC%?UjVKM%WR`B(^6E3ds888A +zZxx1*neW!52ovxm9OTCRj+nW@(FCe%$EptVQ=tx)TmWXrr)Iyrwq{L5T-{tEgir$O|M6N +zLqn0*X6AtWMI&8Hf4&g_NT%!o`BRXWCHC>^72riyR?x)IbV1;uaRQKDQ9L2S!`J@J +zPfh(yo8?b&sr4n$1)dL(+k}_vvh9N)($A?h*uRI$5%9O5!RZO4ObzrQufpwpN5gnZ +z(`O70_J|d(an8lD%ix&0NvqFtqE5>A}=UrniY$57361G|53 +ziYw1IyxrUw!E=#v_c!i+kzD{5LtG9N-1^j@Zk=R;6rILm`gtFJR$G=%^h~f$JZ9j? +z)Zvs{(cHwzj4%pefUat@z433G89N$QG6`ehk6qPfZ}lpuA5<}aK`^9~nG!st66Dj4or +z7fb}RP0e2iNDp{?5fw)K0M0Yav8kqPxQhy5E&+1RYcS-n;qp5!UCxkuuc{T>k?cob +zN>bs^+ds@$_M$=ecJ@k{#x#Zdc~uAKn=nT7wHxZ-RYGVmR6@wMO+MgmP*d)t!Y$i# +z^pb*zRA|HQMWc#GEa*GFFf#$SC=UGmozzFzxx?;4ooK>a@kg4c8Sm9tZ<5FV!yE7z +z&CW)CpsG6crw{SM-%ln*e +zP3upQk$wax0*g{vz0|Xu`#1NfYT<;BJ!E&A9D>Oj=T%kp?d){ZP9Z@ijMUq7gymRw +z;+7lP8vDuwsGH#zUc`|<2gD{ug +zjVyXsFuY^VVH92r3+Sl1{_ZV_DKr;p+uV3_vx5P_L%I>b3em32tgIfpqUSiEJU`C0 +z1DJL%ZnEZoY#fcFi>~Rir5nwnH(sxwP`#Mu((_?S#&qFaW! +z!JO(uQV*$nAL^|(e?uq6Gy2+!o`Tn#;C4l?Rz@VpO{O2&S{N&g_auDpPt4a +zS-mt`L9|)@74#q=lDf2eBSmE~*Nq>SZU$i;tqW^NGoS$g20(4%;Pv45^bIY$^9JT&C4oJ-~owh?DD{==^?tXyiU!({B+o_-KMLh#3=`Z +z#~noCRcr|>Vf()?FrBTZEw3aWD13WruI*nhcA>aRFukVtU)5^e0{ +z6Mk^09Xao9yZ;tF7(+#x$D+}z3RHsF{`~}FtK1;lsLTk{usWYV(PGmTVvcbKR#qL= +zpX$bbxMa2S%nfCFSL_|JxhhAA#kdzq-dwmbv*IjB!#25p^6a~$s22S9C4nEK!~bak +zYTln1hdH!Nn&9QY&iDBhGoRc1FdRwDU71x42ZSm_lRDY`RS;lJ2MgccAXuMw_TE_J +z?bA%P`J~{308|1K`>H(bkI5f_wz$Ty2txrJPRh(aaopTkM;k7`rINQ|S|aS4>69m> +zL^#C$l$pOnz5NJ*v&m+=eh20H?bbXo{jrdLpv}NtFZN;ui>Lx%}I +z$JSW*V)Td>8?ee3=;)2=y>e!E{`pm>m?0>HIYgy>n(q2uJnN6>t5;HKXVL`|*x1>r +zlhIo?-~AI~P-K9y*EBcvX>SzvzuK?9>^&Nvpuxf7D2eKsH+1Xx>8pX^y}QI^U3D1$ +zXMauI@c6T?ukc2lp-H7(($@&ExM$plzqYd_m&z^*Z!q${BZu7H7|oMBuzm%Tq5`}B +zuW6VQ31x5bj5YJ`-x@e|b8u4G!JciyYYfLgIWxxMuLr?-qe_l#ZHLR8q}_7R4$Nx1 +znmOHNhxGe@vzYMA4H~#*@^BPD7GiV}>JASVp_n$vjGlM%3f*AMM-8J$%AA4h83kD} +zfXaAWjB;W$tFck2;bP-twm&my7Lb`GC}NzVO~Dnf@Zbyjo1eS$uwzjvvddRc3hJm{jzc3f-W{YwYf-=17A~7v4+^7|kq70WyVR?1XdAZqfr>+{OZZ5u?2Q+^9 +z4zI_;(!;~a3AVX(EYor|ospg}kmOj4-E?GIb{ei%e49$qV51uGD|SlgOGK&Z^LF#K +z_6A|vpQcqlov`=RyzP!RT`w+awf({gcPE#bXhMtyu)-B^9JU^^E#SR8esl1SrR;7ne2UR6F0t;IcdqhRr@<7bHs65fc5otlpG!^NzY$9kpt +zzek`i!fh2^DO-@UcGRP4y?NznWC`yJ)p2Uw;Ub&+-E-oAKokaJ>S^ui#D0P2mP%RE^g +z4z^1PUeaNI1-Y;z`Znb0w#FYC7Z*&H8pxt5QCs@%6B#CWB5^?Cg6{=aK7mM +z_I{e7L4X7rPDhREj}Z{~PDW*CN}Lu0B5iU3)B7S;PuXAhtrPDyZ{FVfxVj8X))gts +zAQvavF%=g&I-krIi)RBW5wX%0)i?E~pH)&=#8pkO1>{sxS5-@Q=fjmgMGeUS1*4Zj +zF;W?VM=af+EQy&GUJ==7UGIn~7l46N&cf@+d^qat$vU*D1K|cno$h}Zcgwh#4;Y4~`7B$z2HPpYr!E)ls6slA0u)%Hk@rd{F +zP8uina-*Wc&$%jt`>lf8USh~u7)-=9@bYel3sZQsqfV#e;j!AReRF@5@!mBA(5xIb +z-z?%r4W#b34$rXEEmMl+QpdnQKMG5 +z|47n?PGRS;xw-K+w+)D|F4ndzIBXWzEOy52rD5i%$ei&0GQ|LItL*Ul?H=m85+d)niHL&g`7+!u`E}e&Z}r +zr_P}*at6gpgQfXcPI<)LzD!6;QFeTecJVg>=paO+UU~-gP!v#DN*wPlNXzQc-q6s{ +zx#rw#I%ZcfiIST2IRT$bI#)hab(zr1&LzvoJnq4UM9m&Xa70woQzMG +z;&d$;$Y1PjOfF&{lwJ%V&B2?#v7rY{L>jmHQSc}bdI{2XgF{~3)-Kxk(}s855B6~e +z#`rTrFLWR~&#A)c_<)0jjFdEGb75JX>N=we;G-_yAYkCckPxXYD8Eu4^J!f67dn5K +zI0`&&-kt(a+c|<<%V|OR$(zdkuIlu6o_ASNm)L?ash;`e4|t=G<4IJRIp!s$*Fd}V +zGL)R;T{S(D3Ar-xZFR=?!FvMJROSG_LpT&306FU~z`&GHa +zWZj${#q7Oi;U$l0OUh!46{*e3IjPKp*bF6aK`FBj!v?m~8)sv19RgpFuP%h|NY|ByFYR2NTp4W4`IinK)$ +z4P^`+)mQ4URqY%aeQCMpkn4o!DAygPe|nB?xa}O~p@Ov&oB>H0uI^29OnH7IYM+yp +zY#6#QoJvhsA{tLUP6RMS{5{CG#RI_af6q~ofu1e^qrU}&$w1GG&TZf= +zMS!3EnDSx!Nj_vfqtiifo)LO|yxwv)AaV!W$q9m7H=b5?-gK6fO$6=k@djSYy!bBy +z2ahDNS$rO3E{-}90AP_~GYQyz)+DtAj{6UpX%`y{wSMF>rAU=w=re!1|JcTuyi)b4 +zJ3-K}BtEVpm$BoK8*y6*iOwRAK{wasmwqP4yd!5fH)m&WoISd+q*p)NTx0|T>BS(= +z00!eSx`^4eLzB~+B{}cNLSzfwzn(q%NZ`SgE?a78%hXbDywCeroD}2gB5% +zK~VU;#5q$N68f-qie4^2Gv?nvfL^dbLn?8WS4?25i<#zTKQB$~5|vgcE%^*0DRV9D +zS~nFbb4G`q=a1_=CNLW8_fPd1#TJNmU!v@KqPSLPzr3SHg)OHyjNLfrJ%=EyrD +zHNU0hidIenFBZ2l0i|gDE7XvJ0rMeeMw$N_KhNu~NrzvZO`RPrLOiuJ!a2oXZgrk; +zbpGqfhB{aVFv0b$FTD<2ynZC +zVQ_;auVZS=Q8)3ZI|)0jhpjznxBZ)8Lv&A97ngb$#b31|FLs71a7WXpI|@=A5|UST +zayDGOYOlFZO|)^0F`&`(!OYQ7??oRSh*qGn38megJ9fe9=Ex(CvW4s{Fl6M>tz|iM?M@@^uHIePM5sj(5 +zgBsTIiH^aL-q2}5ng1$V*oM?&(c^Xfodl1{)_=-T>-2NH(&RVD?$0#~49L98+`c(NsolulF=}CWG&jsW-?AdJWp{0;G}6+otOwG6*;T +zQ1gIej)*byeU2W_SVNb9q$Pvj>hNgteVf?r=>Jz&+QayZ%jK{PvL8(Zz%|c69|o*r +zbT~W;IWl(_hWWR*%3$#u2Ec;(dn62mo_rHf?85w52v758E9UjWpkdiSO-O~5gY*$d +zLuBJOC#&7iP8j#d6)X7kiO%rv*arE{aFnRr%#S+_g8Pqg@QDY0RvXGV7H?J9^xG*_ +z**oM~JZwHdLP8)kF5WKgD<$~Tf41bx;{~a7^OC+;f6LGYE2mJ@EZTiXLdG3zWjJ1t +zBZEmEYC(QrI=s`Z^>-}pfEv@oK(qu#f&mtToXoMb4Vpl9K-!pL`r7xnHw-KWH-1!8 +zgN8wL{qAMZhUnduG8wPEsu5}^YAi~|;|(4b##0;fdND!@--ib=fHP(=;pyPp>F^Q0 +zhOVjphi$VKU^;KS@PX`tmxwYXN%eE)QB~gyJ6q%=!4Y=l$%g*fm+D)fJSol9y+}3K +z^!@uBDl?*-4;K+if%FexH=-h$InaC5$thB9W7re~#?;dyl*%qoCLqVXUUySR(v^&_QZLm)Az$c +z%(TLc&Rdq9?h*6!AFqQ*YuJ9gQfmK>r^b@=wSAMJ!$#akEkxFOgy!kL8AhM?m +z6Sq}^p=+c@?>5T4MaaSZVsk=Z@)PERKaYL(q>-wC+l=*lnTC{T2)rMH6Y_7xWxM<~ +zK79VD*uKqkbrw|+c6)5l(AsBQ@q&P0*>o6gwq04i6 +zsXYDdE0Grd(n&2?op^&X +zPSS>j@77(sx?AUSK2Z6YUd1wScGUVl>N-Qlg9>%O{tI?`caN@(+zUHTBt}a{-yzEv +z$MqJx)pa0y-HhnbIv*K~@Zc>Q^dmL?AH7fYvmJq+UhiQxe$N$_@)C4x;@I9PByk4X +zC_ep)UTaABn{GhgABk_AI)mNE*(BuADwAOi;;eH2YF-05KAipc7_pV_YF8Y*^#16q +zo<)QRLXs4*Q4vi4pbuaAq@^WIDNQ_LX8yVMI6)$9KsC}ewK{w-b$}i{vYg3n{(a~`b_op`c +zG&U=--iu(Pn~#>NPkjSisl}&Wlv?XKcuBbqG>~;mGWU;$b^XPxz!;ZkZ)usd$$H$l +z;9M&IOoAJD?gNTTTtgJ1cCOdo^{CwmQv#8%}3q4_SP9rj~c#2_FzQ6 +zbn|XzZQepLslp?IKl<#J^b0?ib~8{~y|+OR-VNYSMkPM#ekJuNf&{bvagEKGTJYoGPUvQXH)EpM4%5 +zj{kgHilC`D+o|AdC~`?*@puuhR1^%UZK>tHaH!Wrrr4vr4t4ioIu*e~u +ztA}kA9{nzGmy54bCAYFWC4O8?fvZ9<6r@yYP_%LE@JnoEWeLMExfB-cwrf~C_AV6y_g`L?SjMDs&4~fn>5;O(Uzda; +zl&rf>0;qtvDzO;W)^&|)W9srnqA^$@I4U8sOWbNUCJ_RbqSV4U +z3RpTJ4zUMgb8?&&W#5OcZ^VWlac-6)gzDtE-M;?-&?vqXQW00nbMPihj%Qg?E9{(m +zqglu@r=4>3vWZ%w%3G1{EIz%YDK+LF+}p$KO3sI1nPxVC4S8S9 +zk}iV-$yZtic?-FSZXnShwn?#~W6Pu!KL%Y$7B|?GpvW-x1Q)9`8w*?W2{YC^wO1?( +zx>7YH98XC|nU}9B+2*_c!($J9)`$|vp?CzaHF%K)p!=*yBdb6Y{urlN@pDL}tf}+k +zPRWl^!1skNB1-(H_*1SwY@m9C)vC4_p`jWTg7tON$F^W$jmQ^ou(YE~DLVnRtIsBx +zGb9TKu!3U!MzPtiY6>b+59k?h1q5FGc9J2rM{fI?a@fh&U4144^t=wCuuuF^=YtAt +zj%^fgMXnD!X6j7i1ior$`^RHgt{?JAG&lEB6w!cR2 +zwm;AP9L?h=MiR^)lEg=bMNpik2nP#Bl8^xfo$A1`Gl4iH>4hU||FVSa_jNT6Wpd +z#wJd-Iv@&R+c9n+(dbE#;sRZs&?AErK7K5o(MoJ`^VtNa=%pzNrm`1 +z6jkt4fQ7~iA&-w*pH5eb5T3%YYyD@oJZRQZT&~*Gckk!anp7p1$1-%oWB8(@ecIUO?Thfz;u-DA#N5cglc}ymBR6z78Gk +z?hralnsDNG_azV6`T27IRWfqUD$!LndZxy@56q9>wd$t*_uuwSf$zjE8rAP1u +zH}z){<*}XLjtB>`Gusx^_{+#D?2p4t0{Pm6G`=5_6^z2>Ba$3Rv*&m +z@aQ(W%`nOviazbHy~zpIc`V|SmB!(uIG*7psx)_fm0sFL7%TkJ=1Dy1%W}~e>RUPl +zZB2Y%)>iB4-14uyeajlm3?QqP^b)2@*m@PSDH@xKIkBr-e1nB_tos8#jaBE{fV)V_ +z+aJaTiT;vPqZi_NHXo$koIEENCgZMpz%IOb;67d#3`QkL>38ylXke@?I@X=Pq(BDvbIElsLf>8BCi=$;)XL^rKF9e{L) +z3PRs~)814!hql(&cQ;H2UWhdnVmmwtml$nXk66@<>yG%r4J?o;}yW0ynwRH}tpjU5c?vZ;E}@ +z|Lo?^{iXoK)-ul&X%^$&{UWY61+*NgB--}N2&?+zIgb1XbCL?^$sq_Q@UXn>EGAWz +z7rh{EWNB%KTbI+hJsIT9uhn~_7xZt4J}bDr@J%gPv?H$^749Fca|e!6frN&X1PcPnCILb-(+F +zfSvF##$V@*P*QM*>Td0widjDdcpRsHa%>h_5_aSG({Itnh1EyuN-@?9VXR2|rTN#H1~@Z#m`E$u^S70Lso@xZWxLpB7+KL6j^(G$LcX +z^<5@oGvB;x^W+xeE*a6~Z|UVk(VW#!hue9Guy#~MQWR;>*%oN>{ACv26^UI=k}Vz! +z&TE;+lGF#zF=j9SHL~JQbooQ8ZO6f+A$zWz)_^9Qb<|1%5`*Wn%r%f0pkKk!_2)8? +zN{_eg{Y`B#@E@7X8ZkmjX<7Sr(wCgr|G +z=lp%^f(N=!H+szR0(jONpCo{zUAc5aS0Z+~N|oamPT{i{LoHfC4;V;{! +ztxL!hcyGtqosv~abh&D;)ISHAvEE#WpezVT{rsU3C%S2v%}UBDA=7KgZ&tw? +z`?F&ucVjk>yZ$AiX+eXxJr^Nc(c+vZW$LTg{c>)XC(rY%9)w@^wTS1{t;eTF +z0qkXQFq-8qdCcVl4hA6ma;pR~oO;$AO759!a$t#cj`D!#PdXz-T +zdh3DK5;L%S7nNuPj@b+Xvv%Z?&!Wdn4_~ah!lzt$^QE7^dYnIp?e6z;A~}XPXVbo7 +zVCZvJz)OW*_JY8V2iA-;V@kpeBzt|0g)Z8P>5(O&BdB2_OFV0P7T8V-=GHd9D~xXR +zzk7>xr5oqx^{B&`VaYKaM@{r53fPJR38UlVpTP`RnxdyA7UgG!oQSjv(5Gc{CRr1i +zjcS~awJOEt554T!r$P3SRnaanQB@azHVyP>!awh^c4=+YYTW(r`HOo-Zqij0N241f +zGN=Z#sY~yDSVjohHS;d0gRK`OTaSQGz^T>@j$mQO_(6m_l +z=;O&qtE^-SWgSu@W;@bdYJCgJZpYYvPV=bdix~pKu-pEq9d$twV}a|$3QZoz8l)Kzgaq-AHZESD)( +z^Nvfg1aybiH*4Gv-Z{VK%a5{4zKSwTAkv%4n~X1a??~etY^n-FY|Nsak@j +zJnnp3z)>9nPkBtS==p(dfY4+n-@48hzEj)NJ@hy+ppb5sm*ga9+di8ov7k_wNy_4w;wtEC17gwYDI8Yb4!zdRNkO +zoCwuSRgz3uz;hL>S65#tFd@%p +zL;$miBsd*TxjSf?eWfv0Wu>Gkd#2h}k4xv9LKgJ$NYvCyt&xeL7QJZehI_ +zcv-HH6`_Dm`5kSw?y+Sqy-^nKR*b=4}SEc&1c_{AZB&9_OD7W`*B!i +zfibHN%hpR;FX>DvKp_#s+Dz7?9tR-1Dr{rEb#~s*OH5KUVjgNe)OyG|W|k7XgpgMj +zPn|hKPLXPPVPmGI$W>k{1DEnXwIVE+QiWOy1VpR9D$FDL;!Y_=)Cj|meCm_mR5bYU +zD?E%CkQo?-Q5c9(7%4ztM3v=SS$Jo*P%>M30}_G=2#Nr*2$~JPeIaHIXf4F*QI7{4 +zc!9GX$k-jTN2Aw|P$Wv7qc+Qf%D3b&;N^wWPd!CM_LR*rS*($$FpQ+kC`m8}U`_&- +z_oznz2*%B6QZB)~U({;0KJtlA{AHuD{hc4maAcTeTqGlD1SSc97*GK!Fv=@~QEC_o +zL<9xRu98A#_acyjcdYGXJ?e2l@N&ro*}5NR10l0mFcuye*_Ga2Of6ViZ65}B^4OWv +zr-`Vzw8q7X6;Ne#6*)%Amta|87!{@;jV=lbOOXhPiGA(m{9L7!qDC0L|3e@8D}n9r +z{(y%g0boW(&{l|PlmIC}WJCq&zTF6d-k&FE5`D;pn50`R)fB5oJq|qZDv*l-bh>*G +z$DH;qHA@C_kC`rS1hIkr$+ +z!7{wSHIGHlsO)>?!7C$}G88knLz}?+jluHu;DJS#}i$KYq_F16fGExlCHK$4e% +zSs`Tdd-1#_A#u^A>P&(e{iPHu6$HV_lP5c!&X2$KZN7AsnHf=AcxfaJqLBiW0FjZ% +zQVa{-`b}8{Ah|BGOfd&plE1J>jj?*vqY7T>D}EV6F1a$#nApH8X4dwbjQq+vPcUJ! +zG=Kc;S<}znhnHWfnwM{tGcHv?n1e6FnPN>Cl2;#*$(X=W!pEjTSgyd>{B(BUm4R$- +zZtjJbe&z@5@5Dd7$WhFadP$9JMmO_vXZ*}M;OO!bPduT5z}u)X!%3lqm!+4=*ySW% +zfpZ}!`N-Tr7V7WwSd-}x6@(LEZL1z>z)Yg{-mpcNbR1l~ja0updEH9!! +zfBvzs9Z`@LQ%IhI5upf@kPs6oMa))$alj6{6r0b2AYhg-eCq5|^Ku&-F5?-GJ^5s((}D61+ECnlBj3=+54^}#TS1Us4uS%{D9^u?UC^Bs +zVE7xX0S4~YYFKiRL_(yLVrF7i%&e3ORKQkwF|)96z^2K@{QUfTKK9X9{`#*+uV3O` +zpAp$nUe0?|NEyNuB7vZd#+*IgQW#|v%iU$kRJw{;YB^Sq$B +zeXjZw5ikDYZx7D+0U#J3xdGQzg++5tRM1r0x|1{((nlk65M&u +zlwqWZBqLacFkxXa63oCWNIPGP$kC%mXJ=<$yKrH2=}NHE(}D`cNUa1Z$l*mQvy(Z( +zz@u29(~h|;Xy$-ZlUakT9*>#S0;s^2#~SHjD!6?NdHEV$gERQkcMpvaeTd+^FuKAO7{*wuzvitf@2QILcbDIsg`qnEK@Yb4&VueM%Kd<>FilgBdQ3jE%Gh%2A<`y-zUC_M3w9-!C`uORR!*Ouo|-DQk@n$*g`R=l +zQt7JwCui6yXuH900`2gJe6P$z^scD5m7>-NJOz@uwv%Ge8|Zq +zS!rC_01aeuadGBDAH00!%Es##^_@+{tgT^G;=xOq0xy(ogL!dkjrE@Vu-Up?wE8G>s!Y}wsp3$iP{Cb4UPs%4iU +z7oqNU!sW%&$B&0$=%&qMJfp4kD)hr~;AMTGGcw5)8jOW*b{|x@NAeotK%v8y%%kS>Eo(qSv@95aJl89T&1=$X1U7C +zB^s2LZi|0GcUrhOf8ylHX0r*Uy>;9QuZp!nSgx+OnO9~R!!UFimch%p))s=1SNVly +z1?Em1fLT8T1qtQ`VU}VBVM-N}t_sanK`wVpO-()f+;f|!Hm_c~6x~`?JAFdbHnw-+ +zMdLy-Yc0`$3>;DBO<8(-skj*#rVR7kCDbgd$E0AZoNZN@#PVgg!mAQkP$CyB%&i%ThZ#e>h+145K@pi{31_?K_T5odws?-TioWc4BYtN +zZjuBxI?Gmg)hw&WK@Y5?iR^6>$DxYtWfswC3O}BY<~^bAv~hlR<=C+?uu +zQh}~)<2FRlTBj77ot=K}UA^JXWB*`NgcIY_{W)6lGVg{G6kpwMInHdTMIw9nU;7I&#(H?tR +z*+|xZKI}(orI%e=WgyG1EMjXH{Qv;E8FHu7IkLR8v=j!xp5y|%PC8d!M5W2bqHXj_ +zRIT`O{yVNQw6Ry3-;+{a&1$*W-ko;L?s!mj%x$CR^xM+L)+x43mJcf5C9bk0G|!*V +zm0<2c$%Ggpwpy*zr%orwj<2t;uU)&I+}WhTkXRF9QkGp{`|B5q#cVo;KFiR0Ov^Gs +zzsuSxH;1chw6#NVq9LPF +zPBB$fVcw@kg1Ib1`za!jWMI#61`f`$W98t?Wf?fD#B-cgna!GLkDjpFGlI|TVTI1J +zD-(g!&8y2(ibdy`@AOktT4V1Fhk>5zH0I})mzUe^c5(gB?&PXkl3m_?V;6W8`4#3# +zSW$d=t-p%psyRiWLVT6i*vS-LVg;Hj%>Xc6See)P +zmJeIDtlYs__Pq6Q<`NCYTFwUwHK|E+Ae=%dJgh}#xyz^1Jj>Fmu$o%NxW!zEIiKpg +zS@0%`bi0LfGqa0}v$HcwDS*2p7mVF%7RzbW91Vx7 +zYim0@07W +z?P)ZC{Xwme`QG0-EH$Lc-;HaaPuURXyOwMfyP)02mj^;2)$h2g^lyc1+BDO^7f_GK!Ij +z!-!aG&5YJd8Y9chVhkg;LEUXKvEl^4T~6c4kYV^h +zSbF!Ws;sSwm&F!7X27cQiSB#hbZehnb4isJ+x_5Heu))vyCtpWIBZoWTqV)9N7Pj{ +z&6x8`m6iw<8{&jne~ID>p{(s{L3!EKz67sg?1lT`S0M6Vo +z)%8i$qg`mT4ZBxYzI`$b@Bc={KQzCh5L)@D0uhf{8Liwro(tDlV0jeFIhAj)DEsh+ +zV@tPME$X(r^Yb$^GtEY0FKqeQ1y)zm!}wI%-D_6)@bWsTI<8R_d*ZkSs`)#W)_Rfh +z3ntLfUf{qBaF2&P*hOV$|1oXgfF*=6*a$x*T%qU<{B3xNkSOuHV<$;sJ|K}UAuP3% +zL}VHzqSasy$c#`_oo>6`IdbGk9LGC5JDYdzL|fZ17^+N^<-K=+#WoLv+-4SVma4NH +zTQ0~dR9FT_7iy5*STa|gat(@gEt&U}T%n1-RG`}Hmmj>!vc_>4!q~;C4`4FkzG@L* +z_qwVvoRV^-Xh~jWYuy}Fxz~HMhr5C-1(sJE;nHoNkdmrtL}@j{nW_2Nxv6e9aEea% +z=@VgG8GTjjE;sF}3hT$h%P;yWcP7lhm9G-YpqOn?o5L$VDV%L$$3IVk-Gc(RFyHK3 +zW{#nQFu{^o$nFIeRbhrMGzpl8Fs*fx6c9$tnus+sFY7GAooIoyvsV8&(N1=X!@|`7~t-Uf?OUoL2dlAT27(BQtkl +zfMipjo_6ydPpp)0V{H9>NFJ%W?fqyo*}Z;Bs&6d*ZQKpMz~8A595(rv{V=OibNN-K +zt`N&?V^MbH*A(l(_Kz)5q?-+CHq=zNJ3Bi)JzXia?h#wCTNRUQ7*nET0;y;lZM&Pm +z?EvjJv#*d{&bE)XIkXe7722z!|J>f~i5BeV1v6XT4UorS7GW$vu4T%XS{Cvzw8?#D +z6)D4&VOL7A?2U;uGijZo%Na(HNtG7Mo?(QjI-PdAePnq>Ydstdw|91W8=F4Ma*vr| +zMO&PKALo;Yt&$J}C_>Fy^pLR(prF?rAtrhMGH_>dbH|szC?Pnj0X*N}J@B~eJRBa3 +zLzD`eTctAGskEZY&G+wuYCPrg#+ef=^d8_6B;D!5qUIzP^tAVVd +zqKq&RVi5A06=o-SA;C}YD_M{c5hXfFKWdL+M9SDnW<#-ZB9` +zPFGfrXsw6C;m*!ZZ*x=c^dO4WD55wq`M4|1($z<*0Yu+#yJ8FD^vVT8e{qSFD05i7Z=zw +zsv^7c4TJ&@UCv&PdjwuZc=?q`_rtH^bYzY&=XW?>60?ojz+EC_31*K~8rz%Pi!^C# +z7&D5Qk*P34F%ySnBilNJnW>oUj|G_k5MnSjHP!9P%8F)=qG&Ma_j>)|#wH8~7$p=Z +zMw+=egRJ-~g@{|zkVj)+Wf~MjnXkpbUDlqLVmM*HI5*DXSMkhXMlF=mz#z_1U!d~?X_22EF{85*OD^}lE)Au%R?5U-MIk0a +zWk+d!W#%Ovkb#JxRc%NVDAjJa7v>k_#ECdbhQndM-|ug2>HYwsh>SF2slr+IY!Y_L +zQ^9kEPBXGR`9iPE!YRuDpKjn*{CgP9`(#%~WBZ!{z+Lim*{>dx3PU*d#CBmcHhr&j +zk#6m1QEj=wmggD4-_3BGf85WcL`gM{2NohX0&X;**--6vXJ)$7X*Zj#APB}8BOE_5 +zQ|%DP1oKd;K`7KMdDto_FN>{8b``9n@-7B$G*&6Q4rsPI*x$_@Bbm0CaqGg&SJ_g` +zfj^)|jf{xqT^8QwvAs4HGUu1lIw>QJv}UEu`?8lzWtjb#;>xsLOeyAdT(nPZi!=Ma +zNz`aGW~Qg*$PrqRg60iUW5eN#f6A@#^FE_l;0{nzD +z>5N}W>!d=0X{}jnt&|>zFrQ*M$g<|K)xOe!nD`aDh@@1r*_@l56#!w5lO!6AMp4us +z^rMX}j$@1yiXu#yOfMkcvK63ak6vax%LQ3jOztbECMyE6k_5x5biW#2PD|SRpHi$k +z+og(SBE`t8WFd=ab6Oa=PSDBq_ws#v155T)jv$ISP~2!hps>+s&dyA=+l@w}*=+8j +zuwd+3f&DS7GM0xudn4pI(^zut3tqV^bXNc57s)}F(+o#tr~BK^uiX&_2q0t{f)TS& +zy1bD6C6J74Rtx1I)7nxji@wH4Fs-#>)>^Y>tu$AK`jtX#uV^frv;Fj>YOJA^>z_oV?T8&#Hi57 +z%g!@S0>3F=-^U1*>V*gcElq +zN^9*?j5TX^F69*SK$hOoWRAhiS(d6EBUg|R0~It|tt?bw7M&zf +z97Rz)91cglo*s@MibONT2@2CF#)_1xh_(XVz-?TC6{x^nPua1teKoug?rDW{sfcS= +z@ipFTj$_UNsj6yJ5ka$|n$2dnV`vqIp*g+pnpV35Yd^tOWxQ1dFLz4MPWC&Ivm4fD +z)m`pC2SmHV%kznrTvXMA&}oJ<8TTRKa!{wzOl*Y(q6jHaN;R6zd|OZv);iHT +ziDSdHD2n3kZDz*dNCZ?A0f3nzC_l?x6^7$$NoCg-3$jP2>$?TTJ{lw3)AtM9`)}TV +z5rYs)7zhA28VDe*CMgQ0ry7k$BWyGpjW9_285f(1+_NPd3#{>Kt1P$nVHGo4IP55J +z%b92NJ)_%?&_`6^qURLHlPlMMlg6*gNl7o!H;IbzlG&;6`pC551S4n3eLDY)IO*bTB +z5oVnvI*#Kwj*}#b<2W7+^k^iB#wZp8HDO?}wP}?a3bAym;$DO}=w*%apl`n)JQV_U +zAT(kM0i+RPps3MoblOfUy)Xy@bGGd#{Tm;`V@1tLWpOFE-O6!n-PZW|L>Mo)Jb0A~ +z>NBx5rk#YZrBuZfZN~@xKWQSr!A!hlda|t%iQCgJwINPVMtfU#*s~mNfn$6UzNltwQqKLvEY`0p4 +zJV=-|vnl1xhfb2gP>&)JfjGuQ3jk_u<_!QKbEf;tunw&B{w_2A{e#SPdFchEL@5N2 +zKtUKF5;YoOyH#x1LPSa-;(qkh9(=EChEP?XRknnCQfvP{u|zLVca`0uU51_Wt021y +z0*oB7<@!pmz`~hZOsQ2RyZk1Elf|#9I4o_T@63}qLJU!u0TCHZmo6Len~phTmJ6lT +zs$>ejbPBT+Qd;XQ!snc21%zp*&{cM!Sn0x^AS=ZD#neAv(o!^=X@4D$XccEN0)SFV +zDY4tQyB1Jv%x3vkJC4uk==l9}E2f7d-TiOBuY +zH(Uw;Tef5QA{~3E9>w-itS^OP0sPt_Uw<9%-{rsmx&8df%x!5uZawU^8vYZFxA3K(rW|Ojxedq6uG=TuYE2sz>8&;@#*;G?69Mjw7*BZJ7PRW-)BT` +zk&3gu@n{#?D7M0DS(bxe@~#A!&|Y0$5EOG2rTBavE1rNXE-j7SPrl3)x@;#J9UAR? +z1))3{N0^HT6ScMu{n$#<0ZOey>8w(86D+;|`u*#EKl}E2@4tWly5GB>lweSJ`PV`~ +z2mG(4-EKeRwz|1;yfMfRx4r(`IRmMPQy5j#9(-uW2Ss8AF7MAb*8~*CQuWdaFy-Ql +zXPiO{Z7c?w>%hOa002zSRD(l!(v3#mL~te-}Lvj +z!tF77y$m`pqEfYw%C*<-1z3Tq$qmGuTo_(vvftT5%m+bi2P4Z?Ag91KECK)C;jJ}w +zvWCJ|hQl?$;$j;T&-<}o^V?mU>ejkc!4B*k`^Exm6D>%A}cdtbKv*Ip`$ +zh0tIQWPo2M$ecG;>{NQF5sH#Ua*XU%lC8_fHB){ny>^&bV+6Ln0$hSBc6*h2f8aT8 +zT-AK@3TsYYIWYNM!%T1`yNEN}i9xmKu!YA*H0jwdYHb%vqXk8x7hF5S9JUm@-qvZo +zy}_?o>WGQx5sxu=aOXY-ub-Gl8)trS~9wRB{A33AC|-i?1)Nt~5M9#;jSLbyaQogHR#D +zOfe=W3+htQsxCH7*lM#;T$FfPmIWbC82_4FVy9sL5f30k+4a`{`rY2_m(U6^a}?}2 +zw&U7pV{NJKd*Z!~*4sX@u${(x)8sip2AzA2t*qZj+WRNIeBeUU>;lV-E-U@Ad?95T +znf~Lkk9t*rlk!c9I145YhfZGzki8b`Qu%wjx?x~w{1Rte6i +zD(F~2R2ef4(yCNgZ;UNXE}^-sJI@)pI78Et@XCHsDY(ue(HLE1L|0re^2gF&NQj-~ +zBpt_7A7Loor`Yc^BDjy8U}LPcWE<_!Vnb2P6Kxe`sL(6pCU)@=iB_%e##1`(8>V&FDZE;RwbBip{eO>$8`z%zA2n#Q#cs +zu4~K!>z6PqA{U02c(Y59#mO9Jj}j$}M0<{9lGS5uFsDD%CV)n#&-N=m19Ew*>ksYv +z+~^P8kSXRUwr@|mZOR>Jjawgm9R8TsNY=H+MMZX=>`av| +zi=n3GI!xj$ib_-`72?3!Yl$x?yK;U(U^&5MP*pKYf0|QUGY6r9DG^R{vC~RcH$h-& +z?wLo&XDPM(ej=Rj?8)_KtgiRvm!g<5#jL%*x%)b7L5Cn)wb*E56Ji_1fJizt8pN4^ +zmtVMNfllyYlKjP_o&mI&IdFsk!D>-<^aeg6$~?6Kiq(jkr`SwW^bEP;ho#gKv(_uY +zW!!0h9ER6ip~WTPB_~7xY60RnTiwSRG_X`Nq`4ztg~q(fp*{z>-i2R)V*A0er!OWb +zb|6f?*M&A~W5ZY5>dJ#BE5=5ooxHX(`;RfXY;51>#g6Yj1+uNoq#3J!4q=FBGJx?i +zmQ4fgiWK8Xkj*d)R5j+Um&42GF1V1j)J%j+lEUS=679tLVaSKy0nGHj^fS7%kZP8riDa;#zgwV)hhw7!j7RiOvd>*(~8yc*uY +zvlPEvKV@7~h6vlQ(0L)Cn8#SnGHGL};mtA50#)_8@X8S8uBr#Vno>T=T_v` +zul?=gtxI=3)Ln>SrOE=@q6|Ri9;}t&)jhOK +zNoh1#6@JxR6GYpMv;9P{K~SBYXIvBr%hq}sAZ%RuJN9phmBh{_BrL0MU}O()aWhoDU({p;d)-d_00SV<(TmJhy3jo +z=LJO|6UM(fhbTCes0WO}eULId;XM1ECR{^`k^Yn>$27biiuKD*q!E#8lv%KAg=Da6 +zW!rrMia9gpa(c@k3~VR57z7oe2&8=gTcTY*bJQ97s<|qiMxp}m1ir=BU4$%20z5saTb{Znbu{5r(o3eWTegt@df{J +zXMJo55Cf#&&|MU10%#vuLnSO9PlP!hThYGG|RZ=MH3Z@iZlp=!ZsuqnQR!^k<{2aE?Ac3 +zu`!pdu)C9FPo;e%MS<*LCX_}MwWC>RY&o}H6p_xnhae-ij=sT`wZDt06zbb$vP7+}^2OLrSHidow$x<~%K=A5(hGmjq>o9KUq!PkJ5p;H(5dTG$~ +zgIV%lhhK%+zwK5IKZ@lXfpN_H!?Dmnrg=3KN+h?=FH$jSCv&+9cs=Ofmtn9M49Eu? +zk@#)*pno4DEHKEluE~S=aP&kxkAh+ug#e06LL{+ZThAwyTA!O=MRh4SHum!{c9@Z8 +zSqQX5@8AUroff7QE(6oX?yM~`w(W;FmyIqAd95t`ImJ9zNvbu#nSvKI^7Ek*6Fz^s +zo0lv+v)lse!3pafzABXUGknt9jXv#-&AaN1lC5r;Zn7kQ?8sJQCOE)_C%&k>D5H%6 +zuPQXK@_oe_k3Q~*OzK5A#F#UFe(ZY)m4D&irMAk_cWRMny(t{Am40bveL;Rrv5W{DlSE_p{zWHKg|nl+idaUvyXS(} +z9>dG@2?hKLefr=7f+}(C=jumBMIj +z(LS6FNsK^=U3g_VC?*Lv?eI{=ndD)_*y-rXFmg +zat~Ba!LgwS_mBwWBnY1GXuixNFK9M7oe|owNftij>R1nmtrAb!dWKeo68*kix&0sJ +W%$ntMK9COp0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009ONklHe7?C^`mTjs9V1q2r^+<5=Urj_CXsM_jDZ1Wd;fu5Wwz(SGzHW}4Z(htMH&4GtVbKlB^xe<^xM1`P;SWliw`;5II6^?+n +z6U?ragHFo2n3()3-&~-1;T-cCzGwWKV&DjRw%umZYjULy{DRjBv|8{kfwuwJ^bCQ% +zO;Zo74jCADs^G5DYgI)#hiuFF1dbIT&ekM%*;*pw5jghH)FXoEM?>>=5y1xd@B)Pp +z5gN<51RjqQEDB&* +z0r>Gtf}uj^9|5@hEnXz%*xW`S^N?9u#1b7!z_Hu8ECsiAk;Doexh5^dZM>BvK@zEA +z0dH|31ve|2(7+&80nkE?}v!R#PG)-+8kJOxKA +zxqXGt<=IvTkDxa^=gk4v!x8-YdTYe^ty90C1p((P)Hf5>w5ZXAli%83h}A1WuNaZ^ +z0pWfeLQZ0d*|6_f#1V@1$L@-?0uL_92V*hh6tM%A!_@&bfZ^;?73vR7c!*Sd^qcR1 +z7{q=9VxsRe_AW=>F`RfkgjG@V1=mpe98~8&H@L~~@quyc^Vk8nGpxtq(9$0Od-)kE +kKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009eNkla4C}AlyD=8B}hykPuq_9Mk4RUJ=8($Jr +z64pd)soE(^k;;H7!j^XA5GY7!KG&Ix>OVRd?&VKhXEBpuF})43!s1~7?i}^`#jjcDt+4pD +z1PyVFMbBe#r!eBcFMnY%n+33UBquHg+o0Lc5QXEO%VO)St)5{RIA(7C8~|v;fl4$w +zcxDQs!}oyYr=}VpVa6g#@WYEm{{5&6t*itVmY?9qlE`E@X7cQk;Jrhx+#_g+BP=$$ +zEN&%3%5d~#%;Zr4Eh_aJGJlN4@vddy2>O28iIp&+o-FY_+Zgb;f|hBv?Kk5!f#Vkv +z=)E%@twue#CiG@{Zjs>XfOp*if!}&QTxDHU%1X3eZQy7jSQe4|DSt+0F%sZ+CkR>) +z7IW>f0ytVnx!Qii_oufnAhQdaz)_7XRWH8k>{Bon +zmK9TbnXrZCrwOKxh16@RGd1rP;wXzP(+IAeLdYJ${iz+^iH=HK6Br +zCUrlt&->x?;O(tSyg{!``u*g9dwiN3Fj&A37}fRT=+UqK^79q{3TRUmw)7@0++Sr8 +z_r?tElpM<9#+a&2SHC?SbhlTH5-JU9sixaU9C2{#Nj+87u0*#scplpSkKXZb*TvEU1ZZ +z%<#w4!kWiacW-O@1K@h^V34~f8QjWYo7VpU0H}D!ZbP%4egFUf07*qoM6N<$g4ZCk +AmjD0& + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/key.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/key.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..7a3f563bdeeaee0a604e964edf60cd2facc39b4a +GIT binary patch +literal 2857 +zcmV+^3)b|BP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0000~NklG%47fB);3>yl$6$2obP=l$IG>wd@R>#AL)xkUp2z*P-(WkUcU^8~-I +zhLD5L-|tW$!2`9Yy16$1T)FY@iwwxjhJnANLTl)#P)(7sU!~-n*%KfF04JcKtZ3{% +zvk@}l!QEHqKFu)j-kfsosb@2l@%^Ms{0GK&Xp!#@QgIo;b&6U4>rOlKmORJA&9*q6 +zD?#^d-iaj{ggf6YqGBIwRJt};1g(!oUwyL)Hxz%fbbFiWfy+40LELW_jqH>6k>Bb4 +zjVFBCPlijzL*}O!E?A;3H~Fvu-(mL}d? +z(Znsw%_?(Z#C4J}Ugm{{B?v4ui^bK|^$`S)VPRnreK)YS7yJxHgr#W-rhZ-VLg?7V +zKNJYvUB9O=!5|@) +zV!C3(l7xh-qkahsjR^?};~{5rkOVB9K5fC$aFQkthRiI|;Z2sh6N+hqW0HOarH!mf +zN=SaA`ZaDFY{AcP$$YS4?V4=Vz4Nt5U&|}$(M8VjqN7HcLyksU#makP7*C{kgyGD2 +zyN78r_Eb1`fLC0nd&RKY1cHvOm&`ZwReWM +zBBFD&dE-UfSs-;^{KC)6&VNN2oSy!9Ccfm$&0)ax=6#A79z2tj6C5MP;TYJK`wTxg +z|FyougZTQBKHVC}=BWbi`{Cd1Sg8z8C(`hrKlMe{&?}co@-rv&_ZQcmzuACkuASApw +zY)cFeMWl@RJEoE}b;eIVo``-)?j&_S6W_g9f1dec!}sz{@HQ7IKQ~+oRe?4#kORwJ +z(wmF9YcW%_tKH3=Bt=r%x*wDvH4W9-aq=TK1PytUH7-nSTPoaKU7vV7Z3)|o +z{Uf94ESRdvL*G_lBay{eDD31h8+8+_+>}&upTp6CCct4_VCVCm+{hkpGWCL|YQZS@ +zsWM+S|L-6$xgSGy216=J3$S}}V;W~!XepblDkn*EP2POz1B?p7+Dzd+>B%hUG}i +zw&dCM+*JoG*X{HH=Z3m@1CRY~{)-yPDD>GK!z2~_xayVJ=)*@F+YR2j;x#DXd +z4&Q6n5m;XU*yho#Rkf|R(N!ahuS%~-Uvem$H~6>!j*cxq!|ri#%iQW>VWT=vb`@jt +z?=`g)Ojoj@5Jf1Y>&8s5?cHFjpICp|D$x;g&r#v;n!@QUt?b)_IDMrnd^$->#9NrK +zqbFj{4TMO<;&6`awtS;Q*?u#8OojndsUH#J3AB&UQc|1`JrP@6h~rM#*w_eGcrCiB +z_Bw;^K0@!3QHk+tH*N7ihGMU;Cud@7*E5t@#!)-nLd1UycUBoz8H?^$@}O#b+X?sG +zC9<3`H277Gu;d}fI)X)G#ywfZZpX5fQ!)TR_Rh{A`0u(7CA3s(L9l2D@a?oA~FyebWLRTUgL>D_$vFR9_d-ecK!11sRA;(vOba~TJ*=?AjzyD +zUEbu|)e`Xu&x3;6x0E1^m-jT77F~O|_mr|Yel9NBOJuF|Y8H&Lxcmuum^EaB#)?UV +z?oXJd7{;T-sI4b`Sc|QMJ+dqv(0$vZX0|(?vKg3S*_T_VGj3O{Dl^weGm;qpS?1yW +zmcgi-TO9LmF}wNG)o!P9BZ}L^7%g2~CFxLz5t5uOc6Xq3lBFZ~h;ujS)tLI^!FtH6 +zte}(q>5pX{C;g%RcN+6GYeXgL%Ol2(B7)a#y$r~K(up}EiLw4CV%&UG5uIa}OIQc;P;MS0^&72~ar)o%$|>-V{kM)* +z507@vw-hcmG%znkZ2~)MbFRU2?O}&PhY0U9pY3UnbL9DJX~t{^(%g6*&W-TO-q_C% +z89k(lTe`=g@Y9tX;D=?wkdutNMFNmy@NGpo30d4dH{=KT(k=rcw8VXe&$p?c!nOpI +z27P)lSSXfD_f>kX=snYxMC87cV;KI0qcbl&P +z5M2m7WFc&4sdr2Ry>Mt^l9elCZA%3-TKna;+O+zkPD~FsADF-4GpH-Y@4Lj*k7H9Z +zEiDm~@@B!oA<+j_iz35Wy;}?z4LqJ5{<4~n4?FEb258$aMThMY|Aq_;+{?V%hteKr +z@N*Ek_kj#J`^4pPPJ_T_>q742khio)x(zwr0PM1}DHC0sC;(>N(qRF%iyvM@I=P78PfnVhGr9h3dm1RzdBH7X3Rxwd8U9UCbcqq*i81U?IeTO)7ERmlYK- +z?p*&8`okp%TJ5Q1+#r>gICi!?U7N@N|VMnJh7N&rB!mkT+FVinH2 +zj!6C5X5n_P9`YOqi5#=9sHXz_kA5n;_S<2`tU7BBZ|CPJv5IP +zSi9A=dh>}=l|ekw`td_U>jtgTyZgPoM*gd1#&>Ay90>KLE@#G!fW9DOGIXZ?Z~ipB +zXvP`DtJvxf1qULUG4ftk#%G?))I3!?VIrQmvhrj3fQtc-e|>mJ22A{RKMO8*5qt)b +z_FRcU>89KlV$3$VOAmLZ(GsnshhsfqFO8e}jLetr%OM +zn2wNMn)dFKF-a+0vlZs6^R1XFtZz^gU^He6y4FAk09;}M6TdfG`L8T)#o$ +zY|YYhv&?QvN(tcSLzg@&rGdNFTZ~^>^+yNNUa6~ZpaQ0*ucyW?mDnn90pT2%5{aCc +zG+AtmFikJre5?KPXu-$Th>I_;e;w^{E*kN5!*MAH$iT|3iOG&iPF>X<;HaCExRcdP +z(8O`^*9*e3Fwi~}1img#L!Kw82frygjO-b +z?i|)>Z2S_lSsh?4Nz2{phw(qFb#Ky>y@ySS?XCTC`1HNFjB}Ym-7jXGbEY$BSP>+ezc)h;)ud&0>MXqmj+1E?lP=u+&2FWL3McPnV1OYI^`zQBlwjp +zz$#bB$kaRw7S>r5t3qDBS`;Je$;;9b(dEgatsLjf^nkAyIe-6l^b!%(eQn}=Llv#k +z$GYbKk5w>*ZPn%|NnZi2gCSO3UES(ldH-@f_*xC`|M~e#k{SYmppV61Fv`Iga`<;~ +z9o=6moeOt`n?*lhdg}O62tr!?pazE`Ad7hXt7n$U{g)8$M%Iv% +zeLqF3E${c?X{(lSLIZamre_`WFQT8kx!ydUdK)s&#)Hi!!%yvbGRiJT{@Asn?(0u~qr}6I+3Gwef8Q0ML|~u* +zm-X8`YUfb;!Ru&qO^IUux^@z_|4CQ(Rra^GdFp4cuG8Sevs*gtIM+Gp6IXYYXMgAU +zy&8R%qRwOb@rR>~`1bi?Oo0|2cHxPEoAseXLqE +ziGAnVV+hW~B;k_}u!VVV_q2#Yo$ybz1!&1$5YdI!uA~F}nTn!E)LH~hnDM9llFavM +zZ1?LOp#ggI3JH50E!zsJ51Nw)RTP@PU5`FQ^3~M-bpN_`*s|AhavW7u@_Veobz}MN +z^Ru36tI3t?447{yxjvLd#gA?(IxcfAXjfpt3(;IS1EK!-&x1Cpv(FzTZ;eXiluI%} +zV@pf8AiXFV%phemm&LW5Ct9r7Z;RxW#pq||ObC82?_l&EN6^^8ho4kraExeCX(s&6 +z>5Yhmq42{Gu`W+@)%k;sn=7|c27+Pn2>}boeW#}rb8`b*m93GutG85UysE +zS`?*YLk4`$tAE!fXKZrnb6{3Q{r%zj;$bka{F3<(#kSFR%+J#M_M_V?LzJTXHgef_ +zIWbU#maAXu)u6J8OkRdQ6ae%#*=T{bI90PMY~hoC)M3zavH-fX=cnJ5P8L_&(5LM| +z)k|KYcuDZUb%nlM2@YshqZ47^=%~FWRbMITgxx}WyK5H<^TH?O=MSb +z#}WF3WMNWbi(SZR7Xu62n2`4dj|nv}HDmG3d|rGguwW4_^X8eBiIE}&bXRa0@w&AO +zwx>G8zSBj*_``@3zi!-84gT4<@h252mSKhOZ&ELr>=-W<1m15*fu35}=|0b0uKj+8 +zhe}HgGy`7Sv!8zWeHW5kS{kX`O??0520swKnDm2`u>R41lL^YY83H`36e#JDhSUL1is +zl7tbxnp)l5?;c9WQ9nHw_q#X4XO@cLO}Srm +z^$&0tni4<(Z+>RQYf<>2R5hA!rT=X^v;ds=94xly-b`!y3@T&*dhYVji$(%BhU@#4 +z($bUmkq9LdqvCvc4s>_5IsDSs)EF_737;IO$0Ds(Hq~BJ|Kc{j<5bYG_l!}v+Yi)^R +zaGde$W@Qn_p8x!IuG1_aLKZGa#E{VQF6n9;5AiIWcvS7}?QG>&N~Py14~~w_p_hbA +zUvw2vct3xxaQhC57gWpeS~uD9f&%oBe;CK?8F$UQzq*%nwZG1PH1=owL~1_EAP+5y +z6isYBXU2-(JINJTr+&WIJH!p24?CX>i-YivD3=(cWpW&AoMBl)X*rBTy(?bR)#Vm$ +z9)V9Yi!zvt^yLtlL#EIpApGO=1sJ~Qy_`XID6|w8}1Oiz;$I?@5jhyD#!$uWW9#WVXX}yO{RNKlLMMNIPJiIyKE5n8N9dlas +zv7W8Jp~SeiPLZ8EFSSt_E{z$JU1>p4a-&RXd!2^a&^kOsrlBvNlJ>AUk0C(q_~&Y +z*?Nut=2%XW0b|+!q`@cYlK&4Kf+_&Chft}Et)|N9H)-hasU|t`aQ8qsm;^xgQ`^l3O(_VZbDT +zC{6_r!!d+}`&-gc$24eR0pR3syRRkbAh61O@QK*ZBkNC9J4I^&qOklFL(MvZ+4i|0 +zCaK8zW%C**Mg*U`*1M1z(nJ|=_DtCImHgaY&t@gx660l$Jn22rE|v_Xosfrb)IIrL +zC+LGfFI*X|pwG`BAtBi#%}&SI5Z0bEvPNXEop!C?M!_X6v&BgFt@FT*KP^e+@croA +zS1~a*onYgUELo+h|IP0123G$ +zrBi#-{;s@1b}WD*BipojuJTvvF$nBXGKkt$@q;vik2H4MQGPuRZ60{IN>6htN$k5p +zFL?z-WN*~V>w71{^Z84Q9D-jQey^CD9R=5Pjr%Ts0V0B**^of+XAQYD)cHF=-LHj& +zQ+}knXL%2oD^I9+$r(I(Xvwhai5PW%F6#9CwlH<*hfAQOb30ulfFw@wSm2+AqYS3| +zV|&mt=kBU@E}5~@=hk=gT2y+#`tKPX_J{u%RNB7RgW1NQ$qnD2w%o??BxSDAtwZ9y +zi3m^wsudW>F{G*UR8PBhEOf+6$EOl2A2*b?w2U*8e#!!$LD-hxb? +zG%e8F$5icGW`e258&o0TGYbvKQ$5uJ10EcHF|#R&ct?ppar_0;-OX*fp3Ss18ZcXx +zUGeh2UH^lpH7dEZq;4knDcjlR-h$2XTb;H%!Cxt=P??$SUQ=?FOo*N4^}oqz1%5u~`}7#-8+)=zQd?I`I= +zkf24{%XPs>ho_P$Iv})4()oRWFZkHL8}WVv-F~z?@F`(G!~d{+9ZYs!RmJFAO#1Yp +zdai0uPIjWwkITp}I9_r#HVMshvjdMNeWri&cpWL)5hU>bswZ<+cb?n;!ksfASPQq2 +ze+*!lLn!{{{c>LxyROI{yoH|`V3=AO#jf34xye5SXB`#eqOv+wRKwL +zyvwoI>`wMmicJwiZeQKpa{9fVt*`1%8E6Ow{CXcqv>WL8foah??)*p=p)1Jy#T`PKO2AjUDs9&}*^eg=~b)=Iv47s=( +z0rj#@ud3pdzG}Z4x?)rExLop9B2f;swcCpkjKmbf9lk0*W9zLEXX9+bNS;lI^{M0e +zyR%iU9My@rpt`m;)dEyt!1p0?y32P4$N^0D%PNP=Ro!D@B#|$TF#)l7Gx@kR=GiM% +z{t(c?PEK+>oc9oKk4x6)XCnu|V)tl)$x0k+cNusT)g7s7W}_C}ipt|m0j>3fOAv?< +zuM2K{m5vl;61@IS+w1lV#@>x)_sJYvGiFW(n@~gHbf-q5Uf6luua_zM@%HgZ;hfcc +z?ar@5)~uPOWWblE@m+f6Y?}#jFwi>ApSH;O%(u+Yw~q0d;8QfIGonfVq3c)i(tglN +zlD1&lmFBK`li)u*$&UD?N@Wh^z1r=`T5RJHZK~u^Vl2P}4tLdOs_d4=bMzeriE9IT +ztKPTqqRA=>xy(aMNTT!M>V&zdHcsu!4btc8JCMchC^}QSUL^=A0dI7AlWvJ8ANL=K +z43T$&E%SSB(nO}`{fd)tDd&g4`%t<8J&w{-^=<@-u((C1D|IQB +zQw@j+*Kf9%3pw-em`ETDp1<|pxOD9m&S8gV#a4LX +z>X}_LrzAayvnzvoo=mh$>JwrJt{cqm+ejH$iVb1XWeYRkPvA)zS1LI}-40zY=OA>; +zqGn{)%54ZA{MS*vc7albqH@!Xo^_AjF%&ab7M2=uf^5OcQeS2t@mTS?K>OXl`S=ru^F};y|Ktsqt6$3wyPv +zGOU%_d*am8F+%$M_LCrQ`6ZPYj4i@odfw7JEuwO{h0Pd#1paIKHLjH7#IILc5;Xpu +zvq>b&Q(gB>l7HDZUzrM1p&Z?XkH)%zL1!~wuJqEy`ZC#D0blK5s>}CQ14msGZf1q` +zdrtaLJQUF}`bPNEndR%?F|Yhu-@+i}neFD*b%b2L%a!@EK|bjO{pGDkxza~BW>mrn +zV|yoqFP94}rM3qKml2lZ7ctStt+}4riC~Phl{XfDM2lE-l7V20_40OvTD=oEE-f-b +zutX_n*8uuARw>YsU~O`vTD+;rSr>~w0zrJ&AICSJ>Bt9Ueh!(4;sKy<2aLK)+?=R_I +zx9=qo13dXsz^^HGT%^i|CNu50YopUD6L3FtsWTy3e)LT8P&B8#9!q0#C +zj$(qTiOCiDR#J1C&o@_zt4Je#qBx?pl7#;z{wJj$1FcTBCh=BlRMa0{oNrxRf2Wke +z>-aCJ7(vPOaJN#oe52ggbITIttrUHR^V$M8OmHgcEsrgOQ@p?s31eJg$7>F6eveYIhe +zS=okkBADMd9$Y^n10Gok&E79y$KxwWGzosMx;YMBs@YtAVOwI1X=d&41Gy}Ef}Ag9 +z{X?IRb+?G=TOCK4+IzW4$%iplBu`3B{T`UC95Y{Z8w6_oe5-)B1j +zUE!qsk^)qzRcT%C4-2RU)#NivOG{U!675}SHjHy7eXfLiiV<|9L>*_(lG!w)w3KB^ +zOLMCAtlsIno|=nM_aP1X-Ev#+T#<5@>u1G4;ZF#@3YAGbxgV&ItTaCCTMWwXrQ^kN +zV5~<Q!(-9cLF{U#%1)09IzvzvIm}edym&|RFYgu@vnIt +z3be}k4~0@6{yiQ^P*vi`a;69~#vP~@Y@jhT`69m;lg*ioETIqmYo&$+T8Bs)Ugv`v +z?Eq*&8B)X-?Oa{WsjAo_L6kxQ;5}5h(#*zY>TzTUA$Lm&apJYeuqk{`F&e=YCF +zr!&dj1Y?s2n(J|nLb{4^qP!r@S~?`#^oL+!@5-!%jWn}{(nXc!^SudXy#fX+?>=6^ +z>dS!opvpva@B0=y=L*8PTLiK*qpODL&B+0)Hldz$K>rgEaS#X+0Fyl89;=Iu*l+vzrb-seyCa}jzE~d#+krGGW>@>_Kq7^N5v|8YWrkI- +zfDgS3*B%%>?JyEF6Tsmigw?M +z2UjA<;fyJZ{Mi5L6VUYpXJ{Xr +z4E0Og0{4;s?b1?AtdMss +z;_ZJVp>Uf|FM!8g;rWxA80DqHg{9Xb0OwnL+uC>DBkr^6gWbDwOK&h-RrIK#lba}= +z)$T#i9Os5n!j~_`!(^wG>0^5Ye?BFxXwcxcQTAdPwH+Q#Vi^M+FOKDY{c9Rou4rQh +zugG0a_YFn14(LfhAHJ5iSj%XMxlO$i*hxn|!i@y?EE-dB6U&T0czOUB<{b^?#VPfn +zjCHK1<{XgT6u>rU72fL43!|+k>+=jW;h5N$eMnOeaR4ZCPK#C15E8m)BV6MJhJYrP +zvlNXNr56%Z;9xVJm +z2=v&K>qzk7KM3shnRD?u3|*Pm{`m1_m3hUcp=RFWG;~*LtXs%Kdb7iba6^}#i3Idz +zMj8whNegVZO12?I!LFZkR-v^Yy +zXA#F8BwT4|cAZMeEI*%(kKH +zRAj}eUQPd+08){a*N4XyGHV4)rKL0VL$EUA%^joMJ!JD8ixJYltw~Bw(b5CVW6@HV +z0Dp|Wrpl9D+(}~-=x!lclLWtfuf4kakx6R-v-EhW3q^$#rL)uwumH`u+j^?0}`~M5#or;NYKdZ +zXZjZ!pD4H3H6O}Z@y_k8cA;bdAXEXy0xH3jYkt0)G}dyX&Bx9dF>WvL)6#INEk64# +zb}m7jSbV)G3Blbf<@WvhbkYax=V@(J_(&S(GBuj`Qlji|8`9ee>$3`7lDdY`-#2Bb +z$m;OH9a{a=*X#fZL}1$@n^~PdrZ#8z1}U85zJ@yHJ^Gou8`x1n6#r^g6gqAw;X&+v +z@z@~r@OTXzhiR9c*&+0!OUe4pNj>6FP1_H*Wb@T|03bWVFa_gfjsB{8ya~E&oRUmo +z_`?d$aaQ_CN=2w$yvJ;2Fv0dytum7;f{SwY<7`XJMZIeQ2y?IBJbzfnl`>4IX37A& +PS^*6eUFAxI-OK+2E`~%c + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/layout.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/layout.svn-base +new file mode 100644 +index 0000000..4c3d764 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/layout.svn-base +@@ -0,0 +1,380 @@ ++parts { ++ device { ++ background { ++ image device.png ++ } ++ display { ++ width 320 ++ height 480 ++ x 31 ++ y 72 ++ } ++ ++ buttons { ++ soft-left { ++ image menu.png ++ x 147 ++ y 555 ++ } ++ home { ++ image home.png ++ x 48 ++ y 590 ++ } ++ back { ++ image back.png ++ x 286 ++ y 590 ++ } ++ dpad-up { ++ image arrow_up.png ++ x 140 ++ y 595 ++ } ++ dpad-down { ++ image arrow_down.png ++ x 140 ++ y 656 ++ } ++ dpad-left { ++ image arrow_left.png ++ x 111 ++ y 598 ++ } ++ dpad-right { ++ image arrow_right.png ++ x 222 ++ y 598 ++ } ++ dpad-center { ++ image select.png ++ x 142 ++ y 626 ++ } ++ phone-dial { ++ image send.png ++ x 48 ++ y 646 ++ } ++ phone-hangup { ++ image end.png ++ x 286 ++ y 646 ++ } ++ ++ power { ++ image power.png ++ x -38 ++ y 52 ++ } ++ ++ volume-up { ++ image volume_up.png ++ x 362 ++ y 260 ++ } ++ ++ volume-down { ++ image volume_down.png ++ x 362 ++ y 310 ++ } ++ } ++ } ++ ++ keyboard { ++ background { ++ image keyboard.png ++ } ++ buttons { ++ 1 { ++ image key.png ++ x 0 ++ y 0 ++ } ++ 2 { ++ image key.png ++ x 37 ++ y 0 ++ } ++ 3 { ++ image key.png ++ x 74 ++ y 0 ++ } ++ 4 { ++ image key.png ++ x 111 ++ y 0 ++ } ++ 5 { ++ image key.png ++ x 148 ++ y 0 ++ } ++ 6 { ++ image key.png ++ x 185 ++ y 0 ++ } ++ 7 { ++ image key.png ++ x 222 ++ y 0 ++ } ++ 8 { ++ image key.png ++ x 259 ++ y 0 ++ } ++ 9 { ++ image key.png ++ x 296 ++ y 0 ++ } ++ 0 { ++ image key.png ++ x 333 ++ y 0 ++ } ++ ++ q { ++ image key.png ++ x 0 ++ y 36 ++ } ++ w { ++ image key.png ++ x 37 ++ y 36 ++ } ++ e { ++ image key.png ++ x 74 ++ y 36 ++ } ++ r { ++ image key.png ++ x 111 ++ y 36 ++ } ++ t { ++ image key.png ++ x 148 ++ y 36 ++ } ++ y { ++ image key.png ++ x 185 ++ y 36 ++ } ++ u { ++ image key.png ++ x 222 ++ y 36 ++ } ++ i { ++ image key.png ++ x 259 ++ y 36 ++ } ++ o { ++ image key.png ++ x 296 ++ y 36 ++ } ++ p { ++ image key.png ++ x 333 ++ y 36 ++ } ++ ++ a { ++ image key.png ++ x 0 ++ y 72 ++ } ++ s { ++ image key.png ++ x 37 ++ y 72 ++ } ++ d { ++ image key.png ++ x 74 ++ y 72 ++ } ++ f { ++ image key.png ++ x 111 ++ y 72 ++ } ++ g { ++ image key.png ++ x 148 ++ y 72 ++ } ++ h { ++ image key.png ++ x 185 ++ y 72 ++ } ++ j { ++ image key.png ++ x 222 ++ y 72 ++ } ++ k { ++ image key.png ++ x 259 ++ y 72 ++ } ++ l { ++ image key.png ++ x 296 ++ y 72 ++ } ++ DEL { ++ image key.png ++ x 333 ++ y 72 ++ } ++ ++ CAP { ++ image key.png ++ x 0 ++ y 108 ++ } ++ z { ++ image key.png ++ x 37 ++ y 108 ++ } ++ x { ++ image key.png ++ x 74 ++ y 108 ++ } ++ c { ++ image key.png ++ x 111 ++ y 108 ++ } ++ v { ++ image key.png ++ x 148 ++ y 108 ++ } ++ b { ++ image key.png ++ x 185 ++ y 108 ++ } ++ n { ++ image key.png ++ x 222 ++ y 108 ++ } ++ m { ++ image key.png ++ x 259 ++ y 108 ++ } ++ PERIOD { ++ image key.png ++ x 296 ++ y 108 ++ } ++ ENTER { ++ image key.png ++ x 333 ++ y 108 ++ } ++ ++ ALT { ++ image key.png ++ x 0 ++ y 144 ++ } ++ SYM { ++ image key.png ++ x 37 ++ y 144 ++ } ++ AT { ++ image key.png ++ x 74 ++ y 144 ++ } ++ SPACE { ++ image spacebar.png ++ x 111 ++ y 144 ++ } ++ SLASH { ++ image key.png ++ x 259 ++ y 144 ++ } ++ COMMA { ++ image key.png ++ x 296 ++ y 144 ++ } ++ ALT2 { ++ image key.png ++ x 333 ++ y 144 ++ } ++ ++ } ++ } ++} ++ ++layouts { ++ portrait { ++ width 900 ++ height 730 ++ color 0xe0e0e0 ++ event EV_SW:0:1 ++ ++ part1 { ++ name device ++ x 40 ++ y -18 ++ } ++ part2 { ++ name keyboard ++ x 480 ++ y 200 ++ } ++ } ++ ++ landscape { ++ width 900 ++ height 670 ++ color 0xe0e0e0 ++ event EV_SW:0:0 ++ ++ part1 { ++ name device ++ x 50 ++ y 440 ++ rotation 3 ++ } ++ part2 { ++ name keyboard ++ x 250 ++ y 470 ++ } ++ } ++} ++ ++keyboard { ++ charmap qwerty2 ++} ++ ++network { ++ speed full ++ delay none ++} +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/menu.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/menu.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..e81d8abcffd3f8eaf515449e27b8f9c8480ca323 +GIT binary patch +literal 3079 +zcmV+i4EXbjP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0003pNklaOw$dUjrR +z^uqLB>8Z2tCfv=GE_XUA?r7Q`#M#X)m%oR3SKQGwDm?%@?gz!cc&OKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000B=Nkl&0YI=ukBGDci*@CXdn0P{qF1U{(kqa +zqg*bR%jF1R369{8D_3*5Z(ms;D*Ap3dtpY{?p$m4D~$@fHYx1p$$cZ#ZS)QboBA$n +zVnrixK-&9;GJGis{wHi9ChX!_VYe4ZXj8a(M%ba-+J#(u^2ZM*H6^Y5{`IP``5z>7 +zPjtxwOdk`re=D5NIV5X>*ePLWcZA&?^-J05R$KUJINU_)z;oic;fJ$?A|l6^%yeoF +z3f-C?T{%YyMFAX^hzuIB@XHxO<8f(YmiiY{{j{FYkpVaQ2DN@#Mrd?K9ap+Ceum%H +z5gLE$=6Jg5x1|y48mx^_TY9t2``sBKtO5zOtm-A9j8KAv5+sxe6``(<2dyJC-6QRB +zVaJwO#D|*D=o9txi5o0pwxI+GC7L7@(uXl$Da77LthSb(@IpY>y+Yut1CZ`>WcBmI$4=Tc5}csTX}X+*o$` +z2WomiSG5s_2}K*HOF1?);cugoeN?Gl>9MYd{0T#ZraZPS&CBoo72JCR>GRX|ug5c_ +z#wels%0D8rIB7Qf!o~WLYODOR?Sy*G!I~yg$M#!N(bjS3ZYdx!3oO!5jYBJhXxrT-Z-&i+#qIUC-qoTcpHjgo4nL*6G2dyPtp=y;$sP^qVNa{k+<2!cdi4 +z@aU9`oHLvK_{aL+uS}2{ql98>xE`tKeYU#JiS+t%8}fVinA8|06jks1dj0Fk&%$Cs +zyLK0p_Ct`@@4Zsf*Nk)5&5U!|De@U7_RFdk?*h=<)@acDJUTtu%W8haJ`YvZbA(_vhUpwAN2c35AT*RyipAsyzn8@?lFhX;&2tKe9KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z00076Nklcg88K +z>GpEaGY$qje4-(`@InnRsvlqk=mB=aT}rg~AYW^u=cyj`5Ob@d@1Ju~;PJ9|Dq7t1 +zdqnbn4SXnJ1n3_uPc3glGlZRR=7b{S9^}oTs{SeFt%*#{1vS(yLyPZGlB&1qm}pCLk#VTX08bi +z#E;A?^MUpdlX-#yFqv0Fq#FbSAl*AOqhA2&*y+=SkpHy#c +zF}HyJ#q!qj*c+dvEN`=-8@f%MCg=xBFGaU!{2tL|ZC7jHIHLwR6dm5>BEbLSMsM8P +zv!a#Cea{fE*s(SE>znACkD}8$d$;;d01rWP*|aSBb3{ipm2S^C7|su~Ayq-Q3;UuO +zEjDX!KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009NNkl}Q`|h07@4vjbIoZkY-aWr} +zea^9|t1By8U)YfA>^8T_HwTaV^Ui69Ph-(uKC#MeCc~|@!>tK`&EGJv3ihPngtwix +zeTLgs7VHUbo6VR2w+h@&e*@56cwD(>CAcp9eRm$ff8e%$f!j`M#DOE=*{5)f +z9-5AJWhG%{*>G%sgcWd#+wv7vp=nG_h*)TV2P5D-8wpwPIbXnW?Gv}_KZXoA-qh|N +z2M_A9BcYkcupr@HPC^Fsok1P@rKvLh|L7d(XTS?mUl`9?_48!T4B*pDk2SGF?X +zaRn_8yieeG!nt#dGyweKU1!n|7t02Eowd>FD7<35J$f{?Bm67?Nrkgn)n( +zaFTT3E!q{-qIL>^V`B_St@d^Sc;_v_(4o)w417T_bf}fZ7@nojqEgty*q5d3zd@1; +ze9;5=W`p3!RIf|7=>fdgM@?y>)KIcFFDQK09}z4Wo?XlNtTf5f!|DA+Zu`4z1*JVU +zrc?Ifvyz0iX77G-0dSn5%6Ee4Cxn!3(MX@0SDTl(t>+2uAfZEw`^68rTUgoRwsDyt +zGsakX%IT0|1>Bx}ZO0q@;X#K4?gn4^8jl!VDg^~C2{@|$lH1~6uXJcMg=z8gTkeW6 +zV&Lxl{TY0~+LO^rE74IfWE6K~JCLG(v0*8T`RHs$Ph`>qu;#=z^wy# +z7zw*d)A0P`M3GzBJ&x{Y?i;X4*SP}&)^tsA#6NC;F|p|?7!nYY%wI48&>1!^n22`D +jxq=XIpHfkMFv*%KG9f^00000NkvXXu0mjftD~?R + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/spacebar.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/spacebar.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..19fe604765b984dd1df424c25b9ba0c42f678276 +GIT binary patch +literal 2916 +zcmb`J_dgZ>7suZ>vUm3AW77@Smd(BP3|IFGWnU$$loj2Ztn|T6c2^{OWaR3Gx<y9@7VbcT$ +z4ANnZS9gDI7jBt=ePJ1B&%+>U4^P5!xAUpB{;fig%cM +zkkC->B|EO*WTTvCJIY1kiSXx_K1+?9dM(b&9n$E{tAU!^dXPxGe5tD^&2LK?4s-~4 +zaUX!~roh%OvJ5m>--m{h<|8-tCveG*HaG{I$qOrd*X>f}W4LVGK#d604fe%AM3rpk8~j*-@|o8f}H*mMHK<0)DqnSn1m_CT!FjFu}&QnV+5+fLjPuV$uX +z{}d_eXeP3)d-t4Xyo<>PymmKGetZuPNhz<=&u0({g3@P=TdF>nI2-k?oNPxY>np|0~s+pifTF~O6^ErV#xEHaj^%`_8xBGam@@6s +z_;O5XAX5KLw9|1Som0D2yDj34U4HG&rRGjiW>10oFgYt1 +z$0AKhy5(gBng|sO6;!?b&I=!X`lYPkgO?#TjH|LGnLE)>=eU1fTD&AwtZGG4@^dKO7KDhq{Q=d)UH +zppFQvi~7qB;o5G1C~{AC&s=zdCk^Wqj+y*x!v5@5r^}M$l7FXvXQ4Emw3xJ|^}6*| +zj=eRh_)@X9m9|yaK>xt&f$?m$TwSFJ<<;EP+=<-zMz`x>*X4+%#P{Cjb<5X_owkV0 +z0kPLLor=(o*InyPst8q5<4sjfC7dNBn>3q>ym3r>%`ajPv8+*`W@VC&T21sPM!91= +z_%My1tJ}BITGFCEME!fLOV1iV#a1D5T_pP6ySv<4*R0ZoELQ;(ZHutQVH#E?V4g5Ms%oO9 +zu_&~B-~A__-fz9Tua@+dbTsCa=bUc#Ymghe8~beA1M_ai&LbX4oO+!`oDPE$tP})8 +zlZZ3KIiEW`hixTJYSZvpKFN^BFy(R8_d)S!814V^MMX$w3Kd!C|FLwb0=i#Jzc=zeX8GbGaBLTg|uf7HUwv +za)sME(;6RCKj?QV_&D{Cp$Ta7JC?$l3ealxfIA=Ok2ZJW7YU2ZOObq8ux{6&@B&KP +zZfpr}nF5!bR)&F9g3Xl||1so%mhwK6+P)AfmCO|0CenrxhYhO_Crlz-pcien&7js1 +z&wt>X)xsq|s}#wtkerOrgBsIb=rqlQM)u&dTcamo!!i&EnuggwA>FY4wD4$OQiM^T`6?vBjHv8*) +zsi_(-f4(~1oP3@$TSj^2w@kJG)~V@ttn=62ZSMUxrou7@ +zWT{OtL<_W#b>b*+nx#b4)M6Mw}ph850@NMcSu~U*0ff +z>-y*83E^j`JgYjZ!k5?f8Rz#evT98~cotc?KtKA=0}+e}>^3}SJI5r~ +zA?MK9!})`4zuxfp`dq}3DfJ)rm#R8W;TAi{o?Fvvk4Mum+k?*t>4d0gg+DWH)Yrtw +zRZq(NZT7&QA2>o5MvPCBR<)b8DK6XZL$>RvD;H4jQ8{n5Zu+l>tm~YljoNlKy==;< +zCb{^Lwjx>@B7OGPgz_{fv%4+fzj#l_$MQ6FXIpk60{1`f@6GehM&Fe=rt~#Uh01JI +zHQP4d+%?!VoI=dTkLf#~%uN2Ad32i`n!htVW4ccl8#8!<-%DXfoKMM4>5F5H+sM13 +zr>VK9fA@Ips011M|DUlz +e13Lhxr!)Z7ao$klwv_N$G+=IQV^j@yd;DLCO-#%H + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/volume_down.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/volume_down.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..f8a88dec810c5e3a33ba6d1c1919acb00fa97feb +GIT binary patch +literal 3586 +zcmV+d4*l_oP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009mNkl8TjSwKRP&I6r;ogg6tFF%RVV`r~@A7K5itpWh^6uRa +zUylVr5Cnl`UAykOgRhoi&AY-@z6*QlRl3jHeJJeS8Dal87GznLWqo+>I7=7Qecqf} +z0IF4CYlK+k2mQeU+4XeKS>+!N2#~kJcBx8yAHZk<#_|_o*Ukxh!p*k$3|@omn1JX| +zxjtS-6K4VjM}~$+5u!)G=;`4OgV~_#>H}fhHX=zf9Zv?tqmxwOSBv2umy^pq@1n_- +zfDr{^k~0)cTy6lO2#oqhv4MyKg#CgN<`@@W(&%DgHr=i@X%w?BZ2vJ(kct@fXJ)u> +zil3>$DF390@xl!E*-!QxiUGs6&8!Af{gwu!V(2%Ab1EnX3{$$0xX}tEIb4MR281pJ +zV8nJQIpuQ +z5iwFpHc2es61KXd7O=&e!nS?`46U@fp6&B^Pwgb)(1hgjim>XoGNLOflz6jqzZt%- +zeys;!6jGiSzE;1K0Wb=w(L0PvphFa$p&dH_!)Wm)=Gq{9Kbms@4AUY7z3O@TM)-dB +zJcg@UskNUh^sg1~9ae?C$bD=K_k>M*jb+m*`3|6*p*mMfZ{d +zj9dZXu4wE44Cs)qsCA$lAOJ%P4NGA_er@MnA|#(7oqD1NAVWk9z4YlX>HuIs@?fZ+ +zS}jNt*aQkkg5lpcvl>kGTOJJGP%wO;a3mNb8YX#H%y6Im9Bl&yspNBOL)h_*o^r>2 +zv7eA682k;|dODkKvtNi5Qw~?V&u6P^VL#X}Xi6|xn|84Q;c{={jxiq&NR +zh@_fwt%O7IF6~UZLx;TQeIgG}RK2D{?uYl##F>J@nyd=ab@{fi`~nOg*&N-Ym{y!L +z`k$$*@FF0T(6qUN5eG_#t~>l6P~K2PNqJ&T>{dE}pjiI~0HNr{@I?7%OaK4?07*qo +IM6N<$f_nU^82|tP + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/volume_up.png.svn-base b/feeds/packages/utils/goldfish-qemu/skins/HVGA/.svn/text-base/volume_up.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..940457f707bdc589883be0d8fd7c49930195a23e +GIT binary patch +literal 3856 +zcmV+r5AX1aP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000C#NklV4_&{hN~(tET$+VRW>+$Ff??-nQ+IC~zYYtX>l3@AurbX4GN^gybgzVOXiKUz=tFwAd7Zh!KU_k-o;DGz5&nX;F@J(}m&Y +zFsFA;l+Wq)a-2q#7u?mA>2zh)AK3~JO)j((?PeJU17B=nJ(y;q-3*8!FyJzR3WOUV +zu!~h87ziqdo`utF*abUTnqUmgi1KVEoMyu=*vaw$1HYiKxDH*{!Xt+V81Z;CzlNyV +ztq;ahM8Q~M6v~3p^)s4Z1182;E?|T;*kl>XN}{T+gK*oWA4@S9@`(AiIXZCQi`n~4 +zoD*d#rTYV5Fq-NYjSg%#ls*?mov)7*AZIcRhL&OnjRnGQjHiw`*mkhEDA&Wh&FyIh +zLrXgy_4yohoM|9%zvLQaTeMLM8=CAs`F*#(x{VwRMqLFU&~c`+K#UB9hw}AgPJX>I +zse#$N`e^!U65S|gw5Ab{;>ko +zoL($-oW?R3ffCZs)$YnV9tIf)S-qCaFtw4%6UX9&=Jjh7byn$C)dNFaBGWW4CiS6puT|U +zx*}Z{lfEvy8l2gMi@~BAC_6t;FIV)7IyC8XEd^^K%G#Ng8ke&bxR{j( +zZg*lZnnLJM3yWih?(6n^lI8DS^BN3>q$4a_Pc|43LqbrQCg5U}9p%Qn-pOD{+U*FZ +zU2ZPMT^xL}big<{(GiiLvy)LM3r19*ipNg_^Z>(-=o4pbe$q~PFc5sHt979rDW<|5 +zbQ%K#%07*T`BAac7#O7otA_LxIPBusqRMnNI}@&`9d^JjR+V62^XdHGU;~17!w$DI +zoh(f-+yKdc4pwlRc(S}L%A+Rv!qE=2YyOads7^lDO0eEKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0007+Nkl1*`XmJu0M2A|bqg}l%TAUitr7j)(4c-P9MMp2AvqC39 +zaPF#5M@1K_PP!;Ki8#jL%PS +zjW(nw)ummjy0lf#U!=Yc#(N#3A9`$2kt^ivtd>wA@`qA&Ypdcx($Tlnw}{0+Te6g~ +zf1t^Y2sx|Uxod1BY|CWs>A8gCjM6u?c~*CMM4$MIr`8@L4I^J_FUJ5JjF=jYJHJ&>F~LaVugW@Wni>8m<@=p}i(Y +z@Ei3%g(&k(QmA531T_TDX+R;+RxM0&u)`38BB%v9MQ)V~!IdFgF(^XZD@BV!pq(}P +z&cO{+42lpA$gO`{)<+1mugX~tDoMdgk#*+Ui_g&wbJxCeeRD8LdRAi7evo(G>I(7q +z_Jd6hB1s>}wYM$XM2OWJ4jM^6-kiI(OlVK#`NA-w0XPGd|B~9+aIFxlbq*5IaHXg> +z*)r`fOFf;DdV9ygBIyIUM$VCY&z9+@A{D~87YuBvCXS_!EJ;P5mxugFoZuzNuR~Jb +zE~P%MVN2xtg%h8@A^gAxHky6lg;N{=fe29n0`AUbQ(FE{x?cbQ0RR630Q0Y%YcH3| +Q^8f$<07*qoM6N<$f_jc(fdBvi + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/arrow_left.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/arrow_left.png +new file mode 100644 +index 0000000000000000000000000000000000000000..113e58427aca1ebce4bdc7bc671e8e4be09434ad +GIT binary patch +literal 4122 +zcmV+#5asWQP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000F=Nkl +zmSPD)BZ+|oDg`?ZN{BWdpv4i4CNzpiYccb!?s~`W?9Jcq%-0OCWPiSS`@Q#O-pros +zxV5mbzn3rsHJzkQe<5vtg|u7OWZy|eyoqj^CT-U<`g@Q2c%hNBJBy?}?X|>*LMlbt +zOcS;6YIFlqei$F +z$bch5eAEf|hMRaEZHb4|j5^`}S^ikLPFE1|PFPr#h$ZlRcSbcMeqc~;!lOFeWE~sg +zPCPPAUE*+Q;byZU;xV?ND$`Vr)D6~fvrOWh(ZbDy1(W5MNqpD18Co6`kXZk4GbHf{ +z6HS#CU(0Xw3pYa&FK@yi+D^B0xXDO7oCmKNpSa`hSgCN6k$8S%6=tD-+xwRaMoX`@ +zB!&SLqU9H9b0YyQ9tA)aWm^7LK#PYqAwjSx4^AapQ$?_h)PfBKT9KBc;r8K*`*?oH +zhxqgX{h`T{c^0yCYH)*w*@u3kvLh8|CrCBRmejL|UZa`&@k7=#lpwx!+FE)s>6o3R +z64GAo8B0VpsaKZlL?V&M*OB(|GQvP!XHK3ScbZQ4%n51vmv1MFCrYMEia5ec5a0SD +z8pIsG6LWrOxcCJM9^xDBX>N(XDe>?5o_}YTw}vwkuiJ!%m+-?{G1pnzm;Gc(J)Np7 +z!V!;)k}l?`Chmj-yMwBpG^s~4Bb#tX+jkTbZyMn_<#WYJvj}$*q*}v>S4}u@S}=@w +zBq)cH +zh?lodi(Va&-d9Y#lUUT5)d8p%lJDd_#LFM0Q`-T~MnU6>iT4)XXxjm=IZKY}je(9!P9v +z#p1NU36vkugNXAj-1u#)7LTlFP5<@&dxG0!-C&QgI +zTY6A^9K7tCb6w3`yO~kX8|G>S&cx#tdpT={_9I+mFTxd6NroFiiX7K)aVhjZK7vd5 +zkZ{52#4TJ5UkE0tb`s7PuV&Q4#nq#7&m_5Mb-q2?9l$SRS5z&G4v2~bAzT!`dxtDQ +zg629jxAdF5{q7U6{Rw1f^D{;OW%zd>i*j=5JAYqqi*VW_h)kD~Rc2p3n!MO{JD +zPtGAsoB2sv*<(Stp0xdHbOpk<=iOr81WeIwOp1P@h<#QRQiL}FPMO!xguLxjBK{#= +zIA!<*NCay~DBmb3s(=KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000GENklz)hnXmZ*2mAPav)^NO=DQO& +zZ@quNwn`L9^D@=-?NrY;P`&$^#9XS>oc81d)twiquFg{3!aiU5PWALN_H&;F&qdk> +z81Vh#pC^Z@?qxsk-lKYQo$6dJ>fjS{Pgir7jqGf&|Lg8%206`OH{w?aG%e3@STlv&Qm?%c1fL=bbS&8gKxXw_R+Ehv84C3 +z+Ut-89wY4bsvfslzeDwtDXQ!K#1wpIgZt6fMQ}Y&r`!cxWHF=b~Lt!T^Nb&%zZ=M?8XPTR(}FzyRWca7gfX9_f~*@s-|FqV6vs +zcwC4s>7ww0tVa{@s0gbkh!KK10QW5&JkrI~HDaWo5)MBXln6G`O_v9A?&Lxkc;^+} +zj)i{I#o~nycktdZ?qA{r9_eChzlG{6=@@n=AA!O1dPQfN +z_@Aq)DxNMT&sd0|M*cslOD{|DjQGrgg~ui6ZuoRHEis>Sku4}NOY>ylH*2Y$8FcI1 +zBGm_77G@AhFCXLM;fq$hpTBl%zay5(+FqqUV+Pc%--T}p0m&iAtd!iFnGuz8}Xxi)&NKI +zd*R?q8NhTGl%Gtt5mLTPM%S)nJ)78u8fOfo_>Eh;0>)c({=C +z4+fm|fviE#F}q2vX!^MIumpIgbbseA;p^G&F^QE#-reZYR*DMt7ZeHue?7(WYwYst +zw$OM8dL@&!5{xaIQn%D>UU=ad1` +z&G>(Jhd+S_m<;^t(kFN)-CVcO3CZt#4?YkpoFv1tYE#oqxR%+Wuty3wJNaSFEZ`W~ +z<7r+;3p~+V +zaY0itcqix%s7*KF^3b?QpRXsC)URe{Q0{Hve4~GP7d{aI4?%h+s#6n2_KObHzFRZ! +zPGQ1njt8y_K@uZ-tCmDWB(IN$kIk{J9e#I&9C#|^ucvf%A)12sj{H*Kop+cE9?)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0008eNklmHRFjb(Auv=Bu?(J5IBB2f`{{S08 +zS;zts42X{|ZNi#LT^a#Pt4dU5K?O!Lyn6yRauVC`#ZGd5%aNk^BiHBHe)rjVG?Wfs>2>(gE(dVy~v&r}D2_Ei3f(%fejTSpM?+J3?hC4~xW6oz$ +zZx9%aXf)cYXHnM>GY}Z0uq|sQ2nz_MPTH)M`r6?qU!a43ofT@LhZ|h79sj>8Cz9FqkhWtR=i7eKv0apIO>& +z)on97ihH^vPTUa#z*qXmthU)5-}$JNZCRoN_z1qzkKsU|{k6+ypoj)`+kPe~rGaQ% +z;`p>I(Qyl2G`%Ievp;NoiU*gZ**6^y1Yb=hVF-TJvqu5}_$LM=ojyq@5V$AgV4E}> +zJa>M~X(#)`@k$@tvgE!G4vR_cK_=M(pnbOD`)^LtpIj`8FB0oU-U0vs|NjF3ruWuc +TEP9sB00000NkvXXu0mjfMx=ux + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/back.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/back.png +new file mode 100644 +index 0000000000000000000000000000000000000000..41034d9105e4fc077ea8620862828cc0e76c7938 +GIT binary patch +literal 3564 +zcmVKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009QNkl299y*QtbSJJNx8&?5)rC{LLuw<9y%F{yTej +zb1HpxV`G0$L|m7ay}iG2UdH2m)Xrq2w}(HyDWhQ!*k3ZvtjKsa>+_5M$k3u#FHszm +zu~w7u=)-^mN2X>D2s8l^+qO4m)f_L50Zmb)|1Vsi0r)IqwJPJzy%&>K+#PU9XF6%wI;|-4?9>z`M_Q +zm%yrVdU~26`Vq?Fc8hTU +ze*F67c#%hM_}W@7o@esC|*qNHH9>RzitAYO7LeMTQfGkjQOiAs$|A +zaWYz-lR-# +zoMVVys*$z1E?fIJYwxqxq;@W~iM6>+Rm6;_+%BJZUY>kcAMUdW9Cp +z?`}Wg^YSbnKp$4{COuBFKIiq50k4Mx{L7oe;qgeYt$n}Wpy&n!3j4D>blj7I_0000g~bI$9W*NOK{=tmVl007YC<)qXB009aBFKLipfUhuH4~BrBP#ooST>tNKGdKUqo`1SC&SaL!dx^MP5|L&kX=nfV|WPjc*GFt-6lp+MYXC87>axI;cz< +z_~GW7v21al%?0#F?dv?lm!}h&=o_~jS?T5zX=I!O^O8?~h{1mKaYy53);oya_eswe@fP6&P#wLUj0Vr +zl~tQQbc3oR&EOqdRe83yH8jk9c^f#VXebe)S7ul;lZ*F5JYM4Wa(%Gy8YdV2ozCz` +zk$uesOH^c)lzAD-_y1=1iOu4aYvB)u6_kj5e+@{g)P*BNEr;t&aUh4zC7Nd~N_Ne! +z^HPs1IM{|v?8)4m3h{rIC}A5NUnER4lhV!WG3AJ;G3Aj>Cqc8}w(z}+dxi0{g~Lk; +zug*2d+=>{h~VxEeDIANVCXVkES_1scy0AU=gV8dw9$21m73qS9Q^v} +zjZ$ya&@oX%JXUF$V4M7owI!uAtC5Buw61B +zv-1UhunZb?=s>)>7i`|%D>JE~V#)rl?U%l)XXdfTh3C?lD794FO^8(6#tYbwc9oxL +z5mioP%w?Kn?!p;NVcARz^Yft_f^S}Cz0rltdrD+l*MGw0OGAsa-2M-4TB7OwCH%?7 +z5{rW3`;b0{-jC2;W38dX-aFC8$&6;qel{66;o(}24a$JmF%ISGAscD|+WO}sny0a^ +zMx0@{PM(dpK|gg+<<-M1TjyEZd&l|GMj8olnY@?!UTP +z!Avrw1F4Au#pzZlnA*RH>zUra2!xxLac}>bbUyX)F#pQexYRpS-7Bk|`wJQu+7P3{ +zK&36&0&yGs^Y%bNK%mO2)p60R+kz_>oBto~vbMqu`CLD*DI)91Z%aZG7C{1@u9wWSgRx+rmt^r +zdA7;&jEHGc8fGojk;12*5`TS|f9bPF%L=qruuT8hUF18{M;6$^6(rwK#ASOVTe5oo +z{6PE|)-^lQIH2VO{-I?Ks)_Z#)FNISUAp^RD8yxtdn(%Oajysd*DLsH+#LK{pK +z!iuIVx8lqiNQVA+6~ZI%uheeTek!=Fs1TgJA6t*jo@Ih&ngz!( +z{nRxZDA0McVo0Z2<+@{f)sNqN1TB20UW81J{BexFz^2Un??I3U(K!^}Du|&$_61*` +z_91oFro6N~Q^>{A!h-%puS_dmJ<(k~B5?un{;RXb%rR2N*jRTkrT{;`@Z#b-m!&I0 +zlF=Ybm#P`z<{E=5pIJ1GqL$NP`r`z8C}~*6;*J3GXC}lX-H@fQN-j%Jp*!mf800O- +zbie3aqcfdmTd>$(XJ=Z(mvXhmPt8q|2lPDJ+@>LIr(WfVZ+8^dyl<qb#?XiML^j-Jc^d=8P!SW +zXt^Z}asSOKEe;WpN}JR#F3ru&{ds=-hdwJ-vGgVVvtIe^eRv7PLj!xPzrm&uX3sMV +z3jcY)LBHu^grDF*S-NoSa2Ol2!$NX_~Smnt(4rQyr2raXwI%K=^?zR0nCO_r9kLxcN{;+s*s +zX8a(0Zs;p@=Xv87&cP7$p+YR>K^~e=&9Tw+bf^)BQo?eOBgGs!N1Av!69s)^QkQ== +zmiaASpxpjKm#aZjx<^^zN%)I|xyUK0D(=M(mE^Aiv;w$cGX}c)&5mnbH)n(dgoGfu +zIQ{qjP03f)>eQmT~{|M +zHAuvWUHDjW=)Cp2$}&eI0{Y@(0)$&_kh7f1K)P{IF5yg5*z*IPhrHnFkaE1wrzVCZ +zt+fwoO+x4f@%N01?)r`OunU+E!C1U2`A#wYpxOM^Ip4U#bl5~P6Wmh-Rp7RDAX(?* +z-N8^^KW9e!zk$vUQf6{I_DS#i>2v*JTitm!0qx5WxJO9w_R#DmD(fp@ +z?S9eHg)NiF#@4hiqMMc5{~*biin@1~jZ%4kv$GIvjJwsLNgi1V#go^(J<6J@dCtt) +z@mQLgLI~`nMvJzUyLyeNu)yRxe*5bUQ=!6y*5`*h>#YpsWA?xlmQWHN$pT1*@ +z{k?L_t}HR7m-hO4aSCN6wK9@mQ1QI~^+;WLiE=Tl6E0on0RidS(~qHDLeO*TQP}V8|fq +zX3RYLqo$!L)2x$4%J#OxW!6AwRBt*%#wQI17I)U6J?@Y7vpjTBk?Lkg4|N2RcUqE= +z_iBf=&7Br<7usJx3DGnX4C71E<+5=!G{tt+DmhumJ7Vyt>D1LazR@($ZbCu#Dz)*( +z&4%r$gzlZAO7lhs+IliDUmczKS>Lucw3yu0Qn8NAjin35?~bUS#!S1^p{Gb6 +zWRWQEV8QEARhw8^TckTjqTh6Ozn$l0Y&qQLEbTU*(eOx;x@7Q*@FwcDYhT{>g5jud +zf#!DIs>j?aCx!3ic$<|urEzYL{e%*76(l^rxH{lc%aBWWn?y;TK1=Wji>KXi+lc8b +zVS|l2kZuR&5)c@(iyoi$<`0+8@1ee%9IRLuToTx#F5ezOK{IJ&^?H1`iFZ2r<635z +zK=-N%*{wX42_^4_)K$P#}?cv0T@PF3dW*ubw?#ONr*)Z;ZAna?(;x;_63H;qsD@&a< +z&u`J-vp^VJ|L$6&>5b3xq-I@hYQ{YL9aqAW=PcE%{vi0q9xImUqyD;)^IPTKiQpDx +ztqI-RS$1(MXv>Nx%W_25s9>BTnyR7CZBdCTI~$we#+X~QCGR$D@H)J#R$pJ=q2;8n +z8wpcu;n0dxysECnKpFQ)wpATQtRJT#EjDPeVPLHwUfV}^WnE@rHZ)5Z$KnTZp($8gs{LV~2CA22~Rl@UoJ!oC^ +z@s?m&ZDQ#^!kgtFMh@|-KW8N+C4(U{)hD= +zOI}yDVsBn7R&&(TW^8Sj>@?0)DJ{lR;)=jcXlxIo+hRl9Y2c#&c$2k?rp_GuMQTD( +zG^|1bmAQ3YK~=cRxlOrrXAp$<4O3pOiA@QG4wlA*uCu59vf>z9;^S7W?VW;HNVi>Q +zwCKfVu=xEN6bcoMMQ^fg|H!aCXQV{-x--q8&Ep}%z5Jc?$zVSP7)`@t&Zml&>7v4o +zLQEIo+(laI+*N$SUq5EEo0V3lOr%EE!gb7GqmvG2B7>Vy1E$`p(ld(^_TtXesLSN5 +zAX!&r$|1hs65^e|1J_w+X+-kgrYo2Rc|nXnQO3jy^$;7UZSARdd$=q9rJnQTc&ICk +z*CwBfYWsO1bEvu`7&6&RmWDE%y=)li#j5t!F@yIgKmER{UHCZRHtMxaOWEdjs8=%M +zeEWb8)s#%Z!o{CYe(1Fo5D<8}^;#*3|F*VUFgsSNfw86;2AihpYw~2#WoRw6JDJhR +z@F|I`?X%(iS60Q)9Aos!vmpR=TI|K&x;{l;V&?gOh1lW!w*niva*)z1#;D5JxeB%= +zNyj6rrNgelbE5AFDr+fG-AN;+sWZ<=< +zHu#WQ?$0^LDGetBH@_Yatj06N^h3=o;-S*~MN<6ye!38lr!NF5+B}^u4pha?Y?rR$ +zeOvTV7CPxHA|{F;g1C_rO_i#q^k$`S8OH6Qx`_oFGbOh?uf_Eh=g+$o!eqA6hx5J* +z0`%l6@{D}%MzfHvGUq*Y-Ye{{ADWfBWAT*Ft?ZeZka^x> +z;GHtu(%F(oF5?)bfh?a*B%Pi?7ncs0P7UVR^3>;tMl@P!cw3(2jr&|q<_*u+5WnnK +z{K)`YQgKKn_v2o?yE^vUsd(I5*kYZ{{5DBW7Bg!hkIeHUTb@j#v9xw(!MuxSzP`>= +z*@mNES4CP^m?W9<8@1JIB#O_fqA;t~ocKeLs(n0|7vI%SPdmyYD5kCgGtwq~-j4jr +zRm&fv%=6Yi7NN(l71io1zm8%3*TNo05x-9NnaHjN-bYj|pWh5Szxm~J({+QUdpC|h +zzdEsERzHXR(E9HogMIQeyb6Rt=DxO7L`5A2!ZRtD?94={WYJ4Knf*wYF?us!vL)c} +zOEgk5cNA4U+c+OKVLLaO=joN(9=iIKVhG;XUe*pxx}S>Ou0 +zf;R$3d0 +zQ*n2GKP7$@-kzMnYDn(TENd-P9(IcLxL#IPru}$7-hO|Qlt@4j!bI+#Do~f8kb&PT +z9Hl|F&jfcW&DN1tbNPMXRqw*4&Y_SHL{;hMB9%Fh)Hi- +z6xhp5QITlYAB1&*boCtcnR(+Xp}(+$9!6%ISovKG={%z|vGFV1So({6?VhTZL?urX +zg%Uw6Co)+lvLeB-jU%%i@mt0AfA_)S2lAXE4xdql6v#x>u}Ei(MlQWp?v{C`g3Co? +z-%0Q&&=M74L( +zWzTtV*=5MNcacLCavOl!P4|Uhqwe)fLSS`3c(L1Jmn~ST3!fOJvk!(Pp##Z_k+EUU +zD-g@rELSpb%c;yw#7hja7~I6ZkszY^HCSKju;g?2bnlLahNk-NCO1JHW^T!xqASO& +z8{^7o=91*CFw;AN^l7dQjJ46x`lrj|cTW?)hPI^PdS%L`AWptm7e6Ye(3_Vk7tw{6 +z3Rj|UKad4F;S~w;DD2yMdpoU)l1==qho{V?fpN_T0GcR)c<8)yO +zMFTJ#Ed}e0y~GB`IS|x`=%*?1KO20Z8`r8&zn-pGIekUNJ}>F<^s(4w>mZr@*_X|* +zZ>Yw#Jw{wyd^lA3y&ITeKfT}o0V_Bw%q&O4&6C!}qEU-0#ht&Jo@c&8h})IC&zAp1 +zw{3EK`;uuA?+f;VGz-7LpAN}n5@S)r2PX}*hZIDghLr@@*sx_6zK$gt{}+HlI2n4w +zl*aort}fa{!7_?Fv9_v@E7oHDBC=it^Vj1*a30?7bm*3<_g8sQ7IsU4P1}ExTby<9 +z#{%)2_;Il-6G)j7W;SeQ!E%rlL|KJ#ZWl2F6!vGU;k0UP9#p|BX>?~NInBCAC8lwp +z5|Z@3W_&2XAj(#nP#JM^Is~H-+$f2!|MzIh;JFbgP+neM +zOZt^({?@E7Sto@_{lRy7Hz-4;vNisi_28nL&PBQkK15^|$p?4zkVhVX#1Yjkvb5n| +z@~=DcMu}3BWV+Y3dY4ZaobUTyBK_vMs%av;oXs)*6a*TgRW|KVHVuun)>G1Rmt|@s +zi|;CDRps~MM>X3>&P}~mr^ebEJ%<`mae)leX5wH<#D_@1zcz;`RT?E?6MA}(8UoRk +zVTxI<5)|Y@jlpy%1kKbicJV29I@_;^|g6Tg{8u`AfCR0Dax!2I?-pj +z{kLvv;4htdD;X3&z-!@^??djDBW+aN=?I-b$musZAgp>p;lv=p!ZHCtkfpU%($;)d;* +z$*?WE2fxs(^yF97#&J@aSeY?x#zuOh5=$$$os>@n{S;odCML1$)r|DjJ03kFn_J8g +zA-ORLb=~IDCU=)zo4>8B*!|8_pUw+@`6fnEL*~E07kY*QWA~7pDhR(enG}$^37Zt) +ze)W>?Htda6$q%n&Ag1~dGkadyBUUEN(uVEoB7&tRTk>?j`XiMIwR<4d4u1v1tFa|S +zuKHm=ct4hpCtNY?FiQO@+n1vvkkXxUIrP?7i^!(#a~c1}-A{OU3k&M*Gqkc(Ex*My^n9BwU^b +zw`Y(>(eSoHiDN)u*<&khMTtil)~aH;E}ws>h(tT*y&FTzJW`0QbnX+fba6F$=0tAU8^QNAfMN12J4y3w{I+ +ziuG?MWXO(?_iubpU(0*$V6IofbZrk8KNP?V8T+bsEhkpZ9txW^9r&jL7L{R>@3LXlrWpsZ$rhFyoohtS5s?)C?Yt;-*<7d{8u- +zff$1xQ648w0hQLQuI;Jb{diezum=BzPA{dyIs61G2wh*#L)?!Wo7k-VEXnU?gqAQq +zC(`x}#BNsBP3eyK`ysv?2Vt$BgWAsR?{S_o^G@CHH#ly73FFkuO+I0#NrO +zfBxB0>EPBa<+HF>4r0#NnOtxy2+nG +zqEx_siV%eUv+}dHR}8)f_e7b#04FDhz8SMnn%@3f@1QKyF3|iS +zeLS0dlHVjaZfl3jde#kIXI!@#mCy&*`A{d_uVu-}?aoXkZ=*D> +z&X7!!dIpbY`bphVpu|bBk2`pEM^lNp9DUcWh?N4;T#X{q=^v6O*YNn!cKcv!wzuw( +z`1{_Q4nhU|#7D(0T$XgNu$^?zmbq`-|l2z1`m|u-mIqlDpZJ +z$1y0hdUpWBPB5j9HS8-AG0Y1yXrB&!!XWU1VKIjE?*jlE2Gs#JEeKGfLRe|sOV%6O>zyxO +zq#~uaqrT{zo_!r+b)^y<2Imi(8Uvr}xHX&96JFk`Vf73Oa&EkX@$L~i1n;scz0G~< +znH=(ZP%)pBIIY@(8r>DC@~33`t}sCzE;rXxnw=UlYU@*L7yKToRNui3Bbvm>`>jp> +zdPLU{H0M8do&rZR#DN#q?w$cSbKYOx$f0UK5Bh+xLbSHembG*NYww( +zp_hi2i$307)8H*|bfw|>*SNOz-<9F5Z9MbAMTGh_y~<8Tyzkd-CHy?`$T4T~-LHc? +zOFRX&R{R7DIQ<_Sw|5!ACt((zeFwix*H-Tzhr`je6OoxI_<#A)h#g$}JvEEp?^Y8A +zVo{(BvXxroDdUw;g$OSh7fkszEUnC=G_^7zgRZQwOCv?__`St44{h7Sw^hrb)?T(V +zN)3V*u3AxL_qWj@q-MkO<;qss8B9Ai7D-HANjw%Se=#=Xl3cq3Nc@eIjm +z2QH=tozF37wJkld1J@rJD%p*j8O)-(khiuuby*wa_~LCaPbU-Ry^A{$5fNyF1J^F5NwxH0R+JMhQf0N0iEqWVOk&a94b4lMYMYky +z4CU`=yZ`@P00zicvOB40ev+hAH1onUu&l_^8Y)99txAnsf*9J*%7u*e$(+9a(UNbd +z7FZ5m%!9rp +zTZr5%1VXS9G-9hnri0%*xYn{6GO?Nn*CUnIW2U~92r)+~>s(>xWz4x>r;_tDO#kZ0 +znnuqXRmg=0BkB;7s_g6OEB^Lt>E$O49Va+l)u>8c9bAtYU6(rU!}-m^a>8gFZLZvS +zHrAEEiq~-~WL#{gB`f`_Yd9(_`CDvAUd_lPyB_O?&Vz0KC)mhw>jgYqv7{6oZCJ_t +z4I{*cE`B~(jVHc!%*wlt{}*z<7$TbGgjwP!vY{O2&*=Q#Sbjy7JIbk}0OnA(L6Z?S +zofu_?aw^zJT%dB_aZrh}>vqI@To#@`;NBmVW#Sj4uyZ3y?k-0_g+DT3?i~2+a(F +z=a=&ZM)EN=JJc^68o=8a^`Dod(iKs+FE#<3G`PR38 +zoJH+%^#^96&o54;h{81yw{fE5)VHCbv)t +z=hsb>v_NIG>@7+~d+~Brs-V(UFOBVc-om>1&mPyAMF~Xdhh*>OrAF}40By8r9ASz^ +zCXslf@i405_>j5$;PmVk^0v#ud8LT^F>yP6UX27Yg9%&SMNXZ9E_A!Xb!5SK7a0)T +zB~YAFv9EHym8X{0+Yw3=dD+0zY`64C^*A7_fOZt-TH^~lPsLJ~V~xPyrDuilF-gCZ +zON8abO8LS*so}xR?1JQ{sH$rcYpV2!^CI~Nzt8PDTlM-cwpd|85gdhSl6jd430<_2 +z#~9u)>lyd91QyLtZ+CMc{|TCjgT_pTs}Fhi(y*3RN`#qnz`Su*O0g3uLeAp@ZbU>x +zYID~t=23C@%P8$&rKNEAU+1mA>6-&g6bOQR*b$-9%OW^~1{?M$LjEoQRan!KeXC)T +zvm?}z{p%hVZC)imcQV#@p>X3a>p+z4gKJs`2M2+aQn;3aeAj}gAF&EsBKzB6ct#G= +z`is>X>B`b^sM3%kjiw?G`&NhT)zPR>NYm2M>8W#*oV)OELr98QTm?Tf#o>E=W~tbJ +z$@g@K_6`nckd!xzw!v|NmSGoFWrIlGhx}=;fYq9BBSoM?6XNHP{k%$;OE#>qs)6hN +zo1FI(RyD~?&{BYuLMKsK?f9d=s!4C}SlosxdM(*2>az|i)X^bU*DA@cDp*boYNvlS +zC1hYgTz$I`ezq0&}3b}?`V!y?4T7HkGkBBz!JfceeO?96hb176p +zPtCP+vQYLrV!_5SRQ+qtl(a+~fBNY56O2LEE=}3V6bbW)6j*hY;>`DMuz|I>AH7|R +z%46ZoPxDn%ATEnPtB&Lso=rNBc&n~p7Lkyd00(n1RLc^ZjZ!gIJGKk+$8RFsz^wKu +z`f)R6UAbYpQhKl&1jiEKs7Aetr;iTTtXjm1-$YFoP>JqBM5#+B>cK&Q#RbwcPu+AS +zf8}2>;bD&)-JTX0srNgD2WR?dDX>RQt1HGMR+wvf?-Gv_ZFux8C>h)4DQlgMSrW1h +zX~tn;0>*LXZIhNnaE6RaZ);4*nLLi7Vk$Q`xv8(yUkt$U8|GgnjqU^JLk~BR)zcf6 +zkzbG12*3!YtWjJCk(sC}$%edcs38OSo^e?fTv1!A+LnHJ6Y}nwx`?W(4Gl2P-rT4f +z!X8PzAJQ=PKy)eSWpq!8?7l+_Km#0!{I>8cvXwzvf#YkpHP}&eIq$R*n>{oHZ-fm5 +z8<7LNhD4U1M#8HU{&Pil>DANSc-LH9Nyvy+tUDIdI{a|yK}bp;-ex__ofcx(L59O>`okRw;N|4{uvuLg|0UKITRf+-CT$MXibO04usdN(svbLxVFA7ZPILh8J?)lGoci{?6ra +zX%xw@)%Q1SmIpGN#fLd>8`DaPB;MvldiugxrLpns9~5)B8UOOuc4NuvLfHJ#dEkdm +zF)Z8e*j_?qDS1Vn|8ZEaBwH>hR(4&fq!m}zFz4NRXK-$OVqgWwydCVS>v8ew=nLBp +zQio_x=>vQz?fAkSubLUL&ueJa|Mjrw)@9RcXKjuOSLUJnd+HQ4rdHbZEl){e_J`DS +zv8pE~ECv+}!G)MZjCuB)UOJ$OCt;bE^T +zc2l#-0GqgRdkCD2>RHW;4_=v_X*&n&f1qr)22>~nyhJXvKEdxz_~tvuCz&(Q6K1@1 +ze`OBQYEG3xcPdJ)q~EsP(}&Q-c5#F3L6bEB_Iw`8f@6%%JH6xMiTTdlDSpS>6?x3~V+JKBF=ddqf6rjwUUCbi)5R)bELYBXs`? +zNOrwnI9xC_(c8`vg9R)O6^SAMfT{L8nRf`WN^Cm-^v4)t;P)5DpL3x<5j?&CMrtsx +z2F!?_UI9dqb&@A#4;>!K=a&8HMwlFim}?O$Bw_;G`ZnYe~wy`tDG<|%+Em+08rgkxFdeb<@3Q3@b4xy +zKY08e2LQpBQxV&o0FXR;iwyuOA?+V6UjQ*6z5r->GLdRc&q0qr)&TGx{5GA;kJ}kE +z=na@p6jF4K0>EXAY<}c(znI=4yr0ZQ87B&PMq;**X6FF~06vO$DS-yQB%B1z?yI15 +z4zA~AEp)m;<9-8hnW@JxZh$+hP(K4z05=*i1Q(wX_JBK-qkI&90jStLgwTO%#4$Y! +zw2?TO%YzQ?FF1NZ3jjqBQ)$}g(^^JW!BA)^+?yL^u!6XQB29Vr(_nfGWFP?k)-F_j +zod$q^$`xVsCi`FTSOHLaz)h7CH~Q@aGzIftUBG4}g;k%&U$?k@L$Z*Y)%@_@UzhzMwzx(|Jh9ZRS2WZDL)aR4HFPQKc^-UF0Gkich +zRb4~yL^_QD|Cd&`?N^--|(~p+@y6{2Tywk5k$tQO`PXdv$^VZ^8p>$LNX@*fh3TekknVk(>VTv3IfJREzAG7fc5SU4F%k~;xTpi +z8W|MgKWd=k4?X^~V=%V(O0m5JM$+GGqWFNG5MLo6MA?i2ygwDrZeIm8JGhn@TfhL% +zD>SPB@$t_W9{yk4Ye#K!Cd32(8KkrObt(Y7ZN=6H<(RJNllB-?G#Mulhy08;H_Pb>A+qWsU_0N~|mW8*1k^DrQatNIdfTnOvWxei|g?c@64i2~qq +zXx!&|l$Zp?i+l4NHD@f<+}Gi;!ytYaglvdFa)pBW*ewQVi*Ng~Oy~gDSMh*ZYwb$6eGqi<0{=Xre+{G# +znwd@Bs6SWSF=YTS02-Bx*pJ#Bv{=?9nfBxNDbR<^5IqVXg8D%j2s5RgWn=ye(zpt= +zJvk&6ROwUs{IjURvv?xPCxfI)QL2T==0N(we|#Cy;-?@IhT)1rz5TC&_nQ3&oO2-A +z#sBAv2&60dQG0^t)Om|a{ogrjC_;)NF9AUIAE6Y8WD*erW)m(J8DK0k#3zI)f&vJ# +z=bOFrx8(AD0rC%ZgzV?Ammq9PzxCj#kgGrM#BkHE2ENQ|3yq1r1P}9?T>7)nSZ}}H +zpvQ!f7$r#=rih}fay1BY7QW1G8Rn5_gI6@`Sh13FyDY-sGiiL12vYlfXp{GPiclM| +zulY3>2qRaJMEty-nX}(Xr4V-f;T*P(v`I^I`$x1FK-7PQ;M|XhzVj%0E(H#a$B93) +z-p^3#1Fh&^)D*?b%#C?6pUJB+{No(~02~Q5Q6+~g5%rDa86=vsFW;GLc9y;ZS+37o +zs{C6JZpfc5?pjh!%uf`BzUDn|L4@C393WQExjPl1CkAniapDqcA0Bhcp#YAyVTCpS +z!cTBVg67hd8{hV=S8ix$fzjK!#pS4Frp25ne5Omu#!3+%4!z}$Pa*5~1>>$%a+z)7 +z6a0!Kv%Rp8OfY6+#W#=sF&admpEpZ;bm*hGe|#1tD!9g8$stZH_sIv1yn8+)0V72{*MAwz+@jerl&q6wDoM*;&HRZ +zjTDVlhs^@vutD%6sGnyLqjtZ{n+#JZYr*@b9PO**Ckov+fMW!ur{clQJ9K#TSO=#S +z>ir&%l*fl%N{bZ}uu2QqqNk7l2jQbAq|A6nw6jGA-JTNqbImDp3DQLGOC_*=u%1pD +zFOT|0_>xsTQ6)eM`c2g9Gt*uiCIp$pHYmZYaQHuT?U0y18ZBI|D&Y($v0m6o^4uP?ZD8 +zvD9<3HCv;WltH#p7OV?C5DqL|;jDu}TeJJS9SMl|tZzn`O!Yy^)ZLH#D={6=QRFt; +zX+R})0mI5JE<8u2emzYeA~!JM_67i=Sl5u9VVZkH4mUB3BIyC47>U2o}@y*l<9MjR>zLSjX3>mpTldg@9_bp?k3XF_fa7QzlFB!N_Xx0s686(YU$n!%RNy%ANU6?7$#Ztku6N# +z{a&glW&~4VdnP|H4*=q)GA1doxx*Edb@Adg?l~RY@w?9yt2GCzEZ9RZ0lcWYiKT@F +z@28(p+1b9X3{N!mp{l(~c-iaR63)EcP@BcJ^Y?Y{d`*w*enjBEO_8q1l*aT5b#5W+aHPDgclm+& +zpwR|(y>w&dnTdqRS5vPetD9oUEl$<;WE;TL_^z2-2+pFUb)q%#v@Ui^*!>aA*lt>{ +zw}Nuh+T&Qy?x7Cvb)kdLxh!AZ{eccNEX8W9FO +zpM>9({?l!;P$M~7d3r9b`V+^Khc{@`&!I_B4_>xmBb8U7C(q1(9XZV4f}~!_oBll< +z#!=vGl`$BvgxosIegv<-rT+ +zkcvwUuav5l>E0c5;qGW7Lf9s=bybaU9Scj?SY!kMg@L7Vj<)(X*-XZ~&8!PEX0t{d +zQl3YRs4Zf!$70GfX4YIX(iLf*we*^wV5hMX!e&hqYdDIt +z6+0b?-6I)=uJM~jFo3&KpineIjyGpvpZK@mvChPgZ5_Ne`@7Pu5BOs%Q{^&w4K*5M +ze1T^0HiON|&*-P`u^k*AA@kI*8ov_tHKJZwxI-GfFj)!VIEfE +zlG1Yq>eDwr`sFb+sE919Ah9`%Uz_ +z{!6VL!Mwpl0~Rz7anoV*?Ss%RW|scg_EiCZs!Gz1HgNF_N1|a?W3T_5aYjO&Y|to% +z09eJ^oE*~7Bq3H~A(Gzh$RQH^7Wya#81p;pr8dVs{fXmlU7lE0>-Reu5CK~ec7BpW +zGJ9%;C-=R6X9-r@EsU3}{CKDTiJ+Q+DbqmG(jrG+oM4c3*r=#1aDWqfv_W+feszmo +z^BUOeklZFK@H?(+4kR5pZBjGuXRx+?;QWgQd{pbQFL6)UA5edE#wCK@8TGEBIE6eC +zg1x4o=awAZpA(#}P`ypV_~wXHNXnxnFuuJ|gQLl;6Lzmj@q-hS +ziSZ}cVaUQ$h~nB|_DT92O|(ZPNKD+16oBKo)YqQf7t$C1<&rj{4y)am+dq?t^#%Id +zI)ywMd|skNtIzmjc$4!w|Esoi({-H!y@Yd^b~ss1lcs20XwryW9wj(I2l?~*PWkor +zn+T!-qwJ4baD?t#a=<^d0g_x{;DrC#n=wa?|E3jd^XJ=w5=;>Pd<|(!3f5oH!#9uF +zG;z?q{)5*!w9|`6*IOsJOki=3D{}xVw6nfXD&)xhd2@n#13FBk=hFfIDJh`UG){GEV|A}jB^v$uTuNG_C>`i)g^4+E_P2eXQIpGCLj25_|5?AWan>BI^4c@ +z0Pjs2yxxguNv~ehJ{M%0N}HUy%s@w0DL=Z0TtX1ohe2aD+9w+JW!WUbwj-_zV~vSO`^5bM9ESmQs~gy_z^Z?BHGe$?nbR3Bg~k~4 +z?Zj?|&5DQ17d&8(_!E1R+8vePCGamHZS9n*8Py34dt{Fx@VlY|3YXK;?3r* +z6TrW?-h3X6__t#<0q@J6CmVu;xuwo*iy +z!7i1{%TUCUdthVE3KZ6TmM)O0zrGm+OoQjt#6b|-j~i3;w(6G(2G~eFJH~(oZrS+r +z4%~`wKo#B_nf)WoK>#sA_}{z)-6%d>0EBk+TZG#^#dGT~JFI`ECZ4?uN=U!?@k68y +zOX)lUkZcH#t*#XT<#V4!vl56GGzJVXQEHYv#!AJ>A|p4VV{cR#Zd!u!`><3pVxrgXD)j3=YDPkQpJo7t}?5~Rh43Vc3d+hwf@w=XAMX2 +ze+FL>K4(({|L2Nq_6>s-8zxA^>>x%RgLSiiA0;TjV^c~0*Yw&5J#)mfdjsGXj_ZmY +z#E`&YCs9VA!x}c{eHTv64XjrFSTX&R{~nw>CTn9HaX#y%bc^N;4uO)*zwIr@$msz7 +zpFW9amm;oC%ajvW2Z(l+OX`B*M509DSU_|Hmc${iH#^->7G3~N!ZE1VMCdfKp5K;T +z3aI!1;~MK^;5jt^H*QIm6HQBRZ@9PUdM5D?<-+gG267I;v7!=t{9w-E%V`ia5*#5= +z=A4_oWYGD6gS?8+Z_lWXK!Es-Ic&U4phNA`zwd!y2kwIUTt&CQW1Ux!EX{d=jyH2Q +zr8nUwJU~YqiAbMh-02su*I--y>D4W0M2|vz%r(ws7k9M}FMuFrwWIn1u-*T^{|kU{ +z`k!wQ*w9q}YR52V`2qrE_B>mAwwvRh$Mvigo-iq(4=G2sMx +z2`*ce!-gd8_0x(`2fhWUV9YmYvx}t96lbEr!Jz0bEI^|~}M*?8iG4;=p!Ao6UM91x6F#ZPcS9gB>@JbhC6a*Am +z&|Q<%I5Z9&4||At3&JkS1hYa{#YZ(3iK=PaLFT|>!K(Jqev +zk}!c}ON(7fH%0|*v=83{I~>3y7*`dN|R4weV?<`Qe!s4mYlcaV}8+MRPl6^K^i-8eesg3poTQ^X`PnS_jZpr1BvwEkeu9V +z4PyDP-^(4Yha-X0Ug@?rG&Fx~_vc|PL;o8kXh841Jznv%gR>oiL}5&RVbU}wA{~fZ +z(rnD~&B*mW6)S_TnX8gS2yYpD_LuMDPPw7i{@RZW!R64dU=#oP-q=S`@Y&p1H?5Rw +zR&9svJda`Ur)%K|!Vfi*hC0@@T6%|s9G`V<-*($O?2j!OTQUAWn$7~Kt>*jtfl`XK +zxD<+|NYOxXm*P+;t|d4Wrxce^T#6UBr)Vh-1&XG)Lve@V65K+7ByakA=YN?YGt6-J +z?#bERbI=v;`VR^@h2~x-CoSExdd5R>(Lmye9>t%fE76<&d|NB*;St)*CEJt +z_+)gaw4T^w=p%gL6pYNG)_ZaAsvqV~0FJUoEL(gLQo8Przt7RGDeG3@>T@1SFc;Bu +zt=5I0xqZ)8Er3nwX|MZxBk);YLuxN1N~6CT(YwVLDJ`jGYN4h1{%5w)-)>gJk10#zGTY!Izu{lzKc5Yp +ze*zLCFbSg&ZB+HB1}d}{Gh_X45NRU&qA?5fqrfZnLfn7zw(2nWiv?!Li(S9W%vng7 +z$I4|0Y!?EMR++V2#jM}z1O0aj(1f$Z(fbi@fyi#p3D*t?>|j!~!1hc9OtvhO^v8Ll; +zi4ir)Akeq58mk3h-@iKd0GvFHOig(t#;LPa)kNCMjLQuB#49*);LOXCr{ +zBIwF<p6##?pFjDC=3RbVM+76DN+nEPiAVTX%FrW*jqTD@#5M? +z_sy+7WTSVi3u40FJ;wTJ5J+E|^Yd2LRBIIcXXYr_H9``z^Ehxrr{^*!_?Wu7 +zLsp(|c^V-ec>Z8L1UrjQY=5P>0|W4(oT?9%nH}@dlO@X1*E0f*cGI-^vpc4*eP0wVyelQcq$8uyO%GEh5!45MR8Gk>J-+$JbrH94oh;wPfUTtT@pd~ +zFOvUC$`X!=3v>e)2q3h3*tstRbx*6GBfKmg=2g!qGVJ-(pi&+eWQ%2NV)_yYDszc3 +z;V|g#g7Ii?uf|uig-JEz5rxmQUHG(L*Hg@=FLAWr4zogeqj6H1m~jZzcz@fLbq2qv +zBa_P#Q*>z=kF8pb?xC*|)~7Hbr}eZuu3Z04svU5k;bi$aYY(ES+BE0t6<`U~Qs7Kz +zgP)2>)o^sAnFI~hRL#-~9jLNpY5vG)B?3yYmatsR=N9wWsoP{Vdj(1yx%?2l=#9Ya +zE*5LPsf(k|IrjGaR`pd!&Dg1`QH`UjvC&h8^^t%&hf`zrp5Ks=C3OANn{f@|9uTm1 +z9slHQsXp}Fp~0)aMxB|3kVB=kAsm?e7F{I~1mWMD*L#$~dg9>qa=&`O($j0_kR2R& +zve_3QFrrOyeUITA`JB!v)yxxyG9_4Bf8keha;dbGScig`!%4a?CD-8{Uoeav45EoQ +zR|c|Ee|nG18^7uAcWRcYl`!2qj323rP^{Ty)unrx@OEBz0GdmCF<+Sj^Im{H|FmVW +z)lz`E9mx0XcA9C+8xO0hDrmnSzq#>lUOtB3m$&SKjqZUZ8WeNG4$aGi_UQ#Jx6#^% +z8+XXl_4Zle2j2#yL(wt*Mskuu?Sg8b%%DAi#*CR8+}ky>Lm<)oVS6Iz!_GrXUS8g^ +z&*@5=kDIl%bwEHHBMxT*7Z0z;luYqxWg~`}5%l-VIn}Y)Mm6rPY +z`oh9(7jdxr-gw^F*jO;Mrm-oPKAfWLG%@ZH^>fscLQ(tbY@PTz +z$)m0X-JV&}MEc2?|2ab!tWhV4#TJStU|36Y{ryw_yEgj>?RG}n;BzA4IT$&vz0*@F +z`IN7CR@T&WUq2=i%Z+Is-Ff)jr^iTN?|`I&ugkBmuMNRL*O=R5AOmXU#hRar9<`xm +zT%hb54~G4;sV{~X*4E5TOvEuDAk4xQ7PTz%E8z6pAGUb&@hw^Cf(J`=`QOBytWnwm +z)bY9*`dq6TdU5RM%UE0o>-Y}_ZoQ2!2x?h|b=)jD{i8FS{gtDMOh5jU@r$D4OpY5W +zm@Y>2rbG|A4mL42H!~6qxE{KefES+3?FdGzCaT0*X`nT<-I`_4#AwuE+6a1n9lhF8 +zH!t{gm+{?~$8((GKa9>9b!R%>M*&oj?vp!2Va|>~5=_$T?HY@1VAS +z46j#W>Pkm9n+2PGFMSd%#QHOXp^O6_e@;O>JdM1$Fz?nHS7+&Ilh!Gd@5xsxqZT~I +zZq3jOC~BfY%PfD{M%WPHgu6otzr!p^_Q8A2b_SNY&s29rT9;wcLDz=C#XYj5o5;b^GTU~y}JGg&9BgpenFQQ>0TOFhV-QbR49jFgw7l?zj(;g +z6nvh6uBeJ4UVoTOT*C;FHOq9L3(D-5zhSRQHMTveU|>!;>Eu`9!mu(9_vT&QoXbyo +z_NXUn&jM8$CStp#k;_oO{~s%;DtMB1mEJ3BCs^0mZJxGr)l|XV{zW9~hzxXW^uLC$ +zXQ-tmaxNSty>^_SH(c^yAwhEcIJVObOe?{ckb8R%sMg7g_ri0C#Z5Xe!M)13l$hoc@Dnu8uLKvmH5(!(c+HvfM0A+aBf +zeoA`6dgcP(Yk#zNo+02E6Drq0JA+U2HRlqjfF7x^%0s++OMh`J^0!|aELLoDuH3?Q +zUd3j%nAdo=`IRxgbGsuLS?_@$CeRT%?b3JgHPa%U`DUHhNXCD*Ywkq%wA}KXYapEL +zWEcYmok}Uv8C*2BueUMV95*gc*MFVg!D`mQ;Q2+f_boYU2q#QbkgO5VjyDU7U;>s< +zkP6X0U3FeLc{~$v`>;u1Or|p&!@ltCbc68$CSxSp+;q`v3v4}GX{a#d1!F?cVxgOV +zp;y)yYtJ;OFYZxOO}m|{rE}K$zN-&)w#Ja?Q#yNSs2{^XaO3WK*^X0b)+pg|{qhGbFYdxl?>nr}~(wwIJ +zyKeiMpyQocc3$*@3}WD)qd4+LiZF;=gp_8NZR=|n7dBBA;9bME4*+cs--Fc}m+=`8gUCR{$gXFzR19<)#=#OPOkbeL%T%~=MV7}bTg +z$f^NDPgafL;aA~F@+!dOgm?9G4n>UyYJGM5OS_&d6y(pfK5ISn*GS)AWRUssyC<@1`IL>h9d5C;5pPO9LXm!ewm*Gu%{@|m-`O}Py(bMr9{RvF +zi0%EeU!?SGbzDpQm~3Gd>UP6%jDg;5JDcL!bGPcJs1jo<(&jjD#l3$aD+UL +zl9v@L#MX^g)Mnv1f9p|dFFHLveR}fa(0_Ga%)Ta#`2NWAMtX1M$D#7|%As^yMFoa| +zq3;D-2?&Ox(Wi~`Yifmr9aV`zCk;iS!8>V&)$iNVSyUs7flWU&r;zyzJ8}xX4!ELd +zc<%+T3K#e|=+I104PPa+mOP%S+b%4+{`p!M#NWBytE9QrAlRhyYy|oVEJB4(L6D)?T40^dlR-I +z0$LY_=yjQn+iN%4HL1%iE#&P8M38?D?c!TaKX*4y6s80mYx-`}p-EULNlZYC}w~2N9lj +zmMdwef#?Cqtup&M`XN>3ax!Ma&~}qW2>R@tZ`?y7riP_R3wkBc?7I4z@&;gak)alg +zU|PO>;K(aWoUrz3to60Y~$#o#H0@R&#$ZKeUG~l +zvl$bv60&5K$yrMXCtljN>Cdh=%0@F>bL+~;t_T^#5*-*FM;(laE0w|mY5s-s<%hB +z<}j`yeeZ-4-GK_53(%L(G%pg!3_SkmfB!r7t>ES%<6O+>x@+Zqacd$r>4y^G)Z2as +z_xf3Vf}v<=lrT_26%(1GFea`64^MVj%; +zo+vHQ%g%Ag75Vb=GRCcF6}1U!LQ%sJxZ)Go6PgLhdIyiuJ-kGoKZ!Mg&3}9ncYibC +zF^N;Zek^Pdnil%7S_X`J@+De<<=M=bgM0DfGaP-B`}=o^!~e$1X0^z#>x&AvhedF2 +zqEAlj-~4>XRH5LjC@_cFbX$ivp*fN?u*7|*N4*o^s`#i;RHotA*=~-TtE-D`EYmdj +zgX5zU9T&cfLK_3lagoy=ny+sie6}4$j9p{xf3WjGnNpy*N4pFajZ?gyj1gPv3NeLa +zEavf%1KIQ?;ef|BQ_srqyB&k+sdV%chsiS64znfT58lx=YgzE1@AI&#>T0DT?cL`- +zF&*Cgezy8MAzU4JnRBoCbLto0FlyRCtPK*0pSORxX0ghtuHB +zPSD8lC$_3?t$)@-@j-4Y3f3j_5&O^dkmeg6dI|rX;k2JQ$n>J>817TRA8i*TP&4E`8}2SHQn5~Hot`ZnT%7cj=wvV +z3Gxs4cjXw@0|CvNjaEPE_8GYZK3MWg(re`CtWEfd# +zJ7ypyoyALjo~C0tI4Yi?Tog@VOF`$v;PR=-kig)5k`)y-d+gliB>5<9jNqxwQat6b@qA8glMl)Fp)L3~#2V>~6^BC%?UjVKM%WR`B(^6E3ds888A +zZxx1*neW!52ovxm9OTCRj+nW@(FCe%$EptVQ=tx)TmWXrr)Iyrwq{L5T-{tEgir$O|M6N +zLqn0*X6AtWMI&8Hf4&g_NT%!o`BRXWCHC>^72riyR?x)IbV1;uaRQKDQ9L2S!`J@J +zPfh(yo8?b&sr4n$1)dL(+k}_vvh9N)($A?h*uRI$5%9O5!RZO4ObzrQufpwpN5gnZ +z(`O70_J|d(an8lD%ix&0NvqFtqE5>A}=UrniY$57361G|53 +ziYw1IyxrUw!E=#v_c!i+kzD{5LtG9N-1^j@Zk=R;6rILm`gtFJR$G=%^h~f$JZ9j? +z)Zvs{(cHwzj4%pefUat@z433G89N$QG6`ehk6qPfZ}lpuA5<}aK`^9~nG!st66Dj4or +z7fb}RP0e2iNDp{?5fw)K0M0Yav8kqPxQhy5E&+1RYcS-n;qp5!UCxkuuc{T>k?cob +zN>bs^+ds@$_M$=ecJ@k{#x#Zdc~uAKn=nT7wHxZ-RYGVmR6@wMO+MgmP*d)t!Y$i# +z^pb*zRA|HQMWc#GEa*GFFf#$SC=UGmozzFzxx?;4ooK>a@kg4c8Sm9tZ<5FV!yE7z +z&CW)CpsG6crw{SM-%ln*e +zP3upQk$wax0*g{vz0|Xu`#1NfYT<;BJ!E&A9D>Oj=T%kp?d){ZP9Z@ijMUq7gymRw +z;+7lP8vDuwsGH#zUc`|<2gD{ug +zjVyXsFuY^VVH92r3+Sl1{_ZV_DKr;p+uV3_vx5P_L%I>b3em32tgIfpqUSiEJU`C0 +z1DJL%ZnEZoY#fcFi>~Rir5nwnH(sxwP`#Mu((_?S#&qFaW! +z!JO(uQV*$nAL^|(e?uq6Gy2+!o`Tn#;C4l?Rz@VpO{O2&S{N&g_auDpPt4a +zS-mt`L9|)@74#q=lDf2eBSmE~*Nq>SZU$i;tqW^NGoS$g20(4%;Pv45^bIY$^9JT&C4oJ-~owh?DD{==^?tXyiU!({B+o_-KMLh#3=`Z +z#~noCRcr|>Vf()?FrBTZEw3aWD13WruI*nhcA>aRFukVtU)5^e0{ +z6Mk^09Xao9yZ;tF7(+#x$D+}z3RHsF{`~}FtK1;lsLTk{usWYV(PGmTVvcbKR#qL= +zpX$bbxMa2S%nfCFSL_|JxhhAA#kdzq-dwmbv*IjB!#25p^6a~$s22S9C4nEK!~bak +zYTln1hdH!Nn&9QY&iDBhGoRc1FdRwDU71x42ZSm_lRDY`RS;lJ2MgccAXuMw_TE_J +z?bA%P`J~{308|1K`>H(bkI5f_wz$Ty2txrJPRh(aaopTkM;k7`rINQ|S|aS4>69m> +zL^#C$l$pOnz5NJ*v&m+=eh20H?bbXo{jrdLpv}NtFZN;ui>Lx%}I +z$JSW*V)Td>8?ee3=;)2=y>e!E{`pm>m?0>HIYgy>n(q2uJnN6>t5;HKXVL`|*x1>r +zlhIo?-~AI~P-K9y*EBcvX>SzvzuK?9>^&Nvpuxf7D2eKsH+1Xx>8pX^y}QI^U3D1$ +zXMauI@c6T?ukc2lp-H7(($@&ExM$plzqYd_m&z^*Z!q${BZu7H7|oMBuzm%Tq5`}B +zuW6VQ31x5bj5YJ`-x@e|b8u4G!JciyYYfLgIWxxMuLr?-qe_l#ZHLR8q}_7R4$Nx1 +znmOHNhxGe@vzYMA4H~#*@^BPD7GiV}>JASVp_n$vjGlM%3f*AMM-8J$%AA4h83kD} +zfXaAWjB;W$tFck2;bP-twm&my7Lb`GC}NzVO~Dnf@Zbyjo1eS$uwzjvvddRc3hJm{jzc3f-W{YwYf-=17A~7v4+^7|kq70WyVR?1XdAZqfr>+{OZZ5u?2Q+^9 +z4zI_;(!;~a3AVX(EYor|ospg}kmOj4-E?GIb{ei%e49$qV51uGD|SlgOGK&Z^LF#K +z_6A|vpQcqlov`=RyzP!RT`w+awf({gcPE#bXhMtyu)-B^9JU^^E#SR8esl1SrR;7ne2UR6F0t;IcdqhRr@<7bHs65fc5otlpG!^NzY$9kpt +zzek`i!fh2^DO-@UcGRP4y?NznWC`yJ)p2Uw;Ub&+-E-oAKokaJ>S^ui#D0P2mP%RE^g +z4z^1PUeaNI1-Y;z`Znb0w#FYC7Z*&H8pxt5QCs@%6B#CWB5^?Cg6{=aK7mM +z_I{e7L4X7rPDhREj}Z{~PDW*CN}Lu0B5iU3)B7S;PuXAhtrPDyZ{FVfxVj8X))gts +zAQvavF%=g&I-krIi)RBW5wX%0)i?E~pH)&=#8pkO1>{sxS5-@Q=fjmgMGeUS1*4Zj +zF;W?VM=af+EQy&GUJ==7UGIn~7l46N&cf@+d^qat$vU*D1K|cno$h}Zcgwh#4;Y4~`7B$z2HPpYr!E)ls6slA0u)%Hk@rd{F +zP8uina-*Wc&$%jt`>lf8USh~u7)-=9@bYel3sZQsqfV#e;j!AReRF@5@!mBA(5xIb +z-z?%r4W#b34$rXEEmMl+QpdnQKMG5 +z|47n?PGRS;xw-K+w+)D|F4ndzIBXWzEOy52rD5i%$ei&0GQ|LItL*Ul?H=m85+d)niHL&g`7+!u`E}e&Z}r +zr_P}*at6gpgQfXcPI<)LzD!6;QFeTecJVg>=paO+UU~-gP!v#DN*wPlNXzQc-q6s{ +zx#rw#I%ZcfiIST2IRT$bI#)hab(zr1&LzvoJnq4UM9m&Xa70woQzMG +z;&d$;$Y1PjOfF&{lwJ%V&B2?#v7rY{L>jmHQSc}bdI{2XgF{~3)-Kxk(}s855B6~e +z#`rTrFLWR~&#A)c_<)0jjFdEGb75JX>N=we;G-_yAYkCckPxXYD8Eu4^J!f67dn5K +zI0`&&-kt(a+c|<<%V|OR$(zdkuIlu6o_ASNm)L?ash;`e4|t=G<4IJRIp!s$*Fd}V +zGL)R;T{S(D3Ar-xZFR=?!FvMJROSG_LpT&306FU~z`&GHa +zWZj${#q7Oi;U$l0OUh!46{*e3IjPKp*bF6aK`FBj!v?m~8)sv19RgpFuP%h|NY|ByFYR2NTp4W4`IinK)$ +z4P^`+)mQ4URqY%aeQCMpkn4o!DAygPe|nB?xa}O~p@Ov&oB>H0uI^29OnH7IYM+yp +zY#6#QoJvhsA{tLUP6RMS{5{CG#RI_af6q~ofu1e^qrU}&$w1GG&TZf= +zMS!3EnDSx!Nj_vfqtiifo)LO|yxwv)AaV!W$q9m7H=b5?-gK6fO$6=k@djSYy!bBy +z2ahDNS$rO3E{-}90AP_~GYQyz)+DtAj{6UpX%`y{wSMF>rAU=w=re!1|JcTuyi)b4 +zJ3-K}BtEVpm$BoK8*y6*iOwRAK{wasmwqP4yd!5fH)m&WoISd+q*p)NTx0|T>BS(= +z00!eSx`^4eLzB~+B{}cNLSzfwzn(q%NZ`SgE?a78%hXbDywCeroD}2gB5% +zK~VU;#5q$N68f-qie4^2Gv?nvfL^dbLn?8WS4?25i<#zTKQB$~5|vgcE%^*0DRV9D +zS~nFbb4G`q=a1_=CNLW8_fPd1#TJNmU!v@KqPSLPzr3SHg)OHyjNLfrJ%=EyrD +zHNU0hidIenFBZ2l0i|gDE7XvJ0rMeeMw$N_KhNu~NrzvZO`RPrLOiuJ!a2oXZgrk; +zbpGqfhB{aVFv0b$FTD<2ynZC +zVQ_;auVZS=Q8)3ZI|)0jhpjznxBZ)8Lv&A97ngb$#b31|FLs71a7WXpI|@=A5|UST +zayDGOYOlFZO|)^0F`&`(!OYQ7??oRSh*qGn38megJ9fe9=Ex(CvW4s{Fl6M>tz|iM?M@@^uHIePM5sj(5 +zgBsTIiH^aL-q2}5ng1$V*oM?&(c^Xfodl1{)_=-T>-2NH(&RVD?$0#~49L98+`c(NsolulF=}CWG&jsW-?AdJWp{0;G}6+otOwG6*;T +zQ1gIej)*byeU2W_SVNb9q$Pvj>hNgteVf?r=>Jz&+QayZ%jK{PvL8(Zz%|c69|o*r +zbT~W;IWl(_hWWR*%3$#u2Ec;(dn62mo_rHf?85w52v758E9UjWpkdiSO-O~5gY*$d +zLuBJOC#&7iP8j#d6)X7kiO%rv*arE{aFnRr%#S+_g8Pqg@QDY0RvXGV7H?J9^xG*_ +z**oM~JZwHdLP8)kF5WKgD<$~Tf41bx;{~a7^OC+;f6LGYE2mJ@EZTiXLdG3zWjJ1t +zBZEmEYC(QrI=s`Z^>-}pfEv@oK(qu#f&mtToXoMb4Vpl9K-!pL`r7xnHw-KWH-1!8 +zgN8wL{qAMZhUnduG8wPEsu5}^YAi~|;|(4b##0;fdND!@--ib=fHP(=;pyPp>F^Q0 +zhOVjphi$VKU^;KS@PX`tmxwYXN%eE)QB~gyJ6q%=!4Y=l$%g*fm+D)fJSol9y+}3K +z^!@uBDl?*-4;K+if%FexH=-h$InaC5$thB9W7re~#?;dyl*%qoCLqVXUUySR(v^&_QZLm)Az$c +z%(TLc&Rdq9?h*6!AFqQ*YuJ9gQfmK>r^b@=wSAMJ!$#akEkxFOgy!kL8AhM?m +z6Sq}^p=+c@?>5T4MaaSZVsk=Z@)PERKaYL(q>-wC+l=*lnTC{T2)rMH6Y_7xWxM<~ +zK79VD*uKqkbrw|+c6)5l(AsBQ@q&P0*>o6gwq04i6 +zsXYDdE0Grd(n&2?op^&X +zPSS>j@77(sx?AUSK2Z6YUd1wScGUVl>N-Qlg9>%O{tI?`caN@(+zUHTBt}a{-yzEv +z$MqJx)pa0y-HhnbIv*K~@Zc>Q^dmL?AH7fYvmJq+UhiQxe$N$_@)C4x;@I9PByk4X +zC_ep)UTaABn{GhgABk_AI)mNE*(BuADwAOi;;eH2YF-05KAipc7_pV_YF8Y*^#16q +zo<)QRLXs4*Q4vi4pbuaAq@^WIDNQ_LX8yVMI6)$9KsC}ewK{w-b$}i{vYg3n{(a~`b_op`c +zG&U=--iu(Pn~#>NPkjSisl}&Wlv?XKcuBbqG>~;mGWU;$b^XPxz!;ZkZ)usd$$H$l +z;9M&IOoAJD?gNTTTtgJ1cCOdo^{CwmQv#8%}3q4_SP9rj~c#2_FzQ6 +zbn|XzZQepLslp?IKl<#J^b0?ib~8{~y|+OR-VNYSMkPM#ekJuNf&{bvagEKGTJYoGPUvQXH)EpM4%5 +zj{kgHilC`D+o|AdC~`?*@puuhR1^%UZK>tHaH!Wrrr4vr4t4ioIu*e~u +ztA}kA9{nzGmy54bCAYFWC4O8?fvZ9<6r@yYP_%LE@JnoEWeLMExfB-cwrf~C_AV6y_g`L?SjMDs&4~fn>5;O(Uzda; +zl&rf>0;qtvDzO;W)^&|)W9srnqA^$@I4U8sOWbNUCJ_RbqSV4U +z3RpTJ4zUMgb8?&&W#5OcZ^VWlac-6)gzDtE-M;?-&?vqXQW00nbMPihj%Qg?E9{(m +zqglu@r=4>3vWZ%w%3G1{EIz%YDK+LF+}p$KO3sI1nPxVC4S8S9 +zk}iV-$yZtic?-FSZXnShwn?#~W6Pu!KL%Y$7B|?GpvW-x1Q)9`8w*?W2{YC^wO1?( +zx>7YH98XC|nU}9B+2*_c!($J9)`$|vp?CzaHF%K)p!=*yBdb6Y{urlN@pDL}tf}+k +zPRWl^!1skNB1-(H_*1SwY@m9C)vC4_p`jWTg7tON$F^W$jmQ^ou(YE~DLVnRtIsBx +zGb9TKu!3U!MzPtiY6>b+59k?h1q5FGc9J2rM{fI?a@fh&U4144^t=wCuuuF^=YtAt +zj%^fgMXnD!X6j7i1ior$`^RHgt{?JAG&lEB6w!cR2 +zwm;AP9L?h=MiR^)lEg=bMNpik2nP#Bl8^xfo$A1`Gl4iH>4hU||FVSa_jNT6Wpd +z#wJd-Iv@&R+c9n+(dbE#;sRZs&?AErK7K5o(MoJ`^VtNa=%pzNrm`1 +z6jkt4fQ7~iA&-w*pH5eb5T3%YYyD@oJZRQZT&~*Gckk!anp7p1$1-%oWB8(@ecIUO?Thfz;u-DA#N5cglc}ymBR6z78Gk +z?hralnsDNG_azV6`T27IRWfqUD$!LndZxy@56q9>wd$t*_uuwSf$zjE8rAP1u +zH}z){<*}XLjtB>`Gusx^_{+#D?2p4t0{Pm6G`=5_6^z2>Ba$3Rv*&m +z@aQ(W%`nOviazbHy~zpIc`V|SmB!(uIG*7psx)_fm0sFL7%TkJ=1Dy1%W}~e>RUPl +zZB2Y%)>iB4-14uyeajlm3?QqP^b)2@*m@PSDH@xKIkBr-e1nB_tos8#jaBE{fV)V_ +z+aJaTiT;vPqZi_NHXo$koIEENCgZMpz%IOb;67d#3`QkL>38ylXke@?I@X=Pq(BDvbIElsLf>8BCi=$;)XL^rKF9e{L) +z3PRs~)814!hql(&cQ;H2UWhdnVmmwtml$nXk66@<>yG%r4J?o;}yW0ynwRH}tpjU5c?vZ;E}@ +z|Lo?^{iXoK)-ul&X%^$&{UWY61+*NgB--}N2&?+zIgb1XbCL?^$sq_Q@UXn>EGAWz +z7rh{EWNB%KTbI+hJsIT9uhn~_7xZt4J}bDr@J%gPv?H$^749Fca|e!6frN&X1PcPnCILb-(+F +zfSvF##$V@*P*QM*>Td0widjDdcpRsHa%>h_5_aSG({Itnh1EyuN-@?9VXR2|rTN#H1~@Z#m`E$u^S70Lso@xZWxLpB7+KL6j^(G$LcX +z^<5@oGvB;x^W+xeE*a6~Z|UVk(VW#!hue9Guy#~MQWR;>*%oN>{ACv26^UI=k}Vz! +z&TE;+lGF#zF=j9SHL~JQbooQ8ZO6f+A$zWz)_^9Qb<|1%5`*Wn%r%f0pkKk!_2)8? +zN{_eg{Y`B#@E@7X8ZkmjX<7Sr(wCgr|G +z=lp%^f(N=!H+szR0(jONpCo{zUAc5aS0Z+~N|oamPT{i{LoHfC4;V;{! +ztxL!hcyGtqosv~abh&D;)ISHAvEE#WpezVT{rsU3C%S2v%}UBDA=7KgZ&tw? +z`?F&ucVjk>yZ$AiX+eXxJr^Nc(c+vZW$LTg{c>)XC(rY%9)w@^wTS1{t;eTF +z0qkXQFq-8qdCcVl4hA6ma;pR~oO;$AO759!a$t#cj`D!#PdXz-T +zdh3DK5;L%S7nNuPj@b+Xvv%Z?&!Wdn4_~ah!lzt$^QE7^dYnIp?e6z;A~}XPXVbo7 +zVCZvJz)OW*_JY8V2iA-;V@kpeBzt|0g)Z8P>5(O&BdB2_OFV0P7T8V-=GHd9D~xXR +zzk7>xr5oqx^{B&`VaYKaM@{r53fPJR38UlVpTP`RnxdyA7UgG!oQSjv(5Gc{CRr1i +zjcS~awJOEt554T!r$P3SRnaanQB@azHVyP>!awh^c4=+YYTW(r`HOo-Zqij0N241f +zGN=Z#sY~yDSVjohHS;d0gRK`OTaSQGz^T>@j$mQO_(6m_l +z=;O&qtE^-SWgSu@W;@bdYJCgJZpYYvPV=bdix~pKu-pEq9d$twV}a|$3QZoz8l)Kzgaq-AHZESD)( +z^Nvfg1aybiH*4Gv-Z{VK%a5{4zKSwTAkv%4n~X1a??~etY^n-FY|Nsak@j +zJnnp3z)>9nPkBtS==p(dfY4+n-@48hzEj)NJ@hy+ppb5sm*ga9+di8ov7k_wNy_4w;wtEC17gwYDI8Yb4!zdRNkO +zoCwuSRgz3uz;hL>S65#tFd@%p +zL;$miBsd*TxjSf?eWfv0Wu>Gkd#2h}k4xv9LKgJ$NYvCyt&xeL7QJZehI_ +zcv-HH6`_Dm`5kSw?y+Sqy-^nKR*b=4}SEc&1c_{AZB&9_OD7W`*B!i +zfibHN%hpR;FX>DvKp_#s+Dz7?9tR-1Dr{rEb#~s*OH5KUVjgNe)OyG|W|k7XgpgMj +zPn|hKPLXPPVPmGI$W>k{1DEnXwIVE+QiWOy1VpR9D$FDL;!Y_=)Cj|meCm_mR5bYU +zD?E%CkQo?-Q5c9(7%4ztM3v=SS$Jo*P%>M30}_G=2#Nr*2$~JPeIaHIXf4F*QI7{4 +zc!9GX$k-jTN2Aw|P$Wv7qc+Qf%D3b&;N^wWPd!CM_LR*rS*($$FpQ+kC`m8}U`_&- +z_oznz2*%B6QZB)~U({;0KJtlA{AHuD{hc4maAcTeTqGlD1SSc97*GK!Fv=@~QEC_o +zL<9xRu98A#_acyjcdYGXJ?e2l@N&ro*}5NR10l0mFcuye*_Ga2Of6ViZ65}B^4OWv +zr-`Vzw8q7X6;Ne#6*)%Amta|87!{@;jV=lbOOXhPiGA(m{9L7!qDC0L|3e@8D}n9r +z{(y%g0boW(&{l|PlmIC}WJCq&zTF6d-k&FE5`D;pn50`R)fB5oJq|qZDv*l-bh>*G +z$DH;qHA@C_kC`rS1hIkr$+ +z!7{wSHIGHlsO)>?!7C$}G88knLz}?+jluHu;DJS#}i$KYq_F16fGExlCHK$4e% +zSs`Tdd-1#_A#u^A>P&(e{iPHu6$HV_lP5c!&X2$KZN7AsnHf=AcxfaJqLBiW0FjZ% +zQVa{-`b}8{Ah|BGOfd&plE1J>jj?*vqY7T>D}EV6F1a$#nApH8X4dwbjQq+vPcUJ! +zG=Kc;S<}znhnHWfnwM{tGcHv?n1e6FnPN>Cl2;#*$(X=W!pEjTSgyd>{B(BUm4R$- +zZtjJbe&z@5@5Dd7$WhFadP$9JMmO_vXZ*}M;OO!bPduT5z}u)X!%3lqm!+4=*ySW% +zfpZ}!`N-Tr7V7WwSd-}x6@(LEZL1z>z)Yg{-mpcNbR1l~ja0updEH9!! +zfBvzs9Z`@LQ%IhI5upf@kPs6oMa))$alj6{6r0b2AYhg-eCq5|^Ku&-F5?-GJ^5s((}D61+ECnlBj3=+54^}#TS1Us4uS%{D9^u?UC^Bs +zVE7xX0S4~YYFKiRL_(yLVrF7i%&e3ORKQkwF|)96z^2K@{QUfTKK9X9{`#*+uV3O` +zpAp$nUe0?|NEyNuB7vZd#+*IgQW#|v%iU$kRJw{;YB^Sq$B +zeXjZw5ikDYZx7D+0U#J3xdGQzg++5tRM1r0x|1{((nlk65M&u +zlwqWZBqLacFkxXa63oCWNIPGP$kC%mXJ=<$yKrH2=}NHE(}D`cNUa1Z$l*mQvy(Z( +zz@u29(~h|;Xy$-ZlUakT9*>#S0;s^2#~SHjD!6?NdHEV$gERQkcMpvaeTd+^FuKAO7{*wuzvitf@2QILcbDIsg`qnEK@Yb4&VueM%Kd<>FilgBdQ3jE%Gh%2A<`y-zUC_M3w9-!C`uORR!*Ouo|-DQk@n$*g`R=l +zQt7JwCui6yXuH900`2gJe6P$z^scD5m7>-NJOz@uwv%Ge8|Zq +zS!rC_01aeuadGBDAH00!%Es##^_@+{tgT^G;=xOq0xy(ogL!dkjrE@Vu-Up?wE8G>s!Y}wsp3$iP{Cb4UPs%4iU +z7oqNU!sW%&$B&0$=%&qMJfp4kD)hr~;AMTGGcw5)8jOW*b{|x@NAeotK%v8y%%kS>Eo(qSv@95aJl89T&1=$X1U7C +zB^s2LZi|0GcUrhOf8ylHX0r*Uy>;9QuZp!nSgx+OnO9~R!!UFimch%p))s=1SNVly +z1?Em1fLT8T1qtQ`VU}VBVM-N}t_sanK`wVpO-()f+;f|!Hm_c~6x~`?JAFdbHnw-+ +zMdLy-Yc0`$3>;DBO<8(-skj*#rVR7kCDbgd$E0AZoNZN@#PVgg!mAQkP$CyB%&i%ThZ#e>h+145K@pi{31_?K_T5odws?-TioWc4BYtN +zZjuBxI?Gmg)hw&WK@Y5?iR^6>$DxYtWfswC3O}BY<~^bAv~hlR<=C+?uu +zQh}~)<2FRlTBj77ot=K}UA^JXWB*`NgcIY_{W)6lGVg{G6kpwMInHdTMIw9nU;7I&#(H?tR +z*+|xZKI}(orI%e=WgyG1EMjXH{Qv;E8FHu7IkLR8v=j!xp5y|%PC8d!M5W2bqHXj_ +zRIT`O{yVNQw6Ry3-;+{a&1$*W-ko;L?s!mj%x$CR^xM+L)+x43mJcf5C9bk0G|!*V +zm0<2c$%Ggpwpy*zr%orwj<2t;uU)&I+}WhTkXRF9QkGp{`|B5q#cVo;KFiR0Ov^Gs +zzsuSxH;1chw6#NVq9LPF +zPBB$fVcw@kg1Ib1`za!jWMI#61`f`$W98t?Wf?fD#B-cgna!GLkDjpFGlI|TVTI1J +zD-(g!&8y2(ibdy`@AOktT4V1Fhk>5zH0I})mzUe^c5(gB?&PXkl3m_?V;6W8`4#3# +zSW$d=t-p%psyRiWLVT6i*vS-LVg;Hj%>Xc6See)P +zmJeIDtlYs__Pq6Q<`NCYTFwUwHK|E+Ae=%dJgh}#xyz^1Jj>Fmu$o%NxW!zEIiKpg +zS@0%`bi0LfGqa0}v$HcwDS*2p7mVF%7RzbW91Vx7 +zYim0@07W +z?P)ZC{Xwme`QG0-EH$Lc-;HaaPuURXyOwMfyP)02mj^;2)$h2g^lyc1+BDO^7f_GK!Ij +z!-!aG&5YJd8Y9chVhkg;LEUXKvEl^4T~6c4kYV^h +zSbF!Ws;sSwm&F!7X27cQiSB#hbZehnb4isJ+x_5Heu))vyCtpWIBZoWTqV)9N7Pj{ +z&6x8`m6iw<8{&jne~ID>p{(s{L3!EKz67sg?1lT`S0M6Vo +z)%8i$qg`mT4ZBxYzI`$b@Bc={KQzCh5L)@D0uhf{8Liwro(tDlV0jeFIhAj)DEsh+ +zV@tPME$X(r^Yb$^GtEY0FKqeQ1y)zm!}wI%-D_6)@bWsTI<8R_d*ZkSs`)#W)_Rfh +z3ntLfUf{qBaF2&P*hOV$|1oXgfF*=6*a$x*T%qU<{B3xNkSOuHV<$;sJ|K}UAuP3% +zL}VHzqSasy$c#`_oo>6`IdbGk9LGC5JDYdzL|fZ17^+N^<-K=+#WoLv+-4SVma4NH +zTQ0~dR9FT_7iy5*STa|gat(@gEt&U}T%n1-RG`}Hmmj>!vc_>4!q~;C4`4FkzG@L* +z_qwVvoRV^-Xh~jWYuy}Fxz~HMhr5C-1(sJE;nHoNkdmrtL}@j{nW_2Nxv6e9aEea% +z=@VgG8GTjjE;sF}3hT$h%P;yWcP7lhm9G-YpqOn?o5L$VDV%L$$3IVk-Gc(RFyHK3 +zW{#nQFu{^o$nFIeRbhrMGzpl8Fs*fx6c9$tnus+sFY7GAooIoyvsV8&(N1=X!@|`7~t-Uf?OUoL2dlAT27(BQtkl +zfMipjo_6ydPpp)0V{H9>NFJ%W?fqyo*}Z;Bs&6d*ZQKpMz~8A595(rv{V=OibNN-K +zt`N&?V^MbH*A(l(_Kz)5q?-+CHq=zNJ3Bi)JzXia?h#wCTNRUQ7*nET0;y;lZM&Pm +z?EvjJv#*d{&bE)XIkXe7722z!|J>f~i5BeV1v6XT4UorS7GW$vu4T%XS{Cvzw8?#D +z6)D4&VOL7A?2U;uGijZo%Na(HNtG7Mo?(QjI-PdAePnq>Ydstdw|91W8=F4Ma*vr| +zMO&PKALo;Yt&$J}C_>Fy^pLR(prF?rAtrhMGH_>dbH|szC?Pnj0X*N}J@B~eJRBa3 +zLzD`eTctAGskEZY&G+wuYCPrg#+ef=^d8_6B;D!5qUIzP^tAVVd +zqKq&RVi5A06=o-SA;C}YD_M{c5hXfFKWdL+M9SDnW<#-ZB9` +zPFGfrXsw6C;m*!ZZ*x=c^dO4WD55wq`M4|1($z<*0Yu+#yJ8FD^vVT8e{qSFD05i7Z=zw +zsv^7c4TJ&@UCv&PdjwuZc=?q`_rtH^bYzY&=XW?>60?ojz+EC_31*K~8rz%Pi!^C# +z7&D5Qk*P34F%ySnBilNJnW>oUj|G_k5MnSjHP!9P%8F)=qG&Ma_j>)|#wH8~7$p=Z +zMw+=egRJ-~g@{|zkVj)+Wf~MjnXkpbUDlqLVmM*HI5*DXSMkhXMlF=mz#z_1U!d~?X_22EF{85*OD^}lE)Au%R?5U-MIk0a +zWk+d!W#%Ovkb#JxRc%NVDAjJa7v>k_#ECdbhQndM-|ug2>HYwsh>SF2slr+IY!Y_L +zQ^9kEPBXGR`9iPE!YRuDpKjn*{CgP9`(#%~WBZ!{z+Lim*{>dx3PU*d#CBmcHhr&j +zk#6m1QEj=wmggD4-_3BGf85WcL`gM{2NohX0&X;**--6vXJ)$7X*Zj#APB}8BOE_5 +zQ|%DP1oKd;K`7KMdDto_FN>{8b``9n@-7B$G*&6Q4rsPI*x$_@Bbm0CaqGg&SJ_g` +zfj^)|jf{xqT^8QwvAs4HGUu1lIw>QJv}UEu`?8lzWtjb#;>xsLOeyAdT(nPZi!=Ma +zNz`aGW~Qg*$PrqRg60iUW5eN#f6A@#^FE_l;0{nzD +z>5N}W>!d=0X{}jnt&|>zFrQ*M$g<|K)xOe!nD`aDh@@1r*_@l56#!w5lO!6AMp4us +z^rMX}j$@1yiXu#yOfMkcvK63ak6vax%LQ3jOztbECMyE6k_5x5biW#2PD|SRpHi$k +z+og(SBE`t8WFd=ab6Oa=PSDBq_ws#v155T)jv$ISP~2!hps>+s&dyA=+l@w}*=+8j +zuwd+3f&DS7GM0xudn4pI(^zut3tqV^bXNc57s)}F(+o#tr~BK^uiX&_2q0t{f)TS& +zy1bD6C6J74Rtx1I)7nxji@wH4Fs-#>)>^Y>tu$AK`jtX#uV^frv;Fj>YOJA^>z_oV?T8&#Hi57 +z%g!@S0>3F=-^U1*>V*gcElq +zN^9*?j5TX^F69*SK$hOoWRAhiS(d6EBUg|R0~It|tt?bw7M&zf +z97Rz)91cglo*s@MibONT2@2CF#)_1xh_(XVz-?TC6{x^nPua1teKoug?rDW{sfcS= +z@ipFTj$_UNsj6yJ5ka$|n$2dnV`vqIp*g+pnpV35Yd^tOWxQ1dFLz4MPWC&Ivm4fD +z)m`pC2SmHV%kznrTvXMA&}oJ<8TTRKa!{wzOl*Y(q6jHaN;R6zd|OZv);iHT +ziDSdHD2n3kZDz*dNCZ?A0f3nzC_l?x6^7$$NoCg-3$jP2>$?TTJ{lw3)AtM9`)}TV +z5rYs)7zhA28VDe*CMgQ0ry7k$BWyGpjW9_285f(1+_NPd3#{>Kt1P$nVHGo4IP55J +z%b92NJ)_%?&_`6^qURLHlPlMMlg6*gNl7o!H;IbzlG&;6`pC551S4n3eLDY)IO*bTB +z5oVnvI*#Kwj*}#b<2W7+^k^iB#wZp8HDO?}wP}?a3bAym;$DO}=w*%apl`n)JQV_U +zAT(kM0i+RPps3MoblOfUy)Xy@bGGd#{Tm;`V@1tLWpOFE-O6!n-PZW|L>Mo)Jb0A~ +z>NBx5rk#YZrBuZfZN~@xKWQSr!A!hlda|t%iQCgJwINPVMtfU#*s~mNfn$6UzNltwQqKLvEY`0p4 +zJV=-|vnl1xhfb2gP>&)JfjGuQ3jk_u<_!QKbEf;tunw&B{w_2A{e#SPdFchEL@5N2 +zKtUKF5;YoOyH#x1LPSa-;(qkh9(=EChEP?XRknnCQfvP{u|zLVca`0uU51_Wt021y +z0*oB7<@!pmz`~hZOsQ2RyZk1Elf|#9I4o_T@63}qLJU!u0TCHZmo6Len~phTmJ6lT +zs$>ejbPBT+Qd;XQ!snc21%zp*&{cM!Sn0x^AS=ZD#neAv(o!^=X@4D$XccEN0)SFV +zDY4tQyB1Jv%x3vkJC4uk==l9}E2f7d-TiOBuY +zH(Uw;Tef5QA{~3E9>w-itS^OP0sPt_Uw<9%-{rsmx&8df%x!5uZawU^8vYZFxA3K(rW|Ojxedq6uG=TuYE2sz>8&;@#*;G?69Mjw7*BZJ7PRW-)BT` +zk&3gu@n{#?D7M0DS(bxe@~#A!&|Y0$5EOG2rTBavE1rNXE-j7SPrl3)x@;#J9UAR? +z1))3{N0^HT6ScMu{n$#<0ZOey>8w(86D+;|`u*#EKl}E2@4tWly5GB>lweSJ`PV`~ +z2mG(4-EKeRwz|1;yfMfRx4r(`IRmMPQy5j#9(-uW2Ss8AF7MAb*8~*CQuWdaFy-Ql +zXPiO{Z7c?w>%hOa002zSRD(l!(v3#mL~te-}Lvj +z!tF77y$m`pqEfYw%C*<-1z3Tq$qmGuTo_(vvftT5%m+bi2P4Z?Ag91KECK)C;jJ}w +zvWCJ|hQl?$;$j;T&-<}o^V?mU>ejkc!4B*k`^Exm6D>%A}cdtbKv*Ip`$ +zh0tIQWPo2M$ecG;>{NQF5sH#Ua*XU%lC8_fHB){ny>^&bV+6Ln0$hSBc6*h2f8aT8 +zT-AK@3TsYYIWYNM!%T1`yNEN}i9xmKu!YA*H0jwdYHb%vqXk8x7hF5S9JUm@-qvZo +zy}_?o>WGQx5sxu=aOXY-ub-Gl8)trS~9wRB{A33AC|-i?1)Nt~5M9#;jSLbyaQogHR#D +zOfe=W3+htQsxCH7*lM#;T$FfPmIWbC82_4FVy9sL5f30k+4a`{`rY2_m(U6^a}?}2 +zw&U7pV{NJKd*Z!~*4sX@u${(x)8sip2AzA2t*qZj+WRNIeBeUU>;lV-E-U@Ad?95T +znf~Lkk9t*rlk!c9I145YhfZGzki8b`Qu%wjx?x~w{1Rte6i +zD(F~2R2ef4(yCNgZ;UNXE}^-sJI@)pI78Et@XCHsDY(ue(HLE1L|0re^2gF&NQj-~ +zBpt_7A7Loor`Yc^BDjy8U}LPcWE<_!Vnb2P6Kxe`sL(6pCU)@=iB_%e##1`(8>V&FDZE;RwbBip{eO>$8`z%zA2n#Q#cs +zu4~K!>z6PqA{U02c(Y59#mO9Jj}j$}M0<{9lGS5uFsDD%CV)n#&-N=m19Ew*>ksYv +z+~^P8kSXRUwr@|mZOR>Jjawgm9R8TsNY=H+MMZX=>`av| +zi=n3GI!xj$ib_-`72?3!Yl$x?yK;U(U^&5MP*pKYf0|QUGY6r9DG^R{vC~RcH$h-& +z?wLo&XDPM(ej=Rj?8)_KtgiRvm!g<5#jL%*x%)b7L5Cn)wb*E56Ji_1fJizt8pN4^ +zmtVMNfllyYlKjP_o&mI&IdFsk!D>-<^aeg6$~?6Kiq(jkr`SwW^bEP;ho#gKv(_uY +zW!!0h9ER6ip~WTPB_~7xY60RnTiwSRG_X`Nq`4ztg~q(fp*{z>-i2R)V*A0er!OWb +zb|6f?*M&A~W5ZY5>dJ#BE5=5ooxHX(`;RfXY;51>#g6Yj1+uNoq#3J!4q=FBGJx?i +zmQ4fgiWK8Xkj*d)R5j+Um&42GF1V1j)J%j+lEUS=679tLVaSKy0nGHj^fS7%kZP8riDa;#zgwV)hhw7!j7RiOvd>*(~8yc*uY +zvlPEvKV@7~h6vlQ(0L)Cn8#SnGHGL};mtA50#)_8@X8S8uBr#Vno>T=T_v` +zul?=gtxI=3)Ln>SrOE=@q6|Ri9;}t&)jhOK +zNoh1#6@JxR6GYpMv;9P{K~SBYXIvBr%hq}sAZ%RuJN9phmBh{_BrL0MU}O()aWhoDU({p;d)-d_00SV<(TmJhy3jo +z=LJO|6UM(fhbTCes0WO}eULId;XM1ECR{^`k^Yn>$27biiuKD*q!E#8lv%KAg=Da6 +zW!rrMia9gpa(c@k3~VR57z7oe2&8=gTcTY*bJQ97s<|qiMxp}m1ir=BU4$%20z5saTb{Znbu{5r(o3eWTegt@df{J +zXMJo55Cf#&&|MU10%#vuLnSO9PlP!hThYGG|RZ=MH3Z@iZlp=!ZsuqnQR!^k<{2aE?Ac3 +zu`!pdu)C9FPo;e%MS<*LCX_}MwWC>RY&o}H6p_xnhae-ij=sT`wZDt06zbb$vP7+}^2OLrSHidow$x<~%K=A5(hGmjq>o9KUq!PkJ5p;H(5dTG$~ +zgIV%lhhK%+zwK5IKZ@lXfpN_H!?Dmnrg=3KN+h?=FH$jSCv&+9cs=Ofmtn9M49Eu? +zk@#)*pno4DEHKEluE~S=aP&kxkAh+ug#e06LL{+ZThAwyTA!O=MRh4SHum!{c9@Z8 +zSqQX5@8AUroff7QE(6oX?yM~`w(W;FmyIqAd95t`ImJ9zNvbu#nSvKI^7Ek*6Fz^s +zo0lv+v)lse!3pafzABXUGknt9jXv#-&AaN1lC5r;Zn7kQ?8sJQCOE)_C%&k>D5H%6 +zuPQXK@_oe_k3Q~*OzK5A#F#UFe(ZY)m4D&irMAk_cWRMny(t{Am40bveL;Rrv5W{DlSE_p{zWHKg|nl+idaUvyXS(} +z9>dG@2?hKLefr=7f+}(C=jumBMIj +z(LS6FNsK^=U3g_VC?*Lv?eI{=ndD)_*y-rXFmg +zat~Ba!LgwS_mBwWBnY1GXuixNFK9M7oe|owNftij>R1nmtrAb!dWKeo68*kix&0sJ +W%$ntMK9COp0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009ONklHe7?C^`mTjs9V1q2r^+<5=Urj_CXsM_jDZ1Wd;fu5Wwz(SGzHW}4Z(htMH&4GtVbKlB^xe<^xM1`P;SWliw`;5II6^?+n +z6U?ragHFo2n3()3-&~-1;T-cCzGwWKV&DjRw%umZYjULy{DRjBv|8{kfwuwJ^bCQ% +zO;Zo74jCADs^G5DYgI)#hiuFF1dbIT&ekM%*;*pw5jghH)FXoEM?>>=5y1xd@B)Pp +z5gN<51RjqQEDB&* +z0r>Gtf}uj^9|5@hEnXz%*xW`S^N?9u#1b7!z_Hu8ECsiAk;Doexh5^dZM>BvK@zEA +z0dH|31ve|2(7+&80nkE?}v!R#PG)-+8kJOxKA +zxqXGt<=IvTkDxa^=gk4v!x8-YdTYe^ty90C1p((P)Hf5>w5ZXAli%83h}A1WuNaZ^ +z0pWfeLQZ0d*|6_f#1V@1$L@-?0uL_92V*hh6tM%A!_@&bfZ^;?73vR7c!*Sd^qcR1 +z7{q=9VxsRe_AW=>F`RfkgjG@V1=mpe98~8&H@L~~@quyc^Vk8nGpxtq(9$0Od-)kE +kKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009eNkla4C}AlyD=8B}hykPuq_9Mk4RUJ=8($Jr +z64pd)soE(^k;;H7!j^XA5GY7!KG&Ix>OVRd?&VKhXEBpuF})43!s1~7?i}^`#jjcDt+4pD +z1PyVFMbBe#r!eBcFMnY%n+33UBquHg+o0Lc5QXEO%VO)St)5{RIA(7C8~|v;fl4$w +zcxDQs!}oyYr=}VpVa6g#@WYEm{{5&6t*itVmY?9qlE`E@X7cQk;Jrhx+#_g+BP=$$ +zEN&%3%5d~#%;Zr4Eh_aJGJlN4@vddy2>O28iIp&+o-FY_+Zgb;f|hBv?Kk5!f#Vkv +z=)E%@twue#CiG@{Zjs>XfOp*if!}&QTxDHU%1X3eZQy7jSQe4|DSt+0F%sZ+CkR>) +z7IW>f0ytVnx!Qii_oufnAhQdaz)_7XRWH8k>{Bon +zmK9TbnXrZCrwOKxh16@RGd1rP;wXzP(+IAeLdYJ${iz+^iH=HK6Br +zCUrlt&->x?;O(tSyg{!``u*g9dwiN3Fj&A37}fRT=+UqK^79q{3TRUmw)7@0++Sr8 +z_r?tElpM<9#+a&2SHC?SbhlTH5-JU9sixaU9C2{#Nj+87u0*#scplpSkKXZb*TvEU1ZZ +z%<#w4!kWiacW-O@1K@h^V34~f8QjWYo7VpU0H}D!ZbP%4egFUf07*qoM6N<$g4ZCk +AmjD0& + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/key.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/key.png +new file mode 100644 +index 0000000000000000000000000000000000000000..7a3f563bdeeaee0a604e964edf60cd2facc39b4a +GIT binary patch +literal 2857 +zcmV+^3)b|BP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0000~NklG%47fB);3>yl$6$2obP=l$IG>wd@R>#AL)xkUp2z*P-(WkUcU^8~-I +zhLD5L-|tW$!2`9Yy16$1T)FY@iwwxjhJnANLTl)#P)(7sU!~-n*%KfF04JcKtZ3{% +zvk@}l!QEHqKFu)j-kfsosb@2l@%^Ms{0GK&Xp!#@QgIo;b&6U4>rOlKmORJA&9*q6 +zD?#^d-iaj{ggf6YqGBIwRJt};1g(!oUwyL)Hxz%fbbFiWfy+40LELW_jqH>6k>Bb4 +zjVFBCPlijzL*}O!E?A;3H~Fvu-(mL}d? +z(Znsw%_?(Z#C4J}Ugm{{B?v4ui^bK|^$`S)VPRnreK)YS7yJxHgr#W-rhZ-VLg?7V +zKNJYvUB9O=!5|@) +zV!C3(l7xh-qkahsjR^?};~{5rkOVB9K5fC$aFQkthRiI|;Z2sh6N+hqW0HOarH!mf +zN=SaA`ZaDFY{AcP$$YS4?V4=Vz4Nt5U&|}$(M8VjqN7HcLyksU#makP7*C{kgyGD2 +zyN78r_Eb1`fLC0nd&RKY1cHvOm&`ZwReWM +zBBFD&dE-UfSs-;^{KC)6&VNN2oSy!9Ccfm$&0)ax=6#A79z2tj6C5MP;TYJK`wTxg +z|FyougZTQBKHVC}=BWbi`{Cd1Sg8z8C(`hrKlMe{&?}co@-rv&_ZQcmzuACkuASApw +zY)cFeMWl@RJEoE}b;eIVo``-)?j&_S6W_g9f1dec!}sz{@HQ7IKQ~+oRe?4#kORwJ +z(wmF9YcW%_tKH3=Bt=r%x*wDvH4W9-aq=TK1PytUH7-nSTPoaKU7vV7Z3)|o +z{Uf94ESRdvL*G_lBay{eDD31h8+8+_+>}&upTp6CCct4_VCVCm+{hkpGWCL|YQZS@ +zsWM+S|L-6$xgSGy216=J3$S}}V;W~!XepblDkn*EP2POz1B?p7+Dzd+>B%hUG}i +zw&dCM+*JoG*X{HH=Z3m@1CRY~{)-yPDD>GK!z2~_xayVJ=)*@F+YR2j;x#DXd +z4&Q6n5m;XU*yho#Rkf|R(N!ahuS%~-Uvem$H~6>!j*cxq!|ri#%iQW>VWT=vb`@jt +z?=`g)Ojoj@5Jf1Y>&8s5?cHFjpICp|D$x;g&r#v;n!@QUt?b)_IDMrnd^$->#9NrK +zqbFj{4TMO<;&6`awtS;Q*?u#8OojndsUH#J3AB&UQc|1`JrP@6h~rM#*w_eGcrCiB +z_Bw;^K0@!3QHk+tH*N7ihGMU;Cud@7*E5t@#!)-nLd1UycUBoz8H?^$@}O#b+X?sG +zC9<3`H277Gu;d}fI)X)G#ywfZZpX5fQ!)TR_Rh{A`0u(7CA3s(L9l2D@a?oA~FyebWLRTUgL>D_$vFR9_d-ecK!11sRA;(vOba~TJ*=?AjzyD +zUEbu|)e`Xu&x3;6x0E1^m-jT77F~O|_mr|Yel9NBOJuF|Y8H&Lxcmuum^EaB#)?UV +z?oXJd7{;T-sI4b`Sc|QMJ+dqv(0$vZX0|(?vKg3S*_T_VGj3O{Dl^weGm;qpS?1yW +zmcgi-TO9LmF}wNG)o!P9BZ}L^7%g2~CFxLz5t5uOc6Xq3lBFZ~h;ujS)tLI^!FtH6 +zte}(q>5pX{C;g%RcN+6GYeXgL%Ol2(B7)a#y$r~K(up}EiLw4CV%&UG5uIa}OIQc;P;MS0^&72~ar)o%$|>-V{kM)* +z507@vw-hcmG%znkZ2~)MbFRU2?O}&PhY0U9pY3UnbL9DJX~t{^(%g6*&W-TO-q_C% +z89k(lTe`=g@Y9tX;D=?wkdutNMFNmy@NGpo30d4dH{=KT(k=rcw8VXe&$p?c!nOpI +z27P)lSSXfD_f>kX=snYxMC87cV;KI0qcbl&P +z5M2m7WFc&4sdr2Ry>Mt^l9elCZA%3-TKna;+O+zkPD~FsADF-4GpH-Y@4Lj*k7H9Z +zEiDm~@@B!oA<+j_iz35Wy;}?z4LqJ5{<4~n4?FEb258$aMThMY|Aq_;+{?V%hteKr +z@N*Ek_kj#J`^4pPPJ_T_>q742khio)x(zwr0PM1}DHC0sC;(>N(qRF%iyvM@I=P78PfnVhGr9h3dm1RzdBH7X3Rxwd8U9UCbcqq*i81U?IeTO)7ERmlYK- +z?p*&8`okp%TJ5Q1+#r>gICi!?U7N@N|VMnJh7N&rB!mkT+FVinH2 +zj!6C5X5n_P9`YOqi5#=9sHXz_kA5n;_S<2`tU7BBZ|CPJv5IP +zSi9A=dh>}=l|ekw`td_U>jtgTyZgPoM*gd1#&>Ay90>KLE@#G!fW9DOGIXZ?Z~ipB +zXvP`DtJvxf1qULUG4ftk#%G?))I3!?VIrQmvhrj3fQtc-e|>mJ22A{RKMO8*5qt)b +z_FRcU>89KlV$3$VOAmLZ(GsnshhsfqFO8e}jLetr%OM +zn2wNMn)dFKF-a+0vlZs6^R1XFtZz^gU^He6y4FAk09;}M6TdfG`L8T)#o$ +zY|YYhv&?QvN(tcSLzg@&rGdNFTZ~^>^+yNNUa6~ZpaQ0*ucyW?mDnn90pT2%5{aCc +zG+AtmFikJre5?KPXu-$Th>I_;e;w^{E*kN5!*MAH$iT|3iOG&iPF>X<;HaCExRcdP +z(8O`^*9*e3Fwi~}1img#L!Kw82frygjO-b +z?i|)>Z2S_lSsh?4Nz2{phw(qFb#Ky>y@ySS?XCTC`1HNFjB}Ym-7jXGbEY$BSP>+ezc)h;)ud&0>MXqmj+1E?lP=u+&2FWL3McPnV1OYI^`zQBlwjp +zz$#bB$kaRw7S>r5t3qDBS`;Je$;;9b(dEgatsLjf^nkAyIe-6l^b!%(eQn}=Llv#k +z$GYbKk5w>*ZPn%|NnZi2gCSO3UES(ldH-@f_*xC`|M~e#k{SYmppV61Fv`Iga`<;~ +z9o=6moeOt`n?*lhdg}O62tr!?pazE`Ad7hXt7n$U{g)8$M%Iv% +zeLqF3E${c?X{(lSLIZamre_`WFQT8kx!ydUdK)s&#)Hi!!%yvbGRiJT{@Asn?(0u~qr}6I+3Gwef8Q0ML|~u* +zm-X8`YUfb;!Ru&qO^IUux^@z_|4CQ(Rra^GdFp4cuG8Sevs*gtIM+Gp6IXYYXMgAU +zy&8R%qRwOb@rR>~`1bi?Oo0|2cHxPEoAseXLqE +ziGAnVV+hW~B;k_}u!VVV_q2#Yo$ybz1!&1$5YdI!uA~F}nTn!E)LH~hnDM9llFavM +zZ1?LOp#ggI3JH50E!zsJ51Nw)RTP@PU5`FQ^3~M-bpN_`*s|AhavW7u@_Veobz}MN +z^Ru36tI3t?447{yxjvLd#gA?(IxcfAXjfpt3(;IS1EK!-&x1Cpv(FzTZ;eXiluI%} +zV@pf8AiXFV%phemm&LW5Ct9r7Z;RxW#pq||ObC82?_l&EN6^^8ho4kraExeCX(s&6 +z>5Yhmq42{Gu`W+@)%k;sn=7|c27+Pn2>}boeW#}rb8`b*m93GutG85UysE +zS`?*YLk4`$tAE!fXKZrnb6{3Q{r%zj;$bka{F3<(#kSFR%+J#M_M_V?LzJTXHgef_ +zIWbU#maAXu)u6J8OkRdQ6ae%#*=T{bI90PMY~hoC)M3zavH-fX=cnJ5P8L_&(5LM| +z)k|KYcuDZUb%nlM2@YshqZ47^=%~FWRbMITgxx}WyK5H<^TH?O=MSb +z#}WF3WMNWbi(SZR7Xu62n2`4dj|nv}HDmG3d|rGguwW4_^X8eBiIE}&bXRa0@w&AO +zwx>G8zSBj*_``@3zi!-84gT4<@h252mSKhOZ&ELr>=-W<1m15*fu35}=|0b0uKj+8 +zhe}HgGy`7Sv!8zWeHW5kS{kX`O??0520swKnDm2`u>R41lL^YY83H`36e#JDhSUL1is +zl7tbxnp)l5?;c9WQ9nHw_q#X4XO@cLO}Srm +z^$&0tni4<(Z+>RQYf<>2R5hA!rT=X^v;ds=94xly-b`!y3@T&*dhYVji$(%BhU@#4 +z($bUmkq9LdqvCvc4s>_5IsDSs)EF_737;IO$0Ds(Hq~BJ|Kc{j<5bYG_l!}v+Yi)^R +zaGde$W@Qn_p8x!IuG1_aLKZGa#E{VQF6n9;5AiIWcvS7}?QG>&N~Py14~~w_p_hbA +zUvw2vct3xxaQhC57gWpeS~uD9f&%oBe;CK?8F$UQzq*%nwZG1PH1=owL~1_EAP+5y +z6isYBXU2-(JINJTr+&WIJH!p24?CX>i-YivD3=(cWpW&AoMBl)X*rBTy(?bR)#Vm$ +z9)V9Yi!zvt^yLtlL#EIpApGO=1sJ~Qy_`XID6|w8}1Oiz;$I?@5jhyD#!$uWW9#WVXX}yO{RNKlLMMNIPJiIyKE5n8N9dlas +zv7W8Jp~SeiPLZ8EFSSt_E{z$JU1>p4a-&RXd!2^a&^kOsrlBvNlJ>AUk0C(q_~&Y +z*?Nut=2%XW0b|+!q`@cYlK&4Kf+_&Chft}Et)|N9H)-hasU|t`aQ8qsm;^xgQ`^l3O(_VZbDT +zC{6_r!!d+}`&-gc$24eR0pR3syRRkbAh61O@QK*ZBkNC9J4I^&qOklFL(MvZ+4i|0 +zCaK8zW%C**Mg*U`*1M1z(nJ|=_DtCImHgaY&t@gx660l$Jn22rE|v_Xosfrb)IIrL +zC+LGfFI*X|pwG`BAtBi#%}&SI5Z0bEvPNXEop!C?M!_X6v&BgFt@FT*KP^e+@croA +zS1~a*onYgUELo+h|IP0123G$ +zrBi#-{;s@1b}WD*BipojuJTvvF$nBXGKkt$@q;vik2H4MQGPuRZ60{IN>6htN$k5p +zFL?z-WN*~V>w71{^Z84Q9D-jQey^CD9R=5Pjr%Ts0V0B**^of+XAQYD)cHF=-LHj& +zQ+}knXL%2oD^I9+$r(I(Xvwhai5PW%F6#9CwlH<*hfAQOb30ulfFw@wSm2+AqYS3| +zV|&mt=kBU@E}5~@=hk=gT2y+#`tKPX_J{u%RNB7RgW1NQ$qnD2w%o??BxSDAtwZ9y +zi3m^wsudW>F{G*UR8PBhEOf+6$EOl2A2*b?w2U*8e#!!$LD-hxb? +zG%e8F$5icGW`e258&o0TGYbvKQ$5uJ10EcHF|#R&ct?ppar_0;-OX*fp3Ss18ZcXx +zUGeh2UH^lpH7dEZq;4knDcjlR-h$2XTb;H%!Cxt=P??$SUQ=?FOo*N4^}oqz1%5u~`}7#-8+)=zQd?I`I= +zkf24{%XPs>ho_P$Iv})4()oRWFZkHL8}WVv-F~z?@F`(G!~d{+9ZYs!RmJFAO#1Yp +zdai0uPIjWwkITp}I9_r#HVMshvjdMNeWri&cpWL)5hU>bswZ<+cb?n;!ksfASPQq2 +ze+*!lLn!{{{c>LxyROI{yoH|`V3=AO#jf34xye5SXB`#eqOv+wRKwL +zyvwoI>`wMmicJwiZeQKpa{9fVt*`1%8E6Ow{CXcqv>WL8foah??)*p=p)1Jy#T`PKO2AjUDs9&}*^eg=~b)=Iv47s=( +z0rj#@ud3pdzG}Z4x?)rExLop9B2f;swcCpkjKmbf9lk0*W9zLEXX9+bNS;lI^{M0e +zyR%iU9My@rpt`m;)dEyt!1p0?y32P4$N^0D%PNP=Ro!D@B#|$TF#)l7Gx@kR=GiM% +z{t(c?PEK+>oc9oKk4x6)XCnu|V)tl)$x0k+cNusT)g7s7W}_C}ipt|m0j>3fOAv?< +zuM2K{m5vl;61@IS+w1lV#@>x)_sJYvGiFW(n@~gHbf-q5Uf6luua_zM@%HgZ;hfcc +z?ar@5)~uPOWWblE@m+f6Y?}#jFwi>ApSH;O%(u+Yw~q0d;8QfIGonfVq3c)i(tglN +zlD1&lmFBK`li)u*$&UD?N@Wh^z1r=`T5RJHZK~u^Vl2P}4tLdOs_d4=bMzeriE9IT +ztKPTqqRA=>xy(aMNTT!M>V&zdHcsu!4btc8JCMchC^}QSUL^=A0dI7AlWvJ8ANL=K +z43T$&E%SSB(nO}`{fd)tDd&g4`%t<8J&w{-^=<@-u((C1D|IQB +zQw@j+*Kf9%3pw-em`ETDp1<|pxOD9m&S8gV#a4LX +z>X}_LrzAayvnzvoo=mh$>JwrJt{cqm+ejH$iVb1XWeYRkPvA)zS1LI}-40zY=OA>; +zqGn{)%54ZA{MS*vc7albqH@!Xo^_AjF%&ab7M2=uf^5OcQeS2t@mTS?K>OXl`S=ru^F};y|Ktsqt6$3wyPv +zGOU%_d*am8F+%$M_LCrQ`6ZPYj4i@odfw7JEuwO{h0Pd#1paIKHLjH7#IILc5;Xpu +zvq>b&Q(gB>l7HDZUzrM1p&Z?XkH)%zL1!~wuJqEy`ZC#D0blK5s>}CQ14msGZf1q` +zdrtaLJQUF}`bPNEndR%?F|Yhu-@+i}neFD*b%b2L%a!@EK|bjO{pGDkxza~BW>mrn +zV|yoqFP94}rM3qKml2lZ7ctStt+}4riC~Phl{XfDM2lE-l7V20_40OvTD=oEE-f-b +zutX_n*8uuARw>YsU~O`vTD+;rSr>~w0zrJ&AICSJ>Bt9Ueh!(4;sKy<2aLK)+?=R_I +zx9=qo13dXsz^^HGT%^i|CNu50YopUD6L3FtsWTy3e)LT8P&B8#9!q0#C +zj$(qTiOCiDR#J1C&o@_zt4Je#qBx?pl7#;z{wJj$1FcTBCh=BlRMa0{oNrxRf2Wke +z>-aCJ7(vPOaJN#oe52ggbITIttrUHR^V$M8OmHgcEsrgOQ@p?s31eJg$7>F6eveYIhe +zS=okkBADMd9$Y^n10Gok&E79y$KxwWGzosMx;YMBs@YtAVOwI1X=d&41Gy}Ef}Ag9 +z{X?IRb+?G=TOCK4+IzW4$%iplBu`3B{T`UC95Y{Z8w6_oe5-)B1j +zUE!qsk^)qzRcT%C4-2RU)#NivOG{U!675}SHjHy7eXfLiiV<|9L>*_(lG!w)w3KB^ +zOLMCAtlsIno|=nM_aP1X-Ev#+T#<5@>u1G4;ZF#@3YAGbxgV&ItTaCCTMWwXrQ^kN +zV5~<Q!(-9cLF{U#%1)09IzvzvIm}edym&|RFYgu@vnIt +z3be}k4~0@6{yiQ^P*vi`a;69~#vP~@Y@jhT`69m;lg*ioETIqmYo&$+T8Bs)Ugv`v +z?Eq*&8B)X-?Oa{WsjAo_L6kxQ;5}5h(#*zY>TzTUA$Lm&apJYeuqk{`F&e=YCF +zr!&dj1Y?s2n(J|nLb{4^qP!r@S~?`#^oL+!@5-!%jWn}{(nXc!^SudXy#fX+?>=6^ +z>dS!opvpva@B0=y=L*8PTLiK*qpODL&B+0)Hldz$K>rgEaS#X+0Fyl89;=Iu*l+vzrb-seyCa}jzE~d#+krGGW>@>_Kq7^N5v|8YWrkI- +zfDgS3*B%%>?JyEF6Tsmigw?M +z2UjA<;fyJZ{Mi5L6VUYpXJ{Xr +z4E0Og0{4;s?b1?AtdMss +z;_ZJVp>Uf|FM!8g;rWxA80DqHg{9Xb0OwnL+uC>DBkr^6gWbDwOK&h-RrIK#lba}= +z)$T#i9Os5n!j~_`!(^wG>0^5Ye?BFxXwcxcQTAdPwH+Q#Vi^M+FOKDY{c9Rou4rQh +zugG0a_YFn14(LfhAHJ5iSj%XMxlO$i*hxn|!i@y?EE-dB6U&T0czOUB<{b^?#VPfn +zjCHK1<{XgT6u>rU72fL43!|+k>+=jW;h5N$eMnOeaR4ZCPK#C15E8m)BV6MJhJYrP +zvlNXNr56%Z;9xVJm +z2=v&K>qzk7KM3shnRD?u3|*Pm{`m1_m3hUcp=RFWG;~*LtXs%Kdb7iba6^}#i3Idz +zMj8whNegVZO12?I!LFZkR-v^Yy +zXA#F8BwT4|cAZMeEI*%(kKH +zRAj}eUQPd+08){a*N4XyGHV4)rKL0VL$EUA%^joMJ!JD8ixJYltw~Bw(b5CVW6@HV +z0Dp|Wrpl9D+(}~-=x!lclLWtfuf4kakx6R-v-EhW3q^$#rL)uwumH`u+j^?0}`~M5#or;NYKdZ +zXZjZ!pD4H3H6O}Z@y_k8cA;bdAXEXy0xH3jYkt0)G}dyX&Bx9dF>WvL)6#INEk64# +zb}m7jSbV)G3Blbf<@WvhbkYax=V@(J_(&S(GBuj`Qlji|8`9ee>$3`7lDdY`-#2Bb +z$m;OH9a{a=*X#fZL}1$@n^~PdrZ#8z1}U85zJ@yHJ^Gou8`x1n6#r^g6gqAw;X&+v +z@z@~r@OTXzhiR9c*&+0!OUe4pNj>6FP1_H*Wb@T|03bWVFa_gfjsB{8ya~E&oRUmo +z_`?d$aaQ_CN=2w$yvJ;2Fv0dytum7;f{SwY<7`XJMZIeQ2y?IBJbzfnl`>4IX37A& +PS^*6eUFAxI-OK+2E`~%c + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/layout b/feeds/packages/utils/goldfish-qemu/skins/HVGA/layout +new file mode 100644 +index 0000000..4c3d764 +--- /dev/null ++++ b/feeds/packages/utils/goldfish-qemu/skins/HVGA/layout +@@ -0,0 +1,380 @@ ++parts { ++ device { ++ background { ++ image device.png ++ } ++ display { ++ width 320 ++ height 480 ++ x 31 ++ y 72 ++ } ++ ++ buttons { ++ soft-left { ++ image menu.png ++ x 147 ++ y 555 ++ } ++ home { ++ image home.png ++ x 48 ++ y 590 ++ } ++ back { ++ image back.png ++ x 286 ++ y 590 ++ } ++ dpad-up { ++ image arrow_up.png ++ x 140 ++ y 595 ++ } ++ dpad-down { ++ image arrow_down.png ++ x 140 ++ y 656 ++ } ++ dpad-left { ++ image arrow_left.png ++ x 111 ++ y 598 ++ } ++ dpad-right { ++ image arrow_right.png ++ x 222 ++ y 598 ++ } ++ dpad-center { ++ image select.png ++ x 142 ++ y 626 ++ } ++ phone-dial { ++ image send.png ++ x 48 ++ y 646 ++ } ++ phone-hangup { ++ image end.png ++ x 286 ++ y 646 ++ } ++ ++ power { ++ image power.png ++ x -38 ++ y 52 ++ } ++ ++ volume-up { ++ image volume_up.png ++ x 362 ++ y 260 ++ } ++ ++ volume-down { ++ image volume_down.png ++ x 362 ++ y 310 ++ } ++ } ++ } ++ ++ keyboard { ++ background { ++ image keyboard.png ++ } ++ buttons { ++ 1 { ++ image key.png ++ x 0 ++ y 0 ++ } ++ 2 { ++ image key.png ++ x 37 ++ y 0 ++ } ++ 3 { ++ image key.png ++ x 74 ++ y 0 ++ } ++ 4 { ++ image key.png ++ x 111 ++ y 0 ++ } ++ 5 { ++ image key.png ++ x 148 ++ y 0 ++ } ++ 6 { ++ image key.png ++ x 185 ++ y 0 ++ } ++ 7 { ++ image key.png ++ x 222 ++ y 0 ++ } ++ 8 { ++ image key.png ++ x 259 ++ y 0 ++ } ++ 9 { ++ image key.png ++ x 296 ++ y 0 ++ } ++ 0 { ++ image key.png ++ x 333 ++ y 0 ++ } ++ ++ q { ++ image key.png ++ x 0 ++ y 36 ++ } ++ w { ++ image key.png ++ x 37 ++ y 36 ++ } ++ e { ++ image key.png ++ x 74 ++ y 36 ++ } ++ r { ++ image key.png ++ x 111 ++ y 36 ++ } ++ t { ++ image key.png ++ x 148 ++ y 36 ++ } ++ y { ++ image key.png ++ x 185 ++ y 36 ++ } ++ u { ++ image key.png ++ x 222 ++ y 36 ++ } ++ i { ++ image key.png ++ x 259 ++ y 36 ++ } ++ o { ++ image key.png ++ x 296 ++ y 36 ++ } ++ p { ++ image key.png ++ x 333 ++ y 36 ++ } ++ ++ a { ++ image key.png ++ x 0 ++ y 72 ++ } ++ s { ++ image key.png ++ x 37 ++ y 72 ++ } ++ d { ++ image key.png ++ x 74 ++ y 72 ++ } ++ f { ++ image key.png ++ x 111 ++ y 72 ++ } ++ g { ++ image key.png ++ x 148 ++ y 72 ++ } ++ h { ++ image key.png ++ x 185 ++ y 72 ++ } ++ j { ++ image key.png ++ x 222 ++ y 72 ++ } ++ k { ++ image key.png ++ x 259 ++ y 72 ++ } ++ l { ++ image key.png ++ x 296 ++ y 72 ++ } ++ DEL { ++ image key.png ++ x 333 ++ y 72 ++ } ++ ++ CAP { ++ image key.png ++ x 0 ++ y 108 ++ } ++ z { ++ image key.png ++ x 37 ++ y 108 ++ } ++ x { ++ image key.png ++ x 74 ++ y 108 ++ } ++ c { ++ image key.png ++ x 111 ++ y 108 ++ } ++ v { ++ image key.png ++ x 148 ++ y 108 ++ } ++ b { ++ image key.png ++ x 185 ++ y 108 ++ } ++ n { ++ image key.png ++ x 222 ++ y 108 ++ } ++ m { ++ image key.png ++ x 259 ++ y 108 ++ } ++ PERIOD { ++ image key.png ++ x 296 ++ y 108 ++ } ++ ENTER { ++ image key.png ++ x 333 ++ y 108 ++ } ++ ++ ALT { ++ image key.png ++ x 0 ++ y 144 ++ } ++ SYM { ++ image key.png ++ x 37 ++ y 144 ++ } ++ AT { ++ image key.png ++ x 74 ++ y 144 ++ } ++ SPACE { ++ image spacebar.png ++ x 111 ++ y 144 ++ } ++ SLASH { ++ image key.png ++ x 259 ++ y 144 ++ } ++ COMMA { ++ image key.png ++ x 296 ++ y 144 ++ } ++ ALT2 { ++ image key.png ++ x 333 ++ y 144 ++ } ++ ++ } ++ } ++} ++ ++layouts { ++ portrait { ++ width 900 ++ height 730 ++ color 0xe0e0e0 ++ event EV_SW:0:1 ++ ++ part1 { ++ name device ++ x 40 ++ y -18 ++ } ++ part2 { ++ name keyboard ++ x 480 ++ y 200 ++ } ++ } ++ ++ landscape { ++ width 900 ++ height 670 ++ color 0xe0e0e0 ++ event EV_SW:0:0 ++ ++ part1 { ++ name device ++ x 50 ++ y 440 ++ rotation 3 ++ } ++ part2 { ++ name keyboard ++ x 250 ++ y 470 ++ } ++ } ++} ++ ++keyboard { ++ charmap qwerty2 ++} ++ ++network { ++ speed full ++ delay none ++} +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/menu.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/menu.png +new file mode 100644 +index 0000000000000000000000000000000000000000..e81d8abcffd3f8eaf515449e27b8f9c8480ca323 +GIT binary patch +literal 3079 +zcmV+i4EXbjP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0003pNklaOw$dUjrR +z^uqLB>8Z2tCfv=GE_XUA?r7Q`#M#X)m%oR3SKQGwDm?%@?gz!cc&OKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000B=Nkl&0YI=ukBGDci*@CXdn0P{qF1U{(kqa +zqg*bR%jF1R369{8D_3*5Z(ms;D*Ap3dtpY{?p$m4D~$@fHYx1p$$cZ#ZS)QboBA$n +zVnrixK-&9;GJGis{wHi9ChX!_VYe4ZXj8a(M%ba-+J#(u^2ZM*H6^Y5{`IP``5z>7 +zPjtxwOdk`re=D5NIV5X>*ePLWcZA&?^-J05R$KUJINU_)z;oic;fJ$?A|l6^%yeoF +z3f-C?T{%YyMFAX^hzuIB@XHxO<8f(YmiiY{{j{FYkpVaQ2DN@#Mrd?K9ap+Ceum%H +z5gLE$=6Jg5x1|y48mx^_TY9t2``sBKtO5zOtm-A9j8KAv5+sxe6``(<2dyJC-6QRB +zVaJwO#D|*D=o9txi5o0pwxI+GC7L7@(uXl$Da77LthSb(@IpY>y+Yut1CZ`>WcBmI$4=Tc5}csTX}X+*o$` +z2WomiSG5s_2}K*HOF1?);cugoeN?Gl>9MYd{0T#ZraZPS&CBoo72JCR>GRX|ug5c_ +z#wels%0D8rIB7Qf!o~WLYODOR?Sy*G!I~yg$M#!N(bjS3ZYdx!3oO!5jYBJhXxrT-Z-&i+#qIUC-qoTcpHjgo4nL*6G2dyPtp=y;$sP^qVNa{k+<2!cdi4 +z@aU9`oHLvK_{aL+uS}2{ql98>xE`tKeYU#JiS+t%8}fVinA8|06jks1dj0Fk&%$Cs +zyLK0p_Ct`@@4Zsf*Nk)5&5U!|De@U7_RFdk?*h=<)@acDJUTtu%W8haJ`YvZbA(_vhUpwAN2c35AT*RyipAsyzn8@?lFhX;&2tKe9KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z00076Nklcg88K +z>GpEaGY$qje4-(`@InnRsvlqk=mB=aT}rg~AYW^u=cyj`5Ob@d@1Ju~;PJ9|Dq7t1 +zdqnbn4SXnJ1n3_uPc3glGlZRR=7b{S9^}oTs{SeFt%*#{1vS(yLyPZGlB&1qm}pCLk#VTX08bi +z#E;A?^MUpdlX-#yFqv0Fq#FbSAl*AOqhA2&*y+=SkpHy#c +zF}HyJ#q!qj*c+dvEN`=-8@f%MCg=xBFGaU!{2tL|ZC7jHIHLwR6dm5>BEbLSMsM8P +zv!a#Cea{fE*s(SE>znACkD}8$d$;;d01rWP*|aSBb3{ipm2S^C7|su~Ayq-Q3;UuO +zEjDX!KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009NNkl}Q`|h07@4vjbIoZkY-aWr} +zea^9|t1By8U)YfA>^8T_HwTaV^Ui69Ph-(uKC#MeCc~|@!>tK`&EGJv3ihPngtwix +zeTLgs7VHUbo6VR2w+h@&e*@56cwD(>CAcp9eRm$ff8e%$f!j`M#DOE=*{5)f +z9-5AJWhG%{*>G%sgcWd#+wv7vp=nG_h*)TV2P5D-8wpwPIbXnW?Gv}_KZXoA-qh|N +z2M_A9BcYkcupr@HPC^Fsok1P@rKvLh|L7d(XTS?mUl`9?_48!T4B*pDk2SGF?X +zaRn_8yieeG!nt#dGyweKU1!n|7t02Eowd>FD7<35J$f{?Bm67?Nrkgn)n( +zaFTT3E!q{-qIL>^V`B_St@d^Sc;_v_(4o)w417T_bf}fZ7@nojqEgty*q5d3zd@1; +ze9;5=W`p3!RIf|7=>fdgM@?y>)KIcFFDQK09}z4Wo?XlNtTf5f!|DA+Zu`4z1*JVU +zrc?Ifvyz0iX77G-0dSn5%6Ee4Cxn!3(MX@0SDTl(t>+2uAfZEw`^68rTUgoRwsDyt +zGsakX%IT0|1>Bx}ZO0q@;X#K4?gn4^8jl!VDg^~C2{@|$lH1~6uXJcMg=z8gTkeW6 +zV&Lxl{TY0~+LO^rE74IfWE6K~JCLG(v0*8T`RHs$Ph`>qu;#=z^wy# +z7zw*d)A0P`M3GzBJ&x{Y?i;X4*SP}&)^tsA#6NC;F|p|?7!nYY%wI48&>1!^n22`D +jxq=XIpHfkMFv*%KG9f^00000NkvXXu0mjftD~?R + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/spacebar.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/spacebar.png +new file mode 100644 +index 0000000000000000000000000000000000000000..19fe604765b984dd1df424c25b9ba0c42f678276 +GIT binary patch +literal 2916 +zcmb`J_dgZ>7suZ>vUm3AW77@Smd(BP3|IFGWnU$$loj2Ztn|T6c2^{OWaR3Gx<y9@7VbcT$ +z4ANnZS9gDI7jBt=ePJ1B&%+>U4^P5!xAUpB{;fig%cM +zkkC->B|EO*WTTvCJIY1kiSXx_K1+?9dM(b&9n$E{tAU!^dXPxGe5tD^&2LK?4s-~4 +zaUX!~roh%OvJ5m>--m{h<|8-tCveG*HaG{I$qOrd*X>f}W4LVGK#d604fe%AM3rpk8~j*-@|o8f}H*mMHK<0)DqnSn1m_CT!FjFu}&QnV+5+fLjPuV$uX +z{}d_eXeP3)d-t4Xyo<>PymmKGetZuPNhz<=&u0({g3@P=TdF>nI2-k?oNPxY>np|0~s+pifTF~O6^ErV#xEHaj^%`_8xBGam@@6s +z_;O5XAX5KLw9|1Som0D2yDj34U4HG&rRGjiW>10oFgYt1 +z$0AKhy5(gBng|sO6;!?b&I=!X`lYPkgO?#TjH|LGnLE)>=eU1fTD&AwtZGG4@^dKO7KDhq{Q=d)UH +zppFQvi~7qB;o5G1C~{AC&s=zdCk^Wqj+y*x!v5@5r^}M$l7FXvXQ4Emw3xJ|^}6*| +zj=eRh_)@X9m9|yaK>xt&f$?m$TwSFJ<<;EP+=<-zMz`x>*X4+%#P{Cjb<5X_owkV0 +z0kPLLor=(o*InyPst8q5<4sjfC7dNBn>3q>ym3r>%`ajPv8+*`W@VC&T21sPM!91= +z_%My1tJ}BITGFCEME!fLOV1iV#a1D5T_pP6ySv<4*R0ZoELQ;(ZHutQVH#E?V4g5Ms%oO9 +zu_&~B-~A__-fz9Tua@+dbTsCa=bUc#Ymghe8~beA1M_ai&LbX4oO+!`oDPE$tP})8 +zlZZ3KIiEW`hixTJYSZvpKFN^BFy(R8_d)S!814V^MMX$w3Kd!C|FLwb0=i#Jzc=zeX8GbGaBLTg|uf7HUwv +za)sME(;6RCKj?QV_&D{Cp$Ta7JC?$l3ealxfIA=Ok2ZJW7YU2ZOObq8ux{6&@B&KP +zZfpr}nF5!bR)&F9g3Xl||1so%mhwK6+P)AfmCO|0CenrxhYhO_Crlz-pcien&7js1 +z&wt>X)xsq|s}#wtkerOrgBsIb=rqlQM)u&dTcamo!!i&EnuggwA>FY4wD4$OQiM^T`6?vBjHv8*) +zsi_(-f4(~1oP3@$TSj^2w@kJG)~V@ttn=62ZSMUxrou7@ +zWT{OtL<_W#b>b*+nx#b4)M6Mw}ph850@NMcSu~U*0ff +z>-y*83E^j`JgYjZ!k5?f8Rz#evT98~cotc?KtKA=0}+e}>^3}SJI5r~ +zA?MK9!})`4zuxfp`dq}3DfJ)rm#R8W;TAi{o?Fvvk4Mum+k?*t>4d0gg+DWH)Yrtw +zRZq(NZT7&QA2>o5MvPCBR<)b8DK6XZL$>RvD;H4jQ8{n5Zu+l>tm~YljoNlKy==;< +zCb{^Lwjx>@B7OGPgz_{fv%4+fzj#l_$MQ6FXIpk60{1`f@6GehM&Fe=rt~#Uh01JI +zHQP4d+%?!VoI=dTkLf#~%uN2Ad32i`n!htVW4ccl8#8!<-%DXfoKMM4>5F5H+sM13 +zr>VK9fA@Ips011M|DUlz +e13Lhxr!)Z7ao$klwv_N$G+=IQV^j@yd;DLCO-#%H + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/volume_down.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/volume_down.png +new file mode 100644 +index 0000000000000000000000000000000000000000..f8a88dec810c5e3a33ba6d1c1919acb00fa97feb +GIT binary patch +literal 3586 +zcmV+d4*l_oP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z0009mNkl8TjSwKRP&I6r;ogg6tFF%RVV`r~@A7K5itpWh^6uRa +zUylVr5Cnl`UAykOgRhoi&AY-@z6*QlRl3jHeJJeS8Dal87GznLWqo+>I7=7Qecqf} +z0IF4CYlK+k2mQeU+4XeKS>+!N2#~kJcBx8yAHZk<#_|_o*Ukxh!p*k$3|@omn1JX| +zxjtS-6K4VjM}~$+5u!)G=;`4OgV~_#>H}fhHX=zf9Zv?tqmxwOSBv2umy^pq@1n_- +zfDr{^k~0)cTy6lO2#oqhv4MyKg#CgN<`@@W(&%DgHr=i@X%w?BZ2vJ(kct@fXJ)u> +zil3>$DF390@xl!E*-!QxiUGs6&8!Af{gwu!V(2%Ab1EnX3{$$0xX}tEIb4MR281pJ +zV8nJQIpuQ +z5iwFpHc2es61KXd7O=&e!nS?`46U@fp6&B^Pwgb)(1hgjim>XoGNLOflz6jqzZt%- +zeys;!6jGiSzE;1K0Wb=w(L0PvphFa$p&dH_!)Wm)=Gq{9Kbms@4AUY7z3O@TM)-dB +zJcg@UskNUh^sg1~9ae?C$bD=K_k>M*jb+m*`3|6*p*mMfZ{d +zj9dZXu4wE44Cs)qsCA$lAOJ%P4NGA_er@MnA|#(7oqD1NAVWk9z4YlX>HuIs@?fZ+ +zS}jNt*aQkkg5lpcvl>kGTOJJGP%wO;a3mNb8YX#H%y6Im9Bl&yspNBOL)h_*o^r>2 +zv7eA682k;|dODkKvtNi5Qw~?V&u6P^VL#X}Xi6|xn|84Q;c{={jxiq&NR +zh@_fwt%O7IF6~UZLx;TQeIgG}RK2D{?uYl##F>J@nyd=ab@{fi`~nOg*&N-Ym{y!L +z`k$$*@FF0T(6qUN5eG_#t~>l6P~K2PNqJ&T>{dE}pjiI~0HNr{@I?7%OaK4?07*qo +IM6N<$f_nU^82|tP + +literal 0 +HcmV?d00001 + +diff --git a/feeds/packages/utils/goldfish-qemu/skins/HVGA/volume_up.png b/feeds/packages/utils/goldfish-qemu/skins/HVGA/volume_up.png +new file mode 100644 +index 0000000000000000000000000000000000000000..940457f707bdc589883be0d8fd7c49930195a23e +GIT binary patch +literal 3856 +zcmV+r5AX1aP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T +zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p +z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i +z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW +zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X +zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 +zfg=2N-7=cNnjjOr{yriy6mMFgG#l +znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U +zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? +z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y +zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB +zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt +z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C +z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB +zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe +zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 +z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ +z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 +z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu +zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu +z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E +ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw +zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX +z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& +z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 +z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R +z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw +zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD +zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| +zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy +zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z +zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} +z000C#NklV4_&{hN~(tET$+VRW>+$Ff??-nQ+IC~zYYtX>l3@AurbX4GN^gybgzVOXiKUz=tFwAd7Zh!KU_k-o;DGz5&nX;F@J(}m&Y +zFsFA;l+Wq)a-2q#7u?mA>2zh)AK3~JO)j((?PeJU17B=nJ(y;q-3*8!FyJzR3WOUV +zu!~h87ziqdo`utF*abUTnqUmgi1KVEoMyu=*vaw$1HYiKxDH*{!Xt+V81Z;CzlNyV +ztq;ahM8Q~M6v~3p^)s4Z1182;E?|T;*kl>XN}{T+gK*oWA4@S9@`(AiIXZCQi`n~4 +zoD*d#rTYV5Fq-NYjSg%#ls*?mov)7*AZIcRhL&OnjRnGQjHiw`*mkhEDA&Wh&FyIh +zLrXgy_4yohoM|9%zvLQaTeMLM8=CAs`F*#(x{VwRMqLFU&~c`+K#UB9hw}AgPJX>I +zse#$N`e^!U65S|gw5Ab{;>ko +zoL($-oW?R3ffCZs)$YnV9tIf)S-qCaFtw4%6UX9&=Jjh7byn$C)dNFaBGWW4CiS6puT|U +zx*}Z{lfEvy8l2gMi@~BAC_6t;FIV)7IyC8XEd^^K%G#Ng8ke&bxR{j( +zZg*lZnnLJM3yWih?(6n^lI8DS^BN3>q$4a_Pc|43LqbrQCg5U}9p%Qn-pOD{+U*FZ +zU2ZPMT^xL}big<{(GiiLvy)LM3r19*ipNg_^Z>(-=o4pbe$q~PFc5sHt979rDW<|5 +zbQ%K#%07*T`BAac7#O7otA_LxIPBusqRMnNI}@&`9d^JjR+V62^XdHGU;~17!w$DI +zoh(f-+yKdc4pwlRc(S}L%A+Rv!qE=2YyOads7^lDO0eE&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/bin/$$app ++done ++exit 0 ++endef ++ ++$(eval $(call BuildPackage,gzip)) ++ +diff --git a/feeds/packages/utils/gzip/Makefile b/feeds/packages/utils/gzip/Makefile +new file mode 100644 +index 0000000..12943fb +--- /dev/null ++++ b/feeds/packages/utils/gzip/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=gzip ++PKG_VERSION:=1.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/gzip ++PKG_MD5SUM:=e381b8506210c794278f5527cba0e765 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/gzip ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=gzip (GNU zip) is a compression utility. ++ URL:=http://www.gzip.org/ ++endef ++ ++define Package/gzip/description ++ gzip (GNU zip) is a compression utility designed to be a \ ++ replacement for compress. ++endef ++ ++CONFIGURE_VARS += \ ++ gl_cv_func_getopt_gnu=yes \ ++ ac_cv_search_clock_gettime=no ++ ++define Package/gzip/install ++ $(SED) 's,/bin/bash,/bin/sh,g' $(PKG_INSTALL_DIR)/usr/bin/{gunzip,zcat} ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{gunzip,gzip,zcat} $(1)/usr/bin/ ++endef ++ ++define Package/gzip/postinst ++#!/bin/sh ++for app in gunzip gzip zcat; do ++ ln -sf ../usr/bin/$$app $${IPKG_INSTROOT}/bin/$$app ++done ++endef ++ ++define Package/gzip/postrm ++#!/bin/sh ++for app in gunzip gzip zcat; do ++ ln -sf busybox $${IPKG_INSTROOT}/bin/$$app ++ $${IPKG_INSTROOT}/bin/$$app 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/bin/$$app ++done ++exit 0 ++endef ++ ++$(eval $(call BuildPackage,gzip)) ++ +diff --git a/feeds/packages/utils/gzip/patches/.svn/entries b/feeds/packages/utils/gzip/patches/.svn/entries +new file mode 100644 +index 0000000..9db83aa +--- /dev/null ++++ b/feeds/packages/utils/gzip/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/gzip/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-17T20:31:05.084369Z ++30620 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-rsyncable.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++37f981dbc140904debf8268367939e12 ++2012-02-17T20:31:05.084369Z ++30620 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8468 ++ +diff --git a/feeds/packages/utils/gzip/patches/.svn/text-base/001-rsyncable.patch.svn-base b/feeds/packages/utils/gzip/patches/.svn/text-base/001-rsyncable.patch.svn-base +new file mode 100644 +index 0000000..ddaffc8 +--- /dev/null ++++ b/feeds/packages/utils/gzip/patches/.svn/text-base/001-rsyncable.patch.svn-base +@@ -0,0 +1,248 @@ ++--- a/deflate.c +++++ b/deflate.c ++@@ -131,6 +131,14 @@ ++ #endif ++ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ ++ +++#ifndef RSYNC_WIN +++# define RSYNC_WIN 8192 +++#endif +++/* Size of rsync window, must be < MAX_DIST */ +++ +++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0) +++/* Whether window sum matches magic value */ +++ ++ /* =========================================================================== ++ * Local data used by the "longest match" routines. ++ */ ++@@ -212,6 +220,8 @@ local int compr_level; ++ unsigned near good_match; ++ /* Use a faster search when the previous match is longer than this */ ++ +++local ulg rsync_sum; /* rolling sum of rsync window */ +++local ulg rsync_chunk_end; /* next rsync sequence point */ ++ ++ /* Values for max_lazy_match, good_match and max_chain_length, depending on ++ * the desired pack level (0..9). The values given below have been tuned to ++@@ -307,6 +317,10 @@ void lm_init (pack_level, flags) ++ #endif ++ /* prev will be initialized on the fly */ ++ +++ /* rsync params */ +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ rsync_sum = 0; +++ ++ /* Set the default configuration parameters: ++ */ ++ max_lazy_match = configuration_table[pack_level].max_lazy; ++@@ -324,6 +338,7 @@ void lm_init (pack_level, flags) ++ ++ strstart = 0; ++ block_start = 0L; +++ rsync_chunk_end = 0xFFFFFFFFUL; ++ #ifdef ASMV ++ match_init(); /* initialize the asm code */ ++ #endif ++@@ -543,6 +558,8 @@ local void fill_window() ++ memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); ++ match_start -= WSIZE; ++ strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ +++ if (rsync_chunk_end != 0xFFFFFFFFUL) +++ rsync_chunk_end -= WSIZE; ++ ++ block_start -= (long) WSIZE; ++ ++@@ -570,6 +587,39 @@ local void fill_window() ++ } ++ } ++ +++local void rsync_roll(start, num) +++ unsigned start; +++ unsigned num; +++{ +++ unsigned i; +++ +++ if (start < RSYNC_WIN) { +++ /* before window fills. */ +++ for (i = start; i < RSYNC_WIN; i++) { +++ if (i == start + num) return; +++ rsync_sum += (ulg)window[i]; +++ } +++ num -= (RSYNC_WIN - start); +++ start = RSYNC_WIN; +++ } +++ +++ /* buffer after window full */ +++ for (i = start; i < start+num; i++) { +++ /* New character in */ +++ rsync_sum += (ulg)window[i]; +++ /* Old character out */ +++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; +++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) +++ rsync_chunk_end = i; +++ } +++} +++ +++/* =========================================================================== +++ * Set rsync_chunk_end if window sum matches magic value. +++ */ +++#define RSYNC_ROLL(s, n) \ +++ do { if (rsync) rsync_roll((s), (n)); } while(0) +++ ++ /* =========================================================================== ++ * Flush the current block, with given end-of-file flag. ++ * IN assertion: strstart is set to the end of the current match. ++@@ -617,6 +667,7 @@ local off_t deflate_fast() ++ ++ lookahead -= match_length; ++ +++ RSYNC_ROLL(strstart, match_length); ++ /* Insert new strings in the hash table only if the match length ++ * is not too large. This saves time but degrades compression. ++ */ ++@@ -645,9 +696,18 @@ local off_t deflate_fast() ++ /* No match, output a literal byte */ ++ Tracevv((stderr,"%c",window[strstart])); ++ flush = ct_tally (0, window[strstart]); +++ RSYNC_ROLL(strstart, 1); ++ lookahead--; ++ strstart++; ++ } +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ flush = 1; +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ ++ /* Make sure that we always have enough lookahead, except ++@@ -721,6 +781,7 @@ off_t deflate() ++ */ ++ lookahead -= prev_length-1; ++ prev_length -= 2; +++ RSYNC_ROLL(strstart, prev_length+1); ++ do { ++ strstart++; ++ INSERT_STRING(strstart, hash_head); ++@@ -733,24 +794,51 @@ off_t deflate() ++ match_available = 0; ++ match_length = MIN_MATCH-1; ++ strstart++; ++- if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ flush = 1; +++ } +++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ } else if (match_available) { ++ /* If there was no match at the previous position, output a ++ * single literal. If there was a match but the current match ++ * is longer, truncate the previous match to a single literal. ++ */ ++ Tracevv((stderr,"%c",window[strstart-1])); ++- if (ct_tally (0, window[strstart-1])) { ++- FLUSH_BLOCK(0), block_start = strstart; ++- } +++ flush = ct_tally (0, window[strstart-1]); +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ +++ flush = 1; +++ } +++ if (flush) FLUSH_BLOCK(0), block_start = strstart; +++ RSYNC_ROLL(strstart, 1); ++ strstart++; ++ lookahead--; ++ } else { ++ /* There is no previous match to compare with, wait for ++ * the next step to decide. ++ */ +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ +++ FLUSH_BLOCK(0), block_start = strstart; +++ } ++ match_available = 1; +++ RSYNC_ROLL(strstart, 1); ++ strstart++; ++ lookahead--; ++ } ++--- a/doc/gzip.texi +++++ b/doc/gzip.texi ++@@ -353,6 +353,14 @@ specified on the command line are direct ++ into the directory and compress all the files it finds there (or ++ decompress them in the case of @command{gunzip}). ++ +++@item --rsyncable +++While compressing, synchronize the output occasionally based on the +++input. This can reduce the compression slightly in some cases, but +++means that the @code{rsync} program can take advantage of similarities +++in the uncompressed input when syncronizing two files compressed with +++this flag. @code{gunzip} cannot tell the difference between a +++compressed file created with this option, and one created without it. +++ ++ @item --suffix @var{suf} ++ @itemx -S @var{suf} ++ Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be ++--- a/gzip.c +++++ b/gzip.c ++@@ -218,6 +218,7 @@ int ofd; /* output fil ++ unsigned insize; /* valid bytes in inbuf */ ++ unsigned inptr; /* index of next byte to be processed in inbuf */ ++ unsigned outcnt; /* bytes in output buffer */ +++int rsync = 0; /* make ryncable chunks */ ++ ++ static int handled_sig[] = ++ { ++@@ -271,6 +272,7 @@ struct option longopts[] = ++ {"best", 0, 0, '9'}, /* compress better */ ++ {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ ++ {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ +++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ ++ { 0, 0, 0, 0 } ++ }; ++ ++@@ -352,6 +354,7 @@ local void help() ++ " -Z, --lzw produce output compatible with old compress", ++ " -b, --bits=BITS max number of bits per code (implies -Z)", ++ #endif +++ " --rsyncable Make rsync-friendly archive", ++ "", ++ "With no FILE, or when FILE is -, read standard input.", ++ "", ++@@ -479,6 +482,9 @@ int main (int argc, char **argv) ++ recursive = 1; ++ #endif ++ break; +++ case 'R': +++ rsync = 1; break; +++ ++ case 'S': ++ #ifdef NO_MULTIPLE_DOTS ++ if (*optarg == '.') optarg++; ++--- a/gzip.h +++++ b/gzip.h ++@@ -146,6 +146,7 @@ EXTERN(uch, window); /* Sliding ++ extern unsigned insize; /* valid bytes in inbuf */ ++ extern unsigned inptr; /* index of next byte to be processed in inbuf */ ++ extern unsigned outcnt; /* bytes in output buffer */ +++extern int rsync; /* deflate into rsyncable chunks */ ++ ++ extern off_t bytes_in; /* number of input bytes */ ++ extern off_t bytes_out; /* number of output bytes */ +diff --git a/feeds/packages/utils/gzip/patches/001-rsyncable.patch b/feeds/packages/utils/gzip/patches/001-rsyncable.patch +new file mode 100644 +index 0000000..ddaffc8 +--- /dev/null ++++ b/feeds/packages/utils/gzip/patches/001-rsyncable.patch +@@ -0,0 +1,248 @@ ++--- a/deflate.c +++++ b/deflate.c ++@@ -131,6 +131,14 @@ ++ #endif ++ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ ++ +++#ifndef RSYNC_WIN +++# define RSYNC_WIN 8192 +++#endif +++/* Size of rsync window, must be < MAX_DIST */ +++ +++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0) +++/* Whether window sum matches magic value */ +++ ++ /* =========================================================================== ++ * Local data used by the "longest match" routines. ++ */ ++@@ -212,6 +220,8 @@ local int compr_level; ++ unsigned near good_match; ++ /* Use a faster search when the previous match is longer than this */ ++ +++local ulg rsync_sum; /* rolling sum of rsync window */ +++local ulg rsync_chunk_end; /* next rsync sequence point */ ++ ++ /* Values for max_lazy_match, good_match and max_chain_length, depending on ++ * the desired pack level (0..9). The values given below have been tuned to ++@@ -307,6 +317,10 @@ void lm_init (pack_level, flags) ++ #endif ++ /* prev will be initialized on the fly */ ++ +++ /* rsync params */ +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ rsync_sum = 0; +++ ++ /* Set the default configuration parameters: ++ */ ++ max_lazy_match = configuration_table[pack_level].max_lazy; ++@@ -324,6 +338,7 @@ void lm_init (pack_level, flags) ++ ++ strstart = 0; ++ block_start = 0L; +++ rsync_chunk_end = 0xFFFFFFFFUL; ++ #ifdef ASMV ++ match_init(); /* initialize the asm code */ ++ #endif ++@@ -543,6 +558,8 @@ local void fill_window() ++ memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); ++ match_start -= WSIZE; ++ strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ +++ if (rsync_chunk_end != 0xFFFFFFFFUL) +++ rsync_chunk_end -= WSIZE; ++ ++ block_start -= (long) WSIZE; ++ ++@@ -570,6 +587,39 @@ local void fill_window() ++ } ++ } ++ +++local void rsync_roll(start, num) +++ unsigned start; +++ unsigned num; +++{ +++ unsigned i; +++ +++ if (start < RSYNC_WIN) { +++ /* before window fills. */ +++ for (i = start; i < RSYNC_WIN; i++) { +++ if (i == start + num) return; +++ rsync_sum += (ulg)window[i]; +++ } +++ num -= (RSYNC_WIN - start); +++ start = RSYNC_WIN; +++ } +++ +++ /* buffer after window full */ +++ for (i = start; i < start+num; i++) { +++ /* New character in */ +++ rsync_sum += (ulg)window[i]; +++ /* Old character out */ +++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; +++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) +++ rsync_chunk_end = i; +++ } +++} +++ +++/* =========================================================================== +++ * Set rsync_chunk_end if window sum matches magic value. +++ */ +++#define RSYNC_ROLL(s, n) \ +++ do { if (rsync) rsync_roll((s), (n)); } while(0) +++ ++ /* =========================================================================== ++ * Flush the current block, with given end-of-file flag. ++ * IN assertion: strstart is set to the end of the current match. ++@@ -617,6 +667,7 @@ local off_t deflate_fast() ++ ++ lookahead -= match_length; ++ +++ RSYNC_ROLL(strstart, match_length); ++ /* Insert new strings in the hash table only if the match length ++ * is not too large. This saves time but degrades compression. ++ */ ++@@ -645,9 +696,18 @@ local off_t deflate_fast() ++ /* No match, output a literal byte */ ++ Tracevv((stderr,"%c",window[strstart])); ++ flush = ct_tally (0, window[strstart]); +++ RSYNC_ROLL(strstart, 1); ++ lookahead--; ++ strstart++; ++ } +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ flush = 1; +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ ++ /* Make sure that we always have enough lookahead, except ++@@ -721,6 +781,7 @@ off_t deflate() ++ */ ++ lookahead -= prev_length-1; ++ prev_length -= 2; +++ RSYNC_ROLL(strstart, prev_length+1); ++ do { ++ strstart++; ++ INSERT_STRING(strstart, hash_head); ++@@ -733,24 +794,51 @@ off_t deflate() ++ match_available = 0; ++ match_length = MIN_MATCH-1; ++ strstart++; ++- if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ flush = 1; +++ } +++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ } else if (match_available) { ++ /* If there was no match at the previous position, output a ++ * single literal. If there was a match but the current match ++ * is longer, truncate the previous match to a single literal. ++ */ ++ Tracevv((stderr,"%c",window[strstart-1])); ++- if (ct_tally (0, window[strstart-1])) { ++- FLUSH_BLOCK(0), block_start = strstart; ++- } +++ flush = ct_tally (0, window[strstart-1]); +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ +++ flush = 1; +++ } +++ if (flush) FLUSH_BLOCK(0), block_start = strstart; +++ RSYNC_ROLL(strstart, 1); ++ strstart++; ++ lookahead--; ++ } else { ++ /* There is no previous match to compare with, wait for ++ * the next step to decide. ++ */ +++ if (rsync && strstart > rsync_chunk_end) { +++ ush attr = 0; /* ascii/binary flag */ +++ +++ /* Reset huffman tree */ +++ ct_init(&attr, &method); +++ rsync_chunk_end = 0xFFFFFFFFUL; +++ +++ FLUSH_BLOCK(0), block_start = strstart; +++ } ++ match_available = 1; +++ RSYNC_ROLL(strstart, 1); ++ strstart++; ++ lookahead--; ++ } ++--- a/doc/gzip.texi +++++ b/doc/gzip.texi ++@@ -353,6 +353,14 @@ specified on the command line are direct ++ into the directory and compress all the files it finds there (or ++ decompress them in the case of @command{gunzip}). ++ +++@item --rsyncable +++While compressing, synchronize the output occasionally based on the +++input. This can reduce the compression slightly in some cases, but +++means that the @code{rsync} program can take advantage of similarities +++in the uncompressed input when syncronizing two files compressed with +++this flag. @code{gunzip} cannot tell the difference between a +++compressed file created with this option, and one created without it. +++ ++ @item --suffix @var{suf} ++ @itemx -S @var{suf} ++ Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be ++--- a/gzip.c +++++ b/gzip.c ++@@ -218,6 +218,7 @@ int ofd; /* output fil ++ unsigned insize; /* valid bytes in inbuf */ ++ unsigned inptr; /* index of next byte to be processed in inbuf */ ++ unsigned outcnt; /* bytes in output buffer */ +++int rsync = 0; /* make ryncable chunks */ ++ ++ static int handled_sig[] = ++ { ++@@ -271,6 +272,7 @@ struct option longopts[] = ++ {"best", 0, 0, '9'}, /* compress better */ ++ {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ ++ {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ +++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ ++ { 0, 0, 0, 0 } ++ }; ++ ++@@ -352,6 +354,7 @@ local void help() ++ " -Z, --lzw produce output compatible with old compress", ++ " -b, --bits=BITS max number of bits per code (implies -Z)", ++ #endif +++ " --rsyncable Make rsync-friendly archive", ++ "", ++ "With no FILE, or when FILE is -, read standard input.", ++ "", ++@@ -479,6 +482,9 @@ int main (int argc, char **argv) ++ recursive = 1; ++ #endif ++ break; +++ case 'R': +++ rsync = 1; break; +++ ++ case 'S': ++ #ifdef NO_MULTIPLE_DOTS ++ if (*optarg == '.') optarg++; ++--- a/gzip.h +++++ b/gzip.h ++@@ -146,6 +146,7 @@ EXTERN(uch, window); /* Sliding ++ extern unsigned insize; /* valid bytes in inbuf */ ++ extern unsigned inptr; /* index of next byte to be processed in inbuf */ ++ extern unsigned outcnt; /* bytes in output buffer */ +++extern int rsync; /* deflate into rsyncable chunks */ ++ ++ extern off_t bytes_in; /* number of input bytes */ ++ extern off_t bytes_out; /* number of output bytes */ +diff --git a/feeds/packages/utils/haserl/.svn/entries b/feeds/packages/utils/haserl/.svn/entries +new file mode 100644 +index 0000000..10c3fd1 +--- /dev/null ++++ b/feeds/packages/utils/haserl/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/haserl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-16T15:55:46.478331Z ++33795 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++596a5fee2fb6bff86e5c813b830571f4 ++2012-10-16T15:55:46.478331Z ++33795 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++723 ++ +diff --git a/feeds/packages/utils/haserl/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/haserl/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8e522ae +--- /dev/null ++++ b/feeds/packages/utils/haserl/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 13 ++svn:copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/haserl/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/haserl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d1da47 +--- /dev/null ++++ b/feeds/packages/utils/haserl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,32 @@ ++# ++# Copyright (C) 2006-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:=haserl ++PKG_VERSION:=0.9.29 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/haserl ++PKG_MD5SUM:=4cac9409530200b4a7a82a48ec174800 ++ ++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/ ++endef ++ ++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/feeds/packages/utils/haserl/Makefile b/feeds/packages/utils/haserl/Makefile +new file mode 100644 +index 0000000..6d1da47 +--- /dev/null ++++ b/feeds/packages/utils/haserl/Makefile +@@ -0,0 +1,32 @@ ++# ++# Copyright (C) 2006-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:=haserl ++PKG_VERSION:=0.9.29 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/haserl ++PKG_MD5SUM:=4cac9409530200b4a7a82a48ec174800 ++ ++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/ ++endef ++ ++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/feeds/packages/utils/haveged/.svn/entries b/feeds/packages/utils/haveged/.svn/entries +new file mode 100644 +index 0000000..6c97e16 +--- /dev/null ++++ b/feeds/packages/utils/haveged/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/haveged ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-31T21:21:53.048905Z ++34047 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8420660e093caea1c64716337497ffce ++2012-10-31T21:21:53.048905Z ++34047 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1052 ++ +diff --git a/feeds/packages/utils/haveged/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/haveged/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d176f40 +--- /dev/null ++++ b/feeds/packages/utils/haveged/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# Copyright (C) 2006-2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 1 2012-01-12 03:50:18Z Olipro $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=haveged ++PKG_VERSION:=1.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.issihosts.com/$(PKG_NAME) ++PKG_MD5SUM:=c1f34be00c3f438ec83862e90e192e4b ++ ++#ensure this is consistent with the dir in the tarball!!! ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/haveged ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Feeds the kernel entropy pool by timing CPU loops. ++ DEPENDS:=+librt +libpthread ++ URL:=http://www.issihosts.com/haveged/ ++endef ++ ++define Package/haveged/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/haveged.init $(1)/etc/init.d/haveged ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/haveged $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,haveged)) +diff --git a/feeds/packages/utils/haveged/Makefile b/feeds/packages/utils/haveged/Makefile +new file mode 100644 +index 0000000..d176f40 +--- /dev/null ++++ b/feeds/packages/utils/haveged/Makefile +@@ -0,0 +1,41 @@ ++# ++# Copyright (C) 2006-2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++# $Id: Makefile 1 2012-01-12 03:50:18Z Olipro $ ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=haveged ++PKG_VERSION:=1.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.issihosts.com/$(PKG_NAME) ++PKG_MD5SUM:=c1f34be00c3f438ec83862e90e192e4b ++ ++#ensure this is consistent with the dir in the tarball!!! ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/haveged ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Feeds the kernel entropy pool by timing CPU loops. ++ DEPENDS:=+librt +libpthread ++ URL:=http://www.issihosts.com/haveged/ ++endef ++ ++define Package/haveged/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/haveged.init $(1)/etc/init.d/haveged ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/haveged $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,haveged)) +diff --git a/feeds/packages/utils/haveged/files/.svn/entries b/feeds/packages/utils/haveged/files/.svn/entries +new file mode 100644 +index 0000000..8e03923 +--- /dev/null ++++ b/feeds/packages/utils/haveged/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/haveged/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T16:19:59.474516Z ++31161 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++haveged.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1219ecdaaaeae6f36eaa091154367995 ++2012-04-02T16:19:59.474516Z ++31161 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++275 ++ +diff --git a/feeds/packages/utils/haveged/files/.svn/text-base/haveged.init.svn-base b/feeds/packages/utils/haveged/files/.svn/text-base/haveged.init.svn-base +new file mode 100644 +index 0000000..129d951 +--- /dev/null ++++ b/feeds/packages/utils/haveged/files/.svn/text-base/haveged.init.svn-base +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012 OpenWrt.org ++ ++START=98 ++ ++HAVEGED_THRESHOLD=1024 ++HAVEGED_DCACHE=32 ++HAVEGED_ICACHE=32 ++ ++start() { ++ service_start /sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 ++} ++ ++stop() { ++ service_stop /sbin/haveged ++} +diff --git a/feeds/packages/utils/haveged/files/haveged.init b/feeds/packages/utils/haveged/files/haveged.init +new file mode 100644 +index 0000000..129d951 +--- /dev/null ++++ b/feeds/packages/utils/haveged/files/haveged.init +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2012 OpenWrt.org ++ ++START=98 ++ ++HAVEGED_THRESHOLD=1024 ++HAVEGED_DCACHE=32 ++HAVEGED_ICACHE=32 ++ ++start() { ++ service_start /sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 ++} ++ ++stop() { ++ service_stop /sbin/haveged ++} +diff --git a/feeds/packages/utils/hd-idle/.svn/entries b/feeds/packages/utils/hd-idle/.svn/entries +new file mode 100644 +index 0000000..f3b2a3d +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/hd-idle ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-09T23:47:28.206071Z ++32150 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++da356b8e7c4765ae787141cb2a986e38 ++2012-06-09T23:47:28.206071Z ++32150 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1162 ++ +diff --git a/feeds/packages/utils/hd-idle/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/hd-idle/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..981b884 +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=hd-idle ++PKG_VERSION:=1.04 ++PKG_RELEASE:=1 ++ ++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 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/feeds/packages/utils/hd-idle/Makefile b/feeds/packages/utils/hd-idle/Makefile +new file mode 100644 +index 0000000..981b884 +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=hd-idle ++PKG_VERSION:=1.04 ++PKG_RELEASE:=1 ++ ++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 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/feeds/packages/utils/hd-idle/files/.svn/entries b/feeds/packages/utils/hd-idle/files/.svn/entries +new file mode 100644 +index 0000000..0124d71 +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/hd-idle/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-25T16:10:46.301339Z ++30722 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hd-idle.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++dd5722f51eba729b2968be09796c865d ++2012-02-25T16:10:46.301339Z ++30722 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1472 ++ ++hd-idle.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++290764b2c05d0cbc8881a76b21f9edf3 ++2008-10-02T16:58:26.262726Z ++12824 ++olli ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++156 ++ +diff --git a/feeds/packages/utils/hd-idle/files/.svn/text-base/hd-idle.config.svn-base b/feeds/packages/utils/hd-idle/files/.svn/text-base/hd-idle.config.svn-base +new file mode 100644 +index 0000000..4e22c3b +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/files/.svn/text-base/hd-idle.config.svn-base +@@ -0,0 +1,6 @@ ++config 'hd-idle' ++ option 'disk' 'sda' ++ option 'enable_debug' '0' ++ option 'enabled' '0' ++ option 'idle_time_unit' 'minutes' ++ option 'idle_time_interval' '10' +diff --git a/feeds/packages/utils/hd-idle/files/.svn/text-base/hd-idle.init.svn-base b/feeds/packages/utils/hd-idle/files/.svn/text-base/hd-idle.init.svn-base +new file mode 100644 +index 0000000..1abf232 +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/files/.svn/text-base/hd-idle.init.svn-base +@@ -0,0 +1,80 @@ ++#!/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" ++ append_bool "$section" "enable_debug" "-d" ++ 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/feeds/packages/utils/hd-idle/files/hd-idle.config b/feeds/packages/utils/hd-idle/files/hd-idle.config +new file mode 100644 +index 0000000..4e22c3b +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/files/hd-idle.config +@@ -0,0 +1,6 @@ ++config 'hd-idle' ++ option 'disk' 'sda' ++ option 'enable_debug' '0' ++ option 'enabled' '0' ++ option 'idle_time_unit' 'minutes' ++ option 'idle_time_interval' '10' +diff --git a/feeds/packages/utils/hd-idle/files/hd-idle.init b/feeds/packages/utils/hd-idle/files/hd-idle.init +new file mode 100644 +index 0000000..1abf232 +--- /dev/null ++++ b/feeds/packages/utils/hd-idle/files/hd-idle.init +@@ -0,0 +1,80 @@ ++#!/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" ++ append_bool "$section" "enable_debug" "-d" ++ 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/feeds/packages/utils/hdparm/.svn/entries b/feeds/packages/utils/hdparm/.svn/entries +new file mode 100644 +index 0000000..3716f88 +--- /dev/null ++++ b/feeds/packages/utils/hdparm/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/hdparm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-09T23:47:29.737388Z ++32151 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++64b8e2594b2a3b3f1113c676c763561e ++2012-06-09T23:47:29.737388Z ++32151 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++806 ++ +diff --git a/feeds/packages/utils/hdparm/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/hdparm/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/hdparm/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/hdparm/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/hdparm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b3a0f6b +--- /dev/null ++++ b/feeds/packages/utils/hdparm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=hdparm ++PKG_VERSION:=9.39 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=2bc17b72403885d4faf959682944243b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++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/feeds/packages/utils/hdparm/Makefile b/feeds/packages/utils/hdparm/Makefile +new file mode 100644 +index 0000000..b3a0f6b +--- /dev/null ++++ b/feeds/packages/utils/hdparm/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=hdparm ++PKG_VERSION:=9.39 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=2bc17b72403885d4faf959682944243b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++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/feeds/packages/utils/heyu/.svn/entries b/feeds/packages/utils/heyu/.svn/entries +new file mode 100644 +index 0000000..4738a50 +--- /dev/null ++++ b/feeds/packages/utils/heyu/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/heyu ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-18T20:38:42.952708Z ++23519 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f2a0ea8d465d5c6e58f9e204633c446f ++2010-10-18T20:38:42.952708Z ++23519 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1512 ++ +diff --git a/feeds/packages/utils/heyu/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/heyu/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/heyu/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/heyu/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/heyu/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6694a26 +--- /dev/null ++++ b/feeds/packages/utils/heyu/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=heyu ++PKG_VERSION:=2.9.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://heyu.tanj.com/download/ ++PKG_MD5SUM:=89d20d7f45109e7add5f0a141eac04eb ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/heyu ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+setserial ++ TITLE:=X10 home automation control using a CM11A ++ URL:=http://heyu.tanj.com/heyu2/ ++endef ++ ++define Package/heyu/description ++ HEYU is a text-based console program for remotely controlling lights ++ and appliances in the home or office. It is made available under a ++ free and open source license. ++ ++ Heyu uses the CM11A computer interface to send and receive X10 control ++ signals over the AC power lines to modules which can turn On, Off, or ++ Dim attached lamps or appliances. It can store a schedule of timed ++ events in the CM11A memory for execution when the computer is turned ++ off or disconnected. ++endef ++ ++define Package/heyu/conffiles ++/etc/heyu/x10.conf ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(TARGET_CFLAGS) \$$$$(DFLAGS)" \ ++ ) ++endef ++ ++define Package/heyu/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ ++ ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/x10.conf $(1)/etc/$(PKG_NAME)/x10.conf ++endef ++ ++$(eval $(call BuildPackage,heyu)) +diff --git a/feeds/packages/utils/heyu/Makefile b/feeds/packages/utils/heyu/Makefile +new file mode 100644 +index 0000000..6694a26 +--- /dev/null ++++ b/feeds/packages/utils/heyu/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=heyu ++PKG_VERSION:=2.9.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://heyu.tanj.com/download/ ++PKG_MD5SUM:=89d20d7f45109e7add5f0a141eac04eb ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/heyu ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+setserial ++ TITLE:=X10 home automation control using a CM11A ++ URL:=http://heyu.tanj.com/heyu2/ ++endef ++ ++define Package/heyu/description ++ HEYU is a text-based console program for remotely controlling lights ++ and appliances in the home or office. It is made available under a ++ free and open source license. ++ ++ Heyu uses the CM11A computer interface to send and receive X10 control ++ signals over the AC power lines to modules which can turn On, Off, or ++ Dim attached lamps or appliances. It can store a schedule of timed ++ events in the CM11A memory for execution when the computer is turned ++ off or disconnected. ++endef ++ ++define Package/heyu/conffiles ++/etc/heyu/x10.conf ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ CFLAGS="$(TARGET_CFLAGS) \$$$$(DFLAGS)" \ ++ ) ++endef ++ ++define Package/heyu/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/heyu $(1)/usr/bin/ ++ ++ $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) ++ $(INSTALL_DATA) ./files/x10.conf $(1)/etc/$(PKG_NAME)/x10.conf ++endef ++ ++$(eval $(call BuildPackage,heyu)) +diff --git a/feeds/packages/utils/heyu/files/.svn/entries b/feeds/packages/utils/heyu/files/.svn/entries +new file mode 100644 +index 0000000..5ccc53d +--- /dev/null ++++ b/feeds/packages/utils/heyu/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/heyu/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++x10.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++148e09059bd26504bd9cbdd6d1dd2ae0 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++694 ++ +diff --git a/feeds/packages/utils/heyu/files/.svn/prop-base/x10.conf.svn-base b/feeds/packages/utils/heyu/files/.svn/prop-base/x10.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/heyu/files/.svn/prop-base/x10.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/heyu/files/.svn/text-base/x10.conf.svn-base b/feeds/packages/utils/heyu/files/.svn/text-base/x10.conf.svn-base +new file mode 100644 +index 0000000..3cacaf5 +--- /dev/null ++++ b/feeds/packages/utils/heyu/files/.svn/text-base/x10.conf.svn-base +@@ -0,0 +1,24 @@ ++# this file should contain x10 appliance aliases, one per line, as: ++# appliance-name housecode modulenumber ++# for example: ++# mydesklamp A 4 ++# atticfan B 3 ++# sumppump C 3 ++# manythings J 1-4 ++# ++# IMPORTANT! disable the serial console if you need to use heyu ++# on /dev/tts/0. Read http://forum.openwrt.org/viewtopic.php?id=1767 ++# ++# NOTE: using /dev/tts/1 requires the setserial package to ++# set the port to use irq 3, otherwise performance will be ++# unbearable as it is polled. ++# ++TTY /dev/tts/1 ++# ++# give your location - for computing sunrise and sunset times ++# Boston, MA USA: ++#LATITUDE N42:20 ++#LONGITUDE W71:05 ++# Menlo Park, CA USA: ++LATITUDE N37:43 ++LONGITUDE W122:20 +diff --git a/feeds/packages/utils/heyu/files/x10.conf b/feeds/packages/utils/heyu/files/x10.conf +new file mode 100644 +index 0000000..3cacaf5 +--- /dev/null ++++ b/feeds/packages/utils/heyu/files/x10.conf +@@ -0,0 +1,24 @@ ++# this file should contain x10 appliance aliases, one per line, as: ++# appliance-name housecode modulenumber ++# for example: ++# mydesklamp A 4 ++# atticfan B 3 ++# sumppump C 3 ++# manythings J 1-4 ++# ++# IMPORTANT! disable the serial console if you need to use heyu ++# on /dev/tts/0. Read http://forum.openwrt.org/viewtopic.php?id=1767 ++# ++# NOTE: using /dev/tts/1 requires the setserial package to ++# set the port to use irq 3, otherwise performance will be ++# unbearable as it is polled. ++# ++TTY /dev/tts/1 ++# ++# give your location - for computing sunrise and sunset times ++# Boston, MA USA: ++#LATITUDE N42:20 ++#LONGITUDE W71:05 ++# Menlo Park, CA USA: ++LATITUDE N37:43 ++LONGITUDE W122:20 +diff --git a/feeds/packages/utils/heyu/patches/.svn/entries b/feeds/packages/utils/heyu/patches/.svn/entries +new file mode 100644 +index 0000000..4232c5e +--- /dev/null ++++ b/feeds/packages/utils/heyu/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/heyu/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-05T12:31:43.742167Z ++11646 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-avoid_configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ce457e2c73d79ef05ef1e7623cf79ab9 ++2008-07-05T12:31:43.742167Z ++11646 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6786 ++ +diff --git a/feeds/packages/utils/heyu/patches/.svn/prop-base/001-avoid_configure.patch.svn-base b/feeds/packages/utils/heyu/patches/.svn/prop-base/001-avoid_configure.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/heyu/patches/.svn/prop-base/001-avoid_configure.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/heyu/patches/.svn/text-base/001-avoid_configure.patch.svn-base b/feeds/packages/utils/heyu/patches/.svn/text-base/001-avoid_configure.patch.svn-base +new file mode 100644 +index 0000000..ca895e4 +--- /dev/null ++++ b/feeds/packages/utils/heyu/patches/.svn/text-base/001-avoid_configure.patch.svn-base +@@ -0,0 +1,261 @@ ++--- /dev/null +++++ b/Makefile ++@@ -0,0 +1,252 @@ +++# Makefile for HEYU, a program to control an X10 CM11A computer interface. +++# This makefile is generated by the Configure program. +++# +++BIN = /usr/bin +++MAN = /usr/man/man1 +++MAN5 = /usr/man/man5 +++GROUP = sys +++OWNER = root +++ +++# set DFLAGS equal to: +++# -DSYSV if using SYSTEM V +++# -DVOID if compiler doesn't understand 'void' +++ +++#This makefile is built for linux +++DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ -DHASCM17A +++LIBS = -lm -lc +++# # The rest of the makefile should need no changes +++ +++## Makefile template for Heyu, a program to control an X10 CM11A computer +++## interface. From this point on the Makefile is copied from Makefile.in +++## by the Configure program +++ +++SRCS = date.c erase.c info.c message.c relay.c \ +++ monitor.c reset.c setclock.c stop.c \ +++ tty.c x10.c xread.c xwrite.c status.c cm11a.c \ +++ eeprom.c process.c sun.c cmd.c config.c x10state.c \ +++ poll.c modules.c cm17a.c xsync.c timing.c cm10a.c \ +++ tty_aux.c relay_aux.c x10aux.c rfxcom.c digimax.c oregon.c +++OBJS = date.o erase.o info.o message.o relay.o \ +++ monitor.o reset.o setclock.o stop.o \ +++ tty.o x10.o xread.o xwrite.o status.o cm11a.o \ +++ eeprom.o process.o sun.o cmd.o config.o x10state.o \ +++ poll.o modules.o cm17a.o xsync.o timing.o cm10a.o \ +++ tty_aux.o relay_aux.o x10aux.o rfxcom.o digimax.o oregon.o +++ +++OTHERSRC = README README2 Makefile x10config.sample protocol.txt eeprom.h \ +++ x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ +++ history.txt version.h heyufaq.txt x10sched.5 process.h sun.h \ +++ x10scripts.5 Configure Makefile.in install.sh INSTALL LICENSE \ +++ README.cm10a x10aux.5 x10state.h rfxcom.h digimax.h oregon.h x10rfxsensors.5\ +++ x10rfxmeters.5 x10digimax.5 x10oregon.5 +++ +++EVERYTHING = $(OTHERSRC) $(SRCS) +++ +++all: heyu +++ +++heyu: $(OBJS) version.h +++ $(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS) +++ @echo `id` >usergroup.tmp +++ @echo ${HOME} >userhome.tmp +++ @echo "" +++ @echo "** Now become root and run 'make install' **" +++ @echo "" +++ +++$(OBJS): x10.h process.h sun.h Makefile +++ +++eeprom.o: eeprom.h +++info.o: version.h +++x10state.o: x10state.c x10state.h rfxcom.h digimax.h oregon.h +++rfxcom.o: rfxcom.c x10state.h rfxcom.h +++digimax.o: digimax.c x10state.h digimax.h +++oregon.o: oregon.c x10state.h oregon.h +++modules.o: modules.c oregon.h +++poll.o: poll.c oregon.h +++ +++install: $(BIN)/heyu $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ +++ $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ +++ $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 $(MAN5)/x10digimax.5 \ +++ $(MAN5)/x10oregon.5 +++ +++maninstall: $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ +++ $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ +++ $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 \ +++ $(MAN5)/x10digimax.5 $(MAN5)/x10oregon.5 +++ +++uninstall: +++ rm -f $(BIN)/heyu +++ rm -f $(MAN)/heyu.1 +++ rm -f $(MAN5)/x10config.5 +++ rm -f $(MAN5)/x10sched.5 +++ rm -f $(MAN5)/x10scripts.5 +++ rm -f $(MAN5)/x10cm17a.5 +++ rm -f $(MAN5)/x10aux.5 +++ rm -f $(MAN5)/x10rfxsensors.5 +++ rm -f $(MAN5)/x10rfxmeters.5 +++ rm -f $(MAN5)/x10digimax.5 +++ rm -f $(MAN5)/x10oregon.5 +++ +++$(BIN)/heyu: heyu +++ mkdir -p -m 755 $(BIN) +++ cp heyu $(BIN) +++ chgrp $(GROUP) $(BIN)/heyu +++ chmod 755 $(BIN)/heyu +++ chown $(OWNER) $(BIN)/heyu +++ ./install.sh +++ +++$(MAN)/heyu.1: heyu.1 +++ mkdir -p -m 755 $(MAN) +++ cp heyu.1 $(MAN) +++ chmod 644 $(MAN)/heyu.1 +++ +++$(MAN5)/x10config.5: x10config.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10config.5 $(MAN5) +++ chmod 644 $(MAN5)/x10config.5 +++ +++$(MAN5)/x10sched.5: x10sched.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10sched.5 $(MAN5) +++ chmod 644 $(MAN5)/x10sched.5 +++ +++$(MAN5)/x10scripts.5: x10scripts.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10scripts.5 $(MAN5) +++ chmod 644 $(MAN5)/x10scripts.5 +++ +++$(MAN5)/x10cm17a.5: x10cm17a.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10cm17a.5 $(MAN5) +++ chmod 644 $(MAN5)/x10cm17a.5 +++ +++$(MAN5)/x10aux.5: x10aux.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10aux.5 $(MAN5) +++ chmod 644 $(MAN5)/x10aux.5 +++ +++$(MAN5)/x10rfxsensors.5: x10rfxsensors.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10rfxsensors.5 $(MAN5) +++ chmod 644 $(MAN5)/x10rfxsensors.5 +++ +++$(MAN5)/x10rfxmeters.5: x10rfxmeters.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10rfxmeters.5 $(MAN5) +++ chmod 644 $(MAN5)/x10rfxmeters.5 +++ +++$(MAN5)/x10digimax.5: x10digimax.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10digimax.5 $(MAN5) +++ chmod 644 $(MAN5)/x10digimax.5 +++ +++$(MAN5)/x10oregon.5: x10oregon.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10oregon.5 $(MAN5) +++ chmod 644 $(MAN5)/x10oregon.5 +++ +++lint: +++ lint $(DFLAGS) $(SRCS) +++ +++shar: x10_heyu.shar.1 x10_heyu.shar.2 +++ +++x10.o: x10.c version.h +++process.o: process.c version.h +++xread.o: xread.c local.h +++ +++ci: $(SRCS) index.html Makefile +++ @ for FL in $+ ; do \ +++ if test -w $$FL ; then \ +++ ci -l $$FL ;\ +++ fi ;\ +++ done +++ +++x10_heyu.shar.1: +++ shar $(OTHERSRC) >x10_heyu.shar.1 +++ +++x10_heyu.shar.2: +++ shar $(SRCS) > x10_heyu.shar.2 +++ +++bigshar: +++ shar $(EVERYTHING) > x10_heyu.shar +++ +++tar: x10_heyu.tgz +++ +++x10_heyu.tgz: $(EVERYTHING) +++ rm -fr heyu.dir +++ mkdir heyu.dir +++ cp -p $(EVERYTHING) heyu.dir +++ cp Makefile.dist heyu.dir/Makefile +++ tar -czvf x10_heyu.tgz heyu.dir +++ +++heyudistro: $(EVERYTHING) +++ rm -rf distro.dir +++ mkdir distro.dir +++ cp -p $(EVERYTHING) distro.dir +++ cp -p release_notes.txt distro.dir +++ cp -p INSTALL distro.dir/README.INSTALL +++ rm distro.dir/Makefile +++ +++man2html: +++ man2html heyu.1 >./html/heyu.1.html +++ man2html x10config.5 >./html/x10config.5.html +++ man2html x10scripts.5 > ./html/x10scripts.5.html +++ man2html x10sched.5 > ./html/x10sched.5.html +++ man2html x10aux.5 > ./html/x10aux.5.html +++ man2html x10cm17a.5 > ./html/x10cm17a.5.html +++ man2html x10rfxsensors.5 > ./html/x10rfxsensors.5.html +++ man2html x10rfxmeters.5 > ./html/x10rfxmeters.5.html +++ man2html x10digimax.5 > ./html/x10digimax.5.html +++ man2html x10oregon.5 > ./html/x10oregon.5.html +++ +++beta: x10_beta.tgz +++ +++x10_beta.tgz: $(EVERYTHING) +++ rm -fr heyu.beta +++ mkdir heyu.beta +++ cp -p $(EVERYTHING) heyu.beta +++ cp Makefile.dist heyu.dir/Makefile +++ tar -czvf x10_beta.tgz heyu.beta +++ +++zip: x10_heyu.zip +++ +++x10_heyu.zip: $(EVERYTHING) +++ rm -f x10_heyu.zip +++ zip -kl x10_heyu.zip $(EVERYTHING) +++ +++touch: +++ touch $(OTHERSRC) +++ touch $(SRCS) +++ +++clean: +++ rm -f *.o +++ +++clobber: clean +++ rm -f heyu +++ +++upload: heyu index.html x10_heyu.tgz x10_heyu.zip +++ /bin/sh -c ./upload.sh +++ +++rcsdiffrw: +++ @-for x in `$(MAKE) rw` ;\ +++ do \ +++ echo ;\ +++ echo $$x ;\ +++ echo ========= ;\ +++ rcsdiff $$x ;\ +++ done 2>&1 ;\ +++ echo ;\ +++ echo all done +++ +++list: +++ @ls $(EVERYTHING) | more +++ +++rw: +++ @ls -l $(EVERYTHING) | \ +++ egrep '^[^l].w' | \ +++ sed 's;.* ;;' # strip to last space +++ +++populate: $(EVERYTHING) +++ +++$(EVERYTHING): +++## co -r$(revision) $@ +++ ++--- /dev/null +++++ b/local.h ++@@ -0,0 +1,3 @@ +++#define USESIGINT 1' +++#define SPOOLDIR "/tmp" +++#define LOCKDIR "/tmp" +diff --git a/feeds/packages/utils/heyu/patches/001-avoid_configure.patch b/feeds/packages/utils/heyu/patches/001-avoid_configure.patch +new file mode 100644 +index 0000000..ca895e4 +--- /dev/null ++++ b/feeds/packages/utils/heyu/patches/001-avoid_configure.patch +@@ -0,0 +1,261 @@ ++--- /dev/null +++++ b/Makefile ++@@ -0,0 +1,252 @@ +++# Makefile for HEYU, a program to control an X10 CM11A computer interface. +++# This makefile is generated by the Configure program. +++# +++BIN = /usr/bin +++MAN = /usr/man/man1 +++MAN5 = /usr/man/man5 +++GROUP = sys +++OWNER = root +++ +++# set DFLAGS equal to: +++# -DSYSV if using SYSTEM V +++# -DVOID if compiler doesn't understand 'void' +++ +++#This makefile is built for linux +++DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ -DHASCM17A +++LIBS = -lm -lc +++# # The rest of the makefile should need no changes +++ +++## Makefile template for Heyu, a program to control an X10 CM11A computer +++## interface. From this point on the Makefile is copied from Makefile.in +++## by the Configure program +++ +++SRCS = date.c erase.c info.c message.c relay.c \ +++ monitor.c reset.c setclock.c stop.c \ +++ tty.c x10.c xread.c xwrite.c status.c cm11a.c \ +++ eeprom.c process.c sun.c cmd.c config.c x10state.c \ +++ poll.c modules.c cm17a.c xsync.c timing.c cm10a.c \ +++ tty_aux.c relay_aux.c x10aux.c rfxcom.c digimax.c oregon.c +++OBJS = date.o erase.o info.o message.o relay.o \ +++ monitor.o reset.o setclock.o stop.o \ +++ tty.o x10.o xread.o xwrite.o status.o cm11a.o \ +++ eeprom.o process.o sun.o cmd.o config.o x10state.o \ +++ poll.o modules.o cm17a.o xsync.o timing.o cm10a.o \ +++ tty_aux.o relay_aux.o x10aux.o rfxcom.o digimax.o oregon.o +++ +++OTHERSRC = README README2 Makefile x10config.sample protocol.txt eeprom.h \ +++ x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ +++ history.txt version.h heyufaq.txt x10sched.5 process.h sun.h \ +++ x10scripts.5 Configure Makefile.in install.sh INSTALL LICENSE \ +++ README.cm10a x10aux.5 x10state.h rfxcom.h digimax.h oregon.h x10rfxsensors.5\ +++ x10rfxmeters.5 x10digimax.5 x10oregon.5 +++ +++EVERYTHING = $(OTHERSRC) $(SRCS) +++ +++all: heyu +++ +++heyu: $(OBJS) version.h +++ $(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS) +++ @echo `id` >usergroup.tmp +++ @echo ${HOME} >userhome.tmp +++ @echo "" +++ @echo "** Now become root and run 'make install' **" +++ @echo "" +++ +++$(OBJS): x10.h process.h sun.h Makefile +++ +++eeprom.o: eeprom.h +++info.o: version.h +++x10state.o: x10state.c x10state.h rfxcom.h digimax.h oregon.h +++rfxcom.o: rfxcom.c x10state.h rfxcom.h +++digimax.o: digimax.c x10state.h digimax.h +++oregon.o: oregon.c x10state.h oregon.h +++modules.o: modules.c oregon.h +++poll.o: poll.c oregon.h +++ +++install: $(BIN)/heyu $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ +++ $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ +++ $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 $(MAN5)/x10digimax.5 \ +++ $(MAN5)/x10oregon.5 +++ +++maninstall: $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ +++ $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ +++ $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 \ +++ $(MAN5)/x10digimax.5 $(MAN5)/x10oregon.5 +++ +++uninstall: +++ rm -f $(BIN)/heyu +++ rm -f $(MAN)/heyu.1 +++ rm -f $(MAN5)/x10config.5 +++ rm -f $(MAN5)/x10sched.5 +++ rm -f $(MAN5)/x10scripts.5 +++ rm -f $(MAN5)/x10cm17a.5 +++ rm -f $(MAN5)/x10aux.5 +++ rm -f $(MAN5)/x10rfxsensors.5 +++ rm -f $(MAN5)/x10rfxmeters.5 +++ rm -f $(MAN5)/x10digimax.5 +++ rm -f $(MAN5)/x10oregon.5 +++ +++$(BIN)/heyu: heyu +++ mkdir -p -m 755 $(BIN) +++ cp heyu $(BIN) +++ chgrp $(GROUP) $(BIN)/heyu +++ chmod 755 $(BIN)/heyu +++ chown $(OWNER) $(BIN)/heyu +++ ./install.sh +++ +++$(MAN)/heyu.1: heyu.1 +++ mkdir -p -m 755 $(MAN) +++ cp heyu.1 $(MAN) +++ chmod 644 $(MAN)/heyu.1 +++ +++$(MAN5)/x10config.5: x10config.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10config.5 $(MAN5) +++ chmod 644 $(MAN5)/x10config.5 +++ +++$(MAN5)/x10sched.5: x10sched.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10sched.5 $(MAN5) +++ chmod 644 $(MAN5)/x10sched.5 +++ +++$(MAN5)/x10scripts.5: x10scripts.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10scripts.5 $(MAN5) +++ chmod 644 $(MAN5)/x10scripts.5 +++ +++$(MAN5)/x10cm17a.5: x10cm17a.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10cm17a.5 $(MAN5) +++ chmod 644 $(MAN5)/x10cm17a.5 +++ +++$(MAN5)/x10aux.5: x10aux.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10aux.5 $(MAN5) +++ chmod 644 $(MAN5)/x10aux.5 +++ +++$(MAN5)/x10rfxsensors.5: x10rfxsensors.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10rfxsensors.5 $(MAN5) +++ chmod 644 $(MAN5)/x10rfxsensors.5 +++ +++$(MAN5)/x10rfxmeters.5: x10rfxmeters.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10rfxmeters.5 $(MAN5) +++ chmod 644 $(MAN5)/x10rfxmeters.5 +++ +++$(MAN5)/x10digimax.5: x10digimax.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10digimax.5 $(MAN5) +++ chmod 644 $(MAN5)/x10digimax.5 +++ +++$(MAN5)/x10oregon.5: x10oregon.5 +++ mkdir -p -m 755 $(MAN5) +++ cp x10oregon.5 $(MAN5) +++ chmod 644 $(MAN5)/x10oregon.5 +++ +++lint: +++ lint $(DFLAGS) $(SRCS) +++ +++shar: x10_heyu.shar.1 x10_heyu.shar.2 +++ +++x10.o: x10.c version.h +++process.o: process.c version.h +++xread.o: xread.c local.h +++ +++ci: $(SRCS) index.html Makefile +++ @ for FL in $+ ; do \ +++ if test -w $$FL ; then \ +++ ci -l $$FL ;\ +++ fi ;\ +++ done +++ +++x10_heyu.shar.1: +++ shar $(OTHERSRC) >x10_heyu.shar.1 +++ +++x10_heyu.shar.2: +++ shar $(SRCS) > x10_heyu.shar.2 +++ +++bigshar: +++ shar $(EVERYTHING) > x10_heyu.shar +++ +++tar: x10_heyu.tgz +++ +++x10_heyu.tgz: $(EVERYTHING) +++ rm -fr heyu.dir +++ mkdir heyu.dir +++ cp -p $(EVERYTHING) heyu.dir +++ cp Makefile.dist heyu.dir/Makefile +++ tar -czvf x10_heyu.tgz heyu.dir +++ +++heyudistro: $(EVERYTHING) +++ rm -rf distro.dir +++ mkdir distro.dir +++ cp -p $(EVERYTHING) distro.dir +++ cp -p release_notes.txt distro.dir +++ cp -p INSTALL distro.dir/README.INSTALL +++ rm distro.dir/Makefile +++ +++man2html: +++ man2html heyu.1 >./html/heyu.1.html +++ man2html x10config.5 >./html/x10config.5.html +++ man2html x10scripts.5 > ./html/x10scripts.5.html +++ man2html x10sched.5 > ./html/x10sched.5.html +++ man2html x10aux.5 > ./html/x10aux.5.html +++ man2html x10cm17a.5 > ./html/x10cm17a.5.html +++ man2html x10rfxsensors.5 > ./html/x10rfxsensors.5.html +++ man2html x10rfxmeters.5 > ./html/x10rfxmeters.5.html +++ man2html x10digimax.5 > ./html/x10digimax.5.html +++ man2html x10oregon.5 > ./html/x10oregon.5.html +++ +++beta: x10_beta.tgz +++ +++x10_beta.tgz: $(EVERYTHING) +++ rm -fr heyu.beta +++ mkdir heyu.beta +++ cp -p $(EVERYTHING) heyu.beta +++ cp Makefile.dist heyu.dir/Makefile +++ tar -czvf x10_beta.tgz heyu.beta +++ +++zip: x10_heyu.zip +++ +++x10_heyu.zip: $(EVERYTHING) +++ rm -f x10_heyu.zip +++ zip -kl x10_heyu.zip $(EVERYTHING) +++ +++touch: +++ touch $(OTHERSRC) +++ touch $(SRCS) +++ +++clean: +++ rm -f *.o +++ +++clobber: clean +++ rm -f heyu +++ +++upload: heyu index.html x10_heyu.tgz x10_heyu.zip +++ /bin/sh -c ./upload.sh +++ +++rcsdiffrw: +++ @-for x in `$(MAKE) rw` ;\ +++ do \ +++ echo ;\ +++ echo $$x ;\ +++ echo ========= ;\ +++ rcsdiff $$x ;\ +++ done 2>&1 ;\ +++ echo ;\ +++ echo all done +++ +++list: +++ @ls $(EVERYTHING) | more +++ +++rw: +++ @ls -l $(EVERYTHING) | \ +++ egrep '^[^l].w' | \ +++ sed 's;.* ;;' # strip to last space +++ +++populate: $(EVERYTHING) +++ +++$(EVERYTHING): +++## co -r$(revision) $@ +++ ++--- /dev/null +++++ b/local.h ++@@ -0,0 +1,3 @@ +++#define USESIGINT 1' +++#define SPOOLDIR "/tmp" +++#define LOCKDIR "/tmp" +diff --git a/feeds/packages/utils/hplip/.svn/entries b/feeds/packages/utils/hplip/.svn/entries +new file mode 100644 +index 0000000..7a29d3f +--- /dev/null ++++ b/feeds/packages/utils/hplip/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/hplip ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++b5d79b13b4b0cd97c6113608d5c3af4d ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2090 ++ +diff --git a/feeds/packages/utils/hplip/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/hplip/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..313ebff +--- /dev/null ++++ b/feeds/packages/utils/hplip/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,80 @@ ++# ++# 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:=hplip ++PKG_VERSION:=3.9.12 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/hplip ++PKG_MD5SUM:=2b0906b4a57b437988829557ca62adfd ++ ++PKG_BUILD_DEPENDS := python ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/hplip ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=HP Linux Imaging and Printing ++ URL:=http://sourceforge.net/projects/hplip/ ++ DEPENDS+=+libjpeg +libtiff +libusb-compat +cups +sane-libs ++endef ++ ++define Package/hplip/description ++ HPLIP is an HP developed solution for printing, scanning, and faxing with HP inkjet and laser based printers in Linux. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-gui-build \ ++ --disable-network-build \ ++ --disable-fax-build \ ++ --disable-pp-build \ ++ --disable-doc-build \ ++ --disable-foomatic-xml-install \ ++ --disable-dbus-build ++ ++define Build/Configure ++ $(call Build/Configure/Default,\ ++ $(CONFIGURE_ARGS),\ ++ ac_cv_lib_cups_cupsDoFileRequest=yes \ ++ LIBS="-lz -ljpeg -lusb -lcups -lpng -ltiff" \ ++ ) ++endef ++ ++define Package/hplip/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libhpip.so* $(1)/usr/lib/ ++ $(CP) $(PKG_BUILD_DIR)/.libs/libhpmud.so* $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/cups/backend ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/hp $(1)/usr/lib/cups/backend ++ ++ $(INSTALL_DIR) $(1)/usr/lib/sane ++ $(CP) $(PKG_BUILD_DIR)/.libs/libsane-hpaio.so* $(1)/usr/lib/sane ++ ++ $(INSTALL_DIR) $(1)/etc/hp ++ $(CP) $(PKG_BUILD_DIR)/hplip.conf $(1)/etc/hp/hplip.conf ++ ++ $(INSTALL_DIR) $(1)/usr/share/hplip/data/models/ ++ $(CP) $(PKG_BUILD_DIR)/data/models/models.dat $(1)/usr/share/hplip/data/models/ ++ ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb/ ++ $(INSTALL_BIN) ./files/20-hplip $(1)/etc/hotplug.d/usb/ ++ ++ $(INSTALL_DIR) $(1)/etc/sane.d/dll.d/ ++ $(INSTALL_DATA) ./files/hplib.conf $(1)/etc/sane.d/dll.d/hplib ++endef ++ ++define Package/hplip/conffiles ++/etc/hp/hplip.conf ++endef ++ ++$(eval $(call BuildPackage,hplip)) +diff --git a/feeds/packages/utils/hplip/Makefile b/feeds/packages/utils/hplip/Makefile +new file mode 100644 +index 0000000..313ebff +--- /dev/null ++++ b/feeds/packages/utils/hplip/Makefile +@@ -0,0 +1,80 @@ ++# ++# 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:=hplip ++PKG_VERSION:=3.9.12 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/hplip ++PKG_MD5SUM:=2b0906b4a57b437988829557ca62adfd ++ ++PKG_BUILD_DEPENDS := python ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/hplip ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=HP Linux Imaging and Printing ++ URL:=http://sourceforge.net/projects/hplip/ ++ DEPENDS+=+libjpeg +libtiff +libusb-compat +cups +sane-libs ++endef ++ ++define Package/hplip/description ++ HPLIP is an HP developed solution for printing, scanning, and faxing with HP inkjet and laser based printers in Linux. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-gui-build \ ++ --disable-network-build \ ++ --disable-fax-build \ ++ --disable-pp-build \ ++ --disable-doc-build \ ++ --disable-foomatic-xml-install \ ++ --disable-dbus-build ++ ++define Build/Configure ++ $(call Build/Configure/Default,\ ++ $(CONFIGURE_ARGS),\ ++ ac_cv_lib_cups_cupsDoFileRequest=yes \ ++ LIBS="-lz -ljpeg -lusb -lcups -lpng -ltiff" \ ++ ) ++endef ++ ++define Package/hplip/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_BUILD_DIR)/.libs/libhpip.so* $(1)/usr/lib/ ++ $(CP) $(PKG_BUILD_DIR)/.libs/libhpmud.so* $(1)/usr/lib/ ++ ++ $(INSTALL_DIR) $(1)/usr/lib/cups/backend ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/hp $(1)/usr/lib/cups/backend ++ ++ $(INSTALL_DIR) $(1)/usr/lib/sane ++ $(CP) $(PKG_BUILD_DIR)/.libs/libsane-hpaio.so* $(1)/usr/lib/sane ++ ++ $(INSTALL_DIR) $(1)/etc/hp ++ $(CP) $(PKG_BUILD_DIR)/hplip.conf $(1)/etc/hp/hplip.conf ++ ++ $(INSTALL_DIR) $(1)/usr/share/hplip/data/models/ ++ $(CP) $(PKG_BUILD_DIR)/data/models/models.dat $(1)/usr/share/hplip/data/models/ ++ ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/usb/ ++ $(INSTALL_BIN) ./files/20-hplip $(1)/etc/hotplug.d/usb/ ++ ++ $(INSTALL_DIR) $(1)/etc/sane.d/dll.d/ ++ $(INSTALL_DATA) ./files/hplib.conf $(1)/etc/sane.d/dll.d/hplib ++endef ++ ++define Package/hplip/conffiles ++/etc/hp/hplip.conf ++endef ++ ++$(eval $(call BuildPackage,hplip)) +diff --git a/feeds/packages/utils/hplip/files/.svn/entries b/feeds/packages/utils/hplip/files/.svn/entries +new file mode 100644 +index 0000000..1056bd5 +--- /dev/null ++++ b/feeds/packages/utils/hplip/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/hplip/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-08-19T23:35:30.401482Z ++28055 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hplib.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++117f07a9a56533498971ad24624f9bbe ++2011-08-19T23:35:30.401482Z ++28055 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++30 ++ ++20-hplip ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++bb2846dd15df13c8f576650d6a1c80bb ++2010-03-19T18:07:52.363782Z ++20307 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++667 ++ +diff --git a/feeds/packages/utils/hplip/files/.svn/text-base/20-hplip.svn-base b/feeds/packages/utils/hplip/files/.svn/text-base/20-hplip.svn-base +new file mode 100644 +index 0000000..6066cc5 +--- /dev/null ++++ b/feeds/packages/utils/hplip/files/.svn/text-base/20-hplip.svn-base +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++# Copyright (C) 2009 OpenWrt.org ++ ++ ++case "$ACTION" in ++ add) ++ # You have to figure out your PRODUCT id. Uncomment the line below, ++ # attach and detach your HP USB printer to find your id in /tmp/hplip.test. ++ # It will look like "Found 3f0/1717/100 on /proc/bus/usb/002/009" ++ # Replace 3f0/1717/100 below with your id. ++ # ++ # echo "Found $PRODUCT on $DEVICE" > /tmp/hplip.test ++ ++ [ "$PRODUCT" = "3f0/1717/100" ] && chown nobody $DEVICE && chmod 666 $DEVICE ++ ;; ++ remove) ++ # device is gone ++ ;; ++esac +diff --git a/feeds/packages/utils/hplip/files/.svn/text-base/hplib.conf.svn-base b/feeds/packages/utils/hplip/files/.svn/text-base/hplib.conf.svn-base +new file mode 100644 +index 0000000..d67d370 +--- /dev/null ++++ b/feeds/packages/utils/hplip/files/.svn/text-base/hplib.conf.svn-base +@@ -0,0 +1,2 @@ ++# Load the hplib driver ++hpaio +diff --git a/feeds/packages/utils/hplip/files/20-hplip b/feeds/packages/utils/hplip/files/20-hplip +new file mode 100644 +index 0000000..6066cc5 +--- /dev/null ++++ b/feeds/packages/utils/hplip/files/20-hplip +@@ -0,0 +1,20 @@ ++#!/bin/sh ++ ++# Copyright (C) 2009 OpenWrt.org ++ ++ ++case "$ACTION" in ++ add) ++ # You have to figure out your PRODUCT id. Uncomment the line below, ++ # attach and detach your HP USB printer to find your id in /tmp/hplip.test. ++ # It will look like "Found 3f0/1717/100 on /proc/bus/usb/002/009" ++ # Replace 3f0/1717/100 below with your id. ++ # ++ # echo "Found $PRODUCT on $DEVICE" > /tmp/hplip.test ++ ++ [ "$PRODUCT" = "3f0/1717/100" ] && chown nobody $DEVICE && chmod 666 $DEVICE ++ ;; ++ remove) ++ # device is gone ++ ;; ++esac +diff --git a/feeds/packages/utils/hplip/files/hplib.conf b/feeds/packages/utils/hplip/files/hplib.conf +new file mode 100644 +index 0000000..d67d370 +--- /dev/null ++++ b/feeds/packages/utils/hplip/files/hplib.conf +@@ -0,0 +1,2 @@ ++# Load the hplib driver ++hpaio +diff --git a/feeds/packages/utils/huaweiaktbbo/.svn/entries b/feeds/packages/utils/huaweiaktbbo/.svn/entries +new file mode 100644 +index 0000000..4ddabee +--- /dev/null ++++ b/feeds/packages/utils/huaweiaktbbo/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/huaweiaktbbo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++65b7c05415ed33b5f3e82fb72e647729 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++889 ++ +diff --git a/feeds/packages/utils/huaweiaktbbo/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/huaweiaktbbo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..81c4b56 +--- /dev/null ++++ b/feeds/packages/utils/huaweiaktbbo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# Copyright (C) 2008-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:=huaweiaktbbo ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/huaweiaktbbo ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat ++ TITLE:=Huawei E156/E169/E220 activation tool ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR) ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) \ ++ -lusb \ ++ -o $(PKG_BUILD_DIR)/huaweiAktBbo \ ++ $(PKG_BUILD_DIR)/huaweiAktBbo.c ++endef ++ ++define Package/huaweiaktbbo/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/huaweiAktBbo $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,huaweiaktbbo)) +diff --git a/feeds/packages/utils/huaweiaktbbo/Makefile b/feeds/packages/utils/huaweiaktbbo/Makefile +new file mode 100644 +index 0000000..81c4b56 +--- /dev/null ++++ b/feeds/packages/utils/huaweiaktbbo/Makefile +@@ -0,0 +1,41 @@ ++# ++# Copyright (C) 2008-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:=huaweiaktbbo ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/huaweiaktbbo ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat ++ TITLE:=Huawei E156/E169/E220 activation tool ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR) ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) \ ++ -lusb \ ++ -o $(PKG_BUILD_DIR)/huaweiAktBbo \ ++ $(PKG_BUILD_DIR)/huaweiAktBbo.c ++endef ++ ++define Package/huaweiaktbbo/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/huaweiAktBbo $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,huaweiaktbbo)) +diff --git a/feeds/packages/utils/huaweiaktbbo/src/.svn/entries b/feeds/packages/utils/huaweiaktbbo/src/.svn/entries +new file mode 100644 +index 0000000..e3cffb9 +--- /dev/null ++++ b/feeds/packages/utils/huaweiaktbbo/src/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/huaweiaktbbo/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-22T22:58:59.730417Z ++18898 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++huaweiAktBbo.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8fccc034f73c98c88541b7836d164449 ++2009-12-22T22:58:59.730417Z ++18898 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2300 ++ +diff --git a/feeds/packages/utils/huaweiaktbbo/src/.svn/text-base/huaweiAktBbo.c.svn-base b/feeds/packages/utils/huaweiaktbbo/src/.svn/text-base/huaweiAktBbo.c.svn-base +new file mode 100644 +index 0000000..09c9050 +--- /dev/null ++++ b/feeds/packages/utils/huaweiaktbbo/src/.svn/text-base/huaweiAktBbo.c.svn-base +@@ -0,0 +1,95 @@ ++/* HUAWEI 3G modems activator ++ Copyright (C) 2006 bobovsky bobovsky@kanoistika.sk GPL ++ Copyright (C) 2009 Nuno Goncalves nunojpg@gmail.com GPL ++ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License2. ++*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct usb_dev_handle *devh; ++ ++void release_usb_device(int dummy) { ++ int ret; ++ ret = usb_release_interface(devh, 0); ++ ++ if (!ret) ++ printf("failed to release interface: %d\n", ret); ++ ++ usb_close(devh); ++ ++ if (!ret) ++ printf("failed to close interface: %d\n", ret); ++ ++ exit(1); ++} ++ ++void list_devices() { ++ struct usb_bus *bus; ++ for (bus = usb_get_busses(); bus; bus = bus->next) { ++ struct usb_device *dev; ++ ++ for (dev = bus->devices; dev; dev = dev->next) ++ printf("0x%04x 0x%04x\n", dev->descriptor.idVendor, dev->descriptor.idProduct); ++ } ++} ++ ++struct usb_device *find_device() { ++ struct usb_bus *bus; ++ ++ for (bus = usb_get_busses(); bus; bus = bus->next) { ++ struct usb_device *dev; ++ ++ for (dev = bus->devices; dev; dev = dev->next) { ++ if (dev->descriptor.idVendor == 0x12d1 && dev->descriptor.idProduct == 0x1001 || //Huawei E169, Huawei E169G ++ dev->descriptor.idVendor == 0x12d1 && dev->descriptor.idProduct == 0x1003) //Huawei E220, Huawei E156G ++ return dev; ++ } ++ } ++ return NULL; ++} ++ ++int main(int argc, char **argv) { ++ int ret, vendor, product; ++ struct usb_device *dev; ++ char buf[65535], *endptr; ++ ++ usb_init(); ++ usb_find_busses(); ++ usb_find_devices(); ++ ++ printf("Searching modem..."); ++ dev = find_device(); ++ ++ if(dev == NULL){ ++ printf("No supported modem found\n"); ++ return 1; ++ } ++ ++ printf("found supported modem!\n"); ++ ++ assert(dev); ++ devh = usb_open(dev); ++ assert(devh); ++ ++ signal(SIGTERM, release_usb_device); ++ ++ ret = usb_get_descriptor(devh, 0x0000001, 0x0000000, buf, 0x0000012); ++ usleep(1*1000); ++ ret = usb_get_descriptor(devh, 0x0000002, 0x0000000, buf, 0x0000009); ++ usleep(1*1000); ++ ret = usb_get_descriptor(devh, 0x0000002, 0x0000000, buf, 0x0000020); ++ usleep(1*1000); ++ ret = usb_control_msg(devh, USB_TYPE_STANDARD + USB_RECIP_DEVICE, USB_REQ_SET_FEATURE, 00000001, 0, buf, 0, 1000); ++ ++ ret = usb_close(devh); ++ assert(ret == 0); ++ ++ printf("Modem poked!\n"); ++ return 0; ++} +diff --git a/feeds/packages/utils/huaweiaktbbo/src/huaweiAktBbo.c b/feeds/packages/utils/huaweiaktbbo/src/huaweiAktBbo.c +new file mode 100644 +index 0000000..09c9050 +--- /dev/null ++++ b/feeds/packages/utils/huaweiaktbbo/src/huaweiAktBbo.c +@@ -0,0 +1,95 @@ ++/* HUAWEI 3G modems activator ++ Copyright (C) 2006 bobovsky bobovsky@kanoistika.sk GPL ++ Copyright (C) 2009 Nuno Goncalves nunojpg@gmail.com GPL ++ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License2. ++*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct usb_dev_handle *devh; ++ ++void release_usb_device(int dummy) { ++ int ret; ++ ret = usb_release_interface(devh, 0); ++ ++ if (!ret) ++ printf("failed to release interface: %d\n", ret); ++ ++ usb_close(devh); ++ ++ if (!ret) ++ printf("failed to close interface: %d\n", ret); ++ ++ exit(1); ++} ++ ++void list_devices() { ++ struct usb_bus *bus; ++ for (bus = usb_get_busses(); bus; bus = bus->next) { ++ struct usb_device *dev; ++ ++ for (dev = bus->devices; dev; dev = dev->next) ++ printf("0x%04x 0x%04x\n", dev->descriptor.idVendor, dev->descriptor.idProduct); ++ } ++} ++ ++struct usb_device *find_device() { ++ struct usb_bus *bus; ++ ++ for (bus = usb_get_busses(); bus; bus = bus->next) { ++ struct usb_device *dev; ++ ++ for (dev = bus->devices; dev; dev = dev->next) { ++ if (dev->descriptor.idVendor == 0x12d1 && dev->descriptor.idProduct == 0x1001 || //Huawei E169, Huawei E169G ++ dev->descriptor.idVendor == 0x12d1 && dev->descriptor.idProduct == 0x1003) //Huawei E220, Huawei E156G ++ return dev; ++ } ++ } ++ return NULL; ++} ++ ++int main(int argc, char **argv) { ++ int ret, vendor, product; ++ struct usb_device *dev; ++ char buf[65535], *endptr; ++ ++ usb_init(); ++ usb_find_busses(); ++ usb_find_devices(); ++ ++ printf("Searching modem..."); ++ dev = find_device(); ++ ++ if(dev == NULL){ ++ printf("No supported modem found\n"); ++ return 1; ++ } ++ ++ printf("found supported modem!\n"); ++ ++ assert(dev); ++ devh = usb_open(dev); ++ assert(devh); ++ ++ signal(SIGTERM, release_usb_device); ++ ++ ret = usb_get_descriptor(devh, 0x0000001, 0x0000000, buf, 0x0000012); ++ usleep(1*1000); ++ ret = usb_get_descriptor(devh, 0x0000002, 0x0000000, buf, 0x0000009); ++ usleep(1*1000); ++ ret = usb_get_descriptor(devh, 0x0000002, 0x0000000, buf, 0x0000020); ++ usleep(1*1000); ++ ret = usb_control_msg(devh, USB_TYPE_STANDARD + USB_RECIP_DEVICE, USB_REQ_SET_FEATURE, 00000001, 0, buf, 0, 1000); ++ ++ ret = usb_close(devh); ++ assert(ret == 0); ++ ++ printf("Modem poked!\n"); ++ return 0; ++} +diff --git a/feeds/packages/utils/i2c-tools/.svn/entries b/feeds/packages/utils/i2c-tools/.svn/entries +new file mode 100644 +index 0000000..e7e0438 +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/i2c-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T16:34:33.947811Z ++35232 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++4f6448ff3bd8156e5aa05f99798c76c7 ++2013-01-18T16:34:33.947811Z ++35232 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2333 ++ +diff --git a/feeds/packages/utils/i2c-tools/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/i2c-tools/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/i2c-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/i2c-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..16feedb +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,89 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=i2c-tools ++PKG_VERSION:=3.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.lm-sensors.org/i2c-tools/releases ++PKG_MD5SUM:=f15019e559e378c6e9d5d6299a00df21 ++ ++PKG_BUILD_DEPENDS:=PACKAGE_python-smbus:python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/i2c-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=I2C tools for Linux ++ URL:=http://www.lm-sensors.org/wiki/I2CTools ++endef ++ ++define Package/python-smbus ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Python bindings for the SMBUS ++ URL:=http://www.lm-sensors.org/wiki/I2CTools ++ DEPENDS:= +PACKAGE_python-smbus:python-mini +i2c-tools ++endef ++ ++define Package/i2c-tools/description ++ This package contains an heterogeneous set of I2C tools for Linux. These tools ++ were originally part of the lm-sensors package. ++ Includes: ++ - i2cdetect ++ - i2cdump ++ - i2cget ++ - i2cset ++endef ++ ++define Package/python-smbus/description ++ This package contains an heterogeneous set of I2C tools for Linux. ++ ++ This package contain the python bindings for Linux SMBus access through i2c-dev. ++endef ++ ++TARGET_CPPFLAGS += -I$(LINUX_DIR)/include ++ ++ifdef CONFIG_PACKAGE_python-smbus ++ define Build/Compile/python-smbus ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,./py-smbus/, \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++ endef ++endif ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LINUX="$(LINUX_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ STAGING_DIR="$(STAGING_DIR)" ++ $(Build/Compile/python-smbus) ++endef ++ ++define Package/i2c-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdetect $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdump $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cset $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cget $(1)/usr/sbin/ ++endef ++ ++define PyPackage/python-smbus/filespec +++|$(PYTHON_PKG_DIR)/smbus.so ++endef ++ ++$(eval $(call BuildPackage,i2c-tools)) ++$(eval $(call PyPackage,python-smbus)) ++$(eval $(call BuildPackage,python-smbus)) +diff --git a/feeds/packages/utils/i2c-tools/Makefile b/feeds/packages/utils/i2c-tools/Makefile +new file mode 100644 +index 0000000..16feedb +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/Makefile +@@ -0,0 +1,89 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=i2c-tools ++PKG_VERSION:=3.1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.lm-sensors.org/i2c-tools/releases ++PKG_MD5SUM:=f15019e559e378c6e9d5d6299a00df21 ++ ++PKG_BUILD_DEPENDS:=PACKAGE_python-smbus:python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/i2c-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=I2C tools for Linux ++ URL:=http://www.lm-sensors.org/wiki/I2CTools ++endef ++ ++define Package/python-smbus ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE:=Python bindings for the SMBUS ++ URL:=http://www.lm-sensors.org/wiki/I2CTools ++ DEPENDS:= +PACKAGE_python-smbus:python-mini +i2c-tools ++endef ++ ++define Package/i2c-tools/description ++ This package contains an heterogeneous set of I2C tools for Linux. These tools ++ were originally part of the lm-sensors package. ++ Includes: ++ - i2cdetect ++ - i2cdump ++ - i2cget ++ - i2cset ++endef ++ ++define Package/python-smbus/description ++ This package contains an heterogeneous set of I2C tools for Linux. ++ ++ This package contain the python bindings for Linux SMBus access through i2c-dev. ++endef ++ ++TARGET_CPPFLAGS += -I$(LINUX_DIR)/include ++ ++ifdef CONFIG_PACKAGE_python-smbus ++ define Build/Compile/python-smbus ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,./py-smbus/, \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++ endef ++endif ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LINUX="$(LINUX_DIR)" \ ++ CC="$(TARGET_CC)" \ ++ STAGING_DIR="$(STAGING_DIR)" ++ $(Build/Compile/python-smbus) ++endef ++ ++define Package/i2c-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdetect $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdump $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cset $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cget $(1)/usr/sbin/ ++endef ++ ++define PyPackage/python-smbus/filespec +++|$(PYTHON_PKG_DIR)/smbus.so ++endef ++ ++$(eval $(call BuildPackage,i2c-tools)) ++$(eval $(call PyPackage,python-smbus)) ++$(eval $(call BuildPackage,python-smbus)) +diff --git a/feeds/packages/utils/i2c-tools/patches/.svn/entries b/feeds/packages/utils/i2c-tools/patches/.svn/entries +new file mode 100644 +index 0000000..bfb8589 +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/i2c-tools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-05T21:27:53.196438Z ++24912 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-linux_include.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c3a754aa806c1e35561097400072d029 ++2011-01-05T21:27:53.196438Z ++24912 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++195 ++ +diff --git a/feeds/packages/utils/i2c-tools/patches/.svn/text-base/100-linux_include.patch.svn-base b/feeds/packages/utils/i2c-tools/patches/.svn/text-base/100-linux_include.patch.svn-base +new file mode 100644 +index 0000000..addfc5b +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/patches/.svn/text-base/100-linux_include.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/py-smbus/smbusmodule.c +++++ b/py-smbus/smbusmodule.c ++@@ -21,6 +21,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ ++ /* +diff --git a/feeds/packages/utils/i2c-tools/patches/100-linux_include.patch b/feeds/packages/utils/i2c-tools/patches/100-linux_include.patch +new file mode 100644 +index 0000000..addfc5b +--- /dev/null ++++ b/feeds/packages/utils/i2c-tools/patches/100-linux_include.patch +@@ -0,0 +1,10 @@ ++--- a/py-smbus/smbusmodule.c +++++ b/py-smbus/smbusmodule.c ++@@ -21,6 +21,7 @@ ++ #include ++ #include ++ #include +++#include ++ #include ++ ++ /* +diff --git a/feeds/packages/utils/iioutils/.svn/entries b/feeds/packages/utils/iioutils/.svn/entries +new file mode 100644 +index 0000000..d82a50a +--- /dev/null ++++ b/feeds/packages/utils/iioutils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/iioutils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-11T10:58:51.153617Z ++35551 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++02a6d2e8caabc0b3d9ac1852da8d6ee9 ++2013-02-11T10:58:51.153617Z ++35551 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1010 ++ +diff --git a/feeds/packages/utils/iioutils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/iioutils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..905785c +--- /dev/null ++++ b/feeds/packages/utils/iioutils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# ++# 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:=iioutils ++PKG_VERSION:=0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=8a88b711d3d6a7fedd75af833c5470cb ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/iioutils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+sysfsutils ++ TITLE:=Linux IIO Utilities ++ URL:=http://sourceforge.net/projects/iioutils/ ++endef ++ ++define Package/iioutils/description ++ lsiio is a utility for displaying information about IndustrialIO devices in the system and ++ the sensors provided by them. ++endef ++ ++TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) ++ ++define Package/iioutils/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{lsiio,iio_ring} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,iioutils)) +diff --git a/feeds/packages/utils/iioutils/Makefile b/feeds/packages/utils/iioutils/Makefile +new file mode 100644 +index 0000000..905785c +--- /dev/null ++++ b/feeds/packages/utils/iioutils/Makefile +@@ -0,0 +1,42 @@ ++# ++# 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:=iioutils ++PKG_VERSION:=0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=8a88b711d3d6a7fedd75af833c5470cb ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/iioutils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+sysfsutils ++ TITLE:=Linux IIO Utilities ++ URL:=http://sourceforge.net/projects/iioutils/ ++endef ++ ++define Package/iioutils/description ++ lsiio is a utility for displaying information about IndustrialIO devices in the system and ++ the sensors provided by them. ++endef ++ ++TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) ++ ++define Package/iioutils/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{lsiio,iio_ring} $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,iioutils)) +diff --git a/feeds/packages/utils/ink/.svn/entries b/feeds/packages/utils/ink/.svn/entries +new file mode 100644 +index 0000000..c29dc82 +--- /dev/null ++++ b/feeds/packages/utils/ink/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ink ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-19T15:49:38.700054Z ++21034 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++de5c1cc8015da902d2c80ed098d396a9 ++2010-04-19T15:49:38.700054Z ++21034 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++698 ++ +diff --git a/feeds/packages/utils/ink/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ink/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cc617b7 +--- /dev/null ++++ b/feeds/packages/utils/ink/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,33 @@ ++# ++# 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:=ink ++PKG_VERSION:=0.5.1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ink ++PKG_MD5SUM:=df09c4a1a404dd37ffff80ce2491ab6d ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ink ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A utility for reading ink levels ++ URL:=http://ink.sourceforge.net/ ++ DEPENDS:=+libinklevel ++endef ++ ++define Package/ink/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ink $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,ink)) +diff --git a/feeds/packages/utils/ink/Makefile b/feeds/packages/utils/ink/Makefile +new file mode 100644 +index 0000000..cc617b7 +--- /dev/null ++++ b/feeds/packages/utils/ink/Makefile +@@ -0,0 +1,33 @@ ++# ++# 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:=ink ++PKG_VERSION:=0.5.1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/ink ++PKG_MD5SUM:=df09c4a1a404dd37ffff80ce2491ab6d ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ink ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A utility for reading ink levels ++ URL:=http://ink.sourceforge.net/ ++ DEPENDS:=+libinklevel ++endef ++ ++define Package/ink/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ink $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,ink)) +diff --git a/feeds/packages/utils/input-utils/.svn/entries b/feeds/packages/utils/input-utils/.svn/entries +new file mode 100644 +index 0000000..c3bd167 +--- /dev/null ++++ b/feeds/packages/utils/input-utils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/input-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-20T16:04:10.685896Z ++25615 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d84b12430e6a48f25b4cf0f6058ec66e ++2011-02-20T16:04:10.685896Z ++25615 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1051 ++ +diff --git a/feeds/packages/utils/input-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/input-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..dca3330 +--- /dev/null ++++ b/feeds/packages/utils/input-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=input-utils ++PKG_VERSION:=20081014-101501 ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/input/ ++PKG_SOURCE:=input-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dl.bytesex.org/cvs-snapshots/ ++PKG_MD5SUM:=a6854dc5218301b67324b483d26f1bee ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/input-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Utilities for the input layer of the Linux kernel ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ STRIP="true" \ ++ build ++endef ++ ++define Package/input-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/input-events $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/input-kbd $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lsinput $(1)/usr/bin/ ++ ++endef ++ ++$(eval $(call BuildPackage,input-utils)) +diff --git a/feeds/packages/utils/input-utils/Makefile b/feeds/packages/utils/input-utils/Makefile +new file mode 100644 +index 0000000..dca3330 +--- /dev/null ++++ b/feeds/packages/utils/input-utils/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=input-utils ++PKG_VERSION:=20081014-101501 ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/input/ ++PKG_SOURCE:=input-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://dl.bytesex.org/cvs-snapshots/ ++PKG_MD5SUM:=a6854dc5218301b67324b483d26f1bee ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/input-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Utilities for the input layer of the Linux kernel ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C "$(PKG_BUILD_DIR)" \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ STRIP="true" \ ++ build ++endef ++ ++define Package/input-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/input-events $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/input-kbd $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lsinput $(1)/usr/bin/ ++ ++endef ++ ++$(eval $(call BuildPackage,input-utils)) +diff --git a/feeds/packages/utils/input-utils/patches/.svn/entries b/feeds/packages/utils/input-utils/patches/.svn/entries +new file mode 100644 +index 0000000..ddc29a0 +--- /dev/null ++++ b/feeds/packages/utils/input-utils/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/input-utils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-02-20T16:04:10.685896Z ++25615 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-version-check.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++733f1ece5ce8d8ec5cc399bc61e2b50d ++2011-02-20T16:04:10.685896Z ++25615 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++778 ++ ++001-EVIOCGKEYCODE2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++3286cb266eb442f74f706006b6c5b05b ++2011-02-20T16:04:10.685896Z ++25615 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4981 ++ +diff --git a/feeds/packages/utils/input-utils/patches/.svn/text-base/001-EVIOCGKEYCODE2.patch.svn-base b/feeds/packages/utils/input-utils/patches/.svn/text-base/001-EVIOCGKEYCODE2.patch.svn-base +new file mode 100644 +index 0000000..d282f6b +--- /dev/null ++++ b/feeds/packages/utils/input-utils/patches/.svn/text-base/001-EVIOCGKEYCODE2.patch.svn-base +@@ -0,0 +1,220 @@ ++From 52f533a6c32f8e1e376c5a335cc067da16d59b61 Mon Sep 17 00:00:00 2001 ++From: Dmitry Torokhov ++Date: Wed, 26 Jan 2011 15:49:39 +0100 ++Subject: [PATCH] input-kbd - switch to using EVIOCGKEYCODE2 when available ++ ++[mchehab@redhat.com: Ported it to the -git version] ++ ++Signed-off-by: Dmitry Torokhov ++Signed-off-by: Mauro Carvalho Chehab ++--- ++ input-kbd.c | 110 +++++++++++++++++++++++++++++++++++++++-------------------- ++ input.c | 4 +- ++ 2 files changed, 75 insertions(+), 39 deletions(-) ++ ++diff --git a/input-kbd.c b/input-kbd.c ++index c432d0d..aaf23b9 100644 ++--- a/input-kbd.c +++++ b/input-kbd.c ++@@ -9,9 +9,22 @@ ++ ++ #include "input.h" ++ +++struct input_keymap_entry_v2 { +++#define KEYMAP_BY_INDEX (1 << 0) +++ uint8_t flags; +++ uint8_t len; +++ uint16_t index; +++ uint32_t keycode; +++ uint8_t scancode[32]; +++}; +++ +++#ifndef EVIOCGKEYCODE_V2 +++#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry_v2) +++#endif +++ ++ struct kbd_entry { ++- int scancode; ++- int keycode; +++ unsigned int scancode; +++ unsigned int keycode; ++ }; ++ ++ struct kbd_map { ++@@ -23,7 +36,7 @@ struct kbd_map { ++ ++ /* ------------------------------------------------------------------ */ ++ ++-static struct kbd_map* kbd_map_read(int fd) +++static struct kbd_map* kbd_map_read(int fd, unsigned int version) ++ { ++ struct kbd_entry entry; ++ struct kbd_map *map; ++@@ -32,17 +45,35 @@ static struct kbd_map* kbd_map_read(int fd) ++ map = malloc(sizeof(*map)); ++ memset(map,0,sizeof(*map)); ++ for (map->size = 0; map->size < 65536; map->size++) { ++- entry.scancode = map->size; ++- entry.keycode = KEY_RESERVED; ++- rc = ioctl(fd, EVIOCGKEYCODE, &entry); ++- if (rc < 0) { ++- map->size--; ++- break; +++ if (version < 0x10001) { +++ entry.scancode = map->size; +++ entry.keycode = KEY_RESERVED; +++ rc = ioctl(fd, EVIOCGKEYCODE, &entry); +++ if (rc < 0) { +++ map->size--; +++ break; +++ } +++ } else { +++ struct input_keymap_entry_v2 ke = { +++ .index = map->size, +++ .flags = KEYMAP_BY_INDEX, +++ .len = sizeof(uint32_t), +++ .keycode = KEY_RESERVED, +++ }; +++ +++ rc = ioctl(fd, EVIOCGKEYCODE_V2, &ke); +++ if (rc < 0) +++ break; +++ memcpy(&entry.scancode, ke.scancode, +++ sizeof(entry.scancode)); +++ entry.keycode = ke.keycode; ++ } +++ ++ if (map->size >= map->alloc) { ++ map->alloc += 64; ++ map->map = realloc(map->map, map->alloc * sizeof(entry)); ++ } +++ ++ map->map[map->size] = entry; ++ ++ if (KEY_RESERVED != entry.keycode) ++@@ -156,37 +187,25 @@ static void kbd_print_bits(int fd) ++ } ++ } ++ ++-static void show_kbd(int nr) +++static void show_kbd(int fd, unsigned int protocol_version) ++ { ++ struct kbd_map *map; ++- int fd; ++ ++- fd = device_open(nr,1); ++- if (-1 == fd) ++- return; ++ device_info(fd); ++ ++- map = kbd_map_read(fd); ++- if (NULL != map) { ++- kbd_map_print(stdout,map,0); ++- } else { +++ map = kbd_map_read(fd, protocol_version); +++ if (map) +++ kbd_map_print(stdout, map, 0); +++ else ++ kbd_print_bits(fd); ++- } ++- ++- close(fd); ++ } ++ ++-static int set_kbd(int nr, char *mapfile) +++static int set_kbd(int fd, unsigned int protocol_version, char *mapfile) ++ { ++ struct kbd_map *map; ++ FILE *fp; ++- int fd; ++ ++- fd = device_open(nr,1); ++- if (-1 == fd) ++- return -1; ++- ++- map = kbd_map_read(fd); +++ map = kbd_map_read(fd, protocol_version); ++ if (NULL == map) { ++ fprintf(stderr,"device has no map\n"); ++ close(fd); ++@@ -203,14 +222,12 @@ static int set_kbd(int nr, char *mapfile) ++ return -1; ++ } ++ } ++- +++ ++ if (0 != kbd_map_parse(fp,map) || ++ 0 != kbd_map_write(fd,map)) { ++- close(fd); ++ return -1; ++ } ++ ++- close(fd); ++ return 0; ++ } ++ ++@@ -224,8 +241,10 @@ static int usage(char *prog, int error) ++ ++ int main(int argc, char *argv[]) ++ { ++- int c,devnr; +++ int c, devnr, fd; ++ char *mapfile = NULL; +++ unsigned int protocol_version; +++ int rc = EXIT_FAILURE; ++ ++ for (;;) { ++ if (-1 == (c = getopt(argc, argv, "hf:"))) ++@@ -245,12 +264,29 @@ int main(int argc, char *argv[]) ++ usage(argv[0],1); ++ ++ devnr = atoi(argv[optind]); ++- if (mapfile) { ++- set_kbd(devnr,mapfile); ++- } else { ++- show_kbd(devnr); +++ +++ fd = device_open(devnr, 1); +++ if (fd < 0) +++ goto out; +++ +++ if (ioctl(fd, EVIOCGVERSION, &protocol_version) < 0) { +++ fprintf(stderr, +++ "Unable to query evdev protocol version: %s\n", +++ strerror(errno)); +++ goto out_close; ++ } ++- return 0; +++ +++ if (mapfile) +++ set_kbd(fd, protocol_version, mapfile); +++ else +++ show_kbd(fd, protocol_version); +++ +++ rc = EXIT_SUCCESS; +++ +++out_close: +++ close(fd); +++out: +++ return rc; ++ } ++ ++ /* --------------------------------------------------------------------- ++diff --git a/input.c b/input.c ++index d57a31e..a9bd5e8 100644 ++--- a/input.c +++++ b/input.c ++@@ -101,8 +101,8 @@ int device_open(int nr, int verbose) ++ close(fd); ++ return -1; ++ } ++- if (EV_VERSION != version) { ++- fprintf(stderr, "protocol version mismatch (expected %d, got %d)\n", +++ if (EV_VERSION > version) { +++ fprintf(stderr, "protocol version mismatch (expected >= %d, got %d)\n", ++ EV_VERSION, version); ++ close(fd); ++ return -1; ++-- ++1.7.2.3 ++ +diff --git a/feeds/packages/utils/input-utils/patches/.svn/text-base/002-version-check.patch.svn-base b/feeds/packages/utils/input-utils/patches/.svn/text-base/002-version-check.patch.svn-base +new file mode 100644 +index 0000000..03358eb +--- /dev/null ++++ b/feeds/packages/utils/input-utils/patches/.svn/text-base/002-version-check.patch.svn-base +@@ -0,0 +1,34 @@ ++From d99f056745e53cd2518ca169af474f8c45c1436d Mon Sep 17 00:00:00 2001 ++From: Gerd Hoffmann ++Date: Wed, 26 Jan 2011 21:01:05 +0100 ++Subject: [PATCH] remove version check ++ ++--- ++ input.c | 11 ----------- ++ 1 files changed, 0 insertions(+), 11 deletions(-) ++ ++diff --git a/input.c b/input.c ++index a9bd5e8..9a6a810 100644 ++--- a/input.c +++++ b/input.c ++@@ -96,17 +96,6 @@ int device_open(int nr, int verbose) ++ if (verbose) ++ fprintf(stderr,"%s\n",filename); ++ ++- if (-1 == ioctl(fd,EVIOCGVERSION,&version)) { ++- perror("ioctl EVIOCGVERSION"); ++- close(fd); ++- return -1; ++- } ++- if (EV_VERSION > version) { ++- fprintf(stderr, "protocol version mismatch (expected >= %d, got %d)\n", ++- EV_VERSION, version); ++- close(fd); ++- return -1; ++- } ++ return fd; ++ } ++ ++-- ++1.7.2.3 ++ +diff --git a/feeds/packages/utils/input-utils/patches/001-EVIOCGKEYCODE2.patch b/feeds/packages/utils/input-utils/patches/001-EVIOCGKEYCODE2.patch +new file mode 100644 +index 0000000..d282f6b +--- /dev/null ++++ b/feeds/packages/utils/input-utils/patches/001-EVIOCGKEYCODE2.patch +@@ -0,0 +1,220 @@ ++From 52f533a6c32f8e1e376c5a335cc067da16d59b61 Mon Sep 17 00:00:00 2001 ++From: Dmitry Torokhov ++Date: Wed, 26 Jan 2011 15:49:39 +0100 ++Subject: [PATCH] input-kbd - switch to using EVIOCGKEYCODE2 when available ++ ++[mchehab@redhat.com: Ported it to the -git version] ++ ++Signed-off-by: Dmitry Torokhov ++Signed-off-by: Mauro Carvalho Chehab ++--- ++ input-kbd.c | 110 +++++++++++++++++++++++++++++++++++++++-------------------- ++ input.c | 4 +- ++ 2 files changed, 75 insertions(+), 39 deletions(-) ++ ++diff --git a/input-kbd.c b/input-kbd.c ++index c432d0d..aaf23b9 100644 ++--- a/input-kbd.c +++++ b/input-kbd.c ++@@ -9,9 +9,22 @@ ++ ++ #include "input.h" ++ +++struct input_keymap_entry_v2 { +++#define KEYMAP_BY_INDEX (1 << 0) +++ uint8_t flags; +++ uint8_t len; +++ uint16_t index; +++ uint32_t keycode; +++ uint8_t scancode[32]; +++}; +++ +++#ifndef EVIOCGKEYCODE_V2 +++#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry_v2) +++#endif +++ ++ struct kbd_entry { ++- int scancode; ++- int keycode; +++ unsigned int scancode; +++ unsigned int keycode; ++ }; ++ ++ struct kbd_map { ++@@ -23,7 +36,7 @@ struct kbd_map { ++ ++ /* ------------------------------------------------------------------ */ ++ ++-static struct kbd_map* kbd_map_read(int fd) +++static struct kbd_map* kbd_map_read(int fd, unsigned int version) ++ { ++ struct kbd_entry entry; ++ struct kbd_map *map; ++@@ -32,17 +45,35 @@ static struct kbd_map* kbd_map_read(int fd) ++ map = malloc(sizeof(*map)); ++ memset(map,0,sizeof(*map)); ++ for (map->size = 0; map->size < 65536; map->size++) { ++- entry.scancode = map->size; ++- entry.keycode = KEY_RESERVED; ++- rc = ioctl(fd, EVIOCGKEYCODE, &entry); ++- if (rc < 0) { ++- map->size--; ++- break; +++ if (version < 0x10001) { +++ entry.scancode = map->size; +++ entry.keycode = KEY_RESERVED; +++ rc = ioctl(fd, EVIOCGKEYCODE, &entry); +++ if (rc < 0) { +++ map->size--; +++ break; +++ } +++ } else { +++ struct input_keymap_entry_v2 ke = { +++ .index = map->size, +++ .flags = KEYMAP_BY_INDEX, +++ .len = sizeof(uint32_t), +++ .keycode = KEY_RESERVED, +++ }; +++ +++ rc = ioctl(fd, EVIOCGKEYCODE_V2, &ke); +++ if (rc < 0) +++ break; +++ memcpy(&entry.scancode, ke.scancode, +++ sizeof(entry.scancode)); +++ entry.keycode = ke.keycode; ++ } +++ ++ if (map->size >= map->alloc) { ++ map->alloc += 64; ++ map->map = realloc(map->map, map->alloc * sizeof(entry)); ++ } +++ ++ map->map[map->size] = entry; ++ ++ if (KEY_RESERVED != entry.keycode) ++@@ -156,37 +187,25 @@ static void kbd_print_bits(int fd) ++ } ++ } ++ ++-static void show_kbd(int nr) +++static void show_kbd(int fd, unsigned int protocol_version) ++ { ++ struct kbd_map *map; ++- int fd; ++ ++- fd = device_open(nr,1); ++- if (-1 == fd) ++- return; ++ device_info(fd); ++ ++- map = kbd_map_read(fd); ++- if (NULL != map) { ++- kbd_map_print(stdout,map,0); ++- } else { +++ map = kbd_map_read(fd, protocol_version); +++ if (map) +++ kbd_map_print(stdout, map, 0); +++ else ++ kbd_print_bits(fd); ++- } ++- ++- close(fd); ++ } ++ ++-static int set_kbd(int nr, char *mapfile) +++static int set_kbd(int fd, unsigned int protocol_version, char *mapfile) ++ { ++ struct kbd_map *map; ++ FILE *fp; ++- int fd; ++ ++- fd = device_open(nr,1); ++- if (-1 == fd) ++- return -1; ++- ++- map = kbd_map_read(fd); +++ map = kbd_map_read(fd, protocol_version); ++ if (NULL == map) { ++ fprintf(stderr,"device has no map\n"); ++ close(fd); ++@@ -203,14 +222,12 @@ static int set_kbd(int nr, char *mapfile) ++ return -1; ++ } ++ } ++- +++ ++ if (0 != kbd_map_parse(fp,map) || ++ 0 != kbd_map_write(fd,map)) { ++- close(fd); ++ return -1; ++ } ++ ++- close(fd); ++ return 0; ++ } ++ ++@@ -224,8 +241,10 @@ static int usage(char *prog, int error) ++ ++ int main(int argc, char *argv[]) ++ { ++- int c,devnr; +++ int c, devnr, fd; ++ char *mapfile = NULL; +++ unsigned int protocol_version; +++ int rc = EXIT_FAILURE; ++ ++ for (;;) { ++ if (-1 == (c = getopt(argc, argv, "hf:"))) ++@@ -245,12 +264,29 @@ int main(int argc, char *argv[]) ++ usage(argv[0],1); ++ ++ devnr = atoi(argv[optind]); ++- if (mapfile) { ++- set_kbd(devnr,mapfile); ++- } else { ++- show_kbd(devnr); +++ +++ fd = device_open(devnr, 1); +++ if (fd < 0) +++ goto out; +++ +++ if (ioctl(fd, EVIOCGVERSION, &protocol_version) < 0) { +++ fprintf(stderr, +++ "Unable to query evdev protocol version: %s\n", +++ strerror(errno)); +++ goto out_close; ++ } ++- return 0; +++ +++ if (mapfile) +++ set_kbd(fd, protocol_version, mapfile); +++ else +++ show_kbd(fd, protocol_version); +++ +++ rc = EXIT_SUCCESS; +++ +++out_close: +++ close(fd); +++out: +++ return rc; ++ } ++ ++ /* --------------------------------------------------------------------- ++diff --git a/input.c b/input.c ++index d57a31e..a9bd5e8 100644 ++--- a/input.c +++++ b/input.c ++@@ -101,8 +101,8 @@ int device_open(int nr, int verbose) ++ close(fd); ++ return -1; ++ } ++- if (EV_VERSION != version) { ++- fprintf(stderr, "protocol version mismatch (expected %d, got %d)\n", +++ if (EV_VERSION > version) { +++ fprintf(stderr, "protocol version mismatch (expected >= %d, got %d)\n", ++ EV_VERSION, version); ++ close(fd); ++ return -1; ++-- ++1.7.2.3 ++ +diff --git a/feeds/packages/utils/input-utils/patches/002-version-check.patch b/feeds/packages/utils/input-utils/patches/002-version-check.patch +new file mode 100644 +index 0000000..03358eb +--- /dev/null ++++ b/feeds/packages/utils/input-utils/patches/002-version-check.patch +@@ -0,0 +1,34 @@ ++From d99f056745e53cd2518ca169af474f8c45c1436d Mon Sep 17 00:00:00 2001 ++From: Gerd Hoffmann ++Date: Wed, 26 Jan 2011 21:01:05 +0100 ++Subject: [PATCH] remove version check ++ ++--- ++ input.c | 11 ----------- ++ 1 files changed, 0 insertions(+), 11 deletions(-) ++ ++diff --git a/input.c b/input.c ++index a9bd5e8..9a6a810 100644 ++--- a/input.c +++++ b/input.c ++@@ -96,17 +96,6 @@ int device_open(int nr, int verbose) ++ if (verbose) ++ fprintf(stderr,"%s\n",filename); ++ ++- if (-1 == ioctl(fd,EVIOCGVERSION,&version)) { ++- perror("ioctl EVIOCGVERSION"); ++- close(fd); ++- return -1; ++- } ++- if (EV_VERSION > version) { ++- fprintf(stderr, "protocol version mismatch (expected >= %d, got %d)\n", ++- EV_VERSION, version); ++- close(fd); ++- return -1; ++- } ++ return fd; ++ } ++ ++-- ++1.7.2.3 ++ +diff --git a/feeds/packages/utils/io/.svn/entries b/feeds/packages/utils/io/.svn/entries +new file mode 100644 +index 0000000..21e1d5d +--- /dev/null ++++ b/feeds/packages/utils/io/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/io ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e4f3dfc2f3bf50d63925611383b32ddd ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++976 ++ +diff --git a/feeds/packages/utils/io/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/io/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ddf9440 +--- /dev/null ++++ b/feeds/packages/utils/io/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=io ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/io ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Raw memory i/o utility ++ URL:=http://www.sleepie.demon.co.uk/linuxvme/io.c ++endef ++ ++define Package/io/description ++ This tool can be used to access physical memory addresses from userspace. ++ It can be useful to access hardware for which no device driver exists! ++endef ++ ++define Build/Prepare ++ $(INSTALL_DIR) $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -Os $(PKG_BUILD_DIR)/io.c -o $(PKG_BUILD_DIR)/$(PKG_NAME) ++endef ++ ++define Package/io/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/io $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,io)) +diff --git a/feeds/packages/utils/io/Makefile b/feeds/packages/utils/io/Makefile +new file mode 100644 +index 0000000..ddf9440 +--- /dev/null ++++ b/feeds/packages/utils/io/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=io ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/io ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Raw memory i/o utility ++ URL:=http://www.sleepie.demon.co.uk/linuxvme/io.c ++endef ++ ++define Package/io/description ++ This tool can be used to access physical memory addresses from userspace. ++ It can be useful to access hardware for which no device driver exists! ++endef ++ ++define Build/Prepare ++ $(INSTALL_DIR) $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -Os $(PKG_BUILD_DIR)/io.c -o $(PKG_BUILD_DIR)/$(PKG_NAME) ++endef ++ ++define Package/io/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/io $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,io)) +diff --git a/feeds/packages/utils/io/src/.svn/entries b/feeds/packages/utils/io/src/.svn/entries +new file mode 100644 +index 0000000..e448b5b +--- /dev/null ++++ b/feeds/packages/utils/io/src/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/io/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++io.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ce2e8c34ce77f64a1ec493ce9938f357 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9647 ++ +diff --git a/feeds/packages/utils/io/src/.svn/text-base/io.c.svn-base b/feeds/packages/utils/io/src/.svn/text-base/io.c.svn-base +new file mode 100644 +index 0000000..caa23e0 +--- /dev/null ++++ b/feeds/packages/utils/io/src/.svn/text-base/io.c.svn-base +@@ -0,0 +1,425 @@ ++/* ++ * Simple app. to do memory accesses via /dev/mem. ++ * ++ * ++ * Copyright (c) Richard Hirst ++ * Copyright (c) Thomas Langer ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define MEM_READ 0 ++#define MEM_WRITE 1 ++#define MEM_AND 2 ++#define MEM_OR 3 ++ ++static void ++usage (char *argv0) ++{ ++ fprintf(stderr, ++"Raw memory i/o utility - $Revision: 2.0 $\n\n" ++"%s -v -1|2|4 -r|w|a|o [-l ] [-f ] []\n\n" ++" -v Verbose, asks for confirmation\n" ++" -1|2|4 Sets memory access size in bytes (default byte)\n" ++" -l Length in bytes of area to access (defaults to\n" ++" one access, or whole file length)\n" ++" -r|w|a|o Read from or Write to memory (default read)\n" ++" optional write with modify (and/or)\n" ++" -f File to write on memory read, or\n" ++" to read on memory write\n" ++" The memory address to access\n" ++" The value to write (implies -w)\n\n" ++"Examples:\n" ++" %s 0x1000 Reads one byte from 0x1000\n" ++" %s 0x1000 0x12 Writes 0x12 to location 0x1000\n" ++" %s -2 -l 8 0x1000 Reads 8 words from 0x1000\n" ++" %s -r -f dmp -l 100 200 Reads 100 bytes from addr 200 to file\n" ++" %s -w -f img 0x10000 Writes the whole of file to memory\n" ++"\n" ++"Note access size (-1|2|4) does not apply to file based accesses.\n\n", ++ argv0, argv0, argv0, argv0, argv0, argv0); ++ exit(1); ++} ++ ++ ++static void ++memread_memory(unsigned long phys_addr, void *addr, int len, int iosize) ++{ ++ int i; ++ ++ while (len) { ++ printf("%08lx: ", phys_addr); ++ i = 0; ++ while (i < 16 && len) { ++ switch(iosize) { ++ case 1: ++ printf(" %02x", *(unsigned char *)addr); ++ break; ++ case 2: ++ printf(" %04x", *(unsigned short *)addr); ++ break; ++ case 4: ++ printf(" %08lx", *(unsigned long *)addr); ++ break; ++ } ++ i += iosize; ++ addr += iosize; ++ len -= iosize; ++ } ++ phys_addr += 16; ++ printf("\n"); ++ } ++} ++ ++ ++static void ++write_memory(unsigned long phys_addr, void *addr, int len, int iosize, unsigned long value) ++{ ++ switch(iosize) { ++ case 1: ++ while (len) { ++ *(unsigned char *)addr = value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 2: ++ while (len) { ++ *(unsigned short *)addr = value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 4: ++ while (len) { ++ *(unsigned long *)addr = value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ } ++} ++ ++ ++static void ++and_write_memory(unsigned long phys_addr, void *addr, int len, int iosize, unsigned long value) ++{ ++ switch(iosize) { ++ case 1: ++ while (len) { ++ *(unsigned char *)addr &= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 2: ++ while (len) { ++ *(unsigned short *)addr &= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 4: ++ while (len) { ++ *(unsigned long *)addr &= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ } ++} ++ ++ ++static void ++or_write_memory(unsigned long phys_addr, void *addr, int len, int iosize, unsigned long value) ++{ ++ switch(iosize) { ++ case 1: ++ while (len) { ++ *(unsigned char *)addr |= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 2: ++ while (len) { ++ *(unsigned short *)addr |= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 4: ++ while (len) { ++ *(unsigned long *)addr |= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ } ++} ++ ++ ++int ++main (int argc, char **argv) ++{ ++ int mfd, ffd = 0, req_len = 0, opt; ++ void *real_io; ++ unsigned long real_len, real_addr, req_addr, req_value = 0, offset; ++ char *endptr; ++ int memfunc = MEM_READ; ++ int iosize = 1; ++ char *filename = NULL; ++ int verbose = 0; ++ ++ opterr = 0; ++ if (argc == 1) ++ usage(argv[0]); ++ ++ while ((opt = getopt(argc, argv, "hv124rwaol:f:")) > 0) { ++ switch (opt) { ++ case 'h': ++ usage(argv[0]); ++ case 'v': ++ verbose = 1; ++ break; ++ case '1': ++ case '2': ++ case '4': ++ iosize = opt - '0'; ++ break; ++ case 'r': ++ memfunc = MEM_READ; ++ break; ++ case 'a': ++ memfunc = MEM_AND; ++ break; ++ case 'o': ++ memfunc = MEM_OR; ++ break; ++ case 'w': ++ memfunc = MEM_WRITE; ++ break; ++ case 'l': ++ req_len = strtoul(optarg, &endptr, 0); ++ if (*endptr) { ++ fprintf(stderr, "Bad value '%s'\n", optarg); ++ exit(1); ++ } ++ break; ++ case 'f': ++ filename = strdup(optarg); ++ break; ++ default: ++ fprintf(stderr, "Unknown option: %c\n", opt); ++ usage(argv[0]); ++ } ++ } ++ ++ if (optind == argc) { ++ fprintf(stderr, "No address given\n"); ++ exit(1); ++ } ++ req_addr = strtoul(argv[optind], &endptr, 0); ++ if (*endptr) { ++ fprintf(stderr, "Bad value '%s'\n", argv[optind]); ++ exit(1); ++ } ++ optind++; ++ if (!filename && (memfunc == MEM_READ) && optind < argc) { ++ memfunc = MEM_WRITE; ++ } ++ if (filename && optind > argc) { ++ fprintf(stderr, "Filename AND value given\n"); ++ exit(1); ++ } ++ if (!filename && (memfunc != MEM_READ) && optind == argc) { ++ fprintf(stderr, "No value given for WRITE\n"); ++ exit(1); ++ } ++ if (!filename && (memfunc != MEM_READ)) { ++ req_value = strtoul(argv[optind], &endptr, 0); ++ if (*endptr) { ++ fprintf(stderr, "Bad value '%s'\n", argv[optind]); ++ exit(1); ++ } ++ if ((iosize == 1 && (req_value & 0xffffff00)) || ++ (iosize == 2 && (req_value & 0xffff0000))) { ++ fprintf(stderr, " too large\n"); ++ exit(1); ++ } ++ optind++; ++ } ++ if (filename && (memfunc == MEM_READ) && !req_len) { ++ fprintf(stderr, "No size given for file memread\n"); ++ exit(1); ++ } ++ if (optind < argc) { ++ fprintf(stderr, "Too many arguments '%s'...\n", argv[optind]); ++ exit(1); ++ } ++ if (filename && (memfunc == MEM_READ)) { ++ ffd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ++ if (ffd < 0) { ++ fprintf(stderr, "Failed to open destination file '%s': %s\n", filename, strerror(errno)); ++ exit(1); ++ } ++ } ++ if (filename && (memfunc != MEM_READ)) { ++ ffd = open(filename, O_RDONLY); ++ if (ffd < 0) { ++ fprintf(stderr, "Failed to open source file '%s': %s\n", filename, strerror(errno)); ++ exit(1); ++ } ++ } ++ ++ if (filename && !req_len) { ++ req_len = lseek(ffd, 0, SEEK_END); ++ if (req_len < 0) { ++ fprintf(stderr, "Failed to seek on '%s': %s\n", ++ filename, strerror(errno)); ++ exit(1); ++ } ++ if (lseek(ffd, 0, SEEK_SET)) { ++ fprintf(stderr, "Failed to seek on '%s': %s\n", ++ filename, strerror(errno)); ++ exit(1); ++ } ++ } ++ if (!req_len) ++ req_len = iosize; ++ ++ if ((iosize == 2 && (req_addr & 1)) || ++ (iosize == 4 && (req_addr & 3))) { ++ fprintf(stderr, "Badly aligned for access size\n"); ++ exit(1); ++ } ++ if ((iosize == 2 && (req_len & 1)) || ++ (iosize == 4 && (req_len & 3))) { ++ fprintf(stderr, "Badly aligned for access size\n"); ++ exit(1); ++ } ++ ++ if (!verbose) ++ /* Nothing */; ++ else if (filename && (memfunc == MEM_READ)) ++ printf("Request to read 0x%x bytes from address 0x%08lx\n" ++ "\tto file %s, using %d byte accesses\n", ++ req_len, req_addr, filename, iosize); ++ else if (filename) ++ printf("Request to write 0x%x bytes to address 0x%08lx\n" ++ "\tfrom file %s, using %d byte accesses\n", ++ req_len, req_addr, filename, iosize); ++ else if (memfunc == MEM_READ) ++ printf("Request to read 0x%x bytes from address 0x%08lx\n" ++ "\tusing %d byte accesses\n", ++ req_len, req_addr, iosize); ++ else ++ printf("Request to write 0x%x bytes to address 0x%08lx\n" ++ "\tusing %d byte accesses of value 0x%0*lx\n", ++ req_len, req_addr, iosize, iosize*2, req_value); ++ ++ real_addr = req_addr & ~4095; ++ if (real_addr == 0xfffff000) { ++ fprintf(stderr, "Sorry, cannot map the top 4K page\n"); ++ exit(1); ++ } ++ offset = req_addr - real_addr; ++ real_len = req_len + offset; ++ real_len = (real_len + 4095) & ~ 4095; ++ if (real_addr + real_len < real_addr) { ++ fprintf(stderr, "Aligned addr+len exceeds top of address space\n"); ++ exit(1); ++ } ++ if (verbose) ++ printf("Attempting to map 0x%lx bytes at address 0x%08lx\n", ++ real_len, real_addr); ++ ++ mfd = open("/dev/mem", (memfunc == MEM_READ) ? O_RDONLY : O_RDWR); ++ if (mfd == -1) { ++ perror("open /dev/mem"); ++ exit(1); ++ } ++ if (verbose) ++ printf("open(/dev/mem) ok\n"); ++ real_io = mmap(NULL, real_len, ++ (memfunc == MEM_READ) ? PROT_READ:PROT_READ|PROT_WRITE, ++ MAP_SHARED, mfd, real_addr); ++ if (real_io == (void *)(-1)) { ++ fprintf(stderr, "mmap() failed: %s\n", strerror(errno)); ++ exit(1); ++ } ++ if (verbose) ++ printf("mmap() ok\n"); ++ ++ if (verbose) { ++ int c; ++ ++ printf("OK? "); ++ fflush(stdout); ++ c = getchar(); ++ if (c != 'y' && c != 'Y') { ++ printf("Aborted\n"); ++ exit(1); ++ } ++ } ++ ++ if (filename && (memfunc == MEM_READ)) { ++ int n = write(ffd, real_io + offset, req_len); ++ ++ if (n < 0) { ++ fprintf(stderr, "File write failed: %s\n", strerror(errno)); ++ exit(1); ++ } ++ else if (n != req_len) { ++ fprintf(stderr, "Only wrote %d of %d bytes to file\n", ++ n, req_len); ++ exit(1); ++ } ++ } ++ else if (filename) { ++ int n = read(ffd, real_io + offset, req_len); ++ ++ if (n < 0) { ++ fprintf(stderr, "File read failed: %s\n", strerror(errno)); ++ exit(1); ++ } ++ else if (n != req_len) { ++ fprintf(stderr, "Only read %d of %d bytes from file\n", ++ n, req_len); ++ exit(1); ++ } ++ } ++ else { ++ switch (memfunc) ++ { ++ case MEM_READ: ++ memread_memory(req_addr, real_io + offset, req_len, iosize); ++ break; ++ case MEM_WRITE: ++ write_memory(req_addr, real_io + offset, req_len, iosize, req_value); ++ break; ++ case MEM_AND: ++ and_write_memory(req_addr, real_io + offset, req_len, iosize, req_value); ++ break; ++ case MEM_OR: ++ or_write_memory(req_addr, real_io + offset, req_len, iosize, req_value); ++ break; ++ } ++ } ++ ++ if (filename) ++ close(ffd); ++ close (mfd); ++ ++ return 0; ++} ++ +diff --git a/feeds/packages/utils/io/src/io.c b/feeds/packages/utils/io/src/io.c +new file mode 100644 +index 0000000..caa23e0 +--- /dev/null ++++ b/feeds/packages/utils/io/src/io.c +@@ -0,0 +1,425 @@ ++/* ++ * Simple app. to do memory accesses via /dev/mem. ++ * ++ * ++ * Copyright (c) Richard Hirst ++ * Copyright (c) Thomas Langer ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define MEM_READ 0 ++#define MEM_WRITE 1 ++#define MEM_AND 2 ++#define MEM_OR 3 ++ ++static void ++usage (char *argv0) ++{ ++ fprintf(stderr, ++"Raw memory i/o utility - $Revision: 2.0 $\n\n" ++"%s -v -1|2|4 -r|w|a|o [-l ] [-f ] []\n\n" ++" -v Verbose, asks for confirmation\n" ++" -1|2|4 Sets memory access size in bytes (default byte)\n" ++" -l Length in bytes of area to access (defaults to\n" ++" one access, or whole file length)\n" ++" -r|w|a|o Read from or Write to memory (default read)\n" ++" optional write with modify (and/or)\n" ++" -f File to write on memory read, or\n" ++" to read on memory write\n" ++" The memory address to access\n" ++" The value to write (implies -w)\n\n" ++"Examples:\n" ++" %s 0x1000 Reads one byte from 0x1000\n" ++" %s 0x1000 0x12 Writes 0x12 to location 0x1000\n" ++" %s -2 -l 8 0x1000 Reads 8 words from 0x1000\n" ++" %s -r -f dmp -l 100 200 Reads 100 bytes from addr 200 to file\n" ++" %s -w -f img 0x10000 Writes the whole of file to memory\n" ++"\n" ++"Note access size (-1|2|4) does not apply to file based accesses.\n\n", ++ argv0, argv0, argv0, argv0, argv0, argv0); ++ exit(1); ++} ++ ++ ++static void ++memread_memory(unsigned long phys_addr, void *addr, int len, int iosize) ++{ ++ int i; ++ ++ while (len) { ++ printf("%08lx: ", phys_addr); ++ i = 0; ++ while (i < 16 && len) { ++ switch(iosize) { ++ case 1: ++ printf(" %02x", *(unsigned char *)addr); ++ break; ++ case 2: ++ printf(" %04x", *(unsigned short *)addr); ++ break; ++ case 4: ++ printf(" %08lx", *(unsigned long *)addr); ++ break; ++ } ++ i += iosize; ++ addr += iosize; ++ len -= iosize; ++ } ++ phys_addr += 16; ++ printf("\n"); ++ } ++} ++ ++ ++static void ++write_memory(unsigned long phys_addr, void *addr, int len, int iosize, unsigned long value) ++{ ++ switch(iosize) { ++ case 1: ++ while (len) { ++ *(unsigned char *)addr = value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 2: ++ while (len) { ++ *(unsigned short *)addr = value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 4: ++ while (len) { ++ *(unsigned long *)addr = value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ } ++} ++ ++ ++static void ++and_write_memory(unsigned long phys_addr, void *addr, int len, int iosize, unsigned long value) ++{ ++ switch(iosize) { ++ case 1: ++ while (len) { ++ *(unsigned char *)addr &= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 2: ++ while (len) { ++ *(unsigned short *)addr &= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 4: ++ while (len) { ++ *(unsigned long *)addr &= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ } ++} ++ ++ ++static void ++or_write_memory(unsigned long phys_addr, void *addr, int len, int iosize, unsigned long value) ++{ ++ switch(iosize) { ++ case 1: ++ while (len) { ++ *(unsigned char *)addr |= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 2: ++ while (len) { ++ *(unsigned short *)addr |= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ case 4: ++ while (len) { ++ *(unsigned long *)addr |= value; ++ len -= iosize; ++ addr += iosize; ++ } ++ break; ++ } ++} ++ ++ ++int ++main (int argc, char **argv) ++{ ++ int mfd, ffd = 0, req_len = 0, opt; ++ void *real_io; ++ unsigned long real_len, real_addr, req_addr, req_value = 0, offset; ++ char *endptr; ++ int memfunc = MEM_READ; ++ int iosize = 1; ++ char *filename = NULL; ++ int verbose = 0; ++ ++ opterr = 0; ++ if (argc == 1) ++ usage(argv[0]); ++ ++ while ((opt = getopt(argc, argv, "hv124rwaol:f:")) > 0) { ++ switch (opt) { ++ case 'h': ++ usage(argv[0]); ++ case 'v': ++ verbose = 1; ++ break; ++ case '1': ++ case '2': ++ case '4': ++ iosize = opt - '0'; ++ break; ++ case 'r': ++ memfunc = MEM_READ; ++ break; ++ case 'a': ++ memfunc = MEM_AND; ++ break; ++ case 'o': ++ memfunc = MEM_OR; ++ break; ++ case 'w': ++ memfunc = MEM_WRITE; ++ break; ++ case 'l': ++ req_len = strtoul(optarg, &endptr, 0); ++ if (*endptr) { ++ fprintf(stderr, "Bad value '%s'\n", optarg); ++ exit(1); ++ } ++ break; ++ case 'f': ++ filename = strdup(optarg); ++ break; ++ default: ++ fprintf(stderr, "Unknown option: %c\n", opt); ++ usage(argv[0]); ++ } ++ } ++ ++ if (optind == argc) { ++ fprintf(stderr, "No address given\n"); ++ exit(1); ++ } ++ req_addr = strtoul(argv[optind], &endptr, 0); ++ if (*endptr) { ++ fprintf(stderr, "Bad value '%s'\n", argv[optind]); ++ exit(1); ++ } ++ optind++; ++ if (!filename && (memfunc == MEM_READ) && optind < argc) { ++ memfunc = MEM_WRITE; ++ } ++ if (filename && optind > argc) { ++ fprintf(stderr, "Filename AND value given\n"); ++ exit(1); ++ } ++ if (!filename && (memfunc != MEM_READ) && optind == argc) { ++ fprintf(stderr, "No value given for WRITE\n"); ++ exit(1); ++ } ++ if (!filename && (memfunc != MEM_READ)) { ++ req_value = strtoul(argv[optind], &endptr, 0); ++ if (*endptr) { ++ fprintf(stderr, "Bad value '%s'\n", argv[optind]); ++ exit(1); ++ } ++ if ((iosize == 1 && (req_value & 0xffffff00)) || ++ (iosize == 2 && (req_value & 0xffff0000))) { ++ fprintf(stderr, " too large\n"); ++ exit(1); ++ } ++ optind++; ++ } ++ if (filename && (memfunc == MEM_READ) && !req_len) { ++ fprintf(stderr, "No size given for file memread\n"); ++ exit(1); ++ } ++ if (optind < argc) { ++ fprintf(stderr, "Too many arguments '%s'...\n", argv[optind]); ++ exit(1); ++ } ++ if (filename && (memfunc == MEM_READ)) { ++ ffd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); ++ if (ffd < 0) { ++ fprintf(stderr, "Failed to open destination file '%s': %s\n", filename, strerror(errno)); ++ exit(1); ++ } ++ } ++ if (filename && (memfunc != MEM_READ)) { ++ ffd = open(filename, O_RDONLY); ++ if (ffd < 0) { ++ fprintf(stderr, "Failed to open source file '%s': %s\n", filename, strerror(errno)); ++ exit(1); ++ } ++ } ++ ++ if (filename && !req_len) { ++ req_len = lseek(ffd, 0, SEEK_END); ++ if (req_len < 0) { ++ fprintf(stderr, "Failed to seek on '%s': %s\n", ++ filename, strerror(errno)); ++ exit(1); ++ } ++ if (lseek(ffd, 0, SEEK_SET)) { ++ fprintf(stderr, "Failed to seek on '%s': %s\n", ++ filename, strerror(errno)); ++ exit(1); ++ } ++ } ++ if (!req_len) ++ req_len = iosize; ++ ++ if ((iosize == 2 && (req_addr & 1)) || ++ (iosize == 4 && (req_addr & 3))) { ++ fprintf(stderr, "Badly aligned for access size\n"); ++ exit(1); ++ } ++ if ((iosize == 2 && (req_len & 1)) || ++ (iosize == 4 && (req_len & 3))) { ++ fprintf(stderr, "Badly aligned for access size\n"); ++ exit(1); ++ } ++ ++ if (!verbose) ++ /* Nothing */; ++ else if (filename && (memfunc == MEM_READ)) ++ printf("Request to read 0x%x bytes from address 0x%08lx\n" ++ "\tto file %s, using %d byte accesses\n", ++ req_len, req_addr, filename, iosize); ++ else if (filename) ++ printf("Request to write 0x%x bytes to address 0x%08lx\n" ++ "\tfrom file %s, using %d byte accesses\n", ++ req_len, req_addr, filename, iosize); ++ else if (memfunc == MEM_READ) ++ printf("Request to read 0x%x bytes from address 0x%08lx\n" ++ "\tusing %d byte accesses\n", ++ req_len, req_addr, iosize); ++ else ++ printf("Request to write 0x%x bytes to address 0x%08lx\n" ++ "\tusing %d byte accesses of value 0x%0*lx\n", ++ req_len, req_addr, iosize, iosize*2, req_value); ++ ++ real_addr = req_addr & ~4095; ++ if (real_addr == 0xfffff000) { ++ fprintf(stderr, "Sorry, cannot map the top 4K page\n"); ++ exit(1); ++ } ++ offset = req_addr - real_addr; ++ real_len = req_len + offset; ++ real_len = (real_len + 4095) & ~ 4095; ++ if (real_addr + real_len < real_addr) { ++ fprintf(stderr, "Aligned addr+len exceeds top of address space\n"); ++ exit(1); ++ } ++ if (verbose) ++ printf("Attempting to map 0x%lx bytes at address 0x%08lx\n", ++ real_len, real_addr); ++ ++ mfd = open("/dev/mem", (memfunc == MEM_READ) ? O_RDONLY : O_RDWR); ++ if (mfd == -1) { ++ perror("open /dev/mem"); ++ exit(1); ++ } ++ if (verbose) ++ printf("open(/dev/mem) ok\n"); ++ real_io = mmap(NULL, real_len, ++ (memfunc == MEM_READ) ? PROT_READ:PROT_READ|PROT_WRITE, ++ MAP_SHARED, mfd, real_addr); ++ if (real_io == (void *)(-1)) { ++ fprintf(stderr, "mmap() failed: %s\n", strerror(errno)); ++ exit(1); ++ } ++ if (verbose) ++ printf("mmap() ok\n"); ++ ++ if (verbose) { ++ int c; ++ ++ printf("OK? "); ++ fflush(stdout); ++ c = getchar(); ++ if (c != 'y' && c != 'Y') { ++ printf("Aborted\n"); ++ exit(1); ++ } ++ } ++ ++ if (filename && (memfunc == MEM_READ)) { ++ int n = write(ffd, real_io + offset, req_len); ++ ++ if (n < 0) { ++ fprintf(stderr, "File write failed: %s\n", strerror(errno)); ++ exit(1); ++ } ++ else if (n != req_len) { ++ fprintf(stderr, "Only wrote %d of %d bytes to file\n", ++ n, req_len); ++ exit(1); ++ } ++ } ++ else if (filename) { ++ int n = read(ffd, real_io + offset, req_len); ++ ++ if (n < 0) { ++ fprintf(stderr, "File read failed: %s\n", strerror(errno)); ++ exit(1); ++ } ++ else if (n != req_len) { ++ fprintf(stderr, "Only read %d of %d bytes from file\n", ++ n, req_len); ++ exit(1); ++ } ++ } ++ else { ++ switch (memfunc) ++ { ++ case MEM_READ: ++ memread_memory(req_addr, real_io + offset, req_len, iosize); ++ break; ++ case MEM_WRITE: ++ write_memory(req_addr, real_io + offset, req_len, iosize, req_value); ++ break; ++ case MEM_AND: ++ and_write_memory(req_addr, real_io + offset, req_len, iosize, req_value); ++ break; ++ case MEM_OR: ++ or_write_memory(req_addr, real_io + offset, req_len, iosize, req_value); ++ break; ++ } ++ } ++ ++ if (filename) ++ close(ffd); ++ close (mfd); ++ ++ return 0; ++} ++ +diff --git a/feeds/packages/utils/ipmitool/.svn/entries b/feeds/packages/utils/ipmitool/.svn/entries +new file mode 100644 +index 0000000..7a2c50c +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ipmitool ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-13T00:22:17.978846Z ++32312 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++39e8a08bc63b1cf92f1b8b2116962f1a ++2012-06-13T00:22:17.978846Z ++32312 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1142 ++ +diff --git a/feeds/packages/utils/ipmitool/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ipmitool/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2a4fd5f +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# Copyright (C) 2008-2010, OpenWrt.org ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=ipmitool ++PKG_VERSION:=1.8.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/ipmitool ++PKG_MD5SUM:=1d0da20add7388d64c549f95538b6858 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ipmitool ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libopenssl +libncurses +libreadline ++ TITLE:=IPMI remote computer management utility ++ URL:=http://ipmitool.sourceforge.net/ ++endef ++ ++define Package/ipmitool/description ++ IPMItool is a utility for managing and configuring devices ++ that support the Intelligent Platform Management Interface ++ (IPMI) version 1.5 and version 2.0 specifications. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-static=no \ ++ --enable-internal-md5 \ ++ --enable-intf-lan=yes \ ++ --enable-intf-lanplus=no \ ++ --enable-intf-free=no \ ++ --enable-intf-open=no \ ++ --enable-intf-imb=no \ ++ --enable-intf-lipmi=no \ ++ --enable-intf-bmc=no ++ ++define Package/ipmitool/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ipmitool $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ipmitool)) ++ +diff --git a/feeds/packages/utils/ipmitool/Makefile b/feeds/packages/utils/ipmitool/Makefile +new file mode 100644 +index 0000000..2a4fd5f +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/Makefile +@@ -0,0 +1,49 @@ ++# Copyright (C) 2008-2010, OpenWrt.org ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=ipmitool ++PKG_VERSION:=1.8.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/ipmitool ++PKG_MD5SUM:=1d0da20add7388d64c549f95538b6858 ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ipmitool ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libopenssl +libncurses +libreadline ++ TITLE:=IPMI remote computer management utility ++ URL:=http://ipmitool.sourceforge.net/ ++endef ++ ++define Package/ipmitool/description ++ IPMItool is a utility for managing and configuring devices ++ that support the Intelligent Platform Management Interface ++ (IPMI) version 1.5 and version 2.0 specifications. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-static=no \ ++ --enable-internal-md5 \ ++ --enable-intf-lan=yes \ ++ --enable-intf-lanplus=no \ ++ --enable-intf-free=no \ ++ --enable-intf-open=no \ ++ --enable-intf-imb=no \ ++ --enable-intf-lipmi=no \ ++ --enable-intf-bmc=no ++ ++define Package/ipmitool/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ipmitool $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ipmitool)) ++ +diff --git a/feeds/packages/utils/ipmitool/patches/.svn/entries b/feeds/packages/utils/ipmitool/patches/.svn/entries +new file mode 100644 +index 0000000..03070f3 +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ipmitool/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T09:42:56.103515Z ++24599 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-cubic_root.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++36c45d3a2cd621c2a4526d21aad7a711 ++2009-07-12T12:32:03.678156Z ++16802 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2783 ++ ++101-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++b0ae53752b256c081f43cba3d930fc92 ++2010-12-15T09:42:56.103515Z ++24599 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1132 ++ +diff --git a/feeds/packages/utils/ipmitool/patches/.svn/text-base/100-cubic_root.patch.svn-base b/feeds/packages/utils/ipmitool/patches/.svn/text-base/100-cubic_root.patch.svn-base +new file mode 100644 +index 0000000..11ebffa +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/patches/.svn/text-base/100-cubic_root.patch.svn-base +@@ -0,0 +1,149 @@ ++--- a/lib/ipmi_sdr.c +++++ b/lib/ipmi_sdr.c ++@@ -4399,3 +4399,146 @@ ipmi_sdr_main(struct ipmi_intf *intf, in ++ ++ return rc; ++ } +++ +++/* cbrt.c +++ * +++ * Cube root +++ * +++ * +++ * +++ * SYNOPSIS: +++ * +++ * double x, y, cbrt(); +++ * +++ * y = cbrt( x ); +++ * +++ * +++ * +++ * DESCRIPTION: +++ * +++ * Returns the cube root of the argument, which may be negative. +++ * +++ * Range reduction involves determining the power of 2 of +++ * the argument. A polynomial of degree 2 applied to the +++ * mantissa, and multiplication by the cube root of 1, 2, or 4 +++ * approximates the root to within about 0.1%. Then Newton's +++ * iteration is used three times to converge to an accurate +++ * result. +++ * +++ * +++ * +++ * ACCURACY: +++ * +++ * Relative error: +++ * arithmetic domain # trials peak rms +++ * DEC -10,10 200000 1.8e-17 6.2e-18 +++ * IEEE 0,1e308 30000 1.5e-16 5.0e-17 +++ * +++ */ +++/* cbrt.c */ +++ +++/* +++Cephes Math Library Release 2.8: June, 2000 +++Copyright 1984, 1991, 2000 by Stephen L. Moshier +++*/ +++ +++ +++static double CBRT2 = 1.2599210498948731647672; +++static double CBRT4 = 1.5874010519681994747517; +++static double CBRT2I = 0.79370052598409973737585; +++static double CBRT4I = 0.62996052494743658238361; +++ +++#ifdef ANSIPROT +++extern double frexp ( double, int * ); +++extern double ldexp ( double, int ); +++extern int isnan ( double ); +++extern int isfinite ( double ); +++#else +++/* +++double frexp(), ldexp(); +++int isnan(double), isfinite(double); +++*/ +++#endif +++ +++double cbrt(double x) +++{ +++/* double x; */ +++int e, rem, sign; +++double z; +++ +++#ifdef NANS +++if( isnan(x) ) +++ return x; +++#endif +++#ifdef INFINITIES +++if( !isfinite(x) ) +++ return x; +++#endif +++if( x == 0 ) +++ return( x ); +++if( x > 0 ) +++ sign = 1; +++else +++ { +++ sign = -1; +++ x = -x; +++ } +++ +++z = x; +++/* extract power of 2, leaving +++ * mantissa between 0.5 and 1 +++ */ +++x = frexp( x, &e ); +++ +++/* Approximate cube root of number between .5 and 1, +++ * peak relative error = 9.2e-6 +++ */ +++x = (((-1.3466110473359520655053e-1 * x +++ + 5.4664601366395524503440e-1) * x +++ - 9.5438224771509446525043e-1) * x +++ + 1.1399983354717293273738e0 ) * x +++ + 4.0238979564544752126924e-1; +++ +++/* exponent divided by 3 */ +++if( e >= 0 ) +++ { +++ rem = e; +++ e /= 3; +++ rem -= 3*e; +++ if( rem == 1 ) +++ x *= CBRT2; +++ else if( rem == 2 ) +++ x *= CBRT4; +++ } +++ +++ +++/* argument less than 1 */ +++ +++else +++ { +++ e = -e; +++ rem = e; +++ e /= 3; +++ rem -= 3*e; +++ if( rem == 1 ) +++ x *= CBRT2I; +++ else if( rem == 2 ) +++ x *= CBRT4I; +++ e = -e; +++ } +++ +++/* multiply by power of 2 */ +++x = ldexp( x, e ); +++ +++/* Newton iteration */ +++x -= ( x - (z/(x*x)) )*0.33333333333333333333; +++#ifdef DEC +++x -= ( x - (z/(x*x)) )/3.0; +++#else +++x -= ( x - (z/(x*x)) )*0.33333333333333333333; +++#endif +++ +++if( sign < 0 ) +++ x = -x; +++return(x); +++} +diff --git a/feeds/packages/utils/ipmitool/patches/.svn/text-base/101-cross_compile.patch.svn-base b/feeds/packages/utils/ipmitool/patches/.svn/text-base/101-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..319fe63 +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/patches/.svn/text-base/101-cross_compile.patch.svn-base +@@ -0,0 +1,44 @@ ++--- a/configure +++++ b/configure ++@@ -24315,8 +24315,7 @@ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++-See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++See \`config.log' for more details." >&2;} } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/configure.in +++++ b/configure.in ++@@ -489,29 +489,6 @@ AC_ARG_ENABLE([file-security], ++ fi], []) ++ ++ ++-AC_TRY_RUN([ ++- #include ++- ++- struct packstruct { ++- unsigned char t0 :5; ++- unsigned char t1 :5; ++- unsigned char t2 :5; ++- unsigned char t3 :5; ++- unsigned char t4 :4; ++- } __attribute__ ((packed)); ++- ++- int ++- main(int argc, char ** argv) ++- { ++- if(sizeof(struct packstruct) != 3) ++- return(1); ++- else ++- return(0); ++- } ++- ],[],[AC_DEFINE(HAVE_PRAGMA_PACK,[1],[Define to 1 if you need to use #pragma pack instead of __attribute__ ((packed))])] ++-) ++- ++- ++ dnl Generate files for build ++ AC_CONFIG_FILES([Makefile ++ doc/Makefile +diff --git a/feeds/packages/utils/ipmitool/patches/100-cubic_root.patch b/feeds/packages/utils/ipmitool/patches/100-cubic_root.patch +new file mode 100644 +index 0000000..11ebffa +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/patches/100-cubic_root.patch +@@ -0,0 +1,149 @@ ++--- a/lib/ipmi_sdr.c +++++ b/lib/ipmi_sdr.c ++@@ -4399,3 +4399,146 @@ ipmi_sdr_main(struct ipmi_intf *intf, in ++ ++ return rc; ++ } +++ +++/* cbrt.c +++ * +++ * Cube root +++ * +++ * +++ * +++ * SYNOPSIS: +++ * +++ * double x, y, cbrt(); +++ * +++ * y = cbrt( x ); +++ * +++ * +++ * +++ * DESCRIPTION: +++ * +++ * Returns the cube root of the argument, which may be negative. +++ * +++ * Range reduction involves determining the power of 2 of +++ * the argument. A polynomial of degree 2 applied to the +++ * mantissa, and multiplication by the cube root of 1, 2, or 4 +++ * approximates the root to within about 0.1%. Then Newton's +++ * iteration is used three times to converge to an accurate +++ * result. +++ * +++ * +++ * +++ * ACCURACY: +++ * +++ * Relative error: +++ * arithmetic domain # trials peak rms +++ * DEC -10,10 200000 1.8e-17 6.2e-18 +++ * IEEE 0,1e308 30000 1.5e-16 5.0e-17 +++ * +++ */ +++/* cbrt.c */ +++ +++/* +++Cephes Math Library Release 2.8: June, 2000 +++Copyright 1984, 1991, 2000 by Stephen L. Moshier +++*/ +++ +++ +++static double CBRT2 = 1.2599210498948731647672; +++static double CBRT4 = 1.5874010519681994747517; +++static double CBRT2I = 0.79370052598409973737585; +++static double CBRT4I = 0.62996052494743658238361; +++ +++#ifdef ANSIPROT +++extern double frexp ( double, int * ); +++extern double ldexp ( double, int ); +++extern int isnan ( double ); +++extern int isfinite ( double ); +++#else +++/* +++double frexp(), ldexp(); +++int isnan(double), isfinite(double); +++*/ +++#endif +++ +++double cbrt(double x) +++{ +++/* double x; */ +++int e, rem, sign; +++double z; +++ +++#ifdef NANS +++if( isnan(x) ) +++ return x; +++#endif +++#ifdef INFINITIES +++if( !isfinite(x) ) +++ return x; +++#endif +++if( x == 0 ) +++ return( x ); +++if( x > 0 ) +++ sign = 1; +++else +++ { +++ sign = -1; +++ x = -x; +++ } +++ +++z = x; +++/* extract power of 2, leaving +++ * mantissa between 0.5 and 1 +++ */ +++x = frexp( x, &e ); +++ +++/* Approximate cube root of number between .5 and 1, +++ * peak relative error = 9.2e-6 +++ */ +++x = (((-1.3466110473359520655053e-1 * x +++ + 5.4664601366395524503440e-1) * x +++ - 9.5438224771509446525043e-1) * x +++ + 1.1399983354717293273738e0 ) * x +++ + 4.0238979564544752126924e-1; +++ +++/* exponent divided by 3 */ +++if( e >= 0 ) +++ { +++ rem = e; +++ e /= 3; +++ rem -= 3*e; +++ if( rem == 1 ) +++ x *= CBRT2; +++ else if( rem == 2 ) +++ x *= CBRT4; +++ } +++ +++ +++/* argument less than 1 */ +++ +++else +++ { +++ e = -e; +++ rem = e; +++ e /= 3; +++ rem -= 3*e; +++ if( rem == 1 ) +++ x *= CBRT2I; +++ else if( rem == 2 ) +++ x *= CBRT4I; +++ e = -e; +++ } +++ +++/* multiply by power of 2 */ +++x = ldexp( x, e ); +++ +++/* Newton iteration */ +++x -= ( x - (z/(x*x)) )*0.33333333333333333333; +++#ifdef DEC +++x -= ( x - (z/(x*x)) )/3.0; +++#else +++x -= ( x - (z/(x*x)) )*0.33333333333333333333; +++#endif +++ +++if( sign < 0 ) +++ x = -x; +++return(x); +++} +diff --git a/feeds/packages/utils/ipmitool/patches/101-cross_compile.patch b/feeds/packages/utils/ipmitool/patches/101-cross_compile.patch +new file mode 100644 +index 0000000..319fe63 +--- /dev/null ++++ b/feeds/packages/utils/ipmitool/patches/101-cross_compile.patch +@@ -0,0 +1,44 @@ ++--- a/configure +++++ b/configure ++@@ -24315,8 +24315,7 @@ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++-See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++See \`config.log' for more details." >&2;} } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ /* confdefs.h. */ ++--- a/configure.in +++++ b/configure.in ++@@ -489,29 +489,6 @@ AC_ARG_ENABLE([file-security], ++ fi], []) ++ ++ ++-AC_TRY_RUN([ ++- #include ++- ++- struct packstruct { ++- unsigned char t0 :5; ++- unsigned char t1 :5; ++- unsigned char t2 :5; ++- unsigned char t3 :5; ++- unsigned char t4 :4; ++- } __attribute__ ((packed)); ++- ++- int ++- main(int argc, char ** argv) ++- { ++- if(sizeof(struct packstruct) != 3) ++- return(1); ++- else ++- return(0); ++- } ++- ],[],[AC_DEFINE(HAVE_PRAGMA_PACK,[1],[Define to 1 if you need to use #pragma pack instead of __attribute__ ((packed))])] ++-) ++- ++- ++ dnl Generate files for build ++ AC_CONFIG_FILES([Makefile ++ doc/Makefile +diff --git a/feeds/packages/utils/joe/.svn/entries b/feeds/packages/utils/joe/.svn/entries +new file mode 100644 +index 0000000..e784970 +--- /dev/null ++++ b/feeds/packages/utils/joe/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/joe ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-08-04T17:21:56.773768Z ++22492 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f8eed5da2ab0c8a00608dada356637fc ++2010-08-04T17:21:56.773768Z ++22492 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1143 ++ +diff --git a/feeds/packages/utils/joe/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/joe/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/joe/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/joe/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/joe/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..875a7fd +--- /dev/null ++++ b/feeds/packages/utils/joe/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,49 @@ ++# ++# Copyright (C) 2007 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++# changes by David Kuehling : ++# ++# - include support for all emulation modes jmacs jpico etc. ++# - see patches/002-builtinrc.patch ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=joe ++PKG_VERSION:=3.7 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/joe-editor ++PKG_MD5SUM:=66de1b073e869ba12abbfcde3885c577 ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/joe ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=JOE - Joes own editor ++ URL:=http://sourceforge.net/projects/joe-editor/ ++ SUBMENU:=Editors ++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 ++endef ++ ++$(eval $(call BuildPackage,joe)) +diff --git a/feeds/packages/utils/joe/Makefile b/feeds/packages/utils/joe/Makefile +new file mode 100644 +index 0000000..875a7fd +--- /dev/null ++++ b/feeds/packages/utils/joe/Makefile +@@ -0,0 +1,49 @@ ++# ++# Copyright (C) 2007 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++# changes by David Kuehling : ++# ++# - include support for all emulation modes jmacs jpico etc. ++# - see patches/002-builtinrc.patch ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=joe ++PKG_VERSION:=3.7 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/joe-editor ++PKG_MD5SUM:=66de1b073e869ba12abbfcde3885c577 ++ ++PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/joe ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=JOE - Joes own editor ++ URL:=http://sourceforge.net/projects/joe-editor/ ++ SUBMENU:=Editors ++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 ++endef ++ ++$(eval $(call BuildPackage,joe)) +diff --git a/feeds/packages/utils/joe/patches/.svn/entries b/feeds/packages/utils/joe/patches/.svn/entries +new file mode 100644 +index 0000000..c17c467 +--- /dev/null ++++ b/feeds/packages/utils/joe/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/joe/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-12T12:17:59.436912Z ++16801 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-mathaway.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++3c2029808446af2aeaafa09bc6330b42 ++2009-07-12T12:17:59.436912Z ++16801 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2333 ++ +diff --git a/feeds/packages/utils/joe/patches/.svn/prop-base/001-mathaway.patch.svn-base b/feeds/packages/utils/joe/patches/.svn/prop-base/001-mathaway.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/joe/patches/.svn/prop-base/001-mathaway.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/joe/patches/.svn/text-base/001-mathaway.patch.svn-base b/feeds/packages/utils/joe/patches/.svn/text-base/001-mathaway.patch.svn-base +new file mode 100644 +index 0000000..99fc930 +--- /dev/null ++++ b/feeds/packages/utils/joe/patches/.svn/text-base/001-mathaway.patch.svn-base +@@ -0,0 +1,58 @@ ++--- 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/feeds/packages/utils/joe/patches/001-mathaway.patch b/feeds/packages/utils/joe/patches/001-mathaway.patch +new file mode 100644 +index 0000000..99fc930 +--- /dev/null ++++ b/feeds/packages/utils/joe/patches/001-mathaway.patch +@@ -0,0 +1,58 @@ ++--- 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/feeds/packages/utils/klish/.svn/entries b/feeds/packages/utils/klish/.svn/entries +new file mode 100644 +index 0000000..1376fde +--- /dev/null ++++ b/feeds/packages/utils/klish/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/klish ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-16T14:47:31.826163Z ++31310 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++05e70522fb67e30d2bb301e9dc13de67 ++2012-04-16T14:47:31.826163Z ++31310 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2813 ++ +diff --git a/feeds/packages/utils/klish/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/klish/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..78ccbe0 +--- /dev/null ++++ b/feeds/packages/utils/klish/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# Copyright (C) 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:=klish ++PKG_VERSION:=1.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://klish.googlecode.com/files ++PKG_MD5SUM:=c98a1c65f7538c3f4687c6f8039295df ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/klish/default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Kommand Line Interface SHell ($(1)) ++ URL:=http://code.google.com/p/klish/ ++endef ++ ++define Package/klish ++$(call Package/klish/default,main tool) ++ DEPENDS:=+libstdcpp ++endef ++ ++define Package/konf ++$(call Package/klish/default,konf tool) ++ DEPENDS:=klish ++endef ++ ++define Package/klish/description ++ The klish is a framework for implementing a CISCO-like CLI on a UNIX ++ systems. It is configurable by XML files. The KLISH stands for Kommand ++ Line Interface Shell. ++ The klish is a fork of clish 0.7.3 developed by Graeme McKerrell. ++ It defines new features but it's compatible (as much as possible) with ++ clish's XML configuration files. ++ klish is able to run using clish XML configuration files although ++ current clish users may expect some changes in behavior. ++endef ++ ++define Package/konf/description ++ The klish is a framework for implementing a CISCO-like CLI on a UNIX ++ systems. It is configurable by XML files. The KLISH stands for Kommand ++ Line Interface Shell. ++ Konf and konfd are klish utilities that are used to store configuration ++ informations in a way which is similar to what's found on CISCO devices. ++ More information about these tools is to be found on the klish web site. ++endef ++ ++define Package/klish/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clish $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++endef ++ ++define Package/konf/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/konf $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/konfd $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkonf.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblub.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,klish)) ++$(eval $(call BuildPackage,konf)) ++ ++define Package/klish-xml-files ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=klish ++ TITLE:=klish sample XML files ++ URL:=http://code.google.com/p/klish/ ++endef ++ ++define Package/klish-xml-files/description ++ This is a set of sample XML files for klish. This specific sample set ++ is compatible with the original clish. ++endef ++ ++define Package/klish-xml-files/install ++ $(INSTALL_DIR) $(1)/etc/clish ++ $(CP) $(PKG_BUILD_DIR)/xml-examples/clish $(1)/etc/clish/ ++endef ++ ++$(eval $(call BuildPackage,klish-xml-files)) +diff --git a/feeds/packages/utils/klish/Makefile b/feeds/packages/utils/klish/Makefile +new file mode 100644 +index 0000000..78ccbe0 +--- /dev/null ++++ b/feeds/packages/utils/klish/Makefile +@@ -0,0 +1,96 @@ ++# ++# Copyright (C) 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:=klish ++PKG_VERSION:=1.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://klish.googlecode.com/files ++PKG_MD5SUM:=c98a1c65f7538c3f4687c6f8039295df ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/klish/default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Kommand Line Interface SHell ($(1)) ++ URL:=http://code.google.com/p/klish/ ++endef ++ ++define Package/klish ++$(call Package/klish/default,main tool) ++ DEPENDS:=+libstdcpp ++endef ++ ++define Package/konf ++$(call Package/klish/default,konf tool) ++ DEPENDS:=klish ++endef ++ ++define Package/klish/description ++ The klish is a framework for implementing a CISCO-like CLI on a UNIX ++ systems. It is configurable by XML files. The KLISH stands for Kommand ++ Line Interface Shell. ++ The klish is a fork of clish 0.7.3 developed by Graeme McKerrell. ++ It defines new features but it's compatible (as much as possible) with ++ clish's XML configuration files. ++ klish is able to run using clish XML configuration files although ++ current clish users may expect some changes in behavior. ++endef ++ ++define Package/konf/description ++ The klish is a framework for implementing a CISCO-like CLI on a UNIX ++ systems. It is configurable by XML files. The KLISH stands for Kommand ++ Line Interface Shell. ++ Konf and konfd are klish utilities that are used to store configuration ++ informations in a way which is similar to what's found on CISCO devices. ++ More information about these tools is to be found on the klish web site. ++endef ++ ++define Package/klish/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/clish $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ ++endef ++ ++define Package/konf/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/konf $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/konfd $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libkonf.so* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblub.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,klish)) ++$(eval $(call BuildPackage,konf)) ++ ++define Package/klish-xml-files ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=klish ++ TITLE:=klish sample XML files ++ URL:=http://code.google.com/p/klish/ ++endef ++ ++define Package/klish-xml-files/description ++ This is a set of sample XML files for klish. This specific sample set ++ is compatible with the original clish. ++endef ++ ++define Package/klish-xml-files/install ++ $(INSTALL_DIR) $(1)/etc/clish ++ $(CP) $(PKG_BUILD_DIR)/xml-examples/clish $(1)/etc/clish/ ++endef ++ ++$(eval $(call BuildPackage,klish-xml-files)) +diff --git a/feeds/packages/utils/kmemtrace-user/.svn/entries b/feeds/packages/utils/kmemtrace-user/.svn/entries +new file mode 100644 +index 0000000..8c28637 +--- /dev/null ++++ b/feeds/packages/utils/kmemtrace-user/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/kmemtrace-user ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:57:38.337842Z ++32213 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++837fd5c8cc43e0f088f643996b2b0fb9 ++2012-06-11T21:57:38.337842Z ++32213 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1706 ++ +diff --git a/feeds/packages/utils/kmemtrace-user/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/kmemtrace-user/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4b09633 +--- /dev/null ++++ b/feeds/packages/utils/kmemtrace-user/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2006-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:=kmemtrace-user ++PKG_VERSION:=20100102 ++PKG_RELEASE:=1 ++PKG_REV:=92878e602489d6a6ffd6e50b94f425c3149c86bd ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://repo.or.cz/kmemtrace-user.git ++PKG_SOURCE_SUBDIR:=kmemtrace-user-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=git ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/kmemtrace-user ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=trace slab allocator functions ++ URL:=http://repo.or.cz/w/kmemtrace-user.git ++ DEPENDS:=+libpthread ++ KCONFIG:= \ ++ CONFIG_KMEMTRACE=y ++endef ++ ++define Package/kmemtrace-user/description ++ kmemtrace provides tracing for slab allocator functions, such as ++ kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected ++ data is then fed to the userspace application in order to analyse ++ allocation hotspots, internal fragmentation and so on, making it ++ possible to see how well an allocator performs, as well as debug ++ and profile kernel code. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); ./autogen.sh; ./configure ); ++ $(call Build/Configure/Default) ++endef ++ ++ ++define Package/kmemtrace-user/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtrace-check $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtrace-report $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtrace-show $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtraced $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,kmemtrace-user)) +diff --git a/feeds/packages/utils/kmemtrace-user/Makefile b/feeds/packages/utils/kmemtrace-user/Makefile +new file mode 100644 +index 0000000..4b09633 +--- /dev/null ++++ b/feeds/packages/utils/kmemtrace-user/Makefile +@@ -0,0 +1,58 @@ ++# ++# Copyright (C) 2006-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:=kmemtrace-user ++PKG_VERSION:=20100102 ++PKG_RELEASE:=1 ++PKG_REV:=92878e602489d6a6ffd6e50b94f425c3149c86bd ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://repo.or.cz/kmemtrace-user.git ++PKG_SOURCE_SUBDIR:=kmemtrace-user-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=git ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/kmemtrace-user ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=trace slab allocator functions ++ URL:=http://repo.or.cz/w/kmemtrace-user.git ++ DEPENDS:=+libpthread ++ KCONFIG:= \ ++ CONFIG_KMEMTRACE=y ++endef ++ ++define Package/kmemtrace-user/description ++ kmemtrace provides tracing for slab allocator functions, such as ++ kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected ++ data is then fed to the userspace application in order to analyse ++ allocation hotspots, internal fragmentation and so on, making it ++ possible to see how well an allocator performs, as well as debug ++ and profile kernel code. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); ./autogen.sh; ./configure ); ++ $(call Build/Configure/Default) ++endef ++ ++ ++define Package/kmemtrace-user/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtrace-check $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtrace-report $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtrace-show $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/kmemtraced $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,kmemtrace-user)) +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/.svn/entries b/feeds/packages/utils/lcd4linux-tew673gru/.svn/entries +new file mode 100644 +index 0000000..e0d1947 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lcd4linux-tew673gru ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-08T16:39:21.753562Z ++30382 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9dfe42656cd7eefa2f5de38cd2aace7e ++2012-02-08T16:39:21.753562Z ++30382 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++828 ++ +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/lcd4linux-tew673gru/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lcd4linux-tew673gru/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..036e6be +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,33 @@ ++# ++# Copyright (C) 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:=lcd4linux-tew673gru ++PKG_VERSION:=1 ++PKG_RELEASE:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lcd4linux-tew673gru ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@TARGET_ar71xx +kmod-spi-gpio +kmod-spi-dev +lcd4linux-custom ++ TITLE:=TRENDnet TEW673GRU LCD support ++endef ++ ++define Build/Compile ++endef ++ ++define Package/lcd4linux-tew673gru/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/uci-defaults ++ $(INSTALL_BIN) ./files/openwrt_220x176.png $(1)/etc/ ++ $(INSTALL_BIN) ./files/lcd4linux_tew673gru.conf $(1)/etc/ ++ $(INSTALL_BIN) ./files/tew673gru-lcd $(1)/etc/uci-defaults ++endef ++ ++$(eval $(call BuildPackage,lcd4linux-tew673gru)) +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/Makefile b/feeds/packages/utils/lcd4linux-tew673gru/Makefile +new file mode 100644 +index 0000000..036e6be +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/Makefile +@@ -0,0 +1,33 @@ ++# ++# Copyright (C) 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:=lcd4linux-tew673gru ++PKG_VERSION:=1 ++PKG_RELEASE:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lcd4linux-tew673gru ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@TARGET_ar71xx +kmod-spi-gpio +kmod-spi-dev +lcd4linux-custom ++ TITLE:=TRENDnet TEW673GRU LCD support ++endef ++ ++define Build/Compile ++endef ++ ++define Package/lcd4linux-tew673gru/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/uci-defaults ++ $(INSTALL_BIN) ./files/openwrt_220x176.png $(1)/etc/ ++ $(INSTALL_BIN) ./files/lcd4linux_tew673gru.conf $(1)/etc/ ++ $(INSTALL_BIN) ./files/tew673gru-lcd $(1)/etc/uci-defaults ++endef ++ ++$(eval $(call BuildPackage,lcd4linux-tew673gru)) +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/entries b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/entries +new file mode 100644 +index 0000000..3215da8 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lcd4linux-tew673gru/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-08T16:39:21.753562Z ++30382 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lcd4linux_tew673gru.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d87bec7deb0067e7bb08e7bf80399a2c ++2012-02-08T16:39:21.753562Z ++30382 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3991 ++ ++openwrt_220x176.png ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++92dded52a125f81578044c58f1f7ad08 ++2012-02-08T16:39:21.753562Z ++30382 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++13128 ++ ++tew673gru-lcd ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++b72ac6b02241e63e2c12b8c09e7ecd66 ++2012-02-08T16:39:21.753562Z ++30382 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++262 ++ +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/prop-base/openwrt_220x176.png.svn-base b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/prop-base/openwrt_220x176.png.svn-base +new file mode 100644 +index 0000000..6f145ce +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/prop-base/openwrt_220x176.png.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 9 ++image/png ++END +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/prop-base/tew673gru-lcd.svn-base b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/prop-base/tew673gru-lcd.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/prop-base/tew673gru-lcd.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/text-base/lcd4linux_tew673gru.conf.svn-base b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/text-base/lcd4linux_tew673gru.conf.svn-base +new file mode 100644 +index 0000000..a3b3ece +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/text-base/lcd4linux_tew673gru.conf.svn-base +@@ -0,0 +1,243 @@ ++# LCD4Linux configuration file for the TRENDnet TEW-673GRU board ++ ++Variables { ++ tick 1500 ++ tack 3000 ++ minute 60000 ++ barstyle 'H' ++} ++ ++Display Image { ++ Driver 'Image' ++ Format 'PNG' ++ Size '220x176' ++ Font '6x8' ++ Pixel '1+0' ++ Gap '0x0' ++ Border 0 ++ background 'ffffff00' ++ foreground 'ffffffff' ++ basecolor '000000' ++} ++ ++Display TEW673GRU { ++ Driver 'TEW673GRU' ++ Port '/dev/spidev1.0' ++ Mode 1 ++ Font '6x8' ++ background 'ffffff00' ++ foreground 'ffffffff' ++ basecolor '000000' ++} ++ ++Display TEW673GRU_Text { ++ Driver 'TEW673GRU' ++ Port '/dev/spidev1.0' ++ Mode 0 ++ background 'ffffff00' ++ foreground 'ffffffff' ++ basecolor '000000' ++} ++ ++Widget OS { ++ class 'Text' ++ expression '*** '.uname('sysname').' '.uname('release').' ***' ++ width 20 ++ align 'M' ++ style 'bold' ++ speed 0 ++ update tick ++} ++ ++Widget CPU { ++ class 'Text' ++ expression uname('machine') ++ prefix 'CPU ' ++ width 9 ++ align 'L' ++ style 'norm' ++ update tick ++} ++ ++Widget CPUinfo { ++ class 'Text' ++ expression cpuinfo('model name') ++ prefix '' ++ width 20 ++ align 'M' ++ speed 0 ++ update tick ++} ++ ++Widget RAM { ++ class 'Text' ++ expression meminfo('MemTotal')/1024 ++ postfix 'MB RAM' ++ width 12 ++ precision 1 ++ align 'R' ++ update 0 ++} ++ ++Widget Uptime { ++ class 'Text' ++ expression uptime('%d days %H:%M:%S') ++ width 21 ++ align 'R' ++ prefix 'Up ' ++ update 1000 ++} ++ ++Widget Busy { ++ class 'Text' ++ expression proc_stat::cpu('busy', 500) ++ prefix 'Busy' ++ postfix '%' ++ width 10 ++ precision 1 ++ align 'R' ++ update tick ++} ++ ++Widget BusyBar { ++ class 'Bar' ++ expression proc_stat::cpu('busy', 500) ++ expression2 proc_stat::cpu('system', 500) ++ length 10 ++ direction 'E' ++ update tack ++ style barstyle ++} ++ ++Widget Load { ++ class 'Text' ++ expression loadavg(1) ++ prefix 'Load' ++ postfix ' ' ++ width 11 ++ precision 1 ++ align 'R' ++ update tick ++} ++ ++Widget LoadBar { ++ class 'Bar' ++ expression loadavg(1) ++ max 2.0 ++ length 10 ++ direction 'E' ++ update tack ++ style barstyle ++} ++ ++Widget LAN { ++ class 'Text' ++ expression (netdev('eth0.1', 'Rx_bytes', 500)+netdev('eth0.1', 'Tx_bytes', 500))/1024 ++ prefix 'LAN' ++ postfix ' ' ++ width 11 ++ precision 0 ++ align 'R' ++ update tick ++} ++ ++Widget LANBar { ++ class 'Bar' ++ expression netdev('eth0.1', 'Rx_bytes', 500) ++ expression2 netdev('eth0.1', 'Tx_bytes', 500) ++ length 10 ++ direction 'E' ++ update tack ++ style barstyle ++} ++ ++Widget WAN { ++ class 'Text' ++ expression (netdev('eth2', 'Rx_bytes', 500)+netdev('eth2', 'Tx_bytes', 500))/1024 ++ prefix 'WAN' ++ postfix ' ' ++ width 11 ++ precision 0 ++ align 'R' ++ update tick ++} ++ ++Widget WANBar { ++ class 'Bar' ++ expression netdev('eth2', 'Rx_bytes', 500) ++ expression2 netdev('eth2', 'Tx_bytes', 500) ++ length 10 ++ direction 'E' ++ update tack ++ style barstyle ++} ++ ++Widget Background { ++ class 'Image' ++ file '/etc/openwrt_220x176.png' ++ update 0 ++ visible 1 ++} ++ ++Layout TEW673GRU { ++ Row5 { ++ Col1 'CPU' ++ Col10 'RAM' ++ } ++ Row7 { ++ Col1 'Busy' ++ Col12 'BusyBar' ++ } ++ Row9 { ++ Col1 'Load' ++ Col12 'LoadBar' ++ } ++ Row11 { ++ Col1 'LAN' ++ Col12 'LANBar' ++ } ++ Row13 { ++ Col1 'WAN' ++ Col12 'WANBar' ++ } ++ Row22 { ++ Col1 'Uptime' ++ } ++ Layer 2 { ++ X1.Y1 'Background' ++ } ++} ++ ++Layout TEW673GRU_Text { ++ Row1 { ++ Col1 'CPU' ++ Col10 'RAM' ++ } ++ Row2 { ++ Col1 'Busy' ++ Col12 'BusyBar' ++ } ++ Row3 { ++ Col1 'Load' ++ Col12 'LoadBar' ++ } ++ Row4 { ++ Col1 'LAN' ++ Col12 'LANBar' ++ } ++ Row5 { ++ Col1 'WAN' ++ Col12 'WANBar' ++ } ++ Row11 { ++ Col1 'Uptime' ++ } ++} ++ ++#Display 'Image' ++ ++Display 'TEW673GRU' ++Layout 'TEW673GRU' ++ ++#Display 'TEW673GRU_Text' ++#Layout 'TEW673GRU_Text' +diff --git a/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/text-base/openwrt_220x176.png.svn-base b/feeds/packages/utils/lcd4linux-tew673gru/files/.svn/text-base/openwrt_220x176.png.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..e9f5b9871bedbcf1029c2a55c6e231a29ca8a9ac +GIT binary patch +literal 13128 +zcmV-OGq=o%P)Px#32;bRa{vGh*8l(w*8xH(n|J^KAOJ~3K~#9!?R|N)Bv*OgckivO*SF4lv+tu7 +z!Ds}CAR&-6I+7)XL0}|^47SOMjpLXk$3`NYI61O|mEgqZfCEnOiP;>4;UL*U0ttZt +z2}x+Ak=IU0vPpy?HZFL*4VvOfOZ{)m6X#ec$ittO1m6OHv}NiV5dvJ_cfGc^5Q4O20SL$S8RwyIsu4m6_I#?&DL4qh +zjB!ZDLdQSedlyzuD)oA)TGKVMW^C9r8lXggTA)PT|Jvb;5actNv7tc#F*#eLjJ4iX +zhec>8p8){QMWt?s&J1HD(F_2#j2eG=@p& +z%kw4?5)y$U&ILdOWEJ=KX-1N<5M0XtrshgQ!1(Z>p=)6bp*A?SNU`~}4ZeYW5rV;7 +zCYMfmKAkI9LLV%*$)(c(z!I~At>bv)|!Tc;11eT +zLU1JVx`MAkijjN?-QH@VHi7J-aapR?d`k0~blS3%`3~VMXrqIF;SD;VIXaZr2q{%- +zK4qOp&SfllcWbsAy2}WGsT)no^h1QIem@EnJWvm@f +z#^P})geX+17^9JaTsKe#;TWd9c64^`NH885$O!?3N(5yhgwmD)0FLKM_6mN4X*9s+ +z`82ev9fX>6D>sHQQ+uK+y6srDb&56fpt-Q`Z$E@^H3ZSwsk`Ot1KEraP^sC_aWJL39nT9LTGup1W0bYI +znC-Z1gL{}SgSdB00hOT)&bv+-UHnKqoG(x2N +zNGa!j?Z@B!hJuAPFnsYlub-PZzHish6|-LU&i9P1+r0OgpA{xgDEfTQ2R@R@Ld(mhroj9e=Ib@Lwr%%ql_{2B=_6uMC +z`qwsW+}K^+pzcm&!i!78m%2u9SIr3ki27dP$ZMbb-;b)Bdg$RI4G)a1X}Fk< +zQ!Pw4%&UOm@l~@YkDWSkJe?n0xnUDPHZwGO=01*Ih6E;-|lOX)o-aWVH*w#~a*!wa76s9Lg_)(yRF-H>zmWo!DtUB7$#&6jU|<~v`x>1~&8-@aXLdC`Rz-g)zN+T{Lf +zVYVM-Eg-SqOE}Oc?)k!sp#g+C^Vf|H9{PvBd-BnT)9Dldyt-%4C;#L>UibbF1HkSl +z9{+=neBkDrZ$cxE +zW)6Mvi(dqQYOOYq&!0LyIksX{2*DWBG_6vt4h;@YoH{+WViW-GzWeTY +zKlw=jc=+LmZ@lp)LU6fUUbSk~zJ0H+UArcDCimWZ@8kO?2Ue_$hI`{PWMN%?5LALi_gHZ?|p7 +zZ^py#y6dieyPhnZI(hqVTrWXctJgpK+0TCd^PlHjV2tj)_uf=(ng-(MciwrY0wnQi!q&)j|YgFpWH|N6VXzyE>zr6T$G$A0_7!M$zZzT+crz49G%g+|%O +zmMvS#bFn%_)IeyVx2M<03Q(MKN%y~w#Za%wvCbw2yq&t7`@+y44*zO-fgJFdQV +z=XbyRUHSTt9(!!Vwu}DuYyY4%gf>01TrS50iR>La +zcI@1_bLY;Tn>KBduM7?<@DsFmdVL*L2~bxH7+|n`j8a8_=+pP@%69E$75q-fBHv%@Pn^?`Qfj9 +z>DKqW^DWH?%Oj6Gvi^cgg1g`H-uM3O!S5V=>G{i>g7?UgBizg==zR2}AKiH2C2O}_ +zfSP0d`t>vbLC!fsxKk33uifz6bI%1|+4bCW`LQ)CH*S66$tT)g-?eLa)!LvbC>9Hb +zm2Q1`-1^xVhA}sB{8vADD45!5?i=BTCYi=1$E8%1T||IbyJ_qH`_A`fXJ-|jo_*@c +zT~9rE*Ijohvi!^c_W299zcskqyRW(CJ7535k3IbTp`oFMW_s~g>)&+6x93f*UcIUToyQ(K +zU1zJeUi{a8^W}pF4*|fIEt?;H==PTDd%rB722iJ{T)i>|rphMV8}8#}MN<(6C4tX-S3tYgQIKmL=SeEYlK +z+kWlMYc_2S-J#EY?sKVB>gHQ+Nm;4;@BiL6zH|RY@3|Eda_xtH`!_#)$45W-{u^() +zY4z&Wwr!s}b?Slp@4x@i$FI2YHUM_uz=6jedkg?xdF2%VV2r=8d$*zM>J=eiZ0-8L +z`^r}?z4TH5V2mA|DqN^x04Tcb!3Q5qrBc#u$PAB3Z0+5r;Z#v +zxbL-UxkNNAlN&HcSLa8^^O;nZz}}Z$P_}!`=B+cO>gmG=03e&TG(t99cxiTUxK=Kn +zKDf79w*kQR{K1uLF1YYw0GOLRHF0D=rCeHo@lD$@14D>7`Oz`; +z{ZpnneeA%=gZo^^F*EseesFx_RwI>`fKFQ`fUsRpWwrw0GYw-DnnkHt79-T@fh42P +z@sIc3rR6fIVx?B8+XLBjH%e$&Gl20m8^+gc=-ecdJT7?ijyJviDg(op{_~&Q{%=10 +zz!(4GU;fdbKJcyobKA%M)$GyzSKsuTlrcb1cifpmnQ@*^ncw;!|K$_^>GO`~A%r;R +zK4mVkGK0fHz^c(P9v&UdWOJ9k=T?_-gb){eWaa9?v6Xeltve1v +zNP;OpICSFq;~U@n*4+4d$Me)gB8(B|Lf6QeEf=ode4*`nAqlAXGLjVIoya6&zgRmy +zkWH7WwPK~3OQ$eKjk$#a0D+ok7zl8R9u}?R9{L=uSheQ(-j~*_T{m~~@YLxEBb%Ez +zer#KD>ZM=&ba=%Is->on9b^Kw-g295+lcwkK6qa$l^WZ)&2in@%;{7*J+%3f*M9o_ +zbUM9d`<2wl0D$AVqZ_sjuUtEOWM6H1!rXe{#ED~w`AD}`UbOw_FMeoR*3kNG)V24& +z_F}P6*!bqR9^3uo?5X3~(Un81*3TT;Gdndox_a%)M-N?b!>!iH>dtf`YC=95L~#am55Xj#N&A!)D>V@mJ*ojgvt>Z!U68NKx6;|{E$@5(wL5RPcIOS>`=F0tEj<0^=M-N|f)2%=K;X~^;Z*zURfA1d8bq^ohzxB#%fA!Q)2Zl$SYT2t60bu(0 +z;n}Iv*<60=$bK%w)TxuxvvWv@a{{@&Z4{mBmr_h)8i)?NITx^1uCeBsQ* +zacG|g)VMSV0YF!4j1tka#JXoFpRLxNLZy;PnWmvjI4ag`J?-x1OYC0r-VcTpy$~>0 +zuI5I^?RtHD^F@Orqbt_50^Qkxp+cp$degSasp*w#*AI-21HjPA)s%7Drx(2Cim9oo +z6>B#f+4t&>cU+Yn81g;0JTsLVZWL7vtXc=T5tuk;W%Cqk8@6maJw5Z*tFJ}*QP1;i +zpKZSQGKR>mAO8Tj?=i7q%LTh0d0^uO7dw>chQSyknhqE>PB@w`yO1U7A$k%$v{>D9 +z*B8DD05!*%oGt1aSvxkW=Ep=%A`69G+8im-_M#9_cbwC+g|wls8O}4J>%cjH0F0Oi +zngNU+oi0&E4eqa6xl&+4nCoK$bH;qfL&i*@g#9`;QbR+78uI}J*DdKa)+=s(;W++_d& +zCL+KD1ZG8c@+B8tlRYAV-qQJ(>e0wRK5dzf=S@t{DH;#~4vhPQuruno-o(r-=VEj) +zAK5nx01D-*w2Aq2I&_PL0M!{QWrcFtA~>Vh(A#DUdF`577DLH{ho+fBb9$r@5E;{v +zKh93SGhpJox}FJQ&j2nJ_{K*DB{WY=&A6T~0@5cw@DbcV2q;x+5|k^3^0{<$_^DcN +zbXUu!QgRZHYS#t;b*I(lAY~c~?s7PR1eKxbZSp_VMk|nYjF>#s^jLTYE>(Sg7b@)< +zok+y^8Ny|Nz!0F7BSTW2pO~7ND^)me87t8e-{C)nNYAGe({r-J;P}X(0%eFS8RN2J +z5yogRm+52|)k(`TjL@WS&!>vsFh;tr8WjO!JP0F=5EO7f7-!+=cN2V_e2Ec`3lbqD +zi>kV?WrC|Sp~pkf%F)5RW$LrVN}*CM*Xo10OfHimn8df2a6P|NtyOJX2rvzOY-q66 +z+N#5XPZ!D(K!e$AsPiQN1Vh}}wAHR~MKGIh8AfAHFaQMF7zK^E9F(#Uj8t0=Aw(xB +z%6B8lQsR<#2_PYq1l7+JE<2!^O{G$%StwU4_4;h7GFPrxhMBeuL)Q(RV1y-MP{uv# +zJFZ`MT!|z?@NhmGwB1o|Wlgr$NSQ`1V|B7lxmjXt>bjxn!P_iETU!np)lwsr6_iuz +z!hh-SKOe&kU +zR3NEMGc}*qY^PMML8G5mzTv_K$g*a;s!Nt4OLfO>*Hs)wFjn0zr4bJ*n_w?O0PtD3 +z%v3qGoq7l%*2WDw70|+0t{U< +z+Gm!yD6QKaPCcmLd$wVx=}+D9iefk%3$$ +zWp-L{$Mcj7&!kM9Xd$u;resp4i4j&C_>=}|4`URJ5OvNKQE|;qBd+2{JleSgS-aFN +zbeV{rGp2hO=aX}V!CW?u%}XBZ2;v11dVtIe6mekL#KClE*BtrFhWWG@yy^-rXPiXLb+PE +z-I2kZwAXFugf@)E!!ZcrYTcPDR~ilUF$r+g@9_^ +zso74-G;`^cWg37)FbL9B{ZZ?VTX$T7v1J-EqOK7V#ApC#!t$+$NYv +zBOZy%rV;NRxlD}snf5PRvC0rSCC6k^RyMY*FbajCjEHEugI=*xWvzu7@n{57f)HY^ +zTn$1epGgO;ybvNpmWHk=K?49G`woGOxva6p4cJdo}1DFHwfD%Bv{r7bfUDwh^Kh+2doV_6U=P47gWTGcO7 +z@gRfkHA+lFY*HC64cvQ9RO5F~M +ziA>5G$fi5gw-n&@V8xoL>$!B;f`?*5mSF^AmhG#cHgKcJvNNIyjm)GF0%DbT5+OQ^ +zcHF0Qwp6avwR|QW5Ec>3*NA@d<&7Bt@&qk(KjrFP_~*-prDOqpg-?l@6Bt}Me)Wa-gJ +zBd*Ewk6v5?W9X7Dhvr(O;W}RDgl-%iD{FD%^ +zJWHoJ$uo2i*@`GKI*Skxj3eg&HC@l7hG+?JDQ|qnvNDz>jc+KIDDO9A4BYu0nqZu^ +z%(T_yv-bKR_0aMBVx<px!{q=(=|F;EJL>poeS=`zT^3x?=PTyogp=+|>O?L2#Y9rX_ZA9CX&w1iweEBpXo9htN)efp +zguq1J$akSp#t{=9YEX58p(Vj3=b}=#D|Op6beV<@Hu_(LoodVnue)xrSS}B=J)oiCTm#Awbn@-_?^;CU6LWohzYjm^V1Y=DjvXrh{l}0m`-n|t}0?MWKF9E>y +zeAn|4LWZuHx^5bJu<#ptFYnc6e_h{qJ=#s=VvHn7hXlKfiK?pP5GZr$bdV_>&x^#I +zWtagC?nT;YL)T^fZ{$=8(GtQ%;ehZ1)=^C+2!!itvB7>TuX1kG4GYvgswfU5; +z@7HW6lH`Q;d;}4N=CsMawlpK*Y#!00f*RxLitH=F+Kb+HyVWxL!B@h>|${ +z-W80IsT*m_XtiGH2x`iNXD3Y}1Zm5%noZl9p!6c6LKvfzWhl2&&h3mqxo*hQ_x$d$ +zA=I_72$It@_#yxR65&ZiK~z}!S&9>ZK!BQ=9^v`a^QlMuZd}sOkTcYzpBikc)`>{Y +zdChja5nC>u3N#XG_>_^HiZRNhEG3C-r<+@;$*6<+RlJ{U_u$MJD%gY-6j^MEmOLQYA;!n5gBMi2r?;4A=vf(E}J3CXlU?m*&Twh +zj19%i5Kj`1X9<^-F=Z=b(mWD;7@=-)_HLP>V4;TVQOEPT#j&MQ&Ne}&_GO$`ZJTvz +zfRRaAs(QnxEOH@H08mb<>wDdP4^r;LkR?VqiCLZ{To%ezjS$P!Ozr=e5;|7P +ze8+%NRy0euGBTVQwBRvyeHbMc{OsaV4aT|Mgn|sJ6N06bkwNt+unIXBjB(x+Nt|)k +zk2pXGEW@mP%{#d0)*{&-Mm1_f2{&G0Y0VOIF(?mv`(n|dgy?FKz0jD +zVnfRvm)#vliN%HB5g{-%-89;Rnt>z9>|zYpnvF0PDD~Y<=wOU2Q&*9rZkUskdl=&} +zABqu9Vnb&emjl_1=lj7$#Fk>{8ZmS&G_^8_6`#>=Wk-sq)0U}9NrY%yekuZ#&4i@m +zdEHo@U`z<+T*O=OMDCmeTxtYs#7tWz=fb1Zr<5{wM(BYMtP`y{krH)NOFpBH>vdBk +ziq%@BYXXE2b=U1?SS2Xs#;)hbtXZaMJ>1HqZs?rhQpMFVR>>aVTu{y!_IMRNpbCS*8i%1voUz(GvrHj&T_>!9Ha^ +zu%JbgJ&BqD_10=B^46)@6kIH@szEkp4@`M$)unsBAFsDe-H`oMITudUeB2-?H9~|C +zl+l=DHu?f50n25D%P412Fd>%6(UKW?wRQ;vmJ5%s^N{;C$yHFs;}I-D2_i19({L*R +zvBZKee_SrbKnQeA(={zPjwex6GalY^4AoXvO+?t +ztDx7aII^EkU9!SgE-flkk?~%vVoI+EQzp^M<%G*zCM9P|$SC?!P@_~)p_Ry50U!{* +z&pH>(>#n;SYiP(4p?Dn0k|^2eKYmMD^P8Y@x!@8bgf*f%mom;|b2HBQ!gP%6`b-+R +zAB++1R<+4E^L!SsLV|LnS-C82H;qqSLL*Ko)pw7NkZlbUP%a}}2Iu!Q1DS0AVw}rT +zF*&hE$#A91F+u>1xjqEr?)pi^k{G4DXT5NzGYTN2?(Uf@QcDK*14>z2nF#RZg-h4- +zH4S5oCCWnFhEQXDSs)8JdT^bnMo$jL=0!`oMw)6}#I(=|5w@-oS#QyEV~i64zC3a1 +z`>x+uH%Y?;V@wE=%hd$Y**^puPeE|brAyFf`Ff{os2a8a0A<|sds8gNNN?u8dq(x+ +z8~P{X-0N{6Aeb+f;#7Ky(m_Pc>I{j|_Vu6y=OFu1b1tLni!zJth!l(opY~NADpd{u +z#4JLPfbtC-ClUgfoMXk#-l<5ZP@3STD+zse{!k8OKhhhTNu30gZ!lb*|`?-duPz0p%M9mqGwSjdh|3K?I223Ldq(w>7&>wAxMwmj}Sj%1qhht=X0%2!h5k +z0Fs+y)~1a!+yrZw0FqJqeq*9Ca=x%nOvX9GW!-UQ{!p4)gphD^N!baK=n}6rvej7Xn11d|gJ@7f(?w +zL;}pq4VAWgkrDo6EF(SMvp_vmTfQ_Qq()v;GWC3gk^E65w)@vBPPC*q8zH0-tU7Vd +zU#d54cQVEH*A16TN04gzr4V8P@~BCZiSABtxp+7tjAfl&Ln=wZF6MchM)`4KyAxb4 +z%2+G;--M%BScQB;lL1O*L7Z2(B=~I1Yf+VQGSaSIUt|bL8g6OylY4ny;Zke$0Fv>Y +zRxEunCjge4?<$N&wpG}${I|D5kl>C>H<`nC)j7Y4Ii!97mWvj +zejKgisMO|Suoy<9NDz7c;xcFf8@IffQ4ECB`_A_W;DN;DVtTO0A~JC$f1PxXjHpK$ +zWdP{e5T!LgIxJ*Ve7H7wo+u%`+hB3jR(!69O +zxLooLt +zVf6C~m$EH(FH9_lX+47Zeiz?^){2Gf&`5%_^T>`1!8z-R-DN`U-QMy&Cjr^{#h0Qt +zUji%(T*jQING58Yhqx4PgqtdQx)Wml4e=6OE@v~|)4yB>c3c*W#-Aj@2`XKhMsSbnTj3tF^vnQWk2@n^B +z%hQMUQO^?~FveCUKRCXcXiLSovZ2-j>^P%7(eyLrOUPMqy?#PH^?00ALP-(fB5_GQ +zPsWfL=e5!t*2vKKnx*1P)|)RQ%R)<2r-xUsTg*q#o;>Q>HAbmC0Za(d^sxJuFHD)@q%t0nNpF4HD)1T3FL$@q5mDLPmQMeR>w_VVs +z>=i8pTUZ{FF@KRC?b>zUY2|4c=gjx1=SJg_^ImqGM~b@O^OLW?8hkpma&0<4(2FBn +zw_bJanwicB&TFNDy73re6`9fu)3DO#7MG0CYGF2J1ET5q732Alu?6Cia~90GEk+K9 +zAPxW_pOrJ#I}aH}HNNWtfL$ru)iNfe-3TMxbmp?dqd^1B8LgFyjC#6hG3s}Iv=A_T +z{E&1O<;f#V#y4)AK7KgVx +zYd7Xc#{xj0^iD +zzkOwPCiol^0sv06GJjG>J-%8WrrpY9OVg(fD^;%)>*dmX*!rB9axt&a%6xIz7Q2zh +zsupIaj~|-X*)ZR;E2a3m!8z+0C$cL=yHZq7YsIUqQRSKQweC>E!tXndHY;86F +z&`O6IXb+cgM(1B%$%WvI`nA$re_9(jXVmkk=he%_p5gKE2At1M9PQ(S<}KkPC8{rCu@n4{U1 +z^5K`B8(zI`aBS7Ns!$f9w?t-i5qv44_!7GF<&l?nuUNM!7`2%?cCa*cI+9}Bttv1& +zZ@xqv_4CtgN)3Ddnr|Vvp!_*A(>_fBXrL!yLi36{#-g@yubx+WXZ!|*aT976LP~UAkKgwtq +z&o6{a&ggvgzTkKPd(FqUUJx!j#5E>b&qGn)n>~3fog17xeIkx#d=DYq&xsx1`?AuP +zQlSeWJiG2WHlrTKL^BMc8@g%XMdY7^5Y@tLZg{kxh+a56SF1+w<=$t0CLgR=ziDLk +z`fi*dI^#q_i0)AUg~EEdIC*%#Q?GX0IOJb4%0#a?QTX)aT50p#tN$y$up@UWVuboS +zN$Rm`VJ3b{-*Yk1=5=D_nJJ0O(}!L!oIW0Uch#1QhE}d!@KvIoYgdXLxa{lF1zk)n +zXc3f9?bG*{7Aju%FyCj?2LQKTt(6Ngrxo%q8TICE$1z`k_3zspFVKz`PETY8hl9aw +zgh`)=>ba#|E@_%EuM_iKTRFa+J9bL01G}H{UB^siHgCVO=fN4JQ9&5g&lv_eRg3sp +z2hMEf#8K+G%@PX1{5C6DEzX`gxX*W;m>^kk>Qr&+R6p0N)4!Z=?5(*j(9+`Vew@eQWVnW3HaOnun5yp{MxNv%+JTvLL?%>#} +z73(((A#+`xZdkJu$7W6(=@!C57;Sjd4(5B3hC+9?pEC>sIs%u$nc6ca4tsXJ>o;`l +z>0<}a)Qu0uGG2T7ao@G)n>ps3_mx#&pdnv)jM}qnd!PQPG~uIbH_lBQ@9RDxOuZfm +zHc}bR{P~`k@41GR>P)!-K&?2d*lT3%hNG|ScI!0&z?$Y%%Rv{ga~ym1#TDx}v8aft +zSTJ8Irky@^xHvh{a7F92vs2?pG$POb#OtpBfalZ~P{W2At4uBlE*bUD$dTtJj?-Q- +z|K=U>CXeio|Io=J`xkHyzH3Wd^4J-3rw;5bO;0v}qU${a)wNQ=-|u7wh8Cd5L)g_+ +z3QN7}+4UHXT(Y4{A9v>Xkwr)o-cPm1!Vi8Xj_kYhn7O+|>t0q1vsOA6@AJ5J&2#LQ +z6%``hVN*nArqhwaWPW_P_nDu-G8i(3Og+D6!YV#a#3)BQ_y;9t_>*s{%jQI#5!^%j{zaM$f!sU|IP|i2Vw}9MZ+ZRKWE$#?C +z#6CNJa7jI%FXcC)%mn}e;B+a#>)~H6limSXBZ70z*<#Lz`J8&*5`CkI1AE{+8cw~! +z8CzDJBZ3Nhx!7^RMPYJc=J?@7o{#6$c+z^Mk5QhPT5hN0yUx_n15LhM9(R#5TA7=g +zojA7GD9ou7NlTzN=y2=RgD?D2@#V76nC022^6VM-1=q{PPx#32;bRa{vGh*8l(w*8xH(n|J^KAOJ~3K~#9!?R|N)Bv*OgckivO*SF4lv+tu7 +z!Ds}CAR&-6I+7)XL0}|^47SOMjpLXk$3`NYI61O|mEgqZfCEnOiP;>4;UL*U0ttZt +z2}x+Ak=IU0vPpy?HZFL*4VvOfOZ{)m6X#ec$ittO1m6OHv}NiV5dvJ_cfGc^5Q4O20SL$S8RwyIsu4m6_I#?&DL4qh +zjB!ZDLdQSedlyzuD)oA)TGKVMW^C9r8lXggTA)PT|Jvb;5actNv7tc#F*#eLjJ4iX +zhec>8p8){QMWt?s&J1HD(F_2#j2eG=@p& +z%kw4?5)y$U&ILdOWEJ=KX-1N<5M0XtrshgQ!1(Z>p=)6bp*A?SNU`~}4ZeYW5rV;7 +zCYMfmKAkI9LLV%*$)(c(z!I~At>bv)|!Tc;11eT +zLU1JVx`MAkijjN?-QH@VHi7J-aapR?d`k0~blS3%`3~VMXrqIF;SD;VIXaZr2q{%- +zK4qOp&SfllcWbsAy2}WGsT)no^h1QIem@EnJWvm@f +z#^P})geX+17^9JaTsKe#;TWd9c64^`NH885$O!?3N(5yhgwmD)0FLKM_6mN4X*9s+ +z`82ev9fX>6D>sHQQ+uK+y6srDb&56fpt-Q`Z$E@^H3ZSwsk`Ot1KEraP^sC_aWJL39nT9LTGup1W0bYI +znC-Z1gL{}SgSdB00hOT)&bv+-UHnKqoG(x2N +zNGa!j?Z@B!hJuAPFnsYlub-PZzHish6|-LU&i9P1+r0OgpA{xgDEfTQ2R@R@Ld(mhroj9e=Ib@Lwr%%ql_{2B=_6uMC +z`qwsW+}K^+pzcm&!i!78m%2u9SIr3ki27dP$ZMbb-;b)Bdg$RI4G)a1X}Fk< +zQ!Pw4%&UOm@l~@YkDWSkJe?n0xnUDPHZwGO=01*Ih6E;-|lOX)o-aWVH*w#~a*!wa76s9Lg_)(yRF-H>zmWo!DtUB7$#&6jU|<~v`x>1~&8-@aXLdC`Rz-g)zN+T{Lf +zVYVM-Eg-SqOE}Oc?)k!sp#g+C^Vf|H9{PvBd-BnT)9Dldyt-%4C;#L>UibbF1HkSl +z9{+=neBkDrZ$cxE +zW)6Mvi(dqQYOOYq&!0LyIksX{2*DWBG_6vt4h;@YoH{+WViW-GzWeTY +zKlw=jc=+LmZ@lp)LU6fUUbSk~zJ0H+UArcDCimWZ@8kO?2Ue_$hI`{PWMN%?5LALi_gHZ?|p7 +zZ^py#y6dieyPhnZI(hqVTrWXctJgpK+0TCd^PlHjV2tj)_uf=(ng-(MciwrY0wnQi!q&)j|YgFpWH|N6VXzyE>zr6T$G$A0_7!M$zZzT+crz49G%g+|%O +zmMvS#bFn%_)IeyVx2M<03Q(MKN%y~w#Za%wvCbw2yq&t7`@+y44*zO-fgJFdQV +z=XbyRUHSTt9(!!Vwu}DuYyY4%gf>01TrS50iR>La +zcI@1_bLY;Tn>KBduM7?<@DsFmdVL*L2~bxH7+|n`j8a8_=+pP@%69E$75q-fBHv%@Pn^?`Qfj9 +z>DKqW^DWH?%Oj6Gvi^cgg1g`H-uM3O!S5V=>G{i>g7?UgBizg==zR2}AKiH2C2O}_ +zfSP0d`t>vbLC!fsxKk33uifz6bI%1|+4bCW`LQ)CH*S66$tT)g-?eLa)!LvbC>9Hb +zm2Q1`-1^xVhA}sB{8vADD45!5?i=BTCYi=1$E8%1T||IbyJ_qH`_A`fXJ-|jo_*@c +zT~9rE*Ijohvi!^c_W299zcskqyRW(CJ7535k3IbTp`oFMW_s~g>)&+6x93f*UcIUToyQ(K +zU1zJeUi{a8^W}pF4*|fIEt?;H==PTDd%rB722iJ{T)i>|rphMV8}8#}MN<(6C4tX-S3tYgQIKmL=SeEYlK +z+kWlMYc_2S-J#EY?sKVB>gHQ+Nm;4;@BiL6zH|RY@3|Eda_xtH`!_#)$45W-{u^() +zY4z&Wwr!s}b?Slp@4x@i$FI2YHUM_uz=6jedkg?xdF2%VV2r=8d$*zM>J=eiZ0-8L +z`^r}?z4TH5V2mA|DqN^x04Tcb!3Q5qrBc#u$PAB3Z0+5r;Z#v +zxbL-UxkNNAlN&HcSLa8^^O;nZz}}Z$P_}!`=B+cO>gmG=03e&TG(t99cxiTUxK=Kn +zKDf79w*kQR{K1uLF1YYw0GOLRHF0D=rCeHo@lD$@14D>7`Oz`; +z{ZpnneeA%=gZo^^F*EseesFx_RwI>`fKFQ`fUsRpWwrw0GYw-DnnkHt79-T@fh42P +z@sIc3rR6fIVx?B8+XLBjH%e$&Gl20m8^+gc=-ecdJT7?ijyJviDg(op{_~&Q{%=10 +zz!(4GU;fdbKJcyobKA%M)$GyzSKsuTlrcb1cifpmnQ@*^ncw;!|K$_^>GO`~A%r;R +zK4mVkGK0fHz^c(P9v&UdWOJ9k=T?_-gb){eWaa9?v6Xeltve1v +zNP;OpICSFq;~U@n*4+4d$Me)gB8(B|Lf6QeEf=ode4*`nAqlAXGLjVIoya6&zgRmy +zkWH7WwPK~3OQ$eKjk$#a0D+ok7zl8R9u}?R9{L=uSheQ(-j~*_T{m~~@YLxEBb%Ez +zer#KD>ZM=&ba=%Is->on9b^Kw-g295+lcwkK6qa$l^WZ)&2in@%;{7*J+%3f*M9o_ +zbUM9d`<2wl0D$AVqZ_sjuUtEOWM6H1!rXe{#ED~w`AD}`UbOw_FMeoR*3kNG)V24& +z_F}P6*!bqR9^3uo?5X3~(Un81*3TT;Gdndox_a%)M-N?b!>!iH>dtf`YC=95L~#am55Xj#N&A!)D>V@mJ*ojgvt>Z!U68NKx6;|{E$@5(wL5RPcIOS>`=F0tEj<0^=M-N|f)2%=K;X~^;Z*zURfA1d8bq^ohzxB#%fA!Q)2Zl$SYT2t60bu(0 +z;n}Iv*<60=$bK%w)TxuxvvWv@a{{@&Z4{mBmr_h)8i)?NITx^1uCeBsQ* +zacG|g)VMSV0YF!4j1tka#JXoFpRLxNLZy;PnWmvjI4ag`J?-x1OYC0r-VcTpy$~>0 +zuI5I^?RtHD^F@Orqbt_50^Qkxp+cp$degSasp*w#*AI-21HjPA)s%7Drx(2Cim9oo +z6>B#f+4t&>cU+Yn81g;0JTsLVZWL7vtXc=T5tuk;W%Cqk8@6maJw5Z*tFJ}*QP1;i +zpKZSQGKR>mAO8Tj?=i7q%LTh0d0^uO7dw>chQSyknhqE>PB@w`yO1U7A$k%$v{>D9 +z*B8DD05!*%oGt1aSvxkW=Ep=%A`69G+8im-_M#9_cbwC+g|wls8O}4J>%cjH0F0Oi +zngNU+oi0&E4eqa6xl&+4nCoK$bH;qfL&i*@g#9`;QbR+78uI}J*DdKa)+=s(;W++_d& +zCL+KD1ZG8c@+B8tlRYAV-qQJ(>e0wRK5dzf=S@t{DH;#~4vhPQuruno-o(r-=VEj) +zAK5nx01D-*w2Aq2I&_PL0M!{QWrcFtA~>Vh(A#DUdF`577DLH{ho+fBb9$r@5E;{v +zKh93SGhpJox}FJQ&j2nJ_{K*DB{WY=&A6T~0@5cw@DbcV2q;x+5|k^3^0{<$_^DcN +zbXUu!QgRZHYS#t;b*I(lAY~c~?s7PR1eKxbZSp_VMk|nYjF>#s^jLTYE>(Sg7b@)< +zok+y^8Ny|Nz!0F7BSTW2pO~7ND^)me87t8e-{C)nNYAGe({r-J;P}X(0%eFS8RN2J +z5yogRm+52|)k(`TjL@WS&!>vsFh;tr8WjO!JP0F=5EO7f7-!+=cN2V_e2Ec`3lbqD +zi>kV?WrC|Sp~pkf%F)5RW$LrVN}*CM*Xo10OfHimn8df2a6P|NtyOJX2rvzOY-q66 +z+N#5XPZ!D(K!e$AsPiQN1Vh}}wAHR~MKGIh8AfAHFaQMF7zK^E9F(#Uj8t0=Aw(xB +z%6B8lQsR<#2_PYq1l7+JE<2!^O{G$%StwU4_4;h7GFPrxhMBeuL)Q(RV1y-MP{uv# +zJFZ`MT!|z?@NhmGwB1o|Wlgr$NSQ`1V|B7lxmjXt>bjxn!P_iETU!np)lwsr6_iuz +z!hh-SKOe&kU +zR3NEMGc}*qY^PMML8G5mzTv_K$g*a;s!Nt4OLfO>*Hs)wFjn0zr4bJ*n_w?O0PtD3 +z%v3qGoq7l%*2WDw70|+0t{U< +z+Gm!yD6QKaPCcmLd$wVx=}+D9iefk%3$$ +zWp-L{$Mcj7&!kM9Xd$u;resp4i4j&C_>=}|4`URJ5OvNKQE|;qBd+2{JleSgS-aFN +zbeV{rGp2hO=aX}V!CW?u%}XBZ2;v11dVtIe6mekL#KClE*BtrFhWWG@yy^-rXPiXLb+PE +z-I2kZwAXFugf@)E!!ZcrYTcPDR~ilUF$r+g@9_^ +zso74-G;`^cWg37)FbL9B{ZZ?VTX$T7v1J-EqOK7V#ApC#!t$+$NYv +zBOZy%rV;NRxlD}snf5PRvC0rSCC6k^RyMY*FbajCjEHEugI=*xWvzu7@n{57f)HY^ +zTn$1epGgO;ybvNpmWHk=K?49G`woGOxva6p4cJdo}1DFHwfD%Bv{r7bfUDwh^Kh+2doV_6U=P47gWTGcO7 +z@gRfkHA+lFY*HC64cvQ9RO5F~M +ziA>5G$fi5gw-n&@V8xoL>$!B;f`?*5mSF^AmhG#cHgKcJvNNIyjm)GF0%DbT5+OQ^ +zcHF0Qwp6avwR|QW5Ec>3*NA@d<&7Bt@&qk(KjrFP_~*-prDOqpg-?l@6Bt}Me)Wa-gJ +zBd*Ewk6v5?W9X7Dhvr(O;W}RDgl-%iD{FD%^ +zJWHoJ$uo2i*@`GKI*Skxj3eg&HC@l7hG+?JDQ|qnvNDz>jc+KIDDO9A4BYu0nqZu^ +z%(T_yv-bKR_0aMBVx<px!{q=(=|F;EJL>poeS=`zT^3x?=PTyogp=+|>O?L2#Y9rX_ZA9CX&w1iweEBpXo9htN)efp +zguq1J$akSp#t{=9YEX58p(Vj3=b}=#D|Op6beV<@Hu_(LoodVnue)xrSS}B=J)oiCTm#Awbn@-_?^;CU6LWohzYjm^V1Y=DjvXrh{l}0m`-n|t}0?MWKF9E>y +zeAn|4LWZuHx^5bJu<#ptFYnc6e_h{qJ=#s=VvHn7hXlKfiK?pP5GZr$bdV_>&x^#I +zWtagC?nT;YL)T^fZ{$=8(GtQ%;ehZ1)=^C+2!!itvB7>TuX1kG4GYvgswfU5; +z@7HW6lH`Q;d;}4N=CsMawlpK*Y#!00f*RxLitH=F+Kb+HyVWxL!B@h>|${ +z-W80IsT*m_XtiGH2x`iNXD3Y}1Zm5%noZl9p!6c6LKvfzWhl2&&h3mqxo*hQ_x$d$ +zA=I_72$It@_#yxR65&ZiK~z}!S&9>ZK!BQ=9^v`a^QlMuZd}sOkTcYzpBikc)`>{Y +zdChja5nC>u3N#XG_>_^HiZRNhEG3C-r<+@;$*6<+RlJ{U_u$MJD%gY-6j^MEmOLQYA;!n5gBMi2r?;4A=vf(E}J3CXlU?m*&Twh +zj19%i5Kj`1X9<^-F=Z=b(mWD;7@=-)_HLP>V4;TVQOEPT#j&MQ&Ne}&_GO$`ZJTvz +zfRRaAs(QnxEOH@H08mb<>wDdP4^r;LkR?VqiCLZ{To%ezjS$P!Ozr=e5;|7P +ze8+%NRy0euGBTVQwBRvyeHbMc{OsaV4aT|Mgn|sJ6N06bkwNt+unIXBjB(x+Nt|)k +zk2pXGEW@mP%{#d0)*{&-Mm1_f2{&G0Y0VOIF(?mv`(n|dgy?FKz0jD +zVnfRvm)#vliN%HB5g{-%-89;Rnt>z9>|zYpnvF0PDD~Y<=wOU2Q&*9rZkUskdl=&} +zABqu9Vnb&emjl_1=lj7$#Fk>{8ZmS&G_^8_6`#>=Wk-sq)0U}9NrY%yekuZ#&4i@m +zdEHo@U`z<+T*O=OMDCmeTxtYs#7tWz=fb1Zr<5{wM(BYMtP`y{krH)NOFpBH>vdBk +ziq%@BYXXE2b=U1?SS2Xs#;)hbtXZaMJ>1HqZs?rhQpMFVR>>aVTu{y!_IMRNpbCS*8i%1voUz(GvrHj&T_>!9Ha^ +zu%JbgJ&BqD_10=B^46)@6kIH@szEkp4@`M$)unsBAFsDe-H`oMITudUeB2-?H9~|C +zl+l=DHu?f50n25D%P412Fd>%6(UKW?wRQ;vmJ5%s^N{;C$yHFs;}I-D2_i19({L*R +zvBZKee_SrbKnQeA(={zPjwex6GalY^4AoXvO+?t +ztDx7aII^EkU9!SgE-flkk?~%vVoI+EQzp^M<%G*zCM9P|$SC?!P@_~)p_Ry50U!{* +z&pH>(>#n;SYiP(4p?Dn0k|^2eKYmMD^P8Y@x!@8bgf*f%mom;|b2HBQ!gP%6`b-+R +zAB++1R<+4E^L!SsLV|LnS-C82H;qqSLL*Ko)pw7NkZlbUP%a}}2Iu!Q1DS0AVw}rT +zF*&hE$#A91F+u>1xjqEr?)pi^k{G4DXT5NzGYTN2?(Uf@QcDK*14>z2nF#RZg-h4- +zH4S5oCCWnFhEQXDSs)8JdT^bnMo$jL=0!`oMw)6}#I(=|5w@-oS#QyEV~i64zC3a1 +z`>x+uH%Y?;V@wE=%hd$Y**^puPeE|brAyFf`Ff{os2a8a0A<|sds8gNNN?u8dq(x+ +z8~P{X-0N{6Aeb+f;#7Ky(m_Pc>I{j|_Vu6y=OFu1b1tLni!zJth!l(opY~NADpd{u +z#4JLPfbtC-ClUgfoMXk#-l<5ZP@3STD+zse{!k8OKhhhTNu30gZ!lb*|`?-duPz0p%M9mqGwSjdh|3K?I223Ldq(w>7&>wAxMwmj}Sj%1qhht=X0%2!h5k +z0Fs+y)~1a!+yrZw0FqJqeq*9Ca=x%nOvX9GW!-UQ{!p4)gphD^N!baK=n}6rvej7Xn11d|gJ@7f(?w +zL;}pq4VAWgkrDo6EF(SMvp_vmTfQ_Qq()v;GWC3gk^E65w)@vBPPC*q8zH0-tU7Vd +zU#d54cQVEH*A16TN04gzr4V8P@~BCZiSABtxp+7tjAfl&Ln=wZF6MchM)`4KyAxb4 +z%2+G;--M%BScQB;lL1O*L7Z2(B=~I1Yf+VQGSaSIUt|bL8g6OylY4ny;Zke$0Fv>Y +zRxEunCjge4?<$N&wpG}${I|D5kl>C>H<`nC)j7Y4Ii!97mWvj +zejKgisMO|Suoy<9NDz7c;xcFf8@IffQ4ECB`_A_W;DN;DVtTO0A~JC$f1PxXjHpK$ +zWdP{e5T!LgIxJ*Ve7H7wo+u%`+hB3jR(!69O +zxLooLt +zVf6C~m$EH(FH9_lX+47Zeiz?^){2Gf&`5%_^T>`1!8z-R-DN`U-QMy&Cjr^{#h0Qt +zUji%(T*jQING58Yhqx4PgqtdQx)Wml4e=6OE@v~|)4yB>c3c*W#-Aj@2`XKhMsSbnTj3tF^vnQWk2@n^B +z%hQMUQO^?~FveCUKRCXcXiLSovZ2-j>^P%7(eyLrOUPMqy?#PH^?00ALP-(fB5_GQ +zPsWfL=e5!t*2vKKnx*1P)|)RQ%R)<2r-xUsTg*q#o;>Q>HAbmC0Za(d^sxJuFHD)@q%t0nNpF4HD)1T3FL$@q5mDLPmQMeR>w_VVs +z>=i8pTUZ{FF@KRC?b>zUY2|4c=gjx1=SJg_^ImqGM~b@O^OLW?8hkpma&0<4(2FBn +zw_bJanwicB&TFNDy73re6`9fu)3DO#7MG0CYGF2J1ET5q732Alu?6Cia~90GEk+K9 +zAPxW_pOrJ#I}aH}HNNWtfL$ru)iNfe-3TMxbmp?dqd^1B8LgFyjC#6hG3s}Iv=A_T +z{E&1O<;f#V#y4)AK7KgVx +zYd7Xc#{xj0^iD +zzkOwPCiol^0sv06GJjG>J-%8WrrpY9OVg(fD^;%)>*dmX*!rB9axt&a%6xIz7Q2zh +zsupIaj~|-X*)ZR;E2a3m!8z+0C$cL=yHZq7YsIUqQRSKQweC>E!tXndHY;86F +z&`O6IXb+cgM(1B%$%WvI`nA$re_9(jXVmkk=he%_p5gKE2At1M9PQ(S<}KkPC8{rCu@n4{U1 +z^5K`B8(zI`aBS7Ns!$f9w?t-i5qv44_!7GF<&l?nuUNM!7`2%?cCa*cI+9}Bttv1& +zZ@xqv_4CtgN)3Ddnr|Vvp!_*A(>_fBXrL!yLi36{#-g@yubx+WXZ!|*aT976LP~UAkKgwtq +z&o6{a&ggvgzTkKPd(FqUUJx!j#5E>b&qGn)n>~3fog17xeIkx#d=DYq&xsx1`?AuP +zQlSeWJiG2WHlrTKL^BMc8@g%XMdY7^5Y@tLZg{kxh+a56SF1+w<=$t0CLgR=ziDLk +z`fi*dI^#q_i0)AUg~EEdIC*%#Q?GX0IOJb4%0#a?QTX)aT50p#tN$y$up@UWVuboS +zN$Rm`VJ3b{-*Yk1=5=D_nJJ0O(}!L!oIW0Uch#1QhE}d!@KvIoYgdXLxa{lF1zk)n +zXc3f9?bG*{7Aju%FyCj?2LQKTt(6Ngrxo%q8TICE$1z`k_3zspFVKz`PETY8hl9aw +zgh`)=>ba#|E@_%EuM_iKTRFa+J9bL01G}H{UB^siHgCVO=fN4JQ9&5g&lv_eRg3sp +z2hMEf#8K+G%@PX1{5C6DEzX`gxX*W;m>^kk>Qr&+R6p0N)4!Z=?5(*j(9+`Vew@eQWVnW3HaOnun5yp{MxNv%+JTvLL?%>#} +z73(((A#+`xZdkJu$7W6(=@!C57;Sjd4(5B3hC+9?pEC>sIs%u$nc6ca4tsXJ>o;`l +z>0<}a)Qu0uGG2T7ao@G)n>ps3_mx#&pdnv)jM}qnd!PQPG~uIbH_lBQ@9RDxOuZfm +zHc}bR{P~`k@41GR>P)!-K&?2d*lT3%hNG|ScI!0&z?$Y%%Rv{ga~ym1#TDx}v8aft +zSTJ8Irky@^xHvh{a7F92vs2?pG$POb#OtpBfalZ~P{W2At4uBlE*bUD$dTtJj?-Q- +z|K=U>CXeio|Io=J`xkHyzH3Wd^4J-3rw;5bO;0v}qU${a)wNQ=-|u7wh8Cd5L)g_+ +z3QN7}+4UHXT(Y4{A9v>Xkwr)o-cPm1!Vi8Xj_kYhn7O+|>t0q1vsOA6@AJ5J&2#LQ +z6%``hVN*nArqhwaWPW_P_nDu-G8i(3Og+D6!YV#a#3)BQ_y;9t_>*s{%jQI#5!^%j{zaM$f!sU|IP|i2Vw}9MZ+ZRKWE$#?C +z#6CNJa7jI%FXcC)%mn}e;B+a#>)~H6limSXBZ70z*<#Lz`J8&*5`CkI1AE{+8cw~! +z8CzDJBZ3Nhx!7^RMPYJc=J?@7o{#6$c+z^Mk5QhPT5hN0yUx_n15LhM9(R#5TA7=g +zojA7GD9ou7NlTzN=y2=RgD?D2@#V76nC022^6VM-1=q{P ++ TITLE:=LCD display utility ++ URL:=http://lcd4linux.bulix.org/ ++endef ++ ++define Package/lcd4linux/Default/description ++ LCD4Linux is a small program that grabs information from the kernel and ++ some subsystems and displays it on an external liquid crystal display. ++endef ++ ++ ++define Package/lcd4linux-custom ++$(call Package/lcd4linux/Default) ++ DEPENDS:= \ ++ +LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \ ++ +LCD4LINUX_CUSTOM_NEEDS_libdpf:libdpf \ ++ +LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \ ++ $(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \ ++ +LCD4LINUX_CUSTOM_NEEDS_libjpeg:libjpeg \ ++ +LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \ ++ +LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \ ++ +LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \ ++ +LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \ ++ +LCD4LINUX_CUSTOM_NEEDS_libusb:libusb-compat \ ++ +LCD4LINUX_CUSTOM_NEEDS_libvncserver:libvncserver \ ++ +LCD4LINUX_CUSTOM_NEEDS_serdisplib:serdisplib \ ++ +LCD4LINUX_CUSTOM_NEEDS_st2205tool:st2205tool \ ++# +LCD4LINUX_CUSTOM_NEEDS_libftdi:libftdi \ ++# +LCD4LINUX_CUSTOM_NEEDS_libX11:libX11 \ ++# +LCD4LINUX_CUSTOM_NEEDS_python:python ++ MENU:=1 ++ PROVIDES:=lcd4linux ++ VARIANT=custom ++endef ++ ++define Package/lcd4linux-custom/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++define Package/lcd4linux-custom/description ++$(call Package/lcd4linux/Default/description) ++ . ++ This package contains a customized version of LCD4Linux. ++endef ++ ++ ++define Package/lcd4linux-full ++$(call Package/lcd4linux/Default) ++ DEPENDS:= @DEVEL \ ++ +libdbus \ ++ +libdpf \ ++ +libgd \ ++ $(if $(ICONV_FULL),+libiconv-full) \ ++ +libmpdclient \ ++ +libmysqlclient \ ++ +libncurses \ ++ +libsqlite3 \ ++ +libusb-compat \ ++ +libvncserver \ ++ +serdisplib \ ++ +st2205tool \ ++# +libftdi \ ++# +libX11 \ ++# +python ++ PROVIDES:=lcd4linux ++ VARIANT=full ++endef ++ ++define Package/lcd4linux-full/description ++$(call Package/lcd4linux/Default/description) ++ . ++ This package contains a version of LCD4Linux built with all supported ++ drivers and plugins. ++endef ++ ++ ++CONFIGURE_ARGS+= \ ++ --disable-rpath \ ++ ++EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++ifeq ($(BUILD_VARIANT),custom) ++ ++ LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \ ++ $(if $(CONFIG_LCD4LINUX_CUSTOM_DRIVER_$(c)),$(c),) \ ++ )) ++ ifeq ($(LCD4LINUX_CUSTOM_DRIVERS),) ++ LCD4LINUX_CUSTOM_DRIVERS:=Sample ++ endif ++ ++ LCD4LINUX_CUSTOM_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \ ++ $(if $(CONFIG_LCD4LINUX_CUSTOM_PLUGIN_$(c)),$(c)) \ ++ )) ++ ifeq ($(LCD4LINUX_CUSTOM_PLUGINS),) ++ LCD4LINUX_CUSTOM_PLUGINS:=sample ++ endif ++ ++ CONFIGURE_ARGS+= \ ++ --with-drivers="$(LCD4LINUX_CUSTOM_DRIVERS)" \ ++ --with-plugins="$(LCD4LINUX_CUSTOM_PLUGINS)" \ ++ ++ ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libiconv),) ++ CONFIGURE_ARGS+= --with-libiconv-prefix="$(ICONV_PREFIX)" ++ else ++ CONFIGURE_ARGS+= --without-libiconv-prefix ++ endif ++ ++ ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libmysqlclient),) ++ EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql ++ endif ++ ++# ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_python),) ++# CONFIGURE_ARGS+= --with-python ++# else ++ CONFIGURE_ARGS+= --without-python ++# endif ++ ++# ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libX11),) ++# CONFIGURE_ARGS+= --with-x ++# else ++ CONFIGURE_ARGS+= --without-x ++# endif ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),full) ++ ++ LCD4LINUX_FULL_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \ ++ $(c) \ ++ )) ++ ++ LCD4LINUX_FULL_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \ ++ $(c) \ ++ )) ++ ++ CONFIGURE_ARGS+= \ ++ --with-drivers="$(LCD4LINUX_FULL_DRIVERS)" \ ++ --with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \ ++ --with-libiconv-prefix="$(ICONV_PREFIX)" \ ++ --without-python \ ++ --without-x \ ++ ++ EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql ++ ++endif ++ ++ ++define Package/lcd4linux/conffiles ++/etc/lcd4linux.conf ++endef ++ ++define Package/lcd4linux/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/lcd4linux $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/lcd4linux.conf.sample $(1)/etc/lcd4linux.conf ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/lcd4linux.init $(1)/etc/init.d/lcd4linux ++ $(SED) "s|^\(Display 'GLCD2USB'\)|#\1|g" \ ++ -e "s|^\(Layout 'TestLayer'\)|#\1|g" \ ++ -e "s|^#\(Display 'Image'\)|\1|g" \ ++ -e "s|^#\(Layout 'Default'\)|\1|g" \ ++ $(1)/etc/lcd4linux.conf ++endef ++ ++Package/lcd4linux-custom/conffiles = $(Package/lcd4linux/conffiles) ++Package/lcd4linux-custom/install = $(Package/lcd4linux/install) ++ ++Package/lcd4linux-full/conffiles = $(Package/lcd4linux/conffiles) ++Package/lcd4linux-full/install = $(Package/lcd4linux/install) ++ ++$(eval $(call BuildPackage,lcd4linux-custom)) ++$(eval $(call BuildPackage,lcd4linux-full)) +diff --git a/feeds/packages/utils/lcd4linux/Config.in b/feeds/packages/utils/lcd4linux/Config.in +new file mode 100644 +index 0000000..2453a3c +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/Config.in +@@ -0,0 +1,501 @@ ++if PACKAGE_lcd4linux-custom ++ ++config LCD4LINUX_CUSTOM_NEEDS_libdbus ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libdpf ++ bool ++ ++#config LCD4LINUX_CUSTOM_NEEDS_libftdi ++# bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libgd ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libiconv ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libjpeg ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libmpdclient ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libmysqlclient ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libncurses ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libnmeap ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libsqlite3 ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libusb ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_libvncserver ++ bool ++ ++#config LCD4LINUX_CUSTOM_NEEDS_libX11 ++# bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_ppp ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_python ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_serdisplib ++ bool ++ ++config LCD4LINUX_CUSTOM_NEEDS_st2205tool ++ bool ++ ++ ++comment "Drivers ---" ++ ++config LCD4LINUX_CUSTOM_DRIVER_ASTUSB ++ bool ++ prompt "ASTUSB" ++ ++config LCD4LINUX_CUSTOM_DRIVER_BeckmannEgle ++ bool ++ prompt "BeckmannEgle" ++ ++config LCD4LINUX_CUSTOM_DRIVER_BWCT ++ bool ++ prompt "BWCT" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_CrystalFontz ++ bool ++ prompt "CrystalFontz" ++ ++config LCD4LINUX_CUSTOM_DRIVER_Curses ++ bool ++ prompt "Curses" ++ select LCD4LINUX_CUSTOM_NEEDS_libncurses ++ ++config LCD4LINUX_CUSTOM_DRIVER_Cwlinux ++ bool ++ prompt "Cwlinux" ++ ++config LCD4LINUX_CUSTOM_DRIVER_D4D ++ bool ++ prompt "D4D" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_dpf ++ bool ++ prompt "dpf" ++ select LCD4LINUX_CUSTOM_NEEDS_libdpf ++ ++config LCD4LINUX_CUSTOM_DRIVER_EA232graphic ++ bool ++ prompt "EA232graphic" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_EFN ++ bool ++ prompt "EFN" ++ ++config LCD4LINUX_CUSTOM_DRIVER_FutabaVFD ++ bool ++ prompt "FutabaVFD" ++ ++config LCD4LINUX_CUSTOM_DRIVER_FW8888 ++ bool ++ prompt "FW8888" ++ ++config LCD4LINUX_CUSTOM_DRIVER_G15 ++ bool ++ prompt "G15" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_GLCD2USB ++ bool ++ prompt "GLCD2USB" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_HD44780 ++ bool ++ prompt "HD44780" ++ depends BROKEN ++ ++config LCD4LINUX_CUSTOM_DRIVER_HD44780-I2C ++ bool ++ prompt "HD44780-I2C" ++ depends BROKEN ++ ++config LCD4LINUX_CUSTOM_DRIVER_IRLCD ++ bool ++ prompt "IRLCD" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_LCD2USB ++ bool ++ prompt "LCD2USB" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_LCDLinux ++ bool ++ prompt "LCDLinux" ++ depends BROKEN ++ ++config LCD4LINUX_CUSTOM_DRIVER_LCDTerm ++ bool ++ prompt "LCDTerm" ++ ++config LCD4LINUX_CUSTOM_DRIVER_LEDMatrix ++ bool ++ prompt "LEDMatrix" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_LPH7508 ++ bool ++ prompt "LPH7508" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_LUIse ++ bool ++ prompt "LUIse" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ #select LCD4LINUX_CUSTOM_NEEDS_libluise ++ depends BROKEN ++ ++config LCD4LINUX_CUSTOM_DRIVER_LW_ABP ++ bool ++ prompt "LW_ABP" ++ ++config LCD4LINUX_CUSTOM_DRIVER_M50530 ++ bool ++ prompt "M50530" ++ ++config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbital ++ bool ++ prompt "MatrixOrbital" ++ ++config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbitalGX ++ bool ++ prompt "MatrixOrbitalGX" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_mdm166a ++ bool ++ prompt "mdm166a" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_MilfordInstruments ++ bool ++ prompt "MilfordInstruments" ++ ++config LCD4LINUX_CUSTOM_DRIVER_Newhaven ++ bool ++ prompt "Newhaven" ++ ++config LCD4LINUX_CUSTOM_DRIVER_Noritake ++ bool ++ prompt "Noritake" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_NULL ++ bool ++ prompt "NULL" ++ default y ++ ++config LCD4LINUX_CUSTOM_DRIVER_Pertelian ++ bool ++ prompt "Pertelian" ++ ++config LCD4LINUX_CUSTOM_DRIVER_PHAnderson ++ bool ++ prompt "PHAnderson" ++ ++config LCD4LINUX_CUSTOM_DRIVER_PICGraphic ++ bool ++ prompt "PICGraphic" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_picoLCD ++ bool ++ prompt "picoLCD" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_picoLCDGraphic ++ bool ++ prompt "picoLCDGraphic" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_PNG ++ bool ++ prompt "PNG" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_PPM ++ bool ++ prompt "PPM" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_RouterBoard ++ bool ++ prompt "RouterBoard" ++ depends on TARGET_rb532 ++ ++config LCD4LINUX_CUSTOM_DRIVER_SamsungSPF ++ bool ++ prompt "SamsungSPF" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libjpeg ++ ++config LCD4LINUX_CUSTOM_DRIVER_serdisplib ++ bool ++ prompt "serdisplib" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_serdisplib ++ ++config LCD4LINUX_CUSTOM_DRIVER_ShuttleVFD ++ bool ++ prompt "ShuttleVFD" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_SimpleLCD ++ bool ++ prompt "SimpleLCD" ++ ++config LCD4LINUX_CUSTOM_DRIVER_st2205 ++ bool ++ prompt "st2205" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_st2205tool ++ ++config LCD4LINUX_CUSTOM_DRIVER_T6963 ++ bool ++ prompt "T6963" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ ++config LCD4LINUX_CUSTOM_DRIVER_TeakLCM ++ bool ++ prompt "TeakLCM" ++ ++config LCD4LINUX_CUSTOM_DRIVER_TEW673GRU ++ bool ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ depends on TARGET_ar71xx ++ default TARGET_ar71xx ++ ++config LCD4LINUX_CUSTOM_DRIVER_Trefon ++ bool ++ prompt "Trefon" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++#config LCD4LINUX_CUSTOM_DRIVER_ULA200 ++# bool ++# prompt "ULA200" ++# select LCD4LINUX_CUSTOM_NEEDS_libftdi ++# select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_USBHUB ++ bool ++ prompt "USBHUB" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_USBLCD ++ bool ++ prompt "USBLCD" ++ select LCD4LINUX_CUSTOM_NEEDS_libusb ++ ++config LCD4LINUX_CUSTOM_DRIVER_VNC ++ bool ++ prompt "VNC" ++ select LCD4LINUX_CUSTOM_NEEDS_libgd ++ select LCD4LINUX_CUSTOM_NEEDS_libvncserver ++ ++config LCD4LINUX_CUSTOM_DRIVER_WincorNixdorf ++ bool ++ prompt "WincorNixdorf" ++ ++#config LCD4LINUX_CUSTOM_DRIVER_X11 ++# bool ++# prompt "X11" ++# select LCD4LINUX_CUSTOM_NEEDS_libgd ++# select LCD4LINUX_CUSTOM_NEEDS_libX11 ++ ++ ++comment "Plugins ---" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_apm ++ bool ++ prompt "apm" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_asterisk ++ bool ++ prompt "asterisk" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_button_exec ++ bool ++ prompt "button_exec" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_cpuinfo ++ bool ++ prompt "cpuinfo" ++ default y ++ ++config LCD4LINUX_CUSTOM_PLUGIN_dbus ++ bool ++ prompt "dbus" ++ select LCD4LINUX_CUSTOM_NEEDS_libdbus ++ ++config LCD4LINUX_CUSTOM_PLUGIN_diskstats ++ bool ++ prompt "diskstats" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_dvb ++ bool ++ prompt "dvb" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_event ++ bool ++ prompt "event" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_exec ++ bool ++ prompt "exec" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_fifo ++ bool ++ prompt "fifo" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_file ++ bool ++ prompt "file" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_gps ++ bool ++ prompt "gps" ++ select LCD4LINUX_CUSTOM_NEEDS_libnmeap ++ ++config LCD4LINUX_CUSTOM_PLUGIN_hddtemp ++ bool ++ prompt "hddtemp" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_huawei ++ bool ++ prompt "huawei" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_i2c_sensors ++ bool ++ prompt "i2c_sensors" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_iconv ++ bool ++ prompt "iconv" ++ select LCD4LINUX_CUSTOM_NEEDS_libiconv ++ ++config LCD4LINUX_CUSTOM_PLUGIN_imon ++ bool ++ prompt "imon" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_isdn ++ bool ++ prompt "isdn" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_kvv ++ bool ++ prompt "kvv" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_loadavg ++ bool ++ prompt "loadavg" ++ default y ++ ++config LCD4LINUX_CUSTOM_PLUGIN_meminfo ++ bool ++ prompt "meminfo" ++ default y ++ ++config LCD4LINUX_CUSTOM_PLUGIN_mpd ++ bool ++ prompt "mpd" ++ select LCD4LINUX_CUSTOM_NEEDS_libmpdclient ++ ++config LCD4LINUX_CUSTOM_PLUGIN_mpris_dbus ++ bool ++ prompt "mpris_dbus" ++ select LCD4LINUX_CUSTOM_NEEDS_libdbus ++ ++config LCD4LINUX_CUSTOM_PLUGIN_mysql ++ bool ++ prompt "mysql" ++ select LCD4LINUX_CUSTOM_NEEDS_libmysqlclient ++ ++config LCD4LINUX_CUSTOM_PLUGIN_netdev ++ bool ++ prompt "netdev" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_netinfo ++ bool ++ prompt "netinfo" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_pop3 ++ bool ++ prompt "pop3" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_ppp ++ bool ++ prompt "ppp" ++ select LCD4LINUX_CUSTOM_NEEDS_ppp ++ ++config LCD4LINUX_CUSTOM_PLUGIN_proc_stat ++ bool ++ prompt "proc_stat" ++ default y ++ ++#config LCD4LINUX_CUSTOM_PLUGIN_python ++# bool ++# prompt "python" ++# select LCD4LINUX_CUSTOM_NEEDS_python ++ ++config LCD4LINUX_CUSTOM_PLUGIN_qnaplog ++ bool ++ prompt "qnaplog" ++ select LCD4LINUX_CUSTOM_NEEDS_libsqlite3 ++ ++config LCD4LINUX_CUSTOM_PLUGIN_seti ++ bool ++ prompt "seti" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_statfs ++ bool ++ prompt "statfs" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_uname ++ bool ++ prompt "uname" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_uptime ++ bool ++ prompt "uptime" ++ default y ++ ++config LCD4LINUX_CUSTOM_PLUGIN_w1retap ++ bool ++ prompt "w1retap" ++ ++config LCD4LINUX_CUSTOM_PLUGIN_wireless ++ bool ++ prompt "wireless" ++ depends BROKEN ++ ++config LCD4LINUX_CUSTOM_PLUGIN_xmms ++ bool ++ prompt "xmms" ++ ++endif +diff --git a/feeds/packages/utils/lcd4linux/Makefile b/feeds/packages/utils/lcd4linux/Makefile +new file mode 100644 +index 0000000..452ffeb +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/Makefile +@@ -0,0 +1,321 @@ ++# ++# Copyright (C) 2007-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:=lcd4linux ++PKG_REV:=1187 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/ ++PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++LCD4LINUX_DRIVERS:= \ ++ ASTUSB \ ++ BeckmannEgle \ ++ BWCT \ ++ CrystalFontz \ ++ Curses \ ++ Cwlinux \ ++ D4D \ ++ DPF \ ++ EA232graphic \ ++ EFN \ ++ FutabaVFD \ ++ FW8888 \ ++ G15 \ ++ GLCD2USB \ ++ IRLCD \ ++ $(if $(CONFIG_BROKEN),HD44780) \ ++ $(if $(CONFIG_BROKEN),HD44780-I2C) \ ++ LCD2USB \ ++ $(if $(CONFIG_BROKEN),LCDLinux) \ ++ LCDTerm \ ++ LEDMatrix \ ++ LPH7508 \ ++ $(if $(CONFIG_BROKEN),LUIse) \ ++ LW_ABP \ ++ M50530 \ ++ MatrixOrbital \ ++ MatrixOrbitalGX \ ++ MilfordInstruments \ ++ Newhaven \ ++ Noritake \ ++ NULL \ ++ Pertelian \ ++ PHAnderson \ ++ PICGraphic \ ++ picoLCD \ ++ picoLCDGraphic \ ++ PNG \ ++ PPM \ ++ $(if $(CONFIG_TARGET_rb532),RouterBoard) \ ++ $(if $(CONFIG_BROKEN),SamsungSPF) \ ++ serdisplib \ ++ ShuttleVFD \ ++ SimpleLCD \ ++ st2205 \ ++ T6963 \ ++ TeakLCM \ ++ $(if $(CONFIG_TARGET_ar71xx),TEW673GRU) \ ++ Trefon \ ++ USBHUB \ ++ USBLCD \ ++ VNC \ ++ WincorNixdorf \ ++# ULA200 \ ++# X11 \ ++ ++LCD4LINUX_PLUGINS:= \ ++ apm \ ++ asterisk \ ++ button_exec \ ++ cpuinfo \ ++ dbus \ ++ diskstats \ ++ dvb \ ++ event \ ++ exec \ ++ fifo \ ++ file \ ++ gps \ ++ hddtemp \ ++ huawei \ ++ i2c_sensors \ ++ iconv \ ++ imon \ ++ isdn \ ++ kvv \ ++ loadavg \ ++ netdev \ ++ netinfo \ ++ meminfo \ ++ mpd \ ++ mpris_dbus \ ++ mysql \ ++ netdev \ ++ pop3 \ ++ ppp \ ++ proc_stat \ ++ qnaplog \ ++ seti \ ++ statfs \ ++ uname \ ++ uptime \ ++ w1retap \ ++ $(if $(CONFIG_BROKEN),wireless) \ ++ xmms \ ++# python \ ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_BUILD_DEPENDS:= \ ++ libdbus \ ++ libgd \ ++ libmpdclient \ ++ libmysqlclient \ ++ libncurses \ ++ libnmeap \ ++ libsqlite3 \ ++ libvncserver \ ++ ppp \ ++ serdisplib \ ++ st2205tool \ ++# libftdi \ ++# libX11 \ ++# python \ ++ ++PKG_CONFIG_DEPENDS:= \ ++ $(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \ ++ $(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/lcd4linux/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ MAINTAINER:=Jonathan McCrohan ++ TITLE:=LCD display utility ++ URL:=http://lcd4linux.bulix.org/ ++endef ++ ++define Package/lcd4linux/Default/description ++ LCD4Linux is a small program that grabs information from the kernel and ++ some subsystems and displays it on an external liquid crystal display. ++endef ++ ++ ++define Package/lcd4linux-custom ++$(call Package/lcd4linux/Default) ++ DEPENDS:= \ ++ +LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \ ++ +LCD4LINUX_CUSTOM_NEEDS_libdpf:libdpf \ ++ +LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \ ++ $(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \ ++ +LCD4LINUX_CUSTOM_NEEDS_libjpeg:libjpeg \ ++ +LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \ ++ +LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \ ++ +LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \ ++ +LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \ ++ +LCD4LINUX_CUSTOM_NEEDS_libusb:libusb-compat \ ++ +LCD4LINUX_CUSTOM_NEEDS_libvncserver:libvncserver \ ++ +LCD4LINUX_CUSTOM_NEEDS_serdisplib:serdisplib \ ++ +LCD4LINUX_CUSTOM_NEEDS_st2205tool:st2205tool \ ++# +LCD4LINUX_CUSTOM_NEEDS_libftdi:libftdi \ ++# +LCD4LINUX_CUSTOM_NEEDS_libX11:libX11 \ ++# +LCD4LINUX_CUSTOM_NEEDS_python:python ++ MENU:=1 ++ PROVIDES:=lcd4linux ++ VARIANT=custom ++endef ++ ++define Package/lcd4linux-custom/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++define Package/lcd4linux-custom/description ++$(call Package/lcd4linux/Default/description) ++ . ++ This package contains a customized version of LCD4Linux. ++endef ++ ++ ++define Package/lcd4linux-full ++$(call Package/lcd4linux/Default) ++ DEPENDS:= @DEVEL \ ++ +libdbus \ ++ +libdpf \ ++ +libgd \ ++ $(if $(ICONV_FULL),+libiconv-full) \ ++ +libmpdclient \ ++ +libmysqlclient \ ++ +libncurses \ ++ +libsqlite3 \ ++ +libusb-compat \ ++ +libvncserver \ ++ +serdisplib \ ++ +st2205tool \ ++# +libftdi \ ++# +libX11 \ ++# +python ++ PROVIDES:=lcd4linux ++ VARIANT=full ++endef ++ ++define Package/lcd4linux-full/description ++$(call Package/lcd4linux/Default/description) ++ . ++ This package contains a version of LCD4Linux built with all supported ++ drivers and plugins. ++endef ++ ++ ++CONFIGURE_ARGS+= \ ++ --disable-rpath \ ++ ++EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++ifeq ($(BUILD_VARIANT),custom) ++ ++ LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \ ++ $(if $(CONFIG_LCD4LINUX_CUSTOM_DRIVER_$(c)),$(c),) \ ++ )) ++ ifeq ($(LCD4LINUX_CUSTOM_DRIVERS),) ++ LCD4LINUX_CUSTOM_DRIVERS:=Sample ++ endif ++ ++ LCD4LINUX_CUSTOM_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \ ++ $(if $(CONFIG_LCD4LINUX_CUSTOM_PLUGIN_$(c)),$(c)) \ ++ )) ++ ifeq ($(LCD4LINUX_CUSTOM_PLUGINS),) ++ LCD4LINUX_CUSTOM_PLUGINS:=sample ++ endif ++ ++ CONFIGURE_ARGS+= \ ++ --with-drivers="$(LCD4LINUX_CUSTOM_DRIVERS)" \ ++ --with-plugins="$(LCD4LINUX_CUSTOM_PLUGINS)" \ ++ ++ ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libiconv),) ++ CONFIGURE_ARGS+= --with-libiconv-prefix="$(ICONV_PREFIX)" ++ else ++ CONFIGURE_ARGS+= --without-libiconv-prefix ++ endif ++ ++ ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libmysqlclient),) ++ EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql ++ endif ++ ++# ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_python),) ++# CONFIGURE_ARGS+= --with-python ++# else ++ CONFIGURE_ARGS+= --without-python ++# endif ++ ++# ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libX11),) ++# CONFIGURE_ARGS+= --with-x ++# else ++ CONFIGURE_ARGS+= --without-x ++# endif ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),full) ++ ++ LCD4LINUX_FULL_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \ ++ $(c) \ ++ )) ++ ++ LCD4LINUX_FULL_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \ ++ $(c) \ ++ )) ++ ++ CONFIGURE_ARGS+= \ ++ --with-drivers="$(LCD4LINUX_FULL_DRIVERS)" \ ++ --with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \ ++ --with-libiconv-prefix="$(ICONV_PREFIX)" \ ++ --without-python \ ++ --without-x \ ++ ++ EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql ++ ++endif ++ ++ ++define Package/lcd4linux/conffiles ++/etc/lcd4linux.conf ++endef ++ ++define Package/lcd4linux/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/lcd4linux $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/lcd4linux.conf.sample $(1)/etc/lcd4linux.conf ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/lcd4linux.init $(1)/etc/init.d/lcd4linux ++ $(SED) "s|^\(Display 'GLCD2USB'\)|#\1|g" \ ++ -e "s|^\(Layout 'TestLayer'\)|#\1|g" \ ++ -e "s|^#\(Display 'Image'\)|\1|g" \ ++ -e "s|^#\(Layout 'Default'\)|\1|g" \ ++ $(1)/etc/lcd4linux.conf ++endef ++ ++Package/lcd4linux-custom/conffiles = $(Package/lcd4linux/conffiles) ++Package/lcd4linux-custom/install = $(Package/lcd4linux/install) ++ ++Package/lcd4linux-full/conffiles = $(Package/lcd4linux/conffiles) ++Package/lcd4linux-full/install = $(Package/lcd4linux/install) ++ ++$(eval $(call BuildPackage,lcd4linux-custom)) ++$(eval $(call BuildPackage,lcd4linux-full)) +diff --git a/feeds/packages/utils/lcd4linux/files/.svn/entries b/feeds/packages/utils/lcd4linux/files/.svn/entries +new file mode 100644 +index 0000000..e7a9194 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lcd4linux/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:37.862974Z ++28951 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lcd4linux.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++21a585e4a11cae461b89438393e0aeca ++2011-11-11T15:46:37.862974Z ++28951 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++210 ++ +diff --git a/feeds/packages/utils/lcd4linux/files/.svn/text-base/lcd4linux.init.svn-base b/feeds/packages/utils/lcd4linux/files/.svn/text-base/lcd4linux.init.svn-base +new file mode 100644 +index 0000000..ec56a09 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/files/.svn/text-base/lcd4linux.init.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=98 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/bin/lcd4linux -o /tmp/lcd4linux.png -q ++} ++ ++stop() { ++ service_stop /usr/bin/lcd4linux ++} ++ +diff --git a/feeds/packages/utils/lcd4linux/files/lcd4linux.init b/feeds/packages/utils/lcd4linux/files/lcd4linux.init +new file mode 100644 +index 0000000..ec56a09 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/files/lcd4linux.init +@@ -0,0 +1,15 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2007-2011 OpenWrt.org ++ ++START=98 ++ ++SERVICE_USE_PID=1 ++ ++start() { ++ service_start /usr/bin/lcd4linux -o /tmp/lcd4linux.png -q ++} ++ ++stop() { ++ service_stop /usr/bin/lcd4linux ++} ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/entries b/feeds/packages/utils/lcd4linux/patches/.svn/entries +new file mode 100644 +index 0000000..9a74eea +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/entries +@@ -0,0 +1,334 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lcd4linux/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-12T08:13:22.398431Z ++33136 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-drv_RouterBoard.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a689c01caf8387ddf08dba3ca6c48040 ++2012-02-08T16:39:18.601022Z ++30380 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++212 ++ ++150-addlibmpdclient.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++01855b71d24304098bf5a9957f47a90f ++2012-02-08T16:39:18.601022Z ++30380 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++78059 ++ ++172-add-TEW673GRU-driver.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++dbbf20407938f3f5386d1a93d5f526b9 ++2012-08-12T08:13:22.398431Z ++33136 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++12962 ++ ++110-uclibc-logarithm-fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++f6f7e0244c96fe559db5f0fdeabcb8b0 ++2012-02-08T16:39:18.601022Z ++30380 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++427 ++ ++120-remove-as-needed-linker-option.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++11f40cdb3b9b08e3bc297c80a0b6e515 ++2012-08-12T08:13:19.600587Z ++33134 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++386 ++ ++170-add-generic-spidev-driver.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++9779dc8ac58eafffe0ca6112a68dfc23 ++2012-08-12T08:13:22.398431Z ++33136 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5330 ++ ++160-uinput_defs.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++be2e589e618d9987fde14f84635a4e2a ++2012-02-08T16:39:18.601022Z ++30380 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++575 ++ ++140-no_repnop_T6963.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++f2077cd7afe7e5ac49177fe97340e922 ++2012-05-08T02:03:14.337793Z ++31648 ++jmccrohan ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++441 ++ ++171-allow-to-specify-drv_generic_graphic_real_clear.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++c7f86068c3e621f800d646e9c88d11ac ++2012-02-08T16:39:20.313304Z ++30381 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1425 ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/prop-base/100-drv_RouterBoard.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/prop-base/100-drv_RouterBoard.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/prop-base/100-drv_RouterBoard.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/100-drv_RouterBoard.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/100-drv_RouterBoard.patch.svn-base +new file mode 100644 +index 0000000..9780f5a +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/100-drv_RouterBoard.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/drv_RouterBoard.c +++++ b/drv_RouterBoard.c ++@@ -106,7 +106,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include ++ ++ #include "debug.h" ++ #include "cfg.h" +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/110-uclibc-logarithm-fix.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/110-uclibc-logarithm-fix.patch.svn-base +new file mode 100644 +index 0000000..8f6d861 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/110-uclibc-logarithm-fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/plugin_netinfo.c +++++ b/plugin_netinfo.c ++@@ -264,7 +264,7 @@ static void my_netmask_short(RESULT * re ++ sin = get_netmask(arg1); ++ if (NULL != sin) { ++ logval = (long double) (get_netmask(arg1)->sin_addr.s_addr); ++- netlen = (int) rint(log2l(logval) / log2l(2.0)); +++ netlen = (int) rint(log2f(logval) / log2f(2.0)); ++ qprintf(value, sizeof(value), "/%d", netlen); ++ } else { ++ qprintf(value, sizeof(value), "/?"); +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/120-remove-as-needed-linker-option.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/120-remove-as-needed-linker-option.patch.svn-base +new file mode 100644 +index 0000000..b5e56fe +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/120-remove-as-needed-linker-option.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS=-I m4 ++ # use this for lots of warnings ++ #AM_CFLAGS = -D_GNU_SOURCE -std=c99 -m64 -Wall -W -pedantic -Wno-variadic-macros -fno-strict-aliasing ++ ++-lcd4linux_LDFLAGS ="-Wl,--as-needed" +++lcd4linux_LDFLAGS = ++ lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@ ++ lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@ ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/140-no_repnop_T6963.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/140-no_repnop_T6963.patch.svn-base +new file mode 100644 +index 0000000..85be2c3 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/140-no_repnop_T6963.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/drv_T6963.c +++++ b/drv_T6963.c ++@@ -114,7 +114,9 @@ static void drv_T6_status1(void) ++ /* wait for STA0=1 and STA1=1 */ ++ n = 0; ++ do { +++#if 0 ++ rep_nop(); +++#endif ++ if (++n > 1000) { ++ debug("hang in status1"); ++ bug = 1; ++@@ -150,7 +152,9 @@ static void drv_T6_status2(void) ++ /* wait for STA3=1 */ ++ n = 0; ++ do { +++#if 0 ++ rep_nop(); +++#endif ++ if (++n > 1000) { ++ debug("hang in status2"); ++ bug = 1; +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/150-addlibmpdclient.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/150-addlibmpdclient.patch.svn-base +new file mode 100644 +index 0000000..0e51f67 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/150-addlibmpdclient.patch.svn-base +@@ -0,0 +1,2624 @@ ++--- /dev/null +++++ b/libmpdclient.c ++@@ -0,0 +1,1957 @@ +++/* libmpdclient +++ (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com) +++ This project's homepage is: http://www.musicpd.org +++ +++ Redistribution and use in source and binary forms, with or without +++ modification, are permitted provided that the following conditions +++ are met: +++ +++ - Redistributions of source code must retain the above copyright +++ notice, this list of conditions and the following disclaimer. +++ +++ - 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. +++ +++ - Neither the name of the Music Player Daemon 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 COPYRIGHT HOLDERS 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 FOUNDATION 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. +++*/ +++ +++#include "libmpdclient.h" +++ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#ifdef WIN32 +++# include +++# include +++#else +++# include +++# include +++# include +++# include +++#endif +++ +++/* (bits+1)/3 (plus the sign character) */ +++#define INTLEN ((sizeof(int) * CHAR_BIT + 1) / 3 + 1) +++#define LONGLONGLEN ((sizeof(long long) * CHAR_BIT + 1) / 3 + 1) +++ +++#define COMMAND_LIST 1 +++#define COMMAND_LIST_OK 2 +++ +++#ifndef MPD_NO_GAI +++# ifdef AI_ADDRCONFIG +++# define MPD_HAVE_GAI +++# endif +++#endif +++ +++#ifndef MSG_DONTWAIT +++# define MSG_DONTWAIT 0 +++#endif +++ +++#ifdef WIN32 +++# define SELECT_ERRNO_IGNORE (errno == WSAEINTR || errno == WSAEINPROGRESS) +++# define SENDRECV_ERRNO_IGNORE SELECT_ERRNO_IGNORE +++#else +++# define SELECT_ERRNO_IGNORE (errno == EINTR) +++# define SENDRECV_ERRNO_IGNORE (errno == EINTR || errno == EAGAIN) +++# define winsock_dll_error(c) 0 +++# define closesocket(s) close(s) +++# define WSACleanup() do { /* nothing */ } while (0) +++#endif +++ +++#ifdef WIN32 +++static int winsock_dll_error(mpd_Connection * connection) +++{ +++ WSADATA wsaData; +++ if ((WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0 || LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) { +++ strcpy(connection->errorStr, "Could not find usable WinSock DLL."); +++ connection->error = MPD_ERROR_SYSTEM; +++ return 1; +++ } +++ return 0; +++} +++ +++static int do_connect_fail(mpd_Connection * connection, const struct sockaddr *serv_addr, int addrlen) +++{ +++ int iMode = 1; /* 0 = blocking, else non-blocking */ +++ ioctlsocket(connection->sock, FIONBIO, (u_long FAR *) & iMode); +++ return (connect(connection->sock, serv_addr, addrlen) == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK); +++} +++#else /* !WIN32 (sane operating systems) */ +++static int do_connect_fail(mpd_Connection * connection, const struct sockaddr *serv_addr, int addrlen) +++{ +++ int flags = fcntl(connection->sock, F_GETFL, 0); +++ fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK); +++ return (connect(connection->sock, serv_addr, addrlen) < 0 && errno != EINPROGRESS); +++} +++#endif /* !WIN32 */ +++ +++#ifdef MPD_HAVE_GAI +++static int mpd_connect(mpd_Connection * connection, const char *host, int port, float timeout) +++{ +++ int error; +++ char service[INTLEN + 1]; +++ struct addrinfo hints; +++ struct addrinfo *res = NULL; +++ struct addrinfo *addrinfo = NULL; +++ +++ /** +++ * Setup hints +++ */ +++ hints.ai_flags = AI_ADDRCONFIG; +++ hints.ai_family = PF_UNSPEC; +++ hints.ai_socktype = SOCK_STREAM; +++ hints.ai_protocol = IPPROTO_TCP; +++ hints.ai_addrlen = 0; +++ hints.ai_addr = NULL; +++ hints.ai_canonname = NULL; +++ hints.ai_next = NULL; +++ +++ snprintf(service, sizeof(service), "%i", port); +++ +++ error = getaddrinfo(host, service, &hints, &addrinfo); +++ +++ if (error) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "host \"%s\" not found: %s", host, gai_strerror(error)); +++ connection->error = MPD_ERROR_UNKHOST; +++ return -1; +++ } +++ +++ for (res = addrinfo; res; res = res->ai_next) { +++ /* create socket */ +++ connection->sock = socket(res->ai_family, SOCK_STREAM, res->ai_protocol); +++ if (connection->sock < 0) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "problems creating socket: %s", strerror(errno)); +++ connection->error = MPD_ERROR_SYSTEM; +++ freeaddrinfo(addrinfo); +++ return -1; +++ } +++ +++ mpd_setConnectionTimeout(connection, timeout); +++ +++ /* connect stuff */ +++ if (do_connect_fail(connection, res->ai_addr, res->ai_addrlen)) { +++ /* try the next address family */ +++ closesocket(connection->sock); +++ connection->sock = -1; +++ continue; +++ } +++ } +++ +++ freeaddrinfo(addrinfo); +++ +++ if (connection->sock < 0) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "problems connecting to \"%s\" on port %i: %s", host, port, strerror(errno)); +++ connection->error = MPD_ERROR_CONNPORT; +++ +++ return -1; +++ } +++ +++ return 0; +++} +++#else /* !MPD_HAVE_GAI */ +++static int mpd_connect(mpd_Connection * connection, const char *host, int port, float timeout) +++{ +++ struct hostent *he; +++ struct sockaddr *dest; +++ int destlen; +++ struct sockaddr_in sin; +++ +++ if (!(he = gethostbyname(host))) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "host \"%s\" not found", host); +++ connection->error = MPD_ERROR_UNKHOST; +++ return -1; +++ } +++ +++ memset(&sin, 0, sizeof(struct sockaddr_in)); +++ /*dest.sin_family = he->h_addrtype; */ +++ sin.sin_family = AF_INET; +++ sin.sin_port = htons(port); +++ +++ switch (he->h_addrtype) { +++ case AF_INET: +++ memcpy((char *) &sin.sin_addr.s_addr, (char *) he->h_addr, he->h_length); +++ dest = (struct sockaddr *) &sin; +++ destlen = sizeof(struct sockaddr_in); +++ break; +++ default: +++ strcpy(connection->errorStr, "address type is not IPv4"); +++ connection->error = MPD_ERROR_SYSTEM; +++ return -1; +++ break; +++ } +++ +++ if ((connection->sock = socket(dest->sa_family, SOCK_STREAM, 0)) < 0) { +++ strcpy(connection->errorStr, "problems creating socket"); +++ connection->error = MPD_ERROR_SYSTEM; +++ return -1; +++ } +++ +++ mpd_setConnectionTimeout(connection, timeout); +++ +++ /* connect stuff */ +++ if (do_connect_fail(connection, dest, destlen)) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "problems connecting to \"%s\" on port" " %i", host, port); +++ connection->error = MPD_ERROR_CONNPORT; +++ return -1; +++ } +++ +++ return 0; +++} +++#endif /* !MPD_HAVE_GAI */ +++ +++char *mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES] = { +++ "Artist", +++ "Album", +++ "Title", +++ "Track", +++ "Name", +++ "Genre", +++ "Date", +++ "Composer", +++ "Performer", +++ "Comment", +++ "Disc", +++ "Filename", +++ "Any" +++}; +++ +++static char *mpd_sanitizeArg(const char *arg) +++{ +++ size_t i; +++ char *ret; +++ register const char *c; +++ register char *rc; +++ +++ /* instead of counting in that loop above, just +++ * use a bit more memory and half running time +++ */ +++ ret = malloc(strlen(arg) * 2 + 1); +++ +++ c = arg; +++ rc = ret; +++ for (i = strlen(arg) + 1; i != 0; --i) { +++ if (*c == '"' || *c == '\\') +++ *rc++ = '\\'; +++ *(rc++) = *(c++); +++ } +++ +++ return ret; +++} +++ +++static mpd_ReturnElement *mpd_newReturnElement(const char *name, const char *value) +++{ +++ mpd_ReturnElement *ret = malloc(sizeof(mpd_ReturnElement)); +++ +++ ret->name = strdup(name); +++ ret->value = strdup(value); +++ +++ return ret; +++} +++ +++static void mpd_freeReturnElement(mpd_ReturnElement * re) +++{ +++ free(re->name); +++ free(re->value); +++ free(re); +++} +++ +++void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout) +++{ +++ connection->timeout.tv_sec = (int) timeout; +++ connection->timeout.tv_usec = (int) (timeout * 1e6 - connection->timeout.tv_sec * 1000000 + 0.5); +++} +++ +++static int mpd_parseWelcome(mpd_Connection * connection, const char *host, int port, char *rt, char *output) +++{ +++ char *tmp; +++ char *test; +++ int i; +++ +++ if (strncmp(output, MPD_WELCOME_MESSAGE, strlen(MPD_WELCOME_MESSAGE))) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "mpd not running on port %i on host \"%s\"", port, host); +++ connection->error = MPD_ERROR_NOTMPD; +++ return 1; +++ } +++ +++ tmp = &output[strlen(MPD_WELCOME_MESSAGE)]; +++ +++ for (i = 0; i < 3; i++) { +++ if (tmp) +++ connection->version[i] = strtol(tmp, &test, 10); +++ +++ if (!tmp || (test[0] != '.' && test[0] != '\0')) { +++ snprintf(connection->errorStr, +++ MPD_ERRORSTR_MAX_LENGTH, +++ "error parsing version number at " "\"%s\"", &output[strlen(MPD_WELCOME_MESSAGE)]); +++ connection->error = MPD_ERROR_NOTMPD; +++ return 1; +++ } +++ tmp = ++test; +++ } +++ +++ return 0; +++} +++ +++mpd_Connection *mpd_newConnection(const char *host, int port, float timeout) +++{ +++ int err; +++ char *rt; +++ char *output = NULL; +++ mpd_Connection *connection = malloc(sizeof(mpd_Connection)); +++ struct timeval tv; +++ fd_set fds; +++ strcpy(connection->buffer, ""); +++ connection->buflen = 0; +++ connection->bufstart = 0; +++ strcpy(connection->errorStr, ""); +++ connection->error = 0; +++ connection->doneProcessing = 0; +++ connection->commandList = 0; +++ connection->listOks = 0; +++ connection->doneListOk = 0; +++ connection->returnElement = NULL; +++ connection->request = NULL; +++ +++ if (winsock_dll_error(connection)) +++ return connection; +++ +++ if (mpd_connect(connection, host, port, timeout) < 0) +++ return connection; +++ +++ while (!(rt = strstr(connection->buffer, "\n"))) { +++ tv.tv_sec = connection->timeout.tv_sec; +++ tv.tv_usec = connection->timeout.tv_usec; +++ FD_ZERO(&fds); +++ FD_SET(connection->sock, &fds); +++ if ((err = select(connection->sock + 1, &fds, NULL, NULL, &tv)) == 1) { +++ int readed; +++ readed = recv(connection->sock, +++ &(connection->buffer[connection->buflen]), MPD_BUFFER_MAX_LENGTH - connection->buflen, 0); +++ if (readed <= 0) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "problems getting a response from" " \"%s\" on port %i : %s", host, port, strerror(errno)); +++ connection->error = MPD_ERROR_NORESPONSE; +++ return connection; +++ } +++ connection->buflen += readed; +++ connection->buffer[connection->buflen] = '\0'; +++ } else if (err < 0) { +++ if (SELECT_ERRNO_IGNORE) +++ continue; +++ snprintf(connection->errorStr, +++ MPD_ERRORSTR_MAX_LENGTH, "problems connecting to \"%s\" on port" " %i", host, port); +++ connection->error = MPD_ERROR_CONNPORT; +++ return connection; +++ } else { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "timeout in attempting to get a response from" " \"%s\" on port %i", host, port); +++ connection->error = MPD_ERROR_NORESPONSE; +++ return connection; +++ } +++ } +++ +++ *rt = '\0'; +++ output = strdup(connection->buffer); +++ strcpy(connection->buffer, rt + 1); +++ connection->buflen = strlen(connection->buffer); +++ +++ if (mpd_parseWelcome(connection, host, port, rt, output) == 0) +++ connection->doneProcessing = 1; +++ +++ free(output); +++ +++ return connection; +++} +++ +++void mpd_clearError(mpd_Connection * connection) +++{ +++ connection->error = 0; +++ connection->errorStr[0] = '\0'; +++} +++ +++void mpd_closeConnection(mpd_Connection * connection) +++{ +++ closesocket(connection->sock); +++ if (connection->returnElement) +++ free(connection->returnElement); +++ if (connection->request) +++ free(connection->request); +++ free(connection); +++ WSACleanup(); +++} +++ +++static void mpd_executeCommand(mpd_Connection * connection, char *command) +++{ +++ int ret; +++ struct timeval tv; +++ fd_set fds; +++ char *commandPtr = command; +++ int commandLen = strlen(command); +++ +++ if (!connection->doneProcessing && !connection->commandList) { +++ strcpy(connection->errorStr, "not done processing current command"); +++ connection->error = 1; +++ return; +++ } +++ +++ mpd_clearError(connection); +++ +++ FD_ZERO(&fds); +++ FD_SET(connection->sock, &fds); +++ tv.tv_sec = connection->timeout.tv_sec; +++ tv.tv_usec = connection->timeout.tv_usec; +++ +++ while ((ret = select(connection->sock + 1, NULL, &fds, NULL, &tv) == 1) || (ret == -1 && SELECT_ERRNO_IGNORE)) { +++ ret = send(connection->sock, commandPtr, commandLen, MSG_DONTWAIT); +++ if (ret <= 0) { +++ if (SENDRECV_ERRNO_IGNORE) +++ continue; +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "problems giving command \"%s\"", command); +++ connection->error = MPD_ERROR_SENDING; +++ return; +++ } else { +++ commandPtr += ret; +++ commandLen -= ret; +++ } +++ +++ if (commandLen <= 0) +++ break; +++ } +++ +++ if (commandLen > 0) { +++ perror(""); +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "timeout sending command \"%s\"", command); +++ connection->error = MPD_ERROR_TIMEOUT; +++ return; +++ } +++ +++ if (!connection->commandList) +++ connection->doneProcessing = 0; +++ else if (connection->commandList == COMMAND_LIST_OK) { +++ connection->listOks++; +++ } +++} +++ +++static void mpd_getNextReturnElement(mpd_Connection * connection) +++{ +++ char *output = NULL; +++ char *rt = NULL; +++ char *name = NULL; +++ char *value = NULL; +++ fd_set fds; +++ struct timeval tv; +++ char *tok = NULL; +++ int readed; +++ char *bufferCheck = NULL; +++ int err; +++ int pos; +++ +++ if (connection->returnElement) +++ mpd_freeReturnElement(connection->returnElement); +++ connection->returnElement = NULL; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ strcpy(connection->errorStr, "already done processing current command"); +++ connection->error = 1; +++ return; +++ } +++ +++ bufferCheck = connection->buffer + connection->bufstart; +++ while (connection->bufstart >= connection->buflen || !(rt = strchr(bufferCheck, '\n'))) { +++ if (connection->buflen >= MPD_BUFFER_MAX_LENGTH) { +++ memmove(connection->buffer, +++ connection->buffer + connection->bufstart, connection->buflen - connection->bufstart + 1); +++ connection->buflen -= connection->bufstart; +++ connection->bufstart = 0; +++ } +++ if (connection->buflen >= MPD_BUFFER_MAX_LENGTH) { +++ strcpy(connection->errorStr, "buffer overrun"); +++ connection->error = MPD_ERROR_BUFFEROVERRUN; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ bufferCheck = connection->buffer + connection->buflen; +++ tv.tv_sec = connection->timeout.tv_sec; +++ tv.tv_usec = connection->timeout.tv_usec; +++ FD_ZERO(&fds); +++ FD_SET(connection->sock, &fds); +++ if ((err = select(connection->sock + 1, &fds, NULL, NULL, &tv) == 1)) { +++ readed = recv(connection->sock, +++ connection->buffer + connection->buflen, +++ MPD_BUFFER_MAX_LENGTH - connection->buflen, MSG_DONTWAIT); +++ if (readed < 0 && SENDRECV_ERRNO_IGNORE) { +++ continue; +++ } +++ if (readed <= 0) { +++ strcpy(connection->errorStr, "connection" " closed"); +++ connection->error = MPD_ERROR_CONNCLOSED; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ connection->buflen += readed; +++ connection->buffer[connection->buflen] = '\0'; +++ } else if (err < 0 && SELECT_ERRNO_IGNORE) +++ continue; +++ else { +++ strcpy(connection->errorStr, "connection timeout"); +++ connection->error = MPD_ERROR_TIMEOUT; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ } +++ +++ *rt = '\0'; +++ output = connection->buffer + connection->bufstart; +++ connection->bufstart = rt - connection->buffer + 1; +++ +++ if (strcmp(output, "OK") == 0) { +++ if (connection->listOks > 0) { +++ strcpy(connection->errorStr, "expected more list_OK's"); +++ connection->error = 1; +++ } +++ connection->listOks = 0; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ +++ if (strcmp(output, "list_OK") == 0) { +++ if (!connection->listOks) { +++ strcpy(connection->errorStr, "got an unexpected list_OK"); +++ connection->error = 1; +++ } else { +++ connection->doneListOk = 1; +++ connection->listOks--; +++ } +++ return; +++ } +++ +++ if (strncmp(output, "ACK", strlen("ACK")) == 0) { +++ char *test; +++ char *needle; +++ int val; +++ +++ strcpy(connection->errorStr, output); +++ connection->error = MPD_ERROR_ACK; +++ connection->errorCode = MPD_ACK_ERROR_UNK; +++ connection->errorAt = MPD_ERROR_AT_UNK; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ +++ needle = strchr(output, '['); +++ if (!needle) +++ return; +++ val = strtol(needle + 1, &test, 10); +++ if (*test != '@') +++ return; +++ connection->errorCode = val; +++ val = strtol(test + 1, &test, 10); +++ if (*test != ']') +++ return; +++ connection->errorAt = val; +++ return; +++ } +++ +++ tok = strchr(output, ':'); +++ if (!tok) +++ return; +++ pos = tok - output; +++ value = ++tok; +++ name = output; +++ name[pos] = '\0'; +++ +++ if (value[0] == ' ') { +++ connection->returnElement = mpd_newReturnElement(name, &(value[1])); +++ } else { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "error parsing: %s:%s", name, value); +++ connection->error = 1; +++ } +++} +++ +++void mpd_finishCommand(mpd_Connection * connection) +++{ +++ while (!connection->doneProcessing) { +++ if (connection->doneListOk) +++ connection->doneListOk = 0; +++ mpd_getNextReturnElement(connection); +++ } +++} +++ +++static void mpd_finishListOkCommand(mpd_Connection * connection) +++{ +++ while (!connection->doneProcessing && connection->listOks && !connection->doneListOk) { +++ mpd_getNextReturnElement(connection); +++ } +++} +++ +++int mpd_nextListOkCommand(mpd_Connection * connection) +++{ +++ mpd_finishListOkCommand(connection); +++ if (!connection->doneProcessing) +++ connection->doneListOk = 0; +++ if (connection->listOks == 0 || connection->doneProcessing) +++ return -1; +++ return 0; +++} +++ +++void mpd_sendStatusCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "status\n"); +++} +++ +++mpd_Status *mpd_getStatus(mpd_Connection * connection) +++{ +++ mpd_Status *status; +++ +++ /*mpd_executeCommand(connection,"status\n"); +++ +++ if(connection->error) return NULL; */ +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ status = malloc(sizeof(mpd_Status)); +++ status->volume = -1; +++ status->repeat = 0; +++ status->random = 0; +++ status->playlist = -1; +++ status->playlistLength = -1; +++ status->state = -1; +++ status->song = 0; +++ status->songid = 0; +++ status->elapsedTime = 0; +++ status->totalTime = 0; +++ status->bitRate = 0; +++ status->sampleRate = 0; +++ status->bits = 0; +++ status->channels = 0; +++ status->crossfade = -1; +++ status->error = NULL; +++ status->updatingDb = 0; +++ +++ if (connection->error) { +++ free(status); +++ return NULL; +++ } +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ if (strcmp(re->name, "volume") == 0) { +++ status->volume = atoi(re->value); +++ } else if (strcmp(re->name, "repeat") == 0) { +++ status->repeat = atoi(re->value); +++ } else if (strcmp(re->name, "random") == 0) { +++ status->random = atoi(re->value); +++ } else if (strcmp(re->name, "playlist") == 0) { +++ status->playlist = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "playlistlength") == 0) { +++ status->playlistLength = atoi(re->value); +++ } else if (strcmp(re->name, "bitrate") == 0) { +++ status->bitRate = atoi(re->value); +++ } else if (strcmp(re->name, "state") == 0) { +++ if (strcmp(re->value, "play") == 0) { +++ status->state = MPD_STATUS_STATE_PLAY; +++ } else if (strcmp(re->value, "stop") == 0) { +++ status->state = MPD_STATUS_STATE_STOP; +++ } else if (strcmp(re->value, "pause") == 0) { +++ status->state = MPD_STATUS_STATE_PAUSE; +++ } else { +++ status->state = MPD_STATUS_STATE_UNKNOWN; +++ } +++ } else if (strcmp(re->name, "song") == 0) { +++ status->song = atoi(re->value); +++ } else if (strcmp(re->name, "songid") == 0) { +++ status->songid = atoi(re->value); +++ } else if (strcmp(re->name, "time") == 0) { +++ char *tok = strchr(re->value, ':'); +++ /* the second strchr below is a safety check */ +++ if (tok && (strchr(tok, 0) > (tok + 1))) { +++ /* atoi stops at the first non-[0-9] char: */ +++ status->elapsedTime = atoi(re->value); +++ status->totalTime = atoi(tok + 1); +++ } +++ } else if (strcmp(re->name, "error") == 0) { +++ status->error = strdup(re->value); +++ } else if (strcmp(re->name, "xfade") == 0) { +++ status->crossfade = atoi(re->value); +++ } else if (strcmp(re->name, "updating_db") == 0) { +++ status->updatingDb = atoi(re->value); +++ } else if (strcmp(re->name, "audio") == 0) { +++ char *tok = strchr(re->value, ':'); +++ if (tok && (strchr(tok, 0) > (tok + 1))) { +++ status->sampleRate = atoi(re->value); +++ status->bits = atoi(++tok); +++ tok = strchr(tok, ':'); +++ if (tok && (strchr(tok, 0) > (tok + 1))) +++ status->channels = atoi(tok + 1); +++ } +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(status); +++ return NULL; +++ } +++ } +++ +++ if (connection->error) { +++ free(status); +++ return NULL; +++ } else if (status->state < 0) { +++ strcpy(connection->errorStr, "state not found"); +++ connection->error = 1; +++ free(status); +++ return NULL; +++ } +++ +++ return status; +++} +++ +++void mpd_freeStatus(mpd_Status * status) +++{ +++ if (status->error) +++ free(status->error); +++ free(status); +++} +++ +++void mpd_sendStatsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "stats\n"); +++} +++ +++mpd_Stats *mpd_getStats(mpd_Connection * connection) +++{ +++ mpd_Stats *stats; +++ +++ /*mpd_executeCommand(connection,"stats\n"); +++ +++ if(connection->error) return NULL; */ +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ stats = malloc(sizeof(mpd_Stats)); +++ stats->numberOfArtists = 0; +++ stats->numberOfAlbums = 0; +++ stats->numberOfSongs = 0; +++ stats->uptime = 0; +++ stats->dbUpdateTime = 0; +++ stats->playTime = 0; +++ stats->dbPlayTime = 0; +++ +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ if (strcmp(re->name, "artists") == 0) { +++ stats->numberOfArtists = atoi(re->value); +++ } else if (strcmp(re->name, "albums") == 0) { +++ stats->numberOfAlbums = atoi(re->value); +++ } else if (strcmp(re->name, "songs") == 0) { +++ stats->numberOfSongs = atoi(re->value); +++ } else if (strcmp(re->name, "uptime") == 0) { +++ stats->uptime = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "db_update") == 0) { +++ stats->dbUpdateTime = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "playtime") == 0) { +++ stats->playTime = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "db_playtime") == 0) { +++ stats->dbPlayTime = strtol(re->value, NULL, 10); +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ } +++ +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ +++ return stats; +++} +++ +++void mpd_freeStats(mpd_Stats * stats) +++{ +++ free(stats); +++} +++ +++mpd_SearchStats *mpd_getSearchStats(mpd_Connection * connection) +++{ +++ mpd_SearchStats *stats; +++ mpd_ReturnElement *re; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ if (connection->error) +++ return NULL; +++ +++ stats = malloc(sizeof(mpd_SearchStats)); +++ stats->numberOfSongs = 0; +++ stats->playTime = 0; +++ +++ while (connection->returnElement) { +++ re = connection->returnElement; +++ +++ if (strcmp(re->name, "songs") == 0) { +++ stats->numberOfSongs = atoi(re->value); +++ } else if (strcmp(re->name, "playtime") == 0) { +++ stats->playTime = strtol(re->value, NULL, 10); +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ } +++ +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ +++ return stats; +++} +++ +++void mpd_freeSearchStats(mpd_SearchStats * stats) +++{ +++ free(stats); +++} +++ +++static void mpd_initSong(mpd_Song * song) +++{ +++ song->file = NULL; +++ song->artist = NULL; +++ song->album = NULL; +++ song->track = NULL; +++ song->title = NULL; +++ song->name = NULL; +++ song->date = NULL; +++ /* added by Qball */ +++ song->genre = NULL; +++ song->composer = NULL; +++ song->performer = NULL; +++ song->disc = NULL; +++ song->comment = NULL; +++ +++ song->time = MPD_SONG_NO_TIME; +++ song->pos = MPD_SONG_NO_NUM; +++ song->id = MPD_SONG_NO_ID; +++} +++ +++static void mpd_finishSong(mpd_Song * song) +++{ +++ if (song->file) +++ free(song->file); +++ if (song->artist) +++ free(song->artist); +++ if (song->album) +++ free(song->album); +++ if (song->title) +++ free(song->title); +++ if (song->track) +++ free(song->track); +++ if (song->name) +++ free(song->name); +++ if (song->date) +++ free(song->date); +++ if (song->genre) +++ free(song->genre); +++ if (song->composer) +++ free(song->composer); +++ if (song->disc) +++ free(song->disc); +++ if (song->comment) +++ free(song->comment); +++} +++ +++mpd_Song *mpd_newSong(void) +++{ +++ mpd_Song *ret = malloc(sizeof(mpd_Song)); +++ +++ mpd_initSong(ret); +++ +++ return ret; +++} +++ +++void mpd_freeSong(mpd_Song * song) +++{ +++ mpd_finishSong(song); +++ free(song); +++} +++ +++mpd_Song *mpd_songDup(mpd_Song * song) +++{ +++ mpd_Song *ret = mpd_newSong(); +++ +++ if (song->file) +++ ret->file = strdup(song->file); +++ if (song->artist) +++ ret->artist = strdup(song->artist); +++ if (song->album) +++ ret->album = strdup(song->album); +++ if (song->title) +++ ret->title = strdup(song->title); +++ if (song->track) +++ ret->track = strdup(song->track); +++ if (song->name) +++ ret->name = strdup(song->name); +++ if (song->date) +++ ret->date = strdup(song->date); +++ if (song->genre) +++ ret->genre = strdup(song->genre); +++ if (song->composer) +++ ret->composer = strdup(song->composer); +++ if (song->disc) +++ ret->disc = strdup(song->disc); +++ if (song->comment) +++ ret->comment = strdup(song->comment); +++ ret->time = song->time; +++ ret->pos = song->pos; +++ ret->id = song->id; +++ +++ return ret; +++} +++ +++static void mpd_initDirectory(mpd_Directory * directory) +++{ +++ directory->path = NULL; +++} +++ +++static void mpd_finishDirectory(mpd_Directory * directory) +++{ +++ if (directory->path) +++ free(directory->path); +++} +++ +++mpd_Directory *mpd_newDirectory(void) +++{ +++ mpd_Directory *directory = malloc(sizeof(mpd_Directory));; +++ +++ mpd_initDirectory(directory); +++ +++ return directory; +++} +++ +++void mpd_freeDirectory(mpd_Directory * directory) +++{ +++ mpd_finishDirectory(directory); +++ +++ free(directory); +++} +++ +++mpd_Directory *mpd_directoryDup(mpd_Directory * directory) +++{ +++ mpd_Directory *ret = mpd_newDirectory(); +++ +++ if (directory->path) +++ ret->path = strdup(directory->path); +++ +++ return ret; +++} +++ +++static void mpd_initPlaylistFile(mpd_PlaylistFile * playlist) +++{ +++ playlist->path = NULL; +++} +++ +++static void mpd_finishPlaylistFile(mpd_PlaylistFile * playlist) +++{ +++ if (playlist->path) +++ free(playlist->path); +++} +++ +++mpd_PlaylistFile *mpd_newPlaylistFile(void) +++{ +++ mpd_PlaylistFile *playlist = malloc(sizeof(mpd_PlaylistFile)); +++ +++ mpd_initPlaylistFile(playlist); +++ +++ return playlist; +++} +++ +++void mpd_freePlaylistFile(mpd_PlaylistFile * playlist) +++{ +++ mpd_finishPlaylistFile(playlist); +++ free(playlist); +++} +++ +++mpd_PlaylistFile *mpd_playlistFileDup(mpd_PlaylistFile * playlist) +++{ +++ mpd_PlaylistFile *ret = mpd_newPlaylistFile(); +++ +++ if (playlist->path) +++ ret->path = strdup(playlist->path); +++ +++ return ret; +++} +++ +++static void mpd_initInfoEntity(mpd_InfoEntity * entity) +++{ +++ entity->info.directory = NULL; +++} +++ +++static void mpd_finishInfoEntity(mpd_InfoEntity * entity) +++{ +++ if (entity->info.directory) { +++ if (entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) { +++ mpd_freeDirectory(entity->info.directory); +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_SONG) { +++ mpd_freeSong(entity->info.song); +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) { +++ mpd_freePlaylistFile(entity->info.playlistFile); +++ } +++ } +++} +++ +++mpd_InfoEntity *mpd_newInfoEntity(void) +++{ +++ mpd_InfoEntity *entity = malloc(sizeof(mpd_InfoEntity)); +++ +++ mpd_initInfoEntity(entity); +++ +++ return entity; +++} +++ +++void mpd_freeInfoEntity(mpd_InfoEntity * entity) +++{ +++ mpd_finishInfoEntity(entity); +++ free(entity); +++} +++ +++static void mpd_sendInfoCommand(mpd_Connection * connection, char *command) +++{ +++ mpd_executeCommand(connection, command); +++} +++ +++mpd_InfoEntity *mpd_getNextInfoEntity(mpd_Connection * connection) +++{ +++ mpd_InfoEntity *entity = NULL; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ if (connection->returnElement) { +++ if (strcmp(connection->returnElement->name, "file") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_SONG; +++ entity->info.song = mpd_newSong(); +++ entity->info.song->file = strdup(connection->returnElement->value); +++ } else if (strcmp(connection->returnElement->name, "directory") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_DIRECTORY; +++ entity->info.directory = mpd_newDirectory(); +++ entity->info.directory->path = strdup(connection->returnElement->value); +++ } else if (strcmp(connection->returnElement->name, "playlist") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_PLAYLISTFILE; +++ entity->info.playlistFile = mpd_newPlaylistFile(); +++ entity->info.playlistFile->path = strdup(connection->returnElement->value); +++ } else if (strcmp(connection->returnElement->name, "cpos") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_SONG; +++ entity->info.song = mpd_newSong(); +++ entity->info.song->pos = atoi(connection->returnElement->value); +++ } else { +++ connection->error = 1; +++ strcpy(connection->errorStr, "problem parsing song info"); +++ return NULL; +++ } +++ } else +++ return NULL; +++ +++ mpd_getNextReturnElement(connection); +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ +++ if (strcmp(re->name, "file") == 0) +++ return entity; +++ else if (strcmp(re->name, "directory") == 0) +++ return entity; +++ else if (strcmp(re->name, "playlist") == 0) +++ return entity; +++ else if (strcmp(re->name, "cpos") == 0) +++ return entity; +++ +++ if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && strlen(re->value)) { +++ if (!entity->info.song->artist && strcmp(re->name, "Artist") == 0) { +++ entity->info.song->artist = strdup(re->value); +++ } else if (!entity->info.song->album && strcmp(re->name, "Album") == 0) { +++ entity->info.song->album = strdup(re->value); +++ } else if (!entity->info.song->title && strcmp(re->name, "Title") == 0) { +++ entity->info.song->title = strdup(re->value); +++ } else if (!entity->info.song->track && strcmp(re->name, "Track") == 0) { +++ entity->info.song->track = strdup(re->value); +++ } else if (!entity->info.song->name && strcmp(re->name, "Name") == 0) { +++ entity->info.song->name = strdup(re->value); +++ } else if (entity->info.song->time == MPD_SONG_NO_TIME && strcmp(re->name, "Time") == 0) { +++ entity->info.song->time = atoi(re->value); +++ } else if (entity->info.song->pos == MPD_SONG_NO_NUM && strcmp(re->name, "Pos") == 0) { +++ entity->info.song->pos = atoi(re->value); +++ } else if (entity->info.song->id == MPD_SONG_NO_ID && strcmp(re->name, "Id") == 0) { +++ entity->info.song->id = atoi(re->value); +++ } else if (!entity->info.song->date && strcmp(re->name, "Date") == 0) { +++ entity->info.song->date = strdup(re->value); +++ } else if (!entity->info.song->genre && strcmp(re->name, "Genre") == 0) { +++ entity->info.song->genre = strdup(re->value); +++ } else if (!entity->info.song->composer && strcmp(re->name, "Composer") == 0) { +++ entity->info.song->composer = strdup(re->value); +++ } else if (!entity->info.song->performer && strcmp(re->name, "Performer") == 0) { +++ entity->info.song->performer = strdup(re->value); +++ } else if (!entity->info.song->disc && strcmp(re->name, "Disc") == 0) { +++ entity->info.song->disc = strdup(re->value); +++ } else if (!entity->info.song->comment && strcmp(re->name, "Comment") == 0) { +++ entity->info.song->comment = strdup(re->value); +++ } +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) { +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) { +++ } +++ +++ mpd_getNextReturnElement(connection); +++ } +++ +++ return entity; +++} +++ +++static char *mpd_getNextReturnElementNamed(mpd_Connection * connection, const char *name) +++{ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ mpd_getNextReturnElement(connection); +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ +++ if (strcmp(re->name, name) == 0) +++ return strdup(re->value); +++ mpd_getNextReturnElement(connection); +++ } +++ +++ return NULL; +++} +++ +++char *mpd_getNextTag(mpd_Connection * connection, int type) +++{ +++ if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES || type == MPD_TAG_ITEM_ANY) +++ return NULL; +++ if (type == MPD_TAG_ITEM_FILENAME) +++ return mpd_getNextReturnElementNamed(connection, "file"); +++ return mpd_getNextReturnElementNamed(connection, mpdTagItemKeys[type]); +++} +++ +++char *mpd_getNextArtist(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "Artist"); +++} +++ +++char *mpd_getNextAlbum(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "Album"); +++} +++ +++void mpd_sendPlaylistInfoCommand(mpd_Connection * connection, int songPos) +++{ +++ int len = strlen("playlistinfo") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistinfo \"%i\"\n", songPos); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlaylistIdCommand(mpd_Connection * connection, int id) +++{ +++ int len = strlen("playlistid") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistid \"%i\"\n", id); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist) +++{ +++ int len = strlen("plchanges") + 2 + LONGLONGLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "plchanges \"%lld\"\n", playlist); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist) +++{ +++ int len = strlen("plchangesposid") + 2 + LONGLONGLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "plchangesposid \"%lld\"\n", playlist); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendListallCommand(mpd_Connection * connection, const char *dir) +++{ +++ char *sDir = mpd_sanitizeArg(dir); +++ int len = strlen("listall") + 2 + strlen(sDir) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "listall \"%s\"\n", sDir); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sDir); +++} +++ +++void mpd_sendListallInfoCommand(mpd_Connection * connection, const char *dir) +++{ +++ char *sDir = mpd_sanitizeArg(dir); +++ int len = strlen("listallinfo") + 2 + strlen(sDir) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "listallinfo \"%s\"\n", sDir); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sDir); +++} +++ +++void mpd_sendLsInfoCommand(mpd_Connection * connection, const char *dir) +++{ +++ char *sDir = mpd_sanitizeArg(dir); +++ int len = strlen("lsinfo") + 2 + strlen(sDir) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "lsinfo \"%s\"\n", sDir); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sDir); +++} +++ +++void mpd_sendCurrentSongCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "currentsong\n"); +++} +++ +++void mpd_sendSearchCommand(mpd_Connection * connection, int table, const char *str) +++{ +++ mpd_startSearch(connection, 0); +++ mpd_addConstraintSearch(connection, table, str); +++ mpd_commitSearch(connection); +++} +++ +++void mpd_sendFindCommand(mpd_Connection * connection, int table, const char *str) +++{ +++ mpd_startSearch(connection, 1); +++ mpd_addConstraintSearch(connection, table, str); +++ mpd_commitSearch(connection); +++} +++ +++void mpd_sendListCommand(mpd_Connection * connection, int table, const char *arg1) +++{ +++ char st[10]; +++ int len; +++ char *string; +++ if (table == MPD_TABLE_ARTIST) +++ strcpy(st, "artist"); +++ else if (table == MPD_TABLE_ALBUM) +++ strcpy(st, "album"); +++ else { +++ connection->error = 1; +++ strcpy(connection->errorStr, "unknown table for list"); +++ return; +++ } +++ if (arg1) { +++ char *sanitArg1 = mpd_sanitizeArg(arg1); +++ len = strlen("list") + 1 + strlen(sanitArg1) + 2 + strlen(st) + 3; +++ string = malloc(len); +++ snprintf(string, len, "list %s \"%s\"\n", st, sanitArg1); +++ free(sanitArg1); +++ } else { +++ len = strlen("list") + 1 + strlen(st) + 2; +++ string = malloc(len); +++ snprintf(string, len, "list %s\n", st); +++ } +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendAddCommand(mpd_Connection * connection, const char *file) +++{ +++ char *sFile = mpd_sanitizeArg(file); +++ int len = strlen("add") + 2 + strlen(sFile) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "add \"%s\"\n", sFile); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sFile); +++} +++ +++int mpd_sendAddIdCommand(mpd_Connection * connection, const char *file) +++{ +++ int retval = -1; +++ char *sFile = mpd_sanitizeArg(file); +++ int len = strlen("addid") + 2 + strlen(sFile) + 3; +++ char *string = malloc(len); +++ +++ snprintf(string, len, "addid \"%s\"\n", sFile); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sFile); +++ +++ string = mpd_getNextReturnElementNamed(connection, "Id"); +++ if (string) { +++ retval = atoi(string); +++ free(string); +++ } +++ +++ return retval; +++} +++ +++void mpd_sendDeleteCommand(mpd_Connection * connection, int songPos) +++{ +++ int len = strlen("delete") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "delete \"%i\"\n", songPos); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendDeleteIdCommand(mpd_Connection * connection, int id) +++{ +++ int len = strlen("deleteid") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "deleteid \"%i\"\n", id); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSaveCommand(mpd_Connection * connection, const char *name) +++{ +++ char *sName = mpd_sanitizeArg(name); +++ int len = strlen("save") + 2 + strlen(sName) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "save \"%s\"\n", sName); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sName); +++} +++ +++void mpd_sendLoadCommand(mpd_Connection * connection, const char *name) +++{ +++ char *sName = mpd_sanitizeArg(name); +++ int len = strlen("load") + 2 + strlen(sName) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "load \"%s\"\n", sName); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sName); +++} +++ +++void mpd_sendRmCommand(mpd_Connection * connection, const char *name) +++{ +++ char *sName = mpd_sanitizeArg(name); +++ int len = strlen("rm") + 2 + strlen(sName) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "rm \"%s\"\n", sName); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sName); +++} +++ +++void mpd_sendRenameCommand(mpd_Connection * connection, const char *from, const char *to) +++{ +++ char *sFrom = mpd_sanitizeArg(from); +++ char *sTo = mpd_sanitizeArg(to); +++ int len = strlen("rename") + 2 + strlen(sFrom) + 3 + strlen(sTo) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "rename \"%s\" \"%s\"\n", sFrom, sTo); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sFrom); +++ free(sTo); +++} +++ +++void mpd_sendShuffleCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "shuffle\n"); +++} +++ +++void mpd_sendClearCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "clear\n"); +++} +++ +++void mpd_sendPlayCommand(mpd_Connection * connection, int songPos) +++{ +++ int len = strlen("play") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "play \"%i\"\n", songPos); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlayIdCommand(mpd_Connection * connection, int id) +++{ +++ int len = strlen("playid") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playid \"%i\"\n", id); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendStopCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "stop\n"); +++} +++ +++void mpd_sendPauseCommand(mpd_Connection * connection, int pauseMode) +++{ +++ int len = strlen("pause") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "pause \"%i\"\n", pauseMode); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendNextCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "next\n"); +++} +++ +++void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to) +++{ +++ int len = strlen("move") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "move \"%i\" \"%i\"\n", from, to); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendMoveIdCommand(mpd_Connection * connection, int id, int to) +++{ +++ int len = strlen("moveid") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "moveid \"%i\" \"%i\"\n", id, to); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2) +++{ +++ int len = strlen("swap") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "swap \"%i\" \"%i\"\n", song1, song2); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSwapIdCommand(mpd_Connection * connection, int id1, int id2) +++{ +++ int len = strlen("swapid") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "swapid \"%i\" \"%i\"\n", id1, id2); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time) +++{ +++ int len = strlen("seek") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "seek \"%i\" \"%i\"\n", song, time); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSeekIdCommand(mpd_Connection * connection, int id, int time) +++{ +++ int len = strlen("seekid") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "seekid \"%i\" \"%i\"\n", id, time); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendUpdateCommand(mpd_Connection * connection, char *path) +++{ +++ char *sPath = mpd_sanitizeArg(path); +++ int len = strlen("update") + 2 + strlen(sPath) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "update \"%s\"\n", sPath); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sPath); +++} +++ +++int mpd_getUpdateId(mpd_Connection * connection) +++{ +++ char *jobid; +++ int ret = 0; +++ +++ jobid = mpd_getNextReturnElementNamed(connection, "updating_db"); +++ if (jobid) { +++ ret = atoi(jobid); +++ free(jobid); +++ } +++ +++ return ret; +++} +++ +++void mpd_sendPrevCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "previous\n"); +++} +++ +++void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode) +++{ +++ int len = strlen("repeat") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "repeat \"%i\"\n", repeatMode); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode) +++{ +++ int len = strlen("random") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "random \"%i\"\n", randomMode); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange) +++{ +++ int len = strlen("setvol") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "setvol \"%i\"\n", volumeChange); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange) +++{ +++ int len = strlen("volume") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "volume \"%i\"\n", volumeChange); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds) +++{ +++ int len = strlen("crossfade") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "crossfade \"%i\"\n", seconds); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPasswordCommand(mpd_Connection * connection, const char *pass) +++{ +++ char *sPass = mpd_sanitizeArg(pass); +++ int len = strlen("password") + 2 + strlen(sPass) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "password \"%s\"\n", sPass); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sPass); +++} +++ +++void mpd_sendCommandListBegin(mpd_Connection * connection) +++{ +++ if (connection->commandList) { +++ strcpy(connection->errorStr, "already in command list mode"); +++ connection->error = 1; +++ return; +++ } +++ connection->commandList = COMMAND_LIST; +++ mpd_executeCommand(connection, "command_list_begin\n"); +++} +++ +++void mpd_sendCommandListOkBegin(mpd_Connection * connection) +++{ +++ if (connection->commandList) { +++ strcpy(connection->errorStr, "already in command list mode"); +++ connection->error = 1; +++ return; +++ } +++ connection->commandList = COMMAND_LIST_OK; +++ mpd_executeCommand(connection, "command_list_ok_begin\n"); +++ connection->listOks = 0; +++} +++ +++void mpd_sendCommandListEnd(mpd_Connection * connection) +++{ +++ if (!connection->commandList) { +++ strcpy(connection->errorStr, "not in command list mode"); +++ connection->error = 1; +++ return; +++ } +++ connection->commandList = 0; +++ mpd_executeCommand(connection, "command_list_end\n"); +++} +++ +++void mpd_sendOutputsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "outputs\n"); +++} +++ +++mpd_OutputEntity *mpd_getNextOutput(mpd_Connection * connection) +++{ +++ mpd_OutputEntity *output = NULL; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (connection->error) +++ return NULL; +++ +++ output = malloc(sizeof(mpd_OutputEntity)); +++ output->id = -10; +++ output->name = NULL; +++ output->enabled = 0; +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ if (strcmp(re->name, "outputid") == 0) { +++ if (output != NULL && output->id >= 0) +++ return output; +++ output->id = atoi(re->value); +++ } else if (strcmp(re->name, "outputname") == 0) { +++ output->name = strdup(re->value); +++ } else if (strcmp(re->name, "outputenabled") == 0) { +++ output->enabled = atoi(re->value); +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(output); +++ return NULL; +++ } +++ +++ } +++ +++ return output; +++} +++ +++void mpd_sendEnableOutputCommand(mpd_Connection * connection, int outputId) +++{ +++ int len = strlen("enableoutput") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "enableoutput \"%i\"\n", outputId); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendDisableOutputCommand(mpd_Connection * connection, int outputId) +++{ +++ int len = strlen("disableoutput") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "disableoutput \"%i\"\n", outputId); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_freeOutputElement(mpd_OutputEntity * output) +++{ +++ free(output->name); +++ free(output); +++} +++ +++/** +++ * mpd_sendNotCommandsCommand +++ * odd naming, but it gets the not allowed commands +++ */ +++ +++void mpd_sendNotCommandsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "notcommands\n"); +++} +++ +++/** +++ * mpd_sendCommandsCommand +++ * odd naming, but it gets the allowed commands +++ */ +++void mpd_sendCommandsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "commands\n"); +++} +++ +++/** +++ * Get the next returned command +++ */ +++char *mpd_getNextCommand(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "command"); +++} +++ +++void mpd_sendUrlHandlersCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "urlhandlers\n"); +++} +++ +++char *mpd_getNextHandler(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "handler"); +++} +++ +++void mpd_sendTagTypesCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "tagtypes\n"); +++} +++ +++char *mpd_getNextTagType(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "tagtype"); +++} +++ +++void mpd_startSearch(mpd_Connection * connection, int exact) +++{ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (exact) +++ connection->request = strdup("find"); +++ else +++ connection->request = strdup("search"); +++} +++ +++void mpd_startStatsSearch(mpd_Connection * connection) +++{ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ connection->request = strdup("count"); +++} +++ +++void mpd_startPlaylistSearch(mpd_Connection * connection, int exact) +++{ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (exact) +++ connection->request = strdup("playlistfind"); +++ else +++ connection->request = strdup("playlistsearch"); +++} +++ +++void mpd_startFieldSearch(mpd_Connection * connection, int type) +++{ +++ char *strtype; +++ int len; +++ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES) { +++ strcpy(connection->errorStr, "invalid type specified"); +++ connection->error = 1; +++ return; +++ } +++ +++ strtype = mpdTagItemKeys[type]; +++ +++ len = 5 + strlen(strtype) + 1; +++ connection->request = malloc(len); +++ +++ snprintf(connection->request, len, "list %c%s", tolower(strtype[0]), strtype + 1); +++} +++ +++void mpd_addConstraintSearch(mpd_Connection * connection, int type, const char *name) +++{ +++ char *strtype; +++ char *arg; +++ int len; +++ char *string; +++ +++ if (!connection->request) { +++ strcpy(connection->errorStr, "no search in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES) { +++ strcpy(connection->errorStr, "invalid type specified"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (name == NULL) { +++ strcpy(connection->errorStr, "no name specified"); +++ connection->error = 1; +++ return; +++ } +++ +++ string = strdup(connection->request); +++ strtype = mpdTagItemKeys[type]; +++ arg = mpd_sanitizeArg(name); +++ +++ len = strlen(string) + 1 + strlen(strtype) + 2 + strlen(arg) + 2; +++ connection->request = realloc(connection->request, len); +++ snprintf(connection->request, len, "%s %c%s \"%s\"", string, tolower(strtype[0]), strtype + 1, arg); +++ +++ free(string); +++ free(arg); +++} +++ +++void mpd_commitSearch(mpd_Connection * connection) +++{ +++ int len; +++ +++ if (!connection->request) { +++ strcpy(connection->errorStr, "no search in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ len = strlen(connection->request) + 2; +++ connection->request = realloc(connection->request, len); +++ connection->request[len - 2] = '\n'; +++ connection->request[len - 1] = '\0'; +++ mpd_sendInfoCommand(connection, connection->request); +++ +++ free(connection->request); +++ connection->request = NULL; +++} +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content, with full metadata, of a stored playlist. +++ * +++ */ +++void mpd_sendListPlaylistInfoCommand(mpd_Connection * connection, char *path) +++{ +++ char *arg = mpd_sanitizeArg(path); +++ int len = strlen("listplaylistinfo") + 2 + strlen(arg) + 3; +++ char *query = malloc(len); +++ snprintf(query, len, "listplaylistinfo \"%s\"\n", arg); +++ mpd_sendInfoCommand(connection, query); +++ free(arg); +++ free(query); +++} +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content of a stored playlist. +++ * +++ */ +++void mpd_sendListPlaylistCommand(mpd_Connection * connection, char *path) +++{ +++ char *arg = mpd_sanitizeArg(path); +++ int len = strlen("listplaylist") + 2 + strlen(arg) + 3; +++ char *query = malloc(len); +++ snprintf(query, len, "listplaylist \"%s\"\n", arg); +++ mpd_sendInfoCommand(connection, query); +++ free(arg); +++ free(query); +++} +++ +++void mpd_sendPlaylistClearCommand(mpd_Connection * connection, char *path) +++{ +++ char *sPath = mpd_sanitizeArg(path); +++ int len = strlen("playlistclear") + 2 + strlen(sPath) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistclear \"%s\"\n", sPath); +++ mpd_executeCommand(connection, string); +++ free(sPath); +++ free(string); +++} +++ +++void mpd_sendPlaylistAddCommand(mpd_Connection * connection, char *playlist, char *path) +++{ +++ char *sPlaylist = mpd_sanitizeArg(playlist); +++ char *sPath = mpd_sanitizeArg(path); +++ int len = strlen("playlistadd") + 2 + strlen(sPlaylist) + 3 + strlen(sPath) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistadd \"%s\" \"%s\"\n", sPlaylist, sPath); +++ mpd_executeCommand(connection, string); +++ free(sPlaylist); +++ free(sPath); +++ free(string); +++} +++ +++void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to) +++{ +++ char *sPlaylist = mpd_sanitizeArg(playlist); +++ int len = strlen("playlistmove") + 2 + strlen(sPlaylist) + 3 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistmove \"%s\" \"%i\" \"%i\"\n", sPlaylist, from, to); +++ mpd_executeCommand(connection, string); +++ free(sPlaylist); +++ free(string); +++} +++ +++void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos) +++{ +++ char *sPlaylist = mpd_sanitizeArg(playlist); +++ int len = strlen("playlistdelete") + 2 + strlen(sPlaylist) + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistdelete \"%s\" \"%i\"\n", sPlaylist, pos); +++ mpd_executeCommand(connection, string); +++ free(sPlaylist); +++ free(string); +++} ++--- /dev/null +++++ b/libmpdclient.h ++@@ -0,0 +1,661 @@ +++/* libmpdclient +++ (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com) +++ This project's homepage is: http://www.musicpd.org +++ +++ Redistribution and use in source and binary forms, with or without +++ modification, are permitted provided that the following conditions +++ are met: +++ +++ - Redistributions of source code must retain the above copyright +++ notice, this list of conditions and the following disclaimer. +++ +++ - 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. +++ +++ - Neither the name of the Music Player Daemon 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 COPYRIGHT HOLDERS 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 FOUNDATION 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. +++*/ +++ +++#ifndef LIBMPDCLIENT_H +++#define LIBMPDCLIENT_H +++ +++#ifdef WIN32 +++# define __W32API_USE_DLLIMPORT__ 1 +++#endif +++ +++#include +++#include +++#define MPD_BUFFER_MAX_LENGTH 50000 +++#define MPD_ERRORSTR_MAX_LENGTH 1000 +++#define MPD_WELCOME_MESSAGE "OK MPD " +++ +++#define MPD_ERROR_TIMEOUT 10 /* timeout trying to talk to mpd */ +++#define MPD_ERROR_SYSTEM 11 /* system error */ +++#define MPD_ERROR_UNKHOST 12 /* unknown host */ +++#define MPD_ERROR_CONNPORT 13 /* problems connecting to port on host */ +++#define MPD_ERROR_NOTMPD 14 /* mpd not running on port at host */ +++#define MPD_ERROR_NORESPONSE 15 /* no response on attempting to connect */ +++#define MPD_ERROR_SENDING 16 /* error sending command */ +++#define MPD_ERROR_CONNCLOSED 17 /* connection closed by mpd */ +++#define MPD_ERROR_ACK 18 /* ACK returned! */ +++#define MPD_ERROR_BUFFEROVERRUN 19 /* Buffer was overrun! */ +++ +++#define MPD_ACK_ERROR_UNK -1 +++#define MPD_ERROR_AT_UNK -1 +++ +++#define MPD_ACK_ERROR_NOT_LIST 1 +++#define MPD_ACK_ERROR_ARG 2 +++#define MPD_ACK_ERROR_PASSWORD 3 +++#define MPD_ACK_ERROR_PERMISSION 4 +++#define MPD_ACK_ERROR_UNKNOWN_CMD 5 +++ +++#define MPD_ACK_ERROR_NO_EXIST 50 +++#define MPD_ACK_ERROR_PLAYLIST_MAX 51 +++#define MPD_ACK_ERROR_SYSTEM 52 +++#define MPD_ACK_ERROR_PLAYLIST_LOAD 53 +++#define MPD_ACK_ERROR_UPDATE_ALREADY 54 +++#define MPD_ACK_ERROR_PLAYER_SYNC 55 +++#define MPD_ACK_ERROR_EXIST 56 +++ +++#ifdef __cplusplus +++extern "C" { +++#endif +++ +++ typedef enum mpd_TagItems { +++ MPD_TAG_ITEM_ARTIST, +++ MPD_TAG_ITEM_ALBUM, +++ MPD_TAG_ITEM_TITLE, +++ MPD_TAG_ITEM_TRACK, +++ MPD_TAG_ITEM_NAME, +++ MPD_TAG_ITEM_GENRE, +++ MPD_TAG_ITEM_DATE, +++ MPD_TAG_ITEM_COMPOSER, +++ MPD_TAG_ITEM_PERFORMER, +++ MPD_TAG_ITEM_COMMENT, +++ MPD_TAG_ITEM_DISC, +++ MPD_TAG_ITEM_FILENAME, +++ MPD_TAG_ITEM_ANY, +++ MPD_TAG_NUM_OF_ITEM_TYPES +++ } mpd_TagItems; +++ +++ extern char *mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES]; +++ +++/* internal stuff don't touch this struct */ +++ typedef struct _mpd_ReturnElement { +++ char *name; +++ char *value; +++ } mpd_ReturnElement; +++ +++/* mpd_Connection +++ * holds info about connection to mpd +++ * use error, and errorStr to detect errors +++ */ +++ typedef struct _mpd_Connection { +++ /* use this to check the version of mpd */ +++ int version[3]; +++ /* IMPORTANT, you want to get the error messages from here */ +++ char errorStr[MPD_ERRORSTR_MAX_LENGTH + 1]; +++ int errorCode; +++ int errorAt; +++ /* this will be set to MPD_ERROR_* if there is an error, 0 if not */ +++ int error; +++ /* DON'T TOUCH any of the rest of this stuff */ +++ int sock; +++ char buffer[MPD_BUFFER_MAX_LENGTH + 1]; +++ int buflen; +++ int bufstart; +++ int doneProcessing; +++ int listOks; +++ int doneListOk; +++ int commandList; +++ mpd_ReturnElement *returnElement; +++ struct timeval timeout; +++ char *request; +++ } mpd_Connection; +++ +++/* mpd_newConnection +++ * use this to open a new connection +++ * you should use mpd_closeConnection, when your done with the connection, +++ * even if an error has occurred +++ * _timeout_ is the connection timeout period in seconds +++ */ +++ mpd_Connection *mpd_newConnection(const char *host, int port, float timeout); +++ +++ void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout); +++ +++/* mpd_closeConnection +++ * use this to close a connection and free'ing subsequent memory +++ */ +++ void mpd_closeConnection(mpd_Connection * connection); +++ +++/* mpd_clearError +++ * clears error +++ */ +++ void mpd_clearError(mpd_Connection * connection); +++ +++/* STATUS STUFF */ +++ +++/* use these with status.state to determine what state the player is in */ +++#define MPD_STATUS_STATE_UNKNOWN 0 +++#define MPD_STATUS_STATE_STOP 1 +++#define MPD_STATUS_STATE_PLAY 2 +++#define MPD_STATUS_STATE_PAUSE 3 +++ +++/* us this with status.volume to determine if mpd has volume support */ +++#define MPD_STATUS_NO_VOLUME -1 +++ +++/* mpd_Status +++ * holds info return from status command +++ */ +++ typedef struct mpd_Status { +++ /* 0-100, or MPD_STATUS_NO_VOLUME when there is no volume support */ +++ int volume; +++ /* 1 if repeat is on, 0 otherwise */ +++ int repeat; +++ /* 1 if random is on, 0 otherwise */ +++ int random; +++ /* playlist length */ +++ int playlistLength; +++ /* playlist, use this to determine when the playlist has changed */ +++ long long playlist; +++ /* use with MPD_STATUS_STATE_* to determine state of player */ +++ int state; +++ /* crossfade setting in seconds */ +++ int crossfade; +++ /* if a song is currently selected (always the case when state is +++ * PLAY or PAUSE), this is the position of the currently +++ * playing song in the playlist, beginning with 0 +++ */ +++ int song; +++ /* Song ID of the currently selected song */ +++ int songid; +++ /* time in seconds that have elapsed in the currently playing/paused +++ * song +++ */ +++ int elapsedTime; +++ /* length in seconds of the currently playing/paused song */ +++ int totalTime; +++ /* current bit rate in kbs */ +++ int bitRate; +++ /* audio sample rate */ +++ unsigned int sampleRate; +++ /* audio bits */ +++ int bits; +++ /* audio channels */ +++ int channels; +++ /* 1 if mpd is updating, 0 otherwise */ +++ int updatingDb; +++ /* error */ +++ char *error; +++ } mpd_Status; +++ +++ void mpd_sendStatusCommand(mpd_Connection * connection); +++ +++/* mpd_getStatus +++ * returns status info, be sure to free it with mpd_freeStatus() +++ * call this after mpd_sendStatusCommand() +++ */ +++ mpd_Status *mpd_getStatus(mpd_Connection * connection); +++ +++/* mpd_freeStatus +++ * free's status info malloc'd and returned by mpd_getStatus +++ */ +++ void mpd_freeStatus(mpd_Status * status); +++ +++ typedef struct _mpd_Stats { +++ int numberOfArtists; +++ int numberOfAlbums; +++ int numberOfSongs; +++ unsigned long uptime; +++ unsigned long dbUpdateTime; +++ unsigned long playTime; +++ unsigned long dbPlayTime; +++ } mpd_Stats; +++ +++ typedef struct _mpd_SearchStats { +++ int numberOfSongs; +++ unsigned long playTime; +++ } mpd_SearchStats; +++ +++ void mpd_sendStatsCommand(mpd_Connection * connection); +++ +++ mpd_Stats *mpd_getStats(mpd_Connection * connection); +++ +++ void mpd_freeStats(mpd_Stats * stats); +++ +++ mpd_SearchStats *mpd_getSearchStats(mpd_Connection * connection); +++ +++ void mpd_freeSearchStats(mpd_SearchStats * stats); +++ +++/* SONG STUFF */ +++ +++#define MPD_SONG_NO_TIME -1 +++#define MPD_SONG_NO_NUM -1 +++#define MPD_SONG_NO_ID -1 +++ +++/* mpd_Song +++ * for storing song info returned by mpd +++ */ +++ typedef struct _mpd_Song { +++ /* filename of song */ +++ char *file; +++ /* artist, maybe NULL if there is no tag */ +++ char *artist; +++ /* title, maybe NULL if there is no tag */ +++ char *title; +++ /* album, maybe NULL if there is no tag */ +++ char *album; +++ /* track, maybe NULL if there is no tag */ +++ char *track; +++ /* name, maybe NULL if there is no tag; it's the name of the current +++ * song, f.e. the icyName of the stream */ +++ char *name; +++ /* date */ +++ char *date; +++ +++ /* added by qball */ +++ /* Genre */ +++ char *genre; +++ /* Composer */ +++ char *composer; +++ /* Performer */ +++ char *performer; +++ /* Disc */ +++ char *disc; +++ /* Comment */ +++ char *comment; +++ +++ /* length of song in seconds, check that it is not MPD_SONG_NO_TIME */ +++ int time; +++ /* if plchanges/playlistinfo/playlistid used, is the position of the +++ * song in the playlist */ +++ int pos; +++ /* song id for a song in the playlist */ +++ int id; +++ } mpd_Song; +++ +++/* mpd_newSong +++ * use to allocate memory for a new mpd_Song +++ * file, artist, etc all initialized to NULL +++ * if your going to assign values to file, artist, etc +++ * be sure to malloc or strdup the memory +++ * use mpd_freeSong to free the memory for the mpd_Song, it will also +++ * free memory for file, artist, etc, so don't do it yourself +++ */ +++ mpd_Song *mpd_newSong(void); +++ +++/* mpd_freeSong +++ * use to free memory allocated by mpd_newSong +++ * also it will free memory pointed to by file, artist, etc, so be careful +++ */ +++ void mpd_freeSong(mpd_Song * song); +++ +++/* mpd_songDup +++ * works like strDup, but for a mpd_Song +++ */ +++ mpd_Song *mpd_songDup(mpd_Song * song); +++ +++/* DIRECTORY STUFF */ +++ +++/* mpd_Directory +++ * used to store info fro directory (right now that just the path) +++ */ +++ typedef struct _mpd_Directory { +++ char *path; +++ } mpd_Directory; +++ +++/* mpd_newDirectory +++ * allocates memory for a new directory +++ * use mpd_freeDirectory to free this memory +++ */ +++ mpd_Directory *mpd_newDirectory(void); +++ +++/* mpd_freeDirectory +++ * used to free memory allocated with mpd_newDirectory, and it frees +++ * path of mpd_Directory, so be careful +++ */ +++ void mpd_freeDirectory(mpd_Directory * directory); +++ +++/* mpd_directoryDup +++ * works like strdup, but for mpd_Directory +++ */ +++ mpd_Directory *mpd_directoryDup(mpd_Directory * directory); +++ +++/* PLAYLISTFILE STUFF */ +++ +++/* mpd_PlaylistFile +++ * stores info about playlist file returned by lsinfo +++ */ +++ typedef struct _mpd_PlaylistFile { +++ char *path; +++ } mpd_PlaylistFile; +++ +++/* mpd_newPlaylistFile +++ * allocates memory for new mpd_PlaylistFile, path is set to NULL +++ * free this memory with mpd_freePlaylistFile +++ */ +++ mpd_PlaylistFile *mpd_newPlaylistFile(void); +++ +++/* mpd_freePlaylist +++ * free memory allocated for freePlaylistFile, will also free +++ * path, so be careful +++ */ +++ void mpd_freePlaylistFile(mpd_PlaylistFile * playlist); +++ +++/* mpd_playlistFileDup +++ * works like strdup, but for mpd_PlaylistFile +++ */ +++ mpd_PlaylistFile *mpd_playlistFileDup(mpd_PlaylistFile * playlist); +++ +++/* INFO ENTITY STUFF */ +++ +++/* the type of entity returned from one of the commands that generates info +++ * use in conjunction with mpd_InfoEntity.type +++ */ +++#define MPD_INFO_ENTITY_TYPE_DIRECTORY 0 +++#define MPD_INFO_ENTITY_TYPE_SONG 1 +++#define MPD_INFO_ENTITY_TYPE_PLAYLISTFILE 2 +++ +++/* mpd_InfoEntity +++ * stores info on stuff returned info commands +++ */ +++ typedef struct mpd_InfoEntity { +++ /* the type of entity, use with MPD_INFO_ENTITY_TYPE_* to determine +++ * what this entity is (song, directory, etc...) +++ */ +++ int type; +++ /* the actual data you want, mpd_Song, mpd_Directory, etc */ +++ union { +++ mpd_Directory *directory; +++ mpd_Song *song; +++ mpd_PlaylistFile *playlistFile; +++ } info; +++ } mpd_InfoEntity; +++ +++ mpd_InfoEntity *mpd_newInfoEntity(void); +++ +++ void mpd_freeInfoEntity(mpd_InfoEntity * entity); +++ +++/* INFO COMMANDS AND STUFF */ +++ +++/* use this function to loop over after calling Info/Listall functions */ +++ mpd_InfoEntity *mpd_getNextInfoEntity(mpd_Connection * connection); +++ +++/* fetches the currently seeletect song (the song referenced by status->song +++ * and status->songid*/ +++ void mpd_sendCurrentSongCommand(mpd_Connection * connection); +++ +++/* songNum of -1, means to display the whole list */ +++ void mpd_sendPlaylistInfoCommand(mpd_Connection * connection, int songNum); +++ +++/* songId of -1, means to display the whole list */ +++ void mpd_sendPlaylistIdCommand(mpd_Connection * connection, int songId); +++ +++/* use this to get the changes in the playlist since version _playlist_ */ +++ void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist); +++ +++/** +++ * @param connection: A valid and connected mpd_Connection. +++ * @param playlist: The playlist version you want the diff with. +++ * A more bandwidth efficient version of the mpd_sendPlChangesCommand. +++ * It only returns the pos+id of the changes song. +++ */ +++ void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist); +++ +++/* recursivel fetches all songs/dir/playlists in "dir* (no metadata is +++ * returned) */ +++ void mpd_sendListallCommand(mpd_Connection * connection, const char *dir); +++ +++/* same as sendListallCommand, but also metadata is returned */ +++ void mpd_sendListallInfoCommand(mpd_Connection * connection, const char *dir); +++ +++/* non-recursive version of ListallInfo */ +++ void mpd_sendLsInfoCommand(mpd_Connection * connection, const char *dir); +++ +++#define MPD_TABLE_ARTIST MPD_TAG_ITEM_ARTIST +++#define MPD_TABLE_ALBUM MPD_TAG_ITEM_ALBUM +++#define MPD_TABLE_TITLE MPD_TAG_ITEM_TITLE +++#define MPD_TABLE_FILENAME MPD_TAG_ITEM_FILENAME +++ +++ void mpd_sendSearchCommand(mpd_Connection * connection, int table, const char *str); +++ +++ void mpd_sendFindCommand(mpd_Connection * connection, int table, const char *str); +++ +++/* LIST TAG COMMANDS */ +++ +++/* use this function fetch next artist entry, be sure to free the returned +++ * string. NULL means there are no more. Best used with sendListArtists +++ */ +++ char *mpd_getNextArtist(mpd_Connection * connection); +++ +++ char *mpd_getNextAlbum(mpd_Connection * connection); +++ +++ char *mpd_getNextTag(mpd_Connection * connection, int type); +++ +++/* list artist or albums by artist, arg1 should be set to the artist if +++ * listing albums by a artist, otherwise NULL for listing all artists or albums +++ */ +++ void mpd_sendListCommand(mpd_Connection * connection, int table, const char *arg1); +++ +++/* SIMPLE COMMANDS */ +++ +++ void mpd_sendAddCommand(mpd_Connection * connection, const char *file); +++ +++ int mpd_sendAddIdCommand(mpd_Connection * connection, const char *file); +++ +++ void mpd_sendDeleteCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendDeleteIdCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendSaveCommand(mpd_Connection * connection, const char *name); +++ +++ void mpd_sendLoadCommand(mpd_Connection * connection, const char *name); +++ +++ void mpd_sendRmCommand(mpd_Connection * connection, const char *name); +++ +++ void mpd_sendRenameCommand(mpd_Connection * connection, const char *from, const char *to); +++ +++ void mpd_sendShuffleCommand(mpd_Connection * connection); +++ +++ void mpd_sendClearCommand(mpd_Connection * connection); +++ +++/* use this to start playing at the beginning, useful when in random mode */ +++#define MPD_PLAY_AT_BEGINNING -1 +++ +++ void mpd_sendPlayCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendPlayIdCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendStopCommand(mpd_Connection * connection); +++ +++ void mpd_sendPauseCommand(mpd_Connection * connection, int pauseMode); +++ +++ void mpd_sendNextCommand(mpd_Connection * connection); +++ +++ void mpd_sendPrevCommand(mpd_Connection * connection); +++ +++ void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to); +++ +++ void mpd_sendMoveIdCommand(mpd_Connection * connection, int from, int to); +++ +++ void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2); +++ +++ void mpd_sendSwapIdCommand(mpd_Connection * connection, int song1, int song2); +++ +++ void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time); +++ +++ void mpd_sendSeekIdCommand(mpd_Connection * connection, int song, int time); +++ +++ void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode); +++ +++ void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode); +++ +++ void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange); +++ +++/* WARNING: don't use volume command, its depreacted */ +++ void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange); +++ +++ void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds); +++ +++ void mpd_sendUpdateCommand(mpd_Connection * connection, char *path); +++ +++/* returns the update job id, call this after a update command*/ +++ int mpd_getUpdateId(mpd_Connection * connection); +++ +++ void mpd_sendPasswordCommand(mpd_Connection * connection, const char *pass); +++ +++/* after executing a command, when your done with it to get its status +++ * (you want to check connection->error for an error) +++ */ +++ void mpd_finishCommand(mpd_Connection * connection); +++ +++/* command list stuff, use this to do things like add files very quickly */ +++ void mpd_sendCommandListBegin(mpd_Connection * connection); +++ +++ void mpd_sendCommandListOkBegin(mpd_Connection * connection); +++ +++ void mpd_sendCommandListEnd(mpd_Connection * connection); +++ +++/* advance to the next listOk +++ * returns 0 if advanced to the next list_OK, +++ * returns -1 if it advanced to an OK or ACK */ +++ int mpd_nextListOkCommand(mpd_Connection * connection); +++ +++ typedef struct _mpd_OutputEntity { +++ int id; +++ char *name; +++ int enabled; +++ } mpd_OutputEntity; +++ +++ void mpd_sendOutputsCommand(mpd_Connection * connection); +++ +++ mpd_OutputEntity *mpd_getNextOutput(mpd_Connection * connection); +++ +++ void mpd_sendEnableOutputCommand(mpd_Connection * connection, int outputId); +++ +++ void mpd_sendDisableOutputCommand(mpd_Connection * connection, int outputId); +++ +++ void mpd_freeOutputElement(mpd_OutputEntity * output); +++ +++/** +++ * @param connection a #mpd_Connection +++ * +++ * Queries mpd for the allowed commands +++ */ +++ void mpd_sendCommandsCommand(mpd_Connection * connection); +++ +++/** +++ * @param connection a #mpd_Connection +++ * +++ * Queries mpd for the not allowed commands +++ */ +++ void mpd_sendNotCommandsCommand(mpd_Connection * connection); +++ +++/** +++ * @param connection a #mpd_Connection +++ * +++ * returns the next supported command. +++ * +++ * @returns a string, needs to be free'ed +++ */ +++ char *mpd_getNextCommand(mpd_Connection * connection); +++ +++ void mpd_sendUrlHandlersCommand(mpd_Connection * connection); +++ +++ char *mpd_getNextHandler(mpd_Connection * connection); +++ +++ void mpd_sendTagTypesCommand(mpd_Connection * connection); +++ +++ char *mpd_getNextTagType(mpd_Connection * connection); +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content, with full metadata, of a stored playlist. +++ * +++ */ +++ void mpd_sendListPlaylistInfoCommand(mpd_Connection * connection, char *path); +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content of a stored playlist. +++ * +++ */ +++ void mpd_sendListPlaylistCommand(mpd_Connection * connection, char *path); +++ +++/** +++ * @param connection a #mpd_Connection +++ * @param exact if to match exact +++ * +++ * starts a search, use mpd_addConstraintSearch to add +++ * a constraint to the search, and mpd_commitSearch to do the actual search +++ */ +++ void mpd_startSearch(mpd_Connection * connection, int exact); +++ +++/** +++ * @param connection a #mpd_Connection +++ * @param type +++ * @param name +++ */ +++ void mpd_addConstraintSearch(mpd_Connection * connection, int type, const char *name); +++ +++/** +++ * @param connection a #mpd_Connection +++ */ +++ void mpd_commitSearch(mpd_Connection * connection); +++ +++/** +++ * @param connection a #mpd_Connection +++ * @param type The type to search for +++ * +++ * starts a search for fields... f.e. get a list of artists would be: +++ * @code +++ * mpd_startFieldSearch(connection, MPD_TAG_ITEM_ARTIST); +++ * mpd_commitSearch(connection); +++ * @endcode +++ * +++ * or get a list of artist in genre "jazz" would be: +++ * @code +++ * mpd_startFieldSearch(connection, MPD_TAG_ITEM_ARTIST); +++ * mpd_addConstraintSearch(connection, MPD_TAG_ITEM_GENRE, "jazz") +++ * mpd_commitSearch(connection); +++ * @endcode +++ * +++ * mpd_startSearch will return a list of songs (and you need mpd_getNextInfoEntity) +++ * this one will return a list of only one field (the one specified with type) and you need +++ * mpd_getNextTag to get the results +++ */ +++ void mpd_startFieldSearch(mpd_Connection * connection, int type); +++ +++ void mpd_startPlaylistSearch(mpd_Connection * connection, int exact); +++ +++ void mpd_startStatsSearch(mpd_Connection * connection); +++ +++ void mpd_sendPlaylistClearCommand(mpd_Connection * connection, char *path); +++ +++ void mpd_sendPlaylistAddCommand(mpd_Connection * connection, char *playlist, char *path); +++ +++ void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to); +++ +++ void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos); +++#ifdef __cplusplus +++} +++#endif +++#endif +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/160-uinput_defs.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/160-uinput_defs.patch.svn-base +new file mode 100644 +index 0000000..44b24b3 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/160-uinput_defs.patch.svn-base +@@ -0,0 +1,24 @@ ++--- a/drv_G15.c +++++ b/drv_G15.c ++@@ -42,6 +42,7 @@ ++ ++ #include ++ #include +++#include ++ #include ++ #include ++ ++@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic ++ } ++ memset(&device, 0, sizeof(device)); ++ strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE); +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++ device.id.bustype = BUS_USB; ++ device.id.version = 4; +++#else +++ device.idbus = BUS_USB; +++ device.idversion = 4; +++#endif ++ ++ ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY); ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/170-add-generic-spidev-driver.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/170-add-generic-spidev-driver.patch.svn-base +new file mode 100644 +index 0000000..9dcf1cb +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/170-add-generic-spidev-driver.patch.svn-base +@@ -0,0 +1,195 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -71,6 +71,8 @@ drv_generic_i2c.c \ ++ drv_generic_i2c.h \ ++ drv_generic_keypad.c \ ++ drv_generic_keypad.h \ +++drv_generic_spidev.c \ +++drv_generic_spidev.h \ ++ drv_ASTUSB.c \ ++ drv_BeckmannEgle.c \ ++ drv_BWCT.c \ ++--- /dev/null +++++ b/drv_generic_spidev.c ++@@ -0,0 +1,89 @@ +++/* $Id$ +++ * $URL$ +++ * +++ * generic driver helper for displays connected via SPI bus +++ * +++ * Copyright (C) 2012 Gabor Juhos +++ * +++ * This file is part of LCD4Linux. +++ * +++ * LCD4Linux 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, or (at your option) +++ * any later version. +++ * +++ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ * +++ */ +++ +++#include "config.h" +++ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#include "debug.h" +++#include "qprintf.h" +++#include "cfg.h" +++#include "drv_generic_spidev.h" +++ +++static char *generic_spidev_section = ""; +++static char *generic_spidev_driver = ""; +++static int generic_spidev_fd; +++ +++int drv_generic_spidev_open(const char *section, const char *driver) +++{ +++ char *spidev; +++ +++ udelay_init(); +++ +++ generic_spidev_section = (char *) section; +++ generic_spidev_driver = (char *) driver; +++ +++ spidev = cfg_get(generic_spidev_section, "Port", NULL); +++ +++ info("%s: initializing SPI device %s", generic_spidev_driver, spidev); +++ generic_spidev_fd = open(spidev, O_WRONLY); +++ if (generic_spidev_fd < 0) { +++ error("%s: unable to open SPI device %s!\n", generic_spidev_driver, spidev); +++ goto exit_error; +++ } +++ +++ return 0; +++ +++ exit_error: +++ free(spidev); +++ return -1; +++} +++ +++int drv_generic_spidev_close(void) +++{ +++ close(generic_spidev_fd); +++ return 0; +++} +++ +++int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr) +++{ +++ int ret; +++ +++ ret = ioctl(generic_spidev_fd, SPI_IOC_MESSAGE(count), tr); +++ if (ret < count) { +++ error("%s: can't send SPI message! (%s)\n", +++ generic_spidev_driver, strerror(errno)); +++ return -1; +++ } +++ +++ return 0; +++} ++--- /dev/null +++++ b/drv_generic_spidev.h ++@@ -0,0 +1,54 @@ +++/* $Id$ +++ * $URL$ +++ * +++ * generic driver helper for displays connected via SPI bus +++ * +++ * Copyright (C) 2012 Gabor Juhos +++ * Copyright (C) 2012 The LCD4Linux Team +++ * +++ * This file is part of LCD4Linux. +++ * +++ * LCD4Linux 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, or (at your option) +++ * any later version. +++ * +++ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ * +++ */ +++ +++/* +++ * +++ * exported fuctions: +++ * +++ * int drv_generic_spidev_open (const char *section, const char *driver) +++ * reads 'Port' entry from config and opens +++ * the SPI device +++ * returns 0 if ok, -1 on failure +++ * +++ * int drv_generic_spidev_close (void) +++ * closes SPI device +++ * returns 0 if ok, -1 on failure +++ * +++ * void drv_generic_spidev_transfer (int count, struct spi_ioc_transfer *tr) +++ * transfer data to/from the SPI device +++ * +++ */ +++ +++#ifndef _DRV_GENERIC_SPIDEV_H_ +++#define _DRV_GENERIC_SPIDEV_H_ +++ +++#include +++ +++int drv_generic_spidev_open(const char *section, const char *driver); +++int drv_generic_spidev_close(void); +++int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr); +++ +++#endif /* _DRV_GENERIC_SPIDEV_H_ */ ++--- a/drivers.m4 +++++ b/drivers.m4 ++@@ -301,6 +301,7 @@ PARPORT="no" ++ SERIAL="no" ++ I2C="no" ++ KEYPAD="no" +++SPIDEV="no" ++ ++ # generic libraries ++ LIBUSB="no" ++@@ -940,6 +941,12 @@ if test "$LIBJPEG" = "yes"; then ++ DRVLIBS="$DRVLIBS -ljpeg" ++ fi ++ +++# generic spidev driver +++if test "$SPIDEV" = "yes"; then +++ DRIVERS="$DRIVERS drv_generic_spidev.o" +++ AC_DEFINE(WITH_SPIDEV, 1, [SPIDEV driver]) +++fi +++ ++ # libusb ++ if test "$LIBUSB" = "yes"; then ++ DRVLIBS="$DRVLIBS -lusb" ++--- a/configure.in +++++ b/configure.in ++@@ -118,6 +118,9 @@ AC_ARG_WITH(outb, ++ ++ AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"]) ++ +++# check for spidev +++AC_CHECK_HEADERS([linux/spi/spidev.h], [has_spidev="true"], [has_spidev="false"]) +++ ++ # drivers ++ sinclude(drivers.m4) ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/171-allow-to-specify-drv_generic_graphic_real_clear.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/171-allow-to-specify-drv_generic_graphic_real_clear.patch.svn-base +new file mode 100644 +index 0000000..5a26643 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/171-allow-to-specify-drv_generic_graphic_real_clear.patch.svn-base +@@ -0,0 +1,45 @@ ++--- a/drv_generic_graphic.c +++++ b/drv_generic_graphic.c ++@@ -24,7 +24,7 @@ ++ * ++ */ ++ ++-/* +++/* ++ * ++ * exported functions: ++ * ++@@ -98,6 +98,9 @@ static int INVERTED = 0; ++ /* must be implemented by the real driver */ ++ void (*drv_generic_graphic_real_blit) () = NULL; ++ +++/* can be implemented by the real driver */ +++void (*drv_generic_graphic_real_clear) () = NULL; +++ ++ ++ /****************************************/ ++ /*** generic Framebuffer stuff ***/ ++@@ -691,7 +694,10 @@ int drv_generic_graphic_clear(void) ++ for (i = 0; i < LCOLS * LROWS; i++) ++ drv_generic_graphic_FB[l][i] = NO_COL; ++ ++- drv_generic_graphic_blit(0, 0, LROWS, LCOLS); +++ if (drv_generic_graphic_real_clear) +++ drv_generic_graphic_real_clear(NO_COL); +++ else +++ drv_generic_graphic_blit(0, 0, LROWS, LCOLS); ++ ++ return 0; ++ } ++--- a/drv_generic_graphic.h +++++ b/drv_generic_graphic.h ++@@ -40,6 +40,9 @@ extern RGBA NO_COL; /* no color (comple ++ /* these functions must be implemented by the real driver */ ++ extern void (*drv_generic_graphic_real_blit) (const int row, const int col, const int height, const int width); ++ +++/* these functions can be implemented by the real driver */ +++void (*drv_generic_graphic_real_clear) (const RGBA rgba); +++ ++ /* helper function to get pixel color or gray value */ ++ extern RGBA drv_generic_graphic_rgb(const int row, const int col); ++ extern unsigned char drv_generic_graphic_gray(const int row, const int col); +diff --git a/feeds/packages/utils/lcd4linux/patches/.svn/text-base/172-add-TEW673GRU-driver.patch.svn-base b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/172-add-TEW673GRU-driver.patch.svn-base +new file mode 100644 +index 0000000..29a4bf3 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/.svn/text-base/172-add-TEW673GRU-driver.patch.svn-base +@@ -0,0 +1,552 @@ ++--- a/drivers.m4 +++++ b/drivers.m4 ++@@ -39,7 +39,7 @@ AC_ARG_WITH( ++ [ Newhaven, Noritake, NULL, Pertelian, PHAnderson,] ++ [ PICGraphic, picoLCD, picoLCDGraphic, PNG, PPM, RouterBoard,] ++ [ Sample, SamsungSPF, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963,] ++- [ TeakLCM, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11], +++ [ TeakLCM, TEW673GRU, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11], ++ drivers=$withval, ++ drivers=all ++ ) ++@@ -107,6 +107,7 @@ for driver in $drivers; do ++ SHUTTLEVFD="yes" ++ SIMPLELCD="yes" ++ T6963="yes" +++ TEW673GRU="yes" ++ TeakLCM="yes" ++ Trefon="yes" ++ ULA200="yes" ++@@ -260,6 +261,9 @@ for driver in $drivers; do ++ TeakLCM) ++ TeakLCM=$val ++ ;; +++ TEW673GRU) +++ TEW673GRU=$val +++ ;; ++ Trefon) ++ Trefon=$val ++ ;; ++@@ -801,6 +805,18 @@ if test "$TeakLCM" = "yes"; then ++ AC_DEFINE(WITH_TEAK_LCM,1,[TeakLCM driver]) ++ fi ++ +++if test "$TEW673GRU" = "yes"; then +++ if test "$has_spidev" = "true"; then +++ GRAPHIC="yes" +++ TEXT="yes" +++ SPIDEV="yes" +++ DRIVERS="$DRIVERS drv_TEW673GRU.o" +++ AC_DEFINE(WITH_TEW673GRU,1,[TEW673GRU driver]) +++ else +++ AC_MSG_WARN(linux/spi/spidev.h not found: TEW673GRU driver disabled) +++ fi +++fi +++ ++ if test "$Trefon" = "yes"; then ++ if test "$has_usb" = "true"; then ++ TEXT="yes" ++--- a/drv.c +++++ b/drv.c ++@@ -92,6 +92,7 @@ extern DRIVER drv_serdisplib; ++ extern DRIVER drv_ShuttleVFD; ++ extern DRIVER drv_SimpleLCD; ++ extern DRIVER drv_T6963; +++extern DRIVER drv_TEW673GRU; ++ extern DRIVER drv_TeakLCM; ++ extern DRIVER drv_Trefon; ++ extern DRIVER drv_ula200; ++@@ -248,6 +249,9 @@ DRIVER *Driver[] = { ++ #ifdef WITH_TEAK_LCM ++ &drv_TeakLCM, ++ #endif +++#ifdef WITH_TEW673GRU +++ &drv_TEW673GRU, +++#endif ++ #ifdef WITH_TREFON ++ &drv_Trefon, ++ #endif ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -119,6 +119,7 @@ drv_ShuttleVFD.c \ ++ drv_SimpleLCD.c \ ++ drv_T6963.c \ ++ drv_TeakLCM.c \ +++drv_TEW673GRU.c \ ++ drv_Trefon.c \ ++ drv_ula200.c \ ++ drv_USBHUB.c \ ++--- /dev/null +++++ b/drv_TEW673GRU.c ++@@ -0,0 +1,457 @@ +++/* $Id$ +++ * $URL$ +++ * +++ * TRENDnet TEW673GRU LCD4linux driver +++ * +++ * Copyright (C) 2012 Gabor Juhos +++ * +++ * based on the Sample driver which is: +++ * Copyright (C) 2005 Michael Reinelt +++ * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team +++ * +++ * This file is part of LCD4Linux. +++ * +++ * LCD4Linux 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, or (at your option) +++ * any later version. +++ * +++ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ * +++ */ +++ +++/* +++ * exported fuctions: +++ * +++ * struct DRIVER drv_TEW673GRU +++ */ +++ +++#include "config.h" +++ +++#include +++#include +++#include +++#include +++#include +++ +++#include "debug.h" +++#include "cfg.h" +++#include "qprintf.h" +++#include "udelay.h" +++#include "plugin.h" +++#include "widget.h" +++#include "widget_text.h" +++#include "widget_icon.h" +++#include "widget_bar.h" +++#include "drv.h" +++ +++#include "drv_generic_text.h" +++#include "drv_generic_graphic.h" +++#include "drv_generic_spidev.h" +++ +++#ifdef WITH_DMALLOC +++#include +++#endif +++ +++#define TEW673GRU_NUM_COLS 220 +++#define TEW673GRU_NUM_ROWS 176 +++#define TEW673GRU_BPP 2 /* bytes per pixel */ +++ +++#define TEW673GRU_CMD_SIZE 9 +++#define TEW673GRU_NUM_ROW_BYTES (TEW673GRU_NUM_COLS * TEW673GRU_BPP) +++ +++enum { +++ CMD_SHOW_STRING = 49, +++ CMD_SHOW_IMAGE_DIR = 52, +++ CMD_SCREEN_COLOR = 54, +++}; +++ +++static char Name[] = "TEW673GRU"; +++ +++static char *drv_TEW673GRU_FB; +++static long FB_SIZE; +++static int MODE; +++ +++static unsigned int RGBAto16(RGBA rgb) +++{ +++ return (((rgb.R >> 3) << 11) | ((rgb.G >> 2) << 5) | (rgb.B >> 3)); +++} +++ +++static unsigned char color_msb(unsigned int color) +++{ +++ return color >> 8; +++} +++ +++static unsigned char color_lsb(unsigned int color) +++{ +++ return color & 0xff; +++} +++ +++static void drv_TEW673GRU_hw_clear(const unsigned int color) +++{ +++ unsigned char cmd[TEW673GRU_CMD_SIZE]; +++ struct spi_ioc_transfer tr[1]; +++ +++ memset(tr, '\0', sizeof(tr)); +++ memset(cmd, '\0', sizeof(cmd)); +++ +++ cmd[0] = CMD_SCREEN_COLOR; +++ cmd[7] = color_msb(color); +++ cmd[8] = color_lsb(color); +++ +++ tr[0].tx_buf = (unsigned long) cmd; +++ tr[0].len = sizeof(cmd); +++ +++ drv_generic_spidev_transfer(1, tr); +++} +++ +++static void drv_TEW673GRU_hw_send_row(const int row, const int col, const char *data, const int width) +++{ +++ unsigned char cmd[TEW673GRU_CMD_SIZE]; +++ struct spi_ioc_transfer tr[2]; +++ int datasize; +++ +++ memset(tr, '\0', sizeof(tr)); +++ memset(cmd, '\0', sizeof(cmd)); +++ +++ datasize = width * TEW673GRU_BPP; +++ +++ cmd[0] = CMD_SHOW_IMAGE_DIR; +++ cmd[1] = col; +++ cmd[2] = col + width; +++ cmd[3] = row; +++ cmd[4] = row; +++ cmd[5] = datasize >> 8; +++ cmd[6] = datasize & 0xff; +++ +++ tr[0].tx_buf = (unsigned long) cmd; +++ tr[0].len = sizeof(cmd); +++ tr[1].tx_buf = (unsigned long) data; +++ tr[1].len = datasize; +++ +++ drv_generic_spidev_transfer(2, tr); +++} +++ +++static void drv_TEW673GRU_hw_write_string(const int row, const int col, const char *data, const int datasize) +++{ +++ unsigned char cmd[TEW673GRU_CMD_SIZE]; +++ struct spi_ioc_transfer tr[2]; +++ unsigned char len; +++ +++ memset(tr, '\0', sizeof(tr)); +++ memset(cmd, '\0', sizeof(cmd)); +++ +++ len = datasize & 0xff; +++ cmd[0] = CMD_SHOW_STRING; +++ cmd[1] = col; +++ cmd[2] = col + (XRES * len); +++ cmd[3] = row; +++ cmd[4] = row + YRES; +++ cmd[7] = 0; +++ cmd[8] = len; +++ +++ tr[0].tx_buf = (unsigned long) cmd; +++ tr[0].len = sizeof(cmd); +++ tr[1].tx_buf = (unsigned long) data; +++ tr[1].len = datasize; +++ +++ drv_generic_spidev_transfer(2, tr); +++} +++ +++static void drv_TEW673GRU_FB_set_pixel(const int col, const unsigned int color) +++{ +++ int pos; +++ +++ pos = col * TEW673GRU_BPP; +++ drv_TEW673GRU_FB[pos] = color_msb(color); +++ drv_TEW673GRU_FB[pos + 1] = color_lsb(color); +++} +++ +++static void drv_TEW673GRU_blit(const int row, const int col, const int height, const int width) +++{ +++ int r, c; +++ +++ debug("%s: update area r:%d c:%d w:%d h:%d", Name, row, col, height, width); +++ +++ for (r = row; r < row + height; r++) { +++ for (c = col; c < col + width; c++) { +++ unsigned int color; +++ RGBA rgb; +++ +++ rgb = drv_generic_graphic_rgb(r, c); +++ color = RGBAto16(rgb); +++ drv_TEW673GRU_FB_set_pixel(c, color); +++ } +++ +++ if (width) { +++ char *data; +++ +++ data = &drv_TEW673GRU_FB[col * TEW673GRU_BPP]; +++ drv_TEW673GRU_hw_send_row(r, col, data, width); +++ udelay(100 + width * 50); +++ } +++ } +++} +++ +++static void drv_TEW673GRU_clear(RGBA rgba) +++{ +++ unsigned int color; +++ +++ color = RGBAto16(rgba); +++ drv_TEW673GRU_hw_clear(color); +++} +++ +++static void drv_TEW673GRU_write(const int row, const int col, const char *data, const int len) +++{ +++ int i; +++ +++ for (i = 0; i < len; i++) { +++ drv_TEW673GRU_hw_write_string(row * YRES, (col + i) * XRES, " ", 1); +++ udelay(10000); +++ drv_TEW673GRU_hw_write_string(row * YRES, 2 + (col + i) * XRES, " ", 1); +++ udelay(10000); +++ drv_TEW673GRU_hw_write_string(row * YRES, (col + i) * XRES, &data[i], 1); +++ udelay(10000); +++ } +++} +++ +++static int drv_TEW673GRU_open(const char *section) +++{ +++ int err; +++ +++ err = drv_generic_spidev_open(section, Name); +++ if (err < 0) +++ return err; +++ +++ return 0; +++} +++ +++static int drv_TEW673GRU_close(void) +++{ +++ drv_generic_spidev_close(); +++ return 0; +++} +++ +++static void drv_TEW673GRU_clear_screen(void) +++{ +++ if (MODE) { +++ drv_generic_graphic_clear(); +++ } else { +++ memset(drv_TEW673GRU_FB, ' ', FB_SIZE); +++ drv_TEW673GRU_hw_clear(0x0000); +++ } +++} +++ +++static int drv_TEW673GRU_init_font(const char *section) +++{ +++ char *font; +++ int ret = -1; +++ +++ font = cfg_get(section, "Font", "6x8"); +++ if (font == NULL) { +++ error("%s: no '%s.Font' entry from %s", Name, section, cfg_source()); +++ goto out; +++ } +++ +++ if (*font == '\0') { +++ error("%s: invalid '%s.Font' entry in %s", Name, section, cfg_source()); +++ goto out_free; +++ } +++ +++ XRES = -1; +++ YRES = -1; +++ if (sscanf(font, "%dx%d", &XRES, &YRES) != 2 || +++ XRES < 1 || +++ YRES < 1) { +++ error("%s: bad Font '%s' from %s", Name, font, cfg_source()); +++ goto out_free; +++ } +++ +++ if (XRES != 6 && YRES != 8) { +++ error("%s: bad Font '%s' from %s (only 6x8 at the moment)", +++ Name, font, cfg_source()); +++ goto out_free; +++ } +++ +++ error("%s: font '%s' selected", Name, font); +++ +++ ret = 0; +++ +++out_free: +++ free(font); +++out: +++ return ret; +++} +++ +++static int drv_TEW673GRU_start(const char *section) +++{ +++ int ret; +++ +++ DCOLS = TEW673GRU_NUM_COLS; +++ DROWS = TEW673GRU_NUM_ROWS; +++ +++ if (MODE) { +++ ret = drv_TEW673GRU_init_font(section); +++ if (ret) +++ goto err; +++ +++ FB_SIZE = DCOLS * TEW673GRU_BPP; +++ } else { +++ XRES = 10; +++ YRES = 16; +++ DCOLS = DCOLS / XRES; +++ DROWS = DROWS / YRES; +++ +++ FB_SIZE = DCOLS * DROWS; +++ } +++ +++ if (FB_SIZE) { +++ drv_TEW673GRU_FB = malloc(FB_SIZE); +++ if (drv_TEW673GRU_FB == NULL) { +++ error("%s: framebuffer could not be allocated", Name); +++ goto err; +++ } +++ } +++ +++ ret = drv_TEW673GRU_open(section); +++ if (ret < 0) +++ goto err_free; +++ +++ if (MODE == 0) +++ drv_TEW673GRU_clear_screen(); +++ +++ return 0; +++ +++ err_free: +++ if (drv_TEW673GRU_FB) +++ free(drv_TEW673GRU_FB); +++ err: +++ return -1; +++} +++ +++static int drv_TEW673GRU_greet(const char *msg1, const char *msg2) +++{ +++ if (MODE) +++ return drv_generic_graphic_greet(msg1, msg2); +++ +++ return drv_generic_text_greet(msg1, msg2); +++} +++ +++ +++/****************************************/ +++/*** widget callbacks ***/ +++/****************************************/ +++ +++ +++/* using drv_generic_text_draw(W) */ +++/* using drv_generic_text_icon_draw(W) */ +++/* using drv_generic_text_bar_draw(W) */ +++/* using drv_generic_gpio_draw(W) */ +++ +++ +++/****************************************/ +++/*** exported functions ***/ +++/****************************************/ +++ +++int drv_TEW673GRU_list(void) +++{ +++ printf("TEW673GRU driver"); +++ return 0; +++} +++ +++int drv_TEW673GRU_init(const char *section, const int quiet) +++{ +++ WIDGET_CLASS wc; +++ int ret; +++ +++ cfg_number(section, "Mode", 0, 0, 1, &MODE); +++ +++ if (MODE) { +++ drv_generic_graphic_real_blit = drv_TEW673GRU_blit; +++ drv_generic_graphic_real_clear = drv_TEW673GRU_clear; +++ } else { +++ drv_generic_text_real_write = drv_TEW673GRU_write; +++ } +++ +++ ret = drv_TEW673GRU_start(section); +++ if (ret) +++ return ret; +++ +++ if (MODE) { +++ ret = drv_generic_graphic_init(section, Name); +++ if (ret) +++ return ret; +++ } else { +++ ret = drv_generic_text_init(section, Name); +++ if (ret) +++ return ret; +++ +++ ret = drv_generic_text_icon_init(); +++ if (ret != 0) +++ return ret; +++ +++ ret = drv_generic_text_bar_init(1); +++ if (ret != 0) +++ return ret; +++ +++ drv_generic_text_bar_add_segment(0, 0, 255, ' '); +++ drv_generic_text_bar_add_segment(255, 255, 255, '#'); +++ +++ wc = Widget_Text; +++ wc.draw = drv_generic_text_draw; +++ widget_register(&wc); +++ +++ wc = Widget_Icon; +++ wc.draw = drv_generic_text_icon_draw; +++ widget_register(&wc); +++ +++ wc = Widget_Bar; +++ wc.draw = drv_generic_text_bar_draw; +++ widget_register(&wc); +++ } +++ +++ if (!quiet) { +++ char buffer[40]; +++ qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS); +++ drv_TEW673GRU_greet(buffer, "www.openwrt.org"); +++ sleep(3); +++ drv_TEW673GRU_clear_screen(); +++ } +++ +++ return 0; +++} +++ +++int drv_TEW673GRU_quit(const int quiet) +++{ +++ +++ info("%s: shutting down.", Name); +++ +++ drv_TEW673GRU_clear_screen(); +++ +++ if (!quiet) +++ drv_TEW673GRU_greet("goodbye!", NULL); +++ +++ if (MODE) +++ drv_generic_graphic_quit(); +++ else +++ drv_generic_text_quit(); +++ +++ debug("closing connection"); +++ drv_TEW673GRU_close(); +++ +++ return (0); +++} +++ +++DRIVER drv_TEW673GRU = { +++ .name = Name, +++ .list = drv_TEW673GRU_list, +++ .init = drv_TEW673GRU_init, +++ .quit = drv_TEW673GRU_quit, +++}; ++--- a/lcd4linux.conf.sample +++++ b/lcd4linux.conf.sample ++@@ -571,6 +571,11 @@ Display FutabaVFD { ++ } ++ } ++ +++Display TEW673GRU { +++ Driver 'TEW673GRU' +++ Font '6x8' +++ Port '/dev/spidev1.0' +++} ++ ++ #Plugin KVV { ++ # StationID '12_701' +diff --git a/feeds/packages/utils/lcd4linux/patches/100-drv_RouterBoard.patch b/feeds/packages/utils/lcd4linux/patches/100-drv_RouterBoard.patch +new file mode 100644 +index 0000000..9780f5a +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/100-drv_RouterBoard.patch +@@ -0,0 +1,11 @@ ++--- a/drv_RouterBoard.c +++++ b/drv_RouterBoard.c ++@@ -106,7 +106,7 @@ ++ #include ++ #include ++ #include ++-#include +++#include ++ ++ #include "debug.h" ++ #include "cfg.h" +diff --git a/feeds/packages/utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch b/feeds/packages/utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch +new file mode 100644 +index 0000000..8f6d861 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch +@@ -0,0 +1,11 @@ ++--- a/plugin_netinfo.c +++++ b/plugin_netinfo.c ++@@ -264,7 +264,7 @@ static void my_netmask_short(RESULT * re ++ sin = get_netmask(arg1); ++ if (NULL != sin) { ++ logval = (long double) (get_netmask(arg1)->sin_addr.s_addr); ++- netlen = (int) rint(log2l(logval) / log2l(2.0)); +++ netlen = (int) rint(log2f(logval) / log2f(2.0)); ++ qprintf(value, sizeof(value), "/%d", netlen); ++ } else { ++ qprintf(value, sizeof(value), "/?"); +diff --git a/feeds/packages/utils/lcd4linux/patches/120-remove-as-needed-linker-option.patch b/feeds/packages/utils/lcd4linux/patches/120-remove-as-needed-linker-option.patch +new file mode 100644 +index 0000000..b5e56fe +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/120-remove-as-needed-linker-option.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS=-I m4 ++ # use this for lots of warnings ++ #AM_CFLAGS = -D_GNU_SOURCE -std=c99 -m64 -Wall -W -pedantic -Wno-variadic-macros -fno-strict-aliasing ++ ++-lcd4linux_LDFLAGS ="-Wl,--as-needed" +++lcd4linux_LDFLAGS = ++ lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@ ++ lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@ ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/140-no_repnop_T6963.patch b/feeds/packages/utils/lcd4linux/patches/140-no_repnop_T6963.patch +new file mode 100644 +index 0000000..85be2c3 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/140-no_repnop_T6963.patch +@@ -0,0 +1,22 @@ ++--- a/drv_T6963.c +++++ b/drv_T6963.c ++@@ -114,7 +114,9 @@ static void drv_T6_status1(void) ++ /* wait for STA0=1 and STA1=1 */ ++ n = 0; ++ do { +++#if 0 ++ rep_nop(); +++#endif ++ if (++n > 1000) { ++ debug("hang in status1"); ++ bug = 1; ++@@ -150,7 +152,9 @@ static void drv_T6_status2(void) ++ /* wait for STA3=1 */ ++ n = 0; ++ do { +++#if 0 ++ rep_nop(); +++#endif ++ if (++n > 1000) { ++ debug("hang in status2"); ++ bug = 1; +diff --git a/feeds/packages/utils/lcd4linux/patches/150-addlibmpdclient.patch b/feeds/packages/utils/lcd4linux/patches/150-addlibmpdclient.patch +new file mode 100644 +index 0000000..0e51f67 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/150-addlibmpdclient.patch +@@ -0,0 +1,2624 @@ ++--- /dev/null +++++ b/libmpdclient.c ++@@ -0,0 +1,1957 @@ +++/* libmpdclient +++ (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com) +++ This project's homepage is: http://www.musicpd.org +++ +++ Redistribution and use in source and binary forms, with or without +++ modification, are permitted provided that the following conditions +++ are met: +++ +++ - Redistributions of source code must retain the above copyright +++ notice, this list of conditions and the following disclaimer. +++ +++ - 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. +++ +++ - Neither the name of the Music Player Daemon 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 COPYRIGHT HOLDERS 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 FOUNDATION 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. +++*/ +++ +++#include "libmpdclient.h" +++ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#ifdef WIN32 +++# include +++# include +++#else +++# include +++# include +++# include +++# include +++#endif +++ +++/* (bits+1)/3 (plus the sign character) */ +++#define INTLEN ((sizeof(int) * CHAR_BIT + 1) / 3 + 1) +++#define LONGLONGLEN ((sizeof(long long) * CHAR_BIT + 1) / 3 + 1) +++ +++#define COMMAND_LIST 1 +++#define COMMAND_LIST_OK 2 +++ +++#ifndef MPD_NO_GAI +++# ifdef AI_ADDRCONFIG +++# define MPD_HAVE_GAI +++# endif +++#endif +++ +++#ifndef MSG_DONTWAIT +++# define MSG_DONTWAIT 0 +++#endif +++ +++#ifdef WIN32 +++# define SELECT_ERRNO_IGNORE (errno == WSAEINTR || errno == WSAEINPROGRESS) +++# define SENDRECV_ERRNO_IGNORE SELECT_ERRNO_IGNORE +++#else +++# define SELECT_ERRNO_IGNORE (errno == EINTR) +++# define SENDRECV_ERRNO_IGNORE (errno == EINTR || errno == EAGAIN) +++# define winsock_dll_error(c) 0 +++# define closesocket(s) close(s) +++# define WSACleanup() do { /* nothing */ } while (0) +++#endif +++ +++#ifdef WIN32 +++static int winsock_dll_error(mpd_Connection * connection) +++{ +++ WSADATA wsaData; +++ if ((WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0 || LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) { +++ strcpy(connection->errorStr, "Could not find usable WinSock DLL."); +++ connection->error = MPD_ERROR_SYSTEM; +++ return 1; +++ } +++ return 0; +++} +++ +++static int do_connect_fail(mpd_Connection * connection, const struct sockaddr *serv_addr, int addrlen) +++{ +++ int iMode = 1; /* 0 = blocking, else non-blocking */ +++ ioctlsocket(connection->sock, FIONBIO, (u_long FAR *) & iMode); +++ return (connect(connection->sock, serv_addr, addrlen) == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK); +++} +++#else /* !WIN32 (sane operating systems) */ +++static int do_connect_fail(mpd_Connection * connection, const struct sockaddr *serv_addr, int addrlen) +++{ +++ int flags = fcntl(connection->sock, F_GETFL, 0); +++ fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK); +++ return (connect(connection->sock, serv_addr, addrlen) < 0 && errno != EINPROGRESS); +++} +++#endif /* !WIN32 */ +++ +++#ifdef MPD_HAVE_GAI +++static int mpd_connect(mpd_Connection * connection, const char *host, int port, float timeout) +++{ +++ int error; +++ char service[INTLEN + 1]; +++ struct addrinfo hints; +++ struct addrinfo *res = NULL; +++ struct addrinfo *addrinfo = NULL; +++ +++ /** +++ * Setup hints +++ */ +++ hints.ai_flags = AI_ADDRCONFIG; +++ hints.ai_family = PF_UNSPEC; +++ hints.ai_socktype = SOCK_STREAM; +++ hints.ai_protocol = IPPROTO_TCP; +++ hints.ai_addrlen = 0; +++ hints.ai_addr = NULL; +++ hints.ai_canonname = NULL; +++ hints.ai_next = NULL; +++ +++ snprintf(service, sizeof(service), "%i", port); +++ +++ error = getaddrinfo(host, service, &hints, &addrinfo); +++ +++ if (error) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "host \"%s\" not found: %s", host, gai_strerror(error)); +++ connection->error = MPD_ERROR_UNKHOST; +++ return -1; +++ } +++ +++ for (res = addrinfo; res; res = res->ai_next) { +++ /* create socket */ +++ connection->sock = socket(res->ai_family, SOCK_STREAM, res->ai_protocol); +++ if (connection->sock < 0) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "problems creating socket: %s", strerror(errno)); +++ connection->error = MPD_ERROR_SYSTEM; +++ freeaddrinfo(addrinfo); +++ return -1; +++ } +++ +++ mpd_setConnectionTimeout(connection, timeout); +++ +++ /* connect stuff */ +++ if (do_connect_fail(connection, res->ai_addr, res->ai_addrlen)) { +++ /* try the next address family */ +++ closesocket(connection->sock); +++ connection->sock = -1; +++ continue; +++ } +++ } +++ +++ freeaddrinfo(addrinfo); +++ +++ if (connection->sock < 0) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "problems connecting to \"%s\" on port %i: %s", host, port, strerror(errno)); +++ connection->error = MPD_ERROR_CONNPORT; +++ +++ return -1; +++ } +++ +++ return 0; +++} +++#else /* !MPD_HAVE_GAI */ +++static int mpd_connect(mpd_Connection * connection, const char *host, int port, float timeout) +++{ +++ struct hostent *he; +++ struct sockaddr *dest; +++ int destlen; +++ struct sockaddr_in sin; +++ +++ if (!(he = gethostbyname(host))) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "host \"%s\" not found", host); +++ connection->error = MPD_ERROR_UNKHOST; +++ return -1; +++ } +++ +++ memset(&sin, 0, sizeof(struct sockaddr_in)); +++ /*dest.sin_family = he->h_addrtype; */ +++ sin.sin_family = AF_INET; +++ sin.sin_port = htons(port); +++ +++ switch (he->h_addrtype) { +++ case AF_INET: +++ memcpy((char *) &sin.sin_addr.s_addr, (char *) he->h_addr, he->h_length); +++ dest = (struct sockaddr *) &sin; +++ destlen = sizeof(struct sockaddr_in); +++ break; +++ default: +++ strcpy(connection->errorStr, "address type is not IPv4"); +++ connection->error = MPD_ERROR_SYSTEM; +++ return -1; +++ break; +++ } +++ +++ if ((connection->sock = socket(dest->sa_family, SOCK_STREAM, 0)) < 0) { +++ strcpy(connection->errorStr, "problems creating socket"); +++ connection->error = MPD_ERROR_SYSTEM; +++ return -1; +++ } +++ +++ mpd_setConnectionTimeout(connection, timeout); +++ +++ /* connect stuff */ +++ if (do_connect_fail(connection, dest, destlen)) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "problems connecting to \"%s\" on port" " %i", host, port); +++ connection->error = MPD_ERROR_CONNPORT; +++ return -1; +++ } +++ +++ return 0; +++} +++#endif /* !MPD_HAVE_GAI */ +++ +++char *mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES] = { +++ "Artist", +++ "Album", +++ "Title", +++ "Track", +++ "Name", +++ "Genre", +++ "Date", +++ "Composer", +++ "Performer", +++ "Comment", +++ "Disc", +++ "Filename", +++ "Any" +++}; +++ +++static char *mpd_sanitizeArg(const char *arg) +++{ +++ size_t i; +++ char *ret; +++ register const char *c; +++ register char *rc; +++ +++ /* instead of counting in that loop above, just +++ * use a bit more memory and half running time +++ */ +++ ret = malloc(strlen(arg) * 2 + 1); +++ +++ c = arg; +++ rc = ret; +++ for (i = strlen(arg) + 1; i != 0; --i) { +++ if (*c == '"' || *c == '\\') +++ *rc++ = '\\'; +++ *(rc++) = *(c++); +++ } +++ +++ return ret; +++} +++ +++static mpd_ReturnElement *mpd_newReturnElement(const char *name, const char *value) +++{ +++ mpd_ReturnElement *ret = malloc(sizeof(mpd_ReturnElement)); +++ +++ ret->name = strdup(name); +++ ret->value = strdup(value); +++ +++ return ret; +++} +++ +++static void mpd_freeReturnElement(mpd_ReturnElement * re) +++{ +++ free(re->name); +++ free(re->value); +++ free(re); +++} +++ +++void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout) +++{ +++ connection->timeout.tv_sec = (int) timeout; +++ connection->timeout.tv_usec = (int) (timeout * 1e6 - connection->timeout.tv_sec * 1000000 + 0.5); +++} +++ +++static int mpd_parseWelcome(mpd_Connection * connection, const char *host, int port, char *rt, char *output) +++{ +++ char *tmp; +++ char *test; +++ int i; +++ +++ if (strncmp(output, MPD_WELCOME_MESSAGE, strlen(MPD_WELCOME_MESSAGE))) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "mpd not running on port %i on host \"%s\"", port, host); +++ connection->error = MPD_ERROR_NOTMPD; +++ return 1; +++ } +++ +++ tmp = &output[strlen(MPD_WELCOME_MESSAGE)]; +++ +++ for (i = 0; i < 3; i++) { +++ if (tmp) +++ connection->version[i] = strtol(tmp, &test, 10); +++ +++ if (!tmp || (test[0] != '.' && test[0] != '\0')) { +++ snprintf(connection->errorStr, +++ MPD_ERRORSTR_MAX_LENGTH, +++ "error parsing version number at " "\"%s\"", &output[strlen(MPD_WELCOME_MESSAGE)]); +++ connection->error = MPD_ERROR_NOTMPD; +++ return 1; +++ } +++ tmp = ++test; +++ } +++ +++ return 0; +++} +++ +++mpd_Connection *mpd_newConnection(const char *host, int port, float timeout) +++{ +++ int err; +++ char *rt; +++ char *output = NULL; +++ mpd_Connection *connection = malloc(sizeof(mpd_Connection)); +++ struct timeval tv; +++ fd_set fds; +++ strcpy(connection->buffer, ""); +++ connection->buflen = 0; +++ connection->bufstart = 0; +++ strcpy(connection->errorStr, ""); +++ connection->error = 0; +++ connection->doneProcessing = 0; +++ connection->commandList = 0; +++ connection->listOks = 0; +++ connection->doneListOk = 0; +++ connection->returnElement = NULL; +++ connection->request = NULL; +++ +++ if (winsock_dll_error(connection)) +++ return connection; +++ +++ if (mpd_connect(connection, host, port, timeout) < 0) +++ return connection; +++ +++ while (!(rt = strstr(connection->buffer, "\n"))) { +++ tv.tv_sec = connection->timeout.tv_sec; +++ tv.tv_usec = connection->timeout.tv_usec; +++ FD_ZERO(&fds); +++ FD_SET(connection->sock, &fds); +++ if ((err = select(connection->sock + 1, &fds, NULL, NULL, &tv)) == 1) { +++ int readed; +++ readed = recv(connection->sock, +++ &(connection->buffer[connection->buflen]), MPD_BUFFER_MAX_LENGTH - connection->buflen, 0); +++ if (readed <= 0) { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "problems getting a response from" " \"%s\" on port %i : %s", host, port, strerror(errno)); +++ connection->error = MPD_ERROR_NORESPONSE; +++ return connection; +++ } +++ connection->buflen += readed; +++ connection->buffer[connection->buflen] = '\0'; +++ } else if (err < 0) { +++ if (SELECT_ERRNO_IGNORE) +++ continue; +++ snprintf(connection->errorStr, +++ MPD_ERRORSTR_MAX_LENGTH, "problems connecting to \"%s\" on port" " %i", host, port); +++ connection->error = MPD_ERROR_CONNPORT; +++ return connection; +++ } else { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, +++ "timeout in attempting to get a response from" " \"%s\" on port %i", host, port); +++ connection->error = MPD_ERROR_NORESPONSE; +++ return connection; +++ } +++ } +++ +++ *rt = '\0'; +++ output = strdup(connection->buffer); +++ strcpy(connection->buffer, rt + 1); +++ connection->buflen = strlen(connection->buffer); +++ +++ if (mpd_parseWelcome(connection, host, port, rt, output) == 0) +++ connection->doneProcessing = 1; +++ +++ free(output); +++ +++ return connection; +++} +++ +++void mpd_clearError(mpd_Connection * connection) +++{ +++ connection->error = 0; +++ connection->errorStr[0] = '\0'; +++} +++ +++void mpd_closeConnection(mpd_Connection * connection) +++{ +++ closesocket(connection->sock); +++ if (connection->returnElement) +++ free(connection->returnElement); +++ if (connection->request) +++ free(connection->request); +++ free(connection); +++ WSACleanup(); +++} +++ +++static void mpd_executeCommand(mpd_Connection * connection, char *command) +++{ +++ int ret; +++ struct timeval tv; +++ fd_set fds; +++ char *commandPtr = command; +++ int commandLen = strlen(command); +++ +++ if (!connection->doneProcessing && !connection->commandList) { +++ strcpy(connection->errorStr, "not done processing current command"); +++ connection->error = 1; +++ return; +++ } +++ +++ mpd_clearError(connection); +++ +++ FD_ZERO(&fds); +++ FD_SET(connection->sock, &fds); +++ tv.tv_sec = connection->timeout.tv_sec; +++ tv.tv_usec = connection->timeout.tv_usec; +++ +++ while ((ret = select(connection->sock + 1, NULL, &fds, NULL, &tv) == 1) || (ret == -1 && SELECT_ERRNO_IGNORE)) { +++ ret = send(connection->sock, commandPtr, commandLen, MSG_DONTWAIT); +++ if (ret <= 0) { +++ if (SENDRECV_ERRNO_IGNORE) +++ continue; +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "problems giving command \"%s\"", command); +++ connection->error = MPD_ERROR_SENDING; +++ return; +++ } else { +++ commandPtr += ret; +++ commandLen -= ret; +++ } +++ +++ if (commandLen <= 0) +++ break; +++ } +++ +++ if (commandLen > 0) { +++ perror(""); +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "timeout sending command \"%s\"", command); +++ connection->error = MPD_ERROR_TIMEOUT; +++ return; +++ } +++ +++ if (!connection->commandList) +++ connection->doneProcessing = 0; +++ else if (connection->commandList == COMMAND_LIST_OK) { +++ connection->listOks++; +++ } +++} +++ +++static void mpd_getNextReturnElement(mpd_Connection * connection) +++{ +++ char *output = NULL; +++ char *rt = NULL; +++ char *name = NULL; +++ char *value = NULL; +++ fd_set fds; +++ struct timeval tv; +++ char *tok = NULL; +++ int readed; +++ char *bufferCheck = NULL; +++ int err; +++ int pos; +++ +++ if (connection->returnElement) +++ mpd_freeReturnElement(connection->returnElement); +++ connection->returnElement = NULL; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ strcpy(connection->errorStr, "already done processing current command"); +++ connection->error = 1; +++ return; +++ } +++ +++ bufferCheck = connection->buffer + connection->bufstart; +++ while (connection->bufstart >= connection->buflen || !(rt = strchr(bufferCheck, '\n'))) { +++ if (connection->buflen >= MPD_BUFFER_MAX_LENGTH) { +++ memmove(connection->buffer, +++ connection->buffer + connection->bufstart, connection->buflen - connection->bufstart + 1); +++ connection->buflen -= connection->bufstart; +++ connection->bufstart = 0; +++ } +++ if (connection->buflen >= MPD_BUFFER_MAX_LENGTH) { +++ strcpy(connection->errorStr, "buffer overrun"); +++ connection->error = MPD_ERROR_BUFFEROVERRUN; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ bufferCheck = connection->buffer + connection->buflen; +++ tv.tv_sec = connection->timeout.tv_sec; +++ tv.tv_usec = connection->timeout.tv_usec; +++ FD_ZERO(&fds); +++ FD_SET(connection->sock, &fds); +++ if ((err = select(connection->sock + 1, &fds, NULL, NULL, &tv) == 1)) { +++ readed = recv(connection->sock, +++ connection->buffer + connection->buflen, +++ MPD_BUFFER_MAX_LENGTH - connection->buflen, MSG_DONTWAIT); +++ if (readed < 0 && SENDRECV_ERRNO_IGNORE) { +++ continue; +++ } +++ if (readed <= 0) { +++ strcpy(connection->errorStr, "connection" " closed"); +++ connection->error = MPD_ERROR_CONNCLOSED; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ connection->buflen += readed; +++ connection->buffer[connection->buflen] = '\0'; +++ } else if (err < 0 && SELECT_ERRNO_IGNORE) +++ continue; +++ else { +++ strcpy(connection->errorStr, "connection timeout"); +++ connection->error = MPD_ERROR_TIMEOUT; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ } +++ +++ *rt = '\0'; +++ output = connection->buffer + connection->bufstart; +++ connection->bufstart = rt - connection->buffer + 1; +++ +++ if (strcmp(output, "OK") == 0) { +++ if (connection->listOks > 0) { +++ strcpy(connection->errorStr, "expected more list_OK's"); +++ connection->error = 1; +++ } +++ connection->listOks = 0; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ return; +++ } +++ +++ if (strcmp(output, "list_OK") == 0) { +++ if (!connection->listOks) { +++ strcpy(connection->errorStr, "got an unexpected list_OK"); +++ connection->error = 1; +++ } else { +++ connection->doneListOk = 1; +++ connection->listOks--; +++ } +++ return; +++ } +++ +++ if (strncmp(output, "ACK", strlen("ACK")) == 0) { +++ char *test; +++ char *needle; +++ int val; +++ +++ strcpy(connection->errorStr, output); +++ connection->error = MPD_ERROR_ACK; +++ connection->errorCode = MPD_ACK_ERROR_UNK; +++ connection->errorAt = MPD_ERROR_AT_UNK; +++ connection->doneProcessing = 1; +++ connection->doneListOk = 0; +++ +++ needle = strchr(output, '['); +++ if (!needle) +++ return; +++ val = strtol(needle + 1, &test, 10); +++ if (*test != '@') +++ return; +++ connection->errorCode = val; +++ val = strtol(test + 1, &test, 10); +++ if (*test != ']') +++ return; +++ connection->errorAt = val; +++ return; +++ } +++ +++ tok = strchr(output, ':'); +++ if (!tok) +++ return; +++ pos = tok - output; +++ value = ++tok; +++ name = output; +++ name[pos] = '\0'; +++ +++ if (value[0] == ' ') { +++ connection->returnElement = mpd_newReturnElement(name, &(value[1])); +++ } else { +++ snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "error parsing: %s:%s", name, value); +++ connection->error = 1; +++ } +++} +++ +++void mpd_finishCommand(mpd_Connection * connection) +++{ +++ while (!connection->doneProcessing) { +++ if (connection->doneListOk) +++ connection->doneListOk = 0; +++ mpd_getNextReturnElement(connection); +++ } +++} +++ +++static void mpd_finishListOkCommand(mpd_Connection * connection) +++{ +++ while (!connection->doneProcessing && connection->listOks && !connection->doneListOk) { +++ mpd_getNextReturnElement(connection); +++ } +++} +++ +++int mpd_nextListOkCommand(mpd_Connection * connection) +++{ +++ mpd_finishListOkCommand(connection); +++ if (!connection->doneProcessing) +++ connection->doneListOk = 0; +++ if (connection->listOks == 0 || connection->doneProcessing) +++ return -1; +++ return 0; +++} +++ +++void mpd_sendStatusCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "status\n"); +++} +++ +++mpd_Status *mpd_getStatus(mpd_Connection * connection) +++{ +++ mpd_Status *status; +++ +++ /*mpd_executeCommand(connection,"status\n"); +++ +++ if(connection->error) return NULL; */ +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ status = malloc(sizeof(mpd_Status)); +++ status->volume = -1; +++ status->repeat = 0; +++ status->random = 0; +++ status->playlist = -1; +++ status->playlistLength = -1; +++ status->state = -1; +++ status->song = 0; +++ status->songid = 0; +++ status->elapsedTime = 0; +++ status->totalTime = 0; +++ status->bitRate = 0; +++ status->sampleRate = 0; +++ status->bits = 0; +++ status->channels = 0; +++ status->crossfade = -1; +++ status->error = NULL; +++ status->updatingDb = 0; +++ +++ if (connection->error) { +++ free(status); +++ return NULL; +++ } +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ if (strcmp(re->name, "volume") == 0) { +++ status->volume = atoi(re->value); +++ } else if (strcmp(re->name, "repeat") == 0) { +++ status->repeat = atoi(re->value); +++ } else if (strcmp(re->name, "random") == 0) { +++ status->random = atoi(re->value); +++ } else if (strcmp(re->name, "playlist") == 0) { +++ status->playlist = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "playlistlength") == 0) { +++ status->playlistLength = atoi(re->value); +++ } else if (strcmp(re->name, "bitrate") == 0) { +++ status->bitRate = atoi(re->value); +++ } else if (strcmp(re->name, "state") == 0) { +++ if (strcmp(re->value, "play") == 0) { +++ status->state = MPD_STATUS_STATE_PLAY; +++ } else if (strcmp(re->value, "stop") == 0) { +++ status->state = MPD_STATUS_STATE_STOP; +++ } else if (strcmp(re->value, "pause") == 0) { +++ status->state = MPD_STATUS_STATE_PAUSE; +++ } else { +++ status->state = MPD_STATUS_STATE_UNKNOWN; +++ } +++ } else if (strcmp(re->name, "song") == 0) { +++ status->song = atoi(re->value); +++ } else if (strcmp(re->name, "songid") == 0) { +++ status->songid = atoi(re->value); +++ } else if (strcmp(re->name, "time") == 0) { +++ char *tok = strchr(re->value, ':'); +++ /* the second strchr below is a safety check */ +++ if (tok && (strchr(tok, 0) > (tok + 1))) { +++ /* atoi stops at the first non-[0-9] char: */ +++ status->elapsedTime = atoi(re->value); +++ status->totalTime = atoi(tok + 1); +++ } +++ } else if (strcmp(re->name, "error") == 0) { +++ status->error = strdup(re->value); +++ } else if (strcmp(re->name, "xfade") == 0) { +++ status->crossfade = atoi(re->value); +++ } else if (strcmp(re->name, "updating_db") == 0) { +++ status->updatingDb = atoi(re->value); +++ } else if (strcmp(re->name, "audio") == 0) { +++ char *tok = strchr(re->value, ':'); +++ if (tok && (strchr(tok, 0) > (tok + 1))) { +++ status->sampleRate = atoi(re->value); +++ status->bits = atoi(++tok); +++ tok = strchr(tok, ':'); +++ if (tok && (strchr(tok, 0) > (tok + 1))) +++ status->channels = atoi(tok + 1); +++ } +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(status); +++ return NULL; +++ } +++ } +++ +++ if (connection->error) { +++ free(status); +++ return NULL; +++ } else if (status->state < 0) { +++ strcpy(connection->errorStr, "state not found"); +++ connection->error = 1; +++ free(status); +++ return NULL; +++ } +++ +++ return status; +++} +++ +++void mpd_freeStatus(mpd_Status * status) +++{ +++ if (status->error) +++ free(status->error); +++ free(status); +++} +++ +++void mpd_sendStatsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "stats\n"); +++} +++ +++mpd_Stats *mpd_getStats(mpd_Connection * connection) +++{ +++ mpd_Stats *stats; +++ +++ /*mpd_executeCommand(connection,"stats\n"); +++ +++ if(connection->error) return NULL; */ +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ stats = malloc(sizeof(mpd_Stats)); +++ stats->numberOfArtists = 0; +++ stats->numberOfAlbums = 0; +++ stats->numberOfSongs = 0; +++ stats->uptime = 0; +++ stats->dbUpdateTime = 0; +++ stats->playTime = 0; +++ stats->dbPlayTime = 0; +++ +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ if (strcmp(re->name, "artists") == 0) { +++ stats->numberOfArtists = atoi(re->value); +++ } else if (strcmp(re->name, "albums") == 0) { +++ stats->numberOfAlbums = atoi(re->value); +++ } else if (strcmp(re->name, "songs") == 0) { +++ stats->numberOfSongs = atoi(re->value); +++ } else if (strcmp(re->name, "uptime") == 0) { +++ stats->uptime = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "db_update") == 0) { +++ stats->dbUpdateTime = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "playtime") == 0) { +++ stats->playTime = strtol(re->value, NULL, 10); +++ } else if (strcmp(re->name, "db_playtime") == 0) { +++ stats->dbPlayTime = strtol(re->value, NULL, 10); +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ } +++ +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ +++ return stats; +++} +++ +++void mpd_freeStats(mpd_Stats * stats) +++{ +++ free(stats); +++} +++ +++mpd_SearchStats *mpd_getSearchStats(mpd_Connection * connection) +++{ +++ mpd_SearchStats *stats; +++ mpd_ReturnElement *re; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ if (connection->error) +++ return NULL; +++ +++ stats = malloc(sizeof(mpd_SearchStats)); +++ stats->numberOfSongs = 0; +++ stats->playTime = 0; +++ +++ while (connection->returnElement) { +++ re = connection->returnElement; +++ +++ if (strcmp(re->name, "songs") == 0) { +++ stats->numberOfSongs = atoi(re->value); +++ } else if (strcmp(re->name, "playtime") == 0) { +++ stats->playTime = strtol(re->value, NULL, 10); +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ } +++ +++ if (connection->error) { +++ free(stats); +++ return NULL; +++ } +++ +++ return stats; +++} +++ +++void mpd_freeSearchStats(mpd_SearchStats * stats) +++{ +++ free(stats); +++} +++ +++static void mpd_initSong(mpd_Song * song) +++{ +++ song->file = NULL; +++ song->artist = NULL; +++ song->album = NULL; +++ song->track = NULL; +++ song->title = NULL; +++ song->name = NULL; +++ song->date = NULL; +++ /* added by Qball */ +++ song->genre = NULL; +++ song->composer = NULL; +++ song->performer = NULL; +++ song->disc = NULL; +++ song->comment = NULL; +++ +++ song->time = MPD_SONG_NO_TIME; +++ song->pos = MPD_SONG_NO_NUM; +++ song->id = MPD_SONG_NO_ID; +++} +++ +++static void mpd_finishSong(mpd_Song * song) +++{ +++ if (song->file) +++ free(song->file); +++ if (song->artist) +++ free(song->artist); +++ if (song->album) +++ free(song->album); +++ if (song->title) +++ free(song->title); +++ if (song->track) +++ free(song->track); +++ if (song->name) +++ free(song->name); +++ if (song->date) +++ free(song->date); +++ if (song->genre) +++ free(song->genre); +++ if (song->composer) +++ free(song->composer); +++ if (song->disc) +++ free(song->disc); +++ if (song->comment) +++ free(song->comment); +++} +++ +++mpd_Song *mpd_newSong(void) +++{ +++ mpd_Song *ret = malloc(sizeof(mpd_Song)); +++ +++ mpd_initSong(ret); +++ +++ return ret; +++} +++ +++void mpd_freeSong(mpd_Song * song) +++{ +++ mpd_finishSong(song); +++ free(song); +++} +++ +++mpd_Song *mpd_songDup(mpd_Song * song) +++{ +++ mpd_Song *ret = mpd_newSong(); +++ +++ if (song->file) +++ ret->file = strdup(song->file); +++ if (song->artist) +++ ret->artist = strdup(song->artist); +++ if (song->album) +++ ret->album = strdup(song->album); +++ if (song->title) +++ ret->title = strdup(song->title); +++ if (song->track) +++ ret->track = strdup(song->track); +++ if (song->name) +++ ret->name = strdup(song->name); +++ if (song->date) +++ ret->date = strdup(song->date); +++ if (song->genre) +++ ret->genre = strdup(song->genre); +++ if (song->composer) +++ ret->composer = strdup(song->composer); +++ if (song->disc) +++ ret->disc = strdup(song->disc); +++ if (song->comment) +++ ret->comment = strdup(song->comment); +++ ret->time = song->time; +++ ret->pos = song->pos; +++ ret->id = song->id; +++ +++ return ret; +++} +++ +++static void mpd_initDirectory(mpd_Directory * directory) +++{ +++ directory->path = NULL; +++} +++ +++static void mpd_finishDirectory(mpd_Directory * directory) +++{ +++ if (directory->path) +++ free(directory->path); +++} +++ +++mpd_Directory *mpd_newDirectory(void) +++{ +++ mpd_Directory *directory = malloc(sizeof(mpd_Directory));; +++ +++ mpd_initDirectory(directory); +++ +++ return directory; +++} +++ +++void mpd_freeDirectory(mpd_Directory * directory) +++{ +++ mpd_finishDirectory(directory); +++ +++ free(directory); +++} +++ +++mpd_Directory *mpd_directoryDup(mpd_Directory * directory) +++{ +++ mpd_Directory *ret = mpd_newDirectory(); +++ +++ if (directory->path) +++ ret->path = strdup(directory->path); +++ +++ return ret; +++} +++ +++static void mpd_initPlaylistFile(mpd_PlaylistFile * playlist) +++{ +++ playlist->path = NULL; +++} +++ +++static void mpd_finishPlaylistFile(mpd_PlaylistFile * playlist) +++{ +++ if (playlist->path) +++ free(playlist->path); +++} +++ +++mpd_PlaylistFile *mpd_newPlaylistFile(void) +++{ +++ mpd_PlaylistFile *playlist = malloc(sizeof(mpd_PlaylistFile)); +++ +++ mpd_initPlaylistFile(playlist); +++ +++ return playlist; +++} +++ +++void mpd_freePlaylistFile(mpd_PlaylistFile * playlist) +++{ +++ mpd_finishPlaylistFile(playlist); +++ free(playlist); +++} +++ +++mpd_PlaylistFile *mpd_playlistFileDup(mpd_PlaylistFile * playlist) +++{ +++ mpd_PlaylistFile *ret = mpd_newPlaylistFile(); +++ +++ if (playlist->path) +++ ret->path = strdup(playlist->path); +++ +++ return ret; +++} +++ +++static void mpd_initInfoEntity(mpd_InfoEntity * entity) +++{ +++ entity->info.directory = NULL; +++} +++ +++static void mpd_finishInfoEntity(mpd_InfoEntity * entity) +++{ +++ if (entity->info.directory) { +++ if (entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) { +++ mpd_freeDirectory(entity->info.directory); +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_SONG) { +++ mpd_freeSong(entity->info.song); +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) { +++ mpd_freePlaylistFile(entity->info.playlistFile); +++ } +++ } +++} +++ +++mpd_InfoEntity *mpd_newInfoEntity(void) +++{ +++ mpd_InfoEntity *entity = malloc(sizeof(mpd_InfoEntity)); +++ +++ mpd_initInfoEntity(entity); +++ +++ return entity; +++} +++ +++void mpd_freeInfoEntity(mpd_InfoEntity * entity) +++{ +++ mpd_finishInfoEntity(entity); +++ free(entity); +++} +++ +++static void mpd_sendInfoCommand(mpd_Connection * connection, char *command) +++{ +++ mpd_executeCommand(connection, command); +++} +++ +++mpd_InfoEntity *mpd_getNextInfoEntity(mpd_Connection * connection) +++{ +++ mpd_InfoEntity *entity = NULL; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ if (connection->returnElement) { +++ if (strcmp(connection->returnElement->name, "file") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_SONG; +++ entity->info.song = mpd_newSong(); +++ entity->info.song->file = strdup(connection->returnElement->value); +++ } else if (strcmp(connection->returnElement->name, "directory") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_DIRECTORY; +++ entity->info.directory = mpd_newDirectory(); +++ entity->info.directory->path = strdup(connection->returnElement->value); +++ } else if (strcmp(connection->returnElement->name, "playlist") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_PLAYLISTFILE; +++ entity->info.playlistFile = mpd_newPlaylistFile(); +++ entity->info.playlistFile->path = strdup(connection->returnElement->value); +++ } else if (strcmp(connection->returnElement->name, "cpos") == 0) { +++ entity = mpd_newInfoEntity(); +++ entity->type = MPD_INFO_ENTITY_TYPE_SONG; +++ entity->info.song = mpd_newSong(); +++ entity->info.song->pos = atoi(connection->returnElement->value); +++ } else { +++ connection->error = 1; +++ strcpy(connection->errorStr, "problem parsing song info"); +++ return NULL; +++ } +++ } else +++ return NULL; +++ +++ mpd_getNextReturnElement(connection); +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ +++ if (strcmp(re->name, "file") == 0) +++ return entity; +++ else if (strcmp(re->name, "directory") == 0) +++ return entity; +++ else if (strcmp(re->name, "playlist") == 0) +++ return entity; +++ else if (strcmp(re->name, "cpos") == 0) +++ return entity; +++ +++ if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && strlen(re->value)) { +++ if (!entity->info.song->artist && strcmp(re->name, "Artist") == 0) { +++ entity->info.song->artist = strdup(re->value); +++ } else if (!entity->info.song->album && strcmp(re->name, "Album") == 0) { +++ entity->info.song->album = strdup(re->value); +++ } else if (!entity->info.song->title && strcmp(re->name, "Title") == 0) { +++ entity->info.song->title = strdup(re->value); +++ } else if (!entity->info.song->track && strcmp(re->name, "Track") == 0) { +++ entity->info.song->track = strdup(re->value); +++ } else if (!entity->info.song->name && strcmp(re->name, "Name") == 0) { +++ entity->info.song->name = strdup(re->value); +++ } else if (entity->info.song->time == MPD_SONG_NO_TIME && strcmp(re->name, "Time") == 0) { +++ entity->info.song->time = atoi(re->value); +++ } else if (entity->info.song->pos == MPD_SONG_NO_NUM && strcmp(re->name, "Pos") == 0) { +++ entity->info.song->pos = atoi(re->value); +++ } else if (entity->info.song->id == MPD_SONG_NO_ID && strcmp(re->name, "Id") == 0) { +++ entity->info.song->id = atoi(re->value); +++ } else if (!entity->info.song->date && strcmp(re->name, "Date") == 0) { +++ entity->info.song->date = strdup(re->value); +++ } else if (!entity->info.song->genre && strcmp(re->name, "Genre") == 0) { +++ entity->info.song->genre = strdup(re->value); +++ } else if (!entity->info.song->composer && strcmp(re->name, "Composer") == 0) { +++ entity->info.song->composer = strdup(re->value); +++ } else if (!entity->info.song->performer && strcmp(re->name, "Performer") == 0) { +++ entity->info.song->performer = strdup(re->value); +++ } else if (!entity->info.song->disc && strcmp(re->name, "Disc") == 0) { +++ entity->info.song->disc = strdup(re->value); +++ } else if (!entity->info.song->comment && strcmp(re->name, "Comment") == 0) { +++ entity->info.song->comment = strdup(re->value); +++ } +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) { +++ } else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) { +++ } +++ +++ mpd_getNextReturnElement(connection); +++ } +++ +++ return entity; +++} +++ +++static char *mpd_getNextReturnElementNamed(mpd_Connection * connection, const char *name) +++{ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ mpd_getNextReturnElement(connection); +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ +++ if (strcmp(re->name, name) == 0) +++ return strdup(re->value); +++ mpd_getNextReturnElement(connection); +++ } +++ +++ return NULL; +++} +++ +++char *mpd_getNextTag(mpd_Connection * connection, int type) +++{ +++ if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES || type == MPD_TAG_ITEM_ANY) +++ return NULL; +++ if (type == MPD_TAG_ITEM_FILENAME) +++ return mpd_getNextReturnElementNamed(connection, "file"); +++ return mpd_getNextReturnElementNamed(connection, mpdTagItemKeys[type]); +++} +++ +++char *mpd_getNextArtist(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "Artist"); +++} +++ +++char *mpd_getNextAlbum(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "Album"); +++} +++ +++void mpd_sendPlaylistInfoCommand(mpd_Connection * connection, int songPos) +++{ +++ int len = strlen("playlistinfo") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistinfo \"%i\"\n", songPos); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlaylistIdCommand(mpd_Connection * connection, int id) +++{ +++ int len = strlen("playlistid") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistid \"%i\"\n", id); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist) +++{ +++ int len = strlen("plchanges") + 2 + LONGLONGLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "plchanges \"%lld\"\n", playlist); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist) +++{ +++ int len = strlen("plchangesposid") + 2 + LONGLONGLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "plchangesposid \"%lld\"\n", playlist); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendListallCommand(mpd_Connection * connection, const char *dir) +++{ +++ char *sDir = mpd_sanitizeArg(dir); +++ int len = strlen("listall") + 2 + strlen(sDir) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "listall \"%s\"\n", sDir); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sDir); +++} +++ +++void mpd_sendListallInfoCommand(mpd_Connection * connection, const char *dir) +++{ +++ char *sDir = mpd_sanitizeArg(dir); +++ int len = strlen("listallinfo") + 2 + strlen(sDir) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "listallinfo \"%s\"\n", sDir); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sDir); +++} +++ +++void mpd_sendLsInfoCommand(mpd_Connection * connection, const char *dir) +++{ +++ char *sDir = mpd_sanitizeArg(dir); +++ int len = strlen("lsinfo") + 2 + strlen(sDir) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "lsinfo \"%s\"\n", sDir); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sDir); +++} +++ +++void mpd_sendCurrentSongCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "currentsong\n"); +++} +++ +++void mpd_sendSearchCommand(mpd_Connection * connection, int table, const char *str) +++{ +++ mpd_startSearch(connection, 0); +++ mpd_addConstraintSearch(connection, table, str); +++ mpd_commitSearch(connection); +++} +++ +++void mpd_sendFindCommand(mpd_Connection * connection, int table, const char *str) +++{ +++ mpd_startSearch(connection, 1); +++ mpd_addConstraintSearch(connection, table, str); +++ mpd_commitSearch(connection); +++} +++ +++void mpd_sendListCommand(mpd_Connection * connection, int table, const char *arg1) +++{ +++ char st[10]; +++ int len; +++ char *string; +++ if (table == MPD_TABLE_ARTIST) +++ strcpy(st, "artist"); +++ else if (table == MPD_TABLE_ALBUM) +++ strcpy(st, "album"); +++ else { +++ connection->error = 1; +++ strcpy(connection->errorStr, "unknown table for list"); +++ return; +++ } +++ if (arg1) { +++ char *sanitArg1 = mpd_sanitizeArg(arg1); +++ len = strlen("list") + 1 + strlen(sanitArg1) + 2 + strlen(st) + 3; +++ string = malloc(len); +++ snprintf(string, len, "list %s \"%s\"\n", st, sanitArg1); +++ free(sanitArg1); +++ } else { +++ len = strlen("list") + 1 + strlen(st) + 2; +++ string = malloc(len); +++ snprintf(string, len, "list %s\n", st); +++ } +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendAddCommand(mpd_Connection * connection, const char *file) +++{ +++ char *sFile = mpd_sanitizeArg(file); +++ int len = strlen("add") + 2 + strlen(sFile) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "add \"%s\"\n", sFile); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sFile); +++} +++ +++int mpd_sendAddIdCommand(mpd_Connection * connection, const char *file) +++{ +++ int retval = -1; +++ char *sFile = mpd_sanitizeArg(file); +++ int len = strlen("addid") + 2 + strlen(sFile) + 3; +++ char *string = malloc(len); +++ +++ snprintf(string, len, "addid \"%s\"\n", sFile); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sFile); +++ +++ string = mpd_getNextReturnElementNamed(connection, "Id"); +++ if (string) { +++ retval = atoi(string); +++ free(string); +++ } +++ +++ return retval; +++} +++ +++void mpd_sendDeleteCommand(mpd_Connection * connection, int songPos) +++{ +++ int len = strlen("delete") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "delete \"%i\"\n", songPos); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendDeleteIdCommand(mpd_Connection * connection, int id) +++{ +++ int len = strlen("deleteid") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "deleteid \"%i\"\n", id); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSaveCommand(mpd_Connection * connection, const char *name) +++{ +++ char *sName = mpd_sanitizeArg(name); +++ int len = strlen("save") + 2 + strlen(sName) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "save \"%s\"\n", sName); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sName); +++} +++ +++void mpd_sendLoadCommand(mpd_Connection * connection, const char *name) +++{ +++ char *sName = mpd_sanitizeArg(name); +++ int len = strlen("load") + 2 + strlen(sName) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "load \"%s\"\n", sName); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sName); +++} +++ +++void mpd_sendRmCommand(mpd_Connection * connection, const char *name) +++{ +++ char *sName = mpd_sanitizeArg(name); +++ int len = strlen("rm") + 2 + strlen(sName) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "rm \"%s\"\n", sName); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sName); +++} +++ +++void mpd_sendRenameCommand(mpd_Connection * connection, const char *from, const char *to) +++{ +++ char *sFrom = mpd_sanitizeArg(from); +++ char *sTo = mpd_sanitizeArg(to); +++ int len = strlen("rename") + 2 + strlen(sFrom) + 3 + strlen(sTo) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "rename \"%s\" \"%s\"\n", sFrom, sTo); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sFrom); +++ free(sTo); +++} +++ +++void mpd_sendShuffleCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "shuffle\n"); +++} +++ +++void mpd_sendClearCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "clear\n"); +++} +++ +++void mpd_sendPlayCommand(mpd_Connection * connection, int songPos) +++{ +++ int len = strlen("play") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "play \"%i\"\n", songPos); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPlayIdCommand(mpd_Connection * connection, int id) +++{ +++ int len = strlen("playid") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playid \"%i\"\n", id); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendStopCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "stop\n"); +++} +++ +++void mpd_sendPauseCommand(mpd_Connection * connection, int pauseMode) +++{ +++ int len = strlen("pause") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "pause \"%i\"\n", pauseMode); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendNextCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "next\n"); +++} +++ +++void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to) +++{ +++ int len = strlen("move") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "move \"%i\" \"%i\"\n", from, to); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendMoveIdCommand(mpd_Connection * connection, int id, int to) +++{ +++ int len = strlen("moveid") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "moveid \"%i\" \"%i\"\n", id, to); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2) +++{ +++ int len = strlen("swap") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "swap \"%i\" \"%i\"\n", song1, song2); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSwapIdCommand(mpd_Connection * connection, int id1, int id2) +++{ +++ int len = strlen("swapid") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "swapid \"%i\" \"%i\"\n", id1, id2); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time) +++{ +++ int len = strlen("seek") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "seek \"%i\" \"%i\"\n", song, time); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSeekIdCommand(mpd_Connection * connection, int id, int time) +++{ +++ int len = strlen("seekid") + 2 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "seekid \"%i\" \"%i\"\n", id, time); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendUpdateCommand(mpd_Connection * connection, char *path) +++{ +++ char *sPath = mpd_sanitizeArg(path); +++ int len = strlen("update") + 2 + strlen(sPath) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "update \"%s\"\n", sPath); +++ mpd_sendInfoCommand(connection, string); +++ free(string); +++ free(sPath); +++} +++ +++int mpd_getUpdateId(mpd_Connection * connection) +++{ +++ char *jobid; +++ int ret = 0; +++ +++ jobid = mpd_getNextReturnElementNamed(connection, "updating_db"); +++ if (jobid) { +++ ret = atoi(jobid); +++ free(jobid); +++ } +++ +++ return ret; +++} +++ +++void mpd_sendPrevCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "previous\n"); +++} +++ +++void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode) +++{ +++ int len = strlen("repeat") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "repeat \"%i\"\n", repeatMode); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode) +++{ +++ int len = strlen("random") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "random \"%i\"\n", randomMode); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange) +++{ +++ int len = strlen("setvol") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "setvol \"%i\"\n", volumeChange); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange) +++{ +++ int len = strlen("volume") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "volume \"%i\"\n", volumeChange); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds) +++{ +++ int len = strlen("crossfade") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "crossfade \"%i\"\n", seconds); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendPasswordCommand(mpd_Connection * connection, const char *pass) +++{ +++ char *sPass = mpd_sanitizeArg(pass); +++ int len = strlen("password") + 2 + strlen(sPass) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "password \"%s\"\n", sPass); +++ mpd_executeCommand(connection, string); +++ free(string); +++ free(sPass); +++} +++ +++void mpd_sendCommandListBegin(mpd_Connection * connection) +++{ +++ if (connection->commandList) { +++ strcpy(connection->errorStr, "already in command list mode"); +++ connection->error = 1; +++ return; +++ } +++ connection->commandList = COMMAND_LIST; +++ mpd_executeCommand(connection, "command_list_begin\n"); +++} +++ +++void mpd_sendCommandListOkBegin(mpd_Connection * connection) +++{ +++ if (connection->commandList) { +++ strcpy(connection->errorStr, "already in command list mode"); +++ connection->error = 1; +++ return; +++ } +++ connection->commandList = COMMAND_LIST_OK; +++ mpd_executeCommand(connection, "command_list_ok_begin\n"); +++ connection->listOks = 0; +++} +++ +++void mpd_sendCommandListEnd(mpd_Connection * connection) +++{ +++ if (!connection->commandList) { +++ strcpy(connection->errorStr, "not in command list mode"); +++ connection->error = 1; +++ return; +++ } +++ connection->commandList = 0; +++ mpd_executeCommand(connection, "command_list_end\n"); +++} +++ +++void mpd_sendOutputsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "outputs\n"); +++} +++ +++mpd_OutputEntity *mpd_getNextOutput(mpd_Connection * connection) +++{ +++ mpd_OutputEntity *output = NULL; +++ +++ if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) { +++ return NULL; +++ } +++ +++ if (connection->error) +++ return NULL; +++ +++ output = malloc(sizeof(mpd_OutputEntity)); +++ output->id = -10; +++ output->name = NULL; +++ output->enabled = 0; +++ +++ if (!connection->returnElement) +++ mpd_getNextReturnElement(connection); +++ +++ while (connection->returnElement) { +++ mpd_ReturnElement *re = connection->returnElement; +++ if (strcmp(re->name, "outputid") == 0) { +++ if (output != NULL && output->id >= 0) +++ return output; +++ output->id = atoi(re->value); +++ } else if (strcmp(re->name, "outputname") == 0) { +++ output->name = strdup(re->value); +++ } else if (strcmp(re->name, "outputenabled") == 0) { +++ output->enabled = atoi(re->value); +++ } +++ +++ mpd_getNextReturnElement(connection); +++ if (connection->error) { +++ free(output); +++ return NULL; +++ } +++ +++ } +++ +++ return output; +++} +++ +++void mpd_sendEnableOutputCommand(mpd_Connection * connection, int outputId) +++{ +++ int len = strlen("enableoutput") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "enableoutput \"%i\"\n", outputId); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_sendDisableOutputCommand(mpd_Connection * connection, int outputId) +++{ +++ int len = strlen("disableoutput") + 2 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "disableoutput \"%i\"\n", outputId); +++ mpd_executeCommand(connection, string); +++ free(string); +++} +++ +++void mpd_freeOutputElement(mpd_OutputEntity * output) +++{ +++ free(output->name); +++ free(output); +++} +++ +++/** +++ * mpd_sendNotCommandsCommand +++ * odd naming, but it gets the not allowed commands +++ */ +++ +++void mpd_sendNotCommandsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "notcommands\n"); +++} +++ +++/** +++ * mpd_sendCommandsCommand +++ * odd naming, but it gets the allowed commands +++ */ +++void mpd_sendCommandsCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "commands\n"); +++} +++ +++/** +++ * Get the next returned command +++ */ +++char *mpd_getNextCommand(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "command"); +++} +++ +++void mpd_sendUrlHandlersCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "urlhandlers\n"); +++} +++ +++char *mpd_getNextHandler(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "handler"); +++} +++ +++void mpd_sendTagTypesCommand(mpd_Connection * connection) +++{ +++ mpd_executeCommand(connection, "tagtypes\n"); +++} +++ +++char *mpd_getNextTagType(mpd_Connection * connection) +++{ +++ return mpd_getNextReturnElementNamed(connection, "tagtype"); +++} +++ +++void mpd_startSearch(mpd_Connection * connection, int exact) +++{ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (exact) +++ connection->request = strdup("find"); +++ else +++ connection->request = strdup("search"); +++} +++ +++void mpd_startStatsSearch(mpd_Connection * connection) +++{ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ connection->request = strdup("count"); +++} +++ +++void mpd_startPlaylistSearch(mpd_Connection * connection, int exact) +++{ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (exact) +++ connection->request = strdup("playlistfind"); +++ else +++ connection->request = strdup("playlistsearch"); +++} +++ +++void mpd_startFieldSearch(mpd_Connection * connection, int type) +++{ +++ char *strtype; +++ int len; +++ +++ if (connection->request) { +++ strcpy(connection->errorStr, "search already in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES) { +++ strcpy(connection->errorStr, "invalid type specified"); +++ connection->error = 1; +++ return; +++ } +++ +++ strtype = mpdTagItemKeys[type]; +++ +++ len = 5 + strlen(strtype) + 1; +++ connection->request = malloc(len); +++ +++ snprintf(connection->request, len, "list %c%s", tolower(strtype[0]), strtype + 1); +++} +++ +++void mpd_addConstraintSearch(mpd_Connection * connection, int type, const char *name) +++{ +++ char *strtype; +++ char *arg; +++ int len; +++ char *string; +++ +++ if (!connection->request) { +++ strcpy(connection->errorStr, "no search in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES) { +++ strcpy(connection->errorStr, "invalid type specified"); +++ connection->error = 1; +++ return; +++ } +++ +++ if (name == NULL) { +++ strcpy(connection->errorStr, "no name specified"); +++ connection->error = 1; +++ return; +++ } +++ +++ string = strdup(connection->request); +++ strtype = mpdTagItemKeys[type]; +++ arg = mpd_sanitizeArg(name); +++ +++ len = strlen(string) + 1 + strlen(strtype) + 2 + strlen(arg) + 2; +++ connection->request = realloc(connection->request, len); +++ snprintf(connection->request, len, "%s %c%s \"%s\"", string, tolower(strtype[0]), strtype + 1, arg); +++ +++ free(string); +++ free(arg); +++} +++ +++void mpd_commitSearch(mpd_Connection * connection) +++{ +++ int len; +++ +++ if (!connection->request) { +++ strcpy(connection->errorStr, "no search in progress"); +++ connection->error = 1; +++ return; +++ } +++ +++ len = strlen(connection->request) + 2; +++ connection->request = realloc(connection->request, len); +++ connection->request[len - 2] = '\n'; +++ connection->request[len - 1] = '\0'; +++ mpd_sendInfoCommand(connection, connection->request); +++ +++ free(connection->request); +++ connection->request = NULL; +++} +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content, with full metadata, of a stored playlist. +++ * +++ */ +++void mpd_sendListPlaylistInfoCommand(mpd_Connection * connection, char *path) +++{ +++ char *arg = mpd_sanitizeArg(path); +++ int len = strlen("listplaylistinfo") + 2 + strlen(arg) + 3; +++ char *query = malloc(len); +++ snprintf(query, len, "listplaylistinfo \"%s\"\n", arg); +++ mpd_sendInfoCommand(connection, query); +++ free(arg); +++ free(query); +++} +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content of a stored playlist. +++ * +++ */ +++void mpd_sendListPlaylistCommand(mpd_Connection * connection, char *path) +++{ +++ char *arg = mpd_sanitizeArg(path); +++ int len = strlen("listplaylist") + 2 + strlen(arg) + 3; +++ char *query = malloc(len); +++ snprintf(query, len, "listplaylist \"%s\"\n", arg); +++ mpd_sendInfoCommand(connection, query); +++ free(arg); +++ free(query); +++} +++ +++void mpd_sendPlaylistClearCommand(mpd_Connection * connection, char *path) +++{ +++ char *sPath = mpd_sanitizeArg(path); +++ int len = strlen("playlistclear") + 2 + strlen(sPath) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistclear \"%s\"\n", sPath); +++ mpd_executeCommand(connection, string); +++ free(sPath); +++ free(string); +++} +++ +++void mpd_sendPlaylistAddCommand(mpd_Connection * connection, char *playlist, char *path) +++{ +++ char *sPlaylist = mpd_sanitizeArg(playlist); +++ char *sPath = mpd_sanitizeArg(path); +++ int len = strlen("playlistadd") + 2 + strlen(sPlaylist) + 3 + strlen(sPath) + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistadd \"%s\" \"%s\"\n", sPlaylist, sPath); +++ mpd_executeCommand(connection, string); +++ free(sPlaylist); +++ free(sPath); +++ free(string); +++} +++ +++void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to) +++{ +++ char *sPlaylist = mpd_sanitizeArg(playlist); +++ int len = strlen("playlistmove") + 2 + strlen(sPlaylist) + 3 + INTLEN + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistmove \"%s\" \"%i\" \"%i\"\n", sPlaylist, from, to); +++ mpd_executeCommand(connection, string); +++ free(sPlaylist); +++ free(string); +++} +++ +++void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos) +++{ +++ char *sPlaylist = mpd_sanitizeArg(playlist); +++ int len = strlen("playlistdelete") + 2 + strlen(sPlaylist) + 3 + INTLEN + 3; +++ char *string = malloc(len); +++ snprintf(string, len, "playlistdelete \"%s\" \"%i\"\n", sPlaylist, pos); +++ mpd_executeCommand(connection, string); +++ free(sPlaylist); +++ free(string); +++} ++--- /dev/null +++++ b/libmpdclient.h ++@@ -0,0 +1,661 @@ +++/* libmpdclient +++ (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com) +++ This project's homepage is: http://www.musicpd.org +++ +++ Redistribution and use in source and binary forms, with or without +++ modification, are permitted provided that the following conditions +++ are met: +++ +++ - Redistributions of source code must retain the above copyright +++ notice, this list of conditions and the following disclaimer. +++ +++ - 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. +++ +++ - Neither the name of the Music Player Daemon 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 COPYRIGHT HOLDERS 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 FOUNDATION 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. +++*/ +++ +++#ifndef LIBMPDCLIENT_H +++#define LIBMPDCLIENT_H +++ +++#ifdef WIN32 +++# define __W32API_USE_DLLIMPORT__ 1 +++#endif +++ +++#include +++#include +++#define MPD_BUFFER_MAX_LENGTH 50000 +++#define MPD_ERRORSTR_MAX_LENGTH 1000 +++#define MPD_WELCOME_MESSAGE "OK MPD " +++ +++#define MPD_ERROR_TIMEOUT 10 /* timeout trying to talk to mpd */ +++#define MPD_ERROR_SYSTEM 11 /* system error */ +++#define MPD_ERROR_UNKHOST 12 /* unknown host */ +++#define MPD_ERROR_CONNPORT 13 /* problems connecting to port on host */ +++#define MPD_ERROR_NOTMPD 14 /* mpd not running on port at host */ +++#define MPD_ERROR_NORESPONSE 15 /* no response on attempting to connect */ +++#define MPD_ERROR_SENDING 16 /* error sending command */ +++#define MPD_ERROR_CONNCLOSED 17 /* connection closed by mpd */ +++#define MPD_ERROR_ACK 18 /* ACK returned! */ +++#define MPD_ERROR_BUFFEROVERRUN 19 /* Buffer was overrun! */ +++ +++#define MPD_ACK_ERROR_UNK -1 +++#define MPD_ERROR_AT_UNK -1 +++ +++#define MPD_ACK_ERROR_NOT_LIST 1 +++#define MPD_ACK_ERROR_ARG 2 +++#define MPD_ACK_ERROR_PASSWORD 3 +++#define MPD_ACK_ERROR_PERMISSION 4 +++#define MPD_ACK_ERROR_UNKNOWN_CMD 5 +++ +++#define MPD_ACK_ERROR_NO_EXIST 50 +++#define MPD_ACK_ERROR_PLAYLIST_MAX 51 +++#define MPD_ACK_ERROR_SYSTEM 52 +++#define MPD_ACK_ERROR_PLAYLIST_LOAD 53 +++#define MPD_ACK_ERROR_UPDATE_ALREADY 54 +++#define MPD_ACK_ERROR_PLAYER_SYNC 55 +++#define MPD_ACK_ERROR_EXIST 56 +++ +++#ifdef __cplusplus +++extern "C" { +++#endif +++ +++ typedef enum mpd_TagItems { +++ MPD_TAG_ITEM_ARTIST, +++ MPD_TAG_ITEM_ALBUM, +++ MPD_TAG_ITEM_TITLE, +++ MPD_TAG_ITEM_TRACK, +++ MPD_TAG_ITEM_NAME, +++ MPD_TAG_ITEM_GENRE, +++ MPD_TAG_ITEM_DATE, +++ MPD_TAG_ITEM_COMPOSER, +++ MPD_TAG_ITEM_PERFORMER, +++ MPD_TAG_ITEM_COMMENT, +++ MPD_TAG_ITEM_DISC, +++ MPD_TAG_ITEM_FILENAME, +++ MPD_TAG_ITEM_ANY, +++ MPD_TAG_NUM_OF_ITEM_TYPES +++ } mpd_TagItems; +++ +++ extern char *mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES]; +++ +++/* internal stuff don't touch this struct */ +++ typedef struct _mpd_ReturnElement { +++ char *name; +++ char *value; +++ } mpd_ReturnElement; +++ +++/* mpd_Connection +++ * holds info about connection to mpd +++ * use error, and errorStr to detect errors +++ */ +++ typedef struct _mpd_Connection { +++ /* use this to check the version of mpd */ +++ int version[3]; +++ /* IMPORTANT, you want to get the error messages from here */ +++ char errorStr[MPD_ERRORSTR_MAX_LENGTH + 1]; +++ int errorCode; +++ int errorAt; +++ /* this will be set to MPD_ERROR_* if there is an error, 0 if not */ +++ int error; +++ /* DON'T TOUCH any of the rest of this stuff */ +++ int sock; +++ char buffer[MPD_BUFFER_MAX_LENGTH + 1]; +++ int buflen; +++ int bufstart; +++ int doneProcessing; +++ int listOks; +++ int doneListOk; +++ int commandList; +++ mpd_ReturnElement *returnElement; +++ struct timeval timeout; +++ char *request; +++ } mpd_Connection; +++ +++/* mpd_newConnection +++ * use this to open a new connection +++ * you should use mpd_closeConnection, when your done with the connection, +++ * even if an error has occurred +++ * _timeout_ is the connection timeout period in seconds +++ */ +++ mpd_Connection *mpd_newConnection(const char *host, int port, float timeout); +++ +++ void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout); +++ +++/* mpd_closeConnection +++ * use this to close a connection and free'ing subsequent memory +++ */ +++ void mpd_closeConnection(mpd_Connection * connection); +++ +++/* mpd_clearError +++ * clears error +++ */ +++ void mpd_clearError(mpd_Connection * connection); +++ +++/* STATUS STUFF */ +++ +++/* use these with status.state to determine what state the player is in */ +++#define MPD_STATUS_STATE_UNKNOWN 0 +++#define MPD_STATUS_STATE_STOP 1 +++#define MPD_STATUS_STATE_PLAY 2 +++#define MPD_STATUS_STATE_PAUSE 3 +++ +++/* us this with status.volume to determine if mpd has volume support */ +++#define MPD_STATUS_NO_VOLUME -1 +++ +++/* mpd_Status +++ * holds info return from status command +++ */ +++ typedef struct mpd_Status { +++ /* 0-100, or MPD_STATUS_NO_VOLUME when there is no volume support */ +++ int volume; +++ /* 1 if repeat is on, 0 otherwise */ +++ int repeat; +++ /* 1 if random is on, 0 otherwise */ +++ int random; +++ /* playlist length */ +++ int playlistLength; +++ /* playlist, use this to determine when the playlist has changed */ +++ long long playlist; +++ /* use with MPD_STATUS_STATE_* to determine state of player */ +++ int state; +++ /* crossfade setting in seconds */ +++ int crossfade; +++ /* if a song is currently selected (always the case when state is +++ * PLAY or PAUSE), this is the position of the currently +++ * playing song in the playlist, beginning with 0 +++ */ +++ int song; +++ /* Song ID of the currently selected song */ +++ int songid; +++ /* time in seconds that have elapsed in the currently playing/paused +++ * song +++ */ +++ int elapsedTime; +++ /* length in seconds of the currently playing/paused song */ +++ int totalTime; +++ /* current bit rate in kbs */ +++ int bitRate; +++ /* audio sample rate */ +++ unsigned int sampleRate; +++ /* audio bits */ +++ int bits; +++ /* audio channels */ +++ int channels; +++ /* 1 if mpd is updating, 0 otherwise */ +++ int updatingDb; +++ /* error */ +++ char *error; +++ } mpd_Status; +++ +++ void mpd_sendStatusCommand(mpd_Connection * connection); +++ +++/* mpd_getStatus +++ * returns status info, be sure to free it with mpd_freeStatus() +++ * call this after mpd_sendStatusCommand() +++ */ +++ mpd_Status *mpd_getStatus(mpd_Connection * connection); +++ +++/* mpd_freeStatus +++ * free's status info malloc'd and returned by mpd_getStatus +++ */ +++ void mpd_freeStatus(mpd_Status * status); +++ +++ typedef struct _mpd_Stats { +++ int numberOfArtists; +++ int numberOfAlbums; +++ int numberOfSongs; +++ unsigned long uptime; +++ unsigned long dbUpdateTime; +++ unsigned long playTime; +++ unsigned long dbPlayTime; +++ } mpd_Stats; +++ +++ typedef struct _mpd_SearchStats { +++ int numberOfSongs; +++ unsigned long playTime; +++ } mpd_SearchStats; +++ +++ void mpd_sendStatsCommand(mpd_Connection * connection); +++ +++ mpd_Stats *mpd_getStats(mpd_Connection * connection); +++ +++ void mpd_freeStats(mpd_Stats * stats); +++ +++ mpd_SearchStats *mpd_getSearchStats(mpd_Connection * connection); +++ +++ void mpd_freeSearchStats(mpd_SearchStats * stats); +++ +++/* SONG STUFF */ +++ +++#define MPD_SONG_NO_TIME -1 +++#define MPD_SONG_NO_NUM -1 +++#define MPD_SONG_NO_ID -1 +++ +++/* mpd_Song +++ * for storing song info returned by mpd +++ */ +++ typedef struct _mpd_Song { +++ /* filename of song */ +++ char *file; +++ /* artist, maybe NULL if there is no tag */ +++ char *artist; +++ /* title, maybe NULL if there is no tag */ +++ char *title; +++ /* album, maybe NULL if there is no tag */ +++ char *album; +++ /* track, maybe NULL if there is no tag */ +++ char *track; +++ /* name, maybe NULL if there is no tag; it's the name of the current +++ * song, f.e. the icyName of the stream */ +++ char *name; +++ /* date */ +++ char *date; +++ +++ /* added by qball */ +++ /* Genre */ +++ char *genre; +++ /* Composer */ +++ char *composer; +++ /* Performer */ +++ char *performer; +++ /* Disc */ +++ char *disc; +++ /* Comment */ +++ char *comment; +++ +++ /* length of song in seconds, check that it is not MPD_SONG_NO_TIME */ +++ int time; +++ /* if plchanges/playlistinfo/playlistid used, is the position of the +++ * song in the playlist */ +++ int pos; +++ /* song id for a song in the playlist */ +++ int id; +++ } mpd_Song; +++ +++/* mpd_newSong +++ * use to allocate memory for a new mpd_Song +++ * file, artist, etc all initialized to NULL +++ * if your going to assign values to file, artist, etc +++ * be sure to malloc or strdup the memory +++ * use mpd_freeSong to free the memory for the mpd_Song, it will also +++ * free memory for file, artist, etc, so don't do it yourself +++ */ +++ mpd_Song *mpd_newSong(void); +++ +++/* mpd_freeSong +++ * use to free memory allocated by mpd_newSong +++ * also it will free memory pointed to by file, artist, etc, so be careful +++ */ +++ void mpd_freeSong(mpd_Song * song); +++ +++/* mpd_songDup +++ * works like strDup, but for a mpd_Song +++ */ +++ mpd_Song *mpd_songDup(mpd_Song * song); +++ +++/* DIRECTORY STUFF */ +++ +++/* mpd_Directory +++ * used to store info fro directory (right now that just the path) +++ */ +++ typedef struct _mpd_Directory { +++ char *path; +++ } mpd_Directory; +++ +++/* mpd_newDirectory +++ * allocates memory for a new directory +++ * use mpd_freeDirectory to free this memory +++ */ +++ mpd_Directory *mpd_newDirectory(void); +++ +++/* mpd_freeDirectory +++ * used to free memory allocated with mpd_newDirectory, and it frees +++ * path of mpd_Directory, so be careful +++ */ +++ void mpd_freeDirectory(mpd_Directory * directory); +++ +++/* mpd_directoryDup +++ * works like strdup, but for mpd_Directory +++ */ +++ mpd_Directory *mpd_directoryDup(mpd_Directory * directory); +++ +++/* PLAYLISTFILE STUFF */ +++ +++/* mpd_PlaylistFile +++ * stores info about playlist file returned by lsinfo +++ */ +++ typedef struct _mpd_PlaylistFile { +++ char *path; +++ } mpd_PlaylistFile; +++ +++/* mpd_newPlaylistFile +++ * allocates memory for new mpd_PlaylistFile, path is set to NULL +++ * free this memory with mpd_freePlaylistFile +++ */ +++ mpd_PlaylistFile *mpd_newPlaylistFile(void); +++ +++/* mpd_freePlaylist +++ * free memory allocated for freePlaylistFile, will also free +++ * path, so be careful +++ */ +++ void mpd_freePlaylistFile(mpd_PlaylistFile * playlist); +++ +++/* mpd_playlistFileDup +++ * works like strdup, but for mpd_PlaylistFile +++ */ +++ mpd_PlaylistFile *mpd_playlistFileDup(mpd_PlaylistFile * playlist); +++ +++/* INFO ENTITY STUFF */ +++ +++/* the type of entity returned from one of the commands that generates info +++ * use in conjunction with mpd_InfoEntity.type +++ */ +++#define MPD_INFO_ENTITY_TYPE_DIRECTORY 0 +++#define MPD_INFO_ENTITY_TYPE_SONG 1 +++#define MPD_INFO_ENTITY_TYPE_PLAYLISTFILE 2 +++ +++/* mpd_InfoEntity +++ * stores info on stuff returned info commands +++ */ +++ typedef struct mpd_InfoEntity { +++ /* the type of entity, use with MPD_INFO_ENTITY_TYPE_* to determine +++ * what this entity is (song, directory, etc...) +++ */ +++ int type; +++ /* the actual data you want, mpd_Song, mpd_Directory, etc */ +++ union { +++ mpd_Directory *directory; +++ mpd_Song *song; +++ mpd_PlaylistFile *playlistFile; +++ } info; +++ } mpd_InfoEntity; +++ +++ mpd_InfoEntity *mpd_newInfoEntity(void); +++ +++ void mpd_freeInfoEntity(mpd_InfoEntity * entity); +++ +++/* INFO COMMANDS AND STUFF */ +++ +++/* use this function to loop over after calling Info/Listall functions */ +++ mpd_InfoEntity *mpd_getNextInfoEntity(mpd_Connection * connection); +++ +++/* fetches the currently seeletect song (the song referenced by status->song +++ * and status->songid*/ +++ void mpd_sendCurrentSongCommand(mpd_Connection * connection); +++ +++/* songNum of -1, means to display the whole list */ +++ void mpd_sendPlaylistInfoCommand(mpd_Connection * connection, int songNum); +++ +++/* songId of -1, means to display the whole list */ +++ void mpd_sendPlaylistIdCommand(mpd_Connection * connection, int songId); +++ +++/* use this to get the changes in the playlist since version _playlist_ */ +++ void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist); +++ +++/** +++ * @param connection: A valid and connected mpd_Connection. +++ * @param playlist: The playlist version you want the diff with. +++ * A more bandwidth efficient version of the mpd_sendPlChangesCommand. +++ * It only returns the pos+id of the changes song. +++ */ +++ void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist); +++ +++/* recursivel fetches all songs/dir/playlists in "dir* (no metadata is +++ * returned) */ +++ void mpd_sendListallCommand(mpd_Connection * connection, const char *dir); +++ +++/* same as sendListallCommand, but also metadata is returned */ +++ void mpd_sendListallInfoCommand(mpd_Connection * connection, const char *dir); +++ +++/* non-recursive version of ListallInfo */ +++ void mpd_sendLsInfoCommand(mpd_Connection * connection, const char *dir); +++ +++#define MPD_TABLE_ARTIST MPD_TAG_ITEM_ARTIST +++#define MPD_TABLE_ALBUM MPD_TAG_ITEM_ALBUM +++#define MPD_TABLE_TITLE MPD_TAG_ITEM_TITLE +++#define MPD_TABLE_FILENAME MPD_TAG_ITEM_FILENAME +++ +++ void mpd_sendSearchCommand(mpd_Connection * connection, int table, const char *str); +++ +++ void mpd_sendFindCommand(mpd_Connection * connection, int table, const char *str); +++ +++/* LIST TAG COMMANDS */ +++ +++/* use this function fetch next artist entry, be sure to free the returned +++ * string. NULL means there are no more. Best used with sendListArtists +++ */ +++ char *mpd_getNextArtist(mpd_Connection * connection); +++ +++ char *mpd_getNextAlbum(mpd_Connection * connection); +++ +++ char *mpd_getNextTag(mpd_Connection * connection, int type); +++ +++/* list artist or albums by artist, arg1 should be set to the artist if +++ * listing albums by a artist, otherwise NULL for listing all artists or albums +++ */ +++ void mpd_sendListCommand(mpd_Connection * connection, int table, const char *arg1); +++ +++/* SIMPLE COMMANDS */ +++ +++ void mpd_sendAddCommand(mpd_Connection * connection, const char *file); +++ +++ int mpd_sendAddIdCommand(mpd_Connection * connection, const char *file); +++ +++ void mpd_sendDeleteCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendDeleteIdCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendSaveCommand(mpd_Connection * connection, const char *name); +++ +++ void mpd_sendLoadCommand(mpd_Connection * connection, const char *name); +++ +++ void mpd_sendRmCommand(mpd_Connection * connection, const char *name); +++ +++ void mpd_sendRenameCommand(mpd_Connection * connection, const char *from, const char *to); +++ +++ void mpd_sendShuffleCommand(mpd_Connection * connection); +++ +++ void mpd_sendClearCommand(mpd_Connection * connection); +++ +++/* use this to start playing at the beginning, useful when in random mode */ +++#define MPD_PLAY_AT_BEGINNING -1 +++ +++ void mpd_sendPlayCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendPlayIdCommand(mpd_Connection * connection, int songNum); +++ +++ void mpd_sendStopCommand(mpd_Connection * connection); +++ +++ void mpd_sendPauseCommand(mpd_Connection * connection, int pauseMode); +++ +++ void mpd_sendNextCommand(mpd_Connection * connection); +++ +++ void mpd_sendPrevCommand(mpd_Connection * connection); +++ +++ void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to); +++ +++ void mpd_sendMoveIdCommand(mpd_Connection * connection, int from, int to); +++ +++ void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2); +++ +++ void mpd_sendSwapIdCommand(mpd_Connection * connection, int song1, int song2); +++ +++ void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time); +++ +++ void mpd_sendSeekIdCommand(mpd_Connection * connection, int song, int time); +++ +++ void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode); +++ +++ void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode); +++ +++ void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange); +++ +++/* WARNING: don't use volume command, its depreacted */ +++ void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange); +++ +++ void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds); +++ +++ void mpd_sendUpdateCommand(mpd_Connection * connection, char *path); +++ +++/* returns the update job id, call this after a update command*/ +++ int mpd_getUpdateId(mpd_Connection * connection); +++ +++ void mpd_sendPasswordCommand(mpd_Connection * connection, const char *pass); +++ +++/* after executing a command, when your done with it to get its status +++ * (you want to check connection->error for an error) +++ */ +++ void mpd_finishCommand(mpd_Connection * connection); +++ +++/* command list stuff, use this to do things like add files very quickly */ +++ void mpd_sendCommandListBegin(mpd_Connection * connection); +++ +++ void mpd_sendCommandListOkBegin(mpd_Connection * connection); +++ +++ void mpd_sendCommandListEnd(mpd_Connection * connection); +++ +++/* advance to the next listOk +++ * returns 0 if advanced to the next list_OK, +++ * returns -1 if it advanced to an OK or ACK */ +++ int mpd_nextListOkCommand(mpd_Connection * connection); +++ +++ typedef struct _mpd_OutputEntity { +++ int id; +++ char *name; +++ int enabled; +++ } mpd_OutputEntity; +++ +++ void mpd_sendOutputsCommand(mpd_Connection * connection); +++ +++ mpd_OutputEntity *mpd_getNextOutput(mpd_Connection * connection); +++ +++ void mpd_sendEnableOutputCommand(mpd_Connection * connection, int outputId); +++ +++ void mpd_sendDisableOutputCommand(mpd_Connection * connection, int outputId); +++ +++ void mpd_freeOutputElement(mpd_OutputEntity * output); +++ +++/** +++ * @param connection a #mpd_Connection +++ * +++ * Queries mpd for the allowed commands +++ */ +++ void mpd_sendCommandsCommand(mpd_Connection * connection); +++ +++/** +++ * @param connection a #mpd_Connection +++ * +++ * Queries mpd for the not allowed commands +++ */ +++ void mpd_sendNotCommandsCommand(mpd_Connection * connection); +++ +++/** +++ * @param connection a #mpd_Connection +++ * +++ * returns the next supported command. +++ * +++ * @returns a string, needs to be free'ed +++ */ +++ char *mpd_getNextCommand(mpd_Connection * connection); +++ +++ void mpd_sendUrlHandlersCommand(mpd_Connection * connection); +++ +++ char *mpd_getNextHandler(mpd_Connection * connection); +++ +++ void mpd_sendTagTypesCommand(mpd_Connection * connection); +++ +++ char *mpd_getNextTagType(mpd_Connection * connection); +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content, with full metadata, of a stored playlist. +++ * +++ */ +++ void mpd_sendListPlaylistInfoCommand(mpd_Connection * connection, char *path); +++ +++/** +++ * @param connection a MpdConnection +++ * @param path the path to the playlist. +++ * +++ * List the content of a stored playlist. +++ * +++ */ +++ void mpd_sendListPlaylistCommand(mpd_Connection * connection, char *path); +++ +++/** +++ * @param connection a #mpd_Connection +++ * @param exact if to match exact +++ * +++ * starts a search, use mpd_addConstraintSearch to add +++ * a constraint to the search, and mpd_commitSearch to do the actual search +++ */ +++ void mpd_startSearch(mpd_Connection * connection, int exact); +++ +++/** +++ * @param connection a #mpd_Connection +++ * @param type +++ * @param name +++ */ +++ void mpd_addConstraintSearch(mpd_Connection * connection, int type, const char *name); +++ +++/** +++ * @param connection a #mpd_Connection +++ */ +++ void mpd_commitSearch(mpd_Connection * connection); +++ +++/** +++ * @param connection a #mpd_Connection +++ * @param type The type to search for +++ * +++ * starts a search for fields... f.e. get a list of artists would be: +++ * @code +++ * mpd_startFieldSearch(connection, MPD_TAG_ITEM_ARTIST); +++ * mpd_commitSearch(connection); +++ * @endcode +++ * +++ * or get a list of artist in genre "jazz" would be: +++ * @code +++ * mpd_startFieldSearch(connection, MPD_TAG_ITEM_ARTIST); +++ * mpd_addConstraintSearch(connection, MPD_TAG_ITEM_GENRE, "jazz") +++ * mpd_commitSearch(connection); +++ * @endcode +++ * +++ * mpd_startSearch will return a list of songs (and you need mpd_getNextInfoEntity) +++ * this one will return a list of only one field (the one specified with type) and you need +++ * mpd_getNextTag to get the results +++ */ +++ void mpd_startFieldSearch(mpd_Connection * connection, int type); +++ +++ void mpd_startPlaylistSearch(mpd_Connection * connection, int exact); +++ +++ void mpd_startStatsSearch(mpd_Connection * connection); +++ +++ void mpd_sendPlaylistClearCommand(mpd_Connection * connection, char *path); +++ +++ void mpd_sendPlaylistAddCommand(mpd_Connection * connection, char *playlist, char *path); +++ +++ void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to); +++ +++ void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos); +++#ifdef __cplusplus +++} +++#endif +++#endif +diff --git a/feeds/packages/utils/lcd4linux/patches/160-uinput_defs.patch b/feeds/packages/utils/lcd4linux/patches/160-uinput_defs.patch +new file mode 100644 +index 0000000..44b24b3 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/160-uinput_defs.patch +@@ -0,0 +1,24 @@ ++--- a/drv_G15.c +++++ b/drv_G15.c ++@@ -42,6 +42,7 @@ ++ ++ #include ++ #include +++#include ++ #include ++ #include ++ ++@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic ++ } ++ memset(&device, 0, sizeof(device)); ++ strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE); +++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++ device.id.bustype = BUS_USB; ++ device.id.version = 4; +++#else +++ device.idbus = BUS_USB; +++ device.idversion = 4; +++#endif ++ ++ ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY); ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/170-add-generic-spidev-driver.patch b/feeds/packages/utils/lcd4linux/patches/170-add-generic-spidev-driver.patch +new file mode 100644 +index 0000000..9dcf1cb +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/170-add-generic-spidev-driver.patch +@@ -0,0 +1,195 @@ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -71,6 +71,8 @@ drv_generic_i2c.c \ ++ drv_generic_i2c.h \ ++ drv_generic_keypad.c \ ++ drv_generic_keypad.h \ +++drv_generic_spidev.c \ +++drv_generic_spidev.h \ ++ drv_ASTUSB.c \ ++ drv_BeckmannEgle.c \ ++ drv_BWCT.c \ ++--- /dev/null +++++ b/drv_generic_spidev.c ++@@ -0,0 +1,89 @@ +++/* $Id$ +++ * $URL$ +++ * +++ * generic driver helper for displays connected via SPI bus +++ * +++ * Copyright (C) 2012 Gabor Juhos +++ * +++ * This file is part of LCD4Linux. +++ * +++ * LCD4Linux 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, or (at your option) +++ * any later version. +++ * +++ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ * +++ */ +++ +++#include "config.h" +++ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#include "debug.h" +++#include "qprintf.h" +++#include "cfg.h" +++#include "drv_generic_spidev.h" +++ +++static char *generic_spidev_section = ""; +++static char *generic_spidev_driver = ""; +++static int generic_spidev_fd; +++ +++int drv_generic_spidev_open(const char *section, const char *driver) +++{ +++ char *spidev; +++ +++ udelay_init(); +++ +++ generic_spidev_section = (char *) section; +++ generic_spidev_driver = (char *) driver; +++ +++ spidev = cfg_get(generic_spidev_section, "Port", NULL); +++ +++ info("%s: initializing SPI device %s", generic_spidev_driver, spidev); +++ generic_spidev_fd = open(spidev, O_WRONLY); +++ if (generic_spidev_fd < 0) { +++ error("%s: unable to open SPI device %s!\n", generic_spidev_driver, spidev); +++ goto exit_error; +++ } +++ +++ return 0; +++ +++ exit_error: +++ free(spidev); +++ return -1; +++} +++ +++int drv_generic_spidev_close(void) +++{ +++ close(generic_spidev_fd); +++ return 0; +++} +++ +++int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr) +++{ +++ int ret; +++ +++ ret = ioctl(generic_spidev_fd, SPI_IOC_MESSAGE(count), tr); +++ if (ret < count) { +++ error("%s: can't send SPI message! (%s)\n", +++ generic_spidev_driver, strerror(errno)); +++ return -1; +++ } +++ +++ return 0; +++} ++--- /dev/null +++++ b/drv_generic_spidev.h ++@@ -0,0 +1,54 @@ +++/* $Id$ +++ * $URL$ +++ * +++ * generic driver helper for displays connected via SPI bus +++ * +++ * Copyright (C) 2012 Gabor Juhos +++ * Copyright (C) 2012 The LCD4Linux Team +++ * +++ * This file is part of LCD4Linux. +++ * +++ * LCD4Linux 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, or (at your option) +++ * any later version. +++ * +++ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ * +++ */ +++ +++/* +++ * +++ * exported fuctions: +++ * +++ * int drv_generic_spidev_open (const char *section, const char *driver) +++ * reads 'Port' entry from config and opens +++ * the SPI device +++ * returns 0 if ok, -1 on failure +++ * +++ * int drv_generic_spidev_close (void) +++ * closes SPI device +++ * returns 0 if ok, -1 on failure +++ * +++ * void drv_generic_spidev_transfer (int count, struct spi_ioc_transfer *tr) +++ * transfer data to/from the SPI device +++ * +++ */ +++ +++#ifndef _DRV_GENERIC_SPIDEV_H_ +++#define _DRV_GENERIC_SPIDEV_H_ +++ +++#include +++ +++int drv_generic_spidev_open(const char *section, const char *driver); +++int drv_generic_spidev_close(void); +++int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr); +++ +++#endif /* _DRV_GENERIC_SPIDEV_H_ */ ++--- a/drivers.m4 +++++ b/drivers.m4 ++@@ -301,6 +301,7 @@ PARPORT="no" ++ SERIAL="no" ++ I2C="no" ++ KEYPAD="no" +++SPIDEV="no" ++ ++ # generic libraries ++ LIBUSB="no" ++@@ -940,6 +941,12 @@ if test "$LIBJPEG" = "yes"; then ++ DRVLIBS="$DRVLIBS -ljpeg" ++ fi ++ +++# generic spidev driver +++if test "$SPIDEV" = "yes"; then +++ DRIVERS="$DRIVERS drv_generic_spidev.o" +++ AC_DEFINE(WITH_SPIDEV, 1, [SPIDEV driver]) +++fi +++ ++ # libusb ++ if test "$LIBUSB" = "yes"; then ++ DRVLIBS="$DRVLIBS -lusb" ++--- a/configure.in +++++ b/configure.in ++@@ -118,6 +118,9 @@ AC_ARG_WITH(outb, ++ ++ AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"]) ++ +++# check for spidev +++AC_CHECK_HEADERS([linux/spi/spidev.h], [has_spidev="true"], [has_spidev="false"]) +++ ++ # drivers ++ sinclude(drivers.m4) ++ +diff --git a/feeds/packages/utils/lcd4linux/patches/171-allow-to-specify-drv_generic_graphic_real_clear.patch b/feeds/packages/utils/lcd4linux/patches/171-allow-to-specify-drv_generic_graphic_real_clear.patch +new file mode 100644 +index 0000000..5a26643 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/171-allow-to-specify-drv_generic_graphic_real_clear.patch +@@ -0,0 +1,45 @@ ++--- a/drv_generic_graphic.c +++++ b/drv_generic_graphic.c ++@@ -24,7 +24,7 @@ ++ * ++ */ ++ ++-/* +++/* ++ * ++ * exported functions: ++ * ++@@ -98,6 +98,9 @@ static int INVERTED = 0; ++ /* must be implemented by the real driver */ ++ void (*drv_generic_graphic_real_blit) () = NULL; ++ +++/* can be implemented by the real driver */ +++void (*drv_generic_graphic_real_clear) () = NULL; +++ ++ ++ /****************************************/ ++ /*** generic Framebuffer stuff ***/ ++@@ -691,7 +694,10 @@ int drv_generic_graphic_clear(void) ++ for (i = 0; i < LCOLS * LROWS; i++) ++ drv_generic_graphic_FB[l][i] = NO_COL; ++ ++- drv_generic_graphic_blit(0, 0, LROWS, LCOLS); +++ if (drv_generic_graphic_real_clear) +++ drv_generic_graphic_real_clear(NO_COL); +++ else +++ drv_generic_graphic_blit(0, 0, LROWS, LCOLS); ++ ++ return 0; ++ } ++--- a/drv_generic_graphic.h +++++ b/drv_generic_graphic.h ++@@ -40,6 +40,9 @@ extern RGBA NO_COL; /* no color (comple ++ /* these functions must be implemented by the real driver */ ++ extern void (*drv_generic_graphic_real_blit) (const int row, const int col, const int height, const int width); ++ +++/* these functions can be implemented by the real driver */ +++void (*drv_generic_graphic_real_clear) (const RGBA rgba); +++ ++ /* helper function to get pixel color or gray value */ ++ extern RGBA drv_generic_graphic_rgb(const int row, const int col); ++ extern unsigned char drv_generic_graphic_gray(const int row, const int col); +diff --git a/feeds/packages/utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch b/feeds/packages/utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch +new file mode 100644 +index 0000000..29a4bf3 +--- /dev/null ++++ b/feeds/packages/utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch +@@ -0,0 +1,552 @@ ++--- a/drivers.m4 +++++ b/drivers.m4 ++@@ -39,7 +39,7 @@ AC_ARG_WITH( ++ [ Newhaven, Noritake, NULL, Pertelian, PHAnderson,] ++ [ PICGraphic, picoLCD, picoLCDGraphic, PNG, PPM, RouterBoard,] ++ [ Sample, SamsungSPF, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963,] ++- [ TeakLCM, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11], +++ [ TeakLCM, TEW673GRU, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11], ++ drivers=$withval, ++ drivers=all ++ ) ++@@ -107,6 +107,7 @@ for driver in $drivers; do ++ SHUTTLEVFD="yes" ++ SIMPLELCD="yes" ++ T6963="yes" +++ TEW673GRU="yes" ++ TeakLCM="yes" ++ Trefon="yes" ++ ULA200="yes" ++@@ -260,6 +261,9 @@ for driver in $drivers; do ++ TeakLCM) ++ TeakLCM=$val ++ ;; +++ TEW673GRU) +++ TEW673GRU=$val +++ ;; ++ Trefon) ++ Trefon=$val ++ ;; ++@@ -801,6 +805,18 @@ if test "$TeakLCM" = "yes"; then ++ AC_DEFINE(WITH_TEAK_LCM,1,[TeakLCM driver]) ++ fi ++ +++if test "$TEW673GRU" = "yes"; then +++ if test "$has_spidev" = "true"; then +++ GRAPHIC="yes" +++ TEXT="yes" +++ SPIDEV="yes" +++ DRIVERS="$DRIVERS drv_TEW673GRU.o" +++ AC_DEFINE(WITH_TEW673GRU,1,[TEW673GRU driver]) +++ else +++ AC_MSG_WARN(linux/spi/spidev.h not found: TEW673GRU driver disabled) +++ fi +++fi +++ ++ if test "$Trefon" = "yes"; then ++ if test "$has_usb" = "true"; then ++ TEXT="yes" ++--- a/drv.c +++++ b/drv.c ++@@ -92,6 +92,7 @@ extern DRIVER drv_serdisplib; ++ extern DRIVER drv_ShuttleVFD; ++ extern DRIVER drv_SimpleLCD; ++ extern DRIVER drv_T6963; +++extern DRIVER drv_TEW673GRU; ++ extern DRIVER drv_TeakLCM; ++ extern DRIVER drv_Trefon; ++ extern DRIVER drv_ula200; ++@@ -248,6 +249,9 @@ DRIVER *Driver[] = { ++ #ifdef WITH_TEAK_LCM ++ &drv_TeakLCM, ++ #endif +++#ifdef WITH_TEW673GRU +++ &drv_TEW673GRU, +++#endif ++ #ifdef WITH_TREFON ++ &drv_Trefon, ++ #endif ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -119,6 +119,7 @@ drv_ShuttleVFD.c \ ++ drv_SimpleLCD.c \ ++ drv_T6963.c \ ++ drv_TeakLCM.c \ +++drv_TEW673GRU.c \ ++ drv_Trefon.c \ ++ drv_ula200.c \ ++ drv_USBHUB.c \ ++--- /dev/null +++++ b/drv_TEW673GRU.c ++@@ -0,0 +1,457 @@ +++/* $Id$ +++ * $URL$ +++ * +++ * TRENDnet TEW673GRU LCD4linux driver +++ * +++ * Copyright (C) 2012 Gabor Juhos +++ * +++ * based on the Sample driver which is: +++ * Copyright (C) 2005 Michael Reinelt +++ * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team +++ * +++ * This file is part of LCD4Linux. +++ * +++ * LCD4Linux 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, or (at your option) +++ * any later version. +++ * +++ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ * +++ */ +++ +++/* +++ * exported fuctions: +++ * +++ * struct DRIVER drv_TEW673GRU +++ */ +++ +++#include "config.h" +++ +++#include +++#include +++#include +++#include +++#include +++ +++#include "debug.h" +++#include "cfg.h" +++#include "qprintf.h" +++#include "udelay.h" +++#include "plugin.h" +++#include "widget.h" +++#include "widget_text.h" +++#include "widget_icon.h" +++#include "widget_bar.h" +++#include "drv.h" +++ +++#include "drv_generic_text.h" +++#include "drv_generic_graphic.h" +++#include "drv_generic_spidev.h" +++ +++#ifdef WITH_DMALLOC +++#include +++#endif +++ +++#define TEW673GRU_NUM_COLS 220 +++#define TEW673GRU_NUM_ROWS 176 +++#define TEW673GRU_BPP 2 /* bytes per pixel */ +++ +++#define TEW673GRU_CMD_SIZE 9 +++#define TEW673GRU_NUM_ROW_BYTES (TEW673GRU_NUM_COLS * TEW673GRU_BPP) +++ +++enum { +++ CMD_SHOW_STRING = 49, +++ CMD_SHOW_IMAGE_DIR = 52, +++ CMD_SCREEN_COLOR = 54, +++}; +++ +++static char Name[] = "TEW673GRU"; +++ +++static char *drv_TEW673GRU_FB; +++static long FB_SIZE; +++static int MODE; +++ +++static unsigned int RGBAto16(RGBA rgb) +++{ +++ return (((rgb.R >> 3) << 11) | ((rgb.G >> 2) << 5) | (rgb.B >> 3)); +++} +++ +++static unsigned char color_msb(unsigned int color) +++{ +++ return color >> 8; +++} +++ +++static unsigned char color_lsb(unsigned int color) +++{ +++ return color & 0xff; +++} +++ +++static void drv_TEW673GRU_hw_clear(const unsigned int color) +++{ +++ unsigned char cmd[TEW673GRU_CMD_SIZE]; +++ struct spi_ioc_transfer tr[1]; +++ +++ memset(tr, '\0', sizeof(tr)); +++ memset(cmd, '\0', sizeof(cmd)); +++ +++ cmd[0] = CMD_SCREEN_COLOR; +++ cmd[7] = color_msb(color); +++ cmd[8] = color_lsb(color); +++ +++ tr[0].tx_buf = (unsigned long) cmd; +++ tr[0].len = sizeof(cmd); +++ +++ drv_generic_spidev_transfer(1, tr); +++} +++ +++static void drv_TEW673GRU_hw_send_row(const int row, const int col, const char *data, const int width) +++{ +++ unsigned char cmd[TEW673GRU_CMD_SIZE]; +++ struct spi_ioc_transfer tr[2]; +++ int datasize; +++ +++ memset(tr, '\0', sizeof(tr)); +++ memset(cmd, '\0', sizeof(cmd)); +++ +++ datasize = width * TEW673GRU_BPP; +++ +++ cmd[0] = CMD_SHOW_IMAGE_DIR; +++ cmd[1] = col; +++ cmd[2] = col + width; +++ cmd[3] = row; +++ cmd[4] = row; +++ cmd[5] = datasize >> 8; +++ cmd[6] = datasize & 0xff; +++ +++ tr[0].tx_buf = (unsigned long) cmd; +++ tr[0].len = sizeof(cmd); +++ tr[1].tx_buf = (unsigned long) data; +++ tr[1].len = datasize; +++ +++ drv_generic_spidev_transfer(2, tr); +++} +++ +++static void drv_TEW673GRU_hw_write_string(const int row, const int col, const char *data, const int datasize) +++{ +++ unsigned char cmd[TEW673GRU_CMD_SIZE]; +++ struct spi_ioc_transfer tr[2]; +++ unsigned char len; +++ +++ memset(tr, '\0', sizeof(tr)); +++ memset(cmd, '\0', sizeof(cmd)); +++ +++ len = datasize & 0xff; +++ cmd[0] = CMD_SHOW_STRING; +++ cmd[1] = col; +++ cmd[2] = col + (XRES * len); +++ cmd[3] = row; +++ cmd[4] = row + YRES; +++ cmd[7] = 0; +++ cmd[8] = len; +++ +++ tr[0].tx_buf = (unsigned long) cmd; +++ tr[0].len = sizeof(cmd); +++ tr[1].tx_buf = (unsigned long) data; +++ tr[1].len = datasize; +++ +++ drv_generic_spidev_transfer(2, tr); +++} +++ +++static void drv_TEW673GRU_FB_set_pixel(const int col, const unsigned int color) +++{ +++ int pos; +++ +++ pos = col * TEW673GRU_BPP; +++ drv_TEW673GRU_FB[pos] = color_msb(color); +++ drv_TEW673GRU_FB[pos + 1] = color_lsb(color); +++} +++ +++static void drv_TEW673GRU_blit(const int row, const int col, const int height, const int width) +++{ +++ int r, c; +++ +++ debug("%s: update area r:%d c:%d w:%d h:%d", Name, row, col, height, width); +++ +++ for (r = row; r < row + height; r++) { +++ for (c = col; c < col + width; c++) { +++ unsigned int color; +++ RGBA rgb; +++ +++ rgb = drv_generic_graphic_rgb(r, c); +++ color = RGBAto16(rgb); +++ drv_TEW673GRU_FB_set_pixel(c, color); +++ } +++ +++ if (width) { +++ char *data; +++ +++ data = &drv_TEW673GRU_FB[col * TEW673GRU_BPP]; +++ drv_TEW673GRU_hw_send_row(r, col, data, width); +++ udelay(100 + width * 50); +++ } +++ } +++} +++ +++static void drv_TEW673GRU_clear(RGBA rgba) +++{ +++ unsigned int color; +++ +++ color = RGBAto16(rgba); +++ drv_TEW673GRU_hw_clear(color); +++} +++ +++static void drv_TEW673GRU_write(const int row, const int col, const char *data, const int len) +++{ +++ int i; +++ +++ for (i = 0; i < len; i++) { +++ drv_TEW673GRU_hw_write_string(row * YRES, (col + i) * XRES, " ", 1); +++ udelay(10000); +++ drv_TEW673GRU_hw_write_string(row * YRES, 2 + (col + i) * XRES, " ", 1); +++ udelay(10000); +++ drv_TEW673GRU_hw_write_string(row * YRES, (col + i) * XRES, &data[i], 1); +++ udelay(10000); +++ } +++} +++ +++static int drv_TEW673GRU_open(const char *section) +++{ +++ int err; +++ +++ err = drv_generic_spidev_open(section, Name); +++ if (err < 0) +++ return err; +++ +++ return 0; +++} +++ +++static int drv_TEW673GRU_close(void) +++{ +++ drv_generic_spidev_close(); +++ return 0; +++} +++ +++static void drv_TEW673GRU_clear_screen(void) +++{ +++ if (MODE) { +++ drv_generic_graphic_clear(); +++ } else { +++ memset(drv_TEW673GRU_FB, ' ', FB_SIZE); +++ drv_TEW673GRU_hw_clear(0x0000); +++ } +++} +++ +++static int drv_TEW673GRU_init_font(const char *section) +++{ +++ char *font; +++ int ret = -1; +++ +++ font = cfg_get(section, "Font", "6x8"); +++ if (font == NULL) { +++ error("%s: no '%s.Font' entry from %s", Name, section, cfg_source()); +++ goto out; +++ } +++ +++ if (*font == '\0') { +++ error("%s: invalid '%s.Font' entry in %s", Name, section, cfg_source()); +++ goto out_free; +++ } +++ +++ XRES = -1; +++ YRES = -1; +++ if (sscanf(font, "%dx%d", &XRES, &YRES) != 2 || +++ XRES < 1 || +++ YRES < 1) { +++ error("%s: bad Font '%s' from %s", Name, font, cfg_source()); +++ goto out_free; +++ } +++ +++ if (XRES != 6 && YRES != 8) { +++ error("%s: bad Font '%s' from %s (only 6x8 at the moment)", +++ Name, font, cfg_source()); +++ goto out_free; +++ } +++ +++ error("%s: font '%s' selected", Name, font); +++ +++ ret = 0; +++ +++out_free: +++ free(font); +++out: +++ return ret; +++} +++ +++static int drv_TEW673GRU_start(const char *section) +++{ +++ int ret; +++ +++ DCOLS = TEW673GRU_NUM_COLS; +++ DROWS = TEW673GRU_NUM_ROWS; +++ +++ if (MODE) { +++ ret = drv_TEW673GRU_init_font(section); +++ if (ret) +++ goto err; +++ +++ FB_SIZE = DCOLS * TEW673GRU_BPP; +++ } else { +++ XRES = 10; +++ YRES = 16; +++ DCOLS = DCOLS / XRES; +++ DROWS = DROWS / YRES; +++ +++ FB_SIZE = DCOLS * DROWS; +++ } +++ +++ if (FB_SIZE) { +++ drv_TEW673GRU_FB = malloc(FB_SIZE); +++ if (drv_TEW673GRU_FB == NULL) { +++ error("%s: framebuffer could not be allocated", Name); +++ goto err; +++ } +++ } +++ +++ ret = drv_TEW673GRU_open(section); +++ if (ret < 0) +++ goto err_free; +++ +++ if (MODE == 0) +++ drv_TEW673GRU_clear_screen(); +++ +++ return 0; +++ +++ err_free: +++ if (drv_TEW673GRU_FB) +++ free(drv_TEW673GRU_FB); +++ err: +++ return -1; +++} +++ +++static int drv_TEW673GRU_greet(const char *msg1, const char *msg2) +++{ +++ if (MODE) +++ return drv_generic_graphic_greet(msg1, msg2); +++ +++ return drv_generic_text_greet(msg1, msg2); +++} +++ +++ +++/****************************************/ +++/*** widget callbacks ***/ +++/****************************************/ +++ +++ +++/* using drv_generic_text_draw(W) */ +++/* using drv_generic_text_icon_draw(W) */ +++/* using drv_generic_text_bar_draw(W) */ +++/* using drv_generic_gpio_draw(W) */ +++ +++ +++/****************************************/ +++/*** exported functions ***/ +++/****************************************/ +++ +++int drv_TEW673GRU_list(void) +++{ +++ printf("TEW673GRU driver"); +++ return 0; +++} +++ +++int drv_TEW673GRU_init(const char *section, const int quiet) +++{ +++ WIDGET_CLASS wc; +++ int ret; +++ +++ cfg_number(section, "Mode", 0, 0, 1, &MODE); +++ +++ if (MODE) { +++ drv_generic_graphic_real_blit = drv_TEW673GRU_blit; +++ drv_generic_graphic_real_clear = drv_TEW673GRU_clear; +++ } else { +++ drv_generic_text_real_write = drv_TEW673GRU_write; +++ } +++ +++ ret = drv_TEW673GRU_start(section); +++ if (ret) +++ return ret; +++ +++ if (MODE) { +++ ret = drv_generic_graphic_init(section, Name); +++ if (ret) +++ return ret; +++ } else { +++ ret = drv_generic_text_init(section, Name); +++ if (ret) +++ return ret; +++ +++ ret = drv_generic_text_icon_init(); +++ if (ret != 0) +++ return ret; +++ +++ ret = drv_generic_text_bar_init(1); +++ if (ret != 0) +++ return ret; +++ +++ drv_generic_text_bar_add_segment(0, 0, 255, ' '); +++ drv_generic_text_bar_add_segment(255, 255, 255, '#'); +++ +++ wc = Widget_Text; +++ wc.draw = drv_generic_text_draw; +++ widget_register(&wc); +++ +++ wc = Widget_Icon; +++ wc.draw = drv_generic_text_icon_draw; +++ widget_register(&wc); +++ +++ wc = Widget_Bar; +++ wc.draw = drv_generic_text_bar_draw; +++ widget_register(&wc); +++ } +++ +++ if (!quiet) { +++ char buffer[40]; +++ qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS); +++ drv_TEW673GRU_greet(buffer, "www.openwrt.org"); +++ sleep(3); +++ drv_TEW673GRU_clear_screen(); +++ } +++ +++ return 0; +++} +++ +++int drv_TEW673GRU_quit(const int quiet) +++{ +++ +++ info("%s: shutting down.", Name); +++ +++ drv_TEW673GRU_clear_screen(); +++ +++ if (!quiet) +++ drv_TEW673GRU_greet("goodbye!", NULL); +++ +++ if (MODE) +++ drv_generic_graphic_quit(); +++ else +++ drv_generic_text_quit(); +++ +++ debug("closing connection"); +++ drv_TEW673GRU_close(); +++ +++ return (0); +++} +++ +++DRIVER drv_TEW673GRU = { +++ .name = Name, +++ .list = drv_TEW673GRU_list, +++ .init = drv_TEW673GRU_init, +++ .quit = drv_TEW673GRU_quit, +++}; ++--- a/lcd4linux.conf.sample +++++ b/lcd4linux.conf.sample ++@@ -571,6 +571,11 @@ Display FutabaVFD { ++ } ++ } ++ +++Display TEW673GRU { +++ Driver 'TEW673GRU' +++ Font '6x8' +++ Port '/dev/spidev1.0' +++} ++ ++ #Plugin KVV { ++ # StationID '12_701' +diff --git a/feeds/packages/utils/lcdproc/.svn/entries b/feeds/packages/utils/lcdproc/.svn/entries +new file mode 100644 +index 0000000..6de3a1d +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lcdproc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++427df626c62d76f24b9e3c307cbbb14d ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1799 ++ +diff --git a/feeds/packages/utils/lcdproc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lcdproc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..af88c40 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2007-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:=lcdproc ++PKG_VERSION:=0.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/lcdproc ++PKG_MD5SUM:=4d075c3928e84a90bfccf07313b13721 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ ++define Package/lcdproc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat +libncurses +libftdi ++ TITLE:=LCD Display daemon and client ++ URL:=http://sourceforge.net/projects/lcdproc/ ++endef ++ ++define Package/lcdproc/description ++ LCDProc is a daemon and client for displaying system information on various displays. ++endef ++ ++define Package/lcdproc/conffiles ++/etc/LCDd.conf ++/etc/lcdproc.conf ++/etc/lcdexec.conf ++/etc/lcdvc.conf ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default,--enable-drivers=all) ++endef ++ ++define Package/lcdproc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/lib/lcdproc ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/LCDd $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/clients/lcdproc/lcdproc $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/clients/lcdexec/lcdexec $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/clients/lcdvc/lcdvc $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/drivers/*.so $(1)/usr/lib/lcdproc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/LCDd.conf $(1)/etc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/clients/lcdproc/lcdproc.conf $(1)/etc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/clients/lcdexec/lcdexec.conf $(1)/etc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/clients/lcdvc/lcdvc.conf $(1)/etc/ ++ $(INSTALL_BIN) ./files/* $(1)/etc/init.d ++endef ++ ++$(eval $(call BuildPackage,lcdproc)) +diff --git a/feeds/packages/utils/lcdproc/Makefile b/feeds/packages/utils/lcdproc/Makefile +new file mode 100644 +index 0000000..af88c40 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/Makefile +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2007-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:=lcdproc ++PKG_VERSION:=0.5.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/lcdproc ++PKG_MD5SUM:=4d075c3928e84a90bfccf07313b13721 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ ++define Package/lcdproc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libusb-compat +libncurses +libftdi ++ TITLE:=LCD Display daemon and client ++ URL:=http://sourceforge.net/projects/lcdproc/ ++endef ++ ++define Package/lcdproc/description ++ LCDProc is a daemon and client for displaying system information on various displays. ++endef ++ ++define Package/lcdproc/conffiles ++/etc/LCDd.conf ++/etc/lcdproc.conf ++/etc/lcdexec.conf ++/etc/lcdvc.conf ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default,--enable-drivers=all) ++endef ++ ++define Package/lcdproc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/lib/lcdproc ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/LCDd $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/clients/lcdproc/lcdproc $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/clients/lcdexec/lcdexec $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/clients/lcdvc/lcdvc $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/server/drivers/*.so $(1)/usr/lib/lcdproc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/LCDd.conf $(1)/etc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/clients/lcdproc/lcdproc.conf $(1)/etc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/clients/lcdexec/lcdexec.conf $(1)/etc/ ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/clients/lcdvc/lcdvc.conf $(1)/etc/ ++ $(INSTALL_BIN) ./files/* $(1)/etc/init.d ++endef ++ ++$(eval $(call BuildPackage,lcdproc)) +diff --git a/feeds/packages/utils/lcdproc/files/.svn/entries b/feeds/packages/utils/lcdproc/files/.svn/entries +new file mode 100644 +index 0000000..3a20950 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lcdproc/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-09-05T22:18:30.626465Z ++22941 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++LCDd ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++7b2b080dd6ebd99b17b4a18ce0025948 ++2010-09-05T22:18:30.626465Z ++22941 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++99 ++ ++lcdproc ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ade4f5b1000579a62fd4cdf9ba583ca7 ++2010-09-05T22:18:30.626465Z ++22941 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++109 ++ ++lcdexec ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++cec45268b761d0795a0818e4c985ea6c ++2010-09-05T22:18:30.626465Z ++22941 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++109 ++ ++lcdvc ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c46d83685ca1b75d17354cf5557f0a53 ++2010-09-05T22:18:30.626465Z ++22941 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++103 ++ +diff --git a/feeds/packages/utils/lcdproc/files/.svn/prop-base/LCDd.svn-base b/feeds/packages/utils/lcdproc/files/.svn/prop-base/LCDd.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/prop-base/LCDd.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdexec.svn-base b/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdexec.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdexec.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdproc.svn-base b/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdproc.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdproc.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdvc.svn-base b/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdvc.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/prop-base/lcdvc.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/lcdproc/files/.svn/text-base/LCDd.svn-base b/feeds/packages/utils/lcdproc/files/.svn/text-base/LCDd.svn-base +new file mode 100644 +index 0000000..5bec7bc +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/text-base/LCDd.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common ++ ++START=50 ++ ++start() { ++ LCDd -c /etc/LCDd.conf ++} ++ ++stop() { ++ killall LCDd ++} +diff --git a/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdexec.svn-base b/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdexec.svn-base +new file mode 100644 +index 0000000..0d5a3f3 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdexec.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common. ++ ++START=50 ++ ++start() { ++ lcdexec -c /etc/lcdexec.conf ++} ++ ++stop() { ++ killall lcdexec ++} +diff --git a/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdproc.svn-base b/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdproc.svn-base +new file mode 100644 +index 0000000..eb86134 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdproc.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common. ++ ++START=50 ++ ++start() { ++ lcdproc -c /etc/lcdproc.conf ++} ++ ++stop() { ++ killall lcdproc ++} +diff --git a/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdvc.svn-base b/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdvc.svn-base +new file mode 100644 +index 0000000..026fd04 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/.svn/text-base/lcdvc.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common. ++ ++START=50 ++ ++start() { ++ lcdvc -c /etc/lcdvc.conf ++} ++ ++stop() { ++ killall lcdvc ++} +diff --git a/feeds/packages/utils/lcdproc/files/LCDd b/feeds/packages/utils/lcdproc/files/LCDd +new file mode 100755 +index 0000000..5bec7bc +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/LCDd +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common ++ ++START=50 ++ ++start() { ++ LCDd -c /etc/LCDd.conf ++} ++ ++stop() { ++ killall LCDd ++} +diff --git a/feeds/packages/utils/lcdproc/files/lcdexec b/feeds/packages/utils/lcdproc/files/lcdexec +new file mode 100755 +index 0000000..0d5a3f3 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/lcdexec +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common. ++ ++START=50 ++ ++start() { ++ lcdexec -c /etc/lcdexec.conf ++} ++ ++stop() { ++ killall lcdexec ++} +diff --git a/feeds/packages/utils/lcdproc/files/lcdproc b/feeds/packages/utils/lcdproc/files/lcdproc +new file mode 100755 +index 0000000..eb86134 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/lcdproc +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common. ++ ++START=50 ++ ++start() { ++ lcdproc -c /etc/lcdproc.conf ++} ++ ++stop() { ++ killall lcdproc ++} +diff --git a/feeds/packages/utils/lcdproc/files/lcdvc b/feeds/packages/utils/lcdproc/files/lcdvc +new file mode 100755 +index 0000000..026fd04 +--- /dev/null ++++ b/feeds/packages/utils/lcdproc/files/lcdvc +@@ -0,0 +1,11 @@ ++#!/bin/sh /etc/rc.common. ++ ++START=50 ++ ++start() { ++ lcdvc -c /etc/lcdvc.conf ++} ++ ++stop() { ++ killall lcdvc ++} +diff --git a/feeds/packages/utils/less/.svn/entries b/feeds/packages/utils/less/.svn/entries +new file mode 100644 +index 0000000..e7afeb5 +--- /dev/null ++++ b/feeds/packages/utils/less/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/less ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-18T16:34:33.059476Z ++35231 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++71c959861bcca7508cb5ede4a49b32a2 ++2013-01-18T16:34:33.059476Z ++35231 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2005 ++ +diff --git a/feeds/packages/utils/less/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/less/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c638c20 +--- /dev/null ++++ b/feeds/packages/utils/less/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,88 @@ ++# ++# 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:=457 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less ++PKG_MD5SUM:=b5a964682f327b0dceb690f34e02632f ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=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/feeds/packages/utils/less/Makefile b/feeds/packages/utils/less/Makefile +new file mode 100644 +index 0000000..c638c20 +--- /dev/null ++++ b/feeds/packages/utils/less/Makefile +@@ -0,0 +1,88 @@ ++# ++# 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:=457 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less ++PKG_MD5SUM:=b5a964682f327b0dceb690f34e02632f ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL:=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/feeds/packages/utils/lilo/.svn/entries b/feeds/packages/utils/lilo/.svn/entries +new file mode 100644 +index 0000000..b91e552 +--- /dev/null ++++ b/feeds/packages/utils/lilo/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lilo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-19T21:02:20.278219Z ++20308 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++880aba13793379bb83685b72f5b659b0 ++2010-03-19T21:02:20.278219Z ++20308 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1102 ++ +diff --git a/feeds/packages/utils/lilo/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/lilo/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/lilo/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lilo/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lilo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..35f6da5 +--- /dev/null ++++ b/feeds/packages/utils/lilo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=lilo ++PKG_VERSION:=22.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz ++PKG_SOURCE_URL:=ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/ ++PKG_MD5SUM:=72765f2aafd20e23ecf07ebd22baeec7 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lilo ++ SECTION:=base ++ CATEGORY:=Boot Loaders ++ DEPENDS:=@TARGET_x86 ++ TITLE:=lilo ++ URL:=ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/ ++endef ++ ++define Package/lilo/conffiles ++/etc/lilo.conf ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(HOSTCC) -m32" \ ++ alles ++endef ++ ++define Package/lilo/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(CP) $(PKG_BUILD_DIR)/lilo.static $(1)/sbin/lilo ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) ./files/lilo.conf $(1)/etc/ ++ $(CP) ./files/boot.msg $(1)/etc/ ++endef ++ ++$(foreach command, as86 ld86, \ ++ $(eval $(call RequireCommand,$(command), \ ++ $(PKG_NAME) requires $(command). \ ++ )) \ ++) ++ ++$(eval $(call BuildPackage,lilo)) ++ +diff --git a/feeds/packages/utils/lilo/Makefile b/feeds/packages/utils/lilo/Makefile +new file mode 100644 +index 0000000..35f6da5 +--- /dev/null ++++ b/feeds/packages/utils/lilo/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=lilo ++PKG_VERSION:=22.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz ++PKG_SOURCE_URL:=ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/ ++PKG_MD5SUM:=72765f2aafd20e23ecf07ebd22baeec7 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lilo ++ SECTION:=base ++ CATEGORY:=Boot Loaders ++ DEPENDS:=@TARGET_x86 ++ TITLE:=lilo ++ URL:=ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/ ++endef ++ ++define Package/lilo/conffiles ++/etc/lilo.conf ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(HOSTCC) -m32" \ ++ alles ++endef ++ ++define Package/lilo/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(CP) $(PKG_BUILD_DIR)/lilo.static $(1)/sbin/lilo ++ $(INSTALL_DIR) $(1)/etc ++ $(CP) ./files/lilo.conf $(1)/etc/ ++ $(CP) ./files/boot.msg $(1)/etc/ ++endef ++ ++$(foreach command, as86 ld86, \ ++ $(eval $(call RequireCommand,$(command), \ ++ $(PKG_NAME) requires $(command). \ ++ )) \ ++) ++ ++$(eval $(call BuildPackage,lilo)) ++ +diff --git a/feeds/packages/utils/lilo/files/.svn/entries b/feeds/packages/utils/lilo/files/.svn/entries +new file mode 100644 +index 0000000..f81052b +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lilo/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-07T15:19:23.445177Z ++11744 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++mkbootable ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0e1b514a0efa0711b6df3a2073c6456f ++2008-07-07T15:19:23.445177Z ++11744 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++404 ++ ++lilo.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++e01b1df48f4eb35dd93e13aae2751cee ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++471 ++ ++boot.msg ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++1d5cb14f5d9e71ed67c2e913603a2d20 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++122 ++ ++bdlilo.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++2e3ad8ae053e88699b5863763cc70bf5 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++546 ++ ++README ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++91c4a4381c83b97f77ee4071458abe2f ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1577 ++ +diff --git a/feeds/packages/utils/lilo/files/.svn/prop-base/README.svn-base b/feeds/packages/utils/lilo/files/.svn/prop-base/README.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/prop-base/README.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lilo/files/.svn/prop-base/bdlilo.conf.svn-base b/feeds/packages/utils/lilo/files/.svn/prop-base/bdlilo.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/prop-base/bdlilo.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lilo/files/.svn/prop-base/boot.msg.svn-base b/feeds/packages/utils/lilo/files/.svn/prop-base/boot.msg.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/prop-base/boot.msg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lilo/files/.svn/prop-base/lilo.conf.svn-base b/feeds/packages/utils/lilo/files/.svn/prop-base/lilo.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/prop-base/lilo.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lilo/files/.svn/prop-base/mkbootable.svn-base b/feeds/packages/utils/lilo/files/.svn/prop-base/mkbootable.svn-base +new file mode 100644 +index 0000000..03b5bfa +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/prop-base/mkbootable.svn-base +@@ -0,0 +1,9 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/lilo/files/.svn/text-base/README.svn-base b/feeds/packages/utils/lilo/files/.svn/text-base/README.svn-base +new file mode 100644 +index 0000000..1315e8b +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/text-base/README.svn-base +@@ -0,0 +1,35 @@ ++Using this package to create a bootable usb stick for openwrt. ++ ++The status of this package is currently 'it works for me', and it will ++require more effort before it's generic across the board. Currently ++only tested to be working on x86-2.6 using an initramfs image. ++My development environment for this is a via epia with a ++serial console (no monitors or keyboards attached). ++ ++To create the images that are bootable, configure your buildroot to include ++the lilo package in the image, as well as e2fsprogs. Have it create an ++ext2 file system as the target file system. Let it build the works. ++ ++When the build is finished, you will need to run the script 'mkbootable' ++located in the lilo package directory, it requires root privileges to ++loop mount the fs for installing lilo. When it's done, you have an ++8 meg ext2fs root file system ready to run. ++ ++To use the image, dd it directly onto a usb stick. It should go onto ++/dev/sda not /dev/sda1, it's assuming the stick is not partitioned. ++When you boot the stick, you will get a lilo menu on the serial terminal. ++The three options allow you to boot with the stick itself as the root file ++system, or, to boot into a ramdisk, and not mount the stick at all. The ++stick will likely show up at /dev/disc ++ ++Boot the unit, and select the ramdisk. Once up in the ramdisk, you can ++use the e2fstools to expand the image to fill the stick and add a journal ++to use it as ext3. ++ ++e2fsck -f /dev/disc ++tune2fs -j /dev/disc ++resize2fs /dev/disc ++ ++Reboot the box, and, have fun with openwrt on your x86 using the usb ++stick to boot and run from. ++ +diff --git a/feeds/packages/utils/lilo/files/.svn/text-base/bdlilo.conf.svn-base b/feeds/packages/utils/lilo/files/.svn/text-base/bdlilo.conf.svn-base +new file mode 100644 +index 0000000..cbb26d6 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/text-base/bdlilo.conf.svn-base +@@ -0,0 +1,30 @@ ++serial=0,115200n8 ++boot =/dev/loop1 ++disk =/dev/loop1 ++ bios =0x80 ++ sectors =63 ++ heads =255 ++ cylinders =999 ++lba32 ++compact ++install =mount/boot/boot.b ++map =mount/boot/map ++ ++prompt ++delay =1 ++timeout =100 ++message =mount/etc/boot.msg ++ ++ ++image =mount/vmlinuz ++ label =openwrt ++ append =" rootfs=/dev/discs/disc0/disc console=ttyS0,115200n81 " ++ ++image =mount/vmlinuz ++ label =ramdisk ++ append =" console=ttyS0,115200n81" ++ ++image =mount/vmlinuz ++ label =failsafe ++ append =" FAILSAFE=MenuRequest console=ttyS0,115200n81" ++ +diff --git a/feeds/packages/utils/lilo/files/.svn/text-base/boot.msg.svn-base b/feeds/packages/utils/lilo/files/.svn/text-base/boot.msg.svn-base +new file mode 100644 +index 0000000..a7c5119 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/text-base/boot.msg.svn-base +@@ -0,0 +1,7 @@ ++ ++Boot Options:- ++ ++openwrt - OpenWrt with usb stick root ++ramdisk - OpenWrt with ramdisk root ++failsafe - OpenWrt failsafe ++ +diff --git a/feeds/packages/utils/lilo/files/.svn/text-base/lilo.conf.svn-base b/feeds/packages/utils/lilo/files/.svn/text-base/lilo.conf.svn-base +new file mode 100644 +index 0000000..d4a769e +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/text-base/lilo.conf.svn-base +@@ -0,0 +1,26 @@ ++serial=0,115200n8 ++disk=/dev/discs/disc0/disc ++bios=0x80 ++lba32 ++compact ++install =/boot/boot.b ++map =/boot/map ++backup =/dev/null ++prompt ++delay =1 ++timeout =100 ++message =/etc/boot.msg ++ ++image =/vmlinuz ++ label =openwrt ++ append =" rootfs=/dev/discs/disc0/disc console=ttyS0,115200n81 " ++ ++image =/vmlinuz ++ label =ramdisk ++ append =" console=ttyS0,115200n81" ++ ++image =/vmlinuz ++ label =failsafe ++ append =" FAILSAFE=MenuRequest console=ttyS0,115200n81" ++ ++ +diff --git a/feeds/packages/utils/lilo/files/.svn/text-base/mkbootable.svn-base b/feeds/packages/utils/lilo/files/.svn/text-base/mkbootable.svn-base +new file mode 100644 +index 0000000..30ea2f1 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/.svn/text-base/mkbootable.svn-base +@@ -0,0 +1,15 @@ ++#!/bin/sh ++# Copyright (C) 2006 OpenWrt.org ++LOOPDEV="/dev/loop1" ++ ++mkdir mount ++cp bin/openwrt-x86-ext2.img bin/boot.img ++sudo losetup $LOOPDEV bin/boot.img ++sudo mount $LOOPDEV mount ++sudo cp build_i386/linux/arch/i386/boot/bzImage mount/vmlinuz ++sudo mkdir mount/boot ++sudo build_i386/lilo-22.8/lilo -C package/lilo/bdlilo.conf ++sudo umount mount ++echo releasing $LOOPDEV ++sudo losetup -d $LOOPDEV ++rm -r -f mount +diff --git a/feeds/packages/utils/lilo/files/README b/feeds/packages/utils/lilo/files/README +new file mode 100644 +index 0000000..1315e8b +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/README +@@ -0,0 +1,35 @@ ++Using this package to create a bootable usb stick for openwrt. ++ ++The status of this package is currently 'it works for me', and it will ++require more effort before it's generic across the board. Currently ++only tested to be working on x86-2.6 using an initramfs image. ++My development environment for this is a via epia with a ++serial console (no monitors or keyboards attached). ++ ++To create the images that are bootable, configure your buildroot to include ++the lilo package in the image, as well as e2fsprogs. Have it create an ++ext2 file system as the target file system. Let it build the works. ++ ++When the build is finished, you will need to run the script 'mkbootable' ++located in the lilo package directory, it requires root privileges to ++loop mount the fs for installing lilo. When it's done, you have an ++8 meg ext2fs root file system ready to run. ++ ++To use the image, dd it directly onto a usb stick. It should go onto ++/dev/sda not /dev/sda1, it's assuming the stick is not partitioned. ++When you boot the stick, you will get a lilo menu on the serial terminal. ++The three options allow you to boot with the stick itself as the root file ++system, or, to boot into a ramdisk, and not mount the stick at all. The ++stick will likely show up at /dev/disc ++ ++Boot the unit, and select the ramdisk. Once up in the ramdisk, you can ++use the e2fstools to expand the image to fill the stick and add a journal ++to use it as ext3. ++ ++e2fsck -f /dev/disc ++tune2fs -j /dev/disc ++resize2fs /dev/disc ++ ++Reboot the box, and, have fun with openwrt on your x86 using the usb ++stick to boot and run from. ++ +diff --git a/feeds/packages/utils/lilo/files/bdlilo.conf b/feeds/packages/utils/lilo/files/bdlilo.conf +new file mode 100644 +index 0000000..cbb26d6 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/bdlilo.conf +@@ -0,0 +1,30 @@ ++serial=0,115200n8 ++boot =/dev/loop1 ++disk =/dev/loop1 ++ bios =0x80 ++ sectors =63 ++ heads =255 ++ cylinders =999 ++lba32 ++compact ++install =mount/boot/boot.b ++map =mount/boot/map ++ ++prompt ++delay =1 ++timeout =100 ++message =mount/etc/boot.msg ++ ++ ++image =mount/vmlinuz ++ label =openwrt ++ append =" rootfs=/dev/discs/disc0/disc console=ttyS0,115200n81 " ++ ++image =mount/vmlinuz ++ label =ramdisk ++ append =" console=ttyS0,115200n81" ++ ++image =mount/vmlinuz ++ label =failsafe ++ append =" FAILSAFE=MenuRequest console=ttyS0,115200n81" ++ +diff --git a/feeds/packages/utils/lilo/files/boot.msg b/feeds/packages/utils/lilo/files/boot.msg +new file mode 100644 +index 0000000..a7c5119 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/boot.msg +@@ -0,0 +1,7 @@ ++ ++Boot Options:- ++ ++openwrt - OpenWrt with usb stick root ++ramdisk - OpenWrt with ramdisk root ++failsafe - OpenWrt failsafe ++ +diff --git a/feeds/packages/utils/lilo/files/lilo.conf b/feeds/packages/utils/lilo/files/lilo.conf +new file mode 100644 +index 0000000..d4a769e +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/lilo.conf +@@ -0,0 +1,26 @@ ++serial=0,115200n8 ++disk=/dev/discs/disc0/disc ++bios=0x80 ++lba32 ++compact ++install =/boot/boot.b ++map =/boot/map ++backup =/dev/null ++prompt ++delay =1 ++timeout =100 ++message =/etc/boot.msg ++ ++image =/vmlinuz ++ label =openwrt ++ append =" rootfs=/dev/discs/disc0/disc console=ttyS0,115200n81 " ++ ++image =/vmlinuz ++ label =ramdisk ++ append =" console=ttyS0,115200n81" ++ ++image =/vmlinuz ++ label =failsafe ++ append =" FAILSAFE=MenuRequest console=ttyS0,115200n81" ++ ++ +diff --git a/feeds/packages/utils/lilo/files/mkbootable b/feeds/packages/utils/lilo/files/mkbootable +new file mode 100755 +index 0000000..30ea2f1 +--- /dev/null ++++ b/feeds/packages/utils/lilo/files/mkbootable +@@ -0,0 +1,15 @@ ++#!/bin/sh ++# Copyright (C) 2006 OpenWrt.org ++LOOPDEV="/dev/loop1" ++ ++mkdir mount ++cp bin/openwrt-x86-ext2.img bin/boot.img ++sudo losetup $LOOPDEV bin/boot.img ++sudo mount $LOOPDEV mount ++sudo cp build_i386/linux/arch/i386/boot/bzImage mount/vmlinuz ++sudo mkdir mount/boot ++sudo build_i386/lilo-22.8/lilo -C package/lilo/bdlilo.conf ++sudo umount mount ++echo releasing $LOOPDEV ++sudo losetup -d $LOOPDEV ++rm -r -f mount +diff --git a/feeds/packages/utils/lirc/.svn/entries b/feeds/packages/utils/lirc/.svn/entries +new file mode 100644 +index 0000000..8489c7c +--- /dev/null ++++ b/feeds/packages/utils/lirc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lirc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-16T18:08:24.230763Z ++30596 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++eca873923260b2ed59ba91bd48a79560 ++2012-02-16T18:08:24.230763Z ++30596 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4171 ++ +diff --git a/feeds/packages/utils/lirc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lirc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..00273b7 +--- /dev/null ++++ b/feeds/packages/utils/lirc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,142 @@ ++# ++# 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 ++# we use the $LINUX_DIR variable, which is defined in kernel.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=lirc ++PKG_VERSION:=0.8.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/${PKG_NAME} ++PKG_MD5SUM:=fb1dcddbc8ca3d03c7f3a2d40cf28b71 ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lirc/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://lirc.org/ ++endef ++ ++define Package/lirc ++ $(call Package/lirc/Default) ++ TITLE:=LIRC - Linux Infrared Remote Control ++ MENU:=1 ++endef ++ ++define Package/lirc/description ++ LIRC is a package that allows you to decode and send ++ infra-red signals of many (but not all) commonly used ++ remote controls. ++ ++ This package contains only lircd and lircd.conf! ++ ++tested drivers ++-------------- ++ok: ++userspace,accent,act200l,act220l,adaptec,alsa_usb,animax,asusdh, ++atilibusb,atiusb,audio_alsa,breakoutbox,bte,bw6130,cmdir,creative, ++creative_infracd,devinput,digimatrix,dsp,dvico,ea65,exaudiohauppauge, ++hauppauge_dvb,hercules_smarttv_stereo,i2cuser,igorplugusb,imon, ++imon_24g,imon_knob,imon_pad,imon_rsc,irdeo,irdeo_remote,it87,knc_one, ++leadtek_pvr2000,livedrive_midi,livedrive_seq,logitech,macmini,mceusb, ++mceusb2,mediafocusI,mouseremote,mouseremote_ps2,mp3anywhere, ++packard_bell,parallel,pcmak,pcmak_usb,pctv,pixelview_bt878,provideo, ++realmagic,remotemaster,sasem,sb0540,serial,silitek,sir,streamzap,tekram, ++tekram_bt829,tira,ttusbir,tuxbox,tvbox,udp,uirt2,uirt2_raw,usb_uirt_raw, ++usbx,serial ++ ++nok: ++avermedia,avermedia_vdomate,avermedia98,bestbuy,bestbuy2,chronos,comX, ++cph06x,flyvideo,gvbctv5pci,irreal,kworld,leadtek_0007,leadtek_0010,lptX, ++nslu2,pixelview_pak,pixelview_pro,sa1100, ++ ++unknown: ++audio (no portaudio), caraca (no caraca package), iguanaIR (missing headers), ++irman (no libirman) ++ ++endef ++ ++ ++define Package/lircdaemonadd ++ $(call Package/lirc/Default) ++ DEPENDS:=lirc ++ TITLE:=Daemon Additional Files ++endef ++ ++define Package/lircdaemonadd/description ++ Contains those additional daemon-tools: ++ -irrecord ++ -lircmd ++endef ++ ++define Package/lirctools ++ $(call Package/lirc/Default) ++ DEPENDS:=lirc ++ TITLE:=LIRC tools ++endef ++ ++define Package/lirctools/description ++ This package contains those lirc-tools: ++ -ircat: prints config strings to standard output, can be used to provide remote control input to scripts ++ -irexec: execute programs according to the pressed remote control buttons ++ -irpty: pseudo tty driver. Connects to lircd via socket to receive infra-red codes and converts them to key strokes ++ -irsend: application for sending IR-codes via lirc ++ -irw: watch the codes as lircd recognize them ++ -lircrcd: daemon that manages current mode for all applications ++ -mode2: shows the pulse/space length of a remote button ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-nls \ ++ --disable-static \ ++ --with-kerneldir="$(LINUX_DIR)" \ ++ --with-driver="mceusb" \ ++ --without-x \ ++ --with-pic \ ++ --with-gnu-ld \ ++ --enable-sandboxed ++ ++define Package/lirc/conffiles ++/etc/lircd.conf ++endef ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SUBDIRS="daemons tools" ++ ++define Package/lirc/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemons/lircd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/lircd.conf $(1)/etc/ ++endef ++#todo: ++# $(CP) $(PKG_BUILD_DIR)/drivers/lirc_dev/lirc_dev.ko ++# $(CP) $(PKG_BUILD_DIR)/drivers/lirc_mceusb2/lirc_mceusb2.ko ++#depends on the selected module ++ ++define Package/lircdaemonadd/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemons/{irrecord,lircmd} $(1)/usr/sbin/ ++endef ++ ++define Package/lirctools/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/irsend $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/irw $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mode2 $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,lirc)) ++$(eval $(call BuildPackage,lircdaemonadd)) ++$(eval $(call BuildPackage,lirctools)) +diff --git a/feeds/packages/utils/lirc/Makefile b/feeds/packages/utils/lirc/Makefile +new file mode 100644 +index 0000000..00273b7 +--- /dev/null ++++ b/feeds/packages/utils/lirc/Makefile +@@ -0,0 +1,142 @@ ++# ++# 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 ++# we use the $LINUX_DIR variable, which is defined in kernel.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=lirc ++PKG_VERSION:=0.8.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/${PKG_NAME} ++PKG_MD5SUM:=fb1dcddbc8ca3d03c7f3a2d40cf28b71 ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lirc/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://lirc.org/ ++endef ++ ++define Package/lirc ++ $(call Package/lirc/Default) ++ TITLE:=LIRC - Linux Infrared Remote Control ++ MENU:=1 ++endef ++ ++define Package/lirc/description ++ LIRC is a package that allows you to decode and send ++ infra-red signals of many (but not all) commonly used ++ remote controls. ++ ++ This package contains only lircd and lircd.conf! ++ ++tested drivers ++-------------- ++ok: ++userspace,accent,act200l,act220l,adaptec,alsa_usb,animax,asusdh, ++atilibusb,atiusb,audio_alsa,breakoutbox,bte,bw6130,cmdir,creative, ++creative_infracd,devinput,digimatrix,dsp,dvico,ea65,exaudiohauppauge, ++hauppauge_dvb,hercules_smarttv_stereo,i2cuser,igorplugusb,imon, ++imon_24g,imon_knob,imon_pad,imon_rsc,irdeo,irdeo_remote,it87,knc_one, ++leadtek_pvr2000,livedrive_midi,livedrive_seq,logitech,macmini,mceusb, ++mceusb2,mediafocusI,mouseremote,mouseremote_ps2,mp3anywhere, ++packard_bell,parallel,pcmak,pcmak_usb,pctv,pixelview_bt878,provideo, ++realmagic,remotemaster,sasem,sb0540,serial,silitek,sir,streamzap,tekram, ++tekram_bt829,tira,ttusbir,tuxbox,tvbox,udp,uirt2,uirt2_raw,usb_uirt_raw, ++usbx,serial ++ ++nok: ++avermedia,avermedia_vdomate,avermedia98,bestbuy,bestbuy2,chronos,comX, ++cph06x,flyvideo,gvbctv5pci,irreal,kworld,leadtek_0007,leadtek_0010,lptX, ++nslu2,pixelview_pak,pixelview_pro,sa1100, ++ ++unknown: ++audio (no portaudio), caraca (no caraca package), iguanaIR (missing headers), ++irman (no libirman) ++ ++endef ++ ++ ++define Package/lircdaemonadd ++ $(call Package/lirc/Default) ++ DEPENDS:=lirc ++ TITLE:=Daemon Additional Files ++endef ++ ++define Package/lircdaemonadd/description ++ Contains those additional daemon-tools: ++ -irrecord ++ -lircmd ++endef ++ ++define Package/lirctools ++ $(call Package/lirc/Default) ++ DEPENDS:=lirc ++ TITLE:=LIRC tools ++endef ++ ++define Package/lirctools/description ++ This package contains those lirc-tools: ++ -ircat: prints config strings to standard output, can be used to provide remote control input to scripts ++ -irexec: execute programs according to the pressed remote control buttons ++ -irpty: pseudo tty driver. Connects to lircd via socket to receive infra-red codes and converts them to key strokes ++ -irsend: application for sending IR-codes via lirc ++ -irw: watch the codes as lircd recognize them ++ -lircrcd: daemon that manages current mode for all applications ++ -mode2: shows the pulse/space length of a remote button ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-nls \ ++ --disable-static \ ++ --with-kerneldir="$(LINUX_DIR)" \ ++ --with-driver="mceusb" \ ++ --without-x \ ++ --with-pic \ ++ --with-gnu-ld \ ++ --enable-sandboxed ++ ++define Package/lirc/conffiles ++/etc/lircd.conf ++endef ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ SUBDIRS="daemons tools" ++ ++define Package/lirc/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemons/lircd $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/contrib/lircd.conf $(1)/etc/ ++endef ++#todo: ++# $(CP) $(PKG_BUILD_DIR)/drivers/lirc_dev/lirc_dev.ko ++# $(CP) $(PKG_BUILD_DIR)/drivers/lirc_mceusb2/lirc_mceusb2.ko ++#depends on the selected module ++ ++define Package/lircdaemonadd/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemons/{irrecord,lircmd} $(1)/usr/sbin/ ++endef ++ ++define Package/lirctools/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/irsend $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/irw $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mode2 $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,lirc)) ++$(eval $(call BuildPackage,lircdaemonadd)) ++$(eval $(call BuildPackage,lirctools)) +diff --git a/feeds/packages/utils/lm-sensors/.svn/entries b/feeds/packages/utils/lm-sensors/.svn/entries +new file mode 100644 +index 0000000..6903d9e +--- /dev/null ++++ b/feeds/packages/utils/lm-sensors/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lm-sensors ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++eb43f833efdcf335341612477954d56f ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2614 ++ +diff --git a/feeds/packages/utils/lm-sensors/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lm-sensors/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b9039d5 +--- /dev/null ++++ b/feeds/packages/utils/lm-sensors/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,112 @@ ++# ++# 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:=lm-sensors ++PKG_VERSION:=3.3.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases ++PKG_MD5SUM:=f357ba00b080ab102a170f7bf8bb2578 ++ ++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)" \ ++ 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/feeds/packages/utils/lm-sensors/Makefile b/feeds/packages/utils/lm-sensors/Makefile +new file mode 100644 +index 0000000..b9039d5 +--- /dev/null ++++ b/feeds/packages/utils/lm-sensors/Makefile +@@ -0,0 +1,112 @@ ++# ++# 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:=lm-sensors ++PKG_VERSION:=3.3.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases ++PKG_MD5SUM:=f357ba00b080ab102a170f7bf8bb2578 ++ ++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)" \ ++ 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/feeds/packages/utils/lm-sensors/files/.svn/entries b/feeds/packages/utils/lm-sensors/files/.svn/entries +new file mode 100644 +index 0000000..59fb784 +--- /dev/null ++++ b/feeds/packages/utils/lm-sensors/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lm-sensors/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-04-16T13:04:24.387663Z ++6971 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++sensors.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++46f8c8778d12b473f5f64753e549a9d1 ++2007-04-16T13:04:24.387663Z ++6971 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2243 ++ +diff --git a/feeds/packages/utils/lm-sensors/files/.svn/text-base/sensors.conf.svn-base b/feeds/packages/utils/lm-sensors/files/.svn/text-base/sensors.conf.svn-base +new file mode 100644 +index 0000000..505b9d9 +--- /dev/null ++++ b/feeds/packages/utils/lm-sensors/files/.svn/text-base/sensors.conf.svn-base +@@ -0,0 +1,117 @@ ++chip "pc87366-*" ++ ++# Soekris net4801 configuration ++ ++# Written by Henrik Brix Andersen ++# 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 ++ ++# 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/feeds/packages/utils/lm-sensors/files/sensors.conf b/feeds/packages/utils/lm-sensors/files/sensors.conf +new file mode 100644 +index 0000000..505b9d9 +--- /dev/null ++++ b/feeds/packages/utils/lm-sensors/files/sensors.conf +@@ -0,0 +1,117 @@ ++chip "pc87366-*" ++ ++# Soekris net4801 configuration ++ ++# Written by Henrik Brix Andersen ++# 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 ++ ++# 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/feeds/packages/utils/lmbench/.svn/entries b/feeds/packages/utils/lmbench/.svn/entries +new file mode 100644 +index 0000000..f1e48bb +--- /dev/null ++++ b/feeds/packages/utils/lmbench/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lmbench ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-10T19:47:21.094690Z ++30426 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2338bbc9b4d37eb88190f81949856049 ++2012-02-10T19:47:21.094690Z ++30426 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2287 ++ +diff --git a/feeds/packages/utils/lmbench/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/lmbench/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lmbench/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lmbench/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..91866a1 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,122 @@ ++# ++# Copyright (C) 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:=lmbench ++PKG_VERSION:=3.0-a9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/lmbench/ ++PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf ++ ++PKG_BUILD_DEPENDS:=librpc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lmbench ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=lmbench microbenchmarks ++ URL:=http://sourceforge.net/projects/lmbench ++ MENU:=1 ++endef ++ ++define Package/lmbench/description ++ lmbench is a series of micro benchmarks intended to measure basic operating ++ system and hardware system metrics. ++endef ++ ++define Package/lmbench/install ++ true ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/src \ ++ CC="$(TARGET_CC)" \ ++ AR="$(TARGET_CROSS)ar" \ ++ OS="$(ARCH)" \ ++ BASE="$(PKG_INSTALL_DIR)" \ ++ LDLIBS="-lrpc" \ ++ COMPILE="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ ++ lmbench install ++endef ++ ++define PartGen ++define Package/lmbench-$(subst _,-,$(1)) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=$(1) microbenchmark ++ URL:=http://sourceforge.net/projects/lmbench ++ DEPENDS:=lmbench +librpc ++endef ++endef ++ ++define PartInstall ++define Package/lmbench-$(subst _,-,$(1))/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(1) $$(1)/usr/sbin/$(1) ++endef ++endef ++ ++LMBENCH_FILES:= \ ++ bw_file_rd \ ++ bw_mem \ ++ bw_mmap_rd \ ++ bw_pipe \ ++ bw_tcp \ ++ bw_unix \ ++ cache \ ++ disk \ ++ enough \ ++ flushdisk \ ++ hello \ ++ lat_cmd \ ++ lat_connect \ ++ lat_ctx \ ++ lat_dram_page \ ++ lat_fcntl \ ++ lat_fifo \ ++ lat_fs \ ++ lat_http \ ++ lat_mem_rd \ ++ lat_mmap \ ++ lat_ops \ ++ lat_pagefault \ ++ lat_pipe \ ++ lat_pmake \ ++ lat_proc \ ++ lat_rand \ ++ lat_rpc \ ++ lat_select \ ++ lat_sem \ ++ lat_sig \ ++ lat_syscall \ ++ lat_tcp \ ++ lat_udp \ ++ lat_unix \ ++ lat_unix_connect \ ++ lat_usleep \ ++ line \ ++ lmdd \ ++ lmhttp \ ++ loop_o \ ++ memsize \ ++ mhz \ ++ msleep \ ++ par_mem \ ++ par_ops \ ++ stream \ ++ timing_o \ ++ tlb ++ ++$(foreach file,$(LMBENCH_FILES),$(eval $(call PartGen,$(file)))) ++$(foreach file,$(LMBENCH_FILES),$(eval $(call PartInstall,$(file)))) ++ ++$(eval $(call BuildPackage,lmbench)) ++$(foreach file,$(LMBENCH_FILES),$(eval $(call BuildPackage,lmbench-$(subst _,-,$(file))))) +diff --git a/feeds/packages/utils/lmbench/Makefile b/feeds/packages/utils/lmbench/Makefile +new file mode 100644 +index 0000000..91866a1 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/Makefile +@@ -0,0 +1,122 @@ ++# ++# Copyright (C) 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:=lmbench ++PKG_VERSION:=3.0-a9 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/lmbench/ ++PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf ++ ++PKG_BUILD_DEPENDS:=librpc ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lmbench ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=lmbench microbenchmarks ++ URL:=http://sourceforge.net/projects/lmbench ++ MENU:=1 ++endef ++ ++define Package/lmbench/description ++ lmbench is a series of micro benchmarks intended to measure basic operating ++ system and hardware system metrics. ++endef ++ ++define Package/lmbench/install ++ true ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR)/src \ ++ CC="$(TARGET_CC)" \ ++ AR="$(TARGET_CROSS)ar" \ ++ OS="$(ARCH)" \ ++ BASE="$(PKG_INSTALL_DIR)" \ ++ LDLIBS="-lrpc" \ ++ COMPILE="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ ++ lmbench install ++endef ++ ++define PartGen ++define Package/lmbench-$(subst _,-,$(1)) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=$(1) microbenchmark ++ URL:=http://sourceforge.net/projects/lmbench ++ DEPENDS:=lmbench +librpc ++endef ++endef ++ ++define PartInstall ++define Package/lmbench-$(subst _,-,$(1))/install ++ $(INSTALL_DIR) $$(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(1) $$(1)/usr/sbin/$(1) ++endef ++endef ++ ++LMBENCH_FILES:= \ ++ bw_file_rd \ ++ bw_mem \ ++ bw_mmap_rd \ ++ bw_pipe \ ++ bw_tcp \ ++ bw_unix \ ++ cache \ ++ disk \ ++ enough \ ++ flushdisk \ ++ hello \ ++ lat_cmd \ ++ lat_connect \ ++ lat_ctx \ ++ lat_dram_page \ ++ lat_fcntl \ ++ lat_fifo \ ++ lat_fs \ ++ lat_http \ ++ lat_mem_rd \ ++ lat_mmap \ ++ lat_ops \ ++ lat_pagefault \ ++ lat_pipe \ ++ lat_pmake \ ++ lat_proc \ ++ lat_rand \ ++ lat_rpc \ ++ lat_select \ ++ lat_sem \ ++ lat_sig \ ++ lat_syscall \ ++ lat_tcp \ ++ lat_udp \ ++ lat_unix \ ++ lat_unix_connect \ ++ lat_usleep \ ++ line \ ++ lmdd \ ++ lmhttp \ ++ loop_o \ ++ memsize \ ++ mhz \ ++ msleep \ ++ par_mem \ ++ par_ops \ ++ stream \ ++ timing_o \ ++ tlb ++ ++$(foreach file,$(LMBENCH_FILES),$(eval $(call PartGen,$(file)))) ++$(foreach file,$(LMBENCH_FILES),$(eval $(call PartInstall,$(file)))) ++ ++$(eval $(call BuildPackage,lmbench)) ++$(foreach file,$(LMBENCH_FILES),$(eval $(call BuildPackage,lmbench-$(subst _,-,$(file))))) +diff --git a/feeds/packages/utils/lmbench/patches/.svn/entries b/feeds/packages/utils/lmbench/patches/.svn/entries +new file mode 100644 +index 0000000..87d0c6a +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lmbench/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-08T16:39:23.012237Z ++30383 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-install-cache.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d5bb6bab560a00b45a16653bff3da318 ++2012-02-08T16:39:23.012237Z ++30383 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++407 ++ ++100-bw_mem-add-newline-after-usage.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1696fbeba6dde23d28b83ee83ac158ef ++2012-02-08T16:39:23.012237Z ++30383 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++493 ++ ++001-fix_socklen_t_define.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++90a5377db121a0760880012e85a0db50 ++2012-02-08T16:39:23.012237Z ++30383 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++256 ++ ++003-add-LDLIBS.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++68f7a8698a326e573666c10f49be93db ++2012-02-08T16:39:23.012237Z ++30383 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++905 ++ +diff --git a/feeds/packages/utils/lmbench/patches/.svn/text-base/001-fix_socklen_t_define.patch.svn-base b/feeds/packages/utils/lmbench/patches/.svn/text-base/001-fix_socklen_t_define.patch.svn-base +new file mode 100644 +index 0000000..967e207 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/.svn/text-base/001-fix_socklen_t_define.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/src/bench.h +++++ b/src/bench.h ++@@ -77,7 +77,7 @@ typedef long long int64; ++ #endif /* HAVE_int64_t */ ++ #endif /* HAVE_int64 */ ++ ++-#ifndef HAVE_socklen_t +++#if (!defined(HAVE_socklen_t) && !defined(__socklen_t_defined)) ++ typedef int socklen_t; ++ #endif ++ +diff --git a/feeds/packages/utils/lmbench/patches/.svn/text-base/002-install-cache.patch.svn-base b/feeds/packages/utils/lmbench/patches/.svn/text-base/002-install-cache.patch.svn-base +new file mode 100644 +index 0000000..89543b8 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/.svn/text-base/002-install-cache.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/src/Makefile +++++ b/src/Makefile ++@@ -144,6 +144,7 @@ install-target: ++ if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi ++ if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi ++ cp $(EXES) $(BASE)/bin +++ cp $(OPT_EXES) $(BASE)/bin ++ cp $(INCS) $(BASE)/include ++ cp $O/lmbench.a $(BASE)/lib/libmbench.a ++ cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install +diff --git a/feeds/packages/utils/lmbench/patches/.svn/text-base/003-add-LDLIBS.patch.svn-base b/feeds/packages/utils/lmbench/patches/.svn/text-base/003-add-LDLIBS.patch.svn-base +new file mode 100644 +index 0000000..66a7243 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/.svn/text-base/003-add-LDLIBS.patch.svn-base +@@ -0,0 +1,30 @@ ++--- a/scripts/build +++++ b/scripts/build ++@@ -18,7 +18,7 @@ done ++ ++ trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 ++ ++-LDLIBS=-lm +++LDLIBS=${LDLIBS-"-lm -lrpc"} ++ ++ # check for HP-UX's ANSI compiler ++ echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c ++--- a/src/Makefile +++++ b/src/Makefile ++@@ -38,6 +38,7 @@ CC=`../scripts/compiler` ++ MAKE=`../scripts/make` ++ AR=ar ++ ARCREATE=cr +++LDLIBS= ++ ++ # base of installation location ++ BASE=/usr/local ++@@ -111,7 +112,7 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/li ++ $O/lib_sched.o ++ ++ lmbench: $(UTILS) ++- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all +++ @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" LDLIBS="$(LDLIBS)" ../scripts/build all ++ -@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt ++ ++ results: lmbench +diff --git a/feeds/packages/utils/lmbench/patches/.svn/text-base/100-bw_mem-add-newline-after-usage.patch.svn-base b/feeds/packages/utils/lmbench/patches/.svn/text-base/100-bw_mem-add-newline-after-usage.patch.svn-base +new file mode 100644 +index 0000000..d03ad4a +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/.svn/text-base/100-bw_mem-add-newline-after-usage.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/src/bw_mem.c +++++ b/src/bw_mem.c ++@@ -65,7 +65,7 @@ main(int ac, char **av) ++ size_t nbytes; ++ state_t state; ++ int c; ++- char *usage = "[-P ] [-W ] [-N ] what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n must be larger than 512"; +++ char *usage = "[-P ] [-W ] [-N ] what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n must be larger than 512\n"; ++ ++ state.overhead = 0; ++ +diff --git a/feeds/packages/utils/lmbench/patches/001-fix_socklen_t_define.patch b/feeds/packages/utils/lmbench/patches/001-fix_socklen_t_define.patch +new file mode 100644 +index 0000000..967e207 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/001-fix_socklen_t_define.patch +@@ -0,0 +1,11 @@ ++--- a/src/bench.h +++++ b/src/bench.h ++@@ -77,7 +77,7 @@ typedef long long int64; ++ #endif /* HAVE_int64_t */ ++ #endif /* HAVE_int64 */ ++ ++-#ifndef HAVE_socklen_t +++#if (!defined(HAVE_socklen_t) && !defined(__socklen_t_defined)) ++ typedef int socklen_t; ++ #endif ++ +diff --git a/feeds/packages/utils/lmbench/patches/002-install-cache.patch b/feeds/packages/utils/lmbench/patches/002-install-cache.patch +new file mode 100644 +index 0000000..89543b8 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/002-install-cache.patch +@@ -0,0 +1,10 @@ ++--- a/src/Makefile +++++ b/src/Makefile ++@@ -144,6 +144,7 @@ install-target: ++ if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi ++ if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi ++ cp $(EXES) $(BASE)/bin +++ cp $(OPT_EXES) $(BASE)/bin ++ cp $(INCS) $(BASE)/include ++ cp $O/lmbench.a $(BASE)/lib/libmbench.a ++ cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install +diff --git a/feeds/packages/utils/lmbench/patches/003-add-LDLIBS.patch b/feeds/packages/utils/lmbench/patches/003-add-LDLIBS.patch +new file mode 100644 +index 0000000..66a7243 +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/003-add-LDLIBS.patch +@@ -0,0 +1,30 @@ ++--- a/scripts/build +++++ b/scripts/build ++@@ -18,7 +18,7 @@ done ++ ++ trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 ++ ++-LDLIBS=-lm +++LDLIBS=${LDLIBS-"-lm -lrpc"} ++ ++ # check for HP-UX's ANSI compiler ++ echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c ++--- a/src/Makefile +++++ b/src/Makefile ++@@ -38,6 +38,7 @@ CC=`../scripts/compiler` ++ MAKE=`../scripts/make` ++ AR=ar ++ ARCREATE=cr +++LDLIBS= ++ ++ # base of installation location ++ BASE=/usr/local ++@@ -111,7 +112,7 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/li ++ $O/lib_sched.o ++ ++ lmbench: $(UTILS) ++- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all +++ @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" LDLIBS="$(LDLIBS)" ../scripts/build all ++ -@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt ++ ++ results: lmbench +diff --git a/feeds/packages/utils/lmbench/patches/100-bw_mem-add-newline-after-usage.patch b/feeds/packages/utils/lmbench/patches/100-bw_mem-add-newline-after-usage.patch +new file mode 100644 +index 0000000..d03ad4a +--- /dev/null ++++ b/feeds/packages/utils/lmbench/patches/100-bw_mem-add-newline-after-usage.patch +@@ -0,0 +1,11 @@ ++--- a/src/bw_mem.c +++++ b/src/bw_mem.c ++@@ -65,7 +65,7 @@ main(int ac, char **av) ++ size_t nbytes; ++ state_t state; ++ int c; ++- char *usage = "[-P ] [-W ] [-N ] what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n must be larger than 512"; +++ char *usage = "[-P ] [-W ] [-N ] what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n must be larger than 512\n"; ++ ++ state.overhead = 0; ++ +diff --git a/feeds/packages/utils/logrotate/.svn/entries b/feeds/packages/utils/logrotate/.svn/entries +new file mode 100644 +index 0000000..f155221 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/logrotate ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T21:52:03.590120Z ++32752 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++c6cbf4192995e073fd0f1f66f7bd3203 ++2012-07-16T21:52:03.590120Z ++32752 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1696 ++ +diff --git a/feeds/packages/utils/logrotate/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/logrotate/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/logrotate/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/logrotate/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9e62f56 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,62 @@ ++# ++# 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:=logrotate ++PKG_VERSION:=3.8.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:= \ ++ http://ftp.debian.org/debian/pool/main/l/logrotate \ ++ http://ftp.de.debian.org/debian/pool/main/l/logrotate \ ++ http://ftp.fr.debian.org/debian/pool/main/l/logrotate \ ++ http://ftp.us.debian.org/debian/pool/main/l/logrotate ++PKG_MD5SUM:=bd2e20d8dc644291b08f9215397d28a5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/logrotate ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libpopt ++ TITLE:=rotates, compresses, and mails system logs ++ URL:=http://packages.debian.org/unstable/admin/logrotate ++endef ++ ++define Package/logrotate/description ++ logrotate is designed to ease administration of systems that generate large ++ numbers of log files. It allows auto-matic rotation, compression, removal and ++ mailing of log files. Each log file may be handled daily, weekly, monthly or ++ when it grows too large. ++endef ++ ++define Package/logrotate/conffiles ++/etc/logrotate.conf ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS += $(TARGET_LDFLAGS) ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ RPM_OPT_FLAGS:="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ ++ LDFLAGS="$(EXTRA_LDFLAGS)" \ ++ logrotate \ ++ ) ++endef ++ ++define Package/logrotate/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/logrotate.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/logrotate.d ++endef ++ ++$(eval $(call BuildPackage,logrotate)) +diff --git a/feeds/packages/utils/logrotate/Makefile b/feeds/packages/utils/logrotate/Makefile +new file mode 100644 +index 0000000..9e62f56 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/Makefile +@@ -0,0 +1,62 @@ ++# ++# 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:=logrotate ++PKG_VERSION:=3.8.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:= \ ++ http://ftp.debian.org/debian/pool/main/l/logrotate \ ++ http://ftp.de.debian.org/debian/pool/main/l/logrotate \ ++ http://ftp.fr.debian.org/debian/pool/main/l/logrotate \ ++ http://ftp.us.debian.org/debian/pool/main/l/logrotate ++PKG_MD5SUM:=bd2e20d8dc644291b08f9215397d28a5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/logrotate ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libpopt ++ TITLE:=rotates, compresses, and mails system logs ++ URL:=http://packages.debian.org/unstable/admin/logrotate ++endef ++ ++define Package/logrotate/description ++ logrotate is designed to ease administration of systems that generate large ++ numbers of log files. It allows auto-matic rotation, compression, removal and ++ mailing of log files. Each log file may be handled daily, weekly, monthly or ++ when it grows too large. ++endef ++ ++define Package/logrotate/conffiles ++/etc/logrotate.conf ++endef ++ ++EXTRA_CFLAGS += $(TARGET_CPPFLAGS) ++EXTRA_LDFLAGS += $(TARGET_LDFLAGS) ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ RPM_OPT_FLAGS:="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ ++ LDFLAGS="$(EXTRA_LDFLAGS)" \ ++ logrotate \ ++ ) ++endef ++ ++define Package/logrotate/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/logrotate.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/logrotate.d ++endef ++ ++$(eval $(call BuildPackage,logrotate)) +diff --git a/feeds/packages/utils/logrotate/files/.svn/entries b/feeds/packages/utils/logrotate/files/.svn/entries +new file mode 100644 +index 0000000..1504b47 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/logrotate/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++logrotate.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++96693c1724c8dd1284910d8d9d1a8851 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++557 ++ +diff --git a/feeds/packages/utils/logrotate/files/.svn/prop-base/logrotate.conf.svn-base b/feeds/packages/utils/logrotate/files/.svn/prop-base/logrotate.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/files/.svn/prop-base/logrotate.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/logrotate/files/.svn/text-base/logrotate.conf.svn-base b/feeds/packages/utils/logrotate/files/.svn/text-base/logrotate.conf.svn-base +new file mode 100644 +index 0000000..9a91db9 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/files/.svn/text-base/logrotate.conf.svn-base +@@ -0,0 +1,30 @@ ++# rotate log files weekly ++weekly ++#daily ++ ++# keep 4 weeks worth of backlogs ++rotate 4 ++ ++# create new (empty) log files after rotating old ones ++create ++ ++notifempty ++nomail ++#olddir /var/log/backup/ ++missingok ++#dateext ++ ++# uncomment this if you want your log files compressed ++#compress ++ ++# packages can drop log rotation information into this directory ++include /etc/logrotate.d ++ ++# no packages own lastlog or wtmp -- we'll rotate them here ++#/var/log/wtmp { ++# monthly ++# create 0664 root utmp ++# rotate 1 ++#} ++ ++# system-specific logs may be also be configured here. +diff --git a/feeds/packages/utils/logrotate/files/logrotate.conf b/feeds/packages/utils/logrotate/files/logrotate.conf +new file mode 100644 +index 0000000..9a91db9 +--- /dev/null ++++ b/feeds/packages/utils/logrotate/files/logrotate.conf +@@ -0,0 +1,30 @@ ++# rotate log files weekly ++weekly ++#daily ++ ++# keep 4 weeks worth of backlogs ++rotate 4 ++ ++# create new (empty) log files after rotating old ones ++create ++ ++notifempty ++nomail ++#olddir /var/log/backup/ ++missingok ++#dateext ++ ++# uncomment this if you want your log files compressed ++#compress ++ ++# packages can drop log rotation information into this directory ++include /etc/logrotate.d ++ ++# no packages own lastlog or wtmp -- we'll rotate them here ++#/var/log/wtmp { ++# monthly ++# create 0664 root utmp ++# rotate 1 ++#} ++ ++# system-specific logs may be also be configured here. +diff --git a/feeds/packages/utils/logrotate/patches/.svn/entries b/feeds/packages/utils/logrotate/patches/.svn/entries +new file mode 100644 +index 0000000..cf9c76c +--- /dev/null ++++ b/feeds/packages/utils/logrotate/patches/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/logrotate/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T21:52:03.590120Z ++32752 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ +diff --git a/feeds/packages/utils/loop-aes/.svn/entries b/feeds/packages/utils/loop-aes/.svn/entries +new file mode 100644 +index 0000000..66cbe5d +--- /dev/null ++++ b/feeds/packages/utils/loop-aes/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/loop-aes ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++943ba12a69831e601689aa803c82f5f4 ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1351 ++ +diff --git a/feeds/packages/utils/loop-aes/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/loop-aes/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5e23601 +--- /dev/null ++++ b/feeds/packages/utils/loop-aes/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=loop-aes ++PKG_VERSION:=3.6e ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=loop-AES-v$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=b8bf83f3d21a6ad1ea49ac30f9ec130d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/loop-AES-v$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define KernelPackage/loop-aes ++ SUBMENU:=Cryptographic API modules ++ DEPENDS:=@!PACKAGE_kmod-loop ++ TITLE:=loopback module with built-in AES ++ FILES:=$(PKG_BUILD_DIR)/loop.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,30,loop) ++ URL:=http://loop-aes.sourceforge.net ++endef ++ ++define KernelPackage/loop-aes/description ++ This package provides loadable Linux kernel module (loop.o or loop.ko on 2.6 ++ kernels) that has AES cipher built-in. The AES cipher can be used to encrypt ++ local file systems and disk partitions. ++endef ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ ++ ARCH="$(LINUX_KARCH)" \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ CC="$(TARGET_CC)" \ ++ CPP="$(TARGET_CC)" \ ++ LD="$(TARGET_CROSS)ld" \ ++ LINUX_SOURCE="$(LINUX_DIR)" \ ++ KR="$(LINUX_DIR)" \ ++ MODINST="n" \ ++ all ++endef ++ ++$(eval $(call KernelPackage,loop-aes)) +diff --git a/feeds/packages/utils/loop-aes/Makefile b/feeds/packages/utils/loop-aes/Makefile +new file mode 100644 +index 0000000..5e23601 +--- /dev/null ++++ b/feeds/packages/utils/loop-aes/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=loop-aes ++PKG_VERSION:=3.6e ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=loop-AES-v$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=b8bf83f3d21a6ad1ea49ac30f9ec130d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/loop-AES-v$(PKG_VERSION) ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define KernelPackage/loop-aes ++ SUBMENU:=Cryptographic API modules ++ DEPENDS:=@!PACKAGE_kmod-loop ++ TITLE:=loopback module with built-in AES ++ FILES:=$(PKG_BUILD_DIR)/loop.$(LINUX_KMOD_SUFFIX) ++ AUTOLOAD:=$(call AutoLoad,30,loop) ++ URL:=http://loop-aes.sourceforge.net ++endef ++ ++define KernelPackage/loop-aes/description ++ This package provides loadable Linux kernel module (loop.o or loop.ko on 2.6 ++ kernels) that has AES cipher built-in. The AES cipher can be used to encrypt ++ local file systems and disk partitions. ++endef ++ ++define Build/Compile ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ ++ ARCH="$(LINUX_KARCH)" \ ++ CROSS_COMPILE="$(TARGET_CROSS)" \ ++ CC="$(TARGET_CC)" \ ++ CPP="$(TARGET_CC)" \ ++ LD="$(TARGET_CROSS)ld" \ ++ LINUX_SOURCE="$(LINUX_DIR)" \ ++ KR="$(LINUX_DIR)" \ ++ MODINST="n" \ ++ all ++endef ++ ++$(eval $(call KernelPackage,loop-aes)) +diff --git a/feeds/packages/utils/loop-aes/patches/.svn/entries b/feeds/packages/utils/loop-aes/patches/.svn/entries +new file mode 100644 +index 0000000..027b79e +--- /dev/null ++++ b/feeds/packages/utils/loop-aes/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/loop-aes/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-26T11:11:37.306701Z ++17004 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-no_sync.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++c46e46b955b0bc03ef0b77af50a761a7 ++2009-07-26T11:11:37.306701Z ++17004 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++338 ++ +diff --git a/feeds/packages/utils/loop-aes/patches/.svn/text-base/001-no_sync.patch.svn-base b/feeds/packages/utils/loop-aes/patches/.svn/text-base/001-no_sync.patch.svn-base +new file mode 100644 +index 0000000..e01b9b2 +--- /dev/null ++++ b/feeds/packages/utils/loop-aes/patches/.svn/text-base/001-no_sync.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -208,10 +208,8 @@ endif ++ ifeq ($(EXTRA_CIPHERS),y) ++ ln -s tmp-d-kbuild/loop_twofish.ko tmp-d-kbuild/loop_serpent.ko tmp-d-kbuild/loop_blowfish.ko . ++ endif ++- sync ++ else ++ cd $(LS) && make SUBDIRS=$(TD) modules ++- sync ++ endif ++ ++ # 2.6 kernels older than 2.6.17 do not run depmod in "modules_install" stage, +diff --git a/feeds/packages/utils/loop-aes/patches/001-no_sync.patch b/feeds/packages/utils/loop-aes/patches/001-no_sync.patch +new file mode 100644 +index 0000000..e01b9b2 +--- /dev/null ++++ b/feeds/packages/utils/loop-aes/patches/001-no_sync.patch +@@ -0,0 +1,13 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -208,10 +208,8 @@ endif ++ ifeq ($(EXTRA_CIPHERS),y) ++ ln -s tmp-d-kbuild/loop_twofish.ko tmp-d-kbuild/loop_serpent.ko tmp-d-kbuild/loop_blowfish.ko . ++ endif ++- sync ++ else ++ cd $(LS) && make SUBDIRS=$(TD) modules ++- sync ++ endif ++ ++ # 2.6 kernels older than 2.6.17 do not run depmod in "modules_install" stage, +diff --git a/feeds/packages/utils/lrzsz/.svn/entries b/feeds/packages/utils/lrzsz/.svn/entries +new file mode 100644 +index 0000000..f8d3386 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lrzsz ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-13T22:56:28.852369Z ++28236 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ad1c27180f6da3cf2bfe92fd75857974 ++2011-09-13T22:56:28.852369Z ++28236 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1251 ++ +diff --git a/feeds/packages/utils/lrzsz/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/lrzsz/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lrzsz/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lrzsz/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6ca2083 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=lrzsz ++PKG_VERSION:=0.12.20 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/ ++PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lrzsz ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=X,Y and Z-modem protocols ++ URL:=http://www.ohse.de/uwe/software/lrzsz.html ++endef ++ ++define Package/lrzsz/description ++ Transfer files in your login sessions. ++ Very leightweight and straight forward. ++ You just need a terminal client that can do ++ either X, Y or Z-modem file transfers. ++endef ++ ++# uses GNU configure ++ ++define Package/lrzsz/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/ ++ (cd $(1)/usr/bin; \ ++ ln -fs lrz lrx; \ ++ ln -fs lrz lrb; \ ++ ln -fs lrz rz; \ ++ ln -fs lrz rx; \ ++ ln -fs lrz rb; \ ++ ln -fs lsz lsx; \ ++ ln -fs lsz lsb; \ ++ ln -fs lsz sz; \ ++ ln -fs lsz sx; \ ++ ln -fs lsz sb; \ ++ ); ++endef ++ ++$(eval $(call BuildPackage,lrzsz)) +diff --git a/feeds/packages/utils/lrzsz/Makefile b/feeds/packages/utils/lrzsz/Makefile +new file mode 100644 +index 0000000..6ca2083 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=lrzsz ++PKG_VERSION:=0.12.20 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/ ++PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/lrzsz ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=X,Y and Z-modem protocols ++ URL:=http://www.ohse.de/uwe/software/lrzsz.html ++endef ++ ++define Package/lrzsz/description ++ Transfer files in your login sessions. ++ Very leightweight and straight forward. ++ You just need a terminal client that can do ++ either X, Y or Z-modem file transfers. ++endef ++ ++# uses GNU configure ++ ++define Package/lrzsz/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsz $(1)/usr/bin/ ++ (cd $(1)/usr/bin; \ ++ ln -fs lrz lrx; \ ++ ln -fs lrz lrb; \ ++ ln -fs lrz rz; \ ++ ln -fs lrz rx; \ ++ ln -fs lrz rb; \ ++ ln -fs lsz lsx; \ ++ ln -fs lsz lsb; \ ++ ln -fs lsz sz; \ ++ ln -fs lsz sx; \ ++ ln -fs lsz sb; \ ++ ); ++endef ++ ++$(eval $(call BuildPackage,lrzsz)) +diff --git a/feeds/packages/utils/lrzsz/patches/.svn/entries b/feeds/packages/utils/lrzsz/patches/.svn/entries +new file mode 100644 +index 0000000..e63580e +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lrzsz/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-install_delete_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++adef61e53f35ca493d2ad6a8e165d1e4 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1173 ++ +diff --git a/feeds/packages/utils/lrzsz/patches/.svn/prop-base/100-install_delete_fix.patch.svn-base b/feeds/packages/utils/lrzsz/patches/.svn/prop-base/100-install_delete_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/patches/.svn/prop-base/100-install_delete_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/lrzsz/patches/.svn/text-base/100-install_delete_fix.patch.svn-base b/feeds/packages/utils/lrzsz/patches/.svn/text-base/100-install_delete_fix.patch.svn-base +new file mode 100644 +index 0000000..edd0e89 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/patches/.svn/text-base/100-install_delete_fix.patch.svn-base +@@ -0,0 +1,20 @@ ++diff -ur lrzsz.old/src/Makefile.in lrzsz.dev/src/Makefile.in ++--- lrzsz.old/src/Makefile.in 1998-12-30 17:31:46.000000000 +0100 +++++ lrzsz.dev/src/Makefile.in 2006-08-20 19:10:09.000000000 +0200 ++@@ -372,13 +372,13 @@ ++ rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` ++- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'` +++ rm -f $(DESTDIR)/$(bindir)/`echo lsx | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` ++- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'` +++ rm -f $(DESTDIR)/$(bindir)/`echo lrb | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` ++- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'` +++ rm -f $(DESTDIR)/$(bindir)/`echo lrx | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` ++ # rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'` +diff --git a/feeds/packages/utils/lrzsz/patches/100-install_delete_fix.patch b/feeds/packages/utils/lrzsz/patches/100-install_delete_fix.patch +new file mode 100644 +index 0000000..edd0e89 +--- /dev/null ++++ b/feeds/packages/utils/lrzsz/patches/100-install_delete_fix.patch +@@ -0,0 +1,20 @@ ++diff -ur lrzsz.old/src/Makefile.in lrzsz.dev/src/Makefile.in ++--- lrzsz.old/src/Makefile.in 1998-12-30 17:31:46.000000000 +0100 +++++ lrzsz.dev/src/Makefile.in 2006-08-20 19:10:09.000000000 +0200 ++@@ -372,13 +372,13 @@ ++ rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` ++- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'` +++ rm -f $(DESTDIR)/$(bindir)/`echo lsx | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` ++- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'` +++ rm -f $(DESTDIR)/$(bindir)/`echo lrb | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` ++- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'` +++ rm -f $(DESTDIR)/$(bindir)/`echo lrx | sed -e '$(transform)'` ++ ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ ++ $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` ++ # rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'` +diff --git a/feeds/packages/utils/lsof/.svn/entries b/feeds/packages/utils/lsof/.svn/entries +new file mode 100644 +index 0000000..df36648 +--- /dev/null ++++ b/feeds/packages/utils/lsof/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lsof ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T22:03:26.206515Z ++32549 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8e6c0a180fd062cdc7a51591997b89dc ++2012-06-29T18:30:10.986394Z ++32529 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1307 ++ +diff --git a/feeds/packages/utils/lsof/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lsof/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bcf6b80 +--- /dev/null ++++ b/feeds/packages/utils/lsof/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2007-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)/kernel.mk ++ ++PKG_NAME:=lsof ++PKG_VERSION:=4.86 ++PKG_RELEASE:=1 ++ ++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 ++ ++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_CFGC="$(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/feeds/packages/utils/lsof/Makefile b/feeds/packages/utils/lsof/Makefile +new file mode 100644 +index 0000000..bcf6b80 +--- /dev/null ++++ b/feeds/packages/utils/lsof/Makefile +@@ -0,0 +1,55 @@ ++# ++# Copyright (C) 2007-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)/kernel.mk ++ ++PKG_NAME:=lsof ++PKG_VERSION:=4.86 ++PKG_RELEASE:=1 ++ ++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 ++ ++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_CFGC="$(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/feeds/packages/utils/lsof/patches/.svn/entries b/feeds/packages/utils/lsof/patches/.svn/entries +new file mode 100644 +index 0000000..9f17dcd +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lsof/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T22:03:26.206515Z ++32549 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-lsof_noportmap.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++dd2b248ad3cda9a5a5e9df45f5a8e83a ++2012-06-10T00:07:55.069544Z ++32153 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++357 ++ ++003-lsof_selinux.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++cfe9f66a1ce76addb215448dc5954f4c ++2012-06-29T22:03:26.206515Z ++32549 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++259 ++ ++001-lsof_makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++cc9f315cdd50b42ecc2bbe5c3fc99d45 ++2012-06-10T00:07:55.069544Z ++32153 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++263 ++ ++004-lsof_ccv.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++a03a8c96f1315515fa3f7d6fb75db202 ++2012-06-10T00:07:55.069544Z ++32153 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++311 ++ +diff --git a/feeds/packages/utils/lsof/patches/.svn/text-base/001-lsof_makefile.patch.svn-base b/feeds/packages/utils/lsof/patches/.svn/text-base/001-lsof_makefile.patch.svn-base +new file mode 100644 +index 0000000..eb2b735 +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/.svn/text-base/001-lsof_makefile.patch.svn-base +@@ -0,0 +1,13 @@ ++--- 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/feeds/packages/utils/lsof/patches/.svn/text-base/002-lsof_noportmap.patch.svn-base b/feeds/packages/utils/lsof/patches/.svn/text-base/002-lsof_noportmap.patch.svn-base +new file mode 100644 +index 0000000..d0e8889 +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/.svn/text-base/002-lsof_noportmap.patch.svn-base +@@ -0,0 +1,18 @@ ++--- 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/feeds/packages/utils/lsof/patches/.svn/text-base/003-lsof_selinux.patch.svn-base b/feeds/packages/utils/lsof/patches/.svn/text-base/003-lsof_selinux.patch.svn-base +new file mode 100644 +index 0000000..c74c1e3 +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/.svn/text-base/003-lsof_selinux.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/lsof/patches/.svn/text-base/004-lsof_ccv.patch.svn-base b/feeds/packages/utils/lsof/patches/.svn/text-base/004-lsof_ccv.patch.svn-base +new file mode 100644 +index 0000000..8f1867d +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/.svn/text-base/004-lsof_ccv.patch.svn-base +@@ -0,0 +1,12 @@ ++--- 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/feeds/packages/utils/lsof/patches/001-lsof_makefile.patch b/feeds/packages/utils/lsof/patches/001-lsof_makefile.patch +new file mode 100644 +index 0000000..eb2b735 +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/001-lsof_makefile.patch +@@ -0,0 +1,13 @@ ++--- 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/feeds/packages/utils/lsof/patches/002-lsof_noportmap.patch b/feeds/packages/utils/lsof/patches/002-lsof_noportmap.patch +new file mode 100644 +index 0000000..d0e8889 +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/002-lsof_noportmap.patch +@@ -0,0 +1,18 @@ ++--- 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/feeds/packages/utils/lsof/patches/003-lsof_selinux.patch b/feeds/packages/utils/lsof/patches/003-lsof_selinux.patch +new file mode 100644 +index 0000000..c74c1e3 +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/003-lsof_selinux.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/lsof/patches/004-lsof_ccv.patch b/feeds/packages/utils/lsof/patches/004-lsof_ccv.patch +new file mode 100644 +index 0000000..8f1867d +--- /dev/null ++++ b/feeds/packages/utils/lsof/patches/004-lsof_ccv.patch +@@ -0,0 +1,12 @@ ++--- 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/feeds/packages/utils/lvm2/.svn/entries b/feeds/packages/utils/lvm2/.svn/entries +new file mode 100644 +index 0000000..829e66f +--- /dev/null ++++ b/feeds/packages/utils/lvm2/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lvm2 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T21:52:07.849097Z ++32754 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++0f5f8c2d1313b5a5535236781e851078 ++2012-07-16T21:52:07.849097Z ++32754 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2414 ++ +diff --git a/feeds/packages/utils/lvm2/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/lvm2/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ba93e89 +--- /dev/null ++++ b/feeds/packages/utils/lvm2/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,87 @@ ++# ++# Copyright (C) 2009-2010 Stefan Monnier ++# Copyright (C) 2011-2012 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.96 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2 ++PKG_MD5SUM:=4637503d792e9ee35a9b71387bcd8a93 ++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 ++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 +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 ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/example.conf $(1)/etc/lvm/lvm.conf ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2 ++endef ++ ++define Package/lvm2/conffiles ++/etc/lvm/lvm.conf ++endef ++ ++$(eval $(call BuildPackage,libdevmapper)) ++$(eval $(call BuildPackage,lvm2)) +diff --git a/feeds/packages/utils/lvm2/Makefile b/feeds/packages/utils/lvm2/Makefile +new file mode 100644 +index 0000000..ba93e89 +--- /dev/null ++++ b/feeds/packages/utils/lvm2/Makefile +@@ -0,0 +1,87 @@ ++# ++# Copyright (C) 2009-2010 Stefan Monnier ++# Copyright (C) 2011-2012 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.96 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2 ++PKG_MD5SUM:=4637503d792e9ee35a9b71387bcd8a93 ++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 ++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 +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 ++ $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/example.conf $(1)/etc/lvm/lvm.conf ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2 ++endef ++ ++define Package/lvm2/conffiles ++/etc/lvm/lvm.conf ++endef ++ ++$(eval $(call BuildPackage,libdevmapper)) ++$(eval $(call BuildPackage,lvm2)) +diff --git a/feeds/packages/utils/lvm2/files/.svn/entries b/feeds/packages/utils/lvm2/files/.svn/entries +new file mode 100644 +index 0000000..c0d7e4a +--- /dev/null ++++ b/feeds/packages/utils/lvm2/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lvm2/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-12T01:37:02.126326Z ++19595 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++lvm2.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++3cffde0918357f8b8dc2eae959544c7b ++2010-02-12T01:37:02.126326Z ++19595 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++280 ++ +diff --git a/feeds/packages/utils/lvm2/files/.svn/text-base/lvm2.init.svn-base b/feeds/packages/utils/lvm2/files/.svn/text-base/lvm2.init.svn-base +new file mode 100644 +index 0000000..3b542d0 +--- /dev/null ++++ b/feeds/packages/utils/lvm2/files/.svn/text-base/lvm2.init.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009 Stefan Monnier ++START=15 ++ ++start () { ++ /sbin/lvm vgscan --ignorelockingfailure --mknodes || : ++ /sbin/lvm vgchange -aly --ignorelockingfailure || return 2 ++} ++ ++stop () { ++ /sbin/lvm vgchange -aln --ignorelockingfailure || return 2 ++} +diff --git a/feeds/packages/utils/lvm2/files/lvm2.init b/feeds/packages/utils/lvm2/files/lvm2.init +new file mode 100644 +index 0000000..3b542d0 +--- /dev/null ++++ b/feeds/packages/utils/lvm2/files/lvm2.init +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2009 Stefan Monnier ++START=15 ++ ++start () { ++ /sbin/lvm vgscan --ignorelockingfailure --mknodes || : ++ /sbin/lvm vgchange -aly --ignorelockingfailure || return 2 ++} ++ ++stop () { ++ /sbin/lvm vgchange -aln --ignorelockingfailure || return 2 ++} +diff --git a/feeds/packages/utils/lvm2/patches/.svn/entries b/feeds/packages/utils/lvm2/patches/.svn/entries +new file mode 100644 +index 0000000..0d92dfb +--- /dev/null ++++ b/feeds/packages/utils/lvm2/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/lvm2/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-10T01:32:21.728787Z ++32155 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++75fde7a31f2e3e3d3a6f67522f51f9e7 ++2012-06-10T01:32:21.728787Z ++32155 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++172 ++ +diff --git a/feeds/packages/utils/lvm2/patches/.svn/text-base/000-compile.patch.svn-base b/feeds/packages/utils/lvm2/patches/.svn/text-base/000-compile.patch.svn-base +new file mode 100644 +index 0000000..ec22983 +--- /dev/null ++++ b/feeds/packages/utils/lvm2/patches/.svn/text-base/000-compile.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/make.tmpl.in +++++ b/make.tmpl.in ++@@ -17,7 +17,7 @@ SHELL = /bin/sh ++ ++ @SET_MAKE@ ++ ++-CC ?= @CC@ +++CC = @CC@ ++ RANLIB = @RANLIB@ ++ INSTALL = @INSTALL@ ++ MKDIR_P = @MKDIR_P@ +diff --git a/feeds/packages/utils/lvm2/patches/000-compile.patch b/feeds/packages/utils/lvm2/patches/000-compile.patch +new file mode 100644 +index 0000000..ec22983 +--- /dev/null ++++ b/feeds/packages/utils/lvm2/patches/000-compile.patch +@@ -0,0 +1,11 @@ ++--- a/make.tmpl.in +++++ b/make.tmpl.in ++@@ -17,7 +17,7 @@ SHELL = /bin/sh ++ ++ @SET_MAKE@ ++ ++-CC ?= @CC@ +++CC = @CC@ ++ RANLIB = @RANLIB@ ++ INSTALL = @INSTALL@ ++ MKDIR_P = @MKDIR_P@ +diff --git a/feeds/packages/utils/macchanger/.svn/entries b/feeds/packages/utils/macchanger/.svn/entries +new file mode 100644 +index 0000000..626aa3e +--- /dev/null ++++ b/feeds/packages/utils/macchanger/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/macchanger ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d7261339625a18e24548dd81d0fd459a ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++993 ++ +diff --git a/feeds/packages/utils/macchanger/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/macchanger/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/macchanger/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/macchanger/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/macchanger/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..acd3bc9 +--- /dev/null ++++ b/feeds/packages/utils/macchanger/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=macchanger ++PKG_VERSION:=1.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/macchanger ++PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/macchanger ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=utility for viewing/manipulating the MAC address ++ URL:=http://www.alobbs.com/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 ++ $(INSTALL_BIN) $(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/feeds/packages/utils/macchanger/Makefile b/feeds/packages/utils/macchanger/Makefile +new file mode 100644 +index 0000000..acd3bc9 +--- /dev/null ++++ b/feeds/packages/utils/macchanger/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=macchanger ++PKG_VERSION:=1.5.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/macchanger ++PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/macchanger ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=utility for viewing/manipulating the MAC address ++ URL:=http://www.alobbs.com/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 ++ $(INSTALL_BIN) $(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/feeds/packages/utils/maemo-kexec/.svn/entries b/feeds/packages/utils/maemo-kexec/.svn/entries +new file mode 100644 +index 0000000..08279ed +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/.svn/entries +@@ -0,0 +1,99 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/maemo-kexec ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-07T00:39:09.305086Z ++25918 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++9882ca4d9560a59473099050b9d5b42e ++2010-09-11T18:43:14.103505Z ++23021 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++748 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++0dd552e0a55ef66c4f93f38c2cefcde7 ++2010-10-16T21:12:26.316617Z ++23486 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1324 ++ +diff --git a/feeds/packages/utils/maemo-kexec/.svn/text-base/Config.in.svn-base b/feeds/packages/utils/maemo-kexec/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..74c8c86 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,20 @@ ++config MAEMO_KEXEC_DOWNLOAD_KERNEL ++ bool "Download latest Maemo kernel" ++ default y ++ depends on PACKAGE_maemo-kexec ++ ++config MAEMO_KEXEC_KERNEL_PATH ++ string ++ prompt "Path to the Maemo kernel image" ++ default "PLEASE_CONFIGURE_MAEMO_ZIMAGE" ++ depends on PACKAGE_maemo-kexec && !MAEMO_KEXEC_DOWNLOAD_KERNEL ++ help ++ Defines the path to the Maemo kernel zImage. ++ ++ The image can be extracted from the Fiasco firmware image. ++ Use the proprietary flasher to extract the image. The ++ opensource tool "0xFFFF" is not able to extract the zImage correctly. ++ ++ The zImage defined here will be included in the OpenWrt rootfs ++ for kexec-ing of the Maemo operating system. The Maemo rootfs ++ has to be installed on the n810's "rootfs" MTD partition (MTD4). +diff --git a/feeds/packages/utils/maemo-kexec/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/maemo-kexec/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3f31c97 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=maemo-kexec ++PKG_VERSION:=1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=maemo-rx44-2008.43-7.kernel ++PKG_SOURCE_URL:=http://bu3sch.de/misc/ ++PKG_MD5SUM:=3cbf571c0618bfe20a69babab6b33bea ++UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/ ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_MAEMO_KEXEC_DOWNLOAD_KERNEL \ ++ CONFIG_MAEMO_KEXEC_KERNEL_PATH ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/maemo-kexec ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@TARGET_omap24xx +kexec-tools ++ TITLE:=Kexec Maemo from OpenWRT ++endef ++ ++define Package/maemo-kexec/description ++ Kexec Maemo from OpenWRT. ++ The Maemo rootfs must be in the rootfs MTD partition. ++endef ++ ++define Package/maemo-kexec/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++MAEMO_KRNL_SRC:=$(if $(CONFIG_MAEMO_KEXEC_DOWNLOAD_KERNEL),\ ++ $(PKG_BUILD_DIR)/$(PKG_SOURCE),\ ++ $(CONFIG_MAEMO_KEXEC_KERNEL_PATH)) ++ ++define Package/maemo-kexec/install ++ $(INSTALL_DIR) $(1)/boot $(1)/sbin ++ $(INSTALL_BIN) ./files/sbin/bootmaemo $(1)/sbin/ ++ $(INSTALL_DATA) $(MAEMO_KRNL_SRC) $(1)/boot/maemo.zImage ++endef ++ ++$(eval $(call BuildPackage,maemo-kexec)) +diff --git a/feeds/packages/utils/maemo-kexec/Config.in b/feeds/packages/utils/maemo-kexec/Config.in +new file mode 100644 +index 0000000..74c8c86 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/Config.in +@@ -0,0 +1,20 @@ ++config MAEMO_KEXEC_DOWNLOAD_KERNEL ++ bool "Download latest Maemo kernel" ++ default y ++ depends on PACKAGE_maemo-kexec ++ ++config MAEMO_KEXEC_KERNEL_PATH ++ string ++ prompt "Path to the Maemo kernel image" ++ default "PLEASE_CONFIGURE_MAEMO_ZIMAGE" ++ depends on PACKAGE_maemo-kexec && !MAEMO_KEXEC_DOWNLOAD_KERNEL ++ help ++ Defines the path to the Maemo kernel zImage. ++ ++ The image can be extracted from the Fiasco firmware image. ++ Use the proprietary flasher to extract the image. The ++ opensource tool "0xFFFF" is not able to extract the zImage correctly. ++ ++ The zImage defined here will be included in the OpenWrt rootfs ++ for kexec-ing of the Maemo operating system. The Maemo rootfs ++ has to be installed on the n810's "rootfs" MTD partition (MTD4). +diff --git a/feeds/packages/utils/maemo-kexec/Makefile b/feeds/packages/utils/maemo-kexec/Makefile +new file mode 100644 +index 0000000..3f31c97 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=maemo-kexec ++PKG_VERSION:=1.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=maemo-rx44-2008.43-7.kernel ++PKG_SOURCE_URL:=http://bu3sch.de/misc/ ++PKG_MD5SUM:=3cbf571c0618bfe20a69babab6b33bea ++UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/ ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_MAEMO_KEXEC_DOWNLOAD_KERNEL \ ++ CONFIG_MAEMO_KEXEC_KERNEL_PATH ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/maemo-kexec ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@TARGET_omap24xx +kexec-tools ++ TITLE:=Kexec Maemo from OpenWRT ++endef ++ ++define Package/maemo-kexec/description ++ Kexec Maemo from OpenWRT. ++ The Maemo rootfs must be in the rootfs MTD partition. ++endef ++ ++define Package/maemo-kexec/config ++ source "$(SOURCE)/Config.in" ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++endef ++ ++MAEMO_KRNL_SRC:=$(if $(CONFIG_MAEMO_KEXEC_DOWNLOAD_KERNEL),\ ++ $(PKG_BUILD_DIR)/$(PKG_SOURCE),\ ++ $(CONFIG_MAEMO_KEXEC_KERNEL_PATH)) ++ ++define Package/maemo-kexec/install ++ $(INSTALL_DIR) $(1)/boot $(1)/sbin ++ $(INSTALL_BIN) ./files/sbin/bootmaemo $(1)/sbin/ ++ $(INSTALL_DATA) $(MAEMO_KRNL_SRC) $(1)/boot/maemo.zImage ++endef ++ ++$(eval $(call BuildPackage,maemo-kexec)) +diff --git a/feeds/packages/utils/maemo-kexec/files/.svn/entries b/feeds/packages/utils/maemo-kexec/files/.svn/entries +new file mode 100644 +index 0000000..49fd02f +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/maemo-kexec/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-07T00:39:09.305086Z ++25918 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++sbin ++dir ++ +diff --git a/feeds/packages/utils/maemo-kexec/files/sbin/.svn/entries b/feeds/packages/utils/maemo-kexec/files/sbin/.svn/entries +new file mode 100644 +index 0000000..99b222e +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/files/sbin/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/maemo-kexec/files/sbin ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-07T00:39:09.305086Z ++25918 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++bootmaemo ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++f2cca3164d798021b0e7598489229409 ++2011-03-07T00:39:09.305086Z ++25918 ++mb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++211 ++ +diff --git a/feeds/packages/utils/maemo-kexec/files/sbin/.svn/prop-base/bootmaemo.svn-base b/feeds/packages/utils/maemo-kexec/files/sbin/.svn/prop-base/bootmaemo.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/files/sbin/.svn/prop-base/bootmaemo.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/maemo-kexec/files/sbin/.svn/text-base/bootmaemo.svn-base b/feeds/packages/utils/maemo-kexec/files/sbin/.svn/text-base/bootmaemo.svn-base +new file mode 100644 +index 0000000..14f85b1 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/files/sbin/.svn/text-base/bootmaemo.svn-base +@@ -0,0 +1,11 @@ ++#!/bin/sh ++ ++set -e ++ ++sync ++ ++killall -q watchdog || true ++echo 1 >/dev/watchdog ++ ++/usr/sbin/kexec --load /boot/maemo.zImage --append "root=1f03 rootfstype=jffs2 ro console=tty0 console=ttyMTD5" ++/usr/sbin/kexec --exec +diff --git a/feeds/packages/utils/maemo-kexec/files/sbin/bootmaemo b/feeds/packages/utils/maemo-kexec/files/sbin/bootmaemo +new file mode 100755 +index 0000000..14f85b1 +--- /dev/null ++++ b/feeds/packages/utils/maemo-kexec/files/sbin/bootmaemo +@@ -0,0 +1,11 @@ ++#!/bin/sh ++ ++set -e ++ ++sync ++ ++killall -q watchdog || true ++echo 1 >/dev/watchdog ++ ++/usr/sbin/kexec --load /boot/maemo.zImage --append "root=1f03 rootfstype=jffs2 ro console=tty0 console=ttyMTD5" ++/usr/sbin/kexec --exec +diff --git a/feeds/packages/utils/mc/.svn/entries b/feeds/packages/utils/mc/.svn/entries +new file mode 100644 +index 0000000..4c9a082 +--- /dev/null ++++ b/feeds/packages/utils/mc/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-26T15:57:39.842567Z ++31079 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8149f852129361b21a91e875caf7dab1 ++2011-08-30T21:02:36.392548Z ++28135 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++304 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++4aa7646d229c71030e3a02e157a7f611 ++2012-03-26T15:57:39.842567Z ++31079 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2286 ++ +diff --git a/feeds/packages/utils/mc/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/mc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/mc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/mc/.svn/text-base/Config.in.svn-base b/feeds/packages/utils/mc/.svn/text-base/Config.in.svn-base +new file mode 100644 +index 0000000..7d6abf8 +--- /dev/null ++++ b/feeds/packages/utils/mc/.svn/text-base/Config.in.svn-base +@@ -0,0 +1,20 @@ ++menu "Configuration" ++ depends on PACKAGE_mc ++ ++config MC_DIFF_VIEWER ++ bool "Compile with diff viewer" ++ default n ++ ++config MC_EDITOR ++ bool "Enable internal editor" ++ default n ++ ++config MC_SUBSHELL ++ bool "Compile in concurrent subshell" ++ default n ++ ++config MC_DISABLE_VFS ++ bool "Disable VFS" ++ default y ++ ++endmenu +diff --git a/feeds/packages/utils/mc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/mc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..41e35be +--- /dev/null ++++ b/feeds/packages/utils/mc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,96 @@ ++# ++# 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:=mc ++PKG_VERSION:=4.7.5.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/ ++PKG_MD5SUM:=6a67e139e0032d8a871455a80d490941 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/mc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) ++ TITLE:=midnight commander - a powerful file manager ++ URL:=http://www.midnight-commander.org/ ++ SUBMENU:=filemanager ++ MAINTAINER:=Luka Perkov ++ 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. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-utf8 \ ++ --disable-doxygen-doc \ ++ --with-screen=ncurses \ ++ --without-gpm-mouse \ ++ --without-x \ ++ ac_cv_search_addwstr=no ++ ++ifeq ($(CONFIG_MC_DIFF_VIEWER),n) ++CONFIGURE_ARGS += \ ++ --without-diff-viewer ++endif ++ ++ifeq ($(CONFIG_MC_EDITOR),n) ++CONFIGURE_ARGS += \ ++ --without-edit ++endif ++ ++ifeq ($(CONFIG_MC_SUBSHELL),n) ++CONFIGURE_ARGS += \ ++ --without-subshell ++endif ++ ++ifeq ($(CONFIG_MC_DISABLE_VFS),y) ++CONFIGURE_ARGS += \ ++ --without-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_DIFF_VIEWER),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/feeds/packages/utils/mc/Config.in b/feeds/packages/utils/mc/Config.in +new file mode 100644 +index 0000000..7d6abf8 +--- /dev/null ++++ b/feeds/packages/utils/mc/Config.in +@@ -0,0 +1,20 @@ ++menu "Configuration" ++ depends on PACKAGE_mc ++ ++config MC_DIFF_VIEWER ++ bool "Compile with diff viewer" ++ default n ++ ++config MC_EDITOR ++ bool "Enable internal editor" ++ default n ++ ++config MC_SUBSHELL ++ bool "Compile in concurrent subshell" ++ default n ++ ++config MC_DISABLE_VFS ++ bool "Disable VFS" ++ default y ++ ++endmenu +diff --git a/feeds/packages/utils/mc/Makefile b/feeds/packages/utils/mc/Makefile +new file mode 100644 +index 0000000..41e35be +--- /dev/null ++++ b/feeds/packages/utils/mc/Makefile +@@ -0,0 +1,96 @@ ++# ++# 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:=mc ++PKG_VERSION:=4.7.5.3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/ ++PKG_MD5SUM:=6a67e139e0032d8a871455a80d490941 ++ ++PKG_BUILD_PARALLEL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/nls.mk ++ ++define Package/mc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) ++ TITLE:=midnight commander - a powerful file manager ++ URL:=http://www.midnight-commander.org/ ++ SUBMENU:=filemanager ++ MAINTAINER:=Luka Perkov ++ 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. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-utf8 \ ++ --disable-doxygen-doc \ ++ --with-screen=ncurses \ ++ --without-gpm-mouse \ ++ --without-x \ ++ ac_cv_search_addwstr=no ++ ++ifeq ($(CONFIG_MC_DIFF_VIEWER),n) ++CONFIGURE_ARGS += \ ++ --without-diff-viewer ++endif ++ ++ifeq ($(CONFIG_MC_EDITOR),n) ++CONFIGURE_ARGS += \ ++ --without-edit ++endif ++ ++ifeq ($(CONFIG_MC_SUBSHELL),n) ++CONFIGURE_ARGS += \ ++ --without-subshell ++endif ++ ++ifeq ($(CONFIG_MC_DISABLE_VFS),y) ++CONFIGURE_ARGS += \ ++ --without-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_DIFF_VIEWER),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/feeds/packages/utils/md5deep/.svn/entries b/feeds/packages/utils/md5deep/.svn/entries +new file mode 100644 +index 0000000..0cf1c6c +--- /dev/null ++++ b/feeds/packages/utils/md5deep/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/md5deep ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-20T15:18:55.192410Z ++29282 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1f65c8f7cc897d6df50d043bed54d79b ++2011-11-20T15:18:55.192410Z ++29282 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++961 ++ +diff --git a/feeds/packages/utils/md5deep/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/md5deep/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b868ae7 +--- /dev/null ++++ b/feeds/packages/utils/md5deep/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# 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:=md5deep ++PKG_VERSION:=3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=d103b738721c54a9bf535470b63d49dc ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/md5deep ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A program to compute, match and audit hashsets ++ URL:=http://md5deep.sourceforge.net/ ++endef ++ ++define Package/md5deep/description ++ md5deep is a set of programs to compute MD5, SHA-1, SHA-256, Tiger, or ++ Whirlpool message digests on an arbitrary number of files. ++endef ++ ++define Package/md5deep/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/{hash,md5,sha1,sha256,tiger,whirlpool}deep $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,md5deep)) +diff --git a/feeds/packages/utils/md5deep/Makefile b/feeds/packages/utils/md5deep/Makefile +new file mode 100644 +index 0000000..b868ae7 +--- /dev/null ++++ b/feeds/packages/utils/md5deep/Makefile +@@ -0,0 +1,40 @@ ++# ++# 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:=md5deep ++PKG_VERSION:=3.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=d103b738721c54a9bf535470b63d49dc ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/md5deep ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A program to compute, match and audit hashsets ++ URL:=http://md5deep.sourceforge.net/ ++endef ++ ++define Package/md5deep/description ++ md5deep is a set of programs to compute MD5, SHA-1, SHA-256, Tiger, or ++ Whirlpool message digests on an arbitrary number of files. ++endef ++ ++define Package/md5deep/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/{hash,md5,sha1,sha256,tiger,whirlpool}deep $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,md5deep)) +diff --git a/feeds/packages/utils/md5deep/patches/.svn/entries b/feeds/packages/utils/md5deep/patches/.svn/entries +new file mode 100644 +index 0000000..7c249d0 +--- /dev/null ++++ b/feeds/packages/utils/md5deep/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/md5deep/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-20T15:18:55.192410Z ++29282 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++101-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8a7640f6188e80906e040b5d0d0b5341 ++2011-11-20T15:18:55.192410Z ++29282 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++636 ++ +diff --git a/feeds/packages/utils/md5deep/patches/.svn/text-base/101-cross_compile.patch.svn-base b/feeds/packages/utils/md5deep/patches/.svn/text-base/101-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..540ba4c +--- /dev/null ++++ b/feeds/packages/utils/md5deep/patches/.svn/text-base/101-cross_compile.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -19,17 +19,6 @@ AC_PROG_INSTALL ++ AC_CONFIG_FILES([Makefile hashdeep/Makefile md5deep/Makefile]) ++ AM_CONFIG_HEADER([config.h]) ++ ++-# Bring additional directories where things might be found into our ++-# search path. I don't know why autoconf doesn't do this by default ++-for spfx in /usr/local /opt/local /sw ; do ++- echo checking ${spfx}/include ++- if test -d ${spfx}/include; then ++- CFLAGS="-I${spfx}/include $CFLAGS" ++- CPPFLAGS="-I${spfx}/include $CPPFLAGS" ++- LDFLAGS="-L${spfx}/lib $LDFLAGS" ++- fi ++-done ++- ++ # Checks for header files. ++ AC_HEADER_DIRENT ++ AC_HEADER_STDC +diff --git a/feeds/packages/utils/md5deep/patches/101-cross_compile.patch b/feeds/packages/utils/md5deep/patches/101-cross_compile.patch +new file mode 100644 +index 0000000..540ba4c +--- /dev/null ++++ b/feeds/packages/utils/md5deep/patches/101-cross_compile.patch +@@ -0,0 +1,20 @@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -19,17 +19,6 @@ AC_PROG_INSTALL ++ AC_CONFIG_FILES([Makefile hashdeep/Makefile md5deep/Makefile]) ++ AM_CONFIG_HEADER([config.h]) ++ ++-# Bring additional directories where things might be found into our ++-# search path. I don't know why autoconf doesn't do this by default ++-for spfx in /usr/local /opt/local /sw ; do ++- echo checking ${spfx}/include ++- if test -d ${spfx}/include; then ++- CFLAGS="-I${spfx}/include $CFLAGS" ++- CPPFLAGS="-I${spfx}/include $CPPFLAGS" ++- LDFLAGS="-L${spfx}/lib $LDFLAGS" ++- fi ++-done ++- ++ # Checks for header files. ++ AC_HEADER_DIRENT ++ AC_HEADER_STDC +diff --git a/feeds/packages/utils/mdadm/.svn/entries b/feeds/packages/utils/mdadm/.svn/entries +new file mode 100644 +index 0000000..b282433 +--- /dev/null ++++ b/feeds/packages/utils/mdadm/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mdadm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-03T18:53:02.178298Z ++35002 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++be2b03b2dccbf18366c36886694d162c ++2013-01-03T18:53:02.178298Z ++35002 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1105 ++ +diff --git a/feeds/packages/utils/mdadm/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/mdadm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..9cf4e2a +--- /dev/null ++++ b/feeds/packages/utils/mdadm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=mdadm ++PKG_VERSION:=3.2.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_MD5SUM:=2fd33dedcdb06f0d1461f50ddabb7e4a ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mdadm ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A tool for managing Soft RAID under Linux ++ URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/ ++ DEPENDS:=+@KERNEL_DIRECT_IO ++endef ++ ++define Package/mdadm/description ++ A tool for managing Linux Software RAID arrays. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -DHAVE_STDINT_H" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ mdadm mdassemble ++endef ++ ++define Package/mdadm/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdadm $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdassemble $(1)/sbin ++endef ++ ++$(eval $(call BuildPackage,mdadm)) +diff --git a/feeds/packages/utils/mdadm/Makefile b/feeds/packages/utils/mdadm/Makefile +new file mode 100644 +index 0000000..9cf4e2a +--- /dev/null ++++ b/feeds/packages/utils/mdadm/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=mdadm ++PKG_VERSION:=3.2.5 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_MD5SUM:=2fd33dedcdb06f0d1461f50ddabb7e4a ++ ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mdadm ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A tool for managing Soft RAID under Linux ++ URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/ ++ DEPENDS:=+@KERNEL_DIRECT_IO ++endef ++ ++define Package/mdadm/description ++ A tool for managing Linux Software RAID arrays. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -DHAVE_STDINT_H" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" \ ++ mdadm mdassemble ++endef ++ ++define Package/mdadm/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdadm $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdassemble $(1)/sbin ++endef ++ ++$(eval $(call BuildPackage,mdadm)) +diff --git a/feeds/packages/utils/mdadm/patches/.svn/entries b/feeds/packages/utils/mdadm/patches/.svn/entries +new file mode 100644 +index 0000000..5a99f90 +--- /dev/null ++++ b/feeds/packages/utils/mdadm/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mdadm/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T21:52:06.330553Z ++32753 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++a2858ac2293428e00b811620a23c637e ++2012-07-16T21:52:06.330553Z ++32753 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++314 ++ ++100-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f507256e54539b00d348a564112ce082 ++2012-07-16T21:52:06.330553Z ++32753 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++817 ++ +diff --git a/feeds/packages/utils/mdadm/patches/.svn/text-base/000-compile.patch.svn-base b/feeds/packages/utils/mdadm/patches/.svn/text-base/000-compile.patch.svn-base +new file mode 100644 +index 0000000..6d47489 +--- /dev/null ++++ b/feeds/packages/utils/mdadm/patches/.svn/text-base/000-compile.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/sha1.h +++++ b/sha1.h ++@@ -26,8 +26,6 @@ ++ # include ++ #endif ++ ++-#include "ansidecl.h" ++- ++ /* The following contortions are an attempt to use the C preprocessor ++ to determine an unsigned integral type that is 32 bits wide. An ++ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but +diff --git a/feeds/packages/utils/mdadm/patches/.svn/text-base/100-cross_compile.patch.svn-base b/feeds/packages/utils/mdadm/patches/.svn/text-base/100-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..8709e57 +--- /dev/null ++++ b/feeds/packages/utils/mdadm/patches/.svn/text-base/100-cross_compile.patch.svn-base +@@ -0,0 +1,19 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -76,7 +76,6 @@ FAILED_SLOTS_DIR = /run/mdadm/failed-slo ++ DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" ++ DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" ++ DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\" ++-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) ++ ++ # The glibc TLS ABI requires applications that call clone(2) to set up ++ # TLS data structures, use pthreads until mdmon implements this support ++@@ -183,7 +182,7 @@ raid6check : raid6check.o mdadm.h $(CHEC ++ ++ mdassemble : $(ASSEMBLE_SRCS) $(INCL) ++ rm -f $(OBJS) ++- $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) +++ $(CC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) ++ ++ mdassemble.static : $(ASSEMBLE_SRCS) $(INCL) ++ rm -f $(OBJS) +diff --git a/feeds/packages/utils/mdadm/patches/000-compile.patch b/feeds/packages/utils/mdadm/patches/000-compile.patch +new file mode 100644 +index 0000000..6d47489 +--- /dev/null ++++ b/feeds/packages/utils/mdadm/patches/000-compile.patch +@@ -0,0 +1,11 @@ ++--- a/sha1.h +++++ b/sha1.h ++@@ -26,8 +26,6 @@ ++ # include ++ #endif ++ ++-#include "ansidecl.h" ++- ++ /* The following contortions are an attempt to use the C preprocessor ++ to determine an unsigned integral type that is 32 bits wide. An ++ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but +diff --git a/feeds/packages/utils/mdadm/patches/100-cross_compile.patch b/feeds/packages/utils/mdadm/patches/100-cross_compile.patch +new file mode 100644 +index 0000000..8709e57 +--- /dev/null ++++ b/feeds/packages/utils/mdadm/patches/100-cross_compile.patch +@@ -0,0 +1,19 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -76,7 +76,6 @@ FAILED_SLOTS_DIR = /run/mdadm/failed-slo ++ DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" ++ DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" ++ DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\" ++-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) ++ ++ # The glibc TLS ABI requires applications that call clone(2) to set up ++ # TLS data structures, use pthreads until mdmon implements this support ++@@ -183,7 +182,7 @@ raid6check : raid6check.o mdadm.h $(CHEC ++ ++ mdassemble : $(ASSEMBLE_SRCS) $(INCL) ++ rm -f $(OBJS) ++- $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) +++ $(CC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) ++ ++ mdassemble.static : $(ASSEMBLE_SRCS) $(INCL) ++ rm -f $(OBJS) +diff --git a/feeds/packages/utils/memtester/.svn/entries b/feeds/packages/utils/memtester/.svn/entries +new file mode 100644 +index 0000000..a8ba9a6 +--- /dev/null ++++ b/feeds/packages/utils/memtester/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/memtester ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T20:17:56.969733Z ++32535 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++efe6aac0f97e4238137c84222ab3397d ++2010-04-21T13:06:08.051461Z ++21067 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1118 ++ +diff --git a/feeds/packages/utils/memtester/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/memtester/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..132ada2 +--- /dev/null ++++ b/feeds/packages/utils/memtester/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=memtester ++PKG_VERSION:=4.1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://pyropus.ca/software/memtester/old-versions/ ++PKG_MD5SUM:=e562451620cf5343016950462bc0dc38 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/memtester ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Userspace utility for testing the memory subsystem for faults ++ URL:=http://pyropus.ca/software/memtester/ ++endef ++ ++define Package/memtester/description ++ A userspace utility for testing the memory subsystem for faults. ++endef ++ ++define Build/Configure ++ $(SED) 's,cc -O2,$(TARGET_CC) $(TARGET_CFLAGS),' $(PKG_BUILD_DIR)/conf-cc ++ $(SED) "s,cc,$(TARGET_CC)," $(PKG_BUILD_DIR)/conf-ld ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) all ++endef ++ ++define Package/memtester/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/memtester $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,memtester)) +diff --git a/feeds/packages/utils/memtester/Makefile b/feeds/packages/utils/memtester/Makefile +new file mode 100644 +index 0000000..132ada2 +--- /dev/null ++++ b/feeds/packages/utils/memtester/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=memtester ++PKG_VERSION:=4.1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://pyropus.ca/software/memtester/old-versions/ ++PKG_MD5SUM:=e562451620cf5343016950462bc0dc38 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/memtester ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Userspace utility for testing the memory subsystem for faults ++ URL:=http://pyropus.ca/software/memtester/ ++endef ++ ++define Package/memtester/description ++ A userspace utility for testing the memory subsystem for faults. ++endef ++ ++define Build/Configure ++ $(SED) 's,cc -O2,$(TARGET_CC) $(TARGET_CFLAGS),' $(PKG_BUILD_DIR)/conf-cc ++ $(SED) "s,cc,$(TARGET_CC)," $(PKG_BUILD_DIR)/conf-ld ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) all ++endef ++ ++define Package/memtester/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/memtester $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,memtester)) +diff --git a/feeds/packages/utils/memtester/patches/.svn/entries b/feeds/packages/utils/memtester/patches/.svn/entries +new file mode 100644 +index 0000000..987926b +--- /dev/null ++++ b/feeds/packages/utils/memtester/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/memtester/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T20:17:56.969733Z ++32535 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-quiet.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++45cde687c8bced105bf75fca8622c1bd ++2012-06-29T20:17:56.969733Z ++32535 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10580 ++ +diff --git a/feeds/packages/utils/memtester/patches/.svn/text-base/100-quiet.diff.svn-base b/feeds/packages/utils/memtester/patches/.svn/text-base/100-quiet.diff.svn-base +new file mode 100644 +index 0000000..93661a9 +--- /dev/null ++++ b/feeds/packages/utils/memtester/patches/.svn/text-base/100-quiet.diff.svn-base +@@ -0,0 +1,331 @@ ++--- a/memtester.c +++++ b/memtester.c ++@@ -123,7 +123,7 @@ int main(int argc, char **argv) { ++ pagesizemask = (ptrdiff_t) ~(pagesize - 1); ++ printf("pagesizemask is 0x%tx\n", pagesizemask); ++ ++- while ((opt = getopt(argc, argv, "p:")) != -1) { +++ while ((opt = getopt(argc, argv, "qp:")) != -1) { ++ switch (opt) { ++ case 'p': ++ errno = 0; ++@@ -150,6 +150,9 @@ int main(int argc, char **argv) { ++ /* okay, got address */ ++ use_phys = 1; ++ break; +++ case 'q': +++ quiet = 1; +++ break; ++ default: /* '?' */ ++ usage(argv[0]); /* doesn't return */ ++ } ++--- a/tests.c +++++ b/tests.c ++@@ -17,12 +17,23 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include "types.h" ++ #include "sizes.h" ++ #include "memtester.h" ++ +++int quiet = 0; ++ char progress[] = "-\\|/"; +++ +++void inline __dprintf(const char *format, ...) { +++ if(!quiet) { +++ va_list ap; +++ va_start(ap, format); +++ vprintf(format, ap); +++ } +++} +++ ++ #define PROGRESSLEN 4 ++ #define PROGRESSOFTEN 2500 ++ #define ONE 0x00000001L ++@@ -65,16 +76,16 @@ int test_stuck_address(ulv *bufa, size_t ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < 16; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ *p1 = ((j + i) % 2) == 0 ? (ul) p1 : ~((ul) p1); ++ *p1++; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ for (i = 0; i < count; i++, p1++) { ++@@ -97,7 +108,7 @@ int test_stuck_address(ulv *bufa, size_t ++ } ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -112,13 +123,13 @@ int test_random_value(ulv *bufa, ulv *bu ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = rand_ul(); ++- if (!(i % PROGRESSOFTEN)) { +++ if (!quiet && !(i % PROGRESSOFTEN)) { ++ putchar('\b'); ++ putchar(progress[++j % PROGRESSLEN]); ++ fflush(stdout); ++ } ++ } ++- printf("\b \b"); +++ __dprintf("\b \b"); ++ fflush(stdout); ++ return compare_regions(bufa, bufb, count); ++ } ++@@ -226,23 +237,23 @@ int test_solidbits_comparison(ulv *bufa, ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < 64; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ q = (j % 2) == 0 ? UL_ONEBITS : 0; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (i % 2) == 0 ? q : ~q; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -257,23 +268,23 @@ int test_checkerboard_comparison(ulv *bu ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < 64; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ q = (j % 2) == 0 ? CHECKERBOARD1 : CHECKERBOARD2; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (i % 2) == 0 ? q : ~q; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -284,25 +295,25 @@ int test_blockseq_comparison(ulv *bufa, ++ unsigned int j; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (j = 0; j < 256; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (ul) UL_BYTE(j); ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -316,10 +327,10 @@ int test_walkbits0_comparison(ulv *bufa, ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < UL_LEN * 2; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ if (j < UL_LEN) { /* Walk it up. */ ++@@ -328,14 +339,14 @@ int test_walkbits0_comparison(ulv *bufa, ++ *p1++ = *p2++ = ONE << (UL_LEN * 2 - j - 1); ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -346,13 +357,13 @@ int test_walkbits1_comparison(ulv *bufa, ++ unsigned int j; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (j = 0; j < UL_LEN * 2; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ if (j < UL_LEN) { /* Walk it up. */ ++@@ -361,14 +372,14 @@ int test_walkbits1_comparison(ulv *bufa, ++ *p1++ = *p2++ = UL_ONEBITS ^ (ONE << (UL_LEN * 2 - j - 1)); ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -379,13 +390,13 @@ int test_bitspread_comparison(ulv *bufa, ++ unsigned int j; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (j = 0; j < UL_LEN * 2; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ if (j < UL_LEN) { /* Walk it up. */ ++@@ -400,14 +411,14 @@ int test_bitspread_comparison(ulv *bufa, ++ | (ONE << (UL_LEN * 2 + 1 - j))); ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -419,29 +430,29 @@ int test_bitflip_comparison(ulv *bufa, u ++ ul q; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (k = 0; k < UL_LEN; k++) { ++ q = ONE << k; ++ for (j = 0; j < 8; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ q = ~q; ++- printf("setting %3u", k * 8 + j); +++ __dprintf("setting %3u", k * 8 + j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (i % 2) == 0 ? q : ~q; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", k * 8 + j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", k * 8 + j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++--- a/tests.h +++++ b/tests.h ++@@ -14,6 +14,8 @@ ++ * ++ */ ++ +++extern int quiet; +++ ++ /* Function declaration. */ ++ ++ int test_stuck_address(unsigned long volatile *bufa, size_t count); +diff --git a/feeds/packages/utils/memtester/patches/100-quiet.diff b/feeds/packages/utils/memtester/patches/100-quiet.diff +new file mode 100644 +index 0000000..93661a9 +--- /dev/null ++++ b/feeds/packages/utils/memtester/patches/100-quiet.diff +@@ -0,0 +1,331 @@ ++--- a/memtester.c +++++ b/memtester.c ++@@ -123,7 +123,7 @@ int main(int argc, char **argv) { ++ pagesizemask = (ptrdiff_t) ~(pagesize - 1); ++ printf("pagesizemask is 0x%tx\n", pagesizemask); ++ ++- while ((opt = getopt(argc, argv, "p:")) != -1) { +++ while ((opt = getopt(argc, argv, "qp:")) != -1) { ++ switch (opt) { ++ case 'p': ++ errno = 0; ++@@ -150,6 +150,9 @@ int main(int argc, char **argv) { ++ /* okay, got address */ ++ use_phys = 1; ++ break; +++ case 'q': +++ quiet = 1; +++ break; ++ default: /* '?' */ ++ usage(argv[0]); /* doesn't return */ ++ } ++--- a/tests.c +++++ b/tests.c ++@@ -17,12 +17,23 @@ ++ #include ++ #include ++ #include +++#include ++ ++ #include "types.h" ++ #include "sizes.h" ++ #include "memtester.h" ++ +++int quiet = 0; ++ char progress[] = "-\\|/"; +++ +++void inline __dprintf(const char *format, ...) { +++ if(!quiet) { +++ va_list ap; +++ va_start(ap, format); +++ vprintf(format, ap); +++ } +++} +++ ++ #define PROGRESSLEN 4 ++ #define PROGRESSOFTEN 2500 ++ #define ONE 0x00000001L ++@@ -65,16 +76,16 @@ int test_stuck_address(ulv *bufa, size_t ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < 16; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ *p1 = ((j + i) % 2) == 0 ? (ul) p1 : ~((ul) p1); ++ *p1++; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ for (i = 0; i < count; i++, p1++) { ++@@ -97,7 +108,7 @@ int test_stuck_address(ulv *bufa, size_t ++ } ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -112,13 +123,13 @@ int test_random_value(ulv *bufa, ulv *bu ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = rand_ul(); ++- if (!(i % PROGRESSOFTEN)) { +++ if (!quiet && !(i % PROGRESSOFTEN)) { ++ putchar('\b'); ++ putchar(progress[++j % PROGRESSLEN]); ++ fflush(stdout); ++ } ++ } ++- printf("\b \b"); +++ __dprintf("\b \b"); ++ fflush(stdout); ++ return compare_regions(bufa, bufb, count); ++ } ++@@ -226,23 +237,23 @@ int test_solidbits_comparison(ulv *bufa, ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < 64; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ q = (j % 2) == 0 ? UL_ONEBITS : 0; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (i % 2) == 0 ? q : ~q; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -257,23 +268,23 @@ int test_checkerboard_comparison(ulv *bu ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < 64; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ q = (j % 2) == 0 ? CHECKERBOARD1 : CHECKERBOARD2; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (i % 2) == 0 ? q : ~q; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -284,25 +295,25 @@ int test_blockseq_comparison(ulv *bufa, ++ unsigned int j; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (j = 0; j < 256; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (ul) UL_BYTE(j); ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -316,10 +327,10 @@ int test_walkbits0_comparison(ulv *bufa, ++ printf(" "); ++ fflush(stdout); ++ for (j = 0; j < UL_LEN * 2; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ if (j < UL_LEN) { /* Walk it up. */ ++@@ -328,14 +339,14 @@ int test_walkbits0_comparison(ulv *bufa, ++ *p1++ = *p2++ = ONE << (UL_LEN * 2 - j - 1); ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -346,13 +357,13 @@ int test_walkbits1_comparison(ulv *bufa, ++ unsigned int j; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (j = 0; j < UL_LEN * 2; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ if (j < UL_LEN) { /* Walk it up. */ ++@@ -361,14 +372,14 @@ int test_walkbits1_comparison(ulv *bufa, ++ *p1++ = *p2++ = UL_ONEBITS ^ (ONE << (UL_LEN * 2 - j - 1)); ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -379,13 +390,13 @@ int test_bitspread_comparison(ulv *bufa, ++ unsigned int j; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (j = 0; j < UL_LEN * 2; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++- printf("setting %3u", j); +++ __dprintf("setting %3u", j); ++ fflush(stdout); ++ for (i = 0; i < count; i++) { ++ if (j < UL_LEN) { /* Walk it up. */ ++@@ -400,14 +411,14 @@ int test_bitspread_comparison(ulv *bufa, ++ | (ONE << (UL_LEN * 2 + 1 - j))); ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++@@ -419,29 +430,29 @@ int test_bitflip_comparison(ulv *bufa, u ++ ul q; ++ size_t i; ++ ++- printf(" "); +++ __dprintf(" "); ++ fflush(stdout); ++ for (k = 0; k < UL_LEN; k++) { ++ q = ONE << k; ++ for (j = 0; j < 8; j++) { ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); ++ q = ~q; ++- printf("setting %3u", k * 8 + j); +++ __dprintf("setting %3u", k * 8 + j); ++ fflush(stdout); ++ p1 = (ulv *) bufa; ++ p2 = (ulv *) bufb; ++ for (i = 0; i < count; i++) { ++ *p1++ = *p2++ = (i % 2) == 0 ? q : ~q; ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b"); ++- printf("testing %3u", k * 8 + j); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("testing %3u", k * 8 + j); ++ fflush(stdout); ++ if (compare_regions(bufa, bufb, count)) { ++ return -1; ++ } ++ } ++ } ++- printf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); +++ __dprintf("\b\b\b\b\b\b\b\b\b\b\b \b\b\b\b\b\b\b\b\b\b\b"); ++ fflush(stdout); ++ return 0; ++ } ++--- a/tests.h +++++ b/tests.h ++@@ -14,6 +14,8 @@ ++ * ++ */ ++ +++extern int quiet; +++ ++ /* Function declaration. */ ++ ++ int test_stuck_address(unsigned long volatile *bufa, size_t count); +diff --git a/feeds/packages/utils/mg/.svn/entries b/feeds/packages/utils/mg/.svn/entries +new file mode 100644 +index 0000000..439a6cc +--- /dev/null ++++ b/feeds/packages/utils/mg/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mg ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-06-02T14:24:21.610213Z ++27093 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++4ba71d066bd2537171aba1ef600604f8 ++2011-06-02T14:24:21.610213Z ++27093 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1334 ++ +diff --git a/feeds/packages/utils/mg/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/mg/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..de5265c +--- /dev/null ++++ b/feeds/packages/utils/mg/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=mg ++PKG_VERSION:=20110120 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://homepage.boetes.org/software/mg ++PKG_MD5SUM:=f2fa8016a491aa2a9d4c5698c593f31b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mg ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=microscopic GNU Emacs-style editor ++ URL:=http://homepage.boetes.org/software/mg/ ++ SUBMENU:=Editors ++endef ++ ++define Package/mg/description ++ This program is intended to be a small, fast, and portable ++ editor for people who can't (or don't want to) run real ++ Emacs for one reason or another. It is compatible with GNU ++ because there shouldn't be any reason to learn more than ++ one Emacs flavor. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ ./configure \ ++ ); ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lncurses" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ CC="$(TARGET_CC)" ++endef ++ ++define Package/mg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,mg)) +diff --git a/feeds/packages/utils/mg/Makefile b/feeds/packages/utils/mg/Makefile +new file mode 100644 +index 0000000..de5265c +--- /dev/null ++++ b/feeds/packages/utils/mg/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=mg ++PKG_VERSION:=20110120 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://homepage.boetes.org/software/mg ++PKG_MD5SUM:=f2fa8016a491aa2a9d4c5698c593f31b ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mg ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=microscopic GNU Emacs-style editor ++ URL:=http://homepage.boetes.org/software/mg/ ++ SUBMENU:=Editors ++endef ++ ++define Package/mg/description ++ This program is intended to be a small, fast, and portable ++ editor for people who can't (or don't want to) run real ++ Emacs for one reason or another. It is compatible with GNU ++ because there shouldn't be any reason to learn more than ++ one Emacs flavor. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR); \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ ./configure \ ++ ); ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ LDFLAGS="$(TARGET_LDFLAGS) -lncurses" \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ CC="$(TARGET_CC)" ++endef ++ ++define Package/mg/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,mg)) +diff --git a/feeds/packages/utils/mgetty/.svn/entries b/feeds/packages/utils/mgetty/.svn/entries +new file mode 100644 +index 0000000..1aa3524 +--- /dev/null ++++ b/feeds/packages/utils/mgetty/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mgetty ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ff7f0d8fa795a8f2ded2c1d935920a99 ++2009-06-13T17:01:55.650435Z ++16438 ++hauke ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5311 ++ +diff --git a/feeds/packages/utils/mgetty/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/mgetty/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/mgetty/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/mgetty/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/mgetty/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8e2aec4 +--- /dev/null ++++ b/feeds/packages/utils/mgetty/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,131 @@ ++# ++# 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:=mgetty ++PKG_VERSION:=1.1.36 ++PKG_XVERSION:=Jun15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-$(PKG_XVERSION).tar.gz ++PKG_SOURCE_URL:=ftp://alpha.greenie.net/pub/mgetty/source/1.1 ++PKG_MD5SUM:=0320e98c6b86bcca48fc5f355b94ead4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mgetty ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A data/fax solution for your analog modem ++ URL:=http://mgetty.greenie.net/ ++endef ++ ++define Package/mgetty/description ++A data/fax solution for your analog modem. ++endef ++ ++define Build/Configure ++ cp $(PKG_BUILD_DIR)/policy.h-dist $(PKG_BUILD_DIR)/policy.h ++ echo "#define AUTO_PPP" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef FAX_NOTIFY_PROGRAM" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define FAX_NOTIFY_PROGRAM \"/usr/lib/mgetty+sendfax/new_fax\"" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef DATA_FLOW" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define DATA_FLOW FLOW_HARD" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef DEVICE_GROUP" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef DEVICE_OWNER" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define DEVICE_OWNER \"root\"" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef FAXREC_FLOW" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define FAXREC_FLOW FLOW_SOFT" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef FAXSEND_FLOW" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define FAXSEND_FLOW FLOW_SOFT" >> $(PKG_BUILD_DIR)/policy.h ++endef ++ ++#FIXME: don't manually install, use upstream Makefile instead ++define Build/Compile ++ rm -rf $(PKG_INSTALL_DIR) ++ mkdir -p $(PKG_INSTALL_DIR)/usr/bin ++ mkdir -p $(PKG_INSTALL_DIR)/usr/sbin ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ mkdir -p $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ mksed ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ CONFDIR=/etc/mgetty+sendfax \ ++ bin-all ++ $(CP) $(PKG_BUILD_DIR)/mgetty $(PKG_INSTALL_DIR)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/sendfax $(PKG_INSTALL_DIR)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxrunqd $(PKG_INSTALL_DIR)/usr/sbin ++ chmod 755 $(PKG_INSTALL_DIR)/usr/sbin/* ++ $(CP) $(PKG_BUILD_DIR)/fax/faxq-helper $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ chmod u+s $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/faxq-helper ++ $(CP) $(PKG_BUILD_DIR)/fax/cour25n.pbm $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/cour25.pbm $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/faxq $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxrm $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxrunq $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxspool $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/g3/g32pbm $(PKG_INSTALL_DIR)/usr/bin ++ (cd $(PKG_INSTALL_DIR)/usr/bin;\ ++ ln -snf g32pbm g3topbm;\ ++ ); ++ $(CP) $(PKG_BUILD_DIR)/g3/g3cat $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/g3/pbm2g3 $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/g3/sff2g3 $(PKG_INSTALL_DIR)/usr/bin ++ chmod 755 $(PKG_INSTALL_DIR)/usr/bin/* ++# Installation into /etc ++ $(CP) $(PKG_BUILD_DIR)/dialin.config $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/faxheader $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/faxrunq.config $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/faxspool.rules $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxspool.rules.sample ++ $(PKG_BUILD_DIR)/sedscript < $(PKG_BUILD_DIR)/login.cfg.in > $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/login.config ++ $(PKG_BUILD_DIR)/sedscript < $(PKG_BUILD_DIR)/mgetty.cfg.in > $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/mgetty.config ++ $(PKG_BUILD_DIR)/sedscript < $(PKG_BUILD_DIR)/sendfax.cfg.in > $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/sendfax.config ++endef ++ ++define Package/mgetty/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxq \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxrm \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxrunq \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxspool \ ++ $(PKG_INSTALL_DIR)/usr/bin/g32pbm \ ++ $(PKG_INSTALL_DIR)/usr/bin/g3cat \ ++ $(PKG_INSTALL_DIR)/usr/bin/pbm2g3 \ ++ $(PKG_INSTALL_DIR)/usr/bin/sff2g3 \ ++ $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/mgetty \ ++ $(PKG_INSTALL_DIR)/usr/sbin/sendfax \ ++ $(PKG_INSTALL_DIR)/usr/sbin/faxrunqd \ ++ $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib/mgetty+sendfax ++ install -m4755 \ ++ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/faxq-helper \ ++ $(1)/usr/lib/mgetty+sendfax/ ++ install -m644 \ ++ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/cour25n.pbm \ ++ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/cour25.pbm \ ++ $(1)/usr/lib/mgetty+sendfax/ ++ $(INSTALL_DIR) $(1)/etc/mgetty+sendfax ++ install -m600 \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/dialin.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxheader \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxrunq.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxspool.rules.sample \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/login.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/mgetty.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/sendfax.config \ ++ $(1)/etc/mgetty+sendfax/ ++endef ++ ++$(eval $(call BuildPackage,mgetty)) +diff --git a/feeds/packages/utils/mgetty/Makefile b/feeds/packages/utils/mgetty/Makefile +new file mode 100644 +index 0000000..8e2aec4 +--- /dev/null ++++ b/feeds/packages/utils/mgetty/Makefile +@@ -0,0 +1,131 @@ ++# ++# 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:=mgetty ++PKG_VERSION:=1.1.36 ++PKG_XVERSION:=Jun15 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-$(PKG_XVERSION).tar.gz ++PKG_SOURCE_URL:=ftp://alpha.greenie.net/pub/mgetty/source/1.1 ++PKG_MD5SUM:=0320e98c6b86bcca48fc5f355b94ead4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/mgetty ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A data/fax solution for your analog modem ++ URL:=http://mgetty.greenie.net/ ++endef ++ ++define Package/mgetty/description ++A data/fax solution for your analog modem. ++endef ++ ++define Build/Configure ++ cp $(PKG_BUILD_DIR)/policy.h-dist $(PKG_BUILD_DIR)/policy.h ++ echo "#define AUTO_PPP" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef FAX_NOTIFY_PROGRAM" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define FAX_NOTIFY_PROGRAM \"/usr/lib/mgetty+sendfax/new_fax\"" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef DATA_FLOW" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define DATA_FLOW FLOW_HARD" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef DEVICE_GROUP" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef DEVICE_OWNER" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define DEVICE_OWNER \"root\"" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef FAXREC_FLOW" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define FAXREC_FLOW FLOW_SOFT" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#undef FAXSEND_FLOW" >> $(PKG_BUILD_DIR)/policy.h ++ echo "#define FAXSEND_FLOW FLOW_SOFT" >> $(PKG_BUILD_DIR)/policy.h ++endef ++ ++#FIXME: don't manually install, use upstream Makefile instead ++define Build/Compile ++ rm -rf $(PKG_INSTALL_DIR) ++ mkdir -p $(PKG_INSTALL_DIR)/usr/bin ++ mkdir -p $(PKG_INSTALL_DIR)/usr/sbin ++ mkdir -p $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ mkdir -p $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ mksed ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ CONFDIR=/etc/mgetty+sendfax \ ++ bin-all ++ $(CP) $(PKG_BUILD_DIR)/mgetty $(PKG_INSTALL_DIR)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/sendfax $(PKG_INSTALL_DIR)/usr/sbin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxrunqd $(PKG_INSTALL_DIR)/usr/sbin ++ chmod 755 $(PKG_INSTALL_DIR)/usr/sbin/* ++ $(CP) $(PKG_BUILD_DIR)/fax/faxq-helper $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ chmod u+s $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/faxq-helper ++ $(CP) $(PKG_BUILD_DIR)/fax/cour25n.pbm $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/cour25.pbm $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/faxq $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxrm $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxrunq $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/fax/faxspool $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/g3/g32pbm $(PKG_INSTALL_DIR)/usr/bin ++ (cd $(PKG_INSTALL_DIR)/usr/bin;\ ++ ln -snf g32pbm g3topbm;\ ++ ); ++ $(CP) $(PKG_BUILD_DIR)/g3/g3cat $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/g3/pbm2g3 $(PKG_INSTALL_DIR)/usr/bin ++ $(CP) $(PKG_BUILD_DIR)/g3/sff2g3 $(PKG_INSTALL_DIR)/usr/bin ++ chmod 755 $(PKG_INSTALL_DIR)/usr/bin/* ++# Installation into /etc ++ $(CP) $(PKG_BUILD_DIR)/dialin.config $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/faxheader $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/faxrunq.config $(PKG_INSTALL_DIR)/etc/mgetty+sendfax ++ $(CP) $(PKG_BUILD_DIR)/fax/faxspool.rules $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxspool.rules.sample ++ $(PKG_BUILD_DIR)/sedscript < $(PKG_BUILD_DIR)/login.cfg.in > $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/login.config ++ $(PKG_BUILD_DIR)/sedscript < $(PKG_BUILD_DIR)/mgetty.cfg.in > $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/mgetty.config ++ $(PKG_BUILD_DIR)/sedscript < $(PKG_BUILD_DIR)/sendfax.cfg.in > $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/sendfax.config ++endef ++ ++define Package/mgetty/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxq \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxrm \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxrunq \ ++ $(PKG_INSTALL_DIR)/usr/bin/faxspool \ ++ $(PKG_INSTALL_DIR)/usr/bin/g32pbm \ ++ $(PKG_INSTALL_DIR)/usr/bin/g3cat \ ++ $(PKG_INSTALL_DIR)/usr/bin/pbm2g3 \ ++ $(PKG_INSTALL_DIR)/usr/bin/sff2g3 \ ++ $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/mgetty \ ++ $(PKG_INSTALL_DIR)/usr/sbin/sendfax \ ++ $(PKG_INSTALL_DIR)/usr/sbin/faxrunqd \ ++ $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/usr/lib/mgetty+sendfax ++ install -m4755 \ ++ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/faxq-helper \ ++ $(1)/usr/lib/mgetty+sendfax/ ++ install -m644 \ ++ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/cour25n.pbm \ ++ $(PKG_INSTALL_DIR)/usr/lib/mgetty+sendfax/cour25.pbm \ ++ $(1)/usr/lib/mgetty+sendfax/ ++ $(INSTALL_DIR) $(1)/etc/mgetty+sendfax ++ install -m600 \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/dialin.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxheader \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxrunq.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/faxspool.rules.sample \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/login.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/mgetty.config \ ++ $(PKG_INSTALL_DIR)/etc/mgetty+sendfax/sendfax.config \ ++ $(1)/etc/mgetty+sendfax/ ++endef ++ ++$(eval $(call BuildPackage,mgetty)) +diff --git a/feeds/packages/utils/mgetty/patches/.svn/entries b/feeds/packages/utils/mgetty/patches/.svn/entries +new file mode 100644 +index 0000000..7be0e12 +--- /dev/null ++++ b/feeds/packages/utils/mgetty/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mgetty/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-05T12:25:00.134445Z ++11642 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-mgetty.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8521b611b65379bd14a646de9fc36519 ++2008-07-05T12:25:00.134445Z ++11642 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2683 ++ +diff --git a/feeds/packages/utils/mgetty/patches/.svn/prop-base/001-mgetty.patch.svn-base b/feeds/packages/utils/mgetty/patches/.svn/prop-base/001-mgetty.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/mgetty/patches/.svn/prop-base/001-mgetty.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/mgetty/patches/.svn/text-base/001-mgetty.patch.svn-base b/feeds/packages/utils/mgetty/patches/.svn/text-base/001-mgetty.patch.svn-base +new file mode 100644 +index 0000000..427fe9c +--- /dev/null ++++ b/feeds/packages/utils/mgetty/patches/.svn/text-base/001-mgetty.patch.svn-base +@@ -0,0 +1,88 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -164,7 +164,9 @@ ++ # ++ # if your systems doesn't have one, use the shell script that I provide ++ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 ++-INSTALL=install -c -o bin -g bin +++STRIP=$(STAGING_DIR)sstrip +++INSTALL=install -c -o root -g root +++#INSTALL=install -c -o bin -g bin ++ #INSTALL=install -c -o root -g wheel # NeXT/BSD ++ #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x ++ #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2 ++@@ -216,7 +218,7 @@ ++ # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER ++ # MUST NOT BE root or any other privileged account). ++ # ++-FAX_OUT_USER=fax +++FAX_OUT_USER=root ++ # ++ # ++ # Where section 1 manual pages should be placed ++@@ -421,7 +423,12 @@ ++ ./mksed >sedscript ++ chmod +x sedscript ++ ++-mksed: mksed.c policy.h Makefile +++REALGCC:=/usr/bin/gcc +++mksed: mksed.c policy.h Makefile +++ ( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\ +++ ); +++ +++mksed-wrong: mksed.c policy.h Makefile ++ $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \ ++ -DLIBDIR=\"$(LIBDIR)\" \ ++ -DCONFDIR=\"$(CONFDIR)\" \ ++@@ -586,8 +593,10 @@ ++ -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) ++ -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ++ -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ++- $(INSTALL) -s -m 700 mgetty $(SBINDIR) ++- $(INSTALL) -s -m 755 sendfax $(SBINDIR) +++ $(INSTALL) -m 700 mgetty $(SBINDIR) +++ $(STRIP) $(SBINDIR)/mgetty +++ $(INSTALL) -m 755 sendfax $(SBINDIR) +++ $(STRIP) $(SBINDIR)/sendfax ++ # ++ # data files + directories ++ # ++@@ -649,7 +658,8 @@ ++ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ ++ cd compat ; \ ++ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ ++- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ +++ $(INSTALL) -m 755 mg.echo $(BINDIR) && \ +++ $(STRIP) $(BINDIR)/mg.echo ; \ ++ fi ++ ++ # ++--- a/g3/Makefile +++++ b/g3/Makefile ++@@ -37,7 +37,8 @@ ++ # install programs ++ # ++ for f in $(G3_PROGRAMS) ; do \ ++- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ +++ $(INSTALL) -m 755 $$f $(BINDIR) ; \ +++ $(STRIP) $(BINDIR)/$$f ; \ ++ done ++ # ++ # make symlink for "g3topbm" (so third-party fax viewers won't fail) ++--- a/logfile.c +++++ b/logfile.c ++@@ -327,12 +327,11 @@ ++ } ++ else /* ERROR or FATAL */ ++ { ++- fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s", +++ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d", ++ tm->tm_mon+1, tm->tm_mday, ++ tm->tm_hour, tm->tm_min, tm->tm_sec, ++ log_infix, ws, ++- ( errnr <= sys_nerr ) ? sys_errlist[errnr]: ++- "" ); +++ errnr ); ++ #ifdef SYSLOG ++ syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); ++ #endif +diff --git a/feeds/packages/utils/mgetty/patches/001-mgetty.patch b/feeds/packages/utils/mgetty/patches/001-mgetty.patch +new file mode 100644 +index 0000000..427fe9c +--- /dev/null ++++ b/feeds/packages/utils/mgetty/patches/001-mgetty.patch +@@ -0,0 +1,88 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -164,7 +164,9 @@ ++ # ++ # if your systems doesn't have one, use the shell script that I provide ++ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 ++-INSTALL=install -c -o bin -g bin +++STRIP=$(STAGING_DIR)sstrip +++INSTALL=install -c -o root -g root +++#INSTALL=install -c -o bin -g bin ++ #INSTALL=install -c -o root -g wheel # NeXT/BSD ++ #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x ++ #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2 ++@@ -216,7 +218,7 @@ ++ # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER ++ # MUST NOT BE root or any other privileged account). ++ # ++-FAX_OUT_USER=fax +++FAX_OUT_USER=root ++ # ++ # ++ # Where section 1 manual pages should be placed ++@@ -421,7 +423,12 @@ ++ ./mksed >sedscript ++ chmod +x sedscript ++ ++-mksed: mksed.c policy.h Makefile +++REALGCC:=/usr/bin/gcc +++mksed: mksed.c policy.h Makefile +++ ( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\ +++ ); +++ +++mksed-wrong: mksed.c policy.h Makefile ++ $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \ ++ -DLIBDIR=\"$(LIBDIR)\" \ ++ -DCONFDIR=\"$(CONFDIR)\" \ ++@@ -586,8 +593,10 @@ ++ -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) ++ -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ++ -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ++- $(INSTALL) -s -m 700 mgetty $(SBINDIR) ++- $(INSTALL) -s -m 755 sendfax $(SBINDIR) +++ $(INSTALL) -m 700 mgetty $(SBINDIR) +++ $(STRIP) $(SBINDIR)/mgetty +++ $(INSTALL) -m 755 sendfax $(SBINDIR) +++ $(STRIP) $(SBINDIR)/sendfax ++ # ++ # data files + directories ++ # ++@@ -649,7 +658,8 @@ ++ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ ++ cd compat ; \ ++ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ ++- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ +++ $(INSTALL) -m 755 mg.echo $(BINDIR) && \ +++ $(STRIP) $(BINDIR)/mg.echo ; \ ++ fi ++ ++ # ++--- a/g3/Makefile +++++ b/g3/Makefile ++@@ -37,7 +37,8 @@ ++ # install programs ++ # ++ for f in $(G3_PROGRAMS) ; do \ ++- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ +++ $(INSTALL) -m 755 $$f $(BINDIR) ; \ +++ $(STRIP) $(BINDIR)/$$f ; \ ++ done ++ # ++ # make symlink for "g3topbm" (so third-party fax viewers won't fail) ++--- a/logfile.c +++++ b/logfile.c ++@@ -327,12 +327,11 @@ ++ } ++ else /* ERROR or FATAL */ ++ { ++- fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s", +++ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d", ++ tm->tm_mon+1, tm->tm_mday, ++ tm->tm_hour, tm->tm_min, tm->tm_sec, ++ log_infix, ws, ++- ( errnr <= sys_nerr ) ? sys_errlist[errnr]: ++- "" ); +++ errnr ); ++ #ifdef SYSLOG ++ syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); ++ #endif +diff --git a/feeds/packages/utils/microcom/.svn/entries b/feeds/packages/utils/microcom/.svn/entries +new file mode 100644 +index 0000000..8784f05 +--- /dev/null ++++ b/feeds/packages/utils/microcom/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/microcom ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-06-21T21:55:06.114699Z ++21861 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++fc9e17d0993498c79850407adaa77a66 ++2010-06-21T21:55:06.114699Z ++21861 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1059 ++ +diff --git a/feeds/packages/utils/microcom/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/microcom/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/microcom/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/microcom/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/microcom/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6315cfa +--- /dev/null ++++ b/feeds/packages/utils/microcom/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,47 @@ ++# ++# 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:=microcom ++PKG_VERSION:=1.02 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=m102.tar.gz ++PKG_SOURCE_URL:=http://microcom.port5.com/ ++PKG_MD5SUM:=c7817035dc41cb02e7cfb565cf9b7401 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK:=zcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) ++ ++define Package/microcom ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A serial terminal emulation program ++ URL:=http://microcomlinux.homestead.com/ ++ SUBMENU:=Terminal ++endef ++ ++define Package/microcom/description ++ microcom is a minicom-like serial terminal emulator with scripting ++ support. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ microcom ++endef ++ ++define Package/microcom/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/microcom $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,microcom)) +diff --git a/feeds/packages/utils/microcom/Makefile b/feeds/packages/utils/microcom/Makefile +new file mode 100644 +index 0000000..6315cfa +--- /dev/null ++++ b/feeds/packages/utils/microcom/Makefile +@@ -0,0 +1,47 @@ ++# ++# 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:=microcom ++PKG_VERSION:=1.02 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=m102.tar.gz ++PKG_SOURCE_URL:=http://microcom.port5.com/ ++PKG_MD5SUM:=c7817035dc41cb02e7cfb565cf9b7401 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK:=zcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) ++ ++define Package/microcom ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A serial terminal emulation program ++ URL:=http://microcomlinux.homestead.com/ ++ SUBMENU:=Terminal ++endef ++ ++define Package/microcom/description ++ microcom is a minicom-like serial terminal emulator with scripting ++ support. ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ microcom ++endef ++ ++define Package/microcom/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/microcom $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,microcom)) +diff --git a/feeds/packages/utils/microcom/patches/.svn/entries b/feeds/packages/utils/microcom/patches/.svn/entries +new file mode 100644 +index 0000000..59882be +--- /dev/null ++++ b/feeds/packages/utils/microcom/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/microcom/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++b99887fe483bdaf73183639f4711a7dd ++2007-03-05T01:34:12.253968Z ++6526 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++968 ++ +diff --git a/feeds/packages/utils/microcom/patches/.svn/prop-base/001-cross_compile.patch.svn-base b/feeds/packages/utils/microcom/patches/.svn/prop-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/microcom/patches/.svn/prop-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/microcom/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/utils/microcom/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..f6e44a8 +--- /dev/null ++++ b/feeds/packages/utils/microcom/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,29 @@ ++diff -ruN microcom-1.02-old/Makefile microcom-1.02-new/Makefile ++--- microcom-1.02-old/Makefile 2006-10-29 21:55:45.000000000 +0100 +++++ microcom-1.02-new/Makefile 2006-10-29 22:00:09.000000000 +0100 ++@@ -19,19 +19,19 @@ ++ #** Rev. 0.91 - Jan. 2000 - minor fixes, compiled under Mandrake 6.0 ++ #****************************************************************************/ ++ microcom: microcom.o mux.o script.o help.o autodet.o ++- gcc -o microcom microcom.o mux.o script.o help.o autodet.o +++ $(CC) -o microcom microcom.o mux.o script.o help.o autodet.o ++ ++ autodet.o: autodet.c microcom.h ++- gcc -O -c autodet.c +++ $(CC) $(CFLAGS) -c autodet.c ++ ++ script.o: script.c script.h microcom.h ++- gcc -O -c script.c +++ $(CC) $(CFLAGS) -c script.c ++ ++ mux.o: mux.c microcom.h ++- gcc -O -c mux.c +++ $(CC) $(CFLAGS) -c mux.c ++ ++ microcom.o: microcom.c microcom.h ++- gcc -O -c microcom.c +++ $(CC) $(CFLAGS) -c microcom.c ++ ++ help.o: help.c microcom.h ++- gcc -O -c help.c +++ $(CC) $(CFLAGS) -c help.c +diff --git a/feeds/packages/utils/microcom/patches/001-cross_compile.patch b/feeds/packages/utils/microcom/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..f6e44a8 +--- /dev/null ++++ b/feeds/packages/utils/microcom/patches/001-cross_compile.patch +@@ -0,0 +1,29 @@ ++diff -ruN microcom-1.02-old/Makefile microcom-1.02-new/Makefile ++--- microcom-1.02-old/Makefile 2006-10-29 21:55:45.000000000 +0100 +++++ microcom-1.02-new/Makefile 2006-10-29 22:00:09.000000000 +0100 ++@@ -19,19 +19,19 @@ ++ #** Rev. 0.91 - Jan. 2000 - minor fixes, compiled under Mandrake 6.0 ++ #****************************************************************************/ ++ microcom: microcom.o mux.o script.o help.o autodet.o ++- gcc -o microcom microcom.o mux.o script.o help.o autodet.o +++ $(CC) -o microcom microcom.o mux.o script.o help.o autodet.o ++ ++ autodet.o: autodet.c microcom.h ++- gcc -O -c autodet.c +++ $(CC) $(CFLAGS) -c autodet.c ++ ++ script.o: script.c script.h microcom.h ++- gcc -O -c script.c +++ $(CC) $(CFLAGS) -c script.c ++ ++ mux.o: mux.c microcom.h ++- gcc -O -c mux.c +++ $(CC) $(CFLAGS) -c mux.c ++ ++ microcom.o: microcom.c microcom.h ++- gcc -O -c microcom.c +++ $(CC) $(CFLAGS) -c microcom.c ++ ++ help.o: help.c microcom.h ++- gcc -O -c help.c +++ $(CC) $(CFLAGS) -c help.c +diff --git a/feeds/packages/utils/minicom/.svn/entries b/feeds/packages/utils/minicom/.svn/entries +new file mode 100644 +index 0000000..9ce9936 +--- /dev/null ++++ b/feeds/packages/utils/minicom/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/minicom ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++18c1ef4cb26d339ad63b794cf5633c8f ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++875 ++ +diff --git a/feeds/packages/utils/minicom/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/minicom/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..cf8f4df +--- /dev/null ++++ b/feeds/packages/utils/minicom/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2006-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/minicom/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/minicom/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..104e477 +--- /dev/null ++++ b/feeds/packages/utils/minicom/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,37 @@ ++# ++# 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:=minicom ++PKG_VERSION:=2.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://alioth.debian.org/download.php/2332/ ++PKG_MD5SUM:=0ebe7a91898384ca906787cc4e2c3f25 ++ ++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/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/feeds/packages/utils/minicom/Makefile b/feeds/packages/utils/minicom/Makefile +new file mode 100644 +index 0000000..104e477 +--- /dev/null ++++ b/feeds/packages/utils/minicom/Makefile +@@ -0,0 +1,37 @@ ++# ++# 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:=minicom ++PKG_VERSION:=2.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://alioth.debian.org/download.php/2332/ ++PKG_MD5SUM:=0ebe7a91898384ca906787cc4e2c3f25 ++ ++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/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/feeds/packages/utils/minicom/patches/.svn/entries b/feeds/packages/utils/minicom/patches/.svn/entries +new file mode 100644 +index 0000000..3335094 +--- /dev/null ++++ b/feeds/packages/utils/minicom/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/minicom/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-15T09:52:20.403188Z ++24600 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-resolve-getline-conflict.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++5799095373b0b1fd10108af6e6994004 ++2010-12-15T09:52:20.403188Z ++24600 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3995 ++ +diff --git a/feeds/packages/utils/minicom/patches/.svn/text-base/010-resolve-getline-conflict.patch.svn-base b/feeds/packages/utils/minicom/patches/.svn/text-base/010-resolve-getline-conflict.patch.svn-base +new file mode 100644 +index 0000000..041353d +--- /dev/null ++++ b/feeds/packages/utils/minicom/patches/.svn/text-base/010-resolve-getline-conflict.patch.svn-base +@@ -0,0 +1,111 @@ ++--- a/src/minicom.c +++++ b/src/minicom.c ++@@ -167,7 +167,7 @@ static void shjump(int sig) ++ #endif /*SIGTSTP*/ ++ ++ /* Get a line from either window or scroll back buffer. */ ++-static ELM *getline(WIN *w, int no) +++static ELM *mc_getline(WIN *w, int no) ++ { ++ int i; ++ static ELM outofrange[MAXCOLS] = {{0,0,0}}; ++@@ -205,7 +205,7 @@ static void drawhist(WIN *w, int y, int ++ ++ w->direct = 0; ++ for (f = 0; f < w->ys; f++) ++- mc_wdrawelm(w, f, getline(w, y++)); +++ mc_wdrawelm(w, f, mc_getline(w, y++)); ++ if (r) ++ mc_wredraw(w, 1); ++ w->direct = 1; ++@@ -227,7 +227,7 @@ void drawhist_look(WIN *w, int y, int r, ++ tmp_line[0]='\0'; ++ w->direct = 0; ++ for (f = 0; f < w->ys; f++) { ++- tmp_e = getline(w, y++); +++ tmp_e = mc_getline(w, y++); ++ ++ /* First we "accumulate" the line into a variable */ ++ mc_wdrawelm_var(w, tmp_e, tmp_line); ++@@ -324,7 +324,7 @@ int find_next(WIN *w, WIN *w_hist, ++ ++ for (next_line = hit_line; next_line <= all_lines; next_line++) { ++ /* we do 'something' here... :-) */ ++- tmp_e = getline(w_hist, next_line); +++ tmp_e = mc_getline(w_hist, next_line); ++ ++ /* ++ * First we "accumulate" the line into a variable. ++@@ -379,9 +379,9 @@ wchar_t *StrStr(wchar_t *str1, wchar_t * ++ static void drawcite(WIN *w, int y, int citey, int start, int end) ++ { ++ if (y+citey >= start && y+citey <= end) ++- mc_wdrawelm_inverse(w, y, getline(w, y+citey)); +++ mc_wdrawelm_inverse(w, y, mc_getline(w, y+citey)); ++ else ++- mc_wdrawelm(w, y, getline(w, y+citey)); +++ mc_wdrawelm(w, y, mc_getline(w, y+citey)); ++ } ++ ++ static void drawcite_whole(WIN *w, int y, int start, int end) ++@@ -400,7 +400,7 @@ static void do_cite(WIN *w, int start, i ++ for (y=start; y<=end; y++) { ++ vt_send('>'); ++ vt_send(' '); ++- tmp_e = getline(w, y); +++ tmp_e = mc_getline(w, y); ++ mc_wdrawelm_var(w, tmp_e, tmp_line); ++ tmp_line[w->xs] = 0; ++ for (x = w->xs-1; x >= 0; x--) { ++@@ -600,7 +600,7 @@ static void scrollback(void) ++ if (citemode) { ++ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); ++ } else { ++- tmp_e = getline(b_us, y); +++ tmp_e = mc_getline(b_us, y); ++ if (wcslen(look_for) > 1) { ++ /* quick scan for pattern match */ ++ mc_wdrawelm_var(b_us, tmp_e, tmp_line); ++@@ -611,9 +611,9 @@ static void scrollback(void) ++ } ++ ++ if (inverse) ++- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y)); +++ mc_wdrawelm_inverse(b_us, 0, mc_getline(b_us, y)); ++ else ++- mc_wdrawelm(b_us, 0, getline(b_us, y)); +++ mc_wdrawelm(b_us, 0, mc_getline(b_us, y)); ++ if (citemode) ++ mc_wlocate(b_us, 0, cite_y); ++ mc_wflush(); ++@@ -648,7 +648,7 @@ static void scrollback(void) ++ if (citemode) { ++ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); ++ } else { ++- tmp_e = getline(b_us, y + b_us->ys - 1); +++ tmp_e = mc_getline(b_us, y + b_us->ys - 1); ++ if (wcslen(look_for) > 1) { ++ /* quick scan for pattern match */ ++ mc_wdrawelm_var(b_us, tmp_e, tmp_line); ++@@ -660,10 +660,10 @@ static void scrollback(void) ++ ++ if (inverse) ++ mc_wdrawelm_inverse(b_us, b_us->ys - 1, ++- getline(b_us, y + b_us->ys - 1)); +++ mc_getline(b_us, y + b_us->ys - 1)); ++ else ++ mc_wdrawelm(b_us, b_us->ys - 1, ++- getline(b_us, y + b_us->ys - 1)); +++ mc_getline(b_us, y + b_us->ys - 1)); ++ if (citemode) ++ mc_wlocate(b_us, 0, cite_y); ++ mc_wflush(); ++@@ -753,7 +753,7 @@ static void scrollback(void) ++ mc_wlocate(b_st, 0, 0); ++ mc_wprintf(b_st, hline); ++ mc_wredraw(b_st, 1); ++- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart)); +++ mc_wdrawelm_inverse(b_us, cite_y, mc_getline(b_us, cite_ystart)); ++ mc_wlocate(b_us, 0, cite_y); ++ break; ++ case K_ESC: +diff --git a/feeds/packages/utils/minicom/patches/010-resolve-getline-conflict.patch b/feeds/packages/utils/minicom/patches/010-resolve-getline-conflict.patch +new file mode 100644 +index 0000000..041353d +--- /dev/null ++++ b/feeds/packages/utils/minicom/patches/010-resolve-getline-conflict.patch +@@ -0,0 +1,111 @@ ++--- a/src/minicom.c +++++ b/src/minicom.c ++@@ -167,7 +167,7 @@ static void shjump(int sig) ++ #endif /*SIGTSTP*/ ++ ++ /* Get a line from either window or scroll back buffer. */ ++-static ELM *getline(WIN *w, int no) +++static ELM *mc_getline(WIN *w, int no) ++ { ++ int i; ++ static ELM outofrange[MAXCOLS] = {{0,0,0}}; ++@@ -205,7 +205,7 @@ static void drawhist(WIN *w, int y, int ++ ++ w->direct = 0; ++ for (f = 0; f < w->ys; f++) ++- mc_wdrawelm(w, f, getline(w, y++)); +++ mc_wdrawelm(w, f, mc_getline(w, y++)); ++ if (r) ++ mc_wredraw(w, 1); ++ w->direct = 1; ++@@ -227,7 +227,7 @@ void drawhist_look(WIN *w, int y, int r, ++ tmp_line[0]='\0'; ++ w->direct = 0; ++ for (f = 0; f < w->ys; f++) { ++- tmp_e = getline(w, y++); +++ tmp_e = mc_getline(w, y++); ++ ++ /* First we "accumulate" the line into a variable */ ++ mc_wdrawelm_var(w, tmp_e, tmp_line); ++@@ -324,7 +324,7 @@ int find_next(WIN *w, WIN *w_hist, ++ ++ for (next_line = hit_line; next_line <= all_lines; next_line++) { ++ /* we do 'something' here... :-) */ ++- tmp_e = getline(w_hist, next_line); +++ tmp_e = mc_getline(w_hist, next_line); ++ ++ /* ++ * First we "accumulate" the line into a variable. ++@@ -379,9 +379,9 @@ wchar_t *StrStr(wchar_t *str1, wchar_t * ++ static void drawcite(WIN *w, int y, int citey, int start, int end) ++ { ++ if (y+citey >= start && y+citey <= end) ++- mc_wdrawelm_inverse(w, y, getline(w, y+citey)); +++ mc_wdrawelm_inverse(w, y, mc_getline(w, y+citey)); ++ else ++- mc_wdrawelm(w, y, getline(w, y+citey)); +++ mc_wdrawelm(w, y, mc_getline(w, y+citey)); ++ } ++ ++ static void drawcite_whole(WIN *w, int y, int start, int end) ++@@ -400,7 +400,7 @@ static void do_cite(WIN *w, int start, i ++ for (y=start; y<=end; y++) { ++ vt_send('>'); ++ vt_send(' '); ++- tmp_e = getline(w, y); +++ tmp_e = mc_getline(w, y); ++ mc_wdrawelm_var(w, tmp_e, tmp_line); ++ tmp_line[w->xs] = 0; ++ for (x = w->xs-1; x >= 0; x--) { ++@@ -600,7 +600,7 @@ static void scrollback(void) ++ if (citemode) { ++ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); ++ } else { ++- tmp_e = getline(b_us, y); +++ tmp_e = mc_getline(b_us, y); ++ if (wcslen(look_for) > 1) { ++ /* quick scan for pattern match */ ++ mc_wdrawelm_var(b_us, tmp_e, tmp_line); ++@@ -611,9 +611,9 @@ static void scrollback(void) ++ } ++ ++ if (inverse) ++- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y)); +++ mc_wdrawelm_inverse(b_us, 0, mc_getline(b_us, y)); ++ else ++- mc_wdrawelm(b_us, 0, getline(b_us, y)); +++ mc_wdrawelm(b_us, 0, mc_getline(b_us, y)); ++ if (citemode) ++ mc_wlocate(b_us, 0, cite_y); ++ mc_wflush(); ++@@ -648,7 +648,7 @@ static void scrollback(void) ++ if (citemode) { ++ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); ++ } else { ++- tmp_e = getline(b_us, y + b_us->ys - 1); +++ tmp_e = mc_getline(b_us, y + b_us->ys - 1); ++ if (wcslen(look_for) > 1) { ++ /* quick scan for pattern match */ ++ mc_wdrawelm_var(b_us, tmp_e, tmp_line); ++@@ -660,10 +660,10 @@ static void scrollback(void) ++ ++ if (inverse) ++ mc_wdrawelm_inverse(b_us, b_us->ys - 1, ++- getline(b_us, y + b_us->ys - 1)); +++ mc_getline(b_us, y + b_us->ys - 1)); ++ else ++ mc_wdrawelm(b_us, b_us->ys - 1, ++- getline(b_us, y + b_us->ys - 1)); +++ mc_getline(b_us, y + b_us->ys - 1)); ++ if (citemode) ++ mc_wlocate(b_us, 0, cite_y); ++ mc_wflush(); ++@@ -753,7 +753,7 @@ static void scrollback(void) ++ mc_wlocate(b_st, 0, 0); ++ mc_wprintf(b_st, hline); ++ mc_wredraw(b_st, 1); ++- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart)); +++ mc_wdrawelm_inverse(b_us, cite_y, mc_getline(b_us, cite_ystart)); ++ mc_wlocate(b_us, 0, cite_y); ++ break; ++ case K_ESC: +diff --git a/feeds/packages/utils/mksh/.svn/entries b/feeds/packages/utils/mksh/.svn/entries +new file mode 100644 +index 0000000..fb179f0 +--- /dev/null ++++ b/feeds/packages/utils/mksh/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mksh ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:08.714071Z ++34632 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++36c68b9d3b52629e7d786d157f29268a ++2012-12-11T16:58:08.714071Z ++34632 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2552 ++ +diff --git a/feeds/packages/utils/mksh/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/mksh/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..27a2801 +--- /dev/null ++++ b/feeds/packages/utils/mksh/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,81 @@ ++# ++# Copyright (C) 2007-2011 OpenWrt.org ++# Copyright (c) 2009 Thorsten Glaser ++# ++# 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:=40d ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).cpio.gz ++PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh ++PKG_MD5SUM:=c6428401103367730a95b99284bf47dc ++ ++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 R40d corresponds to OpenBSD 5.0-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) ++ # HAVE_CAN_FSTACKPROTECTORALL=0 ⇒ nuke libssp dependency ++ cd $(PKG_BUILD_DIR); \ ++ CC="$(TARGET_CC)" \ ++ TARGET_OS="$(shell uname -s)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_GCC565048=1" \ ++ HAVE_CAN_FSTACKPROTECTORALL=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/feeds/packages/utils/mksh/Makefile b/feeds/packages/utils/mksh/Makefile +new file mode 100644 +index 0000000..27a2801 +--- /dev/null ++++ b/feeds/packages/utils/mksh/Makefile +@@ -0,0 +1,81 @@ ++# ++# Copyright (C) 2007-2011 OpenWrt.org ++# Copyright (c) 2009 Thorsten Glaser ++# ++# 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:=40d ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).cpio.gz ++PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh ++PKG_MD5SUM:=c6428401103367730a95b99284bf47dc ++ ++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 R40d corresponds to OpenBSD 5.0-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) ++ # HAVE_CAN_FSTACKPROTECTORALL=0 ⇒ nuke libssp dependency ++ cd $(PKG_BUILD_DIR); \ ++ CC="$(TARGET_CC)" \ ++ TARGET_OS="$(shell uname -s)" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_GCC565048=1" \ ++ HAVE_CAN_FSTACKPROTECTORALL=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/feeds/packages/utils/mksh/patches/.svn/entries b/feeds/packages/utils/mksh/patches/.svn/entries +new file mode 100644 +index 0000000..00ce6ce +--- /dev/null ++++ b/feeds/packages/utils/mksh/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mksh/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-11T16:58:08.714071Z ++34632 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-debian_build_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8f95f5781fffff482876c9207d9dd2e3 ++2012-12-11T16:58:08.714071Z ++34632 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++865 ++ ++100-dot_mkshrc ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0cd4fc1ee8f277211593df94fe8c5fdf ++2012-04-04T14:13:46.134680Z ++31186 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1272 ++ +diff --git a/feeds/packages/utils/mksh/patches/.svn/text-base/000-debian_build_fix.patch.svn-base b/feeds/packages/utils/mksh/patches/.svn/text-base/000-debian_build_fix.patch.svn-base +new file mode 100644 +index 0000000..b64fe71 +--- /dev/null ++++ b/feeds/packages/utils/mksh/patches/.svn/text-base/000-debian_build_fix.patch.svn-base +@@ -0,0 +1,18 @@ ++This patch is a backport of the fix proposed at: ++https://bugs.launchpad.net/ubuntu/+source/mksh/+bug/1058035 ++ ++diff -urN mksh/Build.sh mksh.new/Build.sh ++--- mksh/Build.sh 2012-12-11 14:28:56.632807230 +0100 +++++ mksh.new/Build.sh 2012-12-11 14:35:23.704817141 +0100 ++@@ -1530,9 +1530,11 @@ ++ /* but the next three are; we REQUIRE signed integer wraparound */ ++ cta(ari_is_signed, (mksh_ari_t)-1 < (mksh_ari_t)0); ++ cta(ari_has_31_bit, 0 < (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 1)); +++#if !defined(MKSH_GCC565048) ++ cta(ari_sign_32_bit_and_wrap, ++ (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 1) > ++ (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 2)); +++#endif ++ /* the next assertion is probably not really needed */ ++ cta(uari_is_4_char, sizeof(mksh_uari_t) == 4); ++ /* but the next four are; we REQUIRE unsigned integer wraparound */ +diff --git a/feeds/packages/utils/mksh/patches/.svn/text-base/100-dot_mkshrc.svn-base b/feeds/packages/utils/mksh/patches/.svn/text-base/100-dot_mkshrc.svn-base +new file mode 100644 +index 0000000..f326ae7 +--- /dev/null ++++ b/feeds/packages/utils/mksh/patches/.svn/text-base/100-dot_mkshrc.svn-base +@@ -0,0 +1,38 @@ ++$Id$ ++ ++ • 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 ++ ++--- a/dot.mkshrc Sat Nov 26 18:15:38 2011 +++++ b/dot.mkshrc Sun Dec 11 21:31:27 2011 ++@@ -21,7 +21,7 @@ ++ #- ++ # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells ++ ++-: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} +++: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(&-) ++ : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi ++ function precmd { ++@@ -40,7 +40,7 @@ unalias ls ++ alias l='ls -F' ++ alias la='l -a' ++ alias ll='l -l' ++-alias lo='l -alo' +++alias lo='l -al' ++ whence -p rot13 >&- || alias rot13='tr \ ++ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \ ++ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM' ++@@ -365,5 +365,9 @@ alias cls='print -n \\033c' ++ #export LANG=C LC_CTYPE=$p LC_MEASUREMENT=$p LC_MESSAGES=$p LC_PAPER=$p ++ ++ 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 +diff --git a/feeds/packages/utils/mksh/patches/000-debian_build_fix.patch b/feeds/packages/utils/mksh/patches/000-debian_build_fix.patch +new file mode 100644 +index 0000000..b64fe71 +--- /dev/null ++++ b/feeds/packages/utils/mksh/patches/000-debian_build_fix.patch +@@ -0,0 +1,18 @@ ++This patch is a backport of the fix proposed at: ++https://bugs.launchpad.net/ubuntu/+source/mksh/+bug/1058035 ++ ++diff -urN mksh/Build.sh mksh.new/Build.sh ++--- mksh/Build.sh 2012-12-11 14:28:56.632807230 +0100 +++++ mksh.new/Build.sh 2012-12-11 14:35:23.704817141 +0100 ++@@ -1530,9 +1530,11 @@ ++ /* but the next three are; we REQUIRE signed integer wraparound */ ++ cta(ari_is_signed, (mksh_ari_t)-1 < (mksh_ari_t)0); ++ cta(ari_has_31_bit, 0 < (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 1)); +++#if !defined(MKSH_GCC565048) ++ cta(ari_sign_32_bit_and_wrap, ++ (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 1) > ++ (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 2)); +++#endif ++ /* the next assertion is probably not really needed */ ++ cta(uari_is_4_char, sizeof(mksh_uari_t) == 4); ++ /* but the next four are; we REQUIRE unsigned integer wraparound */ +diff --git a/feeds/packages/utils/mksh/patches/100-dot_mkshrc b/feeds/packages/utils/mksh/patches/100-dot_mkshrc +new file mode 100644 +index 0000000..f326ae7 +--- /dev/null ++++ b/feeds/packages/utils/mksh/patches/100-dot_mkshrc +@@ -0,0 +1,38 @@ ++$Id$ ++ ++ • 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 ++ ++--- a/dot.mkshrc Sat Nov 26 18:15:38 2011 +++++ b/dot.mkshrc Sun Dec 11 21:31:27 2011 ++@@ -21,7 +21,7 @@ ++ #- ++ # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells ++ ++-: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} +++: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(&-) ++ : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi ++ function precmd { ++@@ -40,7 +40,7 @@ unalias ls ++ alias l='ls -F' ++ alias la='l -a' ++ alias ll='l -l' ++-alias lo='l -alo' +++alias lo='l -al' ++ whence -p rot13 >&- || alias rot13='tr \ ++ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \ ++ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM' ++@@ -365,5 +365,9 @@ alias cls='print -n \\033c' ++ #export LANG=C LC_CTYPE=$p LC_MEASUREMENT=$p LC_MESSAGES=$p LC_PAPER=$p ++ ++ 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 +diff --git a/feeds/packages/utils/msr-tools/.svn/entries b/feeds/packages/utils/msr-tools/.svn/entries +new file mode 100644 +index 0000000..9301f38 +--- /dev/null ++++ b/feeds/packages/utils/msr-tools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/msr-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-12-29T20:10:31.036397Z ++29618 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f8ebfecf0031e758343d8486530c49c6 ++2011-12-29T20:10:31.036397Z ++29618 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1256 ++ +diff --git a/feeds/packages/utils/msr-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/msr-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5be0fd0 +--- /dev/null ++++ b/feeds/packages/utils/msr-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# 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:=msr-tools ++PKG_VERSION:=1.1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/utils/cpu/msr-tools ++PKG_MD5SUM:=2452d2233556aa0fb8b53208361a2c94 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++ ++define Package/msr-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:= ++ TITLE:=x86 MSR utilities. ++ URL:=http://www.kernel.org/pub/linux/utils/cpu/msr-tools ++ SUBMENU:=CPU tools ++endef ++ ++define Package/msr-tools/description ++ Manipulate the MSR (machine state registers) on i386 and x86_64 ++ processors. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(INSTALL_DIR) "$(PKG_INSTALL_DIR)/usr/sbin" ++ $(MAKE) -C $(PKG_BUILD_DIR) all \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ sbindir="$(PKG_INSTALL_DIR)/usr/sbin" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LDFLAGS="" \ ++ install ++endef ++ ++define Package/msr-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,msr-tools)) +diff --git a/feeds/packages/utils/msr-tools/Makefile b/feeds/packages/utils/msr-tools/Makefile +new file mode 100644 +index 0000000..5be0fd0 +--- /dev/null ++++ b/feeds/packages/utils/msr-tools/Makefile +@@ -0,0 +1,54 @@ ++# ++# 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:=msr-tools ++PKG_VERSION:=1.1.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/utils/cpu/msr-tools ++PKG_MD5SUM:=2452d2233556aa0fb8b53208361a2c94 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TARGET_CFLAGS += -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++ ++define Package/msr-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:= ++ TITLE:=x86 MSR utilities. ++ URL:=http://www.kernel.org/pub/linux/utils/cpu/msr-tools ++ SUBMENU:=CPU tools ++endef ++ ++define Package/msr-tools/description ++ Manipulate the MSR (machine state registers) on i386 and x86_64 ++ processors. ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(INSTALL_DIR) "$(PKG_INSTALL_DIR)/usr/sbin" ++ $(MAKE) -C $(PKG_BUILD_DIR) all \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ sbindir="$(PKG_INSTALL_DIR)/usr/sbin" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ LDFLAGS="" \ ++ install ++endef ++ ++define Package/msr-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,msr-tools)) +diff --git a/feeds/packages/utils/msr-tools/patches/.svn/entries b/feeds/packages/utils/msr-tools/patches/.svn/entries +new file mode 100644 +index 0000000..cc7fe17 +--- /dev/null ++++ b/feeds/packages/utils/msr-tools/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/msr-tools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-12-29T20:10:31.036397Z ++29618 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-multiprocessor.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++490d8d8eac3c54a29bb5fc179d06f86e ++2011-12-29T20:10:31.036397Z ++29618 ++dingo ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++886 ++ +diff --git a/feeds/packages/utils/msr-tools/patches/.svn/text-base/100-multiprocessor.patch.svn-base b/feeds/packages/utils/msr-tools/patches/.svn/text-base/100-multiprocessor.patch.svn-base +new file mode 100644 +index 0000000..8795b8b +--- /dev/null ++++ b/feeds/packages/utils/msr-tools/patches/.svn/text-base/100-multiprocessor.patch.svn-base +@@ -0,0 +1,28 @@ ++--- msr-tools-1.1.2/wrmsr.c.orig 2004-07-20 09:54:59.000000000 -0600 +++++ msr-tools-1.1.2/wrmsr.c 2011-12-27 14:07:24.505887313 -0700 ++@@ -90,7 +90,11 @@ int main(int argc, char *argv[]) ++ ++ reg = strtoul(argv[optind++], NULL, 0); ++ +++#ifdef SMP ++ sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu); +++#else +++ sprintf(msr_file_name, "/dev/msr%d", cpu); +++#endif ++ fd = open(msr_file_name, O_WRONLY); ++ if ( fd < 0 ) { ++ if ( errno == ENXIO ) { ++--- msr-tools-1.1.2/rdmsr.c.orig 2004-07-20 09:54:59.000000000 -0600 +++++ msr-tools-1.1.2/rdmsr.c 2011-12-27 14:06:37.831584784 -0700 ++@@ -167,7 +167,11 @@ int main(int argc, char *argv[]) ++ ++ reg = strtoul(argv[optind], NULL, 0); ++ +++#ifdef SMP ++ sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu); +++#else +++ sprintf(msr_file_name, "/dev/msr%d", cpu); +++#endif ++ fd = open(msr_file_name, O_RDONLY); ++ if ( fd < 0 ) { ++ if ( errno == ENXIO ) { +diff --git a/feeds/packages/utils/msr-tools/patches/100-multiprocessor.patch b/feeds/packages/utils/msr-tools/patches/100-multiprocessor.patch +new file mode 100644 +index 0000000..8795b8b +--- /dev/null ++++ b/feeds/packages/utils/msr-tools/patches/100-multiprocessor.patch +@@ -0,0 +1,28 @@ ++--- msr-tools-1.1.2/wrmsr.c.orig 2004-07-20 09:54:59.000000000 -0600 +++++ msr-tools-1.1.2/wrmsr.c 2011-12-27 14:07:24.505887313 -0700 ++@@ -90,7 +90,11 @@ int main(int argc, char *argv[]) ++ ++ reg = strtoul(argv[optind++], NULL, 0); ++ +++#ifdef SMP ++ sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu); +++#else +++ sprintf(msr_file_name, "/dev/msr%d", cpu); +++#endif ++ fd = open(msr_file_name, O_WRONLY); ++ if ( fd < 0 ) { ++ if ( errno == ENXIO ) { ++--- msr-tools-1.1.2/rdmsr.c.orig 2004-07-20 09:54:59.000000000 -0600 +++++ msr-tools-1.1.2/rdmsr.c 2011-12-27 14:06:37.831584784 -0700 ++@@ -167,7 +167,11 @@ int main(int argc, char *argv[]) ++ ++ reg = strtoul(argv[optind], NULL, 0); ++ +++#ifdef SMP ++ sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu); +++#else +++ sprintf(msr_file_name, "/dev/msr%d", cpu); +++#endif ++ fd = open(msr_file_name, O_RDONLY); ++ if ( fd < 0 ) { ++ if ( errno == ENXIO ) { +diff --git a/feeds/packages/utils/mtd-utils/.svn/entries b/feeds/packages/utils/mtd-utils/.svn/entries +new file mode 100644 +index 0000000..1ed7b76 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mtd-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-04T09:31:55.065348Z ++35004 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++0dd5e0f0665c0cd7f7775269af380d01 ++2013-01-04T09:31:55.065348Z ++35004 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2418 ++ +diff --git a/feeds/packages/utils/mtd-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/mtd-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8fe6d47 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,115 @@ ++# ++# 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:=mtd-utils ++PKG_REV:=5319b84974fcb71504aed2d1b8285e9c0a4a4bb8 ++PKG_VERSION:=1.4.5 ++PKG_RELEASE:=1 ++PKG_INSTALL:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_BUILD_DEPENDS:=util-linux ++ ++include $(INCLUDE_DIR)/package.mk ++ ++FILES:= \ ++ doc_loadbios \ ++ docfdisk \ ++ flash_erase \ ++ flash_eraseall:+mtd-utils-flash-erase \ ++ flash_info \ ++ flash_lock \ ++ flash_otp_dump \ ++ flash_otp_info \ ++ flash_unlock \ ++ flashcp \ ++ ftl_check \ ++ ftl_format \ ++ jffs2dump \ ++ mkfs.jffs2:+zlib \ ++ mkfs.ubifs:+libuuid:+zlib \ ++ mtd_debug \ ++ mtdinfo \ ++ nanddump \ ++ nandtest \ ++ nandwrite \ ++ nftldump \ ++ nftl_format \ ++ recv_image \ ++ rfddump \ ++ rfdformat \ ++ serve_image \ ++ sumtool \ ++ ubiattach \ ++ ubicrc32 \ ++ ubidetach \ ++ ubiformat \ ++ ubimkvol \ ++ ubinfo \ ++ ubinize \ ++ ubirename \ ++ ubirmvol \ ++ ubirsvol \ ++ ubiupdatevol ++ ++define PartGen ++define Package/mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(1)))) ++ TITLE:=$(firstword $(subst :, ,$(1))) package from mtd-utils ++ URL:=http://www.linux-mtd.infradead.org/ ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=mtd-utils $(wordlist 2,$(words $(subst :, ,$(1))),$(subst :, ,$(1))) ++endef ++endef ++ ++define Package/mtd-utils ++ TITLE:=Utilities for flash info/debug ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.linux-mtd.infradead.org/ ++ MENU:=1 ++endef ++ ++define Package/mtd-utils/description ++ Utilities for manipulating memory technology devices. ++endef ++ ++define Package/mtd-utils/install ++ true ++endef ++ ++$(foreach file,$(FILES),$(eval $(call PartGen,$(file)))) ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ BUILDDIR="$(PKG_BUILD_DIR)" \ ++ LDLIBS+="$(LIBGCC_S)" \ ++ WITHOUT_XATTR=1 \ ++ WITHOUT_LZO=1 ++ ++define PartInstall ++define Package/mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(1))))/install ++ $(INSTALL_DIR) \ ++ $$(1)/usr/sbin ++ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/$(firstword $(subst :, ,$(1))) \ ++ $$(1)/usr/sbin/ ++endef ++endef ++ ++$(foreach file,$(FILES),$(eval $(call PartInstall,$(file)))) ++ ++$(eval $(call BuildPackage,mtd-utils)) ++$(foreach file,$(FILES),$(eval $(call BuildPackage,mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(file))))))) +diff --git a/feeds/packages/utils/mtd-utils/Makefile b/feeds/packages/utils/mtd-utils/Makefile +new file mode 100644 +index 0000000..8fe6d47 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/Makefile +@@ -0,0 +1,115 @@ ++# ++# 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:=mtd-utils ++PKG_REV:=5319b84974fcb71504aed2d1b8285e9c0a4a4bb8 ++PKG_VERSION:=1.4.5 ++PKG_RELEASE:=1 ++PKG_INSTALL:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_BUILD_DEPENDS:=util-linux ++ ++include $(INCLUDE_DIR)/package.mk ++ ++FILES:= \ ++ doc_loadbios \ ++ docfdisk \ ++ flash_erase \ ++ flash_eraseall:+mtd-utils-flash-erase \ ++ flash_info \ ++ flash_lock \ ++ flash_otp_dump \ ++ flash_otp_info \ ++ flash_unlock \ ++ flashcp \ ++ ftl_check \ ++ ftl_format \ ++ jffs2dump \ ++ mkfs.jffs2:+zlib \ ++ mkfs.ubifs:+libuuid:+zlib \ ++ mtd_debug \ ++ mtdinfo \ ++ nanddump \ ++ nandtest \ ++ nandwrite \ ++ nftldump \ ++ nftl_format \ ++ recv_image \ ++ rfddump \ ++ rfdformat \ ++ serve_image \ ++ sumtool \ ++ ubiattach \ ++ ubicrc32 \ ++ ubidetach \ ++ ubiformat \ ++ ubimkvol \ ++ ubinfo \ ++ ubinize \ ++ ubirename \ ++ ubirmvol \ ++ ubirsvol \ ++ ubiupdatevol ++ ++define PartGen ++define Package/mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(1)))) ++ TITLE:=$(firstword $(subst :, ,$(1))) package from mtd-utils ++ URL:=http://www.linux-mtd.infradead.org/ ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=mtd-utils $(wordlist 2,$(words $(subst :, ,$(1))),$(subst :, ,$(1))) ++endef ++endef ++ ++define Package/mtd-utils ++ TITLE:=Utilities for flash info/debug ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.linux-mtd.infradead.org/ ++ MENU:=1 ++endef ++ ++define Package/mtd-utils/description ++ Utilities for manipulating memory technology devices. ++endef ++ ++define Package/mtd-utils/install ++ true ++endef ++ ++$(foreach file,$(FILES),$(eval $(call PartGen,$(file)))) ++ ++MAKE_FLAGS += \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ BUILDDIR="$(PKG_BUILD_DIR)" \ ++ LDLIBS+="$(LIBGCC_S)" \ ++ WITHOUT_XATTR=1 \ ++ WITHOUT_LZO=1 ++ ++define PartInstall ++define Package/mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(1))))/install ++ $(INSTALL_DIR) \ ++ $$(1)/usr/sbin ++ ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/$(firstword $(subst :, ,$(1))) \ ++ $$(1)/usr/sbin/ ++endef ++endef ++ ++$(foreach file,$(FILES),$(eval $(call PartInstall,$(file)))) ++ ++$(eval $(call BuildPackage,mtd-utils)) ++$(foreach file,$(FILES),$(eval $(call BuildPackage,mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(file))))))) +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/entries b/feeds/packages/utils/mtd-utils/patches/.svn/entries +new file mode 100644 +index 0000000..b022ccd +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/entries +@@ -0,0 +1,266 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/mtd-utils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++137-mkubifs-allow-to-overwrite-volume-data.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++182bc7ee75034727b35d800223e4905f ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2296 ++ ++100-mtd-debug-add-bad-block-counter.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++4f63da8b9b7db2e6922acee01e1ce887 ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1541 ++ ++131-fix_lib_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++4d0e7dcf8c85164ac2e184ce5cffa6b2 ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++201 ++ ++136-mkubifs-fix-rinoperm-options.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d6808ba632a818b1f98107e443f92dbe ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++860 ++ ++150-fix_ubi-utils_static.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++dd68b1c815f161a3471163a4dfd1c3c1 ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1252 ++ ++130-lzma_jffs2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++24285199b06c7dce6449c3c72710af28 ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++143032 ++ ++135-mkubifs_optional_lzo.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++98313e38b24c0e838dc9a6f12de195ed ++2012-05-27T16:40:32.818294Z ++31913 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2589 ++ +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/100-mtd-debug-add-bad-block-counter.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/100-mtd-debug-add-bad-block-counter.patch.svn-base +new file mode 100644 +index 0000000..dbe6ccc +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/100-mtd-debug-add-bad-block-counter.patch.svn-base +@@ -0,0 +1,73 @@ ++--- a/mtd_debug.c +++++ b/mtd_debug.c ++@@ -238,6 +238,7 @@ int showinfo (int fd) ++ int i,err,n; ++ struct mtd_info_user mtd; ++ static struct region_info_user region[1024]; +++ int iNumOfBadBlocks = 0; ++ ++ err = getmeminfo (fd,&mtd); ++ if (err < 0) ++@@ -330,6 +331,11 @@ int showinfo (int fd) ++ printf ("\nmtd.oobsize = "); ++ printsize (mtd.oobsize); ++ +++ printf ("\nmtd.badblockscount = "); +++ iNumOfBadBlocks = get_bb_number(fd, &mtd); +++ if (iNumOfBadBlocks > -1) +++ printf ("%d", iNumOfBadBlocks); +++ ++ printf ("\n" ++ "regions = %d\n" ++ "\n", ++@@ -349,6 +355,50 @@ int showinfo (int fd) ++ return (0); ++ } ++ +++int get_bb_number(int fd, struct mtd_info_user *meminfo) +++{ +++ int isNAND = (meminfo->type == MTD_NANDFLASH); +++ int ibbCounter = 0; +++ /* Last 4 blocks of any MTD device are protected and +++ MTD reports them as badblocks. */ +++ int usablesize = meminfo->size - (4 * meminfo->erasesize); +++ erase_info_t erase; +++ erase.length = meminfo->erasesize; +++ +++ for (erase.start = 0; +++ erase.start < usablesize; +++ erase.start += meminfo->erasesize) +++ { +++ loff_t offset = erase.start; +++ int ret = ioctl(fd, MEMGETBADBLOCK, &offset); +++ +++ if (ret > 0) +++ { +++ ibbCounter++; +++ continue; +++ } +++ else if (ret < 0) +++ { +++ if (errno == EOPNOTSUPP) +++ { +++ if (isNAND) +++ { +++ printf("Bad block check not available"); +++ return -1; +++ } +++ } +++ else +++ { +++ printf("MTD get bad block failed: %s", +++ strerror(errno)); +++ return -1; +++ } +++ } +++ } +++ +++ return ibbCounter; +++} +++ ++ void showusage(void) ++ { ++ fprintf (stderr, +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/130-lzma_jffs2.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/130-lzma_jffs2.patch.svn-base +new file mode 100644 +index 0000000..9a1c122 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/130-lzma_jffs2.patch.svn-base +@@ -0,0 +1,5031 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -1,7 +1,7 @@ ++ ++ # -*- sh -*- ++ ++-CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) +++CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -I./include/linux/lzma ++ ++ ifeq ($(WITHOUT_XATTR), 1) ++ CPPFLAGS += -DWITHOUT_XATTR ++@@ -50,7 +50,9 @@ $(SYMLINKS): ++ ln -sf ../fs/jffs2/$@ $@ ++ ++ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ ++- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ +++ compr_rtime.o mkfs.jffs2.o compr_zlib.o \ +++ $(if $(WITHOUT_LZO),,compr_lzo.o) \ +++ compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \ ++ compr.o rbtree.o) ++ LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) ++ LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) ++--- a/compr.c +++++ b/compr.c ++@@ -520,6 +520,9 @@ int jffs2_compressors_init(void) ++ #ifdef CONFIG_JFFS2_LZO ++ jffs2_lzo_init(); ++ #endif +++#ifdef CONFIG_JFFS2_LZMA +++ jffs2_lzma_init(); +++#endif ++ return 0; ++ } ++ ++@@ -534,5 +537,8 @@ int jffs2_compressors_exit(void) ++ #ifdef CONFIG_JFFS2_LZO ++ jffs2_lzo_exit(); ++ #endif +++#ifdef CONFIG_JFFS2_LZMA +++ jffs2_lzma_exit(); +++#endif ++ return 0; ++ } ++--- a/compr.h +++++ b/compr.h ++@@ -18,13 +18,14 @@ ++ ++ #define CONFIG_JFFS2_ZLIB ++ #define CONFIG_JFFS2_RTIME ++-#define CONFIG_JFFS2_LZO +++#define CONFIG_JFFS2_LZMA ++ ++ #define JFFS2_RUBINMIPS_PRIORITY 10 ++ #define JFFS2_DYNRUBIN_PRIORITY 20 ++ #define JFFS2_RTIME_PRIORITY 50 ++-#define JFFS2_ZLIB_PRIORITY 60 ++-#define JFFS2_LZO_PRIORITY 80 +++#define JFFS2_LZMA_PRIORITY 70 +++#define JFFS2_ZLIB_PRIORITY 80 +++#define JFFS2_LZO_PRIORITY 90 ++ ++ #define JFFS2_COMPR_MODE_NONE 0 ++ #define JFFS2_COMPR_MODE_PRIORITY 1 ++@@ -115,5 +116,10 @@ void jffs2_rtime_exit(void); ++ int jffs2_lzo_init(void); ++ void jffs2_lzo_exit(void); ++ #endif +++#ifdef CONFIG_JFFS2_LZMA +++int jffs2_lzma_init(void); +++void jffs2_lzma_exit(void); +++#endif +++ ++ ++ #endif /* __JFFS2_COMPR_H__ */ ++--- /dev/null +++++ b/compr_lzma.c ++@@ -0,0 +1,128 @@ +++/* +++ * JFFS2 -- Journalling Flash File System, Version 2. +++ * +++ * For licensing information, see the file 'LICENCE' in this directory. +++ * +++ * JFFS2 wrapper to the LZMA C SDK +++ * +++ */ +++ +++#include +++#include "compr.h" +++ +++#ifdef __KERNEL__ +++ static DEFINE_MUTEX(deflate_mutex); +++#endif +++ +++CLzmaEncHandle *p; +++Byte propsEncoded[LZMA_PROPS_SIZE]; +++SizeT propsSize = sizeof(propsEncoded); +++ +++STATIC void lzma_free_workspace(void) +++{ +++ LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc); +++} +++ +++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props) +++{ +++ if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL) +++ { +++ PRINT_ERROR("Failed to allocate lzma deflate workspace\n"); +++ return -ENOMEM; +++ } +++ +++ if (LzmaEnc_SetProps(p, props) != SZ_OK) +++ { +++ lzma_free_workspace(); +++ return -1; +++ } +++ +++ if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK) +++ { +++ lzma_free_workspace(); +++ return -1; +++ } +++ +++ return 0; +++} +++ +++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out, +++ uint32_t *sourcelen, uint32_t *dstlen, void *model) +++{ +++ SizeT compress_size = (SizeT)(*dstlen); +++ int ret; +++ +++ #ifdef __KERNEL__ +++ mutex_lock(&deflate_mutex); +++ #endif +++ +++ ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen, +++ 0, NULL, &lzma_alloc, &lzma_alloc); +++ +++ #ifdef __KERNEL__ +++ mutex_unlock(&deflate_mutex); +++ #endif +++ +++ if (ret != SZ_OK) +++ return -1; +++ +++ *dstlen = (uint32_t)compress_size; +++ +++ return 0; +++} +++ +++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out, +++ uint32_t srclen, uint32_t destlen, void *model) +++{ +++ int ret; +++ SizeT dl = (SizeT)destlen; +++ SizeT sl = (SizeT)srclen; +++ ELzmaStatus status; +++ +++ ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded, +++ propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc); +++ +++ if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen) +++ return -1; +++ +++ return 0; +++} +++ +++static struct jffs2_compressor jffs2_lzma_comp = { +++ .priority = JFFS2_LZMA_PRIORITY, +++ .name = "lzma", +++ .compr = JFFS2_COMPR_LZMA, +++ .compress = &jffs2_lzma_compress, +++ .decompress = &jffs2_lzma_decompress, +++ .disabled = 0, +++}; +++ +++int INIT jffs2_lzma_init(void) +++{ +++ int ret; +++ CLzmaEncProps props; +++ LzmaEncProps_Init(&props); +++ +++ props.dictSize = LZMA_BEST_DICT(0x2000); +++ props.level = LZMA_BEST_LEVEL; +++ props.lc = LZMA_BEST_LC; +++ props.lp = LZMA_BEST_LP; +++ props.pb = LZMA_BEST_PB; +++ props.fb = LZMA_BEST_FB; +++ +++ ret = lzma_alloc_workspace(&props); +++ if (ret < 0) +++ return ret; +++ +++ ret = jffs2_register_compressor(&jffs2_lzma_comp); +++ if (ret) +++ lzma_free_workspace(); +++ +++ return ret; +++} +++ +++void jffs2_lzma_exit(void) +++{ +++ jffs2_unregister_compressor(&jffs2_lzma_comp); +++ lzma_free_workspace(); +++} ++--- a/include/linux/jffs2.h +++++ b/include/linux/jffs2.h ++@@ -47,6 +47,7 @@ ++ #define JFFS2_COMPR_DYNRUBIN 0x05 ++ #define JFFS2_COMPR_ZLIB 0x06 ++ #define JFFS2_COMPR_LZO 0x07 +++#define JFFS2_COMPR_LZMA 0x08 ++ /* Compatibility flags. */ ++ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ ++ #define JFFS2_NODE_ACCURATE 0x2000 ++--- /dev/null +++++ b/include/linux/lzma.h ++@@ -0,0 +1,61 @@ +++#ifndef __LZMA_H__ +++#define __LZMA_H__ +++ +++#ifdef __KERNEL__ +++ #include +++ #include +++ #include +++ #include +++ #include +++ #define LZMA_MALLOC vmalloc +++ #define LZMA_FREE vfree +++ #define PRINT_ERROR(msg) printk(KERN_WARNING #msg) +++ #define INIT __init +++ #define STATIC static +++#else +++ #include +++ #include +++ #include +++ #include +++ #include +++ #include +++ #include +++ #ifndef PAGE_SIZE +++ extern int page_size; +++ #define PAGE_SIZE page_size +++ #endif +++ #define LZMA_MALLOC malloc +++ #define LZMA_FREE free +++ #define PRINT_ERROR(msg) fprintf(stderr, msg) +++ #define INIT +++ #define STATIC +++#endif +++ +++#include "lzma/LzmaDec.h" +++#include "lzma/LzmaEnc.h" +++ +++#define LZMA_BEST_LEVEL (9) +++#define LZMA_BEST_LC (0) +++#define LZMA_BEST_LP (0) +++#define LZMA_BEST_PB (0) +++#define LZMA_BEST_FB (273) +++ +++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2) +++ +++static void *p_lzma_malloc(void *p, size_t size) +++{ +++ if (size == 0) +++ return NULL; +++ +++ return LZMA_MALLOC(size); +++} +++ +++static void p_lzma_free(void *p, void *address) +++{ +++ if (address != NULL) +++ LZMA_FREE(address); +++} +++ +++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzFind.h ++@@ -0,0 +1,116 @@ +++/* LzFind.h -- Match finder for LZ algorithms +++2008-04-04 +++Copyright (c) 1999-2008 Igor Pavlov +++You can use any of the following license options: +++ 1) GNU Lesser General Public License (GNU LGPL) +++ 2) Common Public License (CPL) +++ 3) Common Development and Distribution License (CDDL) Version 1.0 +++ 4) Igor Pavlov, as the author of this code, expressly permits you to +++ statically or dynamically link your code (or bind by name) to this file, +++ while you keep this file unmodified. +++*/ +++ +++#ifndef __LZFIND_H +++#define __LZFIND_H +++ +++#include "Types.h" +++ +++typedef UInt32 CLzRef; +++ +++typedef struct _CMatchFinder +++{ +++ Byte *buffer; +++ UInt32 pos; +++ UInt32 posLimit; +++ UInt32 streamPos; +++ UInt32 lenLimit; +++ +++ UInt32 cyclicBufferPos; +++ UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */ +++ +++ UInt32 matchMaxLen; +++ CLzRef *hash; +++ CLzRef *son; +++ UInt32 hashMask; +++ UInt32 cutValue; +++ +++ Byte *bufferBase; +++ ISeqInStream *stream; +++ int streamEndWasReached; +++ +++ UInt32 blockSize; +++ UInt32 keepSizeBefore; +++ UInt32 keepSizeAfter; +++ +++ UInt32 numHashBytes; +++ int directInput; +++ int btMode; +++ /* int skipModeBits; */ +++ int bigHash; +++ UInt32 historySize; +++ UInt32 fixedHashSize; +++ UInt32 hashSizeSum; +++ UInt32 numSons; +++ SRes result; +++ UInt32 crc[256]; +++} CMatchFinder; +++ +++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer) +++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)]) +++ +++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos) +++ +++int MatchFinder_NeedMove(CMatchFinder *p); +++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p); +++void MatchFinder_MoveBlock(CMatchFinder *p); +++void MatchFinder_ReadIfRequired(CMatchFinder *p); +++ +++void MatchFinder_Construct(CMatchFinder *p); +++ +++/* Conditions: +++ historySize <= 3 GB +++ keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB +++*/ +++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, +++ UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, +++ ISzAlloc *alloc); +++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); +++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems); +++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue); +++ +++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue, +++ UInt32 *distances, UInt32 maxLen); +++ +++/* +++Conditions: +++ Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func. +++ Mf_GetPointerToCurrentPos_Func's result must be used only before any other function +++*/ +++ +++typedef void (*Mf_Init_Func)(void *object); +++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index); +++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object); +++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object); +++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances); +++typedef void (*Mf_Skip_Func)(void *object, UInt32); +++ +++typedef struct _IMatchFinder +++{ +++ Mf_Init_Func Init; +++ Mf_GetIndexByte_Func GetIndexByte; +++ Mf_GetNumAvailableBytes_Func GetNumAvailableBytes; +++ Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos; +++ Mf_GetMatches_Func GetMatches; +++ Mf_Skip_Func Skip; +++} IMatchFinder; +++ +++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable); +++ +++void MatchFinder_Init(CMatchFinder *p); +++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); +++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); +++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); +++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzHash.h ++@@ -0,0 +1,56 @@ +++/* LzHash.h -- HASH functions for LZ algorithms +++2008-03-26 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzFind.h for license options */ +++ +++#ifndef __LZHASH_H +++#define __LZHASH_H +++ +++#define kHash2Size (1 << 10) +++#define kHash3Size (1 << 16) +++#define kHash4Size (1 << 20) +++ +++#define kFix3HashSize (kHash2Size) +++#define kFix4HashSize (kHash2Size + kHash3Size) +++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size) +++ +++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8); +++ +++#define HASH3_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; } +++ +++#define HASH4_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ +++ hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; } +++ +++#define HASH5_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ +++ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \ +++ hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \ +++ hash4Value &= (kHash4Size - 1); } +++ +++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */ +++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF; +++ +++ +++#define MT_HASH2_CALC \ +++ hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1); +++ +++#define MT_HASH3_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); } +++ +++#define MT_HASH4_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ +++ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzmaDec.h ++@@ -0,0 +1,232 @@ +++/* LzmaDec.h -- LZMA Decoder +++2008-04-29 +++Copyright (c) 1999-2008 Igor Pavlov +++You can use any of the following license options: +++ 1) GNU Lesser General Public License (GNU LGPL) +++ 2) Common Public License (CPL) +++ 3) Common Development and Distribution License (CDDL) Version 1.0 +++ 4) Igor Pavlov, as the author of this code, expressly permits you to +++ statically or dynamically link your code (or bind by name) to this file, +++ while you keep this file unmodified. +++*/ +++ +++#ifndef __LZMADEC_H +++#define __LZMADEC_H +++ +++#include "Types.h" +++ +++/* #define _LZMA_PROB32 */ +++/* _LZMA_PROB32 can increase the speed on some CPUs, +++ but memory usage for CLzmaDec::probs will be doubled in that case */ +++ +++#ifdef _LZMA_PROB32 +++#define CLzmaProb UInt32 +++#else +++#define CLzmaProb UInt16 +++#endif +++ +++ +++/* ---------- LZMA Properties ---------- */ +++ +++#define LZMA_PROPS_SIZE 5 +++ +++typedef struct _CLzmaProps +++{ +++ unsigned lc, lp, pb; +++ UInt32 dicSize; +++} CLzmaProps; +++ +++/* LzmaProps_Decode - decodes properties +++Returns: +++ SZ_OK +++ SZ_ERROR_UNSUPPORTED - Unsupported properties +++*/ +++ +++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size); +++ +++ +++/* ---------- LZMA Decoder state ---------- */ +++ +++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case. +++ Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */ +++ +++#define LZMA_REQUIRED_INPUT_MAX 20 +++ +++typedef struct +++{ +++ CLzmaProps prop; +++ CLzmaProb *probs; +++ Byte *dic; +++ const Byte *buf; +++ UInt32 range, code; +++ SizeT dicPos; +++ SizeT dicBufSize; +++ UInt32 processedPos; +++ UInt32 checkDicSize; +++ unsigned state; +++ UInt32 reps[4]; +++ unsigned remainLen; +++ int needFlush; +++ int needInitState; +++ UInt32 numProbs; +++ unsigned tempBufSize; +++ Byte tempBuf[LZMA_REQUIRED_INPUT_MAX]; +++} CLzmaDec; +++ +++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; } +++ +++void LzmaDec_Init(CLzmaDec *p); +++ +++/* There are two types of LZMA streams: +++ 0) Stream with end mark. That end mark adds about 6 bytes to compressed size. +++ 1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */ +++ +++typedef enum +++{ +++ LZMA_FINISH_ANY, /* finish at any point */ +++ LZMA_FINISH_END /* block must be finished at the end */ +++} ELzmaFinishMode; +++ +++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!! +++ +++ You must use LZMA_FINISH_END, when you know that current output buffer +++ covers last bytes of block. In other cases you must use LZMA_FINISH_ANY. +++ +++ If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK, +++ and output value of destLen will be less than output buffer size limit. +++ You can check status result also. +++ +++ You can use multiple checks to test data integrity after full decompression: +++ 1) Check Result and "status" variable. +++ 2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize. +++ 3) Check that output(srcLen) = compressedSize, if you know real compressedSize. +++ You must use correct finish mode in that case. */ +++ +++typedef enum +++{ +++ LZMA_STATUS_NOT_SPECIFIED, /* use main error code instead */ +++ LZMA_STATUS_FINISHED_WITH_MARK, /* stream was finished with end mark. */ +++ LZMA_STATUS_NOT_FINISHED, /* stream was not finished */ +++ LZMA_STATUS_NEEDS_MORE_INPUT, /* you must provide more input bytes */ +++ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK /* there is probability that stream was finished without end mark */ +++} ELzmaStatus; +++ +++/* ELzmaStatus is used only as output value for function call */ +++ +++ +++/* ---------- Interfaces ---------- */ +++ +++/* There are 3 levels of interfaces: +++ 1) Dictionary Interface +++ 2) Buffer Interface +++ 3) One Call Interface +++ You can select any of these interfaces, but don't mix functions from different +++ groups for same object. */ +++ +++ +++/* There are two variants to allocate state for Dictionary Interface: +++ 1) LzmaDec_Allocate / LzmaDec_Free +++ 2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs +++ You can use variant 2, if you set dictionary buffer manually. +++ For Buffer Interface you must always use variant 1. +++ +++LzmaDec_Allocate* can return: +++ SZ_OK +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_UNSUPPORTED - Unsupported properties +++*/ +++ +++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc); +++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc); +++ +++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc); +++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc); +++ +++/* ---------- Dictionary Interface ---------- */ +++ +++/* You can use it, if you want to eliminate the overhead for data copying from +++ dictionary to some other external buffer. +++ You must work with CLzmaDec variables directly in this interface. +++ +++ STEPS: +++ LzmaDec_Constr() +++ LzmaDec_Allocate() +++ for (each new stream) +++ { +++ LzmaDec_Init() +++ while (it needs more decompression) +++ { +++ LzmaDec_DecodeToDic() +++ use data from CLzmaDec::dic and update CLzmaDec::dicPos +++ } +++ } +++ LzmaDec_Free() +++*/ +++ +++/* LzmaDec_DecodeToDic +++ +++ The decoding to internal dictionary buffer (CLzmaDec::dic). +++ You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! +++ +++finishMode: +++ It has meaning only if the decoding reaches output limit (dicLimit). +++ LZMA_FINISH_ANY - Decode just dicLimit bytes. +++ LZMA_FINISH_END - Stream must be finished after dicLimit. +++ +++Returns: +++ SZ_OK +++ status: +++ LZMA_STATUS_FINISHED_WITH_MARK +++ LZMA_STATUS_NOT_FINISHED +++ LZMA_STATUS_NEEDS_MORE_INPUT +++ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK +++ SZ_ERROR_DATA - Data error +++*/ +++ +++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, +++ const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); +++ +++ +++/* ---------- Buffer Interface ---------- */ +++ +++/* It's zlib-like interface. +++ See LzmaDec_DecodeToDic description for information about STEPS and return results, +++ but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need +++ to work with CLzmaDec variables manually. +++ +++finishMode: +++ It has meaning only if the decoding reaches output limit (*destLen). +++ LZMA_FINISH_ANY - Decode just destLen bytes. +++ LZMA_FINISH_END - Stream must be finished after (*destLen). +++*/ +++ +++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, +++ const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); +++ +++ +++/* ---------- One Call Interface ---------- */ +++ +++/* LzmaDecode +++ +++finishMode: +++ It has meaning only if the decoding reaches output limit (*destLen). +++ LZMA_FINISH_ANY - Decode just destLen bytes. +++ LZMA_FINISH_END - Stream must be finished after (*destLen). +++ +++Returns: +++ SZ_OK +++ status: +++ LZMA_STATUS_FINISHED_WITH_MARK +++ LZMA_STATUS_NOT_FINISHED +++ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK +++ SZ_ERROR_DATA - Data error +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_UNSUPPORTED - Unsupported properties +++ SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src). +++*/ +++ +++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, +++ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, +++ ELzmaStatus *status, ISzAlloc *alloc); +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzmaEnc.h ++@@ -0,0 +1,74 @@ +++/* LzmaEnc.h -- LZMA Encoder +++2008-04-27 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzFind.h for license options */ +++ +++#ifndef __LZMAENC_H +++#define __LZMAENC_H +++ +++#include "Types.h" +++ +++#define LZMA_PROPS_SIZE 5 +++ +++typedef struct _CLzmaEncProps +++{ +++ int level; /* 0 <= level <= 9 */ +++ UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version +++ (1 << 12) <= dictSize <= (1 << 30) for 64-bit version +++ default = (1 << 24) */ +++ int lc; /* 0 <= lc <= 8, default = 3 */ +++ int lp; /* 0 <= lp <= 4, default = 0 */ +++ int pb; /* 0 <= pb <= 4, default = 2 */ +++ int algo; /* 0 - fast, 1 - normal, default = 1 */ +++ int fb; /* 5 <= fb <= 273, default = 32 */ +++ int btMode; /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */ +++ int numHashBytes; /* 2, 3 or 4, default = 4 */ +++ UInt32 mc; /* 1 <= mc <= (1 << 30), default = 32 */ +++ unsigned writeEndMark; /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */ +++ int numThreads; /* 1 or 2, default = 2 */ +++} CLzmaEncProps; +++ +++void LzmaEncProps_Init(CLzmaEncProps *p); +++void LzmaEncProps_Normalize(CLzmaEncProps *p); +++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2); +++ +++ +++/* ---------- CLzmaEncHandle Interface ---------- */ +++ +++/* LzmaEnc_* functions can return the following exit codes: +++Returns: +++ SZ_OK - OK +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_PARAM - Incorrect paramater in props +++ SZ_ERROR_WRITE - Write callback error. +++ SZ_ERROR_PROGRESS - some break from progress callback +++ SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) +++*/ +++ +++typedef void * CLzmaEncHandle; +++ +++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc); +++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig); +++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props); +++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size); +++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, +++ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); +++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); +++ +++/* ---------- One Call Interface ---------- */ +++ +++/* LzmaEncode +++Return code: +++ SZ_OK - OK +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_PARAM - Incorrect paramater +++ SZ_ERROR_OUTPUT_EOF - output buffer overflow +++ SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) +++*/ +++ +++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, +++ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/Types.h ++@@ -0,0 +1,130 @@ +++/* Types.h -- Basic types +++2008-04-11 +++Igor Pavlov +++Public domain */ +++ +++#ifndef __7Z_TYPES_H +++#define __7Z_TYPES_H +++ +++#define SZ_OK 0 +++ +++#define SZ_ERROR_DATA 1 +++#define SZ_ERROR_MEM 2 +++#define SZ_ERROR_CRC 3 +++#define SZ_ERROR_UNSUPPORTED 4 +++#define SZ_ERROR_PARAM 5 +++#define SZ_ERROR_INPUT_EOF 6 +++#define SZ_ERROR_OUTPUT_EOF 7 +++#define SZ_ERROR_READ 8 +++#define SZ_ERROR_WRITE 9 +++#define SZ_ERROR_PROGRESS 10 +++#define SZ_ERROR_FAIL 11 +++#define SZ_ERROR_THREAD 12 +++ +++#define SZ_ERROR_ARCHIVE 16 +++#define SZ_ERROR_NO_ARCHIVE 17 +++ +++typedef int SRes; +++ +++#ifndef RINOK +++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; } +++#endif +++ +++typedef unsigned char Byte; +++typedef short Int16; +++typedef unsigned short UInt16; +++ +++#ifdef _LZMA_UINT32_IS_ULONG +++typedef long Int32; +++typedef unsigned long UInt32; +++#else +++typedef int Int32; +++typedef unsigned int UInt32; +++#endif +++ +++/* #define _SZ_NO_INT_64 */ +++/* define it if your compiler doesn't support 64-bit integers */ +++ +++#ifdef _SZ_NO_INT_64 +++ +++typedef long Int64; +++typedef unsigned long UInt64; +++ +++#else +++ +++#if defined(_MSC_VER) || defined(__BORLANDC__) +++typedef __int64 Int64; +++typedef unsigned __int64 UInt64; +++#else +++typedef long long int Int64; +++typedef unsigned long long int UInt64; +++#endif +++ +++#endif +++ +++#ifdef _LZMA_NO_SYSTEM_SIZE_T +++typedef UInt32 SizeT; +++#else +++#include +++typedef size_t SizeT; +++#endif +++ +++typedef int Bool; +++#define True 1 +++#define False 0 +++ +++ +++#ifdef _MSC_VER +++ +++#if _MSC_VER >= 1300 +++#define MY_NO_INLINE __declspec(noinline) +++#else +++#define MY_NO_INLINE +++#endif +++ +++#define MY_CDECL __cdecl +++#define MY_STD_CALL __stdcall +++#define MY_FAST_CALL MY_NO_INLINE __fastcall +++ +++#else +++ +++#define MY_CDECL +++#define MY_STD_CALL +++#define MY_FAST_CALL +++ +++#endif +++ +++ +++/* The following interfaces use first parameter as pointer to structure */ +++ +++typedef struct +++{ +++ SRes (*Read)(void *p, void *buf, size_t *size); +++ /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream. +++ (output(*size) < input(*size)) is allowed */ +++} ISeqInStream; +++ +++typedef struct +++{ +++ size_t (*Write)(void *p, const void *buf, size_t size); +++ /* Returns: result - the number of actually written bytes. +++ (result < size) means error */ +++} ISeqOutStream; +++ +++typedef struct +++{ +++ SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize); +++ /* Returns: result. (result != SZ_OK) means break. +++ Value (UInt64)(Int64)-1 for size means unknown value. */ +++} ICompressProgress; +++ +++typedef struct +++{ +++ void *(*Alloc)(void *p, size_t size); +++ void (*Free)(void *p, void *address); /* address can be 0 */ +++} ISzAlloc; +++ +++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size) +++#define IAlloc_Free(p, a) (p)->Free((p), a) +++ +++#endif ++--- /dev/null +++++ b/lzma/LzFind.c ++@@ -0,0 +1,753 @@ +++/* LzFind.c -- Match finder for LZ algorithms +++2008-04-04 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzFind.h for license options */ +++ +++#include +++ +++#include "LzFind.h" +++#include "LzHash.h" +++ +++#define kEmptyHashValue 0 +++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF) +++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */ +++#define kNormalizeMask (~(kNormalizeStepMin - 1)) +++#define kMaxHistorySize ((UInt32)3 << 30) +++ +++#define kStartMaxLen 3 +++ +++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc) +++{ +++ if (!p->directInput) +++ { +++ alloc->Free(alloc, p->bufferBase); +++ p->bufferBase = 0; +++ } +++} +++ +++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */ +++ +++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc) +++{ +++ UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv; +++ if (p->directInput) +++ { +++ p->blockSize = blockSize; +++ return 1; +++ } +++ if (p->bufferBase == 0 || p->blockSize != blockSize) +++ { +++ LzInWindow_Free(p, alloc); +++ p->blockSize = blockSize; +++ p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize); +++ } +++ return (p->bufferBase != 0); +++} +++ +++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; } +++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; } +++ +++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; } +++ +++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue) +++{ +++ p->posLimit -= subValue; +++ p->pos -= subValue; +++ p->streamPos -= subValue; +++} +++ +++static void MatchFinder_ReadBlock(CMatchFinder *p) +++{ +++ if (p->streamEndWasReached || p->result != SZ_OK) +++ return; +++ for (;;) +++ { +++ Byte *dest = p->buffer + (p->streamPos - p->pos); +++ size_t size = (p->bufferBase + p->blockSize - dest); +++ if (size == 0) +++ return; +++ p->result = p->stream->Read(p->stream, dest, &size); +++ if (p->result != SZ_OK) +++ return; +++ if (size == 0) +++ { +++ p->streamEndWasReached = 1; +++ return; +++ } +++ p->streamPos += (UInt32)size; +++ if (p->streamPos - p->pos > p->keepSizeAfter) +++ return; +++ } +++} +++ +++void MatchFinder_MoveBlock(CMatchFinder *p) +++{ +++ memmove(p->bufferBase, +++ p->buffer - p->keepSizeBefore, +++ (size_t)(p->streamPos - p->pos + p->keepSizeBefore)); +++ p->buffer = p->bufferBase + p->keepSizeBefore; +++} +++ +++int MatchFinder_NeedMove(CMatchFinder *p) +++{ +++ /* if (p->streamEndWasReached) return 0; */ +++ return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter); +++} +++ +++void MatchFinder_ReadIfRequired(CMatchFinder *p) +++{ +++ if (p->streamEndWasReached) +++ return; +++ if (p->keepSizeAfter >= p->streamPos - p->pos) +++ MatchFinder_ReadBlock(p); +++} +++ +++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p) +++{ +++ if (MatchFinder_NeedMove(p)) +++ MatchFinder_MoveBlock(p); +++ MatchFinder_ReadBlock(p); +++} +++ +++static void MatchFinder_SetDefaultSettings(CMatchFinder *p) +++{ +++ p->cutValue = 32; +++ p->btMode = 1; +++ p->numHashBytes = 4; +++ /* p->skipModeBits = 0; */ +++ p->directInput = 0; +++ p->bigHash = 0; +++} +++ +++#define kCrcPoly 0xEDB88320 +++ +++void MatchFinder_Construct(CMatchFinder *p) +++{ +++ UInt32 i; +++ p->bufferBase = 0; +++ p->directInput = 0; +++ p->hash = 0; +++ MatchFinder_SetDefaultSettings(p); +++ +++ for (i = 0; i < 256; i++) +++ { +++ UInt32 r = i; +++ int j; +++ for (j = 0; j < 8; j++) +++ r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1)); +++ p->crc[i] = r; +++ } +++} +++ +++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->hash); +++ p->hash = 0; +++} +++ +++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc) +++{ +++ MatchFinder_FreeThisClassMemory(p, alloc); +++ LzInWindow_Free(p, alloc); +++} +++ +++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc) +++{ +++ size_t sizeInBytes = (size_t)num * sizeof(CLzRef); +++ if (sizeInBytes / sizeof(CLzRef) != num) +++ return 0; +++ return (CLzRef *)alloc->Alloc(alloc, sizeInBytes); +++} +++ +++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, +++ UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, +++ ISzAlloc *alloc) +++{ +++ UInt32 sizeReserv; +++ if (historySize > kMaxHistorySize) +++ { +++ MatchFinder_Free(p, alloc); +++ return 0; +++ } +++ sizeReserv = historySize >> 1; +++ if (historySize > ((UInt32)2 << 30)) +++ sizeReserv = historySize >> 2; +++ sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19); +++ +++ p->keepSizeBefore = historySize + keepAddBufferBefore + 1; +++ p->keepSizeAfter = matchMaxLen + keepAddBufferAfter; +++ /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */ +++ if (LzInWindow_Create(p, sizeReserv, alloc)) +++ { +++ UInt32 newCyclicBufferSize = (historySize /* >> p->skipModeBits */) + 1; +++ UInt32 hs; +++ p->matchMaxLen = matchMaxLen; +++ { +++ p->fixedHashSize = 0; +++ if (p->numHashBytes == 2) +++ hs = (1 << 16) - 1; +++ else +++ { +++ hs = historySize - 1; +++ hs |= (hs >> 1); +++ hs |= (hs >> 2); +++ hs |= (hs >> 4); +++ hs |= (hs >> 8); +++ hs >>= 1; +++ /* hs >>= p->skipModeBits; */ +++ hs |= 0xFFFF; /* don't change it! It's required for Deflate */ +++ if (hs > (1 << 24)) +++ { +++ if (p->numHashBytes == 3) +++ hs = (1 << 24) - 1; +++ else +++ hs >>= 1; +++ } +++ } +++ p->hashMask = hs; +++ hs++; +++ if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size; +++ if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size; +++ if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size; +++ hs += p->fixedHashSize; +++ } +++ +++ { +++ UInt32 prevSize = p->hashSizeSum + p->numSons; +++ UInt32 newSize; +++ p->historySize = historySize; +++ p->hashSizeSum = hs; +++ p->cyclicBufferSize = newCyclicBufferSize; +++ p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize); +++ newSize = p->hashSizeSum + p->numSons; +++ if (p->hash != 0 && prevSize == newSize) +++ return 1; +++ MatchFinder_FreeThisClassMemory(p, alloc); +++ p->hash = AllocRefs(newSize, alloc); +++ if (p->hash != 0) +++ { +++ p->son = p->hash + p->hashSizeSum; +++ return 1; +++ } +++ } +++ } +++ MatchFinder_Free(p, alloc); +++ return 0; +++} +++ +++static void MatchFinder_SetLimits(CMatchFinder *p) +++{ +++ UInt32 limit = kMaxValForNormalize - p->pos; +++ UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos; +++ if (limit2 < limit) +++ limit = limit2; +++ limit2 = p->streamPos - p->pos; +++ if (limit2 <= p->keepSizeAfter) +++ { +++ if (limit2 > 0) +++ limit2 = 1; +++ } +++ else +++ limit2 -= p->keepSizeAfter; +++ if (limit2 < limit) +++ limit = limit2; +++ { +++ UInt32 lenLimit = p->streamPos - p->pos; +++ if (lenLimit > p->matchMaxLen) +++ lenLimit = p->matchMaxLen; +++ p->lenLimit = lenLimit; +++ } +++ p->posLimit = p->pos + limit; +++} +++ +++void MatchFinder_Init(CMatchFinder *p) +++{ +++ UInt32 i; +++ for(i = 0; i < p->hashSizeSum; i++) +++ p->hash[i] = kEmptyHashValue; +++ p->cyclicBufferPos = 0; +++ p->buffer = p->bufferBase; +++ p->pos = p->streamPos = p->cyclicBufferSize; +++ p->result = SZ_OK; +++ p->streamEndWasReached = 0; +++ MatchFinder_ReadBlock(p); +++ MatchFinder_SetLimits(p); +++} +++ +++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p) +++{ +++ return (p->pos - p->historySize - 1) & kNormalizeMask; +++} +++ +++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems) +++{ +++ UInt32 i; +++ for (i = 0; i < numItems; i++) +++ { +++ UInt32 value = items[i]; +++ if (value <= subValue) +++ value = kEmptyHashValue; +++ else +++ value -= subValue; +++ items[i] = value; +++ } +++} +++ +++static void MatchFinder_Normalize(CMatchFinder *p) +++{ +++ UInt32 subValue = MatchFinder_GetSubValue(p); +++ MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons); +++ MatchFinder_ReduceOffsets(p, subValue); +++} +++ +++static void MatchFinder_CheckLimits(CMatchFinder *p) +++{ +++ if (p->pos == kMaxValForNormalize) +++ MatchFinder_Normalize(p); +++ if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos) +++ MatchFinder_CheckAndMoveAndRead(p); +++ if (p->cyclicBufferPos == p->cyclicBufferSize) +++ p->cyclicBufferPos = 0; +++ MatchFinder_SetLimits(p); +++} +++ +++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, +++ UInt32 *distances, UInt32 maxLen) +++{ +++ son[_cyclicBufferPos] = curMatch; +++ for (;;) +++ { +++ UInt32 delta = pos - curMatch; +++ if (cutValue-- == 0 || delta >= _cyclicBufferSize) +++ return distances; +++ { +++ const Byte *pb = cur - delta; +++ curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)]; +++ if (pb[maxLen] == cur[maxLen] && *pb == *cur) +++ { +++ UInt32 len = 0; +++ while(++len != lenLimit) +++ if (pb[len] != cur[len]) +++ break; +++ if (maxLen < len) +++ { +++ *distances++ = maxLen = len; +++ *distances++ = delta - 1; +++ if (len == lenLimit) +++ return distances; +++ } +++ } +++ } +++ } +++} +++ +++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, +++ UInt32 *distances, UInt32 maxLen) +++{ +++ CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1; +++ CLzRef *ptr1 = son + (_cyclicBufferPos << 1); +++ UInt32 len0 = 0, len1 = 0; +++ for (;;) +++ { +++ UInt32 delta = pos - curMatch; +++ if (cutValue-- == 0 || delta >= _cyclicBufferSize) +++ { +++ *ptr0 = *ptr1 = kEmptyHashValue; +++ return distances; +++ } +++ { +++ CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1); +++ const Byte *pb = cur - delta; +++ UInt32 len = (len0 < len1 ? len0 : len1); +++ if (pb[len] == cur[len]) +++ { +++ if (++len != lenLimit && pb[len] == cur[len]) +++ while(++len != lenLimit) +++ if (pb[len] != cur[len]) +++ break; +++ if (maxLen < len) +++ { +++ *distances++ = maxLen = len; +++ *distances++ = delta - 1; +++ if (len == lenLimit) +++ { +++ *ptr1 = pair[0]; +++ *ptr0 = pair[1]; +++ return distances; +++ } +++ } +++ } +++ if (pb[len] < cur[len]) +++ { +++ *ptr1 = curMatch; +++ ptr1 = pair + 1; +++ curMatch = *ptr1; +++ len1 = len; +++ } +++ else +++ { +++ *ptr0 = curMatch; +++ ptr0 = pair; +++ curMatch = *ptr0; +++ len0 = len; +++ } +++ } +++ } +++} +++ +++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue) +++{ +++ CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1; +++ CLzRef *ptr1 = son + (_cyclicBufferPos << 1); +++ UInt32 len0 = 0, len1 = 0; +++ for (;;) +++ { +++ UInt32 delta = pos - curMatch; +++ if (cutValue-- == 0 || delta >= _cyclicBufferSize) +++ { +++ *ptr0 = *ptr1 = kEmptyHashValue; +++ return; +++ } +++ { +++ CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1); +++ const Byte *pb = cur - delta; +++ UInt32 len = (len0 < len1 ? len0 : len1); +++ if (pb[len] == cur[len]) +++ { +++ while(++len != lenLimit) +++ if (pb[len] != cur[len]) +++ break; +++ { +++ if (len == lenLimit) +++ { +++ *ptr1 = pair[0]; +++ *ptr0 = pair[1]; +++ return; +++ } +++ } +++ } +++ if (pb[len] < cur[len]) +++ { +++ *ptr1 = curMatch; +++ ptr1 = pair + 1; +++ curMatch = *ptr1; +++ len1 = len; +++ } +++ else +++ { +++ *ptr0 = curMatch; +++ ptr0 = pair; +++ curMatch = *ptr0; +++ len0 = len; +++ } +++ } +++ } +++} +++ +++#define MOVE_POS \ +++ ++p->cyclicBufferPos; \ +++ p->buffer++; \ +++ if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p); +++ +++#define MOVE_POS_RET MOVE_POS return offset; +++ +++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; } +++ +++#define GET_MATCHES_HEADER2(minLen, ret_op) \ +++ UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \ +++ lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \ +++ cur = p->buffer; +++ +++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0) +++#define SKIP_HEADER(minLen) GET_MATCHES_HEADER2(minLen, continue) +++ +++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue +++ +++#define GET_MATCHES_FOOTER(offset, maxLen) \ +++ offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \ +++ distances + offset, maxLen) - distances); MOVE_POS_RET; +++ +++#define SKIP_FOOTER \ +++ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS; +++ +++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 offset; +++ GET_MATCHES_HEADER(2) +++ HASH2_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ offset = 0; +++ GET_MATCHES_FOOTER(offset, 1) +++} +++ +++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 offset; +++ GET_MATCHES_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ offset = 0; +++ GET_MATCHES_FOOTER(offset, 2) +++} +++ +++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 hash2Value, delta2, maxLen, offset; +++ GET_MATCHES_HEADER(3) +++ +++ HASH3_CALC; +++ +++ delta2 = p->pos - p->hash[hash2Value]; +++ curMatch = p->hash[kFix3HashSize + hashValue]; +++ +++ p->hash[hash2Value] = +++ p->hash[kFix3HashSize + hashValue] = p->pos; +++ +++ +++ maxLen = 2; +++ offset = 0; +++ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) +++ { +++ for (; maxLen != lenLimit; maxLen++) +++ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) +++ break; +++ distances[0] = maxLen; +++ distances[1] = delta2 - 1; +++ offset = 2; +++ if (maxLen == lenLimit) +++ { +++ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); +++ MOVE_POS_RET; +++ } +++ } +++ GET_MATCHES_FOOTER(offset, maxLen) +++} +++ +++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; +++ GET_MATCHES_HEADER(4) +++ +++ HASH4_CALC; +++ +++ delta2 = p->pos - p->hash[ hash2Value]; +++ delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ +++ maxLen = 1; +++ offset = 0; +++ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) +++ { +++ distances[0] = maxLen = 2; +++ distances[1] = delta2 - 1; +++ offset = 2; +++ } +++ if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) +++ { +++ maxLen = 3; +++ distances[offset + 1] = delta3 - 1; +++ offset += 2; +++ delta2 = delta3; +++ } +++ if (offset != 0) +++ { +++ for (; maxLen != lenLimit; maxLen++) +++ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) +++ break; +++ distances[offset - 2] = maxLen; +++ if (maxLen == lenLimit) +++ { +++ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); +++ MOVE_POS_RET; +++ } +++ } +++ if (maxLen < 3) +++ maxLen = 3; +++ GET_MATCHES_FOOTER(offset, maxLen) +++} +++ +++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; +++ GET_MATCHES_HEADER(4) +++ +++ HASH4_CALC; +++ +++ delta2 = p->pos - p->hash[ hash2Value]; +++ delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ +++ maxLen = 1; +++ offset = 0; +++ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) +++ { +++ distances[0] = maxLen = 2; +++ distances[1] = delta2 - 1; +++ offset = 2; +++ } +++ if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) +++ { +++ maxLen = 3; +++ distances[offset + 1] = delta3 - 1; +++ offset += 2; +++ delta2 = delta3; +++ } +++ if (offset != 0) +++ { +++ for (; maxLen != lenLimit; maxLen++) +++ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) +++ break; +++ distances[offset - 2] = maxLen; +++ if (maxLen == lenLimit) +++ { +++ p->son[p->cyclicBufferPos] = curMatch; +++ MOVE_POS_RET; +++ } +++ } +++ if (maxLen < 3) +++ maxLen = 3; +++ offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), +++ distances + offset, maxLen) - (distances)); +++ MOVE_POS_RET +++} +++ +++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 offset; +++ GET_MATCHES_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), +++ distances, 2) - (distances)); +++ MOVE_POS_RET +++} +++ +++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ SKIP_HEADER(2) +++ HASH2_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ SKIP_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ UInt32 hash2Value; +++ SKIP_HEADER(3) +++ HASH3_CALC; +++ curMatch = p->hash[kFix3HashSize + hashValue]; +++ p->hash[hash2Value] = +++ p->hash[kFix3HashSize + hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ UInt32 hash2Value, hash3Value; +++ SKIP_HEADER(4) +++ HASH4_CALC; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = p->pos; +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ UInt32 hash2Value, hash3Value; +++ SKIP_HEADER(4) +++ HASH4_CALC; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ p->son[p->cyclicBufferPos] = curMatch; +++ MOVE_POS +++ } +++ while (--num != 0); +++} +++ +++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ SKIP_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ p->son[p->cyclicBufferPos] = curMatch; +++ MOVE_POS +++ } +++ while (--num != 0); +++} +++ +++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable) +++{ +++ vTable->Init = (Mf_Init_Func)MatchFinder_Init; +++ vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte; +++ vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes; +++ vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos; +++ if (!p->btMode) +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip; +++ } +++ else if (p->numHashBytes == 2) +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip; +++ } +++ else if (p->numHashBytes == 3) +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip; +++ } +++ else +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; +++ } +++} ++--- /dev/null +++++ b/lzma/LzmaDec.c ++@@ -0,0 +1,1014 @@ +++/* LzmaDec.c -- LZMA Decoder +++2008-04-29 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzmaDec.h for license options */ +++ +++#include "LzmaDec.h" +++ +++#include +++ +++#define kNumTopBits 24 +++#define kTopValue ((UInt32)1 << kNumTopBits) +++ +++#define kNumBitModelTotalBits 11 +++#define kBitModelTotal (1 << kNumBitModelTotalBits) +++#define kNumMoveBits 5 +++ +++#define RC_INIT_SIZE 5 +++ +++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); } +++ +++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) +++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); +++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits)); +++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \ +++ { UPDATE_0(p); i = (i + i); A0; } else \ +++ { UPDATE_1(p); i = (i + i) + 1; A1; } +++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;) +++ +++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); } +++#define TREE_DECODE(probs, limit, i) \ +++ { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; } +++ +++/* #define _LZMA_SIZE_OPT */ +++ +++#ifdef _LZMA_SIZE_OPT +++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i) +++#else +++#define TREE_6_DECODE(probs, i) \ +++ { i = 1; \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ i -= 0x40; } +++#endif +++ +++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); } +++ +++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) +++#define UPDATE_0_CHECK range = bound; +++#define UPDATE_1_CHECK range -= bound; code -= bound; +++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \ +++ { UPDATE_0_CHECK; i = (i + i); A0; } else \ +++ { UPDATE_1_CHECK; i = (i + i) + 1; A1; } +++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;) +++#define TREE_DECODE_CHECK(probs, limit, i) \ +++ { i = 1; do { GET_BIT_CHECK(probs + i, i) } while(i < limit); i -= limit; } +++ +++ +++#define kNumPosBitsMax 4 +++#define kNumPosStatesMax (1 << kNumPosBitsMax) +++ +++#define kLenNumLowBits 3 +++#define kLenNumLowSymbols (1 << kLenNumLowBits) +++#define kLenNumMidBits 3 +++#define kLenNumMidSymbols (1 << kLenNumMidBits) +++#define kLenNumHighBits 8 +++#define kLenNumHighSymbols (1 << kLenNumHighBits) +++ +++#define LenChoice 0 +++#define LenChoice2 (LenChoice + 1) +++#define LenLow (LenChoice2 + 1) +++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits)) +++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits)) +++#define kNumLenProbs (LenHigh + kLenNumHighSymbols) +++ +++ +++#define kNumStates 12 +++#define kNumLitStates 7 +++ +++#define kStartPosModelIndex 4 +++#define kEndPosModelIndex 14 +++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1)) +++ +++#define kNumPosSlotBits 6 +++#define kNumLenToPosStates 4 +++ +++#define kNumAlignBits 4 +++#define kAlignTableSize (1 << kNumAlignBits) +++ +++#define kMatchMinLen 2 +++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols) +++ +++#define IsMatch 0 +++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax)) +++#define IsRepG0 (IsRep + kNumStates) +++#define IsRepG1 (IsRepG0 + kNumStates) +++#define IsRepG2 (IsRepG1 + kNumStates) +++#define IsRep0Long (IsRepG2 + kNumStates) +++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax)) +++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits)) +++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex) +++#define LenCoder (Align + kAlignTableSize) +++#define RepLenCoder (LenCoder + kNumLenProbs) +++#define Literal (RepLenCoder + kNumLenProbs) +++ +++#define LZMA_BASE_SIZE 1846 +++#define LZMA_LIT_SIZE 768 +++ +++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp))) +++ +++#if Literal != LZMA_BASE_SIZE +++StopCompilingDueBUG +++#endif +++ +++/* +++#define LZMA_STREAM_WAS_FINISHED_ID (-1) +++#define LZMA_SPEC_LEN_OFFSET (-3) +++*/ +++ +++Byte kLiteralNextStates[kNumStates * 2] = +++{ +++ 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5, +++ 7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10 +++}; +++ +++#define LZMA_DIC_MIN (1 << 12) +++ +++/* First LZMA-symbol is always decoded. +++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization +++Out: +++ Result: +++ 0 - OK +++ 1 - Error +++ p->remainLen: +++ < kMatchSpecLenStart : normal remain +++ = kMatchSpecLenStart : finished +++ = kMatchSpecLenStart + 1 : Flush marker +++ = kMatchSpecLenStart + 2 : State Init Marker +++*/ +++ +++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit) +++{ +++ CLzmaProb *probs = p->probs; +++ +++ unsigned state = p->state; +++ UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3]; +++ unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1; +++ unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1; +++ unsigned lc = p->prop.lc; +++ +++ Byte *dic = p->dic; +++ SizeT dicBufSize = p->dicBufSize; +++ SizeT dicPos = p->dicPos; +++ +++ UInt32 processedPos = p->processedPos; +++ UInt32 checkDicSize = p->checkDicSize; +++ unsigned len = 0; +++ +++ const Byte *buf = p->buf; +++ UInt32 range = p->range; +++ UInt32 code = p->code; +++ +++ do +++ { +++ CLzmaProb *prob; +++ UInt32 bound; +++ unsigned ttt; +++ unsigned posState = processedPos & pbMask; +++ +++ prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0(prob) +++ { +++ unsigned symbol; +++ UPDATE_0(prob); +++ prob = probs + Literal; +++ if (checkDicSize != 0 || processedPos != 0) +++ prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) + +++ (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc)))); +++ +++ if (state < kNumLitStates) +++ { +++ symbol = 1; +++ do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100); +++ } +++ else +++ { +++ unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; +++ unsigned offs = 0x100; +++ symbol = 1; +++ do +++ { +++ unsigned bit; +++ CLzmaProb *probLit; +++ matchByte <<= 1; +++ bit = (matchByte & offs); +++ probLit = prob + offs + bit + symbol; +++ GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit) +++ } +++ while (symbol < 0x100); +++ } +++ dic[dicPos++] = (Byte)symbol; +++ processedPos++; +++ +++ state = kLiteralNextStates[state]; +++ /* if (state < 4) state = 0; else if (state < 10) state -= 3; else state -= 6; */ +++ continue; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ prob = probs + IsRep + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ state += kNumStates; +++ prob = probs + LenCoder; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ if (checkDicSize == 0 && processedPos == 0) +++ return SZ_ERROR_DATA; +++ prob = probs + IsRepG0 + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; +++ dicPos++; +++ processedPos++; +++ state = state < kNumLitStates ? 9 : 11; +++ continue; +++ } +++ UPDATE_1(prob); +++ } +++ else +++ { +++ UInt32 distance; +++ UPDATE_1(prob); +++ prob = probs + IsRepG1 + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ distance = rep1; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ prob = probs + IsRepG2 + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ distance = rep2; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ distance = rep3; +++ rep3 = rep2; +++ } +++ rep2 = rep1; +++ } +++ rep1 = rep0; +++ rep0 = distance; +++ } +++ state = state < kNumLitStates ? 8 : 11; +++ prob = probs + RepLenCoder; +++ } +++ { +++ unsigned limit, offset; +++ CLzmaProb *probLen = prob + LenChoice; +++ IF_BIT_0(probLen) +++ { +++ UPDATE_0(probLen); +++ probLen = prob + LenLow + (posState << kLenNumLowBits); +++ offset = 0; +++ limit = (1 << kLenNumLowBits); +++ } +++ else +++ { +++ UPDATE_1(probLen); +++ probLen = prob + LenChoice2; +++ IF_BIT_0(probLen) +++ { +++ UPDATE_0(probLen); +++ probLen = prob + LenMid + (posState << kLenNumMidBits); +++ offset = kLenNumLowSymbols; +++ limit = (1 << kLenNumMidBits); +++ } +++ else +++ { +++ UPDATE_1(probLen); +++ probLen = prob + LenHigh; +++ offset = kLenNumLowSymbols + kLenNumMidSymbols; +++ limit = (1 << kLenNumHighBits); +++ } +++ } +++ TREE_DECODE(probLen, limit, len); +++ len += offset; +++ } +++ +++ if (state >= kNumStates) +++ { +++ UInt32 distance; +++ prob = probs + PosSlot + +++ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits); +++ TREE_6_DECODE(prob, distance); +++ if (distance >= kStartPosModelIndex) +++ { +++ unsigned posSlot = (unsigned)distance; +++ int numDirectBits = (int)(((distance >> 1) - 1)); +++ distance = (2 | (distance & 1)); +++ if (posSlot < kEndPosModelIndex) +++ { +++ distance <<= numDirectBits; +++ prob = probs + SpecPos + distance - posSlot - 1; +++ { +++ UInt32 mask = 1; +++ unsigned i = 1; +++ do +++ { +++ GET_BIT2(prob + i, i, ; , distance |= mask); +++ mask <<= 1; +++ } +++ while(--numDirectBits != 0); +++ } +++ } +++ else +++ { +++ numDirectBits -= kNumAlignBits; +++ do +++ { +++ NORMALIZE +++ range >>= 1; +++ +++ { +++ UInt32 t; +++ code -= range; +++ t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */ +++ distance = (distance << 1) + (t + 1); +++ code += range & t; +++ } +++ /* +++ distance <<= 1; +++ if (code >= range) +++ { +++ code -= range; +++ distance |= 1; +++ } +++ */ +++ } +++ while (--numDirectBits != 0); +++ prob = probs + Align; +++ distance <<= kNumAlignBits; +++ { +++ unsigned i = 1; +++ GET_BIT2(prob + i, i, ; , distance |= 1); +++ GET_BIT2(prob + i, i, ; , distance |= 2); +++ GET_BIT2(prob + i, i, ; , distance |= 4); +++ GET_BIT2(prob + i, i, ; , distance |= 8); +++ } +++ if (distance == (UInt32)0xFFFFFFFF) +++ { +++ len += kMatchSpecLenStart; +++ state -= kNumStates; +++ break; +++ } +++ } +++ } +++ rep3 = rep2; +++ rep2 = rep1; +++ rep1 = rep0; +++ rep0 = distance + 1; +++ if (checkDicSize == 0) +++ { +++ if (distance >= processedPos) +++ return SZ_ERROR_DATA; +++ } +++ else if (distance >= checkDicSize) +++ return SZ_ERROR_DATA; +++ state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3; +++ /* state = kLiteralNextStates[state]; */ +++ } +++ +++ len += kMatchMinLen; +++ +++ { +++ SizeT rem = limit - dicPos; +++ unsigned curLen = ((rem < len) ? (unsigned)rem : len); +++ SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0); +++ +++ processedPos += curLen; +++ +++ len -= curLen; +++ if (pos + curLen <= dicBufSize) +++ { +++ Byte *dest = dic + dicPos; +++ ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos; +++ const Byte *lim = dest + curLen; +++ dicPos += curLen; +++ do +++ *(dest) = (Byte)*(dest + src); +++ while (++dest != lim); +++ } +++ else +++ { +++ do +++ { +++ dic[dicPos++] = dic[pos]; +++ if (++pos == dicBufSize) +++ pos = 0; +++ } +++ while (--curLen != 0); +++ } +++ } +++ } +++ } +++ while (dicPos < limit && buf < bufLimit); +++ NORMALIZE; +++ p->buf = buf; +++ p->range = range; +++ p->code = code; +++ p->remainLen = len; +++ p->dicPos = dicPos; +++ p->processedPos = processedPos; +++ p->reps[0] = rep0; +++ p->reps[1] = rep1; +++ p->reps[2] = rep2; +++ p->reps[3] = rep3; +++ p->state = state; +++ +++ return SZ_OK; +++} +++ +++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit) +++{ +++ if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart) +++ { +++ Byte *dic = p->dic; +++ SizeT dicPos = p->dicPos; +++ SizeT dicBufSize = p->dicBufSize; +++ unsigned len = p->remainLen; +++ UInt32 rep0 = p->reps[0]; +++ if (limit - dicPos < len) +++ len = (unsigned)(limit - dicPos); +++ +++ if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len) +++ p->checkDicSize = p->prop.dicSize; +++ +++ p->processedPos += len; +++ p->remainLen -= len; +++ while (len-- != 0) +++ { +++ dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; +++ dicPos++; +++ } +++ p->dicPos = dicPos; +++ } +++} +++ +++/* LzmaDec_DecodeReal2 decodes LZMA-symbols and sets p->needFlush and p->needInit, if required. */ +++ +++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit) +++{ +++ do +++ { +++ SizeT limit2 = limit; +++ if (p->checkDicSize == 0) +++ { +++ UInt32 rem = p->prop.dicSize - p->processedPos; +++ if (limit - p->dicPos > rem) +++ limit2 = p->dicPos + rem; +++ } +++ RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit)); +++ if (p->processedPos >= p->prop.dicSize) +++ p->checkDicSize = p->prop.dicSize; +++ LzmaDec_WriteRem(p, limit); +++ } +++ while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart); +++ +++ if (p->remainLen > kMatchSpecLenStart) +++ { +++ p->remainLen = kMatchSpecLenStart; +++ } +++ return 0; +++} +++ +++typedef enum +++{ +++ DUMMY_ERROR, /* unexpected end of input stream */ +++ DUMMY_LIT, +++ DUMMY_MATCH, +++ DUMMY_REP +++} ELzmaDummy; +++ +++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize) +++{ +++ UInt32 range = p->range; +++ UInt32 code = p->code; +++ const Byte *bufLimit = buf + inSize; +++ CLzmaProb *probs = p->probs; +++ unsigned state = p->state; +++ ELzmaDummy res; +++ +++ { +++ CLzmaProb *prob; +++ UInt32 bound; +++ unsigned ttt; +++ unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1); +++ +++ prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK +++ +++ /* if (bufLimit - buf >= 7) return DUMMY_LIT; */ +++ +++ prob = probs + Literal; +++ if (p->checkDicSize != 0 || p->processedPos != 0) +++ prob += (LZMA_LIT_SIZE * +++ ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) + +++ (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc)))); +++ +++ if (state < kNumLitStates) +++ { +++ unsigned symbol = 1; +++ do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100); +++ } +++ else +++ { +++ unsigned matchByte = p->dic[p->dicPos - p->reps[0] + +++ ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)]; +++ unsigned offs = 0x100; +++ unsigned symbol = 1; +++ do +++ { +++ unsigned bit; +++ CLzmaProb *probLit; +++ matchByte <<= 1; +++ bit = (matchByte & offs); +++ probLit = prob + offs + bit + symbol; +++ GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit) +++ } +++ while (symbol < 0x100); +++ } +++ res = DUMMY_LIT; +++ } +++ else +++ { +++ unsigned len; +++ UPDATE_1_CHECK; +++ +++ prob = probs + IsRep + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ state = 0; +++ prob = probs + LenCoder; +++ res = DUMMY_MATCH; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ res = DUMMY_REP; +++ prob = probs + IsRepG0 + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ NORMALIZE_CHECK; +++ return DUMMY_REP; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ } +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ prob = probs + IsRepG1 + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ prob = probs + IsRepG2 + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ } +++ } +++ } +++ state = kNumStates; +++ prob = probs + RepLenCoder; +++ } +++ { +++ unsigned limit, offset; +++ CLzmaProb *probLen = prob + LenChoice; +++ IF_BIT_0_CHECK(probLen) +++ { +++ UPDATE_0_CHECK; +++ probLen = prob + LenLow + (posState << kLenNumLowBits); +++ offset = 0; +++ limit = 1 << kLenNumLowBits; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ probLen = prob + LenChoice2; +++ IF_BIT_0_CHECK(probLen) +++ { +++ UPDATE_0_CHECK; +++ probLen = prob + LenMid + (posState << kLenNumMidBits); +++ offset = kLenNumLowSymbols; +++ limit = 1 << kLenNumMidBits; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ probLen = prob + LenHigh; +++ offset = kLenNumLowSymbols + kLenNumMidSymbols; +++ limit = 1 << kLenNumHighBits; +++ } +++ } +++ TREE_DECODE_CHECK(probLen, limit, len); +++ len += offset; +++ } +++ +++ if (state < 4) +++ { +++ unsigned posSlot; +++ prob = probs + PosSlot + +++ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << +++ kNumPosSlotBits); +++ TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot); +++ if (posSlot >= kStartPosModelIndex) +++ { +++ int numDirectBits = ((posSlot >> 1) - 1); +++ +++ /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */ +++ +++ if (posSlot < kEndPosModelIndex) +++ { +++ prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1; +++ } +++ else +++ { +++ numDirectBits -= kNumAlignBits; +++ do +++ { +++ NORMALIZE_CHECK +++ range >>= 1; +++ code -= range & (((code - range) >> 31) - 1); +++ /* if (code >= range) code -= range; */ +++ } +++ while (--numDirectBits != 0); +++ prob = probs + Align; +++ numDirectBits = kNumAlignBits; +++ } +++ { +++ unsigned i = 1; +++ do +++ { +++ GET_BIT_CHECK(prob + i, i); +++ } +++ while(--numDirectBits != 0); +++ } +++ } +++ } +++ } +++ } +++ NORMALIZE_CHECK; +++ return res; +++} +++ +++ +++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data) +++{ +++ p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]); +++ p->range = 0xFFFFFFFF; +++ p->needFlush = 0; +++} +++ +++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) +++{ +++ p->needFlush = 1; +++ p->remainLen = 0; +++ p->tempBufSize = 0; +++ +++ if (initDic) +++ { +++ p->processedPos = 0; +++ p->checkDicSize = 0; +++ p->needInitState = 1; +++ } +++ if (initState) +++ p->needInitState = 1; +++} +++ +++void LzmaDec_Init(CLzmaDec *p) +++{ +++ p->dicPos = 0; +++ LzmaDec_InitDicAndState(p, True, True); +++} +++ +++static void LzmaDec_InitStateReal(CLzmaDec *p) +++{ +++ UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp)); +++ UInt32 i; +++ CLzmaProb *probs = p->probs; +++ for (i = 0; i < numProbs; i++) +++ probs[i] = kBitModelTotal >> 1; +++ p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1; +++ p->state = 0; +++ p->needInitState = 0; +++} +++ +++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, +++ ELzmaFinishMode finishMode, ELzmaStatus *status) +++{ +++ SizeT inSize = *srcLen; +++ (*srcLen) = 0; +++ LzmaDec_WriteRem(p, dicLimit); +++ +++ *status = LZMA_STATUS_NOT_SPECIFIED; +++ +++ while (p->remainLen != kMatchSpecLenStart) +++ { +++ int checkEndMarkNow; +++ +++ if (p->needFlush != 0) +++ { +++ for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--) +++ p->tempBuf[p->tempBufSize++] = *src++; +++ if (p->tempBufSize < RC_INIT_SIZE) +++ { +++ *status = LZMA_STATUS_NEEDS_MORE_INPUT; +++ return SZ_OK; +++ } +++ if (p->tempBuf[0] != 0) +++ return SZ_ERROR_DATA; +++ +++ LzmaDec_InitRc(p, p->tempBuf); +++ p->tempBufSize = 0; +++ } +++ +++ checkEndMarkNow = 0; +++ if (p->dicPos >= dicLimit) +++ { +++ if (p->remainLen == 0 && p->code == 0) +++ { +++ *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK; +++ return SZ_OK; +++ } +++ if (finishMode == LZMA_FINISH_ANY) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_OK; +++ } +++ if (p->remainLen != 0) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_ERROR_DATA; +++ } +++ checkEndMarkNow = 1; +++ } +++ +++ if (p->needInitState) +++ LzmaDec_InitStateReal(p); +++ +++ if (p->tempBufSize == 0) +++ { +++ SizeT processed; +++ const Byte *bufLimit; +++ if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) +++ { +++ int dummyRes = LzmaDec_TryDummy(p, src, inSize); +++ if (dummyRes == DUMMY_ERROR) +++ { +++ memcpy(p->tempBuf, src, inSize); +++ p->tempBufSize = (unsigned)inSize; +++ (*srcLen) += inSize; +++ *status = LZMA_STATUS_NEEDS_MORE_INPUT; +++ return SZ_OK; +++ } +++ if (checkEndMarkNow && dummyRes != DUMMY_MATCH) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_ERROR_DATA; +++ } +++ bufLimit = src; +++ } +++ else +++ bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX; +++ p->buf = src; +++ if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0) +++ return SZ_ERROR_DATA; +++ processed = p->buf - src; +++ (*srcLen) += processed; +++ src += processed; +++ inSize -= processed; +++ } +++ else +++ { +++ unsigned rem = p->tempBufSize, lookAhead = 0; +++ while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize) +++ p->tempBuf[rem++] = src[lookAhead++]; +++ p->tempBufSize = rem; +++ if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) +++ { +++ int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem); +++ if (dummyRes == DUMMY_ERROR) +++ { +++ (*srcLen) += lookAhead; +++ *status = LZMA_STATUS_NEEDS_MORE_INPUT; +++ return SZ_OK; +++ } +++ if (checkEndMarkNow && dummyRes != DUMMY_MATCH) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_ERROR_DATA; +++ } +++ } +++ p->buf = p->tempBuf; +++ if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0) +++ return SZ_ERROR_DATA; +++ lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf)); +++ (*srcLen) += lookAhead; +++ src += lookAhead; +++ inSize -= lookAhead; +++ p->tempBufSize = 0; +++ } +++ } +++ if (p->code == 0) +++ *status = LZMA_STATUS_FINISHED_WITH_MARK; +++ return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA; +++} +++ +++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status) +++{ +++ SizeT outSize = *destLen; +++ SizeT inSize = *srcLen; +++ *srcLen = *destLen = 0; +++ for (;;) +++ { +++ SizeT inSizeCur = inSize, outSizeCur, dicPos; +++ ELzmaFinishMode curFinishMode; +++ SRes res; +++ if (p->dicPos == p->dicBufSize) +++ p->dicPos = 0; +++ dicPos = p->dicPos; +++ if (outSize > p->dicBufSize - dicPos) +++ { +++ outSizeCur = p->dicBufSize; +++ curFinishMode = LZMA_FINISH_ANY; +++ } +++ else +++ { +++ outSizeCur = dicPos + outSize; +++ curFinishMode = finishMode; +++ } +++ +++ res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status); +++ src += inSizeCur; +++ inSize -= inSizeCur; +++ *srcLen += inSizeCur; +++ outSizeCur = p->dicPos - dicPos; +++ memcpy(dest, p->dic + dicPos, outSizeCur); +++ dest += outSizeCur; +++ outSize -= outSizeCur; +++ *destLen += outSizeCur; +++ if (res != 0) +++ return res; +++ if (outSizeCur == 0 || outSize == 0) +++ return SZ_OK; +++ } +++} +++ +++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->probs); +++ p->probs = 0; +++} +++ +++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->dic); +++ p->dic = 0; +++} +++ +++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc) +++{ +++ LzmaDec_FreeProbs(p, alloc); +++ LzmaDec_FreeDict(p, alloc); +++} +++ +++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size) +++{ +++ UInt32 dicSize; +++ Byte d; +++ +++ if (size < LZMA_PROPS_SIZE) +++ return SZ_ERROR_UNSUPPORTED; +++ else +++ dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24); +++ +++ if (dicSize < LZMA_DIC_MIN) +++ dicSize = LZMA_DIC_MIN; +++ p->dicSize = dicSize; +++ +++ d = data[0]; +++ if (d >= (9 * 5 * 5)) +++ return SZ_ERROR_UNSUPPORTED; +++ +++ p->lc = d % 9; +++ d /= 9; +++ p->pb = d / 5; +++ p->lp = d % 5; +++ +++ return SZ_OK; +++} +++ +++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc) +++{ +++ UInt32 numProbs = LzmaProps_GetNumProbs(propNew); +++ if (p->probs == 0 || numProbs != p->numProbs) +++ { +++ LzmaDec_FreeProbs(p, alloc); +++ p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb)); +++ p->numProbs = numProbs; +++ if (p->probs == 0) +++ return SZ_ERROR_MEM; +++ } +++ return SZ_OK; +++} +++ +++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +++{ +++ CLzmaProps propNew; +++ RINOK(LzmaProps_Decode(&propNew, props, propsSize)); +++ RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); +++ p->prop = propNew; +++ return SZ_OK; +++} +++ +++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +++{ +++ CLzmaProps propNew; +++ SizeT dicBufSize; +++ RINOK(LzmaProps_Decode(&propNew, props, propsSize)); +++ RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); +++ dicBufSize = propNew.dicSize; +++ if (p->dic == 0 || dicBufSize != p->dicBufSize) +++ { +++ LzmaDec_FreeDict(p, alloc); +++ p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize); +++ if (p->dic == 0) +++ { +++ LzmaDec_FreeProbs(p, alloc); +++ return SZ_ERROR_MEM; +++ } +++ } +++ p->dicBufSize = dicBufSize; +++ p->prop = propNew; +++ return SZ_OK; +++} +++ +++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, +++ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, +++ ELzmaStatus *status, ISzAlloc *alloc) +++{ +++ CLzmaDec p; +++ SRes res; +++ SizeT inSize = *srcLen; +++ SizeT outSize = *destLen; +++ *srcLen = *destLen = 0; +++ if (inSize < RC_INIT_SIZE) +++ return SZ_ERROR_INPUT_EOF; +++ +++ LzmaDec_Construct(&p); +++ res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc); +++ if (res != 0) +++ return res; +++ p.dic = dest; +++ p.dicBufSize = outSize; +++ +++ LzmaDec_Init(&p); +++ +++ *srcLen = inSize; +++ res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status); +++ +++ if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT) +++ res = SZ_ERROR_INPUT_EOF; +++ +++ (*destLen) = p.dicPos; +++ LzmaDec_FreeProbs(&p, alloc); +++ return res; +++} ++--- /dev/null +++++ b/lzma/LzmaEnc.c ++@@ -0,0 +1,2335 @@ +++/* LzmaEnc.c -- LZMA Encoder +++2008-04-28 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzmaEnc.h for license options */ +++ +++#if defined(SHOW_STAT) || defined(SHOW_STAT2) +++#include +++#endif +++ +++#include +++ +++#include "LzmaEnc.h" +++ +++#include "LzFind.h" +++#ifdef COMPRESS_MF_MT +++#include "LzFindMt.h" +++#endif +++ +++/* #define SHOW_STAT */ +++/* #define SHOW_STAT2 */ +++ +++#ifdef SHOW_STAT +++static int ttt = 0; +++#endif +++ +++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1) +++ +++#define kBlockSize (9 << 10) +++#define kUnpackBlockSize (1 << 18) +++#define kMatchArraySize (1 << 21) +++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX) +++ +++#define kNumMaxDirectBits (31) +++ +++#define kNumTopBits 24 +++#define kTopValue ((UInt32)1 << kNumTopBits) +++ +++#define kNumBitModelTotalBits 11 +++#define kBitModelTotal (1 << kNumBitModelTotalBits) +++#define kNumMoveBits 5 +++#define kProbInitValue (kBitModelTotal >> 1) +++ +++#define kNumMoveReducingBits 4 +++#define kNumBitPriceShiftBits 4 +++#define kBitPrice (1 << kNumBitPriceShiftBits) +++ +++void LzmaEncProps_Init(CLzmaEncProps *p) +++{ +++ p->level = 5; +++ p->dictSize = p->mc = 0; +++ p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1; +++ p->writeEndMark = 0; +++} +++ +++void LzmaEncProps_Normalize(CLzmaEncProps *p) +++{ +++ int level = p->level; +++ if (level < 0) level = 5; +++ p->level = level; +++ if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26))); +++ if (p->lc < 0) p->lc = 3; +++ if (p->lp < 0) p->lp = 0; +++ if (p->pb < 0) p->pb = 2; +++ if (p->algo < 0) p->algo = (level < 5 ? 0 : 1); +++ if (p->fb < 0) p->fb = (level < 7 ? 32 : 64); +++ if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); +++ if (p->numHashBytes < 0) p->numHashBytes = 4; +++ if (p->mc == 0) p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1); +++ if (p->numThreads < 0) p->numThreads = ((p->btMode && p->algo) ? 2 : 1); +++} +++ +++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2) +++{ +++ CLzmaEncProps props = *props2; +++ LzmaEncProps_Normalize(&props); +++ return props.dictSize; +++} +++ +++/* #define LZMA_LOG_BSR */ +++/* Define it for Intel's CPU */ +++ +++ +++#ifdef LZMA_LOG_BSR +++ +++#define kDicLogSizeMaxCompress 30 +++ +++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); } +++ +++UInt32 GetPosSlot1(UInt32 pos) +++{ +++ UInt32 res; +++ BSR2_RET(pos, res); +++ return res; +++} +++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); } +++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); } +++ +++#else +++ +++#define kNumLogBits (9 + (int)sizeof(size_t) / 2) +++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7) +++ +++void LzmaEnc_FastPosInit(Byte *g_FastPos) +++{ +++ int c = 2, slotFast; +++ g_FastPos[0] = 0; +++ g_FastPos[1] = 1; +++ +++ for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++) +++ { +++ UInt32 k = (1 << ((slotFast >> 1) - 1)); +++ UInt32 j; +++ for (j = 0; j < k; j++, c++) +++ g_FastPos[c] = (Byte)slotFast; +++ } +++} +++ +++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \ +++ (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \ +++ res = p->g_FastPos[pos >> i] + (i * 2); } +++/* +++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \ +++ p->g_FastPos[pos >> 6] + 12 : \ +++ p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; } +++*/ +++ +++#define GetPosSlot1(pos) p->g_FastPos[pos] +++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); } +++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); } +++ +++#endif +++ +++ +++#define LZMA_NUM_REPS 4 +++ +++typedef unsigned CState; +++ +++typedef struct _COptimal +++{ +++ UInt32 price; +++ +++ CState state; +++ int prev1IsChar; +++ int prev2; +++ +++ UInt32 posPrev2; +++ UInt32 backPrev2; +++ +++ UInt32 posPrev; +++ UInt32 backPrev; +++ UInt32 backs[LZMA_NUM_REPS]; +++} COptimal; +++ +++#define kNumOpts (1 << 12) +++ +++#define kNumLenToPosStates 4 +++#define kNumPosSlotBits 6 +++#define kDicLogSizeMin 0 +++#define kDicLogSizeMax 32 +++#define kDistTableSizeMax (kDicLogSizeMax * 2) +++ +++ +++#define kNumAlignBits 4 +++#define kAlignTableSize (1 << kNumAlignBits) +++#define kAlignMask (kAlignTableSize - 1) +++ +++#define kStartPosModelIndex 4 +++#define kEndPosModelIndex 14 +++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex) +++ +++#define kNumFullDistances (1 << (kEndPosModelIndex / 2)) +++ +++#ifdef _LZMA_PROB32 +++#define CLzmaProb UInt32 +++#else +++#define CLzmaProb UInt16 +++#endif +++ +++#define LZMA_PB_MAX 4 +++#define LZMA_LC_MAX 8 +++#define LZMA_LP_MAX 4 +++ +++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX) +++ +++ +++#define kLenNumLowBits 3 +++#define kLenNumLowSymbols (1 << kLenNumLowBits) +++#define kLenNumMidBits 3 +++#define kLenNumMidSymbols (1 << kLenNumMidBits) +++#define kLenNumHighBits 8 +++#define kLenNumHighSymbols (1 << kLenNumHighBits) +++ +++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols) +++ +++#define LZMA_MATCH_LEN_MIN 2 +++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1) +++ +++#define kNumStates 12 +++ +++typedef struct +++{ +++ CLzmaProb choice; +++ CLzmaProb choice2; +++ CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits]; +++ CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits]; +++ CLzmaProb high[kLenNumHighSymbols]; +++} CLenEnc; +++ +++typedef struct +++{ +++ CLenEnc p; +++ UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal]; +++ UInt32 tableSize; +++ UInt32 counters[LZMA_NUM_PB_STATES_MAX]; +++} CLenPriceEnc; +++ +++typedef struct _CRangeEnc +++{ +++ UInt32 range; +++ Byte cache; +++ UInt64 low; +++ UInt64 cacheSize; +++ Byte *buf; +++ Byte *bufLim; +++ Byte *bufBase; +++ ISeqOutStream *outStream; +++ UInt64 processed; +++ SRes res; +++} CRangeEnc; +++ +++typedef struct _CSeqInStreamBuf +++{ +++ ISeqInStream funcTable; +++ const Byte *data; +++ SizeT rem; +++} CSeqInStreamBuf; +++ +++static SRes MyRead(void *pp, void *data, size_t *size) +++{ +++ size_t curSize = *size; +++ CSeqInStreamBuf *p = (CSeqInStreamBuf *)pp; +++ if (p->rem < curSize) +++ curSize = p->rem; +++ memcpy(data, p->data, curSize); +++ p->rem -= curSize; +++ p->data += curSize; +++ *size = curSize; +++ return SZ_OK; +++} +++ +++typedef struct +++{ +++ CLzmaProb *litProbs; +++ +++ CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ CLzmaProb isRep[kNumStates]; +++ CLzmaProb isRepG0[kNumStates]; +++ CLzmaProb isRepG1[kNumStates]; +++ CLzmaProb isRepG2[kNumStates]; +++ CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ +++ CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; +++ CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; +++ CLzmaProb posAlignEncoder[1 << kNumAlignBits]; +++ +++ CLenPriceEnc lenEnc; +++ CLenPriceEnc repLenEnc; +++ +++ UInt32 reps[LZMA_NUM_REPS]; +++ UInt32 state; +++} CSaveState; +++ +++typedef struct _CLzmaEnc +++{ +++ IMatchFinder matchFinder; +++ void *matchFinderObj; +++ +++ #ifdef COMPRESS_MF_MT +++ Bool mtMode; +++ CMatchFinderMt matchFinderMt; +++ #endif +++ +++ CMatchFinder matchFinderBase; +++ +++ #ifdef COMPRESS_MF_MT +++ Byte pad[128]; +++ #endif +++ +++ UInt32 optimumEndIndex; +++ UInt32 optimumCurrentIndex; +++ +++ Bool longestMatchWasFound; +++ UInt32 longestMatchLength; +++ UInt32 numDistancePairs; +++ +++ COptimal opt[kNumOpts]; +++ +++ #ifndef LZMA_LOG_BSR +++ Byte g_FastPos[1 << kNumLogBits]; +++ #endif +++ +++ UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits]; +++ UInt32 matchDistances[LZMA_MATCH_LEN_MAX * 2 + 2 + 1]; +++ UInt32 numFastBytes; +++ UInt32 additionalOffset; +++ UInt32 reps[LZMA_NUM_REPS]; +++ UInt32 state; +++ +++ UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax]; +++ UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances]; +++ UInt32 alignPrices[kAlignTableSize]; +++ UInt32 alignPriceCount; +++ +++ UInt32 distTableSize; +++ +++ unsigned lc, lp, pb; +++ unsigned lpMask, pbMask; +++ +++ CLzmaProb *litProbs; +++ +++ CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ CLzmaProb isRep[kNumStates]; +++ CLzmaProb isRepG0[kNumStates]; +++ CLzmaProb isRepG1[kNumStates]; +++ CLzmaProb isRepG2[kNumStates]; +++ CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ +++ CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; +++ CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; +++ CLzmaProb posAlignEncoder[1 << kNumAlignBits]; +++ +++ CLenPriceEnc lenEnc; +++ CLenPriceEnc repLenEnc; +++ +++ unsigned lclp; +++ +++ Bool fastMode; +++ +++ CRangeEnc rc; +++ +++ Bool writeEndMark; +++ UInt64 nowPos64; +++ UInt32 matchPriceCount; +++ Bool finished; +++ Bool multiThread; +++ +++ SRes result; +++ UInt32 dictSize; +++ UInt32 matchFinderCycles; +++ +++ ISeqInStream *inStream; +++ CSeqInStreamBuf seqBufInStream; +++ +++ CSaveState saveState; +++} CLzmaEnc; +++ +++void LzmaEnc_SaveState(CLzmaEncHandle pp) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ CSaveState *dest = &p->saveState; +++ int i; +++ dest->lenEnc = p->lenEnc; +++ dest->repLenEnc = p->repLenEnc; +++ dest->state = p->state; +++ +++ for (i = 0; i < kNumStates; i++) +++ { +++ memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); +++ memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); +++ } +++ for (i = 0; i < kNumLenToPosStates; i++) +++ memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); +++ memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); +++ memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); +++ memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); +++ memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); +++ memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); +++ memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); +++ memcpy(dest->reps, p->reps, sizeof(p->reps)); +++ memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb)); +++} +++ +++void LzmaEnc_RestoreState(CLzmaEncHandle pp) +++{ +++ CLzmaEnc *dest = (CLzmaEnc *)pp; +++ const CSaveState *p = &dest->saveState; +++ int i; +++ dest->lenEnc = p->lenEnc; +++ dest->repLenEnc = p->repLenEnc; +++ dest->state = p->state; +++ +++ for (i = 0; i < kNumStates; i++) +++ { +++ memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); +++ memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); +++ } +++ for (i = 0; i < kNumLenToPosStates; i++) +++ memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); +++ memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); +++ memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); +++ memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); +++ memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); +++ memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); +++ memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); +++ memcpy(dest->reps, p->reps, sizeof(p->reps)); +++ memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb)); +++} +++ +++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ CLzmaEncProps props = *props2; +++ LzmaEncProps_Normalize(&props); +++ +++ if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX || +++ props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30)) +++ return SZ_ERROR_PARAM; +++ p->dictSize = props.dictSize; +++ p->matchFinderCycles = props.mc; +++ { +++ unsigned fb = props.fb; +++ if (fb < 5) +++ fb = 5; +++ if (fb > LZMA_MATCH_LEN_MAX) +++ fb = LZMA_MATCH_LEN_MAX; +++ p->numFastBytes = fb; +++ } +++ p->lc = props.lc; +++ p->lp = props.lp; +++ p->pb = props.pb; +++ p->fastMode = (props.algo == 0); +++ p->matchFinderBase.btMode = props.btMode; +++ { +++ UInt32 numHashBytes = 4; +++ if (props.btMode) +++ { +++ if (props.numHashBytes < 2) +++ numHashBytes = 2; +++ else if (props.numHashBytes < 4) +++ numHashBytes = props.numHashBytes; +++ } +++ p->matchFinderBase.numHashBytes = numHashBytes; +++ } +++ +++ p->matchFinderBase.cutValue = props.mc; +++ +++ p->writeEndMark = props.writeEndMark; +++ +++ #ifdef COMPRESS_MF_MT +++ /* +++ if (newMultiThread != _multiThread) +++ { +++ ReleaseMatchFinder(); +++ _multiThread = newMultiThread; +++ } +++ */ +++ p->multiThread = (props.numThreads > 1); +++ #endif +++ +++ return SZ_OK; +++} +++ +++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5}; +++static const int kMatchNextStates[kNumStates] = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10}; +++static const int kRepNextStates[kNumStates] = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11}; +++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11}; +++ +++/* +++ void UpdateChar() { Index = kLiteralNextStates[Index]; } +++ void UpdateMatch() { Index = kMatchNextStates[Index]; } +++ void UpdateRep() { Index = kRepNextStates[Index]; } +++ void UpdateShortRep() { Index = kShortRepNextStates[Index]; } +++*/ +++ +++#define IsCharState(s) ((s) < 7) +++ +++ +++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1) +++ +++#define kInfinityPrice (1 << 30) +++ +++static void RangeEnc_Construct(CRangeEnc *p) +++{ +++ p->outStream = 0; +++ p->bufBase = 0; +++} +++ +++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize) +++ +++#define RC_BUF_SIZE (1 << 16) +++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc) +++{ +++ if (p->bufBase == 0) +++ { +++ p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE); +++ if (p->bufBase == 0) +++ return 0; +++ p->bufLim = p->bufBase + RC_BUF_SIZE; +++ } +++ return 1; +++} +++ +++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->bufBase); +++ p->bufBase = 0; +++} +++ +++static void RangeEnc_Init(CRangeEnc *p) +++{ +++ /* Stream.Init(); */ +++ p->low = 0; +++ p->range = 0xFFFFFFFF; +++ p->cacheSize = 1; +++ p->cache = 0; +++ +++ p->buf = p->bufBase; +++ +++ p->processed = 0; +++ p->res = SZ_OK; +++} +++ +++static void RangeEnc_FlushStream(CRangeEnc *p) +++{ +++ size_t num; +++ if (p->res != SZ_OK) +++ return; +++ num = p->buf - p->bufBase; +++ if (num != p->outStream->Write(p->outStream, p->bufBase, num)) +++ p->res = SZ_ERROR_WRITE; +++ p->processed += num; +++ p->buf = p->bufBase; +++} +++ +++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p) +++{ +++ if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0) +++ { +++ Byte temp = p->cache; +++ do +++ { +++ Byte *buf = p->buf; +++ *buf++ = (Byte)(temp + (Byte)(p->low >> 32)); +++ p->buf = buf; +++ if (buf == p->bufLim) +++ RangeEnc_FlushStream(p); +++ temp = 0xFF; +++ } +++ while (--p->cacheSize != 0); +++ p->cache = (Byte)((UInt32)p->low >> 24); +++ } +++ p->cacheSize++; +++ p->low = (UInt32)p->low << 8; +++} +++ +++static void RangeEnc_FlushData(CRangeEnc *p) +++{ +++ int i; +++ for (i = 0; i < 5; i++) +++ RangeEnc_ShiftLow(p); +++} +++ +++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits) +++{ +++ do +++ { +++ p->range >>= 1; +++ p->low += p->range & (0 - ((value >> --numBits) & 1)); +++ if (p->range < kTopValue) +++ { +++ p->range <<= 8; +++ RangeEnc_ShiftLow(p); +++ } +++ } +++ while (numBits != 0); +++} +++ +++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol) +++{ +++ UInt32 ttt = *prob; +++ UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt; +++ if (symbol == 0) +++ { +++ p->range = newBound; +++ ttt += (kBitModelTotal - ttt) >> kNumMoveBits; +++ } +++ else +++ { +++ p->low += newBound; +++ p->range -= newBound; +++ ttt -= ttt >> kNumMoveBits; +++ } +++ *prob = (CLzmaProb)ttt; +++ if (p->range < kTopValue) +++ { +++ p->range <<= 8; +++ RangeEnc_ShiftLow(p); +++ } +++} +++ +++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol) +++{ +++ symbol |= 0x100; +++ do +++ { +++ RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1); +++ symbol <<= 1; +++ } +++ while (symbol < 0x10000); +++} +++ +++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte) +++{ +++ UInt32 offs = 0x100; +++ symbol |= 0x100; +++ do +++ { +++ matchByte <<= 1; +++ RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1); +++ symbol <<= 1; +++ offs &= ~(matchByte ^ symbol); +++ } +++ while (symbol < 0x10000); +++} +++ +++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices) +++{ +++ UInt32 i; +++ for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits)) +++ { +++ const int kCyclesBits = kNumBitPriceShiftBits; +++ UInt32 w = i; +++ UInt32 bitCount = 0; +++ int j; +++ for (j = 0; j < kCyclesBits; j++) +++ { +++ w = w * w; +++ bitCount <<= 1; +++ while (w >= ((UInt32)1 << 16)) +++ { +++ w >>= 1; +++ bitCount++; +++ } +++ } +++ ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount); +++ } +++} +++ +++ +++#define GET_PRICE(prob, symbol) \ +++ p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits]; +++ +++#define GET_PRICEa(prob, symbol) \ +++ ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits]; +++ +++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits] +++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits] +++ +++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits] +++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits] +++ +++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ symbol |= 0x100; +++ do +++ { +++ price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1); +++ symbol <<= 1; +++ } +++ while (symbol < 0x10000); +++ return price; +++}; +++ +++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ UInt32 offs = 0x100; +++ symbol |= 0x100; +++ do +++ { +++ matchByte <<= 1; +++ price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1); +++ symbol <<= 1; +++ offs &= ~(matchByte ^ symbol); +++ } +++ while (symbol < 0x10000); +++ return price; +++}; +++ +++ +++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol) +++{ +++ UInt32 m = 1; +++ int i; +++ for (i = numBitLevels; i != 0 ;) +++ { +++ UInt32 bit; +++ i--; +++ bit = (symbol >> i) & 1; +++ RangeEnc_EncodeBit(rc, probs + m, bit); +++ m = (m << 1) | bit; +++ } +++}; +++ +++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol) +++{ +++ UInt32 m = 1; +++ int i; +++ for (i = 0; i < numBitLevels; i++) +++ { +++ UInt32 bit = symbol & 1; +++ RangeEnc_EncodeBit(rc, probs + m, bit); +++ m = (m << 1) | bit; +++ symbol >>= 1; +++ } +++} +++ +++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ symbol |= (1 << numBitLevels); +++ while (symbol != 1) +++ { +++ price += GET_PRICEa(probs[symbol >> 1], symbol & 1); +++ symbol >>= 1; +++ } +++ return price; +++} +++ +++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ UInt32 m = 1; +++ int i; +++ for (i = numBitLevels; i != 0; i--) +++ { +++ UInt32 bit = symbol & 1; +++ symbol >>= 1; +++ price += GET_PRICEa(probs[m], bit); +++ m = (m << 1) | bit; +++ } +++ return price; +++} +++ +++ +++static void LenEnc_Init(CLenEnc *p) +++{ +++ unsigned i; +++ p->choice = p->choice2 = kProbInitValue; +++ for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++) +++ p->low[i] = kProbInitValue; +++ for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++) +++ p->mid[i] = kProbInitValue; +++ for (i = 0; i < kLenNumHighSymbols; i++) +++ p->high[i] = kProbInitValue; +++} +++ +++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState) +++{ +++ if (symbol < kLenNumLowSymbols) +++ { +++ RangeEnc_EncodeBit(rc, &p->choice, 0); +++ RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol); +++ } +++ else +++ { +++ RangeEnc_EncodeBit(rc, &p->choice, 1); +++ if (symbol < kLenNumLowSymbols + kLenNumMidSymbols) +++ { +++ RangeEnc_EncodeBit(rc, &p->choice2, 0); +++ RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols); +++ } +++ else +++ { +++ RangeEnc_EncodeBit(rc, &p->choice2, 1); +++ RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols); +++ } +++ } +++} +++ +++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices) +++{ +++ UInt32 a0 = GET_PRICE_0a(p->choice); +++ UInt32 a1 = GET_PRICE_1a(p->choice); +++ UInt32 b0 = a1 + GET_PRICE_0a(p->choice2); +++ UInt32 b1 = a1 + GET_PRICE_1a(p->choice2); +++ UInt32 i = 0; +++ for (i = 0; i < kLenNumLowSymbols; i++) +++ { +++ if (i >= numSymbols) +++ return; +++ prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices); +++ } +++ for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++) +++ { +++ if (i >= numSymbols) +++ return; +++ prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices); +++ } +++ for (; i < numSymbols; i++) +++ prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices); +++} +++ +++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices) +++{ +++ LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices); +++ p->counters[posState] = p->tableSize; +++} +++ +++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices) +++{ +++ UInt32 posState; +++ for (posState = 0; posState < numPosStates; posState++) +++ LenPriceEnc_UpdateTable(p, posState, ProbPrices); +++} +++ +++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices) +++{ +++ LenEnc_Encode(&p->p, rc, symbol, posState); +++ if (updatePrice) +++ if (--p->counters[posState] == 0) +++ LenPriceEnc_UpdateTable(p, posState, ProbPrices); +++} +++ +++ +++ +++ +++static void MovePos(CLzmaEnc *p, UInt32 num) +++{ +++ #ifdef SHOW_STAT +++ ttt += num; +++ printf("\n MovePos %d", num); +++ #endif +++ if (num != 0) +++ { +++ p->additionalOffset += num; +++ p->matchFinder.Skip(p->matchFinderObj, num); +++ } +++} +++ +++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes) +++{ +++ UInt32 lenRes = 0, numDistancePairs; +++ numDistancePairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matchDistances); +++ #ifdef SHOW_STAT +++ printf("\n i = %d numPairs = %d ", ttt, numDistancePairs / 2); +++ if (ttt >= 61994) +++ ttt = ttt; +++ +++ ttt++; +++ { +++ UInt32 i; +++ for (i = 0; i < numDistancePairs; i += 2) +++ printf("%2d %6d | ", p->matchDistances[i], p->matchDistances[i + 1]); +++ } +++ #endif +++ if (numDistancePairs > 0) +++ { +++ lenRes = p->matchDistances[numDistancePairs - 2]; +++ if (lenRes == p->numFastBytes) +++ { +++ UInt32 numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) + 1; +++ const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ UInt32 distance = p->matchDistances[numDistancePairs - 1] + 1; +++ if (numAvail > LZMA_MATCH_LEN_MAX) +++ numAvail = LZMA_MATCH_LEN_MAX; +++ +++ { +++ const Byte *pby2 = pby - distance; +++ for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++); +++ } +++ } +++ } +++ p->additionalOffset++; +++ *numDistancePairsRes = numDistancePairs; +++ return lenRes; +++} +++ +++ +++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False; +++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False; +++#define IsShortRep(p) ((p)->backPrev == 0) +++ +++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState) +++{ +++ return +++ GET_PRICE_0(p->isRepG0[state]) + +++ GET_PRICE_0(p->isRep0Long[state][posState]); +++} +++ +++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState) +++{ +++ UInt32 price; +++ if (repIndex == 0) +++ { +++ price = GET_PRICE_0(p->isRepG0[state]); +++ price += GET_PRICE_1(p->isRep0Long[state][posState]); +++ } +++ else +++ { +++ price = GET_PRICE_1(p->isRepG0[state]); +++ if (repIndex == 1) +++ price += GET_PRICE_0(p->isRepG1[state]); +++ else +++ { +++ price += GET_PRICE_1(p->isRepG1[state]); +++ price += GET_PRICE(p->isRepG2[state], repIndex - 2); +++ } +++ } +++ return price; +++} +++ +++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState) +++{ +++ return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] + +++ GetPureRepPrice(p, repIndex, state, posState); +++} +++ +++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur) +++{ +++ UInt32 posMem = p->opt[cur].posPrev; +++ UInt32 backMem = p->opt[cur].backPrev; +++ p->optimumEndIndex = cur; +++ do +++ { +++ if (p->opt[cur].prev1IsChar) +++ { +++ MakeAsChar(&p->opt[posMem]) +++ p->opt[posMem].posPrev = posMem - 1; +++ if (p->opt[cur].prev2) +++ { +++ p->opt[posMem - 1].prev1IsChar = False; +++ p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2; +++ p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2; +++ } +++ } +++ { +++ UInt32 posPrev = posMem; +++ UInt32 backCur = backMem; +++ +++ backMem = p->opt[posPrev].backPrev; +++ posMem = p->opt[posPrev].posPrev; +++ +++ p->opt[posPrev].backPrev = backCur; +++ p->opt[posPrev].posPrev = cur; +++ cur = posPrev; +++ } +++ } +++ while (cur != 0); +++ *backRes = p->opt[0].backPrev; +++ p->optimumCurrentIndex = p->opt[0].posPrev; +++ return p->optimumCurrentIndex; +++} +++ +++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300) +++ +++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes) +++{ +++ UInt32 numAvailableBytes, lenMain, numDistancePairs; +++ const Byte *data; +++ UInt32 reps[LZMA_NUM_REPS]; +++ UInt32 repLens[LZMA_NUM_REPS]; +++ UInt32 repMaxIndex, i; +++ UInt32 *matchDistances; +++ Byte currentByte, matchByte; +++ UInt32 posState; +++ UInt32 matchPrice, repMatchPrice; +++ UInt32 lenEnd; +++ UInt32 len; +++ UInt32 normalMatchPrice; +++ UInt32 cur; +++ if (p->optimumEndIndex != p->optimumCurrentIndex) +++ { +++ const COptimal *opt = &p->opt[p->optimumCurrentIndex]; +++ UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex; +++ *backRes = opt->backPrev; +++ p->optimumCurrentIndex = opt->posPrev; +++ return lenRes; +++ } +++ p->optimumCurrentIndex = p->optimumEndIndex = 0; +++ +++ numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ +++ if (!p->longestMatchWasFound) +++ { +++ lenMain = ReadMatchDistances(p, &numDistancePairs); +++ } +++ else +++ { +++ lenMain = p->longestMatchLength; +++ numDistancePairs = p->numDistancePairs; +++ p->longestMatchWasFound = False; +++ } +++ +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ if (numAvailableBytes < 2) +++ { +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ if (numAvailableBytes > LZMA_MATCH_LEN_MAX) +++ numAvailableBytes = LZMA_MATCH_LEN_MAX; +++ +++ repMaxIndex = 0; +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ UInt32 lenTest; +++ const Byte *data2; +++ reps[i] = p->reps[i]; +++ data2 = data - (reps[i] + 1); +++ if (data[0] != data2[0] || data[1] != data2[1]) +++ { +++ repLens[i] = 0; +++ continue; +++ } +++ for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++); +++ repLens[i] = lenTest; +++ if (lenTest > repLens[repMaxIndex]) +++ repMaxIndex = i; +++ } +++ if (repLens[repMaxIndex] >= p->numFastBytes) +++ { +++ UInt32 lenRes; +++ *backRes = repMaxIndex; +++ lenRes = repLens[repMaxIndex]; +++ MovePos(p, lenRes - 1); +++ return lenRes; +++ } +++ +++ matchDistances = p->matchDistances; +++ if (lenMain >= p->numFastBytes) +++ { +++ *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; +++ MovePos(p, lenMain - 1); +++ return lenMain; +++ } +++ currentByte = *data; +++ matchByte = *(data - (reps[0] + 1)); +++ +++ if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2) +++ { +++ *backRes = (UInt32)-1; +++ return 1; +++ } +++ +++ p->opt[0].state = (CState)p->state; +++ +++ posState = (position & p->pbMask); +++ +++ { +++ const CLzmaProb *probs = LIT_PROBS(position, *(data - 1)); +++ p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) + +++ (!IsCharState(p->state) ? +++ LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) : +++ LitEnc_GetPrice(probs, currentByte, p->ProbPrices)); +++ } +++ +++ MakeAsChar(&p->opt[1]); +++ +++ matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]); +++ repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]); +++ +++ if (matchByte == currentByte) +++ { +++ UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState); +++ if (shortRepPrice < p->opt[1].price) +++ { +++ p->opt[1].price = shortRepPrice; +++ MakeAsShortRep(&p->opt[1]); +++ } +++ } +++ lenEnd = ((lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex]); +++ +++ if (lenEnd < 2) +++ { +++ *backRes = p->opt[1].backPrev; +++ return 1; +++ } +++ +++ p->opt[1].posPrev = 0; +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ p->opt[0].backs[i] = reps[i]; +++ +++ len = lenEnd; +++ do +++ p->opt[len--].price = kInfinityPrice; +++ while (len >= 2); +++ +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ UInt32 repLen = repLens[i]; +++ UInt32 price; +++ if (repLen < 2) +++ continue; +++ price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState); +++ do +++ { +++ UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2]; +++ COptimal *opt = &p->opt[repLen]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = 0; +++ opt->backPrev = i; +++ opt->prev1IsChar = False; +++ } +++ } +++ while (--repLen >= 2); +++ } +++ +++ normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]); +++ +++ len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2); +++ if (len <= lenMain) +++ { +++ UInt32 offs = 0; +++ while (len > matchDistances[offs]) +++ offs += 2; +++ for (; ; len++) +++ { +++ COptimal *opt; +++ UInt32 distance = matchDistances[offs + 1]; +++ +++ UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN]; +++ UInt32 lenToPosState = GetLenToPosState(len); +++ if (distance < kNumFullDistances) +++ curAndLenPrice += p->distancesPrices[lenToPosState][distance]; +++ else +++ { +++ UInt32 slot; +++ GetPosSlot2(distance, slot); +++ curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot]; +++ } +++ opt = &p->opt[len]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = 0; +++ opt->backPrev = distance + LZMA_NUM_REPS; +++ opt->prev1IsChar = False; +++ } +++ if (len == matchDistances[offs]) +++ { +++ offs += 2; +++ if (offs == numDistancePairs) +++ break; +++ } +++ } +++ } +++ +++ cur = 0; +++ +++ #ifdef SHOW_STAT2 +++ if (position >= 0) +++ { +++ unsigned i; +++ printf("\n pos = %4X", position); +++ for (i = cur; i <= lenEnd; i++) +++ printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price); +++ } +++ #endif +++ +++ for (;;) +++ { +++ UInt32 numAvailableBytesFull, newLen, numDistancePairs; +++ COptimal *curOpt; +++ UInt32 posPrev; +++ UInt32 state; +++ UInt32 curPrice; +++ Bool nextIsChar; +++ const Byte *data; +++ Byte currentByte, matchByte; +++ UInt32 posState; +++ UInt32 curAnd1Price; +++ COptimal *nextOpt; +++ UInt32 matchPrice, repMatchPrice; +++ UInt32 numAvailableBytes; +++ UInt32 startLen; +++ +++ cur++; +++ if (cur == lenEnd) +++ return Backward(p, backRes, cur); +++ +++ numAvailableBytesFull = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ newLen = ReadMatchDistances(p, &numDistancePairs); +++ if (newLen >= p->numFastBytes) +++ { +++ p->numDistancePairs = numDistancePairs; +++ p->longestMatchLength = newLen; +++ p->longestMatchWasFound = True; +++ return Backward(p, backRes, cur); +++ } +++ position++; +++ curOpt = &p->opt[cur]; +++ posPrev = curOpt->posPrev; +++ if (curOpt->prev1IsChar) +++ { +++ posPrev--; +++ if (curOpt->prev2) +++ { +++ state = p->opt[curOpt->posPrev2].state; +++ if (curOpt->backPrev2 < LZMA_NUM_REPS) +++ state = kRepNextStates[state]; +++ else +++ state = kMatchNextStates[state]; +++ } +++ else +++ state = p->opt[posPrev].state; +++ state = kLiteralNextStates[state]; +++ } +++ else +++ state = p->opt[posPrev].state; +++ if (posPrev == cur - 1) +++ { +++ if (IsShortRep(curOpt)) +++ state = kShortRepNextStates[state]; +++ else +++ state = kLiteralNextStates[state]; +++ } +++ else +++ { +++ UInt32 pos; +++ const COptimal *prevOpt; +++ if (curOpt->prev1IsChar && curOpt->prev2) +++ { +++ posPrev = curOpt->posPrev2; +++ pos = curOpt->backPrev2; +++ state = kRepNextStates[state]; +++ } +++ else +++ { +++ pos = curOpt->backPrev; +++ if (pos < LZMA_NUM_REPS) +++ state = kRepNextStates[state]; +++ else +++ state = kMatchNextStates[state]; +++ } +++ prevOpt = &p->opt[posPrev]; +++ if (pos < LZMA_NUM_REPS) +++ { +++ UInt32 i; +++ reps[0] = prevOpt->backs[pos]; +++ for (i = 1; i <= pos; i++) +++ reps[i] = prevOpt->backs[i - 1]; +++ for (; i < LZMA_NUM_REPS; i++) +++ reps[i] = prevOpt->backs[i]; +++ } +++ else +++ { +++ UInt32 i; +++ reps[0] = (pos - LZMA_NUM_REPS); +++ for (i = 1; i < LZMA_NUM_REPS; i++) +++ reps[i] = prevOpt->backs[i - 1]; +++ } +++ } +++ curOpt->state = (CState)state; +++ +++ curOpt->backs[0] = reps[0]; +++ curOpt->backs[1] = reps[1]; +++ curOpt->backs[2] = reps[2]; +++ curOpt->backs[3] = reps[3]; +++ +++ curPrice = curOpt->price; +++ nextIsChar = False; +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ currentByte = *data; +++ matchByte = *(data - (reps[0] + 1)); +++ +++ posState = (position & p->pbMask); +++ +++ curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]); +++ { +++ const CLzmaProb *probs = LIT_PROBS(position, *(data - 1)); +++ curAnd1Price += +++ (!IsCharState(state) ? +++ LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) : +++ LitEnc_GetPrice(probs, currentByte, p->ProbPrices)); +++ } +++ +++ nextOpt = &p->opt[cur + 1]; +++ +++ if (curAnd1Price < nextOpt->price) +++ { +++ nextOpt->price = curAnd1Price; +++ nextOpt->posPrev = cur; +++ MakeAsChar(nextOpt); +++ nextIsChar = True; +++ } +++ +++ matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]); +++ repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]); +++ +++ if (matchByte == currentByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0)) +++ { +++ UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState); +++ if (shortRepPrice <= nextOpt->price) +++ { +++ nextOpt->price = shortRepPrice; +++ nextOpt->posPrev = cur; +++ MakeAsShortRep(nextOpt); +++ nextIsChar = True; +++ } +++ } +++ +++ { +++ UInt32 temp = kNumOpts - 1 - cur; +++ if (temp < numAvailableBytesFull) +++ numAvailableBytesFull = temp; +++ } +++ numAvailableBytes = numAvailableBytesFull; +++ +++ if (numAvailableBytes < 2) +++ continue; +++ if (numAvailableBytes > p->numFastBytes) +++ numAvailableBytes = p->numFastBytes; +++ if (!nextIsChar && matchByte != currentByte) /* speed optimization */ +++ { +++ /* try Literal + rep0 */ +++ UInt32 temp; +++ UInt32 lenTest2; +++ const Byte *data2 = data - (reps[0] + 1); +++ UInt32 limit = p->numFastBytes + 1; +++ if (limit > numAvailableBytesFull) +++ limit = numAvailableBytesFull; +++ +++ for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++); +++ lenTest2 = temp - 1; +++ if (lenTest2 >= 2) +++ { +++ UInt32 state2 = kLiteralNextStates[state]; +++ UInt32 posStateNext = (position + 1) & p->pbMask; +++ UInt32 nextRepMatchPrice = curAnd1Price + +++ GET_PRICE_1(p->isMatch[state2][posStateNext]) + +++ GET_PRICE_1(p->isRep[state2]); +++ /* for (; lenTest2 >= 2; lenTest2--) */ +++ { +++ UInt32 curAndLenPrice; +++ COptimal *opt; +++ UInt32 offset = cur + 1 + lenTest2; +++ while (lenEnd < offset) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); +++ opt = &p->opt[offset]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur + 1; +++ opt->backPrev = 0; +++ opt->prev1IsChar = True; +++ opt->prev2 = False; +++ } +++ } +++ } +++ } +++ +++ startLen = 2; /* speed optimization */ +++ { +++ UInt32 repIndex; +++ for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++) +++ { +++ UInt32 lenTest; +++ UInt32 lenTestTemp; +++ UInt32 price; +++ const Byte *data2 = data - (reps[repIndex] + 1); +++ if (data[0] != data2[0] || data[1] != data2[1]) +++ continue; +++ for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++); +++ while (lenEnd < cur + lenTest) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ lenTestTemp = lenTest; +++ price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState); +++ do +++ { +++ UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2]; +++ COptimal *opt = &p->opt[cur + lenTest]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur; +++ opt->backPrev = repIndex; +++ opt->prev1IsChar = False; +++ } +++ } +++ while (--lenTest >= 2); +++ lenTest = lenTestTemp; +++ +++ if (repIndex == 0) +++ startLen = lenTest + 1; +++ +++ /* if (_maxMode) */ +++ { +++ UInt32 lenTest2 = lenTest + 1; +++ UInt32 limit = lenTest2 + p->numFastBytes; +++ UInt32 nextRepMatchPrice; +++ if (limit > numAvailableBytesFull) +++ limit = numAvailableBytesFull; +++ for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++); +++ lenTest2 -= lenTest + 1; +++ if (lenTest2 >= 2) +++ { +++ UInt32 state2 = kRepNextStates[state]; +++ UInt32 posStateNext = (position + lenTest) & p->pbMask; +++ UInt32 curAndLenCharPrice = +++ price + p->repLenEnc.prices[posState][lenTest - 2] + +++ GET_PRICE_0(p->isMatch[state2][posStateNext]) + +++ LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]), +++ data[lenTest], data2[lenTest], p->ProbPrices); +++ state2 = kLiteralNextStates[state2]; +++ posStateNext = (position + lenTest + 1) & p->pbMask; +++ nextRepMatchPrice = curAndLenCharPrice + +++ GET_PRICE_1(p->isMatch[state2][posStateNext]) + +++ GET_PRICE_1(p->isRep[state2]); +++ +++ /* for (; lenTest2 >= 2; lenTest2--) */ +++ { +++ UInt32 curAndLenPrice; +++ COptimal *opt; +++ UInt32 offset = cur + lenTest + 1 + lenTest2; +++ while (lenEnd < offset) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); +++ opt = &p->opt[offset]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur + lenTest + 1; +++ opt->backPrev = 0; +++ opt->prev1IsChar = True; +++ opt->prev2 = True; +++ opt->posPrev2 = cur; +++ opt->backPrev2 = repIndex; +++ } +++ } +++ } +++ } +++ } +++ } +++ /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */ +++ if (newLen > numAvailableBytes) +++ { +++ newLen = numAvailableBytes; +++ for (numDistancePairs = 0; newLen > matchDistances[numDistancePairs]; numDistancePairs += 2); +++ matchDistances[numDistancePairs] = newLen; +++ numDistancePairs += 2; +++ } +++ if (newLen >= startLen) +++ { +++ UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]); +++ UInt32 offs, curBack, posSlot; +++ UInt32 lenTest; +++ while (lenEnd < cur + newLen) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ +++ offs = 0; +++ while (startLen > matchDistances[offs]) +++ offs += 2; +++ curBack = matchDistances[offs + 1]; +++ GetPosSlot2(curBack, posSlot); +++ for (lenTest = /*2*/ startLen; ; lenTest++) +++ { +++ UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN]; +++ UInt32 lenToPosState = GetLenToPosState(lenTest); +++ COptimal *opt; +++ if (curBack < kNumFullDistances) +++ curAndLenPrice += p->distancesPrices[lenToPosState][curBack]; +++ else +++ curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask]; +++ +++ opt = &p->opt[cur + lenTest]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur; +++ opt->backPrev = curBack + LZMA_NUM_REPS; +++ opt->prev1IsChar = False; +++ } +++ +++ if (/*_maxMode && */lenTest == matchDistances[offs]) +++ { +++ /* Try Match + Literal + Rep0 */ +++ const Byte *data2 = data - (curBack + 1); +++ UInt32 lenTest2 = lenTest + 1; +++ UInt32 limit = lenTest2 + p->numFastBytes; +++ UInt32 nextRepMatchPrice; +++ if (limit > numAvailableBytesFull) +++ limit = numAvailableBytesFull; +++ for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++); +++ lenTest2 -= lenTest + 1; +++ if (lenTest2 >= 2) +++ { +++ UInt32 state2 = kMatchNextStates[state]; +++ UInt32 posStateNext = (position + lenTest) & p->pbMask; +++ UInt32 curAndLenCharPrice = curAndLenPrice + +++ GET_PRICE_0(p->isMatch[state2][posStateNext]) + +++ LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]), +++ data[lenTest], data2[lenTest], p->ProbPrices); +++ state2 = kLiteralNextStates[state2]; +++ posStateNext = (posStateNext + 1) & p->pbMask; +++ nextRepMatchPrice = curAndLenCharPrice + +++ GET_PRICE_1(p->isMatch[state2][posStateNext]) + +++ GET_PRICE_1(p->isRep[state2]); +++ +++ /* for (; lenTest2 >= 2; lenTest2--) */ +++ { +++ UInt32 offset = cur + lenTest + 1 + lenTest2; +++ UInt32 curAndLenPrice; +++ COptimal *opt; +++ while (lenEnd < offset) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); +++ opt = &p->opt[offset]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur + lenTest + 1; +++ opt->backPrev = 0; +++ opt->prev1IsChar = True; +++ opt->prev2 = True; +++ opt->posPrev2 = cur; +++ opt->backPrev2 = curBack + LZMA_NUM_REPS; +++ } +++ } +++ } +++ offs += 2; +++ if (offs == numDistancePairs) +++ break; +++ curBack = matchDistances[offs + 1]; +++ if (curBack >= kNumFullDistances) +++ GetPosSlot2(curBack, posSlot); +++ } +++ } +++ } +++ } +++} +++ +++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist)) +++ +++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes) +++{ +++ UInt32 numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ UInt32 lenMain, numDistancePairs; +++ const Byte *data; +++ UInt32 repLens[LZMA_NUM_REPS]; +++ UInt32 repMaxIndex, i; +++ UInt32 *matchDistances; +++ UInt32 backMain; +++ +++ if (!p->longestMatchWasFound) +++ { +++ lenMain = ReadMatchDistances(p, &numDistancePairs); +++ } +++ else +++ { +++ lenMain = p->longestMatchLength; +++ numDistancePairs = p->numDistancePairs; +++ p->longestMatchWasFound = False; +++ } +++ +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ if (numAvailableBytes > LZMA_MATCH_LEN_MAX) +++ numAvailableBytes = LZMA_MATCH_LEN_MAX; +++ if (numAvailableBytes < 2) +++ { +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ +++ repMaxIndex = 0; +++ +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ const Byte *data2 = data - (p->reps[i] + 1); +++ UInt32 len; +++ if (data[0] != data2[0] || data[1] != data2[1]) +++ { +++ repLens[i] = 0; +++ continue; +++ } +++ for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++); +++ if (len >= p->numFastBytes) +++ { +++ *backRes = i; +++ MovePos(p, len - 1); +++ return len; +++ } +++ repLens[i] = len; +++ if (len > repLens[repMaxIndex]) +++ repMaxIndex = i; +++ } +++ matchDistances = p->matchDistances; +++ if (lenMain >= p->numFastBytes) +++ { +++ *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; +++ MovePos(p, lenMain - 1); +++ return lenMain; +++ } +++ +++ backMain = 0; /* for GCC */ +++ if (lenMain >= 2) +++ { +++ backMain = matchDistances[numDistancePairs - 1]; +++ while (numDistancePairs > 2 && lenMain == matchDistances[numDistancePairs - 4] + 1) +++ { +++ if (!ChangePair(matchDistances[numDistancePairs - 3], backMain)) +++ break; +++ numDistancePairs -= 2; +++ lenMain = matchDistances[numDistancePairs - 2]; +++ backMain = matchDistances[numDistancePairs - 1]; +++ } +++ if (lenMain == 2 && backMain >= 0x80) +++ lenMain = 1; +++ } +++ +++ if (repLens[repMaxIndex] >= 2) +++ { +++ if (repLens[repMaxIndex] + 1 >= lenMain || +++ (repLens[repMaxIndex] + 2 >= lenMain && (backMain > (1 << 9))) || +++ (repLens[repMaxIndex] + 3 >= lenMain && (backMain > (1 << 15)))) +++ { +++ UInt32 lenRes; +++ *backRes = repMaxIndex; +++ lenRes = repLens[repMaxIndex]; +++ MovePos(p, lenRes - 1); +++ return lenRes; +++ } +++ } +++ +++ if (lenMain >= 2 && numAvailableBytes > 2) +++ { +++ UInt32 i; +++ numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ p->longestMatchLength = ReadMatchDistances(p, &p->numDistancePairs); +++ if (p->longestMatchLength >= 2) +++ { +++ UInt32 newDistance = matchDistances[p->numDistancePairs - 1]; +++ if ((p->longestMatchLength >= lenMain && newDistance < backMain) || +++ (p->longestMatchLength == lenMain + 1 && !ChangePair(backMain, newDistance)) || +++ (p->longestMatchLength > lenMain + 1) || +++ (p->longestMatchLength + 1 >= lenMain && lenMain >= 3 && ChangePair(newDistance, backMain))) +++ { +++ p->longestMatchWasFound = True; +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ } +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ UInt32 len; +++ const Byte *data2 = data - (p->reps[i] + 1); +++ if (data[1] != data2[1] || data[2] != data2[2]) +++ { +++ repLens[i] = 0; +++ continue; +++ } +++ for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++); +++ if (len + 1 >= lenMain) +++ { +++ p->longestMatchWasFound = True; +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ } +++ *backRes = backMain + LZMA_NUM_REPS; +++ MovePos(p, lenMain - 2); +++ return lenMain; +++ } +++ *backRes = (UInt32)(-1); +++ return 1; +++} +++ +++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState) +++{ +++ UInt32 len; +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1); +++ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); +++ p->state = kMatchNextStates[p->state]; +++ len = LZMA_MATCH_LEN_MIN; +++ LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); +++ RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1); +++ RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits); +++ RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask); +++} +++ +++static SRes CheckErrors(CLzmaEnc *p) +++{ +++ if (p->result != SZ_OK) +++ return p->result; +++ if (p->rc.res != SZ_OK) +++ p->result = SZ_ERROR_WRITE; +++ if (p->matchFinderBase.result != SZ_OK) +++ p->result = SZ_ERROR_READ; +++ if (p->result != SZ_OK) +++ p->finished = True; +++ return p->result; +++} +++ +++static SRes Flush(CLzmaEnc *p, UInt32 nowPos) +++{ +++ /* ReleaseMFStream(); */ +++ p->finished = True; +++ if (p->writeEndMark) +++ WriteEndMarker(p, nowPos & p->pbMask); +++ RangeEnc_FlushData(&p->rc); +++ RangeEnc_FlushStream(&p->rc); +++ return CheckErrors(p); +++} +++ +++static void FillAlignPrices(CLzmaEnc *p) +++{ +++ UInt32 i; +++ for (i = 0; i < kAlignTableSize; i++) +++ p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices); +++ p->alignPriceCount = 0; +++} +++ +++static void FillDistancesPrices(CLzmaEnc *p) +++{ +++ UInt32 tempPrices[kNumFullDistances]; +++ UInt32 i, lenToPosState; +++ for (i = kStartPosModelIndex; i < kNumFullDistances; i++) +++ { +++ UInt32 posSlot = GetPosSlot1(i); +++ UInt32 footerBits = ((posSlot >> 1) - 1); +++ UInt32 base = ((2 | (posSlot & 1)) << footerBits); +++ tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices); +++ } +++ +++ for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++) +++ { +++ UInt32 posSlot; +++ const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState]; +++ UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState]; +++ for (posSlot = 0; posSlot < p->distTableSize; posSlot++) +++ posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices); +++ for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++) +++ posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits); +++ +++ { +++ UInt32 *distancesPrices = p->distancesPrices[lenToPosState]; +++ UInt32 i; +++ for (i = 0; i < kStartPosModelIndex; i++) +++ distancesPrices[i] = posSlotPrices[i]; +++ for (; i < kNumFullDistances; i++) +++ distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i]; +++ } +++ } +++ p->matchPriceCount = 0; +++} +++ +++void LzmaEnc_Construct(CLzmaEnc *p) +++{ +++ RangeEnc_Construct(&p->rc); +++ MatchFinder_Construct(&p->matchFinderBase); +++ #ifdef COMPRESS_MF_MT +++ MatchFinderMt_Construct(&p->matchFinderMt); +++ p->matchFinderMt.MatchFinder = &p->matchFinderBase; +++ #endif +++ +++ { +++ CLzmaEncProps props; +++ LzmaEncProps_Init(&props); +++ LzmaEnc_SetProps(p, &props); +++ } +++ +++ #ifndef LZMA_LOG_BSR +++ LzmaEnc_FastPosInit(p->g_FastPos); +++ #endif +++ +++ LzmaEnc_InitPriceTables(p->ProbPrices); +++ p->litProbs = 0; +++ p->saveState.litProbs = 0; +++} +++ +++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc) +++{ +++ void *p; +++ p = alloc->Alloc(alloc, sizeof(CLzmaEnc)); +++ if (p != 0) +++ LzmaEnc_Construct((CLzmaEnc *)p); +++ return p; +++} +++ +++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->litProbs); +++ alloc->Free(alloc, p->saveState.litProbs); +++ p->litProbs = 0; +++ p->saveState.litProbs = 0; +++} +++ +++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ #ifdef COMPRESS_MF_MT +++ MatchFinderMt_Destruct(&p->matchFinderMt, allocBig); +++ #endif +++ MatchFinder_Free(&p->matchFinderBase, allocBig); +++ LzmaEnc_FreeLits(p, alloc); +++ RangeEnc_Free(&p->rc, alloc); +++} +++ +++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig); +++ alloc->Free(alloc, p); +++} +++ +++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize) +++{ +++ UInt32 nowPos32, startPos32; +++ if (p->inStream != 0) +++ { +++ p->matchFinderBase.stream = p->inStream; +++ p->matchFinder.Init(p->matchFinderObj); +++ p->inStream = 0; +++ } +++ +++ if (p->finished) +++ return p->result; +++ RINOK(CheckErrors(p)); +++ +++ nowPos32 = (UInt32)p->nowPos64; +++ startPos32 = nowPos32; +++ +++ if (p->nowPos64 == 0) +++ { +++ UInt32 numDistancePairs; +++ Byte curByte; +++ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0) +++ return Flush(p, nowPos32); +++ ReadMatchDistances(p, &numDistancePairs); +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0); +++ p->state = kLiteralNextStates[p->state]; +++ curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset); +++ LitEnc_Encode(&p->rc, p->litProbs, curByte); +++ p->additionalOffset--; +++ nowPos32++; +++ } +++ +++ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0) +++ for (;;) +++ { +++ UInt32 pos, len, posState; +++ +++ if (p->fastMode) +++ len = GetOptimumFast(p, &pos); +++ else +++ len = GetOptimum(p, nowPos32, &pos); +++ +++ #ifdef SHOW_STAT2 +++ printf("\n pos = %4X, len = %d pos = %d", nowPos32, len, pos); +++ #endif +++ +++ posState = nowPos32 & p->pbMask; +++ if (len == 1 && pos == 0xFFFFFFFF) +++ { +++ Byte curByte; +++ CLzmaProb *probs; +++ const Byte *data; +++ +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0); +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; +++ curByte = *data; +++ probs = LIT_PROBS(nowPos32, *(data - 1)); +++ if (IsCharState(p->state)) +++ LitEnc_Encode(&p->rc, probs, curByte); +++ else +++ LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1)); +++ p->state = kLiteralNextStates[p->state]; +++ } +++ else +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1); +++ if (pos < LZMA_NUM_REPS) +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1); +++ if (pos == 0) +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0); +++ RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1)); +++ } +++ else +++ { +++ UInt32 distance = p->reps[pos]; +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1); +++ if (pos == 1) +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0); +++ else +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1); +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2); +++ if (pos == 3) +++ p->reps[3] = p->reps[2]; +++ p->reps[2] = p->reps[1]; +++ } +++ p->reps[1] = p->reps[0]; +++ p->reps[0] = distance; +++ } +++ if (len == 1) +++ p->state = kShortRepNextStates[p->state]; +++ else +++ { +++ LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); +++ p->state = kRepNextStates[p->state]; +++ } +++ } +++ else +++ { +++ UInt32 posSlot; +++ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); +++ p->state = kMatchNextStates[p->state]; +++ LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); +++ pos -= LZMA_NUM_REPS; +++ GetPosSlot(pos, posSlot); +++ RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot); +++ +++ if (posSlot >= kStartPosModelIndex) +++ { +++ UInt32 footerBits = ((posSlot >> 1) - 1); +++ UInt32 base = ((2 | (posSlot & 1)) << footerBits); +++ UInt32 posReduced = pos - base; +++ +++ if (posSlot < kEndPosModelIndex) +++ RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced); +++ else +++ { +++ RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits); +++ RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask); +++ p->alignPriceCount++; +++ } +++ } +++ p->reps[3] = p->reps[2]; +++ p->reps[2] = p->reps[1]; +++ p->reps[1] = p->reps[0]; +++ p->reps[0] = pos; +++ p->matchPriceCount++; +++ } +++ } +++ p->additionalOffset -= len; +++ nowPos32 += len; +++ if (p->additionalOffset == 0) +++ { +++ UInt32 processed; +++ if (!p->fastMode) +++ { +++ if (p->matchPriceCount >= (1 << 7)) +++ FillDistancesPrices(p); +++ if (p->alignPriceCount >= kAlignTableSize) +++ FillAlignPrices(p); +++ } +++ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0) +++ break; +++ processed = nowPos32 - startPos32; +++ if (useLimits) +++ { +++ if (processed + kNumOpts + 300 >= maxUnpackSize || +++ RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize) +++ break; +++ } +++ else if (processed >= (1 << 15)) +++ { +++ p->nowPos64 += nowPos32 - startPos32; +++ return CheckErrors(p); +++ } +++ } +++ } +++ p->nowPos64 += nowPos32 - startPos32; +++ return Flush(p, nowPos32); +++} +++ +++#define kBigHashDicLimit ((UInt32)1 << 24) +++ +++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ UInt32 beforeSize = kNumOpts; +++ Bool btMode; +++ if (!RangeEnc_Alloc(&p->rc, alloc)) +++ return SZ_ERROR_MEM; +++ btMode = (p->matchFinderBase.btMode != 0); +++ #ifdef COMPRESS_MF_MT +++ p->mtMode = (p->multiThread && !p->fastMode && btMode); +++ #endif +++ +++ { +++ unsigned lclp = p->lc + p->lp; +++ if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp) +++ { +++ LzmaEnc_FreeLits(p, alloc); +++ p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb)); +++ p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb)); +++ if (p->litProbs == 0 || p->saveState.litProbs == 0) +++ { +++ LzmaEnc_FreeLits(p, alloc); +++ return SZ_ERROR_MEM; +++ } +++ p->lclp = lclp; +++ } +++ } +++ +++ p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit); +++ +++ if (beforeSize + p->dictSize < keepWindowSize) +++ beforeSize = keepWindowSize - p->dictSize; +++ +++ #ifdef COMPRESS_MF_MT +++ if (p->mtMode) +++ { +++ RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig)); +++ p->matchFinderObj = &p->matchFinderMt; +++ MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder); +++ } +++ else +++ #endif +++ { +++ if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig)) +++ return SZ_ERROR_MEM; +++ p->matchFinderObj = &p->matchFinderBase; +++ MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder); +++ } +++ return SZ_OK; +++} +++ +++void LzmaEnc_Init(CLzmaEnc *p) +++{ +++ UInt32 i; +++ p->state = 0; +++ for(i = 0 ; i < LZMA_NUM_REPS; i++) +++ p->reps[i] = 0; +++ +++ RangeEnc_Init(&p->rc); +++ +++ +++ for (i = 0; i < kNumStates; i++) +++ { +++ UInt32 j; +++ for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++) +++ { +++ p->isMatch[i][j] = kProbInitValue; +++ p->isRep0Long[i][j] = kProbInitValue; +++ } +++ p->isRep[i] = kProbInitValue; +++ p->isRepG0[i] = kProbInitValue; +++ p->isRepG1[i] = kProbInitValue; +++ p->isRepG2[i] = kProbInitValue; +++ } +++ +++ { +++ UInt32 num = 0x300 << (p->lp + p->lc); +++ for (i = 0; i < num; i++) +++ p->litProbs[i] = kProbInitValue; +++ } +++ +++ { +++ for (i = 0; i < kNumLenToPosStates; i++) +++ { +++ CLzmaProb *probs = p->posSlotEncoder[i]; +++ UInt32 j; +++ for (j = 0; j < (1 << kNumPosSlotBits); j++) +++ probs[j] = kProbInitValue; +++ } +++ } +++ { +++ for(i = 0; i < kNumFullDistances - kEndPosModelIndex; i++) +++ p->posEncoders[i] = kProbInitValue; +++ } +++ +++ LenEnc_Init(&p->lenEnc.p); +++ LenEnc_Init(&p->repLenEnc.p); +++ +++ for (i = 0; i < (1 << kNumAlignBits); i++) +++ p->posAlignEncoder[i] = kProbInitValue; +++ +++ p->longestMatchWasFound = False; +++ p->optimumEndIndex = 0; +++ p->optimumCurrentIndex = 0; +++ p->additionalOffset = 0; +++ +++ p->pbMask = (1 << p->pb) - 1; +++ p->lpMask = (1 << p->lp) - 1; +++} +++ +++void LzmaEnc_InitPrices(CLzmaEnc *p) +++{ +++ if (!p->fastMode) +++ { +++ FillDistancesPrices(p); +++ FillAlignPrices(p); +++ } +++ +++ p->lenEnc.tableSize = +++ p->repLenEnc.tableSize = +++ p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN; +++ LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices); +++ LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices); +++} +++ +++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ UInt32 i; +++ for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++) +++ if (p->dictSize <= ((UInt32)1 << i)) +++ break; +++ p->distTableSize = i * 2; +++ +++ p->finished = False; +++ p->result = SZ_OK; +++ RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig)); +++ LzmaEnc_Init(p); +++ LzmaEnc_InitPrices(p); +++ p->nowPos64 = 0; +++ return SZ_OK; +++} +++ +++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqInStream *inStream, ISeqOutStream *outStream, +++ ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ p->inStream = inStream; +++ p->rc.outStream = outStream; +++ return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig); +++} +++ +++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, +++ ISeqInStream *inStream, UInt32 keepWindowSize, +++ ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ p->inStream = inStream; +++ return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); +++} +++ +++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen) +++{ +++ p->seqBufInStream.funcTable.Read = MyRead; +++ p->seqBufInStream.data = src; +++ p->seqBufInStream.rem = srcLen; +++} +++ +++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen, +++ UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ LzmaEnc_SetInputBuf(p, src, srcLen); +++ p->inStream = &p->seqBufInStream.funcTable; +++ return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); +++} +++ +++void LzmaEnc_Finish(CLzmaEncHandle pp) +++{ +++ #ifdef COMPRESS_MF_MT +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ if (p->mtMode) +++ MatchFinderMt_ReleaseStream(&p->matchFinderMt); +++ #endif +++} +++ +++typedef struct _CSeqOutStreamBuf +++{ +++ ISeqOutStream funcTable; +++ Byte *data; +++ SizeT rem; +++ Bool overflow; +++} CSeqOutStreamBuf; +++ +++static size_t MyWrite(void *pp, const void *data, size_t size) +++{ +++ CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp; +++ if (p->rem < size) +++ { +++ size = p->rem; +++ p->overflow = True; +++ } +++ memcpy(p->data, data, size); +++ p->rem -= size; +++ p->data += size; +++ return size; +++} +++ +++ +++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp) +++{ +++ const CLzmaEnc *p = (CLzmaEnc *)pp; +++ return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++} +++ +++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp) +++{ +++ const CLzmaEnc *p = (CLzmaEnc *)pp; +++ return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; +++} +++ +++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit, +++ Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ UInt64 nowPos64; +++ SRes res; +++ CSeqOutStreamBuf outStream; +++ +++ outStream.funcTable.Write = MyWrite; +++ outStream.data = dest; +++ outStream.rem = *destLen; +++ outStream.overflow = False; +++ +++ p->writeEndMark = False; +++ p->finished = False; +++ p->result = SZ_OK; +++ +++ if (reInit) +++ LzmaEnc_Init(p); +++ LzmaEnc_InitPrices(p); +++ nowPos64 = p->nowPos64; +++ RangeEnc_Init(&p->rc); +++ p->rc.outStream = &outStream.funcTable; +++ +++ res = LzmaEnc_CodeOneBlock(pp, True, desiredPackSize, *unpackSize); +++ +++ *unpackSize = (UInt32)(p->nowPos64 - nowPos64); +++ *destLen -= outStream.rem; +++ if (outStream.overflow) +++ return SZ_ERROR_OUTPUT_EOF; +++ +++ return res; +++} +++ +++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress, +++ ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ SRes res = SZ_OK; +++ +++ #ifdef COMPRESS_MF_MT +++ Byte allocaDummy[0x300]; +++ int i = 0; +++ for (i = 0; i < 16; i++) +++ allocaDummy[i] = (Byte)i; +++ #endif +++ +++ RINOK(LzmaEnc_Prepare(pp, inStream, outStream, alloc, allocBig)); +++ +++ for (;;) +++ { +++ res = LzmaEnc_CodeOneBlock(pp, False, 0, 0); +++ if (res != SZ_OK || p->finished != 0) +++ break; +++ if (progress != 0) +++ { +++ res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc)); +++ if (res != SZ_OK) +++ { +++ res = SZ_ERROR_PROGRESS; +++ break; +++ } +++ } +++ } +++ LzmaEnc_Finish(pp); +++ return res; +++} +++ +++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ int i; +++ UInt32 dictSize = p->dictSize; +++ if (*size < LZMA_PROPS_SIZE) +++ return SZ_ERROR_PARAM; +++ *size = LZMA_PROPS_SIZE; +++ props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc); +++ +++ for (i = 11; i <= 30; i++) +++ { +++ if (dictSize <= ((UInt32)2 << i)) +++ { +++ dictSize = (2 << i); +++ break; +++ } +++ if (dictSize <= ((UInt32)3 << i)) +++ { +++ dictSize = (3 << i); +++ break; +++ } +++ } +++ +++ for (i = 0; i < 4; i++) +++ props[1 + i] = (Byte)(dictSize >> (8 * i)); +++ return SZ_OK; +++} +++ +++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ SRes res; +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ +++ CSeqOutStreamBuf outStream; +++ +++ LzmaEnc_SetInputBuf(p, src, srcLen); +++ +++ outStream.funcTable.Write = MyWrite; +++ outStream.data = dest; +++ outStream.rem = *destLen; +++ outStream.overflow = False; +++ +++ p->writeEndMark = writeEndMark; +++ res = LzmaEnc_Encode(pp, &outStream.funcTable, &p->seqBufInStream.funcTable, +++ progress, alloc, allocBig); +++ +++ *destLen -= outStream.rem; +++ if (outStream.overflow) +++ return SZ_ERROR_OUTPUT_EOF; +++ return res; +++} +++ +++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, +++ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc); +++ SRes res; +++ if (p == 0) +++ return SZ_ERROR_MEM; +++ +++ res = LzmaEnc_SetProps(p, props); +++ if (res == SZ_OK) +++ { +++ res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize); +++ if (res == SZ_OK) +++ res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen, +++ writeEndMark, progress, alloc, allocBig); +++ } +++ +++ LzmaEnc_Destroy(p, alloc, allocBig); +++ return res; +++} ++--- a/mkfs.jffs2.c +++++ b/mkfs.jffs2.c ++@@ -1658,11 +1658,11 @@ int main(int argc, char **argv) ++ } ++ erase_block_size *= units; ++ ++- /* If it's less than 8KiB, they're not allowed */ ++- if (erase_block_size < 0x2000) { ++- fprintf(stderr, "Erase size 0x%x too small. Increasing to 8KiB minimum\n", +++ /* If it's less than 4KiB, they're not allowed */ +++ if (erase_block_size < 0x1000) { +++ fprintf(stderr, "Erase size 0x%x too small. Increasing to 4KiB minimum\n", ++ erase_block_size); ++- erase_block_size = 0x2000; +++ erase_block_size = 0x1000; ++ } ++ break; ++ } +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/131-fix_lib_compile.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/131-fix_lib_compile.patch.svn-base +new file mode 100644 +index 0000000..8c977c1 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/131-fix_lib_compile.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/lib/Makefile +++++ b/lib/Makefile ++@@ -7,7 +7,7 @@ SUBDIRS = ++ # CFLAGS += -Werror ++ CPPFLAGS += -I../include ++ LIBS = libmtd ++-TARGETS = libmtd.a +++override TARGETS = libmtd.a ++ ++ include ../common.mk ++ +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/135-mkubifs_optional_lzo.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/135-mkubifs_optional_lzo.patch.svn-base +new file mode 100644 +index 0000000..82b6c2f +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/135-mkubifs_optional_lzo.patch.svn-base +@@ -0,0 +1,119 @@ ++--- a/mkfs.ubifs/compr.c +++++ b/mkfs.ubifs/compr.c ++@@ -24,7 +24,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ ++ #define crc32 __zlib_crc32 ++@@ -35,7 +34,6 @@ ++ #include "ubifs-media.h" ++ #include "mkfs.ubifs.h" ++ ++-static void *lzo_mem; ++ static unsigned long long errcnt = 0; ++ static struct ubifs_info *c = &info_; ++ ++@@ -86,6 +84,25 @@ static int zlib_deflate(void *in_buf, si ++ return 0; ++ } ++ +++#ifndef WITHOUT_LZO +++#include +++ +++static void *lzo_mem; +++ +++static int lzo_init(void) +++{ +++ lzo_mem = malloc(LZO1X_999_MEM_COMPRESS); +++ if (!lzo_mem) +++ return -1; +++ +++ return 0; +++} +++ +++static void lzo_fini(void) +++{ +++ free(lzo_mem); +++} +++ ++ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++ { ++@@ -103,6 +120,12 @@ static int lzo_compress(void *in_buf, si ++ ++ return 0; ++ } +++#else +++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, +++ size_t *out_len) { return -1; } +++static inline int lzo_init(void) { return 0; } +++static inline void lzo_fini(void) { } +++#endif ++ ++ static int no_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++@@ -123,7 +146,6 @@ static int favor_lzo_compress(void *in_b ++ lzo_len = zlib_len = *out_len; ++ lzo_ret = lzo_compress(in_buf, in_len, out_buf, &lzo_len); ++ zlib_ret = zlib_deflate(in_buf, in_len, zlib_buf, &zlib_len); ++- ++ if (lzo_ret && zlib_ret) ++ /* Both compressors failed */ ++ return -1; ++@@ -198,23 +220,28 @@ int compress_data(void *in_buf, size_t i ++ ++ int init_compression(void) ++ { ++- lzo_mem = malloc(LZO1X_999_MEM_COMPRESS); ++- if (!lzo_mem) ++- return -1; +++ int ret; +++ +++ ret = lzo_init(); +++ if (ret) +++ goto err; ++ ++ zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR); ++- if (!zlib_buf) { ++- free(lzo_mem); ++- return -1; ++- } +++ if (!zlib_buf) +++ goto err_lzo; ++ ++ return 0; +++ +++err_lzo: +++ lzo_fini(); +++err: +++ return ret; ++ } ++ ++ void destroy_compression(void) ++ { ++ free(zlib_buf); ++- free(lzo_mem); +++ lzo_fini(); ++ if (errcnt) ++ fprintf(stderr, "%llu compression errors occurred\n", errcnt); ++ } ++--- a/mkfs.ubifs/Makefile +++++ b/mkfs.ubifs/Makefile ++@@ -6,7 +6,13 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] ++ ++ TARGETS = mkfs.ubifs ++ ++-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi +++ifeq ($(WITHOUT_LZO), 1) +++ CPPFLAGS += -DWITHOUT_LZO +++else +++ LZOLDLIBS = -llzo2 +++endif +++ +++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi ++ LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd ++ LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) ++ +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/136-mkubifs-fix-rinoperm-options.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/136-mkubifs-fix-rinoperm-options.patch.svn-base +new file mode 100644 +index 0000000..dd7c74c +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/136-mkubifs-fix-rinoperm-options.patch.svn-base +@@ -0,0 +1,28 @@ ++--- a/mkfs.ubifs/mkfs.ubifs.c +++++ b/mkfs.ubifs/mkfs.ubifs.c ++@@ -109,7 +109,7 @@ static char *output; ++ static int out_fd; ++ static int out_ubi; ++ static int squash_owner; ++-static int squash_rino_perm; +++static int squash_rino_perm = -1; ++ ++ /* The 'head' (position) which nodes are written */ ++ static int head_lnum; ++@@ -683,6 +683,7 @@ static int get_options(int argc, char**a ++ printf("WARNING: --squash-rino-perm is depricated, do not use it\n"); ++ break; ++ case 'q': +++ squash_rino_perm = 0; ++ printf("WARNING: --nosquash-rino-perm is depricated, do not use it\n"); ++ break; ++ } ++@@ -1686,7 +1687,7 @@ static int write_data(void) ++ if (err) ++ return sys_err_msg("bad root file-system directory '%s'", ++ root); ++- if (squash_rino_perm) { +++ if (squash_rino_perm > 0) { ++ root_st.st_uid = root_st.st_gid = 0; ++ root_st.st_mode = mode; ++ } +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/137-mkubifs-allow-to-overwrite-volume-data.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/137-mkubifs-allow-to-overwrite-volume-data.patch.svn-base +new file mode 100644 +index 0000000..33f6f30 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/137-mkubifs-allow-to-overwrite-volume-data.patch.svn-base +@@ -0,0 +1,61 @@ ++--- a/mkfs.ubifs/mkfs.ubifs.c +++++ b/mkfs.ubifs/mkfs.ubifs.c ++@@ -110,6 +110,7 @@ static int out_fd; ++ static int out_ubi; ++ static int squash_owner; ++ static int squash_rino_perm = -1; +++static int overwrite_volume; ++ ++ /* The 'head' (position) which nodes are written */ ++ static int head_lnum; ++@@ -132,7 +133,7 @@ static struct inum_mapping **hash_table; ++ /* Inode creation sequence number */ ++ static unsigned long long creat_sqnum; ++ ++-static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:Fp:k:x:X:j:R:l:j:UQq"; +++static const char *optstring = "d:r:m:o:OD:h?vVe:c:g:f:Fp:k:x:X:j:R:l:j:UQq"; ++ ++ static const struct option longopts[] = { ++ {"root", 1, NULL, 'r'}, ++@@ -140,6 +141,7 @@ static const struct option longopts[] = ++ {"leb-size", 1, NULL, 'e'}, ++ {"max-leb-cnt", 1, NULL, 'c'}, ++ {"output", 1, NULL, 'o'}, +++ {"overwrite", 0, NULL, 'O'}, ++ {"devtable", 1, NULL, 'D'}, ++ {"help", 0, NULL, 'h'}, ++ {"verbose", 0, NULL, 'v'}, ++@@ -176,6 +178,7 @@ static const char *helptext = ++ "-e, --leb-size=SIZE logical erase block size\n" ++ "-c, --max-leb-cnt=COUNT maximum logical erase block count\n" ++ "-o, --output=FILE output to FILE\n" +++"-O, --overwrite force overwriting of the existing volume\n" ++ "-j, --jrn-size=SIZE journal size\n" ++ "-R, --reserved=SIZE how much space should be reserved for the super-user\n" ++ "-x, --compr=TYPE compression type - \"lzo\", \"favor_lzo\", \"zlib\" or\n" ++@@ -594,6 +597,9 @@ static int get_options(int argc, char**a ++ case 'o': ++ output = strdup(optarg); ++ break; +++ case 'O': +++ overwrite_volume = 1; +++ break; ++ case 'D': ++ tbl_file = optarg; ++ if (stat(tbl_file, &st) < 0) ++@@ -2180,8 +2186,13 @@ static int open_target(void) ++ if (ubi_set_property(out_fd, UBI_PROP_DIRECT_WRITE, 1)) ++ return sys_err_msg("ubi_set_property failed"); ++ ++- if (check_volume_empty()) ++- return err_msg("UBI volume is not empty"); +++ if (check_volume_empty()) { +++ if (overwrite_volume) +++ if (verbose) +++ printf("Warning: overwriting existing data\n"); +++ else +++ return err_msg("UBI volume is not empty"); +++ } ++ } else { ++ out_fd = open(output, O_CREAT | O_RDWR | O_TRUNC, ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); +diff --git a/feeds/packages/utils/mtd-utils/patches/.svn/text-base/150-fix_ubi-utils_static.patch.svn-base b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/150-fix_ubi-utils_static.patch.svn-base +new file mode 100644 +index 0000000..1413a98 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/.svn/text-base/150-fix_ubi-utils_static.patch.svn-base +@@ -0,0 +1,32 @@ ++--- a/ubi-utils/Makefile +++++ b/ubi-utils/Makefile ++@@ -22,7 +22,7 @@ $(TARGETS): $(addprefix $(BUILDDIR)/,\ ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -lubi -o $@ ++ ++ $(BUILDDIR)/ubicrc32: $(addprefix $(BUILDDIR)/,\ ++- ubicrc32.o) +++ ../lib/libcrc32.o ubicrc32.o) ++ # $(CC) $(CFLAGS) -o $@ $^ ++ ++ $(BUILDDIR)/ubinize: $(addprefix $(BUILDDIR)/,\ ++@@ -30,16 +30,17 @@ $(BUILDDIR)/ubinize: $(addprefix $(BUILD ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -liniparser -lubigen -o $@ ++ ++ $(BUILDDIR)/mtdinfo: $(addprefix $(BUILDDIR)/,\ ++- libubigen.a ubiutils-common.o) +++ ../lib/libmtd.o ../lib/libmtd_legacy.o libubigen.a ubiutils-common.o) ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -lmtd -lubigen -o $@ ++ ++ $(BUILDDIR)/ubiformat: $(addprefix $(BUILDDIR)/,\ ++- ubiformat.o ubiutils-common.o libscan.a libubi.a libubigen.a) +++ ../lib/libmtd.o ../lib/libmtd_legacy.o ubiformat.o ubiutils-common.o libscan.a libubi.a libubigen.a) ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -lmtd -lscan -lubi -lubigen -o $@ ++ ++ $(BUILDDIR)/libubi.a: $(BUILDDIR)/libubi.o ++ ++-$(BUILDDIR)/libubigen.a: $(BUILDDIR)/libubigen.o +++$(BUILDDIR)/libubigen.a: $(addprefix $(BUILDDIR)/,\ +++ ../lib/libcrc32.o libubigen.o) ++ ++ $(BUILDDIR)/libiniparser.a: $(addprefix $(BUILDDIR)/,\ ++ libiniparser.o dictionary.o) +diff --git a/feeds/packages/utils/mtd-utils/patches/100-mtd-debug-add-bad-block-counter.patch b/feeds/packages/utils/mtd-utils/patches/100-mtd-debug-add-bad-block-counter.patch +new file mode 100644 +index 0000000..dbe6ccc +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/100-mtd-debug-add-bad-block-counter.patch +@@ -0,0 +1,73 @@ ++--- a/mtd_debug.c +++++ b/mtd_debug.c ++@@ -238,6 +238,7 @@ int showinfo (int fd) ++ int i,err,n; ++ struct mtd_info_user mtd; ++ static struct region_info_user region[1024]; +++ int iNumOfBadBlocks = 0; ++ ++ err = getmeminfo (fd,&mtd); ++ if (err < 0) ++@@ -330,6 +331,11 @@ int showinfo (int fd) ++ printf ("\nmtd.oobsize = "); ++ printsize (mtd.oobsize); ++ +++ printf ("\nmtd.badblockscount = "); +++ iNumOfBadBlocks = get_bb_number(fd, &mtd); +++ if (iNumOfBadBlocks > -1) +++ printf ("%d", iNumOfBadBlocks); +++ ++ printf ("\n" ++ "regions = %d\n" ++ "\n", ++@@ -349,6 +355,50 @@ int showinfo (int fd) ++ return (0); ++ } ++ +++int get_bb_number(int fd, struct mtd_info_user *meminfo) +++{ +++ int isNAND = (meminfo->type == MTD_NANDFLASH); +++ int ibbCounter = 0; +++ /* Last 4 blocks of any MTD device are protected and +++ MTD reports them as badblocks. */ +++ int usablesize = meminfo->size - (4 * meminfo->erasesize); +++ erase_info_t erase; +++ erase.length = meminfo->erasesize; +++ +++ for (erase.start = 0; +++ erase.start < usablesize; +++ erase.start += meminfo->erasesize) +++ { +++ loff_t offset = erase.start; +++ int ret = ioctl(fd, MEMGETBADBLOCK, &offset); +++ +++ if (ret > 0) +++ { +++ ibbCounter++; +++ continue; +++ } +++ else if (ret < 0) +++ { +++ if (errno == EOPNOTSUPP) +++ { +++ if (isNAND) +++ { +++ printf("Bad block check not available"); +++ return -1; +++ } +++ } +++ else +++ { +++ printf("MTD get bad block failed: %s", +++ strerror(errno)); +++ return -1; +++ } +++ } +++ } +++ +++ return ibbCounter; +++} +++ ++ void showusage(void) ++ { ++ fprintf (stderr, +diff --git a/feeds/packages/utils/mtd-utils/patches/130-lzma_jffs2.patch b/feeds/packages/utils/mtd-utils/patches/130-lzma_jffs2.patch +new file mode 100644 +index 0000000..9a1c122 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/130-lzma_jffs2.patch +@@ -0,0 +1,5031 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -1,7 +1,7 @@ ++ ++ # -*- sh -*- ++ ++-CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) +++CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -I./include/linux/lzma ++ ++ ifeq ($(WITHOUT_XATTR), 1) ++ CPPFLAGS += -DWITHOUT_XATTR ++@@ -50,7 +50,9 @@ $(SYMLINKS): ++ ln -sf ../fs/jffs2/$@ $@ ++ ++ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ ++- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ +++ compr_rtime.o mkfs.jffs2.o compr_zlib.o \ +++ $(if $(WITHOUT_LZO),,compr_lzo.o) \ +++ compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \ ++ compr.o rbtree.o) ++ LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) ++ LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) ++--- a/compr.c +++++ b/compr.c ++@@ -520,6 +520,9 @@ int jffs2_compressors_init(void) ++ #ifdef CONFIG_JFFS2_LZO ++ jffs2_lzo_init(); ++ #endif +++#ifdef CONFIG_JFFS2_LZMA +++ jffs2_lzma_init(); +++#endif ++ return 0; ++ } ++ ++@@ -534,5 +537,8 @@ int jffs2_compressors_exit(void) ++ #ifdef CONFIG_JFFS2_LZO ++ jffs2_lzo_exit(); ++ #endif +++#ifdef CONFIG_JFFS2_LZMA +++ jffs2_lzma_exit(); +++#endif ++ return 0; ++ } ++--- a/compr.h +++++ b/compr.h ++@@ -18,13 +18,14 @@ ++ ++ #define CONFIG_JFFS2_ZLIB ++ #define CONFIG_JFFS2_RTIME ++-#define CONFIG_JFFS2_LZO +++#define CONFIG_JFFS2_LZMA ++ ++ #define JFFS2_RUBINMIPS_PRIORITY 10 ++ #define JFFS2_DYNRUBIN_PRIORITY 20 ++ #define JFFS2_RTIME_PRIORITY 50 ++-#define JFFS2_ZLIB_PRIORITY 60 ++-#define JFFS2_LZO_PRIORITY 80 +++#define JFFS2_LZMA_PRIORITY 70 +++#define JFFS2_ZLIB_PRIORITY 80 +++#define JFFS2_LZO_PRIORITY 90 ++ ++ #define JFFS2_COMPR_MODE_NONE 0 ++ #define JFFS2_COMPR_MODE_PRIORITY 1 ++@@ -115,5 +116,10 @@ void jffs2_rtime_exit(void); ++ int jffs2_lzo_init(void); ++ void jffs2_lzo_exit(void); ++ #endif +++#ifdef CONFIG_JFFS2_LZMA +++int jffs2_lzma_init(void); +++void jffs2_lzma_exit(void); +++#endif +++ ++ ++ #endif /* __JFFS2_COMPR_H__ */ ++--- /dev/null +++++ b/compr_lzma.c ++@@ -0,0 +1,128 @@ +++/* +++ * JFFS2 -- Journalling Flash File System, Version 2. +++ * +++ * For licensing information, see the file 'LICENCE' in this directory. +++ * +++ * JFFS2 wrapper to the LZMA C SDK +++ * +++ */ +++ +++#include +++#include "compr.h" +++ +++#ifdef __KERNEL__ +++ static DEFINE_MUTEX(deflate_mutex); +++#endif +++ +++CLzmaEncHandle *p; +++Byte propsEncoded[LZMA_PROPS_SIZE]; +++SizeT propsSize = sizeof(propsEncoded); +++ +++STATIC void lzma_free_workspace(void) +++{ +++ LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc); +++} +++ +++STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props) +++{ +++ if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL) +++ { +++ PRINT_ERROR("Failed to allocate lzma deflate workspace\n"); +++ return -ENOMEM; +++ } +++ +++ if (LzmaEnc_SetProps(p, props) != SZ_OK) +++ { +++ lzma_free_workspace(); +++ return -1; +++ } +++ +++ if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK) +++ { +++ lzma_free_workspace(); +++ return -1; +++ } +++ +++ return 0; +++} +++ +++STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out, +++ uint32_t *sourcelen, uint32_t *dstlen, void *model) +++{ +++ SizeT compress_size = (SizeT)(*dstlen); +++ int ret; +++ +++ #ifdef __KERNEL__ +++ mutex_lock(&deflate_mutex); +++ #endif +++ +++ ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen, +++ 0, NULL, &lzma_alloc, &lzma_alloc); +++ +++ #ifdef __KERNEL__ +++ mutex_unlock(&deflate_mutex); +++ #endif +++ +++ if (ret != SZ_OK) +++ return -1; +++ +++ *dstlen = (uint32_t)compress_size; +++ +++ return 0; +++} +++ +++STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out, +++ uint32_t srclen, uint32_t destlen, void *model) +++{ +++ int ret; +++ SizeT dl = (SizeT)destlen; +++ SizeT sl = (SizeT)srclen; +++ ELzmaStatus status; +++ +++ ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded, +++ propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc); +++ +++ if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen) +++ return -1; +++ +++ return 0; +++} +++ +++static struct jffs2_compressor jffs2_lzma_comp = { +++ .priority = JFFS2_LZMA_PRIORITY, +++ .name = "lzma", +++ .compr = JFFS2_COMPR_LZMA, +++ .compress = &jffs2_lzma_compress, +++ .decompress = &jffs2_lzma_decompress, +++ .disabled = 0, +++}; +++ +++int INIT jffs2_lzma_init(void) +++{ +++ int ret; +++ CLzmaEncProps props; +++ LzmaEncProps_Init(&props); +++ +++ props.dictSize = LZMA_BEST_DICT(0x2000); +++ props.level = LZMA_BEST_LEVEL; +++ props.lc = LZMA_BEST_LC; +++ props.lp = LZMA_BEST_LP; +++ props.pb = LZMA_BEST_PB; +++ props.fb = LZMA_BEST_FB; +++ +++ ret = lzma_alloc_workspace(&props); +++ if (ret < 0) +++ return ret; +++ +++ ret = jffs2_register_compressor(&jffs2_lzma_comp); +++ if (ret) +++ lzma_free_workspace(); +++ +++ return ret; +++} +++ +++void jffs2_lzma_exit(void) +++{ +++ jffs2_unregister_compressor(&jffs2_lzma_comp); +++ lzma_free_workspace(); +++} ++--- a/include/linux/jffs2.h +++++ b/include/linux/jffs2.h ++@@ -47,6 +47,7 @@ ++ #define JFFS2_COMPR_DYNRUBIN 0x05 ++ #define JFFS2_COMPR_ZLIB 0x06 ++ #define JFFS2_COMPR_LZO 0x07 +++#define JFFS2_COMPR_LZMA 0x08 ++ /* Compatibility flags. */ ++ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ ++ #define JFFS2_NODE_ACCURATE 0x2000 ++--- /dev/null +++++ b/include/linux/lzma.h ++@@ -0,0 +1,61 @@ +++#ifndef __LZMA_H__ +++#define __LZMA_H__ +++ +++#ifdef __KERNEL__ +++ #include +++ #include +++ #include +++ #include +++ #include +++ #define LZMA_MALLOC vmalloc +++ #define LZMA_FREE vfree +++ #define PRINT_ERROR(msg) printk(KERN_WARNING #msg) +++ #define INIT __init +++ #define STATIC static +++#else +++ #include +++ #include +++ #include +++ #include +++ #include +++ #include +++ #include +++ #ifndef PAGE_SIZE +++ extern int page_size; +++ #define PAGE_SIZE page_size +++ #endif +++ #define LZMA_MALLOC malloc +++ #define LZMA_FREE free +++ #define PRINT_ERROR(msg) fprintf(stderr, msg) +++ #define INIT +++ #define STATIC +++#endif +++ +++#include "lzma/LzmaDec.h" +++#include "lzma/LzmaEnc.h" +++ +++#define LZMA_BEST_LEVEL (9) +++#define LZMA_BEST_LC (0) +++#define LZMA_BEST_LP (0) +++#define LZMA_BEST_PB (0) +++#define LZMA_BEST_FB (273) +++ +++#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2) +++ +++static void *p_lzma_malloc(void *p, size_t size) +++{ +++ if (size == 0) +++ return NULL; +++ +++ return LZMA_MALLOC(size); +++} +++ +++static void p_lzma_free(void *p, void *address) +++{ +++ if (address != NULL) +++ LZMA_FREE(address); +++} +++ +++static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzFind.h ++@@ -0,0 +1,116 @@ +++/* LzFind.h -- Match finder for LZ algorithms +++2008-04-04 +++Copyright (c) 1999-2008 Igor Pavlov +++You can use any of the following license options: +++ 1) GNU Lesser General Public License (GNU LGPL) +++ 2) Common Public License (CPL) +++ 3) Common Development and Distribution License (CDDL) Version 1.0 +++ 4) Igor Pavlov, as the author of this code, expressly permits you to +++ statically or dynamically link your code (or bind by name) to this file, +++ while you keep this file unmodified. +++*/ +++ +++#ifndef __LZFIND_H +++#define __LZFIND_H +++ +++#include "Types.h" +++ +++typedef UInt32 CLzRef; +++ +++typedef struct _CMatchFinder +++{ +++ Byte *buffer; +++ UInt32 pos; +++ UInt32 posLimit; +++ UInt32 streamPos; +++ UInt32 lenLimit; +++ +++ UInt32 cyclicBufferPos; +++ UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */ +++ +++ UInt32 matchMaxLen; +++ CLzRef *hash; +++ CLzRef *son; +++ UInt32 hashMask; +++ UInt32 cutValue; +++ +++ Byte *bufferBase; +++ ISeqInStream *stream; +++ int streamEndWasReached; +++ +++ UInt32 blockSize; +++ UInt32 keepSizeBefore; +++ UInt32 keepSizeAfter; +++ +++ UInt32 numHashBytes; +++ int directInput; +++ int btMode; +++ /* int skipModeBits; */ +++ int bigHash; +++ UInt32 historySize; +++ UInt32 fixedHashSize; +++ UInt32 hashSizeSum; +++ UInt32 numSons; +++ SRes result; +++ UInt32 crc[256]; +++} CMatchFinder; +++ +++#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer) +++#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)]) +++ +++#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos) +++ +++int MatchFinder_NeedMove(CMatchFinder *p); +++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p); +++void MatchFinder_MoveBlock(CMatchFinder *p); +++void MatchFinder_ReadIfRequired(CMatchFinder *p); +++ +++void MatchFinder_Construct(CMatchFinder *p); +++ +++/* Conditions: +++ historySize <= 3 GB +++ keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB +++*/ +++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, +++ UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, +++ ISzAlloc *alloc); +++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); +++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems); +++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue); +++ +++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue, +++ UInt32 *distances, UInt32 maxLen); +++ +++/* +++Conditions: +++ Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func. +++ Mf_GetPointerToCurrentPos_Func's result must be used only before any other function +++*/ +++ +++typedef void (*Mf_Init_Func)(void *object); +++typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index); +++typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object); +++typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object); +++typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances); +++typedef void (*Mf_Skip_Func)(void *object, UInt32); +++ +++typedef struct _IMatchFinder +++{ +++ Mf_Init_Func Init; +++ Mf_GetIndexByte_Func GetIndexByte; +++ Mf_GetNumAvailableBytes_Func GetNumAvailableBytes; +++ Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos; +++ Mf_GetMatches_Func GetMatches; +++ Mf_Skip_Func Skip; +++} IMatchFinder; +++ +++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable); +++ +++void MatchFinder_Init(CMatchFinder *p); +++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); +++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances); +++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); +++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzHash.h ++@@ -0,0 +1,56 @@ +++/* LzHash.h -- HASH functions for LZ algorithms +++2008-03-26 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzFind.h for license options */ +++ +++#ifndef __LZHASH_H +++#define __LZHASH_H +++ +++#define kHash2Size (1 << 10) +++#define kHash3Size (1 << 16) +++#define kHash4Size (1 << 20) +++ +++#define kFix3HashSize (kHash2Size) +++#define kFix4HashSize (kHash2Size + kHash3Size) +++#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size) +++ +++#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8); +++ +++#define HASH3_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; } +++ +++#define HASH4_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ +++ hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; } +++ +++#define HASH5_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ +++ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \ +++ hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \ +++ hash4Value &= (kHash4Size - 1); } +++ +++/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */ +++#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF; +++ +++ +++#define MT_HASH2_CALC \ +++ hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1); +++ +++#define MT_HASH3_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); } +++ +++#define MT_HASH4_CALC { \ +++ UInt32 temp = p->crc[cur[0]] ^ cur[1]; \ +++ hash2Value = temp & (kHash2Size - 1); \ +++ hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \ +++ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzmaDec.h ++@@ -0,0 +1,232 @@ +++/* LzmaDec.h -- LZMA Decoder +++2008-04-29 +++Copyright (c) 1999-2008 Igor Pavlov +++You can use any of the following license options: +++ 1) GNU Lesser General Public License (GNU LGPL) +++ 2) Common Public License (CPL) +++ 3) Common Development and Distribution License (CDDL) Version 1.0 +++ 4) Igor Pavlov, as the author of this code, expressly permits you to +++ statically or dynamically link your code (or bind by name) to this file, +++ while you keep this file unmodified. +++*/ +++ +++#ifndef __LZMADEC_H +++#define __LZMADEC_H +++ +++#include "Types.h" +++ +++/* #define _LZMA_PROB32 */ +++/* _LZMA_PROB32 can increase the speed on some CPUs, +++ but memory usage for CLzmaDec::probs will be doubled in that case */ +++ +++#ifdef _LZMA_PROB32 +++#define CLzmaProb UInt32 +++#else +++#define CLzmaProb UInt16 +++#endif +++ +++ +++/* ---------- LZMA Properties ---------- */ +++ +++#define LZMA_PROPS_SIZE 5 +++ +++typedef struct _CLzmaProps +++{ +++ unsigned lc, lp, pb; +++ UInt32 dicSize; +++} CLzmaProps; +++ +++/* LzmaProps_Decode - decodes properties +++Returns: +++ SZ_OK +++ SZ_ERROR_UNSUPPORTED - Unsupported properties +++*/ +++ +++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size); +++ +++ +++/* ---------- LZMA Decoder state ---------- */ +++ +++/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case. +++ Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */ +++ +++#define LZMA_REQUIRED_INPUT_MAX 20 +++ +++typedef struct +++{ +++ CLzmaProps prop; +++ CLzmaProb *probs; +++ Byte *dic; +++ const Byte *buf; +++ UInt32 range, code; +++ SizeT dicPos; +++ SizeT dicBufSize; +++ UInt32 processedPos; +++ UInt32 checkDicSize; +++ unsigned state; +++ UInt32 reps[4]; +++ unsigned remainLen; +++ int needFlush; +++ int needInitState; +++ UInt32 numProbs; +++ unsigned tempBufSize; +++ Byte tempBuf[LZMA_REQUIRED_INPUT_MAX]; +++} CLzmaDec; +++ +++#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; } +++ +++void LzmaDec_Init(CLzmaDec *p); +++ +++/* There are two types of LZMA streams: +++ 0) Stream with end mark. That end mark adds about 6 bytes to compressed size. +++ 1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */ +++ +++typedef enum +++{ +++ LZMA_FINISH_ANY, /* finish at any point */ +++ LZMA_FINISH_END /* block must be finished at the end */ +++} ELzmaFinishMode; +++ +++/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!! +++ +++ You must use LZMA_FINISH_END, when you know that current output buffer +++ covers last bytes of block. In other cases you must use LZMA_FINISH_ANY. +++ +++ If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK, +++ and output value of destLen will be less than output buffer size limit. +++ You can check status result also. +++ +++ You can use multiple checks to test data integrity after full decompression: +++ 1) Check Result and "status" variable. +++ 2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize. +++ 3) Check that output(srcLen) = compressedSize, if you know real compressedSize. +++ You must use correct finish mode in that case. */ +++ +++typedef enum +++{ +++ LZMA_STATUS_NOT_SPECIFIED, /* use main error code instead */ +++ LZMA_STATUS_FINISHED_WITH_MARK, /* stream was finished with end mark. */ +++ LZMA_STATUS_NOT_FINISHED, /* stream was not finished */ +++ LZMA_STATUS_NEEDS_MORE_INPUT, /* you must provide more input bytes */ +++ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK /* there is probability that stream was finished without end mark */ +++} ELzmaStatus; +++ +++/* ELzmaStatus is used only as output value for function call */ +++ +++ +++/* ---------- Interfaces ---------- */ +++ +++/* There are 3 levels of interfaces: +++ 1) Dictionary Interface +++ 2) Buffer Interface +++ 3) One Call Interface +++ You can select any of these interfaces, but don't mix functions from different +++ groups for same object. */ +++ +++ +++/* There are two variants to allocate state for Dictionary Interface: +++ 1) LzmaDec_Allocate / LzmaDec_Free +++ 2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs +++ You can use variant 2, if you set dictionary buffer manually. +++ For Buffer Interface you must always use variant 1. +++ +++LzmaDec_Allocate* can return: +++ SZ_OK +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_UNSUPPORTED - Unsupported properties +++*/ +++ +++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc); +++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc); +++ +++SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc); +++void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc); +++ +++/* ---------- Dictionary Interface ---------- */ +++ +++/* You can use it, if you want to eliminate the overhead for data copying from +++ dictionary to some other external buffer. +++ You must work with CLzmaDec variables directly in this interface. +++ +++ STEPS: +++ LzmaDec_Constr() +++ LzmaDec_Allocate() +++ for (each new stream) +++ { +++ LzmaDec_Init() +++ while (it needs more decompression) +++ { +++ LzmaDec_DecodeToDic() +++ use data from CLzmaDec::dic and update CLzmaDec::dicPos +++ } +++ } +++ LzmaDec_Free() +++*/ +++ +++/* LzmaDec_DecodeToDic +++ +++ The decoding to internal dictionary buffer (CLzmaDec::dic). +++ You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! +++ +++finishMode: +++ It has meaning only if the decoding reaches output limit (dicLimit). +++ LZMA_FINISH_ANY - Decode just dicLimit bytes. +++ LZMA_FINISH_END - Stream must be finished after dicLimit. +++ +++Returns: +++ SZ_OK +++ status: +++ LZMA_STATUS_FINISHED_WITH_MARK +++ LZMA_STATUS_NOT_FINISHED +++ LZMA_STATUS_NEEDS_MORE_INPUT +++ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK +++ SZ_ERROR_DATA - Data error +++*/ +++ +++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, +++ const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); +++ +++ +++/* ---------- Buffer Interface ---------- */ +++ +++/* It's zlib-like interface. +++ See LzmaDec_DecodeToDic description for information about STEPS and return results, +++ but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need +++ to work with CLzmaDec variables manually. +++ +++finishMode: +++ It has meaning only if the decoding reaches output limit (*destLen). +++ LZMA_FINISH_ANY - Decode just destLen bytes. +++ LZMA_FINISH_END - Stream must be finished after (*destLen). +++*/ +++ +++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, +++ const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status); +++ +++ +++/* ---------- One Call Interface ---------- */ +++ +++/* LzmaDecode +++ +++finishMode: +++ It has meaning only if the decoding reaches output limit (*destLen). +++ LZMA_FINISH_ANY - Decode just destLen bytes. +++ LZMA_FINISH_END - Stream must be finished after (*destLen). +++ +++Returns: +++ SZ_OK +++ status: +++ LZMA_STATUS_FINISHED_WITH_MARK +++ LZMA_STATUS_NOT_FINISHED +++ LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK +++ SZ_ERROR_DATA - Data error +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_UNSUPPORTED - Unsupported properties +++ SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src). +++*/ +++ +++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, +++ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, +++ ELzmaStatus *status, ISzAlloc *alloc); +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/LzmaEnc.h ++@@ -0,0 +1,74 @@ +++/* LzmaEnc.h -- LZMA Encoder +++2008-04-27 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzFind.h for license options */ +++ +++#ifndef __LZMAENC_H +++#define __LZMAENC_H +++ +++#include "Types.h" +++ +++#define LZMA_PROPS_SIZE 5 +++ +++typedef struct _CLzmaEncProps +++{ +++ int level; /* 0 <= level <= 9 */ +++ UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version +++ (1 << 12) <= dictSize <= (1 << 30) for 64-bit version +++ default = (1 << 24) */ +++ int lc; /* 0 <= lc <= 8, default = 3 */ +++ int lp; /* 0 <= lp <= 4, default = 0 */ +++ int pb; /* 0 <= pb <= 4, default = 2 */ +++ int algo; /* 0 - fast, 1 - normal, default = 1 */ +++ int fb; /* 5 <= fb <= 273, default = 32 */ +++ int btMode; /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */ +++ int numHashBytes; /* 2, 3 or 4, default = 4 */ +++ UInt32 mc; /* 1 <= mc <= (1 << 30), default = 32 */ +++ unsigned writeEndMark; /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */ +++ int numThreads; /* 1 or 2, default = 2 */ +++} CLzmaEncProps; +++ +++void LzmaEncProps_Init(CLzmaEncProps *p); +++void LzmaEncProps_Normalize(CLzmaEncProps *p); +++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2); +++ +++ +++/* ---------- CLzmaEncHandle Interface ---------- */ +++ +++/* LzmaEnc_* functions can return the following exit codes: +++Returns: +++ SZ_OK - OK +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_PARAM - Incorrect paramater in props +++ SZ_ERROR_WRITE - Write callback error. +++ SZ_ERROR_PROGRESS - some break from progress callback +++ SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) +++*/ +++ +++typedef void * CLzmaEncHandle; +++ +++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc); +++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig); +++SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props); +++SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size); +++SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream, +++ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); +++SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); +++ +++/* ---------- One Call Interface ---------- */ +++ +++/* LzmaEncode +++Return code: +++ SZ_OK - OK +++ SZ_ERROR_MEM - Memory allocation error +++ SZ_ERROR_PARAM - Incorrect paramater +++ SZ_ERROR_OUTPUT_EOF - output buffer overflow +++ SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version) +++*/ +++ +++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, +++ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); +++ +++#endif ++--- /dev/null +++++ b/include/linux/lzma/Types.h ++@@ -0,0 +1,130 @@ +++/* Types.h -- Basic types +++2008-04-11 +++Igor Pavlov +++Public domain */ +++ +++#ifndef __7Z_TYPES_H +++#define __7Z_TYPES_H +++ +++#define SZ_OK 0 +++ +++#define SZ_ERROR_DATA 1 +++#define SZ_ERROR_MEM 2 +++#define SZ_ERROR_CRC 3 +++#define SZ_ERROR_UNSUPPORTED 4 +++#define SZ_ERROR_PARAM 5 +++#define SZ_ERROR_INPUT_EOF 6 +++#define SZ_ERROR_OUTPUT_EOF 7 +++#define SZ_ERROR_READ 8 +++#define SZ_ERROR_WRITE 9 +++#define SZ_ERROR_PROGRESS 10 +++#define SZ_ERROR_FAIL 11 +++#define SZ_ERROR_THREAD 12 +++ +++#define SZ_ERROR_ARCHIVE 16 +++#define SZ_ERROR_NO_ARCHIVE 17 +++ +++typedef int SRes; +++ +++#ifndef RINOK +++#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; } +++#endif +++ +++typedef unsigned char Byte; +++typedef short Int16; +++typedef unsigned short UInt16; +++ +++#ifdef _LZMA_UINT32_IS_ULONG +++typedef long Int32; +++typedef unsigned long UInt32; +++#else +++typedef int Int32; +++typedef unsigned int UInt32; +++#endif +++ +++/* #define _SZ_NO_INT_64 */ +++/* define it if your compiler doesn't support 64-bit integers */ +++ +++#ifdef _SZ_NO_INT_64 +++ +++typedef long Int64; +++typedef unsigned long UInt64; +++ +++#else +++ +++#if defined(_MSC_VER) || defined(__BORLANDC__) +++typedef __int64 Int64; +++typedef unsigned __int64 UInt64; +++#else +++typedef long long int Int64; +++typedef unsigned long long int UInt64; +++#endif +++ +++#endif +++ +++#ifdef _LZMA_NO_SYSTEM_SIZE_T +++typedef UInt32 SizeT; +++#else +++#include +++typedef size_t SizeT; +++#endif +++ +++typedef int Bool; +++#define True 1 +++#define False 0 +++ +++ +++#ifdef _MSC_VER +++ +++#if _MSC_VER >= 1300 +++#define MY_NO_INLINE __declspec(noinline) +++#else +++#define MY_NO_INLINE +++#endif +++ +++#define MY_CDECL __cdecl +++#define MY_STD_CALL __stdcall +++#define MY_FAST_CALL MY_NO_INLINE __fastcall +++ +++#else +++ +++#define MY_CDECL +++#define MY_STD_CALL +++#define MY_FAST_CALL +++ +++#endif +++ +++ +++/* The following interfaces use first parameter as pointer to structure */ +++ +++typedef struct +++{ +++ SRes (*Read)(void *p, void *buf, size_t *size); +++ /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream. +++ (output(*size) < input(*size)) is allowed */ +++} ISeqInStream; +++ +++typedef struct +++{ +++ size_t (*Write)(void *p, const void *buf, size_t size); +++ /* Returns: result - the number of actually written bytes. +++ (result < size) means error */ +++} ISeqOutStream; +++ +++typedef struct +++{ +++ SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize); +++ /* Returns: result. (result != SZ_OK) means break. +++ Value (UInt64)(Int64)-1 for size means unknown value. */ +++} ICompressProgress; +++ +++typedef struct +++{ +++ void *(*Alloc)(void *p, size_t size); +++ void (*Free)(void *p, void *address); /* address can be 0 */ +++} ISzAlloc; +++ +++#define IAlloc_Alloc(p, size) (p)->Alloc((p), size) +++#define IAlloc_Free(p, a) (p)->Free((p), a) +++ +++#endif ++--- /dev/null +++++ b/lzma/LzFind.c ++@@ -0,0 +1,753 @@ +++/* LzFind.c -- Match finder for LZ algorithms +++2008-04-04 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzFind.h for license options */ +++ +++#include +++ +++#include "LzFind.h" +++#include "LzHash.h" +++ +++#define kEmptyHashValue 0 +++#define kMaxValForNormalize ((UInt32)0xFFFFFFFF) +++#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */ +++#define kNormalizeMask (~(kNormalizeStepMin - 1)) +++#define kMaxHistorySize ((UInt32)3 << 30) +++ +++#define kStartMaxLen 3 +++ +++static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc) +++{ +++ if (!p->directInput) +++ { +++ alloc->Free(alloc, p->bufferBase); +++ p->bufferBase = 0; +++ } +++} +++ +++/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */ +++ +++static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc) +++{ +++ UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv; +++ if (p->directInput) +++ { +++ p->blockSize = blockSize; +++ return 1; +++ } +++ if (p->bufferBase == 0 || p->blockSize != blockSize) +++ { +++ LzInWindow_Free(p, alloc); +++ p->blockSize = blockSize; +++ p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize); +++ } +++ return (p->bufferBase != 0); +++} +++ +++Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; } +++Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; } +++ +++UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; } +++ +++void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue) +++{ +++ p->posLimit -= subValue; +++ p->pos -= subValue; +++ p->streamPos -= subValue; +++} +++ +++static void MatchFinder_ReadBlock(CMatchFinder *p) +++{ +++ if (p->streamEndWasReached || p->result != SZ_OK) +++ return; +++ for (;;) +++ { +++ Byte *dest = p->buffer + (p->streamPos - p->pos); +++ size_t size = (p->bufferBase + p->blockSize - dest); +++ if (size == 0) +++ return; +++ p->result = p->stream->Read(p->stream, dest, &size); +++ if (p->result != SZ_OK) +++ return; +++ if (size == 0) +++ { +++ p->streamEndWasReached = 1; +++ return; +++ } +++ p->streamPos += (UInt32)size; +++ if (p->streamPos - p->pos > p->keepSizeAfter) +++ return; +++ } +++} +++ +++void MatchFinder_MoveBlock(CMatchFinder *p) +++{ +++ memmove(p->bufferBase, +++ p->buffer - p->keepSizeBefore, +++ (size_t)(p->streamPos - p->pos + p->keepSizeBefore)); +++ p->buffer = p->bufferBase + p->keepSizeBefore; +++} +++ +++int MatchFinder_NeedMove(CMatchFinder *p) +++{ +++ /* if (p->streamEndWasReached) return 0; */ +++ return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter); +++} +++ +++void MatchFinder_ReadIfRequired(CMatchFinder *p) +++{ +++ if (p->streamEndWasReached) +++ return; +++ if (p->keepSizeAfter >= p->streamPos - p->pos) +++ MatchFinder_ReadBlock(p); +++} +++ +++static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p) +++{ +++ if (MatchFinder_NeedMove(p)) +++ MatchFinder_MoveBlock(p); +++ MatchFinder_ReadBlock(p); +++} +++ +++static void MatchFinder_SetDefaultSettings(CMatchFinder *p) +++{ +++ p->cutValue = 32; +++ p->btMode = 1; +++ p->numHashBytes = 4; +++ /* p->skipModeBits = 0; */ +++ p->directInput = 0; +++ p->bigHash = 0; +++} +++ +++#define kCrcPoly 0xEDB88320 +++ +++void MatchFinder_Construct(CMatchFinder *p) +++{ +++ UInt32 i; +++ p->bufferBase = 0; +++ p->directInput = 0; +++ p->hash = 0; +++ MatchFinder_SetDefaultSettings(p); +++ +++ for (i = 0; i < 256; i++) +++ { +++ UInt32 r = i; +++ int j; +++ for (j = 0; j < 8; j++) +++ r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1)); +++ p->crc[i] = r; +++ } +++} +++ +++static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->hash); +++ p->hash = 0; +++} +++ +++void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc) +++{ +++ MatchFinder_FreeThisClassMemory(p, alloc); +++ LzInWindow_Free(p, alloc); +++} +++ +++static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc) +++{ +++ size_t sizeInBytes = (size_t)num * sizeof(CLzRef); +++ if (sizeInBytes / sizeof(CLzRef) != num) +++ return 0; +++ return (CLzRef *)alloc->Alloc(alloc, sizeInBytes); +++} +++ +++int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, +++ UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, +++ ISzAlloc *alloc) +++{ +++ UInt32 sizeReserv; +++ if (historySize > kMaxHistorySize) +++ { +++ MatchFinder_Free(p, alloc); +++ return 0; +++ } +++ sizeReserv = historySize >> 1; +++ if (historySize > ((UInt32)2 << 30)) +++ sizeReserv = historySize >> 2; +++ sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19); +++ +++ p->keepSizeBefore = historySize + keepAddBufferBefore + 1; +++ p->keepSizeAfter = matchMaxLen + keepAddBufferAfter; +++ /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */ +++ if (LzInWindow_Create(p, sizeReserv, alloc)) +++ { +++ UInt32 newCyclicBufferSize = (historySize /* >> p->skipModeBits */) + 1; +++ UInt32 hs; +++ p->matchMaxLen = matchMaxLen; +++ { +++ p->fixedHashSize = 0; +++ if (p->numHashBytes == 2) +++ hs = (1 << 16) - 1; +++ else +++ { +++ hs = historySize - 1; +++ hs |= (hs >> 1); +++ hs |= (hs >> 2); +++ hs |= (hs >> 4); +++ hs |= (hs >> 8); +++ hs >>= 1; +++ /* hs >>= p->skipModeBits; */ +++ hs |= 0xFFFF; /* don't change it! It's required for Deflate */ +++ if (hs > (1 << 24)) +++ { +++ if (p->numHashBytes == 3) +++ hs = (1 << 24) - 1; +++ else +++ hs >>= 1; +++ } +++ } +++ p->hashMask = hs; +++ hs++; +++ if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size; +++ if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size; +++ if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size; +++ hs += p->fixedHashSize; +++ } +++ +++ { +++ UInt32 prevSize = p->hashSizeSum + p->numSons; +++ UInt32 newSize; +++ p->historySize = historySize; +++ p->hashSizeSum = hs; +++ p->cyclicBufferSize = newCyclicBufferSize; +++ p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize); +++ newSize = p->hashSizeSum + p->numSons; +++ if (p->hash != 0 && prevSize == newSize) +++ return 1; +++ MatchFinder_FreeThisClassMemory(p, alloc); +++ p->hash = AllocRefs(newSize, alloc); +++ if (p->hash != 0) +++ { +++ p->son = p->hash + p->hashSizeSum; +++ return 1; +++ } +++ } +++ } +++ MatchFinder_Free(p, alloc); +++ return 0; +++} +++ +++static void MatchFinder_SetLimits(CMatchFinder *p) +++{ +++ UInt32 limit = kMaxValForNormalize - p->pos; +++ UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos; +++ if (limit2 < limit) +++ limit = limit2; +++ limit2 = p->streamPos - p->pos; +++ if (limit2 <= p->keepSizeAfter) +++ { +++ if (limit2 > 0) +++ limit2 = 1; +++ } +++ else +++ limit2 -= p->keepSizeAfter; +++ if (limit2 < limit) +++ limit = limit2; +++ { +++ UInt32 lenLimit = p->streamPos - p->pos; +++ if (lenLimit > p->matchMaxLen) +++ lenLimit = p->matchMaxLen; +++ p->lenLimit = lenLimit; +++ } +++ p->posLimit = p->pos + limit; +++} +++ +++void MatchFinder_Init(CMatchFinder *p) +++{ +++ UInt32 i; +++ for(i = 0; i < p->hashSizeSum; i++) +++ p->hash[i] = kEmptyHashValue; +++ p->cyclicBufferPos = 0; +++ p->buffer = p->bufferBase; +++ p->pos = p->streamPos = p->cyclicBufferSize; +++ p->result = SZ_OK; +++ p->streamEndWasReached = 0; +++ MatchFinder_ReadBlock(p); +++ MatchFinder_SetLimits(p); +++} +++ +++static UInt32 MatchFinder_GetSubValue(CMatchFinder *p) +++{ +++ return (p->pos - p->historySize - 1) & kNormalizeMask; +++} +++ +++void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems) +++{ +++ UInt32 i; +++ for (i = 0; i < numItems; i++) +++ { +++ UInt32 value = items[i]; +++ if (value <= subValue) +++ value = kEmptyHashValue; +++ else +++ value -= subValue; +++ items[i] = value; +++ } +++} +++ +++static void MatchFinder_Normalize(CMatchFinder *p) +++{ +++ UInt32 subValue = MatchFinder_GetSubValue(p); +++ MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons); +++ MatchFinder_ReduceOffsets(p, subValue); +++} +++ +++static void MatchFinder_CheckLimits(CMatchFinder *p) +++{ +++ if (p->pos == kMaxValForNormalize) +++ MatchFinder_Normalize(p); +++ if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos) +++ MatchFinder_CheckAndMoveAndRead(p); +++ if (p->cyclicBufferPos == p->cyclicBufferSize) +++ p->cyclicBufferPos = 0; +++ MatchFinder_SetLimits(p); +++} +++ +++static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, +++ UInt32 *distances, UInt32 maxLen) +++{ +++ son[_cyclicBufferPos] = curMatch; +++ for (;;) +++ { +++ UInt32 delta = pos - curMatch; +++ if (cutValue-- == 0 || delta >= _cyclicBufferSize) +++ return distances; +++ { +++ const Byte *pb = cur - delta; +++ curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)]; +++ if (pb[maxLen] == cur[maxLen] && *pb == *cur) +++ { +++ UInt32 len = 0; +++ while(++len != lenLimit) +++ if (pb[len] != cur[len]) +++ break; +++ if (maxLen < len) +++ { +++ *distances++ = maxLen = len; +++ *distances++ = delta - 1; +++ if (len == lenLimit) +++ return distances; +++ } +++ } +++ } +++ } +++} +++ +++UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, +++ UInt32 *distances, UInt32 maxLen) +++{ +++ CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1; +++ CLzRef *ptr1 = son + (_cyclicBufferPos << 1); +++ UInt32 len0 = 0, len1 = 0; +++ for (;;) +++ { +++ UInt32 delta = pos - curMatch; +++ if (cutValue-- == 0 || delta >= _cyclicBufferSize) +++ { +++ *ptr0 = *ptr1 = kEmptyHashValue; +++ return distances; +++ } +++ { +++ CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1); +++ const Byte *pb = cur - delta; +++ UInt32 len = (len0 < len1 ? len0 : len1); +++ if (pb[len] == cur[len]) +++ { +++ if (++len != lenLimit && pb[len] == cur[len]) +++ while(++len != lenLimit) +++ if (pb[len] != cur[len]) +++ break; +++ if (maxLen < len) +++ { +++ *distances++ = maxLen = len; +++ *distances++ = delta - 1; +++ if (len == lenLimit) +++ { +++ *ptr1 = pair[0]; +++ *ptr0 = pair[1]; +++ return distances; +++ } +++ } +++ } +++ if (pb[len] < cur[len]) +++ { +++ *ptr1 = curMatch; +++ ptr1 = pair + 1; +++ curMatch = *ptr1; +++ len1 = len; +++ } +++ else +++ { +++ *ptr0 = curMatch; +++ ptr0 = pair; +++ curMatch = *ptr0; +++ len0 = len; +++ } +++ } +++ } +++} +++ +++static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son, +++ UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue) +++{ +++ CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1; +++ CLzRef *ptr1 = son + (_cyclicBufferPos << 1); +++ UInt32 len0 = 0, len1 = 0; +++ for (;;) +++ { +++ UInt32 delta = pos - curMatch; +++ if (cutValue-- == 0 || delta >= _cyclicBufferSize) +++ { +++ *ptr0 = *ptr1 = kEmptyHashValue; +++ return; +++ } +++ { +++ CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1); +++ const Byte *pb = cur - delta; +++ UInt32 len = (len0 < len1 ? len0 : len1); +++ if (pb[len] == cur[len]) +++ { +++ while(++len != lenLimit) +++ if (pb[len] != cur[len]) +++ break; +++ { +++ if (len == lenLimit) +++ { +++ *ptr1 = pair[0]; +++ *ptr0 = pair[1]; +++ return; +++ } +++ } +++ } +++ if (pb[len] < cur[len]) +++ { +++ *ptr1 = curMatch; +++ ptr1 = pair + 1; +++ curMatch = *ptr1; +++ len1 = len; +++ } +++ else +++ { +++ *ptr0 = curMatch; +++ ptr0 = pair; +++ curMatch = *ptr0; +++ len0 = len; +++ } +++ } +++ } +++} +++ +++#define MOVE_POS \ +++ ++p->cyclicBufferPos; \ +++ p->buffer++; \ +++ if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p); +++ +++#define MOVE_POS_RET MOVE_POS return offset; +++ +++static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; } +++ +++#define GET_MATCHES_HEADER2(minLen, ret_op) \ +++ UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \ +++ lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \ +++ cur = p->buffer; +++ +++#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0) +++#define SKIP_HEADER(minLen) GET_MATCHES_HEADER2(minLen, continue) +++ +++#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue +++ +++#define GET_MATCHES_FOOTER(offset, maxLen) \ +++ offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \ +++ distances + offset, maxLen) - distances); MOVE_POS_RET; +++ +++#define SKIP_FOOTER \ +++ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS; +++ +++static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 offset; +++ GET_MATCHES_HEADER(2) +++ HASH2_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ offset = 0; +++ GET_MATCHES_FOOTER(offset, 1) +++} +++ +++UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 offset; +++ GET_MATCHES_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ offset = 0; +++ GET_MATCHES_FOOTER(offset, 2) +++} +++ +++static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 hash2Value, delta2, maxLen, offset; +++ GET_MATCHES_HEADER(3) +++ +++ HASH3_CALC; +++ +++ delta2 = p->pos - p->hash[hash2Value]; +++ curMatch = p->hash[kFix3HashSize + hashValue]; +++ +++ p->hash[hash2Value] = +++ p->hash[kFix3HashSize + hashValue] = p->pos; +++ +++ +++ maxLen = 2; +++ offset = 0; +++ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) +++ { +++ for (; maxLen != lenLimit; maxLen++) +++ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) +++ break; +++ distances[0] = maxLen; +++ distances[1] = delta2 - 1; +++ offset = 2; +++ if (maxLen == lenLimit) +++ { +++ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); +++ MOVE_POS_RET; +++ } +++ } +++ GET_MATCHES_FOOTER(offset, maxLen) +++} +++ +++static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; +++ GET_MATCHES_HEADER(4) +++ +++ HASH4_CALC; +++ +++ delta2 = p->pos - p->hash[ hash2Value]; +++ delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ +++ maxLen = 1; +++ offset = 0; +++ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) +++ { +++ distances[0] = maxLen = 2; +++ distances[1] = delta2 - 1; +++ offset = 2; +++ } +++ if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) +++ { +++ maxLen = 3; +++ distances[offset + 1] = delta3 - 1; +++ offset += 2; +++ delta2 = delta3; +++ } +++ if (offset != 0) +++ { +++ for (; maxLen != lenLimit; maxLen++) +++ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) +++ break; +++ distances[offset - 2] = maxLen; +++ if (maxLen == lenLimit) +++ { +++ SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); +++ MOVE_POS_RET; +++ } +++ } +++ if (maxLen < 3) +++ maxLen = 3; +++ GET_MATCHES_FOOTER(offset, maxLen) +++} +++ +++static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset; +++ GET_MATCHES_HEADER(4) +++ +++ HASH4_CALC; +++ +++ delta2 = p->pos - p->hash[ hash2Value]; +++ delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ +++ maxLen = 1; +++ offset = 0; +++ if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur) +++ { +++ distances[0] = maxLen = 2; +++ distances[1] = delta2 - 1; +++ offset = 2; +++ } +++ if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur) +++ { +++ maxLen = 3; +++ distances[offset + 1] = delta3 - 1; +++ offset += 2; +++ delta2 = delta3; +++ } +++ if (offset != 0) +++ { +++ for (; maxLen != lenLimit; maxLen++) +++ if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen]) +++ break; +++ distances[offset - 2] = maxLen; +++ if (maxLen == lenLimit) +++ { +++ p->son[p->cyclicBufferPos] = curMatch; +++ MOVE_POS_RET; +++ } +++ } +++ if (maxLen < 3) +++ maxLen = 3; +++ offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), +++ distances + offset, maxLen) - (distances)); +++ MOVE_POS_RET +++} +++ +++UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +++{ +++ UInt32 offset; +++ GET_MATCHES_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p), +++ distances, 2) - (distances)); +++ MOVE_POS_RET +++} +++ +++static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ SKIP_HEADER(2) +++ HASH2_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ SKIP_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ UInt32 hash2Value; +++ SKIP_HEADER(3) +++ HASH3_CALC; +++ curMatch = p->hash[kFix3HashSize + hashValue]; +++ p->hash[hash2Value] = +++ p->hash[kFix3HashSize + hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ UInt32 hash2Value, hash3Value; +++ SKIP_HEADER(4) +++ HASH4_CALC; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = p->pos; +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ SKIP_FOOTER +++ } +++ while (--num != 0); +++} +++ +++static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ UInt32 hash2Value, hash3Value; +++ SKIP_HEADER(4) +++ HASH4_CALC; +++ curMatch = p->hash[kFix4HashSize + hashValue]; +++ p->hash[ hash2Value] = +++ p->hash[kFix3HashSize + hash3Value] = +++ p->hash[kFix4HashSize + hashValue] = p->pos; +++ p->son[p->cyclicBufferPos] = curMatch; +++ MOVE_POS +++ } +++ while (--num != 0); +++} +++ +++void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +++{ +++ do +++ { +++ SKIP_HEADER(3) +++ HASH_ZIP_CALC; +++ curMatch = p->hash[hashValue]; +++ p->hash[hashValue] = p->pos; +++ p->son[p->cyclicBufferPos] = curMatch; +++ MOVE_POS +++ } +++ while (--num != 0); +++} +++ +++void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable) +++{ +++ vTable->Init = (Mf_Init_Func)MatchFinder_Init; +++ vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte; +++ vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes; +++ vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos; +++ if (!p->btMode) +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip; +++ } +++ else if (p->numHashBytes == 2) +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip; +++ } +++ else if (p->numHashBytes == 3) +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip; +++ } +++ else +++ { +++ vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches; +++ vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; +++ } +++} ++--- /dev/null +++++ b/lzma/LzmaDec.c ++@@ -0,0 +1,1014 @@ +++/* LzmaDec.c -- LZMA Decoder +++2008-04-29 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzmaDec.h for license options */ +++ +++#include "LzmaDec.h" +++ +++#include +++ +++#define kNumTopBits 24 +++#define kTopValue ((UInt32)1 << kNumTopBits) +++ +++#define kNumBitModelTotalBits 11 +++#define kBitModelTotal (1 << kNumBitModelTotalBits) +++#define kNumMoveBits 5 +++ +++#define RC_INIT_SIZE 5 +++ +++#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); } +++ +++#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) +++#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); +++#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits)); +++#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \ +++ { UPDATE_0(p); i = (i + i); A0; } else \ +++ { UPDATE_1(p); i = (i + i) + 1; A1; } +++#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;) +++ +++#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); } +++#define TREE_DECODE(probs, limit, i) \ +++ { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; } +++ +++/* #define _LZMA_SIZE_OPT */ +++ +++#ifdef _LZMA_SIZE_OPT +++#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i) +++#else +++#define TREE_6_DECODE(probs, i) \ +++ { i = 1; \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ TREE_GET_BIT(probs, i); \ +++ i -= 0x40; } +++#endif +++ +++#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); } +++ +++#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound) +++#define UPDATE_0_CHECK range = bound; +++#define UPDATE_1_CHECK range -= bound; code -= bound; +++#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \ +++ { UPDATE_0_CHECK; i = (i + i); A0; } else \ +++ { UPDATE_1_CHECK; i = (i + i) + 1; A1; } +++#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;) +++#define TREE_DECODE_CHECK(probs, limit, i) \ +++ { i = 1; do { GET_BIT_CHECK(probs + i, i) } while(i < limit); i -= limit; } +++ +++ +++#define kNumPosBitsMax 4 +++#define kNumPosStatesMax (1 << kNumPosBitsMax) +++ +++#define kLenNumLowBits 3 +++#define kLenNumLowSymbols (1 << kLenNumLowBits) +++#define kLenNumMidBits 3 +++#define kLenNumMidSymbols (1 << kLenNumMidBits) +++#define kLenNumHighBits 8 +++#define kLenNumHighSymbols (1 << kLenNumHighBits) +++ +++#define LenChoice 0 +++#define LenChoice2 (LenChoice + 1) +++#define LenLow (LenChoice2 + 1) +++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits)) +++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits)) +++#define kNumLenProbs (LenHigh + kLenNumHighSymbols) +++ +++ +++#define kNumStates 12 +++#define kNumLitStates 7 +++ +++#define kStartPosModelIndex 4 +++#define kEndPosModelIndex 14 +++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1)) +++ +++#define kNumPosSlotBits 6 +++#define kNumLenToPosStates 4 +++ +++#define kNumAlignBits 4 +++#define kAlignTableSize (1 << kNumAlignBits) +++ +++#define kMatchMinLen 2 +++#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols) +++ +++#define IsMatch 0 +++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax)) +++#define IsRepG0 (IsRep + kNumStates) +++#define IsRepG1 (IsRepG0 + kNumStates) +++#define IsRepG2 (IsRepG1 + kNumStates) +++#define IsRep0Long (IsRepG2 + kNumStates) +++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax)) +++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits)) +++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex) +++#define LenCoder (Align + kAlignTableSize) +++#define RepLenCoder (LenCoder + kNumLenProbs) +++#define Literal (RepLenCoder + kNumLenProbs) +++ +++#define LZMA_BASE_SIZE 1846 +++#define LZMA_LIT_SIZE 768 +++ +++#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp))) +++ +++#if Literal != LZMA_BASE_SIZE +++StopCompilingDueBUG +++#endif +++ +++/* +++#define LZMA_STREAM_WAS_FINISHED_ID (-1) +++#define LZMA_SPEC_LEN_OFFSET (-3) +++*/ +++ +++Byte kLiteralNextStates[kNumStates * 2] = +++{ +++ 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5, +++ 7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10 +++}; +++ +++#define LZMA_DIC_MIN (1 << 12) +++ +++/* First LZMA-symbol is always decoded. +++And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization +++Out: +++ Result: +++ 0 - OK +++ 1 - Error +++ p->remainLen: +++ < kMatchSpecLenStart : normal remain +++ = kMatchSpecLenStart : finished +++ = kMatchSpecLenStart + 1 : Flush marker +++ = kMatchSpecLenStart + 2 : State Init Marker +++*/ +++ +++static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit) +++{ +++ CLzmaProb *probs = p->probs; +++ +++ unsigned state = p->state; +++ UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3]; +++ unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1; +++ unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1; +++ unsigned lc = p->prop.lc; +++ +++ Byte *dic = p->dic; +++ SizeT dicBufSize = p->dicBufSize; +++ SizeT dicPos = p->dicPos; +++ +++ UInt32 processedPos = p->processedPos; +++ UInt32 checkDicSize = p->checkDicSize; +++ unsigned len = 0; +++ +++ const Byte *buf = p->buf; +++ UInt32 range = p->range; +++ UInt32 code = p->code; +++ +++ do +++ { +++ CLzmaProb *prob; +++ UInt32 bound; +++ unsigned ttt; +++ unsigned posState = processedPos & pbMask; +++ +++ prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0(prob) +++ { +++ unsigned symbol; +++ UPDATE_0(prob); +++ prob = probs + Literal; +++ if (checkDicSize != 0 || processedPos != 0) +++ prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) + +++ (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc)))); +++ +++ if (state < kNumLitStates) +++ { +++ symbol = 1; +++ do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100); +++ } +++ else +++ { +++ unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; +++ unsigned offs = 0x100; +++ symbol = 1; +++ do +++ { +++ unsigned bit; +++ CLzmaProb *probLit; +++ matchByte <<= 1; +++ bit = (matchByte & offs); +++ probLit = prob + offs + bit + symbol; +++ GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit) +++ } +++ while (symbol < 0x100); +++ } +++ dic[dicPos++] = (Byte)symbol; +++ processedPos++; +++ +++ state = kLiteralNextStates[state]; +++ /* if (state < 4) state = 0; else if (state < 10) state -= 3; else state -= 6; */ +++ continue; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ prob = probs + IsRep + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ state += kNumStates; +++ prob = probs + LenCoder; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ if (checkDicSize == 0 && processedPos == 0) +++ return SZ_ERROR_DATA; +++ prob = probs + IsRepG0 + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; +++ dicPos++; +++ processedPos++; +++ state = state < kNumLitStates ? 9 : 11; +++ continue; +++ } +++ UPDATE_1(prob); +++ } +++ else +++ { +++ UInt32 distance; +++ UPDATE_1(prob); +++ prob = probs + IsRepG1 + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ distance = rep1; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ prob = probs + IsRepG2 + state; +++ IF_BIT_0(prob) +++ { +++ UPDATE_0(prob); +++ distance = rep2; +++ } +++ else +++ { +++ UPDATE_1(prob); +++ distance = rep3; +++ rep3 = rep2; +++ } +++ rep2 = rep1; +++ } +++ rep1 = rep0; +++ rep0 = distance; +++ } +++ state = state < kNumLitStates ? 8 : 11; +++ prob = probs + RepLenCoder; +++ } +++ { +++ unsigned limit, offset; +++ CLzmaProb *probLen = prob + LenChoice; +++ IF_BIT_0(probLen) +++ { +++ UPDATE_0(probLen); +++ probLen = prob + LenLow + (posState << kLenNumLowBits); +++ offset = 0; +++ limit = (1 << kLenNumLowBits); +++ } +++ else +++ { +++ UPDATE_1(probLen); +++ probLen = prob + LenChoice2; +++ IF_BIT_0(probLen) +++ { +++ UPDATE_0(probLen); +++ probLen = prob + LenMid + (posState << kLenNumMidBits); +++ offset = kLenNumLowSymbols; +++ limit = (1 << kLenNumMidBits); +++ } +++ else +++ { +++ UPDATE_1(probLen); +++ probLen = prob + LenHigh; +++ offset = kLenNumLowSymbols + kLenNumMidSymbols; +++ limit = (1 << kLenNumHighBits); +++ } +++ } +++ TREE_DECODE(probLen, limit, len); +++ len += offset; +++ } +++ +++ if (state >= kNumStates) +++ { +++ UInt32 distance; +++ prob = probs + PosSlot + +++ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits); +++ TREE_6_DECODE(prob, distance); +++ if (distance >= kStartPosModelIndex) +++ { +++ unsigned posSlot = (unsigned)distance; +++ int numDirectBits = (int)(((distance >> 1) - 1)); +++ distance = (2 | (distance & 1)); +++ if (posSlot < kEndPosModelIndex) +++ { +++ distance <<= numDirectBits; +++ prob = probs + SpecPos + distance - posSlot - 1; +++ { +++ UInt32 mask = 1; +++ unsigned i = 1; +++ do +++ { +++ GET_BIT2(prob + i, i, ; , distance |= mask); +++ mask <<= 1; +++ } +++ while(--numDirectBits != 0); +++ } +++ } +++ else +++ { +++ numDirectBits -= kNumAlignBits; +++ do +++ { +++ NORMALIZE +++ range >>= 1; +++ +++ { +++ UInt32 t; +++ code -= range; +++ t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */ +++ distance = (distance << 1) + (t + 1); +++ code += range & t; +++ } +++ /* +++ distance <<= 1; +++ if (code >= range) +++ { +++ code -= range; +++ distance |= 1; +++ } +++ */ +++ } +++ while (--numDirectBits != 0); +++ prob = probs + Align; +++ distance <<= kNumAlignBits; +++ { +++ unsigned i = 1; +++ GET_BIT2(prob + i, i, ; , distance |= 1); +++ GET_BIT2(prob + i, i, ; , distance |= 2); +++ GET_BIT2(prob + i, i, ; , distance |= 4); +++ GET_BIT2(prob + i, i, ; , distance |= 8); +++ } +++ if (distance == (UInt32)0xFFFFFFFF) +++ { +++ len += kMatchSpecLenStart; +++ state -= kNumStates; +++ break; +++ } +++ } +++ } +++ rep3 = rep2; +++ rep2 = rep1; +++ rep1 = rep0; +++ rep0 = distance + 1; +++ if (checkDicSize == 0) +++ { +++ if (distance >= processedPos) +++ return SZ_ERROR_DATA; +++ } +++ else if (distance >= checkDicSize) +++ return SZ_ERROR_DATA; +++ state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3; +++ /* state = kLiteralNextStates[state]; */ +++ } +++ +++ len += kMatchMinLen; +++ +++ { +++ SizeT rem = limit - dicPos; +++ unsigned curLen = ((rem < len) ? (unsigned)rem : len); +++ SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0); +++ +++ processedPos += curLen; +++ +++ len -= curLen; +++ if (pos + curLen <= dicBufSize) +++ { +++ Byte *dest = dic + dicPos; +++ ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos; +++ const Byte *lim = dest + curLen; +++ dicPos += curLen; +++ do +++ *(dest) = (Byte)*(dest + src); +++ while (++dest != lim); +++ } +++ else +++ { +++ do +++ { +++ dic[dicPos++] = dic[pos]; +++ if (++pos == dicBufSize) +++ pos = 0; +++ } +++ while (--curLen != 0); +++ } +++ } +++ } +++ } +++ while (dicPos < limit && buf < bufLimit); +++ NORMALIZE; +++ p->buf = buf; +++ p->range = range; +++ p->code = code; +++ p->remainLen = len; +++ p->dicPos = dicPos; +++ p->processedPos = processedPos; +++ p->reps[0] = rep0; +++ p->reps[1] = rep1; +++ p->reps[2] = rep2; +++ p->reps[3] = rep3; +++ p->state = state; +++ +++ return SZ_OK; +++} +++ +++static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit) +++{ +++ if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart) +++ { +++ Byte *dic = p->dic; +++ SizeT dicPos = p->dicPos; +++ SizeT dicBufSize = p->dicBufSize; +++ unsigned len = p->remainLen; +++ UInt32 rep0 = p->reps[0]; +++ if (limit - dicPos < len) +++ len = (unsigned)(limit - dicPos); +++ +++ if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len) +++ p->checkDicSize = p->prop.dicSize; +++ +++ p->processedPos += len; +++ p->remainLen -= len; +++ while (len-- != 0) +++ { +++ dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)]; +++ dicPos++; +++ } +++ p->dicPos = dicPos; +++ } +++} +++ +++/* LzmaDec_DecodeReal2 decodes LZMA-symbols and sets p->needFlush and p->needInit, if required. */ +++ +++static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit) +++{ +++ do +++ { +++ SizeT limit2 = limit; +++ if (p->checkDicSize == 0) +++ { +++ UInt32 rem = p->prop.dicSize - p->processedPos; +++ if (limit - p->dicPos > rem) +++ limit2 = p->dicPos + rem; +++ } +++ RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit)); +++ if (p->processedPos >= p->prop.dicSize) +++ p->checkDicSize = p->prop.dicSize; +++ LzmaDec_WriteRem(p, limit); +++ } +++ while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart); +++ +++ if (p->remainLen > kMatchSpecLenStart) +++ { +++ p->remainLen = kMatchSpecLenStart; +++ } +++ return 0; +++} +++ +++typedef enum +++{ +++ DUMMY_ERROR, /* unexpected end of input stream */ +++ DUMMY_LIT, +++ DUMMY_MATCH, +++ DUMMY_REP +++} ELzmaDummy; +++ +++static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize) +++{ +++ UInt32 range = p->range; +++ UInt32 code = p->code; +++ const Byte *bufLimit = buf + inSize; +++ CLzmaProb *probs = p->probs; +++ unsigned state = p->state; +++ ELzmaDummy res; +++ +++ { +++ CLzmaProb *prob; +++ UInt32 bound; +++ unsigned ttt; +++ unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1); +++ +++ prob = probs + IsMatch + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK +++ +++ /* if (bufLimit - buf >= 7) return DUMMY_LIT; */ +++ +++ prob = probs + Literal; +++ if (p->checkDicSize != 0 || p->processedPos != 0) +++ prob += (LZMA_LIT_SIZE * +++ ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) + +++ (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc)))); +++ +++ if (state < kNumLitStates) +++ { +++ unsigned symbol = 1; +++ do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100); +++ } +++ else +++ { +++ unsigned matchByte = p->dic[p->dicPos - p->reps[0] + +++ ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)]; +++ unsigned offs = 0x100; +++ unsigned symbol = 1; +++ do +++ { +++ unsigned bit; +++ CLzmaProb *probLit; +++ matchByte <<= 1; +++ bit = (matchByte & offs); +++ probLit = prob + offs + bit + symbol; +++ GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit) +++ } +++ while (symbol < 0x100); +++ } +++ res = DUMMY_LIT; +++ } +++ else +++ { +++ unsigned len; +++ UPDATE_1_CHECK; +++ +++ prob = probs + IsRep + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ state = 0; +++ prob = probs + LenCoder; +++ res = DUMMY_MATCH; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ res = DUMMY_REP; +++ prob = probs + IsRepG0 + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ NORMALIZE_CHECK; +++ return DUMMY_REP; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ } +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ prob = probs + IsRepG1 + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ prob = probs + IsRepG2 + state; +++ IF_BIT_0_CHECK(prob) +++ { +++ UPDATE_0_CHECK; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ } +++ } +++ } +++ state = kNumStates; +++ prob = probs + RepLenCoder; +++ } +++ { +++ unsigned limit, offset; +++ CLzmaProb *probLen = prob + LenChoice; +++ IF_BIT_0_CHECK(probLen) +++ { +++ UPDATE_0_CHECK; +++ probLen = prob + LenLow + (posState << kLenNumLowBits); +++ offset = 0; +++ limit = 1 << kLenNumLowBits; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ probLen = prob + LenChoice2; +++ IF_BIT_0_CHECK(probLen) +++ { +++ UPDATE_0_CHECK; +++ probLen = prob + LenMid + (posState << kLenNumMidBits); +++ offset = kLenNumLowSymbols; +++ limit = 1 << kLenNumMidBits; +++ } +++ else +++ { +++ UPDATE_1_CHECK; +++ probLen = prob + LenHigh; +++ offset = kLenNumLowSymbols + kLenNumMidSymbols; +++ limit = 1 << kLenNumHighBits; +++ } +++ } +++ TREE_DECODE_CHECK(probLen, limit, len); +++ len += offset; +++ } +++ +++ if (state < 4) +++ { +++ unsigned posSlot; +++ prob = probs + PosSlot + +++ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << +++ kNumPosSlotBits); +++ TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot); +++ if (posSlot >= kStartPosModelIndex) +++ { +++ int numDirectBits = ((posSlot >> 1) - 1); +++ +++ /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */ +++ +++ if (posSlot < kEndPosModelIndex) +++ { +++ prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1; +++ } +++ else +++ { +++ numDirectBits -= kNumAlignBits; +++ do +++ { +++ NORMALIZE_CHECK +++ range >>= 1; +++ code -= range & (((code - range) >> 31) - 1); +++ /* if (code >= range) code -= range; */ +++ } +++ while (--numDirectBits != 0); +++ prob = probs + Align; +++ numDirectBits = kNumAlignBits; +++ } +++ { +++ unsigned i = 1; +++ do +++ { +++ GET_BIT_CHECK(prob + i, i); +++ } +++ while(--numDirectBits != 0); +++ } +++ } +++ } +++ } +++ } +++ NORMALIZE_CHECK; +++ return res; +++} +++ +++ +++static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data) +++{ +++ p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]); +++ p->range = 0xFFFFFFFF; +++ p->needFlush = 0; +++} +++ +++void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) +++{ +++ p->needFlush = 1; +++ p->remainLen = 0; +++ p->tempBufSize = 0; +++ +++ if (initDic) +++ { +++ p->processedPos = 0; +++ p->checkDicSize = 0; +++ p->needInitState = 1; +++ } +++ if (initState) +++ p->needInitState = 1; +++} +++ +++void LzmaDec_Init(CLzmaDec *p) +++{ +++ p->dicPos = 0; +++ LzmaDec_InitDicAndState(p, True, True); +++} +++ +++static void LzmaDec_InitStateReal(CLzmaDec *p) +++{ +++ UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp)); +++ UInt32 i; +++ CLzmaProb *probs = p->probs; +++ for (i = 0; i < numProbs; i++) +++ probs[i] = kBitModelTotal >> 1; +++ p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1; +++ p->state = 0; +++ p->needInitState = 0; +++} +++ +++SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen, +++ ELzmaFinishMode finishMode, ELzmaStatus *status) +++{ +++ SizeT inSize = *srcLen; +++ (*srcLen) = 0; +++ LzmaDec_WriteRem(p, dicLimit); +++ +++ *status = LZMA_STATUS_NOT_SPECIFIED; +++ +++ while (p->remainLen != kMatchSpecLenStart) +++ { +++ int checkEndMarkNow; +++ +++ if (p->needFlush != 0) +++ { +++ for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--) +++ p->tempBuf[p->tempBufSize++] = *src++; +++ if (p->tempBufSize < RC_INIT_SIZE) +++ { +++ *status = LZMA_STATUS_NEEDS_MORE_INPUT; +++ return SZ_OK; +++ } +++ if (p->tempBuf[0] != 0) +++ return SZ_ERROR_DATA; +++ +++ LzmaDec_InitRc(p, p->tempBuf); +++ p->tempBufSize = 0; +++ } +++ +++ checkEndMarkNow = 0; +++ if (p->dicPos >= dicLimit) +++ { +++ if (p->remainLen == 0 && p->code == 0) +++ { +++ *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK; +++ return SZ_OK; +++ } +++ if (finishMode == LZMA_FINISH_ANY) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_OK; +++ } +++ if (p->remainLen != 0) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_ERROR_DATA; +++ } +++ checkEndMarkNow = 1; +++ } +++ +++ if (p->needInitState) +++ LzmaDec_InitStateReal(p); +++ +++ if (p->tempBufSize == 0) +++ { +++ SizeT processed; +++ const Byte *bufLimit; +++ if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) +++ { +++ int dummyRes = LzmaDec_TryDummy(p, src, inSize); +++ if (dummyRes == DUMMY_ERROR) +++ { +++ memcpy(p->tempBuf, src, inSize); +++ p->tempBufSize = (unsigned)inSize; +++ (*srcLen) += inSize; +++ *status = LZMA_STATUS_NEEDS_MORE_INPUT; +++ return SZ_OK; +++ } +++ if (checkEndMarkNow && dummyRes != DUMMY_MATCH) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_ERROR_DATA; +++ } +++ bufLimit = src; +++ } +++ else +++ bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX; +++ p->buf = src; +++ if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0) +++ return SZ_ERROR_DATA; +++ processed = p->buf - src; +++ (*srcLen) += processed; +++ src += processed; +++ inSize -= processed; +++ } +++ else +++ { +++ unsigned rem = p->tempBufSize, lookAhead = 0; +++ while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize) +++ p->tempBuf[rem++] = src[lookAhead++]; +++ p->tempBufSize = rem; +++ if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) +++ { +++ int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem); +++ if (dummyRes == DUMMY_ERROR) +++ { +++ (*srcLen) += lookAhead; +++ *status = LZMA_STATUS_NEEDS_MORE_INPUT; +++ return SZ_OK; +++ } +++ if (checkEndMarkNow && dummyRes != DUMMY_MATCH) +++ { +++ *status = LZMA_STATUS_NOT_FINISHED; +++ return SZ_ERROR_DATA; +++ } +++ } +++ p->buf = p->tempBuf; +++ if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0) +++ return SZ_ERROR_DATA; +++ lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf)); +++ (*srcLen) += lookAhead; +++ src += lookAhead; +++ inSize -= lookAhead; +++ p->tempBufSize = 0; +++ } +++ } +++ if (p->code == 0) +++ *status = LZMA_STATUS_FINISHED_WITH_MARK; +++ return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA; +++} +++ +++SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status) +++{ +++ SizeT outSize = *destLen; +++ SizeT inSize = *srcLen; +++ *srcLen = *destLen = 0; +++ for (;;) +++ { +++ SizeT inSizeCur = inSize, outSizeCur, dicPos; +++ ELzmaFinishMode curFinishMode; +++ SRes res; +++ if (p->dicPos == p->dicBufSize) +++ p->dicPos = 0; +++ dicPos = p->dicPos; +++ if (outSize > p->dicBufSize - dicPos) +++ { +++ outSizeCur = p->dicBufSize; +++ curFinishMode = LZMA_FINISH_ANY; +++ } +++ else +++ { +++ outSizeCur = dicPos + outSize; +++ curFinishMode = finishMode; +++ } +++ +++ res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status); +++ src += inSizeCur; +++ inSize -= inSizeCur; +++ *srcLen += inSizeCur; +++ outSizeCur = p->dicPos - dicPos; +++ memcpy(dest, p->dic + dicPos, outSizeCur); +++ dest += outSizeCur; +++ outSize -= outSizeCur; +++ *destLen += outSizeCur; +++ if (res != 0) +++ return res; +++ if (outSizeCur == 0 || outSize == 0) +++ return SZ_OK; +++ } +++} +++ +++void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->probs); +++ p->probs = 0; +++} +++ +++static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->dic); +++ p->dic = 0; +++} +++ +++void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc) +++{ +++ LzmaDec_FreeProbs(p, alloc); +++ LzmaDec_FreeDict(p, alloc); +++} +++ +++SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size) +++{ +++ UInt32 dicSize; +++ Byte d; +++ +++ if (size < LZMA_PROPS_SIZE) +++ return SZ_ERROR_UNSUPPORTED; +++ else +++ dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24); +++ +++ if (dicSize < LZMA_DIC_MIN) +++ dicSize = LZMA_DIC_MIN; +++ p->dicSize = dicSize; +++ +++ d = data[0]; +++ if (d >= (9 * 5 * 5)) +++ return SZ_ERROR_UNSUPPORTED; +++ +++ p->lc = d % 9; +++ d /= 9; +++ p->pb = d / 5; +++ p->lp = d % 5; +++ +++ return SZ_OK; +++} +++ +++static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc) +++{ +++ UInt32 numProbs = LzmaProps_GetNumProbs(propNew); +++ if (p->probs == 0 || numProbs != p->numProbs) +++ { +++ LzmaDec_FreeProbs(p, alloc); +++ p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb)); +++ p->numProbs = numProbs; +++ if (p->probs == 0) +++ return SZ_ERROR_MEM; +++ } +++ return SZ_OK; +++} +++ +++SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +++{ +++ CLzmaProps propNew; +++ RINOK(LzmaProps_Decode(&propNew, props, propsSize)); +++ RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); +++ p->prop = propNew; +++ return SZ_OK; +++} +++ +++SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +++{ +++ CLzmaProps propNew; +++ SizeT dicBufSize; +++ RINOK(LzmaProps_Decode(&propNew, props, propsSize)); +++ RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); +++ dicBufSize = propNew.dicSize; +++ if (p->dic == 0 || dicBufSize != p->dicBufSize) +++ { +++ LzmaDec_FreeDict(p, alloc); +++ p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize); +++ if (p->dic == 0) +++ { +++ LzmaDec_FreeProbs(p, alloc); +++ return SZ_ERROR_MEM; +++ } +++ } +++ p->dicBufSize = dicBufSize; +++ p->prop = propNew; +++ return SZ_OK; +++} +++ +++SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, +++ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, +++ ELzmaStatus *status, ISzAlloc *alloc) +++{ +++ CLzmaDec p; +++ SRes res; +++ SizeT inSize = *srcLen; +++ SizeT outSize = *destLen; +++ *srcLen = *destLen = 0; +++ if (inSize < RC_INIT_SIZE) +++ return SZ_ERROR_INPUT_EOF; +++ +++ LzmaDec_Construct(&p); +++ res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc); +++ if (res != 0) +++ return res; +++ p.dic = dest; +++ p.dicBufSize = outSize; +++ +++ LzmaDec_Init(&p); +++ +++ *srcLen = inSize; +++ res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status); +++ +++ if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT) +++ res = SZ_ERROR_INPUT_EOF; +++ +++ (*destLen) = p.dicPos; +++ LzmaDec_FreeProbs(&p, alloc); +++ return res; +++} ++--- /dev/null +++++ b/lzma/LzmaEnc.c ++@@ -0,0 +1,2335 @@ +++/* LzmaEnc.c -- LZMA Encoder +++2008-04-28 +++Copyright (c) 1999-2008 Igor Pavlov +++Read LzmaEnc.h for license options */ +++ +++#if defined(SHOW_STAT) || defined(SHOW_STAT2) +++#include +++#endif +++ +++#include +++ +++#include "LzmaEnc.h" +++ +++#include "LzFind.h" +++#ifdef COMPRESS_MF_MT +++#include "LzFindMt.h" +++#endif +++ +++/* #define SHOW_STAT */ +++/* #define SHOW_STAT2 */ +++ +++#ifdef SHOW_STAT +++static int ttt = 0; +++#endif +++ +++#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1) +++ +++#define kBlockSize (9 << 10) +++#define kUnpackBlockSize (1 << 18) +++#define kMatchArraySize (1 << 21) +++#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX) +++ +++#define kNumMaxDirectBits (31) +++ +++#define kNumTopBits 24 +++#define kTopValue ((UInt32)1 << kNumTopBits) +++ +++#define kNumBitModelTotalBits 11 +++#define kBitModelTotal (1 << kNumBitModelTotalBits) +++#define kNumMoveBits 5 +++#define kProbInitValue (kBitModelTotal >> 1) +++ +++#define kNumMoveReducingBits 4 +++#define kNumBitPriceShiftBits 4 +++#define kBitPrice (1 << kNumBitPriceShiftBits) +++ +++void LzmaEncProps_Init(CLzmaEncProps *p) +++{ +++ p->level = 5; +++ p->dictSize = p->mc = 0; +++ p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1; +++ p->writeEndMark = 0; +++} +++ +++void LzmaEncProps_Normalize(CLzmaEncProps *p) +++{ +++ int level = p->level; +++ if (level < 0) level = 5; +++ p->level = level; +++ if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26))); +++ if (p->lc < 0) p->lc = 3; +++ if (p->lp < 0) p->lp = 0; +++ if (p->pb < 0) p->pb = 2; +++ if (p->algo < 0) p->algo = (level < 5 ? 0 : 1); +++ if (p->fb < 0) p->fb = (level < 7 ? 32 : 64); +++ if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1); +++ if (p->numHashBytes < 0) p->numHashBytes = 4; +++ if (p->mc == 0) p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1); +++ if (p->numThreads < 0) p->numThreads = ((p->btMode && p->algo) ? 2 : 1); +++} +++ +++UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2) +++{ +++ CLzmaEncProps props = *props2; +++ LzmaEncProps_Normalize(&props); +++ return props.dictSize; +++} +++ +++/* #define LZMA_LOG_BSR */ +++/* Define it for Intel's CPU */ +++ +++ +++#ifdef LZMA_LOG_BSR +++ +++#define kDicLogSizeMaxCompress 30 +++ +++#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); } +++ +++UInt32 GetPosSlot1(UInt32 pos) +++{ +++ UInt32 res; +++ BSR2_RET(pos, res); +++ return res; +++} +++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); } +++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); } +++ +++#else +++ +++#define kNumLogBits (9 + (int)sizeof(size_t) / 2) +++#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7) +++ +++void LzmaEnc_FastPosInit(Byte *g_FastPos) +++{ +++ int c = 2, slotFast; +++ g_FastPos[0] = 0; +++ g_FastPos[1] = 1; +++ +++ for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++) +++ { +++ UInt32 k = (1 << ((slotFast >> 1) - 1)); +++ UInt32 j; +++ for (j = 0; j < k; j++, c++) +++ g_FastPos[c] = (Byte)slotFast; +++ } +++} +++ +++#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \ +++ (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \ +++ res = p->g_FastPos[pos >> i] + (i * 2); } +++/* +++#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \ +++ p->g_FastPos[pos >> 6] + 12 : \ +++ p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; } +++*/ +++ +++#define GetPosSlot1(pos) p->g_FastPos[pos] +++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); } +++#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); } +++ +++#endif +++ +++ +++#define LZMA_NUM_REPS 4 +++ +++typedef unsigned CState; +++ +++typedef struct _COptimal +++{ +++ UInt32 price; +++ +++ CState state; +++ int prev1IsChar; +++ int prev2; +++ +++ UInt32 posPrev2; +++ UInt32 backPrev2; +++ +++ UInt32 posPrev; +++ UInt32 backPrev; +++ UInt32 backs[LZMA_NUM_REPS]; +++} COptimal; +++ +++#define kNumOpts (1 << 12) +++ +++#define kNumLenToPosStates 4 +++#define kNumPosSlotBits 6 +++#define kDicLogSizeMin 0 +++#define kDicLogSizeMax 32 +++#define kDistTableSizeMax (kDicLogSizeMax * 2) +++ +++ +++#define kNumAlignBits 4 +++#define kAlignTableSize (1 << kNumAlignBits) +++#define kAlignMask (kAlignTableSize - 1) +++ +++#define kStartPosModelIndex 4 +++#define kEndPosModelIndex 14 +++#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex) +++ +++#define kNumFullDistances (1 << (kEndPosModelIndex / 2)) +++ +++#ifdef _LZMA_PROB32 +++#define CLzmaProb UInt32 +++#else +++#define CLzmaProb UInt16 +++#endif +++ +++#define LZMA_PB_MAX 4 +++#define LZMA_LC_MAX 8 +++#define LZMA_LP_MAX 4 +++ +++#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX) +++ +++ +++#define kLenNumLowBits 3 +++#define kLenNumLowSymbols (1 << kLenNumLowBits) +++#define kLenNumMidBits 3 +++#define kLenNumMidSymbols (1 << kLenNumMidBits) +++#define kLenNumHighBits 8 +++#define kLenNumHighSymbols (1 << kLenNumHighBits) +++ +++#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols) +++ +++#define LZMA_MATCH_LEN_MIN 2 +++#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1) +++ +++#define kNumStates 12 +++ +++typedef struct +++{ +++ CLzmaProb choice; +++ CLzmaProb choice2; +++ CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits]; +++ CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits]; +++ CLzmaProb high[kLenNumHighSymbols]; +++} CLenEnc; +++ +++typedef struct +++{ +++ CLenEnc p; +++ UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal]; +++ UInt32 tableSize; +++ UInt32 counters[LZMA_NUM_PB_STATES_MAX]; +++} CLenPriceEnc; +++ +++typedef struct _CRangeEnc +++{ +++ UInt32 range; +++ Byte cache; +++ UInt64 low; +++ UInt64 cacheSize; +++ Byte *buf; +++ Byte *bufLim; +++ Byte *bufBase; +++ ISeqOutStream *outStream; +++ UInt64 processed; +++ SRes res; +++} CRangeEnc; +++ +++typedef struct _CSeqInStreamBuf +++{ +++ ISeqInStream funcTable; +++ const Byte *data; +++ SizeT rem; +++} CSeqInStreamBuf; +++ +++static SRes MyRead(void *pp, void *data, size_t *size) +++{ +++ size_t curSize = *size; +++ CSeqInStreamBuf *p = (CSeqInStreamBuf *)pp; +++ if (p->rem < curSize) +++ curSize = p->rem; +++ memcpy(data, p->data, curSize); +++ p->rem -= curSize; +++ p->data += curSize; +++ *size = curSize; +++ return SZ_OK; +++} +++ +++typedef struct +++{ +++ CLzmaProb *litProbs; +++ +++ CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ CLzmaProb isRep[kNumStates]; +++ CLzmaProb isRepG0[kNumStates]; +++ CLzmaProb isRepG1[kNumStates]; +++ CLzmaProb isRepG2[kNumStates]; +++ CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ +++ CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; +++ CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; +++ CLzmaProb posAlignEncoder[1 << kNumAlignBits]; +++ +++ CLenPriceEnc lenEnc; +++ CLenPriceEnc repLenEnc; +++ +++ UInt32 reps[LZMA_NUM_REPS]; +++ UInt32 state; +++} CSaveState; +++ +++typedef struct _CLzmaEnc +++{ +++ IMatchFinder matchFinder; +++ void *matchFinderObj; +++ +++ #ifdef COMPRESS_MF_MT +++ Bool mtMode; +++ CMatchFinderMt matchFinderMt; +++ #endif +++ +++ CMatchFinder matchFinderBase; +++ +++ #ifdef COMPRESS_MF_MT +++ Byte pad[128]; +++ #endif +++ +++ UInt32 optimumEndIndex; +++ UInt32 optimumCurrentIndex; +++ +++ Bool longestMatchWasFound; +++ UInt32 longestMatchLength; +++ UInt32 numDistancePairs; +++ +++ COptimal opt[kNumOpts]; +++ +++ #ifndef LZMA_LOG_BSR +++ Byte g_FastPos[1 << kNumLogBits]; +++ #endif +++ +++ UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits]; +++ UInt32 matchDistances[LZMA_MATCH_LEN_MAX * 2 + 2 + 1]; +++ UInt32 numFastBytes; +++ UInt32 additionalOffset; +++ UInt32 reps[LZMA_NUM_REPS]; +++ UInt32 state; +++ +++ UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax]; +++ UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances]; +++ UInt32 alignPrices[kAlignTableSize]; +++ UInt32 alignPriceCount; +++ +++ UInt32 distTableSize; +++ +++ unsigned lc, lp, pb; +++ unsigned lpMask, pbMask; +++ +++ CLzmaProb *litProbs; +++ +++ CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ CLzmaProb isRep[kNumStates]; +++ CLzmaProb isRepG0[kNumStates]; +++ CLzmaProb isRepG1[kNumStates]; +++ CLzmaProb isRepG2[kNumStates]; +++ CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX]; +++ +++ CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; +++ CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; +++ CLzmaProb posAlignEncoder[1 << kNumAlignBits]; +++ +++ CLenPriceEnc lenEnc; +++ CLenPriceEnc repLenEnc; +++ +++ unsigned lclp; +++ +++ Bool fastMode; +++ +++ CRangeEnc rc; +++ +++ Bool writeEndMark; +++ UInt64 nowPos64; +++ UInt32 matchPriceCount; +++ Bool finished; +++ Bool multiThread; +++ +++ SRes result; +++ UInt32 dictSize; +++ UInt32 matchFinderCycles; +++ +++ ISeqInStream *inStream; +++ CSeqInStreamBuf seqBufInStream; +++ +++ CSaveState saveState; +++} CLzmaEnc; +++ +++void LzmaEnc_SaveState(CLzmaEncHandle pp) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ CSaveState *dest = &p->saveState; +++ int i; +++ dest->lenEnc = p->lenEnc; +++ dest->repLenEnc = p->repLenEnc; +++ dest->state = p->state; +++ +++ for (i = 0; i < kNumStates; i++) +++ { +++ memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); +++ memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); +++ } +++ for (i = 0; i < kNumLenToPosStates; i++) +++ memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); +++ memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); +++ memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); +++ memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); +++ memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); +++ memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); +++ memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); +++ memcpy(dest->reps, p->reps, sizeof(p->reps)); +++ memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb)); +++} +++ +++void LzmaEnc_RestoreState(CLzmaEncHandle pp) +++{ +++ CLzmaEnc *dest = (CLzmaEnc *)pp; +++ const CSaveState *p = &dest->saveState; +++ int i; +++ dest->lenEnc = p->lenEnc; +++ dest->repLenEnc = p->repLenEnc; +++ dest->state = p->state; +++ +++ for (i = 0; i < kNumStates; i++) +++ { +++ memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i])); +++ memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i])); +++ } +++ for (i = 0; i < kNumLenToPosStates; i++) +++ memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i])); +++ memcpy(dest->isRep, p->isRep, sizeof(p->isRep)); +++ memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0)); +++ memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1)); +++ memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2)); +++ memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders)); +++ memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder)); +++ memcpy(dest->reps, p->reps, sizeof(p->reps)); +++ memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb)); +++} +++ +++SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ CLzmaEncProps props = *props2; +++ LzmaEncProps_Normalize(&props); +++ +++ if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX || +++ props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30)) +++ return SZ_ERROR_PARAM; +++ p->dictSize = props.dictSize; +++ p->matchFinderCycles = props.mc; +++ { +++ unsigned fb = props.fb; +++ if (fb < 5) +++ fb = 5; +++ if (fb > LZMA_MATCH_LEN_MAX) +++ fb = LZMA_MATCH_LEN_MAX; +++ p->numFastBytes = fb; +++ } +++ p->lc = props.lc; +++ p->lp = props.lp; +++ p->pb = props.pb; +++ p->fastMode = (props.algo == 0); +++ p->matchFinderBase.btMode = props.btMode; +++ { +++ UInt32 numHashBytes = 4; +++ if (props.btMode) +++ { +++ if (props.numHashBytes < 2) +++ numHashBytes = 2; +++ else if (props.numHashBytes < 4) +++ numHashBytes = props.numHashBytes; +++ } +++ p->matchFinderBase.numHashBytes = numHashBytes; +++ } +++ +++ p->matchFinderBase.cutValue = props.mc; +++ +++ p->writeEndMark = props.writeEndMark; +++ +++ #ifdef COMPRESS_MF_MT +++ /* +++ if (newMultiThread != _multiThread) +++ { +++ ReleaseMatchFinder(); +++ _multiThread = newMultiThread; +++ } +++ */ +++ p->multiThread = (props.numThreads > 1); +++ #endif +++ +++ return SZ_OK; +++} +++ +++static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5}; +++static const int kMatchNextStates[kNumStates] = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10}; +++static const int kRepNextStates[kNumStates] = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11}; +++static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11}; +++ +++/* +++ void UpdateChar() { Index = kLiteralNextStates[Index]; } +++ void UpdateMatch() { Index = kMatchNextStates[Index]; } +++ void UpdateRep() { Index = kRepNextStates[Index]; } +++ void UpdateShortRep() { Index = kShortRepNextStates[Index]; } +++*/ +++ +++#define IsCharState(s) ((s) < 7) +++ +++ +++#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1) +++ +++#define kInfinityPrice (1 << 30) +++ +++static void RangeEnc_Construct(CRangeEnc *p) +++{ +++ p->outStream = 0; +++ p->bufBase = 0; +++} +++ +++#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize) +++ +++#define RC_BUF_SIZE (1 << 16) +++static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc) +++{ +++ if (p->bufBase == 0) +++ { +++ p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE); +++ if (p->bufBase == 0) +++ return 0; +++ p->bufLim = p->bufBase + RC_BUF_SIZE; +++ } +++ return 1; +++} +++ +++static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->bufBase); +++ p->bufBase = 0; +++} +++ +++static void RangeEnc_Init(CRangeEnc *p) +++{ +++ /* Stream.Init(); */ +++ p->low = 0; +++ p->range = 0xFFFFFFFF; +++ p->cacheSize = 1; +++ p->cache = 0; +++ +++ p->buf = p->bufBase; +++ +++ p->processed = 0; +++ p->res = SZ_OK; +++} +++ +++static void RangeEnc_FlushStream(CRangeEnc *p) +++{ +++ size_t num; +++ if (p->res != SZ_OK) +++ return; +++ num = p->buf - p->bufBase; +++ if (num != p->outStream->Write(p->outStream, p->bufBase, num)) +++ p->res = SZ_ERROR_WRITE; +++ p->processed += num; +++ p->buf = p->bufBase; +++} +++ +++static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p) +++{ +++ if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0) +++ { +++ Byte temp = p->cache; +++ do +++ { +++ Byte *buf = p->buf; +++ *buf++ = (Byte)(temp + (Byte)(p->low >> 32)); +++ p->buf = buf; +++ if (buf == p->bufLim) +++ RangeEnc_FlushStream(p); +++ temp = 0xFF; +++ } +++ while (--p->cacheSize != 0); +++ p->cache = (Byte)((UInt32)p->low >> 24); +++ } +++ p->cacheSize++; +++ p->low = (UInt32)p->low << 8; +++} +++ +++static void RangeEnc_FlushData(CRangeEnc *p) +++{ +++ int i; +++ for (i = 0; i < 5; i++) +++ RangeEnc_ShiftLow(p); +++} +++ +++static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits) +++{ +++ do +++ { +++ p->range >>= 1; +++ p->low += p->range & (0 - ((value >> --numBits) & 1)); +++ if (p->range < kTopValue) +++ { +++ p->range <<= 8; +++ RangeEnc_ShiftLow(p); +++ } +++ } +++ while (numBits != 0); +++} +++ +++static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol) +++{ +++ UInt32 ttt = *prob; +++ UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt; +++ if (symbol == 0) +++ { +++ p->range = newBound; +++ ttt += (kBitModelTotal - ttt) >> kNumMoveBits; +++ } +++ else +++ { +++ p->low += newBound; +++ p->range -= newBound; +++ ttt -= ttt >> kNumMoveBits; +++ } +++ *prob = (CLzmaProb)ttt; +++ if (p->range < kTopValue) +++ { +++ p->range <<= 8; +++ RangeEnc_ShiftLow(p); +++ } +++} +++ +++static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol) +++{ +++ symbol |= 0x100; +++ do +++ { +++ RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1); +++ symbol <<= 1; +++ } +++ while (symbol < 0x10000); +++} +++ +++static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte) +++{ +++ UInt32 offs = 0x100; +++ symbol |= 0x100; +++ do +++ { +++ matchByte <<= 1; +++ RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1); +++ symbol <<= 1; +++ offs &= ~(matchByte ^ symbol); +++ } +++ while (symbol < 0x10000); +++} +++ +++void LzmaEnc_InitPriceTables(UInt32 *ProbPrices) +++{ +++ UInt32 i; +++ for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits)) +++ { +++ const int kCyclesBits = kNumBitPriceShiftBits; +++ UInt32 w = i; +++ UInt32 bitCount = 0; +++ int j; +++ for (j = 0; j < kCyclesBits; j++) +++ { +++ w = w * w; +++ bitCount <<= 1; +++ while (w >= ((UInt32)1 << 16)) +++ { +++ w >>= 1; +++ bitCount++; +++ } +++ } +++ ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount); +++ } +++} +++ +++ +++#define GET_PRICE(prob, symbol) \ +++ p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits]; +++ +++#define GET_PRICEa(prob, symbol) \ +++ ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits]; +++ +++#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits] +++#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits] +++ +++#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits] +++#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits] +++ +++static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ symbol |= 0x100; +++ do +++ { +++ price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1); +++ symbol <<= 1; +++ } +++ while (symbol < 0x10000); +++ return price; +++}; +++ +++static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ UInt32 offs = 0x100; +++ symbol |= 0x100; +++ do +++ { +++ matchByte <<= 1; +++ price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1); +++ symbol <<= 1; +++ offs &= ~(matchByte ^ symbol); +++ } +++ while (symbol < 0x10000); +++ return price; +++}; +++ +++ +++static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol) +++{ +++ UInt32 m = 1; +++ int i; +++ for (i = numBitLevels; i != 0 ;) +++ { +++ UInt32 bit; +++ i--; +++ bit = (symbol >> i) & 1; +++ RangeEnc_EncodeBit(rc, probs + m, bit); +++ m = (m << 1) | bit; +++ } +++}; +++ +++static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol) +++{ +++ UInt32 m = 1; +++ int i; +++ for (i = 0; i < numBitLevels; i++) +++ { +++ UInt32 bit = symbol & 1; +++ RangeEnc_EncodeBit(rc, probs + m, bit); +++ m = (m << 1) | bit; +++ symbol >>= 1; +++ } +++} +++ +++static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ symbol |= (1 << numBitLevels); +++ while (symbol != 1) +++ { +++ price += GET_PRICEa(probs[symbol >> 1], symbol & 1); +++ symbol >>= 1; +++ } +++ return price; +++} +++ +++static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices) +++{ +++ UInt32 price = 0; +++ UInt32 m = 1; +++ int i; +++ for (i = numBitLevels; i != 0; i--) +++ { +++ UInt32 bit = symbol & 1; +++ symbol >>= 1; +++ price += GET_PRICEa(probs[m], bit); +++ m = (m << 1) | bit; +++ } +++ return price; +++} +++ +++ +++static void LenEnc_Init(CLenEnc *p) +++{ +++ unsigned i; +++ p->choice = p->choice2 = kProbInitValue; +++ for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++) +++ p->low[i] = kProbInitValue; +++ for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++) +++ p->mid[i] = kProbInitValue; +++ for (i = 0; i < kLenNumHighSymbols; i++) +++ p->high[i] = kProbInitValue; +++} +++ +++static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState) +++{ +++ if (symbol < kLenNumLowSymbols) +++ { +++ RangeEnc_EncodeBit(rc, &p->choice, 0); +++ RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol); +++ } +++ else +++ { +++ RangeEnc_EncodeBit(rc, &p->choice, 1); +++ if (symbol < kLenNumLowSymbols + kLenNumMidSymbols) +++ { +++ RangeEnc_EncodeBit(rc, &p->choice2, 0); +++ RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols); +++ } +++ else +++ { +++ RangeEnc_EncodeBit(rc, &p->choice2, 1); +++ RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols); +++ } +++ } +++} +++ +++static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices) +++{ +++ UInt32 a0 = GET_PRICE_0a(p->choice); +++ UInt32 a1 = GET_PRICE_1a(p->choice); +++ UInt32 b0 = a1 + GET_PRICE_0a(p->choice2); +++ UInt32 b1 = a1 + GET_PRICE_1a(p->choice2); +++ UInt32 i = 0; +++ for (i = 0; i < kLenNumLowSymbols; i++) +++ { +++ if (i >= numSymbols) +++ return; +++ prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices); +++ } +++ for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++) +++ { +++ if (i >= numSymbols) +++ return; +++ prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices); +++ } +++ for (; i < numSymbols; i++) +++ prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices); +++} +++ +++static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices) +++{ +++ LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices); +++ p->counters[posState] = p->tableSize; +++} +++ +++static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices) +++{ +++ UInt32 posState; +++ for (posState = 0; posState < numPosStates; posState++) +++ LenPriceEnc_UpdateTable(p, posState, ProbPrices); +++} +++ +++static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices) +++{ +++ LenEnc_Encode(&p->p, rc, symbol, posState); +++ if (updatePrice) +++ if (--p->counters[posState] == 0) +++ LenPriceEnc_UpdateTable(p, posState, ProbPrices); +++} +++ +++ +++ +++ +++static void MovePos(CLzmaEnc *p, UInt32 num) +++{ +++ #ifdef SHOW_STAT +++ ttt += num; +++ printf("\n MovePos %d", num); +++ #endif +++ if (num != 0) +++ { +++ p->additionalOffset += num; +++ p->matchFinder.Skip(p->matchFinderObj, num); +++ } +++} +++ +++static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes) +++{ +++ UInt32 lenRes = 0, numDistancePairs; +++ numDistancePairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matchDistances); +++ #ifdef SHOW_STAT +++ printf("\n i = %d numPairs = %d ", ttt, numDistancePairs / 2); +++ if (ttt >= 61994) +++ ttt = ttt; +++ +++ ttt++; +++ { +++ UInt32 i; +++ for (i = 0; i < numDistancePairs; i += 2) +++ printf("%2d %6d | ", p->matchDistances[i], p->matchDistances[i + 1]); +++ } +++ #endif +++ if (numDistancePairs > 0) +++ { +++ lenRes = p->matchDistances[numDistancePairs - 2]; +++ if (lenRes == p->numFastBytes) +++ { +++ UInt32 numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) + 1; +++ const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ UInt32 distance = p->matchDistances[numDistancePairs - 1] + 1; +++ if (numAvail > LZMA_MATCH_LEN_MAX) +++ numAvail = LZMA_MATCH_LEN_MAX; +++ +++ { +++ const Byte *pby2 = pby - distance; +++ for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++); +++ } +++ } +++ } +++ p->additionalOffset++; +++ *numDistancePairsRes = numDistancePairs; +++ return lenRes; +++} +++ +++ +++#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False; +++#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False; +++#define IsShortRep(p) ((p)->backPrev == 0) +++ +++static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState) +++{ +++ return +++ GET_PRICE_0(p->isRepG0[state]) + +++ GET_PRICE_0(p->isRep0Long[state][posState]); +++} +++ +++static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState) +++{ +++ UInt32 price; +++ if (repIndex == 0) +++ { +++ price = GET_PRICE_0(p->isRepG0[state]); +++ price += GET_PRICE_1(p->isRep0Long[state][posState]); +++ } +++ else +++ { +++ price = GET_PRICE_1(p->isRepG0[state]); +++ if (repIndex == 1) +++ price += GET_PRICE_0(p->isRepG1[state]); +++ else +++ { +++ price += GET_PRICE_1(p->isRepG1[state]); +++ price += GET_PRICE(p->isRepG2[state], repIndex - 2); +++ } +++ } +++ return price; +++} +++ +++static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState) +++{ +++ return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] + +++ GetPureRepPrice(p, repIndex, state, posState); +++} +++ +++static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur) +++{ +++ UInt32 posMem = p->opt[cur].posPrev; +++ UInt32 backMem = p->opt[cur].backPrev; +++ p->optimumEndIndex = cur; +++ do +++ { +++ if (p->opt[cur].prev1IsChar) +++ { +++ MakeAsChar(&p->opt[posMem]) +++ p->opt[posMem].posPrev = posMem - 1; +++ if (p->opt[cur].prev2) +++ { +++ p->opt[posMem - 1].prev1IsChar = False; +++ p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2; +++ p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2; +++ } +++ } +++ { +++ UInt32 posPrev = posMem; +++ UInt32 backCur = backMem; +++ +++ backMem = p->opt[posPrev].backPrev; +++ posMem = p->opt[posPrev].posPrev; +++ +++ p->opt[posPrev].backPrev = backCur; +++ p->opt[posPrev].posPrev = cur; +++ cur = posPrev; +++ } +++ } +++ while (cur != 0); +++ *backRes = p->opt[0].backPrev; +++ p->optimumCurrentIndex = p->opt[0].posPrev; +++ return p->optimumCurrentIndex; +++} +++ +++#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300) +++ +++static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes) +++{ +++ UInt32 numAvailableBytes, lenMain, numDistancePairs; +++ const Byte *data; +++ UInt32 reps[LZMA_NUM_REPS]; +++ UInt32 repLens[LZMA_NUM_REPS]; +++ UInt32 repMaxIndex, i; +++ UInt32 *matchDistances; +++ Byte currentByte, matchByte; +++ UInt32 posState; +++ UInt32 matchPrice, repMatchPrice; +++ UInt32 lenEnd; +++ UInt32 len; +++ UInt32 normalMatchPrice; +++ UInt32 cur; +++ if (p->optimumEndIndex != p->optimumCurrentIndex) +++ { +++ const COptimal *opt = &p->opt[p->optimumCurrentIndex]; +++ UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex; +++ *backRes = opt->backPrev; +++ p->optimumCurrentIndex = opt->posPrev; +++ return lenRes; +++ } +++ p->optimumCurrentIndex = p->optimumEndIndex = 0; +++ +++ numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ +++ if (!p->longestMatchWasFound) +++ { +++ lenMain = ReadMatchDistances(p, &numDistancePairs); +++ } +++ else +++ { +++ lenMain = p->longestMatchLength; +++ numDistancePairs = p->numDistancePairs; +++ p->longestMatchWasFound = False; +++ } +++ +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ if (numAvailableBytes < 2) +++ { +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ if (numAvailableBytes > LZMA_MATCH_LEN_MAX) +++ numAvailableBytes = LZMA_MATCH_LEN_MAX; +++ +++ repMaxIndex = 0; +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ UInt32 lenTest; +++ const Byte *data2; +++ reps[i] = p->reps[i]; +++ data2 = data - (reps[i] + 1); +++ if (data[0] != data2[0] || data[1] != data2[1]) +++ { +++ repLens[i] = 0; +++ continue; +++ } +++ for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++); +++ repLens[i] = lenTest; +++ if (lenTest > repLens[repMaxIndex]) +++ repMaxIndex = i; +++ } +++ if (repLens[repMaxIndex] >= p->numFastBytes) +++ { +++ UInt32 lenRes; +++ *backRes = repMaxIndex; +++ lenRes = repLens[repMaxIndex]; +++ MovePos(p, lenRes - 1); +++ return lenRes; +++ } +++ +++ matchDistances = p->matchDistances; +++ if (lenMain >= p->numFastBytes) +++ { +++ *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; +++ MovePos(p, lenMain - 1); +++ return lenMain; +++ } +++ currentByte = *data; +++ matchByte = *(data - (reps[0] + 1)); +++ +++ if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2) +++ { +++ *backRes = (UInt32)-1; +++ return 1; +++ } +++ +++ p->opt[0].state = (CState)p->state; +++ +++ posState = (position & p->pbMask); +++ +++ { +++ const CLzmaProb *probs = LIT_PROBS(position, *(data - 1)); +++ p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) + +++ (!IsCharState(p->state) ? +++ LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) : +++ LitEnc_GetPrice(probs, currentByte, p->ProbPrices)); +++ } +++ +++ MakeAsChar(&p->opt[1]); +++ +++ matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]); +++ repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]); +++ +++ if (matchByte == currentByte) +++ { +++ UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState); +++ if (shortRepPrice < p->opt[1].price) +++ { +++ p->opt[1].price = shortRepPrice; +++ MakeAsShortRep(&p->opt[1]); +++ } +++ } +++ lenEnd = ((lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex]); +++ +++ if (lenEnd < 2) +++ { +++ *backRes = p->opt[1].backPrev; +++ return 1; +++ } +++ +++ p->opt[1].posPrev = 0; +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ p->opt[0].backs[i] = reps[i]; +++ +++ len = lenEnd; +++ do +++ p->opt[len--].price = kInfinityPrice; +++ while (len >= 2); +++ +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ UInt32 repLen = repLens[i]; +++ UInt32 price; +++ if (repLen < 2) +++ continue; +++ price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState); +++ do +++ { +++ UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2]; +++ COptimal *opt = &p->opt[repLen]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = 0; +++ opt->backPrev = i; +++ opt->prev1IsChar = False; +++ } +++ } +++ while (--repLen >= 2); +++ } +++ +++ normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]); +++ +++ len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2); +++ if (len <= lenMain) +++ { +++ UInt32 offs = 0; +++ while (len > matchDistances[offs]) +++ offs += 2; +++ for (; ; len++) +++ { +++ COptimal *opt; +++ UInt32 distance = matchDistances[offs + 1]; +++ +++ UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN]; +++ UInt32 lenToPosState = GetLenToPosState(len); +++ if (distance < kNumFullDistances) +++ curAndLenPrice += p->distancesPrices[lenToPosState][distance]; +++ else +++ { +++ UInt32 slot; +++ GetPosSlot2(distance, slot); +++ curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot]; +++ } +++ opt = &p->opt[len]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = 0; +++ opt->backPrev = distance + LZMA_NUM_REPS; +++ opt->prev1IsChar = False; +++ } +++ if (len == matchDistances[offs]) +++ { +++ offs += 2; +++ if (offs == numDistancePairs) +++ break; +++ } +++ } +++ } +++ +++ cur = 0; +++ +++ #ifdef SHOW_STAT2 +++ if (position >= 0) +++ { +++ unsigned i; +++ printf("\n pos = %4X", position); +++ for (i = cur; i <= lenEnd; i++) +++ printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price); +++ } +++ #endif +++ +++ for (;;) +++ { +++ UInt32 numAvailableBytesFull, newLen, numDistancePairs; +++ COptimal *curOpt; +++ UInt32 posPrev; +++ UInt32 state; +++ UInt32 curPrice; +++ Bool nextIsChar; +++ const Byte *data; +++ Byte currentByte, matchByte; +++ UInt32 posState; +++ UInt32 curAnd1Price; +++ COptimal *nextOpt; +++ UInt32 matchPrice, repMatchPrice; +++ UInt32 numAvailableBytes; +++ UInt32 startLen; +++ +++ cur++; +++ if (cur == lenEnd) +++ return Backward(p, backRes, cur); +++ +++ numAvailableBytesFull = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ newLen = ReadMatchDistances(p, &numDistancePairs); +++ if (newLen >= p->numFastBytes) +++ { +++ p->numDistancePairs = numDistancePairs; +++ p->longestMatchLength = newLen; +++ p->longestMatchWasFound = True; +++ return Backward(p, backRes, cur); +++ } +++ position++; +++ curOpt = &p->opt[cur]; +++ posPrev = curOpt->posPrev; +++ if (curOpt->prev1IsChar) +++ { +++ posPrev--; +++ if (curOpt->prev2) +++ { +++ state = p->opt[curOpt->posPrev2].state; +++ if (curOpt->backPrev2 < LZMA_NUM_REPS) +++ state = kRepNextStates[state]; +++ else +++ state = kMatchNextStates[state]; +++ } +++ else +++ state = p->opt[posPrev].state; +++ state = kLiteralNextStates[state]; +++ } +++ else +++ state = p->opt[posPrev].state; +++ if (posPrev == cur - 1) +++ { +++ if (IsShortRep(curOpt)) +++ state = kShortRepNextStates[state]; +++ else +++ state = kLiteralNextStates[state]; +++ } +++ else +++ { +++ UInt32 pos; +++ const COptimal *prevOpt; +++ if (curOpt->prev1IsChar && curOpt->prev2) +++ { +++ posPrev = curOpt->posPrev2; +++ pos = curOpt->backPrev2; +++ state = kRepNextStates[state]; +++ } +++ else +++ { +++ pos = curOpt->backPrev; +++ if (pos < LZMA_NUM_REPS) +++ state = kRepNextStates[state]; +++ else +++ state = kMatchNextStates[state]; +++ } +++ prevOpt = &p->opt[posPrev]; +++ if (pos < LZMA_NUM_REPS) +++ { +++ UInt32 i; +++ reps[0] = prevOpt->backs[pos]; +++ for (i = 1; i <= pos; i++) +++ reps[i] = prevOpt->backs[i - 1]; +++ for (; i < LZMA_NUM_REPS; i++) +++ reps[i] = prevOpt->backs[i]; +++ } +++ else +++ { +++ UInt32 i; +++ reps[0] = (pos - LZMA_NUM_REPS); +++ for (i = 1; i < LZMA_NUM_REPS; i++) +++ reps[i] = prevOpt->backs[i - 1]; +++ } +++ } +++ curOpt->state = (CState)state; +++ +++ curOpt->backs[0] = reps[0]; +++ curOpt->backs[1] = reps[1]; +++ curOpt->backs[2] = reps[2]; +++ curOpt->backs[3] = reps[3]; +++ +++ curPrice = curOpt->price; +++ nextIsChar = False; +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ currentByte = *data; +++ matchByte = *(data - (reps[0] + 1)); +++ +++ posState = (position & p->pbMask); +++ +++ curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]); +++ { +++ const CLzmaProb *probs = LIT_PROBS(position, *(data - 1)); +++ curAnd1Price += +++ (!IsCharState(state) ? +++ LitEnc_GetPriceMatched(probs, currentByte, matchByte, p->ProbPrices) : +++ LitEnc_GetPrice(probs, currentByte, p->ProbPrices)); +++ } +++ +++ nextOpt = &p->opt[cur + 1]; +++ +++ if (curAnd1Price < nextOpt->price) +++ { +++ nextOpt->price = curAnd1Price; +++ nextOpt->posPrev = cur; +++ MakeAsChar(nextOpt); +++ nextIsChar = True; +++ } +++ +++ matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]); +++ repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]); +++ +++ if (matchByte == currentByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0)) +++ { +++ UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState); +++ if (shortRepPrice <= nextOpt->price) +++ { +++ nextOpt->price = shortRepPrice; +++ nextOpt->posPrev = cur; +++ MakeAsShortRep(nextOpt); +++ nextIsChar = True; +++ } +++ } +++ +++ { +++ UInt32 temp = kNumOpts - 1 - cur; +++ if (temp < numAvailableBytesFull) +++ numAvailableBytesFull = temp; +++ } +++ numAvailableBytes = numAvailableBytesFull; +++ +++ if (numAvailableBytes < 2) +++ continue; +++ if (numAvailableBytes > p->numFastBytes) +++ numAvailableBytes = p->numFastBytes; +++ if (!nextIsChar && matchByte != currentByte) /* speed optimization */ +++ { +++ /* try Literal + rep0 */ +++ UInt32 temp; +++ UInt32 lenTest2; +++ const Byte *data2 = data - (reps[0] + 1); +++ UInt32 limit = p->numFastBytes + 1; +++ if (limit > numAvailableBytesFull) +++ limit = numAvailableBytesFull; +++ +++ for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++); +++ lenTest2 = temp - 1; +++ if (lenTest2 >= 2) +++ { +++ UInt32 state2 = kLiteralNextStates[state]; +++ UInt32 posStateNext = (position + 1) & p->pbMask; +++ UInt32 nextRepMatchPrice = curAnd1Price + +++ GET_PRICE_1(p->isMatch[state2][posStateNext]) + +++ GET_PRICE_1(p->isRep[state2]); +++ /* for (; lenTest2 >= 2; lenTest2--) */ +++ { +++ UInt32 curAndLenPrice; +++ COptimal *opt; +++ UInt32 offset = cur + 1 + lenTest2; +++ while (lenEnd < offset) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); +++ opt = &p->opt[offset]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur + 1; +++ opt->backPrev = 0; +++ opt->prev1IsChar = True; +++ opt->prev2 = False; +++ } +++ } +++ } +++ } +++ +++ startLen = 2; /* speed optimization */ +++ { +++ UInt32 repIndex; +++ for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++) +++ { +++ UInt32 lenTest; +++ UInt32 lenTestTemp; +++ UInt32 price; +++ const Byte *data2 = data - (reps[repIndex] + 1); +++ if (data[0] != data2[0] || data[1] != data2[1]) +++ continue; +++ for (lenTest = 2; lenTest < numAvailableBytes && data[lenTest] == data2[lenTest]; lenTest++); +++ while (lenEnd < cur + lenTest) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ lenTestTemp = lenTest; +++ price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState); +++ do +++ { +++ UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2]; +++ COptimal *opt = &p->opt[cur + lenTest]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur; +++ opt->backPrev = repIndex; +++ opt->prev1IsChar = False; +++ } +++ } +++ while (--lenTest >= 2); +++ lenTest = lenTestTemp; +++ +++ if (repIndex == 0) +++ startLen = lenTest + 1; +++ +++ /* if (_maxMode) */ +++ { +++ UInt32 lenTest2 = lenTest + 1; +++ UInt32 limit = lenTest2 + p->numFastBytes; +++ UInt32 nextRepMatchPrice; +++ if (limit > numAvailableBytesFull) +++ limit = numAvailableBytesFull; +++ for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++); +++ lenTest2 -= lenTest + 1; +++ if (lenTest2 >= 2) +++ { +++ UInt32 state2 = kRepNextStates[state]; +++ UInt32 posStateNext = (position + lenTest) & p->pbMask; +++ UInt32 curAndLenCharPrice = +++ price + p->repLenEnc.prices[posState][lenTest - 2] + +++ GET_PRICE_0(p->isMatch[state2][posStateNext]) + +++ LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]), +++ data[lenTest], data2[lenTest], p->ProbPrices); +++ state2 = kLiteralNextStates[state2]; +++ posStateNext = (position + lenTest + 1) & p->pbMask; +++ nextRepMatchPrice = curAndLenCharPrice + +++ GET_PRICE_1(p->isMatch[state2][posStateNext]) + +++ GET_PRICE_1(p->isRep[state2]); +++ +++ /* for (; lenTest2 >= 2; lenTest2--) */ +++ { +++ UInt32 curAndLenPrice; +++ COptimal *opt; +++ UInt32 offset = cur + lenTest + 1 + lenTest2; +++ while (lenEnd < offset) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); +++ opt = &p->opt[offset]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur + lenTest + 1; +++ opt->backPrev = 0; +++ opt->prev1IsChar = True; +++ opt->prev2 = True; +++ opt->posPrev2 = cur; +++ opt->backPrev2 = repIndex; +++ } +++ } +++ } +++ } +++ } +++ } +++ /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */ +++ if (newLen > numAvailableBytes) +++ { +++ newLen = numAvailableBytes; +++ for (numDistancePairs = 0; newLen > matchDistances[numDistancePairs]; numDistancePairs += 2); +++ matchDistances[numDistancePairs] = newLen; +++ numDistancePairs += 2; +++ } +++ if (newLen >= startLen) +++ { +++ UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]); +++ UInt32 offs, curBack, posSlot; +++ UInt32 lenTest; +++ while (lenEnd < cur + newLen) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ +++ offs = 0; +++ while (startLen > matchDistances[offs]) +++ offs += 2; +++ curBack = matchDistances[offs + 1]; +++ GetPosSlot2(curBack, posSlot); +++ for (lenTest = /*2*/ startLen; ; lenTest++) +++ { +++ UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN]; +++ UInt32 lenToPosState = GetLenToPosState(lenTest); +++ COptimal *opt; +++ if (curBack < kNumFullDistances) +++ curAndLenPrice += p->distancesPrices[lenToPosState][curBack]; +++ else +++ curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask]; +++ +++ opt = &p->opt[cur + lenTest]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur; +++ opt->backPrev = curBack + LZMA_NUM_REPS; +++ opt->prev1IsChar = False; +++ } +++ +++ if (/*_maxMode && */lenTest == matchDistances[offs]) +++ { +++ /* Try Match + Literal + Rep0 */ +++ const Byte *data2 = data - (curBack + 1); +++ UInt32 lenTest2 = lenTest + 1; +++ UInt32 limit = lenTest2 + p->numFastBytes; +++ UInt32 nextRepMatchPrice; +++ if (limit > numAvailableBytesFull) +++ limit = numAvailableBytesFull; +++ for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++); +++ lenTest2 -= lenTest + 1; +++ if (lenTest2 >= 2) +++ { +++ UInt32 state2 = kMatchNextStates[state]; +++ UInt32 posStateNext = (position + lenTest) & p->pbMask; +++ UInt32 curAndLenCharPrice = curAndLenPrice + +++ GET_PRICE_0(p->isMatch[state2][posStateNext]) + +++ LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]), +++ data[lenTest], data2[lenTest], p->ProbPrices); +++ state2 = kLiteralNextStates[state2]; +++ posStateNext = (posStateNext + 1) & p->pbMask; +++ nextRepMatchPrice = curAndLenCharPrice + +++ GET_PRICE_1(p->isMatch[state2][posStateNext]) + +++ GET_PRICE_1(p->isRep[state2]); +++ +++ /* for (; lenTest2 >= 2; lenTest2--) */ +++ { +++ UInt32 offset = cur + lenTest + 1 + lenTest2; +++ UInt32 curAndLenPrice; +++ COptimal *opt; +++ while (lenEnd < offset) +++ p->opt[++lenEnd].price = kInfinityPrice; +++ curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext); +++ opt = &p->opt[offset]; +++ if (curAndLenPrice < opt->price) +++ { +++ opt->price = curAndLenPrice; +++ opt->posPrev = cur + lenTest + 1; +++ opt->backPrev = 0; +++ opt->prev1IsChar = True; +++ opt->prev2 = True; +++ opt->posPrev2 = cur; +++ opt->backPrev2 = curBack + LZMA_NUM_REPS; +++ } +++ } +++ } +++ offs += 2; +++ if (offs == numDistancePairs) +++ break; +++ curBack = matchDistances[offs + 1]; +++ if (curBack >= kNumFullDistances) +++ GetPosSlot2(curBack, posSlot); +++ } +++ } +++ } +++ } +++} +++ +++#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist)) +++ +++static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes) +++{ +++ UInt32 numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ UInt32 lenMain, numDistancePairs; +++ const Byte *data; +++ UInt32 repLens[LZMA_NUM_REPS]; +++ UInt32 repMaxIndex, i; +++ UInt32 *matchDistances; +++ UInt32 backMain; +++ +++ if (!p->longestMatchWasFound) +++ { +++ lenMain = ReadMatchDistances(p, &numDistancePairs); +++ } +++ else +++ { +++ lenMain = p->longestMatchLength; +++ numDistancePairs = p->numDistancePairs; +++ p->longestMatchWasFound = False; +++ } +++ +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ if (numAvailableBytes > LZMA_MATCH_LEN_MAX) +++ numAvailableBytes = LZMA_MATCH_LEN_MAX; +++ if (numAvailableBytes < 2) +++ { +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ +++ repMaxIndex = 0; +++ +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ const Byte *data2 = data - (p->reps[i] + 1); +++ UInt32 len; +++ if (data[0] != data2[0] || data[1] != data2[1]) +++ { +++ repLens[i] = 0; +++ continue; +++ } +++ for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++); +++ if (len >= p->numFastBytes) +++ { +++ *backRes = i; +++ MovePos(p, len - 1); +++ return len; +++ } +++ repLens[i] = len; +++ if (len > repLens[repMaxIndex]) +++ repMaxIndex = i; +++ } +++ matchDistances = p->matchDistances; +++ if (lenMain >= p->numFastBytes) +++ { +++ *backRes = matchDistances[numDistancePairs - 1] + LZMA_NUM_REPS; +++ MovePos(p, lenMain - 1); +++ return lenMain; +++ } +++ +++ backMain = 0; /* for GCC */ +++ if (lenMain >= 2) +++ { +++ backMain = matchDistances[numDistancePairs - 1]; +++ while (numDistancePairs > 2 && lenMain == matchDistances[numDistancePairs - 4] + 1) +++ { +++ if (!ChangePair(matchDistances[numDistancePairs - 3], backMain)) +++ break; +++ numDistancePairs -= 2; +++ lenMain = matchDistances[numDistancePairs - 2]; +++ backMain = matchDistances[numDistancePairs - 1]; +++ } +++ if (lenMain == 2 && backMain >= 0x80) +++ lenMain = 1; +++ } +++ +++ if (repLens[repMaxIndex] >= 2) +++ { +++ if (repLens[repMaxIndex] + 1 >= lenMain || +++ (repLens[repMaxIndex] + 2 >= lenMain && (backMain > (1 << 9))) || +++ (repLens[repMaxIndex] + 3 >= lenMain && (backMain > (1 << 15)))) +++ { +++ UInt32 lenRes; +++ *backRes = repMaxIndex; +++ lenRes = repLens[repMaxIndex]; +++ MovePos(p, lenRes - 1); +++ return lenRes; +++ } +++ } +++ +++ if (lenMain >= 2 && numAvailableBytes > 2) +++ { +++ UInt32 i; +++ numAvailableBytes = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++ p->longestMatchLength = ReadMatchDistances(p, &p->numDistancePairs); +++ if (p->longestMatchLength >= 2) +++ { +++ UInt32 newDistance = matchDistances[p->numDistancePairs - 1]; +++ if ((p->longestMatchLength >= lenMain && newDistance < backMain) || +++ (p->longestMatchLength == lenMain + 1 && !ChangePair(backMain, newDistance)) || +++ (p->longestMatchLength > lenMain + 1) || +++ (p->longestMatchLength + 1 >= lenMain && lenMain >= 3 && ChangePair(newDistance, backMain))) +++ { +++ p->longestMatchWasFound = True; +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ } +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; +++ for (i = 0; i < LZMA_NUM_REPS; i++) +++ { +++ UInt32 len; +++ const Byte *data2 = data - (p->reps[i] + 1); +++ if (data[1] != data2[1] || data[2] != data2[2]) +++ { +++ repLens[i] = 0; +++ continue; +++ } +++ for (len = 2; len < numAvailableBytes && data[len] == data2[len]; len++); +++ if (len + 1 >= lenMain) +++ { +++ p->longestMatchWasFound = True; +++ *backRes = (UInt32)(-1); +++ return 1; +++ } +++ } +++ *backRes = backMain + LZMA_NUM_REPS; +++ MovePos(p, lenMain - 2); +++ return lenMain; +++ } +++ *backRes = (UInt32)(-1); +++ return 1; +++} +++ +++static void WriteEndMarker(CLzmaEnc *p, UInt32 posState) +++{ +++ UInt32 len; +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1); +++ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); +++ p->state = kMatchNextStates[p->state]; +++ len = LZMA_MATCH_LEN_MIN; +++ LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); +++ RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1); +++ RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits); +++ RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask); +++} +++ +++static SRes CheckErrors(CLzmaEnc *p) +++{ +++ if (p->result != SZ_OK) +++ return p->result; +++ if (p->rc.res != SZ_OK) +++ p->result = SZ_ERROR_WRITE; +++ if (p->matchFinderBase.result != SZ_OK) +++ p->result = SZ_ERROR_READ; +++ if (p->result != SZ_OK) +++ p->finished = True; +++ return p->result; +++} +++ +++static SRes Flush(CLzmaEnc *p, UInt32 nowPos) +++{ +++ /* ReleaseMFStream(); */ +++ p->finished = True; +++ if (p->writeEndMark) +++ WriteEndMarker(p, nowPos & p->pbMask); +++ RangeEnc_FlushData(&p->rc); +++ RangeEnc_FlushStream(&p->rc); +++ return CheckErrors(p); +++} +++ +++static void FillAlignPrices(CLzmaEnc *p) +++{ +++ UInt32 i; +++ for (i = 0; i < kAlignTableSize; i++) +++ p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices); +++ p->alignPriceCount = 0; +++} +++ +++static void FillDistancesPrices(CLzmaEnc *p) +++{ +++ UInt32 tempPrices[kNumFullDistances]; +++ UInt32 i, lenToPosState; +++ for (i = kStartPosModelIndex; i < kNumFullDistances; i++) +++ { +++ UInt32 posSlot = GetPosSlot1(i); +++ UInt32 footerBits = ((posSlot >> 1) - 1); +++ UInt32 base = ((2 | (posSlot & 1)) << footerBits); +++ tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices); +++ } +++ +++ for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++) +++ { +++ UInt32 posSlot; +++ const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState]; +++ UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState]; +++ for (posSlot = 0; posSlot < p->distTableSize; posSlot++) +++ posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices); +++ for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++) +++ posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits); +++ +++ { +++ UInt32 *distancesPrices = p->distancesPrices[lenToPosState]; +++ UInt32 i; +++ for (i = 0; i < kStartPosModelIndex; i++) +++ distancesPrices[i] = posSlotPrices[i]; +++ for (; i < kNumFullDistances; i++) +++ distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i]; +++ } +++ } +++ p->matchPriceCount = 0; +++} +++ +++void LzmaEnc_Construct(CLzmaEnc *p) +++{ +++ RangeEnc_Construct(&p->rc); +++ MatchFinder_Construct(&p->matchFinderBase); +++ #ifdef COMPRESS_MF_MT +++ MatchFinderMt_Construct(&p->matchFinderMt); +++ p->matchFinderMt.MatchFinder = &p->matchFinderBase; +++ #endif +++ +++ { +++ CLzmaEncProps props; +++ LzmaEncProps_Init(&props); +++ LzmaEnc_SetProps(p, &props); +++ } +++ +++ #ifndef LZMA_LOG_BSR +++ LzmaEnc_FastPosInit(p->g_FastPos); +++ #endif +++ +++ LzmaEnc_InitPriceTables(p->ProbPrices); +++ p->litProbs = 0; +++ p->saveState.litProbs = 0; +++} +++ +++CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc) +++{ +++ void *p; +++ p = alloc->Alloc(alloc, sizeof(CLzmaEnc)); +++ if (p != 0) +++ LzmaEnc_Construct((CLzmaEnc *)p); +++ return p; +++} +++ +++void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc) +++{ +++ alloc->Free(alloc, p->litProbs); +++ alloc->Free(alloc, p->saveState.litProbs); +++ p->litProbs = 0; +++ p->saveState.litProbs = 0; +++} +++ +++void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ #ifdef COMPRESS_MF_MT +++ MatchFinderMt_Destruct(&p->matchFinderMt, allocBig); +++ #endif +++ MatchFinder_Free(&p->matchFinderBase, allocBig); +++ LzmaEnc_FreeLits(p, alloc); +++ RangeEnc_Free(&p->rc, alloc); +++} +++ +++void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig); +++ alloc->Free(alloc, p); +++} +++ +++static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize) +++{ +++ UInt32 nowPos32, startPos32; +++ if (p->inStream != 0) +++ { +++ p->matchFinderBase.stream = p->inStream; +++ p->matchFinder.Init(p->matchFinderObj); +++ p->inStream = 0; +++ } +++ +++ if (p->finished) +++ return p->result; +++ RINOK(CheckErrors(p)); +++ +++ nowPos32 = (UInt32)p->nowPos64; +++ startPos32 = nowPos32; +++ +++ if (p->nowPos64 == 0) +++ { +++ UInt32 numDistancePairs; +++ Byte curByte; +++ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0) +++ return Flush(p, nowPos32); +++ ReadMatchDistances(p, &numDistancePairs); +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0); +++ p->state = kLiteralNextStates[p->state]; +++ curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset); +++ LitEnc_Encode(&p->rc, p->litProbs, curByte); +++ p->additionalOffset--; +++ nowPos32++; +++ } +++ +++ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0) +++ for (;;) +++ { +++ UInt32 pos, len, posState; +++ +++ if (p->fastMode) +++ len = GetOptimumFast(p, &pos); +++ else +++ len = GetOptimum(p, nowPos32, &pos); +++ +++ #ifdef SHOW_STAT2 +++ printf("\n pos = %4X, len = %d pos = %d", nowPos32, len, pos); +++ #endif +++ +++ posState = nowPos32 & p->pbMask; +++ if (len == 1 && pos == 0xFFFFFFFF) +++ { +++ Byte curByte; +++ CLzmaProb *probs; +++ const Byte *data; +++ +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0); +++ data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; +++ curByte = *data; +++ probs = LIT_PROBS(nowPos32, *(data - 1)); +++ if (IsCharState(p->state)) +++ LitEnc_Encode(&p->rc, probs, curByte); +++ else +++ LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1)); +++ p->state = kLiteralNextStates[p->state]; +++ } +++ else +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1); +++ if (pos < LZMA_NUM_REPS) +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1); +++ if (pos == 0) +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0); +++ RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1)); +++ } +++ else +++ { +++ UInt32 distance = p->reps[pos]; +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1); +++ if (pos == 1) +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0); +++ else +++ { +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1); +++ RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2); +++ if (pos == 3) +++ p->reps[3] = p->reps[2]; +++ p->reps[2] = p->reps[1]; +++ } +++ p->reps[1] = p->reps[0]; +++ p->reps[0] = distance; +++ } +++ if (len == 1) +++ p->state = kShortRepNextStates[p->state]; +++ else +++ { +++ LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); +++ p->state = kRepNextStates[p->state]; +++ } +++ } +++ else +++ { +++ UInt32 posSlot; +++ RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); +++ p->state = kMatchNextStates[p->state]; +++ LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); +++ pos -= LZMA_NUM_REPS; +++ GetPosSlot(pos, posSlot); +++ RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot); +++ +++ if (posSlot >= kStartPosModelIndex) +++ { +++ UInt32 footerBits = ((posSlot >> 1) - 1); +++ UInt32 base = ((2 | (posSlot & 1)) << footerBits); +++ UInt32 posReduced = pos - base; +++ +++ if (posSlot < kEndPosModelIndex) +++ RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced); +++ else +++ { +++ RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits); +++ RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask); +++ p->alignPriceCount++; +++ } +++ } +++ p->reps[3] = p->reps[2]; +++ p->reps[2] = p->reps[1]; +++ p->reps[1] = p->reps[0]; +++ p->reps[0] = pos; +++ p->matchPriceCount++; +++ } +++ } +++ p->additionalOffset -= len; +++ nowPos32 += len; +++ if (p->additionalOffset == 0) +++ { +++ UInt32 processed; +++ if (!p->fastMode) +++ { +++ if (p->matchPriceCount >= (1 << 7)) +++ FillDistancesPrices(p); +++ if (p->alignPriceCount >= kAlignTableSize) +++ FillAlignPrices(p); +++ } +++ if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0) +++ break; +++ processed = nowPos32 - startPos32; +++ if (useLimits) +++ { +++ if (processed + kNumOpts + 300 >= maxUnpackSize || +++ RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize) +++ break; +++ } +++ else if (processed >= (1 << 15)) +++ { +++ p->nowPos64 += nowPos32 - startPos32; +++ return CheckErrors(p); +++ } +++ } +++ } +++ p->nowPos64 += nowPos32 - startPos32; +++ return Flush(p, nowPos32); +++} +++ +++#define kBigHashDicLimit ((UInt32)1 << 24) +++ +++static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ UInt32 beforeSize = kNumOpts; +++ Bool btMode; +++ if (!RangeEnc_Alloc(&p->rc, alloc)) +++ return SZ_ERROR_MEM; +++ btMode = (p->matchFinderBase.btMode != 0); +++ #ifdef COMPRESS_MF_MT +++ p->mtMode = (p->multiThread && !p->fastMode && btMode); +++ #endif +++ +++ { +++ unsigned lclp = p->lc + p->lp; +++ if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp) +++ { +++ LzmaEnc_FreeLits(p, alloc); +++ p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb)); +++ p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb)); +++ if (p->litProbs == 0 || p->saveState.litProbs == 0) +++ { +++ LzmaEnc_FreeLits(p, alloc); +++ return SZ_ERROR_MEM; +++ } +++ p->lclp = lclp; +++ } +++ } +++ +++ p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit); +++ +++ if (beforeSize + p->dictSize < keepWindowSize) +++ beforeSize = keepWindowSize - p->dictSize; +++ +++ #ifdef COMPRESS_MF_MT +++ if (p->mtMode) +++ { +++ RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig)); +++ p->matchFinderObj = &p->matchFinderMt; +++ MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder); +++ } +++ else +++ #endif +++ { +++ if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig)) +++ return SZ_ERROR_MEM; +++ p->matchFinderObj = &p->matchFinderBase; +++ MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder); +++ } +++ return SZ_OK; +++} +++ +++void LzmaEnc_Init(CLzmaEnc *p) +++{ +++ UInt32 i; +++ p->state = 0; +++ for(i = 0 ; i < LZMA_NUM_REPS; i++) +++ p->reps[i] = 0; +++ +++ RangeEnc_Init(&p->rc); +++ +++ +++ for (i = 0; i < kNumStates; i++) +++ { +++ UInt32 j; +++ for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++) +++ { +++ p->isMatch[i][j] = kProbInitValue; +++ p->isRep0Long[i][j] = kProbInitValue; +++ } +++ p->isRep[i] = kProbInitValue; +++ p->isRepG0[i] = kProbInitValue; +++ p->isRepG1[i] = kProbInitValue; +++ p->isRepG2[i] = kProbInitValue; +++ } +++ +++ { +++ UInt32 num = 0x300 << (p->lp + p->lc); +++ for (i = 0; i < num; i++) +++ p->litProbs[i] = kProbInitValue; +++ } +++ +++ { +++ for (i = 0; i < kNumLenToPosStates; i++) +++ { +++ CLzmaProb *probs = p->posSlotEncoder[i]; +++ UInt32 j; +++ for (j = 0; j < (1 << kNumPosSlotBits); j++) +++ probs[j] = kProbInitValue; +++ } +++ } +++ { +++ for(i = 0; i < kNumFullDistances - kEndPosModelIndex; i++) +++ p->posEncoders[i] = kProbInitValue; +++ } +++ +++ LenEnc_Init(&p->lenEnc.p); +++ LenEnc_Init(&p->repLenEnc.p); +++ +++ for (i = 0; i < (1 << kNumAlignBits); i++) +++ p->posAlignEncoder[i] = kProbInitValue; +++ +++ p->longestMatchWasFound = False; +++ p->optimumEndIndex = 0; +++ p->optimumCurrentIndex = 0; +++ p->additionalOffset = 0; +++ +++ p->pbMask = (1 << p->pb) - 1; +++ p->lpMask = (1 << p->lp) - 1; +++} +++ +++void LzmaEnc_InitPrices(CLzmaEnc *p) +++{ +++ if (!p->fastMode) +++ { +++ FillDistancesPrices(p); +++ FillAlignPrices(p); +++ } +++ +++ p->lenEnc.tableSize = +++ p->repLenEnc.tableSize = +++ p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN; +++ LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices); +++ LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices); +++} +++ +++static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ UInt32 i; +++ for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++) +++ if (p->dictSize <= ((UInt32)1 << i)) +++ break; +++ p->distTableSize = i * 2; +++ +++ p->finished = False; +++ p->result = SZ_OK; +++ RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig)); +++ LzmaEnc_Init(p); +++ LzmaEnc_InitPrices(p); +++ p->nowPos64 = 0; +++ return SZ_OK; +++} +++ +++static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqInStream *inStream, ISeqOutStream *outStream, +++ ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ p->inStream = inStream; +++ p->rc.outStream = outStream; +++ return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig); +++} +++ +++SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp, +++ ISeqInStream *inStream, UInt32 keepWindowSize, +++ ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ p->inStream = inStream; +++ return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); +++} +++ +++static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen) +++{ +++ p->seqBufInStream.funcTable.Read = MyRead; +++ p->seqBufInStream.data = src; +++ p->seqBufInStream.rem = srcLen; +++} +++ +++SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen, +++ UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ LzmaEnc_SetInputBuf(p, src, srcLen); +++ p->inStream = &p->seqBufInStream.funcTable; +++ return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); +++} +++ +++void LzmaEnc_Finish(CLzmaEncHandle pp) +++{ +++ #ifdef COMPRESS_MF_MT +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ if (p->mtMode) +++ MatchFinderMt_ReleaseStream(&p->matchFinderMt); +++ #endif +++} +++ +++typedef struct _CSeqOutStreamBuf +++{ +++ ISeqOutStream funcTable; +++ Byte *data; +++ SizeT rem; +++ Bool overflow; +++} CSeqOutStreamBuf; +++ +++static size_t MyWrite(void *pp, const void *data, size_t size) +++{ +++ CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp; +++ if (p->rem < size) +++ { +++ size = p->rem; +++ p->overflow = True; +++ } +++ memcpy(p->data, data, size); +++ p->rem -= size; +++ p->data += size; +++ return size; +++} +++ +++ +++UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp) +++{ +++ const CLzmaEnc *p = (CLzmaEnc *)pp; +++ return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj); +++} +++ +++const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp) +++{ +++ const CLzmaEnc *p = (CLzmaEnc *)pp; +++ return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset; +++} +++ +++SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit, +++ Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ UInt64 nowPos64; +++ SRes res; +++ CSeqOutStreamBuf outStream; +++ +++ outStream.funcTable.Write = MyWrite; +++ outStream.data = dest; +++ outStream.rem = *destLen; +++ outStream.overflow = False; +++ +++ p->writeEndMark = False; +++ p->finished = False; +++ p->result = SZ_OK; +++ +++ if (reInit) +++ LzmaEnc_Init(p); +++ LzmaEnc_InitPrices(p); +++ nowPos64 = p->nowPos64; +++ RangeEnc_Init(&p->rc); +++ p->rc.outStream = &outStream.funcTable; +++ +++ res = LzmaEnc_CodeOneBlock(pp, True, desiredPackSize, *unpackSize); +++ +++ *unpackSize = (UInt32)(p->nowPos64 - nowPos64); +++ *destLen -= outStream.rem; +++ if (outStream.overflow) +++ return SZ_ERROR_OUTPUT_EOF; +++ +++ return res; +++} +++ +++SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress, +++ ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ SRes res = SZ_OK; +++ +++ #ifdef COMPRESS_MF_MT +++ Byte allocaDummy[0x300]; +++ int i = 0; +++ for (i = 0; i < 16; i++) +++ allocaDummy[i] = (Byte)i; +++ #endif +++ +++ RINOK(LzmaEnc_Prepare(pp, inStream, outStream, alloc, allocBig)); +++ +++ for (;;) +++ { +++ res = LzmaEnc_CodeOneBlock(pp, False, 0, 0); +++ if (res != SZ_OK || p->finished != 0) +++ break; +++ if (progress != 0) +++ { +++ res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc)); +++ if (res != SZ_OK) +++ { +++ res = SZ_ERROR_PROGRESS; +++ break; +++ } +++ } +++ } +++ LzmaEnc_Finish(pp); +++ return res; +++} +++ +++SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ int i; +++ UInt32 dictSize = p->dictSize; +++ if (*size < LZMA_PROPS_SIZE) +++ return SZ_ERROR_PARAM; +++ *size = LZMA_PROPS_SIZE; +++ props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc); +++ +++ for (i = 11; i <= 30; i++) +++ { +++ if (dictSize <= ((UInt32)2 << i)) +++ { +++ dictSize = (2 << i); +++ break; +++ } +++ if (dictSize <= ((UInt32)3 << i)) +++ { +++ dictSize = (3 << i); +++ break; +++ } +++ } +++ +++ for (i = 0; i < 4; i++) +++ props[1 + i] = (Byte)(dictSize >> (8 * i)); +++ return SZ_OK; +++} +++ +++SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ SRes res; +++ CLzmaEnc *p = (CLzmaEnc *)pp; +++ +++ CSeqOutStreamBuf outStream; +++ +++ LzmaEnc_SetInputBuf(p, src, srcLen); +++ +++ outStream.funcTable.Write = MyWrite; +++ outStream.data = dest; +++ outStream.rem = *destLen; +++ outStream.overflow = False; +++ +++ p->writeEndMark = writeEndMark; +++ res = LzmaEnc_Encode(pp, &outStream.funcTable, &p->seqBufInStream.funcTable, +++ progress, alloc, allocBig); +++ +++ *destLen -= outStream.rem; +++ if (outStream.overflow) +++ return SZ_ERROR_OUTPUT_EOF; +++ return res; +++} +++ +++SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen, +++ const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark, +++ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig) +++{ +++ CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc); +++ SRes res; +++ if (p == 0) +++ return SZ_ERROR_MEM; +++ +++ res = LzmaEnc_SetProps(p, props); +++ if (res == SZ_OK) +++ { +++ res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize); +++ if (res == SZ_OK) +++ res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen, +++ writeEndMark, progress, alloc, allocBig); +++ } +++ +++ LzmaEnc_Destroy(p, alloc, allocBig); +++ return res; +++} ++--- a/mkfs.jffs2.c +++++ b/mkfs.jffs2.c ++@@ -1658,11 +1658,11 @@ int main(int argc, char **argv) ++ } ++ erase_block_size *= units; ++ ++- /* If it's less than 8KiB, they're not allowed */ ++- if (erase_block_size < 0x2000) { ++- fprintf(stderr, "Erase size 0x%x too small. Increasing to 8KiB minimum\n", +++ /* If it's less than 4KiB, they're not allowed */ +++ if (erase_block_size < 0x1000) { +++ fprintf(stderr, "Erase size 0x%x too small. Increasing to 4KiB minimum\n", ++ erase_block_size); ++- erase_block_size = 0x2000; +++ erase_block_size = 0x1000; ++ } ++ break; ++ } +diff --git a/feeds/packages/utils/mtd-utils/patches/131-fix_lib_compile.patch b/feeds/packages/utils/mtd-utils/patches/131-fix_lib_compile.patch +new file mode 100644 +index 0000000..8c977c1 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/131-fix_lib_compile.patch +@@ -0,0 +1,11 @@ ++--- a/lib/Makefile +++++ b/lib/Makefile ++@@ -7,7 +7,7 @@ SUBDIRS = ++ # CFLAGS += -Werror ++ CPPFLAGS += -I../include ++ LIBS = libmtd ++-TARGETS = libmtd.a +++override TARGETS = libmtd.a ++ ++ include ../common.mk ++ +diff --git a/feeds/packages/utils/mtd-utils/patches/135-mkubifs_optional_lzo.patch b/feeds/packages/utils/mtd-utils/patches/135-mkubifs_optional_lzo.patch +new file mode 100644 +index 0000000..82b6c2f +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/135-mkubifs_optional_lzo.patch +@@ -0,0 +1,119 @@ ++--- a/mkfs.ubifs/compr.c +++++ b/mkfs.ubifs/compr.c ++@@ -24,7 +24,6 @@ ++ #include ++ #include ++ #include ++-#include ++ #include ++ ++ #define crc32 __zlib_crc32 ++@@ -35,7 +34,6 @@ ++ #include "ubifs-media.h" ++ #include "mkfs.ubifs.h" ++ ++-static void *lzo_mem; ++ static unsigned long long errcnt = 0; ++ static struct ubifs_info *c = &info_; ++ ++@@ -86,6 +84,25 @@ static int zlib_deflate(void *in_buf, si ++ return 0; ++ } ++ +++#ifndef WITHOUT_LZO +++#include +++ +++static void *lzo_mem; +++ +++static int lzo_init(void) +++{ +++ lzo_mem = malloc(LZO1X_999_MEM_COMPRESS); +++ if (!lzo_mem) +++ return -1; +++ +++ return 0; +++} +++ +++static void lzo_fini(void) +++{ +++ free(lzo_mem); +++} +++ ++ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++ { ++@@ -103,6 +120,12 @@ static int lzo_compress(void *in_buf, si ++ ++ return 0; ++ } +++#else +++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, +++ size_t *out_len) { return -1; } +++static inline int lzo_init(void) { return 0; } +++static inline void lzo_fini(void) { } +++#endif ++ ++ static int no_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++@@ -123,7 +146,6 @@ static int favor_lzo_compress(void *in_b ++ lzo_len = zlib_len = *out_len; ++ lzo_ret = lzo_compress(in_buf, in_len, out_buf, &lzo_len); ++ zlib_ret = zlib_deflate(in_buf, in_len, zlib_buf, &zlib_len); ++- ++ if (lzo_ret && zlib_ret) ++ /* Both compressors failed */ ++ return -1; ++@@ -198,23 +220,28 @@ int compress_data(void *in_buf, size_t i ++ ++ int init_compression(void) ++ { ++- lzo_mem = malloc(LZO1X_999_MEM_COMPRESS); ++- if (!lzo_mem) ++- return -1; +++ int ret; +++ +++ ret = lzo_init(); +++ if (ret) +++ goto err; ++ ++ zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR); ++- if (!zlib_buf) { ++- free(lzo_mem); ++- return -1; ++- } +++ if (!zlib_buf) +++ goto err_lzo; ++ ++ return 0; +++ +++err_lzo: +++ lzo_fini(); +++err: +++ return ret; ++ } ++ ++ void destroy_compression(void) ++ { ++ free(zlib_buf); ++- free(lzo_mem); +++ lzo_fini(); ++ if (errcnt) ++ fprintf(stderr, "%llu compression errors occurred\n", errcnt); ++ } ++--- a/mkfs.ubifs/Makefile +++++ b/mkfs.ubifs/Makefile ++@@ -6,7 +6,13 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] ++ ++ TARGETS = mkfs.ubifs ++ ++-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi +++ifeq ($(WITHOUT_LZO), 1) +++ CPPFLAGS += -DWITHOUT_LZO +++else +++ LZOLDLIBS = -llzo2 +++endif +++ +++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi ++ LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd ++ LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) ++ +diff --git a/feeds/packages/utils/mtd-utils/patches/136-mkubifs-fix-rinoperm-options.patch b/feeds/packages/utils/mtd-utils/patches/136-mkubifs-fix-rinoperm-options.patch +new file mode 100644 +index 0000000..dd7c74c +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/136-mkubifs-fix-rinoperm-options.patch +@@ -0,0 +1,28 @@ ++--- a/mkfs.ubifs/mkfs.ubifs.c +++++ b/mkfs.ubifs/mkfs.ubifs.c ++@@ -109,7 +109,7 @@ static char *output; ++ static int out_fd; ++ static int out_ubi; ++ static int squash_owner; ++-static int squash_rino_perm; +++static int squash_rino_perm = -1; ++ ++ /* The 'head' (position) which nodes are written */ ++ static int head_lnum; ++@@ -683,6 +683,7 @@ static int get_options(int argc, char**a ++ printf("WARNING: --squash-rino-perm is depricated, do not use it\n"); ++ break; ++ case 'q': +++ squash_rino_perm = 0; ++ printf("WARNING: --nosquash-rino-perm is depricated, do not use it\n"); ++ break; ++ } ++@@ -1686,7 +1687,7 @@ static int write_data(void) ++ if (err) ++ return sys_err_msg("bad root file-system directory '%s'", ++ root); ++- if (squash_rino_perm) { +++ if (squash_rino_perm > 0) { ++ root_st.st_uid = root_st.st_gid = 0; ++ root_st.st_mode = mode; ++ } +diff --git a/feeds/packages/utils/mtd-utils/patches/137-mkubifs-allow-to-overwrite-volume-data.patch b/feeds/packages/utils/mtd-utils/patches/137-mkubifs-allow-to-overwrite-volume-data.patch +new file mode 100644 +index 0000000..33f6f30 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/137-mkubifs-allow-to-overwrite-volume-data.patch +@@ -0,0 +1,61 @@ ++--- a/mkfs.ubifs/mkfs.ubifs.c +++++ b/mkfs.ubifs/mkfs.ubifs.c ++@@ -110,6 +110,7 @@ static int out_fd; ++ static int out_ubi; ++ static int squash_owner; ++ static int squash_rino_perm = -1; +++static int overwrite_volume; ++ ++ /* The 'head' (position) which nodes are written */ ++ static int head_lnum; ++@@ -132,7 +133,7 @@ static struct inum_mapping **hash_table; ++ /* Inode creation sequence number */ ++ static unsigned long long creat_sqnum; ++ ++-static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:Fp:k:x:X:j:R:l:j:UQq"; +++static const char *optstring = "d:r:m:o:OD:h?vVe:c:g:f:Fp:k:x:X:j:R:l:j:UQq"; ++ ++ static const struct option longopts[] = { ++ {"root", 1, NULL, 'r'}, ++@@ -140,6 +141,7 @@ static const struct option longopts[] = ++ {"leb-size", 1, NULL, 'e'}, ++ {"max-leb-cnt", 1, NULL, 'c'}, ++ {"output", 1, NULL, 'o'}, +++ {"overwrite", 0, NULL, 'O'}, ++ {"devtable", 1, NULL, 'D'}, ++ {"help", 0, NULL, 'h'}, ++ {"verbose", 0, NULL, 'v'}, ++@@ -176,6 +178,7 @@ static const char *helptext = ++ "-e, --leb-size=SIZE logical erase block size\n" ++ "-c, --max-leb-cnt=COUNT maximum logical erase block count\n" ++ "-o, --output=FILE output to FILE\n" +++"-O, --overwrite force overwriting of the existing volume\n" ++ "-j, --jrn-size=SIZE journal size\n" ++ "-R, --reserved=SIZE how much space should be reserved for the super-user\n" ++ "-x, --compr=TYPE compression type - \"lzo\", \"favor_lzo\", \"zlib\" or\n" ++@@ -594,6 +597,9 @@ static int get_options(int argc, char**a ++ case 'o': ++ output = strdup(optarg); ++ break; +++ case 'O': +++ overwrite_volume = 1; +++ break; ++ case 'D': ++ tbl_file = optarg; ++ if (stat(tbl_file, &st) < 0) ++@@ -2180,8 +2186,13 @@ static int open_target(void) ++ if (ubi_set_property(out_fd, UBI_PROP_DIRECT_WRITE, 1)) ++ return sys_err_msg("ubi_set_property failed"); ++ ++- if (check_volume_empty()) ++- return err_msg("UBI volume is not empty"); +++ if (check_volume_empty()) { +++ if (overwrite_volume) +++ if (verbose) +++ printf("Warning: overwriting existing data\n"); +++ else +++ return err_msg("UBI volume is not empty"); +++ } ++ } else { ++ out_fd = open(output, O_CREAT | O_RDWR | O_TRUNC, ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); +diff --git a/feeds/packages/utils/mtd-utils/patches/150-fix_ubi-utils_static.patch b/feeds/packages/utils/mtd-utils/patches/150-fix_ubi-utils_static.patch +new file mode 100644 +index 0000000..1413a98 +--- /dev/null ++++ b/feeds/packages/utils/mtd-utils/patches/150-fix_ubi-utils_static.patch +@@ -0,0 +1,32 @@ ++--- a/ubi-utils/Makefile +++++ b/ubi-utils/Makefile ++@@ -22,7 +22,7 @@ $(TARGETS): $(addprefix $(BUILDDIR)/,\ ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -lubi -o $@ ++ ++ $(BUILDDIR)/ubicrc32: $(addprefix $(BUILDDIR)/,\ ++- ubicrc32.o) +++ ../lib/libcrc32.o ubicrc32.o) ++ # $(CC) $(CFLAGS) -o $@ $^ ++ ++ $(BUILDDIR)/ubinize: $(addprefix $(BUILDDIR)/,\ ++@@ -30,16 +30,17 @@ $(BUILDDIR)/ubinize: $(addprefix $(BUILD ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -liniparser -lubigen -o $@ ++ ++ $(BUILDDIR)/mtdinfo: $(addprefix $(BUILDDIR)/,\ ++- libubigen.a ubiutils-common.o) +++ ../lib/libmtd.o ../lib/libmtd_legacy.o libubigen.a ubiutils-common.o) ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -lmtd -lubigen -o $@ ++ ++ $(BUILDDIR)/ubiformat: $(addprefix $(BUILDDIR)/,\ ++- ubiformat.o ubiutils-common.o libscan.a libubi.a libubigen.a) +++ ../lib/libmtd.o ../lib/libmtd_legacy.o ubiformat.o ubiutils-common.o libscan.a libubi.a libubigen.a) ++ # $(CC) $(CFLAGS) $(filter %.o, $^) -L. -lmtd -lscan -lubi -lubigen -o $@ ++ ++ $(BUILDDIR)/libubi.a: $(BUILDDIR)/libubi.o ++ ++-$(BUILDDIR)/libubigen.a: $(BUILDDIR)/libubigen.o +++$(BUILDDIR)/libubigen.a: $(addprefix $(BUILDDIR)/,\ +++ ../lib/libcrc32.o libubigen.o) ++ ++ $(BUILDDIR)/libiniparser.a: $(addprefix $(BUILDDIR)/,\ ++ libiniparser.o dictionary.o) +diff --git a/feeds/packages/utils/nano/.svn/entries b/feeds/packages/utils/nano/.svn/entries +new file mode 100644 +index 0000000..aca2638 +--- /dev/null ++++ b/feeds/packages/utils/nano/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/nano ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-12-19T04:18:44.761170Z ++24702 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++a14f0a406108a6053bd5154bd6f3d289 ++2010-12-19T04:18:44.761170Z ++24702 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1153 ++ +diff --git a/feeds/packages/utils/nano/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/nano/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/nano/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/nano/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/nano/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cff2bc7 +--- /dev/null ++++ b/feeds/packages/utils/nano/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=nano ++PKG_VERSION:=2.2.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.nano-editor.org/dist/v2.2 ++PKG_MD5SUM:=03233ae480689a008eb98feb1b599807 ++ ++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:=Bernhard Loos ++ 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 \ ++ ++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/feeds/packages/utils/nano/Makefile b/feeds/packages/utils/nano/Makefile +new file mode 100644 +index 0000000..cff2bc7 +--- /dev/null ++++ b/feeds/packages/utils/nano/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=nano ++PKG_VERSION:=2.2.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.nano-editor.org/dist/v2.2 ++PKG_MD5SUM:=03233ae480689a008eb98feb1b599807 ++ ++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:=Bernhard Loos ++ 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 \ ++ ++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/feeds/packages/utils/ntfs-3g/.svn/entries b/feeds/packages/utils/ntfs-3g/.svn/entries +new file mode 100644 +index 0000000..0f03bc5 +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ntfs-3g ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches-2011.4.12 ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++df558d02244bea1efc310d966f1cde90 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6782 ++ +diff --git a/feeds/packages/utils/ntfs-3g/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/ntfs-3g/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..fd3736b +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 13 ++svn:copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++K 11 ++svn:licence ++V 5 ++GPLv2 ++END +diff --git a/feeds/packages/utils/ntfs-3g/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ntfs-3g/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4650344 +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,235 @@ ++# ++# 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:=ntfs-3g ++PKG_RELEASE:=1 ++ ++# 2011.4.12 integrates ntfsprogs and changed srcfile name ++PKG_VERSION:=2011.4.12 ++# disable next line and do _not_ select ntfsprogs_ntfs-3g to build an older version ++PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz ++ ++## 2010.3.6 needs a recent uclibc 0.9.30.2 or greater ++## this has been fixed in 2010.5.16, keeping this in case this happens again ++#PKG_UCLIBC_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) ++#ifneq (,$(or $(findstring !0.9.29,!$(PKG_UCLIBC_VERSION)),$(findstring !0.9.30.1!,!$(PKG_UCLIBC_VERSION)!) )) ++# PKG_VERSION:=2010.1.16 ++#endif ++ ++PATCH_DIR:=./patches-$(PKG_VERSION) ++ ++PKG_SOURCE?=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.tuxera.com/opensource/ ++ ++PKG_MD5SUM_2010.1.16:=e104c914e8d7d29ee83e63d46afbba25 ++PKG_MD5SUM_2010.3.6:=12ce21aa044c6068a4df6e8cbd3c5cfa ++PKG_MD5SUM_2010.5.16:=aeff7659a4943c9223d79116f051a863 ++PKG_MD5SUM_2010.5.22:=caa08c73220a7106c76f697b7a7915ec ++PKG_MD5SUM_2010.8.8:=6c109746c2708f679725a2ea441c61c6 ++PKG_MD5SUM_2010.10.2:=91405690f25822142cdcb43d03e62d3f ++PKG_MD5SUM_2011.1.15:=15a5cf5752012269fa168c24191f00e2 ++PKG_MD5SUM_2011.4.12:=9c4ce318373b15332239a77a9d2a39fe ++PKG_MD5SUM:=$(PKG_MD5SUM_$(PKG_VERSION)) ++ ++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 ++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 ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static ++ ++# 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/feeds/packages/utils/ntfs-3g/Makefile b/feeds/packages/utils/ntfs-3g/Makefile +new file mode 100644 +index 0000000..4650344 +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/Makefile +@@ -0,0 +1,235 @@ ++# ++# 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:=ntfs-3g ++PKG_RELEASE:=1 ++ ++# 2011.4.12 integrates ntfsprogs and changed srcfile name ++PKG_VERSION:=2011.4.12 ++# disable next line and do _not_ select ntfsprogs_ntfs-3g to build an older version ++PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz ++ ++## 2010.3.6 needs a recent uclibc 0.9.30.2 or greater ++## this has been fixed in 2010.5.16, keeping this in case this happens again ++#PKG_UCLIBC_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) ++#ifneq (,$(or $(findstring !0.9.29,!$(PKG_UCLIBC_VERSION)),$(findstring !0.9.30.1!,!$(PKG_UCLIBC_VERSION)!) )) ++# PKG_VERSION:=2010.1.16 ++#endif ++ ++PATCH_DIR:=./patches-$(PKG_VERSION) ++ ++PKG_SOURCE?=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.tuxera.com/opensource/ ++ ++PKG_MD5SUM_2010.1.16:=e104c914e8d7d29ee83e63d46afbba25 ++PKG_MD5SUM_2010.3.6:=12ce21aa044c6068a4df6e8cbd3c5cfa ++PKG_MD5SUM_2010.5.16:=aeff7659a4943c9223d79116f051a863 ++PKG_MD5SUM_2010.5.22:=caa08c73220a7106c76f697b7a7915ec ++PKG_MD5SUM_2010.8.8:=6c109746c2708f679725a2ea441c61c6 ++PKG_MD5SUM_2010.10.2:=91405690f25822142cdcb43d03e62d3f ++PKG_MD5SUM_2011.1.15:=15a5cf5752012269fa168c24191f00e2 ++PKG_MD5SUM_2011.4.12:=9c4ce318373b15332239a77a9d2a39fe ++PKG_MD5SUM:=$(PKG_MD5SUM_$(PKG_VERSION)) ++ ++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 ++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 ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static ++ ++# 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/feeds/packages/utils/ntfs-3g/patches-2011.4.12/.svn/entries b/feeds/packages/utils/ntfs-3g/patches-2011.4.12/.svn/entries +new file mode 100644 +index 0000000..802c993 +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/patches-2011.4.12/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ntfs-3g/patches-2011.4.12 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-06-01T14:47:21.362295Z ++27085 ++bud ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-options.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++2b82e90d46768759c96131df3ae90a27 ++2011-06-01T14:47:21.362295Z ++27085 ++bud ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++493 ++ +diff --git a/feeds/packages/utils/ntfs-3g/patches-2011.4.12/.svn/text-base/001-options.patch.svn-base b/feeds/packages/utils/ntfs-3g/patches-2011.4.12/.svn/text-base/001-options.patch.svn-base +new file mode 100644 +index 0000000..e0d7ac8 +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/patches-2011.4.12/.svn/text-base/001-options.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/src/ntfs-3g_common.c.ref 2011-04-23 08:25:28.000000000 +0200 +++++ b/src/ntfs-3g_common.c 2011-04-23 08:32:16.000000000 +0200 ++@@ -58,8 +58,6 @@ ++ ++ static const char nf_ns_alt_xattr_efsinfo[] = "user.ntfs.efsinfo"; ++ ++-#ifdef HAVE_SETXATTR ++- ++ static const char def_opts[] = "allow_other,nonempty,"; ++ ++ /* ++@@ -573,6 +571,8 @@ ++ return 0; ++ } ++ +++#ifdef HAVE_SETXATTR +++ ++ int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx, ++ char *list, size_t size, BOOL prefixing) ++ { +diff --git a/feeds/packages/utils/ntfs-3g/patches-2011.4.12/001-options.patch b/feeds/packages/utils/ntfs-3g/patches-2011.4.12/001-options.patch +new file mode 100644 +index 0000000..e0d7ac8 +--- /dev/null ++++ b/feeds/packages/utils/ntfs-3g/patches-2011.4.12/001-options.patch +@@ -0,0 +1,20 @@ ++--- a/src/ntfs-3g_common.c.ref 2011-04-23 08:25:28.000000000 +0200 +++++ b/src/ntfs-3g_common.c 2011-04-23 08:32:16.000000000 +0200 ++@@ -58,8 +58,6 @@ ++ ++ static const char nf_ns_alt_xattr_efsinfo[] = "user.ntfs.efsinfo"; ++ ++-#ifdef HAVE_SETXATTR ++- ++ static const char def_opts[] = "allow_other,nonempty,"; ++ ++ /* ++@@ -573,6 +571,8 @@ ++ return 0; ++ } ++ +++#ifdef HAVE_SETXATTR +++ ++ int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx, ++ char *list, size_t size, BOOL prefixing) ++ { +diff --git a/feeds/packages/utils/ntfsprogs/.svn/entries b/feeds/packages/utils/ntfsprogs/.svn/entries +new file mode 100644 +index 0000000..f3df876 +--- /dev/null ++++ b/feeds/packages/utils/ntfsprogs/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ntfsprogs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++7945928042a8a2193c2fd1f50243614c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1489 ++ +diff --git a/feeds/packages/utils/ntfsprogs/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ntfsprogs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..78ae9f6 +--- /dev/null ++++ b/feeds/packages/utils/ntfsprogs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Gianluigi Tiesi ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=ntfsprogs ++PKG_VERSION:=2.0.0 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/linux-ntfs ++PKG_MD5SUM:=2c402b647bb7aeb1d3f8ce1cc354fd68 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_DEPENDS:=libgcrypt ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ntfsprogs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ TITLE:=Linux-NTFS ++ URL:=http://www.linux-ntfs.org/ ++ MAINTAINER:=Gianluigi Tiesi ++endef ++ ++define Package/ntfsprogs/description ++ Tools for managing NTFS volumes from Linux ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-crypto \ ++ --disable-gnome-vfs \ ++ --disable-ntfsmount ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.{la,a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/ntfsprogs/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ntfsfix $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ntfsprogs)) +diff --git a/feeds/packages/utils/ntfsprogs/Makefile b/feeds/packages/utils/ntfsprogs/Makefile +new file mode 100644 +index 0000000..78ae9f6 +--- /dev/null ++++ b/feeds/packages/utils/ntfsprogs/Makefile +@@ -0,0 +1,61 @@ ++# ++# Copyright (C) 2010-2011 OpenWrt.org ++# Copyright (C) 2010 Gianluigi Tiesi ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=ntfsprogs ++PKG_VERSION:=2.0.0 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/linux-ntfs ++PKG_MD5SUM:=2c402b647bb7aeb1d3f8ce1cc354fd68 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++PKG_BUILD_DEPENDS:=libgcrypt ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ntfsprogs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ TITLE:=Linux-NTFS ++ URL:=http://www.linux-ntfs.org/ ++ MAINTAINER:=Gianluigi Tiesi ++endef ++ ++define Package/ntfsprogs/description ++ Tools for managing NTFS volumes from Linux ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-crypto \ ++ --disable-gnome-vfs \ ++ --disable-ntfsmount ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.{la,a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/ntfsprogs/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ntfsfix $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ntfsprogs)) +diff --git a/feeds/packages/utils/ntfsprogs/patches/.svn/entries b/feeds/packages/utils/ntfsprogs/patches/.svn/entries +new file mode 100644 +index 0000000..fb7d162 +--- /dev/null ++++ b/feeds/packages/utils/ntfsprogs/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ntfsprogs/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-07-10T00:09:26.993162Z ++22108 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-autoconf_fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d0cbb8259afaaeae9fa3c7366772099d ++2010-07-10T00:09:26.993162Z ++22108 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2151 ++ +diff --git a/feeds/packages/utils/ntfsprogs/patches/.svn/text-base/001-autoconf_fixes.patch.svn-base b/feeds/packages/utils/ntfsprogs/patches/.svn/text-base/001-autoconf_fixes.patch.svn-base +new file mode 100644 +index 0000000..0055159 +--- /dev/null ++++ b/feeds/packages/utils/ntfsprogs/patches/.svn/text-base/001-autoconf_fixes.patch.svn-base +@@ -0,0 +1,52 @@ ++--- a/libntfs/Makefile.am +++++ b/libntfs/Makefile.am ++@@ -38,8 +38,8 @@ libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \ ++ -DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\" ++ ++ if ENABLE_CRYPTO ++-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig` ++-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig` +++libntfs_la_LDFLAGS += $(GNUTLS_LIBS) $(libconfig_LIBS) +++libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(libconfig_CFLAGS) ++ endif ++ ++ libntfs_la_SOURCES = \ ++--- a/libntfs/Makefile.in +++++ b/libntfs/Makefile.in ++@@ -61,8 +61,8 @@ POST_UNINSTALL = : ++ build_triplet = @build@ ++ host_triplet = @host@ ++ target_triplet = @target@ ++-@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig` ++-@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig` +++@ENABLE_CRYPTO_TRUE@am__append_1 = $(GNUTLS_LIBS) $(libconfig_LIBS) +++@ENABLE_CRYPTO_TRUE@am__append_2 = $(GNUTLS_CFLAGS) $(libconfig_CFLAGS) ++ subdir = libntfs ++ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \ ++--- a/ntfsprogs/Makefile.am +++++ b/ntfsprogs/Makefile.am ++@@ -125,8 +125,8 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS) ++ if ENABLE_CRYPTO ++ ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h ++ ntfsdecrypt_LDADD = $(AM_LIBS) ++-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` ++-ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` +++ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS) +++ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) ++ endif ++ ++ # Extra targets ++--- a/ntfsprogs/Makefile.in +++++ b/ntfsprogs/Makefile.in ++@@ -449,8 +449,8 @@ ntfsdump_logfile_LDADD = $(AM_LIBS) ++ ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS) ++ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h ++ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS) ++-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` ++-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` +++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS) +++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) ++ all: all-am ++ ++ .SUFFIXES: +diff --git a/feeds/packages/utils/ntfsprogs/patches/001-autoconf_fixes.patch b/feeds/packages/utils/ntfsprogs/patches/001-autoconf_fixes.patch +new file mode 100644 +index 0000000..0055159 +--- /dev/null ++++ b/feeds/packages/utils/ntfsprogs/patches/001-autoconf_fixes.patch +@@ -0,0 +1,52 @@ ++--- a/libntfs/Makefile.am +++++ b/libntfs/Makefile.am ++@@ -38,8 +38,8 @@ libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \ ++ -DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\" ++ ++ if ENABLE_CRYPTO ++-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig` ++-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig` +++libntfs_la_LDFLAGS += $(GNUTLS_LIBS) $(libconfig_LIBS) +++libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(libconfig_CFLAGS) ++ endif ++ ++ libntfs_la_SOURCES = \ ++--- a/libntfs/Makefile.in +++++ b/libntfs/Makefile.in ++@@ -61,8 +61,8 @@ POST_UNINSTALL = : ++ build_triplet = @build@ ++ host_triplet = @host@ ++ target_triplet = @target@ ++-@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig` ++-@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig` +++@ENABLE_CRYPTO_TRUE@am__append_1 = $(GNUTLS_LIBS) $(libconfig_LIBS) +++@ENABLE_CRYPTO_TRUE@am__append_2 = $(GNUTLS_CFLAGS) $(libconfig_CFLAGS) ++ subdir = libntfs ++ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \ ++--- a/ntfsprogs/Makefile.am +++++ b/ntfsprogs/Makefile.am ++@@ -125,8 +125,8 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS) ++ if ENABLE_CRYPTO ++ ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h ++ ntfsdecrypt_LDADD = $(AM_LIBS) ++-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` ++-ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` +++ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS) +++ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) ++ endif ++ ++ # Extra targets ++--- a/ntfsprogs/Makefile.in +++++ b/ntfsprogs/Makefile.in ++@@ -449,8 +449,8 @@ ntfsdump_logfile_LDADD = $(AM_LIBS) ++ ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS) ++ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h ++ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS) ++-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` ++-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` +++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS) +++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) ++ all: all-am ++ ++ .SUFFIXES: +diff --git a/feeds/packages/utils/nut/.svn/entries b/feeds/packages/utils/nut/.svn/entries +new file mode 100644 +index 0000000..023e1f8 +--- /dev/null ++++ b/feeds/packages/utils/nut/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/nut ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:43:49.709578Z ++35391 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++58371eae42e4aaa7bce5ecf709ced508 ++2013-01-29T18:43:49.709578Z ++35391 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10366 ++ +diff --git a/feeds/packages/utils/nut/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/nut/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4a5a1f2 +--- /dev/null ++++ b/feeds/packages/utils/nut/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,302 @@ ++# ++# Copyright © 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:=nut ++PKG_VERSION:=2.6.5 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.6/ ++PKG_MD5SUM:=e6eac4fa04baff0d0a827d64efe81a7e ++ ++PKG_BUILD_DEPENDS:=libusb-compat libnetsnmp ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_BUILD_PARALLEL:=1 ++ ++define Package/nut/Default ++ URL:=http://www.networkupstools.org/ ++ TITLE:= Network UPS Tools ++ DEPENDS:=@USB_SUPPORT +libnetsnmp +libpthread ++ SECTION:=utils ++ CATEGORY:=Utilities ++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) ++ MENU:=1 ++# TITLE+= (common) ++endef ++ ++define Package/nut-server ++$(call Package/nut/Default) ++ TITLE+= (server) ++ DEPENDS+= nut ++endef ++ ++define Package/nut-client ++$(call Package/nut/Default) ++ TITLE+= (client) ++ DEPENDS+= nut ++endef ++ ++define Package/nut-logger ++$(call Package/nut/Default) ++ TITLE+= (logger) ++ DEPENDS+= nut ++endef ++ ++define Package/nut-monitor ++$(call Package/nut/Default) ++ TITLE+= (monitor) ++ DEPENDS+= nut ++endef ++ ++define Package/nut/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/etc/nut ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupsclient.so* $(1)/usr/lib/ ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/nut.conf.sample $(1)/etc/nut/nut.conf ++ ln -sf /var/run/ups.conf $(1)/etc/nut/ups.conf ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib ++endef ++ ++define Package/nut/conffiles ++/etc/nut/nut.conf ++endef ++ ++define Package/nut-client/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upsc $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upsrw $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upscmd $(1)/usr/bin ++endef ++ ++define Package/nut-server/install ++ $(INSTALL_DIR) $(1)/etc/nut ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/lib/nut ++ $(INSTALL_DIR) $(1)/usr/share/nut ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ups.init $(1)/etc/init.d/ups ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsd $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/nut/upsdrvctl $(1)/lib/nut ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.conf.sample $(1)/etc/nut/upsd.conf ++ ln -sf /var/run/upsd.users $(1)/etc/nut/upsd.users ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nut/cmdvartab $(1)/usr/share/nut/cmdvartab ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nut/driver.list $(1)/usr/share/nut/driver.list ++endef ++ ++define Package/nut-server/conffiles ++/etc/nut/upsd.conf ++endef ++ ++define Package/nut-logger/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upslog $(1)/usr/bin ++endef ++ ++define Package/nut-monitor/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/nut ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/upsmon.init $(1)/etc/init.d/upsmon ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsmon $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upssched $(1)/usr/sbin ++ ln -sf /var/run/upsmon.conf $(1)/etc/nut/upsmon.conf ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upssched.conf.sample $(1)/etc/nut/upssched.conf ++endef ++ ++define Package/nut-monitor/conffiles ++/etc/nut/upssched.conf ++endef ++ ++define DriverPackage ++ define Package/nut-driver-$(1) ++ $(call Package/nut/Default) ++ TITLE += ($(1) driver) ++ DEPENDS += nut nut-server ++ ifeq ($(1),$(filter $(1),$(USB_LIBUSB_DRIVERLIST))) ++ DEPENDS+=libusb-compat ++ endif ++ ifeq ($(1),$(filter $(1),$(SNMP_DRIVERLIST))) ++ DEPENDS+=libnetsnmp ++ endif ++ endef ++ # Deliberately empty (well, some spaces) 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-$(1)/description ++ ++ endef ++ define Package/nut-driver-$(1)/install ++ $(INSTALL_DIR) $$(1)/lib/nut/ ++ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/lib/nut/$(1) $$(1)/lib/nut/ ++ ifeq ($(1),clone) ++ # Bundle clone and clone-outlet together ++ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/lib/nut/$(1)-outlet $$(1)/lib/nut/ ++ endif ++ 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 = 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 ++SNMP_DRIVERLIST = snmp-ups ++USB_LIBUSB_DRIVERLIST = usbhid-ups bcmxcp_usb tripplite_usb \ ++ blazer_usb richcomm_usb ++# END: DO NOT EDIT! ++ ++NUT_DRIVERS := $(filter-out skel clone-outlet,$(SERIAL_DRIVERLIST)) \ ++ $(USB_LIBUSB_DRIVERLIST) $(SNMP_DRIVERLIST) ++ ++$(foreach d,$(NUT_DRIVERS),$(eval $(call DriverPackage,$(d)))) ++ ++define DriverDescription ++ define Package/nut-driver-$(1)/description ++ $(2) ++ endef ++endef ++ ++$(eval $(call DriverDescription,apcsmart,\ ++ Driver for American Power Conversion Smart Protocol UPS equipment)) ++$(eval $(call DriverDescription,apcsmart-old,\ ++ Driver for American Power Conversion Smart Protocol UPS equipment)) ++$(eval $(call DriverDescription,bcmxcp,\ ++ Driver for UPSes supporting the serial BCM/XCP protocol)) ++$(eval $(call DriverDescription,bcmxcp_usb,\ ++ Experimental driver for UPSes supporting the BCM/XCP protocol over USB)) ++$(eval $(call DriverDescription,belkin,\ ++ Driver for Belkin serial UPS equipment)) ++$(eval $(call DriverDescription,belkinunv,\ ++ Driver for Belkin "Universal UPS" and compatible)) ++$(eval $(call DriverDescription,bestfcom,\ ++ Driver for Best Power Fortress/Ferrups)) ++$(eval $(call DriverDescription,bestfortress,\ ++ Driver for old Best Fortress UPS equipment)) ++$(eval $(call DriverDescription,bestuferrups,\ ++ Driver for Best Power Micro-Ferrups)) ++$(eval $(call DriverDescription,bestups,\ ++ Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment)) ++$(eval $(call DriverDescription,blazer_ser,\ ++ Driver for Megatec/Q1 protocol serial)) ++$(eval $(call DriverDescription,blazer_usb,\ ++ Driver for Megatec/Q1 protocol USB)) ++$(eval $(call DriverDescription,clone,\ ++ UPS driver clone)) ++$(eval $(call DriverDescription,dummy-ups,\ ++ Driver for multi-purpose UPS emulation)) ++$(eval $(call DriverDescription,etapro,\ ++ Driver for ETA UPS equipment)) ++$(eval $(call DriverDescription,everups,\ ++ Driver for Ever UPS models)) ++$(eval $(call DriverDescription,gamatronic,\ ++ Driver for Gamatronic UPS equipment)) ++$(eval $(call DriverDescription,genericups,\ ++ Driver for contact-closure UPS equipment)) ++$(eval $(call DriverDescription,isbmex,\ ++ Driver for ISBMEX UPS equipment)) ++$(eval $(call DriverDescription,ivtscd,\ ++ driver for the IVT Solar Controller Device)) ++$(eval $(call DriverDescription,liebert,\ ++ Driver for Liebert contact-closure UPS equipment)) ++$(eval $(call DriverDescription,liebert-esp2,\ ++ Driver for Liebert UPS using the ESP-II protocol)) ++$(eval $(call DriverDescription,masterguard,\ ++ Driver for Masterguard UPS equipment)) ++$(eval $(call DriverDescription,metasys,\ ++ Driver for Meta System UPS equipment)) ++$(eval $(call DriverDescription,mge-shut,\ ++ Driver for SHUT Protocol UPS equipment)) ++$(eval $(call DriverDescription,mge-utalk,\ ++ Driver for MGE UPS SYSTEMS UTalk protocol equipment)) ++$(eval $(call DriverDescription,microdowell,\ ++ Driver for Microdowell Enterprise UPS series)) ++$(eval $(call DriverDescription,oldmge-shut,\ ++ Driver for SHUT Protocol UPS equipment)) ++$(eval $(call DriverDescription,oneac,\ ++ Driver for Oneac UPS equipment)) ++$(eval $(call DriverDescription,optiups,\ ++ Driver for Opti-UPS (Viewsonice) UPS and Zinto D (ONLINE-USV) equipment)) ++$(eval $(call DriverDescription,powercom,\ ++ UPS driver for Powercom/Trust/Advice UPS equipment)) ++$(eval $(call DriverDescription,powerpanel,\ ++ Driver for PowerPanel Plus compatible UPS equipment)) ++$(eval $(call DriverDescription,rhino,\ ++ Driver for Brazilian Microsol RHINO UPS equipment)) ++$(eval $(call DriverDescription,richcomm_usb,\ ++ Driver UPS equipment using Richcomm dry-contact to USB solution)) ++$(eval $(call DriverDescription,safenet,\ ++ Driver for SafeNet compatible UPS equipment)) ++$(eval $(call DriverDescription,solis,\ ++ Driver for Brazilian Microsol SOLIS UPS equipment)) ++$(eval $(call DriverDescription,tripplite,\ ++ Driver for Tripp-Lite SmartPro UPS equipment)) ++$(eval $(call DriverDescription,tripplitesu,\ ++ Driver for Tripp-Lite SmartOnline (SU) UPS equipment)) ++$(eval $(call DriverDescription,tripplite_usb,\ ++ Driver for older Tripp Lite USB UPSes (not PDC HID))) ++$(eval $(call DriverDescription,upscode2,\ ++ Driver for UPScode II compatible UPS equipment)) ++$(eval $(call DriverDescription,usbhid-ups,\ ++ Driver for USB/HID UPS equipment)) ++$(eval $(call DriverDescription,victronups,\ ++ Driver for IMV/Victron UPS unit Match, Match Lite, NetUps)) ++$(eval $(call DriverDescription,snmp-ups,\ ++ Multi-MIB Driver for SNMP UPS equipment)) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_ARGS += \ ++ --without-ssl \ ++ --with-pidpath=/var/run \ ++ --with-statepath=/var/run \ ++ --with-altpidpath=/var/run \ ++ --sysconfdir=/etc/nut \ ++ --with-drvpath=/lib/nut \ ++ --datadir=/usr/share/nut \ ++ --with-user=root \ ++ --with-group=root \ ++ --with-usb \ ++ --with-snmp \ ++ --without-libltdl \ ++ --with-dev ++ ++ ++$(eval $(call BuildPackage,nut)) ++$(eval $(call BuildPackage,nut-client)) ++$(eval $(call BuildPackage,nut-server)) ++$(eval $(call BuildPackage,nut-monitor)) ++$(eval $(call BuildPackage,nut-logger)) ++$(foreach d,$(NUT_DRIVERS),$(eval $(call BuildPackage,nut-driver-$(d)))) +diff --git a/feeds/packages/utils/nut/Makefile b/feeds/packages/utils/nut/Makefile +new file mode 100644 +index 0000000..4a5a1f2 +--- /dev/null ++++ b/feeds/packages/utils/nut/Makefile +@@ -0,0 +1,302 @@ ++# ++# Copyright © 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:=nut ++PKG_VERSION:=2.6.5 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.6/ ++PKG_MD5SUM:=e6eac4fa04baff0d0a827d64efe81a7e ++ ++PKG_BUILD_DEPENDS:=libusb-compat libnetsnmp ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++PKG_BUILD_PARALLEL:=1 ++ ++define Package/nut/Default ++ URL:=http://www.networkupstools.org/ ++ TITLE:= Network UPS Tools ++ DEPENDS:=@USB_SUPPORT +libnetsnmp +libpthread ++ SECTION:=utils ++ CATEGORY:=Utilities ++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) ++ MENU:=1 ++# TITLE+= (common) ++endef ++ ++define Package/nut-server ++$(call Package/nut/Default) ++ TITLE+= (server) ++ DEPENDS+= nut ++endef ++ ++define Package/nut-client ++$(call Package/nut/Default) ++ TITLE+= (client) ++ DEPENDS+= nut ++endef ++ ++define Package/nut-logger ++$(call Package/nut/Default) ++ TITLE+= (logger) ++ DEPENDS+= nut ++endef ++ ++define Package/nut-monitor ++$(call Package/nut/Default) ++ TITLE+= (monitor) ++ DEPENDS+= nut ++endef ++ ++define Package/nut/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_DIR) $(1)/etc/nut ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupsclient.so* $(1)/usr/lib/ ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/nut.conf.sample $(1)/etc/nut/nut.conf ++ ln -sf /var/run/ups.conf $(1)/etc/nut/ups.conf ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib ++endef ++ ++define Package/nut/conffiles ++/etc/nut/nut.conf ++endef ++ ++define Package/nut-client/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upsc $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upsrw $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upscmd $(1)/usr/bin ++endef ++ ++define Package/nut-server/install ++ $(INSTALL_DIR) $(1)/etc/nut ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/lib/nut ++ $(INSTALL_DIR) $(1)/usr/share/nut ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/ups.init $(1)/etc/init.d/ups ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsd $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/nut/upsdrvctl $(1)/lib/nut ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.conf.sample $(1)/etc/nut/upsd.conf ++ ln -sf /var/run/upsd.users $(1)/etc/nut/upsd.users ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nut/cmdvartab $(1)/usr/share/nut/cmdvartab ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nut/driver.list $(1)/usr/share/nut/driver.list ++endef ++ ++define Package/nut-server/conffiles ++/etc/nut/upsd.conf ++endef ++ ++define Package/nut-logger/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upslog $(1)/usr/bin ++endef ++ ++define Package/nut-monitor/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/etc/nut ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/upsmon.init $(1)/etc/init.d/upsmon ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsmon $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upssched $(1)/usr/sbin ++ ln -sf /var/run/upsmon.conf $(1)/etc/nut/upsmon.conf ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upssched.conf.sample $(1)/etc/nut/upssched.conf ++endef ++ ++define Package/nut-monitor/conffiles ++/etc/nut/upssched.conf ++endef ++ ++define DriverPackage ++ define Package/nut-driver-$(1) ++ $(call Package/nut/Default) ++ TITLE += ($(1) driver) ++ DEPENDS += nut nut-server ++ ifeq ($(1),$(filter $(1),$(USB_LIBUSB_DRIVERLIST))) ++ DEPENDS+=libusb-compat ++ endif ++ ifeq ($(1),$(filter $(1),$(SNMP_DRIVERLIST))) ++ DEPENDS+=libnetsnmp ++ endif ++ endef ++ # Deliberately empty (well, some spaces) 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-$(1)/description ++ ++ endef ++ define Package/nut-driver-$(1)/install ++ $(INSTALL_DIR) $$(1)/lib/nut/ ++ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/lib/nut/$(1) $$(1)/lib/nut/ ++ ifeq ($(1),clone) ++ # Bundle clone and clone-outlet together ++ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/lib/nut/$(1)-outlet $$(1)/lib/nut/ ++ endif ++ 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 = 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 ++SNMP_DRIVERLIST = snmp-ups ++USB_LIBUSB_DRIVERLIST = usbhid-ups bcmxcp_usb tripplite_usb \ ++ blazer_usb richcomm_usb ++# END: DO NOT EDIT! ++ ++NUT_DRIVERS := $(filter-out skel clone-outlet,$(SERIAL_DRIVERLIST)) \ ++ $(USB_LIBUSB_DRIVERLIST) $(SNMP_DRIVERLIST) ++ ++$(foreach d,$(NUT_DRIVERS),$(eval $(call DriverPackage,$(d)))) ++ ++define DriverDescription ++ define Package/nut-driver-$(1)/description ++ $(2) ++ endef ++endef ++ ++$(eval $(call DriverDescription,apcsmart,\ ++ Driver for American Power Conversion Smart Protocol UPS equipment)) ++$(eval $(call DriverDescription,apcsmart-old,\ ++ Driver for American Power Conversion Smart Protocol UPS equipment)) ++$(eval $(call DriverDescription,bcmxcp,\ ++ Driver for UPSes supporting the serial BCM/XCP protocol)) ++$(eval $(call DriverDescription,bcmxcp_usb,\ ++ Experimental driver for UPSes supporting the BCM/XCP protocol over USB)) ++$(eval $(call DriverDescription,belkin,\ ++ Driver for Belkin serial UPS equipment)) ++$(eval $(call DriverDescription,belkinunv,\ ++ Driver for Belkin "Universal UPS" and compatible)) ++$(eval $(call DriverDescription,bestfcom,\ ++ Driver for Best Power Fortress/Ferrups)) ++$(eval $(call DriverDescription,bestfortress,\ ++ Driver for old Best Fortress UPS equipment)) ++$(eval $(call DriverDescription,bestuferrups,\ ++ Driver for Best Power Micro-Ferrups)) ++$(eval $(call DriverDescription,bestups,\ ++ Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment)) ++$(eval $(call DriverDescription,blazer_ser,\ ++ Driver for Megatec/Q1 protocol serial)) ++$(eval $(call DriverDescription,blazer_usb,\ ++ Driver for Megatec/Q1 protocol USB)) ++$(eval $(call DriverDescription,clone,\ ++ UPS driver clone)) ++$(eval $(call DriverDescription,dummy-ups,\ ++ Driver for multi-purpose UPS emulation)) ++$(eval $(call DriverDescription,etapro,\ ++ Driver for ETA UPS equipment)) ++$(eval $(call DriverDescription,everups,\ ++ Driver for Ever UPS models)) ++$(eval $(call DriverDescription,gamatronic,\ ++ Driver for Gamatronic UPS equipment)) ++$(eval $(call DriverDescription,genericups,\ ++ Driver for contact-closure UPS equipment)) ++$(eval $(call DriverDescription,isbmex,\ ++ Driver for ISBMEX UPS equipment)) ++$(eval $(call DriverDescription,ivtscd,\ ++ driver for the IVT Solar Controller Device)) ++$(eval $(call DriverDescription,liebert,\ ++ Driver for Liebert contact-closure UPS equipment)) ++$(eval $(call DriverDescription,liebert-esp2,\ ++ Driver for Liebert UPS using the ESP-II protocol)) ++$(eval $(call DriverDescription,masterguard,\ ++ Driver for Masterguard UPS equipment)) ++$(eval $(call DriverDescription,metasys,\ ++ Driver for Meta System UPS equipment)) ++$(eval $(call DriverDescription,mge-shut,\ ++ Driver for SHUT Protocol UPS equipment)) ++$(eval $(call DriverDescription,mge-utalk,\ ++ Driver for MGE UPS SYSTEMS UTalk protocol equipment)) ++$(eval $(call DriverDescription,microdowell,\ ++ Driver for Microdowell Enterprise UPS series)) ++$(eval $(call DriverDescription,oldmge-shut,\ ++ Driver for SHUT Protocol UPS equipment)) ++$(eval $(call DriverDescription,oneac,\ ++ Driver for Oneac UPS equipment)) ++$(eval $(call DriverDescription,optiups,\ ++ Driver for Opti-UPS (Viewsonice) UPS and Zinto D (ONLINE-USV) equipment)) ++$(eval $(call DriverDescription,powercom,\ ++ UPS driver for Powercom/Trust/Advice UPS equipment)) ++$(eval $(call DriverDescription,powerpanel,\ ++ Driver for PowerPanel Plus compatible UPS equipment)) ++$(eval $(call DriverDescription,rhino,\ ++ Driver for Brazilian Microsol RHINO UPS equipment)) ++$(eval $(call DriverDescription,richcomm_usb,\ ++ Driver UPS equipment using Richcomm dry-contact to USB solution)) ++$(eval $(call DriverDescription,safenet,\ ++ Driver for SafeNet compatible UPS equipment)) ++$(eval $(call DriverDescription,solis,\ ++ Driver for Brazilian Microsol SOLIS UPS equipment)) ++$(eval $(call DriverDescription,tripplite,\ ++ Driver for Tripp-Lite SmartPro UPS equipment)) ++$(eval $(call DriverDescription,tripplitesu,\ ++ Driver for Tripp-Lite SmartOnline (SU) UPS equipment)) ++$(eval $(call DriverDescription,tripplite_usb,\ ++ Driver for older Tripp Lite USB UPSes (not PDC HID))) ++$(eval $(call DriverDescription,upscode2,\ ++ Driver for UPScode II compatible UPS equipment)) ++$(eval $(call DriverDescription,usbhid-ups,\ ++ Driver for USB/HID UPS equipment)) ++$(eval $(call DriverDescription,victronups,\ ++ Driver for IMV/Victron UPS unit Match, Match Lite, NetUps)) ++$(eval $(call DriverDescription,snmp-ups,\ ++ Multi-MIB Driver for SNMP UPS equipment)) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++CONFIGURE_ARGS += \ ++ --without-ssl \ ++ --with-pidpath=/var/run \ ++ --with-statepath=/var/run \ ++ --with-altpidpath=/var/run \ ++ --sysconfdir=/etc/nut \ ++ --with-drvpath=/lib/nut \ ++ --datadir=/usr/share/nut \ ++ --with-user=root \ ++ --with-group=root \ ++ --with-usb \ ++ --with-snmp \ ++ --without-libltdl \ ++ --with-dev ++ ++ ++$(eval $(call BuildPackage,nut)) ++$(eval $(call BuildPackage,nut-client)) ++$(eval $(call BuildPackage,nut-server)) ++$(eval $(call BuildPackage,nut-monitor)) ++$(eval $(call BuildPackage,nut-logger)) ++$(foreach d,$(NUT_DRIVERS),$(eval $(call BuildPackage,nut-driver-$(d)))) +diff --git a/feeds/packages/utils/nut/files/.svn/entries b/feeds/packages/utils/nut/files/.svn/entries +new file mode 100644 +index 0000000..c9bb08d +--- /dev/null ++++ b/feeds/packages/utils/nut/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/nut/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-21T18:25:32.474130Z ++34828 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++upsmon.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++72277141dc59d0afcb57ddedcf34a2f2 ++2012-12-21T18:25:32.474130Z ++34828 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4450 ++ ++ups.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++89ec1bf49da72f31e547d00e5c466805 ++2012-12-21T18:25:32.474130Z ++34828 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1704 ++ +diff --git a/feeds/packages/utils/nut/files/.svn/prop-base/ups.init.svn-base b/feeds/packages/utils/nut/files/.svn/prop-base/ups.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/nut/files/.svn/prop-base/ups.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/nut/files/.svn/prop-base/upsmon.init.svn-base b/feeds/packages/utils/nut/files/.svn/prop-base/upsmon.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/nut/files/.svn/prop-base/upsmon.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/nut/files/.svn/text-base/ups.init.svn-base b/feeds/packages/utils/nut/files/.svn/text-base/ups.init.svn-base +new file mode 100644 +index 0000000..90410a3 +--- /dev/null ++++ b/feeds/packages/utils/nut/files/.svn/text-base/ups.init.svn-base +@@ -0,0 +1,87 @@ ++#!/bin/sh /etc/rc.common ++# Copyright © 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++START=50 ++ ++DEFAULT=/etc/default/nut ++RUN_D=/var/run ++PID_F=$RUN_D/upsd.pid ++UPS_C=$RUN_D/ups.conf ++USERS_C=$RUN_D/upsd.users ++ ++nut_user_add() { ++ local cfg="$1" ++ local a ++ local val ++ ++ config_get val "$cfg" username "$1" ++ echo "[$val]" >> $USERS_C ++ ++ config_get val "$cfg" password ++ echo " password = $val" >> $USERS_C ++ ++ config_get val "$cfg" actions ++ for a in $val; do ++ echo " actions = $a" >> $USERS_C ++ done ++ ++ config_get val "$cfg" instcmds ++ for a in $val; do ++ echo " instcmds = $a" >> $USERS_C ++ done ++ ++ config_get val "$cfg" upsmon ++ if [ -n "$val" ]; then ++ echo " upsmon $val" >> $USERS_C ++ fi ++} ++ ++start() { ++ local in_driver have_drivers ++ config_cb() { ++ if [ "$1" != "driver" ]; then ++ in_driver= ++ else ++ echo "[$2]" >> $UPS_C ++ in_driver=true ++ have_drivers=true ++ fi ++ } ++ option_cb() { ++ if [ "$in_driver" = "true" ]; then ++ echo " $1 = $2" >> $UPS_C ++ fi ++ } ++ ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ echo "# Config file automatically generated from UCI config" > $UPS_C ++ echo "# Config file automatically generated from UCI config" > $USERS_C ++ ++ config_load ups ++ ++ config_foreach nut_user_add user ++ ++ [ -f $DEFAULT ] && . $DEFAULT ++ if [ "$have_drivers" = "true" ]; then ++ $DEBUG /usr/sbin/upsd $OPTIONS ++ $DEBUG /lib/nut/upsdrvctl start ++ fi ++} ++ ++nut_driver_stop() { ++ local cfg="$1" ++ local driver ++ ++ config_get driver "$cfg" driver ++ ++ [ -r /var/run/$driver-$cfg ] && /lib/nut/upsdrvctl stop $cfg ++} ++ ++stop() { ++ [ -r $PID_F ] && /usr/sbin/upsd -c stop ++ config_load ups ++ config_foreach nut_driver_stop driver ++} +diff --git a/feeds/packages/utils/nut/files/.svn/text-base/upsmon.init.svn-base b/feeds/packages/utils/nut/files/.svn/text-base/upsmon.init.svn-base +new file mode 100644 +index 0000000..8d6c09e +--- /dev/null ++++ b/feeds/packages/utils/nut/files/.svn/text-base/upsmon.init.svn-base +@@ -0,0 +1,144 @@ ++#!/bin/sh /etc/rc.common ++# Copyright © 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++START=51 ++ ++DEFAULT=/etc/default/nut ++RUN_D=/var/run ++PID_F=$RUN_D/upsmon.pid ++UPSMON_C=$RUN_D/upsmon.conf ++ ++nut_upsmon_conf() { ++ local cfg="$1" ++ ++ echo "# Config file automatically generated from UCI config" > $UPSMON_C ++ ++ config_get val "$cfg" runas ++ [ -n "$val" ] && echo "RUN_AS_USER $val" >> $PSMON_C ++ ++ config_get val "$cfg" minsupplies 1 ++ echo "MINSUPPLIES $val" >> $UPSMON_C ++ ++ config_get val "$cfg" shutdowncmd "/sbin/halt" ++ echo "SHUTDOWNCMD \"$val\"" >> $UPSMON_C ++ ++ config_get val "$cfg" notifycmd ++ [ -n "$val" ] && echo "NOTIFYCMD \"$val\"" >> $UPSMON_C ++ ++ config_get val "$cfg" pollfreq 5 ++ echo "POLLFREQ $val" >> $UPSMON_C ++ ++ config_get val "$cfg" pollfreqalert 5 ++ echo "POLLFREQALERT $val" >> $UPSMON_C ++ ++ config_get val "$cfg" hostsync 15 ++ echo "HOSTSYNC $val" >> $UPSMON_C ++ ++ config_get val "$cfg" deadtime 15 ++ echo "DEADTIME $val" >> $UPSMON_C ++ ++ config_get val "$cfg" powerdownflag /var/run/killpower ++ echo "POWERDOWNFLAG $val" >> $UPSMON_C ++ ++ config_get val "$cfg" onlinemsg ++ [ -n "$val" ] && echo "NOTIFYMSG ONLINE \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" onbattmsg ++ [ -n "$val" ] && echo "NOTIFYMSG ONBATT \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" lowbattmsg ++ [ -n "$val" ] && echo "NOTIFYMSG LOWBATT \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" fsdmsg ++ [ -n "$val" ] && echo "NOTIFYMSG FSD \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" commokmsg ++ [ -n "$val" ] && echo "NOTIFYMSG COMMOK \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" commbadmsg ++ [ -n "$val" ] && echo "NOTIFYMSG COMMBAD \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" shutdownmsg ++ [ -n "$val" ] && echo "NOTIFYMSG SHUTDOWN \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" replbattmsg ++ [ -n "$val" ] && echo "NOTIFYMSG REPLBATT \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" nocommmsg ++ [ -n "$val" ] && echo "NOTIFYMSG NOCOMM \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" noparentmsg ++ [ -n "$val" ] && echo "NOTIFYMSG NOPARENT \"$val\"" >> $UPSMON_C ++ ++ local default ++ config_get default "$cfg" defaultnotify SYSLOG ++ config_get val "$cfg" onlinenotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG ONLINE $val" >> $UPSMON_C ++ config_get val "$cfg" onbattnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG ONBATT $val" >> $UPSMON_C ++ config_get val "$cfg" lowbattnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG LOWBATT $val" >> $UPSMON_C ++ config_get val "$cfg" fsdnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG FSD $val" >> $UPSMON_C ++ config_get val "$cfg" commoknotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG COMMOK $val" >> $UPSMON_C ++ config_get val "$cfg" commbadnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG COMMBAD $val" >> $UPSMON_C ++ config_get val "$cfg" shutdownnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG SHUTDOWN $val" >> $UPSMON_C ++ config_get val "$cfg" replbattnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG REPLBATT $val" >> $UPSMON_C ++ config_get val "$cfg" nocommnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG NOCOMM $val" >> $UPSMON_C ++ config_get val "$cfg" noparentnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG NOPARENT $val" >> $UPSMON_C ++ ++ config_get val "$cfg" rbwarntime 43200 ++ echo "RBWARNTIME $val" >> $UPSMON_C ++ ++ config_get val "$cfg" nocommwarntime 300 ++ echo "NOCOMMWARNTIME $val" >> $UPSMON_C ++ ++ config_get val "$cfg" finaldelay 5 ++ echo "FINALDELAY $val" >> $UPSMON_C ++} ++ ++nut_upsmon_add() { ++ local cfg="$1" ++ local type="$2" ++ local upsname ++ local hostname ++ local port ++ local powervalue ++ local user ++ local pass ++ local system ++ ++ # If no core config, use defaults ++ [ -r $UPSMON_C ] || nut_upsmon_conf "" ++ ++ config_get upsname "$cfg" upsname ++ config_get hostname "$cfg" hostname localhost ++ config_get port "$cfg" port ++ config_get powervalue "$cfg" powervalue 1 ++ config_get user "$cfg" user ++ config_get pass "$cfg" password ++ system="$upsname@$hostname" ++ if [ -n "$port" ]; then ++ system="$system:$port"; ++ fi ++ echo "MONITOR $system $powervalue $user $pass $type" >> $UPSMON_C ++} ++ ++start() { ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ rm -f $UPSMON_C ++ ++ config_load upsmon ++ ++ config_foreach nut_upsmon_conf upsmon ++ config_foreach nut_upsmon_add master master ++ config_foreach nut_upsmon_add slave slave ++ ++ [ -f $DEFAULT ] && . $DEFAULT ++ $DEBUG /usr/sbin/upsmon $UPSMON_OPTIONS ++} ++ ++stop() { ++ [ -r $PID_F ] && /usr/sbin/upsmon -c stop ++ rm -f $UPSMON_C ++} +diff --git a/feeds/packages/utils/nut/files/ups.init b/feeds/packages/utils/nut/files/ups.init +new file mode 100755 +index 0000000..90410a3 +--- /dev/null ++++ b/feeds/packages/utils/nut/files/ups.init +@@ -0,0 +1,87 @@ ++#!/bin/sh /etc/rc.common ++# Copyright © 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++START=50 ++ ++DEFAULT=/etc/default/nut ++RUN_D=/var/run ++PID_F=$RUN_D/upsd.pid ++UPS_C=$RUN_D/ups.conf ++USERS_C=$RUN_D/upsd.users ++ ++nut_user_add() { ++ local cfg="$1" ++ local a ++ local val ++ ++ config_get val "$cfg" username "$1" ++ echo "[$val]" >> $USERS_C ++ ++ config_get val "$cfg" password ++ echo " password = $val" >> $USERS_C ++ ++ config_get val "$cfg" actions ++ for a in $val; do ++ echo " actions = $a" >> $USERS_C ++ done ++ ++ config_get val "$cfg" instcmds ++ for a in $val; do ++ echo " instcmds = $a" >> $USERS_C ++ done ++ ++ config_get val "$cfg" upsmon ++ if [ -n "$val" ]; then ++ echo " upsmon $val" >> $USERS_C ++ fi ++} ++ ++start() { ++ local in_driver have_drivers ++ config_cb() { ++ if [ "$1" != "driver" ]; then ++ in_driver= ++ else ++ echo "[$2]" >> $UPS_C ++ in_driver=true ++ have_drivers=true ++ fi ++ } ++ option_cb() { ++ if [ "$in_driver" = "true" ]; then ++ echo " $1 = $2" >> $UPS_C ++ fi ++ } ++ ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ echo "# Config file automatically generated from UCI config" > $UPS_C ++ echo "# Config file automatically generated from UCI config" > $USERS_C ++ ++ config_load ups ++ ++ config_foreach nut_user_add user ++ ++ [ -f $DEFAULT ] && . $DEFAULT ++ if [ "$have_drivers" = "true" ]; then ++ $DEBUG /usr/sbin/upsd $OPTIONS ++ $DEBUG /lib/nut/upsdrvctl start ++ fi ++} ++ ++nut_driver_stop() { ++ local cfg="$1" ++ local driver ++ ++ config_get driver "$cfg" driver ++ ++ [ -r /var/run/$driver-$cfg ] && /lib/nut/upsdrvctl stop $cfg ++} ++ ++stop() { ++ [ -r $PID_F ] && /usr/sbin/upsd -c stop ++ config_load ups ++ config_foreach nut_driver_stop driver ++} +diff --git a/feeds/packages/utils/nut/files/upsmon.init b/feeds/packages/utils/nut/files/upsmon.init +new file mode 100755 +index 0000000..8d6c09e +--- /dev/null ++++ b/feeds/packages/utils/nut/files/upsmon.init +@@ -0,0 +1,144 @@ ++#!/bin/sh /etc/rc.common ++# Copyright © 2012 OpenWrt.org ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++START=51 ++ ++DEFAULT=/etc/default/nut ++RUN_D=/var/run ++PID_F=$RUN_D/upsmon.pid ++UPSMON_C=$RUN_D/upsmon.conf ++ ++nut_upsmon_conf() { ++ local cfg="$1" ++ ++ echo "# Config file automatically generated from UCI config" > $UPSMON_C ++ ++ config_get val "$cfg" runas ++ [ -n "$val" ] && echo "RUN_AS_USER $val" >> $PSMON_C ++ ++ config_get val "$cfg" minsupplies 1 ++ echo "MINSUPPLIES $val" >> $UPSMON_C ++ ++ config_get val "$cfg" shutdowncmd "/sbin/halt" ++ echo "SHUTDOWNCMD \"$val\"" >> $UPSMON_C ++ ++ config_get val "$cfg" notifycmd ++ [ -n "$val" ] && echo "NOTIFYCMD \"$val\"" >> $UPSMON_C ++ ++ config_get val "$cfg" pollfreq 5 ++ echo "POLLFREQ $val" >> $UPSMON_C ++ ++ config_get val "$cfg" pollfreqalert 5 ++ echo "POLLFREQALERT $val" >> $UPSMON_C ++ ++ config_get val "$cfg" hostsync 15 ++ echo "HOSTSYNC $val" >> $UPSMON_C ++ ++ config_get val "$cfg" deadtime 15 ++ echo "DEADTIME $val" >> $UPSMON_C ++ ++ config_get val "$cfg" powerdownflag /var/run/killpower ++ echo "POWERDOWNFLAG $val" >> $UPSMON_C ++ ++ config_get val "$cfg" onlinemsg ++ [ -n "$val" ] && echo "NOTIFYMSG ONLINE \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" onbattmsg ++ [ -n "$val" ] && echo "NOTIFYMSG ONBATT \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" lowbattmsg ++ [ -n "$val" ] && echo "NOTIFYMSG LOWBATT \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" fsdmsg ++ [ -n "$val" ] && echo "NOTIFYMSG FSD \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" commokmsg ++ [ -n "$val" ] && echo "NOTIFYMSG COMMOK \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" commbadmsg ++ [ -n "$val" ] && echo "NOTIFYMSG COMMBAD \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" shutdownmsg ++ [ -n "$val" ] && echo "NOTIFYMSG SHUTDOWN \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" replbattmsg ++ [ -n "$val" ] && echo "NOTIFYMSG REPLBATT \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" nocommmsg ++ [ -n "$val" ] && echo "NOTIFYMSG NOCOMM \"$val\"" >> $UPSMON_C ++ config_get val "$cfg" noparentmsg ++ [ -n "$val" ] && echo "NOTIFYMSG NOPARENT \"$val\"" >> $UPSMON_C ++ ++ local default ++ config_get default "$cfg" defaultnotify SYSLOG ++ config_get val "$cfg" onlinenotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG ONLINE $val" >> $UPSMON_C ++ config_get val "$cfg" onbattnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG ONBATT $val" >> $UPSMON_C ++ config_get val "$cfg" lowbattnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG LOWBATT $val" >> $UPSMON_C ++ config_get val "$cfg" fsdnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG FSD $val" >> $UPSMON_C ++ config_get val "$cfg" commoknotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG COMMOK $val" >> $UPSMON_C ++ config_get val "$cfg" commbadnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG COMMBAD $val" >> $UPSMON_C ++ config_get val "$cfg" shutdownnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG SHUTDOWN $val" >> $UPSMON_C ++ config_get val "$cfg" replbattnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG REPLBATT $val" >> $UPSMON_C ++ config_get val "$cfg" nocommnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG NOCOMM $val" >> $UPSMON_C ++ config_get val "$cfg" noparentnotify "$default" ++ [ -n "$val" ] && echo "NOTIFYFLAG NOPARENT $val" >> $UPSMON_C ++ ++ config_get val "$cfg" rbwarntime 43200 ++ echo "RBWARNTIME $val" >> $UPSMON_C ++ ++ config_get val "$cfg" nocommwarntime 300 ++ echo "NOCOMMWARNTIME $val" >> $UPSMON_C ++ ++ config_get val "$cfg" finaldelay 5 ++ echo "FINALDELAY $val" >> $UPSMON_C ++} ++ ++nut_upsmon_add() { ++ local cfg="$1" ++ local type="$2" ++ local upsname ++ local hostname ++ local port ++ local powervalue ++ local user ++ local pass ++ local system ++ ++ # If no core config, use defaults ++ [ -r $UPSMON_C ] || nut_upsmon_conf "" ++ ++ config_get upsname "$cfg" upsname ++ config_get hostname "$cfg" hostname localhost ++ config_get port "$cfg" port ++ config_get powervalue "$cfg" powervalue 1 ++ config_get user "$cfg" user ++ config_get pass "$cfg" password ++ system="$upsname@$hostname" ++ if [ -n "$port" ]; then ++ system="$system:$port"; ++ fi ++ echo "MONITOR $system $powervalue $user $pass $type" >> $UPSMON_C ++} ++ ++start() { ++ [ -d $RUN_D ] || mkdir -p $RUN_D ++ rm -f $UPSMON_C ++ ++ config_load upsmon ++ ++ config_foreach nut_upsmon_conf upsmon ++ config_foreach nut_upsmon_add master master ++ config_foreach nut_upsmon_add slave slave ++ ++ [ -f $DEFAULT ] && . $DEFAULT ++ $DEBUG /usr/sbin/upsmon $UPSMON_OPTIONS ++} ++ ++stop() { ++ [ -r $PID_F ] && /usr/sbin/upsmon -c stop ++ rm -f $UPSMON_C ++} +diff --git a/feeds/packages/utils/nut/patches/.svn/entries b/feeds/packages/utils/nut/patches/.svn/entries +new file mode 100644 +index 0000000..ee3a31f +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/nut/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-08T17:06:08.170978Z ++34582 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-fix-missing-libmath-flags.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++0c9e6d4d99aa338e415d41206e671c35 ++2012-12-08T17:06:08.170978Z ++34582 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++457 ++ ++002-minibox-openups-driver.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d8ccbfbb95fab8097756dad907c6c499 ++2012-12-08T17:06:08.170978Z ++34582 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++19254 ++ ++003-openups-backport.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++912563f741a6a2045fa28ce1975b8993 ++2012-12-08T17:06:08.170978Z ++34582 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++950 ++ +diff --git a/feeds/packages/utils/nut/patches/.svn/text-base/001-fix-missing-libmath-flags.patch.svn-base b/feeds/packages/utils/nut/patches/.svn/text-base/001-fix-missing-libmath-flags.patch.svn-base +new file mode 100644 +index 0000000..4f5ea9d +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/.svn/text-base/001-fix-missing-libmath-flags.patch.svn-base +@@ -0,0 +1,11 @@ ++--- nut-2.6.3.orig/drivers/Makefile.am 2011-12-05 16:36:46.000000000 ++0100 +++++ nut-2.6.3/drivers/Makefile.am 2012-04-19 10:51:52.152059206 +0200 ++@@ -165,7 +165,7 @@ ++ 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 +diff --git a/feeds/packages/utils/nut/patches/.svn/text-base/002-minibox-openups-driver.patch.svn-base b/feeds/packages/utils/nut/patches/.svn/text-base/002-minibox-openups-driver.patch.svn-base +new file mode 100644 +index 0000000..0d8e9fe +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/.svn/text-base/002-minibox-openups-driver.patch.svn-base +@@ -0,0 +1,528 @@ ++From f8546df4c18c087eac829d3dfc097c919abb6d1c Mon Sep 17 00:00:00 2001 ++From: aquette ++Date: Wed, 28 Nov 2012 21:44:21 +0000 ++Subject: [PATCH] Official support for Minibox openUPS Intelligent UPS ++ ++Add a new usbhid-ups subdriver to handle Minibox openUPS Intelligent UPS ++(USB ID 0x04d8:0xd004) (patch from Nicu Pavel, Mini-Box.Com) ++ ++git-svn-id: svn://anonscm.debian.org/nut/trunk@3791 72a954d1-e00c-0410-aa02-d9c7bb700a61 ++--- ++ data/driver.list.in | 2 + ++ drivers/Makefile.am | 5 +- ++ drivers/openups-hid.c | 360 +++++++++++++++++++++++++++++++++++++ ++ drivers/openups-hid.h | 38 ++++ ++ drivers/usbhid-ups.c | 5 +- ++ scripts/upower/95-upower-hid.rules | 4 + ++ 6 files changed, 411 insertions(+), 3 deletions(-) ++ create mode 100644 drivers/openups-hid.c ++ create mode 100644 drivers/openups-hid.h ++ ++diff --git a/data/driver.list.in b/data/driver.list.in ++index 11014d6..70b5e0f 100644 ++--- a/data/driver.list.in +++++ b/data/driver.list.in ++@@ -645,6 +645,8 @@ ++ "Microsol" "ups" "5" "Rhino 10.0" "10000VA" "rhino" ++ "Microsol" "ups" "5" "Rhino 20.0" "20000VA" "rhino" ++ +++"Minibox" "ups" "5" "openUPS Intelligent UPS" "USB port" "usbhid-ups" +++ ++ "Mustek" "ups" "2" "Powermust" "400VA Plus" "blazer_ser" ++ "Mustek" "ups" "2" "Powermust" "600VA Plus" "blazer_ser" ++ "Mustek" "ups" "2" "Powermust" "800VA Pro" "blazer_ser" ++diff --git a/drivers/Makefile.am b/drivers/Makefile.am ++index cd900cf..ad30874 100644 ++--- a/drivers/Makefile.am +++++ b/drivers/Makefile.am ++@@ -162,7 +162,8 @@ skel_LDADD = $(LDADD_DRIVERS) ++ ++ # USB ++ USBHID_UPS_SUBDRIVERS = apc-hid.c belkin-hid.c cps-hid.c explore-hid.c \ ++- liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c +++ liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c \ +++ openups-hid.c ++ usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ ++ usb-common.c $(USBHID_UPS_SUBDRIVERS) ++ usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) ++@@ -245,7 +246,7 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h \ ++ powercom.h powerpanel.h powerp-bin.h powerp-txt.h powerware-mib.h raritan-pdu-mib.h \ ++ safenet.h serial.h snmp-ups.h solis.h tripplite.h tripplite-hid.h \ ++ upshandler.h usb-common.h usbhid-ups.h powercom-hid.h compaq-mib.h idowell-hid.h \ ++- apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h +++ apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h openups-hid.h ++ ++ # Define a dummy library so that Automake builds rules for the ++ # corresponding object files. This library is not actually built, ++diff --git a/drivers/openups-hid.c b/drivers/openups-hid.c ++new file mode 100644 ++index 0000000..69a4a61 ++--- /dev/null +++++ b/drivers/openups-hid.c ++@@ -0,0 +1,360 @@ +++/* openups-hid.c - subdriver to monitor Minibox openUPS USB/HID devices with NUT +++ * +++ * Copyright (C) +++ * 2003 - 2012 Arnaud Quette +++ * 2005 - 2006 Peter Selinger +++ * 2008 - 2009 Arjen de Korte +++ * 2012 Nicu Pavel +++ * +++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ */ +++ +++#include "usbhid-ups.h" +++#include "openups-hid.h" +++#include "main.h" /* for getval() */ +++#include "usb-common.h" +++ +++#define OPENUPS_HID_VERSION "openUPS HID 0.1" +++ +++/* Minibox */ +++#define OPENUPS_VENDORID 0x04d8 +++ +++static char openups_scratch_buf[20]; +++ +++/* USB IDs device table */ +++static usb_device_id_t openups_usb_device_table[] = { +++ /* openUPS Intelligent UPS (minimum required firmware 1.4) */ +++ {USB_DEVICE(OPENUPS_VENDORID, 0xd004), NULL}, +++ +++ /* Terminating entry */ +++ {-1, -1, NULL} +++}; +++ +++/* Thermistor table used for temperature lookups +++ * taken from the windows monitoring application +++ */ +++static unsigned int therm_tbl[] = +++{ +++ (unsigned int)0x31, +++ (unsigned int)0x40, +++ (unsigned int)0x53, +++ (unsigned int)0x68, +++ (unsigned int)0x82, +++ (unsigned int)0xA0, +++ (unsigned int)0xC3, +++ (unsigned int)0xE9, +++ (unsigned int)0x113, +++ (unsigned int)0x13F, +++ (unsigned int)0x16E, +++ (unsigned int)0x19F, +++ (unsigned int)0x1CF, +++ (unsigned int)0x200, +++ (unsigned int)0x22F, +++ (unsigned int)0x25C, +++ (unsigned int)0x286, +++ (unsigned int)0x2AE, +++ (unsigned int)0x2D3, +++ (unsigned int)0x2F4, +++ (unsigned int)0x312, +++ (unsigned int)0x32D, +++ (unsigned int)0x345, +++ (unsigned int)0x35A, +++ (unsigned int)0x36D, +++ (unsigned int)0x37E, +++ (unsigned int)0x38C, +++ (unsigned int)0x399, +++ (unsigned int)0x3A5, +++ (unsigned int)0x3AF, +++ (unsigned int)0x3B7, +++ (unsigned int)0x3BF, +++ (unsigned int)0x3C6, +++ (unsigned int)0x3CC +++}; +++ +++static unsigned int therm_tbl_size = sizeof(therm_tbl)/sizeof(therm_tbl[0]); +++ +++static const char *openups_charging_fun(double value); +++static const char *openups_discharging_fun(double value); +++static const char *openups_online_fun(double value); +++static const char *openups_nobattery_fun(double value); +++static const char *openups_off_fun(double value); +++ +++static const char *openups_scale_vin_fun(double value); +++static const char *openups_scale_vout_fun(double value); +++/* static const char *openups_scale_vbat_fun(double value); */ +++static const char *openups_scale_ccharge_fun(double value); +++static const char *openups_scale_cdischarge_fun(double value); +++static const char *openups_temperature_fun(double value); +++ +++static info_lkp_t openups_charging_info[] = { +++ {0, NULL, openups_charging_fun} +++}; +++ +++static info_lkp_t openups_discharging_info[] = { +++ {0, NULL, openups_discharging_fun} +++}; +++ +++static info_lkp_t openups_online_info[] = { +++ {0, NULL, openups_online_fun} +++}; +++ +++static info_lkp_t openups_nobattery_info[] = { +++ {0, NULL, openups_nobattery_fun} +++}; +++ +++static info_lkp_t openups_off_info[] = { +++ {0, NULL, openups_off_fun} +++}; +++ +++static info_lkp_t openups_vin_info[] = { +++ {0, NULL, openups_scale_vin_fun} +++}; +++ +++static info_lkp_t openups_vout_info[] = { +++ {0, NULL, openups_scale_vout_fun} +++}; +++ +++/* static info_lkp_t openups_vbat_info[] = { +++ {0, NULL, openups_scale_vbat_fun} +++};*/ +++ +++static info_lkp_t openups_ccharge_info[] = { +++ {0, NULL, openups_scale_ccharge_fun} +++}; +++ +++static info_lkp_t openups_cdischarge_info[] = { +++ {0, NULL, openups_scale_cdischarge_fun} +++}; +++ +++static info_lkp_t openups_temperature_info[] = { +++ {0, NULL, openups_temperature_fun} +++}; +++ +++static const char *openups_charging_fun(double value) +++{ +++ return value ? "chrg" : "!chrg"; +++} +++ +++static const char *openups_discharging_fun(double value) +++{ +++ return value ? "dischrg" : "!dischrg"; +++} +++ +++static const char *openups_online_fun(double value) +++{ +++ return value ? "online" : "!online"; +++} +++ +++static const char *openups_nobattery_fun(double value) +++{ +++ return value ? "nobattery" : "!nobattery"; +++} +++ +++static const char *openups_off_fun(double value) +++{ +++ return value ? "!off" : "off"; +++} +++ +++static const char *openups_scale_vin_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vin_scale); +++ return openups_scratch_buf; +++} +++ +++static const char *openups_scale_vout_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vout_scale); +++ return openups_scratch_buf; +++} +++ +++/* static const char *openups_scale_vbat_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vbat_scale); +++ return openups_scratch_buf; +++}*/ +++ +++static const char *openups_scale_ccharge_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.3f", value * ccharge_scale); +++ return openups_scratch_buf; +++} +++ +++static const char *openups_scale_cdischarge_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.3f", value * cdischarge_scale); +++ return openups_scratch_buf; +++} +++ +++static const char *openups_temperature_fun(double value) +++{ +++ int i; +++ int pos = -1; +++ unsigned int thermistor = value * 100; +++ +++ if (thermistor <= therm_tbl[0]) { +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", -40); +++ } else { +++ if (thermistor >= therm_tbl[therm_tbl_size - 1]) { +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", 125); +++ } else { +++ for (i = therm_tbl_size - 1; i >= 0; i--) { +++ if (thermistor >= therm_tbl[i]) { +++ pos = i; +++ break; +++ } +++ } +++ +++ if (thermistor == therm_tbl[pos]) { +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", pos * 5 - 40); +++ } else { +++ int t1 = pos * 5 - 40; +++ int t2 = (pos + 1) * 5 - 40; +++ +++ unsigned int d1 = therm_tbl[pos]; +++ unsigned int d2 = therm_tbl[pos + 1]; +++ +++ float temp = (float) (thermistor - d1) * (t2 - t1) / (d2 - d1) + t1; +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", temp); +++ } +++ } +++ } +++ +++ return openups_scratch_buf; +++} +++ +++/* --------------------------------------------------------------- */ +++/* Vendor-specific usage table */ +++/* --------------------------------------------------------------- */ +++ +++/* OPENUPS usage table */ +++static usage_lkp_t openups_usage_lkp[] = { +++ {"Cell1", 0x00000001}, /* Battery cell 1 on J6 pin 1 */ +++ {"Cell2", 0x00000002}, /* Battery cell 2 on J6 pin 2 */ +++ {"Cell3", 0x00000003}, /* Battery cell 3 on J6 pin 3 */ +++ {"Cell4", 0x00000004}, /* Battery cell 4 on J6 pin 4 */ +++ {"Cell5", 0x00000005}, /* Battery cell 5 on J6 pin 5 */ +++ {"Cell6", 0x00000006}, /* Battery cell 6 on J4 pin 1 */ +++ /* Usage table for windows monitoring app only updates when +++ * certain request codes are written to USB endpoint */ +++ /*{ "OpenUPSExtra", 0xff000001 }, */ +++ {NULL, 0} +++}; +++ +++static usage_tables_t openups_utab[] = { +++ openups_usage_lkp, +++ hid_usage_lkp, +++ NULL, +++}; +++ +++/* --------------------------------------------------------------- */ +++/* HID2NUT lookup table */ +++/* --------------------------------------------------------------- */ +++ +++static hid_info_t openups_hid2nut[] = { +++ {"ups.serial", 0, 0, "UPS.PowerSummary.iSerialNumber", NULL, "%s", 0, stringid_conversion}, +++ +++ /* Battery */ +++ {"battery.type", 0, 0, "UPS.PowerSummary.iDeviceChemistry", NULL, "%s", HU_FLAG_STATIC, stringid_conversion}, +++ {"battery.mfr.date", 0, 0, "UPS.PowerSummary.iOEMInformation", NULL, "%s", 0, stringid_conversion}, +++ {"battery.voltage", 0, 0, "UPS.PowerSummary.Voltage", NULL, "%.2f", HU_FLAG_QUICK_POLL, NULL}, +++ /* { "battery.voltage.nominal", 0, 0, "UPS.PowerSummary.ConfigVoltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info }, */ +++ {"battery.current", 0, 0, "UPS.PowerSummary.Current", NULL, "%.3f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.capacity", 0, 0, "UPS.PowerSummary.DesignCapacity", NULL, "%.0f", HU_FLAG_STATIC, NULL}, +++ {"battery.charge", 0, 0, "UPS.PowerSummary.RemainingCapacity", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.charge.low", 0, 0, "UPS.PowerSummary.RemainingCapacityLimit", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.charge.warning", 0, 0, "UPS.PowerSummary.WarningCapacityLimit", NULL, "%.0f", 0, NULL}, +++ {"battery.runtime", 0, 0, "UPS.PowerSummary.RunTimeToEmpty", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.temperature", 0, 0, "UPS.PowerSummary.Temperature", NULL, NULL, HU_FLAG_QUICK_POLL, openups_temperature_info}, +++/* {"battery.cell1.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell1", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell2.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell2", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell3.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell3", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell4.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell4", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell5.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell5", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell6.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell6", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++*/ +++ /* Output */ +++ {"output.voltage", 0, 0, "UPS.PowerSummary.Output.Voltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vout_info}, +++ {"output.current", 0, 0, "UPS.PowerSummary.Output.Current", NULL, NULL, HU_FLAG_QUICK_POLL, openups_cdischarge_info}, +++ +++ /* Input */ +++ {"input.voltage", 0, 0, "UPS.PowerSummary.Input.Voltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vin_info}, +++ {"input.current", 0, 0, "UPS.PowerSummary.Input.Current", NULL, NULL, HU_FLAG_QUICK_POLL, openups_ccharge_info}, +++ +++ /* Status */ +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Good", NULL, NULL, HU_FLAG_QUICK_POLL, openups_off_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.InternalFailure", NULL, NULL, HU_FLAG_QUICK_POLL, commfault_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Overload", NULL, NULL, HU_FLAG_QUICK_POLL, overload_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.OverTemperature", NULL, NULL, HU_FLAG_QUICK_POLL, overheat_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ShutdownImminent", NULL, NULL, HU_FLAG_QUICK_POLL, shutdownimm_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BelowRemainingCapacityLimit", NULL, NULL, HU_FLAG_QUICK_POLL, lowbatt_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.RemainingTimeLimitExpired", NULL, NULL, HU_FLAG_QUICK_POLL, timelimitexpired_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Charging", NULL, NULL, HU_FLAG_QUICK_POLL, openups_charging_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Discharging", NULL, NULL, HU_FLAG_QUICK_POLL, openups_discharging_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.NeedReplacement", NULL, NULL, 0, replacebatt_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ACPresent", NULL, NULL, HU_FLAG_QUICK_POLL, openups_online_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BatteryPresent", NULL, NULL, HU_FLAG_QUICK_POLL, openups_nobattery_info}, +++ +++ /* end of structure. */ +++ {NULL, 0, 0, NULL, NULL, NULL, 0, NULL} +++}; +++ +++static const char *openups_format_model(HIDDevice_t * hd) +++{ +++ return hd->Product; +++} +++ +++static const char *openups_format_mfr(HIDDevice_t * hd) +++{ +++ return hd->Vendor ? hd->Vendor : "openUPS"; +++} +++ +++static const char *openups_format_serial(HIDDevice_t * hd) +++{ +++ return hd->Serial; +++} +++ +++/* this function allows the subdriver to "claim" a device: return 1 if +++ * the device is supported by this subdriver, else 0. */ +++static int openups_claim(HIDDevice_t * hd) +++{ +++ int status = is_usb_device_supported(openups_usb_device_table, hd); +++ +++ switch (status) { +++ case POSSIBLY_SUPPORTED: +++ /* by default, reject, unless the productid option is given */ +++ if (getval("productid")) { +++ return 1; +++ } +++ possibly_supported("openUPS", hd); +++ return 0; +++ +++ case SUPPORTED: +++ return 1; +++ +++ case NOT_SUPPORTED: +++ default: +++ return 0; +++ } +++} +++ +++subdriver_t openups_subdriver = { +++ OPENUPS_HID_VERSION, +++ openups_claim, +++ openups_utab, +++ openups_hid2nut, +++ openups_format_model, +++ openups_format_mfr, +++ openups_format_serial, +++}; ++diff --git a/drivers/openups-hid.h b/drivers/openups-hid.h ++new file mode 100644 ++index 0000000..c87b3d1 ++--- /dev/null +++++ b/drivers/openups-hid.h ++@@ -0,0 +1,38 @@ +++/* openups-hid.h - subdriver to monitor Minibox openUPS USB/HID devices with NUT +++ * +++ * Copyright (C) +++ * 2003 - 2009 Arnaud Quette +++ * 2005 - 2006 Peter Selinger +++ * 2008 - 2009 Arjen de Korte +++ * 2012 Nicu Pavel +++ * +++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ */ +++ +++#ifndef OPENUPS_HID_H +++#define OPENUPS_HID_H +++ +++#include "usbhid-ups.h" +++ +++/* constants for converting HID read values to real values */ +++static const float vin_scale = 0.03545 * 100; +++static const float vout_scale = 0.02571 * 100; +++static const float vbat_scale = 0.00857 * 100; +++static const float ccharge_scale = 0.8274 / 10; +++static const float cdischarge_scale = 16.113 / 10; +++ +++extern subdriver_t openups_subdriver; +++ +++#endif /* OPENUPS_HID_H */ ++diff --git a/drivers/usbhid-ups.c b/drivers/usbhid-ups.c ++index 2d254c4..fcf628d 100644 ++--- a/drivers/usbhid-ups.c +++++ b/drivers/usbhid-ups.c ++@@ -27,7 +27,7 @@ ++ */ ++ ++ #define DRIVER_NAME "Generic HID driver" ++-#define DRIVER_VERSION "0.37" +++#define DRIVER_VERSION "0.38" ++ ++ #include "main.h" ++ #include "libhid.h" ++@@ -37,6 +37,7 @@ ++ ++ /* include all known subdrivers */ ++ #include "mge-hid.h" +++ ++ #ifndef SHUT_MODE ++ #include "explore-hid.h" ++ #include "apc-hid.h" ++@@ -46,6 +47,7 @@ ++ #include "powercom-hid.h" ++ #include "tripplite-hid.h" ++ #include "idowell-hid.h" +++ #include "openups-hid.h" ++ #endif ++ ++ /* master list of avaiable subdrivers */ ++@@ -62,6 +64,7 @@ static subdriver_t *subdriver_list[] = { ++ &powercom_subdriver, ++ &tripplite_subdriver, ++ &idowell_subdriver, +++ &openups_subdriver, ++ #endif ++ NULL ++ }; ++diff --git a/scripts/upower/95-upower-hid.rules b/scripts/upower/95-upower-hid.rules ++index a9e18fe..c57ef75 100644 ++--- a/scripts/upower/95-upower-hid.rules +++++ b/scripts/upower/95-upower-hid.rules ++@@ -15,6 +15,7 @@ ENV{DEVTYPE}=="usb_interface", GOTO="up_hid_end" ++ ATTRS{idVendor}=="03f0", ENV{UPOWER_VENDOR}="Hewlett Packard" ++ ATTRS{idVendor}=="0463", ENV{UPOWER_VENDOR}="Eaton" ++ ATTRS{idVendor}=="047c", ENV{UPOWER_VENDOR}="Dell" +++ATTRS{idVendor}=="04d8", ENV{UPOWER_VENDOR}="Minibox" ++ ATTRS{idVendor}=="050d", ENV{UPOWER_VENDOR}="Belkin" ++ ATTRS{idVendor}=="051d", ENV{UPOWER_VENDOR}="APC" ++ ATTRS{idVendor}=="0592", ENV{UPOWER_VENDOR}="Powerware" ++@@ -47,6 +48,9 @@ ATTRS{idVendor}=="0463", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups ++ # Dell ++ ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups" ++ +++# Minibox +++ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d004", ENV{UPOWER_BATTERY_TYPE}="ups" +++ ++ # Belkin ++ ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375", ENV{UPOWER_BATTERY_TYPE}="ups" ++ ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551", ENV{UPOWER_BATTERY_TYPE}="ups" ++-- ++1.8.0 ++ +diff --git a/feeds/packages/utils/nut/patches/.svn/text-base/003-openups-backport.patch.svn-base b/feeds/packages/utils/nut/patches/.svn/text-base/003-openups-backport.patch.svn-base +new file mode 100644 +index 0000000..9ed7abf +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/.svn/text-base/003-openups-backport.patch.svn-base +@@ -0,0 +1,35 @@ ++--- nut-2.6.5/drivers/openups-hid.c~ 2012-12-06 15:07:29.000000000 +0000 +++++ nut-2.6.5/drivers/openups-hid.c 2012-12-06 15:14:45.541936770 +0000 ++@@ -329,24 +329,18 @@ static const char *openups_format_serial ++ * the device is supported by this subdriver, else 0. */ ++ static int openups_claim(HIDDevice_t * hd) ++ { ++- int status = is_usb_device_supported(openups_usb_device_table, hd); ++- ++- switch (status) { ++- case POSSIBLY_SUPPORTED: ++- /* by default, reject, unless the productid option is given */ ++- if (getval("productid")) { ++- return 1; ++- } ++- possibly_supported("openUPS", hd); +++ if (hd->VendorID != OPENUPS_VENDORID) ++ return 0; ++ ++- case SUPPORTED: +++ if (hd->ProductID == 0xd004) ++ return 1; ++ ++- case NOT_SUPPORTED: ++- default: ++- return 0; ++- } +++ /* by default, reject, unless the productid option is given */ +++ if (getval("productid")) +++ return 1; +++ +++ possibly_supported("openUPS", hd); +++ return 0; ++ } ++ ++ subdriver_t openups_subdriver = { +diff --git a/feeds/packages/utils/nut/patches/001-fix-missing-libmath-flags.patch b/feeds/packages/utils/nut/patches/001-fix-missing-libmath-flags.patch +new file mode 100644 +index 0000000..4f5ea9d +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/001-fix-missing-libmath-flags.patch +@@ -0,0 +1,11 @@ ++--- nut-2.6.3.orig/drivers/Makefile.am 2011-12-05 16:36:46.000000000 ++0100 +++++ nut-2.6.3/drivers/Makefile.am 2012-04-19 10:51:52.152059206 +0200 ++@@ -165,7 +165,7 @@ ++ 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 +diff --git a/feeds/packages/utils/nut/patches/002-minibox-openups-driver.patch b/feeds/packages/utils/nut/patches/002-minibox-openups-driver.patch +new file mode 100644 +index 0000000..0d8e9fe +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/002-minibox-openups-driver.patch +@@ -0,0 +1,528 @@ ++From f8546df4c18c087eac829d3dfc097c919abb6d1c Mon Sep 17 00:00:00 2001 ++From: aquette ++Date: Wed, 28 Nov 2012 21:44:21 +0000 ++Subject: [PATCH] Official support for Minibox openUPS Intelligent UPS ++ ++Add a new usbhid-ups subdriver to handle Minibox openUPS Intelligent UPS ++(USB ID 0x04d8:0xd004) (patch from Nicu Pavel, Mini-Box.Com) ++ ++git-svn-id: svn://anonscm.debian.org/nut/trunk@3791 72a954d1-e00c-0410-aa02-d9c7bb700a61 ++--- ++ data/driver.list.in | 2 + ++ drivers/Makefile.am | 5 +- ++ drivers/openups-hid.c | 360 +++++++++++++++++++++++++++++++++++++ ++ drivers/openups-hid.h | 38 ++++ ++ drivers/usbhid-ups.c | 5 +- ++ scripts/upower/95-upower-hid.rules | 4 + ++ 6 files changed, 411 insertions(+), 3 deletions(-) ++ create mode 100644 drivers/openups-hid.c ++ create mode 100644 drivers/openups-hid.h ++ ++diff --git a/data/driver.list.in b/data/driver.list.in ++index 11014d6..70b5e0f 100644 ++--- a/data/driver.list.in +++++ b/data/driver.list.in ++@@ -645,6 +645,8 @@ ++ "Microsol" "ups" "5" "Rhino 10.0" "10000VA" "rhino" ++ "Microsol" "ups" "5" "Rhino 20.0" "20000VA" "rhino" ++ +++"Minibox" "ups" "5" "openUPS Intelligent UPS" "USB port" "usbhid-ups" +++ ++ "Mustek" "ups" "2" "Powermust" "400VA Plus" "blazer_ser" ++ "Mustek" "ups" "2" "Powermust" "600VA Plus" "blazer_ser" ++ "Mustek" "ups" "2" "Powermust" "800VA Pro" "blazer_ser" ++diff --git a/drivers/Makefile.am b/drivers/Makefile.am ++index cd900cf..ad30874 100644 ++--- a/drivers/Makefile.am +++++ b/drivers/Makefile.am ++@@ -162,7 +162,8 @@ skel_LDADD = $(LDADD_DRIVERS) ++ ++ # USB ++ USBHID_UPS_SUBDRIVERS = apc-hid.c belkin-hid.c cps-hid.c explore-hid.c \ ++- liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c +++ liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c \ +++ openups-hid.c ++ usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c \ ++ usb-common.c $(USBHID_UPS_SUBDRIVERS) ++ usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) ++@@ -245,7 +246,7 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h \ ++ powercom.h powerpanel.h powerp-bin.h powerp-txt.h powerware-mib.h raritan-pdu-mib.h \ ++ safenet.h serial.h snmp-ups.h solis.h tripplite.h tripplite-hid.h \ ++ upshandler.h usb-common.h usbhid-ups.h powercom-hid.h compaq-mib.h idowell-hid.h \ ++- apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h +++ apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h openups-hid.h ++ ++ # Define a dummy library so that Automake builds rules for the ++ # corresponding object files. This library is not actually built, ++diff --git a/drivers/openups-hid.c b/drivers/openups-hid.c ++new file mode 100644 ++index 0000000..69a4a61 ++--- /dev/null +++++ b/drivers/openups-hid.c ++@@ -0,0 +1,360 @@ +++/* openups-hid.c - subdriver to monitor Minibox openUPS USB/HID devices with NUT +++ * +++ * Copyright (C) +++ * 2003 - 2012 Arnaud Quette +++ * 2005 - 2006 Peter Selinger +++ * 2008 - 2009 Arjen de Korte +++ * 2012 Nicu Pavel +++ * +++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ */ +++ +++#include "usbhid-ups.h" +++#include "openups-hid.h" +++#include "main.h" /* for getval() */ +++#include "usb-common.h" +++ +++#define OPENUPS_HID_VERSION "openUPS HID 0.1" +++ +++/* Minibox */ +++#define OPENUPS_VENDORID 0x04d8 +++ +++static char openups_scratch_buf[20]; +++ +++/* USB IDs device table */ +++static usb_device_id_t openups_usb_device_table[] = { +++ /* openUPS Intelligent UPS (minimum required firmware 1.4) */ +++ {USB_DEVICE(OPENUPS_VENDORID, 0xd004), NULL}, +++ +++ /* Terminating entry */ +++ {-1, -1, NULL} +++}; +++ +++/* Thermistor table used for temperature lookups +++ * taken from the windows monitoring application +++ */ +++static unsigned int therm_tbl[] = +++{ +++ (unsigned int)0x31, +++ (unsigned int)0x40, +++ (unsigned int)0x53, +++ (unsigned int)0x68, +++ (unsigned int)0x82, +++ (unsigned int)0xA0, +++ (unsigned int)0xC3, +++ (unsigned int)0xE9, +++ (unsigned int)0x113, +++ (unsigned int)0x13F, +++ (unsigned int)0x16E, +++ (unsigned int)0x19F, +++ (unsigned int)0x1CF, +++ (unsigned int)0x200, +++ (unsigned int)0x22F, +++ (unsigned int)0x25C, +++ (unsigned int)0x286, +++ (unsigned int)0x2AE, +++ (unsigned int)0x2D3, +++ (unsigned int)0x2F4, +++ (unsigned int)0x312, +++ (unsigned int)0x32D, +++ (unsigned int)0x345, +++ (unsigned int)0x35A, +++ (unsigned int)0x36D, +++ (unsigned int)0x37E, +++ (unsigned int)0x38C, +++ (unsigned int)0x399, +++ (unsigned int)0x3A5, +++ (unsigned int)0x3AF, +++ (unsigned int)0x3B7, +++ (unsigned int)0x3BF, +++ (unsigned int)0x3C6, +++ (unsigned int)0x3CC +++}; +++ +++static unsigned int therm_tbl_size = sizeof(therm_tbl)/sizeof(therm_tbl[0]); +++ +++static const char *openups_charging_fun(double value); +++static const char *openups_discharging_fun(double value); +++static const char *openups_online_fun(double value); +++static const char *openups_nobattery_fun(double value); +++static const char *openups_off_fun(double value); +++ +++static const char *openups_scale_vin_fun(double value); +++static const char *openups_scale_vout_fun(double value); +++/* static const char *openups_scale_vbat_fun(double value); */ +++static const char *openups_scale_ccharge_fun(double value); +++static const char *openups_scale_cdischarge_fun(double value); +++static const char *openups_temperature_fun(double value); +++ +++static info_lkp_t openups_charging_info[] = { +++ {0, NULL, openups_charging_fun} +++}; +++ +++static info_lkp_t openups_discharging_info[] = { +++ {0, NULL, openups_discharging_fun} +++}; +++ +++static info_lkp_t openups_online_info[] = { +++ {0, NULL, openups_online_fun} +++}; +++ +++static info_lkp_t openups_nobattery_info[] = { +++ {0, NULL, openups_nobattery_fun} +++}; +++ +++static info_lkp_t openups_off_info[] = { +++ {0, NULL, openups_off_fun} +++}; +++ +++static info_lkp_t openups_vin_info[] = { +++ {0, NULL, openups_scale_vin_fun} +++}; +++ +++static info_lkp_t openups_vout_info[] = { +++ {0, NULL, openups_scale_vout_fun} +++}; +++ +++/* static info_lkp_t openups_vbat_info[] = { +++ {0, NULL, openups_scale_vbat_fun} +++};*/ +++ +++static info_lkp_t openups_ccharge_info[] = { +++ {0, NULL, openups_scale_ccharge_fun} +++}; +++ +++static info_lkp_t openups_cdischarge_info[] = { +++ {0, NULL, openups_scale_cdischarge_fun} +++}; +++ +++static info_lkp_t openups_temperature_info[] = { +++ {0, NULL, openups_temperature_fun} +++}; +++ +++static const char *openups_charging_fun(double value) +++{ +++ return value ? "chrg" : "!chrg"; +++} +++ +++static const char *openups_discharging_fun(double value) +++{ +++ return value ? "dischrg" : "!dischrg"; +++} +++ +++static const char *openups_online_fun(double value) +++{ +++ return value ? "online" : "!online"; +++} +++ +++static const char *openups_nobattery_fun(double value) +++{ +++ return value ? "nobattery" : "!nobattery"; +++} +++ +++static const char *openups_off_fun(double value) +++{ +++ return value ? "!off" : "off"; +++} +++ +++static const char *openups_scale_vin_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vin_scale); +++ return openups_scratch_buf; +++} +++ +++static const char *openups_scale_vout_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vout_scale); +++ return openups_scratch_buf; +++} +++ +++/* static const char *openups_scale_vbat_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vbat_scale); +++ return openups_scratch_buf; +++}*/ +++ +++static const char *openups_scale_ccharge_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.3f", value * ccharge_scale); +++ return openups_scratch_buf; +++} +++ +++static const char *openups_scale_cdischarge_fun(double value) +++{ +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.3f", value * cdischarge_scale); +++ return openups_scratch_buf; +++} +++ +++static const char *openups_temperature_fun(double value) +++{ +++ int i; +++ int pos = -1; +++ unsigned int thermistor = value * 100; +++ +++ if (thermistor <= therm_tbl[0]) { +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", -40); +++ } else { +++ if (thermistor >= therm_tbl[therm_tbl_size - 1]) { +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", 125); +++ } else { +++ for (i = therm_tbl_size - 1; i >= 0; i--) { +++ if (thermistor >= therm_tbl[i]) { +++ pos = i; +++ break; +++ } +++ } +++ +++ if (thermistor == therm_tbl[pos]) { +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", pos * 5 - 40); +++ } else { +++ int t1 = pos * 5 - 40; +++ int t2 = (pos + 1) * 5 - 40; +++ +++ unsigned int d1 = therm_tbl[pos]; +++ unsigned int d2 = therm_tbl[pos + 1]; +++ +++ float temp = (float) (thermistor - d1) * (t2 - t1) / (d2 - d1) + t1; +++ snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", temp); +++ } +++ } +++ } +++ +++ return openups_scratch_buf; +++} +++ +++/* --------------------------------------------------------------- */ +++/* Vendor-specific usage table */ +++/* --------------------------------------------------------------- */ +++ +++/* OPENUPS usage table */ +++static usage_lkp_t openups_usage_lkp[] = { +++ {"Cell1", 0x00000001}, /* Battery cell 1 on J6 pin 1 */ +++ {"Cell2", 0x00000002}, /* Battery cell 2 on J6 pin 2 */ +++ {"Cell3", 0x00000003}, /* Battery cell 3 on J6 pin 3 */ +++ {"Cell4", 0x00000004}, /* Battery cell 4 on J6 pin 4 */ +++ {"Cell5", 0x00000005}, /* Battery cell 5 on J6 pin 5 */ +++ {"Cell6", 0x00000006}, /* Battery cell 6 on J4 pin 1 */ +++ /* Usage table for windows monitoring app only updates when +++ * certain request codes are written to USB endpoint */ +++ /*{ "OpenUPSExtra", 0xff000001 }, */ +++ {NULL, 0} +++}; +++ +++static usage_tables_t openups_utab[] = { +++ openups_usage_lkp, +++ hid_usage_lkp, +++ NULL, +++}; +++ +++/* --------------------------------------------------------------- */ +++/* HID2NUT lookup table */ +++/* --------------------------------------------------------------- */ +++ +++static hid_info_t openups_hid2nut[] = { +++ {"ups.serial", 0, 0, "UPS.PowerSummary.iSerialNumber", NULL, "%s", 0, stringid_conversion}, +++ +++ /* Battery */ +++ {"battery.type", 0, 0, "UPS.PowerSummary.iDeviceChemistry", NULL, "%s", HU_FLAG_STATIC, stringid_conversion}, +++ {"battery.mfr.date", 0, 0, "UPS.PowerSummary.iOEMInformation", NULL, "%s", 0, stringid_conversion}, +++ {"battery.voltage", 0, 0, "UPS.PowerSummary.Voltage", NULL, "%.2f", HU_FLAG_QUICK_POLL, NULL}, +++ /* { "battery.voltage.nominal", 0, 0, "UPS.PowerSummary.ConfigVoltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info }, */ +++ {"battery.current", 0, 0, "UPS.PowerSummary.Current", NULL, "%.3f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.capacity", 0, 0, "UPS.PowerSummary.DesignCapacity", NULL, "%.0f", HU_FLAG_STATIC, NULL}, +++ {"battery.charge", 0, 0, "UPS.PowerSummary.RemainingCapacity", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.charge.low", 0, 0, "UPS.PowerSummary.RemainingCapacityLimit", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.charge.warning", 0, 0, "UPS.PowerSummary.WarningCapacityLimit", NULL, "%.0f", 0, NULL}, +++ {"battery.runtime", 0, 0, "UPS.PowerSummary.RunTimeToEmpty", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL}, +++ {"battery.temperature", 0, 0, "UPS.PowerSummary.Temperature", NULL, NULL, HU_FLAG_QUICK_POLL, openups_temperature_info}, +++/* {"battery.cell1.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell1", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell2.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell2", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell3.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell3", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell4.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell4", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell5.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell5", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++ {"battery.cell6.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell6", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info}, +++*/ +++ /* Output */ +++ {"output.voltage", 0, 0, "UPS.PowerSummary.Output.Voltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vout_info}, +++ {"output.current", 0, 0, "UPS.PowerSummary.Output.Current", NULL, NULL, HU_FLAG_QUICK_POLL, openups_cdischarge_info}, +++ +++ /* Input */ +++ {"input.voltage", 0, 0, "UPS.PowerSummary.Input.Voltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vin_info}, +++ {"input.current", 0, 0, "UPS.PowerSummary.Input.Current", NULL, NULL, HU_FLAG_QUICK_POLL, openups_ccharge_info}, +++ +++ /* Status */ +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Good", NULL, NULL, HU_FLAG_QUICK_POLL, openups_off_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.InternalFailure", NULL, NULL, HU_FLAG_QUICK_POLL, commfault_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Overload", NULL, NULL, HU_FLAG_QUICK_POLL, overload_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.OverTemperature", NULL, NULL, HU_FLAG_QUICK_POLL, overheat_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ShutdownImminent", NULL, NULL, HU_FLAG_QUICK_POLL, shutdownimm_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BelowRemainingCapacityLimit", NULL, NULL, HU_FLAG_QUICK_POLL, lowbatt_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.RemainingTimeLimitExpired", NULL, NULL, HU_FLAG_QUICK_POLL, timelimitexpired_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Charging", NULL, NULL, HU_FLAG_QUICK_POLL, openups_charging_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Discharging", NULL, NULL, HU_FLAG_QUICK_POLL, openups_discharging_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.NeedReplacement", NULL, NULL, 0, replacebatt_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ACPresent", NULL, NULL, HU_FLAG_QUICK_POLL, openups_online_info}, +++ {"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BatteryPresent", NULL, NULL, HU_FLAG_QUICK_POLL, openups_nobattery_info}, +++ +++ /* end of structure. */ +++ {NULL, 0, 0, NULL, NULL, NULL, 0, NULL} +++}; +++ +++static const char *openups_format_model(HIDDevice_t * hd) +++{ +++ return hd->Product; +++} +++ +++static const char *openups_format_mfr(HIDDevice_t * hd) +++{ +++ return hd->Vendor ? hd->Vendor : "openUPS"; +++} +++ +++static const char *openups_format_serial(HIDDevice_t * hd) +++{ +++ return hd->Serial; +++} +++ +++/* this function allows the subdriver to "claim" a device: return 1 if +++ * the device is supported by this subdriver, else 0. */ +++static int openups_claim(HIDDevice_t * hd) +++{ +++ int status = is_usb_device_supported(openups_usb_device_table, hd); +++ +++ switch (status) { +++ case POSSIBLY_SUPPORTED: +++ /* by default, reject, unless the productid option is given */ +++ if (getval("productid")) { +++ return 1; +++ } +++ possibly_supported("openUPS", hd); +++ return 0; +++ +++ case SUPPORTED: +++ return 1; +++ +++ case NOT_SUPPORTED: +++ default: +++ return 0; +++ } +++} +++ +++subdriver_t openups_subdriver = { +++ OPENUPS_HID_VERSION, +++ openups_claim, +++ openups_utab, +++ openups_hid2nut, +++ openups_format_model, +++ openups_format_mfr, +++ openups_format_serial, +++}; ++diff --git a/drivers/openups-hid.h b/drivers/openups-hid.h ++new file mode 100644 ++index 0000000..c87b3d1 ++--- /dev/null +++++ b/drivers/openups-hid.h ++@@ -0,0 +1,38 @@ +++/* openups-hid.h - subdriver to monitor Minibox openUPS USB/HID devices with NUT +++ * +++ * Copyright (C) +++ * 2003 - 2009 Arnaud Quette +++ * 2005 - 2006 Peter Selinger +++ * 2008 - 2009 Arjen de Korte +++ * 2012 Nicu Pavel +++ * +++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ */ +++ +++#ifndef OPENUPS_HID_H +++#define OPENUPS_HID_H +++ +++#include "usbhid-ups.h" +++ +++/* constants for converting HID read values to real values */ +++static const float vin_scale = 0.03545 * 100; +++static const float vout_scale = 0.02571 * 100; +++static const float vbat_scale = 0.00857 * 100; +++static const float ccharge_scale = 0.8274 / 10; +++static const float cdischarge_scale = 16.113 / 10; +++ +++extern subdriver_t openups_subdriver; +++ +++#endif /* OPENUPS_HID_H */ ++diff --git a/drivers/usbhid-ups.c b/drivers/usbhid-ups.c ++index 2d254c4..fcf628d 100644 ++--- a/drivers/usbhid-ups.c +++++ b/drivers/usbhid-ups.c ++@@ -27,7 +27,7 @@ ++ */ ++ ++ #define DRIVER_NAME "Generic HID driver" ++-#define DRIVER_VERSION "0.37" +++#define DRIVER_VERSION "0.38" ++ ++ #include "main.h" ++ #include "libhid.h" ++@@ -37,6 +37,7 @@ ++ ++ /* include all known subdrivers */ ++ #include "mge-hid.h" +++ ++ #ifndef SHUT_MODE ++ #include "explore-hid.h" ++ #include "apc-hid.h" ++@@ -46,6 +47,7 @@ ++ #include "powercom-hid.h" ++ #include "tripplite-hid.h" ++ #include "idowell-hid.h" +++ #include "openups-hid.h" ++ #endif ++ ++ /* master list of avaiable subdrivers */ ++@@ -62,6 +64,7 @@ static subdriver_t *subdriver_list[] = { ++ &powercom_subdriver, ++ &tripplite_subdriver, ++ &idowell_subdriver, +++ &openups_subdriver, ++ #endif ++ NULL ++ }; ++diff --git a/scripts/upower/95-upower-hid.rules b/scripts/upower/95-upower-hid.rules ++index a9e18fe..c57ef75 100644 ++--- a/scripts/upower/95-upower-hid.rules +++++ b/scripts/upower/95-upower-hid.rules ++@@ -15,6 +15,7 @@ ENV{DEVTYPE}=="usb_interface", GOTO="up_hid_end" ++ ATTRS{idVendor}=="03f0", ENV{UPOWER_VENDOR}="Hewlett Packard" ++ ATTRS{idVendor}=="0463", ENV{UPOWER_VENDOR}="Eaton" ++ ATTRS{idVendor}=="047c", ENV{UPOWER_VENDOR}="Dell" +++ATTRS{idVendor}=="04d8", ENV{UPOWER_VENDOR}="Minibox" ++ ATTRS{idVendor}=="050d", ENV{UPOWER_VENDOR}="Belkin" ++ ATTRS{idVendor}=="051d", ENV{UPOWER_VENDOR}="APC" ++ ATTRS{idVendor}=="0592", ENV{UPOWER_VENDOR}="Powerware" ++@@ -47,6 +48,9 @@ ATTRS{idVendor}=="0463", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups ++ # Dell ++ ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups" ++ +++# Minibox +++ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d004", ENV{UPOWER_BATTERY_TYPE}="ups" +++ ++ # Belkin ++ ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375", ENV{UPOWER_BATTERY_TYPE}="ups" ++ ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551", ENV{UPOWER_BATTERY_TYPE}="ups" ++-- ++1.8.0 ++ +diff --git a/feeds/packages/utils/nut/patches/003-openups-backport.patch b/feeds/packages/utils/nut/patches/003-openups-backport.patch +new file mode 100644 +index 0000000..9ed7abf +--- /dev/null ++++ b/feeds/packages/utils/nut/patches/003-openups-backport.patch +@@ -0,0 +1,35 @@ ++--- nut-2.6.5/drivers/openups-hid.c~ 2012-12-06 15:07:29.000000000 +0000 +++++ nut-2.6.5/drivers/openups-hid.c 2012-12-06 15:14:45.541936770 +0000 ++@@ -329,24 +329,18 @@ static const char *openups_format_serial ++ * the device is supported by this subdriver, else 0. */ ++ static int openups_claim(HIDDevice_t * hd) ++ { ++- int status = is_usb_device_supported(openups_usb_device_table, hd); ++- ++- switch (status) { ++- case POSSIBLY_SUPPORTED: ++- /* by default, reject, unless the productid option is given */ ++- if (getval("productid")) { ++- return 1; ++- } ++- possibly_supported("openUPS", hd); +++ if (hd->VendorID != OPENUPS_VENDORID) ++ return 0; ++ ++- case SUPPORTED: +++ if (hd->ProductID == 0xd004) ++ return 1; ++ ++- case NOT_SUPPORTED: ++- default: ++- return 0; ++- } +++ /* by default, reject, unless the productid option is given */ +++ if (getval("productid")) +++ return 1; +++ +++ possibly_supported("openUPS", hd); +++ return 0; ++ } ++ ++ subdriver_t openups_subdriver = { +diff --git a/feeds/packages/utils/nvramtool/.svn/entries b/feeds/packages/utils/nvramtool/.svn/entries +new file mode 100644 +index 0000000..3250468 +--- /dev/null ++++ b/feeds/packages/utils/nvramtool/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/nvramtool ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-19T06:14:09.785779Z ++20296 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a96e691752bf1619369f012cd03438b7 ++2010-03-19T06:14:09.785779Z ++20296 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1502 ++ +diff --git a/feeds/packages/utils/nvramtool/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/nvramtool/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2818b1e +--- /dev/null ++++ b/feeds/packages/utils/nvramtool/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=nvramtool ++PKG_REV:=4887 ++PKG_VERSION:=$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_URL:=svn://coreboot.org/coreboot/trunk/util/nvramtool ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nvramtool ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.coreboot.org/Nvramtool ++ TITLE:=Coreboot nvramtool ++ DEPENDS:=@TARGET_x86 +@PACKAGE_pciutils +zlib ++endef ++ ++define Package/nvramtool/description ++nvramtool (previously known as lxbios and cmos_util) is a utility for ++reading/writing coreboot parameters and displaying information from the coreboot ++table in CMOS/NVRAM. ++The program is intended only for x86-based Linux systems that use coreboot, but ++can also be used for non-coreboot systems (e.g. for dumping all NVRAM bytes). ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ++ LIBS="-lpci -lz" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ nvramtool ++endef ++ ++define Package/nvramtool/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvramtool $(1)/sbin/nvramtool ++endef ++ ++$(eval $(call BuildPackage,nvramtool)) +diff --git a/feeds/packages/utils/nvramtool/Makefile b/feeds/packages/utils/nvramtool/Makefile +new file mode 100644 +index 0000000..2818b1e +--- /dev/null ++++ b/feeds/packages/utils/nvramtool/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=nvramtool ++PKG_REV:=4887 ++PKG_VERSION:=$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_PROTO:=svn ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_URL:=svn://coreboot.org/coreboot/trunk/util/nvramtool ++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/nvramtool ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://www.coreboot.org/Nvramtool ++ TITLE:=Coreboot nvramtool ++ DEPENDS:=@TARGET_x86 +@PACKAGE_pciutils +zlib ++endef ++ ++define Package/nvramtool/description ++nvramtool (previously known as lxbios and cmos_util) is a utility for ++reading/writing coreboot parameters and displaying information from the coreboot ++table in CMOS/NVRAM. ++The program is intended only for x86-based Linux systems that use coreboot, but ++can also be used for non-coreboot systems (e.g. for dumping all NVRAM bytes). ++endef ++ ++define Build/Configure ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ++ LIBS="-lpci -lz" \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ nvramtool ++endef ++ ++define Package/nvramtool/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvramtool $(1)/sbin/nvramtool ++endef ++ ++$(eval $(call BuildPackage,nvramtool)) +diff --git a/feeds/packages/utils/open-plc-utils/.svn/entries b/feeds/packages/utils/open-plc-utils/.svn/entries +new file mode 100644 +index 0000000..49581c2 +--- /dev/null ++++ b/feeds/packages/utils/open-plc-utils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/open-plc-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-11T11:12:52.404139Z ++35552 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e4bd74fdab32c9749f1ad1e6fd271a83 ++2013-02-11T11:12:52.404139Z ++35552 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3012 ++ +diff --git a/feeds/packages/utils/open-plc-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/open-plc-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..39ea4c1 +--- /dev/null ++++ b/feeds/packages/utils/open-plc-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,97 @@ ++# ++# 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:=open-plc-utils ++PKG_VERSION:=2013-01-29 ++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:=6beeb6fe6ce2b16b14284c26e1b9220b68044591 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++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)" \ ++ 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/feeds/packages/utils/open-plc-utils/Makefile b/feeds/packages/utils/open-plc-utils/Makefile +new file mode 100644 +index 0000000..39ea4c1 +--- /dev/null ++++ b/feeds/packages/utils/open-plc-utils/Makefile +@@ -0,0 +1,97 @@ ++# ++# 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:=open-plc-utils ++PKG_VERSION:=2013-01-29 ++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:=6beeb6fe6ce2b16b14284c26e1b9220b68044591 ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++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)" \ ++ 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/feeds/packages/utils/open2300/.svn/entries b/feeds/packages/utils/open2300/.svn/entries +new file mode 100644 +index 0000000..43e985f +--- /dev/null ++++ b/feeds/packages/utils/open2300/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/open2300 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-23T23:09:18.585393Z ++21115 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++43c3d227ce434df0fe71d045ec1adc43 ++2010-04-23T23:09:18.585393Z ++21115 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1952 ++ +diff --git a/feeds/packages/utils/open2300/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/open2300/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a874069 +--- /dev/null ++++ b/feeds/packages/utils/open2300/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,58 @@ ++# ++# 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:=open2300 ++PKG_RELEASE:=1.11 ++PKG_VERSION:=1.11 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.ccccoimbra.com/open2300/ ++PKG_MD5SUM:=804576790840c3bc4a288f3e0f83ce4d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ ++define Package/open2300 ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=WS23XX weather station utilities ++ URL:=http://www.lavrsen.dk/twiki/bin/view/Open2300/WebHome ++ MAINTAINER:=Nuno Goncalves ++endef ++ ++define Package/open2300/description ++ This is an utility suite used to communicate with and collect data from a WS23XX wheather station. ++endef ++ ++define Package/open2300/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/open2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/log2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fetch2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wu2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cw2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/history2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/histlog2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/xml2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/light2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/interval2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/minmax2300 $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/open2300-dist.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib2300.so.1.11 $(1)/usr/lib/ ++ ln -sf /usr/lib/lib2300.so.1.11 $(1)/usr/lib/lib2300.so ++endef ++ ++$(eval $(call BuildPackage,open2300)) +diff --git a/feeds/packages/utils/open2300/Makefile b/feeds/packages/utils/open2300/Makefile +new file mode 100644 +index 0000000..a874069 +--- /dev/null ++++ b/feeds/packages/utils/open2300/Makefile +@@ -0,0 +1,58 @@ ++# ++# 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:=open2300 ++PKG_RELEASE:=1.11 ++PKG_VERSION:=1.11 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.ccccoimbra.com/open2300/ ++PKG_MD5SUM:=804576790840c3bc4a288f3e0f83ce4d ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++ ++define Package/open2300 ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=WS23XX weather station utilities ++ URL:=http://www.lavrsen.dk/twiki/bin/view/Open2300/WebHome ++ MAINTAINER:=Nuno Goncalves ++endef ++ ++define Package/open2300/description ++ This is an utility suite used to communicate with and collect data from a WS23XX wheather station. ++endef ++ ++define Package/open2300/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/open2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/log2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fetch2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wu2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cw2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/history2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/histlog2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/xml2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/light2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/interval2300 $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/minmax2300 $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/open2300-dist.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib2300.so.1.11 $(1)/usr/lib/ ++ ln -sf /usr/lib/lib2300.so.1.11 $(1)/usr/lib/lib2300.so ++endef ++ ++$(eval $(call BuildPackage,open2300)) +diff --git a/feeds/packages/utils/open2300/patches/.svn/entries b/feeds/packages/utils/open2300/patches/.svn/entries +new file mode 100644 +index 0000000..b92d631 +--- /dev/null ++++ b/feeds/packages/utils/open2300/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/open2300/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-04-23T23:09:18.585393Z ++21115 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++x1.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++85d599a1ae6ef4066e22e6b03b8e56d6 ++2010-04-23T23:09:18.585393Z ++21115 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3186 ++ ++x2.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ba8173d43c8ca6947c5d761cb9c22a91 ++2010-04-23T23:09:18.585393Z ++21115 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6087 ++ +diff --git a/feeds/packages/utils/open2300/patches/.svn/text-base/x1.patch.svn-base b/feeds/packages/utils/open2300/patches/.svn/text-base/x1.patch.svn-base +new file mode 100644 +index 0000000..86654f6 +--- /dev/null ++++ b/feeds/packages/utils/open2300/patches/.svn/text-base/x1.patch.svn-base +@@ -0,0 +1,68 @@ ++--- a/open2300.conf +++++ b/open2300.conf ++@@ -0,0 +1,65 @@ +++# open2300.conf +++# +++# Configuration files for open2300 weather station tools +++# +++# Default locations in which the programs will search for this file: +++# Programs search in this sequence: +++# 1. Path to config file including filename given as parameter (not supported by all tools) +++# 2. ./open2300.conf (current working directory) +++# 3. /jffs/etc/open2300.conf (typical DD-WRT location) +++# 4. /etc/open2300.conf (typical Linux location) +++# +++# All names are case sensitive!!! +++ +++ +++# Set to your serial port and time zone +++# For Windows use COM1, COM2, COM2 etc +++# For Linux use /dev/ttyS0, /dev/ttyS1 etc +++ +++SERIAL_DEVICE /dev/tts/1 # /dev/ttyS0, /dev/ttyS1, COM1, COM2 etc +++TIMEZONE 1 # Hours Relative to UTC. East is positive, west is negative +++ +++ +++# Units of measure (set them to your preference) +++# The units of measure are ignored by wu2300 and cw2300 because both requires specific units +++ +++WIND_SPEED m/s # select MPH (miles/hour), m/s, or km/h +++TEMPERATURE C # Select C or F +++RAIN mm # Select mm or IN +++PRESSURE hPa # Select hPa, mb or INHG +++ +++ +++#### Citizens Weather variables (used only by cw2300) +++# Format for latitude is +++# [2 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][N for north or S for south] +++# Format for longitude is +++# [3 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][E for east or W for west] +++# Use leading zeros to get the format ####.##N (lat) and #####.##E (long) +++ +++CITIZEN_WEATHER_ID CW0000 # CW0000 should be replaced by HAM call or actual CW number +++CITIZEN_WEATHER_LATITUDE 5540.12N # DDMM.mmN or S - example 55 deg, 40.23 minutes north +++CITIZEN_WEATHER_LONGITUDE 01224.60E # DDDMM.mmE or W - example 12 deg, 24.60 minutes east +++ +++APRS_SERVER rotate.aprs.net 14580 # These are the APRS servers and ports for +++APRS_SERVER first.aprs.net 14580 # Citizens Weather reporting. +++APRS_SERVER second.aprs.net 14580 # They they are tried in the entered order +++APRS_SERVER third.aprs.net 14580 # you may enter up to 5 alternate servers +++ +++ +++#### WEATHER UNDERGROUND variables (used only by wu2300) +++ +++WEATHER_UNDERGROUND_ID WUID # ID received from Weather Underground +++WEATHER_UNDERGROUND_PASSWORD WUPASSWORD # Password for Weather Underground +++ +++ +++### MYSQL Settings (only used by mysql2300) +++ +++#MYSQL_HOST localhost # Localhost or IP address/host name +++#MYSQL_USERNAME open2300 # Name of the MySQL user that has access to the database +++#MYSQL_PASSWORD mysql2300 # Password for the MySQL user +++#MYSQL_DATABASE open2300 # Named of your database +++#MYSQL_PORT 0 # TCP/IP Port number. Zero means default +++ +++#PGSQL_CONNECT hostaddr='127.0.0.1'dbname='open2300'user='postgres'password='sql' # Connection string +++#PGSQL_TABLE weather # Table name +++#PGSQL_STATION open2300 # Unique station id +diff --git a/feeds/packages/utils/open2300/patches/.svn/text-base/x2.patch.svn-base b/feeds/packages/utils/open2300/patches/.svn/text-base/x2.patch.svn-base +new file mode 100644 +index 0000000..7e43e6f +--- /dev/null ++++ b/feeds/packages/utils/open2300/patches/.svn/text-base/x2.patch.svn-base +@@ -0,0 +1,168 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -15,91 +15,91 @@ ++ prefix = /usr/local ++ exec_prefix = ${prefix} ++ bindir = ${exec_prefix}/bin +++libdir = ${prefix}/lib ++ ++ ######################################### ++ ++ CC = gcc ++-OBJ = open2300.o rw2300.o linux2300.o win2300.o ++-LOGOBJ = log2300.o rw2300.o linux2300.o win2300.o ++-FETCHOBJ = fetch2300.o rw2300.o linux2300.o win2300.o ++-WUOBJ = wu2300.o rw2300.o linux2300.o win2300.o ++-CWOBJ = cw2300.o rw2300.o linux2300.o win2300.o ++-DUMPOBJ = dump2300.o rw2300.o linux2300.o win2300.o ++-HISTOBJ = history2300.o rw2300.o linux2300.o win2300.o ++-HISTLOGOBJ = histlog2300.o rw2300.o linux2300.o win2300.o ++-DUMPBINOBJ = bin2300.o rw2300.o linux2300.o win2300.o ++-XMLOBJ = xml2300.o rw2300.o linux2300.o win2300.o ++-PGSQLOBJ = pgsql2300.o rw2300.o linux2300.o win2300.o ++-LIGHTOBJ = light2300.o rw2300.o linux2300.o win2300.o ++-INTERVALOBJ = interval2300.o rw2300.o linux2300.o win2300.o ++-MINMAXOBJ = minmax2300.o rw2300.o linux2300.o win2300.o ++-MYSQLHISTLOGOBJ = mysqlhistlog2300.o rw2300.o linux2300.o win2300.o +++LIB = lib2300 +++LIB_C = rw2300.c linux2300.c +++LIBOBJ = rw2300.o linux2300.o ++ ++ VERSION = 1.11 ++ ++ CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\" ++-CC_LDFLAGS = -lm ++-CC_WINFLAG = ++-# For Windows - comment the two line above and un-comment the two lines below. ++-#CC_LDFLAGS = -lm -lwsock32 ++-#CC_WINFLAG = -mwindows +++CC_LDFLAGS = -L. -lm -l2300 +++LFLAGS = -shared -Wl,-soname ++ INSTALL = install +++MAKE_EXEC = $(CC) $(CFLAGS) $@.c -o $@ $(CC_LDFLAGS) ++ ++ ####### Build rules ++ ++-all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 +++all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 +++#mysql2300 mysqlhistlog2300 ++ ++-open2300 : $(OBJ) ++- $(CC) $(CFLAGS) -o $@ $(OBJ) $(CC_LDFLAGS) ++- ++-dump2300 : $(DUMPOBJ) ++- $(CC) $(CFLAGS) -o $@ $(DUMPOBJ) $(CC_LDFLAGS) +++lib2300 : +++ $(CC) -c -fPIC $(CFLAGS) $(LIB_C) +++ $(CC) $(LFLAGS),$@.so -o $@.so.$(VERSION) $(LIBOBJ) +++ ln -sf $@.so.$(VERSION) $@.so +++ +++open2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-log2300 : $(LOGOBJ) ++- $(CC) $(CFLAGS) -o $@ $(LOGOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++dump2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-fetch2300 : $(FETCHOBJ) ++- $(CC) $(CFLAGS) -o $@ $(FETCHOBJ) $(CC_LDFLAGS) +++log2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-wu2300 : $(WUOBJ) ++- $(CC) $(CFLAGS) -o $@ $(WUOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++fetch2300 : $(LIB) +++ $(MAKE_EXEC) +++ +++srv2300 : $(LIB) +++ $(MAKE_EXEC) +++ +++wu2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-cw2300 : $(CWOBJ) ++- $(CC) $(CFLAGS) -o $@ $(CWOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++cw2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-history2300 : $(HISTOBJ) ++- $(CC) $(CFLAGS) -o $@ $(HISTOBJ) $(CC_LDFLAGS) +++history2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-histlog2300 : $(HISTLOGOBJ) ++- $(CC) $(CFLAGS) -o $@ $(HISTLOGOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++histlog2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-bin2300 : $(DUMPBINOBJ) ++- $(CC) $(CFLAGS) -o $@ $(DUMPBINOBJ) $(CC_LDFLAGS) +++bin2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-xml2300 : $(XMLOBJ) ++- $(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++xml2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-mysql2300: ++- $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient +++mysql2300: $(LIB) +++ $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/mysql -L/usr/lib/mysql $(CC_LDFLAGS) -lmysqlclient ++ ++-pgsql2300: $(PGSQLOBJ) ++- $(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq +++pgsql2300: $(LIB) +++ $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/pgsql -L/usr/lib/pgsql $(CC_LDFLAGS) -lpq ++ ++-light2300: $(LIGHTOBJ) ++- $(CC) $(CFLAGS) -o $@ $(LIGHTOBJ) $(CC_LDFLAGS) +++light2300: $(LIB) +++ $(MAKE_EXEC) ++ ++-interval2300: $(INTERVALOBJ) ++- $(CC) $(CFLAGS) -o $@ $(INTERVALOBJ) $(CC_LDFLAGS) +++interval2300: $(LIB) +++ $(MAKE_EXEC) ++ ++-minmax2300: $(MINMAXOBJ) ++- $(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++minmax2300: $(LIB) +++ $(MAKE_EXEC) ++ ++-mysqlhistlog2300 : ++- $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient +++mysqlhistlog2300 : $(LIB) +++ $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/mysql -L/usr/lib/mysql $(CC_LDFLAGS) -lmysqlclient ++ ++ ++ install: ++ mkdir -p $(bindir) +++ mkdir -p $(libdir) +++ $(INSTALL) $(LIB).so.$(VERSION) $(libdir) +++ ln -sf $(libdir)/$(LIB).so.$(VERSION) $(libdir)/$(LIB).so +++ $(INSTALL) srv2300 $(bindir) ++ $(INSTALL) open2300 $(bindir) ++ $(INSTALL) dump2300 $(bindir) ++ $(INSTALL) log2300 $(bindir) ++@@ -111,14 +111,11 @@ ++ $(INSTALL) light2300 $(bindir) ++ $(INSTALL) interval2300 $(bindir) ++ $(INSTALL) minmax2300 $(bindir) ++- $(INSTALL) mysql2300 $(bindir) ++- $(INSTALL) mysqlhistlog2300 $(bindir) +++# $(INSTALL) mysql2300 $(bindir) +++# $(INSTALL) mysqlhistlog2300 $(bindir) ++ ++ uninstall: ++- rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300 +++ rm -f $(libdir)/$(LIB).* $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/srv2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/histlog2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300 ++ ++ clean: ++- rm -f *~ *.o open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 ++- ++-cleanexe: ++- rm -f *~ *.o open2300.exe dump2300.exe log2300.exe fetch2300.exe wu2300.exe cw2300.exe history2300.exe histlog2300.exe bin2300.exe xml2300.exe mysql2300.exe pgsql2300.exe light2300.exe interval2300.exe minmax2300.exe ++\ No newline at end of file +++ rm -f *~ *.o *.so* open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 +diff --git a/feeds/packages/utils/open2300/patches/x1.patch b/feeds/packages/utils/open2300/patches/x1.patch +new file mode 100644 +index 0000000..86654f6 +--- /dev/null ++++ b/feeds/packages/utils/open2300/patches/x1.patch +@@ -0,0 +1,68 @@ ++--- a/open2300.conf +++++ b/open2300.conf ++@@ -0,0 +1,65 @@ +++# open2300.conf +++# +++# Configuration files for open2300 weather station tools +++# +++# Default locations in which the programs will search for this file: +++# Programs search in this sequence: +++# 1. Path to config file including filename given as parameter (not supported by all tools) +++# 2. ./open2300.conf (current working directory) +++# 3. /jffs/etc/open2300.conf (typical DD-WRT location) +++# 4. /etc/open2300.conf (typical Linux location) +++# +++# All names are case sensitive!!! +++ +++ +++# Set to your serial port and time zone +++# For Windows use COM1, COM2, COM2 etc +++# For Linux use /dev/ttyS0, /dev/ttyS1 etc +++ +++SERIAL_DEVICE /dev/tts/1 # /dev/ttyS0, /dev/ttyS1, COM1, COM2 etc +++TIMEZONE 1 # Hours Relative to UTC. East is positive, west is negative +++ +++ +++# Units of measure (set them to your preference) +++# The units of measure are ignored by wu2300 and cw2300 because both requires specific units +++ +++WIND_SPEED m/s # select MPH (miles/hour), m/s, or km/h +++TEMPERATURE C # Select C or F +++RAIN mm # Select mm or IN +++PRESSURE hPa # Select hPa, mb or INHG +++ +++ +++#### Citizens Weather variables (used only by cw2300) +++# Format for latitude is +++# [2 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][N for north or S for south] +++# Format for longitude is +++# [3 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][E for east or W for west] +++# Use leading zeros to get the format ####.##N (lat) and #####.##E (long) +++ +++CITIZEN_WEATHER_ID CW0000 # CW0000 should be replaced by HAM call or actual CW number +++CITIZEN_WEATHER_LATITUDE 5540.12N # DDMM.mmN or S - example 55 deg, 40.23 minutes north +++CITIZEN_WEATHER_LONGITUDE 01224.60E # DDDMM.mmE or W - example 12 deg, 24.60 minutes east +++ +++APRS_SERVER rotate.aprs.net 14580 # These are the APRS servers and ports for +++APRS_SERVER first.aprs.net 14580 # Citizens Weather reporting. +++APRS_SERVER second.aprs.net 14580 # They they are tried in the entered order +++APRS_SERVER third.aprs.net 14580 # you may enter up to 5 alternate servers +++ +++ +++#### WEATHER UNDERGROUND variables (used only by wu2300) +++ +++WEATHER_UNDERGROUND_ID WUID # ID received from Weather Underground +++WEATHER_UNDERGROUND_PASSWORD WUPASSWORD # Password for Weather Underground +++ +++ +++### MYSQL Settings (only used by mysql2300) +++ +++#MYSQL_HOST localhost # Localhost or IP address/host name +++#MYSQL_USERNAME open2300 # Name of the MySQL user that has access to the database +++#MYSQL_PASSWORD mysql2300 # Password for the MySQL user +++#MYSQL_DATABASE open2300 # Named of your database +++#MYSQL_PORT 0 # TCP/IP Port number. Zero means default +++ +++#PGSQL_CONNECT hostaddr='127.0.0.1'dbname='open2300'user='postgres'password='sql' # Connection string +++#PGSQL_TABLE weather # Table name +++#PGSQL_STATION open2300 # Unique station id +diff --git a/feeds/packages/utils/open2300/patches/x2.patch b/feeds/packages/utils/open2300/patches/x2.patch +new file mode 100644 +index 0000000..7e43e6f +--- /dev/null ++++ b/feeds/packages/utils/open2300/patches/x2.patch +@@ -0,0 +1,168 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -15,91 +15,91 @@ ++ prefix = /usr/local ++ exec_prefix = ${prefix} ++ bindir = ${exec_prefix}/bin +++libdir = ${prefix}/lib ++ ++ ######################################### ++ ++ CC = gcc ++-OBJ = open2300.o rw2300.o linux2300.o win2300.o ++-LOGOBJ = log2300.o rw2300.o linux2300.o win2300.o ++-FETCHOBJ = fetch2300.o rw2300.o linux2300.o win2300.o ++-WUOBJ = wu2300.o rw2300.o linux2300.o win2300.o ++-CWOBJ = cw2300.o rw2300.o linux2300.o win2300.o ++-DUMPOBJ = dump2300.o rw2300.o linux2300.o win2300.o ++-HISTOBJ = history2300.o rw2300.o linux2300.o win2300.o ++-HISTLOGOBJ = histlog2300.o rw2300.o linux2300.o win2300.o ++-DUMPBINOBJ = bin2300.o rw2300.o linux2300.o win2300.o ++-XMLOBJ = xml2300.o rw2300.o linux2300.o win2300.o ++-PGSQLOBJ = pgsql2300.o rw2300.o linux2300.o win2300.o ++-LIGHTOBJ = light2300.o rw2300.o linux2300.o win2300.o ++-INTERVALOBJ = interval2300.o rw2300.o linux2300.o win2300.o ++-MINMAXOBJ = minmax2300.o rw2300.o linux2300.o win2300.o ++-MYSQLHISTLOGOBJ = mysqlhistlog2300.o rw2300.o linux2300.o win2300.o +++LIB = lib2300 +++LIB_C = rw2300.c linux2300.c +++LIBOBJ = rw2300.o linux2300.o ++ ++ VERSION = 1.11 ++ ++ CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\" ++-CC_LDFLAGS = -lm ++-CC_WINFLAG = ++-# For Windows - comment the two line above and un-comment the two lines below. ++-#CC_LDFLAGS = -lm -lwsock32 ++-#CC_WINFLAG = -mwindows +++CC_LDFLAGS = -L. -lm -l2300 +++LFLAGS = -shared -Wl,-soname ++ INSTALL = install +++MAKE_EXEC = $(CC) $(CFLAGS) $@.c -o $@ $(CC_LDFLAGS) ++ ++ ####### Build rules ++ ++-all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 +++all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 +++#mysql2300 mysqlhistlog2300 ++ ++-open2300 : $(OBJ) ++- $(CC) $(CFLAGS) -o $@ $(OBJ) $(CC_LDFLAGS) ++- ++-dump2300 : $(DUMPOBJ) ++- $(CC) $(CFLAGS) -o $@ $(DUMPOBJ) $(CC_LDFLAGS) +++lib2300 : +++ $(CC) -c -fPIC $(CFLAGS) $(LIB_C) +++ $(CC) $(LFLAGS),$@.so -o $@.so.$(VERSION) $(LIBOBJ) +++ ln -sf $@.so.$(VERSION) $@.so +++ +++open2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-log2300 : $(LOGOBJ) ++- $(CC) $(CFLAGS) -o $@ $(LOGOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++dump2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-fetch2300 : $(FETCHOBJ) ++- $(CC) $(CFLAGS) -o $@ $(FETCHOBJ) $(CC_LDFLAGS) +++log2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-wu2300 : $(WUOBJ) ++- $(CC) $(CFLAGS) -o $@ $(WUOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++fetch2300 : $(LIB) +++ $(MAKE_EXEC) +++ +++srv2300 : $(LIB) +++ $(MAKE_EXEC) +++ +++wu2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-cw2300 : $(CWOBJ) ++- $(CC) $(CFLAGS) -o $@ $(CWOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++cw2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-history2300 : $(HISTOBJ) ++- $(CC) $(CFLAGS) -o $@ $(HISTOBJ) $(CC_LDFLAGS) +++history2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-histlog2300 : $(HISTLOGOBJ) ++- $(CC) $(CFLAGS) -o $@ $(HISTLOGOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++histlog2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-bin2300 : $(DUMPBINOBJ) ++- $(CC) $(CFLAGS) -o $@ $(DUMPBINOBJ) $(CC_LDFLAGS) +++bin2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-xml2300 : $(XMLOBJ) ++- $(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++xml2300 : $(LIB) +++ $(MAKE_EXEC) ++ ++-mysql2300: ++- $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient +++mysql2300: $(LIB) +++ $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/mysql -L/usr/lib/mysql $(CC_LDFLAGS) -lmysqlclient ++ ++-pgsql2300: $(PGSQLOBJ) ++- $(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq +++pgsql2300: $(LIB) +++ $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/pgsql -L/usr/lib/pgsql $(CC_LDFLAGS) -lpq ++ ++-light2300: $(LIGHTOBJ) ++- $(CC) $(CFLAGS) -o $@ $(LIGHTOBJ) $(CC_LDFLAGS) +++light2300: $(LIB) +++ $(MAKE_EXEC) ++ ++-interval2300: $(INTERVALOBJ) ++- $(CC) $(CFLAGS) -o $@ $(INTERVALOBJ) $(CC_LDFLAGS) +++interval2300: $(LIB) +++ $(MAKE_EXEC) ++ ++-minmax2300: $(MINMAXOBJ) ++- $(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) +++minmax2300: $(LIB) +++ $(MAKE_EXEC) ++ ++-mysqlhistlog2300 : ++- $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient +++mysqlhistlog2300 : $(LIB) +++ $(CC) $(CFLAGS) $@.c -o $@ -I/usr/include/mysql -L/usr/lib/mysql $(CC_LDFLAGS) -lmysqlclient ++ ++ ++ install: ++ mkdir -p $(bindir) +++ mkdir -p $(libdir) +++ $(INSTALL) $(LIB).so.$(VERSION) $(libdir) +++ ln -sf $(libdir)/$(LIB).so.$(VERSION) $(libdir)/$(LIB).so +++ $(INSTALL) srv2300 $(bindir) ++ $(INSTALL) open2300 $(bindir) ++ $(INSTALL) dump2300 $(bindir) ++ $(INSTALL) log2300 $(bindir) ++@@ -111,14 +111,11 @@ ++ $(INSTALL) light2300 $(bindir) ++ $(INSTALL) interval2300 $(bindir) ++ $(INSTALL) minmax2300 $(bindir) ++- $(INSTALL) mysql2300 $(bindir) ++- $(INSTALL) mysqlhistlog2300 $(bindir) +++# $(INSTALL) mysql2300 $(bindir) +++# $(INSTALL) mysqlhistlog2300 $(bindir) ++ ++ uninstall: ++- rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300 +++ rm -f $(libdir)/$(LIB).* $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/srv2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/histlog2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300 ++ ++ clean: ++- rm -f *~ *.o open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 ++- ++-cleanexe: ++- rm -f *~ *.o open2300.exe dump2300.exe log2300.exe fetch2300.exe wu2300.exe cw2300.exe history2300.exe histlog2300.exe bin2300.exe xml2300.exe mysql2300.exe pgsql2300.exe light2300.exe interval2300.exe minmax2300.exe ++\ No newline at end of file +++ rm -f *~ *.o *.so* open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 +diff --git a/feeds/packages/utils/owfs/.svn/entries b/feeds/packages/utils/owfs/.svn/entries +new file mode 100644 +index 0000000..bb6fcab +--- /dev/null ++++ b/feeds/packages/utils/owfs/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/owfs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++7f64a2021bc9768e3649d15b3ed692d1 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6083 ++ +diff --git a/feeds/packages/utils/owfs/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/owfs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b35eec6 +--- /dev/null ++++ b/feeds/packages/utils/owfs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,246 @@ ++# ++# 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:=owfs ++PKG_VERSION:=2.8p13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=cc3e2542aed41c753bffca13f2a0a84e ++ ++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/feeds/packages/utils/owfs/Makefile b/feeds/packages/utils/owfs/Makefile +new file mode 100644 +index 0000000..b35eec6 +--- /dev/null ++++ b/feeds/packages/utils/owfs/Makefile +@@ -0,0 +1,246 @@ ++# ++# 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:=owfs ++PKG_VERSION:=2.8p13 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=cc3e2542aed41c753bffca13f2a0a84e ++ ++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/feeds/packages/utils/oww/.svn/entries b/feeds/packages/utils/oww/.svn/entries +new file mode 100644 +index 0000000..1093d3f +--- /dev/null ++++ b/feeds/packages/utils/oww/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/oww ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++565a748c85fd0a5f59bdaf92c9eb8424 ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1189 ++ +diff --git a/feeds/packages/utils/oww/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/oww/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..12a47fa +--- /dev/null ++++ b/feeds/packages/utils/oww/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 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:=oww ++PKG_VERSION:=0.86.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/oww ++PKG_MD5SUM:=8e51ffcd6008c9dc8a03a1a65f80092e ++ ++PKG_BUILD_DEPENDS:=intltool/host ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/oww ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=One-wire weather ++ URL:=http://oww.sourceforge.net/ ++ DEPENDS:=+libcurl +libusb-compat ++endef ++ ++define Package/oww/description ++ Oww is a software project, to communicate with the Dallas 1-wire weather ++ station and other 1-wire sensors, presenting live weather readings, logging ++ data to file, uploading data to weather Web sites, and sending data to other ++ programs through a command line interface. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-gui ++ ++define Package/oww/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/oww.init $(1)/etc/init.d/oww ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owwnogui $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,oww)) +diff --git a/feeds/packages/utils/oww/Makefile b/feeds/packages/utils/oww/Makefile +new file mode 100644 +index 0000000..12a47fa +--- /dev/null ++++ b/feeds/packages/utils/oww/Makefile +@@ -0,0 +1,48 @@ ++# ++# Copyright (C) 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:=oww ++PKG_VERSION:=0.86.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/oww ++PKG_MD5SUM:=8e51ffcd6008c9dc8a03a1a65f80092e ++ ++PKG_BUILD_DEPENDS:=intltool/host ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/oww ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=One-wire weather ++ URL:=http://oww.sourceforge.net/ ++ DEPENDS:=+libcurl +libusb-compat ++endef ++ ++define Package/oww/description ++ Oww is a software project, to communicate with the Dallas 1-wire weather ++ station and other 1-wire sensors, presenting live weather readings, logging ++ data to file, uploading data to weather Web sites, and sending data to other ++ programs through a command line interface. ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-gui ++ ++define Package/oww/install ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/oww.init $(1)/etc/init.d/oww ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owwnogui $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,oww)) +diff --git a/feeds/packages/utils/oww/files/.svn/entries b/feeds/packages/utils/oww/files/.svn/entries +new file mode 100644 +index 0000000..00ae041 +--- /dev/null ++++ b/feeds/packages/utils/oww/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/oww/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-18T02:14:25.712691Z ++30625 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++oww.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2cb9e6ea26e50193b574e21370b83966 ++2012-02-18T02:14:25.712691Z ++30625 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++146 ++ +diff --git a/feeds/packages/utils/oww/files/.svn/text-base/oww.init.svn-base b/feeds/packages/utils/oww/files/.svn/text-base/oww.init.svn-base +new file mode 100644 +index 0000000..74684c6 +--- /dev/null ++++ b/feeds/packages/utils/oww/files/.svn/text-base/oww.init.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=65 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() { ++ service_start /usr/bin/owwnogui ++} ++ ++stop() { ++ service_stop /usr/bin/owwnogui ++} +diff --git a/feeds/packages/utils/oww/files/oww.init b/feeds/packages/utils/oww/files/oww.init +new file mode 100644 +index 0000000..74684c6 +--- /dev/null ++++ b/feeds/packages/utils/oww/files/oww.init +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++ ++START=65 ++ ++SERVICE_DAEMONIZE=1 ++ ++start() { ++ service_start /usr/bin/owwnogui ++} ++ ++stop() { ++ service_stop /usr/bin/owwnogui ++} +diff --git a/feeds/packages/utils/pciutils/.svn/dir-prop-base b/feeds/packages/utils/pciutils/.svn/dir-prop-base +new file mode 100644 +index 0000000..c6963ad +--- /dev/null ++++ b/feeds/packages/utils/pciutils/.svn/dir-prop-base +@@ -0,0 +1,6 @@ ++K 10 ++svn:ignore ++V 9 ++pci.ids* ++ ++END +diff --git a/feeds/packages/utils/pciutils/.svn/entries b/feeds/packages/utils/pciutils/.svn/entries +new file mode 100644 +index 0000000..3f49c31 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pciutils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T22:33:06.690383Z ++32758 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++782511e3393c6db73c01040a0fe33bd6 ++2012-07-16T22:33:06.690383Z ++32758 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1647 ++ +diff --git a/feeds/packages/utils/pciutils/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/pciutils/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pciutils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pciutils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f6af923 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2007-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:=pciutils ++PKG_VERSION:=3.1.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils ++PKG_MD5SUM:=3a5d8b2784c8571dc5557efda4a8c157 ++ ++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:=+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_EGLIBC),) ++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/feeds/packages/utils/pciutils/Makefile b/feeds/packages/utils/pciutils/Makefile +new file mode 100644 +index 0000000..f6af923 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/Makefile +@@ -0,0 +1,67 @@ ++# ++# Copyright (C) 2007-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:=pciutils ++PKG_VERSION:=3.1.10 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils ++PKG_MD5SUM:=3a5d8b2784c8571dc5557efda4a8c157 ++ ++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:=+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_EGLIBC),) ++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/feeds/packages/utils/pciutils/patches/.svn/entries b/feeds/packages/utils/pciutils/patches/.svn/entries +new file mode 100644 +index 0000000..8dfc661 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/.svn/entries +@@ -0,0 +1,198 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pciutils/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T22:33:06.690383Z ++32758 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++102-compressed-ids.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++899f95f408ba7ed4ce3b2056825e7365 ++2012-07-16T22:33:06.690383Z ++32758 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++893 ++ ++103-relative-path-ids.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++71a1ea5fcfd3c2b297118bf66f8b7192 ++2010-01-21T12:58:33.137869Z ++19255 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++416 ++ ++100-remove-no-timestamping.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d756b7ed1e0a688413f8b9b28e691783 ++2009-09-20T13:23:45.804140Z ++17648 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++388 ++ ++101-no-strip.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++da26385e699efa405996c7371e28b735 ++2010-01-21T08:51:15.771810Z ++19252 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++562 ++ ++104-resolv.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a9f098b49237177d5729afdec54e189e ++2011-03-11T10:37:30.883427Z ++26029 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++222 ++ +diff --git a/feeds/packages/utils/pciutils/patches/.svn/text-base/100-remove-no-timestamping.patch.svn-base b/feeds/packages/utils/pciutils/patches/.svn/text-base/100-remove-no-timestamping.patch.svn-base +new file mode 100644 +index 0000000..93bc85f +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/.svn/text-base/100-remove-no-timestamping.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/pciutils/patches/.svn/text-base/101-no-strip.patch.svn-base b/feeds/packages/utils/pciutils/patches/.svn/text-base/101-no-strip.patch.svn-base +new file mode 100644 +index 0000000..032118c +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/.svn/text-base/101-no-strip.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -101,7 +101,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/feeds/packages/utils/pciutils/patches/.svn/text-base/102-compressed-ids.patch.svn-base b/feeds/packages/utils/pciutils/patches/.svn/text-base/102-compressed-ids.patch.svn-base +new file mode 100644 +index 0000000..9b31938 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/.svn/text-base/102-compressed-ids.patch.svn-base +@@ -0,0 +1,31 @@ ++--- 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/feeds/packages/utils/pciutils/patches/.svn/text-base/103-relative-path-ids.patch.svn-base b/feeds/packages/utils/pciutils/patches/.svn/text-base/103-relative-path-ids.patch.svn-base +new file mode 100644 +index 0000000..6ccea29 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/.svn/text-base/103-relative-path-ids.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -78,7 +78,7 @@ setpci.o: setpci.c pciutils.h $(PCIINC) ++ common.o: common.c pciutils.h $(PCIINC) ++ ++ 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/feeds/packages/utils/pciutils/patches/.svn/text-base/104-resolv.patch.svn-base b/feeds/packages/utils/pciutils/patches/.svn/text-base/104-resolv.patch.svn-base +new file mode 100644 +index 0000000..dbd46aa +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/.svn/text-base/104-resolv.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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= ++ ++ case $sys in ++ linux*) +diff --git a/feeds/packages/utils/pciutils/patches/100-remove-no-timestamping.patch b/feeds/packages/utils/pciutils/patches/100-remove-no-timestamping.patch +new file mode 100644 +index 0000000..93bc85f +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/100-remove-no-timestamping.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/pciutils/patches/101-no-strip.patch b/feeds/packages/utils/pciutils/patches/101-no-strip.patch +new file mode 100644 +index 0000000..032118c +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/101-no-strip.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -101,7 +101,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/feeds/packages/utils/pciutils/patches/102-compressed-ids.patch b/feeds/packages/utils/pciutils/patches/102-compressed-ids.patch +new file mode 100644 +index 0000000..9b31938 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/102-compressed-ids.patch +@@ -0,0 +1,31 @@ ++--- 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/feeds/packages/utils/pciutils/patches/103-relative-path-ids.patch b/feeds/packages/utils/pciutils/patches/103-relative-path-ids.patch +new file mode 100644 +index 0000000..6ccea29 +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/103-relative-path-ids.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -78,7 +78,7 @@ setpci.o: setpci.c pciutils.h $(PCIINC) ++ common.o: common.c pciutils.h $(PCIINC) ++ ++ 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/feeds/packages/utils/pciutils/patches/104-resolv.patch b/feeds/packages/utils/pciutils/patches/104-resolv.patch +new file mode 100644 +index 0000000..dbd46aa +--- /dev/null ++++ b/feeds/packages/utils/pciutils/patches/104-resolv.patch +@@ -0,0 +1,11 @@ ++--- 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= ++ ++ case $sys in ++ linux*) +diff --git a/feeds/packages/utils/pcmciautils/.svn/entries b/feeds/packages/utils/pcmciautils/.svn/entries +new file mode 100644 +index 0000000..0b92ba1 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++12b7da5687bc0861dd64ac63bae30a50 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1380 ++ +diff --git a/feeds/packages/utils/pcmciautils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pcmciautils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..992ba7b +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=pcmciautils ++PKG_VERSION:=018 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/pcmcia ++PKG_MD5SUM:=5d85669b3440baa4532363da6caaf1b4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pcmciautils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libsysfs @PCMCIA_SUPPORT ++ TITLE:=PCMCIA Utilities ++ URL:=http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ LD="$(TARGET_CC)" UDEV=false \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \ ++ -DPCMCIAUTILS_VERSION=\\\"$(PKG_VERSION)\\\"" \ ++ prefix=/usr all \ ++ ) ++endef ++ ++define Package/pcmciautils/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(CP) $(PKG_BUILD_DIR)/pccardctl $(1)/usr/sbin/ ++ $(CP) $(PKG_BUILD_DIR)/pcmcia-check-broken-cis $(1)/usr/sbin/ ++ $(CP) $(PKG_BUILD_DIR)/pcmcia-socket-startup $(1)/usr/sbin/ ++ rm -f $(1)/usr/sbin/lspcmcia ++ ln -s pccardctl $(1)/usr/sbin/lspcmcia ++ $(INSTALL_DIR) $(1)/etc/pcmcia/ ++ $(CP) $(PKG_BUILD_DIR)/config/config.opts $(1)/etc/pcmcia/ ++ $(CP) files/* $(1)/ ++endef ++ ++define Package/pcmciautils/conffiles ++/etc/pcmcia/config.opts ++endef ++ ++$(eval $(call BuildPackage,pcmciautils)) +diff --git a/feeds/packages/utils/pcmciautils/Makefile b/feeds/packages/utils/pcmciautils/Makefile +new file mode 100644 +index 0000000..992ba7b +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=pcmciautils ++PKG_VERSION:=018 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/pcmcia ++PKG_MD5SUM:=5d85669b3440baa4532363da6caaf1b4 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pcmciautils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libsysfs @PCMCIA_SUPPORT ++ TITLE:=PCMCIA Utilities ++ URL:=http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html ++endef ++ ++define Build/Compile ++ $(call Build/Compile/Default, \ ++ LD="$(TARGET_CC)" UDEV=false \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \ ++ -DPCMCIAUTILS_VERSION=\\\"$(PKG_VERSION)\\\"" \ ++ prefix=/usr all \ ++ ) ++endef ++ ++define Package/pcmciautils/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(CP) $(PKG_BUILD_DIR)/pccardctl $(1)/usr/sbin/ ++ $(CP) $(PKG_BUILD_DIR)/pcmcia-check-broken-cis $(1)/usr/sbin/ ++ $(CP) $(PKG_BUILD_DIR)/pcmcia-socket-startup $(1)/usr/sbin/ ++ rm -f $(1)/usr/sbin/lspcmcia ++ ln -s pccardctl $(1)/usr/sbin/lspcmcia ++ $(INSTALL_DIR) $(1)/etc/pcmcia/ ++ $(CP) $(PKG_BUILD_DIR)/config/config.opts $(1)/etc/pcmcia/ ++ $(CP) files/* $(1)/ ++endef ++ ++define Package/pcmciautils/conffiles ++/etc/pcmcia/config.opts ++endef ++ ++$(eval $(call BuildPackage,pcmciautils)) +diff --git a/feeds/packages/utils/pcmciautils/files/.svn/entries b/feeds/packages/utils/pcmciautils/files/.svn/entries +new file mode 100644 +index 0000000..d2349c4 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-04T09:43:03.474779Z ++13122 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/utils/pcmciautils/files/etc/.svn/entries b/feeds/packages/utils/pcmciautils/files/etc/.svn/entries +new file mode 100644 +index 0000000..0cd37e6 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-04T09:43:03.474779Z ++13122 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++hotplug.d ++dir ++ ++init.d ++dir ++ +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/.svn/entries b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..e445083 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils/files/etc/hotplug.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-03T21:38:32.595583Z ++13113 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pcmcia_socket ++dir ++ ++pcmcia ++dir ++ +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/.svn/entries b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/.svn/entries +new file mode 100644 +index 0000000..aaeabb1 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-03T21:38:32.595583Z ++13113 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pcmcia.agent ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++717f4e0eb94b4394abd1c3891953d226 ++2008-11-03T21:38:32.595583Z ++13113 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++819 ++ +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/.svn/text-base/pcmcia.agent.svn-base b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/.svn/text-base/pcmcia.agent.svn-base +new file mode 100644 +index 0000000..537c50a +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/.svn/text-base/pcmcia.agent.svn-base +@@ -0,0 +1,28 @@ ++#!/bin/sh ++# Copyright (C) 2008 OpenWrt.org ++ ++case "$ACTION" in ++ add) ++ SYSFS=/sys/bus/pcmcia/devices/ ++ DEVPATH=$SOCKET_NO.$((0x$DEVICE_NO)) ++ ++ # check whether the CIS is completely broken ++ if [ ! -h $SYSFS$DEVPATH/driver ]; then ++ CISFILE=$(/usr/sbin/pcmcia-check-broken-cis $SOCKET_NO) ++ echo PCMCIA: $CISFILE; ++ if [ ! -z $CISFILE ]; then ++ if [ -f /lib/firmware/$CISFILE ]; then ++ cat /lib/firmware/$CISFILE > $SYSFS/class/pcmcia_socket/pcmcia_socket$(SOCKET_NO)/cis ++ fi; ++ fi; ++ fi; ++ ++ # allow a match solely based on the "function ID" field ++ if [ ! -h $SYSFS$DEVPATH/driver ]; then ++ if [ -w $SYSFS$DEVPATH/allow_func_id_match ]; then ++ echo PCMCIA: allowing func_id based match for PCMCIA device $SOCKET_NO.$DEVICE_NO ++ echo -n "42" > $SYSFS$DEVPATH/allow_func_id_match; ++ fi; ++ fi; ++ ;; ++esac +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/pcmcia.agent b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/pcmcia.agent +new file mode 100644 +index 0000000..537c50a +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia/pcmcia.agent +@@ -0,0 +1,28 @@ ++#!/bin/sh ++# Copyright (C) 2008 OpenWrt.org ++ ++case "$ACTION" in ++ add) ++ SYSFS=/sys/bus/pcmcia/devices/ ++ DEVPATH=$SOCKET_NO.$((0x$DEVICE_NO)) ++ ++ # check whether the CIS is completely broken ++ if [ ! -h $SYSFS$DEVPATH/driver ]; then ++ CISFILE=$(/usr/sbin/pcmcia-check-broken-cis $SOCKET_NO) ++ echo PCMCIA: $CISFILE; ++ if [ ! -z $CISFILE ]; then ++ if [ -f /lib/firmware/$CISFILE ]; then ++ cat /lib/firmware/$CISFILE > $SYSFS/class/pcmcia_socket/pcmcia_socket$(SOCKET_NO)/cis ++ fi; ++ fi; ++ fi; ++ ++ # allow a match solely based on the "function ID" field ++ if [ ! -h $SYSFS$DEVPATH/driver ]; then ++ if [ -w $SYSFS$DEVPATH/allow_func_id_match ]; then ++ echo PCMCIA: allowing func_id based match for PCMCIA device $SOCKET_NO.$DEVICE_NO ++ echo -n "42" > $SYSFS$DEVPATH/allow_func_id_match; ++ fi; ++ fi; ++ ;; ++esac +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/.svn/entries b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/.svn/entries +new file mode 100644 +index 0000000..6fc1cc4 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-03T21:38:32.595583Z ++13113 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pcmcia_socket.agent ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9f549a04205eb8dd9e36712c8afa5ae7 ++2008-11-03T21:38:32.595583Z ++13113 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++372 ++ +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/.svn/text-base/pcmcia_socket.agent.svn-base b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/.svn/text-base/pcmcia_socket.agent.svn-base +new file mode 100644 +index 0000000..79b3524 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/.svn/text-base/pcmcia_socket.agent.svn-base +@@ -0,0 +1,18 @@ ++#!/bin/sh ++# Copyright (C) 2008 OpenWrt.org ++ ++case "$ACTION" in ++ add) ++ echo PCMCIA: socket number: $SOCKET_NO ++ ++ sleep 1; ++ /usr/sbin/pcmcia-socket-startup $SOCKET_NO ++ DONE_FILE=/sys/class/pcmcia_socket/pcmcia_socket$SOCKET_NO/available_resources_setup_done ++ if [ -f $DONE_FILE ]; then ++ if [ -w $DONE_FILE ]; then ++ echo -n "42" > $DONE_FILE ++ fi; ++ fi; ++ ;; ++ ++esac +diff --git a/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/pcmcia_socket.agent b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/pcmcia_socket.agent +new file mode 100644 +index 0000000..79b3524 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/hotplug.d/pcmcia_socket/pcmcia_socket.agent +@@ -0,0 +1,18 @@ ++#!/bin/sh ++# Copyright (C) 2008 OpenWrt.org ++ ++case "$ACTION" in ++ add) ++ echo PCMCIA: socket number: $SOCKET_NO ++ ++ sleep 1; ++ /usr/sbin/pcmcia-socket-startup $SOCKET_NO ++ DONE_FILE=/sys/class/pcmcia_socket/pcmcia_socket$SOCKET_NO/available_resources_setup_done ++ if [ -f $DONE_FILE ]; then ++ if [ -w $DONE_FILE ]; then ++ echo -n "42" > $DONE_FILE ++ fi; ++ fi; ++ ;; ++ ++esac +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/entries b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..f0eba42 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcmciautils/files/etc/init.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-11-04T09:43:03.474779Z ++13122 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pcmcia_socket ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d6bafc201b9ac4b7c71b42afd9043a8c ++2008-11-04T09:43:03.474779Z ++13122 ++agb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++396 ++ ++pcmcia ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++6256322630fc4d6c818c4c065858f03c ++2008-11-04T09:43:03.474779Z ++13122 ++agb ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++601 ++ +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/prop-base/pcmcia.svn-base b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/prop-base/pcmcia.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/prop-base/pcmcia.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/prop-base/pcmcia_socket.svn-base b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/prop-base/pcmcia_socket.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/prop-base/pcmcia_socket.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/text-base/pcmcia.svn-base b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/text-base/pcmcia.svn-base +new file mode 100644 +index 0000000..16f2276 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/text-base/pcmcia.svn-base +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=42 ++start() { ++ if [ -d /sys/bus/pcmcia/devices/ ]; then ++ # 2.6 kernels ++ cd /sys/bus/pcmcia/devices/ ++ for PCMCIA_DEVICE in *; do ++ if [ $PCMCIA_DEVICE == \* ]; then ++ continue; ++ fi; ++ MODALIAS=$(cat $PCMCIA_DEVICE/modalias) ++ echo PCMCIA: $MODALIAS $PCMCIA_DEVICE ++ if [ -z $MODALIAS ]; then ++ continue; ++ fi; ++ ACTION=add ++ SOCKET_NO=$(echo $PCMCIA_DEVICE | cut -d. -f1) ++ DEVICE_NO=$(echo $MODALIAS | sed 's/.*pfn\(..\).*/\1/') ++ export MODALIAS ACTION SOCKET_NO DEVICE_NO ++ /sbin/hotplug-call pcmcia ++ done; ++ fi; ++} +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/text-base/pcmcia_socket.svn-base b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/text-base/pcmcia_socket.svn-base +new file mode 100644 +index 0000000..fdd0b8c +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/.svn/text-base/pcmcia_socket.svn-base +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=41 ++start() { ++ if [ -d /sys/class/pcmcia_socket/ ]; then ++ # 2.6 kernels ++ cd /sys/class/pcmcia_socket/ ++ for PCMCIA_SOCKET in *; do ++ if [ $PCMCIA_SOCKET == \* ]; then ++ continue; ++ fi; ++ SOCKET_NO=$(echo $PCMCIA_SOCKET | cut -b14-) ++ ACTION=add ++ export SOCKET_NO ACTION ++ /sbin/hotplug-call pcmcia_socket ++ done; ++ fi; ++} +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/pcmcia b/feeds/packages/utils/pcmciautils/files/etc/init.d/pcmcia +new file mode 100755 +index 0000000..16f2276 +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/pcmcia +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=42 ++start() { ++ if [ -d /sys/bus/pcmcia/devices/ ]; then ++ # 2.6 kernels ++ cd /sys/bus/pcmcia/devices/ ++ for PCMCIA_DEVICE in *; do ++ if [ $PCMCIA_DEVICE == \* ]; then ++ continue; ++ fi; ++ MODALIAS=$(cat $PCMCIA_DEVICE/modalias) ++ echo PCMCIA: $MODALIAS $PCMCIA_DEVICE ++ if [ -z $MODALIAS ]; then ++ continue; ++ fi; ++ ACTION=add ++ SOCKET_NO=$(echo $PCMCIA_DEVICE | cut -d. -f1) ++ DEVICE_NO=$(echo $MODALIAS | sed 's/.*pfn\(..\).*/\1/') ++ export MODALIAS ACTION SOCKET_NO DEVICE_NO ++ /sbin/hotplug-call pcmcia ++ done; ++ fi; ++} +diff --git a/feeds/packages/utils/pcmciautils/files/etc/init.d/pcmcia_socket b/feeds/packages/utils/pcmciautils/files/etc/init.d/pcmcia_socket +new file mode 100755 +index 0000000..fdd0b8c +--- /dev/null ++++ b/feeds/packages/utils/pcmciautils/files/etc/init.d/pcmcia_socket +@@ -0,0 +1,19 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2008 OpenWrt.org ++ ++START=41 ++start() { ++ if [ -d /sys/class/pcmcia_socket/ ]; then ++ # 2.6 kernels ++ cd /sys/class/pcmcia_socket/ ++ for PCMCIA_SOCKET in *; do ++ if [ $PCMCIA_SOCKET == \* ]; then ++ continue; ++ fi; ++ SOCKET_NO=$(echo $PCMCIA_SOCKET | cut -b14-) ++ ACTION=add ++ export SOCKET_NO ACTION ++ /sbin/hotplug-call pcmcia_socket ++ done; ++ fi; ++} +diff --git a/feeds/packages/utils/pcsc-lite/.svn/entries b/feeds/packages/utils/pcsc-lite/.svn/entries +new file mode 100644 +index 0000000..44ac945 +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcsc-lite ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T01:56:24.669316Z ++32249 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2e7c098c58b60afb95f17851f4a93a5a ++2012-06-12T01:56:24.669316Z ++32249 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2503 ++ +diff --git a/feeds/packages/utils/pcsc-lite/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pcsc-lite/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..db3eeec +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,98 @@ ++# ++# 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.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3695 ++PKG_MD5SUM:=cb7156346e9478c19085c918b605ed43 ++ ++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/feeds/packages/utils/pcsc-lite/Makefile b/feeds/packages/utils/pcsc-lite/Makefile +new file mode 100644 +index 0000000..db3eeec +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/Makefile +@@ -0,0 +1,98 @@ ++# ++# 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.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3695 ++PKG_MD5SUM:=cb7156346e9478c19085c918b605ed43 ++ ++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/feeds/packages/utils/pcsc-lite/files/.svn/entries b/feeds/packages/utils/pcsc-lite/files/.svn/entries +new file mode 100644 +index 0000000..e4f6816 +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pcsc-lite/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T15:46:25.451054Z ++28944 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pcscd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++6239d2e906f01c243da7fa2518c667df ++2011-11-11T15:46:25.451054Z ++28944 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++202 ++ +diff --git a/feeds/packages/utils/pcsc-lite/files/.svn/text-base/pcscd.init.svn-base b/feeds/packages/utils/pcsc-lite/files/.svn/text-base/pcscd.init.svn-base +new file mode 100644 +index 0000000..9a7a905 +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/files/.svn/text-base/pcscd.init.svn-base +@@ -0,0 +1,14 @@ ++#!/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/feeds/packages/utils/pcsc-lite/files/pcscd.init b/feeds/packages/utils/pcsc-lite/files/pcscd.init +new file mode 100644 +index 0000000..9a7a905 +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/files/pcscd.init +@@ -0,0 +1,14 @@ ++#!/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/feeds/packages/utils/petitboot/.svn/entries b/feeds/packages/utils/petitboot/.svn/entries +new file mode 100644 +index 0000000..e7d922d +--- /dev/null ++++ b/feeds/packages/utils/petitboot/.svn/entries +@@ -0,0 +1,102 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/petitboot ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-22T01:05:37.759223Z ++35742 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++petitboot-config.in ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++05b504ca44607438ec4fdfe85ff6b754 ++2009-07-10T01:12:10.297305Z ++16762 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1819 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++8f22e4e6c5f831d01619654afa02b965 ++2013-02-22T01:05:37.759223Z ++35742 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3543 ++ +diff --git a/feeds/packages/utils/petitboot/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/petitboot/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4ae52e8 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,113 @@ ++# ++# 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:=petitboot ++PKG_REV:=93b2c2e0f0ca46d2a823b33cdfa44d082e9e8d10 ++PKG_VERSION:=20090709 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://ozlabs.org/home/jk/git/petitboot ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_INSTALL=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/petitboot ++ SECTION:=boot ++ CATEGORY:=Boot Loaders ++ TITLE:=A kexec based bootloader ++ URL:=http://ozlabs.org/~jk/projects/petitboot/ ++ MAINTAINER:=Geoff Levand ++ DEPENDS:=@TARGET_ps3 +kexec-tools +libncurses +libtwin +udev +ps3-utils ++endef ++ ++define Package/petitboot/description ++ Petitboot is a Linux kexec based bootloader with both ++ graphical and command-line user interfaces. The OpenWRT ++ Petitboot package has configuration options that can be ++ used to specify which Petitboot components to build, and ++ can also be used to specify that Petitboot should be run ++ automatically at system start-up. ++ ++ Petitboot supports loading Linux kernel and initrd images ++ from any device that can be mounted by Linux. It can ++ handle gzipped images and can also load images from the ++ network using TFTP, NFS, HTTP, HTTPS, and SFTP. Petitboot ++ looks for bootloader config files on mountable devices in ++ the system, and also uses the boot configuration sent to ++ it from a DHCP server. ++endef ++ ++define Package/petitboot/config ++ source "$(SOURCE)/petitboot-config.in" ++endef ++ ++petitboot-config-args-y$(CONFIG_PETITBOOT_CUI) += --without-ncurses ++petitboot-config-args-y$(CONFIG_PETITBOOT_GUI) += --without-twin ++petitboot-config-args-y$(CONFIG_PETITBOOT_PS3) += --enable-ps3=no ++ ++petitboot-cppflags-$(CONFIG_PETITBOOT_DEBUG) += -DDEBUG ++petitboot-cppflags-y$(CONFIG_PETITBOOT_DEBUG) += -DNDEBUG ++ ++petitboot-extra-bin-$(CONFIG_PETITBOOT_CUI) += /usr/sbin/pb-cui ++petitboot-extra-bin-$(CONFIG_PETITBOOT_GUI) += /usr/sbin/pb-twin ++petitboot-extra-data-$(CONFIG_PETITBOOT_GUI) += /usr/share/petitboot/artwork/* ++ ++# The platform inittab and/or initrun should check for /usr/sbin/petitboot ++# and run it on startup if found. ++ ++petitboot-install-autorun-$(CONFIG_PETITBOOT_AUTORUN_CUI) = \ ++ ln -sf pb-cui $(1)/usr/sbin/petitboot ++petitboot-install-autorun-$(CONFIG_PETITBOOT_AUTORUN_GUI) = \ ++ ln -sf pb-twin $(1)/usr/sbin/petitboot ++ ++CONFIGURE_ARGS += $(petitboot-config-args-y) \ ++ PACKAGE_VERSION=$(shell uname -n)-$(shell date +%y.%m.%d-%H.%M) ++ ++EXTRA_CPPFLAGS += $(petitboot-cppflags-y) ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ (cd $(PKG_BUILD_DIR) && $(BASH) -x ./bootstrap) ++endef ++ ++define Package/petitboot/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(addprefix $(PKG_INSTALL_DIR),$(petitboot-extra-bin-y)) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/pb-discover \ ++ $(PKG_INSTALL_DIR)/usr/sbin/pb-event \ ++ $(1)/usr/sbin/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/petitboot/ ++ $(INSTALL_DATA) \ ++ $(addprefix $(PKG_INSTALL_DIR),$(petitboot-extra-data-y)) \ ++ $(1)/usr/share/petitboot/ ++ ++ $(INSTALL_DIR) $(1)/etc/udev/rules.d ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/utils/99-petitboot.rules \ ++ $(1)/etc/udev/rules.d/ ++ ++ $(INSTALL_DIR) $(1)/etc/ ++ $(INSTALL_DATA) -T $(PKG_BUILD_DIR)/utils/udhcpc $(1)/etc/udhcpc.user ++ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/petitboot.init \ ++ $(1)/etc/init.d/petitboot ++ ++ $(petitboot-install-autorun-y) ++endef ++ ++$(eval $(call BuildPackage,petitboot)) +diff --git a/feeds/packages/utils/petitboot/.svn/text-base/petitboot-config.in.svn-base b/feeds/packages/utils/petitboot/.svn/text-base/petitboot-config.in.svn-base +new file mode 100644 +index 0000000..c5213c2 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/.svn/text-base/petitboot-config.in.svn-base +@@ -0,0 +1,65 @@ ++# petitboot package config ++ ++config PETITBOOT_GUI ++ bool "Enable Graphical UI support" ++ depends on PACKAGE_petitboot ++ select PACKAGE_libtwin ++ default y ++ help ++ Enable support a petitboot graphical front end based on ++ the twin windowing package. ++ ++config PETITBOOT_CUI ++ bool "Enable Command-line UI support" ++ depends on PACKAGE_petitboot ++ select PACKAGE_libncurses ++ default y ++ help ++ Enable support a petitboot command-line front end based on ++ the ncurses package. ++ ++config PETITBOOT_DEBUG ++ bool "Build debug versions of petitboot binaries" ++ depends on PACKAGE_petitboot ++ default n ++ help ++ Enable additional petitboot runtime checks and debug messages. ++ ++config PETITBOOT_PS3 ++ bool "Build in extra support for the PS3 game console" ++ depends on PACKAGE_petitboot ++ default n ++ help ++ Enable additional petitboot runtime checks and debug messages. ++ ++choice ++ prompt "Startup behavior" ++ default PETITBOOT_AUTORUN_GUI ++ depends on PETITBOOT_GUI || PETITBOOT_CUI ++ ++config PETITBOOT_AUTORUN_GUI ++ bool "Auto run Petitboot GUI" ++ depends on PETITBOOT_GUI ++ help ++ Automatically run Petitboot in graphical mode at ++ system startup. Note that the Petitboot program has a menu item ++ 'Exit to Shell' that can be used to exit the program when ++ it is running. ++ ++config PETITBOOT_AUTORUN_CUI ++ bool "Auto run Petitboot CUI" ++ depends on PETITBOOT_CUI ++ help ++ Automatically run Petitboot in command-line mode at system ++ startup. Note that the Petitboot program has a menu item ++ 'Exit to Shell' that can be used to exit the program when ++ it is running. ++ ++config PETITBOOT_AUTORUN_NONE ++ bool "Disable Petitboot auto run" ++ help ++ Disable Petitboot from running automatically at system startup. ++ The system will boot into a shell. Petitboot can still be run ++ manually from the shell prompt when this option is selected. ++ ++endchoice +diff --git a/feeds/packages/utils/petitboot/Makefile b/feeds/packages/utils/petitboot/Makefile +new file mode 100644 +index 0000000..4ae52e8 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/Makefile +@@ -0,0 +1,113 @@ ++# ++# 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:=petitboot ++PKG_REV:=93b2c2e0f0ca46d2a823b33cdfa44d082e9e8d10 ++PKG_VERSION:=20090709 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=git://ozlabs.org/home/jk/git/petitboot ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_INSTALL=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/petitboot ++ SECTION:=boot ++ CATEGORY:=Boot Loaders ++ TITLE:=A kexec based bootloader ++ URL:=http://ozlabs.org/~jk/projects/petitboot/ ++ MAINTAINER:=Geoff Levand ++ DEPENDS:=@TARGET_ps3 +kexec-tools +libncurses +libtwin +udev +ps3-utils ++endef ++ ++define Package/petitboot/description ++ Petitboot is a Linux kexec based bootloader with both ++ graphical and command-line user interfaces. The OpenWRT ++ Petitboot package has configuration options that can be ++ used to specify which Petitboot components to build, and ++ can also be used to specify that Petitboot should be run ++ automatically at system start-up. ++ ++ Petitboot supports loading Linux kernel and initrd images ++ from any device that can be mounted by Linux. It can ++ handle gzipped images and can also load images from the ++ network using TFTP, NFS, HTTP, HTTPS, and SFTP. Petitboot ++ looks for bootloader config files on mountable devices in ++ the system, and also uses the boot configuration sent to ++ it from a DHCP server. ++endef ++ ++define Package/petitboot/config ++ source "$(SOURCE)/petitboot-config.in" ++endef ++ ++petitboot-config-args-y$(CONFIG_PETITBOOT_CUI) += --without-ncurses ++petitboot-config-args-y$(CONFIG_PETITBOOT_GUI) += --without-twin ++petitboot-config-args-y$(CONFIG_PETITBOOT_PS3) += --enable-ps3=no ++ ++petitboot-cppflags-$(CONFIG_PETITBOOT_DEBUG) += -DDEBUG ++petitboot-cppflags-y$(CONFIG_PETITBOOT_DEBUG) += -DNDEBUG ++ ++petitboot-extra-bin-$(CONFIG_PETITBOOT_CUI) += /usr/sbin/pb-cui ++petitboot-extra-bin-$(CONFIG_PETITBOOT_GUI) += /usr/sbin/pb-twin ++petitboot-extra-data-$(CONFIG_PETITBOOT_GUI) += /usr/share/petitboot/artwork/* ++ ++# The platform inittab and/or initrun should check for /usr/sbin/petitboot ++# and run it on startup if found. ++ ++petitboot-install-autorun-$(CONFIG_PETITBOOT_AUTORUN_CUI) = \ ++ ln -sf pb-cui $(1)/usr/sbin/petitboot ++petitboot-install-autorun-$(CONFIG_PETITBOOT_AUTORUN_GUI) = \ ++ ln -sf pb-twin $(1)/usr/sbin/petitboot ++ ++CONFIGURE_ARGS += $(petitboot-config-args-y) \ ++ PACKAGE_VERSION=$(shell uname -n)-$(shell date +%y.%m.%d-%H.%M) ++ ++EXTRA_CPPFLAGS += $(petitboot-cppflags-y) ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ (cd $(PKG_BUILD_DIR) && $(BASH) -x ./bootstrap) ++endef ++ ++define Package/petitboot/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) \ ++ $(addprefix $(PKG_INSTALL_DIR),$(petitboot-extra-bin-y)) \ ++ $(PKG_INSTALL_DIR)/usr/sbin/pb-discover \ ++ $(PKG_INSTALL_DIR)/usr/sbin/pb-event \ ++ $(1)/usr/sbin/ ++ ++ $(INSTALL_DIR) $(1)/usr/share/petitboot/ ++ $(INSTALL_DATA) \ ++ $(addprefix $(PKG_INSTALL_DIR),$(petitboot-extra-data-y)) \ ++ $(1)/usr/share/petitboot/ ++ ++ $(INSTALL_DIR) $(1)/etc/udev/rules.d ++ $(INSTALL_DATA) \ ++ $(PKG_BUILD_DIR)/utils/99-petitboot.rules \ ++ $(1)/etc/udev/rules.d/ ++ ++ $(INSTALL_DIR) $(1)/etc/ ++ $(INSTALL_DATA) -T $(PKG_BUILD_DIR)/utils/udhcpc $(1)/etc/udhcpc.user ++ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) \ ++ ./files/petitboot.init \ ++ $(1)/etc/init.d/petitboot ++ ++ $(petitboot-install-autorun-y) ++endef ++ ++$(eval $(call BuildPackage,petitboot)) +diff --git a/feeds/packages/utils/petitboot/files/.svn/entries b/feeds/packages/utils/petitboot/files/.svn/entries +new file mode 100644 +index 0000000..e973e84 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/petitboot/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-07-10T01:12:10.297305Z ++16762 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++petitboot.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d0e976d2a52975ebe148dff0238a1ec6 ++2009-07-10T01:12:10.297305Z ++16762 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++345 ++ +diff --git a/feeds/packages/utils/petitboot/files/.svn/text-base/petitboot.init.svn-base b/feeds/packages/utils/petitboot/files/.svn/text-base/petitboot.init.svn-base +new file mode 100644 +index 0000000..336d47a +--- /dev/null ++++ b/feeds/packages/utils/petitboot/files/.svn/text-base/petitboot.init.svn-base +@@ -0,0 +1,22 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=90 ++ ++kill_discover() { ++ killall -q -KILL pb-discover ++ umount -f -d /var/petitboot/mnt/* 2>/dev/null ++} ++ ++start() { ++ kill_discover ++ /usr/sbin/pb-discover 2>&- >&- & ++} ++ ++stop() { ++ # first signal pb-discover to exit ++ killall -q -INT pb-discover ++ sleep 3 ++ # now force it ++ kill_discover ++} +diff --git a/feeds/packages/utils/petitboot/files/petitboot.init b/feeds/packages/utils/petitboot/files/petitboot.init +new file mode 100644 +index 0000000..336d47a +--- /dev/null ++++ b/feeds/packages/utils/petitboot/files/petitboot.init +@@ -0,0 +1,22 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=90 ++ ++kill_discover() { ++ killall -q -KILL pb-discover ++ umount -f -d /var/petitboot/mnt/* 2>/dev/null ++} ++ ++start() { ++ kill_discover ++ /usr/sbin/pb-discover 2>&- >&- & ++} ++ ++stop() { ++ # first signal pb-discover to exit ++ killall -q -INT pb-discover ++ sleep 3 ++ # now force it ++ kill_discover ++} +diff --git a/feeds/packages/utils/petitboot/patches/.svn/entries b/feeds/packages/utils/petitboot/patches/.svn/entries +new file mode 100644 +index 0000000..32af236 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/petitboot/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-08-26T22:02:51.394022Z ++17413 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++020-petitboot-fix-pb-twin.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d13dc41ef2c4c5f0a7c878c8d8c54b04 ++2009-08-26T22:02:51.394022Z ++17413 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++38391 ++ ++010-petitboot-fixups.diff ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++59b15aac8a676c3ecca56ffea9451493 ++2009-08-26T22:02:51.394022Z ++17413 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10521 ++ +diff --git a/feeds/packages/utils/petitboot/patches/.svn/text-base/010-petitboot-fixups.diff.svn-base b/feeds/packages/utils/petitboot/patches/.svn/text-base/010-petitboot-fixups.diff.svn-base +new file mode 100644 +index 0000000..cdc0c74 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/patches/.svn/text-base/010-petitboot-fixups.diff.svn-base +@@ -0,0 +1,391 @@ ++ 12 files changed, 96 insertions(+), 40 deletions(-) ++ ++diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c ++index 23d48a4..7c7cb5d 100644 ++--- a/discover/kboot-parser.c +++++ b/discover/kboot-parser.c ++@@ -133,7 +133,7 @@ static int kboot_parse(struct discover_context *dc) ++ conf = talloc_zero(dc, struct conf_context); ++ ++ if (!conf) ++- return -1; +++ return 0; ++ ++ conf->dc = dc; ++ conf->global_options = kboot_global_options, ++diff --git a/discover/parser.c b/discover/parser.c ++index 2b4ddd2..8f2735c 100644 ++--- a/discover/parser.c +++++ b/discover/parser.c ++@@ -13,16 +13,16 @@ extern struct parser __start_parsers[], __stop_parsers[]; ++ void iterate_parsers(struct discover_context *ctx) ++ { ++ struct parser *parser; +++ unsigned int count = 0; ++ ++ pb_log("trying parsers for %s\n", ctx->device_path); ++ ++ for (parser = __start_parsers; parser < __stop_parsers; parser++) { ++ pb_log("\ttrying parser '%s'\n", parser->name); ++- /* just use a dummy device path for now */ ++- if (parser->parse(ctx)) ++- return; +++ count += parser->parse(ctx); ++ } ++- pb_log("\tno boot_options found\n"); +++ if (!count) +++ pb_log("\tno boot_options found\n"); ++ } ++ ++ static int compare_parsers(const void *a, const void *b) ++diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c ++index 1000505..6101cd8 100644 ++--- a/discover/yaboot-parser.c +++++ b/discover/yaboot-parser.c ++@@ -295,7 +295,7 @@ static int yaboot_parse(struct discover_context *dc) ++ conf = talloc_zero(dc, struct conf_context); ++ ++ if (!conf) ++- return -1; +++ return 0; ++ ++ conf->dc = dc; ++ conf->global_options = yaboot_global_options, ++diff --git a/lib/log/log.h b/lib/log/log.h ++index 2a5d375..6f44bea 100644 ++--- a/lib/log/log.h +++++ b/lib/log/log.h ++@@ -3,7 +3,7 @@ ++ ++ #include ++ ++-void pb_log(const char *fmt, ...); +++void __attribute__ ((format (printf, 1, 2))) pb_log(const char *fmt, ...); ++ void pb_log_set_stream(FILE *stream); ++ FILE * pb_log_get_stream(void); ++ void pb_log_always_flush(int state); ++diff --git a/lib/system/system.c b/lib/system/system.c ++index 65bd6bf..7371445 100644 ++--- a/lib/system/system.c +++++ b/lib/system/system.c ++@@ -20,6 +20,7 @@ const struct pb_system_apps pb_system_apps = { ++ .cp = "/bin/cp", ++ .kexec = "/sbin/kexec", ++ .mount = "/bin/mount", +++ .shutdown = "/sbin/shutdown", ++ .sftp = "/usr/bin/sftp", ++ .tftp = "/usr/bin/tftp", ++ .umount = "/bin/umount", ++diff --git a/lib/system/system.h b/lib/system/system.h ++index 47c7c02..1918309 100644 ++--- a/lib/system/system.h +++++ b/lib/system/system.h ++@@ -5,6 +5,7 @@ struct pb_system_apps { ++ const char *cp; ++ const char *kexec; ++ const char *mount; +++ const char *shutdown; ++ const char *sftp; ++ const char *tftp; ++ const char *umount; ++diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c ++index e8ce4dd..5b42b6c 100644 ++--- a/ui/common/discover-client.c +++++ b/ui/common/discover-client.c ++@@ -46,7 +46,7 @@ struct discover_client* discover_client_init( ++ client->ops.cb_arg = cb_arg; ++ ++ client->fd = socket(AF_UNIX, SOCK_STREAM, 0); ++- if (!client->fd < 0) { +++ if (client->fd < 0) { ++ pb_log("%s: socket: %s\n", __func__, strerror(errno)); ++ goto out_err; ++ } ++diff --git a/ui/common/loader.c b/ui/common/loader.c ++index 0fe62a0..5c69533 100644 ++--- a/ui/common/loader.c +++++ b/ui/common/loader.c ++@@ -263,16 +263,22 @@ fail: ++ /** ++ * pb_load_file - Loads a remote file and returns the local file path. ++ * @ctx: The talloc context to associate with the returned string. +++ * @remote: The remote file URL. +++ * @tempfile: An optional variable pointer to be set when a temporary local +++ * file is created. ++ * ++ * Returns the local file path in a talloc'ed character string on success, ++ * or NULL on error. ++ */ ++ ++-char *pb_load_file(void *ctx, const char *remote) +++char *pb_load_file(void *ctx, const char *remote, unsigned int *tempfile) ++ { ++ char *local; ++ struct pb_url *url = pb_url_parse(NULL, remote); ++ +++ if (tempfile) +++ *tempfile = 0; +++ ++ if (!url) ++ return NULL; ++ ++@@ -280,19 +286,28 @@ char *pb_load_file(void *ctx, const char *remote) ++ case pb_url_ftp: ++ case pb_url_http: ++ local = pb_load_wget(ctx, url, 0); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_https: ++- local = pb_load_wget(ctx, url, ++- wget_no_check_certificate); +++ local = pb_load_wget(ctx, url, wget_no_check_certificate); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_nfs: ++ local = pb_load_nfs(ctx, url); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_sftp: ++ local = pb_load_sftp(ctx, url); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_tftp: ++ local = pb_load_tftp(ctx, url); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ default: ++ local = talloc_strdup(ctx, url->full); ++diff --git a/ui/common/loader.h b/ui/common/loader.h ++index b06bb43..42d4d4b 100644 ++--- a/ui/common/loader.h +++++ b/ui/common/loader.h ++@@ -19,6 +19,6 @@ ++ #if !defined(_PB_FILE_LOADER_H) ++ #define _PB_FILE_LOADER_H ++ ++-char *pb_load_file(void *ctx, const char *remote); +++char *pb_load_file(void *ctx, const char *remote, unsigned int *tempfile); ++ ++ #endif ++diff --git a/ui/common/ps3.c b/ui/common/ps3.c ++index cb1c8d1..c62a10d 100644 ++--- a/ui/common/ps3.c +++++ b/ui/common/ps3.c ++@@ -87,7 +87,7 @@ static int ps3_flash_open(struct ps3_flash_ctx *fc, const char *mode) ++ result = os_area_fixed_read(&fc->header, &fc->params, fc->dev); ++ ++ if (result) { ++- pb_log("%s: os_area_fixed_read failed: %s\n", __func__); +++ pb_log("%s: os_area_fixed_read failed\n", __func__); ++ goto fail; ++ } ++ ++@@ -114,7 +114,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values) ++ result = ps3_flash_open(&fc, "r"); ++ ++ if (result) ++- goto done; +++ goto fail; ++ ++ result = os_area_db_read(&fc.db, &fc.header, fc.dev); ++ ++@@ -123,7 +123,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values) ++ if (result) { ++ pb_log("%s: os_area_db_read failed: %s\n", __func__, ++ strerror(errno)); ++- goto done; +++ goto fail; ++ } ++ ++ sum = result = os_area_db_get(&fc.db, &id_default_item, &tmp); ++@@ -141,14 +141,13 @@ int ps3_flash_get_values(struct ps3_flash_values *values) ++ if (!result) ++ values->video_mode = (uint16_t)tmp; ++ ++-done: ++ pb_log("%s: default_item: %x\n", __func__, ++ (unsigned int)values->default_item); ++ pb_log("%s: timeout: %u\n", __func__, ++ (unsigned int)values->timeout); ++ pb_log("%s: video_mode: %u\n", __func__, ++ (unsigned int)values->video_mode); ++- +++fail: ++ return (result || sum) ? -1 : 0; ++ } ++ ++diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c ++index bd6dd31..0140f0e 100644 ++--- a/ui/common/ui-system.c +++++ b/ui/common/ui-system.c ++@@ -33,13 +33,13 @@ ++ #include "ui-system.h" ++ ++ /** ++- * run_kexec_local - Final kexec helper. +++ * kexec_load - kexec load helper. ++ * @l_image: The local image file for kexec to execute. ++ * @l_initrd: Optional local initrd file for kexec --initrd, can be NULL. ++ * @args: Optional command line args for kexec --append, can be NULL. ++ */ ++ ++-static int run_kexec_local(const char *l_image, const char *l_initrd, +++static int kexec_load(const char *l_image, const char *l_initrd, ++ const char *args) ++ { ++ int result; ++@@ -49,34 +49,64 @@ static int run_kexec_local(const char *l_image, const char *l_initrd, ++ char *s_args = NULL; ++ ++ p = argv; ++- *p++ = pb_system_apps.kexec; /* 1 */ +++ *p++ = pb_system_apps.kexec; /* 1 */ +++ *p++ = "-l"; /* 2 */ ++ ++ if (l_initrd) { ++ s_initrd = talloc_asprintf(NULL, "--initrd=%s", l_initrd); ++ assert(s_initrd); ++- *p++ = s_initrd; /* 2 */ +++ *p++ = s_initrd; /* 3 */ ++ } ++ ++ if (args) { ++ s_args = talloc_asprintf(NULL, "--append=%s", args); ++ assert(s_args); ++- *p++ = s_args; /* 3 */ +++ *p++ = s_args; /* 4 */ ++ } ++ ++- /* First try by telling kexec to run shutdown */ +++ *p++ = l_image; /* 5 */ +++ *p++ = NULL; /* 6 */ ++ ++- *(p + 0) = l_image; ++- *(p + 1) = NULL; +++ result = pb_run_cmd(argv); +++ +++ if (result) +++ pb_log("%s: failed: (%d)\n", __func__, result); +++ +++ talloc_free(s_initrd); +++ talloc_free(s_args); +++ +++ return result; +++} +++ +++/** +++ * kexec_reboot - Helper to boot the new kernel. +++ * +++ * Must only be called after a successful call to kexec_load(). +++ */ +++ +++static int kexec_reboot(void) +++{ +++ int result; +++ const char *argv[4]; +++ const char **p; +++ +++ /* First try running shutdown. Init scripts should run 'exec -e' */ +++ +++ p = argv; +++ *p++ = pb_system_apps.shutdown; /* 1 */ +++ *p++ = "-r"; /* 2 */ +++ *p++ = "now"; /* 3 */ +++ *p++ = NULL; /* 4 */ ++ ++ result = pb_run_cmd(argv); ++ ++- /* kexec will return zero on success */ ++- /* On error, force a kexec with the -f option */ +++ /* On error, force a kexec with the -e option */ ++ ++ if (result) { ++- *(p + 0) = "-f"; /* 4 */ ++- *(p + 1) = l_image; /* 5 */ ++- *(p + 2) = NULL; /* 6 */ +++ p = argv; +++ *p++ = pb_system_apps.kexec; /* 1 */ +++ *p++ = "-e"; /* 2 */ +++ *p++ = NULL; /* 3 */ ++ ++ result = pb_run_cmd(argv); ++ } ++@@ -84,9 +114,6 @@ static int run_kexec_local(const char *l_image, const char *l_initrd, ++ if (result) ++ pb_log("%s: failed: (%d)\n", __func__, result); ++ ++- talloc_free(s_initrd); ++- talloc_free(s_args); ++- ++ return result; ++ } ++ ++@@ -99,31 +126,44 @@ int pb_run_kexec(const struct pb_kexec_data *kd) ++ int result; ++ char *l_image = NULL; ++ char *l_initrd = NULL; +++ unsigned int clean_image = 0; +++ unsigned int clean_initrd = 0; ++ ++ pb_log("%s: image: '%s'\n", __func__, kd->image); ++ pb_log("%s: initrd: '%s'\n", __func__, kd->initrd); ++ pb_log("%s: args: '%s'\n", __func__, kd->args); ++ +++ result = -1; +++ ++ if (kd->image) { ++- l_image = pb_load_file(NULL, kd->image); +++ l_image = pb_load_file(NULL, kd->image, &clean_image); ++ if (!l_image) ++- return -1; +++ goto no_load; ++ } ++ ++ if (kd->initrd) { ++- l_initrd = pb_load_file(NULL, kd->initrd); +++ l_initrd = pb_load_file(NULL, kd->initrd, &clean_initrd); ++ if (!l_initrd) ++- return -1; +++ goto no_load; ++ } ++ ++ if (!l_image && !l_initrd) ++- return -1; +++ goto no_load; +++ +++ result = kexec_load(l_image, l_initrd, kd->args); ++ ++- result = run_kexec_local(l_image, l_initrd, kd->args); +++no_load: +++ if (clean_image) +++ unlink(l_image); +++ if (clean_initrd) +++ unlink(l_initrd); ++ ++ talloc_free(l_image); ++ talloc_free(l_initrd); ++ +++ if (!result) +++ result = kexec_reboot(); +++ ++ return result; ++ } ++ ++diff --git a/ui/common/url.c b/ui/common/url.c ++index 0de0f58..544eee2 100644 ++--- a/ui/common/url.c +++++ b/ui/common/url.c ++@@ -140,7 +140,7 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str) ++ path = strchr(p, '/'); ++ ++ if (!path) { ++- pb_log("%s: parse path failed '%s'\n", p); +++ pb_log("%s: parse path failed '%s'\n", __func__ , p); ++ goto fail; ++ } ++ +diff --git a/feeds/packages/utils/petitboot/patches/.svn/text-base/020-petitboot-fix-pb-twin.diff.svn-base b/feeds/packages/utils/petitboot/patches/.svn/text-base/020-petitboot-fix-pb-twin.diff.svn-base +new file mode 100644 +index 0000000..aa24f56 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/patches/.svn/text-base/020-petitboot-fix-pb-twin.diff.svn-base +@@ -0,0 +1,1521 @@ ++a work-in-progress ++ ++Subject: Update PS3 twin GUI program ++ ++Update the PS3 twin GUI program to work with petitboot-multi-ui. ++ ++Signed-off-by: Geoff Levand ++--- ++ Makefile.in | 1 ++ configure.ac | 12 ++ rules.mk | 14 ++ ui/twin/ps3-twin.c | 1441 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ 4 files changed, 1463 insertions(+), 5 deletions(-) ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -18,6 +18,7 @@ twin_LDFLAGS = @twin_LIBS@ ++ ++ # build target ++ ENABLE_PS3 = @ENABLE_PS3@ +++ENABLE_X11 = @ENABLE_X11@ ++ ++ # other programs ++ INSTALL = @INSTALL@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -56,7 +56,17 @@ AS_IF([test "x$with_twin" != xno], ++ [if test "x$with_twin" != xcheck; then ++ AC_MSG_FAILURE([--with-twin was given, but test for twin failed]) ++ fi], ++- [${twin_LIBS}])]) +++ [${twin_LIBS}]) +++ AC_CHECK_HEADERS([libtwin/twin_x11.h])]) +++ +++AC_ARG_ENABLE([x11], +++ [AS_HELP_STRING([--enable-x11], +++ [build for x11])], +++ [], +++ [enable_x11=check]) +++ +++AS_IF([test "x$enable_x11" != xno], [AC_SUBST([ENABLE_X11], ["y"])], []) +++ ++ ++ mkdir -p discover lib/list lib/log lib/pb-protocol lib/system lib/talloc \ ++ lib/waiter test ui/common ui/ncurses ui/test ui/twin utils ++--- a/rules.mk +++++ b/rules.mk ++@@ -54,7 +54,7 @@ ui_common_objs = ui/common/discover-clie ++ ui/common/url.o ++ ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o ui/ncurses/nc-ked.o \ ++ ui/ncurses/nc-cui.o ++-twin_objs = ui/twin/pb-twin.o +++twin_objs = ++ ++ # Makefiles ++ makefiles = Makefile $(top_srcdir)/rules.mk ++@@ -89,11 +89,17 @@ $(pb_test): $(pb_test_objs) ++ $(LINK.o) -o $@ $^ ++ ++ # twin gui ++-pb_twin_objs = $(client_objs) $(twin_objs) ui/twin/ps3-twin.o +++pb_twin_objs-y$(ENABLE_PS3) += ui/twin/pb-twin.o +++pb_twin_objs-$(ENABLE_PS3) += ui/twin/ps3-twin.o ui/common/ps3.o +++pb_twin_cflags-$(ENABLE_X11) += -DUSE_X11 +++pb_twin_ldflags-$(ENABLE_PS3) += -lps3-utils +++ +++pb_twin_objs = $(client_objs) $(twin_objs) $(pb_twin_objs-y) ++ $(pb_twin_objs): $(makefiles) ++ ++-$(pb_twin): LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN) ++-$(pb_twin): CFLAGS+=$(twin_CFLAGS) +++$(pb_twin): LDFLAGS += $(pb_twin_ldflags-y) $(twin_LDFLAGS) $(LIBTWIN) +++$(pb_twin): CFLAGS += $(pb_twin_cflags-y) $(twin_CFLAGS) \ +++ -DPB_ARTWORK_PATH='"$(pkgdatadir)/artwork/"' ++ ++ $(pb_twin): $(pb_twin_objs) ++ $(LINK.o) -o $@ $^ ++--- /dev/null +++++ b/ui/twin/ps3-twin.c ++@@ -0,0 +1,1441 @@ +++/* +++ * Petitboot twin bootloader for the PS3 game console +++ * +++ * Copyright (C) 2009 Sony Computer Entertainment Inc. +++ * Copyright 2009 Sony Corp. +++ * +++ * 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; version 2 of the License. +++ * +++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ */ +++ +++#if defined(HAVE_CONFIG_H) +++#include "config.h" +++#endif +++ +++#define _GNU_SOURCE +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#if defined(HAVE_LIBTWIN_TWIN_X11_H) +++# include +++#endif +++#include +++ +++#include "log/log.h" +++#include "talloc/talloc.h" +++#include "waiter/waiter.h" +++#include "ui/common/discover-client.h" +++#include "ui/common/ps3.h" +++#include "ui/common/timer.h" +++ +++//------------------------------------------------------------------------------ +++// twin-ui.c/h +++ +++#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args) +++#define DBGS(fmt, args...) \ +++ pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) +++ +++/* control to keyboard mappings for the sixaxis controller */ +++uint8_t sixaxis_map[] = { +++ 0, /* 0 Select */ +++ 0, /* 1 L3 */ +++ 0, /* 2 R3 */ +++ 0, /* 3 Start */ +++ KEY_UP, /* 4 Dpad Up */ +++ KEY_RIGHT, /* 5 Dpad Right */ +++ KEY_DOWN, /* 6 Dpad Down */ +++ KEY_LEFT, /* 7 Dpad Left */ +++ 0, /* 8 L2 */ +++ 0, /* 9 R2 */ +++ 0, /* 10 L1 */ +++ 0, /* 11 R1 */ +++ 0, /* 12 Triangle */ +++ KEY_ENTER, /* 13 Circle */ +++ 0, /* 14 Cross */ +++ KEY_DELETE, /* 15 Square */ +++ 0, /* 16 PS Button */ +++ 0, /* 17 nothing */ +++ 0, /* 18 nothing */ +++}; +++ +++#define PBOOT_LEFT_PANE_SIZE 160 +++#define PBOOT_LEFT_PANE_COLOR 0x80000000 +++#define PBOOT_LEFT_LINE_COLOR 0xff000000 +++ +++#define PBOOT_LEFT_FOCUS_WIDTH 80 +++#define PBOOT_LEFT_FOCUS_HEIGHT 80 +++#define PBOOT_LEFT_FOCUS_XOFF 40 +++#define PBOOT_LEFT_FOCUS_YOFF 40 +++#define PBOOT_LEFT_FOCUS_XRAD (6 * TWIN_FIXED_ONE) +++#define PBOOT_LEFT_FOCUS_YRAD (6 * TWIN_FIXED_ONE) +++ +++#define PBOOT_RIGHT_FOCUS_XOFF 20 +++#define PBOOT_RIGHT_FOCUS_YOFF 60 +++#define PBOOT_RIGHT_FOCUS_HEIGHT 80 +++#define PBOOT_RIGHT_FOCUS_XRAD (6 * TWIN_FIXED_ONE) +++#define PBOOT_RIGHT_FOCUS_YRAD (6 * TWIN_FIXED_ONE) +++ +++#define PBOOT_LEFT_ICON_WIDTH 64 +++#define PBOOT_LEFT_ICON_HEIGHT 64 +++#define PBOOT_LEFT_ICON_XOFF 50 +++#define PBOOT_LEFT_ICON_YOFF 50 +++#define PBOOT_LEFT_ICON_STRIDE 100 +++ +++#define PBOOT_RIGHT_OPTION_LMARGIN 30 +++#define PBOOT_RIGHT_OPTION_RMARGIN 30 +++#define PBOOT_RIGHT_OPTION_TMARGIN 70 +++#define PBOOT_RIGHT_OPTION_HEIGHT 64 +++#define PBOOT_RIGHT_OPTION_STRIDE 100 +++#define PBOOT_RIGHT_TITLE_TEXT_SIZE (30 * TWIN_FIXED_ONE) +++#define PBOOT_RIGHT_SUBTITLE_TEXT_SIZE (18 * TWIN_FIXED_ONE) +++#define PBOOT_RIGHT_TITLE_XOFFSET 80 +++#define PBOOT_RIGHT_TITLE_YOFFSET 30 +++#define PBOOT_RIGHT_SUBTITLE_XOFFSET 100 +++#define PBOOT_RIGHT_SUBTITLE_YOFFSET 50 +++#define PBOOT_RIGHT_BADGE_XOFFSET 2 +++#define PBOOT_RIGHT_BADGE_YOFFSET 0 +++ +++ +++#define PBOOT_RIGHT_TITLE_COLOR 0xff000000 +++#define PBOOT_RIGHT_SUBTITLE_COLOR 0xff400000 +++ +++#define PBOOT_FOCUS_COLOR 0x10404040 +++ +++#define PBOOT_STATUS_PANE_COLOR 0x60606060 +++#define PBOOT_STATUS_PANE_HEIGHT 20 +++#define PBOOT_STATUS_PANE_XYMARGIN 20 +++#define PBOOT_STATUS_TEXT_MARGIN 10 +++#define PBOOT_STATUS_TEXT_SIZE (16 * TWIN_FIXED_ONE) +++#define PBOOT_STATUS_TEXT_COLOR 0xff000000 +++ +++#define PBOOT_MAX_OPTION 100 +++#define PBOOT_MAX_DEV 10 +++ +++struct pbt_option +++{ +++ char *title; +++ char *subtitle; +++ twin_pixmap_t *badge; +++ twin_pixmap_t *cache; +++ twin_rect_t box; +++ void *data; +++}; +++ +++struct pbt_device +++{ +++ char *id; +++ twin_pixmap_t *badge; +++ twin_rect_t box; +++ int option_count; +++ struct pbt_option options[PBOOT_MAX_OPTION]; +++}; +++ +++enum pbt_sig { +++ pbt_scr_sig = 111, +++ pbt_menu_sig = 222, +++ pbt_pane_sig = 333, +++ pb_removed_sig = -555, +++}; +++ +++struct pbt_cursor { +++ twin_pixmap_t *pixmap; +++ int hx; +++ int hy; +++}; +++ +++struct pbt_scr { +++ enum pbt_sig sig; +++ struct pbt_cursor cursor; +++ twin_screen_t *tscreen; +++#if defined(HAVE_LIBTWIN_TWIN_X11_H) +++ twin_x11_t *x11; +++#endif +++ twin_fbdev_t *fbdev; +++}; +++ +++struct pbt_frame { +++ twin_label_t *title; +++ twin_label_t *help; +++ twin_label_t *status; +++}; +++ +++/** +++ * struct pbt_pane - A twin menu pane. +++ */ +++ +++struct pbt_pane { +++ enum pbt_sig sig; +++ twin_window_t *window; +++ twin_rect_t focus_box; +++ int focus_start; +++ int focus_target; +++ int focus_curindex; +++ int mouse_target; +++ int has_focus; +++}; +++ +++/** +++ * struct pbt_menu - A twin menu. +++ * @sig: Sanity check signature. +++ * @scr: The screen this menu is associated with. +++ * @dp: The device pane instance. +++ * @op: The option pane instance. +++ */ +++ +++struct pbt_menu { +++ enum pbt_sig sig; +++ struct pbt_scr *scr; +++ struct pbt_pane *dp; +++ struct pbt_pane *op; +++}; +++ +++//============================================================================== +++// helper +++//============================================================================== +++ +++static struct pbt_scr *pbt_scr_from_tscreen(twin_screen_t *tscreen); +++ +++static struct pbt_menu *pbt_menu_from_twindow(twin_window_t *twindow) +++{ +++ struct pbt_menu *menu = twindow->client_data; +++ +++ assert(menu); +++ assert(menu->sig == pbt_menu_sig); +++ return menu; +++} +++ +++/* +++static struct pbt_menu *pbt_menu_from_arg(void *arg) +++{ +++ struct pbt_menu *menu = arg; +++ +++ assert(menu); +++ assert(menu->sig == pbt_menu_sig); +++ return menu; +++} +++*/ +++ +++static struct pbt_pane *pbt_pane_from_arg(void *arg) +++{ +++ struct pbt_pane *pane = arg; +++ +++ assert(pane); +++ assert(pane->sig == pbt_pane_sig); +++ return pane; +++} +++ +++static twin_bool_t pbt_rect_intersect(twin_rect_t r1, twin_rect_t r2) +++{ +++ // FIXME: move this to twin!!! +++ return !(r1.left > r2.right || +++ r1.right < r2.left || +++ r1.top > r2.bottom || +++ r1.bottom < r2.top); +++} +++ +++static twin_pixmap_t * pbt_load_background(twin_screen_t *tscreen) +++{ +++ static const char *bgd = PB_ARTWORK_PATH "/background.jpg"; +++ twin_pixmap_t *rawpix; +++ twin_pixmap_t *scaledpix; +++ +++ rawpix = twin_jpeg_to_pixmap(bgd, TWIN_ARGB32); +++ +++ if (!rawpix) { +++ pb_log("%s: loading image %s failed\n", __func__, bgd); +++ return twin_make_pattern(); +++ } +++ +++ if (tscreen->height == rawpix->height && +++ tscreen->width == rawpix->width) +++ return rawpix; +++ +++ /* Scale as needed. */ +++ +++ twin_fixed_t sx, sy; +++ twin_operand_t srcop; +++ +++ scaledpix = twin_pixmap_create(TWIN_ARGB32, +++ tscreen->width, +++ tscreen->height); +++ if (!scaledpix) { +++ pb_log("%s: scale %s failed\n", __func__, bgd); +++ twin_pixmap_destroy(rawpix); +++ return twin_make_pattern(); +++ } +++ sx = twin_fixed_div(twin_int_to_fixed(rawpix->width), +++ twin_int_to_fixed(tscreen->width)); +++ sy = twin_fixed_div(twin_int_to_fixed(rawpix->height), +++ twin_int_to_fixed(tscreen->height)); +++ +++ twin_matrix_scale(&rawpix->transform, sx, sy); +++ srcop.source_kind = TWIN_PIXMAP; +++ srcop.u.pixmap = rawpix; +++ twin_composite(scaledpix, 0, 0, &srcop, 0, 0, +++ NULL, 0, 0, TWIN_SOURCE, +++ tscreen->width, tscreen->height); +++ +++ twin_pixmap_destroy(rawpix); +++ return scaledpix; +++} +++ +++//============================================================================== +++// option +++//============================================================================== +++ +++static void pbt_option_execute(struct pbt_menu *menu) +++{ +++#if 0 +++ pboot_device_t *dev = pboot_devices[pboot_dev_sel]; +++ pboot_option_t *opt = &dev->options[menu->op->focus_curindex]; +++ +++ pb_log("Selected device %s\n", opt->title); +++ pboot_message("booting %s...", opt->title); +++ +++ /* Give user feedback, make sure errors and panics will be seen */ +++ pboot_exec_option(opt->data); +++#endif +++} +++ +++//============================================================================== +++// device +++//============================================================================== +++ +++//============================================================================== +++// scr +++//============================================================================== +++ +++static twin_bool_t pbt_scr_event(twin_screen_t *tscreen, twin_event_t *event) +++{ +++ struct pbt_scr *scr = pbt_scr_from_tscreen(tscreen); +++ +++ switch(event->kind) { +++ case TwinEventEnter: +++ case TwinEventMotion: +++ case TwinEventLeave: +++ case TwinEventButtonDown: +++ case TwinEventButtonUp: +++ if (scr->cursor.pixmap) +++ twin_screen_set_cursor(tscreen, scr->cursor.pixmap, +++ scr->cursor.hx, scr->cursor.hy); +++ break; +++ case TwinEventJoyButton: +++ /* map joystick events into key events */ +++ if (event->u.js.control >= sizeof(sixaxis_map)) +++ break; +++ +++ event->u.key.key = sixaxis_map[event->u.js.control]; +++ if (event->u.js.value == 0) { +++ event->kind = TwinEventKeyUp; +++ break; +++ } else { +++ event->kind = TwinEventKeyDown; +++ } +++ /* fall through.. */ +++ case TwinEventKeyDown: +++ switch(event->u.key.key) { +++ case KEY_0: +++ return TWIN_TRUE; +++ case KEY_BACKSPACE: +++ case KEY_DELETE: +++ return TWIN_FALSE; +++ } +++ case TwinEventKeyUp: +++ twin_screen_set_cursor(tscreen, NULL, 0, 0); +++ break; +++ default: +++ break; +++ } +++ return TWIN_FALSE; +++} +++ +++//============================================================================== +++// pane +++//============================================================================== +++ +++static int pbt_pane_has_focus(const struct pbt_pane *pane) +++{ +++ return pane->has_focus; +++} +++ +++static twin_time_t pbt_pane_timeout(twin_time_t now, void *closure) +++{ +++ const int accel[11] = { 7, 4, 2, 1, 1, 1, 1, 1, 2, 2, 3 }; +++ struct pbt_pane *pane = pbt_pane_from_arg(closure); +++ int dir = 1, dist, pos; +++ +++ dist = abs(pane->focus_target - pane->focus_start); +++ dir = dist > 5 ? 5 : dist; +++ pos = pane->focus_target - (int)pane->focus_box.top; +++ if (pos == 0) { +++ return -1; +++ } +++ if (pos < 0) { +++ dir = -dir; +++ pos = -pos; +++ } +++ twin_window_damage(pane->window, +++ pane->focus_box.left, +++ pane->focus_box.top, +++ pane->focus_box.right, +++ pane->focus_box.bottom); +++ +++ pane->focus_box.top += dir; +++ pane->focus_box.bottom += dir; +++ +++ twin_window_damage(pane->window, +++ pane->focus_box.left, +++ pane->focus_box.top, +++ pane->focus_box.right, +++ pane->focus_box.bottom); +++ +++ twin_window_queue_paint(pane->window); +++ +++ return accel[(pos * 10) / dist]; +++} +++ +++//============================================================================== +++// menu +++//============================================================================== +++ +++/** +++ * pbt_menu_set_focus - Set the menu's pane of focus. +++ * @menu: The menu to operate on. +++ * @pane: The pane that will have the focus. +++ */ +++ +++static void pbt_menu_set_focus(struct pbt_menu *menu, struct pbt_pane *pane) +++{ +++ assert(!pane->has_focus); +++ +++ if (pane == menu->dp) { +++ menu->dp->has_focus = 1; +++ menu->op->has_focus = 0; +++ } else if (pane == menu->op) { +++ menu->dp->has_focus = 0; +++ menu->op->has_focus = 1; +++// pbt_menu_set_option_focus(menu, 0); +++ } else +++ assert(0 && "bad logic"); +++} +++ +++static void pbt_menu_pane_select(struct pbt_menu *menu, struct pbt_pane *pane) +++{ +++ if(pbt_pane_has_focus(pane)) +++ return; +++ +++ twin_screen_set_active(menu->scr->tscreen, pane->window->pixmap); +++ +++ twin_window_damage(menu->dp->window, +++ menu->dp->focus_box.left, +++ menu->dp->focus_box.top, +++ menu->dp->focus_box.right, +++ menu->dp->focus_box.bottom); +++ twin_window_damage(menu->op->window, +++ menu->op->focus_box.left, +++ menu->op->focus_box.top, +++ menu->op->focus_box.right, +++ menu->op->focus_box.bottom); +++ +++ twin_window_queue_paint(menu->dp->window); +++ twin_window_queue_paint(menu->op->window); +++ +++ pbt_menu_set_focus(menu, pane); +++} +++ +++ +++static struct pbt_pane *pbt_device_pane_create(struct pbt_menu *menu); +++static struct pbt_pane *pbt_option_pane_create(struct pbt_menu *menu); +++ +++static struct pbt_menu *pbt_menu_create(void *ctx, struct pbt_scr *scr) +++{ +++ struct pbt_menu *menu = talloc_zero(ctx, struct pbt_menu); +++ +++ if (!menu) +++ return NULL; +++ +++ assert(scr && scr->sig == pbt_scr_sig); +++ +++ menu->sig = pbt_menu_sig; +++ menu->scr = scr; +++ +++ menu->dp = pbt_device_pane_create(menu); +++ +++ if (!menu->dp) +++ goto fail_dp; +++ +++ menu->op = pbt_option_pane_create(menu); +++ +++ if (!menu->op) +++ goto fail_op; +++ +++ return menu; +++ +++fail_op: +++ //clean dp +++fail_dp: +++ talloc_free(menu); +++ return NULL; +++} +++ +++//============================================================================== +++// device_pane +++//============================================================================== +++ +++static void pbt_device_pane_draw(twin_window_t *window) +++{ +++ struct pbt_pane *dp = pbt_menu_from_twindow(window)->dp; +++ twin_pixmap_t *px = window->pixmap; +++ twin_path_t *path; +++ twin_fixed_t x, y, w, h; +++ int i; +++ +++ /* Fill background */ +++ twin_fill(px, PBOOT_LEFT_PANE_COLOR, TWIN_SOURCE, 0, 0, px->width, +++ px->height); +++ +++ /* Create a path for use later */ +++ path = twin_path_create(); +++ assert(path); +++ +++ /* Draw right line if needed */ +++ if (px->clip.right > (PBOOT_LEFT_PANE_SIZE - 4)) { +++ x = twin_int_to_fixed(PBOOT_LEFT_PANE_SIZE - 4); +++ y = twin_int_to_fixed(px->height); +++ twin_path_rectangle(path, x, 0, 0x40000, y); +++ twin_paint_path(px, PBOOT_LEFT_LINE_COLOR, path); +++ twin_path_empty(path); +++ } +++ +++ /* Draw focus box */ +++ if (dp->focus_curindex >= 0 && +++ pbt_rect_intersect(dp->focus_box, px->clip)) { +++ x = twin_int_to_fixed(dp->focus_box.left + 2); +++ y = twin_int_to_fixed(dp->focus_box.top + 2); +++ w = twin_int_to_fixed(dp->focus_box.right - +++ dp->focus_box.left - 4); +++ h = twin_int_to_fixed(dp->focus_box.bottom - +++ dp->focus_box.top - 4); +++ twin_path_rounded_rectangle(path, x, y, w, h, +++ PBOOT_LEFT_FOCUS_XRAD, +++ PBOOT_LEFT_FOCUS_YRAD); +++ if (pbt_pane_has_focus(dp)) +++ twin_paint_path(px, PBOOT_FOCUS_COLOR, path); +++ else +++ twin_paint_stroke(px, PBOOT_FOCUS_COLOR, path, +++ 4 * TWIN_FIXED_ONE); +++ } +++ +++#if 0 +++ /* Draw icons */ +++ for (i = 0; i < pboot_dev_count; i++) { +++ pboot_device_t *dev = pboot_devices[i]; +++ twin_operand_t src; +++ +++ if (!twin_rect_intersect(dev->box, px->clip)) +++ continue; +++ +++ src.source_kind = TWIN_PIXMAP; +++ src.u.pixmap = dev->badge; +++ +++ twin_composite(px, dev->box.left, dev->box.top, +++ &src, 0, 0, NULL, 0, 0, TWIN_OVER, +++ dev->box.right - dev->box.left, +++ dev->box.bottom - dev->box.top); +++ } +++#endif +++ +++ /* Destroy path */ +++ twin_path_destroy(path); +++} +++ +++ +++static void pbt_device_pane_set_focus(struct pbt_menu *menu, int index) +++{ +++#if 0 +++ if (index >= pboot_dev_count) +++ return; +++#endif +++ +++ menu->dp->focus_start = menu->dp->focus_box.top; +++ +++ if (index < 0) +++ menu->dp->focus_target = 0 - PBOOT_LEFT_FOCUS_HEIGHT; +++ else +++ menu->dp->focus_target = PBOOT_LEFT_FOCUS_YOFF + +++ PBOOT_LEFT_ICON_STRIDE * index; +++ +++ menu->dp->focus_curindex = index; +++ +++ twin_set_timeout(pbt_pane_timeout, 0, menu->dp); +++} +++ +++static void pbt_device_pane_mousetrack(struct pbt_menu *menu, twin_coord_t x, +++ twin_coord_t y) +++{ +++ int candidate = -1; +++ twin_coord_t icon_top; +++ +++ if (x < PBOOT_LEFT_ICON_XOFF || +++ x > (PBOOT_LEFT_ICON_XOFF + PBOOT_LEFT_ICON_WIDTH)) +++ goto miss; +++ +++ if (y < PBOOT_LEFT_ICON_YOFF) +++ goto miss; +++ +++ candidate = (y - PBOOT_LEFT_ICON_YOFF) / PBOOT_LEFT_ICON_STRIDE; +++ +++#if 0 +++ if (candidate >= pboot_dev_count) { +++ candidate = -1; +++ goto miss; +++ } +++#endif +++ if (candidate == menu->dp->mouse_target) +++ return; +++ +++ icon_top = PBOOT_LEFT_ICON_YOFF + candidate * PBOOT_LEFT_ICON_STRIDE; +++ +++ if (y > (icon_top + PBOOT_LEFT_ICON_HEIGHT)) { +++ candidate = -1; +++ goto miss; +++ } +++ +++ /* The mouse hit an icon that wasn't the same +++ * as the previous one, trigger a focus change. +++ */ +++ +++ pbt_device_pane_set_focus(menu, candidate); +++ +++ miss: +++ menu->dp->mouse_target = candidate; +++} +++ +++static twin_bool_t pbt_device_pane_event(twin_window_t *window, +++ twin_event_t *event) +++{ +++ struct pbt_menu *menu = pbt_menu_from_twindow(window); +++ +++ /* filter out all mouse events */ +++ switch(event->kind) { +++ case TwinEventEnter: +++ case TwinEventMotion: +++ case TwinEventLeave: +++ pbt_menu_pane_select(menu, menu->dp); +++ pbt_device_pane_mousetrack(menu, event->u.pointer.x, +++ event->u.pointer.y); +++ return TWIN_TRUE; +++ case TwinEventButtonDown: +++ case TwinEventButtonUp: +++ return TWIN_TRUE; +++ case TwinEventKeyDown: +++ switch(event->u.key.key) { +++ case KEY_UP: +++ if (menu->dp->focus_curindex > 0) +++ pbt_device_pane_set_focus(menu, +++ menu->dp->focus_curindex - 1); +++ return TWIN_TRUE; +++ case KEY_DOWN: +++ pbt_device_pane_set_focus(menu, menu->dp->focus_curindex + 1); +++ return TWIN_TRUE; +++ case KEY_RIGHT: +++ pbt_menu_pane_select(menu, menu->op); +++ return TWIN_TRUE; +++ default: +++ break; +++ } +++ break; +++ default: +++ break; +++ } +++ return TWIN_FALSE; +++} +++ +++static struct pbt_pane *pbt_device_pane_create(struct pbt_menu *menu) +++{ +++ struct pbt_pane *pane = talloc_zero(menu, struct pbt_pane); +++ +++ if (!pane) +++ return NULL; +++ +++ pane->sig = pbt_pane_sig; +++ pane->window = twin_window_create(menu->scr->tscreen, TWIN_ARGB32, +++ TwinWindowPlain, 0, 0, PBOOT_LEFT_PANE_SIZE, +++ menu->scr->tscreen->height); +++ +++ if (!pane->window) +++ goto fail_window; +++ +++ pane->window->draw = pbt_device_pane_draw; +++ pane->window->event = pbt_device_pane_event; +++ pane->window->client_data = menu; +++ +++ pane->focus_curindex = -1; +++ pane->focus_box.left = PBOOT_LEFT_FOCUS_XOFF; +++ pane->focus_box.top = -2 * PBOOT_LEFT_FOCUS_HEIGHT; +++ pane->focus_box.right = pane->focus_box.left + PBOOT_LEFT_FOCUS_WIDTH; +++ pane->focus_box.bottom = pane->focus_box.top + PBOOT_LEFT_FOCUS_HEIGHT; +++ +++ pane->mouse_target = -1; +++ +++ twin_window_show(pane->window); +++ twin_window_queue_paint(pane->window); +++ +++ return pane; +++ +++fail_window: +++ talloc_free(pane); +++ return NULL; +++} +++ +++//============================================================================== +++// option_pane +++//============================================================================== +++ +++static void pbt_option_pane_set_focus(struct pbt_menu *menu, int index) +++{ +++#if 0 +++ pboot_device_t *dev; +++ +++ if (pboot_dev_sel < 0 || pboot_dev_sel >= pboot_dev_count) +++ return; +++ dev = pboot_devices[pboot_dev_sel]; +++ if (index < 0 || index >= dev->option_count) +++ return; +++#endif +++ +++ menu->op->focus_start = menu->op->focus_box.top; +++ menu->op->focus_target = PBOOT_RIGHT_FOCUS_YOFF + +++ PBOOT_RIGHT_OPTION_STRIDE * index; +++ menu->op->focus_curindex = index; +++ +++ twin_set_timeout(pbt_pane_timeout, 0, menu->op); +++} +++ +++static void pbt_option_pane_draw(twin_window_t *window) +++{ +++ struct pbt_pane *op = pbt_menu_from_twindow(window)->op; +++ twin_pixmap_t *px = window->pixmap; +++// pboot_device_t *dev; +++ twin_path_t *path; +++ twin_fixed_t x, y, w, h; +++ int i; +++ +++ /* Fill background */ +++ twin_fill(px, 0x00000000, TWIN_SOURCE, 0, 0, px->width, px->height); +++ +++ /* Nothing to draw, return */ +++// if (pboot_dev_sel < 0) +++// return; +++ +++ /* Create a path for use later */ +++ path = twin_path_create(); +++ assert(path); +++ +++ /* Draw focus box */ +++ if (op->focus_curindex >= 0 && +++ pbt_rect_intersect(op->focus_box, px->clip)) { +++ x = twin_int_to_fixed(op->focus_box.left + 2); +++ y = twin_int_to_fixed(op->focus_box.top + 2); +++ w = twin_int_to_fixed(op->focus_box.right - +++ op->focus_box.left - 4); +++ h = twin_int_to_fixed(op->focus_box.bottom - +++ op->focus_box.top - 4); +++ twin_path_rounded_rectangle(path, x, y, w, h, +++ PBOOT_RIGHT_FOCUS_XRAD, +++ PBOOT_RIGHT_FOCUS_YRAD); +++ if (pbt_pane_has_focus(op)) +++ twin_paint_path(px, PBOOT_FOCUS_COLOR, path); +++ else +++ twin_paint_stroke(px, PBOOT_FOCUS_COLOR, path, +++ 4 * TWIN_FIXED_ONE); +++ } +++ +++ /* Get device and iterate through options */ +++/* +++ dev = pboot_devices[pboot_dev_sel]; +++ for (i = 0; i < dev->option_count; i++) { +++ pboot_option_t *opt = &dev->options[i]; +++ twin_operand_t src; +++ +++ if (opt->title == NULL) +++ continue; +++ if (!pbt_rect_intersect(opt->box, px->clip)) +++ continue; +++ if (opt->cache == NULL) +++ pboot_draw_option_cache(dev, opt, i); +++ +++ src.source_kind = TWIN_PIXMAP; +++ src.u.pixmap = opt->cache; +++ +++ twin_composite(px, opt->box.left, opt->box.top, +++ &src, 0, 0, NULL, 0, 0, TWIN_OVER, +++ opt->box.right - opt->box.left, +++ opt->box.bottom - opt->box.top); +++ } +++*/ +++ /* Destroy path */ +++ twin_path_destroy(path); +++} +++ +++static void pbt_option_pane_mousetrack(struct pbt_menu *menu, twin_coord_t x, +++ twin_coord_t y) +++{ +++ int candidate = -1; +++ +++ if (y < PBOOT_RIGHT_OPTION_TMARGIN) +++ goto miss; +++ +++#if 0 +++ pboot_device_t *dev; +++ pboot_option_t *opt; +++ +++ if (pboot_dev_sel < 0 || pboot_dev_sel >= pboot_dev_count) +++ return; +++ +++ dev = pboot_devices[pboot_dev_sel]; +++ +++ candidate = (y - PBOOT_RIGHT_OPTION_TMARGIN) / +++ PBOOT_RIGHT_OPTION_STRIDE; +++ +++ if (candidate >= dev->option_count) { +++ candidate = -1; +++ goto miss; +++ } +++ +++ if (candidate == op->mouse_target) +++ return; +++ +++ opt = &dev->options[candidate]; +++ +++ if (x < opt->box.left || x > opt->box.right || +++ y < opt->box.top || y > opt->box.bottom) { +++ candidate = -1; +++ goto miss; +++ } +++#endif +++ +++ pbt_option_pane_set_focus(menu, candidate); +++ +++miss: +++ menu->op->mouse_target = candidate; +++} +++ +++static twin_bool_t pbt_option_pane_event(twin_window_t *window, +++ twin_event_t *event) +++{ +++ struct pbt_menu *menu = pbt_menu_from_twindow(window); +++ +++ /* filter out all mouse events */ +++ switch(event->kind) { +++ case TwinEventEnter: +++ case TwinEventMotion: +++ case TwinEventLeave: +++ pbt_menu_pane_select(menu, menu->op); +++ pbt_option_pane_mousetrack(menu, event->u.pointer.x, +++ event->u.pointer.y); +++ return TWIN_TRUE; +++ case TwinEventButtonDown: +++ pbt_menu_pane_select(menu, menu->op); +++ pbt_option_pane_mousetrack(menu, event->u.pointer.x, +++ event->u.pointer.y); +++ pbt_option_execute(menu); +++ return TWIN_TRUE; +++ case TwinEventButtonUp: +++ return TWIN_TRUE; +++ case TwinEventKeyDown: +++ switch(event->u.key.key) { +++ case KEY_UP: +++ //pbt_menu_set_option_focus(menu, menu->op->focus_curindex - 1); +++ return TWIN_TRUE; +++ case KEY_DOWN: +++ //pbt_menu_set_option_focus(menu, menu->op->focus_curindex + 1); +++ return TWIN_TRUE; +++ case KEY_LEFT: +++ pbt_menu_pane_select(menu, menu->dp); +++ return TWIN_TRUE; +++ case KEY_ENTER: +++ pbt_option_execute(menu); +++ default: +++ break; +++ } +++ break; +++ default: +++ break; +++ } +++ return TWIN_FALSE; +++} +++ +++static struct pbt_pane *pbt_option_pane_create(struct pbt_menu *menu) +++{ +++ struct pbt_pane *pane = talloc_zero(menu, struct pbt_pane); +++ +++ if (!pane) +++ return NULL; +++ +++ pane->sig = pbt_pane_sig; +++ pane->window = twin_window_create(menu->scr->tscreen, TWIN_ARGB32, +++ TwinWindowPlain, PBOOT_LEFT_PANE_SIZE, 0, +++ menu->scr->tscreen->width - PBOOT_LEFT_PANE_SIZE, +++ menu->scr->tscreen->height); +++ +++ if (!pane->window) +++ goto fail_window; +++ +++ pane->window->draw = pbt_option_pane_draw; +++ pane->window->event = pbt_option_pane_event; +++ pane->window->client_data = menu; +++ +++ pane->focus_curindex = -1; +++ pane->focus_box.left = PBOOT_RIGHT_FOCUS_XOFF; +++ pane->focus_box.top = -2 * PBOOT_RIGHT_FOCUS_HEIGHT; +++ pane->focus_box.right = pane->window->pixmap->width +++ - 2 * PBOOT_RIGHT_FOCUS_XOFF; +++ pane->focus_box.bottom = pane->focus_box.top + PBOOT_RIGHT_FOCUS_HEIGHT; +++ +++ pane->mouse_target = -1; +++ +++ twin_window_show(pane->window); +++ twin_window_queue_paint(pane->window); +++ +++ return pane; +++ +++fail_window: +++ talloc_free(pane); +++ return NULL; +++} +++ +++//============================================================================== +++// junk +++//============================================================================== +++ +++#if 0 +++ +++static pboot_device_t *pboot_devices[PBOOT_MAX_DEV]; +++static int pboot_dev_count; +++static int pboot_dev_sel = -1; +++ +++ +++ +++ +++static int pboot_vmode_change = -1; +++ +++static void pboot_message(const char *fmt, ...) +++{ +++ va_list ap; +++ char *msg; +++ +++ va_start(ap, fmt); +++ vasprintf(&msg, fmt, ap); +++ va_end(ap); +++ +++ pb_log(msg); +++} +++ +++static void pboot_draw_option_cache(pboot_device_t *dev, pboot_option_t *opt, +++ int index) +++{ +++ twin_pixmap_t *px; +++ twin_path_t *path; +++ twin_fixed_t tx, ty; +++ +++ /* Create pixmap */ +++ px = twin_pixmap_create(TWIN_ARGB32, opt->box.right - opt->box.left, +++ opt->box.bottom - opt->box.top); +++ assert(px); +++ opt->cache = px; +++ +++ /* Fill background */ +++ twin_fill(px, 0x00000000, TWIN_SOURCE, 0, 0, px->width, px->height); +++ +++ /* Allocate a path for drawing */ +++ path = twin_path_create(); +++ assert(path); +++ +++#if 0 +++ /* TEST - Bounding rectangle */ +++ twin_path_rectangle(path, 0, 0, +++ twin_int_to_fixed(px->width), +++ twin_int_to_fixed(px->height)); +++ twin_paint_path(px, PBOOT_RIGHT_TITLE_COLOR, path); +++ twin_path_empty(path); +++ twin_fill(px, 0x00000000, TWIN_SOURCE, 2, 2, +++ px->width - 3, px->height - 3); +++#endif +++ +++ /* Draw texts */ +++ twin_path_set_font_size(path, PBOOT_RIGHT_TITLE_TEXT_SIZE); +++ twin_path_set_font_style(path, TWIN_TEXT_UNHINTED); +++ tx = twin_int_to_fixed(PBOOT_RIGHT_TITLE_XOFFSET); +++ ty = twin_int_to_fixed(PBOOT_RIGHT_TITLE_YOFFSET); +++ twin_path_move (path, tx, ty); +++ twin_path_utf8 (path, opt->title); +++ twin_paint_path (px, PBOOT_RIGHT_TITLE_COLOR, path); +++ twin_path_empty (path); +++ +++ if (opt->subtitle) { +++ twin_path_set_font_size(path, PBOOT_RIGHT_SUBTITLE_TEXT_SIZE); +++ twin_path_set_font_style(path, TWIN_TEXT_UNHINTED); +++ tx = twin_int_to_fixed(PBOOT_RIGHT_SUBTITLE_XOFFSET); +++ ty = twin_int_to_fixed(PBOOT_RIGHT_SUBTITLE_YOFFSET); +++ twin_path_move (path, tx, ty); +++ twin_path_utf8 (path, opt->subtitle); +++ twin_paint_path (px, PBOOT_RIGHT_SUBTITLE_COLOR, path); +++ twin_path_empty (path); +++ } +++ +++ if (opt->badge) { +++ twin_operand_t src; +++ +++ src.source_kind = TWIN_PIXMAP; +++ src.u.pixmap = opt->badge; +++ +++ twin_composite(px, PBOOT_RIGHT_BADGE_XOFFSET, +++ PBOOT_RIGHT_BADGE_YOFFSET, +++ &src, 0, 0, NULL, 0, 0, TWIN_OVER, +++ opt->badge->width, opt->badge->height); +++ } +++ +++ +++ /* Destroy path */ +++ twin_path_destroy(path); +++} +++ +++ +++ +++static int pboot_add_option(int devindex, const char *title, +++ const char *subtitle, twin_pixmap_t *badge, void *data) +++{ +++ pboot_device_t *dev; +++ pboot_option_t *opt; +++ twin_coord_t width; +++ int index; +++ struct pbt_menu *menu = NULL; +++ +++ if (devindex < 0 || devindex >= pboot_dev_count) +++ return -1; +++ dev = pboot_devices[devindex]; +++ +++ if (dev->option_count >= PBOOT_MAX_OPTION) +++ return -1; +++ index = dev->option_count++; +++ opt = &dev->options[index]; +++ +++ opt->title = malloc(strlen(title) + 1); +++ strcpy(opt->title, title); +++ +++ if (subtitle) { +++ opt->subtitle = malloc(strlen(subtitle) + 1); +++ strcpy(opt->subtitle, subtitle); +++ } else +++ opt->subtitle = NULL; +++ +++ opt->badge = badge; +++ opt->cache = NULL; +++ +++ width = menu->op->window->pixmap->width - +++ (PBOOT_RIGHT_OPTION_LMARGIN + PBOOT_RIGHT_OPTION_RMARGIN); +++ +++ opt->box.left = PBOOT_RIGHT_OPTION_LMARGIN; +++ opt->box.right = opt->box.left + width; +++ opt->box.top = PBOOT_RIGHT_OPTION_TMARGIN + +++ index * PBOOT_RIGHT_OPTION_STRIDE; +++ opt->box.bottom = opt->box.top + PBOOT_RIGHT_OPTION_HEIGHT; +++ +++ opt->data = data; +++ return index; +++} +++ +++static void pboot_set_device_select(struct pbt_menu *menu, int sel, int force) +++{ +++ pb_log("%s: %d -> %d\n", __FUNCTION__, pboot_dev_sel, sel); +++ if (!force && sel == pboot_dev_sel) +++ return; +++ if (sel >= pboot_dev_count) +++ return; +++ pboot_dev_sel = sel; +++ if (force) { +++ menu->dp->focus_curindex = sel; +++ if (sel < 0) +++ menu->dp->focus_target = 0 - PBOOT_LEFT_FOCUS_HEIGHT; +++ else +++ menu->dp->focus_target = PBOOT_LEFT_FOCUS_YOFF + +++ PBOOT_LEFT_ICON_STRIDE * sel; +++ menu->op->focus_box.bottom = menu->dp->focus_target; +++ menu->op->focus_box.bottom = menu->op->focus_box.top + +++ PBOOT_RIGHT_FOCUS_HEIGHT; +++ twin_window_damage(menu->dp->window, +++ 0, 0, +++ menu->dp->window->pixmap->width, +++ menu->dp->window->pixmap->height); +++ twin_window_queue_paint(menu->dp->window); +++ } +++ menu->op->focus_curindex = -1; +++ menu->op->mouse_target = -1; +++ menu->op->focus_box.top = -2*PBOOT_RIGHT_FOCUS_HEIGHT; +++ menu->op->focus_box.bottom = menu->op->focus_box.top + +++ PBOOT_RIGHT_FOCUS_HEIGHT; +++ twin_window_damage(menu->op->window, 0, 0, +++ menu->op->window->pixmap->width, +++ menu->op->window->pixmap->height); +++ twin_window_queue_paint(menu->op->window); +++} +++ +++static void pboot_quit(void) +++{ +++ kill(0, SIGINT); +++} +++ +++ +++static int pboot_add_device(const char *dev_id, twin_pixmap_t *pixmap) +++{ +++ int index; +++ pboot_device_t *dev; +++ +++ struct pbt_menu *menu = NULL; +++ +++ if (pboot_dev_count >= PBOOT_MAX_DEV) +++ return -1; +++ +++ index = pboot_dev_count++; +++ +++ dev = malloc(sizeof(*dev)); +++ memset(dev, 0, sizeof(*dev)); +++ dev->id = malloc(strlen(dev_id) + 1); +++ strcpy(dev->id, dev_id); +++ dev->badge = pixmap; +++ dev->box.left = PBOOT_LEFT_ICON_XOFF; +++ dev->box.right = dev->box.left + PBOOT_LEFT_ICON_WIDTH; +++ dev->box.top = PBOOT_LEFT_ICON_YOFF + +++ PBOOT_LEFT_ICON_STRIDE * index; +++ dev->box.bottom = dev->box.top + PBOOT_LEFT_ICON_HEIGHT; +++ +++ pboot_devices[index] = dev; +++ +++ twin_window_damage(menu->dp->window, +++ dev->box.left, dev->box.top, +++ dev->box.right, dev->box.bottom); +++ twin_window_queue_paint(menu->dp->window); +++ +++ return index; +++} +++ +++static int pboot_remove_device(const char *dev_id) +++{ +++ pboot_device_t *dev = NULL; +++ int i, newsel = pboot_dev_sel; +++ +++ struct pbt_menu *menu = NULL; +++ +++ /* find the matching device */ +++ for (i = 0; i < pboot_dev_count; i++) { +++ if (!strcmp(pboot_devices[i]->id, dev_id)) { +++ dev = pboot_devices[i]; +++ break; +++ } +++ } +++ +++ if (!dev) +++ return TWIN_FALSE; +++ +++ memmove(pboot_devices + i, pboot_devices + i + 1, +++ sizeof(*pboot_devices) * (pboot_dev_count + i - 1)); +++ pboot_devices[--pboot_dev_count] = NULL; +++ +++ /* select the newly-focussed device */ +++ if (pboot_dev_sel > i) +++ newsel = pboot_dev_sel - 1; +++ else if (pboot_dev_sel == i && i >= pboot_dev_count) +++ newsel = pboot_dev_count - 1; +++ pboot_set_device_select(menu, newsel, 1); +++ +++ /* todo: free device & options */ +++ +++ return TWIN_TRUE; +++} +++#endif +++ +++//------------------------------------------------------------------------------ +++ +++static void print_version(void) +++{ +++ printf("pb-twin (" PACKAGE_NAME ") " PACKAGE_VERSION "\n"); +++} +++ +++static void print_usage(void) +++{ +++ print_version(); +++ printf( +++"Usage: pb-twin [-h, --help] [-l, --log log-file] [-r, --reset-defaults]\n" +++" [-t, --timeout] [-V, --version]\n"); +++} +++ +++/** +++ * enum opt_value - Tri-state options variables. +++ */ +++ +++enum opt_value {opt_undef = 0, opt_yes, opt_no}; +++ +++/** +++ * struct opts - Values from command line options. +++ */ +++ +++struct opts { +++ enum opt_value show_help; +++ const char *log_file; +++ enum opt_value reset_defaults; +++ enum opt_value use_timeout; +++ enum opt_value show_version; +++}; +++ +++/** +++ * opts_parse - Parse the command line options. +++ */ +++ +++static int opts_parse(struct opts *opts, int argc, char *argv[]) +++{ +++ static const struct option long_options[] = { +++ {"help", no_argument, NULL, 'h'}, +++ {"log", required_argument, NULL, 'l'}, +++ {"reset-defaults", no_argument, NULL, 'r'}, +++ {"timeout", no_argument, NULL, 't'}, +++ {"version", no_argument, NULL, 'V'}, +++ { NULL, 0, NULL, 0}, +++ }; +++ static const char short_options[] = "hl:trV"; +++ static const struct opts default_values = { +++ .log_file = "pb-twin.log", +++ }; +++ +++ *opts = default_values; +++ +++ while (1) { +++ int c = getopt_long(argc, argv, short_options, long_options, +++ NULL); +++ +++ if (c == EOF) +++ break; +++ +++ switch (c) { +++ case 'h': +++ opts->show_help = opt_yes; +++ break; +++ case 'l': +++ opts->log_file = optarg; +++ break; +++ case 't': +++ opts->use_timeout = opt_yes; +++ break; +++ case 'r': +++ opts->reset_defaults = opt_yes; +++ break; +++ case 'V': +++ opts->show_version = opt_yes; +++ break; +++ default: +++ opts->show_help = opt_yes; +++ return -1; +++ } +++ } +++ +++ return optind != argc; +++} +++ +++/** +++ * struct ps3_gui - Main gui program instance. +++ */ +++ +++ +++struct ps3_gui { +++ struct ui_timer timer; +++ struct ps3_flash_values values; +++ int dirty_values; +++ +++ struct pbt_scr scr; +++ struct pbt_frame frame; +++ struct pbt_menu *menu; +++}; +++ +++static struct ps3_gui ps3; +++ +++static struct pbt_scr *pbt_scr_from_tscreen(twin_screen_t *tscreen) +++{ +++ assert(ps3.scr.sig == pbt_scr_sig); +++ assert(ps3.scr.tscreen == tscreen); +++ return &ps3.scr; +++} +++ +++static void sig_handler(int signum) +++{ +++ DBGS("%d\n", signum); +++ +++ switch (signum) { +++ case SIGALRM: +++ ui_timer_sigalrm(&ps3.timer); +++ break; +++ case SIGWINCH: +++// if (ps3.gui) +++// gui_resize(ps3.gui); +++ break; +++ default: +++ assert(0 && "unknown sig"); +++ /* fall through */ +++ case SIGINT: +++ case SIGHUP: +++ case SIGTERM: +++ exit(EXIT_FAILURE); +++// if (ps3.gui) +++// gui_abort(ps3.gui); +++ break; +++ } +++} +++ +++/** +++ * main - twin bootloader main routine. +++ */ +++ +++int main(int argc, char *argv[]) +++{ +++ static struct sigaction sa; +++ static struct opts opts; +++ int result; +++ int ui_result; +++ unsigned int mode; +++ FILE *log; +++ +++ result = opts_parse(&opts, argc, argv); +++ +++ if (result) { +++ print_usage(); +++ return EXIT_FAILURE; +++ } +++ +++ if (opts.show_help == opt_yes) { +++ print_usage(); +++ return EXIT_SUCCESS; +++ } +++ +++ if (opts.show_version == opt_yes) { +++ print_version(); +++ return EXIT_SUCCESS; +++ } +++ +++ log = fopen(opts.log_file, "a"); +++ assert(log); +++ pb_log_set_stream(log); +++ +++#if defined(DEBUG) +++ pb_log_always_flush(1); +++#endif +++ +++ pb_log("--- pb-twin ---\n"); +++ +++ sa.sa_handler = sig_handler; +++ result = sigaction(SIGALRM, &sa, NULL); +++ result += sigaction(SIGHUP, &sa, NULL); +++ result += sigaction(SIGINT, &sa, NULL); +++ result += sigaction(SIGTERM, &sa, NULL); +++ result += sigaction(SIGWINCH, &sa, NULL); +++ +++ if (result) { +++ pb_log("%s sigaction failed.\n", __func__); +++ return EXIT_FAILURE; +++ } +++ +++ ps3.values = ps3_flash_defaults; +++ +++ if (opts.reset_defaults != opt_yes) +++ ps3.dirty_values = ps3_flash_get_values(&ps3.values); +++ +++ twin_feature_init(); // need it??? +++ +++ /* Setup screen. */ +++ +++ ps3.scr.sig = pbt_scr_sig; +++ +++#if defined(HAVE_LIBTWIN_TWIN_X11_H) +++# if defined(USE_X11) +++ if (1) { +++# else +++ if (0) { +++# endif +++ ps3.scr.x11 = twin_x11_create(XOpenDisplay(0), 1024, 768); +++ +++ if (!ps3.scr.x11) { +++ perror("failed to create x11 screen !\n"); +++ return EXIT_FAILURE; +++ } +++ +++ ps3.scr.tscreen = ps3.scr.x11->screen; +++ } else { +++#else +++ if (1) { +++#endif +++ result = ps3_get_video_mode(&mode); +++ +++ /* Current becomes default if ps3_flash_get_values() failed. */ +++ +++ if (ps3.dirty_values && !result) +++ ps3.values.video_mode = mode; +++ +++ /* Set mode if not at default. */ +++ +++ if (!result && (ps3.values.video_mode != (uint16_t)mode)) +++ ps3_set_video_mode(ps3.values.video_mode); +++ +++ ps3.scr.fbdev = twin_fbdev_create(-1, SIGUSR1); +++ +++ if (!ps3.scr.fbdev) { +++ perror("failed to create fbdev screen !\n"); +++ return EXIT_FAILURE; +++ } +++ +++ ps3.scr.tscreen = ps3.scr.fbdev->screen; +++ } +++ +++ ps3.scr.tscreen->event_filter = pbt_scr_event; +++ +++ twin_screen_set_background(ps3.scr.tscreen, +++ pbt_load_background(ps3.scr.tscreen)); +++ +++ /* setup menu */ +++ +++ ps3.menu = pbt_menu_create(NULL, &ps3.scr); +++ +++ pbt_device_pane_set_focus(ps3.menu, 0); +++ twin_screen_set_active(ps3.scr.tscreen, ps3.menu->dp->window->pixmap); +++ +++ /* Console switch */ +++ +++ if (ps3.scr.fbdev) +++ twin_fbdev_activate(ps3.scr.fbdev); +++ +++ /* run twin */ +++ +++// twin_toplevel_show(ps3.toplevel); +++ twin_dispatch(); +++ +++ pb_log("--- end ---\n"); +++ +++ return ui_result ? EXIT_FAILURE : EXIT_SUCCESS; +++} +diff --git a/feeds/packages/utils/petitboot/patches/010-petitboot-fixups.diff b/feeds/packages/utils/petitboot/patches/010-petitboot-fixups.diff +new file mode 100644 +index 0000000..cdc0c74 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/patches/010-petitboot-fixups.diff +@@ -0,0 +1,391 @@ ++ 12 files changed, 96 insertions(+), 40 deletions(-) ++ ++diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c ++index 23d48a4..7c7cb5d 100644 ++--- a/discover/kboot-parser.c +++++ b/discover/kboot-parser.c ++@@ -133,7 +133,7 @@ static int kboot_parse(struct discover_context *dc) ++ conf = talloc_zero(dc, struct conf_context); ++ ++ if (!conf) ++- return -1; +++ return 0; ++ ++ conf->dc = dc; ++ conf->global_options = kboot_global_options, ++diff --git a/discover/parser.c b/discover/parser.c ++index 2b4ddd2..8f2735c 100644 ++--- a/discover/parser.c +++++ b/discover/parser.c ++@@ -13,16 +13,16 @@ extern struct parser __start_parsers[], __stop_parsers[]; ++ void iterate_parsers(struct discover_context *ctx) ++ { ++ struct parser *parser; +++ unsigned int count = 0; ++ ++ pb_log("trying parsers for %s\n", ctx->device_path); ++ ++ for (parser = __start_parsers; parser < __stop_parsers; parser++) { ++ pb_log("\ttrying parser '%s'\n", parser->name); ++- /* just use a dummy device path for now */ ++- if (parser->parse(ctx)) ++- return; +++ count += parser->parse(ctx); ++ } ++- pb_log("\tno boot_options found\n"); +++ if (!count) +++ pb_log("\tno boot_options found\n"); ++ } ++ ++ static int compare_parsers(const void *a, const void *b) ++diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c ++index 1000505..6101cd8 100644 ++--- a/discover/yaboot-parser.c +++++ b/discover/yaboot-parser.c ++@@ -295,7 +295,7 @@ static int yaboot_parse(struct discover_context *dc) ++ conf = talloc_zero(dc, struct conf_context); ++ ++ if (!conf) ++- return -1; +++ return 0; ++ ++ conf->dc = dc; ++ conf->global_options = yaboot_global_options, ++diff --git a/lib/log/log.h b/lib/log/log.h ++index 2a5d375..6f44bea 100644 ++--- a/lib/log/log.h +++++ b/lib/log/log.h ++@@ -3,7 +3,7 @@ ++ ++ #include ++ ++-void pb_log(const char *fmt, ...); +++void __attribute__ ((format (printf, 1, 2))) pb_log(const char *fmt, ...); ++ void pb_log_set_stream(FILE *stream); ++ FILE * pb_log_get_stream(void); ++ void pb_log_always_flush(int state); ++diff --git a/lib/system/system.c b/lib/system/system.c ++index 65bd6bf..7371445 100644 ++--- a/lib/system/system.c +++++ b/lib/system/system.c ++@@ -20,6 +20,7 @@ const struct pb_system_apps pb_system_apps = { ++ .cp = "/bin/cp", ++ .kexec = "/sbin/kexec", ++ .mount = "/bin/mount", +++ .shutdown = "/sbin/shutdown", ++ .sftp = "/usr/bin/sftp", ++ .tftp = "/usr/bin/tftp", ++ .umount = "/bin/umount", ++diff --git a/lib/system/system.h b/lib/system/system.h ++index 47c7c02..1918309 100644 ++--- a/lib/system/system.h +++++ b/lib/system/system.h ++@@ -5,6 +5,7 @@ struct pb_system_apps { ++ const char *cp; ++ const char *kexec; ++ const char *mount; +++ const char *shutdown; ++ const char *sftp; ++ const char *tftp; ++ const char *umount; ++diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c ++index e8ce4dd..5b42b6c 100644 ++--- a/ui/common/discover-client.c +++++ b/ui/common/discover-client.c ++@@ -46,7 +46,7 @@ struct discover_client* discover_client_init( ++ client->ops.cb_arg = cb_arg; ++ ++ client->fd = socket(AF_UNIX, SOCK_STREAM, 0); ++- if (!client->fd < 0) { +++ if (client->fd < 0) { ++ pb_log("%s: socket: %s\n", __func__, strerror(errno)); ++ goto out_err; ++ } ++diff --git a/ui/common/loader.c b/ui/common/loader.c ++index 0fe62a0..5c69533 100644 ++--- a/ui/common/loader.c +++++ b/ui/common/loader.c ++@@ -263,16 +263,22 @@ fail: ++ /** ++ * pb_load_file - Loads a remote file and returns the local file path. ++ * @ctx: The talloc context to associate with the returned string. +++ * @remote: The remote file URL. +++ * @tempfile: An optional variable pointer to be set when a temporary local +++ * file is created. ++ * ++ * Returns the local file path in a talloc'ed character string on success, ++ * or NULL on error. ++ */ ++ ++-char *pb_load_file(void *ctx, const char *remote) +++char *pb_load_file(void *ctx, const char *remote, unsigned int *tempfile) ++ { ++ char *local; ++ struct pb_url *url = pb_url_parse(NULL, remote); ++ +++ if (tempfile) +++ *tempfile = 0; +++ ++ if (!url) ++ return NULL; ++ ++@@ -280,19 +286,28 @@ char *pb_load_file(void *ctx, const char *remote) ++ case pb_url_ftp: ++ case pb_url_http: ++ local = pb_load_wget(ctx, url, 0); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_https: ++- local = pb_load_wget(ctx, url, ++- wget_no_check_certificate); +++ local = pb_load_wget(ctx, url, wget_no_check_certificate); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_nfs: ++ local = pb_load_nfs(ctx, url); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_sftp: ++ local = pb_load_sftp(ctx, url); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ case pb_url_tftp: ++ local = pb_load_tftp(ctx, url); +++ if (tempfile && local) +++ *tempfile = 1; ++ break; ++ default: ++ local = talloc_strdup(ctx, url->full); ++diff --git a/ui/common/loader.h b/ui/common/loader.h ++index b06bb43..42d4d4b 100644 ++--- a/ui/common/loader.h +++++ b/ui/common/loader.h ++@@ -19,6 +19,6 @@ ++ #if !defined(_PB_FILE_LOADER_H) ++ #define _PB_FILE_LOADER_H ++ ++-char *pb_load_file(void *ctx, const char *remote); +++char *pb_load_file(void *ctx, const char *remote, unsigned int *tempfile); ++ ++ #endif ++diff --git a/ui/common/ps3.c b/ui/common/ps3.c ++index cb1c8d1..c62a10d 100644 ++--- a/ui/common/ps3.c +++++ b/ui/common/ps3.c ++@@ -87,7 +87,7 @@ static int ps3_flash_open(struct ps3_flash_ctx *fc, const char *mode) ++ result = os_area_fixed_read(&fc->header, &fc->params, fc->dev); ++ ++ if (result) { ++- pb_log("%s: os_area_fixed_read failed: %s\n", __func__); +++ pb_log("%s: os_area_fixed_read failed\n", __func__); ++ goto fail; ++ } ++ ++@@ -114,7 +114,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values) ++ result = ps3_flash_open(&fc, "r"); ++ ++ if (result) ++- goto done; +++ goto fail; ++ ++ result = os_area_db_read(&fc.db, &fc.header, fc.dev); ++ ++@@ -123,7 +123,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values) ++ if (result) { ++ pb_log("%s: os_area_db_read failed: %s\n", __func__, ++ strerror(errno)); ++- goto done; +++ goto fail; ++ } ++ ++ sum = result = os_area_db_get(&fc.db, &id_default_item, &tmp); ++@@ -141,14 +141,13 @@ int ps3_flash_get_values(struct ps3_flash_values *values) ++ if (!result) ++ values->video_mode = (uint16_t)tmp; ++ ++-done: ++ pb_log("%s: default_item: %x\n", __func__, ++ (unsigned int)values->default_item); ++ pb_log("%s: timeout: %u\n", __func__, ++ (unsigned int)values->timeout); ++ pb_log("%s: video_mode: %u\n", __func__, ++ (unsigned int)values->video_mode); ++- +++fail: ++ return (result || sum) ? -1 : 0; ++ } ++ ++diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c ++index bd6dd31..0140f0e 100644 ++--- a/ui/common/ui-system.c +++++ b/ui/common/ui-system.c ++@@ -33,13 +33,13 @@ ++ #include "ui-system.h" ++ ++ /** ++- * run_kexec_local - Final kexec helper. +++ * kexec_load - kexec load helper. ++ * @l_image: The local image file for kexec to execute. ++ * @l_initrd: Optional local initrd file for kexec --initrd, can be NULL. ++ * @args: Optional command line args for kexec --append, can be NULL. ++ */ ++ ++-static int run_kexec_local(const char *l_image, const char *l_initrd, +++static int kexec_load(const char *l_image, const char *l_initrd, ++ const char *args) ++ { ++ int result; ++@@ -49,34 +49,64 @@ static int run_kexec_local(const char *l_image, const char *l_initrd, ++ char *s_args = NULL; ++ ++ p = argv; ++- *p++ = pb_system_apps.kexec; /* 1 */ +++ *p++ = pb_system_apps.kexec; /* 1 */ +++ *p++ = "-l"; /* 2 */ ++ ++ if (l_initrd) { ++ s_initrd = talloc_asprintf(NULL, "--initrd=%s", l_initrd); ++ assert(s_initrd); ++- *p++ = s_initrd; /* 2 */ +++ *p++ = s_initrd; /* 3 */ ++ } ++ ++ if (args) { ++ s_args = talloc_asprintf(NULL, "--append=%s", args); ++ assert(s_args); ++- *p++ = s_args; /* 3 */ +++ *p++ = s_args; /* 4 */ ++ } ++ ++- /* First try by telling kexec to run shutdown */ +++ *p++ = l_image; /* 5 */ +++ *p++ = NULL; /* 6 */ ++ ++- *(p + 0) = l_image; ++- *(p + 1) = NULL; +++ result = pb_run_cmd(argv); +++ +++ if (result) +++ pb_log("%s: failed: (%d)\n", __func__, result); +++ +++ talloc_free(s_initrd); +++ talloc_free(s_args); +++ +++ return result; +++} +++ +++/** +++ * kexec_reboot - Helper to boot the new kernel. +++ * +++ * Must only be called after a successful call to kexec_load(). +++ */ +++ +++static int kexec_reboot(void) +++{ +++ int result; +++ const char *argv[4]; +++ const char **p; +++ +++ /* First try running shutdown. Init scripts should run 'exec -e' */ +++ +++ p = argv; +++ *p++ = pb_system_apps.shutdown; /* 1 */ +++ *p++ = "-r"; /* 2 */ +++ *p++ = "now"; /* 3 */ +++ *p++ = NULL; /* 4 */ ++ ++ result = pb_run_cmd(argv); ++ ++- /* kexec will return zero on success */ ++- /* On error, force a kexec with the -f option */ +++ /* On error, force a kexec with the -e option */ ++ ++ if (result) { ++- *(p + 0) = "-f"; /* 4 */ ++- *(p + 1) = l_image; /* 5 */ ++- *(p + 2) = NULL; /* 6 */ +++ p = argv; +++ *p++ = pb_system_apps.kexec; /* 1 */ +++ *p++ = "-e"; /* 2 */ +++ *p++ = NULL; /* 3 */ ++ ++ result = pb_run_cmd(argv); ++ } ++@@ -84,9 +114,6 @@ static int run_kexec_local(const char *l_image, const char *l_initrd, ++ if (result) ++ pb_log("%s: failed: (%d)\n", __func__, result); ++ ++- talloc_free(s_initrd); ++- talloc_free(s_args); ++- ++ return result; ++ } ++ ++@@ -99,31 +126,44 @@ int pb_run_kexec(const struct pb_kexec_data *kd) ++ int result; ++ char *l_image = NULL; ++ char *l_initrd = NULL; +++ unsigned int clean_image = 0; +++ unsigned int clean_initrd = 0; ++ ++ pb_log("%s: image: '%s'\n", __func__, kd->image); ++ pb_log("%s: initrd: '%s'\n", __func__, kd->initrd); ++ pb_log("%s: args: '%s'\n", __func__, kd->args); ++ +++ result = -1; +++ ++ if (kd->image) { ++- l_image = pb_load_file(NULL, kd->image); +++ l_image = pb_load_file(NULL, kd->image, &clean_image); ++ if (!l_image) ++- return -1; +++ goto no_load; ++ } ++ ++ if (kd->initrd) { ++- l_initrd = pb_load_file(NULL, kd->initrd); +++ l_initrd = pb_load_file(NULL, kd->initrd, &clean_initrd); ++ if (!l_initrd) ++- return -1; +++ goto no_load; ++ } ++ ++ if (!l_image && !l_initrd) ++- return -1; +++ goto no_load; +++ +++ result = kexec_load(l_image, l_initrd, kd->args); ++ ++- result = run_kexec_local(l_image, l_initrd, kd->args); +++no_load: +++ if (clean_image) +++ unlink(l_image); +++ if (clean_initrd) +++ unlink(l_initrd); ++ ++ talloc_free(l_image); ++ talloc_free(l_initrd); ++ +++ if (!result) +++ result = kexec_reboot(); +++ ++ return result; ++ } ++ ++diff --git a/ui/common/url.c b/ui/common/url.c ++index 0de0f58..544eee2 100644 ++--- a/ui/common/url.c +++++ b/ui/common/url.c ++@@ -140,7 +140,7 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str) ++ path = strchr(p, '/'); ++ ++ if (!path) { ++- pb_log("%s: parse path failed '%s'\n", p); +++ pb_log("%s: parse path failed '%s'\n", __func__ , p); ++ goto fail; ++ } ++ +diff --git a/feeds/packages/utils/petitboot/patches/020-petitboot-fix-pb-twin.diff b/feeds/packages/utils/petitboot/patches/020-petitboot-fix-pb-twin.diff +new file mode 100644 +index 0000000..aa24f56 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/patches/020-petitboot-fix-pb-twin.diff +@@ -0,0 +1,1521 @@ ++a work-in-progress ++ ++Subject: Update PS3 twin GUI program ++ ++Update the PS3 twin GUI program to work with petitboot-multi-ui. ++ ++Signed-off-by: Geoff Levand ++--- ++ Makefile.in | 1 ++ configure.ac | 12 ++ rules.mk | 14 ++ ui/twin/ps3-twin.c | 1441 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ 4 files changed, 1463 insertions(+), 5 deletions(-) ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -18,6 +18,7 @@ twin_LDFLAGS = @twin_LIBS@ ++ ++ # build target ++ ENABLE_PS3 = @ENABLE_PS3@ +++ENABLE_X11 = @ENABLE_X11@ ++ ++ # other programs ++ INSTALL = @INSTALL@ ++--- a/configure.ac +++++ b/configure.ac ++@@ -56,7 +56,17 @@ AS_IF([test "x$with_twin" != xno], ++ [if test "x$with_twin" != xcheck; then ++ AC_MSG_FAILURE([--with-twin was given, but test for twin failed]) ++ fi], ++- [${twin_LIBS}])]) +++ [${twin_LIBS}]) +++ AC_CHECK_HEADERS([libtwin/twin_x11.h])]) +++ +++AC_ARG_ENABLE([x11], +++ [AS_HELP_STRING([--enable-x11], +++ [build for x11])], +++ [], +++ [enable_x11=check]) +++ +++AS_IF([test "x$enable_x11" != xno], [AC_SUBST([ENABLE_X11], ["y"])], []) +++ ++ ++ mkdir -p discover lib/list lib/log lib/pb-protocol lib/system lib/talloc \ ++ lib/waiter test ui/common ui/ncurses ui/test ui/twin utils ++--- a/rules.mk +++++ b/rules.mk ++@@ -54,7 +54,7 @@ ui_common_objs = ui/common/discover-clie ++ ui/common/url.o ++ ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o ui/ncurses/nc-ked.o \ ++ ui/ncurses/nc-cui.o ++-twin_objs = ui/twin/pb-twin.o +++twin_objs = ++ ++ # Makefiles ++ makefiles = Makefile $(top_srcdir)/rules.mk ++@@ -89,11 +89,17 @@ $(pb_test): $(pb_test_objs) ++ $(LINK.o) -o $@ $^ ++ ++ # twin gui ++-pb_twin_objs = $(client_objs) $(twin_objs) ui/twin/ps3-twin.o +++pb_twin_objs-y$(ENABLE_PS3) += ui/twin/pb-twin.o +++pb_twin_objs-$(ENABLE_PS3) += ui/twin/ps3-twin.o ui/common/ps3.o +++pb_twin_cflags-$(ENABLE_X11) += -DUSE_X11 +++pb_twin_ldflags-$(ENABLE_PS3) += -lps3-utils +++ +++pb_twin_objs = $(client_objs) $(twin_objs) $(pb_twin_objs-y) ++ $(pb_twin_objs): $(makefiles) ++ ++-$(pb_twin): LDFLAGS+=$(twin_LDFLAGS) $(LIBTWIN) ++-$(pb_twin): CFLAGS+=$(twin_CFLAGS) +++$(pb_twin): LDFLAGS += $(pb_twin_ldflags-y) $(twin_LDFLAGS) $(LIBTWIN) +++$(pb_twin): CFLAGS += $(pb_twin_cflags-y) $(twin_CFLAGS) \ +++ -DPB_ARTWORK_PATH='"$(pkgdatadir)/artwork/"' ++ ++ $(pb_twin): $(pb_twin_objs) ++ $(LINK.o) -o $@ $^ ++--- /dev/null +++++ b/ui/twin/ps3-twin.c ++@@ -0,0 +1,1441 @@ +++/* +++ * Petitboot twin bootloader for the PS3 game console +++ * +++ * Copyright (C) 2009 Sony Computer Entertainment Inc. +++ * Copyright 2009 Sony Corp. +++ * +++ * 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; version 2 of the License. +++ * +++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +++ */ +++ +++#if defined(HAVE_CONFIG_H) +++#include "config.h" +++#endif +++ +++#define _GNU_SOURCE +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#if defined(HAVE_LIBTWIN_TWIN_X11_H) +++# include +++#endif +++#include +++ +++#include "log/log.h" +++#include "talloc/talloc.h" +++#include "waiter/waiter.h" +++#include "ui/common/discover-client.h" +++#include "ui/common/ps3.h" +++#include "ui/common/timer.h" +++ +++//------------------------------------------------------------------------------ +++// twin-ui.c/h +++ +++#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args) +++#define DBGS(fmt, args...) \ +++ pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) +++ +++/* control to keyboard mappings for the sixaxis controller */ +++uint8_t sixaxis_map[] = { +++ 0, /* 0 Select */ +++ 0, /* 1 L3 */ +++ 0, /* 2 R3 */ +++ 0, /* 3 Start */ +++ KEY_UP, /* 4 Dpad Up */ +++ KEY_RIGHT, /* 5 Dpad Right */ +++ KEY_DOWN, /* 6 Dpad Down */ +++ KEY_LEFT, /* 7 Dpad Left */ +++ 0, /* 8 L2 */ +++ 0, /* 9 R2 */ +++ 0, /* 10 L1 */ +++ 0, /* 11 R1 */ +++ 0, /* 12 Triangle */ +++ KEY_ENTER, /* 13 Circle */ +++ 0, /* 14 Cross */ +++ KEY_DELETE, /* 15 Square */ +++ 0, /* 16 PS Button */ +++ 0, /* 17 nothing */ +++ 0, /* 18 nothing */ +++}; +++ +++#define PBOOT_LEFT_PANE_SIZE 160 +++#define PBOOT_LEFT_PANE_COLOR 0x80000000 +++#define PBOOT_LEFT_LINE_COLOR 0xff000000 +++ +++#define PBOOT_LEFT_FOCUS_WIDTH 80 +++#define PBOOT_LEFT_FOCUS_HEIGHT 80 +++#define PBOOT_LEFT_FOCUS_XOFF 40 +++#define PBOOT_LEFT_FOCUS_YOFF 40 +++#define PBOOT_LEFT_FOCUS_XRAD (6 * TWIN_FIXED_ONE) +++#define PBOOT_LEFT_FOCUS_YRAD (6 * TWIN_FIXED_ONE) +++ +++#define PBOOT_RIGHT_FOCUS_XOFF 20 +++#define PBOOT_RIGHT_FOCUS_YOFF 60 +++#define PBOOT_RIGHT_FOCUS_HEIGHT 80 +++#define PBOOT_RIGHT_FOCUS_XRAD (6 * TWIN_FIXED_ONE) +++#define PBOOT_RIGHT_FOCUS_YRAD (6 * TWIN_FIXED_ONE) +++ +++#define PBOOT_LEFT_ICON_WIDTH 64 +++#define PBOOT_LEFT_ICON_HEIGHT 64 +++#define PBOOT_LEFT_ICON_XOFF 50 +++#define PBOOT_LEFT_ICON_YOFF 50 +++#define PBOOT_LEFT_ICON_STRIDE 100 +++ +++#define PBOOT_RIGHT_OPTION_LMARGIN 30 +++#define PBOOT_RIGHT_OPTION_RMARGIN 30 +++#define PBOOT_RIGHT_OPTION_TMARGIN 70 +++#define PBOOT_RIGHT_OPTION_HEIGHT 64 +++#define PBOOT_RIGHT_OPTION_STRIDE 100 +++#define PBOOT_RIGHT_TITLE_TEXT_SIZE (30 * TWIN_FIXED_ONE) +++#define PBOOT_RIGHT_SUBTITLE_TEXT_SIZE (18 * TWIN_FIXED_ONE) +++#define PBOOT_RIGHT_TITLE_XOFFSET 80 +++#define PBOOT_RIGHT_TITLE_YOFFSET 30 +++#define PBOOT_RIGHT_SUBTITLE_XOFFSET 100 +++#define PBOOT_RIGHT_SUBTITLE_YOFFSET 50 +++#define PBOOT_RIGHT_BADGE_XOFFSET 2 +++#define PBOOT_RIGHT_BADGE_YOFFSET 0 +++ +++ +++#define PBOOT_RIGHT_TITLE_COLOR 0xff000000 +++#define PBOOT_RIGHT_SUBTITLE_COLOR 0xff400000 +++ +++#define PBOOT_FOCUS_COLOR 0x10404040 +++ +++#define PBOOT_STATUS_PANE_COLOR 0x60606060 +++#define PBOOT_STATUS_PANE_HEIGHT 20 +++#define PBOOT_STATUS_PANE_XYMARGIN 20 +++#define PBOOT_STATUS_TEXT_MARGIN 10 +++#define PBOOT_STATUS_TEXT_SIZE (16 * TWIN_FIXED_ONE) +++#define PBOOT_STATUS_TEXT_COLOR 0xff000000 +++ +++#define PBOOT_MAX_OPTION 100 +++#define PBOOT_MAX_DEV 10 +++ +++struct pbt_option +++{ +++ char *title; +++ char *subtitle; +++ twin_pixmap_t *badge; +++ twin_pixmap_t *cache; +++ twin_rect_t box; +++ void *data; +++}; +++ +++struct pbt_device +++{ +++ char *id; +++ twin_pixmap_t *badge; +++ twin_rect_t box; +++ int option_count; +++ struct pbt_option options[PBOOT_MAX_OPTION]; +++}; +++ +++enum pbt_sig { +++ pbt_scr_sig = 111, +++ pbt_menu_sig = 222, +++ pbt_pane_sig = 333, +++ pb_removed_sig = -555, +++}; +++ +++struct pbt_cursor { +++ twin_pixmap_t *pixmap; +++ int hx; +++ int hy; +++}; +++ +++struct pbt_scr { +++ enum pbt_sig sig; +++ struct pbt_cursor cursor; +++ twin_screen_t *tscreen; +++#if defined(HAVE_LIBTWIN_TWIN_X11_H) +++ twin_x11_t *x11; +++#endif +++ twin_fbdev_t *fbdev; +++}; +++ +++struct pbt_frame { +++ twin_label_t *title; +++ twin_label_t *help; +++ twin_label_t *status; +++}; +++ +++/** +++ * struct pbt_pane - A twin menu pane. +++ */ +++ +++struct pbt_pane { +++ enum pbt_sig sig; +++ twin_window_t *window; +++ twin_rect_t focus_box; +++ int focus_start; +++ int focus_target; +++ int focus_curindex; +++ int mouse_target; +++ int has_focus; +++}; +++ +++/** +++ * struct pbt_menu - A twin menu. +++ * @sig: Sanity check signature. +++ * @scr: The screen this menu is associated with. +++ * @dp: The device pane instance. +++ * @op: The option pane instance. +++ */ +++ +++struct pbt_menu { +++ enum pbt_sig sig; +++ struct pbt_scr *scr; +++ struct pbt_pane *dp; +++ struct pbt_pane *op; +++}; +++ +++//============================================================================== +++// helper +++//============================================================================== +++ +++static struct pbt_scr *pbt_scr_from_tscreen(twin_screen_t *tscreen); +++ +++static struct pbt_menu *pbt_menu_from_twindow(twin_window_t *twindow) +++{ +++ struct pbt_menu *menu = twindow->client_data; +++ +++ assert(menu); +++ assert(menu->sig == pbt_menu_sig); +++ return menu; +++} +++ +++/* +++static struct pbt_menu *pbt_menu_from_arg(void *arg) +++{ +++ struct pbt_menu *menu = arg; +++ +++ assert(menu); +++ assert(menu->sig == pbt_menu_sig); +++ return menu; +++} +++*/ +++ +++static struct pbt_pane *pbt_pane_from_arg(void *arg) +++{ +++ struct pbt_pane *pane = arg; +++ +++ assert(pane); +++ assert(pane->sig == pbt_pane_sig); +++ return pane; +++} +++ +++static twin_bool_t pbt_rect_intersect(twin_rect_t r1, twin_rect_t r2) +++{ +++ // FIXME: move this to twin!!! +++ return !(r1.left > r2.right || +++ r1.right < r2.left || +++ r1.top > r2.bottom || +++ r1.bottom < r2.top); +++} +++ +++static twin_pixmap_t * pbt_load_background(twin_screen_t *tscreen) +++{ +++ static const char *bgd = PB_ARTWORK_PATH "/background.jpg"; +++ twin_pixmap_t *rawpix; +++ twin_pixmap_t *scaledpix; +++ +++ rawpix = twin_jpeg_to_pixmap(bgd, TWIN_ARGB32); +++ +++ if (!rawpix) { +++ pb_log("%s: loading image %s failed\n", __func__, bgd); +++ return twin_make_pattern(); +++ } +++ +++ if (tscreen->height == rawpix->height && +++ tscreen->width == rawpix->width) +++ return rawpix; +++ +++ /* Scale as needed. */ +++ +++ twin_fixed_t sx, sy; +++ twin_operand_t srcop; +++ +++ scaledpix = twin_pixmap_create(TWIN_ARGB32, +++ tscreen->width, +++ tscreen->height); +++ if (!scaledpix) { +++ pb_log("%s: scale %s failed\n", __func__, bgd); +++ twin_pixmap_destroy(rawpix); +++ return twin_make_pattern(); +++ } +++ sx = twin_fixed_div(twin_int_to_fixed(rawpix->width), +++ twin_int_to_fixed(tscreen->width)); +++ sy = twin_fixed_div(twin_int_to_fixed(rawpix->height), +++ twin_int_to_fixed(tscreen->height)); +++ +++ twin_matrix_scale(&rawpix->transform, sx, sy); +++ srcop.source_kind = TWIN_PIXMAP; +++ srcop.u.pixmap = rawpix; +++ twin_composite(scaledpix, 0, 0, &srcop, 0, 0, +++ NULL, 0, 0, TWIN_SOURCE, +++ tscreen->width, tscreen->height); +++ +++ twin_pixmap_destroy(rawpix); +++ return scaledpix; +++} +++ +++//============================================================================== +++// option +++//============================================================================== +++ +++static void pbt_option_execute(struct pbt_menu *menu) +++{ +++#if 0 +++ pboot_device_t *dev = pboot_devices[pboot_dev_sel]; +++ pboot_option_t *opt = &dev->options[menu->op->focus_curindex]; +++ +++ pb_log("Selected device %s\n", opt->title); +++ pboot_message("booting %s...", opt->title); +++ +++ /* Give user feedback, make sure errors and panics will be seen */ +++ pboot_exec_option(opt->data); +++#endif +++} +++ +++//============================================================================== +++// device +++//============================================================================== +++ +++//============================================================================== +++// scr +++//============================================================================== +++ +++static twin_bool_t pbt_scr_event(twin_screen_t *tscreen, twin_event_t *event) +++{ +++ struct pbt_scr *scr = pbt_scr_from_tscreen(tscreen); +++ +++ switch(event->kind) { +++ case TwinEventEnter: +++ case TwinEventMotion: +++ case TwinEventLeave: +++ case TwinEventButtonDown: +++ case TwinEventButtonUp: +++ if (scr->cursor.pixmap) +++ twin_screen_set_cursor(tscreen, scr->cursor.pixmap, +++ scr->cursor.hx, scr->cursor.hy); +++ break; +++ case TwinEventJoyButton: +++ /* map joystick events into key events */ +++ if (event->u.js.control >= sizeof(sixaxis_map)) +++ break; +++ +++ event->u.key.key = sixaxis_map[event->u.js.control]; +++ if (event->u.js.value == 0) { +++ event->kind = TwinEventKeyUp; +++ break; +++ } else { +++ event->kind = TwinEventKeyDown; +++ } +++ /* fall through.. */ +++ case TwinEventKeyDown: +++ switch(event->u.key.key) { +++ case KEY_0: +++ return TWIN_TRUE; +++ case KEY_BACKSPACE: +++ case KEY_DELETE: +++ return TWIN_FALSE; +++ } +++ case TwinEventKeyUp: +++ twin_screen_set_cursor(tscreen, NULL, 0, 0); +++ break; +++ default: +++ break; +++ } +++ return TWIN_FALSE; +++} +++ +++//============================================================================== +++// pane +++//============================================================================== +++ +++static int pbt_pane_has_focus(const struct pbt_pane *pane) +++{ +++ return pane->has_focus; +++} +++ +++static twin_time_t pbt_pane_timeout(twin_time_t now, void *closure) +++{ +++ const int accel[11] = { 7, 4, 2, 1, 1, 1, 1, 1, 2, 2, 3 }; +++ struct pbt_pane *pane = pbt_pane_from_arg(closure); +++ int dir = 1, dist, pos; +++ +++ dist = abs(pane->focus_target - pane->focus_start); +++ dir = dist > 5 ? 5 : dist; +++ pos = pane->focus_target - (int)pane->focus_box.top; +++ if (pos == 0) { +++ return -1; +++ } +++ if (pos < 0) { +++ dir = -dir; +++ pos = -pos; +++ } +++ twin_window_damage(pane->window, +++ pane->focus_box.left, +++ pane->focus_box.top, +++ pane->focus_box.right, +++ pane->focus_box.bottom); +++ +++ pane->focus_box.top += dir; +++ pane->focus_box.bottom += dir; +++ +++ twin_window_damage(pane->window, +++ pane->focus_box.left, +++ pane->focus_box.top, +++ pane->focus_box.right, +++ pane->focus_box.bottom); +++ +++ twin_window_queue_paint(pane->window); +++ +++ return accel[(pos * 10) / dist]; +++} +++ +++//============================================================================== +++// menu +++//============================================================================== +++ +++/** +++ * pbt_menu_set_focus - Set the menu's pane of focus. +++ * @menu: The menu to operate on. +++ * @pane: The pane that will have the focus. +++ */ +++ +++static void pbt_menu_set_focus(struct pbt_menu *menu, struct pbt_pane *pane) +++{ +++ assert(!pane->has_focus); +++ +++ if (pane == menu->dp) { +++ menu->dp->has_focus = 1; +++ menu->op->has_focus = 0; +++ } else if (pane == menu->op) { +++ menu->dp->has_focus = 0; +++ menu->op->has_focus = 1; +++// pbt_menu_set_option_focus(menu, 0); +++ } else +++ assert(0 && "bad logic"); +++} +++ +++static void pbt_menu_pane_select(struct pbt_menu *menu, struct pbt_pane *pane) +++{ +++ if(pbt_pane_has_focus(pane)) +++ return; +++ +++ twin_screen_set_active(menu->scr->tscreen, pane->window->pixmap); +++ +++ twin_window_damage(menu->dp->window, +++ menu->dp->focus_box.left, +++ menu->dp->focus_box.top, +++ menu->dp->focus_box.right, +++ menu->dp->focus_box.bottom); +++ twin_window_damage(menu->op->window, +++ menu->op->focus_box.left, +++ menu->op->focus_box.top, +++ menu->op->focus_box.right, +++ menu->op->focus_box.bottom); +++ +++ twin_window_queue_paint(menu->dp->window); +++ twin_window_queue_paint(menu->op->window); +++ +++ pbt_menu_set_focus(menu, pane); +++} +++ +++ +++static struct pbt_pane *pbt_device_pane_create(struct pbt_menu *menu); +++static struct pbt_pane *pbt_option_pane_create(struct pbt_menu *menu); +++ +++static struct pbt_menu *pbt_menu_create(void *ctx, struct pbt_scr *scr) +++{ +++ struct pbt_menu *menu = talloc_zero(ctx, struct pbt_menu); +++ +++ if (!menu) +++ return NULL; +++ +++ assert(scr && scr->sig == pbt_scr_sig); +++ +++ menu->sig = pbt_menu_sig; +++ menu->scr = scr; +++ +++ menu->dp = pbt_device_pane_create(menu); +++ +++ if (!menu->dp) +++ goto fail_dp; +++ +++ menu->op = pbt_option_pane_create(menu); +++ +++ if (!menu->op) +++ goto fail_op; +++ +++ return menu; +++ +++fail_op: +++ //clean dp +++fail_dp: +++ talloc_free(menu); +++ return NULL; +++} +++ +++//============================================================================== +++// device_pane +++//============================================================================== +++ +++static void pbt_device_pane_draw(twin_window_t *window) +++{ +++ struct pbt_pane *dp = pbt_menu_from_twindow(window)->dp; +++ twin_pixmap_t *px = window->pixmap; +++ twin_path_t *path; +++ twin_fixed_t x, y, w, h; +++ int i; +++ +++ /* Fill background */ +++ twin_fill(px, PBOOT_LEFT_PANE_COLOR, TWIN_SOURCE, 0, 0, px->width, +++ px->height); +++ +++ /* Create a path for use later */ +++ path = twin_path_create(); +++ assert(path); +++ +++ /* Draw right line if needed */ +++ if (px->clip.right > (PBOOT_LEFT_PANE_SIZE - 4)) { +++ x = twin_int_to_fixed(PBOOT_LEFT_PANE_SIZE - 4); +++ y = twin_int_to_fixed(px->height); +++ twin_path_rectangle(path, x, 0, 0x40000, y); +++ twin_paint_path(px, PBOOT_LEFT_LINE_COLOR, path); +++ twin_path_empty(path); +++ } +++ +++ /* Draw focus box */ +++ if (dp->focus_curindex >= 0 && +++ pbt_rect_intersect(dp->focus_box, px->clip)) { +++ x = twin_int_to_fixed(dp->focus_box.left + 2); +++ y = twin_int_to_fixed(dp->focus_box.top + 2); +++ w = twin_int_to_fixed(dp->focus_box.right - +++ dp->focus_box.left - 4); +++ h = twin_int_to_fixed(dp->focus_box.bottom - +++ dp->focus_box.top - 4); +++ twin_path_rounded_rectangle(path, x, y, w, h, +++ PBOOT_LEFT_FOCUS_XRAD, +++ PBOOT_LEFT_FOCUS_YRAD); +++ if (pbt_pane_has_focus(dp)) +++ twin_paint_path(px, PBOOT_FOCUS_COLOR, path); +++ else +++ twin_paint_stroke(px, PBOOT_FOCUS_COLOR, path, +++ 4 * TWIN_FIXED_ONE); +++ } +++ +++#if 0 +++ /* Draw icons */ +++ for (i = 0; i < pboot_dev_count; i++) { +++ pboot_device_t *dev = pboot_devices[i]; +++ twin_operand_t src; +++ +++ if (!twin_rect_intersect(dev->box, px->clip)) +++ continue; +++ +++ src.source_kind = TWIN_PIXMAP; +++ src.u.pixmap = dev->badge; +++ +++ twin_composite(px, dev->box.left, dev->box.top, +++ &src, 0, 0, NULL, 0, 0, TWIN_OVER, +++ dev->box.right - dev->box.left, +++ dev->box.bottom - dev->box.top); +++ } +++#endif +++ +++ /* Destroy path */ +++ twin_path_destroy(path); +++} +++ +++ +++static void pbt_device_pane_set_focus(struct pbt_menu *menu, int index) +++{ +++#if 0 +++ if (index >= pboot_dev_count) +++ return; +++#endif +++ +++ menu->dp->focus_start = menu->dp->focus_box.top; +++ +++ if (index < 0) +++ menu->dp->focus_target = 0 - PBOOT_LEFT_FOCUS_HEIGHT; +++ else +++ menu->dp->focus_target = PBOOT_LEFT_FOCUS_YOFF + +++ PBOOT_LEFT_ICON_STRIDE * index; +++ +++ menu->dp->focus_curindex = index; +++ +++ twin_set_timeout(pbt_pane_timeout, 0, menu->dp); +++} +++ +++static void pbt_device_pane_mousetrack(struct pbt_menu *menu, twin_coord_t x, +++ twin_coord_t y) +++{ +++ int candidate = -1; +++ twin_coord_t icon_top; +++ +++ if (x < PBOOT_LEFT_ICON_XOFF || +++ x > (PBOOT_LEFT_ICON_XOFF + PBOOT_LEFT_ICON_WIDTH)) +++ goto miss; +++ +++ if (y < PBOOT_LEFT_ICON_YOFF) +++ goto miss; +++ +++ candidate = (y - PBOOT_LEFT_ICON_YOFF) / PBOOT_LEFT_ICON_STRIDE; +++ +++#if 0 +++ if (candidate >= pboot_dev_count) { +++ candidate = -1; +++ goto miss; +++ } +++#endif +++ if (candidate == menu->dp->mouse_target) +++ return; +++ +++ icon_top = PBOOT_LEFT_ICON_YOFF + candidate * PBOOT_LEFT_ICON_STRIDE; +++ +++ if (y > (icon_top + PBOOT_LEFT_ICON_HEIGHT)) { +++ candidate = -1; +++ goto miss; +++ } +++ +++ /* The mouse hit an icon that wasn't the same +++ * as the previous one, trigger a focus change. +++ */ +++ +++ pbt_device_pane_set_focus(menu, candidate); +++ +++ miss: +++ menu->dp->mouse_target = candidate; +++} +++ +++static twin_bool_t pbt_device_pane_event(twin_window_t *window, +++ twin_event_t *event) +++{ +++ struct pbt_menu *menu = pbt_menu_from_twindow(window); +++ +++ /* filter out all mouse events */ +++ switch(event->kind) { +++ case TwinEventEnter: +++ case TwinEventMotion: +++ case TwinEventLeave: +++ pbt_menu_pane_select(menu, menu->dp); +++ pbt_device_pane_mousetrack(menu, event->u.pointer.x, +++ event->u.pointer.y); +++ return TWIN_TRUE; +++ case TwinEventButtonDown: +++ case TwinEventButtonUp: +++ return TWIN_TRUE; +++ case TwinEventKeyDown: +++ switch(event->u.key.key) { +++ case KEY_UP: +++ if (menu->dp->focus_curindex > 0) +++ pbt_device_pane_set_focus(menu, +++ menu->dp->focus_curindex - 1); +++ return TWIN_TRUE; +++ case KEY_DOWN: +++ pbt_device_pane_set_focus(menu, menu->dp->focus_curindex + 1); +++ return TWIN_TRUE; +++ case KEY_RIGHT: +++ pbt_menu_pane_select(menu, menu->op); +++ return TWIN_TRUE; +++ default: +++ break; +++ } +++ break; +++ default: +++ break; +++ } +++ return TWIN_FALSE; +++} +++ +++static struct pbt_pane *pbt_device_pane_create(struct pbt_menu *menu) +++{ +++ struct pbt_pane *pane = talloc_zero(menu, struct pbt_pane); +++ +++ if (!pane) +++ return NULL; +++ +++ pane->sig = pbt_pane_sig; +++ pane->window = twin_window_create(menu->scr->tscreen, TWIN_ARGB32, +++ TwinWindowPlain, 0, 0, PBOOT_LEFT_PANE_SIZE, +++ menu->scr->tscreen->height); +++ +++ if (!pane->window) +++ goto fail_window; +++ +++ pane->window->draw = pbt_device_pane_draw; +++ pane->window->event = pbt_device_pane_event; +++ pane->window->client_data = menu; +++ +++ pane->focus_curindex = -1; +++ pane->focus_box.left = PBOOT_LEFT_FOCUS_XOFF; +++ pane->focus_box.top = -2 * PBOOT_LEFT_FOCUS_HEIGHT; +++ pane->focus_box.right = pane->focus_box.left + PBOOT_LEFT_FOCUS_WIDTH; +++ pane->focus_box.bottom = pane->focus_box.top + PBOOT_LEFT_FOCUS_HEIGHT; +++ +++ pane->mouse_target = -1; +++ +++ twin_window_show(pane->window); +++ twin_window_queue_paint(pane->window); +++ +++ return pane; +++ +++fail_window: +++ talloc_free(pane); +++ return NULL; +++} +++ +++//============================================================================== +++// option_pane +++//============================================================================== +++ +++static void pbt_option_pane_set_focus(struct pbt_menu *menu, int index) +++{ +++#if 0 +++ pboot_device_t *dev; +++ +++ if (pboot_dev_sel < 0 || pboot_dev_sel >= pboot_dev_count) +++ return; +++ dev = pboot_devices[pboot_dev_sel]; +++ if (index < 0 || index >= dev->option_count) +++ return; +++#endif +++ +++ menu->op->focus_start = menu->op->focus_box.top; +++ menu->op->focus_target = PBOOT_RIGHT_FOCUS_YOFF + +++ PBOOT_RIGHT_OPTION_STRIDE * index; +++ menu->op->focus_curindex = index; +++ +++ twin_set_timeout(pbt_pane_timeout, 0, menu->op); +++} +++ +++static void pbt_option_pane_draw(twin_window_t *window) +++{ +++ struct pbt_pane *op = pbt_menu_from_twindow(window)->op; +++ twin_pixmap_t *px = window->pixmap; +++// pboot_device_t *dev; +++ twin_path_t *path; +++ twin_fixed_t x, y, w, h; +++ int i; +++ +++ /* Fill background */ +++ twin_fill(px, 0x00000000, TWIN_SOURCE, 0, 0, px->width, px->height); +++ +++ /* Nothing to draw, return */ +++// if (pboot_dev_sel < 0) +++// return; +++ +++ /* Create a path for use later */ +++ path = twin_path_create(); +++ assert(path); +++ +++ /* Draw focus box */ +++ if (op->focus_curindex >= 0 && +++ pbt_rect_intersect(op->focus_box, px->clip)) { +++ x = twin_int_to_fixed(op->focus_box.left + 2); +++ y = twin_int_to_fixed(op->focus_box.top + 2); +++ w = twin_int_to_fixed(op->focus_box.right - +++ op->focus_box.left - 4); +++ h = twin_int_to_fixed(op->focus_box.bottom - +++ op->focus_box.top - 4); +++ twin_path_rounded_rectangle(path, x, y, w, h, +++ PBOOT_RIGHT_FOCUS_XRAD, +++ PBOOT_RIGHT_FOCUS_YRAD); +++ if (pbt_pane_has_focus(op)) +++ twin_paint_path(px, PBOOT_FOCUS_COLOR, path); +++ else +++ twin_paint_stroke(px, PBOOT_FOCUS_COLOR, path, +++ 4 * TWIN_FIXED_ONE); +++ } +++ +++ /* Get device and iterate through options */ +++/* +++ dev = pboot_devices[pboot_dev_sel]; +++ for (i = 0; i < dev->option_count; i++) { +++ pboot_option_t *opt = &dev->options[i]; +++ twin_operand_t src; +++ +++ if (opt->title == NULL) +++ continue; +++ if (!pbt_rect_intersect(opt->box, px->clip)) +++ continue; +++ if (opt->cache == NULL) +++ pboot_draw_option_cache(dev, opt, i); +++ +++ src.source_kind = TWIN_PIXMAP; +++ src.u.pixmap = opt->cache; +++ +++ twin_composite(px, opt->box.left, opt->box.top, +++ &src, 0, 0, NULL, 0, 0, TWIN_OVER, +++ opt->box.right - opt->box.left, +++ opt->box.bottom - opt->box.top); +++ } +++*/ +++ /* Destroy path */ +++ twin_path_destroy(path); +++} +++ +++static void pbt_option_pane_mousetrack(struct pbt_menu *menu, twin_coord_t x, +++ twin_coord_t y) +++{ +++ int candidate = -1; +++ +++ if (y < PBOOT_RIGHT_OPTION_TMARGIN) +++ goto miss; +++ +++#if 0 +++ pboot_device_t *dev; +++ pboot_option_t *opt; +++ +++ if (pboot_dev_sel < 0 || pboot_dev_sel >= pboot_dev_count) +++ return; +++ +++ dev = pboot_devices[pboot_dev_sel]; +++ +++ candidate = (y - PBOOT_RIGHT_OPTION_TMARGIN) / +++ PBOOT_RIGHT_OPTION_STRIDE; +++ +++ if (candidate >= dev->option_count) { +++ candidate = -1; +++ goto miss; +++ } +++ +++ if (candidate == op->mouse_target) +++ return; +++ +++ opt = &dev->options[candidate]; +++ +++ if (x < opt->box.left || x > opt->box.right || +++ y < opt->box.top || y > opt->box.bottom) { +++ candidate = -1; +++ goto miss; +++ } +++#endif +++ +++ pbt_option_pane_set_focus(menu, candidate); +++ +++miss: +++ menu->op->mouse_target = candidate; +++} +++ +++static twin_bool_t pbt_option_pane_event(twin_window_t *window, +++ twin_event_t *event) +++{ +++ struct pbt_menu *menu = pbt_menu_from_twindow(window); +++ +++ /* filter out all mouse events */ +++ switch(event->kind) { +++ case TwinEventEnter: +++ case TwinEventMotion: +++ case TwinEventLeave: +++ pbt_menu_pane_select(menu, menu->op); +++ pbt_option_pane_mousetrack(menu, event->u.pointer.x, +++ event->u.pointer.y); +++ return TWIN_TRUE; +++ case TwinEventButtonDown: +++ pbt_menu_pane_select(menu, menu->op); +++ pbt_option_pane_mousetrack(menu, event->u.pointer.x, +++ event->u.pointer.y); +++ pbt_option_execute(menu); +++ return TWIN_TRUE; +++ case TwinEventButtonUp: +++ return TWIN_TRUE; +++ case TwinEventKeyDown: +++ switch(event->u.key.key) { +++ case KEY_UP: +++ //pbt_menu_set_option_focus(menu, menu->op->focus_curindex - 1); +++ return TWIN_TRUE; +++ case KEY_DOWN: +++ //pbt_menu_set_option_focus(menu, menu->op->focus_curindex + 1); +++ return TWIN_TRUE; +++ case KEY_LEFT: +++ pbt_menu_pane_select(menu, menu->dp); +++ return TWIN_TRUE; +++ case KEY_ENTER: +++ pbt_option_execute(menu); +++ default: +++ break; +++ } +++ break; +++ default: +++ break; +++ } +++ return TWIN_FALSE; +++} +++ +++static struct pbt_pane *pbt_option_pane_create(struct pbt_menu *menu) +++{ +++ struct pbt_pane *pane = talloc_zero(menu, struct pbt_pane); +++ +++ if (!pane) +++ return NULL; +++ +++ pane->sig = pbt_pane_sig; +++ pane->window = twin_window_create(menu->scr->tscreen, TWIN_ARGB32, +++ TwinWindowPlain, PBOOT_LEFT_PANE_SIZE, 0, +++ menu->scr->tscreen->width - PBOOT_LEFT_PANE_SIZE, +++ menu->scr->tscreen->height); +++ +++ if (!pane->window) +++ goto fail_window; +++ +++ pane->window->draw = pbt_option_pane_draw; +++ pane->window->event = pbt_option_pane_event; +++ pane->window->client_data = menu; +++ +++ pane->focus_curindex = -1; +++ pane->focus_box.left = PBOOT_RIGHT_FOCUS_XOFF; +++ pane->focus_box.top = -2 * PBOOT_RIGHT_FOCUS_HEIGHT; +++ pane->focus_box.right = pane->window->pixmap->width +++ - 2 * PBOOT_RIGHT_FOCUS_XOFF; +++ pane->focus_box.bottom = pane->focus_box.top + PBOOT_RIGHT_FOCUS_HEIGHT; +++ +++ pane->mouse_target = -1; +++ +++ twin_window_show(pane->window); +++ twin_window_queue_paint(pane->window); +++ +++ return pane; +++ +++fail_window: +++ talloc_free(pane); +++ return NULL; +++} +++ +++//============================================================================== +++// junk +++//============================================================================== +++ +++#if 0 +++ +++static pboot_device_t *pboot_devices[PBOOT_MAX_DEV]; +++static int pboot_dev_count; +++static int pboot_dev_sel = -1; +++ +++ +++ +++ +++static int pboot_vmode_change = -1; +++ +++static void pboot_message(const char *fmt, ...) +++{ +++ va_list ap; +++ char *msg; +++ +++ va_start(ap, fmt); +++ vasprintf(&msg, fmt, ap); +++ va_end(ap); +++ +++ pb_log(msg); +++} +++ +++static void pboot_draw_option_cache(pboot_device_t *dev, pboot_option_t *opt, +++ int index) +++{ +++ twin_pixmap_t *px; +++ twin_path_t *path; +++ twin_fixed_t tx, ty; +++ +++ /* Create pixmap */ +++ px = twin_pixmap_create(TWIN_ARGB32, opt->box.right - opt->box.left, +++ opt->box.bottom - opt->box.top); +++ assert(px); +++ opt->cache = px; +++ +++ /* Fill background */ +++ twin_fill(px, 0x00000000, TWIN_SOURCE, 0, 0, px->width, px->height); +++ +++ /* Allocate a path for drawing */ +++ path = twin_path_create(); +++ assert(path); +++ +++#if 0 +++ /* TEST - Bounding rectangle */ +++ twin_path_rectangle(path, 0, 0, +++ twin_int_to_fixed(px->width), +++ twin_int_to_fixed(px->height)); +++ twin_paint_path(px, PBOOT_RIGHT_TITLE_COLOR, path); +++ twin_path_empty(path); +++ twin_fill(px, 0x00000000, TWIN_SOURCE, 2, 2, +++ px->width - 3, px->height - 3); +++#endif +++ +++ /* Draw texts */ +++ twin_path_set_font_size(path, PBOOT_RIGHT_TITLE_TEXT_SIZE); +++ twin_path_set_font_style(path, TWIN_TEXT_UNHINTED); +++ tx = twin_int_to_fixed(PBOOT_RIGHT_TITLE_XOFFSET); +++ ty = twin_int_to_fixed(PBOOT_RIGHT_TITLE_YOFFSET); +++ twin_path_move (path, tx, ty); +++ twin_path_utf8 (path, opt->title); +++ twin_paint_path (px, PBOOT_RIGHT_TITLE_COLOR, path); +++ twin_path_empty (path); +++ +++ if (opt->subtitle) { +++ twin_path_set_font_size(path, PBOOT_RIGHT_SUBTITLE_TEXT_SIZE); +++ twin_path_set_font_style(path, TWIN_TEXT_UNHINTED); +++ tx = twin_int_to_fixed(PBOOT_RIGHT_SUBTITLE_XOFFSET); +++ ty = twin_int_to_fixed(PBOOT_RIGHT_SUBTITLE_YOFFSET); +++ twin_path_move (path, tx, ty); +++ twin_path_utf8 (path, opt->subtitle); +++ twin_paint_path (px, PBOOT_RIGHT_SUBTITLE_COLOR, path); +++ twin_path_empty (path); +++ } +++ +++ if (opt->badge) { +++ twin_operand_t src; +++ +++ src.source_kind = TWIN_PIXMAP; +++ src.u.pixmap = opt->badge; +++ +++ twin_composite(px, PBOOT_RIGHT_BADGE_XOFFSET, +++ PBOOT_RIGHT_BADGE_YOFFSET, +++ &src, 0, 0, NULL, 0, 0, TWIN_OVER, +++ opt->badge->width, opt->badge->height); +++ } +++ +++ +++ /* Destroy path */ +++ twin_path_destroy(path); +++} +++ +++ +++ +++static int pboot_add_option(int devindex, const char *title, +++ const char *subtitle, twin_pixmap_t *badge, void *data) +++{ +++ pboot_device_t *dev; +++ pboot_option_t *opt; +++ twin_coord_t width; +++ int index; +++ struct pbt_menu *menu = NULL; +++ +++ if (devindex < 0 || devindex >= pboot_dev_count) +++ return -1; +++ dev = pboot_devices[devindex]; +++ +++ if (dev->option_count >= PBOOT_MAX_OPTION) +++ return -1; +++ index = dev->option_count++; +++ opt = &dev->options[index]; +++ +++ opt->title = malloc(strlen(title) + 1); +++ strcpy(opt->title, title); +++ +++ if (subtitle) { +++ opt->subtitle = malloc(strlen(subtitle) + 1); +++ strcpy(opt->subtitle, subtitle); +++ } else +++ opt->subtitle = NULL; +++ +++ opt->badge = badge; +++ opt->cache = NULL; +++ +++ width = menu->op->window->pixmap->width - +++ (PBOOT_RIGHT_OPTION_LMARGIN + PBOOT_RIGHT_OPTION_RMARGIN); +++ +++ opt->box.left = PBOOT_RIGHT_OPTION_LMARGIN; +++ opt->box.right = opt->box.left + width; +++ opt->box.top = PBOOT_RIGHT_OPTION_TMARGIN + +++ index * PBOOT_RIGHT_OPTION_STRIDE; +++ opt->box.bottom = opt->box.top + PBOOT_RIGHT_OPTION_HEIGHT; +++ +++ opt->data = data; +++ return index; +++} +++ +++static void pboot_set_device_select(struct pbt_menu *menu, int sel, int force) +++{ +++ pb_log("%s: %d -> %d\n", __FUNCTION__, pboot_dev_sel, sel); +++ if (!force && sel == pboot_dev_sel) +++ return; +++ if (sel >= pboot_dev_count) +++ return; +++ pboot_dev_sel = sel; +++ if (force) { +++ menu->dp->focus_curindex = sel; +++ if (sel < 0) +++ menu->dp->focus_target = 0 - PBOOT_LEFT_FOCUS_HEIGHT; +++ else +++ menu->dp->focus_target = PBOOT_LEFT_FOCUS_YOFF + +++ PBOOT_LEFT_ICON_STRIDE * sel; +++ menu->op->focus_box.bottom = menu->dp->focus_target; +++ menu->op->focus_box.bottom = menu->op->focus_box.top + +++ PBOOT_RIGHT_FOCUS_HEIGHT; +++ twin_window_damage(menu->dp->window, +++ 0, 0, +++ menu->dp->window->pixmap->width, +++ menu->dp->window->pixmap->height); +++ twin_window_queue_paint(menu->dp->window); +++ } +++ menu->op->focus_curindex = -1; +++ menu->op->mouse_target = -1; +++ menu->op->focus_box.top = -2*PBOOT_RIGHT_FOCUS_HEIGHT; +++ menu->op->focus_box.bottom = menu->op->focus_box.top + +++ PBOOT_RIGHT_FOCUS_HEIGHT; +++ twin_window_damage(menu->op->window, 0, 0, +++ menu->op->window->pixmap->width, +++ menu->op->window->pixmap->height); +++ twin_window_queue_paint(menu->op->window); +++} +++ +++static void pboot_quit(void) +++{ +++ kill(0, SIGINT); +++} +++ +++ +++static int pboot_add_device(const char *dev_id, twin_pixmap_t *pixmap) +++{ +++ int index; +++ pboot_device_t *dev; +++ +++ struct pbt_menu *menu = NULL; +++ +++ if (pboot_dev_count >= PBOOT_MAX_DEV) +++ return -1; +++ +++ index = pboot_dev_count++; +++ +++ dev = malloc(sizeof(*dev)); +++ memset(dev, 0, sizeof(*dev)); +++ dev->id = malloc(strlen(dev_id) + 1); +++ strcpy(dev->id, dev_id); +++ dev->badge = pixmap; +++ dev->box.left = PBOOT_LEFT_ICON_XOFF; +++ dev->box.right = dev->box.left + PBOOT_LEFT_ICON_WIDTH; +++ dev->box.top = PBOOT_LEFT_ICON_YOFF + +++ PBOOT_LEFT_ICON_STRIDE * index; +++ dev->box.bottom = dev->box.top + PBOOT_LEFT_ICON_HEIGHT; +++ +++ pboot_devices[index] = dev; +++ +++ twin_window_damage(menu->dp->window, +++ dev->box.left, dev->box.top, +++ dev->box.right, dev->box.bottom); +++ twin_window_queue_paint(menu->dp->window); +++ +++ return index; +++} +++ +++static int pboot_remove_device(const char *dev_id) +++{ +++ pboot_device_t *dev = NULL; +++ int i, newsel = pboot_dev_sel; +++ +++ struct pbt_menu *menu = NULL; +++ +++ /* find the matching device */ +++ for (i = 0; i < pboot_dev_count; i++) { +++ if (!strcmp(pboot_devices[i]->id, dev_id)) { +++ dev = pboot_devices[i]; +++ break; +++ } +++ } +++ +++ if (!dev) +++ return TWIN_FALSE; +++ +++ memmove(pboot_devices + i, pboot_devices + i + 1, +++ sizeof(*pboot_devices) * (pboot_dev_count + i - 1)); +++ pboot_devices[--pboot_dev_count] = NULL; +++ +++ /* select the newly-focussed device */ +++ if (pboot_dev_sel > i) +++ newsel = pboot_dev_sel - 1; +++ else if (pboot_dev_sel == i && i >= pboot_dev_count) +++ newsel = pboot_dev_count - 1; +++ pboot_set_device_select(menu, newsel, 1); +++ +++ /* todo: free device & options */ +++ +++ return TWIN_TRUE; +++} +++#endif +++ +++//------------------------------------------------------------------------------ +++ +++static void print_version(void) +++{ +++ printf("pb-twin (" PACKAGE_NAME ") " PACKAGE_VERSION "\n"); +++} +++ +++static void print_usage(void) +++{ +++ print_version(); +++ printf( +++"Usage: pb-twin [-h, --help] [-l, --log log-file] [-r, --reset-defaults]\n" +++" [-t, --timeout] [-V, --version]\n"); +++} +++ +++/** +++ * enum opt_value - Tri-state options variables. +++ */ +++ +++enum opt_value {opt_undef = 0, opt_yes, opt_no}; +++ +++/** +++ * struct opts - Values from command line options. +++ */ +++ +++struct opts { +++ enum opt_value show_help; +++ const char *log_file; +++ enum opt_value reset_defaults; +++ enum opt_value use_timeout; +++ enum opt_value show_version; +++}; +++ +++/** +++ * opts_parse - Parse the command line options. +++ */ +++ +++static int opts_parse(struct opts *opts, int argc, char *argv[]) +++{ +++ static const struct option long_options[] = { +++ {"help", no_argument, NULL, 'h'}, +++ {"log", required_argument, NULL, 'l'}, +++ {"reset-defaults", no_argument, NULL, 'r'}, +++ {"timeout", no_argument, NULL, 't'}, +++ {"version", no_argument, NULL, 'V'}, +++ { NULL, 0, NULL, 0}, +++ }; +++ static const char short_options[] = "hl:trV"; +++ static const struct opts default_values = { +++ .log_file = "pb-twin.log", +++ }; +++ +++ *opts = default_values; +++ +++ while (1) { +++ int c = getopt_long(argc, argv, short_options, long_options, +++ NULL); +++ +++ if (c == EOF) +++ break; +++ +++ switch (c) { +++ case 'h': +++ opts->show_help = opt_yes; +++ break; +++ case 'l': +++ opts->log_file = optarg; +++ break; +++ case 't': +++ opts->use_timeout = opt_yes; +++ break; +++ case 'r': +++ opts->reset_defaults = opt_yes; +++ break; +++ case 'V': +++ opts->show_version = opt_yes; +++ break; +++ default: +++ opts->show_help = opt_yes; +++ return -1; +++ } +++ } +++ +++ return optind != argc; +++} +++ +++/** +++ * struct ps3_gui - Main gui program instance. +++ */ +++ +++ +++struct ps3_gui { +++ struct ui_timer timer; +++ struct ps3_flash_values values; +++ int dirty_values; +++ +++ struct pbt_scr scr; +++ struct pbt_frame frame; +++ struct pbt_menu *menu; +++}; +++ +++static struct ps3_gui ps3; +++ +++static struct pbt_scr *pbt_scr_from_tscreen(twin_screen_t *tscreen) +++{ +++ assert(ps3.scr.sig == pbt_scr_sig); +++ assert(ps3.scr.tscreen == tscreen); +++ return &ps3.scr; +++} +++ +++static void sig_handler(int signum) +++{ +++ DBGS("%d\n", signum); +++ +++ switch (signum) { +++ case SIGALRM: +++ ui_timer_sigalrm(&ps3.timer); +++ break; +++ case SIGWINCH: +++// if (ps3.gui) +++// gui_resize(ps3.gui); +++ break; +++ default: +++ assert(0 && "unknown sig"); +++ /* fall through */ +++ case SIGINT: +++ case SIGHUP: +++ case SIGTERM: +++ exit(EXIT_FAILURE); +++// if (ps3.gui) +++// gui_abort(ps3.gui); +++ break; +++ } +++} +++ +++/** +++ * main - twin bootloader main routine. +++ */ +++ +++int main(int argc, char *argv[]) +++{ +++ static struct sigaction sa; +++ static struct opts opts; +++ int result; +++ int ui_result; +++ unsigned int mode; +++ FILE *log; +++ +++ result = opts_parse(&opts, argc, argv); +++ +++ if (result) { +++ print_usage(); +++ return EXIT_FAILURE; +++ } +++ +++ if (opts.show_help == opt_yes) { +++ print_usage(); +++ return EXIT_SUCCESS; +++ } +++ +++ if (opts.show_version == opt_yes) { +++ print_version(); +++ return EXIT_SUCCESS; +++ } +++ +++ log = fopen(opts.log_file, "a"); +++ assert(log); +++ pb_log_set_stream(log); +++ +++#if defined(DEBUG) +++ pb_log_always_flush(1); +++#endif +++ +++ pb_log("--- pb-twin ---\n"); +++ +++ sa.sa_handler = sig_handler; +++ result = sigaction(SIGALRM, &sa, NULL); +++ result += sigaction(SIGHUP, &sa, NULL); +++ result += sigaction(SIGINT, &sa, NULL); +++ result += sigaction(SIGTERM, &sa, NULL); +++ result += sigaction(SIGWINCH, &sa, NULL); +++ +++ if (result) { +++ pb_log("%s sigaction failed.\n", __func__); +++ return EXIT_FAILURE; +++ } +++ +++ ps3.values = ps3_flash_defaults; +++ +++ if (opts.reset_defaults != opt_yes) +++ ps3.dirty_values = ps3_flash_get_values(&ps3.values); +++ +++ twin_feature_init(); // need it??? +++ +++ /* Setup screen. */ +++ +++ ps3.scr.sig = pbt_scr_sig; +++ +++#if defined(HAVE_LIBTWIN_TWIN_X11_H) +++# if defined(USE_X11) +++ if (1) { +++# else +++ if (0) { +++# endif +++ ps3.scr.x11 = twin_x11_create(XOpenDisplay(0), 1024, 768); +++ +++ if (!ps3.scr.x11) { +++ perror("failed to create x11 screen !\n"); +++ return EXIT_FAILURE; +++ } +++ +++ ps3.scr.tscreen = ps3.scr.x11->screen; +++ } else { +++#else +++ if (1) { +++#endif +++ result = ps3_get_video_mode(&mode); +++ +++ /* Current becomes default if ps3_flash_get_values() failed. */ +++ +++ if (ps3.dirty_values && !result) +++ ps3.values.video_mode = mode; +++ +++ /* Set mode if not at default. */ +++ +++ if (!result && (ps3.values.video_mode != (uint16_t)mode)) +++ ps3_set_video_mode(ps3.values.video_mode); +++ +++ ps3.scr.fbdev = twin_fbdev_create(-1, SIGUSR1); +++ +++ if (!ps3.scr.fbdev) { +++ perror("failed to create fbdev screen !\n"); +++ return EXIT_FAILURE; +++ } +++ +++ ps3.scr.tscreen = ps3.scr.fbdev->screen; +++ } +++ +++ ps3.scr.tscreen->event_filter = pbt_scr_event; +++ +++ twin_screen_set_background(ps3.scr.tscreen, +++ pbt_load_background(ps3.scr.tscreen)); +++ +++ /* setup menu */ +++ +++ ps3.menu = pbt_menu_create(NULL, &ps3.scr); +++ +++ pbt_device_pane_set_focus(ps3.menu, 0); +++ twin_screen_set_active(ps3.scr.tscreen, ps3.menu->dp->window->pixmap); +++ +++ /* Console switch */ +++ +++ if (ps3.scr.fbdev) +++ twin_fbdev_activate(ps3.scr.fbdev); +++ +++ /* run twin */ +++ +++// twin_toplevel_show(ps3.toplevel); +++ twin_dispatch(); +++ +++ pb_log("--- end ---\n"); +++ +++ return ui_result ? EXIT_FAILURE : EXIT_SUCCESS; +++} +diff --git a/feeds/packages/utils/petitboot/petitboot-config.in b/feeds/packages/utils/petitboot/petitboot-config.in +new file mode 100644 +index 0000000..c5213c2 +--- /dev/null ++++ b/feeds/packages/utils/petitboot/petitboot-config.in +@@ -0,0 +1,65 @@ ++# petitboot package config ++ ++config PETITBOOT_GUI ++ bool "Enable Graphical UI support" ++ depends on PACKAGE_petitboot ++ select PACKAGE_libtwin ++ default y ++ help ++ Enable support a petitboot graphical front end based on ++ the twin windowing package. ++ ++config PETITBOOT_CUI ++ bool "Enable Command-line UI support" ++ depends on PACKAGE_petitboot ++ select PACKAGE_libncurses ++ default y ++ help ++ Enable support a petitboot command-line front end based on ++ the ncurses package. ++ ++config PETITBOOT_DEBUG ++ bool "Build debug versions of petitboot binaries" ++ depends on PACKAGE_petitboot ++ default n ++ help ++ Enable additional petitboot runtime checks and debug messages. ++ ++config PETITBOOT_PS3 ++ bool "Build in extra support for the PS3 game console" ++ depends on PACKAGE_petitboot ++ default n ++ help ++ Enable additional petitboot runtime checks and debug messages. ++ ++choice ++ prompt "Startup behavior" ++ default PETITBOOT_AUTORUN_GUI ++ depends on PETITBOOT_GUI || PETITBOOT_CUI ++ ++config PETITBOOT_AUTORUN_GUI ++ bool "Auto run Petitboot GUI" ++ depends on PETITBOOT_GUI ++ help ++ Automatically run Petitboot in graphical mode at ++ system startup. Note that the Petitboot program has a menu item ++ 'Exit to Shell' that can be used to exit the program when ++ it is running. ++ ++config PETITBOOT_AUTORUN_CUI ++ bool "Auto run Petitboot CUI" ++ depends on PETITBOOT_CUI ++ help ++ Automatically run Petitboot in command-line mode at system ++ startup. Note that the Petitboot program has a menu item ++ 'Exit to Shell' that can be used to exit the program when ++ it is running. ++ ++config PETITBOOT_AUTORUN_NONE ++ bool "Disable Petitboot auto run" ++ help ++ Disable Petitboot from running automatically at system startup. ++ The system will boot into a shell. Petitboot can still be run ++ manually from the shell prompt when this option is selected. ++ ++endchoice +diff --git a/feeds/packages/utils/picocom/.svn/entries b/feeds/packages/utils/picocom/.svn/entries +new file mode 100644 +index 0000000..a77c92f +--- /dev/null ++++ b/feeds/packages/utils/picocom/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/picocom ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-07-16T00:11:18.569702Z ++32740 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++af84f1e0f6dfec47c8d9ed742583754c ++2012-07-16T00:11:18.569702Z ++32740 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++991 ++ +diff --git a/feeds/packages/utils/picocom/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/picocom/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/picocom/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/picocom/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/picocom/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3e24c03 +--- /dev/null ++++ b/feeds/packages/utils/picocom/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=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 ++ ++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/feeds/packages/utils/picocom/Makefile b/feeds/packages/utils/picocom/Makefile +new file mode 100644 +index 0000000..3e24c03 +--- /dev/null ++++ b/feeds/packages/utils/picocom/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=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 ++ ++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/feeds/packages/utils/pipacs/.svn/entries b/feeds/packages/utils/pipacs/.svn/entries +new file mode 100644 +index 0000000..aec060c +--- /dev/null ++++ b/feeds/packages/utils/pipacs/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pipacs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++10733216a012591503d160c41b970e99 ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++768 ++ +diff --git a/feeds/packages/utils/pipacs/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/pipacs/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pipacs/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pipacs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5d1b08f +--- /dev/null ++++ b/feeds/packages/utils/pipacs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# ++# Copyright (C) 2006-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:=pipacs ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pipacs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=UNIX socket accounting/wiewer program ++endef ++ ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ all ++endef ++ ++define Package/pipacs/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,pipacs)) +diff --git a/feeds/packages/utils/pipacs/Makefile b/feeds/packages/utils/pipacs/Makefile +new file mode 100644 +index 0000000..5d1b08f +--- /dev/null ++++ b/feeds/packages/utils/pipacs/Makefile +@@ -0,0 +1,39 @@ ++# ++# Copyright (C) 2006-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:=pipacs ++PKG_RELEASE:=2 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pipacs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=UNIX socket accounting/wiewer program ++endef ++ ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR) ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ ++ all ++endef ++ ++define Package/pipacs/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pipacs $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,pipacs)) +diff --git a/feeds/packages/utils/pipacs/src/.svn/entries b/feeds/packages/utils/pipacs/src/.svn/entries +new file mode 100644 +index 0000000..ad65eba +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pipacs/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++pipacs.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1911ecf4757bc1afdfaff6866564f667 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++19229 ++ ++parser.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ffceb0bc41d9c480ffa92d4598789aad ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1432 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++811cbd63f754b53447ba1139a4215796 ++2009-04-17T14:22:30.956153Z ++15244 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++193 ++ ++parser.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++dfe7c64ef121b9269aa40954f9177dff ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++30581 ++ +diff --git a/feeds/packages/utils/pipacs/src/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/pipacs/src/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pipacs/src/.svn/prop-base/parser.c.svn-base b/feeds/packages/utils/pipacs/src/.svn/prop-base/parser.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/prop-base/parser.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pipacs/src/.svn/prop-base/parser.h.svn-base b/feeds/packages/utils/pipacs/src/.svn/prop-base/parser.h.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/prop-base/parser.h.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pipacs/src/.svn/prop-base/pipacs.c.svn-base b/feeds/packages/utils/pipacs/src/.svn/prop-base/pipacs.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/prop-base/pipacs.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pipacs/src/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pipacs/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3a48e88 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,14 @@ ++ ++EXTRA_CFLAGS := -c -I. ++PIPACS_OBJS := pipacs.o parser.o ++ ++all: pipacs ++ ++%.o: %.c ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^ ++ ++pipacs: $(PIPACS_OBJS) ++ $(CC) -o $@ $^ ++ ++clean: ++ rm -f *.o *.so pipacs +diff --git a/feeds/packages/utils/pipacs/src/.svn/text-base/parser.c.svn-base b/feeds/packages/utils/pipacs/src/.svn/text-base/parser.c.svn-base +new file mode 100644 +index 0000000..330d7cd +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/text-base/parser.c.svn-base +@@ -0,0 +1,907 @@ ++#include ++#include ++#include ++#include ++//#include ++#include "parser.h" ++ ++#define printit ++ ++extern BOOL bFilter; ++extern int iline; ++extern char * author; ++extern char myipname[]; ++extern int justheader; ++extern int gre,sortbysize,fromip,toip; ++int nomac=1; ++int mostird=0; ++char mypbuff[2048]; ++// accounting variables ++#define MAXHASH 0xffff ++#define MAXTCPPORT 4096 ++unsigned long *iph=NULL; //[MAXHASH]; ++ ++typedef struct { ++ unsigned short from; ++ unsigned short to; ++ unsigned long byte; ++ unsigned short pkt; ++ unsigned short sport; ++ unsigned short dport; ++} ta; ++ ++ta *acc = NULL; ++unsigned long tcppb[MAXTCPPORT]; ++unsigned long tcppp[MAXTCPPORT]; ++unsigned long typp[255]; ++unsigned long typb[255]; ++unsigned long udpb,tcpb,udpp,tcpp; ++time_t elapsed=0; ++int iCycle=10; ++int iScreen=1; ++int iFile=0; ++long lNum=0; ++char filename[128]; ++char intlist[128]; ++int iRun=1; ++int iDetail=0; ++FILE *f=NULL; ++int iProto=0; ++int iSum=0; ++char execname[255]; ++char pbuf[8196]; ++char str[255]; ++extern char pattern[]; ++#ifndef LINUX ++int iLnxplus=0; // Windows buffer without the MAC frame ! ++#else ++int iLnxplus=14; // Linux plus IP header len =14 !!! ++#endif ++// ++// A list of protocol types in the IP protocol header ++// ++char *szProto[255] = {"IP", // 0 ++ "ICMP", // 1 ++ "IGMP", // 2 ++ "GGP", // 3 ++ "IP", // 4 ++ "ST", // 5 ++ "TCP", // 6 ++ "UCL", // 7 ++ "EGP", // 8 ++ "IGP", // 9 ++ "BBN-RCC-MON", // 10 ++ "NVP-II", // 11 ++ "PUP", // 12 ++ "ARGUS", // 13 ++ "EMCON", // 14 ++ "XNET", // 15 ++ "CHAOS", // 16 ++ "UDP", // 17 ++ "MUX", // 18 ++ "DCN-MEAS", // 19 ++ "HMP", // 20 ++ "PRM", // 21 ++ "XNS-IDP", // 22 ++ "TRUNK-1", // 23 ++ "TRUNK-2", // 24 ++ "LEAF-1", // 25 ++ "LEAF-2", // 26 ++ "RDP", // 27 ++ "IRTP", // 28 ++ "ISO-TP4", // 29 ++ "NETBLT", // 30 ++ "MFE-NSP", // 31 ++ "MERIT-INP", // 32 ++ "SEP", // 33 ++ "3PC", // 34 ++ "IDPR", // 35 ++ "XTP", // 36 ++ "DDP", // 37 ++ "IDPR-CMTP", // 38 ++ "TP++", // 39 ++ "IL", // 40 ++ "SIP", // 41 ++ "SDRP", // 42 ++ "SIP-SR", // 43 ++ "SIP-FRAG", // 44 ++ "IDRP", // 45 ++ "RSVP", // 46 ++ "GRE", // 47 ++ "MHRP", // 48 ++ "BNA", // 49 ++ "IPSEC-ESP", // 50 ++ "IPSEC-AH", // 51 ++ "I-NLSP", // 52 ++ "SWIPE", // 53 ++ "NHRP", // 54 ++ "?55?", // 55 ++ "?56?", // 56 ++ "SKIO", // 57 ++ "V6ICMP", // 58 ++ "V6NoNXT", // 59 ++ "V6OPT", // 60 ++ "int.host", // 61 ++ "CFTP", // 62 ++ "loc.net", // 63 ++ "SAT-EXPAK", // 64 ++ "KRYPTOLAN", // 65 ++ "RVD", // 66 ++ "IPPC", // 67 ++ "dist.fs", // 68 ++ "SAT-MON", // 69 ++ "VISA", // 70 ++ "IPCV", // 71 ++ "CPNX", // 72 ++ "CPHB", // 73 ++ "WSN", // 74 ++ "PVP", // 75 ++ "BR-SAT-MON", // 76 ++ "SUN-ND", // 77 ++ "WB-MON", // 78 ++ "WB-EXPAK", // 79 ++ "ISO-IP", // 80 ++ "VMTP", // 81 ++ "SECURE-VMTP",// 82 ++ "VINES", // 83 ++ "TTP", // 84 ++ "NSFNET-IGP", // 85 ++ "DGP", // 86 ++ "TCF", // 87 ++ "IGRP", // 88 ++ "OSPF", // 89 ++ "Sprite-RPC", // 90 ++ "LARP", // 91 ++ "MTP", // 92 ++ "AX.25", // 93 ++ "IPIP", // 94 ++ "MICP", // 95 ++ "SCC-SP", // 96 ++ "ETHERIP", // 97 ++ "ENCAP", // 98 ++ "priv.enc", // 99 ++ "GMTP" // 99 ++ }; ++// ++// The types of IGMP messages ++// ++char *szIgmpType[] = {"", ++ "Host Membership Query", ++ "HOst Membership Report", ++ "", ++ "", ++ "", ++ "Version 2 Membership Report", ++ "Leave Group", ++ "", ++ "" ++ }; ++ ++// ++// Function: PrintRawBytes ++// ++// Description: ++// This function simply prints out a series of bytes ++// as hexadecimal digits. ++// ++void PrintRawBytes(BYTE *ptr, DWORD len) ++{ ++ int i,j; ++// if (! iFile) { ++*(ptr+len)=0; ++if ((*pattern==0) || strstr(ptr,pattern) ) { ++ fprintf(iFile?f:stdout,"%s",pbuf); ++ fprintf(iFile?f:stdout," " ); ++ while (len > 0) { ++ for(i=0; i < 16; i++) { ++ fprintf(iFile?f:stdout,"%x%x ", HI_WORD(*ptr), LO_WORD(*ptr)); ++ len--; ++ ptr++; ++ if (len == 0) {j=i++; while(++j < 16) fprintf(iFile?f:stdout," "); break; } ++ } ++ fprintf(iFile?f:stdout," "); ++ for(j=0; j < i; j++) fprintf(iFile?f:stdout,"%c",isprint(*(ptr-i+j))?*(ptr-i+j):'.'); ++ if (len) fprintf(iFile?f:stdout,"\n "); ++ } ++// } else { ++// fwrite(ptr,sizeof(BYTE),len,f); ++// } ++} ++} ++ ++static char *ICMPTypeTable[]={ ++ "Echo Reply", "ICMP 1", "ICMP 2", "Dest Unreachable","SrcQuench", "Redirect", "6", "7","Echo Request","9","10", ++ "Time Exceed", "ParamPrblm", "Timestamp", "Timestamp reply","InfoRqst", "InfoRply" ++}; ++static char *Dstunreach[]={ ++"net unreach.","host unreach.","protocol unreach.","port unreach.", ++"frag needed","source route?","","" ++}; ++int DecodeICMPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus ); ++ unsigned short type,code,chksum, ++ id, ++ seq; ++ unsigned long resptime,r1,r2; ++ BYTE *hhh; ++ SOCKADDR_IN addr; ++ type=*hdr++; code=*hdr++; ++ sprintf(str," Type:%-12s Code:%3d,",ICMPTypeTable[type],code); ++ ++ strcat(pbuf,str); ++ memcpy(&chksum, hdr, 2); ++ hdr += 2; hhh=hdr; ++ memcpy(&id, hdr, 2); ++ hdr += 2; ++ memcpy(&seq, hdr, 2); ++ hdr+=2; ++// memcpy(&resptime, hdr, 4); ++// hdr+=4; ++ switch (type) { ++ case 3: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ if (code==4 ) sprintf(str,"frag needed-Max MTU:%u at %-15s\n",ntohs(seq), inet_ntoa(addr.sin_addr)); ++ else sprintf(str,"%s at %-15s\n",Dstunreach[code&7],inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 11: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ sprintf(str,"%s at %-15s\n",code?"frag reass. exceed":"ttl exceed",inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 12: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ sprintf(str," err:%d at %-15s\n",id,inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 4: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ sprintf(str," wait for %-15s\n",ntohs(id),inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 5: ++ memcpy(&addr.sin_addr.s_addr, hhh, 4); ++ sprintf(str," from gw: %-15s\n",inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 0: ++ case 8: ++ sprintf(str," Id:%3u Seq:%3u\n",ntohs(id),ntohs(seq)); ++ break; ++ case 13: ++ case 14: ++ memcpy(&resptime, hdr, 4); ++ hdr+=4; ++ memcpy(&r1, hdr, 4); ++ hdr+=4; ++ memcpy(&r2, hdr, 4); ++ hdr+=4; ++ sprintf(str," Id:%3u Seq:%3d Rec/Tr %ld/%ld ms\n",ntohs(id),ntohs(seq),ntohl(r1)-ntohl(resptime),ntohl(r2)-ntohl(resptime)); ++ break; ++ case 15: ++ case 16: ++ sprintf(str," Id:%3u Seq:%3d\n",ntohs(id),ntohs(seq)); ++ break; ++ } ++ strcat(pbuf,str); ++ return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++// ++// Function: DecodeIGMPHeader ++// ++// Description: ++// This function takes a pointer to a buffer containing ++// an IGMP packet and prints it out in a readable form. ++// ++ ++int DecodeIGMPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short chksum, ++ version, ++ type, ++ maxresptime; ++ SOCKADDR_IN addr; ++ version = HI_WORD(*hdr); ++ type = LO_WORD(*hdr); ++ ++ hdr++; ++ maxresptime = *hdr; ++ hdr++; ++ ++ memcpy(&chksum, hdr, 2); ++ chksum = ntohs(chksum); ++ hdr += 2; ++ ++ memcpy(&(addr.sin_addr.s_addr), hdr, 4); ++ sprintf(str," IGMP HEADER:\n"); ++ strcat(pbuf,str); ++ if ((type == 1) || (type == 2)) version = 1; ++ else version = 2; ++ sprintf(str," IGMP Version = %d\n IGMP Type = %s\n",version, szIgmpType[type]); ++ strcat(pbuf,str); ++ if (version == 2) { ++ sprintf(str," Max Resp Time = %d\n", maxresptime); ++ strcat(pbuf,str); ++ } ++ sprintf(str," IGMP Grp Addr = %s\n", inet_ntoa(addr.sin_addr)); ++ strcat(pbuf,str); ++ ++ return 8; ++} ++ ++// ++// Function: DecodeUDPHeader ++// ++// Description: ++// This function takes a buffer which points to a UDP ++// header and prints it out in a readable form. ++// ++int DecodeUDPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short shortval, ++ udp_src_port, ++ udp_dest_port, ++ udp_len, ++ udp_chksum; ++ memcpy(&shortval, hdr, 2); ++ udp_src_port = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ udp_dest_port = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ udp_len = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ udp_chksum = ntohs(shortval); ++ hdr += 2; ++ ++ sprintf(str," UDP: SPort: %-05d | DPort: %-05d",udp_src_port, udp_dest_port); ++ strcat(pbuf,str); ++ sprintf(str," | Len: %-05d | CSum: 0x%08x\n",udp_len, udp_chksum); ++ strcat(pbuf,str); ++ return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++// ++// Function: DecodeTCPHeader ++// ++// Description: ++// This function takes a buffer pointing to a TCP header ++// and prints it out in a readable form. ++// ++int DecodeTCPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short shortval; ++ unsigned long longval; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ sprintf(str," TCP: SPort: %u", shortval); ++ strcat(pbuf,str); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ sprintf(str," DPort: %u", shortval); ++ strcat(pbuf,str); ++ hdr += 2; ++ ++ memcpy(&longval, hdr, 4); ++ longval = ntohl(longval); ++ sprintf(str," Seq: %lX", longval); ++ strcat(pbuf,str); ++ hdr += 4; ++ ++ memcpy(&longval, hdr, 4); ++ longval = ntohl(longval); ++ sprintf(str," ACK: %lX", longval); ++ strcat(pbuf,str); ++ hdr += 4; ++// printf(" Header Len : %d (bytes %d)\n", HI_WORD(*hdr), (HI_WORD(*hdr) * 4)); ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval) & 0x3F; ++ sprintf(str," Flags: "); ++ strcat(pbuf,str); ++ if (shortval & 0x20) strcat(pbuf,"URG "); ++ if (shortval & 0x10) strcat(pbuf,"ACK "); ++ if (shortval & 0x08) strcat(pbuf,"PSH "); ++ if (shortval & 0x04) strcat(pbuf,"RST "); ++ if (shortval & 0x02) strcat(pbuf,"SYN "); ++ if (shortval & 0x01) strcat(pbuf,"FIN "); ++ strcat(pbuf,"\n"); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++// printf(" Window size: %d\n", shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++// printf(" TCP Chksum : %d\n", shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ hdr += 2; ++// printf(" Urgent ptr : %d\n", shortval); ++ ++ return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++int DecodeGREHeader(WSABUF *wsabuf, DWORD iphdrlen,DWORD bytesret, ++ unsigned int srcip, unsigned short srcport, unsigned long srcnet,unsigned int destip, unsigned short destport, unsigned long destnet, ++ unsigned short xport,unsigned int xip, unsigned long xnet) ++ { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short shortval; ++ unsigned long longval; ++ int ipe; ++ BYTE *orihdr; ++ char *sstr; ++ SOCKADDR_IN srcaddr; ++ ++ orihdr=hdr; ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ sprintf(str," GRE Flag: %u Prot:", shortval); ++ strcat(mypbuff,str); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ ipe=0; ++ sstr=str; ++// sprintf(str," Prot: %u", shortval); ++ switch ( shortval ) { ++ case 4: sstr="SNA"; ++ break; ++ case 0xfe: sstr="OSI"; ++ break; ++ case 0x200: sstr="PUP"; ++ break; ++ case 0x600: sstr="XNS"; ++ break; ++ case 0x800: sstr="IP"; ++ ipe=1; ++ break; ++ case 0x804: sstr="Chaos"; ++ break; ++ case 0x806: sstr="ARP"; ++ break; ++ case 0x6558: sstr="Tr.bridge"; ++ break; ++ default: sprintf(str,"%u", shortval); ++ break; ++ } ++ hdr += 2; ++ strcat(mypbuff,sstr); ++ if (ipe && gre) { ++ int plusment,jj,protoment; ++ plusment=iLnxplus; ++ protoment=iProto; ++ if (iProto==47) iProto=0; ++ iLnxplus+=4; ++ nomac=0; ++ iLnxplus=plusment+24; ++ DecodeIPHeader(wsabuf,srcip,srcport,srcnet,destip,destport,destnet,bytesret,xport,xip,xnet); ++ nomac=1; ++ iLnxplus=plusment; ++ iProto=protoment; ++ } ++return -1; ++// return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++ ++int ClearIPAcc() { ++ unsigned long i; ++ ta *tai; ++ for(i=0;ifrom=tai->to=0; tai++; } ++ for (i=0;ibyte > d2->byte) return -1; ++ if (d1->byte < d2->byte) return 1; ++ return 0; ++} ++int countsort(const void *s1, const void *s2) { // sorting tale in packet count order ++ ta *d1; ++ ta *d2; ++ d1= (ta *)s1; d2=(ta *)s2; ++ if (d1->pkt > d2->pkt) return -1; ++ if (d1->pkt < d2->pkt) return 1; ++ return 0; ++} ++int CloseIPAcc( long ti) { ++ unsigned long i; ++ ta *tai; ++ SOCKADDR_IN srcaddr; ++ SOCKADDR_IN dstaddr; ++ float ff; ++ char str[16]; ++ unsigned long j,k,l; ++ int lin=0; ++ int linn; ++ ++ time(&elapsed); ++ if (iFile) f=fopen(filename,"w+"); ++ k=0; ++ if (sortbysize) qsort(acc,MAXHASH,sizeof(ta),bytesort); ++ else qsort(acc,MAXHASH,sizeof(ta),countsort); ++ ff=0.0; ++ for (i=0;i<255;i++) ff+=typb[i]; ++ for (i=0; ifrom!=0) && (tai->to!=0)) ++k; ++ } ++ if (iScreen) { ++#ifndef LINUX ++ system("cls"); ++#else ++ system("clear"); ++// printf("\033[1~"); ++#endif ++ printf("%-16s Speed: %5.2f Kbit/s , %ld IP pairs / %ld secs. %s@%s.hu",myipname,ff/ti/1024*8,k,ti,author,author); ++ printf("\nProt:"); j=0; ++lin; ++ while (1) { ++ l=k=0; ++ for (i=0;i<100;i++) if ( typb[i]>k) { k=typb[i]; l=i; } ++ if (k==0) break; ++ if ((j>0) && ((j%3)==0)) { printf("\n "); ++lin; } ++ if (k>1024*1024) printf(" %-8.8s:%5.1fk/%-6.1f M",szProto[l],(float)typp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) printf(" %-8.8s:%5ld/%-6.1f k",szProto[l],typp[l],(float)k/1024); ++ else printf(" %-8.8s:%5ld/%-8ld",szProto[l],typp[l],k); ++ typb[l]=0; ++ ++j; ++ } ++ printf("\nPort:"); j=0; ++lin; ++ k=0; linn=lin; ++ while (1) { ++ l=k=0; ++ for (i=0;ik) { k=tcppb[i]; l=i; } ++ if (k==0) break; ++ if (j && (j%4)==0) { ++ if (lin >= linn+1) break; ++ printf("\n "); ++ ++lin; ++ } ++ if (k>1024*1024) printf(" %04d:%4.1fk/%-5.1f M",l,(float)tcppp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) printf(" %04d:%4ld/%-5.1f k",l,tcppp[l],(float)k/1024); ++ else printf(" %04d:%4ld/%-7ld",l,tcppp[l],k); ++ tcppb[l]=0; ++ ++j; ++ } ++ } else if (f) { ++ fprintf(f,"%-16s Speed: %5.2f Kbit/s , %ld IP pairs / %ld secs. %s@%s.hu",myipname,ff/ti/1024*8,k,ti,author,author); ++ fprintf(f,"\nProt:"); j=0; ++ while (1) { ++ l=k=0; ++ for (i=0;i<100;i++) if ( typb[i]>k) { k=typb[i]; l=i; } ++ if (k==0) break; ++ if (k>1024*1024) fprintf(f," %-8.8s:%5.1fk/%-6.1f M",szProto[l],(float)typp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) fprintf(f," %-8.8s:%5ld/%-6.1f k",szProto[l],typp[l],(float)k/1024); ++ else fprintf(f," %-8.8s:%5ld/%-8ld",szProto[l],typp[l],k); ++ typb[l]=0; ++ ++j; ++ } ++ printf("\nPort:"); j=0; ++ k=0; linn=lin; ++ while (1) { ++ l=k=0; ++ for (i=0;ik) { k=tcppb[i]; l=i; } ++ if (k==0) break; ++ if (k>1024*1024) fprintf(f," %04d:%4.1fk/%-5.1f M",l,(float)tcppp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) fprintf(f," %04d:%4ld/%-5.1f k",l,tcppp[l],(float)k/1024); ++ else fprintf(f," %04d:%4ld/%-7ld",l,tcppp[l],k); ++ tcppb[l]=0; ++ ++j; ++ } ++ } ++ ++ for (i=0; ifrom!=0) && (tai->to!=0)) { ++k; ++ if (!iSum) { ++ dstaddr.sin_addr.s_addr = htonl(*(iph+tai->from)); ++ srcaddr.sin_addr.s_addr = htonl(*(iph+(tai->to))); ++ strcpy(str,inet_ntoa(dstaddr.sin_addr)); ++ if (iScreen && (++linpkt,tai->byte,((float)tai->byte)/ti/1024*8); ++ if (f) fprintf(f,"%-15s\t%-15s\t%d\t%ld\n",str,inet_ntoa(srcaddr.sin_addr),tai->pkt,tai->byte); ++ } ++ } ++ } ++ if (iScreen) printf("\n"); ++#ifdef LINUX ++ if (iScreen) fflush(stdout); ++#endif ++ ClearIPAcc(); ++ if (f) { ++ char cmdline[255]; ++ fclose(f); ++// if (*execname) _spawnle(_P_NOWAIT,execname,execname,filename); ++// if (*execname) _execl(execname,execname); ++ if (*execname) { ++#ifndef LINUX ++ sprintf(cmdline,"%s %s",execname,filename); ++#else ++ sprintf(cmdline,"%s %s",execname,filename); ++#endif ++ system(cmdline); ++// iRun=0; ++ } ++ } ++ f=NULL; ++ return 0; ++} ++ ++unsigned short FindIPHash( unsigned long ip ) { ++ unsigned short hashval; ++ unsigned long *ipt; ++ ++ hashval = (unsigned short)(((ip&0xFFFF0000)>>16) ^ (ip&0x0000FFFF)); ++ ipt=iph + hashval; ++ while (*ipt != 0 && (*ipt!=ip)) { ipt++; hashval++; } ++ if (*ipt==0) *ipt=ip; ++ return hashval; ++} ++ ++unsigned short SetIPAcc( unsigned long src, unsigned long dst, unsigned long byte, unsigned short typ, unsigned short sport, unsigned short dport) { ++ unsigned short from,to,hash; ++ ta *tai; ++ hash=0; ++ if (src) { ++ ++ if (fromip) from=FindIPHash(src); else from=-1; ++ if (toip) to=FindIPHash(dst); else to=-1; ++ hash=from^to; ++ tai=acc + hash; ++ while ( ((tai->from!=from) && (tai->to!=to)) && ((tai->from!=0) && (tai->to!=0)) ) {tai++; hash++; } ++ if ((tai->from==0)&&(tai->to==0)) { ++ tai->byte=byte; tai->from=from; tai->to=to; tai->pkt=1; ++ } else { tai->byte+=byte; tai->pkt++; } ++ ++ typp[typ]++; ++ typb[typ]+=byte; ++ if ((sport>0) && (sport0) && (dportbuf, ++ *nexthdr = NULL, ++ *ohdr; ++ unsigned short shortval; ++ SOCKADDR_IN srcaddr, ++ destaddr; ++ ++ unsigned short ip_version, ++ ip_hdr_len, ++ ip_tos, ++ ip_total_len, ++ ip_id, ++ ip_flags, ++ ip_ttl, ++ ip_frag_offset, ++ ip_proto, ++ ip_hdr_chksum, ++ ip_src_port, ++ ip_dest_port; ++ unsigned int ip_src, ++ ip_dest; ++ BOOL bPrint = FALSE; ++ char ip_prtype=0; ++ int j; ++ time_t tt; ++ struct tm *tmm; ++ ++ ohdr=hdr; ++ if (iLnxplus) ip_prtype=*(hdr+iLnxplus-1); ++ if (ip_prtype) return 0; ++ hdr += iLnxplus; ++ ip_version = HI_WORD(*hdr); ++ ip_hdr_len = LO_WORD(*hdr) * 4; ++ nexthdr = (BYTE *)((BYTE *)hdr + ip_hdr_len); ++ hdr++; ++ ++ ip_tos = *hdr; ++ hdr++; ++ ++ memcpy(&shortval, hdr, 2); ++ ip_total_len = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ ip_id = ntohs(shortval); ++ hdr += 2; ++ ++ ip_flags = ((*hdr) >> 5); ++ ++ memcpy(&shortval, hdr, 2); ++ ip_frag_offset = ((ntohs(shortval)) & 0x1FFF); ++ hdr += 2; ++ ++ ip_ttl = *hdr; ++ hdr++; ++ ++ ip_proto = *hdr; ++ hdr++; ++ ++ memcpy(&shortval, hdr, 2); ++ ip_hdr_chksum = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&srcaddr.sin_addr.s_addr, hdr, 4); ++ ip_src = ntohl(srcaddr.sin_addr.s_addr); ++ hdr += 4; ++ ++ memcpy(&destaddr.sin_addr.s_addr, hdr, 4); ++ ip_dest = ntohl(destaddr.sin_addr.s_addr); ++ hdr += 4; ++ // ++ // If packet is UDP, TCP, or IGMP read ahead and ++ // get the port values. ++ // ++ ip_src_port=ip_dest_port=0; ++ if (((ip_proto == 2) || ++ (ip_proto == 6) || ++ (ip_proto == 17)) ) //&& bFilter) ++ { ++ memcpy(&ip_src_port, nexthdr, 2); ++ ip_src_port = ntohs(ip_src_port); ++ memcpy(&ip_dest_port, nexthdr+2, 2); ++ ip_dest_port = ntohs(ip_dest_port); ++ ++ }; ++ bPrint = 0; ++// xaok= (xip!=0) && (((xip&xnet)==(ip_src&xnet))||((xip&xnet)==(ip_dest&xnet))); ++// saok= ((srcip==0)||((srcip&srcnet)==(ip_src&srcnet))); ++// daok = ((destip==0)||((destip&destnet)==(ip_dest&destnet))); ++// xpok=(xport!=0) && ((xport==ip_src_port)||(xport==ip_dest_port)); ++// spok=((srcport==0)||(srcport == ip_src_port)); ++// dpok=((destport==0)||(destport == ip_dest_port)); ++//printf("\nf:%d xa:%d sa:%d da:%d xp:%d sp:%d dp:%d",bFilter,xaok,saok,daok,xpok,spok,dpok); ++// if (!bFilter || ( (xaok||(saok&&daok)) && (xpok||(spok&&dpok)))) { ++if ((!bFilter) || ((ip_proto==47)&&gre) || ++ ( ++ ((iProto==0)||(ip_proto==iProto)) && ++ ( ++ ((xip!=0) && (((xip&xnet)==(ip_src&xnet))||((xip&xnet)==(ip_dest&xnet))) ++ ) || ( ++ ((srcip==0) || ((srcip&srcnet)==(ip_src&srcnet))) && ((destip==0)||((destip&destnet)==(ip_dest&destnet))) ++ ) ++ ) ++ && ++ ( ++ ((xport!=0) && ((xport==ip_src_port)||(xport==ip_dest_port)) ++ ) || ( ++ ((srcport==0)||(srcport == ip_src_port))&&((destport==0)||(destport == ip_dest_port)) ++ ) ++ ) ++ ) ++ ) { ++ if (! iDetail) { ++ if ((ip_proto==47)&&gre) { ++ *mypbuff=0; ++ DecodeGREHeader(wsabuf, ip_hdr_len, bytesret, ++ srcip,srcport,srcnet,destip,destport,destnet,xport,xip,xnet); ++// SetIPAcc(0,0,0,0,0,0); ++ return ip_hdr_len; ++ } ++ SetIPAcc(ip_src,ip_dest,ip_total_len,ip_proto,ip_src_port,ip_dest_port); ++ } ++ else bPrint=TRUE; ++// printf("%d %ld %ld %ld %ld",ip_proto,xip,xip&xnet,ip_src&xnet,ip_dest&xnet); ++ } else { ++ if (! iDetail) SetIPAcc(0,0,0,0,0,0); ++// else bPrint=TRUE; ++ } ++ time(&tt); ++ if ((!iSum && ( tt-elapsed > iCycle)) || !iRun || mostird) { ++ mostird=0; ++ if (! iDetail) CloseIPAcc(tt-elapsed-1); ++ else { ++ time(&elapsed); ++ if (f) fclose(f); ++ if (iFile) f=fopen(filename,"a"); ++ } ++ } ++ if (lNum) { if (--lNum <= 0) iRun=0; } ++ ++ // ++ *pbuf=0; ++ if (bPrint) { ++ tmm=localtime(&tt); ++if (! nomac ) { ++ strcpy(pbuf,mypbuff); ++} else { ++ sprintf(str,"\n%4.4d.%2.2d.%2.2d %2.2d:%2.2d:%2.2d ", ++ tmm->tm_year+1900,tmm->tm_mon+1,tmm->tm_mday,tmm->tm_hour,tmm->tm_min,tmm->tm_sec); ++ strcat(pbuf,str); ++#ifdef LINUX ++ sprintf(str,"%x:%x:%x:%x:%x:%x > %x:%x:%x:%x:%x:%x",*ohdr,*(ohdr+1),*(ohdr+2),*(ohdr+3),*(ohdr+4),*(ohdr+5), ++ *(ohdr+6),*(ohdr+7),*(ohdr+8),*(ohdr+9),*(ohdr+10),*(ohdr+11)); ++ strcat(pbuf,str); ++#endif ++} ++ sprintf(str," %d bytes\n%-15s>", ip_total_len, inet_ntoa(srcaddr.sin_addr)); ++ strcat(pbuf,str); ++ sprintf(str,"%-15s", inet_ntoa(destaddr.sin_addr)); ++ strcat(pbuf,str); ++ sprintf(str," TTL:%-3d Proto:%-6s F:%d/%d TOS:%X%X\n", ++ ip_ttl, szProto[ip_proto],ip_flags,ip_frag_offset,HI_WORD(ip_tos), LO_WORD(ip_tos)); ++ strcat(pbuf,str); ++ if (iFile) strcat(pbuf,"."); ++ strcpy(mypbuff,pbuf); ++ ++ } ++ else return ip_hdr_len; ++ ++ if (justheader) { if (*pbuf) fprintf(iFile?f:stdout,"%s",pbuf); return ip_hdr_len; } ++ if (iDetail) { ++ switch (ip_proto) { ++ case 1: // ICMP ++ j=DecodeICMPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 2: // IGMP ++ j=DecodeIGMPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 6: // TCP ++ j=DecodeTCPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 17: // UDP ++ j=DecodeUDPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 47: // UDP ++ j=DecodeGREHeader(wsabuf, ip_hdr_len, bytesret, ++ srcip,srcport,srcnet,destip,destport,destnet,xport,xip,xnet); ++ break; ++ default: ++ j=0; hdr=(BYTE *)wsabuf->buf; ++ sprintf(str," No decoder installed for protocol\n"); ++ strcat(pbuf,str); ++ break; ++ } ++ if (j>=0) PrintRawBytes(hdr+j,bytesret-j-ip_hdr_len-12); //(hdr-(BYTE *)(wsabuf->buf + iLnxplus))); ++ } ++ else if (*pbuf) fprintf(iFile?f:stdout,"%s",pbuf); ++ ++ return ip_hdr_len; ++} +diff --git a/feeds/packages/utils/pipacs/src/.svn/text-base/parser.h.svn-base b/feeds/packages/utils/pipacs/src/.svn/text-base/parser.h.svn-base +new file mode 100644 +index 0000000..aedaeaf +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/text-base/parser.h.svn-base +@@ -0,0 +1,60 @@ ++#define LINUX 1 ++#ifdef LINUX ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#define BYTE unsigned char ++#define DWORD unsigned long ++#define BOOL char ++#define TRUE 1 ++#define FALSE 0 ++#define WSADATA int ++#define SOCKET int ++#define SOCKADDR struct sockaddr ++#define SOCKADDR_IN struct sockaddr_in ++typedef struct _WSABUF { ++ unsigned long len; ++ unsigned char *buf; ++} WSABUF; ++#define SIO_RCVALL 0 ++#define SIO_RCVALL_IGMPMCAST 0 ++#define SIO_RCVALL_MCAST 0 ++#define ETH_P_ALL 0x0003 ++#else // WINDOWS ++ ++#include ++#include ++ ++#endif ++ ++#ifndef _RCVALL_H_ ++#define _RCVALL_H_ ++ ++ ++#define MAX_IP_SIZE 65535 ++#define MIN_IP_HDR_SIZE 20 ++ ++#define HI_WORD(byte) (((byte) >> 4) & 0x0F) ++#define LO_WORD(byte) ((byte) & 0x0F) ++ ++extern char *szProto[]; ++ ++ ++ ++void PrintRawBytes (BYTE *ptr, DWORD len); ++int DecodeIGMPHeader(WSABUF *wsabuf, DWORD iphdrlen); ++int DecodeUDPHeader (WSABUF *wsabuf, DWORD iphdrlen); ++int DecodeTCPHeader (WSABUF *wsabuf, DWORD iphdrlenz); ++int DecodeIPHeader (WSABUF *wasbuf, unsigned int srcaddr, unsigned short srcport, unsigned long srcnet, ++ unsigned int destaddr, unsigned short destport, unsigned long destnet, DWORD bytesret, ++ unsigned short xport, unsigned int xip, unsigned long xnet); ++ ++#endif +diff --git a/feeds/packages/utils/pipacs/src/.svn/text-base/pipacs.c.svn-base b/feeds/packages/utils/pipacs/src/.svn/text-base/pipacs.c.svn-base +new file mode 100644 +index 0000000..4087cd3 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/.svn/text-base/pipacs.c.svn-base +@@ -0,0 +1,589 @@ ++// http://www.phj.hu/freesoft.asp ++#include ++#include ++#include "parser.h" ++ ++#ifndef LINUX ++#include ++#include ++#else ++#include ++struct promisc_device ++{ ++ char name[16]; /* name (e.g. eth0) */ ++ ++ int reset; /* do we have to reset it on exit ? */ ++ struct ifreq oldifr; /* old settings */ ++ ++ struct promisc_device *next; ++}; ++ ++#endif ++ ++DWORD dwIoControlCode=SIO_RCVALL; ++DWORD dwProtocol=IPPROTO_IP, dwInterface=0; ++ ++#define MAXVER 2 ++#define MINVER 6 ++SOCKET s; ++ ++// ++// Filters (Globals) ++// ++unsigned int uiSourceAddr=0, uiDestAddr=0, uiXAddr=0; ++unsigned short usSourcePort = 0, usDestPort = 0, usXPort = 0; ++unsigned short usSourceNet = 32, usDestNet = 32, usXNet = 32; ++unsigned long ulDestNet=0xffffffff, ulSourceNet=0xffffffff, ulXNet=0xffffffff; ++BOOL bFilter=FALSE; ++int iline=25; ++char myipname[64]; ++char pattern[1024]; ++int justheader=0; ++int gre=0; ++int sortbysize,fromip,toip; ++int skipvlan=0; ++ ++extern char filename[128]; ++ ++extern char intlist[128]; ++ ++#ifndef LINUX ++void PrintInterfaceList( void ); ++int GetInterface(SOCKET , SOCKADDR_IN *, int ); ++#endif ++extern int InitIPAcc( void ); ++extern int CloseIPAcc( void ); ++extern int iCycle; ++extern int iScreen; ++extern int iFile; ++extern int iDetail; ++extern int iRun; ++extern long lNum; ++extern FILE *f; ++extern int iProto; ++extern int iSum; ++extern char execname[]; ++extern int mostird; ++extern int iLnxplus; ++ ++int set_raw_mode(void) ++{ ++ int fd = STDIN_FILENO; ++ struct termios t; ++ ++ if (tcgetattr(fd, &t) < 0) { perror("tcgetattr"); return -1; } ++ t.c_lflag &= ~ICANON; ++ if (tcsetattr(fd, TCSANOW, &t) < 0) { perror("tcsetattr"); return -1; } ++ setbuf(stdin, NULL); ++ return 0; ++}// ++// Function: usage ++// ++// Description: ++// Prints usage information. ++// ++char *author = "phj"; ++ ++void usage(char *progname) ++{ ++ printf(" usage: %s options\n where options:\n", progname); ++ printf(" [-c:sec] Dump cycle in sec (10)\n"); ++ printf(" [-f:file[-e:program]] Results into a file [and exec program](-)\n"); ++ printf(" [-n:db] Execute just db cycle (0)\n"); ++ printf(" [-l:lineno] Print lineno lines of hosts(25)\n"); ++ printf(" [-k] Sort result by packet count (size)\n"); ++ printf(" [-1] Ignore source IP (don't ignore)\n"); ++ printf(" [-2] Ignore destination IP (don't ignore)\n"); ++ printf(" [-h] Print just the header(use -a!)\n"); ++ printf(" [-a] Print packet info&data (-)\n"); ++ printf(" [-p] Print just summary info (-)\n"); ++ printf(" Otherwise print sum&ip pairs\n"); ++//#ifndef LINUX ++ printf(" [-t:[tcp|udp|icmp|....|number]] Filter on IP protocoll (ALL)\n"); ++//#endif ++ printf(" [-g] Make GRE encapsulation trasparent (-)\n"); ++ printf(" [-v] Skip VLAN headers (-)\n"); ++ printf(" [-sa:IP[/Net]] Filter on source address (-)/net\n"); ++ printf(" [-sp:Port] Filter on source port (-)\n"); ++ printf(" [-da:IP[/Net]] Filter on dest address/net (-)\n"); ++ printf(" [-dp:Port] Filter on dest port(-)\n"); ++ printf(" [-xa:IP[/Net]] Filter on src|dest address/net (-)\n"); ++ printf(" [-xp:Port] Filter on src|dest port (-)\n"); ++ printf(" [-pa:pattern] String match (0), last param!!!\n"); ++#ifndef LINUX ++ printf(" [-i:int] Capture on this interface (0)\n"); ++ printf(" Available interfaces:\n"); ++ PrintInterfaceList(); ++#else ++ printf(" [-i:int[,int]] Capture on this interface (eth0)\n"); ++#endif ++ printf(" Filtering rules: t && (sa|da|xa) && (sp|dp|xp)"); ++ printf("\nVer. %d.%d (c):2000-2006, P l¢czi-Horv th J nos\n",MAXVER,MINVER); ++#ifndef LINUX ++ WSACleanup(); ++ ExitProcess(-1); ++#else ++ exit(5); ++#endif ++} ++ ++// ++// Function: ValidateArgs ++// ++// Description: ++// This function parses the command line arguments and ++// sets global variables to indicate how the app should act. ++// ++void ValidateArgs(int argc, char **argv) ++{ ++ int i,j; ++ char *ptr; ++ ++ sortbysize=1; fromip=1; toip=1; ++ ++ if (argc <2) { usage(argv[0]); return; } ++ if (*(author+2) != 'j') { usage(argv[0]); return; } ++ for(i=1; i < argc ;i++) { ++ if ((argv[i][0] == '-') || (argv[i][0] == '/')) { ++ switch (tolower(argv[i][1])) { ++ case 't': // traffic type ++ ptr = &argv[i][2]; ++ while (*++ptr) *ptr = toupper(*ptr); ++ ptr = &argv[i][3]; ++ for ( j=0;j<134;j++) { ++ if (!strcmp(ptr, szProto[j])) { ++// dwIoControlCode = SIO_RCVALL; ++#ifdef LINUX ++ dwProtocol = j; ++#endif ++ iProto=j; ++ break; ++ } ++ } ++ if ((j>133) && atoi(&argv[i][3])) { ++// dwIoControlCode = SIO_RCVALL; ++#ifdef LINUX ++ dwProtocol = atoi(&argv[i][3]); ++#endif ++ iProto=atoi(&argv[i][3]); ++ } else if (j>133) usage(argv[0]); ++ break; ++ case 'i': // interface number ++#ifndef LINUX ++ dwInterface = atoi(&argv[i][3]); ++#else ++ strcpy(intlist,&argv[i][3]); ++ ptr=strchr(intlist,' '); ++ if (ptr) *ptr=0; ++#endif ++ break; ++ case 'g': // gre ++ gre=1; ++ break; ++ case 'c': // cycle time ++ iCycle = atoi(&argv[i][3]); ++ break; ++ case 'a': // cycle time ++ iDetail = 1; ++ break; ++ case 'h': // cycle time ++ iDetail = justheader = 1; ++ break; ++ case 'n': // just n cycle ++ lNum = atol(&argv[i][3]); ++ break; ++ case 'l': // lineno lines ++ iline = atoi(&argv[i][3]); ++ break; ++ case 'p': // just summary ++ if ((tolower(argv[i][2]) == 'a')) { ++ strcpy(pattern,&argv[i][4]); printf("\n Pattern: \'%s",&argv[i][4]); ++ while (++iiAddressCount ;i++) { ++ printf(" %-2d ........ [%s]\n", i, ++ inet_ntoa(((SOCKADDR_IN *)slist->Address[i].lpSockaddr)->sin_addr)); ++ } ++ closesocket(s); ++ return; ++} ++ ++// ++// Function: GetInterface ++// ++// Description: ++// This function retrieves a zero based index and returns ++// the IP interface corresponding to that. ++// ++int GetInterface(SOCKET s, SOCKADDR_IN *ifx, int num) ++{ ++ SOCKET_ADDRESS_LIST *slist=NULL; ++ char buf[2048]; ++ DWORD dwBytesRet; ++ int ret; ++ ++ ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, buf, 2048,&dwBytesRet, NULL, NULL); ++ if (ret == SOCKET_ERROR) { ++ printf("WSAIoctl(SIO_ADDRESS_LIST_QUERY) failed: %d\n",WSAGetLastError()); ++ return -1; ++ } ++ slist = (SOCKET_ADDRESS_LIST *)buf; ++ if (num >= slist->iAddressCount) return -1; ++ ifx->sin_addr.s_addr = ((SOCKADDR_IN *)slist->Address[num].lpSockaddr)->sin_addr.s_addr; ++ if (*author != 'p') return -1; ++ return 0; ++} ++#endif ++#ifdef LINUX ++struct promisc_device *prom; ++ ++void init_capture( void ) ++/* ++ * 1) Open our capture socket ++ * 2) Set all the promisc devices to promiscous mode ++ */ ++{ ++ struct ifreq ifr; ++ struct promisc_device *p,*pp; ++ struct protoent *pr; ++ char *p1,*p2; ++ ++ if ((s = socket (AF_INET, SOCK_PACKET, htons (ETH_P_ALL))) < 0) ++ { ++ printf(" can't get socket: \n"); ++ exit(1); ++ } ++ strcpy(myipname,intlist); ++ p1=intlist; p=NULL; ++ while (p1) { ++ pp=p; ++ p = malloc(sizeof(struct promisc_device)); ++ if (pp) pp->next=p; else prom=p; ++ if ( (p2=strchr(p1,','))) *p2++=0; ++ strcpy(&p->name,p1); p->next=NULL; ++ printf(" %s",p->name); fflush(stdout); ++ p1=p2; ++// while(p!=NULL) { ++ strcpy (p -> oldifr.ifr_name, p -> name); ++ ++ if (ioctl (s, SIOCGIFFLAGS, &(p -> oldifr)) < 0) { ++ printf(" can't get flags: \n"); ++ exit(2); ++ } ++ p -> reset = 1; ++ ifr = p -> oldifr; ++ if (ifr.ifr_flags & IFF_PROMISC) printf(" already promisc! \n"); ++ ifr.ifr_flags |= IFF_PROMISC; ++ if (ioctl (s, SIOCSIFFLAGS, &ifr) < 0) { ++ printf(" can't set flags: \n"); ++ exit(3); ++ } ++// p = p -> next; ++ } ++} ++ ++void exit_capture(void) ++{ ++ struct promisc_device *p; ++ ++ /* do we have to check (capture_sd >= 0) ? */ ++ ++ p = prom; ++ ++ while(p != NULL) { ++ if (ioctl (s, SIOCSIFFLAGS, &(p -> oldifr)) < 0) { ++ printf("can't reset flags: \n"); ++ } ++ ++ p = p -> next; ++ } ++ ++ close (s); ++} ++#endif ++// ++// Function: main ++// ++int main(int argc, char **argv) { ++ WSADATA wsd; ++ SOCKADDR_IN if0; ++ int ret,count; ++ unsigned int optval; ++ DWORD dwBytesRet, ++ dwFlags, ++ nproc; ++ char rcvbuf[MAX_IP_SIZE]; ++ WSABUF wbuf; ++ unsigned long i; ++#ifndef LINUX ++ // Load Winsock ++ // ++ if (WSAStartup(MAKEWORD(2,2), &wsd) != 0) { ++ printf(" WSAStartup() failed: %d\n", GetLastError()); ++ return -1; ++ } ++#else ++ SOCKADDR ssaddr; ++ struct promisc_device *p; ++ fd_set ready; ++ struct timeval tv; ++#endif ++ char Key; ++ int status; ++ FILE *input; ++// Parse the command line ++// ++ strcpy(intlist,"eth0"); ++ for(i=100;i<255;i++) szProto[i]="?!?"; ++ szProto[103]="PIM"; ++ szProto[108]="IPCOMP"; ++ szProto[112]="VRRP"; ++ szProto[115]="L2TP"; ++ szProto[124]="ISIS"; ++ szProto[132]="SCTP"; ++ szProto[133]="FC"; ++ *execname=0; ++ ValidateArgs(argc, argv); ++ if (bFilter) { ++ i=uiSourceAddr; ++ if ( i || usSourcePort) ++ printf(" Source: %03d.%03d.%03d.%03d/%d:%d\n",(i&0xff000000)>>24,(i&0x00ff0000)>>16,(i&0x0000ff00)>>8,i&0xff,uiSourceAddr?usSourceNet:0, usSourcePort); ++ i=uiDestAddr; ++ if ( i || usDestPort) ++ printf(" Dest. : %03d.%03d.%03d.%03d/%d:%d\n",(i&0xff000000)>>24,(i&0x00ff0000)>>16,(i&0x0000ff00)>>8,i&0xff,uiDestAddr?usDestNet:0, usDestPort); ++ i=uiXAddr; ++ if ( i || usXPort) ++ printf(" IP. : %03d.%03d.%03d.%03d/%d:%d\n",(i&0xff000000)>>24,(i&0x00ff0000)>>16,(i&0x0000ff00)>>8,i&0xff,uiXAddr?usXNet:0, usXPort); ++ } ++ if (iFile) printf(" To file : %s\n",filename); ++ if (iProto) printf(" Protocol: %s (%d)\n",szProto[iProto],iProto); ++ // Create a raw socket for receiving IP datagrams ++ // ++#ifndef LINUX ++ s = WSASocket(AF_INET, SOCK_RAW, dwProtocol, NULL, 0, WSA_FLAG_OVERLAPPED); ++ if (s == INVALID_SOCKET) ++ { ++ printf("WSASocket() failed: %d\n", WSAGetLastError()); ++ return -1; ++ } ++ // Get an interface to read IP packets on ++ // ++ memset(&if0,0,sizeof(if0)); ++ if0.sin_family = AF_INET; ++ if0.sin_port = htons(0); ++ if (GetInterface(s, &if0, dwInterface) != 0) ++ { ++ printf("Unable to obtain an interface\n"); ++ return -1; ++ } ++ sprintf(myipname,"%-16s",inet_ntoa(if0.sin_addr)); ++#else ++ printf("starting capture ...."); fflush(stdout); ++ init_capture(); ++ printf(" capture started ....\n"); fflush(stdout); ++#endif ++ printf(" Binding to IF: %s\n", myipname); ++#ifndef LINUX ++// ++// This socket MUST be bound before calling the ioctl ++// ++ ++ if (bind(s, (SOCKADDR *)&if0, sizeof(if0)) == SOCKET_ERROR) { ++ printf("bind() failed: %d\n", WSAGetLastError()); ++ return -1; ++ } ++// ++// Set the SIO_RCVALLxxx ioctl ++// ++ optval = 1; ++ if (WSAIoctl(s, dwIoControlCode, &optval, sizeof(optval), ++ NULL, 0, &dwBytesRet, NULL, NULL) == SOCKET_ERROR) { ++ printf("WSAIotcl() set raw socket failed; %d\n", WSAGetLastError()); ++// return -1; ++ optval = 2; ++ if (WSAIoctl(s, dwIoControlCode, &optval, sizeof(optval), ++ NULL, 0, &dwBytesRet, NULL, NULL) == SOCKET_ERROR) { ++ printf("WSAIotcl() set raw socket only failed; %d\n", WSAGetLastError()); ++ return -1; ++ } ++ } ++ system("cls"); ++#else ++ tv.tv_sec=0; tv.tv_usec=0; ++ set_raw_mode(); ++ FD_ZERO(&ready); ++ FD_SET(STDIN_FILENO,&ready); ++#endif ++ input = fopen("/dev/tty", "r"); //open the terminal keyboard ++ if (uiSourceAddr==0) ulSourceNet=0; ++ else for ( i=0; i<32-usSourceNet; i++) ulSourceNet <<= 1; ++ if (uiDestAddr==0) ulDestNet=0; ++ else for ( i=0; i<32-usDestNet; i++) ulDestNet <<= 1; ++ if (uiXAddr==0) ulXNet=0; ++ else for ( i=0; i<32-usXNet; i++) ulXNet <<= 1; ++ if (uiXAddr) uiSourceAddr=uiDestAddr=uiXAddr; ++ if (usXPort) usSourcePort=usDestPort=usXPort; ++ if (ulXNet) ulSourceNet=ulDestNet=ulXNet; ++ InitIPAcc(); ++// Start receiving IP datagrams until interrupted ++// ++ count = 0; ++ if (iFile && iDetail) f=fopen(filename,"w+"); ++ if (iProto) bFilter=1; ++ if (*(author+1) != 'h') iRun=0; ++ while (iRun) { ++ rcvbuf[MAX_IP_SIZE]=0; ++ wbuf.len = MAX_IP_SIZE; ++ wbuf.buf = rcvbuf; ++#ifndef LINUX ++ dwFlags = 0; ++ ret = WSARecv(s, &wbuf, 1, &dwBytesRet, &dwFlags, NULL, NULL); ++ if (ret == SOCKET_ERROR) { ++ printf("WSARecv() failed: %d\n", WSAGetLastError()); ++ return -1; ++ } ++ if (kbhit()) { ++#else ++ dwFlags = sizeof(ssaddr); ++ ++ ret = recvfrom (s, wbuf.buf, MAX_IP_SIZE, 0, &ssaddr, (int *) &dwFlags); ++ if (ret == -1) continue; ++ dwBytesRet=wbuf.len=ret; ++ p=prom; ++ while(p!=NULL) { ++ if (!strcmp(p -> name, ssaddr.sa_data)) break; ++ p=p->next; ++ } ++ if (!p) { ++// printf("\n%s: ignored",ssaddr.sa_data); fflush(stdout); ++ continue; ++ } ++ FD_ZERO(&ready); ++ FD_SET(STDIN_FILENO,&ready); ++ if (select(STDIN_FILENO+1,&ready,NULL,NULL,&tv)>0) { ++// if (FD_ISSET(STDIN_FILENO,&ready)) { ++#endif ++ switch (getchar()) { /* branch to appropiate key handler */ ++ case 0x1b: /* Esc */ ++ iRun=0; ++ break; ++ default: ++ mostird=1; ++ break; ++ } //end of switch key ++ } ++ ++// Deccode the IP header ++// ++ if (!(nproc = DecodeIPHeader(&wbuf, uiSourceAddr, usSourcePort, ulSourceNet, ++ uiDestAddr, usDestPort, ulDestNet, dwBytesRet,usXPort,uiXAddr,ulXNet))) ++ { ++// printf("Error decoding IP header!\n"); ++// break; ++ } ++ } ++ // Cleanup ++ // ++ if (iRun && !iDetail) CloseIPAcc(); ++ if (f) fclose(f); ++#ifndef LINUX ++ closesocket(s); ++ WSACleanup(); ++#else ++ exit_capture(); ++#endif ++ return 0; ++} +diff --git a/feeds/packages/utils/pipacs/src/Makefile b/feeds/packages/utils/pipacs/src/Makefile +new file mode 100644 +index 0000000..3a48e88 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/Makefile +@@ -0,0 +1,14 @@ ++ ++EXTRA_CFLAGS := -c -I. ++PIPACS_OBJS := pipacs.o parser.o ++ ++all: pipacs ++ ++%.o: %.c ++ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^ ++ ++pipacs: $(PIPACS_OBJS) ++ $(CC) -o $@ $^ ++ ++clean: ++ rm -f *.o *.so pipacs +diff --git a/feeds/packages/utils/pipacs/src/parser.c b/feeds/packages/utils/pipacs/src/parser.c +new file mode 100644 +index 0000000..330d7cd +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/parser.c +@@ -0,0 +1,907 @@ ++#include ++#include ++#include ++#include ++//#include ++#include "parser.h" ++ ++#define printit ++ ++extern BOOL bFilter; ++extern int iline; ++extern char * author; ++extern char myipname[]; ++extern int justheader; ++extern int gre,sortbysize,fromip,toip; ++int nomac=1; ++int mostird=0; ++char mypbuff[2048]; ++// accounting variables ++#define MAXHASH 0xffff ++#define MAXTCPPORT 4096 ++unsigned long *iph=NULL; //[MAXHASH]; ++ ++typedef struct { ++ unsigned short from; ++ unsigned short to; ++ unsigned long byte; ++ unsigned short pkt; ++ unsigned short sport; ++ unsigned short dport; ++} ta; ++ ++ta *acc = NULL; ++unsigned long tcppb[MAXTCPPORT]; ++unsigned long tcppp[MAXTCPPORT]; ++unsigned long typp[255]; ++unsigned long typb[255]; ++unsigned long udpb,tcpb,udpp,tcpp; ++time_t elapsed=0; ++int iCycle=10; ++int iScreen=1; ++int iFile=0; ++long lNum=0; ++char filename[128]; ++char intlist[128]; ++int iRun=1; ++int iDetail=0; ++FILE *f=NULL; ++int iProto=0; ++int iSum=0; ++char execname[255]; ++char pbuf[8196]; ++char str[255]; ++extern char pattern[]; ++#ifndef LINUX ++int iLnxplus=0; // Windows buffer without the MAC frame ! ++#else ++int iLnxplus=14; // Linux plus IP header len =14 !!! ++#endif ++// ++// A list of protocol types in the IP protocol header ++// ++char *szProto[255] = {"IP", // 0 ++ "ICMP", // 1 ++ "IGMP", // 2 ++ "GGP", // 3 ++ "IP", // 4 ++ "ST", // 5 ++ "TCP", // 6 ++ "UCL", // 7 ++ "EGP", // 8 ++ "IGP", // 9 ++ "BBN-RCC-MON", // 10 ++ "NVP-II", // 11 ++ "PUP", // 12 ++ "ARGUS", // 13 ++ "EMCON", // 14 ++ "XNET", // 15 ++ "CHAOS", // 16 ++ "UDP", // 17 ++ "MUX", // 18 ++ "DCN-MEAS", // 19 ++ "HMP", // 20 ++ "PRM", // 21 ++ "XNS-IDP", // 22 ++ "TRUNK-1", // 23 ++ "TRUNK-2", // 24 ++ "LEAF-1", // 25 ++ "LEAF-2", // 26 ++ "RDP", // 27 ++ "IRTP", // 28 ++ "ISO-TP4", // 29 ++ "NETBLT", // 30 ++ "MFE-NSP", // 31 ++ "MERIT-INP", // 32 ++ "SEP", // 33 ++ "3PC", // 34 ++ "IDPR", // 35 ++ "XTP", // 36 ++ "DDP", // 37 ++ "IDPR-CMTP", // 38 ++ "TP++", // 39 ++ "IL", // 40 ++ "SIP", // 41 ++ "SDRP", // 42 ++ "SIP-SR", // 43 ++ "SIP-FRAG", // 44 ++ "IDRP", // 45 ++ "RSVP", // 46 ++ "GRE", // 47 ++ "MHRP", // 48 ++ "BNA", // 49 ++ "IPSEC-ESP", // 50 ++ "IPSEC-AH", // 51 ++ "I-NLSP", // 52 ++ "SWIPE", // 53 ++ "NHRP", // 54 ++ "?55?", // 55 ++ "?56?", // 56 ++ "SKIO", // 57 ++ "V6ICMP", // 58 ++ "V6NoNXT", // 59 ++ "V6OPT", // 60 ++ "int.host", // 61 ++ "CFTP", // 62 ++ "loc.net", // 63 ++ "SAT-EXPAK", // 64 ++ "KRYPTOLAN", // 65 ++ "RVD", // 66 ++ "IPPC", // 67 ++ "dist.fs", // 68 ++ "SAT-MON", // 69 ++ "VISA", // 70 ++ "IPCV", // 71 ++ "CPNX", // 72 ++ "CPHB", // 73 ++ "WSN", // 74 ++ "PVP", // 75 ++ "BR-SAT-MON", // 76 ++ "SUN-ND", // 77 ++ "WB-MON", // 78 ++ "WB-EXPAK", // 79 ++ "ISO-IP", // 80 ++ "VMTP", // 81 ++ "SECURE-VMTP",// 82 ++ "VINES", // 83 ++ "TTP", // 84 ++ "NSFNET-IGP", // 85 ++ "DGP", // 86 ++ "TCF", // 87 ++ "IGRP", // 88 ++ "OSPF", // 89 ++ "Sprite-RPC", // 90 ++ "LARP", // 91 ++ "MTP", // 92 ++ "AX.25", // 93 ++ "IPIP", // 94 ++ "MICP", // 95 ++ "SCC-SP", // 96 ++ "ETHERIP", // 97 ++ "ENCAP", // 98 ++ "priv.enc", // 99 ++ "GMTP" // 99 ++ }; ++// ++// The types of IGMP messages ++// ++char *szIgmpType[] = {"", ++ "Host Membership Query", ++ "HOst Membership Report", ++ "", ++ "", ++ "", ++ "Version 2 Membership Report", ++ "Leave Group", ++ "", ++ "" ++ }; ++ ++// ++// Function: PrintRawBytes ++// ++// Description: ++// This function simply prints out a series of bytes ++// as hexadecimal digits. ++// ++void PrintRawBytes(BYTE *ptr, DWORD len) ++{ ++ int i,j; ++// if (! iFile) { ++*(ptr+len)=0; ++if ((*pattern==0) || strstr(ptr,pattern) ) { ++ fprintf(iFile?f:stdout,"%s",pbuf); ++ fprintf(iFile?f:stdout," " ); ++ while (len > 0) { ++ for(i=0; i < 16; i++) { ++ fprintf(iFile?f:stdout,"%x%x ", HI_WORD(*ptr), LO_WORD(*ptr)); ++ len--; ++ ptr++; ++ if (len == 0) {j=i++; while(++j < 16) fprintf(iFile?f:stdout," "); break; } ++ } ++ fprintf(iFile?f:stdout," "); ++ for(j=0; j < i; j++) fprintf(iFile?f:stdout,"%c",isprint(*(ptr-i+j))?*(ptr-i+j):'.'); ++ if (len) fprintf(iFile?f:stdout,"\n "); ++ } ++// } else { ++// fwrite(ptr,sizeof(BYTE),len,f); ++// } ++} ++} ++ ++static char *ICMPTypeTable[]={ ++ "Echo Reply", "ICMP 1", "ICMP 2", "Dest Unreachable","SrcQuench", "Redirect", "6", "7","Echo Request","9","10", ++ "Time Exceed", "ParamPrblm", "Timestamp", "Timestamp reply","InfoRqst", "InfoRply" ++}; ++static char *Dstunreach[]={ ++"net unreach.","host unreach.","protocol unreach.","port unreach.", ++"frag needed","source route?","","" ++}; ++int DecodeICMPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus ); ++ unsigned short type,code,chksum, ++ id, ++ seq; ++ unsigned long resptime,r1,r2; ++ BYTE *hhh; ++ SOCKADDR_IN addr; ++ type=*hdr++; code=*hdr++; ++ sprintf(str," Type:%-12s Code:%3d,",ICMPTypeTable[type],code); ++ ++ strcat(pbuf,str); ++ memcpy(&chksum, hdr, 2); ++ hdr += 2; hhh=hdr; ++ memcpy(&id, hdr, 2); ++ hdr += 2; ++ memcpy(&seq, hdr, 2); ++ hdr+=2; ++// memcpy(&resptime, hdr, 4); ++// hdr+=4; ++ switch (type) { ++ case 3: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ if (code==4 ) sprintf(str,"frag needed-Max MTU:%u at %-15s\n",ntohs(seq), inet_ntoa(addr.sin_addr)); ++ else sprintf(str,"%s at %-15s\n",Dstunreach[code&7],inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 11: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ sprintf(str,"%s at %-15s\n",code?"frag reass. exceed":"ttl exceed",inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 12: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ sprintf(str," err:%d at %-15s\n",id,inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 4: ++ memcpy(&addr.sin_addr.s_addr, hdr+16, 4); ++ sprintf(str," wait for %-15s\n",ntohs(id),inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 5: ++ memcpy(&addr.sin_addr.s_addr, hhh, 4); ++ sprintf(str," from gw: %-15s\n",inet_ntoa(addr.sin_addr)); ++ hdr+=iphdrlen; ++ break; ++ case 0: ++ case 8: ++ sprintf(str," Id:%3u Seq:%3u\n",ntohs(id),ntohs(seq)); ++ break; ++ case 13: ++ case 14: ++ memcpy(&resptime, hdr, 4); ++ hdr+=4; ++ memcpy(&r1, hdr, 4); ++ hdr+=4; ++ memcpy(&r2, hdr, 4); ++ hdr+=4; ++ sprintf(str," Id:%3u Seq:%3d Rec/Tr %ld/%ld ms\n",ntohs(id),ntohs(seq),ntohl(r1)-ntohl(resptime),ntohl(r2)-ntohl(resptime)); ++ break; ++ case 15: ++ case 16: ++ sprintf(str," Id:%3u Seq:%3d\n",ntohs(id),ntohs(seq)); ++ break; ++ } ++ strcat(pbuf,str); ++ return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++// ++// Function: DecodeIGMPHeader ++// ++// Description: ++// This function takes a pointer to a buffer containing ++// an IGMP packet and prints it out in a readable form. ++// ++ ++int DecodeIGMPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short chksum, ++ version, ++ type, ++ maxresptime; ++ SOCKADDR_IN addr; ++ version = HI_WORD(*hdr); ++ type = LO_WORD(*hdr); ++ ++ hdr++; ++ maxresptime = *hdr; ++ hdr++; ++ ++ memcpy(&chksum, hdr, 2); ++ chksum = ntohs(chksum); ++ hdr += 2; ++ ++ memcpy(&(addr.sin_addr.s_addr), hdr, 4); ++ sprintf(str," IGMP HEADER:\n"); ++ strcat(pbuf,str); ++ if ((type == 1) || (type == 2)) version = 1; ++ else version = 2; ++ sprintf(str," IGMP Version = %d\n IGMP Type = %s\n",version, szIgmpType[type]); ++ strcat(pbuf,str); ++ if (version == 2) { ++ sprintf(str," Max Resp Time = %d\n", maxresptime); ++ strcat(pbuf,str); ++ } ++ sprintf(str," IGMP Grp Addr = %s\n", inet_ntoa(addr.sin_addr)); ++ strcat(pbuf,str); ++ ++ return 8; ++} ++ ++// ++// Function: DecodeUDPHeader ++// ++// Description: ++// This function takes a buffer which points to a UDP ++// header and prints it out in a readable form. ++// ++int DecodeUDPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short shortval, ++ udp_src_port, ++ udp_dest_port, ++ udp_len, ++ udp_chksum; ++ memcpy(&shortval, hdr, 2); ++ udp_src_port = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ udp_dest_port = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ udp_len = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ udp_chksum = ntohs(shortval); ++ hdr += 2; ++ ++ sprintf(str," UDP: SPort: %-05d | DPort: %-05d",udp_src_port, udp_dest_port); ++ strcat(pbuf,str); ++ sprintf(str," | Len: %-05d | CSum: 0x%08x\n",udp_len, udp_chksum); ++ strcat(pbuf,str); ++ return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++// ++// Function: DecodeTCPHeader ++// ++// Description: ++// This function takes a buffer pointing to a TCP header ++// and prints it out in a readable form. ++// ++int DecodeTCPHeader(WSABUF *wsabuf, DWORD iphdrlen) { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short shortval; ++ unsigned long longval; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ sprintf(str," TCP: SPort: %u", shortval); ++ strcat(pbuf,str); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ sprintf(str," DPort: %u", shortval); ++ strcat(pbuf,str); ++ hdr += 2; ++ ++ memcpy(&longval, hdr, 4); ++ longval = ntohl(longval); ++ sprintf(str," Seq: %lX", longval); ++ strcat(pbuf,str); ++ hdr += 4; ++ ++ memcpy(&longval, hdr, 4); ++ longval = ntohl(longval); ++ sprintf(str," ACK: %lX", longval); ++ strcat(pbuf,str); ++ hdr += 4; ++// printf(" Header Len : %d (bytes %d)\n", HI_WORD(*hdr), (HI_WORD(*hdr) * 4)); ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval) & 0x3F; ++ sprintf(str," Flags: "); ++ strcat(pbuf,str); ++ if (shortval & 0x20) strcat(pbuf,"URG "); ++ if (shortval & 0x10) strcat(pbuf,"ACK "); ++ if (shortval & 0x08) strcat(pbuf,"PSH "); ++ if (shortval & 0x04) strcat(pbuf,"RST "); ++ if (shortval & 0x02) strcat(pbuf,"SYN "); ++ if (shortval & 0x01) strcat(pbuf,"FIN "); ++ strcat(pbuf,"\n"); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++// printf(" Window size: %d\n", shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++// printf(" TCP Chksum : %d\n", shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ hdr += 2; ++// printf(" Urgent ptr : %d\n", shortval); ++ ++ return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++int DecodeGREHeader(WSABUF *wsabuf, DWORD iphdrlen,DWORD bytesret, ++ unsigned int srcip, unsigned short srcport, unsigned long srcnet,unsigned int destip, unsigned short destport, unsigned long destnet, ++ unsigned short xport,unsigned int xip, unsigned long xnet) ++ { ++ BYTE *hdr = (BYTE *)((BYTE *)wsabuf->buf + iphdrlen + iLnxplus); ++ unsigned short shortval; ++ unsigned long longval; ++ int ipe; ++ BYTE *orihdr; ++ char *sstr; ++ SOCKADDR_IN srcaddr; ++ ++ orihdr=hdr; ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ sprintf(str," GRE Flag: %u Prot:", shortval); ++ strcat(mypbuff,str); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ shortval = ntohs(shortval); ++ ipe=0; ++ sstr=str; ++// sprintf(str," Prot: %u", shortval); ++ switch ( shortval ) { ++ case 4: sstr="SNA"; ++ break; ++ case 0xfe: sstr="OSI"; ++ break; ++ case 0x200: sstr="PUP"; ++ break; ++ case 0x600: sstr="XNS"; ++ break; ++ case 0x800: sstr="IP"; ++ ipe=1; ++ break; ++ case 0x804: sstr="Chaos"; ++ break; ++ case 0x806: sstr="ARP"; ++ break; ++ case 0x6558: sstr="Tr.bridge"; ++ break; ++ default: sprintf(str,"%u", shortval); ++ break; ++ } ++ hdr += 2; ++ strcat(mypbuff,sstr); ++ if (ipe && gre) { ++ int plusment,jj,protoment; ++ plusment=iLnxplus; ++ protoment=iProto; ++ if (iProto==47) iProto=0; ++ iLnxplus+=4; ++ nomac=0; ++ iLnxplus=plusment+24; ++ DecodeIPHeader(wsabuf,srcip,srcport,srcnet,destip,destport,destnet,bytesret,xport,xip,xnet); ++ nomac=1; ++ iLnxplus=plusment; ++ iProto=protoment; ++ } ++return -1; ++// return hdr-(BYTE *)(wsabuf->buf + iphdrlen + iLnxplus); ++} ++ ++ ++int ClearIPAcc() { ++ unsigned long i; ++ ta *tai; ++ for(i=0;ifrom=tai->to=0; tai++; } ++ for (i=0;ibyte > d2->byte) return -1; ++ if (d1->byte < d2->byte) return 1; ++ return 0; ++} ++int countsort(const void *s1, const void *s2) { // sorting tale in packet count order ++ ta *d1; ++ ta *d2; ++ d1= (ta *)s1; d2=(ta *)s2; ++ if (d1->pkt > d2->pkt) return -1; ++ if (d1->pkt < d2->pkt) return 1; ++ return 0; ++} ++int CloseIPAcc( long ti) { ++ unsigned long i; ++ ta *tai; ++ SOCKADDR_IN srcaddr; ++ SOCKADDR_IN dstaddr; ++ float ff; ++ char str[16]; ++ unsigned long j,k,l; ++ int lin=0; ++ int linn; ++ ++ time(&elapsed); ++ if (iFile) f=fopen(filename,"w+"); ++ k=0; ++ if (sortbysize) qsort(acc,MAXHASH,sizeof(ta),bytesort); ++ else qsort(acc,MAXHASH,sizeof(ta),countsort); ++ ff=0.0; ++ for (i=0;i<255;i++) ff+=typb[i]; ++ for (i=0; ifrom!=0) && (tai->to!=0)) ++k; ++ } ++ if (iScreen) { ++#ifndef LINUX ++ system("cls"); ++#else ++ system("clear"); ++// printf("\033[1~"); ++#endif ++ printf("%-16s Speed: %5.2f Kbit/s , %ld IP pairs / %ld secs. %s@%s.hu",myipname,ff/ti/1024*8,k,ti,author,author); ++ printf("\nProt:"); j=0; ++lin; ++ while (1) { ++ l=k=0; ++ for (i=0;i<100;i++) if ( typb[i]>k) { k=typb[i]; l=i; } ++ if (k==0) break; ++ if ((j>0) && ((j%3)==0)) { printf("\n "); ++lin; } ++ if (k>1024*1024) printf(" %-8.8s:%5.1fk/%-6.1f M",szProto[l],(float)typp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) printf(" %-8.8s:%5ld/%-6.1f k",szProto[l],typp[l],(float)k/1024); ++ else printf(" %-8.8s:%5ld/%-8ld",szProto[l],typp[l],k); ++ typb[l]=0; ++ ++j; ++ } ++ printf("\nPort:"); j=0; ++lin; ++ k=0; linn=lin; ++ while (1) { ++ l=k=0; ++ for (i=0;ik) { k=tcppb[i]; l=i; } ++ if (k==0) break; ++ if (j && (j%4)==0) { ++ if (lin >= linn+1) break; ++ printf("\n "); ++ ++lin; ++ } ++ if (k>1024*1024) printf(" %04d:%4.1fk/%-5.1f M",l,(float)tcppp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) printf(" %04d:%4ld/%-5.1f k",l,tcppp[l],(float)k/1024); ++ else printf(" %04d:%4ld/%-7ld",l,tcppp[l],k); ++ tcppb[l]=0; ++ ++j; ++ } ++ } else if (f) { ++ fprintf(f,"%-16s Speed: %5.2f Kbit/s , %ld IP pairs / %ld secs. %s@%s.hu",myipname,ff/ti/1024*8,k,ti,author,author); ++ fprintf(f,"\nProt:"); j=0; ++ while (1) { ++ l=k=0; ++ for (i=0;i<100;i++) if ( typb[i]>k) { k=typb[i]; l=i; } ++ if (k==0) break; ++ if (k>1024*1024) fprintf(f," %-8.8s:%5.1fk/%-6.1f M",szProto[l],(float)typp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) fprintf(f," %-8.8s:%5ld/%-6.1f k",szProto[l],typp[l],(float)k/1024); ++ else fprintf(f," %-8.8s:%5ld/%-8ld",szProto[l],typp[l],k); ++ typb[l]=0; ++ ++j; ++ } ++ printf("\nPort:"); j=0; ++ k=0; linn=lin; ++ while (1) { ++ l=k=0; ++ for (i=0;ik) { k=tcppb[i]; l=i; } ++ if (k==0) break; ++ if (k>1024*1024) fprintf(f," %04d:%4.1fk/%-5.1f M",l,(float)tcppp[l]/1024,(float)k/(1024*1024)); ++ else if (k>1024) fprintf(f," %04d:%4ld/%-5.1f k",l,tcppp[l],(float)k/1024); ++ else fprintf(f," %04d:%4ld/%-7ld",l,tcppp[l],k); ++ tcppb[l]=0; ++ ++j; ++ } ++ } ++ ++ for (i=0; ifrom!=0) && (tai->to!=0)) { ++k; ++ if (!iSum) { ++ dstaddr.sin_addr.s_addr = htonl(*(iph+tai->from)); ++ srcaddr.sin_addr.s_addr = htonl(*(iph+(tai->to))); ++ strcpy(str,inet_ntoa(dstaddr.sin_addr)); ++ if (iScreen && (++linpkt,tai->byte,((float)tai->byte)/ti/1024*8); ++ if (f) fprintf(f,"%-15s\t%-15s\t%d\t%ld\n",str,inet_ntoa(srcaddr.sin_addr),tai->pkt,tai->byte); ++ } ++ } ++ } ++ if (iScreen) printf("\n"); ++#ifdef LINUX ++ if (iScreen) fflush(stdout); ++#endif ++ ClearIPAcc(); ++ if (f) { ++ char cmdline[255]; ++ fclose(f); ++// if (*execname) _spawnle(_P_NOWAIT,execname,execname,filename); ++// if (*execname) _execl(execname,execname); ++ if (*execname) { ++#ifndef LINUX ++ sprintf(cmdline,"%s %s",execname,filename); ++#else ++ sprintf(cmdline,"%s %s",execname,filename); ++#endif ++ system(cmdline); ++// iRun=0; ++ } ++ } ++ f=NULL; ++ return 0; ++} ++ ++unsigned short FindIPHash( unsigned long ip ) { ++ unsigned short hashval; ++ unsigned long *ipt; ++ ++ hashval = (unsigned short)(((ip&0xFFFF0000)>>16) ^ (ip&0x0000FFFF)); ++ ipt=iph + hashval; ++ while (*ipt != 0 && (*ipt!=ip)) { ipt++; hashval++; } ++ if (*ipt==0) *ipt=ip; ++ return hashval; ++} ++ ++unsigned short SetIPAcc( unsigned long src, unsigned long dst, unsigned long byte, unsigned short typ, unsigned short sport, unsigned short dport) { ++ unsigned short from,to,hash; ++ ta *tai; ++ hash=0; ++ if (src) { ++ ++ if (fromip) from=FindIPHash(src); else from=-1; ++ if (toip) to=FindIPHash(dst); else to=-1; ++ hash=from^to; ++ tai=acc + hash; ++ while ( ((tai->from!=from) && (tai->to!=to)) && ((tai->from!=0) && (tai->to!=0)) ) {tai++; hash++; } ++ if ((tai->from==0)&&(tai->to==0)) { ++ tai->byte=byte; tai->from=from; tai->to=to; tai->pkt=1; ++ } else { tai->byte+=byte; tai->pkt++; } ++ ++ typp[typ]++; ++ typb[typ]+=byte; ++ if ((sport>0) && (sport0) && (dportbuf, ++ *nexthdr = NULL, ++ *ohdr; ++ unsigned short shortval; ++ SOCKADDR_IN srcaddr, ++ destaddr; ++ ++ unsigned short ip_version, ++ ip_hdr_len, ++ ip_tos, ++ ip_total_len, ++ ip_id, ++ ip_flags, ++ ip_ttl, ++ ip_frag_offset, ++ ip_proto, ++ ip_hdr_chksum, ++ ip_src_port, ++ ip_dest_port; ++ unsigned int ip_src, ++ ip_dest; ++ BOOL bPrint = FALSE; ++ char ip_prtype=0; ++ int j; ++ time_t tt; ++ struct tm *tmm; ++ ++ ohdr=hdr; ++ if (iLnxplus) ip_prtype=*(hdr+iLnxplus-1); ++ if (ip_prtype) return 0; ++ hdr += iLnxplus; ++ ip_version = HI_WORD(*hdr); ++ ip_hdr_len = LO_WORD(*hdr) * 4; ++ nexthdr = (BYTE *)((BYTE *)hdr + ip_hdr_len); ++ hdr++; ++ ++ ip_tos = *hdr; ++ hdr++; ++ ++ memcpy(&shortval, hdr, 2); ++ ip_total_len = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&shortval, hdr, 2); ++ ip_id = ntohs(shortval); ++ hdr += 2; ++ ++ ip_flags = ((*hdr) >> 5); ++ ++ memcpy(&shortval, hdr, 2); ++ ip_frag_offset = ((ntohs(shortval)) & 0x1FFF); ++ hdr += 2; ++ ++ ip_ttl = *hdr; ++ hdr++; ++ ++ ip_proto = *hdr; ++ hdr++; ++ ++ memcpy(&shortval, hdr, 2); ++ ip_hdr_chksum = ntohs(shortval); ++ hdr += 2; ++ ++ memcpy(&srcaddr.sin_addr.s_addr, hdr, 4); ++ ip_src = ntohl(srcaddr.sin_addr.s_addr); ++ hdr += 4; ++ ++ memcpy(&destaddr.sin_addr.s_addr, hdr, 4); ++ ip_dest = ntohl(destaddr.sin_addr.s_addr); ++ hdr += 4; ++ // ++ // If packet is UDP, TCP, or IGMP read ahead and ++ // get the port values. ++ // ++ ip_src_port=ip_dest_port=0; ++ if (((ip_proto == 2) || ++ (ip_proto == 6) || ++ (ip_proto == 17)) ) //&& bFilter) ++ { ++ memcpy(&ip_src_port, nexthdr, 2); ++ ip_src_port = ntohs(ip_src_port); ++ memcpy(&ip_dest_port, nexthdr+2, 2); ++ ip_dest_port = ntohs(ip_dest_port); ++ ++ }; ++ bPrint = 0; ++// xaok= (xip!=0) && (((xip&xnet)==(ip_src&xnet))||((xip&xnet)==(ip_dest&xnet))); ++// saok= ((srcip==0)||((srcip&srcnet)==(ip_src&srcnet))); ++// daok = ((destip==0)||((destip&destnet)==(ip_dest&destnet))); ++// xpok=(xport!=0) && ((xport==ip_src_port)||(xport==ip_dest_port)); ++// spok=((srcport==0)||(srcport == ip_src_port)); ++// dpok=((destport==0)||(destport == ip_dest_port)); ++//printf("\nf:%d xa:%d sa:%d da:%d xp:%d sp:%d dp:%d",bFilter,xaok,saok,daok,xpok,spok,dpok); ++// if (!bFilter || ( (xaok||(saok&&daok)) && (xpok||(spok&&dpok)))) { ++if ((!bFilter) || ((ip_proto==47)&&gre) || ++ ( ++ ((iProto==0)||(ip_proto==iProto)) && ++ ( ++ ((xip!=0) && (((xip&xnet)==(ip_src&xnet))||((xip&xnet)==(ip_dest&xnet))) ++ ) || ( ++ ((srcip==0) || ((srcip&srcnet)==(ip_src&srcnet))) && ((destip==0)||((destip&destnet)==(ip_dest&destnet))) ++ ) ++ ) ++ && ++ ( ++ ((xport!=0) && ((xport==ip_src_port)||(xport==ip_dest_port)) ++ ) || ( ++ ((srcport==0)||(srcport == ip_src_port))&&((destport==0)||(destport == ip_dest_port)) ++ ) ++ ) ++ ) ++ ) { ++ if (! iDetail) { ++ if ((ip_proto==47)&&gre) { ++ *mypbuff=0; ++ DecodeGREHeader(wsabuf, ip_hdr_len, bytesret, ++ srcip,srcport,srcnet,destip,destport,destnet,xport,xip,xnet); ++// SetIPAcc(0,0,0,0,0,0); ++ return ip_hdr_len; ++ } ++ SetIPAcc(ip_src,ip_dest,ip_total_len,ip_proto,ip_src_port,ip_dest_port); ++ } ++ else bPrint=TRUE; ++// printf("%d %ld %ld %ld %ld",ip_proto,xip,xip&xnet,ip_src&xnet,ip_dest&xnet); ++ } else { ++ if (! iDetail) SetIPAcc(0,0,0,0,0,0); ++// else bPrint=TRUE; ++ } ++ time(&tt); ++ if ((!iSum && ( tt-elapsed > iCycle)) || !iRun || mostird) { ++ mostird=0; ++ if (! iDetail) CloseIPAcc(tt-elapsed-1); ++ else { ++ time(&elapsed); ++ if (f) fclose(f); ++ if (iFile) f=fopen(filename,"a"); ++ } ++ } ++ if (lNum) { if (--lNum <= 0) iRun=0; } ++ ++ // ++ *pbuf=0; ++ if (bPrint) { ++ tmm=localtime(&tt); ++if (! nomac ) { ++ strcpy(pbuf,mypbuff); ++} else { ++ sprintf(str,"\n%4.4d.%2.2d.%2.2d %2.2d:%2.2d:%2.2d ", ++ tmm->tm_year+1900,tmm->tm_mon+1,tmm->tm_mday,tmm->tm_hour,tmm->tm_min,tmm->tm_sec); ++ strcat(pbuf,str); ++#ifdef LINUX ++ sprintf(str,"%x:%x:%x:%x:%x:%x > %x:%x:%x:%x:%x:%x",*ohdr,*(ohdr+1),*(ohdr+2),*(ohdr+3),*(ohdr+4),*(ohdr+5), ++ *(ohdr+6),*(ohdr+7),*(ohdr+8),*(ohdr+9),*(ohdr+10),*(ohdr+11)); ++ strcat(pbuf,str); ++#endif ++} ++ sprintf(str," %d bytes\n%-15s>", ip_total_len, inet_ntoa(srcaddr.sin_addr)); ++ strcat(pbuf,str); ++ sprintf(str,"%-15s", inet_ntoa(destaddr.sin_addr)); ++ strcat(pbuf,str); ++ sprintf(str," TTL:%-3d Proto:%-6s F:%d/%d TOS:%X%X\n", ++ ip_ttl, szProto[ip_proto],ip_flags,ip_frag_offset,HI_WORD(ip_tos), LO_WORD(ip_tos)); ++ strcat(pbuf,str); ++ if (iFile) strcat(pbuf,"."); ++ strcpy(mypbuff,pbuf); ++ ++ } ++ else return ip_hdr_len; ++ ++ if (justheader) { if (*pbuf) fprintf(iFile?f:stdout,"%s",pbuf); return ip_hdr_len; } ++ if (iDetail) { ++ switch (ip_proto) { ++ case 1: // ICMP ++ j=DecodeICMPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 2: // IGMP ++ j=DecodeIGMPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 6: // TCP ++ j=DecodeTCPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 17: // UDP ++ j=DecodeUDPHeader(wsabuf, ip_hdr_len); ++ break; ++ case 47: // UDP ++ j=DecodeGREHeader(wsabuf, ip_hdr_len, bytesret, ++ srcip,srcport,srcnet,destip,destport,destnet,xport,xip,xnet); ++ break; ++ default: ++ j=0; hdr=(BYTE *)wsabuf->buf; ++ sprintf(str," No decoder installed for protocol\n"); ++ strcat(pbuf,str); ++ break; ++ } ++ if (j>=0) PrintRawBytes(hdr+j,bytesret-j-ip_hdr_len-12); //(hdr-(BYTE *)(wsabuf->buf + iLnxplus))); ++ } ++ else if (*pbuf) fprintf(iFile?f:stdout,"%s",pbuf); ++ ++ return ip_hdr_len; ++} +diff --git a/feeds/packages/utils/pipacs/src/parser.h b/feeds/packages/utils/pipacs/src/parser.h +new file mode 100644 +index 0000000..aedaeaf +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/parser.h +@@ -0,0 +1,60 @@ ++#define LINUX 1 ++#ifdef LINUX ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#define BYTE unsigned char ++#define DWORD unsigned long ++#define BOOL char ++#define TRUE 1 ++#define FALSE 0 ++#define WSADATA int ++#define SOCKET int ++#define SOCKADDR struct sockaddr ++#define SOCKADDR_IN struct sockaddr_in ++typedef struct _WSABUF { ++ unsigned long len; ++ unsigned char *buf; ++} WSABUF; ++#define SIO_RCVALL 0 ++#define SIO_RCVALL_IGMPMCAST 0 ++#define SIO_RCVALL_MCAST 0 ++#define ETH_P_ALL 0x0003 ++#else // WINDOWS ++ ++#include ++#include ++ ++#endif ++ ++#ifndef _RCVALL_H_ ++#define _RCVALL_H_ ++ ++ ++#define MAX_IP_SIZE 65535 ++#define MIN_IP_HDR_SIZE 20 ++ ++#define HI_WORD(byte) (((byte) >> 4) & 0x0F) ++#define LO_WORD(byte) ((byte) & 0x0F) ++ ++extern char *szProto[]; ++ ++ ++ ++void PrintRawBytes (BYTE *ptr, DWORD len); ++int DecodeIGMPHeader(WSABUF *wsabuf, DWORD iphdrlen); ++int DecodeUDPHeader (WSABUF *wsabuf, DWORD iphdrlen); ++int DecodeTCPHeader (WSABUF *wsabuf, DWORD iphdrlenz); ++int DecodeIPHeader (WSABUF *wasbuf, unsigned int srcaddr, unsigned short srcport, unsigned long srcnet, ++ unsigned int destaddr, unsigned short destport, unsigned long destnet, DWORD bytesret, ++ unsigned short xport, unsigned int xip, unsigned long xnet); ++ ++#endif +diff --git a/feeds/packages/utils/pipacs/src/pipacs.c b/feeds/packages/utils/pipacs/src/pipacs.c +new file mode 100644 +index 0000000..4087cd3 +--- /dev/null ++++ b/feeds/packages/utils/pipacs/src/pipacs.c +@@ -0,0 +1,589 @@ ++// http://www.phj.hu/freesoft.asp ++#include ++#include ++#include "parser.h" ++ ++#ifndef LINUX ++#include ++#include ++#else ++#include ++struct promisc_device ++{ ++ char name[16]; /* name (e.g. eth0) */ ++ ++ int reset; /* do we have to reset it on exit ? */ ++ struct ifreq oldifr; /* old settings */ ++ ++ struct promisc_device *next; ++}; ++ ++#endif ++ ++DWORD dwIoControlCode=SIO_RCVALL; ++DWORD dwProtocol=IPPROTO_IP, dwInterface=0; ++ ++#define MAXVER 2 ++#define MINVER 6 ++SOCKET s; ++ ++// ++// Filters (Globals) ++// ++unsigned int uiSourceAddr=0, uiDestAddr=0, uiXAddr=0; ++unsigned short usSourcePort = 0, usDestPort = 0, usXPort = 0; ++unsigned short usSourceNet = 32, usDestNet = 32, usXNet = 32; ++unsigned long ulDestNet=0xffffffff, ulSourceNet=0xffffffff, ulXNet=0xffffffff; ++BOOL bFilter=FALSE; ++int iline=25; ++char myipname[64]; ++char pattern[1024]; ++int justheader=0; ++int gre=0; ++int sortbysize,fromip,toip; ++int skipvlan=0; ++ ++extern char filename[128]; ++ ++extern char intlist[128]; ++ ++#ifndef LINUX ++void PrintInterfaceList( void ); ++int GetInterface(SOCKET , SOCKADDR_IN *, int ); ++#endif ++extern int InitIPAcc( void ); ++extern int CloseIPAcc( void ); ++extern int iCycle; ++extern int iScreen; ++extern int iFile; ++extern int iDetail; ++extern int iRun; ++extern long lNum; ++extern FILE *f; ++extern int iProto; ++extern int iSum; ++extern char execname[]; ++extern int mostird; ++extern int iLnxplus; ++ ++int set_raw_mode(void) ++{ ++ int fd = STDIN_FILENO; ++ struct termios t; ++ ++ if (tcgetattr(fd, &t) < 0) { perror("tcgetattr"); return -1; } ++ t.c_lflag &= ~ICANON; ++ if (tcsetattr(fd, TCSANOW, &t) < 0) { perror("tcsetattr"); return -1; } ++ setbuf(stdin, NULL); ++ return 0; ++}// ++// Function: usage ++// ++// Description: ++// Prints usage information. ++// ++char *author = "phj"; ++ ++void usage(char *progname) ++{ ++ printf(" usage: %s options\n where options:\n", progname); ++ printf(" [-c:sec] Dump cycle in sec (10)\n"); ++ printf(" [-f:file[-e:program]] Results into a file [and exec program](-)\n"); ++ printf(" [-n:db] Execute just db cycle (0)\n"); ++ printf(" [-l:lineno] Print lineno lines of hosts(25)\n"); ++ printf(" [-k] Sort result by packet count (size)\n"); ++ printf(" [-1] Ignore source IP (don't ignore)\n"); ++ printf(" [-2] Ignore destination IP (don't ignore)\n"); ++ printf(" [-h] Print just the header(use -a!)\n"); ++ printf(" [-a] Print packet info&data (-)\n"); ++ printf(" [-p] Print just summary info (-)\n"); ++ printf(" Otherwise print sum&ip pairs\n"); ++//#ifndef LINUX ++ printf(" [-t:[tcp|udp|icmp|....|number]] Filter on IP protocoll (ALL)\n"); ++//#endif ++ printf(" [-g] Make GRE encapsulation trasparent (-)\n"); ++ printf(" [-v] Skip VLAN headers (-)\n"); ++ printf(" [-sa:IP[/Net]] Filter on source address (-)/net\n"); ++ printf(" [-sp:Port] Filter on source port (-)\n"); ++ printf(" [-da:IP[/Net]] Filter on dest address/net (-)\n"); ++ printf(" [-dp:Port] Filter on dest port(-)\n"); ++ printf(" [-xa:IP[/Net]] Filter on src|dest address/net (-)\n"); ++ printf(" [-xp:Port] Filter on src|dest port (-)\n"); ++ printf(" [-pa:pattern] String match (0), last param!!!\n"); ++#ifndef LINUX ++ printf(" [-i:int] Capture on this interface (0)\n"); ++ printf(" Available interfaces:\n"); ++ PrintInterfaceList(); ++#else ++ printf(" [-i:int[,int]] Capture on this interface (eth0)\n"); ++#endif ++ printf(" Filtering rules: t && (sa|da|xa) && (sp|dp|xp)"); ++ printf("\nVer. %d.%d (c):2000-2006, P l¢czi-Horv th J nos\n",MAXVER,MINVER); ++#ifndef LINUX ++ WSACleanup(); ++ ExitProcess(-1); ++#else ++ exit(5); ++#endif ++} ++ ++// ++// Function: ValidateArgs ++// ++// Description: ++// This function parses the command line arguments and ++// sets global variables to indicate how the app should act. ++// ++void ValidateArgs(int argc, char **argv) ++{ ++ int i,j; ++ char *ptr; ++ ++ sortbysize=1; fromip=1; toip=1; ++ ++ if (argc <2) { usage(argv[0]); return; } ++ if (*(author+2) != 'j') { usage(argv[0]); return; } ++ for(i=1; i < argc ;i++) { ++ if ((argv[i][0] == '-') || (argv[i][0] == '/')) { ++ switch (tolower(argv[i][1])) { ++ case 't': // traffic type ++ ptr = &argv[i][2]; ++ while (*++ptr) *ptr = toupper(*ptr); ++ ptr = &argv[i][3]; ++ for ( j=0;j<134;j++) { ++ if (!strcmp(ptr, szProto[j])) { ++// dwIoControlCode = SIO_RCVALL; ++#ifdef LINUX ++ dwProtocol = j; ++#endif ++ iProto=j; ++ break; ++ } ++ } ++ if ((j>133) && atoi(&argv[i][3])) { ++// dwIoControlCode = SIO_RCVALL; ++#ifdef LINUX ++ dwProtocol = atoi(&argv[i][3]); ++#endif ++ iProto=atoi(&argv[i][3]); ++ } else if (j>133) usage(argv[0]); ++ break; ++ case 'i': // interface number ++#ifndef LINUX ++ dwInterface = atoi(&argv[i][3]); ++#else ++ strcpy(intlist,&argv[i][3]); ++ ptr=strchr(intlist,' '); ++ if (ptr) *ptr=0; ++#endif ++ break; ++ case 'g': // gre ++ gre=1; ++ break; ++ case 'c': // cycle time ++ iCycle = atoi(&argv[i][3]); ++ break; ++ case 'a': // cycle time ++ iDetail = 1; ++ break; ++ case 'h': // cycle time ++ iDetail = justheader = 1; ++ break; ++ case 'n': // just n cycle ++ lNum = atol(&argv[i][3]); ++ break; ++ case 'l': // lineno lines ++ iline = atoi(&argv[i][3]); ++ break; ++ case 'p': // just summary ++ if ((tolower(argv[i][2]) == 'a')) { ++ strcpy(pattern,&argv[i][4]); printf("\n Pattern: \'%s",&argv[i][4]); ++ while (++iiAddressCount ;i++) { ++ printf(" %-2d ........ [%s]\n", i, ++ inet_ntoa(((SOCKADDR_IN *)slist->Address[i].lpSockaddr)->sin_addr)); ++ } ++ closesocket(s); ++ return; ++} ++ ++// ++// Function: GetInterface ++// ++// Description: ++// This function retrieves a zero based index and returns ++// the IP interface corresponding to that. ++// ++int GetInterface(SOCKET s, SOCKADDR_IN *ifx, int num) ++{ ++ SOCKET_ADDRESS_LIST *slist=NULL; ++ char buf[2048]; ++ DWORD dwBytesRet; ++ int ret; ++ ++ ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, buf, 2048,&dwBytesRet, NULL, NULL); ++ if (ret == SOCKET_ERROR) { ++ printf("WSAIoctl(SIO_ADDRESS_LIST_QUERY) failed: %d\n",WSAGetLastError()); ++ return -1; ++ } ++ slist = (SOCKET_ADDRESS_LIST *)buf; ++ if (num >= slist->iAddressCount) return -1; ++ ifx->sin_addr.s_addr = ((SOCKADDR_IN *)slist->Address[num].lpSockaddr)->sin_addr.s_addr; ++ if (*author != 'p') return -1; ++ return 0; ++} ++#endif ++#ifdef LINUX ++struct promisc_device *prom; ++ ++void init_capture( void ) ++/* ++ * 1) Open our capture socket ++ * 2) Set all the promisc devices to promiscous mode ++ */ ++{ ++ struct ifreq ifr; ++ struct promisc_device *p,*pp; ++ struct protoent *pr; ++ char *p1,*p2; ++ ++ if ((s = socket (AF_INET, SOCK_PACKET, htons (ETH_P_ALL))) < 0) ++ { ++ printf(" can't get socket: \n"); ++ exit(1); ++ } ++ strcpy(myipname,intlist); ++ p1=intlist; p=NULL; ++ while (p1) { ++ pp=p; ++ p = malloc(sizeof(struct promisc_device)); ++ if (pp) pp->next=p; else prom=p; ++ if ( (p2=strchr(p1,','))) *p2++=0; ++ strcpy(&p->name,p1); p->next=NULL; ++ printf(" %s",p->name); fflush(stdout); ++ p1=p2; ++// while(p!=NULL) { ++ strcpy (p -> oldifr.ifr_name, p -> name); ++ ++ if (ioctl (s, SIOCGIFFLAGS, &(p -> oldifr)) < 0) { ++ printf(" can't get flags: \n"); ++ exit(2); ++ } ++ p -> reset = 1; ++ ifr = p -> oldifr; ++ if (ifr.ifr_flags & IFF_PROMISC) printf(" already promisc! \n"); ++ ifr.ifr_flags |= IFF_PROMISC; ++ if (ioctl (s, SIOCSIFFLAGS, &ifr) < 0) { ++ printf(" can't set flags: \n"); ++ exit(3); ++ } ++// p = p -> next; ++ } ++} ++ ++void exit_capture(void) ++{ ++ struct promisc_device *p; ++ ++ /* do we have to check (capture_sd >= 0) ? */ ++ ++ p = prom; ++ ++ while(p != NULL) { ++ if (ioctl (s, SIOCSIFFLAGS, &(p -> oldifr)) < 0) { ++ printf("can't reset flags: \n"); ++ } ++ ++ p = p -> next; ++ } ++ ++ close (s); ++} ++#endif ++// ++// Function: main ++// ++int main(int argc, char **argv) { ++ WSADATA wsd; ++ SOCKADDR_IN if0; ++ int ret,count; ++ unsigned int optval; ++ DWORD dwBytesRet, ++ dwFlags, ++ nproc; ++ char rcvbuf[MAX_IP_SIZE]; ++ WSABUF wbuf; ++ unsigned long i; ++#ifndef LINUX ++ // Load Winsock ++ // ++ if (WSAStartup(MAKEWORD(2,2), &wsd) != 0) { ++ printf(" WSAStartup() failed: %d\n", GetLastError()); ++ return -1; ++ } ++#else ++ SOCKADDR ssaddr; ++ struct promisc_device *p; ++ fd_set ready; ++ struct timeval tv; ++#endif ++ char Key; ++ int status; ++ FILE *input; ++// Parse the command line ++// ++ strcpy(intlist,"eth0"); ++ for(i=100;i<255;i++) szProto[i]="?!?"; ++ szProto[103]="PIM"; ++ szProto[108]="IPCOMP"; ++ szProto[112]="VRRP"; ++ szProto[115]="L2TP"; ++ szProto[124]="ISIS"; ++ szProto[132]="SCTP"; ++ szProto[133]="FC"; ++ *execname=0; ++ ValidateArgs(argc, argv); ++ if (bFilter) { ++ i=uiSourceAddr; ++ if ( i || usSourcePort) ++ printf(" Source: %03d.%03d.%03d.%03d/%d:%d\n",(i&0xff000000)>>24,(i&0x00ff0000)>>16,(i&0x0000ff00)>>8,i&0xff,uiSourceAddr?usSourceNet:0, usSourcePort); ++ i=uiDestAddr; ++ if ( i || usDestPort) ++ printf(" Dest. : %03d.%03d.%03d.%03d/%d:%d\n",(i&0xff000000)>>24,(i&0x00ff0000)>>16,(i&0x0000ff00)>>8,i&0xff,uiDestAddr?usDestNet:0, usDestPort); ++ i=uiXAddr; ++ if ( i || usXPort) ++ printf(" IP. : %03d.%03d.%03d.%03d/%d:%d\n",(i&0xff000000)>>24,(i&0x00ff0000)>>16,(i&0x0000ff00)>>8,i&0xff,uiXAddr?usXNet:0, usXPort); ++ } ++ if (iFile) printf(" To file : %s\n",filename); ++ if (iProto) printf(" Protocol: %s (%d)\n",szProto[iProto],iProto); ++ // Create a raw socket for receiving IP datagrams ++ // ++#ifndef LINUX ++ s = WSASocket(AF_INET, SOCK_RAW, dwProtocol, NULL, 0, WSA_FLAG_OVERLAPPED); ++ if (s == INVALID_SOCKET) ++ { ++ printf("WSASocket() failed: %d\n", WSAGetLastError()); ++ return -1; ++ } ++ // Get an interface to read IP packets on ++ // ++ memset(&if0,0,sizeof(if0)); ++ if0.sin_family = AF_INET; ++ if0.sin_port = htons(0); ++ if (GetInterface(s, &if0, dwInterface) != 0) ++ { ++ printf("Unable to obtain an interface\n"); ++ return -1; ++ } ++ sprintf(myipname,"%-16s",inet_ntoa(if0.sin_addr)); ++#else ++ printf("starting capture ...."); fflush(stdout); ++ init_capture(); ++ printf(" capture started ....\n"); fflush(stdout); ++#endif ++ printf(" Binding to IF: %s\n", myipname); ++#ifndef LINUX ++// ++// This socket MUST be bound before calling the ioctl ++// ++ ++ if (bind(s, (SOCKADDR *)&if0, sizeof(if0)) == SOCKET_ERROR) { ++ printf("bind() failed: %d\n", WSAGetLastError()); ++ return -1; ++ } ++// ++// Set the SIO_RCVALLxxx ioctl ++// ++ optval = 1; ++ if (WSAIoctl(s, dwIoControlCode, &optval, sizeof(optval), ++ NULL, 0, &dwBytesRet, NULL, NULL) == SOCKET_ERROR) { ++ printf("WSAIotcl() set raw socket failed; %d\n", WSAGetLastError()); ++// return -1; ++ optval = 2; ++ if (WSAIoctl(s, dwIoControlCode, &optval, sizeof(optval), ++ NULL, 0, &dwBytesRet, NULL, NULL) == SOCKET_ERROR) { ++ printf("WSAIotcl() set raw socket only failed; %d\n", WSAGetLastError()); ++ return -1; ++ } ++ } ++ system("cls"); ++#else ++ tv.tv_sec=0; tv.tv_usec=0; ++ set_raw_mode(); ++ FD_ZERO(&ready); ++ FD_SET(STDIN_FILENO,&ready); ++#endif ++ input = fopen("/dev/tty", "r"); //open the terminal keyboard ++ if (uiSourceAddr==0) ulSourceNet=0; ++ else for ( i=0; i<32-usSourceNet; i++) ulSourceNet <<= 1; ++ if (uiDestAddr==0) ulDestNet=0; ++ else for ( i=0; i<32-usDestNet; i++) ulDestNet <<= 1; ++ if (uiXAddr==0) ulXNet=0; ++ else for ( i=0; i<32-usXNet; i++) ulXNet <<= 1; ++ if (uiXAddr) uiSourceAddr=uiDestAddr=uiXAddr; ++ if (usXPort) usSourcePort=usDestPort=usXPort; ++ if (ulXNet) ulSourceNet=ulDestNet=ulXNet; ++ InitIPAcc(); ++// Start receiving IP datagrams until interrupted ++// ++ count = 0; ++ if (iFile && iDetail) f=fopen(filename,"w+"); ++ if (iProto) bFilter=1; ++ if (*(author+1) != 'h') iRun=0; ++ while (iRun) { ++ rcvbuf[MAX_IP_SIZE]=0; ++ wbuf.len = MAX_IP_SIZE; ++ wbuf.buf = rcvbuf; ++#ifndef LINUX ++ dwFlags = 0; ++ ret = WSARecv(s, &wbuf, 1, &dwBytesRet, &dwFlags, NULL, NULL); ++ if (ret == SOCKET_ERROR) { ++ printf("WSARecv() failed: %d\n", WSAGetLastError()); ++ return -1; ++ } ++ if (kbhit()) { ++#else ++ dwFlags = sizeof(ssaddr); ++ ++ ret = recvfrom (s, wbuf.buf, MAX_IP_SIZE, 0, &ssaddr, (int *) &dwFlags); ++ if (ret == -1) continue; ++ dwBytesRet=wbuf.len=ret; ++ p=prom; ++ while(p!=NULL) { ++ if (!strcmp(p -> name, ssaddr.sa_data)) break; ++ p=p->next; ++ } ++ if (!p) { ++// printf("\n%s: ignored",ssaddr.sa_data); fflush(stdout); ++ continue; ++ } ++ FD_ZERO(&ready); ++ FD_SET(STDIN_FILENO,&ready); ++ if (select(STDIN_FILENO+1,&ready,NULL,NULL,&tv)>0) { ++// if (FD_ISSET(STDIN_FILENO,&ready)) { ++#endif ++ switch (getchar()) { /* branch to appropiate key handler */ ++ case 0x1b: /* Esc */ ++ iRun=0; ++ break; ++ default: ++ mostird=1; ++ break; ++ } //end of switch key ++ } ++ ++// Deccode the IP header ++// ++ if (!(nproc = DecodeIPHeader(&wbuf, uiSourceAddr, usSourcePort, ulSourceNet, ++ uiDestAddr, usDestPort, ulDestNet, dwBytesRet,usXPort,uiXAddr,ulXNet))) ++ { ++// printf("Error decoding IP header!\n"); ++// break; ++ } ++ } ++ // Cleanup ++ // ++ if (iRun && !iDetail) CloseIPAcc(); ++ if (f) fclose(f); ++#ifndef LINUX ++ closesocket(s); ++ WSACleanup(); ++#else ++ exit_capture(); ++#endif ++ return 0; ++} +diff --git a/feeds/packages/utils/powertop/.svn/entries b/feeds/packages/utils/powertop/.svn/entries +new file mode 100644 +index 0000000..b20fca0 +--- /dev/null ++++ b/feeds/packages/utils/powertop/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/powertop ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8fba7900d8eb93e085c346257871bf1a ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++881 ++ +diff --git a/feeds/packages/utils/powertop/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/powertop/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..96f6854 +--- /dev/null ++++ b/feeds/packages/utils/powertop/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# 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:=powertop ++PKG_VERSION:=1.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.lesswatts.org/projects/powertop/download/ ++PKG_MD5SUM:=3498f5983c683c3a57dce7379a722082 ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/powertop ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=PowerTOP ++ DEPENDS:=+libncurses ++ URL:=http://www.lesswatts.org ++endef ++ ++define Package/powertop/description ++ PowerTOP is a Linux tool that helps you find those programs that are ++ misbehaving while your computer is idle. ++endef ++ ++define Package/powertop/install ++ $(CP) $(PKG_INSTALL_DIR)/* $(1) ++endef ++ ++$(eval $(call BuildPackage,powertop)) +diff --git a/feeds/packages/utils/powertop/Makefile b/feeds/packages/utils/powertop/Makefile +new file mode 100644 +index 0000000..96f6854 +--- /dev/null ++++ b/feeds/packages/utils/powertop/Makefile +@@ -0,0 +1,40 @@ ++# ++# 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:=powertop ++PKG_VERSION:=1.11 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.lesswatts.org/projects/powertop/download/ ++PKG_MD5SUM:=3498f5983c683c3a57dce7379a722082 ++ ++PKG_INSTALL:=1 ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/powertop ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=PowerTOP ++ DEPENDS:=+libncurses ++ URL:=http://www.lesswatts.org ++endef ++ ++define Package/powertop/description ++ PowerTOP is a Linux tool that helps you find those programs that are ++ misbehaving while your computer is idle. ++endef ++ ++define Package/powertop/install ++ $(CP) $(PKG_INSTALL_DIR)/* $(1) ++endef ++ ++$(eval $(call BuildPackage,powertop)) +diff --git a/feeds/packages/utils/powertop/patches/.svn/entries b/feeds/packages/utils/powertop/patches/.svn/entries +new file mode 100644 +index 0000000..f304395 +--- /dev/null ++++ b/feeds/packages/utils/powertop/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/powertop/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-12T15:38:58.012404Z ++19607 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++200-no-gettext.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++5ea32d7f71c4fce48789d9fc0e0d9da2 ++2010-02-12T15:38:58.012404Z ++19607 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1001 ++ ++100-no-wide-ncurses.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++681524eed5d25e7cf89d5c30ae2e4c48 ++2010-02-12T15:38:58.012404Z ++19607 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++286 ++ +diff --git a/feeds/packages/utils/powertop/patches/.svn/text-base/100-no-wide-ncurses.patch.svn-base b/feeds/packages/utils/powertop/patches/.svn/text-base/100-no-wide-ncurses.patch.svn-base +new file mode 100644 +index 0000000..61c93a3 +--- /dev/null ++++ b/feeds/packages/utils/powertop/patches/.svn/text-base/100-no-wide-ncurses.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -20,7 +20,7 @@ OBJS = powertop.o config.o process.o mis ++ ++ ++ powertop: $(OBJS) Makefile powertop.h ++- $(CC) ${CFLAGS} $(OBJS) -lncursesw -o powertop +++ $(CC) ${LDFLAGS} $(OBJS) -lncurses -o powertop ++ @(cd po/ && $(MAKE)) ++ ++ powertop.1.gz: powertop.1 +diff --git a/feeds/packages/utils/powertop/patches/.svn/text-base/200-no-gettext.patch.svn-base b/feeds/packages/utils/powertop/patches/.svn/text-base/200-no-gettext.patch.svn-base +new file mode 100644 +index 0000000..623f240 +--- /dev/null ++++ b/feeds/packages/utils/powertop/patches/.svn/text-base/200-no-gettext.patch.svn-base +@@ -0,0 +1,48 @@ ++--- a/powertop.c +++++ b/powertop.c ++@@ -30,7 +30,9 @@ ++ #include ++ #include ++ #include +++#ifdef ENABLE_GETTEXT ++ #include +++#endif ++ #include ++ #include ++ #include ++@@ -783,9 +785,11 @@ int main(int argc, char **argv) ++ uint64_t cur_usage[8], cur_duration[8]; ++ double wakeups_per_second = 0; ++ +++#ifdef ENABLE_GETTEXT ++ setlocale (LC_ALL, ""); ++ bindtextdomain ("powertop", "/usr/share/locale"); ++ textdomain ("powertop"); +++#endif ++ ++ while (1) { ++ static struct option opts[] = { ++--- a/powertop.h +++++ b/powertop.h ++@@ -26,7 +26,9 @@ ++ #ifndef __INCLUDE_GUARD_POWERTOP_H_ ++ #define __INCLUDE_GUARD_POWERTOP_H_ ++ +++#ifdef ENABLE_GETTEXT ++ #include +++#endif ++ ++ struct line { ++ char *string; ++@@ -86,7 +88,11 @@ extern suggestion_func *suggestion_activ ++ _x < _y ? _x : _y; }) ++ ++ +++#ifdef ENABLE_GETTEXT ++ #define _(STRING) gettext(STRING) +++#else +++#define _(STRING) STRING +++#endif ++ ++ ++ #define PT_COLOR_DEFAULT 1 +diff --git a/feeds/packages/utils/powertop/patches/100-no-wide-ncurses.patch b/feeds/packages/utils/powertop/patches/100-no-wide-ncurses.patch +new file mode 100644 +index 0000000..61c93a3 +--- /dev/null ++++ b/feeds/packages/utils/powertop/patches/100-no-wide-ncurses.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -20,7 +20,7 @@ OBJS = powertop.o config.o process.o mis ++ ++ ++ powertop: $(OBJS) Makefile powertop.h ++- $(CC) ${CFLAGS} $(OBJS) -lncursesw -o powertop +++ $(CC) ${LDFLAGS} $(OBJS) -lncurses -o powertop ++ @(cd po/ && $(MAKE)) ++ ++ powertop.1.gz: powertop.1 +diff --git a/feeds/packages/utils/powertop/patches/200-no-gettext.patch b/feeds/packages/utils/powertop/patches/200-no-gettext.patch +new file mode 100644 +index 0000000..623f240 +--- /dev/null ++++ b/feeds/packages/utils/powertop/patches/200-no-gettext.patch +@@ -0,0 +1,48 @@ ++--- a/powertop.c +++++ b/powertop.c ++@@ -30,7 +30,9 @@ ++ #include ++ #include ++ #include +++#ifdef ENABLE_GETTEXT ++ #include +++#endif ++ #include ++ #include ++ #include ++@@ -783,9 +785,11 @@ int main(int argc, char **argv) ++ uint64_t cur_usage[8], cur_duration[8]; ++ double wakeups_per_second = 0; ++ +++#ifdef ENABLE_GETTEXT ++ setlocale (LC_ALL, ""); ++ bindtextdomain ("powertop", "/usr/share/locale"); ++ textdomain ("powertop"); +++#endif ++ ++ while (1) { ++ static struct option opts[] = { ++--- a/powertop.h +++++ b/powertop.h ++@@ -26,7 +26,9 @@ ++ #ifndef __INCLUDE_GUARD_POWERTOP_H_ ++ #define __INCLUDE_GUARD_POWERTOP_H_ ++ +++#ifdef ENABLE_GETTEXT ++ #include +++#endif ++ ++ struct line { ++ char *string; ++@@ -86,7 +88,11 @@ extern suggestion_func *suggestion_activ ++ _x < _y ? _x : _y; }) ++ ++ +++#ifdef ENABLE_GETTEXT ++ #define _(STRING) gettext(STRING) +++#else +++#define _(STRING) STRING +++#endif ++ ++ ++ #define PT_COLOR_DEFAULT 1 +diff --git a/feeds/packages/utils/pps-tools/.svn/entries b/feeds/packages/utils/pps-tools/.svn/entries +new file mode 100644 +index 0000000..ddb1dcf +--- /dev/null ++++ b/feeds/packages/utils/pps-tools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pps-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-04-03T23:11:41.324789Z ++10730 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ada333b1eec4a4e23947e80450429178 ++2008-04-03T23:11:41.324789Z ++10730 ++agb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1218 ++ +diff --git a/feeds/packages/utils/pps-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pps-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d152363 +--- /dev/null ++++ b/feeds/packages/utils/pps-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=pps-tools ++PKG_VERSION:=2.6.23 ++PKG_RELEASE:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pps-tools ++ SUBMENU:=Time Synchronization ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=@LINUX_2_6_23 ++ TITLE:=PPS (Pulse Per Second) Userland tools ++ URL:=http://wiki.enneenne.com/index.php/LinuxPPS_support ++endef ++ ++ ++define Package/pps-tools/description ++ Userland tools for GPS and DCF-77 Clock syncronization. PPS support in Kernel must be enabled. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/timepps.h $(1)/usr/include/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -DHAVE_ISC_READER=1 -I$(LINUX_DIR)/include -I ." \ ++ BINDIR="/usr/sbin" MANDIR="/usr/man" ++endef ++ ++define Package/pps-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ppstest $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ppsctl $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,pps-tools)) +diff --git a/feeds/packages/utils/pps-tools/Makefile b/feeds/packages/utils/pps-tools/Makefile +new file mode 100644 +index 0000000..d152363 +--- /dev/null ++++ b/feeds/packages/utils/pps-tools/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=pps-tools ++PKG_VERSION:=2.6.23 ++PKG_RELEASE:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pps-tools ++ SUBMENU:=Time Synchronization ++ SECTION:=net ++ CATEGORY:=Network ++ DEPENDS:=@LINUX_2_6_23 ++ TITLE:=PPS (Pulse Per Second) Userland tools ++ URL:=http://wiki.enneenne.com/index.php/LinuxPPS_support ++endef ++ ++ ++define Package/pps-tools/description ++ Userland tools for GPS and DCF-77 Clock syncronization. PPS support in Kernel must be enabled. ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_BUILD_DIR)/timepps.h $(1)/usr/include/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ CFLAGS="$(TARGET_CFLAGS) -DHAVE_ISC_READER=1 -I$(LINUX_DIR)/include -I ." \ ++ BINDIR="/usr/sbin" MANDIR="/usr/man" ++endef ++ ++define Package/pps-tools/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ppstest $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ppsctl $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,pps-tools)) +diff --git a/feeds/packages/utils/pps-tools/patches/.svn/entries b/feeds/packages/utils/pps-tools/patches/.svn/entries +new file mode 100644 +index 0000000..031c751 +--- /dev/null ++++ b/feeds/packages/utils/pps-tools/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pps-tools/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-03-19T08:03:21.297141Z ++10620 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-source.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++42c0074dacea00a9463bd762fc671a17 ++2008-03-19T08:03:21.297141Z ++10620 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++12018 ++ +diff --git a/feeds/packages/utils/pps-tools/patches/.svn/text-base/001-source.patch.svn-base b/feeds/packages/utils/pps-tools/patches/.svn/text-base/001-source.patch.svn-base +new file mode 100644 +index 0000000..6707478 +--- /dev/null ++++ b/feeds/packages/utils/pps-tools/patches/.svn/text-base/001-source.patch.svn-base +@@ -0,0 +1,480 @@ ++diff --git a/Makefile b/Makefile ++new file mode 100644 ++index 0000000..a2660a2 ++--- /dev/null +++++ b/Makefile ++@@ -0,0 +1,27 @@ +++TARGETS = ppstest ppsctl +++ +++CFLAGS += -Wall -O2 -D_GNU_SOURCE +++CFLAGS += -I . +++CFLAGS += -ggdb +++ +++# -- Actions section ---------------------------------------------------------- +++ +++.PHONY : all depend dep +++ +++all : .depend $(TARGETS) +++ +++.depend depend dep : +++ $(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend +++ +++ifeq (.depend,$(wildcard .depend)) +++include .depend +++endif +++ +++ +++# -- Clean section ------------------------------------------------------------ +++ +++.PHONY : clean +++ +++clean : +++ rm -f *.o *~ core .depend +++ rm -f ${TARGETS} ++diff --git a/ppsctl.c b/ppsctl.c ++new file mode 100644 ++index 0000000..83fd08a ++--- /dev/null +++++ b/ppsctl.c ++@@ -0,0 +1,62 @@ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++void usage(char *name) +++{ +++ fprintf(stderr, "usage: %s [enable|disable]\n", name); +++ +++ exit(EXIT_FAILURE); +++} +++ +++int main(int argc, char *argv[]) +++{ +++ int fd; +++ int ret; +++ struct serial_struct ss; +++ +++ if (argc < 2) +++ usage(argv[0]); +++ +++ fd = open(argv[1], O_RDWR); +++ if (fd < 0) { +++ perror("open"); +++ exit(EXIT_FAILURE); +++ } +++ +++ ret = ioctl(fd, TIOCGSERIAL, &ss); +++ if (ret < 0) { +++ perror("ioctl(TIOCGSERIAL)"); +++ exit(EXIT_FAILURE); +++ } +++ +++ if (argc < 3) { /* just read PPS status */ +++ printf("PPS is %sabled\n", +++ ss.flags & ASYNC_HARDPPS_CD ? "en" : "dis"); +++ exit(EXIT_SUCCESS); +++ } +++ +++ if (argv[2][0] == 'e' || argv[2][0] == '1') +++ ss.flags |= ASYNC_HARDPPS_CD; +++ else if (argv[2][0] == 'd' || argv[2][0] == '0') +++ ss.flags &= ~ASYNC_HARDPPS_CD; +++ else { +++ fprintf(stderr, "invalid state argument \"%s\"\n", argv[2]); +++ exit(EXIT_FAILURE); +++ } +++ +++ ret = ioctl(fd, TIOCSSERIAL, &ss); +++ if (ret < 0) { +++ perror("ioctl(TIOCSSERIAL)"); +++ exit(EXIT_FAILURE); +++ } +++ +++ return 0; +++} ++diff --git a/ppsfind b/ppsfind ++new file mode 100755 ++index 0000000..93c0e17 ++--- /dev/null +++++ b/ppsfind ++@@ -0,0 +1,17 @@ +++#!/bin/sh +++ +++SYS="/sys/class/pps/" +++ +++if [ $# -lt 1 ] ; then +++ echo "usage: ppsfind " >&2 +++ exit 1 +++fi +++ +++for d in $(ls $SYS) ; do +++ if grep $1 $SYS/$d/name >& /dev/null || \ +++ grep $1 $SYS/$d/path >& /dev/null ; then +++ echo "$d: name=$(cat $SYS/$d/name) path=$(cat $SYS/$d/path)" +++ fi +++done +++ +++exit 0 ++diff --git a/ppstest.c b/ppstest.c ++new file mode 100644 ++index 0000000..d125ffa ++--- /dev/null +++++ b/ppstest.c ++@@ -0,0 +1,151 @@ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#include +++ +++int find_source(char *path, pps_handle_t *handle, int *avail_mode) +++{ +++ pps_params_t params; +++ int ret; +++ +++ printf("trying PPS source \"%s\"\n", path); +++ +++ /* Try to find the source by using the supplied "path" name */ +++ ret = open(path, O_RDWR); +++ if (ret < 0) { +++ fprintf(stderr, "unable to open device \"%s\" (%m)\n", path); +++ return ret; +++ } +++ +++ /* Open the PPS source (and check the file descriptor) */ +++ ret = time_pps_create(ret, handle); +++ if (ret < 0) { +++ fprintf(stderr, "cannot create a PPS source from device " +++ "\"%s\" (%m)\n", path); +++ return -1; +++ } +++ printf("found PPS source \"%s\"\n", path); +++ +++ /* Find out what features are supported */ +++ ret = time_pps_getcap(*handle, avail_mode); +++ if (ret < 0) { +++ fprintf(stderr, "cannot get capabilities (%m)\n"); +++ return -1; +++ } +++ if ((*avail_mode & PPS_CAPTUREASSERT) == 0) { +++ fprintf(stderr, "cannot CAPTUREASSERT\n"); +++ return -1; +++ } +++ if ((*avail_mode & PPS_OFFSETASSERT) == 0) { +++ fprintf(stderr, "cannot OFFSETASSERT\n"); +++ return -1; +++ } +++ +++ /* Capture assert timestamps, and compensate for a 675 nsec +++ * propagation delay */ +++ ret = time_pps_getparams(*handle, ¶ms); +++ if (ret < 0) { +++ fprintf(stderr, "cannot get parameters (%m)\n"); +++ return -1; +++ } +++ params.assert_offset.tv_sec = 0; +++ params.assert_offset.tv_nsec = 675; +++ params.mode |= PPS_CAPTUREASSERT | PPS_OFFSETASSERT; +++ ret = time_pps_setparams(*handle, ¶ms); +++ if (ret < 0) { +++ fprintf(stderr, "cannot set parameters (%m)\n"); +++ return -1; +++ } +++ +++ return 0; +++} +++ +++int fetch_source(int i, pps_handle_t *handle, int *avail_mode) +++{ +++ struct timespec timeout; +++ pps_info_t infobuf; +++ int ret; +++ +++ /* create a zero-valued timeout */ +++ timeout.tv_sec = 3; +++ timeout.tv_nsec = 0; +++ +++retry: +++ if (*avail_mode & PPS_CANWAIT) /* waits for the next event */ +++ ret = time_pps_fetch(*handle, PPS_TSFMT_TSPEC, &infobuf, +++ &timeout); +++ else { +++ sleep(1); +++ ret = time_pps_fetch(*handle, PPS_TSFMT_TSPEC, &infobuf, +++ &timeout); +++ } +++ if (ret < 0) { +++ if (ret == -EINTR) { +++ fprintf(stderr, "time_pps_fetch() got a signal!\n"); +++ goto retry; +++ } +++ +++ fprintf(stderr, "time_pps_fetch() error %d (%m)\n", ret); +++ return -1; +++ } +++ +++ printf("source %d - " +++ "assert %ld.%09ld, sequence: %ld - " +++ "clear %ld.%09ld, sequence: %ld\n", +++ i, +++ infobuf.assert_timestamp.tv_sec, +++ infobuf.assert_timestamp.tv_nsec, +++ infobuf.assert_sequence, +++ infobuf.clear_timestamp.tv_sec, +++ infobuf.clear_timestamp.tv_nsec, infobuf.clear_sequence); +++ +++ return 0; +++} +++ +++void usage(char *name) +++{ +++ fprintf(stderr, "usage: %s [ ...]\n", name); +++ exit(EXIT_FAILURE); +++} +++ +++int main(int argc, char *argv[]) +++{ +++ int num; +++ pps_handle_t handle[4]; +++ int avail_mode[4]; +++ int i = 0; +++ int ret; +++ +++ /* Check the command line */ +++ if (argc < 2) +++ usage(argv[0]); +++ +++ for (i = 1; i < argc && i <= 4; i++) { +++ ret = find_source(argv[i], &handle[i - 1], &avail_mode[i - 1]); +++ if (ret < 0) +++ exit(EXIT_FAILURE); +++ } +++ +++ num = i - 1; +++ printf("ok, found %d source(s), now start fetching data...\n", num); +++ +++ /* loop, printing the most recent timestamp every second or so */ +++ while (1) { +++ for (i = 0; i < num; i++) { +++ ret = fetch_source(i, &handle[i], &avail_mode[i]); +++ if (ret < 0 && errno != ETIMEDOUT) +++ exit(EXIT_FAILURE); +++ } +++ } +++ +++ for (; i >= 0; i--) +++ time_pps_destroy(handle[i]); +++ +++ return 0; +++} ++diff --git a/timepps.h b/timepps.h ++new file mode 100644 ++index 0000000..28ebf4c ++--- /dev/null +++++ b/timepps.h ++@@ -0,0 +1,193 @@ +++/* +++ * timepps.h -- PPS API main header +++ * +++ * Copyright (C) 2005-2007 Rodolfo Giometti +++ * +++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ */ +++ +++#ifndef _SYS_TIMEPPS_H_ +++#define _SYS_TIMEPPS_H_ +++ +++#include +++#include +++#include +++#include +++ +++/* +++ * New data structures +++ */ +++ +++struct ntp_fp { +++ unsigned int integral; +++ unsigned int fractional; +++}; +++ +++union pps_timeu { +++ struct timespec tspec; +++ struct ntp_fp ntpfp; +++ unsigned long longpad[3]; +++}; +++ +++struct pps_info { +++ unsigned long assert_sequence; /* seq. num. of assert event */ +++ unsigned long clear_sequence; /* seq. num. of clear event */ +++ union pps_timeu assert_tu; /* time of assert event */ +++ union pps_timeu clear_tu; /* time of clear event */ +++ int current_mode; /* current mode bits */ +++}; +++ +++struct pps_params { +++ int api_version; /* API version # */ +++ int mode; /* mode bits */ +++ union pps_timeu assert_off_tu; /* offset compensation for assert */ +++ union pps_timeu clear_off_tu; /* offset compensation for clear */ +++}; +++ +++typedef int pps_handle_t; /* represents a PPS source */ +++typedef unsigned long pps_seq_t; /* sequence number */ +++typedef struct ntp_fp ntp_fp_t; /* NTP-compatible time stamp */ +++typedef union pps_timeu pps_timeu_t; /* generic data type for time stamps */ +++typedef struct pps_info pps_info_t; +++typedef struct pps_params pps_params_t; +++ +++#define assert_timestamp assert_tu.tspec +++#define clear_timestamp clear_tu.tspec +++ +++#define assert_timestamp_ntpfp assert_tu.ntpfp +++#define clear_timestamp_ntpfp clear_tu.ntpfp +++ +++#define assert_offset assert_off_tu.tspec +++#define clear_offset clear_off_tu.tspec +++ +++#define assert_offset_ntpfp assert_off_tu.ntpfp +++#define clear_offset_ntpfp clear_off_tu.ntpfp +++ +++/* +++ * The PPS API +++ */ +++ +++static __inline int time_pps_create(int source, pps_handle_t *handle) +++{ +++ int ret; +++ +++ if (!handle) { +++ errno = EINVAL; +++ return -1; +++ } +++ +++ /* First we check if current device is a PPS valid PPS one... +++ */ +++ ret = ioctl(source, PPS_CHECK); +++ if (ret) { +++ errno = EOPNOTSUPP; +++ return -1; +++ } +++ +++ /* ... then since in LinuxPPS there are no differences between a +++ * "PPS source" and a "PPS handle", we simply return the same value. +++ */ +++ *handle = source; +++ +++ return 0; +++} +++ +++static __inline int time_pps_destroy(pps_handle_t handle) +++{ +++ return close(handle); +++} +++ +++static __inline int time_pps_getparams(pps_handle_t handle, +++ pps_params_t *ppsparams) +++{ +++ int ret; +++ struct pps_kparams __ppsparams; +++ +++ ret = ioctl(handle, PPS_GETPARAMS, &__ppsparams); +++ +++ ppsparams->api_version = __ppsparams.api_version; +++ ppsparams->mode = __ppsparams.mode; +++ ppsparams->assert_off_tu.tspec.tv_sec = __ppsparams.assert_off_tu.sec; +++ ppsparams->assert_off_tu.tspec.tv_nsec = __ppsparams.assert_off_tu.nsec; +++ ppsparams->clear_off_tu.tspec.tv_sec = __ppsparams.clear_off_tu.sec; +++ ppsparams->clear_off_tu.tspec.tv_nsec = __ppsparams.clear_off_tu.nsec; +++ +++ return ret; +++} +++ +++static __inline int time_pps_setparams(pps_handle_t handle, +++ const pps_params_t *ppsparams) +++{ +++ struct pps_kparams __ppsparams; +++ +++ __ppsparams.api_version = ppsparams->api_version; +++ __ppsparams.mode = ppsparams->mode; +++ __ppsparams.assert_off_tu.sec = ppsparams->assert_off_tu.tspec.tv_sec; +++ __ppsparams.assert_off_tu.nsec = ppsparams->assert_off_tu.tspec.tv_nsec; +++ __ppsparams.clear_off_tu.sec = ppsparams->clear_off_tu.tspec.tv_sec; +++ __ppsparams.clear_off_tu.nsec = ppsparams->clear_off_tu.tspec.tv_nsec; +++ +++ return ioctl(handle, PPS_SETPARAMS, &__ppsparams); +++} +++ +++/* Get capabilities for handle */ +++static __inline int time_pps_getcap(pps_handle_t handle, int *mode) +++{ +++ return ioctl(handle, PPS_GETCAP, mode); +++} +++ +++static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat, +++ pps_info_t *ppsinfobuf, +++ const struct timespec *timeout) +++{ +++ struct pps_fdata __fdata; +++ int ret; +++ +++ /* Sanity checks */ +++ if (tsformat != PPS_TSFMT_TSPEC) { +++ errno = EINVAL; +++ return -1; +++ } +++ +++ if (timeout) { +++ __fdata.timeout.sec = timeout->tv_sec; +++ __fdata.timeout.nsec = timeout->tv_nsec; +++ __fdata.timeout.flags = ~PPS_TIME_INVALID; +++ } else +++ __fdata.timeout.flags = PPS_TIME_INVALID; +++ +++ ret = ioctl(handle, PPS_FETCH, &__fdata); +++ +++ ppsinfobuf->assert_sequence = __fdata.info.assert_sequence; +++ ppsinfobuf->clear_sequence = __fdata.info.clear_sequence; +++ ppsinfobuf->assert_tu.tspec.tv_sec = __fdata.info.assert_tu.sec; +++ ppsinfobuf->assert_tu.tspec.tv_nsec = __fdata.info.assert_tu.nsec; +++ ppsinfobuf->clear_tu.tspec.tv_sec = __fdata.info.clear_tu.sec; +++ ppsinfobuf->clear_tu.tspec.tv_nsec = __fdata.info.clear_tu.nsec; +++ ppsinfobuf->current_mode = __fdata.info.current_mode; +++ +++ return ret; +++} +++ +++static __inline int time_pps_kcbind(pps_handle_t handle, +++ const int kernel_consumer, +++ const int edge, const int tsformat) +++{ +++ /* LinuxPPS doesn't implement kernel consumer feature */ +++ errno = EOPNOTSUPP; +++ return -1; +++} +++ +++#endif /* _SYS_TIMEPPS_H_ */ +diff --git a/feeds/packages/utils/pps-tools/patches/001-source.patch b/feeds/packages/utils/pps-tools/patches/001-source.patch +new file mode 100644 +index 0000000..6707478 +--- /dev/null ++++ b/feeds/packages/utils/pps-tools/patches/001-source.patch +@@ -0,0 +1,480 @@ ++diff --git a/Makefile b/Makefile ++new file mode 100644 ++index 0000000..a2660a2 ++--- /dev/null +++++ b/Makefile ++@@ -0,0 +1,27 @@ +++TARGETS = ppstest ppsctl +++ +++CFLAGS += -Wall -O2 -D_GNU_SOURCE +++CFLAGS += -I . +++CFLAGS += -ggdb +++ +++# -- Actions section ---------------------------------------------------------- +++ +++.PHONY : all depend dep +++ +++all : .depend $(TARGETS) +++ +++.depend depend dep : +++ $(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend +++ +++ifeq (.depend,$(wildcard .depend)) +++include .depend +++endif +++ +++ +++# -- Clean section ------------------------------------------------------------ +++ +++.PHONY : clean +++ +++clean : +++ rm -f *.o *~ core .depend +++ rm -f ${TARGETS} ++diff --git a/ppsctl.c b/ppsctl.c ++new file mode 100644 ++index 0000000..83fd08a ++--- /dev/null +++++ b/ppsctl.c ++@@ -0,0 +1,62 @@ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++void usage(char *name) +++{ +++ fprintf(stderr, "usage: %s [enable|disable]\n", name); +++ +++ exit(EXIT_FAILURE); +++} +++ +++int main(int argc, char *argv[]) +++{ +++ int fd; +++ int ret; +++ struct serial_struct ss; +++ +++ if (argc < 2) +++ usage(argv[0]); +++ +++ fd = open(argv[1], O_RDWR); +++ if (fd < 0) { +++ perror("open"); +++ exit(EXIT_FAILURE); +++ } +++ +++ ret = ioctl(fd, TIOCGSERIAL, &ss); +++ if (ret < 0) { +++ perror("ioctl(TIOCGSERIAL)"); +++ exit(EXIT_FAILURE); +++ } +++ +++ if (argc < 3) { /* just read PPS status */ +++ printf("PPS is %sabled\n", +++ ss.flags & ASYNC_HARDPPS_CD ? "en" : "dis"); +++ exit(EXIT_SUCCESS); +++ } +++ +++ if (argv[2][0] == 'e' || argv[2][0] == '1') +++ ss.flags |= ASYNC_HARDPPS_CD; +++ else if (argv[2][0] == 'd' || argv[2][0] == '0') +++ ss.flags &= ~ASYNC_HARDPPS_CD; +++ else { +++ fprintf(stderr, "invalid state argument \"%s\"\n", argv[2]); +++ exit(EXIT_FAILURE); +++ } +++ +++ ret = ioctl(fd, TIOCSSERIAL, &ss); +++ if (ret < 0) { +++ perror("ioctl(TIOCSSERIAL)"); +++ exit(EXIT_FAILURE); +++ } +++ +++ return 0; +++} ++diff --git a/ppsfind b/ppsfind ++new file mode 100755 ++index 0000000..93c0e17 ++--- /dev/null +++++ b/ppsfind ++@@ -0,0 +1,17 @@ +++#!/bin/sh +++ +++SYS="/sys/class/pps/" +++ +++if [ $# -lt 1 ] ; then +++ echo "usage: ppsfind " >&2 +++ exit 1 +++fi +++ +++for d in $(ls $SYS) ; do +++ if grep $1 $SYS/$d/name >& /dev/null || \ +++ grep $1 $SYS/$d/path >& /dev/null ; then +++ echo "$d: name=$(cat $SYS/$d/name) path=$(cat $SYS/$d/path)" +++ fi +++done +++ +++exit 0 ++diff --git a/ppstest.c b/ppstest.c ++new file mode 100644 ++index 0000000..d125ffa ++--- /dev/null +++++ b/ppstest.c ++@@ -0,0 +1,151 @@ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#include +++ +++int find_source(char *path, pps_handle_t *handle, int *avail_mode) +++{ +++ pps_params_t params; +++ int ret; +++ +++ printf("trying PPS source \"%s\"\n", path); +++ +++ /* Try to find the source by using the supplied "path" name */ +++ ret = open(path, O_RDWR); +++ if (ret < 0) { +++ fprintf(stderr, "unable to open device \"%s\" (%m)\n", path); +++ return ret; +++ } +++ +++ /* Open the PPS source (and check the file descriptor) */ +++ ret = time_pps_create(ret, handle); +++ if (ret < 0) { +++ fprintf(stderr, "cannot create a PPS source from device " +++ "\"%s\" (%m)\n", path); +++ return -1; +++ } +++ printf("found PPS source \"%s\"\n", path); +++ +++ /* Find out what features are supported */ +++ ret = time_pps_getcap(*handle, avail_mode); +++ if (ret < 0) { +++ fprintf(stderr, "cannot get capabilities (%m)\n"); +++ return -1; +++ } +++ if ((*avail_mode & PPS_CAPTUREASSERT) == 0) { +++ fprintf(stderr, "cannot CAPTUREASSERT\n"); +++ return -1; +++ } +++ if ((*avail_mode & PPS_OFFSETASSERT) == 0) { +++ fprintf(stderr, "cannot OFFSETASSERT\n"); +++ return -1; +++ } +++ +++ /* Capture assert timestamps, and compensate for a 675 nsec +++ * propagation delay */ +++ ret = time_pps_getparams(*handle, ¶ms); +++ if (ret < 0) { +++ fprintf(stderr, "cannot get parameters (%m)\n"); +++ return -1; +++ } +++ params.assert_offset.tv_sec = 0; +++ params.assert_offset.tv_nsec = 675; +++ params.mode |= PPS_CAPTUREASSERT | PPS_OFFSETASSERT; +++ ret = time_pps_setparams(*handle, ¶ms); +++ if (ret < 0) { +++ fprintf(stderr, "cannot set parameters (%m)\n"); +++ return -1; +++ } +++ +++ return 0; +++} +++ +++int fetch_source(int i, pps_handle_t *handle, int *avail_mode) +++{ +++ struct timespec timeout; +++ pps_info_t infobuf; +++ int ret; +++ +++ /* create a zero-valued timeout */ +++ timeout.tv_sec = 3; +++ timeout.tv_nsec = 0; +++ +++retry: +++ if (*avail_mode & PPS_CANWAIT) /* waits for the next event */ +++ ret = time_pps_fetch(*handle, PPS_TSFMT_TSPEC, &infobuf, +++ &timeout); +++ else { +++ sleep(1); +++ ret = time_pps_fetch(*handle, PPS_TSFMT_TSPEC, &infobuf, +++ &timeout); +++ } +++ if (ret < 0) { +++ if (ret == -EINTR) { +++ fprintf(stderr, "time_pps_fetch() got a signal!\n"); +++ goto retry; +++ } +++ +++ fprintf(stderr, "time_pps_fetch() error %d (%m)\n", ret); +++ return -1; +++ } +++ +++ printf("source %d - " +++ "assert %ld.%09ld, sequence: %ld - " +++ "clear %ld.%09ld, sequence: %ld\n", +++ i, +++ infobuf.assert_timestamp.tv_sec, +++ infobuf.assert_timestamp.tv_nsec, +++ infobuf.assert_sequence, +++ infobuf.clear_timestamp.tv_sec, +++ infobuf.clear_timestamp.tv_nsec, infobuf.clear_sequence); +++ +++ return 0; +++} +++ +++void usage(char *name) +++{ +++ fprintf(stderr, "usage: %s [ ...]\n", name); +++ exit(EXIT_FAILURE); +++} +++ +++int main(int argc, char *argv[]) +++{ +++ int num; +++ pps_handle_t handle[4]; +++ int avail_mode[4]; +++ int i = 0; +++ int ret; +++ +++ /* Check the command line */ +++ if (argc < 2) +++ usage(argv[0]); +++ +++ for (i = 1; i < argc && i <= 4; i++) { +++ ret = find_source(argv[i], &handle[i - 1], &avail_mode[i - 1]); +++ if (ret < 0) +++ exit(EXIT_FAILURE); +++ } +++ +++ num = i - 1; +++ printf("ok, found %d source(s), now start fetching data...\n", num); +++ +++ /* loop, printing the most recent timestamp every second or so */ +++ while (1) { +++ for (i = 0; i < num; i++) { +++ ret = fetch_source(i, &handle[i], &avail_mode[i]); +++ if (ret < 0 && errno != ETIMEDOUT) +++ exit(EXIT_FAILURE); +++ } +++ } +++ +++ for (; i >= 0; i--) +++ time_pps_destroy(handle[i]); +++ +++ return 0; +++} ++diff --git a/timepps.h b/timepps.h ++new file mode 100644 ++index 0000000..28ebf4c ++--- /dev/null +++++ b/timepps.h ++@@ -0,0 +1,193 @@ +++/* +++ * timepps.h -- PPS API main header +++ * +++ * Copyright (C) 2005-2007 Rodolfo Giometti +++ * +++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. +++ */ +++ +++#ifndef _SYS_TIMEPPS_H_ +++#define _SYS_TIMEPPS_H_ +++ +++#include +++#include +++#include +++#include +++ +++/* +++ * New data structures +++ */ +++ +++struct ntp_fp { +++ unsigned int integral; +++ unsigned int fractional; +++}; +++ +++union pps_timeu { +++ struct timespec tspec; +++ struct ntp_fp ntpfp; +++ unsigned long longpad[3]; +++}; +++ +++struct pps_info { +++ unsigned long assert_sequence; /* seq. num. of assert event */ +++ unsigned long clear_sequence; /* seq. num. of clear event */ +++ union pps_timeu assert_tu; /* time of assert event */ +++ union pps_timeu clear_tu; /* time of clear event */ +++ int current_mode; /* current mode bits */ +++}; +++ +++struct pps_params { +++ int api_version; /* API version # */ +++ int mode; /* mode bits */ +++ union pps_timeu assert_off_tu; /* offset compensation for assert */ +++ union pps_timeu clear_off_tu; /* offset compensation for clear */ +++}; +++ +++typedef int pps_handle_t; /* represents a PPS source */ +++typedef unsigned long pps_seq_t; /* sequence number */ +++typedef struct ntp_fp ntp_fp_t; /* NTP-compatible time stamp */ +++typedef union pps_timeu pps_timeu_t; /* generic data type for time stamps */ +++typedef struct pps_info pps_info_t; +++typedef struct pps_params pps_params_t; +++ +++#define assert_timestamp assert_tu.tspec +++#define clear_timestamp clear_tu.tspec +++ +++#define assert_timestamp_ntpfp assert_tu.ntpfp +++#define clear_timestamp_ntpfp clear_tu.ntpfp +++ +++#define assert_offset assert_off_tu.tspec +++#define clear_offset clear_off_tu.tspec +++ +++#define assert_offset_ntpfp assert_off_tu.ntpfp +++#define clear_offset_ntpfp clear_off_tu.ntpfp +++ +++/* +++ * The PPS API +++ */ +++ +++static __inline int time_pps_create(int source, pps_handle_t *handle) +++{ +++ int ret; +++ +++ if (!handle) { +++ errno = EINVAL; +++ return -1; +++ } +++ +++ /* First we check if current device is a PPS valid PPS one... +++ */ +++ ret = ioctl(source, PPS_CHECK); +++ if (ret) { +++ errno = EOPNOTSUPP; +++ return -1; +++ } +++ +++ /* ... then since in LinuxPPS there are no differences between a +++ * "PPS source" and a "PPS handle", we simply return the same value. +++ */ +++ *handle = source; +++ +++ return 0; +++} +++ +++static __inline int time_pps_destroy(pps_handle_t handle) +++{ +++ return close(handle); +++} +++ +++static __inline int time_pps_getparams(pps_handle_t handle, +++ pps_params_t *ppsparams) +++{ +++ int ret; +++ struct pps_kparams __ppsparams; +++ +++ ret = ioctl(handle, PPS_GETPARAMS, &__ppsparams); +++ +++ ppsparams->api_version = __ppsparams.api_version; +++ ppsparams->mode = __ppsparams.mode; +++ ppsparams->assert_off_tu.tspec.tv_sec = __ppsparams.assert_off_tu.sec; +++ ppsparams->assert_off_tu.tspec.tv_nsec = __ppsparams.assert_off_tu.nsec; +++ ppsparams->clear_off_tu.tspec.tv_sec = __ppsparams.clear_off_tu.sec; +++ ppsparams->clear_off_tu.tspec.tv_nsec = __ppsparams.clear_off_tu.nsec; +++ +++ return ret; +++} +++ +++static __inline int time_pps_setparams(pps_handle_t handle, +++ const pps_params_t *ppsparams) +++{ +++ struct pps_kparams __ppsparams; +++ +++ __ppsparams.api_version = ppsparams->api_version; +++ __ppsparams.mode = ppsparams->mode; +++ __ppsparams.assert_off_tu.sec = ppsparams->assert_off_tu.tspec.tv_sec; +++ __ppsparams.assert_off_tu.nsec = ppsparams->assert_off_tu.tspec.tv_nsec; +++ __ppsparams.clear_off_tu.sec = ppsparams->clear_off_tu.tspec.tv_sec; +++ __ppsparams.clear_off_tu.nsec = ppsparams->clear_off_tu.tspec.tv_nsec; +++ +++ return ioctl(handle, PPS_SETPARAMS, &__ppsparams); +++} +++ +++/* Get capabilities for handle */ +++static __inline int time_pps_getcap(pps_handle_t handle, int *mode) +++{ +++ return ioctl(handle, PPS_GETCAP, mode); +++} +++ +++static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat, +++ pps_info_t *ppsinfobuf, +++ const struct timespec *timeout) +++{ +++ struct pps_fdata __fdata; +++ int ret; +++ +++ /* Sanity checks */ +++ if (tsformat != PPS_TSFMT_TSPEC) { +++ errno = EINVAL; +++ return -1; +++ } +++ +++ if (timeout) { +++ __fdata.timeout.sec = timeout->tv_sec; +++ __fdata.timeout.nsec = timeout->tv_nsec; +++ __fdata.timeout.flags = ~PPS_TIME_INVALID; +++ } else +++ __fdata.timeout.flags = PPS_TIME_INVALID; +++ +++ ret = ioctl(handle, PPS_FETCH, &__fdata); +++ +++ ppsinfobuf->assert_sequence = __fdata.info.assert_sequence; +++ ppsinfobuf->clear_sequence = __fdata.info.clear_sequence; +++ ppsinfobuf->assert_tu.tspec.tv_sec = __fdata.info.assert_tu.sec; +++ ppsinfobuf->assert_tu.tspec.tv_nsec = __fdata.info.assert_tu.nsec; +++ ppsinfobuf->clear_tu.tspec.tv_sec = __fdata.info.clear_tu.sec; +++ ppsinfobuf->clear_tu.tspec.tv_nsec = __fdata.info.clear_tu.nsec; +++ ppsinfobuf->current_mode = __fdata.info.current_mode; +++ +++ return ret; +++} +++ +++static __inline int time_pps_kcbind(pps_handle_t handle, +++ const int kernel_consumer, +++ const int edge, const int tsformat) +++{ +++ /* LinuxPPS doesn't implement kernel consumer feature */ +++ errno = EOPNOTSUPP; +++ return -1; +++} +++ +++#endif /* _SYS_TIMEPPS_H_ */ +diff --git a/feeds/packages/utils/procps/.svn/entries b/feeds/packages/utils/procps/.svn/entries +new file mode 100644 +index 0000000..81ee36d +--- /dev/null ++++ b/feeds/packages/utils/procps/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/procps ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-04T16:20:42.595148Z ++34481 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c5e05a047c8036cb586a248c1086f3de ++2012-12-04T16:20:42.595148Z ++34481 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1962 ++ +diff --git a/feeds/packages/utils/procps/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/procps/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/utils/procps/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/procps/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/procps/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7fd866f +--- /dev/null ++++ b/feeds/packages/utils/procps/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,83 @@ ++# ++# 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:=procps ++PKG_VERSION:=3.2.8 ++PKG_RELEASE:=1 ++ ++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/ ++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/feeds/packages/utils/procps/Makefile b/feeds/packages/utils/procps/Makefile +new file mode 100644 +index 0000000..7fd866f +--- /dev/null ++++ b/feeds/packages/utils/procps/Makefile +@@ -0,0 +1,83 @@ ++# ++# 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:=procps ++PKG_VERSION:=3.2.8 ++PKG_RELEASE:=1 ++ ++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/ ++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/feeds/packages/utils/procps/patches/.svn/entries b/feeds/packages/utils/procps/patches/.svn/entries +new file mode 100644 +index 0000000..da1de03 +--- /dev/null ++++ b/feeds/packages/utils/procps/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/procps/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-07-11T00:00:11.770324Z ++27585 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-make_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++21d3b5bea0e72a62dfc4e11c09edba0f ++2010-10-21T08:47:05.563599Z ++23566 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++250 ++ ++020_hz_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++79e6f384f2ec1704f188200f00f60c8c ++2011-07-11T00:00:11.770324Z ++27585 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1346 ++ +diff --git a/feeds/packages/utils/procps/patches/.svn/text-base/010-make_fix.patch.svn-base b/feeds/packages/utils/procps/patches/.svn/text-base/010-make_fix.patch.svn-base +new file mode 100644 +index 0000000..74b1d3c +--- /dev/null ++++ b/feeds/packages/utils/procps/patches/.svn/text-base/010-make_fix.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/procps/patches/.svn/text-base/020_hz_fix.patch.svn-base b/feeds/packages/utils/procps/patches/.svn/text-base/020_hz_fix.patch.svn-base +new file mode 100644 +index 0000000..1954453 +--- /dev/null ++++ b/feeds/packages/utils/procps/patches/.svn/text-base/020_hz_fix.patch.svn-base +@@ -0,0 +1,41 @@ ++--- 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/feeds/packages/utils/procps/patches/010-make_fix.patch b/feeds/packages/utils/procps/patches/010-make_fix.patch +new file mode 100644 +index 0000000..74b1d3c +--- /dev/null ++++ b/feeds/packages/utils/procps/patches/010-make_fix.patch +@@ -0,0 +1,11 @@ ++--- 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/feeds/packages/utils/procps/patches/020_hz_fix.patch b/feeds/packages/utils/procps/patches/020_hz_fix.patch +new file mode 100644 +index 0000000..1954453 +--- /dev/null ++++ b/feeds/packages/utils/procps/patches/020_hz_fix.patch +@@ -0,0 +1,41 @@ ++--- 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/feeds/packages/utils/ps3-utils/.svn/entries b/feeds/packages/utils/ps3-utils/.svn/entries +new file mode 100644 +index 0000000..c2ccdda +--- /dev/null ++++ b/feeds/packages/utils/ps3-utils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ps3-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-21T23:06:30.551381Z ++35739 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++22b0e5a18998f6f8bdbffec48a69678d ++2013-02-21T23:06:30.551381Z ++35739 ++geoff ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1913 ++ +diff --git a/feeds/packages/utils/ps3-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ps3-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..dcc872d +--- /dev/null ++++ b/feeds/packages/utils/ps3-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,70 @@ ++# ++# 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:=ps3-utils ++PKG_REV:=6488134e48cf2d6f2d6471ced8346ac8cb1b855a ++PKG_VERSION:=20090320 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-utils.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ps3-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=PS3 Linux Utilities ++ URL:=http://kernel.org/pub/linux/kernel/people/geoff/cell/ps3-utils/ ++ MAINTAINER:=Geoff Levand ++ DEPENDS:=@TARGET_ps3||TARGET_ps3chk||TARGET_powerpc ++endef ++ ++define Package/ps3-utils/description ++ The ps3-utils package is a set of system administration utilites for the ++ PS3 game console. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR) && $(BASH) -x ./bootstrap) ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/ps3*.h \ ++ $(1)/usr/include ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libps3-utils.{la,a,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/ps3-utils/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ps3-boot-game-os $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ps3-dump-bootloader $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ps3-flash-util $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ps3-video-mode $(1)/usr/bin ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libps3-utils.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,ps3-utils)) +diff --git a/feeds/packages/utils/ps3-utils/Makefile b/feeds/packages/utils/ps3-utils/Makefile +new file mode 100644 +index 0000000..dcc872d +--- /dev/null ++++ b/feeds/packages/utils/ps3-utils/Makefile +@@ -0,0 +1,70 @@ ++# ++# 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:=ps3-utils ++PKG_REV:=6488134e48cf2d6f2d6471ced8346ac8cb1b855a ++PKG_VERSION:=20090320 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-utils.git ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ps3-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=PS3 Linux Utilities ++ URL:=http://kernel.org/pub/linux/kernel/people/geoff/cell/ps3-utils/ ++ MAINTAINER:=Geoff Levand ++ DEPENDS:=@TARGET_ps3||TARGET_ps3chk||TARGET_powerpc ++endef ++ ++define Package/ps3-utils/description ++ The ps3-utils package is a set of system administration utilites for the ++ PS3 game console. ++endef ++ ++define Build/Configure ++ (cd $(PKG_BUILD_DIR) && $(BASH) -x ./bootstrap) ++ $(call Build/Configure/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(INSTALL_DATA) \ ++ $(PKG_INSTALL_DIR)/usr/include/ps3*.h \ ++ $(1)/usr/include ++ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/lib/libps3-utils.{la,a,so*} \ ++ $(1)/usr/lib/ ++endef ++ ++define Package/ps3-utils/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/usr/lib ++ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ps3-boot-game-os $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ps3-dump-bootloader $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ps3-flash-util $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ps3-video-mode $(1)/usr/bin ++ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libps3-utils.so.* $(1)/usr/lib ++endef ++ ++$(eval $(call BuildPackage,ps3-utils)) +diff --git a/feeds/packages/utils/psmisc/.svn/entries b/feeds/packages/utils/psmisc/.svn/entries +new file mode 100644 +index 0000000..0b0a264 +--- /dev/null ++++ b/feeds/packages/utils/psmisc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/psmisc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++fe911ef4c2dcd2b3e3343f38d23a860d ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1469 ++ +diff --git a/feeds/packages/utils/psmisc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/psmisc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..cd06b08 +--- /dev/null ++++ b/feeds/packages/utils/psmisc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,65 @@ ++# ++# 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:=psmisc ++PKG_VERSION:=22.16 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/psmisc ++PKG_MD5SUM:=d52caf26159c905574c2ce4bd792b9ee ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/psmisc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=proc utilities ++ URL:=http://psmisc.sourceforge.net/ ++endef ++ ++define Package/psmisc/description ++ psmisc is a set of additional small useful utilities that use ++ the proc filesystem: fuser, killall, pstree, and prtstat ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-harden-flags ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++ ++define Package/psmisc/preinst ++#!/bin/sh ++if [ -e $${IPKG_INSTROOT}/usr/bin/killall ]; then ++ rm $${IPKG_INSTROOT}/usr/bin/killall; ++fi ++endef ++ ++define Package/psmisc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/{fuser,killall,prtstat,pstree} \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/psmisc/postrm ++#!/bin/sh ++ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/killall ++$${IPKG_INSTROOT}/usr/bin/killall 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/killall ++exit 0 ++endef ++ ++$(eval $(call BuildPackage,psmisc)) +diff --git a/feeds/packages/utils/psmisc/Makefile b/feeds/packages/utils/psmisc/Makefile +new file mode 100644 +index 0000000..cd06b08 +--- /dev/null ++++ b/feeds/packages/utils/psmisc/Makefile +@@ -0,0 +1,65 @@ ++# ++# 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:=psmisc ++PKG_VERSION:=22.16 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/psmisc ++PKG_MD5SUM:=d52caf26159c905574c2ce4bd792b9ee ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/psmisc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses ++ TITLE:=proc utilities ++ URL:=http://psmisc.sourceforge.net/ ++endef ++ ++define Package/psmisc/description ++ psmisc is a set of additional small useful utilities that use ++ the proc filesystem: fuser, killall, pstree, and prtstat ++endef ++ ++CONFIGURE_ARGS += \ ++ --disable-harden-flags ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CPPFLAGS="$(TARGET_CPPFLAGS)" \ ++ LDFLAGS="$(TARGET_LDFLAGS)" ++ ++define Package/psmisc/preinst ++#!/bin/sh ++if [ -e $${IPKG_INSTROOT}/usr/bin/killall ]; then ++ rm $${IPKG_INSTROOT}/usr/bin/killall; ++fi ++endef ++ ++define Package/psmisc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) \ ++ $(PKG_INSTALL_DIR)/usr/bin/{fuser,killall,prtstat,pstree} \ ++ $(1)/usr/bin/ ++endef ++ ++define Package/psmisc/postrm ++#!/bin/sh ++ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/killall ++$${IPKG_INSTROOT}/usr/bin/killall 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/killall ++exit 0 ++endef ++ ++$(eval $(call BuildPackage,psmisc)) +diff --git a/feeds/packages/utils/psplash/.svn/entries b/feeds/packages/utils/psplash/.svn/entries +new file mode 100644 +index 0000000..afce349 +--- /dev/null ++++ b/feeds/packages/utils/psplash/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/psplash ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-17T11:48:50.337345Z ++29221 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++e70aa80c18b8346fca4ff4887f2a789c ++2011-11-17T11:48:50.337345Z ++29221 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1148 ++ +diff --git a/feeds/packages/utils/psplash/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/psplash/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0b56383 +--- /dev/null ++++ b/feeds/packages/utils/psplash/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,55 @@ ++# ++# 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:=psplash ++PKG_VERSION:=0.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://projects.o-hand.com/sources/psplash/ ++PKG_MD5SUM:=7649b7e0fac573eca2048a2a267e242b ++ ++PKG_INSTALL:=1 ++ ++IMAGE_FILE:=generic ++ifeq ($(CONFIG_TARGET_s3c24xx),y) ++ IMAGE_FILE:=480x640 ++endif ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/psplash ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A boot splash screen ++ URL:=http://projects.o-hand.com/psplash ++endef ++ ++define Package/psplash/description ++PSplash is a userspace graphical boot splash screen. ++endef ++ ++define Build/Configure ++ $(CP) \ ++ ./files/image_$(IMAGE_FILE).h \ ++ $(PKG_BUILD_DIR)/psplash-owrt-img.h ++ $(call Build/Configure/Default) ++endef ++ ++define Package/psplash/install ++ $(INSTALL_DIR) $(1)/bin $(1)/etc/init.d ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/psplash* \ ++ $(1)/bin/ ++ $(INSTALL_BIN) \ ++ ./files/psplash.init \ ++ $(1)/etc/init.d/psplash ++endef ++ ++$(eval $(call BuildPackage,psplash)) +diff --git a/feeds/packages/utils/psplash/Makefile b/feeds/packages/utils/psplash/Makefile +new file mode 100644 +index 0000000..0b56383 +--- /dev/null ++++ b/feeds/packages/utils/psplash/Makefile +@@ -0,0 +1,55 @@ ++# ++# 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:=psplash ++PKG_VERSION:=0.1 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://projects.o-hand.com/sources/psplash/ ++PKG_MD5SUM:=7649b7e0fac573eca2048a2a267e242b ++ ++PKG_INSTALL:=1 ++ ++IMAGE_FILE:=generic ++ifeq ($(CONFIG_TARGET_s3c24xx),y) ++ IMAGE_FILE:=480x640 ++endif ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/psplash ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A boot splash screen ++ URL:=http://projects.o-hand.com/psplash ++endef ++ ++define Package/psplash/description ++PSplash is a userspace graphical boot splash screen. ++endef ++ ++define Build/Configure ++ $(CP) \ ++ ./files/image_$(IMAGE_FILE).h \ ++ $(PKG_BUILD_DIR)/psplash-owrt-img.h ++ $(call Build/Configure/Default) ++endef ++ ++define Package/psplash/install ++ $(INSTALL_DIR) $(1)/bin $(1)/etc/init.d ++ $(CP) \ ++ $(PKG_INSTALL_DIR)/usr/bin/psplash* \ ++ $(1)/bin/ ++ $(INSTALL_BIN) \ ++ ./files/psplash.init \ ++ $(1)/etc/init.d/psplash ++endef ++ ++$(eval $(call BuildPackage,psplash)) +diff --git a/feeds/packages/utils/psplash/files/.svn/entries b/feeds/packages/utils/psplash/files/.svn/entries +new file mode 100644 +index 0000000..bc820b5 +--- /dev/null ++++ b/feeds/packages/utils/psplash/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/psplash/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-17T11:48:50.337345Z ++29221 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++image_generic.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++413aa97d186f4507c4bfa5c483318c9e ++2009-05-13T07:23:33.029849Z ++15812 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++415963 ++ ++image_480x640.h ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++db606cbcbaf14b4c3cf436f62cd371ee ++2009-05-13T11:33:29.492674Z ++15820 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++718294 ++ ++psplash.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8b835b103d87688660cadcee43335941 ++2011-11-17T11:48:50.337345Z ++29221 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++126 ++ +diff --git a/feeds/packages/utils/psplash/files/.svn/prop-base/psplash.init.svn-base b/feeds/packages/utils/psplash/files/.svn/prop-base/psplash.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/psplash/files/.svn/prop-base/psplash.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/psplash/files/.svn/text-base/image_480x640.h.svn-base b/feeds/packages/utils/psplash/files/.svn/text-base/image_480x640.h.svn-base +new file mode 100644 +index 0000000..c26996b +--- /dev/null ++++ b/feeds/packages/utils/psplash/files/.svn/text-base/image_480x640.h.svn-base +@@ -0,0 +1,9452 @@ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++#define OWRT_IMG_ROWSTRIDE (1920) ++#define OWRT_IMG_WIDTH (480) ++#define OWRT_IMG_HEIGHT (640) ++#define OWRT_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ ++#define OWRT_IMG_RLE_PIXEL_DATA ((uint8*) \ ++ "\206FT\203\377\2ES\202\377FT\203\377\210GU\204\377\202FU\204\377\5GU\204" \ ++ "\377HT\203\377HU\204\377FS\203\377+:p\377\211\31*e\377\202\30)d\377\2" \ ++ "\"2k\377CQ\201\377\204IV\205\377\202HU\204\377\1IV\205\377\214JW\206" \ ++ "\377\1IV\206\377\204JW\206\377\264KX\206\377\202JW\206\377\202IV\206" \ ++ "\377\214JW\206\377\202IV\205\377\1HU\204\377\203IV\205\377\3IW\206\377" \ ++ "3Bv\377\31*e\377\202\30)d\377\207\31*e\377\3\30)d\377\31+f\377=K|\377" \ ++ "\202HU\204\377\3HT\203\377GU\204\377FU\204\377\210GU\204\377\2FT\203" \ ++ "\377ES\202\377\210FT\203\377\2ES\203\377DR\203\377\207ES\203\377\1DR" \ ++ "\202\377\202CQ\201\377\205DR\202\377\3CP\201\377#3l\377\30)d\377\212" \ ++ "\31*e\377\10\30)d\377\34,g\377AO\200\377BP\201\377AO\200\377BP\201\377" \ ++ "BP\200\377BP\177\377\206BP\200\377\1AO\200\377\202@N\200\377\206AO\200" \ ++ "\377\1@N\177\377\202\77M~\377\206@N\177\377\202\77M~\377\3""0@t\377\27" \ ++ "(c\377\30)d\377\214\31*e\377\3\30)d\377,;q\377>L}\377\205=K}\377\210" \ ++ "L}\377;I{\377\36.h\377\30)d\377\214\31*e\377\3\30" \ ++ ")d\377\37/i\377s\377\26'c\377\213\31*e\377\7\34-g" \ ++ "\377;I|\377BP\201\377AO\200\377BP\201\377BP\200\377BP\177\377\206BP\200" \ ++ "\377\202AO\200\377\1@N\200\377\206AO\200\377\207@N\177\377\5\77M~\377" \ ++ "@N\177\377\77M~\377>L}\377*:p\377\202\30)d\377\214\31*e\377\4\33,f\377" \ ++ "2Av\377=K}\377s\377\30)d\377\224" \ ++ "\31*e\377\5\30)d\377!2k\3771Av\3772Av\3771@u\377\2062Av\377\1""0At\377" \ ++ "\2071Au\377\4/\77u\377,L}\377HU\204\377GT\203\377HU\204\377FU\204\377\210GU\204" \ ++ "\377\2FT\203\377ES\202\377\206FT\203\377\4ES\203\377FT\203\377ES\203" \ ++ "\377DR\203\377\205ES\203\377\4DR\202\377ES\203\377DR\202\377CQ\201\377" \ ++ "\204DR\202\377\5CQ\201\377DR\202\377CQ\201\377\37/h\377\30)d\377\212" \ ++ "\31*e\377\3\30)d\377+:q\377BP\200\377\203BP\201\377\2BP\200\377BP\177" \ ++ "\377\204BP\200\377\4AO\200\377BP\200\377AO\200\377@N\200\377\205AO\200" \ ++ "\377\2@N\177\377AO\200\377\210@N\177\377\5>L}\377\77M~\3775Cw\377\33" \ ++ ",f\377\30)d\377\214\31*e\377\2\30)d\377)8o\377\204=K}\377\3s\377\36/h\377\30" \ ++ ")d\377\230\31*e\377\5\30)d\377\36/h\377.=s\377-t\377" \ ++ "2Av\3771@u\377\2062Av\377\2""1Au\3770At\377\2051Au\377\5""0@u\3771Au" \ ++ "\377/\77u\377\"2k\377\30)d\377\230\31*e\377\5\30)d\377\35-g\377,;r\377" \ ++ ".=s\377,;q\377\205-s\377\30)d\377\214\31*e\377\202\30)d\377\2""4Bw\377" \ ++ "L~\377\203BP\201\377\2BP\200\377BP\177\377\205BP\200\377\3AO\200\377" \ ++ "BP\200\377@N\200\377\207AO\200\377\2@N\177\377\77M~\377\205@N\177\377" \ ++ "\203\77M~\377\3>K}\377\32+e\377\30)d\377\214\31*e\377\3\27(d\377(8o\377" \ ++ "L}\377@N\177\377(7n\377\27)d\377\214" \ ++ "\31*e\377\4\30)d\377\32+f\377=K}\377M\177\377BP\201\377AO" \ ++ "\200\377\202BP\200\377\1BP\177\377\206BP\200\377\1AO\200\377\202@N\200" \ ++ "\377\206AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202\77M~\377\3" \ ++ "9Hz\377\27(c\377\30)d\377\214\31*e\377\2\27(c\3772Av\377\205=K}\377\1" \ ++ "s\377\27(c\377\220\31*e\377" \ ++ "\2\27(c\377,;q\377\2058Fz\377\2""7Fy\3778Fz\377\2077Fy\377\2076Ex\377" \ ++ "\3""0@t\377\31*e\377\30)d\377\223\31*e\377\5\30)d\377#4l\3774Cw\3772" \ ++ "Av\3771@u\377\2052Av\377\2021Au\377\1""0At\377\2051Au\377\2020@u\377" \ ++ "\2%6m\377\30)d\377\230\31*e\377\5\30)d\377\34,g\377,;q\377-t\377\203" \ ++ "BP\201\377\2BP\200\377BP\177\377\207BP\200\377\2AO\200\377@N\200\377" \ ++ "\204AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\206@N\177\377" \ ++ "\202\77M~\377\3""9Hz\377\33,f\377\30)d\377\214\31*e\377\3\30)d\377/=" \ ++ "s\377>L}\377\204=K}\377\210M~\377BP\201\377BP\200\377BP\201\377BP\200" \ ++ "\377BP\177\377\206BP\200\377\210AO\200\377\207@N\177\377\5\77M~\377@" \ ++ "N\177\377\77M~\377=K|\377$5m\377\202\30)d\377\213\31*e\377\3\30)d\377" \ ++ "\"3k\377>L~\377\205=K}\377\210L}" \ ++ "\377\77M~\377.>s\377\31*e\377\30)d\377\214\31*e\377\2\35.g\3779Gz\377" \ ++ "\205=K}\377\1;K}\377\207L}\377\77M~\377\40""1j\377" \ ++ "\215\31*e\377\2\30)d\377)9p\377\204=K}\377\3s\377\202" \ ++ "HU\204\377\1GU\204\377\202FU\204\377\206GU\204\377\1FT\203\377\202ES" \ ++ "\202\377\204FT\203\377\2ES\203\377FT\203\377\207ES\203\377\2DR\202\377" \ ++ "ES\203\377\205DR\202\377\5CQ\201\377ES\202\3775Ex\377\31*e\377\31)d\377" \ ++ "\211\31*e\377\7\27(c\377-=s\377CQ\201\377AO\200\377BP\200\377BP\201\377" \ ++ "BP\177\377\207BP\200\377\1@N\200\377\207AO\200\377\2@N\177\377\77M~\377" \ ++ "\206@N\177\377\3\77M~\377@N\177\377+;q\377\215\31*e\377\3\30)d\377\"" \ ++ "2k\377:H{\377\205=K}\377\2L}\377GT" \ ++ "\203\377HU\204\377GU\204\377FU\204\377\205GU\204\377\4FT\203\377GU\204" \ ++ "\377FT\203\377ES\202\377\205FT\203\377\3ES\203\377FT\203\377DR\203\377" \ ++ "\207ES\203\377\2DR\202\377CQ\201\377\205DR\202\377\3ES\202\377\36/i\377" \ ++ "\30)d\377\211\31*e\377\2\30)d\377\33-g\377\204BP\201\377\2BP\200\377" \ ++ "BP\177\377\206BP\200\377\2AO\200\377@N\200\377\205AO\200\377\202@N\177" \ ++ "\377\1\77M~\377\205@N\177\377\203\77M~\377\2""8Gz\377\30)d\377\214\31" \ ++ "*e\377\3\30)d\377\33+f\3777Fy\377\204=K}\377\202L}\377@N\177\377\35.g\377\30)d\377\213\31*e\377\4\30)d\377\27" \ ++ "(c\3771@t\377s\377-" \ ++ "L}\377\77M~\377\34-f\377\30)d\377" \ ++ "\213\31*e\377\3\30)d\377\26(c\3777Fz\377\205=K}\377\2s\377\210-t\377\27" \ ++ ")d\377\30)d\377\205\31*e\377\3\27)d\377!2j\377FS\203\377\203IV\205\377" \ ++ "\2HU\204\377IV\205\377\207JW\206\377\4IV\206\377JW\206\377KX\206\377" \ ++ "JW\206\377\206KX\206\377\4JW\205\377KX\206\377LY\207\377KX\206\377\207" \ ++ "LY\207\377\1LX\207\377\202LY\207\377\2LZ\207\377LY\207\377\211LZ\207" \ ++ "\377\1KZ\206\377\203LZ\207\377\202MZ\210\377\1LZ\207\377\236MZ\210\377" \ ++ "\1LZ\207\377\203MZ\210\377\202LZ\207\377\202KZ\206\377\210LZ\207\377" \ ++ "\1LY\207\377\202LZ\207\377\2LY\207\377LX\207\377\207LY\207\377\4KX\206" \ ++ "\377LY\207\377KX\206\377JW\205\377\207KX\206\377\4JW\206\377KX\206\377" \ ++ "JW\206\377IV\206\377\205JW\206\377\11IV\205\377JW\206\377IV\205\377H" \ ++ "U\204\377IV\205\377HU\204\377KX\206\3777Dy\377\26'c\377\207\31*e\377" \ ++ "\6\34,g\377>K}\377HU\204\377HT\203\377GU\204\377FU\204\377\205GU\204" \ ++ "\377\202FT\203\377\1ES\202\377\206FT\203\377\202ES\203\377\1DR\203\377" \ ++ "\206ES\203\377\2DR\202\377CQ\201\377\204DR\202\377\4CQ\201\377AO\200" \ ++ "\377%5m\377\30)d\377\211\31*e\377\3\30)d\377&6n\377@N\200\377\202BP\201" \ ++ "\377\202BP\200\377\1BP\177\377\205BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\205AO\200\377\202@N\177\377\1\77M~\377\205@N\177\377\203\77M~\377\2" \ ++ "(7o\377\27(d\377\214\31*e\377\3\27(d\377,L}\377\204=K}\377\2<" \ ++ "K}\377;K}\377\206s\377\2068Fz\377\2""7Fy\3776Fx\377\2067Fy\377\2""6Ex\3775Dw\377\203" \ ++ "6Ex\377\4""5Dw\3777Fx\377\37""0i\377\30)d\377\223\31*e\377\5\30)d\377" \ ++ "\40""1i\3771@u\3773Bw\3771@u\377\2062Av\377\1""0At\377\2071Au\377\2/" \ ++ "\77u\377*:q\377\202\30)d\377\227\31*e\377\2\30)d\377\31*e\377\202.=s" \ ++ "\377\207-L~\377K}\377\202HU\204\377\2GU\204" \ ++ "\377FU\204\377\206GU\204\377\1FT\203\377\202ES\202\377\204FT\203\377" \ ++ "\4ES\203\377FT\203\377ES\203\377DR\203\377\206ES\203\377\2DR\202\377" \ ++ "CQ\201\377\205DR\202\377\3;I|\377\35.g\377\30)d\377\210\31*e\377\4\30" \ ++ ")d\377\26(c\3776Dy\377AO\200\377\202BP\201\377\210BP\200\377\210AO\200" \ ++ "\377\210@N\177\377\5\77M~\377>L}\3779Gz\377\33+f\377\30)d\377\213\31" \ ++ "*e\377\2\30)d\377\31*e\377\206=K}\377\2t\3772Av\3771@u\377\2062Av\377\2""1" \ ++ "Au\3770At\377\2061Au\377\4/\77u\377-=s\377\34-g\377\30)d\377\231\31*" \ ++ "e\377\2(8o\377.=s\377\206-s\377\36/i\377\30)d\377" \ ++ "\231\31*e\377\2%5m\377.=s\377\210-L}\377(8o\377\30)d" \ ++ "\377\214\31*e\377\3\30)d\377+:q\377>L}\377\204=K}\377\210K}\377\33,f\377\30)" \ ++ "d\377\205\31*e\377\202\30)d\377\3FS\203\377IV\205\377HU\204\377\202I" \ ++ "V\205\377\207JW\206\377\2IV\206\377JW\206\377\210KX\206\377\4JW\205\377" \ ++ "KX\206\377LY\207\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377\215" \ ++ "LZ\207\377\214MZ\210\377\202LY\207\377\204MZ\210\377\204N[\211\377\1" \ ++ "MZ\210\377\206N[\211\377\1MZ\210\377\205N[\211\377\203MZ\210\377\203" \ ++ "LY\207\377\212MZ\210\377\1LZ\207\377\202MZ\210\377\2LZ\207\377KZ\206" \ ++ "\377\207LZ\207\377\4LY\207\377LZ\207\377LY\207\377LX\207\377\206LY\207" \ ++ "\377\1KX\206\377\202LY\207\377\1JW\205\377\206KX\206\377\4JW\206\377" \ ++ "KX\206\377JW\206\377IV\206\377\207JW\206\377\2IV\205\377HU\204\377\202" \ ++ "IV\205\377\2JW\206\377-L}\377\77M~\377/>t\377\31*e\377\30)d" \ ++ "\377\213\31*e\377\4\30)d\377\"2k\377\77M~\377s\377" \ ++ "\27(c\377\217\31*e\377\4\30)d\377\32+f\3773Av\3777Fz\377\2058Fz\377\2" \ ++ "7Fy\3776Fx\377\2067Fy\377\2""6Ex\3775Dw\377\2046Ex\377\3""5Dw\377\36" \ ++ "/h\377\30)d\377\223\31*e\377\5\27)d\377&5m\3773Bw\3772Av\3771@u\377\205" \ ++ "2Av\377\2""1Au\3770At\377\2061Au\377\2020@u\377\2#3k\377\30)d\377\231" \ ++ "\31*e\377\4\40""0j\377/=s\377-L}\377@N\177" \ ++ "\377\"2j\377\215\31*e\377\4\32+e\3770\77t\377=K}\377L}\377@N\177\377*:p\377\215\31*e\377\4\30)d\377+;q\377=K}\377=J|\377" \ ++ "\202=K}\377\3L}\377\26'c\377\30)d\377\205\31*e\377" \ ++ "\2\30)d\377*9p\377\202IV\205\377\202HU\204\377\1IV\205\377\206JW\206" \ ++ "\377\202IV\206\377\1JW\206\377\206KX\206\377\2JW\205\377KX\206\377\210" \ ++ "LY\207\377\2LX\207\377LY\207\377\207LZ\207\377\202KZ\206\377\202LZ\207" \ ++ "\377\207MZ\210\377\203LY\207\377\3MZ\210\377N[\211\377MZ\210\377\215" \ ++ "N[\211\377\215MZ\211\377\214N[\211\377\1MZ\210\377\202N[\211\377\1MZ" \ ++ "\210\377\202LY\207\377\207MZ\210\377\4LZ\207\377MZ\210\377LZ\207\377" \ ++ "KZ\206\377\210LZ\207\377\2LY\207\377LX\207\377\207LY\207\377\2KX\206" \ ++ "\377JW\205\377\207KX\206\377\2JW\206\377IV\206\377\207JW\206\377\7IV" \ ++ "\205\377HU\204\377IV\205\377HU\204\377DQ\201\377\34-g\377\30)d\377\205" \ ++ "\31*e\377\6\30)d\377%4l\377DQ\201\377HU\204\377GU\204\377FU\204\377\206" \ ++ "GU\204\377\1FT\203\377\202ES\202\377\205FT\203\377\1ES\203\377\202DR" \ ++ "\203\377\205ES\203\377\1DR\202\377\202CQ\201\377\205DR\202\377\3""1@" \ ++ "u\377\27(c\377\30)e\377\210\31*e\377\3\30)d\377\"2k\377DR\202\377\202" \ ++ "BP\201\377\2BP\200\377BP\177\377\206BP\200\377\2AO\200\377@N\200\377" \ ++ "\206AO\200\377\2@N\177\377\77M~\377\205@N\177\377\203\77M~\377\1""3A" \ ++ "v\377\215\31*e\377\3\30)d\377&6n\377L~\377\202BP\201\377\202BP\200\377\1BP\177\377\205BP\200\377\202AO\200" \ ++ "\377\1@N\200\377\205AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202" \ ++ "\77M~\377\2;I{\377\30)d\377\214\31*e\377\3\30)d\377\"2j\377:H{\377\205" \ ++ "=K}\377\1;K}\377\206s\377GT\203\377HU\204\377GU\204\377" \ ++ "FU\204\377\206GU\204\377\2FT\203\377ES\202\377\206FT\203\377\2ES\203" \ ++ "\377DR\203\377\206ES\203\377\2DR\202\377CQ\201\377\204DR\202\377\4CQ" \ ++ "\201\377\77N\177\377\40""0i\377\30)d\377\211\31*e\377\2\33,f\3776Dy\377" \ ++ "\203BP\201\377\2BP\200\377BP\177\377\206BP\200\377\2AO\200\377@N\200" \ ++ "\377\205AO\200\377\202@N\177\377\1\77M~\377\205@N\177\377\5\77M~\377" \ ++ ">L}\377@N\177\377\33,f\377\30)d\377\213\31*e\377\3\30)d\377\35.h\377" \ ++ "8Fy\377\205=K}\377\2t\377CP\201\377AO\200" \ ++ "\377BP\201\377BP\200\377BP\177\377\206BP\200\377\2AO\200\377@N\200\377" \ ++ "\206AO\200\377\2@N\177\377\77M~\377\206@N\177\377\4\77M~\377@N\177\377" \ ++ "$4l\377\30)d\377\213\31*e\377\3\30)d\377\31)e\3776Ex\377\204=K}\377\202" \ ++ "t\377JW\205\377HU\204" \ ++ "\377IV\205\377HU\204\377JW\206\377IV\205\377\205JW\206\377\2IV\206\377" \ ++ "JW\206\377\210KX\206\377\2LY\207\377KX\206\377\205LY\207\377\4LX\207" \ ++ "\377LY\207\377LZ\207\377LY\207\377\205LZ\207\377\4KZ\206\377LZ\207\377" \ ++ "MZ\210\377LZ\207\377\207MZ\210\377\4LY\207\377MZ\210\377N[\211\377MZ" \ ++ "\210\377\210N[\211\377\1MZ\211\377\202N[\211\377\2O\\\211\377N[\211\377" \ ++ "\203O\\\211\377\12JV\201\377ALq\3779Cc\37708S\377$*\77\377\32\37.\377" \ ++ "\23\26!\377\15\17\26\377\10\12\17\377\5\6\12\377\202\4\5\10\377\12\6" \ ++ "\7\13\377\11\13\20\377\16\20\30\377\24\27#\377\34!1\377&,B\37719U\377" \ ++ ":Ce\377ALr\377JV\202\377\202O\\\211\377\202N[\211\377\202MZ\211\377\207" \ ++ "N[\211\377\203MZ\210\377\1LY\207\377\206MZ\210\377\4LZ\207\377MZ\210" \ ++ "\377LZ\207\377KZ\206\377\206LZ\207\377\202LY\207\377\1LX\207\377\207" \ ++ "LY\207\377\2KX\206\377JW\205\377\206KX\206\377\202JW\206\377\1IV\206" \ ++ "\377\204JW\206\377\4IV\205\377JW\206\377IV\205\377HU\204\377\202IV\205" \ ++ "\377\3CQ\201\377\32+e\377\30)d\377\205\31*e\377\4\27(d\377'7o\377JW\205" \ ++ "\377HT\203\377\210GU\204\377\210FT\203\377\210ES\203\377\2DR\202\377" \ ++ "CQ\201\377\205DR\202\377\3""7Fy\377\33,f\377\30)d\377\210\31*e\377\10" \ ++ "\30)d\377\"3k\377>L~\377BP\201\377BP\200\377BP\201\377BP\200\377BP\177" \ ++ "\377\205BP\200\377\202AO\200\377\1@N\200\377\205AO\200\377\2@N\177\377" \ ++ "\77M~\377\206@N\177\377\202\77M~\377\2""5Dx\377\27(c\377\214\31*e\377" \ ++ "\3\27(c\377,;q\377l\377" \ ++ "6Ex\3776Ew\3776Ex\377&6n\377\30)d\377\204\31*e\377\1\24\"S\377\216\24" \ ++ "\"R\377\10\23!Q\377\25#S\377*6a\377(5`\377'4_\377(5`\377(4_\377+8g\377" \ ++ "\2032Av\377\2""1Au\3770At\377\2051Au\377\2020@u\377\2&6n\377\30)d\377" \ ++ "\230\31*e\377\2\30)d\377!2j\377\202-\377JV\200\377N[\211\377MZ\211" \ ++ "\377\207N[\211\377\1MZ\210\377\202N[\211\377\1LY\207\377\207MZ\210\377" \ ++ "\202LZ\207\377\1KZ\206\377\210LZ\207\377\2LY\207\377LX\207\377\204LY" \ ++ "\207\377\4KX\206\377LY\207\377KX\206\377JW\205\377\207KX\206\377\206" \ ++ "JW\206\377\2IV\205\377JW\206\377\202IV\205\377\4HU\204\377JW\205\377" \ ++ ":I{\377\26'c\377\206\31*e\377\5\30)d\3777Fy\377IV\204\377HU\204\377F" \ ++ "U\204\377\207GU\204\377\210FT\203\377\206ES\203\377\2DR\202\377ES\203" \ ++ "\377\207DR\202\377\2!2j\377\30)d\377\210\31*e\377\3\30)d\377\27(d\377" \ ++ "8G{\377\203BP\201\377\2BP\200\377BP\177\377\206BP\200\377\2AO\200\377" \ ++ "@N\200\377\204AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\205" \ ++ "@N\177\377\5\77M~\377>L}\377\77M~\377\33-g\377\30)d\377\213\31*e\377" \ ++ "\3\30)d\377\40""0i\377m\377\2026Ex\377\2+;q\377\32*e\377\203\31*e\377" \ ++ "\2\24\"S\377\0\0\2\377\224\0\0\0\377\2\0\1\1\377\33#@\377\2032Av\377" \ ++ "\2""1Au\3770At\377\2041Au\377\5""0@u\3771Au\3770@u\377*:q\377\30)d\377" \ ++ "\230\31*e\377\5\30)d\377\37/i\377,s\377\27(c\377\214\31*e\377\2\26(c\3774Cx\377\205=K}\377\5s\377\205=K}\377\5L}\3778Gy\377\202\30)d\377\213\31*e\377\3\27(d\377)9p\377>L}\377" \ ++ "\204=K}\377\2\377\0\0\1\377\0\0\0\377DDD\377\355\355\355" \ ++ "\377\217\377\377\377\377\3\376\376\376\377\377\377\377\377\"\"\"\377" \ ++ "\202\0\0\0\377\1,9c\377\2026Ex\377\1\35.g\377\202\31*e\377\5\24\"S\377" \ ++ "\3\5\15\377\0\0\0\377\25\25\25\377\327\327\327\377\216\377\377\377\377" \ ++ "\2\363\363\363\377QQQ\377\202\0\0\0\377\1\40*M\377\2052Av\377\2071Au" \ ++ "\377\4""0@u\3771Au\377\35-g\377\30)d\377\227\31*e\377\202\30)d\377\6" \ ++ "+:q\377.=s\377-L~\377\204=K}\377\204" \ ++ "L}\377(8o\377\30)d\377\214\31*e\377" \ ++ "\2\30)d\3779Gz\377\205=K}\377\204q\377\2062Av\377\2101Au\377\3""0@u\377(8o\377\27(d\377" \ ++ "\227\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377\1\225\225\225\377\216" \ ++ "\377\377\377\377\1\367\367\367\377\202\0\0\0\377\2\3\6\17\377\27'_\377" \ ++ "\225\31*e\377\2\30)d\377\36/i\377\203(8o\377\207'7o\377\2\36/h\377\30" \ ++ ")d\377\233\31*e\377\6\27(d\377%5m\377JW\206\377HU\204\377IV\205\377H" \ ++ "U\204\377\207JW\206\377\1IV\206\377\206KX\206\377\2JW\205\377KX\206\377" \ ++ "\206LY\207\377\2LX\207\377LY\207\377\206LZ\207\377\2KZ\206\377LZ\207" \ ++ "\377\207MZ\210\377\1LY\207\377\207N[\211\377\5MZ\211\377N[\211\377O\\" \ ++ "\211\377MZ\206\377\4\5\10\377\202\0\0\0\377\3\212\212\212\377\377\377" \ ++ "\377\377\376\376\376\377\254\377\377\377\377\3\376\376\376\377\377\377" \ ++ "\377\377\222\222\222\377\202\0\0\0\377\2\3\3\5\377IV\203\377\207N[\211" \ ++ "\377\210MZ\210\377\210LZ\207\377\210LY\207\377\207KX\206\377\2JW\206" \ ++ "\377IV\206\377\206JW\206\377\5IV\205\377HU\204\377IV\205\377JW\205\377" \ ++ ";I|\377\206\31*e\377\7\30)d\377\26(c\377FS\203\377HU\203\377HU\204\377" \ ++ "GU\204\377FU\204\377\205GU\204\377\2FT\203\377ES\202\377\206FT\203\377" \ ++ "\2ES\203\377DR\203\377\206ES\203\377\2DR\202\377CQ\201\377\205DR\202" \ ++ "\377\2&6n\377\27(d\377\211\31*e\377\2\30)d\377;J|\377\203BP\201\377\2" \ ++ "BP\200\377BP\177\377\206BP\200\377\1@N\200\377\207AO\200\377\1\77M~\377" \ ++ "\206@N\177\377\202\77M~\377\1-\377" \ ++ "\202\31*e\377\1\24#T\377\202\0\0\0\377\1\16\16\16\377\225\377\377\377" \ ++ "\377\10\337\337\337\377'''\377\0\0\0\377\3\4\7\377&0U\377-;r\377\30)" \ ++ "d\377\23\40M\377\202\0\0\0\377\3CCC\377\377\377\377\377\376\376\376\377" \ ++ "\215\377\377\377\377\1\264\264\264\377\202\0\0\0\377\2\17\24$\3770>r" \ ++ "\377\2062Av\377\2101Au\377\3""0@u\377):p\377\27(d\377\227\31*e\377\2" \ ++ "\30)c\377\12\22,\377\202\0\0\0\377\1\225\225\225\377\216\377\377\377" \ ++ "\377\1\367\367\367\377\202\0\0\0\377\2\3\6\17\377\27'_\377\225\31*e\377" \ ++ "\2\30)d\377\36.h\377\203(8o\377\2'7o\377&6o\377\203'7o\377\4'6n\377'" \ ++ "7o\377\36/h\377\30)d\377\233\31*e\377\3\27(c\377.=s\377JW\205\377\202" \ ++ "IV\205\377\1HU\204\377\206JW\206\377\1IV\206\377\202JW\206\377\205KX" \ ++ "\206\377\2JW\205\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377\206" \ ++ "LZ\207\377\2KZ\206\377LZ\207\377\206MZ\210\377\1LY\207\377\202MZ\210" \ ++ "\377\205N[\211\377\2MZ\211\377N[\211\377\202O\\\211\377\1$*\77\377\202" \ ++ "\0\0\0\377\4""222\377\360\360\360\377\377\377\377\377\376\376\376\377" \ ++ "\221\377\377\377\377\1\376\376\376\377\210\377\377\377\377\1\376\376" \ ++ "\376\377\221\377\377\377\377\4\376\376\376\377\377\377\377\377\365\365" \ ++ "\365\377666\377\202\0\0\0\377\1!';\377\207N[\211\377\210MZ\210\377\210" \ ++ "LZ\207\377\210LY\207\377\11KX\206\377>Io\37719W\377(/I\377$+A\377%,C" \ ++ "\377*1L\3774=]\377AMv\377\206JW\206\377\204IV\205\377\1CP\201\377\207" \ ++ "\31*e\377\2\26'c\377\77M}\377\202HU\204\377\2GU\204\377FU\204\377\205" \ ++ "GU\204\377\1FT\203\377\202ES\202\377\204FT\203\377\14=Ir\3771;^\377)" \ ++ "2P\377%,F\377\")A\377!(@\377\")A\377%,F\377)2O\377.8Y\3775@g\377@Mz\377" \ ++ "\204DR\202\377\2,t\377\31*e\377\30" \ ++ ")d\377\31*e\377\26%Y\377\21\35G\377\16\30;\377\14\25""3\377\14\24""1" \ ++ "\377\14\25""4\377\16\31<\377\22\37K\377\27'_\377\31*e\377\30)d\377/>" \ ++ "t\377>L}\377\204=K}\377\205s\377\30)d\377\16\27""8\377\202\0\0\0\377\1\200\200\200\377" \ ++ "\217\377\377\377\377\1ooo\377\202\0\0\0\377\2\32\">\3770\77t\377\206" \ ++ "2Av\377\2101Au\377\3""0@u\377+;q\377\27(d\377\207\31*e\377\7\24\"S\377" \ ++ "\17\31=\377\14\25""3\377\14\24""1\377\16\27""9\377\22\36J\377\27(`\377" \ ++ "\211\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377\1\225\225\225\377\216" \ ++ "\377\377\377\377\1\367\367\367\377\202\0\0\0\377\2\3\6\17\377\27(`\377" \ ++ "\225\31*e\377\2\30)d\377\35.h\377\204(8o\377\1&6o\377\205'7o\377\2\37" \ ++ "/i\377\30)e\377\233\31*e\377\2\26'c\3778Fy\377\202IV\205\377\2HU\204" \ ++ "\377IV\205\377\206JW\206\377\2IV\206\377JW\206\377\206KX\206\377\2JW" \ ++ "\205\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377\205LZ\207\377" \ ++ "\1KZ\206\377\202LZ\207\377\205MZ\210\377\1LY\207\377\202MZ\210\377\206" \ ++ "N[\211\377\5MZ\211\377O\\\211\377N[\211\377IU\177\377\4\5\10\377\202" \ ++ "\0\0\0\377\1\247\247\247\377\223\377\377\377\377\14\370\370\370\377\341" \ ++ "\341\341\377\251\251\251\377ggg\377\77\77\77\377...\377222\377III\377" \ ++ "uuu\377\275\275\275\377\345\345\345\377\374\374\374\377\223\377\377\377" \ ++ "\377\1\260\260\260\377\202\0\0\0\377\2\2\3\4\377HT\177\377\203N[\211" \ ++ "\377\5MY\207\3772:X\377%+A\377$+A\377$*@\377\206$+A\377\2$+@\377#+@\377" \ ++ "\206$+@\377\3$*@\377#)\77\377/7S\377\202JW\204\377\3BMv\377/7T\377\24" \ ++ "\27$\377\211\0\0\0\377\4\3\4\6\377\32\36/\3775>`\377CNy\377\202IV\205" \ ++ "\377\1JW\206\377\203IV\205\377\3JW\206\377\32+f\377\30)d\377\205\31*" \ ++ "e\377\6\26'c\3776Ex\377IU\204\377HU\204\377GU\204\377FU\204\377\204G" \ ++ "U\204\377\7FT\203\377GU\204\377BP}\377L|\377,8h\377\20\33A\377\7\14" \ ++ "\36\377\0\1\3\377\211\0\0\0\377\4\3\5\15\377\13\22.\377#0\\\377:Hv\377" \ ++ "\204=K}\377\205s\377IV\205\377HU\204\377GU\204\377F" \ ++ "U\204\377\204GU\204\377\4@Mw\377,5R\377\27\34,\377\4\5\11\377\224\0\0" \ ++ "\0\377\4\4\5\10\377\7\15!\377\17\31>\377\26%Y\377\207\31*e\377\3\30)" \ ++ "d\377-=s\377CQ\202\377\202BP\201\377\2BP\200\377\37%;\377\223\0\0\0\377" \ ++ "\5\13\15\26\377\377\223\0\0\0\377\3\15\20\33\377" \ ++ "\37%=\377\10\11\17\377\205\0\0\0\377\11...\377YYY\377vvv\377\207\207" \ ++ "\207\377\214\214\214\377\207\207\207\377uuu\377SSS\377\37\37\37\377\204" \ ++ "\0\0\0\377\4\2\3\5\377\23\30(\3779Fu\377=K}\377\206Hk\377\7\10\14\377\0\0\0\377\15\15\15" \ ++ "\377\335\335\335\377\377\377\377\377\376\376\376\377\215\377\377\377" \ ++ "\377\3\376\376\376\377\377\377\377\377\264\264\264\377\204\0\0\0\377" \ ++ "\10\24\27#\3775=Z\377GRy\377MY\203\377KX\201\377BMq\377.5N\377\13\15" \ ++ "\24\377\203\0\0\0\377\4\6\6\6\377\330\330\330\377\377\377\377\377\376" \ ++ "\376\376\377\215\377\377\377\377\7\376\376\376\377\377\377\377\377\327" \ ++ "\327\327\377\22\22\22\377\0\0\0\377\7\10\14\377\377\202\0\0\0\377\2DDD\377\241\241\241\377\213\232\232" \ ++ "\232\377\2\234\234\234\377\207\207\207\377\202\0\0\0\377\202\0\0\1\377" \ ++ "\203\0\0\0\377\12...\377\240\240\240\377\360\360\360\377\370\370\370" \ ++ "\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377" \ ++ "\374\374\374\377\373\373\373\377\202\371\371\371\377\3\332\332\332\377" \ ++ "ppp\377\1\1\1\377\203\0\0\0\377\3\11\14\24\3775Am\377=K}\377\205>>\377\204\0\0\0\377\7aaa\377\346\346\346\377\371\371\371\377" \ ++ "\373\373\373\377\374\374\374\377\375\375\375\377\373\373\373\377\202" \ ++ "\371\371\371\377\2\306\306\306\377SSS\377\205\0\0\0\377\2\77\77\77\377" \ ++ "\227\227\227\377\203\232\232\232\377\2\230\230\230\377\324\324\324\377" \ ++ "\216\377\377\377\377\2\374\374\374\377\225\225\225\377\206\232\232\232" \ ++ "\377\2\235\235\235\377OOO\377\202\0\0\0\377\1\16\31<\377\215\31*e\377" \ ++ "\2\30)d\377\33+g\377\204(8o\377\1&6o\377\205'7o\377\1\40""1j\377\233" \ ++ "\31*e\377\3\30)d\377\"3k\377FS\203\377\202IV\205\377\2HU\204\377IV\205" \ ++ "\377\205JW\206\377\2IV\206\377JW\206\377\206KX\206\377\2JW\205\377KX" \ ++ "\206\377\206LY\207\377\2LX\207\377LY\207\377\205LZ\207\377\1KZ\206\377" \ ++ "\202LZ\207\377\205MZ\210\377\4LY\207\377MZ\210\377N[\211\377MZ\210\377" \ ++ "\204N[\211\377\5MZ\211\377N[\211\377O\\\211\377N[\211\37708S\377\202" \ ++ "\0\0\0\377\3""888\377\377\377\377\377\376\376\376\377\215\377\377\377" \ ++ "\377\4\376\376\376\377\377\377\377\377\327\327\327\377\13\13\13\377\202" \ ++ "\0\0\0\377\2\10\12\17\377=Gh\377\202R_\213\377\1Q^\212\377\202R_\213" \ ++ "\377\203Q^\212\377\2""2:V\377\4\5\10\377\202\0\0\0\377\4\24\24\24\377" \ ++ "\355\355\355\377\377\377\377\377\376\376\376\377\217\377\377\377\377" \ ++ "\1""444\377\202\0\0\0\377\1.6R\377\202N[\211\377\5LX\205\377\30\34+\377" \ ++ "\0\0\0\377\4\4\4\377\241\241\241\377\215\377\377\377\377\1\320\320\320" \ ++ "\377\204\0\0\0\377\2%%%\377\265\265\265\377\203\377\377\377\377\1\376" \ ++ "\376\376\377\206\377\377\377\377\1\376\376\376\377\203\377\377\377\377" \ ++ "\2\241\241\241\377\32\32\32\377\203\0\0\0\377\5\30\35,\377FS\201\377" \ ++ "JW\205\3778Fy\377\27(c\377\205\31*e\377\7\30)d\377\33+f\377JW\205\377" \ ++ "GT\203\377HU\204\377DQ~\377&-F\377\203\0\0\0\377\4\2\2\2\377\32\32\32" \ ++ "\377vvv\377\351\351\351\377\203\377\377\377\377\1\376\376\376\377\213" \ ++ "\377\377\377\377\1\376\376\376\377\204\377\377\377\377\4\346\346\346" \ ++ "\377qqq\377\35\35\35\377\2\2\2\377\203\0\0\0\377\2\16\27""9\377\30)c" \ ++ "\377\202\31*e\377\3\30)d\377#3k\377DR\202\377\202BP\201\377\2BP\200\377" \ ++ "\40'>\377\202\0\0\0\377\1rrr\377\215\377\377\377\377\1\345\345\345\377" \ ++ "\204\0\0\0\377\3\1\1\1\377'''\377\257\257\257\377\203\377\377\377\377" \ ++ "\1\376\376\376\377\207\377\377\377\377\1\376\376\376\377\202\377\377" \ ++ "\377\377\3\355\355\355\377UUU\377\5\5\5\377\202\0\0\0\377\2\14\17\32" \ ++ "\3776Bo\377\205>>\377\203\0\0\0\377\1kkk\377\206\377\377\377\377\1\376\376\376" \ ++ "\377\214\377\377\377\377\1\376\376\376\377\211\377\377\377\377\1\205" \ ++ "\205\205\377\202\0\0\0\377\1\16\31<\377\215\31*e\377\2\30)d\377\32+f" \ ++ "\377\204(8o\377\1&6o\377\205'7o\377\1\40""1j\377\233\31*e\377\3\27)d" \ ++ "\377'7n\377GT\203\377\202IV\205\377\2HU\204\377IV\205\377\205JW\206\377" \ ++ "\2IV\206\377JW\206\377\206KX\206\377\2JW\205\377KX\206\377\205LY\207" \ ++ "\377\1LX\207\377\202LY\207\377\205LZ\207\377\4KZ\206\377LZ\207\377MZ" \ ++ "\210\377LZ\207\377\204MZ\210\377\2LY\207\377MZ\210\377\206N[\211\377" \ ++ "\5MZ\211\377N[\211\377O\\\211\377LY\205\377\34!1\377\202\0\0\0\377\3" \ ++ "\231\231\231\377\377\377\377\377\376\376\376\377\216\377\377\377\377" \ ++ "\2\371\371\371\377SSS\377\202\0\0\0\377\3\13\15\24\377DOt\377Q^\212\377" \ ++ "\207R_\213\377\4Q^\212\377P]\211\377=Gi\377\10\11\16\377\202\0\0\0\377" \ ++ "\1aaa\377\217\377\377\377\377\3\376\376\376\377\377\377\377\377\214\214" \ ++ "\214\377\202\0\0\0\377\10\35\"4\377KX\204\377N[\211\377LX\205\377\30" \ ++ "\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\215\377\377\377\377\1\314" \ ++ "\314\314\377\202\0\0\0\377\3\2\2\2\377fff\377\367\367\367\377\202\377" \ ++ "\377\377\377\1\376\376\376\377\212\377\377\377\377\202\376\376\376\377" \ ++ "\3\377\377\377\377\350\350\350\377XXX\377\203\0\0\0\377\4\36#6\377GT" \ ++ "\202\377=L}\377\26'c\377\205\31*e\377\202\30)d\377\4HV\204\377HU\204" \ ++ "\377AMw\377\31\36.\377\203\0\0\0\377\3!!!\377\177\177\177\377\354\354" \ ++ "\354\377\202\377\377\377\377\1\376\376\376\377\225\377\377\377\377\3" \ ++ "\353\353\353\377\177\177\177\377!!!\377\203\0\0\0\377\12\11\17&\377\27" \ ++ "'^\377\31*e\377\30)d\377\40""1j\377DR\202\377AO\200\377BP\201\377BP\200" \ ++ "\377\40'>\377\202\0\0\0\377\1ppp\377\215\377\377\377\377\1\340\340\340" \ ++ "\377\203\0\0\0\377\3\7\7\7\377nnn\377\363\363\363\377\202\377\377\377" \ ++ "\377\1\376\376\376\377\213\377\377\377\377\1\376\376\376\377\202\377" \ ++ "\377\377\377\2\223\223\223\377\12\12\12\377\202\0\0\0\377\2\23\30(\377" \ ++ ";J|\377\204\377\202\0\0\0\377\1ppp\377\215\377\377\377\377\1\340" \ ++ "\340\340\377\202\0\0\0\377\2\20\20\20\377\246\246\246\377\202\377\377" \ ++ "\377\377\1\376\376\376\377\216\377\377\377\377\1\376\376\376\377\202" \ ++ "\377\377\377\377\1\261\261\261\377\203\0\0\0\377\1\40)D\377\204\377\202\0\0\0\377" \ ++ "\1ppp\377\215\377\377\377\377\4\340\340\340\377\0\0\0\377\15\15\15\377" \ ++ "\262\262\262\377\202\377\377\377\377\1\376\376\376\377\220\377\377\377" \ ++ "\377\1\376\376\376\377\202\377\377\377\377\1\232\232\232\377\202\0\0" \ ++ "\0\377\2\1\1\2\3777Dr\377\203\377\202\0\0\0\377" \ ++ "\1ppp\377\215\377\377\377\377\5\337\337\337\377\6\6\6\377\237\237\237" \ ++ "\377\377\377\377\377\376\376\376\377\224\377\377\377\377\3\376\376\376" \ ++ "\377\357\357\357\377CCC\377\202\0\0\0\377\1\31\37""4\377\203\377\202\0\0\0\377\1ppp\377\215\377\377" \ ++ "\377\377\4\336\336\336\377\215\215\215\377\377\377\377\377\376\376\376" \ ++ "\377\227\377\377\377\377\5\242\242\242\377\6\6\6\377\0\0\0\377\7\11\17" \ ++ "\3778Ft\377\203\377N[\211\377LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235\235" \ ++ "\235\377\214\377\377\377\377\1\376\376\376\377\202\377\377\377\377\1" \ ++ "\376\376\376\377\230\377\377\377\377\5yyy\377\1\1\1\377\0\0\0\377\4\7" \ ++ "\22\377\25%[\377\204\31*e\377\2\27'^\377\1\3\7\377\202\0\0\0\377\1oo" \ ++ "o\377\202\377\377\377\377\1\376\376\376\377\222\377\377\377\377\202\376" \ ++ "\376\376\377\214\377\377\377\377\4\376\376\376\377\377\377\377\377\361" \ ++ "\361\361\377FFF\377\202\0\0\0\377\2\6\12\30\377\377\202\0\0\0\377\1ppp\377\215\377\377\377\377\2\367\367\367" \ ++ "\377\377\377\377\377\202\376\376\376\377\227\377\377\377\377\5\352\352" \ ++ "\352\377%%%\377\0\0\0\377\3\3\6\377(2T\377\203\377\204R_\213\377\3Q_\212\377R_\213\377" \ ++ "S_\214\377\207R_\213\377\3Q^\212\377R_\213\377\35\"2\377\202\0\0\0\377" \ ++ "\1\261\261\261\377\220\377\377\377\377\1\304\304\304\377\202\0\0\0\377" \ ++ "\7\32\36.\377MZ\211\377LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235" \ ++ "\235\235\377\246\377\377\377\377\7\376\376\376\377\377\377\377\377\346" \ ++ "\346\346\377\30\30\30\377\0\0\0\377\0\0\1\377\17\31\77\377\204\31*e\377" \ ++ "\1\11\17%\377\202\0\0\0\377\4""999\377\350\350\350\377\377\377\377\377" \ ++ "\376\376\376\377\213\377\377\377\377\202\376\376\376\377\202\377\377" \ ++ "\377\377\4\351\351\351\377\305\305\305\377\307\307\307\377\352\352\352" \ ++ "\377\221\377\377\377\377\5\304\304\304\377\23\23\23\377\0\0\0\377\0\0" \ ++ "\2\377&0N\377\203BP\201\377\1\40'>\377\202\0\0\0\377\1ppp\377\214\377" \ ++ "\377\377\377\1\376\376\376\377\202\377\377\377\377\1\376\376\376\377" \ ++ "\231\377\377\377\377\1WWW\377\202\0\0\0\377\1\34#;\377\203\377\202\0\0\0\377\1p" \ ++ "pp\377\251\377\377\377\377\5\234\234\234\377\1\1\1\377\0\0\0\377\23\30" \ ++ "(\3779Gw\377\203\377\202\0\0\0\377\1ppp\377\222\377\377\377\377\1\376\376\376\377" \ ++ "\205\377\377\377\377\1\376\376\376\377\220\377\377\377\377\5\323\323" \ ++ "\323\377\1\1\1\377\0\0\0\377\14\17\31\3776Cp\377\203\377\202\0\0\0\377\1ppp\377\220\377\377\377\377\1\376\376\376\377" \ ++ "\202\377\377\377\377\5\346\346\346\377\266\266\266\377\255\255\255\377" \ ++ "\302\302\302\377\366\366\366\377\202\377\377\377\377\1\376\376\376\377" \ ++ "\216\377\377\377\377\5\376\376\376\377\1\1\1\377\0\0\0\377\6\10\16\377" \ ++ "3@j\377\203Kw\377'/J\377\202\0\0\0\377\4\1\1\1\377\237\237\237\377\377\377" \ ++ "\377\377\376\376\376\377\212\377\377\377\377\3\376\376\376\377\377\377" \ ++ "\377\377\334\334\334\377\202\0\0\0\377\1\5\7\13\377\202BP\201\377\1\40" \ ++ "'>\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\12\376\376\376\377" \ ++ "\377\377\377\377\370\370\370\377]]]\377\24\24\24\377\16\16\16\377\14" \ ++ "\14\14\377\20\20\20\377$$$\377\243\243\243\377\221\377\377\377\377\4" \ ++ "\17\17\17\377\0\0\0\377\2\3\5\3771>g\377\203h\377\0\0\1" \ ++ "\377\0\0\0\377+++\377\340\340\340\377\216\377\377\377\377\3}}}\377\0" \ ++ "\0\0\377\330\330\330\377\214\377\377\377\377\2\355\355\355\377===\377" \ ++ "\202\0\0\0\377\2###\377\371\371\371\377\212\377\377\377\377\7\376\376" \ ++ "\376\377\377\377\377\377\245\245\245\377\2\2\2\377hhh\377\377\377\377" \ ++ "\377\376\376\376\377\215\377\377\377\377\202\0\0\0\377\6\0\1\3\377\27" \ ++ "'`\377\31*e\377)9p\3773Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370" \ ++ "\377\221\377\377\377\377\17\367\367\367\377kkk\377\27\27\27\377\12\12" \ ++ "\12\377\6\6\6\377\12\12\12\377\25\25\25\377222\377{{{\377\40\40\40\377" \ ++ "\0\0\0\377\0\1\3\377\20\33A\377\31*e\377\17\32@\377\202\0\0\0\377\1\6" \ ++ "\6\6\377\204\17\17\17\377\2\12\12\12\377\233\233\233\377\216\377\377" \ ++ "\377\377\2\367\367\367\377\4\4\4\377\207\17\17\17\377\1\7\7\7\377\202" \ ++ "\0\0\0\377\1\16\31<\377\215\31*e\377\2\30)d\377\31*e\377\204(8o\377\1" \ ++ "&6o\377\205'7o\377\1!2k\377\233\31*e\377\6\27(c\3773Bv\377HU\204\377" \ ++ "IV\205\377HU\204\377IV\205\377\206JW\206\377\2IV\206\377JW\206\377\205" \ ++ "KX\206\377\2JW\205\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377" \ ++ "\206LZ\207\377\2KZ\206\377LZ\207\377\207MZ\210\377\210N[\211\377\202" \ ++ "O\\\211\377\202\0\0\0\377\2\33\33\33\377\357\357\357\377\220\377\377" \ ++ "\377\377\1BBB\377\202\0\0\0\377\1DOt\377\205R_\213\377\202Q_\212\377" \ ++ "\206R_\213\377\4Q^\212\377R_\213\377Q^\212\3775>[\377\202\0\0\0\377\1" \ ++ "qqq\377\217\377\377\377\377\2\376\376\376\377\362\362\362\377\202\0\0" \ ++ "\0\377\7\12\14\22\377N[\211\377LX\205\377\30\34+\377\0\0\0\377\4\4\4" \ ++ "\377\235\235\235\377\220\377\377\377\377\2\242\242\242\377\7\7\7\377" \ ++ "\202\0\0\0\377\4\1\1\2\377\2\2\3\377\1\2\3\377\0\0\1\377\202\0\0\0\377" \ ++ "\1kkk\377\217\377\377\377\377\1\367\367\367\377\202\0\0\0\377\3\1\2\5" \ ++ "\377\31*e\377\16\30""9\377\202\0\0\0\377\3}}}\377\377\377\377\377\376" \ ++ "\376\376\377\215\377\377\377\377\1\6\6\6\377\202\0\0\0\377\2(1M\377C" \ ++ "Q\201\377\204CQ\200\377\2CP\177\377\32\37""2\377\202\0\0\0\377\1:::\377" \ ++ "\215\377\377\377\377\202\376\376\376\377\1&&&\377\202\0\0\0\377\3""8" \ ++ "Dn\377BP\200\377\40'>\377\202\0\0\0\377\1ppp\377\220\377\377\377\377" \ ++ "\2\352\352\352\377...\377\207\0\0\0\377\1\254\254\254\377\202\376\376" \ ++ "\376\377\216\377\377\377\377\1%%%\377\202\0\0\0\377\1""0\377\202\0\0\0\377\1ppp\377\216\377\377\377\377\3" \ ++ "\376\376\376\377\371\371\371\377ddd\377\202\0\0\0\377\4\1\1\2\377\13" \ ++ "\15\26\377\6\11\25\377\3\5\16\377\202\0\0\0\377\2\26\26\26\377\370\370" \ ++ "\370\377\217\377\377\377\377\1""222\377\202\0\0\0\377\1/;c\377\203t\377HU\204\377IV\205\377HU\204\377" \ ++ "IV\205\377\206JW\206\377\2IV\206\377JW\206\377\205KX\206\377\202JW\205" \ ++ "\377\1KX\206\377\205LY\207\377\2LX\207\377LY\207\377\206LZ\207\377\2" \ ++ "KZ\206\377LZ\207\377\207MZ\210\377\2N[\211\377MZ\210\377\206N[\211\377" \ ++ "\202O\\\211\377\4\5\6\11\377\0\0\0\377\16\16\16\377\355\355\355\377\220" \ ++ "\377\377\377\377\1UUU\377\202\0\0\0\377\1>Gi\377\216R_\213\377\3Q^\212" \ ++ "\377P]\211\377,3K\377\202\0\0\0\377\1\210\210\210\377\220\377\377\377" \ ++ "\377\1\350\350\350\377\202\0\0\0\377\7\20\23\35\377N[\211\377LX\205\377" \ ++ "\30\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2" \ ++ "\376\376\376\377\254\254\254\377\202\0\0\0\377\2\5\6\12\377BMu\377\202" \ ++ "LY\207\377\3KX\206\377HU\202\377\25\31'\377\202\0\0\0\377\1TTT\377\216" \ ++ "\377\377\377\377\2\374\374\374\377ooo\377\202\0\0\0\377\6\20\34C\377" \ ++ "\3\5\14\377\0\0\0\377\15\15\15\377\377\377\377\377\376\376\376\377\213" \ ++ "\377\377\377\377\3\376\376\376\377\377\377\377\377hhh\377\215\0\0\0\377" \ ++ "\2\13\13\13\377\254\254\254\377\215\377\377\377\377\2\376\376\376\377" \ ++ "\256\256\256\377\202\0\0\0\377\3\23\30&\377BP\200\377\40'>\377\202\0" \ ++ "\0\0\377\1ppp\377\216\377\377\377\377\3\376\376\376\377\327\327\327\377" \ ++ "\14\14\14\377\202\0\0\0\377\5#*F\3777Ds\377\35-e\377\24#V\377\4\7\21" \ ++ "\377\202\0\0\0\377\1\273\273\273\377\217\377\377\377\377\1""555\377\202" \ ++ "\0\0\0\377\1/;b\377\203[\377\213R_\213\377\6Q^\212\377R_\213\377" \ ++ "Q^\212\377P]\211\377Q^\212\377#)=\377\202\0\0\0\377\1\236\236\236\377" \ ++ "\220\377\377\377\377\1\324\324\324\377\202\0\0\0\377\7\25\31&\377N[\211" \ ++ "\377LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377" \ ++ "\377\377\377\2\373\373\373\377ggg\377\202\0\0\0\377\1$*A\377\204LY\207" \ ++ "\377\6JW\205\3772:Y\377\3\4\6\377\0\0\0\377+++\377\346\346\346\377\215" \ ++ "\377\377\377\377\2\376\376\376\377\231\231\231\377\202\0\0\0\377\1\13" \ ++ "\23.\377\202\0\0\0\377\3EEE\377\377\377\377\377\376\376\376\377\215\377" \ ++ "\377\377\377\1+++\377\216\0\0\0\377\1\213\213\213\377\216\377\377\377" \ ++ "\377\1\316\316\316\377\202\0\0\0\377\3\5\6\13\377BP\200\377\40'>\377" \ ++ "\202\0\0\0\377\1ppp\377\217\377\377\377\377\1\235\235\235\377\202\0\0" \ ++ "\0\377\6\15\20\33\377\77M~\377;J{\377\36/h\377\30)d\377\15\26""7\377" \ ++ "\202\0\0\0\377\1www\377\217\377\377\377\377\1""555\377\202\0\0\0\377" \ ++ "\1/;b\377\203h\377\202\0\0\0\377\3""444\377\374\374" \ ++ "\374\377\376\376\376\377\214\377\377\377\377\2\371\371\371\377\373\373" \ ++ "\373\377\213\377\377\377\377\3\376\376\376\377\377\377\377\377\12\12" \ ++ "\12\377\204\0\0\0\377\2///\377\341\341\341\377\214\377\377\377\377\3" \ ++ "\363\363\363\377\377\377\377\377\376\376\376\377\215\377\377\377\377" \ ++ "\11\15\15\15\377\0\0\0\377\1\2\5\377\23!P\377\30)d\377\31*e\377*9p\377" \ ++ "3Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370\377\217\377\377\377" \ ++ "\377\1\263\263\263\377\202\0\0\0\377\2\4\6\20\377\27'_\377\205\31*e\377" \ ++ "\3\26&\\\377\20\34D\377\17\32@\377\210\31*e\377\2\30)c\377\12\22,\377" \ ++ "\202\0\0\0\377\1\225\225\225\377\216\377\377\377\377\1\367\367\367\377" \ ++ "\202\0\0\0\377\2\3\6\17\377\27(`\377\225\31*e\377\2\30)d\377\31+f\377" \ ++ "\204(8o\377\1&6o\377\205'7o\377\1!1j\377\233\31*e\377\3\27(d\377(8o\377" \ ++ "GT\203\377\202IV\205\377\2HU\204\377IV\205\377\205JW\206\377\2IV\206" \ ++ "\377JW\206\377\206KX\206\377\2JW\205\377KX\206\377\205LY\207\377\1LX" \ ++ "\207\377\202LY\207\377\205LZ\207\377\2KZ\206\377LZ\207\377\206MZ\210" \ ++ "\377\2LY\207\377MZ\210\377\206N[\211\377\4MZ\211\377N[\211\377O\\\211" \ ++ "\377\21\24\37\377\202\0\0\0\377\1\346\346\346\377\220\377\377\377\377" \ ++ "\1\213\213\213\377\202\0\0\0\377\1)0G\377\202R_\213\377\1Q^\212\377\206" \ ++ "R_\213\377\1Q^\212\377\202R_\213\377\2Q^\212\377P]\211\377\202Q^\212" \ ++ "\377\1\30\34)\377\202\0\0\0\377\1\275\275\275\377\220\377\377\377\377" \ ++ "\1\272\272\272\377\202\0\0\0\377\7\34!2\377N[\211\377LX\205\377\30\34" \ ++ "+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2\370\370" \ ++ "\370\377000\377\202\0\0\0\377\1@Kq\377\204LY\207\377\6JW\205\377CNw\377" \ ++ "\7\10\15\377\0\0\0\377\30\30\30\377\307\307\307\377\216\377\377\377\377" \ ++ "\1\270\270\270\377\202\0\0\0\377\1\4\7\21\377\202\0\0\0\377\1ppp\377" \ ++ "\217\377\377\377\377\1\335\335\335\377\215\327\327\327\377\2\326\326" \ ++ "\326\377\353\353\353\377\216\377\377\377\377\6\332\332\332\377\33\33" \ ++ "\33\377\0\0\0\377\0\0\1\377BP\200\377\40'\77\377\202\0\0\0\377\1ppp\377" \ ++ "\217\377\377\377\377\1```\377\202\0\0\0\377\6$,I\377\77M~\377:Hz\377" \ ++ "\36.h\377\30)d\377\22\36H\377\202\0\0\0\377\1TTT\377\217\377\377\377" \ ++ "\377\1""555\377\202\0\0\0\377\1/;b\377\203K{\377\77M~\3778Fy\377\35-g\377\30)d\377\24" \ ++ "!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0" \ ++ "\0\377\1/;b\377\203>>\377\202\0\0\0\377\7>In\377N[\211\377LX\205\377\30" \ ++ "\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\1\364" \ ++ "\364\364\377\202\0\0\0\377\1\13\15\24\377\203LY\207\377\10KX\206\377" \ ++ "LY\207\377JW\205\377KX\206\377\21\24\37\377\0\0\0\377\3\3\3\377\244\244" \ ++ "\244\377\216\377\377\377\377\2\315\315\315\377\15\15\15\377\204\0\0\0" \ ++ "\377\1\252\252\252\377\255\377\377\377\377\2\360\360\360\377KKK\377\202" \ ++ "\0\0\0\377\2""1;_\377\")A\377\202\0\0\0\377\1ppp\377\217\377\377\377" \ ++ "\377\1\16\16\16\377\202\0\0\0\377\6@N\177\377\77M~\3776Ex\377\34-g\377" \ ++ "\30)d\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555" \ ++ "\377\202\0\0\0\377\1/;b\377\203\377\31*e\377\30" \ ++ ")d\377\33+f\377,;r\3773Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370" \ ++ "\377\216\377\377\377\377\5\270\270\270\377\7\7\7\377\0\0\0\377\5\11\25" \ ++ "\377\26%[\377\221\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377\1\225" \ ++ "\225\225\377\216\377\377\377\377\1\367\367\367\377\202\0\0\0\377\2\3" \ ++ "\6\17\377\27'_\377\225\31*e\377\2\30)d\377\33,g\377\204(8o\377\1&6o\377" \ ++ "\205'7o\377\1\40""1j\377\233\31*e\377\3\30)d\377\26(c\377DQ\201\377\202" \ ++ "IV\205\377\2HU\204\377IV\205\377\206JW\206\377\2IV\206\377JW\206\377" \ ++ "\206KX\206\377\2JW\205\377KX\206\377\205LY\207\377\2LX\207\377LY\207" \ ++ "\377\206LZ\207\377\2KZ\206\377LZ\207\377\206MZ\210\377\2LY\207\377MZ" \ ++ "\210\377\206N[\211\377\3MZ\211\377N[\211\377DOv\377\202\0\0\0\377\3," \ ++ ",,\377\377\377\377\377\376\376\376\377\216\377\377\377\377\2\371\371" \ ++ "\371\377hhh\377\202\0\0\0\377\1!&8\377\216Q^\212\377\1\27\33(\377\202" \ ++ "\0\0\0\377\2\177\177\177\377\374\374\374\377\220\377\377\377\377\12\5" \ ++ "\5\5\377\0\0\0\377\1\1\2\377FQ{\377N[\211\377LX\205\377\30\34+\377\0" \ ++ "\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\1\364\364\364" \ ++ "\377\202\0\0\0\377\1\12\14\23\377\204LY\207\377\7KX\206\377JW\205\377" \ ++ "KX\206\377\17\22\34\377\0\0\0\377\4\4\4\377\246\246\246\377\216\377\377" \ ++ "\377\377\2\316\316\316\377\16\16\16\377\204\0\0\0\377\1\251\251\251\377" \ ++ "\255\377\377\377\377\2\363\363\363\377SSS\377\202\0\0\0\377\2.8Z\377" \ ++ "\")A\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\11\11\11\11\377\0" \ ++ "\0\0\377\1\2\3\377@N\177\377\77M~\3774Cw\377\33,f\377\30)d\377\24!P\377" \ ++ "\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377" \ ++ "\1/;b\377\203L}\377\77M~\377/=s\377\31)e\377\30)d\377\24!P\377\202\0\0" \ ++ "\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377\1/;b\377" \ ++ "\203l\377\2028Fz\377\2""2@o\377\11\14\26\377\202\0" \ ++ "\0\0\377\1\320\320\320\377\227\377\377\377\377\2\371\371\371\377kkk\377" \ ++ "\202\0\0\0\377\1\15\25""4\377\202\31*e\377\5\30)d\377\34-g\377.>t\377" \ ++ "3Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370\377\216\377\377\377" \ ++ "\377\1ccc\377\202\0\0\0\377\1\13\23/\377\222\31*e\377\2\30)c\377\12\22" \ ++ ",\377\202\0\0\0\377\1\225\225\225\377\216\377\377\377\377\1\367\367\367" \ ++ "\377\202\0\0\0\377\2\3\6\17\377\27'_\377\225\31*e\377\2\30)d\377\35." \ ++ "h\377\202(8o\377\3'7o\377(8o\377&6o\377\203'7o\377\4&6o\377'7o\377\36" \ ++ "/h\377\30)d\377\233\31*e\377\6\30)d\377\37""0i\377KW\206\377HU\204\377" \ ++ "IV\205\377HU\204\377\207JW\206\377\1IV\206\377\207KX\206\377\1JW\205" \ ++ "\377\206LY\207\377\2LX\207\377LY\207\377\207LZ\207\377\1KZ\206\377\207" \ ++ "MZ\210\377\3LY\207\377N[\211\377MZ\210\377\205N[\211\377\6MZ\211\377" \ ++ "9Ce\377\3\4\6\377\0\0\0\377\21\21\21\377\354\354\354\377\216\377\377" \ ++ "\377\377\1\376\376\376\377\202\377\377\377\377\1hhh\377\203\0\0\0\377" \ ++ "\3\6\7\12\377-4M\377KW\200\377\204Q^\212\377\3JV\177\377-4M\377\6\7\13" \ ++ "\377\203\0\0\0\377\1fff\377\202\377\377\377\377\1\376\376\376\377\216" \ ++ "\377\377\377\377\5\336\336\336\377\24\24\24\377\0\0\0\377\6\7\12\377" \ ++ ";Dg\377\202N[\211\377\5LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235" \ ++ "\235\235\377\216\377\377\377\377\2\375\375\375\377\212\212\212\377\202" \ ++ "\0\0\0\377\1\20\23\35\377\202LY\207\377\203KX\206\377\5*1K\377\1\1\2" \ ++ "\377\0\0\0\377666\377\367\367\367\377\215\377\377\377\377\2\376\376\376" \ ++ "\377\257\257\257\377\202\0\0\0\377\4\11\20(\377\1\3\7\377\0\0\0\377;" \ ++ ";;\377\217\377\377\377\377\1""666\377\236\3\3\3\377\1\1\1\1\377\202\0" \ ++ "\0\0\377\2-6W\377\")B\377\202\0\0\0\377\1ppp\377\217\377\377\377\377" \ ++ "\3\10\10\10\377\0\0\0\377\2\2\3\377\202\77M~\377\1,;q\377\202\30)d\377" \ ++ "\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202" \ ++ "\0\0\0\377\1/;b\377\203h\377\7\11\17\377\0\0\0\377\27\27\27\377" \ ++ "\316\316\316\377\226\377\377\377\377\2\365\365\365\377ZZZ\377\202\0\0" \ ++ "\0\377\1\35$\77\377\2038Fz\377\2""7Fy\377\40*H\377\202\0\0\0\377\1""3" \ ++ "33\377\227\377\377\377\377\2\344\344\344\377\17\17\17\377\202\0\0\0\377" \ ++ "\203\31*e\377\5\30)d\377\35.h\3771@u\3772Av\377*6d\377\202\0\0\0\377" \ ++ "\2EEE\377\370\370\370\377\216\377\377\377\377\4UUU\377\0\0\0\377\0\0" \ ++ "\1\377\15\26""5\377\222\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377" \ ++ "\1\222\222\222\377\216\377\377\377\377\1\367\367\367\377\202\0\0\0\377" \ ++ "\2\3\6\17\377\27(`\377\202\31*e\377\6\30)b\377\26&\\\377\24!P\377\12" \ ++ "\20(\377\17\32\77\377\30)d\377\215\31*e\377\2\30)d\377\37""0i\377\203" \ ++ "(8o\377\207'7o\377\2\36.h\377\30)d\377\234\31*e\377\6\27(c\377=K|\377" \ ++ "JV\205\377IV\205\377HU\204\377IV\205\377\206JW\206\377\3IV\206\377KX" \ ++ "\206\377JW\206\377\205KX\206\377\3JW\205\377LY\207\377KX\206\377\205" \ ++ "LY\207\377\3LX\207\377LZ\207\377LY\207\377\205LZ\207\377\2KZ\206\377" \ ++ "LZ\207\377\210MZ\210\377\2N[\211\377MZ\210\377\205N[\211\377\6MZ\211" \ ++ "\377\"(=\377\0\0\1\377\0\0\0\377@@@\377\363\363\363\377\217\377\377\377" \ ++ "\377\202\376\376\376\377\3\377\377\377\377\236\236\236\377111\377\212" \ ++ "\0\0\0\377\3...\377\227\227\227\377\377\377\377\377\202\376\376\376\377" \ ++ "\217\377\377\377\377\5\362\362\362\377CCC\377\0\0\0\377\0\0\1\377$*\77" \ ++ "\377\203N[\211\377\5LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235\235" \ ++ "\235\377\217\377\377\377\377\2\372\372\372\377mmm\377\203\0\0\0\377\4" \ ++ "\23\26\"\377\"(=\377!';\377\14\16\26\377\202\0\0\0\377\2\23\23\23\377" \ ++ "\343\343\343\377\216\377\377\377\377\2\373\373\373\377```\377\202\0\0" \ ++ "\0\377\2\22\37L\377\12\21)\377\202\0\0\0\377\1\313\313\313\377\216\377" \ ++ "\377\377\377\1\266\266\266\377\203\0\0\0\377\2\22\26$\377\26\33*\377" \ ++ "\205\26\32*\377\2\25\32)\377\3\4\7\377\223\0\0\0\377\4\2\3\5\377\6\7" \ ++ "\14\377)1O\377\36$:\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\11" \ ++ "\10\10\10\377\0\0\0\377\2\2\3\377\77M~\377>K}\377'7n\377\30)d\377\31" \ ++ "*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377" \ ++ "\202\0\0\0\377\1/;b\377\202c\377" \ ++ "\27\33,\377\1\1\2\377\202\0\0\0\377\11(((\377\311\311\311\377\271\271" \ ++ "\271\377\233\233\233\377~~~\377bbb\377EEE\377(((\377\13\13\13\377\213" \ ++ "\0\0\0\377\2\35#8\377\"*C\377\202\0\0\0\377\1ppp\377\217\377\377\377" \ ++ "\377\11\10\10\10\377\0\0\0\377\2\2\3\377\77M~\377;J{\377!1j\377\30)d" \ ++ "\377\31*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""5" \ ++ "55\377\202\0\0\0\377\1/;b\377\202\377\202\0\0\0\377\1ppp\377\217\377\377" \ ++ "\377\377\11\10\10\10\377\0\0\0\377\1\2\3\377\77M~\3779Gz\377\32+e\377" \ ++ "\30)d\377\31*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377" \ ++ "\1""555\377\202\0\0\0\377\1/;b\377\202s\377JW\206\377IV\205\377HU\204\377IV\205\377" \ ++ "\206JW\206\377\2IV\206\377JW\206\377\206KX\206\377\2JW\205\377KX\206" \ ++ "\377\207LY\207\377\2LX\207\377LY\207\377\206LZ\207\377\4KZ\206\377LZ" \ ++ "\207\377MZ\210\377LZ\207\377\206MZ\210\377\3LY\207\377N[\211\377MZ\210" \ ++ "\377\205N[\211\377\2JW\203\377\23\26!\377\202\0\0\0\377\4///\377\356" \ ++ "\356\356\377\377\377\377\377\376\376\376\377\250\377\377\377\377\4\376" \ ++ "\376\376\377\377\377\377\377\365\365\365\377;;;\377\202\0\0\0\377\4\20" \ ++ "\23\35\377IU\200\377N[\211\377MZ\210\377\202N[\211\377\6MZ\210\377KW" \ ++ "\204\377\30\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\247\377\377\377" \ ++ "\377\3\376\376\376\377\377\377\377\377\273\273\273\377\202\0\0\0\377" \ ++ "\13\4\6\20\377\26&\\\377\31*e\377\30)d\377&2`\377\5\6\12\377\0\0\0\377" \ ++ "\4\4\4\377\234\234\234\377\377\377\377\377\376\376\376\377\213\377\377" \ ++ "\377\377\16\376\376\376\377\377\377\377\377\376\376\376\377\311\311\311" \ ++ "\377\204\204\204\377III\377---\377,,,\377DDD\377yyy\377\272\272\272\377" \ ++ "\367\367\367\377\377\377\377\377\376\376\376\377\213\377\377\377\377" \ ++ "\1\376\376\376\377\202\377\377\377\377\1===\377\202\0\0\0\377\1\22\26" \ ++ "#\377\202BP\200\377\1\40'>\377\202\0\0\0\377\1ppp\377\217\377\377\377" \ ++ "\377\11\10\10\10\377\0\0\0\377\1\2\3\377\77M~\3777Fy\377\27(c\377\30" \ ++ ")d\377\31*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1" \ ++ "555\377\202\0\0\0\377\1/;b\377\202\377\202\0" \ ++ "\0\0\377\1ppp\377\217\377\377\377\377\6\10\10\10\377\0\0\0\377\1\2\3" \ ++ "\377\77M~\3772Au\377\26(c\377\202\31*e\377\1\24!P\377\202\0\0\0\377\1" \ ++ "DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377\5/;b\377;J|\377" \ ++ "\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\6\10\10\10\377" \ ++ "\0\0\0\377\1\2\3\377\77M~\377,;q\377\27(c\377\202\31*e\377\1\24!P\377" \ ++ "\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377" \ ++ "\2/;b\377\377\202\0\0\0\377\1ppp\377" \ ++ "\217\377\377\377\377\6\10\10\10\377\0\0\0\377\1\2\3\377\77M~\377&6n\377" \ ++ "\27(d\377\202\31*e\377\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377" \ ++ "\377\377\1""555\377\202\0\0\0\377\4/;b\377l\377\2038Fz\377" \ ++ "\3""7Fy\3778Fz\3776Fx\377\2037Fy\377\1\5\7\14\377\202\0\0\0\377\1\341" \ ++ "\341\341\377\222\377\377\377\377\5\335\335\335\377\6\6\6\377\0\0\0\377" \ ++ "\3\6\17\377\25#V\377\205\31*e\377\4,\377\202\0\0\0\377\1ppp\377\217" \ ++ "\377\377\377\377\6\10\10\10\377\0\0\0\377\1\2\3\377\77M~\377\40""0i\377" \ ++ "\30)d\377\202\31*e\377\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377" \ ++ "\377\377\1""555\377\202\0\0\0\377\4/;b\377t\3773Bw\3772A" \ ++ "v\377*7e\377\202\0\0\0\377\2EEE\377\370\370\370\377\216\377\377\377\377" \ ++ "\4SSS\377\0\0\0\377\0\0\1\377\15\26""7\377\222\31*e\377\7\30)d\377\36" \ ++ ".h\377\30\40\77\377\0\1\2\377\0\0\0\377666\377\352\352\352\377\225\377" \ ++ "\377\377\377\1\244\244\244\377\202\0\0\0\377\1\14\24""0\377\214\31*e" \ ++ "\377\3\30)d\377\32+f\377&6n\377\203(8o\377\206'7o\377\3#4l\377\31*e\377" \ ++ "\30)d\377\236\31*e\377\7\30)d\377\34-g\377ES\202\377HV\205\377IV\205" \ ++ "\377HU\204\377IV\205\377\207JW\206\377\1IV\206\377\207KX\206\377\3JW" \ ++ "\205\377LY\207\377KX\206\377\207LY\207\377\2LZ\207\377LY\207\377\205" \ ++ "LZ\207\377\1KZ\206\377\202LZ\207\377\207MZ\210\377\4LY\207\377MZ\210" \ ++ "\377N[\211\377MZ\210\377\205N[\211\377\2JW\203\377\40%8\377\203\0\0\0" \ ++ "\377\2$$$\377\275\275\275\377\202\377\377\377\377\1\376\376\376\377\234" \ ++ "\377\377\377\377\1\376\376\376\377\202\377\377\377\377\2\275\275\275" \ ++ "\377$$$\377\203\0\0\0\377\7\36#5\377JV\202\377N[\211\377MZ\210\377N[" \ ++ "\211\377MZ\210\377LY\207\377\204MZ\210\377\5KW\204\377\30\34+\377\0\0" \ ++ "\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2\372\372\372\377" \ ++ "\260\260\260\377\223\377\377\377\377\1\376\376\376\377\202\377\377\377" \ ++ "\377\1JJJ\377\203\0\0\0\377\1\22\37K\377\203\31*e\377\2\30)d\377\77M" \ ++ "~\377\202HU\204\377\3GU\204\377CQ~\377\27\34+\377\202\0\0\0\377\5\3\3" \ ++ "\3\377ttt\377\376\376\376\377\377\377\377\377\376\376\376\377\232\377" \ ++ "\377\377\377\1\376\376\376\377\202\377\377\377\377\2\261\261\261\377" \ ++ "\22\22\22\377\203\0\0\0\377\1""6Ai\377\202BP\201\377\4BP\200\377BP\177" \ ++ "\377BP\200\377\40'>\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\6" \ ++ "\10\10\10\377\0\0\0\377\1\2\3\377\77M}\377\30*e\377\30)d\377\202\31*" \ ++ "e\377\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377" \ ++ "\202\0\0\0\377\4/;b\377>>\377\203\0\0\0\377\1\16\27""8\377\203\31*e\377\4" \ ++ "\30)d\377\37/h\377IV\205\377HU\204\377\203GU\204\377\2CP}\377\16\21\33" \ ++ "\377\203\0\0\0\377\3JJJ\377\357\357\357\377\376\376\376\377\202\377\377" \ ++ "\377\377\1\376\376\376\377\224\377\377\377\377\1\376\376\376\377\203" \ ++ "\377\377\377\377\3\366\366\366\377\206\206\206\377\4\4\4\377\202\0\0" \ ++ "\0\377\2\1\1\3\377-8^\377\203BP\201\377\4BP\200\377BP\177\377BP\200\377" \ ++ "\40'>\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\5\10\10\10\377\0" \ ++ "\0\0\377\1\2\3\377:Hz\377\26'c\377\203\31*e\377\1\24!P\377\202\0\0\0" \ ++ "\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377\4/;b\377<" \ ++ "K}\377;J|\377:I{\377\205;J|\377\2:I{\377*5Y\377\202\0\0\0\377\3\77\77" \ ++ "\77\377\377\377\377\377\376\376\376\377\217\377\377\377\377\5\323\323" \ ++ "\323\377\37\37\37\377\0\0\0\377\4\5\11\377+6_\377\2058Fz\377\1""6Fx\377" \ ++ "\2047Fy\377\2""0>k\377\4\5\11\377\202\0\0\0\377\1\365\365\365\377\221" \ ++ "\377\377\377\377\4@@@\377\0\0\0\377\0\0\2\377\16\30:\377\204\31*e\377" \ ++ "\6\30)d\377\32*e\3774Cx\3772Av\3771@u\377*7e\377\202\0\0\0\377\2EEE\377" \ ++ "\370\370\370\377\216\377\377\377\377\4SSS\377\0\0\0\377\0\0\1\377\15" \ ++ "\26""7\377\222\31*e\377\4\30)d\377!1j\377->>\377" \ ++ "\203\0\0\0\377\12\2\4\13\377\32%L\377\77M\177\377BP\201\377BP\200\377" \ ++ "BP\201\377BP\200\377BP\177\377BP\200\377\40'>\377\202\0\0\0\377\1ppp" \ ++ "\377\217\377\377\377\377\5\10\10\10\377\0\0\0\377\1\2\3\3772@u\377\27" \ ++ "(c\377\203\31*e\377\1\24!P\377\202\0\0\0\377\1EEE\377\217\377\377\377" \ ++ "\377\1""555\377\202\0\0\0\377\4/;b\377i\377\1\2\3\377\0\0\0\377\4\4\4\377\221\377\377\377\377\5" \ ++ "\247\247\247\377\6\6\6\377\0\0\0\377\10\12\22\3777Ex\377\2058Fz\377\1" \ ++ "6Fx\377\2047Fy\377\2""4Br\377\20\24#\377\202\0\0\0\377\1\244\244\244" \ ++ "\377\220\377\377\377\377\5\342\342\342\377***\377\0\0\0\377\1\2\6\377" \ ++ "\22\37L\377\204\31*e\377\6\30)d\377\34-g\3774Cx\3772Av\3771@u\377*7e" \ ++ "\377\202\0\0\0\377\2EEE\377\371\371\371\377\216\377\377\377\377\4SSS" \ ++ "\377\0\0\0\377\0\0\1\377\15\26""7\377\222\31*e\377\2\30)d\377\"2k\377" \ ++ "\202->>\377\204\0\0\0\377\3\6\13\33\377\23\40P\377+;q\377" \ ++ "\203BP\201\377\2BP\200\377BP\177\377\202BP\200\377\1\40'>\377\202\0\0" \ ++ "\0\377\1rrr\377\217\377\377\377\377\5\10\10\10\377\0\0\0\377\2\2\3\377" \ ++ "(8o\377\27)d\377\203\31*e\377\1\24!P\377\202\0\0\0\377\1EEE\377\217\377" \ ++ "\377\377\377\1""666\377\202\0\0\0\377\3/;b\377;J|\377:I{\377\206;J|\377" \ ++ "\3:I{\3774Ao\377\13\16\30\377\202\0\0\0\377\1\317\317\317\377\220\377" \ ++ "\377\377\377\1vvv\377\202\0\0\0\377\1\24\31,\377\2068Fz\377\1""6Fx\377" \ ++ "\2057Fy\377\1\34#>\377\202\0\0\0\377\1RRR\377\220\377\377\377\377\5\303" \ ++ "\303\303\377\24\24\24\377\0\0\0\377\2\4\11\377\27'_\377\204\31*e\377" \ ++ "\6\30)d\377\37""0i\3774Cx\3772Av\3771@u\377*7e\377\202\0\0\0\377\2FF" \ ++ "F\377\374\374\374\377\216\377\377\377\377\4TTT\377\0\0\0\377\0\0\1\377" \ ++ "\15\26""7\377\221\31*e\377\7\30)e\377\30)d\377$4l\377.=s\377-b\377\11\13\21\377\204\0\0\0\377" \ ++ "\7\17\17\17\377\37\37\37\377@@@\377www\377\246\246\246\377\314\314\314" \ ++ "\377\352\352\352\377\207\377\377\377\377\10\372\372\372\377\343\343\343" \ ++ "\377\305\305\305\377\241\241\241\377ttt\377===\377\40\40\40\377\21\21" \ ++ "\21\377\204\0\0\0\377\12\0\0\2\377\16\30:\377\27'^\377\32+e\3772Av\377" \ ++ "BP\201\377AO\200\377BP\201\377BP\200\377BP\177\377\202BP\200\377\1\40" \ ++ "'>\377\202\0\0\0\377\2\20\20\20\377&&&\377\216%%%\377\5\1\1\1\377\0\0" \ ++ "\0\377\2\2\3\377\37""0i\377\30)d\377\203\31*e\377\1\24!P\377\202\0\0" \ ++ "\0\377\2\12\12\12\377'''\377\215%%%\377\2'''\377\7\7\7\377\202\0\0\0" \ ++ "\377\3/;b\377;J|\377:I{\377\206;J|\377\3:I{\3777Ev\377\25\32-\377\202" \ ++ "\0\0\0\377\2\32\32\32\377&&&\377\216%%%\377\2$$$\377\16\16\16\377\202" \ ++ "\0\0\0\377\1&/S\377\2048Fz\377\3""7Fy\3778Fz\3776Fx\377\2057Fy\377\5" \ ++ "&0T\377\2\3\5\377\0\0\0\377\7\7\7\377'''\377\217%%%\377\4\32\32\32\377" \ ++ "\1\1\1\377\0\0\0\377\5\10\24\377\205\31*e\377\6\30)d\377#3l\3774Cw\377" \ ++ "2Av\3771@u\377*7e\377\202\0\0\0\377\2\12\12\12\377$$$\377\215%%%\377" \ ++ "\5'''\377\14\14\14\377\0\0\0\377\0\0\1\377\15\26""7\377\221\31*e\377" \ ++ "\202\30)d\377\6%5m\377.=s\377->>\377\206\206\206\377\274\274\274\377" \ ++ "\343\343\343\377\206\377\377\377\377\11\371\371\371\377\340\340\340\377" \ ++ "\301\301\301\377\234\234\234\377rrr\377AAA\377$$$\377\27\27\27\377\2" \ ++ "\2\2\377\202\0\0\0\377\214\31*e\377\3\30)d\377\37/i\377'7n\377\202(8" \ ++ "o\377\2'7o\377&6o\377\204'7o\377\3&6n\377\37""0i\377\30)d\377\232\31" \ ++ "*e\377\2\37""0i\377\30)d\377\205\31*e\377\3\30)d\377\34-g\377ER\202\377" \ ++ "\202IV\205\377\4HU\204\377IV\205\377JW\206\377IV\205\377\204JW\206\377" \ ++ "\1IV\206\377\202JW\206\377\206KX\206\377\1JW\205\377\202KX\206\377\207" \ ++ "LY\207\377\3LX\207\377LZ\207\377LY\207\377\206LZ\207\377\1KZ\206\377" \ ++ "\202LZ\207\377\210MZ\210\377\202LY\207\377\3MZ\210\377N[\211\377MZ\210" \ ++ "\377\207N[\211\377\4;Eh\377\22\26!\377\0\1\1\377\0\0\1\377\212\0\0\0" \ ++ "\377\5\13\13\13\377\24\24\24\377\27\27\27\377\23\23\23\377\11\11\11\377" \ ++ "\211\0\0\0\377\202\0\0\1\377\2\17\22\33\3778Bc\377\204N[\211\377\203" \ ++ "MZ\210\377\202LY\207\377\206MZ\210\377\7LZ\207\377MZ\210\377JW\203\377" \ ++ "\27\34*\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2" \ ++ "\366\366\366\377\13\13\13\377\202\0\0\0\377\1\0\0\1\377\207\0\0\0\377" \ ++ "\2\11\11\11\377\5\5\5\377\207\0\0\0\377\4\1\1\2\377\22\27*\377\27'_\377" \ ++ "\30)d\377\204\31*e\377\7\30)d\377\27(c\3777Fx\377GT\203\377HU\204\377" \ ++ "GU\204\377FU\204\377\206GU\204\377\4FT\203\377ES\202\377&.H\377\4\5\10" \ ++ "\377\213\0\0\0\377\4\6\6\6\377\13\13\13\377\11\11\11\377\3\3\3\377\213" \ ++ "\0\0\0\377\3\0\0\1\377\11\17%\377\26&[\377\202\31*e\377\2\34-g\377:H" \ ++ "{\377\203BP\201\377\2BP\200\377BP\177\377\202BP\200\377\1\40'>\377\224" \ ++ "\0\0\0\377\3\1\2\3\377\31*e\377\30)d\377\203\31*e\377\1\24!P\377\225" \ ++ "\0\0\0\377\3/;b\377;J|\377:I{\377\206;J|\377\3:I{\3779Hz\377\36&A\377" \ ++ "\226\0\0\0\377\1""7Ex\377\2058Fz\377\2""7Fy\3776Fx\377\2057Fy\377\2/" \ ++ "\377" \ ++ "\32\37/\377\23\27\"\377\16\20\30\377\11\13\20\377\5\6\12\377\3\3\5\377" \ ++ "\2\2\3\377\1\1\2\377\2\2\3\377\3\4\6\377\6\7\13\377\12\14\22\377\20\22" \ ++ "\34\377\26\32(\377\36$6\377(/G\3773;Z\377\77Jp\377\205N[\211\377\1MZ" \ ++ "\210\377\202N[\211\377\2MZ\210\377LY\207\377\212MZ\210\377\7LZ\207\377" \ ++ "KZ\206\377JW\203\377\30\34*\377\0\0\0\377\4\4\4\377\235\235\235\377\216" \ ++ "\377\377\377\377\30\366\366\366\377\13\13\13\377\0\0\0\377\3\4\6\377" \ ++ "KX\206\377GT\200\3774=_\377&-D\377\31\35.\377\20\23\35\377\11\12\20\377" \ ++ "\5\6\11\377\3\4\6\377\4\4\7\377\6\10\14\377\14\16\26\377\25\30&\377\37" \ ++ "%9\377-5R\377L}\377\27(c\377\30)d\377\205\31*e\377" \ ++ "\6\30)d\377*:p\377GT\203\377HU\204\377GU\204\377FU\204\377\205GU\204" \ ++ "\377\202FT\203\377\1ES\202\377\205FT\203\377\26" \ ++ "t\3773Bv\3771@u\3772Av\3770>q\377\"-Q\377\203#.S\377\2\".S\377\".R\377" \ ++ "\206\".S\377\3\"-S\377\37*P\377\23\37H\377\205\21\35G\377\2\21\35H\377" \ ++ "\25$W\377\221\31*e\377\5\30)d\377\33,f\377)9p\377.=s\377,;q\377\205-" \ ++ "Ip\377>Iq\377\77K" \ ++ "s\377BMw\377DP|\377GT\202\377IV\205\377HU\204\377JW\205\377&6m\377\27" \ ++ "(d\377\206\31*e\377\6\32+f\3778Gz\377IU\204\377HT\203\377GU\204\377F" \ ++ "U\204\377\206GU\204\377\2FT\203\377ES\202\377\205FT\203\377\202ES\203" \ ++ "\377\21DR\203\377DR\201\377AN|\377\77Kw\377=It\377Kw\377\32*a\377\27(c\377\211" \ ++ "\31*e\377\4\30)d\3773Bw\377CQ\201\377BP\201\377\202BP\200\377\1BP\177" \ ++ "\377\205BP\200\377\202AO\200\377\1@N\200\377\206AO\200\377\2@N\177\377" \ ++ "\77M~\377\206@N\177\377\3>L}\377@N\177\377&5m\377\216\31*e\377\3-=s\377" \ ++ "=K}\377s\377\27(d\377\30)d\377\222\31*e\377\2\30)d\377\30(d\377\2022Av\377" \ ++ "\1""1@u\377\2062Av\377\2""1Au\3770At\377\2051Au\377\2020@u\377\2*;q\377" \ ++ "\32+f\377\230\31*e\377\5\30)d\377\34,g\377+:q\377.=s\377,;q\377\205-" \ ++ "L}\377" \ ++ "\37""0i\377\30)d\377\214\31*e\377\2\33,f\3773Bv\377\205=K}\377\2t\377CQ\201\377\202BP\201\377\2BP\200\377BP\177" \ ++ "\377\206BP\200\377\2AO\200\377@N\200\377\206AO\200\377\2@N\177\377\77" \ ++ "M~\377\206@N\177\377\5>L}\377\77M~\3772Av\377\32+f\377\30)d\377\213\31" \ ++ "*e\377\2\30)d\377\37""0i\377\204=K}\377\2s\377-L~\377L}\377\204=K}\377\2t\377\37""0j\377\30)d\377\231\31*e\377\2$4l\377.=s\377\210-" \ ++ "Js\377vvv\377\33\33" \ ++ "\33\377\202\23\23\23\377\25\21\21\21\377***\377\224\225\226\377NZ\205" \ ++ "\377GU\204\377HV\204\377\217\217\217\377+++\377\21\21\21\377\23\23\23" \ ++ "\377\24\24\24\377LLL\377z\200\222\377FT\203\377\211\212\217\377<<<\377" \ ++ "\17\17\17\377\23\23\23\377\24\24\24\377XXY\377iq\216\377\204ES\203\377" \ ++ "\207DR\202\377\3@N\177\377\40""0i\377\30)d\377\211\31*e\377\17\27(c\377" \ ++ ".>s\377AO\200\377BP\201\377BP\200\377BP\201\377BP\200\377Wa\205\377i" \ ++ "ii\377\24\24\24\377\23\23\23\377\22\22\22\377222\377ux\203\377CQ\200" \ ++ "\377\205AO\200\377\2@N\177\377AO\200\377\207@N\177\377\202\77M~\377\3" \ ++ ":I{\377\36/i\377\30)d\377\214\31*e\377\2\30)d\3779Gz\377\205=K}\377\2" \ ++ "t\3772Av\3771@u\377\2042Av\377\3n" \ ++ "t\207\377PPP\377\16\16\16\377\202\23\23\23\377\2===\377ov\214\377\203" \ ++ "1Au\377\4""0@u\377-=s\377\35.h\377\30)d\377\231\31*e\377\2'6o\377.=s" \ ++ "\377\210-L~\377BP\201\377BP\200\377BP\201" \ ++ "\377BP\200\377BP\177\377Wb\206\377ccc\377\1\1\1\377\202\0\0\0\377\3#" \ ++ "##\377sw\201\377BP\200\377\204AO\200\377\4@N\177\377AO\200\377@N\177" \ ++ "\377\77M~\377\204@N\177\377\2\77M~\377@N\177\377\202\77M~\377\2.=r\377" \ ++ "\27(c\377\214\31*e\377\3\27)d\377'7o\377>L}\377\204=K}\377\202L~\377IV\205\377HU\204\377IV\205\377HU\204\377" \ ++ "IV\205\377\207JW\206\377\1IV\206\377\202JW\206\377\210KX\206\377\4JW" \ ++ "\205\377KX\206\377LY\207\377KX\206\377\207LY\207\377\4LX\207\377LY\207" \ ++ "\377LZ\207\377LY\207\377\212LZ\207\377\1KZ\206\377\202LZ\207\377\203" \ ++ "MZ\210\377\1LZ\207\377\240MZ\210\377\202LZ\207\377\202KZ\206\377\211" \ ++ "LZ\207\377\11LY\207\377LZ\207\377LY\207\377LX\207\377JU\203\377\30\34" \ ++ "*\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\4\366\366" \ ++ "\366\377\13\13\13\377\0\0\0\377\3\4\6\377\206JW\206\377\202IV\205\377" \ ++ "\1HU\204\377\202IV\205\377\4JW\206\377@Lv\377sss\377\12\12\12\377\202" \ ++ "\0\0\0\377\6\14\14\14\377sss\3771>n\377\37/g\377\203\203\203\377\36\36" \ ++ "\36\377\205\0\0\0\377\5///\377\212\215\227\377GU\204\377{\200\220\377" \ ++ "]]]\377\203\0\0\0\377\6\7\7\7\377\220\222\227\377S_\205\377FT\203\377" \ ++ "qw\213\377uz\212\377\203sx\212\377\2uz\213\377Yc\207\377\203ES\203\377" \ ++ "\2DR\202\377CQ\201\377\204DR\202\377\4IV\202\377ES\200\377\40""0h\377" \ ++ "\30)d\377\206\31*e\377\5\40""0g\377#2h\377\"2h\377\37/f\377+;q\377\203" \ ++ "BP\201\377\202BP\200\377\4BP\177\377Wb\206\377ccc\377\1\1\1\377\202\0" \ ++ "\0\0\377\3###\377sw\201\377BP\200\377\205AO\200\377\202@N\177\377\3E" \ ++ "R\177\377FS\200\377GS\200\377\203@N\177\377\203\77M~\377\2\"2k\377\30" \ ++ ")d\377\205\31*e\377\1\"1h\377\203\"2h\377\203\31*e\377\2\26(c\3772Bv" \ ++ "\377\205=K}\377\6s\377.=s\377\202-r\377+>>\377\203\0\0\0\377\7$$$\377\216\216\216\377>Jr\377\31*e\377W`}\377" \ ++ "\206\206\206\377\21\21\21\377\203\0\0\0\377\4JJJ\377xxx\377yyy\377OO" \ ++ "O\377\203\0\0\0\377\6\20\20\20\377\213\213\213\377X`}\377\30)d\377ot" \ ++ "\206\377sss\377\205\0\0\0\377\1\20\20\20\377\202\0\0\0\377\1\16\16\16" \ ++ "\377\203\0\0\0\377\6""111\377pw\215\3771Au\377;Ix\377\215\215\216\377" \ ++ "DDD\377\203\0\0\0\377\4\2\2\2\377000\377\77\77\77\377\27\27\27\377\203" \ ++ "\0\0\0\377\7\20\20\20\377rrr\377]e\200\377\31*e\377)8l\377mmm\377\14" \ ++ "\14\14\377\202\0\0\0\377\2&&&\377###\377\207\0\0\0\377\2\"\"\"\377\6" \ ++ "\6\6\377\207\0\0\0\377\2\203\203\203\377+K{\377\206\207\214\377***\377" \ ++ "\203\0\0\0\377\6WWW\377\216\216\220\377Wa\202\377bj\205\377\223\223\225" \ ++ "\377###\377\203\0\0\0\377\5```\377z~\212\377\34-f\377\201\204\221\377" \ ++ "111\377\203\0\0\0\377\6DDE\377\221\221\221\377PYz\377LVx\377\220\221" \ ++ "\223\377CCD\377\203\0\0\0\377\5;;;\377\200\203\217\377%4i\377\211\213" \ ++ "\223\377+++\377\203\0\0\0\377\5\5\5\5\377qqq\377\217\217\217\377\211" \ ++ "\211\211\377&&&\377\204\0\0\0\377\5""111\377pw\215\3771Au\377ho\206\377" \ ++ "www\377\203\0\0\0\377\6\7\7\7\377bbb\377\216\216\217\377\202\204\212" \ ++ "\377\206\206\206\377,,-\377\203\0\0\0\377\6""222\377\210\211\213\377" \ ++ "\32+e\377)8l\377mmm\377\14\14\14\377\203\0\0\0\377\5\7\7\7\377jjj\377" \ ++ "\212\212\212\377[[[\377\7\7\7\377\204\0\0\0\377\4\27\27\27\377zzz\377" \ ++ "\206\206\206\377/00\377\204\0\0\0\377\1fff\377\203,s\377\27(c\377Ya\200\377BBB\377" \ ++ "\204\0\0\0\377\3ppp\377ou\212\377PZ}\377\204S\\~\377\6Q[{\377.M}\377]f\205\377\223\224\231\377555\377\202\0\0\0\377\4\2\2\2\377" \ ++ "|||\377O[\201\377;J|\377\205:I{\377\5""5Dw\377\26'c\377\31*e\377Ya\200" \ ++ "\377BBB\377\204\0\0\0\377\2lll\377JTx\377\207\31*e\377\4\27(d\377bi\205" \ ++ "\377HHH\377\1\1\1\377\202\0\0\0\377\3>>>\377|\177\212\3778Fz\377\203" \ ++ "7Fy\377\3\77M{\377\203\203\203\377\34\34\34\377\202\0\0\0\377\17\7\7" \ ++ "\7\377mmm\377uz\212\3777Fx\377=Kz\377z~\214\377\215\215\215\377\214\214" \ ++ "\214\377}\200\210\377rv\204\377in\202\377T]{\377&5j\377\206\210\221\377" \ ++ "\30\30\30\377\203\0\0\0\377\16kkk\377\201\203\214\377\37/g\377\32+e\377" \ ++ "lr\205\377\216\216\216\377\214\214\214\377\177\201\210\377vy\205\377" \ ++ "fl\200\377QZz\377,:n\377\214\216\225\377(((\377\203\0\0\0\377\5\"\"\"" \ ++ "\377\222\222\222\377~\201\213\377\216\216\220\377nno\377\204\0\0\0\377" \ ++ "\5""111\377pw\215\3770@u\377z~\213\377```\377\203\0\0\0\377\6\25\25\25" \ ++ "\377\211\211\211\377fl\202\377ISw\377\216\216\221\377RRR\377\203\0\0" \ ++ "\0\377\6###\377\206\206\206\377\40""0g\377)8k\377mmm\377\14\14\14\377" \ ++ "\202\0\0\0\377\7\23\23\23\377wxy\377\36.g\377\31*e\377NY|\377KKK\377" \ ++ "\1\1\1\377\202\0\0\0\377\2///\377y|\207\377\202-t\377KW\206\377IV\205" \ ++ "\377HU\204\377IV\205\377HU\204\377IV\205\377JW\206\377IV\205\377\207" \ ++ "JW\206\377\1IV\206\377\202JW\206\377\2KX\206\377JW\206\377\210KX\206" \ ++ "\377\202JW\205\377\202KX\206\377\202LY\207\377\1KX\206\377\220LY\207" \ ++ "\377\207LX\207\377\205LY\207\377\207LX\207\377\220LY\207\377\2KX\206" \ ++ "\377LY\207\377\202KX\206\377\202JW\205\377\211KX\206\377\4JW\206\377" \ ++ "KX\206\377JW\206\377IV\206\377\207JW\206\377\1IV\205\377\202JW\206\377" \ ++ "\2IV\205\377HU\204\377\203IV\205\377\3CP\201\377\"2k\377\30)d\377\207" \ ++ "\31*e\377\5\30)d\377!1j\377DQ\201\377\214\216\224\377@@@\377\205\0\0" \ ++ "\0\377\2SSS\377y}\215\377\202GU\204\377\3NZ\204\377\224\225\231\377\34" \ ++ "\34\34\377\204\0\0\0\377\3\2\2\2\377bbb\377go\213\377\204ES\203\377\2" \ ++ "\210\212\217\377333\377\203\0\0\0\377\5OPP\377iq\216\377DR\202\377bj" \ ++ "\210\377ttt\377\203\0\0\0\377\3\33\33\33\377vz\207\377$3i\377\204\31" \ ++ "*e\377\2sx\207\377ooo\377\203\0\0\0\377\17\20\20\20\377sss\377\202\203" \ ++ "\210\377\201\202\210\377yyy\377666\377\37\37\37\377111\377\77\77\77\377" \ ++ "uuu\377\210\212\221\377CQ\200\377Wb\206\377ccc\377\1\1\1\377\202\0\0" \ ++ "\0\377\6###\377sw\201\377CQ\200\377FS\201\377\212\213\222\377<<<\377" \ ++ "\203\0\0\0\377\26""444\377~~~\377\201\203\211\377\204\204\207\377lll" \ ++ "\377\40\40\40\377$$$\377555\377HHH\377\215\215\215\377lq\204\377[c\177" \ ++ "\377fff\377\36\36\36\377\20\20\20\377\0\0\0\377\21\21\21\377www\377\177" \ ++ "\202\214\377dk\204\377\205\206\214\377JJJ\377\203\0\0\0\377\15uuu\377" \ ++ "jq\210\377\201\203\214\377NNN\377\26\26\26\377\12\12\12\377\0\0\0\377" \ ++ "///\377\206\206\206\377x}\216\377w|\216\377\206\207\210\377\"\"\"\377" \ ++ "\202\0\0\0\377\4\33\33\33\377\205\205\205\377DQ}\377;J|\377\204:I{\377" \ ++ "\6;J{\377(8p\377\27(d\377\31*e\377Ya\200\377BBB\377\204\0\0\0\377\2l" \ ++ "ll\377JTx\377\206\31*e\377\5\30)d\377\27(c\377fm\210\377HHH\377\1\1\1" \ ++ "\377\202\0\0\0\377\2>>>\377|\177\212\377\2047Fy\377\3;Iz\377~\202\220" \ ++ "\377OOO\377\203\0\0\0\377\16(((\377yyy\377\202\204\210\377\200\202\207" \ ++ "\377uuu\377###\377$$$\377222\377@@@\377\206\206\206\377\207\210\216\377" \ ++ "\31*e\377ms\207\377eee\377\203\0\0\0\377\16\21\21\21\377www\377\203\204" \ ++ "\207\377~\200\206\377~~~\377--.\377\40\40\40\377...\377;;;\377{{{\377" \ ++ "\203\205\216\377+:o\377z~\215\377mmm\377\204\0\0\0\377\6\"\"\"\377WW" \ ++ "W\377CCC\377\0\0\0\377$$$\377\4\4\4\377\202\0\0\0\377\6""111\377pw\215" \ ++ "\3770@u\377MY}\377\210\210\210\377\40\40\40\377\203\0\0\0\377\5)**\377" \ ++ "mmm\377ttt\377UUU\377\7\7\7\377\202\0\0\0\377\7\2\2\2\377\\\\\\\377o" \ ++ "u\207\377\31*e\377)8l\377mmm\377\14\14\14\377\202\0\0\0\377\7\23\23\23" \ ++ "\377wxy\377\36.g\377\31*e\377NY|\377KKK\377\1\1\1\377\202\0\0\0\377\2" \ ++ "///\377y|\207\377\202-m\377>Js\377\205\205\205\377" \ ++ "\34\34\34\377\203\0\0\0\377\5\30\30\30\377CCC\377LLL\377777\377\3\3\3" \ ++ "\377\202\0\0\0\377\6;;;\377\216\216\216\377KV\200\377mt\213\377mmm\377" \ ++ "\6\6\6\377\203\0\0\0\377\4)))\377HHH\377III\377$$$\377\202\0\0\0\377" \ ++ "\6\1\1\1\377]]]\377\201\204\215\377;J|\377:I{\3779Hz\377\202:I{\377\7" \ ++ "9Hz\377>>\377|\177\212\3777Fy\3776Fx\377\2037Fy\377" \ ++ "\3T^\201\377\214\215\216\377888\377\203\0\0\0\377\4\22\22\22\377222\377" \ ++ "///\377\12\12\12\377\203\0\0\0\377\7""999\377\215\215\215\377>Js\377" \ ++ "\31*e\3776Cp\377\222\223\225\377HHH\377\203\0\0\0\377\4\7\7\7\377111" \ ++ "\377222\377\20\20\20\377\203\0\0\0\377\7())\377\212\212\212\377PYy\377" \ ++ ".=s\377HS}\377\223\223\223\377000\377\206\0\0\0\377\3---\377ttt\377\2" \ ++ "\2\2\377\202\0\0\0\377\7""000\377pw\215\3770@t\3771Av\377ns\206\377v" \ ++ "vv\377\27\27\27\377\204\0\0\0\377\1\2\2\2\377\204\0\0\0\377\7III\377" \ ++ "\212\213\217\3774Ao\377\31*e\377)8l\377mmm\377\14\14\14\377\202\0\0\0" \ ++ "\377\7\23\23\23\377wxy\377\36.g\377\31*e\377NY|\377KKK\377\1\1\1\377" \ ++ "\202\0\0\0\377\2///\377y|\207\377\202->>\377\204\0\0\0\377\2kkk\377JTx\377\206\31*e\377\4\30)d\377" \ ++ "!1j\377iq\213\377CCC\377\203\0\0\0\377\4""888\377|\177\212\3777Fy\377" \ ++ "6Fx\377\2047Fy\377\4fm\207\377\214\214\214\377UUU\377\20\20\20\377\206" \ ++ "\0\0\0\377\4\30\30\30\377[[[\377\215\215\215\377LVx\377\203\31*e\377" \ ++ "\4DOu\377\221\221\221\377___\377\27\27\27\377\206\0\0\0\377\12\20\20" \ ++ "\20\377RRR\377\212\212\212\377]e~\377\30)e\3773Bw\3772Av\377io\206\377" \ ++ "\204\204\204\377222\377\204\0\0\0\377\3""9::\377\211\211\211\377uuu\377" \ ++ "\203\0\0\0\377\11+++\377ov\215\3770@u\377.\77t\377'6k\377sx\210\377\177" \ ++ "\177\177\377AAA\377\7\7\7\377\205\0\0\0\377\4#$$\377hhh\377\216\216\217" \ ++ "\377GRw\377\202\31*e\377\3)8l\377kkk\377\3\3\3\377\202\0\0\0\377\6\12" \ ++ "\12\12\377vwx\377\36.g\377\31*e\377NX|\377GGG\377\203\0\0\0\377\2)))" \ ++ "\377y|\207\377\202-L}\377" \ ++ "\202s\377GT\203\377HU\204\377\202" \ ++ "GU\204\377\1FU\204\377\207GU\204\377\2FT\203\377ES\202\377\206FT\203" \ ++ "\377\4ES\203\377FT\203\377ES\203\377DR\203\377\206ES\203\377\202DR\202" \ ++ "\377\1CQ\201\377\205DR\202\377\4CQ\201\3770\77t\377\31*e\377\30)d\377" \ ++ "\211\31*e\377\4\30)d\377!2k\377AO\200\377AP\200\377\202BP\201\377\2B" \ ++ "P\200\377BP\177\377\205BP\200\377\3AO\200\377BP\200\377@N\200\377\207" \ ++ "AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202\77M~\377\3""7Fy\377" \ ++ "\31*e\377\31*d\377\213\31*e\377\4\31*d\377\27(c\377/>t\377L}\377\36.h" \ ++ "\377\30)d\377\207\31*e\377\3\30)d\377\32*e\377/=s\377\204IV\205\377\2" \ ++ "HU\204\377IV\205\377\202JW\206\377\1IV\205\377\210JW\206\377\1IV\206" \ ++ "\377\202JW\206\377\216KX\206\377\202JW\205\377\204KX\206\377\203LY\207" \ ++ "\377\1KX\206\377\226LY\207\377\1KX\206\377\203LY\207\377\204KX\206\377" \ ++ "\203JW\205\377\213KX\206\377\2JW\206\377KX\206\377\203JW\206\377\1IV" \ ++ "\206\377\212JW\206\377\2IV\205\377HU\204\377\202IV\205\377\4HU\204\377" \ ++ "IV\205\377DR\202\377!1j\377\202\30)d\377\207\31*e\377\2\30)d\377(8o\377" \ ++ "\202HU\204\377\3HT\203\377GU\204\377FU\204\377\206GU\204\377\4FT\203" \ ++ "\377GU\204\377FT\203\377ES\202\377\207FT\203\377\2ES\203\377DR\203\377" \ ++ "\206ES\203\377\202DR\202\377\1CQ\201\377\205DR\202\377\4CQ\201\377\77" \ ++ "N\177\377\36.h\377\30)d\377\211\31*e\377\3\30)d\377\27(d\3775Dy\377\202" \ ++ "AO\200\377\2BP\200\377BP\201\377\210BP\200\377\2AO\200\377@N\200\377" \ ++ "\205AO\200\377\3@N\177\377AO\200\377\77M~\377\207@N\177\377\3>L}\377" \ ++ "AN\177\377&7n\377\215\31*e\377\4\30)d\377\33,f\3777Ey\377=J}\377\203" \ ++ "=K}\377\202t\377GT\203\377IV\205\377HU\204\377\202IV\205\377\2HU\204\377" \ ++ "IV\205\377\213JW\206\377\202IV\206\377\202JW\206\377\202KX\206\377\1" \ ++ "JW\206\377\215KX\206\377\203JW\205\377\206KX\206\377\216LY\207\377\206" \ ++ "KX\206\377\203JW\205\377\216KX\206\377\2JW\206\377KX\206\377\202JW\206" \ ++ "\377\202IV\206\377\211JW\206\377\3IV\205\377JW\206\377IV\205\377\202" \ ++ "HU\204\377\2IV\205\377HU\204\377\202IV\205\377\3BP\200\377\35-h\377\30" \ ++ ")d\377\207\31*e\377\202\30)d\377\5%5m\377IV\205\377HU\204\377HT\203\377" \ ++ "FU\204\377\207GU\204\377\4FT\203\377GU\204\377FT\203\377ES\202\377\205" \ ++ "FT\203\377\1ES\203\377\202FT\203\377\207ES\203\377\3DR\202\377ES\203" \ ++ "\377CQ\201\377\205DR\202\377\4DQ\201\377DR\202\377-=r\377\26(c\377\212" \ ++ "\31*e\377\10\30)d\377#3l\377>M~\377BP\201\377BP\200\377BP\201\377BP\200" \ ++ "\377BP\177\377\207BP\200\377\206AO\200\377\3@N\177\377AO\200\377\77M" \ ++ "~\377\207@N\177\377\202\77M~\377\3:I{\377\36.h\377\30)d\377\214\31*e" \ ++ "\377\3\30)d\377$4l\377;I{\377\205=K}\377\1;K}\377\207L}\377\77" \ ++ "M~\3770\77t\377\31*e\377\30)d\377\215\31*e\377\3.=s\377=K}\377s\377-L~\377JW\206\377\203IV\205\377\1HU\204\377\202IV\205\377\2J" \ ++ "W\206\377IV\205\377\211JW\206\377\202IV\206\377\202JW\206\377\202KX\206" \ ++ "\377\1JW\206\377\222KX\206\377\220JW\205\377\225KX\206\377\202JW\206" \ ++ "\377\202IV\206\377\213JW\206\377\202IV\205\377\1HU\204\377\202IV\205" \ ++ "\377\1HU\204\377\202IV\205\377\3""2Av\377\33+f\377\30)d\377\210\31*e" \ ++ "\377\7\30)d\377'7n\377DR\202\377HU\204\377HT\203\377GU\204\377FU\204" \ ++ "\377\210GU\204\377\2FT\203\377ES\202\377\210FT\203\377\2ES\203\377DR" \ ++ "\203\377\207ES\203\377\2DR\202\377CQ\201\377\207DR\202\377\2\40""1j\377" \ ++ "\30)d\377\212\31*e\377\10\30)d\377!1j\377AO\200\377BP\201\377AO\200\377" \ ++ "BP\201\377BP\200\377BP\177\377\206BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\204AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\206@N\177\377" \ ++ "\202\77M~\377\4=K|\377%4l\377\30)d\377\31*d\377\214\31*e\377\4\35-g\377" \ ++ "8Fy\377=K}\377L~\377\205=K}\377\1;K}\377\207L}\377\77M~\377)9p\377\27(c\377\214\31*e\377\202\30)" \ ++ "d\377\1""3Bv\377\205=K}\377\210L~\377=K|\377\202" \ ++ "=K}\377\4s\377\33+f\377\224\31*e\377\3\30)d\377\35.h\3771@v\377\2102Av\377" \ ++ "\2101Au\377\4""0@t\377/\77t\377\35-g\377\30)d\377\230\31*e\377\5\30)" \ ++ "d\377\35-g\377/>t\377-t\377GT\203\377HU\204\377HT\203\377\202GU\204\377\1FU\204\377\206" \ ++ "GU\204\377\4FT\203\377GU\204\377FT\203\377ES\202\377\206FT\203\377\4" \ ++ "ES\203\377FT\203\377ES\203\377DR\203\377\206ES\203\377\3DR\202\377ES" \ ++ "\203\377CQ\201\377\205DR\202\377\5CQ\201\377DR\202\3777Fy\377\31*d\377" \ ++ "\30)d\377\212\31*e\377\7\27(c\377.>s\377BP\201\377AO\200\377BP\200\377" \ ++ "BP\201\377BP\177\377\206BP\200\377\3AO\200\377BP\200\377@N\200\377\207" \ ++ "AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202\77M~\377\3@N\177\377" \ ++ "):p\377\27(d\377\215\31*e\377\4\26(c\377/>t\377=K}\377t\377\202\30" \ ++ ")d\377\230\31*e\377\5\30)d\377#2k\377.=s\377-L}\377@N~\377*:q\377\215" \ ++ "\31*e\377\4\30)d\377\27(d\377*;q\377r\377\202\30)d\377\223\31*e\377\5\30)d\377\34-g\377" \ ++ "4Cw\3772Av\3771@u\377\2062Av\377\2""1Au\3770At\377\2041Au\377\2""0@u" \ ++ "\3771Au\377\2020@u\377\2\32+f\377\30)d\377\230\31*e\377\5\30)d\377\35" \ ++ ".h\377.=s\377-L}\377\77M~\377.>s\377\31*e\377\30)d\377" \ ++ "\214\31*e\377\3\30)d\377%5m\377;J|\377\205=K}\377\2K}\377" \ ++ "\"2k\377\31*e\377\202\30)d\377\211\31*e\377\5\30)d\377\31*e\3779Gy\377" \ ++ "GT\203\377HU\204\377\202HT\203\377\2GU\204\377FU\204\377\207GU\204\377" \ ++ "\4FT\203\377GU\204\377FT\203\377ES\202\377\210FT\203\377\1ES\203\377" \ ++ "\202DR\203\377\206ES\203\377\4DR\202\377ES\203\377DR\202\377CQ\201\377" \ ++ "\205DR\202\377\3CQ\201\377AO\200\377%5m\377\202\30)d\377\212\31*e\377" \ ++ "\3\26'c\377/>t\377CP\201\377\203BP\201\377\2BP\200\377BP\177\377\206" \ ++ "BP\200\377\1AO\200\377\202@N\200\377\206AO\200\377\1@N\177\377\202\77" \ ++ "M~\377\206@N\177\377\6\77M~\377>L}\377;J|\377!1j\377\30)d\377\31*d\377" \ ++ "\214\31*e\377\2\32+f\3770\77u\377\204=K}\377\3L}\377\36.h\377" \ ++ "\30)d\377\215\31*e\377\4\30)d\377.=s\377>L}\377s\377\33,f\377\231\31*e\377\5\30)d\377\36.h\377,;r\377-r\377\30)d\377\224\31*e\377\5\30)d\377\33,g\377/\77t\3772Av\377" \ ++ "1@u\377\2062Av\377\2""1Au\3770At\377\2051Au\377\5""0@u\3771At\3770@u" \ ++ "\377$4m\377\30)d\377\230\31*e\377\6\30)d\377\31*e\377&5m\377.=s\377-" \ ++ "L}\377@N~\377)9p\377\216\31*e\377\4\30)d\377\34.g\377=K}\377<" \ ++ "J|\377\204=K}\377\2t\377\37""0i\377\30)d\377\230\31*e\377\5\30)d\377\32+f\377" \ ++ ")8p\377.=s\377,;q\377\205-L}\377\77M~\3778Gy\377\34-g\377\30)d\377\214\31*e\377\4\30)d\377" \ ++ "\27(d\377/>t\377L~\377-L~\3773Bw\377)9p\377\"2k\377\34,f\377\202\27" \ ++ "(d\377\1\30)d\377\215\31*e\377\10\30)d\377\26'b\377\40""0j\3776Dx\377" \ ++ "DQ\201\377IV\204\377HU\204\377HT\204\377\202GU\204\377\1FU\204\377\210" \ ++ "GU\204\377\1FT\203\377\202GU\204\377\2FT\203\377ES\202\377\207FT\203" \ ++ "\377\2ES\203\377FT\203\377\202ES\203\377\1DR\203\377\210ES\203\377\202" \ ++ "DR\202\377\1CQ\201\377\205DR\202\377\5CQ\201\377FT\203\3773Bv\377\31" \ ++ "*e\377\30)d\377\213\31*e\377\4\27(c\377*9p\377BP\201\377AO\200\377\202" \ ++ "BP\201\377\2BP\200\377BP\177\377\206BP\200\377\203AO\200\377\1@N\200" \ ++ "\377\206AO\200\377\202@N\177\377\1\77M~\377\206@N\177\377\202\77M~\377" \ ++ "\2>L}\377)9p\377\202\30)d\377\214\31*e\377\3\30)d\377\37""0i\3779Hz\377" \ ++ "\204=K}\377\202t\3776Ex\377=K}\377BP\200\377\202ER\202\377\1FS\202\377" \ ++ "\211FS\203\377\11ES\202\377ER\202\377DR\202\377@N\177\377:H{\3774Bw\377" \ ++ "+;r\377#3k\377\32+f\377\202\27(c\377\203\30)d\377\220\31*e\377\202\30" \ ++ ")d\377\4\31*e\377\34-g\3770\77t\377GT\203\377\204HU\204\377\2GU\204\377" \ ++ "FU\204\377\211GU\204\377\1FT\203\377\202GU\204\377\2FT\203\377ES\202" \ ++ "\377\210FT\203\377\4ES\203\377FT\203\377ES\203\377DR\203\377\207ES\203" \ ++ "\377\4DR\202\377ES\203\377DR\202\377CQ\201\377\206DR\202\377\5CQ\201" \ ++ "\377DR\202\377;J|\377\35.h\377\30)d\377\213\31*e\377\5\30)d\377\33,f" \ ++ "\3776Ey\377BP\201\377AO\200\377\202BP\201\377\2BP\200\377BP\177\377\205" \ ++ "BP\200\377\4AO\200\377BP\200\377AO\200\377@N\200\377\207AO\200\377\2" \ ++ "@N\177\377\77M~\377\207@N\177\377\5\77M~\377>L}\377\77L~\377&5m\377\27" \ ++ "(d\377\215\31*e\377\3\30)d\377\36.h\3779Gz\377\205=K}\377\2M~\377!2j\377\30)d\377\214\31*e\377\5\30)d\377/>t\377CQ\202\377AO\200" \ ++ "\377BP\201\377\202BP\200\377\1BP\177\377\205BP\200\377\4AO\200\377BP" \ ++ "\200\377AO\200\377@N\200\377\206AO\200\377\3@N\177\377AO\200\377\77M" \ ++ "~\377\206@N\177\377\203\77M~\377\4@N~\3774Cw\377\27(c\377\31)e\377\215" \ ++ "\31*e\377\4\30)d\377,:q\377>L~\377s\377\202\30)d\377\225\31*e\377\2,L}\377@N\177\377)8o\377\31)d\377\216\31*e\377\4\26" \ ++ "'c\3772Av\377=K}\377L}\377\77M~\3776Ex\377" \ ++ "\34-g\377\30)d\377\214\31*e\377\5\31*d\377\30)d\377\"2k\377=K}\377L}\377=K}\377&6m\377\30)d\377\31)e\377\214\31*e\377\4\30)d\377\31*e" \ ++ "\3774Cw\377L}\377\33+g\377\30)d\377\216" \ ++ "\31*e\377\2\33,f\3775Cw\377\204=K}\377\4t\3772Av\3771@u\377\2062Av\377\2""1Au\3770At\377\2061Au\377\2020@u\377" \ ++ "\2*:q\377\32+f\377\231\31*e\377\4\30)d\377\32+f\377+:q\377-K}\377GT\203\377JW\205\377IV\204\377\202" \ ++ "HU\204\377\1GT\203\377\202HU\204\377\204GU\204\377\203FU\204\377\217" \ ++ "GU\204\377\202FT\203\377\202ES\202\377\211FT\203\377\1ES\203\377\202" \ ++ "FT\203\377\2ES\203\377DR\203\377\210ES\203\377\1DR\202\377\202ES\203" \ ++ "\377\1CQ\201\377\207DR\202\377\5CQ\201\377DR\202\377@N\177\377\"3k\377" \ ++ "\30)d\377\214\31*e\377\202\30)d\377\7,;r\377BP\201\377AO\200\377BP\200" \ ++ "\377BP\201\377BP\200\377BP\177\377\210BP\200\377\2AO\200\377@N\200\377" \ ++ "\210AO\200\377\1\77M~\377\206@N\177\377\7\77M~\377@N\177\377\77M~\377" \ ++ ">L}\377@N~\377%5m\377\30)d\377\216\31*e\377\4\30)d\377&7n\377>M~\377" \ ++ "=J|\377\202=K}\377\3L}\377AO\177\377" \ ++ "ER\202\377IU\204\377KW\206\377JW\205\377JV\205\377IV\204\377\202HU\204" \ ++ "\377\1GT\203\377\203HU\204\377\204GU\204\377\203FU\204\377\216GU\204" \ ++ "\377\2FT\203\377GU\204\377\203FT\203\377\1ES\202\377\212FT\203\377\2" \ ++ "ES\203\377FT\203\377\202ES\203\377\1DR\203\377\212ES\203\377\202DR\202" \ ++ "\377\1CQ\201\377\206DR\202\377\6CQ\201\377DR\202\377>L~\377$4l\377\27" \ ++ ")d\377\30)d\377\214\31*e\377\10\30)d\377'7n\377@N\177\377BP\201\377B" \ ++ "P\200\377BP\201\377BP\200\377BP\177\377\207BP\200\377\202AO\200\377\1" \ ++ "@N\200\377\206AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\207" \ ++ "@N\177\377\5\77M~\377>L}\377@N~\3771@u\377\30)d\377\216\31*e\377\5\30" \ ++ ")d\377\34,g\377:I{\377=K}\377t\377" \ ++ "\37""0i\377\30)d\377\230\31*e\377\202\30)d\377\4$4m\377.=s\377-L}\377\77M~\3779Hz\377\36.h\377\30*e\377\215\31*e\377\5\30*e\377" \ ++ "\27'c\3772@u\377>L}\377L}\377\1(7o\377\202\30)d\377\215\31*e\377" \ ++ "\3\27(d\377$5m\377L}\377\77M~\3774Bv\377\27" \ ++ ")d\377\30)d\377\215\31*e\377\3\30)d\377\33,f\3776Ey\377\204=K}\377\4" \ ++ "s\377\210-" \ ++ "L~\377BP\201\377AO\200\377" \ ++ "BP\200\377BP\201\377BP\200\377BP\177\377\210BP\200\377\2AO\200\377@N" \ ++ "\200\377\206AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\206@" \ ++ "N\177\377\204\77M~\377\3;I{\377\34,g\377\30)d\377\216\31*e\377\3\31*" \ ++ "d\377*9p\377L~\377\40""1j\377\31)e\377\30)d\377\215\31*e\377\3" \ ++ "\30)d\377\37""0i\377@N\200\377\202BP\201\377\3AO\200\377BP\201\377BP" \ ++ "\200\377\202BP\177\377\206BP\200\377\4AO\200\377BP\200\377AO\200\377" \ ++ "@N\200\377\207AO\200\377\1@N\177\377\202\77M~\377\207@N\177\377\6\77" \ ++ "M~\377>L}\377@N~\377)9p\377\31*e\377\30*e\377\216\31*e\377\4\30)d\377" \ ++ "2Av\377=K}\377=K|\377\204=K}\377\2L}\377@N~\377$5m\377\27(d\377\216\31*e\377\5\30)d\377\31+e\377" \ ++ "3Bv\377=K}\377s\377\32+f\377\225\31" \ ++ "*e\377\5\30)d\377\35-g\3770\77u\3773Bw\3771@u\377\2062Av\377\2""1Au\377" \ ++ "0At\377\2061Au\377\2020@u\377\2-=s\377\33,f\377\232\31*e\377\5\30)d\377" \ ++ "\"3k\377.=s\377-L}\377AN\177\377*9p\377\202\30)d\377\216\31*e\377\3\30)d\377(" \ ++ "8o\377L}\377\77M~\377" \ ++ "2Au\377\30)d\377\217\31*e\377\5\30)d\377\36/h\3779Hz\377=K}\377L~\377\212" \ ++ "DR\202\377\202CQ\201\377\1DR\202\377\202ES\203\377\1DR\202\377\214ES" \ ++ "\203\377\202DR\203\377\203ES\203\377\203FT\203\377\1ES\203\377\300FT" \ ++ "\203\377\203ES\203\377\202DR\203\377\214ES\203\377\1DR\202\377\202ES" \ ++ "\203\377\202DR\202\377\1CQ\201\377\210DR\202\377\6CQ\201\377DR\202\377" \ ++ "CQ\202\3776Ex\377\37""0i\377\27(d\377\217\31*e\377\3\30)d\377\33,f\377" \ ++ "2Av\377\202BP\201\377\2BP\200\377BP\201\377\202BP\200\377\1BP\177\377" \ ++ "\210BP\200\377\202AO\200\377\1@N\200\377\210AO\200\377\2@N\177\377\77" \ ++ "M~\377\206@N\177\377\10\77M~\377@N\177\377\77M~\377>L}\377\77M~\3777" \ ++ "Fy\377\34-g\377\30)d\377\216\31*e\377\5\30)d\377\31*e\3773Bv\377>L}\377" \ ++ "L}\377" \ ++ "L}\377L}\377\2@N~\377$4l\377\202\30)d\377\216\31*e\377\5\27(d\377$5l\377<" \ ++ "J|\377=K}\377M~\377$5m\377\202\30)d\377\217\31*e\377\4\30)" \ ++ "d\377\31*e\377(8n\377@N\200\377\202BP\201\377\4BP\200\377BP\201\377B" \ ++ "P\200\377BP\177\377\207BP\200\377\1AO\200\377\202BP\200\377\1@N\200\377" \ ++ "\212AO\200\377\2@N\177\377\77M~\377\206@N\177\377\7\77M~\377@N\177\377" \ ++ "\77M~\377\77M}\377\77M~\377*:p\377\27(c\377\217\31*e\377\3\30)d\377\35" \ ++ ".g\3778Gy\377\206=K}\377\2s\377" \ ++ "\210-L~\377.>s\377\31+e\377\27(c\377\30)d\377\217\31*e\377\3\27)d\377" \ ++ "\33,f\377.=s\377\202BP\201\377\1AO\200\377\202BP\201\377\2BP\200\377" \ ++ "BP\177\377\211BP\200\377\202AO\200\377\1@N\200\377\207AO\200\377\203" \ ++ "@N\177\377\1\77M~\377\206@N\177\377\7\77M~\377@N\177\377\77M~\377>L}" \ ++ "\377\77M~\377.>s\377\27(d\377\221\31*e\377\1""0\77t\377\205=K}\377\202" \ ++ "L}\377" \ ++ "\77M~\3773Av\377\32+f\377\30)d\377\217\31*e\377\2\30)d\377(7o\377\202" \ ++ "=K}\377\1L~\377\202BP\201\377\4AO\200\377BP\200\377BP\201\377" \ ++ "BP\200\377\202BP\177\377\207BP\200\377\4AO\200\377BP\200\377AO\200\377" \ ++ "@N\200\377\207AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\210" \ ++ "@N\177\377\5\77M~\377>L}\377\77M~\3778Fy\377\33,f\377\202\30)d\377\216" \ ++ "\31*e\377\2\30)d\377\40""0i\377\202=K}\377\1t\3772Av\3771@u\377\2062Av\377\1""1Au" \ ++ "\377\2020At\377\2061Au\377\4""0@t\3771Au\377\"3k\377\30)d\377\232\31" \ ++ "*e\377\5\30)d\377&5m\377.=s\377-L}\377\77M~\377;J{\377\34,g\377\30)d\377\217\31*e\377\3\30)d\377" \ ++ "\33,g\377;H{\377\204=K}\377\4s\377\33,f\377\232\31*e\377\6\30" \ ++ ")d\377\31*e\377-s\377L}\377\77M~\377:H{\377\36/h\377\30)d\377\217\31*e\377\5\30" \ ++ ")d\377\32+f\3773Bw\377=K}\377L}\377\77M~\377" \ ++ ";I{\377!1j\377\30)d\377\221\31*e\377\1,;r\377\205=K}\377\203t\377\40""0j\377\30)d\377\231\31" \ ++ "*e\377\202\30)d\377\4)9p\377.=r\377-L}\377\2=K|\377#3k\377\202\30)d\377\217\31*e\377\2\30)d\377%5m\377\202" \ ++ "=K}\377\1s\377\32+f\377\202" \ ++ "\30)d\377\222\31*e\377\202\30)d\377\6\32+e\377,L}\377\77M~\377>L}\377" \ ++ "&6m\377\27(c\377\217\31*e\377\3\30)e\377\30)d\377\36/i\377\202=K}\377" \ ++ "\1t\377:I{\377BP\200\377ES\202" \ ++ "\377DR\202\377CQ\201\377\217DR\202\377\204CQ\201\377\204DR\202\377\232" \ ++ "ES\203\377\1DR\202\377\207ES\203\377\205DR\202\377\204CQ\201\377\216" \ ++ "DR\202\377\1CQ\201\377\202DR\202\377\6ES\202\377\77M~\3776Ex\377(8o\377" \ ++ "\31*e\377\26'c\377\202\30)d\377\222\31*e\377\202\30)d\377\3$4l\3778F" \ ++ "z\377CQ\202\377\202BP\201\377\2BP\200\377BP\201\377\202BP\200\377\1B" \ ++ "P\177\377\210BP\200\377\2AO\200\377BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\207AO\200\377\3@N\177\377AO\200\377@N\177\377\202\77M~\377\206@N\177" \ ++ "\377\10\77M~\377@N\177\377\77M~\377>L}\377\77M~\377=K|\377&6m\377\26" \ ++ "'c\377\220\31*e\377\5\27)d\377\36/h\3779H{\377=K}\377t\377\32" \ ++ "*e\377\30)d\377\231\31*e\377\5\30)d\377\33+f\377)9o\377.=s\377,;q\377" \ ++ "\207-L~\377GT\204\377ES\202" \ ++ "\377DR\202\377CQ\201\377\220DR\202\377\204CQ\201\377\207DR\202\377\224" \ ++ "ES\203\377\210DR\202\377\205CQ\201\377\217DR\202\377\12CQ\201\377DR\202" \ ++ "\377FT\203\377DR\202\3777Gy\377*9p\377\40""1j\377\31*e\377\27(d\377\30" \ ++ ")d\377\223\31*e\377\10\30)d\377\26(c\377\37""0i\3773Bw\377@N\177\377" \ ++ "CQ\201\377BP\201\377AO\200\377\202BP\201\377\1BP\200\377\202BP\177\377" \ ++ "\210BP\200\377\2AO\200\377BP\200\377\202AO\200\377\1@N\200\377\207AO" \ ++ "\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\207@N\177\377\10\77" \ ++ "M~\377@N\177\377\77M~\377>L}\377\77M~\377=K|\377%5m\377\30)d\377\220" \ ++ "\31*e\377\5\30)d\377\34-g\3775Dx\377=K}\377M~\377\202BP\201\377\2AO\200\377BP\201\377\204BP\200\377" \ ++ "\1BP\177\377\210BP\200\377\3AO\200\377BP\200\377AO\200\377\202@N\200" \ ++ "\377\207AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\211@N\177" \ ++ "\377\1\77M~\377\202>L}\377\2=L}\377&6m\377\202\30)d\377\220\31*e\377" \ ++ "\2\32+e\3770@t\377\205=K}\377\202M~\3771@t\377\40""0i\377\26'c\377\202\30)d\377" \ ++ "\225\31*e\377\202\30)d\377\10\31*e\377\"2k\377;J|\377CQ\202\377BP\201" \ ++ "\377AO\200\377BP\200\377BP\201\377\202BP\200\377\1BP\177\377\211BP\200" \ ++ "\377\2AO\200\377BP\200\377\202AO\200\377\1@N\200\377\210AO\200\377\4" \ ++ "@N\177\377AO\200\377@N\177\377\77M~\377\207@N\177\377\10\77M~\377@N\177" \ ++ "\377\77M~\377>L}\377\77M~\377=L}\377&7n\377\27(c\377\220\31*e\377\5\30" \ ++ ")d\377\31*e\377+:q\377\77L~\377L~\377" \ ++ "*:q\377\35.h\377\27)d\377\30)d\377\226\31*e\377\12\30)d\377\27(d\377" \ ++ "\26'c\377\33,f\377'7n\3772Au\3779H{\377\77M~\377DR\202\377ES\202\377" \ ++ "\203DR\202\377\1CQ\201\377\266DR\202\377\12ES\202\377ES\203\377BP\200" \ ++ "\377L}\377\77M~\377L~\3775Dw\377+;q\377$4l\377\36/i\377\30*d\377\27(d\377\202\30)d\377" \ ++ "\227\31*e\377\11\30)d\377\26'c\377\"2k\3774Cw\377\77M\177\377CP\201\377" \ ++ "BP\201\377AO\201\377BP\200\377\202BP\201\377\202BP\200\377\1BP\177\377" \ ++ "\213BP\200\377\2AO\200\377@N\200\377\210AO\200\377\2@N\177\377AO\200" \ ++ "\377\202@N\177\377\1\77M~\377\207@N\177\377\10\77M~\377@N\177\377\77" \ ++ "M~\377>L}\377\77M~\377;I{\377#3k\377\30)d\377\220\31*e\377\6\30)d\377" \ ++ "\27(d\377(9o\377M~\377):p\377\203\30)d\377\227\31*e\377\1\30)e\377\203\30" \ ++ ")d\377\11\31*e\377\32+f\377\34,g\377!2k\377-;r\3777Fy\377AO\200\377E" \ ++ "S\203\377ES\202\377\203DR\202\377\1CQ\201\377\243DR\202\377\1CQ\201\377" \ ++ "\202DR\202\377\1ER\202\377\202ES\203\377\7=L~\3772Bv\377'7o\377\35.g" \ ++ "\377\33,f\377\32+e\377\31*e\377\204\30)d\377\227\31*e\377\5\30)d\377" \ ++ "\27(d\377\35.h\3775Dx\377\77N\177\377\202BP\201\377\202AO\200\377\202" \ ++ "BP\201\377\202BP\200\377\202BP\177\377\211BP\200\377\204AO\200\377\1" \ ++ "@N\200\377\211AO\200\377\1@N\177\377\202\77M~\377\211@N\177\377\5\77" \ ++ "M~\377>L}\377\77M~\377t\377\37""0i\377\30)d\377\232\31*e\377\5\30)d\377!1j\377" \ ++ ".=s\377-s\3777Fy\377\77M~" \ ++ "\377\202AO\200\377\3BP\200\377BQ\201\377CQ\201\377\232DR\202\377\202" \ ++ "CQ\201\377\13BP\201\377BP\200\377AO\200\377@O\177\377L}\377\77M~\377t\3773Bv\3776Ex\3778Fy\3779H{\377;I|\377L}\377\77M~" \ ++ "\377\77N\177\377@N\177\377\203AO\200\377\1BO\200\377\202AO\200\377\23" \ ++ "@O\200\377@N\177\377\77M\177\377>M~\377=K}\377L}" \ ++ "\377\77M~\3776Ex\377\35-g\377\30)d\377\221\31*e\377\5\27(d\377!1j\377" \ ++ ":H{\377=K}\377L}\377\77M~\3772Au\377\34" \ ++ "-g\377\30)d\377\221\31*e\377\5\27(c\377!1j\3779Gz\377=K}\377L}\377\3\77M~\3770\77t\377\31*e\377\202" \ ++ "\30)d\377\220\31*e\377\5\30)d\377\40""0i\3778Fz\377=K}\377L}\377\77M~\377>L~\377,;p\377\26'c\377\222\31*e\377" \ ++ "\5\30)d\377\36.h\3777Fy\377=K}\377s\377" \ ++ "\210-L}\377\77" \ ++ "M~\377;I|\377&5m\377\27(d\377\222\31*e\377\5\27(d\377\36/i\3777Ey\377" \ ++ ">L}\377s\377\27(d\377\30)d\377\225" \ ++ "\31*e\377\5\30)d\377\31*e\377*9p\3773Bw\3771@u\377\2062Av\377\3""1Au" \ ++ "\3772Av\3770At\377\2061Au\377\2030@u\377\2\37/i\377\30)d\377\232\31*" \ ++ "e\377\4\30*d\377\31*e\377*:q\377.=s\377\210-L~\377CQ\201\377" \ ++ "\202BP\201\377\3AO\200\377BP\201\377BP\200\377\202BP\201\377\203BP\200" \ ++ "\377\1BP\177\377\213BP\200\377\2AO\200\377BP\200\377\202AO\200\377\1" \ ++ "@N\200\377\211AO\200\377\1@N\177\377\202AO\200\377\1@N\177\377\202\77" \ ++ "M~\377\210@N\177\377\203\77M~\377\4>L}\377@M~\3778Gy\377\40""1j\377\202" \ ++ "\30)d\377\221\31*e\377\5\27(c\377\40""1j\3777Fy\377=K}\377t\377\2078Fz\377\2107Fy\377\3""6Ex\3777Fy\3775Dw\377" \ ++ "\2066Ex\377\3""5Dw\377\34-g\377\30)d\377\227\31*e\377\1\37/i\377\202" \ ++ "2Av\377\1""1@u\377\2052Av\377\4""1Au\3772Av\3771Au\3770At\377\2051Au" \ ++ "\377\5""0@u\3771At\3770@u\377*9p\377\32+e\377\233\31*e\377\3\30)d\377" \ ++ "\40""0i\377/=s\377\207-L}\377@N\177\3774Bv\377\32+f\377\202\30)d\377\221\31*e\377\5\30" \ ++ ")d\377\40""0j\3778Gz\377=K}\377L}\377\77M~\377>L}\377" \ ++ ",;r\377\30)d\377\222\31*e\377\202\30)d\377\4\37""0i\3779Gz\377=K}\377" \ ++ "s\377\33,f\377\227\31*e\377\5\30)d\377\40""0j\377" \ ++ "4Cx\3772Av\3771@u\377\2072Av\377\2101Au\377\5""0@u\377/\77u\377+;q\377" \ ++ "\32*e\377\30)d\377\232\31*e\377\5\30)d\377\37""0j\377.=s\377-L}\377\77M~\377:H{\377&6m\377\202" \ ++ "\30)d\377\221\31*e\377\6\30)d\377\27)d\377\"2k\377:H{\377=K}\377L~\377\202CQ\201\377\202BP\201\377\1AO\200\377\202BP\201\377\1BP\200" \ ++ "\377\202BP\201\377\203BP\200\377\203BP\177\377\214BP\200\377\2AO\200" \ ++ "\377BP\200\377\202AO\200\377\202@N\200\377\212AO\200\377\2@N\177\377" \ ++ "AO\200\377\202@N\177\377\1\77M~\377\211@N\177\377\2\77M~\377@N\177\377" \ ++ "\202\77M~\377\4\77M}\377AN\177\3773Bv\377\37/i\377\202\30)d\377\221\31" \ ++ "*e\377\6\30)d\377\27(d\377&6m\377:H{\377=K}\377L~\3778Fz\377" \ ++ "->s\377%4m\377\33,g\377\27(c\377\27(d\377\27)d\377\203\30)d\377\243\31" \ ++ "*e\377\203\30)d\377\12\27(d\377\27(c\377\30)e\377\37""0i\377)9p\3773" \ ++ "Av\377L}\377\202\77M~\377\2+:q\377\32+f\377\202\30)d\377\222" \ ++ "\31*e\377\5\30)d\377'6n\377;I{\377=K}\377" \ ++ "K}\377=K}\377t\377+;q\377" \ ++ "(8o\377&6n\377%5m\377$4l\377#3k\377\"2k\377!1j\377\40""1j\377\40""0j" \ ++ "\377\204\37""0i\377\20\40""0i\377\40""0j\377\40""1j\377!1j\377\"2k\377" \ ++ "#3l\377$4m\377%5n\377'7o\377*9q\377-L}\377\77M~\377>L}\3772Av\377\35.g\377\27" \ ++ "(c\377\31*d\377\222\31*e\377\6\30)d\377\32+e\377+;r\377>L~\377=K}\377" \ ++ "s\377\31*e\377\30)d\377\223\31*e\377\5\30)d\377\32+f\377" \ ++ "2@u\3778Fz\3777Ey\377\2058Fz\377\2027Fy\377\1""6Fx\377\2057Fy\377\2""6" \ ++ "Ex\3777Fy\377\2066Ex\377\4""5Ew\3776Ex\377+:p\377\30)d\377\230\31*e\377" \ ++ "\4\36/i\3771Av\3772Av\3771@u\377\2072Av\377\2""1Au\3770At\377\2051Au" \ ++ "\377\6""0@u\3771At\3770@u\377/\77t\377\35.g\377\30)d\377\234\31*e\377" \ ++ "\2$4l\377/=s\377\207-M~\377=L~\377=K}\377\202L~\377\77M\177\377@N\177\377AO\200\377BP" \ ++ "\201\377\202CQ\202\377\202CQ\201\377\214BP\201\377\1BP\200\377\204BP" \ ++ "\201\377\203BP\200\377\204BP\177\377\217BP\200\377\2AO\200\377BP\200" \ ++ "\377\203AO\200\377\202@N\200\377\213AO\200\377\2@N\177\377AO\200\377" \ ++ "\202@N\177\377\202\77M~\377\213@N\177\377\202\77M~\377\6>L}\377@M~\377" \ ++ ";I{\377&6n\377\31*e\377\30)d\377\223\31*e\377\6\30)d\377\34,g\3771@u" \ ++ "\377=K}\377=K|\377L}\377" \ ++ "\3@N~\3775Cw\377\35.g\377\202\30)d\377\223\31*e\377\3\30)d\377\34,g\377" \ ++ "5Dx\377\202=K}\377\1s\377\36/h\377" \ ++ "\30)d\377\233\31*e\377\5\30)d\377&5m\377.=s\377-L}\377\77M}\377>M~\377=K|\377(8n\377" \ ++ "\27(c\377\30)d\377\223\31*e\377\202\30)d\377\4\37.i\3779I{\377=K}\377" \ ++ "L}\377\77M~\377\214@N\177\377\202\77M" \ ++ "~\377\202@N\177\377\202AO\200\377\1@N\177\377\214AO\200\377\203@N\200" \ ++ "\377\203AO\200\377\202BP\200\377\1AO\200\377\225BP\200\377\205BP\177" \ ++ "\377\212BP\200\377\216BP\201\377\212BP\200\377\206BP\177\377\225BP\200" \ ++ "\377\1AO\200\377\202BP\200\377\203AO\200\377\202@N\200\377\215AO\200" \ ++ "\377\2@N\177\377AO\200\377\203@N\177\377\1\77M~\377\212@N\177\377\2\77" \ ++ "M~\377@N\177\377\202\77M~\377\6>L}\377\77M~\377>L}\3772Au\377\35.h\377" \ ++ "\27(d\377\224\31*e\377\6\30)d\377\31*e\377&5m\377t\377\33,f\377\30)d\377\232" \ ++ "\31*e\377\202\30)d\377\4&6n\377.=s\377-t\3779Fz\3777Ey\377\2068Fz\377\2""7Fy\377" \ ++ "6Fx\377\2077Fy\377\2""6Ex\3775Dw\377\2076Ex\377\2\40""1i\377\30)d\377" \ ++ "\227\31*e\377\2\30)d\377\40""1j\377\2022Av\377\1""1@u\377\2072Av\377" \ ++ "\2""1Au\3770At\377\2051Au\377\6""0@u\3771Au\3770@t\3771Au\377#4l\377" \ ++ "\27(d\377\233\31*e\377\3\30)d\377\35-g\377,;r\377\202-L}\377\77M~\377>L~\377*;p\377" \ ++ "\33,f\377\202\30)d\377\224\31*e\377\3\30)d\377\31+e\3774Cw\377\210=K" \ ++ "}\377\1L~\377\77" \ ++ "M~\377>L}\377\77M~\377\202@N\177\377\1\77M~\377\213@N\177\377\202\77" \ ++ "M~\377\202@N\177\377\222AO\200\377\202@N\200\377\204AO\200\377\203BP" \ ++ "\200\377\1AO\200\377\300BP\200\377\1AO\200\377\203BP\200\377\204AO\200" \ ++ "\377\203@N\200\377\216AO\200\377\1@N\177\377\202AO\200\377\202@N\177" \ ++ "\377\202\77M~\377\213@N\177\377\1\77M~\377\202@N\177\377\202\77M~\377" \ ++ "\5>L}\377\77M~\377>L}\3777Ey\377\37/i\377\202\30)d\377\224\31*e\377\202" \ ++ "\30)d\377\4\37""0j\377:I{\377=K}\377s\377\33,f\377\230\31*e\377\3\30)d\377#2k\3774Cw\377" \ ++ "\2072Av\377\3""1Au\3772Av\3770At\377\2061Au\377\2""0@u\3771At\377\202" \ ++ "0@u\377\2\36/i\377\30)d\377\233\31*e\377\5\30)d\377\34-g\377+;q\377." \ ++ "=s\377,;q\377\207-L}\377\202\77M~\377\4""7" \ ++ "Fy\377'7n\377\27(d\377\30)d\377\225\31*e\377\6\30)d\377\31*e\377(8o\377" \ ++ ";I|\377=K}\377s\377-L}\377\202\77M~\377\2@N\177\377\77M~\377\213@N\177\377\203\77M~\377" \ ++ "\202@N\177\377\223AO\200\377\204@N\200\377\204AO\200\377\204BP\200\377" \ ++ "\1AO\200\377\260BP\200\377\1AO\200\377\205BP\200\377\204AO\200\377\203" \ ++ "@N\200\377\220AO\200\377\1@N\177\377\202AO\200\377\202@N\177\377\203" \ ++ "\77M~\377\213@N\177\377\1\77M~\377\202@N\177\377\202\77M~\377\5\77M}" \ ++ "\377@N\177\377;I{\377(8o\377\33,g\377\202\30)d\377\225\31*e\377\6\27" \ ++ "(d\377\33-f\3771@u\377s\377\36/i\377\30)d\377\233\31*e\377\2\30" \ ++ ")d\377\33,f\377\212-L}\377\202\77M~\377\3+;q\377\33" \ ++ ",f\377\31*e\377\202\30)d\377\224\31*e\377\4\30)d\377\27(c\377\"2j\377" \ ++ "9G{\377\202=K}\377\1L}\377" \ ++ "\77M~\377>L}\377\203\77M~\377\2@N\177\377\77M~\377\215@N\177\377\1\77" \ ++ "M~\377\203@N\177\377\203AO\200\377\1@N\177\377\225AO\200\377\204@N\200" \ ++ "\377\207AO\200\377\234BP\200\377\207AO\200\377\205@N\200\377\230AO\200" \ ++ "\377\203@N\177\377\202\77M~\377\214@N\177\377\1\77M~\377\202@N\177\377" \ ++ "\202\77M~\377\1>L}\377\202\77M~\377\5=K|\3772Au\377\34,g\377\30)d\377" \ ++ "\31)d\377\225\31*e\377\7\31)e\377\30)d\377\32+f\377)9p\377L}\377\202\77M~\377\202@N\177\377\1\77M~\377" \ ++ "\214@N\177\377\203\77M~\377\203@N\177\377\203AO\200\377\1@N\177\377\226" \ ++ "AO\200\377\207@N\200\377\234AO\200\377\207@N\200\377\227AO\200\377\1" \ ++ "@N\177\377\202AO\200\377\203@N\177\377\203\77M~\377\215@N\177\377\2\77" \ ++ "M~\377@N\177\377\202\77M~\377\7>L}\377\77M~\377@N~\377;I{\3772@u\377" \ ++ "!2j\377\26(c\377\202\30)d\377\225\31*e\377\7\30)d\377\27)d\377\37/i\377" \ ++ "1@u\377>L}\377=K}\377L}\377\202" \ ++ "\77M~\377\202@N\177\377\1\77M~\377\215@N\177\377\202\77M~\377\204@N\177" \ ++ "\377\236AO\200\377\235@N\200\377\232AO\200\377\1@N\177\377\203AO\200" \ ++ "\377\203@N\177\377\203\77M~\377\214@N\177\377\1\77M~\377\203@N\177\377" \ ++ "\202\77M~\377\5\77M}\377@N~\377>L}\377.=s\377!1j\377\202\30)d\377\1\31" \ ++ ")d\377\226\31*e\377\7\30)d\377\30*d\377)9o\3779Gz\377>L}\377=J}\377<" \ ++ "J|\377\203=K}\377\2M~\377.=s\377\34-f\377\31*e\377\202\30)d\377\227\31*e\377" \ ++ "\6\30)d\377\34,f\3773Bv\377L}\377\202\77M~\377\203" \ ++ "@N\177\377\1\77M~\377\217@N\177\377\203\77M~\377\204@N\177\377\203AO" \ ++ "\200\377\1@N\177\377\276AO\200\377\1@N\177\377\204AO\200\377\204@N\177" \ ++ "\377\203\77M~\377\217@N\177\377\1\77M~\377\202@N\177\377\202\77M~\377" \ ++ "\1>L}\377\202\77M~\377\4>L}\377;J{\377/>s\377\33,f\377\202\30)d\377\227" \ ++ "\31*e\377\202\30)d\377\5\31*e\377$3l\377;J|\377=K}\377" \ ++ "L}\377\203\77M~\377\202@N\177\377\1\77M~\377\220@N\177\377\203\77M~\377" \ ++ "\204@N\177\377\204AO\200\377\1@N\177\377\266AO\200\377\1@N\177\377\204" \ ++ "AO\200\377\205@N\177\377\203\77M~\377\220@N\177\377\1\77M~\377\202@N" \ ++ "\177\377\204\77M~\377\6@M~\377>L}\3776Ex\377+:p\377\34,g\377\26'c\377" \ ++ "\202\30)d\377\227\31*e\377\202\30)d\377\5\37""0i\3771@t\377>L~\377=K" \ ++ "}\377L}\377\77M~\377AN\177\377=L}\3770\77t\377$3" \ ++ "l\377\33,f\377\27(d\377\30)d\377\231\31*e\377\4\27)d\377\31*e\377+:q" \ ++ "\3779Gz\377\206=K}\377\1L~\377\77M~\377" \ ++ "@N~\377;I|\377*9p\377\33,g\377\32*e\377\203\30)d\377\230\31*e\377\5\30" \ ++ ")d\377\27(d\377!2k\3777Gy\377L}\377\77M~\377>L}\377" \ ++ "\203\77M~\377\203@N\177\377\1\77M~\377\226@N\177\377\206\77M~\377\210" \ ++ "@N\177\377\224AO\200\377\211@N\177\377\206\77M~\377\231@N\177\377\203" \ ++ "\77M~\377\1>L}\377\202\77M~\377\4>L}\377=K|\3775Dx\377$4l\377\203\30" \ ++ ")d\377\232\31*e\377\4\30)d\377\31*e\377\34,g\377.t\377\32*f\377\30)d\377\230\31*e\377\3\30)d\377\"2k\3773Cw\377" \ ++ "\2112Av\377\2""1Au\3770At\377\2071Au\377\5""0@t\3770@u\377/\77t\377\32" \ ++ "+f\377\30)d\377\233\31*e\377\202\30)d\377\4%5m\377.=s\377-L~\377@N~\377\77M~\377>L}\377\203\77M~\377\203" \ ++ "@N\177\377\1\77M~\377\231@N\177\377\210\77M~\377\224@N\177\377\211\77" \ ++ "M~\377\231@N\177\377\1\77M~\377\202@N\177\377\203\77M~\377\1>L}\377\202" \ ++ "\77M~\377\10@N~\377;J{\3775Cw\377,;q\377\36/h\377\26'c\377\27)d\377\30" \ ++ ")d\377\232\31*e\377\10\30)d\377\27(d\377\33,g\377'7n\3778Fz\377>L~\377" \ ++ "=K}\377s\377\32,f\377\30)d\377\226\31*" \ ++ "e\377\5\30)d\377\35.h\3773Bw\3778Fz\3777Ey\377\2058Fz\377\2037Fy\377" \ ++ "\1""6Fx\377\2077Fy\377\2""6Ex\3775Dw\377\2056Ex\377\5""5Dw\3776Ex\377" \ ++ "2Au\377\34-g\377\30)d\377\230\31*e\377\4\30)d\377\34-g\3772Av\3773Bw" \ ++ "\377\2072Av\377\3""1Au\3772Av\3770At\377\2061Au\377\2""0@u\3771Au\377" \ ++ "\2020@u\377\2!2k\377\30)d\377\234\31*e\377\5\30)d\377\35.h\377,;r\377" \ ++ ".=s\377,;q\377\207-L}\377\77M~\377@N\177\377\77M~\3774Cw\377(8o\377" \ ++ "\40""1j\377\32+f\377\27(d\377\202\30)d\377\233\31*e\377\4\30)d\377\27" \ ++ "(d\377%5m\3774Cw\377\202=K}\377\1t\3773Bw\3772Av\3771@u\377\2052Av" \ ++ "\377\4""1Au\3772Av\3771Au\3770At\377\2071Au\377\3""0@t\3770@u\377)9p" \ ++ "\377\235\31*e\377\6\30)d\377\31*e\377&6n\377.=s\377-s\377" \ ++ "=J|\377@N\177\377\206\77M~\377\203@N\177\377\1\77M~\377\313@N\177\377" \ ++ "\1\77M~\377\203@N\177\377\203\77M~\377\1>M~\377\203\77M~\377\5""6Ex\377" \ ++ "(8o\377\34,g\377\32+e\377\31*e\377\202\30)d\377\1\31*d\377\233\31*e\377" \ ++ "\5\30)d\377\27(c\377\36/i\3774Cw\377s\377\36.h\377\30)d\377\234\31*e\377\5\30)e" \ ++ "\377\35.h\377-=r\377.=s\377,;q\377\206-L}\377\203\77M~\377\1>L}\377\204\77M~" \ ++ "\377\204@N\177\377\1\77M~\377\301@N\177\377\204\77M~\377\202>L}\377\202" \ ++ "\77M~\377\7>L}\377=K}\377s\377>K}\377" \ ++ "=K}\377L~\3773Bw" \ ++ "\377$4l\377\32+e\377\27)d\377\30)d\377\236\31*e\377\202\30)d\377\13\26" \ ++ "(c\377\27)d\377\40""1j\377*:p\3772Au\3778Fy\377L}\377\202\77M~\377\13@N~\377\77M}\377:H{\3775Dw\377" \ ++ "/>t\377%6m\377\34-f\377\26'c\377\27(d\377\30)d\377\30)e\377\235\31*e" \ ++ "\377\202\30)d\377\5\27)d\377\36/h\377*:p\377:H{\377>L~\377\206=K}\377" \ ++ "\1t\3773Bw\3771@u\377\2062" \ ++ "Av\377\4""1Au\3772Av\3771Au\3770At\377\2051Au\377\7""0@u\3771Au\3770" \ ++ "@t\3770@u\377+t\377\207-t\377" \ ++ "7Fy\377\77M~\377AO\177\377@N~\377\77M~\377>L}\377\205\77M~\377\260@N" \ ++ "\177\377\1\77M~\377\205@N\177\377\205\77M~\377\1>L}\377\202\77M~\377" \ ++ "\11@N\177\377AN\177\377L}\377=K}\377L}\377\202" \ ++ "\77M~\377\11@N~\377@N\177\377=K|\3773Bu\377)9o\377\37""0i\377\33,f\377" \ ++ "\32+f\377\31*e\377\204\30)d\377\240\31*e\377\11\30)d\377\27)d\377\32" \ ++ "*e\377-L~\3774Dw\377!2j\377" \ ++ "\32*e\377\31*d\377\202\30)d\377\243\31*e\377\203\30)d\377\12\27(d\377" \ ++ "\30)e\377\40""0i\377)9o\3771@u\3779Hz\377L}\377" \ ++ "\205\77M~\377\1\77M}\377\202>L}\377\240\77M~\377\203>L}\377\205\77M~" \ ++ "\377\202>L}\377\7=K}\377L~\3774Bw\377&6m\377\35-g\377\27(d\377\202\30)d\377\245\31*e\377\202" \ ++ "\30)d\377\17\27(d\377\27(c\377\26'c\377\32,f\377\40""1j\377&6m\377+:" \ ++ "q\3770\77t\3773Bv\3776Dx\3778Gy\377:I{\377=K|\377\77M~\377@N\177\377" \ ++ "\202@N~\377\210\77M~\377\1\77L}\377\213>L}\377\210\77M~\377\22@M~\377" \ ++ "@N~\377@N\177\377@N~\377>L}\377L~\377=K}\377s\377\35.h\377\30)d\377\234\31*e\377\6\30" \ ++ ")d\377\32+e\377(8o\377.=s\377-K}\377\77M~\377@N\177\377\213AO\177\377\24@N~\377" \ ++ ">L}\377=K|\377;I{\3779Gz\3777Ey\3774Cw\3771Au\377/>s\377,;q\377(8o\377" \ ++ "&5m\377#3l\377!1j\377\37""0i\377\35-g\377\32+e\377\30)d\377\27(c\377" \ ++ "\27(d\377\203\30)d\377\250\31*e\377\12\30)d\377\27(d\377\30)d\377$5m" \ ++ "\3771@u\377:H{\377>L}\377=K}\377L~\3774Cw\377\"2k\377\32+f\377\31*e\377\202\30)d\377\1\31*d\377\271" \ ++ "\31*e\377\212\30)d\377\272\31*e\377\203\30)d\377\4\32+e\377\34-g\377" \ ++ "+:p\377;I|\377\202=K}\377\1L~\3777Ey\377*9p\377!1j\377\32+e\377\27(d\377\30)d\377" \ ++ "\372\31*e\377\203\30)d\377\7\35.h\377$4l\3770\77t\377L~\377=" \ ++ "K}\377=K|\377\206=K}\377\2L}\377:H{\3773Bv\377)9p\377\35.h\377\26'c\377\202\30)d\377\365\31*e" \ ++ "\377\7\30)d\377\27(c\377\30)d\377#3l\377/>s\3777Ey\377=K|\377\202=K}" \ ++ "\377\1L}\377:I|\377" \ ++ "-=s\377\37""0i\377\32+f\377\31*e\377\203\30)d\377\346\31*e\377\203\30" \ ++ ")d\377\6\31*d\377\32+e\377\34-g\377%6n\3775Cw\377>L~\377\202=K}\377\1" \ ++ "L}\377>L~\3777Ey\377,;r\377#3l\377" \ ++ "\36/h\377\31*d\377\27(d\377\202\30)d\377\340\31*e\377\1\31*d\377\202" \ ++ "\30)d\377\11\27(d\377\33,f\377\40""1j\377'7n\3772@u\377L}\377L}\377" \ ++ "\202=K}\377\1s\377\31*e\377\202\30)d\377\231\31*e\377\4" \ ++ "\30)d\377\37/i\3770\77u\3773Bw\377\2021@u\377\2052Av\377\4""1Au\3772" \ ++ "Av\3771Au\3770At\377\2101Au\377\5""0@t\3770@u\377)9p\377\32+e\377\30" \ ++ ")d\377\235\31*e\377\2\30)d\377\36.h\377\202-L}\377" \ ++ "=K}\3772Av\377'8o\377\35.h\377\33+f\377\32+e\377\31*e\377\204\30)d\377" \ ++ "\306\31*e\377\205\30)d\377\7\31*e\377\32+f\377\33,f\377\"2k\377-L}\377\202=K}\377\2r\377\31*e\377\30)d\377\232\31*e\377\5\30)d\377\34,g\377" \ ++ ".=s\3773Bw\3771@u\377\2102Av\377\2""1Au\3770At\377\2061Au\377\7""0@u" \ ++ "\3771Au\3770@t\3770@u\377-=s\377\35.h\377\30)d\377\235\31*e\377\6\30" \ ++ ")d\377\32*e\377*9p\377.=s\377-L~\377\10""9Gz\3770@u\377" \ ++ ")8p\377#3l\377\37""0i\377\34,g\377\30)d\377\27(d\377\204\30)d\377\275" \ ++ "\31*e\377\203\30)d\377\202\27(d\377\11\32+e\377\36.h\377!2j\377&6n\377" \ ++ ",L}\377\214=K}\377\1s\377\2108Fz\377\4""7Fy\3778Fz\3777Fy\3776Fx\377\2077Fy\377" \ ++ "\4""6Ex\3777Fy\3776Ex\3775Dw\377\2066Ex\377\5""5Dw\3776Ex\377-=r\377" \ ++ "\32+f\377\30)d\377\232\31*e\377\4\30)d\377\32+e\377+;r\3774Cw\377\210" \ ++ "2Av\377\4""1Au\3772Av\3771Au\3770At\377\2051Au\377\7""0@u\3771Au\377" \ ++ "0@u\3770@t\377/\77u\377!2j\377\30)d\377\235\31*e\377\6\30)d\377\31*e" \ ++ "\377$4l\377-L}\377s\3773Bv\3777Ey\377:I{\377\202>L}" \ ++ "\377\202=K}\377\1L}\377>L~\377L}\377\1>K}\377\203" \ ++ "=K}\377\1t\377\33,f\377" \ ++ "\202\30)d\377\232\31*e\377\4\30)e\377\30)d\377\33+f\377+;r\377\2108F" \ ++ "z\377\3""7Fy\3778Fz\3777Fy\377\2026Fx\377\2077Fy\377\4""6Ex\3777Fy\377" \ ++ "6Ex\3775Dw\377\2106Ex\377\2+;q\377\30)d\377\233\31*e\377\3\30)d\377\31" \ ++ "*e\377$5m\377\2022Av\377\1""1@u\377\2062Av\377\4""1Au\3772Av\3771Au\377" \ ++ "0At\377\2061Au\377\2""0@u\3771Au\377\2020@u\377\2+;r\377\32+f\377\236" \ ++ "\31*e\377\202\30)d\377\4$4m\377.=s\377-K}\377" \ ++ "\202>L~\377\17\77M~\377>L~\377;I{\3777Fy\3775Cw\3771@v\377.>t\377,L~\377>L}\377\227=K}\377\203" \ ++ "s\377\36/h\377\30" \ ++ ")d\377\235\31*e\377\4\31*d\377\30)d\377\37""0i\377.=s\377\202-K}\377\203>L}\377\5>L~\377=K}\377L~\377\203>L}\377\1>K}\377\205=K}\377\1t\3773Bw\3771@u\377\210" \ ++ "2Av\377\2021Au\377\1""0At\377\2061Au\377\2""0@u\3771Au\377\2020@u\377" \ ++ "\2+;q\377\32+f\377\237\31*e\377\4\30)d\377\33,f\377,t\377\2028Fz\377\1""7Ey\377\2068Fz\377\2047Fy\377\1""6Fx\377\2077F" \ ++ "y\377\2""6Ex\3777Fy\377\2026Ex\377\1""5Dw\377\2056Ex\377\4""5Dw\3776" \ ++ "Ex\3773Bv\377\40""0i\377\202\30)d\377\233\31*e\377\4\30)d\377\33,f\377" \ ++ ".>s\3773Bw\377\2112Av\377\2021Au\377\1""0At\377\2061Au\377\7""0@u\377" \ ++ "1Au\3770@u\377/\77u\377-=s\377\34-g\377\30)d\377\236\31*e\377\6\30)d" \ ++ "\377\31*e\377)9p\377.=s\377-t\3778Fz\3777Ey\377\2108Fz\377\2027Fy\377" \ ++ "\1""6Fx\377\2107Fy\377\1""6Ex\377\2027Fy\377\1""5Dw\377\2066Ex\377\1" \ ++ "5Dw\377\2026Ex\377\3.>s\377\32+f\377\30)d\377\233\31*e\377\202\30)d\377" \ ++ "\5\33+f\377.=t\3773Bw\3772Av\3771@u\377\2062Av\377\1""1Au\377\2022Av" \ ++ "\377\1""0At\377\2101Au\377\5""0@t\377/\77u\3770@u\377!1j\377\30)d\377" \ ++ "\236\31*e\377\202\30)d\377\1\40""0j\377\202-t\3777Ey\3778Fz\3777Ey\3777Fz\377\2058Fz\377\1""7Fy\377\2028Fz\377\2" \ ++ "7Fy\3776Fx\377\2107Fy\377\2""6Ex\3777Fy\377\2026Ex\377\1""5Dw\377\205" \ ++ "6Ex\377\6""5Dw\3776Ex\3777Ex\377&6n\377\31*e\377\30)d\377\234\31*e\377" \ ++ "\6\30)d\377\32*f\377,;r\3773Bw\3772Av\3771@u\377\2102Av\377\2021Au\377" \ ++ "\1""0At\377\2061Au\377\2""0@u\3771Au\377\2020@u\377\1&7n\377\240\31*" \ ++ "e\377\6\31*d\377\30*e\377(8o\377.=s\377-s\377\36.h\377\32+e\377\203\30)d\377\237\31*e\377\4\30)d\377\30*" \ ++ "d\377'7n\3776Dx\377\2028Fz\377\1""7Ey\377\2068Fz\377\2""7Fy\3778Fz\377" \ ++ "\2027Fy\377\1""6Fx\377\2107Fy\377\3""6Ex\3777Fy\3776Ex\377\2025Dw\377" \ ++ "\2076Ex\377\4""4Dw\377\"2k\377\31*e\377\30)d\377\234\31*e\377\6\30)d" \ ++ "\377\31*d\377.=s\3773Bw\3772Av\3771@u\377\2072Av\377\2""1Au\3772Av\377" \ ++ "\2020At\377\2061Au\377\7""0@u\3771Au\3770@t\3770@u\377*:q\377\31*e\377" \ ++ "\30)d\377\237\31*e\377\5\27(d\377$5m\377.=s\377-s\377\35.h\377\27(d\377\235" \ ++ "\31*e\377\6\30)d\377\33,f\377+;r\3773Bw\3772Av\3771@u\377\2062Av\377" \ ++ "\2""1Au\3772Av\377\2111Au\377\7""0@u\3771Au\3770@t\3770@u\377,t\3773Bw\3772Av\3771@u\377\207" \ ++ "2Av\377\2""1Au\3772Av\377\2020At\377\2061Au\377\7""0@u\3771Au\3770@u" \ ++ "\377/\77u\377.>t\377\36/i\377\30)d\377\240\31*e\377\5\30)d\377%4m\377" \ ++ ".=s\377-s\377\210-s\377%5m\377\37""0i\377\32+e\377\27(d\377\202\30)d" \ ++ "\377\245\31*e\377\202\30)d\377\2%4m\3771\77u\377\2028Fz\377\1""7Ey\377" \ ++ "\2078Fz\377\1""7Fy\377\2028Fz\377\1""7Fy\377\2026Fx\377\2127Fy\377\202" \ ++ "6Ex\377\1""5Dw\377\2066Ex\377\6""5Dw\3776Ex\3776Ew\377&6m\377\31*e\377" \ ++ "\30)d\377\236\31*e\377\6\27)d\377\35.h\377/>t\3773Bw\3772Av\3771@u\377" \ ++ "\2102Av\377\2021Au\377\1""0At\377\2071Au\377\6""0@u\3771At\3770@u\377" \ ++ "/\77t\377\"2k\377\30)d\377\240\31*e\377\6\30)d\377\34-g\377+:q\377.=" \ ++ "s\377-s\377\"" \ ++ "2k\377\33,f\377\32+e\377\204\30)d\377\245\31*e\377\5\30)d\377\27(c\377" \ ++ "\37""0i\3772@u\3777Ey\377\2028Fz\377\1""7Ey\377\2118Fz\377\2027Fy\377" \ ++ "\1""6Fx\377\2117Fy\377\3""6Ex\3777Fy\3776Ex\377\2025Dw\377\2066Ex\377" \ ++ "\4""5Dw\3776Ex\3774Cw\377\40""0i\377\203\30)d\377\235\31*e\377\4\30)" \ ++ "d\377\37/i\3771@v\3773Bv\377\2021@u\377\2072Av\377\2""1Au\3772Av\377" \ ++ "\2020At\377\2071Au\377\7""0@u\3771Au\3770@u\377/\77t\377#3l\377\31*e" \ ++ "\377\30)d\377\237\31*e\377\3\30)d\377\32+e\377(7n\377\202.=s\377\1,;" \ ++ "q\377\206-s\377\32*f\377\30)d\377\236\31*e\377\202\30)d\377\4\40""0j\377" \ ++ "1@v\3772Av\3771@u\377\2072Av\377\1""1Au\377\2022Av\377\1""0At\377\207" \ ++ "1Au\377\6""0@u\3771Au\3771At\3770@u\377/\77t\377&6n\377\202\30)d\377" \ ++ "\237\31*e\377\6\30)d\377\31*e\377$3l\377/>s\377-s\377'8n\377\37""0i\377\30" \ ++ ")d\377\27(c\377\202\30)d\377\250\31*e\377\203\30)d\377\4\37/i\377*9p" \ ++ "\3777Ey\3779Fz\377\2138Fz\377\2027Fy\377\1""6Fx\377\2127Fy\377\2046E" \ ++ "x\377\1""5Dw\377\2066Ex\377\6""5Dw\3776Ex\3774Cw\377'7n\377\30)e\377" \ ++ "\30)d\377\236\31*e\377\202\30)d\377\4\"2k\3771@v\3773Bw\3771@u\377\207" \ ++ "2Av\377\2""1Au\3772Av\377\2131Au\377\1""0@t\377\2020@u\377\1%6n\377\202" \ ++ "\30)d\377\240\31*e\377\3\30)d\377!1j\377/>s\377\212-s\3776Ex\377s\377'7n\377\37""0i\377" \ ++ "\30)d\377\27(d\377\203\30)d\377\256\31*e\377\202\30)d\377\6\31*e\377" \ ++ "\35-g\377+:q\3779Fz\3778Fz\3777Ey\377\2108Fz\377\2""7Fy\3778Fz\377\203" \ ++ "7Fy\377\1""6Fx\377\2117Fy\377\1""6Ex\377\2027Fy\377\1""6Ex\377\2025D" \ ++ "w\377\2066Ex\377\1""5Dw\377\2026Ex\377\2""3Bv\377#3k\377\202\30)d\377" \ ++ "\237\31*e\377\6\30)d\377\32+f\377)9p\3773Bw\3772Av\3771@u\377\2072Av" \ ++ "\377\1""1Au\377\2022Av\377\1""0At\377\2071Au\377\6""0@u\3771Au\3771A" \ ++ "t\3770@u\377/\77t\377'7o\377\202\30)d\377\240\31*e\377\6\30)d\377\33" \ ++ ",f\377)9p\377.=s\377-s\377-<" \ ++ "r\377,;q\377\207-t\3776Dx\3779Fz\3778Fz\3777Ey\377\210" \ ++ "8Fz\377\2""7Fy\3778Fz\377\2027Fy\377\2026Fx\377\2127Fy\377\2""6Ex\377" \ ++ "7Fy\377\2026Ex\377\1""5Dw\377\2076Ex\377\6""5Dw\3776Ex\3772Au\377#3l" \ ++ "\377\31*e\377\30)d\377\237\31*e\377\5\30)e\377\27(d\377\37/i\377.=s\377" \ ++ "3Bw\377\2022Av\377\1""1@u\377\2102Av\377\2021Au\377\1""0At\377\2071A" \ ++ "u\377\2""0@u\3771At\377\2020@u\377\3%5m\377\31*e\377\30)d\377\240\31" \ ++ "*e\377\202\30)d\377\2&6m\377.=s\377\211-t\377" \ ++ "3Bw\3772Av\377\2021@u\377\2072Av\377\4""1Au\3772Av\3771Au\3770At\377" \ ++ "\2071Au\377\10""0@u\3771Au\3770@u\377/\77u\377/\77t\377#3l\377\31*e\377" \ ++ "\30)d\377\241\31*e\377\6\30)d\377\33,f\377-s\377!1j\377\27(c\377\242\31*e\377\6\30)d\377\32+e\377(7o\377" \ ++ ".=s\377-t\377\2038Fz\377\1""7Ey\377\2138Fz\377\1""7Fy\377\202" \ ++ "8Fz\377\2037Fy\377\2026Fx\377\2167Fy\377\2026Ex\377\2025Dw\377\2076E" \ ++ "x\377\1""5Dw\377\2026Ex\377\3""5Dw\3771Au\377!2j\377\202\30)d\377\243" \ ++ "\31*e\377\4\30)d\377\31*e\377%6m\3773Bw\377\2022Av\377\1""1@u\377\210" \ ++ "2Av\377\4""1Au\3772Av\3771Au\3770At\377\2071Au\377\3""0@u\3771Au\377" \ ++ "1At\377\2020@u\377\3-=r\377\33+f\377\30)d\377\242\31*e\377\6\30)d\377" \ ++ "\31*d\377&6m\377.=s\377-t\3777Ey\3779G{\377\2028Fz\377\1""7Ey\377\2138" \ ++ "Fz\377\1""7Fy\377\2028Fz\377\2027Fy\377\2036Fx\377\2147Fy\377\2""6Ex" \ ++ "\3777Fy\377\2036Ex\377\1""5Dw\377\2106Ex\377\1""5Dx\377\2026Ex\377\3" \ ++ "1@u\377'6n\377\32*e\377\202\30)d\377\242\31*e\377\6\31*d\377\30)d\377" \ ++ "\34-g\377*:p\3773Bw\3772Av\377\2021@u\377\2072Av\377\1""1Au\377\2022" \ ++ "Av\377\2""1Au\3770At\377\2071Au\377\2""0@u\3771Au\377\2030@u\377\3*:" \ ++ "p\377\32+f\377\30)d\377\242\31*e\377\6\30)d\377\31*e\377$4l\377-=r\377" \ ++ ".=s\377,;q\377\207-t\377*:q\377#3l\377\33,f\377\26'c\377\27(d\377" \ ++ "\202\30)d\377\353\31*e\377\202\30)d\377\10\27(c\377\31)d\377\37/i\377" \ ++ "'6n\377.=s\3772Av\3776Ey\3779Gz\377\2178Fz\377\1""7Fy\377\2028Fz\377" \ ++ "\2037Fy\377\2026Fx\377\2147Fy\377\1""6Ex\377\2027Fy\377\2026Ex\377\202" \ ++ "5Dw\377\2106Ex\377\5""5Dw\3777Fx\3773Cv\377&6m\377\34-g\377\202\30)d" \ ++ "\377\243\31*e\377\7\30)d\377\27(d\377!2j\377/>t\3773Bw\3772Av\3771@u" \ ++ "\377\2102Av\377\2""1Au\3772Av\377\2021Au\377\1""0At\377\2071Au\377\10" \ ++ "0@u\3771Au\3770@u\377/\77u\3770@u\377&7n\377\32+e\377\30)d\377\243\31" \ ++ "*e\377\6\30)d\377#3k\377-t\377+:q\377&6m\377!1j\377\33,f\377\27(d\377\27(c\377\27(d\377\203" \ ++ "\30)d\377\303\31*e\377\202\30)d\377\14\27(d\377\27(c\377\26(c\377\30" \ ++ ")e\377\36.h\377#3k\377(8o\377-=s\3771\77u\3773Bw\3776Ey\3779Gz\377\203" \ ++ "8Fz\377\1""7Ey\377\2178Fz\377\1""7Fy\377\2038Fz\377\2037Fy\377\2026F" \ ++ "x\377\2167Fy\377\1""6Ex\377\2027Fy\377\2026Ex\377\2025Dw\377\2116Ex\377" \ ++ "\6""5Dw\3776Ex\3775Dw\377*:p\377\40""0i\377\31*e\377\202\30)d\377\245" \ ++ "\31*e\377\6\30)d\377\34,g\377*:p\3773Bv\3773Bw\3772Av\377\2021@u\377" \ ++ "\2112Av\377\2021Au\377\1""0At\377\2111Au\377\6""0@u\3770@t\3770@u\377" \ ++ ",s\377)8p\377#3k" \ ++ "\377\34-g\377\202\27(d\377\204\30)d\377\1\30)e\377\267\31*e\377\204\30" \ ++ ")d\377\11\27)d\377\27(c\377\32+e\377\40""0i\377&5m\377,;r\3772@v\377" \ ++ "5Dx\3776Dx\377\2027Ey\377\2048Fz\377\1""7Ey\377\2218Fz\377\1""7Fy\377" \ ++ "\2028Fz\377\2037Fy\377\2036Fx\377\2167Fy\377\1""6Ex\377\2027Fy\377\203" \ ++ "6Ex\377\1""5Dw\377\2116Ex\377\6""5Dw\3776Ex\3777Fx\377,;q\377\35-g\377" \ ++ "\31*e\377\202\30)d\377\245\31*e\377\5\31*d\377\30)d\377\40""0j\3770@" \ ++ "u\3773Bw\377\2022Av\377\1""1@u\377\2102Av\377\3""1Au\3772Av\3771Au\377" \ ++ "\2020At\377\2101Au\377\2020@u\377\4/\77t\3770@u\377*:p\377\32*e\377\202" \ ++ "\30)d\377\243\31*e\377\2\30)d\377\40""0j\377\202.=s\377\2-t\377,;r\377)8p\377&6n\377$4l\377\"2k\377" \ ++ "!1j\377\37""0i\377\36/i\377\35.h\377\34-g\377\33,f\377\33+f\377\32+e" \ ++ "\377\31*e\377\30)d\377\27)d\377\221\27(d\377\23\30)d\377\31)d\377\31" \ ++ "*e\377\32+e\377\33,f\377\34,g\377\35-h\377\36.h\377\37/i\377\40""0j\377" \ ++ "!1k\377#3k\377%5m\377'7o\377*9p\377-t\3773Bw\3772Av\377\2021@u\377\2102Av\377" \ ++ "\2""1Au\3772Av\377\2021Au\377\1""0At\377\2111Au\377\5""0@u\3770@t\377" \ ++ "0@u\377.>t\377\"3k\377\202\30)d\377\243\31*e\377\202\30)d\377\5!1j\377" \ ++ "-t\377.>t\377.=s\377-s\3770>t\3771\77u\3771@u\3772Av\3774Bw\3775Cw\3776Dx\377" \ ++ "7Ey\3778Fz\3779Gz\3779Fz\377\2058Fz\377\2""8Fy\3777Ez\377\2278Fz\377" \ ++ "\1""7Fy\377\2038Fz\377\2047Fy\377\2026Fx\377\2207Fy\377\1""6Ex\377\203" \ ++ "7Fy\377\2036Ex\377\1""5Dw\377\2126Ex\377\6""5Dw\3776Ex\3777Fx\3771@u" \ ++ "\377%5m\377\35.h\377\203\30)d\377\247\31*e\377\7\27)d\377\33+f\377)9" \ ++ "p\3772Av\3773Bw\3772Av\3771@u\377\2112Av\377\2""1Au\3772Av\377\2021A" \ ++ "u\377\1""0At\377\2101Au\377\2020@u\377\4""0@t\3770@u\377,s\377\40""0i\377\202" \ ++ "\30)d\377\251\31*e\377\5\30)d\377\31*e\377\33,f\377)9p\3773Bw\377\202" \ ++ "2Av\377\1""1@u\377\2112Av\377\3""1Au\3772Av\3771Au\377\2020At\377\211" \ ++ "1Au\377\7""0@u\3770@t\3770@u\377/\77t\377&6n\377\31*e\377\30)d\377\244" \ ++ "\31*e\377\202\30)d\377\2\"2k\377.=s\377\202-t\377#3k\377\202\30)d\377\244\31*e\377\202\30)" \ ++ "d\377\3\31*e\377'6m\377.=s\377\202-s\377&5m\377\37""0i\377\32+f\377\27)d\377\202\30)d\377\254\31*e\377" \ ++ "\7\30)d\377\27(c\377\33-g\377)8o\3770\77u\3774Bw\3772Av\377\2021@u\377" \ ++ "\2112Av\377\2""1Au\3772Av\377\2021Au\377\2020At\377\2121Au\377\1""0@" \ ++ "t\377\2020@u\377\3%6m\377\32+f\377\30)d\377\246\31*e\377\6\30)d\377\32" \ ++ "+e\377(7o\377.=s\377-s\3774Cv\3775Dw\377\2036E" \ ++ "x\377\1""5Dw\377\2176Ex\377\2035Dw\377\2046Ex\377\2057Fy\377\1""6Ex\377" \ ++ "\3207Fy\377\1""6Ex\377\2057Fy\377\2046Ex\377\2045Dw\377\2166Ex\377\1" \ ++ "5Dw\377\2036Ex\377\5""5Dw\3774Cw\3772Bv\377)9p\377\35.g\377\203\30)d" \ ++ "\377\257\31*e\377\202\30)d\377\5\31*e\377\36.i\377.=s\3774Cw\3773Bw\377" \ ++ "\2021@u\377\2112Av\377\2""1Au\3772Av\377\2031Au\377\1""0At\377\2101A" \ ++ "u\377\11""0@u\3771Au\3770@u\3770@t\377/\77u\377/\77t\377*:q\377\31+f" \ ++ "\377\30)d\377\246\31*e\377\202\30)d\377\5\34-g\377+;r\377.=s\377-s\377#4l\377\202\30)d\377\246\31*e" \ ++ "\377\7\31*d\377\30)d\377\37/i\377+:q\377.=s\377-t\377%6m\377\34-g\377\32" \ ++ "+e\377\31*e\377\203\30)d\377\1\30)e\377\262\31*e\377\5\30)d\377\33+f" \ ++ "\377*9p\3771@v\3773Bw\377\2022Av\377\2021@u\377\2122Av\377\2041Au\377" \ ++ "\1""0At\377\2111Au\377\2""0@u\3771Au\377\2030@u\377\2#3k\377\31*e\377" \ ++ "\202\30)d\377\246\31*e\377\202\30)d\377\5$4l\377-s\3774Cv\3774Cw\3775Dw\377\2046Ex" \ ++ "\377\1""5Dw\377\2256Ex\377\2065Dw\377\2136Ex\377\2357Fy\377\2126Ex\377" \ ++ "\2075Dw\377\2246Ex\377\2""5Ex\3776Dw\377\2036Ex\377\2025Dw\377\6""4C" \ ++ "v\3772Au\377+;q\377!1k\377\31*e\377\27(d\377\202\30)d\377\264\31*e\377" \ ++ "\202\30)d\377\6\31*e\377\32+f\377$5m\3772Av\3773Bw\3772Av\377\2021@u" \ ++ "\377\2142Av\377\2021Au\377\1""0At\377\2111Au\377\10""0@u\3771Au\3770" \ ++ "@u\3770@t\3770@u\377/\77t\377,s\377*:p\377$4l\377\35.g\377\27(d\377\27(c\377\202\30" \ ++ ")d\377\266\31*e\377\202\30)d\377\4\34-g\377$4m\3770\77u\3774Cw\377\202" \ ++ "2Av\377\1""1@u\377\2122Av\377\2""1Au\3772Av\377\2031Au\377\1""0At\377" \ ++ "\2111Au\377\2""0@u\3771Au\377\2030@u\377\5.>s\377&6n\377\31*e\377\30" \ ++ ")d\377\31*d\377\247\31*e\377\5\30)d\377\33+f\377&6n\377/=s\377-t\3773Bw\377\2022Av\377\2021@u\377\2122Av\377\2""1" \ ++ "Au\3772Av\377\2021Au\377\2020At\377\2131Au\377\5""0@u\377/\77t\3770@" \ ++ "u\377*:q\377\36/i\377\202\30)d\377\250\31*e\377\4\27)d\377\35-h\377)" \ ++ "9p\377.=s\377\214-s\377" \ ++ "0@t\3772Bu\3774Cw\3776Ex\3777Fx\377\2076Ex\377\1""5Dw\377\2536Ex\377" \ ++ "\1""5Dx\377\2066Ex\377\14""7Ex\3777Fx\3775Dw\3773Bv\3771Au\377/\77t\377" \ ++ ".=r\377+;q\377(8n\377$3k\377\37""0i\377\33,f\377\202\27(c\377\1\27(d" \ ++ "\377\203\30)d\377\276\31*e\377\202\30)d\377\5\30)e\377\36/h\377&6n\377" \ ++ "1@v\3774Cw\377\2022Av\377\1""1@u\377\2152Av\377\2021Au\377\2020At\377" \ ++ "\2121Au\377\2020@u\377\1""0@t\377\2020@u\377\2-=r\377#3l\377\202\30)" \ ++ "d\377\251\31*e\377\7\30)d\377\32+e\377#4l\377.>s\377.s\377,;q\377)9p\377&6n\377#3k\377!1j\377\37""0i\377\35" \ ++ ".h\377\33,f\377\31*e\377\30)d\377\27(d\377\204\30)d\377\301\31*e\377" \ ++ "\203\30)d\377\4!1j\377*:q\3770@u\3773Bw\377\2022Av\377\2021@u\377\213" \ ++ "2Av\377\2""1Au\3772Av\377\2021Au\377\2020At\377\2111Au\377\1""0@u\377" \ ++ "\2021Au\377\1""0@t\377\2020@u\377\2&6n\377\34-g\377\202\30)d\377\250" \ ++ "\31*e\377\202\30)d\377\3\34,f\377(7o\377.=s\377\202-s\3770@t\3772Bu\3774Cw\3776Ex\377\2067Fx\377\2027Ex\377" \ ++ "\2076Ex\377\2027Ex\377\2067Fx\377\14""6Dw\3774Cv\3771Au\3770\77s\377" \ ++ "-=r\377+;p\377)8o\377&6n\377#4k\377\40""1j\377\35.h\377\33,f\377\202" \ ++ "\32+f\377\1\32+e\377\203\31*e\377\207\30)d\377\305\31*e\377\202\30)d" \ ++ "\377\4!1j\377/>t\3772Av\3773Bw\377\2022Av\377\2021@u\377\2132Av\377\1" \ ++ "1Au\377\2022Av\377\2021Au\377\1""0At\377\2141Au\377\6""0@u\3770@t\377" \ ++ "0@u\377,u\3774Cw\3773Bw\3772Av\377\2021@u\377" \ ++ "\2132Av\377\1""1Au\377\2022Av\377\2021Au\377\2020At\377\2111Au\377\1" \ ++ "0@u\377\2021Au\377\1""0@u\377\202/\77u\377\2.>t\377%5m\377\203\30)d\377" \ ++ "\250\31*e\377\10\31*d\377\30)d\377\31*e\377\37""0i\377.s\377.=r\377-t\377\40""0j\377\31*e\377\203\30)d\377\252\31*e\377\3" \ ++ "\30)d\377\36.i\377,;q\377\202.=s\377\2-t\377'7n\377\31*e\377\30)d\377\254" \ ++ "\31*e\377\3\30)d\377\31*e\377#3k\377\202.=s\377\2-t\3774Cw\3773Bw\377\2022Av\377\2021@u\377" \ ++ "\2142Av\377\1""1Au\377\2022Av\377\2021Au\377\2020At\377\2121Au\377\1" \ ++ "0@u\377\2021Au\377\2030@u\377\5.>t\377(8o\377\35.h\377\27(d\377\30)d" \ ++ "\377\253\31*e\377\202\30)d\377\2\34,f\377'6n\377\202.=s\377\2-t\3771@v\3772Av\3773Bw\377\2032Av\377\2021@u\377\2172Av\377\2021Au" \ ++ "\377\2030At\377\2121Au\377\1""0@u\377\2021Au\377\1""0@t\377\2020@u\377" \ ++ "\3,s\377&6n\377\40""0i\377\34" \ ++ "-g\377\203\30)d\377\377\31*e\377\233\31*e\377\203\30)d\377\7\31*e\377" \ ++ "\36.h\377\"2k\377):p\3771@u\3774Cx\3773Bw\377\2022Av\377\2021@u\377\216" \ ++ "2Av\377\2""1Au\3772Av\377\2031Au\377\2020At\377\2131Au\377\1""0@u\377" \ ++ "\2021Au\377\2040@u\377\3+;q\377#3l\377\31*e\377\202\30)d\377\255\31*" \ ++ "e\377\6\30)d\377\31*e\377\37""0i\377,;q\377.=s\377-t\377*9p\377#3l\377\34-g\377\27(c\377\27" \ ++ ")d\377\202\30)d\377\377\31*e\377\224\31*e\377\202\30)d\377\6\27(c\377" \ ++ "\30*e\377\37/i\377&6n\377,;r\3770\77u\377\2023Bw\377\2022Av\377\2031" \ ++ "@u\377\2212Av\377\2021Au\377\2030At\377\2131Au\377\4""0@u\3771Au\377" \ ++ "0@u\3770@t\377\2020@u\377\3,s\377!1j\377\32*e\377\30*e\377\30)d\377\257\31*e\377\3" \ ++ "\30)d\377\35.h\377+:q\377\202.=s\377\202-t\377%6n\377\35.h\377\32+e\377" \ ++ "\202\31*e\377\203\30)d\377\377\31*e\377\203\31*e\377\204\30)d\377\6\31" \ ++ "*e\377\32+e\377\33,f\377\40""1j\377*9p\3773Av\377\2023Bw\377\2022Av\377" \ ++ "\2031@u\377\2172Av\377\2""1Au\3772Av\377\2031Au\377\2020At\377\2151A" \ ++ "u\377\4""0@u\3771Au\3770@u\3770@t\377\2020@u\377\3/\77t\377-=s\377\"" \ ++ "3l\377\202\30)d\377\1\30*e\377\256\31*e\377\202\30)d\377\6\31*e\377#" \ ++ "3k\377.=t\377.=s\377-t\3773Bw\3774Bw\3773Bw\377" \ ++ "\2032Av\377\2031@u\377\2172Av\377\1""1Au\377\2022Av\377\2031Au\377\202" \ ++ "0At\377\2151Au\377\1""0@u\377\2021Au\377\2""0@u\3770@t\377\2020@u\377" \ ++ "\3(9o\377\40""1i\377\32+f\377\202\30)d\377\260\31*e\377\5\30)d\377\31" \ ++ "*d\377#3l\377,;q\377.=s\377\202-t\377(8o\377\33,f\377\202\30)d\377\261\31*e\377\202\30)d\377\5" \ ++ "\31*e\377\"2k\377-t\377*9q\377%5m\377!2j\377" \ ++ "\37/i\377\34-g\377\32+e\377\206\30)d\377\323\31*e\377\204\30)d\377\14" \ ++ "\27)d\377\30)d\377\33,f\377\35.h\377\37""0i\377#3l\377'7o\377,;r\377" \ ++ "1\77v\3775Cx\3774Cw\3773Bw\377\2042Av\377\2031@u\377\2222Av\377\1""1" \ ++ "Au\377\2032Av\377\2031Au\377\2020At\377\2161Au\377\4""0@u\3771Au\377" \ ++ "0@u\3770@t\377\2020@u\377\5/\77t\377+;q\377%5m\377\34-g\377\27(d\377" \ ++ "\202\30)d\377\261\31*e\377\202\30)d\377\3\35.h\377(7n\377/>s\377\202" \ ++ "-t\377,t\3773Bv\3774Cw\377\2043Bw\377\2042Av\377\2051@u\377" \ ++ "\2252Av\377\1""1Au\377\2032Av\377\2031Au\377\2030At\377\2171Au\377\1" \ ++ "0@u\377\2021Au\377\3""0@u\3770@t\3770@u\377\202/\77u\377\4/\77t\377-" \ ++ "=r\377#3l\377\31*e\377\202\30)d\377\264\31*e\377\10\30)d\377\31*d\377" \ ++ "\32+f\377%5l\377/>s\377.=s\377-t\377,t\377.=s\377\202-s\377/>t\3770\77t\3770@u\377\2022Av\377" \ ++ "\3""4Bw\3774Cw\3774Bw\377\2043Bw\377\1""3Bv\377\2062Av\377\2061@u\377" \ ++ "\2352Av\377\2041Au\377\2030At\377\2201Au\377\1""0@u\377\2021Au\377\10" \ ++ "0@u\3770@t\3770@u\3771Au\377/\77t\377'8o\377!1j\377\34,g\377\203\30)" \ ++ "d\377\265\31*e\377\6\30)d\377\30(c\377\36/h\377(7o\377-s\377(9o\377\35.h\377\203\30)d\377\267\31*e\377\202\30)d\377\4\31*" \ ++ "e\377\36/i\377,:q\377.=s\377\202-t\377/\77t\377\2060@u\377\202" \ ++ "1Au\377\1""0@u\377\2271Au\377\2050At\377\2061Au\377\2062Av\377\1""1A" \ ++ "u\377\2762Av\377\1""1Au\377\2072Av\377\2051Au\377\2050At\377\2271Au\377" \ ++ "\1""0@u\377\2031Au\377\5""0@u\3770@t\3770@u\377/\77u\3770@u\377\202/" \ ++ "\77t\377\3-=s\377'7o\377\36/i\377\203\30)d\377\1\30)e\377\273\31*e\377" \ ++ "\202\30)d\377\4\31*e\377\37/i\377,;q\377.=s\377\202-t\377\2040@u\377\1""0@t\377\235" \ ++ "1Au\377\2050At\377\2071Au\377\2072Av\377\1""1Au\377\2602Av\377\1""1A" \ ++ "u\377\2072Av\377\2071Au\377\2050At\377\2311Au\377\1""0@u\377\2031Au\377" \ ++ "\2060@u\377\6-=r\377*:p\377%6m\377\36/i\377\30)d\377\27(d\377\202\30" \ ++ ")d\377\274\31*e\377\202\30)d\377\3\31*e\377\36.h\377'7n\377\202.=s\377" \ ++ "\202-s\3771Au\377\2020@u\377" \ ++ "\2""0@t\3770@u\377\2041Au\377\1""0@u\377\2321Au\377\2070At\377\2071A" \ ++ "u\377\2142Av\377\1""1Au\377\2312Av\377\1""1Au\377\2132Av\377\2101Au\377" \ ++ "\2060At\377\2331Au\377\1""0@u\377\2031Au\377\2""0@u\3770@t\377\2020@" \ ++ "u\377\2021Au\377\5+;q\377%5m\377\40""0j\377\34-g\377\31*e\377\203\30" \ ++ ")d\377\276\31*e\377\202\30)d\377\4\35.h\377'7n\377-s\377.>t\377/\77t\377/\77u\377\2060@u\377\2041Au\377\1""0@u\377\251" \ ++ "1Au\377\2340At\377\2541Au\377\2020@u\377\1""0@t\377\2020@u\377\2/\77" \ ++ "u\3770@u\377\202/\77t\377\4.>t\377+;r\377%5n\377\36.i\377\204\30)d\377" \ ++ "\301\31*e\377\202\30)d\377\3\31*e\377\32+e\377$4l\377\202.=s\377\3-=" \ ++ "s\377-s\377+;r\377)9p\377%5m\377" \ ++ "\40""0i\377\33+f\377\27(d\377\27)d\377\202\30)d\377\302\31*e\377\1\31" \ ++ "*d\377\202\30)d\377\3\34,g\377\"3k\377,;r\377\202.=s\377\202-s\377)9p\377$5m\377\40""1j\377" \ ++ "\36.h\377\33,f\377\30)e\377\204\30)d\377\304\31*e\377\202\30)d\377\3" \ ++ "\33,f\377%4l\377*:p\377\202.=s\377\202-s\377\2100@u\377\3271Au\377\1""0@u\377\2051" \ ++ "Au\377\2020@u\377\1""0@t\377\2040@u\377\6""1Au\377,s\377.>t\377\203/\77t\377\2020@u\377\1/\77" \ ++ "u\377\2020@u\377\1""0@t\377\2030@u\377\3011Au\377\1""0@u\377\2061Au\377" \ ++ "\2030@u\377\3""0@t\3770@u\3771Au\377\2040@u\377\202/\77t\377\7.>t\377" \ ++ ".>s\377-=r\377(8o\377#3k\377\35.g\377\31*e\377\204\30)d\377\312\31*e" \ ++ "\377\202\30)d\377\5\31*e\377\32+f\377\"2k\377-s\377/\77t\377\2040@u\377\1""1Au\377\2050@u\377\2111" \ ++ "Au\377\1""0@u\377\2501Au\377\1""0@u\377\2111Au\377\2030@u\377\1""0@t" \ ++ "\377\2070@u\377\13.>t\377-=s\377+;q\377):p\377(8o\377$4m\377!2j\377\36" \ ++ ".h\377\32+e\377\27(c\377\27(d\377\203\30)d\377\314\31*e\377\203\30)d" \ ++ "\377\3\35-g\377#3k\377,;r\377\202.=s\377\202-t\377\2021Av\377\3""1Au\3770@u\3771Au\377\2100@u\377\2241Au" \ ++ "\377\2020@u\377\2241Au\377\2040@u\377\1""0@t\377\2030@u\377\2""1@u\377" \ ++ "0@u\377\2021Au\377\14""1Av\3770@u\377-=s\377+;q\377(8p\377%6n\377\"3" \ ++ "k\377\40""1j\377\36/i\377\35-g\377\33,f\377\31*e\377\206\30)d\377\317" \ ++ "\31*e\377\202\30)d\377\3\35.h\377&6m\377+;q\377\202.=s\377\202-s\377\206.>t\377\204.\77t\377\1/\77" \ ++ "t\377\203.\77t\377\207.>t\377\204.>s\377\14,=r\377+;q\377)9p\377(8o\377" \ ++ "&7n\377$5l\377\"3k\377\40""1j\377\36/h\377\33,f\377\31*e\377\27)d\377" \ ++ "\210\30)d\377\331\31*e\377\202\30)d\377\4\31)d\377\31*e\377\36.h\377" \ ++ ")8p\377\202.=s\377\202-s\377.=s\377\202-s\377.=s\377\203-s\377\202." \ ++ "=s\377\203-s\377\203.=s\377\203-t\377-s\377\202.=s\377\204-s\377,;q\377'7o\377" \ ++ "$4l\377\40""0i\377\34,g\377\32+f\377\32+e\377\203\31*e\377\1\30)e\377" \ ++ "\207\30)d\377\300\31*e\377\210\30)d\377\203\31*e\377\10\32*e\377\32+" \ ++ "e\377\33,f\377\36.h\377\"1k\377%5m\377)9p\377-s\377\14-=s\377+:q\377)8o\377&5n\377#3l\377!" \ ++ "1j\377\37""0i\377\36.h\377\35-g\377\33,f\377\32+f\377\31*e\377\212\30" \ ++ ")d\377\256\31*e\377\212\30)d\377\14\30*e\377\31+e\377\33,f\377\34,g\377" \ ++ "\35.h\377\37/i\377\40""0i\377\"2k\377$4m\377'6n\377*9p\377,;r\377\202" \ ++ "/>s\377\1/=s\377\203.=s\377\205-\377\10\15\37\377\202\7\15!\377\2\12\20)\377\23\40O\377" \ ++ "\314\31*e\377\202\30)d\377\4\31*e\377\33,f\377\34-g\377\35.g\377\202" \ ++ "\36.h\377\1\35-g\377\206\36.h\377\3\34-g\377\33+f\377\31*e\377\202\30" \ ++ ")d\377\1\30)e\377\377\31*e\377\377\31*e\377\257\31*e\377\3\21\34E\377" \ ++ "\7\13\32\377\6\13\33\377\243\7\13\33\377\1\6\13\33\377\244\31*e\377\2" \ ++ "\27'_\377\12\23.\377\205\7\13\33\377\1\20\33C\377\310\31*e\377\203\30" \ ++ ")d\377\4\32,f\377\34-g\377\35-g\377\35.h\377\202\36.h\377\1\35-g\377" \ ++ "\203\36.h\377\4\35-g\377\36.h\377\36-g\377\34,f\377\203\31*e\377\202" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\261\31*e\377\3\21\34E\377\7\13\32" \ ++ "\377\6\13\33\377\243\7\13\33\377\1\6\13\33\377\244\31*e\377\2\26%Z\377" \ ++ "\10\15#\377\205\7\13\33\377\1\15\26""6\377\304\31*e\377\202\30)d\377" \ ++ "\1\31*d\377\202\31*e\377\1\33,f\377\203\36.h\377\1\35-g\377\203\36.h" \ ++ "\377\1\35-g\377\202\36.h\377\202\35-g\377\2\33,f\377\31*e\377\202\30" \ ++ ")d\377\377\31*e\377\377\31*e\377\265\31*e\377\3\21\34E\377\7\13\32\377" \ ++ "\7\12\33\377\244\7\13\33\377\244\31*e\377\1\25#U\377\206\7\13\33\377" \ ++ "\1\16\27""8\377\302\31*e\377\202\30)d\377\4\31*e\377\32*e\377\33,f\377" \ ++ "\34-g\377\212\36.h\377\3\35-g\377\34,g\377\32+e\377\203\30)d\377\377" \ ++ "\31*e\377\377\31*e\377\267\31*e\377\3\20\33C\377\7\13\33\377\6\12\32" \ ++ "\377\243\7\13\33\377\1\7\12\33\377\244\31*e\377\3\26%Y\377\10\15!\377" \ ++ "\6\12\32\377\204\7\13\33\377\1\14\24""0\377\277\31*e\377\203\30)d\377" \ ++ "\4\32+e\377\33,f\377\34-g\377\35-g\377\202\36.h\377\2\36-g\377\35.h\377" \ ++ "\203\36.h\377\1\35-g\377\202\36.h\377\2\34,g\377\33+f\377\202\31*e\377" \ ++ "\202\30)d\377\377\31*e\377\377\31*e\377\271\31*e\377\2\17\32\77\377\6" \ ++ "\12\32\377\244\7\13\33\377\1\7\12\33\377\244\31*e\377\3\27'_\377\12\22" \ ++ "-\377\7\12\32\377\204\7\13\33\377\1\12\22.\377\275\31*e\377\202\30)d" \ ++ "\377\2\31*e\377\33,f\377\203\35-g\377\202\36.h\377\1\36-g\377\207\36" \ ++ ".h\377\3\34,f\377\32+e\377\31*e\377\203\30)d\377\377\31*e\377\377\31" \ ++ "*e\377\273\31*e\377\2\20\32@\377\6\12\33\377\244\7\13\33\377\1\6\13\33" \ ++ "\377\227\31*e\377\1\30)b\377\214\27'^\377\2\27'_\377\15\27""8\377\204" \ ++ "\7\13\33\377\2\6\12\32\377\13\22-\377\270\31*e\377\203\30)d\377\202\31" \ ++ "*e\377\2\32*e\377\34-g\377\203\36.h\377\1\35-g\377\203\36.h\377\1\35" \ ++ "-g\377\202\36.h\377\203\35-g\377\4\32+f\377\30)e\377\30)d\377\30)e\377" \ ++ "\377\31*e\377\377\31*e\377\277\31*e\377\2\20\32@\377\6\12\33\377\244" \ ++ "\7\13\33\377\1\6\13\33\377\227\31*e\377\2\23\40O\377\12\20)\377\212\13" \ ++ "\22+\377\4\13\21+\377\13\22,\377\10\16\"\377\6\12\32\377\204\7\13\33" \ ++ "\377\1\12\17'\377\266\31*e\377\202\30)d\377\202\31*e\377\3\32+f\377\33" \ ++ ",f\377\35.g\377\202\36.h\377\1\35-g\377\203\36.h\377\1\35-g\377\203\36" \ ++ ".h\377\4\35-g\377\34-g\377\33,f\377\32*e\377\203\30)d\377\377\31*e\377" \ ++ "\377\31*e\377\301\31*e\377\2\17\32@\377\6\12\33\377\244\7\13\33\377\1" \ ++ "\7\12\33\377\227\31*e\377\2\21\35G\377\7\13\32\377\213\7\12\33\377\206" \ ++ "\7\13\33\377\2\6\12\32\377\11\17$\377\263\31*e\377\203\30)d\377\4\32" \ ++ "+e\377\33,f\377\34-g\377\35-g\377\203\36.h\377\1\35-g\377\204\36.h\377" \ ++ "\7\35-g\377\36.h\377\36-g\377\35-f\377\33,f\377\32*e\377\31*e\377\202" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\304\31*e\377\2\17\32\77\377\6\13" \ ++ "\33\377\244\7\13\33\377\1\7\12\33\377\227\31*e\377\2\22\37L\377\7\13" \ ++ "\32\377\221\7\13\33\377\2\7\13\32\377\11\17%\377\260\31*e\377\203\30" \ ++ ")d\377\2\31*d\377\33,f\377\203\35-g\377\207\36.h\377\1\35-g\377\203\36" \ ++ ".h\377\1\33+f\377\202\31*e\377\1\31*d\377\202\30)d\377\1\30*e\377\377" \ ++ "\31*e\377\377\31*e\377\305\31*e\377\2\20\32@\377\6\12\33\377\244\7\13" \ ++ "\33\377\1\6\13\33\377\227\31*e\377\1\24\"R\377\224\7\13\33\377\253\31" \ ++ "*e\377\203\30)d\377\203\31*e\377\3\33+f\377\35.h\377\36.h\377\202\36" \ ++ ".g\377\1\35-h\377\207\36.h\377\202\35-g\377\2\34,g\377\32+f\377\203\30" \ ++ ")d\377\377\31*e\377\377\31*e\377\312\31*e\377\2\20\32@\377\6\12\33\377" \ ++ "\244\7\13\33\377\1\6\13\33\377\227\31*e\377\1\24!Q\377\223\7\13\33\377" \ ++ "\1\7\13\34\377\250\31*e\377\203\30)d\377\6\31*d\377\31*e\377\32+f\377" \ ++ "\33,f\377\35-g\377\35.h\377\202\36.h\377\1\35-g\377\203\36.h\377\2\35" \ ++ "-h\377\36.g\377\203\36.h\377\4\35-g\377\34,g\377\32+f\377\31*e\377\203" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\314\31*e\377\2\17\32@\377\6\12\33" \ ++ "\377\244\7\13\33\377\1\7\12\33\377\227\31*e\377\2\26%Y\377\7\13\32\377" \ ++ "\222\7\13\33\377\1\6\13\34\377\245\31*e\377\1\30)e\377\202\30)d\377\5" \ ++ "\30)e\377\32+f\377\33,f\377\34-g\377\35-g\377\203\36.h\377\2\36-g\377" \ ++ "\35.h\377\203\36.h\377\1\35-g\377\202\36.h\377\5\36-h\377\35-g\377\33" \ ++ ",f\377\32+e\377\31*e\377\203\30)d\377\377\31*e\377\377\31*e\377\317\31" \ ++ "*e\377\2\17\32\77\377\6\13\33\377\244\7\13\33\377\1\7\12\33\377\227\31" \ ++ "*e\377\1\26%[\377\223\7\13\33\377\1\6\13\34\377\243\31*e\377\202\30)" \ ++ "d\377\3\31*d\377\32+f\377\34,g\377\202\35-g\377\1\35.h\377\202\36.h\377" \ ++ "\2\36.g\377\35-h\377\207\36.h\377\2\35-g\377\33,e\377\203\31*e\377\203" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\321\31*e\377\2\20\32@\377\6\12\33" \ ++ "\377\244\7\13\33\377\2\7\13\32\377\30(a\377\226\31*e\377\1\26&\\\377" \ ++ "\223\7\13\33\377\1\7\13\34\377\234\31*e\377\204\30)d\377\203\31*e\377" \ ++ "\2\33,f\377\34-g\377\202\36.h\377\2\36.g\377\35-h\377\204\36.h\377\1" \ ++ "\35-g\377\203\36.h\377\203\35-g\377\2\33,f\377\31*e\377\202\30)d\377" \ ++ "\1\30)e\377\377\31*e\377\377\31*e\377\243\31*e\377\6\30)b\377\27'^\377" \ ++ "\26%Y\377\25$W\377\24\"S\377\23\40O\377\202\22\36J\377\6\23!P\377\24" \ ++ "#T\377\25$W\377\26%Y\377\27'^\377\30)d\377\245\31*e\377\2\20\32@\377" \ ++ "\6\12\33\377\245\7\13\33\377\1\30(b\377\226\31*e\377\1\30(b\377\224\7" \ ++ "\13\33\377\231\31*e\377\203\30)d\377\2\30)e\377\31*e\377\202\32+f\377" \ ++ "\3\34,g\377\35.h\377\36/h\377\202\36.h\377\2\36-g\377\35-g\377\207\36" \ ++ ".h\377\202\35-g\377\3\34,g\377\33,f\377\32*e\377\203\30)d\377\1\30*e" \ ++ "\377\377\31*e\377\377\31*e\377\236\31*e\377\32\23\40M\377\22\36J\377" \ ++ "\20\33B\377\16\30;\377\15\25""3\377\13\22.\377\13\21,\377\11\21*\377" \ ++ "\12\20'\377\10\17%\377\10\16#\377\10\15!\377\7\13\37\377\7\12\33\377" \ ++ "\7\13\33\377\7\14\37\377\7\15!\377\11\16#\377\11\17$\377\11\17(\377\12" \ ++ "\21*\377\12\22,\377\13\22.\377\15\25""4\377\16\30<\377\25#V\377\240\31" \ ++ "*e\377\2\20\32\77\377\6\12\33\377\244\7\13\33\377\2\6\13\33\377\30(b" \ ++ "\377\226\31*e\377\1\30)d\377\224\7\13\33\377\1\30(b\377\225\31*e\377" \ ++ "\203\30)d\377\6\31*e\377\32+f\377\33,g\377\34,g\377\35-g\377\35.h\377" \ ++ "\203\36.h\377\1\36-g\377\204\36.h\377\1\35-g\377\204\36.h\377\5\34-g" \ ++ "\377\33+f\377\32+e\377\31*e\377\30*e\377\202\30)d\377\215\31*e\377\2" \ ++ "\27'^\377\22\36J\377\205\22\37L\377\1\23\37L\377\377\31*e\377\377\31" \ ++ "*e\377\215\31*e\377\2\6\12\35\377\7\13\34\377\202\7\12\33\377\3\6\12" \ ++ "\32\377\6\12\33\377\7\13\32\377\202\6\13\32\377\16\7\13\33\377\6\13\33" \ ++ "\377\6\13\32\377\7\13\33\377\7\12\33\377\6\12\32\377\7\13\33\377\6\12" \ ++ "\32\377\7\12\32\377\7\13\33\377\6\13\33\377\7\13\33\377\7\12\33\377\6" \ ++ "\13\32\377\202\7\13\33\377\2\11\21*\377\30)c\377\237\31*e\377\2\17\32" \ ++ "\77\377\6\13\33\377\244\7\13\33\377\2\6\12\32\377\30(b\377\226\31*e\377" \ ++ "\1\30)d\377\224\7\13\33\377\1\30(b\377\221\31*e\377\204\30)d\377\2\32" \ ++ "+e\377\33,f\377\202\35-h\377\2\35-g\377\35.h\377\203\36.h\377\1\35.h" \ ++ "\377\205\36.h\377\1\35-g\377\202\36.h\377\3\35-g\377\34,g\377\32+f\377" \ ++ "\202\31*e\377\1\31*d\377\203\30)d\377\217\31*e\377\2\24\"S\377\7\12\33" \ ++ "\377\205\7\13\34\377\1\7\14\36\377\377\31*e\377\320\31*e\377\2\20\33" \ ++ "B\377\7\13\32\377\216\7\13\35\377\2\7\14\35\377\6\13\35\377\207\7\13" \ ++ "\35\377\6\7\13\34\377\10\17&\377\16\27""8\377\20\33D\377\25#U\377\30" \ ++ ")d\377\235\31*e\377\1\6\12\33\377\231\7\13\33\377\1\21\34E\377\237\31" \ ++ "*e\377\2\20\32@\377\6\12\33\377\245\7\13\33\377\1\30(a\377\226\31*e\377" \ ++ "\1\30)d\377\223\7\13\33\377\2\6\12\32\377\26&\\\377\212\31*e\377\204" \ ++ "\30)d\377\203\31*e\377\4\32+f\377\33,f\377\34-g\377\36/h\377\202\36." \ ++ "h\377\2\36-g\377\35.g\377\211\36.h\377\203\35-g\377\3\33,f\377\32*e\377" \ ++ "\31)d\377\202\30)d\377\225\31*e\377\1\24\"R\377\206\7\13\33\377\1\7\13" \ ++ "\35\377\377\31*e\377\317\31*e\377\2\23\40M\377\7\13\32\377\217\7\13\33" \ ++ "\377\3\6\13\33\377\7\13\33\377\6\13\32\377\206\7\13\33\377\13\6\13\33" \ ++ "\377\7\13\33\377\6\12\32\377\7\13\33\377\6\12\33\377\7\13\33\377\7\14" \ ++ "!\377\14\24""2\377\17\31>\377\23!Q\377\26%[\377\230\31*e\377\1\6\12\33" \ ++ "\377\231\7\13\33\377\1\17\31>\377\237\31*e\377\2\20\32@\377\6\12\33\377" \ ++ "\245\7\13\33\377\1\26&\\\377\226\31*e\377\2\30)d\377\7\12\33\377\223" \ ++ "\7\13\33\377\2\23\40N\377\25$X\377\205\25$W\377\204\24#V\377\202\25$" \ ++ "W\377\4\26%W\377\26%X\377\27%X\377\30&X\377\203\31'Y\377\3\36.h\377\36" \ ++ "-g\377\35-g\377\204\36.h\377\1\35-g\377\204\36.h\377\5\35-g\377\34-g" \ ++ "\377\34,f\377\33+f\377\31*e\377\203\30)d\377\1\30*e\377\227\31*e\377" \ ++ "\1\24\"R\377\206\7\13\33\377\1\7\13\35\377\377\31*e\377\317\31*e\377" \ ++ "\1\21\34D\377\235\7\13\33\377\1\6\12\33\377\203\7\13\33\377\3\6\13\33" \ ++ "\377\7\13\33\377\6\13\32\377\203\30)d\377\225\31*e\377\1\6\12\33\377" \ ++ "\231\7\13\33\377\1\17\31>\377\237\31*e\377\2\20\32\77\377\6\12\33\377" \ ++ "\244\7\13\33\377\2\6\12\32\377\26%Z\377\226\31*e\377\3\30)d\377\7\13" \ ++ "\33\377\6\13\33\377\222\7\13\33\377\3\10\16\"\377\10\16#\377\11\15#\377" \ ++ "\204\11\15\"\377\1\11\15#\377\213\11\16#\377\1\12\17%\377\204\36.h\377" \ ++ "\1\35-g\377\203\36.h\377\6\36.g\377\35-g\377\33,f\377\32+e\377\32*e\377" \ ++ "\31*e\377\204\30)d\377\232\31*e\377\1\24\"R\377\206\7\13\33\377\1\6\12" \ ++ "\34\377\377\31*e\377\317\31*e\377\2\21\34E\377\6\12\33\377\242\7\13\33" \ ++ "\377\4\7\12\33\377\33,g\377\32+f\377\31*e\377\205\30)d\377\220\31*e\377" \ ++ "\1\6\12\33\377\231\7\13\33\377\1\17\31>\377\237\31*e\377\2\17\32\77\377" \ ++ "\6\13\33\377\244\7\13\33\377\2\6\12\33\377\26%Z\377\226\31*e\377\3\30" \ ++ ")d\377\6\13\35\377\6\13\32\377\221\7\13\33\377\2\7\12\33\377\6\13\33" \ ++ "\377\222\7\13\33\377\3\7\13\34\377\36.h\377\35-g\377\203\36.h\377\3\35" \ ++ "-g\377\33,g\377\32+e\377\203\31*e\377\204\30)d\377\235\31*e\377\1\24" \ ++ "\"R\377\206\7\13\33\377\3\6\12\34\377\21\34D\377\25$W\377\210\31*e\377" \ ++ "\4\17\32\77\377\16\27""9\377\17\31>\377\20\33C\377\212\20\33B\377\205" \ ++ "\22\37K\377\2\23\40N\377\24\"T\377\203\25#U\377\2\24\"T\377\25$X\377" \ ++ "\205\27'^\377\1\30)c\377\377\31*e\377\245\31*e\377\2\21\34E\377\6\13" \ ++ "\33\377\243\7\13\33\377\203\36.h\377\202\35.h\377\2\33,f\377\32+f\377" \ ++ "\205\31*e\377\205\30)d\377\207\31*e\377\1\6\12\33\377\231\7\13\33\377" \ ++ "\1\17\32>\377\237\31*e\377\1\16\30;\377\245\7\13\33\377\2\7\13\32\377" \ ++ "\26%Z\377\226\31*e\377\2\30)d\377\6\14\35\377\246\7\13\33\377\1\7\13" \ ++ "\34\377\202\35-g\377\3\33,f\377\32+e\377\31*e\377\203\30)d\377\244\31" \ ++ "*e\377\1\24\"R\377\206\7\13\33\377\3\6\12\33\377\7\14\36\377\24\"R\377" \ ++ "\206\31*e\377\2\30(a\377\15\25""5\377\202\7\13\33\377\1\6\13\32\377\212" \ ++ "\7\13\33\377\3\6\12\33\377\7\13\33\377\6\13\33\377\202\7\13\33\377\3" \ ++ "\7\12\32\377\7\12\33\377\6\13\32\377\212\7\13\33\377\2\11\17$\377\27" \ ++ "'^\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33" \ ++ "\377\202\36.h\377\2\35-g\377\36-g\377\204\36.h\377\6\35.h\377\34-g\377" \ ++ "\34,f\377\33,g\377\32+e\377\32+f\377\203\31*e\377\206\30)d\377\2\31*" \ ++ "e\377\6\12\33\377\231\7\13\33\377\1\17\32>\377\203\31*e\377\203\30)d" \ ++ "\377\1\30(b\377\203\27(`\377\1\27'^\377\203\26&\\\377\1\26%Y\377\203" \ ++ "\25$W\377\1\25$X\377\203\25$W\377\3\25#U\377\24\"R\377\30(a\377\203\31" \ ++ "*e\377\1\26%Z\377\202\25$W\377\2\14\26""5\377\6\12\32\377\245\7\13\33" \ ++ "\377\1\25#U\377\226\31*e\377\2\30)d\377\7\15!\377\246\7\13\33\377\2\7" \ ++ "\13\34\377\31*e\377\204\30)d\377\247\31*e\377\1\24\"R\377\207\7\13\33" \ ++ "\377\2\11\17&\377\27'_\377\205\31*e\377\3\30(b\377\14\26""5\377\6\13" \ ++ "\32\377\236\7\13\33\377\3\7\13\32\377\11\20&\377\27'^\377\377\31*e\377" \ ++ "\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\206\36.h\377\2" \ ++ "\36-g\377\35-g\377\205\36.h\377\11\35.h\377\35-g\377\30%V\377\24\40K" \ ++ "\377\23\37I\377\25\"Q\377\30'^\377\31+f\377\31*e\377\202\30)d\377\1\6" \ ++ "\12\33\377\231\7\13\33\377\1\17\31>\377\202\31*e\377\2\17\31\77\377\13" \ ++ "\21,\377\202\12\22-\377\14\13\22,\377\12\21)\377\12\20*\377\12\20)\377" \ ++ "\11\20(\377\12\20'\377\12\20&\377\11\17'\377\11\17%\377\10\16#\377\11" \ ++ "\17$\377\10\17#\377\203\11\17$\377\4\10\16$\377\10\15#\377\7\13\35\377" \ ++ "\25$W\377\203\31*e\377\4\14\23""1\377\11\17$\377\11\17#\377\7\13\37\377" \ ++ "\246\7\13\33\377\1\24\"R\377\224\31*e\377\202\30)d\377\2\27(c\377\11" \ ++ "\16%\377\246\7\13\33\377\1\7\13\34\377\202\30)d\377\252\31*e\377\1\24" \ ++ "\"R\377\207\7\13\33\377\1\13\24""2\377\205\31*e\377\4\30(a\377\13\22" \ ++ "-\377\7\13\33\377\6\13\32\377\236\7\13\33\377\3\7\13\32\377\11\17#\377" \ ++ "\27&]\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13" \ ++ "\33\377\203\36.h\377\1\36-g\377\207\36.h\377\5\26!M\377\17\30:\377\11" \ ++ "\20%\377\10\14\36\377\7\13\35\377\202\7\12\33\377\7\7\13\35\377\6\13" \ ++ "\35\377\7\14\37\377\12\17&\377\17\30""8\377\23\37H\377\7\12\33\377\231" \ ++ "\7\13\33\377\1\17\31>\377\202\31*e\377\2\13\22-\377\6\12\32\377\202\7" \ ++ "\13\33\377\6\6\12\32\377\6\12\33\377\7\13\33\377\6\13\33\377\7\12\32" \ ++ "\377\6\13\33\377\202\7\13\33\377\5\6\13\32\377\6\12\33\377\7\13\33\377" \ ++ "\6\12\33\377\6\13\33\377\202\7\13\33\377\4\7\12\33\377\7\13\33\377\6" \ ++ "\12\32\377\25#U\377\203\31*e\377\3\12\20)\377\7\12\33\377\7\13\32\377" \ ++ "\246\7\13\33\377\2\6\13\33\377\24!R\377\216\31*e\377\206\30)d\377\203" \ ++ "\31*e\377\1\10\16$\377\246\7\13\33\377\1\7\13\34\377\254\31*e\377\1\24" \ ++ "!R\377\206\7\13\33\377\2\6\13\32\377\21\35G\377\204\31*e\377\5\27&]\377" \ ++ "\12\20(\377\6\13\33\377\6\12\32\377\6\13\32\377\236\7\13\33\377\3\6\13" \ ++ "\33\377\7\15!\377\27&]\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\13" \ ++ "\33\377\243\7\13\33\377\3\31*e\377\33,f\377\34-g\377\204\35-g\377\204" \ ++ "\36.h\377\1\12\21*\377\210\7\13\33\377\1\7\13\32\377\203\7\13\33\377" \ ++ "\1\6\13\32\377\231\7\13\33\377\5\16\31>\377\30)d\377\31*e\377\13\23." \ ++ "\377\6\12\32\377\224\7\13\33\377\1\25#U\377\203\31*e\377\1\11\20)\377" \ ++ "\251\7\13\33\377\1\23!P\377\206\30)d\377\210\31*e\377\12\32+f\377\33" \ ++ "+f\377\34,g\377\34-h\377\35.h\377\36.h\377\36/i\377\36.h\377\35-g\377" \ ++ "\14\22,\377\246\7\13\33\377\1\7\13\34\377\254\31*e\377\2\26%[\377\11" \ ++ "\17&\377\205\7\13\33\377\2\6\13\34\377\26&\\\377\203\31*e\377\4\27(`" \ ++ "\377\13\23.\377\7\13\33\377\6\13\33\377\241\7\13\33\377\2\7\15\40\377" \ ++ "\26&]\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13" \ ++ "\33\377\204\30)d\377\4\31*e\377\32+e\377\33+f\377\34,f\377\202\34-g\377" \ ++ "\2\35-g\377\13\22,\377\246\7\13\33\377\5\17\32>\377\31*e\377\30)d\377" \ ++ "\13\22.\377\6\12\32\377\224\7\13\33\377\1\25#U\377\203\31*e\377\1\11" \ ++ "\20)\377\251\7\13\33\377\1\22\36K\377\202\31*e\377\204\32+f\377\6\33" \ ++ ",g\377\33,f\377\34,g\377\34-g\377\35-h\377\35.h\377\206\36.h\377\2\36" \ ++ "-h\377\35-g\377\202\36-g\377\2\35-g\377\13\22-\377\246\7\13\33\377\1" \ ++ "\7\13\34\377\255\31*e\377\2\17\31>\377\6\12\32\377\203\7\13\33\377\2" \ ++ "\6\12\32\377\10\15\40\377\204\31*e\377\3\26%Y\377\10\16\"\377\6\12\32" \ ++ "\377\241\7\13\33\377\3\6\13\32\377\6\13\34\377\26&[\377\377\31*e\377" \ ++ "\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\204\31*e\377\204" \ ++ "\30)d\377\203\31*e\377\1\12\22+\377\246\7\13\33\377\5\20\33\77\377\34" \ ++ "-h\377\34-g\377\13\20)\377\7\12\33\377\224\7\13\33\377\1\24\"T\377\203" \ ++ "\30)d\377\2\11\20)\377\7\12\33\377\250\7\13\33\377\1\25\40K\377\202\35" \ ++ "-g\377\2\35-h\377\35.h\377\206\36.h\377\4\36.g\377\36-h\377\36.h\377" \ ++ "\35-g\377\202\36-g\377\206\36.h\377\3\35-g\377\15\24/\377\6\12\33\377" \ ++ "\245\7\13\33\377\1\7\13\34\377\255\31*e\377\2\23!P\377\10\14\37\377\203" \ ++ "\7\13\33\377\2\6\13\33\377\7\14\37\377\204\31*e\377\2\25#V\377\7\14\36" \ ++ "\377\242\7\13\33\377\3\7\12\32\377\6\13\33\377\26&\\\377\377\31*e\377" \ ++ "\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\210\31*e\377\203" \ ++ "\30)d\377\1\12\21+\377\246\7\13\33\377\1\21\33\77\377\202\36.h\377\2" \ ++ "\11\17%\377\6\13\32\377\223\7\13\33\377\3\7\12\32\377\27%W\377\34,g\377" \ ++ "\202\33,g\377\2\13\21*\377\7\12\33\377\247\7\13\33\377\2\6\13\33\377" \ ++ "\25!L\377\202\36.h\377\4\36.g\377\36-h\377\36.h\377\35-g\377\202\36-" \ ++ "g\377\212\36.h\377\2\35.h\377\36-g\377\202\36.h\377\3\35-g\377\17\27" \ ++ "5\377\6\12\32\377\245\7\13\33\377\1\7\13\34\377\255\31*e\377\2\27'_\377" \ ++ "\11\16#\377\204\7\13\33\377\1\7\13\35\377\204\31*e\377\3\24\"S\377\6" \ ++ "\13\32\377\6\12\32\377\241\7\13\33\377\3\7\12\32\377\7\13\33\377\26%" \ ++ "Z\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\13\33\377\243\7\13\33" \ ++ "\377\213\31*e\377\1\12\22+\377\246\7\13\33\377\1\21\34@\377\202\36.h" \ ++ "\377\2\12\17&\377\6\13\32\377\224\7\13\33\377\1\31%W\377\202\36.h\377" \ ++ "\2\35,e\377\12\21(\377\251\7\13\33\377\1\25!L\377\204\36.h\377\2\35." \ ++ "h\377\36-h\377\207\36.h\377\1\35-h\377\206\35-g\377\5\34,g\377\33,f\377" \ ++ "\32*e\377\15\26""5\377\7\13\32\377\245\7\13\33\377\1\7\13\34\377\256" \ ++ "\31*e\377\1\12\20(\377\204\7\13\33\377\2\7\12\33\377\30(a\377\203\31" \ ++ "*e\377\1\24!Q\377\245\7\13\33\377\1\26%Z\377\377\31*e\377\244\31*e\377" \ ++ "\2\21\34E\377\6\12\33\377\243\7\13\33\377\213\31*e\377\1\12\22+\377\246" \ ++ "\7\13\33\377\5\21\34@\377\36.h\377\36-h\377\12\17&\377\6\12\33\377\223" \ ++ "\7\13\33\377\5\7\12\33\377\31'Y\377\36.h\377\30%V\377\13\23,\377\252" \ ++ "\7\13\33\377\1\25!L\377\205\36.h\377\2\35.h\377\35-h\377\203\35-g\377" \ ++ "\202\34,g\377\1\34,f\377\202\33+f\377\2\32+f\377\32+e\377\202\31*e\377" \ ++ "\203\30)d\377\3\27(c\377\15\25""4\377\7\13\32\377\245\7\13\33\377\1\7" \ ++ "\13\34\377\256\31*e\377\1\16\27""9\377\204\7\13\33\377\2\6\13\34\377" \ ++ "\26%Y\377\203\31*e\377\2\21\36I\377\7\12\33\377\243\7\13\33\377\2\7\12" \ ++ "\32\377\26%Z\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243" \ ++ "\7\13\33\377\213\31*e\377\1\12\22+\377\246\7\13\33\377\5\21\33\77\377" \ ++ "\35-h\377\35.h\377\10\16!\377\7\12\33\377\223\7\13\33\377\5\7\13\32\377" \ ++ "\22\34A\377\20\31""9\377\11\16\"\377\7\12\33\377\252\7\13\33\377\1\24" \ ++ "\40K\377\202\34,f\377\2\33,f\377\33+f\377\202\32+f\377\1\32*e\377\205" \ ++ "\31*e\377\207\30)d\377\203\31*e\377\3\30)d\377\15\25""5\377\7\13\32\377" \ ++ "\245\7\13\33\377\1\7\13\34\377\256\31*e\377\2\21\35F\377\6\12\33\377" \ ++ "\203\7\13\33\377\2\6\13\34\377\24\"R\377\202\31*e\377\2\30)d\377\17\32" \ ++ "@\377\244\7\13\33\377\2\7\12\33\377\26%Z\377\377\31*e\377\244\31*e\377" \ ++ "\2\21\34E\377\6\12\33\377\243\7\13\33\377\213\31*e\377\1\12\21+\377\246" \ ++ "\7\13\33\377\1\17\31>\377\202\31*e\377\2\6\13\34\377\7\12\33\377\223" \ ++ "\7\13\33\377\5\6\12\32\377\6\13\34\377\6\13\33\377\7\13\33\377\6\13\33" \ ++ "\377\251\7\13\33\377\2\7\12\32\377\20\33B\377\204\31*e\377\210\30)d\377" \ ++ "\212\31*e\377\2\30)d\377\14\25""4\377\246\7\13\33\377\1\7\13\34\377\256" \ ++ "\31*e\377\1\24\"R\377\204\7\13\33\377\2\7\13\34\377\22\37L\377\202\31" \ ++ "*e\377\3\30)d\377\16\27""8\377\6\13\32\377\243\7\13\33\377\2\6\12\32" \ ++ "\377\26%Z\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\13\33\377\243" \ ++ "\7\13\33\377\213\31*e\377\1\13\22,\377\246\7\13\33\377\1\17\32>\377\202" \ ++ "\31*e\377\1\7\14\35\377\303\7\13\33\377\1\20\33B\377\227\31*e\377\1\17" \ ++ "\31=\377\246\7\13\33\377\1\7\13\34\377\256\31*e\377\3\27'`\377\7\13\32" \ ++ "\377\6\13\32\377\202\7\13\33\377\2\7\13\34\377\22\37K\377\202\31*e\377" \ ++ "\2\30)d\377\14\25""3\377\245\7\13\33\377\1\25#T\377\377\31*e\377\244" \ ++ "\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\205\31*e\377\7\30" \ ++ ")c\377\27'^\377\26%Z\377\25$W\377\24\"R\377\23!P\377\11\16%\377\246\7" \ ++ "\13\33\377\1\17\32>\377\202\31*e\377\1\7\13\35\377\303\7\13\33\377\1" \ ++ "\20\32@\377\227\31*e\377\1\17\31<\377\246\7\13\33\377\1\7\13\34\377\234" \ ++ "\31*e\377\1\25$X\377\221\26%Y\377\1\27'^\377\205\7\13\33\377\1\20\33" \ ++ "A\377\202\31*e\377\2\30)d\377\15\25""4\377\244\7\13\33\377\3\7\12\32" \ ++ "\377\22\36I\377\26%[\377\377\31*e\377\243\31*e\377\2\21\34E\377\6\12" \ ++ "\33\377\243\7\13\33\377\14\24!P\377\22\36I\377\20\32@\377\15\26""7\377" \ ++ "\15\25""4\377\13\23""0\377\12\21*\377\12\20'\377\11\16$\377\7\13\37\377" \ ++ "\7\13\33\377\6\12\33\377\246\7\13\33\377\1\17\31>\377\202\31*e\377\1" \ ++ "\6\12\33\377\302\7\13\33\377\2\7\13\32\377\16\30:\377\227\31*e\377\2" \ ++ "\20\32@\377\6\12\32\377\245\7\13\33\377\1\7\13\34\377\233\31*e\377\2" \ ++ "\30)c\377\10\15!\377\221\11\17&\377\2\11\20'\377\6\12\33\377\204\7\13" \ ++ "\33\377\1\16\30""9\377\202\31*e\377\3\30)d\377\13\23/\377\6\12\33\377" \ ++ "\244\7\13\33\377\4\11\16#\377\11\17'\377\16\30:\377\27'`\377\377\31*" \ ++ "e\377\241\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\11\7\13\36" \ ++ "\377\7\13\35\377\7\13\34\377\7\13\32\377\6\13\33\377\6\13\32\377\7\12" \ ++ "\33\377\7\13\33\377\7\12\32\377\202\7\13\33\377\1\7\12\33\377\246\7\13" \ ++ "\33\377\1\17\31>\377\202\31*e\377\2\6\13\32\377\7\12\33\377\301\7\13" \ ++ "\33\377\2\6\12\32\377\16\30:\377\227\31*e\377\1\21\34D\377\246\7\13\33" \ ++ "\377\1\7\13\34\377\233\31*e\377\2\30)c\377\7\13\33\377\221\6\13\33\377" \ ++ "\202\7\13\33\377\1\6\13\33\377\202\7\13\33\377\2\7\13\32\377\14\24""3" \ ++ "\377\202\31*e\377\2\30)c\377\13\21,\377\244\7\13\33\377\1\6\12\33\377" \ ++ "\202\7\13\33\377\3\7\13\32\377\11\17&\377\26%Y\377\377\31*e\377\240\31" \ ++ "*e\377\2\21\34E\377\6\13\33\377\325\7\13\33\377\1\17\32>\377\202\31*" \ ++ "e\377\304\7\13\33\377\1\13\24""2\377\227\31*e\377\1\20\34D\377\246\7" \ ++ "\13\33\377\1\7\13\34\377\233\31*e\377\1\30)c\377\227\7\13\33\377\2\6" \ ++ "\13\32\377\12\22,\377\202\31*e\377\2\30)c\377\10\17%\377\252\7\13\33" \ ++ "\377\4\24!Q\377\30)c\377\30)b\377\30(b\377\377\31*e\377\234\31*e\377" \ ++ "\2\21\34E\377\6\12\33\377\325\7\13\33\377\1\17\32>\377\202\31*e\377\304" \ ++ "\7\13\33\377\1\14\24""2\377\227\31*e\377\2\22\37J\377\6\13\32\377\245" \ ++ "\7\13\33\377\4\7\13\34\377\26%[\377\26&\\\377\30(b\377\230\31*e\377\1" \ ++ "\26&[\377\230\7\13\33\377\1\13\22,\377\202\31*e\377\2\30)c\377\11\17" \ ++ "$\377\253\7\13\33\377\3\13\22/\377\14\24""1\377\13\23.\377\377\31*e\377" \ ++ "\234\31*e\377\2\21\34E\377\6\12\33\377\325\7\13\33\377\1\17\31>\377\202" \ ++ "\31*e\377\1\7\13\32\377\302\7\13\33\377\2\7\13\32\377\13\22-\377\227" \ ++ "\31*e\377\2\23\37L\377\7\12\32\377\245\7\13\33\377\7\6\13\32\377\10\15" \ ++ "#\377\12\20(\377\13\22.\377\15\26""7\377\21\34E\377\26%Z\377\223\31*" \ ++ "e\377\3\30)b\377\20\33B\377\12\20)\377\230\7\13\33\377\6\12\21)\377\30" \ ++ "(b\377\31*e\377\30)c\377\10\14\37\377\7\13\32\377\250\7\13\33\377\3\6" \ ++ "\12\33\377\7\13\33\377\6\12\32\377\202\7\13\33\377\377\31*e\377\234\31" \ ++ "*e\377\2\21\34E\377\6\12\33\377\325\7\13\33\377\1\17\31>\377\202\31*" \ ++ "e\377\303\7\13\33\377\2\6\12\33\377\12\21*\377\227\31*e\377\1\23\40O" \ ++ "\377\247\7\13\33\377\1\7\13\32\377\203\7\13\33\377\4\7\13\35\377\10\13" \ ++ "\37\377\13\22,\377\26%Z\377\206\31*e\377\205\27(`\377\3\27'`\377\27'" \ ++ "_\377\25$X\377\202\25$W\377\2\22\36J\377\10\16$\377\231\7\13\33\377\7" \ ++ "\6\13\32\377\11\20&\377\27&]\377\31*e\377\30)c\377\7\13\35\377\6\12\32" \ ++ "\377\255\7\13\33\377\377\31*e\377\234\31*e\377\2\21\34E\377\6\13\33\377" \ ++ "\325\7\13\33\377\1\17\32>\377\202\31*e\377\304\7\13\33\377\1\12\20*\377" \ ++ "\227\31*e\377\1\24#T\377\255\7\13\33\377\3\6\13\33\377\7\13\33\377\21" \ ++ "\35F\377\204\31*e\377\1\16\30<\377\205\6\13\32\377\206\7\13\33\377\1" \ ++ "\7\12\33\377\231\7\13\33\377\6\6\13\33\377\10\16$\377\26%Y\377\31*e\377" \ ++ "\30)c\377\7\12\34\377\256\7\13\33\377\1\31*e\377\204\30)b\377\202\30" \ ++ ")c\377\1\30)d\377\377\31*e\377\224\31*e\377\2\21\34E\377\6\12\33\377" \ ++ "\325\7\13\33\377\3\17\32>\377\31*e\377\30)c\377\304\7\13\33\377\1\12" \ ++ "\20*\377\227\31*e\377\1\24\"T\377\257\7\13\33\377\2\10\16\"\377\26%Y" \ ++ "\377\202\31*e\377\2\30(a\377\14\24""0\377\246\7\13\33\377\5\11\15#\377" \ ++ "\25$V\377\31*e\377\30)c\377\6\13\32\377\256\7\13\33\377\205\14\24""1" \ ++ "\377\7\14\25""3\377\16\27""8\377\20\33A\377\22\37K\377\23!Q\377\25$W" \ ++ "\377\27&\\\377\377\31*e\377\220\31*e\377\2\21\34E\377\6\13\33\377\325" \ ++ "\7\13\33\377\3\17\31>\377\31*e\377\27&]\377\303\7\13\33\377\2\7\12\33" \ ++ "\377\11\21)\377\227\31*e\377\1\24\"T\377\256\7\13\33\377\3\7\13\32\377" \ ++ "\10\13\37\377\23\40N\377\202\31*e\377\3\26%Z\377\10\16#\377\6\12\32\377" \ ++ "\244\7\13\33\377\6\7\12\33\377\10\15!\377\24\"S\377\31*e\377\30)c\377" \ ++ "\6\12\32\377\266\7\13\33\377\5\6\12\32\377\7\13\32\377\10\16\"\377\12" \ ++ "\20'\377\27'^\377\366\31*e\377\1\23\40O\377\227\31*e\377\1\22\37L\377" \ ++ "\326\7\13\33\377\3\17\31>\377\31*e\377\26&\\\377\303\7\13\33\377\2\7" \ ++ "\12\32\377\12\20(\377\227\31*e\377\1\24\"T\377\202\7\12\32\377\254\7" \ ++ "\13\33\377\3\7\13\32\377\6\12\32\377\21\33D\377\202\31*e\377\1\24\"S" \ ++ "\377\202\6\12\32\377\245\7\13\33\377\5\7\14\36\377\23\40N\377\31*e\377" \ ++ "\30)c\377\6\12\33\377\271\7\13\33\377\2\6\12\33\377\12\22-\377\365\31" \ ++ "*e\377\2\27'^\377\10\15\37\377\227\31*e\377\2\23\40N\377\7\13\32\377" \ ++ "\325\7\13\33\377\4\17\32>\377\31*e\377\26&\\\377\6\12\33\377\303\7\13" \ ++ "\33\377\2\12\20(\377\30)d\377\226\31*e\377\1\25#V\377\260\7\13\33\377" \ ++ "\5\15\27""7\377\30)b\377\30)d\377\17\32\77\377\6\12\32\377\245\7\13\33" \ ++ "\377\6\7\12\33\377\7\13\34\377\22\36I\377\31*e\377\30)c\377\6\12\32\377" \ ++ "\273\7\13\33\377\1\22\36H\377\212\31*e\377\25\30)d\377\30)c\377\30(b" \ ++ "\377\30(a\377\27'`\377\25\"T\377\22\36J\377\17\32>\377\17\31=\377\15" \ ++ "\26""5\377\12\22-\377\10\16\"\377\12\20'\377\13\23/\377\16\30:\377\17" \ ++ "\31=\377\21\34D\377\23\40M\377\25#V\377\27(`\377\30(a\377\202\30(b\377" \ ++ "\1\30)b\377\202\30)c\377\317\31*e\377\3\30)b\377\14\24""2\377\6\12\33" \ ++ "\377\227\31*e\377\1\23\40N\377\326\7\13\33\377\3\17\32>\377\31*e\377" \ ++ "\26%Y\377\303\7\13\33\377\3\6\13\33\377\11\17&\377\27(`\377\226\31*e" \ ++ "\377\3\25$V\377\7\13\33\377\6\12\33\377\255\7\13\33\377\5\7\13\32\377" \ ++ "\12\21*\377\27'_\377\30)d\377\12\21+\377\247\7\13\33\377\5\6\12\33\377" \ ++ "\21\35F\377\31*e\377\30)c\377\6\12\32\377\272\7\13\33\377\3\7\12\32\377" \ ++ "\12\20(\377\30(a\377\210\31*e\377\10\27'`\377\20\32@\377\13\23""0\377" \ ++ "\11\16#\377\7\13\33\377\6\13\33\377\7\13\33\377\6\13\32\377\203\7\13" \ ++ "\33\377\3\6\13\33\377\7\13\33\377\7\12\33\377\206\7\13\33\377\7\6\13" \ ++ "\32\377\7\13\33\377\7\13\35\377\11\17$\377\12\21+\377\14\24""2\377\20" \ ++ "\33A\377\317\31*e\377\1\23\40N\377\202\7\13\33\377\227\31*e\377\1\23" \ ++ "\40N\377\326\7\13\33\377\3\17\31>\377\31*e\377\24\"S\377\304\7\13\33" \ ++ "\377\2\11\17%\377\27'_\377\226\31*e\377\3\25$X\377\7\14\35\377\6\12\32" \ ++ "\377\256\7\13\33\377\4\7\14\35\377\26%Z\377\30)d\377\7\13\32\377\250" \ ++ "\7\13\33\377\4\20\34D\377\31*e\377\30)c\377\6\12\32\377\272\7\13\33\377" \ ++ "\3\6\13\32\377\10\16#\377\25$X\377\210\31*e\377\4\20\34C\377\7\12\33" \ ++ "\377\7\13\33\377\7\13\32\377\220\7\13\33\377\1\6\13\33\377\202\7\12\33" \ ++ "\377\203\7\13\33\377\1\13\23/\377\316\31*e\377\4\30)d\377\21\35F\377" \ ++ "\6\12\32\377\7\13\33\377\227\31*e\377\2\23\40N\377\7\13\32\377\325\7" \ ++ "\13\33\377\4\17\31>\377\31*e\377\24\"S\377\6\12\33\377\302\7\13\33\377" \ ++ "\3\6\12\32\377\11\17%\377\26&\\\377\226\31*e\377\3\26%Y\377\10\15\40" \ ++ "\377\6\13\32\377\255\7\13\33\377\5\6\13\33\377\6\12\32\377\25$X\377\27" \ ++ "'^\377\6\12\33\377\250\7\13\33\377\4\17\32\77\377\31*e\377\30)c\377\6" \ ++ "\12\33\377\272\7\13\33\377\3\6\12\32\377\10\16\"\377\25#U\377\210\31" \ ++ "*e\377\2\17\31>\377\7\12\33\377\230\7\13\33\377\1\13\23""0\377\316\31" \ ++ "*e\377\4\30)d\377\21\34F\377\7\12\32\377\7\13\33\377\227\31*e\377\2\23" \ ++ "\40N\377\6\12\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\24\"S\377" \ ++ "\304\7\13\33\377\2\10\16#\377\26%Z\377\226\31*e\377\2\26%Z\377\10\16" \ ++ "#\377\256\7\13\33\377\2\6\13\33\377\7\12\32\377\202\26%Z\377\251\7\13" \ ++ "\33\377\1\16\27""8\377\202\30)c\377\1\6\12\32\377\272\7\13\33\377\3\6" \ ++ "\12\32\377\10\14\36\377\23!P\377\210\31*e\377\2\17\31>\377\7\13\32\377" \ ++ "\230\7\13\33\377\1\13\23""0\377\225\31*e\377\205\30)c\377\204\30)d\377" \ ++ "\260\31*e\377\4\30)d\377\21\35F\377\7\13\33\377\6\12\32\377\227\31*e" \ ++ "\377\1\23\40N\377\326\7\13\33\377\3\17\32>\377\31*e\377\23\40O\377\304" \ ++ "\7\13\33\377\2\10\16\"\377\25$X\377\226\31*e\377\2\26&[\377\11\17$\377" \ ++ "\257\7\13\33\377\3\7\14\36\377\26%[\377\26%Z\377\250\7\13\33\377\5\6" \ ++ "\12\32\377\14\23/\377\30(a\377\30)c\377\6\12\32\377\272\7\13\33\377\3" \ ++ "\6\13\33\377\7\13\33\377\22\36J\377\210\31*e\377\2\17\31>\377\7\13\32" \ ++ "\377\230\7\13\33\377\1\13\23""0\377\225\31*e\377\13\14\24""2\377\13\22" \ ++ ",\377\15\25""3\377\14\24""3\377\14\25""3\377\16\30""9\377\17\30<\377" \ ++ "\17\33A\377\21\35E\377\22\36J\377\26&]\377\256\31*e\377\4\30)d\377\21" \ ++ "\34E\377\6\12\33\377\6\13\32\377\227\31*e\377\1\23\40N\377\326\7\13\33" \ ++ "\377\3\17\31>\377\31*e\377\22\36I\377\304\7\13\33\377\3\7\12\33\377\14" \ ++ "\23""0\377\25#U\377\225\31*e\377\3\26&\\\377\12\20'\377\7\12\32\377\256" \ ++ "\7\13\33\377\3\11\16$\377\27&]\377\26%Z\377\252\7\13\33\377\3\21\34E" \ ++ "\377\30)d\377\7\12\33\377\274\7\13\33\377\1\21\35F\377\210\31*e\377\1" \ ++ "\17\32>\377\231\7\13\33\377\1\13\23""0\377\225\31*e\377\5\10\15\"\377" \ ++ "\7\13\33\377\6\13\33\377\6\12\33\377\6\13\32\377\205\7\13\33\377\1\22" \ ++ "\37L\377\256\31*e\377\5\30)d\377\20\32@\377\6\12\32\377\7\13\33\377\27" \ ++ "'^\377\226\31*e\377\2\23\40N\377\7\13\32\377\325\7\13\33\377\4\17\31" \ ++ ">\377\31*e\377\21\36I\377\6\13\33\377\302\7\13\33\377\1\6\13\32\377\202" \ ++ "\7\13\33\377\3\7\14\37\377\16\27""8\377\30)b\377\223\31*e\377\3\27&]" \ ++ "\377\11\20)\377\6\13\32\377\256\7\13\33\377\4\13\22+\377\27'_\377\26" \ ++ "%Z\377\6\13\32\377\247\7\13\33\377\203\6\13\32\377\2\27&]\377\7\12\33" \ ++ "\377\273\7\13\33\377\2\6\12\32\377\20\33A\377\210\31*e\377\1\16\30;\377" \ ++ "\231\7\13\33\377\1\13\23""0\377\225\31*e\377\1\11\16#\377\210\7\13\33" \ ++ "\377\2\6\13\35\377\23\37M\377\256\31*e\377\5\30)d\377\17\31>\377\6\12" \ ++ "\32\377\7\13\33\377\27'_\377\226\31*e\377\2\23\40N\377\6\12\32\377\325" \ ++ "\7\13\33\377\3\17\32>\377\31*e\377\22\36I\377\306\7\13\33\377\5\7\13" \ ++ "\32\377\7\13\33\377\10\15!\377\23\40N\377\30)d\377\221\31*e\377\2\27" \ ++ "']\377\12\21*\377\257\7\13\33\377\3\12\21+\377\27'`\377\26%Z\377\247" \ ++ "\7\13\33\377\1\6\12\33\377\202\7\13\33\377\2\15\26""4\377\30)d\377\275" \ ++ "\7\13\33\377\2\16\30:\377\30)c\377\207\31*e\377\1\15\26""5\377\231\7" \ ++ "\13\33\377\1\14\23""0\377\205\31*e\377\204\30)d\377\214\31*e\377\1\11" \ ++ "\16#\377\210\7\13\33\377\2\7\13\34\377\23\37M\377\203\31*e\377\245\30" \ ++ ")d\377\206\31*e\377\2\30)c\377\15\27""7\377\202\7\13\33\377\1\25%X\377" \ ++ "\226\31*e\377\1\23\40N\377\326\7\13\33\377\3\17\32>\377\31*e\377\21\34" \ ++ "D\377\311\7\13\33\377\2\6\13\32\377\25#V\377\221\31*e\377\2\27']\377" \ ++ "\12\20*\377\257\7\13\33\377\3\13\24""0\377\30(a\377\26%Z\377\247\7\13" \ ++ "\33\377\6\6\13\33\377\7\13\33\377\11\17%\377\27'_\377\30)c\377\6\12\32" \ ++ "\377\274\7\13\33\377\2\14\24""2\377\30(a\377\207\31*e\377\2\15\26""5" \ ++ "\377\7\12\33\377\227\7\13\33\377\16\7\13\32\377\12\22.\377\27(`\377\26" \ ++ "%Y\377\25#V\377\24\"R\377\23\37L\377\20\32A\377\15\26""5\377\14\23""0" \ ++ "\377\14\25""3\377\23\40N\377\26&\\\377\30)d\377\211\31*e\377\1\11\16" \ ++ "$\377\210\7\13\33\377\7\7\13\35\377\23\40N\377\31*e\377\27&\\\377\23" \ ++ "!Q\377\16\27""8\377\14\24""3\377\243\15\25""3\377\1\23\40N\377\205\31" \ ++ "*e\377\5\30)b\377\14\25""3\377\7\13\33\377\7\12\33\377\25#U\377\226\31" \ ++ "*e\377\1\23\40N\377\326\7\13\33\377\4\17\31>\377\31*e\377\20\32\77\377" \ ++ "\7\12\33\377\307\7\13\33\377\3\6\12\32\377\7\12\32\377\26$X\377\221\31" \ ++ "*e\377\3\30(a\377\12\22,\377\7\12\32\377\256\7\13\33\377\3\15\26""7\377" \ ++ "\30)c\377\26%Z\377\247\7\13\33\377\6\7\13\32\377\7\14\37\377\23\40M\377" \ ++ "\31*e\377\30)c\377\6\12\32\377\274\7\13\33\377\2\13\22-\377\27'`\377" \ ++ "\207\31*e\377\2\15\26""5\377\7\12\33\377\230\7\13\33\377\5\10\14\37\377" \ ++ "\12\20*\377\11\16$\377\7\13\35\377\6\12\32\377\206\7\13\33\377\3\11\17" \ ++ "&\377\15\26""8\377\26$X\377\210\31*e\377\1\11\16#\377\210\7\13\33\377" \ ++ "\5\7\13\35\377\24\"S\377\31*e\377\13\22.\377\6\12\32\377\202\7\12\32" \ ++ "\377\242\7\13\33\377\3\6\13\32\377\7\14\37\377\25$X\377\204\31*e\377" \ ++ "\5\30)b\377\14\24""1\377\6\12\33\377\7\13\33\377\24!Q\377\226\31*e\377" \ ++ "\2\23\40M\377\7\13\32\377\325\7\13\33\377\4\17\31>\377\31*e\377\20\32" \ ++ "\77\377\7\12\33\377\311\7\13\33\377\1\17\31\77\377\211\22\36H\377\2\21" \ ++ "\35G\377\25$X\377\202\31*e\377\1\21\35F\377\202\22\36H\377\4\21\35H\377" \ ++ "\22\36I\377\14\24""1\377\6\12\33\377\256\7\13\33\377\4\16\30<\377\31" \ ++ "*e\377\26%Z\377\6\13\32\377\247\7\13\33\377\1\13\22,\377\202\31*e\377" \ ++ "\2\30)c\377\6\12\33\377\273\7\13\33\377\3\7\12\33\377\12\20&\377\27'" \ ++ "_\377\207\31*e\377\2\15\26""5\377\6\12\32\377\233\7\13\33\377\3\7\12" \ ++ "\33\377\7\13\33\377\6\13\33\377\205\7\13\33\377\3\6\12\33\377\6\13\33" \ ++ "\377\21\35G\377\206\31*e\377\2\30)d\377\16\27:\377\211\7\13\33\377\4" \ ++ "\7\14\34\377\26%Z\377\31*e\377\10\15#\377\245\7\13\33\377\202\6\12\32" \ ++ "\377\1\11\17&\377\204\31*e\377\5\30(b\377\12\21+\377\7\13\33\377\7\12" \ ++ "\32\377\22\37M\377\226\31*e\377\2\24#T\377\6\12\32\377\325\7\13\33\377" \ ++ "\3\17\32>\377\31*e\377\20\32\77\377\325\7\13\33\377\3\15\25""4\377\30" \ ++ ")b\377\26%[\377\204\7\13\33\377\2\10\16\"\377\12\22,\377\256\7\13\33" \ ++ "\377\4\7\12\33\377\20\33C\377\31*e\377\26%Z\377\247\7\13\33\377\2\6\13" \ ++ "\32\377\13\22-\377\202\31*e\377\2\30)c\377\6\12\32\377\273\7\13\33\377" \ ++ "\3\6\13\32\377\10\14\37\377\27&]\377\207\31*e\377\2\15\26""5\377\7\12" \ ++ "\33\377\245\7\13\33\377\1\21\35G\377\205\31*e\377\2\30)c\377\16\26""8" \ ++ "\377\202\6\12\32\377\210\7\13\33\377\4\7\14\36\377\30(b\377\31*e\377" \ ++ "\10\15#\377\246\7\13\33\377\3\6\13\33\377\7\13\33\377\14\24""0\377\203" \ ++ "\31*e\377\5\30(a\377\10\16\"\377\7\13\32\377\7\13\33\377\21\34E\377\226" \ ++ "\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377" \ ++ "\20\32\77\377\325\7\13\33\377\3\10\16#\377\26&\\\377\26%[\377\203\7\13" \ ++ "\33\377\3\7\12\32\377\7\14\34\377\7\15\40\377\257\7\13\33\377\3\20\32" \ ++ "@\377\31*e\377\26%Z\377\247\7\13\33\377\2\6\13\32\377\13\22-\377\202" \ ++ "\31*e\377\2\30)c\377\6\12\32\377\273\7\13\33\377\3\7\12\33\377\7\13\33" \ ++ "\377\26%[\377\207\31*e\377\1\14\24""1\377\246\7\13\33\377\1\21\35G\377" \ ++ "\204\31*e\377\4\27'`\377\14\24""2\377\7\13\33\377\7\13\32\377\210\7\13" \ ++ "\33\377\2\7\12\33\377\7\14\35\377\202\31*e\377\1\10\15#\377\251\7\13" \ ++ "\33\377\1\20\34D\377\202\31*e\377\5\30(`\377\6\13\32\377\7\13\33\377" \ ++ "\6\13\33\377\20\34C\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13" \ ++ "\33\377\3\17\32>\377\31*e\377\20\32\77\377\324\7\13\33\377\4\7\13\32" \ ++ "\377\7\13\33\377\26%Y\377\24!P\377\264\7\13\33\377\4\7\13\32\377\11\17" \ ++ "$\377\26%[\377\26%Z\377\247\7\13\33\377\2\6\13\33\377\13\23.\377\203" \ ++ "\31*e\377\1\6\12\32\377\275\7\13\33\377\1\26$Y\377\207\31*e\377\2\13" \ ++ "\22-\377\6\13\33\377\245\7\13\33\377\1\21\35G\377\203\31*e\377\3\26%" \ ++ "[\377\13\22-\377\7\12\32\377\212\7\13\33\377\2\6\13\33\377\10\15!\377" \ ++ "\202\31*e\377\1\10\15#\377\250\7\13\33\377\5\7\12\33\377\10\15\37\377" \ ++ "\24\"S\377\31*e\377\26&\\\377\203\7\13\33\377\1\20\34D\377\226\31*e\377" \ ++ "\2\25$W\377\7\13\32\377\325\7\13\33\377\4\17\31>\377\31*e\377\20\32\77" \ ++ "\377\7\12\33\377\323\7\13\33\377\4\7\13\32\377\6\12\32\377\25$W\377\16" \ ++ "\27""9\377\265\7\13\33\377\4\7\13\32\377\12\21*\377\26%[\377\6\13\32" \ ++ "\377\247\7\13\33\377\5\11\17&\377\22\37K\377\22\35I\377\21\35G\377\6" \ ++ "\13\33\377\275\7\13\33\377\1\23\40O\377\207\31*e\377\2\12\22,\377\6\13" \ ++ "\33\377\244\7\13\33\377\2\7\12\32\377\21\35G\377\202\31*e\377\2\26%Z" \ ++ "\377\11\20'\377\214\7\13\33\377\2\6\13\32\377\13\22-\377\202\31*e\377" \ ++ "\1\10\15#\377\250\7\13\33\377\5\6\12\33\377\6\12\32\377\11\17&\377\30" \ ++ ")b\377\23\40M\377\203\7\13\33\377\1\17\31>\377\226\31*e\377\2\25$W\377" \ ++ "\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\17\32\77\377\325\7" \ ++ "\13\33\377\4\6\12\33\377\22\36J\377\7\13\33\377\7\12\32\377\266\7\13" \ ++ "\33\377\2\13\21-\377\6\12\32\377\351\7\13\33\377\1\20\33C\377\207\31" \ ++ "*e\377\2\13\22-\377\6\13\33\377\245\7\13\33\377\4\21\35G\377\31*e\377" \ ++ "\27'^\377\10\14\37\377\216\7\13\33\377\1\16\27""9\377\202\31*e\377\1" \ ++ "\10\15#\377\252\7\13\33\377\7\6\12\32\377\15\26""6\377\20\32A\377\7\13" \ ++ "\32\377\7\13\33\377\6\13\32\377\15\27""8\377\226\31*e\377\2\25$W\377" \ ++ "\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\15\26""7\377\325\7" \ ++ "\13\33\377\3\6\13\33\377\10\15\40\377\6\13\33\377\377\7\13\33\377\243" \ ++ "\7\13\33\377\1\15\27""8\377\207\31*e\377\1\13\22-\377\246\7\13\33\377" \ ++ "\3\21\35G\377\31*e\377\21\34E\377\217\7\13\33\377\1\21\34D\377\202\31" \ ++ "*e\377\1\10\15#\377\253\7\13\33\377\6\7\12\32\377\11\16#\377\7\12\33" \ ++ "\377\7\13\33\377\7\13\32\377\13\23""0\377\226\31*e\377\2\25$W\377\7\13" \ ++ "\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\15\26""7\377\325\7\13\33" \ ++ "\377\202\7\13\32\377\377\7\13\33\377\243\7\13\33\377\2\7\13\32\377\15" \ ++ "\26""5\377\207\31*e\377\2\12\21*\377\6\13\33\377\245\7\13\33\377\3\21" \ ++ "\35G\377\31*e\377\14\23.\377\217\7\13\33\377\1\22\37K\377\202\31*e\377" \ ++ "\1\10\15#\377\253\7\13\33\377\2\7\13\32\377\6\13\33\377\203\7\13\33\377" \ ++ "\1\12\21+\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17" \ ++ "\31>\377\31*e\377\15\26""7\377\377\7\13\33\377\373\7\13\33\377\1\12\20" \ ++ "(\377\207\31*e\377\2\11\17%\377\6\13\33\377\244\7\13\33\377\3\7\12\32" \ ++ "\377\22\36I\377\31*e\377\202\6\13\32\377\215\7\13\33\377\2\7\12\33\377" \ ++ "\25$X\377\202\31*e\377\1\10\15#\377\257\7\13\33\377\2\6\12\32\377\10" \ ++ "\15!\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32" \ ++ ">\377\31*e\377\14\25""3\377\377\7\13\33\377\373\7\13\33\377\1\7\12\34" \ ++ "\377\207\31*e\377\1\11\17%\377\246\7\13\33\377\2\14\24""1\377\15\27""8" \ ++ "\377\220\7\13\33\377\203\31*e\377\1\10\15#\377\260\7\13\33\377\1\10\15" \ ++ "\37\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32>" \ ++ "\377\31*e\377\13\22-\377\377\7\13\33\377\373\7\13\33\377\5\6\12\32\377" \ ++ "\26&\\\377\27'^\377\30(`\377\30)b\377\203\31*e\377\1\11\17%\377\246\7" \ ++ "\13\33\377\3\6\13\33\377\7\13\33\377\7\12\33\377\217\7\13\33\377\4\30" \ ++ "(`\377\27'^\377\30)c\377\10\15\"\377\260\7\13\33\377\1\10\15\37\377\226" \ ++ "\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377" \ ++ "\13\22-\377\377\7\13\33\377\374\7\13\33\377\5\7\15\40\377\13\22,\377" \ ++ "\13\24""1\377\15\25""6\377\23\40M\377\202\31*e\377\1\11\17%\377\267\7" \ ++ "\13\33\377\5\7\13\34\377\13\22,\377\13\21*\377\12\22,\377\7\13\35\377" \ ++ "\260\7\13\33\377\2\7\14\37\377\30(a\377\225\31*e\377\2\25$W\377\7\13" \ ++ "\32\377\325\7\13\33\377\3\17\31>\377\31*e\377\13\23.\377\377\7\13\33" \ ++ "\377\373\7\13\33\377\3\6\13\33\377\7\13\33\377\6\12\32\377\202\7\13\33" \ ++ "\377\1\15\27""8\377\202\31*e\377\1\11\17%\377\270\7\13\33\377\3\6\12" \ ++ "\32\377\7\13\33\377\6\13\32\377\261\7\13\33\377\2\7\13\36\377\27&]\377" \ ++ "\225\31*e\377\2\25$V\377\7\13\32\377\325\7\13\33\377\4\17\31>\377\31" \ ++ "*e\377\11\17$\377\7\12\33\377\377\7\13\33\377\377\7\13\33\377\1\16\27" \ ++ "7\377\202\31*e\377\1\11\17%\377\354\7\13\33\377\2\6\13\34\377\25#U\377" \ ++ "\225\31*e\377\1\26&[\377\326\7\13\33\377\3\17\32>\377\31*e\377\11\17" \ ++ "$\377\377\7\13\33\377\377\7\13\33\377\2\7\13\33\377\14\23/\377\202\31" \ ++ "*e\377\1\11\17%\377\354\7\13\33\377\20\7\13\34\377\14\24""0\377\15\26" \ ++ "7\377\15\26""6\377\15\26""5\377\21\34D\377\31*e\377\30)c\377\27'^\377" \ ++ "\24\"S\377\15\26""7\377\11\17%\377\17\30;\377\24\"R\377\27&]\377\30(" \ ++ "b\377\207\31*e\377\1\30(a\377\326\7\13\33\377\4\17\32>\377\31*e\377\11" \ ++ "\17$\377\6\13\33\377\377\7\13\33\377\377\7\13\33\377\1\14\23/\377\202" \ ++ "\31*e\377\1\11\17%\377\354\7\13\33\377\1\7\13\32\377\203\7\13\33\377" \ ++ "\6\6\13\33\377\10\16#\377\21\35F\377\16\30""9\377\12\20)\377\7\13\32" \ ++ "\377\202\7\13\33\377\7\6\12\33\377\6\13\33\377\11\17$\377\15\25""4\377" \ ++ "\21\34D\377\24\"R\377\25#V\377\203\25#U\377\2\25#V\377\24!Q\377\326\7" \ ++ "\13\33\377\4\17\31>\377\31*e\377\10\14\36\377\6\13\33\377\377\7\13\33" \ ++ "\377\376\7\13\33\377\2\6\13\33\377\12\20(\377\202\31*e\377\1\11\17%\377" \ ++ "\360\7\13\33\377\7\7\13\32\377\7\12\33\377\6\13\33\377\7\13\33\377\6" \ ++ "\12\32\377\6\13\32\377\6\12\32\377\203\7\13\33\377\5\6\13\33\377\7\13" \ ++ "\32\377\7\13\33\377\7\14!\377\10\16!\377\204\10\16\"\377\2\10\16!\377" \ ++ "\7\13\32\377\325\7\13\33\377\2\17\31>\377\31*e\377\202\6\13\33\377\377" \ ++ "\7\13\33\377\376\7\13\33\377\2\7\12\32\377\11\17&\377\202\31*e\377\1" \ ++ "\11\17%\377\360\7\13\33\377\2\7\13\32\377\6\13\32\377\211\7\13\33\377" \ ++ "\202\7\12\33\377\2\7\13\33\377\7\13\32\377\333\7\13\33\377\2\17\32>\377" \ ++ "\31*e\377\377\7\13\33\377\377\7\13\33\377\202\7\13\33\377\1\10\16\"\377" \ ++ "\202\31*e\377\1\11\17$\377\377\7\13\33\377\333\7\13\33\377\2\17\32>\377" \ ++ "\31*e\377\377\7\13\33\377\377\7\13\33\377\6\7\13\33\377\7\13\32\377\7" \ ++ "\13\35\377\31*e\377\30)d\377\10\15#\377\377\7\13\33\377\333\7\13\33\377" \ ++ "\2\17\31>\377\31*e\377\377\7\13\33\377\377\7\13\33\377\202\7\13\33\377" \ ++ "\4\7\14\35\377\31*e\377\30)d\377\11\16#\377\377\7\13\33\377\333\7\13" \ ++ "\33\377\2\17\31>\377\31*e\377\377\7\13\33\377\377\7\13\33\377\202\7\13" \ ++ "\33\377\4\7\14\35\377\31*e\377\30)d\377\11\16#\377\377\7\13\33\377\333" \ ++ "\7\13\33\377\3\12\20)\377\16\30:\377\7\13\32\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\5\7\13\33\377\7\14\35\377\31*e\377\30)d\377\11\16#\377\377" \ ++ "\7\13\33\377\332\7\13\33\377\1\7\13\32\377\377\7\13\33\377\377\7\13\33" \ ++ "\377\204\7\13\33\377\1\7\14\34\377\202\31*e\377\1\11\16#\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\337\7\13\33\377\4\6\12\33\377" \ ++ "\22\37K\377\22\36I\377\10\15\40\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\340\7\13\33\377\202\7\13\34\377\1\7\13\32\377\377\7\13\33" \ ++ "\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\344\7\13\33\377") ++ ++ +diff --git a/feeds/packages/utils/psplash/files/.svn/text-base/image_generic.h.svn-base b/feeds/packages/utils/psplash/files/.svn/text-base/image_generic.h.svn-base +new file mode 100644 +index 0000000..8db52fc +--- /dev/null ++++ b/feeds/packages/utils/psplash/files/.svn/text-base/image_generic.h.svn-base +@@ -0,0 +1,5475 @@ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++#define OWRT_IMG_ROWSTRIDE (1280) ++#define OWRT_IMG_WIDTH (320) ++#define OWRT_IMG_HEIGHT (320) ++#define OWRT_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ ++#define OWRT_IMG_RLE_PIXEL_DATA ((uint8*) \ ++ "\2ES\203\377DS\203\377\202FS\203\377\2FR\203\377FS\203\377\203FT\203\377" \ ++ "\10ET\202\377FT\203\377GS\204\377FT\203\377GT\204\377FT\203\377+;q\377" \ ++ "\30)d\377\205\31*e\377\3\30)d\377\36/h\377M}\377\77M~\377\35.h\377\30)d\377\207\31*e\377\12\30)d\377\32+f\377" \ ++ ">M~\377=J}\377L}\377BP\200\377\202AO\200\377\1@N" \ ++ "\200\377\204AO\200\377\3@O\177\377\77N~\377@M\177\377\203@N\177\377\11" \ ++ "\77M\177\377@N\177\377>L\177\377\77M\177\377\77M~\377\77M}\377\77M~\377" \ ++ "+;q\377\30)d\377\210\31*e\377\10\27(d\3771Au\377=K}\377t\377\30)d\377\204\31*e\377\3" \ ++ "\30)d\377\27(d\3770\77t\377\203HV\205\377\5GV\205\377HV\205\377IV\205" \ ++ "\377HV\205\377IU\205\377\202IV\205\377\202IW\205\377\1HW\204\377\202" \ ++ "IW\205\377\2JW\206\377IW\205\377\203JW\206\377\202JV\206\377\202JW\206" \ ++ "\377\203JX\206\377\2JW\206\377JX\206\377\204IX\206\377\213JX\206\377" \ ++ "\204IX\206\377\205JX\206\377\202JW\206\377\202JV\206\377\205JW\206\377" \ ++ "\202IW\205\377\202HW\204\377\202IW\205\377\13IV\205\377IU\205\377HV\205" \ ++ "\377IV\205\377HV\205\377GV\205\377GU\204\377HV\205\377AP\200\377\"2j" \ ++ "\377\27(c\377\204\31*e\377\6\30)d\377\33,f\377>M~\377GU\204\377FT\203" \ ++ "\377FS\203\377\205FT\203\377\14FS\203\377FR\203\377ES\203\377FS\203\377" \ ++ "ES\203\377DS\203\377ES\203\377ER\202\377ES\201\377ER\202\377DQ\202\377" \ ++ "CR\202\377\204DR\202\377\5DQ\201\377CP\200\377BP\200\377\37""0i\377\30" \ ++ ")d\377\206\31*e\377\4\27(d\3772@u\377BP\200\377AO\177\377\202AO\200\377" \ ++ "\1@N\200\377\202AO\200\377\3@O\177\377AO\200\377\77O~\377\206@N\177\377" \ ++ "\7\77M\177\377>L\177\377\77M\177\377\77M~\377>L}\3776Ex\377\32+e\377" \ ++ "\210\31*e\377\3\30)d\377!2j\377=K}\377\202" \ ++ "L\177\377\202\77M\177\377\3\77M~\377\77L~\377\34-g\377\211\31*e\377\6" \ ++ "\33,g\3778Gz\377=K}\377M}\377\202BP\200\377\2AO\200\377@N\200\377\204AO\200\377" \ ++ "\202@N\177\377\1@M\177\377\204@N\177\377\202\77M\177\377\6\77M~\377\77" \ ++ "M\177\377\77M~\377=K}\377\27(c\377\30)d\377\207\31*e\377\2\30)d\377#" \ ++ "3k\377\202=K}\377\1;K}\377\202L\177\377\202\77M\177\377\4>L~\377@N~\377%5m\377\30)d" \ ++ "\377\207\31*e\377\3\30)d\377\27(d\377;J|\377\202=K}\377\1;K}\377\202" \ ++ "s\377\33,f\377\221\31*e\377\1\27(c\377\202-=r\377\2-;q\377-" \ ++ "L\177\377\77M\177" \ ++ "\377\203\77M~\377\2""4Cw\377\30)d\377\210\31*e\377\10\27(d\377*9p\377" \ ++ ">L}\377=K}\377;K}\377L\177\377\77M\177\377\77M~\377>M~\377" \ ++ ";I{\377\35-g\377\210\31*e\377\6\30)d\377\34-f\377>L~\377=K}\377L\177" \ ++ "\377\202\77M\177\377\202\77M~\377\2$4l\377\30)d\377\210\31*e\377\6\32" \ ++ "+e\3778Fz\377=K}\377L\177\377\77M\177\377\202\77M~\377\2""4Cv\377\27(d\377" \ ++ "\211\31*e\377\7""1@t\377=K}\377L\177\377\77M~\377\77M\177\377\77M" \ ++ "}\377@N\177\377\31*e\377\30)d\377\207\31*e\377\22\30)d\377)9p\377M~\377" \ ++ "\30)d\377\204\31*e\377\7\30)d\377/\77t\377GU\204\377FU\203\377FS\203" \ ++ "\377FT\203\377ET\202\377\203FT\203\377\3FS\203\377ES\203\377FS\203\377" \ ++ "\203ES\203\377\5ES\202\377ES\201\377EQ\202\377DR\202\377CR\202\377\202" \ ++ "DR\202\377\6DQ\201\377DR\202\377DP\200\377CQ\201\377\30)e\377\30)d\377" \ ++ "\205\31*e\377\3\30)d\377#3k\377AO\177\377\202BP\200\377\2AO\200\377@" \ ++ "N\200\377\204AO\200\377\3@O\177\377@N\177\377@M\177\377\204@N\177\377" \ ++ "\203\77M\177\377\4>L}\377@N\177\377%4l\377\30)d\377\207\31*e\377\4\30" \ ++ ")d\377\"1k\377M~\377\202BP\200\377\2AO\200\377@N\200\377\204AO\200\377\3@O\177\377" \ ++ "@N\177\377@M\177\377\204@N\177\377\2>L\177\377\77M\177\377\203\77M~\377" \ ++ "\2""1@u\377\27(c\377\207\31*e\377\11\30)d\377\31+e\377L\177" \ ++ "\377\77M\177\377\77M~\377\77M}\377;I{\377\210\31*e\377\3\30)e\377\27" \ ++ "(c\3774Cw\377\202=K}\377\1;K}\377\202L\177\377\77M\177\377\202\77M~\377\2=K|\377\37/i\377\210\31*e\377" \ ++ "\10\30)d\377&6n\377>L~\377=J|\377;K}\377L\177\377\77M\177\377\77M~\377>L}\377%5" \ ++ "m\377\210\31*e\377\6\30)d\377\32+e\377>L}\377=K}\377L\177\377" \ ++ "\77M\177\377\202\77M~\377\2-L~\377\27(c\377\204\31*e\377\2\32+f\377@N\177\377\202HV\205\377" \ ++ "\3GV\205\377IV\205\377HV\205\377\202IV\205\377\4IW\205\377HW\204\377" \ ++ "JW\206\377IW\205\377\202JW\206\377\3JV\206\377JX\206\377JW\206\377\203" \ ++ "JX\206\377\10KX\205\377KX\206\377KW\207\377KX\206\377JY\207\377KX\207" \ ++ "\377LY\207\377KY\207\377\204LY\207\377\5LX\207\377LY\207\377KY\206\377" \ ++ "KZ\206\377LY\207\377\202MZ\210\377\1LZ\207\377\230MZ\210\377\7LZ\207" \ ++ "\377MZ\210\377LZ\207\377KZ\206\377KY\206\377LY\207\377LX\207\377\205" \ ++ "LY\207\377\202KY\207\377\14JX\207\377KX\206\377KX\207\377KX\206\377K" \ ++ "X\205\377KX\206\377JX\206\377IX\206\377JW\206\377JX\206\377JW\206\377" \ ++ "JV\206\377\203JW\206\377\3IW\205\377HW\204\377IW\205\377\203IV\205\377" \ ++ "\5HV\205\377GU\204\377HV\205\377/>t\377\30)d\377\203\31*e\377\24\30)" \ ++ "d\377!1j\377IV\205\377GU\204\377GT\204\377FS\203\377ET\202\377FT\203" \ ++ "\377FS\203\377FT\203\377FR\203\377ES\203\377FS\203\377DS\203\377ES\203" \ ++ "\377ES\202\377ES\201\377EQ\202\377DR\202\377CR\202\377\204DR\202\377" \ ++ "\4DQ\201\377ER\202\377\37""0i\377\30)d\377\206\31*e\377\2!1j\377@N~\377" \ ++ "\202BP\200\377\2AO\200\377@N\200\377\203AO\200\377\3@O\177\377\77O~\377" \ ++ "@M\177\377\204@N\177\377\7\77M\177\377>L\177\377\77M~\377\77M\177\377" \ ++ "\77M~\3777Fy\377\30)d\377\210\31*e\377\6\30)d\377-=r\377=K}\377s\377\34," \ ++ "g\377\220\31*e\377\4\30)d\377\34,g\377,L}\377AO\177\377\202AO\200" \ ++ "\377\1@N\200\377\204AO\200\377\3@O\177\377@N\177\377@M\177\377\204@N" \ ++ "\177\377\203\77M\177\377\4\77M}\377@M~\377\31*e\377\30)d\377\207\31*" \ ++ "e\377\4\30)d\377%5m\377=J}\377=K}\377\202L}\377@N\177\377" \ ++ "%4m\377\30)d\377\210\31*e\377\7!1j\377;I|\377=K}\377L\177\377\77M\177\377\77M~\377\77M}\377=K}\377\27" \ ++ "(c\377\30)d\377\207\31*e\377\7\32+e\3779Hz\377=J|\377M}\377\30)d\377\203\31*e\377" \ ++ "\7\30)d\377\37/i\377JX\206\377FT\203\377GT\204\377FS\203\377ET\202\377" \ ++ "\202FT\203\377\203FS\203\377\10ES\203\377DS\203\377ES\203\377ES\202\377" \ ++ "ER\201\377ER\202\377DR\202\377CR\202\377\203DR\202\377\202DQ\201\377" \ ++ "\2""7Ex\377\30*d\377\206\31*e\377\2\27(c\377L\177\377\77M\177\377\77M~\377" \ ++ "\202>L}\377\2\33,f\377\30)d\377\207\31*e\377\2\27(d\3777Fy\377\202=K" \ ++ "}\377\2;K}\377;J|\377\204>M\201\377\203=M\201\377\203=L\201\377\203<" \ ++ "L\200\377\4=M\201\377\30*h\377\32+i\377\30)d\377\204\31*e\377\2\30)d" \ ++ "\377\31*f\377\203\32+i\377\3!2n\3779H}\377:I~\377\2049I~\377\1""9H~\377" \ ++ "\2038H~\377\7""6Fy\3775Dw\3776Dx\3775Cx\3775Dx\377\32+e\377\30)d\377" \ ++ "\214\32+i\377\5\31+i\377#4p\3776F|\3773Cy\3771@u\377\2022Av\377\3""2" \ ++ "Au\3771@u\3770\77u\377\2041@u\377\2'7n\377\30)d\377\220\31*e\377\10\30" \ ++ ")d\377#3l\377-=s\377-=q\377-;r\377-s\377HV\205\377GV\205\377HV\205\377\203IV\205\377\203IW\205\377\205" \ ++ "JW\206\377\2JX\206\377IX\206\377\202JX\206\377\3KX\205\377KW\207\377" \ ++ "KX\206\377\202KY\207\377\205LY\207\377\5LX\207\377KY\206\377LZ\207\377" \ ++ "MZ\210\377LZ\207\377\204MZ\210\377\4LY\210\377MZ\210\377N[\210\377MZ" \ ++ "\207\377\202N[\210\377\4IU\200\377EPw\377.6R\377\22\26!\377\213\0\0\0" \ ++ "\377\5\30\33*\3772;Y\377FR{\377IV\201\377N[\211\377\202N[\210\377\5N" \ ++ "[\207\377MZ\210\377N[\210\377MZ\210\377LY\210\377\204MZ\210\377\6LZ\207" \ ++ "\377MZ\210\377LY\207\377KZ\206\377LY\207\377LX\207\377\203LY\207\377" \ ++ "\13KY\207\377LY\207\377JY\207\377KX\206\377KW\207\377KX\206\377KX\205" \ ++ "\377JX\206\377IX\206\377JW\206\377JX\206\377\204JW\206\377\5IW\205\377" \ ++ "HW\204\377IW\205\377IV\205\377IU\205\377\202HV\205\377\3GV\204\377DR" \ ++ "\202\377\40""0i\377\204\31*e\377\6\26(c\377\77M~\377GU\204\377GT\204" \ ++ "\377GS\204\377ET\202\377\203FT\203\377\203FS\203\377\1DS\203\377\202" \ ++ "ES\203\377\4ES\201\377ER\202\377DR\202\377CR\202\377\204DR\202\377\3" \ ++ "DQ\201\377=K|\377\33,f\377\206\31*e\377\6\30)d\377/\77t\377BP\200\377" \ ++ "AO\200\377BP\200\377@N\200\377\204AO\200\377\3@O\177\377\77N~\377@M\177" \ ++ "\377\204@N\177\377\1>L\177\377\202\77M\177\377\4\77M~\377>L}\377\40""0" \ ++ "i\377\30)d\377\207\31*e\377\2\27(d\3771\77u\377\202=K}\377\4;K}\377>" \ ++ "N\202\377\31\37""4\377\20\25#\377\205\21\26$\377\206\21\25$\377\5\22" \ ++ "\26%\377\10\15\36\377\10\16\"\377\31*e\377\30)d\377\204\31*e\377\2\21" \ ++ "\34E\377\6\14\35\377\202\7\14\36\377\1\10\16\36\377\202\20\24#\377\207" \ ++ "\17\24#\377\11\16\23\40\377(3Z\3776Ey\3776Dx\3776Cx\3775Dx\377\36.h\377" \ ++ "\31+g\377\6\13\32\377\213\7\14\36\377\5\6\14\36\377\11\16\36\377\16\23" \ ++ "!\377\34%C\3773By\377\2022Av\377\4""2Au\3771@t\3771@u\3770\77u\377\203" \ ++ "1@u\377\2+;q\377\30)d\377\220\31*e\377\17\30)d\377\40""1j\377-=s\377" \ ++ "-=q\377-;r\377-L\177\377\77M\177\377" \ ++ "\77M~\377>L}\377%5m\377\30)d\377\207\31*e\377\7\30)d\377)9p\377>L}\377" \ ++ "=K}\377;K}\377>M\201\377\32\40""7\377\217\0\0\0\377\1\30(a\377\205\31" \ ++ "*e\377\1\7\14\36\377\216\0\0\0\377\7\20\25%\3777G|\3776Dx\3776Cx\377" \ ++ "5Dx\377\"2l\377\25$V\377\217\0\0\0\377\10\40*K\3772Bx\3772Av\3772Au\377" \ ++ "2Av\3772At\3771@u\3770\77u\377\2031@u\377\2-L\177\377" \ ++ "\77M\177\377\77M~\377>L}\377*:p\377\30)d\377\207\31*e\377\12\30)d\377" \ ++ "\"2k\377>L~\377=K}\377;K}\377s\377\30)d\377\220\31*e\377\10\30)d\377" \ ++ "\34-g\377.>s\377,=q\377-;r\377,;q\377+9n\377\22\32""1\377\202\0\0\0\377" \ ++ "\5\1\1\1\377***\377\20\20\20\377\0\0\1\377\23\37L\377\220\31*e\377\2" \ ++ "\30)d\377!1j\377\203(8o\377\5'7o\377&6o\377'7o\377\36/h\377\30)d\377" \ ++ "\207\31*e\377\7\26'c\3778Gz\377IV\205\377HV\204\377HV\205\377IV\205\377" \ ++ "IU\205\377\202IV\205\377\11HW\204\377JW\206\377IW\205\377JW\206\377J" \ ++ "V\206\377JW\206\377JX\206\377IX\206\377JX\206\377\203KX\206\377\4KW\207" \ ++ "\377JY\207\377KX\207\377KY\207\377\205LY\207\377\4KZ\206\377LZ\207\377" \ ++ "MZ\210\377LZ\207\377\203MZ\210\377\1LY\210\377\202MZ\207\377\3P^\214" \ ++ "\3772;X\377\1\2\3\377\202\0\0\0\377\3III\377\255\255\255\377\372\372" \ ++ "\372\377\203\377\377\377\377\1\376\376\376\377\207\377\377\377\377\1" \ ++ "\376\376\376\377\203\377\377\377\377\3\367\367\367\377\245\245\245\377" \ ++ "DDD\377\202\0\0\0\377\3\3\3\5\3772;Y\377Q_\217\377\202N[\210\377\4MZ" \ ++ "\210\377N[\210\377MZ\210\377LY\210\377\203MZ\210\377\5LZ\207\377MZ\210" \ ++ "\377KZ\206\377LY\207\377LX\207\377\204LY\207\377\202KY\207\377\6KX\207" \ ++ "\377KW\206\377KX\205\377JX\206\377KX\206\377IX\206\377\202JW\206\377" \ ++ "\1JV\206\377\202JW\206\377\6IW\205\377HW\204\377IW\205\377IV\205\377" \ ++ "IU\205\377IV\205\377\202HV\205\377\3JX\206\377\35.h\377\30)d\377\203" \ ++ "\31*e\377\6\33,f\377\77N\177\377FU\203\377GT\204\377FT\203\377ET\202" \ ++ "\377\203FT\203\377\10FR\203\377FS\203\377ES\203\377DS\203\377ES\203\377" \ ++ "ES\202\377ES\201\377EQ\202\377\206DR\202\377\3DQ\201\3774Cw\377\27(c" \ ++ "\377\206\31*e\377\2\35-g\377=K}\377\202BP\200\377\2AO\200\377@N\200\377" \ ++ "\203AO\200\377\3@O\177\377\77O~\377@M\177\377\204@N\177\377\3\77M\177" \ ++ "\377>L\177\377\77M\177\377\202\77M~\377\1/>s\377\210\31*e\377\7\30)d" \ ++ "\377\32+e\377\77M~\377s\377.\77v\377(5f\377\25\35""7\377\2\3" \ ++ "\7\377\202\0\0\0\377\6HHH\377\264\264\264\377\377\377\377\377\"\"\"\377" \ ++ "\0\0\1\377\23\37L\377\220\31*e\377\3\30)d\377\40""0i\377'7n\377\202(" \ ++ "8o\377\5'7o\377&6o\377'7o\377&6n\377\30)d\377\206\31*e\377\3\30)d\377" \ ++ "\31*e\377GU\203\377\203HV\205\377\6IV\205\377IU\205\377IV\205\377IW\205" \ ++ "\377HW\204\377IW\205\377\202JW\206\377\1JV\206\377\202JW\206\377\1IX" \ ++ "\206\377\202JX\206\377\4KX\205\377KW\207\377KX\207\377KY\207\377\205" \ ++ "LY\207\377\5LX\207\377KZ\206\377LZ\207\377MZ\210\377LZ\207\377\203MZ" \ ++ "\210\377\5LY\210\377MZ\210\377N[\210\377Q^\216\377\37%6\377\202\0\0\0" \ ++ "\377\3""333\377\333\333\333\377\372\372\372\377\202\377\377\377\377\1" \ ++ "\376\376\376\377\215\377\377\377\377\1\376\376\376\377\202\377\377\377" \ ++ "\377\3\371\371\371\377\326\326\326\377***\377\202\0\0\0\377\4\34!3\377" \ ++ "N\\\213\377MZ\207\377N[\210\377\202MZ\210\377\1LY\210\377\205MZ\210\377" \ ++ "\3LY\207\377KZ\206\377LX\207\377\203LY\207\377\11KY\207\377LY\207\377" \ ++ "KX\207\377KX\206\377KW\207\377KX\205\377KX\206\377JX\206\377IX\206\377" \ ++ "\202JX\206\377\204JW\206\377\203IW\205\377\203IV\205\377\4GU\204\377" \ ++ "IW\206\3771@u\377\27(c\377\203\31*e\377\2\27(d\377:H{\377\202GU\204\377" \ ++ "\3FS\203\377FT\203\377ET\202\377\202FT\203\377\10FS\203\377FR\203\377" \ ++ "FS\203\377ES\203\377DS\203\377ES\203\377ES\202\377EQ\202\377\206DR\202" \ ++ "\377\3DQ\201\377\77L~\377\26'c\377\206\31*e\377\3\32+f\377;I{\377BP\200" \ ++ "\377\202AO\200\377\1@N\200\377\203AO\200\377\3@O\177\377\77O~\377@M\177" \ ++ "\377\204@N\177\377\2\77M\177\377>L\177\377\202\77M\177\377\2\77M}\377" \ ++ "3Bv\377\210\31*e\377\12\30)d\377\27(c\377;J|\377=K}\377L\177\377\202\77M\177" \ ++ "\377\3\77M}\3777Fy\377\32+e\377\210\31*e\377\11\27(d\3775Dx\377=K}\377" \ ++ "s\377=K}\377L}\377@N\177\377\"2j\377\30)d\377\207\31*e\377\13\30)d\377#3l\377=K" \ ++ "}\377L~\377\77M\177\377\77M~\377@N~\377)9p\377\30" \ ++ ")d\377\31*e\377\31)d\377\30)d\377\205\31*e\377\1!1j\377\202=K}\377\202" \ ++ "\377\35\"6\377\33!4\377\40&=\377%,F\377)2P\377/9Z\3774\77c\377\77" \ ++ "Ly\377HW\212\377ES\204\377=K|\377\31)d\377\205\31*e\377\5\30)d\377\26" \ ++ "'c\377BO\200\377@M|\377M\201\377\27\35" \ ++ "1\377\0\0\0\377vvv\377\212\377\377\377\377\11\246\246\246\377\0\0\0\377" \ ++ "\5\11\26\377\30(b\377\24\"S\377\1\2\5\377\23\23\23\377\335\335\335\377" \ ++ "\376\376\376\377\214\377\377\377\377\11\376\376\376\377\342\342\342\377" \ ++ "\16\16\16\377\1\2\3\377-8d\3776Dy\377\11\14\25\377\0\0\0\377\277\277" \ ++ "\277\377\210\377\377\377\377\7\376\376\376\377\377\377\377\377III\377" \ ++ "\0\0\0\377\16\27""9\377!1i\377-s\377IW\206\377HV\204\377HV\205\377IV\205\377IU\205\377IV\205\377I" \ ++ "W\205\377HW\204\377\203JW\206\377\4JV\206\377JW\206\377JX\206\377IX\206" \ ++ "\377\202KX\206\377\4KX\205\377KW\207\377KX\207\377KY\207\377\204LY\207" \ ++ "\377\3LX\207\377LY\207\377LZ\207\377\204MZ\210\377\10LY\210\377MZ\210" \ ++ "\377N\\\211\377\12\14\22\377\0\0\0\377\217\217\217\377\377\377\377\377" \ ++ "\376\376\376\377\211\377\377\377\377\5\376\376\376\377\377\377\377\377" \ ++ "\325\325\325\377555\377\3\3\3\377\203\2\2\2\377\5\6\6\6\377UUU\377\357" \ ++ "\357\357\377\377\377\377\377\376\376\376\377\211\377\377\377\377\202" \ ++ "\376\376\376\377\10nnn\377\0\0\0\377\25\30$\377MZ\207\377N[\207\377Q" \ ++ "_\216\377\25\30%\377\0\0\0\377\213\0\1\1\377\5\0\0\0\377\27\35+\377D" \ ++ "Q{\377\34!3\377\1\1\2\377\207\0\0\0\377\6\1\1\1\377\24\31%\377>Ip\377" \ ++ "JW\206\377HU\204\377IV\205\377\202HV\205\377\1GU\204\377\204\31*e\377" \ ++ "\13\30)e\377\35-g\377FT\203\377GU\204\377FT\203\377GT\204\377GU\204\377" \ ++ "2<_\377\23\30%\377\2\2\4\377\0\0\1\377\211\0\0\0\377\202\0\0\1\377\5" \ ++ "\12\15\25\377(/L\377\77M\177\377\34-g\377\30)d\377\205\31*e\377\5\26" \ ++ "'c\377;I|\377/8[\377\0\0\0\377\0\1\1\377\213\0\0\1\377\5\2\2\4\377BQ" \ ++ "\205\3778Dr\377\32\40""5\377\2\2\4\377\210\0\0\0\377\5\1\1\4\377\16\30" \ ++ ";\377\40""1l\377M\200\377M\177" \ ++ "\377ANz\377\12\14\23\377\202\0\0\0\377\6\6\6\6\377\222\222\222\377\337" \ ++ "\337\337\377\356\356\356\377\371\371\371\377\375\375\375\377\204\377" \ ++ "\377\377\377\7\375\375\375\377\371\371\371\377\366\366\366\377\361\361" \ ++ "\361\377\336\336\336\377www\377\6\6\6\377\202\0\0\0\377\4\2\3\11\377" \ ++ "\23\40O\377\31*e\377\30)d\377\202\31*e\377\6\27(c\3774Cx\377/8Z\377\0" \ ++ "\0\0\377666\377\344\344\344\377\207\351\351\351\377\2\352\352\352\377" \ ++ "\333\333\333\377\204\0\0\0\377\4TTT\377\316\316\316\377\361\361\361\377" \ ++ "\373\373\373\377\204\377\377\377\377\16\372\372\372\377\357\357\357\377" \ ++ "\267\267\267\377\16\16\16\377\0\0\0\377\0\0\1\377'1Q\377>M\200\377\377\30)c\377\202\31*e" \ ++ "\377\6\27(c\3772Bv\377/9Z\377\0\0\0\377;;;\377\370\370\370\377\210\377" \ ++ "\377\377\377\1\357\357\357\377\202\0\0\0\377\2\27\27\27\377\245\245\245" \ ++ "\377\202\377\377\377\377\1\376\376\376\377\206\377\377\377\377\1\376" \ ++ "\376\376\377\202\377\377\377\377\4GGG\377\0\0\0\377\1\1\1\3771=e\377" \ ++ "\203\377Tb\223\377\24\27" \ ++ "#\377\0\0\0\377\253\253\253\377\213\377\377\377\377\202\376\376\376\377" \ ++ "\217\377\377\377\377\6\301\301\301\377\0\0\0\377\5\6\12\377FT\201\377" \ ++ "\25'c\377\26%[\377\202\0\0\0\377\1\320\320\320\377\210\377\377\377\377" \ ++ "\13\376\376\376\377\377\377\377\377\345\345\345\377___\377)))\377\0\0" \ ++ "\0\377\25\25\25\377DDD\377\274\274\274\377\377\377\377\377\376\376\376" \ ++ "\377\207\377\377\377\377\12\376\376\376\377\324\324\324\377\12\12\12" \ ++ "\377\0\0\2\377\23!Q\377$4l\37709[\377\0\0\0\377;;;\377\370\370\370\377" \ ++ "\233\377\377\377\377\11\365\365\365\377777\377\0\0\0\377'1R\377\377\10\16#\377\0\0\0\377\227\227\227\377\224\377\377" \ ++ "\377\377\3***\377\0\0\0\377\23!O\377\213\31*e\377\3\30)d\377'7n\377(" \ ++ "8n\377\202(8o\377\203'7o\377\2\32+e\377\30)d\377\203\31*e\377\2\30)d" \ ++ "\377*:q\377\202HV\205\377\1GV\205\377\203IV\205\377\202IW\205\377\203" \ ++ "JW\206\377\1JV\206\377\203JX\206\377\6KX\206\377KX\205\377KX\206\377" \ ++ "KW\207\377JY\207\377KY\207\377\203LY\207\377\3LX\207\377KZ\206\377LZ" \ ++ "\207\377\204MZ\210\377\6LY\210\377N[\210\377R_\217\377\16\22\32\377\0" \ ++ "\0\0\377\267\267\267\377\213\377\377\377\377\4ttt\377\0\0\0\377$*\77" \ ++ "\377Ta\217\377\202Q^\212\377\13Q^\213\377P^\213\377Q^\213\377R]\213\377" \ ++ "R^\213\377Q^\213\377Q^\212\377Sa\217\377\40$6\377\0\0\0\377\212\212\212" \ ++ "\377\213\377\377\377\377\7\210\210\210\377\0\0\0\377\34\40""0\377Tb\224" \ ++ "\377\24\27#\377\0\0\0\377\253\253\253\377\215\377\377\377\377\6\276\276" \ ++ "\276\377ppp\377sss\377\312\312\312\377\377\377\377\377\376\376\376\377" \ ++ "\212\377\377\377\377\7\26\26\26\377\0\0\0\3775Ac\377\31+i\377\12\21)" \ ++ "\377\0\0\0\377]]]\377\212\377\377\377\377\2\321\321\321\377\15\15\15" \ ++ "\377\206\0\0\0\377\3\262\262\262\377\377\377\377\377\376\376\376\377" \ ++ "\206\377\377\377\377\12\376\376\376\377\377\377\377\377111\377\0\0\0" \ ++ "\377\12\21)\377\"3m\37709[\377\0\0\0\377;;;\377\370\370\370\377\220\377" \ ++ "\377\377\377\202\376\376\376\377\212\377\377\377\377\10YYY\377\0\0\0" \ ++ "\377\35%=\377\377'/J\377\202&.I\377\4%,F\377\5\6\12\377\0\0\0\377" \ ++ "\227\227\227\377\212\377\377\377\377\202\0\0\0\377\5\35*W\3770:\\\377" \ ++ "\0\0\0\377;;;\377\370\370\370\377\212\377\377\377\377\2\302\302\302\377" \ ++ "\10\10\10\377\204\0\0\0\377\3\36\36\36\377\353\353\353\377\376\376\376" \ ++ "\377\211\377\377\377\377\11{{{\377\0\0\0\377\27\34""0\377;I{\377;J|\377" \ ++ "\77M\202\377\5\7\14\377\0\0\0\377\313\313\313\377\211\377\377\377\377" \ ++ "\4\335\335\335\377CCC\377\377\377\377\377\376\376\376\377\207\377\377" \ ++ "\377\377\1sss\377\202\0\0\0\377\1{{{\377\211\377\377\377\377\2\23\23" \ ++ "\23\377\374\374\374\377\211\377\377\377\377\11\245\245\245\377\0\0\0" \ ++ "\377\5\11\26\377\31+g\377\30)d\377\31*e\377\12\21*\377\0\0\0\377xxx\377" \ ++ "\213\377\377\377\377\2\352\352\352\377\36\36\36\377\207\0\0\0\377\3\23" \ ++ "\40N\377\31*g\377\7\14\34\377\205\0\0\0\377\1\273\273\273\377\211\377" \ ++ "\377\377\377\2\365\365\365\377\40\40\40\377\207\0\0\0\377\2\22\40M\377" \ ++ "\31*f\377\212\31*e\377\3\30)d\377'7n\377(8n\377\202(8o\377\203'7o\377" \ ++ "\2\35.f\377\30)d\377\203\31*e\377\2\30)d\377&5m\377\202HV\205\377\1G" \ ++ "V\205\377\203IV\205\377\3IW\205\377HW\204\377IW\205\377\202JW\206\377" \ ++ "\1JV\206\377\203JX\206\377\6KX\206\377KX\205\377KX\206\377KW\207\377" \ ++ "JY\207\377KY\207\377\203LY\207\377\3LX\207\377KZ\206\377LY\207\377\204" \ ++ "MZ\210\377\6LY\210\377N[\210\377R`\217\377\16\20\30\377\0\0\0\377\274" \ ++ "\274\274\377\213\377\377\377\377\5zzz\377\0\0\0\377!':\377Ta\217\377" \ ++ "P]\212\377\203Q^\212\377\203P^\213\377\202Q^\213\377\4Tb\220\377\23\27" \ ++ "!\377\0\0\0\377\260\260\260\377\213\377\377\377\377\7iii\377\0\0\0\377" \ ++ "&-D\377Sa\223\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377" \ ++ "\377\1\341\341\341\377\202\0\0\0\377\10ANw\377M[\214\377LZ\211\3773<" \ ++ "\\\377\1\1\2\377\32\32\32\377\345\345\345\377\376\376\376\377\207\377" \ ++ "\377\377\377\7\376\376\376\377\364\364\364\377\26\27\27\377\0\0\0\377" \ ++ "\20\33C\377\0\0\0\377\77\77\77\377\212\377\377\377\377\1}}}\377\211\0" \ ++ "\0\0\377\2fff\377\376\376\376\377\211\377\377\377\377\7]]]\377\0\0\0" \ ++ "\377\25\35""9\3771;^\377\0\0\0\377;;;\377\370\370\370\377\212\377\377" \ ++ "\377\377\10DDD\377\0\0\0\377\21\25#\377;Hx\377=Jz\377\10\12\20\377\0" \ ++ "\0\0\377\243\243\243\377\212\377\377\377\377\13\207\207\207\377\0\0\0" \ ++ "\377\25\32+\377;Iz\377L\200\377\26\33/\377\0\0\0\377zzz\377\377" \ ++ "\377\377\377\376\376\376\377\207\377\377\377\377\2\371\371\371\377\256" \ ++ "\256\256\377\211\377\377\377\377\1\35\35\35\377\202\0\0\0\377\3""444" \ ++ "\377\377\377\377\377\376\376\376\377\207\377\377\377\377\3\231\231\231" \ ++ "\377\377\377\377\377\376\376\376\377\210\377\377\377\377\4\\\\\\\377" \ ++ "\0\0\0\377\13\23.\377\31*f\377\202\31*e\377\3\12\21*\377\0\0\0\377xx" \ ++ "x\377\213\377\377\377\377\14|||\377\0\0\0\377\3\5\15\377\30(a\377\31" \ ++ "+f\377\20\34D\377\6\13\34\377\1\2\6\377\4\6\20\377\32,j\377\31*e\377" \ ++ "\30)d\377\202\30)b\377\4\32+h\377\5\7\24\377\0\0\0\377\273\273\273\377" \ ++ "\211\377\377\377\377\4\365\365\365\377!!!\377\0\0\1\377\22\37J\377\205" \ ++ "\30)b\377\2\30*d\377\31)e\377\212\31*e\377\2\27)d\377'7n\377\203(8o\377" \ ++ "\202'7o\377\2(7o\377\30)d\377\204\31*e\377\5\30)d\377#3l\377IW\205\377" \ ++ "HV\205\377GV\205\377\203IV\205\377\3IW\205\377HW\204\377IW\205\377\202" \ ++ "JW\206\377\1JV\206\377\203JX\206\377\6KX\206\377KX\205\377KX\206\377" \ ++ "KW\207\377JY\207\377KY\207\377\203LY\207\377\2LX\207\377KY\206\377\202" \ ++ "LZ\207\377\203MZ\210\377\6LY\210\377N[\210\377Q_\216\377\23\27#\377\0" \ ++ "\0\0\377\253\253\253\377\213\377\377\377\377\21\240\240\240\377\0\0\0" \ ++ "\377\25\32&\377Tb\221\377Q^\212\377Q^\211\377Q^\212\377Q^\213\377Q^\212" \ ++ "\377Q^\213\377Q^\212\377Q^\213\377Q^\212\377Ub\221\377\11\13\20\377\0" \ ++ "\0\0\377\324\324\324\377\213\377\377\377\377\7NNN\377\0\0\0\37708T\377" \ ++ "Sa\222\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377\377\13" \ ++ "nnn\377\0\0\0\377\35\"4\377LZ\212\377JW\206\377JW\205\377IV\203\377\6" \ ++ "\7\13\377\0\0\0\377\306\306\306\377\376\376\376\377\210\377\377\377\377" \ ++ "\6\370\370\370\377:::\377\0\0\0\377\7\15\37\377\0\0\0\377ttt\377\212" \ ++ "\377\377\377\377\2\213\213\213\377^^^\377\210aaa\377\2\214\214\214\377" \ ++ "\374\374\374\377\211\377\377\377\377\7\206\206\206\377\0\0\0\377\22\30" \ ++ "-\3771;_\377\0\0\0\377;;;\377\370\370\370\377\211\377\377\377\377\11" \ ++ "\337\337\337\377\25\25\25\377\2\3\4\3772>f\377\77M\177\377AP\202\377" \ ++ "\36%>\377\0\0\0\377ooo\377\212\377\377\377\377\13\210\210\210\377\0\0" \ ++ "\0\377\24\32+\377;Iz\377L~\377\77M~\377@N\200\377'" \ ++ "2U\377\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210\377\0\0\0\377" \ ++ "\24\32+\377;Iz\377\202l\377\0\0\0\377\3\3\3\377\362\362\362\377" \ ++ "\221\377\377\377\377\4\245\245\245\377\0\0\0\377\3\7\21\377\31*g\377" \ ++ "\203\31*e\377\3\12\21*\377\0\0\0\377xxx\377\212\377\377\377\377\5\254" \ ++ "\254\254\377\0\0\0\377\5\11\26\377\32,j\377\30)d\377\212\31*e\377\4\32" \ ++ ",j\377\4\10\24\377\0\0\0\377\273\273\273\377\211\377\377\377\377\4\365" \ ++ "\365\365\377!!!\377\0\0\1\377\23\37L\377\220\31*e\377\3\30)d\377\31*" \ ++ "d\377'7n\377\203(8o\377\202'7o\377\2(7o\377\30)d\377\205\31*e\377\5\25" \ ++ "&b\377DR\202\377HV\205\377GV\205\377HV\205\377\202IV\205\377\3IW\205" \ ++ "\377HW\204\377IW\205\377\204JW\206\377\10JX\206\377IX\206\377JX\206\377" \ ++ "KX\206\377KX\205\377KX\206\377KX\207\377JY\207\377\205LY\207\377\2KY" \ ++ "\206\377LZ\207\377\205MZ\210\377\2MZ\207\377O\\\211\377\202\0\0\0\377" \ ++ "\1\353\353\353\377\212\377\377\377\377\7\375\375\375\377fff\377\0\0\0" \ ++ "\377\20\22\34\377O\\\211\377P]\212\377O\\\211\377\203P]\212\377\6P]\211" \ ++ "\377P]\212\377LX\203\377\7\10\14\377\0\0\0\377\227\227\227\377\213\377" \ ++ "\377\377\377\10\317\317\317\377\0\0\0\377\4\4\6\377R`\221\377R_\217\377" \ ++ "\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377\377\12""888\377" \ ++ "\0\0\0\377/8V\377KX\207\377KX\206\377KX\205\377N[\214\377\20\22\35\377" \ ++ "\0\0\0\377\250\250\250\377\211\377\377\377\377\2\373\373\373\377SSS\377" \ ++ "\203\0\0\0\377\1\213\213\213\377\211\377\377\377\377\1\376\376\376\377" \ ++ "\225\377\377\377\377\7\323\323\323\377\7\7\7\377\5\7\13\377+4T\377\0" \ ++ "\0\0\377;;;\377\370\370\370\377\211\377\377\377\377\11\265\265\265\377" \ ++ "\0\0\0\377\11\12\21\377AP\205\377\77M~\377@N\200\377$/S\377\0\0\0\377" \ ++ "DDD\377\212\377\377\377\377\4\210\210\210\377\0\0\0\377\24\32+\377;I" \ ++ "z\377\202M" \ ++ "\202\377\2\2\4\377\0\0\0\377\330\330\330\377\217\377\377\377\377\1\374" \ ++ "\374\374\377\202\0\0\0\377\10""3Aq\3778Fy\3777Fy\377/L}\377AO\201" \ ++ "\377\30$K\377\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210\377" \ ++ "\0\0\0\377\24\31+\377;Iz\377\202>>\377\0\0\0\377\17\30""7\377:H}\3778Fx" \ ++ "\3776Ex\3779H}\377\31!9\377\0\0\0\377[[[\377\377\377\377\377\376\376" \ ++ "\376\377\215\377\377\377\377\3\36\36\36\377\0\0\0\377\22\36H\377\205" \ ++ "\31*e\377\3\15\24,\377\0\0\0\377xxx\377\212\377\377\377\377\4<<<\377" \ ++ "\0\0\0\377\21\35F\377\31*g\377\213\31*e\377\4\31+i\377\12\21)\377\0\0" \ ++ "\0\377\203\203\203\377\212\377\377\377\377\1\265\265\265\377\202\0\0" \ ++ "\0\377\6\13\13\13\377AAA\377XXX\377\0\0\0\377\4\7\22\377\32,j\377\212" \ ++ "\31*e\377\3\30)d\377\33,f\377'7n\377\202(8o\377\5'7o\377&6o\377'7o\377" \ ++ "(7o\377\30)d\377\207\31*e\377\3""9Hz\377HV\205\377GV\205\377\202HV\205" \ ++ "\377\22IU\205\377IW\205\377IV\205\377IW\205\377JW\206\377IW\205\377J" \ ++ "W\206\377JV\206\377JX\206\377JW\206\377JX\206\377KX\206\377JX\206\377" \ ++ "KX\206\377KW\207\377JY\207\377KX\207\377KY\207\377\203LY\207\377\3LX" \ ++ "\207\377KZ\206\377LZ\207\377\205MZ\210\377\10MZ\207\377P]\213\377\33" \ ++ "!0\377\0\0\0\377\17\17\17\377\344\344\344\377\377\377\377\377\376\376" \ ++ "\376\377\236\377\377\377\377\12\16\16\16\377\0\0\0\377\40%9\377Q^\216" \ ++ "\377MZ\207\377N[\210\377Q^\216\377\24\27#\377\0\0\0\377\253\253\253\377" \ ++ "\214\377\377\377\377\1\376\376\376\377\220\377\377\377\377\7\25\25\25" \ ++ "\377\0\0\0\377\21\35H\377\31+h\377\23\37M\377\0\0\0\377\2\2\2\377\211" \ ++ "\377\377\377\377\5\376\376\376\377\377\377\377\377\237\237\237\377\0" \ ++ "\0\0\377\1\1\1\377\202\0\0\0\377\5\1\1\1\377\40\40\40\377\367\367\367" \ ++ "\377\377\377\377\377\376\376\376\377\202\377\377\377\377\1\376\376\376" \ ++ "\377\205\377\377\377\377\1\332\332\332\377\202\0\0\0\377\5.7Y\377/9\\" \ ++ "\377\0\0\0\377;;;\377\370\370\370\377\211\377\377\377\377\11\266\266" \ ++ "\266\377\0\0\0\377\10\12\20\377AP\205\377\77M}\377AO\201\377\24\37H\377" \ ++ "\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210\377\0\0\0\377\24" \ ++ "\31+\377;Iz\377\202^" \ ++ "\377\202\0\0\0\377\3___\377\377\377\377\377\376\376\376\377\231\377\377" \ ++ "\377\377\3\376\376\376\377\377\377\377\377\177\177\177\377\202\0\0\0" \ ++ "\377\11""8Bc\377N[\210\377MZ\207\377N[\210\377LY\210\377P^\216\377\24" \ ++ "\27#\377\0\0\0\377\253\253\253\377\232\377\377\377\377\5\376\376\376" \ ++ "\377\367\367\367\377888\377\0\0\0\377\14\24""1\377\202\30)d\377\7\31" \ ++ "*e\377\21\35G\377\0\0\0\377\4\4\4\377\261\261\261\377\377\377\377\377" \ ++ "\376\376\376\377\207\377\377\377\377\1\376\376\376\377\216\377\377\377" \ ++ "\377\13\376\376\376\377\377\377\377\377___\377\0\0\0\377\2\4\14\3776" \ ++ "Cr\377BP\200\377.8Z\377\0\0\0\377;;;\377\370\370\370\377\211\377\377" \ ++ "\377\377\11\266\266\266\377\0\0\0\377\10\12\20\377AP\205\377\77M}\377" \ ++ "9G{\377\22\37G\377\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210" \ ++ "\377\0\0\0\377\24\31+\377;Iz\377\202L}\377+;s\377\21\35F\377\0\0\0\377DDD\377\212\377\377\377\377\4" \ ++ "\210\210\210\377\0\0\0\377\24\31+\377;Iz\377\202L}\377&6o\377\21\35F\377\0\0\0\377HHH\377\212" \ ++ "\377\377\377\377\4\220\220\220\377\0\0\0\377\24\31+\377;Iz\377\202L}\377!2l\377\21\35F\377\0\0\0\377" \ ++ "\14\14\14\377...\377\211---\377\15\27\27\27\377\0\0\0\377\24\31+\377" \ ++ ";Iz\377;J|\377>>\377\245\245\245\377\314\314\314\377\346\346\346\377\360\360\360" \ ++ "\377\361\361\361\377\355\355\355\377\332\332\332\377\302\302\302\377" \ ++ "\214\214\214\377OOO\377\22\22\22\377\202\0\0\0\377\2\6\12\30\377\31+" \ ++ "g\377\212\31*e\377\1\"3k\377\203(8o\377\4'7o\377&6o\377'7n\377\36.h\377" \ ++ "\205\31*e\377\1\30)d\377\204\31*e\377\4#3l\377FT\204\377GU\204\377GV" \ ++ "\205\377\202IV\205\377\4IU\205\377IW\205\377IV\205\377IW\205\377\205" \ ++ "JW\206\377\2JX\206\377IX\206\377\202JX\206\377\5KX\205\377KW\206\377" \ ++ "KX\207\377JY\207\377KX\207\377\205LY\207\377\4LX\207\377LY\207\377KZ" \ ++ "\206\377LZ\207\377\205MZ\210\377\10LY\210\377MZ\210\377MZ\207\377P]\213" \ ++ "\377KX\203\3774=\\\377\34!2\377\12\13\21\377\207\0\0\0\377\1\4\4\4\377" \ ++ "\207\0\0\0\377\6\10\12\20\377\35\"3\3774=\\\377MY\206\377O]\213\377M" \ ++ "Z\207\377\202N[\210\377\2MZ\210\377LY\210\377\204MZ\210\377\5LZ\207\377" \ ++ "P^\217\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377\377\4" \ ++ "***\377\0\0\0\377\21\24\37\377\1\1\2\377\211\0\0\0\377\6\4\5\10\377!" \ ++ "'<\377@Lv\377IX\210\377\77M~\377\30)e\377\203\31*e\377\14\30)d\377\35" \ ++ ".h\377IW\205\377GU\204\377FT\203\377GS\204\377ET\202\377HW\207\377;G" \ ++ "p\377'/J\377\25\31(\377\3\3\6\377\216\0\0\0\377\11\2\3\11\377\11\17$" \ ++ "\377\21\35G\377\31*e\377\31*f\377\30)d\377\31*e\377\27(c\377;I|\377\202" \ ++ "BP\200\377\1-6X\377\216\0\0\0\377\5\6\6\13\377BP\204\377>L}\377\34-i" \ ++ "\377\20\35E\377\216\0\0\0\377\11\22\27&\377;Iz\377h\377;I{\377Kz\377\16'7n\377BQ\201\377IW\205\377^i\220\377cm\224\377bm\223\377" \ ++ "`k\221\377Q^\212\377S`\214\377al\222\377bl\223\377al\223\377Ye\220\377" \ ++ "GV\210\377\202HW\211\377\13IX\212\377GU\207\377BP\177\377GV\210\377H" \ ++ "W\212\377GV\211\377GU\210\377FT\206\377GT\205\377\"3l\377\30)d\377\205" \ ++ "\31*e\377\4\30)d\377'7n\377N[\207\377^i\220\377\202^i\221\377\2Yd\217" \ ++ "\377@N\201\377\203BP\202\377\1@P\200\377\205AO\201\377\10@N\201\377\77" \ ++ "N\201\377@N\201\377\77N\200\377\77M~\3775Dw\377\27(c\377\31*e\377\207" \ ++ "\31*f\377\2\35.i\377;J}\377\202=L~\377\4L|\377\3>L{\377.=s\377\30)e\377\203\31*f\377" \ ++ "\5\30)e\377%4m\3778Fy\3777Fy\3776Fy\377\2027Fy\377\5""6Ey\3777Dy\377" \ ++ "6Dx\3776Ez\3776Fz\377\2026Fy\377\4""6Dy\3776Ez\3772Aw\377\27(e\377\207" \ ++ "\31*f\377\206\31*e\377\12\27(d\377+:q\3771Bv\377FT\204\377R^\212\377" \ ++ "S_\212\377R^\212\377DQ\201\3772Av\3771@v\377\2031Av\377\2""2Aw\377\"" \ ++ "2l\377\202\31*f\377\2\31*e\377\30)d\377\215\31*e\377\15\27(d\377(8o\377" \ ++ "-=r\377-=q\377,;q\377-A\377))+\377'()\377\207\215\237\377Ly\377##%\377\203\0\0\0\377\4kq\203" \ ++ "\377JX\206\377Ze\216\377/04\377\202\0\0\0\377\13OPS\377Yf\223\377v\200" \ ++ "\242\377&%\"\377\5\4\4\377\16\16\15\377jp\207\377CQ\201\377ES\202\377" \ ++ "ES\201\377EQ\202\377\203DR\202\377\10CQ\201\377DR\202\377CQ\201\377D" \ ++ "Q\201\3775Dw\377\26(c\377\31*e\377\30)d\377\205\31*e\377\3=L}\377_i\215" \ ++ "\377\32\32\34\377\202\0\0\0\377\2\210\215\236\377s\3778Fy\3777Fy\377" \ ++ "6Fy\377\2027Fy\377\4""7Dy\3776Ey\3775Dx\3776Ey\377\2036Ex\377\4""6Cx" \ ++ "\3776Dx\377'7n\377\27)d\377\203\31*e\377\1\30)d\377\210\31*e\377\13\30" \ ++ ")d\377\30*d\3772Au\377.>t\377y\200\233\377\11\10\7\377\0\0\0\377\10\10" \ ++ "\11\377]f\203\3771@t\3770\77u\377\2031@u\377\2/\77t\377\35.h\377\214" \ ++ "\31*e\377\202\30)d\377\202\31*e\377\4\30)d\377\31*e\377,L~\377\202\77M\177\377\11\77M~\3778Fy\377\23%a" \ ++ "\377\22$a\377\22$b\377\21#a\377\22$a\377\24&b\377\30)d\377\202\31*e\377" \ ++ "\10\30)d\377,;q\3779G{\3777Fz\3776F{\3776Fz\3777Fz\3778Gz\377\202L~\377\202\77M~\377\10>L}\377\\f\206\377kq\206\377x{\207" \ ++ "\377w{\210\377mr\206\377Va\204\377#3k\377\203\30)d\377\22HU\204\377o" \ ++ "v\221\377x}\216\377\177\203\214\377\177\202\216\377w|\216\377iq\222\377" \ ++ "@N\177\377M~\377HV\205\377GV\205\377" \ ++ "HV\205\377IV\205\377IU\205\377IV\205\377\203IW\205\377\2JW\206\377IW" \ ++ "\205\377\203JW\206\377\202JX\206\377\3IX\206\377KX\206\377JX\206\377" \ ++ "\202KX\206\377\6KW\206\377KX\206\377JY\207\377KY\207\377LY\207\377KY" \ ++ "\207\377\204LY\207\377\202LX\207\377\7LY\207\377KY\206\377KZ\206\377" \ ++ "LY\207\377LZ\207\377MZ\210\377LZ\207\377\223MZ\210\377\1LZ\207\377\202" \ ++ "MZ\210\377\202LZ\207\377\1KZ\206\377\202LY\207\377\1LX\207\377\203LY" \ ++ "\207\377\4O]\215\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377" \ ++ "\377\377\7***\377\0\0\0\3773<^\377IW\205\377JW\206\377IW\205\377HW\204" \ ++ "\377\202IV\205\377\4IU\205\377HU\204\377\\i\225\377Y[_\377\202\0\0\0" \ ++ "\377\"68>\377O\\\212\377FFH\377\0\0\0\377\4\4\4\377666\377\0\0\0\377" \ ++ "\27\27\26\377ox\225\377kp\203\377\6\6\5\377\0\0\0\377))'\377ny\235\377" \ ++ "@N\177\377v\200\242\377'&#\377\6\6\5\377\20\17\15\377jp\207\377CQ\201" \ ++ "\377qx\221\377\11\11\10\377\5\4\3\377.-+\377\203\206\222\377\15\15\14" \ ++ "\377\0\0\0\377fhp\377IV\205\377^i\217\377OQZ\377\31\31\30\377\2\1\0\377" \ ++ "\202\0\0\0\377\7\10\7\6\377(((\377ch{\377DR\203\377@N\177\377_i\215\377" \ ++ "\34\34\35\377\202\0\0\0\377\6\210\215\236\377A\377q" \ ++ "t~\377\6\5\3\377\0\0\0\377cen\377>M~\377cn\221\377QSZ\377\25\24\22\377" \ ++ "\203\0\0\0\377\11\11\10\7\377*+,\377ot\207\377;I|\3772Av\377\26'c\377" \ ++ "Q\\\201\377FHN\377\23\23\21\377\203\0\0\0\377\10\14\13\12\377123\377" \ ++ "ho\211\377\35/j\377\30)d\377%5m\377[_n\377\31\30\30\377\202\0\0\0\377" \ ++ "\13\24\24\23\377dej\377\15\15\15\377\0\0\0\377\12\12\12\377]f\203\377" \ ++ "0\77t\3773Cx\377ox\224\377ABF\377\20\17\16\377\202\0\0\0\377\22\6\6\4" \ ++ "\377\30\30\26\377PR[\377O[\205\377\31*e\377$4m\377UYf\377\4\4\2\377\2" \ ++ "\2\0\377]^b\377Z]i\377\20\20\16\377\0\0\0\377\2\2\1\377!!\40\377jr\211" \ ++ "\377TW`\377\22\22\20\377\202\0\0\0\377\4\35\34\34\377ot\213\3771@u\377" \ ++ "+\377\202\0\0\0\377\3UW]\3779H~\377}\203\226\377\202" \ ++ "\0\0\0\377\5\34\34\36\377^i\217\377!3o\377an\231\377.-.\377\202\0\0\0" \ ++ "\377\3MQ^\377\36/j\377ru\177\377\202\0\0\0\377\4\37\37\37\377pw\217\377" \ ++ "lu\225\377CEJ\377\202\0\0\0\377\4\12\12\12\377]f\203\3771@u\377]an\377" \ ++ "\202\0\0\0\377\12\"\"!\377s{\230\377DR\201\377ms\210\377\13\12\11\377" \ ++ "\0\0\0\377\21\20\17\377bi\207\377\36/j\377RWd\377\203\0\0\0\377\3Z_n" \ ++ "\377^h\214\377FGM\377\203\0\0\0\377\3cfq\377ir\220\377ACF\377\202\0\0" \ ++ "\0\377\3\"#%\377HU\201\377+;q\377\203,M\177\377chv\377\202\0\0\0" \ ++ "\377\5###\377kmu\377ehr\377gjs\377WWZ\377\202\0\0\0\377\3))*\377R_\214" \ ++ "\377gkv\377\202\0\0\0\377\5--.\377cfp\377`co\377beq\377TUW\377\202\0" \ ++ "\0\0\377\3""68=\3776Fy\377_`h\377\202\0\0\0\377\4LMQ\377:J{\3770@v\377" \ ++ "\202\206\230\377\202\0\0\0\377\4\12\12\12\377\\e\203\3773Bv\377QRW\377" \ ++ "\202\0\0\0\377\5abf\3773Cy\377\24%b\377AN}\377,,.\377\202\0\0\0\377\3" \ ++ "uy\210\377\34-j\377RWd\377\202\0\0\0\377\12\17\17\17\377Wb\210\377\25" \ ++ "'c\377\\`q\377\4\3\3\377\0\0\0\377!\40\36\377\\h\220\377\40""1l\377\207" \ ++ "\213\230\377\202\0\0\0\377\3\36\36\40\377LX\202\377+;q\377\203,F\377))-\377\31\31\30" \ ++ "\377\7\7\6\377\202\0\0\0\377\11\37\37\36\377u|\227\377\34-g\377CQ\202" \ ++ "\377qx\216\377@AH\377((+\377\26\26\26\377\5\5\4\377\202\0\0\0\377\13" \ ++ "--,\377oy\227\3776Fy\377;J|\377;H|\377;I|\377:I{\3779Iz\3779Hz\377ag" \ ++ "~\377\6\6\6\377\202\0\0\0\377\2kp\201\377\34-j\377\203\26(e\377\13\26" \ ++ "(d\377\24%b\377Wa\201\377\20\17\16\377\0\0\0\377\21\20\16\377t{\227\377" \ ++ "3Bv\3777Fy\377BQ\202\377TWb\377\202\0\0\0\377\2\13\13\13\377\36\36\40" \ ++ "\377\202\36\37\40\377\6\36\37!\377%&(\377$%'\377:;>\377`l\224\377TV_" \ ++ "\377\202\0\0\0\377\2\15\15\15\377\35\36\37\377\202\36\36\37\377\1\36" \ ++ "\36\40\377\202%%'\377\3IKO\377>L~\377XZ`\377\202\0\0\0\377\12SU\\\377" \ ++ "4Cw\377.>t\377~\205\233\377\5\4\3\377\0\0\0\377\12\12\12\377\\d\202\377" \ ++ "t\377x}\222\377\3\3\1\377\0\0\0\377\34\34\34\377_i\212\3774Br\377" \ ++ "3Br\377Vb\214\377^i\221\377_i\220\377Wb\213\377JW\205\377^h\215\377\34" \ ++ "\34\35\377\202\0\0\0\377\3\210\215\236\377CQ\204\377y}\207\377\202\0" \ ++ "\0\0\377\20##%\377py\227\377Vb\211\377Xc\213\377s|\240\377gr\227\377" \ ++ "Ze\216\377S_\210\377HU\203\377'7p\377;J\177\377Xe\221\377^i\220\377L" \ ++ "W\177\377fl\201\377457\377\202\0\0\0\377\11VXa\377@N\202\377LY\211\377" \ ++ "]j\226\377t\177\244\377w\201\241\377cm\215\377pu\204\377//1\377\202\0" \ ++ "\0\0\377\12~\201\215\377;J}\377:I{\377;H|\377;I|\377:I{\3779Iz\3779H" \ ++ "z\377ag~\377\6\6\6\377\202\0\0\0\377\2ko\200\377\36/i\377\204\30)d\377" \ ++ "\12\24&b\377Wa\201\377\20\17\16\377\0\0\0\377\30\27\25\377nw\227\377" \ ++ "3Bv\3777Fy\377L}\377\26(c\377\30)d\377\203\31*e" \ ++ "\377\3\30)d\377\35.h\377GT\204\377\204HV\205\377\10IU\205\377IV\205\377" \ ++ "IW\205\377IV\205\377HW\204\377IW\205\377JW\206\377IW\205\377\202JW\206" \ ++ "\377\5JV\206\377JW\206\377JX\206\377JW\206\377IX\206\377\202JX\206\377" \ ++ "\202KX\206\377\5KX\205\377KX\206\377KW\206\377KW\207\377KX\206\377\202" \ ++ "JY\207\377\2KX\207\377KY\207\377\202LY\207\377\1KY\207\377\223LY\207" \ ++ "\377\1KY\207\377\202LY\207\377\10KY\207\377KX\207\377KY\207\377JY\207" \ ++ "\377KX\207\377KW\206\377KW\207\377KX\206\377\202KX\205\377\202KX\206" \ ++ "\377\1JX\206\377\202IX\206\377\3JX\206\377JW\206\377JV\206\377\203JW" \ ++ "\206\377\203IW\205\377\4IV\205\377IW\205\377IV\205\377IU\205\377\202" \ ++ "HV\205\377\10GV\205\377IV\205\3776Dx\377\27(d\377\30*e\377\31*e\377S" \ ++ "]\202\377\4\4\4\377\202\0\0\0\377\6\13\13\13\377ks\215\377ES\203\377" \ ++ "ER\203\377\\h\222\377DDF\377\203\0\0\0\377\13ps\177\377MZ\212\377ES\203" \ ++ "\377BP\201\377u\200\242\377\36\36\33\377\0\0\0\377\5\4\4\377hn\205\377" \ ++ "CQ\201\377px\221\377\203\0\0\0\377\7\206\215\243\377BO\200\377=K}\377" \ ++ "\31*e\377\32+e\377]f\204\377...\377\202\0\0\0\377\2\31\30\30\377\27\27" \ ++ "\27\377\202\0\0\0\377\5@AB\377nv\225\377@N\177\377_h\215\377\30\31\32" \ ++ "\377\202\0\0\0\377\5\210\215\236\377;J}\377FT\203\377qx\215\377\31\31" \ ++ "\31\377\202\0\0\0\377\2\36\36\37\377\21\21\20\377\202\0\0\0\377\31UV" \ ++ "X\377fp\225\377#2l\377ip\207\377\21\20\16\377\0\0\0\377\1\1\1\377\"#" \ ++ "%\377'(+\377\5\5\5\377\0\0\0\377EEF\377\\g\214\377:I}\377w{\207\377\7" \ ++ "\6\3\377\0\0\0\377\2\2\2\377'')\377%&(\377\3\3\3\377\0\0\0\377PQS\377" \ ++ "\\h\217\3778Gz\377\203;I|\377\5""9Iz\377:I{\3779Hz\377`f}\377\2\2\1\377" \ ++ "\202\0\0\0\377\2jo\177\377\36/j\377\204\31*e\377\14\24&b\377Wa\200\377" \ ++ "\14\13\12\377\0\0\0\377\27\26\24\377lv\227\3773Bv\3776Fy\3776Ex\377;" \ ++ "I|\377mu\220\377(((\377\202\0\0\0\377\2\35\35\36\377\24\24\24\377\202" \ ++ "\0\0\0\377\6HHH\377]h\217\377\25&b\377\37""0j\377bh\202\377\31\31\30" \ ++ "\377\202\0\0\0\377\2\35\36\36\377\22\21\21\377\202\0\0\0\377\5SSW\377" \ ++ "HT\201\377\30)d\3770\77r\377RTY\377\204\0\0\0\377\11VY_\377122\377\0" \ ++ "\0\0\377\6\6\6\377\\e\203\3770\77t\377\77M\177\377uy\205\377\20\20\15" \ ++ "\377\202\0\0\0\377\1\2\2\1\377\202\0\0\0\377\5///\377ck\205\377\32+f" \ ++ "\377$4m\377QVc\377\202\0\0\0\377\4&&'\377FS\201\377\25&c\377Y^p\377\202" \ ++ "\0\0\0\377\4""667\377DR\204\377%6n\377\212\216\235\377\202\0\0\0\377" \ ++ "\6\32\33\34\377LX\202\377+;q\377,\377" \ ++ "\207\214\237\377BP\201\377ES\203\377BP\201\377r}\240\377RQQ\377AAC\377" \ ++ "FFG\377qw\217\377BQ\201\377px\222\377BCE\377ABD\377\77\77A\377\200\207" \ ++ "\236\377CP\201\377&7n\377\202\30)d\377\77\27(d\377mu\224\377fis\377B" \ ++ "CF\377$%&\377#$%\37778:\377wy\204\377nz\235\377>L}\377@N\177\377_i\216" \ ++ "\377QQU\377ABD\377@@A\377\206\213\235\377;K|\377@N\177\377ES\203\377" \ ++ "\203\212\237\377egp\377\77@B\377\40\40!\377&'(\377<>@\377|\200\215\377" \ ++ "\\g\221\3779Gz\377\36.h\377\35.h\377s{\225\377QSX\377-./\377\37\40!\377" \ ++ "((*\377DDH\377dgs\377LY\204\377\30)d\377=K}\377DR\202\377\206\213\236" \ ++ "\377LMQ\377-./\377\37\37\40\377--/\377HIM\377qu\177\377bm\224\377:I{" \ ++ "\377;J|\377;I|\377:I{\377;I|\3779Iz\377:I{\3779Hz\377jq\211\377CDF\377" \ ++ "@@C\377<<>\377qu\206\377\35.i\377\204\31*e\377\7\24&b\377[e\206\377H" \ ++ "HI\377\77@C\377NNN\377lv\227\3773Bv\377\2037Fy\377D8Fz\377w\177\232\377" \ ++ "gjs\377BCE\377\"\"#\377%&'\37799;\377tw\204\377]i\221\377%5m\377\30)" \ ++ "d\377\31*e\377\36/i\377u|\225\377^ak\377==@\377\40\40!\377&'(\377;<>" \ ++ "\377sw\210\377;I|\377\25&b\377\31*e\377\27(d\377KX\206\377iks\377../" \ ++ "\377113\377ehq\377y\204\247\377Z[\\\377@@B\377FGI\377`i\210\3770\77t" \ ++ "\377/\77t\377:I|\377z\201\233\377PRW\377./0\377!\"#\3779:<\377fhr\377" \ ++ "[f\216\377\27(d\377\30)d\377\"3l\377bfu\377=>@\377>\77A\377STW\377BO" \ ++ "}\377\25'c\377fl\177\377BCE\377\77@B\377]^`\377GU\205\377%6n\377\207" \ ++ "\214\234\377;<=\377@AC\377QRU\377KX\202\377+;q\377,M~\377@N\177\377\77M~\377>M\177\377M[\212\377Zf\222\377cn\223\377`k" \ ++ "\223\377[g\222\377CQ\203\377=K|\3775Dx\377\30)e\377\30)d\377\25&c\377" \ ++ "1@w\377\77M}\377FR\200\377BP~\3775Dz\377%6o\377\26'c\377'7o\377>L}\377" \ ++ "L~\3770\77t\3771@u\377" \ ++ "0\77t\3770\77u\3775E{\377\77M~\377ER\177\3779H|\377'7q\377\25&b\377\30" \ ++ ")d\377\31*e\377\32+f\377/\77u\377\2026F{\377\4""4Dz\377!2j\377\30)d\377" \ ++ "/>u\377\2026F{\377\14""4Dz\377/>s\377+;q\377CR\201\377IV\207\377HU\207" \ ++ "\377HU\206\3773Cw\377+;q\377,s\377HV\204\377\202FT\203" \ ++ "\377\4FS\203\377FT\203\377ET\202\377FT\203\377\203ES\202\377\202ER\202" \ ++ "\377\11ES\203\377DS\203\377ES\202\377DR\203\377DS\201\377DR\201\377D" \ ++ "Q\201\377CQ\201\377DR\202\377\203CQ\201\377\4CR\202\377DQ\201\377%4m" \ ++ "\377\30)d\377\203\31*e\377\204\30)d\377\2""1Au\377BP\200\377\202AO\177" \ ++ "\377\2AO\200\377@N\200\377\203@N\177\377\5AN\200\377\77N~\377@N\177\377" \ ++ "@M\177\377@N\177\377\202\77M~\377\1@N~\377\204>L~\377\4\77M~\377'6n\377" \ ++ "\30)d\377\31*e\377\207\30)d\377\2\26'c\377:Iz\377\202=K}\377\203;J|\377" \ ++ "\204;I{\377\5:J|\377;J|\377;I|\377;H|\377;I|\377\204:I{\377\1'7n\377" \ ++ "\205\30)d\377\205\31*e\377\202\30)d\377\20%5l\3779Gz\3778Ex\3776Fy\377" \ ++ "7Fy\3777Ey\3777Fy\3777Dy\3776Dx\3775Dx\3775Dy\3775Dx\3775Ew\3775Dw\377" \ ++ "5Dx\3774Cw\377\202\30)d\377\202\31*e\377\210\30)d\377\202\31*e\377\4" \ ++ "\30)d\377\35.h\3773Bv\3771Bu\377\2031@u\377\4""1@v\3771@u\3771@t\377" \ ++ "0\77t\377\2031@u\377\2/>s\377\33,f\377\205\30)d\377\202\31*e\377\206" \ ++ "\30)d\377\1\31*e\377\203\30)d\377\4\27(d\377,L}\377AO\177\377AO\200\377BP\200\377@N\200" \ ++ "\377\204AO\200\377\4@O\177\377\77N~\377@N\177\377@M\177\377\203@N\177" \ ++ "\377\2\77M\177\377>L\177\377\202\77M\177\377\2\77M}\377>L}\377\202\30" \ ++ ")d\377\207\31*e\377\11\30)d\377!2j\377>K}\377=J|\377s\377CP\200\377AO\177\377BP\200\377AO\200\377@N\200\377\204A" \ ++ "O\200\377\3@N\177\377\77O~\377@M\177\377\203@N\177\377\202\77M\177\377" \ ++ "\6>L\177\377\77M~\377\77M\177\377>L~\3777Ex\377\32+e\377\210\31*e\377" \ ++ "\2\30)d\377\40""1j\377\202=K}\377\3" \ ++ "L}\377AO\177\377BP\200\377\202AO\200\377\1@N\200\377\202AO\200\377\3" \ ++ "@O\177\377AO\200\377\77O~\377\206@N\177\377\1>L\177\377\202\77M\177\377" \ ++ "\202\77M~\377\2-=s\377\30)d\377\210\31*e\377\3\27(d\3770>t\377=K}\377" \ ++ "\202L\177\377\77M\177\377" \ ++ "\77M~\377>L~\377@M~\377\37/i\377\30)d\377\207\31*e\377\2\30)d\377\31" \ ++ "*e\377\202=K}\377\5L~\377\77M~\3775Dx\377\26(c\377\210" \ ++ "\31*e\377\11\30)d\377(9o\377>K}\377=K}\377s\3778Fy\3777Fy\3776Fy\377\2027Fy\377\2""7Ey\3776" \ ++ "Dy\377\2026Ey\377\10""6Ex\3776Ew\3776Ex\3776Dx\3775Dx\3775Cw\377\30(" \ ++ "d\377\30)d\377\214\31*e\377\5\30)d\377\27(d\3772Au\3772Bv\3772@v\377" \ ++ "\2032Av\377\3""2Au\3771@u\3770\77u\377\2021@u\377\4""0\77t\3772Au\377" \ ++ "\36/h\377\30)d\377\220\31*e\377\5\30)d\377\37/i\377-=r\377-L\177\377\77M\177\377\202\77M~\377\1""2Au\377\212\31*e\377\17" \ ++ "\37/i\377:I{\377=J|\377L\177\377\202\77M\177\377\4>L~\377>L}\377#3k\377\30)d" \ ++ "\377\210\31*e\377\2\30)d\377(8n\377\202=K}\377\3L\177\377\77M\177\377\202\77M~\377\3""9Gz\377" \ ++ "\27)d\377\30)d\377\207\31*e\377\4\31)d\377\27(d\377:I{\377=K}\377\203" \ ++ "s\3771Bv\377\2042Av\377" \ ++ "\3""2Au\3772At\3770\77u\377\2041@u\377\1(8o\377\221\31*e\377\6\30)d\377" \ ++ "\32+f\377.=s\377-=r\377-L~\377=J|\377t\377\32+e\377\216\31*e\377\3\35-g\377" \ ++ "1@u\3771Av\377\2042Av\377\3""2Au\3771@t\3770\77u\377\2031@u\377\3""0" \ ++ "\77t\377#3k\377\30)d\377\220\31*e\377\5\30)d\377\40""0j\377-=s\377-=" \ ++ "q\377-;r\377\202-t\377\26'b\377\30)d\377\205\31*e\377\10" \ ++ "\30)d\377\27(d\377\37""0i\377/\77t\377GU\204\377IW\206\377HV\205\377" \ ++ "GV\205\377\203HV\205\377\3IV\205\377HV\205\377IV\205\377\202IU\205\377" \ ++ "\204IV\205\377\205IW\205\377\1IV\205\377\215IW\205\377\204IV\205\377" \ ++ "\202IU\205\377\2IV\205\377HV\205\377\202IV\205\377\202HV\205\377\10G" \ ++ "U\204\377HV\205\377JX\206\377>L~\377'7n\377\32+f\377\27)d\377\30)e\377" \ ++ "\205\31*e\377\6\30)d\377\34-g\377L\177\377\77M~\377\77" \ ++ "M\177\377\77M~\3775Cw\377\27)d\377\210\31*e\377\3\30)d\377\32+f\377:" \ ++ "H{\377\202=K}\377\4;K}\377L\177\377\202\77M\177\377\4>L~\377>L}\377#3l\377" \ ++ "\30)d\377\210\31*e\377\4\30)d\377'7n\377s\3778Fy\3777Fy\3776Fy\377\2027Fy\377\14""7Ey\3777Dy\3776Ey\3776Ex" \ ++ "\3776Ey\3776Ew\3776Dx\3775Dx\3776Cw\3775Dx\377\37/i\377\30)d\377\215" \ ++ "\31*e\377\11\30)d\377(8o\3772Bv\3772Av\3772@v\3772Av\3772Au\3772Av\377" \ ++ "2At\377\2051@u\377\3/>t\377\27)d\377\30)d\377\221\31*e\377\2*:q\377," \ ++ "=q\377\202-L\177\377\203\77M~\377\2""9Gz\377\32" \ ++ "*e\377\211\31*e\377\2\30)d\3776Ex\377\202=K}\377\4L~\377%5m\377\202\31*e\377\202" \ ++ "\30)d\377\206\31*e\377\4\30)d\377\27(d\377-=r\377FT\204\377\202GU\204" \ ++ "\377\2FU\203\377GT\204\377\202FS\203\377\202ET\202\377\202FT\203\377" \ ++ "\10FS\203\377FT\203\377FS\203\377FR\203\377ES\203\377FS\203\377ES\203" \ ++ "\377DS\203\377\202ES\203\377\4ES\202\377ES\201\377DR\202\377EQ\202\377" \ ++ "\202CR\202\377\204DR\202\377\5DQ\201\377DP\200\377DR\202\377\36/h\377" \ ++ "\30)d\377\207\31*e\377\7\31*d\3776Ey\377BP\200\377AO\177\377BP\200\377" \ ++ "AO\200\377@N\200\377\204AO\200\377\4@O\177\377\77N~\377\77O~\377@M\177" \ ++ "\377\203@N\177\377\3\77M\177\377@N\177\377>L\177\377\202\77M\177\377" \ ++ "\4>L}\377@N~\377'7n\377\30)d\377\210\31*e\377\11\30)d\377#3l\377>L~\377" \ ++ "=K}\377M~\377HV\205\377" \ ++ "FT\203\377FU\203\377GT\204\377FT\203\377FS\203\377FT\203\377ET\202\377" \ ++ "\203FT\203\377\203FS\203\377\14FR\203\377ES\203\377FS\203\377ES\203\377" \ ++ "DS\203\377ES\202\377ES\203\377ES\202\377ES\201\377ER\202\377DQ\202\377" \ ++ "CR\202\377\204DR\202\377\6DQ\201\377DR\202\377DQ\201\377BO\200\377$4" \ ++ "l\377\27(d\377\207\31*e\377\10\27)d\377)8o\377BP\200\377AO\177\377AO" \ ++ "\200\377BP\200\377AO\200\377@N\200\377\202AO\200\377\5@O\177\377AO\200" \ ++ "\377@O\177\377\77N~\377@M\177\377\204@N\177\377\204\77M\177\377\202\77" \ ++ "M~\377\2""6Ex\377\26'c\377\210\31*e\377\202\30)d\377\1""9H{\377\202=" \ ++ "K}\377\2s\377\30)d\377\221\31*e\377\7\30)d\377" \ ++ "\"2k\377-=r\377-L~\3774Cw\377&6n\377\35-g\377\33+f\377" \ ++ "\30*d\377\203\30)d\377\207\31*e\377\10\30)d\377\26'c\377$5l\377\77N\177" \ ++ "\377FS\203\377GU\204\377FT\203\377GU\204\377\202GT\204\377\3GS\204\377" \ ++ "FT\203\377ET\202\377\205FT\203\377\6FS\203\377FR\203\377ES\203\377FS" \ ++ "\203\377ES\203\377DS\203\377\202ES\203\377\4ER\202\377ER\201\377DR\202" \ ++ "\377EQ\202\377\202CR\202\377\205DR\202\377\4CQ\201\377DQ\201\377(8o\377" \ ++ "\30)d\377\207\31*e\377\2\30)d\377\37/i\377\204BP\200\377\2AO\200\377" \ ++ "@N\200\377\204AO\200\377\4@O\177\377\77O~\377@N\177\377@M\177\377\203" \ ++ "@N\177\377\202\77M\177\377\7>L\177\377\77M~\377\77M\177\377>L~\377=K" \ ++ "}\377\36/h\377\30)d\377\210\31*e\377\6\30)d\377&6n\377=K}\377s\3772Bv\3775Dw\3778Fy\377;J{\377=K}\377=L}\377L~\377B" \ ++ "P\177\377\202BP\200\377\2AO\200\377@N\200\377\203AO\200\377\203@O\177" \ ++ "\377\2@N\177\377@M\177\377\203@N\177\377\3\77M\177\377@N\177\377>L\177" \ ++ "\377\202\77M\177\377\4>L~\377\77M~\377/\77s\377\30)d\377\212\31*e\377" \ ++ "\7""5Cw\377s\377-=r\377-s\377\77M~\377FT\203\377GU\204\377FT\203\377GU\204\377GT\204\377" \ ++ "FT\203\377GS\204\377FS\203\377FT\203\377ET\202\377\205FT\203\377\2FS" \ ++ "\203\377FR\203\377\202FS\203\377\1ES\203\377\202DS\203\377\2ES\203\377" \ ++ "ES\202\377\202ER\201\377\1DQ\202\377\210DR\202\377\4CQ\201\377DQ\201" \ ++ "\377.=s\377\30)d\377\210\31*e\377\4\27(d\3772Bv\377BP\200\377AO\177\377" \ ++ "\210AO\200\377\3@N\177\377\77O~\377@M\177\377\205@N\177\377\10\77M\177" \ ++ "\377>L\177\377\77M~\377\77M\177\377\77M~\377=K|\377\31*e\377\30)d\377" \ ++ "\210\31*e\377\2\30)d\377\40""0i\377\202=K}\377\203L\177\377\77" \ ++ "M~\377\77M\177\377\77M}\377@N~\377\"2k\377\30)d\377\210\31*e\377\3\30" \ ++ ")d\377\27(d\3775Dx\377\202=K}\377\3s\377#3k\377\30)d\377\26'c\377\27)d\377\30)d\377\233" \ ++ "\31*e\377\10\30)d\377\27(c\377\26'c\377\33,g\377(8o\3774Cw\377\77N\177" \ ++ "\377HV\204\377\202GU\204\377\10FU\203\377GU\204\377GT\204\377FT\203\377" \ ++ "GS\204\377FS\203\377FT\203\377ET\202\377\203FT\203\377\2FS\203\377FT" \ ++ "\203\377\202FS\203\377\2FR\203\377FS\203\377\202ES\203\377\202DS\203" \ ++ "\377\6ES\202\377ES\203\377ER\202\377ES\201\377DR\202\377EQ\202\377\210" \ ++ "DR\202\377\3CQ\201\377DQ\201\3774Cw\377\202\30)d\377\207\31*e\377\2\30" \ ++ ")d\377$4l\377\202AO\177\377\202BP\200\377\2AO\200\377@N\200\377\204A" \ ++ "O\200\377\1@O\177\377\202@N\177\377\1@M\177\377\203@N\177\377\5\77M\177" \ ++ "\377@N\177\377\77M\177\377>L\177\377\77M\177\377\202\77M~\377\1""3Bv" \ ++ "\377\212\31*e\377\6\30)d\377(7o\377>L}\377=J|\377t\377\77M\177\377HV\204\377\202GU\204\377\10FT\203\377G" \ ++ "U\204\377GT\204\377FT\203\377GT\204\377GS\204\377FT\203\377GT\204\377" \ ++ "\202ET\202\377\203FT\203\377\1FS\203\377\202FT\203\377\2FS\203\377FR" \ ++ "\203\377\202FS\203\377\202ES\203\377\2DS\203\377ES\202\377\202ES\203" \ ++ "\377\202ES\201\377\202EQ\202\377\2DR\202\377CR\202\377\204DR\202\377" \ ++ "\2DQ\201\377DR\202\377\202DQ\201\377\2""8Fy\377\32*e\377\207\31*e\377" \ ++ "\202\30)d\377\7\35.g\377@N\177\377BP\200\377AO\200\377BP\200\377AO\200" \ ++ "\377@N\200\377\203AO\200\377\5@O\177\377AO\200\377@O\177\377\77O~\377" \ ++ "@M\177\377\205@N\177\377\202\77M\177\377\6\77M~\377>M~\377\77M}\377>" \ ++ "L}\377\40""0i\377\30)d\377\210\31*e\377\11\30)d\377\34-g\3778Gz\377<" \ ++ "J|\377=K}\377;K}\377L~\3777Fy\377" \ ++ "2Au\377,;r\377'6n\377!2j\377\34-g\377\31*e\377\27(d\377\203\26'c\377" \ ++ "\2\26(c\377\27(c\377\203\26'c\377\16\27'c\377\30)d\377\32+e\377\36/h" \ ++ "\377#4l\377)9o\377.=s\3774Cw\377:I{\377BP\201\377JW\206\377HV\205\377" \ ++ "GU\204\377FT\203\377\202GU\204\377\5GT\204\377FT\203\377GT\204\377GS" \ ++ "\204\377FS\203\377\202FT\203\377\1ET\202\377\206FT\203\377\202FS\203" \ ++ "\377\2FR\203\377ES\203\377\202FS\203\377\5ES\203\377DS\203\377ES\202" \ ++ "\377ES\203\377ER\202\377\202ES\202\377\4DR\202\377ER\202\377DR\202\377" \ ++ "CR\202\377\204DR\202\377\5DQ\201\377DR\202\377CQ\201\377DQ\201\3771A" \ ++ "v\377\202\30)d\377\207\31*e\377\10\30)d\377\37/i\377\77M~\377BP\200\377" \ ++ "AO\177\377BP\200\377AO\200\377@N\200\377\203AO\200\377\4@O\177\377AO" \ ++ "\200\377@O\177\377\77O~\377\205@N\177\377\203\77M\177\377\6\77M~\377" \ ++ "\77M\177\377>L~\377@N\177\377-t\3778Ex\3777Fy\3776Fy\377\2027Fy\377\202" \ ++ "7Ey\377\12""6Ey\3775Ey\3776Ey\3776Ex\3776Ew\3776Dx\3775Dx\3776Dx\377" \ ++ "(7o\377\30)d\377\215\31*e\377\202\30)d\377\3""1@u\3771Bv\3772@v\377\203" \ ++ "2Av\377\4""2Au\3771@t\3771@u\3770\77u\377\2031@u\377\2,t\377\31*e\377\30)d\377\210\31*e\377\7\33,f\377<" \ ++ "J|\377BP\200\377AO\177\377BP\200\377AO\200\377@N\200\377\205AO\200\377" \ ++ "\4@O\177\377\77N~\377@N\177\377@M\177\377\205@N\177\377\202>L\177\377" \ ++ "\1\77M\177\377\202\77M~\377\3""8Gz\377\31*e\377\30)d\377\210\31*e\377" \ ++ "\10\30)d\377\37/i\377>L}\377=K}\377L\177\377\202" \ ++ "\77M~\377\4>L~\377>L}\377#3k\377\30)d\377\212\31*e\377\1""7Fy\377\202" \ ++ "=K}\377\5L\177\377\202\77M\177\377\4>L" \ ++ "~\377@N~\377-=r\377\30)d\377\211\31*e\377\2\30)d\377'7n\377\202s\377\30)d\377" \ ++ "\213\31*e\377\6\30)d\377\33,g\3778Fz\3778Fx\3777Fy\3776Fy\377\2027Fy" \ ++ "\377\14""7Ey\3776Dy\3776Ey\3776Ex\3776Ey\3776Ew\3776Dx\3776Ex\3776Cx" \ ++ "\3776Dx\377%6m\377\30)d\377\216\31*e\377\12\32+f\377/>t\3771Bu\3772A" \ ++ "v\3772@v\3772Av\3772Au\3771@u\3772At\3770\77u\377\2031@u\377\2""0\77" \ ++ "t\377-L\177\377\202\77M\177\377\202\77M~\377\2""5Dx\377\26'c\377\211" \ ++ "\31*e\377\4\30)d\377\32+e\377:I{\377=K}\377\202L\177\377\202\77M~\377\4>L}\377;J|\377\34-g\377" \ ++ "\30)d\377\210\31*e\377\12\30)e\377\27(c\3772Au\377=K}\377L~\377\202DQ\201\377\3CQ\201\377DR\202\377DQ\201\377\205" \ ++ "DR\202\377\1CR\202\377\202DR\202\377\6EQ\202\377ER\202\377ER\201\377" \ ++ "ES\201\377ER\202\377ES\202\377\202ES\203\377\1ES\202\377\202DS\203\377" \ ++ "\2FS\203\377ES\203\377\202FS\203\377\1ES\203\377\202FR\203\377\204FS" \ ++ "\203\377\242FT\203\377\203FS\203\377\202FR\203\377\3FS\203\377ES\203" \ ++ "\377FS\203\377\203ES\203\377\12DS\203\377ES\203\377ES\202\377ES\203\377" \ ++ "ES\202\377ER\202\377ES\201\377ER\201\377DR\202\377EQ\202\377\202DR\202" \ ++ "\377\1CR\202\377\205DR\202\377\10DQ\201\377DR\202\377CR\202\377DQ\201" \ ++ "\377CQ\201\3771@t\377\26'c\377\30)d\377\210\31*e\377\4\30)d\377\32+e" \ ++ "\3776Ex\377BP\200\377\202AO\200\377\1BP\200\377\207AO\200\377\2AN\200" \ ++ "\377\77O~\377\205@N\177\377\2\77M\177\377@N\177\377\202\77M\177\377\6" \ ++ "\77M~\377\77M\177\377\77M}\377\77M~\377$5l\377\30)d\377\211\31*e\377" \ ++ "\2\30)d\377#3l\377\202L\177\377\77M~\377\77M\177\377\77M" \ ++ "~\377@M~\377+;q\377\27(c\377\212\31*e\377\2\30)d\3775Ex\377\202=K}\377" \ ++ "\203L\177\377\202\77M\177\377\5\77M~\377>L}\377" \ ++ "5Cw\377\31*e\377\30)d\377\211\31*e\377\3\27(d\377,K}\377\202<" \ ++ "K}\377\4;K}\377L~\377\77M~\377=K|\377" \ ++ "\35.h\377\30)d\377\211\31*e\377\7\30)d\377$4l\377>L~\377t\377\26(c\377\216\31*e\377\3\30)" \ ++ "d\377\40""0i\3772Bv\377\2052Av\377\3""2Au\3771@t\3770\77u\377\2041@u" \ ++ "\377\1(7o\377\222\31*e\377\7\30)d\377\40""0i\377-=s\377-L\177\377\77M~\377\77M\177\377\77M~\377@N~\377\40""1j\377\30)d\377\212" \ ++ "\31*e\377\2\33,f\3779H{\377\202=K}\377\2L\177\377\77M\177\377\77M" \ ++ "~\377\77M\177\377>L~\377\77M~\377*:p\377\30)d\377\211\31*e\377\202\30" \ ++ ")d\377\1""4Bw\377\202=K}\377\5t\377\32*e\377\216\31*e\377" \ ++ "\5\30)d\377\34,g\3774Cw\3771Bu\3772@v\377\2032Av\377\2""2Au\3771@t\377" \ ++ "\2051@u\377\1.=s\377\202\30)d\377\220\31*e\377\6\30)d\377\33,f\377.>" \ ++ "s\377,=q\377-;r\377-L\177" \ ++ "\377\77M~\377\77M\177\377>L~\377AO\177\377,s\377=K}\377L}\377\40""1j\377\30)d\377\212\31*e\377\202\30)d\377\10!1j\377@" \ ++ "N\200\377BP\200\377AO\177\377AO\200\377BP\200\377AO\200\377@N\200\377" \ ++ "\206AO\200\377\4@O\177\377\77O~\377@O\177\377@M\177\377\206@N\177\377" \ ++ "\10>L\177\377\77M\177\377\77M~\377\77M\177\377>L~\377\77M~\377/\77t\377" \ ++ "\27(d\377\212\31*e\377\2\30)d\377\"3k\377\202L~\377@M~\3774Cw\377\213" \ ++ "\31*e\377\3\30)d\377\33,f\377:H{\377\202=K}\377\5L\177\377\77M\177\377\77M~\377\77M\177\377" \ ++ ">L~\377\77M~\3777Fy\377\27(d\377\30)d\377\211\31*e\377\202\30)d\377\1" \ ++ "7Fy\377\202=K}\377\2s\377" \ ++ "\217\31*e\377\202\30)d\377\10""0@u\3772Bv\3772Av\3772@v\3772Av\3772A" \ ++ "u\3771@u\3772At\377\2041@u\377\2020\77t\377\2\37""0i\377\30)d\377\221" \ ++ "\31*e\377\7\30)d\377$4l\377-=r\377-L~\377\77M~\3778Gz\377" \ ++ "\32+f\377\30)d\377\212\31*e\377\7\30)d\377+:q\377=K}\377L\177\377\7\77M\177\377\77" \ ++ "M~\377>L\177\377\77M~\377=L}\377\33,f\377\30)d\377\212\31*e\377\3\30" \ ++ ")d\377!1j\377=L}\377\202=K}\377\202L~\377\77M}\377;J|\377\35-h\377\30)d\377\212\31*e\377\12" \ ++ "\30)d\377!1j\377=K}\377=J|\377=K}\377L\177\377\77M~\377\77M\177\377>L~\377\77M" \ ++ "~\377=L~\377\37""0i\377\30)d\377\212\31*e\377\7\30)d\377\34-g\377:H{" \ ++ "\377=K}\377=J|\377L}\377" \ ++ "AO\177\377\207DQ\201\377\240DR\202\377\2DQ\201\377CQ\201\377\203DQ\201" \ ++ "\377\10CP\200\377@M~\377=K}\3772Av\377\40""1i\377\27(c\377\30)d\377\31" \ ++ "*d\377\215\31*e\377\202\30)d\377\7\34,g\3772@u\377CQ\201\377AO\177\377" \ ++ "BP\200\377AO\200\377BP\200\377\202AO\200\377\1@N\200\377\207AO\200\377" \ ++ "\4@N\177\377\77O~\377@N\177\377@M\177\377\206@N\177\377\12\77M\177\377" \ ++ ">L\177\377\77M\177\377\77M~\377\77M\177\377>L~\377\77M~\377:I{\377\34" \ ++ ",g\377\30)d\377\212\31*e\377\3\30)d\377\33,f\377:I{\377\202=K}\377\5" \ ++ "s\377\33,f\377\222\31*e\377\10\30)d\377#3l\377-=r" \ ++ "\377-M}\377FS\202\377ER\201\377DQ\201\377DQ\200\377CQ\201\377\203" \ ++ "DQ\201\377\227DR\202\377\203DQ\201\377\1CQ\201\377\202DQ\201\377\10F" \ ++ "R\202\377DR\201\3779G{\377-L\177\377\77M~\377\77" \ ++ "M\177\377>L~\377\77M~\3778Gz\377\34-g\377\30)d\377\213\31*e\377\17\32" \ ++ "+f\3777Ey\377=K}\377L~\377" \ ++ "#3k\377\32*e\377\202\30)d\377\220\31*e\377\202\30)d\377\7\27(d\377\34" \ ++ "-g\377+;q\3778Fy\377\77M\177\377BO\177\377BO\200\377\202CP\200\377\204" \ ++ "DQ\201\377\2DQ\200\377DP\200\377\203DQ\201\377\1CQ\201\377\202DQ\201" \ ++ "\377\1CQ\201\377\204DQ\201\377\2DP\200\377DQ\200\377\204DQ\201\377\2" \ ++ "CP\200\377BP\200\377\202BO\177\377\5=K}\3774Bv\377&6m\377\30)d\377\27" \ ++ ")d\377\202\30)d\377\220\31*e\377\4\30)d\377\31*e\377\32+f\3770\77t\377" \ ++ "\202BP\200\377\2AO\177\377AO\200\377\202BP\200\377\210AO\200\377\202" \ ++ "@O\177\377\3@N\177\377\77O~\377@O\177\377\202@M\177\377\204@N\177\377" \ ++ "\202\77M\177\377\10@N\177\377>L\177\377\77M\177\377\77M~\377\77M\177" \ ++ "\377>L~\377\77M~\3777Fy\377\202\30)d\377\212\31*e\377\202\30)d\377\1" \ ++ "4Cw\377\203=K}\377\5;K}\377L}\377@M~\377AO\177\377CP\201\377ER\202\377\205" \ ++ "FS\202\377\17DQ\202\377BP\200\377AN\177\377\77L~\377=K}\377;I{\3777F" \ ++ "y\3772Au\377,;r\377'8o\377\"3k\377\36/h\377\31*e\377\26'c\377\27(c\377" \ ++ "\202\30)d\377\221\31*e\377\6\30)d\377\26'c\377\40""1j\3771@u\377@N\177" \ ++ "\377CQ\200\377\202BP\200\377\2AO\200\377BP\200\377\202AO\200\377\202" \ ++ "@N\200\377\204AO\200\377\1@O\177\377\202AO\200\377\2@N\177\377\77O~\377" \ ++ "\207@N\177\377\14\77M\177\377@N\177\377\77M\177\377>L\177\377\77M\177" \ ++ "\377\77M~\377\77M\177\377>L~\377@N\177\3772Av\377\32+e\377\30)d\377\214" \ ++ "\31*e\377\11""2Av\377>L}\377L\177\377\77M\177\377\77" \ ++ "M~\377\77M\177\377>M~\377@M~\377.>s\377\27)d\377\30)d\377\213\31*e\377" \ ++ "\5\30)d\377.=s\377=K}\377K}\377.>s\377" \ ++ "#3k\377\32*e\377\27(d\377\30)d\377\235\31*e\377\205\30)d\377\234\31*" \ ++ "e\377\13\31*d\377\30)d\377\27(d\377\36.h\377'7n\3775Dw\377CP\201\377" \ ++ "BP\200\377AO\177\377BP\200\377AO\200\377\202BP\200\377\212AO\200\377" \ ++ "\202@O\177\377\2\77O~\377@N\177\377\202@M\177\377\204@N\177\377\2\77" \ ++ "M\177\377@N\177\377\202\77M\177\377\10>L\177\377\77M~\377\77M\177\377" \ ++ ">L~\377\77M~\377@M~\377,L~\377s\377\30" \ ++ ")d\377\215\31*e\377\4\30)d\377(7o\3777Ey\3777Fx\377\2047Fy\377\2027E" \ ++ "y\377\13""6Ey\3775Ey\3776Ey\3776Ex\3776Ew\3776Ex\3775Dx\3776Cw\3775D" \ ++ "x\377$4l\377\30)d\377\216\31*e\377\202\30)d\377\12/\77t\3772Bv\3772A" \ ++ "v\3772@v\3772Av\3772Au\3772Av\3772At\3771@u\3770\77u\377\2041@u\377\1" \ ++ ")9p\377\224\31*e\377\3&6n\377-=r\377-L\177\377\202\77M\177\377\202\77M~\377\2@N~\377&6m\377\202\30)d\377" \ ++ "\213\31*e\377\12\30)d\377+:p\377L~\377" \ ++ "CQ\201\377BP\200\377BP\177\377\204BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\206AO\200\377\1@O\177\377\202AO\200\377\5@N\177\377@O\177\377\77N~\377" \ ++ "@N\177\377@M\177\377\207@N\177\377\202\77M\177\377\1>L\177\377\202\77" \ ++ "M\177\377\203\77M~\377\3:Hz\377\"2k\377\30)d\377\213\31*e\377\5\30)d" \ ++ "\377\31*e\377*9p\377>L~\377=K}\377\203L}\3778Gz" \ ++ "\377-L\177\377\77M\177" \ ++ "\377\202\77M~\377\4>L}\377@M~\3771@u\377\34-g\377\202\30)d\377\213\31" \ ++ "*e\377\13\30*e\3770@u\377=K}\377L\177\377\202\77M\177\377\6\77M~\377>L~\377" \ ++ "\77M~\377>L}\377,K}\377\202=K}\377\4;K}\377s\3776Ex\377=K}\377" \ ++ "\202CQ\200\377\204BP\200\377\1AO\200\377\203BP\200\377\202AO\200\377" \ ++ "\202@N\200\377\212AO\200\377\4@N\177\377@O\177\377\77O~\377@N\177\377" \ ++ "\202@M\177\377\207@N\177\377\202\77M\177\377\2>L\177\377\77M~\377\202" \ ++ "\77M\177\377\6>L~\377\77M~\377:H{\377\"2k\377\27(c\377\30)d\377\213\31" \ ++ "*e\377\14\30)d\377\33,f\3775Cw\377>L}\377s\377\31)e" \ ++ "\377\30)d\377\214\31*e\377\6\30)d\377\34-g\3776Ey\3778Fy\3777Fy\3776" \ ++ "Fy\377\2027Fy\377\16""7Ey\3776Ey\3777Dy\3776Ey\3775Ey\3776Ey\3776Ex\377" \ ++ "6Ew\3776Ex\3776Dx\3775Cx\3776Dx\377\36/h\377\30)d\377\216\31*e\377\202" \ ++ "\30)d\377\4,;r\3772Bv\3771Bu\3772@v\377\2032Av\377\2""2Au\3771@t\377" \ ++ "\2041@u\377\4""0\77t\3771@u\377\35-h\377\30)d\377\222\31*e\377\3\32+" \ ++ "e\377*:q\377,L\177\377\2@N\177\377\77M\177\377\207@N\177\377\202@M\177\377\7@N\177" \ ++ "\377\77N~\377\77O~\377AN\200\377@O\177\377AO\200\377@O\177\377\210AO" \ ++ "\200\377\202@N\200\377\3AO\200\377BP\200\377AO\200\377\203BP\200\377" \ ++ "\1AO\200\377\207BP\200\377\5>K}\3775Dw\377+;p\377#2k\377\32+f\377\225" \ ++ "\31*e\377\5\35.g\377&6m\377/>t\3778Gz\377@O\177\377\204BP\200\377\1A" \ ++ "O\177\377\202BP\200\377\1AO\200\377\203BP\200\377\3AO\200\377BP\200\377" \ ++ "AO\200\377\202@N\200\377\210AO\200\377\2@O\177\377AO\200\377\203@O\177" \ ++ "\377\1\77O~\377\202@N\177\377\1@M\177\377\210@N\177\377\202\77M\177\377" \ ++ "\2>L\177\377\77M~\377\202\77M\177\377\6>L~\377\77M}\377\77M~\3775Dx\377" \ ++ "\31*e\377\30)d\377\213\31*e\377\202\30)d\377\2\32+e\3779Gz\377\203=K" \ ++ "}\377\4;K}\377L\177\377\77M\177\377\202@N\177\377\1\77M\177\377\206@N\177\377" \ ++ "\1@M\177\377\202@N\177\377\1\77O~\377\202@O\177\377\202AO\200\377\1@" \ ++ "O\177\377\210AO\200\377\202@N\200\377\204AO\200\377\212BP\200\377\33" \ ++ "CQ\201\377DQ\201\377DR\201\377\77M~\377=K|\377:I{\3779Hz\3777Fy\3775" \ ++ "Dx\3774Cv\3772Au\3770\77t\377.>s\377-=r\377/\77s\3771@t\3772Bv\3774C" \ ++ "w\3776Ex\3778Gy\3779H{\377;J|\377=K}\377AO\177\377DR\201\377CQ\201\377" \ ++ "CQ\200\377\212BP\200\377\204AO\200\377\202@N\200\377\213AO\200\377\5" \ ++ "@O\177\377@N\177\377\77O~\377\77N~\377@N\177\377\202@M\177\377\206@N" \ ++ "\177\377\3\77M\177\377@N\177\377\77M\177\377\202>L\177\377\202\77M\177" \ ++ "\377\7\77M~\377>L~\377\77M~\377>M~\377*:p\377\27(d\377\30)d\377\214\31" \ ++ "*e\377\5\30)d\377\37/i\3779Hz\377=K}\377L\177\377\202\77M\177\377\2@N\177\377\77" \ ++ "M\177\377\206@N\177\377\202@M\177\377\5@N\177\377\77N~\377\77O~\377@" \ ++ "N\177\377@O\177\377\213AO\200\377\203@N\200\377\204AO\200\377\203BP\200" \ ++ "\377\1AO\200\377\241BP\200\377\1AO\200\377\203BP\200\377\204AO\200\377" \ ++ "\203@N\200\377\213AO\200\377\2@O\177\377@N\177\377\202\77O~\377\202@" \ ++ "N\177\377\1@M\177\377\211@N\177\377\1\77M\177\377\202>L\177\377\7\77" \ ++ "M~\377\77M\177\377\77M~\377>L}\377\77M~\3778Gz\377\35.h\377\202\30)d" \ ++ "\377\214\31*e\377\6\30)d\377\37/h\377L\177\377\203\77M\177\377\207@N\177\377" \ ++ "\202@M\177\377\202@N\177\377\1\77O~\377\203@O\177\377\215AO\200\377\203" \ ++ "@N\200\377\205AO\200\377\207BP\200\377\1AO\200\377\223BP\200\377\204" \ ++ "AO\200\377\204@N\200\377\213AO\200\377\1@O\177\377\202AO\200\377\202" \ ++ "@O\177\377\202\77O~\377\1@N\177\377\203@M\177\377\206@N\177\377\2\77" \ ++ "M\177\377@N\177\377\202\77M\177\377\11>L\177\377\77M\177\377\77M~\377" \ ++ "\77M\177\377\77M~\377>L}\377\77M~\377;I{\377+;q\377\202\30)d\377\214" \ ++ "\31*e\377\3\30*d\377\30)d\377$4l\377\202=K}\377\1=J|\377\202s\377\33,f\377\224\31*e\377\4+:p\377,=r\377-L}\377\77M~\377\204\77M\177" \ ++ "\377\2>L\177\377\77M\177\377\211@N\177\377\203@M\177\377\3@N\177\377" \ ++ "\77N~\377\77O~\377\203@O\177\377\202AO\200\377\1@O\177\377\213AO\200" \ ++ "\377\205@N\200\377\207AO\200\377\216BP\200\377\206AO\200\377\205@N\200" \ ++ "\377\214AO\200\377\1@O\177\377\202AO\200\377\4@O\177\377@N\177\377@O" \ ++ "\177\377\77N~\377\202@N\177\377\202@M\177\377\206@N\177\377\1\77M\177" \ ++ "\377\202@N\177\377\202\77M\177\377\1>L\177\377\203\77M\177\377\202\77" \ ++ "M~\377\3AO\177\3770\77u\377\34-g\377\202\30)d\377\214\31*e\377\6\30)" \ ++ "d\377\27(d\377/\77t\377L~\377\77M~\377\77M\177\377\77M~\377\77M\177\377>L\177\377\202" \ ++ "\77M\177\377\202@N\177\377\1\77M\177\377\207@N\177\377\202@M\177\377" \ ++ "\202@N\177\377\5\77N~\377\77O~\377@O\177\377@N\177\377@O\177\377\226" \ ++ "AO\200\377\216@N\200\377\222AO\200\377\1@O\177\377\202AO\200\377\202" \ ++ "@O\177\377\1@N\177\377\202\77O~\377\1\77N~\377\202@N\177\377\1@M\177" \ ++ "\377\212@N\177\377\202\77M\177\377\1>L\177\377\203\77M\177\377\10\77" \ ++ "M~\377>L~\377\77M}\377\77M~\3779Hz\377!2k\377\27(c\377\30)d\377\214\31" \ ++ "*e\377\15\30*d\377\30)d\377\35.h\3776Ex\377=K}\377s\3778Fz" \ ++ "\3778Ex\3776Fy\377\2027Fy\377\17""7Ey\3777Fy\3777Ey\3776Dy\3775Ey\377" \ ++ "6Ex\3776Ey\3776Ex\3776Dx\3776Ex\3775Dx\3776Cx\3775Dx\377\37""0j\377\30" \ ++ ")d\377\217\31*e\377\14\30)d\377\35.g\3772Bu\3771Av\3772Av\3772@v\377" \ ++ "2Av\3772Au\3772Av\3772Au\3771@u\3770\77u\377\2041@u\377\2-L\177\377\202\77M\177\377\212@N\177\377" \ ++ "\202@M\177\377\202@N\177\377\4\77N~\377\77O~\377@O\177\377@N\177\377" \ ++ "\202@O\177\377\202AO\200\377\1@O\177\377\255AO\200\377\1@O\177\377\203" \ ++ "AO\200\377\3@O\177\377@N\177\377@O\177\377\202\77O~\377\202@N\177\377" \ ++ "\203@M\177\377\207@N\177\377\2\77M\177\377@N\177\377\202\77M\177\377" \ ++ "\202>L\177\377\12\77M\177\377\77M~\377\77M\177\377\77M~\377>L~\377\77" \ ++ "M~\377=K}\377(7n\377\32+f\377\30)d\377\216\31*e\377\10\27(d\377&7n\377" \ ++ ":H{\377=K}\377L}\377\77M~\377>L}\377\202\77M~\377\2\77M\177\377\77M~\377\202\77M\177" \ ++ "\377\1>L\177\377\202\77M\177\377\2@N\177\377\77M\177\377\211@N\177\377" \ ++ "\202@M\177\377\203@N\177\377\2\77N~\377\77O~\377\204@O\177\377\244AO" \ ++ "\200\377\1@O\177\377\204AO\200\377\202@O\177\377\2@N\177\377@O\177\377" \ ++ "\202\77O~\377\1\77N~\377\202@N\177\377\202@M\177\377\211@N\177\377\2" \ ++ "\77M\177\377@N\177\377\203\77M\177\377\3>L\177\377\77M\177\377\77M~\377" \ ++ "\202\77M\177\377\1>L~\377\202\77M~\377\4>L}\3776Ex\377\33,f\377\30)d" \ ++ "\377\215\31*e\377\202\30)d\377\11\31*e\377,M}\377\77M" \ ++ "~\377\202\77M\177\377\3\77M~\377\77M\177\377>L\177\377\202\77M\177\377" \ ++ "\214@N\177\377\203@M\177\377\202@N\177\377\1\77N~\377\203\77O~\377\1" \ ++ "@N\177\377\203@O\177\377\241AO\200\377\203@O\177\377\1@N\177\377\203" \ ++ "\77O~\377\1\77N~\377\202@N\177\377\203@M\177\377\214@N\177\377\1\77M" \ ++ "\177\377\203>L\177\377\1\77M~\377\202\77M\177\377\10\77M~\377>L~\377" \ ++ "\77M~\377@M~\3771Au\377#3k\377\27(d\377\30)d\377\216\31*e\377\4\30)d" \ ++ "\377\37/h\3774Cw\377>L~\377\202=K}\377\2L}\377\202\77M~\377\3\77M\177\377\77M~\377\77M\177\377\202>L\177\377" \ ++ "\3\77M\177\377>L\177\377\77M\177\377\214@N\177\377\203@M\177\377\202" \ ++ "@N\177\377\1@M\177\377\203\77O~\377\2@O\177\377@N\177\377\202@O\177\377" \ ++ "\2\77O~\377@O\177\377\212AO\200\377\3@O\177\377AO\200\377@O\177\377\212" \ ++ "AO\200\377\2@O\177\377\77O~\377\202@O\177\377\2@N\177\377@O\177\377\203" \ ++ "\77O~\377\1@M\177\377\203@N\177\377\203@M\177\377\211@N\177\377\5\77" \ ++ "M\177\377@N\177\377\77M\177\377>L\177\377\77M\177\377\202>L\177\377\5" \ ++ "\77M\177\377\77M~\377\77M\177\377\77M~\377>L~\377\202\77M~\377\3""5C" \ ++ "w\377\34-g\377\31*e\377\202\30)d\377\216\31*e\377\11\30)d\377\"3k\377" \ ++ "L\177\377\202\77" \ ++ "M\177\377\202@N\177\377\1\77M\177\377\214@N\177\377\204@M\177\377\204" \ ++ "@N\177\377\1\77N~\377\211\77O~\377\204@O\177\377\212\77O~\377\1\77N~" \ ++ "\377\205@N\177\377\203@M\177\377\214@N\177\377\1\77M\177\377\202@N\177" \ ++ "\377\203\77M\177\377\1>L\177\377\202\77M\177\377\2\77M~\377\77M\177\377" \ ++ "\202\77M~\377\7\77M}\377@N~\377=K|\3771@u\377\40""1j\377\26(c\377\30" \ ++ ")d\377\217\31*e\377\6\30)d\377\33+f\377-M~\377=K}\377=J|\377\202" \ ++ "s\377,=r\377-<" \ ++ "r\377-;r\377-L~\377\202\77M~\377\2\77M\177\377\77M~\377\202" \ ++ "\77M\177\377\1>L\177\377\203\77M\177\377\203@N\177\377\1\77M\177\377" \ ++ "\215@N\177\377\205@M\177\377\211@N\177\377\205\77N~\377\211@N\177\377" \ ++ "\206@M\177\377\215@N\177\377\1\77M\177\377\202@N\177\377\203\77M\177" \ ++ "\377\202>L\177\377\2\77M\177\377\77M~\377\202\77M\177\377\2\77M~\377" \ ++ ">L~\377\202\77M~\377\4.=s\377\34,g\377\31*e\377\30)d\377\220\31*e\377" \ ++ "\6\27(d\377%4m\377:Hz\377=K}\377=J|\377=K}\377\202L}\377\202" \ ++ "\77M~\377\202\77M\177\377\2\77M~\377\77M\177\377\203>L\177\377\203\77" \ ++ "M\177\377\271@N\177\377\203\77M\177\377\203>L\177\377\204\77M\177\377" \ ++ "\3\77M~\377>L~\377\77M}\377\202\77M~\377\4;I{\3771@u\377\34-g\377\27" \ ++ "(c\377\220\31*e\377\202\30)d\377\5\35.h\3770\77t\377>L}\377L\177\377\204\77M\177\377\263@N\177\377" \ ++ "\204\77M\177\377\202>L\177\377\205\77M\177\377\202\77M~\377\6\77M}\377" \ ++ "@N~\377@N\177\3773Bv\377#3l\377\34-g\377\202\30)d\377\220\31*e\377\4" \ ++ "\30)d\377\27(d\377,s\377" \ ++ "\32+e\377\30)d\377\222\31*e\377\4\30)d\377\32+f\377,L}\377\77M~\377\77M}\377>L}\377\202\77M~\377\206\77M\177\377\203" \ ++ ">L\177\377\204\77M\177\377\204@N\177\377\1\77M\177\377\235@N\177\377" \ ++ "\1\77M\177\377\204@N\177\377\204\77M\177\377\203>L\177\377\206\77M\177" \ ++ "\377\203\77M~\377\10\77M}\377\77M~\377=K}\377;I{\377,L~\377@N\177" \ ++ "\377\77M~\377>L}\377\202\77M~\377\203\77M\177\377\1\77M~\377\203\77M" \ ++ "\177\377\203>L\177\377\205\77M\177\377\206@N\177\377\1\77M\177\377\221" \ ++ "@N\177\377\1\77M\177\377\206@N\177\377\205\77M\177\377\203>L\177\377" \ ++ "\203\77M\177\377\1\77M~\377\202\77M\177\377\202\77M~\377\12>L~\377>L" \ ++ "}\377\77M~\377@N\177\377:Hz\377,;r\377!1j\377\31*e\377\27(d\377\30)d" \ ++ "\377\222\31*e\377\3\27(d\377\36.h\3771Au\377\202=K}\377\2t\3771Bv\377\2052Av\377\4""2Au\3771@t\3771@u\377" \ ++ "0\77u\377\2021@u\377\5""0\77t\3771@u\377,L}\377\1>L~\377\203\77M}\377\1\77M\177\377\202\77M~\377\210\77M" \ ++ "\177\377\207>L\177\377\1@N\177\377\222\77M\177\377\206>L\177\377\211" \ ++ "\77M\177\377\202\77M~\377\1>M\177\377\203\77M}\377\202>L}\377\3>L~\377" \ ++ "4Cw\377!1j\377\202\30)d\377\223\31*e\377\7\30)d\377\31*e\377\30)d\377" \ ++ "'7o\377s\377\32*e\377\220\31*e\377\6\30" \ ++ ")d\377\27(d\377*:q\3773Bv\3771Bu\3772@v\377\2022Av\377\5""2Au\3771@u" \ ++ "\3772At\3771@u\3770\77u\377\2051@u\377\2\32+f\377\30)d\377\223\31*e\377" \ ++ "\5\32*e\377)9p\377,L}\377\203\77M~\377\214\77M\177\377\223>L\177\377\206\77M\177" \ ++ "\377\1\77M~\377\204\77M\177\377\204\77M~\377\14>L}\377\77M~\377@N~\377" \ ++ "\77N~\3779Hz\3772Au\377*:p\377\"2k\377\31*e\377\27(c\377\30)d\377\30" \ ++ "*d\377\222\31*e\377\6\30)d\377\27(d\377\32+f\377'7n\3776Ex\377\77L~\377" \ ++ "\202=K}\377\202L}\377\205\77M~\377\205\77" \ ++ "M\177\377\1\77M~\377\233\77M\177\377\204\77M~\377\2>M~\377\77L}\377\202" \ ++ "\77M~\377\6@N~\3776Ex\377(8o\377\34-g\377\32+e\377\31*e\377\204\30)d" \ ++ "\377\223\31*e\377\202\30)d\377\6)8p\377;I{\377L~" \ ++ "\3772@u\377!2j\377\31*e\377\202\30)d\377\226\31*e\377\14\30)d\377\27" \ ++ "(c\377\26'c\377\35.h\377(8o\3771@u\3775Dw\3778Fy\377;I{\377>L}\377@N" \ ++ "~\377@M~\377\202\77M~\377\3\77M}\377>L}\377\77M}\377\227\77M~\377\2>" \ ++ "L~\377\77M}\377\203\77M~\377\12@N~\377\77M~\377=J|\3779Hz\3776Ex\377" \ ++ "3Cw\377.=s\377#3l\377\31*e\377\26'c\377\202\30)d\377\226\31*e\377\6\30" \ ++ ")d\377\27(d\377\34-g\377'7o\377:H{\377>L~\377\203=K}\377\203M~\377AO\177\377@N\177\377\202@N~\377\1@M~\377\205\77M~" \ ++ "\377\205\77M}\377\2>M}\377\77M}\377\205\77M~\377\203@N~\377\12@N\177" \ ++ "\377AN\177\377;J{\3774Cw\377,s\377:H{\377" \ ++ "\202=K}\377\2s\3778Fz\3778Fy\377" \ ++ "\2067Fy\377\2""6Ey\3776Dy\377\2026Ey\377\11""6Ex\3776Ey\3776Ex\3776E" \ ++ "w\3776Ex\3775Dx\3775Cw\3776Ex\377\40""1j\377\202\30)d\377\220\31*e\377" \ ++ "\14\30)e\377+;q\3773Bv\3771Bu\3772Av\3772@v\3772Av\3772Au\3772Av\377" \ ++ "1@u\3772At\3770\77u\377\2051@u\377\2!1k\377\30)d\377\224\31*e\377\6\35" \ ++ ".h\377,L}\3776Ex\377!1j\377\32+f\377\203\30)d\377" \ ++ "\233\31*e\377\202\30)d\377\40\27(d\377\27(c\377\26'c\377\32,f\377\"2" \ ++ "k\377%5m\377'8n\377*9p\377,t\3771@u\3773Cv\3776Ey\3778Fy\377" \ ++ "9Gz\3779Hz\377:Hz\3779Gz\3778Gy\3777Fy\3775Dx\3772Bu\3771\77t\377.=s" \ ++ "\377+;q\377)8o\377&7n\377$4l\377\37""0i\377\30)d\377\26'c\377\27(c\377" \ ++ "\203\30)d\377\233\31*e\377\203\30)d\377\2\34-g\377*:q\377\202=K}\377" \ ++ "\1L~\3775Dw\377#3l\377\32+e\377\31*e\377\202\30)d\377\320" \ ++ "\31*e\377\1\30*d\377\202\30)d\377\4\31*e\377\34,g\377*:p\377s\377\222\31" \ ++ "*e\377\5\30)d\377\32+f\3772Au\3778Fy\3778Fx\377\2047Fy\377\5""7Ey\377" \ ++ "6Fy\3777Ey\3776Dy\3775Ey\377\2036Ey\377\10""6Ew\3776Dx\3776Ex\3775Dx" \ ++ "\3776Cw\3776Dx\377)8p\377\27)d\377\221\31*e\377\6\30)d\377\33,g\3771" \ ++ "Au\3772Au\3771Bv\3772@v\377\2032Av\377\4""2Au\3772At\3772Au\3770\77u" \ ++ "\377\2051@u\377\2\36.h\377\30)d\377\223\31*e\377\6\30)d\377\34-g\377" \ ++ "-=s\377,L~\3779Hz\377/>s\377$5l\377\31*e\377\27(c\377\30)d\377\315\31" \ ++ "*e\377\12\30)d\377\27(c\377\36.h\377)9p\3774Bv\377=K}\377>L}\377=K}\377" \ ++ "=J|\377=K}\377\202K}\377>M~\3774Cw\377(8o\377\"2k\377\34-g\377\202" \ ++ "\27(d\377\2\30)d\377\30)e\377\275\31*e\377\202\30)d\377\7\27(c\377\31" \ ++ "*e\377\37/i\377$4l\377-L~\377\204=K}\377\202t\377\33,f\377\30)e\377" \ ++ "\30)d\377\221\31*e\377\7\27(d\377)9p\3777Fy\3778Fy\3777Ex\3777Fy\377" \ ++ "6Fy\377\2027Fy\377\2027Ey\377\17""6Dy\3776Ey\3775Ey\3776Ey\3776Ex\377" \ ++ "6Ey\3776Ex\3776Ew\3776Ex\3776Dx\3776Cw\3776Dx\3770\77t\377\31*d\377\30" \ ++ ")d\377\221\31*e\377\6\30)d\377\37/i\3773Av\3771Au\3772Av\3772@v\377\202" \ ++ "2Av\377\5""2Au\3772Av\3772At\3771@u\3770\77u\377\2031@u\377\2020\77t" \ ++ "\377\2!1j\377\30)d\377\225\31*e\377\6'7n\377-=s\377,=q\377-K}\377\77L~\377;I{\3770\77t\377$5m\377\37/i\377" \ ++ "\33,f\377\205\30)d\377\252\31*e\377\205\30)d\377\7\31*e\377\35-g\377" \ ++ "\40""1j\377)9p\3775Cx\377>L}\377>L~\377\204=K}\377\203t\3779Gz\3778Ex\3777Fy\3776Fy\377\2047Fy\377\20""7Ey\3777Dy\3776Ey" \ ++ "\3775Ey\3776Ex\3776Ey\3776Ex\3776Ew\3776Dx\3776Ex\3775Dx\3776Cw\3775" \ ++ "Dx\377.=s\377\30)d\377\30)e\377\221\31*e\377\6\30)d\377\35.g\3773Bv\377" \ ++ "2Bu\3772Av\3772@v\377\2022Av\377\5""2Au\3772Av\3772Au\3771@u\3770\77" \ ++ "u\377\2031@u\377\4""0\77t\3771@u\377(8o\377\30)d\377\224\31*e\377\16" \ ++ "\30)d\377\36.h\377-=r\377-=q\377-K}\377>L}\377>L~\377" \ ++ "9Fz\3771@u\377)9p\377!2j\377\34-g\377\33,f\377\32+f\377\31*e\377\30)" \ ++ "e\377\231\30)d\377\13\31*e\377\32+e\377\33,f\377\34,g\377\36/h\377%5" \ ++ "m\377-L~\377>L}\377\202=K}\377\1L}\377>L~\377" \ ++ "=K}\377:H{\3777Ey\3773Bv\3770\77t\377.>s\377,t\3771@u\3775Cw\3778Fy\377;J|\377\202>L}\377\203" \ ++ "=K}\377\1t\3777Ez\3778Fx\3778Ex\377\2026Fy\377\2047Fy\377\2027Ey\377\3""6Dy\377" \ ++ "6Ey\3775Ey\377\2036Ex\377\1""6Ew\377\2026Dx\377\4""5Cx\3776Cx\3776Ex" \ ++ "\377\"3k\377\202\30)d\377\222\31*e\377\6\30*e\377&6n\3772Au\3771Bv\377" \ ++ "1Au\3772@v\377\2022Av\377\4""2Au\3772Av\3771@t\3772At\377\2020\77u\377" \ ++ "\2021@u\377\5""0\77t\3771@u\377-=r\377\30)e\377\30)d\377\225\31*e\377" \ ++ "\7#3l\377-s\377$4l\377" \ ++ "\30)d\377\27(d\377\30)d\377\230\31*e\377\7\30)d\377\31*e\377$4l\3774" \ ++ "Cw\3779Gz\3778Ex\3777Fy\377\2026Fy\377\2057Fy\377\5""7Ey\3777Dy\3776" \ ++ "Dy\3776Ey\3775Ey\377\2026Ey\377\1""6Ex\377\2026Ew\377\1""6Ex\377\202" \ ++ "6Dx\377\5""6Cw\3776Dx\377,s\377" \ ++ "6Dy\377\2028Fy\377\2027Fy\377\1""6Fy\377\2057Fy\377\2027Ey\377\2""7D" \ ++ "y\3776Ey\377\2025Ey\377\2026Ey\377\3""6Ex\3776Ew\3776Dx\377\2026Ex\377" \ ++ "\6""5Dx\3776Cw\3776Ex\377+:q\377\33,f\377\30)d\377\226\31*e\377\3*9p" \ ++ "\3773Bv\3772Bu\377\2022Av\377\1""2@v\377\2032Av\377\4""2Au\3772At\377" \ ++ "1@u\3770\77u\377\2051@u\377\3,;q\377\32+e\377\30)d\377\225\31*e\377\12" \ ++ "\30)d\377\32+f\377+;q\377-=r\377,=r\377-t\377\36/h\377\27(d\377\30)d\377\224\31*e\377\7\30)d\377\34-g\377." \ ++ ">s\3772Bv\3771Bu\3772Av\3772@v\377\2042Av\377\4""1@u\3771@t\3771@u\377" \ ++ "0\77u\377\2051@u\377\3.=s\377\34,g\377\30)d\377\225\31*e\377\202\30)" \ ++ "d\377\3&6m\377-=s\377,s\3778Fz\3778Fy\3777Fx\3778Fy\377\2026Fy" \ ++ "\377\2037Fy\377\1""7Ey\377\2027Fy\377\7""6Ey\3777Dy\3777Ey\3776Ey\377" \ ++ "5Ey\3776Ex\3776Ey\377\2026Ex\377\1""6Ew\377\2026Ex\377\2026Dx\377\1""6" \ ++ "Cw\377\2025Dx\377\1*:p\377\202\30)d\377\224\31*e\377\202\30)d\377\2\34" \ ++ "-g\3772@u\377\2022Bv\377\2032Av\377\1""2Au\377\2022Av\377\3""2Au\377" \ ++ "2At\3770\77u\377\2041@u\377\4""0\77t\3771@u\377.>s\377\33,f\377\227\31" \ ++ "*e\377\6\30)e\377$4l\377-=s\377,s\377,t\377\37/i\377\27)d\377\226\31*e\377\6\30)d\377\32+e\377(8n\3773" \ ++ "Cv\3771Au\3771Av\377\2022@v\377\2032Av\377\4""2Au\3772At\3771@u\3770" \ ++ "\77u\377\2041@u\377\5""1@t\3771@u\377-t\377\37/i\377\27(d\377\202\30)d\377" \ ++ "\351\31*e\377\203\30)d\377\3&6n\3773Av\3776Dx\377\2028Fy\377\1""8Ex\377" \ ++ "\2027Fy\377\2026Fy\377\2037Fy\377\1""7Ey\377\2027Fy\377\4""6Ey\3777D" \ ++ "y\3776Dy\3776Ey\377\2025Ey\377\2""6Ex\3776Ey\377\2026Ex\377\6""6Ew\377" \ ++ "6Dx\3776Ex\3776Dx\3775Dx\3776Cw\377\2025Dx\377\3#4l\377\31*e\377\30)" \ ++ "d\377\226\31*e\377\7\30)d\377\32+f\377.>s\3772Bv\3771Bu\3772Av\3772@" \ ++ "v\377\2032Av\377\2022Au\377\4""1@u\3772Au\3771@u\3770\77u\377\2031@u" \ ++ "\377\5""0\77t\3771@u\377*:q\377\32+e\377\30)d\377\226\31*e\377\7\30)" \ ++ "d\377\31*e\377+;q\377-=r\377-=q\377-t\377" \ ++ "\40""1i\377\31*e\377\30)d\377\226\31*e\377\202\30)d\377\6&6n\3772Au\377" \ ++ "2Bv\3771Av\3772Av\3772@v\377\2022Av\377\4""2Au\3772Av\3771@u\3772Au\377" \ ++ "\2061@u\377\5""0\77t\3771@u\377(8o\377\31*e\377\30)d\377\227\31*e\377" \ ++ "\6\30)d\377'8o\377-=s\377,=q\377-s\377(7o\377" \ ++ "\"2k\377\35.h\377\31*e\377\27(d\377\202\30)d\377\276\31*e\377\203\30" \ ++ ")d\377\6\27)c\377\33,f\377\37""0i\377$4l\377+:q\3773Au\377\2029Gz\377" \ ++ "\3""8Fy\3778Ex\3777Fx\377\2027Fy\377\2026Fy\377\2057Fy\377\1""7Ey\377" \ ++ "\2027Fy\377\4""7Ey\3776Ey\3777Ey\3776Dy\377\2026Ey\377\4""5Ey\3776Ey" \ ++ "\3776Ex\3776Ey\377\2026Ex\377\2026Ew\377\1""6Dx\377\2026Ex\377\11""6" \ ++ "Dx\3775Dx\3776Cx\3776Dx\3775Dx\377-s\377\37/i\377\27)d\377\231\31*e\377" \ ++ "\5$5m\377-=s\377,s\377\34,f\377\30)d\377\230\31*e\377\7\30)d\377#3l\377-=s\377,s\377,t\3772@v\3774Bw\3776Dx\377\205" \ ++ "8Fy\377\2""8Fx\3777Fx\377\2037Fy\377\2026Fy\377\2127Fy\377\2""7Ey\377" \ ++ "6Ey\377\2027Dy\377\2026Ey\377\2035Ey\377\1""6Ex\377\2026Ey\377\2026E" \ ++ "x\377\2026Ew\377\1""6Dx\377\2026Ex\377\2026Dx\377\6""6Cw\3775Dx\3776" \ ++ "Ey\377-s\3773Bv\3772Bv\377\2022Av\377\1""2@v\377\2022Av\377\4""2" \ ++ "Au\3772Av\3772Au\3771@t\377\2021@u\377\1""0\77u\377\2041@u\377\5""1\77" \ ++ "t\3772Av\377&6n\377\31*e\377\30)d\377\230\31*e\377\13\30)d\377\"3k\377" \ ++ "-=r\377," \ ++ "s\377+;q\377(8o\377%4m\377!2k\377\36/h\377\34-g\377\205\33,f\377\204" \ ++ "\32+f\377\1\32+e\377\203\32+f\377\1\33+f\377\204\33,f\377\11\34,g\377" \ ++ "\35-g\377\37""0i\377#3l\377'6n\377)9p\377-s\377" \ ++ ",s\3773Bv\3771Bu\3771Av\3772Av\377" \ ++ "2@v\377\2042Av\377\2022Au\377\2""2At\3771@u\377\2020\77u\377\2061@u\377" \ ++ "\3%5m\377\31*e\377\30)d\377\231\31*e\377\13\30*d\377%6m\377-=s\377,<" \ ++ "r\377-=q\377-s\377" \ ++ "4Cw\377\2035Dx\377\2026Cx\377\2""5Dx\3776Dx\377\2026Ex\377\2""6Dx\377" \ ++ "6Ex\377\2036Ew\377\2036Ex\377\2036Ey\377\2""6Ex\3776Ey\377\2045Ey\377" \ ++ "\2036Ey\377\1""6Dy\377\2037Dy\377\2""7Ey\3776Ey\377\2047Ey\377\2467F" \ ++ "y\377\2037Ey\377\2""6Ey\3777Ey\377\2047Dy\377\1""6Dy\377\2036Ey\377\204" \ ++ "5Ey\377\2""6Ey\3776Ex\377\2036Ey\377\2026Ex\377\2036Ew\377\2046Ex\377" \ ++ "\2036Dx\377\2026Cx\377\2026Dx\377\4""1Av\377,t\377$4l\377\30)d\377\27" \ ++ "(d\377\30)d\377\237\31*e\377\10\30)d\377\31*e\377\34-g\377,;r\3773Bv" \ ++ "\3771Au\3771Av\3772Av\377\2022@v\377\2022Av\377\7""2Au\3772Av\3771@u" \ ++ "\3772Au\3772At\3771@u\3770\77u\377\2041@u\377\6""0\77t\3771@t\3771@u" \ ++ "\377.=r\377\36.h\377\30)d\377\232\31*e\377\14\30)d\377\33+f\377*:p\377" \ ++ "-=s\377,=r\377-s\3773Bw\3774Cw\3774Dx\3776Dx\3775Dx\3775Cw\377\2026Cx\377\2""6Dx\377" \ ++ "5Dx\377\2026Dx\377\2046Ex\377\1""6Dx\377\2026Ex\377\2046Ew\377\2066E" \ ++ "x\377\2106Ey\377\1""6Ex\377\2336Ey\377\2066Ex\377\2046Ew\377\2026Ex\377" \ ++ "\1""6Dx\377\2036Ex\377\2026Dx\377\4""5Dx\3776Dx\3776Cx\3776Cw\377\202" \ ++ "5Dx\377\1""6Dx\377\2024Cw\377\4""2Bv\377)9p\377\36.i\377\27(d\377\202" \ ++ "\30)d\377\241\31*e\377\7\30)d\377\31*e\377\32+e\377$5l\3773Bv\3772Bv" \ ++ "\3771Bu\377\2062Av\377\2022Au\377\5""1@v\3772At\3771@t\3771@u\3770\77" \ ++ "u\377\2071@u\377\3""0\77t\377!2k\377\30)d\377\232\31*e\377\13\31*d\377" \ ++ "\30)d\377\36/h\377-=r\377,s\3772Av\3775Dx\3776Ex\377\2026Dx\377" \ ++ "\2""5Dx\3775Cw\377\2046Cx\377\1""5Dx\377\2056Dx\377\2416Ex\377\2056D" \ ++ "x\377\2""5Dx\3776Dx\377\2036Cx\377\2""6Cw\3775Dx\377\2026Dx\377\7""6" \ ++ "Ex\3774Cw\3770@u\377-=s\377)9p\377#3k\377\34-g\377\202\27(d\377\202\30" \ ++ ")d\377\245\31*e\377\202\30)d\377\7\32+f\377#3l\377/\77t\3773Bv\3771B" \ ++ "u\3771Av\3772Av\377\2022@v\377\2032Av\377\6""2Au\3772Av\3772Au\3772A" \ ++ "t\3771@t\3771@u\377\2020\77u\377\2071@u\377\3)9o\377\33,f\377\30)d\377" \ ++ "\233\31*e\377\6\30)d\377\31*e\377%5m\377-=s\377,t\377\36/h\377\31" \ ++ "*e\377\30)d\377\233\31*e\377\7\30)e\377\32+f\377*:p\377-=r\377-=q\377" \ ++ "-t\3770@u\3772Av\3773Bw\3775Dw\3775Dx\377\2066Dx\377\203" \ ++ "5Dx\377\2025Cx\377\2136Cx\377\2""5Cw\3775Cx\377\2035Dx\377\2066Dx\377" \ ++ "\15""5Dx\3774Cw\3772Bv\3771@u\3770\77t\377.>t\377,;q\377'7n\377#3l\377" \ ++ "\36/h\377\31)d\377\27(c\377\27(d\377\202\30)d\377\252\31*e\377\1\31*" \ ++ "d\377\202\30)d\377\10\34-g\377%5m\3771Au\3773Bv\3771Bu\3771Av\3772Av" \ ++ "\3772@v\377\2042Av\377\2""2Au\3772Av\377\2022Au\377\1""2At\377\2021@" \ ++ "u\377\1""0\77u\377\2051@u\377\6""0\77t\3771@u\3770\77t\377)8o\377\31" \ ++ "*e\377\30)d\377\233\31*e\377\202\30)d\377\6\35.g\377+;q\377-=s\377-=" \ ++ "q\377-s\377,;q\377)8o\377&6n\377#4l\377!1j\377" \ ++ "\37/i\377\36.h\377\34-g\377\33,f\377\32*e\377\206\30)d\377\255\31*e\377" \ ++ "\5\30)d\377\27(d\377\36/h\377+;q\3771@u\377\2022Bv\377\2""1Bv\3772Av" \ ++ "\377\2022@v\377\2032Av\377\1""2Au\377\2022Av\377\4""1@u\3772Au\3771@" \ ++ "t\3771@u\377\2020\77u\377\2061@u\377\3""2@u\377-=s\377\36/h\377\202\30" \ ++ ")d\377\234\31*e\377\5\30)d\377\"2k\377,s\377$4l\377\27(d\377\30)d\377\234\31*e\377\4\30)d\377\31*e\377%" \ ++ "5l\377-=s\377\202-=q\377\2-t\377%5m\377\35.g\377\33+f\377\31*e\377\203\30" \ ++ ")d\377\341\31*e\377\203\30)d\377\10\31*e\377\33,f\377\40""0i\377(9o\377" \ ++ "2Av\3773Bv\3772Bv\3771Bu\377\2022Av\377\2022@v\377\2052Av\377\1""2Au" \ ++ "\377\2022Av\377\4""2Au\3771@u\3772At\3771@t\377\2021@u\377\1""0\77u\377" \ ++ "\2061@u\377\1""0\77t\377\2021@u\377\4/>t\377(8o\377\32+e\377\30)d\377" \ ++ "\237\31*e\377\7\30)e\377\30)d\377\34,f\377*:q\377-=s\377-s\377\2032Au\377\2032Bv\377\4""1Bu\3771Av\3772@v\3772" \ ++ "Av\377\2032@v\377\2102Av\377\1""2Au\377\2032At\377\1""1@t\377\2021@u" \ ++ "\377\2020\77u\377\2111@u\377\2.=s\377\37/i\377\202\31*e\377\1\30)d\377" \ ++ "\241\31*e\377\7\30)d\377\32+f\377)9o\377,t\377)9p\377$4l\377" \ ++ "\40""0j\377\33,f\377\27(c\377\27(d\377\204\30)d\377\246\31*e\377\204" \ ++ "\30)d\377\13\27)d\377\27(d\377\31*d\377\35.h\377\"2k\377&6n\377,t\377+:q\377!1j\377\27)d\377\202\30)d\377\242\31" \ ++ "*e\377\202\30)d\377\5\32+f\377\"2k\377-=s\377-=r\377,=q\377\202-s\377" \ ++ ".>s\377-=r\377,s\377/>s\3770\77t\3771@t" \ ++ "\3771@u\3771Au\377\2062Bv\377\2031Bv\377\1""1Av\377\2042Av\377\2042@" \ ++ "v\377\2072Av\377\1""2Au\377\2032Av\377\2022Au\377\1""1@u\377\2022At\377" \ ++ "\1""1@t\377\2021@u\377\2020\77u\377\2111@u\377\6""0\77t\3771@u\3772@" \ ++ "u\377.=s\377#3k\377\34,g\377\203\30)d\377\243\31*e\377\202\30)d\377\6" \ ++ "\37""0i\377*:q\377-=s\377-=r\377-=q\377-t\377" \ ++ "+:q\377\40""0i\377\202\30)d\377\245\31*e\377\202\30)d\377\6\33,f\377" \ ++ "&6n\377.>s\377-=r\377-s\377-=r\377-=q\377-t\377%5m\377" \ ++ "\34-g\377\202\31*e\377\202\30)d\377\251\31*e\377\7\30)d\377\32+f\377" \ ++ "(7o\377,s\377\2041@u\377\1""0\77t\377\216" \ ++ "1@u\377\2050\77u\377\2051@u\377\1""1@t\377\2072At\377\2312Au\377\2""1" \ ++ "@u\3772Au\377\2072At\377\1""1@t\377\2061@u\377\2040\77u\377\2161@u\377" \ ++ "\1""0\77t\377\2041@u\377\5-=s\377*:p\377$4l\377\34-g\377\27(c\377\202" \ ++ "\30)d\377\252\31*e\377\202\30)d\377\13\33,f\377\"3l\377,t\377.=s\377+:q\377$4m\377\35" \ ++ ".g\377\27)d\377\203\30)d\377\255\31*e\377\202\30)d\377\7\32+f\377!1k" \ ++ "\377-=r\377-=s\377,s\377*9p\377" \ ++ "%5m\377\37""0i\377\35-g\377\32+e\377\204\30)d\377\256\31*e\377\202\30" \ ++ ")d\377\10\31*d\377$4l\377*:q\377-=s\377-=r\377-=q\377-s\377+;q\377%5m\377\36/h\377" \ ++ "\31*e\377\204\30)d\377\262\31*e\377\11\30)d\377\31)e\377\31*e\377!1j" \ ++ "\377-s\377,;q\377)9p\377'6n\377$4l\377\"2k\377\36/h\377\33,g" \ ++ "\377\30)d\377\27(d\377\203\30)d\377\264\31*e\377\13\30)d\377\27)d\377" \ ++ "\33,f\377#3k\377*:q\377-=s\377,=r\377-=q\377-t\377\2151@u\377\2""1@t\3770" \ ++ "\77u\377\2051@u\377\1""1\77t\377\2151@u\377\7""1\77t\377.=s\377+;q\377" \ ++ "(8o\377$5l\377\40""1i\377\34-g\377\205\31*e\377\1\30*d\377\204\30)d\377" \ ++ "\266\31*e\377\20\30)e\377\30)d\377\32+f\377&6m\377-=s\377,s\377\202-=r\377\2-=q\377-s\377-=s\377,s\377-=s\377-=r" \ ++ "\377,=q\377-=q\377\203-r\377+;q\377'7o\377#4l\377\40""1" \ ++ "j\377\36.h\377\34-g\377\33+f\377\31*e\377\206\30)d\377\261\31*e\377\206" \ ++ "\30)d\377\12\32*e\377\33,f\377\35-g\377\37/i\377\"2k\377%5m\377)9p\377" \ ++ ",s\377-=s\377\202-=r\377\1,=r\377\202-=q\377\204-s\377\15,s\377\203" \ ++ "-=s\377\2-=r\377,=r\377\204-=q\377\204-L}\377\205=K}\377\210" \ ++ "L}\377;I{\377\36.h\377\30)d\377\214\31*e\377\3\30" \ ++ ")d\377\37/i\377s\377\26'c\377\213\31*e\377\7\34-g" \ ++ "\377;I|\377BP\201\377AO\200\377BP\201\377BP\200\377BP\177\377\206BP\200" \ ++ "\377\202AO\200\377\1@N\200\377\206AO\200\377\207@N\177\377\5\77M~\377" \ ++ "@N\177\377\77M~\377>L}\377*:p\377\202\30)d\377\214\31*e\377\4\33,f\377" \ ++ "2Av\377=K}\377s\377\30)d\377\224" \ ++ "\31*e\377\5\30)d\377!2k\3771Av\3772Av\3771@u\377\2062Av\377\1""0At\377" \ ++ "\2071Au\377\4/\77u\377,L}\377HU\204\377GT\203\377HU\204\377FU\204\377\210GU\204" \ ++ "\377\2FT\203\377ES\202\377\206FT\203\377\4ES\203\377FT\203\377ES\203" \ ++ "\377DR\203\377\205ES\203\377\4DR\202\377ES\203\377DR\202\377CQ\201\377" \ ++ "\204DR\202\377\5CQ\201\377DR\202\377CQ\201\377\37/h\377\30)d\377\212" \ ++ "\31*e\377\3\30)d\377+:q\377BP\200\377\203BP\201\377\2BP\200\377BP\177" \ ++ "\377\204BP\200\377\4AO\200\377BP\200\377AO\200\377@N\200\377\205AO\200" \ ++ "\377\2@N\177\377AO\200\377\210@N\177\377\5>L}\377\77M~\3775Cw\377\33" \ ++ ",f\377\30)d\377\214\31*e\377\2\30)d\377)8o\377\204=K}\377\3s\377\36/h\377\30" \ ++ ")d\377\230\31*e\377\5\30)d\377\36/h\377.=s\377-t\377" \ ++ "2Av\3771@u\377\2062Av\377\2""1Au\3770At\377\2051Au\377\5""0@u\3771Au" \ ++ "\377/\77u\377\"2k\377\30)d\377\230\31*e\377\5\30)d\377\35-g\377,;r\377" \ ++ ".=s\377,;q\377\205-s\377\30)d\377\214\31*e\377\202\30)d\377\2""4Bw\377" \ ++ "L~\377\203BP\201\377\2BP\200\377BP\177\377\205BP\200\377\3AO\200\377" \ ++ "BP\200\377@N\200\377\207AO\200\377\2@N\177\377\77M~\377\205@N\177\377" \ ++ "\203\77M~\377\3>K}\377\32+e\377\30)d\377\214\31*e\377\3\27(d\377(8o\377" \ ++ "L}\377@N\177\377(7n\377\27)d\377\214" \ ++ "\31*e\377\4\30)d\377\32+f\377=K}\377M\177\377BP\201\377AO" \ ++ "\200\377\202BP\200\377\1BP\177\377\206BP\200\377\1AO\200\377\202@N\200" \ ++ "\377\206AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202\77M~\377\3" \ ++ "9Hz\377\27(c\377\30)d\377\214\31*e\377\2\27(c\3772Av\377\205=K}\377\1" \ ++ "s\377\27(c\377\220\31*e\377" \ ++ "\2\27(c\377,;q\377\2058Fz\377\2""7Fy\3778Fz\377\2077Fy\377\2076Ex\377" \ ++ "\3""0@t\377\31*e\377\30)d\377\223\31*e\377\5\30)d\377#4l\3774Cw\3772" \ ++ "Av\3771@u\377\2052Av\377\2021Au\377\1""0At\377\2051Au\377\2020@u\377" \ ++ "\2%6m\377\30)d\377\230\31*e\377\5\30)d\377\34,g\377,;q\377-t\377\203" \ ++ "BP\201\377\2BP\200\377BP\177\377\207BP\200\377\2AO\200\377@N\200\377" \ ++ "\204AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\206@N\177\377" \ ++ "\202\77M~\377\3""9Hz\377\33,f\377\30)d\377\214\31*e\377\3\30)d\377/=" \ ++ "s\377>L}\377\204=K}\377\210M~\377BP\201\377BP\200\377BP\201\377BP\200" \ ++ "\377BP\177\377\206BP\200\377\210AO\200\377\207@N\177\377\5\77M~\377@" \ ++ "N\177\377\77M~\377=K|\377$5m\377\202\30)d\377\213\31*e\377\3\30)d\377" \ ++ "\"3k\377>L~\377\205=K}\377\210L}" \ ++ "\377\77M~\377.>s\377\31*e\377\30)d\377\214\31*e\377\2\35.g\3779Gz\377" \ ++ "\205=K}\377\1;K}\377\207L}\377\77M~\377\40""1j\377" \ ++ "\215\31*e\377\2\30)d\377)9p\377\204=K}\377\3s\377\202" \ ++ "HU\204\377\1GU\204\377\202FU\204\377\206GU\204\377\1FT\203\377\202ES" \ ++ "\202\377\204FT\203\377\2ES\203\377FT\203\377\207ES\203\377\2DR\202\377" \ ++ "ES\203\377\205DR\202\377\5CQ\201\377ES\202\3775Ex\377\31*e\377\31)d\377" \ ++ "\211\31*e\377\7\27(c\377-=s\377CQ\201\377AO\200\377BP\200\377BP\201\377" \ ++ "BP\177\377\207BP\200\377\1@N\200\377\207AO\200\377\2@N\177\377\77M~\377" \ ++ "\206@N\177\377\3\77M~\377@N\177\377+;q\377\215\31*e\377\3\30)d\377\"" \ ++ "2k\377:H{\377\205=K}\377\2L}\377GT" \ ++ "\203\377HU\204\377GU\204\377FU\204\377\205GU\204\377\4FT\203\377GU\204" \ ++ "\377FT\203\377ES\202\377\205FT\203\377\3ES\203\377FT\203\377DR\203\377" \ ++ "\207ES\203\377\2DR\202\377CQ\201\377\205DR\202\377\3ES\202\377\36/i\377" \ ++ "\30)d\377\211\31*e\377\2\30)d\377\33-g\377\204BP\201\377\2BP\200\377" \ ++ "BP\177\377\206BP\200\377\2AO\200\377@N\200\377\205AO\200\377\202@N\177" \ ++ "\377\1\77M~\377\205@N\177\377\203\77M~\377\2""8Gz\377\30)d\377\214\31" \ ++ "*e\377\3\30)d\377\33+f\3777Fy\377\204=K}\377\202L}\377@N\177\377\35.g\377\30)d\377\213\31*e\377\4\30)d\377\27" \ ++ "(c\3771@t\377s\377-" \ ++ "L}\377\77M~\377\34-f\377\30)d\377" \ ++ "\213\31*e\377\3\30)d\377\26(c\3777Fz\377\205=K}\377\2s\377\210-t\377\27" \ ++ ")d\377\30)d\377\205\31*e\377\3\27)d\377!2j\377FS\203\377\203IV\205\377" \ ++ "\2HU\204\377IV\205\377\207JW\206\377\4IV\206\377JW\206\377KX\206\377" \ ++ "JW\206\377\206KX\206\377\4JW\205\377KX\206\377LY\207\377KX\206\377\207" \ ++ "LY\207\377\1LX\207\377\202LY\207\377\2LZ\207\377LY\207\377\211LZ\207" \ ++ "\377\1KZ\206\377\203LZ\207\377\202MZ\210\377\1LZ\207\377\236MZ\210\377" \ ++ "\1LZ\207\377\203MZ\210\377\202LZ\207\377\202KZ\206\377\210LZ\207\377" \ ++ "\1LY\207\377\202LZ\207\377\2LY\207\377LX\207\377\207LY\207\377\4KX\206" \ ++ "\377LY\207\377KX\206\377JW\205\377\207KX\206\377\4JW\206\377KX\206\377" \ ++ "JW\206\377IV\206\377\205JW\206\377\11IV\205\377JW\206\377IV\205\377H" \ ++ "U\204\377IV\205\377HU\204\377KX\206\3777Dy\377\26'c\377\207\31*e\377" \ ++ "\6\34,g\377>K}\377HU\204\377HT\203\377GU\204\377FU\204\377\205GU\204" \ ++ "\377\202FT\203\377\1ES\202\377\206FT\203\377\202ES\203\377\1DR\203\377" \ ++ "\206ES\203\377\2DR\202\377CQ\201\377\204DR\202\377\4CQ\201\377AO\200" \ ++ "\377%5m\377\30)d\377\211\31*e\377\3\30)d\377&6n\377@N\200\377\202BP\201" \ ++ "\377\202BP\200\377\1BP\177\377\205BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\205AO\200\377\202@N\177\377\1\77M~\377\205@N\177\377\203\77M~\377\2" \ ++ "(7o\377\27(d\377\214\31*e\377\3\27(d\377,L}\377\204=K}\377\2<" \ ++ "K}\377;K}\377\206s\377\2068Fz\377\2""7Fy\3776Fx\377\2067Fy\377\2""6Ex\3775Dw\377\203" \ ++ "6Ex\377\4""5Dw\3777Fx\377\37""0i\377\30)d\377\223\31*e\377\5\30)d\377" \ ++ "\40""1i\3771@u\3773Bw\3771@u\377\2062Av\377\1""0At\377\2071Au\377\2/" \ ++ "\77u\377*:q\377\202\30)d\377\227\31*e\377\2\30)d\377\31*e\377\202.=s" \ ++ "\377\207-L~\377K}\377\202HU\204\377\2GU\204" \ ++ "\377FU\204\377\206GU\204\377\1FT\203\377\202ES\202\377\204FT\203\377" \ ++ "\4ES\203\377FT\203\377ES\203\377DR\203\377\206ES\203\377\2DR\202\377" \ ++ "CQ\201\377\205DR\202\377\3;I|\377\35.g\377\30)d\377\210\31*e\377\4\30" \ ++ ")d\377\26(c\3776Dy\377AO\200\377\202BP\201\377\210BP\200\377\210AO\200" \ ++ "\377\210@N\177\377\5\77M~\377>L}\3779Gz\377\33+f\377\30)d\377\213\31" \ ++ "*e\377\2\30)d\377\31*e\377\206=K}\377\2t\3772Av\3771@u\377\2062Av\377\2""1" \ ++ "Au\3770At\377\2061Au\377\4/\77u\377-=s\377\34-g\377\30)d\377\231\31*" \ ++ "e\377\2(8o\377.=s\377\206-s\377\36/i\377\30)d\377" \ ++ "\231\31*e\377\2%5m\377.=s\377\210-L}\377(8o\377\30)d" \ ++ "\377\214\31*e\377\3\30)d\377+:q\377>L}\377\204=K}\377\210K}\377\33,f\377\30)" \ ++ "d\377\205\31*e\377\202\30)d\377\3FS\203\377IV\205\377HU\204\377\202I" \ ++ "V\205\377\207JW\206\377\2IV\206\377JW\206\377\210KX\206\377\4JW\205\377" \ ++ "KX\206\377LY\207\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377\215" \ ++ "LZ\207\377\214MZ\210\377\202LY\207\377\204MZ\210\377\204N[\211\377\1" \ ++ "MZ\210\377\206N[\211\377\1MZ\210\377\205N[\211\377\203MZ\210\377\203" \ ++ "LY\207\377\212MZ\210\377\1LZ\207\377\202MZ\210\377\2LZ\207\377KZ\206" \ ++ "\377\207LZ\207\377\4LY\207\377LZ\207\377LY\207\377LX\207\377\206LY\207" \ ++ "\377\1KX\206\377\202LY\207\377\1JW\205\377\206KX\206\377\4JW\206\377" \ ++ "KX\206\377JW\206\377IV\206\377\207JW\206\377\2IV\205\377HU\204\377\202" \ ++ "IV\205\377\2JW\206\377-L}\377\77M~\377/>t\377\31*e\377\30)d" \ ++ "\377\213\31*e\377\4\30)d\377\"2k\377\77M~\377s\377" \ ++ "\27(c\377\217\31*e\377\4\30)d\377\32+f\3773Av\3777Fz\377\2058Fz\377\2" \ ++ "7Fy\3776Fx\377\2067Fy\377\2""6Ex\3775Dw\377\2046Ex\377\3""5Dw\377\36" \ ++ "/h\377\30)d\377\223\31*e\377\5\27)d\377&5m\3773Bw\3772Av\3771@u\377\205" \ ++ "2Av\377\2""1Au\3770At\377\2061Au\377\2020@u\377\2#3k\377\30)d\377\231" \ ++ "\31*e\377\4\40""0j\377/=s\377-L}\377@N\177" \ ++ "\377\"2j\377\215\31*e\377\4\32+e\3770\77t\377=K}\377L}\377@N\177\377*:p\377\215\31*e\377\4\30)d\377+;q\377=K}\377=J|\377" \ ++ "\202=K}\377\3L}\377\26'c\377\30)d\377\205\31*e\377" \ ++ "\2\30)d\377*9p\377\202IV\205\377\202HU\204\377\1IV\205\377\206JW\206" \ ++ "\377\202IV\206\377\1JW\206\377\206KX\206\377\2JW\205\377KX\206\377\210" \ ++ "LY\207\377\2LX\207\377LY\207\377\207LZ\207\377\202KZ\206\377\202LZ\207" \ ++ "\377\207MZ\210\377\203LY\207\377\3MZ\210\377N[\211\377MZ\210\377\215" \ ++ "N[\211\377\215MZ\211\377\214N[\211\377\1MZ\210\377\202N[\211\377\1MZ" \ ++ "\210\377\202LY\207\377\207MZ\210\377\4LZ\207\377MZ\210\377LZ\207\377" \ ++ "KZ\206\377\210LZ\207\377\2LY\207\377LX\207\377\207LY\207\377\2KX\206" \ ++ "\377JW\205\377\207KX\206\377\2JW\206\377IV\206\377\207JW\206\377\7IV" \ ++ "\205\377HU\204\377IV\205\377HU\204\377DQ\201\377\34-g\377\30)d\377\205" \ ++ "\31*e\377\6\30)d\377%4l\377DQ\201\377HU\204\377GU\204\377FU\204\377\206" \ ++ "GU\204\377\1FT\203\377\202ES\202\377\205FT\203\377\1ES\203\377\202DR" \ ++ "\203\377\205ES\203\377\1DR\202\377\202CQ\201\377\205DR\202\377\3""1@" \ ++ "u\377\27(c\377\30)e\377\210\31*e\377\3\30)d\377\"2k\377DR\202\377\202" \ ++ "BP\201\377\2BP\200\377BP\177\377\206BP\200\377\2AO\200\377@N\200\377" \ ++ "\206AO\200\377\2@N\177\377\77M~\377\205@N\177\377\203\77M~\377\1""3A" \ ++ "v\377\215\31*e\377\3\30)d\377&6n\377L~\377\202BP\201\377\202BP\200\377\1BP\177\377\205BP\200\377\202AO\200" \ ++ "\377\1@N\200\377\205AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202" \ ++ "\77M~\377\2;I{\377\30)d\377\214\31*e\377\3\30)d\377\"2j\377:H{\377\205" \ ++ "=K}\377\1;K}\377\206s\377GT\203\377HU\204\377GU\204\377" \ ++ "FU\204\377\206GU\204\377\2FT\203\377ES\202\377\206FT\203\377\2ES\203" \ ++ "\377DR\203\377\206ES\203\377\2DR\202\377CQ\201\377\204DR\202\377\4CQ" \ ++ "\201\377\77N\177\377\40""0i\377\30)d\377\211\31*e\377\2\33,f\3776Dy\377" \ ++ "\203BP\201\377\2BP\200\377BP\177\377\206BP\200\377\2AO\200\377@N\200" \ ++ "\377\205AO\200\377\202@N\177\377\1\77M~\377\205@N\177\377\5\77M~\377" \ ++ ">L}\377@N\177\377\33,f\377\30)d\377\213\31*e\377\3\30)d\377\35.h\377" \ ++ "8Fy\377\205=K}\377\2t\377CP\201\377AO\200" \ ++ "\377BP\201\377BP\200\377BP\177\377\206BP\200\377\2AO\200\377@N\200\377" \ ++ "\206AO\200\377\2@N\177\377\77M~\377\206@N\177\377\4\77M~\377@N\177\377" \ ++ "$4l\377\30)d\377\213\31*e\377\3\30)d\377\31)e\3776Ex\377\204=K}\377\202" \ ++ "t\377JW\205\377HU\204" \ ++ "\377IV\205\377HU\204\377JW\206\377IV\205\377\205JW\206\377\2IV\206\377" \ ++ "JW\206\377\210KX\206\377\2LY\207\377KX\206\377\205LY\207\377\4LX\207" \ ++ "\377LY\207\377LZ\207\377LY\207\377\205LZ\207\377\4KZ\206\377LZ\207\377" \ ++ "MZ\210\377LZ\207\377\207MZ\210\377\4LY\207\377MZ\210\377N[\211\377MZ" \ ++ "\210\377\210N[\211\377\1MZ\211\377\202N[\211\377\2O\\\211\377N[\211\377" \ ++ "\203O\\\211\377\12JV\201\377ALq\3779Cc\37708S\377$*\77\377\32\37.\377" \ ++ "\23\26!\377\15\17\26\377\10\12\17\377\5\6\12\377\202\4\5\10\377\12\6" \ ++ "\7\13\377\11\13\20\377\16\20\30\377\24\27#\377\34!1\377&,B\37719U\377" \ ++ ":Ce\377ALr\377JV\202\377\202O\\\211\377\202N[\211\377\202MZ\211\377\207" \ ++ "N[\211\377\203MZ\210\377\1LY\207\377\206MZ\210\377\4LZ\207\377MZ\210" \ ++ "\377LZ\207\377KZ\206\377\206LZ\207\377\202LY\207\377\1LX\207\377\207" \ ++ "LY\207\377\2KX\206\377JW\205\377\206KX\206\377\202JW\206\377\1IV\206" \ ++ "\377\204JW\206\377\4IV\205\377JW\206\377IV\205\377HU\204\377\202IV\205" \ ++ "\377\3CQ\201\377\32+e\377\30)d\377\205\31*e\377\4\27(d\377'7o\377JW\205" \ ++ "\377HT\203\377\210GU\204\377\210FT\203\377\210ES\203\377\2DR\202\377" \ ++ "CQ\201\377\205DR\202\377\3""7Fy\377\33,f\377\30)d\377\210\31*e\377\10" \ ++ "\30)d\377\"3k\377>L~\377BP\201\377BP\200\377BP\201\377BP\200\377BP\177" \ ++ "\377\205BP\200\377\202AO\200\377\1@N\200\377\205AO\200\377\2@N\177\377" \ ++ "\77M~\377\206@N\177\377\202\77M~\377\2""5Dx\377\27(c\377\214\31*e\377" \ ++ "\3\27(c\377,;q\377l\377" \ ++ "6Ex\3776Ew\3776Ex\377&6n\377\30)d\377\204\31*e\377\1\24\"S\377\216\24" \ ++ "\"R\377\10\23!Q\377\25#S\377*6a\377(5`\377'4_\377(5`\377(4_\377+8g\377" \ ++ "\2032Av\377\2""1Au\3770At\377\2051Au\377\2020@u\377\2&6n\377\30)d\377" \ ++ "\230\31*e\377\2\30)d\377!2j\377\202-\377JV\200\377N[\211\377MZ\211" \ ++ "\377\207N[\211\377\1MZ\210\377\202N[\211\377\1LY\207\377\207MZ\210\377" \ ++ "\202LZ\207\377\1KZ\206\377\210LZ\207\377\2LY\207\377LX\207\377\204LY" \ ++ "\207\377\4KX\206\377LY\207\377KX\206\377JW\205\377\207KX\206\377\206" \ ++ "JW\206\377\2IV\205\377JW\206\377\202IV\205\377\4HU\204\377JW\205\377" \ ++ ":I{\377\26'c\377\206\31*e\377\5\30)d\3777Fy\377IV\204\377HU\204\377F" \ ++ "U\204\377\207GU\204\377\210FT\203\377\206ES\203\377\2DR\202\377ES\203" \ ++ "\377\207DR\202\377\2!2j\377\30)d\377\210\31*e\377\3\30)d\377\27(d\377" \ ++ "8G{\377\203BP\201\377\2BP\200\377BP\177\377\206BP\200\377\2AO\200\377" \ ++ "@N\200\377\204AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\205" \ ++ "@N\177\377\5\77M~\377>L}\377\77M~\377\33-g\377\30)d\377\213\31*e\377" \ ++ "\3\30)d\377\40""0i\377m\377\2026Ex\377\2+;q\377\32*e\377\203\31*e\377" \ ++ "\2\24\"S\377\0\0\2\377\224\0\0\0\377\2\0\1\1\377\33#@\377\2032Av\377" \ ++ "\2""1Au\3770At\377\2041Au\377\5""0@u\3771Au\3770@u\377*:q\377\30)d\377" \ ++ "\230\31*e\377\5\30)d\377\37/i\377,s\377\27(c\377\214\31*e\377\2\26(c\3774Cx\377\205=K}\377\5s\377\205=K}\377\5L}\3778Gy\377\202\30)d\377\213\31*e\377\3\27(d\377)9p\377>L}\377" \ ++ "\204=K}\377\2\377\0\0\1\377\0\0\0\377DDD\377\355\355\355" \ ++ "\377\217\377\377\377\377\3\376\376\376\377\377\377\377\377\"\"\"\377" \ ++ "\202\0\0\0\377\1,9c\377\2026Ex\377\1\35.g\377\202\31*e\377\5\24\"S\377" \ ++ "\3\5\15\377\0\0\0\377\25\25\25\377\327\327\327\377\216\377\377\377\377" \ ++ "\2\363\363\363\377QQQ\377\202\0\0\0\377\1\40*M\377\2052Av\377\2071Au" \ ++ "\377\4""0@u\3771Au\377\35-g\377\30)d\377\227\31*e\377\202\30)d\377\6" \ ++ "+:q\377.=s\377-L~\377\204=K}\377\204" \ ++ "L}\377(8o\377\30)d\377\214\31*e\377" \ ++ "\2\30)d\3779Gz\377\205=K}\377\204q\377\2062Av\377\2101Au\377\3""0@u\377(8o\377\27(d\377" \ ++ "\227\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377\1\225\225\225\377\216" \ ++ "\377\377\377\377\1\367\367\367\377\202\0\0\0\377\2\3\6\17\377\27'_\377" \ ++ "\225\31*e\377\2\30)d\377\36/i\377\203(8o\377\207'7o\377\2\36/h\377\30" \ ++ ")d\377\233\31*e\377\6\27(d\377%5m\377JW\206\377HU\204\377IV\205\377H" \ ++ "U\204\377\207JW\206\377\1IV\206\377\206KX\206\377\2JW\205\377KX\206\377" \ ++ "\206LY\207\377\2LX\207\377LY\207\377\206LZ\207\377\2KZ\206\377LZ\207" \ ++ "\377\207MZ\210\377\1LY\207\377\207N[\211\377\5MZ\211\377N[\211\377O\\" \ ++ "\211\377MZ\206\377\4\5\10\377\202\0\0\0\377\3\212\212\212\377\377\377" \ ++ "\377\377\376\376\376\377\254\377\377\377\377\3\376\376\376\377\377\377" \ ++ "\377\377\222\222\222\377\202\0\0\0\377\2\3\3\5\377IV\203\377\207N[\211" \ ++ "\377\210MZ\210\377\210LZ\207\377\210LY\207\377\207KX\206\377\2JW\206" \ ++ "\377IV\206\377\206JW\206\377\5IV\205\377HU\204\377IV\205\377JW\205\377" \ ++ ";I|\377\206\31*e\377\7\30)d\377\26(c\377FS\203\377HU\203\377HU\204\377" \ ++ "GU\204\377FU\204\377\205GU\204\377\2FT\203\377ES\202\377\206FT\203\377" \ ++ "\2ES\203\377DR\203\377\206ES\203\377\2DR\202\377CQ\201\377\205DR\202" \ ++ "\377\2&6n\377\27(d\377\211\31*e\377\2\30)d\377;J|\377\203BP\201\377\2" \ ++ "BP\200\377BP\177\377\206BP\200\377\1@N\200\377\207AO\200\377\1\77M~\377" \ ++ "\206@N\177\377\202\77M~\377\1-\377" \ ++ "\202\31*e\377\1\24#T\377\202\0\0\0\377\1\16\16\16\377\225\377\377\377" \ ++ "\377\10\337\337\337\377'''\377\0\0\0\377\3\4\7\377&0U\377-;r\377\30)" \ ++ "d\377\23\40M\377\202\0\0\0\377\3CCC\377\377\377\377\377\376\376\376\377" \ ++ "\215\377\377\377\377\1\264\264\264\377\202\0\0\0\377\2\17\24$\3770>r" \ ++ "\377\2062Av\377\2101Au\377\3""0@u\377):p\377\27(d\377\227\31*e\377\2" \ ++ "\30)c\377\12\22,\377\202\0\0\0\377\1\225\225\225\377\216\377\377\377" \ ++ "\377\1\367\367\367\377\202\0\0\0\377\2\3\6\17\377\27'_\377\225\31*e\377" \ ++ "\2\30)d\377\36.h\377\203(8o\377\2'7o\377&6o\377\203'7o\377\4'6n\377'" \ ++ "7o\377\36/h\377\30)d\377\233\31*e\377\3\27(c\377.=s\377JW\205\377\202" \ ++ "IV\205\377\1HU\204\377\206JW\206\377\1IV\206\377\202JW\206\377\205KX" \ ++ "\206\377\2JW\205\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377\206" \ ++ "LZ\207\377\2KZ\206\377LZ\207\377\206MZ\210\377\1LY\207\377\202MZ\210" \ ++ "\377\205N[\211\377\2MZ\211\377N[\211\377\202O\\\211\377\1$*\77\377\202" \ ++ "\0\0\0\377\4""222\377\360\360\360\377\377\377\377\377\376\376\376\377" \ ++ "\221\377\377\377\377\1\376\376\376\377\210\377\377\377\377\1\376\376" \ ++ "\376\377\221\377\377\377\377\4\376\376\376\377\377\377\377\377\365\365" \ ++ "\365\377666\377\202\0\0\0\377\1!';\377\207N[\211\377\210MZ\210\377\210" \ ++ "LZ\207\377\210LY\207\377\11KX\206\377>Io\37719W\377(/I\377$+A\377%,C" \ ++ "\377*1L\3774=]\377AMv\377\206JW\206\377\204IV\205\377\1CP\201\377\207" \ ++ "\31*e\377\2\26'c\377\77M}\377\202HU\204\377\2GU\204\377FU\204\377\205" \ ++ "GU\204\377\1FT\203\377\202ES\202\377\204FT\203\377\14=Ir\3771;^\377)" \ ++ "2P\377%,F\377\")A\377!(@\377\")A\377%,F\377)2O\377.8Y\3775@g\377@Mz\377" \ ++ "\204DR\202\377\2,t\377\31*e\377\30" \ ++ ")d\377\31*e\377\26%Y\377\21\35G\377\16\30;\377\14\25""3\377\14\24""1" \ ++ "\377\14\25""4\377\16\31<\377\22\37K\377\27'_\377\31*e\377\30)d\377/>" \ ++ "t\377>L}\377\204=K}\377\205s\377\30)d\377\16\27""8\377\202\0\0\0\377\1\200\200\200\377" \ ++ "\217\377\377\377\377\1ooo\377\202\0\0\0\377\2\32\">\3770\77t\377\206" \ ++ "2Av\377\2101Au\377\3""0@u\377+;q\377\27(d\377\207\31*e\377\7\24\"S\377" \ ++ "\17\31=\377\14\25""3\377\14\24""1\377\16\27""9\377\22\36J\377\27(`\377" \ ++ "\211\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377\1\225\225\225\377\216" \ ++ "\377\377\377\377\1\367\367\367\377\202\0\0\0\377\2\3\6\17\377\27(`\377" \ ++ "\225\31*e\377\2\30)d\377\35.h\377\204(8o\377\1&6o\377\205'7o\377\2\37" \ ++ "/i\377\30)e\377\233\31*e\377\2\26'c\3778Fy\377\202IV\205\377\2HU\204" \ ++ "\377IV\205\377\206JW\206\377\2IV\206\377JW\206\377\206KX\206\377\2JW" \ ++ "\205\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377\205LZ\207\377" \ ++ "\1KZ\206\377\202LZ\207\377\205MZ\210\377\1LY\207\377\202MZ\210\377\206" \ ++ "N[\211\377\5MZ\211\377O\\\211\377N[\211\377IU\177\377\4\5\10\377\202" \ ++ "\0\0\0\377\1\247\247\247\377\223\377\377\377\377\14\370\370\370\377\341" \ ++ "\341\341\377\251\251\251\377ggg\377\77\77\77\377...\377222\377III\377" \ ++ "uuu\377\275\275\275\377\345\345\345\377\374\374\374\377\223\377\377\377" \ ++ "\377\1\260\260\260\377\202\0\0\0\377\2\2\3\4\377HT\177\377\203N[\211" \ ++ "\377\5MY\207\3772:X\377%+A\377$+A\377$*@\377\206$+A\377\2$+@\377#+@\377" \ ++ "\206$+@\377\3$*@\377#)\77\377/7S\377\202JW\204\377\3BMv\377/7T\377\24" \ ++ "\27$\377\211\0\0\0\377\4\3\4\6\377\32\36/\3775>`\377CNy\377\202IV\205" \ ++ "\377\1JW\206\377\203IV\205\377\3JW\206\377\32+f\377\30)d\377\205\31*" \ ++ "e\377\6\26'c\3776Ex\377IU\204\377HU\204\377GU\204\377FU\204\377\204G" \ ++ "U\204\377\7FT\203\377GU\204\377BP}\377L|\377,8h\377\20\33A\377\7\14" \ ++ "\36\377\0\1\3\377\211\0\0\0\377\4\3\5\15\377\13\22.\377#0\\\377:Hv\377" \ ++ "\204=K}\377\205s\377IV\205\377HU\204\377GU\204\377F" \ ++ "U\204\377\204GU\204\377\4@Mw\377,5R\377\27\34,\377\4\5\11\377\224\0\0" \ ++ "\0\377\4\4\5\10\377\7\15!\377\17\31>\377\26%Y\377\207\31*e\377\3\30)" \ ++ "d\377-=s\377CQ\202\377\202BP\201\377\2BP\200\377\37%;\377\223\0\0\0\377" \ ++ "\5\13\15\26\377\377\223\0\0\0\377\3\15\20\33\377" \ ++ "\37%=\377\10\11\17\377\205\0\0\0\377\11...\377YYY\377vvv\377\207\207" \ ++ "\207\377\214\214\214\377\207\207\207\377uuu\377SSS\377\37\37\37\377\204" \ ++ "\0\0\0\377\4\2\3\5\377\23\30(\3779Fu\377=K}\377\206Hk\377\7\10\14\377\0\0\0\377\15\15\15" \ ++ "\377\335\335\335\377\377\377\377\377\376\376\376\377\215\377\377\377" \ ++ "\377\3\376\376\376\377\377\377\377\377\264\264\264\377\204\0\0\0\377" \ ++ "\10\24\27#\3775=Z\377GRy\377MY\203\377KX\201\377BMq\377.5N\377\13\15" \ ++ "\24\377\203\0\0\0\377\4\6\6\6\377\330\330\330\377\377\377\377\377\376" \ ++ "\376\376\377\215\377\377\377\377\7\376\376\376\377\377\377\377\377\327" \ ++ "\327\327\377\22\22\22\377\0\0\0\377\7\10\14\377\377\202\0\0\0\377\2DDD\377\241\241\241\377\213\232\232" \ ++ "\232\377\2\234\234\234\377\207\207\207\377\202\0\0\0\377\202\0\0\1\377" \ ++ "\203\0\0\0\377\12...\377\240\240\240\377\360\360\360\377\370\370\370" \ ++ "\377\372\372\372\377\373\373\373\377\374\374\374\377\375\375\375\377" \ ++ "\374\374\374\377\373\373\373\377\202\371\371\371\377\3\332\332\332\377" \ ++ "ppp\377\1\1\1\377\203\0\0\0\377\3\11\14\24\3775Am\377=K}\377\205>>\377\204\0\0\0\377\7aaa\377\346\346\346\377\371\371\371\377" \ ++ "\373\373\373\377\374\374\374\377\375\375\375\377\373\373\373\377\202" \ ++ "\371\371\371\377\2\306\306\306\377SSS\377\205\0\0\0\377\2\77\77\77\377" \ ++ "\227\227\227\377\203\232\232\232\377\2\230\230\230\377\324\324\324\377" \ ++ "\216\377\377\377\377\2\374\374\374\377\225\225\225\377\206\232\232\232" \ ++ "\377\2\235\235\235\377OOO\377\202\0\0\0\377\1\16\31<\377\215\31*e\377" \ ++ "\2\30)d\377\33+g\377\204(8o\377\1&6o\377\205'7o\377\1\40""1j\377\233" \ ++ "\31*e\377\3\30)d\377\"3k\377FS\203\377\202IV\205\377\2HU\204\377IV\205" \ ++ "\377\205JW\206\377\2IV\206\377JW\206\377\206KX\206\377\2JW\205\377KX" \ ++ "\206\377\206LY\207\377\2LX\207\377LY\207\377\205LZ\207\377\1KZ\206\377" \ ++ "\202LZ\207\377\205MZ\210\377\4LY\207\377MZ\210\377N[\211\377MZ\210\377" \ ++ "\204N[\211\377\5MZ\211\377N[\211\377O\\\211\377N[\211\37708S\377\202" \ ++ "\0\0\0\377\3""888\377\377\377\377\377\376\376\376\377\215\377\377\377" \ ++ "\377\4\376\376\376\377\377\377\377\377\327\327\327\377\13\13\13\377\202" \ ++ "\0\0\0\377\2\10\12\17\377=Gh\377\202R_\213\377\1Q^\212\377\202R_\213" \ ++ "\377\203Q^\212\377\2""2:V\377\4\5\10\377\202\0\0\0\377\4\24\24\24\377" \ ++ "\355\355\355\377\377\377\377\377\376\376\376\377\217\377\377\377\377" \ ++ "\1""444\377\202\0\0\0\377\1.6R\377\202N[\211\377\5LX\205\377\30\34+\377" \ ++ "\0\0\0\377\4\4\4\377\241\241\241\377\215\377\377\377\377\1\320\320\320" \ ++ "\377\204\0\0\0\377\2%%%\377\265\265\265\377\203\377\377\377\377\1\376" \ ++ "\376\376\377\206\377\377\377\377\1\376\376\376\377\203\377\377\377\377" \ ++ "\2\241\241\241\377\32\32\32\377\203\0\0\0\377\5\30\35,\377FS\201\377" \ ++ "JW\205\3778Fy\377\27(c\377\205\31*e\377\7\30)d\377\33+f\377JW\205\377" \ ++ "GT\203\377HU\204\377DQ~\377&-F\377\203\0\0\0\377\4\2\2\2\377\32\32\32" \ ++ "\377vvv\377\351\351\351\377\203\377\377\377\377\1\376\376\376\377\213" \ ++ "\377\377\377\377\1\376\376\376\377\204\377\377\377\377\4\346\346\346" \ ++ "\377qqq\377\35\35\35\377\2\2\2\377\203\0\0\0\377\2\16\27""9\377\30)c" \ ++ "\377\202\31*e\377\3\30)d\377#3k\377DR\202\377\202BP\201\377\2BP\200\377" \ ++ "\40'>\377\202\0\0\0\377\1rrr\377\215\377\377\377\377\1\345\345\345\377" \ ++ "\204\0\0\0\377\3\1\1\1\377'''\377\257\257\257\377\203\377\377\377\377" \ ++ "\1\376\376\376\377\207\377\377\377\377\1\376\376\376\377\202\377\377" \ ++ "\377\377\3\355\355\355\377UUU\377\5\5\5\377\202\0\0\0\377\2\14\17\32" \ ++ "\3776Bo\377\205>>\377\203\0\0\0\377\1kkk\377\206\377\377\377\377\1\376\376\376" \ ++ "\377\214\377\377\377\377\1\376\376\376\377\211\377\377\377\377\1\205" \ ++ "\205\205\377\202\0\0\0\377\1\16\31<\377\215\31*e\377\2\30)d\377\32+f" \ ++ "\377\204(8o\377\1&6o\377\205'7o\377\1\40""1j\377\233\31*e\377\3\27)d" \ ++ "\377'7n\377GT\203\377\202IV\205\377\2HU\204\377IV\205\377\205JW\206\377" \ ++ "\2IV\206\377JW\206\377\206KX\206\377\2JW\205\377KX\206\377\205LY\207" \ ++ "\377\1LX\207\377\202LY\207\377\205LZ\207\377\4KZ\206\377LZ\207\377MZ" \ ++ "\210\377LZ\207\377\204MZ\210\377\2LY\207\377MZ\210\377\206N[\211\377" \ ++ "\5MZ\211\377N[\211\377O\\\211\377LY\205\377\34!1\377\202\0\0\0\377\3" \ ++ "\231\231\231\377\377\377\377\377\376\376\376\377\216\377\377\377\377" \ ++ "\2\371\371\371\377SSS\377\202\0\0\0\377\3\13\15\24\377DOt\377Q^\212\377" \ ++ "\207R_\213\377\4Q^\212\377P]\211\377=Gi\377\10\11\16\377\202\0\0\0\377" \ ++ "\1aaa\377\217\377\377\377\377\3\376\376\376\377\377\377\377\377\214\214" \ ++ "\214\377\202\0\0\0\377\10\35\"4\377KX\204\377N[\211\377LX\205\377\30" \ ++ "\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\215\377\377\377\377\1\314" \ ++ "\314\314\377\202\0\0\0\377\3\2\2\2\377fff\377\367\367\367\377\202\377" \ ++ "\377\377\377\1\376\376\376\377\212\377\377\377\377\202\376\376\376\377" \ ++ "\3\377\377\377\377\350\350\350\377XXX\377\203\0\0\0\377\4\36#6\377GT" \ ++ "\202\377=L}\377\26'c\377\205\31*e\377\202\30)d\377\4HV\204\377HU\204" \ ++ "\377AMw\377\31\36.\377\203\0\0\0\377\3!!!\377\177\177\177\377\354\354" \ ++ "\354\377\202\377\377\377\377\1\376\376\376\377\225\377\377\377\377\3" \ ++ "\353\353\353\377\177\177\177\377!!!\377\203\0\0\0\377\12\11\17&\377\27" \ ++ "'^\377\31*e\377\30)d\377\40""1j\377DR\202\377AO\200\377BP\201\377BP\200" \ ++ "\377\40'>\377\202\0\0\0\377\1ppp\377\215\377\377\377\377\1\340\340\340" \ ++ "\377\203\0\0\0\377\3\7\7\7\377nnn\377\363\363\363\377\202\377\377\377" \ ++ "\377\1\376\376\376\377\213\377\377\377\377\1\376\376\376\377\202\377" \ ++ "\377\377\377\2\223\223\223\377\12\12\12\377\202\0\0\0\377\2\23\30(\377" \ ++ ";J|\377\204\377\202\0\0\0\377\1ppp\377\215\377\377\377\377\1\340" \ ++ "\340\340\377\202\0\0\0\377\2\20\20\20\377\246\246\246\377\202\377\377" \ ++ "\377\377\1\376\376\376\377\216\377\377\377\377\1\376\376\376\377\202" \ ++ "\377\377\377\377\1\261\261\261\377\203\0\0\0\377\1\40)D\377\204\377\202\0\0\0\377" \ ++ "\1ppp\377\215\377\377\377\377\4\340\340\340\377\0\0\0\377\15\15\15\377" \ ++ "\262\262\262\377\202\377\377\377\377\1\376\376\376\377\220\377\377\377" \ ++ "\377\1\376\376\376\377\202\377\377\377\377\1\232\232\232\377\202\0\0" \ ++ "\0\377\2\1\1\2\3777Dr\377\203\377\202\0\0\0\377" \ ++ "\1ppp\377\215\377\377\377\377\5\337\337\337\377\6\6\6\377\237\237\237" \ ++ "\377\377\377\377\377\376\376\376\377\224\377\377\377\377\3\376\376\376" \ ++ "\377\357\357\357\377CCC\377\202\0\0\0\377\1\31\37""4\377\203\377\202\0\0\0\377\1ppp\377\215\377\377" \ ++ "\377\377\4\336\336\336\377\215\215\215\377\377\377\377\377\376\376\376" \ ++ "\377\227\377\377\377\377\5\242\242\242\377\6\6\6\377\0\0\0\377\7\11\17" \ ++ "\3778Ft\377\203\377N[\211\377LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235\235" \ ++ "\235\377\214\377\377\377\377\1\376\376\376\377\202\377\377\377\377\1" \ ++ "\376\376\376\377\230\377\377\377\377\5yyy\377\1\1\1\377\0\0\0\377\4\7" \ ++ "\22\377\25%[\377\204\31*e\377\2\27'^\377\1\3\7\377\202\0\0\0\377\1oo" \ ++ "o\377\202\377\377\377\377\1\376\376\376\377\222\377\377\377\377\202\376" \ ++ "\376\376\377\214\377\377\377\377\4\376\376\376\377\377\377\377\377\361" \ ++ "\361\361\377FFF\377\202\0\0\0\377\2\6\12\30\377\377\202\0\0\0\377\1ppp\377\215\377\377\377\377\2\367\367\367" \ ++ "\377\377\377\377\377\202\376\376\376\377\227\377\377\377\377\5\352\352" \ ++ "\352\377%%%\377\0\0\0\377\3\3\6\377(2T\377\203\377\204R_\213\377\3Q_\212\377R_\213\377" \ ++ "S_\214\377\207R_\213\377\3Q^\212\377R_\213\377\35\"2\377\202\0\0\0\377" \ ++ "\1\261\261\261\377\220\377\377\377\377\1\304\304\304\377\202\0\0\0\377" \ ++ "\7\32\36.\377MZ\211\377LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235" \ ++ "\235\235\377\246\377\377\377\377\7\376\376\376\377\377\377\377\377\346" \ ++ "\346\346\377\30\30\30\377\0\0\0\377\0\0\1\377\17\31\77\377\204\31*e\377" \ ++ "\1\11\17%\377\202\0\0\0\377\4""999\377\350\350\350\377\377\377\377\377" \ ++ "\376\376\376\377\213\377\377\377\377\202\376\376\376\377\202\377\377" \ ++ "\377\377\4\351\351\351\377\305\305\305\377\307\307\307\377\352\352\352" \ ++ "\377\221\377\377\377\377\5\304\304\304\377\23\23\23\377\0\0\0\377\0\0" \ ++ "\2\377&0N\377\203BP\201\377\1\40'>\377\202\0\0\0\377\1ppp\377\214\377" \ ++ "\377\377\377\1\376\376\376\377\202\377\377\377\377\1\376\376\376\377" \ ++ "\231\377\377\377\377\1WWW\377\202\0\0\0\377\1\34#;\377\203\377\202\0\0\0\377\1p" \ ++ "pp\377\251\377\377\377\377\5\234\234\234\377\1\1\1\377\0\0\0\377\23\30" \ ++ "(\3779Gw\377\203\377\202\0\0\0\377\1ppp\377\222\377\377\377\377\1\376\376\376\377" \ ++ "\205\377\377\377\377\1\376\376\376\377\220\377\377\377\377\5\323\323" \ ++ "\323\377\1\1\1\377\0\0\0\377\14\17\31\3776Cp\377\203\377\202\0\0\0\377\1ppp\377\220\377\377\377\377\1\376\376\376\377" \ ++ "\202\377\377\377\377\5\346\346\346\377\266\266\266\377\255\255\255\377" \ ++ "\302\302\302\377\366\366\366\377\202\377\377\377\377\1\376\376\376\377" \ ++ "\216\377\377\377\377\5\376\376\376\377\1\1\1\377\0\0\0\377\6\10\16\377" \ ++ "3@j\377\203Kw\377'/J\377\202\0\0\0\377\4\1\1\1\377\237\237\237\377\377\377" \ ++ "\377\377\376\376\376\377\212\377\377\377\377\3\376\376\376\377\377\377" \ ++ "\377\377\334\334\334\377\202\0\0\0\377\1\5\7\13\377\202BP\201\377\1\40" \ ++ "'>\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\12\376\376\376\377" \ ++ "\377\377\377\377\370\370\370\377]]]\377\24\24\24\377\16\16\16\377\14" \ ++ "\14\14\377\20\20\20\377$$$\377\243\243\243\377\221\377\377\377\377\4" \ ++ "\17\17\17\377\0\0\0\377\2\3\5\3771>g\377\203h\377\0\0\1" \ ++ "\377\0\0\0\377+++\377\340\340\340\377\216\377\377\377\377\3}}}\377\0" \ ++ "\0\0\377\330\330\330\377\214\377\377\377\377\2\355\355\355\377===\377" \ ++ "\202\0\0\0\377\2###\377\371\371\371\377\212\377\377\377\377\7\376\376" \ ++ "\376\377\377\377\377\377\245\245\245\377\2\2\2\377hhh\377\377\377\377" \ ++ "\377\376\376\376\377\215\377\377\377\377\202\0\0\0\377\6\0\1\3\377\27" \ ++ "'`\377\31*e\377)9p\3773Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370" \ ++ "\377\221\377\377\377\377\17\367\367\367\377kkk\377\27\27\27\377\12\12" \ ++ "\12\377\6\6\6\377\12\12\12\377\25\25\25\377222\377{{{\377\40\40\40\377" \ ++ "\0\0\0\377\0\1\3\377\20\33A\377\31*e\377\17\32@\377\202\0\0\0\377\1\6" \ ++ "\6\6\377\204\17\17\17\377\2\12\12\12\377\233\233\233\377\216\377\377" \ ++ "\377\377\2\367\367\367\377\4\4\4\377\207\17\17\17\377\1\7\7\7\377\202" \ ++ "\0\0\0\377\1\16\31<\377\215\31*e\377\2\30)d\377\31*e\377\204(8o\377\1" \ ++ "&6o\377\205'7o\377\1!2k\377\233\31*e\377\6\27(c\3773Bv\377HU\204\377" \ ++ "IV\205\377HU\204\377IV\205\377\206JW\206\377\2IV\206\377JW\206\377\205" \ ++ "KX\206\377\2JW\205\377KX\206\377\206LY\207\377\2LX\207\377LY\207\377" \ ++ "\206LZ\207\377\2KZ\206\377LZ\207\377\207MZ\210\377\210N[\211\377\202" \ ++ "O\\\211\377\202\0\0\0\377\2\33\33\33\377\357\357\357\377\220\377\377" \ ++ "\377\377\1BBB\377\202\0\0\0\377\1DOt\377\205R_\213\377\202Q_\212\377" \ ++ "\206R_\213\377\4Q^\212\377R_\213\377Q^\212\3775>[\377\202\0\0\0\377\1" \ ++ "qqq\377\217\377\377\377\377\2\376\376\376\377\362\362\362\377\202\0\0" \ ++ "\0\377\7\12\14\22\377N[\211\377LX\205\377\30\34+\377\0\0\0\377\4\4\4" \ ++ "\377\235\235\235\377\220\377\377\377\377\2\242\242\242\377\7\7\7\377" \ ++ "\202\0\0\0\377\4\1\1\2\377\2\2\3\377\1\2\3\377\0\0\1\377\202\0\0\0\377" \ ++ "\1kkk\377\217\377\377\377\377\1\367\367\367\377\202\0\0\0\377\3\1\2\5" \ ++ "\377\31*e\377\16\30""9\377\202\0\0\0\377\3}}}\377\377\377\377\377\376" \ ++ "\376\376\377\215\377\377\377\377\1\6\6\6\377\202\0\0\0\377\2(1M\377C" \ ++ "Q\201\377\204CQ\200\377\2CP\177\377\32\37""2\377\202\0\0\0\377\1:::\377" \ ++ "\215\377\377\377\377\202\376\376\376\377\1&&&\377\202\0\0\0\377\3""8" \ ++ "Dn\377BP\200\377\40'>\377\202\0\0\0\377\1ppp\377\220\377\377\377\377" \ ++ "\2\352\352\352\377...\377\207\0\0\0\377\1\254\254\254\377\202\376\376" \ ++ "\376\377\216\377\377\377\377\1%%%\377\202\0\0\0\377\1""0\377\202\0\0\0\377\1ppp\377\216\377\377\377\377\3" \ ++ "\376\376\376\377\371\371\371\377ddd\377\202\0\0\0\377\4\1\1\2\377\13" \ ++ "\15\26\377\6\11\25\377\3\5\16\377\202\0\0\0\377\2\26\26\26\377\370\370" \ ++ "\370\377\217\377\377\377\377\1""222\377\202\0\0\0\377\1/;c\377\203t\377HU\204\377IV\205\377HU\204\377" \ ++ "IV\205\377\206JW\206\377\2IV\206\377JW\206\377\205KX\206\377\202JW\205" \ ++ "\377\1KX\206\377\205LY\207\377\2LX\207\377LY\207\377\206LZ\207\377\2" \ ++ "KZ\206\377LZ\207\377\207MZ\210\377\2N[\211\377MZ\210\377\206N[\211\377" \ ++ "\202O\\\211\377\4\5\6\11\377\0\0\0\377\16\16\16\377\355\355\355\377\220" \ ++ "\377\377\377\377\1UUU\377\202\0\0\0\377\1>Gi\377\216R_\213\377\3Q^\212" \ ++ "\377P]\211\377,3K\377\202\0\0\0\377\1\210\210\210\377\220\377\377\377" \ ++ "\377\1\350\350\350\377\202\0\0\0\377\7\20\23\35\377N[\211\377LX\205\377" \ ++ "\30\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2" \ ++ "\376\376\376\377\254\254\254\377\202\0\0\0\377\2\5\6\12\377BMu\377\202" \ ++ "LY\207\377\3KX\206\377HU\202\377\25\31'\377\202\0\0\0\377\1TTT\377\216" \ ++ "\377\377\377\377\2\374\374\374\377ooo\377\202\0\0\0\377\6\20\34C\377" \ ++ "\3\5\14\377\0\0\0\377\15\15\15\377\377\377\377\377\376\376\376\377\213" \ ++ "\377\377\377\377\3\376\376\376\377\377\377\377\377hhh\377\215\0\0\0\377" \ ++ "\2\13\13\13\377\254\254\254\377\215\377\377\377\377\2\376\376\376\377" \ ++ "\256\256\256\377\202\0\0\0\377\3\23\30&\377BP\200\377\40'>\377\202\0" \ ++ "\0\0\377\1ppp\377\216\377\377\377\377\3\376\376\376\377\327\327\327\377" \ ++ "\14\14\14\377\202\0\0\0\377\5#*F\3777Ds\377\35-e\377\24#V\377\4\7\21" \ ++ "\377\202\0\0\0\377\1\273\273\273\377\217\377\377\377\377\1""555\377\202" \ ++ "\0\0\0\377\1/;b\377\203[\377\213R_\213\377\6Q^\212\377R_\213\377" \ ++ "Q^\212\377P]\211\377Q^\212\377#)=\377\202\0\0\0\377\1\236\236\236\377" \ ++ "\220\377\377\377\377\1\324\324\324\377\202\0\0\0\377\7\25\31&\377N[\211" \ ++ "\377LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377" \ ++ "\377\377\377\2\373\373\373\377ggg\377\202\0\0\0\377\1$*A\377\204LY\207" \ ++ "\377\6JW\205\3772:Y\377\3\4\6\377\0\0\0\377+++\377\346\346\346\377\215" \ ++ "\377\377\377\377\2\376\376\376\377\231\231\231\377\202\0\0\0\377\1\13" \ ++ "\23.\377\202\0\0\0\377\3EEE\377\377\377\377\377\376\376\376\377\215\377" \ ++ "\377\377\377\1+++\377\216\0\0\0\377\1\213\213\213\377\216\377\377\377" \ ++ "\377\1\316\316\316\377\202\0\0\0\377\3\5\6\13\377BP\200\377\40'>\377" \ ++ "\202\0\0\0\377\1ppp\377\217\377\377\377\377\1\235\235\235\377\202\0\0" \ ++ "\0\377\6\15\20\33\377\77M~\377;J{\377\36/h\377\30)d\377\15\26""7\377" \ ++ "\202\0\0\0\377\1www\377\217\377\377\377\377\1""555\377\202\0\0\0\377" \ ++ "\1/;b\377\203h\377\202\0\0\0\377\3""444\377\374\374" \ ++ "\374\377\376\376\376\377\214\377\377\377\377\2\371\371\371\377\373\373" \ ++ "\373\377\213\377\377\377\377\3\376\376\376\377\377\377\377\377\12\12" \ ++ "\12\377\204\0\0\0\377\2///\377\341\341\341\377\214\377\377\377\377\3" \ ++ "\363\363\363\377\377\377\377\377\376\376\376\377\215\377\377\377\377" \ ++ "\11\15\15\15\377\0\0\0\377\1\2\5\377\23!P\377\30)d\377\31*e\377*9p\377" \ ++ "3Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370\377\217\377\377\377" \ ++ "\377\1\263\263\263\377\202\0\0\0\377\2\4\6\20\377\27'_\377\205\31*e\377" \ ++ "\3\26&\\\377\20\34D\377\17\32@\377\210\31*e\377\2\30)c\377\12\22,\377" \ ++ "\202\0\0\0\377\1\225\225\225\377\216\377\377\377\377\1\367\367\367\377" \ ++ "\202\0\0\0\377\2\3\6\17\377\27(`\377\225\31*e\377\2\30)d\377\31+f\377" \ ++ "\204(8o\377\1&6o\377\205'7o\377\1!1j\377\233\31*e\377\3\27(d\377(8o\377" \ ++ "GT\203\377\202IV\205\377\2HU\204\377IV\205\377\205JW\206\377\2IV\206" \ ++ "\377JW\206\377\206KX\206\377\2JW\205\377KX\206\377\205LY\207\377\1LX" \ ++ "\207\377\202LY\207\377\205LZ\207\377\2KZ\206\377LZ\207\377\206MZ\210" \ ++ "\377\2LY\207\377MZ\210\377\206N[\211\377\4MZ\211\377N[\211\377O\\\211" \ ++ "\377\21\24\37\377\202\0\0\0\377\1\346\346\346\377\220\377\377\377\377" \ ++ "\1\213\213\213\377\202\0\0\0\377\1)0G\377\202R_\213\377\1Q^\212\377\206" \ ++ "R_\213\377\1Q^\212\377\202R_\213\377\2Q^\212\377P]\211\377\202Q^\212" \ ++ "\377\1\30\34)\377\202\0\0\0\377\1\275\275\275\377\220\377\377\377\377" \ ++ "\1\272\272\272\377\202\0\0\0\377\7\34!2\377N[\211\377LX\205\377\30\34" \ ++ "+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2\370\370" \ ++ "\370\377000\377\202\0\0\0\377\1@Kq\377\204LY\207\377\6JW\205\377CNw\377" \ ++ "\7\10\15\377\0\0\0\377\30\30\30\377\307\307\307\377\216\377\377\377\377" \ ++ "\1\270\270\270\377\202\0\0\0\377\1\4\7\21\377\202\0\0\0\377\1ppp\377" \ ++ "\217\377\377\377\377\1\335\335\335\377\215\327\327\327\377\2\326\326" \ ++ "\326\377\353\353\353\377\216\377\377\377\377\6\332\332\332\377\33\33" \ ++ "\33\377\0\0\0\377\0\0\1\377BP\200\377\40'\77\377\202\0\0\0\377\1ppp\377" \ ++ "\217\377\377\377\377\1```\377\202\0\0\0\377\6$,I\377\77M~\377:Hz\377" \ ++ "\36.h\377\30)d\377\22\36H\377\202\0\0\0\377\1TTT\377\217\377\377\377" \ ++ "\377\1""555\377\202\0\0\0\377\1/;b\377\203K{\377\77M~\3778Fy\377\35-g\377\30)d\377\24" \ ++ "!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0" \ ++ "\0\377\1/;b\377\203>>\377\202\0\0\0\377\7>In\377N[\211\377LX\205\377\30" \ ++ "\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\1\364" \ ++ "\364\364\377\202\0\0\0\377\1\13\15\24\377\203LY\207\377\10KX\206\377" \ ++ "LY\207\377JW\205\377KX\206\377\21\24\37\377\0\0\0\377\3\3\3\377\244\244" \ ++ "\244\377\216\377\377\377\377\2\315\315\315\377\15\15\15\377\204\0\0\0" \ ++ "\377\1\252\252\252\377\255\377\377\377\377\2\360\360\360\377KKK\377\202" \ ++ "\0\0\0\377\2""1;_\377\")A\377\202\0\0\0\377\1ppp\377\217\377\377\377" \ ++ "\377\1\16\16\16\377\202\0\0\0\377\6@N\177\377\77M~\3776Ex\377\34-g\377" \ ++ "\30)d\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555" \ ++ "\377\202\0\0\0\377\1/;b\377\203\377\31*e\377\30" \ ++ ")d\377\33+f\377,;r\3773Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370" \ ++ "\377\216\377\377\377\377\5\270\270\270\377\7\7\7\377\0\0\0\377\5\11\25" \ ++ "\377\26%[\377\221\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377\1\225" \ ++ "\225\225\377\216\377\377\377\377\1\367\367\367\377\202\0\0\0\377\2\3" \ ++ "\6\17\377\27'_\377\225\31*e\377\2\30)d\377\33,g\377\204(8o\377\1&6o\377" \ ++ "\205'7o\377\1\40""1j\377\233\31*e\377\3\30)d\377\26(c\377DQ\201\377\202" \ ++ "IV\205\377\2HU\204\377IV\205\377\206JW\206\377\2IV\206\377JW\206\377" \ ++ "\206KX\206\377\2JW\205\377KX\206\377\205LY\207\377\2LX\207\377LY\207" \ ++ "\377\206LZ\207\377\2KZ\206\377LZ\207\377\206MZ\210\377\2LY\207\377MZ" \ ++ "\210\377\206N[\211\377\3MZ\211\377N[\211\377DOv\377\202\0\0\0\377\3," \ ++ ",,\377\377\377\377\377\376\376\376\377\216\377\377\377\377\2\371\371" \ ++ "\371\377hhh\377\202\0\0\0\377\1!&8\377\216Q^\212\377\1\27\33(\377\202" \ ++ "\0\0\0\377\2\177\177\177\377\374\374\374\377\220\377\377\377\377\12\5" \ ++ "\5\5\377\0\0\0\377\1\1\2\377FQ{\377N[\211\377LX\205\377\30\34+\377\0" \ ++ "\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\1\364\364\364" \ ++ "\377\202\0\0\0\377\1\12\14\23\377\204LY\207\377\7KX\206\377JW\205\377" \ ++ "KX\206\377\17\22\34\377\0\0\0\377\4\4\4\377\246\246\246\377\216\377\377" \ ++ "\377\377\2\316\316\316\377\16\16\16\377\204\0\0\0\377\1\251\251\251\377" \ ++ "\255\377\377\377\377\2\363\363\363\377SSS\377\202\0\0\0\377\2.8Z\377" \ ++ "\")A\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\11\11\11\11\377\0" \ ++ "\0\0\377\1\2\3\377@N\177\377\77M~\3774Cw\377\33,f\377\30)d\377\24!P\377" \ ++ "\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377" \ ++ "\1/;b\377\203L}\377\77M~\377/=s\377\31)e\377\30)d\377\24!P\377\202\0\0" \ ++ "\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377\1/;b\377" \ ++ "\203l\377\2028Fz\377\2""2@o\377\11\14\26\377\202\0" \ ++ "\0\0\377\1\320\320\320\377\227\377\377\377\377\2\371\371\371\377kkk\377" \ ++ "\202\0\0\0\377\1\15\25""4\377\202\31*e\377\5\30)d\377\34-g\377.>t\377" \ ++ "3Bw\377*6d\377\202\0\0\0\377\2EEE\377\370\370\370\377\216\377\377\377" \ ++ "\377\1ccc\377\202\0\0\0\377\1\13\23/\377\222\31*e\377\2\30)c\377\12\22" \ ++ ",\377\202\0\0\0\377\1\225\225\225\377\216\377\377\377\377\1\367\367\367" \ ++ "\377\202\0\0\0\377\2\3\6\17\377\27'_\377\225\31*e\377\2\30)d\377\35." \ ++ "h\377\202(8o\377\3'7o\377(8o\377&6o\377\203'7o\377\4&6o\377'7o\377\36" \ ++ "/h\377\30)d\377\233\31*e\377\6\30)d\377\37""0i\377KW\206\377HU\204\377" \ ++ "IV\205\377HU\204\377\207JW\206\377\1IV\206\377\207KX\206\377\1JW\205" \ ++ "\377\206LY\207\377\2LX\207\377LY\207\377\207LZ\207\377\1KZ\206\377\207" \ ++ "MZ\210\377\3LY\207\377N[\211\377MZ\210\377\205N[\211\377\6MZ\211\377" \ ++ "9Ce\377\3\4\6\377\0\0\0\377\21\21\21\377\354\354\354\377\216\377\377" \ ++ "\377\377\1\376\376\376\377\202\377\377\377\377\1hhh\377\203\0\0\0\377" \ ++ "\3\6\7\12\377-4M\377KW\200\377\204Q^\212\377\3JV\177\377-4M\377\6\7\13" \ ++ "\377\203\0\0\0\377\1fff\377\202\377\377\377\377\1\376\376\376\377\216" \ ++ "\377\377\377\377\5\336\336\336\377\24\24\24\377\0\0\0\377\6\7\12\377" \ ++ ";Dg\377\202N[\211\377\5LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235" \ ++ "\235\235\377\216\377\377\377\377\2\375\375\375\377\212\212\212\377\202" \ ++ "\0\0\0\377\1\20\23\35\377\202LY\207\377\203KX\206\377\5*1K\377\1\1\2" \ ++ "\377\0\0\0\377666\377\367\367\367\377\215\377\377\377\377\2\376\376\376" \ ++ "\377\257\257\257\377\202\0\0\0\377\4\11\20(\377\1\3\7\377\0\0\0\377;" \ ++ ";;\377\217\377\377\377\377\1""666\377\236\3\3\3\377\1\1\1\1\377\202\0" \ ++ "\0\0\377\2-6W\377\")B\377\202\0\0\0\377\1ppp\377\217\377\377\377\377" \ ++ "\3\10\10\10\377\0\0\0\377\2\2\3\377\202\77M~\377\1,;q\377\202\30)d\377" \ ++ "\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202" \ ++ "\0\0\0\377\1/;b\377\203h\377\7\11\17\377\0\0\0\377\27\27\27\377" \ ++ "\316\316\316\377\226\377\377\377\377\2\365\365\365\377ZZZ\377\202\0\0" \ ++ "\0\377\1\35$\77\377\2038Fz\377\2""7Fy\377\40*H\377\202\0\0\0\377\1""3" \ ++ "33\377\227\377\377\377\377\2\344\344\344\377\17\17\17\377\202\0\0\0\377" \ ++ "\203\31*e\377\5\30)d\377\35.h\3771@u\3772Av\377*6d\377\202\0\0\0\377" \ ++ "\2EEE\377\370\370\370\377\216\377\377\377\377\4UUU\377\0\0\0\377\0\0" \ ++ "\1\377\15\26""5\377\222\31*e\377\2\30)c\377\12\22,\377\202\0\0\0\377" \ ++ "\1\222\222\222\377\216\377\377\377\377\1\367\367\367\377\202\0\0\0\377" \ ++ "\2\3\6\17\377\27(`\377\202\31*e\377\6\30)b\377\26&\\\377\24!P\377\12" \ ++ "\20(\377\17\32\77\377\30)d\377\215\31*e\377\2\30)d\377\37""0i\377\203" \ ++ "(8o\377\207'7o\377\2\36.h\377\30)d\377\234\31*e\377\6\27(c\377=K|\377" \ ++ "JV\205\377IV\205\377HU\204\377IV\205\377\206JW\206\377\3IV\206\377KX" \ ++ "\206\377JW\206\377\205KX\206\377\3JW\205\377LY\207\377KX\206\377\205" \ ++ "LY\207\377\3LX\207\377LZ\207\377LY\207\377\205LZ\207\377\2KZ\206\377" \ ++ "LZ\207\377\210MZ\210\377\2N[\211\377MZ\210\377\205N[\211\377\6MZ\211" \ ++ "\377\"(=\377\0\0\1\377\0\0\0\377@@@\377\363\363\363\377\217\377\377\377" \ ++ "\377\202\376\376\376\377\3\377\377\377\377\236\236\236\377111\377\212" \ ++ "\0\0\0\377\3...\377\227\227\227\377\377\377\377\377\202\376\376\376\377" \ ++ "\217\377\377\377\377\5\362\362\362\377CCC\377\0\0\0\377\0\0\1\377$*\77" \ ++ "\377\203N[\211\377\5LX\205\377\30\34+\377\0\0\0\377\4\4\4\377\235\235" \ ++ "\235\377\217\377\377\377\377\2\372\372\372\377mmm\377\203\0\0\0\377\4" \ ++ "\23\26\"\377\"(=\377!';\377\14\16\26\377\202\0\0\0\377\2\23\23\23\377" \ ++ "\343\343\343\377\216\377\377\377\377\2\373\373\373\377```\377\202\0\0" \ ++ "\0\377\2\22\37L\377\12\21)\377\202\0\0\0\377\1\313\313\313\377\216\377" \ ++ "\377\377\377\1\266\266\266\377\203\0\0\0\377\2\22\26$\377\26\33*\377" \ ++ "\205\26\32*\377\2\25\32)\377\3\4\7\377\223\0\0\0\377\4\2\3\5\377\6\7" \ ++ "\14\377)1O\377\36$:\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\11" \ ++ "\10\10\10\377\0\0\0\377\2\2\3\377\77M~\377>K}\377'7n\377\30)d\377\31" \ ++ "*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377" \ ++ "\202\0\0\0\377\1/;b\377\202c\377" \ ++ "\27\33,\377\1\1\2\377\202\0\0\0\377\11(((\377\311\311\311\377\271\271" \ ++ "\271\377\233\233\233\377~~~\377bbb\377EEE\377(((\377\13\13\13\377\213" \ ++ "\0\0\0\377\2\35#8\377\"*C\377\202\0\0\0\377\1ppp\377\217\377\377\377" \ ++ "\377\11\10\10\10\377\0\0\0\377\2\2\3\377\77M~\377;J{\377!1j\377\30)d" \ ++ "\377\31*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""5" \ ++ "55\377\202\0\0\0\377\1/;b\377\202\377\202\0\0\0\377\1ppp\377\217\377\377" \ ++ "\377\377\11\10\10\10\377\0\0\0\377\1\2\3\377\77M~\3779Gz\377\32+e\377" \ ++ "\30)d\377\31*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377" \ ++ "\1""555\377\202\0\0\0\377\1/;b\377\202s\377JW\206\377IV\205\377HU\204\377IV\205\377" \ ++ "\206JW\206\377\2IV\206\377JW\206\377\206KX\206\377\2JW\205\377KX\206" \ ++ "\377\207LY\207\377\2LX\207\377LY\207\377\206LZ\207\377\4KZ\206\377LZ" \ ++ "\207\377MZ\210\377LZ\207\377\206MZ\210\377\3LY\207\377N[\211\377MZ\210" \ ++ "\377\205N[\211\377\2JW\203\377\23\26!\377\202\0\0\0\377\4///\377\356" \ ++ "\356\356\377\377\377\377\377\376\376\376\377\250\377\377\377\377\4\376" \ ++ "\376\376\377\377\377\377\377\365\365\365\377;;;\377\202\0\0\0\377\4\20" \ ++ "\23\35\377IU\200\377N[\211\377MZ\210\377\202N[\211\377\6MZ\210\377KW" \ ++ "\204\377\30\34+\377\0\0\0\377\4\4\4\377\235\235\235\377\247\377\377\377" \ ++ "\377\3\376\376\376\377\377\377\377\377\273\273\273\377\202\0\0\0\377" \ ++ "\13\4\6\20\377\26&\\\377\31*e\377\30)d\377&2`\377\5\6\12\377\0\0\0\377" \ ++ "\4\4\4\377\234\234\234\377\377\377\377\377\376\376\376\377\213\377\377" \ ++ "\377\377\16\376\376\376\377\377\377\377\377\376\376\376\377\311\311\311" \ ++ "\377\204\204\204\377III\377---\377,,,\377DDD\377yyy\377\272\272\272\377" \ ++ "\367\367\367\377\377\377\377\377\376\376\376\377\213\377\377\377\377" \ ++ "\1\376\376\376\377\202\377\377\377\377\1===\377\202\0\0\0\377\1\22\26" \ ++ "#\377\202BP\200\377\1\40'>\377\202\0\0\0\377\1ppp\377\217\377\377\377" \ ++ "\377\11\10\10\10\377\0\0\0\377\1\2\3\377\77M~\3777Fy\377\27(c\377\30" \ ++ ")d\377\31*e\377\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1" \ ++ "555\377\202\0\0\0\377\1/;b\377\202\377\202\0" \ ++ "\0\0\377\1ppp\377\217\377\377\377\377\6\10\10\10\377\0\0\0\377\1\2\3" \ ++ "\377\77M~\3772Au\377\26(c\377\202\31*e\377\1\24!P\377\202\0\0\0\377\1" \ ++ "DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377\5/;b\377;J|\377" \ ++ "\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\6\10\10\10\377" \ ++ "\0\0\0\377\1\2\3\377\77M~\377,;q\377\27(c\377\202\31*e\377\1\24!P\377" \ ++ "\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377" \ ++ "\2/;b\377\377\202\0\0\0\377\1ppp\377" \ ++ "\217\377\377\377\377\6\10\10\10\377\0\0\0\377\1\2\3\377\77M~\377&6n\377" \ ++ "\27(d\377\202\31*e\377\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377" \ ++ "\377\377\1""555\377\202\0\0\0\377\4/;b\377l\377\2038Fz\377" \ ++ "\3""7Fy\3778Fz\3776Fx\377\2037Fy\377\1\5\7\14\377\202\0\0\0\377\1\341" \ ++ "\341\341\377\222\377\377\377\377\5\335\335\335\377\6\6\6\377\0\0\0\377" \ ++ "\3\6\17\377\25#V\377\205\31*e\377\4,\377\202\0\0\0\377\1ppp\377\217" \ ++ "\377\377\377\377\6\10\10\10\377\0\0\0\377\1\2\3\377\77M~\377\40""0i\377" \ ++ "\30)d\377\202\31*e\377\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377" \ ++ "\377\377\1""555\377\202\0\0\0\377\4/;b\377t\3773Bw\3772A" \ ++ "v\377*7e\377\202\0\0\0\377\2EEE\377\370\370\370\377\216\377\377\377\377" \ ++ "\4SSS\377\0\0\0\377\0\0\1\377\15\26""7\377\222\31*e\377\7\30)d\377\36" \ ++ ".h\377\30\40\77\377\0\1\2\377\0\0\0\377666\377\352\352\352\377\225\377" \ ++ "\377\377\377\1\244\244\244\377\202\0\0\0\377\1\14\24""0\377\214\31*e" \ ++ "\377\3\30)d\377\32+f\377&6n\377\203(8o\377\206'7o\377\3#4l\377\31*e\377" \ ++ "\30)d\377\236\31*e\377\7\30)d\377\34-g\377ES\202\377HV\205\377IV\205" \ ++ "\377HU\204\377IV\205\377\207JW\206\377\1IV\206\377\207KX\206\377\3JW" \ ++ "\205\377LY\207\377KX\206\377\207LY\207\377\2LZ\207\377LY\207\377\205" \ ++ "LZ\207\377\1KZ\206\377\202LZ\207\377\207MZ\210\377\4LY\207\377MZ\210" \ ++ "\377N[\211\377MZ\210\377\205N[\211\377\2JW\203\377\40%8\377\203\0\0\0" \ ++ "\377\2$$$\377\275\275\275\377\202\377\377\377\377\1\376\376\376\377\234" \ ++ "\377\377\377\377\1\376\376\376\377\202\377\377\377\377\2\275\275\275" \ ++ "\377$$$\377\203\0\0\0\377\7\36#5\377JV\202\377N[\211\377MZ\210\377N[" \ ++ "\211\377MZ\210\377LY\207\377\204MZ\210\377\5KW\204\377\30\34+\377\0\0" \ ++ "\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2\372\372\372\377" \ ++ "\260\260\260\377\223\377\377\377\377\1\376\376\376\377\202\377\377\377" \ ++ "\377\1JJJ\377\203\0\0\0\377\1\22\37K\377\203\31*e\377\2\30)d\377\77M" \ ++ "~\377\202HU\204\377\3GU\204\377CQ~\377\27\34+\377\202\0\0\0\377\5\3\3" \ ++ "\3\377ttt\377\376\376\376\377\377\377\377\377\376\376\376\377\232\377" \ ++ "\377\377\377\1\376\376\376\377\202\377\377\377\377\2\261\261\261\377" \ ++ "\22\22\22\377\203\0\0\0\377\1""6Ai\377\202BP\201\377\4BP\200\377BP\177" \ ++ "\377BP\200\377\40'>\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\6" \ ++ "\10\10\10\377\0\0\0\377\1\2\3\377\77M}\377\30*e\377\30)d\377\202\31*" \ ++ "e\377\1\24!P\377\202\0\0\0\377\1DDD\377\217\377\377\377\377\1""555\377" \ ++ "\202\0\0\0\377\4/;b\377>>\377\203\0\0\0\377\1\16\27""8\377\203\31*e\377\4" \ ++ "\30)d\377\37/h\377IV\205\377HU\204\377\203GU\204\377\2CP}\377\16\21\33" \ ++ "\377\203\0\0\0\377\3JJJ\377\357\357\357\377\376\376\376\377\202\377\377" \ ++ "\377\377\1\376\376\376\377\224\377\377\377\377\1\376\376\376\377\203" \ ++ "\377\377\377\377\3\366\366\366\377\206\206\206\377\4\4\4\377\202\0\0" \ ++ "\0\377\2\1\1\3\377-8^\377\203BP\201\377\4BP\200\377BP\177\377BP\200\377" \ ++ "\40'>\377\202\0\0\0\377\1ppp\377\217\377\377\377\377\5\10\10\10\377\0" \ ++ "\0\0\377\1\2\3\377:Hz\377\26'c\377\203\31*e\377\1\24!P\377\202\0\0\0" \ ++ "\377\1DDD\377\217\377\377\377\377\1""555\377\202\0\0\0\377\4/;b\377<" \ ++ "K}\377;J|\377:I{\377\205;J|\377\2:I{\377*5Y\377\202\0\0\0\377\3\77\77" \ ++ "\77\377\377\377\377\377\376\376\376\377\217\377\377\377\377\5\323\323" \ ++ "\323\377\37\37\37\377\0\0\0\377\4\5\11\377+6_\377\2058Fz\377\1""6Fx\377" \ ++ "\2047Fy\377\2""0>k\377\4\5\11\377\202\0\0\0\377\1\365\365\365\377\221" \ ++ "\377\377\377\377\4@@@\377\0\0\0\377\0\0\2\377\16\30:\377\204\31*e\377" \ ++ "\6\30)d\377\32*e\3774Cx\3772Av\3771@u\377*7e\377\202\0\0\0\377\2EEE\377" \ ++ "\370\370\370\377\216\377\377\377\377\4SSS\377\0\0\0\377\0\0\1\377\15" \ ++ "\26""7\377\222\31*e\377\4\30)d\377!1j\377->>\377" \ ++ "\203\0\0\0\377\12\2\4\13\377\32%L\377\77M\177\377BP\201\377BP\200\377" \ ++ "BP\201\377BP\200\377BP\177\377BP\200\377\40'>\377\202\0\0\0\377\1ppp" \ ++ "\377\217\377\377\377\377\5\10\10\10\377\0\0\0\377\1\2\3\3772@u\377\27" \ ++ "(c\377\203\31*e\377\1\24!P\377\202\0\0\0\377\1EEE\377\217\377\377\377" \ ++ "\377\1""555\377\202\0\0\0\377\4/;b\377i\377\1\2\3\377\0\0\0\377\4\4\4\377\221\377\377\377\377\5" \ ++ "\247\247\247\377\6\6\6\377\0\0\0\377\10\12\22\3777Ex\377\2058Fz\377\1" \ ++ "6Fx\377\2047Fy\377\2""4Br\377\20\24#\377\202\0\0\0\377\1\244\244\244" \ ++ "\377\220\377\377\377\377\5\342\342\342\377***\377\0\0\0\377\1\2\6\377" \ ++ "\22\37L\377\204\31*e\377\6\30)d\377\34-g\3774Cx\3772Av\3771@u\377*7e" \ ++ "\377\202\0\0\0\377\2EEE\377\371\371\371\377\216\377\377\377\377\4SSS" \ ++ "\377\0\0\0\377\0\0\1\377\15\26""7\377\222\31*e\377\2\30)d\377\"2k\377" \ ++ "\202->>\377\204\0\0\0\377\3\6\13\33\377\23\40P\377+;q\377" \ ++ "\203BP\201\377\2BP\200\377BP\177\377\202BP\200\377\1\40'>\377\202\0\0" \ ++ "\0\377\1rrr\377\217\377\377\377\377\5\10\10\10\377\0\0\0\377\2\2\3\377" \ ++ "(8o\377\27)d\377\203\31*e\377\1\24!P\377\202\0\0\0\377\1EEE\377\217\377" \ ++ "\377\377\377\1""666\377\202\0\0\0\377\3/;b\377;J|\377:I{\377\206;J|\377" \ ++ "\3:I{\3774Ao\377\13\16\30\377\202\0\0\0\377\1\317\317\317\377\220\377" \ ++ "\377\377\377\1vvv\377\202\0\0\0\377\1\24\31,\377\2068Fz\377\1""6Fx\377" \ ++ "\2057Fy\377\1\34#>\377\202\0\0\0\377\1RRR\377\220\377\377\377\377\5\303" \ ++ "\303\303\377\24\24\24\377\0\0\0\377\2\4\11\377\27'_\377\204\31*e\377" \ ++ "\6\30)d\377\37""0i\3774Cx\3772Av\3771@u\377*7e\377\202\0\0\0\377\2FF" \ ++ "F\377\374\374\374\377\216\377\377\377\377\4TTT\377\0\0\0\377\0\0\1\377" \ ++ "\15\26""7\377\221\31*e\377\7\30)e\377\30)d\377$4l\377.=s\377-b\377\11\13\21\377\204\0\0\0\377" \ ++ "\7\17\17\17\377\37\37\37\377@@@\377www\377\246\246\246\377\314\314\314" \ ++ "\377\352\352\352\377\207\377\377\377\377\10\372\372\372\377\343\343\343" \ ++ "\377\305\305\305\377\241\241\241\377ttt\377===\377\40\40\40\377\21\21" \ ++ "\21\377\204\0\0\0\377\12\0\0\2\377\16\30:\377\27'^\377\32+e\3772Av\377" \ ++ "BP\201\377AO\200\377BP\201\377BP\200\377BP\177\377\202BP\200\377\1\40" \ ++ "'>\377\202\0\0\0\377\2\20\20\20\377&&&\377\216%%%\377\5\1\1\1\377\0\0" \ ++ "\0\377\2\2\3\377\37""0i\377\30)d\377\203\31*e\377\1\24!P\377\202\0\0" \ ++ "\0\377\2\12\12\12\377'''\377\215%%%\377\2'''\377\7\7\7\377\202\0\0\0" \ ++ "\377\3/;b\377;J|\377:I{\377\206;J|\377\3:I{\3777Ev\377\25\32-\377\202" \ ++ "\0\0\0\377\2\32\32\32\377&&&\377\216%%%\377\2$$$\377\16\16\16\377\202" \ ++ "\0\0\0\377\1&/S\377\2048Fz\377\3""7Fy\3778Fz\3776Fx\377\2057Fy\377\5" \ ++ "&0T\377\2\3\5\377\0\0\0\377\7\7\7\377'''\377\217%%%\377\4\32\32\32\377" \ ++ "\1\1\1\377\0\0\0\377\5\10\24\377\205\31*e\377\6\30)d\377#3l\3774Cw\377" \ ++ "2Av\3771@u\377*7e\377\202\0\0\0\377\2\12\12\12\377$$$\377\215%%%\377" \ ++ "\5'''\377\14\14\14\377\0\0\0\377\0\0\1\377\15\26""7\377\221\31*e\377" \ ++ "\202\30)d\377\6%5m\377.=s\377->>\377\206\206\206\377\274\274\274\377" \ ++ "\343\343\343\377\206\377\377\377\377\11\371\371\371\377\340\340\340\377" \ ++ "\301\301\301\377\234\234\234\377rrr\377AAA\377$$$\377\27\27\27\377\2" \ ++ "\2\2\377\202\0\0\0\377\214\31*e\377\3\30)d\377\37/i\377'7n\377\202(8" \ ++ "o\377\2'7o\377&6o\377\204'7o\377\3&6n\377\37""0i\377\30)d\377\232\31" \ ++ "*e\377\2\37""0i\377\30)d\377\205\31*e\377\3\30)d\377\34-g\377ER\202\377" \ ++ "\202IV\205\377\4HU\204\377IV\205\377JW\206\377IV\205\377\204JW\206\377" \ ++ "\1IV\206\377\202JW\206\377\206KX\206\377\1JW\205\377\202KX\206\377\207" \ ++ "LY\207\377\3LX\207\377LZ\207\377LY\207\377\206LZ\207\377\1KZ\206\377" \ ++ "\202LZ\207\377\210MZ\210\377\202LY\207\377\3MZ\210\377N[\211\377MZ\210" \ ++ "\377\207N[\211\377\4;Eh\377\22\26!\377\0\1\1\377\0\0\1\377\212\0\0\0" \ ++ "\377\5\13\13\13\377\24\24\24\377\27\27\27\377\23\23\23\377\11\11\11\377" \ ++ "\211\0\0\0\377\202\0\0\1\377\2\17\22\33\3778Bc\377\204N[\211\377\203" \ ++ "MZ\210\377\202LY\207\377\206MZ\210\377\7LZ\207\377MZ\210\377JW\203\377" \ ++ "\27\34*\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\2" \ ++ "\366\366\366\377\13\13\13\377\202\0\0\0\377\1\0\0\1\377\207\0\0\0\377" \ ++ "\2\11\11\11\377\5\5\5\377\207\0\0\0\377\4\1\1\2\377\22\27*\377\27'_\377" \ ++ "\30)d\377\204\31*e\377\7\30)d\377\27(c\3777Fx\377GT\203\377HU\204\377" \ ++ "GU\204\377FU\204\377\206GU\204\377\4FT\203\377ES\202\377&.H\377\4\5\10" \ ++ "\377\213\0\0\0\377\4\6\6\6\377\13\13\13\377\11\11\11\377\3\3\3\377\213" \ ++ "\0\0\0\377\3\0\0\1\377\11\17%\377\26&[\377\202\31*e\377\2\34-g\377:H" \ ++ "{\377\203BP\201\377\2BP\200\377BP\177\377\202BP\200\377\1\40'>\377\224" \ ++ "\0\0\0\377\3\1\2\3\377\31*e\377\30)d\377\203\31*e\377\1\24!P\377\225" \ ++ "\0\0\0\377\3/;b\377;J|\377:I{\377\206;J|\377\3:I{\3779Hz\377\36&A\377" \ ++ "\226\0\0\0\377\1""7Ex\377\2058Fz\377\2""7Fy\3776Fx\377\2057Fy\377\2/" \ ++ "\377" \ ++ "\32\37/\377\23\27\"\377\16\20\30\377\11\13\20\377\5\6\12\377\3\3\5\377" \ ++ "\2\2\3\377\1\1\2\377\2\2\3\377\3\4\6\377\6\7\13\377\12\14\22\377\20\22" \ ++ "\34\377\26\32(\377\36$6\377(/G\3773;Z\377\77Jp\377\205N[\211\377\1MZ" \ ++ "\210\377\202N[\211\377\2MZ\210\377LY\207\377\212MZ\210\377\7LZ\207\377" \ ++ "KZ\206\377JW\203\377\30\34*\377\0\0\0\377\4\4\4\377\235\235\235\377\216" \ ++ "\377\377\377\377\30\366\366\366\377\13\13\13\377\0\0\0\377\3\4\6\377" \ ++ "KX\206\377GT\200\3774=_\377&-D\377\31\35.\377\20\23\35\377\11\12\20\377" \ ++ "\5\6\11\377\3\4\6\377\4\4\7\377\6\10\14\377\14\16\26\377\25\30&\377\37" \ ++ "%9\377-5R\377L}\377\27(c\377\30)d\377\205\31*e\377" \ ++ "\6\30)d\377*:p\377GT\203\377HU\204\377GU\204\377FU\204\377\205GU\204" \ ++ "\377\202FT\203\377\1ES\202\377\205FT\203\377\26" \ ++ "t\3773Bv\3771@u\3772Av\3770>q\377\"-Q\377\203#.S\377\2\".S\377\".R\377" \ ++ "\206\".S\377\3\"-S\377\37*P\377\23\37H\377\205\21\35G\377\2\21\35H\377" \ ++ "\25$W\377\221\31*e\377\5\30)d\377\33,f\377)9p\377.=s\377,;q\377\205-" \ ++ "Ip\377>Iq\377\77K" \ ++ "s\377BMw\377DP|\377GT\202\377IV\205\377HU\204\377JW\205\377&6m\377\27" \ ++ "(d\377\206\31*e\377\6\32+f\3778Gz\377IU\204\377HT\203\377GU\204\377F" \ ++ "U\204\377\206GU\204\377\2FT\203\377ES\202\377\205FT\203\377\202ES\203" \ ++ "\377\21DR\203\377DR\201\377AN|\377\77Kw\377=It\377Kw\377\32*a\377\27(c\377\211" \ ++ "\31*e\377\4\30)d\3773Bw\377CQ\201\377BP\201\377\202BP\200\377\1BP\177" \ ++ "\377\205BP\200\377\202AO\200\377\1@N\200\377\206AO\200\377\2@N\177\377" \ ++ "\77M~\377\206@N\177\377\3>L}\377@N\177\377&5m\377\216\31*e\377\3-=s\377" \ ++ "=K}\377s\377\27(d\377\30)d\377\222\31*e\377\2\30)d\377\30(d\377\2022Av\377" \ ++ "\1""1@u\377\2062Av\377\2""1Au\3770At\377\2051Au\377\2020@u\377\2*;q\377" \ ++ "\32+f\377\230\31*e\377\5\30)d\377\34,g\377+:q\377.=s\377,;q\377\205-" \ ++ "L}\377" \ ++ "\37""0i\377\30)d\377\214\31*e\377\2\33,f\3773Bv\377\205=K}\377\2t\377CQ\201\377\202BP\201\377\2BP\200\377BP\177" \ ++ "\377\206BP\200\377\2AO\200\377@N\200\377\206AO\200\377\2@N\177\377\77" \ ++ "M~\377\206@N\177\377\5>L}\377\77M~\3772Av\377\32+f\377\30)d\377\213\31" \ ++ "*e\377\2\30)d\377\37""0i\377\204=K}\377\2s\377-L~\377L}\377\204=K}\377\2t\377\37""0j\377\30)d\377\231\31*e\377\2$4l\377.=s\377\210-" \ ++ "Js\377vvv\377\33\33" \ ++ "\33\377\202\23\23\23\377\25\21\21\21\377***\377\224\225\226\377NZ\205" \ ++ "\377GU\204\377HV\204\377\217\217\217\377+++\377\21\21\21\377\23\23\23" \ ++ "\377\24\24\24\377LLL\377z\200\222\377FT\203\377\211\212\217\377<<<\377" \ ++ "\17\17\17\377\23\23\23\377\24\24\24\377XXY\377iq\216\377\204ES\203\377" \ ++ "\207DR\202\377\3@N\177\377\40""0i\377\30)d\377\211\31*e\377\17\27(c\377" \ ++ ".>s\377AO\200\377BP\201\377BP\200\377BP\201\377BP\200\377Wa\205\377i" \ ++ "ii\377\24\24\24\377\23\23\23\377\22\22\22\377222\377ux\203\377CQ\200" \ ++ "\377\205AO\200\377\2@N\177\377AO\200\377\207@N\177\377\202\77M~\377\3" \ ++ ":I{\377\36/i\377\30)d\377\214\31*e\377\2\30)d\3779Gz\377\205=K}\377\2" \ ++ "t\3772Av\3771@u\377\2042Av\377\3n" \ ++ "t\207\377PPP\377\16\16\16\377\202\23\23\23\377\2===\377ov\214\377\203" \ ++ "1Au\377\4""0@u\377-=s\377\35.h\377\30)d\377\231\31*e\377\2'6o\377.=s" \ ++ "\377\210-L~\377BP\201\377BP\200\377BP\201" \ ++ "\377BP\200\377BP\177\377Wb\206\377ccc\377\1\1\1\377\202\0\0\0\377\3#" \ ++ "##\377sw\201\377BP\200\377\204AO\200\377\4@N\177\377AO\200\377@N\177" \ ++ "\377\77M~\377\204@N\177\377\2\77M~\377@N\177\377\202\77M~\377\2.=r\377" \ ++ "\27(c\377\214\31*e\377\3\27)d\377'7o\377>L}\377\204=K}\377\202L~\377IV\205\377HU\204\377IV\205\377HU\204\377" \ ++ "IV\205\377\207JW\206\377\1IV\206\377\202JW\206\377\210KX\206\377\4JW" \ ++ "\205\377KX\206\377LY\207\377KX\206\377\207LY\207\377\4LX\207\377LY\207" \ ++ "\377LZ\207\377LY\207\377\212LZ\207\377\1KZ\206\377\202LZ\207\377\203" \ ++ "MZ\210\377\1LZ\207\377\240MZ\210\377\202LZ\207\377\202KZ\206\377\211" \ ++ "LZ\207\377\11LY\207\377LZ\207\377LY\207\377LX\207\377JU\203\377\30\34" \ ++ "*\377\0\0\0\377\4\4\4\377\235\235\235\377\216\377\377\377\377\4\366\366" \ ++ "\366\377\13\13\13\377\0\0\0\377\3\4\6\377\206JW\206\377\202IV\205\377" \ ++ "\1HU\204\377\202IV\205\377\4JW\206\377@Lv\377sss\377\12\12\12\377\202" \ ++ "\0\0\0\377\6\14\14\14\377sss\3771>n\377\37/g\377\203\203\203\377\36\36" \ ++ "\36\377\205\0\0\0\377\5///\377\212\215\227\377GU\204\377{\200\220\377" \ ++ "]]]\377\203\0\0\0\377\6\7\7\7\377\220\222\227\377S_\205\377FT\203\377" \ ++ "qw\213\377uz\212\377\203sx\212\377\2uz\213\377Yc\207\377\203ES\203\377" \ ++ "\2DR\202\377CQ\201\377\204DR\202\377\4IV\202\377ES\200\377\40""0h\377" \ ++ "\30)d\377\206\31*e\377\5\40""0g\377#2h\377\"2h\377\37/f\377+;q\377\203" \ ++ "BP\201\377\202BP\200\377\4BP\177\377Wb\206\377ccc\377\1\1\1\377\202\0" \ ++ "\0\0\377\3###\377sw\201\377BP\200\377\205AO\200\377\202@N\177\377\3E" \ ++ "R\177\377FS\200\377GS\200\377\203@N\177\377\203\77M~\377\2\"2k\377\30" \ ++ ")d\377\205\31*e\377\1\"1h\377\203\"2h\377\203\31*e\377\2\26(c\3772Bv" \ ++ "\377\205=K}\377\6s\377.=s\377\202-r\377+>>\377\203\0\0\0\377\7$$$\377\216\216\216\377>Jr\377\31*e\377W`}\377" \ ++ "\206\206\206\377\21\21\21\377\203\0\0\0\377\4JJJ\377xxx\377yyy\377OO" \ ++ "O\377\203\0\0\0\377\6\20\20\20\377\213\213\213\377X`}\377\30)d\377ot" \ ++ "\206\377sss\377\205\0\0\0\377\1\20\20\20\377\202\0\0\0\377\1\16\16\16" \ ++ "\377\203\0\0\0\377\6""111\377pw\215\3771Au\377;Ix\377\215\215\216\377" \ ++ "DDD\377\203\0\0\0\377\4\2\2\2\377000\377\77\77\77\377\27\27\27\377\203" \ ++ "\0\0\0\377\7\20\20\20\377rrr\377]e\200\377\31*e\377)8l\377mmm\377\14" \ ++ "\14\14\377\202\0\0\0\377\2&&&\377###\377\207\0\0\0\377\2\"\"\"\377\6" \ ++ "\6\6\377\207\0\0\0\377\2\203\203\203\377+K{\377\206\207\214\377***\377" \ ++ "\203\0\0\0\377\6WWW\377\216\216\220\377Wa\202\377bj\205\377\223\223\225" \ ++ "\377###\377\203\0\0\0\377\5```\377z~\212\377\34-f\377\201\204\221\377" \ ++ "111\377\203\0\0\0\377\6DDE\377\221\221\221\377PYz\377LVx\377\220\221" \ ++ "\223\377CCD\377\203\0\0\0\377\5;;;\377\200\203\217\377%4i\377\211\213" \ ++ "\223\377+++\377\203\0\0\0\377\5\5\5\5\377qqq\377\217\217\217\377\211" \ ++ "\211\211\377&&&\377\204\0\0\0\377\5""111\377pw\215\3771Au\377ho\206\377" \ ++ "www\377\203\0\0\0\377\6\7\7\7\377bbb\377\216\216\217\377\202\204\212" \ ++ "\377\206\206\206\377,,-\377\203\0\0\0\377\6""222\377\210\211\213\377" \ ++ "\32+e\377)8l\377mmm\377\14\14\14\377\203\0\0\0\377\5\7\7\7\377jjj\377" \ ++ "\212\212\212\377[[[\377\7\7\7\377\204\0\0\0\377\4\27\27\27\377zzz\377" \ ++ "\206\206\206\377/00\377\204\0\0\0\377\1fff\377\203,s\377\27(c\377Ya\200\377BBB\377" \ ++ "\204\0\0\0\377\3ppp\377ou\212\377PZ}\377\204S\\~\377\6Q[{\377.M}\377]f\205\377\223\224\231\377555\377\202\0\0\0\377\4\2\2\2\377" \ ++ "|||\377O[\201\377;J|\377\205:I{\377\5""5Dw\377\26'c\377\31*e\377Ya\200" \ ++ "\377BBB\377\204\0\0\0\377\2lll\377JTx\377\207\31*e\377\4\27(d\377bi\205" \ ++ "\377HHH\377\1\1\1\377\202\0\0\0\377\3>>>\377|\177\212\3778Fz\377\203" \ ++ "7Fy\377\3\77M{\377\203\203\203\377\34\34\34\377\202\0\0\0\377\17\7\7" \ ++ "\7\377mmm\377uz\212\3777Fx\377=Kz\377z~\214\377\215\215\215\377\214\214" \ ++ "\214\377}\200\210\377rv\204\377in\202\377T]{\377&5j\377\206\210\221\377" \ ++ "\30\30\30\377\203\0\0\0\377\16kkk\377\201\203\214\377\37/g\377\32+e\377" \ ++ "lr\205\377\216\216\216\377\214\214\214\377\177\201\210\377vy\205\377" \ ++ "fl\200\377QZz\377,:n\377\214\216\225\377(((\377\203\0\0\0\377\5\"\"\"" \ ++ "\377\222\222\222\377~\201\213\377\216\216\220\377nno\377\204\0\0\0\377" \ ++ "\5""111\377pw\215\3770@u\377z~\213\377```\377\203\0\0\0\377\6\25\25\25" \ ++ "\377\211\211\211\377fl\202\377ISw\377\216\216\221\377RRR\377\203\0\0" \ ++ "\0\377\6###\377\206\206\206\377\40""0g\377)8k\377mmm\377\14\14\14\377" \ ++ "\202\0\0\0\377\7\23\23\23\377wxy\377\36.g\377\31*e\377NY|\377KKK\377" \ ++ "\1\1\1\377\202\0\0\0\377\2///\377y|\207\377\202-t\377KW\206\377IV\205" \ ++ "\377HU\204\377IV\205\377HU\204\377IV\205\377JW\206\377IV\205\377\207" \ ++ "JW\206\377\1IV\206\377\202JW\206\377\2KX\206\377JW\206\377\210KX\206" \ ++ "\377\202JW\205\377\202KX\206\377\202LY\207\377\1KX\206\377\220LY\207" \ ++ "\377\207LX\207\377\205LY\207\377\207LX\207\377\220LY\207\377\2KX\206" \ ++ "\377LY\207\377\202KX\206\377\202JW\205\377\211KX\206\377\4JW\206\377" \ ++ "KX\206\377JW\206\377IV\206\377\207JW\206\377\1IV\205\377\202JW\206\377" \ ++ "\2IV\205\377HU\204\377\203IV\205\377\3CP\201\377\"2k\377\30)d\377\207" \ ++ "\31*e\377\5\30)d\377!1j\377DQ\201\377\214\216\224\377@@@\377\205\0\0" \ ++ "\0\377\2SSS\377y}\215\377\202GU\204\377\3NZ\204\377\224\225\231\377\34" \ ++ "\34\34\377\204\0\0\0\377\3\2\2\2\377bbb\377go\213\377\204ES\203\377\2" \ ++ "\210\212\217\377333\377\203\0\0\0\377\5OPP\377iq\216\377DR\202\377bj" \ ++ "\210\377ttt\377\203\0\0\0\377\3\33\33\33\377vz\207\377$3i\377\204\31" \ ++ "*e\377\2sx\207\377ooo\377\203\0\0\0\377\17\20\20\20\377sss\377\202\203" \ ++ "\210\377\201\202\210\377yyy\377666\377\37\37\37\377111\377\77\77\77\377" \ ++ "uuu\377\210\212\221\377CQ\200\377Wb\206\377ccc\377\1\1\1\377\202\0\0" \ ++ "\0\377\6###\377sw\201\377CQ\200\377FS\201\377\212\213\222\377<<<\377" \ ++ "\203\0\0\0\377\26""444\377~~~\377\201\203\211\377\204\204\207\377lll" \ ++ "\377\40\40\40\377$$$\377555\377HHH\377\215\215\215\377lq\204\377[c\177" \ ++ "\377fff\377\36\36\36\377\20\20\20\377\0\0\0\377\21\21\21\377www\377\177" \ ++ "\202\214\377dk\204\377\205\206\214\377JJJ\377\203\0\0\0\377\15uuu\377" \ ++ "jq\210\377\201\203\214\377NNN\377\26\26\26\377\12\12\12\377\0\0\0\377" \ ++ "///\377\206\206\206\377x}\216\377w|\216\377\206\207\210\377\"\"\"\377" \ ++ "\202\0\0\0\377\4\33\33\33\377\205\205\205\377DQ}\377;J|\377\204:I{\377" \ ++ "\6;J{\377(8p\377\27(d\377\31*e\377Ya\200\377BBB\377\204\0\0\0\377\2l" \ ++ "ll\377JTx\377\206\31*e\377\5\30)d\377\27(c\377fm\210\377HHH\377\1\1\1" \ ++ "\377\202\0\0\0\377\2>>>\377|\177\212\377\2047Fy\377\3;Iz\377~\202\220" \ ++ "\377OOO\377\203\0\0\0\377\16(((\377yyy\377\202\204\210\377\200\202\207" \ ++ "\377uuu\377###\377$$$\377222\377@@@\377\206\206\206\377\207\210\216\377" \ ++ "\31*e\377ms\207\377eee\377\203\0\0\0\377\16\21\21\21\377www\377\203\204" \ ++ "\207\377~\200\206\377~~~\377--.\377\40\40\40\377...\377;;;\377{{{\377" \ ++ "\203\205\216\377+:o\377z~\215\377mmm\377\204\0\0\0\377\6\"\"\"\377WW" \ ++ "W\377CCC\377\0\0\0\377$$$\377\4\4\4\377\202\0\0\0\377\6""111\377pw\215" \ ++ "\3770@u\377MY}\377\210\210\210\377\40\40\40\377\203\0\0\0\377\5)**\377" \ ++ "mmm\377ttt\377UUU\377\7\7\7\377\202\0\0\0\377\7\2\2\2\377\\\\\\\377o" \ ++ "u\207\377\31*e\377)8l\377mmm\377\14\14\14\377\202\0\0\0\377\7\23\23\23" \ ++ "\377wxy\377\36.g\377\31*e\377NY|\377KKK\377\1\1\1\377\202\0\0\0\377\2" \ ++ "///\377y|\207\377\202-m\377>Js\377\205\205\205\377" \ ++ "\34\34\34\377\203\0\0\0\377\5\30\30\30\377CCC\377LLL\377777\377\3\3\3" \ ++ "\377\202\0\0\0\377\6;;;\377\216\216\216\377KV\200\377mt\213\377mmm\377" \ ++ "\6\6\6\377\203\0\0\0\377\4)))\377HHH\377III\377$$$\377\202\0\0\0\377" \ ++ "\6\1\1\1\377]]]\377\201\204\215\377;J|\377:I{\3779Hz\377\202:I{\377\7" \ ++ "9Hz\377>>\377|\177\212\3777Fy\3776Fx\377\2037Fy\377" \ ++ "\3T^\201\377\214\215\216\377888\377\203\0\0\0\377\4\22\22\22\377222\377" \ ++ "///\377\12\12\12\377\203\0\0\0\377\7""999\377\215\215\215\377>Js\377" \ ++ "\31*e\3776Cp\377\222\223\225\377HHH\377\203\0\0\0\377\4\7\7\7\377111" \ ++ "\377222\377\20\20\20\377\203\0\0\0\377\7())\377\212\212\212\377PYy\377" \ ++ ".=s\377HS}\377\223\223\223\377000\377\206\0\0\0\377\3---\377ttt\377\2" \ ++ "\2\2\377\202\0\0\0\377\7""000\377pw\215\3770@t\3771Av\377ns\206\377v" \ ++ "vv\377\27\27\27\377\204\0\0\0\377\1\2\2\2\377\204\0\0\0\377\7III\377" \ ++ "\212\213\217\3774Ao\377\31*e\377)8l\377mmm\377\14\14\14\377\202\0\0\0" \ ++ "\377\7\23\23\23\377wxy\377\36.g\377\31*e\377NY|\377KKK\377\1\1\1\377" \ ++ "\202\0\0\0\377\2///\377y|\207\377\202->>\377\204\0\0\0\377\2kkk\377JTx\377\206\31*e\377\4\30)d\377" \ ++ "!1j\377iq\213\377CCC\377\203\0\0\0\377\4""888\377|\177\212\3777Fy\377" \ ++ "6Fx\377\2047Fy\377\4fm\207\377\214\214\214\377UUU\377\20\20\20\377\206" \ ++ "\0\0\0\377\4\30\30\30\377[[[\377\215\215\215\377LVx\377\203\31*e\377" \ ++ "\4DOu\377\221\221\221\377___\377\27\27\27\377\206\0\0\0\377\12\20\20" \ ++ "\20\377RRR\377\212\212\212\377]e~\377\30)e\3773Bw\3772Av\377io\206\377" \ ++ "\204\204\204\377222\377\204\0\0\0\377\3""9::\377\211\211\211\377uuu\377" \ ++ "\203\0\0\0\377\11+++\377ov\215\3770@u\377.\77t\377'6k\377sx\210\377\177" \ ++ "\177\177\377AAA\377\7\7\7\377\205\0\0\0\377\4#$$\377hhh\377\216\216\217" \ ++ "\377GRw\377\202\31*e\377\3)8l\377kkk\377\3\3\3\377\202\0\0\0\377\6\12" \ ++ "\12\12\377vwx\377\36.g\377\31*e\377NX|\377GGG\377\203\0\0\0\377\2)))" \ ++ "\377y|\207\377\202-L}\377" \ ++ "\202s\377GT\203\377HU\204\377\202" \ ++ "GU\204\377\1FU\204\377\207GU\204\377\2FT\203\377ES\202\377\206FT\203" \ ++ "\377\4ES\203\377FT\203\377ES\203\377DR\203\377\206ES\203\377\202DR\202" \ ++ "\377\1CQ\201\377\205DR\202\377\4CQ\201\3770\77t\377\31*e\377\30)d\377" \ ++ "\211\31*e\377\4\30)d\377!2k\377AO\200\377AP\200\377\202BP\201\377\2B" \ ++ "P\200\377BP\177\377\205BP\200\377\3AO\200\377BP\200\377@N\200\377\207" \ ++ "AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202\77M~\377\3""7Fy\377" \ ++ "\31*e\377\31*d\377\213\31*e\377\4\31*d\377\27(c\377/>t\377L}\377\36.h" \ ++ "\377\30)d\377\207\31*e\377\3\30)d\377\32*e\377/=s\377\204IV\205\377\2" \ ++ "HU\204\377IV\205\377\202JW\206\377\1IV\205\377\210JW\206\377\1IV\206" \ ++ "\377\202JW\206\377\216KX\206\377\202JW\205\377\204KX\206\377\203LY\207" \ ++ "\377\1KX\206\377\226LY\207\377\1KX\206\377\203LY\207\377\204KX\206\377" \ ++ "\203JW\205\377\213KX\206\377\2JW\206\377KX\206\377\203JW\206\377\1IV" \ ++ "\206\377\212JW\206\377\2IV\205\377HU\204\377\202IV\205\377\4HU\204\377" \ ++ "IV\205\377DR\202\377!1j\377\202\30)d\377\207\31*e\377\2\30)d\377(8o\377" \ ++ "\202HU\204\377\3HT\203\377GU\204\377FU\204\377\206GU\204\377\4FT\203" \ ++ "\377GU\204\377FT\203\377ES\202\377\207FT\203\377\2ES\203\377DR\203\377" \ ++ "\206ES\203\377\202DR\202\377\1CQ\201\377\205DR\202\377\4CQ\201\377\77" \ ++ "N\177\377\36.h\377\30)d\377\211\31*e\377\3\30)d\377\27(d\3775Dy\377\202" \ ++ "AO\200\377\2BP\200\377BP\201\377\210BP\200\377\2AO\200\377@N\200\377" \ ++ "\205AO\200\377\3@N\177\377AO\200\377\77M~\377\207@N\177\377\3>L}\377" \ ++ "AN\177\377&7n\377\215\31*e\377\4\30)d\377\33,f\3777Ey\377=J}\377\203" \ ++ "=K}\377\202t\377GT\203\377IV\205\377HU\204\377\202IV\205\377\2HU\204\377" \ ++ "IV\205\377\213JW\206\377\202IV\206\377\202JW\206\377\202KX\206\377\1" \ ++ "JW\206\377\215KX\206\377\203JW\205\377\206KX\206\377\216LY\207\377\206" \ ++ "KX\206\377\203JW\205\377\216KX\206\377\2JW\206\377KX\206\377\202JW\206" \ ++ "\377\202IV\206\377\211JW\206\377\3IV\205\377JW\206\377IV\205\377\202" \ ++ "HU\204\377\2IV\205\377HU\204\377\202IV\205\377\3BP\200\377\35-h\377\30" \ ++ ")d\377\207\31*e\377\202\30)d\377\5%5m\377IV\205\377HU\204\377HT\203\377" \ ++ "FU\204\377\207GU\204\377\4FT\203\377GU\204\377FT\203\377ES\202\377\205" \ ++ "FT\203\377\1ES\203\377\202FT\203\377\207ES\203\377\3DR\202\377ES\203" \ ++ "\377CQ\201\377\205DR\202\377\4DQ\201\377DR\202\377-=r\377\26(c\377\212" \ ++ "\31*e\377\10\30)d\377#3l\377>M~\377BP\201\377BP\200\377BP\201\377BP\200" \ ++ "\377BP\177\377\207BP\200\377\206AO\200\377\3@N\177\377AO\200\377\77M" \ ++ "~\377\207@N\177\377\202\77M~\377\3:I{\377\36.h\377\30)d\377\214\31*e" \ ++ "\377\3\30)d\377$4l\377;I{\377\205=K}\377\1;K}\377\207L}\377\77" \ ++ "M~\3770\77t\377\31*e\377\30)d\377\215\31*e\377\3.=s\377=K}\377s\377-L~\377JW\206\377\203IV\205\377\1HU\204\377\202IV\205\377\2J" \ ++ "W\206\377IV\205\377\211JW\206\377\202IV\206\377\202JW\206\377\202KX\206" \ ++ "\377\1JW\206\377\222KX\206\377\220JW\205\377\225KX\206\377\202JW\206" \ ++ "\377\202IV\206\377\213JW\206\377\202IV\205\377\1HU\204\377\202IV\205" \ ++ "\377\1HU\204\377\202IV\205\377\3""2Av\377\33+f\377\30)d\377\210\31*e" \ ++ "\377\7\30)d\377'7n\377DR\202\377HU\204\377HT\203\377GU\204\377FU\204" \ ++ "\377\210GU\204\377\2FT\203\377ES\202\377\210FT\203\377\2ES\203\377DR" \ ++ "\203\377\207ES\203\377\2DR\202\377CQ\201\377\207DR\202\377\2\40""1j\377" \ ++ "\30)d\377\212\31*e\377\10\30)d\377!1j\377AO\200\377BP\201\377AO\200\377" \ ++ "BP\201\377BP\200\377BP\177\377\206BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\204AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\206@N\177\377" \ ++ "\202\77M~\377\4=K|\377%4l\377\30)d\377\31*d\377\214\31*e\377\4\35-g\377" \ ++ "8Fy\377=K}\377L~\377\205=K}\377\1;K}\377\207L}\377\77M~\377)9p\377\27(c\377\214\31*e\377\202\30)" \ ++ "d\377\1""3Bv\377\205=K}\377\210L~\377=K|\377\202" \ ++ "=K}\377\4s\377\33+f\377\224\31*e\377\3\30)d\377\35.h\3771@v\377\2102Av\377" \ ++ "\2101Au\377\4""0@t\377/\77t\377\35-g\377\30)d\377\230\31*e\377\5\30)" \ ++ "d\377\35-g\377/>t\377-t\377GT\203\377HU\204\377HT\203\377\202GU\204\377\1FU\204\377\206" \ ++ "GU\204\377\4FT\203\377GU\204\377FT\203\377ES\202\377\206FT\203\377\4" \ ++ "ES\203\377FT\203\377ES\203\377DR\203\377\206ES\203\377\3DR\202\377ES" \ ++ "\203\377CQ\201\377\205DR\202\377\5CQ\201\377DR\202\3777Fy\377\31*d\377" \ ++ "\30)d\377\212\31*e\377\7\27(c\377.>s\377BP\201\377AO\200\377BP\200\377" \ ++ "BP\201\377BP\177\377\206BP\200\377\3AO\200\377BP\200\377@N\200\377\207" \ ++ "AO\200\377\2@N\177\377\77M~\377\206@N\177\377\202\77M~\377\3@N\177\377" \ ++ "):p\377\27(d\377\215\31*e\377\4\26(c\377/>t\377=K}\377t\377\202\30" \ ++ ")d\377\230\31*e\377\5\30)d\377#2k\377.=s\377-L}\377@N~\377*:q\377\215" \ ++ "\31*e\377\4\30)d\377\27(d\377*;q\377r\377\202\30)d\377\223\31*e\377\5\30)d\377\34-g\377" \ ++ "4Cw\3772Av\3771@u\377\2062Av\377\2""1Au\3770At\377\2041Au\377\2""0@u" \ ++ "\3771Au\377\2020@u\377\2\32+f\377\30)d\377\230\31*e\377\5\30)d\377\35" \ ++ ".h\377.=s\377-L}\377\77M~\377.>s\377\31*e\377\30)d\377" \ ++ "\214\31*e\377\3\30)d\377%5m\377;J|\377\205=K}\377\2K}\377" \ ++ "\"2k\377\31*e\377\202\30)d\377\211\31*e\377\5\30)d\377\31*e\3779Gy\377" \ ++ "GT\203\377HU\204\377\202HT\203\377\2GU\204\377FU\204\377\207GU\204\377" \ ++ "\4FT\203\377GU\204\377FT\203\377ES\202\377\210FT\203\377\1ES\203\377" \ ++ "\202DR\203\377\206ES\203\377\4DR\202\377ES\203\377DR\202\377CQ\201\377" \ ++ "\205DR\202\377\3CQ\201\377AO\200\377%5m\377\202\30)d\377\212\31*e\377" \ ++ "\3\26'c\377/>t\377CP\201\377\203BP\201\377\2BP\200\377BP\177\377\206" \ ++ "BP\200\377\1AO\200\377\202@N\200\377\206AO\200\377\1@N\177\377\202\77" \ ++ "M~\377\206@N\177\377\6\77M~\377>L}\377;J|\377!1j\377\30)d\377\31*d\377" \ ++ "\214\31*e\377\2\32+f\3770\77u\377\204=K}\377\3L}\377\36.h\377" \ ++ "\30)d\377\215\31*e\377\4\30)d\377.=s\377>L}\377s\377\33,f\377\231\31*e\377\5\30)d\377\36.h\377,;r\377-r\377\30)d\377\224\31*e\377\5\30)d\377\33,g\377/\77t\3772Av\377" \ ++ "1@u\377\2062Av\377\2""1Au\3770At\377\2051Au\377\5""0@u\3771At\3770@u" \ ++ "\377$4m\377\30)d\377\230\31*e\377\6\30)d\377\31*e\377&5m\377.=s\377-" \ ++ "L}\377@N~\377)9p\377\216\31*e\377\4\30)d\377\34.g\377=K}\377<" \ ++ "J|\377\204=K}\377\2t\377\37""0i\377\30)d\377\230\31*e\377\5\30)d\377\32+f\377" \ ++ ")8p\377.=s\377,;q\377\205-L}\377\77M~\3778Gy\377\34-g\377\30)d\377\214\31*e\377\4\30)d\377" \ ++ "\27(d\377/>t\377L~\377-L~\3773Bw\377)9p\377\"2k\377\34,f\377\202\27" \ ++ "(d\377\1\30)d\377\215\31*e\377\10\30)d\377\26'b\377\40""0j\3776Dx\377" \ ++ "DQ\201\377IV\204\377HU\204\377HT\204\377\202GU\204\377\1FU\204\377\210" \ ++ "GU\204\377\1FT\203\377\202GU\204\377\2FT\203\377ES\202\377\207FT\203" \ ++ "\377\2ES\203\377FT\203\377\202ES\203\377\1DR\203\377\210ES\203\377\202" \ ++ "DR\202\377\1CQ\201\377\205DR\202\377\5CQ\201\377FT\203\3773Bv\377\31" \ ++ "*e\377\30)d\377\213\31*e\377\4\27(c\377*9p\377BP\201\377AO\200\377\202" \ ++ "BP\201\377\2BP\200\377BP\177\377\206BP\200\377\203AO\200\377\1@N\200" \ ++ "\377\206AO\200\377\202@N\177\377\1\77M~\377\206@N\177\377\202\77M~\377" \ ++ "\2>L}\377)9p\377\202\30)d\377\214\31*e\377\3\30)d\377\37""0i\3779Hz\377" \ ++ "\204=K}\377\202t\3776Ex\377=K}\377BP\200\377\202ER\202\377\1FS\202\377" \ ++ "\211FS\203\377\11ES\202\377ER\202\377DR\202\377@N\177\377:H{\3774Bw\377" \ ++ "+;r\377#3k\377\32+f\377\202\27(c\377\203\30)d\377\220\31*e\377\202\30" \ ++ ")d\377\4\31*e\377\34-g\3770\77t\377GT\203\377\204HU\204\377\2GU\204\377" \ ++ "FU\204\377\211GU\204\377\1FT\203\377\202GU\204\377\2FT\203\377ES\202" \ ++ "\377\210FT\203\377\4ES\203\377FT\203\377ES\203\377DR\203\377\207ES\203" \ ++ "\377\4DR\202\377ES\203\377DR\202\377CQ\201\377\206DR\202\377\5CQ\201" \ ++ "\377DR\202\377;J|\377\35.h\377\30)d\377\213\31*e\377\5\30)d\377\33,f" \ ++ "\3776Ey\377BP\201\377AO\200\377\202BP\201\377\2BP\200\377BP\177\377\205" \ ++ "BP\200\377\4AO\200\377BP\200\377AO\200\377@N\200\377\207AO\200\377\2" \ ++ "@N\177\377\77M~\377\207@N\177\377\5\77M~\377>L}\377\77L~\377&5m\377\27" \ ++ "(d\377\215\31*e\377\3\30)d\377\36.h\3779Gz\377\205=K}\377\2M~\377!2j\377\30)d\377\214\31*e\377\5\30)d\377/>t\377CQ\202\377AO\200" \ ++ "\377BP\201\377\202BP\200\377\1BP\177\377\205BP\200\377\4AO\200\377BP" \ ++ "\200\377AO\200\377@N\200\377\206AO\200\377\3@N\177\377AO\200\377\77M" \ ++ "~\377\206@N\177\377\203\77M~\377\4@N~\3774Cw\377\27(c\377\31)e\377\215" \ ++ "\31*e\377\4\30)d\377,:q\377>L~\377s\377\202\30)d\377\225\31*e\377\2,L}\377@N\177\377)8o\377\31)d\377\216\31*e\377\4\26" \ ++ "'c\3772Av\377=K}\377L}\377\77M~\3776Ex\377" \ ++ "\34-g\377\30)d\377\214\31*e\377\5\31*d\377\30)d\377\"2k\377=K}\377L}\377=K}\377&6m\377\30)d\377\31)e\377\214\31*e\377\4\30)d\377\31*e" \ ++ "\3774Cw\377L}\377\33+g\377\30)d\377\216" \ ++ "\31*e\377\2\33,f\3775Cw\377\204=K}\377\4t\3772Av\3771@u\377\2062Av\377\2""1Au\3770At\377\2061Au\377\2020@u\377" \ ++ "\2*:q\377\32+f\377\231\31*e\377\4\30)d\377\32+f\377+:q\377-K}\377GT\203\377JW\205\377IV\204\377\202" \ ++ "HU\204\377\1GT\203\377\202HU\204\377\204GU\204\377\203FU\204\377\217" \ ++ "GU\204\377\202FT\203\377\202ES\202\377\211FT\203\377\1ES\203\377\202" \ ++ "FT\203\377\2ES\203\377DR\203\377\210ES\203\377\1DR\202\377\202ES\203" \ ++ "\377\1CQ\201\377\207DR\202\377\5CQ\201\377DR\202\377@N\177\377\"3k\377" \ ++ "\30)d\377\214\31*e\377\202\30)d\377\7,;r\377BP\201\377AO\200\377BP\200" \ ++ "\377BP\201\377BP\200\377BP\177\377\210BP\200\377\2AO\200\377@N\200\377" \ ++ "\210AO\200\377\1\77M~\377\206@N\177\377\7\77M~\377@N\177\377\77M~\377" \ ++ ">L}\377@N~\377%5m\377\30)d\377\216\31*e\377\4\30)d\377&7n\377>M~\377" \ ++ "=J|\377\202=K}\377\3L}\377AO\177\377" \ ++ "ER\202\377IU\204\377KW\206\377JW\205\377JV\205\377IV\204\377\202HU\204" \ ++ "\377\1GT\203\377\203HU\204\377\204GU\204\377\203FU\204\377\216GU\204" \ ++ "\377\2FT\203\377GU\204\377\203FT\203\377\1ES\202\377\212FT\203\377\2" \ ++ "ES\203\377FT\203\377\202ES\203\377\1DR\203\377\212ES\203\377\202DR\202" \ ++ "\377\1CQ\201\377\206DR\202\377\6CQ\201\377DR\202\377>L~\377$4l\377\27" \ ++ ")d\377\30)d\377\214\31*e\377\10\30)d\377'7n\377@N\177\377BP\201\377B" \ ++ "P\200\377BP\201\377BP\200\377BP\177\377\207BP\200\377\202AO\200\377\1" \ ++ "@N\200\377\206AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\207" \ ++ "@N\177\377\5\77M~\377>L}\377@N~\3771@u\377\30)d\377\216\31*e\377\5\30" \ ++ ")d\377\34,g\377:I{\377=K}\377t\377" \ ++ "\37""0i\377\30)d\377\230\31*e\377\202\30)d\377\4$4m\377.=s\377-L}\377\77M~\3779Hz\377\36.h\377\30*e\377\215\31*e\377\5\30*e\377" \ ++ "\27'c\3772@u\377>L}\377L}\377\1(7o\377\202\30)d\377\215\31*e\377" \ ++ "\3\27(d\377$5m\377L}\377\77M~\3774Bv\377\27" \ ++ ")d\377\30)d\377\215\31*e\377\3\30)d\377\33,f\3776Ey\377\204=K}\377\4" \ ++ "s\377\210-" \ ++ "L~\377BP\201\377AO\200\377" \ ++ "BP\200\377BP\201\377BP\200\377BP\177\377\210BP\200\377\2AO\200\377@N" \ ++ "\200\377\206AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\206@" \ ++ "N\177\377\204\77M~\377\3;I{\377\34,g\377\30)d\377\216\31*e\377\3\31*" \ ++ "d\377*9p\377L~\377\40""1j\377\31)e\377\30)d\377\215\31*e\377\3" \ ++ "\30)d\377\37""0i\377@N\200\377\202BP\201\377\3AO\200\377BP\201\377BP" \ ++ "\200\377\202BP\177\377\206BP\200\377\4AO\200\377BP\200\377AO\200\377" \ ++ "@N\200\377\207AO\200\377\1@N\177\377\202\77M~\377\207@N\177\377\6\77" \ ++ "M~\377>L}\377@N~\377)9p\377\31*e\377\30*e\377\216\31*e\377\4\30)d\377" \ ++ "2Av\377=K}\377=K|\377\204=K}\377\2L}\377@N~\377$5m\377\27(d\377\216\31*e\377\5\30)d\377\31+e\377" \ ++ "3Bv\377=K}\377s\377\32+f\377\225\31" \ ++ "*e\377\5\30)d\377\35-g\3770\77u\3773Bw\3771@u\377\2062Av\377\2""1Au\377" \ ++ "0At\377\2061Au\377\2020@u\377\2-=s\377\33,f\377\232\31*e\377\5\30)d\377" \ ++ "\"3k\377.=s\377-L}\377AN\177\377*9p\377\202\30)d\377\216\31*e\377\3\30)d\377(" \ ++ "8o\377L}\377\77M~\377" \ ++ "2Au\377\30)d\377\217\31*e\377\5\30)d\377\36/h\3779Hz\377=K}\377L~\377\212" \ ++ "DR\202\377\202CQ\201\377\1DR\202\377\202ES\203\377\1DR\202\377\214ES" \ ++ "\203\377\202DR\203\377\203ES\203\377\203FT\203\377\1ES\203\377\300FT" \ ++ "\203\377\203ES\203\377\202DR\203\377\214ES\203\377\1DR\202\377\202ES" \ ++ "\203\377\202DR\202\377\1CQ\201\377\210DR\202\377\6CQ\201\377DR\202\377" \ ++ "CQ\202\3776Ex\377\37""0i\377\27(d\377\217\31*e\377\3\30)d\377\33,f\377" \ ++ "2Av\377\202BP\201\377\2BP\200\377BP\201\377\202BP\200\377\1BP\177\377" \ ++ "\210BP\200\377\202AO\200\377\1@N\200\377\210AO\200\377\2@N\177\377\77" \ ++ "M~\377\206@N\177\377\10\77M~\377@N\177\377\77M~\377>L}\377\77M~\3777" \ ++ "Fy\377\34-g\377\30)d\377\216\31*e\377\5\30)d\377\31*e\3773Bv\377>L}\377" \ ++ "L}\377" \ ++ "L}\377L}\377\2@N~\377$4l\377\202\30)d\377\216\31*e\377\5\27(d\377$5l\377<" \ ++ "J|\377=K}\377M~\377$5m\377\202\30)d\377\217\31*e\377\4\30)" \ ++ "d\377\31*e\377(8n\377@N\200\377\202BP\201\377\4BP\200\377BP\201\377B" \ ++ "P\200\377BP\177\377\207BP\200\377\1AO\200\377\202BP\200\377\1@N\200\377" \ ++ "\212AO\200\377\2@N\177\377\77M~\377\206@N\177\377\7\77M~\377@N\177\377" \ ++ "\77M~\377\77M}\377\77M~\377*:p\377\27(c\377\217\31*e\377\3\30)d\377\35" \ ++ ".g\3778Gy\377\206=K}\377\2s\377" \ ++ "\210-L~\377.>s\377\31+e\377\27(c\377\30)d\377\217\31*e\377\3\27)d\377" \ ++ "\33,f\377.=s\377\202BP\201\377\1AO\200\377\202BP\201\377\2BP\200\377" \ ++ "BP\177\377\211BP\200\377\202AO\200\377\1@N\200\377\207AO\200\377\203" \ ++ "@N\177\377\1\77M~\377\206@N\177\377\7\77M~\377@N\177\377\77M~\377>L}" \ ++ "\377\77M~\377.>s\377\27(d\377\221\31*e\377\1""0\77t\377\205=K}\377\202" \ ++ "L}\377" \ ++ "\77M~\3773Av\377\32+f\377\30)d\377\217\31*e\377\2\30)d\377(7o\377\202" \ ++ "=K}\377\1L~\377\202BP\201\377\4AO\200\377BP\200\377BP\201\377" \ ++ "BP\200\377\202BP\177\377\207BP\200\377\4AO\200\377BP\200\377AO\200\377" \ ++ "@N\200\377\207AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\210" \ ++ "@N\177\377\5\77M~\377>L}\377\77M~\3778Fy\377\33,f\377\202\30)d\377\216" \ ++ "\31*e\377\2\30)d\377\40""0i\377\202=K}\377\1t\3772Av\3771@u\377\2062Av\377\1""1Au" \ ++ "\377\2020At\377\2061Au\377\4""0@t\3771Au\377\"3k\377\30)d\377\232\31" \ ++ "*e\377\5\30)d\377&5m\377.=s\377-L}\377\77M~\377;J{\377\34,g\377\30)d\377\217\31*e\377\3\30)d\377" \ ++ "\33,g\377;H{\377\204=K}\377\4s\377\33,f\377\232\31*e\377\6\30" \ ++ ")d\377\31*e\377-s\377L}\377\77M~\377:H{\377\36/h\377\30)d\377\217\31*e\377\5\30" \ ++ ")d\377\32+f\3773Bw\377=K}\377L}\377\77M~\377" \ ++ ";I{\377!1j\377\30)d\377\221\31*e\377\1,;r\377\205=K}\377\203t\377\40""0j\377\30)d\377\231\31" \ ++ "*e\377\202\30)d\377\4)9p\377.=r\377-L}\377\2=K|\377#3k\377\202\30)d\377\217\31*e\377\2\30)d\377%5m\377\202" \ ++ "=K}\377\1s\377\32+f\377\202" \ ++ "\30)d\377\222\31*e\377\202\30)d\377\6\32+e\377,L}\377\77M~\377>L}\377" \ ++ "&6m\377\27(c\377\217\31*e\377\3\30)e\377\30)d\377\36/i\377\202=K}\377" \ ++ "\1t\377:I{\377BP\200\377ES\202" \ ++ "\377DR\202\377CQ\201\377\217DR\202\377\204CQ\201\377\204DR\202\377\232" \ ++ "ES\203\377\1DR\202\377\207ES\203\377\205DR\202\377\204CQ\201\377\216" \ ++ "DR\202\377\1CQ\201\377\202DR\202\377\6ES\202\377\77M~\3776Ex\377(8o\377" \ ++ "\31*e\377\26'c\377\202\30)d\377\222\31*e\377\202\30)d\377\3$4l\3778F" \ ++ "z\377CQ\202\377\202BP\201\377\2BP\200\377BP\201\377\202BP\200\377\1B" \ ++ "P\177\377\210BP\200\377\2AO\200\377BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\207AO\200\377\3@N\177\377AO\200\377@N\177\377\202\77M~\377\206@N\177" \ ++ "\377\10\77M~\377@N\177\377\77M~\377>L}\377\77M~\377=K|\377&6m\377\26" \ ++ "'c\377\220\31*e\377\5\27)d\377\36/h\3779H{\377=K}\377t\377\32" \ ++ "*e\377\30)d\377\231\31*e\377\5\30)d\377\33+f\377)9o\377.=s\377,;q\377" \ ++ "\207-L~\377GT\204\377ES\202" \ ++ "\377DR\202\377CQ\201\377\220DR\202\377\204CQ\201\377\207DR\202\377\224" \ ++ "ES\203\377\210DR\202\377\205CQ\201\377\217DR\202\377\12CQ\201\377DR\202" \ ++ "\377FT\203\377DR\202\3777Gy\377*9p\377\40""1j\377\31*e\377\27(d\377\30" \ ++ ")d\377\223\31*e\377\10\30)d\377\26(c\377\37""0i\3773Bw\377@N\177\377" \ ++ "CQ\201\377BP\201\377AO\200\377\202BP\201\377\1BP\200\377\202BP\177\377" \ ++ "\210BP\200\377\2AO\200\377BP\200\377\202AO\200\377\1@N\200\377\207AO" \ ++ "\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\207@N\177\377\10\77" \ ++ "M~\377@N\177\377\77M~\377>L}\377\77M~\377=K|\377%5m\377\30)d\377\220" \ ++ "\31*e\377\5\30)d\377\34-g\3775Dx\377=K}\377M~\377\202BP\201\377\2AO\200\377BP\201\377\204BP\200\377" \ ++ "\1BP\177\377\210BP\200\377\3AO\200\377BP\200\377AO\200\377\202@N\200" \ ++ "\377\207AO\200\377\4@N\177\377AO\200\377@N\177\377\77M~\377\211@N\177" \ ++ "\377\1\77M~\377\202>L}\377\2=L}\377&6m\377\202\30)d\377\220\31*e\377" \ ++ "\2\32+e\3770@t\377\205=K}\377\202M~\3771@t\377\40""0i\377\26'c\377\202\30)d\377" \ ++ "\225\31*e\377\202\30)d\377\10\31*e\377\"2k\377;J|\377CQ\202\377BP\201" \ ++ "\377AO\200\377BP\200\377BP\201\377\202BP\200\377\1BP\177\377\211BP\200" \ ++ "\377\2AO\200\377BP\200\377\202AO\200\377\1@N\200\377\210AO\200\377\4" \ ++ "@N\177\377AO\200\377@N\177\377\77M~\377\207@N\177\377\10\77M~\377@N\177" \ ++ "\377\77M~\377>L}\377\77M~\377=L}\377&7n\377\27(c\377\220\31*e\377\5\30" \ ++ ")d\377\31*e\377+:q\377\77L~\377L~\377" \ ++ "*:q\377\35.h\377\27)d\377\30)d\377\226\31*e\377\12\30)d\377\27(d\377" \ ++ "\26'c\377\33,f\377'7n\3772Au\3779H{\377\77M~\377DR\202\377ES\202\377" \ ++ "\203DR\202\377\1CQ\201\377\266DR\202\377\12ES\202\377ES\203\377BP\200" \ ++ "\377L}\377\77M~\377L~\3775Dw\377+;q\377$4l\377\36/i\377\30*d\377\27(d\377\202\30)d\377" \ ++ "\227\31*e\377\11\30)d\377\26'c\377\"2k\3774Cw\377\77M\177\377CP\201\377" \ ++ "BP\201\377AO\201\377BP\200\377\202BP\201\377\202BP\200\377\1BP\177\377" \ ++ "\213BP\200\377\2AO\200\377@N\200\377\210AO\200\377\2@N\177\377AO\200" \ ++ "\377\202@N\177\377\1\77M~\377\207@N\177\377\10\77M~\377@N\177\377\77" \ ++ "M~\377>L}\377\77M~\377;I{\377#3k\377\30)d\377\220\31*e\377\6\30)d\377" \ ++ "\27(d\377(9o\377M~\377):p\377\203\30)d\377\227\31*e\377\1\30)e\377\203\30" \ ++ ")d\377\11\31*e\377\32+f\377\34,g\377!2k\377-;r\3777Fy\377AO\200\377E" \ ++ "S\203\377ES\202\377\203DR\202\377\1CQ\201\377\243DR\202\377\1CQ\201\377" \ ++ "\202DR\202\377\1ER\202\377\202ES\203\377\7=L~\3772Bv\377'7o\377\35.g" \ ++ "\377\33,f\377\32+e\377\31*e\377\204\30)d\377\227\31*e\377\5\30)d\377" \ ++ "\27(d\377\35.h\3775Dx\377\77N\177\377\202BP\201\377\202AO\200\377\202" \ ++ "BP\201\377\202BP\200\377\202BP\177\377\211BP\200\377\204AO\200\377\1" \ ++ "@N\200\377\211AO\200\377\1@N\177\377\202\77M~\377\211@N\177\377\5\77" \ ++ "M~\377>L}\377\77M~\377t\377\37""0i\377\30)d\377\232\31*e\377\5\30)d\377!1j\377" \ ++ ".=s\377-s\3777Fy\377\77M~" \ ++ "\377\202AO\200\377\3BP\200\377BQ\201\377CQ\201\377\232DR\202\377\202" \ ++ "CQ\201\377\13BP\201\377BP\200\377AO\200\377@O\177\377L}\377\77M~\377t\3773Bv\3776Ex\3778Fy\3779H{\377;I|\377L}\377\77M~" \ ++ "\377\77N\177\377@N\177\377\203AO\200\377\1BO\200\377\202AO\200\377\23" \ ++ "@O\200\377@N\177\377\77M\177\377>M~\377=K}\377L}" \ ++ "\377\77M~\3776Ex\377\35-g\377\30)d\377\221\31*e\377\5\27(d\377!1j\377" \ ++ ":H{\377=K}\377L}\377\77M~\3772Au\377\34" \ ++ "-g\377\30)d\377\221\31*e\377\5\27(c\377!1j\3779Gz\377=K}\377L}\377\3\77M~\3770\77t\377\31*e\377\202" \ ++ "\30)d\377\220\31*e\377\5\30)d\377\40""0i\3778Fz\377=K}\377L}\377\77M~\377>L~\377,;p\377\26'c\377\222\31*e\377" \ ++ "\5\30)d\377\36.h\3777Fy\377=K}\377s\377" \ ++ "\210-L}\377\77" \ ++ "M~\377;I|\377&5m\377\27(d\377\222\31*e\377\5\27(d\377\36/i\3777Ey\377" \ ++ ">L}\377s\377\27(d\377\30)d\377\225" \ ++ "\31*e\377\5\30)d\377\31*e\377*9p\3773Bw\3771@u\377\2062Av\377\3""1Au" \ ++ "\3772Av\3770At\377\2061Au\377\2030@u\377\2\37/i\377\30)d\377\232\31*" \ ++ "e\377\4\30*d\377\31*e\377*:q\377.=s\377\210-L~\377CQ\201\377" \ ++ "\202BP\201\377\3AO\200\377BP\201\377BP\200\377\202BP\201\377\203BP\200" \ ++ "\377\1BP\177\377\213BP\200\377\2AO\200\377BP\200\377\202AO\200\377\1" \ ++ "@N\200\377\211AO\200\377\1@N\177\377\202AO\200\377\1@N\177\377\202\77" \ ++ "M~\377\210@N\177\377\203\77M~\377\4>L}\377@M~\3778Gy\377\40""1j\377\202" \ ++ "\30)d\377\221\31*e\377\5\27(c\377\40""1j\3777Fy\377=K}\377t\377\2078Fz\377\2107Fy\377\3""6Ex\3777Fy\3775Dw\377" \ ++ "\2066Ex\377\3""5Dw\377\34-g\377\30)d\377\227\31*e\377\1\37/i\377\202" \ ++ "2Av\377\1""1@u\377\2052Av\377\4""1Au\3772Av\3771Au\3770At\377\2051Au" \ ++ "\377\5""0@u\3771At\3770@u\377*9p\377\32+e\377\233\31*e\377\3\30)d\377" \ ++ "\40""0i\377/=s\377\207-L}\377@N\177\3774Bv\377\32+f\377\202\30)d\377\221\31*e\377\5\30" \ ++ ")d\377\40""0j\3778Gz\377=K}\377L}\377\77M~\377>L}\377" \ ++ ",;r\377\30)d\377\222\31*e\377\202\30)d\377\4\37""0i\3779Gz\377=K}\377" \ ++ "s\377\33,f\377\227\31*e\377\5\30)d\377\40""0j\377" \ ++ "4Cx\3772Av\3771@u\377\2072Av\377\2101Au\377\5""0@u\377/\77u\377+;q\377" \ ++ "\32*e\377\30)d\377\232\31*e\377\5\30)d\377\37""0j\377.=s\377-L}\377\77M~\377:H{\377&6m\377\202" \ ++ "\30)d\377\221\31*e\377\6\30)d\377\27)d\377\"2k\377:H{\377=K}\377L~\377\202CQ\201\377\202BP\201\377\1AO\200\377\202BP\201\377\1BP\200" \ ++ "\377\202BP\201\377\203BP\200\377\203BP\177\377\214BP\200\377\2AO\200" \ ++ "\377BP\200\377\202AO\200\377\202@N\200\377\212AO\200\377\2@N\177\377" \ ++ "AO\200\377\202@N\177\377\1\77M~\377\211@N\177\377\2\77M~\377@N\177\377" \ ++ "\202\77M~\377\4\77M}\377AN\177\3773Bv\377\37/i\377\202\30)d\377\221\31" \ ++ "*e\377\6\30)d\377\27(d\377&6m\377:H{\377=K}\377L~\3778Fz\377" \ ++ "->s\377%4m\377\33,g\377\27(c\377\27(d\377\27)d\377\203\30)d\377\243\31" \ ++ "*e\377\203\30)d\377\12\27(d\377\27(c\377\30)e\377\37""0i\377)9p\3773" \ ++ "Av\377L}\377\202\77M~\377\2+:q\377\32+f\377\202\30)d\377\222" \ ++ "\31*e\377\5\30)d\377'6n\377;I{\377=K}\377" \ ++ "K}\377=K}\377t\377+;q\377" \ ++ "(8o\377&6n\377%5m\377$4l\377#3k\377\"2k\377!1j\377\40""1j\377\40""0j" \ ++ "\377\204\37""0i\377\20\40""0i\377\40""0j\377\40""1j\377!1j\377\"2k\377" \ ++ "#3l\377$4m\377%5n\377'7o\377*9q\377-L}\377\77M~\377>L}\3772Av\377\35.g\377\27" \ ++ "(c\377\31*d\377\222\31*e\377\6\30)d\377\32+e\377+;r\377>L~\377=K}\377" \ ++ "s\377\31*e\377\30)d\377\223\31*e\377\5\30)d\377\32+f\377" \ ++ "2@u\3778Fz\3777Ey\377\2058Fz\377\2027Fy\377\1""6Fx\377\2057Fy\377\2""6" \ ++ "Ex\3777Fy\377\2066Ex\377\4""5Ew\3776Ex\377+:p\377\30)d\377\230\31*e\377" \ ++ "\4\36/i\3771Av\3772Av\3771@u\377\2072Av\377\2""1Au\3770At\377\2051Au" \ ++ "\377\6""0@u\3771At\3770@u\377/\77t\377\35.g\377\30)d\377\234\31*e\377" \ ++ "\2$4l\377/=s\377\207-M~\377=L~\377=K}\377\202L~\377\77M\177\377@N\177\377AO\200\377BP" \ ++ "\201\377\202CQ\202\377\202CQ\201\377\214BP\201\377\1BP\200\377\204BP" \ ++ "\201\377\203BP\200\377\204BP\177\377\217BP\200\377\2AO\200\377BP\200" \ ++ "\377\203AO\200\377\202@N\200\377\213AO\200\377\2@N\177\377AO\200\377" \ ++ "\202@N\177\377\202\77M~\377\213@N\177\377\202\77M~\377\6>L}\377@M~\377" \ ++ ";I{\377&6n\377\31*e\377\30)d\377\223\31*e\377\6\30)d\377\34,g\3771@u" \ ++ "\377=K}\377=K|\377L}\377" \ ++ "\3@N~\3775Cw\377\35.g\377\202\30)d\377\223\31*e\377\3\30)d\377\34,g\377" \ ++ "5Dx\377\202=K}\377\1s\377\36/h\377" \ ++ "\30)d\377\233\31*e\377\5\30)d\377&5m\377.=s\377-L}\377\77M}\377>M~\377=K|\377(8n\377" \ ++ "\27(c\377\30)d\377\223\31*e\377\202\30)d\377\4\37.i\3779I{\377=K}\377" \ ++ "L}\377\77M~\377\214@N\177\377\202\77M" \ ++ "~\377\202@N\177\377\202AO\200\377\1@N\177\377\214AO\200\377\203@N\200" \ ++ "\377\203AO\200\377\202BP\200\377\1AO\200\377\225BP\200\377\205BP\177" \ ++ "\377\212BP\200\377\216BP\201\377\212BP\200\377\206BP\177\377\225BP\200" \ ++ "\377\1AO\200\377\202BP\200\377\203AO\200\377\202@N\200\377\215AO\200" \ ++ "\377\2@N\177\377AO\200\377\203@N\177\377\1\77M~\377\212@N\177\377\2\77" \ ++ "M~\377@N\177\377\202\77M~\377\6>L}\377\77M~\377>L}\3772Au\377\35.h\377" \ ++ "\27(d\377\224\31*e\377\6\30)d\377\31*e\377&5m\377t\377\33,f\377\30)d\377\232" \ ++ "\31*e\377\202\30)d\377\4&6n\377.=s\377-t\3779Fz\3777Ey\377\2068Fz\377\2""7Fy\377" \ ++ "6Fx\377\2077Fy\377\2""6Ex\3775Dw\377\2076Ex\377\2\40""1i\377\30)d\377" \ ++ "\227\31*e\377\2\30)d\377\40""1j\377\2022Av\377\1""1@u\377\2072Av\377" \ ++ "\2""1Au\3770At\377\2051Au\377\6""0@u\3771Au\3770@t\3771Au\377#4l\377" \ ++ "\27(d\377\233\31*e\377\3\30)d\377\35-g\377,;r\377\202-L}\377\77M~\377>L~\377*;p\377" \ ++ "\33,f\377\202\30)d\377\224\31*e\377\3\30)d\377\31+e\3774Cw\377\210=K" \ ++ "}\377\1L~\377\77" \ ++ "M~\377>L}\377\77M~\377\202@N\177\377\1\77M~\377\213@N\177\377\202\77" \ ++ "M~\377\202@N\177\377\222AO\200\377\202@N\200\377\204AO\200\377\203BP" \ ++ "\200\377\1AO\200\377\300BP\200\377\1AO\200\377\203BP\200\377\204AO\200" \ ++ "\377\203@N\200\377\216AO\200\377\1@N\177\377\202AO\200\377\202@N\177" \ ++ "\377\202\77M~\377\213@N\177\377\1\77M~\377\202@N\177\377\202\77M~\377" \ ++ "\5>L}\377\77M~\377>L}\3777Ey\377\37/i\377\202\30)d\377\224\31*e\377\202" \ ++ "\30)d\377\4\37""0j\377:I{\377=K}\377s\377\33,f\377\230\31*e\377\3\30)d\377#2k\3774Cw\377" \ ++ "\2072Av\377\3""1Au\3772Av\3770At\377\2061Au\377\2""0@u\3771At\377\202" \ ++ "0@u\377\2\36/i\377\30)d\377\233\31*e\377\5\30)d\377\34-g\377+;q\377." \ ++ "=s\377,;q\377\207-L}\377\202\77M~\377\4""7" \ ++ "Fy\377'7n\377\27(d\377\30)d\377\225\31*e\377\6\30)d\377\31*e\377(8o\377" \ ++ ";I|\377=K}\377s\377-L}\377\202\77M~\377\2@N\177\377\77M~\377\213@N\177\377\203\77M~\377" \ ++ "\202@N\177\377\223AO\200\377\204@N\200\377\204AO\200\377\204BP\200\377" \ ++ "\1AO\200\377\260BP\200\377\1AO\200\377\205BP\200\377\204AO\200\377\203" \ ++ "@N\200\377\220AO\200\377\1@N\177\377\202AO\200\377\202@N\177\377\203" \ ++ "\77M~\377\213@N\177\377\1\77M~\377\202@N\177\377\202\77M~\377\5\77M}" \ ++ "\377@N\177\377;I{\377(8o\377\33,g\377\202\30)d\377\225\31*e\377\6\27" \ ++ "(d\377\33-f\3771@u\377s\377\36/i\377\30)d\377\233\31*e\377\2\30" \ ++ ")d\377\33,f\377\212-L}\377\202\77M~\377\3+;q\377\33" \ ++ ",f\377\31*e\377\202\30)d\377\224\31*e\377\4\30)d\377\27(c\377\"2j\377" \ ++ "9G{\377\202=K}\377\1L}\377" \ ++ "\77M~\377>L}\377\203\77M~\377\2@N\177\377\77M~\377\215@N\177\377\1\77" \ ++ "M~\377\203@N\177\377\203AO\200\377\1@N\177\377\225AO\200\377\204@N\200" \ ++ "\377\207AO\200\377\234BP\200\377\207AO\200\377\205@N\200\377\230AO\200" \ ++ "\377\203@N\177\377\202\77M~\377\214@N\177\377\1\77M~\377\202@N\177\377" \ ++ "\202\77M~\377\1>L}\377\202\77M~\377\5=K|\3772Au\377\34,g\377\30)d\377" \ ++ "\31)d\377\225\31*e\377\7\31)e\377\30)d\377\32+f\377)9p\377L}\377\202\77M~\377\202@N\177\377\1\77M~\377" \ ++ "\214@N\177\377\203\77M~\377\203@N\177\377\203AO\200\377\1@N\177\377\226" \ ++ "AO\200\377\207@N\200\377\234AO\200\377\207@N\200\377\227AO\200\377\1" \ ++ "@N\177\377\202AO\200\377\203@N\177\377\203\77M~\377\215@N\177\377\2\77" \ ++ "M~\377@N\177\377\202\77M~\377\7>L}\377\77M~\377@N~\377;I{\3772@u\377" \ ++ "!2j\377\26(c\377\202\30)d\377\225\31*e\377\7\30)d\377\27)d\377\37/i\377" \ ++ "1@u\377>L}\377=K}\377L}\377\202" \ ++ "\77M~\377\202@N\177\377\1\77M~\377\215@N\177\377\202\77M~\377\204@N\177" \ ++ "\377\236AO\200\377\235@N\200\377\232AO\200\377\1@N\177\377\203AO\200" \ ++ "\377\203@N\177\377\203\77M~\377\214@N\177\377\1\77M~\377\203@N\177\377" \ ++ "\202\77M~\377\5\77M}\377@N~\377>L}\377.=s\377!1j\377\202\30)d\377\1\31" \ ++ ")d\377\226\31*e\377\7\30)d\377\30*d\377)9o\3779Gz\377>L}\377=J}\377<" \ ++ "J|\377\203=K}\377\2M~\377.=s\377\34-f\377\31*e\377\202\30)d\377\227\31*e\377" \ ++ "\6\30)d\377\34,f\3773Bv\377L}\377\202\77M~\377\203" \ ++ "@N\177\377\1\77M~\377\217@N\177\377\203\77M~\377\204@N\177\377\203AO" \ ++ "\200\377\1@N\177\377\276AO\200\377\1@N\177\377\204AO\200\377\204@N\177" \ ++ "\377\203\77M~\377\217@N\177\377\1\77M~\377\202@N\177\377\202\77M~\377" \ ++ "\1>L}\377\202\77M~\377\4>L}\377;J{\377/>s\377\33,f\377\202\30)d\377\227" \ ++ "\31*e\377\202\30)d\377\5\31*e\377$3l\377;J|\377=K}\377" \ ++ "L}\377\203\77M~\377\202@N\177\377\1\77M~\377\220@N\177\377\203\77M~\377" \ ++ "\204@N\177\377\204AO\200\377\1@N\177\377\266AO\200\377\1@N\177\377\204" \ ++ "AO\200\377\205@N\177\377\203\77M~\377\220@N\177\377\1\77M~\377\202@N" \ ++ "\177\377\204\77M~\377\6@M~\377>L}\3776Ex\377+:p\377\34,g\377\26'c\377" \ ++ "\202\30)d\377\227\31*e\377\202\30)d\377\5\37""0i\3771@t\377>L~\377=K" \ ++ "}\377L}\377\77M~\377AN\177\377=L}\3770\77t\377$3" \ ++ "l\377\33,f\377\27(d\377\30)d\377\231\31*e\377\4\27)d\377\31*e\377+:q" \ ++ "\3779Gz\377\206=K}\377\1L~\377\77M~\377" \ ++ "@N~\377;I|\377*9p\377\33,g\377\32*e\377\203\30)d\377\230\31*e\377\5\30" \ ++ ")d\377\27(d\377!2k\3777Gy\377L}\377\77M~\377>L}\377" \ ++ "\203\77M~\377\203@N\177\377\1\77M~\377\226@N\177\377\206\77M~\377\210" \ ++ "@N\177\377\224AO\200\377\211@N\177\377\206\77M~\377\231@N\177\377\203" \ ++ "\77M~\377\1>L}\377\202\77M~\377\4>L}\377=K|\3775Dx\377$4l\377\203\30" \ ++ ")d\377\232\31*e\377\4\30)d\377\31*e\377\34,g\377.t\377\32*f\377\30)d\377\230\31*e\377\3\30)d\377\"2k\3773Cw\377" \ ++ "\2112Av\377\2""1Au\3770At\377\2071Au\377\5""0@t\3770@u\377/\77t\377\32" \ ++ "+f\377\30)d\377\233\31*e\377\202\30)d\377\4%5m\377.=s\377-L~\377@N~\377\77M~\377>L}\377\203\77M~\377\203" \ ++ "@N\177\377\1\77M~\377\231@N\177\377\210\77M~\377\224@N\177\377\211\77" \ ++ "M~\377\231@N\177\377\1\77M~\377\202@N\177\377\203\77M~\377\1>L}\377\202" \ ++ "\77M~\377\10@N~\377;J{\3775Cw\377,;q\377\36/h\377\26'c\377\27)d\377\30" \ ++ ")d\377\232\31*e\377\10\30)d\377\27(d\377\33,g\377'7n\3778Fz\377>L~\377" \ ++ "=K}\377s\377\32,f\377\30)d\377\226\31*" \ ++ "e\377\5\30)d\377\35.h\3773Bw\3778Fz\3777Ey\377\2058Fz\377\2037Fy\377" \ ++ "\1""6Fx\377\2077Fy\377\2""6Ex\3775Dw\377\2056Ex\377\5""5Dw\3776Ex\377" \ ++ "2Au\377\34-g\377\30)d\377\230\31*e\377\4\30)d\377\34-g\3772Av\3773Bw" \ ++ "\377\2072Av\377\3""1Au\3772Av\3770At\377\2061Au\377\2""0@u\3771Au\377" \ ++ "\2020@u\377\2!2k\377\30)d\377\234\31*e\377\5\30)d\377\35.h\377,;r\377" \ ++ ".=s\377,;q\377\207-L}\377\77M~\377@N\177\377\77M~\3774Cw\377(8o\377" \ ++ "\40""1j\377\32+f\377\27(d\377\202\30)d\377\233\31*e\377\4\30)d\377\27" \ ++ "(d\377%5m\3774Cw\377\202=K}\377\1t\3773Bw\3772Av\3771@u\377\2052Av" \ ++ "\377\4""1Au\3772Av\3771Au\3770At\377\2071Au\377\3""0@t\3770@u\377)9p" \ ++ "\377\235\31*e\377\6\30)d\377\31*e\377&6n\377.=s\377-s\377" \ ++ "=J|\377@N\177\377\206\77M~\377\203@N\177\377\1\77M~\377\313@N\177\377" \ ++ "\1\77M~\377\203@N\177\377\203\77M~\377\1>M~\377\203\77M~\377\5""6Ex\377" \ ++ "(8o\377\34,g\377\32+e\377\31*e\377\202\30)d\377\1\31*d\377\233\31*e\377" \ ++ "\5\30)d\377\27(c\377\36/i\3774Cw\377s\377\36.h\377\30)d\377\234\31*e\377\5\30)e" \ ++ "\377\35.h\377-=r\377.=s\377,;q\377\206-L}\377\203\77M~\377\1>L}\377\204\77M~" \ ++ "\377\204@N\177\377\1\77M~\377\301@N\177\377\204\77M~\377\202>L}\377\202" \ ++ "\77M~\377\7>L}\377=K}\377s\377>K}\377" \ ++ "=K}\377L~\3773Bw" \ ++ "\377$4l\377\32+e\377\27)d\377\30)d\377\236\31*e\377\202\30)d\377\13\26" \ ++ "(c\377\27)d\377\40""1j\377*:p\3772Au\3778Fy\377L}\377\202\77M~\377\13@N~\377\77M}\377:H{\3775Dw\377" \ ++ "/>t\377%6m\377\34-f\377\26'c\377\27(d\377\30)d\377\30)e\377\235\31*e" \ ++ "\377\202\30)d\377\5\27)d\377\36/h\377*:p\377:H{\377>L~\377\206=K}\377" \ ++ "\1t\3773Bw\3771@u\377\2062" \ ++ "Av\377\4""1Au\3772Av\3771Au\3770At\377\2051Au\377\7""0@u\3771Au\3770" \ ++ "@t\3770@u\377+t\377\207-t\377" \ ++ "7Fy\377\77M~\377AO\177\377@N~\377\77M~\377>L}\377\205\77M~\377\260@N" \ ++ "\177\377\1\77M~\377\205@N\177\377\205\77M~\377\1>L}\377\202\77M~\377" \ ++ "\11@N\177\377AN\177\377L}\377=K}\377L}\377\202" \ ++ "\77M~\377\11@N~\377@N\177\377=K|\3773Bu\377)9o\377\37""0i\377\33,f\377" \ ++ "\32+f\377\31*e\377\204\30)d\377\240\31*e\377\11\30)d\377\27)d\377\32" \ ++ "*e\377-L~\3774Dw\377!2j\377" \ ++ "\32*e\377\31*d\377\202\30)d\377\243\31*e\377\203\30)d\377\12\27(d\377" \ ++ "\30)e\377\40""0i\377)9o\3771@u\3779Hz\377L}\377" \ ++ "\205\77M~\377\1\77M}\377\202>L}\377\240\77M~\377\203>L}\377\205\77M~" \ ++ "\377\202>L}\377\7=K}\377L~\3774Bw\377&6m\377\35-g\377\27(d\377\202\30)d\377\245\31*e\377\202" \ ++ "\30)d\377\17\27(d\377\27(c\377\26'c\377\32,f\377\40""1j\377&6m\377+:" \ ++ "q\3770\77t\3773Bv\3776Dx\3778Gy\377:I{\377=K|\377\77M~\377@N\177\377" \ ++ "\202@N~\377\210\77M~\377\1\77L}\377\213>L}\377\210\77M~\377\22@M~\377" \ ++ "@N~\377@N\177\377@N~\377>L}\377L~\377=K}\377s\377\35.h\377\30)d\377\234\31*e\377\6\30" \ ++ ")d\377\32+e\377(8o\377.=s\377-K}\377\77M~\377@N\177\377\213AO\177\377\24@N~\377" \ ++ ">L}\377=K|\377;I{\3779Gz\3777Ey\3774Cw\3771Au\377/>s\377,;q\377(8o\377" \ ++ "&5m\377#3l\377!1j\377\37""0i\377\35-g\377\32+e\377\30)d\377\27(c\377" \ ++ "\27(d\377\203\30)d\377\250\31*e\377\12\30)d\377\27(d\377\30)d\377$5m" \ ++ "\3771@u\377:H{\377>L}\377=K}\377L~\3774Cw\377\"2k\377\32+f\377\31*e\377\202\30)d\377\1\31*d\377\271" \ ++ "\31*e\377\212\30)d\377\272\31*e\377\203\30)d\377\4\32+e\377\34-g\377" \ ++ "+:p\377;I|\377\202=K}\377\1L~\3777Ey\377*9p\377!1j\377\32+e\377\27(d\377\30)d\377" \ ++ "\372\31*e\377\203\30)d\377\7\35.h\377$4l\3770\77t\377L~\377=" \ ++ "K}\377=K|\377\206=K}\377\2L}\377:H{\3773Bv\377)9p\377\35.h\377\26'c\377\202\30)d\377\365\31*e" \ ++ "\377\7\30)d\377\27(c\377\30)d\377#3l\377/>s\3777Ey\377=K|\377\202=K}" \ ++ "\377\1L}\377:I|\377" \ ++ "-=s\377\37""0i\377\32+f\377\31*e\377\203\30)d\377\346\31*e\377\203\30" \ ++ ")d\377\6\31*d\377\32+e\377\34-g\377%6n\3775Cw\377>L~\377\202=K}\377\1" \ ++ "L}\377>L~\3777Ey\377,;r\377#3l\377" \ ++ "\36/h\377\31*d\377\27(d\377\202\30)d\377\340\31*e\377\1\31*d\377\202" \ ++ "\30)d\377\11\27(d\377\33,f\377\40""1j\377'7n\3772@u\377L}\377L}\377" \ ++ "\202=K}\377\1s\377\31*e\377\202\30)d\377\231\31*e\377\4" \ ++ "\30)d\377\37/i\3770\77u\3773Bw\377\2021@u\377\2052Av\377\4""1Au\3772" \ ++ "Av\3771Au\3770At\377\2101Au\377\5""0@t\3770@u\377)9p\377\32+e\377\30" \ ++ ")d\377\235\31*e\377\2\30)d\377\36.h\377\202-L}\377" \ ++ "=K}\3772Av\377'8o\377\35.h\377\33+f\377\32+e\377\31*e\377\204\30)d\377" \ ++ "\306\31*e\377\205\30)d\377\7\31*e\377\32+f\377\33,f\377\"2k\377-L}\377\202=K}\377\2r\377\31*e\377\30)d\377\232\31*e\377\5\30)d\377\34,g\377" \ ++ ".=s\3773Bw\3771@u\377\2102Av\377\2""1Au\3770At\377\2061Au\377\7""0@u" \ ++ "\3771Au\3770@t\3770@u\377-=s\377\35.h\377\30)d\377\235\31*e\377\6\30" \ ++ ")d\377\32*e\377*9p\377.=s\377-L~\377\10""9Gz\3770@u\377" \ ++ ")8p\377#3l\377\37""0i\377\34,g\377\30)d\377\27(d\377\204\30)d\377\275" \ ++ "\31*e\377\203\30)d\377\202\27(d\377\11\32+e\377\36.h\377!2j\377&6n\377" \ ++ ",L}\377\214=K}\377\1s\377\2108Fz\377\4""7Fy\3778Fz\3777Fy\3776Fx\377\2077Fy\377" \ ++ "\4""6Ex\3777Fy\3776Ex\3775Dw\377\2066Ex\377\5""5Dw\3776Ex\377-=r\377" \ ++ "\32+f\377\30)d\377\232\31*e\377\4\30)d\377\32+e\377+;r\3774Cw\377\210" \ ++ "2Av\377\4""1Au\3772Av\3771Au\3770At\377\2051Au\377\7""0@u\3771Au\377" \ ++ "0@u\3770@t\377/\77u\377!2j\377\30)d\377\235\31*e\377\6\30)d\377\31*e" \ ++ "\377$4l\377-L}\377s\3773Bv\3777Ey\377:I{\377\202>L}" \ ++ "\377\202=K}\377\1L}\377>L~\377L}\377\1>K}\377\203" \ ++ "=K}\377\1t\377\33,f\377" \ ++ "\202\30)d\377\232\31*e\377\4\30)e\377\30)d\377\33+f\377+;r\377\2108F" \ ++ "z\377\3""7Fy\3778Fz\3777Fy\377\2026Fx\377\2077Fy\377\4""6Ex\3777Fy\377" \ ++ "6Ex\3775Dw\377\2106Ex\377\2+;q\377\30)d\377\233\31*e\377\3\30)d\377\31" \ ++ "*e\377$5m\377\2022Av\377\1""1@u\377\2062Av\377\4""1Au\3772Av\3771Au\377" \ ++ "0At\377\2061Au\377\2""0@u\3771Au\377\2020@u\377\2+;r\377\32+f\377\236" \ ++ "\31*e\377\202\30)d\377\4$4m\377.=s\377-K}\377" \ ++ "\202>L~\377\17\77M~\377>L~\377;I{\3777Fy\3775Cw\3771@v\377.>t\377,L~\377>L}\377\227=K}\377\203" \ ++ "s\377\36/h\377\30" \ ++ ")d\377\235\31*e\377\4\31*d\377\30)d\377\37""0i\377.=s\377\202-K}\377\203>L}\377\5>L~\377=K}\377L~\377\203>L}\377\1>K}\377\205=K}\377\1t\3773Bw\3771@u\377\210" \ ++ "2Av\377\2021Au\377\1""0At\377\2061Au\377\2""0@u\3771Au\377\2020@u\377" \ ++ "\2+;q\377\32+f\377\237\31*e\377\4\30)d\377\33,f\377,t\377\2028Fz\377\1""7Ey\377\2068Fz\377\2047Fy\377\1""6Fx\377\2077F" \ ++ "y\377\2""6Ex\3777Fy\377\2026Ex\377\1""5Dw\377\2056Ex\377\4""5Dw\3776" \ ++ "Ex\3773Bv\377\40""0i\377\202\30)d\377\233\31*e\377\4\30)d\377\33,f\377" \ ++ ".>s\3773Bw\377\2112Av\377\2021Au\377\1""0At\377\2061Au\377\7""0@u\377" \ ++ "1Au\3770@u\377/\77u\377-=s\377\34-g\377\30)d\377\236\31*e\377\6\30)d" \ ++ "\377\31*e\377)9p\377.=s\377-t\3778Fz\3777Ey\377\2108Fz\377\2027Fy\377" \ ++ "\1""6Fx\377\2107Fy\377\1""6Ex\377\2027Fy\377\1""5Dw\377\2066Ex\377\1" \ ++ "5Dw\377\2026Ex\377\3.>s\377\32+f\377\30)d\377\233\31*e\377\202\30)d\377" \ ++ "\5\33+f\377.=t\3773Bw\3772Av\3771@u\377\2062Av\377\1""1Au\377\2022Av" \ ++ "\377\1""0At\377\2101Au\377\5""0@t\377/\77u\3770@u\377!1j\377\30)d\377" \ ++ "\236\31*e\377\202\30)d\377\1\40""0j\377\202-t\3777Ey\3778Fz\3777Ey\3777Fz\377\2058Fz\377\1""7Fy\377\2028Fz\377\2" \ ++ "7Fy\3776Fx\377\2107Fy\377\2""6Ex\3777Fy\377\2026Ex\377\1""5Dw\377\205" \ ++ "6Ex\377\6""5Dw\3776Ex\3777Ex\377&6n\377\31*e\377\30)d\377\234\31*e\377" \ ++ "\6\30)d\377\32*f\377,;r\3773Bw\3772Av\3771@u\377\2102Av\377\2021Au\377" \ ++ "\1""0At\377\2061Au\377\2""0@u\3771Au\377\2020@u\377\1&7n\377\240\31*" \ ++ "e\377\6\31*d\377\30*e\377(8o\377.=s\377-s\377\36.h\377\32+e\377\203\30)d\377\237\31*e\377\4\30)d\377\30*" \ ++ "d\377'7n\3776Dx\377\2028Fz\377\1""7Ey\377\2068Fz\377\2""7Fy\3778Fz\377" \ ++ "\2027Fy\377\1""6Fx\377\2107Fy\377\3""6Ex\3777Fy\3776Ex\377\2025Dw\377" \ ++ "\2076Ex\377\4""4Dw\377\"2k\377\31*e\377\30)d\377\234\31*e\377\6\30)d" \ ++ "\377\31*d\377.=s\3773Bw\3772Av\3771@u\377\2072Av\377\2""1Au\3772Av\377" \ ++ "\2020At\377\2061Au\377\7""0@u\3771Au\3770@t\3770@u\377*:q\377\31*e\377" \ ++ "\30)d\377\237\31*e\377\5\27(d\377$5m\377.=s\377-s\377\35.h\377\27(d\377\235" \ ++ "\31*e\377\6\30)d\377\33,f\377+;r\3773Bw\3772Av\3771@u\377\2062Av\377" \ ++ "\2""1Au\3772Av\377\2111Au\377\7""0@u\3771Au\3770@t\3770@u\377,t\3773Bw\3772Av\3771@u\377\207" \ ++ "2Av\377\2""1Au\3772Av\377\2020At\377\2061Au\377\7""0@u\3771Au\3770@u" \ ++ "\377/\77u\377.>t\377\36/i\377\30)d\377\240\31*e\377\5\30)d\377%4m\377" \ ++ ".=s\377-s\377\210-s\377%5m\377\37""0i\377\32+e\377\27(d\377\202\30)d" \ ++ "\377\245\31*e\377\202\30)d\377\2%4m\3771\77u\377\2028Fz\377\1""7Ey\377" \ ++ "\2078Fz\377\1""7Fy\377\2028Fz\377\1""7Fy\377\2026Fx\377\2127Fy\377\202" \ ++ "6Ex\377\1""5Dw\377\2066Ex\377\6""5Dw\3776Ex\3776Ew\377&6m\377\31*e\377" \ ++ "\30)d\377\236\31*e\377\6\27)d\377\35.h\377/>t\3773Bw\3772Av\3771@u\377" \ ++ "\2102Av\377\2021Au\377\1""0At\377\2071Au\377\6""0@u\3771At\3770@u\377" \ ++ "/\77t\377\"2k\377\30)d\377\240\31*e\377\6\30)d\377\34-g\377+:q\377.=" \ ++ "s\377-s\377\"" \ ++ "2k\377\33,f\377\32+e\377\204\30)d\377\245\31*e\377\5\30)d\377\27(c\377" \ ++ "\37""0i\3772@u\3777Ey\377\2028Fz\377\1""7Ey\377\2118Fz\377\2027Fy\377" \ ++ "\1""6Fx\377\2117Fy\377\3""6Ex\3777Fy\3776Ex\377\2025Dw\377\2066Ex\377" \ ++ "\4""5Dw\3776Ex\3774Cw\377\40""0i\377\203\30)d\377\235\31*e\377\4\30)" \ ++ "d\377\37/i\3771@v\3773Bv\377\2021@u\377\2072Av\377\2""1Au\3772Av\377" \ ++ "\2020At\377\2071Au\377\7""0@u\3771Au\3770@u\377/\77t\377#3l\377\31*e" \ ++ "\377\30)d\377\237\31*e\377\3\30)d\377\32+e\377(7n\377\202.=s\377\1,;" \ ++ "q\377\206-s\377\32*f\377\30)d\377\236\31*e\377\202\30)d\377\4\40""0j\377" \ ++ "1@v\3772Av\3771@u\377\2072Av\377\1""1Au\377\2022Av\377\1""0At\377\207" \ ++ "1Au\377\6""0@u\3771Au\3771At\3770@u\377/\77t\377&6n\377\202\30)d\377" \ ++ "\237\31*e\377\6\30)d\377\31*e\377$3l\377/>s\377-s\377'8n\377\37""0i\377\30" \ ++ ")d\377\27(c\377\202\30)d\377\250\31*e\377\203\30)d\377\4\37/i\377*9p" \ ++ "\3777Ey\3779Fz\377\2138Fz\377\2027Fy\377\1""6Fx\377\2127Fy\377\2046E" \ ++ "x\377\1""5Dw\377\2066Ex\377\6""5Dw\3776Ex\3774Cw\377'7n\377\30)e\377" \ ++ "\30)d\377\236\31*e\377\202\30)d\377\4\"2k\3771@v\3773Bw\3771@u\377\207" \ ++ "2Av\377\2""1Au\3772Av\377\2131Au\377\1""0@t\377\2020@u\377\1%6n\377\202" \ ++ "\30)d\377\240\31*e\377\3\30)d\377!1j\377/>s\377\212-s\3776Ex\377s\377'7n\377\37""0i\377" \ ++ "\30)d\377\27(d\377\203\30)d\377\256\31*e\377\202\30)d\377\6\31*e\377" \ ++ "\35-g\377+:q\3779Fz\3778Fz\3777Ey\377\2108Fz\377\2""7Fy\3778Fz\377\203" \ ++ "7Fy\377\1""6Fx\377\2117Fy\377\1""6Ex\377\2027Fy\377\1""6Ex\377\2025D" \ ++ "w\377\2066Ex\377\1""5Dw\377\2026Ex\377\2""3Bv\377#3k\377\202\30)d\377" \ ++ "\237\31*e\377\6\30)d\377\32+f\377)9p\3773Bw\3772Av\3771@u\377\2072Av" \ ++ "\377\1""1Au\377\2022Av\377\1""0At\377\2071Au\377\6""0@u\3771Au\3771A" \ ++ "t\3770@u\377/\77t\377'7o\377\202\30)d\377\240\31*e\377\6\30)d\377\33" \ ++ ",f\377)9p\377.=s\377-s\377-<" \ ++ "r\377,;q\377\207-t\3776Dx\3779Fz\3778Fz\3777Ey\377\210" \ ++ "8Fz\377\2""7Fy\3778Fz\377\2027Fy\377\2026Fx\377\2127Fy\377\2""6Ex\377" \ ++ "7Fy\377\2026Ex\377\1""5Dw\377\2076Ex\377\6""5Dw\3776Ex\3772Au\377#3l" \ ++ "\377\31*e\377\30)d\377\237\31*e\377\5\30)e\377\27(d\377\37/i\377.=s\377" \ ++ "3Bw\377\2022Av\377\1""1@u\377\2102Av\377\2021Au\377\1""0At\377\2071A" \ ++ "u\377\2""0@u\3771At\377\2020@u\377\3%5m\377\31*e\377\30)d\377\240\31" \ ++ "*e\377\202\30)d\377\2&6m\377.=s\377\211-t\377" \ ++ "3Bw\3772Av\377\2021@u\377\2072Av\377\4""1Au\3772Av\3771Au\3770At\377" \ ++ "\2071Au\377\10""0@u\3771Au\3770@u\377/\77u\377/\77t\377#3l\377\31*e\377" \ ++ "\30)d\377\241\31*e\377\6\30)d\377\33,f\377-s\377!1j\377\27(c\377\242\31*e\377\6\30)d\377\32+e\377(7o\377" \ ++ ".=s\377-t\377\2038Fz\377\1""7Ey\377\2138Fz\377\1""7Fy\377\202" \ ++ "8Fz\377\2037Fy\377\2026Fx\377\2167Fy\377\2026Ex\377\2025Dw\377\2076E" \ ++ "x\377\1""5Dw\377\2026Ex\377\3""5Dw\3771Au\377!2j\377\202\30)d\377\243" \ ++ "\31*e\377\4\30)d\377\31*e\377%6m\3773Bw\377\2022Av\377\1""1@u\377\210" \ ++ "2Av\377\4""1Au\3772Av\3771Au\3770At\377\2071Au\377\3""0@u\3771Au\377" \ ++ "1At\377\2020@u\377\3-=r\377\33+f\377\30)d\377\242\31*e\377\6\30)d\377" \ ++ "\31*d\377&6m\377.=s\377-t\3777Ey\3779G{\377\2028Fz\377\1""7Ey\377\2138" \ ++ "Fz\377\1""7Fy\377\2028Fz\377\2027Fy\377\2036Fx\377\2147Fy\377\2""6Ex" \ ++ "\3777Fy\377\2036Ex\377\1""5Dw\377\2106Ex\377\1""5Dx\377\2026Ex\377\3" \ ++ "1@u\377'6n\377\32*e\377\202\30)d\377\242\31*e\377\6\31*d\377\30)d\377" \ ++ "\34-g\377*:p\3773Bw\3772Av\377\2021@u\377\2072Av\377\1""1Au\377\2022" \ ++ "Av\377\2""1Au\3770At\377\2071Au\377\2""0@u\3771Au\377\2030@u\377\3*:" \ ++ "p\377\32+f\377\30)d\377\242\31*e\377\6\30)d\377\31*e\377$4l\377-=r\377" \ ++ ".=s\377,;q\377\207-t\377*:q\377#3l\377\33,f\377\26'c\377\27(d\377" \ ++ "\202\30)d\377\353\31*e\377\202\30)d\377\10\27(c\377\31)d\377\37/i\377" \ ++ "'6n\377.=s\3772Av\3776Ey\3779Gz\377\2178Fz\377\1""7Fy\377\2028Fz\377" \ ++ "\2037Fy\377\2026Fx\377\2147Fy\377\1""6Ex\377\2027Fy\377\2026Ex\377\202" \ ++ "5Dw\377\2106Ex\377\5""5Dw\3777Fx\3773Cv\377&6m\377\34-g\377\202\30)d" \ ++ "\377\243\31*e\377\7\30)d\377\27(d\377!2j\377/>t\3773Bw\3772Av\3771@u" \ ++ "\377\2102Av\377\2""1Au\3772Av\377\2021Au\377\1""0At\377\2071Au\377\10" \ ++ "0@u\3771Au\3770@u\377/\77u\3770@u\377&7n\377\32+e\377\30)d\377\243\31" \ ++ "*e\377\6\30)d\377#3k\377-t\377+:q\377&6m\377!1j\377\33,f\377\27(d\377\27(c\377\27(d\377\203" \ ++ "\30)d\377\303\31*e\377\202\30)d\377\14\27(d\377\27(c\377\26(c\377\30" \ ++ ")e\377\36.h\377#3k\377(8o\377-=s\3771\77u\3773Bw\3776Ey\3779Gz\377\203" \ ++ "8Fz\377\1""7Ey\377\2178Fz\377\1""7Fy\377\2038Fz\377\2037Fy\377\2026F" \ ++ "x\377\2167Fy\377\1""6Ex\377\2027Fy\377\2026Ex\377\2025Dw\377\2116Ex\377" \ ++ "\6""5Dw\3776Ex\3775Dw\377*:p\377\40""0i\377\31*e\377\202\30)d\377\245" \ ++ "\31*e\377\6\30)d\377\34,g\377*:p\3773Bv\3773Bw\3772Av\377\2021@u\377" \ ++ "\2112Av\377\2021Au\377\1""0At\377\2111Au\377\6""0@u\3770@t\3770@u\377" \ ++ ",s\377)8p\377#3k" \ ++ "\377\34-g\377\202\27(d\377\204\30)d\377\1\30)e\377\267\31*e\377\204\30" \ ++ ")d\377\11\27)d\377\27(c\377\32+e\377\40""0i\377&5m\377,;r\3772@v\377" \ ++ "5Dx\3776Dx\377\2027Ey\377\2048Fz\377\1""7Ey\377\2218Fz\377\1""7Fy\377" \ ++ "\2028Fz\377\2037Fy\377\2036Fx\377\2167Fy\377\1""6Ex\377\2027Fy\377\203" \ ++ "6Ex\377\1""5Dw\377\2116Ex\377\6""5Dw\3776Ex\3777Fx\377,;q\377\35-g\377" \ ++ "\31*e\377\202\30)d\377\245\31*e\377\5\31*d\377\30)d\377\40""0j\3770@" \ ++ "u\3773Bw\377\2022Av\377\1""1@u\377\2102Av\377\3""1Au\3772Av\3771Au\377" \ ++ "\2020At\377\2101Au\377\2020@u\377\4/\77t\3770@u\377*:p\377\32*e\377\202" \ ++ "\30)d\377\243\31*e\377\2\30)d\377\40""0j\377\202.=s\377\2-t\377,;r\377)8p\377&6n\377$4l\377\"2k\377" \ ++ "!1j\377\37""0i\377\36/i\377\35.h\377\34-g\377\33,f\377\33+f\377\32+e" \ ++ "\377\31*e\377\30)d\377\27)d\377\221\27(d\377\23\30)d\377\31)d\377\31" \ ++ "*e\377\32+e\377\33,f\377\34,g\377\35-h\377\36.h\377\37/i\377\40""0j\377" \ ++ "!1k\377#3k\377%5m\377'7o\377*9p\377-t\3773Bw\3772Av\377\2021@u\377\2102Av\377" \ ++ "\2""1Au\3772Av\377\2021Au\377\1""0At\377\2111Au\377\5""0@u\3770@t\377" \ ++ "0@u\377.>t\377\"3k\377\202\30)d\377\243\31*e\377\202\30)d\377\5!1j\377" \ ++ "-t\377.>t\377.=s\377-s\3770>t\3771\77u\3771@u\3772Av\3774Bw\3775Cw\3776Dx\377" \ ++ "7Ey\3778Fz\3779Gz\3779Fz\377\2058Fz\377\2""8Fy\3777Ez\377\2278Fz\377" \ ++ "\1""7Fy\377\2038Fz\377\2047Fy\377\2026Fx\377\2207Fy\377\1""6Ex\377\203" \ ++ "7Fy\377\2036Ex\377\1""5Dw\377\2126Ex\377\6""5Dw\3776Ex\3777Fx\3771@u" \ ++ "\377%5m\377\35.h\377\203\30)d\377\247\31*e\377\7\27)d\377\33+f\377)9" \ ++ "p\3772Av\3773Bw\3772Av\3771@u\377\2112Av\377\2""1Au\3772Av\377\2021A" \ ++ "u\377\1""0At\377\2101Au\377\2020@u\377\4""0@t\3770@u\377,s\377\40""0i\377\202" \ ++ "\30)d\377\251\31*e\377\5\30)d\377\31*e\377\33,f\377)9p\3773Bw\377\202" \ ++ "2Av\377\1""1@u\377\2112Av\377\3""1Au\3772Av\3771Au\377\2020At\377\211" \ ++ "1Au\377\7""0@u\3770@t\3770@u\377/\77t\377&6n\377\31*e\377\30)d\377\244" \ ++ "\31*e\377\202\30)d\377\2\"2k\377.=s\377\202-t\377#3k\377\202\30)d\377\244\31*e\377\202\30)" \ ++ "d\377\3\31*e\377'6m\377.=s\377\202-s\377&5m\377\37""0i\377\32+f\377\27)d\377\202\30)d\377\254\31*e\377" \ ++ "\7\30)d\377\27(c\377\33-g\377)8o\3770\77u\3774Bw\3772Av\377\2021@u\377" \ ++ "\2112Av\377\2""1Au\3772Av\377\2021Au\377\2020At\377\2121Au\377\1""0@" \ ++ "t\377\2020@u\377\3%6m\377\32+f\377\30)d\377\246\31*e\377\6\30)d\377\32" \ ++ "+e\377(7o\377.=s\377-s\3774Cv\3775Dw\377\2036E" \ ++ "x\377\1""5Dw\377\2176Ex\377\2035Dw\377\2046Ex\377\2057Fy\377\1""6Ex\377" \ ++ "\3207Fy\377\1""6Ex\377\2057Fy\377\2046Ex\377\2045Dw\377\2166Ex\377\1" \ ++ "5Dw\377\2036Ex\377\5""5Dw\3774Cw\3772Bv\377)9p\377\35.g\377\203\30)d" \ ++ "\377\257\31*e\377\202\30)d\377\5\31*e\377\36.i\377.=s\3774Cw\3773Bw\377" \ ++ "\2021@u\377\2112Av\377\2""1Au\3772Av\377\2031Au\377\1""0At\377\2101A" \ ++ "u\377\11""0@u\3771Au\3770@u\3770@t\377/\77u\377/\77t\377*:q\377\31+f" \ ++ "\377\30)d\377\246\31*e\377\202\30)d\377\5\34-g\377+;r\377.=s\377-s\377#4l\377\202\30)d\377\246\31*e" \ ++ "\377\7\31*d\377\30)d\377\37/i\377+:q\377.=s\377-t\377%6m\377\34-g\377\32" \ ++ "+e\377\31*e\377\203\30)d\377\1\30)e\377\262\31*e\377\5\30)d\377\33+f" \ ++ "\377*9p\3771@v\3773Bw\377\2022Av\377\2021@u\377\2122Av\377\2041Au\377" \ ++ "\1""0At\377\2111Au\377\2""0@u\3771Au\377\2030@u\377\2#3k\377\31*e\377" \ ++ "\202\30)d\377\246\31*e\377\202\30)d\377\5$4l\377-s\3774Cv\3774Cw\3775Dw\377\2046Ex" \ ++ "\377\1""5Dw\377\2256Ex\377\2065Dw\377\2136Ex\377\2357Fy\377\2126Ex\377" \ ++ "\2075Dw\377\2246Ex\377\2""5Ex\3776Dw\377\2036Ex\377\2025Dw\377\6""4C" \ ++ "v\3772Au\377+;q\377!1k\377\31*e\377\27(d\377\202\30)d\377\264\31*e\377" \ ++ "\202\30)d\377\6\31*e\377\32+f\377$5m\3772Av\3773Bw\3772Av\377\2021@u" \ ++ "\377\2142Av\377\2021Au\377\1""0At\377\2111Au\377\10""0@u\3771Au\3770" \ ++ "@u\3770@t\3770@u\377/\77t\377,s\377*:p\377$4l\377\35.g\377\27(d\377\27(c\377\202\30" \ ++ ")d\377\266\31*e\377\202\30)d\377\4\34-g\377$4m\3770\77u\3774Cw\377\202" \ ++ "2Av\377\1""1@u\377\2122Av\377\2""1Au\3772Av\377\2031Au\377\1""0At\377" \ ++ "\2111Au\377\2""0@u\3771Au\377\2030@u\377\5.>s\377&6n\377\31*e\377\30" \ ++ ")d\377\31*d\377\247\31*e\377\5\30)d\377\33+f\377&6n\377/=s\377-t\3773Bw\377\2022Av\377\2021@u\377\2122Av\377\2""1" \ ++ "Au\3772Av\377\2021Au\377\2020At\377\2131Au\377\5""0@u\377/\77t\3770@" \ ++ "u\377*:q\377\36/i\377\202\30)d\377\250\31*e\377\4\27)d\377\35-h\377)" \ ++ "9p\377.=s\377\214-s\377" \ ++ "0@t\3772Bu\3774Cw\3776Ex\3777Fx\377\2076Ex\377\1""5Dw\377\2536Ex\377" \ ++ "\1""5Dx\377\2066Ex\377\14""7Ex\3777Fx\3775Dw\3773Bv\3771Au\377/\77t\377" \ ++ ".=r\377+;q\377(8n\377$3k\377\37""0i\377\33,f\377\202\27(c\377\1\27(d" \ ++ "\377\203\30)d\377\276\31*e\377\202\30)d\377\5\30)e\377\36/h\377&6n\377" \ ++ "1@v\3774Cw\377\2022Av\377\1""1@u\377\2152Av\377\2021Au\377\2020At\377" \ ++ "\2121Au\377\2020@u\377\1""0@t\377\2020@u\377\2-=r\377#3l\377\202\30)" \ ++ "d\377\251\31*e\377\7\30)d\377\32+e\377#4l\377.>s\377.s\377,;q\377)9p\377&6n\377#3k\377!1j\377\37""0i\377\35" \ ++ ".h\377\33,f\377\31*e\377\30)d\377\27(d\377\204\30)d\377\301\31*e\377" \ ++ "\203\30)d\377\4!1j\377*:q\3770@u\3773Bw\377\2022Av\377\2021@u\377\213" \ ++ "2Av\377\2""1Au\3772Av\377\2021Au\377\2020At\377\2111Au\377\1""0@u\377" \ ++ "\2021Au\377\1""0@t\377\2020@u\377\2&6n\377\34-g\377\202\30)d\377\250" \ ++ "\31*e\377\202\30)d\377\3\34,f\377(7o\377.=s\377\202-s\3770@t\3772Bu\3774Cw\3776Ex\377\2067Fx\377\2027Ex\377" \ ++ "\2076Ex\377\2027Ex\377\2067Fx\377\14""6Dw\3774Cv\3771Au\3770\77s\377" \ ++ "-=r\377+;p\377)8o\377&6n\377#4k\377\40""1j\377\35.h\377\33,f\377\202" \ ++ "\32+f\377\1\32+e\377\203\31*e\377\207\30)d\377\305\31*e\377\202\30)d" \ ++ "\377\4!1j\377/>t\3772Av\3773Bw\377\2022Av\377\2021@u\377\2132Av\377\1" \ ++ "1Au\377\2022Av\377\2021Au\377\1""0At\377\2141Au\377\6""0@u\3770@t\377" \ ++ "0@u\377,u\3774Cw\3773Bw\3772Av\377\2021@u\377" \ ++ "\2132Av\377\1""1Au\377\2022Av\377\2021Au\377\2020At\377\2111Au\377\1" \ ++ "0@u\377\2021Au\377\1""0@u\377\202/\77u\377\2.>t\377%5m\377\203\30)d\377" \ ++ "\250\31*e\377\10\31*d\377\30)d\377\31*e\377\37""0i\377.s\377.=r\377-t\377\40""0j\377\31*e\377\203\30)d\377\252\31*e\377\3" \ ++ "\30)d\377\36.i\377,;q\377\202.=s\377\2-t\377'7n\377\31*e\377\30)d\377\254" \ ++ "\31*e\377\3\30)d\377\31*e\377#3k\377\202.=s\377\2-t\3774Cw\3773Bw\377\2022Av\377\2021@u\377" \ ++ "\2142Av\377\1""1Au\377\2022Av\377\2021Au\377\2020At\377\2121Au\377\1" \ ++ "0@u\377\2021Au\377\2030@u\377\5.>t\377(8o\377\35.h\377\27(d\377\30)d" \ ++ "\377\253\31*e\377\202\30)d\377\2\34,f\377'6n\377\202.=s\377\2-t\3771@v\3772Av\3773Bw\377\2032Av\377\2021@u\377\2172Av\377\2021Au" \ ++ "\377\2030At\377\2121Au\377\1""0@u\377\2021Au\377\1""0@t\377\2020@u\377" \ ++ "\3,s\377&6n\377\40""0i\377\34" \ ++ "-g\377\203\30)d\377\377\31*e\377\233\31*e\377\203\30)d\377\7\31*e\377" \ ++ "\36.h\377\"2k\377):p\3771@u\3774Cx\3773Bw\377\2022Av\377\2021@u\377\216" \ ++ "2Av\377\2""1Au\3772Av\377\2031Au\377\2020At\377\2131Au\377\1""0@u\377" \ ++ "\2021Au\377\2040@u\377\3+;q\377#3l\377\31*e\377\202\30)d\377\255\31*" \ ++ "e\377\6\30)d\377\31*e\377\37""0i\377,;q\377.=s\377-t\377*9p\377#3l\377\34-g\377\27(c\377\27" \ ++ ")d\377\202\30)d\377\377\31*e\377\224\31*e\377\202\30)d\377\6\27(c\377" \ ++ "\30*e\377\37/i\377&6n\377,;r\3770\77u\377\2023Bw\377\2022Av\377\2031" \ ++ "@u\377\2212Av\377\2021Au\377\2030At\377\2131Au\377\4""0@u\3771Au\377" \ ++ "0@u\3770@t\377\2020@u\377\3,s\377!1j\377\32*e\377\30*e\377\30)d\377\257\31*e\377\3" \ ++ "\30)d\377\35.h\377+:q\377\202.=s\377\202-t\377%6n\377\35.h\377\32+e\377" \ ++ "\202\31*e\377\203\30)d\377\377\31*e\377\203\31*e\377\204\30)d\377\6\31" \ ++ "*e\377\32+e\377\33,f\377\40""1j\377*9p\3773Av\377\2023Bw\377\2022Av\377" \ ++ "\2031@u\377\2172Av\377\2""1Au\3772Av\377\2031Au\377\2020At\377\2151A" \ ++ "u\377\4""0@u\3771Au\3770@u\3770@t\377\2020@u\377\3/\77t\377-=s\377\"" \ ++ "3l\377\202\30)d\377\1\30*e\377\256\31*e\377\202\30)d\377\6\31*e\377#" \ ++ "3k\377.=t\377.=s\377-t\3773Bw\3774Bw\3773Bw\377" \ ++ "\2032Av\377\2031@u\377\2172Av\377\1""1Au\377\2022Av\377\2031Au\377\202" \ ++ "0At\377\2151Au\377\1""0@u\377\2021Au\377\2""0@u\3770@t\377\2020@u\377" \ ++ "\3(9o\377\40""1i\377\32+f\377\202\30)d\377\260\31*e\377\5\30)d\377\31" \ ++ "*d\377#3l\377,;q\377.=s\377\202-t\377(8o\377\33,f\377\202\30)d\377\261\31*e\377\202\30)d\377\5" \ ++ "\31*e\377\"2k\377-t\377*9q\377%5m\377!2j\377" \ ++ "\37/i\377\34-g\377\32+e\377\206\30)d\377\323\31*e\377\204\30)d\377\14" \ ++ "\27)d\377\30)d\377\33,f\377\35.h\377\37""0i\377#3l\377'7o\377,;r\377" \ ++ "1\77v\3775Cx\3774Cw\3773Bw\377\2042Av\377\2031@u\377\2222Av\377\1""1" \ ++ "Au\377\2032Av\377\2031Au\377\2020At\377\2161Au\377\4""0@u\3771Au\377" \ ++ "0@u\3770@t\377\2020@u\377\5/\77t\377+;q\377%5m\377\34-g\377\27(d\377" \ ++ "\202\30)d\377\261\31*e\377\202\30)d\377\3\35.h\377(7n\377/>s\377\202" \ ++ "-t\377,t\3773Bv\3774Cw\377\2043Bw\377\2042Av\377\2051@u\377" \ ++ "\2252Av\377\1""1Au\377\2032Av\377\2031Au\377\2030At\377\2171Au\377\1" \ ++ "0@u\377\2021Au\377\3""0@u\3770@t\3770@u\377\202/\77u\377\4/\77t\377-" \ ++ "=r\377#3l\377\31*e\377\202\30)d\377\264\31*e\377\10\30)d\377\31*d\377" \ ++ "\32+f\377%5l\377/>s\377.=s\377-t\377,t\377.=s\377\202-s\377/>t\3770\77t\3770@u\377\2022Av\377" \ ++ "\3""4Bw\3774Cw\3774Bw\377\2043Bw\377\1""3Bv\377\2062Av\377\2061@u\377" \ ++ "\2352Av\377\2041Au\377\2030At\377\2201Au\377\1""0@u\377\2021Au\377\10" \ ++ "0@u\3770@t\3770@u\3771Au\377/\77t\377'8o\377!1j\377\34,g\377\203\30)" \ ++ "d\377\265\31*e\377\6\30)d\377\30(c\377\36/h\377(7o\377-s\377(9o\377\35.h\377\203\30)d\377\267\31*e\377\202\30)d\377\4\31*" \ ++ "e\377\36/i\377,:q\377.=s\377\202-t\377/\77t\377\2060@u\377\202" \ ++ "1Au\377\1""0@u\377\2271Au\377\2050At\377\2061Au\377\2062Av\377\1""1A" \ ++ "u\377\2762Av\377\1""1Au\377\2072Av\377\2051Au\377\2050At\377\2271Au\377" \ ++ "\1""0@u\377\2031Au\377\5""0@u\3770@t\3770@u\377/\77u\3770@u\377\202/" \ ++ "\77t\377\3-=s\377'7o\377\36/i\377\203\30)d\377\1\30)e\377\273\31*e\377" \ ++ "\202\30)d\377\4\31*e\377\37/i\377,;q\377.=s\377\202-t\377\2040@u\377\1""0@t\377\235" \ ++ "1Au\377\2050At\377\2071Au\377\2072Av\377\1""1Au\377\2602Av\377\1""1A" \ ++ "u\377\2072Av\377\2071Au\377\2050At\377\2311Au\377\1""0@u\377\2031Au\377" \ ++ "\2060@u\377\6-=r\377*:p\377%6m\377\36/i\377\30)d\377\27(d\377\202\30" \ ++ ")d\377\274\31*e\377\202\30)d\377\3\31*e\377\36.h\377'7n\377\202.=s\377" \ ++ "\202-s\3771Au\377\2020@u\377" \ ++ "\2""0@t\3770@u\377\2041Au\377\1""0@u\377\2321Au\377\2070At\377\2071A" \ ++ "u\377\2142Av\377\1""1Au\377\2312Av\377\1""1Au\377\2132Av\377\2101Au\377" \ ++ "\2060At\377\2331Au\377\1""0@u\377\2031Au\377\2""0@u\3770@t\377\2020@" \ ++ "u\377\2021Au\377\5+;q\377%5m\377\40""0j\377\34-g\377\31*e\377\203\30" \ ++ ")d\377\276\31*e\377\202\30)d\377\4\35.h\377'7n\377-s\377.>t\377/\77t\377/\77u\377\2060@u\377\2041Au\377\1""0@u\377\251" \ ++ "1Au\377\2340At\377\2541Au\377\2020@u\377\1""0@t\377\2020@u\377\2/\77" \ ++ "u\3770@u\377\202/\77t\377\4.>t\377+;r\377%5n\377\36.i\377\204\30)d\377" \ ++ "\301\31*e\377\202\30)d\377\3\31*e\377\32+e\377$4l\377\202.=s\377\3-=" \ ++ "s\377-s\377+;r\377)9p\377%5m\377" \ ++ "\40""0i\377\33+f\377\27(d\377\27)d\377\202\30)d\377\302\31*e\377\1\31" \ ++ "*d\377\202\30)d\377\3\34,g\377\"3k\377,;r\377\202.=s\377\202-s\377)9p\377$5m\377\40""1j\377" \ ++ "\36.h\377\33,f\377\30)e\377\204\30)d\377\304\31*e\377\202\30)d\377\3" \ ++ "\33,f\377%4l\377*:p\377\202.=s\377\202-s\377\2100@u\377\3271Au\377\1""0@u\377\2051" \ ++ "Au\377\2020@u\377\1""0@t\377\2040@u\377\6""1Au\377,s\377.>t\377\203/\77t\377\2020@u\377\1/\77" \ ++ "u\377\2020@u\377\1""0@t\377\2030@u\377\3011Au\377\1""0@u\377\2061Au\377" \ ++ "\2030@u\377\3""0@t\3770@u\3771Au\377\2040@u\377\202/\77t\377\7.>t\377" \ ++ ".>s\377-=r\377(8o\377#3k\377\35.g\377\31*e\377\204\30)d\377\312\31*e" \ ++ "\377\202\30)d\377\5\31*e\377\32+f\377\"2k\377-s\377/\77t\377\2040@u\377\1""1Au\377\2050@u\377\2111" \ ++ "Au\377\1""0@u\377\2501Au\377\1""0@u\377\2111Au\377\2030@u\377\1""0@t" \ ++ "\377\2070@u\377\13.>t\377-=s\377+;q\377):p\377(8o\377$4m\377!2j\377\36" \ ++ ".h\377\32+e\377\27(c\377\27(d\377\203\30)d\377\314\31*e\377\203\30)d" \ ++ "\377\3\35-g\377#3k\377,;r\377\202.=s\377\202-t\377\2021Av\377\3""1Au\3770@u\3771Au\377\2100@u\377\2241Au" \ ++ "\377\2020@u\377\2241Au\377\2040@u\377\1""0@t\377\2030@u\377\2""1@u\377" \ ++ "0@u\377\2021Au\377\14""1Av\3770@u\377-=s\377+;q\377(8p\377%6n\377\"3" \ ++ "k\377\40""1j\377\36/i\377\35-g\377\33,f\377\31*e\377\206\30)d\377\317" \ ++ "\31*e\377\202\30)d\377\3\35.h\377&6m\377+;q\377\202.=s\377\202-s\377\206.>t\377\204.\77t\377\1/\77" \ ++ "t\377\203.\77t\377\207.>t\377\204.>s\377\14,=r\377+;q\377)9p\377(8o\377" \ ++ "&7n\377$5l\377\"3k\377\40""1j\377\36/h\377\33,f\377\31*e\377\27)d\377" \ ++ "\210\30)d\377\331\31*e\377\202\30)d\377\4\31)d\377\31*e\377\36.h\377" \ ++ ")8p\377\202.=s\377\202-s\377.=s\377\202-s\377.=s\377\203-s\377\202." \ ++ "=s\377\203-s\377\203.=s\377\203-t\377-s\377\202.=s\377\204-s\377,;q\377'7o\377" \ ++ "$4l\377\40""0i\377\34,g\377\32+f\377\32+e\377\203\31*e\377\1\30)e\377" \ ++ "\207\30)d\377\300\31*e\377\210\30)d\377\203\31*e\377\10\32*e\377\32+" \ ++ "e\377\33,f\377\36.h\377\"1k\377%5m\377)9p\377-s\377\14-=s\377+:q\377)8o\377&5n\377#3l\377!" \ ++ "1j\377\37""0i\377\36.h\377\35-g\377\33,f\377\32+f\377\31*e\377\212\30" \ ++ ")d\377\256\31*e\377\212\30)d\377\14\30*e\377\31+e\377\33,f\377\34,g\377" \ ++ "\35.h\377\37/i\377\40""0i\377\"2k\377$4m\377'6n\377*9p\377,;r\377\202" \ ++ "/>s\377\1/=s\377\203.=s\377\205-\377\10\15\37\377\202\7\15!\377\2\12\20)\377\23\40O\377" \ ++ "\314\31*e\377\202\30)d\377\4\31*e\377\33,f\377\34-g\377\35.g\377\202" \ ++ "\36.h\377\1\35-g\377\206\36.h\377\3\34-g\377\33+f\377\31*e\377\202\30" \ ++ ")d\377\1\30)e\377\377\31*e\377\377\31*e\377\257\31*e\377\3\21\34E\377" \ ++ "\7\13\32\377\6\13\33\377\243\7\13\33\377\1\6\13\33\377\244\31*e\377\2" \ ++ "\27'_\377\12\23.\377\205\7\13\33\377\1\20\33C\377\310\31*e\377\203\30" \ ++ ")d\377\4\32,f\377\34-g\377\35-g\377\35.h\377\202\36.h\377\1\35-g\377" \ ++ "\203\36.h\377\4\35-g\377\36.h\377\36-g\377\34,f\377\203\31*e\377\202" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\261\31*e\377\3\21\34E\377\7\13\32" \ ++ "\377\6\13\33\377\243\7\13\33\377\1\6\13\33\377\244\31*e\377\2\26%Z\377" \ ++ "\10\15#\377\205\7\13\33\377\1\15\26""6\377\304\31*e\377\202\30)d\377" \ ++ "\1\31*d\377\202\31*e\377\1\33,f\377\203\36.h\377\1\35-g\377\203\36.h" \ ++ "\377\1\35-g\377\202\36.h\377\202\35-g\377\2\33,f\377\31*e\377\202\30" \ ++ ")d\377\377\31*e\377\377\31*e\377\265\31*e\377\3\21\34E\377\7\13\32\377" \ ++ "\7\12\33\377\244\7\13\33\377\244\31*e\377\1\25#U\377\206\7\13\33\377" \ ++ "\1\16\27""8\377\302\31*e\377\202\30)d\377\4\31*e\377\32*e\377\33,f\377" \ ++ "\34-g\377\212\36.h\377\3\35-g\377\34,g\377\32+e\377\203\30)d\377\377" \ ++ "\31*e\377\377\31*e\377\267\31*e\377\3\20\33C\377\7\13\33\377\6\12\32" \ ++ "\377\243\7\13\33\377\1\7\12\33\377\244\31*e\377\3\26%Y\377\10\15!\377" \ ++ "\6\12\32\377\204\7\13\33\377\1\14\24""0\377\277\31*e\377\203\30)d\377" \ ++ "\4\32+e\377\33,f\377\34-g\377\35-g\377\202\36.h\377\2\36-g\377\35.h\377" \ ++ "\203\36.h\377\1\35-g\377\202\36.h\377\2\34,g\377\33+f\377\202\31*e\377" \ ++ "\202\30)d\377\377\31*e\377\377\31*e\377\271\31*e\377\2\17\32\77\377\6" \ ++ "\12\32\377\244\7\13\33\377\1\7\12\33\377\244\31*e\377\3\27'_\377\12\22" \ ++ "-\377\7\12\32\377\204\7\13\33\377\1\12\22.\377\275\31*e\377\202\30)d" \ ++ "\377\2\31*e\377\33,f\377\203\35-g\377\202\36.h\377\1\36-g\377\207\36" \ ++ ".h\377\3\34,f\377\32+e\377\31*e\377\203\30)d\377\377\31*e\377\377\31" \ ++ "*e\377\273\31*e\377\2\20\32@\377\6\12\33\377\244\7\13\33\377\1\6\13\33" \ ++ "\377\227\31*e\377\1\30)b\377\214\27'^\377\2\27'_\377\15\27""8\377\204" \ ++ "\7\13\33\377\2\6\12\32\377\13\22-\377\270\31*e\377\203\30)d\377\202\31" \ ++ "*e\377\2\32*e\377\34-g\377\203\36.h\377\1\35-g\377\203\36.h\377\1\35" \ ++ "-g\377\202\36.h\377\203\35-g\377\4\32+f\377\30)e\377\30)d\377\30)e\377" \ ++ "\377\31*e\377\377\31*e\377\277\31*e\377\2\20\32@\377\6\12\33\377\244" \ ++ "\7\13\33\377\1\6\13\33\377\227\31*e\377\2\23\40O\377\12\20)\377\212\13" \ ++ "\22+\377\4\13\21+\377\13\22,\377\10\16\"\377\6\12\32\377\204\7\13\33" \ ++ "\377\1\12\17'\377\266\31*e\377\202\30)d\377\202\31*e\377\3\32+f\377\33" \ ++ ",f\377\35.g\377\202\36.h\377\1\35-g\377\203\36.h\377\1\35-g\377\203\36" \ ++ ".h\377\4\35-g\377\34-g\377\33,f\377\32*e\377\203\30)d\377\377\31*e\377" \ ++ "\377\31*e\377\301\31*e\377\2\17\32@\377\6\12\33\377\244\7\13\33\377\1" \ ++ "\7\12\33\377\227\31*e\377\2\21\35G\377\7\13\32\377\213\7\12\33\377\206" \ ++ "\7\13\33\377\2\6\12\32\377\11\17$\377\263\31*e\377\203\30)d\377\4\32" \ ++ "+e\377\33,f\377\34-g\377\35-g\377\203\36.h\377\1\35-g\377\204\36.h\377" \ ++ "\7\35-g\377\36.h\377\36-g\377\35-f\377\33,f\377\32*e\377\31*e\377\202" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\304\31*e\377\2\17\32\77\377\6\13" \ ++ "\33\377\244\7\13\33\377\1\7\12\33\377\227\31*e\377\2\22\37L\377\7\13" \ ++ "\32\377\221\7\13\33\377\2\7\13\32\377\11\17%\377\260\31*e\377\203\30" \ ++ ")d\377\2\31*d\377\33,f\377\203\35-g\377\207\36.h\377\1\35-g\377\203\36" \ ++ ".h\377\1\33+f\377\202\31*e\377\1\31*d\377\202\30)d\377\1\30*e\377\377" \ ++ "\31*e\377\377\31*e\377\305\31*e\377\2\20\32@\377\6\12\33\377\244\7\13" \ ++ "\33\377\1\6\13\33\377\227\31*e\377\1\24\"R\377\224\7\13\33\377\253\31" \ ++ "*e\377\203\30)d\377\203\31*e\377\3\33+f\377\35.h\377\36.h\377\202\36" \ ++ ".g\377\1\35-h\377\207\36.h\377\202\35-g\377\2\34,g\377\32+f\377\203\30" \ ++ ")d\377\377\31*e\377\377\31*e\377\312\31*e\377\2\20\32@\377\6\12\33\377" \ ++ "\244\7\13\33\377\1\6\13\33\377\227\31*e\377\1\24!Q\377\223\7\13\33\377" \ ++ "\1\7\13\34\377\250\31*e\377\203\30)d\377\6\31*d\377\31*e\377\32+f\377" \ ++ "\33,f\377\35-g\377\35.h\377\202\36.h\377\1\35-g\377\203\36.h\377\2\35" \ ++ "-h\377\36.g\377\203\36.h\377\4\35-g\377\34,g\377\32+f\377\31*e\377\203" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\314\31*e\377\2\17\32@\377\6\12\33" \ ++ "\377\244\7\13\33\377\1\7\12\33\377\227\31*e\377\2\26%Y\377\7\13\32\377" \ ++ "\222\7\13\33\377\1\6\13\34\377\245\31*e\377\1\30)e\377\202\30)d\377\5" \ ++ "\30)e\377\32+f\377\33,f\377\34-g\377\35-g\377\203\36.h\377\2\36-g\377" \ ++ "\35.h\377\203\36.h\377\1\35-g\377\202\36.h\377\5\36-h\377\35-g\377\33" \ ++ ",f\377\32+e\377\31*e\377\203\30)d\377\377\31*e\377\377\31*e\377\317\31" \ ++ "*e\377\2\17\32\77\377\6\13\33\377\244\7\13\33\377\1\7\12\33\377\227\31" \ ++ "*e\377\1\26%[\377\223\7\13\33\377\1\6\13\34\377\243\31*e\377\202\30)" \ ++ "d\377\3\31*d\377\32+f\377\34,g\377\202\35-g\377\1\35.h\377\202\36.h\377" \ ++ "\2\36.g\377\35-h\377\207\36.h\377\2\35-g\377\33,e\377\203\31*e\377\203" \ ++ "\30)d\377\377\31*e\377\377\31*e\377\321\31*e\377\2\20\32@\377\6\12\33" \ ++ "\377\244\7\13\33\377\2\7\13\32\377\30(a\377\226\31*e\377\1\26&\\\377" \ ++ "\223\7\13\33\377\1\7\13\34\377\234\31*e\377\204\30)d\377\203\31*e\377" \ ++ "\2\33,f\377\34-g\377\202\36.h\377\2\36.g\377\35-h\377\204\36.h\377\1" \ ++ "\35-g\377\203\36.h\377\203\35-g\377\2\33,f\377\31*e\377\202\30)d\377" \ ++ "\1\30)e\377\377\31*e\377\377\31*e\377\243\31*e\377\6\30)b\377\27'^\377" \ ++ "\26%Y\377\25$W\377\24\"S\377\23\40O\377\202\22\36J\377\6\23!P\377\24" \ ++ "#T\377\25$W\377\26%Y\377\27'^\377\30)d\377\245\31*e\377\2\20\32@\377" \ ++ "\6\12\33\377\245\7\13\33\377\1\30(b\377\226\31*e\377\1\30(b\377\224\7" \ ++ "\13\33\377\231\31*e\377\203\30)d\377\2\30)e\377\31*e\377\202\32+f\377" \ ++ "\3\34,g\377\35.h\377\36/h\377\202\36.h\377\2\36-g\377\35-g\377\207\36" \ ++ ".h\377\202\35-g\377\3\34,g\377\33,f\377\32*e\377\203\30)d\377\1\30*e" \ ++ "\377\377\31*e\377\377\31*e\377\236\31*e\377\32\23\40M\377\22\36J\377" \ ++ "\20\33B\377\16\30;\377\15\25""3\377\13\22.\377\13\21,\377\11\21*\377" \ ++ "\12\20'\377\10\17%\377\10\16#\377\10\15!\377\7\13\37\377\7\12\33\377" \ ++ "\7\13\33\377\7\14\37\377\7\15!\377\11\16#\377\11\17$\377\11\17(\377\12" \ ++ "\21*\377\12\22,\377\13\22.\377\15\25""4\377\16\30<\377\25#V\377\240\31" \ ++ "*e\377\2\20\32\77\377\6\12\33\377\244\7\13\33\377\2\6\13\33\377\30(b" \ ++ "\377\226\31*e\377\1\30)d\377\224\7\13\33\377\1\30(b\377\225\31*e\377" \ ++ "\203\30)d\377\6\31*e\377\32+f\377\33,g\377\34,g\377\35-g\377\35.h\377" \ ++ "\203\36.h\377\1\36-g\377\204\36.h\377\1\35-g\377\204\36.h\377\5\34-g" \ ++ "\377\33+f\377\32+e\377\31*e\377\30*e\377\202\30)d\377\215\31*e\377\2" \ ++ "\27'^\377\22\36J\377\205\22\37L\377\1\23\37L\377\377\31*e\377\377\31" \ ++ "*e\377\215\31*e\377\2\6\12\35\377\7\13\34\377\202\7\12\33\377\3\6\12" \ ++ "\32\377\6\12\33\377\7\13\32\377\202\6\13\32\377\16\7\13\33\377\6\13\33" \ ++ "\377\6\13\32\377\7\13\33\377\7\12\33\377\6\12\32\377\7\13\33\377\6\12" \ ++ "\32\377\7\12\32\377\7\13\33\377\6\13\33\377\7\13\33\377\7\12\33\377\6" \ ++ "\13\32\377\202\7\13\33\377\2\11\21*\377\30)c\377\237\31*e\377\2\17\32" \ ++ "\77\377\6\13\33\377\244\7\13\33\377\2\6\12\32\377\30(b\377\226\31*e\377" \ ++ "\1\30)d\377\224\7\13\33\377\1\30(b\377\221\31*e\377\204\30)d\377\2\32" \ ++ "+e\377\33,f\377\202\35-h\377\2\35-g\377\35.h\377\203\36.h\377\1\35.h" \ ++ "\377\205\36.h\377\1\35-g\377\202\36.h\377\3\35-g\377\34,g\377\32+f\377" \ ++ "\202\31*e\377\1\31*d\377\203\30)d\377\217\31*e\377\2\24\"S\377\7\12\33" \ ++ "\377\205\7\13\34\377\1\7\14\36\377\377\31*e\377\320\31*e\377\2\20\33" \ ++ "B\377\7\13\32\377\216\7\13\35\377\2\7\14\35\377\6\13\35\377\207\7\13" \ ++ "\35\377\6\7\13\34\377\10\17&\377\16\27""8\377\20\33D\377\25#U\377\30" \ ++ ")d\377\235\31*e\377\1\6\12\33\377\231\7\13\33\377\1\21\34E\377\237\31" \ ++ "*e\377\2\20\32@\377\6\12\33\377\245\7\13\33\377\1\30(a\377\226\31*e\377" \ ++ "\1\30)d\377\223\7\13\33\377\2\6\12\32\377\26&\\\377\212\31*e\377\204" \ ++ "\30)d\377\203\31*e\377\4\32+f\377\33,f\377\34-g\377\36/h\377\202\36." \ ++ "h\377\2\36-g\377\35.g\377\211\36.h\377\203\35-g\377\3\33,f\377\32*e\377" \ ++ "\31)d\377\202\30)d\377\225\31*e\377\1\24\"R\377\206\7\13\33\377\1\7\13" \ ++ "\35\377\377\31*e\377\317\31*e\377\2\23\40M\377\7\13\32\377\217\7\13\33" \ ++ "\377\3\6\13\33\377\7\13\33\377\6\13\32\377\206\7\13\33\377\13\6\13\33" \ ++ "\377\7\13\33\377\6\12\32\377\7\13\33\377\6\12\33\377\7\13\33\377\7\14" \ ++ "!\377\14\24""2\377\17\31>\377\23!Q\377\26%[\377\230\31*e\377\1\6\12\33" \ ++ "\377\231\7\13\33\377\1\17\31>\377\237\31*e\377\2\20\32@\377\6\12\33\377" \ ++ "\245\7\13\33\377\1\26&\\\377\226\31*e\377\2\30)d\377\7\12\33\377\223" \ ++ "\7\13\33\377\2\23\40N\377\25$X\377\205\25$W\377\204\24#V\377\202\25$" \ ++ "W\377\4\26%W\377\26%X\377\27%X\377\30&X\377\203\31'Y\377\3\36.h\377\36" \ ++ "-g\377\35-g\377\204\36.h\377\1\35-g\377\204\36.h\377\5\35-g\377\34-g" \ ++ "\377\34,f\377\33+f\377\31*e\377\203\30)d\377\1\30*e\377\227\31*e\377" \ ++ "\1\24\"R\377\206\7\13\33\377\1\7\13\35\377\377\31*e\377\317\31*e\377" \ ++ "\1\21\34D\377\235\7\13\33\377\1\6\12\33\377\203\7\13\33\377\3\6\13\33" \ ++ "\377\7\13\33\377\6\13\32\377\203\30)d\377\225\31*e\377\1\6\12\33\377" \ ++ "\231\7\13\33\377\1\17\31>\377\237\31*e\377\2\20\32\77\377\6\12\33\377" \ ++ "\244\7\13\33\377\2\6\12\32\377\26%Z\377\226\31*e\377\3\30)d\377\7\13" \ ++ "\33\377\6\13\33\377\222\7\13\33\377\3\10\16\"\377\10\16#\377\11\15#\377" \ ++ "\204\11\15\"\377\1\11\15#\377\213\11\16#\377\1\12\17%\377\204\36.h\377" \ ++ "\1\35-g\377\203\36.h\377\6\36.g\377\35-g\377\33,f\377\32+e\377\32*e\377" \ ++ "\31*e\377\204\30)d\377\232\31*e\377\1\24\"R\377\206\7\13\33\377\1\6\12" \ ++ "\34\377\377\31*e\377\317\31*e\377\2\21\34E\377\6\12\33\377\242\7\13\33" \ ++ "\377\4\7\12\33\377\33,g\377\32+f\377\31*e\377\205\30)d\377\220\31*e\377" \ ++ "\1\6\12\33\377\231\7\13\33\377\1\17\31>\377\237\31*e\377\2\17\32\77\377" \ ++ "\6\13\33\377\244\7\13\33\377\2\6\12\33\377\26%Z\377\226\31*e\377\3\30" \ ++ ")d\377\6\13\35\377\6\13\32\377\221\7\13\33\377\2\7\12\33\377\6\13\33" \ ++ "\377\222\7\13\33\377\3\7\13\34\377\36.h\377\35-g\377\203\36.h\377\3\35" \ ++ "-g\377\33,g\377\32+e\377\203\31*e\377\204\30)d\377\235\31*e\377\1\24" \ ++ "\"R\377\206\7\13\33\377\3\6\12\34\377\21\34D\377\25$W\377\210\31*e\377" \ ++ "\4\17\32\77\377\16\27""9\377\17\31>\377\20\33C\377\212\20\33B\377\205" \ ++ "\22\37K\377\2\23\40N\377\24\"T\377\203\25#U\377\2\24\"T\377\25$X\377" \ ++ "\205\27'^\377\1\30)c\377\377\31*e\377\245\31*e\377\2\21\34E\377\6\13" \ ++ "\33\377\243\7\13\33\377\203\36.h\377\202\35.h\377\2\33,f\377\32+f\377" \ ++ "\205\31*e\377\205\30)d\377\207\31*e\377\1\6\12\33\377\231\7\13\33\377" \ ++ "\1\17\32>\377\237\31*e\377\1\16\30;\377\245\7\13\33\377\2\7\13\32\377" \ ++ "\26%Z\377\226\31*e\377\2\30)d\377\6\14\35\377\246\7\13\33\377\1\7\13" \ ++ "\34\377\202\35-g\377\3\33,f\377\32+e\377\31*e\377\203\30)d\377\244\31" \ ++ "*e\377\1\24\"R\377\206\7\13\33\377\3\6\12\33\377\7\14\36\377\24\"R\377" \ ++ "\206\31*e\377\2\30(a\377\15\25""5\377\202\7\13\33\377\1\6\13\32\377\212" \ ++ "\7\13\33\377\3\6\12\33\377\7\13\33\377\6\13\33\377\202\7\13\33\377\3" \ ++ "\7\12\32\377\7\12\33\377\6\13\32\377\212\7\13\33\377\2\11\17$\377\27" \ ++ "'^\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33" \ ++ "\377\202\36.h\377\2\35-g\377\36-g\377\204\36.h\377\6\35.h\377\34-g\377" \ ++ "\34,f\377\33,g\377\32+e\377\32+f\377\203\31*e\377\206\30)d\377\2\31*" \ ++ "e\377\6\12\33\377\231\7\13\33\377\1\17\32>\377\203\31*e\377\203\30)d" \ ++ "\377\1\30(b\377\203\27(`\377\1\27'^\377\203\26&\\\377\1\26%Y\377\203" \ ++ "\25$W\377\1\25$X\377\203\25$W\377\3\25#U\377\24\"R\377\30(a\377\203\31" \ ++ "*e\377\1\26%Z\377\202\25$W\377\2\14\26""5\377\6\12\32\377\245\7\13\33" \ ++ "\377\1\25#U\377\226\31*e\377\2\30)d\377\7\15!\377\246\7\13\33\377\2\7" \ ++ "\13\34\377\31*e\377\204\30)d\377\247\31*e\377\1\24\"R\377\207\7\13\33" \ ++ "\377\2\11\17&\377\27'_\377\205\31*e\377\3\30(b\377\14\26""5\377\6\13" \ ++ "\32\377\236\7\13\33\377\3\7\13\32\377\11\20&\377\27'^\377\377\31*e\377" \ ++ "\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\206\36.h\377\2" \ ++ "\36-g\377\35-g\377\205\36.h\377\11\35.h\377\35-g\377\30%V\377\24\40K" \ ++ "\377\23\37I\377\25\"Q\377\30'^\377\31+f\377\31*e\377\202\30)d\377\1\6" \ ++ "\12\33\377\231\7\13\33\377\1\17\31>\377\202\31*e\377\2\17\31\77\377\13" \ ++ "\21,\377\202\12\22-\377\14\13\22,\377\12\21)\377\12\20*\377\12\20)\377" \ ++ "\11\20(\377\12\20'\377\12\20&\377\11\17'\377\11\17%\377\10\16#\377\11" \ ++ "\17$\377\10\17#\377\203\11\17$\377\4\10\16$\377\10\15#\377\7\13\35\377" \ ++ "\25$W\377\203\31*e\377\4\14\23""1\377\11\17$\377\11\17#\377\7\13\37\377" \ ++ "\246\7\13\33\377\1\24\"R\377\224\31*e\377\202\30)d\377\2\27(c\377\11" \ ++ "\16%\377\246\7\13\33\377\1\7\13\34\377\202\30)d\377\252\31*e\377\1\24" \ ++ "\"R\377\207\7\13\33\377\1\13\24""2\377\205\31*e\377\4\30(a\377\13\22" \ ++ "-\377\7\13\33\377\6\13\32\377\236\7\13\33\377\3\7\13\32\377\11\17#\377" \ ++ "\27&]\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13" \ ++ "\33\377\203\36.h\377\1\36-g\377\207\36.h\377\5\26!M\377\17\30:\377\11" \ ++ "\20%\377\10\14\36\377\7\13\35\377\202\7\12\33\377\7\7\13\35\377\6\13" \ ++ "\35\377\7\14\37\377\12\17&\377\17\30""8\377\23\37H\377\7\12\33\377\231" \ ++ "\7\13\33\377\1\17\31>\377\202\31*e\377\2\13\22-\377\6\12\32\377\202\7" \ ++ "\13\33\377\6\6\12\32\377\6\12\33\377\7\13\33\377\6\13\33\377\7\12\32" \ ++ "\377\6\13\33\377\202\7\13\33\377\5\6\13\32\377\6\12\33\377\7\13\33\377" \ ++ "\6\12\33\377\6\13\33\377\202\7\13\33\377\4\7\12\33\377\7\13\33\377\6" \ ++ "\12\32\377\25#U\377\203\31*e\377\3\12\20)\377\7\12\33\377\7\13\32\377" \ ++ "\246\7\13\33\377\2\6\13\33\377\24!R\377\216\31*e\377\206\30)d\377\203" \ ++ "\31*e\377\1\10\16$\377\246\7\13\33\377\1\7\13\34\377\254\31*e\377\1\24" \ ++ "!R\377\206\7\13\33\377\2\6\13\32\377\21\35G\377\204\31*e\377\5\27&]\377" \ ++ "\12\20(\377\6\13\33\377\6\12\32\377\6\13\32\377\236\7\13\33\377\3\6\13" \ ++ "\33\377\7\15!\377\27&]\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\13" \ ++ "\33\377\243\7\13\33\377\3\31*e\377\33,f\377\34-g\377\204\35-g\377\204" \ ++ "\36.h\377\1\12\21*\377\210\7\13\33\377\1\7\13\32\377\203\7\13\33\377" \ ++ "\1\6\13\32\377\231\7\13\33\377\5\16\31>\377\30)d\377\31*e\377\13\23." \ ++ "\377\6\12\32\377\224\7\13\33\377\1\25#U\377\203\31*e\377\1\11\20)\377" \ ++ "\251\7\13\33\377\1\23!P\377\206\30)d\377\210\31*e\377\12\32+f\377\33" \ ++ "+f\377\34,g\377\34-h\377\35.h\377\36.h\377\36/i\377\36.h\377\35-g\377" \ ++ "\14\22,\377\246\7\13\33\377\1\7\13\34\377\254\31*e\377\2\26%[\377\11" \ ++ "\17&\377\205\7\13\33\377\2\6\13\34\377\26&\\\377\203\31*e\377\4\27(`" \ ++ "\377\13\23.\377\7\13\33\377\6\13\33\377\241\7\13\33\377\2\7\15\40\377" \ ++ "\26&]\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13" \ ++ "\33\377\204\30)d\377\4\31*e\377\32+e\377\33+f\377\34,f\377\202\34-g\377" \ ++ "\2\35-g\377\13\22,\377\246\7\13\33\377\5\17\32>\377\31*e\377\30)d\377" \ ++ "\13\22.\377\6\12\32\377\224\7\13\33\377\1\25#U\377\203\31*e\377\1\11" \ ++ "\20)\377\251\7\13\33\377\1\22\36K\377\202\31*e\377\204\32+f\377\6\33" \ ++ ",g\377\33,f\377\34,g\377\34-g\377\35-h\377\35.h\377\206\36.h\377\2\36" \ ++ "-h\377\35-g\377\202\36-g\377\2\35-g\377\13\22-\377\246\7\13\33\377\1" \ ++ "\7\13\34\377\255\31*e\377\2\17\31>\377\6\12\32\377\203\7\13\33\377\2" \ ++ "\6\12\32\377\10\15\40\377\204\31*e\377\3\26%Y\377\10\16\"\377\6\12\32" \ ++ "\377\241\7\13\33\377\3\6\13\32\377\6\13\34\377\26&[\377\377\31*e\377" \ ++ "\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\204\31*e\377\204" \ ++ "\30)d\377\203\31*e\377\1\12\22+\377\246\7\13\33\377\5\20\33\77\377\34" \ ++ "-h\377\34-g\377\13\20)\377\7\12\33\377\224\7\13\33\377\1\24\"T\377\203" \ ++ "\30)d\377\2\11\20)\377\7\12\33\377\250\7\13\33\377\1\25\40K\377\202\35" \ ++ "-g\377\2\35-h\377\35.h\377\206\36.h\377\4\36.g\377\36-h\377\36.h\377" \ ++ "\35-g\377\202\36-g\377\206\36.h\377\3\35-g\377\15\24/\377\6\12\33\377" \ ++ "\245\7\13\33\377\1\7\13\34\377\255\31*e\377\2\23!P\377\10\14\37\377\203" \ ++ "\7\13\33\377\2\6\13\33\377\7\14\37\377\204\31*e\377\2\25#V\377\7\14\36" \ ++ "\377\242\7\13\33\377\3\7\12\32\377\6\13\33\377\26&\\\377\377\31*e\377" \ ++ "\244\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\210\31*e\377\203" \ ++ "\30)d\377\1\12\21+\377\246\7\13\33\377\1\21\33\77\377\202\36.h\377\2" \ ++ "\11\17%\377\6\13\32\377\223\7\13\33\377\3\7\12\32\377\27%W\377\34,g\377" \ ++ "\202\33,g\377\2\13\21*\377\7\12\33\377\247\7\13\33\377\2\6\13\33\377" \ ++ "\25!L\377\202\36.h\377\4\36.g\377\36-h\377\36.h\377\35-g\377\202\36-" \ ++ "g\377\212\36.h\377\2\35.h\377\36-g\377\202\36.h\377\3\35-g\377\17\27" \ ++ "5\377\6\12\32\377\245\7\13\33\377\1\7\13\34\377\255\31*e\377\2\27'_\377" \ ++ "\11\16#\377\204\7\13\33\377\1\7\13\35\377\204\31*e\377\3\24\"S\377\6" \ ++ "\13\32\377\6\12\32\377\241\7\13\33\377\3\7\12\32\377\7\13\33\377\26%" \ ++ "Z\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\13\33\377\243\7\13\33" \ ++ "\377\213\31*e\377\1\12\22+\377\246\7\13\33\377\1\21\34@\377\202\36.h" \ ++ "\377\2\12\17&\377\6\13\32\377\224\7\13\33\377\1\31%W\377\202\36.h\377" \ ++ "\2\35,e\377\12\21(\377\251\7\13\33\377\1\25!L\377\204\36.h\377\2\35." \ ++ "h\377\36-h\377\207\36.h\377\1\35-h\377\206\35-g\377\5\34,g\377\33,f\377" \ ++ "\32*e\377\15\26""5\377\7\13\32\377\245\7\13\33\377\1\7\13\34\377\256" \ ++ "\31*e\377\1\12\20(\377\204\7\13\33\377\2\7\12\33\377\30(a\377\203\31" \ ++ "*e\377\1\24!Q\377\245\7\13\33\377\1\26%Z\377\377\31*e\377\244\31*e\377" \ ++ "\2\21\34E\377\6\12\33\377\243\7\13\33\377\213\31*e\377\1\12\22+\377\246" \ ++ "\7\13\33\377\5\21\34@\377\36.h\377\36-h\377\12\17&\377\6\12\33\377\223" \ ++ "\7\13\33\377\5\7\12\33\377\31'Y\377\36.h\377\30%V\377\13\23,\377\252" \ ++ "\7\13\33\377\1\25!L\377\205\36.h\377\2\35.h\377\35-h\377\203\35-g\377" \ ++ "\202\34,g\377\1\34,f\377\202\33+f\377\2\32+f\377\32+e\377\202\31*e\377" \ ++ "\203\30)d\377\3\27(c\377\15\25""4\377\7\13\32\377\245\7\13\33\377\1\7" \ ++ "\13\34\377\256\31*e\377\1\16\27""9\377\204\7\13\33\377\2\6\13\34\377" \ ++ "\26%Y\377\203\31*e\377\2\21\36I\377\7\12\33\377\243\7\13\33\377\2\7\12" \ ++ "\32\377\26%Z\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\12\33\377\243" \ ++ "\7\13\33\377\213\31*e\377\1\12\22+\377\246\7\13\33\377\5\21\33\77\377" \ ++ "\35-h\377\35.h\377\10\16!\377\7\12\33\377\223\7\13\33\377\5\7\13\32\377" \ ++ "\22\34A\377\20\31""9\377\11\16\"\377\7\12\33\377\252\7\13\33\377\1\24" \ ++ "\40K\377\202\34,f\377\2\33,f\377\33+f\377\202\32+f\377\1\32*e\377\205" \ ++ "\31*e\377\207\30)d\377\203\31*e\377\3\30)d\377\15\25""5\377\7\13\32\377" \ ++ "\245\7\13\33\377\1\7\13\34\377\256\31*e\377\2\21\35F\377\6\12\33\377" \ ++ "\203\7\13\33\377\2\6\13\34\377\24\"R\377\202\31*e\377\2\30)d\377\17\32" \ ++ "@\377\244\7\13\33\377\2\7\12\33\377\26%Z\377\377\31*e\377\244\31*e\377" \ ++ "\2\21\34E\377\6\12\33\377\243\7\13\33\377\213\31*e\377\1\12\21+\377\246" \ ++ "\7\13\33\377\1\17\31>\377\202\31*e\377\2\6\13\34\377\7\12\33\377\223" \ ++ "\7\13\33\377\5\6\12\32\377\6\13\34\377\6\13\33\377\7\13\33\377\6\13\33" \ ++ "\377\251\7\13\33\377\2\7\12\32\377\20\33B\377\204\31*e\377\210\30)d\377" \ ++ "\212\31*e\377\2\30)d\377\14\25""4\377\246\7\13\33\377\1\7\13\34\377\256" \ ++ "\31*e\377\1\24\"R\377\204\7\13\33\377\2\7\13\34\377\22\37L\377\202\31" \ ++ "*e\377\3\30)d\377\16\27""8\377\6\13\32\377\243\7\13\33\377\2\6\12\32" \ ++ "\377\26%Z\377\377\31*e\377\244\31*e\377\2\21\34E\377\6\13\33\377\243" \ ++ "\7\13\33\377\213\31*e\377\1\13\22,\377\246\7\13\33\377\1\17\32>\377\202" \ ++ "\31*e\377\1\7\14\35\377\303\7\13\33\377\1\20\33B\377\227\31*e\377\1\17" \ ++ "\31=\377\246\7\13\33\377\1\7\13\34\377\256\31*e\377\3\27'`\377\7\13\32" \ ++ "\377\6\13\32\377\202\7\13\33\377\2\7\13\34\377\22\37K\377\202\31*e\377" \ ++ "\2\30)d\377\14\25""3\377\245\7\13\33\377\1\25#T\377\377\31*e\377\244" \ ++ "\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\205\31*e\377\7\30" \ ++ ")c\377\27'^\377\26%Z\377\25$W\377\24\"R\377\23!P\377\11\16%\377\246\7" \ ++ "\13\33\377\1\17\32>\377\202\31*e\377\1\7\13\35\377\303\7\13\33\377\1" \ ++ "\20\32@\377\227\31*e\377\1\17\31<\377\246\7\13\33\377\1\7\13\34\377\234" \ ++ "\31*e\377\1\25$X\377\221\26%Y\377\1\27'^\377\205\7\13\33\377\1\20\33" \ ++ "A\377\202\31*e\377\2\30)d\377\15\25""4\377\244\7\13\33\377\3\7\12\32" \ ++ "\377\22\36I\377\26%[\377\377\31*e\377\243\31*e\377\2\21\34E\377\6\12" \ ++ "\33\377\243\7\13\33\377\14\24!P\377\22\36I\377\20\32@\377\15\26""7\377" \ ++ "\15\25""4\377\13\23""0\377\12\21*\377\12\20'\377\11\16$\377\7\13\37\377" \ ++ "\7\13\33\377\6\12\33\377\246\7\13\33\377\1\17\31>\377\202\31*e\377\1" \ ++ "\6\12\33\377\302\7\13\33\377\2\7\13\32\377\16\30:\377\227\31*e\377\2" \ ++ "\20\32@\377\6\12\32\377\245\7\13\33\377\1\7\13\34\377\233\31*e\377\2" \ ++ "\30)c\377\10\15!\377\221\11\17&\377\2\11\20'\377\6\12\33\377\204\7\13" \ ++ "\33\377\1\16\30""9\377\202\31*e\377\3\30)d\377\13\23/\377\6\12\33\377" \ ++ "\244\7\13\33\377\4\11\16#\377\11\17'\377\16\30:\377\27'`\377\377\31*" \ ++ "e\377\241\31*e\377\2\21\34E\377\6\12\33\377\243\7\13\33\377\11\7\13\36" \ ++ "\377\7\13\35\377\7\13\34\377\7\13\32\377\6\13\33\377\6\13\32\377\7\12" \ ++ "\33\377\7\13\33\377\7\12\32\377\202\7\13\33\377\1\7\12\33\377\246\7\13" \ ++ "\33\377\1\17\31>\377\202\31*e\377\2\6\13\32\377\7\12\33\377\301\7\13" \ ++ "\33\377\2\6\12\32\377\16\30:\377\227\31*e\377\1\21\34D\377\246\7\13\33" \ ++ "\377\1\7\13\34\377\233\31*e\377\2\30)c\377\7\13\33\377\221\6\13\33\377" \ ++ "\202\7\13\33\377\1\6\13\33\377\202\7\13\33\377\2\7\13\32\377\14\24""3" \ ++ "\377\202\31*e\377\2\30)c\377\13\21,\377\244\7\13\33\377\1\6\12\33\377" \ ++ "\202\7\13\33\377\3\7\13\32\377\11\17&\377\26%Y\377\377\31*e\377\240\31" \ ++ "*e\377\2\21\34E\377\6\13\33\377\325\7\13\33\377\1\17\32>\377\202\31*" \ ++ "e\377\304\7\13\33\377\1\13\24""2\377\227\31*e\377\1\20\34D\377\246\7" \ ++ "\13\33\377\1\7\13\34\377\233\31*e\377\1\30)c\377\227\7\13\33\377\2\6" \ ++ "\13\32\377\12\22,\377\202\31*e\377\2\30)c\377\10\17%\377\252\7\13\33" \ ++ "\377\4\24!Q\377\30)c\377\30)b\377\30(b\377\377\31*e\377\234\31*e\377" \ ++ "\2\21\34E\377\6\12\33\377\325\7\13\33\377\1\17\32>\377\202\31*e\377\304" \ ++ "\7\13\33\377\1\14\24""2\377\227\31*e\377\2\22\37J\377\6\13\32\377\245" \ ++ "\7\13\33\377\4\7\13\34\377\26%[\377\26&\\\377\30(b\377\230\31*e\377\1" \ ++ "\26&[\377\230\7\13\33\377\1\13\22,\377\202\31*e\377\2\30)c\377\11\17" \ ++ "$\377\253\7\13\33\377\3\13\22/\377\14\24""1\377\13\23.\377\377\31*e\377" \ ++ "\234\31*e\377\2\21\34E\377\6\12\33\377\325\7\13\33\377\1\17\31>\377\202" \ ++ "\31*e\377\1\7\13\32\377\302\7\13\33\377\2\7\13\32\377\13\22-\377\227" \ ++ "\31*e\377\2\23\37L\377\7\12\32\377\245\7\13\33\377\7\6\13\32\377\10\15" \ ++ "#\377\12\20(\377\13\22.\377\15\26""7\377\21\34E\377\26%Z\377\223\31*" \ ++ "e\377\3\30)b\377\20\33B\377\12\20)\377\230\7\13\33\377\6\12\21)\377\30" \ ++ "(b\377\31*e\377\30)c\377\10\14\37\377\7\13\32\377\250\7\13\33\377\3\6" \ ++ "\12\33\377\7\13\33\377\6\12\32\377\202\7\13\33\377\377\31*e\377\234\31" \ ++ "*e\377\2\21\34E\377\6\12\33\377\325\7\13\33\377\1\17\31>\377\202\31*" \ ++ "e\377\303\7\13\33\377\2\6\12\33\377\12\21*\377\227\31*e\377\1\23\40O" \ ++ "\377\247\7\13\33\377\1\7\13\32\377\203\7\13\33\377\4\7\13\35\377\10\13" \ ++ "\37\377\13\22,\377\26%Z\377\206\31*e\377\205\27(`\377\3\27'`\377\27'" \ ++ "_\377\25$X\377\202\25$W\377\2\22\36J\377\10\16$\377\231\7\13\33\377\7" \ ++ "\6\13\32\377\11\20&\377\27&]\377\31*e\377\30)c\377\7\13\35\377\6\12\32" \ ++ "\377\255\7\13\33\377\377\31*e\377\234\31*e\377\2\21\34E\377\6\13\33\377" \ ++ "\325\7\13\33\377\1\17\32>\377\202\31*e\377\304\7\13\33\377\1\12\20*\377" \ ++ "\227\31*e\377\1\24#T\377\255\7\13\33\377\3\6\13\33\377\7\13\33\377\21" \ ++ "\35F\377\204\31*e\377\1\16\30<\377\205\6\13\32\377\206\7\13\33\377\1" \ ++ "\7\12\33\377\231\7\13\33\377\6\6\13\33\377\10\16$\377\26%Y\377\31*e\377" \ ++ "\30)c\377\7\12\34\377\256\7\13\33\377\1\31*e\377\204\30)b\377\202\30" \ ++ ")c\377\1\30)d\377\377\31*e\377\224\31*e\377\2\21\34E\377\6\12\33\377" \ ++ "\325\7\13\33\377\3\17\32>\377\31*e\377\30)c\377\304\7\13\33\377\1\12" \ ++ "\20*\377\227\31*e\377\1\24\"T\377\257\7\13\33\377\2\10\16\"\377\26%Y" \ ++ "\377\202\31*e\377\2\30(a\377\14\24""0\377\246\7\13\33\377\5\11\15#\377" \ ++ "\25$V\377\31*e\377\30)c\377\6\13\32\377\256\7\13\33\377\205\14\24""1" \ ++ "\377\7\14\25""3\377\16\27""8\377\20\33A\377\22\37K\377\23!Q\377\25$W" \ ++ "\377\27&\\\377\377\31*e\377\220\31*e\377\2\21\34E\377\6\13\33\377\325" \ ++ "\7\13\33\377\3\17\31>\377\31*e\377\27&]\377\303\7\13\33\377\2\7\12\33" \ ++ "\377\11\21)\377\227\31*e\377\1\24\"T\377\256\7\13\33\377\3\7\13\32\377" \ ++ "\10\13\37\377\23\40N\377\202\31*e\377\3\26%Z\377\10\16#\377\6\12\32\377" \ ++ "\244\7\13\33\377\6\7\12\33\377\10\15!\377\24\"S\377\31*e\377\30)c\377" \ ++ "\6\12\32\377\266\7\13\33\377\5\6\12\32\377\7\13\32\377\10\16\"\377\12" \ ++ "\20'\377\27'^\377\366\31*e\377\1\23\40O\377\227\31*e\377\1\22\37L\377" \ ++ "\326\7\13\33\377\3\17\31>\377\31*e\377\26&\\\377\303\7\13\33\377\2\7" \ ++ "\12\32\377\12\20(\377\227\31*e\377\1\24\"T\377\202\7\12\32\377\254\7" \ ++ "\13\33\377\3\7\13\32\377\6\12\32\377\21\33D\377\202\31*e\377\1\24\"S" \ ++ "\377\202\6\12\32\377\245\7\13\33\377\5\7\14\36\377\23\40N\377\31*e\377" \ ++ "\30)c\377\6\12\33\377\271\7\13\33\377\2\6\12\33\377\12\22-\377\365\31" \ ++ "*e\377\2\27'^\377\10\15\37\377\227\31*e\377\2\23\40N\377\7\13\32\377" \ ++ "\325\7\13\33\377\4\17\32>\377\31*e\377\26&\\\377\6\12\33\377\303\7\13" \ ++ "\33\377\2\12\20(\377\30)d\377\226\31*e\377\1\25#V\377\260\7\13\33\377" \ ++ "\5\15\27""7\377\30)b\377\30)d\377\17\32\77\377\6\12\32\377\245\7\13\33" \ ++ "\377\6\7\12\33\377\7\13\34\377\22\36I\377\31*e\377\30)c\377\6\12\32\377" \ ++ "\273\7\13\33\377\1\22\36H\377\212\31*e\377\25\30)d\377\30)c\377\30(b" \ ++ "\377\30(a\377\27'`\377\25\"T\377\22\36J\377\17\32>\377\17\31=\377\15" \ ++ "\26""5\377\12\22-\377\10\16\"\377\12\20'\377\13\23/\377\16\30:\377\17" \ ++ "\31=\377\21\34D\377\23\40M\377\25#V\377\27(`\377\30(a\377\202\30(b\377" \ ++ "\1\30)b\377\202\30)c\377\317\31*e\377\3\30)b\377\14\24""2\377\6\12\33" \ ++ "\377\227\31*e\377\1\23\40N\377\326\7\13\33\377\3\17\32>\377\31*e\377" \ ++ "\26%Y\377\303\7\13\33\377\3\6\13\33\377\11\17&\377\27(`\377\226\31*e" \ ++ "\377\3\25$V\377\7\13\33\377\6\12\33\377\255\7\13\33\377\5\7\13\32\377" \ ++ "\12\21*\377\27'_\377\30)d\377\12\21+\377\247\7\13\33\377\5\6\12\33\377" \ ++ "\21\35F\377\31*e\377\30)c\377\6\12\32\377\272\7\13\33\377\3\7\12\32\377" \ ++ "\12\20(\377\30(a\377\210\31*e\377\10\27'`\377\20\32@\377\13\23""0\377" \ ++ "\11\16#\377\7\13\33\377\6\13\33\377\7\13\33\377\6\13\32\377\203\7\13" \ ++ "\33\377\3\6\13\33\377\7\13\33\377\7\12\33\377\206\7\13\33\377\7\6\13" \ ++ "\32\377\7\13\33\377\7\13\35\377\11\17$\377\12\21+\377\14\24""2\377\20" \ ++ "\33A\377\317\31*e\377\1\23\40N\377\202\7\13\33\377\227\31*e\377\1\23" \ ++ "\40N\377\326\7\13\33\377\3\17\31>\377\31*e\377\24\"S\377\304\7\13\33" \ ++ "\377\2\11\17%\377\27'_\377\226\31*e\377\3\25$X\377\7\14\35\377\6\12\32" \ ++ "\377\256\7\13\33\377\4\7\14\35\377\26%Z\377\30)d\377\7\13\32\377\250" \ ++ "\7\13\33\377\4\20\34D\377\31*e\377\30)c\377\6\12\32\377\272\7\13\33\377" \ ++ "\3\6\13\32\377\10\16#\377\25$X\377\210\31*e\377\4\20\34C\377\7\12\33" \ ++ "\377\7\13\33\377\7\13\32\377\220\7\13\33\377\1\6\13\33\377\202\7\12\33" \ ++ "\377\203\7\13\33\377\1\13\23/\377\316\31*e\377\4\30)d\377\21\35F\377" \ ++ "\6\12\32\377\7\13\33\377\227\31*e\377\2\23\40N\377\7\13\32\377\325\7" \ ++ "\13\33\377\4\17\31>\377\31*e\377\24\"S\377\6\12\33\377\302\7\13\33\377" \ ++ "\3\6\12\32\377\11\17%\377\26&\\\377\226\31*e\377\3\26%Y\377\10\15\40" \ ++ "\377\6\13\32\377\255\7\13\33\377\5\6\13\33\377\6\12\32\377\25$X\377\27" \ ++ "'^\377\6\12\33\377\250\7\13\33\377\4\17\32\77\377\31*e\377\30)c\377\6" \ ++ "\12\33\377\272\7\13\33\377\3\6\12\32\377\10\16\"\377\25#U\377\210\31" \ ++ "*e\377\2\17\31>\377\7\12\33\377\230\7\13\33\377\1\13\23""0\377\316\31" \ ++ "*e\377\4\30)d\377\21\34F\377\7\12\32\377\7\13\33\377\227\31*e\377\2\23" \ ++ "\40N\377\6\12\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\24\"S\377" \ ++ "\304\7\13\33\377\2\10\16#\377\26%Z\377\226\31*e\377\2\26%Z\377\10\16" \ ++ "#\377\256\7\13\33\377\2\6\13\33\377\7\12\32\377\202\26%Z\377\251\7\13" \ ++ "\33\377\1\16\27""8\377\202\30)c\377\1\6\12\32\377\272\7\13\33\377\3\6" \ ++ "\12\32\377\10\14\36\377\23!P\377\210\31*e\377\2\17\31>\377\7\13\32\377" \ ++ "\230\7\13\33\377\1\13\23""0\377\225\31*e\377\205\30)c\377\204\30)d\377" \ ++ "\260\31*e\377\4\30)d\377\21\35F\377\7\13\33\377\6\12\32\377\227\31*e" \ ++ "\377\1\23\40N\377\326\7\13\33\377\3\17\32>\377\31*e\377\23\40O\377\304" \ ++ "\7\13\33\377\2\10\16\"\377\25$X\377\226\31*e\377\2\26&[\377\11\17$\377" \ ++ "\257\7\13\33\377\3\7\14\36\377\26%[\377\26%Z\377\250\7\13\33\377\5\6" \ ++ "\12\32\377\14\23/\377\30(a\377\30)c\377\6\12\32\377\272\7\13\33\377\3" \ ++ "\6\13\33\377\7\13\33\377\22\36J\377\210\31*e\377\2\17\31>\377\7\13\32" \ ++ "\377\230\7\13\33\377\1\13\23""0\377\225\31*e\377\13\14\24""2\377\13\22" \ ++ ",\377\15\25""3\377\14\24""3\377\14\25""3\377\16\30""9\377\17\30<\377" \ ++ "\17\33A\377\21\35E\377\22\36J\377\26&]\377\256\31*e\377\4\30)d\377\21" \ ++ "\34E\377\6\12\33\377\6\13\32\377\227\31*e\377\1\23\40N\377\326\7\13\33" \ ++ "\377\3\17\31>\377\31*e\377\22\36I\377\304\7\13\33\377\3\7\12\33\377\14" \ ++ "\23""0\377\25#U\377\225\31*e\377\3\26&\\\377\12\20'\377\7\12\32\377\256" \ ++ "\7\13\33\377\3\11\16$\377\27&]\377\26%Z\377\252\7\13\33\377\3\21\34E" \ ++ "\377\30)d\377\7\12\33\377\274\7\13\33\377\1\21\35F\377\210\31*e\377\1" \ ++ "\17\32>\377\231\7\13\33\377\1\13\23""0\377\225\31*e\377\5\10\15\"\377" \ ++ "\7\13\33\377\6\13\33\377\6\12\33\377\6\13\32\377\205\7\13\33\377\1\22" \ ++ "\37L\377\256\31*e\377\5\30)d\377\20\32@\377\6\12\32\377\7\13\33\377\27" \ ++ "'^\377\226\31*e\377\2\23\40N\377\7\13\32\377\325\7\13\33\377\4\17\31" \ ++ ">\377\31*e\377\21\36I\377\6\13\33\377\302\7\13\33\377\1\6\13\32\377\202" \ ++ "\7\13\33\377\3\7\14\37\377\16\27""8\377\30)b\377\223\31*e\377\3\27&]" \ ++ "\377\11\20)\377\6\13\32\377\256\7\13\33\377\4\13\22+\377\27'_\377\26" \ ++ "%Z\377\6\13\32\377\247\7\13\33\377\203\6\13\32\377\2\27&]\377\7\12\33" \ ++ "\377\273\7\13\33\377\2\6\12\32\377\20\33A\377\210\31*e\377\1\16\30;\377" \ ++ "\231\7\13\33\377\1\13\23""0\377\225\31*e\377\1\11\16#\377\210\7\13\33" \ ++ "\377\2\6\13\35\377\23\37M\377\256\31*e\377\5\30)d\377\17\31>\377\6\12" \ ++ "\32\377\7\13\33\377\27'_\377\226\31*e\377\2\23\40N\377\6\12\32\377\325" \ ++ "\7\13\33\377\3\17\32>\377\31*e\377\22\36I\377\306\7\13\33\377\5\7\13" \ ++ "\32\377\7\13\33\377\10\15!\377\23\40N\377\30)d\377\221\31*e\377\2\27" \ ++ "']\377\12\21*\377\257\7\13\33\377\3\12\21+\377\27'`\377\26%Z\377\247" \ ++ "\7\13\33\377\1\6\12\33\377\202\7\13\33\377\2\15\26""4\377\30)d\377\275" \ ++ "\7\13\33\377\2\16\30:\377\30)c\377\207\31*e\377\1\15\26""5\377\231\7" \ ++ "\13\33\377\1\14\23""0\377\205\31*e\377\204\30)d\377\214\31*e\377\1\11" \ ++ "\16#\377\210\7\13\33\377\2\7\13\34\377\23\37M\377\203\31*e\377\245\30" \ ++ ")d\377\206\31*e\377\2\30)c\377\15\27""7\377\202\7\13\33\377\1\25%X\377" \ ++ "\226\31*e\377\1\23\40N\377\326\7\13\33\377\3\17\32>\377\31*e\377\21\34" \ ++ "D\377\311\7\13\33\377\2\6\13\32\377\25#V\377\221\31*e\377\2\27']\377" \ ++ "\12\20*\377\257\7\13\33\377\3\13\24""0\377\30(a\377\26%Z\377\247\7\13" \ ++ "\33\377\6\6\13\33\377\7\13\33\377\11\17%\377\27'_\377\30)c\377\6\12\32" \ ++ "\377\274\7\13\33\377\2\14\24""2\377\30(a\377\207\31*e\377\2\15\26""5" \ ++ "\377\7\12\33\377\227\7\13\33\377\16\7\13\32\377\12\22.\377\27(`\377\26" \ ++ "%Y\377\25#V\377\24\"R\377\23\37L\377\20\32A\377\15\26""5\377\14\23""0" \ ++ "\377\14\25""3\377\23\40N\377\26&\\\377\30)d\377\211\31*e\377\1\11\16" \ ++ "$\377\210\7\13\33\377\7\7\13\35\377\23\40N\377\31*e\377\27&\\\377\23" \ ++ "!Q\377\16\27""8\377\14\24""3\377\243\15\25""3\377\1\23\40N\377\205\31" \ ++ "*e\377\5\30)b\377\14\25""3\377\7\13\33\377\7\12\33\377\25#U\377\226\31" \ ++ "*e\377\1\23\40N\377\326\7\13\33\377\4\17\31>\377\31*e\377\20\32\77\377" \ ++ "\7\12\33\377\307\7\13\33\377\3\6\12\32\377\7\12\32\377\26$X\377\221\31" \ ++ "*e\377\3\30(a\377\12\22,\377\7\12\32\377\256\7\13\33\377\3\15\26""7\377" \ ++ "\30)c\377\26%Z\377\247\7\13\33\377\6\7\13\32\377\7\14\37\377\23\40M\377" \ ++ "\31*e\377\30)c\377\6\12\32\377\274\7\13\33\377\2\13\22-\377\27'`\377" \ ++ "\207\31*e\377\2\15\26""5\377\7\12\33\377\230\7\13\33\377\5\10\14\37\377" \ ++ "\12\20*\377\11\16$\377\7\13\35\377\6\12\32\377\206\7\13\33\377\3\11\17" \ ++ "&\377\15\26""8\377\26$X\377\210\31*e\377\1\11\16#\377\210\7\13\33\377" \ ++ "\5\7\13\35\377\24\"S\377\31*e\377\13\22.\377\6\12\32\377\202\7\12\32" \ ++ "\377\242\7\13\33\377\3\6\13\32\377\7\14\37\377\25$X\377\204\31*e\377" \ ++ "\5\30)b\377\14\24""1\377\6\12\33\377\7\13\33\377\24!Q\377\226\31*e\377" \ ++ "\2\23\40M\377\7\13\32\377\325\7\13\33\377\4\17\31>\377\31*e\377\20\32" \ ++ "\77\377\7\12\33\377\311\7\13\33\377\1\17\31\77\377\211\22\36H\377\2\21" \ ++ "\35G\377\25$X\377\202\31*e\377\1\21\35F\377\202\22\36H\377\4\21\35H\377" \ ++ "\22\36I\377\14\24""1\377\6\12\33\377\256\7\13\33\377\4\16\30<\377\31" \ ++ "*e\377\26%Z\377\6\13\32\377\247\7\13\33\377\1\13\22,\377\202\31*e\377" \ ++ "\2\30)c\377\6\12\33\377\273\7\13\33\377\3\7\12\33\377\12\20&\377\27'" \ ++ "_\377\207\31*e\377\2\15\26""5\377\6\12\32\377\233\7\13\33\377\3\7\12" \ ++ "\33\377\7\13\33\377\6\13\33\377\205\7\13\33\377\3\6\12\33\377\6\13\33" \ ++ "\377\21\35G\377\206\31*e\377\2\30)d\377\16\27:\377\211\7\13\33\377\4" \ ++ "\7\14\34\377\26%Z\377\31*e\377\10\15#\377\245\7\13\33\377\202\6\12\32" \ ++ "\377\1\11\17&\377\204\31*e\377\5\30(b\377\12\21+\377\7\13\33\377\7\12" \ ++ "\32\377\22\37M\377\226\31*e\377\2\24#T\377\6\12\32\377\325\7\13\33\377" \ ++ "\3\17\32>\377\31*e\377\20\32\77\377\325\7\13\33\377\3\15\25""4\377\30" \ ++ ")b\377\26%[\377\204\7\13\33\377\2\10\16\"\377\12\22,\377\256\7\13\33" \ ++ "\377\4\7\12\33\377\20\33C\377\31*e\377\26%Z\377\247\7\13\33\377\2\6\13" \ ++ "\32\377\13\22-\377\202\31*e\377\2\30)c\377\6\12\32\377\273\7\13\33\377" \ ++ "\3\6\13\32\377\10\14\37\377\27&]\377\207\31*e\377\2\15\26""5\377\7\12" \ ++ "\33\377\245\7\13\33\377\1\21\35G\377\205\31*e\377\2\30)c\377\16\26""8" \ ++ "\377\202\6\12\32\377\210\7\13\33\377\4\7\14\36\377\30(b\377\31*e\377" \ ++ "\10\15#\377\246\7\13\33\377\3\6\13\33\377\7\13\33\377\14\24""0\377\203" \ ++ "\31*e\377\5\30(a\377\10\16\"\377\7\13\32\377\7\13\33\377\21\34E\377\226" \ ++ "\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377" \ ++ "\20\32\77\377\325\7\13\33\377\3\10\16#\377\26&\\\377\26%[\377\203\7\13" \ ++ "\33\377\3\7\12\32\377\7\14\34\377\7\15\40\377\257\7\13\33\377\3\20\32" \ ++ "@\377\31*e\377\26%Z\377\247\7\13\33\377\2\6\13\32\377\13\22-\377\202" \ ++ "\31*e\377\2\30)c\377\6\12\32\377\273\7\13\33\377\3\7\12\33\377\7\13\33" \ ++ "\377\26%[\377\207\31*e\377\1\14\24""1\377\246\7\13\33\377\1\21\35G\377" \ ++ "\204\31*e\377\4\27'`\377\14\24""2\377\7\13\33\377\7\13\32\377\210\7\13" \ ++ "\33\377\2\7\12\33\377\7\14\35\377\202\31*e\377\1\10\15#\377\251\7\13" \ ++ "\33\377\1\20\34D\377\202\31*e\377\5\30(`\377\6\13\32\377\7\13\33\377" \ ++ "\6\13\33\377\20\34C\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13" \ ++ "\33\377\3\17\32>\377\31*e\377\20\32\77\377\324\7\13\33\377\4\7\13\32" \ ++ "\377\7\13\33\377\26%Y\377\24!P\377\264\7\13\33\377\4\7\13\32\377\11\17" \ ++ "$\377\26%[\377\26%Z\377\247\7\13\33\377\2\6\13\33\377\13\23.\377\203" \ ++ "\31*e\377\1\6\12\32\377\275\7\13\33\377\1\26$Y\377\207\31*e\377\2\13" \ ++ "\22-\377\6\13\33\377\245\7\13\33\377\1\21\35G\377\203\31*e\377\3\26%" \ ++ "[\377\13\22-\377\7\12\32\377\212\7\13\33\377\2\6\13\33\377\10\15!\377" \ ++ "\202\31*e\377\1\10\15#\377\250\7\13\33\377\5\7\12\33\377\10\15\37\377" \ ++ "\24\"S\377\31*e\377\26&\\\377\203\7\13\33\377\1\20\34D\377\226\31*e\377" \ ++ "\2\25$W\377\7\13\32\377\325\7\13\33\377\4\17\31>\377\31*e\377\20\32\77" \ ++ "\377\7\12\33\377\323\7\13\33\377\4\7\13\32\377\6\12\32\377\25$W\377\16" \ ++ "\27""9\377\265\7\13\33\377\4\7\13\32\377\12\21*\377\26%[\377\6\13\32" \ ++ "\377\247\7\13\33\377\5\11\17&\377\22\37K\377\22\35I\377\21\35G\377\6" \ ++ "\13\33\377\275\7\13\33\377\1\23\40O\377\207\31*e\377\2\12\22,\377\6\13" \ ++ "\33\377\244\7\13\33\377\2\7\12\32\377\21\35G\377\202\31*e\377\2\26%Z" \ ++ "\377\11\20'\377\214\7\13\33\377\2\6\13\32\377\13\22-\377\202\31*e\377" \ ++ "\1\10\15#\377\250\7\13\33\377\5\6\12\33\377\6\12\32\377\11\17&\377\30" \ ++ ")b\377\23\40M\377\203\7\13\33\377\1\17\31>\377\226\31*e\377\2\25$W\377" \ ++ "\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\17\32\77\377\325\7" \ ++ "\13\33\377\4\6\12\33\377\22\36J\377\7\13\33\377\7\12\32\377\266\7\13" \ ++ "\33\377\2\13\21-\377\6\12\32\377\351\7\13\33\377\1\20\33C\377\207\31" \ ++ "*e\377\2\13\22-\377\6\13\33\377\245\7\13\33\377\4\21\35G\377\31*e\377" \ ++ "\27'^\377\10\14\37\377\216\7\13\33\377\1\16\27""9\377\202\31*e\377\1" \ ++ "\10\15#\377\252\7\13\33\377\7\6\12\32\377\15\26""6\377\20\32A\377\7\13" \ ++ "\32\377\7\13\33\377\6\13\32\377\15\27""8\377\226\31*e\377\2\25$W\377" \ ++ "\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\15\26""7\377\325\7" \ ++ "\13\33\377\3\6\13\33\377\10\15\40\377\6\13\33\377\377\7\13\33\377\243" \ ++ "\7\13\33\377\1\15\27""8\377\207\31*e\377\1\13\22-\377\246\7\13\33\377" \ ++ "\3\21\35G\377\31*e\377\21\34E\377\217\7\13\33\377\1\21\34D\377\202\31" \ ++ "*e\377\1\10\15#\377\253\7\13\33\377\6\7\12\32\377\11\16#\377\7\12\33" \ ++ "\377\7\13\33\377\7\13\32\377\13\23""0\377\226\31*e\377\2\25$W\377\7\13" \ ++ "\32\377\325\7\13\33\377\3\17\32>\377\31*e\377\15\26""7\377\325\7\13\33" \ ++ "\377\202\7\13\32\377\377\7\13\33\377\243\7\13\33\377\2\7\13\32\377\15" \ ++ "\26""5\377\207\31*e\377\2\12\21*\377\6\13\33\377\245\7\13\33\377\3\21" \ ++ "\35G\377\31*e\377\14\23.\377\217\7\13\33\377\1\22\37K\377\202\31*e\377" \ ++ "\1\10\15#\377\253\7\13\33\377\2\7\13\32\377\6\13\33\377\203\7\13\33\377" \ ++ "\1\12\21+\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17" \ ++ "\31>\377\31*e\377\15\26""7\377\377\7\13\33\377\373\7\13\33\377\1\12\20" \ ++ "(\377\207\31*e\377\2\11\17%\377\6\13\33\377\244\7\13\33\377\3\7\12\32" \ ++ "\377\22\36I\377\31*e\377\202\6\13\32\377\215\7\13\33\377\2\7\12\33\377" \ ++ "\25$X\377\202\31*e\377\1\10\15#\377\257\7\13\33\377\2\6\12\32\377\10" \ ++ "\15!\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32" \ ++ ">\377\31*e\377\14\25""3\377\377\7\13\33\377\373\7\13\33\377\1\7\12\34" \ ++ "\377\207\31*e\377\1\11\17%\377\246\7\13\33\377\2\14\24""1\377\15\27""8" \ ++ "\377\220\7\13\33\377\203\31*e\377\1\10\15#\377\260\7\13\33\377\1\10\15" \ ++ "\37\377\226\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32>" \ ++ "\377\31*e\377\13\22-\377\377\7\13\33\377\373\7\13\33\377\5\6\12\32\377" \ ++ "\26&\\\377\27'^\377\30(`\377\30)b\377\203\31*e\377\1\11\17%\377\246\7" \ ++ "\13\33\377\3\6\13\33\377\7\13\33\377\7\12\33\377\217\7\13\33\377\4\30" \ ++ "(`\377\27'^\377\30)c\377\10\15\"\377\260\7\13\33\377\1\10\15\37\377\226" \ ++ "\31*e\377\2\25$W\377\7\13\32\377\325\7\13\33\377\3\17\32>\377\31*e\377" \ ++ "\13\22-\377\377\7\13\33\377\374\7\13\33\377\5\7\15\40\377\13\22,\377" \ ++ "\13\24""1\377\15\25""6\377\23\40M\377\202\31*e\377\1\11\17%\377\267\7" \ ++ "\13\33\377\5\7\13\34\377\13\22,\377\13\21*\377\12\22,\377\7\13\35\377" \ ++ "\260\7\13\33\377\2\7\14\37\377\30(a\377\225\31*e\377\2\25$W\377\7\13" \ ++ "\32\377\325\7\13\33\377\3\17\31>\377\31*e\377\13\23.\377\377\7\13\33" \ ++ "\377\373\7\13\33\377\3\6\13\33\377\7\13\33\377\6\12\32\377\202\7\13\33" \ ++ "\377\1\15\27""8\377\202\31*e\377\1\11\17%\377\270\7\13\33\377\3\6\12" \ ++ "\32\377\7\13\33\377\6\13\32\377\261\7\13\33\377\2\7\13\36\377\27&]\377" \ ++ "\225\31*e\377\2\25$V\377\7\13\32\377\325\7\13\33\377\4\17\31>\377\31" \ ++ "*e\377\11\17$\377\7\12\33\377\377\7\13\33\377\377\7\13\33\377\1\16\27" \ ++ "7\377\202\31*e\377\1\11\17%\377\354\7\13\33\377\2\6\13\34\377\25#U\377" \ ++ "\225\31*e\377\1\26&[\377\326\7\13\33\377\3\17\32>\377\31*e\377\11\17" \ ++ "$\377\377\7\13\33\377\377\7\13\33\377\2\7\13\33\377\14\23/\377\202\31" \ ++ "*e\377\1\11\17%\377\354\7\13\33\377\20\7\13\34\377\14\24""0\377\15\26" \ ++ "7\377\15\26""6\377\15\26""5\377\21\34D\377\31*e\377\30)c\377\27'^\377" \ ++ "\24\"S\377\15\26""7\377\11\17%\377\17\30;\377\24\"R\377\27&]\377\30(" \ ++ "b\377\207\31*e\377\1\30(a\377\326\7\13\33\377\4\17\32>\377\31*e\377\11" \ ++ "\17$\377\6\13\33\377\377\7\13\33\377\377\7\13\33\377\1\14\23/\377\202" \ ++ "\31*e\377\1\11\17%\377\354\7\13\33\377\1\7\13\32\377\203\7\13\33\377" \ ++ "\6\6\13\33\377\10\16#\377\21\35F\377\16\30""9\377\12\20)\377\7\13\32" \ ++ "\377\202\7\13\33\377\7\6\12\33\377\6\13\33\377\11\17$\377\15\25""4\377" \ ++ "\21\34D\377\24\"R\377\25#V\377\203\25#U\377\2\25#V\377\24!Q\377\326\7" \ ++ "\13\33\377\4\17\31>\377\31*e\377\10\14\36\377\6\13\33\377\377\7\13\33" \ ++ "\377\376\7\13\33\377\2\6\13\33\377\12\20(\377\202\31*e\377\1\11\17%\377" \ ++ "\360\7\13\33\377\7\7\13\32\377\7\12\33\377\6\13\33\377\7\13\33\377\6" \ ++ "\12\32\377\6\13\32\377\6\12\32\377\203\7\13\33\377\5\6\13\33\377\7\13" \ ++ "\32\377\7\13\33\377\7\14!\377\10\16!\377\204\10\16\"\377\2\10\16!\377" \ ++ "\7\13\32\377\325\7\13\33\377\2\17\31>\377\31*e\377\202\6\13\33\377\377" \ ++ "\7\13\33\377\376\7\13\33\377\2\7\12\32\377\11\17&\377\202\31*e\377\1" \ ++ "\11\17%\377\360\7\13\33\377\2\7\13\32\377\6\13\32\377\211\7\13\33\377" \ ++ "\202\7\12\33\377\2\7\13\33\377\7\13\32\377\333\7\13\33\377\2\17\32>\377" \ ++ "\31*e\377\377\7\13\33\377\377\7\13\33\377\202\7\13\33\377\1\10\16\"\377" \ ++ "\202\31*e\377\1\11\17$\377\377\7\13\33\377\333\7\13\33\377\2\17\32>\377" \ ++ "\31*e\377\377\7\13\33\377\377\7\13\33\377\6\7\13\33\377\7\13\32\377\7" \ ++ "\13\35\377\31*e\377\30)d\377\10\15#\377\377\7\13\33\377\333\7\13\33\377" \ ++ "\2\17\31>\377\31*e\377\377\7\13\33\377\377\7\13\33\377\202\7\13\33\377" \ ++ "\4\7\14\35\377\31*e\377\30)d\377\11\16#\377\377\7\13\33\377\333\7\13" \ ++ "\33\377\2\17\31>\377\31*e\377\377\7\13\33\377\377\7\13\33\377\202\7\13" \ ++ "\33\377\4\7\14\35\377\31*e\377\30)d\377\11\16#\377\377\7\13\33\377\333" \ ++ "\7\13\33\377\3\12\20)\377\16\30:\377\7\13\32\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\5\7\13\33\377\7\14\35\377\31*e\377\30)d\377\11\16#\377\377" \ ++ "\7\13\33\377\332\7\13\33\377\1\7\13\32\377\377\7\13\33\377\377\7\13\33" \ ++ "\377\204\7\13\33\377\1\7\14\34\377\202\31*e\377\1\11\16#\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\337\7\13\33\377\4\6\12\33\377" \ ++ "\22\37K\377\22\36I\377\10\15\40\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\340\7\13\33\377\202\7\13\34\377\1\7\13\32\377\377\7\13\33" \ ++ "\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13" \ ++ "\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377" \ ++ "\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377\7\13\33\377\377" \ ++ "\7\13\33\377\377\7\13\33\377\344\7\13\33\377") ++ ++ +diff --git a/feeds/packages/utils/psplash/files/image_generic.h b/feeds/packages/utils/psplash/files/image_generic.h +new file mode 100644 +index 0000000..8db52fc +--- /dev/null ++++ b/feeds/packages/utils/psplash/files/image_generic.h +@@ -0,0 +1,5475 @@ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++#define OWRT_IMG_ROWSTRIDE (1280) ++#define OWRT_IMG_WIDTH (320) ++#define OWRT_IMG_HEIGHT (320) ++#define OWRT_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */ ++#define OWRT_IMG_RLE_PIXEL_DATA ((uint8*) \ ++ "\2ES\203\377DS\203\377\202FS\203\377\2FR\203\377FS\203\377\203FT\203\377" \ ++ "\10ET\202\377FT\203\377GS\204\377FT\203\377GT\204\377FT\203\377+;q\377" \ ++ "\30)d\377\205\31*e\377\3\30)d\377\36/h\377M}\377\77M~\377\35.h\377\30)d\377\207\31*e\377\12\30)d\377\32+f\377" \ ++ ">M~\377=J}\377L}\377BP\200\377\202AO\200\377\1@N" \ ++ "\200\377\204AO\200\377\3@O\177\377\77N~\377@M\177\377\203@N\177\377\11" \ ++ "\77M\177\377@N\177\377>L\177\377\77M\177\377\77M~\377\77M}\377\77M~\377" \ ++ "+;q\377\30)d\377\210\31*e\377\10\27(d\3771Au\377=K}\377t\377\30)d\377\204\31*e\377\3" \ ++ "\30)d\377\27(d\3770\77t\377\203HV\205\377\5GV\205\377HV\205\377IV\205" \ ++ "\377HV\205\377IU\205\377\202IV\205\377\202IW\205\377\1HW\204\377\202" \ ++ "IW\205\377\2JW\206\377IW\205\377\203JW\206\377\202JV\206\377\202JW\206" \ ++ "\377\203JX\206\377\2JW\206\377JX\206\377\204IX\206\377\213JX\206\377" \ ++ "\204IX\206\377\205JX\206\377\202JW\206\377\202JV\206\377\205JW\206\377" \ ++ "\202IW\205\377\202HW\204\377\202IW\205\377\13IV\205\377IU\205\377HV\205" \ ++ "\377IV\205\377HV\205\377GV\205\377GU\204\377HV\205\377AP\200\377\"2j" \ ++ "\377\27(c\377\204\31*e\377\6\30)d\377\33,f\377>M~\377GU\204\377FT\203" \ ++ "\377FS\203\377\205FT\203\377\14FS\203\377FR\203\377ES\203\377FS\203\377" \ ++ "ES\203\377DS\203\377ES\203\377ER\202\377ES\201\377ER\202\377DQ\202\377" \ ++ "CR\202\377\204DR\202\377\5DQ\201\377CP\200\377BP\200\377\37""0i\377\30" \ ++ ")d\377\206\31*e\377\4\27(d\3772@u\377BP\200\377AO\177\377\202AO\200\377" \ ++ "\1@N\200\377\202AO\200\377\3@O\177\377AO\200\377\77O~\377\206@N\177\377" \ ++ "\7\77M\177\377>L\177\377\77M\177\377\77M~\377>L}\3776Ex\377\32+e\377" \ ++ "\210\31*e\377\3\30)d\377!2j\377=K}\377\202" \ ++ "L\177\377\202\77M\177\377\3\77M~\377\77L~\377\34-g\377\211\31*e\377\6" \ ++ "\33,g\3778Gz\377=K}\377M}\377\202BP\200\377\2AO\200\377@N\200\377\204AO\200\377" \ ++ "\202@N\177\377\1@M\177\377\204@N\177\377\202\77M\177\377\6\77M~\377\77" \ ++ "M\177\377\77M~\377=K}\377\27(c\377\30)d\377\207\31*e\377\2\30)d\377#" \ ++ "3k\377\202=K}\377\1;K}\377\202L\177\377\202\77M\177\377\4>L~\377@N~\377%5m\377\30)d" \ ++ "\377\207\31*e\377\3\30)d\377\27(d\377;J|\377\202=K}\377\1;K}\377\202" \ ++ "s\377\33,f\377\221\31*e\377\1\27(c\377\202-=r\377\2-;q\377-" \ ++ "L\177\377\77M\177" \ ++ "\377\203\77M~\377\2""4Cw\377\30)d\377\210\31*e\377\10\27(d\377*9p\377" \ ++ ">L}\377=K}\377;K}\377L\177\377\77M\177\377\77M~\377>M~\377" \ ++ ";I{\377\35-g\377\210\31*e\377\6\30)d\377\34-f\377>L~\377=K}\377L\177" \ ++ "\377\202\77M\177\377\202\77M~\377\2$4l\377\30)d\377\210\31*e\377\6\32" \ ++ "+e\3778Fz\377=K}\377L\177\377\77M\177\377\202\77M~\377\2""4Cv\377\27(d\377" \ ++ "\211\31*e\377\7""1@t\377=K}\377L\177\377\77M~\377\77M\177\377\77M" \ ++ "}\377@N\177\377\31*e\377\30)d\377\207\31*e\377\22\30)d\377)9p\377M~\377" \ ++ "\30)d\377\204\31*e\377\7\30)d\377/\77t\377GU\204\377FU\203\377FS\203" \ ++ "\377FT\203\377ET\202\377\203FT\203\377\3FS\203\377ES\203\377FS\203\377" \ ++ "\203ES\203\377\5ES\202\377ES\201\377EQ\202\377DR\202\377CR\202\377\202" \ ++ "DR\202\377\6DQ\201\377DR\202\377DP\200\377CQ\201\377\30)e\377\30)d\377" \ ++ "\205\31*e\377\3\30)d\377#3k\377AO\177\377\202BP\200\377\2AO\200\377@" \ ++ "N\200\377\204AO\200\377\3@O\177\377@N\177\377@M\177\377\204@N\177\377" \ ++ "\203\77M\177\377\4>L}\377@N\177\377%4l\377\30)d\377\207\31*e\377\4\30" \ ++ ")d\377\"1k\377M~\377\202BP\200\377\2AO\200\377@N\200\377\204AO\200\377\3@O\177\377" \ ++ "@N\177\377@M\177\377\204@N\177\377\2>L\177\377\77M\177\377\203\77M~\377" \ ++ "\2""1@u\377\27(c\377\207\31*e\377\11\30)d\377\31+e\377L\177" \ ++ "\377\77M\177\377\77M~\377\77M}\377;I{\377\210\31*e\377\3\30)e\377\27" \ ++ "(c\3774Cw\377\202=K}\377\1;K}\377\202L\177\377\77M\177\377\202\77M~\377\2=K|\377\37/i\377\210\31*e\377" \ ++ "\10\30)d\377&6n\377>L~\377=J|\377;K}\377L\177\377\77M\177\377\77M~\377>L}\377%5" \ ++ "m\377\210\31*e\377\6\30)d\377\32+e\377>L}\377=K}\377L\177\377" \ ++ "\77M\177\377\202\77M~\377\2-L~\377\27(c\377\204\31*e\377\2\32+f\377@N\177\377\202HV\205\377" \ ++ "\3GV\205\377IV\205\377HV\205\377\202IV\205\377\4IW\205\377HW\204\377" \ ++ "JW\206\377IW\205\377\202JW\206\377\3JV\206\377JX\206\377JW\206\377\203" \ ++ "JX\206\377\10KX\205\377KX\206\377KW\207\377KX\206\377JY\207\377KX\207" \ ++ "\377LY\207\377KY\207\377\204LY\207\377\5LX\207\377LY\207\377KY\206\377" \ ++ "KZ\206\377LY\207\377\202MZ\210\377\1LZ\207\377\230MZ\210\377\7LZ\207" \ ++ "\377MZ\210\377LZ\207\377KZ\206\377KY\206\377LY\207\377LX\207\377\205" \ ++ "LY\207\377\202KY\207\377\14JX\207\377KX\206\377KX\207\377KX\206\377K" \ ++ "X\205\377KX\206\377JX\206\377IX\206\377JW\206\377JX\206\377JW\206\377" \ ++ "JV\206\377\203JW\206\377\3IW\205\377HW\204\377IW\205\377\203IV\205\377" \ ++ "\5HV\205\377GU\204\377HV\205\377/>t\377\30)d\377\203\31*e\377\24\30)" \ ++ "d\377!1j\377IV\205\377GU\204\377GT\204\377FS\203\377ET\202\377FT\203" \ ++ "\377FS\203\377FT\203\377FR\203\377ES\203\377FS\203\377DS\203\377ES\203" \ ++ "\377ES\202\377ES\201\377EQ\202\377DR\202\377CR\202\377\204DR\202\377" \ ++ "\4DQ\201\377ER\202\377\37""0i\377\30)d\377\206\31*e\377\2!1j\377@N~\377" \ ++ "\202BP\200\377\2AO\200\377@N\200\377\203AO\200\377\3@O\177\377\77O~\377" \ ++ "@M\177\377\204@N\177\377\7\77M\177\377>L\177\377\77M~\377\77M\177\377" \ ++ "\77M~\3777Fy\377\30)d\377\210\31*e\377\6\30)d\377-=r\377=K}\377s\377\34," \ ++ "g\377\220\31*e\377\4\30)d\377\34,g\377,L}\377AO\177\377\202AO\200" \ ++ "\377\1@N\200\377\204AO\200\377\3@O\177\377@N\177\377@M\177\377\204@N" \ ++ "\177\377\203\77M\177\377\4\77M}\377@M~\377\31*e\377\30)d\377\207\31*" \ ++ "e\377\4\30)d\377%5m\377=J}\377=K}\377\202L}\377@N\177\377" \ ++ "%4m\377\30)d\377\210\31*e\377\7!1j\377;I|\377=K}\377L\177\377\77M\177\377\77M~\377\77M}\377=K}\377\27" \ ++ "(c\377\30)d\377\207\31*e\377\7\32+e\3779Hz\377=J|\377M}\377\30)d\377\203\31*e\377" \ ++ "\7\30)d\377\37/i\377JX\206\377FT\203\377GT\204\377FS\203\377ET\202\377" \ ++ "\202FT\203\377\203FS\203\377\10ES\203\377DS\203\377ES\203\377ES\202\377" \ ++ "ER\201\377ER\202\377DR\202\377CR\202\377\203DR\202\377\202DQ\201\377" \ ++ "\2""7Ex\377\30*d\377\206\31*e\377\2\27(c\377L\177\377\77M\177\377\77M~\377" \ ++ "\202>L}\377\2\33,f\377\30)d\377\207\31*e\377\2\27(d\3777Fy\377\202=K" \ ++ "}\377\2;K}\377;J|\377\204>M\201\377\203=M\201\377\203=L\201\377\203<" \ ++ "L\200\377\4=M\201\377\30*h\377\32+i\377\30)d\377\204\31*e\377\2\30)d" \ ++ "\377\31*f\377\203\32+i\377\3!2n\3779H}\377:I~\377\2049I~\377\1""9H~\377" \ ++ "\2038H~\377\7""6Fy\3775Dw\3776Dx\3775Cx\3775Dx\377\32+e\377\30)d\377" \ ++ "\214\32+i\377\5\31+i\377#4p\3776F|\3773Cy\3771@u\377\2022Av\377\3""2" \ ++ "Au\3771@u\3770\77u\377\2041@u\377\2'7n\377\30)d\377\220\31*e\377\10\30" \ ++ ")d\377#3l\377-=s\377-=q\377-;r\377-s\377HV\205\377GV\205\377HV\205\377\203IV\205\377\203IW\205\377\205" \ ++ "JW\206\377\2JX\206\377IX\206\377\202JX\206\377\3KX\205\377KW\207\377" \ ++ "KX\206\377\202KY\207\377\205LY\207\377\5LX\207\377KY\206\377LZ\207\377" \ ++ "MZ\210\377LZ\207\377\204MZ\210\377\4LY\210\377MZ\210\377N[\210\377MZ" \ ++ "\207\377\202N[\210\377\4IU\200\377EPw\377.6R\377\22\26!\377\213\0\0\0" \ ++ "\377\5\30\33*\3772;Y\377FR{\377IV\201\377N[\211\377\202N[\210\377\5N" \ ++ "[\207\377MZ\210\377N[\210\377MZ\210\377LY\210\377\204MZ\210\377\6LZ\207" \ ++ "\377MZ\210\377LY\207\377KZ\206\377LY\207\377LX\207\377\203LY\207\377" \ ++ "\13KY\207\377LY\207\377JY\207\377KX\206\377KW\207\377KX\206\377KX\205" \ ++ "\377JX\206\377IX\206\377JW\206\377JX\206\377\204JW\206\377\5IW\205\377" \ ++ "HW\204\377IW\205\377IV\205\377IU\205\377\202HV\205\377\3GV\204\377DR" \ ++ "\202\377\40""0i\377\204\31*e\377\6\26(c\377\77M~\377GU\204\377GT\204" \ ++ "\377GS\204\377ET\202\377\203FT\203\377\203FS\203\377\1DS\203\377\202" \ ++ "ES\203\377\4ES\201\377ER\202\377DR\202\377CR\202\377\204DR\202\377\3" \ ++ "DQ\201\377=K|\377\33,f\377\206\31*e\377\6\30)d\377/\77t\377BP\200\377" \ ++ "AO\200\377BP\200\377@N\200\377\204AO\200\377\3@O\177\377\77N~\377@M\177" \ ++ "\377\204@N\177\377\1>L\177\377\202\77M\177\377\4\77M~\377>L}\377\40""0" \ ++ "i\377\30)d\377\207\31*e\377\2\27(d\3771\77u\377\202=K}\377\4;K}\377>" \ ++ "N\202\377\31\37""4\377\20\25#\377\205\21\26$\377\206\21\25$\377\5\22" \ ++ "\26%\377\10\15\36\377\10\16\"\377\31*e\377\30)d\377\204\31*e\377\2\21" \ ++ "\34E\377\6\14\35\377\202\7\14\36\377\1\10\16\36\377\202\20\24#\377\207" \ ++ "\17\24#\377\11\16\23\40\377(3Z\3776Ey\3776Dx\3776Cx\3775Dx\377\36.h\377" \ ++ "\31+g\377\6\13\32\377\213\7\14\36\377\5\6\14\36\377\11\16\36\377\16\23" \ ++ "!\377\34%C\3773By\377\2022Av\377\4""2Au\3771@t\3771@u\3770\77u\377\203" \ ++ "1@u\377\2+;q\377\30)d\377\220\31*e\377\17\30)d\377\40""1j\377-=s\377" \ ++ "-=q\377-;r\377-L\177\377\77M\177\377" \ ++ "\77M~\377>L}\377%5m\377\30)d\377\207\31*e\377\7\30)d\377)9p\377>L}\377" \ ++ "=K}\377;K}\377>M\201\377\32\40""7\377\217\0\0\0\377\1\30(a\377\205\31" \ ++ "*e\377\1\7\14\36\377\216\0\0\0\377\7\20\25%\3777G|\3776Dx\3776Cx\377" \ ++ "5Dx\377\"2l\377\25$V\377\217\0\0\0\377\10\40*K\3772Bx\3772Av\3772Au\377" \ ++ "2Av\3772At\3771@u\3770\77u\377\2031@u\377\2-L\177\377" \ ++ "\77M\177\377\77M~\377>L}\377*:p\377\30)d\377\207\31*e\377\12\30)d\377" \ ++ "\"2k\377>L~\377=K}\377;K}\377s\377\30)d\377\220\31*e\377\10\30)d\377" \ ++ "\34-g\377.>s\377,=q\377-;r\377,;q\377+9n\377\22\32""1\377\202\0\0\0\377" \ ++ "\5\1\1\1\377***\377\20\20\20\377\0\0\1\377\23\37L\377\220\31*e\377\2" \ ++ "\30)d\377!1j\377\203(8o\377\5'7o\377&6o\377'7o\377\36/h\377\30)d\377" \ ++ "\207\31*e\377\7\26'c\3778Gz\377IV\205\377HV\204\377HV\205\377IV\205\377" \ ++ "IU\205\377\202IV\205\377\11HW\204\377JW\206\377IW\205\377JW\206\377J" \ ++ "V\206\377JW\206\377JX\206\377IX\206\377JX\206\377\203KX\206\377\4KW\207" \ ++ "\377JY\207\377KX\207\377KY\207\377\205LY\207\377\4KZ\206\377LZ\207\377" \ ++ "MZ\210\377LZ\207\377\203MZ\210\377\1LY\210\377\202MZ\207\377\3P^\214" \ ++ "\3772;X\377\1\2\3\377\202\0\0\0\377\3III\377\255\255\255\377\372\372" \ ++ "\372\377\203\377\377\377\377\1\376\376\376\377\207\377\377\377\377\1" \ ++ "\376\376\376\377\203\377\377\377\377\3\367\367\367\377\245\245\245\377" \ ++ "DDD\377\202\0\0\0\377\3\3\3\5\3772;Y\377Q_\217\377\202N[\210\377\4MZ" \ ++ "\210\377N[\210\377MZ\210\377LY\210\377\203MZ\210\377\5LZ\207\377MZ\210" \ ++ "\377KZ\206\377LY\207\377LX\207\377\204LY\207\377\202KY\207\377\6KX\207" \ ++ "\377KW\206\377KX\205\377JX\206\377KX\206\377IX\206\377\202JW\206\377" \ ++ "\1JV\206\377\202JW\206\377\6IW\205\377HW\204\377IW\205\377IV\205\377" \ ++ "IU\205\377IV\205\377\202HV\205\377\3JX\206\377\35.h\377\30)d\377\203" \ ++ "\31*e\377\6\33,f\377\77N\177\377FU\203\377GT\204\377FT\203\377ET\202" \ ++ "\377\203FT\203\377\10FR\203\377FS\203\377ES\203\377DS\203\377ES\203\377" \ ++ "ES\202\377ES\201\377EQ\202\377\206DR\202\377\3DQ\201\3774Cw\377\27(c" \ ++ "\377\206\31*e\377\2\35-g\377=K}\377\202BP\200\377\2AO\200\377@N\200\377" \ ++ "\203AO\200\377\3@O\177\377\77O~\377@M\177\377\204@N\177\377\3\77M\177" \ ++ "\377>L\177\377\77M\177\377\202\77M~\377\1/>s\377\210\31*e\377\7\30)d" \ ++ "\377\32+e\377\77M~\377s\377.\77v\377(5f\377\25\35""7\377\2\3" \ ++ "\7\377\202\0\0\0\377\6HHH\377\264\264\264\377\377\377\377\377\"\"\"\377" \ ++ "\0\0\1\377\23\37L\377\220\31*e\377\3\30)d\377\40""0i\377'7n\377\202(" \ ++ "8o\377\5'7o\377&6o\377'7o\377&6n\377\30)d\377\206\31*e\377\3\30)d\377" \ ++ "\31*e\377GU\203\377\203HV\205\377\6IV\205\377IU\205\377IV\205\377IW\205" \ ++ "\377HW\204\377IW\205\377\202JW\206\377\1JV\206\377\202JW\206\377\1IX" \ ++ "\206\377\202JX\206\377\4KX\205\377KW\207\377KX\207\377KY\207\377\205" \ ++ "LY\207\377\5LX\207\377KZ\206\377LZ\207\377MZ\210\377LZ\207\377\203MZ" \ ++ "\210\377\5LY\210\377MZ\210\377N[\210\377Q^\216\377\37%6\377\202\0\0\0" \ ++ "\377\3""333\377\333\333\333\377\372\372\372\377\202\377\377\377\377\1" \ ++ "\376\376\376\377\215\377\377\377\377\1\376\376\376\377\202\377\377\377" \ ++ "\377\3\371\371\371\377\326\326\326\377***\377\202\0\0\0\377\4\34!3\377" \ ++ "N\\\213\377MZ\207\377N[\210\377\202MZ\210\377\1LY\210\377\205MZ\210\377" \ ++ "\3LY\207\377KZ\206\377LX\207\377\203LY\207\377\11KY\207\377LY\207\377" \ ++ "KX\207\377KX\206\377KW\207\377KX\205\377KX\206\377JX\206\377IX\206\377" \ ++ "\202JX\206\377\204JW\206\377\203IW\205\377\203IV\205\377\4GU\204\377" \ ++ "IW\206\3771@u\377\27(c\377\203\31*e\377\2\27(d\377:H{\377\202GU\204\377" \ ++ "\3FS\203\377FT\203\377ET\202\377\202FT\203\377\10FS\203\377FR\203\377" \ ++ "FS\203\377ES\203\377DS\203\377ES\203\377ES\202\377EQ\202\377\206DR\202" \ ++ "\377\3DQ\201\377\77L~\377\26'c\377\206\31*e\377\3\32+f\377;I{\377BP\200" \ ++ "\377\202AO\200\377\1@N\200\377\203AO\200\377\3@O\177\377\77O~\377@M\177" \ ++ "\377\204@N\177\377\2\77M\177\377>L\177\377\202\77M\177\377\2\77M}\377" \ ++ "3Bv\377\210\31*e\377\12\30)d\377\27(c\377;J|\377=K}\377L\177\377\202\77M\177" \ ++ "\377\3\77M}\3777Fy\377\32+e\377\210\31*e\377\11\27(d\3775Dx\377=K}\377" \ ++ "s\377=K}\377L}\377@N\177\377\"2j\377\30)d\377\207\31*e\377\13\30)d\377#3l\377=K" \ ++ "}\377L~\377\77M\177\377\77M~\377@N~\377)9p\377\30" \ ++ ")d\377\31*e\377\31)d\377\30)d\377\205\31*e\377\1!1j\377\202=K}\377\202" \ ++ "\377\35\"6\377\33!4\377\40&=\377%,F\377)2P\377/9Z\3774\77c\377\77" \ ++ "Ly\377HW\212\377ES\204\377=K|\377\31)d\377\205\31*e\377\5\30)d\377\26" \ ++ "'c\377BO\200\377@M|\377M\201\377\27\35" \ ++ "1\377\0\0\0\377vvv\377\212\377\377\377\377\11\246\246\246\377\0\0\0\377" \ ++ "\5\11\26\377\30(b\377\24\"S\377\1\2\5\377\23\23\23\377\335\335\335\377" \ ++ "\376\376\376\377\214\377\377\377\377\11\376\376\376\377\342\342\342\377" \ ++ "\16\16\16\377\1\2\3\377-8d\3776Dy\377\11\14\25\377\0\0\0\377\277\277" \ ++ "\277\377\210\377\377\377\377\7\376\376\376\377\377\377\377\377III\377" \ ++ "\0\0\0\377\16\27""9\377!1i\377-s\377IW\206\377HV\204\377HV\205\377IV\205\377IU\205\377IV\205\377I" \ ++ "W\205\377HW\204\377\203JW\206\377\4JV\206\377JW\206\377JX\206\377IX\206" \ ++ "\377\202KX\206\377\4KX\205\377KW\207\377KX\207\377KY\207\377\204LY\207" \ ++ "\377\3LX\207\377LY\207\377LZ\207\377\204MZ\210\377\10LY\210\377MZ\210" \ ++ "\377N\\\211\377\12\14\22\377\0\0\0\377\217\217\217\377\377\377\377\377" \ ++ "\376\376\376\377\211\377\377\377\377\5\376\376\376\377\377\377\377\377" \ ++ "\325\325\325\377555\377\3\3\3\377\203\2\2\2\377\5\6\6\6\377UUU\377\357" \ ++ "\357\357\377\377\377\377\377\376\376\376\377\211\377\377\377\377\202" \ ++ "\376\376\376\377\10nnn\377\0\0\0\377\25\30$\377MZ\207\377N[\207\377Q" \ ++ "_\216\377\25\30%\377\0\0\0\377\213\0\1\1\377\5\0\0\0\377\27\35+\377D" \ ++ "Q{\377\34!3\377\1\1\2\377\207\0\0\0\377\6\1\1\1\377\24\31%\377>Ip\377" \ ++ "JW\206\377HU\204\377IV\205\377\202HV\205\377\1GU\204\377\204\31*e\377" \ ++ "\13\30)e\377\35-g\377FT\203\377GU\204\377FT\203\377GT\204\377GU\204\377" \ ++ "2<_\377\23\30%\377\2\2\4\377\0\0\1\377\211\0\0\0\377\202\0\0\1\377\5" \ ++ "\12\15\25\377(/L\377\77M\177\377\34-g\377\30)d\377\205\31*e\377\5\26" \ ++ "'c\377;I|\377/8[\377\0\0\0\377\0\1\1\377\213\0\0\1\377\5\2\2\4\377BQ" \ ++ "\205\3778Dr\377\32\40""5\377\2\2\4\377\210\0\0\0\377\5\1\1\4\377\16\30" \ ++ ";\377\40""1l\377M\200\377M\177" \ ++ "\377ANz\377\12\14\23\377\202\0\0\0\377\6\6\6\6\377\222\222\222\377\337" \ ++ "\337\337\377\356\356\356\377\371\371\371\377\375\375\375\377\204\377" \ ++ "\377\377\377\7\375\375\375\377\371\371\371\377\366\366\366\377\361\361" \ ++ "\361\377\336\336\336\377www\377\6\6\6\377\202\0\0\0\377\4\2\3\11\377" \ ++ "\23\40O\377\31*e\377\30)d\377\202\31*e\377\6\27(c\3774Cx\377/8Z\377\0" \ ++ "\0\0\377666\377\344\344\344\377\207\351\351\351\377\2\352\352\352\377" \ ++ "\333\333\333\377\204\0\0\0\377\4TTT\377\316\316\316\377\361\361\361\377" \ ++ "\373\373\373\377\204\377\377\377\377\16\372\372\372\377\357\357\357\377" \ ++ "\267\267\267\377\16\16\16\377\0\0\0\377\0\0\1\377'1Q\377>M\200\377\377\30)c\377\202\31*e" \ ++ "\377\6\27(c\3772Bv\377/9Z\377\0\0\0\377;;;\377\370\370\370\377\210\377" \ ++ "\377\377\377\1\357\357\357\377\202\0\0\0\377\2\27\27\27\377\245\245\245" \ ++ "\377\202\377\377\377\377\1\376\376\376\377\206\377\377\377\377\1\376" \ ++ "\376\376\377\202\377\377\377\377\4GGG\377\0\0\0\377\1\1\1\3771=e\377" \ ++ "\203\377Tb\223\377\24\27" \ ++ "#\377\0\0\0\377\253\253\253\377\213\377\377\377\377\202\376\376\376\377" \ ++ "\217\377\377\377\377\6\301\301\301\377\0\0\0\377\5\6\12\377FT\201\377" \ ++ "\25'c\377\26%[\377\202\0\0\0\377\1\320\320\320\377\210\377\377\377\377" \ ++ "\13\376\376\376\377\377\377\377\377\345\345\345\377___\377)))\377\0\0" \ ++ "\0\377\25\25\25\377DDD\377\274\274\274\377\377\377\377\377\376\376\376" \ ++ "\377\207\377\377\377\377\12\376\376\376\377\324\324\324\377\12\12\12" \ ++ "\377\0\0\2\377\23!Q\377$4l\37709[\377\0\0\0\377;;;\377\370\370\370\377" \ ++ "\233\377\377\377\377\11\365\365\365\377777\377\0\0\0\377'1R\377\377\10\16#\377\0\0\0\377\227\227\227\377\224\377\377" \ ++ "\377\377\3***\377\0\0\0\377\23!O\377\213\31*e\377\3\30)d\377'7n\377(" \ ++ "8n\377\202(8o\377\203'7o\377\2\32+e\377\30)d\377\203\31*e\377\2\30)d" \ ++ "\377*:q\377\202HV\205\377\1GV\205\377\203IV\205\377\202IW\205\377\203" \ ++ "JW\206\377\1JV\206\377\203JX\206\377\6KX\206\377KX\205\377KX\206\377" \ ++ "KW\207\377JY\207\377KY\207\377\203LY\207\377\3LX\207\377KZ\206\377LZ" \ ++ "\207\377\204MZ\210\377\6LY\210\377N[\210\377R_\217\377\16\22\32\377\0" \ ++ "\0\0\377\267\267\267\377\213\377\377\377\377\4ttt\377\0\0\0\377$*\77" \ ++ "\377Ta\217\377\202Q^\212\377\13Q^\213\377P^\213\377Q^\213\377R]\213\377" \ ++ "R^\213\377Q^\213\377Q^\212\377Sa\217\377\40$6\377\0\0\0\377\212\212\212" \ ++ "\377\213\377\377\377\377\7\210\210\210\377\0\0\0\377\34\40""0\377Tb\224" \ ++ "\377\24\27#\377\0\0\0\377\253\253\253\377\215\377\377\377\377\6\276\276" \ ++ "\276\377ppp\377sss\377\312\312\312\377\377\377\377\377\376\376\376\377" \ ++ "\212\377\377\377\377\7\26\26\26\377\0\0\0\3775Ac\377\31+i\377\12\21)" \ ++ "\377\0\0\0\377]]]\377\212\377\377\377\377\2\321\321\321\377\15\15\15" \ ++ "\377\206\0\0\0\377\3\262\262\262\377\377\377\377\377\376\376\376\377" \ ++ "\206\377\377\377\377\12\376\376\376\377\377\377\377\377111\377\0\0\0" \ ++ "\377\12\21)\377\"3m\37709[\377\0\0\0\377;;;\377\370\370\370\377\220\377" \ ++ "\377\377\377\202\376\376\376\377\212\377\377\377\377\10YYY\377\0\0\0" \ ++ "\377\35%=\377\377'/J\377\202&.I\377\4%,F\377\5\6\12\377\0\0\0\377" \ ++ "\227\227\227\377\212\377\377\377\377\202\0\0\0\377\5\35*W\3770:\\\377" \ ++ "\0\0\0\377;;;\377\370\370\370\377\212\377\377\377\377\2\302\302\302\377" \ ++ "\10\10\10\377\204\0\0\0\377\3\36\36\36\377\353\353\353\377\376\376\376" \ ++ "\377\211\377\377\377\377\11{{{\377\0\0\0\377\27\34""0\377;I{\377;J|\377" \ ++ "\77M\202\377\5\7\14\377\0\0\0\377\313\313\313\377\211\377\377\377\377" \ ++ "\4\335\335\335\377CCC\377\377\377\377\377\376\376\376\377\207\377\377" \ ++ "\377\377\1sss\377\202\0\0\0\377\1{{{\377\211\377\377\377\377\2\23\23" \ ++ "\23\377\374\374\374\377\211\377\377\377\377\11\245\245\245\377\0\0\0" \ ++ "\377\5\11\26\377\31+g\377\30)d\377\31*e\377\12\21*\377\0\0\0\377xxx\377" \ ++ "\213\377\377\377\377\2\352\352\352\377\36\36\36\377\207\0\0\0\377\3\23" \ ++ "\40N\377\31*g\377\7\14\34\377\205\0\0\0\377\1\273\273\273\377\211\377" \ ++ "\377\377\377\2\365\365\365\377\40\40\40\377\207\0\0\0\377\2\22\40M\377" \ ++ "\31*f\377\212\31*e\377\3\30)d\377'7n\377(8n\377\202(8o\377\203'7o\377" \ ++ "\2\35.f\377\30)d\377\203\31*e\377\2\30)d\377&5m\377\202HV\205\377\1G" \ ++ "V\205\377\203IV\205\377\3IW\205\377HW\204\377IW\205\377\202JW\206\377" \ ++ "\1JV\206\377\203JX\206\377\6KX\206\377KX\205\377KX\206\377KW\207\377" \ ++ "JY\207\377KY\207\377\203LY\207\377\3LX\207\377KZ\206\377LY\207\377\204" \ ++ "MZ\210\377\6LY\210\377N[\210\377R`\217\377\16\20\30\377\0\0\0\377\274" \ ++ "\274\274\377\213\377\377\377\377\5zzz\377\0\0\0\377!':\377Ta\217\377" \ ++ "P]\212\377\203Q^\212\377\203P^\213\377\202Q^\213\377\4Tb\220\377\23\27" \ ++ "!\377\0\0\0\377\260\260\260\377\213\377\377\377\377\7iii\377\0\0\0\377" \ ++ "&-D\377Sa\223\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377" \ ++ "\377\1\341\341\341\377\202\0\0\0\377\10ANw\377M[\214\377LZ\211\3773<" \ ++ "\\\377\1\1\2\377\32\32\32\377\345\345\345\377\376\376\376\377\207\377" \ ++ "\377\377\377\7\376\376\376\377\364\364\364\377\26\27\27\377\0\0\0\377" \ ++ "\20\33C\377\0\0\0\377\77\77\77\377\212\377\377\377\377\1}}}\377\211\0" \ ++ "\0\0\377\2fff\377\376\376\376\377\211\377\377\377\377\7]]]\377\0\0\0" \ ++ "\377\25\35""9\3771;^\377\0\0\0\377;;;\377\370\370\370\377\212\377\377" \ ++ "\377\377\10DDD\377\0\0\0\377\21\25#\377;Hx\377=Jz\377\10\12\20\377\0" \ ++ "\0\0\377\243\243\243\377\212\377\377\377\377\13\207\207\207\377\0\0\0" \ ++ "\377\25\32+\377;Iz\377L\200\377\26\33/\377\0\0\0\377zzz\377\377" \ ++ "\377\377\377\376\376\376\377\207\377\377\377\377\2\371\371\371\377\256" \ ++ "\256\256\377\211\377\377\377\377\1\35\35\35\377\202\0\0\0\377\3""444" \ ++ "\377\377\377\377\377\376\376\376\377\207\377\377\377\377\3\231\231\231" \ ++ "\377\377\377\377\377\376\376\376\377\210\377\377\377\377\4\\\\\\\377" \ ++ "\0\0\0\377\13\23.\377\31*f\377\202\31*e\377\3\12\21*\377\0\0\0\377xx" \ ++ "x\377\213\377\377\377\377\14|||\377\0\0\0\377\3\5\15\377\30(a\377\31" \ ++ "+f\377\20\34D\377\6\13\34\377\1\2\6\377\4\6\20\377\32,j\377\31*e\377" \ ++ "\30)d\377\202\30)b\377\4\32+h\377\5\7\24\377\0\0\0\377\273\273\273\377" \ ++ "\211\377\377\377\377\4\365\365\365\377!!!\377\0\0\1\377\22\37J\377\205" \ ++ "\30)b\377\2\30*d\377\31)e\377\212\31*e\377\2\27)d\377'7n\377\203(8o\377" \ ++ "\202'7o\377\2(7o\377\30)d\377\204\31*e\377\5\30)d\377#3l\377IW\205\377" \ ++ "HV\205\377GV\205\377\203IV\205\377\3IW\205\377HW\204\377IW\205\377\202" \ ++ "JW\206\377\1JV\206\377\203JX\206\377\6KX\206\377KX\205\377KX\206\377" \ ++ "KW\207\377JY\207\377KY\207\377\203LY\207\377\2LX\207\377KY\206\377\202" \ ++ "LZ\207\377\203MZ\210\377\6LY\210\377N[\210\377Q_\216\377\23\27#\377\0" \ ++ "\0\0\377\253\253\253\377\213\377\377\377\377\21\240\240\240\377\0\0\0" \ ++ "\377\25\32&\377Tb\221\377Q^\212\377Q^\211\377Q^\212\377Q^\213\377Q^\212" \ ++ "\377Q^\213\377Q^\212\377Q^\213\377Q^\212\377Ub\221\377\11\13\20\377\0" \ ++ "\0\0\377\324\324\324\377\213\377\377\377\377\7NNN\377\0\0\0\37708T\377" \ ++ "Sa\222\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377\377\13" \ ++ "nnn\377\0\0\0\377\35\"4\377LZ\212\377JW\206\377JW\205\377IV\203\377\6" \ ++ "\7\13\377\0\0\0\377\306\306\306\377\376\376\376\377\210\377\377\377\377" \ ++ "\6\370\370\370\377:::\377\0\0\0\377\7\15\37\377\0\0\0\377ttt\377\212" \ ++ "\377\377\377\377\2\213\213\213\377^^^\377\210aaa\377\2\214\214\214\377" \ ++ "\374\374\374\377\211\377\377\377\377\7\206\206\206\377\0\0\0\377\22\30" \ ++ "-\3771;_\377\0\0\0\377;;;\377\370\370\370\377\211\377\377\377\377\11" \ ++ "\337\337\337\377\25\25\25\377\2\3\4\3772>f\377\77M\177\377AP\202\377" \ ++ "\36%>\377\0\0\0\377ooo\377\212\377\377\377\377\13\210\210\210\377\0\0" \ ++ "\0\377\24\32+\377;Iz\377L~\377\77M~\377@N\200\377'" \ ++ "2U\377\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210\377\0\0\0\377" \ ++ "\24\32+\377;Iz\377\202l\377\0\0\0\377\3\3\3\377\362\362\362\377" \ ++ "\221\377\377\377\377\4\245\245\245\377\0\0\0\377\3\7\21\377\31*g\377" \ ++ "\203\31*e\377\3\12\21*\377\0\0\0\377xxx\377\212\377\377\377\377\5\254" \ ++ "\254\254\377\0\0\0\377\5\11\26\377\32,j\377\30)d\377\212\31*e\377\4\32" \ ++ ",j\377\4\10\24\377\0\0\0\377\273\273\273\377\211\377\377\377\377\4\365" \ ++ "\365\365\377!!!\377\0\0\1\377\23\37L\377\220\31*e\377\3\30)d\377\31*" \ ++ "d\377'7n\377\203(8o\377\202'7o\377\2(7o\377\30)d\377\205\31*e\377\5\25" \ ++ "&b\377DR\202\377HV\205\377GV\205\377HV\205\377\202IV\205\377\3IW\205" \ ++ "\377HW\204\377IW\205\377\204JW\206\377\10JX\206\377IX\206\377JX\206\377" \ ++ "KX\206\377KX\205\377KX\206\377KX\207\377JY\207\377\205LY\207\377\2KY" \ ++ "\206\377LZ\207\377\205MZ\210\377\2MZ\207\377O\\\211\377\202\0\0\0\377" \ ++ "\1\353\353\353\377\212\377\377\377\377\7\375\375\375\377fff\377\0\0\0" \ ++ "\377\20\22\34\377O\\\211\377P]\212\377O\\\211\377\203P]\212\377\6P]\211" \ ++ "\377P]\212\377LX\203\377\7\10\14\377\0\0\0\377\227\227\227\377\213\377" \ ++ "\377\377\377\10\317\317\317\377\0\0\0\377\4\4\6\377R`\221\377R_\217\377" \ ++ "\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377\377\12""888\377" \ ++ "\0\0\0\377/8V\377KX\207\377KX\206\377KX\205\377N[\214\377\20\22\35\377" \ ++ "\0\0\0\377\250\250\250\377\211\377\377\377\377\2\373\373\373\377SSS\377" \ ++ "\203\0\0\0\377\1\213\213\213\377\211\377\377\377\377\1\376\376\376\377" \ ++ "\225\377\377\377\377\7\323\323\323\377\7\7\7\377\5\7\13\377+4T\377\0" \ ++ "\0\0\377;;;\377\370\370\370\377\211\377\377\377\377\11\265\265\265\377" \ ++ "\0\0\0\377\11\12\21\377AP\205\377\77M~\377@N\200\377$/S\377\0\0\0\377" \ ++ "DDD\377\212\377\377\377\377\4\210\210\210\377\0\0\0\377\24\32+\377;I" \ ++ "z\377\202M" \ ++ "\202\377\2\2\4\377\0\0\0\377\330\330\330\377\217\377\377\377\377\1\374" \ ++ "\374\374\377\202\0\0\0\377\10""3Aq\3778Fy\3777Fy\377/L}\377AO\201" \ ++ "\377\30$K\377\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210\377" \ ++ "\0\0\0\377\24\31+\377;Iz\377\202>>\377\0\0\0\377\17\30""7\377:H}\3778Fx" \ ++ "\3776Ex\3779H}\377\31!9\377\0\0\0\377[[[\377\377\377\377\377\376\376" \ ++ "\376\377\215\377\377\377\377\3\36\36\36\377\0\0\0\377\22\36H\377\205" \ ++ "\31*e\377\3\15\24,\377\0\0\0\377xxx\377\212\377\377\377\377\4<<<\377" \ ++ "\0\0\0\377\21\35F\377\31*g\377\213\31*e\377\4\31+i\377\12\21)\377\0\0" \ ++ "\0\377\203\203\203\377\212\377\377\377\377\1\265\265\265\377\202\0\0" \ ++ "\0\377\6\13\13\13\377AAA\377XXX\377\0\0\0\377\4\7\22\377\32,j\377\212" \ ++ "\31*e\377\3\30)d\377\33,f\377'7n\377\202(8o\377\5'7o\377&6o\377'7o\377" \ ++ "(7o\377\30)d\377\207\31*e\377\3""9Hz\377HV\205\377GV\205\377\202HV\205" \ ++ "\377\22IU\205\377IW\205\377IV\205\377IW\205\377JW\206\377IW\205\377J" \ ++ "W\206\377JV\206\377JX\206\377JW\206\377JX\206\377KX\206\377JX\206\377" \ ++ "KX\206\377KW\207\377JY\207\377KX\207\377KY\207\377\203LY\207\377\3LX" \ ++ "\207\377KZ\206\377LZ\207\377\205MZ\210\377\10MZ\207\377P]\213\377\33" \ ++ "!0\377\0\0\0\377\17\17\17\377\344\344\344\377\377\377\377\377\376\376" \ ++ "\376\377\236\377\377\377\377\12\16\16\16\377\0\0\0\377\40%9\377Q^\216" \ ++ "\377MZ\207\377N[\210\377Q^\216\377\24\27#\377\0\0\0\377\253\253\253\377" \ ++ "\214\377\377\377\377\1\376\376\376\377\220\377\377\377\377\7\25\25\25" \ ++ "\377\0\0\0\377\21\35H\377\31+h\377\23\37M\377\0\0\0\377\2\2\2\377\211" \ ++ "\377\377\377\377\5\376\376\376\377\377\377\377\377\237\237\237\377\0" \ ++ "\0\0\377\1\1\1\377\202\0\0\0\377\5\1\1\1\377\40\40\40\377\367\367\367" \ ++ "\377\377\377\377\377\376\376\376\377\202\377\377\377\377\1\376\376\376" \ ++ "\377\205\377\377\377\377\1\332\332\332\377\202\0\0\0\377\5.7Y\377/9\\" \ ++ "\377\0\0\0\377;;;\377\370\370\370\377\211\377\377\377\377\11\266\266" \ ++ "\266\377\0\0\0\377\10\12\20\377AP\205\377\77M}\377AO\201\377\24\37H\377" \ ++ "\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210\377\0\0\0\377\24" \ ++ "\31+\377;Iz\377\202^" \ ++ "\377\202\0\0\0\377\3___\377\377\377\377\377\376\376\376\377\231\377\377" \ ++ "\377\377\3\376\376\376\377\377\377\377\377\177\177\177\377\202\0\0\0" \ ++ "\377\11""8Bc\377N[\210\377MZ\207\377N[\210\377LY\210\377P^\216\377\24" \ ++ "\27#\377\0\0\0\377\253\253\253\377\232\377\377\377\377\5\376\376\376" \ ++ "\377\367\367\367\377888\377\0\0\0\377\14\24""1\377\202\30)d\377\7\31" \ ++ "*e\377\21\35G\377\0\0\0\377\4\4\4\377\261\261\261\377\377\377\377\377" \ ++ "\376\376\376\377\207\377\377\377\377\1\376\376\376\377\216\377\377\377" \ ++ "\377\13\376\376\376\377\377\377\377\377___\377\0\0\0\377\2\4\14\3776" \ ++ "Cr\377BP\200\377.8Z\377\0\0\0\377;;;\377\370\370\370\377\211\377\377" \ ++ "\377\377\11\266\266\266\377\0\0\0\377\10\12\20\377AP\205\377\77M}\377" \ ++ "9G{\377\22\37G\377\0\0\0\377DDD\377\212\377\377\377\377\4\210\210\210" \ ++ "\377\0\0\0\377\24\31+\377;Iz\377\202L}\377+;s\377\21\35F\377\0\0\0\377DDD\377\212\377\377\377\377\4" \ ++ "\210\210\210\377\0\0\0\377\24\31+\377;Iz\377\202L}\377&6o\377\21\35F\377\0\0\0\377HHH\377\212" \ ++ "\377\377\377\377\4\220\220\220\377\0\0\0\377\24\31+\377;Iz\377\202L}\377!2l\377\21\35F\377\0\0\0\377" \ ++ "\14\14\14\377...\377\211---\377\15\27\27\27\377\0\0\0\377\24\31+\377" \ ++ ";Iz\377;J|\377>>\377\245\245\245\377\314\314\314\377\346\346\346\377\360\360\360" \ ++ "\377\361\361\361\377\355\355\355\377\332\332\332\377\302\302\302\377" \ ++ "\214\214\214\377OOO\377\22\22\22\377\202\0\0\0\377\2\6\12\30\377\31+" \ ++ "g\377\212\31*e\377\1\"3k\377\203(8o\377\4'7o\377&6o\377'7n\377\36.h\377" \ ++ "\205\31*e\377\1\30)d\377\204\31*e\377\4#3l\377FT\204\377GU\204\377GV" \ ++ "\205\377\202IV\205\377\4IU\205\377IW\205\377IV\205\377IW\205\377\205" \ ++ "JW\206\377\2JX\206\377IX\206\377\202JX\206\377\5KX\205\377KW\206\377" \ ++ "KX\207\377JY\207\377KX\207\377\205LY\207\377\4LX\207\377LY\207\377KZ" \ ++ "\206\377LZ\207\377\205MZ\210\377\10LY\210\377MZ\210\377MZ\207\377P]\213" \ ++ "\377KX\203\3774=\\\377\34!2\377\12\13\21\377\207\0\0\0\377\1\4\4\4\377" \ ++ "\207\0\0\0\377\6\10\12\20\377\35\"3\3774=\\\377MY\206\377O]\213\377M" \ ++ "Z\207\377\202N[\210\377\2MZ\210\377LY\210\377\204MZ\210\377\5LZ\207\377" \ ++ "P^\217\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377\377\377\4" \ ++ "***\377\0\0\0\377\21\24\37\377\1\1\2\377\211\0\0\0\377\6\4\5\10\377!" \ ++ "'<\377@Lv\377IX\210\377\77M~\377\30)e\377\203\31*e\377\14\30)d\377\35" \ ++ ".h\377IW\205\377GU\204\377FT\203\377GS\204\377ET\202\377HW\207\377;G" \ ++ "p\377'/J\377\25\31(\377\3\3\6\377\216\0\0\0\377\11\2\3\11\377\11\17$" \ ++ "\377\21\35G\377\31*e\377\31*f\377\30)d\377\31*e\377\27(c\377;I|\377\202" \ ++ "BP\200\377\1-6X\377\216\0\0\0\377\5\6\6\13\377BP\204\377>L}\377\34-i" \ ++ "\377\20\35E\377\216\0\0\0\377\11\22\27&\377;Iz\377h\377;I{\377Kz\377\16'7n\377BQ\201\377IW\205\377^i\220\377cm\224\377bm\223\377" \ ++ "`k\221\377Q^\212\377S`\214\377al\222\377bl\223\377al\223\377Ye\220\377" \ ++ "GV\210\377\202HW\211\377\13IX\212\377GU\207\377BP\177\377GV\210\377H" \ ++ "W\212\377GV\211\377GU\210\377FT\206\377GT\205\377\"3l\377\30)d\377\205" \ ++ "\31*e\377\4\30)d\377'7n\377N[\207\377^i\220\377\202^i\221\377\2Yd\217" \ ++ "\377@N\201\377\203BP\202\377\1@P\200\377\205AO\201\377\10@N\201\377\77" \ ++ "N\201\377@N\201\377\77N\200\377\77M~\3775Dw\377\27(c\377\31*e\377\207" \ ++ "\31*f\377\2\35.i\377;J}\377\202=L~\377\4L|\377\3>L{\377.=s\377\30)e\377\203\31*f\377" \ ++ "\5\30)e\377%4m\3778Fy\3777Fy\3776Fy\377\2027Fy\377\5""6Ey\3777Dy\377" \ ++ "6Dx\3776Ez\3776Fz\377\2026Fy\377\4""6Dy\3776Ez\3772Aw\377\27(e\377\207" \ ++ "\31*f\377\206\31*e\377\12\27(d\377+:q\3771Bv\377FT\204\377R^\212\377" \ ++ "S_\212\377R^\212\377DQ\201\3772Av\3771@v\377\2031Av\377\2""2Aw\377\"" \ ++ "2l\377\202\31*f\377\2\31*e\377\30)d\377\215\31*e\377\15\27(d\377(8o\377" \ ++ "-=r\377-=q\377,;q\377-A\377))+\377'()\377\207\215\237\377Ly\377##%\377\203\0\0\0\377\4kq\203" \ ++ "\377JX\206\377Ze\216\377/04\377\202\0\0\0\377\13OPS\377Yf\223\377v\200" \ ++ "\242\377&%\"\377\5\4\4\377\16\16\15\377jp\207\377CQ\201\377ES\202\377" \ ++ "ES\201\377EQ\202\377\203DR\202\377\10CQ\201\377DR\202\377CQ\201\377D" \ ++ "Q\201\3775Dw\377\26(c\377\31*e\377\30)d\377\205\31*e\377\3=L}\377_i\215" \ ++ "\377\32\32\34\377\202\0\0\0\377\2\210\215\236\377s\3778Fy\3777Fy\377" \ ++ "6Fy\377\2027Fy\377\4""7Dy\3776Ey\3775Dx\3776Ey\377\2036Ex\377\4""6Cx" \ ++ "\3776Dx\377'7n\377\27)d\377\203\31*e\377\1\30)d\377\210\31*e\377\13\30" \ ++ ")d\377\30*d\3772Au\377.>t\377y\200\233\377\11\10\7\377\0\0\0\377\10\10" \ ++ "\11\377]f\203\3771@t\3770\77u\377\2031@u\377\2/\77t\377\35.h\377\214" \ ++ "\31*e\377\202\30)d\377\202\31*e\377\4\30)d\377\31*e\377,L~\377\202\77M\177\377\11\77M~\3778Fy\377\23%a" \ ++ "\377\22$a\377\22$b\377\21#a\377\22$a\377\24&b\377\30)d\377\202\31*e\377" \ ++ "\10\30)d\377,;q\3779G{\3777Fz\3776F{\3776Fz\3777Fz\3778Gz\377\202L~\377\202\77M~\377\10>L}\377\\f\206\377kq\206\377x{\207" \ ++ "\377w{\210\377mr\206\377Va\204\377#3k\377\203\30)d\377\22HU\204\377o" \ ++ "v\221\377x}\216\377\177\203\214\377\177\202\216\377w|\216\377iq\222\377" \ ++ "@N\177\377M~\377HV\205\377GV\205\377" \ ++ "HV\205\377IV\205\377IU\205\377IV\205\377\203IW\205\377\2JW\206\377IW" \ ++ "\205\377\203JW\206\377\202JX\206\377\3IX\206\377KX\206\377JX\206\377" \ ++ "\202KX\206\377\6KW\206\377KX\206\377JY\207\377KY\207\377LY\207\377KY" \ ++ "\207\377\204LY\207\377\202LX\207\377\7LY\207\377KY\206\377KZ\206\377" \ ++ "LY\207\377LZ\207\377MZ\210\377LZ\207\377\223MZ\210\377\1LZ\207\377\202" \ ++ "MZ\210\377\202LZ\207\377\1KZ\206\377\202LY\207\377\1LX\207\377\203LY" \ ++ "\207\377\4O]\215\377\24\27#\377\0\0\0\377\253\253\253\377\212\377\377" \ ++ "\377\377\7***\377\0\0\0\3773<^\377IW\205\377JW\206\377IW\205\377HW\204" \ ++ "\377\202IV\205\377\4IU\205\377HU\204\377\\i\225\377Y[_\377\202\0\0\0" \ ++ "\377\"68>\377O\\\212\377FFH\377\0\0\0\377\4\4\4\377666\377\0\0\0\377" \ ++ "\27\27\26\377ox\225\377kp\203\377\6\6\5\377\0\0\0\377))'\377ny\235\377" \ ++ "@N\177\377v\200\242\377'&#\377\6\6\5\377\20\17\15\377jp\207\377CQ\201" \ ++ "\377qx\221\377\11\11\10\377\5\4\3\377.-+\377\203\206\222\377\15\15\14" \ ++ "\377\0\0\0\377fhp\377IV\205\377^i\217\377OQZ\377\31\31\30\377\2\1\0\377" \ ++ "\202\0\0\0\377\7\10\7\6\377(((\377ch{\377DR\203\377@N\177\377_i\215\377" \ ++ "\34\34\35\377\202\0\0\0\377\6\210\215\236\377A\377q" \ ++ "t~\377\6\5\3\377\0\0\0\377cen\377>M~\377cn\221\377QSZ\377\25\24\22\377" \ ++ "\203\0\0\0\377\11\11\10\7\377*+,\377ot\207\377;I|\3772Av\377\26'c\377" \ ++ "Q\\\201\377FHN\377\23\23\21\377\203\0\0\0\377\10\14\13\12\377123\377" \ ++ "ho\211\377\35/j\377\30)d\377%5m\377[_n\377\31\30\30\377\202\0\0\0\377" \ ++ "\13\24\24\23\377dej\377\15\15\15\377\0\0\0\377\12\12\12\377]f\203\377" \ ++ "0\77t\3773Cx\377ox\224\377ABF\377\20\17\16\377\202\0\0\0\377\22\6\6\4" \ ++ "\377\30\30\26\377PR[\377O[\205\377\31*e\377$4m\377UYf\377\4\4\2\377\2" \ ++ "\2\0\377]^b\377Z]i\377\20\20\16\377\0\0\0\377\2\2\1\377!!\40\377jr\211" \ ++ "\377TW`\377\22\22\20\377\202\0\0\0\377\4\35\34\34\377ot\213\3771@u\377" \ ++ "+\377\202\0\0\0\377\3UW]\3779H~\377}\203\226\377\202" \ ++ "\0\0\0\377\5\34\34\36\377^i\217\377!3o\377an\231\377.-.\377\202\0\0\0" \ ++ "\377\3MQ^\377\36/j\377ru\177\377\202\0\0\0\377\4\37\37\37\377pw\217\377" \ ++ "lu\225\377CEJ\377\202\0\0\0\377\4\12\12\12\377]f\203\3771@u\377]an\377" \ ++ "\202\0\0\0\377\12\"\"!\377s{\230\377DR\201\377ms\210\377\13\12\11\377" \ ++ "\0\0\0\377\21\20\17\377bi\207\377\36/j\377RWd\377\203\0\0\0\377\3Z_n" \ ++ "\377^h\214\377FGM\377\203\0\0\0\377\3cfq\377ir\220\377ACF\377\202\0\0" \ ++ "\0\377\3\"#%\377HU\201\377+;q\377\203,M\177\377chv\377\202\0\0\0" \ ++ "\377\5###\377kmu\377ehr\377gjs\377WWZ\377\202\0\0\0\377\3))*\377R_\214" \ ++ "\377gkv\377\202\0\0\0\377\5--.\377cfp\377`co\377beq\377TUW\377\202\0" \ ++ "\0\0\377\3""68=\3776Fy\377_`h\377\202\0\0\0\377\4LMQ\377:J{\3770@v\377" \ ++ "\202\206\230\377\202\0\0\0\377\4\12\12\12\377\\e\203\3773Bv\377QRW\377" \ ++ "\202\0\0\0\377\5abf\3773Cy\377\24%b\377AN}\377,,.\377\202\0\0\0\377\3" \ ++ "uy\210\377\34-j\377RWd\377\202\0\0\0\377\12\17\17\17\377Wb\210\377\25" \ ++ "'c\377\\`q\377\4\3\3\377\0\0\0\377!\40\36\377\\h\220\377\40""1l\377\207" \ ++ "\213\230\377\202\0\0\0\377\3\36\36\40\377LX\202\377+;q\377\203,F\377))-\377\31\31\30" \ ++ "\377\7\7\6\377\202\0\0\0\377\11\37\37\36\377u|\227\377\34-g\377CQ\202" \ ++ "\377qx\216\377@AH\377((+\377\26\26\26\377\5\5\4\377\202\0\0\0\377\13" \ ++ "--,\377oy\227\3776Fy\377;J|\377;H|\377;I|\377:I{\3779Iz\3779Hz\377ag" \ ++ "~\377\6\6\6\377\202\0\0\0\377\2kp\201\377\34-j\377\203\26(e\377\13\26" \ ++ "(d\377\24%b\377Wa\201\377\20\17\16\377\0\0\0\377\21\20\16\377t{\227\377" \ ++ "3Bv\3777Fy\377BQ\202\377TWb\377\202\0\0\0\377\2\13\13\13\377\36\36\40" \ ++ "\377\202\36\37\40\377\6\36\37!\377%&(\377$%'\377:;>\377`l\224\377TV_" \ ++ "\377\202\0\0\0\377\2\15\15\15\377\35\36\37\377\202\36\36\37\377\1\36" \ ++ "\36\40\377\202%%'\377\3IKO\377>L~\377XZ`\377\202\0\0\0\377\12SU\\\377" \ ++ "4Cw\377.>t\377~\205\233\377\5\4\3\377\0\0\0\377\12\12\12\377\\d\202\377" \ ++ "t\377x}\222\377\3\3\1\377\0\0\0\377\34\34\34\377_i\212\3774Br\377" \ ++ "3Br\377Vb\214\377^i\221\377_i\220\377Wb\213\377JW\205\377^h\215\377\34" \ ++ "\34\35\377\202\0\0\0\377\3\210\215\236\377CQ\204\377y}\207\377\202\0" \ ++ "\0\0\377\20##%\377py\227\377Vb\211\377Xc\213\377s|\240\377gr\227\377" \ ++ "Ze\216\377S_\210\377HU\203\377'7p\377;J\177\377Xe\221\377^i\220\377L" \ ++ "W\177\377fl\201\377457\377\202\0\0\0\377\11VXa\377@N\202\377LY\211\377" \ ++ "]j\226\377t\177\244\377w\201\241\377cm\215\377pu\204\377//1\377\202\0" \ ++ "\0\0\377\12~\201\215\377;J}\377:I{\377;H|\377;I|\377:I{\3779Iz\3779H" \ ++ "z\377ag~\377\6\6\6\377\202\0\0\0\377\2ko\200\377\36/i\377\204\30)d\377" \ ++ "\12\24&b\377Wa\201\377\20\17\16\377\0\0\0\377\30\27\25\377nw\227\377" \ ++ "3Bv\3777Fy\377L}\377\26(c\377\30)d\377\203\31*e" \ ++ "\377\3\30)d\377\35.h\377GT\204\377\204HV\205\377\10IU\205\377IV\205\377" \ ++ "IW\205\377IV\205\377HW\204\377IW\205\377JW\206\377IW\205\377\202JW\206" \ ++ "\377\5JV\206\377JW\206\377JX\206\377JW\206\377IX\206\377\202JX\206\377" \ ++ "\202KX\206\377\5KX\205\377KX\206\377KW\206\377KW\207\377KX\206\377\202" \ ++ "JY\207\377\2KX\207\377KY\207\377\202LY\207\377\1KY\207\377\223LY\207" \ ++ "\377\1KY\207\377\202LY\207\377\10KY\207\377KX\207\377KY\207\377JY\207" \ ++ "\377KX\207\377KW\206\377KW\207\377KX\206\377\202KX\205\377\202KX\206" \ ++ "\377\1JX\206\377\202IX\206\377\3JX\206\377JW\206\377JV\206\377\203JW" \ ++ "\206\377\203IW\205\377\4IV\205\377IW\205\377IV\205\377IU\205\377\202" \ ++ "HV\205\377\10GV\205\377IV\205\3776Dx\377\27(d\377\30*e\377\31*e\377S" \ ++ "]\202\377\4\4\4\377\202\0\0\0\377\6\13\13\13\377ks\215\377ES\203\377" \ ++ "ER\203\377\\h\222\377DDF\377\203\0\0\0\377\13ps\177\377MZ\212\377ES\203" \ ++ "\377BP\201\377u\200\242\377\36\36\33\377\0\0\0\377\5\4\4\377hn\205\377" \ ++ "CQ\201\377px\221\377\203\0\0\0\377\7\206\215\243\377BO\200\377=K}\377" \ ++ "\31*e\377\32+e\377]f\204\377...\377\202\0\0\0\377\2\31\30\30\377\27\27" \ ++ "\27\377\202\0\0\0\377\5@AB\377nv\225\377@N\177\377_h\215\377\30\31\32" \ ++ "\377\202\0\0\0\377\5\210\215\236\377;J}\377FT\203\377qx\215\377\31\31" \ ++ "\31\377\202\0\0\0\377\2\36\36\37\377\21\21\20\377\202\0\0\0\377\31UV" \ ++ "X\377fp\225\377#2l\377ip\207\377\21\20\16\377\0\0\0\377\1\1\1\377\"#" \ ++ "%\377'(+\377\5\5\5\377\0\0\0\377EEF\377\\g\214\377:I}\377w{\207\377\7" \ ++ "\6\3\377\0\0\0\377\2\2\2\377'')\377%&(\377\3\3\3\377\0\0\0\377PQS\377" \ ++ "\\h\217\3778Gz\377\203;I|\377\5""9Iz\377:I{\3779Hz\377`f}\377\2\2\1\377" \ ++ "\202\0\0\0\377\2jo\177\377\36/j\377\204\31*e\377\14\24&b\377Wa\200\377" \ ++ "\14\13\12\377\0\0\0\377\27\26\24\377lv\227\3773Bv\3776Fy\3776Ex\377;" \ ++ "I|\377mu\220\377(((\377\202\0\0\0\377\2\35\35\36\377\24\24\24\377\202" \ ++ "\0\0\0\377\6HHH\377]h\217\377\25&b\377\37""0j\377bh\202\377\31\31\30" \ ++ "\377\202\0\0\0\377\2\35\36\36\377\22\21\21\377\202\0\0\0\377\5SSW\377" \ ++ "HT\201\377\30)d\3770\77r\377RTY\377\204\0\0\0\377\11VY_\377122\377\0" \ ++ "\0\0\377\6\6\6\377\\e\203\3770\77t\377\77M\177\377uy\205\377\20\20\15" \ ++ "\377\202\0\0\0\377\1\2\2\1\377\202\0\0\0\377\5///\377ck\205\377\32+f" \ ++ "\377$4m\377QVc\377\202\0\0\0\377\4&&'\377FS\201\377\25&c\377Y^p\377\202" \ ++ "\0\0\0\377\4""667\377DR\204\377%6n\377\212\216\235\377\202\0\0\0\377" \ ++ "\6\32\33\34\377LX\202\377+;q\377,\377" \ ++ "\207\214\237\377BP\201\377ES\203\377BP\201\377r}\240\377RQQ\377AAC\377" \ ++ "FFG\377qw\217\377BQ\201\377px\222\377BCE\377ABD\377\77\77A\377\200\207" \ ++ "\236\377CP\201\377&7n\377\202\30)d\377\77\27(d\377mu\224\377fis\377B" \ ++ "CF\377$%&\377#$%\37778:\377wy\204\377nz\235\377>L}\377@N\177\377_i\216" \ ++ "\377QQU\377ABD\377@@A\377\206\213\235\377;K|\377@N\177\377ES\203\377" \ ++ "\203\212\237\377egp\377\77@B\377\40\40!\377&'(\377<>@\377|\200\215\377" \ ++ "\\g\221\3779Gz\377\36.h\377\35.h\377s{\225\377QSX\377-./\377\37\40!\377" \ ++ "((*\377DDH\377dgs\377LY\204\377\30)d\377=K}\377DR\202\377\206\213\236" \ ++ "\377LMQ\377-./\377\37\37\40\377--/\377HIM\377qu\177\377bm\224\377:I{" \ ++ "\377;J|\377;I|\377:I{\377;I|\3779Iz\377:I{\3779Hz\377jq\211\377CDF\377" \ ++ "@@C\377<<>\377qu\206\377\35.i\377\204\31*e\377\7\24&b\377[e\206\377H" \ ++ "HI\377\77@C\377NNN\377lv\227\3773Bv\377\2037Fy\377D8Fz\377w\177\232\377" \ ++ "gjs\377BCE\377\"\"#\377%&'\37799;\377tw\204\377]i\221\377%5m\377\30)" \ ++ "d\377\31*e\377\36/i\377u|\225\377^ak\377==@\377\40\40!\377&'(\377;<>" \ ++ "\377sw\210\377;I|\377\25&b\377\31*e\377\27(d\377KX\206\377iks\377../" \ ++ "\377113\377ehq\377y\204\247\377Z[\\\377@@B\377FGI\377`i\210\3770\77t" \ ++ "\377/\77t\377:I|\377z\201\233\377PRW\377./0\377!\"#\3779:<\377fhr\377" \ ++ "[f\216\377\27(d\377\30)d\377\"3l\377bfu\377=>@\377>\77A\377STW\377BO" \ ++ "}\377\25'c\377fl\177\377BCE\377\77@B\377]^`\377GU\205\377%6n\377\207" \ ++ "\214\234\377;<=\377@AC\377QRU\377KX\202\377+;q\377,M~\377@N\177\377\77M~\377>M\177\377M[\212\377Zf\222\377cn\223\377`k" \ ++ "\223\377[g\222\377CQ\203\377=K|\3775Dx\377\30)e\377\30)d\377\25&c\377" \ ++ "1@w\377\77M}\377FR\200\377BP~\3775Dz\377%6o\377\26'c\377'7o\377>L}\377" \ ++ "L~\3770\77t\3771@u\377" \ ++ "0\77t\3770\77u\3775E{\377\77M~\377ER\177\3779H|\377'7q\377\25&b\377\30" \ ++ ")d\377\31*e\377\32+f\377/\77u\377\2026F{\377\4""4Dz\377!2j\377\30)d\377" \ ++ "/>u\377\2026F{\377\14""4Dz\377/>s\377+;q\377CR\201\377IV\207\377HU\207" \ ++ "\377HU\206\3773Cw\377+;q\377,s\377HV\204\377\202FT\203" \ ++ "\377\4FS\203\377FT\203\377ET\202\377FT\203\377\203ES\202\377\202ER\202" \ ++ "\377\11ES\203\377DS\203\377ES\202\377DR\203\377DS\201\377DR\201\377D" \ ++ "Q\201\377CQ\201\377DR\202\377\203CQ\201\377\4CR\202\377DQ\201\377%4m" \ ++ "\377\30)d\377\203\31*e\377\204\30)d\377\2""1Au\377BP\200\377\202AO\177" \ ++ "\377\2AO\200\377@N\200\377\203@N\177\377\5AN\200\377\77N~\377@N\177\377" \ ++ "@M\177\377@N\177\377\202\77M~\377\1@N~\377\204>L~\377\4\77M~\377'6n\377" \ ++ "\30)d\377\31*e\377\207\30)d\377\2\26'c\377:Iz\377\202=K}\377\203;J|\377" \ ++ "\204;I{\377\5:J|\377;J|\377;I|\377;H|\377;I|\377\204:I{\377\1'7n\377" \ ++ "\205\30)d\377\205\31*e\377\202\30)d\377\20%5l\3779Gz\3778Ex\3776Fy\377" \ ++ "7Fy\3777Ey\3777Fy\3777Dy\3776Dx\3775Dx\3775Dy\3775Dx\3775Ew\3775Dw\377" \ ++ "5Dx\3774Cw\377\202\30)d\377\202\31*e\377\210\30)d\377\202\31*e\377\4" \ ++ "\30)d\377\35.h\3773Bv\3771Bu\377\2031@u\377\4""1@v\3771@u\3771@t\377" \ ++ "0\77t\377\2031@u\377\2/>s\377\33,f\377\205\30)d\377\202\31*e\377\206" \ ++ "\30)d\377\1\31*e\377\203\30)d\377\4\27(d\377,L}\377AO\177\377AO\200\377BP\200\377@N\200" \ ++ "\377\204AO\200\377\4@O\177\377\77N~\377@N\177\377@M\177\377\203@N\177" \ ++ "\377\2\77M\177\377>L\177\377\202\77M\177\377\2\77M}\377>L}\377\202\30" \ ++ ")d\377\207\31*e\377\11\30)d\377!2j\377>K}\377=J|\377s\377CP\200\377AO\177\377BP\200\377AO\200\377@N\200\377\204A" \ ++ "O\200\377\3@N\177\377\77O~\377@M\177\377\203@N\177\377\202\77M\177\377" \ ++ "\6>L\177\377\77M~\377\77M\177\377>L~\3777Ex\377\32+e\377\210\31*e\377" \ ++ "\2\30)d\377\40""1j\377\202=K}\377\3" \ ++ "L}\377AO\177\377BP\200\377\202AO\200\377\1@N\200\377\202AO\200\377\3" \ ++ "@O\177\377AO\200\377\77O~\377\206@N\177\377\1>L\177\377\202\77M\177\377" \ ++ "\202\77M~\377\2-=s\377\30)d\377\210\31*e\377\3\27(d\3770>t\377=K}\377" \ ++ "\202L\177\377\77M\177\377" \ ++ "\77M~\377>L~\377@M~\377\37/i\377\30)d\377\207\31*e\377\2\30)d\377\31" \ ++ "*e\377\202=K}\377\5L~\377\77M~\3775Dx\377\26(c\377\210" \ ++ "\31*e\377\11\30)d\377(9o\377>K}\377=K}\377s\3778Fy\3777Fy\3776Fy\377\2027Fy\377\2""7Ey\3776" \ ++ "Dy\377\2026Ey\377\10""6Ex\3776Ew\3776Ex\3776Dx\3775Dx\3775Cw\377\30(" \ ++ "d\377\30)d\377\214\31*e\377\5\30)d\377\27(d\3772Au\3772Bv\3772@v\377" \ ++ "\2032Av\377\3""2Au\3771@u\3770\77u\377\2021@u\377\4""0\77t\3772Au\377" \ ++ "\36/h\377\30)d\377\220\31*e\377\5\30)d\377\37/i\377-=r\377-L\177\377\77M\177\377\202\77M~\377\1""2Au\377\212\31*e\377\17" \ ++ "\37/i\377:I{\377=J|\377L\177\377\202\77M\177\377\4>L~\377>L}\377#3k\377\30)d" \ ++ "\377\210\31*e\377\2\30)d\377(8n\377\202=K}\377\3L\177\377\77M\177\377\202\77M~\377\3""9Gz\377" \ ++ "\27)d\377\30)d\377\207\31*e\377\4\31)d\377\27(d\377:I{\377=K}\377\203" \ ++ "s\3771Bv\377\2042Av\377" \ ++ "\3""2Au\3772At\3770\77u\377\2041@u\377\1(8o\377\221\31*e\377\6\30)d\377" \ ++ "\32+f\377.=s\377-=r\377-L~\377=J|\377t\377\32+e\377\216\31*e\377\3\35-g\377" \ ++ "1@u\3771Av\377\2042Av\377\3""2Au\3771@t\3770\77u\377\2031@u\377\3""0" \ ++ "\77t\377#3k\377\30)d\377\220\31*e\377\5\30)d\377\40""0j\377-=s\377-=" \ ++ "q\377-;r\377\202-t\377\26'b\377\30)d\377\205\31*e\377\10" \ ++ "\30)d\377\27(d\377\37""0i\377/\77t\377GU\204\377IW\206\377HV\205\377" \ ++ "GV\205\377\203HV\205\377\3IV\205\377HV\205\377IV\205\377\202IU\205\377" \ ++ "\204IV\205\377\205IW\205\377\1IV\205\377\215IW\205\377\204IV\205\377" \ ++ "\202IU\205\377\2IV\205\377HV\205\377\202IV\205\377\202HV\205\377\10G" \ ++ "U\204\377HV\205\377JX\206\377>L~\377'7n\377\32+f\377\27)d\377\30)e\377" \ ++ "\205\31*e\377\6\30)d\377\34-g\377L\177\377\77M~\377\77" \ ++ "M\177\377\77M~\3775Cw\377\27)d\377\210\31*e\377\3\30)d\377\32+f\377:" \ ++ "H{\377\202=K}\377\4;K}\377L\177\377\202\77M\177\377\4>L~\377>L}\377#3l\377" \ ++ "\30)d\377\210\31*e\377\4\30)d\377'7n\377s\3778Fy\3777Fy\3776Fy\377\2027Fy\377\14""7Ey\3777Dy\3776Ey\3776Ex" \ ++ "\3776Ey\3776Ew\3776Dx\3775Dx\3776Cw\3775Dx\377\37/i\377\30)d\377\215" \ ++ "\31*e\377\11\30)d\377(8o\3772Bv\3772Av\3772@v\3772Av\3772Au\3772Av\377" \ ++ "2At\377\2051@u\377\3/>t\377\27)d\377\30)d\377\221\31*e\377\2*:q\377," \ ++ "=q\377\202-L\177\377\203\77M~\377\2""9Gz\377\32" \ ++ "*e\377\211\31*e\377\2\30)d\3776Ex\377\202=K}\377\4L~\377%5m\377\202\31*e\377\202" \ ++ "\30)d\377\206\31*e\377\4\30)d\377\27(d\377-=r\377FT\204\377\202GU\204" \ ++ "\377\2FU\203\377GT\204\377\202FS\203\377\202ET\202\377\202FT\203\377" \ ++ "\10FS\203\377FT\203\377FS\203\377FR\203\377ES\203\377FS\203\377ES\203" \ ++ "\377DS\203\377\202ES\203\377\4ES\202\377ES\201\377DR\202\377EQ\202\377" \ ++ "\202CR\202\377\204DR\202\377\5DQ\201\377DP\200\377DR\202\377\36/h\377" \ ++ "\30)d\377\207\31*e\377\7\31*d\3776Ey\377BP\200\377AO\177\377BP\200\377" \ ++ "AO\200\377@N\200\377\204AO\200\377\4@O\177\377\77N~\377\77O~\377@M\177" \ ++ "\377\203@N\177\377\3\77M\177\377@N\177\377>L\177\377\202\77M\177\377" \ ++ "\4>L}\377@N~\377'7n\377\30)d\377\210\31*e\377\11\30)d\377#3l\377>L~\377" \ ++ "=K}\377M~\377HV\205\377" \ ++ "FT\203\377FU\203\377GT\204\377FT\203\377FS\203\377FT\203\377ET\202\377" \ ++ "\203FT\203\377\203FS\203\377\14FR\203\377ES\203\377FS\203\377ES\203\377" \ ++ "DS\203\377ES\202\377ES\203\377ES\202\377ES\201\377ER\202\377DQ\202\377" \ ++ "CR\202\377\204DR\202\377\6DQ\201\377DR\202\377DQ\201\377BO\200\377$4" \ ++ "l\377\27(d\377\207\31*e\377\10\27)d\377)8o\377BP\200\377AO\177\377AO" \ ++ "\200\377BP\200\377AO\200\377@N\200\377\202AO\200\377\5@O\177\377AO\200" \ ++ "\377@O\177\377\77N~\377@M\177\377\204@N\177\377\204\77M\177\377\202\77" \ ++ "M~\377\2""6Ex\377\26'c\377\210\31*e\377\202\30)d\377\1""9H{\377\202=" \ ++ "K}\377\2s\377\30)d\377\221\31*e\377\7\30)d\377" \ ++ "\"2k\377-=r\377-L~\3774Cw\377&6n\377\35-g\377\33+f\377" \ ++ "\30*d\377\203\30)d\377\207\31*e\377\10\30)d\377\26'c\377$5l\377\77N\177" \ ++ "\377FS\203\377GU\204\377FT\203\377GU\204\377\202GT\204\377\3GS\204\377" \ ++ "FT\203\377ET\202\377\205FT\203\377\6FS\203\377FR\203\377ES\203\377FS" \ ++ "\203\377ES\203\377DS\203\377\202ES\203\377\4ER\202\377ER\201\377DR\202" \ ++ "\377EQ\202\377\202CR\202\377\205DR\202\377\4CQ\201\377DQ\201\377(8o\377" \ ++ "\30)d\377\207\31*e\377\2\30)d\377\37/i\377\204BP\200\377\2AO\200\377" \ ++ "@N\200\377\204AO\200\377\4@O\177\377\77O~\377@N\177\377@M\177\377\203" \ ++ "@N\177\377\202\77M\177\377\7>L\177\377\77M~\377\77M\177\377>L~\377=K" \ ++ "}\377\36/h\377\30)d\377\210\31*e\377\6\30)d\377&6n\377=K}\377s\3772Bv\3775Dw\3778Fy\377;J{\377=K}\377=L}\377L~\377B" \ ++ "P\177\377\202BP\200\377\2AO\200\377@N\200\377\203AO\200\377\203@O\177" \ ++ "\377\2@N\177\377@M\177\377\203@N\177\377\3\77M\177\377@N\177\377>L\177" \ ++ "\377\202\77M\177\377\4>L~\377\77M~\377/\77s\377\30)d\377\212\31*e\377" \ ++ "\7""5Cw\377s\377-=r\377-s\377\77M~\377FT\203\377GU\204\377FT\203\377GU\204\377GT\204\377" \ ++ "FT\203\377GS\204\377FS\203\377FT\203\377ET\202\377\205FT\203\377\2FS" \ ++ "\203\377FR\203\377\202FS\203\377\1ES\203\377\202DS\203\377\2ES\203\377" \ ++ "ES\202\377\202ER\201\377\1DQ\202\377\210DR\202\377\4CQ\201\377DQ\201" \ ++ "\377.=s\377\30)d\377\210\31*e\377\4\27(d\3772Bv\377BP\200\377AO\177\377" \ ++ "\210AO\200\377\3@N\177\377\77O~\377@M\177\377\205@N\177\377\10\77M\177" \ ++ "\377>L\177\377\77M~\377\77M\177\377\77M~\377=K|\377\31*e\377\30)d\377" \ ++ "\210\31*e\377\2\30)d\377\40""0i\377\202=K}\377\203L\177\377\77" \ ++ "M~\377\77M\177\377\77M}\377@N~\377\"2k\377\30)d\377\210\31*e\377\3\30" \ ++ ")d\377\27(d\3775Dx\377\202=K}\377\3s\377#3k\377\30)d\377\26'c\377\27)d\377\30)d\377\233" \ ++ "\31*e\377\10\30)d\377\27(c\377\26'c\377\33,g\377(8o\3774Cw\377\77N\177" \ ++ "\377HV\204\377\202GU\204\377\10FU\203\377GU\204\377GT\204\377FT\203\377" \ ++ "GS\204\377FS\203\377FT\203\377ET\202\377\203FT\203\377\2FS\203\377FT" \ ++ "\203\377\202FS\203\377\2FR\203\377FS\203\377\202ES\203\377\202DS\203" \ ++ "\377\6ES\202\377ES\203\377ER\202\377ES\201\377DR\202\377EQ\202\377\210" \ ++ "DR\202\377\3CQ\201\377DQ\201\3774Cw\377\202\30)d\377\207\31*e\377\2\30" \ ++ ")d\377$4l\377\202AO\177\377\202BP\200\377\2AO\200\377@N\200\377\204A" \ ++ "O\200\377\1@O\177\377\202@N\177\377\1@M\177\377\203@N\177\377\5\77M\177" \ ++ "\377@N\177\377\77M\177\377>L\177\377\77M\177\377\202\77M~\377\1""3Bv" \ ++ "\377\212\31*e\377\6\30)d\377(7o\377>L}\377=J|\377t\377\77M\177\377HV\204\377\202GU\204\377\10FT\203\377G" \ ++ "U\204\377GT\204\377FT\203\377GT\204\377GS\204\377FT\203\377GT\204\377" \ ++ "\202ET\202\377\203FT\203\377\1FS\203\377\202FT\203\377\2FS\203\377FR" \ ++ "\203\377\202FS\203\377\202ES\203\377\2DS\203\377ES\202\377\202ES\203" \ ++ "\377\202ES\201\377\202EQ\202\377\2DR\202\377CR\202\377\204DR\202\377" \ ++ "\2DQ\201\377DR\202\377\202DQ\201\377\2""8Fy\377\32*e\377\207\31*e\377" \ ++ "\202\30)d\377\7\35.g\377@N\177\377BP\200\377AO\200\377BP\200\377AO\200" \ ++ "\377@N\200\377\203AO\200\377\5@O\177\377AO\200\377@O\177\377\77O~\377" \ ++ "@M\177\377\205@N\177\377\202\77M\177\377\6\77M~\377>M~\377\77M}\377>" \ ++ "L}\377\40""0i\377\30)d\377\210\31*e\377\11\30)d\377\34-g\3778Gz\377<" \ ++ "J|\377=K}\377;K}\377L~\3777Fy\377" \ ++ "2Au\377,;r\377'6n\377!2j\377\34-g\377\31*e\377\27(d\377\203\26'c\377" \ ++ "\2\26(c\377\27(c\377\203\26'c\377\16\27'c\377\30)d\377\32+e\377\36/h" \ ++ "\377#4l\377)9o\377.=s\3774Cw\377:I{\377BP\201\377JW\206\377HV\205\377" \ ++ "GU\204\377FT\203\377\202GU\204\377\5GT\204\377FT\203\377GT\204\377GS" \ ++ "\204\377FS\203\377\202FT\203\377\1ET\202\377\206FT\203\377\202FS\203" \ ++ "\377\2FR\203\377ES\203\377\202FS\203\377\5ES\203\377DS\203\377ES\202" \ ++ "\377ES\203\377ER\202\377\202ES\202\377\4DR\202\377ER\202\377DR\202\377" \ ++ "CR\202\377\204DR\202\377\5DQ\201\377DR\202\377CQ\201\377DQ\201\3771A" \ ++ "v\377\202\30)d\377\207\31*e\377\10\30)d\377\37/i\377\77M~\377BP\200\377" \ ++ "AO\177\377BP\200\377AO\200\377@N\200\377\203AO\200\377\4@O\177\377AO" \ ++ "\200\377@O\177\377\77O~\377\205@N\177\377\203\77M\177\377\6\77M~\377" \ ++ "\77M\177\377>L~\377@N\177\377-t\3778Ex\3777Fy\3776Fy\377\2027Fy\377\202" \ ++ "7Ey\377\12""6Ey\3775Ey\3776Ey\3776Ex\3776Ew\3776Dx\3775Dx\3776Dx\377" \ ++ "(7o\377\30)d\377\215\31*e\377\202\30)d\377\3""1@u\3771Bv\3772@v\377\203" \ ++ "2Av\377\4""2Au\3771@t\3771@u\3770\77u\377\2031@u\377\2,t\377\31*e\377\30)d\377\210\31*e\377\7\33,f\377<" \ ++ "J|\377BP\200\377AO\177\377BP\200\377AO\200\377@N\200\377\205AO\200\377" \ ++ "\4@O\177\377\77N~\377@N\177\377@M\177\377\205@N\177\377\202>L\177\377" \ ++ "\1\77M\177\377\202\77M~\377\3""8Gz\377\31*e\377\30)d\377\210\31*e\377" \ ++ "\10\30)d\377\37/i\377>L}\377=K}\377L\177\377\202" \ ++ "\77M~\377\4>L~\377>L}\377#3k\377\30)d\377\212\31*e\377\1""7Fy\377\202" \ ++ "=K}\377\5L\177\377\202\77M\177\377\4>L" \ ++ "~\377@N~\377-=r\377\30)d\377\211\31*e\377\2\30)d\377'7n\377\202s\377\30)d\377" \ ++ "\213\31*e\377\6\30)d\377\33,g\3778Fz\3778Fx\3777Fy\3776Fy\377\2027Fy" \ ++ "\377\14""7Ey\3776Dy\3776Ey\3776Ex\3776Ey\3776Ew\3776Dx\3776Ex\3776Cx" \ ++ "\3776Dx\377%6m\377\30)d\377\216\31*e\377\12\32+f\377/>t\3771Bu\3772A" \ ++ "v\3772@v\3772Av\3772Au\3771@u\3772At\3770\77u\377\2031@u\377\2""0\77" \ ++ "t\377-L\177\377\202\77M\177\377\202\77M~\377\2""5Dx\377\26'c\377\211" \ ++ "\31*e\377\4\30)d\377\32+e\377:I{\377=K}\377\202L\177\377\202\77M~\377\4>L}\377;J|\377\34-g\377" \ ++ "\30)d\377\210\31*e\377\12\30)e\377\27(c\3772Au\377=K}\377L~\377\202DQ\201\377\3CQ\201\377DR\202\377DQ\201\377\205" \ ++ "DR\202\377\1CR\202\377\202DR\202\377\6EQ\202\377ER\202\377ER\201\377" \ ++ "ES\201\377ER\202\377ES\202\377\202ES\203\377\1ES\202\377\202DS\203\377" \ ++ "\2FS\203\377ES\203\377\202FS\203\377\1ES\203\377\202FR\203\377\204FS" \ ++ "\203\377\242FT\203\377\203FS\203\377\202FR\203\377\3FS\203\377ES\203" \ ++ "\377FS\203\377\203ES\203\377\12DS\203\377ES\203\377ES\202\377ES\203\377" \ ++ "ES\202\377ER\202\377ES\201\377ER\201\377DR\202\377EQ\202\377\202DR\202" \ ++ "\377\1CR\202\377\205DR\202\377\10DQ\201\377DR\202\377CR\202\377DQ\201" \ ++ "\377CQ\201\3771@t\377\26'c\377\30)d\377\210\31*e\377\4\30)d\377\32+e" \ ++ "\3776Ex\377BP\200\377\202AO\200\377\1BP\200\377\207AO\200\377\2AN\200" \ ++ "\377\77O~\377\205@N\177\377\2\77M\177\377@N\177\377\202\77M\177\377\6" \ ++ "\77M~\377\77M\177\377\77M}\377\77M~\377$5l\377\30)d\377\211\31*e\377" \ ++ "\2\30)d\377#3l\377\202L\177\377\77M~\377\77M\177\377\77M" \ ++ "~\377@M~\377+;q\377\27(c\377\212\31*e\377\2\30)d\3775Ex\377\202=K}\377" \ ++ "\203L\177\377\202\77M\177\377\5\77M~\377>L}\377" \ ++ "5Cw\377\31*e\377\30)d\377\211\31*e\377\3\27(d\377,K}\377\202<" \ ++ "K}\377\4;K}\377L~\377\77M~\377=K|\377" \ ++ "\35.h\377\30)d\377\211\31*e\377\7\30)d\377$4l\377>L~\377t\377\26(c\377\216\31*e\377\3\30)" \ ++ "d\377\40""0i\3772Bv\377\2052Av\377\3""2Au\3771@t\3770\77u\377\2041@u" \ ++ "\377\1(7o\377\222\31*e\377\7\30)d\377\40""0i\377-=s\377-L\177\377\77M~\377\77M\177\377\77M~\377@N~\377\40""1j\377\30)d\377\212" \ ++ "\31*e\377\2\33,f\3779H{\377\202=K}\377\2L\177\377\77M\177\377\77M" \ ++ "~\377\77M\177\377>L~\377\77M~\377*:p\377\30)d\377\211\31*e\377\202\30" \ ++ ")d\377\1""4Bw\377\202=K}\377\5t\377\32*e\377\216\31*e\377" \ ++ "\5\30)d\377\34,g\3774Cw\3771Bu\3772@v\377\2032Av\377\2""2Au\3771@t\377" \ ++ "\2051@u\377\1.=s\377\202\30)d\377\220\31*e\377\6\30)d\377\33,f\377.>" \ ++ "s\377,=q\377-;r\377-L\177" \ ++ "\377\77M~\377\77M\177\377>L~\377AO\177\377,s\377=K}\377L}\377\40""1j\377\30)d\377\212\31*e\377\202\30)d\377\10!1j\377@" \ ++ "N\200\377BP\200\377AO\177\377AO\200\377BP\200\377AO\200\377@N\200\377" \ ++ "\206AO\200\377\4@O\177\377\77O~\377@O\177\377@M\177\377\206@N\177\377" \ ++ "\10>L\177\377\77M\177\377\77M~\377\77M\177\377>L~\377\77M~\377/\77t\377" \ ++ "\27(d\377\212\31*e\377\2\30)d\377\"3k\377\202L~\377@M~\3774Cw\377\213" \ ++ "\31*e\377\3\30)d\377\33,f\377:H{\377\202=K}\377\5L\177\377\77M\177\377\77M~\377\77M\177\377" \ ++ ">L~\377\77M~\3777Fy\377\27(d\377\30)d\377\211\31*e\377\202\30)d\377\1" \ ++ "7Fy\377\202=K}\377\2s\377" \ ++ "\217\31*e\377\202\30)d\377\10""0@u\3772Bv\3772Av\3772@v\3772Av\3772A" \ ++ "u\3771@u\3772At\377\2041@u\377\2020\77t\377\2\37""0i\377\30)d\377\221" \ ++ "\31*e\377\7\30)d\377$4l\377-=r\377-L~\377\77M~\3778Gz\377" \ ++ "\32+f\377\30)d\377\212\31*e\377\7\30)d\377+:q\377=K}\377L\177\377\7\77M\177\377\77" \ ++ "M~\377>L\177\377\77M~\377=L}\377\33,f\377\30)d\377\212\31*e\377\3\30" \ ++ ")d\377!1j\377=L}\377\202=K}\377\202L~\377\77M}\377;J|\377\35-h\377\30)d\377\212\31*e\377\12" \ ++ "\30)d\377!1j\377=K}\377=J|\377=K}\377L\177\377\77M~\377\77M\177\377>L~\377\77M" \ ++ "~\377=L~\377\37""0i\377\30)d\377\212\31*e\377\7\30)d\377\34-g\377:H{" \ ++ "\377=K}\377=J|\377L}\377" \ ++ "AO\177\377\207DQ\201\377\240DR\202\377\2DQ\201\377CQ\201\377\203DQ\201" \ ++ "\377\10CP\200\377@M~\377=K}\3772Av\377\40""1i\377\27(c\377\30)d\377\31" \ ++ "*d\377\215\31*e\377\202\30)d\377\7\34,g\3772@u\377CQ\201\377AO\177\377" \ ++ "BP\200\377AO\200\377BP\200\377\202AO\200\377\1@N\200\377\207AO\200\377" \ ++ "\4@N\177\377\77O~\377@N\177\377@M\177\377\206@N\177\377\12\77M\177\377" \ ++ ">L\177\377\77M\177\377\77M~\377\77M\177\377>L~\377\77M~\377:I{\377\34" \ ++ ",g\377\30)d\377\212\31*e\377\3\30)d\377\33,f\377:I{\377\202=K}\377\5" \ ++ "s\377\33,f\377\222\31*e\377\10\30)d\377#3l\377-=r" \ ++ "\377-M}\377FS\202\377ER\201\377DQ\201\377DQ\200\377CQ\201\377\203" \ ++ "DQ\201\377\227DR\202\377\203DQ\201\377\1CQ\201\377\202DQ\201\377\10F" \ ++ "R\202\377DR\201\3779G{\377-L\177\377\77M~\377\77" \ ++ "M\177\377>L~\377\77M~\3778Gz\377\34-g\377\30)d\377\213\31*e\377\17\32" \ ++ "+f\3777Ey\377=K}\377L~\377" \ ++ "#3k\377\32*e\377\202\30)d\377\220\31*e\377\202\30)d\377\7\27(d\377\34" \ ++ "-g\377+;q\3778Fy\377\77M\177\377BO\177\377BO\200\377\202CP\200\377\204" \ ++ "DQ\201\377\2DQ\200\377DP\200\377\203DQ\201\377\1CQ\201\377\202DQ\201" \ ++ "\377\1CQ\201\377\204DQ\201\377\2DP\200\377DQ\200\377\204DQ\201\377\2" \ ++ "CP\200\377BP\200\377\202BO\177\377\5=K}\3774Bv\377&6m\377\30)d\377\27" \ ++ ")d\377\202\30)d\377\220\31*e\377\4\30)d\377\31*e\377\32+f\3770\77t\377" \ ++ "\202BP\200\377\2AO\177\377AO\200\377\202BP\200\377\210AO\200\377\202" \ ++ "@O\177\377\3@N\177\377\77O~\377@O\177\377\202@M\177\377\204@N\177\377" \ ++ "\202\77M\177\377\10@N\177\377>L\177\377\77M\177\377\77M~\377\77M\177" \ ++ "\377>L~\377\77M~\3777Fy\377\202\30)d\377\212\31*e\377\202\30)d\377\1" \ ++ "4Cw\377\203=K}\377\5;K}\377L}\377@M~\377AO\177\377CP\201\377ER\202\377\205" \ ++ "FS\202\377\17DQ\202\377BP\200\377AN\177\377\77L~\377=K}\377;I{\3777F" \ ++ "y\3772Au\377,;r\377'8o\377\"3k\377\36/h\377\31*e\377\26'c\377\27(c\377" \ ++ "\202\30)d\377\221\31*e\377\6\30)d\377\26'c\377\40""1j\3771@u\377@N\177" \ ++ "\377CQ\200\377\202BP\200\377\2AO\200\377BP\200\377\202AO\200\377\202" \ ++ "@N\200\377\204AO\200\377\1@O\177\377\202AO\200\377\2@N\177\377\77O~\377" \ ++ "\207@N\177\377\14\77M\177\377@N\177\377\77M\177\377>L\177\377\77M\177" \ ++ "\377\77M~\377\77M\177\377>L~\377@N\177\3772Av\377\32+e\377\30)d\377\214" \ ++ "\31*e\377\11""2Av\377>L}\377L\177\377\77M\177\377\77" \ ++ "M~\377\77M\177\377>M~\377@M~\377.>s\377\27)d\377\30)d\377\213\31*e\377" \ ++ "\5\30)d\377.=s\377=K}\377K}\377.>s\377" \ ++ "#3k\377\32*e\377\27(d\377\30)d\377\235\31*e\377\205\30)d\377\234\31*" \ ++ "e\377\13\31*d\377\30)d\377\27(d\377\36.h\377'7n\3775Dw\377CP\201\377" \ ++ "BP\200\377AO\177\377BP\200\377AO\200\377\202BP\200\377\212AO\200\377" \ ++ "\202@O\177\377\2\77O~\377@N\177\377\202@M\177\377\204@N\177\377\2\77" \ ++ "M\177\377@N\177\377\202\77M\177\377\10>L\177\377\77M~\377\77M\177\377" \ ++ ">L~\377\77M~\377@M~\377,L~\377s\377\30" \ ++ ")d\377\215\31*e\377\4\30)d\377(7o\3777Ey\3777Fx\377\2047Fy\377\2027E" \ ++ "y\377\13""6Ey\3775Ey\3776Ey\3776Ex\3776Ew\3776Ex\3775Dx\3776Cw\3775D" \ ++ "x\377$4l\377\30)d\377\216\31*e\377\202\30)d\377\12/\77t\3772Bv\3772A" \ ++ "v\3772@v\3772Av\3772Au\3772Av\3772At\3771@u\3770\77u\377\2041@u\377\1" \ ++ ")9p\377\224\31*e\377\3&6n\377-=r\377-L\177\377\202\77M\177\377\202\77M~\377\2@N~\377&6m\377\202\30)d\377" \ ++ "\213\31*e\377\12\30)d\377+:p\377L~\377" \ ++ "CQ\201\377BP\200\377BP\177\377\204BP\200\377\202AO\200\377\1@N\200\377" \ ++ "\206AO\200\377\1@O\177\377\202AO\200\377\5@N\177\377@O\177\377\77N~\377" \ ++ "@N\177\377@M\177\377\207@N\177\377\202\77M\177\377\1>L\177\377\202\77" \ ++ "M\177\377\203\77M~\377\3:Hz\377\"2k\377\30)d\377\213\31*e\377\5\30)d" \ ++ "\377\31*e\377*9p\377>L~\377=K}\377\203L}\3778Gz" \ ++ "\377-L\177\377\77M\177" \ ++ "\377\202\77M~\377\4>L}\377@M~\3771@u\377\34-g\377\202\30)d\377\213\31" \ ++ "*e\377\13\30*e\3770@u\377=K}\377L\177\377\202\77M\177\377\6\77M~\377>L~\377" \ ++ "\77M~\377>L}\377,K}\377\202=K}\377\4;K}\377s\3776Ex\377=K}\377" \ ++ "\202CQ\200\377\204BP\200\377\1AO\200\377\203BP\200\377\202AO\200\377" \ ++ "\202@N\200\377\212AO\200\377\4@N\177\377@O\177\377\77O~\377@N\177\377" \ ++ "\202@M\177\377\207@N\177\377\202\77M\177\377\2>L\177\377\77M~\377\202" \ ++ "\77M\177\377\6>L~\377\77M~\377:H{\377\"2k\377\27(c\377\30)d\377\213\31" \ ++ "*e\377\14\30)d\377\33,f\3775Cw\377>L}\377s\377\31)e" \ ++ "\377\30)d\377\214\31*e\377\6\30)d\377\34-g\3776Ey\3778Fy\3777Fy\3776" \ ++ "Fy\377\2027Fy\377\16""7Ey\3776Ey\3777Dy\3776Ey\3775Ey\3776Ey\3776Ex\377" \ ++ "6Ew\3776Ex\3776Dx\3775Cx\3776Dx\377\36/h\377\30)d\377\216\31*e\377\202" \ ++ "\30)d\377\4,;r\3772Bv\3771Bu\3772@v\377\2032Av\377\2""2Au\3771@t\377" \ ++ "\2041@u\377\4""0\77t\3771@u\377\35-h\377\30)d\377\222\31*e\377\3\32+" \ ++ "e\377*:q\377,L\177\377\2@N\177\377\77M\177\377\207@N\177\377\202@M\177\377\7@N\177" \ ++ "\377\77N~\377\77O~\377AN\200\377@O\177\377AO\200\377@O\177\377\210AO" \ ++ "\200\377\202@N\200\377\3AO\200\377BP\200\377AO\200\377\203BP\200\377" \ ++ "\1AO\200\377\207BP\200\377\5>K}\3775Dw\377+;p\377#2k\377\32+f\377\225" \ ++ "\31*e\377\5\35.g\377&6m\377/>t\3778Gz\377@O\177\377\204BP\200\377\1A" \ ++ "O\177\377\202BP\200\377\1AO\200\377\203BP\200\377\3AO\200\377BP\200\377" \ ++ "AO\200\377\202@N\200\377\210AO\200\377\2@O\177\377AO\200\377\203@O\177" \ ++ "\377\1\77O~\377\202@N\177\377\1@M\177\377\210@N\177\377\202\77M\177\377" \ ++ "\2>L\177\377\77M~\377\202\77M\177\377\6>L~\377\77M}\377\77M~\3775Dx\377" \ ++ "\31*e\377\30)d\377\213\31*e\377\202\30)d\377\2\32+e\3779Gz\377\203=K" \ ++ "}\377\4;K}\377L\177\377\77M\177\377\202@N\177\377\1\77M\177\377\206@N\177\377" \ ++ "\1@M\177\377\202@N\177\377\1\77O~\377\202@O\177\377\202AO\200\377\1@" \ ++ "O\177\377\210AO\200\377\202@N\200\377\204AO\200\377\212BP\200\377\33" \ ++ "CQ\201\377DQ\201\377DR\201\377\77M~\377=K|\377:I{\3779Hz\3777Fy\3775" \ ++ "Dx\3774Cv\3772Au\3770\77t\377.>s\377-=r\377/\77s\3771@t\3772Bv\3774C" \ ++ "w\3776Ex\3778Gy\3779H{\377;J|\377=K}\377AO\177\377DR\201\377CQ\201\377" \ ++ "CQ\200\377\212BP\200\377\204AO\200\377\202@N\200\377\213AO\200\377\5" \ ++ "@O\177\377@N\177\377\77O~\377\77N~\377@N\177\377\202@M\177\377\206@N" \ ++ "\177\377\3\77M\177\377@N\177\377\77M\177\377\202>L\177\377\202\77M\177" \ ++ "\377\7\77M~\377>L~\377\77M~\377>M~\377*:p\377\27(d\377\30)d\377\214\31" \ ++ "*e\377\5\30)d\377\37/i\3779Hz\377=K}\377L\177\377\202\77M\177\377\2@N\177\377\77" \ ++ "M\177\377\206@N\177\377\202@M\177\377\5@N\177\377\77N~\377\77O~\377@" \ ++ "N\177\377@O\177\377\213AO\200\377\203@N\200\377\204AO\200\377\203BP\200" \ ++ "\377\1AO\200\377\241BP\200\377\1AO\200\377\203BP\200\377\204AO\200\377" \ ++ "\203@N\200\377\213AO\200\377\2@O\177\377@N\177\377\202\77O~\377\202@" \ ++ "N\177\377\1@M\177\377\211@N\177\377\1\77M\177\377\202>L\177\377\7\77" \ ++ "M~\377\77M\177\377\77M~\377>L}\377\77M~\3778Gz\377\35.h\377\202\30)d" \ ++ "\377\214\31*e\377\6\30)d\377\37/h\377L\177\377\203\77M\177\377\207@N\177\377" \ ++ "\202@M\177\377\202@N\177\377\1\77O~\377\203@O\177\377\215AO\200\377\203" \ ++ "@N\200\377\205AO\200\377\207BP\200\377\1AO\200\377\223BP\200\377\204" \ ++ "AO\200\377\204@N\200\377\213AO\200\377\1@O\177\377\202AO\200\377\202" \ ++ "@O\177\377\202\77O~\377\1@N\177\377\203@M\177\377\206@N\177\377\2\77" \ ++ "M\177\377@N\177\377\202\77M\177\377\11>L\177\377\77M\177\377\77M~\377" \ ++ "\77M\177\377\77M~\377>L}\377\77M~\377;I{\377+;q\377\202\30)d\377\214" \ ++ "\31*e\377\3\30*d\377\30)d\377$4l\377\202=K}\377\1=J|\377\202s\377\33,f\377\224\31*e\377\4+:p\377,=r\377-L}\377\77M~\377\204\77M\177" \ ++ "\377\2>L\177\377\77M\177\377\211@N\177\377\203@M\177\377\3@N\177\377" \ ++ "\77N~\377\77O~\377\203@O\177\377\202AO\200\377\1@O\177\377\213AO\200" \ ++ "\377\205@N\200\377\207AO\200\377\216BP\200\377\206AO\200\377\205@N\200" \ ++ "\377\214AO\200\377\1@O\177\377\202AO\200\377\4@O\177\377@N\177\377@O" \ ++ "\177\377\77N~\377\202@N\177\377\202@M\177\377\206@N\177\377\1\77M\177" \ ++ "\377\202@N\177\377\202\77M\177\377\1>L\177\377\203\77M\177\377\202\77" \ ++ "M~\377\3AO\177\3770\77u\377\34-g\377\202\30)d\377\214\31*e\377\6\30)" \ ++ "d\377\27(d\377/\77t\377L~\377\77M~\377\77M\177\377\77M~\377\77M\177\377>L\177\377\202" \ ++ "\77M\177\377\202@N\177\377\1\77M\177\377\207@N\177\377\202@M\177\377" \ ++ "\202@N\177\377\5\77N~\377\77O~\377@O\177\377@N\177\377@O\177\377\226" \ ++ "AO\200\377\216@N\200\377\222AO\200\377\1@O\177\377\202AO\200\377\202" \ ++ "@O\177\377\1@N\177\377\202\77O~\377\1\77N~\377\202@N\177\377\1@M\177" \ ++ "\377\212@N\177\377\202\77M\177\377\1>L\177\377\203\77M\177\377\10\77" \ ++ "M~\377>L~\377\77M}\377\77M~\3779Hz\377!2k\377\27(c\377\30)d\377\214\31" \ ++ "*e\377\15\30*d\377\30)d\377\35.h\3776Ex\377=K}\377s\3778Fz" \ ++ "\3778Ex\3776Fy\377\2027Fy\377\17""7Ey\3777Fy\3777Ey\3776Dy\3775Ey\377" \ ++ "6Ex\3776Ey\3776Ex\3776Dx\3776Ex\3775Dx\3776Cx\3775Dx\377\37""0j\377\30" \ ++ ")d\377\217\31*e\377\14\30)d\377\35.g\3772Bu\3771Av\3772Av\3772@v\377" \ ++ "2Av\3772Au\3772Av\3772Au\3771@u\3770\77u\377\2041@u\377\2-L\177\377\202\77M\177\377\212@N\177\377" \ ++ "\202@M\177\377\202@N\177\377\4\77N~\377\77O~\377@O\177\377@N\177\377" \ ++ "\202@O\177\377\202AO\200\377\1@O\177\377\255AO\200\377\1@O\177\377\203" \ ++ "AO\200\377\3@O\177\377@N\177\377@O\177\377\202\77O~\377\202@N\177\377" \ ++ "\203@M\177\377\207@N\177\377\2\77M\177\377@N\177\377\202\77M\177\377" \ ++ "\202>L\177\377\12\77M\177\377\77M~\377\77M\177\377\77M~\377>L~\377\77" \ ++ "M~\377=K}\377(7n\377\32+f\377\30)d\377\216\31*e\377\10\27(d\377&7n\377" \ ++ ":H{\377=K}\377L}\377\77M~\377>L}\377\202\77M~\377\2\77M\177\377\77M~\377\202\77M\177" \ ++ "\377\1>L\177\377\202\77M\177\377\2@N\177\377\77M\177\377\211@N\177\377" \ ++ "\202@M\177\377\203@N\177\377\2\77N~\377\77O~\377\204@O\177\377\244AO" \ ++ "\200\377\1@O\177\377\204AO\200\377\202@O\177\377\2@N\177\377@O\177\377" \ ++ "\202\77O~\377\1\77N~\377\202@N\177\377\202@M\177\377\211@N\177\377\2" \ ++ "\77M\177\377@N\177\377\203\77M\177\377\3>L\177\377\77M\177\377\77M~\377" \ ++ "\202\77M\177\377\1>L~\377\202\77M~\377\4>L}\3776Ex\377\33,f\377\30)d" \ ++ "\377\215\31*e\377\202\30)d\377\11\31*e\377,M}\377\77M" \ ++ "~\377\202\77M\177\377\3\77M~\377\77M\177\377>L\177\377\202\77M\177\377" \ ++ "\214@N\177\377\203@M\177\377\202@N\177\377\1\77N~\377\203\77O~\377\1" \ ++ "@N\177\377\203@O\177\377\241AO\200\377\203@O\177\377\1@N\177\377\203" \ ++ "\77O~\377\1\77N~\377\202@N\177\377\203@M\177\377\214@N\177\377\1\77M" \ ++ "\177\377\203>L\177\377\1\77M~\377\202\77M\177\377\10\77M~\377>L~\377" \ ++ "\77M~\377@M~\3771Au\377#3k\377\27(d\377\30)d\377\216\31*e\377\4\30)d" \ ++ "\377\37/h\3774Cw\377>L~\377\202=K}\377\2L}\377\202\77M~\377\3\77M\177\377\77M~\377\77M\177\377\202>L\177\377" \ ++ "\3\77M\177\377>L\177\377\77M\177\377\214@N\177\377\203@M\177\377\202" \ ++ "@N\177\377\1@M\177\377\203\77O~\377\2@O\177\377@N\177\377\202@O\177\377" \ ++ "\2\77O~\377@O\177\377\212AO\200\377\3@O\177\377AO\200\377@O\177\377\212" \ ++ "AO\200\377\2@O\177\377\77O~\377\202@O\177\377\2@N\177\377@O\177\377\203" \ ++ "\77O~\377\1@M\177\377\203@N\177\377\203@M\177\377\211@N\177\377\5\77" \ ++ "M\177\377@N\177\377\77M\177\377>L\177\377\77M\177\377\202>L\177\377\5" \ ++ "\77M\177\377\77M~\377\77M\177\377\77M~\377>L~\377\202\77M~\377\3""5C" \ ++ "w\377\34-g\377\31*e\377\202\30)d\377\216\31*e\377\11\30)d\377\"3k\377" \ ++ "L\177\377\202\77" \ ++ "M\177\377\202@N\177\377\1\77M\177\377\214@N\177\377\204@M\177\377\204" \ ++ "@N\177\377\1\77N~\377\211\77O~\377\204@O\177\377\212\77O~\377\1\77N~" \ ++ "\377\205@N\177\377\203@M\177\377\214@N\177\377\1\77M\177\377\202@N\177" \ ++ "\377\203\77M\177\377\1>L\177\377\202\77M\177\377\2\77M~\377\77M\177\377" \ ++ "\202\77M~\377\7\77M}\377@N~\377=K|\3771@u\377\40""1j\377\26(c\377\30" \ ++ ")d\377\217\31*e\377\6\30)d\377\33+f\377-M~\377=K}\377=J|\377\202" \ ++ "s\377,=r\377-<" \ ++ "r\377-;r\377-L~\377\202\77M~\377\2\77M\177\377\77M~\377\202" \ ++ "\77M\177\377\1>L\177\377\203\77M\177\377\203@N\177\377\1\77M\177\377" \ ++ "\215@N\177\377\205@M\177\377\211@N\177\377\205\77N~\377\211@N\177\377" \ ++ "\206@M\177\377\215@N\177\377\1\77M\177\377\202@N\177\377\203\77M\177" \ ++ "\377\202>L\177\377\2\77M\177\377\77M~\377\202\77M\177\377\2\77M~\377" \ ++ ">L~\377\202\77M~\377\4.=s\377\34,g\377\31*e\377\30)d\377\220\31*e\377" \ ++ "\6\27(d\377%4m\377:Hz\377=K}\377=J|\377=K}\377\202L}\377\202" \ ++ "\77M~\377\202\77M\177\377\2\77M~\377\77M\177\377\203>L\177\377\203\77" \ ++ "M\177\377\271@N\177\377\203\77M\177\377\203>L\177\377\204\77M\177\377" \ ++ "\3\77M~\377>L~\377\77M}\377\202\77M~\377\4;I{\3771@u\377\34-g\377\27" \ ++ "(c\377\220\31*e\377\202\30)d\377\5\35.h\3770\77t\377>L}\377L\177\377\204\77M\177\377\263@N\177\377" \ ++ "\204\77M\177\377\202>L\177\377\205\77M\177\377\202\77M~\377\6\77M}\377" \ ++ "@N~\377@N\177\3773Bv\377#3l\377\34-g\377\202\30)d\377\220\31*e\377\4" \ ++ "\30)d\377\27(d\377,s\377" \ ++ "\32+e\377\30)d\377\222\31*e\377\4\30)d\377\32+f\377,L}\377\77M~\377\77M}\377>L}\377\202\77M~\377\206\77M\177\377\203" \ ++ ">L\177\377\204\77M\177\377\204@N\177\377\1\77M\177\377\235@N\177\377" \ ++ "\1\77M\177\377\204@N\177\377\204\77M\177\377\203>L\177\377\206\77M\177" \ ++ "\377\203\77M~\377\10\77M}\377\77M~\377=K}\377;I{\377,L~\377@N\177" \ ++ "\377\77M~\377>L}\377\202\77M~\377\203\77M\177\377\1\77M~\377\203\77M" \ ++ "\177\377\203>L\177\377\205\77M\177\377\206@N\177\377\1\77M\177\377\221" \ ++ "@N\177\377\1\77M\177\377\206@N\177\377\205\77M\177\377\203>L\177\377" \ ++ "\203\77M\177\377\1\77M~\377\202\77M\177\377\202\77M~\377\12>L~\377>L" \ ++ "}\377\77M~\377@N\177\377:Hz\377,;r\377!1j\377\31*e\377\27(d\377\30)d" \ ++ "\377\222\31*e\377\3\27(d\377\36.h\3771Au\377\202=K}\377\2t\3771Bv\377\2052Av\377\4""2Au\3771@t\3771@u\377" \ ++ "0\77u\377\2021@u\377\5""0\77t\3771@u\377,L}\377\1>L~\377\203\77M}\377\1\77M\177\377\202\77M~\377\210\77M" \ ++ "\177\377\207>L\177\377\1@N\177\377\222\77M\177\377\206>L\177\377\211" \ ++ "\77M\177\377\202\77M~\377\1>M\177\377\203\77M}\377\202>L}\377\3>L~\377" \ ++ "4Cw\377!1j\377\202\30)d\377\223\31*e\377\7\30)d\377\31*e\377\30)d\377" \ ++ "'7o\377s\377\32*e\377\220\31*e\377\6\30" \ ++ ")d\377\27(d\377*:q\3773Bv\3771Bu\3772@v\377\2022Av\377\5""2Au\3771@u" \ ++ "\3772At\3771@u\3770\77u\377\2051@u\377\2\32+f\377\30)d\377\223\31*e\377" \ ++ "\5\32*e\377)9p\377,L}\377\203\77M~\377\214\77M\177\377\223>L\177\377\206\77M\177" \ ++ "\377\1\77M~\377\204\77M\177\377\204\77M~\377\14>L}\377\77M~\377@N~\377" \ ++ "\77N~\3779Hz\3772Au\377*:p\377\"2k\377\31*e\377\27(c\377\30)d\377\30" \ ++ "*d\377\222\31*e\377\6\30)d\377\27(d\377\32+f\377'7n\3776Ex\377\77L~\377" \ ++ "\202=K}\377\202L}\377\205\77M~\377\205\77" \ ++ "M\177\377\1\77M~\377\233\77M\177\377\204\77M~\377\2>M~\377\77L}\377\202" \ ++ "\77M~\377\6@N~\3776Ex\377(8o\377\34-g\377\32+e\377\31*e\377\204\30)d" \ ++ "\377\223\31*e\377\202\30)d\377\6)8p\377;I{\377L~" \ ++ "\3772@u\377!2j\377\31*e\377\202\30)d\377\226\31*e\377\14\30)d\377\27" \ ++ "(c\377\26'c\377\35.h\377(8o\3771@u\3775Dw\3778Fy\377;I{\377>L}\377@N" \ ++ "~\377@M~\377\202\77M~\377\3\77M}\377>L}\377\77M}\377\227\77M~\377\2>" \ ++ "L~\377\77M}\377\203\77M~\377\12@N~\377\77M~\377=J|\3779Hz\3776Ex\377" \ ++ "3Cw\377.=s\377#3l\377\31*e\377\26'c\377\202\30)d\377\226\31*e\377\6\30" \ ++ ")d\377\27(d\377\34-g\377'7o\377:H{\377>L~\377\203=K}\377\203M~\377AO\177\377@N\177\377\202@N~\377\1@M~\377\205\77M~" \ ++ "\377\205\77M}\377\2>M}\377\77M}\377\205\77M~\377\203@N~\377\12@N\177" \ ++ "\377AN\177\377;J{\3774Cw\377,s\377:H{\377" \ ++ "\202=K}\377\2s\3778Fz\3778Fy\377" \ ++ "\2067Fy\377\2""6Ey\3776Dy\377\2026Ey\377\11""6Ex\3776Ey\3776Ex\3776E" \ ++ "w\3776Ex\3775Dx\3775Cw\3776Ex\377\40""1j\377\202\30)d\377\220\31*e\377" \ ++ "\14\30)e\377+;q\3773Bv\3771Bu\3772Av\3772@v\3772Av\3772Au\3772Av\377" \ ++ "1@u\3772At\3770\77u\377\2051@u\377\2!1k\377\30)d\377\224\31*e\377\6\35" \ ++ ".h\377,L}\3776Ex\377!1j\377\32+f\377\203\30)d\377" \ ++ "\233\31*e\377\202\30)d\377\40\27(d\377\27(c\377\26'c\377\32,f\377\"2" \ ++ "k\377%5m\377'8n\377*9p\377,t\3771@u\3773Cv\3776Ey\3778Fy\377" \ ++ "9Gz\3779Hz\377:Hz\3779Gz\3778Gy\3777Fy\3775Dx\3772Bu\3771\77t\377.=s" \ ++ "\377+;q\377)8o\377&7n\377$4l\377\37""0i\377\30)d\377\26'c\377\27(c\377" \ ++ "\203\30)d\377\233\31*e\377\203\30)d\377\2\34-g\377*:q\377\202=K}\377" \ ++ "\1L~\3775Dw\377#3l\377\32+e\377\31*e\377\202\30)d\377\320" \ ++ "\31*e\377\1\30*d\377\202\30)d\377\4\31*e\377\34,g\377*:p\377s\377\222\31" \ ++ "*e\377\5\30)d\377\32+f\3772Au\3778Fy\3778Fx\377\2047Fy\377\5""7Ey\377" \ ++ "6Fy\3777Ey\3776Dy\3775Ey\377\2036Ey\377\10""6Ew\3776Dx\3776Ex\3775Dx" \ ++ "\3776Cw\3776Dx\377)8p\377\27)d\377\221\31*e\377\6\30)d\377\33,g\3771" \ ++ "Au\3772Au\3771Bv\3772@v\377\2032Av\377\4""2Au\3772At\3772Au\3770\77u" \ ++ "\377\2051@u\377\2\36.h\377\30)d\377\223\31*e\377\6\30)d\377\34-g\377" \ ++ "-=s\377,L~\3779Hz\377/>s\377$5l\377\31*e\377\27(c\377\30)d\377\315\31" \ ++ "*e\377\12\30)d\377\27(c\377\36.h\377)9p\3774Bv\377=K}\377>L}\377=K}\377" \ ++ "=J|\377=K}\377\202K}\377>M~\3774Cw\377(8o\377\"2k\377\34-g\377\202" \ ++ "\27(d\377\2\30)d\377\30)e\377\275\31*e\377\202\30)d\377\7\27(c\377\31" \ ++ "*e\377\37/i\377$4l\377-L~\377\204=K}\377\202t\377\33,f\377\30)e\377" \ ++ "\30)d\377\221\31*e\377\7\27(d\377)9p\3777Fy\3778Fy\3777Ex\3777Fy\377" \ ++ "6Fy\377\2027Fy\377\2027Ey\377\17""6Dy\3776Ey\3775Ey\3776Ey\3776Ex\377" \ ++ "6Ey\3776Ex\3776Ew\3776Ex\3776Dx\3776Cw\3776Dx\3770\77t\377\31*d\377\30" \ ++ ")d\377\221\31*e\377\6\30)d\377\37/i\3773Av\3771Au\3772Av\3772@v\377\202" \ ++ "2Av\377\5""2Au\3772Av\3772At\3771@u\3770\77u\377\2031@u\377\2020\77t" \ ++ "\377\2!1j\377\30)d\377\225\31*e\377\6'7n\377-=s\377,=q\377-K}\377\77L~\377;I{\3770\77t\377$5m\377\37/i\377" \ ++ "\33,f\377\205\30)d\377\252\31*e\377\205\30)d\377\7\31*e\377\35-g\377" \ ++ "\40""1j\377)9p\3775Cx\377>L}\377>L~\377\204=K}\377\203t\3779Gz\3778Ex\3777Fy\3776Fy\377\2047Fy\377\20""7Ey\3777Dy\3776Ey" \ ++ "\3775Ey\3776Ex\3776Ey\3776Ex\3776Ew\3776Dx\3776Ex\3775Dx\3776Cw\3775" \ ++ "Dx\377.=s\377\30)d\377\30)e\377\221\31*e\377\6\30)d\377\35.g\3773Bv\377" \ ++ "2Bu\3772Av\3772@v\377\2022Av\377\5""2Au\3772Av\3772Au\3771@u\3770\77" \ ++ "u\377\2031@u\377\4""0\77t\3771@u\377(8o\377\30)d\377\224\31*e\377\16" \ ++ "\30)d\377\36.h\377-=r\377-=q\377-K}\377>L}\377>L~\377" \ ++ "9Fz\3771@u\377)9p\377!2j\377\34-g\377\33,f\377\32+f\377\31*e\377\30)" \ ++ "e\377\231\30)d\377\13\31*e\377\32+e\377\33,f\377\34,g\377\36/h\377%5" \ ++ "m\377-L~\377>L}\377\202=K}\377\1L}\377>L~\377" \ ++ "=K}\377:H{\3777Ey\3773Bv\3770\77t\377.>s\377,t\3771@u\3775Cw\3778Fy\377;J|\377\202>L}\377\203" \ ++ "=K}\377\1t\3777Ez\3778Fx\3778Ex\377\2026Fy\377\2047Fy\377\2027Ey\377\3""6Dy\377" \ ++ "6Ey\3775Ey\377\2036Ex\377\1""6Ew\377\2026Dx\377\4""5Cx\3776Cx\3776Ex" \ ++ "\377\"3k\377\202\30)d\377\222\31*e\377\6\30*e\377&6n\3772Au\3771Bv\377" \ ++ "1Au\3772@v\377\2022Av\377\4""2Au\3772Av\3771@t\3772At\377\2020\77u\377" \ ++ "\2021@u\377\5""0\77t\3771@u\377-=r\377\30)e\377\30)d\377\225\31*e\377" \ ++ "\7#3l\377-s\377$4l\377" \ ++ "\30)d\377\27(d\377\30)d\377\230\31*e\377\7\30)d\377\31*e\377$4l\3774" \ ++ "Cw\3779Gz\3778Ex\3777Fy\377\2026Fy\377\2057Fy\377\5""7Ey\3777Dy\3776" \ ++ "Dy\3776Ey\3775Ey\377\2026Ey\377\1""6Ex\377\2026Ew\377\1""6Ex\377\202" \ ++ "6Dx\377\5""6Cw\3776Dx\377,s\377" \ ++ "6Dy\377\2028Fy\377\2027Fy\377\1""6Fy\377\2057Fy\377\2027Ey\377\2""7D" \ ++ "y\3776Ey\377\2025Ey\377\2026Ey\377\3""6Ex\3776Ew\3776Dx\377\2026Ex\377" \ ++ "\6""5Dx\3776Cw\3776Ex\377+:q\377\33,f\377\30)d\377\226\31*e\377\3*9p" \ ++ "\3773Bv\3772Bu\377\2022Av\377\1""2@v\377\2032Av\377\4""2Au\3772At\377" \ ++ "1@u\3770\77u\377\2051@u\377\3,;q\377\32+e\377\30)d\377\225\31*e\377\12" \ ++ "\30)d\377\32+f\377+;q\377-=r\377,=r\377-t\377\36/h\377\27(d\377\30)d\377\224\31*e\377\7\30)d\377\34-g\377." \ ++ ">s\3772Bv\3771Bu\3772Av\3772@v\377\2042Av\377\4""1@u\3771@t\3771@u\377" \ ++ "0\77u\377\2051@u\377\3.=s\377\34,g\377\30)d\377\225\31*e\377\202\30)" \ ++ "d\377\3&6m\377-=s\377,s\3778Fz\3778Fy\3777Fx\3778Fy\377\2026Fy" \ ++ "\377\2037Fy\377\1""7Ey\377\2027Fy\377\7""6Ey\3777Dy\3777Ey\3776Ey\377" \ ++ "5Ey\3776Ex\3776Ey\377\2026Ex\377\1""6Ew\377\2026Ex\377\2026Dx\377\1""6" \ ++ "Cw\377\2025Dx\377\1*:p\377\202\30)d\377\224\31*e\377\202\30)d\377\2\34" \ ++ "-g\3772@u\377\2022Bv\377\2032Av\377\1""2Au\377\2022Av\377\3""2Au\377" \ ++ "2At\3770\77u\377\2041@u\377\4""0\77t\3771@u\377.>s\377\33,f\377\227\31" \ ++ "*e\377\6\30)e\377$4l\377-=s\377,s\377,t\377\37/i\377\27)d\377\226\31*e\377\6\30)d\377\32+e\377(8n\3773" \ ++ "Cv\3771Au\3771Av\377\2022@v\377\2032Av\377\4""2Au\3772At\3771@u\3770" \ ++ "\77u\377\2041@u\377\5""1@t\3771@u\377-t\377\37/i\377\27(d\377\202\30)d\377" \ ++ "\351\31*e\377\203\30)d\377\3&6n\3773Av\3776Dx\377\2028Fy\377\1""8Ex\377" \ ++ "\2027Fy\377\2026Fy\377\2037Fy\377\1""7Ey\377\2027Fy\377\4""6Ey\3777D" \ ++ "y\3776Dy\3776Ey\377\2025Ey\377\2""6Ex\3776Ey\377\2026Ex\377\6""6Ew\377" \ ++ "6Dx\3776Ex\3776Dx\3775Dx\3776Cw\377\2025Dx\377\3#4l\377\31*e\377\30)" \ ++ "d\377\226\31*e\377\7\30)d\377\32+f\377.>s\3772Bv\3771Bu\3772Av\3772@" \ ++ "v\377\2032Av\377\2022Au\377\4""1@u\3772Au\3771@u\3770\77u\377\2031@u" \ ++ "\377\5""0\77t\3771@u\377*:q\377\32+e\377\30)d\377\226\31*e\377\7\30)" \ ++ "d\377\31*e\377+;q\377-=r\377-=q\377-t\377" \ ++ "\40""1i\377\31*e\377\30)d\377\226\31*e\377\202\30)d\377\6&6n\3772Au\377" \ ++ "2Bv\3771Av\3772Av\3772@v\377\2022Av\377\4""2Au\3772Av\3771@u\3772Au\377" \ ++ "\2061@u\377\5""0\77t\3771@u\377(8o\377\31*e\377\30)d\377\227\31*e\377" \ ++ "\6\30)d\377'8o\377-=s\377,=q\377-s\377(7o\377" \ ++ "\"2k\377\35.h\377\31*e\377\27(d\377\202\30)d\377\276\31*e\377\203\30" \ ++ ")d\377\6\27)c\377\33,f\377\37""0i\377$4l\377+:q\3773Au\377\2029Gz\377" \ ++ "\3""8Fy\3778Ex\3777Fx\377\2027Fy\377\2026Fy\377\2057Fy\377\1""7Ey\377" \ ++ "\2027Fy\377\4""7Ey\3776Ey\3777Ey\3776Dy\377\2026Ey\377\4""5Ey\3776Ey" \ ++ "\3776Ex\3776Ey\377\2026Ex\377\2026Ew\377\1""6Dx\377\2026Ex\377\11""6" \ ++ "Dx\3775Dx\3776Cx\3776Dx\3775Dx\377-s\377\37/i\377\27)d\377\231\31*e\377" \ ++ "\5$5m\377-=s\377,s\377\34,f\377\30)d\377\230\31*e\377\7\30)d\377#3l\377-=s\377,s\377,t\3772@v\3774Bw\3776Dx\377\205" \ ++ "8Fy\377\2""8Fx\3777Fx\377\2037Fy\377\2026Fy\377\2127Fy\377\2""7Ey\377" \ ++ "6Ey\377\2027Dy\377\2026Ey\377\2035Ey\377\1""6Ex\377\2026Ey\377\2026E" \ ++ "x\377\2026Ew\377\1""6Dx\377\2026Ex\377\2026Dx\377\6""6Cw\3775Dx\3776" \ ++ "Ey\377-s\3773Bv\3772Bv\377\2022Av\377\1""2@v\377\2022Av\377\4""2" \ ++ "Au\3772Av\3772Au\3771@t\377\2021@u\377\1""0\77u\377\2041@u\377\5""1\77" \ ++ "t\3772Av\377&6n\377\31*e\377\30)d\377\230\31*e\377\13\30)d\377\"3k\377" \ ++ "-=r\377," \ ++ "s\377+;q\377(8o\377%4m\377!2k\377\36/h\377\34-g\377\205\33,f\377\204" \ ++ "\32+f\377\1\32+e\377\203\32+f\377\1\33+f\377\204\33,f\377\11\34,g\377" \ ++ "\35-g\377\37""0i\377#3l\377'6n\377)9p\377-s\377" \ ++ ",s\3773Bv\3771Bu\3771Av\3772Av\377" \ ++ "2@v\377\2042Av\377\2022Au\377\2""2At\3771@u\377\2020\77u\377\2061@u\377" \ ++ "\3%5m\377\31*e\377\30)d\377\231\31*e\377\13\30*d\377%6m\377-=s\377,<" \ ++ "r\377-=q\377-s\377" \ ++ "4Cw\377\2035Dx\377\2026Cx\377\2""5Dx\3776Dx\377\2026Ex\377\2""6Dx\377" \ ++ "6Ex\377\2036Ew\377\2036Ex\377\2036Ey\377\2""6Ex\3776Ey\377\2045Ey\377" \ ++ "\2036Ey\377\1""6Dy\377\2037Dy\377\2""7Ey\3776Ey\377\2047Ey\377\2467F" \ ++ "y\377\2037Ey\377\2""6Ey\3777Ey\377\2047Dy\377\1""6Dy\377\2036Ey\377\204" \ ++ "5Ey\377\2""6Ey\3776Ex\377\2036Ey\377\2026Ex\377\2036Ew\377\2046Ex\377" \ ++ "\2036Dx\377\2026Cx\377\2026Dx\377\4""1Av\377,t\377$4l\377\30)d\377\27" \ ++ "(d\377\30)d\377\237\31*e\377\10\30)d\377\31*e\377\34-g\377,;r\3773Bv" \ ++ "\3771Au\3771Av\3772Av\377\2022@v\377\2022Av\377\7""2Au\3772Av\3771@u" \ ++ "\3772Au\3772At\3771@u\3770\77u\377\2041@u\377\6""0\77t\3771@t\3771@u" \ ++ "\377.=r\377\36.h\377\30)d\377\232\31*e\377\14\30)d\377\33+f\377*:p\377" \ ++ "-=s\377,=r\377-s\3773Bw\3774Cw\3774Dx\3776Dx\3775Dx\3775Cw\377\2026Cx\377\2""6Dx\377" \ ++ "5Dx\377\2026Dx\377\2046Ex\377\1""6Dx\377\2026Ex\377\2046Ew\377\2066E" \ ++ "x\377\2106Ey\377\1""6Ex\377\2336Ey\377\2066Ex\377\2046Ew\377\2026Ex\377" \ ++ "\1""6Dx\377\2036Ex\377\2026Dx\377\4""5Dx\3776Dx\3776Cx\3776Cw\377\202" \ ++ "5Dx\377\1""6Dx\377\2024Cw\377\4""2Bv\377)9p\377\36.i\377\27(d\377\202" \ ++ "\30)d\377\241\31*e\377\7\30)d\377\31*e\377\32+e\377$5l\3773Bv\3772Bv" \ ++ "\3771Bu\377\2062Av\377\2022Au\377\5""1@v\3772At\3771@t\3771@u\3770\77" \ ++ "u\377\2071@u\377\3""0\77t\377!2k\377\30)d\377\232\31*e\377\13\31*d\377" \ ++ "\30)d\377\36/h\377-=r\377,s\3772Av\3775Dx\3776Ex\377\2026Dx\377" \ ++ "\2""5Dx\3775Cw\377\2046Cx\377\1""5Dx\377\2056Dx\377\2416Ex\377\2056D" \ ++ "x\377\2""5Dx\3776Dx\377\2036Cx\377\2""6Cw\3775Dx\377\2026Dx\377\7""6" \ ++ "Ex\3774Cw\3770@u\377-=s\377)9p\377#3k\377\34-g\377\202\27(d\377\202\30" \ ++ ")d\377\245\31*e\377\202\30)d\377\7\32+f\377#3l\377/\77t\3773Bv\3771B" \ ++ "u\3771Av\3772Av\377\2022@v\377\2032Av\377\6""2Au\3772Av\3772Au\3772A" \ ++ "t\3771@t\3771@u\377\2020\77u\377\2071@u\377\3)9o\377\33,f\377\30)d\377" \ ++ "\233\31*e\377\6\30)d\377\31*e\377%5m\377-=s\377,t\377\36/h\377\31" \ ++ "*e\377\30)d\377\233\31*e\377\7\30)e\377\32+f\377*:p\377-=r\377-=q\377" \ ++ "-t\3770@u\3772Av\3773Bw\3775Dw\3775Dx\377\2066Dx\377\203" \ ++ "5Dx\377\2025Cx\377\2136Cx\377\2""5Cw\3775Cx\377\2035Dx\377\2066Dx\377" \ ++ "\15""5Dx\3774Cw\3772Bv\3771@u\3770\77t\377.>t\377,;q\377'7n\377#3l\377" \ ++ "\36/h\377\31)d\377\27(c\377\27(d\377\202\30)d\377\252\31*e\377\1\31*" \ ++ "d\377\202\30)d\377\10\34-g\377%5m\3771Au\3773Bv\3771Bu\3771Av\3772Av" \ ++ "\3772@v\377\2042Av\377\2""2Au\3772Av\377\2022Au\377\1""2At\377\2021@" \ ++ "u\377\1""0\77u\377\2051@u\377\6""0\77t\3771@u\3770\77t\377)8o\377\31" \ ++ "*e\377\30)d\377\233\31*e\377\202\30)d\377\6\35.g\377+;q\377-=s\377-=" \ ++ "q\377-s\377,;q\377)8o\377&6n\377#4l\377!1j\377" \ ++ "\37/i\377\36.h\377\34-g\377\33,f\377\32*e\377\206\30)d\377\255\31*e\377" \ ++ "\5\30)d\377\27(d\377\36/h\377+;q\3771@u\377\2022Bv\377\2""1Bv\3772Av" \ ++ "\377\2022@v\377\2032Av\377\1""2Au\377\2022Av\377\4""1@u\3772Au\3771@" \ ++ "t\3771@u\377\2020\77u\377\2061@u\377\3""2@u\377-=s\377\36/h\377\202\30" \ ++ ")d\377\234\31*e\377\5\30)d\377\"2k\377,s\377$4l\377\27(d\377\30)d\377\234\31*e\377\4\30)d\377\31*e\377%" \ ++ "5l\377-=s\377\202-=q\377\2-t\377%5m\377\35.g\377\33+f\377\31*e\377\203\30" \ ++ ")d\377\341\31*e\377\203\30)d\377\10\31*e\377\33,f\377\40""0i\377(9o\377" \ ++ "2Av\3773Bv\3772Bv\3771Bu\377\2022Av\377\2022@v\377\2052Av\377\1""2Au" \ ++ "\377\2022Av\377\4""2Au\3771@u\3772At\3771@t\377\2021@u\377\1""0\77u\377" \ ++ "\2061@u\377\1""0\77t\377\2021@u\377\4/>t\377(8o\377\32+e\377\30)d\377" \ ++ "\237\31*e\377\7\30)e\377\30)d\377\34,f\377*:q\377-=s\377-s\377\2032Au\377\2032Bv\377\4""1Bu\3771Av\3772@v\3772" \ ++ "Av\377\2032@v\377\2102Av\377\1""2Au\377\2032At\377\1""1@t\377\2021@u" \ ++ "\377\2020\77u\377\2111@u\377\2.=s\377\37/i\377\202\31*e\377\1\30)d\377" \ ++ "\241\31*e\377\7\30)d\377\32+f\377)9o\377,t\377)9p\377$4l\377" \ ++ "\40""0j\377\33,f\377\27(c\377\27(d\377\204\30)d\377\246\31*e\377\204" \ ++ "\30)d\377\13\27)d\377\27(d\377\31*d\377\35.h\377\"2k\377&6n\377,t\377+:q\377!1j\377\27)d\377\202\30)d\377\242\31" \ ++ "*e\377\202\30)d\377\5\32+f\377\"2k\377-=s\377-=r\377,=q\377\202-s\377" \ ++ ".>s\377-=r\377,s\377/>s\3770\77t\3771@t" \ ++ "\3771@u\3771Au\377\2062Bv\377\2031Bv\377\1""1Av\377\2042Av\377\2042@" \ ++ "v\377\2072Av\377\1""2Au\377\2032Av\377\2022Au\377\1""1@u\377\2022At\377" \ ++ "\1""1@t\377\2021@u\377\2020\77u\377\2111@u\377\6""0\77t\3771@u\3772@" \ ++ "u\377.=s\377#3k\377\34,g\377\203\30)d\377\243\31*e\377\202\30)d\377\6" \ ++ "\37""0i\377*:q\377-=s\377-=r\377-=q\377-t\377" \ ++ "+:q\377\40""0i\377\202\30)d\377\245\31*e\377\202\30)d\377\6\33,f\377" \ ++ "&6n\377.>s\377-=r\377-s\377-=r\377-=q\377-t\377%5m\377" \ ++ "\34-g\377\202\31*e\377\202\30)d\377\251\31*e\377\7\30)d\377\32+f\377" \ ++ "(7o\377,s\377\2041@u\377\1""0\77t\377\216" \ ++ "1@u\377\2050\77u\377\2051@u\377\1""1@t\377\2072At\377\2312Au\377\2""1" \ ++ "@u\3772Au\377\2072At\377\1""1@t\377\2061@u\377\2040\77u\377\2161@u\377" \ ++ "\1""0\77t\377\2041@u\377\5-=s\377*:p\377$4l\377\34-g\377\27(c\377\202" \ ++ "\30)d\377\252\31*e\377\202\30)d\377\13\33,f\377\"3l\377,t\377.=s\377+:q\377$4m\377\35" \ ++ ".g\377\27)d\377\203\30)d\377\255\31*e\377\202\30)d\377\7\32+f\377!1k" \ ++ "\377-=r\377-=s\377,s\377*9p\377" \ ++ "%5m\377\37""0i\377\35-g\377\32+e\377\204\30)d\377\256\31*e\377\202\30" \ ++ ")d\377\10\31*d\377$4l\377*:q\377-=s\377-=r\377-=q\377-s\377+;q\377%5m\377\36/h\377" \ ++ "\31*e\377\204\30)d\377\262\31*e\377\11\30)d\377\31)e\377\31*e\377!1j" \ ++ "\377-s\377,;q\377)9p\377'6n\377$4l\377\"2k\377\36/h\377\33,g" \ ++ "\377\30)d\377\27(d\377\203\30)d\377\264\31*e\377\13\30)d\377\27)d\377" \ ++ "\33,f\377#3k\377*:q\377-=s\377,=r\377-=q\377-t\377\2151@u\377\2""1@t\3770" \ ++ "\77u\377\2051@u\377\1""1\77t\377\2151@u\377\7""1\77t\377.=s\377+;q\377" \ ++ "(8o\377$5l\377\40""1i\377\34-g\377\205\31*e\377\1\30*d\377\204\30)d\377" \ ++ "\266\31*e\377\20\30)e\377\30)d\377\32+f\377&6m\377-=s\377,s\377\202-=r\377\2-=q\377-s\377-=s\377,s\377-=s\377-=r" \ ++ "\377,=q\377-=q\377\203-r\377+;q\377'7o\377#4l\377\40""1" \ ++ "j\377\36.h\377\34-g\377\33+f\377\31*e\377\206\30)d\377\261\31*e\377\206" \ ++ "\30)d\377\12\32*e\377\33,f\377\35-g\377\37/i\377\"2k\377%5m\377)9p\377" \ ++ ",s\377-=s\377\202-=r\377\1,=r\377\202-=q\377\204-s\377\15,s\377\203" \ ++ "-=s\377\2-=r\377,=r\377\204-=q\377\204-width, fb->height, 0xec, 0xec, 0xe1); +++ /* Clear the background with #192a65 */ +++ psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0x19, 0x2a, 0x65); ++ ++ /* Draw the OH logo */ ++ psplash_fb_draw_image (fb, ++- (fb->width - HAND_IMG_WIDTH)/2, ++- (fb->height - HAND_IMG_HEIGHT)/2, ++- HAND_IMG_WIDTH, ++- HAND_IMG_HEIGHT, ++- HAND_IMG_BYTES_PER_PIXEL, ++- HAND_IMG_RLE_PIXEL_DATA); +++ 0, +++ 0, +++ OWRT_IMG_WIDTH, +++ OWRT_IMG_HEIGHT, +++ OWRT_IMG_BYTES_PER_PIXEL, +++ OWRT_IMG_RLE_PIXEL_DATA); ++ ++ /* Draw progress bar border */ ++ psplash_fb_draw_image (fb, +diff --git a/feeds/packages/utils/psplash/patches/.svn/text-base/001-hide-msgfield-and-progressbar.patch.svn-base b/feeds/packages/utils/psplash/patches/.svn/text-base/001-hide-msgfield-and-progressbar.patch.svn-base +new file mode 100644 +index 0000000..e62213e +--- /dev/null ++++ b/feeds/packages/utils/psplash/patches/.svn/text-base/001-hide-msgfield-and-progressbar.patch.svn-base +@@ -0,0 +1,25 @@ ++diff -ruN psplash.x/psplash.c psplash/psplash.c ++--- psplash.x/psplash.c 2009-05-12 10:11:25.000000000 +0200 +++++ psplash/psplash.c 2009-05-12 10:24:09.000000000 +0200 ++@@ -276,17 +276,17 @@ ++ OWRT_IMG_RLE_PIXEL_DATA); ++ ++ /* Draw progress bar border */ ++- psplash_fb_draw_image (fb, +++ /* psplash_fb_draw_image (fb, ++ (fb->width - BAR_IMG_WIDTH)/2, ++ fb->height - (fb->height/6), ++ BAR_IMG_WIDTH, ++ BAR_IMG_HEIGHT, ++ BAR_IMG_BYTES_PER_PIXEL, ++- BAR_IMG_RLE_PIXEL_DATA); +++ BAR_IMG_RLE_PIXEL_DATA); */ ++ ++- psplash_draw_progress (fb, 0); +++ // psplash_draw_progress (fb, 0); ++ ++- psplash_draw_msg (fb, MSG); +++ // psplash_draw_msg (fb, MSG); ++ ++ psplash_main (fb, pipe_fd, 0); ++ +diff --git a/feeds/packages/utils/psplash/patches/000-adjust-for-openwrt.patch b/feeds/packages/utils/psplash/patches/000-adjust-for-openwrt.patch +new file mode 100644 +index 0000000..38f3c91 +--- /dev/null ++++ b/feeds/packages/utils/psplash/patches/000-adjust-for-openwrt.patch +@@ -0,0 +1,42 @@ ++--- psplash.orig/psplash.c 2009-05-11 15:45:57.000000000 +0200 +++++ psplash/psplash.c 2009-05-13 00:21:20.000000000 +0200 ++@@ -19,11 +19,11 @@ ++ */ ++ ++ #include "psplash.h" ++-#include "psplash-hand-img.h" +++#include "psplash-owrt-img.h" ++ #include "psplash-bar-img.h" ++ #include "radeon-font.h" ++ ++-#define MSG "" +++#define MSG "Loading - please wait..." ++ ++ void ++ psplash_exit (int signum) ++@@ -263,17 +263,17 @@ ++ goto fb_fail; ++ } ++ ++- /* Clear the background with #ecece1 */ ++- psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1); +++ /* Clear the background with #192a65 */ +++ psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0x19, 0x2a, 0x65); ++ ++ /* Draw the OH logo */ ++ psplash_fb_draw_image (fb, ++- (fb->width - HAND_IMG_WIDTH)/2, ++- (fb->height - HAND_IMG_HEIGHT)/2, ++- HAND_IMG_WIDTH, ++- HAND_IMG_HEIGHT, ++- HAND_IMG_BYTES_PER_PIXEL, ++- HAND_IMG_RLE_PIXEL_DATA); +++ 0, +++ 0, +++ OWRT_IMG_WIDTH, +++ OWRT_IMG_HEIGHT, +++ OWRT_IMG_BYTES_PER_PIXEL, +++ OWRT_IMG_RLE_PIXEL_DATA); ++ ++ /* Draw progress bar border */ ++ psplash_fb_draw_image (fb, +diff --git a/feeds/packages/utils/psplash/patches/001-hide-msgfield-and-progressbar.patch b/feeds/packages/utils/psplash/patches/001-hide-msgfield-and-progressbar.patch +new file mode 100644 +index 0000000..e62213e +--- /dev/null ++++ b/feeds/packages/utils/psplash/patches/001-hide-msgfield-and-progressbar.patch +@@ -0,0 +1,25 @@ ++diff -ruN psplash.x/psplash.c psplash/psplash.c ++--- psplash.x/psplash.c 2009-05-12 10:11:25.000000000 +0200 +++++ psplash/psplash.c 2009-05-12 10:24:09.000000000 +0200 ++@@ -276,17 +276,17 @@ ++ OWRT_IMG_RLE_PIXEL_DATA); ++ ++ /* Draw progress bar border */ ++- psplash_fb_draw_image (fb, +++ /* psplash_fb_draw_image (fb, ++ (fb->width - BAR_IMG_WIDTH)/2, ++ fb->height - (fb->height/6), ++ BAR_IMG_WIDTH, ++ BAR_IMG_HEIGHT, ++ BAR_IMG_BYTES_PER_PIXEL, ++- BAR_IMG_RLE_PIXEL_DATA); +++ BAR_IMG_RLE_PIXEL_DATA); */ ++ ++- psplash_draw_progress (fb, 0); +++ // psplash_draw_progress (fb, 0); ++ ++- psplash_draw_msg (fb, MSG); +++ // psplash_draw_msg (fb, MSG); ++ ++ psplash_main (fb, pipe_fd, 0); ++ +diff --git a/feeds/packages/utils/pv/.svn/entries b/feeds/packages/utils/pv/.svn/entries +new file mode 100644 +index 0000000..c5123aa +--- /dev/null ++++ b/feeds/packages/utils/pv/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pv ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-02T08:28:42.351336Z ++24879 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c8b1cc2f1879bde3b657c9c54ce1175b ++2011-01-02T08:28:42.351336Z ++24879 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1173 ++ +diff --git a/feeds/packages/utils/pv/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pv/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..eecda86 +--- /dev/null ++++ b/feeds/packages/utils/pv/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# Copyright (C) 2008 David Cooper ++# 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:=pv ++PKG_VERSION:=1.2.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pipeviewer.googlecode.com/files ++PKG_MD5SUM:=67aedf6dbcd068d5feeaa76156153f4f ++ ++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/feeds/packages/utils/pv/Makefile b/feeds/packages/utils/pv/Makefile +new file mode 100644 +index 0000000..eecda86 +--- /dev/null ++++ b/feeds/packages/utils/pv/Makefile +@@ -0,0 +1,44 @@ ++# ++# Copyright (C) 2008 David Cooper ++# 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:=pv ++PKG_VERSION:=1.2.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pipeviewer.googlecode.com/files ++PKG_MD5SUM:=67aedf6dbcd068d5feeaa76156153f4f ++ ++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/feeds/packages/utils/pwcrypt/.svn/entries b/feeds/packages/utils/pwcrypt/.svn/entries +new file mode 100644 +index 0000000..73fd973 +--- /dev/null ++++ b/feeds/packages/utils/pwcrypt/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pwcrypt ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-06-21T21:57:27.040699Z ++21862 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++93b53a52142983852bb894adb30aab85 ++2010-06-21T21:57:27.040699Z ++21862 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++845 ++ +diff --git a/feeds/packages/utils/pwcrypt/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pwcrypt/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..75e33fc +--- /dev/null ++++ b/feeds/packages/utils/pwcrypt/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,36 @@ ++# ++# 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:=pwcrypt ++PKG_VERSION:=1.2.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xjack.org/pwcrypt/downloads ++PKG_MD5SUM:=381a60c8debe5b21c935b19684de ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pwcrypt ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A utility to create crypted passwords from plaintext ++ URL:=http://xjack.org/pwcrypt ++endef ++ ++define Package/pwcrypt/description ++ A wrapper for the unix crypt() function. Supports crypt and MD5 hashing ++endef ++ ++define Package/pwcrypt/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pwcrypt $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,pwcrypt)) +diff --git a/feeds/packages/utils/pwcrypt/Makefile b/feeds/packages/utils/pwcrypt/Makefile +new file mode 100644 +index 0000000..75e33fc +--- /dev/null ++++ b/feeds/packages/utils/pwcrypt/Makefile +@@ -0,0 +1,36 @@ ++# ++# 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:=pwcrypt ++PKG_VERSION:=1.2.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xjack.org/pwcrypt/downloads ++PKG_MD5SUM:=381a60c8debe5b21c935b19684de ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pwcrypt ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=A utility to create crypted passwords from plaintext ++ URL:=http://xjack.org/pwcrypt ++endef ++ ++define Package/pwcrypt/description ++ A wrapper for the unix crypt() function. Supports crypt and MD5 hashing ++endef ++ ++define Package/pwcrypt/install ++ $(INSTALL_DIR) $(1)/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pwcrypt $(1)/sbin/ ++endef ++ ++$(eval $(call BuildPackage,pwcrypt)) +diff --git a/feeds/packages/utils/pwgen/.svn/entries b/feeds/packages/utils/pwgen/.svn/entries +new file mode 100644 +index 0000000..c31867f +--- /dev/null ++++ b/feeds/packages/utils/pwgen/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/pwgen ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++dc050a963bb945e0fc1e916807b7ff27 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1115 ++ +diff --git a/feeds/packages/utils/pwgen/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/pwgen/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/utils/pwgen/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/pwgen/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/pwgen/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..84e40c6 +--- /dev/null ++++ b/feeds/packages/utils/pwgen/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=pwgen ++PKG_VERSION:=2.06 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=935aebcbe610fbc9de8125e7b7d71297 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pwgen ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Automatic Password generator ++ URL:=http://sourceforge.net/projects/pwgen/ ++endef ++ ++define Package/pwgen/description ++ pwgen generates random, meaningless but pronounceable passwords. ++ These passwords contain either only lowercase letters, or upper ++ and lower case mixed, or digits thrown in. ++ Uppercase letters and digits are placed in a way that eases ++ remembering their position when memorizing only the word. ++ ++ E.g. to generate a WPA preshared-key do: ++ pwgen -c -n -s 63 1 ++endef ++ ++# uses GNU configure ++ ++define Package/pwgen/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pwgen $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,pwgen)) +diff --git a/feeds/packages/utils/pwgen/Makefile b/feeds/packages/utils/pwgen/Makefile +new file mode 100644 +index 0000000..84e40c6 +--- /dev/null ++++ b/feeds/packages/utils/pwgen/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=pwgen ++PKG_VERSION:=2.06 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=935aebcbe610fbc9de8125e7b7d71297 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/pwgen ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Automatic Password generator ++ URL:=http://sourceforge.net/projects/pwgen/ ++endef ++ ++define Package/pwgen/description ++ pwgen generates random, meaningless but pronounceable passwords. ++ These passwords contain either only lowercase letters, or upper ++ and lower case mixed, or digits thrown in. ++ Uppercase letters and digits are placed in a way that eases ++ remembering their position when memorizing only the word. ++ ++ E.g. to generate a WPA preshared-key do: ++ pwgen -c -n -s 63 1 ++endef ++ ++# uses GNU configure ++ ++define Package/pwgen/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pwgen $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,pwgen)) +diff --git a/feeds/packages/utils/rcs/.svn/entries b/feeds/packages/utils/rcs/.svn/entries +new file mode 100644 +index 0000000..374e081 +--- /dev/null ++++ b/feeds/packages/utils/rcs/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rcs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-27T15:30:22.372718Z ++17765 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9733b8f32e4c3b66cfd13ac242b0c5a1 ++2009-09-27T15:30:22.372718Z ++17765 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1179 ++ +diff --git a/feeds/packages/utils/rcs/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rcs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..dcab7d5 +--- /dev/null ++++ b/feeds/packages/utils/rcs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# Copyright (C) 2006-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:=rcs ++PKG_VERSION:=5.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/$(PKG_NAME) ++PKG_MD5SUM:=4c8e896f2d2446fa593c6f1601a4fb75 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/$(PKG_NAME) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The GNU Revision Control System ++ URL:=http://www.gnu.org/software/$(PKG_NAME)/ ++endef ++ ++define Package/$(PKG_NAME)/desctiption ++ The Revision Control System (RCS) manages multiple revisions of files. RCS ++ automates the storing, retrieval, logging, identification, and merging of ++ revisions. RCS is useful for text that is revised frequently, for example ++ programs, documentation, graphics, papers, and form letters. ++endef ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/{ci,co,ident,merge,rcs,rcsclean,rcsdiff,rcsmerge,rlog} $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rcsfreeze.sh $(1)/usr/bin/rcsfreeze ++endef ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/utils/rcs/Makefile b/feeds/packages/utils/rcs/Makefile +new file mode 100644 +index 0000000..dcab7d5 +--- /dev/null ++++ b/feeds/packages/utils/rcs/Makefile +@@ -0,0 +1,40 @@ ++# ++# Copyright (C) 2006-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:=rcs ++PKG_VERSION:=5.7 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/$(PKG_NAME) ++PKG_MD5SUM:=4c8e896f2d2446fa593c6f1601a4fb75 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/$(PKG_NAME) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The GNU Revision Control System ++ URL:=http://www.gnu.org/software/$(PKG_NAME)/ ++endef ++ ++define Package/$(PKG_NAME)/desctiption ++ The Revision Control System (RCS) manages multiple revisions of files. RCS ++ automates the storing, retrieval, logging, identification, and merging of ++ revisions. RCS is useful for text that is revised frequently, for example ++ programs, documentation, graphics, papers, and form letters. ++endef ++ ++define Package/$(PKG_NAME)/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/{ci,co,ident,merge,rcs,rcsclean,rcsdiff,rcsmerge,rlog} $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rcsfreeze.sh $(1)/usr/bin/rcsfreeze ++endef ++ ++$(eval $(call BuildPackage,$(PKG_NAME))) +diff --git a/feeds/packages/utils/rcs/patches/.svn/entries b/feeds/packages/utils/rcs/patches/.svn/entries +new file mode 100644 +index 0000000..5ecdc2b +--- /dev/null ++++ b/feeds/packages/utils/rcs/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rcs/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-09-27T15:30:22.372718Z ++17765 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++000-debian.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++3f9a29ce76c1de0d8a681c9199ab1b25 ++2008-02-02T03:21:51.063006Z ++10359 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++154354 ++ ++100-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8586fe21d0b362d97b3d1229ecaa9202 ++2009-09-27T15:30:22.372718Z ++17765 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++13943 ++ +diff --git a/feeds/packages/utils/rcs/patches/.svn/text-base/000-debian.patch.svn-base b/feeds/packages/utils/rcs/patches/.svn/text-base/000-debian.patch.svn-base +new file mode 100644 +index 0000000..96df338 +--- /dev/null ++++ b/feeds/packages/utils/rcs/patches/.svn/text-base/000-debian.patch.svn-base +@@ -0,0 +1,4879 @@ ++--- rcs-5.7.orig/debian/rules +++++ rcs-5.7/debian/rules ++@@ -0,0 +1,91 @@ +++#!/usr/bin/make -f +++# Derived from: Sample debian.rules file - for GNU Hello (1.3). +++# Copyright 1994,1995 by Ian Jackson. +++# I hereby give you perpetual unlimited permission to copy, +++# modify and relicense this file, provided that you do not remove +++# my name from the file itself. (I assert my moral right of +++# paternity under the Copyright, Designs and Patents Act 1988.) +++# This file may have to be extensively modified +++ +++# There used to be `source' and `diff' targets in this file, and many +++# packages also had `changes' and `dist' targets. These functions +++# have been taken over by dpkg-source, dpkg-genchanges and +++# dpkg-buildpackage in a package-independent way, and so these targets +++# are obsolete. +++ +++package=rcs +++ +++CFLAGS = -g +++ +++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +++CFLAGS += -O0 +++else +++CFLAGS += -O2 +++endif +++ +++# The next section may have to be extensively modified +++ +++build: +++ $(checkdir) +++ ./configure --prefix=/usr --with-diffutils +++ $(MAKE) CFLAGS="$(CFLAGS)" +++ groff -t -p -Tps -ms rcs.ms >rcs.ps +++ touch build +++ +++clean: +++ $(checkdir) +++ -rm -f build +++ [ ! -f Makefile ] || $(MAKE) -i distclean +++ -rm -f *.ps man/index.db man/rcsfile.5 +++ -rm -rf debian/tmp debian/*~ debian/files autom4te.cache \ +++ debian/substvars +++ +++binary-indep: checkroot build +++ $(checkdir) +++# There are no architecture-independent files to be uploaded +++# generated by this package. If there were any they would be +++# made here. +++ +++binary-arch: checkroot build +++ -rm -rf debian/tmp +++ install -d debian/tmp/DEBIAN +++ install -d debian/tmp/usr/share/doc/$(package) +++ $(MAKE) prefix=`pwd`/debian/tmp/usr install +++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +++ for f in debian/tmp/usr/bin/*; do \ +++ strip -s -R.comment $$f; \ +++ done +++endif +++ cp debian/copyright debian/tmp/usr/share/doc/$(package)/ +++ cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian +++ cp ChangeLog debian/tmp/usr/share/doc/$(package)/changelog +++ gzip -9f debian/tmp/usr/share/doc/$(package)/changelog* +++ cp *.ps debian/tmp/usr/share/doc/$(package)/ +++ gzip -9f debian/tmp/usr/share/doc/$(package)/*.ps +++ mv debian/tmp/usr/man debian/tmp/usr/share/man +++ gzip -9f debian/tmp/usr/share/man/man*/* +++ (cd debian/tmp; find . -type f ! -regex '.*/DEBIAN/.*' \ +++ -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums) +++ dpkg-shlibdeps src/rcs +++ dpkg-gencontrol -isp +++ chown -R root.root debian/tmp +++ chmod -R u+w debian/tmp +++ chmod -R g-ws debian/tmp +++ dpkg --build debian/tmp .. +++ +++define checkdir +++ test -f man/rcs.1 +++endef +++ +++# Below here is fairly generic really +++ +++binary: binary-indep binary-arch +++ +++source diff: +++ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false +++ +++checkroot: +++ $(checkdir) +++ test root = "`whoami`" +++ +++.PHONY: binary binary-arch binary-indep clean checkroot ++--- rcs-5.7.orig/debian/control +++++ rcs-5.7/debian/control ++@@ -0,0 +1,16 @@ +++Source: rcs +++Section: devel +++Priority: optional +++Maintainer: Romain Francoise +++Standards-Version: 3.7.2 +++Build-Depends: groff, autoconf +++ +++Package: rcs +++Architecture: any +++Depends: ${shlibs:Depends} +++Description: The GNU Revision Control System +++ The Revision Control System (RCS) manages multiple +++ revisions of files. RCS automates the storing, retrieval, +++ logging, identification, and merging of revisions. RCS is +++ useful for text that is revised frequently, for example +++ programs, documentation, graphics, papers, and form letters. ++--- rcs-5.7.orig/debian/copyright +++++ rcs-5.7/debian/copyright ++@@ -0,0 +1,28 @@ +++This is Debian GNU/Linux's prepackaged version of the FSF's Revision +++Control System (RCS) utilities. These utilities allow you to keep +++multiple revisions of one or more files in a very compact manner. RCS +++is similar to, and in most respects better than, the non-free Source +++Code Control System (SCCS). +++ +++This package was assembled by Sven Rudolph +++from the GNU sources available from prep.ai.mit.edu (and its numerous +++mirrors) as /pub/gnu/rcs-5.7.tar.gz. It is currently maintained by +++Romain Francoise . +++ +++The upstream URL is: http://www.gnu.org/software/rcs/ +++ +++Copyright (C) 1991,1992,1993 Free Software Foundation, Inc. +++ +++RCS 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, or (at your option) +++any later version. +++ +++RCS 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. +++ +++On Debian GNU/Linux systems, the complete text of the GNU General +++Public License can be found in `/usr/share/common-licenses/GPL'. +++ ++--- rcs-5.7.orig/debian/changelog +++++ rcs-5.7/debian/changelog ++@@ -0,0 +1,216 @@ +++rcs (5.7-20) unstable; urgency=low +++ +++ * debian/control: Add support for DEB_BUILD_OPTIONS (closes: #437885). +++ +++ -- Romain Francoise Tue, 14 Aug 2007 21:24:54 +0200 +++ +++rcs (5.7-19) unstable; urgency=low +++ +++ * debian/control: Bump Standards-Version to 3.7.2, no changes needed. +++ * debian/copyright: Mention the current upstream URL (closes: #436739). +++ * debian/rules: +++ + Don't ignore errors from 'make distclean'. +++ + Generate DEBIAN/md5sums. +++ * Apply patch from Brendan O'Dea adding support for +++ diff's '-U' option to rcsdiff (closes: #428445). +++ +++ -- Romain Francoise Sun, 12 Aug 2007 18:40:04 +0200 +++ +++rcs (5.7-18) unstable; urgency=low +++ +++ * Apply patch from Mark D. Baushke adding support for the +++ new 'commitid' phrase used by newer version of CVS and CVSNT. Note +++ that this patch does not include support for *generating* the ids at +++ check in time; it only makes RCS recognize them (closes: #352527). +++ +++ -- Romain Francoise Tue, 14 Feb 2006 22:41:33 +0100 +++ +++rcs (5.7-17) unstable; urgency=low +++ +++ * Apply patch from Aaron S. Hawley making the diff strategy of rcsdiff a +++ bit more subtle: previously rcsdiff considered any long option as a +++ case where diff(1) can produce output when the revisions are +++ identical, when in fact it is only the case if either the +++ --side-by-side or --ifdef options are used (closes: #334004). +++ +++ * Patch man/co.1 to not use 'asteriskmath', thanks to LI Daobing +++ (closes: #345507). +++ +++ * debian/control: Bump Standards-Version to 3.6.2.2, no changes needed. +++ * debian/changelog: Change formatting of entries from 1995 and 1996 to +++ avoid lintian warnings. +++ * debian/rules: `install' no longer strips .comment sections from +++ binaries (since version 5.93-1), so revert previous fix and strip these +++ sections manually. +++ +++ -- Romain Francoise Sun, 5 Feb 2006 16:34:21 +0100 +++ +++rcs (5.7-16) unstable; urgency=low +++ +++ * Tenth anniversary release: RCS 5.7 was released on June 16th, 1995. +++ +++ * rcs.c: Check delta pointer in scanlogtext() before dereferencing it to +++ prevent a segmentation fault in some rare cases (discovered while +++ investigating #69193). +++ +++ * Ship docs in PostScript format (instead of DVI). Drop the ``Functions +++ of RCS'' paper since it's quite obsolete nowadays. +++ +++ * debian/rules: Delete substvars file in clean target. +++ * debian/changelog: Facelift previous entry. +++ +++ -- Romain Francoise Thu, 16 Jun 2005 08:14:01 +0200 +++ +++rcs (5.7-15) unstable; urgency=low +++ +++ * Adopting this package with Mark's blessing. +++ * debian/control: +++ + Bump Standard-Version to 3.6.1.0. +++ + Update maintainer contact info. +++ * debian/copyright: Ditto. +++ * debian/rules: +++ + Adjust CFLAGS to include -g and remove useless -I directive. +++ + Remove LDFLAGS. +++ +++ * Patch upstream Makefile.in to use install -s (which has the nice +++ effect of also deleting .comment sections from the binaries). +++ +++ * Patch man/rlog.1 to document option -q which does nothing, it's +++ provided for consistency with other commands (closes: #69257). +++ +++ * Remove a few unneeded files from the Debian diff (.orig files, Emacs +++ lock files). +++ +++ -- Romain Francoise Wed, 11 May 2005 17:51:01 +0200 +++ +++rcs (5.7-14) unstable; urgency=high +++ +++ * Fixes tmp file race (patch from OpenBSD) (Closes: #291542) +++ +++ -- Mark Baker Fri, 21 Jan 2005 18:16:20 +0000 +++ +++rcs (5.7-13.3) unstable; urgency=high +++ +++ * NMU +++ * Add build-dep on autoconf. Closes: #246566. +++ * Fix up quoting in src/Makefile.in to make $SHELL not complain, as \" +++ is not interpolated inside single-quoted strings. +++ * Make ident accept numbers as well as letters in identifiers. +++ Closes: #157891 +++ * Remove emacs variables from the changelog as they are no longer +++ needed. +++ * Add -isp to the dpkg-gencontrol call in debian/rules to get Section +++ and Priority included. Closes: #190383. +++ +++ -- Tollef Fog Heen Thu, 29 Jul 2004 19:09:32 +0200 +++ +++rcs (5.7-13.2) unstable; urgency=low +++ +++ * NMU +++ * can build now as root. Closes: #249106 +++ * priority dumped down to optional. Closes: #64438 +++ * fixed spelling error in debian/copyright, and location of the GPL. +++ +++ -- Andreas Barth Wed, 26 May 2004 22:21:05 +0200 +++ +++rcs (5.7-13.1) unstable; urgency=low +++ +++ * NMU. +++ * Rebuild so that the .dsc file will have Build-Depends. +++ Closes: #187853, #176344. +++ * Remove /usr/doc symlink. +++ +++ -- Daniel Schepler Mon, 28 Jul 2003 16:28:32 -0700 +++ +++rcs (5.7-13) unstable; urgency=low +++ +++ * debian/rules: install docs and manpages in /usr/share, as in FHS +++ * debian/control: standards version 3.1.0 +++ * debian/rules: format docs into dvi instead of leaving groff source. I +++ chose dvi as it is easier to view on screen than PS (Closes: 42277) +++ +++ -- Mark Baker Sun, 28 Nov 1999 18:31:21 +0000 +++ +++rcs (5.7-12) unstable; urgency=low +++ +++ * man/Makefile: use sed filter to fix .lf requests on output of pic, +++ so zsoelim doesn't complain about them (#26150) +++ * debian/rules: clean target deletes rcsfile.5 so it is always rebuilt +++ using fix above +++ +++ -- Mark Baker Mon, 5 Jul 1999 23:24:17 +0100 +++ +++rcs (5.7-11) unstable; urgency=low +++ +++ * Fixed temp file security hole in rcsfreeze script (#27845) +++ +++ -- Mark Baker Wed, 14 Oct 1998 22:43:47 +0100 +++ +++rcs (5.7-10) unstable; urgency=low +++ +++ * Included rcsfreeze script (#26743) +++ +++ -- Mark Baker Wed, 16 Sep 1998 20:57:00 +0000 +++ +++rcs (5.7-9) unstable; urgency=low +++ +++ * Fixed permissions +++ +++ -- Mark Baker Mon, 16 Feb 1998 00:07:52 +0000 +++ +++rcs (5.7-8) unstable; urgency=low +++ +++ * Updated standards-version to 2.4.0.0 (no changes) +++ +++ -- Mark Baker Tue, 10 Feb 1998 10:54:36 +0000 +++ +++rcs (5.7-7) unstable; urgency=low +++ +++ * Corrected maintainer field in debian/control +++ * Flushed configure cache and recompiled, to fix bug #11305/#11308) +++ +++ -- Mark Baker Thu, 17 Jul 1997 10:54:36 +0100 +++ +++rcs (5.7-6) unstable; urgency=low +++ +++ * Renamed changelog.upstream to changelog, as per policy (fixes #9657) +++ +++ -- Mark Baker Sat, 12 Jul 1997 16:55:37 +0100 +++ +++rcs (5.7-5) unstable; urgency=low +++ +++ * New maintainer +++ * Compiled with libc6 +++ * Use canonical path for sendmail (configure.in changed) +++ +++ -- Mark Baker Fri, 11 Jul 1997 21:24:48 +0100 +++ +++rcs (5.7-4) unstable; urgency=low +++ +++ * Updated to Standards-Version 2.1.2.2. +++ +++ -- Sven Rudolph Sun, 26 Jan 1997 22:34:57 +0100 +++ +++rcs (5.7-3) unstable; urgency=low +++ +++ * debian.rules: added multi-architecture support +++ +++ * debian.control: added Priority: and Section: +++ +++ * debian.control: corrected extended description (Bug#3619) +++ +++ -- Sven Rudolph Wed, 24 Jul 1996 23:48:20 +0100 +++ +++rcs (5.7-2) unstable; urgency=low +++ +++ * rebuilt for elf +++ +++ -- Sven Rudolph Thu, 23 Nov 1995 23:27:13 +0100 +++ +++rcs (5.7-1) unstable; urgency=low +++ +++ * created new Debian GNU/Linux package maintenance system files +++ * updated from rcs5.6.0.1 to rcs-5.7 +++ * received this package from Robert Sanders +++ +++ -- Sven Rudolph Tue, 5 Sep 1995 04:38:07 +0100 ++--- rcs-5.7.orig/man/co.1 +++++ rcs-5.7/man/co.1 ++@@ -597,7 +597,7 @@ ++ .RB \*(lq "//\ " \*(rq. ++ This is useful for languages with comments that go to the end of the line. ++ The convention for other languages is to use a ++-.RB \*(lq " \(** " \(rq +++.RB \*(lq " * " \(rq ++ prefix inside a multiline comment. ++ For example, the initial log comment of a C program ++ conventionally is of the following form: ++@@ -606,19 +606,19 @@ ++ .nf ++ .ft 3 ++ .ne 3 ++-/\(** +++/* ++ .in +\w'/'u ++-\(** $\&Log$ ++-\(**/ +++* $\&Log$ +++*/ ++ .in ++ .ft ++ .fi ++ .RE ++ .LP ++ For backwards compatibility with older versions of \*r, if the log prefix is ++-.B /\(** +++.B /* ++ or ++-.B (\(** +++.B (* ++ surrounded by optional white space, inserted log lines contain a space ++ instead of ++ .B / ++--- rcs-5.7.orig/man/rlog.1 +++++ rcs-5.7/man/rlog.1 ++@@ -187,6 +187,10 @@ ++ .I logins ++ is omitted, the user's login is assumed. ++ .TP +++.B \-q +++This option has no effect; +++it is provided for consistency with other commands. +++.TP ++ .B \-T ++ This option has no effect; ++ it is present for compatibility with other \*r commands. ++--- rcs-5.7.orig/man/rcsfile.5in +++++ rcs-5.7/man/rcsfile.5in ++@@ -68,6 +68,7 @@ ++ \f3state\fP {\f2id\fP}\f3;\fP ++ \f3branches\fP {\f2num\fP}*\f3;\fP ++ \f3next\fP {\f2num\fP}\f3;\fP +++ { \f3commitid\fP \f2id\fP\f3;\fP } ++ { \f2newphrase\fP }* ++ .LP ++ \f2desc\fP ::= \f3desc\fP \f2string\fP ++@@ -127,6 +128,18 @@ ++ Dates use the Gregorian calendar; times use UTC. ++ .PP ++ The +++.I commitid +++is followed by an +++.I id +++token. This token is intended to be unique across +++multiple files and is used to help group files as +++being a part of the same logical commit. +++This token must uniquely identify the commit +++operation that was applied to a set of RCS files. +++In particular, it must be unique among all the +++commitids in this file. +++.PP +++The ++ .I newphrase ++ productions in the grammar are reserved for future extensions ++ to the format of \*r files. ++--- rcs-5.7.orig/man/Makefile.in +++++ rcs-5.7/man/Makefile.in ++@@ -44,14 +44,16 @@ ++ all default :: rcsfile.5 ++ ++ rcsfile.5 : rcsfile.5in ++- $(PIC) $(PICFLAGS) $(srcdir)/$@in >$@ +++ $(PIC) $(PICFLAGS) $(srcdir)/$@in \ +++ | sed "s%\.lf \([0-9]*\)%\.lf \1 foo%" >$@ ++ ++ check dvi info TAGS :: ++ ++ installdirs :: ../mkinstalldirs ++ -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir) ++ ++-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog +++man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \ +++ rcsfreeze ++ ++ install :: installdirs ++ -for m in $(man1pages); do \ ++--- rcs-5.7.orig/configure +++++ rcs-5.7/configure ++@@ -1,28 +1,288 @@ ++ #! /bin/sh ++- ++ # Guess values for system-dependent variables and create Makefiles. ++-# Generated automatically using autoconf version 2.4 ++-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +++# Generated by GNU Autoconf 2.59. ++ # +++# Copyright (C) 2003 Free Software Foundation, Inc. ++ # This configure script is free software; the Free Software Foundation ++ # gives unlimited permission to copy, distribute and modify it. +++## --------------------- ## +++## M4sh Initialization. ## +++## --------------------- ## +++ +++# Be Bourne compatible +++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 +++ # is contrary to our usage. Disable this feature. +++ alias -g '${1+"$@"}'='"$@"' +++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +++ set -o posix +++fi +++DUALCASE=1; export DUALCASE # for MKS sh +++ +++# Support unset when possible. +++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +++ as_unset=unset +++else +++ as_unset=false +++fi +++ +++ +++# Work around bugs in pre-3.0 UWIN ksh. +++$as_unset ENV MAIL MAILPATH +++PS1='$ ' +++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 +++ fi +++done +++ +++# Required to use basename. +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +++ as_basename=basename +++else +++ as_basename=false +++fi +++ +++ +++# Name of the executable. +++as_me=`$as_basename "$0" || +++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +++ X"$0" : 'X\(//\)$' \| \ +++ X"$0" : 'X\(/\)$' \| \ +++ . : '\(.\)' 2>/dev/null || +++echo X/"$0" | +++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +++ /^X\/\(\/\/\)$/{ s//\1/; q; } +++ /^X\/\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ +++ +++# PATH needs CR, and LINENO needs CR and PATH. +++# Avoid depending upon Character Ranges. +++as_cr_letters='abcdefghijklmnopqrstuvwxyz' +++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +++as_cr_Letters=$as_cr_letters$as_cr_LETTERS +++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=';' +++ else +++ PATH_SEPARATOR=: +++ fi +++ rm -f conf$$.sh +++fi +++ +++ +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" || { +++ # Find who we are. Look in the path if we contain no path at all +++ # relative or not. +++ case $0 in +++ *[\\/]* ) as_myself=$0 ;; +++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +++done +++ +++ ;; +++ esac +++ # We did not find ourselves, most probably we were run as `sh COMMAND' +++ # in which case we are not to be found in the path. +++ if test "x$as_myself" = x; then +++ as_myself=$0 +++ fi +++ if test ! -f "$as_myself"; then +++ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +++ { (exit 1); exit 1; }; } +++ fi +++ case $CONFIG_SHELL in +++ '') +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ for as_base in sh bash ksh sh5; do +++ case $as_dir in +++ /*) +++ if ("$as_dir/$as_base" -c ' +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +++ CONFIG_SHELL=$as_dir/$as_base +++ export CONFIG_SHELL +++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} +++ fi;; +++ esac +++ done +++done +++;; +++ esac +++ +++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +++ # uniformly replaced by the line number. The first 'sed' inserts a +++ # line-number line before each line; the second 'sed' does the real +++ # work. The second script uses 'N' to pair each line-number line +++ # with the numbered line, and appends trailing '-' during +++ # substitution so that $LINENO is not a special case at line end. +++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +++ sed '=' <$as_myself | +++ sed ' +++ N +++ s,$,-, +++ : loop +++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, +++ t loop +++ s,-$,, +++ s,^['$as_cr_digits']*\n,, +++ ' >$as_me.lineno && +++ chmod +x $as_me.lineno || +++ { 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 +++ # (the dirname of $[0] is not the place where we might find the +++ # original and so on. Autoconf is especially sensible to this). +++ . ./$as_me.lineno +++ # Exit status is that of the last command. +++ exit +++} +++ +++ +++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +++ *c*,-n*) ECHO_N= ECHO_C=' +++' ECHO_T=' ' ;; +++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +++esac +++ +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++rm -f conf$$ conf$$.exe conf$$.file +++echo >conf$$.file +++if ln -s conf$$.file conf$$ 2>/dev/null; then +++ # We could just check for DJGPP; but this test a) works b) is more generic +++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +++ if test -f conf$$.exe; then +++ # Don't use ln at all; we don't have any links +++ as_ln_s='cp -p' +++ else +++ as_ln_s='ln -s' +++ fi +++elif ln conf$$.file conf$$ 2>/dev/null; then +++ as_ln_s=ln +++else +++ as_ln_s='cp -p' +++fi +++rm -f conf$$ conf$$.exe conf$$.file +++ +++if mkdir -p . 2>/dev/null; then +++ as_mkdir_p=: +++else +++ test -d ./-p && rmdir ./-p +++ as_mkdir_p=false +++fi +++ +++as_executable_p="test -f" +++ +++# Sed expression to map a string onto a valid CPP name. +++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +++ +++# Sed expression to map a string onto a valid variable name. +++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +++ +++ +++# IFS +++# We need space, tab and new line, in precisely that order. +++as_nl=' +++' +++IFS=" $as_nl" +++ +++# CDPATH. +++$as_unset CDPATH ++ ++-# Defaults: ++-ac_help= +++ +++# Name of the host. +++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +++# so uname gets run too. +++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +++ +++exec 6>&1 +++ +++# +++# Initializations. +++# ++ ac_default_prefix=/usr/local ++-# Any additions from configure.in: ++-ac_help="$ac_help ++- --with-diffutils assume GNU diffutils is similarly installed" +++ac_config_libobj_dir=. +++cross_compiling=no +++subdirs= +++MFLAGS= +++MAKEFLAGS= +++SHELL=${CONFIG_SHELL-/bin/sh} +++ +++# Maximum number of lines to put in a shell here document. +++# This variable seems obsolete. It should probably be removed, and +++# only ac_max_sed_lines should be used. +++: ${ac_max_here_lines=38} +++ +++# Identity of this package. +++PACKAGE_NAME= +++PACKAGE_TARNAME= +++PACKAGE_VERSION= +++PACKAGE_STRING= +++PACKAGE_BUGREPORT= +++ +++ac_unique_file="src/rcsbase.h" +++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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DIFF DIFF_SUCCESS DIFF_FAILURE DIFF_TROUBLE DIFFFLAGS DIFF_L DIFF3 DIFF3_BIN ED SENDMAIL PIC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE LIBOBJS LTLIBOBJS' +++ac_subst_files='' ++ ++ # Initialize some variables set by options. +++ac_init_help= +++ac_init_version=false ++ # The variables have the same names as the options, with ++ # dashes changed to underlines. ++-build=NONE ++-cache_file=./config.cache +++cache_file=/dev/null ++ exec_prefix=NONE ++-host=NONE ++ no_create= ++-nonopt=NONE ++ no_recursion= ++ prefix=NONE ++ program_prefix=NONE ++@@ -31,18 +291,31 @@ ++ silent= ++ site= ++ srcdir= ++-target=NONE ++ verbose= ++ x_includes=NONE ++ x_libraries=NONE ++ ++-# Initialize some other variables. ++-subdirs= +++# Installation directory options. +++# These are left unexpanded so users can "make install exec_prefix=/foo" +++# and all the variables that are supposed to be based on exec_prefix +++# by default will actually change. +++# Use braces instead of parens because sh, perl, etc. also accept them. +++bindir='${exec_prefix}/bin' +++sbindir='${exec_prefix}/sbin' +++libexecdir='${exec_prefix}/libexec' +++datadir='${prefix}/share' +++sysconfdir='${prefix}/etc' +++sharedstatedir='${prefix}/com' +++localstatedir='${prefix}/var' +++libdir='${exec_prefix}/lib' +++includedir='${prefix}/include' +++oldincludedir='/usr/include' +++infodir='${prefix}/info' +++mandir='${prefix}/man' ++ ++ ac_prev= ++ for ac_option ++ do ++- ++ # If the previous option needs an argument, assign it. ++ if test -n "$ac_prev"; then ++ eval "$ac_prev=\$ac_option" ++@@ -50,48 +323,59 @@ ++ continue ++ fi ++ ++- case "$ac_option" in ++- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++- *) ac_optarg= ;; ++- esac +++ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ ++ # Accept the important Cygnus configure options, so we can diagnose typos. ++ ++- case "$ac_option" in +++ case $ac_option in ++ ++- -build | --build | --buil | --bui | --bu | --b) ++- ac_prev=build ;; ++- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) ++- build="$ac_optarg" ;; +++ -bindir | --bindir | --bindi | --bind | --bin | --bi) +++ ac_prev=bindir ;; +++ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +++ bindir=$ac_optarg ;; +++ +++ -build | --build | --buil | --bui | --bu) +++ ac_prev=build_alias ;; +++ -build=* | --build=* | --buil=* | --bui=* | --bu=*) +++ build_alias=$ac_optarg ;; ++ ++ -cache-file | --cache-file | --cache-fil | --cache-fi \ ++ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ++ ac_prev=cache_file ;; ++ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ ++ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) ++- cache_file="$ac_optarg" ;; +++ cache_file=$ac_optarg ;; +++ +++ --config-cache | -C) +++ cache_file=config.cache ;; +++ +++ -datadir | --datadir | --datadi | --datad | --data | --dat | --da) +++ ac_prev=datadir ;; +++ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +++ | --da=*) +++ datadir=$ac_optarg ;; ++ ++ -disable-* | --disable-*) ++- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` +++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then ++- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } ++- fi ++- ac_feature=`echo $ac_feature| sed 's/-/_/g'` ++- eval "enable_${ac_feature}=no" ;; +++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +++ { (exit 1); exit 1; }; } +++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` +++ eval "enable_$ac_feature=no" ;; ++ ++ -enable-* | --enable-*) ++- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` +++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then ++- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } ++- fi ++- ac_feature=`echo $ac_feature| sed 's/-/_/g'` ++- case "$ac_option" in ++- *=*) ;; +++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +++ { (exit 1); exit 1; }; } +++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` +++ case $ac_option in +++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) ac_optarg=yes ;; ++ esac ++- eval "enable_${ac_feature}='$ac_optarg'" ;; +++ eval "enable_$ac_feature='$ac_optarg'" ;; ++ ++ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ ++ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ ++@@ -100,83 +384,101 @@ ++ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ ++ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ ++ | --exec=* | --exe=* | --ex=*) ++- exec_prefix="$ac_optarg" ;; +++ exec_prefix=$ac_optarg ;; ++ ++ -gas | --gas | --ga | --g) ++ # Obsolete; use --with-gas. ++ with_gas=yes ;; ++ ++- -help | --help | --hel | --he) ++- # Omit some internal or obsolete options to make the list less imposing. ++- # This message is too long to be a string in the A/UX 3.1 sh. ++- cat << EOF ++-Usage: configure [options] [host] ++-Options: [defaults in brackets after descriptions] ++-Configuration: ++- --cache-file=FILE cache test results in FILE ++- --help print this message ++- --no-create do not create output files ++- --quiet, --silent do not print \`checking...' messages ++- --version print the version of autoconf that created configure ++-Directory and file names: ++- --prefix=PREFIX install architecture-independent files in PREFIX ++- [$ac_default_prefix] ++- --exec-prefix=PREFIX install architecture-dependent files in PREFIX ++- [same as prefix] ++- --srcdir=DIR find the sources in DIR [configure dir or ..] ++- --program-prefix=PREFIX prepend PREFIX to installed program names ++- --program-suffix=SUFFIX append SUFFIX to installed program names ++- --program-transform-name=PROGRAM run sed PROGRAM on installed program names ++-Host type: ++- --build=BUILD configure for building on BUILD [BUILD=HOST] ++- --host=HOST configure for HOST [guessed] ++- --target=TARGET configure for TARGET [TARGET=HOST] ++-Features and packages: ++- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++- --x-includes=DIR X include files are in DIR ++- --x-libraries=DIR X library files are in DIR ++---enable and --with options recognized:$ac_help ++-EOF ++- exit 0 ;; +++ -help | --help | --hel | --he | -h) +++ ac_init_help=long ;; +++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) +++ ac_init_help=recursive ;; +++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) +++ ac_init_help=short ;; ++ ++ -host | --host | --hos | --ho) ++- ac_prev=host ;; +++ ac_prev=host_alias ;; ++ -host=* | --host=* | --hos=* | --ho=*) ++- host="$ac_optarg" ;; +++ host_alias=$ac_optarg ;; +++ +++ -includedir | --includedir | --includedi | --included | --include \ +++ | --includ | --inclu | --incl | --inc) +++ ac_prev=includedir ;; +++ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ +++ | --includ=* | --inclu=* | --incl=* | --inc=*) +++ includedir=$ac_optarg ;; +++ +++ -infodir | --infodir | --infodi | --infod | --info | --inf) +++ ac_prev=infodir ;; +++ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +++ infodir=$ac_optarg ;; +++ +++ -libdir | --libdir | --libdi | --libd) +++ ac_prev=libdir ;; +++ -libdir=* | --libdir=* | --libdi=* | --libd=*) +++ libdir=$ac_optarg ;; +++ +++ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ +++ | --libexe | --libex | --libe) +++ ac_prev=libexecdir ;; +++ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ +++ | --libexe=* | --libex=* | --libe=*) +++ libexecdir=$ac_optarg ;; +++ +++ -localstatedir | --localstatedir | --localstatedi | --localstated \ +++ | --localstate | --localstat | --localsta | --localst \ +++ | --locals | --local | --loca | --loc | --lo) +++ ac_prev=localstatedir ;; +++ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +++ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +++ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) +++ localstatedir=$ac_optarg ;; +++ +++ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +++ ac_prev=mandir ;; +++ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +++ mandir=$ac_optarg ;; ++ ++ -nfp | --nfp | --nf) ++ # Obsolete; use --without-fp. ++ with_fp=no ;; ++ ++ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ++- | --no-cr | --no-c) +++ | --no-cr | --no-c | -n) ++ no_create=yes ;; ++ ++ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ++ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ++ no_recursion=yes ;; ++ +++ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ +++ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ +++ | --oldin | --oldi | --old | --ol | --o) +++ ac_prev=oldincludedir ;; +++ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ +++ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ +++ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +++ oldincludedir=$ac_optarg ;; +++ ++ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ++ ac_prev=prefix ;; ++ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ++- prefix="$ac_optarg" ;; +++ prefix=$ac_optarg ;; ++ ++ -program-prefix | --program-prefix | --program-prefi | --program-pref \ ++ | --program-pre | --program-pr | --program-p) ++ ac_prev=program_prefix ;; ++ -program-prefix=* | --program-prefix=* | --program-prefi=* \ ++ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ++- program_prefix="$ac_optarg" ;; +++ program_prefix=$ac_optarg ;; ++ ++ -program-suffix | --program-suffix | --program-suffi | --program-suff \ ++ | --program-suf | --program-su | --program-s) ++ ac_prev=program_suffix ;; ++ -program-suffix=* | --program-suffix=* | --program-suffi=* \ ++ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ++- program_suffix="$ac_optarg" ;; +++ program_suffix=$ac_optarg ;; ++ ++ -program-transform-name | --program-transform-name \ ++ | --program-transform-nam | --program-transform-na \ ++@@ -193,55 +495,78 @@ ++ | --program-transfo=* | --program-transf=* \ ++ | --program-trans=* | --program-tran=* \ ++ | --progr-tra=* | --program-tr=* | --program-t=*) ++- program_transform_name="$ac_optarg" ;; +++ program_transform_name=$ac_optarg ;; ++ ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ silent=yes ;; ++ +++ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) +++ ac_prev=sbindir ;; +++ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +++ | --sbi=* | --sb=*) +++ sbindir=$ac_optarg ;; +++ +++ -sharedstatedir | --sharedstatedir | --sharedstatedi \ +++ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +++ | --sharedst | --shareds | --shared | --share | --shar \ +++ | --sha | --sh) +++ ac_prev=sharedstatedir ;; +++ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ +++ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ +++ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ +++ | --sha=* | --sh=*) +++ sharedstatedir=$ac_optarg ;; +++ ++ -site | --site | --sit) ++ ac_prev=site ;; ++ -site=* | --site=* | --sit=*) ++- site="$ac_optarg" ;; +++ site=$ac_optarg ;; ++ ++ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ++ ac_prev=srcdir ;; ++ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ++- srcdir="$ac_optarg" ;; +++ srcdir=$ac_optarg ;; +++ +++ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ +++ | --syscon | --sysco | --sysc | --sys | --sy) +++ ac_prev=sysconfdir ;; +++ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ +++ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +++ sysconfdir=$ac_optarg ;; ++ ++ -target | --target | --targe | --targ | --tar | --ta | --t) ++- ac_prev=target ;; +++ ac_prev=target_alias ;; ++ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) ++- target="$ac_optarg" ;; +++ target_alias=$ac_optarg ;; ++ ++ -v | -verbose | --verbose | --verbos | --verbo | --verb) ++ verbose=yes ;; ++ ++- -version | --version | --versio | --versi | --vers) ++- echo "configure generated by autoconf version 2.4" ++- exit 0 ;; +++ -version | --version | --versio | --versi | --vers | -V) +++ ac_init_version=: ;; ++ ++ -with-* | --with-*) ++- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` +++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then ++- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } ++- fi +++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid package name: $ac_package" >&2 +++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package| sed 's/-/_/g'` ++- case "$ac_option" in ++- *=*) ;; +++ case $ac_option in +++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) ac_optarg=yes ;; ++ esac ++- eval "with_${ac_package}='$ac_optarg'" ;; +++ eval "with_$ac_package='$ac_optarg'" ;; ++ ++ -without-* | --without-*) ++- ac_package=`echo $ac_option|sed -e 's/-*without-//'` +++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then ++- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } ++- fi ++- ac_package=`echo $ac_package| sed 's/-/_/g'` ++- eval "with_${ac_package}=no" ;; +++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid package name: $ac_package" >&2 +++ { (exit 1); exit 1; }; } +++ ac_package=`echo $ac_package | sed 's/-/_/g'` +++ eval "with_$ac_package=no" ;; ++ ++ --x) ++ # Obsolete; use --with-x. ++@@ -252,96 +577,110 @@ ++ ac_prev=x_includes ;; ++ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ ++ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) ++- x_includes="$ac_optarg" ;; +++ x_includes=$ac_optarg ;; ++ ++ -x-libraries | --x-libraries | --x-librarie | --x-librari \ ++ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ++ ac_prev=x_libraries ;; ++ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ ++ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) ++- x_libraries="$ac_optarg" ;; +++ x_libraries=$ac_optarg ;; ++ ++- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } +++ -*) { echo "$as_me: error: unrecognized option: $ac_option +++Try \`$0 --help' for more information." >&2 +++ { (exit 1); exit 1; }; } ++ ;; ++ ++- *) ++- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then ++- echo "configure: warning: $ac_option: invalid host type" 1>&2 ++- fi ++- if test "x$nonopt" != xNONE; then ++- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ++- fi ++- nonopt="$ac_option" +++ *=*) +++ 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 +++ { (exit 1); exit 1; }; } +++ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +++ 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 +++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ ;; ++ ++ esac ++ done ++ ++ if test -n "$ac_prev"; then ++- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } ++-fi ++- ++-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 ++- ++-# File descriptor usage: ++-# 0 standard input ++-# 1 file creation ++-# 2 errors and warnings ++-# 3 some systems may open it to /dev/tty ++-# 4 used on the Kubota Titan ++-# 6 checking for... messages and results ++-# 5 compiler messages saved in config.log ++-if test "$silent" = yes; then ++- exec 6>/dev/null ++-else ++- exec 6>&1 +++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` +++ { echo "$as_me: error: missing argument to $ac_option" >&2 +++ { (exit 1); exit 1; }; } ++ fi ++-exec 5>./config.log ++ ++-echo "\ ++-This file contains any messages produced by compilers while ++-running configure, to aid debugging if configure makes a mistake. ++-" 1>&5 +++# Be sure to have absolute paths. +++for ac_var in exec_prefix prefix +++do +++ eval ac_val=$`echo $ac_var` +++ case $ac_val in +++ [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +++ { (exit 1); exit 1; }; };; +++ esac +++done ++ ++-# Strip out --no-create and --no-recursion so they do not pile up. ++-# Also quote any args containing shell metacharacters. ++-ac_configure_args= ++-for ac_arg +++# Be sure to have absolute paths. +++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +++ localstatedir libdir includedir oldincludedir infodir mandir ++ do ++- case "$ac_arg" in ++- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ++- | --no-cr | --no-c) ;; ++- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ++- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; ++- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) ++- ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++- *) ac_configure_args="$ac_configure_args $ac_arg" ;; +++ eval ac_val=$`echo $ac_var` +++ case $ac_val in +++ [\\/$]* | ?:[\\/]* ) ;; +++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +++ { (exit 1); exit 1; }; };; ++ esac ++ done ++ ++-# NLS nuisances. ++-# Only set LANG and LC_ALL to C if already set. ++-# These must not be set unconditionally because not all systems understand ++-# e.g. LANG=C (notably SCO). ++-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +++# There might be people who depend on the old broken behavior: `$host' +++# used to hold the argument of --host etc. +++# FIXME: To remove some day. +++build=$build_alias +++host=$host_alias +++target=$target_alias +++ +++# FIXME: To remove some day. +++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. +++ 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 +++ fi +++fi ++ ++-# confdefs.h avoids OS command line length limits that DEFS can exceed. ++-rm -rf conftest* confdefs.h ++-# AIX cpp loses on an empty file, so make sure it contains at least a newline. ++-echo > confdefs.h +++ac_tool_prefix= +++test -n "$host_alias" && ac_tool_prefix=$host_alias- +++ +++test "$silent" = yes && exec 6>/dev/null ++ ++-# A filename unique to this package, relative to the directory that ++-# configure is in, which we can look for to find out if srcdir is correct. ++-ac_unique_file=src/rcsbase.h ++ ++ # Find the source files, if location was not specified. ++ if test -z "$srcdir"; then ++ ac_srcdir_defaulted=yes ++ # Try the directory containing this script, then its parent. ++- ac_prog=$0 ++- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` ++- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. +++ ac_confdir=`(dirname "$0") 2>/dev/null || +++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +++ X"$0" : 'X\(//\)[^/]' \| \ +++ X"$0" : 'X\(//\)$' \| \ +++ X"$0" : 'X\(/\)' \| \ +++ . : '\(.\)' 2>/dev/null || +++echo X"$0" | +++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } +++ /^X\(\/\/\)$/{ s//\1/; q; } +++ /^X\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` ++ srcdir=$ac_confdir ++ if test ! -r $srcdir/$ac_unique_file; then ++ srcdir=.. ++@@ -351,13 +690,454 @@ ++ fi ++ if test ! -r $srcdir/$ac_unique_file; then ++ if test "$ac_srcdir_defaulted" = yes; then ++- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } +++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +++ { (exit 1); exit 1; }; } ++ else ++- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } +++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +++ { (exit 1); exit 1; }; } ++ fi ++ fi ++-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +++ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +++ { (exit 1); exit 1; }; } +++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +++ac_env_build_alias_set=${build_alias+set} +++ac_env_build_alias_value=$build_alias +++ac_cv_env_build_alias_set=${build_alias+set} +++ac_cv_env_build_alias_value=$build_alias +++ac_env_host_alias_set=${host_alias+set} +++ac_env_host_alias_value=$host_alias +++ac_cv_env_host_alias_set=${host_alias+set} +++ac_cv_env_host_alias_value=$host_alias +++ac_env_target_alias_set=${target_alias+set} +++ac_env_target_alias_value=$target_alias +++ac_cv_env_target_alias_set=${target_alias+set} +++ac_cv_env_target_alias_value=$target_alias +++ac_env_CC_set=${CC+set} +++ac_env_CC_value=$CC +++ac_cv_env_CC_set=${CC+set} +++ac_cv_env_CC_value=$CC +++ac_env_CFLAGS_set=${CFLAGS+set} +++ac_env_CFLAGS_value=$CFLAGS +++ac_cv_env_CFLAGS_set=${CFLAGS+set} +++ac_cv_env_CFLAGS_value=$CFLAGS +++ac_env_LDFLAGS_set=${LDFLAGS+set} +++ac_env_LDFLAGS_value=$LDFLAGS +++ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +++ac_cv_env_LDFLAGS_value=$LDFLAGS +++ac_env_CPPFLAGS_set=${CPPFLAGS+set} +++ac_env_CPPFLAGS_value=$CPPFLAGS +++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +++ac_cv_env_CPPFLAGS_value=$CPPFLAGS +++ +++# +++# Report the --help message. +++# +++if test "$ac_init_help" = "long"; then +++ # Omit some internal or obsolete options to make the list less imposing. +++ # This message is too long to be a string in the A/UX 3.1 sh. +++ cat <<_ACEOF +++\`configure' configures this package to adapt to many kinds of systems. +++ +++Usage: $0 [OPTION]... [VAR=VALUE]... +++ +++To assign environment variables (e.g., CC, CFLAGS...), specify them as +++VAR=VALUE. See below for descriptions of some of the useful variables. +++ +++Defaults for the options are specified in brackets. +++ +++Configuration: +++ -h, --help display this help and exit +++ --help=short display options specific to this package +++ --help=recursive display the short help of all the included packages +++ -V, --version display version information and exit +++ -q, --quiet, --silent do not print \`checking...' messages +++ --cache-file=FILE cache test results in FILE [disabled] +++ -C, --config-cache alias for \`--cache-file=config.cache' +++ -n, --no-create do not create output files +++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] +++ +++_ACEOF +++ +++ cat <<_ACEOF +++Installation directories: +++ --prefix=PREFIX install architecture-independent files in PREFIX +++ [$ac_default_prefix] +++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +++ [PREFIX] +++ +++By default, \`make install' will install all the files in +++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +++an installation prefix other than \`$ac_default_prefix' using \`--prefix', +++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] +++ --datadir=DIR read-only architecture-independent data [PREFIX/share] +++ --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] +++ --infodir=DIR info documentation [PREFIX/info] +++ --mandir=DIR man documentation [PREFIX/man] +++_ACEOF +++ +++ cat <<\_ACEOF +++_ACEOF +++fi +++ +++if test -n "$ac_init_help"; then +++ +++ cat <<\_ACEOF +++ +++Optional Packages: +++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +++ --with-diffutils assume GNU diffutils is similarly installed +++ +++Some influential environment variables: +++ CC C compiler command +++ CFLAGS C compiler flags +++ LDFLAGS linker flags, e.g. -L if you have libraries in a +++ nonstandard directory +++ CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have +++ headers in a nonstandard directory +++ +++Use these variables to override the choices made by `configure' or to help +++it to find libraries and programs with nonstandard names/locations. +++ +++_ACEOF +++fi +++ +++if test "$ac_init_help" = "recursive"; then +++ # If there are subdirs, report their specific --help. +++ ac_popdir=`pwd` +++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +++ test -d $ac_dir || continue +++ ac_builddir=. +++ +++if test "$ac_dir" != .; then +++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +++ # A "../" for each directory in $ac_dir_suffix. +++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +++else +++ ac_dir_suffix= ac_top_builddir= +++fi +++ +++case $srcdir in +++ .) # No --srcdir option. We are building in place. +++ ac_srcdir=. +++ if test -z "$ac_top_builddir"; then +++ ac_top_srcdir=. +++ else +++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +++ fi ;; +++ [\\/]* | ?:[\\/]* ) # Absolute path. +++ ac_srcdir=$srcdir$ac_dir_suffix; +++ ac_top_srcdir=$srcdir ;; +++ *) # Relative path. +++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +++ ac_top_srcdir=$ac_top_builddir$srcdir ;; +++esac +++ +++# Do not use `cd foo && pwd` to compute absolute paths, because +++# the directories may not exist. +++case `pwd` in +++.) ac_abs_builddir="$ac_dir";; +++*) +++ case "$ac_dir" in +++ .) ac_abs_builddir=`pwd`;; +++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +++ *) ac_abs_builddir=`pwd`/"$ac_dir";; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_builddir=${ac_top_builddir}.;; +++*) +++ case ${ac_top_builddir}. in +++ .) ac_abs_top_builddir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_srcdir=$ac_srcdir;; +++*) +++ case $ac_srcdir in +++ .) ac_abs_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_srcdir=$ac_top_srcdir;; +++*) +++ case $ac_top_srcdir in +++ .) ac_abs_top_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +++ esac;; +++esac +++ +++ cd $ac_dir +++ # Check for guested configure; otherwise get Cygnus style configure. +++ if test -f $ac_srcdir/configure.gnu; then +++ echo +++ $SHELL $ac_srcdir/configure.gnu --help=recursive +++ elif test -f $ac_srcdir/configure; then +++ echo +++ $SHELL $ac_srcdir/configure --help=recursive +++ elif test -f $ac_srcdir/configure.ac || +++ test -f $ac_srcdir/configure.in; then +++ echo +++ $ac_configure --help +++ else +++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +++ fi +++ cd "$ac_popdir" +++ done +++fi +++ +++test -n "$ac_init_help" && exit 0 +++if $ac_init_version; then +++ cat <<\_ACEOF +++ +++Copyright (C) 2003 Free Software Foundation, Inc. +++This configure script is free software; the Free Software Foundation +++gives unlimited permission to copy, distribute and modify it. +++_ACEOF +++ exit 0 +++fi +++exec 5>config.log +++cat >&5 <<_ACEOF +++This file contains any messages produced by compilers while +++running configure, to aid debugging if configure makes a mistake. +++ +++It was created by $as_me, which was +++generated by GNU Autoconf 2.59. Invocation command line was +++ +++ $ $0 $@ +++ +++_ACEOF +++{ +++cat <<_ASUNAME +++## --------- ## +++## Platform. ## +++## --------- ## +++ +++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +++uname -m = `(uname -m) 2>/dev/null || echo unknown` +++uname -r = `(uname -r) 2>/dev/null || echo unknown` +++uname -s = `(uname -s) 2>/dev/null || echo unknown` +++uname -v = `(uname -v) 2>/dev/null || echo unknown` +++ +++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +++ +++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +++hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +++ +++_ASUNAME +++ +++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ echo "PATH: $as_dir" +++done +++ +++} >&5 +++ +++cat >&5 <<_ACEOF +++ +++ +++## ----------- ## +++## Core tests. ## +++## ----------- ## +++ +++_ACEOF +++ +++ +++# Keep a trace of the command line. +++# Strip out --no-create and --no-recursion so they do not pile up. +++# Strip out --silent because we don't want to record it for future runs. +++# Also quote any args containing shell meta-characters. +++# Make two passes to allow for proper duplicate-argument suppression. +++ac_configure_args= +++ac_configure_args0= +++ac_configure_args1= +++ac_sep= +++ac_must_keep_next=false +++for ac_pass in 1 2 +++do +++ for ac_arg +++ do +++ case $ac_arg in +++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +++ | -silent | --silent | --silen | --sile | --sil) +++ continue ;; +++ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +++ esac +++ case $ac_pass in +++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +++ 2) +++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" +++ if test $ac_must_keep_next = true; then +++ ac_must_keep_next=false # Got value, back to normal. +++ else +++ case $ac_arg in +++ *=* | --config-cache | -C | -disable-* | --disable-* \ +++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +++ | -with-* | --with-* | -without-* | --without-* | --x) +++ case "$ac_configure_args0 " in +++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +++ esac +++ ;; +++ -* ) ac_must_keep_next=true ;; +++ esac +++ fi +++ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +++ # Get rid of the leading space. +++ ac_sep=" " +++ ;; +++ esac +++ done +++done +++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +++ +++# When interrupted or exit'd, cleanup temporary files, and complete +++# config.log. We remove comments because anyway the quotes in there +++# would cause problems or look ugly. +++# WARNING: Be sure not to use single quotes in there, as some shells, +++# such as our DU 5.0 friend, will then `close' the trap. +++trap 'exit_status=$? +++ # Save into config.log some information that might help in debugging. +++ { +++ echo +++ +++ cat <<\_ASBOX +++## ---------------- ## +++## Cache variables. ## +++## ---------------- ## +++_ASBOX +++ echo +++ # The following way of writing the cache mishandles newlines in values, +++{ +++ (set) 2>&1 | +++ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +++ *ac_space=\ *) +++ sed -n \ +++ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" +++ ;; +++ *) +++ sed -n \ +++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +++ ;; +++ esac; +++} +++ echo +++ +++ cat <<\_ASBOX +++## ----------------- ## +++## Output variables. ## +++## ----------------- ## +++_ASBOX +++ echo +++ for ac_var in $ac_subst_vars +++ do +++ eval ac_val=$`echo $ac_var` +++ echo "$ac_var='"'"'$ac_val'"'"'" +++ done | sort +++ echo +++ +++ if test -n "$ac_subst_files"; then +++ cat <<\_ASBOX +++## ------------- ## +++## Output files. ## +++## ------------- ## +++_ASBOX +++ echo +++ for ac_var in $ac_subst_files +++ do +++ eval ac_val=$`echo $ac_var` +++ echo "$ac_var='"'"'$ac_val'"'"'" +++ done | sort +++ echo +++ fi +++ +++ if test -s confdefs.h; then +++ cat <<\_ASBOX +++## ----------- ## +++## confdefs.h. ## +++## ----------- ## +++_ASBOX +++ echo +++ sed "/^$/d" confdefs.h | sort +++ echo +++ fi +++ test "$ac_signal" != 0 && +++ echo "$as_me: caught signal $ac_signal" +++ echo "$as_me: exit $exit_status" +++ } >&5 +++ rm -f core *.core && +++ rm -rf conftest* confdefs* conf$$* $ac_clean_files && +++ exit $exit_status +++ ' 0 +++for ac_signal in 1 2 13 15; do +++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +++done +++ac_signal=0 +++ +++# confdefs.h avoids OS command line length limits that DEFS can exceed. +++rm -rf conftest* confdefs.h +++# AIX cpp loses on an empty file, so make sure it contains at least a newline. +++echo >confdefs.h +++ +++# Predefined preprocessor variables. +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_NAME "$PACKAGE_NAME" +++_ACEOF +++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +++_ACEOF +++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_VERSION "$PACKAGE_VERSION" +++_ACEOF ++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_STRING "$PACKAGE_STRING" +++_ACEOF +++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +++_ACEOF +++ +++ +++# Let the site file select an alternate cache file if it wants to. ++ # Prefer explicitly selected file to automatically selected ones. ++ if test -z "$CONFIG_SITE"; then ++ if test "x$prefix" != xNONE; then ++@@ -368,36 +1148,103 @@ ++ fi ++ for ac_site_file in $CONFIG_SITE; do ++ if test -r "$ac_site_file"; then ++- echo "loading site script $ac_site_file" +++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +++echo "$as_me: loading site script $ac_site_file" >&6;} +++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++ done ++ ++ if test -r "$cache_file"; then ++- echo "loading cache $cache_file" ++- . $cache_file +++ # 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;} +++ case $cache_file in +++ [\\/]* | ?:[\\/]* ) . $cache_file;; +++ *) . ./$cache_file;; +++ esac +++ fi ++ else ++- echo "creating cache $cache_file" ++- > $cache_file +++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +++echo "$as_me: creating cache $cache_file" >&6;} +++ >$cache_file +++fi +++ +++# Check that the precious variables saved in the cache have kept the same +++# value. +++ac_cache_corrupted=false +++for ac_var in `(set) 2>&1 | +++ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +++ eval ac_old_set=\$ac_cv_env_${ac_var}_set +++ eval ac_new_set=\$ac_env_${ac_var}_set +++ eval ac_old_val="\$ac_cv_env_${ac_var}_value" +++ 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;} +++ 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;} +++ 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=: +++ 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=$ac_new_val ;; +++ esac +++ case " $ac_configure_args " in +++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; +++ esac +++ 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;} +++ { (exit 1); exit 1; }; } ++ fi ++ ++ ac_ext=c ++-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++ ac_cpp='$CPP $CPPFLAGS' ++-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' ++-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +++ac_compiler_gnu=$ac_cv_c_compiler_gnu +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ ++ ++-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then ++- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. ++- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then ++- ac_n= ac_c=' ++-' ac_t=' ' ++- else ++- ac_n=-n ac_c= ac_t= ++- fi ++-else ++- ac_n= ac_c='\c' ac_t= ++-fi ++ ++ ++ ++@@ -411,15 +1258,15 @@ ++ 1 ++ EOF ++ +++ ++ # Check whether --with-diffutils or --without-diffutils was given. ++-withval="$with_diffutils" ++-if test -n "$withval"; then +++if test "${with_diffutils+set}" = set; then +++ withval="$with_diffutils" ++ with_diffutils=$withval ++ else ++ with_diffutils=no ++ ++-fi ++- +++fi; ++ ++ case $with_diffutils in ++ yes) ++@@ -437,11 +1284,12 @@ ++ # On some systems, the RCS-compatible diff program is called `rdiff'; ++ # use it if it works and `diff' doesn't. ++ ++-echo $ac_n "checking diff basename""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_prog_diff'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff basename" >&5 +++echo $ECHO_N "checking diff basename... $ECHO_C" >&6 +++if test "${rcs_cv_prog_diff+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_prog_diff=$DIFF ++ case $rcs_cv_prog_diff in ++ '') ++@@ -463,49 +1311,62 @@ ++ ++ DIFF=$rcs_cv_prog_diff ++ case $DIFF in ++-'') { echo "configure: error: cannot find RCS-compatible diff" 1>&2; exit 1; };; +++'') { { echo "$as_me:$LINENO: error: cannot find RCS-compatible diff" >&5 +++echo "$as_me: error: cannot find RCS-compatible diff" >&2;} +++ { (exit 1); exit 1; }; };; ++ esac ++-echo "$ac_t""$DIFF" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF" >&5 +++echo "${ECHO_T}$DIFF" >&6 ++ # Extract the first word of "$DIFF", so it can be a program name with args. ++ set dummy $DIFF; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_DIFF'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_DIFF+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$DIFF" in ++- /*) +++ case $DIFF in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_DIFF="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ test -z "$ac_cv_path_DIFF" && ac_cv_path_DIFF="$DIFF" ++ ;; ++ esac ++ fi ++-DIFF="$ac_cv_path_DIFF" +++DIFF=$ac_cv_path_DIFF +++ ++ if test -n "$DIFF"; then ++- echo "$ac_t""$DIFF" 1>&6 +++ echo "$as_me:$LINENO: result: $DIFF" >&5 +++echo "${ECHO_T}$DIFF" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++ ++ # Set DIFF_SUCCESS, DIFF_FAILURE, DIFF_TROUBLE to diff's exit status ++ # when it finds no differences, some differences, or trouble. ++ ++-echo $ac_n "checking diff success status""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_status_diff_success'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff success status" >&5 +++echo $ECHO_N "checking diff success status... $ECHO_C" >&6 +++if test "${rcs_cv_status_diff_success+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_status_diff_success=$DIFF_SUCCESS ++ case $rcs_cv_status_diff_success in ++ '') ++@@ -519,14 +1380,16 @@ ++ fi ++ ++ DIFF_SUCCESS=$rcs_cv_status_diff_success ++-echo "$ac_t""$DIFF_SUCCESS" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF_SUCCESS" >&5 +++echo "${ECHO_T}$DIFF_SUCCESS" >&6 ++ # ++ ++-echo $ac_n "checking diff failure status""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_status_diff_failure'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff failure status" >&5 +++echo $ECHO_N "checking diff failure status... $ECHO_C" >&6 +++if test "${rcs_cv_status_diff_failure+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_status_diff_failure=$DIFF_FAILURE ++ case $rcs_cv_status_diff_failure in ++ '') ++@@ -538,14 +1401,16 @@ ++ fi ++ ++ DIFF_FAILURE=$rcs_cv_status_diff_failure ++-echo "$ac_t""$DIFF_FAILURE" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF_FAILURE" >&5 +++echo "${ECHO_T}$DIFF_FAILURE" >&6 ++ # ++ ++-echo $ac_n "checking diff trouble status""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_status_diff_trouble'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff trouble status" >&5 +++echo $ECHO_N "checking diff trouble status... $ECHO_C" >&6 +++if test "${rcs_cv_status_diff_trouble+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_status_diff_trouble=$DIFF_TROUBLE ++ case $rcs_cv_status_diff_trouble in ++ '') ++@@ -557,16 +1422,18 @@ ++ fi ++ ++ DIFF_TROUBLE=$rcs_cv_status_diff_trouble ++-echo "$ac_t""$DIFF_TROUBLE" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF_TROUBLE" >&5 +++echo "${ECHO_T}$DIFF_TROUBLE" >&6 ++ ++ # Set DIFFFLAGS to the options of the `diff' program to be run. ++ # Use -an if possible, -n otherwise. ++ ++-echo $ac_n "checking diff options for RCS""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_options_diff'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff options for RCS" >&5 +++echo $ECHO_N "checking diff options for RCS... $ECHO_C" >&6 +++if test "${rcs_cv_options_diff+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_options_diff=$DIFFFLAGS ++ case $rcs_cv_options_diff in ++ '') ++@@ -585,15 +1452,17 @@ ++ fi ++ ++ DIFFFLAGS=$rcs_cv_options_diff ++-echo "$ac_t""$DIFFFLAGS" 1>&6 +++echo "$as_me:$LINENO: result: $DIFFFLAGS" >&5 +++echo "${ECHO_T}$DIFFFLAGS" >&6 ++ ++ # Set DIFF_L to 1 if diff understands the L option, 0 otherwise. ++ ++-echo $ac_n "checking diff -L""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_options_diff_l'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff -L" >&5 +++echo $ECHO_N "checking diff -L... $ECHO_C" >&6 +++if test "${rcs_cv_options_diff_l+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_options_diff_l=$DIFF_L ++ case $rcs_cv_options_diff_l in ++ '') ++@@ -621,19 +1490,22 @@ ++ ++ DIFF_L=$rcs_cv_options_diff_l ++ case $DIFF_L in ++-1) echo "$ac_t""yes" 1>&6;; ++-*) echo "$ac_t""no" 1>&6;; +++1) echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6;; +++*) echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6;; ++ esac ++ ++ # Set DIFF3 to the name of the diff3 program. ++ # In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec. ++ diff3PATH=$PATH:/usr/libexec ++ ++-echo $ac_n "checking diff3 -m""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_prog_diff3_bin'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff3 -m" >&5 +++echo $ECHO_N "checking diff3 -m... $ECHO_C" >&6 +++if test "${rcs_cv_prog_diff3_bin+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_prog_diff3_bin=$DIFF3 ++ case $rcs_cv_prog_diff3_bin in ++ '') ++@@ -657,49 +1529,61 @@ ++ ++ case $rcs_cv_prog_diff3_bin in ++ ?*) ++- echo "$ac_t""yes" 1>&6 +++ echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6 ++ ac_save_path=$PATH ++ PATH=$diff3PATH ++ # Extract the first word of "$rcs_cv_prog_diff3_bin", so it can be a program name with args. ++ set dummy $rcs_cv_prog_diff3_bin; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_DIFF3'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_DIFF3+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$DIFF3" in ++- /*) +++ case $DIFF3 in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_DIFF3="$DIFF3" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_DIFF3="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_DIFF3="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ test -z "$ac_cv_path_DIFF3" && ac_cv_path_DIFF3="$rcs_cv_prog_diff3_bin" ++ ;; ++ esac ++ fi ++-DIFF3="$ac_cv_path_DIFF3" +++DIFF3=$ac_cv_path_DIFF3 +++ ++ if test -n "$DIFF3"; then ++- echo "$ac_t""$DIFF3" 1>&6 +++ echo "$as_me:$LINENO: result: $DIFF3" >&5 +++echo "${ECHO_T}$DIFF3" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++ PATH=$ac_save_path ++ ;; ++ '') ++- echo "$ac_t""no" 1>&6 ++- echo $ac_n "checking diff3 library program""... $ac_c" 1>&6 ++- if eval "test \"`echo '$''{'rcs_cv_path_diff3_lib'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++ echo "$as_me:$LINENO: checking diff3 library program" >&5 +++echo $ECHO_N "checking diff3 library program... $ECHO_C" >&6 +++ if test "${rcs_cv_path_diff3_lib+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ $DIFF conftest0 conftest1 >conftest01 ++ $DIFF /dev/null conftest1 >conftestn1 ++ for i in /usr/*lib*/*diff3*; do ++@@ -714,13 +1598,16 @@ ++ break ++ fi ++ done ++- +++ ++ fi ++ ++ DIFF3=$rcs_cv_path_diff3_lib ++ case $DIFF3 in ++- '') { echo "configure: error: cannot find a working diff3 library program" 1>&2; exit 1; };; ++- ?*) echo "$ac_t""$DIFF3" 1>&6;; +++ '') { { echo "$as_me:$LINENO: error: cannot find a working diff3 library program" >&5 +++echo "$as_me: error: cannot find a working diff3 library program" >&2;} +++ { (exit 1); exit 1; }; };; +++ ?*) echo "$as_me:$LINENO: result: $DIFF3" >&5 +++echo "${ECHO_T}$DIFF3" >&6;; ++ esac ++ ;; ++ esac ++@@ -740,71 +1627,89 @@ ++ ++ # Extract the first word of "ed", so it can be a program name with args. ++ set dummy ed; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_ED'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_ED+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$ED" in ++- /*) +++ case $ED in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ED="$ED" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_ED="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_ED="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ test -z "$ac_cv_path_ED" && ac_cv_path_ED="ed" ++ ;; ++ esac ++ fi ++-ED="$ac_cv_path_ED" +++ED=$ac_cv_path_ED +++ ++ if test -n "$ED"; then ++- echo "$ac_t""$ED" 1>&6 +++ echo "$as_me:$LINENO: result: $ED" >&5 +++echo "${ECHO_T}$ED" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++ ++ ac_save_path=$PATH ++-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH +++PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH ++ for ac_prog in sendmail mail mailx ++ do ++-# Extract the first word of "$ac_prog", so it can be a program name with args. +++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_SENDMAIL+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$SENDMAIL" in ++- /*) +++ case $SENDMAIL in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_SENDMAIL="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ ;; ++ esac ++ fi ++-SENDMAIL="$ac_cv_path_SENDMAIL" +++SENDMAIL=$ac_cv_path_SENDMAIL +++ ++ if test -n "$SENDMAIL"; then ++- echo "$ac_t""$SENDMAIL" 1>&6 +++ echo "$as_me:$LINENO: result: $SENDMAIL" >&5 +++echo "${ECHO_T}$SENDMAIL" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++-test -n "$SENDMAIL" && break +++ test -n "$SENDMAIL" && break ++ done ++ ++ PATH=$ac_save_path ++@@ -817,110 +1722,969 @@ ++ # Similarly, if using traditional pic, use its -D option. ++ for ac_prog in "pic -n" "gpic -n" "pic -D" "pic" ++ do ++-# Extract the first word of "$ac_prog", so it can be a program name with args. +++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_PIC'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_prog_PIC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ if test -n "$PIC"; then ++ ac_cv_prog_PIC="$PIC" # Let the user override the test. ++ else ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_prog_PIC="$ac_prog" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_prog_PIC="$ac_prog" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ fi ++ fi ++-PIC="$ac_cv_prog_PIC" +++PIC=$ac_cv_prog_PIC ++ if test -n "$PIC"; then ++- echo "$ac_t""$PIC" 1>&6 +++ echo "$as_me:$LINENO: result: $PIC" >&5 +++echo "${ECHO_T}$PIC" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++-test -n "$PIC" && break +++ test -n "$PIC" && break ++ done ++ test -n "$PIC" || PIC="pic" ++ ++ ++-# Extract the first word of "gcc", so it can be a program name with args. +++ac_ext=c +++ac_cpp='$CPP $CPPFLAGS' +++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +++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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$CC"; then +++ ac_cv_prog_CC="$CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++fi +++fi +++CC=$ac_cv_prog_CC +++if test -n "$CC"; then +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++fi +++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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$ac_ct_CC"; then +++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++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 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ CC=$ac_ct_CC +++else +++ CC="$ac_cv_prog_CC" +++fi +++ +++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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++ else ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_prog_CC="gcc" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" ++- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ ++ fi ++ fi ++-CC="$ac_cv_prog_CC" +++CC=$ac_cv_prog_CC ++ if test -n "$CC"; then ++- echo "$ac_t""$CC" 1>&6 +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ +++fi +++if test -z "$ac_cv_prog_CC"; then +++ ac_ct_CC=$CC +++ # 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 +++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$ac_ct_CC"; then +++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +++else +++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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_prog_ac_ct_CC="cc" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done ++ ++-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++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 ++ else ++- cat > conftest.c <&5 | egrep yes >/dev/null 2>&1; then ++- ac_cv_prog_gcc=yes +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ CC=$ac_ct_CC ++ else ++- ac_cv_prog_gcc=no +++ CC="$ac_cv_prog_CC" ++ fi +++ ++ fi ++-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++-if test $ac_cv_prog_gcc = yes; then ++- GCC=yes ++- if test "${CFLAGS+set}" != set; then ++- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- echo 'void f(){}' > conftest.c ++-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ++- ac_cv_prog_gcc_g=yes +++ if test -n "$CC"; then +++ ac_cv_prog_CC="$CC" # Let the user override the test. +++else +++ ac_prog_rejected=no +++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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +++ ac_prog_rejected=yes +++ continue +++ fi +++ ac_cv_prog_CC="cc" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ +++if test $ac_prog_rejected = yes; then +++ # We found a bogon in the path, so make sure we never use it. +++ set dummy $ac_cv_prog_CC +++ shift +++ if test $# != 0; then +++ # We chose a different compiler from the bogus one. +++ # However, it has the same basename, so the bogon will be chosen +++ # first if we set CC to just the basename; use the full file name. +++ shift +++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +++ fi +++fi +++fi +++fi +++CC=$ac_cv_prog_CC +++if test -n "$CC"; then +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 ++ else ++- ac_cv_prog_gcc_g=no +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++fi +++if test -z "$CC"; then +++ if test -n "$ac_tool_prefix"; then +++ for ac_prog in cl +++ 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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$CC"; then +++ ac_cv_prog_CC="$CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++fi +++fi +++CC=$ac_cv_prog_CC +++if test -n "$CC"; then +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ test -n "$CC" && break +++ done +++fi +++if test -z "$CC"; then +++ ac_ct_CC=$CC +++ for ac_prog in cl +++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 +++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$ac_ct_CC"; then +++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++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 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ test -n "$ac_ct_CC" && break +++done +++ +++ CC=$ac_ct_CC ++ fi ++-rm -f conftest* ++ ++ fi ++- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 ++- if test $ac_cv_prog_gcc_g = yes; then ++- CFLAGS="-g -O" +++ +++ +++test -z "$CC" && { { 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 +++See \`config.log' for more details." >&2;} +++ { (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` +++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +++ (eval $ac_compiler --version &5) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } +++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +++ (eval $ac_compiler -v &5) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } +++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +++ (eval $ac_compiler -V &5) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } +++ +++cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++ +++ ; +++ return 0; +++} +++_ACEOF +++ac_clean_files_save=$ac_clean_files +++ac_clean_files="$ac_clean_files a.out 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[^ ]*//'` +++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +++ (eval $ac_link_default) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; then +++ # Find the output, starting from the most likely. This scheme is +++# not robust to junk in `.', hence go to wildcards (a.*) only as a last +++# resort. +++ +++# Be careful to initialize this variable, since it used to be cached. +++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +++ac_cv_exeext= +++# b.out is created by i960 compilers. +++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +++do +++ test -f "$ac_file" || continue +++ case $ac_file in +++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) +++ ;; +++ conftest.$ac_ext ) +++ # This is the source file. +++ ;; +++ [ab].out ) +++ # We found the default executable, but exeext='' is most +++ # certainly right. +++ break;; +++ *.* ) +++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +++ # FIXME: I believe we export ac_cv_exeext for Libtool, +++ # but it would be cool to find out if it's true. Does anybody +++ # maintain Libtool? --akim. +++ export ac_cv_exeext +++ break;; +++ * ) +++ break;; +++ esac +++done +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++{ { 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 +++See \`config.log' for more details." >&2;} +++ { (exit 77); exit 77; }; } +++fi +++ +++ac_exeext=$ac_cv_exeext +++echo "$as_me:$LINENO: result: $ac_file" >&5 +++echo "${ECHO_T}$ac_file" >&6 +++ +++# Check 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 +++# 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 +++ if { ac_try='./$ac_file' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ 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 ++- CFLAGS="-O" +++ { { 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. +++If you meant to cross compile, use \`--host'. +++See \`config.log' for more details." >&2;} +++ { (exit 1); exit 1; }; } ++ fi ++ fi +++fi +++echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6 +++ +++rm -f a.out a.exe conftest$ac_cv_exeext b.out +++ac_clean_files=$ac_clean_files_save +++# Check 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 +++ +++echo "$as_me:$LINENO: checking for suffix of executables" >&5 +++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +++ (eval $ac_link) 2>&5 +++ ac_status=$? +++ 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 +++# work properly (i.e., refer to `conftest.exe'), while it won't with +++# `rm'. +++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 | *.o | *.obj ) ;; +++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +++ export ac_cv_exeext +++ break;; +++ * ) break;; +++ esac +++done +++else +++ { { 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 +++See \`config.log' for more details." >&2;} +++ { (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 +++ +++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 +++if test "${ac_cv_objext+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++ +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.o conftest.obj +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +++ (eval $ac_compile) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; then +++ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do +++ case $ac_file in +++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; +++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +++ break;; +++ esac +++done +++else +++ 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 +++See \`config.log' for more details." >&5 +++echo "$as_me: error: cannot compute suffix of object files: cannot compile +++See \`config.log' for more details." >&2;} +++ { (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 +++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 +++if test "${ac_cv_c_compiler_gnu+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++#ifndef __GNUC__ +++ choke me +++#endif +++ +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ ac_compiler_gnu=yes +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++ac_compiler_gnu=no +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++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` +++ac_test_CFLAGS=${CFLAGS+set} +++ac_save_CFLAGS=$CFLAGS +++CFLAGS="-g" +++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +++if test "${ac_cv_prog_cc_g+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++ +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ ac_cv_prog_cc_g=yes +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++ac_cv_prog_cc_g=no +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++fi +++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +++echo "${ECHO_T}$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 +++ if test "$GCC" = yes; then +++ CFLAGS="-g -O2" +++ else +++ CFLAGS="-g" +++ fi +++else +++ if test "$GCC" = yes; then +++ CFLAGS="-O2" +++ else +++ CFLAGS= +++ fi +++fi +++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +++if test "${ac_cv_prog_cc_stdc+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ ac_cv_prog_cc_stdc=no +++ac_save_CC=$CC +++cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++#include +++#include +++#include +++#include +++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +++struct buf { int x; }; +++FILE * (*rcsopen) (struct buf *, struct stat *, int); +++static char *e (p, i) +++ char **p; +++ int i; +++{ +++ return p[i]; +++} +++static char *f (char * (*g) (char **, int), char **p, ...) +++{ +++ char *s; +++ va_list v; +++ va_start (v,p); +++ s = g (p, va_arg (v,int)); +++ va_end (v); +++ return s; +++} +++ +++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +++ function prototypes and stuff, but not '\xHH' hex character constants. +++ These don't provoke an error unfortunately, instead are silently treated +++ as 'x'. The following induces an error, until -std1 is added to get +++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +++ array size at least. It's necessary to write '\x00'==0 to get something +++ that's true only with -std1. */ +++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +++ +++int test (int i, double x); +++struct s1 {int (*f) (int a);}; +++struct s2 {int (*f) (double a);}; +++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +++int argc; +++char **argv; +++int +++main () +++{ +++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +++ ; +++ return 0; +++} +++_ACEOF +++# Don't try gcc -ansi; that turns off useful extensions and +++# breaks some systems' header files. +++# AIX -qlanglvl=ansi +++# Ultrix and OSF/1 -std1 +++# HP-UX 10.20 and later -Ae +++# HP-UX older versions -Aa -D_HPUX_SOURCE +++# SVR4 -Xc -D__EXTENSIONS__ +++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +++do +++ CC="$ac_save_CC $ac_arg" +++ rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ ac_cv_prog_cc_stdc=$ac_arg +++break +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++fi +++rm -f conftest.err conftest.$ac_objext +++done +++rm -f conftest.$ac_ext conftest.$ac_objext +++CC=$ac_save_CC +++ +++fi +++ +++case "x$ac_cv_prog_cc_stdc" in +++ x|xno) +++ echo "$as_me:$LINENO: result: none needed" >&5 +++echo "${ECHO_T}none needed" >&6 ;; +++ *) +++ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +++ CC="$CC $ac_cv_prog_cc_stdc" ;; +++esac +++ +++# Some people use a C++ compiler to compile C. Since we use `exit', +++# in C++ we need to declare it. In case someone uses the same compiler +++# for both compiling C and C++ we need to have the C++ compiler decide +++# the declaration of exit, since it's the most demanding environment. +++cat >conftest.$ac_ext <<_ACEOF +++#ifndef __cplusplus +++ choke me +++#endif +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ for ac_declaration in \ +++ '' \ +++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ +++ 'extern "C" void std::exit (int); using std::exit;' \ +++ 'extern "C" void exit (int) throw ();' \ +++ 'extern "C" void exit (int);' \ +++ 'void exit (int);' +++do +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++$ac_declaration +++#include +++int +++main () +++{ +++exit (42); +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ : ++ else ++- GCC= ++- test "${CFLAGS+set}" = set || CFLAGS="-g" +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++continue ++ fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++$ac_declaration +++int +++main () +++{ +++exit (42); +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ break +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++done +++rm -f conftest* +++if test -n "$ac_declaration"; then +++ echo '#ifdef __cplusplus' >>confdefs.h +++ echo $ac_declaration >>confdefs.h +++ echo '#endif' >>confdefs.h +++fi +++ +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++ac_ext=c +++ac_cpp='$CPP $CPPFLAGS' +++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ac_aux_dir= ++ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ++@@ -932,14 +2696,20 @@ ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break +++ elif test -f $ac_dir/shtool; then +++ ac_aux_dir=$ac_dir +++ ac_install_sh="$ac_aux_dir/shtool install -c" +++ break ++ fi ++ done ++ if test -z "$ac_aux_dir"; then ++- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } ++-fi ++-ac_config_guess=$ac_aux_dir/config.guess ++-ac_config_sub=$ac_aux_dir/config.sub ++-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +++echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} +++ { (exit 1); exit 1; }; } +++fi +++ac_config_guess="$SHELL $ac_aux_dir/config.guess" +++ac_config_sub="$SHELL $ac_aux_dir/config.sub" +++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ++ ++ # Find a good install program. We prefer a C program (faster), ++ # so one script is as good as another. But avoid the broken or ++@@ -948,274 +2718,1036 @@ ++ # SunOS /usr/etc/install ++ # IRIX /sbin/install ++ # AIX /bin/install +++# AmigaOS /C/install, which installs bootblocks on floppy discs +++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag ++ # AFS /usr/afsws/bin/install, which mishandles nonexistent args ++ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +++# OS/2's system install, which has a completely different semantic ++ # ./install, which can be erroneously created by make from ./install.sh. ++-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++ if test -z "$INSTALL"; then ++-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++if test "${ac_cv_path_install+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- # Account for people who put trailing slashes in PATH elements. ++- case "$ac_dir/" in ++- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++- *) ++- # OSF1 and SCO ODT 3.0 have their own names for install. ++- for ac_prog in ginstall installbsd scoinst install; do ++- if test -f $ac_dir/$ac_prog; then +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ # Account for people who put trailing slashes in PATH elements. +++case $as_dir/ in +++ ./ | .// | /cC/* | \ +++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ +++ /usr/ucb/* ) ;; +++ *) +++ # OSF1 and SCO ODT 3.0 have their own names for install. +++ # Don't use installbsd from OSF since it installs stuff as root +++ # by default. +++ for ac_prog in ginstall scoinst install; do +++ for ac_exec_ext in '' $ac_executable_extensions; do +++ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if test $ac_prog = install && ++- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then +++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++- # OSF/1 installbsd also uses dspmsg, but is usable. +++ : +++ elif test $ac_prog = install && +++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++- ac_cv_path_install="$ac_dir/$ac_prog -c" ++- break 2 +++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +++ break 3 ++ fi ++ fi ++ done ++- ;; ++- esac ++- done ++- IFS="$ac_save_ifs" ++- # As a last resort, use the slow shell script. ++- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" +++ done +++ ;; +++esac +++done +++ +++ ++ fi ++- INSTALL="$ac_cv_path_install" +++ if test "${ac_cv_path_install+set}" = set; then +++ INSTALL=$ac_cv_path_install +++ else +++ # As a last resort, use the slow shell script. We don't cache a +++ # path for INSTALL within a source directory, because that will +++ # break other packages using the cache if that directory is +++ # removed, or if the path is relative. +++ INSTALL=$ac_install_sh +++ fi ++ fi ++-echo "$ac_t""$INSTALL" 1>&6 +++echo "$as_me:$LINENO: result: $INSTALL" >&5 +++echo "${ECHO_T}$INSTALL" >&6 ++ ++ # Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++ # It thinks the first close brace ends the variable substitution. ++ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' ++ +++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +++ ++ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ++ ++-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ++-set dummy ${MAKE-make}; ac_make=$2 ++-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- cat > conftestmake <<\EOF +++ cat >conftest.make <<\_ACEOF ++ all: ++- @echo 'ac_maketemp="${MAKE}"' ++-EOF +++ @echo 'ac_maketemp="$(MAKE)"' +++_ACEOF ++ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` ++ if test -n "$ac_maketemp"; then ++ eval ac_cv_prog_make_${ac_make}_set=yes ++ else ++ eval ac_cv_prog_make_${ac_make}_set=no ++ fi ++-rm -f conftestmake +++rm -f conftest.make ++ fi ++ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then ++- echo "$ac_t""yes" 1>&6 +++ echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6 ++ SET_MAKE= ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ SET_MAKE="MAKE=${MAKE-make}" ++ fi ++ ++ ++-trap '' 1 2 15 ++-cat > confcache <<\EOF +++ ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile" +++cat >confcache <<\_ACEOF ++ # This file is a shell script that caches the results of configure ++ # tests run on this system so they can be shared between configure ++-# scripts and configure runs. It is not useful on other systems. ++-# If it contains results you don't want to keep, you may remove or edit it. +++# scripts and configure runs, see configure's option --config-cache. +++# It is not useful on other systems. If it contains results you don't +++# want to keep, you may remove or edit it. ++ # ++-# By default, configure uses ./config.cache as the cache file, ++-# creating it if it does not exist already. You can give configure ++-# the --cache-file=FILE option to use a different cache file; that is ++-# what configure does when it calls configure scripts in ++-# subdirectories, so they share the cache. ++-# Giving --cache-file=/dev/null disables caching, for debugging configure. ++-# config.status only pays attention to the cache file if you give it the ++-# --recheck option to rerun configure. +++# config.status only pays attention to the cache file if you give it +++# the --recheck option to rerun configure. ++ # ++-EOF +++# `ac_cv_env_foo' variables (set or unset) will be overridden when +++# loading this file, other *unset* `ac_cv_foo' will be assigned the +++# following values. +++ +++_ACEOF +++ +++# The following way of writing the cache mishandles newlines in values, +++# but we know of no workaround that is simple, portable, and efficient. +++# So, don't put newlines in cache variables' values. ++ # Ultrix sh set writes to stderr and can't be redirected directly, ++ # and sets the high bit in the cache file unless we assign to the vars. ++-(set) 2>&1 | ++- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ ++- >> confcache ++-if cmp -s $cache_file confcache; then ++- : ++-else +++{ +++ (set) 2>&1 | +++ case `(ac_space=' '; set | grep ac_space) 2>&1` in +++ *ac_space=\ *) +++ # `set' does not quote correctly, so add quotes (double-quote +++ # substitution turns \\\\ into \\, and sed turns \\ into \). +++ sed -n \ +++ "s/'/'\\\\''/g; +++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +++ ;; +++ *) +++ # `set' quotes correctly as required by POSIX, so do not add quotes. +++ sed -n \ +++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +++ ;; +++ esac; +++} | +++ sed ' +++ t clear +++ : clear +++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ +++ t end +++ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +++ : end' >>confcache +++if diff $cache_file confcache >/dev/null 2>&1; then :; else ++ if test -w $cache_file; then ++- echo "updating cache $cache_file" ++- cat confcache > $cache_file +++ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" +++ cat confcache >$cache_file ++ else ++ echo "not updating unwritable cache $cache_file" ++ fi ++ fi ++ rm -f confcache ++ ++-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 ++- ++ test "x$prefix" = xNONE && prefix=$ac_default_prefix ++ # Let make expand exec_prefix. ++ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' ++ ++-# Any assignment to VPATH causes Sun make to only execute ++-# the first set of double-colon rules, so remove it if not needed. ++-# If there is a colon in the path, we need to keep it. +++# VPATH may cause trouble with some makes, so we remove $(srcdir), +++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +++# trailing colons and then remove the whole line if VPATH becomes empty +++# (actually we leave an empty line to preserve line numbers). ++ if test "x$srcdir" = x.; then ++- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ +++s/:*\$(srcdir):*/:/; +++s/:*\${srcdir}:*/:/; +++s/:*@srcdir@:*/:/; +++s/^\([^=]*=[ ]*\):*/\1/; +++s/:*$//; +++s/^[^=]*=[ ]*$//; +++}' ++ fi ++ ++-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 ++- ++ # Transform confdefs.h into DEFS. ++ # Protect against shell expansion while executing Makefile rules. ++ # Protect against Makefile macro expansion. ++-cat > conftest.defs <<\EOF ++-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g ++-s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++-s%\[%\\&%g ++-s%\]%\\&%g ++-s%\$%$$%g ++-EOF ++-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++-rm -f conftest.defs +++# +++# If the first sed substitution is executed (which looks for macros that +++# take arguments), then we branch to the quote section. Otherwise, +++# look for a macro that doesn't take arguments. +++cat >confdef2opt.sed <<\_ACEOF +++t clear +++: clear +++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +++t quote +++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +++t quote +++d +++: quote +++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +++s,\[,\\&,g +++s,\],\\&,g +++s,\$,$$,g +++p +++_ACEOF +++# We use echo to avoid assuming a particular line-breaking character. +++# The extra dot is to prevent the shell from consuming trailing +++# line-breaks from the sub-command output. A line-break within +++# single-quotes doesn't work because, if this script is created in a +++# platform that uses two characters for line-breaks (e.g., DOS), tr +++# would break. +++ac_LF_and_DOT=`echo; echo .` +++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +++rm -f confdef2opt.sed +++ +++ +++ac_libobjs= +++ac_ltlibobjs= +++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue +++ # 1. Remove the extension, and $U if already installed. +++ ac_i=`echo "$ac_i" | +++ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +++ # 2. Add them. +++ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +++ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +++done +++LIBOBJS=$ac_libobjs ++ +++LTLIBOBJS=$ac_ltlibobjs ++ ++-# Without the "./", some shells look in PATH for config.status. ++-: ${CONFIG_STATUS=./config.status} ++ ++-echo creating $CONFIG_STATUS ++-rm -f $CONFIG_STATUS ++-cat > $CONFIG_STATUS <&5 +++echo "$as_me: creating $CONFIG_STATUS" >&6;} +++cat >$CONFIG_STATUS <<_ACEOF +++#! $SHELL +++# Generated by $as_me. ++ # Run this file to recreate the current configuration. ++-# This directory was configured as follows, ++-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++-# ++-# $0 $ac_configure_args ++-# ++ # Compiler output produced by configure, useful for debugging ++-# configure, is in ./config.log if it exists. +++# configure, is in config.log if it exists. ++ ++-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" ++-for ac_option +++debug=false +++ac_cs_recheck=false +++ac_cs_silent=false +++SHELL=\${CONFIG_SHELL-$SHELL} +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++## --------------------- ## +++## M4sh Initialization. ## +++## --------------------- ## +++ +++# Be Bourne compatible +++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 +++ # is contrary to our usage. Disable this feature. +++ alias -g '${1+"$@"}'='"$@"' +++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +++ set -o posix +++fi +++DUALCASE=1; export DUALCASE # for MKS sh +++ +++# Support unset when possible. +++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +++ as_unset=unset +++else +++ as_unset=false +++fi +++ +++ +++# Work around bugs in pre-3.0 UWIN ksh. +++$as_unset ENV MAIL MAILPATH +++PS1='$ ' +++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 +++ fi +++done +++ +++# Required to use basename. +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +++ as_basename=basename +++else +++ as_basename=false +++fi +++ +++ +++# Name of the executable. +++as_me=`$as_basename "$0" || +++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +++ X"$0" : 'X\(//\)$' \| \ +++ X"$0" : 'X\(/\)$' \| \ +++ . : '\(.\)' 2>/dev/null || +++echo X/"$0" | +++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +++ /^X\/\(\/\/\)$/{ s//\1/; q; } +++ /^X\/\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ +++ +++# PATH needs CR, and LINENO needs CR and PATH. +++# Avoid depending upon Character Ranges. +++as_cr_letters='abcdefghijklmnopqrstuvwxyz' +++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +++as_cr_Letters=$as_cr_letters$as_cr_LETTERS +++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=';' +++ else +++ PATH_SEPARATOR=: +++ fi +++ rm -f conf$$.sh +++fi +++ +++ +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" || { +++ # Find who we are. Look in the path if we contain no path at all +++ # relative or not. +++ case $0 in +++ *[\\/]* ) as_myself=$0 ;; +++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +++done +++ +++ ;; +++ esac +++ # We did not find ourselves, most probably we were run as `sh COMMAND' +++ # in which case we are not to be found in the path. +++ if test "x$as_myself" = x; then +++ as_myself=$0 +++ fi +++ if test ! -f "$as_myself"; then +++ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +++ { (exit 1); exit 1; }; } +++ fi +++ case $CONFIG_SHELL in +++ '') +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ for as_base in sh bash ksh sh5; do +++ case $as_dir in +++ /*) +++ if ("$as_dir/$as_base" -c ' +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +++ CONFIG_SHELL=$as_dir/$as_base +++ export CONFIG_SHELL +++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} +++ fi;; +++ esac +++ done +++done +++;; +++ esac +++ +++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +++ # uniformly replaced by the line number. The first 'sed' inserts a +++ # line-number line before each line; the second 'sed' does the real +++ # work. The second script uses 'N' to pair each line-number line +++ # with the numbered line, and appends trailing '-' during +++ # substitution so that $LINENO is not a special case at line end. +++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +++ sed '=' <$as_myself | +++ sed ' +++ N +++ s,$,-, +++ : loop +++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, +++ t loop +++ s,-$,, +++ s,^['$as_cr_digits']*\n,, +++ ' >$as_me.lineno && +++ chmod +x $as_me.lineno || +++ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +++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 +++ # (the dirname of $[0] is not the place where we might find the +++ # original and so on. Autoconf is especially sensible to this). +++ . ./$as_me.lineno +++ # Exit status is that of the last command. +++ exit +++} +++ +++ +++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +++ *c*,-n*) ECHO_N= ECHO_C=' +++' ECHO_T=' ' ;; +++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +++esac +++ +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++rm -f conf$$ conf$$.exe conf$$.file +++echo >conf$$.file +++if ln -s conf$$.file conf$$ 2>/dev/null; then +++ # We could just check for DJGPP; but this test a) works b) is more generic +++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +++ if test -f conf$$.exe; then +++ # Don't use ln at all; we don't have any links +++ as_ln_s='cp -p' +++ else +++ as_ln_s='ln -s' +++ fi +++elif ln conf$$.file conf$$ 2>/dev/null; then +++ as_ln_s=ln +++else +++ as_ln_s='cp -p' +++fi +++rm -f conf$$ conf$$.exe conf$$.file +++ +++if mkdir -p . 2>/dev/null; then +++ as_mkdir_p=: +++else +++ test -d ./-p && rmdir ./-p +++ as_mkdir_p=false +++fi +++ +++as_executable_p="test -f" +++ +++# Sed expression to map a string onto a valid CPP name. +++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +++ +++# Sed expression to map a string onto a valid variable name. +++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +++ +++ +++# IFS +++# We need space, tab and new line, in precisely that order. +++as_nl=' +++' +++IFS=" $as_nl" +++ +++# CDPATH. +++$as_unset CDPATH +++ +++exec 6>&1 +++ +++# Open the log real soon, to keep \$[0] and so on meaningful, and to +++# report actual input values of CONFIG_FILES etc. instead of their +++# values after options handling. Logging --version etc. is OK. +++exec 5>>config.log +++{ +++ echo +++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +++## Running $as_me. ## +++_ASBOX +++} >&5 +++cat >&5 <<_CSEOF +++ +++This file was extended by $as_me, which was +++generated by GNU Autoconf 2.59. Invocation command line was +++ +++ CONFIG_FILES = $CONFIG_FILES +++ CONFIG_HEADERS = $CONFIG_HEADERS +++ CONFIG_LINKS = $CONFIG_LINKS +++ CONFIG_COMMANDS = $CONFIG_COMMANDS +++ $ $0 $@ +++ +++_CSEOF +++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +++echo >&5 +++_ACEOF +++ +++# Files that config.status was made for. +++if test -n "$ac_config_files"; then +++ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +++fi +++ +++if test -n "$ac_config_headers"; then +++ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +++fi +++ +++if test -n "$ac_config_links"; then +++ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +++fi +++ +++if test -n "$ac_config_commands"; then +++ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +++fi +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++ +++ac_cs_usage="\ +++\`$as_me' instantiates files from templates according to the +++current configuration. +++ +++Usage: $0 [OPTIONS] [FILE]... +++ +++ -h, --help print this help, then exit +++ -V, --version print version number, then exit +++ -q, --quiet 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 +++ +++Configuration files: +++$config_files +++ +++Report bugs to ." +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<_ACEOF +++ac_cs_version="\\ +++config.status +++configured by $0, generated by GNU Autoconf 2.59, +++ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +++ +++Copyright (C) 2003 Free Software Foundation, Inc. +++This config.status script is free software; the Free Software Foundation +++gives unlimited permission to copy, distribute and modify it." +++srcdir=$srcdir +++INSTALL="$INSTALL" +++_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. +++ac_need_defaults=: +++while test $# != 0 ++ do ++- case "\$ac_option" in +++ case $1 in +++ --*=*) +++ ac_option=`expr "x$1" : 'x\([^=]*\)='` +++ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` +++ ac_shift=: +++ ;; +++ -*) +++ ac_option=$1 +++ ac_optarg=$2 +++ ac_shift=shift +++ ;; +++ *) # This is not an option, so the user has probably given explicit +++ # arguments. +++ ac_option=$1 +++ ac_need_defaults=false;; +++ esac +++ +++ case $ac_option in +++ # Handling of the options. +++_ACEOF +++cat >>$CONFIG_STATUS <<\_ACEOF ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" ++- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; ++- -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ++- echo "$CONFIG_STATUS generated by autoconf version 2.4" ++- exit 0 ;; ++- -help | --help | --hel | --he | --h) ++- echo "\$ac_cs_usage"; exit 0 ;; ++- *) echo "\$ac_cs_usage"; exit 1 ;; +++ ac_cs_recheck=: ;; +++ --version | --vers* | -V ) +++ echo "$ac_cs_version"; exit 0 ;; +++ --he | --h) +++ # Conflict between --help and --header +++ { { echo "$as_me:$LINENO: error: ambiguous option: $1 +++Try \`$0 --help' for more information." >&5 +++echo "$as_me: error: ambiguous option: $1 +++Try \`$0 --help' for more information." >&2;} +++ { (exit 1); exit 1; }; };; +++ --help | --hel | -h ) +++ echo "$ac_cs_usage"; exit 0 ;; +++ --debug | --d* | -d ) +++ debug=: ;; +++ --file | --fil | --fi | --f ) +++ $ac_shift +++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" +++ ac_need_defaults=false;; +++ --header | --heade | --head | --hea ) +++ $ac_shift +++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" +++ ac_need_defaults=false;; +++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +++ | -silent | --silent | --silen | --sile | --sil | --si | --s) +++ ac_cs_silent=: ;; +++ +++ # This is an error. +++ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +++Try \`$0 --help' for more information." >&5 +++echo "$as_me: error: unrecognized option: $1 +++Try \`$0 --help' for more information." >&2;} +++ { (exit 1); exit 1; }; } ;; +++ +++ *) ac_config_targets="$ac_config_targets $1" ;; +++ ++ esac +++ shift ++ done ++ ++-ac_given_srcdir=$srcdir ++-ac_given_INSTALL="$INSTALL" ++- ++-trap 'rm -fr `echo "Makefile man/Makefile src/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 ++- ++-# Protect against being on the right side of a sed subst in config.status. ++-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; ++- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF ++-$ac_vpsub ++-$extrasub ++-s%@CFLAGS@%$CFLAGS%g ++-s%@CPPFLAGS@%$CPPFLAGS%g ++-s%@CXXFLAGS@%$CXXFLAGS%g ++-s%@DEFS@%$DEFS%g ++-s%@LDFLAGS@%$LDFLAGS%g ++-s%@LIBS@%$LIBS%g ++-s%@exec_prefix@%$exec_prefix%g ++-s%@prefix@%$prefix%g ++-s%@program_transform_name@%$program_transform_name%g ++-s%@DIFF@%$DIFF%g ++-s%@DIFF_SUCCESS@%$DIFF_SUCCESS%g ++-s%@DIFF_FAILURE@%$DIFF_FAILURE%g ++-s%@DIFF_TROUBLE@%$DIFF_TROUBLE%g ++-s%@DIFFFLAGS@%$DIFFFLAGS%g ++-s%@DIFF_L@%$DIFF_L%g ++-s%@DIFF3@%$DIFF3%g ++-s%@DIFF3_BIN@%$DIFF3_BIN%g ++-s%@ED@%$ED%g ++-s%@SENDMAIL@%$SENDMAIL%g ++-s%@PIC@%$PIC%g ++-s%@CC@%$CC%g ++-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g ++-s%@INSTALL_DATA@%$INSTALL_DATA%g ++-s%@SET_MAKE@%$SET_MAKE%g +++ac_configure_extra_args= +++ +++if $ac_cs_silent; then +++ exec 6>/dev/null +++ ac_configure_extra_args="$ac_configure_extra_args --silent" +++fi +++ +++_ACEOF +++cat >>$CONFIG_STATUS <<_ACEOF +++if \$ac_cs_recheck; then +++ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +++ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +++fi +++ +++_ACEOF +++ +++ +++ +++ +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++for ac_config_target in $ac_config_targets +++do +++ case "$ac_config_target" in +++ # Handling of arguments. +++ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +++ "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; +++ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; +++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +++ { (exit 1); exit 1; }; };; +++ esac +++done +++ +++# If the user did not use the arguments to specify the items to instantiate, +++# then the envvar interface is used. Set only those that are not. +++# We use the long form for the default assignment because of an extremely +++# bizarre bug on SunOS 4.1.3. +++if $ac_need_defaults; then +++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +++fi +++ +++# Have a temporary directory for convenience. Make it in the build tree +++# simply because there is no reason to put it here, and in addition, +++# creating and moving files from /tmp can sometimes cause problems. +++# Create a temporary directory, and hook for its removal unless debugging. +++$debug || +++{ +++ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 +++ trap '{ (exit 1); exit 1; }' 1 2 13 15 +++} +++ +++# Create a (secure) tmp directory for tmp files. +++ +++{ +++ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && +++ test -n "$tmp" && test -d "$tmp" +++} || +++{ +++ tmp=./confstat$$-$RANDOM +++ (umask 077 && mkdir $tmp) +++} || +++{ +++ echo "$me: cannot create a temporary directory in ." >&2 +++ { (exit 1); exit 1; } +++} ++ +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<_ACEOF +++ +++# +++# CONFIG_FILES section. +++# +++ +++# No need to generate the scripts if there are no CONFIG_FILES. +++# This happens for instance when ./config.status config.h +++if test -n "\$CONFIG_FILES"; then +++ # Protect against being on the right side of a sed subst in config.status. +++ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +++ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +++s,@SHELL@,$SHELL,;t t +++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +++s,@exec_prefix@,$exec_prefix,;t t +++s,@prefix@,$prefix,;t t +++s,@program_transform_name@,$program_transform_name,;t t +++s,@bindir@,$bindir,;t t +++s,@sbindir@,$sbindir,;t t +++s,@libexecdir@,$libexecdir,;t t +++s,@datadir@,$datadir,;t t +++s,@sysconfdir@,$sysconfdir,;t t +++s,@sharedstatedir@,$sharedstatedir,;t t +++s,@localstatedir@,$localstatedir,;t t +++s,@libdir@,$libdir,;t t +++s,@includedir@,$includedir,;t t +++s,@oldincludedir@,$oldincludedir,;t t +++s,@infodir@,$infodir,;t t +++s,@mandir@,$mandir,;t t +++s,@build_alias@,$build_alias,;t t +++s,@host_alias@,$host_alias,;t t +++s,@target_alias@,$target_alias,;t t +++s,@DEFS@,$DEFS,;t t +++s,@ECHO_C@,$ECHO_C,;t t +++s,@ECHO_N@,$ECHO_N,;t t +++s,@ECHO_T@,$ECHO_T,;t t +++s,@LIBS@,$LIBS,;t t +++s,@DIFF@,$DIFF,;t t +++s,@DIFF_SUCCESS@,$DIFF_SUCCESS,;t t +++s,@DIFF_FAILURE@,$DIFF_FAILURE,;t t +++s,@DIFF_TROUBLE@,$DIFF_TROUBLE,;t t +++s,@DIFFFLAGS@,$DIFFFLAGS,;t t +++s,@DIFF_L@,$DIFF_L,;t t +++s,@DIFF3@,$DIFF3,;t t +++s,@DIFF3_BIN@,$DIFF3_BIN,;t t +++s,@ED@,$ED,;t t +++s,@SENDMAIL@,$SENDMAIL,;t t +++s,@PIC@,$PIC,;t t +++s,@CC@,$CC,;t t +++s,@CFLAGS@,$CFLAGS,;t t +++s,@LDFLAGS@,$LDFLAGS,;t t +++s,@CPPFLAGS@,$CPPFLAGS,;t t +++s,@ac_ct_CC@,$ac_ct_CC,;t t +++s,@EXEEXT@,$EXEEXT,;t t +++s,@OBJEXT@,$OBJEXT,;t t +++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +++s,@INSTALL_DATA@,$INSTALL_DATA,;t t +++s,@SET_MAKE@,$SET_MAKE,;t t +++s,@LIBOBJS@,$LIBOBJS,;t t +++s,@LTLIBOBJS@,$LTLIBOBJS,;t t ++ CEOF ++-EOF ++-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF ++-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then ++- # Support "outfile[:infile]", defaulting infile="outfile.in". ++- case "$ac_file" in ++- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` ++- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; ++- *) ac_file_in="${ac_file}.in" ;; ++- esac ++- ++- # Adjust relative srcdir, etc. for subdirectories. ++- ++- # Remove last slash and all that follows it. Not all systems have dirname. ++- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` ++- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then ++- # The file is in a subdirectory. ++- test ! -d "$ac_dir" && mkdir "$ac_dir" ++- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" ++- # A "../" for each directory in $ac_dir_suffix. ++- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` ++- else ++- ac_dir_suffix= ac_dots= +++_ACEOF +++ +++ cat >>$CONFIG_STATUS <<\_ACEOF +++ # Split the substitutions into bite-sized pieces for seds with +++ # small command number limits, like on Digital OSF/1 and HP-UX. +++ ac_max_sed_lines=48 +++ ac_sed_frag=1 # Number of current file. +++ ac_beg=1 # First line for current file. +++ ac_end=$ac_max_sed_lines # Line after last line for current file. +++ ac_more_lines=: +++ ac_sed_cmds= +++ while $ac_more_lines; do +++ if test $ac_beg -gt 1; then +++ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +++ else +++ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +++ fi +++ if test ! -s $tmp/subs.frag; then +++ ac_more_lines=false +++ else +++ # The purpose of the label and of the branching condition is to +++ # speed up the sed processing (if there are no `@' at all, there +++ # is no need to browse any of the substitutions). +++ # These are the two extra sed commands mentioned above. +++ (echo ':t +++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +++ if test -z "$ac_sed_cmds"; then +++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +++ else +++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +++ fi +++ ac_sed_frag=`expr $ac_sed_frag + 1` +++ ac_beg=$ac_end +++ ac_end=`expr $ac_end + $ac_max_sed_lines` +++ fi +++ done +++ if test -z "$ac_sed_cmds"; then +++ ac_sed_cmds=cat ++ fi +++fi # test -n "$CONFIG_FILES" +++ +++_ACEOF +++cat >>$CONFIG_STATUS <<\_ACEOF +++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +++ case $ac_file in +++ - | *:- | *:-:* ) # input from stdin +++ cat >$tmp/stdin +++ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +++ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +++ * ) ac_file_in=$ac_file.in ;; +++ esac ++ ++- case "$ac_given_srcdir" in ++- .) srcdir=. ++- if test -z "$ac_dots"; then top_srcdir=. ++- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; ++- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +++ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +++ ac_dir=`(dirname "$ac_file") 2>/dev/null || +++$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" | +++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } +++ /^X\(\/\/\)$/{ s//\1/; q; } +++ /^X\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ { if $as_mkdir_p; then +++ mkdir -p "$ac_dir" +++ else +++ as_dir="$ac_dir" +++ as_dirs= +++ while test ! -d "$as_dir"; do +++ as_dirs="$as_dir $as_dirs" +++ as_dir=`(dirname "$as_dir") 2>/dev/null || +++$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" | +++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } +++ /^X\(\/\/\)$/{ s//\1/; q; } +++ /^X\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ done +++ test ! -n "$as_dirs" || mkdir $as_dirs +++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +++ { (exit 1); exit 1; }; }; } +++ +++ ac_builddir=. +++ +++if test "$ac_dir" != .; then +++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +++ # A "../" for each directory in $ac_dir_suffix. +++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +++else +++ ac_dir_suffix= ac_top_builddir= +++fi +++ +++case $srcdir in +++ .) # No --srcdir option. We are building in place. +++ ac_srcdir=. +++ if test -z "$ac_top_builddir"; then +++ ac_top_srcdir=. +++ else +++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +++ fi ;; +++ [\\/]* | ?:[\\/]* ) # Absolute path. +++ ac_srcdir=$srcdir$ac_dir_suffix; +++ ac_top_srcdir=$srcdir ;; ++ *) # Relative path. ++- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" ++- top_srcdir="$ac_dots$ac_given_srcdir" ;; +++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +++ ac_top_srcdir=$ac_top_builddir$srcdir ;; +++esac +++ +++# Do not use `cd foo && pwd` to compute absolute paths, because +++# the directories may not exist. +++case `pwd` in +++.) ac_abs_builddir="$ac_dir";; +++*) +++ case "$ac_dir" in +++ .) ac_abs_builddir=`pwd`;; +++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +++ *) ac_abs_builddir=`pwd`/"$ac_dir";; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_builddir=${ac_top_builddir}.;; +++*) +++ case ${ac_top_builddir}. in +++ .) ac_abs_top_builddir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_srcdir=$ac_srcdir;; +++*) +++ case $ac_srcdir in +++ .) ac_abs_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_srcdir=$ac_top_srcdir;; +++*) +++ case $ac_top_srcdir in +++ .) ac_abs_top_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +++ esac;; +++esac +++ +++ +++ case $INSTALL in +++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +++ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ esac ++ ++- case "$ac_given_INSTALL" in ++- [/$]*) INSTALL="$ac_given_INSTALL" ;; ++- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++- esac ++- echo creating "$ac_file" ++- rm -f "$ac_file" ++- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." ++- case "$ac_file" in ++- *Makefile*) ac_comsub="1i\\ ++-# $configure_input" ;; ++- *) ac_comsub= ;; ++- esac ++- sed -e "$ac_comsub ++-s%@configure_input@%$configure_input%g ++-s%@srcdir@%$srcdir%g ++-s%@top_srcdir@%$top_srcdir%g ++-s%@INSTALL@%$INSTALL%g ++-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file ++-fi; done ++-rm -f conftest.subs +++ # 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. */ +++ if test x"$ac_file" = x-; then +++ configure_input= +++ else +++ configure_input="$ac_file. " +++ fi +++ configure_input=$configure_input"Generated from `echo $ac_file_in | +++ sed 's,.*/,,'` by configure." ++ +++ # First look for the input files in the build tree, otherwise in the +++ # src tree. +++ ac_file_inputs=`IFS=: +++ for f in $ac_file_in; do +++ case $f in +++ -) echo $tmp/stdin ;; +++ [\\/$]*) +++ # Absolute (can't be DOS-style, as IFS=:) +++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +++echo "$as_me: error: cannot find input file: $f" >&2;} +++ { (exit 1); exit 1; }; } +++ echo "$f";; +++ *) # Relative +++ if test -f "$f"; then +++ # Build tree +++ echo "$f" +++ elif test -f "$srcdir/$f"; then +++ # Source tree +++ echo "$srcdir/$f" +++ else +++ # /dev/null tree +++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +++echo "$as_me: error: cannot find input file: $f" >&2;} +++ { (exit 1); exit 1; }; } +++ fi;; +++ esac +++ done` || { (exit 1); exit 1; } ++ +++ if test x"$ac_file" != x-; then +++ { echo "$as_me:$LINENO: creating $ac_file" >&5 +++echo "$as_me: creating $ac_file" >&6;} +++ rm -f "$ac_file" +++ fi +++_ACEOF +++cat >>$CONFIG_STATUS <<_ACEOF +++ sed "$ac_vpsub +++$extrasub +++_ACEOF +++cat >>$CONFIG_STATUS <<\_ACEOF +++:t +++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +++s,@configure_input@,$configure_input,;t t +++s,@srcdir@,$ac_srcdir,;t t +++s,@abs_srcdir@,$ac_abs_srcdir,;t t +++s,@top_srcdir@,$ac_top_srcdir,;t t +++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +++s,@builddir@,$ac_builddir,;t t +++s,@abs_builddir@,$ac_abs_builddir,;t t +++s,@top_builddir@,$ac_top_builddir,;t t +++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +++s,@INSTALL@,$ac_INSTALL,;t t +++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +++ rm -f $tmp/stdin +++ if test x"$ac_file" != x-; then +++ mv $tmp/out $ac_file +++ else +++ cat $tmp/out +++ rm -f $tmp/out +++ fi ++ ++-exit 0 ++-EOF +++done +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++ +++{ (exit 0); exit 0; } +++_ACEOF ++ chmod +x $CONFIG_STATUS ++-rm -fr confdefs* $ac_clean_files ++-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +++ac_clean_files=$ac_clean_files_save +++ +++ +++# configure is writing to config.log, and then calls config.status. +++# config.status does its own redirection, appending to config.log. +++# Unfortunately, on DOS this fails, as config.log is still kept open +++# by configure, so config.status won't be able to write to it; its +++# output is simply discarded. So we exec the FD to /dev/null, +++# effectively closing config.log, so it can be properly (re)opened and +++# appended to by config.status. When coming back to configure, we +++# need to make the FD available again. +++if test "$no_create" != yes; then +++ ac_cs_success=: +++ ac_config_status_args= +++ test "$silent" = yes && +++ ac_config_status_args="$ac_config_status_args --quiet" +++ exec 5>/dev/null +++ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false +++ exec 5>>config.log +++ # Use ||, not &&, to avoid exiting from the if with $? = 1, which +++ # would make configure fail if this is the last instruction. +++ $ac_cs_success || { (exit 1); exit 1; } +++fi ++ ++--- rcs-5.7.orig/configure.in +++++ rcs-5.7/configure.in ++@@ -243,7 +243,7 @@ ++ AC_PATH_PROG(ED, ed, ed) ++ ++ ac_save_path=$PATH ++-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH +++PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH ++ AC_PATH_PROGS(SENDMAIL, sendmail mail mailx) ++ PATH=$ac_save_path ++ case $SENDMAIL in ++--- rcs-5.7.orig/src/rcs.c +++++ rcs-5.7/src/rcs.c ++@@ -916,10 +916,11 @@ ++ getkeystring(Klog); ++ if (nextdelta == cuttail) { ++ cb = savestring(&curlogbuf); ++- if (!delta->log.string) +++ if (delta && !delta->log.string) ++ delta->log = cleanlogmsg(curlogbuf.string, cb.size); ++ nextlex(); ++- delta->igtext = getphrases(Ktext); +++ if (delta) +++ delta->igtext = getphrases(Ktext); ++ } else { ++ if (nextdelta->log.string && nextdelta->selector) { ++ foutptr = 0; ++--- rcs-5.7.orig/src/rcsfreeze.sh +++++ rcs-5.7/src/rcsfreeze.sh ++@@ -59,8 +59,7 @@ ++ ++ # Stamp the logfile. Because we order the logfile the most recent ++ # first we will have to save everything right now in a temporary file. ++-TMPLOG=/tmp/rcsfrz$$ ++-trap 'rm -f $TMPLOG; exit 1' 1 2 13 15 +++TMPLOG=$(tempfile) ++ # Now ask for a log message, continously add to the log file ++ ( ++ echo "Version: $SYMREVNAME($SYMREV), Date: $DATE ++--- rcs-5.7.orig/src/rcsbase.h +++++ rcs-5.7/src/rcsbase.h ++@@ -358,6 +358,7 @@ ++ char const * lockedby; /* who locks the revision */ ++ char const * state; /* state of revision (Exp by default) */ ++ char const * name; /* name (if any) by which retrieved */ +++ char const * commitid; /* text string to associate commits */ ++ struct cbuf log; /* log message requested at checkin */ ++ struct branchhead * branches; /* list of first revisions on branches*/ ++ struct cbuf ig; /* ignored phrases in admin part */ ++@@ -662,6 +663,7 @@ ++ extern char const *const expand_names[]; ++ extern char const ++ Kaccess[], Kauthor[], Kbranch[], Kcomment[], +++ Kcommitid[], ++ Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[], ++ Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[]; ++ void unexpected_EOF P((void)) exiting; ++--- rcs-5.7.orig/src/rcssyn.c +++++ rcs-5.7/src/rcssyn.c ++@@ -171,6 +171,7 @@ ++ Kauthor[] = "author", ++ Kbranch[] = "branch", ++ Kcomment[] = "comment", +++ Kcommitid[] = "commitid", ++ Kdate[] = "date", ++ Kdesc[] = "desc", ++ Kexpand[] = "expand", ++@@ -433,6 +434,14 @@ ++ Delta->lockedby = 0; ++ Delta->log.string = 0; ++ Delta->selector = true; +++ +++ if (getkeyopt(Kcommitid)) { +++ Delta->commitid = NextString; +++ nextlex(); +++ getsemi(Kcommitid); +++ } else +++ Delta->commitid = NULL; +++ ++ Delta->ig = getphrases(Kdesc); ++ TotalDeltas++; ++ return (true); ++--- rcs-5.7.orig/src/rcsdiff.c +++++ rcs-5.7/src/rcsdiff.c ++@@ -212,9 +212,13 @@ ++ } ++ goto option_handled; ++ case '-': case 'D': ++- no_diff_means_no_output = false; +++ if (c == 'D' +++ || strcmp(*argv, "--side-by-side") == 0 +++ || strcmp(*argv, "--ifdef") == 0) { +++ no_diff_means_no_output = false; +++ } ++ /* fall into */ ++- case 'C': case 'F': case 'I': case 'L': case 'W': +++ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W': ++ #if DIFF_L ++ if (c == 'L' && ++file_labels == 2) ++ faterror("too many -L options"); ++--- rcs-5.7.orig/src/ident.c +++++ rcs-5.7/src/ident.c ++@@ -234,7 +234,7 @@ ++ if (c == EOF && feof(fp) | ferror(fp)) ++ return c; ++ switch (ctab[c]) { ++- case LETTER: case Letter: +++ case LETTER: case Letter: case DIGIT: ++ *tp++ = c; ++ if (tp < line+sizeof(line)-4) ++ break; ++--- rcs-5.7.orig/src/conf.sh +++++ rcs-5.7/src/conf.sh ++@@ -73,17 +73,6 @@ ++ ech='echo -n' dots='... ' ++ esac ++ ++-$ech >&3 "$0: testing permissions $dots" ++-rm -f a.d && ++-date >a.d && ++-chmod 0 a.d && ++-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { ++- echo >&3 "$n$0: This command should not be run with superuser permissions." ++- exit 1 ++-} ++-echo >&3 OK ++-rm -f a.d || exit ++- ++ $ech >&3 "$0: testing compiler for plausibility $dots" ++ echo 'main() { return 0; }' >a.c ++ rm -f a.exe a.out || exit ++--- rcs-5.7.orig/src/rcsgen.c +++++ rcs-5.7/src/rcsgen.c ++@@ -547,6 +547,9 @@ ++ ++ aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:""); ++ awrite(node->ig.string, node->ig.size, fout); +++ +++ if (node->commitid) +++ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid); ++ } ++ ++ ++--- rcs-5.7.orig/src/rcsfnms.c +++++ rcs-5.7/src/rcsfnms.c ++@@ -285,6 +285,9 @@ ++ { ++ char *p; ++ char const *t = tpnames[n]; +++# if has_mktemp +++ int fd; +++# endif ++ ++ if (t) ++ return t; ++@@ -296,10 +299,12 @@ ++ size_t tplen = dir_useful_len(tp); ++ p = testalloc(tplen + 10); ++ VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n); ++- if (!mktemp(p) || !*p) +++ fd = mkstemp(p); +++ if (fd < 0 || !*p) ++ faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'", ++ (int)tplen, tp, SLASH, '0'+n ++ ); +++ close(fd); ++ # else ++ static char tpnamebuf[TEMPNAMES][L_tmpnam]; ++ p = tpnamebuf[n]; ++--- rcs-5.7.orig/src/rcsedit.c +++++ rcs-5.7/src/rcsedit.c ++@@ -1503,6 +1503,9 @@ ++ register size_t dl; ++ register struct buf *bn; ++ register char const *name = isworkfile ? workname : RCSname; +++# if has_mktemp +++ int fd; +++# endif ++ ++ dl = basefilename(name) - name; ++ bn = &dirtpname[newRCSdirtp_index + isworkfile]; ++@@ -1521,10 +1524,12 @@ ++ catchints(); ++ # if has_mktemp ++ VOID strcpy(tp, "XXXXXX"); ++- if (!mktemp(np) || !*np) +++ fd = mkstemp(np); +++ if (fd < 0 || !*np) ++ faterror("can't make temporary pathname `%.*s_%cXXXXXX'", ++ (int)dl, name, '0'+isworkfile ++ ); +++ close(fd); ++ # else ++ /* ++ * Posix 1003.1-1990 has no reliable way ++--- rcs-5.7.orig/src/Makefile.in +++++ rcs-5.7/src/Makefile.in ++@@ -116,16 +116,18 @@ ++ for p in $(PROGRAMS); do \ ++ $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ ++ done +++ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze ++ ++ uninstall :: ++ for p in $(PROGRAMS); do \ ++ $(REMOVE) $(bindir)/$$p; \ ++ done +++ $(REMOVE) $(bindir)/rcsfreeze ++ ++ # Install RCS and (if applicable) GNU diff before running these tests. ++ # To test RCS before installing it, see the file INSTALL.RCS. ++ RCSTEST = \ ++- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \ +++ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \ ++ LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ ++ PATH=$(bindir):$$PATH \ ++ sh $(srcdir)/rcstest ++@@ -153,7 +155,7 @@ ++ #(Unix ++ conf.h : conf.sh Makefile ++ $(REMOVE) a.* ++- ALL_CFLAGS='$(ALL_CFLAGS)' \ +++ ALL_CFLAGS="$(ALL_CFLAGS)" \ ++ CC='$(CC)' \ ++ COMPAT2='$(COMPAT2)' \ ++ DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ ++--- rcs-5.7.orig/src/rlog.c +++++ rcs-5.7/src/rlog.c ++@@ -591,6 +591,10 @@ ++ aprintf(out, insDelFormat, ++ editscript->insertlns, editscript->deletelns); ++ +++ if ( node->commitid ) +++ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "", +++ node->commitid); +++ ++ newbranch = node->branches; ++ if ( newbranch ) { ++ bufautobegin(&branchnum); +diff --git a/feeds/packages/utils/rcs/patches/.svn/text-base/100-cross_compile.patch.svn-base b/feeds/packages/utils/rcs/patches/.svn/text-base/100-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..665ca0f +--- /dev/null ++++ b/feeds/packages/utils/rcs/patches/.svn/text-base/100-cross_compile.patch.svn-base +@@ -0,0 +1,413 @@ ++--- /dev/null +++++ b/src/conf.h ++@@ -0,0 +1,399 @@ +++/* RCS compile-time configuration */ +++ +++ /* $Id: conf.sh,v 5.25 1995/06/16 06:19:24 eggert Exp $ */ +++ +++/* +++ * This file is generated automatically. +++ * If you edit it by hand your changes may be lost. +++ * Instead, please try to fix conf.sh, +++ * and send your fixes to rcs-bugs@cs.purdue.edu. +++ */ +++ +++#define exitmain(n) return n /* how to exit from main() */ +++/* #define _POSIX_C_SOURCE 2147483647L */ /* if strict C + Posix 1003.1b-1993 or later */ +++/* #define _POSIX_SOURCE */ /* if strict C + Posix 1003.1-1990 */ +++ +++#include +++#include +++#include +++ +++/* Comment out #include lines below that do not work. */ +++#include +++#include +++#include +++#include +++#include +++/* #include */ +++/* #include */ +++#include +++/* #include */ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++/* #include */ +++ +++/* Define boolean symbols to be 0 (false, the default), or 1 (true). */ +++#define has_sys_param_h 1 /* Does #include work? */ +++/* extern int errno; */ /* Uncomment if doesn't declare errno. */ +++#define has_readlink 1 /* Does readlink() work? */ +++#define readlink_isreg_errno EINVAL /* errno after readlink on regular file */ +++ +++#if has_readlink && !defined(MAXSYMLINKS) +++# if has_sys_param_h +++# include +++# endif +++# ifndef MAXSYMLINKS +++# define MAXSYMLINKS 20 /* BSD; not standard yet */ +++# endif +++#endif +++ +++/* Comment out the typedefs below if the types are already declared. */ +++/* Fix any uncommented typedefs that are wrong. */ +++/* typedef int mode_t; */ +++/* typedef long off_t; */ +++/* typedef int pid_t; */ +++/* typedef int sig_atomic_t; */ +++/* typedef unsigned size_t; */ +++/* typedef int ssize_t; */ +++/* typedef long time_t; */ +++/* typedef int uid_t; */ +++ +++/* Comment out the keyword definitions below if the keywords work. */ +++/* #define const */ +++/* #define volatile */ +++ +++/* Define boolean symbols to be 0 (false, the default), or 1 (true). */ +++#define has_prototypes 1 /* Do function prototypes work? */ +++#define has_stdarg 1 /* Does work? */ +++/* #define has_varargs ? */ /* Does work? */ +++#define va_start_args 2 /* How many args does va_start() take? */ +++ +++#if O_BINARY +++ /* Text and binary i/o behave differently. */ +++ /* This is incompatible with Posix and Unix. */ +++# define FOPEN_RB "rb" +++# define FOPEN_R_WORK (Expand==BINARY_EXPAND ? "r" : "rb") +++# define FOPEN_WB "wb" +++# define FOPEN_W_WORK (Expand==BINARY_EXPAND ? "w" : "wb") +++# define FOPEN_WPLUS_WORK (Expand==BINARY_EXPAND ? "w+" : "w+b") +++# define OPEN_O_BINARY O_BINARY +++#else +++ /* +++ * Text and binary i/o behave the same. +++ * Omit "b", since some nonstandard hosts reject it. +++ */ +++# define FOPEN_RB "r" +++# define FOPEN_R_WORK "r" +++# define FOPEN_WB "w" +++# define FOPEN_W_WORK "w" +++# define FOPEN_WPLUS_WORK "w+" +++# define OPEN_O_BINARY 0 +++#endif +++ +++/* This may need changing on non-Unix systems (notably DOS). */ +++#define OPEN_CREAT_READONLY (S_IRUSR|S_IRGRP|S_IROTH) /* lock file mode */ +++#define OPEN_O_LOCK 0 /* extra open flags for creating lock file */ +++#define OPEN_O_WRONLY O_WRONLY /* main open flag for creating a lock file */ +++ +++/* Define or comment out the following symbols as needed. */ +++#if has_prototypes +++# define P(params) params +++#else +++# define P(params) () +++#endif +++#if has_stdarg +++# include +++#else +++# if has_varargs +++# include +++# else +++ typedef char *va_list; +++# define va_dcl int va_alist; +++# define va_start(ap) ((ap) = (va_list)&va_alist) +++# define va_arg(ap,t) (((t*) ((ap)+=sizeof(t))) [-1]) +++# define va_end(ap) +++# endif +++#endif +++#if va_start_args == 2 +++# define vararg_start va_start +++#else +++# define vararg_start(ap,p) va_start(ap) +++#endif +++#define bad_chmod_close 0 /* Can chmod() close file descriptors? */ +++#define bad_creat0 0 /* Do writes fail after creat(f,0)? */ +++#define bad_fopen_wplus 0 /* Does fopen(f,"w+") fail to truncate f? */ +++#define getlogin_is_secure 0 /* Is getlogin() secure? Usually it's not. */ +++#define has_attribute_noreturn 1 /* Does __attribute__((noreturn)) work? */ +++#if has_attribute_noreturn +++# define exiting __attribute__((noreturn)) +++#else +++# define exiting +++#endif +++#define has_dirent 1 /* Do opendir(), readdir(), closedir() work? */ +++#define void_closedir 0 /* Does closedir() yield void? */ +++#define has_fchmod 1 /* Does fchmod() work? */ +++#define has_fflush_input 1 /* Does fflush() work on input files? */ +++#define has_fputs 1 /* Does fputs() work? */ +++#define has_ftruncate 1 /* Does ftruncate() work? */ +++#define has_getuid 1 /* Does getuid() work? */ +++#define has_getpwuid 1 /* Does getpwuid() work? */ +++#define has_memcmp 1 /* Does memcmp() work? */ +++#define has_memcpy 1 /* Does memcpy() work? */ +++#define has_memmove 1 /* Does memmove() work? */ +++#define has_map_fd 0 /* Does map_fd() work? */ +++#define has_mmap 1 /* Does mmap() work on regular files? */ +++#define has_madvise 1 /* Does madvise() work? */ +++#define mmap_signal SIGBUS /* signal received if you reference nonexistent part of mmapped file */ +++#define has_rename 1 /* Does rename() work? */ +++#define bad_a_rename 0 /* Does rename(A,B) fail if A is unwritable? */ +++#define bad_b_rename 0 /* Does rename(A,B) fail if B is unwritable? */ +++#define bad_NFS_rename 0 /* Can rename(A,B) falsely report success? */ +++/* typedef int void; */ /* Some ancient compilers need this. */ +++#define VOID (void) /* 'VOID e;' discards the value of an expression 'e'. */ +++#define has_seteuid 1 /* Does seteuid() work? See ../INSTALL.RCS. */ +++#define has_setreuid 0 /* Does setreuid() work? See ../INSTALL.RCS. */ +++#define has_setuid 1 /* Does setuid() exist? */ +++#define has_sigaction 1 /* Does struct sigaction work? */ +++#define has_sa_sigaction 1 /* Does struct sigaction have sa_sigaction? */ +++#define has_signal 1 /* Does signal() work? */ +++#define signal_type void /* type returned by signal handlers */ +++#define sig_zaps_handler 0 /* Must a signal handler reinvoke signal()? */ +++/* #define has_sigblock ? */ /* Does sigblock() work? */ +++/* #define sigmask(s) (1 << ((s)-1)) */ /* Yield mask for signal number. */ +++typedef size_t fread_type; /* type returned by fread() and fwrite() */ +++typedef size_t freadarg_type; /* type of their size arguments */ +++typedef void *malloc_type; /* type returned by malloc() */ +++#define has_getcwd 1 /* Does getcwd() work? */ +++/* #define has_getwd ? */ /* Does getwd() work? */ +++#define needs_getabsname 0 /* Must we define getabsname? */ +++#define has_mktemp 1 /* Does mktemp() work? */ +++#define has_NFS 1 /* Might NFS be used? */ +++#define has_psiginfo 0 /* Does psiginfo() work? */ +++#define has_psignal 1 /* Does psignal() work? */ +++/* #define has_si_errno ? */ /* Does siginfo_t have si_errno? */ +++/* #define has_sys_siglist ? */ /* Does sys_siglist[] work? */ +++/* #define strchr index */ /* Use old-fashioned name for strchr()? */ +++/* #define strrchr rindex */ /* Use old-fashioned name for strrchr()? */ +++#define bad_unlink 0 /* Does unlink() fail on unwritable files? */ +++#define has_vfork 1 /* Does vfork() work? */ +++#define has_fork 1 /* Does fork() work? */ +++#define has_spawn 0 /* Does spawn*() work? */ +++#define has_waitpid 1 /* Does waitpid() work? */ +++#define bad_wait_if_SIGCHLD_ignored 1 /* Does ignoring SIGCHLD break wait()? */ +++#define RCS_SHELL "/bin/sh" /* shell to run RCS subprograms */ +++#define has_printf_dot 1 /* Does "%.2d" print leading 0? */ +++#define has_vfprintf 1 /* Does vfprintf() work? */ +++#define has_attribute_format_printf 1 /* Does __attribute__((format(printf,N,N+1))) work? */ +++#if has_attribute_format_printf +++# define printf_string(m, n) __attribute__((format(printf, m, n))) +++#else +++# define printf_string(m, n) +++#endif +++#if has_attribute_format_printf && has_attribute_noreturn +++ /* Work around a bug in GCC 2.5.x. */ +++# define printf_string_exiting(m, n) __attribute__((format(printf, m, n), noreturn)) +++#else +++# define printf_string_exiting(m, n) printf_string(m, n) exiting +++#endif +++/* #define has__doprintf ? */ /* Does _doprintf() work? */ +++/* #define has__doprnt ? */ /* Does _doprnt() work? */ +++/* #undef EXIT_FAILURE */ /* Uncomment this if EXIT_FAILURE is broken. */ +++#define large_memory 1 /* Can main memory hold entire RCS files? */ +++#ifndef LONG_MAX +++#define LONG_MAX 2147483647L /* long maximum */ +++#endif +++/* Do struct stat s and t describe the same file? Answer d if unknown. */ +++#define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) +++#define has_utimbuf 1 /* Does struct utimbuf work? */ +++#define CO "/usr/bin/co" /* name of 'co' program */ +++#define COMPAT2 0 /* Are version 2 files supported? */ +++#define DIFF "/usr/bin/diff" /* name of 'diff' program */ +++#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ +++#define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */ +++#define DIFFFLAGS "-an" /* Make diff output suitable for RCS. */ +++#define DIFF_L 1 /* Does diff -L work? */ +++#define DIFF_SUCCESS 0 /* DIFF status if no differences are found */ +++#define DIFF_FAILURE 1 /* DIFF status if differences are found */ +++#define DIFF_TROUBLE 2 /* DIFF status if trouble */ +++#define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ +++#define MERGE "/usr/bin/merge" /* name of 'merge' program */ +++#define TMPDIR "/tmp" /* default directory for temporary files */ +++#define SLASH '/' /* principal filename separator */ +++#define SLASHes '/' /* `case SLASHes:' labels all filename separators */ +++#define isSLASH(c) ((c) == SLASH) /* Is arg a filename separator? */ +++#define ROOTPATH(p) isSLASH((p)[0]) /* Is p an absolute pathname? */ +++#define X_DEFAULT ",v/" /* default value for -x option */ +++#define SLASHSLASH_is_SLASH 1 /* Are // and / the same directory? */ +++#define ALL_ABSOLUTE 1 /* Do all subprograms satisfy ROOTPATH? */ +++#define DIFF_ABSOLUTE 1 /* Is ROOTPATH(DIFF) true? */ +++#define SENDMAIL "/usr/sbin/sendmail" /* how to send mail */ +++#define TZ_must_be_set 0 /* Must TZ be set for gmtime() to work? */ +++ +++ +++ +++/* Adjust the following declarations as needed. */ +++ +++ +++/* The rest is for the benefit of non-standard, traditional hosts. */ +++/* Don't bother to declare functions that in traditional hosts do not appear, */ +++/* or are declared in .h files, or return int or void. */ +++ +++ +++/* traditional BSD */ +++ +++#if has_sys_siglist && !defined(sys_siglist) +++ extern char const * const sys_siglist[]; +++#endif +++ +++ +++/* Posix (ISO/IEC 9945-1: 1990 / IEEE Std 1003.1-1990) */ +++ +++/* */ +++#ifdef O_CREAT +++# define open_can_creat 1 +++#else +++# define open_can_creat 0 +++# define O_RDONLY 0 +++# define O_WRONLY 1 +++# define O_RDWR 2 +++# define O_CREAT 01000 +++# define O_TRUNC 02000 +++#endif +++#ifndef O_EXCL +++#define O_EXCL 0 +++#endif +++ +++/* */ +++#ifndef S_IRUSR +++# ifdef S_IREAD +++# define S_IRUSR S_IREAD +++# else +++# define S_IRUSR 0400 +++# endif +++# ifdef S_IWRITE +++# define S_IWUSR S_IWRITE +++# else +++# define S_IWUSR (S_IRUSR/2) +++# endif +++#endif +++#ifndef S_IRGRP +++# if has_getuid +++# define S_IRGRP (S_IRUSR / 0010) +++# define S_IWGRP (S_IWUSR / 0010) +++# define S_IROTH (S_IRUSR / 0100) +++# define S_IWOTH (S_IWUSR / 0100) +++# else +++ /* single user OS -- not Posix or Unix */ +++# define S_IRGRP 0 +++# define S_IWGRP 0 +++# define S_IROTH 0 +++# define S_IWOTH 0 +++# endif +++#endif +++#ifndef S_ISREG +++#define S_ISREG(n) (((n) & S_IFMT) == S_IFREG) +++#endif +++ +++/* */ +++#ifndef WEXITSTATUS +++#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +++#undef WIFEXITED /* Avoid 4.3BSD incompatibility with Posix. */ +++#endif +++#ifndef WIFEXITED +++#define WIFEXITED(stat_val) (((stat_val) & 0377) == 0) +++#endif +++#ifndef WTERMSIG +++#define WTERMSIG(stat_val) ((stat_val) & 0177) +++#undef WIFSIGNALED /* Avoid 4.3BSD incompatibility with Posix. */ +++#endif +++#ifndef WIFSIGNALED +++#define WIFSIGNALED(stat_val) ((unsigned)(stat_val) - 1 < 0377) +++#endif +++ +++/* */ +++char *getlogin P((void)); +++#ifndef STDIN_FILENO +++# define STDIN_FILENO 0 +++# define STDOUT_FILENO 1 +++# define STDERR_FILENO 2 +++#endif +++#if has_fork && !has_vfork +++# undef vfork +++# define vfork fork +++#endif +++#if has_getcwd || !has_getwd +++ char *getcwd P((char*,size_t)); +++#else +++ char *getwd P((char*)); +++#endif +++#if has_setuid && !has_seteuid +++# undef seteuid +++# define seteuid setuid +++#endif +++#if has_spawn +++# if ALL_ABSOLUTE +++# define spawn_RCS spawnv +++# else +++# define spawn_RCS spawnvp +++# endif +++#else +++# if ALL_ABSOLUTE +++# define exec_RCS execv +++# else +++# define exec_RCS execvp +++# endif +++#endif +++ +++/* utime.h */ +++#if !has_utimbuf +++ struct utimbuf { time_t actime, modtime; }; +++#endif +++ +++ +++/* Standard C library */ +++ +++/* */ +++#ifndef L_tmpnam +++#define L_tmpnam 32 /* power of 2 > sizeof("/usr/tmp/xxxxxxxxxxxxxxx") */ +++#endif +++#ifndef SEEK_SET +++#define SEEK_SET 0 +++#endif +++#ifndef SEEK_CUR +++#define SEEK_CUR 1 +++#endif +++#if has_mktemp +++ char *mktemp P((char*)); /* traditional */ +++#else +++ char *tmpnam P((char*)); +++#endif +++ +++/* */ +++char *getenv P((char const*)); +++void _exit P((int)) exiting; +++void exit P((int)) exiting; +++malloc_type malloc P((size_t)); +++malloc_type realloc P((malloc_type,size_t)); +++#ifndef EXIT_FAILURE +++#define EXIT_FAILURE 1 +++#endif +++#ifndef EXIT_SUCCESS +++#define EXIT_SUCCESS 0 +++#endif +++ +++/* */ +++char *strcpy P((char*,char const*)); +++char *strchr P((char const*,int)); +++char *strrchr P((char const*,int)); +++void *memcpy P((void*,void const*,size_t)); +++#if has_memmove +++ void *memmove P((void*,void const*,size_t)); +++#endif +++ +++/* */ +++time_t time P((time_t*)); ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -153,7 +153,7 @@ ++ $(REMOVE) TAGS ++ ++ #(Unix ++-conf.h : conf.sh Makefile +++conf.h : ++ $(REMOVE) a.* ++ ALL_CFLAGS="$(ALL_CFLAGS)" \ ++ CC='$(CC)' \ +diff --git a/feeds/packages/utils/rcs/patches/000-debian.patch b/feeds/packages/utils/rcs/patches/000-debian.patch +new file mode 100644 +index 0000000..96df338 +--- /dev/null ++++ b/feeds/packages/utils/rcs/patches/000-debian.patch +@@ -0,0 +1,4879 @@ ++--- rcs-5.7.orig/debian/rules +++++ rcs-5.7/debian/rules ++@@ -0,0 +1,91 @@ +++#!/usr/bin/make -f +++# Derived from: Sample debian.rules file - for GNU Hello (1.3). +++# Copyright 1994,1995 by Ian Jackson. +++# I hereby give you perpetual unlimited permission to copy, +++# modify and relicense this file, provided that you do not remove +++# my name from the file itself. (I assert my moral right of +++# paternity under the Copyright, Designs and Patents Act 1988.) +++# This file may have to be extensively modified +++ +++# There used to be `source' and `diff' targets in this file, and many +++# packages also had `changes' and `dist' targets. These functions +++# have been taken over by dpkg-source, dpkg-genchanges and +++# dpkg-buildpackage in a package-independent way, and so these targets +++# are obsolete. +++ +++package=rcs +++ +++CFLAGS = -g +++ +++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +++CFLAGS += -O0 +++else +++CFLAGS += -O2 +++endif +++ +++# The next section may have to be extensively modified +++ +++build: +++ $(checkdir) +++ ./configure --prefix=/usr --with-diffutils +++ $(MAKE) CFLAGS="$(CFLAGS)" +++ groff -t -p -Tps -ms rcs.ms >rcs.ps +++ touch build +++ +++clean: +++ $(checkdir) +++ -rm -f build +++ [ ! -f Makefile ] || $(MAKE) -i distclean +++ -rm -f *.ps man/index.db man/rcsfile.5 +++ -rm -rf debian/tmp debian/*~ debian/files autom4te.cache \ +++ debian/substvars +++ +++binary-indep: checkroot build +++ $(checkdir) +++# There are no architecture-independent files to be uploaded +++# generated by this package. If there were any they would be +++# made here. +++ +++binary-arch: checkroot build +++ -rm -rf debian/tmp +++ install -d debian/tmp/DEBIAN +++ install -d debian/tmp/usr/share/doc/$(package) +++ $(MAKE) prefix=`pwd`/debian/tmp/usr install +++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +++ for f in debian/tmp/usr/bin/*; do \ +++ strip -s -R.comment $$f; \ +++ done +++endif +++ cp debian/copyright debian/tmp/usr/share/doc/$(package)/ +++ cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian +++ cp ChangeLog debian/tmp/usr/share/doc/$(package)/changelog +++ gzip -9f debian/tmp/usr/share/doc/$(package)/changelog* +++ cp *.ps debian/tmp/usr/share/doc/$(package)/ +++ gzip -9f debian/tmp/usr/share/doc/$(package)/*.ps +++ mv debian/tmp/usr/man debian/tmp/usr/share/man +++ gzip -9f debian/tmp/usr/share/man/man*/* +++ (cd debian/tmp; find . -type f ! -regex '.*/DEBIAN/.*' \ +++ -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums) +++ dpkg-shlibdeps src/rcs +++ dpkg-gencontrol -isp +++ chown -R root.root debian/tmp +++ chmod -R u+w debian/tmp +++ chmod -R g-ws debian/tmp +++ dpkg --build debian/tmp .. +++ +++define checkdir +++ test -f man/rcs.1 +++endef +++ +++# Below here is fairly generic really +++ +++binary: binary-indep binary-arch +++ +++source diff: +++ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false +++ +++checkroot: +++ $(checkdir) +++ test root = "`whoami`" +++ +++.PHONY: binary binary-arch binary-indep clean checkroot ++--- rcs-5.7.orig/debian/control +++++ rcs-5.7/debian/control ++@@ -0,0 +1,16 @@ +++Source: rcs +++Section: devel +++Priority: optional +++Maintainer: Romain Francoise +++Standards-Version: 3.7.2 +++Build-Depends: groff, autoconf +++ +++Package: rcs +++Architecture: any +++Depends: ${shlibs:Depends} +++Description: The GNU Revision Control System +++ The Revision Control System (RCS) manages multiple +++ revisions of files. RCS automates the storing, retrieval, +++ logging, identification, and merging of revisions. RCS is +++ useful for text that is revised frequently, for example +++ programs, documentation, graphics, papers, and form letters. ++--- rcs-5.7.orig/debian/copyright +++++ rcs-5.7/debian/copyright ++@@ -0,0 +1,28 @@ +++This is Debian GNU/Linux's prepackaged version of the FSF's Revision +++Control System (RCS) utilities. These utilities allow you to keep +++multiple revisions of one or more files in a very compact manner. RCS +++is similar to, and in most respects better than, the non-free Source +++Code Control System (SCCS). +++ +++This package was assembled by Sven Rudolph +++from the GNU sources available from prep.ai.mit.edu (and its numerous +++mirrors) as /pub/gnu/rcs-5.7.tar.gz. It is currently maintained by +++Romain Francoise . +++ +++The upstream URL is: http://www.gnu.org/software/rcs/ +++ +++Copyright (C) 1991,1992,1993 Free Software Foundation, Inc. +++ +++RCS 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, or (at your option) +++any later version. +++ +++RCS 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. +++ +++On Debian GNU/Linux systems, the complete text of the GNU General +++Public License can be found in `/usr/share/common-licenses/GPL'. +++ ++--- rcs-5.7.orig/debian/changelog +++++ rcs-5.7/debian/changelog ++@@ -0,0 +1,216 @@ +++rcs (5.7-20) unstable; urgency=low +++ +++ * debian/control: Add support for DEB_BUILD_OPTIONS (closes: #437885). +++ +++ -- Romain Francoise Tue, 14 Aug 2007 21:24:54 +0200 +++ +++rcs (5.7-19) unstable; urgency=low +++ +++ * debian/control: Bump Standards-Version to 3.7.2, no changes needed. +++ * debian/copyright: Mention the current upstream URL (closes: #436739). +++ * debian/rules: +++ + Don't ignore errors from 'make distclean'. +++ + Generate DEBIAN/md5sums. +++ * Apply patch from Brendan O'Dea adding support for +++ diff's '-U' option to rcsdiff (closes: #428445). +++ +++ -- Romain Francoise Sun, 12 Aug 2007 18:40:04 +0200 +++ +++rcs (5.7-18) unstable; urgency=low +++ +++ * Apply patch from Mark D. Baushke adding support for the +++ new 'commitid' phrase used by newer version of CVS and CVSNT. Note +++ that this patch does not include support for *generating* the ids at +++ check in time; it only makes RCS recognize them (closes: #352527). +++ +++ -- Romain Francoise Tue, 14 Feb 2006 22:41:33 +0100 +++ +++rcs (5.7-17) unstable; urgency=low +++ +++ * Apply patch from Aaron S. Hawley making the diff strategy of rcsdiff a +++ bit more subtle: previously rcsdiff considered any long option as a +++ case where diff(1) can produce output when the revisions are +++ identical, when in fact it is only the case if either the +++ --side-by-side or --ifdef options are used (closes: #334004). +++ +++ * Patch man/co.1 to not use 'asteriskmath', thanks to LI Daobing +++ (closes: #345507). +++ +++ * debian/control: Bump Standards-Version to 3.6.2.2, no changes needed. +++ * debian/changelog: Change formatting of entries from 1995 and 1996 to +++ avoid lintian warnings. +++ * debian/rules: `install' no longer strips .comment sections from +++ binaries (since version 5.93-1), so revert previous fix and strip these +++ sections manually. +++ +++ -- Romain Francoise Sun, 5 Feb 2006 16:34:21 +0100 +++ +++rcs (5.7-16) unstable; urgency=low +++ +++ * Tenth anniversary release: RCS 5.7 was released on June 16th, 1995. +++ +++ * rcs.c: Check delta pointer in scanlogtext() before dereferencing it to +++ prevent a segmentation fault in some rare cases (discovered while +++ investigating #69193). +++ +++ * Ship docs in PostScript format (instead of DVI). Drop the ``Functions +++ of RCS'' paper since it's quite obsolete nowadays. +++ +++ * debian/rules: Delete substvars file in clean target. +++ * debian/changelog: Facelift previous entry. +++ +++ -- Romain Francoise Thu, 16 Jun 2005 08:14:01 +0200 +++ +++rcs (5.7-15) unstable; urgency=low +++ +++ * Adopting this package with Mark's blessing. +++ * debian/control: +++ + Bump Standard-Version to 3.6.1.0. +++ + Update maintainer contact info. +++ * debian/copyright: Ditto. +++ * debian/rules: +++ + Adjust CFLAGS to include -g and remove useless -I directive. +++ + Remove LDFLAGS. +++ +++ * Patch upstream Makefile.in to use install -s (which has the nice +++ effect of also deleting .comment sections from the binaries). +++ +++ * Patch man/rlog.1 to document option -q which does nothing, it's +++ provided for consistency with other commands (closes: #69257). +++ +++ * Remove a few unneeded files from the Debian diff (.orig files, Emacs +++ lock files). +++ +++ -- Romain Francoise Wed, 11 May 2005 17:51:01 +0200 +++ +++rcs (5.7-14) unstable; urgency=high +++ +++ * Fixes tmp file race (patch from OpenBSD) (Closes: #291542) +++ +++ -- Mark Baker Fri, 21 Jan 2005 18:16:20 +0000 +++ +++rcs (5.7-13.3) unstable; urgency=high +++ +++ * NMU +++ * Add build-dep on autoconf. Closes: #246566. +++ * Fix up quoting in src/Makefile.in to make $SHELL not complain, as \" +++ is not interpolated inside single-quoted strings. +++ * Make ident accept numbers as well as letters in identifiers. +++ Closes: #157891 +++ * Remove emacs variables from the changelog as they are no longer +++ needed. +++ * Add -isp to the dpkg-gencontrol call in debian/rules to get Section +++ and Priority included. Closes: #190383. +++ +++ -- Tollef Fog Heen Thu, 29 Jul 2004 19:09:32 +0200 +++ +++rcs (5.7-13.2) unstable; urgency=low +++ +++ * NMU +++ * can build now as root. Closes: #249106 +++ * priority dumped down to optional. Closes: #64438 +++ * fixed spelling error in debian/copyright, and location of the GPL. +++ +++ -- Andreas Barth Wed, 26 May 2004 22:21:05 +0200 +++ +++rcs (5.7-13.1) unstable; urgency=low +++ +++ * NMU. +++ * Rebuild so that the .dsc file will have Build-Depends. +++ Closes: #187853, #176344. +++ * Remove /usr/doc symlink. +++ +++ -- Daniel Schepler Mon, 28 Jul 2003 16:28:32 -0700 +++ +++rcs (5.7-13) unstable; urgency=low +++ +++ * debian/rules: install docs and manpages in /usr/share, as in FHS +++ * debian/control: standards version 3.1.0 +++ * debian/rules: format docs into dvi instead of leaving groff source. I +++ chose dvi as it is easier to view on screen than PS (Closes: 42277) +++ +++ -- Mark Baker Sun, 28 Nov 1999 18:31:21 +0000 +++ +++rcs (5.7-12) unstable; urgency=low +++ +++ * man/Makefile: use sed filter to fix .lf requests on output of pic, +++ so zsoelim doesn't complain about them (#26150) +++ * debian/rules: clean target deletes rcsfile.5 so it is always rebuilt +++ using fix above +++ +++ -- Mark Baker Mon, 5 Jul 1999 23:24:17 +0100 +++ +++rcs (5.7-11) unstable; urgency=low +++ +++ * Fixed temp file security hole in rcsfreeze script (#27845) +++ +++ -- Mark Baker Wed, 14 Oct 1998 22:43:47 +0100 +++ +++rcs (5.7-10) unstable; urgency=low +++ +++ * Included rcsfreeze script (#26743) +++ +++ -- Mark Baker Wed, 16 Sep 1998 20:57:00 +0000 +++ +++rcs (5.7-9) unstable; urgency=low +++ +++ * Fixed permissions +++ +++ -- Mark Baker Mon, 16 Feb 1998 00:07:52 +0000 +++ +++rcs (5.7-8) unstable; urgency=low +++ +++ * Updated standards-version to 2.4.0.0 (no changes) +++ +++ -- Mark Baker Tue, 10 Feb 1998 10:54:36 +0000 +++ +++rcs (5.7-7) unstable; urgency=low +++ +++ * Corrected maintainer field in debian/control +++ * Flushed configure cache and recompiled, to fix bug #11305/#11308) +++ +++ -- Mark Baker Thu, 17 Jul 1997 10:54:36 +0100 +++ +++rcs (5.7-6) unstable; urgency=low +++ +++ * Renamed changelog.upstream to changelog, as per policy (fixes #9657) +++ +++ -- Mark Baker Sat, 12 Jul 1997 16:55:37 +0100 +++ +++rcs (5.7-5) unstable; urgency=low +++ +++ * New maintainer +++ * Compiled with libc6 +++ * Use canonical path for sendmail (configure.in changed) +++ +++ -- Mark Baker Fri, 11 Jul 1997 21:24:48 +0100 +++ +++rcs (5.7-4) unstable; urgency=low +++ +++ * Updated to Standards-Version 2.1.2.2. +++ +++ -- Sven Rudolph Sun, 26 Jan 1997 22:34:57 +0100 +++ +++rcs (5.7-3) unstable; urgency=low +++ +++ * debian.rules: added multi-architecture support +++ +++ * debian.control: added Priority: and Section: +++ +++ * debian.control: corrected extended description (Bug#3619) +++ +++ -- Sven Rudolph Wed, 24 Jul 1996 23:48:20 +0100 +++ +++rcs (5.7-2) unstable; urgency=low +++ +++ * rebuilt for elf +++ +++ -- Sven Rudolph Thu, 23 Nov 1995 23:27:13 +0100 +++ +++rcs (5.7-1) unstable; urgency=low +++ +++ * created new Debian GNU/Linux package maintenance system files +++ * updated from rcs5.6.0.1 to rcs-5.7 +++ * received this package from Robert Sanders +++ +++ -- Sven Rudolph Tue, 5 Sep 1995 04:38:07 +0100 ++--- rcs-5.7.orig/man/co.1 +++++ rcs-5.7/man/co.1 ++@@ -597,7 +597,7 @@ ++ .RB \*(lq "//\ " \*(rq. ++ This is useful for languages with comments that go to the end of the line. ++ The convention for other languages is to use a ++-.RB \*(lq " \(** " \(rq +++.RB \*(lq " * " \(rq ++ prefix inside a multiline comment. ++ For example, the initial log comment of a C program ++ conventionally is of the following form: ++@@ -606,19 +606,19 @@ ++ .nf ++ .ft 3 ++ .ne 3 ++-/\(** +++/* ++ .in +\w'/'u ++-\(** $\&Log$ ++-\(**/ +++* $\&Log$ +++*/ ++ .in ++ .ft ++ .fi ++ .RE ++ .LP ++ For backwards compatibility with older versions of \*r, if the log prefix is ++-.B /\(** +++.B /* ++ or ++-.B (\(** +++.B (* ++ surrounded by optional white space, inserted log lines contain a space ++ instead of ++ .B / ++--- rcs-5.7.orig/man/rlog.1 +++++ rcs-5.7/man/rlog.1 ++@@ -187,6 +187,10 @@ ++ .I logins ++ is omitted, the user's login is assumed. ++ .TP +++.B \-q +++This option has no effect; +++it is provided for consistency with other commands. +++.TP ++ .B \-T ++ This option has no effect; ++ it is present for compatibility with other \*r commands. ++--- rcs-5.7.orig/man/rcsfile.5in +++++ rcs-5.7/man/rcsfile.5in ++@@ -68,6 +68,7 @@ ++ \f3state\fP {\f2id\fP}\f3;\fP ++ \f3branches\fP {\f2num\fP}*\f3;\fP ++ \f3next\fP {\f2num\fP}\f3;\fP +++ { \f3commitid\fP \f2id\fP\f3;\fP } ++ { \f2newphrase\fP }* ++ .LP ++ \f2desc\fP ::= \f3desc\fP \f2string\fP ++@@ -127,6 +128,18 @@ ++ Dates use the Gregorian calendar; times use UTC. ++ .PP ++ The +++.I commitid +++is followed by an +++.I id +++token. This token is intended to be unique across +++multiple files and is used to help group files as +++being a part of the same logical commit. +++This token must uniquely identify the commit +++operation that was applied to a set of RCS files. +++In particular, it must be unique among all the +++commitids in this file. +++.PP +++The ++ .I newphrase ++ productions in the grammar are reserved for future extensions ++ to the format of \*r files. ++--- rcs-5.7.orig/man/Makefile.in +++++ rcs-5.7/man/Makefile.in ++@@ -44,14 +44,16 @@ ++ all default :: rcsfile.5 ++ ++ rcsfile.5 : rcsfile.5in ++- $(PIC) $(PICFLAGS) $(srcdir)/$@in >$@ +++ $(PIC) $(PICFLAGS) $(srcdir)/$@in \ +++ | sed "s%\.lf \([0-9]*\)%\.lf \1 foo%" >$@ ++ ++ check dvi info TAGS :: ++ ++ installdirs :: ../mkinstalldirs ++ -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir) ++ ++-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog +++man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \ +++ rcsfreeze ++ ++ install :: installdirs ++ -for m in $(man1pages); do \ ++--- rcs-5.7.orig/configure +++++ rcs-5.7/configure ++@@ -1,28 +1,288 @@ ++ #! /bin/sh ++- ++ # Guess values for system-dependent variables and create Makefiles. ++-# Generated automatically using autoconf version 2.4 ++-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +++# Generated by GNU Autoconf 2.59. ++ # +++# Copyright (C) 2003 Free Software Foundation, Inc. ++ # This configure script is free software; the Free Software Foundation ++ # gives unlimited permission to copy, distribute and modify it. +++## --------------------- ## +++## M4sh Initialization. ## +++## --------------------- ## +++ +++# Be Bourne compatible +++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 +++ # is contrary to our usage. Disable this feature. +++ alias -g '${1+"$@"}'='"$@"' +++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +++ set -o posix +++fi +++DUALCASE=1; export DUALCASE # for MKS sh +++ +++# Support unset when possible. +++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +++ as_unset=unset +++else +++ as_unset=false +++fi +++ +++ +++# Work around bugs in pre-3.0 UWIN ksh. +++$as_unset ENV MAIL MAILPATH +++PS1='$ ' +++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 +++ fi +++done +++ +++# Required to use basename. +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +++ as_basename=basename +++else +++ as_basename=false +++fi +++ +++ +++# Name of the executable. +++as_me=`$as_basename "$0" || +++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +++ X"$0" : 'X\(//\)$' \| \ +++ X"$0" : 'X\(/\)$' \| \ +++ . : '\(.\)' 2>/dev/null || +++echo X/"$0" | +++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +++ /^X\/\(\/\/\)$/{ s//\1/; q; } +++ /^X\/\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ +++ +++# PATH needs CR, and LINENO needs CR and PATH. +++# Avoid depending upon Character Ranges. +++as_cr_letters='abcdefghijklmnopqrstuvwxyz' +++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +++as_cr_Letters=$as_cr_letters$as_cr_LETTERS +++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=';' +++ else +++ PATH_SEPARATOR=: +++ fi +++ rm -f conf$$.sh +++fi +++ +++ +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" || { +++ # Find who we are. Look in the path if we contain no path at all +++ # relative or not. +++ case $0 in +++ *[\\/]* ) as_myself=$0 ;; +++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +++done +++ +++ ;; +++ esac +++ # We did not find ourselves, most probably we were run as `sh COMMAND' +++ # in which case we are not to be found in the path. +++ if test "x$as_myself" = x; then +++ as_myself=$0 +++ fi +++ if test ! -f "$as_myself"; then +++ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +++ { (exit 1); exit 1; }; } +++ fi +++ case $CONFIG_SHELL in +++ '') +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ for as_base in sh bash ksh sh5; do +++ case $as_dir in +++ /*) +++ if ("$as_dir/$as_base" -c ' +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +++ CONFIG_SHELL=$as_dir/$as_base +++ export CONFIG_SHELL +++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} +++ fi;; +++ esac +++ done +++done +++;; +++ esac +++ +++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +++ # uniformly replaced by the line number. The first 'sed' inserts a +++ # line-number line before each line; the second 'sed' does the real +++ # work. The second script uses 'N' to pair each line-number line +++ # with the numbered line, and appends trailing '-' during +++ # substitution so that $LINENO is not a special case at line end. +++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +++ sed '=' <$as_myself | +++ sed ' +++ N +++ s,$,-, +++ : loop +++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, +++ t loop +++ s,-$,, +++ s,^['$as_cr_digits']*\n,, +++ ' >$as_me.lineno && +++ chmod +x $as_me.lineno || +++ { 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 +++ # (the dirname of $[0] is not the place where we might find the +++ # original and so on. Autoconf is especially sensible to this). +++ . ./$as_me.lineno +++ # Exit status is that of the last command. +++ exit +++} +++ +++ +++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +++ *c*,-n*) ECHO_N= ECHO_C=' +++' ECHO_T=' ' ;; +++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +++esac +++ +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++rm -f conf$$ conf$$.exe conf$$.file +++echo >conf$$.file +++if ln -s conf$$.file conf$$ 2>/dev/null; then +++ # We could just check for DJGPP; but this test a) works b) is more generic +++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +++ if test -f conf$$.exe; then +++ # Don't use ln at all; we don't have any links +++ as_ln_s='cp -p' +++ else +++ as_ln_s='ln -s' +++ fi +++elif ln conf$$.file conf$$ 2>/dev/null; then +++ as_ln_s=ln +++else +++ as_ln_s='cp -p' +++fi +++rm -f conf$$ conf$$.exe conf$$.file +++ +++if mkdir -p . 2>/dev/null; then +++ as_mkdir_p=: +++else +++ test -d ./-p && rmdir ./-p +++ as_mkdir_p=false +++fi +++ +++as_executable_p="test -f" +++ +++# Sed expression to map a string onto a valid CPP name. +++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +++ +++# Sed expression to map a string onto a valid variable name. +++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +++ +++ +++# IFS +++# We need space, tab and new line, in precisely that order. +++as_nl=' +++' +++IFS=" $as_nl" +++ +++# CDPATH. +++$as_unset CDPATH ++ ++-# Defaults: ++-ac_help= +++ +++# Name of the host. +++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +++# so uname gets run too. +++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +++ +++exec 6>&1 +++ +++# +++# Initializations. +++# ++ ac_default_prefix=/usr/local ++-# Any additions from configure.in: ++-ac_help="$ac_help ++- --with-diffutils assume GNU diffutils is similarly installed" +++ac_config_libobj_dir=. +++cross_compiling=no +++subdirs= +++MFLAGS= +++MAKEFLAGS= +++SHELL=${CONFIG_SHELL-/bin/sh} +++ +++# Maximum number of lines to put in a shell here document. +++# This variable seems obsolete. It should probably be removed, and +++# only ac_max_sed_lines should be used. +++: ${ac_max_here_lines=38} +++ +++# Identity of this package. +++PACKAGE_NAME= +++PACKAGE_TARNAME= +++PACKAGE_VERSION= +++PACKAGE_STRING= +++PACKAGE_BUGREPORT= +++ +++ac_unique_file="src/rcsbase.h" +++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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DIFF DIFF_SUCCESS DIFF_FAILURE DIFF_TROUBLE DIFFFLAGS DIFF_L DIFF3 DIFF3_BIN ED SENDMAIL PIC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE LIBOBJS LTLIBOBJS' +++ac_subst_files='' ++ ++ # Initialize some variables set by options. +++ac_init_help= +++ac_init_version=false ++ # The variables have the same names as the options, with ++ # dashes changed to underlines. ++-build=NONE ++-cache_file=./config.cache +++cache_file=/dev/null ++ exec_prefix=NONE ++-host=NONE ++ no_create= ++-nonopt=NONE ++ no_recursion= ++ prefix=NONE ++ program_prefix=NONE ++@@ -31,18 +291,31 @@ ++ silent= ++ site= ++ srcdir= ++-target=NONE ++ verbose= ++ x_includes=NONE ++ x_libraries=NONE ++ ++-# Initialize some other variables. ++-subdirs= +++# Installation directory options. +++# These are left unexpanded so users can "make install exec_prefix=/foo" +++# and all the variables that are supposed to be based on exec_prefix +++# by default will actually change. +++# Use braces instead of parens because sh, perl, etc. also accept them. +++bindir='${exec_prefix}/bin' +++sbindir='${exec_prefix}/sbin' +++libexecdir='${exec_prefix}/libexec' +++datadir='${prefix}/share' +++sysconfdir='${prefix}/etc' +++sharedstatedir='${prefix}/com' +++localstatedir='${prefix}/var' +++libdir='${exec_prefix}/lib' +++includedir='${prefix}/include' +++oldincludedir='/usr/include' +++infodir='${prefix}/info' +++mandir='${prefix}/man' ++ ++ ac_prev= ++ for ac_option ++ do ++- ++ # If the previous option needs an argument, assign it. ++ if test -n "$ac_prev"; then ++ eval "$ac_prev=\$ac_option" ++@@ -50,48 +323,59 @@ ++ continue ++ fi ++ ++- case "$ac_option" in ++- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++- *) ac_optarg= ;; ++- esac +++ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ ++ # Accept the important Cygnus configure options, so we can diagnose typos. ++ ++- case "$ac_option" in +++ case $ac_option in ++ ++- -build | --build | --buil | --bui | --bu | --b) ++- ac_prev=build ;; ++- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) ++- build="$ac_optarg" ;; +++ -bindir | --bindir | --bindi | --bind | --bin | --bi) +++ ac_prev=bindir ;; +++ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +++ bindir=$ac_optarg ;; +++ +++ -build | --build | --buil | --bui | --bu) +++ ac_prev=build_alias ;; +++ -build=* | --build=* | --buil=* | --bui=* | --bu=*) +++ build_alias=$ac_optarg ;; ++ ++ -cache-file | --cache-file | --cache-fil | --cache-fi \ ++ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ++ ac_prev=cache_file ;; ++ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ ++ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) ++- cache_file="$ac_optarg" ;; +++ cache_file=$ac_optarg ;; +++ +++ --config-cache | -C) +++ cache_file=config.cache ;; +++ +++ -datadir | --datadir | --datadi | --datad | --data | --dat | --da) +++ ac_prev=datadir ;; +++ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +++ | --da=*) +++ datadir=$ac_optarg ;; ++ ++ -disable-* | --disable-*) ++- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` +++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then ++- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } ++- fi ++- ac_feature=`echo $ac_feature| sed 's/-/_/g'` ++- eval "enable_${ac_feature}=no" ;; +++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +++ { (exit 1); exit 1; }; } +++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` +++ eval "enable_$ac_feature=no" ;; ++ ++ -enable-* | --enable-*) ++- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` +++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then ++- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } ++- fi ++- ac_feature=`echo $ac_feature| sed 's/-/_/g'` ++- case "$ac_option" in ++- *=*) ;; +++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +++ { (exit 1); exit 1; }; } +++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` +++ case $ac_option in +++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) ac_optarg=yes ;; ++ esac ++- eval "enable_${ac_feature}='$ac_optarg'" ;; +++ eval "enable_$ac_feature='$ac_optarg'" ;; ++ ++ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ ++ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ ++@@ -100,83 +384,101 @@ ++ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ ++ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ ++ | --exec=* | --exe=* | --ex=*) ++- exec_prefix="$ac_optarg" ;; +++ exec_prefix=$ac_optarg ;; ++ ++ -gas | --gas | --ga | --g) ++ # Obsolete; use --with-gas. ++ with_gas=yes ;; ++ ++- -help | --help | --hel | --he) ++- # Omit some internal or obsolete options to make the list less imposing. ++- # This message is too long to be a string in the A/UX 3.1 sh. ++- cat << EOF ++-Usage: configure [options] [host] ++-Options: [defaults in brackets after descriptions] ++-Configuration: ++- --cache-file=FILE cache test results in FILE ++- --help print this message ++- --no-create do not create output files ++- --quiet, --silent do not print \`checking...' messages ++- --version print the version of autoconf that created configure ++-Directory and file names: ++- --prefix=PREFIX install architecture-independent files in PREFIX ++- [$ac_default_prefix] ++- --exec-prefix=PREFIX install architecture-dependent files in PREFIX ++- [same as prefix] ++- --srcdir=DIR find the sources in DIR [configure dir or ..] ++- --program-prefix=PREFIX prepend PREFIX to installed program names ++- --program-suffix=SUFFIX append SUFFIX to installed program names ++- --program-transform-name=PROGRAM run sed PROGRAM on installed program names ++-Host type: ++- --build=BUILD configure for building on BUILD [BUILD=HOST] ++- --host=HOST configure for HOST [guessed] ++- --target=TARGET configure for TARGET [TARGET=HOST] ++-Features and packages: ++- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++- --x-includes=DIR X include files are in DIR ++- --x-libraries=DIR X library files are in DIR ++---enable and --with options recognized:$ac_help ++-EOF ++- exit 0 ;; +++ -help | --help | --hel | --he | -h) +++ ac_init_help=long ;; +++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) +++ ac_init_help=recursive ;; +++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) +++ ac_init_help=short ;; ++ ++ -host | --host | --hos | --ho) ++- ac_prev=host ;; +++ ac_prev=host_alias ;; ++ -host=* | --host=* | --hos=* | --ho=*) ++- host="$ac_optarg" ;; +++ host_alias=$ac_optarg ;; +++ +++ -includedir | --includedir | --includedi | --included | --include \ +++ | --includ | --inclu | --incl | --inc) +++ ac_prev=includedir ;; +++ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ +++ | --includ=* | --inclu=* | --incl=* | --inc=*) +++ includedir=$ac_optarg ;; +++ +++ -infodir | --infodir | --infodi | --infod | --info | --inf) +++ ac_prev=infodir ;; +++ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +++ infodir=$ac_optarg ;; +++ +++ -libdir | --libdir | --libdi | --libd) +++ ac_prev=libdir ;; +++ -libdir=* | --libdir=* | --libdi=* | --libd=*) +++ libdir=$ac_optarg ;; +++ +++ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ +++ | --libexe | --libex | --libe) +++ ac_prev=libexecdir ;; +++ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ +++ | --libexe=* | --libex=* | --libe=*) +++ libexecdir=$ac_optarg ;; +++ +++ -localstatedir | --localstatedir | --localstatedi | --localstated \ +++ | --localstate | --localstat | --localsta | --localst \ +++ | --locals | --local | --loca | --loc | --lo) +++ ac_prev=localstatedir ;; +++ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +++ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +++ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) +++ localstatedir=$ac_optarg ;; +++ +++ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +++ ac_prev=mandir ;; +++ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +++ mandir=$ac_optarg ;; ++ ++ -nfp | --nfp | --nf) ++ # Obsolete; use --without-fp. ++ with_fp=no ;; ++ ++ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ++- | --no-cr | --no-c) +++ | --no-cr | --no-c | -n) ++ no_create=yes ;; ++ ++ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ++ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ++ no_recursion=yes ;; ++ +++ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ +++ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ +++ | --oldin | --oldi | --old | --ol | --o) +++ ac_prev=oldincludedir ;; +++ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ +++ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ +++ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +++ oldincludedir=$ac_optarg ;; +++ ++ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ++ ac_prev=prefix ;; ++ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ++- prefix="$ac_optarg" ;; +++ prefix=$ac_optarg ;; ++ ++ -program-prefix | --program-prefix | --program-prefi | --program-pref \ ++ | --program-pre | --program-pr | --program-p) ++ ac_prev=program_prefix ;; ++ -program-prefix=* | --program-prefix=* | --program-prefi=* \ ++ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ++- program_prefix="$ac_optarg" ;; +++ program_prefix=$ac_optarg ;; ++ ++ -program-suffix | --program-suffix | --program-suffi | --program-suff \ ++ | --program-suf | --program-su | --program-s) ++ ac_prev=program_suffix ;; ++ -program-suffix=* | --program-suffix=* | --program-suffi=* \ ++ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ++- program_suffix="$ac_optarg" ;; +++ program_suffix=$ac_optarg ;; ++ ++ -program-transform-name | --program-transform-name \ ++ | --program-transform-nam | --program-transform-na \ ++@@ -193,55 +495,78 @@ ++ | --program-transfo=* | --program-transf=* \ ++ | --program-trans=* | --program-tran=* \ ++ | --progr-tra=* | --program-tr=* | --program-t=*) ++- program_transform_name="$ac_optarg" ;; +++ program_transform_name=$ac_optarg ;; ++ ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ silent=yes ;; ++ +++ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) +++ ac_prev=sbindir ;; +++ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +++ | --sbi=* | --sb=*) +++ sbindir=$ac_optarg ;; +++ +++ -sharedstatedir | --sharedstatedir | --sharedstatedi \ +++ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +++ | --sharedst | --shareds | --shared | --share | --shar \ +++ | --sha | --sh) +++ ac_prev=sharedstatedir ;; +++ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ +++ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ +++ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ +++ | --sha=* | --sh=*) +++ sharedstatedir=$ac_optarg ;; +++ ++ -site | --site | --sit) ++ ac_prev=site ;; ++ -site=* | --site=* | --sit=*) ++- site="$ac_optarg" ;; +++ site=$ac_optarg ;; ++ ++ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ++ ac_prev=srcdir ;; ++ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ++- srcdir="$ac_optarg" ;; +++ srcdir=$ac_optarg ;; +++ +++ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ +++ | --syscon | --sysco | --sysc | --sys | --sy) +++ ac_prev=sysconfdir ;; +++ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ +++ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +++ sysconfdir=$ac_optarg ;; ++ ++ -target | --target | --targe | --targ | --tar | --ta | --t) ++- ac_prev=target ;; +++ ac_prev=target_alias ;; ++ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) ++- target="$ac_optarg" ;; +++ target_alias=$ac_optarg ;; ++ ++ -v | -verbose | --verbose | --verbos | --verbo | --verb) ++ verbose=yes ;; ++ ++- -version | --version | --versio | --versi | --vers) ++- echo "configure generated by autoconf version 2.4" ++- exit 0 ;; +++ -version | --version | --versio | --versi | --vers | -V) +++ ac_init_version=: ;; ++ ++ -with-* | --with-*) ++- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` +++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then ++- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } ++- fi +++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid package name: $ac_package" >&2 +++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package| sed 's/-/_/g'` ++- case "$ac_option" in ++- *=*) ;; +++ case $ac_option in +++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) ac_optarg=yes ;; ++ esac ++- eval "with_${ac_package}='$ac_optarg'" ;; +++ eval "with_$ac_package='$ac_optarg'" ;; ++ ++ -without-* | --without-*) ++- ac_package=`echo $ac_option|sed -e 's/-*without-//'` +++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then ++- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } ++- fi ++- ac_package=`echo $ac_package| sed 's/-/_/g'` ++- eval "with_${ac_package}=no" ;; +++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +++ { echo "$as_me: error: invalid package name: $ac_package" >&2 +++ { (exit 1); exit 1; }; } +++ ac_package=`echo $ac_package | sed 's/-/_/g'` +++ eval "with_$ac_package=no" ;; ++ ++ --x) ++ # Obsolete; use --with-x. ++@@ -252,96 +577,110 @@ ++ ac_prev=x_includes ;; ++ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ ++ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) ++- x_includes="$ac_optarg" ;; +++ x_includes=$ac_optarg ;; ++ ++ -x-libraries | --x-libraries | --x-librarie | --x-librari \ ++ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ++ ac_prev=x_libraries ;; ++ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ ++ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) ++- x_libraries="$ac_optarg" ;; +++ x_libraries=$ac_optarg ;; ++ ++- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } +++ -*) { echo "$as_me: error: unrecognized option: $ac_option +++Try \`$0 --help' for more information." >&2 +++ { (exit 1); exit 1; }; } ++ ;; ++ ++- *) ++- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then ++- echo "configure: warning: $ac_option: invalid host type" 1>&2 ++- fi ++- if test "x$nonopt" != xNONE; then ++- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ++- fi ++- nonopt="$ac_option" +++ *=*) +++ 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 +++ { (exit 1); exit 1; }; } +++ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +++ 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 +++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ ;; ++ ++ esac ++ done ++ ++ if test -n "$ac_prev"; then ++- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } ++-fi ++- ++-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 ++- ++-# File descriptor usage: ++-# 0 standard input ++-# 1 file creation ++-# 2 errors and warnings ++-# 3 some systems may open it to /dev/tty ++-# 4 used on the Kubota Titan ++-# 6 checking for... messages and results ++-# 5 compiler messages saved in config.log ++-if test "$silent" = yes; then ++- exec 6>/dev/null ++-else ++- exec 6>&1 +++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` +++ { echo "$as_me: error: missing argument to $ac_option" >&2 +++ { (exit 1); exit 1; }; } ++ fi ++-exec 5>./config.log ++ ++-echo "\ ++-This file contains any messages produced by compilers while ++-running configure, to aid debugging if configure makes a mistake. ++-" 1>&5 +++# Be sure to have absolute paths. +++for ac_var in exec_prefix prefix +++do +++ eval ac_val=$`echo $ac_var` +++ case $ac_val in +++ [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +++ { (exit 1); exit 1; }; };; +++ esac +++done ++ ++-# Strip out --no-create and --no-recursion so they do not pile up. ++-# Also quote any args containing shell metacharacters. ++-ac_configure_args= ++-for ac_arg +++# Be sure to have absolute paths. +++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +++ localstatedir libdir includedir oldincludedir infodir mandir ++ do ++- case "$ac_arg" in ++- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ++- | --no-cr | --no-c) ;; ++- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ++- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; ++- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) ++- ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++- *) ac_configure_args="$ac_configure_args $ac_arg" ;; +++ eval ac_val=$`echo $ac_var` +++ case $ac_val in +++ [\\/$]* | ?:[\\/]* ) ;; +++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +++ { (exit 1); exit 1; }; };; ++ esac ++ done ++ ++-# NLS nuisances. ++-# Only set LANG and LC_ALL to C if already set. ++-# These must not be set unconditionally because not all systems understand ++-# e.g. LANG=C (notably SCO). ++-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +++# There might be people who depend on the old broken behavior: `$host' +++# used to hold the argument of --host etc. +++# FIXME: To remove some day. +++build=$build_alias +++host=$host_alias +++target=$target_alias +++ +++# FIXME: To remove some day. +++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. +++ 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 +++ fi +++fi ++ ++-# confdefs.h avoids OS command line length limits that DEFS can exceed. ++-rm -rf conftest* confdefs.h ++-# AIX cpp loses on an empty file, so make sure it contains at least a newline. ++-echo > confdefs.h +++ac_tool_prefix= +++test -n "$host_alias" && ac_tool_prefix=$host_alias- +++ +++test "$silent" = yes && exec 6>/dev/null ++ ++-# A filename unique to this package, relative to the directory that ++-# configure is in, which we can look for to find out if srcdir is correct. ++-ac_unique_file=src/rcsbase.h ++ ++ # Find the source files, if location was not specified. ++ if test -z "$srcdir"; then ++ ac_srcdir_defaulted=yes ++ # Try the directory containing this script, then its parent. ++- ac_prog=$0 ++- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` ++- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. +++ ac_confdir=`(dirname "$0") 2>/dev/null || +++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +++ X"$0" : 'X\(//\)[^/]' \| \ +++ X"$0" : 'X\(//\)$' \| \ +++ X"$0" : 'X\(/\)' \| \ +++ . : '\(.\)' 2>/dev/null || +++echo X"$0" | +++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } +++ /^X\(\/\/\)$/{ s//\1/; q; } +++ /^X\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` ++ srcdir=$ac_confdir ++ if test ! -r $srcdir/$ac_unique_file; then ++ srcdir=.. ++@@ -351,13 +690,454 @@ ++ fi ++ if test ! -r $srcdir/$ac_unique_file; then ++ if test "$ac_srcdir_defaulted" = yes; then ++- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } +++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +++ { (exit 1); exit 1; }; } ++ else ++- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } +++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +++ { (exit 1); exit 1; }; } ++ fi ++ fi ++-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +++ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +++ { (exit 1); exit 1; }; } +++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +++ac_env_build_alias_set=${build_alias+set} +++ac_env_build_alias_value=$build_alias +++ac_cv_env_build_alias_set=${build_alias+set} +++ac_cv_env_build_alias_value=$build_alias +++ac_env_host_alias_set=${host_alias+set} +++ac_env_host_alias_value=$host_alias +++ac_cv_env_host_alias_set=${host_alias+set} +++ac_cv_env_host_alias_value=$host_alias +++ac_env_target_alias_set=${target_alias+set} +++ac_env_target_alias_value=$target_alias +++ac_cv_env_target_alias_set=${target_alias+set} +++ac_cv_env_target_alias_value=$target_alias +++ac_env_CC_set=${CC+set} +++ac_env_CC_value=$CC +++ac_cv_env_CC_set=${CC+set} +++ac_cv_env_CC_value=$CC +++ac_env_CFLAGS_set=${CFLAGS+set} +++ac_env_CFLAGS_value=$CFLAGS +++ac_cv_env_CFLAGS_set=${CFLAGS+set} +++ac_cv_env_CFLAGS_value=$CFLAGS +++ac_env_LDFLAGS_set=${LDFLAGS+set} +++ac_env_LDFLAGS_value=$LDFLAGS +++ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +++ac_cv_env_LDFLAGS_value=$LDFLAGS +++ac_env_CPPFLAGS_set=${CPPFLAGS+set} +++ac_env_CPPFLAGS_value=$CPPFLAGS +++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +++ac_cv_env_CPPFLAGS_value=$CPPFLAGS +++ +++# +++# Report the --help message. +++# +++if test "$ac_init_help" = "long"; then +++ # Omit some internal or obsolete options to make the list less imposing. +++ # This message is too long to be a string in the A/UX 3.1 sh. +++ cat <<_ACEOF +++\`configure' configures this package to adapt to many kinds of systems. +++ +++Usage: $0 [OPTION]... [VAR=VALUE]... +++ +++To assign environment variables (e.g., CC, CFLAGS...), specify them as +++VAR=VALUE. See below for descriptions of some of the useful variables. +++ +++Defaults for the options are specified in brackets. +++ +++Configuration: +++ -h, --help display this help and exit +++ --help=short display options specific to this package +++ --help=recursive display the short help of all the included packages +++ -V, --version display version information and exit +++ -q, --quiet, --silent do not print \`checking...' messages +++ --cache-file=FILE cache test results in FILE [disabled] +++ -C, --config-cache alias for \`--cache-file=config.cache' +++ -n, --no-create do not create output files +++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] +++ +++_ACEOF +++ +++ cat <<_ACEOF +++Installation directories: +++ --prefix=PREFIX install architecture-independent files in PREFIX +++ [$ac_default_prefix] +++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +++ [PREFIX] +++ +++By default, \`make install' will install all the files in +++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +++an installation prefix other than \`$ac_default_prefix' using \`--prefix', +++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] +++ --datadir=DIR read-only architecture-independent data [PREFIX/share] +++ --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] +++ --infodir=DIR info documentation [PREFIX/info] +++ --mandir=DIR man documentation [PREFIX/man] +++_ACEOF +++ +++ cat <<\_ACEOF +++_ACEOF +++fi +++ +++if test -n "$ac_init_help"; then +++ +++ cat <<\_ACEOF +++ +++Optional Packages: +++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +++ --with-diffutils assume GNU diffutils is similarly installed +++ +++Some influential environment variables: +++ CC C compiler command +++ CFLAGS C compiler flags +++ LDFLAGS linker flags, e.g. -L if you have libraries in a +++ nonstandard directory +++ CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have +++ headers in a nonstandard directory +++ +++Use these variables to override the choices made by `configure' or to help +++it to find libraries and programs with nonstandard names/locations. +++ +++_ACEOF +++fi +++ +++if test "$ac_init_help" = "recursive"; then +++ # If there are subdirs, report their specific --help. +++ ac_popdir=`pwd` +++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +++ test -d $ac_dir || continue +++ ac_builddir=. +++ +++if test "$ac_dir" != .; then +++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +++ # A "../" for each directory in $ac_dir_suffix. +++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +++else +++ ac_dir_suffix= ac_top_builddir= +++fi +++ +++case $srcdir in +++ .) # No --srcdir option. We are building in place. +++ ac_srcdir=. +++ if test -z "$ac_top_builddir"; then +++ ac_top_srcdir=. +++ else +++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +++ fi ;; +++ [\\/]* | ?:[\\/]* ) # Absolute path. +++ ac_srcdir=$srcdir$ac_dir_suffix; +++ ac_top_srcdir=$srcdir ;; +++ *) # Relative path. +++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +++ ac_top_srcdir=$ac_top_builddir$srcdir ;; +++esac +++ +++# Do not use `cd foo && pwd` to compute absolute paths, because +++# the directories may not exist. +++case `pwd` in +++.) ac_abs_builddir="$ac_dir";; +++*) +++ case "$ac_dir" in +++ .) ac_abs_builddir=`pwd`;; +++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +++ *) ac_abs_builddir=`pwd`/"$ac_dir";; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_builddir=${ac_top_builddir}.;; +++*) +++ case ${ac_top_builddir}. in +++ .) ac_abs_top_builddir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_srcdir=$ac_srcdir;; +++*) +++ case $ac_srcdir in +++ .) ac_abs_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_srcdir=$ac_top_srcdir;; +++*) +++ case $ac_top_srcdir in +++ .) ac_abs_top_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +++ esac;; +++esac +++ +++ cd $ac_dir +++ # Check for guested configure; otherwise get Cygnus style configure. +++ if test -f $ac_srcdir/configure.gnu; then +++ echo +++ $SHELL $ac_srcdir/configure.gnu --help=recursive +++ elif test -f $ac_srcdir/configure; then +++ echo +++ $SHELL $ac_srcdir/configure --help=recursive +++ elif test -f $ac_srcdir/configure.ac || +++ test -f $ac_srcdir/configure.in; then +++ echo +++ $ac_configure --help +++ else +++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +++ fi +++ cd "$ac_popdir" +++ done +++fi +++ +++test -n "$ac_init_help" && exit 0 +++if $ac_init_version; then +++ cat <<\_ACEOF +++ +++Copyright (C) 2003 Free Software Foundation, Inc. +++This configure script is free software; the Free Software Foundation +++gives unlimited permission to copy, distribute and modify it. +++_ACEOF +++ exit 0 +++fi +++exec 5>config.log +++cat >&5 <<_ACEOF +++This file contains any messages produced by compilers while +++running configure, to aid debugging if configure makes a mistake. +++ +++It was created by $as_me, which was +++generated by GNU Autoconf 2.59. Invocation command line was +++ +++ $ $0 $@ +++ +++_ACEOF +++{ +++cat <<_ASUNAME +++## --------- ## +++## Platform. ## +++## --------- ## +++ +++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +++uname -m = `(uname -m) 2>/dev/null || echo unknown` +++uname -r = `(uname -r) 2>/dev/null || echo unknown` +++uname -s = `(uname -s) 2>/dev/null || echo unknown` +++uname -v = `(uname -v) 2>/dev/null || echo unknown` +++ +++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +++ +++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +++hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +++ +++_ASUNAME +++ +++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ echo "PATH: $as_dir" +++done +++ +++} >&5 +++ +++cat >&5 <<_ACEOF +++ +++ +++## ----------- ## +++## Core tests. ## +++## ----------- ## +++ +++_ACEOF +++ +++ +++# Keep a trace of the command line. +++# Strip out --no-create and --no-recursion so they do not pile up. +++# Strip out --silent because we don't want to record it for future runs. +++# Also quote any args containing shell meta-characters. +++# Make two passes to allow for proper duplicate-argument suppression. +++ac_configure_args= +++ac_configure_args0= +++ac_configure_args1= +++ac_sep= +++ac_must_keep_next=false +++for ac_pass in 1 2 +++do +++ for ac_arg +++ do +++ case $ac_arg in +++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +++ | -silent | --silent | --silen | --sile | --sil) +++ continue ;; +++ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +++ esac +++ case $ac_pass in +++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +++ 2) +++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" +++ if test $ac_must_keep_next = true; then +++ ac_must_keep_next=false # Got value, back to normal. +++ else +++ case $ac_arg in +++ *=* | --config-cache | -C | -disable-* | --disable-* \ +++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +++ | -with-* | --with-* | -without-* | --without-* | --x) +++ case "$ac_configure_args0 " in +++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +++ esac +++ ;; +++ -* ) ac_must_keep_next=true ;; +++ esac +++ fi +++ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +++ # Get rid of the leading space. +++ ac_sep=" " +++ ;; +++ esac +++ done +++done +++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +++ +++# When interrupted or exit'd, cleanup temporary files, and complete +++# config.log. We remove comments because anyway the quotes in there +++# would cause problems or look ugly. +++# WARNING: Be sure not to use single quotes in there, as some shells, +++# such as our DU 5.0 friend, will then `close' the trap. +++trap 'exit_status=$? +++ # Save into config.log some information that might help in debugging. +++ { +++ echo +++ +++ cat <<\_ASBOX +++## ---------------- ## +++## Cache variables. ## +++## ---------------- ## +++_ASBOX +++ echo +++ # The following way of writing the cache mishandles newlines in values, +++{ +++ (set) 2>&1 | +++ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +++ *ac_space=\ *) +++ sed -n \ +++ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" +++ ;; +++ *) +++ sed -n \ +++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +++ ;; +++ esac; +++} +++ echo +++ +++ cat <<\_ASBOX +++## ----------------- ## +++## Output variables. ## +++## ----------------- ## +++_ASBOX +++ echo +++ for ac_var in $ac_subst_vars +++ do +++ eval ac_val=$`echo $ac_var` +++ echo "$ac_var='"'"'$ac_val'"'"'" +++ done | sort +++ echo +++ +++ if test -n "$ac_subst_files"; then +++ cat <<\_ASBOX +++## ------------- ## +++## Output files. ## +++## ------------- ## +++_ASBOX +++ echo +++ for ac_var in $ac_subst_files +++ do +++ eval ac_val=$`echo $ac_var` +++ echo "$ac_var='"'"'$ac_val'"'"'" +++ done | sort +++ echo +++ fi +++ +++ if test -s confdefs.h; then +++ cat <<\_ASBOX +++## ----------- ## +++## confdefs.h. ## +++## ----------- ## +++_ASBOX +++ echo +++ sed "/^$/d" confdefs.h | sort +++ echo +++ fi +++ test "$ac_signal" != 0 && +++ echo "$as_me: caught signal $ac_signal" +++ echo "$as_me: exit $exit_status" +++ } >&5 +++ rm -f core *.core && +++ rm -rf conftest* confdefs* conf$$* $ac_clean_files && +++ exit $exit_status +++ ' 0 +++for ac_signal in 1 2 13 15; do +++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +++done +++ac_signal=0 +++ +++# confdefs.h avoids OS command line length limits that DEFS can exceed. +++rm -rf conftest* confdefs.h +++# AIX cpp loses on an empty file, so make sure it contains at least a newline. +++echo >confdefs.h +++ +++# Predefined preprocessor variables. +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_NAME "$PACKAGE_NAME" +++_ACEOF +++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +++_ACEOF +++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_VERSION "$PACKAGE_VERSION" +++_ACEOF ++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_STRING "$PACKAGE_STRING" +++_ACEOF +++ +++ +++cat >>confdefs.h <<_ACEOF +++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +++_ACEOF +++ +++ +++# Let the site file select an alternate cache file if it wants to. ++ # Prefer explicitly selected file to automatically selected ones. ++ if test -z "$CONFIG_SITE"; then ++ if test "x$prefix" != xNONE; then ++@@ -368,36 +1148,103 @@ ++ fi ++ for ac_site_file in $CONFIG_SITE; do ++ if test -r "$ac_site_file"; then ++- echo "loading site script $ac_site_file" +++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +++echo "$as_me: loading site script $ac_site_file" >&6;} +++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++ done ++ ++ if test -r "$cache_file"; then ++- echo "loading cache $cache_file" ++- . $cache_file +++ # 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;} +++ case $cache_file in +++ [\\/]* | ?:[\\/]* ) . $cache_file;; +++ *) . ./$cache_file;; +++ esac +++ fi ++ else ++- echo "creating cache $cache_file" ++- > $cache_file +++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +++echo "$as_me: creating cache $cache_file" >&6;} +++ >$cache_file +++fi +++ +++# Check that the precious variables saved in the cache have kept the same +++# value. +++ac_cache_corrupted=false +++for ac_var in `(set) 2>&1 | +++ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +++ eval ac_old_set=\$ac_cv_env_${ac_var}_set +++ eval ac_new_set=\$ac_env_${ac_var}_set +++ eval ac_old_val="\$ac_cv_env_${ac_var}_value" +++ 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;} +++ 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;} +++ 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=: +++ 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=$ac_new_val ;; +++ esac +++ case " $ac_configure_args " in +++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; +++ esac +++ 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;} +++ { (exit 1); exit 1; }; } ++ fi ++ ++ ac_ext=c ++-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++ ac_cpp='$CPP $CPPFLAGS' ++-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' ++-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +++ac_compiler_gnu=$ac_cv_c_compiler_gnu +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ +++ ++ ++-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then ++- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. ++- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then ++- ac_n= ac_c=' ++-' ac_t=' ' ++- else ++- ac_n=-n ac_c= ac_t= ++- fi ++-else ++- ac_n= ac_c='\c' ac_t= ++-fi ++ ++ ++ ++@@ -411,15 +1258,15 @@ ++ 1 ++ EOF ++ +++ ++ # Check whether --with-diffutils or --without-diffutils was given. ++-withval="$with_diffutils" ++-if test -n "$withval"; then +++if test "${with_diffutils+set}" = set; then +++ withval="$with_diffutils" ++ with_diffutils=$withval ++ else ++ with_diffutils=no ++ ++-fi ++- +++fi; ++ ++ case $with_diffutils in ++ yes) ++@@ -437,11 +1284,12 @@ ++ # On some systems, the RCS-compatible diff program is called `rdiff'; ++ # use it if it works and `diff' doesn't. ++ ++-echo $ac_n "checking diff basename""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_prog_diff'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff basename" >&5 +++echo $ECHO_N "checking diff basename... $ECHO_C" >&6 +++if test "${rcs_cv_prog_diff+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_prog_diff=$DIFF ++ case $rcs_cv_prog_diff in ++ '') ++@@ -463,49 +1311,62 @@ ++ ++ DIFF=$rcs_cv_prog_diff ++ case $DIFF in ++-'') { echo "configure: error: cannot find RCS-compatible diff" 1>&2; exit 1; };; +++'') { { echo "$as_me:$LINENO: error: cannot find RCS-compatible diff" >&5 +++echo "$as_me: error: cannot find RCS-compatible diff" >&2;} +++ { (exit 1); exit 1; }; };; ++ esac ++-echo "$ac_t""$DIFF" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF" >&5 +++echo "${ECHO_T}$DIFF" >&6 ++ # Extract the first word of "$DIFF", so it can be a program name with args. ++ set dummy $DIFF; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_DIFF'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_DIFF+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$DIFF" in ++- /*) +++ case $DIFF in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_DIFF="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ test -z "$ac_cv_path_DIFF" && ac_cv_path_DIFF="$DIFF" ++ ;; ++ esac ++ fi ++-DIFF="$ac_cv_path_DIFF" +++DIFF=$ac_cv_path_DIFF +++ ++ if test -n "$DIFF"; then ++- echo "$ac_t""$DIFF" 1>&6 +++ echo "$as_me:$LINENO: result: $DIFF" >&5 +++echo "${ECHO_T}$DIFF" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++ ++ # Set DIFF_SUCCESS, DIFF_FAILURE, DIFF_TROUBLE to diff's exit status ++ # when it finds no differences, some differences, or trouble. ++ ++-echo $ac_n "checking diff success status""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_status_diff_success'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff success status" >&5 +++echo $ECHO_N "checking diff success status... $ECHO_C" >&6 +++if test "${rcs_cv_status_diff_success+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_status_diff_success=$DIFF_SUCCESS ++ case $rcs_cv_status_diff_success in ++ '') ++@@ -519,14 +1380,16 @@ ++ fi ++ ++ DIFF_SUCCESS=$rcs_cv_status_diff_success ++-echo "$ac_t""$DIFF_SUCCESS" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF_SUCCESS" >&5 +++echo "${ECHO_T}$DIFF_SUCCESS" >&6 ++ # ++ ++-echo $ac_n "checking diff failure status""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_status_diff_failure'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff failure status" >&5 +++echo $ECHO_N "checking diff failure status... $ECHO_C" >&6 +++if test "${rcs_cv_status_diff_failure+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_status_diff_failure=$DIFF_FAILURE ++ case $rcs_cv_status_diff_failure in ++ '') ++@@ -538,14 +1401,16 @@ ++ fi ++ ++ DIFF_FAILURE=$rcs_cv_status_diff_failure ++-echo "$ac_t""$DIFF_FAILURE" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF_FAILURE" >&5 +++echo "${ECHO_T}$DIFF_FAILURE" >&6 ++ # ++ ++-echo $ac_n "checking diff trouble status""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_status_diff_trouble'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff trouble status" >&5 +++echo $ECHO_N "checking diff trouble status... $ECHO_C" >&6 +++if test "${rcs_cv_status_diff_trouble+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_status_diff_trouble=$DIFF_TROUBLE ++ case $rcs_cv_status_diff_trouble in ++ '') ++@@ -557,16 +1422,18 @@ ++ fi ++ ++ DIFF_TROUBLE=$rcs_cv_status_diff_trouble ++-echo "$ac_t""$DIFF_TROUBLE" 1>&6 +++echo "$as_me:$LINENO: result: $DIFF_TROUBLE" >&5 +++echo "${ECHO_T}$DIFF_TROUBLE" >&6 ++ ++ # Set DIFFFLAGS to the options of the `diff' program to be run. ++ # Use -an if possible, -n otherwise. ++ ++-echo $ac_n "checking diff options for RCS""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_options_diff'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff options for RCS" >&5 +++echo $ECHO_N "checking diff options for RCS... $ECHO_C" >&6 +++if test "${rcs_cv_options_diff+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_options_diff=$DIFFFLAGS ++ case $rcs_cv_options_diff in ++ '') ++@@ -585,15 +1452,17 @@ ++ fi ++ ++ DIFFFLAGS=$rcs_cv_options_diff ++-echo "$ac_t""$DIFFFLAGS" 1>&6 +++echo "$as_me:$LINENO: result: $DIFFFLAGS" >&5 +++echo "${ECHO_T}$DIFFFLAGS" >&6 ++ ++ # Set DIFF_L to 1 if diff understands the L option, 0 otherwise. ++ ++-echo $ac_n "checking diff -L""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_options_diff_l'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff -L" >&5 +++echo $ECHO_N "checking diff -L... $ECHO_C" >&6 +++if test "${rcs_cv_options_diff_l+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_options_diff_l=$DIFF_L ++ case $rcs_cv_options_diff_l in ++ '') ++@@ -621,19 +1490,22 @@ ++ ++ DIFF_L=$rcs_cv_options_diff_l ++ case $DIFF_L in ++-1) echo "$ac_t""yes" 1>&6;; ++-*) echo "$ac_t""no" 1>&6;; +++1) echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6;; +++*) echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6;; ++ esac ++ ++ # Set DIFF3 to the name of the diff3 program. ++ # In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec. ++ diff3PATH=$PATH:/usr/libexec ++ ++-echo $ac_n "checking diff3 -m""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'rcs_cv_prog_diff3_bin'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking diff3 -m" >&5 +++echo $ECHO_N "checking diff3 -m... $ECHO_C" >&6 +++if test "${rcs_cv_prog_diff3_bin+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ rcs_cv_prog_diff3_bin=$DIFF3 ++ case $rcs_cv_prog_diff3_bin in ++ '') ++@@ -657,49 +1529,61 @@ ++ ++ case $rcs_cv_prog_diff3_bin in ++ ?*) ++- echo "$ac_t""yes" 1>&6 +++ echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6 ++ ac_save_path=$PATH ++ PATH=$diff3PATH ++ # Extract the first word of "$rcs_cv_prog_diff3_bin", so it can be a program name with args. ++ set dummy $rcs_cv_prog_diff3_bin; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_DIFF3'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_DIFF3+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$DIFF3" in ++- /*) +++ case $DIFF3 in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_DIFF3="$DIFF3" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_DIFF3="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_DIFF3="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ test -z "$ac_cv_path_DIFF3" && ac_cv_path_DIFF3="$rcs_cv_prog_diff3_bin" ++ ;; ++ esac ++ fi ++-DIFF3="$ac_cv_path_DIFF3" +++DIFF3=$ac_cv_path_DIFF3 +++ ++ if test -n "$DIFF3"; then ++- echo "$ac_t""$DIFF3" 1>&6 +++ echo "$as_me:$LINENO: result: $DIFF3" >&5 +++echo "${ECHO_T}$DIFF3" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++ PATH=$ac_save_path ++ ;; ++ '') ++- echo "$ac_t""no" 1>&6 ++- echo $ac_n "checking diff3 library program""... $ac_c" 1>&6 ++- if eval "test \"`echo '$''{'rcs_cv_path_diff3_lib'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++ echo "$as_me:$LINENO: checking diff3 library program" >&5 +++echo $ECHO_N "checking diff3 library program... $ECHO_C" >&6 +++ if test "${rcs_cv_path_diff3_lib+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- +++ ++ $DIFF conftest0 conftest1 >conftest01 ++ $DIFF /dev/null conftest1 >conftestn1 ++ for i in /usr/*lib*/*diff3*; do ++@@ -714,13 +1598,16 @@ ++ break ++ fi ++ done ++- +++ ++ fi ++ ++ DIFF3=$rcs_cv_path_diff3_lib ++ case $DIFF3 in ++- '') { echo "configure: error: cannot find a working diff3 library program" 1>&2; exit 1; };; ++- ?*) echo "$ac_t""$DIFF3" 1>&6;; +++ '') { { echo "$as_me:$LINENO: error: cannot find a working diff3 library program" >&5 +++echo "$as_me: error: cannot find a working diff3 library program" >&2;} +++ { (exit 1); exit 1; }; };; +++ ?*) echo "$as_me:$LINENO: result: $DIFF3" >&5 +++echo "${ECHO_T}$DIFF3" >&6;; ++ esac ++ ;; ++ esac ++@@ -740,71 +1627,89 @@ ++ ++ # Extract the first word of "ed", so it can be a program name with args. ++ set dummy ed; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_ED'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_ED+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$ED" in ++- /*) +++ case $ED in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ED="$ED" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_ED="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_ED="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ test -z "$ac_cv_path_ED" && ac_cv_path_ED="ed" ++ ;; ++ esac ++ fi ++-ED="$ac_cv_path_ED" +++ED=$ac_cv_path_ED +++ ++ if test -n "$ED"; then ++- echo "$ac_t""$ED" 1>&6 +++ echo "$as_me:$LINENO: result: $ED" >&5 +++echo "${ECHO_T}$ED" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++ ++ ac_save_path=$PATH ++-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH +++PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH ++ for ac_prog in sendmail mail mailx ++ do ++-# Extract the first word of "$ac_prog", so it can be a program name with args. +++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_path_SENDMAIL+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- case "$SENDMAIL" in ++- /*) +++ case $SENDMAIL in +++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path. ++ ;; ++ *) ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_path_SENDMAIL="$ac_dir/$ac_word" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ ;; ++ esac ++ fi ++-SENDMAIL="$ac_cv_path_SENDMAIL" +++SENDMAIL=$ac_cv_path_SENDMAIL +++ ++ if test -n "$SENDMAIL"; then ++- echo "$ac_t""$SENDMAIL" 1>&6 +++ echo "$as_me:$LINENO: result: $SENDMAIL" >&5 +++echo "${ECHO_T}$SENDMAIL" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++-test -n "$SENDMAIL" && break +++ test -n "$SENDMAIL" && break ++ done ++ ++ PATH=$ac_save_path ++@@ -817,110 +1722,969 @@ ++ # Similarly, if using traditional pic, use its -D option. ++ for ac_prog in "pic -n" "gpic -n" "pic -D" "pic" ++ do ++-# Extract the first word of "$ac_prog", so it can be a program name with args. +++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_PIC'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_prog_PIC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ if test -n "$PIC"; then ++ ac_cv_prog_PIC="$PIC" # Let the user override the test. ++ else ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_prog_PIC="$ac_prog" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" +++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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_prog_PIC="$ac_prog" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ ++ fi ++ fi ++-PIC="$ac_cv_prog_PIC" +++PIC=$ac_cv_prog_PIC ++ if test -n "$PIC"; then ++- echo "$ac_t""$PIC" 1>&6 +++ echo "$as_me:$LINENO: result: $PIC" >&5 +++echo "${ECHO_T}$PIC" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ ++-test -n "$PIC" && break +++ test -n "$PIC" && break ++ done ++ test -n "$PIC" || PIC="pic" ++ ++ ++-# Extract the first word of "gcc", so it can be a program name with args. +++ac_ext=c +++ac_cpp='$CPP $CPPFLAGS' +++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +++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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$CC"; then +++ ac_cv_prog_CC="$CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++fi +++fi +++CC=$ac_cv_prog_CC +++if test -n "$CC"; then +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++fi +++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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for $ac_word" >&5 +++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$ac_ct_CC"; then +++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++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 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ CC=$ac_ct_CC +++else +++ CC="$ac_cv_prog_CC" +++fi +++ +++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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++ else ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- test -z "$ac_dir" && ac_dir=. ++- if test -f $ac_dir/$ac_word; then ++- ac_cv_prog_CC="gcc" ++- break ++- fi ++- done ++- IFS="$ac_save_ifs" ++- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ ++ fi ++ fi ++-CC="$ac_cv_prog_CC" +++CC=$ac_cv_prog_CC ++ if test -n "$CC"; then ++- echo "$ac_t""$CC" 1>&6 +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ fi ++ +++fi +++if test -z "$ac_cv_prog_CC"; then +++ ac_ct_CC=$CC +++ # 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 +++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$ac_ct_CC"; then +++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +++else +++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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_prog_ac_ct_CC="cc" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done ++ ++-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++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 ++ else ++- cat > conftest.c <&5 | egrep yes >/dev/null 2>&1; then ++- ac_cv_prog_gcc=yes +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ CC=$ac_ct_CC ++ else ++- ac_cv_prog_gcc=no +++ CC="$ac_cv_prog_CC" ++ fi +++ ++ fi ++-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++-if test $ac_cv_prog_gcc = yes; then ++- GCC=yes ++- if test "${CFLAGS+set}" != set; then ++- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ++-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- echo 'void f(){}' > conftest.c ++-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ++- ac_cv_prog_gcc_g=yes +++ if test -n "$CC"; then +++ ac_cv_prog_CC="$CC" # Let the user override the test. +++else +++ ac_prog_rejected=no +++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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +++ ac_prog_rejected=yes +++ continue +++ fi +++ ac_cv_prog_CC="cc" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++done +++done +++ +++if test $ac_prog_rejected = yes; then +++ # We found a bogon in the path, so make sure we never use it. +++ set dummy $ac_cv_prog_CC +++ shift +++ if test $# != 0; then +++ # We chose a different compiler from the bogus one. +++ # However, it has the same basename, so the bogon will be chosen +++ # first if we set CC to just the basename; use the full file name. +++ shift +++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +++ fi +++fi +++fi +++fi +++CC=$ac_cv_prog_CC +++if test -n "$CC"; then +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 ++ else ++- ac_cv_prog_gcc_g=no +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++fi +++if test -z "$CC"; then +++ if test -n "$ac_tool_prefix"; then +++ for ac_prog in cl +++ 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 +++if test "${ac_cv_prog_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$CC"; then +++ ac_cv_prog_CC="$CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++fi +++fi +++CC=$ac_cv_prog_CC +++if test -n "$CC"; then +++ echo "$as_me:$LINENO: result: $CC" >&5 +++echo "${ECHO_T}$CC" >&6 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ test -n "$CC" && break +++ done +++fi +++if test -z "$CC"; then +++ ac_ct_CC=$CC +++ for ac_prog in cl +++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 +++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ if test -n "$ac_ct_CC"; then +++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +++else +++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 $as_executable_p "$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 +++ break 2 +++ fi +++done +++done +++ +++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 +++else +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 +++fi +++ +++ test -n "$ac_ct_CC" && break +++done +++ +++ CC=$ac_ct_CC ++ fi ++-rm -f conftest* ++ ++ fi ++- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 ++- if test $ac_cv_prog_gcc_g = yes; then ++- CFLAGS="-g -O" +++ +++ +++test -z "$CC" && { { 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 +++See \`config.log' for more details." >&2;} +++ { (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` +++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +++ (eval $ac_compiler --version &5) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } +++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +++ (eval $ac_compiler -v &5) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } +++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +++ (eval $ac_compiler -V &5) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); } +++ +++cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++ +++ ; +++ return 0; +++} +++_ACEOF +++ac_clean_files_save=$ac_clean_files +++ac_clean_files="$ac_clean_files a.out 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[^ ]*//'` +++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +++ (eval $ac_link_default) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; then +++ # Find the output, starting from the most likely. This scheme is +++# not robust to junk in `.', hence go to wildcards (a.*) only as a last +++# resort. +++ +++# Be careful to initialize this variable, since it used to be cached. +++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +++ac_cv_exeext= +++# b.out is created by i960 compilers. +++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +++do +++ test -f "$ac_file" || continue +++ case $ac_file in +++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) +++ ;; +++ conftest.$ac_ext ) +++ # This is the source file. +++ ;; +++ [ab].out ) +++ # We found the default executable, but exeext='' is most +++ # certainly right. +++ break;; +++ *.* ) +++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +++ # FIXME: I believe we export ac_cv_exeext for Libtool, +++ # but it would be cool to find out if it's true. Does anybody +++ # maintain Libtool? --akim. +++ export ac_cv_exeext +++ break;; +++ * ) +++ break;; +++ esac +++done +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++{ { 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 +++See \`config.log' for more details." >&2;} +++ { (exit 77); exit 77; }; } +++fi +++ +++ac_exeext=$ac_cv_exeext +++echo "$as_me:$LINENO: result: $ac_file" >&5 +++echo "${ECHO_T}$ac_file" >&6 +++ +++# Check 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 +++# 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 +++ if { ac_try='./$ac_file' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ 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 ++- CFLAGS="-O" +++ { { 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. +++If you meant to cross compile, use \`--host'. +++See \`config.log' for more details." >&2;} +++ { (exit 1); exit 1; }; } ++ fi ++ fi +++fi +++echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6 +++ +++rm -f a.out a.exe conftest$ac_cv_exeext b.out +++ac_clean_files=$ac_clean_files_save +++# Check 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 +++ +++echo "$as_me:$LINENO: checking for suffix of executables" >&5 +++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +++ (eval $ac_link) 2>&5 +++ ac_status=$? +++ 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 +++# work properly (i.e., refer to `conftest.exe'), while it won't with +++# `rm'. +++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 | *.o | *.obj ) ;; +++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +++ export ac_cv_exeext +++ break;; +++ * ) break;; +++ esac +++done +++else +++ { { 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 +++See \`config.log' for more details." >&2;} +++ { (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 +++ +++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 +++if test "${ac_cv_objext+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++ +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.o conftest.obj +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +++ (eval $ac_compile) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; then +++ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do +++ case $ac_file in +++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; +++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +++ break;; +++ esac +++done +++else +++ 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 +++See \`config.log' for more details." >&5 +++echo "$as_me: error: cannot compute suffix of object files: cannot compile +++See \`config.log' for more details." >&2;} +++ { (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 +++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 +++if test "${ac_cv_c_compiler_gnu+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++#ifndef __GNUC__ +++ choke me +++#endif +++ +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ ac_compiler_gnu=yes +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++ac_compiler_gnu=no +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++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` +++ac_test_CFLAGS=${CFLAGS+set} +++ac_save_CFLAGS=$CFLAGS +++CFLAGS="-g" +++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +++if test "${ac_cv_prog_cc_g+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++ +++int +++main () +++{ +++ +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ ac_cv_prog_cc_g=yes +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++ac_cv_prog_cc_g=no +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++fi +++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +++echo "${ECHO_T}$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 +++ if test "$GCC" = yes; then +++ CFLAGS="-g -O2" +++ else +++ CFLAGS="-g" +++ fi +++else +++ if test "$GCC" = yes; then +++ CFLAGS="-O2" +++ else +++ CFLAGS= +++ fi +++fi +++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +++if test "${ac_cv_prog_cc_stdc+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++else +++ ac_cv_prog_cc_stdc=no +++ac_save_CC=$CC +++cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++#include +++#include +++#include +++#include +++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +++struct buf { int x; }; +++FILE * (*rcsopen) (struct buf *, struct stat *, int); +++static char *e (p, i) +++ char **p; +++ int i; +++{ +++ return p[i]; +++} +++static char *f (char * (*g) (char **, int), char **p, ...) +++{ +++ char *s; +++ va_list v; +++ va_start (v,p); +++ s = g (p, va_arg (v,int)); +++ va_end (v); +++ return s; +++} +++ +++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +++ function prototypes and stuff, but not '\xHH' hex character constants. +++ These don't provoke an error unfortunately, instead are silently treated +++ as 'x'. The following induces an error, until -std1 is added to get +++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +++ array size at least. It's necessary to write '\x00'==0 to get something +++ that's true only with -std1. */ +++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +++ +++int test (int i, double x); +++struct s1 {int (*f) (int a);}; +++struct s2 {int (*f) (double a);}; +++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +++int argc; +++char **argv; +++int +++main () +++{ +++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +++ ; +++ return 0; +++} +++_ACEOF +++# Don't try gcc -ansi; that turns off useful extensions and +++# breaks some systems' header files. +++# AIX -qlanglvl=ansi +++# Ultrix and OSF/1 -std1 +++# HP-UX 10.20 and later -Ae +++# HP-UX older versions -Aa -D_HPUX_SOURCE +++# SVR4 -Xc -D__EXTENSIONS__ +++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +++do +++ CC="$ac_save_CC $ac_arg" +++ rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ ac_cv_prog_cc_stdc=$ac_arg +++break +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++fi +++rm -f conftest.err conftest.$ac_objext +++done +++rm -f conftest.$ac_ext conftest.$ac_objext +++CC=$ac_save_CC +++ +++fi +++ +++case "x$ac_cv_prog_cc_stdc" in +++ x|xno) +++ echo "$as_me:$LINENO: result: none needed" >&5 +++echo "${ECHO_T}none needed" >&6 ;; +++ *) +++ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +++ CC="$CC $ac_cv_prog_cc_stdc" ;; +++esac +++ +++# Some people use a C++ compiler to compile C. Since we use `exit', +++# in C++ we need to declare it. In case someone uses the same compiler +++# for both compiling C and C++ we need to have the C++ compiler decide +++# the declaration of exit, since it's the most demanding environment. +++cat >conftest.$ac_ext <<_ACEOF +++#ifndef __cplusplus +++ choke me +++#endif +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ for ac_declaration in \ +++ '' \ +++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ +++ 'extern "C" void std::exit (int); using std::exit;' \ +++ 'extern "C" void exit (int) throw ();' \ +++ 'extern "C" void exit (int);' \ +++ 'void exit (int);' +++do +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++$ac_declaration +++#include +++int +++main () +++{ +++exit (42); +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ : ++ else ++- GCC= ++- test "${CFLAGS+set}" = set || CFLAGS="-g" +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++continue ++ fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++ cat >conftest.$ac_ext <<_ACEOF +++/* confdefs.h. */ +++_ACEOF +++cat confdefs.h >>conftest.$ac_ext +++cat >>conftest.$ac_ext <<_ACEOF +++/* end confdefs.h. */ +++$ac_declaration +++int +++main () +++{ +++exit (42); +++ ; +++ return 0; +++} +++_ACEOF +++rm -f conftest.$ac_objext +++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 +++ (exit $ac_status); } && +++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; } && +++ { ac_try='test -s conftest.$ac_objext' +++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +++ (eval $ac_try) 2>&5 +++ ac_status=$? +++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +++ (exit $ac_status); }; }; then +++ break +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++done +++rm -f conftest* +++if test -n "$ac_declaration"; then +++ echo '#ifdef __cplusplus' >>confdefs.h +++ echo $ac_declaration >>confdefs.h +++ echo '#endif' >>confdefs.h +++fi +++ +++else +++ echo "$as_me: failed program was:" >&5 +++sed 's/^/| /' conftest.$ac_ext >&5 +++ +++fi +++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +++ac_ext=c +++ac_cpp='$CPP $CPPFLAGS' +++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ac_aux_dir= ++ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ++@@ -932,14 +2696,20 @@ ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break +++ elif test -f $ac_dir/shtool; then +++ ac_aux_dir=$ac_dir +++ ac_install_sh="$ac_aux_dir/shtool install -c" +++ break ++ fi ++ done ++ if test -z "$ac_aux_dir"; then ++- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } ++-fi ++-ac_config_guess=$ac_aux_dir/config.guess ++-ac_config_sub=$ac_aux_dir/config.sub ++-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +++echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} +++ { (exit 1); exit 1; }; } +++fi +++ac_config_guess="$SHELL $ac_aux_dir/config.guess" +++ac_config_sub="$SHELL $ac_aux_dir/config.sub" +++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ++ ++ # Find a good install program. We prefer a C program (faster), ++ # so one script is as good as another. But avoid the broken or ++@@ -948,274 +2718,1036 @@ ++ # SunOS /usr/etc/install ++ # IRIX /sbin/install ++ # AIX /bin/install +++# AmigaOS /C/install, which installs bootblocks on floppy discs +++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag ++ # AFS /usr/afsws/bin/install, which mishandles nonexistent args ++ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +++# OS/2's system install, which has a completely different semantic ++ # ./install, which can be erroneously created by make from ./install.sh. ++-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++ if test -z "$INSTALL"; then ++-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++if test "${ac_cv_path_install+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++- for ac_dir in $PATH; do ++- # Account for people who put trailing slashes in PATH elements. ++- case "$ac_dir/" in ++- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++- *) ++- # OSF1 and SCO ODT 3.0 have their own names for install. ++- for ac_prog in ginstall installbsd scoinst install; do ++- if test -f $ac_dir/$ac_prog; then +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ # Account for people who put trailing slashes in PATH elements. +++case $as_dir/ in +++ ./ | .// | /cC/* | \ +++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ +++ /usr/ucb/* ) ;; +++ *) +++ # OSF1 and SCO ODT 3.0 have their own names for install. +++ # Don't use installbsd from OSF since it installs stuff as root +++ # by default. +++ for ac_prog in ginstall scoinst install; do +++ for ac_exec_ext in '' $ac_executable_extensions; do +++ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if test $ac_prog = install && ++- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then +++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++- # OSF/1 installbsd also uses dspmsg, but is usable. +++ : +++ elif test $ac_prog = install && +++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++- ac_cv_path_install="$ac_dir/$ac_prog -c" ++- break 2 +++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +++ break 3 ++ fi ++ fi ++ done ++- ;; ++- esac ++- done ++- IFS="$ac_save_ifs" ++- # As a last resort, use the slow shell script. ++- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" +++ done +++ ;; +++esac +++done +++ +++ ++ fi ++- INSTALL="$ac_cv_path_install" +++ if test "${ac_cv_path_install+set}" = set; then +++ INSTALL=$ac_cv_path_install +++ else +++ # As a last resort, use the slow shell script. We don't cache a +++ # path for INSTALL within a source directory, because that will +++ # break other packages using the cache if that directory is +++ # removed, or if the path is relative. +++ INSTALL=$ac_install_sh +++ fi ++ fi ++-echo "$ac_t""$INSTALL" 1>&6 +++echo "$as_me:$LINENO: result: $INSTALL" >&5 +++echo "${ECHO_T}$INSTALL" >&6 ++ ++ # Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++ # It thinks the first close brace ends the variable substitution. ++ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' ++ +++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +++ ++ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ++ ++-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ++-set dummy ${MAKE-make}; ac_make=$2 ++-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 +++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++- cat > conftestmake <<\EOF +++ cat >conftest.make <<\_ACEOF ++ all: ++- @echo 'ac_maketemp="${MAKE}"' ++-EOF +++ @echo 'ac_maketemp="$(MAKE)"' +++_ACEOF ++ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` ++ if test -n "$ac_maketemp"; then ++ eval ac_cv_prog_make_${ac_make}_set=yes ++ else ++ eval ac_cv_prog_make_${ac_make}_set=no ++ fi ++-rm -f conftestmake +++rm -f conftest.make ++ fi ++ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then ++- echo "$ac_t""yes" 1>&6 +++ echo "$as_me:$LINENO: result: yes" >&5 +++echo "${ECHO_T}yes" >&6 ++ SET_MAKE= ++ else ++- echo "$ac_t""no" 1>&6 +++ echo "$as_me:$LINENO: result: no" >&5 +++echo "${ECHO_T}no" >&6 ++ SET_MAKE="MAKE=${MAKE-make}" ++ fi ++ ++ ++-trap '' 1 2 15 ++-cat > confcache <<\EOF +++ ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile" +++cat >confcache <<\_ACEOF ++ # This file is a shell script that caches the results of configure ++ # tests run on this system so they can be shared between configure ++-# scripts and configure runs. It is not useful on other systems. ++-# If it contains results you don't want to keep, you may remove or edit it. +++# scripts and configure runs, see configure's option --config-cache. +++# It is not useful on other systems. If it contains results you don't +++# want to keep, you may remove or edit it. ++ # ++-# By default, configure uses ./config.cache as the cache file, ++-# creating it if it does not exist already. You can give configure ++-# the --cache-file=FILE option to use a different cache file; that is ++-# what configure does when it calls configure scripts in ++-# subdirectories, so they share the cache. ++-# Giving --cache-file=/dev/null disables caching, for debugging configure. ++-# config.status only pays attention to the cache file if you give it the ++-# --recheck option to rerun configure. +++# config.status only pays attention to the cache file if you give it +++# the --recheck option to rerun configure. ++ # ++-EOF +++# `ac_cv_env_foo' variables (set or unset) will be overridden when +++# loading this file, other *unset* `ac_cv_foo' will be assigned the +++# following values. +++ +++_ACEOF +++ +++# The following way of writing the cache mishandles newlines in values, +++# but we know of no workaround that is simple, portable, and efficient. +++# So, don't put newlines in cache variables' values. ++ # Ultrix sh set writes to stderr and can't be redirected directly, ++ # and sets the high bit in the cache file unless we assign to the vars. ++-(set) 2>&1 | ++- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ ++- >> confcache ++-if cmp -s $cache_file confcache; then ++- : ++-else +++{ +++ (set) 2>&1 | +++ case `(ac_space=' '; set | grep ac_space) 2>&1` in +++ *ac_space=\ *) +++ # `set' does not quote correctly, so add quotes (double-quote +++ # substitution turns \\\\ into \\, and sed turns \\ into \). +++ sed -n \ +++ "s/'/'\\\\''/g; +++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +++ ;; +++ *) +++ # `set' quotes correctly as required by POSIX, so do not add quotes. +++ sed -n \ +++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +++ ;; +++ esac; +++} | +++ sed ' +++ t clear +++ : clear +++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ +++ t end +++ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +++ : end' >>confcache +++if diff $cache_file confcache >/dev/null 2>&1; then :; else ++ if test -w $cache_file; then ++- echo "updating cache $cache_file" ++- cat confcache > $cache_file +++ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" +++ cat confcache >$cache_file ++ else ++ echo "not updating unwritable cache $cache_file" ++ fi ++ fi ++ rm -f confcache ++ ++-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 ++- ++ test "x$prefix" = xNONE && prefix=$ac_default_prefix ++ # Let make expand exec_prefix. ++ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' ++ ++-# Any assignment to VPATH causes Sun make to only execute ++-# the first set of double-colon rules, so remove it if not needed. ++-# If there is a colon in the path, we need to keep it. +++# VPATH may cause trouble with some makes, so we remove $(srcdir), +++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +++# trailing colons and then remove the whole line if VPATH becomes empty +++# (actually we leave an empty line to preserve line numbers). ++ if test "x$srcdir" = x.; then ++- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ +++s/:*\$(srcdir):*/:/; +++s/:*\${srcdir}:*/:/; +++s/:*@srcdir@:*/:/; +++s/^\([^=]*=[ ]*\):*/\1/; +++s/:*$//; +++s/^[^=]*=[ ]*$//; +++}' ++ fi ++ ++-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 ++- ++ # Transform confdefs.h into DEFS. ++ # Protect against shell expansion while executing Makefile rules. ++ # Protect against Makefile macro expansion. ++-cat > conftest.defs <<\EOF ++-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g ++-s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++-s%\[%\\&%g ++-s%\]%\\&%g ++-s%\$%$$%g ++-EOF ++-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++-rm -f conftest.defs +++# +++# If the first sed substitution is executed (which looks for macros that +++# take arguments), then we branch to the quote section. Otherwise, +++# look for a macro that doesn't take arguments. +++cat >confdef2opt.sed <<\_ACEOF +++t clear +++: clear +++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +++t quote +++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +++t quote +++d +++: quote +++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +++s,\[,\\&,g +++s,\],\\&,g +++s,\$,$$,g +++p +++_ACEOF +++# We use echo to avoid assuming a particular line-breaking character. +++# The extra dot is to prevent the shell from consuming trailing +++# line-breaks from the sub-command output. A line-break within +++# single-quotes doesn't work because, if this script is created in a +++# platform that uses two characters for line-breaks (e.g., DOS), tr +++# would break. +++ac_LF_and_DOT=`echo; echo .` +++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +++rm -f confdef2opt.sed +++ +++ +++ac_libobjs= +++ac_ltlibobjs= +++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue +++ # 1. Remove the extension, and $U if already installed. +++ ac_i=`echo "$ac_i" | +++ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +++ # 2. Add them. +++ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +++ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +++done +++LIBOBJS=$ac_libobjs ++ +++LTLIBOBJS=$ac_ltlibobjs ++ ++-# Without the "./", some shells look in PATH for config.status. ++-: ${CONFIG_STATUS=./config.status} ++ ++-echo creating $CONFIG_STATUS ++-rm -f $CONFIG_STATUS ++-cat > $CONFIG_STATUS <&5 +++echo "$as_me: creating $CONFIG_STATUS" >&6;} +++cat >$CONFIG_STATUS <<_ACEOF +++#! $SHELL +++# Generated by $as_me. ++ # Run this file to recreate the current configuration. ++-# This directory was configured as follows, ++-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++-# ++-# $0 $ac_configure_args ++-# ++ # Compiler output produced by configure, useful for debugging ++-# configure, is in ./config.log if it exists. +++# configure, is in config.log if it exists. ++ ++-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" ++-for ac_option +++debug=false +++ac_cs_recheck=false +++ac_cs_silent=false +++SHELL=\${CONFIG_SHELL-$SHELL} +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++## --------------------- ## +++## M4sh Initialization. ## +++## --------------------- ## +++ +++# Be Bourne compatible +++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 +++ # is contrary to our usage. Disable this feature. +++ alias -g '${1+"$@"}'='"$@"' +++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +++ set -o posix +++fi +++DUALCASE=1; export DUALCASE # for MKS sh +++ +++# Support unset when possible. +++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +++ as_unset=unset +++else +++ as_unset=false +++fi +++ +++ +++# Work around bugs in pre-3.0 UWIN ksh. +++$as_unset ENV MAIL MAILPATH +++PS1='$ ' +++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 +++ fi +++done +++ +++# Required to use basename. +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +++ as_basename=basename +++else +++ as_basename=false +++fi +++ +++ +++# Name of the executable. +++as_me=`$as_basename "$0" || +++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +++ X"$0" : 'X\(//\)$' \| \ +++ X"$0" : 'X\(/\)$' \| \ +++ . : '\(.\)' 2>/dev/null || +++echo X/"$0" | +++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +++ /^X\/\(\/\/\)$/{ s//\1/; q; } +++ /^X\/\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ +++ +++# PATH needs CR, and LINENO needs CR and PATH. +++# Avoid depending upon Character Ranges. +++as_cr_letters='abcdefghijklmnopqrstuvwxyz' +++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +++as_cr_Letters=$as_cr_letters$as_cr_LETTERS +++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=';' +++ else +++ PATH_SEPARATOR=: +++ fi +++ rm -f conf$$.sh +++fi +++ +++ +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" || { +++ # Find who we are. Look in the path if we contain no path at all +++ # relative or not. +++ case $0 in +++ *[\\/]* ) as_myself=$0 ;; +++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in $PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +++done +++ +++ ;; +++ esac +++ # We did not find ourselves, most probably we were run as `sh COMMAND' +++ # in which case we are not to be found in the path. +++ if test "x$as_myself" = x; then +++ as_myself=$0 +++ fi +++ if test ! -f "$as_myself"; then +++ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +++ { (exit 1); exit 1; }; } +++ fi +++ case $CONFIG_SHELL in +++ '') +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +++do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ for as_base in sh bash ksh sh5; do +++ case $as_dir in +++ /*) +++ if ("$as_dir/$as_base" -c ' +++ as_lineno_1=$LINENO +++ as_lineno_2=$LINENO +++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +++ test "x$as_lineno_1" != "x$as_lineno_2" && +++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +++ CONFIG_SHELL=$as_dir/$as_base +++ export CONFIG_SHELL +++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} +++ fi;; +++ esac +++ done +++done +++;; +++ esac +++ +++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +++ # uniformly replaced by the line number. The first 'sed' inserts a +++ # line-number line before each line; the second 'sed' does the real +++ # work. The second script uses 'N' to pair each line-number line +++ # with the numbered line, and appends trailing '-' during +++ # substitution so that $LINENO is not a special case at line end. +++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +++ sed '=' <$as_myself | +++ sed ' +++ N +++ s,$,-, +++ : loop +++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, +++ t loop +++ s,-$,, +++ s,^['$as_cr_digits']*\n,, +++ ' >$as_me.lineno && +++ chmod +x $as_me.lineno || +++ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +++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 +++ # (the dirname of $[0] is not the place where we might find the +++ # original and so on. Autoconf is especially sensible to this). +++ . ./$as_me.lineno +++ # Exit status is that of the last command. +++ exit +++} +++ +++ +++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +++ *c*,-n*) ECHO_N= ECHO_C=' +++' ECHO_T=' ' ;; +++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +++esac +++ +++if expr a : '\(a\)' >/dev/null 2>&1; then +++ as_expr=expr +++else +++ as_expr=false +++fi +++ +++rm -f conf$$ conf$$.exe conf$$.file +++echo >conf$$.file +++if ln -s conf$$.file conf$$ 2>/dev/null; then +++ # We could just check for DJGPP; but this test a) works b) is more generic +++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +++ if test -f conf$$.exe; then +++ # Don't use ln at all; we don't have any links +++ as_ln_s='cp -p' +++ else +++ as_ln_s='ln -s' +++ fi +++elif ln conf$$.file conf$$ 2>/dev/null; then +++ as_ln_s=ln +++else +++ as_ln_s='cp -p' +++fi +++rm -f conf$$ conf$$.exe conf$$.file +++ +++if mkdir -p . 2>/dev/null; then +++ as_mkdir_p=: +++else +++ test -d ./-p && rmdir ./-p +++ as_mkdir_p=false +++fi +++ +++as_executable_p="test -f" +++ +++# Sed expression to map a string onto a valid CPP name. +++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +++ +++# Sed expression to map a string onto a valid variable name. +++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +++ +++ +++# IFS +++# We need space, tab and new line, in precisely that order. +++as_nl=' +++' +++IFS=" $as_nl" +++ +++# CDPATH. +++$as_unset CDPATH +++ +++exec 6>&1 +++ +++# Open the log real soon, to keep \$[0] and so on meaningful, and to +++# report actual input values of CONFIG_FILES etc. instead of their +++# values after options handling. Logging --version etc. is OK. +++exec 5>>config.log +++{ +++ echo +++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +++## Running $as_me. ## +++_ASBOX +++} >&5 +++cat >&5 <<_CSEOF +++ +++This file was extended by $as_me, which was +++generated by GNU Autoconf 2.59. Invocation command line was +++ +++ CONFIG_FILES = $CONFIG_FILES +++ CONFIG_HEADERS = $CONFIG_HEADERS +++ CONFIG_LINKS = $CONFIG_LINKS +++ CONFIG_COMMANDS = $CONFIG_COMMANDS +++ $ $0 $@ +++ +++_CSEOF +++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +++echo >&5 +++_ACEOF +++ +++# Files that config.status was made for. +++if test -n "$ac_config_files"; then +++ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +++fi +++ +++if test -n "$ac_config_headers"; then +++ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +++fi +++ +++if test -n "$ac_config_links"; then +++ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +++fi +++ +++if test -n "$ac_config_commands"; then +++ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +++fi +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++ +++ac_cs_usage="\ +++\`$as_me' instantiates files from templates according to the +++current configuration. +++ +++Usage: $0 [OPTIONS] [FILE]... +++ +++ -h, --help print this help, then exit +++ -V, --version print version number, then exit +++ -q, --quiet 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 +++ +++Configuration files: +++$config_files +++ +++Report bugs to ." +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<_ACEOF +++ac_cs_version="\\ +++config.status +++configured by $0, generated by GNU Autoconf 2.59, +++ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +++ +++Copyright (C) 2003 Free Software Foundation, Inc. +++This config.status script is free software; the Free Software Foundation +++gives unlimited permission to copy, distribute and modify it." +++srcdir=$srcdir +++INSTALL="$INSTALL" +++_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. +++ac_need_defaults=: +++while test $# != 0 ++ do ++- case "\$ac_option" in +++ case $1 in +++ --*=*) +++ ac_option=`expr "x$1" : 'x\([^=]*\)='` +++ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` +++ ac_shift=: +++ ;; +++ -*) +++ ac_option=$1 +++ ac_optarg=$2 +++ ac_shift=shift +++ ;; +++ *) # This is not an option, so the user has probably given explicit +++ # arguments. +++ ac_option=$1 +++ ac_need_defaults=false;; +++ esac +++ +++ case $ac_option in +++ # Handling of the options. +++_ACEOF +++cat >>$CONFIG_STATUS <<\_ACEOF ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" ++- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; ++- -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ++- echo "$CONFIG_STATUS generated by autoconf version 2.4" ++- exit 0 ;; ++- -help | --help | --hel | --he | --h) ++- echo "\$ac_cs_usage"; exit 0 ;; ++- *) echo "\$ac_cs_usage"; exit 1 ;; +++ ac_cs_recheck=: ;; +++ --version | --vers* | -V ) +++ echo "$ac_cs_version"; exit 0 ;; +++ --he | --h) +++ # Conflict between --help and --header +++ { { echo "$as_me:$LINENO: error: ambiguous option: $1 +++Try \`$0 --help' for more information." >&5 +++echo "$as_me: error: ambiguous option: $1 +++Try \`$0 --help' for more information." >&2;} +++ { (exit 1); exit 1; }; };; +++ --help | --hel | -h ) +++ echo "$ac_cs_usage"; exit 0 ;; +++ --debug | --d* | -d ) +++ debug=: ;; +++ --file | --fil | --fi | --f ) +++ $ac_shift +++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" +++ ac_need_defaults=false;; +++ --header | --heade | --head | --hea ) +++ $ac_shift +++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" +++ ac_need_defaults=false;; +++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +++ | -silent | --silent | --silen | --sile | --sil | --si | --s) +++ ac_cs_silent=: ;; +++ +++ # This is an error. +++ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +++Try \`$0 --help' for more information." >&5 +++echo "$as_me: error: unrecognized option: $1 +++Try \`$0 --help' for more information." >&2;} +++ { (exit 1); exit 1; }; } ;; +++ +++ *) ac_config_targets="$ac_config_targets $1" ;; +++ ++ esac +++ shift ++ done ++ ++-ac_given_srcdir=$srcdir ++-ac_given_INSTALL="$INSTALL" ++- ++-trap 'rm -fr `echo "Makefile man/Makefile src/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 ++- ++-# Protect against being on the right side of a sed subst in config.status. ++-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; ++- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF ++-$ac_vpsub ++-$extrasub ++-s%@CFLAGS@%$CFLAGS%g ++-s%@CPPFLAGS@%$CPPFLAGS%g ++-s%@CXXFLAGS@%$CXXFLAGS%g ++-s%@DEFS@%$DEFS%g ++-s%@LDFLAGS@%$LDFLAGS%g ++-s%@LIBS@%$LIBS%g ++-s%@exec_prefix@%$exec_prefix%g ++-s%@prefix@%$prefix%g ++-s%@program_transform_name@%$program_transform_name%g ++-s%@DIFF@%$DIFF%g ++-s%@DIFF_SUCCESS@%$DIFF_SUCCESS%g ++-s%@DIFF_FAILURE@%$DIFF_FAILURE%g ++-s%@DIFF_TROUBLE@%$DIFF_TROUBLE%g ++-s%@DIFFFLAGS@%$DIFFFLAGS%g ++-s%@DIFF_L@%$DIFF_L%g ++-s%@DIFF3@%$DIFF3%g ++-s%@DIFF3_BIN@%$DIFF3_BIN%g ++-s%@ED@%$ED%g ++-s%@SENDMAIL@%$SENDMAIL%g ++-s%@PIC@%$PIC%g ++-s%@CC@%$CC%g ++-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g ++-s%@INSTALL_DATA@%$INSTALL_DATA%g ++-s%@SET_MAKE@%$SET_MAKE%g +++ac_configure_extra_args= +++ +++if $ac_cs_silent; then +++ exec 6>/dev/null +++ ac_configure_extra_args="$ac_configure_extra_args --silent" +++fi +++ +++_ACEOF +++cat >>$CONFIG_STATUS <<_ACEOF +++if \$ac_cs_recheck; then +++ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +++ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +++fi +++ +++_ACEOF +++ +++ +++ +++ +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++for ac_config_target in $ac_config_targets +++do +++ case "$ac_config_target" in +++ # Handling of arguments. +++ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +++ "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; +++ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; +++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +++ { (exit 1); exit 1; }; };; +++ esac +++done +++ +++# If the user did not use the arguments to specify the items to instantiate, +++# then the envvar interface is used. Set only those that are not. +++# We use the long form for the default assignment because of an extremely +++# bizarre bug on SunOS 4.1.3. +++if $ac_need_defaults; then +++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +++fi +++ +++# Have a temporary directory for convenience. Make it in the build tree +++# simply because there is no reason to put it here, and in addition, +++# creating and moving files from /tmp can sometimes cause problems. +++# Create a temporary directory, and hook for its removal unless debugging. +++$debug || +++{ +++ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 +++ trap '{ (exit 1); exit 1; }' 1 2 13 15 +++} +++ +++# Create a (secure) tmp directory for tmp files. +++ +++{ +++ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && +++ test -n "$tmp" && test -d "$tmp" +++} || +++{ +++ tmp=./confstat$$-$RANDOM +++ (umask 077 && mkdir $tmp) +++} || +++{ +++ echo "$me: cannot create a temporary directory in ." >&2 +++ { (exit 1); exit 1; } +++} ++ +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<_ACEOF +++ +++# +++# CONFIG_FILES section. +++# +++ +++# No need to generate the scripts if there are no CONFIG_FILES. +++# This happens for instance when ./config.status config.h +++if test -n "\$CONFIG_FILES"; then +++ # Protect against being on the right side of a sed subst in config.status. +++ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +++ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +++s,@SHELL@,$SHELL,;t t +++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +++s,@exec_prefix@,$exec_prefix,;t t +++s,@prefix@,$prefix,;t t +++s,@program_transform_name@,$program_transform_name,;t t +++s,@bindir@,$bindir,;t t +++s,@sbindir@,$sbindir,;t t +++s,@libexecdir@,$libexecdir,;t t +++s,@datadir@,$datadir,;t t +++s,@sysconfdir@,$sysconfdir,;t t +++s,@sharedstatedir@,$sharedstatedir,;t t +++s,@localstatedir@,$localstatedir,;t t +++s,@libdir@,$libdir,;t t +++s,@includedir@,$includedir,;t t +++s,@oldincludedir@,$oldincludedir,;t t +++s,@infodir@,$infodir,;t t +++s,@mandir@,$mandir,;t t +++s,@build_alias@,$build_alias,;t t +++s,@host_alias@,$host_alias,;t t +++s,@target_alias@,$target_alias,;t t +++s,@DEFS@,$DEFS,;t t +++s,@ECHO_C@,$ECHO_C,;t t +++s,@ECHO_N@,$ECHO_N,;t t +++s,@ECHO_T@,$ECHO_T,;t t +++s,@LIBS@,$LIBS,;t t +++s,@DIFF@,$DIFF,;t t +++s,@DIFF_SUCCESS@,$DIFF_SUCCESS,;t t +++s,@DIFF_FAILURE@,$DIFF_FAILURE,;t t +++s,@DIFF_TROUBLE@,$DIFF_TROUBLE,;t t +++s,@DIFFFLAGS@,$DIFFFLAGS,;t t +++s,@DIFF_L@,$DIFF_L,;t t +++s,@DIFF3@,$DIFF3,;t t +++s,@DIFF3_BIN@,$DIFF3_BIN,;t t +++s,@ED@,$ED,;t t +++s,@SENDMAIL@,$SENDMAIL,;t t +++s,@PIC@,$PIC,;t t +++s,@CC@,$CC,;t t +++s,@CFLAGS@,$CFLAGS,;t t +++s,@LDFLAGS@,$LDFLAGS,;t t +++s,@CPPFLAGS@,$CPPFLAGS,;t t +++s,@ac_ct_CC@,$ac_ct_CC,;t t +++s,@EXEEXT@,$EXEEXT,;t t +++s,@OBJEXT@,$OBJEXT,;t t +++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +++s,@INSTALL_DATA@,$INSTALL_DATA,;t t +++s,@SET_MAKE@,$SET_MAKE,;t t +++s,@LIBOBJS@,$LIBOBJS,;t t +++s,@LTLIBOBJS@,$LTLIBOBJS,;t t ++ CEOF ++-EOF ++-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF ++-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then ++- # Support "outfile[:infile]", defaulting infile="outfile.in". ++- case "$ac_file" in ++- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` ++- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; ++- *) ac_file_in="${ac_file}.in" ;; ++- esac ++- ++- # Adjust relative srcdir, etc. for subdirectories. ++- ++- # Remove last slash and all that follows it. Not all systems have dirname. ++- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` ++- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then ++- # The file is in a subdirectory. ++- test ! -d "$ac_dir" && mkdir "$ac_dir" ++- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" ++- # A "../" for each directory in $ac_dir_suffix. ++- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` ++- else ++- ac_dir_suffix= ac_dots= +++_ACEOF +++ +++ cat >>$CONFIG_STATUS <<\_ACEOF +++ # Split the substitutions into bite-sized pieces for seds with +++ # small command number limits, like on Digital OSF/1 and HP-UX. +++ ac_max_sed_lines=48 +++ ac_sed_frag=1 # Number of current file. +++ ac_beg=1 # First line for current file. +++ ac_end=$ac_max_sed_lines # Line after last line for current file. +++ ac_more_lines=: +++ ac_sed_cmds= +++ while $ac_more_lines; do +++ if test $ac_beg -gt 1; then +++ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +++ else +++ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +++ fi +++ if test ! -s $tmp/subs.frag; then +++ ac_more_lines=false +++ else +++ # The purpose of the label and of the branching condition is to +++ # speed up the sed processing (if there are no `@' at all, there +++ # is no need to browse any of the substitutions). +++ # These are the two extra sed commands mentioned above. +++ (echo ':t +++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +++ if test -z "$ac_sed_cmds"; then +++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +++ else +++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +++ fi +++ ac_sed_frag=`expr $ac_sed_frag + 1` +++ ac_beg=$ac_end +++ ac_end=`expr $ac_end + $ac_max_sed_lines` +++ fi +++ done +++ if test -z "$ac_sed_cmds"; then +++ ac_sed_cmds=cat ++ fi +++fi # test -n "$CONFIG_FILES" +++ +++_ACEOF +++cat >>$CONFIG_STATUS <<\_ACEOF +++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +++ case $ac_file in +++ - | *:- | *:-:* ) # input from stdin +++ cat >$tmp/stdin +++ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +++ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +++ * ) ac_file_in=$ac_file.in ;; +++ esac ++ ++- case "$ac_given_srcdir" in ++- .) srcdir=. ++- if test -z "$ac_dots"; then top_srcdir=. ++- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; ++- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +++ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +++ ac_dir=`(dirname "$ac_file") 2>/dev/null || +++$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" | +++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } +++ /^X\(\/\/\)$/{ s//\1/; q; } +++ /^X\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ { if $as_mkdir_p; then +++ mkdir -p "$ac_dir" +++ else +++ as_dir="$ac_dir" +++ as_dirs= +++ while test ! -d "$as_dir"; do +++ as_dirs="$as_dir $as_dirs" +++ as_dir=`(dirname "$as_dir") 2>/dev/null || +++$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" | +++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } +++ /^X\(\/\/\)$/{ s//\1/; q; } +++ /^X\(\/\).*/{ s//\1/; q; } +++ s/.*/./; q'` +++ done +++ test ! -n "$as_dirs" || mkdir $as_dirs +++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +++ { (exit 1); exit 1; }; }; } +++ +++ ac_builddir=. +++ +++if test "$ac_dir" != .; then +++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +++ # A "../" for each directory in $ac_dir_suffix. +++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +++else +++ ac_dir_suffix= ac_top_builddir= +++fi +++ +++case $srcdir in +++ .) # No --srcdir option. We are building in place. +++ ac_srcdir=. +++ if test -z "$ac_top_builddir"; then +++ ac_top_srcdir=. +++ else +++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +++ fi ;; +++ [\\/]* | ?:[\\/]* ) # Absolute path. +++ ac_srcdir=$srcdir$ac_dir_suffix; +++ ac_top_srcdir=$srcdir ;; ++ *) # Relative path. ++- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" ++- top_srcdir="$ac_dots$ac_given_srcdir" ;; +++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +++ ac_top_srcdir=$ac_top_builddir$srcdir ;; +++esac +++ +++# Do not use `cd foo && pwd` to compute absolute paths, because +++# the directories may not exist. +++case `pwd` in +++.) ac_abs_builddir="$ac_dir";; +++*) +++ case "$ac_dir" in +++ .) ac_abs_builddir=`pwd`;; +++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +++ *) ac_abs_builddir=`pwd`/"$ac_dir";; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_builddir=${ac_top_builddir}.;; +++*) +++ case ${ac_top_builddir}. in +++ .) ac_abs_top_builddir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_srcdir=$ac_srcdir;; +++*) +++ case $ac_srcdir in +++ .) ac_abs_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +++ esac;; +++esac +++case $ac_abs_builddir in +++.) ac_abs_top_srcdir=$ac_top_srcdir;; +++*) +++ case $ac_top_srcdir in +++ .) ac_abs_top_srcdir=$ac_abs_builddir;; +++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +++ esac;; +++esac +++ +++ +++ case $INSTALL in +++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +++ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ esac ++ ++- case "$ac_given_INSTALL" in ++- [/$]*) INSTALL="$ac_given_INSTALL" ;; ++- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++- esac ++- echo creating "$ac_file" ++- rm -f "$ac_file" ++- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." ++- case "$ac_file" in ++- *Makefile*) ac_comsub="1i\\ ++-# $configure_input" ;; ++- *) ac_comsub= ;; ++- esac ++- sed -e "$ac_comsub ++-s%@configure_input@%$configure_input%g ++-s%@srcdir@%$srcdir%g ++-s%@top_srcdir@%$top_srcdir%g ++-s%@INSTALL@%$INSTALL%g ++-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file ++-fi; done ++-rm -f conftest.subs +++ # 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. */ +++ if test x"$ac_file" = x-; then +++ configure_input= +++ else +++ configure_input="$ac_file. " +++ fi +++ configure_input=$configure_input"Generated from `echo $ac_file_in | +++ sed 's,.*/,,'` by configure." ++ +++ # First look for the input files in the build tree, otherwise in the +++ # src tree. +++ ac_file_inputs=`IFS=: +++ for f in $ac_file_in; do +++ case $f in +++ -) echo $tmp/stdin ;; +++ [\\/$]*) +++ # Absolute (can't be DOS-style, as IFS=:) +++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +++echo "$as_me: error: cannot find input file: $f" >&2;} +++ { (exit 1); exit 1; }; } +++ echo "$f";; +++ *) # Relative +++ if test -f "$f"; then +++ # Build tree +++ echo "$f" +++ elif test -f "$srcdir/$f"; then +++ # Source tree +++ echo "$srcdir/$f" +++ else +++ # /dev/null tree +++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +++echo "$as_me: error: cannot find input file: $f" >&2;} +++ { (exit 1); exit 1; }; } +++ fi;; +++ esac +++ done` || { (exit 1); exit 1; } ++ +++ if test x"$ac_file" != x-; then +++ { echo "$as_me:$LINENO: creating $ac_file" >&5 +++echo "$as_me: creating $ac_file" >&6;} +++ rm -f "$ac_file" +++ fi +++_ACEOF +++cat >>$CONFIG_STATUS <<_ACEOF +++ sed "$ac_vpsub +++$extrasub +++_ACEOF +++cat >>$CONFIG_STATUS <<\_ACEOF +++:t +++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +++s,@configure_input@,$configure_input,;t t +++s,@srcdir@,$ac_srcdir,;t t +++s,@abs_srcdir@,$ac_abs_srcdir,;t t +++s,@top_srcdir@,$ac_top_srcdir,;t t +++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +++s,@builddir@,$ac_builddir,;t t +++s,@abs_builddir@,$ac_abs_builddir,;t t +++s,@top_builddir@,$ac_top_builddir,;t t +++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +++s,@INSTALL@,$ac_INSTALL,;t t +++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +++ rm -f $tmp/stdin +++ if test x"$ac_file" != x-; then +++ mv $tmp/out $ac_file +++ else +++ cat $tmp/out +++ rm -f $tmp/out +++ fi ++ ++-exit 0 ++-EOF +++done +++_ACEOF +++ +++cat >>$CONFIG_STATUS <<\_ACEOF +++ +++{ (exit 0); exit 0; } +++_ACEOF ++ chmod +x $CONFIG_STATUS ++-rm -fr confdefs* $ac_clean_files ++-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +++ac_clean_files=$ac_clean_files_save +++ +++ +++# configure is writing to config.log, and then calls config.status. +++# config.status does its own redirection, appending to config.log. +++# Unfortunately, on DOS this fails, as config.log is still kept open +++# by configure, so config.status won't be able to write to it; its +++# output is simply discarded. So we exec the FD to /dev/null, +++# effectively closing config.log, so it can be properly (re)opened and +++# appended to by config.status. When coming back to configure, we +++# need to make the FD available again. +++if test "$no_create" != yes; then +++ ac_cs_success=: +++ ac_config_status_args= +++ test "$silent" = yes && +++ ac_config_status_args="$ac_config_status_args --quiet" +++ exec 5>/dev/null +++ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false +++ exec 5>>config.log +++ # Use ||, not &&, to avoid exiting from the if with $? = 1, which +++ # would make configure fail if this is the last instruction. +++ $ac_cs_success || { (exit 1); exit 1; } +++fi ++ ++--- rcs-5.7.orig/configure.in +++++ rcs-5.7/configure.in ++@@ -243,7 +243,7 @@ ++ AC_PATH_PROG(ED, ed, ed) ++ ++ ac_save_path=$PATH ++-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH +++PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH ++ AC_PATH_PROGS(SENDMAIL, sendmail mail mailx) ++ PATH=$ac_save_path ++ case $SENDMAIL in ++--- rcs-5.7.orig/src/rcs.c +++++ rcs-5.7/src/rcs.c ++@@ -916,10 +916,11 @@ ++ getkeystring(Klog); ++ if (nextdelta == cuttail) { ++ cb = savestring(&curlogbuf); ++- if (!delta->log.string) +++ if (delta && !delta->log.string) ++ delta->log = cleanlogmsg(curlogbuf.string, cb.size); ++ nextlex(); ++- delta->igtext = getphrases(Ktext); +++ if (delta) +++ delta->igtext = getphrases(Ktext); ++ } else { ++ if (nextdelta->log.string && nextdelta->selector) { ++ foutptr = 0; ++--- rcs-5.7.orig/src/rcsfreeze.sh +++++ rcs-5.7/src/rcsfreeze.sh ++@@ -59,8 +59,7 @@ ++ ++ # Stamp the logfile. Because we order the logfile the most recent ++ # first we will have to save everything right now in a temporary file. ++-TMPLOG=/tmp/rcsfrz$$ ++-trap 'rm -f $TMPLOG; exit 1' 1 2 13 15 +++TMPLOG=$(tempfile) ++ # Now ask for a log message, continously add to the log file ++ ( ++ echo "Version: $SYMREVNAME($SYMREV), Date: $DATE ++--- rcs-5.7.orig/src/rcsbase.h +++++ rcs-5.7/src/rcsbase.h ++@@ -358,6 +358,7 @@ ++ char const * lockedby; /* who locks the revision */ ++ char const * state; /* state of revision (Exp by default) */ ++ char const * name; /* name (if any) by which retrieved */ +++ char const * commitid; /* text string to associate commits */ ++ struct cbuf log; /* log message requested at checkin */ ++ struct branchhead * branches; /* list of first revisions on branches*/ ++ struct cbuf ig; /* ignored phrases in admin part */ ++@@ -662,6 +663,7 @@ ++ extern char const *const expand_names[]; ++ extern char const ++ Kaccess[], Kauthor[], Kbranch[], Kcomment[], +++ Kcommitid[], ++ Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[], ++ Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[]; ++ void unexpected_EOF P((void)) exiting; ++--- rcs-5.7.orig/src/rcssyn.c +++++ rcs-5.7/src/rcssyn.c ++@@ -171,6 +171,7 @@ ++ Kauthor[] = "author", ++ Kbranch[] = "branch", ++ Kcomment[] = "comment", +++ Kcommitid[] = "commitid", ++ Kdate[] = "date", ++ Kdesc[] = "desc", ++ Kexpand[] = "expand", ++@@ -433,6 +434,14 @@ ++ Delta->lockedby = 0; ++ Delta->log.string = 0; ++ Delta->selector = true; +++ +++ if (getkeyopt(Kcommitid)) { +++ Delta->commitid = NextString; +++ nextlex(); +++ getsemi(Kcommitid); +++ } else +++ Delta->commitid = NULL; +++ ++ Delta->ig = getphrases(Kdesc); ++ TotalDeltas++; ++ return (true); ++--- rcs-5.7.orig/src/rcsdiff.c +++++ rcs-5.7/src/rcsdiff.c ++@@ -212,9 +212,13 @@ ++ } ++ goto option_handled; ++ case '-': case 'D': ++- no_diff_means_no_output = false; +++ if (c == 'D' +++ || strcmp(*argv, "--side-by-side") == 0 +++ || strcmp(*argv, "--ifdef") == 0) { +++ no_diff_means_no_output = false; +++ } ++ /* fall into */ ++- case 'C': case 'F': case 'I': case 'L': case 'W': +++ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W': ++ #if DIFF_L ++ if (c == 'L' && ++file_labels == 2) ++ faterror("too many -L options"); ++--- rcs-5.7.orig/src/ident.c +++++ rcs-5.7/src/ident.c ++@@ -234,7 +234,7 @@ ++ if (c == EOF && feof(fp) | ferror(fp)) ++ return c; ++ switch (ctab[c]) { ++- case LETTER: case Letter: +++ case LETTER: case Letter: case DIGIT: ++ *tp++ = c; ++ if (tp < line+sizeof(line)-4) ++ break; ++--- rcs-5.7.orig/src/conf.sh +++++ rcs-5.7/src/conf.sh ++@@ -73,17 +73,6 @@ ++ ech='echo -n' dots='... ' ++ esac ++ ++-$ech >&3 "$0: testing permissions $dots" ++-rm -f a.d && ++-date >a.d && ++-chmod 0 a.d && ++-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { ++- echo >&3 "$n$0: This command should not be run with superuser permissions." ++- exit 1 ++-} ++-echo >&3 OK ++-rm -f a.d || exit ++- ++ $ech >&3 "$0: testing compiler for plausibility $dots" ++ echo 'main() { return 0; }' >a.c ++ rm -f a.exe a.out || exit ++--- rcs-5.7.orig/src/rcsgen.c +++++ rcs-5.7/src/rcsgen.c ++@@ -547,6 +547,9 @@ ++ ++ aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:""); ++ awrite(node->ig.string, node->ig.size, fout); +++ +++ if (node->commitid) +++ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid); ++ } ++ ++ ++--- rcs-5.7.orig/src/rcsfnms.c +++++ rcs-5.7/src/rcsfnms.c ++@@ -285,6 +285,9 @@ ++ { ++ char *p; ++ char const *t = tpnames[n]; +++# if has_mktemp +++ int fd; +++# endif ++ ++ if (t) ++ return t; ++@@ -296,10 +299,12 @@ ++ size_t tplen = dir_useful_len(tp); ++ p = testalloc(tplen + 10); ++ VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n); ++- if (!mktemp(p) || !*p) +++ fd = mkstemp(p); +++ if (fd < 0 || !*p) ++ faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'", ++ (int)tplen, tp, SLASH, '0'+n ++ ); +++ close(fd); ++ # else ++ static char tpnamebuf[TEMPNAMES][L_tmpnam]; ++ p = tpnamebuf[n]; ++--- rcs-5.7.orig/src/rcsedit.c +++++ rcs-5.7/src/rcsedit.c ++@@ -1503,6 +1503,9 @@ ++ register size_t dl; ++ register struct buf *bn; ++ register char const *name = isworkfile ? workname : RCSname; +++# if has_mktemp +++ int fd; +++# endif ++ ++ dl = basefilename(name) - name; ++ bn = &dirtpname[newRCSdirtp_index + isworkfile]; ++@@ -1521,10 +1524,12 @@ ++ catchints(); ++ # if has_mktemp ++ VOID strcpy(tp, "XXXXXX"); ++- if (!mktemp(np) || !*np) +++ fd = mkstemp(np); +++ if (fd < 0 || !*np) ++ faterror("can't make temporary pathname `%.*s_%cXXXXXX'", ++ (int)dl, name, '0'+isworkfile ++ ); +++ close(fd); ++ # else ++ /* ++ * Posix 1003.1-1990 has no reliable way ++--- rcs-5.7.orig/src/Makefile.in +++++ rcs-5.7/src/Makefile.in ++@@ -116,16 +116,18 @@ ++ for p in $(PROGRAMS); do \ ++ $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ ++ done +++ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze ++ ++ uninstall :: ++ for p in $(PROGRAMS); do \ ++ $(REMOVE) $(bindir)/$$p; \ ++ done +++ $(REMOVE) $(bindir)/rcsfreeze ++ ++ # Install RCS and (if applicable) GNU diff before running these tests. ++ # To test RCS before installing it, see the file INSTALL.RCS. ++ RCSTEST = \ ++- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \ +++ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \ ++ LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ ++ PATH=$(bindir):$$PATH \ ++ sh $(srcdir)/rcstest ++@@ -153,7 +155,7 @@ ++ #(Unix ++ conf.h : conf.sh Makefile ++ $(REMOVE) a.* ++- ALL_CFLAGS='$(ALL_CFLAGS)' \ +++ ALL_CFLAGS="$(ALL_CFLAGS)" \ ++ CC='$(CC)' \ ++ COMPAT2='$(COMPAT2)' \ ++ DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ ++--- rcs-5.7.orig/src/rlog.c +++++ rcs-5.7/src/rlog.c ++@@ -591,6 +591,10 @@ ++ aprintf(out, insDelFormat, ++ editscript->insertlns, editscript->deletelns); ++ +++ if ( node->commitid ) +++ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "", +++ node->commitid); +++ ++ newbranch = node->branches; ++ if ( newbranch ) { ++ bufautobegin(&branchnum); +diff --git a/feeds/packages/utils/rcs/patches/100-cross_compile.patch b/feeds/packages/utils/rcs/patches/100-cross_compile.patch +new file mode 100644 +index 0000000..665ca0f +--- /dev/null ++++ b/feeds/packages/utils/rcs/patches/100-cross_compile.patch +@@ -0,0 +1,413 @@ ++--- /dev/null +++++ b/src/conf.h ++@@ -0,0 +1,399 @@ +++/* RCS compile-time configuration */ +++ +++ /* $Id: conf.sh,v 5.25 1995/06/16 06:19:24 eggert Exp $ */ +++ +++/* +++ * This file is generated automatically. +++ * If you edit it by hand your changes may be lost. +++ * Instead, please try to fix conf.sh, +++ * and send your fixes to rcs-bugs@cs.purdue.edu. +++ */ +++ +++#define exitmain(n) return n /* how to exit from main() */ +++/* #define _POSIX_C_SOURCE 2147483647L */ /* if strict C + Posix 1003.1b-1993 or later */ +++/* #define _POSIX_SOURCE */ /* if strict C + Posix 1003.1-1990 */ +++ +++#include +++#include +++#include +++ +++/* Comment out #include lines below that do not work. */ +++#include +++#include +++#include +++#include +++#include +++/* #include */ +++/* #include */ +++#include +++/* #include */ +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++#include +++/* #include */ +++ +++/* Define boolean symbols to be 0 (false, the default), or 1 (true). */ +++#define has_sys_param_h 1 /* Does #include work? */ +++/* extern int errno; */ /* Uncomment if doesn't declare errno. */ +++#define has_readlink 1 /* Does readlink() work? */ +++#define readlink_isreg_errno EINVAL /* errno after readlink on regular file */ +++ +++#if has_readlink && !defined(MAXSYMLINKS) +++# if has_sys_param_h +++# include +++# endif +++# ifndef MAXSYMLINKS +++# define MAXSYMLINKS 20 /* BSD; not standard yet */ +++# endif +++#endif +++ +++/* Comment out the typedefs below if the types are already declared. */ +++/* Fix any uncommented typedefs that are wrong. */ +++/* typedef int mode_t; */ +++/* typedef long off_t; */ +++/* typedef int pid_t; */ +++/* typedef int sig_atomic_t; */ +++/* typedef unsigned size_t; */ +++/* typedef int ssize_t; */ +++/* typedef long time_t; */ +++/* typedef int uid_t; */ +++ +++/* Comment out the keyword definitions below if the keywords work. */ +++/* #define const */ +++/* #define volatile */ +++ +++/* Define boolean symbols to be 0 (false, the default), or 1 (true). */ +++#define has_prototypes 1 /* Do function prototypes work? */ +++#define has_stdarg 1 /* Does work? */ +++/* #define has_varargs ? */ /* Does work? */ +++#define va_start_args 2 /* How many args does va_start() take? */ +++ +++#if O_BINARY +++ /* Text and binary i/o behave differently. */ +++ /* This is incompatible with Posix and Unix. */ +++# define FOPEN_RB "rb" +++# define FOPEN_R_WORK (Expand==BINARY_EXPAND ? "r" : "rb") +++# define FOPEN_WB "wb" +++# define FOPEN_W_WORK (Expand==BINARY_EXPAND ? "w" : "wb") +++# define FOPEN_WPLUS_WORK (Expand==BINARY_EXPAND ? "w+" : "w+b") +++# define OPEN_O_BINARY O_BINARY +++#else +++ /* +++ * Text and binary i/o behave the same. +++ * Omit "b", since some nonstandard hosts reject it. +++ */ +++# define FOPEN_RB "r" +++# define FOPEN_R_WORK "r" +++# define FOPEN_WB "w" +++# define FOPEN_W_WORK "w" +++# define FOPEN_WPLUS_WORK "w+" +++# define OPEN_O_BINARY 0 +++#endif +++ +++/* This may need changing on non-Unix systems (notably DOS). */ +++#define OPEN_CREAT_READONLY (S_IRUSR|S_IRGRP|S_IROTH) /* lock file mode */ +++#define OPEN_O_LOCK 0 /* extra open flags for creating lock file */ +++#define OPEN_O_WRONLY O_WRONLY /* main open flag for creating a lock file */ +++ +++/* Define or comment out the following symbols as needed. */ +++#if has_prototypes +++# define P(params) params +++#else +++# define P(params) () +++#endif +++#if has_stdarg +++# include +++#else +++# if has_varargs +++# include +++# else +++ typedef char *va_list; +++# define va_dcl int va_alist; +++# define va_start(ap) ((ap) = (va_list)&va_alist) +++# define va_arg(ap,t) (((t*) ((ap)+=sizeof(t))) [-1]) +++# define va_end(ap) +++# endif +++#endif +++#if va_start_args == 2 +++# define vararg_start va_start +++#else +++# define vararg_start(ap,p) va_start(ap) +++#endif +++#define bad_chmod_close 0 /* Can chmod() close file descriptors? */ +++#define bad_creat0 0 /* Do writes fail after creat(f,0)? */ +++#define bad_fopen_wplus 0 /* Does fopen(f,"w+") fail to truncate f? */ +++#define getlogin_is_secure 0 /* Is getlogin() secure? Usually it's not. */ +++#define has_attribute_noreturn 1 /* Does __attribute__((noreturn)) work? */ +++#if has_attribute_noreturn +++# define exiting __attribute__((noreturn)) +++#else +++# define exiting +++#endif +++#define has_dirent 1 /* Do opendir(), readdir(), closedir() work? */ +++#define void_closedir 0 /* Does closedir() yield void? */ +++#define has_fchmod 1 /* Does fchmod() work? */ +++#define has_fflush_input 1 /* Does fflush() work on input files? */ +++#define has_fputs 1 /* Does fputs() work? */ +++#define has_ftruncate 1 /* Does ftruncate() work? */ +++#define has_getuid 1 /* Does getuid() work? */ +++#define has_getpwuid 1 /* Does getpwuid() work? */ +++#define has_memcmp 1 /* Does memcmp() work? */ +++#define has_memcpy 1 /* Does memcpy() work? */ +++#define has_memmove 1 /* Does memmove() work? */ +++#define has_map_fd 0 /* Does map_fd() work? */ +++#define has_mmap 1 /* Does mmap() work on regular files? */ +++#define has_madvise 1 /* Does madvise() work? */ +++#define mmap_signal SIGBUS /* signal received if you reference nonexistent part of mmapped file */ +++#define has_rename 1 /* Does rename() work? */ +++#define bad_a_rename 0 /* Does rename(A,B) fail if A is unwritable? */ +++#define bad_b_rename 0 /* Does rename(A,B) fail if B is unwritable? */ +++#define bad_NFS_rename 0 /* Can rename(A,B) falsely report success? */ +++/* typedef int void; */ /* Some ancient compilers need this. */ +++#define VOID (void) /* 'VOID e;' discards the value of an expression 'e'. */ +++#define has_seteuid 1 /* Does seteuid() work? See ../INSTALL.RCS. */ +++#define has_setreuid 0 /* Does setreuid() work? See ../INSTALL.RCS. */ +++#define has_setuid 1 /* Does setuid() exist? */ +++#define has_sigaction 1 /* Does struct sigaction work? */ +++#define has_sa_sigaction 1 /* Does struct sigaction have sa_sigaction? */ +++#define has_signal 1 /* Does signal() work? */ +++#define signal_type void /* type returned by signal handlers */ +++#define sig_zaps_handler 0 /* Must a signal handler reinvoke signal()? */ +++/* #define has_sigblock ? */ /* Does sigblock() work? */ +++/* #define sigmask(s) (1 << ((s)-1)) */ /* Yield mask for signal number. */ +++typedef size_t fread_type; /* type returned by fread() and fwrite() */ +++typedef size_t freadarg_type; /* type of their size arguments */ +++typedef void *malloc_type; /* type returned by malloc() */ +++#define has_getcwd 1 /* Does getcwd() work? */ +++/* #define has_getwd ? */ /* Does getwd() work? */ +++#define needs_getabsname 0 /* Must we define getabsname? */ +++#define has_mktemp 1 /* Does mktemp() work? */ +++#define has_NFS 1 /* Might NFS be used? */ +++#define has_psiginfo 0 /* Does psiginfo() work? */ +++#define has_psignal 1 /* Does psignal() work? */ +++/* #define has_si_errno ? */ /* Does siginfo_t have si_errno? */ +++/* #define has_sys_siglist ? */ /* Does sys_siglist[] work? */ +++/* #define strchr index */ /* Use old-fashioned name for strchr()? */ +++/* #define strrchr rindex */ /* Use old-fashioned name for strrchr()? */ +++#define bad_unlink 0 /* Does unlink() fail on unwritable files? */ +++#define has_vfork 1 /* Does vfork() work? */ +++#define has_fork 1 /* Does fork() work? */ +++#define has_spawn 0 /* Does spawn*() work? */ +++#define has_waitpid 1 /* Does waitpid() work? */ +++#define bad_wait_if_SIGCHLD_ignored 1 /* Does ignoring SIGCHLD break wait()? */ +++#define RCS_SHELL "/bin/sh" /* shell to run RCS subprograms */ +++#define has_printf_dot 1 /* Does "%.2d" print leading 0? */ +++#define has_vfprintf 1 /* Does vfprintf() work? */ +++#define has_attribute_format_printf 1 /* Does __attribute__((format(printf,N,N+1))) work? */ +++#if has_attribute_format_printf +++# define printf_string(m, n) __attribute__((format(printf, m, n))) +++#else +++# define printf_string(m, n) +++#endif +++#if has_attribute_format_printf && has_attribute_noreturn +++ /* Work around a bug in GCC 2.5.x. */ +++# define printf_string_exiting(m, n) __attribute__((format(printf, m, n), noreturn)) +++#else +++# define printf_string_exiting(m, n) printf_string(m, n) exiting +++#endif +++/* #define has__doprintf ? */ /* Does _doprintf() work? */ +++/* #define has__doprnt ? */ /* Does _doprnt() work? */ +++/* #undef EXIT_FAILURE */ /* Uncomment this if EXIT_FAILURE is broken. */ +++#define large_memory 1 /* Can main memory hold entire RCS files? */ +++#ifndef LONG_MAX +++#define LONG_MAX 2147483647L /* long maximum */ +++#endif +++/* Do struct stat s and t describe the same file? Answer d if unknown. */ +++#define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) +++#define has_utimbuf 1 /* Does struct utimbuf work? */ +++#define CO "/usr/bin/co" /* name of 'co' program */ +++#define COMPAT2 0 /* Are version 2 files supported? */ +++#define DIFF "/usr/bin/diff" /* name of 'diff' program */ +++#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ +++#define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */ +++#define DIFFFLAGS "-an" /* Make diff output suitable for RCS. */ +++#define DIFF_L 1 /* Does diff -L work? */ +++#define DIFF_SUCCESS 0 /* DIFF status if no differences are found */ +++#define DIFF_FAILURE 1 /* DIFF status if differences are found */ +++#define DIFF_TROUBLE 2 /* DIFF status if trouble */ +++#define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ +++#define MERGE "/usr/bin/merge" /* name of 'merge' program */ +++#define TMPDIR "/tmp" /* default directory for temporary files */ +++#define SLASH '/' /* principal filename separator */ +++#define SLASHes '/' /* `case SLASHes:' labels all filename separators */ +++#define isSLASH(c) ((c) == SLASH) /* Is arg a filename separator? */ +++#define ROOTPATH(p) isSLASH((p)[0]) /* Is p an absolute pathname? */ +++#define X_DEFAULT ",v/" /* default value for -x option */ +++#define SLASHSLASH_is_SLASH 1 /* Are // and / the same directory? */ +++#define ALL_ABSOLUTE 1 /* Do all subprograms satisfy ROOTPATH? */ +++#define DIFF_ABSOLUTE 1 /* Is ROOTPATH(DIFF) true? */ +++#define SENDMAIL "/usr/sbin/sendmail" /* how to send mail */ +++#define TZ_must_be_set 0 /* Must TZ be set for gmtime() to work? */ +++ +++ +++ +++/* Adjust the following declarations as needed. */ +++ +++ +++/* The rest is for the benefit of non-standard, traditional hosts. */ +++/* Don't bother to declare functions that in traditional hosts do not appear, */ +++/* or are declared in .h files, or return int or void. */ +++ +++ +++/* traditional BSD */ +++ +++#if has_sys_siglist && !defined(sys_siglist) +++ extern char const * const sys_siglist[]; +++#endif +++ +++ +++/* Posix (ISO/IEC 9945-1: 1990 / IEEE Std 1003.1-1990) */ +++ +++/* */ +++#ifdef O_CREAT +++# define open_can_creat 1 +++#else +++# define open_can_creat 0 +++# define O_RDONLY 0 +++# define O_WRONLY 1 +++# define O_RDWR 2 +++# define O_CREAT 01000 +++# define O_TRUNC 02000 +++#endif +++#ifndef O_EXCL +++#define O_EXCL 0 +++#endif +++ +++/* */ +++#ifndef S_IRUSR +++# ifdef S_IREAD +++# define S_IRUSR S_IREAD +++# else +++# define S_IRUSR 0400 +++# endif +++# ifdef S_IWRITE +++# define S_IWUSR S_IWRITE +++# else +++# define S_IWUSR (S_IRUSR/2) +++# endif +++#endif +++#ifndef S_IRGRP +++# if has_getuid +++# define S_IRGRP (S_IRUSR / 0010) +++# define S_IWGRP (S_IWUSR / 0010) +++# define S_IROTH (S_IRUSR / 0100) +++# define S_IWOTH (S_IWUSR / 0100) +++# else +++ /* single user OS -- not Posix or Unix */ +++# define S_IRGRP 0 +++# define S_IWGRP 0 +++# define S_IROTH 0 +++# define S_IWOTH 0 +++# endif +++#endif +++#ifndef S_ISREG +++#define S_ISREG(n) (((n) & S_IFMT) == S_IFREG) +++#endif +++ +++/* */ +++#ifndef WEXITSTATUS +++#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +++#undef WIFEXITED /* Avoid 4.3BSD incompatibility with Posix. */ +++#endif +++#ifndef WIFEXITED +++#define WIFEXITED(stat_val) (((stat_val) & 0377) == 0) +++#endif +++#ifndef WTERMSIG +++#define WTERMSIG(stat_val) ((stat_val) & 0177) +++#undef WIFSIGNALED /* Avoid 4.3BSD incompatibility with Posix. */ +++#endif +++#ifndef WIFSIGNALED +++#define WIFSIGNALED(stat_val) ((unsigned)(stat_val) - 1 < 0377) +++#endif +++ +++/* */ +++char *getlogin P((void)); +++#ifndef STDIN_FILENO +++# define STDIN_FILENO 0 +++# define STDOUT_FILENO 1 +++# define STDERR_FILENO 2 +++#endif +++#if has_fork && !has_vfork +++# undef vfork +++# define vfork fork +++#endif +++#if has_getcwd || !has_getwd +++ char *getcwd P((char*,size_t)); +++#else +++ char *getwd P((char*)); +++#endif +++#if has_setuid && !has_seteuid +++# undef seteuid +++# define seteuid setuid +++#endif +++#if has_spawn +++# if ALL_ABSOLUTE +++# define spawn_RCS spawnv +++# else +++# define spawn_RCS spawnvp +++# endif +++#else +++# if ALL_ABSOLUTE +++# define exec_RCS execv +++# else +++# define exec_RCS execvp +++# endif +++#endif +++ +++/* utime.h */ +++#if !has_utimbuf +++ struct utimbuf { time_t actime, modtime; }; +++#endif +++ +++ +++/* Standard C library */ +++ +++/* */ +++#ifndef L_tmpnam +++#define L_tmpnam 32 /* power of 2 > sizeof("/usr/tmp/xxxxxxxxxxxxxxx") */ +++#endif +++#ifndef SEEK_SET +++#define SEEK_SET 0 +++#endif +++#ifndef SEEK_CUR +++#define SEEK_CUR 1 +++#endif +++#if has_mktemp +++ char *mktemp P((char*)); /* traditional */ +++#else +++ char *tmpnam P((char*)); +++#endif +++ +++/* */ +++char *getenv P((char const*)); +++void _exit P((int)) exiting; +++void exit P((int)) exiting; +++malloc_type malloc P((size_t)); +++malloc_type realloc P((malloc_type,size_t)); +++#ifndef EXIT_FAILURE +++#define EXIT_FAILURE 1 +++#endif +++#ifndef EXIT_SUCCESS +++#define EXIT_SUCCESS 0 +++#endif +++ +++/* */ +++char *strcpy P((char*,char const*)); +++char *strchr P((char const*,int)); +++char *strrchr P((char const*,int)); +++void *memcpy P((void*,void const*,size_t)); +++#if has_memmove +++ void *memmove P((void*,void const*,size_t)); +++#endif +++ +++/* */ +++time_t time P((time_t*)); ++--- a/src/Makefile.in +++++ b/src/Makefile.in ++@@ -153,7 +153,7 @@ ++ $(REMOVE) TAGS ++ ++ #(Unix ++-conf.h : conf.sh Makefile +++conf.h : ++ $(REMOVE) a.* ++ ALL_CFLAGS="$(ALL_CFLAGS)" \ ++ CC='$(CC)' \ +diff --git a/feeds/packages/utils/rdiff-backup/.svn/entries b/feeds/packages/utils/rdiff-backup/.svn/entries +new file mode 100644 +index 0000000..f2b3d5a +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rdiff-backup ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-06-28T03:56:52.169854Z ++21972 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++7a0ff2fd73a6762d5e99ae4997abfdd0 ++2010-06-28T03:56:52.169854Z ++21972 ++cshore ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1585 ++ +diff --git a/feeds/packages/utils/rdiff-backup/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/rdiff-backup/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rdiff-backup/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rdiff-backup/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..33ec189 +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# Copyright (C) 2006-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:=rdiff-backup ++PKG_VERSION:=1.2.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://savannah.nongnu.org/download/rdiff-backup/ ++PKG_MD5SUM:=1a94dc537fcf74d6a3a80bd27808e77b ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/rdiff-backup ++ SUBMENU:=backup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Incremental backup utility ++ URL:=http://www.nongnu.org/rdiff-backup ++ DEPENDS:=+python +librsync +libpopt +openssl-util ++endef ++ ++define Package/rdiff-backup/description ++ rdiff-backup backs up one directory to another, possibly over a ++ network. The target directory ends up a copy of the source directory, ++ but extra reverse diffs are stored in a special subdirectory of that ++ target directory, so you can still recover files lost some time ago. ++ The idea is to combine the best features of a mirror and an incremental ++ backup. ++endef ++ ++define PyPackage/rdiff-backup/filespec +++|/usr/bin/rdiff-backup +++|$(PYTHON_PKG_DIR)/rdiff_backup ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ build --librsync-dir="$(STAGING_DIR)/usr" , \ ++ ) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++$(eval $(call PyPackage,rdiff-backup)) ++$(eval $(call BuildPackage,rdiff-backup)) +diff --git a/feeds/packages/utils/rdiff-backup/Makefile b/feeds/packages/utils/rdiff-backup/Makefile +new file mode 100644 +index 0000000..33ec189 +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/Makefile +@@ -0,0 +1,57 @@ ++# ++# Copyright (C) 2006-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:=rdiff-backup ++PKG_VERSION:=1.2.8 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://savannah.nongnu.org/download/rdiff-backup/ ++PKG_MD5SUM:=1a94dc537fcf74d6a3a80bd27808e77b ++ ++PKG_BUILD_DEPENDS:=python ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/rdiff-backup ++ SUBMENU:=backup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Incremental backup utility ++ URL:=http://www.nongnu.org/rdiff-backup ++ DEPENDS:=+python +librsync +libpopt +openssl-util ++endef ++ ++define Package/rdiff-backup/description ++ rdiff-backup backs up one directory to another, possibly over a ++ network. The target directory ends up a copy of the source directory, ++ but extra reverse diffs are stored in a special subdirectory of that ++ target directory, so you can still recover files lost some time ago. ++ The idea is to combine the best features of a mirror and an incremental ++ backup. ++endef ++ ++define PyPackage/rdiff-backup/filespec +++|/usr/bin/rdiff-backup +++|$(PYTHON_PKG_DIR)/rdiff_backup ++endef ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/PyMod,., \ ++ build --librsync-dir="$(STAGING_DIR)/usr" , \ ++ ) ++ $(call Build/Compile/PyMod,., \ ++ install --prefix="$(PKG_INSTALL_DIR)/usr", \ ++ ) ++endef ++ ++$(eval $(call PyPackage,rdiff-backup)) ++$(eval $(call BuildPackage,rdiff-backup)) +diff --git a/feeds/packages/utils/rdiff-backup/patches/.svn/entries b/feeds/packages/utils/rdiff-backup/patches/.svn/entries +new file mode 100644 +index 0000000..530120a +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rdiff-backup/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-07-05T10:48:55.760634Z ++11639 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-python_path.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9253142145a0e6651ea487bed9abe717 ++2008-07-05T10:48:55.760634Z ++11639 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++272 ++ +diff --git a/feeds/packages/utils/rdiff-backup/patches/.svn/text-base/001-python_path.patch.svn-base b/feeds/packages/utils/rdiff-backup/patches/.svn/text-base/001-python_path.patch.svn-base +new file mode 100644 +index 0000000..5142645 +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/patches/.svn/text-base/001-python_path.patch.svn-base +@@ -0,0 +1,8 @@ ++--- a/rdiff-backup +++++ b/rdiff-backup ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/env python +++#!/usr/bin/python ++ # rdiff-backup -- Mirror files while keeping incremental changes ++ # Version 1.0.5 released November 11, 2006 ++ # Copyright (C) 2001-2005 Ben Escoto +diff --git a/feeds/packages/utils/rdiff-backup/patches/001-python_path.patch b/feeds/packages/utils/rdiff-backup/patches/001-python_path.patch +new file mode 100644 +index 0000000..5142645 +--- /dev/null ++++ b/feeds/packages/utils/rdiff-backup/patches/001-python_path.patch +@@ -0,0 +1,8 @@ ++--- a/rdiff-backup +++++ b/rdiff-backup ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/env python +++#!/usr/bin/python ++ # rdiff-backup -- Mirror files while keeping incremental changes ++ # Version 1.0.5 released November 11, 2006 ++ # Copyright (C) 2001-2005 Ben Escoto +diff --git a/feeds/packages/utils/redboot-ar231x/.svn/entries b/feeds/packages/utils/redboot-ar231x/.svn/entries +new file mode 100644 +index 0000000..c89bd26 +--- /dev/null ++++ b/feeds/packages/utils/redboot-ar231x/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/redboot-ar231x ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-10-07T12:50:15.917460Z ++33634 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ace6d61bb1ed0d9372482fc8f674ec3a ++2011-03-25T00:55:25.741448Z ++26286 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1281 ++ +diff --git a/feeds/packages/utils/redboot-ar231x/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/redboot-ar231x/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b07b5a3 +--- /dev/null ++++ b/feeds/packages/utils/redboot-ar231x/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=redboot-ar231x ++PKG_VERSION:=2010-10-26 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_TARGETS:=bin ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://nbd.name/redboot-ar231x.git ++PKG_SOURCE_VERSION:=327f02ce1645d3427f26cf8116353332c81564a9 ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++export GCC_HONOUR_COPTS=s ++ ++define Package/redboot-ar231x ++ SECTION:=boot ++ CATEGORY:=Boot Loaders ++ DEPENDS:=@TARGET_atheros @BROKEN ++ TITLE:=Tiny redboot for AR231x/AR531x ++endef ++ ++define Build/Configure ++ mkdir -p $(PKG_BUILD_DIR)/host-build ++ if [ \! -x $(PKG_BUILD_DIR)/host-install/bin/ecosconfig ]; then ( \ ++ cd $(PKG_BUILD_DIR)/host-build; \ ++ ../ecos/host/configure \ ++ --prefix=$(PKG_BUILD_DIR)/host-install \ ++ --exec-prefix=$(PKG_BUILD_DIR)/host-install; \ ++ CFLAGS="$(HOST_CFLAGS)" $(MAKE) all install; \ ++ ) fi ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) all ++endef ++ ++define Package/redboot-ar231x/install ++ $(CP) $(PKG_BUILD_DIR)/bin/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,redboot-ar231x)) +diff --git a/feeds/packages/utils/redboot-ar231x/Makefile b/feeds/packages/utils/redboot-ar231x/Makefile +new file mode 100644 +index 0000000..b07b5a3 +--- /dev/null ++++ b/feeds/packages/utils/redboot-ar231x/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=redboot-ar231x ++PKG_VERSION:=2010-10-26 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_TARGETS:=bin ++ ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_URL:=git://nbd.name/redboot-ar231x.git ++PKG_SOURCE_VERSION:=327f02ce1645d3427f26cf8116353332c81564a9 ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++export GCC_HONOUR_COPTS=s ++ ++define Package/redboot-ar231x ++ SECTION:=boot ++ CATEGORY:=Boot Loaders ++ DEPENDS:=@TARGET_atheros @BROKEN ++ TITLE:=Tiny redboot for AR231x/AR531x ++endef ++ ++define Build/Configure ++ mkdir -p $(PKG_BUILD_DIR)/host-build ++ if [ \! -x $(PKG_BUILD_DIR)/host-install/bin/ecosconfig ]; then ( \ ++ cd $(PKG_BUILD_DIR)/host-build; \ ++ ../ecos/host/configure \ ++ --prefix=$(PKG_BUILD_DIR)/host-install \ ++ --exec-prefix=$(PKG_BUILD_DIR)/host-install; \ ++ CFLAGS="$(HOST_CFLAGS)" $(MAKE) all install; \ ++ ) fi ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) all ++endef ++ ++define Package/redboot-ar231x/install ++ $(CP) $(PKG_BUILD_DIR)/bin/* $(1)/ ++endef ++ ++$(eval $(call BuildPackage,redboot-ar231x)) +diff --git a/feeds/packages/utils/redboot-ar231x/patches/.svn/entries b/feeds/packages/utils/redboot-ar231x/patches/.svn/entries +new file mode 100644 +index 0000000..6a3642c +--- /dev/null ++++ b/feeds/packages/utils/redboot-ar231x/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/redboot-ar231x/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-10T18:32:16.252835Z ++26017 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c33f5b73407d155ebdc6969cd636cd54 ++2011-03-10T18:32:16.252835Z ++26017 ++acoul ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7829 ++ +diff --git a/feeds/packages/utils/redboot-ar231x/patches/.svn/text-base/010-fix-compile.patch.svn-base b/feeds/packages/utils/redboot-ar231x/patches/.svn/text-base/010-fix-compile.patch.svn-base +new file mode 100644 +index 0000000..962b133 +--- /dev/null ++++ b/feeds/packages/utils/redboot-ar231x/patches/.svn/text-base/010-fix-compile.patch.svn-base +@@ -0,0 +1,181 @@ ++--- a/ecos/packages/hal/mips/ap30/current/cdl/hal_mips_ap30.cdl +++++ b/ecos/packages/hal/mips/ap30/current/cdl/hal_mips_ap30.cdl ++@@ -98,7 +98,7 @@ cdl_package CYGPKG_HAL_MIPS_AP30 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap43/current/cdl/hal_mips_ap43.cdl +++++ b/ecos/packages/hal/mips/ap43/current/cdl/hal_mips_ap43.cdl ++@@ -98,7 +98,7 @@ cdl_package CYGPKG_HAL_MIPS_AP43 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap48/current/cdl/hal_mips_ap48.cdl +++++ b/ecos/packages/hal/mips/ap48/current/cdl/hal_mips_ap48.cdl ++@@ -98,7 +98,7 @@ cdl_package CYGPKG_HAL_MIPS_AP48 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap51/current/cdl/hal_mips_ap51.cdl +++++ b/ecos/packages/hal/mips/ap51/current/cdl/hal_mips_ap51.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP51 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap53/current/cdl/hal_mips_ap53.cdl +++++ b/ecos/packages/hal/mips/ap53/current/cdl/hal_mips_ap53.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP53 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap61/current/cdl/hal_mips_ap61.cdl +++++ b/ecos/packages/hal/mips/ap61/current/cdl/hal_mips_ap61.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP61 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap65/current/cdl/hal_mips_ap65.cdl +++++ b/ecos/packages/hal/mips/ap65/current/cdl/hal_mips_ap65.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP65 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/pb32/current/cdl/hal_mips_pb32.cdl +++++ b/ecos/packages/hal/mips/pb32/current/cdl/hal_mips_pb32.cdl ++@@ -91,7 +91,7 @@ cdl_package CYGPKG_HAL_MIPS_PB32 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/pb44/current/cdl/hal_mips_pb44.cdl +++++ b/ecos/packages/hal/mips/pb44/current/cdl/hal_mips_pb44.cdl ++@@ -99,7 +99,7 @@ cdl_package CYGPKG_HAL_MIPS_PB44 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/pb45/current/cdl/hal_mips_pb45.cdl +++++ b/ecos/packages/hal/mips/pb45/current/cdl/hal_mips_pb45.cdl ++@@ -99,7 +99,7 @@ cdl_package CYGPKG_HAL_MIPS_PB45 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/tb225/current/cdl/hal_mips_tb225.cdl +++++ b/ecos/packages/hal/mips/tb225/current/cdl/hal_mips_tb225.cdl ++@@ -99,7 +99,7 @@ cdl_package CYGPKG_HAL_MIPS_TB225 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/host/tools/configtool/standalone/common/cdl_exec.cxx +++++ b/ecos/host/tools/configtool/standalone/common/cdl_exec.cxx ++@@ -51,6 +51,7 @@ ++ #endif ++ #include "build.hxx" ++ #include "cdl_exec.hxx" +++#include ++ ++ // ---------------------------------------------------------------------------- ++ bool cdl_exec::quiet = false; ++--- a/ecos/host/tools/configtool/standalone/common/ecosconfig.cxx +++++ b/ecos/host/tools/configtool/standalone/common/ecosconfig.cxx ++@@ -50,6 +50,7 @@ ++ #endif ++ #include "cdl_exec.hxx" ++ #include "ecosconfig.hxx" +++#include ++ ++ #define TOOL_VERSION "2.net" ++ #define TOOL_COPYRIGHT "Copyright (c) 2002 Red Hat, Inc." ++--- a/ecos/host/libcdl/build.cxx +++++ b/ecos/host/libcdl/build.cxx ++@@ -57,6 +57,7 @@ ++ // It implicitly supplies , and because ++ // the class definitions rely on these headers. ++ #include +++#include ++ ++ //}}} ++ ++--- a/ecos/host/libcdl/parse.cxx +++++ b/ecos/host/libcdl/parse.cxx ++@@ -58,6 +58,7 @@ ++ // It implicitly supplies , and because ++ // the class definitions rely on these headers. ++ #include +++#include ++ ++ //}}} ++ ++--- a/ecos/host/libcdl/cdlmisc.cxx +++++ b/ecos/host/libcdl/cdlmisc.cxx ++@@ -66,6 +66,7 @@ ++ ++ // For access to strtod() ++ #include +++#include ++ ++ // strtod() involves errno... ++ #include ++--- a/ecos/host/infra/assert.cxx +++++ b/ecos/host/infra/assert.cxx ++@@ -61,6 +61,7 @@ ++ // STDLIB is needed for exit() and the status codes. ++ #include ++ #include +++#include ++ ++ #if defined(__unix__) || defined(__CYGWIN32__) ++ extern "C" { +diff --git a/feeds/packages/utils/redboot-ar231x/patches/010-fix-compile.patch b/feeds/packages/utils/redboot-ar231x/patches/010-fix-compile.patch +new file mode 100644 +index 0000000..962b133 +--- /dev/null ++++ b/feeds/packages/utils/redboot-ar231x/patches/010-fix-compile.patch +@@ -0,0 +1,181 @@ ++--- a/ecos/packages/hal/mips/ap30/current/cdl/hal_mips_ap30.cdl +++++ b/ecos/packages/hal/mips/ap30/current/cdl/hal_mips_ap30.cdl ++@@ -98,7 +98,7 @@ cdl_package CYGPKG_HAL_MIPS_AP30 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap43/current/cdl/hal_mips_ap43.cdl +++++ b/ecos/packages/hal/mips/ap43/current/cdl/hal_mips_ap43.cdl ++@@ -98,7 +98,7 @@ cdl_package CYGPKG_HAL_MIPS_AP43 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap48/current/cdl/hal_mips_ap48.cdl +++++ b/ecos/packages/hal/mips/ap48/current/cdl/hal_mips_ap48.cdl ++@@ -98,7 +98,7 @@ cdl_package CYGPKG_HAL_MIPS_AP48 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap51/current/cdl/hal_mips_ap51.cdl +++++ b/ecos/packages/hal/mips/ap51/current/cdl/hal_mips_ap51.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP51 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap53/current/cdl/hal_mips_ap53.cdl +++++ b/ecos/packages/hal/mips/ap53/current/cdl/hal_mips_ap53.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP53 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap61/current/cdl/hal_mips_ap61.cdl +++++ b/ecos/packages/hal/mips/ap61/current/cdl/hal_mips_ap61.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP61 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/ap65/current/cdl/hal_mips_ap65.cdl +++++ b/ecos/packages/hal/mips/ap65/current/cdl/hal_mips_ap65.cdl ++@@ -93,7 +93,7 @@ cdl_package CYGPKG_HAL_MIPS_AP65 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/pb32/current/cdl/hal_mips_pb32.cdl +++++ b/ecos/packages/hal/mips/pb32/current/cdl/hal_mips_pb32.cdl ++@@ -91,7 +91,7 @@ cdl_package CYGPKG_HAL_MIPS_PB32 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/pb44/current/cdl/hal_mips_pb44.cdl +++++ b/ecos/packages/hal/mips/pb44/current/cdl/hal_mips_pb44.cdl ++@@ -99,7 +99,7 @@ cdl_package CYGPKG_HAL_MIPS_PB44 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/pb45/current/cdl/hal_mips_pb45.cdl +++++ b/ecos/packages/hal/mips/pb45/current/cdl/hal_mips_pb45.cdl ++@@ -99,7 +99,7 @@ cdl_package CYGPKG_HAL_MIPS_PB45 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/packages/hal/mips/tb225/current/cdl/hal_mips_tb225.cdl +++++ b/ecos/packages/hal/mips/tb225/current/cdl/hal_mips_tb225.cdl ++@@ -99,7 +99,7 @@ cdl_package CYGPKG_HAL_MIPS_TB225 { ++ $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,plf_defs.tmp -o plf_mk_defs.tmp -S $< ++ fgrep .equ plf_mk_defs.tmp | sed s/#// > $@ ++ @echo $@ ": \\" > $(notdir $@).deps ++- @tail +2 plf_defs.tmp >> $(notdir $@).deps +++ @tail -n +2 plf_defs.tmp >> $(notdir $@).deps ++ @echo >> $(notdir $@).deps ++ @rm plf_defs.tmp plf_mk_defs.tmp ++ } ++--- a/ecos/host/tools/configtool/standalone/common/cdl_exec.cxx +++++ b/ecos/host/tools/configtool/standalone/common/cdl_exec.cxx ++@@ -51,6 +51,7 @@ ++ #endif ++ #include "build.hxx" ++ #include "cdl_exec.hxx" +++#include ++ ++ // ---------------------------------------------------------------------------- ++ bool cdl_exec::quiet = false; ++--- a/ecos/host/tools/configtool/standalone/common/ecosconfig.cxx +++++ b/ecos/host/tools/configtool/standalone/common/ecosconfig.cxx ++@@ -50,6 +50,7 @@ ++ #endif ++ #include "cdl_exec.hxx" ++ #include "ecosconfig.hxx" +++#include ++ ++ #define TOOL_VERSION "2.net" ++ #define TOOL_COPYRIGHT "Copyright (c) 2002 Red Hat, Inc." ++--- a/ecos/host/libcdl/build.cxx +++++ b/ecos/host/libcdl/build.cxx ++@@ -57,6 +57,7 @@ ++ // It implicitly supplies , and because ++ // the class definitions rely on these headers. ++ #include +++#include ++ ++ //}}} ++ ++--- a/ecos/host/libcdl/parse.cxx +++++ b/ecos/host/libcdl/parse.cxx ++@@ -58,6 +58,7 @@ ++ // It implicitly supplies , and because ++ // the class definitions rely on these headers. ++ #include +++#include ++ ++ //}}} ++ ++--- a/ecos/host/libcdl/cdlmisc.cxx +++++ b/ecos/host/libcdl/cdlmisc.cxx ++@@ -66,6 +66,7 @@ ++ ++ // For access to strtod() ++ #include +++#include ++ ++ // strtod() involves errno... ++ #include ++--- a/ecos/host/infra/assert.cxx +++++ b/ecos/host/infra/assert.cxx ++@@ -61,6 +61,7 @@ ++ // STDLIB is needed for exit() and the status codes. ++ #include ++ #include +++#include ++ ++ #if defined(__unix__) || defined(__CYGWIN32__) ++ extern "C" { +diff --git a/feeds/packages/utils/reiserfsprogs/.svn/entries b/feeds/packages/utils/reiserfsprogs/.svn/entries +new file mode 100644 +index 0000000..fa59506 +--- /dev/null ++++ b/feeds/packages/utils/reiserfsprogs/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/reiserfsprogs ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++cd118a8158356c85cdabd1f469884798 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1124 ++ +diff --git a/feeds/packages/utils/reiserfsprogs/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/reiserfsprogs/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ac8620 +--- /dev/null ++++ b/feeds/packages/utils/reiserfsprogs/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/reiserfsprogs/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/reiserfsprogs/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..228b687 +--- /dev/null ++++ b/feeds/packages/utils/reiserfsprogs/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2006-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:=reiserfsprogs ++PKG_VERSION:=3.6.21 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/reiserfs/ ++PKG_MD5SUM:=bc00c7c4e047902575dc4e1c64ab3ba4 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/reiserfsprogs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ TITLE:=ReiserFS filesystems utilities ++ URL:=http://www.namesys.com/ ++endef ++ ++define Package/reiserfsprogs/description ++ This package contains utilities to create, check, ++ resize, and debug ReiserFS filesystems. ++endef ++ ++define Package/reiserfsprogs/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(foreach bin,debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs,$(PKG_INSTALL_DIR)/usr/sbin/$(bin)) $(1)/usr/sbin/ ++ ln -sf mkreiserfs $(1)/usr/sbin/mkfs.reiserfs ++ ln -sf reiserfsck $(1)/usr/sbin/fsck.reiserfs ++endef ++ ++$(eval $(call BuildPackage,reiserfsprogs)) +diff --git a/feeds/packages/utils/reiserfsprogs/Makefile b/feeds/packages/utils/reiserfsprogs/Makefile +new file mode 100644 +index 0000000..228b687 +--- /dev/null ++++ b/feeds/packages/utils/reiserfsprogs/Makefile +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2006-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:=reiserfsprogs ++PKG_VERSION:=3.6.21 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/reiserfs/ ++PKG_MD5SUM:=bc00c7c4e047902575dc4e1c64ab3ba4 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/reiserfsprogs ++ SECTION:=utils ++ CATEGORY:=Utilities ++ SUBMENU:=Filesystem ++ TITLE:=ReiserFS filesystems utilities ++ URL:=http://www.namesys.com/ ++endef ++ ++define Package/reiserfsprogs/description ++ This package contains utilities to create, check, ++ resize, and debug ReiserFS filesystems. ++endef ++ ++define Package/reiserfsprogs/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(foreach bin,debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs,$(PKG_INSTALL_DIR)/usr/sbin/$(bin)) $(1)/usr/sbin/ ++ ln -sf mkreiserfs $(1)/usr/sbin/mkfs.reiserfs ++ ln -sf reiserfsck $(1)/usr/sbin/fsck.reiserfs ++endef ++ ++$(eval $(call BuildPackage,reiserfsprogs)) +diff --git a/feeds/packages/utils/remind/.svn/entries b/feeds/packages/utils/remind/.svn/entries +new file mode 100644 +index 0000000..e69de7a +--- /dev/null ++++ b/feeds/packages/utils/remind/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/remind ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-03-13T19:41:25.306447Z ++30934 ++juhosg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++bd287aeeb4bfbd33c7bb9c6529dc89a3 ++2012-03-13T19:41:25.306447Z ++30934 ++juhosg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1070 ++ +diff --git a/feeds/packages/utils/remind/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/remind/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/remind/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/remind/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/remind/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..8f28b3c +--- /dev/null ++++ b/feeds/packages/utils/remind/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=remind ++PKG_VERSION:=03.01.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=remind-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.roaringpenguin.com/files/download/ ++PKG_MD5SUM:=de16cbfc3ee94defcb1abdf78b2ebcd1 ++PKG_CAT:=zcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/remind-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/remind ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Reminder ++ URL:=http://www.roaringpenguin.com/files/download/ ++endef ++ ++define Package/remind/description ++ Remind is a powerfull commadline reminder. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --prefix=/usr --with-linux-headers="$(LINUX_DIR)" \ ++ ) ++endef ++ ++define Package/remind/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/remind $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rem2ps $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/www/rem2html $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,remind)) +diff --git a/feeds/packages/utils/remind/Makefile b/feeds/packages/utils/remind/Makefile +new file mode 100644 +index 0000000..8f28b3c +--- /dev/null ++++ b/feeds/packages/utils/remind/Makefile +@@ -0,0 +1,45 @@ ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=remind ++PKG_VERSION:=03.01.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=remind-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.roaringpenguin.com/files/download/ ++PKG_MD5SUM:=de16cbfc3ee94defcb1abdf78b2ebcd1 ++PKG_CAT:=zcat ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/remind-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/remind ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Reminder ++ URL:=http://www.roaringpenguin.com/files/download/ ++endef ++ ++define Package/remind/description ++ Remind is a powerfull commadline reminder. ++endef ++ ++define Build/Configure ++ $(call Build/Configure/Default, \ ++ --prefix=/usr --with-linux-headers="$(LINUX_DIR)" \ ++ ) ++endef ++ ++define Package/remind/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/remind $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rem2ps $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/www/rem2html $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,remind)) +diff --git a/feeds/packages/utils/restorefactory/.svn/entries b/feeds/packages/utils/restorefactory/.svn/entries +new file mode 100644 +index 0000000..54bc91e +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/restorefactory ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-08T19:14:32.206039Z ++31653 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++5d692598f6bbeaa7592fe3d108db1908 ++2011-05-19T05:26:06.150098Z ++26946 ++cshore ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1025 ++ +diff --git a/feeds/packages/utils/restorefactory/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/restorefactory/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..577592b +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,38 @@ ++# ++# 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:=restorefactory ++PKG_VERSION:=1 ++PKG_RELEASE:=6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/restorefactory ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Mimic original functionality of the reset button ++ MAINTAINER:=Nuno Goncalves ++endef ++ ++define Package/restorefactory/description ++RestoreFactory handles the reset button event and issues a "firstboot" command. ++Button and wait time can be configured with a UCI file. ++endef ++ ++define Build/Compile ++endef ++ ++define Package/restorefactory/install ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/button ++ $(INSTALL_BIN) ./files/hotplug_restorefactory $(1)/etc/hotplug.d/button/50-restorefactory ++ $(INSTALL_DIR) $(1)/etc/uci-defaults ++ $(INSTALL_BIN) ./files/uci_defaults_restorefactory $(1)/etc/uci-defaults/50-restorefactory ++endef ++ ++$(eval $(call BuildPackage,restorefactory)) +diff --git a/feeds/packages/utils/restorefactory/Makefile b/feeds/packages/utils/restorefactory/Makefile +new file mode 100644 +index 0000000..577592b +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/Makefile +@@ -0,0 +1,38 @@ ++# ++# 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:=restorefactory ++PKG_VERSION:=1 ++PKG_RELEASE:=6 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/restorefactory ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Mimic original functionality of the reset button ++ MAINTAINER:=Nuno Goncalves ++endef ++ ++define Package/restorefactory/description ++RestoreFactory handles the reset button event and issues a "firstboot" command. ++Button and wait time can be configured with a UCI file. ++endef ++ ++define Build/Compile ++endef ++ ++define Package/restorefactory/install ++ $(INSTALL_DIR) $(1)/etc/hotplug.d/button ++ $(INSTALL_BIN) ./files/hotplug_restorefactory $(1)/etc/hotplug.d/button/50-restorefactory ++ $(INSTALL_DIR) $(1)/etc/uci-defaults ++ $(INSTALL_BIN) ./files/uci_defaults_restorefactory $(1)/etc/uci-defaults/50-restorefactory ++endef ++ ++$(eval $(call BuildPackage,restorefactory)) +diff --git a/feeds/packages/utils/restorefactory/files/.svn/entries b/feeds/packages/utils/restorefactory/files/.svn/entries +new file mode 100644 +index 0000000..9fd3ee6 +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/restorefactory/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-08T19:14:32.206039Z ++31653 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++uci_defaults_restorefactory ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++256b903d1381c6743d2ea7c6f49b685a ++2012-05-08T19:14:32.206039Z ++31653 ++nunojpg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++243 ++ ++hotplug_restorefactory ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++920e8900f4e5c3ab65bfefda72635543 ++2010-12-19T01:17:57.267577Z ++24696 ++nunojpg ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++856 ++ +diff --git a/feeds/packages/utils/restorefactory/files/.svn/prop-base/hotplug_restorefactory.svn-base b/feeds/packages/utils/restorefactory/files/.svn/prop-base/hotplug_restorefactory.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/.svn/prop-base/hotplug_restorefactory.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/restorefactory/files/.svn/prop-base/uci_defaults_restorefactory.svn-base b/feeds/packages/utils/restorefactory/files/.svn/prop-base/uci_defaults_restorefactory.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/.svn/prop-base/uci_defaults_restorefactory.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/restorefactory/files/.svn/text-base/hotplug_restorefactory.svn-base b/feeds/packages/utils/restorefactory/files/.svn/text-base/hotplug_restorefactory.svn-base +new file mode 100644 +index 0000000..5273499 +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/.svn/text-base/hotplug_restorefactory.svn-base +@@ -0,0 +1,31 @@ ++#!/bin/sh ++ ++system_config() { ++ config_get button "$1" button "reset" ++ config_get action "$1" action "pressed" ++ config_get timeout "$1" timeout "5" ++} ++ ++config_load system ++config_foreach system_config restorefactory ++ ++[ "$BUTTON" = "$button" ] && { ++ ++ [ -f /tmp/run/restorefactory.pid ] && read PID < /tmp/run/restorefactory.pid && kill $PID && rm /tmp/run/restorefactory.pid && logger -p user.info -t "restorefactory" "restore to factory defaults aborted" ++ ++ [ "$ACTION" = "$action" ] && { ++ ++ if [ "$timeout" -gt 0 ] ++ then ++ sleep "$timeout" && firstboot && reboot & ++ echo $! > /tmp/run/restorefactory.pid ++ logger -p user.info -t "restorefactory" "restoring to factory defaults in $timeout seconds" ++ elif [ "$timeout" -eq 0 ] ++ then ++ firstboot && reboot & ++ else ++ logger -p user.info -t "restorefactory" "invalid timeout value ($timeout)" ++ fi ++ } ++} ++ +diff --git a/feeds/packages/utils/restorefactory/files/.svn/text-base/uci_defaults_restorefactory.svn-base b/feeds/packages/utils/restorefactory/files/.svn/text-base/uci_defaults_restorefactory.svn-base +new file mode 100644 +index 0000000..1af088e +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/.svn/text-base/uci_defaults_restorefactory.svn-base +@@ -0,0 +1,10 @@ ++#!/bin/sh ++ ++uci -q show system.@restorefactory[0] || { ++ uci add system restorefactory ++ uci set system.@restorefactory[0].button=reset ++ uci set system.@restorefactory[0].action=pressed ++ uci set system.@restorefactory[0].timeout=5 ++ uci commit ++} ++ +diff --git a/feeds/packages/utils/restorefactory/files/hotplug_restorefactory b/feeds/packages/utils/restorefactory/files/hotplug_restorefactory +new file mode 100755 +index 0000000..5273499 +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/hotplug_restorefactory +@@ -0,0 +1,31 @@ ++#!/bin/sh ++ ++system_config() { ++ config_get button "$1" button "reset" ++ config_get action "$1" action "pressed" ++ config_get timeout "$1" timeout "5" ++} ++ ++config_load system ++config_foreach system_config restorefactory ++ ++[ "$BUTTON" = "$button" ] && { ++ ++ [ -f /tmp/run/restorefactory.pid ] && read PID < /tmp/run/restorefactory.pid && kill $PID && rm /tmp/run/restorefactory.pid && logger -p user.info -t "restorefactory" "restore to factory defaults aborted" ++ ++ [ "$ACTION" = "$action" ] && { ++ ++ if [ "$timeout" -gt 0 ] ++ then ++ sleep "$timeout" && firstboot && reboot & ++ echo $! > /tmp/run/restorefactory.pid ++ logger -p user.info -t "restorefactory" "restoring to factory defaults in $timeout seconds" ++ elif [ "$timeout" -eq 0 ] ++ then ++ firstboot && reboot & ++ else ++ logger -p user.info -t "restorefactory" "invalid timeout value ($timeout)" ++ fi ++ } ++} ++ +diff --git a/feeds/packages/utils/restorefactory/files/uci_defaults_restorefactory b/feeds/packages/utils/restorefactory/files/uci_defaults_restorefactory +new file mode 100755 +index 0000000..1af088e +--- /dev/null ++++ b/feeds/packages/utils/restorefactory/files/uci_defaults_restorefactory +@@ -0,0 +1,10 @@ ++#!/bin/sh ++ ++uci -q show system.@restorefactory[0] || { ++ uci add system restorefactory ++ uci set system.@restorefactory[0].button=reset ++ uci set system.@restorefactory[0].action=pressed ++ uci set system.@restorefactory[0].timeout=5 ++ uci commit ++} ++ +diff --git a/feeds/packages/utils/rng-tools/.svn/entries b/feeds/packages/utils/rng-tools/.svn/entries +new file mode 100644 +index 0000000..d9ffb6b +--- /dev/null ++++ b/feeds/packages/utils/rng-tools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rng-tools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++c23a41fcacbc5775fcd5fc6585b14c11 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1069 ++ +diff --git a/feeds/packages/utils/rng-tools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rng-tools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..474589c +--- /dev/null ++++ b/feeds/packages/utils/rng-tools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=rng-tools ++PKG_VERSION:=3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/gkernel/rng-tools/3/ ++PKG_MD5SUM:=fa305916ec101c85c0065aeceb81a38d ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rng-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+USE_UCLIBC:argp-standalone ++ 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 ++ ++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/feeds/packages/utils/rng-tools/Makefile b/feeds/packages/utils/rng-tools/Makefile +new file mode 100644 +index 0000000..474589c +--- /dev/null ++++ b/feeds/packages/utils/rng-tools/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=rng-tools ++PKG_VERSION:=3 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/gkernel/rng-tools/3/ ++PKG_MD5SUM:=fa305916ec101c85c0065aeceb81a38d ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rng-tools ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+USE_UCLIBC:argp-standalone ++ 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 ++ ++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/feeds/packages/utils/rng-tools/files/.svn/entries b/feeds/packages/utils/rng-tools/files/.svn/entries +new file mode 100644 +index 0000000..270cf9d +--- /dev/null ++++ b/feeds/packages/utils/rng-tools/files/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rng-tools/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:43:45.635911Z ++28917 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++rngd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++08aa9e9fedc56db85cd64fb7be363e62 ++2011-11-09T23:43:45.635911Z ++28917 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++256 ++ +diff --git a/feeds/packages/utils/rng-tools/files/.svn/text-base/rngd.init.svn-base b/feeds/packages/utils/rng-tools/files/.svn/text-base/rngd.init.svn-base +new file mode 100644 +index 0000000..74d23b3 +--- /dev/null ++++ b/feeds/packages/utils/rng-tools/files/.svn/text-base/rngd.init.svn-base +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 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 -t $RNGD_INTERVAL ++} ++ ++stop() { ++ service_stop /sbin/rngd ++} +diff --git a/feeds/packages/utils/rng-tools/files/rngd.init b/feeds/packages/utils/rng-tools/files/rngd.init +new file mode 100644 +index 0000000..74d23b3 +--- /dev/null ++++ b/feeds/packages/utils/rng-tools/files/rngd.init +@@ -0,0 +1,16 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2011 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 -t $RNGD_INTERVAL ++} ++ ++stop() { ++ service_stop /sbin/rngd ++} +diff --git a/feeds/packages/utils/rrdcollect/.svn/entries b/feeds/packages/utils/rrdcollect/.svn/entries +new file mode 100644 +index 0000000..da893e7 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rrdcollect ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:06:52.704042Z ++28957 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0086853735095821218ff63935eb40f9 ++2011-11-11T18:06:52.704042Z ++28957 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4410 ++ +diff --git a/feeds/packages/utils/rrdcollect/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/rrdcollect/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rrdcollect/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rrdcollect/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c79d388 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,158 @@ ++# ++# 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:=rrdcollect ++PKG_VERSION:=0.2.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/rrdcollect ++PKG_MD5SUM:=fd7ac95195e3e5cbab0677629505d9be ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rrdcollect/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://rrdcollect.sourceforge.net/ ++endef ++ ++define Package/rrdcollect/Default/description ++ RRDcollect is a daemon which polls ceratin files in /proc/ ++ directory, gathering data and storing it inside RRDtool's ++ database files. Being written in C should be both fast ++ and resources-friendly. Supports both scanf(3)-style ++ pattern matches and perl compatible regular expressions. ++endef ++ ++define Package/rrdcollect10 ++$(call Package/rrdcollect/Default) ++ TITLE:=Round-Robin Database (RRD) collecting daemon ++ PROVIDES:=rrdcollect ++ DEPENDS:=+librrd1 ++ VARIANT:=rrdtool10 ++endef ++ ++define Package/rrdcollect10/description ++$(call Package/rrdcollect/Default/description) ++ . ++ This package contains the RRD collecting daemon, linked against ++ rrdtool-1.0.x shared library. ++endef ++ ++define Package/rrdcollect12 ++$(call Package/rrdcollect/Default) ++ TITLE:=Round-Robin Database (RRD) collecting daemon ++ PROVIDES:=rrdcollect ++ DEPENDS:=+librrd ++ VARIANT:=rrdtool12 ++endef ++ ++define Package/rrdcollect12/description ++$(call Package/rrdcollect/Default/description) ++ . ++ This package contains the RRD collecting daemon, linked against ++ rrdtool-1.2.x shared library. ++endef ++ ++ ++define Package/rrdcollect10-example ++$(call Package/rrdcollect/Default) ++ TITLE:=Example setup for RRD collecting daemon above ++ DEPENDS:=rrdcollect +rrdtool1 ++ VARIANT:=rrdtool12 ++endef ++ ++define Package/rrdcollect10-example/description ++$(call Package/rrdcollect/Default/description) ++ . ++ This package contains examples for the RRD collecting daemon, using ++ rrdtool-1.0.x shared library and utilities. ++endef ++ ++define Package/rrdcollect12-example ++$(call Package/rrdcollect/Default) ++ TITLE:=Example setup for RRD collecting daemon above ++ DEPENDS:=rrdcollect +rrdtool ++ VARIANT:=rrdtool12 ++endef ++ ++define Package/rrdcollect12-example/description ++$(call Package/rrdcollect/Default/description) ++ This package contains examples for the RRD collecting daemon, using ++ rrdtool-1.2.x shared library and utilities. ++endef ++ ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --enable-exec \ ++ --without-rrdtool \ ++ --with-librrd \ ++ --without-libpcre \ ++ --without-libpcap \ ++ ++CONFIGURE_VARS+= \ ++ CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \ ++ ++EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++ifeq ($(BUILD_VARIANT),rrdtool10) ++ ++ TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/lib/rrdtool-1.0/include $(TARGET_CPPFLAGS) ++ TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/rrdtool-1.0/lib $(TARGET_CPPFLAGS) ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),rrdtool12) ++ ++ TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/lib/rrdtool-1.2/include $(TARGET_CPPFLAGS) ++ TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/rrdtool-1.2/lib $(TARGET_CPPFLAGS) ++ ++endif ++ ++define Package/rrdcollect/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/ ++endef ++ ++Package/rrdcollect10/install = $(Package/rrdcollect/install) ++Package/rrdcollect12/install = $(Package/rrdcollect/install) ++ ++define Package/rrdcollect-example/conffiles ++/etc/rrd.conf ++/etc/rrdcollect.conf ++endef ++ ++define Package/rrdcollect-example/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/rrd.conf $(1)/etc/ ++ $(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) ./files/rrd.sh $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/www/cgi-bin ++ ln -sf /var/lib/rrdcollect/rrd.cgi $(1)/www/cgi-bin/rrd.cgi ++ ln -sf /var/lib/rrdcollect/img $(1)/www/img ++endef ++ ++Package/rrdcollect10-example/install = $(Package/rrdcollect-example/install) ++Package/rrdcollect12-example/install = $(Package/rrdcollect-example/install) ++ ++$(eval $(call BuildPackage,rrdcollect10)) ++$(eval $(call BuildPackage,rrdcollect10-example)) ++$(eval $(call BuildPackage,rrdcollect12)) ++$(eval $(call BuildPackage,rrdcollect12-example)) +diff --git a/feeds/packages/utils/rrdcollect/Makefile b/feeds/packages/utils/rrdcollect/Makefile +new file mode 100644 +index 0000000..c79d388 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/Makefile +@@ -0,0 +1,158 @@ ++# ++# 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:=rrdcollect ++PKG_VERSION:=0.2.4 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/rrdcollect ++PKG_MD5SUM:=fd7ac95195e3e5cbab0677629505d9be ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rrdcollect/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://rrdcollect.sourceforge.net/ ++endef ++ ++define Package/rrdcollect/Default/description ++ RRDcollect is a daemon which polls ceratin files in /proc/ ++ directory, gathering data and storing it inside RRDtool's ++ database files. Being written in C should be both fast ++ and resources-friendly. Supports both scanf(3)-style ++ pattern matches and perl compatible regular expressions. ++endef ++ ++define Package/rrdcollect10 ++$(call Package/rrdcollect/Default) ++ TITLE:=Round-Robin Database (RRD) collecting daemon ++ PROVIDES:=rrdcollect ++ DEPENDS:=+librrd1 ++ VARIANT:=rrdtool10 ++endef ++ ++define Package/rrdcollect10/description ++$(call Package/rrdcollect/Default/description) ++ . ++ This package contains the RRD collecting daemon, linked against ++ rrdtool-1.0.x shared library. ++endef ++ ++define Package/rrdcollect12 ++$(call Package/rrdcollect/Default) ++ TITLE:=Round-Robin Database (RRD) collecting daemon ++ PROVIDES:=rrdcollect ++ DEPENDS:=+librrd ++ VARIANT:=rrdtool12 ++endef ++ ++define Package/rrdcollect12/description ++$(call Package/rrdcollect/Default/description) ++ . ++ This package contains the RRD collecting daemon, linked against ++ rrdtool-1.2.x shared library. ++endef ++ ++ ++define Package/rrdcollect10-example ++$(call Package/rrdcollect/Default) ++ TITLE:=Example setup for RRD collecting daemon above ++ DEPENDS:=rrdcollect +rrdtool1 ++ VARIANT:=rrdtool12 ++endef ++ ++define Package/rrdcollect10-example/description ++$(call Package/rrdcollect/Default/description) ++ . ++ This package contains examples for the RRD collecting daemon, using ++ rrdtool-1.0.x shared library and utilities. ++endef ++ ++define Package/rrdcollect12-example ++$(call Package/rrdcollect/Default) ++ TITLE:=Example setup for RRD collecting daemon above ++ DEPENDS:=rrdcollect +rrdtool ++ VARIANT:=rrdtool12 ++endef ++ ++define Package/rrdcollect12-example/description ++$(call Package/rrdcollect/Default/description) ++ This package contains examples for the RRD collecting daemon, using ++ rrdtool-1.2.x shared library and utilities. ++endef ++ ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --disable-static \ ++ --disable-rpath \ ++ --enable-exec \ ++ --without-rrdtool \ ++ --with-librrd \ ++ --without-libpcre \ ++ --without-libpcap \ ++ ++CONFIGURE_VARS+= \ ++ CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \ ++ ++EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib ++ ++ifeq ($(BUILD_VARIANT),rrdtool10) ++ ++ TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/lib/rrdtool-1.0/include $(TARGET_CPPFLAGS) ++ TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/rrdtool-1.0/lib $(TARGET_CPPFLAGS) ++ ++endif ++ ++ifeq ($(BUILD_VARIANT),rrdtool12) ++ ++ TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/lib/rrdtool-1.2/include $(TARGET_CPPFLAGS) ++ TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/rrdtool-1.2/lib $(TARGET_CPPFLAGS) ++ ++endif ++ ++define Package/rrdcollect/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/ ++endef ++ ++Package/rrdcollect10/install = $(Package/rrdcollect/install) ++Package/rrdcollect12/install = $(Package/rrdcollect/install) ++ ++define Package/rrdcollect-example/conffiles ++/etc/rrd.conf ++/etc/rrdcollect.conf ++endef ++ ++define Package/rrdcollect-example/install ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) ./files/rrd.conf $(1)/etc/ ++ $(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/ ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) ./files/rrd.sh $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/www/cgi-bin ++ ln -sf /var/lib/rrdcollect/rrd.cgi $(1)/www/cgi-bin/rrd.cgi ++ ln -sf /var/lib/rrdcollect/img $(1)/www/img ++endef ++ ++Package/rrdcollect10-example/install = $(Package/rrdcollect-example/install) ++Package/rrdcollect12-example/install = $(Package/rrdcollect-example/install) ++ ++$(eval $(call BuildPackage,rrdcollect10)) ++$(eval $(call BuildPackage,rrdcollect10-example)) ++$(eval $(call BuildPackage,rrdcollect12)) ++$(eval $(call BuildPackage,rrdcollect12-example)) +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/entries b/feeds/packages/utils/rrdcollect/files/.svn/entries +new file mode 100644 +index 0000000..f492e62 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/entries +@@ -0,0 +1,164 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rrdcollect/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:06:52.704042Z ++28957 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++rrdcollect.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++3cbddfd3bce1e49bbf9a2400c5a450fc ++2011-11-11T18:06:52.704042Z ++28957 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++448 ++ ++rrd.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c331da6aaafd6720cd8466961a960f00 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10118 ++ ++rrdcollect.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++02f3f40ea4d8dd0babb81b6d3bcbb2d0 ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1138 ++ ++rrd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++91640006b907ea70a464471588c66bbd ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++16560 ++ +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrd.conf.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrd.sh.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrd.sh.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrd.sh.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrdcollect.conf.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrdcollect.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrdcollect.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrdcollect.init.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrdcollect.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/prop-base/rrdcollect.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrd.conf.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrd.conf.svn-base +new file mode 100644 +index 0000000..4ee13ce +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrd.conf.svn-base +@@ -0,0 +1,381 @@ ++# ++# Author: Christian Rost (chr@baltic-online.de) ++# Purpose: Shell-Interface to rrdtool ++# ++# Configuration-File for rrd.sh ++# ++DATADIR=/var/lib/rrdcollect ++# Location of *.rrd-data-files ++RRDDIR=$DATADIR/rrd ++# Location of *.png-files ++IMGDIR=$DATADIR/img ++# Hostname used in title of png-images ++HOSTNAME="WRT54GS" ++# Location of rrdtool ++RRDTOOL=/usr/bin/rrdtool ++# Location of rrdcgi ++RRDCGI=/usr/bin/rrdcgi ++# Location of generated cgi-script ++RRDCGISCRIPT=$DATADIR/rrd.cgi ++# Image-Path relative to webserver-root ++RRDCGIIMGPATH="/img" ++# Location of netcat (used for fetching data from rrdcollect-daemon) ++NETCAT=/usr/bin/nc ++ ++# Alternative settings for use on external machines ++#RRDDIR=/home/webm/htdocs/stats/rrd/rrd ++#IMGDIR=/home/webm/htdocs/stats/rrd/web ++#RRDTOOL=/opt/rrd/bin/rrdtool ++#RRDCGI=/opt/rrd/bin/rrdcgi ++#RRDCGISCRIPT=/home/webm/cgi-bin/rrd.cgi ++#RRDCGIIMGPATH="/stats/rrd/web" ++#NETCAT=/opt/bin/nc ++ ++ ++#################################################################################### ++# Configuration of statistic sources: ++# ++# Column 1: Time-periods ++# I'm interrested in last-24hour-, last-week- and last-month-plots. ++# Column 2: Define precision/resolution of above three intervalls ++# These values have an impact on the size of your rrd-files, ++# and on the sharpness of your plots ++# RES=1 means maximum precision (every pixel in the plot is individual) ++# RES=4 -> 4 pixel represents one interval ++ ++# Optimized values for storing rather small rrd-files on the openwrt-box ++HOURS=24;H_RES=2;DAYS=7;D_RES=4;WEEKS=4;W_RES=4; ++# Measure-Step (Same value should be in the rrdcollect.conf) Optimal: STEP=$HOURS / $PIXWIDTH * 3600 * $H_RES ++STEP=360; MAXSTEP=`expr $STEP \* 2` ++ ++# Values for storing rrd-files externally outside the router allowing better resolution ++#HOURS=24;H_RES=1;DAYS=32;D_RES=2;WEEKS=50;W_RES=2; ++#STEP=180; MAXSTEP=`expr $STEP \* 2` ++# Even better resolution ++#HOURS=8;H_RES=1;DAYS=32;D_RES=2;WEEKS=50;W_RES=2; ++#STEP=60; MAXSTEP=`expr $STEP \* 2` ++ ++# Format and size of the plots PIXWIDTH will be used in ++# calculating rrd-data-file dimensions during init of rrd-files ++# If you change the size you must change NCGIPIXWIDTH too ++PIXWIDTH=480 ++PIXHEIGHT=120 ++PIXFORMAT=PNG ++ ++# Image-Size of the thumbnail for rrdcgi ++SCGIPIXWIDTH=400 ++# Normal Image-Size for rrdcgi (480px plotsize in rrd) ++NCGIPIXWIDTH=571 ++ ++# Predefined colors ++RED0=#ff0000; RED1=#ff5555; ++GRN0=#009828; GRN1=#81ffa2; ++ORG0=#ff9900; ORG1=#ffc571; ++BLU0=#0030ff; BLU1=#8ba1ff; ++CYA0=#ff00FF; CYA1=#ffbcfe; ++YEL0=#ffff00; YEL1=#e0df76; ++BLK0=#000000; BLK1=#7d7d7d; ++WHI0=#FFFFFF; WHI1=#c1c1c1; ++ ++# Date-String used when creating images with rrd.sh ++DATE=`/bin/date "+%d.%m.%Y %H:%M:%S"` ++ ++# Max-Values bytes/second and packets/second for WAN/Wifi/LAN Interfaces ++MAXWANB=130000 ++MAXWANP=500 ++MAXWIFB=600000 ++MAXWIFP=800 ++MAXLANB=1200000 ++MAXLANP=1000 ++ ++# RRD-Types: ++# GAUGE=save the value itself, no calculations at all ++# COUNTER=continuously increasing value. difference between last 2 values must be positive ! (Traffic-Counter) ++# DERIVE=like counter but can store negative values (rate of change in free disk-space) ++# ++# General syntax: PREFIX_POSTFIX=[-]|Legend|RRD-Type|Maximum|Color|RRD-Plot-Type|Printf-Precision|Optional rrdgraph def-arguments ++ ++################ ++# Sys-Statistics ++################ ++SYS_L01=" l1|System Load (1 min)|GAUGE|U|$YEL0|AREA|%6.2lf" ++SYS_L05=" l2|System Load (5 min)|GAUGE|U|$ORG0|STACK|%6.2lf" ++SYS_L15=" l3|System Load (15 min)|GAUGE|U|$RED0|STACK|%6.2lf" ++ ++SYS_CPN=" cn|CPU nice |COUNTER|U|$YEL0|AREA|%6.2lf%%" ++SYS_CPU=" cu|CPU user |COUNTER|U|$ORG0|STACK|%6.2lf%%" ++SYS_CPS=" cs|CPU system |COUNTER|U|$RED0|STACK|%6.2lf%%" ++SYS_CPI=" ci|CPU idle |COUNTER|U|$GRN0|STACK|%6.2lf%%" ++ ++SYS_MEU=" mu|Memory used |GAUGE|U|$BLU0|AREA" ++SYS_MEF=" mf|Memory free |GAUGE|U|$GRN0|STACK" ++#SYS_MES=" ms|Memory shared |GAUGE|U|$BLK0|LINE1" ++SYS_MEB=" mb|Memory buffer |GAUGE|U|$YEL0|LINE1" ++SYS_MEC=" mc|Memory cached |GAUGE|U|$RED0|LINE1" ++ ++SYS_FUS=" us|Flash Disk Used |GAUGE|U|$BLU0|AREA|%6.2lf%s|CDEF:usC=us,1024,* CDEF:MAXusC=us,1024,*" ++SYS_FAV=" av|Flash Disk Available|GAUGE|U|$GRN0|STACK|%6.2lf%s|CDEF:avC=av,1024,* CDEF:MAXavC=av,1024,*" ++ ++SYS_IRA="ira|Interrupts total |COUNTER|U|$RED0|AREA" ++SYS_IRE="ire|Interrupts eth0 |COUNTER|U|$ORG0|AREA" ++SYS_IRW="irw|Interrupts wifi |COUNTER|U|$YEL0|STACK" ++ ++SYS_PRT=" pt|Processes total |GAUGE|U|$BLU0|AREA|%6.0lf" ++SYS_CTX=" ct|Context switches |COUNTER|U|$RED0|LINE2|%6.0lf" ++SYS_PRR=" pr|Processes active |GAUGE|U|$ORG0|AREA|%6.0lf" ++SYS_ARP="arp|Arp Entries |GAUGE|U|$YEL0|LINE2|%6.0lf" ++SYS_PFK=" fk|Forks |COUNTER|U|$GRN0|LINE2|%6.0lf" ++SYS_CON="con|NAT-Connections |GAUGE|U|$CYA0|LINE2|%6.0lf" ++ ++# Plot-Titles ++MISC_STATS="Misc ($HOSTNAME)" ++DSK_STATS="Flash Disk Usage ($HOSTNAME)" ++USG_STATS="System Load ($HOSTNAME)" ++MEM_STATS="Memory Usage ($HOSTNAME)" ++CPU_STATS="CPU Usage ($HOSTNAME)" ++IRQ_STATS="Interrupts ($HOSTNAME)" ++ ++# Plot-Definitions (sort-order is relevant) ++SYS_CPU_STATS="CPN CPU CPS CPI" ++#SYS_MEM_STATS="MEU MEF MES MEB MEC" ++SYS_MEM_STATS="MEU MEF MEB MEC" ++SYS_USG_STATS="L01 L05 L15" ++SYS_DSK_STATS="FUS FAV" ++SYS_MISC_STATS="PRT PRR ARP PFK CTX CON" ++SYS_IRQ_STATS="IRA IRE IRW" ++ ++# Data-Definition needed by init() ++SYS_ALL="$SYS_CPU_STATS $SYS_MEM_STATS $SYS_USG_STATS $SYS_DSK_STATS $SYS_MISC_STATS $SYS_IRQ_STATS" ++ ++################################################################################################# ++# Wifi Traffic & Wan Traffic & Tunnel Traffic Statistics ; # LAN: vlan0 , WAN: vlan1 , eth1: WIFI ++################################################################################################# ++IF_WLOBY="Wibo |Outgoing Traffic Wifi |COUNTER|$MAXWIFB|$GRN1|AREA" ++IF_WLIBY="-Wibi|Incoming Traffic Wifi |COUNTER|$MAXWIFB|$RED0|AREA" ++IF_WLOPK="Wipo |Outgoing Packets Wifi |COUNTER|$MAXWIFP|$GRN1|AREA|%6.0lf" ++IF_WLIPK="-Wipi|Incoming Packets Wifi |COUNTER|$MAXWIFP|$RED0|AREA|%6.0lf" ++ ++IF_WAIBY="-Wabi|Incoming Traffic Wan |COUNTER|$MAXWANB|$BLU0|AREA" ++IF_WAOBY="Wabo |Outgoing Traffic Wan |COUNTER|$MAXWANB|$ORG1|AREA" ++IF_WAIPK="-Wapi|Incoming Packets Wan |COUNTER|$MAXWANP|$BLU0|AREA|%6.0lf" ++IF_WAOPK="Wapo |Outgoing Packets Wan |COUNTER|$MAXWANP|$ORG1|AREA|%6.0lf" ++ ++IF_LAIBY="-Labi|Incoming Traffic Lan |COUNTER|$MAXLANB|$BLU0|AREA" ++IF_LAOBY="Labo |Outgoing Traffic Lan |COUNTER|$MAXLANB|$ORG1|AREA" ++IF_LAIPK="-Lapi|Incoming Packets Lan |COUNTER|$MAXLANP|$BLU0|AREA|%6.0lf" ++IF_LAOPK="Lapo |Outgoing Packets Lan |COUNTER|$MAXLANP|$ORG1|AREA|%6.0lf" ++ ++#IF_TUIBY="-tbi|Incoming Traffic VPN-Tunnel|COUNTER|$MAXWANB|$CYA0|AREA" ++#IF_TUOBY="tbo |Outgoing Traffic VPN-Tunnel|COUNTER|$MAXWANB|$YEL1|AREA" ++#IF_TUIPK="-tpi|Incoming Packets VPN-Tunnel|COUNTER|$MAXWANP|$CYA0|AREA|%6.0lf" ++#IF_TUOPK="tpo |Outgoing Packets VPN-Tunnel|COUNTER|$MAXWANP|$YEL1|AREA|%6.0lf" ++ ++# Plot-Titles ++WIFI_TRAFFIC="Wifi Interface Traffic Statistics ($HOSTNAME)" ++WIFI_PACKETS="Wifi Interface Packets Statistics ($HOSTNAME)" ++WAN_TRAFFIC="Wan Interface Traffic Statistics ($HOSTNAME)" ++WAN_PACKETS="Wan Interface Packets Statistics ($HOSTNAME)" ++LAN_TRAFFIC="Lan Interface Traffic Statistics ($HOSTNAME)" ++LAN_PACKETS="Lan Interface Packets Statistics ($HOSTNAME)" ++ ++#TUN_TRAFFIC="VPN-Tunnel Interface Traffic Statistics ($HOSTNAME)" ++#TUN_PACKETS="VPN-Tunnel Interface Packets Statistics ($HOSTNAME)" ++ ++# Plot-Definitions (sort-order is relevant) ++IF_WIFI_TRAFFIC="WLOBY WLIBY" ++IF_WIFI_PACKETS="WLOPK WLIPK" ++IF_WAN_TRAFFIC="WAIBY WAOBY" ++IF_WAN_PACKETS="WAIPK WAOPK" ++IF_LAN_TRAFFIC="LAIBY LAOBY" ++IF_LAN_PACKETS="LAIPK LAOPK" ++#IF_TUN_TRAFFIC="TUIBY TUOBY" ++#IF_TUN_PACKETS="TUIPK TUOPK" ++ ++# Data-Definition needed by init() ++#IF_ALL="$IF_WIFI_TRAFFIC $IF_WIFI_PACKETS $IF_WAN_TRAFFIC $IF_WAN_PACKETS $IF_TUN_TRAFFIC $IF_TUN_PACKETS" ++IF_ALL="$IF_LAN_TRAFFIC $IF_LAN_PACKETS $IF_WAN_TRAFFIC $IF_WAN_PACKETS $IF_WIFI_TRAFFIC $IF_WIFI_PACKETS" ++ ++############################################## ++# Port Traffic Statistics for Port 1 - Port 4 ++############################################## ++#PT_OPK1="po1 |Port 1 Outgoing Packets |COUNTER|U|$ORG1|AREA|%6.0lf" ++#PT_IPK1="-pi1|Port 1 Incoming Packets |COUNTER|U|$GRN0|AREA|%6.0lf" ++#PT_COL1="cl1 |Port 1 Collisions |COUNTER|U|$BLU0|AREA|%6.0lf" ++#PT_ERR1="er1 |Port 1 Errors |COUNTER|U|$CYA0|AREA|%6.0lf" ++#PT_OBY1="bo1 |Port 1 Outgoing Traffic |COUNTER|U|$ORG1|AREA" ++#PT_IBY1="-bi1|Port 1 Incoming Traffic |COUNTER|U|$GRN0|AREA" ++#PT_OPK2="po2 |Port 2 Outgoing Packets |COUNTER|U|$RED1|AREA|%6.0lf" ++#PT_IPK2="-pi2|Port 2 Incoming Packets |COUNTER|U|$BLK0|AREA|%6.0lf" ++#PT_COL2="cl2 |Port 2 Collisions |COUNTER|U|$GRN0|AREA|%6.0lf" ++#PT_ERR2="er2 |Port 2 Errors |COUNTER|U|$ORG0|AREA|%6.0lf" ++#PT_OBY2="bo2 |Port 2 Outgoing Traffic |COUNTER|U|$RED1|AREA" ++#PT_IBY2="-bi2|Port 2 Incoming Traffic |COUNTER|U|$BLK0|AREA" ++#PT_OPK3="po3 |Port 3 Outgoing Packets |COUNTER|U|$BLU1|AREA|%6.0lf" ++#PT_IPK3="-pi3|Port 3 Incoming Packets |COUNTER|U|$CYA0|AREA|%6.0lf" ++#PT_COL3="cl3 |Port 3 Collisions |COUNTER|U|$GRN0|AREA|%6.0lf" ++#PT_ERR3="er3 |Port 3 Errors |COUNTER|U|$ORG0|AREA|%6.0lf" ++#PT_OBY3="bo3 |Port 3 Outgoing Traffic |COUNTER|U|$BLU1|AREA" ++#PT_IBY3="-bi3|Port 3 Incoming Traffic |COUNTER|U|$CYA0|AREA" ++#PT_OPK4="po4 |Port 4 Outgoing Packets |COUNTER|U|$YEL1|AREA|%6.0lf" ++#PT_IPK4="-pi4|Port 4 Incoming Packets |COUNTER|U|$CYA0|AREA|%6.0lf" ++#PT_COL4="cl4 |Port 4 Collisions |COUNTER|U|$BLK0|AREA|%6.0lf" ++#PT_ERR4="er4 |Port 4 Errors |COUNTER|U|$RED0|AREA|%6.0lf" ++#PT_OBY4="bo4 |Port 4 Outgoing Traffic |COUNTER|U|$YEL1|AREA" ++#PT_IBY4="-bi4|Port 4 Incoming Traffic |COUNTER|U|$CYA0|AREA" ++ ++# Plot-Titles ++#TRAFFIC_1="Traffic Statistics Port 1 ($HOSTNAME)" ++#TRAFFIC_2="Traffic Statistics Port 2 ($HOSTNAME)" ++#TRAFFIC_3="Traffic Statistics Port 3 ($HOSTNAME)" ++#TRAFFIC_4="Traffic Statistics Port 4 ($HOSTNAME)" ++#PACKETS_1="Packet Statistics Port 1 ($HOSTNAME)" ++#PACKETS_2="Packet Statistics Port 2 ($HOSTNAME)" ++#PACKETS_3="Packet Statistics Port 3 ($HOSTNAME)" ++#PACKETS_4="Packet Statistics Port 4 ($HOSTNAME)" ++ ++# Plot-Definitions (sort-order is relevant) ++#PT_TRAFFIC_1="OBY1 IBY1" ++#PT_TRAFFIC_2="OBY2 IBY2" ++#PT_TRAFFIC_3="OBY3 IBY3" ++#PT_TRAFFIC_4="OBY4 IBY4" ++#PT_PACKETS_1="OPK1 IPK1 COL1 ERR1" ++#PT_PACKETS_2="OPK2 IPK2 COL2 ERR2" ++#PT_PACKETS_3="OPK3 IPK3 COL3 ERR3" ++#PT_PACKETS_4="OPK4 IPK4 COL4 ERR4" ++#PT_PACKETS_1="OPK1 IPK1" ++#PT_PACKETS_2="OPK2 IPK2" ++#PT_PACKETS_3="OPK3 IPK3" ++#PT_PACKETS_4="OPK4 IPK4" ++ ++# Data Definition needed by init() ++#PT_ALL="$PT_TRAFFIC_1 $PT_TRAFFIC_2 $PT_TRAFFIC_3 $PT_TRAFFIC_4 $PT_PACKETS_1 $PT_PACKETS_2 $PT_PACKETS_3 $PT_PACKETS_4" ++ ++################################# ++# Traffic Priorisation Statistics ++################################# ++#TC_APRIB="bwa|Ack Priority Queue Bandwidth |COUNTER|$MAXWANB|$YEL0|AREA" ++#TC_DPRIB="bwd|Default Priority Queue Bandwidth |COUNTER|$MAXWANB|$ORG0|STACK" ++#TC_HPRIB="bwh|High Priority Queue Bandwidth |COUNTER|$MAXWANB|$RED0|STACK" ++#TC_LPRIB="bwl|Low Priority Queue Bandwidth |COUNTER|$MAXWANB|$GRN0|STACK" ++#TC_APRID="dra|Ack Priority Queue Packet Dropped |COUNTER|100|$YEL0|AREA" ++#TC_DPRID="drd|Default Priority Queue Packet Dropped|COUNTER|100|$ORG0|STACK" ++#TC_HPRID="drh|High Priority Queue Packet Dropped |COUNTER|100|$RED0|STACK" ++#TC_LPRID="drl|Low Priority Queue Packet Dropped |COUNTER|100|$GRN0|STACK" ++ ++# Plot-Titles ++#TRAFFIC="Traffic Priorisation Stats" ++#PACKETS="Packet Priorisation Stats" ++ ++# Plot-Definitions (sort-order is relevant) ++#TC_TRAFFIC="APRIB DPRIB HPRIB LPRIB" ++#TC_PACKETS="APRID DPRID HPRID LPRID" ++ ++# Data Definition needed by init() ++#TC_ALL="$TC_TRAFFIC $TC_PACKETS" ++ ++################################# ++# Firewall Packet Drop Statistics ++################################# ++#PC_WIN="win|Windows Traffic |COUNTER|U|$YEL0|AREA" ++#PC_INV="inv|Invalid State Traffic |COUNTER|U|$ORG0|STACK" ++#PC_TCP="tcp|TCP Packets |COUNTER|U|$RED0|STACK" ++#PC_OTH="oth|Other Packets |COUNTER|U|$BLU0|STACK" ++ ++# Plot-Titles ++#DROPPED="Firewall Packet Drop Statistics" ++ ++# Plot-Definitions (sort-order is relevant) ++#PC_DROPPED="WIN INV TCP OTH" ++ ++# Data Definition needed by init() ++#PC_ALL="$PC_DROPPED" ++ ++########################## ++# Traffic Accounting Stats ++########################## ++#ACI="Incoming for "; ACO="Outgoing for " ++#IP14="notebook"; COL14=$ORG0; COL_14=$ORG1 ++#IP15="saugi "; COL15=$RED0; COL_15=$RED1 ++#IP20="aplink "; COL20=$GRN0; COL_20=$GRN1 ++#IP50="sunny "; COL50=$BLU0; COL_50=$BLU1 ++ ++#TYPE=AREA ++#for i in 15 50 20 14 ++#do ++# # Packet-Statistics ++# eval AC_TIP$i='-TIP$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL$i\|$TYPE" ++# eval AC_TOP$i='TOP$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL_$i\|$TYPE" ++# eval AC_UIP$i='-UIP$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL$i\|$TYPE" ++# eval AC_UOP$i='UOP$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL_$i\|$TYPE" ++# eval AC_IIP$i='-IIP$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL$i\|$TYPE" ++# eval AC_IOP$i='IOP$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL_$i\|$TYPE" ++# # Traffic Statistics ++# eval AC_TIB$i='-TIB$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL$i\|$TYPE" ++# eval AC_TOB$i='TOB$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL_$i\|$TYPE" ++# eval AC_UIB$i='-UIB$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL$i\|$TYPE" ++# eval AC_UOB$i='UOB$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL_$i\|$TYPE" ++# eval AC_IIB$i='-IIB$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL$i\|$TYPE" ++# eval AC_IOB$i='IOB$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL_$i\|$TYPE" ++# # Plot-Definitions (sort-order is relevant) ++# AC_TB_O="$AC_TB_O TOB$i"; AC_TB_I="$AC_TB_I TIB$i" ++# AC_TP_O="$AC_TP_O TOP$i"; AC_TP_I="$AC_TP_I TIP$i" ++# AC_UB_O="$AC_UB_O UOB$i"; AC_UB_I="$AC_UB_I UIB$i" ++# AC_UP_O="$AC_UP_O UOP$i"; AC_UP_I="$AC_UP_I UIP$i" ++# AC_IB_O="$AC_IB_O IOB$i"; AC_IB_I="$AC_IB_I IIB$i" ++# AC_IP_O="$AC_IP_O IOP$i"; AC_IP_I="$AC_IP_I IIP$i" ++# TYPE=STACK ++#done ++#AC_TB="$AC_TB_O $AC_TB_I"; AC_TP="$AC_TP_O $AC_TP_I" ++#AC_UB="$AC_UB_O $AC_UB_I"; AC_UP="$AC_UP_O $AC_UP_I" ++#AC_IB="$AC_IB_O $AC_IB_I"; AC_IP="$AC_IP_O $AC_IP_I"; ++ ++# Plot-Titles ++#TB="TCP Traffic Accounting Stats ($HOSTNAME)"; TP="TCP Packet Accounting Stats ($HOSTNAME)" ++#UB="UDP Traffic Accounting Stats ($HOSTNAME)"; UP="UDP Packet Accounting Stats ($HOSTNAME)" ++#IB="ICMP Traffic Accounting Stats ($HOSTNAME)";IP="ICMP Packet Accounting Stats ($HOSTNAME)" ++ ++# Data Definition needed by init() ++#AC_ALL="$AC_TB $AC_TP $AC_UB $AC_UP $AC_IB $AC_IP" ++ ++ ++# System Statistics ++GRAPH_1="SYS|USG_STATS|$USG_STATS|Load" ++GRAPH_2="SYS|CPU_STATS|$CPU_STATS|CPU-Time_in_%|1000|--upper-limit 100 --rigid --logarithmic --lower-limit 0.1" ++GRAPH_3="SYS|MEM_STATS|$MEM_STATS|Bytes|1024" ++GRAPH_4="SYS|DSK_STATS|$DSK_STATS|Bytes|1024" ++GRAPH_5="SYS|MISC_STATS|$MISC_STATS|_|1000|--logarithmic" ++GRAPH_6="SYS|IRQ_STATS|$IRQ_STATS|IRQ_per_second|1000" ++# Interface Traffic Statistics ++GRAPH_7="IF|LAN_TRAFFIC|$LAN_TRAFFIC|Bytes_per_second" ++GRAPH_8="IF|LAN_PACKETS|$LAN_PACKETS|Packets_per_second" ++GRAPH_9="IF|WAN_TRAFFIC|$WAN_TRAFFIC|Bytes_per_second" ++GRAPH_10="IF|WAN_PACKETS|$WAN_PACKETS|Packets_per_second" ++GRAPH_11="IF|WIFI_TRAFFIC|$WIFI_TRAFFIC|Bytes_per_second" ++GRAPH_12="IF|WIFI_PACKETS|$WIFI_PACKETS|Packets_per_second" ++#GRAPH_11="IF|TUN_TRAFFIC|$TUN_TRAFFIC|Bytes_per_second" ++#GRAPH_12="IF|TUN_PACKETS|$TUN_PACKETS|Packets_per_second" ++# Port Traffic Statistics ++#GRAPH_13="PT|TRAFFIC_1|$TRAFFIC_1|Bytes_per_second" ++#GRAPH_14="PT|PACKETS_1|$PACKETS_1|Packets_per_second" ++#GRAPH_15="PT|TRAFFIC_2|$TRAFFIC_2|Bytes_per_second" ++#GRAPH_16="PT|PACKETS_2|$PACKETS_2|Packets_per_second" ++#GRAPH_17="PT|TRAFFIC_3|$TRAFFIC_3|Bytes_per_second" ++#GRAPH_18="PT|PACKETS_3|$PACKETS_3|Packets_per_second" ++#GRAPH_19="PT|TRAFFIC_4|$TRAFFIC_4|Bytes_per_second" ++#GRAPH_20="PT|PACKETS_4|$PACKETS_4|Packets_per_second" ++# Traffic Priorisation Statistics ++# GRAPH_21="TC|TRAFFIC|$TRAFFIC|Bytes_per_second|1000|--logarithmic" ++# GRAPH_22="TC|PACKETS|$PACKETS|Packets_per_second" ++# Accounting Statistics ++#GRAPH_23="AC|TB|$TB|Bytes_per_second" ++#GRAPH_24="AC|TP|$TP|Packets_per_second" ++#GRAPH_25="AC|UB|$UB|Bytes_per_second" ++#GRAPH_26="AC|UP|$UP|Packets_per_second" ++#GRAPH_27="AC|IB|$IB|Bytes_per_second" ++#GRAPH_28="AC|IP|$IP|Packets_per_second" ++# Firewall Drop Statistics ++#GRAPH_29="PC|DROPPED|$DROPPED|Packets_per_second" ++ ++#ALL_PRAEFIXES="SYS IF PT TC AC PC" ++ALL_PRAEFIXES="SYS IF" ++GRAPH_MAX=12 +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrd.sh.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrd.sh.svn-base +new file mode 100644 +index 0000000..3faa4fb +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrd.sh.svn-base +@@ -0,0 +1,288 @@ ++#!/bin/sh ++# ++# Author: Christian Rost (chr@baltic-online.de) ++# Purpose: Shell-Interface to rrdtool ++# ++RRDCNF=/etc/rrd.conf ++. $RRDCNF ++ ++###################################### ++# init() function to create .rrd-file ++# $1=VAR-PRAEFIX $2=VAR-POSTFIX ++###################################### ++init() ++{ ++ # Calculate optimal step by assuming highest precision on the last-xhour plot ++ OPTSTEP=`expr $HOURS \* 3600 \/ $PIXWIDTH \* $H_RES` ++ [ $OPTSTEP != $STEP ] && echo "WARNING: Your optimal step is: $OPTSTEP. But you are using: $STEP" ++ ++ ARH_AVG=`expr $HOURS \* 3600 \/ $PIXWIDTH \* $H_RES \/ $STEP`; ARH_CNT=`expr $HOURS \* 3600 \/ $ARH_AVG \/ $STEP` ++ ARD_AVG=`expr $DAYS \* 86400 \/ $PIXWIDTH \* $D_RES \/ $STEP`; ARD_CNT=`expr $DAYS \* 86400 \/ $ARD_AVG \/ $STEP` ++ ARW_AVG=`expr $WEEKS \* 604800 \/ $PIXWIDTH \* $W_RES \/ $STEP`; ARW_CNT=`expr $WEEKS \* 604800 \/ $ARW_AVG \/ $STEP` ++ ++ PRAEFIX=$1; POSTFIX=$2 ++ DSOURCE="" ++ ++ echo "Init storage for $HOURS hours on averages: $ARH_AVG x $STEP seconds ($ARH_CNT total values)" ++ echo "Init storage for $DAYS days on averages: $ARD_AVG x $STEP seconds ($ARD_CNT total values)" ++ echo "Init storage for $WEEKS weeks on averages: $ARW_AVG x $STEP seconds ($ARW_CNT total values)" ++ ++ eval SOURCE=\$${PRAEFIX}_${POSTFIX} ++ for i in $SOURCE ++ do ++ eval var=\$${PRAEFIX}_${i} ++ ifs="$IFS"; IFS="|"; set -- $var ++ if [ "`echo ${1} | cut -b1`" = "-" ] ++ then ++ VAR="`echo ${1} | cut -b2-`" ++ else ++ VAR=`echo $1 | sed "s/ //g"` ++ fi ++ DSOURCE="$DSOURCE DS:${VAR}:${3}:$MAXSTEP:0:${4}" ++ IFS="$ifs" ++ done ++ $DEBUG $RRDTOOL create $RRDDIR/$PRAEFIX.rrd \ ++ --step ${STEP} \ ++ $DSOURCE \ ++ RRA:AVERAGE:0.5:$ARH_AVG:$ARH_CNT \ ++ RRA:AVERAGE:0.5:$ARD_AVG:$ARD_CNT \ ++ RRA:AVERAGE:0.5:$ARW_AVG:$ARW_CNT \ ++ RRA:MAX:0.5:$ARH_AVG:$ARH_CNT \ ++ RRA:MAX:0.5:$ARD_AVG:$ARD_CNT \ ++ RRA:MAX:0.5:$ARW_AVG:$ARW_CNT ++ return $? ++} ++ ++################################################################################################################# ++# graph() function to create png-graphics ++# $1=IMG-DIR $2=VAR-PRAEFIX, $3=VAR-POSTFIX, $4=Headline, $5=end, $6=start, $7=base, ++# $8=DEFS/ENTRIES $9=other rrdgraph options (Vertlabel,...) ++################################################################################################################# ++# COMMENT:"$DATE\c" ++do_rrdgraph() ++{ ++ $DEBUG $NICE $RRDTOOL graph "$1/$2_$3.png" \ ++ --title "$4" \ ++ --imgformat $PIXFORMAT \ ++ --width $PIXWIDTH \ ++ --height $PIXHEIGHT \ ++ --end "$5" \ ++ --start "$6" \ ++ --base "$7" \ ++ $8 $9 ++} ++ ++################################################################################################################# ++# graph() function to create png-graphics ++# $1=IMG-DIR $2=VAR-PRAEFIX, $3=VAR-POSTFIX, $4=Headline, $5=end, $6=start, $7=base, ++# $8=DEFS/ENTRIES $9=other rrdgraph options (Vertlabel,...) ++################################################################################################################# ++# COMMENT:"\c" ++do_rrdcgi() ++{ ++ cat << EOF > $1/$2_$3.def ++ ++$2_$3.png \ ++--title "$4" \ ++--imgformat $PIXFORMAT \ ++--width $PIXWIDTH \ ++--height $PIXHEIGHT \ ++--end "$5" \ ++--start \ ++--base $7 \ ++--imginfo "" \ ++--lazy \ ++$8 $9 > ++EOF ++ ++ cat << EOF >> $RRDCGISCRIPT ++$NEWLINE $4
++ ++ ++EOF ++} ++ ++ ++ ++gen_cgi_header() ++{ ++ cat << EOF > $RRDCGISCRIPT ++#!$RRDCGI ++RRDCGI Router Statistics ++ ++ ++

RRDCGI Router Statistics ()

++
++ ${HOURS} hours ago ++ ${DAYS} days ago ++ ${WEEKS} weeks ago ++ ++
++

++ ++EOF ++} ++ ++gen_cgi_footer() ++{ ++ cat << EOF >> $RRDCGISCRIPT ++
++

++ ++ ++EOF ++ chmod +x $RRDCGISCRIPT ++} ++ ++################################################################################################################# ++# $1=mode $2=VAR-PRAEFIX, $3=VAR-POSTFIX, $4=Headline, $5=Vertlabel, $6=start, $7=end, $8=base, $9=other rrdgraph options ++################################################################################################################# ++do_graph() ++{ ++ MODE=$1; PRAEFIX=$2; POSTFIX=$3; HEADLINE=$4; VERTLABEL=$5; START=$6; END=$7; BASE=$8; SRC=${RRDDIR}/${PRAEFIX}.rrd ++ if [ ! -r "$SRC" ] ++ then ++ echo "$SRC not found. Aborting all operations now..." ++ exit 1 ++ fi ++ ++ # For Graphing Memory BASE should be set to 1024, default is 1000 ++ [ -n "$8" ] && BASE=$8 || BASE=1000 ++ [ -n "$9" ] && OPTS=$9 || OPTS="--lower-limit 0" ++ DEFS=""; ENTRIES="" ++ eval SOURCE=\$${PRAEFIX}_${POSTFIX} ++ for i in $SOURCE ++ do ++ eval var=\$${PRAEFIX}_${i} ++ ifs="$IFS"; IFS="|"; set -- $var ++ if [ "`echo ${1} | cut -b1`" = "-" ] ++ then ++ VAR="`echo ${1} | cut -b2-`" ++ NEG=1 ++ else ++ VAR=`echo $1 | sed "s/ //g"` ++ NEG=0 ++ fi ++ ++ if [ "$NEG" = 1 ] ++ then ++ [ -n "${8}" ] && DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX ${8} CDEF:N${VAR}C=${VAR}C,-1,* " \ ++ || DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX CDEF:N${VAR}=${VAR},-1,*" ++ else ++ [ -n "${8}" ] && DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX ${8}" \ ++ || DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX" ++ fi ++ # Now this is a bit ugly, but i don't know how to escape the blanks in a proper way. ++ # If you know any better way to keep the blanks in the legend of the graphics please inform me. ++ #L=`echo ${2} | tr -s "[= =]" '\014'` ++ #L=`echo ${2} | tr -s "[= =]" '_'` ++ L=`echo ${2} | sed "s/ /_/g"` ++ if [ -n "${7}" ] ++ then ++ if [ -n "${8}" ] ++ then ++ [ "$NEG" = 1 ] && ENTRIES="$ENTRIES ${6}:N${VAR}C${5}:${L}: GPRINT:${VAR}C:AVERAGE:Average\:${7} GPRINT:MAX${VAR}C:MAX:Max\:${7} GPRINT:${VAR}C:LAST:Last\:${7}\\j" \ ++ || ENTRIES="$ENTRIES ${6}:${VAR}C${5}:${L}: GPRINT:${VAR}C:AVERAGE:Average\:${7} GPRINT:MAX${VAR}C:MAX:Max\:${7} GPRINT:${VAR}C:LAST:Last\:${7}\\j" ++ else ++ [ "$NEG" = 1 ] && ENTRIES="$ENTRIES ${6}:N${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:${7} GPRINT:MAX${VAR}:MAX:Max\:${7} GPRINT:${VAR}:LAST:Last\:${7}\\j" \ ++ || ENTRIES="$ENTRIES ${6}:${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:${7} GPRINT:MAX${VAR}:MAX:Max\:${7} GPRINT:${VAR}:LAST:Last\:${7}\\j" ++ fi ++ else ++ [ "$NEG" = 1 ] && ENTRIES="$ENTRIES ${6}:N${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:%6.2lf%s GPRINT:MAX${VAR}:MAX:Max\:%6.0lf%s GPRINT:${VAR}:LAST:Last\:%6.2lf%s\\j" \ ++ || ENTRIES="$ENTRIES ${6}:${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:%6.2lf%s GPRINT:MAX${VAR}:MAX:Max\:%6.0lf%s GPRINT:${VAR}:LAST:Last\:%6.2lf%s\\j" ++ fi ++ IFS="$ifs" ++ done ++ ++ #[ "$POSTFIX" = "CPU_STATS" ] && (echo $OPTS; echo $DEFS ; echo $ENTRIES; echo $OPTS) ++ ++ $MODE "$IMGDIR" "$PRAEFIX" "$POSTFIX" "$HEADLINE" "$END" "$START" "$BASE" "$DEFS $ENTRIES" "--vertical-label $VERTLABEL $OPTS" ++} ++ ++# Check if all rrd-files are present ++# and create them if not ++init_loop() ++{ ++ for j in $ALL_PRAEFIXES ++ do ++ if [ ! -f $RRDDIR/$j.rrd ] ++ then ++ echo "Creating $RRDDIR/$j.rrd ..." ++ init $j ALL ++ [ ! -f $RRDDIR/$j.rrd ] && EXIT=1 ++ fi ++ done ++ [ "$EXIT" = 1 ] && return 1 || return 0 ++} ++ ++ ++graph_loop() ++{ ++ mode=$1; start=$2; end=$3; c=1 ++ while [ $c -le $GRAPH_MAX ] ++ do ++ eval var=\$GRAPH_${c} ++ # $1=VAR-PRAEFIX $2=VAR-POSTFIX $3=Headline $4=Vertlabel $5=base $6=other rrdgraph options ++ ifs="$IFS"; IFS="|"; set -- $var ++ IFS="$ifs" ++ [ "$1" != "$OLD" -o "`expr \( $c - 1 \) % 2`" = 0 ] && NEWLINE="" || NEWLINE="" ++ do_graph $mode $1 $2 "$3" "$4" $start $end $5 "$6" ++ c=`expr $c + 1`; OLD=$1 ++ done ++} ++ ++ ++case "$1" in ++ init) ++ if init_loop ++ then ++ exit 0 ++ else ++ echo "Initialisation of rrd-database-files failed" ++ exit 1 ++ fi ++ ;; ++ cgi) ++ echo "Updating $RRDCGISCRIPT and $IMGDIR/*.def" ++ gen_cgi_header ++ # The start-time will be not used ++ graph_loop do_rrdcgi end now ++ gen_cgi_footer ++ ;; ++ images) ++ # Create the graphs ++ [ -n "$2" ] && STH=$2 || STH=24h ++ echo "Updating Graphs ($STH ago -> now) for $RRDDIR/*.rrd" ++ graph_loop do_rrdgraph "end-${STH}" now ++ ;; ++ fetch) ++ # Fetch data from rrdcollect daemon ++ if [ ! -n "$3" ] ++ then ++ echo "Usage: $0 fetch " ++ exit 1 ++ else ++ echo "Fetching ascii-logs from rrdcollect daemon" ++ (cd $RRDDIR && $NETCAT $2 $3 | sed -n "s:^\(update .*\):$RRDTOOL \1:p" | sh -x ) 2>&1 | wc -l #>/dev/null ++ exit 0 ++ fi ++ ;; ++ *) echo "Usage: $0 " ++ echo " init: Initialize rrd-datafiles if neeeded" ++ echo " cgi: Creates cgi-script for use with rrdcgi" ++ echo " fetch: Fetching data from rrdcollect via netcat" ++ echo " images: Generates images" ++ exit 1 ++ ;; ++esac ++exit 0 +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrdcollect.conf.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrdcollect.conf.svn-base +new file mode 100644 +index 0000000..e34c9bf +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrdcollect.conf.svn-base +@@ -0,0 +1,33 @@ ++step = 360 ++directory = /var/lib/rrdcollect/rrd ++ ++file:///proc/stat ++"cpu0 %d %d %d %d" SYS.rrd:cu,cn,cs,ci ++"ctxt %u" SYS.rrd:ct ++"processes %u" SYS.rrd:fk ++"intr %u" SYS.rrd:ira ++ ++file:///proc/meminfo ++#"Mem: %*d %d %d %d %d %d" SYS.rrd:mu,mf,ms,mb,mc ++"Mem: %*d %d %d %*d %d %d" SYS.rrd:mu,mf,mb,mc ++ ++file:///proc/loadavg ++"%f %f %f %d/%d %*d" SYS.rrd:l1,l2,l3,pr,pt ++ ++exec:///bin/df ++"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av ++ ++# LAN: vlan0, WAN: vlan1, WIFI: eth1 ++file:///proc/net/dev ++" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo ++" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo ++" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo ++#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo ++ ++file:///proc/slabinfo ++"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con ++"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp ++ ++file:///proc/interrupts ++" 4: %d MIPS eth1" SYS.rrd:irw ++" 5: %d MIPS eth0" SYS.rrd:ire +diff --git a/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrdcollect.init.svn-base b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrdcollect.init.svn-base +new file mode 100644 +index 0000000..9099c4b +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/.svn/text-base/rrdcollect.init.svn-base +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=98 ++ ++SERVICE_USE_PID=1 ++ ++LIB_D=/var/lib/rrdcollect ++CGI_S=$LIB_D/rrd.cgi ++IMG_D=$LIB_D/img ++RRD_D=$LIB_D/rrd ++ ++start() { ++ RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null) ++ mkdir -m 0755 -p $IMG_D ++ mkdir -m 0755 -p $RRD_D ++ [ -n "$RRD_F" ] || /usr/bin/rrd.sh init ++ [ -x $CGI_S ] || /usr/bin/rrd.sh cgi ++ service_start /usr/sbin/rrdcollect ++} ++ ++stop() { ++ service_stop /usr/sbin/rrdcollect ++} ++ +diff --git a/feeds/packages/utils/rrdcollect/files/rrd.conf b/feeds/packages/utils/rrdcollect/files/rrd.conf +new file mode 100644 +index 0000000..4ee13ce +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/rrd.conf +@@ -0,0 +1,381 @@ ++# ++# Author: Christian Rost (chr@baltic-online.de) ++# Purpose: Shell-Interface to rrdtool ++# ++# Configuration-File for rrd.sh ++# ++DATADIR=/var/lib/rrdcollect ++# Location of *.rrd-data-files ++RRDDIR=$DATADIR/rrd ++# Location of *.png-files ++IMGDIR=$DATADIR/img ++# Hostname used in title of png-images ++HOSTNAME="WRT54GS" ++# Location of rrdtool ++RRDTOOL=/usr/bin/rrdtool ++# Location of rrdcgi ++RRDCGI=/usr/bin/rrdcgi ++# Location of generated cgi-script ++RRDCGISCRIPT=$DATADIR/rrd.cgi ++# Image-Path relative to webserver-root ++RRDCGIIMGPATH="/img" ++# Location of netcat (used for fetching data from rrdcollect-daemon) ++NETCAT=/usr/bin/nc ++ ++# Alternative settings for use on external machines ++#RRDDIR=/home/webm/htdocs/stats/rrd/rrd ++#IMGDIR=/home/webm/htdocs/stats/rrd/web ++#RRDTOOL=/opt/rrd/bin/rrdtool ++#RRDCGI=/opt/rrd/bin/rrdcgi ++#RRDCGISCRIPT=/home/webm/cgi-bin/rrd.cgi ++#RRDCGIIMGPATH="/stats/rrd/web" ++#NETCAT=/opt/bin/nc ++ ++ ++#################################################################################### ++# Configuration of statistic sources: ++# ++# Column 1: Time-periods ++# I'm interrested in last-24hour-, last-week- and last-month-plots. ++# Column 2: Define precision/resolution of above three intervalls ++# These values have an impact on the size of your rrd-files, ++# and on the sharpness of your plots ++# RES=1 means maximum precision (every pixel in the plot is individual) ++# RES=4 -> 4 pixel represents one interval ++ ++# Optimized values for storing rather small rrd-files on the openwrt-box ++HOURS=24;H_RES=2;DAYS=7;D_RES=4;WEEKS=4;W_RES=4; ++# Measure-Step (Same value should be in the rrdcollect.conf) Optimal: STEP=$HOURS / $PIXWIDTH * 3600 * $H_RES ++STEP=360; MAXSTEP=`expr $STEP \* 2` ++ ++# Values for storing rrd-files externally outside the router allowing better resolution ++#HOURS=24;H_RES=1;DAYS=32;D_RES=2;WEEKS=50;W_RES=2; ++#STEP=180; MAXSTEP=`expr $STEP \* 2` ++# Even better resolution ++#HOURS=8;H_RES=1;DAYS=32;D_RES=2;WEEKS=50;W_RES=2; ++#STEP=60; MAXSTEP=`expr $STEP \* 2` ++ ++# Format and size of the plots PIXWIDTH will be used in ++# calculating rrd-data-file dimensions during init of rrd-files ++# If you change the size you must change NCGIPIXWIDTH too ++PIXWIDTH=480 ++PIXHEIGHT=120 ++PIXFORMAT=PNG ++ ++# Image-Size of the thumbnail for rrdcgi ++SCGIPIXWIDTH=400 ++# Normal Image-Size for rrdcgi (480px plotsize in rrd) ++NCGIPIXWIDTH=571 ++ ++# Predefined colors ++RED0=#ff0000; RED1=#ff5555; ++GRN0=#009828; GRN1=#81ffa2; ++ORG0=#ff9900; ORG1=#ffc571; ++BLU0=#0030ff; BLU1=#8ba1ff; ++CYA0=#ff00FF; CYA1=#ffbcfe; ++YEL0=#ffff00; YEL1=#e0df76; ++BLK0=#000000; BLK1=#7d7d7d; ++WHI0=#FFFFFF; WHI1=#c1c1c1; ++ ++# Date-String used when creating images with rrd.sh ++DATE=`/bin/date "+%d.%m.%Y %H:%M:%S"` ++ ++# Max-Values bytes/second and packets/second for WAN/Wifi/LAN Interfaces ++MAXWANB=130000 ++MAXWANP=500 ++MAXWIFB=600000 ++MAXWIFP=800 ++MAXLANB=1200000 ++MAXLANP=1000 ++ ++# RRD-Types: ++# GAUGE=save the value itself, no calculations at all ++# COUNTER=continuously increasing value. difference between last 2 values must be positive ! (Traffic-Counter) ++# DERIVE=like counter but can store negative values (rate of change in free disk-space) ++# ++# General syntax: PREFIX_POSTFIX=[-]|Legend|RRD-Type|Maximum|Color|RRD-Plot-Type|Printf-Precision|Optional rrdgraph def-arguments ++ ++################ ++# Sys-Statistics ++################ ++SYS_L01=" l1|System Load (1 min)|GAUGE|U|$YEL0|AREA|%6.2lf" ++SYS_L05=" l2|System Load (5 min)|GAUGE|U|$ORG0|STACK|%6.2lf" ++SYS_L15=" l3|System Load (15 min)|GAUGE|U|$RED0|STACK|%6.2lf" ++ ++SYS_CPN=" cn|CPU nice |COUNTER|U|$YEL0|AREA|%6.2lf%%" ++SYS_CPU=" cu|CPU user |COUNTER|U|$ORG0|STACK|%6.2lf%%" ++SYS_CPS=" cs|CPU system |COUNTER|U|$RED0|STACK|%6.2lf%%" ++SYS_CPI=" ci|CPU idle |COUNTER|U|$GRN0|STACK|%6.2lf%%" ++ ++SYS_MEU=" mu|Memory used |GAUGE|U|$BLU0|AREA" ++SYS_MEF=" mf|Memory free |GAUGE|U|$GRN0|STACK" ++#SYS_MES=" ms|Memory shared |GAUGE|U|$BLK0|LINE1" ++SYS_MEB=" mb|Memory buffer |GAUGE|U|$YEL0|LINE1" ++SYS_MEC=" mc|Memory cached |GAUGE|U|$RED0|LINE1" ++ ++SYS_FUS=" us|Flash Disk Used |GAUGE|U|$BLU0|AREA|%6.2lf%s|CDEF:usC=us,1024,* CDEF:MAXusC=us,1024,*" ++SYS_FAV=" av|Flash Disk Available|GAUGE|U|$GRN0|STACK|%6.2lf%s|CDEF:avC=av,1024,* CDEF:MAXavC=av,1024,*" ++ ++SYS_IRA="ira|Interrupts total |COUNTER|U|$RED0|AREA" ++SYS_IRE="ire|Interrupts eth0 |COUNTER|U|$ORG0|AREA" ++SYS_IRW="irw|Interrupts wifi |COUNTER|U|$YEL0|STACK" ++ ++SYS_PRT=" pt|Processes total |GAUGE|U|$BLU0|AREA|%6.0lf" ++SYS_CTX=" ct|Context switches |COUNTER|U|$RED0|LINE2|%6.0lf" ++SYS_PRR=" pr|Processes active |GAUGE|U|$ORG0|AREA|%6.0lf" ++SYS_ARP="arp|Arp Entries |GAUGE|U|$YEL0|LINE2|%6.0lf" ++SYS_PFK=" fk|Forks |COUNTER|U|$GRN0|LINE2|%6.0lf" ++SYS_CON="con|NAT-Connections |GAUGE|U|$CYA0|LINE2|%6.0lf" ++ ++# Plot-Titles ++MISC_STATS="Misc ($HOSTNAME)" ++DSK_STATS="Flash Disk Usage ($HOSTNAME)" ++USG_STATS="System Load ($HOSTNAME)" ++MEM_STATS="Memory Usage ($HOSTNAME)" ++CPU_STATS="CPU Usage ($HOSTNAME)" ++IRQ_STATS="Interrupts ($HOSTNAME)" ++ ++# Plot-Definitions (sort-order is relevant) ++SYS_CPU_STATS="CPN CPU CPS CPI" ++#SYS_MEM_STATS="MEU MEF MES MEB MEC" ++SYS_MEM_STATS="MEU MEF MEB MEC" ++SYS_USG_STATS="L01 L05 L15" ++SYS_DSK_STATS="FUS FAV" ++SYS_MISC_STATS="PRT PRR ARP PFK CTX CON" ++SYS_IRQ_STATS="IRA IRE IRW" ++ ++# Data-Definition needed by init() ++SYS_ALL="$SYS_CPU_STATS $SYS_MEM_STATS $SYS_USG_STATS $SYS_DSK_STATS $SYS_MISC_STATS $SYS_IRQ_STATS" ++ ++################################################################################################# ++# Wifi Traffic & Wan Traffic & Tunnel Traffic Statistics ; # LAN: vlan0 , WAN: vlan1 , eth1: WIFI ++################################################################################################# ++IF_WLOBY="Wibo |Outgoing Traffic Wifi |COUNTER|$MAXWIFB|$GRN1|AREA" ++IF_WLIBY="-Wibi|Incoming Traffic Wifi |COUNTER|$MAXWIFB|$RED0|AREA" ++IF_WLOPK="Wipo |Outgoing Packets Wifi |COUNTER|$MAXWIFP|$GRN1|AREA|%6.0lf" ++IF_WLIPK="-Wipi|Incoming Packets Wifi |COUNTER|$MAXWIFP|$RED0|AREA|%6.0lf" ++ ++IF_WAIBY="-Wabi|Incoming Traffic Wan |COUNTER|$MAXWANB|$BLU0|AREA" ++IF_WAOBY="Wabo |Outgoing Traffic Wan |COUNTER|$MAXWANB|$ORG1|AREA" ++IF_WAIPK="-Wapi|Incoming Packets Wan |COUNTER|$MAXWANP|$BLU0|AREA|%6.0lf" ++IF_WAOPK="Wapo |Outgoing Packets Wan |COUNTER|$MAXWANP|$ORG1|AREA|%6.0lf" ++ ++IF_LAIBY="-Labi|Incoming Traffic Lan |COUNTER|$MAXLANB|$BLU0|AREA" ++IF_LAOBY="Labo |Outgoing Traffic Lan |COUNTER|$MAXLANB|$ORG1|AREA" ++IF_LAIPK="-Lapi|Incoming Packets Lan |COUNTER|$MAXLANP|$BLU0|AREA|%6.0lf" ++IF_LAOPK="Lapo |Outgoing Packets Lan |COUNTER|$MAXLANP|$ORG1|AREA|%6.0lf" ++ ++#IF_TUIBY="-tbi|Incoming Traffic VPN-Tunnel|COUNTER|$MAXWANB|$CYA0|AREA" ++#IF_TUOBY="tbo |Outgoing Traffic VPN-Tunnel|COUNTER|$MAXWANB|$YEL1|AREA" ++#IF_TUIPK="-tpi|Incoming Packets VPN-Tunnel|COUNTER|$MAXWANP|$CYA0|AREA|%6.0lf" ++#IF_TUOPK="tpo |Outgoing Packets VPN-Tunnel|COUNTER|$MAXWANP|$YEL1|AREA|%6.0lf" ++ ++# Plot-Titles ++WIFI_TRAFFIC="Wifi Interface Traffic Statistics ($HOSTNAME)" ++WIFI_PACKETS="Wifi Interface Packets Statistics ($HOSTNAME)" ++WAN_TRAFFIC="Wan Interface Traffic Statistics ($HOSTNAME)" ++WAN_PACKETS="Wan Interface Packets Statistics ($HOSTNAME)" ++LAN_TRAFFIC="Lan Interface Traffic Statistics ($HOSTNAME)" ++LAN_PACKETS="Lan Interface Packets Statistics ($HOSTNAME)" ++ ++#TUN_TRAFFIC="VPN-Tunnel Interface Traffic Statistics ($HOSTNAME)" ++#TUN_PACKETS="VPN-Tunnel Interface Packets Statistics ($HOSTNAME)" ++ ++# Plot-Definitions (sort-order is relevant) ++IF_WIFI_TRAFFIC="WLOBY WLIBY" ++IF_WIFI_PACKETS="WLOPK WLIPK" ++IF_WAN_TRAFFIC="WAIBY WAOBY" ++IF_WAN_PACKETS="WAIPK WAOPK" ++IF_LAN_TRAFFIC="LAIBY LAOBY" ++IF_LAN_PACKETS="LAIPK LAOPK" ++#IF_TUN_TRAFFIC="TUIBY TUOBY" ++#IF_TUN_PACKETS="TUIPK TUOPK" ++ ++# Data-Definition needed by init() ++#IF_ALL="$IF_WIFI_TRAFFIC $IF_WIFI_PACKETS $IF_WAN_TRAFFIC $IF_WAN_PACKETS $IF_TUN_TRAFFIC $IF_TUN_PACKETS" ++IF_ALL="$IF_LAN_TRAFFIC $IF_LAN_PACKETS $IF_WAN_TRAFFIC $IF_WAN_PACKETS $IF_WIFI_TRAFFIC $IF_WIFI_PACKETS" ++ ++############################################## ++# Port Traffic Statistics for Port 1 - Port 4 ++############################################## ++#PT_OPK1="po1 |Port 1 Outgoing Packets |COUNTER|U|$ORG1|AREA|%6.0lf" ++#PT_IPK1="-pi1|Port 1 Incoming Packets |COUNTER|U|$GRN0|AREA|%6.0lf" ++#PT_COL1="cl1 |Port 1 Collisions |COUNTER|U|$BLU0|AREA|%6.0lf" ++#PT_ERR1="er1 |Port 1 Errors |COUNTER|U|$CYA0|AREA|%6.0lf" ++#PT_OBY1="bo1 |Port 1 Outgoing Traffic |COUNTER|U|$ORG1|AREA" ++#PT_IBY1="-bi1|Port 1 Incoming Traffic |COUNTER|U|$GRN0|AREA" ++#PT_OPK2="po2 |Port 2 Outgoing Packets |COUNTER|U|$RED1|AREA|%6.0lf" ++#PT_IPK2="-pi2|Port 2 Incoming Packets |COUNTER|U|$BLK0|AREA|%6.0lf" ++#PT_COL2="cl2 |Port 2 Collisions |COUNTER|U|$GRN0|AREA|%6.0lf" ++#PT_ERR2="er2 |Port 2 Errors |COUNTER|U|$ORG0|AREA|%6.0lf" ++#PT_OBY2="bo2 |Port 2 Outgoing Traffic |COUNTER|U|$RED1|AREA" ++#PT_IBY2="-bi2|Port 2 Incoming Traffic |COUNTER|U|$BLK0|AREA" ++#PT_OPK3="po3 |Port 3 Outgoing Packets |COUNTER|U|$BLU1|AREA|%6.0lf" ++#PT_IPK3="-pi3|Port 3 Incoming Packets |COUNTER|U|$CYA0|AREA|%6.0lf" ++#PT_COL3="cl3 |Port 3 Collisions |COUNTER|U|$GRN0|AREA|%6.0lf" ++#PT_ERR3="er3 |Port 3 Errors |COUNTER|U|$ORG0|AREA|%6.0lf" ++#PT_OBY3="bo3 |Port 3 Outgoing Traffic |COUNTER|U|$BLU1|AREA" ++#PT_IBY3="-bi3|Port 3 Incoming Traffic |COUNTER|U|$CYA0|AREA" ++#PT_OPK4="po4 |Port 4 Outgoing Packets |COUNTER|U|$YEL1|AREA|%6.0lf" ++#PT_IPK4="-pi4|Port 4 Incoming Packets |COUNTER|U|$CYA0|AREA|%6.0lf" ++#PT_COL4="cl4 |Port 4 Collisions |COUNTER|U|$BLK0|AREA|%6.0lf" ++#PT_ERR4="er4 |Port 4 Errors |COUNTER|U|$RED0|AREA|%6.0lf" ++#PT_OBY4="bo4 |Port 4 Outgoing Traffic |COUNTER|U|$YEL1|AREA" ++#PT_IBY4="-bi4|Port 4 Incoming Traffic |COUNTER|U|$CYA0|AREA" ++ ++# Plot-Titles ++#TRAFFIC_1="Traffic Statistics Port 1 ($HOSTNAME)" ++#TRAFFIC_2="Traffic Statistics Port 2 ($HOSTNAME)" ++#TRAFFIC_3="Traffic Statistics Port 3 ($HOSTNAME)" ++#TRAFFIC_4="Traffic Statistics Port 4 ($HOSTNAME)" ++#PACKETS_1="Packet Statistics Port 1 ($HOSTNAME)" ++#PACKETS_2="Packet Statistics Port 2 ($HOSTNAME)" ++#PACKETS_3="Packet Statistics Port 3 ($HOSTNAME)" ++#PACKETS_4="Packet Statistics Port 4 ($HOSTNAME)" ++ ++# Plot-Definitions (sort-order is relevant) ++#PT_TRAFFIC_1="OBY1 IBY1" ++#PT_TRAFFIC_2="OBY2 IBY2" ++#PT_TRAFFIC_3="OBY3 IBY3" ++#PT_TRAFFIC_4="OBY4 IBY4" ++#PT_PACKETS_1="OPK1 IPK1 COL1 ERR1" ++#PT_PACKETS_2="OPK2 IPK2 COL2 ERR2" ++#PT_PACKETS_3="OPK3 IPK3 COL3 ERR3" ++#PT_PACKETS_4="OPK4 IPK4 COL4 ERR4" ++#PT_PACKETS_1="OPK1 IPK1" ++#PT_PACKETS_2="OPK2 IPK2" ++#PT_PACKETS_3="OPK3 IPK3" ++#PT_PACKETS_4="OPK4 IPK4" ++ ++# Data Definition needed by init() ++#PT_ALL="$PT_TRAFFIC_1 $PT_TRAFFIC_2 $PT_TRAFFIC_3 $PT_TRAFFIC_4 $PT_PACKETS_1 $PT_PACKETS_2 $PT_PACKETS_3 $PT_PACKETS_4" ++ ++################################# ++# Traffic Priorisation Statistics ++################################# ++#TC_APRIB="bwa|Ack Priority Queue Bandwidth |COUNTER|$MAXWANB|$YEL0|AREA" ++#TC_DPRIB="bwd|Default Priority Queue Bandwidth |COUNTER|$MAXWANB|$ORG0|STACK" ++#TC_HPRIB="bwh|High Priority Queue Bandwidth |COUNTER|$MAXWANB|$RED0|STACK" ++#TC_LPRIB="bwl|Low Priority Queue Bandwidth |COUNTER|$MAXWANB|$GRN0|STACK" ++#TC_APRID="dra|Ack Priority Queue Packet Dropped |COUNTER|100|$YEL0|AREA" ++#TC_DPRID="drd|Default Priority Queue Packet Dropped|COUNTER|100|$ORG0|STACK" ++#TC_HPRID="drh|High Priority Queue Packet Dropped |COUNTER|100|$RED0|STACK" ++#TC_LPRID="drl|Low Priority Queue Packet Dropped |COUNTER|100|$GRN0|STACK" ++ ++# Plot-Titles ++#TRAFFIC="Traffic Priorisation Stats" ++#PACKETS="Packet Priorisation Stats" ++ ++# Plot-Definitions (sort-order is relevant) ++#TC_TRAFFIC="APRIB DPRIB HPRIB LPRIB" ++#TC_PACKETS="APRID DPRID HPRID LPRID" ++ ++# Data Definition needed by init() ++#TC_ALL="$TC_TRAFFIC $TC_PACKETS" ++ ++################################# ++# Firewall Packet Drop Statistics ++################################# ++#PC_WIN="win|Windows Traffic |COUNTER|U|$YEL0|AREA" ++#PC_INV="inv|Invalid State Traffic |COUNTER|U|$ORG0|STACK" ++#PC_TCP="tcp|TCP Packets |COUNTER|U|$RED0|STACK" ++#PC_OTH="oth|Other Packets |COUNTER|U|$BLU0|STACK" ++ ++# Plot-Titles ++#DROPPED="Firewall Packet Drop Statistics" ++ ++# Plot-Definitions (sort-order is relevant) ++#PC_DROPPED="WIN INV TCP OTH" ++ ++# Data Definition needed by init() ++#PC_ALL="$PC_DROPPED" ++ ++########################## ++# Traffic Accounting Stats ++########################## ++#ACI="Incoming for "; ACO="Outgoing for " ++#IP14="notebook"; COL14=$ORG0; COL_14=$ORG1 ++#IP15="saugi "; COL15=$RED0; COL_15=$RED1 ++#IP20="aplink "; COL20=$GRN0; COL_20=$GRN1 ++#IP50="sunny "; COL50=$BLU0; COL_50=$BLU1 ++ ++#TYPE=AREA ++#for i in 15 50 20 14 ++#do ++# # Packet-Statistics ++# eval AC_TIP$i='-TIP$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL$i\|$TYPE" ++# eval AC_TOP$i='TOP$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL_$i\|$TYPE" ++# eval AC_UIP$i='-UIP$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL$i\|$TYPE" ++# eval AC_UOP$i='UOP$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL_$i\|$TYPE" ++# eval AC_IIP$i='-IIP$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL$i\|$TYPE" ++# eval AC_IOP$i='IOP$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANP\|\$COL_$i\|$TYPE" ++# # Traffic Statistics ++# eval AC_TIB$i='-TIB$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL$i\|$TYPE" ++# eval AC_TOB$i='TOB$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL_$i\|$TYPE" ++# eval AC_UIB$i='-UIB$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL$i\|$TYPE" ++# eval AC_UOB$i='UOB$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL_$i\|$TYPE" ++# eval AC_IIB$i='-IIB$i\|$ACI'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL$i\|$TYPE" ++# eval AC_IOB$i='IOB$i\|$ACO'"\$IP$i\|COUNTER\|$MAXWANB\|\$COL_$i\|$TYPE" ++# # Plot-Definitions (sort-order is relevant) ++# AC_TB_O="$AC_TB_O TOB$i"; AC_TB_I="$AC_TB_I TIB$i" ++# AC_TP_O="$AC_TP_O TOP$i"; AC_TP_I="$AC_TP_I TIP$i" ++# AC_UB_O="$AC_UB_O UOB$i"; AC_UB_I="$AC_UB_I UIB$i" ++# AC_UP_O="$AC_UP_O UOP$i"; AC_UP_I="$AC_UP_I UIP$i" ++# AC_IB_O="$AC_IB_O IOB$i"; AC_IB_I="$AC_IB_I IIB$i" ++# AC_IP_O="$AC_IP_O IOP$i"; AC_IP_I="$AC_IP_I IIP$i" ++# TYPE=STACK ++#done ++#AC_TB="$AC_TB_O $AC_TB_I"; AC_TP="$AC_TP_O $AC_TP_I" ++#AC_UB="$AC_UB_O $AC_UB_I"; AC_UP="$AC_UP_O $AC_UP_I" ++#AC_IB="$AC_IB_O $AC_IB_I"; AC_IP="$AC_IP_O $AC_IP_I"; ++ ++# Plot-Titles ++#TB="TCP Traffic Accounting Stats ($HOSTNAME)"; TP="TCP Packet Accounting Stats ($HOSTNAME)" ++#UB="UDP Traffic Accounting Stats ($HOSTNAME)"; UP="UDP Packet Accounting Stats ($HOSTNAME)" ++#IB="ICMP Traffic Accounting Stats ($HOSTNAME)";IP="ICMP Packet Accounting Stats ($HOSTNAME)" ++ ++# Data Definition needed by init() ++#AC_ALL="$AC_TB $AC_TP $AC_UB $AC_UP $AC_IB $AC_IP" ++ ++ ++# System Statistics ++GRAPH_1="SYS|USG_STATS|$USG_STATS|Load" ++GRAPH_2="SYS|CPU_STATS|$CPU_STATS|CPU-Time_in_%|1000|--upper-limit 100 --rigid --logarithmic --lower-limit 0.1" ++GRAPH_3="SYS|MEM_STATS|$MEM_STATS|Bytes|1024" ++GRAPH_4="SYS|DSK_STATS|$DSK_STATS|Bytes|1024" ++GRAPH_5="SYS|MISC_STATS|$MISC_STATS|_|1000|--logarithmic" ++GRAPH_6="SYS|IRQ_STATS|$IRQ_STATS|IRQ_per_second|1000" ++# Interface Traffic Statistics ++GRAPH_7="IF|LAN_TRAFFIC|$LAN_TRAFFIC|Bytes_per_second" ++GRAPH_8="IF|LAN_PACKETS|$LAN_PACKETS|Packets_per_second" ++GRAPH_9="IF|WAN_TRAFFIC|$WAN_TRAFFIC|Bytes_per_second" ++GRAPH_10="IF|WAN_PACKETS|$WAN_PACKETS|Packets_per_second" ++GRAPH_11="IF|WIFI_TRAFFIC|$WIFI_TRAFFIC|Bytes_per_second" ++GRAPH_12="IF|WIFI_PACKETS|$WIFI_PACKETS|Packets_per_second" ++#GRAPH_11="IF|TUN_TRAFFIC|$TUN_TRAFFIC|Bytes_per_second" ++#GRAPH_12="IF|TUN_PACKETS|$TUN_PACKETS|Packets_per_second" ++# Port Traffic Statistics ++#GRAPH_13="PT|TRAFFIC_1|$TRAFFIC_1|Bytes_per_second" ++#GRAPH_14="PT|PACKETS_1|$PACKETS_1|Packets_per_second" ++#GRAPH_15="PT|TRAFFIC_2|$TRAFFIC_2|Bytes_per_second" ++#GRAPH_16="PT|PACKETS_2|$PACKETS_2|Packets_per_second" ++#GRAPH_17="PT|TRAFFIC_3|$TRAFFIC_3|Bytes_per_second" ++#GRAPH_18="PT|PACKETS_3|$PACKETS_3|Packets_per_second" ++#GRAPH_19="PT|TRAFFIC_4|$TRAFFIC_4|Bytes_per_second" ++#GRAPH_20="PT|PACKETS_4|$PACKETS_4|Packets_per_second" ++# Traffic Priorisation Statistics ++# GRAPH_21="TC|TRAFFIC|$TRAFFIC|Bytes_per_second|1000|--logarithmic" ++# GRAPH_22="TC|PACKETS|$PACKETS|Packets_per_second" ++# Accounting Statistics ++#GRAPH_23="AC|TB|$TB|Bytes_per_second" ++#GRAPH_24="AC|TP|$TP|Packets_per_second" ++#GRAPH_25="AC|UB|$UB|Bytes_per_second" ++#GRAPH_26="AC|UP|$UP|Packets_per_second" ++#GRAPH_27="AC|IB|$IB|Bytes_per_second" ++#GRAPH_28="AC|IP|$IP|Packets_per_second" ++# Firewall Drop Statistics ++#GRAPH_29="PC|DROPPED|$DROPPED|Packets_per_second" ++ ++#ALL_PRAEFIXES="SYS IF PT TC AC PC" ++ALL_PRAEFIXES="SYS IF" ++GRAPH_MAX=12 +diff --git a/feeds/packages/utils/rrdcollect/files/rrd.sh b/feeds/packages/utils/rrdcollect/files/rrd.sh +new file mode 100644 +index 0000000..3faa4fb +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/rrd.sh +@@ -0,0 +1,288 @@ ++#!/bin/sh ++# ++# Author: Christian Rost (chr@baltic-online.de) ++# Purpose: Shell-Interface to rrdtool ++# ++RRDCNF=/etc/rrd.conf ++. $RRDCNF ++ ++###################################### ++# init() function to create .rrd-file ++# $1=VAR-PRAEFIX $2=VAR-POSTFIX ++###################################### ++init() ++{ ++ # Calculate optimal step by assuming highest precision on the last-xhour plot ++ OPTSTEP=`expr $HOURS \* 3600 \/ $PIXWIDTH \* $H_RES` ++ [ $OPTSTEP != $STEP ] && echo "WARNING: Your optimal step is: $OPTSTEP. But you are using: $STEP" ++ ++ ARH_AVG=`expr $HOURS \* 3600 \/ $PIXWIDTH \* $H_RES \/ $STEP`; ARH_CNT=`expr $HOURS \* 3600 \/ $ARH_AVG \/ $STEP` ++ ARD_AVG=`expr $DAYS \* 86400 \/ $PIXWIDTH \* $D_RES \/ $STEP`; ARD_CNT=`expr $DAYS \* 86400 \/ $ARD_AVG \/ $STEP` ++ ARW_AVG=`expr $WEEKS \* 604800 \/ $PIXWIDTH \* $W_RES \/ $STEP`; ARW_CNT=`expr $WEEKS \* 604800 \/ $ARW_AVG \/ $STEP` ++ ++ PRAEFIX=$1; POSTFIX=$2 ++ DSOURCE="" ++ ++ echo "Init storage for $HOURS hours on averages: $ARH_AVG x $STEP seconds ($ARH_CNT total values)" ++ echo "Init storage for $DAYS days on averages: $ARD_AVG x $STEP seconds ($ARD_CNT total values)" ++ echo "Init storage for $WEEKS weeks on averages: $ARW_AVG x $STEP seconds ($ARW_CNT total values)" ++ ++ eval SOURCE=\$${PRAEFIX}_${POSTFIX} ++ for i in $SOURCE ++ do ++ eval var=\$${PRAEFIX}_${i} ++ ifs="$IFS"; IFS="|"; set -- $var ++ if [ "`echo ${1} | cut -b1`" = "-" ] ++ then ++ VAR="`echo ${1} | cut -b2-`" ++ else ++ VAR=`echo $1 | sed "s/ //g"` ++ fi ++ DSOURCE="$DSOURCE DS:${VAR}:${3}:$MAXSTEP:0:${4}" ++ IFS="$ifs" ++ done ++ $DEBUG $RRDTOOL create $RRDDIR/$PRAEFIX.rrd \ ++ --step ${STEP} \ ++ $DSOURCE \ ++ RRA:AVERAGE:0.5:$ARH_AVG:$ARH_CNT \ ++ RRA:AVERAGE:0.5:$ARD_AVG:$ARD_CNT \ ++ RRA:AVERAGE:0.5:$ARW_AVG:$ARW_CNT \ ++ RRA:MAX:0.5:$ARH_AVG:$ARH_CNT \ ++ RRA:MAX:0.5:$ARD_AVG:$ARD_CNT \ ++ RRA:MAX:0.5:$ARW_AVG:$ARW_CNT ++ return $? ++} ++ ++################################################################################################################# ++# graph() function to create png-graphics ++# $1=IMG-DIR $2=VAR-PRAEFIX, $3=VAR-POSTFIX, $4=Headline, $5=end, $6=start, $7=base, ++# $8=DEFS/ENTRIES $9=other rrdgraph options (Vertlabel,...) ++################################################################################################################# ++# COMMENT:"$DATE\c" ++do_rrdgraph() ++{ ++ $DEBUG $NICE $RRDTOOL graph "$1/$2_$3.png" \ ++ --title "$4" \ ++ --imgformat $PIXFORMAT \ ++ --width $PIXWIDTH \ ++ --height $PIXHEIGHT \ ++ --end "$5" \ ++ --start "$6" \ ++ --base "$7" \ ++ $8 $9 ++} ++ ++################################################################################################################# ++# graph() function to create png-graphics ++# $1=IMG-DIR $2=VAR-PRAEFIX, $3=VAR-POSTFIX, $4=Headline, $5=end, $6=start, $7=base, ++# $8=DEFS/ENTRIES $9=other rrdgraph options (Vertlabel,...) ++################################################################################################################# ++# COMMENT:"\c" ++do_rrdcgi() ++{ ++ cat << EOF > $1/$2_$3.def ++ ++$2_$3.png \ ++--title "$4" \ ++--imgformat $PIXFORMAT \ ++--width $PIXWIDTH \ ++--height $PIXHEIGHT \ ++--end "$5" \ ++--start \ ++--base $7 \ ++--imginfo "" \ ++--lazy \ ++$8 $9 > ++EOF ++ ++ cat << EOF >> $RRDCGISCRIPT ++$NEWLINE $4
++ ++ ++EOF ++} ++ ++ ++ ++gen_cgi_header() ++{ ++ cat << EOF > $RRDCGISCRIPT ++#!$RRDCGI ++RRDCGI Router Statistics ++ ++ ++

RRDCGI Router Statistics ()

++
++ ${HOURS} hours ago ++ ${DAYS} days ago ++ ${WEEKS} weeks ago ++ ++
++

++ ++EOF ++} ++ ++gen_cgi_footer() ++{ ++ cat << EOF >> $RRDCGISCRIPT ++
++

++ ++ ++EOF ++ chmod +x $RRDCGISCRIPT ++} ++ ++################################################################################################################# ++# $1=mode $2=VAR-PRAEFIX, $3=VAR-POSTFIX, $4=Headline, $5=Vertlabel, $6=start, $7=end, $8=base, $9=other rrdgraph options ++################################################################################################################# ++do_graph() ++{ ++ MODE=$1; PRAEFIX=$2; POSTFIX=$3; HEADLINE=$4; VERTLABEL=$5; START=$6; END=$7; BASE=$8; SRC=${RRDDIR}/${PRAEFIX}.rrd ++ if [ ! -r "$SRC" ] ++ then ++ echo "$SRC not found. Aborting all operations now..." ++ exit 1 ++ fi ++ ++ # For Graphing Memory BASE should be set to 1024, default is 1000 ++ [ -n "$8" ] && BASE=$8 || BASE=1000 ++ [ -n "$9" ] && OPTS=$9 || OPTS="--lower-limit 0" ++ DEFS=""; ENTRIES="" ++ eval SOURCE=\$${PRAEFIX}_${POSTFIX} ++ for i in $SOURCE ++ do ++ eval var=\$${PRAEFIX}_${i} ++ ifs="$IFS"; IFS="|"; set -- $var ++ if [ "`echo ${1} | cut -b1`" = "-" ] ++ then ++ VAR="`echo ${1} | cut -b2-`" ++ NEG=1 ++ else ++ VAR=`echo $1 | sed "s/ //g"` ++ NEG=0 ++ fi ++ ++ if [ "$NEG" = 1 ] ++ then ++ [ -n "${8}" ] && DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX ${8} CDEF:N${VAR}C=${VAR}C,-1,* " \ ++ || DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX CDEF:N${VAR}=${VAR},-1,*" ++ else ++ [ -n "${8}" ] && DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX ${8}" \ ++ || DEFS="$DEFS DEF:${VAR}=$SRC:${VAR}:AVERAGE DEF:MAX${VAR}=$SRC:${VAR}:MAX" ++ fi ++ # Now this is a bit ugly, but i don't know how to escape the blanks in a proper way. ++ # If you know any better way to keep the blanks in the legend of the graphics please inform me. ++ #L=`echo ${2} | tr -s "[= =]" '\014'` ++ #L=`echo ${2} | tr -s "[= =]" '_'` ++ L=`echo ${2} | sed "s/ /_/g"` ++ if [ -n "${7}" ] ++ then ++ if [ -n "${8}" ] ++ then ++ [ "$NEG" = 1 ] && ENTRIES="$ENTRIES ${6}:N${VAR}C${5}:${L}: GPRINT:${VAR}C:AVERAGE:Average\:${7} GPRINT:MAX${VAR}C:MAX:Max\:${7} GPRINT:${VAR}C:LAST:Last\:${7}\\j" \ ++ || ENTRIES="$ENTRIES ${6}:${VAR}C${5}:${L}: GPRINT:${VAR}C:AVERAGE:Average\:${7} GPRINT:MAX${VAR}C:MAX:Max\:${7} GPRINT:${VAR}C:LAST:Last\:${7}\\j" ++ else ++ [ "$NEG" = 1 ] && ENTRIES="$ENTRIES ${6}:N${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:${7} GPRINT:MAX${VAR}:MAX:Max\:${7} GPRINT:${VAR}:LAST:Last\:${7}\\j" \ ++ || ENTRIES="$ENTRIES ${6}:${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:${7} GPRINT:MAX${VAR}:MAX:Max\:${7} GPRINT:${VAR}:LAST:Last\:${7}\\j" ++ fi ++ else ++ [ "$NEG" = 1 ] && ENTRIES="$ENTRIES ${6}:N${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:%6.2lf%s GPRINT:MAX${VAR}:MAX:Max\:%6.0lf%s GPRINT:${VAR}:LAST:Last\:%6.2lf%s\\j" \ ++ || ENTRIES="$ENTRIES ${6}:${VAR}${5}:${L}: GPRINT:${VAR}:AVERAGE:Average\:%6.2lf%s GPRINT:MAX${VAR}:MAX:Max\:%6.0lf%s GPRINT:${VAR}:LAST:Last\:%6.2lf%s\\j" ++ fi ++ IFS="$ifs" ++ done ++ ++ #[ "$POSTFIX" = "CPU_STATS" ] && (echo $OPTS; echo $DEFS ; echo $ENTRIES; echo $OPTS) ++ ++ $MODE "$IMGDIR" "$PRAEFIX" "$POSTFIX" "$HEADLINE" "$END" "$START" "$BASE" "$DEFS $ENTRIES" "--vertical-label $VERTLABEL $OPTS" ++} ++ ++# Check if all rrd-files are present ++# and create them if not ++init_loop() ++{ ++ for j in $ALL_PRAEFIXES ++ do ++ if [ ! -f $RRDDIR/$j.rrd ] ++ then ++ echo "Creating $RRDDIR/$j.rrd ..." ++ init $j ALL ++ [ ! -f $RRDDIR/$j.rrd ] && EXIT=1 ++ fi ++ done ++ [ "$EXIT" = 1 ] && return 1 || return 0 ++} ++ ++ ++graph_loop() ++{ ++ mode=$1; start=$2; end=$3; c=1 ++ while [ $c -le $GRAPH_MAX ] ++ do ++ eval var=\$GRAPH_${c} ++ # $1=VAR-PRAEFIX $2=VAR-POSTFIX $3=Headline $4=Vertlabel $5=base $6=other rrdgraph options ++ ifs="$IFS"; IFS="|"; set -- $var ++ IFS="$ifs" ++ [ "$1" != "$OLD" -o "`expr \( $c - 1 \) % 2`" = 0 ] && NEWLINE="" || NEWLINE="" ++ do_graph $mode $1 $2 "$3" "$4" $start $end $5 "$6" ++ c=`expr $c + 1`; OLD=$1 ++ done ++} ++ ++ ++case "$1" in ++ init) ++ if init_loop ++ then ++ exit 0 ++ else ++ echo "Initialisation of rrd-database-files failed" ++ exit 1 ++ fi ++ ;; ++ cgi) ++ echo "Updating $RRDCGISCRIPT and $IMGDIR/*.def" ++ gen_cgi_header ++ # The start-time will be not used ++ graph_loop do_rrdcgi end now ++ gen_cgi_footer ++ ;; ++ images) ++ # Create the graphs ++ [ -n "$2" ] && STH=$2 || STH=24h ++ echo "Updating Graphs ($STH ago -> now) for $RRDDIR/*.rrd" ++ graph_loop do_rrdgraph "end-${STH}" now ++ ;; ++ fetch) ++ # Fetch data from rrdcollect daemon ++ if [ ! -n "$3" ] ++ then ++ echo "Usage: $0 fetch " ++ exit 1 ++ else ++ echo "Fetching ascii-logs from rrdcollect daemon" ++ (cd $RRDDIR && $NETCAT $2 $3 | sed -n "s:^\(update .*\):$RRDTOOL \1:p" | sh -x ) 2>&1 | wc -l #>/dev/null ++ exit 0 ++ fi ++ ;; ++ *) echo "Usage: $0 " ++ echo " init: Initialize rrd-datafiles if neeeded" ++ echo " cgi: Creates cgi-script for use with rrdcgi" ++ echo " fetch: Fetching data from rrdcollect via netcat" ++ echo " images: Generates images" ++ exit 1 ++ ;; ++esac ++exit 0 +diff --git a/feeds/packages/utils/rrdcollect/files/rrdcollect.conf b/feeds/packages/utils/rrdcollect/files/rrdcollect.conf +new file mode 100644 +index 0000000..e34c9bf +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/rrdcollect.conf +@@ -0,0 +1,33 @@ ++step = 360 ++directory = /var/lib/rrdcollect/rrd ++ ++file:///proc/stat ++"cpu0 %d %d %d %d" SYS.rrd:cu,cn,cs,ci ++"ctxt %u" SYS.rrd:ct ++"processes %u" SYS.rrd:fk ++"intr %u" SYS.rrd:ira ++ ++file:///proc/meminfo ++#"Mem: %*d %d %d %d %d %d" SYS.rrd:mu,mf,ms,mb,mc ++"Mem: %*d %d %d %*d %d %d" SYS.rrd:mu,mf,mb,mc ++ ++file:///proc/loadavg ++"%f %f %f %d/%d %*d" SYS.rrd:l1,l2,l3,pr,pt ++ ++exec:///bin/df ++"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av ++ ++# LAN: vlan0, WAN: vlan1, WIFI: eth1 ++file:///proc/net/dev ++" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo ++" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo ++" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo ++#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo ++ ++file:///proc/slabinfo ++"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con ++"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp ++ ++file:///proc/interrupts ++" 4: %d MIPS eth1" SYS.rrd:irw ++" 5: %d MIPS eth0" SYS.rrd:ire +diff --git a/feeds/packages/utils/rrdcollect/files/rrdcollect.init b/feeds/packages/utils/rrdcollect/files/rrdcollect.init +new file mode 100644 +index 0000000..9099c4b +--- /dev/null ++++ b/feeds/packages/utils/rrdcollect/files/rrdcollect.init +@@ -0,0 +1,25 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=98 ++ ++SERVICE_USE_PID=1 ++ ++LIB_D=/var/lib/rrdcollect ++CGI_S=$LIB_D/rrd.cgi ++IMG_D=$LIB_D/img ++RRD_D=$LIB_D/rrd ++ ++start() { ++ RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null) ++ mkdir -m 0755 -p $IMG_D ++ mkdir -m 0755 -p $RRD_D ++ [ -n "$RRD_F" ] || /usr/bin/rrd.sh init ++ [ -x $CGI_S ] || /usr/bin/rrd.sh cgi ++ service_start /usr/sbin/rrdcollect ++} ++ ++stop() { ++ service_stop /usr/sbin/rrdcollect ++} ++ +diff --git a/feeds/packages/utils/rrdtool/.svn/entries b/feeds/packages/utils/rrdtool/.svn/entries +new file mode 100644 +index 0000000..42f096d +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rrdtool ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-22T10:05:43.735566Z ++33223 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++d86fb76890f8579ba36019df6c414ec0 ++2012-08-22T10:05:43.735566Z ++33223 ++blogic ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3466 ++ +diff --git a/feeds/packages/utils/rrdtool/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/rrdtool/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..8ac8620 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2007 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/rrdtool/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rrdtool/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..74f063a +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,141 @@ ++# ++# Copyright (C) 2007-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:=rrdtool ++PKG_VERSION:=1.2.30 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb ++ ++PKG_BUILD_DEPENDS:=python ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_PACKAGE_python-rrd \ ++ CONFIG_PACKAGE_rrdcgi \ ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/rrdtool/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Round Robin Database (RRD) ++ URL:=http://oss.oetiker.ch/rrdtool/ ++endef ++ ++define Package/librrd ++$(call Package/rrdtool/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= management library (v1.2.x) ++ DEPENDS+= +libart +libfreetype +libpng +zlib +libpthread ++endef ++ ++define Package/rrdcgi ++$(call Package/rrdtool/Default) ++ TITLE+= CGI graphing tool (v1.2.x) ++ DEPENDS+= +librrd +cgilib ++endef ++ ++define Package/rrdtool ++$(call Package/rrdtool/Default) ++ TITLE+= management tools (v1.2.x) ++ DEPENDS+= +librrd ++endef ++ ++define Package/python-rrd ++$(call Package/rrdtool/Default) ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE+= python bindings (v1.2.x) ++ DEPENDS+= +python-mini +librrd ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared=yes \ ++ --enable-static=yes \ ++ --disable-rpath \ ++ --with-gnu-ld \ ++ --disable-mmap \ ++ --disable-perl \ ++ --disable-tcl \ ++ --disable-ruby \ ++ --without-x \ ++ --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \ ++ ++CONFIGURE_VARS += \ ++ rd_cv_ieee_works=yes \ ++ rd_cv_null_realloc=nope \ ++ ac_cv_func_mmap_fixed_mapped=yes \ ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_rrdcgi),) ++ CONFIGURE_ARGS += --enable-rrdcgi ++else ++ CONFIGURE_ARGS += --disable-rrdcgi ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_python-rrd),) ++ CONFIGURE_ARGS += \ ++ --enable-python ++ CONFIGURE_VARS += \ ++ PYTHON="$(PYTHON)" ++else ++ CONFIGURE_ARGS += --disable-python ++endif ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/ ++endef ++ ++define Package/librrd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts ++ $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ ++ $(1)/usr/share/rrdtool/fonts/ ++endef ++ ++define Package/rrdcgi/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ ++endef ++ ++define Package/rrdtool/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/ ++endef ++ ++define PyPackage/python-rrd/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/ ++endef ++ ++$(eval $(call BuildPackage,librrd)) ++$(eval $(call BuildPackage,rrdcgi)) ++$(eval $(call BuildPackage,rrdtool)) ++ ++#$(eval $(call PyPackage,python-rrd)) ++#$(eval $(call BuildPackage,python-rrd)) +diff --git a/feeds/packages/utils/rrdtool/Makefile b/feeds/packages/utils/rrdtool/Makefile +new file mode 100644 +index 0000000..74f063a +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/Makefile +@@ -0,0 +1,141 @@ ++# ++# Copyright (C) 2007-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:=rrdtool ++PKG_VERSION:=1.2.30 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb ++ ++PKG_BUILD_DEPENDS:=python ++ ++PKG_CONFIG_DEPENDS:= \ ++ CONFIG_PACKAGE_python-rrd \ ++ CONFIG_PACKAGE_rrdcgi \ ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++$(call include_mk, python-package.mk) ++ ++define Package/rrdtool/Default ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Round Robin Database (RRD) ++ URL:=http://oss.oetiker.ch/rrdtool/ ++endef ++ ++define Package/librrd ++$(call Package/rrdtool/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= management library (v1.2.x) ++ DEPENDS+= +libart +libfreetype +libpng +zlib +libpthread ++endef ++ ++define Package/rrdcgi ++$(call Package/rrdtool/Default) ++ TITLE+= CGI graphing tool (v1.2.x) ++ DEPENDS+= +librrd +cgilib ++endef ++ ++define Package/rrdtool ++$(call Package/rrdtool/Default) ++ TITLE+= management tools (v1.2.x) ++ DEPENDS+= +librrd ++endef ++ ++define Package/python-rrd ++$(call Package/rrdtool/Default) ++ SUBMENU:=Python ++ SECTION:=lang ++ CATEGORY:=Languages ++ TITLE+= python bindings (v1.2.x) ++ DEPENDS+= +python-mini +librrd ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-shared=yes \ ++ --enable-static=yes \ ++ --disable-rpath \ ++ --with-gnu-ld \ ++ --disable-mmap \ ++ --disable-perl \ ++ --disable-tcl \ ++ --disable-ruby \ ++ --without-x \ ++ --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \ ++ ++CONFIGURE_VARS += \ ++ rd_cv_ieee_works=yes \ ++ rd_cv_null_realloc=nope \ ++ ac_cv_func_mmap_fixed_mapped=yes \ ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_rrdcgi),) ++ CONFIGURE_ARGS += --enable-rrdcgi ++else ++ CONFIGURE_ARGS += --disable-rrdcgi ++endif ++ ++ifneq ($(SDK)$(CONFIG_PACKAGE_python-rrd),) ++ CONFIGURE_ARGS += \ ++ --enable-python ++ CONFIGURE_VARS += \ ++ PYTHON="$(PYTHON)" ++else ++ CONFIGURE_ARGS += --disable-python ++endif ++ ++define Build/Compile ++ $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) ++ $(call Build/Compile/Default) ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/ ++ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/ ++endef ++ ++define Package/librrd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts ++ $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ ++ $(1)/usr/share/rrdtool/fonts/ ++endef ++ ++define Package/rrdcgi/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/ ++endef ++ ++define Package/rrdtool/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/ ++endef ++ ++define PyPackage/python-rrd/install ++ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) ++ $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/ ++endef ++ ++$(eval $(call BuildPackage,librrd)) ++$(eval $(call BuildPackage,rrdcgi)) ++$(eval $(call BuildPackage,rrdtool)) ++ ++#$(eval $(call PyPackage,python-rrd)) ++#$(eval $(call BuildPackage,python-rrd)) +diff --git a/feeds/packages/utils/rrdtool/patches/.svn/entries b/feeds/packages/utils/rrdtool/patches/.svn/entries +new file mode 100644 +index 0000000..2839034 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rrdtool/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-04-02T20:34:03.800196Z ++31180 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-dont-add-host-include-paths.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++f79f3f3c64be0c08f1e82105112bec92 ++2010-12-25T21:47:09.543506Z ++24826 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1399 ++ ++030-automake-compat.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a67c110667dd8d61cd6bb9ef5e72c70a ++2012-04-02T20:34:03.800196Z ++31180 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++369 ++ ++020-x86-float-cast.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++6503db3f9b7fe19ee8dd389709788ff4 ++2012-01-23T13:55:11.271304Z ++29874 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++448 ++ +diff --git a/feeds/packages/utils/rrdtool/patches/.svn/text-base/010-dont-add-host-include-paths.patch.svn-base b/feeds/packages/utils/rrdtool/patches/.svn/text-base/010-dont-add-host-include-paths.patch.svn-base +new file mode 100644 +index 0000000..507a0e9 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/.svn/text-base/010-dont-add-host-include-paths.patch.svn-base +@@ -0,0 +1,34 @@ ++--- a/configure +++++ b/configure ++@@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ex_check_save_LIBS=${LIBS} ++ ex_check_save_CPPFLAGS=${CPPFLAGS} ++ ex_check_save_LDFLAGS=${LDFLAGS} ++- if test "x/usr/include/libart-2.0" != "x"; then ++- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0" ++- fi ++ { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5 ++ echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; } ++ if test "${ac_cv_lib_art_lgpl_2_art_vpath_add_point+set}" = set; then ++@@ -27915,9 +27912,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ex_check_save_LIBS=${LIBS} ++ ex_check_save_CPPFLAGS=${CPPFLAGS} ++ ex_check_save_LDFLAGS=${LDFLAGS} ++- if test "x/usr/include/freetype2" != "x"; then ++- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" ++- fi ++ { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 ++ echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; } ++ if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL], ++ ex_check_save_LIBS=${LIBS} ++ ex_check_save_CPPFLAGS=${CPPFLAGS} ++ ex_check_save_LDFLAGS=${LDFLAGS} ++- if test "x$7" != "x"; then ++- CPPFLAGS="$CPPFLAGS -I$7" ++- fi ++ dnl try compiling naked first ++ AC_CHECK_LIB($1,$2, [ ++ AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[]) +diff --git a/feeds/packages/utils/rrdtool/patches/.svn/text-base/020-x86-float-cast.patch.svn-base b/feeds/packages/utils/rrdtool/patches/.svn/text-base/020-x86-float-cast.patch.svn-base +new file mode 100644 +index 0000000..f382404 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/.svn/text-base/020-x86-float-cast.patch.svn-base +@@ -0,0 +1,13 @@ ++Index: rrdtool-1.2.30/src/rrd_format.h ++=================================================================== ++--- rrdtool-1.2.30.orig/src/rrd_format.h +++++ rrdtool-1.2.30/src/rrd_format.h ++@@ -22,7 +22,7 @@ ++ /* #define RRD_VERSION "0002" */ ++ /* changed because microsecond precision requires another field */ ++ #define RRD_VERSION "0003" ++-#define FLOAT_COOKIE 8.642135E130 +++#define FLOAT_COOKIE ((double)8.642135E130) ++ ++ #include "rrd_nan_inf.h" ++ +diff --git a/feeds/packages/utils/rrdtool/patches/.svn/text-base/030-automake-compat.patch.svn-base b/feeds/packages/utils/rrdtool/patches/.svn/text-base/030-automake-compat.patch.svn-base +new file mode 100644 +index 0000000..df51205 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/.svn/text-base/030-automake-compat.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/bindings/tcl/Makefile.am +++++ b/bindings/tcl/Makefile.am ++@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@ ++ tclpkg_DATA = pkgIndex.tcl ++ tclpkg_SCRIPTS = ifOctets.tcl ++ else ++-pkglib_DATA = pkgIndex.tcl ++-pkglib_SCRIPTS = ifOctets.tcl +++pkgdata_DATA = pkgIndex.tcl +++pkgdata_SCRIPTS = ifOctets.tcl ++ endif ++ ++ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as +diff --git a/feeds/packages/utils/rrdtool/patches/010-dont-add-host-include-paths.patch b/feeds/packages/utils/rrdtool/patches/010-dont-add-host-include-paths.patch +new file mode 100644 +index 0000000..507a0e9 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/010-dont-add-host-include-paths.patch +@@ -0,0 +1,34 @@ ++--- a/configure +++++ b/configure ++@@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ex_check_save_LIBS=${LIBS} ++ ex_check_save_CPPFLAGS=${CPPFLAGS} ++ ex_check_save_LDFLAGS=${LDFLAGS} ++- if test "x/usr/include/libart-2.0" != "x"; then ++- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0" ++- fi ++ { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5 ++ echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; } ++ if test "${ac_cv_lib_art_lgpl_2_art_vpath_add_point+set}" = set; then ++@@ -27915,9 +27912,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ex_check_save_LIBS=${LIBS} ++ ex_check_save_CPPFLAGS=${CPPFLAGS} ++ ex_check_save_LDFLAGS=${LDFLAGS} ++- if test "x/usr/include/freetype2" != "x"; then ++- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" ++- fi ++ { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 ++ echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; } ++ if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL], ++ ex_check_save_LIBS=${LIBS} ++ ex_check_save_CPPFLAGS=${CPPFLAGS} ++ ex_check_save_LDFLAGS=${LDFLAGS} ++- if test "x$7" != "x"; then ++- CPPFLAGS="$CPPFLAGS -I$7" ++- fi ++ dnl try compiling naked first ++ AC_CHECK_LIB($1,$2, [ ++ AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[]) +diff --git a/feeds/packages/utils/rrdtool/patches/020-x86-float-cast.patch b/feeds/packages/utils/rrdtool/patches/020-x86-float-cast.patch +new file mode 100644 +index 0000000..f382404 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/020-x86-float-cast.patch +@@ -0,0 +1,13 @@ ++Index: rrdtool-1.2.30/src/rrd_format.h ++=================================================================== ++--- rrdtool-1.2.30.orig/src/rrd_format.h +++++ rrdtool-1.2.30/src/rrd_format.h ++@@ -22,7 +22,7 @@ ++ /* #define RRD_VERSION "0002" */ ++ /* changed because microsecond precision requires another field */ ++ #define RRD_VERSION "0003" ++-#define FLOAT_COOKIE 8.642135E130 +++#define FLOAT_COOKIE ((double)8.642135E130) ++ ++ #include "rrd_nan_inf.h" ++ +diff --git a/feeds/packages/utils/rrdtool/patches/030-automake-compat.patch b/feeds/packages/utils/rrdtool/patches/030-automake-compat.patch +new file mode 100644 +index 0000000..df51205 +--- /dev/null ++++ b/feeds/packages/utils/rrdtool/patches/030-automake-compat.patch +@@ -0,0 +1,13 @@ ++--- a/bindings/tcl/Makefile.am +++++ b/bindings/tcl/Makefile.am ++@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@ ++ tclpkg_DATA = pkgIndex.tcl ++ tclpkg_SCRIPTS = ifOctets.tcl ++ else ++-pkglib_DATA = pkgIndex.tcl ++-pkglib_SCRIPTS = ifOctets.tcl +++pkgdata_DATA = pkgIndex.tcl +++pkgdata_SCRIPTS = ifOctets.tcl ++ endif ++ ++ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as +diff --git a/feeds/packages/utils/rsnapshot/.svn/entries b/feeds/packages/utils/rsnapshot/.svn/entries +new file mode 100644 +index 0000000..f849101 +--- /dev/null ++++ b/feeds/packages/utils/rsnapshot/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rsnapshot ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:02.028912Z ++34508 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++8730fbac00bf5b526e6ff2c6b0228c2d ++2012-12-05T17:31:02.028912Z ++34508 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1803 ++ +diff --git a/feeds/packages/utils/rsnapshot/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rsnapshot/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a228423 +--- /dev/null ++++ b/feeds/packages/utils/rsnapshot/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,73 @@ ++# ++# 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:=rsnapshot ++PKG_VERSION:=1.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.rsnapshot.org/downloads/ ++PKG_MD5SUM:=588f92995dcf60a6ea6df8d94a017e7e ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rsnapshot ++ SUBMENU:=backup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=rsnapshot Backup ++ URL:=http://www.rsnapshot.org/ ++ DEPENDS:=+rsync +perl \ ++ +perlbase-autoloader \ ++ +perlbase-class \ ++ +perlbase-cwd \ ++ +perlbase-dirhandle \ ++ +perlbase-essential \ ++ +perlbase-fcntl \ ++ +perlbase-file \ ++ +perlbase-getopt \ ++ +perlbase-io \ ++ +perlbase-posix \ ++ +perlbase-selectsaver \ ++ +perlbase-symbol \ ++ +perlbase-tie \ ++ +perlbase-xsloader ++endef ++ ++define Package/rsnapshot/description ++ rsnapshot is a filesystem snapshot utility for making backups of local and ++ remote systems. ++ ++ Using rsync and hard links, it is possible to keep multiple, full backups ++ instantly available. The disk space required is just a little more than the ++ space of one full backup, plus incrementals. ++endef ++ ++CONFIGURE_ARGS += --with-cp=/bin/cp \ ++ --with-rsync=/usr/bin/rsync \ ++ --with-rm=/bin/rm \ ++ --with-ssh=/usr/bin/ssh \ ++ --with-logger=/usr/bin/logger \ ++ --with-du=/usr/bin/du ++ ++define Package/rsnapshot/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME).conf.default $(1)/etc/$(PKG_NAME).conf ++endef ++ ++define Package/rsnapshot/conffiles ++/etc/$(PKG_NAME).conf ++endef ++ ++$(eval $(call BuildPackage,rsnapshot)) +diff --git a/feeds/packages/utils/rsnapshot/Makefile b/feeds/packages/utils/rsnapshot/Makefile +new file mode 100644 +index 0000000..a228423 +--- /dev/null ++++ b/feeds/packages/utils/rsnapshot/Makefile +@@ -0,0 +1,73 @@ ++# ++# 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:=rsnapshot ++PKG_VERSION:=1.3.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.rsnapshot.org/downloads/ ++PKG_MD5SUM:=588f92995dcf60a6ea6df8d94a017e7e ++ ++PKG_INSTALL:=1 ++PKG_BUILD_PARALLEL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rsnapshot ++ SUBMENU:=backup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=rsnapshot Backup ++ URL:=http://www.rsnapshot.org/ ++ DEPENDS:=+rsync +perl \ ++ +perlbase-autoloader \ ++ +perlbase-class \ ++ +perlbase-cwd \ ++ +perlbase-dirhandle \ ++ +perlbase-essential \ ++ +perlbase-fcntl \ ++ +perlbase-file \ ++ +perlbase-getopt \ ++ +perlbase-io \ ++ +perlbase-posix \ ++ +perlbase-selectsaver \ ++ +perlbase-symbol \ ++ +perlbase-tie \ ++ +perlbase-xsloader ++endef ++ ++define Package/rsnapshot/description ++ rsnapshot is a filesystem snapshot utility for making backups of local and ++ remote systems. ++ ++ Using rsync and hard links, it is possible to keep multiple, full backups ++ instantly available. The disk space required is just a little more than the ++ space of one full backup, plus incrementals. ++endef ++ ++CONFIGURE_ARGS += --with-cp=/bin/cp \ ++ --with-rsync=/usr/bin/rsync \ ++ --with-rm=/bin/rm \ ++ --with-ssh=/usr/bin/ssh \ ++ --with-logger=/usr/bin/logger \ ++ --with-du=/usr/bin/du ++ ++define Package/rsnapshot/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc ++ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME).conf.default $(1)/etc/$(PKG_NAME).conf ++endef ++ ++define Package/rsnapshot/conffiles ++/etc/$(PKG_NAME).conf ++endef ++ ++$(eval $(call BuildPackage,rsnapshot)) +diff --git a/feeds/packages/utils/rsnapshot/patches/.svn/entries b/feeds/packages/utils/rsnapshot/patches/.svn/entries +new file mode 100644 +index 0000000..747ea7e +--- /dev/null ++++ b/feeds/packages/utils/rsnapshot/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rsnapshot/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:31:02.028912Z ++34508 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-busybox-logger-i.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++15daf272c891575cd3e0040437fe360d ++2012-12-05T17:31:02.028912Z ++34508 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1000 ++ +diff --git a/feeds/packages/utils/rsnapshot/patches/.svn/text-base/001-busybox-logger-i.patch.svn-base b/feeds/packages/utils/rsnapshot/patches/.svn/text-base/001-busybox-logger-i.patch.svn-base +new file mode 100644 +index 0000000..db4af28 +--- /dev/null ++++ b/feeds/packages/utils/rsnapshot/patches/.svn/text-base/001-busybox-logger-i.patch.svn-base +@@ -0,0 +1,23 @@ ++diff --git a/rsnapshot-program.pl b/rsnapshot-program.pl ++index dfd7ef6..c51b9ff 100755 ++--- a/rsnapshot-program.pl +++++ b/rsnapshot-program.pl ++@@ -2164,15 +2164,15 @@ sub syslog_msg { ++ if (defined($config_vars{'cmd_logger'})) { ++ # print out our call to syslog ++ if (defined($verbose) && ($verbose >= 4)) { ++- print_cmd("$config_vars{'cmd_logger'} -i -p $facility.$level -t rsnapshot $msg"); +++ print_cmd("$config_vars{'cmd_logger'} -p $facility.$level -t rsnapshot $msg"); ++ } ++ ++ # log to syslog ++ if (0 == $test) { ++- $result = system($config_vars{'cmd_logger'}, '-i', '-p', "$facility.$level", '-t', 'rsnapshot', $msg); +++ $result = system($config_vars{'cmd_logger'}, '-p', "$facility.$level", '-t', 'rsnapshot', $msg); ++ if (0 != $result) { ++ print_warn("Could not log to syslog:", 2); ++- print_warn("$config_vars{'cmd_logger'} -i -p $facility.$level -t rsnapshot $msg", 2); +++ print_warn("$config_vars{'cmd_logger'} -p $facility.$level -t rsnapshot $msg", 2); ++ } ++ } ++ } +diff --git a/feeds/packages/utils/rsnapshot/patches/001-busybox-logger-i.patch b/feeds/packages/utils/rsnapshot/patches/001-busybox-logger-i.patch +new file mode 100644 +index 0000000..db4af28 +--- /dev/null ++++ b/feeds/packages/utils/rsnapshot/patches/001-busybox-logger-i.patch +@@ -0,0 +1,23 @@ ++diff --git a/rsnapshot-program.pl b/rsnapshot-program.pl ++index dfd7ef6..c51b9ff 100755 ++--- a/rsnapshot-program.pl +++++ b/rsnapshot-program.pl ++@@ -2164,15 +2164,15 @@ sub syslog_msg { ++ if (defined($config_vars{'cmd_logger'})) { ++ # print out our call to syslog ++ if (defined($verbose) && ($verbose >= 4)) { ++- print_cmd("$config_vars{'cmd_logger'} -i -p $facility.$level -t rsnapshot $msg"); +++ print_cmd("$config_vars{'cmd_logger'} -p $facility.$level -t rsnapshot $msg"); ++ } ++ ++ # log to syslog ++ if (0 == $test) { ++- $result = system($config_vars{'cmd_logger'}, '-i', '-p', "$facility.$level", '-t', 'rsnapshot', $msg); +++ $result = system($config_vars{'cmd_logger'}, '-p', "$facility.$level", '-t', 'rsnapshot', $msg); ++ if (0 != $result) { ++ print_warn("Could not log to syslog:", 2); ++- print_warn("$config_vars{'cmd_logger'} -i -p $facility.$level -t rsnapshot $msg", 2); +++ print_warn("$config_vars{'cmd_logger'} -p $facility.$level -t rsnapshot $msg", 2); ++ } ++ } ++ } +diff --git a/feeds/packages/utils/rsyncrypto/.svn/entries b/feeds/packages/utils/rsyncrypto/.svn/entries +new file mode 100644 +index 0000000..3fadec8 +--- /dev/null ++++ b/feeds/packages/utils/rsyncrypto/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rsyncrypto ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-17T20:31:48.323972Z ++30621 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++cf15fc609cd7649f14883ec022f55fa1 ++2012-02-17T20:31:48.323972Z ++30621 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1231 ++ +diff --git a/feeds/packages/utils/rsyncrypto/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rsyncrypto/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bb1b6e5 +--- /dev/null ++++ b/feeds/packages/utils/rsyncrypto/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,46 @@ ++# ++# Copyright (C) 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:=rsyncrypto ++PKG_VERSION:=1.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/rsyncrypto ++PKG_MD5SUM:=62367d5458ceaab58bbe73030880f538 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rsyncrypto ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Rsync friendly encryption ++ URL:=http://rsyncrypto.lingnu.com/ ++ DEPENDS:=+argtable +gzip +libopenssl +libstdcpp ++endef ++ ++define Package/rsyncrypto/description ++ rsyncrypto is a utility that encrypts a file (or a directory structure) in a ++ way that ensures that local changes to the plain text file will result in ++ local changes to the cipher text file. This, in turn, ensures that doing rsync ++ to synchronize the encrypted files to another machine will have only a small ++ impact on rsync's efficiency. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-openssl="$(STAGING_DIR)/usr" ++ ++define Package/rsyncrypto/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rsyncrypto $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,rsyncrypto)) +diff --git a/feeds/packages/utils/rsyncrypto/Makefile b/feeds/packages/utils/rsyncrypto/Makefile +new file mode 100644 +index 0000000..bb1b6e5 +--- /dev/null ++++ b/feeds/packages/utils/rsyncrypto/Makefile +@@ -0,0 +1,46 @@ ++# ++# Copyright (C) 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:=rsyncrypto ++PKG_VERSION:=1.12 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/rsyncrypto ++PKG_MD5SUM:=62367d5458ceaab58bbe73030880f538 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/rsyncrypto ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Rsync friendly encryption ++ URL:=http://rsyncrypto.lingnu.com/ ++ DEPENDS:=+argtable +gzip +libopenssl +libstdcpp ++endef ++ ++define Package/rsyncrypto/description ++ rsyncrypto is a utility that encrypts a file (or a directory structure) in a ++ way that ensures that local changes to the plain text file will result in ++ local changes to the cipher text file. This, in turn, ensures that doing rsync ++ to synchronize the encrypted files to another machine will have only a small ++ impact on rsync's efficiency. ++endef ++ ++CONFIGURE_ARGS += \ ++ --with-openssl="$(STAGING_DIR)/usr" ++ ++define Package/rsyncrypto/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rsyncrypto $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,rsyncrypto)) +diff --git a/feeds/packages/utils/rtl-sdr/.svn/entries b/feeds/packages/utils/rtl-sdr/.svn/entries +new file mode 100644 +index 0000000..a7b77de +--- /dev/null ++++ b/feeds/packages/utils/rtl-sdr/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/rtl-sdr ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-28T21:27:08.248731Z ++35837 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++7d05c705c1628e8569cb7c24adbe522f ++2013-02-28T21:27:08.248731Z ++35837 ++acinonyx ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2279 ++ +diff --git a/feeds/packages/utils/rtl-sdr/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/rtl-sdr/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3e0f48a +--- /dev/null ++++ b/feeds/packages/utils/rtl-sdr/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,88 @@ ++# ++# 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:=2013-02-27 ++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:=3c4aa46f5ad38d9904d56087747f369d395cc9d0 ++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 ++ ++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/feeds/packages/utils/rtl-sdr/Makefile b/feeds/packages/utils/rtl-sdr/Makefile +new file mode 100644 +index 0000000..3e0f48a +--- /dev/null ++++ b/feeds/packages/utils/rtl-sdr/Makefile +@@ -0,0 +1,88 @@ ++# ++# 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:=2013-02-27 ++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:=3c4aa46f5ad38d9904d56087747f369d395cc9d0 ++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 ++ ++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/feeds/packages/utils/sane-backends/.svn/entries b/feeds/packages/utils/sane-backends/.svn/entries +new file mode 100644 +index 0000000..9fef7ac +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sane-backends ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ef2076c49cd5f377613ad534c9bb2a8f ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3132 ++ +diff --git a/feeds/packages/utils/sane-backends/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/sane-backends/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/sane-backends/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sane-backends/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5a99780 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,123 @@ ++# ++# 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:=sane-backends ++PKG_VERSION:=1.0.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fossies.org/linux/misc \ ++ ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION) \ ++ https://alioth.debian.org/frs/download.php/3503 ++PKG_MD5SUM:=e226a89c54173efea80e91e9a5eb6573 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sane-backends/Default ++ TITLE:=Scanner Access Now Easy ++ URL:=http://www.sane-project.org/ ++endef ++ ++define Package/sane-backends/Default/description ++ SANE (Scanner Access Now Easy) is a universal scanner interface. ++endef ++ ++define Package/sane-backends ++$(call Package/sane-backends/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+sane-libs ++ TITLE+= (backends) ++endef ++ ++define Package/sane-backends/description ++$(call Package/sane-backends/Default/description) ++ This package contains the SANE daemon. ++endef ++ ++define Package/sane-libs ++ $(call Package/sane-backends/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libjpeg +libtiff +libusb-compat +libv4l +cups ++ TITLE+= (libraries) ++endef ++ ++define Package/sane-libs/description ++$(call Package/sane-backends/Default/description) ++ This package contains the SANE shared libraries. ++endef ++ ++define Package/sane-frontends ++ $(call Package/sane-backends/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+sane-backends ++ TITLE+= (frontends) ++endef ++ ++define Package/sane-frontends/description ++$(call Package/sane-backends/Default/description) ++ This package contains the SANE frontends. ++endef ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link $(STAGING_DIR)/usr/lib \ ++ -Wl,-rpath-link $(PKG_BUILD_DIR)/backend/.libs ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-translations \ ++ --disable-latex \ ++ --without-gphoto2 \ ++ --disable-debug \ ++ --without-snmp ++ ++define Build/Configure ++ mkdir -p $(PKG_BUILD_DIR)/backend/.libs ++ $(Build/Configure/Default) ++endef ++ ++define Package/sane-backends/conffiles ++/etc/sane.d/saned.conf ++endef ++ ++define Package/sane-backends/install ++ $(INSTALL_DIR) $(1)/etc/sane.d ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++define Package/sane-libs/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/sane ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-*.so.* $(1)/usr/lib/sane/ ++endef ++ ++define Package/sane-frontends/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/sane $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.{a,so*} $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,sane-backends)) ++$(eval $(call BuildPackage,sane-libs)) ++$(eval $(call BuildPackage,sane-frontends)) +diff --git a/feeds/packages/utils/sane-backends/Makefile b/feeds/packages/utils/sane-backends/Makefile +new file mode 100644 +index 0000000..5a99780 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/Makefile +@@ -0,0 +1,123 @@ ++# ++# 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:=sane-backends ++PKG_VERSION:=1.0.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://fossies.org/linux/misc \ ++ ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION) \ ++ https://alioth.debian.org/frs/download.php/3503 ++PKG_MD5SUM:=e226a89c54173efea80e91e9a5eb6573 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sane-backends/Default ++ TITLE:=Scanner Access Now Easy ++ URL:=http://www.sane-project.org/ ++endef ++ ++define Package/sane-backends/Default/description ++ SANE (Scanner Access Now Easy) is a universal scanner interface. ++endef ++ ++define Package/sane-backends ++$(call Package/sane-backends/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+sane-libs ++ TITLE+= (backends) ++endef ++ ++define Package/sane-backends/description ++$(call Package/sane-backends/Default/description) ++ This package contains the SANE daemon. ++endef ++ ++define Package/sane-libs ++ $(call Package/sane-backends/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ DEPENDS:=+libjpeg +libtiff +libusb-compat +libv4l +cups ++ TITLE+= (libraries) ++endef ++ ++define Package/sane-libs/description ++$(call Package/sane-backends/Default/description) ++ This package contains the SANE shared libraries. ++endef ++ ++define Package/sane-frontends ++ $(call Package/sane-backends/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+sane-backends ++ TITLE+= (frontends) ++endef ++ ++define Package/sane-frontends/description ++$(call Package/sane-backends/Default/description) ++ This package contains the SANE frontends. ++endef ++ ++TARGET_LDFLAGS += \ ++ -Wl,-rpath-link $(STAGING_DIR)/usr/lib \ ++ -Wl,-rpath-link $(PKG_BUILD_DIR)/backend/.libs ++ ++CONFIGURE_ARGS+= \ ++ --enable-shared \ ++ --enable-static \ ++ --disable-translations \ ++ --disable-latex \ ++ --without-gphoto2 \ ++ --disable-debug \ ++ --without-snmp ++ ++define Build/Configure ++ mkdir -p $(PKG_BUILD_DIR)/backend/.libs ++ $(Build/Configure/Default) ++endef ++ ++define Package/sane-backends/conffiles ++/etc/sane.d/saned.conf ++endef ++ ++define Package/sane-backends/install ++ $(INSTALL_DIR) $(1)/etc/sane.d ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ ++endef ++ ++define Package/sane-libs/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/sane ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-*.so.* $(1)/usr/lib/sane/ ++endef ++ ++define Package/sane-frontends/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/sane $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.{a,so*} $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,sane-backends)) ++$(eval $(call BuildPackage,sane-libs)) ++$(eval $(call BuildPackage,sane-frontends)) +diff --git a/feeds/packages/utils/sane-backends/patches/.svn/entries b/feeds/packages/utils/sane-backends/patches/.svn/entries +new file mode 100644 +index 0000000..fd31a0c +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sane-backends/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-12-05T17:30:59.964199Z ++34507 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++002-remove-uneeded.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++1df7fd6d1df783561f5d9d8debf5cc43 ++2012-06-03T17:37:56.475199Z ++32036 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++519 ++ ++010-dont-add-host-include-path.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c67c2b2530f8c43b3fd6c72a3619fcbd ++2011-07-17T09:45:40.374303Z ++27634 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++197 ++ ++020-non-i386-qcam.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++54be26b567c3f9a100c5faa57825cc8c ++2011-07-17T09:45:40.374303Z ++27634 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++377 ++ +diff --git a/feeds/packages/utils/sane-backends/patches/.svn/prop-base/002-remove-uneeded.patch.svn-base b/feeds/packages/utils/sane-backends/patches/.svn/prop-base/002-remove-uneeded.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/.svn/prop-base/002-remove-uneeded.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/sane-backends/patches/.svn/text-base/002-remove-uneeded.patch.svn-base b/feeds/packages/utils/sane-backends/patches/.svn/text-base/002-remove-uneeded.patch.svn-base +new file mode 100644 +index 0000000..3eeca3d +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/.svn/text-base/002-remove-uneeded.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -293,7 +293,7 @@ target_alias = @target_alias@ ++ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++-SUBDIRS = include lib sanei backend frontend tools doc po +++SUBDIRS = include lib sanei backend frontend ++ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite ++ dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \ ++ README README.aix README.beos README.darwin README.djpeg README.freebsd \ +diff --git a/feeds/packages/utils/sane-backends/patches/.svn/text-base/010-dont-add-host-include-path.patch.svn-base b/feeds/packages/utils/sane-backends/patches/.svn/text-base/010-dont-add-host-include-path.patch.svn-base +new file mode 100644 +index 0000000..c7caf25 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/.svn/text-base/010-dont-add-host-include-path.patch.svn-base +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -5070,9 +5070,6 @@ else ++ fi ++ ++ ++-INCLUDES="${INCLUDES} -I/usr/local/include" ++- ++- ++ if test "${ac_cv_c_compiler_gnu}" = "yes"; then ++ NORMAL_CFLAGS="\ ++ -W \ +diff --git a/feeds/packages/utils/sane-backends/patches/.svn/text-base/020-non-i386-qcam.patch.svn-base b/feeds/packages/utils/sane-backends/patches/.svn/text-base/020-non-i386-qcam.patch.svn-base +new file mode 100644 +index 0000000..aa64d43 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/.svn/text-base/020-non-i386-qcam.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/backend/qcam.c +++++ b/backend/qcam.c ++@@ -105,6 +105,17 @@ ++ ++ #include "qcam.h" ++ +++#if !defined( __i386__) && !defined(__arm__) +++static inline unsigned char inb(unsigned int port) +++{ +++ return 0; +++} +++ +++static inline void outb(unsigned char value, unsigned int port) +++{ +++} +++#endif +++ ++ /* status bits */ ++ #define NeedRamTable (1 << 1) ++ #define BlackBalanceInProgress (1 << 6) +diff --git a/feeds/packages/utils/sane-backends/patches/002-remove-uneeded.patch b/feeds/packages/utils/sane-backends/patches/002-remove-uneeded.patch +new file mode 100644 +index 0000000..3eeca3d +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/002-remove-uneeded.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -293,7 +293,7 @@ target_alias = @target_alias@ ++ top_build_prefix = @top_build_prefix@ ++ top_builddir = @top_builddir@ ++ top_srcdir = @top_srcdir@ ++-SUBDIRS = include lib sanei backend frontend tools doc po +++SUBDIRS = include lib sanei backend frontend ++ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite ++ dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \ ++ README README.aix README.beos README.darwin README.djpeg README.freebsd \ +diff --git a/feeds/packages/utils/sane-backends/patches/010-dont-add-host-include-path.patch b/feeds/packages/utils/sane-backends/patches/010-dont-add-host-include-path.patch +new file mode 100644 +index 0000000..c7caf25 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/010-dont-add-host-include-path.patch +@@ -0,0 +1,12 @@ ++--- a/configure +++++ b/configure ++@@ -5070,9 +5070,6 @@ else ++ fi ++ ++ ++-INCLUDES="${INCLUDES} -I/usr/local/include" ++- ++- ++ if test "${ac_cv_c_compiler_gnu}" = "yes"; then ++ NORMAL_CFLAGS="\ ++ -W \ +diff --git a/feeds/packages/utils/sane-backends/patches/020-non-i386-qcam.patch b/feeds/packages/utils/sane-backends/patches/020-non-i386-qcam.patch +new file mode 100644 +index 0000000..aa64d43 +--- /dev/null ++++ b/feeds/packages/utils/sane-backends/patches/020-non-i386-qcam.patch +@@ -0,0 +1,20 @@ ++--- a/backend/qcam.c +++++ b/backend/qcam.c ++@@ -105,6 +105,17 @@ ++ ++ #include "qcam.h" ++ +++#if !defined( __i386__) && !defined(__arm__) +++static inline unsigned char inb(unsigned int port) +++{ +++ return 0; +++} +++ +++static inline void outb(unsigned char value, unsigned int port) +++{ +++} +++#endif +++ ++ /* status bits */ ++ #define NeedRamTable (1 << 1) ++ #define BlackBalanceInProgress (1 << 6) +diff --git a/feeds/packages/utils/schedtools/.svn/entries b/feeds/packages/utils/schedtools/.svn/entries +new file mode 100644 +index 0000000..f9a8700 +--- /dev/null ++++ b/feeds/packages/utils/schedtools/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/schedtools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-12-13T12:46:09.420108Z ++18769 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c5e9ec07d2d54ccf00cc0a239212b282 ++2009-12-13T12:46:09.420108Z ++18769 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1042 ++ +diff --git a/feeds/packages/utils/schedtools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/schedtools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..2dad559 +--- /dev/null ++++ b/feeds/packages/utils/schedtools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,38 @@ ++# ++# 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:=schedtool ++PKG_VERSION:=1.3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://freequaos.host.sk/schedtool/ ++PKG_MD5SUM:=0d968f05d3ad7675f1f33ef1f6d0a3fb ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/schedtool ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Scheduler control utility ++ URL:=http://freequaos.host.sk/schedtool/ ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/schedtool.c -o $(PKG_BUILD_DIR)/schedtool.o ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/error.c -o $(PKG_BUILD_DIR)/error.o ++ $(TARGET_CC) $(PKG_BUILD_DIR)/schedtool.o $(PKG_BUILD_DIR)/error.o -o $(PKG_BUILD_DIR)/schedtool ++endef ++ ++define Package/schedtool/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/schedtool $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,schedtool)) +diff --git a/feeds/packages/utils/schedtools/Makefile b/feeds/packages/utils/schedtools/Makefile +new file mode 100644 +index 0000000..2dad559 +--- /dev/null ++++ b/feeds/packages/utils/schedtools/Makefile +@@ -0,0 +1,38 @@ ++# ++# 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:=schedtool ++PKG_VERSION:=1.3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://freequaos.host.sk/schedtool/ ++PKG_MD5SUM:=0d968f05d3ad7675f1f33ef1f6d0a3fb ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/schedtool ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Scheduler control utility ++ URL:=http://freequaos.host.sk/schedtool/ ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/schedtool.c -o $(PKG_BUILD_DIR)/schedtool.o ++ $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/error.c -o $(PKG_BUILD_DIR)/error.o ++ $(TARGET_CC) $(PKG_BUILD_DIR)/schedtool.o $(PKG_BUILD_DIR)/error.o -o $(PKG_BUILD_DIR)/schedtool ++endef ++ ++define Package/schedtool/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/schedtool $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,schedtool)) +diff --git a/feeds/packages/utils/scponly/.svn/entries b/feeds/packages/utils/scponly/.svn/entries +new file mode 100644 +index 0000000..6e279ad +--- /dev/null ++++ b/feeds/packages/utils/scponly/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/scponly ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-29T11:03:23.721604Z ++20575 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++837c89499b73c535298110e7da1a445c ++2010-03-29T11:03:23.721604Z ++20575 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1400 ++ +diff --git a/feeds/packages/utils/scponly/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/scponly/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..59529b6 +--- /dev/null ++++ b/feeds/packages/utils/scponly/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 35 ++Copyright (C) 2007-2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/scponly/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/scponly/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..52a14a2 +--- /dev/null ++++ b/feeds/packages/utils/scponly/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# 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:=scponly ++PKG_VERSION:=4.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=139ac9abd7f3b8dbc5c5520745318f8a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/scponly ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Alternative 'shell' (of sorts) for sysadmins ++ URL:=http://sourceforge.net/projects/scponly ++endef ++ ++define Package/scponly/description ++ "scponly" is an alternative 'shell' (of sorts) for system ++ administrators who would like to provide access to remote ++ users to both read and write local files without providing ++ any remote execution priviledges. Functionally, it is best ++ described as a wrapper to the mostly trusted suite of ssh ++ applications. ++endef ++ ++CONFIGURE_ARGS += \ ++ ac_cv_path_scponly_PROG_SFTP_SERVER="/usr/libexec/sftp-server" \ ++ \ ++ --enable-winscp-compat \ ++ --enable-scp-compat \ ++ --disable-rsync-compat \ ++ --with-sftp-server="/usr/libexec/sftp-server" \ ++ ++define Package/scponly/postinst ++#!/bin/sh ++echo "/usr/bin/scponly" >> $${IPKG_INSTROOT}/etc/shells ++endef ++ ++define Package/scponly/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,scponly)) +diff --git a/feeds/packages/utils/scponly/Makefile b/feeds/packages/utils/scponly/Makefile +new file mode 100644 +index 0000000..52a14a2 +--- /dev/null ++++ b/feeds/packages/utils/scponly/Makefile +@@ -0,0 +1,54 @@ ++# ++# 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:=scponly ++PKG_VERSION:=4.8 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=139ac9abd7f3b8dbc5c5520745318f8a ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/scponly ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Alternative 'shell' (of sorts) for sysadmins ++ URL:=http://sourceforge.net/projects/scponly ++endef ++ ++define Package/scponly/description ++ "scponly" is an alternative 'shell' (of sorts) for system ++ administrators who would like to provide access to remote ++ users to both read and write local files without providing ++ any remote execution priviledges. Functionally, it is best ++ described as a wrapper to the mostly trusted suite of ssh ++ applications. ++endef ++ ++CONFIGURE_ARGS += \ ++ ac_cv_path_scponly_PROG_SFTP_SERVER="/usr/libexec/sftp-server" \ ++ \ ++ --enable-winscp-compat \ ++ --enable-scp-compat \ ++ --disable-rsync-compat \ ++ --with-sftp-server="/usr/libexec/sftp-server" \ ++ ++define Package/scponly/postinst ++#!/bin/sh ++echo "/usr/bin/scponly" >> $${IPKG_INSTROOT}/etc/shells ++endef ++ ++define Package/scponly/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,scponly)) +diff --git a/feeds/packages/utils/scponly/patches/.svn/entries b/feeds/packages/utils/scponly/patches/.svn/entries +new file mode 100644 +index 0000000..0240adc +--- /dev/null ++++ b/feeds/packages/utils/scponly/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/scponly/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-03-29T11:03:23.721604Z ++20575 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-elif_else_replacement.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++85074fd77b575b6faf17243af4c5528c ++2010-03-29T11:03:23.721604Z ++20575 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++381 ++ +diff --git a/feeds/packages/utils/scponly/patches/.svn/text-base/001-elif_else_replacement.patch.svn-base b/feeds/packages/utils/scponly/patches/.svn/text-base/001-elif_else_replacement.patch.svn-base +new file mode 100644 +index 0000000..e817e3e +--- /dev/null ++++ b/feeds/packages/utils/scponly/patches/.svn/text-base/001-elif_else_replacement.patch.svn-base +@@ -0,0 +1,12 @@ ++diff -urN scponly-4.8/helper.c scponly-4.8.new/helper.c ++--- scponly-4.8/helper.c 2008-01-15 07:26:13.000000000 +0100 +++++ scponly-4.8.new/helper.c 2010-03-29 09:48:33.000000000 +0200 ++@@ -230,7 +230,7 @@ ++ return 1; ++ } ++ } ++-#elif +++#else ++ /* ++ * make sure that processing doesn't continue if we can't validate a rsync check ++ * and if the getopt flag is set. +diff --git a/feeds/packages/utils/scponly/patches/001-elif_else_replacement.patch b/feeds/packages/utils/scponly/patches/001-elif_else_replacement.patch +new file mode 100644 +index 0000000..e817e3e +--- /dev/null ++++ b/feeds/packages/utils/scponly/patches/001-elif_else_replacement.patch +@@ -0,0 +1,12 @@ ++diff -urN scponly-4.8/helper.c scponly-4.8.new/helper.c ++--- scponly-4.8/helper.c 2008-01-15 07:26:13.000000000 +0100 +++++ scponly-4.8.new/helper.c 2010-03-29 09:48:33.000000000 +0200 ++@@ -230,7 +230,7 @@ ++ return 1; ++ } ++ } ++-#elif +++#else ++ /* ++ * make sure that processing doesn't continue if we can't validate a rsync check ++ * and if the getopt flag is set. +diff --git a/feeds/packages/utils/screen/.svn/entries b/feeds/packages/utils/screen/.svn/entries +new file mode 100644 +index 0000000..f82999c +--- /dev/null ++++ b/feeds/packages/utils/screen/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/screen ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++466f0c3d3b98eed6cb46899e3308f790 ++2011-11-16T20:02:41.452853Z ++29199 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1213 ++ +diff --git a/feeds/packages/utils/screen/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/screen/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/screen/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/screen/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/screen/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..df22deb +--- /dev/null ++++ b/feeds/packages/utils/screen/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=screen ++PKG_VERSION:=4.0.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/utilities/screen \ ++ @GNU/screen ++PKG_MD5SUM:=8506fd205028a96c741e4037de6e3c42 ++ ++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/ ++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,\ ++ LIBS="-lcrypt" \ ++ ) ++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/feeds/packages/utils/screen/Makefile b/feeds/packages/utils/screen/Makefile +new file mode 100644 +index 0000000..df22deb +--- /dev/null ++++ b/feeds/packages/utils/screen/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=screen ++PKG_VERSION:=4.0.3 ++PKG_RELEASE:=3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/utilities/screen \ ++ @GNU/screen ++PKG_MD5SUM:=8506fd205028a96c741e4037de6e3c42 ++ ++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/ ++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,\ ++ LIBS="-lcrypt" \ ++ ) ++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/feeds/packages/utils/screen/files/.svn/entries b/feeds/packages/utils/screen/files/.svn/entries +new file mode 100644 +index 0000000..cff2e59 +--- /dev/null ++++ b/feeds/packages/utils/screen/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/screen/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-29T18:17:51.065361Z ++18210 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/utils/screen/files/etc/.svn/entries b/feeds/packages/utils/screen/files/etc/.svn/entries +new file mode 100644 +index 0000000..2b27eaf +--- /dev/null ++++ b/feeds/packages/utils/screen/files/etc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/screen/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-10-29T18:17:51.065361Z ++18210 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++screenrc ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e62017b211e6edf10bf5df526756ed54 ++2009-10-29T18:17:51.065361Z ++18210 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++20 ++ +diff --git a/feeds/packages/utils/screen/files/etc/.svn/text-base/screenrc.svn-base b/feeds/packages/utils/screen/files/etc/.svn/text-base/screenrc.svn-base +new file mode 100644 +index 0000000..3337674 +--- /dev/null ++++ b/feeds/packages/utils/screen/files/etc/.svn/text-base/screenrc.svn-base +@@ -0,0 +1 @@ ++startup_message off +diff --git a/feeds/packages/utils/screen/files/etc/screenrc b/feeds/packages/utils/screen/files/etc/screenrc +new file mode 100644 +index 0000000..3337674 +--- /dev/null ++++ b/feeds/packages/utils/screen/files/etc/screenrc +@@ -0,0 +1 @@ ++startup_message off +diff --git a/feeds/packages/utils/screen/patches/.svn/entries b/feeds/packages/utils/screen/patches/.svn/entries +new file mode 100644 +index 0000000..b267efe +--- /dev/null ++++ b/feeds/packages/utils/screen/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/screen/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-cross_compile_fix.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c599e38198203c6551f4baad06663d0e ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++17270 ++ +diff --git a/feeds/packages/utils/screen/patches/.svn/prop-base/100-cross_compile_fix.patch.svn-base b/feeds/packages/utils/screen/patches/.svn/prop-base/100-cross_compile_fix.patch.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/screen/patches/.svn/prop-base/100-cross_compile_fix.patch.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/screen/patches/.svn/text-base/100-cross_compile_fix.patch.svn-base b/feeds/packages/utils/screen/patches/.svn/text-base/100-cross_compile_fix.patch.svn-base +new file mode 100644 +index 0000000..80833a6 +--- /dev/null ++++ b/feeds/packages/utils/screen/patches/.svn/text-base/100-cross_compile_fix.patch.svn-base +@@ -0,0 +1,530 @@ ++Binary files screen-4.0.2.old/.configure.swp and screen-4.0.2.dev/.configure.swp differ ++diff -urN screen-4.0.2.old/configure screen-4.0.2.dev/configure ++--- screen-4.0.2.old/configure 2003-12-05 14:46:53.000000000 +0100 +++++ screen-4.0.2.dev/configure 2005-05-05 12:13:03.000000000 +0200 ++@@ -124,7 +124,7 @@ ++ fi ++ if test ! -f "$as_myself"; then ++ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ case $CONFIG_SHELL in ++ '') ++@@ -174,7 +174,7 @@ ++ ' >$as_me.lineno && ++ chmod +x $as_me.lineno || ++ { 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 ++ # (the dirname of $[0] is not the place where we might find the ++@@ -397,7 +397,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval "enable_$ac_feature=no" ;; ++ ++@@ -406,7 +406,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++@@ -588,7 +588,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_package=`echo $ac_package| sed 's/-/_/g'` ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++@@ -601,7 +601,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_package=`echo $ac_package | sed 's/-/_/g'` ++ eval "with_$ac_package=no" ;; ++ ++@@ -625,7 +625,7 @@ ++ ++ -*) { echo "$as_me: error: unrecognized option: $ac_option ++ Try \`$0 --help' for more information." >&2 ++- { (exit 1); exit 1; }; } +++ } ++ ;; ++ ++ *=*) ++@@ -633,7 +633,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ++ eval "$ac_envvar='$ac_optarg'" ++ export $ac_envvar ;; ++@@ -652,7 +652,7 @@ ++ if test -n "$ac_prev"; then ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ # Be sure to have absolute paths. ++@@ -662,7 +662,7 @@ ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* | NONE | '' ) ;; ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++- { (exit 1); exit 1; }; };; +++ };; ++ esac ++ done ++ ++@@ -674,7 +674,7 @@ ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) ;; ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++- { (exit 1); exit 1; }; };; +++ };; ++ esac ++ done ++ ++@@ -728,15 +728,15 @@ ++ if test ! -r $srcdir/$ac_unique_file; then ++ if test "$ac_srcdir_defaulted" = yes; then ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 ++- { (exit 1); exit 1; }; } +++ } ++ else ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ fi ++ (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || ++ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ++ ac_env_build_alias_set=${build_alias+set} ++ ac_env_build_alias_value=$build_alias ++@@ -1243,7 +1243,7 @@ ++ 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;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ ac_ext=c ++@@ -1734,7 +1734,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: no acceptable C compiler found in \$PATH ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ ++ # Provide some information about the compiler. ++ echo "$as_me:$LINENO:" \ ++@@ -1856,7 +1856,7 @@ ++ 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; }; } +++ } ++ fi ++ fi ++ fi ++@@ -1898,7 +1898,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ rm -f conftest$ac_cv_exeext ++@@ -1950,7 +1950,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot compute suffix of object files: cannot compile ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ rm -f conftest.$ac_cv_objext conftest.$ac_ext ++@@ -2514,7 +2514,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ ac_ext=c ++@@ -2704,7 +2704,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -2753,7 +2753,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -2790,7 +2790,7 @@ ++ ++ { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5 ++ echo "$as_me: error: Can't run the compiler - sorry" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ fi ++@@ -2800,7 +2800,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -2830,7 +2830,7 @@ ++ (exit $ac_status); }; }; then ++ { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5 ++ echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ echo "$as_me: program exited with status $ac_status" >&5 ++ echo "$as_me: failed program was:" >&5 ++@@ -2900,7 +2900,7 @@ ++ if test -z "$ac_aux_dir"; then ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ++ ac_config_sub="$SHELL $ac_aux_dir/config.sub" ++@@ -4149,7 +4149,7 @@ ++ ++ { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5 ++ echo "$as_me: error: !!! no select - no screen" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ ++@@ -4163,7 +4163,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4272,7 +4272,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4365,7 +4365,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4460,7 +4460,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4562,7 +4562,7 @@ ++ else ++ { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5 ++ echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ ++@@ -4573,7 +4573,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4898,7 +4898,7 @@ ++ ++ { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5 ++ echo "$as_me: error: !!! no tgetent - no screen" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ fi ++@@ -4915,7 +4915,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -5359,7 +5356,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -6206,7 +6203,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -6482,7 +6479,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7004,7 +7001,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7056,7 +7053,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7110,7 +7107,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7951,7 +7948,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7982,7 +7979,7 @@ ++ ( exit $ac_status ) ++ { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5 ++ echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ fi ++@@ -8251,7 +8248,7 @@ ++ if test ! -f "$as_myself"; then ++ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 ++ echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ case $CONFIG_SHELL in ++ '') ++@@ -8302,7 +8299,7 @@ ++ chmod +x $as_me.lineno || ++ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 ++ 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 ++ # (the dirname of $[0] is not the place where we might find the ++@@ -8494,7 +8491,7 @@ ++ Try \`$0 --help' for more information." >&5 ++ echo "$as_me: error: ambiguous option: $1 ++ Try \`$0 --help' for more information." >&2;} ++- { (exit 1); exit 1; }; };; +++ };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit 0 ;; ++ --debug | --d* | -d ) ++@@ -8516,7 +8513,7 @@ ++ Try \`$0 --help' for more information." >&5 ++ echo "$as_me: error: unrecognized option: $1 ++ Try \`$0 --help' for more information." >&2;} ++- { (exit 1); exit 1; }; } ;; +++ } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ;; ++ ++@@ -8555,7 +8552,7 @@ ++ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++ echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++- { (exit 1); exit 1; }; };; +++ };; ++ esac ++ done ++ ++@@ -8750,7 +8747,7 @@ ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++- { (exit 1); exit 1; }; }; } +++ }; } ++ ++ ac_builddir=. ++ ++@@ -8816,7 +8813,7 @@ ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ echo $f;; ++ *) # Relative ++ if test -f "$f"; then ++@@ -8829,7 +8826,7 @@ ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++@@ -8907,7 +8904,7 @@ ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ echo $f;; ++ *) # Relative ++ if test -f "$f"; then ++@@ -8920,7 +8917,7 @@ ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++@@ -9073,7 +9070,7 @@ ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++- { (exit 1); exit 1; }; }; } +++ }; } ++ ++ rm -f $ac_file ++ mv $tmp/config.h $ac_file ++diff -urN screen-4.0.2.old/pty.c screen-4.0.2.dev/pty.c ++--- screen-4.0.2.old/pty.c 2003-09-08 16:26:18.000000000 +0200 +++++ screen-4.0.2.dev/pty.c 2005-05-05 12:32:20.000000000 +0200 ++@@ -34,9 +34,9 @@ ++ #endif ++ ++ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ ++-#ifdef HAVE_SVR4_PTYS ++-# include ++-#endif +++//#ifdef HAVE_SVR4_PTYS +++//# include +++//#endif ++ ++ #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) ++ # include ++--- screen-4.0.2/configure.old 2005-05-24 18:49:30.000000000 +0200 +++++ screen-4.0.2/configure 2005-05-24 18:49:54.000000000 +0200 ++@@ -6598,8 +6598,6 @@ ++ LIBS="$oldlibs" ++ fi ++ rm -f 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" ++ { echo "$as_me:$LINENO: checking IRIX sun library..." >&5 ++diff -ur screen.old/sched.h screen.dev/sched.h ++--- screen.old/sched.h 2002-01-08 16:42:43.000000000 +0100 +++++ screen.dev/sched.h 2007-03-02 17:03:48.475830776 +0100 ++@@ -22,6 +22,11 @@ ++ * $Id: 100-cross_compile_fix.patch 6458 2007-03-02 16:12:30Z nbd $ FAU ++ */ ++ +++#ifndef __SCHED_H +++#define __SCHED_H +++ +++#include +++ ++ struct event ++ { ++ struct event *next; ++@@ -41,3 +46,5 @@ ++ #define EV_READ 1 ++ #define EV_WRITE 2 ++ #define EV_ALWAYS 3 +++ +++#endif +diff --git a/feeds/packages/utils/screen/patches/100-cross_compile_fix.patch b/feeds/packages/utils/screen/patches/100-cross_compile_fix.patch +new file mode 100644 +index 0000000..80833a6 +--- /dev/null ++++ b/feeds/packages/utils/screen/patches/100-cross_compile_fix.patch +@@ -0,0 +1,530 @@ ++Binary files screen-4.0.2.old/.configure.swp and screen-4.0.2.dev/.configure.swp differ ++diff -urN screen-4.0.2.old/configure screen-4.0.2.dev/configure ++--- screen-4.0.2.old/configure 2003-12-05 14:46:53.000000000 +0100 +++++ screen-4.0.2.dev/configure 2005-05-05 12:13:03.000000000 +0200 ++@@ -124,7 +124,7 @@ ++ fi ++ if test ! -f "$as_myself"; then ++ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ case $CONFIG_SHELL in ++ '') ++@@ -174,7 +174,7 @@ ++ ' >$as_me.lineno && ++ chmod +x $as_me.lineno || ++ { 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 ++ # (the dirname of $[0] is not the place where we might find the ++@@ -397,7 +397,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval "enable_$ac_feature=no" ;; ++ ++@@ -406,7 +406,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++@@ -588,7 +588,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_package=`echo $ac_package| sed 's/-/_/g'` ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; ++@@ -601,7 +601,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_package=`echo $ac_package | sed 's/-/_/g'` ++ eval "with_$ac_package=no" ;; ++ ++@@ -625,7 +625,7 @@ ++ ++ -*) { echo "$as_me: error: unrecognized option: $ac_option ++ Try \`$0 --help' for more information." >&2 ++- { (exit 1); exit 1; }; } +++ } ++ ;; ++ ++ *=*) ++@@ -633,7 +633,7 @@ ++ # 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 ++- { (exit 1); exit 1; }; } +++ } ++ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ++ eval "$ac_envvar='$ac_optarg'" ++ export $ac_envvar ;; ++@@ -652,7 +652,7 @@ ++ if test -n "$ac_prev"; then ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ # Be sure to have absolute paths. ++@@ -662,7 +662,7 @@ ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* | NONE | '' ) ;; ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++- { (exit 1); exit 1; }; };; +++ };; ++ esac ++ done ++ ++@@ -674,7 +674,7 @@ ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) ;; ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++- { (exit 1); exit 1; }; };; +++ };; ++ esac ++ done ++ ++@@ -728,15 +728,15 @@ ++ if test ! -r $srcdir/$ac_unique_file; then ++ if test "$ac_srcdir_defaulted" = yes; then ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 ++- { (exit 1); exit 1; }; } +++ } ++ else ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ fi ++ (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || ++ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 ++- { (exit 1); exit 1; }; } +++ } ++ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ++ ac_env_build_alias_set=${build_alias+set} ++ ac_env_build_alias_value=$build_alias ++@@ -1243,7 +1243,7 @@ ++ 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;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ ac_ext=c ++@@ -1734,7 +1734,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: no acceptable C compiler found in \$PATH ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ ++ # Provide some information about the compiler. ++ echo "$as_me:$LINENO:" \ ++@@ -1856,7 +1856,7 @@ ++ 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; }; } +++ } ++ fi ++ fi ++ fi ++@@ -1898,7 +1898,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ rm -f conftest$ac_cv_exeext ++@@ -1950,7 +1950,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot compute suffix of object files: cannot compile ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ rm -f conftest.$ac_cv_objext conftest.$ac_ext ++@@ -2514,7 +2514,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ ac_ext=c ++@@ -2704,7 +2704,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -2753,7 +2753,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -2790,7 +2790,7 @@ ++ ++ { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5 ++ echo "$as_me: error: Can't run the compiler - sorry" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ fi ++@@ -2800,7 +2800,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -2830,7 +2830,7 @@ ++ (exit $ac_status); }; }; then ++ { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5 ++ echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ echo "$as_me: program exited with status $ac_status" >&5 ++ echo "$as_me: failed program was:" >&5 ++@@ -2900,7 +2900,7 @@ ++ if test -z "$ac_aux_dir"; then ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ++ ac_config_sub="$SHELL $ac_aux_dir/config.sub" ++@@ -4149,7 +4149,7 @@ ++ ++ { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5 ++ echo "$as_me: error: !!! no select - no screen" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ ++@@ -4163,7 +4163,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4272,7 +4272,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4365,7 +4365,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4460,7 +4460,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4562,7 +4562,7 @@ ++ else ++ { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5 ++ echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ ++ ++@@ -4573,7 +4573,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -4898,7 +4898,7 @@ ++ ++ { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5 ++ echo "$as_me: error: !!! no tgetent - no screen" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ fi ++@@ -4915,7 +4915,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -5359,7 +5356,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -6206,7 +6203,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -6482,7 +6479,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7004,7 +7001,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7056,7 +7053,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7110,7 +7107,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7951,7 +7948,7 @@ ++ See \`config.log' for more details." >&5 ++ echo "$as_me: error: cannot run test program while cross compiling ++ See \`config.log' for more details." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ else ++ cat >conftest.$ac_ext <<_ACEOF ++ #line $LINENO "configure" ++@@ -7982,7 +7979,7 @@ ++ ( exit $ac_status ) ++ { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5 ++ echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ fi ++@@ -8251,7 +8248,7 @@ ++ if test ! -f "$as_myself"; then ++ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 ++ echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi ++ case $CONFIG_SHELL in ++ '') ++@@ -8302,7 +8299,7 @@ ++ chmod +x $as_me.lineno || ++ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 ++ 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 ++ # (the dirname of $[0] is not the place where we might find the ++@@ -8494,7 +8491,7 @@ ++ Try \`$0 --help' for more information." >&5 ++ echo "$as_me: error: ambiguous option: $1 ++ Try \`$0 --help' for more information." >&2;} ++- { (exit 1); exit 1; }; };; +++ };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit 0 ;; ++ --debug | --d* | -d ) ++@@ -8516,7 +8513,7 @@ ++ Try \`$0 --help' for more information." >&5 ++ echo "$as_me: error: unrecognized option: $1 ++ Try \`$0 --help' for more information." >&2;} ++- { (exit 1); exit 1; }; } ;; +++ } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ;; ++ ++@@ -8555,7 +8552,7 @@ ++ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++ echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++- { (exit 1); exit 1; }; };; +++ };; ++ esac ++ done ++ ++@@ -8750,7 +8747,7 @@ ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++- { (exit 1); exit 1; }; }; } +++ }; } ++ ++ ac_builddir=. ++ ++@@ -8816,7 +8813,7 @@ ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ echo $f;; ++ *) # Relative ++ if test -f "$f"; then ++@@ -8829,7 +8826,7 @@ ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++@@ -8907,7 +8904,7 @@ ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ echo $f;; ++ *) # Relative ++ if test -f "$f"; then ++@@ -8920,7 +8917,7 @@ ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++ echo "$as_me: error: cannot find input file: $f" >&2;} ++- { (exit 1); exit 1; }; } +++ } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++@@ -9073,7 +9070,7 @@ ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++- { (exit 1); exit 1; }; }; } +++ }; } ++ ++ rm -f $ac_file ++ mv $tmp/config.h $ac_file ++diff -urN screen-4.0.2.old/pty.c screen-4.0.2.dev/pty.c ++--- screen-4.0.2.old/pty.c 2003-09-08 16:26:18.000000000 +0200 +++++ screen-4.0.2.dev/pty.c 2005-05-05 12:32:20.000000000 +0200 ++@@ -34,9 +34,9 @@ ++ #endif ++ ++ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ ++-#ifdef HAVE_SVR4_PTYS ++-# include ++-#endif +++//#ifdef HAVE_SVR4_PTYS +++//# include +++//#endif ++ ++ #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) ++ # include ++--- screen-4.0.2/configure.old 2005-05-24 18:49:30.000000000 +0200 +++++ screen-4.0.2/configure 2005-05-24 18:49:54.000000000 +0200 ++@@ -6598,8 +6598,6 @@ ++ LIBS="$oldlibs" ++ fi ++ rm -f 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" ++ { echo "$as_me:$LINENO: checking IRIX sun library..." >&5 ++diff -ur screen.old/sched.h screen.dev/sched.h ++--- screen.old/sched.h 2002-01-08 16:42:43.000000000 +0100 +++++ screen.dev/sched.h 2007-03-02 17:03:48.475830776 +0100 ++@@ -22,6 +22,11 @@ ++ * $Id: 100-cross_compile_fix.patch 6458 2007-03-02 16:12:30Z nbd $ FAU ++ */ ++ +++#ifndef __SCHED_H +++#define __SCHED_H +++ +++#include +++ ++ struct event ++ { ++ struct event *next; ++@@ -41,3 +46,5 @@ ++ #define EV_READ 1 ++ #define EV_WRITE 2 ++ #define EV_ALWAYS 3 +++ +++#endif +diff --git a/feeds/packages/utils/sdparm/.svn/entries b/feeds/packages/utils/sdparm/.svn/entries +new file mode 100644 +index 0000000..61a8f0e +--- /dev/null ++++ b/feeds/packages/utils/sdparm/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sdparm ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++ae5cc7c271e215566edd8f1a5a20804c ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++920 ++ +diff --git a/feeds/packages/utils/sdparm/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sdparm/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..bde487f +--- /dev/null ++++ b/feeds/packages/utils/sdparm/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,41 @@ ++# ++# 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:=sdparm ++PKG_VERSION:=1.04 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://sg.danny.cz/sg/p ++PKG_MD5SUM:=f4b8c7bfc1cd27d30fbdc066a65a44ea ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sdparm ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Read or modify SCSI or USB disk parameters ++ DEPENDS:=+kmod-scsi-generic ++ SUBMENU:=disc ++ URL:=http://sg.danny.cz/sg/sdparm.html ++endef ++ ++define Package/sdparm/description ++ The sdparm utility outputs and in some cases modifies SCSI device ++ parameters. ++endef ++ ++define Package/sdparm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,sdparm)) +diff --git a/feeds/packages/utils/sdparm/Makefile b/feeds/packages/utils/sdparm/Makefile +new file mode 100644 +index 0000000..bde487f +--- /dev/null ++++ b/feeds/packages/utils/sdparm/Makefile +@@ -0,0 +1,41 @@ ++# ++# 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:=sdparm ++PKG_VERSION:=1.04 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://sg.danny.cz/sg/p ++PKG_MD5SUM:=f4b8c7bfc1cd27d30fbdc066a65a44ea ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sdparm ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Read or modify SCSI or USB disk parameters ++ DEPENDS:=+kmod-scsi-generic ++ SUBMENU:=disc ++ URL:=http://sg.danny.cz/sg/sdparm.html ++endef ++ ++define Package/sdparm/description ++ The sdparm utility outputs and in some cases modifies SCSI device ++ parameters. ++endef ++ ++define Package/sdparm/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,sdparm)) +diff --git a/feeds/packages/utils/sed/.svn/entries b/feeds/packages/utils/sed/.svn/entries +new file mode 100644 +index 0000000..f6e3186 +--- /dev/null ++++ b/feeds/packages/utils/sed/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sed ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-08-20T15:09:25.244913Z ++22739 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++18f7173d72d404a01684dda73dde9531 ++2010-08-20T15:09:25.244913Z ++22739 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++983 ++ +diff --git a/feeds/packages/utils/sed/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sed/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5a60bb0 +--- /dev/null ++++ b/feeds/packages/utils/sed/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,44 @@ ++# ++# 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:=sed ++PKG_VERSION:=4.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@GNU/$(PKG_NAME) ++PKG_MD5SUM:=7d310fbd76e01a01115075c1fd3f455a ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sed ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=GNU streams editor ++ URL:=http://ftp.gnu.org/gnu/sed/ ++endef ++ ++define Package/sed/description ++ Sed (streams editor) takes text input and performs some operation ++ (or set of operations) on it and outputs the modified text. ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ PREFIX="/usr" \ ++ HOST="$(GNU_TARGET_NAME)" \ ++ ++define Package/sed/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sed $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,sed)) +diff --git a/feeds/packages/utils/sed/Makefile b/feeds/packages/utils/sed/Makefile +new file mode 100644 +index 0000000..5a60bb0 +--- /dev/null ++++ b/feeds/packages/utils/sed/Makefile +@@ -0,0 +1,44 @@ ++# ++# 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:=sed ++PKG_VERSION:=4.2.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@GNU/$(PKG_NAME) ++PKG_MD5SUM:=7d310fbd76e01a01115075c1fd3f455a ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sed ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=GNU streams editor ++ URL:=http://ftp.gnu.org/gnu/sed/ ++endef ++ ++define Package/sed/description ++ Sed (streams editor) takes text input and performs some operation ++ (or set of operations) on it and outputs the modified text. ++endef ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ ++ PREFIX="/usr" \ ++ HOST="$(GNU_TARGET_NAME)" \ ++ ++define Package/sed/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sed $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,sed)) +diff --git a/feeds/packages/utils/setpwc/.svn/entries b/feeds/packages/utils/setpwc/.svn/entries +new file mode 100644 +index 0000000..7b04588 +--- /dev/null ++++ b/feeds/packages/utils/setpwc/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/setpwc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-20T19:47:07.946331Z ++31833 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++44bafbeb0b0e68be4960460d8af7c0ea ++2012-05-20T19:47:07.946331Z ++31833 ++swalker ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1060 ++ +diff --git a/feeds/packages/utils/setpwc/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/setpwc/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/setpwc/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/setpwc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/setpwc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..638f10e +--- /dev/null ++++ b/feeds/packages/utils/setpwc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# ++# 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:=setpwc ++PKG_VERSION:=1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.vanheusden.com/setpwc ++PKG_MD5SUM:=79d5ee468c0076feb3cac473bef661d2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/setpwc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Philips (and compatibles) WebCams (PWC) control utility ++ URL:=http://www.vanheusden.com/setpwc/ ++ DEPENDS:=+kmod-video-pwc ++endef ++ ++define Package/setpwc/description ++ With setpwc you can set and list various settings of Philips (and ++ compatibles) WebCams with the 'PWC chipset'. ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -DVERSION=\"$(PKG_VERSION)\" -o $(PKG_BUILD_DIR)/setpwc $(PKG_BUILD_DIR)/setpwc.c ++endef ++ ++define Package/setpwc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/setpwc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,setpwc)) +diff --git a/feeds/packages/utils/setpwc/Makefile b/feeds/packages/utils/setpwc/Makefile +new file mode 100644 +index 0000000..638f10e +--- /dev/null ++++ b/feeds/packages/utils/setpwc/Makefile +@@ -0,0 +1,42 @@ ++# ++# 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:=setpwc ++PKG_VERSION:=1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz ++PKG_SOURCE_URL:=http://www.vanheusden.com/setpwc ++PKG_MD5SUM:=79d5ee468c0076feb3cac473bef661d2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/setpwc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Philips (and compatibles) WebCams (PWC) control utility ++ URL:=http://www.vanheusden.com/setpwc/ ++ DEPENDS:=+kmod-video-pwc ++endef ++ ++define Package/setpwc/description ++ With setpwc you can set and list various settings of Philips (and ++ compatibles) WebCams with the 'PWC chipset'. ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -DVERSION=\"$(PKG_VERSION)\" -o $(PKG_BUILD_DIR)/setpwc $(PKG_BUILD_DIR)/setpwc.c ++endef ++ ++define Package/setpwc/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/setpwc $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,setpwc)) +diff --git a/feeds/packages/utils/setserial/.svn/entries b/feeds/packages/utils/setserial/.svn/entries +new file mode 100644 +index 0000000..9733f2e +--- /dev/null ++++ b/feeds/packages/utils/setserial/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/setserial ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-17T10:47:17.613735Z ++29212 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++636ad78d5cebb9542be79329936c40e6 ++2011-11-17T10:47:17.613735Z ++29212 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1437 ++ +diff --git a/feeds/packages/utils/setserial/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/setserial/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/setserial/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/setserial/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/setserial/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a154499 +--- /dev/null ++++ b/feeds/packages/utils/setserial/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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:=setserial ++PKG_VERSION:=2.17 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/setserial ++PKG_MD5SUM:=c4867d72c41564318e0107745eb7a0f2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/setserial ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Serial port configuration utility ++ URL:=http://setserial.sourceforge.net/ ++ SUBMENU:=Terminal ++endef ++ ++define Package/setserial/description ++ setserial is a program designed to set and/or report the ++ configuration information associated with a serial port. This ++ information includes what I/O port and IRQ a particular ++ serial port is using, and whether or not the break key should ++ be interpreted as the Secure Attention Key, and so on. ++endef ++ ++# uses GNU configure ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ setserial ++endef ++ ++define Package/setserial/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/setserial $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/setserial.config $(1)/etc/config/setserial ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/setserial.init $(1)/etc/init.d/setserial ++endef ++ ++define Package/setserial/conffiles ++/etc/config/setserial ++endef ++ ++$(eval $(call BuildPackage,setserial)) +diff --git a/feeds/packages/utils/setserial/Makefile b/feeds/packages/utils/setserial/Makefile +new file mode 100644 +index 0000000..a154499 +--- /dev/null ++++ b/feeds/packages/utils/setserial/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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:=setserial ++PKG_VERSION:=2.17 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/setserial ++PKG_MD5SUM:=c4867d72c41564318e0107745eb7a0f2 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/setserial ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Serial port configuration utility ++ URL:=http://setserial.sourceforge.net/ ++ SUBMENU:=Terminal ++endef ++ ++define Package/setserial/description ++ setserial is a program designed to set and/or report the ++ configuration information associated with a serial port. This ++ information includes what I/O port and IRQ a particular ++ serial port is using, and whether or not the break key should ++ be interpreted as the Secure Attention Key, and so on. ++endef ++ ++# uses GNU configure ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ setserial ++endef ++ ++define Package/setserial/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/setserial $(1)/usr/sbin/ ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DATA) ./files/setserial.config $(1)/etc/config/setserial ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/setserial.init $(1)/etc/init.d/setserial ++endef ++ ++define Package/setserial/conffiles ++/etc/config/setserial ++endef ++ ++$(eval $(call BuildPackage,setserial)) +diff --git a/feeds/packages/utils/setserial/files/.svn/entries b/feeds/packages/utils/setserial/files/.svn/entries +new file mode 100644 +index 0000000..9db08d8 +--- /dev/null ++++ b/feeds/packages/utils/setserial/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/setserial/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-17T10:47:17.613735Z ++29212 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++setserial.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++a16088e0965ebd80ff5ecd9b7bef0614 ++2011-11-17T10:47:17.613735Z ++29212 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++113 ++ ++setserial.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++12ca514c70ac076e16ef680070b6c4fe ++2011-11-17T10:47:17.613735Z ++29212 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++639 ++ +diff --git a/feeds/packages/utils/setserial/files/.svn/text-base/setserial.config.svn-base b/feeds/packages/utils/setserial/files/.svn/text-base/setserial.config.svn-base +new file mode 100644 +index 0000000..ba2957f +--- /dev/null ++++ b/feeds/packages/utils/setserial/files/.svn/text-base/setserial.config.svn-base +@@ -0,0 +1,6 @@ ++package 'setserial' ++ ++config 'setserial' ++ option enabled 0 ++ option device '/dev/ttyS1' ++ option parameters 'irq 3' +diff --git a/feeds/packages/utils/setserial/files/.svn/text-base/setserial.init.svn-base b/feeds/packages/utils/setserial/files/.svn/text-base/setserial.init.svn-base +new file mode 100644 +index 0000000..db38ce2 +--- /dev/null ++++ b/feeds/packages/utils/setserial/files/.svn/text-base/setserial.init.svn-base +@@ -0,0 +1,34 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=15 ++ ++section_enabled() { ++ local enabled ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] || return 1 ++} ++ ++start_instance() { ++ local section="$1" ++ local device ++ local parameters ++ local args="" ++ ++ section_enabled "$section" || return 1 ++ ++ config_get device "$section" 'device' ++ [ -n "$device" ] || return 1 ++ append args "$device" ++ ++ config_get parameters "$section" 'parameters' ++ [ -n "$parameters" ] || return 1 ++ append args "$parameters" ++ ++ /usr/sbin/setserial $device $parameters ++} ++ ++boot() { ++ config_load 'setserial' ++ config_foreach start_instance 'setserial' ++} +diff --git a/feeds/packages/utils/setserial/files/setserial.config b/feeds/packages/utils/setserial/files/setserial.config +new file mode 100644 +index 0000000..ba2957f +--- /dev/null ++++ b/feeds/packages/utils/setserial/files/setserial.config +@@ -0,0 +1,6 @@ ++package 'setserial' ++ ++config 'setserial' ++ option enabled 0 ++ option device '/dev/ttyS1' ++ option parameters 'irq 3' +diff --git a/feeds/packages/utils/setserial/files/setserial.init b/feeds/packages/utils/setserial/files/setserial.init +new file mode 100644 +index 0000000..db38ce2 +--- /dev/null ++++ b/feeds/packages/utils/setserial/files/setserial.init +@@ -0,0 +1,34 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006-2011 OpenWrt.org ++ ++START=15 ++ ++section_enabled() { ++ local enabled ++ config_get_bool enabled "$1" 'enabled' 0 ++ [ $enabled -gt 0 ] || return 1 ++} ++ ++start_instance() { ++ local section="$1" ++ local device ++ local parameters ++ local args="" ++ ++ section_enabled "$section" || return 1 ++ ++ config_get device "$section" 'device' ++ [ -n "$device" ] || return 1 ++ append args "$device" ++ ++ config_get parameters "$section" 'parameters' ++ [ -n "$parameters" ] || return 1 ++ append args "$parameters" ++ ++ /usr/sbin/setserial $device $parameters ++} ++ ++boot() { ++ config_load 'setserial' ++ config_foreach start_instance 'setserial' ++} +diff --git a/feeds/packages/utils/setserial/patches/.svn/entries b/feeds/packages/utils/setserial/patches/.svn/entries +new file mode 100644 +index 0000000..60645bc +--- /dev/null ++++ b/feeds/packages/utils/setserial/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/setserial/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-10-24T09:28:15.670575Z ++23606 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-compile-fixes.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e74d5b61fdc92857b975199a68d13756 ++2010-10-24T09:28:15.670575Z ++23606 ++mb ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2034 ++ +diff --git a/feeds/packages/utils/setserial/patches/.svn/text-base/100-compile-fixes.patch.svn-base b/feeds/packages/utils/setserial/patches/.svn/text-base/100-compile-fixes.patch.svn-base +new file mode 100644 +index 0000000..4adc7cb +--- /dev/null ++++ b/feeds/packages/utils/setserial/patches/.svn/text-base/100-compile-fixes.patch.svn-base +@@ -0,0 +1,70 @@ ++Index: setserial-2.17/setserial.c ++=================================================================== ++--- setserial-2.17.orig/setserial.c 2010-10-24 11:21:21.000000000 +0200 +++++ setserial-2.17/setserial.c 2010-10-24 11:26:55.000000000 +0200 ++@@ -15,14 +15,19 @@ ++ #include ++ #include ++ #include +++#include +++ +++#include ++ ++ #ifdef HAVE_ASM_IOCTLS_H ++ #include ++ #endif ++ #ifdef HAVE_LINUX_HAYESESP_H ++ #include +++#ifdef TIOCGHAYESESP +++#define HAVE_HAYESESP +++#endif ++ #endif ++-#include ++ ++ #include "version.h" ++ ++@@ -118,7 +123,7 @@ ++ CMD_CONFIG, "autoconfigure",0, 0, 0, 0, ++ CMD_GETMULTI, "get_multiport",0, 0, 0, 0, ++ CMD_SETMULTI, "set_multiport",0, 0, 0, 0, ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ CMD_RX_TRIG, "rx_trigger", 0, 0, 0, FLAG_NEED_ARG, ++ CMD_TX_TRIG, "tx_trigger", 0, 0, 0, FLAG_NEED_ARG, ++ CMD_FLOW_OFF, "flow_off", 0, 0, 0, FLAG_NEED_ARG, ++@@ -356,7 +361,7 @@ ++ } ++ #endif ++ ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ void print_hayesesp(int fd) ++ { ++ struct hayes_esp_config esp; ++@@ -453,7 +458,7 @@ ++ print_flags(&serinfo, "\tFlags: ", ""); ++ printf("\n\n"); ++ ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ print_hayesesp(fd); ++ #endif ++ } else if (verbosity==0) { ++@@ -593,7 +598,7 @@ ++ } ++ set_multiport(device, fd, &arg); ++ break; ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ case CMD_RX_TRIG: ++ case CMD_TX_TRIG: ++ case CMD_FLOW_OFF: ++@@ -692,7 +697,7 @@ ++ fprintf(stderr, "\t get_multiport\tDisplay the multiport configuration\n"); ++ fprintf(stderr, "\t set_multiport\tSet the multiport configuration\n"); ++ fprintf(stderr, "\n"); ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ fprintf(stderr, "\t* rx_trigger\tSet RX trigger level (ESP-only)\n"); ++ fprintf(stderr, "\t* tx_trigger\tSet TX trigger level (ESP-only)\n"); ++ fprintf(stderr, "\t* flow_off\tSet hardware flow off level (ESP-only)\n"); +diff --git a/feeds/packages/utils/setserial/patches/100-compile-fixes.patch b/feeds/packages/utils/setserial/patches/100-compile-fixes.patch +new file mode 100644 +index 0000000..4adc7cb +--- /dev/null ++++ b/feeds/packages/utils/setserial/patches/100-compile-fixes.patch +@@ -0,0 +1,70 @@ ++Index: setserial-2.17/setserial.c ++=================================================================== ++--- setserial-2.17.orig/setserial.c 2010-10-24 11:21:21.000000000 +0200 +++++ setserial-2.17/setserial.c 2010-10-24 11:26:55.000000000 +0200 ++@@ -15,14 +15,19 @@ ++ #include ++ #include ++ #include +++#include +++ +++#include ++ ++ #ifdef HAVE_ASM_IOCTLS_H ++ #include ++ #endif ++ #ifdef HAVE_LINUX_HAYESESP_H ++ #include +++#ifdef TIOCGHAYESESP +++#define HAVE_HAYESESP +++#endif ++ #endif ++-#include ++ ++ #include "version.h" ++ ++@@ -118,7 +123,7 @@ ++ CMD_CONFIG, "autoconfigure",0, 0, 0, 0, ++ CMD_GETMULTI, "get_multiport",0, 0, 0, 0, ++ CMD_SETMULTI, "set_multiport",0, 0, 0, 0, ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ CMD_RX_TRIG, "rx_trigger", 0, 0, 0, FLAG_NEED_ARG, ++ CMD_TX_TRIG, "tx_trigger", 0, 0, 0, FLAG_NEED_ARG, ++ CMD_FLOW_OFF, "flow_off", 0, 0, 0, FLAG_NEED_ARG, ++@@ -356,7 +361,7 @@ ++ } ++ #endif ++ ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ void print_hayesesp(int fd) ++ { ++ struct hayes_esp_config esp; ++@@ -453,7 +458,7 @@ ++ print_flags(&serinfo, "\tFlags: ", ""); ++ printf("\n\n"); ++ ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ print_hayesesp(fd); ++ #endif ++ } else if (verbosity==0) { ++@@ -593,7 +598,7 @@ ++ } ++ set_multiport(device, fd, &arg); ++ break; ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ case CMD_RX_TRIG: ++ case CMD_TX_TRIG: ++ case CMD_FLOW_OFF: ++@@ -692,7 +697,7 @@ ++ fprintf(stderr, "\t get_multiport\tDisplay the multiport configuration\n"); ++ fprintf(stderr, "\t set_multiport\tSet the multiport configuration\n"); ++ fprintf(stderr, "\n"); ++-#ifdef TIOCGHAYESESP +++#ifdef HAVE_HAYESESP ++ fprintf(stderr, "\t* rx_trigger\tSet RX trigger level (ESP-only)\n"); ++ fprintf(stderr, "\t* tx_trigger\tSet TX trigger level (ESP-only)\n"); ++ fprintf(stderr, "\t* flow_off\tSet hardware flow off level (ESP-only)\n"); +diff --git a/feeds/packages/utils/sg3-utils/.svn/entries b/feeds/packages/utils/sg3-utils/.svn/entries +new file mode 100644 +index 0000000..94ae0dd +--- /dev/null ++++ b/feeds/packages/utils/sg3-utils/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sg3-utils ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-29T21:09:39.997545Z ++32541 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++33441ac5e53d53d63a83a047eee8e74b ++2012-06-29T21:09:39.997545Z ++32541 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1189 ++ +diff --git a/feeds/packages/utils/sg3-utils/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sg3-utils/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b8c960a +--- /dev/null ++++ b/feeds/packages/utils/sg3-utils/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,53 @@ ++# ++# 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:=sg3-utils ++PKG_VERSION:=1.24 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/s/$(PKG_NAME) ++PKG_MD5SUM:=9e1b8811b013d8f97d8ea2e0942cebad ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sg3-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+kmod-usb-storage ++ TITLE:=sg3 scsi utilities ++ URL:=http://sg.danny.cz/sg/sg3_utils.html ++endef ++ ++define Package/sg3-utils/description ++ The package includes a number of utilities to allow a user ++ to use the sg interface to find out low-level information ++ about any SCSI device. ++endef ++ ++define Build/Configure ++endef ++ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f no_lib/Makefile.linux \ ++ DESTDIR=$(STAGING_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -DSG3_UTILS_LINUX" \ ++ sg_start ++endef ++ ++ ++define Package/sg3-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sg_start $(1)/usr/bin ++endef ++ ++ ++$(eval $(call BuildPackage,sg3-utils)) +diff --git a/feeds/packages/utils/sg3-utils/Makefile b/feeds/packages/utils/sg3-utils/Makefile +new file mode 100644 +index 0000000..b8c960a +--- /dev/null ++++ b/feeds/packages/utils/sg3-utils/Makefile +@@ -0,0 +1,53 @@ ++# ++# 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:=sg3-utils ++PKG_VERSION:=1.24 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/s/$(PKG_NAME) ++PKG_MD5SUM:=9e1b8811b013d8f97d8ea2e0942cebad ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sg3-utils ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+kmod-usb-storage ++ TITLE:=sg3 scsi utilities ++ URL:=http://sg.danny.cz/sg/sg3_utils.html ++endef ++ ++define Package/sg3-utils/description ++ The package includes a number of utilities to allow a user ++ to use the sg interface to find out low-level information ++ about any SCSI device. ++endef ++ ++define Build/Configure ++endef ++ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f no_lib/Makefile.linux \ ++ DESTDIR=$(STAGING_DIR) \ ++ CC="$(TARGET_CC)" \ ++ CFLAGS="$(TARGET_CFLAGS) -DSG3_UTILS_LINUX" \ ++ sg_start ++endef ++ ++ ++define Package/sg3-utils/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/sg_start $(1)/usr/bin ++endef ++ ++ ++$(eval $(call BuildPackage,sg3-utils)) +diff --git a/feeds/packages/utils/shadow/.svn/entries b/feeds/packages/utils/shadow/.svn/entries +new file mode 100644 +index 0000000..72ce35f +--- /dev/null ++++ b/feeds/packages/utils/shadow/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/shadow ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8801d2e0b11906961c9777b7527cb0cc ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2425 ++ +diff --git a/feeds/packages/utils/shadow/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/shadow/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..fd0735c +--- /dev/null ++++ b/feeds/packages/utils/shadow/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,102 @@ ++# ++# 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:=shadow ++PKG_VERSION:=4.1.5.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases ++PKG_MD5SUM:=a00449aa439c69287b6d472191dc2247 ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++UTILS := \ ++ groupadd groupdel groupmod useradd userdel usermod \ ++ su passwd groups ++ ++CONFIGURE_ARGS += \ ++ --without-audit \ ++ --without-libpam \ ++ --without-selinux \ ++ --without-acl \ ++ --without-attr \ ++ --without-tcb \ ++ --without-nscd ++ ++define Package/shadow ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The PLD Linux shadow utilities ++ URL:=http://pkg-shadow.alioth.debian.org/ ++ DEPENDS:=$(foreach u,$(UTILS),+shadow-$(u)) ++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-common ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Shared definitions for the shadow utilities ++ URL:=http://pkg-shadow.alioth.debian.org/ ++endef ++ ++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 program ++ define Package/shadow-$(1) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Utility $(1) from the PLD Linux shadow utilities ++ URL:=http://pkg-shadow.alioth.debian.org/ ++ DEPENDS:=+shadow-common ++ 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 ++ ++ 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 ++ ++$(eval $(call BuildPackage,shadow)) ++$(eval $(call BuildPackage,shadow-common)) ++$(foreach u,$(UTILS),$(eval $(call program,$(u)))) +diff --git a/feeds/packages/utils/shadow/Makefile b/feeds/packages/utils/shadow/Makefile +new file mode 100644 +index 0000000..fd0735c +--- /dev/null ++++ b/feeds/packages/utils/shadow/Makefile +@@ -0,0 +1,102 @@ ++# ++# 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:=shadow ++PKG_VERSION:=4.1.5.1 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases ++PKG_MD5SUM:=a00449aa439c69287b6d472191dc2247 ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++UTILS := \ ++ groupadd groupdel groupmod useradd userdel usermod \ ++ su passwd groups ++ ++CONFIGURE_ARGS += \ ++ --without-audit \ ++ --without-libpam \ ++ --without-selinux \ ++ --without-acl \ ++ --without-attr \ ++ --without-tcb \ ++ --without-nscd ++ ++define Package/shadow ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The PLD Linux shadow utilities ++ URL:=http://pkg-shadow.alioth.debian.org/ ++ DEPENDS:=$(foreach u,$(UTILS),+shadow-$(u)) ++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-common ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Shared definitions for the shadow utilities ++ URL:=http://pkg-shadow.alioth.debian.org/ ++endef ++ ++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 program ++ define Package/shadow-$(1) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Utility $(1) from the PLD Linux shadow utilities ++ URL:=http://pkg-shadow.alioth.debian.org/ ++ DEPENDS:=+shadow-common ++ 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 ++ ++ 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 ++ ++$(eval $(call BuildPackage,shadow)) ++$(eval $(call BuildPackage,shadow-common)) ++$(foreach u,$(UTILS),$(eval $(call program,$(u)))) +diff --git a/feeds/packages/utils/shadow/patches/.svn/entries b/feeds/packages/utils/shadow/patches/.svn/entries +new file mode 100644 +index 0000000..c6cf294 +--- /dev/null ++++ b/feeds/packages/utils/shadow/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/shadow/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T01:12:03.287135Z ++32186 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++004-disable-ruser-lookup.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ce1df575eec97faa8e07af68665ddc48 ++2012-06-11T01:12:03.287135Z ++32186 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++503 ++ +diff --git a/feeds/packages/utils/shadow/patches/.svn/text-base/004-disable-ruser-lookup.patch.svn-base b/feeds/packages/utils/shadow/patches/.svn/text-base/004-disable-ruser-lookup.patch.svn-base +new file mode 100644 +index 0000000..7a6f38e +--- /dev/null ++++ b/feeds/packages/utils/shadow/patches/.svn/text-base/004-disable-ruser-lookup.patch.svn-base +@@ -0,0 +1,10 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -195,7 +195,6 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$sha ++ dnl XXX - quick hack, should disappear before anyone notices :). ++ AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) ++ 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).]) ++ ++ AC_ARG_ENABLE(shadowgrp, ++ [AC_HELP_STRING([--enable-shadowgrp], [enable shadow group support @<:@default=yes@:>@])], +diff --git a/feeds/packages/utils/shadow/patches/004-disable-ruser-lookup.patch b/feeds/packages/utils/shadow/patches/004-disable-ruser-lookup.patch +new file mode 100644 +index 0000000..7a6f38e +--- /dev/null ++++ b/feeds/packages/utils/shadow/patches/004-disable-ruser-lookup.patch +@@ -0,0 +1,10 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -195,7 +195,6 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$sha ++ dnl XXX - quick hack, should disappear before anyone notices :). ++ AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) ++ 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).]) ++ ++ AC_ARG_ENABLE(shadowgrp, ++ [AC_HELP_STRING([--enable-shadowgrp], [enable shadow group support @<:@default=yes@:>@])], +diff --git a/feeds/packages/utils/sierra-pcmcia/.svn/entries b/feeds/packages/utils/sierra-pcmcia/.svn/entries +new file mode 100644 +index 0000000..15430e4 +--- /dev/null ++++ b/feeds/packages/utils/sierra-pcmcia/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sierra-pcmcia ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++4cb90007e022ec186cc4e900d21de6e9 ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1019 ++ +diff --git a/feeds/packages/utils/sierra-pcmcia/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sierra-pcmcia/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..3b25b18 +--- /dev/null ++++ b/feeds/packages/utils/sierra-pcmcia/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,39 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=sierra-pcmcia ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://www.sierrawireless.com/resources/faq/PC_Card/AirCard850_860/ ++PKG_SOURCE:=Aircard_Linux.tar ++PKG_MD5SUM:=9562b626d958ea02d737feb6a85f0920 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define KernelPackage/pcmcia-serial-sierra ++ SUBMENU:=Other modules ++ TITLE:=Sierra AirCard PCMCIA support ++ DEPENDS:=kmod-pcmcia-serial ++ URL:=http://www.sierrawireless.com/faq/ShowFAQ.aspx?ID=118 ++endef ++ ++define KernelPackage/pcmcia-serial-sierra/description ++ Support files for the Sierra AirCard 555, 7xx, and 8x0 ++endef ++ ++define Build/Compile ++endef ++ ++define Package/kmod-pcmcia-serial-sierra/install ++ $(INSTALL_DIR) $(1)/lib/firmware ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/../Aircard_Linux/*.cis $(1)/lib/firmware/ ++endef ++ ++$(eval $(call KernelPackage,pcmcia-serial-sierra)) +diff --git a/feeds/packages/utils/sierra-pcmcia/Makefile b/feeds/packages/utils/sierra-pcmcia/Makefile +new file mode 100644 +index 0000000..3b25b18 +--- /dev/null ++++ b/feeds/packages/utils/sierra-pcmcia/Makefile +@@ -0,0 +1,39 @@ ++# ++# 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 ++include $(INCLUDE_DIR)/kernel.mk ++ ++PKG_NAME:=sierra-pcmcia ++PKG_RELEASE:=1 ++ ++PKG_SOURCE_URL:=http://www.sierrawireless.com/resources/faq/PC_Card/AirCard850_860/ ++PKG_SOURCE:=Aircard_Linux.tar ++PKG_MD5SUM:=9562b626d958ea02d737feb6a85f0920 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define KernelPackage/pcmcia-serial-sierra ++ SUBMENU:=Other modules ++ TITLE:=Sierra AirCard PCMCIA support ++ DEPENDS:=kmod-pcmcia-serial ++ URL:=http://www.sierrawireless.com/faq/ShowFAQ.aspx?ID=118 ++endef ++ ++define KernelPackage/pcmcia-serial-sierra/description ++ Support files for the Sierra AirCard 555, 7xx, and 8x0 ++endef ++ ++define Build/Compile ++endef ++ ++define Package/kmod-pcmcia-serial-sierra/install ++ $(INSTALL_DIR) $(1)/lib/firmware ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/../Aircard_Linux/*.cis $(1)/lib/firmware/ ++endef ++ ++$(eval $(call KernelPackage,pcmcia-serial-sierra)) +diff --git a/feeds/packages/utils/sispmctl/.svn/entries b/feeds/packages/utils/sispmctl/.svn/entries +new file mode 100644 +index 0000000..d9bc4a0 +--- /dev/null ++++ b/feeds/packages/utils/sispmctl/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sispmctl ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++1ec60d0555debe9663b7081fa72dcc2c ++2013-01-29T18:09:28.401803Z ++35388 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1257 ++ +diff --git a/feeds/packages/utils/sispmctl/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/sispmctl/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..431893e +--- /dev/null ++++ b/feeds/packages/utils/sispmctl/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/sispmctl/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sispmctl/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ba7ea04 +--- /dev/null ++++ b/feeds/packages/utils/sispmctl/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,50 @@ ++# ++# 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:=sispmctl ++PKG_VERSION:=3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=eca3d5803a29617432ef9f609be59bad ++ ++PKG_INSTALL:=1 ++ ++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 ++ ++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/feeds/packages/utils/sispmctl/Makefile b/feeds/packages/utils/sispmctl/Makefile +new file mode 100644 +index 0000000..ba7ea04 +--- /dev/null ++++ b/feeds/packages/utils/sispmctl/Makefile +@@ -0,0 +1,50 @@ ++# ++# 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:=sispmctl ++PKG_VERSION:=3.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++PKG_MD5SUM:=eca3d5803a29617432ef9f609be59bad ++ ++PKG_INSTALL:=1 ++ ++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 ++ ++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/feeds/packages/utils/smartmontools/.svn/entries b/feeds/packages/utils/smartmontools/.svn/entries +new file mode 100644 +index 0000000..9546c65 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/smartmontools ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-19T15:30:42.597009Z ++34259 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++bc1b37e17e739915aea2765ad07bd19c ++2012-11-19T15:30:42.597009Z ++34259 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2485 ++ +diff --git a/feeds/packages/utils/smartmontools/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/smartmontools/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..4179626 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,9 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/smartmontools/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/smartmontools/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..674fbc3 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,94 @@ ++# ++# 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:=5.40 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/smartmontools ++PKG_MD5SUM:=0f0be0239914ad87830a4fff594bda5b ++ ++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) ++ DEPENDS+= +rsync ++ 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/Configure ++ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ ++ ./autogen.sh \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++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/feeds/packages/utils/smartmontools/Makefile b/feeds/packages/utils/smartmontools/Makefile +new file mode 100644 +index 0000000..674fbc3 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/Makefile +@@ -0,0 +1,94 @@ ++# ++# 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:=5.40 ++PKG_RELEASE:=4 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/smartmontools ++PKG_MD5SUM:=0f0be0239914ad87830a4fff594bda5b ++ ++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) ++ DEPENDS+= +rsync ++ 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/Configure ++ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ ++ ./autogen.sh \ ++ ); ++ $(call Build/Configure/Default) ++endef ++ ++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/feeds/packages/utils/smartmontools/files/.svn/entries b/feeds/packages/utils/smartmontools/files/.svn/entries +new file mode 100644 +index 0000000..7adccd0 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/smartmontools/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-09T23:43:47.350746Z ++28918 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++smartd.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++d5ff8612b8d4cd58573569b1d4d8456b ++2011-11-09T23:43:47.350746Z ++28918 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++217 ++ ++smartd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++776a1d6c9c9e96755c221f85b7d50a42 ++2007-03-04T04:19:46.934987Z ++6500 ++pavlov ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++12 ++ +diff --git a/feeds/packages/utils/smartmontools/files/.svn/prop-base/smartd.conf.svn-base b/feeds/packages/utils/smartmontools/files/.svn/prop-base/smartd.conf.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/.svn/prop-base/smartd.conf.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/smartmontools/files/.svn/prop-base/smartd.init.svn-base b/feeds/packages/utils/smartmontools/files/.svn/prop-base/smartd.init.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/.svn/prop-base/smartd.init.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/smartmontools/files/.svn/text-base/smartd.conf.svn-base b/feeds/packages/utils/smartmontools/files/.svn/text-base/smartd.conf.svn-base +new file mode 100644 +index 0000000..0740fcf +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/.svn/text-base/smartd.conf.svn-base +@@ -0,0 +1 @@ ++/dev/hdb -H +diff --git a/feeds/packages/utils/smartmontools/files/.svn/text-base/smartd.init.svn-base b/feeds/packages/utils/smartmontools/files/.svn/text-base/smartd.init.svn-base +new file mode 100644 +index 0000000..f1453f2 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/.svn/text-base/smartd.init.svn-base +@@ -0,0 +1,16 @@ ++#!/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/feeds/packages/utils/smartmontools/files/smartd.conf b/feeds/packages/utils/smartmontools/files/smartd.conf +new file mode 100644 +index 0000000..0740fcf +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/smartd.conf +@@ -0,0 +1 @@ ++/dev/hdb -H +diff --git a/feeds/packages/utils/smartmontools/files/smartd.init b/feeds/packages/utils/smartmontools/files/smartd.init +new file mode 100644 +index 0000000..f1453f2 +--- /dev/null ++++ b/feeds/packages/utils/smartmontools/files/smartd.init +@@ -0,0 +1,16 @@ ++#!/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/feeds/packages/utils/ssldump/.svn/entries b/feeds/packages/utils/ssldump/.svn/entries +new file mode 100644 +index 0000000..ab4220e +--- /dev/null ++++ b/feeds/packages/utils/ssldump/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ssldump ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-19T01:20:44.229700Z ++19719 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++69c9a66ecdefc86fdc01d305f1f5f591 ++2010-02-19T01:20:44.229700Z ++19719 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1535 ++ +diff --git a/feeds/packages/utils/ssldump/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/ssldump/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4700e11 +--- /dev/null ++++ b/feeds/packages/utils/ssldump/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,54 @@ ++# ++# 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:=ssldump ++PKG_VERSION:=0.9b3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.rtfm.com/ssldump/ ++PKG_MD5SUM:=ac8c28fe87508d6bfb06344ec496b1dd ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ssldump ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libopenssl +libpcap ++ TITLE:=a SSLv3/TLS network protocol analyzer ++ URL:=http://www.rtfm.com/ssldump/ ++endef ++ ++define Package/ssldump/description ++ ssldump is an SSLv3/TLS network protocol analyzer. It identifies TCP connections on the chosen network interface ++ and attempts to interpret them as SSLv3/TLS traffic. When it identifies SSLv3/TLS traffic, it decodes the records ++ and displays them in a textual form to stdout. If provided with the appropriate keying material, it will also decrypt ++ the connections and display the application data traffic. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ --with-openssl-inc="$(STAGING_DIR)/usr/include" \ ++ --with-openssl-lib="$(STAGING_DIR)/usr/lib" \ ++ --with-pcap-inc="$(STAGING_DIR)/usr/include" \ ++ --with-pcap-lib="$(STAGING_DIR)/usr/lib" \ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all ++endef ++ ++ ++define Package/ssldump/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssldump $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ssldump)) +diff --git a/feeds/packages/utils/ssldump/Makefile b/feeds/packages/utils/ssldump/Makefile +new file mode 100644 +index 0000000..4700e11 +--- /dev/null ++++ b/feeds/packages/utils/ssldump/Makefile +@@ -0,0 +1,54 @@ ++# ++# 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:=ssldump ++PKG_VERSION:=0.9b3 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.rtfm.com/ssldump/ ++PKG_MD5SUM:=ac8c28fe87508d6bfb06344ec496b1dd ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/ssldump ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libopenssl +libpcap ++ TITLE:=a SSLv3/TLS network protocol analyzer ++ URL:=http://www.rtfm.com/ssldump/ ++endef ++ ++define Package/ssldump/description ++ ssldump is an SSLv3/TLS network protocol analyzer. It identifies TCP connections on the chosen network interface ++ and attempts to interpret them as SSLv3/TLS traffic. When it identifies SSLv3/TLS traffic, it decodes the records ++ and displays them in a textual form to stdout. If provided with the appropriate keying material, it will also decrypt ++ the connections and display the application data traffic. ++endef ++ ++CONFIGURE_ARGS += \ ++ --enable-static \ ++ --enable-shared \ ++ --with-openssl-inc="$(STAGING_DIR)/usr/include" \ ++ --with-openssl-lib="$(STAGING_DIR)/usr/lib" \ ++ --with-pcap-inc="$(STAGING_DIR)/usr/include" \ ++ --with-pcap-lib="$(STAGING_DIR)/usr/lib" \ ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ all ++endef ++ ++ ++define Package/ssldump/install ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssldump $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,ssldump)) +diff --git a/feeds/packages/utils/ssldump/patches/.svn/entries b/feeds/packages/utils/ssldump/patches/.svn/entries +new file mode 100644 +index 0000000..4096628 +--- /dev/null ++++ b/feeds/packages/utils/ssldump/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/ssldump/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2008-12-14T17:10:36.091428Z ++13628 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-missing_headers.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++9c3bc8183d30f70832183d475c49bb4f ++2008-12-14T17:10:36.091428Z ++13628 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++777 ++ +diff --git a/feeds/packages/utils/ssldump/patches/.svn/text-base/001-missing_headers.patch.svn-base b/feeds/packages/utils/ssldump/patches/.svn/text-base/001-missing_headers.patch.svn-base +new file mode 100644 +index 0000000..70ac11c +--- /dev/null ++++ b/feeds/packages/utils/ssldump/patches/.svn/text-base/001-missing_headers.patch.svn-base +@@ -0,0 +1,23 @@ ++diff -urN ssldump-0.9b3/base/pcap-snoop.c ssldump-0.9b3.new/base/pcap-snoop.c ++--- ssldump-0.9b3/base/pcap-snoop.c 2002-09-09 23:02:58.000000000 +0200 +++++ ssldump-0.9b3.new/base/pcap-snoop.c 2008-12-14 18:43:48.000000000 +0100 ++@@ -49,7 +49,7 @@ ++ ++ #include ++ #include ++-#include +++#include ++ #ifndef _WIN32 ++ #include ++ #endif ++diff -urN ssldump-0.9b3/ssl/ssldecode.c ssldump-0.9b3.new/ssl/ssldecode.c ++--- ssldump-0.9b3/ssl/ssldecode.c 2002-08-17 03:33:17.000000000 +0200 +++++ ssldump-0.9b3.new/ssl/ssldecode.c 2008-12-14 18:44:11.000000000 +0100 ++@@ -52,6 +52,7 @@ ++ #include ++ #include ++ #include +++#include ++ #endif ++ #include "ssldecode.h" ++ #include "ssl_rec.h" +diff --git a/feeds/packages/utils/ssldump/patches/001-missing_headers.patch b/feeds/packages/utils/ssldump/patches/001-missing_headers.patch +new file mode 100644 +index 0000000..70ac11c +--- /dev/null ++++ b/feeds/packages/utils/ssldump/patches/001-missing_headers.patch +@@ -0,0 +1,23 @@ ++diff -urN ssldump-0.9b3/base/pcap-snoop.c ssldump-0.9b3.new/base/pcap-snoop.c ++--- ssldump-0.9b3/base/pcap-snoop.c 2002-09-09 23:02:58.000000000 +0200 +++++ ssldump-0.9b3.new/base/pcap-snoop.c 2008-12-14 18:43:48.000000000 +0100 ++@@ -49,7 +49,7 @@ ++ ++ #include ++ #include ++-#include +++#include ++ #ifndef _WIN32 ++ #include ++ #endif ++diff -urN ssldump-0.9b3/ssl/ssldecode.c ssldump-0.9b3.new/ssl/ssldecode.c ++--- ssldump-0.9b3/ssl/ssldecode.c 2002-08-17 03:33:17.000000000 +0200 +++++ ssldump-0.9b3.new/ssl/ssldecode.c 2008-12-14 18:44:11.000000000 +0100 ++@@ -52,6 +52,7 @@ ++ #include ++ #include ++ #include +++#include ++ #endif ++ #include "ssldecode.h" ++ #include "ssl_rec.h" +diff --git a/feeds/packages/utils/stm32flash/.svn/entries b/feeds/packages/utils/stm32flash/.svn/entries +new file mode 100644 +index 0000000..9563a0f +--- /dev/null ++++ b/feeds/packages/utils/stm32flash/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/stm32flash ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:37.726874Z ++35270 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++f9e4768611a5a378816bbe6a415ab034 ++2013-01-21T15:27:37.726874Z ++35270 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++995 ++ +diff --git a/feeds/packages/utils/stm32flash/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/stm32flash/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..6d4af92 +--- /dev/null ++++ b/feeds/packages/utils/stm32flash/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,40 @@ ++# ++# Copyright (C) 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:=stm32flash ++PKG_REV:=61 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://stm32flash.googlecode.com/svn/trunk ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++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/feeds/packages/utils/stm32flash/Makefile b/feeds/packages/utils/stm32flash/Makefile +new file mode 100644 +index 0000000..6d4af92 +--- /dev/null ++++ b/feeds/packages/utils/stm32flash/Makefile +@@ -0,0 +1,40 @@ ++# ++# Copyright (C) 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:=stm32flash ++PKG_REV:=61 ++PKG_VERSION:=r$(PKG_REV) ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://stm32flash.googlecode.com/svn/trunk ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_VERSION:=$(PKG_REV) ++PKG_SOURCE_PROTO:=svn ++ ++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/feeds/packages/utils/strace/.svn/entries b/feeds/packages/utils/strace/.svn/entries +new file mode 100644 +index 0000000..1f3d893 +--- /dev/null ++++ b/feeds/packages/utils/strace/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/strace ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-19T14:37:33.614449Z ++34257 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches-4.5.16 ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++30989b0e7bda23e21f0c84082ca1e2a5 ++2012-11-17T21:49:45.865626Z ++34224 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1217 ++ +diff --git a/feeds/packages/utils/strace/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/strace/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/strace/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/strace/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/strace/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f87a503 +--- /dev/null ++++ b/feeds/packages/utils/strace/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# 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)/kernel.mk ++ ++PKG_NAME:=strace ++ ++PKG_VERSION:=4.7 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=6054c3880a00c6703f83b57f15e04642 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++ ++PKG_LICENSE:=BSD-3c ++PKG_LICENSE_FILES:=COPYRIGHT ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/strace ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=System call tracer ++ URL:=http://strace.sourceforge.net/ ++endef ++ ++define Package/strace/description ++A useful diagnostic, instructional, and debugging tool. Allows you to track what ++system calls a program makes while it is running. ++endef ++ ++# needed when compiling against Linux 2.4 ++CONFIGURE_VARS += \ ++ ac_cv_header_linux_netlink_h=yes ++ ++ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ++ TARGET_CPPFLAGS += -I$(LINUX_DIR)/include ++endif ++ ++MAKE_FLAGS := \ ++ CCOPT="$(TARGET_CFLAGS)" ++ ++define Package/strace/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/strace $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,strace)) +diff --git a/feeds/packages/utils/strace/Makefile b/feeds/packages/utils/strace/Makefile +new file mode 100644 +index 0000000..f87a503 +--- /dev/null ++++ b/feeds/packages/utils/strace/Makefile +@@ -0,0 +1,56 @@ ++# ++# 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)/kernel.mk ++ ++PKG_NAME:=strace ++ ++PKG_VERSION:=4.7 ++PKG_RELEASE:=1 ++PKG_MD5SUM:=6054c3880a00c6703f83b57f15e04642 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz ++PKG_SOURCE_URL:=@SF/$(PKG_NAME) ++ ++PKG_LICENSE:=BSD-3c ++PKG_LICENSE_FILES:=COPYRIGHT ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/strace ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=System call tracer ++ URL:=http://strace.sourceforge.net/ ++endef ++ ++define Package/strace/description ++A useful diagnostic, instructional, and debugging tool. Allows you to track what ++system calls a program makes while it is running. ++endef ++ ++# needed when compiling against Linux 2.4 ++CONFIGURE_VARS += \ ++ ac_cv_header_linux_netlink_h=yes ++ ++ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ++ TARGET_CPPFLAGS += -I$(LINUX_DIR)/include ++endif ++ ++MAKE_FLAGS := \ ++ CCOPT="$(TARGET_CFLAGS)" ++ ++define Package/strace/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/strace $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,strace)) +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/entries b/feeds/packages/utils/strace/patches-4.5.16/.svn/entries +new file mode 100644 +index 0000000..edffa70 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/strace/patches-4.5.16 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T00:42:44.525207Z ++19696 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++004-no_cacheflush.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++576fbc14583b7030d28b98526e421d3f ++2009-01-19T05:20:02.788795Z ++14101 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++215 ++ ++003-avr32_support.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3ff7bd491955258b6e12db2191e29dd9 ++2009-01-18T01:59:59.054019Z ++14082 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++95092 ++ ++001-arm_eabi_syscalls.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++664664664d8b84ff49255c729f4be4d2 ++2009-01-18T01:59:59.054019Z ++14082 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2488 ++ ++010-cris_support.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3374f2e2eb2325b1cda681ace9f5be5a ++2009-02-11T18:39:53.290141Z ++14477 ++claudio ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9527 ++ ++002-arm_bad_syscall.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++87805beb50fa8be2bbcd817eba8714aa ++2009-01-18T01:59:59.054019Z ++14082 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++600 ++ ++004-mips64_support.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++a5f798be33877efb8d3866e62630db96 ++2010-02-18T00:42:44.525207Z ++19696 ++thepeople ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++152784 ++ +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/001-arm_eabi_syscalls.patch.svn-base b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/001-arm_eabi_syscalls.patch.svn-base +new file mode 100644 +index 0000000..52234c5 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/001-arm_eabi_syscalls.patch.svn-base +@@ -0,0 +1,64 @@ ++Index: strace-4.5.16/linux/syscallent.h ++=================================================================== ++--- strace-4.5.16.orig/linux/syscallent.h 2007-08-02 03:37:55.000000000 +0200 +++++ strace-4.5.16/linux/syscallent.h 2008-05-11 15:35:45.000000000 +0200 ++@@ -130,7 +130,10 @@ ++ { 2, TF, sys_statfs, "statfs" }, /* 99 */ ++ { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ ++ { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ ++- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ +++ { 2, TD, sys_socketcall, "socketcall", +++#ifdef __NR_socketcall +++ SYS_socketcall }, /* 102 */ +++#endif ++ { 3, 0, sys_syslog, "syslog" }, /* 103 */ ++ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ ++ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ ++@@ -145,7 +148,10 @@ ++ { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ ++ { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ ++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ ++- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ +++ { 6, 0, sys_ipc, "ipc", +++#ifdef __NR_ipc +++ SYS_ipc }, /* 117 */ +++#endif ++ { 1, TD, sys_fsync, "fsync" }, /* 118 */ ++ { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ ++ { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ ++@@ -282,7 +288,11 @@ ++ { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ ++ { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ ++ { 5, 0, printargs, "SYS_251" }, /* 251 */ ++- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ +++ { 1, TP, sys_exit, "exit_group" +++#ifdef __NR_exit_group +++ , __NR_exit_group +++#endif +++ }, /* 252 */ ++ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ ++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ ++ { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ ++Index: strace-4.5.16/syscall.c ++=================================================================== ++--- strace-4.5.16.orig/syscall.c 2006-12-21 23:13:33.000000000 +0100 +++++ strace-4.5.16/syscall.c 2008-05-11 15:35:45.000000000 +0200 ++@@ -2383,14 +2383,18 @@ ++ switch (known_scno(tcp)) { ++ #ifdef LINUX ++ #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) +++#ifdef __NR_socketcall ++ case SYS_socketcall: ++ decode_subcall(tcp, SYS_socket_subcall, ++ SYS_socket_nsubcalls, deref_style); ++ break; +++#endif +++#ifdef __NR_ipc ++ case SYS_ipc: ++ decode_subcall(tcp, SYS_ipc_subcall, ++ SYS_ipc_nsubcalls, shift_style); ++ break; +++#endif ++ #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */ ++ #if defined (SPARC) || defined (SPARC64) ++ case SYS_socketcall: +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/002-arm_bad_syscall.patch.svn-base b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/002-arm_bad_syscall.patch.svn-base +new file mode 100644 +index 0000000..4eb8a73 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/002-arm_bad_syscall.patch.svn-base +@@ -0,0 +1,20 @@ ++Index: strace-4.5.16/syscall.c ++=================================================================== ++--- strace-4.5.16.orig/syscall.c 2008-05-11 15:35:45.000000000 +0200 +++++ strace-4.5.16/syscall.c 2008-05-11 15:36:09.000000000 +0200 ++@@ -1045,6 +1045,15 @@ ++ /* ++ * Note: we only deal with only 32-bit CPUs here. ++ */ +++ +++ if (!(tcp->flags & TCB_INSYSCALL) && +++ (tcp->flags & TCB_WAITEXECVE)) { +++ /* caught a fake syscall from the execve's exit */ +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ +++ ++ if (regs.ARM_cpsr & 0x20) { ++ /* ++ * Get the Thumb-mode system call number +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/003-avr32_support.patch.svn-base b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/003-avr32_support.patch.svn-base +new file mode 100644 +index 0000000..79d9add +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/003-avr32_support.patch.svn-base +@@ -0,0 +1,2080 @@ ++--- strace-4.5.16/configure 2008-05-11 15:51:53.000000000 +0200 +++++ strace-4.5.16/configure 2008-05-11 15:54:52.000000000 +0200 ++@@ -2531,6 +2531,14 @@ ++ _ACEOF ++ ++ ;; +++avr32*) +++ arch=avr32 +++ +++cat >>confdefs.h <<\_ACEOF +++#define AVR32 1 +++_ACEOF +++ +++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: NO!" >&5 ++ echo "${ECHO_T}NO!" >&6; } ++Index: strace-4.5.16/config.h.in ++=================================================================== ++--- strace-4.5.16.orig/config.h.in 2007-08-03 12:24:53.000000000 +0200 +++++ strace-4.5.16/config.h.in 2008-05-11 15:36:30.000000000 +0200 ++@@ -6,6 +6,9 @@ ++ /* Define for the ARM architecture. */ ++ #undef ARM ++ +++/* Define for the AVR32 architecture. */ +++#undef AVR32 +++ ++ /* Define for the FreeBSD operating system. */ ++ #undef FREEBSD ++ ++Index: strace-4.5.16/config.sub ++=================================================================== ++--- strace-4.5.16.orig/config.sub 2005-02-02 05:18:19.000000000 +0100 +++++ strace-4.5.16/config.sub 2008-05-11 15:38:53.000000000 +0200 ++@@ -230,7 +230,7 @@ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++- | 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 \ ++@@ -297,7 +297,7 @@ ++ | 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-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++Index: strace-4.5.16/configure.ac ++=================================================================== ++--- strace-4.5.16.orig/configure.ac 2007-08-03 12:06:42.000000000 +0200 +++++ strace-4.5.16/configure.ac 2008-05-11 15:36:30.000000000 +0200 ++@@ -103,6 +103,10 @@ ++ arch=x86_64 ++ AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.]) ++ ;; +++avr32*) +++ arch=avr32 +++ AC_DEFINE([AVR32], 1, [Define for the AVR32 architecture.]) +++ ;; ++ *) ++ AC_MSG_RESULT([NO!]) ++ AC_MSG_ERROR([architecture $host_cpu is not supported by strace]) ++Index: strace-4.5.16/defs.h ++=================================================================== ++--- strace-4.5.16.orig/defs.h 2007-07-24 03:57:11.000000000 +0200 +++++ strace-4.5.16/defs.h 2008-05-11 15:36:30.000000000 +0200 ++@@ -94,6 +94,9 @@ ++ # if defined(X86_64) ++ # define LINUX_X86_64 ++ # endif +++# if defined(AVR32) +++# define LINUX_AVR32 +++# endif ++ #endif ++ ++ #if defined(SVR4) || defined(FREEBSD) ++@@ -120,7 +123,7 @@ ++ #include ++ #endif /* FREEBSD */ ++ #else /* !USE_PROCFS */ ++-#if (defined(LINUXSPARC) || defined (LINUX_X86_64)) && defined(__GLIBC__) +++#if (defined(LINUXSPARC) || defined (LINUX_X86_64) || defined (LINUX_AVR32)) && defined(__GLIBC__) ++ #include ++ #else ++ /* Work around awkward prototype in ptrace.h. */ ++@@ -327,7 +330,7 @@ ++ #define TCB_FOLLOWFORK 00400 /* Process should have forks followed */ ++ #define TCB_REPRINT 01000 /* We should reprint this syscall on exit */ ++ #ifdef LINUX ++-# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) +++# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(AVR32) ++ # define TCB_WAITEXECVE 02000 /* ignore SIGTRAP after exceve */ ++ # endif ++ # define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */ ++Index: strace-4.5.16/linux/avr32/ioctlent.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ strace-4.5.16/linux/avr32/ioctlent.h 2008-05-11 15:36:30.000000000 +0200 ++@@ -0,0 +1,1268 @@ +++{"linux/fs.h", "FIBMAP", 0x1}, +++{"linux/fs.h", "FIGETBSZ", 0x2}, +++{"linux/fd.h", "FDCLRPRM", 0x241}, +++{"linux/fd.h", "FDMSGON", 0x245}, +++{"linux/fd.h", "FDMSGOFF", 0x246}, +++{"linux/fd.h", "FDFMTBEG", 0x247}, +++{"linux/fd.h", "FDFMTEND", 0x249}, +++{"linux/fd.h", "FDSETEMSGTRESH", 0x24a}, +++{"linux/fd.h", "FDFLUSH", 0x24b}, +++{"linux/fd.h", "FDRESET", 0x254}, +++{"linux/fd.h", "FDWERRORCLR", 0x256}, +++{"linux/fd.h", "FDRAWCMD", 0x258}, +++{"linux/fd.h", "FDTWADDLE", 0x259}, +++{"linux/fd.h", "FDEJECT", 0x25a}, +++{"linux/wireless.h", "IW_POWER_ALL_R", 0x300}, +++{"linux/in6.h", "IPV6_PRIORITY_RESERVED1", 0x300}, +++{"linux/apm_bios.h", "APM_DEVICE_PARALLEL", 0x300}, +++{"linux/hdreg.h", "HDIO_GETGEO", 0x301}, +++{"linux/ps2esdi.h", "HDIO_GETGEO", 0x301}, +++{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302}, +++{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304}, +++{"linux/hdreg.h", "HDIO_GET_QDMA", 0x305}, +++{"linux/hdreg.h", "HDIO_SET_XFER", 0x306}, +++{"linux/hdreg.h", "HDIO_OBSOLETE_IDENTITY", 0x307}, +++{"linux/hdreg.h", "HDIO_GET_KEEPSETTINGS", 0x308}, +++{"linux/hdreg.h", "HDIO_GET_32BIT", 0x309}, +++{"linux/hdreg.h", "HDIO_GET_NOWERR", 0x30a}, +++{"linux/hdreg.h", "HDIO_GET_DMA", 0x30b}, +++{"linux/hdreg.h", "HDIO_GET_NICE", 0x30c}, +++{"linux/hdreg.h", "HDIO_GET_IDENTITY", 0x30d}, +++{"linux/hdreg.h", "HDIO_GET_WCACHE", 0x30e}, +++{"linux/hdreg.h", "HDIO_GET_ACOUSTIC", 0x30f}, +++{"linux/hdreg.h", "HDIO_GET_ADDRESS", 0x310}, +++{"linux/hdreg.h", "HDIO_GET_BUSSTATE", 0x31a}, +++{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31b}, +++{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c}, +++{"linux/hdreg.h", "HDIO_DRIVE_TASKFILE", 0x31d}, +++{"linux/hdreg.h", "HDIO_DRIVE_TASK", 0x31e}, +++{"linux/hdreg.h", "HDIO_DRIVE_CMD", 0x31f}, +++{"linux/hdreg.h", "HDIO_SET_MULTCOUNT", 0x321}, +++{"linux/hdreg.h", "HDIO_SET_UNMASKINTR", 0x322}, +++{"linux/hdreg.h", "HDIO_SET_KEEPSETTINGS", 0x323}, +++{"linux/hdreg.h", "HDIO_SET_32BIT", 0x324}, +++{"linux/hdreg.h", "HDIO_SET_NOWERR", 0x325}, +++{"linux/hdreg.h", "HDIO_SET_DMA", 0x326}, +++{"linux/hdreg.h", "HDIO_SET_PIO_MODE", 0x327}, +++{"linux/hdreg.h", "HDIO_SCAN_HWIF", 0x328}, +++{"linux/hdreg.h", "HDIO_SET_NICE", 0x329}, +++{"linux/hdreg.h", "HDIO_UNREGISTER_HWIF", 0x32a}, +++{"linux/hdreg.h", "HDIO_SET_WCACHE", 0x32b}, +++{"linux/hdreg.h", "HDIO_SET_ACOUSTIC", 0x32c}, +++{"linux/hdreg.h", "HDIO_SET_BUSSTATE", 0x32d}, +++{"linux/hdreg.h", "HDIO_SET_QDMA", 0x32e}, +++{"linux/hdreg.h", "HDIO_SET_ADDRESS", 0x32f}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_CARDCO_1", 0x3ec}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_A_SQUARED", 0x3ed}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_COMSPEC_COMMUNICATIONS", 0x3ee}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_ANAKIN_RESEARCH", 0x3f1}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_MICROBOTICS", 0x3f2}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_ACCESS_ASSOCIATES_ALEGRA", 0x3f4}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_EXPANSION_TECHNOLOGIES", 0x3f6}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_ASDG", 0x3ff}, +++{"linux/apm_bios.h", "APM_DEVICE_PCMCIA", 0x600}, +++{"linux/ixjuser.h", "MIXER_PORT_CD_L", 0x600}, +++{"linux/in6.h", "IPV6_PRIORITY_INTERACTIVE", 0x600}, +++{"linux/lp.h", "LPCHAR", 0x601}, +++{"linux/lp.h", "LPTIME", 0x602}, +++{"linux/lp.h", "LPABORT", 0x604}, +++{"linux/lp.h", "LPSETIRQ", 0x605}, +++{"linux/lp.h", "LPGETIRQ", 0x606}, +++{"linux/lp.h", "LPWAIT", 0x608}, +++{"linux/lp.h", "LPCAREFUL", 0x609}, +++{"linux/lp.h", "LPABORTOPEN", 0x60a}, +++{"linux/lp.h", "LPGETSTATUS", 0x60b}, +++{"linux/lp.h", "LPRESET", 0x60c}, +++{"linux/lp.h", "LPGETSTATS", 0x60d}, +++{"linux/lp.h", "LPGETFLAGS", 0x60e}, +++{"linux/lp.h", "LPSETTIMEOUT", 0x60f}, +++{"linux/som.h", "SOM_LIB_RELOC", 0x619}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_1", 0x6e1}, +++{"linux/fs.h", "BLKROSET", 0x125d}, +++{"linux/fs.h", "BLKROGET", 0x125e}, +++{"linux/fs.h", "BLKRRPART", 0x125f}, +++{"linux/fs.h", "BLKGETSIZE", 0x1260}, +++{"linux/fs.h", "BLKFLSBUF", 0x1261}, +++{"linux/fs.h", "BLKRASET", 0x1262}, +++{"linux/fs.h", "BLKRAGET", 0x1263}, +++{"linux/fs.h", "BLKFRASET", 0x1264}, +++{"linux/fs.h", "BLKFRAGET", 0x1265}, +++{"linux/fs.h", "BLKSECTSET", 0x1266}, +++{"linux/fs.h", "BLKSECTGET", 0x1267}, +++{"linux/fs.h", "BLKSSZGET", 0x1268}, +++{"linux/blkpg.h", "BLKPG", 0x1269}, +++{"linux/fs.h", "BLKTRACESTART", 0x1274}, +++{"linux/fs.h", "BLKTRACESTOP", 0x1275}, +++{"linux/fs.h", "BLKTRACETEARDOWN", 0x1276}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_2", 0x2200}, +++{"scsi/sg.h", "SG_SET_TIMEOUT", 0x2201}, +++{"scsi/sg.h", "SG_GET_TIMEOUT", 0x2202}, +++{"scsi/sg.h", "SG_EMULATED_HOST", 0x2203}, +++{"scsi/sg.h", "SG_SET_TRANSFORM", 0x2204}, +++{"scsi/sg.h", "SG_GET_TRANSFORM", 0x2205}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_3", 0x2222}, +++{"scsi/sg.h", "SG_GET_COMMAND_Q", 0x2270}, +++{"scsi/sg.h", "SG_SET_COMMAND_Q", 0x2271}, +++{"scsi/sg.h", "SG_GET_RESERVED_SIZE", 0x2272}, +++{"scsi/sg.h", "SG_SET_RESERVED_SIZE", 0x2275}, +++{"scsi/sg.h", "SG_GET_SCSI_ID", 0x2276}, +++{"scsi/sg.h", "SG_SET_FORCE_LOW_DMA", 0x2279}, +++{"scsi/sg.h", "SG_GET_LOW_DMA", 0x227a}, +++{"scsi/sg.h", "SG_SET_FORCE_PACK_ID", 0x227b}, +++{"scsi/sg.h", "SG_GET_PACK_ID", 0x227c}, +++{"scsi/sg.h", "SG_GET_NUM_WAITING", 0x227d}, +++{"scsi/sg.h", "SG_SET_DEBUG", 0x227e}, +++{"scsi/sg.h", "SG_GET_SG_TABLESIZE", 0x227f}, +++{"scsi/sg.h", "SG_GET_VERSION_NUM", 0x2282}, +++{"scsi/sg.h", "SG_NEXT_CMD_LEN", 0x2283}, +++{"scsi/sg.h", "SG_SCSI_RESET", 0x2284}, +++{"scsi/sg.h", "SG_IO", 0x2285}, +++{"scsi/sg.h", "SG_GET_REQUEST_TABLE", 0x2286}, +++{"scsi/sg.h", "SG_SET_KEEP_ORPHAN", 0x2287}, +++{"scsi/sg.h", "SG_GET_KEEP_ORPHAN", 0x2288}, +++{"linux/apm_bios.h", "APM_IOC_STANDBY", 0x4101}, +++{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101}, +++{"linux/apm_bios.h", "APM_IOC_SUSPEND", 0x4102}, +++{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102}, +++{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200}, +++{"linux/cciss_ioctl.h", "CCISS_REVALIDVOLS", 0x420a}, +++{"linux/cciss_ioctl.h", "CCISS_DEREGDISK", 0x420c}, +++{"linux/cciss_ioctl.h", "CCISS_REGNEWD", 0x420e}, +++{"linux/cciss_ioctl.h", "CCISS_RESCANDISK", 0x4210}, +++{"linux/fb.h", "FBIOGET_VSCREENINFO", 0x4600}, +++{"linux/fb.h", "FBIOPUT_VSCREENINFO", 0x4601}, +++{"linux/ps2esdi.h", "CMD_READ", 0x4601}, +++{"linux/fb.h", "FBIOGET_FSCREENINFO", 0x4602}, +++{"linux/ps2esdi.h", "CMD_WRITE", 0x4602}, +++{"linux/fb.h", "FBIOGETCMAP", 0x4604}, +++{"linux/fb.h", "FBIOPUTCMAP", 0x4605}, +++{"linux/fb.h", "FBIOPAN_DISPLAY", 0x4606}, +++{"linux/fb.h", "FBIOGET_CON2FBMAP", 0x460f}, +++{"linux/fb.h", "FBIOPUT_CON2FBMAP", 0x4610}, +++{"linux/fb.h", "FBIOBLANK", 0x4611}, +++{"linux/fb.h", "FBIO_ALLOC", 0x4613}, +++{"linux/fb.h", "FBIO_FREE", 0x4614}, +++{"linux/fb.h", "FBIOGET_GLYPH", 0x4615}, +++{"linux/fb.h", "FBIOGET_HWCINFO", 0x4616}, +++{"linux/fb.h", "FBIOPUT_MODEINFO", 0x4617}, +++{"linux/fb.h", "FBIOGET_DISPINFO", 0x4618}, +++{"linux/arcfb.h", "FBIO_WAITEVENT", 0x4688}, +++{"linux/hiddev.h", "HIDIOCAPPLICATION", 0x4802}, +++{"linux/hiddev.h", "HIDIOCINITREPORT", 0x4805}, +++{"linux/isdn.h", "IIOCNETAIF", 0x4901}, +++{"linux/isdn.h", "IIOCNETDIF", 0x4902}, +++{"linux/isdn.h", "IIOCNETSCF", 0x4903}, +++{"linux/isdn.h", "IIOCNETGCF", 0x4904}, +++{"linux/isdn.h", "IIOCNETANM", 0x4905}, +++{"linux/isdn.h", "IIOCNETDNM", 0x4906}, +++{"linux/isdn.h", "IIOCNETGNM", 0x4907}, +++{"linux/isdn.h", "IIOCGETSET", 0x4908}, +++{"linux/isdn.h", "IIOCSETSET", 0x4909}, +++{"linux/isdn.h", "IIOCSETVER", 0x490a}, +++{"linux/isdn.h", "IIOCNETHUP", 0x490b}, +++{"linux/isdn.h", "IIOCSETGST", 0x490c}, +++{"linux/isdn.h", "IIOCSETBRJ", 0x490d}, +++{"linux/isdn.h", "IIOCSIGPRF", 0x490e}, +++{"linux/isdn.h", "IIOCGETPRF", 0x490f}, +++{"linux/isdn.h", "IIOCSETPRF", 0x4910}, +++{"linux/isdn.h", "IIOCGETMAP", 0x4911}, +++{"linux/isdn.h", "IIOCSETMAP", 0x4912}, +++{"linux/isdn.h", "IIOCNETASL", 0x4913}, +++{"linux/isdn.h", "IIOCNETDIL", 0x4914}, +++{"linux/isdn.h", "IIOCGETCPS", 0x4915}, +++{"linux/isdn.h", "IIOCGETDVR", 0x4916}, +++{"linux/isdn.h", "IIOCNETLCR", 0x4917}, +++{"linux/isdn.h", "IIOCNETDWRSET", 0x4918}, +++{"linux/isdn.h", "IIOCNETALN", 0x4920}, +++{"linux/isdn.h", "IIOCNETDLN", 0x4921}, +++{"linux/isdn.h", "IIOCNETGPN", 0x4922}, +++{"linux/isdn.h", "IIOCDBGVAR", 0x497f}, +++{"linux/isdn.h", "IIOCDRVCTL", 0x4980}, +++{"linux/kd.h", "KIOCSOUND", 0x4b2f}, +++{"linux/kd.h", "KDMKTONE", 0x4b30}, +++{"linux/kd.h", "KDGETLED", 0x4b31}, +++{"linux/kd.h", "KDSETLED", 0x4b32}, +++{"linux/kd.h", "KDGKBTYPE", 0x4b33}, +++{"linux/kd.h", "KDADDIO", 0x4b34}, +++{"linux/kd.h", "KDDELIO", 0x4b35}, +++{"linux/kd.h", "KDENABIO", 0x4b36}, +++{"linux/kd.h", "KDDISABIO", 0x4b37}, +++{"linux/kd.h", "KDSETMODE", 0x4b3a}, +++{"linux/kd.h", "KDGETMODE", 0x4b3b}, +++{"linux/kd.h", "KDMAPDISP", 0x4b3c}, +++{"linux/kd.h", "KDUNMAPDISP", 0x4b3d}, +++{"linux/kd.h", "GIO_SCRNMAP", 0x4b40}, +++{"linux/kd.h", "PIO_SCRNMAP", 0x4b41}, +++{"linux/kd.h", "KDGKBMODE", 0x4b44}, +++{"linux/kd.h", "KDSKBMODE", 0x4b45}, +++{"linux/kd.h", "KDGKBENT", 0x4b46}, +++{"linux/kd.h", "KDSKBENT", 0x4b47}, +++{"linux/kd.h", "KDGKBSENT", 0x4b48}, +++{"linux/kd.h", "KDSKBSENT", 0x4b49}, +++{"linux/kd.h", "KDGKBDIACR", 0x4b4a}, +++{"linux/kd.h", "KDSKBDIACR", 0x4b4b}, +++{"linux/kd.h", "KDGETKEYCODE", 0x4b4c}, +++{"linux/kd.h", "KDSETKEYCODE", 0x4b4d}, +++{"linux/kd.h", "KDSIGACCEPT", 0x4b4e}, +++{"linux/kd.h", "KDKBDREP", 0x4b52}, +++{"linux/kd.h", "GIO_FONT", 0x4b60}, +++{"linux/kd.h", "PIO_FONT", 0x4b61}, +++{"linux/kd.h", "KDGKBMETA", 0x4b62}, +++{"linux/kd.h", "KDSKBMETA", 0x4b63}, +++{"linux/kd.h", "KDGKBLED", 0x4b64}, +++{"linux/kd.h", "KDSKBLED", 0x4b65}, +++{"linux/kd.h", "GIO_UNIMAP", 0x4b66}, +++{"linux/kd.h", "PIO_UNIMAP", 0x4b67}, +++{"linux/kd.h", "PIO_UNIMAPCLR", 0x4b68}, +++{"linux/kd.h", "GIO_UNISCRNMAP", 0x4b69}, +++{"linux/kd.h", "PIO_UNISCRNMAP", 0x4b6a}, +++{"linux/kd.h", "GIO_FONTX", 0x4b6b}, +++{"linux/kd.h", "PIO_FONTX", 0x4b6c}, +++{"linux/kd.h", "PIO_FONTRESET", 0x4b6d}, +++{"linux/kd.h", "GIO_CMAP", 0x4b70}, +++{"linux/kd.h", "PIO_CMAP", 0x4b71}, +++{"linux/kd.h", "KDFONTOP", 0x4b72}, +++{"linux/loop.h", "LOOP_SET_FD", 0x4c00}, +++{"linux/loop.h", "LOOP_CLR_FD", 0x4c01}, +++{"linux/loop.h", "LOOP_SET_STATUS", 0x4c02}, +++{"linux/loop.h", "LOOP_GET_STATUS", 0x4c03}, +++{"linux/loop.h", "LOOP_SET_STATUS64", 0x4c04}, +++{"linux/loop.h", "LOOP_GET_STATUS64", 0x4c05}, +++{"linux/loop.h", "LOOP_CHANGE_FD", 0x4c06}, +++{"mtd/mtd-abi.h", "MTDFILEMODE", 0x4d13}, +++{"linux/random.h", "RNDZAPENTCNT", 0x5204}, +++{"linux/random.h", "RNDCLEARPOOL", 0x5206}, +++{"linux/cdrom.h", "CDROMPAUSE", 0x5301}, +++{"linux/n_r3964.h", "R3964_ENABLE_SIGNALS", 0x5301}, +++{"linux/n_r3964.h", "R3964_SETPRIORITY", 0x5302}, +++{"linux/cdrom.h", "CDROMRESUME", 0x5302}, +++{"linux/n_r3964.h", "R3964_USE_BCC", 0x5303}, +++{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303}, +++{"linux/n_r3964.h", "R3964_READ_TELEGRAM", 0x5304}, +++{"linux/cdrom.h", "CDROMPLAYTRKIND", 0x5304}, +++{"linux/cdrom.h", "CDROMREADTOCHDR", 0x5305}, +++{"linux/cdrom.h", "CDROMREADTOCENTRY", 0x5306}, +++{"linux/cdrom.h", "CDROMSTOP", 0x5307}, +++{"linux/cdrom.h", "CDROMSTART", 0x5308}, +++{"linux/cdrom.h", "CDROMEJECT", 0x5309}, +++{"linux/cdrom.h", "CDROMVOLCTRL", 0x530a}, +++{"linux/cdrom.h", "CDROMSUBCHNL", 0x530b}, +++{"linux/cdrom.h", "CDROMREADMODE2", 0x530c}, +++{"linux/cdrom.h", "CDROMREADMODE1", 0x530d}, +++{"linux/cdrom.h", "CDROMREADAUDIO", 0x530e}, +++{"linux/cdrom.h", "CDROMEJECT_SW", 0x530f}, +++{"linux/cdrom.h", "CDROMMULTISESSION", 0x5310}, +++{"linux/cdrom.h", "CDROM_GET_MCN", 0x5311}, +++{"linux/cdrom.h", "CDROMRESET", 0x5312}, +++{"linux/cdrom.h", "CDROMVOLREAD", 0x5313}, +++{"linux/cdrom.h", "CDROMREADRAW", 0x5314}, +++{"linux/cdrom.h", "CDROMREADCOOKED", 0x5315}, +++{"linux/cdrom.h", "CDROMSEEK", 0x5316}, +++{"linux/cdrom.h", "CDROMPLAYBLK", 0x5317}, +++{"linux/cdrom.h", "CDROMREADALL", 0x5318}, +++{"linux/cdrom.h", "CDROMCLOSETRAY", 0x5319}, +++{"linux/cdrom.h", "CDROMGETSPINDOWN", 0x531d}, +++{"linux/cdrom.h", "CDROMSETSPINDOWN", 0x531e}, +++{"linux/cdrom.h", "CDROM_SET_OPTIONS", 0x5320}, +++{"linux/cdrom.h", "CDROM_CLEAR_OPTIONS", 0x5321}, +++{"linux/cdrom.h", "CDROM_SELECT_SPEED", 0x5322}, +++{"linux/cdrom.h", "CDROM_SELECT_DISC", 0x5323}, +++{"linux/cdrom.h", "CDROM_MEDIA_CHANGED", 0x5325}, +++{"linux/cdrom.h", "CDROM_DRIVE_STATUS", 0x5326}, +++{"linux/cdrom.h", "CDROM_DISC_STATUS", 0x5327}, +++{"linux/cdrom.h", "CDROM_CHANGER_NSLOTS", 0x5328}, +++{"linux/cdrom.h", "CDROM_LOCKDOOR", 0x5329}, +++{"linux/cdrom.h", "CDROM_DEBUG", 0x5330}, +++{"linux/cdrom.h", "CDROM_GET_CAPABILITY", 0x5331}, +++{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORLOCK", 0x5380}, +++{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORUNLOCK", 0x5381}, +++{"linux/cdrom.h", "CDROMAUDIOBUFSIZ", 0x5382}, +++{"scsi/scsi.h", "SCSI_IOCTL_GET_IDLUN", 0x5382}, +++{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_ENABLE", 0x5383}, +++{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_DISABLE", 0x5384}, +++{"scsi/scsi.h", "SCSI_IOCTL_PROBE_HOST", 0x5385}, +++{"scsi/scsi.h", "SCSI_IOCTL_GET_BUS_NUMBER", 0x5386}, +++{"linux/cdrom.h", "DVD_READ_STRUCT", 0x5390}, +++{"linux/cdrom.h", "DVD_WRITE_STRUCT", 0x5391}, +++{"linux/cdrom.h", "DVD_AUTH", 0x5392}, +++{"linux/cdrom.h", "CDROM_SEND_PACKET", 0x5393}, +++{"linux/cdrom.h", "CDROM_NEXT_WRITABLE", 0x5394}, +++{"linux/cdrom.h", "CDROM_LAST_WRITTEN", 0x5395}, +++{"asm/ioctls.h", "TCGETS", 0x5401}, +++{"asm/ioctls.h", "TCSETS", 0x5402}, +++{"asm/ioctls.h", "TCSETSW", 0x5403}, +++{"asm/ioctls.h", "TCSETSF", 0x5404}, +++{"asm/ioctls.h", "TCGETA", 0x5405}, +++{"asm/ioctls.h", "TCSETA", 0x5406}, +++{"asm/ioctls.h", "TCSETAW", 0x5407}, +++{"asm/ioctls.h", "TCSETAF", 0x5408}, +++{"asm/ioctls.h", "TCSBRK", 0x5409}, +++{"asm/ioctls.h", "TCXONC", 0x540a}, +++{"asm/ioctls.h", "TCFLSH", 0x540b}, +++{"asm/ioctls.h", "TIOCEXCL", 0x540c}, +++{"asm/ioctls.h", "TIOCNXCL", 0x540d}, +++{"asm/ioctls.h", "TIOCSCTTY", 0x540e}, +++{"asm/ioctls.h", "TIOCGPGRP", 0x540f}, +++{"asm/ioctls.h", "TIOCSPGRP", 0x5410}, +++{"asm/ioctls.h", "TIOCOUTQ", 0x5411}, +++{"asm/ioctls.h", "TIOCSTI", 0x5412}, +++{"asm/ioctls.h", "TIOCGWINSZ", 0x5413}, +++{"asm/ioctls.h", "TIOCSWINSZ", 0x5414}, +++{"asm/ioctls.h", "TIOCMGET", 0x5415}, +++{"asm/ioctls.h", "TIOCMBIS", 0x5416}, +++{"asm/ioctls.h", "TIOCMBIC", 0x5417}, +++{"asm/ioctls.h", "TIOCMSET", 0x5418}, +++{"asm/ioctls.h", "TIOCGSOFTCAR", 0x5419}, +++{"asm/ioctls.h", "TIOCSSOFTCAR", 0x541a}, +++{"asm/ioctls.h", "FIONREAD", 0x541b}, +++{"asm/ioctls.h", "TIOCLINUX", 0x541c}, +++{"asm/ioctls.h", "TIOCCONS", 0x541d}, +++{"asm/ioctls.h", "TIOCGSERIAL", 0x541e}, +++{"asm/ioctls.h", "TIOCSSERIAL", 0x541f}, +++{"asm/ioctls.h", "TIOCPKT", 0x5420}, +++{"asm/ioctls.h", "FIONBIO", 0x5421}, +++{"asm/ioctls.h", "TIOCNOTTY", 0x5422}, +++{"asm/ioctls.h", "TIOCSETD", 0x5423}, +++{"asm/ioctls.h", "TIOCGETD", 0x5424}, +++{"asm/ioctls.h", "TCSBRKP", 0x5425}, +++{"asm/ioctls.h", "TIOCSBRK", 0x5427}, +++{"asm/ioctls.h", "TIOCCBRK", 0x5428}, +++{"asm/ioctls.h", "TIOCGSID", 0x5429}, +++{"asm/ioctls.h", "FIONCLEX", 0x5450}, +++{"asm/ioctls.h", "FIOCLEX", 0x5451}, +++{"asm/ioctls.h", "FIOASYNC", 0x5452}, +++{"asm/ioctls.h", "TIOCSERCONFIG", 0x5453}, +++{"asm/ioctls.h", "TIOCSERGWILD", 0x5454}, +++{"asm/ioctls.h", "TIOCSERSWILD", 0x5455}, +++{"asm/ioctls.h", "TIOCGLCKTRMIOS", 0x5456}, +++{"asm/ioctls.h", "TIOCSLCKTRMIOS", 0x5457}, +++{"asm/ioctls.h", "TIOCSERGSTRUCT", 0x5458}, +++{"asm/ioctls.h", "TIOCSERGETLSR", 0x5459}, +++{"asm/ioctls.h", "TIOCSERGETMULTI", 0x545a}, +++{"asm/ioctls.h", "TIOCSERSETMULTI", 0x545b}, +++{"asm/ioctls.h", "TIOCMIWAIT", 0x545c}, +++{"asm/ioctls.h", "TIOCGICOUNT", 0x545d}, +++{"asm/ioctls.h", "TIOCGHAYESESP", 0x545e}, +++{"asm/ioctls.h", "TIOCSHAYESESP", 0x545f}, +++{"asm/ioctls.h", "FIOQSIZE", 0x5460}, +++{"linux/uinput.h", "UI_DEV_CREATE", 0x5501}, +++{"linux/uinput.h", "UI_DEV_DESTROY", 0x5502}, +++{"linux/vt.h", "VT_OPENQRY", 0x5600}, +++{"linux/vt.h", "VT_GETMODE", 0x5601}, +++{"linux/videodev2.h", "VIDIOC_RESERVED", 0x5601}, +++{"linux/vt.h", "VT_SETMODE", 0x5602}, +++{"linux/vt.h", "VT_GETSTATE", 0x5603}, +++{"linux/vt.h", "VT_SENDSIG", 0x5604}, +++{"linux/vt.h", "VT_RELDISP", 0x5605}, +++{"linux/vt.h", "VT_ACTIVATE", 0x5606}, +++{"linux/vt.h", "VT_WAITACTIVE", 0x5607}, +++{"linux/vt.h", "VT_DISALLOCATE", 0x5608}, +++{"linux/vt.h", "VT_RESIZE", 0x5609}, +++{"linux/vt.h", "VT_RESIZEX", 0x560a}, +++{"linux/vt.h", "VT_LOCKSWITCH", 0x560b}, +++{"linux/vt.h", "VT_UNLOCKSWITCH", 0x560c}, +++{"linux/vt.h", "VT_GETHIFONTMASK", 0x560d}, +++{"linux/videodev2.h", "VIDIOC_LOG_STATUS", 0x5646}, +++{"linux/sonet.h", "SONET_SETFRAMING", 0x6115}, +++{"linux/atm_nicstar.h", "NS_ADJBUFLEV", 0x6163}, +++{"linux/atm_tcp.h", "SIOCSIFATMTCP", 0x6180}, +++{"linux/atm_tcp.h", "ATMTCP_CREATE", 0x618e}, +++{"linux/atm_tcp.h", "ATMTCP_REMOVE", 0x618f}, +++{"linux/atmlec.h", "ATMLEC_CTRL", 0x61d0}, +++{"linux/atmlec.h", "ATMLEC_DATA", 0x61d1}, +++{"linux/atmlec.h", "ATMLEC_MCAST", 0x61d2}, +++{"linux/atmmpc.h", "ATMMPC_CTRL", 0x61d8}, +++{"linux/atmmpc.h", "ATMMPC_DATA", 0x61d9}, +++{"linux/atmclip.h", "SIOCMKCLIP", 0x61e0}, +++{"linux/atmarp.h", "ATMARPD_CTRL", 0x61e1}, +++{"linux/atmarp.h", "ATMARP_MKIP", 0x61e2}, +++{"linux/atmarp.h", "ATMARP_SETENTRY", 0x61e3}, +++{"linux/atmarp.h", "ATMARP_ENCAP", 0x61e5}, +++{"linux/atmsvc.h", "ATMSIGD_CTRL", 0x61f0}, +++{"linux/cm4000_cs.h", "CM_IOCSRDR", 0x6303}, +++{"linux/cm4000_cs.h", "CM_IOCARDOFF", 0x6304}, +++{"linux/chio.h", "CHIOINITELEM", 0x6311}, +++{"linux/comstats.h", "COM_GETPORTSTATS", 0x631e}, +++{"linux/comstats.h", "COM_CLRPORTSTATS", 0x631f}, +++{"linux/comstats.h", "COM_GETBRDSTATS", 0x6320}, +++{"linux/comstats.h", "COM_READPORT", 0x6328}, +++{"linux/comstats.h", "COM_READBOARD", 0x6329}, +++{"linux/comstats.h", "COM_READPANEL", 0x632a}, +++{"linux/video_decoder.h", "DECODER_DUMP", 0x64c0}, +++{"linux/hpet.h", "HPET_IE_ON", 0x6801}, +++{"linux/hpet.h", "HPET_IE_OFF", 0x6802}, +++{"linux/hpet.h", "HPET_EPI", 0x6804}, +++{"linux/hpet.h", "HPET_DPI", 0x6805}, +++{"linux/mmtimer.h", "MMTIMER_GETOFFSET", 0x6d00}, +++{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02}, +++{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03}, +++{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04}, +++{"linux/mmtimer.h", "MMTIMER_GETBITS", 0x6d04}, +++{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05}, +++{"linux/mmtimer.h", "MMTIMER_MMAPAVAIL", 0x6d06}, +++{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06}, +++{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07}, +++{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09}, +++{"linux/synclink.h", "MGSL_IOCSIF", 0x6d0a}, +++{"linux/synclink.h", "MGSL_IOCGIF", 0x6d0b}, +++{"linux/synclink.h", "MGSL_IOCCLRMODCOUNT", 0x6d0f}, +++{"linux/ncp_fs.h", "NCP_IOC_CONN_LOGGED_IN", 0x6e03}, +++{"linux/rtc.h", "RTC_AIE_ON", 0x7001}, +++{"linux/rtc.h", "RTC_AIE_OFF", 0x7002}, +++{"linux/rtc.h", "RTC_UIE_ON", 0x7003}, +++{"linux/rtc.h", "RTC_UIE_OFF", 0x7004}, +++{"linux/rtc.h", "RTC_PIE_ON", 0x7005}, +++{"linux/rtc.h", "RTC_PIE_OFF", 0x7006}, +++{"linux/rtc.h", "RTC_WIE_ON", 0x700f}, +++{"linux/rtc.h", "RTC_WIE_OFF", 0x7010}, +++{"linux/nvram.h", "NVRAM_INIT", 0x7040}, +++{"linux/nvram.h", "NVRAM_SETCKS", 0x7041}, +++{"linux/ppdev.h", "PPCLAIM", 0x708b}, +++{"linux/ppdev.h", "PPRELEASE", 0x708c}, +++{"linux/ppdev.h", "PPYIELD", 0x708d}, +++{"linux/ppdev.h", "PPEXCL", 0x708f}, +++{"linux/telephony.h", "PHONE_CAPABILITIES", 0x7180}, +++{"linux/telephony.h", "PHONE_RING", 0x7183}, +++{"linux/telephony.h", "PHONE_HOOKSTATE", 0x7184}, +++{"linux/telephony.h", "OLD_PHONE_RING_START", 0x7187}, +++{"linux/telephony.h", "PHONE_RING_STOP", 0x7188}, +++{"linux/telephony.h", "PHONE_REC_START", 0x718a}, +++{"linux/telephony.h", "PHONE_REC_STOP", 0x718b}, +++{"linux/telephony.h", "PHONE_REC_LEVEL", 0x718f}, +++{"linux/telephony.h", "PHONE_PLAY_START", 0x7191}, +++{"linux/telephony.h", "PHONE_PLAY_STOP", 0x7192}, +++{"linux/telephony.h", "PHONE_PLAY_LEVEL", 0x7195}, +++{"linux/telephony.h", "PHONE_GET_TONE_ON_TIME", 0x719e}, +++{"linux/telephony.h", "PHONE_GET_TONE_OFF_TIME", 0x719f}, +++{"linux/telephony.h", "PHONE_GET_TONE_STATE", 0x71a0}, +++{"linux/telephony.h", "PHONE_BUSY", 0x71a1}, +++{"linux/telephony.h", "PHONE_RINGBACK", 0x71a2}, +++{"linux/telephony.h", "PHONE_DIALTONE", 0x71a3}, +++{"linux/telephony.h", "PHONE_CPT_STOP", 0x71a4}, +++{"linux/telephony.h", "PHONE_PSTN_GET_STATE", 0x71a5}, +++{"linux/telephony.h", "PHONE_PSTN_LINETEST", 0x71a8}, +++{"linux/ixjuser.h", "IXJCTL_DSP_RESET", 0x71c0}, +++{"linux/ixjuser.h", "IXJCTL_DSP_IDLE", 0x71c5}, +++{"linux/ixjuser.h", "IXJCTL_TESTRAM", 0x71c6}, +++{"linux/ixjuser.h", "IXJCTL_AEC_STOP", 0x71cc}, +++{"linux/ixjuser.h", "IXJCTL_AEC_GET_LEVEL", 0x71cd}, +++{"linux/ixjuser.h", "IXJCTL_PSTN_LINETEST", 0x71d3}, +++{"linux/ixjuser.h", "IXJCTL_PLAY_CID", 0x71d7}, +++{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_CLEAR", 0x71e7}, +++{"linux/cdk.h", "STL_BINTR", 0x7314}, +++{"linux/cdk.h", "STL_BSTART", 0x7315}, +++{"linux/cdk.h", "STL_BSTOP", 0x7316}, +++{"linux/cdk.h", "STL_BRESET", 0x7317}, +++{"linux/cdk.h", "STL_GETPFLAG", 0x7350}, +++{"linux/cdk.h", "STL_SETPFLAG", 0x7351}, +++{"linux/if_ppp.h", "PPPIOCDISCONN", 0x7439}, +++{"linux/if_ppp.h", "PPPIOCXFERUNIT", 0x744e}, +++{"linux/meye.h", "MEYEIOC_STILLCAPT", 0x76c4}, +++{"linux/videotext.h", "VTXIOCPUTPAGE", 0x8108}, +++{"linux/videotext.h", "VTXIOCSETDISP", 0x8109}, +++{"linux/videotext.h", "VTXIOCPUTSTAT", 0x810a}, +++{"linux/videotext.h", "VTXIOCCLRCACHE", 0x810b}, +++{"asm/sockios.h", "FIOSETOWN", 0x8901}, +++{"asm/sockios.h", "SIOCSPGRP", 0x8902}, +++{"asm/sockios.h", "FIOGETOWN", 0x8903}, +++{"asm/sockios.h", "SIOCGPGRP", 0x8904}, +++{"asm/sockios.h", "SIOCATMARK", 0x8905}, +++{"asm/sockios.h", "SIOCGSTAMP", 0x8906}, +++{"linux/sockios.h", "SIOCADDRT", 0x890b}, +++{"linux/sockios.h", "SIOCDELRT", 0x890c}, +++{"linux/sockios.h", "SIOCRTMSG", 0x890d}, +++{"linux/sockios.h", "SIOCGIFNAME", 0x8910}, +++{"linux/sockios.h", "SIOCSIFLINK", 0x8911}, +++{"linux/sockios.h", "SIOCGIFCONF", 0x8912}, +++{"linux/sockios.h", "SIOCGIFFLAGS", 0x8913}, +++{"linux/sockios.h", "SIOCSIFFLAGS", 0x8914}, +++{"linux/sockios.h", "SIOCGIFADDR", 0x8915}, +++{"linux/sockios.h", "SIOCSIFADDR", 0x8916}, +++{"linux/sockios.h", "SIOCGIFDSTADDR", 0x8917}, +++{"linux/sockios.h", "SIOCSIFDSTADDR", 0x8918}, +++{"linux/sockios.h", "SIOCGIFBRDADDR", 0x8919}, +++{"linux/sockios.h", "SIOCSIFBRDADDR", 0x891a}, +++{"linux/sockios.h", "SIOCGIFNETMASK", 0x891b}, +++{"linux/sockios.h", "SIOCSIFNETMASK", 0x891c}, +++{"linux/sockios.h", "SIOCGIFMETRIC", 0x891d}, +++{"linux/sockios.h", "SIOCSIFMETRIC", 0x891e}, +++{"linux/sockios.h", "SIOCGIFMEM", 0x891f}, +++{"linux/sockios.h", "SIOCSIFMEM", 0x8920}, +++{"linux/sockios.h", "SIOCGIFMTU", 0x8921}, +++{"linux/sockios.h", "SIOCSIFMTU", 0x8922}, +++{"linux/sockios.h", "SIOCSIFNAME", 0x8923}, +++{"linux/sockios.h", "SIOCSIFHWADDR", 0x8924}, +++{"linux/sockios.h", "SIOCGIFENCAP", 0x8925}, +++{"linux/sockios.h", "SIOCSIFENCAP", 0x8926}, +++{"linux/sockios.h", "SIOCGIFHWADDR", 0x8927}, +++{"linux/sockios.h", "SIOCGIFSLAVE", 0x8929}, +++{"linux/sockios.h", "SIOCSIFSLAVE", 0x8930}, +++{"linux/sockios.h", "SIOCADDMULTI", 0x8931}, +++{"linux/sockios.h", "SIOCDELMULTI", 0x8932}, +++{"linux/sockios.h", "SIOCGIFINDEX", 0x8933}, +++{"linux/sockios.h", "SIOCSIFPFLAGS", 0x8934}, +++{"linux/sockios.h", "SIOCGIFPFLAGS", 0x8935}, +++{"linux/sockios.h", "SIOCDIFADDR", 0x8936}, +++{"linux/sockios.h", "SIOCSIFHWBROADCAST", 0x8937}, +++{"linux/sockios.h", "SIOCGIFCOUNT", 0x8938}, +++{"linux/sockios.h", "SIOCGIFBR", 0x8940}, +++{"linux/sockios.h", "SIOCSIFBR", 0x8941}, +++{"linux/sockios.h", "SIOCGIFTXQLEN", 0x8942}, +++{"linux/sockios.h", "SIOCSIFTXQLEN", 0x8943}, +++{"linux/sockios.h", "SIOCGIFDIVERT", 0x8944}, +++{"linux/sockios.h", "SIOCSIFDIVERT", 0x8945}, +++{"linux/sockios.h", "SIOCETHTOOL", 0x8946}, +++{"linux/sockios.h", "SIOCGMIIPHY", 0x8947}, +++{"linux/sockios.h", "SIOCGMIIREG", 0x8948}, +++{"linux/sockios.h", "SIOCSMIIREG", 0x8949}, +++{"linux/sockios.h", "SIOCWANDEV", 0x894a}, +++{"linux/sockios.h", "SIOCDARP", 0x8953}, +++{"linux/sockios.h", "SIOCGARP", 0x8954}, +++{"linux/sockios.h", "SIOCSARP", 0x8955}, +++{"linux/sockios.h", "SIOCDRARP", 0x8960}, +++{"linux/sockios.h", "SIOCGRARP", 0x8961}, +++{"linux/sockios.h", "SIOCSRARP", 0x8962}, +++{"linux/sockios.h", "SIOCGIFMAP", 0x8970}, +++{"linux/sockios.h", "SIOCSIFMAP", 0x8971}, +++{"linux/sockios.h", "SIOCADDDLCI", 0x8980}, +++{"linux/sockios.h", "SIOCDELDLCI", 0x8981}, +++{"linux/sockios.h", "SIOCGIFVLAN", 0x8982}, +++{"linux/sockios.h", "SIOCSIFVLAN", 0x8983}, +++{"linux/sockios.h", "SIOCBONDENSLAVE", 0x8990}, +++{"linux/sockios.h", "SIOCBONDRELEASE", 0x8991}, +++{"linux/sockios.h", "SIOCBONDSETHWADDR", 0x8992}, +++{"linux/sockios.h", "SIOCBONDSLAVEINFOQUERY", 0x8993}, +++{"linux/sockios.h", "SIOCBONDINFOQUERY", 0x8994}, +++{"linux/sockios.h", "SIOCBONDCHANGEACTIVE", 0x8995}, +++{"linux/sockios.h", "SIOCBRADDBR", 0x89a0}, +++{"linux/sockios.h", "SIOCBRDELBR", 0x89a1}, +++{"linux/sockios.h", "SIOCBRADDIF", 0x89a2}, +++{"linux/sockios.h", "SIOCBRDELIF", 0x89a3}, +++{"linux/sockios.h", "SIOCPROTOPRIVATE", 0x89e0}, +++{"linux/sockios.h", "SIOCDEVPRIVATE", 0x89f0}, +++{"linux/auto_fs.h", "AUTOFS_IOC_READY", 0x9360}, +++{"linux/auto_fs.h", "AUTOFS_IOC_FAIL", 0x9361}, +++{"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362}, +++{"linux/nbd.h", "NBD_SET_SOCK", 0xab00}, +++{"linux/nbd.h", "NBD_SET_BLKSIZE", 0xab01}, +++{"linux/nbd.h", "NBD_SET_SIZE", 0xab02}, +++{"linux/nbd.h", "NBD_DO_IT", 0xab03}, +++{"linux/nbd.h", "NBD_CLEAR_SOCK", 0xab04}, +++{"linux/nbd.h", "NBD_CLEAR_QUE", 0xab05}, +++{"linux/nbd.h", "NBD_PRINT_DEBUG", 0xab06}, +++{"linux/nbd.h", "NBD_SET_SIZE_BLOCKS", 0xab07}, +++{"linux/nbd.h", "NBD_DISCONNECT", 0xab08}, +++{"linux/raw.h", "RAW_SETBIND", 0xac00}, +++{"linux/raw.h", "RAW_GETBIND", 0xac01}, +++{"linux/if_pppox.h", "PPPOEIOCDFWD", 0xb101}, +++{"linux/cyclades.h", "CYGETMON", 0x435901}, +++{"linux/cyclades.h", "CYGETTHRESH", 0x435902}, +++{"linux/cyclades.h", "CYSETTHRESH", 0x435903}, +++{"linux/cyclades.h", "CYGETDEFTHRESH", 0x435904}, +++{"linux/cyclades.h", "CYSETDEFTHRESH", 0x435905}, +++{"linux/cyclades.h", "CYGETTIMEOUT", 0x435906}, +++{"linux/cyclades.h", "CYSETTIMEOUT", 0x435907}, +++{"linux/cyclades.h", "CYGETDEFTIMEOUT", 0x435908}, +++{"linux/cyclades.h", "CYSETDEFTIMEOUT", 0x435909}, +++{"linux/cyclades.h", "CYSETRFLOW", 0x43590a}, +++{"linux/cyclades.h", "CYGETRFLOW", 0x43590b}, +++{"linux/cyclades.h", "CYSETRTSDTR_INV", 0x43590c}, +++{"linux/cyclades.h", "CYGETRTSDTR_INV", 0x43590d}, +++{"linux/cyclades.h", "CYZSETPOLLCYCLE", 0x43590e}, +++{"linux/cyclades.h", "CYZGETPOLLCYCLE", 0x43590f}, +++{"linux/cyclades.h", "CYGETCD1400VER", 0x435910}, +++{"linux/cyclades.h", "CYGETCARDINFO", 0x435911}, +++{"linux/cyclades.h", "CYSETWAIT", 0x435912}, +++{"linux/cyclades.h", "CYGETWAIT", 0x435913}, +++{"linux/videodev2.h", "VIDIOC_S_PRIORITY", 0x40015644}, +++{"linux/ppdev.h", "PPWCONTROL", 0x40017084}, +++{"linux/ppdev.h", "PPWDATA", 0x40017086}, +++{"linux/ppdev.h", "PPWCTLONIRQ", 0x40017092}, +++{"linux/telephony.h", "PHONE_MAXRINGS", 0x40017185}, +++{"linux/telephony.h", "PHONE_PLAY_TONE", 0x4001719b}, +++{"linux/sonypi.h", "SONYPI_IOCSBRT", 0x40017600}, +++{"linux/sonypi.h", "SONYPI_IOCSBLUE", 0x40017609}, +++{"linux/sonypi.h", "SONYPI_IOCSFAN", 0x4001760b}, +++{"linux/atmdev.h", "ATM_SETBACKEND", 0x400261f2}, +++{"linux/atmdev.h", "ATM_NEWBACKENDIF", 0x400261f3}, +++{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40026e02}, +++{"linux/ppdev.h", "PPFCONTROL", 0x4002708e}, +++{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186}, +++{"linux/fs.h", "BLKBSZSET", 0x40041271}, +++{"linux/radeonfb.h", "FBIO_RADEON_SET_MIRROR", 0x40044004}, +++{"linux/agpgart.h", "AGPIOC_SETUP", 0x40044103}, +++{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40044104}, +++{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40044105}, +++{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107}, +++{"linux/agpgart.h", "AGPIOC_BIND", 0x40044108}, +++{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40044109}, +++{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40044202}, +++{"linux/cciss_ioctl.h", "CCISS_REGNEWDISK", 0x4004420d}, +++{"linux/input.h", "EVIOCRMFF", 0x40044581}, +++{"linux/input.h", "EVIOCGRAB", 0x40044590}, +++{"linux/matroxfb.h", "FBIO_WAITFORVSYNC", 0x40044620}, +++{"linux/hiddev.h", "HIDIOCSFLAG", 0x4004480f}, +++{"mtd/mtd-abi.h", "OTPGETREGIONCOUNT", 0x40044d0e}, +++{"linux/ticable.h", "IOCTL_TIUSB_TIMEOUT", 0x40044e20}, +++{"linux/ticable.h", "IOCTL_TIUSB_RESET_DEVICE", 0x40044e21}, +++{"linux/ticable.h", "IOCTL_TIUSB_RESET_PIPES", 0x40044e22}, +++{"linux/random.h", "RNDADDTOENTCNT", 0x40045201}, +++{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431}, +++{"linux/if_tun.h", "TUNSETNOCSUM", 0x400454c8}, +++{"linux/if_tun.h", "TUNSETDEBUG", 0x400454c9}, +++{"linux/if_tun.h", "TUNSETIFF", 0x400454ca}, +++{"linux/if_tun.h", "TUNSETPERSIST", 0x400454cb}, +++{"linux/if_tun.h", "TUNSETOWNER", 0x400454cc}, +++{"linux/if_tun.h", "TUNSETLINK", 0x400454cd}, +++{"linux/uinput.h", "UI_SET_EVBIT", 0x40045564}, +++{"linux/uinput.h", "UI_SET_KEYBIT", 0x40045565}, +++{"linux/uinput.h", "UI_SET_RELBIT", 0x40045566}, +++{"linux/uinput.h", "UI_SET_ABSBIT", 0x40045567}, +++{"linux/uinput.h", "UI_SET_MSCBIT", 0x40045568}, +++{"linux/uinput.h", "UI_SET_LEDBIT", 0x40045569}, +++{"linux/uinput.h", "UI_SET_SNDBIT", 0x4004556a}, +++{"linux/uinput.h", "UI_SET_FFBIT", 0x4004556b}, +++{"linux/uinput.h", "UI_SET_PHYS", 0x4004556c}, +++{"linux/uinput.h", "UI_SET_SWBIT", 0x4004556d}, +++{"linux/videodev2.h", "VIDIOC_OVERLAY", 0x4004560e}, +++{"linux/videodev2.h", "VIDIOC_STREAMON", 0x40045612}, +++{"linux/videodev2.h", "VIDIOC_STREAMOFF", 0x40045613}, +++{"linux/atmdev.h", "ATM_SETSC", 0x400461f1}, +++{"linux/atmdev.h", "ATM_DROPPARTY", 0x400461f5}, +++{"linux/cm4000_cs.h", "CM_IOCSPTS", 0x40046302}, +++{"linux/chio.h", "CHIOSPICKER", 0x40046305}, +++{"linux/cm4000_cs.h", "CM_IOSDBGLVL", 0x400463fa}, +++{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403}, +++{"linux/video_decoder.h", "DECODER_SET_INPUT", 0x40046404}, +++{"linux/video_decoder.h", "DECODER_SET_OUTPUT", 0x40046405}, +++{"linux/video_decoder.h", "DECODER_ENABLE_OUTPUT", 0x40046406}, +++{"linux/video_decoder.h", "DECODER_SET_GPIO", 0x40046408}, +++{"linux/video_decoder.h", "DECODER_SET_VBI_BYPASS", 0x4004640a}, +++{"linux/video_encoder.h", "ENCODER_SET_NORM", 0x40046502}, +++{"linux/video_encoder.h", "ENCODER_SET_INPUT", 0x40046503}, +++{"linux/video_encoder.h", "ENCODER_SET_OUTPUT", 0x40046504}, +++{"linux/video_encoder.h", "ENCODER_ENABLE_OUTPUT", 0x40046505}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETFLAGS", 0x40046602}, +++{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40046602}, +++{"linux/iflags.h", "IFLAGS_SET_IOC", 0x40046602}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION", 0x40046604}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETRSVSZ", 0x40046606}, +++{"linux/ext3_fs.h", "EXT3_IOC_GROUP_EXTEND", 0x40046607}, +++{"linux/hpet.h", "HPET_IRQFREQ", 0x40046806}, +++{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40046e02}, +++{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06}, +++{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c}, +++{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40046ef8}, +++{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40046efa}, +++{"linux/rtc.h", "RTC_IRQP_SET", 0x4004700c}, +++{"linux/rtc.h", "RTC_EPOCH_SET", 0x4004700e}, +++{"linux/ppdev.h", "PPSETMODE", 0x40047080}, +++{"linux/ppdev.h", "PPDATADIR", 0x40047090}, +++{"linux/ppdev.h", "PPNEGOT", 0x40047091}, +++{"linux/ppdev.h", "PPSETPHASE", 0x40047094}, +++{"linux/ppdev.h", "PPSETFLAGS", 0x4004709b}, +++{"linux/ticable.h", "IOCTL_TISER_DELAY", 0x400470a0}, +++{"linux/ticable.h", "IOCTL_TISER_TIMEOUT", 0x400470a1}, +++{"linux/ticable.h", "IOCTL_TIPAR_DELAY", 0x400470a8}, +++{"linux/ticable.h", "IOCTL_TIPAR_TIMEOUT", 0x400470a9}, +++{"linux/serio.h", "SPIOCSTYPE", 0x40047101}, +++{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40047182}, +++{"linux/telephony.h", "PHONE_RING_START", 0x40047187}, +++{"linux/telephony.h", "PHONE_REC_CODEC", 0x40047189}, +++{"linux/telephony.h", "PHONE_REC_DEPTH", 0x4004718c}, +++{"linux/telephony.h", "PHONE_FRAME", 0x4004718d}, +++{"linux/telephony.h", "PHONE_REC_VOLUME", 0x4004718e}, +++{"linux/telephony.h", "PHONE_PLAY_CODEC", 0x40047190}, +++{"linux/telephony.h", "PHONE_PLAY_DEPTH", 0x40047193}, +++{"linux/telephony.h", "PHONE_PLAY_VOLUME", 0x40047194}, +++{"linux/telephony.h", "PHONE_DTMF_OOB", 0x40047199}, +++{"linux/telephony.h", "PHONE_SET_TONE_ON_TIME", 0x4004719c}, +++{"linux/telephony.h", "PHONE_SET_TONE_OFF_TIME", 0x4004719d}, +++{"linux/telephony.h", "PHONE_PSTN_SET_STATE", 0x400471a4}, +++{"linux/telephony.h", "PHONE_WINK_DURATION", 0x400471a6}, +++{"linux/telephony.h", "PHONE_VAD", 0x400471a9}, +++{"linux/telephony.h", "PHONE_WINK", 0x400471aa}, +++{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400471c7}, +++{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8}, +++{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400471c9}, +++{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400471ca}, +++{"linux/ixjuser.h", "IXJCTL_AEC_START", 0x400471cb}, +++{"linux/ixjuser.h", "IXJCTL_SET_LED", 0x400471ce}, +++{"linux/ixjuser.h", "IXJCTL_MIXER", 0x400471cf}, +++{"linux/ixjuser.h", "IXJCTL_DAA_COEFF_SET", 0x400471d0}, +++{"linux/ixjuser.h", "IXJCTL_PORT", 0x400471d1}, +++{"linux/ixjuser.h", "IXJCTL_DAA_AGAIN", 0x400471d2}, +++{"linux/ixjuser.h", "IXJCTL_POTS_PSTN", 0x400471d5}, +++{"linux/ixjuser.h", "IXJCTL_FILTER_CADENCE", 0x400471d6}, +++{"linux/ixjuser.h", "IXJCTL_CIDCW", 0x400471d9}, +++{"linux/telephony.h", "PHONE_REC_VOLUME_LINEAR", 0x400471db}, +++{"linux/telephony.h", "PHONE_PLAY_VOLUME_LINEAR", 0x400471dc}, +++{"linux/ixjuser.h", "IXJCTL_SET_FILTER_RAW", 0x400471dd}, +++{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0}, +++{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1}, +++{"linux/ixjuser.h", "IXJCTL_DTMF_PRESCALE", 0x400471e8}, +++{"linux/ixjuser.h", "IXJCTL_SIGCTL", 0x400471e9}, +++{"linux/ixjuser.h", "IXJCTL_SC_RXG", 0x400471ea}, +++{"linux/ixjuser.h", "IXJCTL_SC_TXG", 0x400471eb}, +++{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd}, +++{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe}, +++{"linux/msdos_fs.h", "FAT_IOCTL_SET_ATTRIBUTES", 0x40047211}, +++{"linux/if_ppp.h", "PPPIOCATTCHAN", 0x40047438}, +++{"linux/if_ppp.h", "PPPIOCCONNECT", 0x4004743a}, +++{"linux/if_ppp.h", "PPPIOCSMRRU", 0x4004743b}, +++{"linux/if_ppp.h", "PPPIOCDETACH", 0x4004743c}, +++{"linux/if_ppp.h", "PPPIOCATTACH", 0x4004743d}, +++{"linux/if_ppp.h", "PPPIOCSDEBUG", 0x40047440}, +++{"linux/if_ppp.h", "PPPIOCSMAXCID", 0x40047451}, +++{"linux/if_ppp.h", "PPPIOCSMRU", 0x40047452}, +++{"linux/if_ppp.h", "PPPIOCSRASYNCMAP", 0x40047454}, +++{"linux/if_ppp.h", "PPPIOCSASYNCMAP", 0x40047457}, +++{"linux/if_ppp.h", "PPPIOCSFLAGS", 0x40047459}, +++{"linux/isdn_ppp.h", "PPPIOCBUNDLE", 0x40047481}, +++{"linux/isdn_ppp.h", "PPPIOCSMPFLAGS", 0x40047483}, +++{"linux/isdn_ppp.h", "PPPIOCSMPMTU", 0x40047484}, +++{"linux/isdn_ppp.h", "PPPIOCSMPMRU", 0x40047485}, +++{"linux/isdn_ppp.h", "PPPIOCSCOMPRESSOR", 0x40047487}, +++{"linux/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40047602}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION_OLD", 0x40047602}, +++{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608}, +++{"linux/videodev.h", "VIDIOCSFREQ", 0x4004760f}, +++{"linux/videodev.h", "VIDIOCSYNC", 0x40047612}, +++{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619}, +++{"linux/meye.h", "MEYEIOC_QBUF_CAPT", 0x400476c2}, +++{"linux/videotext.h", "VTXIOCSETVIRT", 0x4004810c}, +++{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0}, +++{"linux/dn.h", "SIOCSNETADDR", 0x400489e0}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366}, +++{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4004b100}, +++{"linux/gigaset_dev.h", "GIGASET_BRKCHARS", 0x40064702}, +++{"linux/meye.h", "MEYEIOC_S_PARAMS", 0x400676c1}, +++{"linux/cciss_ioctl.h", "CCISS_SETINTINFO", 0x40084203}, +++{"linux/input.h", "EVIOCSREP", 0x40084503}, +++{"linux/input.h", "EVIOCSKEYCODE", 0x40084504}, +++{"mtd/mtd-abi.h", "MEMERASE", 0x40084d02}, +++{"mtd/mtd-abi.h", "MEMLOCK", 0x40084d05}, +++{"mtd/mtd-abi.h", "MEMUNLOCK", 0x40084d06}, +++{"mtd/mtd-abi.h", "MEMGETBADBLOCK", 0x40084d0b}, +++{"mtd/mtd-abi.h", "MEMSETBADBLOCK", 0x40084d0c}, +++{"linux/random.h", "RNDADDENTROPY", 0x40085203}, +++{"linux/videodev2.h", "VIDIOC_S_STD", 0x40085618}, +++{"linux/videodev2.h", "VIDIOC_S_CTRL_OLD", 0x4008561c}, +++{"linux/atmdev.h", "ATM_GETNAMES", 0x40086183}, +++{"linux/atmdev.h", "ATM_ADDPARTY", 0x400861f4}, +++{"linux/chio.h", "CHIOGSTATUS", 0x40086308}, +++{"linux/video_decoder.h", "DECODER_INIT", 0x40086409}, +++{"linux/mtio.h", "MTIOCTOP", 0x40086d01}, +++{"linux/ppdev.h", "PPSETTIME", 0x40087096}, +++{"linux/if_ppp.h", "PPPIOCSACTIVE", 0x40087446}, +++{"linux/if_ppp.h", "PPPIOCSPASS", 0x40087447}, +++{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b}, +++{"linux/fd.h", "FDFMTTRK", 0x400c0248}, +++{"linux/capi.h", "CAPI_REGISTER", 0x400c4301}, +++{"linux/hiddev.h", "HIDIOCGREPORT", 0x400c4807}, +++{"linux/hiddev.h", "HIDIOCSREPORT", 0x400c4808}, +++{"mtd/mtd-abi.h", "OTPGETREGIONINFO", 0x400c4d0f}, +++{"linux/uinput.h", "UI_END_FF_ERASE", 0x400c55cb}, +++{"linux/ite_gpio.h", "ITE_GPIO_OUT", 0x400c5a01}, +++{"linux/ite_gpio.h", "ITE_GPIO_INT_CTRL", 0x400c5a02}, +++{"linux/ite_gpio.h", "ITE_GPIO_IN_STATUS", 0x400c5a03}, +++{"linux/ite_gpio.h", "ITE_GPIO_OUT_STATUS", 0x400c5a04}, +++{"linux/ite_gpio.h", "ITE_GPIO_GEN_CTRL", 0x400c5a05}, +++{"linux/ite_gpio.h", "ITE_GPIO_INT_WAIT", 0x400c5a06}, +++{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x400c6132}, +++{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x400c6133}, +++{"linux/atmdev.h", "ATM_GETSTAT", 0x400c6150}, +++{"linux/atmdev.h", "ATM_GETSTATZ", 0x400c6151}, +++{"linux/atmdev.h", "ATM_GETLOOP", 0x400c6152}, +++{"linux/atmdev.h", "ATM_SETLOOP", 0x400c6153}, +++{"linux/atmdev.h", "ATM_QUERYLOOP", 0x400c6154}, +++{"linux/atm_eni.h", "ENI_MEMDUMP", 0x400c6160}, +++{"linux/atm_he.h", "HE_GET_REG", 0x400c6160}, +++{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x400c6161}, +++{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x400c6162}, +++{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x400c6162}, +++{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x400c6163}, +++{"linux/atm_eni.h", "ENI_SETMULT", 0x400c6167}, +++{"linux/atmdev.h", "ATM_GETLINKRATE", 0x400c6181}, +++{"linux/atmdev.h", "ATM_GETTYPE", 0x400c6184}, +++{"linux/atmdev.h", "ATM_GETESI", 0x400c6185}, +++{"linux/atmdev.h", "ATM_GETADDR", 0x400c6186}, +++{"linux/atmdev.h", "ATM_RSTADDR", 0x400c6187}, +++{"linux/atmdev.h", "ATM_ADDADDR", 0x400c6188}, +++{"linux/atmdev.h", "ATM_DELADDR", 0x400c6189}, +++{"linux/atmdev.h", "ATM_GETCIRANGE", 0x400c618a}, +++{"linux/atmdev.h", "ATM_SETCIRANGE", 0x400c618b}, +++{"linux/atmdev.h", "ATM_SETESI", 0x400c618c}, +++{"linux/atmdev.h", "ATM_SETESIF", 0x400c618d}, +++{"linux/atmdev.h", "ATM_ADDLECSADDR", 0x400c618e}, +++{"linux/atmdev.h", "ATM_DELLECSADDR", 0x400c618f}, +++{"linux/atmdev.h", "ATM_GETLECSADDR", 0x400c6190}, +++{"linux/chio.h", "CHIOPOSITION", 0x400c6303}, +++{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a}, +++{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08}, +++{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x400c744d}, +++{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618}, +++{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407}, +++{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607}, +++{"linux/cciss_ioctl.h", "CCISS_SETNODENAME", 0x40104205}, +++{"linux/synclink.h", "MGSL_IOCSGPIO", 0x40106d10}, +++{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613}, +++{"linux/fd.h", "FDSETMAXERRS", 0x4014024c}, +++{"linux/videodev2.h", "VIDIOC_S_CROP", 0x4014563c}, +++{"linux/chio.h", "CHIOMOVE", 0x40146301}, +++{"linux/videodev.h", "VIDIOCSFBUF", 0x4014760c}, +++{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617}, +++{"linux/hiddev.h", "HIDIOCSUSAGE", 0x4018480c}, +++{"linux/hiddev.h", "HIDIOCGCOLLECTIONINDEX", 0x40184810}, +++{"linux/ext3_fs.h", "EXT3_IOC_GROUP_ADD", 0x40186608}, +++{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4018761b}, +++{"linux/fd.h", "FDSETPRM", 0x401c0242}, +++{"linux/fd.h", "FDDEFPRM", 0x401c0243}, +++{"linux/atmbr2684.h", "BR2684_SETFILT", 0x401c6190}, +++{"linux/chio.h", "CHIOEXCHANGE", 0x401c6302}, +++{"linux/rtc.h", "RTC_PLL_SET", 0x401c7012}, +++{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40206d00}, +++{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f}, +++{"linux/videodev.h", "VIDIOCSWIN", 0x4020760a}, +++{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d}, +++{"linux/videotext.h", "VTXIOCCLRPAGE", 0x40208102}, +++{"linux/videotext.h", "VTXIOCCLRFOUND", 0x40208103}, +++{"linux/videotext.h", "VTXIOCPAGEREQ", 0x40208104}, +++{"linux/videotext.h", "VTXIOCGETSTAT", 0x40208105}, +++{"linux/videotext.h", "VTXIOCGETPAGE", 0x40208106}, +++{"linux/videotext.h", "VTXIOCSTOPDAU", 0x40208107}, +++{"linux/joystick.h", "JSIOCSCORR", 0x40246a21}, +++{"linux/rtc.h", "RTC_ALM_SET", 0x40247007}, +++{"linux/rtc.h", "RTC_SET_TIME", 0x4024700a}, +++{"linux/rtc.h", "RTC_WKALM_SET", 0x4028700f}, +++{"linux/smb_fs.h", "SMB_IOC_NEWCONN", 0x40287502}, +++{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611}, +++{"linux/videodev2.h", "VIDIOC_S_FBUF", 0x402c560b}, +++{"linux/videodev2.h", "VIDIOC_S_FREQUENCY", 0x402c5639}, +++{"linux/chio.h", "CHIOSVOLTAG", 0x40306312}, +++{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603}, +++{"linux/uinput.h", "UI_END_FF_UPLOAD", 0x403455c9}, +++{"linux/videodev2.h", "VIDIOC_S_AUDIO", 0x40345622}, +++{"linux/videodev2.h", "VIDIOC_S_AUDOUT", 0x40345632}, +++{"linux/videodev.h", "VIDIOCSTUNER", 0x40347605}, +++{"linux/joystick.h", "JSIOCSAXMAP", 0x40406a31}, +++{"linux/videodev2.h", "VIDIOC_S_MODULATOR", 0x40445637}, +++{"linux/videodev2.h", "VIDIOC_S_TUNER", 0x4054561e}, +++{"linux/fd.h", "FDSETDRVPRM", 0x40580290}, +++{"linux/chio.h", "CHIOGELEM", 0x406c6310}, +++{"linux/videodev2.h", "VIDIOC_S_JPEGCOMP", 0x408c563e}, +++{"mtd/mtd-abi.h", "MEMSETOOBSEL", 0x40c84d09}, +++{"linux/videodev2.h", "VIDIOC_S_PARM_OLD", 0x40cc5616}, +++{"linux/joystick.h", "JSIOCSBTNMAP", 0x42006a33}, +++{"linux/hiddev.h", "HIDIOCSUSAGES", 0x501c4814}, +++{"linux/videodev2.h", "VIDIOC_G_PRIORITY", 0x80015643}, +++{"linux/joystick.h", "JSIOCGAXES", 0x80016a11}, +++{"linux/joystick.h", "JSIOCGBUTTONS", 0x80016a12}, +++{"linux/ppdev.h", "PPRSTATUS", 0x80017081}, +++{"linux/ppdev.h", "PPRCONTROL", 0x80017083}, +++{"linux/ppdev.h", "PPRDATA", 0x80017085}, +++{"linux/sonypi.h", "SONYPI_IOCGBRT", 0x80017600}, +++{"linux/sonypi.h", "SONYPI_IOCGBATFLAGS", 0x80017607}, +++{"linux/sonypi.h", "SONYPI_IOCGBLUE", 0x80017608}, +++{"linux/sonypi.h", "SONYPI_IOCGFAN", 0x8001760a}, +++{"linux/sonypi.h", "SONYPI_IOCGTEMP", 0x8001760c}, +++{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321}, +++{"linux/capi.h", "CAPI_INSTALLED", 0x80024322}, +++{"linux/ipmi.h", "IPMICTL_REGISTER_FOR_CMD", 0x8002690e}, +++{"linux/ipmi.h", "IPMICTL_UNREGISTER_FOR_CMD", 0x8002690f}, +++{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80027501}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT1CAP", 0x80027602}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT1REM", 0x80027603}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT2CAP", 0x80027604}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT2REM", 0x80027605}, +++{"linux/fs.h", "BLKBSZGET", 0x80041270}, +++{"linux/fs.h", "BLKGETSIZE64", 0x80041272}, +++{"linux/radeonfb.h", "FBIO_RADEON_GET_MIRROR", 0x80044003}, +++{"linux/agpgart.h", "AGPIOC_INFO", 0x80044100}, +++{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80044201}, +++{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80044203}, +++{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80044204}, +++{"linux/pmu.h", "PMU_IOC_CAN_SLEEP", 0x80044205}, +++{"linux/pmu.h", "PMU_IOC_GRAB_BACKLIGHT", 0x80044206}, +++{"linux/cciss_ioctl.h", "CCISS_GETHEARTBEAT", 0x80044206}, +++{"linux/cciss_ioctl.h", "CCISS_GETBUSTYPES", 0x80044207}, +++{"linux/cciss_ioctl.h", "CCISS_GETFIRMVER", 0x80044208}, +++{"linux/cciss_ioctl.h", "CCISS_GETDRIVVER", 0x80044209}, +++{"linux/capi.h", "CAPI_GET_FLAGS", 0x80044323}, +++{"linux/capi.h", "CAPI_SET_FLAGS", 0x80044324}, +++{"linux/capi.h", "CAPI_CLR_FLAGS", 0x80044325}, +++{"linux/capi.h", "CAPI_NCCI_OPENCOUNT", 0x80044326}, +++{"linux/capi.h", "CAPI_NCCI_GETUNIT", 0x80044327}, +++{"linux/input.h", "EVIOCGVERSION", 0x80044501}, +++{"linux/input.h", "EVIOCGEFFECTS", 0x80044584}, +++{"linux/arcfb.h", "FBIO_GETCONTROL2", 0x80044689}, +++{"linux/hiddev.h", "HIDIOCGVERSION", 0x80044801}, +++{"linux/hiddev.h", "HIDIOCGFLAG", 0x8004480e}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x80044d00}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x80044d01}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x80044d02}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x80044d03}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x80044d04}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x80044d05}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x80044d06}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x80044d07}, +++{"mtd/mtd-abi.h", "MEMGETREGIONCOUNT", 0x80044d07}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x80044d08}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x80044d09}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x80044d0a}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x80044d0b}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x80044d0c}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x80044d0d}, +++{"mtd/mtd-abi.h", "OTPSELECT", 0x80044d0d}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x80044d0e}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x80044d0f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x80044d10}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x80044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x80044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x80044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x80044dfb}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x80044dfc}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x80044dfd}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x80044dfe}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x80044dff}, +++{"linux/ticable.h", "IOCTL_TIUSB_GET_MAXPS", 0x80044e23}, +++{"linux/ticable.h", "IOCTL_TIUSB_GET_DEVID", 0x80044e24}, +++{"linux/random.h", "RNDGETENTCNT", 0x80045200}, +++{"asm/ioctls.h", "TIOCGPTN", 0x80045430}, +++{"linux/videodev2.h", "VIDIOC_G_INPUT", 0x80045626}, +++{"linux/videodev2.h", "VIDIOC_G_OUTPUT", 0x8004562e}, +++{"linux/watchdog.h", "WDIOC_GETSTATUS", 0x80045701}, +++{"linux/watchdog.h", "WDIOC_GETBOOTSTATUS", 0x80045702}, +++{"linux/watchdog.h", "WDIOC_GETTEMP", 0x80045703}, +++{"linux/watchdog.h", "WDIOC_SETOPTIONS", 0x80045704}, +++{"linux/watchdog.h", "WDIOC_KEEPALIVE", 0x80045705}, +++{"linux/watchdog.h", "WDIOC_GETTIMEOUT", 0x80045707}, +++{"linux/watchdog.h", "WDIOC_GETPRETIMEOUT", 0x80045709}, +++{"linux/watchdog.h", "WDIOC_GETTIMELEFT", 0x8004570a}, +++{"linux/sonet.h", "SONET_GETDIAG", 0x80046114}, +++{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116}, +++{"linux/cm4000_cs.h", "CM_IOCGSTATUS", 0x80046300}, +++{"linux/chio.h", "CHIOGPICKER", 0x80046304}, +++{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402}, +++{"linux/iflags.h", "IFLAGS_GET_IOC", 0x80046601}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETFLAGS", 0x80046601}, +++{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80046601}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION", 0x80046603}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETRSVSZ", 0x80046605}, +++{"linux/ext3_fs.h", "EXT3_IOC_WAIT_FOR_READONLY", 0x80046663}, +++{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908}, +++{"linux/ipmi.h", "IPMICTL_SET_GETS_EVENTS_CMD", 0x80046910}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_ADDRESS_CMD", 0x80046911}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_ADDRESS_CMD", 0x80046912}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_LUN_CMD", 0x80046913}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_LUN_CMD", 0x80046914}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD", 0x80046918}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD", 0x80046919}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_LUN_CMD", 0x8004691a}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_LUN_CMD", 0x8004691b}, +++{"linux/i8k.h", "I8K_BIOS_VERSION", 0x80046980}, +++{"linux/i8k.h", "I8K_MACHINE_ID", 0x80046981}, +++{"linux/i8k.h", "I8K_POWER_STATUS", 0x80046982}, +++{"linux/i8k.h", "I8K_FN_STATUS", 0x80046983}, +++{"linux/i8k.h", "I8K_GET_TEMP", 0x80046984}, +++{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01}, +++{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40}, +++{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80046c41}, +++{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80046c42}, +++{"linux/mmtimer.h", "MMTIMER_GETRES", 0x80046d01}, +++{"linux/mmtimer.h", "MMTIMER_GETFREQ", 0x80046d02}, +++{"linux/mtio.h", "MTIOCPOS", 0x80046d03}, +++{"linux/mmtimer.h", "MMTIMER_GETCOUNTER", 0x80046d09}, +++{"linux/zftape.h", "MTIOC_ZFTAPE_GETBLKSZ", 0x80046d68}, +++{"linux/ncp_fs.h", "NCP_IOC_SIGN_WANTED", 0x80046e06}, +++{"linux/ncp_fs.h", "NCP_IOC_SETDENTRYTTL", 0x80046e0c}, +++{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80046ef8}, +++{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80046ef9}, +++{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80046efb}, +++{"linux/rtc.h", "RTC_IRQP_READ", 0x8004700b}, +++{"linux/rtc.h", "RTC_EPOCH_READ", 0x8004700d}, +++{"linux/ppdev.h", "PPCLRIRQ", 0x80047093}, +++{"linux/ppdev.h", "PPGETMODES", 0x80047097}, +++{"linux/ppdev.h", "PPGETMODE", 0x80047098}, +++{"linux/ppdev.h", "PPGETPHASE", 0x80047099}, +++{"linux/ppdev.h", "PPGETFLAGS", 0x8004709a}, +++{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80047181}, +++{"linux/telephony.h", "PHONE_DTMF_READY", 0x80047196}, +++{"linux/telephony.h", "PHONE_GET_DTMF", 0x80047197}, +++{"linux/telephony.h", "PHONE_GET_DTMF_ASCII", 0x80047198}, +++{"linux/telephony.h", "PHONE_EXCEPTION", 0x8004719a}, +++{"linux/ixjuser.h", "IXJCTL_CARDTYPE", 0x800471c1}, +++{"linux/ixjuser.h", "IXJCTL_SERIAL", 0x800471c2}, +++{"linux/ixjuser.h", "IXJCTL_DSP_TYPE", 0x800471c3}, +++{"linux/ixjuser.h", "IXJCTL_DSP_VERSION", 0x800471c4}, +++{"linux/ixjuser.h", "IXJCTL_CID", 0x800471d4}, +++{"linux/ixjuser.h", "IXJCTL_VMWI", 0x800471d8}, +++{"linux/ixjuser.h", "IXJCTL_VERSION", 0x800471da}, +++{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800471e2}, +++{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800471e3}, +++{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800471e4}, +++{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800471e5}, +++{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800471e6}, +++{"linux/msdos_fs.h", "FAT_IOCTL_GET_ATTRIBUTES", 0x80047210}, +++{"linux/if_ppp.h", "PPPIOCGCHAN", 0x80047437}, +++{"linux/if_ppp.h", "PPPIOCGDEBUG", 0x80047441}, +++{"linux/if_ppp.h", "PPPIOCGMRU", 0x80047453}, +++{"linux/if_ppp.h", "PPPIOCGRASYNCMAP", 0x80047455}, +++{"linux/if_ppp.h", "PPPIOCGUNIT", 0x80047456}, +++{"linux/if_ppp.h", "PPPIOCGASYNCMAP", 0x80047458}, +++{"linux/if_ppp.h", "PPPIOCGFLAGS", 0x8004745a}, +++{"linux/isdn_ppp.h", "PPPIOCGMPFLAGS", 0x80047482}, +++{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID32", 0x80047503}, +++{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80047601}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION_OLD", 0x80047601}, +++{"linux/videodev.h", "VIDIOCGFREQ", 0x8004760e}, +++{"linux/meye.h", "MEYEIOC_STILLJCAPT", 0x800476c5}, +++{"linux/dn.h", "SIOCGNETADDR", 0x800489e1}, +++{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1}, +++{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_PROTOSUBVER", 0x80049367}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_ASKREGHOST", 0x80049368}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_TOGGLEREGHOST", 0x80049369}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_ASKUMOUNT", 0x80049370}, +++{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117}, +++{"linux/meye.h", "MEYEIOC_G_PARAMS", 0x800676c0}, +++{"linux/cciss_ioctl.h", "CCISS_GETPCIINFO", 0x80084201}, +++{"linux/cciss_ioctl.h", "CCISS_GETINTINFO", 0x80084202}, +++{"linux/input.h", "EVIOCGID", 0x80084502}, +++{"linux/input.h", "EVIOCGREP", 0x80084503}, +++{"linux/input.h", "EVIOCGKEYCODE", 0x80084504}, +++{"linux/random.h", "RNDGETPOOL", 0x80085202}, +++{"linux/videodev2.h", "VIDIOC_G_STD", 0x80085617}, +++{"linux/videodev2.h", "VIDIOC_QUERYSTD", 0x8008563f}, +++{"linux/i2o-dev.h", "I2OPASSTHRU", 0x8008690c}, +++{"linux/i2o-dev.h", "I2OPASSTHRU32", 0x8008690c}, +++{"linux/ipmi.h", "IPMICTL_SET_TIMING_PARMS_CMD", 0x80086916}, +++{"linux/ipmi.h", "IPMICTL_GET_TIMING_PARMS_CMD", 0x80086917}, +++{"linux/mtio.h", "MTIOCGETSIZE", 0x80086d09}, +++{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80086e0a}, +++{"linux/ppdev.h", "PPGETTIME", 0x80087095}, +++{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8008743f}, +++{"linux/cciss_ioctl.h", "CCISS_GETLUNINFO", 0x800c4211}, +++{"mtd/mtd-abi.h", "OTPLOCK", 0x800c4d10}, +++{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401}, +++{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501}, +++{"linux/hpet.h", "HPET_INFO", 0x800c6803}, +++{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x800c6e01}, +++{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08}, +++{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x800c6e09}, +++{"linux/videodev.h", "VIDIOCKEY", 0x800c760d}, +++{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606}, +++{"linux/fd.h", "FDGETDRVTYP", 0x8010020f}, +++{"linux/cciss_ioctl.h", "CCISS_GETNODENAME", 0x80104204}, +++{"mtd/mtd-abi.h", "ECCGETSTATS", 0x80104d12}, +++{"linux/synclink.h", "MGSL_IOCGGPIO", 0x80106d11}, +++{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488}, +++{"linux/videotext.h", "VTXIOCGETINFO", 0x80108101}, +++{"linux/fd.h", "FDGETMAXERRS", 0x8014020e}, +++{"linux/chio.h", "CHIOGPARAMS", 0x80146306}, +++{"linux/ipmi.h", "IPMICTL_SEND_COMMAND", 0x8014690d}, +++{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08}, +++{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07}, +++{"linux/videodev.h", "VIDIOCGFBUF", 0x8014760b}, +++{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615}, +++{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616}, +++{"linux/fd.h", "FDWERRORGET", 0x80180217}, +++{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05}, +++{"linux/fd.h", "FDGETPRM", 0x801c0204}, +++{"linux/hiddev.h", "HIDIOCGDEVINFO", 0x801c4803}, +++{"linux/ipmi.h", "IPMICTL_SEND_COMMAND_SETTIME", 0x801c6915}, +++{"linux/mtio.h", "MTIOCGET", 0x801c6d02}, +++{"linux/rtc.h", "RTC_PLL_GET", 0x801c7011}, +++{"linux/fd.h", "FDGETFDCSTAT", 0x80200215}, +++{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612}, +++{"mtd/mtd-abi.h", "MEMGETINFO", 0x80204d01}, +++{"linux/i2o-dev.h", "I2OGETIOPS", 0x80206900}, +++{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80206d01}, +++{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450}, +++{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80207486}, +++{"linux/videodev.h", "VIDIOCGWIN", 0x80207609}, +++{"linux/videodev.h", "VIDIOCGVBIFMT", 0x8020761c}, +++{"linux/sonet.h", "SONET_GETSTAT", 0x80246110}, +++{"linux/sonet.h", "SONET_GETSTATZ", 0x80246111}, +++{"linux/joystick.h", "JSIOCGCORR", 0x80246a22}, +++{"linux/rtc.h", "RTC_ALM_READ", 0x80247008}, +++{"linux/rtc.h", "RTC_RD_TIME", 0x80247009}, +++{"linux/watchdog.h", "WDIOC_GETSUPPORT", 0x80285700}, +++{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010}, +++{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610}, +++{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b}, +++{"linux/videodev2.h", "VIDIOC_G_FBUF", 0x802c560a}, +++{"linux/videodev2.h", "VIDIOC_CROPCAP_OLD", 0x802c563a}, +++{"linux/fd.h", "FDGETDRVSTAT", 0x80340212}, +++{"linux/fd.h", "FDPOLLDRVSTAT", 0x80340213}, +++{"linux/videodev2.h", "VIDIOC_G_AUDIO", 0x80345621}, +++{"linux/videodev2.h", "VIDIOC_G_AUDOUT", 0x80345631}, +++{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601}, +++{"linux/joystick.h", "JSIOCGAXMAP", 0x80406a32}, +++{"linux/fd.h", "FDGETDRVPRM", 0x80580211}, +++{"linux/videodev2.h", "VIDIOC_QUERYCAP", 0x80685600}, +++{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b}, +++{"linux/chio.h", "CHIOGVPARAMS", 0x80706313}, +++{"linux/videodev2.h", "VIDIOC_G_SLICED_VBI_CAP", 0x80745645}, +++{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614}, +++{"linux/videodev2.h", "VIDIOC_G_JPEGCOMP", 0x808c563d}, +++{"mtd/mtd-abi.h", "MEMGETOOBSEL", 0x80c84d0a}, +++{"linux/hiddev.h", "HIDIOCGSTRING", 0x81044804}, +++{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365}, +++{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a}, +++{"mtd/mtd-abi.h", "ECCGETLAYOUT", 0x81484d11}, +++{"linux/joystick.h", "JSIOCGBTNMAP", 0x82006a34}, +++{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82187201}, +++{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82187202}, +++{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0044106}, +++{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306}, +++{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308}, +++{"linux/gigaset_dev.h", "GIGASET_REDIR", 0xc0044700}, +++{"linux/gigaset_dev.h", "GIGASET_CONFIG", 0xc0044701}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0xc0044d00}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0xc0044d01}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0xc0044d02}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0xc0044d03}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0xc0044d04}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0xc0044d05}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0xc0044d06}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0xc0044d07}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0xc0044d08}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0xc0044d09}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0xc0044d0a}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0xc0044d0b}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0xc0044d0c}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0xc0044d0d}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0xc0044d0e}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0xc0044d0f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0xc0044d10}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0xc0044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0xc0044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0xc0044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0xc0044dff}, +++{"linux/videodev2.h", "VIDIOC_OVERLAY_OLD", 0xc004560e}, +++{"linux/videodev2.h", "VIDIOC_S_INPUT", 0xc0045627}, +++{"linux/videodev2.h", "VIDIOC_S_OUTPUT", 0xc004562f}, +++{"linux/watchdog.h", "WDIOC_SETTIMEOUT", 0xc0045706}, +++{"linux/watchdog.h", "WDIOC_SETPRETIMEOUT", 0xc0045708}, +++{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112}, +++{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113}, +++{"linux/cm4000_cs.h", "CM_IOCGATR", 0xc0046301}, +++{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc004630a}, +++{"linux/i8k.h", "I8K_GET_SPEED", 0xc0046985}, +++{"linux/i8k.h", "I8K_GET_FAN", 0xc0046986}, +++{"linux/i8k.h", "I8K_SET_FAN", 0xc0046987}, +++{"linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", 0xc0046c43}, +++{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08}, +++{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0046efa}, +++{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00471a7}, +++{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e}, +++{"linux/toshiba.h", "TOSH_SMM", 0xc0047490}, +++{"linux/meye.h", "MEYEIOC_SYNC", 0xc00476c3}, +++{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0049364}, +++{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0084320}, +++{"linux/videodev2.h", "VIDIOC_G_CTRL", 0xc008561b}, +++{"linux/videodev2.h", "VIDIOC_S_CTRL", 0xc008561c}, +++{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0086e0a}, +++{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c}, +++{"linux/hiddev.h", "HIDIOCGREPORTINFO", 0xc00c4809}, +++{"mtd/mtd-abi.h", "MEMWRITEOOB", 0xc00c4d03}, +++{"mtd/mtd-abi.h", "MEMREADOOB", 0xc00c4d04}, +++{"linux/uinput.h", "UI_BEGIN_FF_ERASE", 0xc00c55ca}, +++{"linux/ite_gpio.h", "ITE_GPIO_IN", 0xc00c5a00}, +++{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc00c6161}, +++{"linux/i2o-dev.h", "I2OHRTGET", 0xc00c6901}, +++{"linux/i2o-dev.h", "I2OLCTGET", 0xc00c6902}, +++{"linux/mtio.h", "MTIOCFTFORMAT", 0xc00c6d0a}, +++{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc00c6e09}, +++{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307}, +++{"linux/gigaset_dev.h", "GIGASET_VERSION", 0xc0104703}, +++{"linux/hiddev.h", "HIDIOCGCOLLECTIONINFO", 0xc0104811}, +++{"mtd/mtd-abi.h", "MEMGETREGIONINFO", 0xc0104d08}, +++{"linux/videodev2.h", "VIDIOC_REQBUFS", 0xc0105608}, +++{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0106d06}, +++{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0106d07}, +++{"linux/synclink.h", "MGSL_IOCWAITGPIO", 0xc0106d12}, +++{"linux/videodev2.h", "VIDIOC_G_CROP", 0xc014563b}, +++{"linux/hiddev.h", "HIDIOCGUSAGE", 0xc018480b}, +++{"linux/hiddev.h", "HIDIOCGUCODE", 0xc018480d}, +++{"linux/videodev2.h", "VIDIOC_G_EXT_CTRLS", 0xc0185647}, +++{"linux/videodev2.h", "VIDIOC_S_EXT_CTRLS", 0xc0185648}, +++{"linux/videodev2.h", "VIDIOC_TRY_EXT_CTRLS", 0xc0185649}, +++{"linux/pktcdvd.h", "PACKET_CTRL_CMD", 0xc0185801}, +++{"linux/i2o-dev.h", "I2OPARMSET", 0xc0186903}, +++{"linux/i2o-dev.h", "I2OPARMGET", 0xc0186904}, +++{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG_TRUNC", 0xc018690b}, +++{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG", 0xc018690c}, +++{"linux/i2o-dev.h", "I2OSWDL", 0xc01c6905}, +++{"linux/i2o-dev.h", "I2OSWUL", 0xc01c6906}, +++{"linux/i2o-dev.h", "I2OSWDEL", 0xc01c6907}, +++{"linux/i2o-dev.h", "I2OHTML", 0xc01c6909}, +++{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b}, +++{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0246e04}, +++{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04}, +++{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b}, +++{"linux/videodev2.h", "VIDIOC_QUERYMENU", 0xc02c5625}, +++{"linux/videodev2.h", "VIDIOC_G_FREQUENCY", 0xc02c5638}, +++{"linux/videodev2.h", "VIDIOC_CROPCAP", 0xc02c563a}, +++{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602}, +++{"linux/uinput.h", "UI_BEGIN_FF_UPLOAD", 0xc03455c8}, +++{"linux/videodev2.h", "VIDIOC_G_AUDIO_OLD", 0xc0345621}, +++{"linux/videodev2.h", "VIDIOC_G_AUDOUT_OLD", 0xc0345631}, +++{"linux/videodev2.h", "VIDIOC_ENUMAUDIO", 0xc0345641}, +++{"linux/videodev2.h", "VIDIOC_ENUMAUDOUT", 0xc0345642}, +++{"linux/videodev.h", "VIDIOCGTUNER", 0xc0347604}, +++{"linux/hiddev.h", "HIDIOCGFIELDINFO", 0xc038480a}, +++{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309}, +++{"linux/videodev2.h", "VIDIOC_ENUM_FMT", 0xc0405602}, +++{"linux/videodev2.h", "VIDIOC_ENUMSTD", 0xc0405619}, +++{"linux/videodev2.h", "VIDIOC_QUERYBUF", 0xc0445609}, +++{"linux/videodev2.h", "VIDIOC_QBUF", 0xc044560f}, +++{"linux/videodev2.h", "VIDIOC_DQBUF", 0xc0445611}, +++{"linux/videodev2.h", "VIDIOC_QUERYCTRL", 0xc0445624}, +++{"linux/videodev2.h", "VIDIOC_G_MODULATOR", 0xc0445636}, +++{"linux/fb.h", "FBIO_CURSOR", 0xc0484608}, +++{"linux/videodev2.h", "VIDIOC_ENUMOUTPUT", 0xc0485630}, +++{"linux/videodev2.h", "VIDIOC_ENUMINPUT", 0xc04c561a}, +++{"linux/cciss_ioctl.h", "CCISS_PASSTHRU", 0xc054420b}, +++{"linux/videodev2.h", "VIDIOC_G_TUNER", 0xc054561d}, +++{"linux/cciss_ioctl.h", "CCISS_BIG_PASSTHRU", 0xc0584212}, +++{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480}, +++{"linux/videodev2.h", "VIDIOC_G_FMT", 0xc0cc5604}, +++{"linux/videodev2.h", "VIDIOC_S_FMT", 0xc0cc5605}, +++{"linux/videodev2.h", "VIDIOC_G_PARM", 0xc0cc5615}, +++{"linux/videodev2.h", "VIDIOC_S_PARM", 0xc0cc5616}, +++{"linux/videodev2.h", "VIDIOC_TRY_FMT", 0xc0cc5640}, +++{"linux/dm-ioctl.h", "DM_VERSION", 0xc134fd00}, +++{"linux/dm-ioctl.h", "DM_VERSION_32", 0xc134fd00}, +++{"linux/dm-ioctl.h", "DM_REMOVE_ALL_32", 0xc134fd01}, +++{"linux/dm-ioctl.h", "DM_REMOVE_ALL", 0xc134fd01}, +++{"linux/dm-ioctl.h", "DM_LIST_DEVICES_32", 0xc134fd02}, +++{"linux/dm-ioctl.h", "DM_LIST_DEVICES", 0xc134fd02}, +++{"linux/dm-ioctl.h", "DM_DEV_CREATE_32", 0xc134fd03}, +++{"linux/dm-ioctl.h", "DM_DEV_CREATE", 0xc134fd03}, +++{"linux/dm-ioctl.h", "DM_DEV_REMOVE", 0xc134fd04}, +++{"linux/dm-ioctl.h", "DM_DEV_REMOVE_32", 0xc134fd04}, +++{"linux/dm-ioctl.h", "DM_DEV_RENAME_32", 0xc134fd05}, +++{"linux/dm-ioctl.h", "DM_DEV_RENAME", 0xc134fd05}, +++{"linux/dm-ioctl.h", "DM_DEV_SUSPEND_32", 0xc134fd06}, +++{"linux/dm-ioctl.h", "DM_DEV_SUSPEND", 0xc134fd06}, +++{"linux/dm-ioctl.h", "DM_DEV_STATUS", 0xc134fd07}, +++{"linux/dm-ioctl.h", "DM_DEV_STATUS_32", 0xc134fd07}, +++{"linux/dm-ioctl.h", "DM_DEV_WAIT", 0xc134fd08}, +++{"linux/dm-ioctl.h", "DM_DEV_WAIT_32", 0xc134fd08}, +++{"linux/dm-ioctl.h", "DM_TABLE_LOAD", 0xc134fd09}, +++{"linux/dm-ioctl.h", "DM_TABLE_LOAD_32", 0xc134fd09}, +++{"linux/dm-ioctl.h", "DM_TABLE_CLEAR_32", 0xc134fd0a}, +++{"linux/dm-ioctl.h", "DM_TABLE_CLEAR", 0xc134fd0a}, +++{"linux/dm-ioctl.h", "DM_TABLE_DEPS_32", 0xc134fd0b}, +++{"linux/dm-ioctl.h", "DM_TABLE_DEPS", 0xc134fd0b}, +++{"linux/dm-ioctl.h", "DM_TABLE_STATUS", 0xc134fd0c}, +++{"linux/dm-ioctl.h", "DM_TABLE_STATUS_32", 0xc134fd0c}, +++{"linux/dm-ioctl.h", "DM_LIST_VERSIONS", 0xc134fd0d}, +++{"linux/dm-ioctl.h", "DM_LIST_VERSIONS_32", 0xc134fd0d}, +++{"linux/dm-ioctl.h", "DM_TARGET_MSG", 0xc134fd0e}, +++{"linux/dm-ioctl.h", "DM_TARGET_MSG_32", 0xc134fd0e}, +++{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY_32", 0xc134fd0f}, +++{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY", 0xc134fd0f}, +++{"linux/hiddev.h", "HIDIOCGUSAGES", 0xd01c4813}, ++Index: strace-4.5.16/linux/avr32/ioctlent.sh ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ strace-4.5.16/linux/avr32/ioctlent.sh 2008-05-11 15:36:30.000000000 +0200 ++@@ -0,0 +1,124 @@ +++#!/bin/sh +++# Copyright (c) 1993, 1994, 1995 Rick Sladkey +++# All rights reserved. +++# +++# Copyright (c) 1995, 1996 Michael Elizabeth Chastain +++# All rights reserved. +++# +++# 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. The name of the author may not be used to endorse or promote products +++# derived from this software without specific prior written permission. +++# +++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +++ +++# Files to find. +++file_find='asm/*.h linux/*.h scsi/*.h mtd/*.h' +++ +++# Files to stop. +++file_stop='asm/byteorder.h linux/config.h linux/elf-em.h linux/pci_ids.h linux/xd.h linux/reiserfs_fs.h linux/usbdevice_fs.h' +++ +++# Defs to find. +++# Work on the kernel source to convert all to df_iowr. +++# Don't know how to find low-numbered ioctls in linux/mc146818rtc.h. +++df_name='^[ ]*#[ ]*define[ ]+[A-Z_][A-Z0-9_]*[ ]+' +++df_iowr='_IO|_IOR|_IOW|_IOWR' +++df_NNNN='0[Xx](03|06|22|46|4B|4C|53|54|56|89|90)[0-9A-Fa-f][0-9A-Fa-f]' +++df_4359='0[Xx]4359[0-9A-Fa-f][0-9A-Fa-f]' # linux/cyclades.h +++df_470N='470[0-9]' # linux/fs.h (only in 1.2.13) +++df_smix='MIXER_READ|MIXER_WRITE' # linux/soundcard.h +++df_12NN='12[3-4][0-9]' # linux/umsdos_fs.h (only in 1.2.13) +++df_tail='([() ]|$)' +++def_find="$df_name($df_iowr|$df_NNNN|$df_4359|$df_470N|$df_smix|$df_12NN)$df_tail" +++ +++# Defs to stop. +++ds_tail='_MAGIC|_PATCH' +++ds_fdmp='FD(DEF|GET|SET)MEDIAPRM' # linux/fd.h aliases (only in 1.2.13) +++ds_mtio='MTIOC(GET|SET)CONFIG' # linux/mtio.h needs config (only in 1.2.13) +++ds_soundcard='_SIO(RW?|W)?' +++def_stop="$ds_tail|$ds_fdmp|$ds_mtio|$ds_soundcard" +++ +++# Validate arg count. +++if [ $# -ne 1 ] +++then +++ echo "usage: $0 include-directory" >&2 +++ exit 1 +++fi +++ +++# Grep through the files. +++( +++ # Construct list: find files minus stop files. +++ cd $1 || exit +++ file_list=`(ls $file_find $file_stop $file_stop 2>/dev/null) | sort | uniq -u` +++ +++ # Grep matching #define lines. +++ # Transform to C structure form. +++ # Filter out stop list. +++ egrep "$def_find" $file_list | +++ sed -n -e 's/^\(.*\):#[ ]*define[ ]*\([A-Z_][A-Z0-9_]*\).*$/ { "\1", "\2", \2 },/p' | +++ egrep -v "$def_stop" +++) > ioctlent.tmp +++ +++# Generate the output file. +++echo '/* This file is automatically generated by ioctlent.sh */' +++echo +++echo '#include ' +++echo '#include ' +++echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#define BAYCOM_DEBUG' +++echo +++echo '/* Needed for */' +++echo '#define CONFIG_COMPAT' +++echo +++echo '/* Needed for */' +++echo '#define CONFIG_JBD_DEBUG' +++echo +++echo '/* Needed for */' +++echo '#define LP_STATS' +++echo +++echo '/* Needed for */' +++echo '#define __OLD_VIDIOC_' +++echo +++echo '/* Needed for */' +++echo '#define ZFT_OBSOLETE' +++echo +++echo '/* Needed for */' +++echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#include ' +++#echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#include ' +++echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#include ' +++echo +++awk '{ print "#include <" substr($2, 2, length($2) - 3) ">" }' ioctlent.tmp | sort -u +++echo +++echo 'struct ioctlent ioctlent [] =' +++echo '{' +++cat ioctlent.tmp +++echo '};' +++ +++# Clean up. +++rm -f ioctlent.tmp ++Index: strace-4.5.16/linux/avr32/syscallent.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ strace-4.5.16/linux/avr32/syscallent.h 2008-05-11 15:36:30.000000000 +0200 ++@@ -0,0 +1,307 @@ +++/* +++ * Copyright (c) 2004-2006 Atmel Corporation +++ * All rights reserved. +++ * +++ * 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. The name of the author may not be used to endorse or promote products +++ * derived from this software without specific prior written permission. +++ * +++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +++ * +++ * $Id$ +++ */ +++ +++ { 0, 0, sys_setup, "setup" }, /* 0 */ +++ { 1, TP, sys_exit, "_exit" }, /* 1 */ +++ { 0, TP, sys_fork, "fork" }, /* 2 */ +++ { 3, 0, sys_read, "read" }, /* 3 */ +++ { 3, 0, sys_write, "write" }, /* 4 */ +++ { 3, TF, sys_open, "open" }, /* 5 */ +++ { 1, 0, sys_close, "close" }, /* 6 */ +++ { 1, 0, sys_umask, "umask" }, /* 7 */ +++ { 2, TF, sys_creat, "creat" }, /* 8 */ +++ { 2, TF, sys_link, "link" }, /* 9 */ +++ { 1, TF, sys_unlink, "unlink" }, /* 10 */ +++ { 3, TF|TP, sys_execve, "execve" }, /* 11 */ +++ { 1, TF, sys_chdir, "chdir" }, /* 12 */ +++ { 1, 0, sys_time, "time" }, /* 13 */ +++ { 3, TF, sys_mknod, "mknod" }, /* 14 */ +++ { 2, TF, sys_chmod, "chmod" }, /* 15 */ +++ { 3, TF, sys_chown, "chown" }, /* 16 */ +++ { 3, TF, sys_chown, "lchown" }, /* 17 */ +++ { 3, 0, sys_lseek, "lseek" }, /* 18 */ +++ { 5, 0, sys_llseek, "_llseek" }, /* 19 */ +++ { 0, 0, sys_getpid, "getpid" }, /* 20 */ +++ { 5, TF, sys_mount, "mount" }, /* 21 */ +++ { 2, TF, sys_umount, "umount" }, /* 22 */ +++ { 1, 0, sys_setuid, "setuid" }, /* 23 */ +++ { 0, 0, sys_getuid, "getuid" }, /* 24 */ +++ { 1, 0, sys_stime, "stime" }, /* 25 */ +++ { 4, 0, sys_ptrace, "ptrace" }, /* 26 */ +++ { 1, 0, sys_alarm, "alarm" }, /* 27 */ +++ { 0, TS, sys_pause, "pause" }, /* 28 */ +++ { 2, TF, sys_utime, "utime" }, /* 29 */ +++ { 2, TF, sys_stat, "stat" }, /* 30 */ +++ { 2, 0, sys_fstat, "fstat" }, /* 31 */ +++ { 2, TF, sys_lstat, "lstat" }, /* 32 */ +++ { 2, TF, sys_access, "access" }, /* 33 */ +++ { 1, TF, sys_chroot, "chroot" }, /* 34 */ +++ { 0, 0, sys_sync, "sync" }, /* 35 */ +++ { 1, 0, sys_fsync, "fsync" }, /* 36 */ +++ { 2, TS, sys_kill, "kill" }, /* 37 */ +++ { 2, TF, sys_rename, "rename" }, /* 38 */ +++ { 2, TF, sys_mkdir, "mkdir" }, /* 39 */ +++ { 1, TF, sys_rmdir, "rmdir" }, /* 40 */ +++ { 1, 0, sys_dup, "dup" }, /* 41 */ +++ { 1, 0, sys_pipe, "pipe" }, /* 42 */ +++ { 1, 0, sys_times, "times" }, /* 43 */ +++ { 5, TP, sys_clone, "clone" }, /* 44 */ +++ { 1, 0, sys_brk, "brk" }, /* 45 */ +++ { 1, 0, sys_setgid, "setgid" }, /* 46 */ +++ { 0, 0, sys_getgid, "getgid" }, /* 47 */ +++ { 2, TF, sys_getcwd, "getcwd" }, /* 48 */ +++ { 0, 0, sys_geteuid, "geteuid" }, /* 49 */ +++ { 0, 0, sys_getegid, "getegid" }, /* 50 */ +++ { 1, TF, sys_acct, "acct" }, /* 51 */ +++ { 1, 0, sys_setfsuid, "setfsuid" }, /* 52 */ +++ { 1, 0, sys_setfsgid, "setfsgid" }, /* 53 */ +++ { 3, 0, sys_ioctl, "ioctl" }, /* 54 */ +++ { 3, 0, sys_fcntl, "fcntl" }, /* 55 */ +++ { 2, 0, sys_setpgid, "setpgid" }, /* 56 */ +++ { 4, 0, sys_mremap, "mremap" }, /* 57 */ +++ { 3, 0, sys_setresuid, "setresuid" }, /* 58 */ +++ { 3, 0, sys_getresuid, "getresuid" }, /* 59 */ +++ { 2, 0, sys_setreuid, "setreuid" }, /* 60 */ +++ { 2, 0, sys_setregid, "setregid" }, /* 61 */ +++ { 2, 0, sys_ustat, "ustat" }, /* 62 */ +++ { 2, 0, sys_dup2, "dup2" }, /* 63 */ +++ { 0, 0, sys_getppid, "getppid" }, /* 64 */ +++ { 0, 0, sys_getpgrp, "getpgrp" }, /* 65 */ +++ { 0, 0, sys_setsid, "setsid" }, /* 66 */ +++ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 67 */ +++ { 1, TS, printargs, "rt_sigreturn" }, /* 68 */ +++ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 69 */ +++ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 70 */ +++ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 71 */ +++ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 72 */ +++ { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 73 */ +++ { 2, 0, sys_sethostname, "sethostname" }, /* 74 */ +++ { 2, 0, sys_setrlimit, "setrlimit" }, /* 75 */ +++ { 2, 0, sys_getrlimit, "old_getrlimit" }, /* 76 */ +++ { 2, 0, sys_getrusage, "getrusage" }, /* 77 */ +++ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 78 */ +++ { 2, 0, sys_settimeofday, "settimeofday" }, /* 79 */ +++ { 2, 0, sys_getgroups, "getgroups" }, /* 80 */ +++ { 2, 0, sys_setgroups, "setgroups" }, /* 81 */ +++ { 5, 0, sys_select, "select" }, /* 82 */ +++ { 2, TF, sys_symlink, "symlink" }, /* 83 */ +++ { 1, 0, sys_fchdir, "fchdir" }, /* 84 */ +++ { 3, TF, sys_readlink, "readlink" }, /* 85 */ +++ { 5, TF, sys_pread, "pread" }, /* 86 */ +++ { 5, TF, sys_pwrite, "pwrite" }, /* 87 */ +++ { 1, TF, sys_swapon, "swapon" }, /* 88 */ +++ { 3, 0, sys_reboot, "reboot" }, /* 89 */ +++ { 6, 0, sys_mmap, "mmap" }, /* 90 */ +++ { 2, 0, sys_munmap, "munmap" }, /* 91 */ +++ { 2, TF, sys_truncate, "truncate" }, /* 92 */ +++ { 2, 0, sys_ftruncate, "ftruncate" }, /* 93 */ +++ { 2, 0, sys_fchmod, "fchmod" }, /* 94 */ +++ { 3, 0, sys_fchown, "fchown" }, /* 95 */ +++ { 2, 0, sys_getpriority, "getpriority" }, /* 96 */ +++ { 3, 0, sys_setpriority, "setpriority" }, /* 97 */ +++ { 4, TP, sys_wait4, "wait4" }, /* 98 */ +++ { 2, TF, sys_statfs, "statfs" }, /* 99 */ +++ { 2, 0, sys_fstatfs, "fstatfs" }, /* 100 */ +++ { 0, 0, sys_vhangup, "vhangup" }, /* 101 */ +++ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 102 */ +++ { 3, 0, sys_syslog, "syslog" }, /* 103 */ +++ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ +++ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ +++ { 1, 0, sys_swapoff, "swapoff" }, /* 106 */ +++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 107 */ +++ { 6, 0, sys_ipc, "ipc" }, /* 108 */ +++ { 4, TF, sys_sendfile, "sendfile" }, /* 109 */ +++ { 2, 0, sys_setdomainname, "setdomainname" }, /* 110 */ +++ { 1, 0, sys_uname, "uname" }, /* 111 */ +++ { 1, 0, sys_adjtimex, "adjtimex" }, /* 112 */ +++ { 3, 0, sys_mprotect, "mprotect" }, /* 113 */ +++ { 0, TP, sys_vfork, "vfork" }, /* 114 */ +++ { 2, 0, sys_init_module, "init_module" }, /* 115 */ +++ { 1, 0, sys_delete_module, "delete_module" }, /* 116 */ +++ { 4, 0, sys_quotactl, "quotactl" }, /* 117 */ +++ { 1, 0, sys_getpgid, "getpgid" }, /* 118 */ +++ { 0, 0, sys_bdflush, "bdflush" }, /* 119 */ +++ { 3, 0, sys_sysfs, "sysfs" }, /* 120 */ +++ { 1, 0, sys_personality, "personality" }, /* 121 */ +++ { 5, 0, sys_afs_syscall, "afs_syscall" }, /* 122 */ +++ { 3, 0, sys_getdents, "getdents" }, /* 123 */ +++ { 2, 0, sys_flock, "flock" }, /* 124 */ +++ { 3, 0, sys_msync, "msync" }, /* 125 */ +++ { 3, 0, sys_readv, "readv" }, /* 126 */ +++ { 3, 0, sys_writev, "writev" }, /* 127 */ +++ { 1, 0, sys_getsid, "getsid" }, /* 128 */ +++ { 1, 0, sys_fdatasync, "fdatasync" }, /* 129 */ +++ { 1, 0, sys_sysctl, "_sysctl" }, /* 130 */ +++ { 2, 0, sys_mlock, "mlock" }, /* 131 */ +++ { 2, 0, sys_munlock, "munlock" }, /* 132 */ +++ { 2, 0, sys_mlockall, "mlockall" }, /* 133 */ +++ { 0, 0, sys_munlockall, "munlockall" }, /* 134 */ +++ { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 135 */ +++ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 136 */ +++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 137 */ +++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 138 */ +++ { 0, 0, sys_sched_yield, "sched_yield"}, /* 139 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 140 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 141 */ +++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 142 */ +++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 143 */ +++ { 3, 0, sys_poll, "poll" }, /* 144 */ +++ { 3, 0, printargs, "nfsservctl" }, /* 145 */ +++ { 3, 0, sys_setresgid, "setresgid" }, /* 146 */ +++ { 3, 0, sys_getresgid, "getresgid" }, /* 147 */ +++ { 5, 0, sys_prctl, "prctl" }, /* 148 */ +++ { 3, TN, sys_socket, "socket" }, /* 149 */ +++ { 3, TN, sys_bind, "bind" }, /* 150 */ +++ { 3, TN, sys_connect, "connect" }, /* 151 */ +++ { 2, TN, sys_listen, "listen" }, /* 152 */ +++ { 3, TN, sys_accept, "accept" }, /* 153 */ +++ { 3, TN, sys_getsockname, "getsockname" }, /* 154 */ +++ { 3, TN, sys_getpeername, "getpeername" }, /* 155 */ +++ { 4, TN, sys_socketpair, "socketpair" }, /* 156 */ +++ { 4, TN, sys_send, "send" }, /* 157 */ +++ { 4, TN, sys_recv, "recv" }, /* 158 */ +++ { 6, TN, sys_sendto, "sendto" }, /* 159 */ +++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 160 */ +++ { 2, TN, sys_shutdown, "shutdown" }, /* 161 */ +++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 162 */ +++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 163 */ +++ { 3, TN, sys_sendmsg, "sendmsg" }, /* 164 */ +++ { 3, TN, sys_recvmsg, "recvmsg" }, /* 165 */ +++ { 3, TF, sys_truncate64, "truncate64" }, /* 166 */ +++ { 3, TF, sys_ftruncate64, "ftruncate64" }, /* 167 */ +++ { 2, TF, sys_stat64, "stat64" }, /* 168 */ +++ { 2, TF, sys_lstat64, "lstat64" }, /* 169 */ +++ { 2, TF, sys_fstat64, "fstat64" }, /* 170 */ +++ { 2, TF, sys_pivotroot, "pivot_root" }, /* 171 */ +++ { 3, 0, printargs, "mincore" }, /* 172 */ +++ { 3, 0, sys_madvise, "madvise" }, /* 173 */ +++ { 4, 0, sys_getdents64, "getdents64" }, /* 174 */ +++ { 3, 0, sys_fcntl, "fcntl64" }, /* 175 */ +++ { 0, 0, printargs, "gettid" }, /* 176 */ +++ { 4, 0, sys_readahead, "readahead" }, /* 177 */ +++ { 5, TF, sys_setxattr, "setxattr" }, /* 178 */ +++ { 5, TF, sys_setxattr, "lsetxattr" }, /* 179 */ +++ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 180 */ +++ { 4, TF, sys_getxattr, "getxattr" }, /* 181 */ +++ { 4, TF, sys_getxattr, "lgetxattr" }, /* 182 */ +++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 183 */ +++ { 3, TF, sys_listxattr, "listxattr" }, /* 184 */ +++ { 3, TF, sys_listxattr, "llistxattr" }, /* 185 */ +++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 186 */ +++ { 2, TF, sys_removexattr, "removexattr" }, /* 187 */ +++ { 2, TF, sys_removexattr, "lremovexattr" }, /* 188 */ +++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 189 */ +++ { 2, TS, sys_kill, "tkill" }, /* 190 */ +++ { 4, TF, sys_sendfile64, "sendfile64" }, /* 191 */ +++ { 5, 0, sys_futex, "futex" }, /* 192 */ +++ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 193 */ +++ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 194 */ +++ { 2, 0, sys_capget, "capget" }, /* 195 */ +++ { 2, 0, sys_capset, "capset" }, /* 196 */ +++ { 2, 0, sys_io_setup, "io_setup" }, /* 197 */ +++ { 1, 0, sys_io_destroy, "io_destroy" }, /* 198 */ +++ { 5, 0, sys_io_getevents, "io_getevents" }, /* 199 */ +++ { 3, 0, sys_io_submit, "io_submit" }, /* 200 */ +++ { 3, 0, sys_io_cancel, "io_cancel" }, /* 201 */ +++ { 6, 0, sys_fadvise64, "fadvise64" }, /* 202 */ +++ { 1, TP, sys_exit, "exit_group" }, /* 203 */ +++ { 4, 0, printargs, "lookup_dcookie"}, /* 204 */ +++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 205 */ +++ { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 206 */ +++ { 4, 0, sys_epoll_wait, "epoll_wait" }, /* 207 */ +++ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 208 */ +++ { 1, 0, printargs, "set_tid_address"}, /* 209 */ +++ { 3, 0, sys_timer_create, "timer_create" }, /* 210 */ +++ { 4, 0, sys_timer_settime, "timer_settime" }, /* 211 */ +++ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 212 */ +++ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 213 */ +++ { 1, 0, sys_timer_delete, "timer_delete" }, /* 214 */ +++ { 2, 0, sys_clock_settime, "clock_settime" }, /* 215 */ +++ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 216 */ +++ { 2, 0, sys_clock_getres, "clock_getres" }, /* 217 */ +++ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 218 */ +++ { 3, TF, sys_statfs64, "statfs64" }, /* 219 */ +++ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 220 */ +++ { 3, TS, sys_tgkill, "tgkill" }, /* 221 */ +++ { 5, 0, printargs, "SYS_222" }, /* 222 */ +++ { 2, TF, sys_utimes, "utimes" }, /* 223 */ +++ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 224 */ +++ { 3, 0, printargs, "cacheflush" }, /* 225 */ +++ { 0, 0, printargs, "vserver" }, /* 226 */ +++ { 4, 0, sys_mq_open, "mq_open" }, /* 227 */ +++ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 228 */ +++ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 229 */ +++ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 230 */ +++ { 2, 0, sys_mq_notify, "mq_notify" }, /* 231 */ +++ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 232 */ +++ { 4, 0, printargs, "kexec_load" }, /* 233 */ +++ { 1, 0, sys_waitid, "waitid" }, /* 234 */ +++ { 5, 0, printargs, "add_key" }, /* 235 */ +++ { 4, 0, printargs, "request_key" }, /* 236 */ +++ { 5, 0, printargs, "keyctl" }, /* 237 */ +++ { 3, 0, printargs, "ioprio_set" }, /* 238 */ +++ { 2, 0, printargs, "ioprio_get" }, /* 239 */ +++ { 1, 0, printargs, "inotify_init" }, /* 240 */ +++ { 3, 0, sys_inotify_add_watch, "inotify_add_watch" }, /* 241 */ +++ { 2, 0, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 242 */ +++ { 4, 0, sys_openat, "openat" }, /* 243 */ +++ { 3, 0, sys_mkdirat, "mkdirat" }, /* 244 */ +++ { 4, 0, sys_mknodat, "mknodat" }, /* 245 */ +++ { 5, 0, sys_fchownat, "fchownat" }, /* 246 */ +++ { 3, 0, sys_futimesat, "futimesat" }, /* 247 */ +++ { 4, 0, printargs, "fstatat64" }, /* 248 */ +++ { 3, 0, sys_unlinkat, "unlinkat" }, /* 249 */ +++ { 4, 0, sys_renameat, "renameat" }, /* 250 */ +++ { 5, 0, sys_linkat, "linkat" }, /* 251 */ +++ { 3, 0, sys_symlinkat, "symlinkat" }, /* 252 */ +++ { 4, 0, sys_readlinkat, "readlinkat" }, /* 253 */ +++ { 3, 0, sys_fchmodat, "fchmodat" }, /* 254 */ +++ { 3, 0, sys_faccessat, "faccessat" }, /* 255 */ +++ { 6, 0, sys_pselect6, "pselect6" }, /* 256 */ +++ { 5, 0, sys_ppoll, "ppoll" }, /* 257 */ +++ { 1, 0, sys_unshare, "unshare" }, /* 258 */ +++ { 2, 0, printargs, "set_robust_list" }, /* 259 */ +++ { 3, 0, printargs, "get_robust_list" }, /* 260 */ +++ { 6, 0, printargs, "splice" }, /* 261 */ +++ { 4, 0, printargs, "sync_file_range" }, /* 262 */ +++ { 4, 0, printargs, "tee" }, /* 263 */ +++ { 4, 0, printargs, "vmsplice" }, /* 264 */ +++ { 6, 0, printargs, "sys_epoll_pwait" }, /* 265 */ +++ { 2, TI, sys_msgget, "msgget" }, /* 266 */ +++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 267 */ +++ { 5, TI, sys_msgrcv, "msgrcv" }, /* 268 */ +++ { 3, TI, sys_msgctl, "msgctl" }, /* 269 */ +++ { 3, TI, sys_semget, "semget" }, /* 270 */ +++ { 3, TI, sys_semop, "semop" }, /* 271 */ +++ { 4, TI, sys_semctl, "semctl" }, /* 272 */ +++ { 4, TI, sys_semtimedop, "semtimedop" }, /* 273 */ +++ { 3, TI, sys_shmat, "shmat" }, /* 274 */ +++ { 3, TI, sys_shmget, "shmget" }, /* 275 */ +++ { 1, TI, sys_shmdt, "shmdt" }, /* 276 */ +++ { 3, TI, sys_shmctl, "shmctl" }, /* 277 */ ++Index: strace-4.5.16/Makefile.am ++=================================================================== ++--- strace-4.5.16.orig/Makefile.am 2007-07-03 04:07:28.000000000 +0200 +++++ strace-4.5.16/Makefile.am 2008-05-11 15:36:30.000000000 +0200 ++@@ -29,6 +29,7 @@ ++ linux/alpha/errnoent.h linux/alpha/ioctlent.h \ ++ linux/alpha/signalent.h linux/alpha/syscallent.h \ ++ linux/arm/syscallent.h \ +++ linux/avr32/syscallent.h \ ++ linux/hppa/errnoent.h linux/hppa/ioctlent.h \ ++ linux/hppa/signalent.h linux/hppa/syscallent.h \ ++ linux/ia64/syscallent.h linux/ia64/errnoent.h \ ++Index: strace-4.5.16/Makefile.in ++=================================================================== ++--- strace-4.5.16.orig/Makefile.in 2007-08-03 12:24:40.000000000 +0200 +++++ strace-4.5.16/Makefile.in 2008-05-11 15:36:30.000000000 +0200 ++@@ -217,6 +217,7 @@ ++ linux/alpha/errnoent.h linux/alpha/ioctlent.h \ ++ linux/alpha/signalent.h linux/alpha/syscallent.h \ ++ linux/arm/syscallent.h \ +++ linux/avr32/syscallent.h \ ++ linux/hppa/errnoent.h linux/hppa/ioctlent.h \ ++ linux/hppa/signalent.h linux/hppa/syscallent.h \ ++ linux/ia64/syscallent.h linux/ia64/errnoent.h \ ++Index: strace-4.5.16/process.c ++=================================================================== ++--- strace-4.5.16.orig/process.c 2007-08-02 04:13:05.000000000 +0200 +++++ strace-4.5.16/process.c 2008-05-11 15:36:30.000000000 +0200 ++@@ -714,6 +714,10 @@ ++ return -1; ++ ++ return 0; +++#elif defined(AVR32) +++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_R8), new) < 0) +++ return -1; +++ return 0; ++ #else ++ #warning Do not know how to handle change_syscall for this architecture ++ #endif /* architecture */ ++@@ -794,6 +798,28 @@ ++ if (errno) ++ return -1; ++ } +++#elif defined(AVR32) +++ { +++ errno = 0; +++ if (argnum == 0) +++ ptrace(PTRACE_POKEUSER, tcp->pid, +++ (char *)(REG_R12_ORIG), +++ tcp->u_arg[argnum]); +++ else if (argnum < 4) +++ /* r11 .. r9 */ +++ ptrace(PTRACE_POKEUSER, tcp->pid, +++ (char *)(REG_R12 - 4 * argnum), +++ tcp->u_arg[argnum]); +++ else if (argnum < 6) +++ /* r6 .. r5 */ +++ ptrace(PTRACE_POKEUSER, tcp->pid, +++ (char *)(REG_R10 - 4 * argnum), +++ tcp->u_arg[argnum]); +++ else +++ return -E2BIG; +++ if (errno) +++ return -1; +++ } ++ #else ++ # warning Sorry, setargs not implemented for this architecture. ++ #endif ++@@ -2888,8 +2914,27 @@ ++ { uoff(regs.ARM_pc), "pc" }, ++ { uoff(regs.ARM_cpsr), "cpsr" }, ++ #endif ++- ++-#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) +++#ifdef AVR32 +++ { uoff(regs.sr), "sr" }, +++ { uoff(regs.pc), "pc" }, +++ { uoff(regs.lr), "lr" }, +++ { uoff(regs.sp), "sp" }, +++ { uoff(regs.r12), "r12" }, +++ { uoff(regs.r11), "r11" }, +++ { uoff(regs.r10), "r10" }, +++ { uoff(regs.r9), "r9" }, +++ { uoff(regs.r8), "r8" }, +++ { uoff(regs.r7), "r7" }, +++ { uoff(regs.r6), "r6" }, +++ { uoff(regs.r5), "r5" }, +++ { uoff(regs.r4), "r4" }, +++ { uoff(regs.r3), "r3" }, +++ { uoff(regs.r2), "r2" }, +++ { uoff(regs.r1), "r1" }, +++ { uoff(regs.r0), "r0" }, +++ { uoff(regs.r12_orig), "orig_r12" }, +++#endif +++#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, ++ #endif ++ #if defined(I386) || defined(X86_64) ++@@ -2905,20 +2950,20 @@ ++ #if !defined(SPARC64) ++ { uoff(start_code), "offsetof(struct user, start_code)" }, ++ #endif ++-#ifdef SH64 +++#if defined(SH64) || defined(AVR32) ++ { uoff(start_data), "offsetof(struct user, start_data)" }, ++ #endif ++ #if !defined(SPARC64) ++ { uoff(start_stack), "offsetof(struct user, start_stack)" }, ++ #endif ++ { uoff(signal), "offsetof(struct user, signal)" }, ++-#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) +++#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(reserved), "offsetof(struct user, reserved)" }, ++ #endif ++ #if !defined(SPARC64) ++ { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, ++ #endif ++-#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) +++#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" }, ++ #endif ++ { uoff(magic), "offsetof(struct user, magic)" }, ++Index: strace-4.5.16/syscall.c ++=================================================================== ++--- strace-4.5.16.orig/syscall.c 2008-05-11 15:36:09.000000000 +0200 +++++ strace-4.5.16/syscall.c 2008-05-11 15:36:30.000000000 +0200 ++@@ -809,6 +809,8 @@ ++ static long r9; ++ #elif defined(X86_64) ++ static long rax; +++#elif defined(AVR32) +++ static struct pt_regs regs; ++ #endif ++ #endif /* LINUX */ ++ #ifdef FREEBSD ++@@ -1273,7 +1275,26 @@ ++ return 0; ++ } ++ } ++-#endif /* SH64 */ +++#elif defined(AVR32) +++ /* +++ * Read complete register set in one go. +++ */ +++ if (ptrace(PTRACE_GETREGS, pid, NULL, ®s) < 0) +++ return -1; +++ +++ /* +++ * We only need to grab the syscall number on syscall entry. +++ */ +++ if (!(tcp->flags & TCB_INSYSCALL)) { +++ scno = regs.r8; +++ +++ /* Check if we return from execve. */ +++ if (tcp->flags & TCB_WAITEXECVE) { +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ } +++#endif /* AVR32 */ ++ #endif /* LINUX */ ++ #ifdef SUNOS4 ++ if (upeek(pid, uoff(u_arg[7]), &scno) < 0) ++@@ -1632,6 +1653,17 @@ ++ tcp->u_rval = r9; ++ u_error = 0; ++ } +++#else +++#ifdef AVR32 +++ if (regs.r12 && (unsigned) -regs.r12 < nerrnos) { +++ tcp->u_rval = -1; +++ u_error = -regs.r12; +++ } +++ else { +++ tcp->u_rval = regs.r12; +++ u_error = 0; +++ } +++#endif /* AVR32 */ ++ #endif /* SH64 */ ++ #endif /* SH */ ++ #endif /* HPPA */ ++@@ -1857,6 +1889,12 @@ ++ r9 = error ? -error : rval; ++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_GENERAL(9), r9) < 0) ++ return -1; +++#else +++#ifdef AVR32 +++ regs.r12 = error ? -error : rval; +++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_R12, regs.r12) < 0) +++ return -1; +++#endif /* AVR32 */ ++ #endif /* SH64 */ ++ #endif /* SH */ ++ #endif /* HPPA */ ++@@ -2129,6 +2167,14 @@ ++ return -1; ++ } ++ } +++#elif defined(AVR32) +++ tcp->u_nargs = sysent[tcp->scno].nargs; +++ tcp->u_arg[0] = regs.r12; +++ tcp->u_arg[1] = regs.r11; +++ tcp->u_arg[2] = regs.r10; +++ tcp->u_arg[3] = regs.r9; +++ tcp->u_arg[4] = regs.r5; +++ tcp->u_arg[5] = regs.r3; ++ #else /* Other architecture (like i386) (32bits specific) */ ++ { ++ int i; ++@@ -2391,7 +2437,7 @@ ++ ++ switch (known_scno(tcp)) { ++ #ifdef LINUX ++-#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) +++#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) && !defined(AVR32) ++ #ifdef __NR_socketcall ++ case SYS_socketcall: ++ decode_subcall(tcp, SYS_socket_subcall, ++@@ -2404,7 +2450,7 @@ ++ SYS_ipc_nsubcalls, shift_style); ++ break; ++ #endif ++-#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */ +++#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA && !AVR32 */ ++ #if defined (SPARC) || defined (SPARC64) ++ case SYS_socketcall: ++ sparc_socket_decode (tcp); ++Index: strace-4.5.16/util.c ++=================================================================== ++--- strace-4.5.16.orig/util.c 2007-08-02 04:22:06.000000000 +0200 +++++ strace-4.5.16/util.c 2008-05-11 15:36:30.000000000 +0200 ++@@ -1076,6 +1076,9 @@ ++ #elif defined(SH64) ++ if (upeek(tcp->pid, REG_PC ,&pc) < 0) ++ return -1; +++#elif defined(AVR32) +++ if (upeek(tcp->pid, REG_PC, &pc) < 0) +++ return -1; ++ #endif ++ return pc; ++ #endif /* LINUX */ ++@@ -1224,6 +1227,14 @@ ++ return; ++ } ++ tprintf("[%08lx] ", pc); +++#elif defined(AVR32) +++ long pc; +++ +++ if (upeek(tcp->pid, REG_PC, &pc) < 0) { +++ tprintf("[????????] "); +++ return; +++ } +++ tprintf("[%08lx] ", pc); ++ #endif /* !architecture */ ++ #endif /* LINUX */ ++ ++@@ -1405,6 +1416,9 @@ ++ # define arg0_offset (REG_OFFSET+16) ++ # define arg1_offset (REG_OFFSET+24) ++ # define restore_arg0(tcp, state, val) 0 +++# elif defined (AVR32) +++# define arg0_offset (REG_R12) +++# define arg1_offset (REG_R11) ++ # else ++ # define arg0_offset 0 ++ # define arg1_offset 4 +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/004-mips64_support.patch.svn-base b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/004-mips64_support.patch.svn-base +new file mode 100644 +index 0000000..f582054 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/004-mips64_support.patch.svn-base +@@ -0,0 +1,3342 @@ ++2007-08-26 Daniel Jacobowitz ++ ++ * defs.h: Include . ++ (MAX_QUALS): Update for MIPS. ++ (LINUX_MIPSO32, LINUX_MIPSN32, LINUX_MIPSN64, LINUX_MIPS64): Define. ++ (struct tcb): Add ext_arg for MIPS N32. ++ (TCB_WAITEXECVE): Define for MIPS. ++ (ALIGN64): Use LINUX_MIPSO32. ++ * file.c (sys_lseek): Use ext_arg for MIPS N32. ++ (sys_readahead, sys_fadvise64_64): Likewise. ++ * io.c (sys_pread64, sys_pwrite64): Likewise. ++ * mem.c (print_mmap): Take OFFSET argument. ++ (sys_old_mmap): Update call to print_mmap. ++ (sys_mmap): Use ext_arg for MIPS N32. ++ * process.c (struct_user_offsets): Add MIPS registers. ++ * signal.c (sys_sigreturn): Handle MIPS N32 and MIPS N64. Correct ++ MIPS O32 call to sprintsigmask. ++ * syscall.c (internal_syscall): Handle MIPS N32. Check for ++ TCB_WAITEXECVE on MIPS. ++ (force_result): Add a comment about MIPS N32. ++ (syscall_enter): Handle MIPS N32 and MIPS N64. ++ * linux/syscall.h (sys_pread64, sys_pwrite64): Declare. ++ * linux/mips/syscallent.h: Include "dummy.h". Handle alternate ++ MIPS ABIs. ++ ++Index: defs.h ++=================================================================== ++RCS file: /cvsroot/strace/strace/defs.h,v ++retrieving revision 1.75 ++diff -u -p -r1.75 defs.h ++--- strace/defs.h 24 Jul 2007 01:57:11 -0000 1.75 +++++ strace/defs.h 26 Aug 2007 19:13:45 -0000 ++@@ -33,6 +33,10 @@ ++ #include "config.h" ++ #endif ++ +++#ifdef MIPS +++#include +++#endif +++ ++ #ifdef linux ++ #include ++ #endif ++@@ -47,7 +51,7 @@ ++ /* configuration section */ ++ #ifndef MAX_QUALS ++ #if defined(LINUX) && defined(MIPS) ++-#define MAX_QUALS 5000 /* maximum number of syscalls, signals, etc. */ +++#define MAX_QUALS 7000 /* maximum number of syscalls, signals, etc. */ ++ #else ++ #define MAX_QUALS 2048 /* maximum number of syscalls, signals, etc. */ ++ #endif ++@@ -97,6 +101,17 @@ ++ # if defined(AVR32) ++ # define LINUX_AVR32 ++ # endif +++# if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI32 +++# define LINUX_MIPSO32 +++# endif +++# if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_NABI32 +++# define LINUX_MIPSN32 +++# define LINUX_MIPS64 +++# endif +++# if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI64 +++# define LINUX_MIPSN64 +++# define LINUX_MIPS64 +++# endif ++ #endif ++ ++ #if defined(SVR4) || defined(FREEBSD) ++@@ -277,6 +292,9 @@ struct tcb { ++ long scno; /* System call number */ ++ int u_nargs; /* System call arguments */ ++ long u_arg[MAX_ARGS]; /* System call arguments */ +++#if defined (LINUX_MIPSN32) +++ long long ext_arg[MAX_ARGS]; /* System call arguments */ +++#endif ++ int u_error; /* Error code */ ++ long u_rval; /* (first) return value */ ++ #ifdef HAVE_LONG_LONG ++@@ -330,7 +348,7 @@ struct tcb { ++ #define TCB_FOLLOWFORK 00400 /* Process should have forks followed */ ++ #define TCB_REPRINT 01000 /* We should reprint this syscall on exit */ ++ #ifdef LINUX ++-# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(AVR32) +++# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(MIPS) ++ # define TCB_WAITEXECVE 02000 /* ignore SIGTRAP after exceve */ ++ # endif ++ # define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */ ++@@ -594,7 +612,7 @@ extern const int nsignals2; ++ ++ #if defined(FREEBSD) || (defined(LINUX) \ ++ && defined(POWERPC) && !defined(__powerpc64__)) \ ++- || (defined (LINUX) && defined (MIPS) && !defined(__mips64)) +++ || defined (LINUX_MIPSO32) ++ /* ARRGH! off_t args are aligned on 64 bit boundaries! */ ++ #define ALIGN64(tcp,arg) \ ++ do { \ ++Index: file.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/file.c,v ++retrieving revision 1.87 ++diff -u -p -r1.87 file.c ++--- strace/file.c 7 Aug 2007 01:22:49 -0000 1.87 +++++ strace/file.c 26 Aug 2007 19:13:46 -0000 ++@@ -494,6 +494,27 @@ static const struct xlat whence[] = { ++ }; ++ ++ #ifndef HAVE_LONG_LONG_OFF_T +++#if defined (LINUX_MIPSN32) +++int +++sys_lseek(tcp) +++struct tcb *tcp; +++{ +++ long long offset; +++ int _whence; +++ +++ if (entering(tcp)) { +++ tprintf("%ld, ", tcp->u_arg[0]); +++ offset = tcp->ext_arg[1]; +++ _whence = tcp->u_arg[2]; +++ if (_whence == SEEK_SET) +++ tprintf("%llu, ", offset); +++ else +++ tprintf("%lld, ", offset); +++ printxval(whence, _whence, "SEEK_???"); +++ } +++ return RVAL_UDECIMAL; +++} +++#else /* !LINUX_MIPSN32 */ ++ int ++ sys_lseek(tcp) ++ struct tcb *tcp; ++@@ -513,6 +534,7 @@ struct tcb *tcp; ++ } ++ return RVAL_UDECIMAL; ++ } +++#endif /* LINUX_MIPSN32 */ ++ #endif ++ ++ #ifdef LINUX ++@@ -552,7 +574,9 @@ struct tcb *tcp; ++ { ++ if (entering(tcp)) { ++ tprintf("%ld, %lld, %ld", tcp->u_arg[0], ++-# if defined IA64 || defined X86_64 || defined ALPHA +++# if defined LINUX_MIPSN32 +++ tcp->ext_arg[1], tcp->u_arg[2] +++# elif defined IA64 || defined X86_64 || defined ALPHA || defined LINUX_MIPSN64 ++ (long long int) tcp->u_arg[1], tcp->u_arg[2] ++ # else ++ LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]), tcp->u_arg[3] ++@@ -2822,7 +2846,10 @@ struct tcb *tcp; ++ if (entering(tcp)) { ++ tprintf("%ld, %lld, %lld, ", ++ tcp->u_arg[0], ++-# if defined IA64 || defined X86_64 || defined ALPHA +++#if defined LINUX_MIPSN32 +++ tcp->ext_arg[1], tcp->ext_arg[2]); +++ printxval(advise, tcp->u_arg[3], "POSIX_FADV_???"); +++#elif defined IA64 || defined X86_64 || defined ALPHA || defined LINUX_MIPSN64 ++ (long long int) tcp->u_arg[1], (long long int) tcp->u_arg[2]); ++ printxval(advise, tcp->u_arg[3], "POSIX_FADV_???"); ++ #else ++Index: io.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/io.c,v ++retrieving revision 1.21 ++diff -u -p -r1.21 io.c ++--- strace/io.c 13 Dec 2006 17:08:08 -0000 1.21 +++++ strace/io.c 26 Aug 2007 19:13:46 -0000 ++@@ -360,8 +360,12 @@ struct tcb *tcp; ++ tprintf("%#lx", tcp->u_arg[1]); ++ else ++ printstr(tcp, tcp->u_arg[1], tcp->u_rval); +++#ifdef MIPS_LINUXN32 +++ tprintf(", %lu, %#llx", tcp->u_arg[2], tcp->ext_arg[3]); +++#else ++ tprintf(", %lu, %#llx", tcp->u_arg[2], ++ LONG_LONG(tcp->u_arg[3], tcp->u_arg[4])); +++#endif ++ } ++ return 0; ++ } ++@@ -374,8 +378,12 @@ struct tcb *tcp; ++ ALIGN64 (tcp, 3); ++ tprintf("%ld, ", tcp->u_arg[0]); ++ printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]); +++#ifdef MIPS_LINUXN32 +++ tprintf(", %lu, %#llx", tcp->u_arg[2], tcp->ext_arg[3]); +++#else ++ tprintf(", %lu, %#llx", tcp->u_arg[2], ++ LONG_LONG(tcp->u_arg[3], tcp->u_arg[4])); +++#endif ++ } ++ return 0; ++ } ++Index: mem.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/mem.c,v ++retrieving revision 1.40 ++diff -u -p -r1.40 mem.c ++--- strace/mem.c 24 Jul 2007 01:52:58 -0000 1.40 +++++ strace/mem.c 26 Aug 2007 19:13:46 -0000 ++@@ -191,9 +191,10 @@ static const struct xlat mmap_flags[] = ++ #if !HAVE_LONG_LONG_OFF_T ++ static ++ int ++-print_mmap(tcp,u_arg) +++print_mmap(tcp,u_arg, offset) ++ struct tcb *tcp; ++ long *u_arg; +++long long offset; ++ { ++ if (entering(tcp)) { ++ /* addr */ ++@@ -216,7 +217,7 @@ long *u_arg; ++ /* fd (is always int, not long) */ ++ tprintf(", %d, ", (int)u_arg[4]); ++ /* offset */ ++- tprintf("%#lx", u_arg[5]); +++ tprintf("%#llx", offset); ++ } ++ return RVAL_HEX; ++ } ++@@ -265,7 +266,7 @@ struct tcb *tcp; ++ if (umoven(tcp, tcp->u_arg[0], sizeof u_arg, (char *) u_arg) == -1) ++ return 0; ++ #endif // defined(IA64) ++- return print_mmap(tcp, u_arg); +++ return print_mmap(tcp, u_arg, u_arg[5]); ++ ++ } ++ #endif ++@@ -274,6 +275,8 @@ int ++ sys_mmap(tcp) ++ struct tcb *tcp; ++ { +++ long long offset = tcp->u_arg[5]; +++ ++ #if defined(LINUX) && defined(SH64) ++ /* ++ * Old mmap differs from new mmap in specifying the ++@@ -281,9 +284,12 @@ struct tcb *tcp; ++ * pretend it's in byte units so the user only ever ++ * sees bytes in the printout. ++ */ ++- tcp->u_arg[5] <<= PAGE_SHIFT; +++ offset <<= PAGE_SHIFT; +++#endif +++#if defined(LINUX_MIPSN32) +++ offset = tcp->ext_arg[5]; ++ #endif ++- return print_mmap(tcp, tcp->u_arg); +++ return print_mmap(tcp, tcp->u_arg, offset); ++ } ++ #endif /* !HAVE_LONG_LONG_OFF_T */ ++ ++Index: process.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/process.c,v ++retrieving revision 1.107 ++diff -u -p -r1.107 process.c ++--- strace/process.c 2 Aug 2007 02:13:05 -0000 1.107 +++++ strace/process.c 26 Aug 2007 19:13:47 -0000 ++@@ -2934,6 +2934,79 @@ const struct xlat struct_user_offsets[] ++ { uoff(regs.r0), "r0" }, ++ { uoff(regs.r12_orig), "orig_r12" }, ++ #endif +++#ifdef MIPS +++ { 0, "r0" }, +++ { 1, "r1" }, +++ { 2, "r2" }, +++ { 3, "r3" }, +++ { 4, "r4" }, +++ { 5, "r5" }, +++ { 6, "r6" }, +++ { 7, "r7" }, +++ { 8, "r8" }, +++ { 9, "r9" }, +++ { 10, "r10" }, +++ { 11, "r11" }, +++ { 12, "r12" }, +++ { 13, "r13" }, +++ { 14, "r14" }, +++ { 15, "r15" }, +++ { 16, "r16" }, +++ { 17, "r17" }, +++ { 18, "r18" }, +++ { 19, "r19" }, +++ { 20, "r20" }, +++ { 21, "r21" }, +++ { 22, "r22" }, +++ { 23, "r23" }, +++ { 24, "r24" }, +++ { 25, "r25" }, +++ { 26, "r26" }, +++ { 27, "r27" }, +++ { 28, "r28" }, +++ { 29, "r29" }, +++ { 30, "r30" }, +++ { 31, "r31" }, +++ { 32, "f0" }, +++ { 33, "f1" }, +++ { 34, "f2" }, +++ { 35, "f3" }, +++ { 36, "f4" }, +++ { 37, "f5" }, +++ { 38, "f6" }, +++ { 39, "f7" }, +++ { 40, "f8" }, +++ { 41, "f9" }, +++ { 42, "f10" }, +++ { 43, "f11" }, +++ { 44, "f12" }, +++ { 45, "f13" }, +++ { 46, "f14" }, +++ { 47, "f15" }, +++ { 48, "f16" }, +++ { 49, "f17" }, +++ { 50, "f18" }, +++ { 51, "f19" }, +++ { 52, "f20" }, +++ { 53, "f21" }, +++ { 54, "f22" }, +++ { 55, "f23" }, +++ { 56, "f24" }, +++ { 57, "f25" }, +++ { 58, "f26" }, +++ { 59, "f27" }, +++ { 60, "f28" }, +++ { 61, "f29" }, +++ { 62, "f30" }, +++ { 63, "f31" }, +++ { 64, "pc" }, +++ { 65, "cause" }, +++ { 66, "badvaddr" }, +++ { 67, "mmhi" }, +++ { 68, "mmlo" }, +++ { 69, "fpcsr" }, +++ { 70, "fpeir" }, +++#endif ++ #if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, ++ #endif ++Index: signal.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/signal.c,v ++retrieving revision 1.61 ++diff -u -p -r1.61 signal.c ++--- strace/signal.c 2 Aug 2007 01:15:59 -0000 1.61 +++++ strace/signal.c 26 Aug 2007 19:13:47 -0000 ++@@ -1424,6 +1424,32 @@ struct tcb *tcp; ++ } ++ return 0; ++ #else +++#if defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64) +++ /* This decodes rt_sigreturn. The 64-bit ABIs do not have +++ sigreturn. */ +++ long sp; +++ struct ucontext uc; +++ +++ if(entering(tcp)) { +++ tcp->u_arg[0] = 0; +++ if (upeek(tcp->pid, REG_SP, &sp) < 0) +++ return 0; +++ /* There are six words followed by a 128-byte siginfo. */ +++ sp = sp + 6 * 4 + 128; +++ if (umove(tcp, sp, &uc) < 0) +++ return 0; +++ tcp->u_arg[0] = 1; +++ tcp->u_arg[1] = *(long *) &uc.uc_sigmask; +++ } else { +++ tcp->u_rval = tcp->u_error = 0; +++ if(tcp->u_arg[0] == 0) +++ return 0; +++ tcp->auxstr = sprintsigmask("mask now ", +++ (sigset_t *) &tcp->u_arg[1], 0); +++ return RVAL_NONE | RVAL_STR; +++ } +++ return 0; +++#else ++ #ifdef MIPS ++ long sp; ++ struct sigcontext sc; ++@@ -1444,7 +1470,8 @@ struct tcb *tcp; ++ tcp->u_rval = tcp->u_error = 0; ++ if(tcp->u_arg[0] == 0) ++ return 0; ++- tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1], 0); +++ tcp->auxstr = sprintsigmask("mask now ", +++ (sigset_t *) &tcp->u_arg[1], 0); ++ return RVAL_NONE | RVAL_STR; ++ } ++ return 0; ++@@ -1453,6 +1480,7 @@ struct tcb *tcp; ++ #warning (no problem, just a reminder :-) ++ return 0; ++ #endif /* MIPS */ +++#endif /* LINUX_MIPSN32 || LINUX_MIPSN64 */ ++ #endif /* SPARC || SPARC64 */ ++ #endif /* ALPHA */ ++ #endif /* !M68K */ ++Index: syscall.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/syscall.c,v ++retrieving revision 1.89 ++diff -u -p -r1.89 syscall.c ++--- strace/syscall.c 22 Aug 2007 21:43:30 -0000 1.89 +++++ strace/syscall.c 26 Aug 2007 19:13:48 -0000 ++@@ -798,6 +798,9 @@ internal_syscall(struct tcb *tcp) ++ #elif defined (SPARC) || defined (SPARC64) ++ static struct regs regs; ++ static unsigned long trap; +++#elif defined(LINUX_MIPSN32) +++ static long long a3; +++ static long long r2; ++ #elif defined(MIPS) ++ static long a3; ++ static long r2; ++@@ -1102,14 +1105,44 @@ struct tcb *tcp; ++ #elif defined (M68K) ++ if (upeek(pid, 4*PT_ORIG_D0, &scno) < 0) ++ return -1; +++#elif defined (LINUX_MIPSN32) +++ unsigned long long regs[38]; +++ +++ if (ptrace (PTRACE_GETREGS, pid, NULL, (long) ®s) < 0) +++ return -1; +++ a3 = regs[REG_A3]; +++ r2 = regs[REG_V0]; +++ +++ if(!(tcp->flags & TCB_INSYSCALL)) { +++ scno = r2; +++ +++ /* Check if we return from execve. */ +++ if (scno == 0 && tcp->flags & TCB_WAITEXECVE) { +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ +++ if (scno < 0 || scno > nsyscalls) { +++ if(a3 == 0 || a3 == -1) { +++ if(debug) +++ fprintf (stderr, "stray syscall exit: v0 = %ld\n", scno); +++ return 0; +++ } +++ } +++ } ++ #elif defined (MIPS) ++ if (upeek(pid, REG_A3, &a3) < 0) ++ return -1; ++- ++ if(!(tcp->flags & TCB_INSYSCALL)) { ++ if (upeek(pid, REG_V0, &scno) < 0) ++ return -1; ++ +++ /* Check if we return from execve. */ +++ if (scno == 0 && tcp->flags & TCB_WAITEXECVE) { +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ ++ if (scno < 0 || scno > nsyscalls) { ++ if(a3 == 0 || a3 == -1) { ++ if(debug) ++@@ -1768,6 +1801,7 @@ force_result(tcp, error, rval) ++ r2 = rval; ++ a3 = 0; ++ } +++ /* PTRACE_POKEUSER is OK even for n32 since rval is only a long. */ ++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_A3), a3) < 0 || ++ ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_V0), r2) < 0) ++ return -1; ++@@ -1993,6 +2027,27 @@ struct tcb *tcp; ++ tcp->u_nargs = 5; ++ } ++ } +++#elif defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64) +++ /* N32 and N64 both use up to six registers. */ +++ { +++ unsigned long long regs[38]; +++ int i, nargs; +++ +++ if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1) +++ nargs = tcp->u_nargs = sysent[tcp->scno].nargs; +++ else +++ nargs = tcp->u_nargs = MAX_ARGS; +++ +++ if (ptrace (PTRACE_GETREGS, pid, NULL, (long) ®s) < 0) +++ return -1; +++ +++ for(i = 0; i < nargs; i++) { +++ tcp->u_arg[i] = regs[REG_A0 + i]; +++# if defined (LINUX_MIPSN32) +++ tcp->ext_arg[i] = regs[REG_A0 + i]; +++# endif +++ } +++ } ++ #elif defined (MIPS) ++ { ++ long sp; ++Index: linux/syscall.h ++=================================================================== ++RCS file: /cvsroot/strace/strace/linux/syscall.h,v ++retrieving revision 1.55 ++diff -u -p -r1.55 syscall.h ++--- strace/linux/syscall.h 2 Aug 2007 01:37:55 -0000 1.55 +++++ strace/linux/syscall.h 26 Aug 2007 19:13:48 -0000 ++@@ -317,3 +317,5 @@ int sys_capget(), sys_capset(); ++ #ifdef M68K ++ int sys_cacheflush(); ++ #endif +++ +++int sys_pread64(), sys_pwrite64(); ++Index: linux/mips/syscallent.h ++=================================================================== ++RCS file: /cvsroot/strace/strace/linux/mips/syscallent.h,v ++retrieving revision 1.28 ++diff -u -p -r1.28 syscallent.h ++--- strace/linux/mips/syscallent.h 2 Aug 2007 01:44:14 -0000 1.28 +++++ strace/linux/mips/syscallent.h 26 Aug 2007 19:13:51 -0000 ++@@ -1,3 +1,5 @@ +++#include "dummy.h" +++ ++ { 0, 0, printargs, "svr4_syscall" }, /* 000 */ ++ { 0, 0, printargs, "svr4_exit" }, /* 001 */ ++ { 0, 0, printargs, "svr4_fork" }, /* 002 */ ++@@ -3998,6 +4000,8 @@ ++ { 0, 0, printargs, "SYS_3997" }, /* 3997 */ ++ { 0, 0, printargs, "SYS_3998" }, /* 3998 */ ++ { 0, 0, printargs, "SYS_3999" }, /* 3999 */ /* end of POSIX */ +++#if !defined (LINUX_MIPSN32) && !defined (LINUX_MIPSN64) +++ /* For an O32 strace, decode the o32 syscalls. */ ++ { 8, 0, printargs, "syscall" }, /* 4000 */ /* start of Linux o32 */ ++ { 1, TP, sys_exit, "exit" }, /* 4001 */ ++ { 0, TP, sys_fork, "fork" }, /* 4002 */ ++@@ -4161,8 +4165,8 @@ ++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 4160 */ ++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 4161 */ ++ { 0, 0, sys_sched_yield, "sched_yield" }, /* 4162 */ ++- { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max" }, /* 4163 */ ++- { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min" }, /* 4164 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 4163 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 4164 */ ++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 4165 */ ++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 4166 */ ++ { 4, 0, sys_mremap, "mremap" }, /* 4167 */ ++@@ -4318,6 +4322,328 @@ ++ { 3, TD|TS, sys_signalfd, "signalfd" }, /* 4317 */ ++ { 4, TD, sys_timerfd, "timerfd" }, /* 4318 */ ++ { 1, TD, sys_eventfd, "eventfd" }, /* 4319 */ +++#else +++ { 0, 0, printargs, "o32_syscall" }, /* 4000 */ +++ { 0, 0, printargs, "o32_exit" }, /* 4001 */ +++ { 0, 0, printargs, "o32_fork" }, /* 4002 */ +++ { 0, 0, printargs, "o32_read" }, /* 4003 */ +++ { 0, 0, printargs, "o32_write" }, /* 4004 */ +++ { 0, 0, printargs, "o32_open" }, /* 4005 */ +++ { 0, 0, printargs, "o32_close" }, /* 4006 */ +++ { 0, 0, printargs, "o32_waitpid" }, /* 4007 */ +++ { 0, 0, printargs, "o32_creat" }, /* 4008 */ +++ { 0, 0, printargs, "o32_link" }, /* 4009 */ +++ { 0, 0, printargs, "o32_unlink" }, /* 4010 */ +++ { 0, 0, printargs, "o32_execve" }, /* 4011 */ +++ { 0, 0, printargs, "o32_chdir" }, /* 4012 */ +++ { 0, 0, printargs, "o32_time" }, /* 4013 */ +++ { 0, 0, printargs, "o32_mknod" }, /* 4014 */ +++ { 0, 0, printargs, "o32_chmod" }, /* 4015 */ +++ { 0, 0, printargs, "o32_lchown" }, /* 4016 */ +++ { 0, 0, printargs, "o32_break" }, /* 4017 */ +++ { 0, 0, printargs, "o32_oldstat" }, /* 4018 */ +++ { 0, 0, printargs, "o32_lseek" }, /* 4019 */ +++ { 0, 0, printargs, "o32_getpid" }, /* 4020 */ +++ { 0, 0, printargs, "o32_mount" }, /* 4021 */ +++ { 0, 0, printargs, "o32_oldumount" }, /* 4022 */ +++ { 0, 0, printargs, "o32_setuid" }, /* 4023 */ +++ { 0, 0, printargs, "o32_getuid" }, /* 4024 */ +++ { 0, 0, printargs, "o32_stime" }, /* 4025 */ +++ { 0, 0, printargs, "o32_ptrace" }, /* 4026 */ +++ { 0, 0, printargs, "o32_alarm" }, /* 4027 */ +++ { 0, 0, printargs, "o32_oldfstat" }, /* 4028 */ +++ { 0, 0, printargs, "o32_pause" }, /* 4029 */ +++ { 0, 0, printargs, "o32_utime" }, /* 4030 */ +++ { 0, 0, printargs, "o32_stty" }, /* 4031 */ +++ { 0, 0, printargs, "o32_gtty" }, /* 4032 */ +++ { 0, 0, printargs, "o32_access" }, /* 4033 */ +++ { 0, 0, printargs, "o32_nice" }, /* 4034 */ +++ { 0, 0, printargs, "o32_ftime" }, /* 4035 */ +++ { 0, 0, printargs, "o32_sync" }, /* 4036 */ +++ { 0, 0, printargs, "o32_kill" }, /* 4037 */ +++ { 0, 0, printargs, "o32_rename" }, /* 4038 */ +++ { 0, 0, printargs, "o32_mkdir" }, /* 4039 */ +++ { 0, 0, printargs, "o32_rmdir" }, /* 4040 */ +++ { 0, 0, printargs, "o32_dup" }, /* 4041 */ +++ { 0, 0, printargs, "o32_pipe" }, /* 4042 */ +++ { 0, 0, printargs, "o32_times" }, /* 4043 */ +++ { 0, 0, printargs, "o32_prof" }, /* 4044 */ +++ { 0, 0, printargs, "o32_brk" }, /* 4045 */ +++ { 0, 0, printargs, "o32_setgid" }, /* 4046 */ +++ { 0, 0, printargs, "o32_getgid" }, /* 4047 */ +++ { 0, 0, printargs, "o32_signal" }, /* 4048 */ +++ { 0, 0, printargs, "o32_geteuid" }, /* 4049 */ +++ { 0, 0, printargs, "o32_getegid" }, /* 4050 */ +++ { 0, 0, printargs, "o32_acct" }, /* 4051 */ +++ { 0, 0, printargs, "o32_umount" }, /* 4052 */ +++ { 0, 0, printargs, "o32_lock" }, /* 4053 */ +++ { 0, 0, printargs, "o32_ioctl" }, /* 4054 */ +++ { 0, 0, printargs, "o32_fcntl" }, /* 4055 */ +++ { 0, 0, printargs, "o32_mpx" }, /* 4056 */ +++ { 0, 0, printargs, "o32_setpgid" }, /* 4057 */ +++ { 0, 0, printargs, "o32_ulimit" }, /* 4058 */ +++ { 0, 0, printargs, "o32_oldolduname" }, /* 4059 */ +++ { 0, 0, printargs, "o32_umask" }, /* 4060 */ +++ { 0, 0, printargs, "o32_chroot" }, /* 4061 */ +++ { 0, 0, printargs, "o32_ustat" }, /* 4062 */ +++ { 0, 0, printargs, "o32_dup2" }, /* 4063 */ +++ { 0, 0, printargs, "o32_getppid" }, /* 4064 */ +++ { 0, 0, printargs, "o32_getpgrp" }, /* 4065 */ +++ { 0, 0, printargs, "o32_setsid" }, /* 4066 */ +++ { 0, 0, printargs, "o32_sigaction" }, /* 4067 */ +++ { 0, 0, printargs, "o32_siggetmask" }, /* 4068 */ +++ { 0, 0, printargs, "o32_sigsetmask" }, /* 4069 */ +++ { 0, 0, printargs, "o32_setreuid" }, /* 4070 */ +++ { 0, 0, printargs, "o32_setregid" }, /* 4071 */ +++ { 0, 0, printargs, "o32_sigsuspend" }, /* 4072 */ +++ { 0, 0, printargs, "o32_sigpending" }, /* 4073 */ +++ { 0, 0, printargs, "o32_sethostname" }, /* 4074 */ +++ { 0, 0, printargs, "o32_setrlimit" }, /* 4075 */ +++ { 0, 0, printargs, "o32_getrlimit" }, /* 4076 */ +++ { 0, 0, printargs, "o32_getrusage" }, /* 4077 */ +++ { 0, 0, printargs, "o32_gettimeofday" }, /* 4078 */ +++ { 0, 0, printargs, "o32_settimeofday" }, /* 4079 */ +++ { 0, 0, printargs, "o32_getgroups" }, /* 4080 */ +++ { 0, 0, printargs, "o32_setgroups" }, /* 4081 */ +++ { 0, 0, printargs, "o32_reserved82" }, /* 4082 */ +++ { 0, 0, printargs, "o32_symlink" }, /* 4083 */ +++ { 0, 0, printargs, "o32_oldlstat" }, /* 4084 */ +++ { 0, 0, printargs, "o32_readlink" }, /* 4085 */ +++ { 0, 0, printargs, "o32_uselib" }, /* 4086 */ +++ { 0, 0, printargs, "o32_swapon" }, /* 4087 */ +++ { 0, 0, printargs, "o32_reboot" }, /* 4088 */ +++ { 0, 0, printargs, "o32_readdir" }, /* 4089 */ +++ { 0, 0, printargs, "o32_old_mmap" }, /* 4090 */ +++ { 0, 0, printargs, "o32_munmap" }, /* 4091 */ +++ { 0, 0, printargs, "o32_truncate" }, /* 4092 */ +++ { 0, 0, printargs, "o32_ftruncate" }, /* 4093 */ +++ { 0, 0, printargs, "o32_fchmod" }, /* 4094 */ +++ { 0, 0, printargs, "o32_fchown" }, /* 4095 */ +++ { 0, 0, printargs, "o32_getpriority" }, /* 4096 */ +++ { 0, 0, printargs, "o32_setpriority" }, /* 4097 */ +++ { 0, 0, printargs, "o32_profil" }, /* 4098 */ +++ { 0, 0, printargs, "o32_statfs" }, /* 4099 */ +++ { 0, 0, printargs, "o32_fstatfs" }, /* 4100 */ +++ { 0, 0, printargs, "o32_ioperm" }, /* 4101 */ +++ { 0, 0, printargs, "o32_socketcall" }, /* 4102 */ +++ { 0, 0, printargs, "o32_syslog" }, /* 4103 */ +++ { 0, 0, printargs, "o32_setitimer" }, /* 4104 */ +++ { 0, 0, printargs, "o32_getitimer" }, /* 4105 */ +++ { 0, 0, printargs, "o32_stat" }, /* 4106 */ +++ { 0, 0, printargs, "o32_lstat" }, /* 4107 */ +++ { 0, 0, printargs, "o32_fstat" }, /* 4108 */ +++ { 0, 0, printargs, "o32_olduname" }, /* 4109 */ +++ { 0, 0, printargs, "o32_iopl" }, /* 4110 */ +++ { 0, 0, printargs, "o32_vhangup" }, /* 4111 */ +++ { 0, 0, printargs, "o32_idle" }, /* 4112 */ +++ { 0, 0, printargs, "o32_vm86" }, /* 4113 */ +++ { 0, 0, printargs, "o32_wait4" }, /* 4114 */ +++ { 0, 0, printargs, "o32_swapoff" }, /* 4115 */ +++ { 0, 0, printargs, "o32_sysinfo" }, /* 4116 */ +++ { 0, 0, printargs, "o32_ipc" }, /* 4117 */ +++ { 0, 0, printargs, "o32_fsync" }, /* 4118 */ +++ { 0, 0, printargs, "o32_sigreturn" }, /* 4119 */ +++ { 0, 0, printargs, "o32_clone" }, /* 4120 */ +++ { 0, 0, printargs, "o32_setdomainname" }, /* 4121 */ +++ { 0, 0, printargs, "o32_uname" }, /* 4122 */ +++ { 0, 0, printargs, "o32_modify_ldt" }, /* 4123 */ +++ { 0, 0, printargs, "o32_adjtimex" }, /* 4124 */ +++ { 0, 0, printargs, "o32_mprotect" }, /* 4125 */ +++ { 0, 0, printargs, "o32_sigprocmask" }, /* 4126 */ +++ { 0, 0, printargs, "o32_create_module" }, /* 4127 */ +++ { 0, 0, printargs, "o32_init_module" }, /* 4128 */ +++ { 0, 0, printargs, "o32_delete_module" }, /* 4129 */ +++ { 0, 0, printargs, "o32_get_kernel_syms"}, /* 4130 */ +++ { 0, 0, printargs, "o32_quotactl" }, /* 4131 */ +++ { 0, 0, printargs, "o32_getpgid" }, /* 4132 */ +++ { 0, 0, printargs, "o32_fchdir" }, /* 4133 */ +++ { 0, 0, printargs, "o32_bdflush" }, /* 4134 */ +++ { 0, 0, printargs, "o32_sysfs" }, /* 4135 */ +++ { 0, 0, printargs, "o32_personality" }, /* 4136 */ +++ { 0, 0, printargs, "o32_afs_syscall" }, /* 4137 */ +++ { 0, 0, printargs, "o32_setfsuid" }, /* 4138 */ +++ { 0, 0, printargs, "o32_setfsgid" }, /* 4139 */ +++ { 0, 0, printargs, "o32__llseek" }, /* 4140 */ +++ { 0, 0, printargs, "o32_getdents" }, /* 4141 */ +++ { 0, 0, printargs, "o32__newselect" }, /* 4142 */ +++ { 0, 0, printargs, "o32_flock" }, /* 4143 */ +++ { 0, 0, printargs, "o32_msync" }, /* 4144 */ +++ { 0, 0, printargs, "o32_readv" }, /* 4145 */ +++ { 0, 0, printargs, "o32_writev" }, /* 4146 */ +++ { 0, 0, printargs, "o32_cacheflush" }, /* 4147 */ +++ { 0, 0, printargs, "o32_cachectl" }, /* 4148 */ +++ { 0, 0, printargs, "o32_sysmips" }, /* 4149 */ +++ { 0, 0, printargs, "o32_setup" }, /* 4150 */ +++ { 0, 0, printargs, "o32_getsid" }, /* 4151 */ +++ { 0, 0, printargs, "o32_fdatasync" }, /* 4152 */ +++ { 0, 0, printargs, "o32__sysctl" }, /* 4153 */ +++ { 0, 0, printargs, "o32_mlock" }, /* 4154 */ +++ { 0, 0, printargs, "o32_munlock" }, /* 4155 */ +++ { 0, 0, printargs, "o32_mlockall" }, /* 4156 */ +++ { 0, 0, printargs, "o32_munlockall" }, /* 4157 */ +++ { 0, 0, printargs, "o32_sched_setparam"}, /* 4158 */ +++ { 0, 0, printargs, "o32_sched_getparam"}, /* 4159 */ +++ { 0, 0, printargs, "o32_sched_setscheduler"}, /* 4160 */ +++ { 0, 0, printargs, "o32_sched_getscheduler"}, /* 4161 */ +++ { 0, 0, printargs, "o32_sched_yield" }, /* 4162 */ +++ { 0, 0, printargs, "o32_sched_get_priority_max"}, /* 4163 */ +++ { 0, 0, printargs, "o32_sched_get_priority_min"},/* 4164 */ +++ { 0, 0, printargs, "o32_sched_rr_get_interval"}, /* 4165 */ +++ { 0, 0, printargs, "o32_nanosleep" }, /* 4166 */ +++ { 0, 0, printargs, "o32_mremap" }, /* 4167 */ +++ { 0, 0, printargs, "o32_accept" }, /* 4168 */ +++ { 0, 0, printargs, "o32_bind" }, /* 4169 */ +++ { 0, 0, printargs, "o32_connect" }, /* 4170 */ +++ { 0, 0, printargs, "o32_getpeername" }, /* 4171 */ +++ { 0, 0, printargs, "o32_getsockname" }, /* 4172 */ +++ { 0, 0, printargs, "o32_getsockopt" }, /* 4173 */ +++ { 0, 0, printargs, "o32_listen" }, /* 4174 */ +++ { 0, 0, printargs, "o32_recv" }, /* 4175 */ +++ { 0, 0, printargs, "o32_recvfrom" }, /* 4176 */ +++ { 0, 0, printargs, "o32_recvmsg" }, /* 4177 */ +++ { 0, 0, printargs, "o32_send" }, /* 4178 */ +++ { 0, 0, printargs, "o32_sendmsg" }, /* 4179 */ +++ { 0, 0, printargs, "o32_sendto" }, /* 4180 */ +++ { 0, 0, printargs, "o32_setsockopt" }, /* 4181 */ +++ { 0, 0, printargs, "o32_shutdown" }, /* 4182 */ +++ { 0, 0, printargs, "o32_socket" }, /* 4183 */ +++ { 0, 0, printargs, "o32_socketpair" }, /* 4184 */ +++ { 0, 0, printargs, "o32_setresuid" }, /* 4185 */ +++ { 0, 0, printargs, "o32_getresuid" }, /* 4186 */ +++ { 0, 0, printargs, "o32_query_module" }, /* 4187 */ +++ { 0, 0, printargs, "o32_poll" }, /* 4188 */ +++ { 0, 0, printargs, "o32_nfsservctl" }, /* 4189 */ +++ { 0, 0, printargs, "o32_setresgid" }, /* 4190 */ +++ { 0, 0, printargs, "o32_getresgid" }, /* 4191 */ +++ { 0, 0, printargs, "o32_prctl" }, /* 4192 */ +++ { 0, 0, printargs, "o32_rt_sigreturn" }, /* 4193 */ +++ { 0, 0, printargs, "o32_rt_sigaction" }, /* 4194 */ +++ { 0, 0, printargs, "o32_rt_sigprocmask"}, /* 4195 */ +++ { 0, 0, printargs, "o32_rt_sigpending" }, /* 4196 */ +++ { 0, 0, printargs, "o32_rt_sigtimedwait"},/* 4197 */ +++ { 0, 0, printargs, "o32_rt_sigqueueinfo"},/* 4198 */ +++ { 0, 0, printargs, "o32_rt_siguspend" }, /* 4199 */ +++ { 0, 0, printargs, "o32_pread" }, /* 4200 */ +++ { 0, 0, printargs, "o32_pwrite" }, /* 4201 */ +++ { 0, 0, printargs, "o32_chown" }, /* 4202 */ +++ { 0, 0, printargs, "o32_getcwd" }, /* 4203 */ +++ { 0, 0, printargs, "o32_capget" }, /* 4204 */ +++ { 0, 0, printargs, "o32_capset" }, /* 4205 */ +++ { 0, 0, printargs, "o32_sigaltstatck" }, /* 4206 */ +++ { 0, 0, printargs, "o32_sendfile" }, /* 4207 */ +++ { 0, 0, printargs, "SYS_4208" }, /* 4208 */ +++ { 0, 0, printargs, "SYS_4209" }, /* 4209 */ +++ { 0, 0, printargs, "o32_mmap" }, /* 4210 */ +++ { 0, 0, printargs, "o32_truncate64" }, /* 4211 */ +++ { 0, 0, printargs, "o32_ftruncate64" }, /* 4212 */ +++ { 0, 0, printargs, "o32_stat64" }, /* 4213 */ +++ { 0, 0, printargs, "o32_lstat64" }, /* 4214 */ +++ { 0, 0, printargs, "o32_fstat64" }, /* 4215 */ +++ { 0, 0, printargs, "o32_pivot_root" }, /* 4216 */ +++ { 0, 0, printargs, "o32_mincore" }, /* 4217 */ +++ { 0, 0, printargs, "o32_madvise" }, /* 4218 */ +++ { 0, 0, printargs, "o32_getdents64" }, /* 4219 */ +++ { 0, 0, printargs, "o32_fcntl64" }, /* 4220 */ +++ { 0, 0, printargs, "SYS_4221" }, /* 4221 */ +++ { 0, 0, printargs, "o32_gettid" }, /* 4222 */ +++ { 5, TD, printargs, "o32_readahead" }, /* 4223 */ +++ { 5, TF, printargs, "o32_setxattr" }, /* 4224 */ +++ { 5, TF, printargs, "o32_lsetxattr" }, /* 4225 */ +++ { 5, TD, printargs, "o32_fsetxattr" }, /* 4226 */ +++ { 4, TF, printargs, "o32_getxattr" }, /* 4227 */ +++ { 4, TF, printargs, "o32_lgetxattr" }, /* 4228 */ +++ { 4, 0, printargs, "o32_fgetxattr" }, /* 4229 */ +++ { 3, TF, printargs, "o32_listxattr" }, /* 4230 */ +++ { 3, TF, printargs, "o32_llistxattr" }, /* 4231 */ +++ { 3, 0, printargs, "o32_flistxattr" }, /* 4232 */ +++ { 2, TF, printargs, "o32_removexattr" }, /* 4233 */ +++ { 2, TF, printargs, "o32_lremovexattr" }, /* 4234 */ +++ { 2, TD, printargs, "o32_fremovexattr" }, /* 4235 */ +++ { 2, TS, printargs, "o32_tkill" }, /* 4236 */ +++ { 5, TD, printargs, "o32_sendfile64" }, /* 4237 */ +++ { 6, 0, printargs, "o32_futex" }, /* 4238 */ +++ { 3, 0, printargs, "o32_sched_setaffinity"}, /* 4239 */ +++ { 3, 0, printargs, "o32_sched_getaffinity"}, /* 4240 */ +++ { 2, 0, printargs, "o32_io_setup" }, /* 4241 */ +++ { 1, 0, printargs, "o32_io_destroy" }, /* 4242 */ +++ { 5, 0, printargs, "o32_io_getevents" }, /* 4243 */ +++ { 3, 0, printargs, "o32_io_submit" }, /* 4244 */ +++ { 3, 0, printargs, "o32_io_cancel" }, /* 4245 */ +++ { 1, TP, printargs, "o32_exit_group" }, /* 4246 */ +++ { 3, 0, printargs, "o32_lookup_dcookie"}, /* 4247 */ +++ { 1, 0, printargs, "o32_epoll_create" }, /* 4248 */ +++ { 4, TD, printargs, "o32_epoll_ctl" }, /* 4249 */ +++ { 3, TD, printargs, "o32_epoll_wait" }, /* 4250 */ +++ { 5, 0, printargs, "o32_remap_file_pages"}, /* 4251 */ +++ { 1, 0, printargs, "o32_set_tid_address"}, /* 4252 */ +++ { 0, 0, printargs, "o32_restart_syscall"}, /* 4253 */ +++ { 7, 0, printargs, "o32_fadvise64_64" }, /* 4254 */ +++ { 3, TF, printargs, "o32_statfs64" }, /* 4255 */ +++ { 2, TD, printargs, "o32_fstatfs64" }, /* 4256 */ +++ { 3, 0, printargs, "o32_timer_create" }, /* 4257 */ +++ { 4, 0, printargs, "o32_timer_settime" }, /* 4258 */ +++ { 2, 0, printargs, "o32_timer_gettime" }, /* 4259 */ +++ { 1, 0, printargs, "o32_timer_getoverrun"}, /* 4260 */ +++ { 1, 0, printargs, "o32_timer_delete" }, /* 4261 */ +++ { 2, 0, printargs, "o32_clock_settime" }, /* 4262 */ +++ { 2, 0, printargs, "o32_clock_gettime" }, /* 4263 */ +++ { 2, 0, printargs, "o32_clock_getres" }, /* 4264 */ +++ { 4, 0, printargs, "o32_clock_nanosleep"}, /* 4265 */ +++ { 3, TS, printargs, "o32_tgkill" }, /* 4266 */ +++ { 2, TF, printargs, "o32_utimes" }, /* 4267 */ +++ { 4, 0, printargs, "o32_mbind" }, /* 4268 */ +++ { 0, 0, printargs, "o32_SYS_4269" }, /* 4269 */ +++ { 0, 0, printargs, "o32_SYS_4270" }, /* 4270 */ +++ { 4, 0, printargs, "o32_mq_open" }, /* 4271 */ +++ { 1, 0, printargs, "o32_mq_unlink" }, /* 4272 */ +++ { 5, 0, printargs, "o32_mq_timedsend" }, /* 4273 */ +++ { 5, 0, printargs, "o32_mq_timedreceive"}, /* 4274 */ +++ { 2, 0, printargs, "o32_mq_notify" }, /* 4275 */ +++ { 3, 0, printargs, "o32_mq_getsetattr" }, /* 4276 */ +++ { 0, 0, printargs, "o32_SYS_4277" }, /* 4277 */ +++ { 5, TP, printargs, "o32_waitid" }, /* 4278 */ +++ { 0, 0, printargs, "o32_SYS_4279" }, /* 4279 */ +++ { 5, 0, printargs, "o32_add_key" }, /* 4280 */ +++ { 4, 0, printargs, "o32_request_key" }, /* 4281 */ +++ { 5, 0, printargs, "o32_keyctl" }, /* 4282 */ +++ { 1, 0, printargs, "o32_set_thread_area" }, /* 4283 */ +++ { 0, TD, printargs, "o32_inotify_init" }, /* 4284 */ +++ { 3, TD, printargs, "o32_inotify_add_watch" }, /* 4285 */ +++ { 2, TD, printargs, "o32_inotify_rm_watch" }, /* 4286 */ +++ { 4, 0, printargs, "o32_migrate_pages" }, /* 4287 */ +++ { 4, TD|TF, printargs, "o32_openat" }, /* 4288 */ +++ { 3, TD|TF, printargs, "o32_mkdirat" }, /* 4289 */ +++ { 4, TD|TF, printargs, "o32_mknodat" }, /* 4290 */ +++ { 5, TD|TF, printargs, "o32_fchownat" }, /* 4291 */ +++ { 3, TD|TF, printargs, "o32_futimesat" }, /* 4292 */ +++ { 4, TD|TD, printargs, "o32_newfstatat" }, /* 4293 */ +++ { 3, TD|TF, printargs, "o32_unlinkat" }, /* 4294 */ +++ { 4, TD|TF, printargs, "o32_renameat" }, /* 4295 */ +++ { 5, TD|TF, printargs, "o32_linkat" }, /* 4296 */ +++ { 3, TD|TF, printargs, "o32_symlinkat" }, /* 4297 */ +++ { 4, TD|TF, printargs, "o32_readlinkat" }, /* 4298 */ +++ { 3, TD|TF, printargs, "o32_fchmodat" }, /* 4299 */ +++ { 3, TD|TF, printargs, "o32_faccessat" }, /* 4300 */ +++ { 6, TD, printargs, "o32_pselect6" }, /* 4301 */ +++ { 5, TD, printargs, "o32_ppoll" }, /* 4302 */ +++ { 1, TP, printargs, "o32_unshare" }, /* 4303 */ +++ { 6, TD, printargs, "o32_splice" }, /* 4304 */ +++ { 4, TD, printargs, "o32_sync_file_range" }, /* 4305 */ +++ { 0, 0, printargs, "o32_SYS_4306" }, /* 4306 */ +++ { 0, 0, printargs, "o32_SYS_4307" }, /* 4307 */ +++ { 6, 0, printargs, "o32_move_pages" }, /* 4308 */ +++ { 0, 0, printargs, "o32_SYS_4309" }, /* 4309 */ +++ { 0, 0, printargs, "o32_SYS_4310" }, /* 4310 */ +++ { 0, 0, printargs, "o32_SYS_4311" }, /* 4311 */ +++ { 3, 0, printargs, "o32_getcpu" }, /* 4312 */ +++ { 5, TD, printargs, "o32_epoll_pwait" }, /* 4313 */ +++ { 0, 0, printargs, "o32_SYS_4314" }, /* 4314 */ +++ { 0, 0, printargs, "o32_SYS_4315" }, /* 4315 */ +++ { 0, 0, printargs, "o32_SYS_4316" }, /* 4316 */ +++ { 3, TD|TS, printargs, "o32_signalfd" }, /* 4317 */ +++ { 4, TD, printargs, "o32_timerfd" }, /* 4318 */ +++ { 1, TD, printargs, "o32_eventfd" }, /* 4319 */ +++#endif ++ { 0, 0, printargs, "SYS_4320" }, /* 4320 */ ++ { 0, 0, printargs, "SYS_4321" }, /* 4321 */ ++ { 0, 0, printargs, "SYS_4322" }, /* 4322 */ ++@@ -4998,3 +5324,2464 @@ ++ { 0, 0, printargs, "SYS_4997" }, /* 4997 */ ++ { 0, 0, printargs, "SYS_4998" }, /* 4998 */ ++ { 0, 0, printargs, "SYS_4999" }, /* 4999 */ /* end of Linux o32 */ +++#if defined (LINUX_MIPSN64) +++ /* For an N64 strace decode the N64 64-bit syscalls. */ +++ { 3, TF, sys_read, "read" }, /* 5000 */ /* start of Linux N64 */ +++ { 3, TF, sys_write, "write" }, /* 5001 */ +++ { 3, TF, sys_open, "open" }, /* 5002 */ +++ { 1, 0, sys_close, "close" }, /* 5003 */ +++ { 2, TF, sys_stat, "stat" }, /* 5004 */ +++ { 2, 0, sys_fstat, "fstat" }, /* 5005 */ +++ { 2, TF, sys_lstat, "lstat" }, /* 5006 */ +++ { 3, 0, sys_poll, "poll" }, /* 5007 */ +++ { 3, 0, sys_lseek, "lseek" }, /* 5008 */ +++ { 6, 0, sys_mmap, "mmap" }, /* 5009 */ +++ { 3, 0, sys_mprotect, "mprotect" }, /* 5010 */ +++ { 2, 0, sys_munmap, "munmap" }, /* 5011 */ +++ { 1, 0, sys_brk, "brk" }, /* 5012 */ +++ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 5013 */ +++ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 5014 */ +++ { 3, 0, sys_ioctl, "ioctl" }, /* 5015 */ +++ { 6, TF, sys_pread64, "pread" }, /* 5016 */ +++ { 6, TF, sys_pwrite64, "pwrite" }, /* 5017 */ +++ { 3, 0, sys_readv, "readv" }, /* 5018 */ +++ { 3, 0, sys_writev, "writev" }, /* 5019 */ +++ { 2, TF, sys_access, "access" }, /* 5020 */ +++ { 1, 0, sys_pipe, "pipe" }, /* 5021 */ +++ { 5, 0, sys_select, "_newselect" }, /* 5022 */ +++ { 0, 0, sys_sched_yield, "sched_yield" }, /* 5023 */ +++ { 4, 0, sys_mremap, "mremap" }, /* 5024 */ +++ { 3, 0, sys_msync, "msync" }, /* 5025 */ +++ { 3, 0, printargs, "mincore" }, /* 5026 */ +++ { 3, 0, sys_madvise, "madvise" }, /* 5027 */ +++ { 3, TI, sys_shmget, "shmget" }, /* 5028 */ +++ { 3, TI, sys_shmat, "shmgat" }, /* 5029 */ +++ { 3, TI, sys_shmctl, "shmctl" }, /* 5030 */ +++ { 1, 0, sys_dup, "dup" }, /* 5031 */ +++ { 2, 0, sys_dup2, "dup2" }, /* 5032 */ +++ { 0, TS, sys_pause, "pause" }, /* 5033 */ +++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 5034 */ +++ { 2, 0, sys_getitimer, "getitimer" }, /* 5035 */ +++ { 3, 0, sys_setitimer, "setitimer" }, /* 5036 */ +++ { 1, 0, sys_alarm, "alarm" }, /* 5037 */ +++ { 0, 0, sys_getpid, "getpid" }, /* 5038 */ +++ { 4, TF, sys_sendfile, "sendfile" }, /* 5039 */ +++ { 2, 0, sys_socketcall, "socketcall" }, /* 5040 */ +++ { 3, TN, sys_connect, "connect" }, /* 5041 */ +++ { 3, TN, sys_accept, "accept" }, /* 5042 */ +++ { 6, TN, sys_sendto, "sendto" }, /* 5043 */ +++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 5044 */ +++ { 3, TN, sys_sendmsg, "sendmsg" }, /* 5045 */ +++ { 3, TN, sys_recvmsg, "recvmsg" }, /* 5046 */ +++ { 2, TN, sys_shutdown, "shutdown" }, /* 5047 */ +++ { 3, TN, sys_bind, "bind" }, /* 5048 */ +++ { 2, TN, sys_listen, "listen" }, /* 5049 */ +++ { 3, TN, sys_getsockname, "getsockname" }, /* 5050 */ +++ { 3, TN, sys_getpeername, "getpeername" }, /* 5051 */ +++ { 4, TN, sys_socketpair, "socketpair" }, /* 5052 */ +++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 5053 */ +++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 5054 */ +++ { 2, TP, sys_clone, "clone" }, /* 5055 */ +++ { 0, TP, sys_fork, "fork" }, /* 5056 */ +++ { 3, TF|TP, sys_execve, "execve" }, /* 5057 */ +++ { 1, TP, sys_exit, "exit" }, /* 5058 */ +++ { 4, TP, sys_wait4, "wait4" }, /* 5059 */ +++ { 2, TS, sys_kill, "kill" }, /* 5060 */ +++ { 1, 0, sys_uname, "uname" }, /* 5061 */ +++ { 3, TI, sys_semget, "semget" }, /* 5062 */ +++ { 3, TI, printargs, "semop" }, /* 5063 */ +++ { 4, TI, sys_semctl, "semctl" }, /* 5064 */ +++ { 1, TI, sys_shmdt, "shmdt" }, /* 5065 */ +++ { 2, TI, sys_msgget, "msgget" }, /* 5066 */ +++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 5067 */ +++ { 5, TI, sys_msgrcv, "msgrcv" }, /* 5068 */ +++ { 3, TI, sys_msgctl, "msgctl" }, /* 5069 */ +++ { 3, 0, sys_fcntl, "fcntl" }, /* 5070 */ +++ { 2, 0, sys_flock, "flock" }, /* 5071 */ +++ { 1, 0, sys_fsync, "fsync" }, /* 5072 */ +++ { 1, 0, sys_fdatasync, "fdatasync" }, /* 5073 */ +++ { 2, TF, sys_truncate, "truncate" }, /* 5074 */ +++ { 2, 0, sys_ftruncate, "ftruncate" }, /* 5075 */ +++ { 3, 0, sys_getdents, "getdents" }, /* 5076 */ +++ { 2, TF, sys_getcwd, "getcwd" }, /* 5077 */ +++ { 1, TF, sys_chdir, "chdir" }, /* 5078 */ +++ { 1, TF, sys_fchdir, "fchdir" }, /* 5079 */ +++ { 2, TF, sys_rename, "rename" }, /* 5080 */ +++ { 2, TF, sys_mkdir, "mkdir" }, /* 5081 */ +++ { 1, TF, sys_rmdir, "rmdir" }, /* 5082 */ +++ { 2, TF, sys_creat, "creat" }, /* 5083 */ +++ { 2, TF, sys_link, "link" }, /* 5084 */ +++ { 1, TF, sys_unlink, "unlink" }, /* 5085 */ +++ { 2, TF, sys_symlink, "symlink" }, /* 5086 */ +++ { 3, TF, sys_readlink, "readlink" }, /* 5087 */ +++ { 2, TF, sys_chmod, "chmod" }, /* 5088 */ +++ { 2, 0, sys_fchmod, "fchmod" }, /* 5089 */ +++ { 3, TF, sys_chown, "chown" }, /* 5090 */ +++ { 3, 0, sys_fchown, "fchown" }, /* 5091 */ +++ { 3, TF, sys_chown, "lchown" }, /* 5092 */ +++ { 1, 0, sys_umask, "umask" }, /* 5093 */ +++ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 5094 */ +++ { 2, 0, sys_getrlimit, "getrlimit" }, /* 5095 */ +++ { 2, 0, sys_getrusage, "getrusage" }, /* 5096 */ +++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 5097 */ +++ { 1, 0, sys_times, "times" }, /* 5098 */ +++ { 4, 0, sys_ptrace, "ptrace" }, /* 5099 */ +++ { 0, 0, sys_getuid, "getuid" }, /* 5100 */ +++ { 3, 0, sys_syslog, "syslog" }, /* 5101 */ +++ { 0, 0, sys_getgid, "getgid" }, /* 5102 */ +++ { 1, 0, sys_setuid, "setuid" }, /* 5103 */ +++ { 1, 0, sys_setgid, "setgid" }, /* 5104 */ +++ { 0, 0, sys_geteuid, "geteuid" }, /* 5105 */ +++ { 0, 0, sys_getegid, "getegid" }, /* 5106 */ +++ { 2, 0, sys_setpgid, "setpgid" }, /* 5107 */ +++ { 0, 0, sys_getppid, "getppid" }, /* 5108 */ +++ { 0, 0, sys_getpgrp, "getpgrp" }, /* 5109 */ +++ { 0, 0, sys_setsid, "setsid" }, /* 5110 */ +++ { 2, 0, sys_setreuid, "setreuid" }, /* 5111 */ +++ { 2, 0, sys_setregid, "setregid" }, /* 5112 */ +++ { 2, 0, sys_getgroups, "getgroups" }, /* 5113 */ +++ { 2, 0, sys_setgroups, "setgroups" }, /* 5114 */ +++ { 3, 0, sys_setresuid, "setresuid" }, /* 5115 */ +++ { 3, 0, sys_getresuid, "getresuid" }, /* 5116 */ +++ { 3, 0, sys_setresgid, "setresgid" }, /* 5117 */ +++ { 3, 0, sys_getresgid, "getresgid" }, /* 5118 */ +++ { 0, 0, sys_getpgid, "getpgid" }, /* 5119 */ +++ { 1, 0, sys_setfsuid, "setfsuid" }, /* 5120 */ +++ { 1, 0, sys_setfsgid, "setfsgid" }, /* 5121 */ +++ { 1, 0, sys_getsid, "getsid" }, /* 5122 */ +++ { 2, 0, sys_capget, "capget" }, /* 5123 */ +++ { 2, 0, sys_capset, "capset" }, /* 5124 */ +++ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 5125 */ +++ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"},/* 5126 */ +++ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"},/* 5127 */ +++ { 2, TS, sys_rt_sigsuspend, "rt_siguspend" }, /* 5128 */ +++ { 2, TS, sys_sigaltstack, "sigaltstatck" }, /* 5129 */ +++ { 2, TF, sys_utime, "utime" }, /* 5130 */ +++ { 3, TF, sys_mknod, "mknod" }, /* 5131 */ +++ { 1, 0, sys_personality, "personality" }, /* 5132 */ +++ { 2, 0, sys_ustat, "ustat" }, /* 5133 */ +++ { 3, 0, sys_statfs, "statfs" }, /* 5134 */ +++ { 3, 0, sys_fstatfs, "fstatfs" }, /* 5135 */ +++ { 5, 0, sys_sysfs, "sysfs" }, /* 5136 */ +++ { 2, 0, sys_getpriority, "getpriority" }, /* 5137 */ +++ { 3, 0, sys_setpriority, "setpriority" }, /* 5138 */ +++ { 2, 0, sys_sched_setparam, "sched_setparam"}, /* 5139 */ +++ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 5140 */ +++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 5141 */ +++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 5142 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 5143 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 5144 */ +++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 5145 */ +++ { 2, 0, sys_mlock, "mlock" }, /* 5146 */ +++ { 2, 0, sys_munlock, "munlock" }, /* 5147 */ +++ { 1, 0, sys_mlockall, "mlockall" }, /* 5148 */ +++ { 0, 0, sys_munlockall, "munlockall" }, /* 5149 */ +++ { 0, 0, sys_vhangup, "vhangup" }, /* 5150 */ +++ { 2, 0, sys_pivotroot, "pivot_root" }, /* 5151 */ +++ { 1, 0, sys_sysctl, "_sysctl" }, /* 5152 */ +++ { 5, 0, printargs, "prctl" }, /* 5153 */ +++ { 1, 0, sys_adjtimex, "adjtimex" }, /* 5154 */ +++ { 2, 0, sys_setrlimit, "setrlimit" }, /* 5155 */ +++ { 1, TF, sys_chroot, "chroot" }, /* 5156 */ +++ { 0, 0, sys_sync, "sync" }, /* 5157 */ +++ { 1, TF, sys_acct, "acct" }, /* 5158 */ +++ { 2, 0, sys_settimeofday, "settimeofday" }, /* 5159 */ +++ { 5, TF, sys_mount, "mount" }, /* 5160 */ +++ { 2, TF, sys_umount2, "umount" }, /* 5161 */ +++ { 1, TF, sys_swapon, "swapon" }, /* 5162 */ +++ { 1, 0, sys_swapoff, "swapoff" }, /* 5163 */ +++ { 3, 0, sys_reboot, "reboot" }, /* 5164 */ +++ { 2, 0, sys_sethostname, "sethostname" }, /* 5165 */ +++ { 2, 0, sys_setdomainname, "setdomainname" }, /* 5166 */ +++ { 2, 0, sys_create_module, "create_module" }, /* 5167 */ +++ { 4, 0, sys_init_module, "init_module" }, /* 5168 */ +++ { 1, 0, sys_delete_module, "delete_module" }, /* 5169 */ +++ { 1, 0, sys_get_kernel_syms, "get_kernel_syms"}, /* 5170 */ +++ { 5, 0, sys_query_module, "query_module" }, /* 5171 */ +++ { 4, 0, sys_quotactl, "quotactl" }, /* 5172 */ +++ { 3, 0, printargs, "nfsservctl" }, /* 5173 */ +++ { 5, TN, printargs, "getpmsg" }, /* 5174 */ +++ { 5, TN, printargs, "putpmsg" }, /* 5175 */ +++ { 0, 0, sys_afs_syscall, "afs_syscall" }, /* 5176 */ +++ { 0, 0, printargs, "reserved177" }, /* 5177 */ +++ { 0, 0, printargs, "gettid" }, /* 5178 */ +++ { 3, 0, sys_readahead, "readahead" }, /* 5179 */ +++ { 5, 0, sys_setxattr, "setxattr" }, /* 5180 */ +++ { 5, 0, sys_setxattr, "lsetxattr" }, /* 5181 */ +++ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 5182 */ +++ { 4, 0, sys_getxattr, "getxattr" }, /* 5183 */ +++ { 4, 0, sys_getxattr, "lgetxattr" }, /* 5184 */ +++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 5185 */ +++ { 3, 0, sys_listxattr, "listxattr" }, /* 5186 */ +++ { 3, 0, sys_listxattr, "llistxattr" }, /* 5187 */ +++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 5188 */ +++ { 2, 0, sys_removexattr, "removexattr" }, /* 5189 */ +++ { 2, 0, sys_removexattr, "lremovexattr" }, /* 5190 */ +++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 5191 */ +++ { 2, 0, sys_kill, "tkill" }, /* 5192 */ +++ { 1, 0, sys_time, "time" }, /* 5193 */ +++ { 5, 0, printargs, "futex" }, /* 5194 */ +++ { 3, 0, printargs, "sched_setaffinity"}, /* 5195 */ +++ { 3, 0, printargs, "sched_getaffinity"}, /* 5196 */ +++ { 3, 0, printargs, "cacheflush" }, /* 5197 */ +++ { 3, 0, printargs, "cachectl" }, /* 5198 */ +++ { 4, 0, sys_sysmips, "sysmips" }, /* 5199 */ +++ { 0, 0, printargs, "SYS_5200" }, /* 5200 */ +++ { 0, 0, printargs, "SYS_5201" }, /* 5201 */ +++ { 0, 0, printargs, "SYS_5202" }, /* 5202 */ +++ { 0, 0, printargs, "SYS_5203" }, /* 5203 */ +++ { 0, 0, printargs, "SYS_5204" }, /* 5204 */ +++ { 1, TP, sys_exit, "exit_group" }, /* 5205 */ +++ { 0, 0, printargs, "SYS_5206" }, /* 5206 */ +++ { 0, 0, printargs, "SYS_5207" }, /* 5207 */ +++ { 0, 0, printargs, "SYS_5208" }, /* 5208 */ +++ { 0, 0, printargs, "SYS_5209" }, /* 5209 */ +++ { 0, 0, printargs, "SYS_5210" }, /* 5210 */ +++ { 1, TS, printargs, "rt_sigreturn" }, /* 5211 */ +++ { 5, 0, printargs, "timer_create" }, /* 5212 */ +++ { 5, 0, printargs, "timer_settime" }, /* 5213 */ +++ { 5, 0, printargs, "timer_gettime" }, /* 5214 */ +++ { 5, 0, printargs, "timer_getoverrun"}, /* 5215 */ +++ { 5, 0, printargs, "timer_delete" }, /* 5216 */ +++ { 5, 0, printargs, "clock_settime" }, /* 5217 */ +++ { 5, 0, printargs, "clock_gettime" }, /* 5218 */ +++ { 5, 0, printargs, "clock_getres" }, /* 5219 */ +++ { 5, 0, printargs, "clock_nanosleep"}, /* 5220 */ +++#else +++ { 0, 0, printargs, "n64_read" }, /* 5000 */ +++ { 0, 0, printargs, "n64_write" }, /* 5001 */ +++ { 0, 0, printargs, "n64_open" }, /* 5002 */ +++ { 0, 0, printargs, "n64_close" }, /* 5003 */ +++ { 0, 0, printargs, "n64_stat" }, /* 5004 */ +++ { 0, 0, printargs, "n64_fstat" }, /* 5005 */ +++ { 0, 0, printargs, "n64_lstat" }, /* 5006 */ +++ { 0, 0, printargs, "n64_poll" }, /* 5007 */ +++ { 0, 0, printargs, "n64_lseek" }, /* 5008 */ +++ { 0, 0, printargs, "n64_mmap" }, /* 5009 */ +++ { 0, 0, printargs, "n64_mprotect" }, /* 5010 */ +++ { 0, 0, printargs, "n64_munmap" }, /* 5011 */ +++ { 0, 0, printargs, "n64_brk" }, /* 5012 */ +++ { 0, 0, printargs, "n64_rt_sigaction" }, /* 5013 */ +++ { 0, 0, printargs, "n64_rt_sigprocmask" }, /* 5014 */ +++ { 0, 0, printargs, "n64_ioctl" }, /* 5015 */ +++ { 0, 0, printargs, "n64_pread" }, /* 5016 */ +++ { 0, 0, printargs, "n64_pwrite" }, /* 5017 */ +++ { 0, 0, printargs, "n64_readv" }, /* 5018 */ +++ { 0, 0, printargs, "n64_writev" }, /* 5019 */ +++ { 0, 0, printargs, "n64_access" }, /* 5020 */ +++ { 0, 0, printargs, "n64_pipe" }, /* 5021 */ +++ { 0, 0, printargs, "n64__newselect" }, /* 5022 */ +++ { 0, 0, printargs, "n64_sched_yield" }, /* 5023 */ +++ { 0, 0, printargs, "n64_mremap" }, /* 5024 */ +++ { 0, 0, printargs, "n64_msync" }, /* 5025 */ +++ { 0, 0, printargs, "n64_mincore" }, /* 5026 */ +++ { 0, 0, printargs, "n64_madvise" }, /* 5027 */ +++ { 0, 0, printargs, "n64_shmget" }, /* 5028 */ +++ { 0, 0, printargs, "n64_shmgat" }, /* 5029 */ +++ { 0, 0, printargs, "n64_shmctl" }, /* 5030 */ +++ { 0, 0, printargs, "n64_dup" }, /* 5031 */ +++ { 0, 0, printargs, "n64_dup2" }, /* 5032 */ +++ { 0, 0, printargs, "n64_pause" }, /* 5033 */ +++ { 0, 0, printargs, "n64_nanosleep" }, /* 5034 */ +++ { 0, 0, printargs, "n64_getitimer" }, /* 5035 */ +++ { 0, 0, printargs, "n64_setitimer" }, /* 5036 */ +++ { 0, 0, printargs, "n64_alarm" }, /* 5037 */ +++ { 0, 0, printargs, "n64_getpid" }, /* 5038 */ +++ { 0, 0, printargs, "n64_sendfile" }, /* 5039 */ +++ { 0, 0, printargs, "n64_socketcall" }, /* 5040 */ +++ { 0, 0, printargs, "n64_connect" }, /* 5041 */ +++ { 0, 0, printargs, "n64_accept" }, /* 5042 */ +++ { 0, 0, printargs, "n64_sendto" }, /* 5043 */ +++ { 0, 0, printargs, "n64_recvfrom" }, /* 5044 */ +++ { 0, 0, printargs, "n64_sendmsg" }, /* 5045 */ +++ { 0, 0, printargs, "n64_recvmsg" }, /* 5046 */ +++ { 0, 0, printargs, "n64_shutdown" }, /* 5047 */ +++ { 0, 0, printargs, "n64_bind" }, /* 5048 */ +++ { 0, 0, printargs, "n64_listen" }, /* 5049 */ +++ { 0, 0, printargs, "n64_getsockname" }, /* 5050 */ +++ { 0, 0, printargs, "n64_getpeername" }, /* 5051 */ +++ { 0, 0, printargs, "n64_socketpair" }, /* 5052 */ +++ { 0, 0, printargs, "n64_setsockopt" }, /* 5053 */ +++ { 0, 0, printargs, "n64_getsockopt" }, /* 5054 */ +++ { 0, 0, printargs, "n64_clone" }, /* 5055 */ +++ { 0, 0, printargs, "n64_fork" }, /* 5056 */ +++ { 0, 0, printargs, "n64_execve" }, /* 5057 */ +++ { 0, 0, printargs, "n64_exit" }, /* 5058 */ +++ { 0, 0, printargs, "n64_wait4" }, /* 5059 */ +++ { 0, 0, printargs, "n64_kill" }, /* 5060 */ +++ { 0, 0, printargs, "n64_uname" }, /* 5061 */ +++ { 0, 0, printargs, "n64_semget" }, /* 5062 */ +++ { 0, 0, printargs, "n64_semop" }, /* 5063 */ +++ { 0, 0, printargs, "n64_semctl" }, /* 5064 */ +++ { 0, 0, printargs, "n64_shmdt" }, /* 5065 */ +++ { 0, 0, printargs, "n64_msgget" }, /* 5066 */ +++ { 0, 0, printargs, "n64_msgsnd" }, /* 5067 */ +++ { 0, 0, printargs, "n64_msgrcv" }, /* 5068 */ +++ { 0, 0, printargs, "n64_msgctl" }, /* 5069 */ +++ { 0, 0, printargs, "n64_fcntl" }, /* 5070 */ +++ { 0, 0, printargs, "n64_flock" }, /* 5071 */ +++ { 0, 0, printargs, "n64_fsync" }, /* 5072 */ +++ { 0, 0, printargs, "n64_fdatasync" }, /* 5073 */ +++ { 0, 0, printargs, "n64_truncate" }, /* 5074 */ +++ { 0, 0, printargs, "n64_ftruncate" }, /* 5075 */ +++ { 0, 0, printargs, "n64_getdents" }, /* 5076 */ +++ { 0, 0, printargs, "n64_getcwd" }, /* 5077 */ +++ { 0, 0, printargs, "n64_chdir" }, /* 5078 */ +++ { 0, 0, printargs, "n64_fchdir" }, /* 5079 */ +++ { 0, 0, printargs, "n64_rename" }, /* 5080 */ +++ { 0, 0, printargs, "n64_mkdir" }, /* 5081 */ +++ { 0, 0, printargs, "n64_rmdir" }, /* 5082 */ +++ { 0, 0, printargs, "n64_creat" }, /* 5083 */ +++ { 0, 0, printargs, "n64_link" }, /* 5084 */ +++ { 0, 0, printargs, "n64_unlink" }, /* 5085 */ +++ { 0, 0, printargs, "n64_symlink" }, /* 5086 */ +++ { 0, 0, printargs, "n64_readlink" }, /* 5087 */ +++ { 0, 0, printargs, "n64_chmod" }, /* 5088 */ +++ { 0, 0, printargs, "n64_fchmod" }, /* 5089 */ +++ { 0, 0, printargs, "n64_chown" }, /* 5090 */ +++ { 0, 0, printargs, "n64_fchown" }, /* 5091 */ +++ { 0, 0, printargs, "n64_lchown" }, /* 5092 */ +++ { 0, 0, printargs, "n64_umask" }, /* 5093 */ +++ { 0, 0, printargs, "n64_gettimeofday" }, /* 5094 */ +++ { 0, 0, printargs, "n64_getrlimit" }, /* 5095 */ +++ { 0, 0, printargs, "n64_getrusage" }, /* 5096 */ +++ { 0, 0, printargs, "n64_sysinfo" }, /* 5097 */ +++ { 0, 0, printargs, "n64_times" }, /* 5098 */ +++ { 0, 0, printargs, "n64_ptrace" }, /* 5099 */ +++ { 0, 0, printargs, "n64_getuid" }, /* 5100 */ +++ { 0, 0, printargs, "n64_syslog" }, /* 5101 */ +++ { 0, 0, printargs, "n64_getgid" }, /* 5102 */ +++ { 0, 0, printargs, "n64_setuid" }, /* 5103 */ +++ { 0, 0, printargs, "n64_setgid" }, /* 5104 */ +++ { 0, 0, printargs, "n64_geteuid" }, /* 5105 */ +++ { 0, 0, printargs, "n64_getegid" }, /* 5106 */ +++ { 0, 0, printargs, "n64_setpgid" }, /* 5107 */ +++ { 0, 0, printargs, "n64_getppid" }, /* 5108 */ +++ { 0, 0, printargs, "n64_getpgrp" }, /* 5109 */ +++ { 0, 0, printargs, "n64_setsid" }, /* 5110 */ +++ { 0, 0, printargs, "n64_setreuid" }, /* 5111 */ +++ { 0, 0, printargs, "n64_setregid" }, /* 5112 */ +++ { 0, 0, printargs, "n64_getgroups" }, /* 5113 */ +++ { 0, 0, printargs, "n64_setgroups" }, /* 5114 */ +++ { 0, 0, printargs, "n64_setresuid" }, /* 5115 */ +++ { 0, 0, printargs, "n64_getresuid" }, /* 5116 */ +++ { 0, 0, printargs, "n64_setresgid" }, /* 5117 */ +++ { 0, 0, printargs, "n64_getresgid" }, /* 5118 */ +++ { 0, 0, printargs, "n64_getpgid" }, /* 5119 */ +++ { 0, 0, printargs, "n64_setfsuid" }, /* 5120 */ +++ { 0, 0, printargs, "n64_setfsgid" }, /* 5121 */ +++ { 0, 0, printargs, "n64_getsid" }, /* 5122 */ +++ { 0, 0, printargs, "n64_capget" }, /* 5123 */ +++ { 0, 0, printargs, "n64_capset" }, /* 5124 */ +++ { 0, 0, printargs, "n64_rt_sigpending" }, /* 5125 */ +++ { 0, 0, printargs, "n64_rt_sigtimedwait" }, /* 5126 */ +++ { 0, 0, printargs, "n64_rt_sigqueueinfo" }, /* 5127 */ +++ { 0, 0, printargs, "n64_rt_siguspend" }, /* 5128 */ +++ { 0, 0, printargs, "n64_sigaltstatck" }, /* 5129 */ +++ { 0, 0, printargs, "n64_utime" }, /* 5130 */ +++ { 0, 0, printargs, "n64_mknod" }, /* 5131 */ +++ { 0, 0, printargs, "n64_personality" }, /* 5132 */ +++ { 0, 0, printargs, "n64_ustat" }, /* 5133 */ +++ { 0, 0, printargs, "n64_statfs" }, /* 5134 */ +++ { 0, 0, printargs, "n64_fstatfs" }, /* 5135 */ +++ { 0, 0, printargs, "n64_sysfs" }, /* 5136 */ +++ { 0, 0, printargs, "n64_getpriority" }, /* 5137 */ +++ { 0, 0, printargs, "n64_setpriority" }, /* 5138 */ +++ { 0, 0, printargs, "n64_sched_setparam" }, /* 5139 */ +++ { 0, 0, printargs, "n64_sched_getparam" }, /* 5140 */ +++ { 0, 0, printargs, "n64_sched_setscheduler"}, /* 5141 */ +++ { 0, 0, printargs, "n64_sched_getscheduler"}, /* 5142 */ +++ { 0, 0, printargs, "n64_sched_get_priority_max"}, /* 5143 */ +++ { 0, 0, printargs, "n64_sched_get_priority_min"}, /* 5144 */ +++ { 0, 0, printargs, "n64_sched_rr_get_interval"}, /* 5145 */ +++ { 0, 0, printargs, "n64_mlock" }, /* 5146 */ +++ { 0, 0, printargs, "n64_munlock" }, /* 5147 */ +++ { 0, 0, printargs, "n64_mlockall" }, /* 5148 */ +++ { 0, 0, printargs, "n64_munlockall" }, /* 5149 */ +++ { 0, 0, printargs, "n64_vhangup" }, /* 5150 */ +++ { 0, 0, printargs, "n64_pivot_root" }, /* 5151 */ +++ { 0, 0, printargs, "n64__sysctl" }, /* 5152 */ +++ { 0, 0, printargs, "n64_prctl" }, /* 5153 */ +++ { 0, 0, printargs, "n64_adjtimex" }, /* 5154 */ +++ { 0, 0, printargs, "n64_setrlimit" }, /* 5155 */ +++ { 0, 0, printargs, "n64_chroot" }, /* 5156 */ +++ { 0, 0, printargs, "n64_sync" }, /* 5157 */ +++ { 0, 0, printargs, "n64_acct" }, /* 5158 */ +++ { 0, 0, printargs, "n64_settimeofday" }, /* 5159 */ +++ { 0, 0, printargs, "n64_mount" }, /* 5160 */ +++ { 0, 0, printargs, "n64_umount" }, /* 5161 */ +++ { 0, 0, printargs, "n64_swapon" }, /* 5162 */ +++ { 0, 0, printargs, "n64_swapoff" }, /* 5163 */ +++ { 0, 0, printargs, "n64_reboot" }, /* 5164 */ +++ { 0, 0, printargs, "n64_sethostname" }, /* 5165 */ +++ { 0, 0, printargs, "n64_setdomainname" }, /* 5166 */ +++ { 0, 0, printargs, "n64_create_module" }, /* 5167 */ +++ { 0, 0, printargs, "n64_init_module" }, /* 5168 */ +++ { 0, 0, printargs, "n64_delete_module" }, /* 5169 */ +++ { 0, 0, printargs, "n64_get_kernel_syms" }, /* 5170 */ +++ { 0, 0, printargs, "n64_query_module" }, /* 5171 */ +++ { 0, 0, printargs, "n64_quotactl" }, /* 5172 */ +++ { 0, 0, printargs, "n64_nfsservctl" }, /* 5173 */ +++ { 0, 0, printargs, "n64_getpmsg" }, /* 5174 */ +++ { 0, 0, printargs, "n64_putpmsg" }, /* 5175 */ +++ { 0, 0, printargs, "n64_afs_syscall" }, /* 5176 */ +++ { 0, 0, printargs, "n64_reserved177" }, /* 5177 */ +++ { 0, 0, printargs, "n64_gettid" }, /* 5178 */ +++ { 0, 0, printargs, "n64_readahead" }, /* 5179 */ +++ { 0, 0, printargs, "n64_setxattr" }, /* 5180 */ +++ { 0, 0, printargs, "n64_lsetxattr" }, /* 5181 */ +++ { 0, 0, printargs, "n64_fsetxattr" }, /* 5182 */ +++ { 0, 0, printargs, "n64_getxattr" }, /* 5183 */ +++ { 0, 0, printargs, "n64_lgetxattr" }, /* 5184 */ +++ { 0, 0, printargs, "n64_fgetxattr" }, /* 5185 */ +++ { 0, 0, printargs, "n64_listxattr" }, /* 5186 */ +++ { 0, 0, printargs, "n64_llistxattr" }, /* 5187 */ +++ { 0, 0, printargs, "n64_flistxattr" }, /* 5188 */ +++ { 0, 0, printargs, "n64_removexattr" }, /* 5189 */ +++ { 0, 0, printargs, "n64_lremovexattr" }, /* 5190 */ +++ { 0, 0, printargs, "n64_fremovexattr" }, /* 5191 */ +++ { 0, 0, printargs, "n64_tkill" }, /* 5192 */ +++ { 0, 0, printargs, "n64_time" }, /* 5193 */ +++ { 0, 0, printargs, "n64_futex" }, /* 5194 */ +++ { 0, 0, printargs, "n64_sched_setaffinity" }, /* 5195 */ +++ { 0, 0, printargs, "n64_sched_getaffinity" }, /* 5196 */ +++ { 0, 0, printargs, "n64_cacheflush" }, /* 5197 */ +++ { 0, 0, printargs, "n64_cachectl" }, /* 5198 */ +++ { 0, 0, printargs, "n64_sysmips" }, /* 5199 */ +++ { 0, 0, printargs, "SYS_5200" }, /* 5200 */ +++ { 0, 0, printargs, "SYS_5201" }, /* 5201 */ +++ { 0, 0, printargs, "SYS_5202" }, /* 5202 */ +++ { 0, 0, printargs, "SYS_5203" }, /* 5203 */ +++ { 0, 0, printargs, "SYS_5204" }, /* 5204 */ +++ { 1, TP, printargs, "n64_exit_group" }, /* 5205 */ +++ { 0, 0, printargs, "SYS_5206" }, /* 5206 */ +++ { 0, 0, printargs, "SYS_5207" }, /* 5207 */ +++ { 0, 0, printargs, "SYS_5208" }, /* 5208 */ +++ { 0, 0, printargs, "SYS_5209" }, /* 5209 */ +++ { 0, 0, printargs, "SYS_5210" }, /* 5210 */ +++ { 0, 0, printargs, "n64_rt_sigreturn" }, /* 5211 */ +++ { 5, 0, printargs, "n64_timer_create" }, /* 5212 */ +++ { 5, 0, printargs, "n64_timer_settime" }, /* 5213 */ +++ { 5, 0, printargs, "n64_timer_gettime" }, /* 5214 */ +++ { 5, 0, printargs, "n64_timer_getoverrun"}, /* 5215 */ +++ { 5, 0, printargs, "n64_timer_delete" }, /* 5216 */ +++ { 5, 0, printargs, "n64_clock_settime" }, /* 5217 */ +++ { 5, 0, printargs, "n64_clock_gettime" }, /* 5218 */ +++ { 5, 0, printargs, "n64_clock_getres" }, /* 5219 */ +++ { 5, 0, printargs, "n64_clock_nanosleep"}, /* 5220 */ +++#endif +++ { 0, 0, printargs, "SYS_5221" }, /* 5221 */ +++ { 0, 0, printargs, "SYS_5222" }, /* 5222 */ +++ { 0, 0, printargs, "SYS_5223" }, /* 5223 */ +++ { 0, 0, printargs, "SYS_5224" }, /* 5224 */ +++ { 0, 0, printargs, "SYS_5225" }, /* 5225 */ +++ { 0, 0, printargs, "SYS_5226" }, /* 5226 */ +++ { 0, 0, printargs, "SYS_5227" }, /* 5227 */ +++ { 0, 0, printargs, "SYS_5228" }, /* 5228 */ +++ { 0, 0, printargs, "SYS_5229" }, /* 5229 */ +++ { 0, 0, printargs, "SYS_5230" }, /* 5230 */ +++ { 0, 0, printargs, "SYS_5231" }, /* 5231 */ +++ { 0, 0, printargs, "SYS_5232" }, /* 5232 */ +++ { 0, 0, printargs, "SYS_5233" }, /* 5233 */ +++ { 0, 0, printargs, "SYS_5234" }, /* 5234 */ +++ { 0, 0, printargs, "SYS_5235" }, /* 5235 */ +++ { 0, 0, printargs, "SYS_5236" }, /* 5236 */ +++ { 0, 0, printargs, "SYS_5237" }, /* 5237 */ +++ { 0, 0, printargs, "SYS_5238" }, /* 5238 */ +++ { 0, 0, printargs, "SYS_5239" }, /* 5239 */ +++ { 0, 0, printargs, "SYS_5240" }, /* 5240 */ +++ { 0, 0, printargs, "SYS_5241" }, /* 5241 */ +++ { 0, 0, printargs, "SYS_5242" }, /* 5242 */ +++ { 0, 0, printargs, "SYS_5243" }, /* 5243 */ +++ { 0, 0, printargs, "SYS_5244" }, /* 5244 */ +++ { 0, 0, printargs, "SYS_5245" }, /* 5245 */ +++ { 0, 0, printargs, "SYS_5246" }, /* 5246 */ +++ { 0, 0, printargs, "SYS_5247" }, /* 5247 */ +++ { 0, 0, printargs, "SYS_5248" }, /* 5248 */ +++ { 0, 0, printargs, "SYS_5249" }, /* 5249 */ +++ { 0, 0, printargs, "SYS_5250" }, /* 5250 */ +++ { 0, 0, printargs, "SYS_5251" }, /* 5251 */ +++ { 0, 0, printargs, "SYS_5252" }, /* 5252 */ +++ { 0, 0, printargs, "SYS_5253" }, /* 5253 */ +++ { 0, 0, printargs, "SYS_5254" }, /* 5254 */ +++ { 0, 0, printargs, "SYS_5255" }, /* 5255 */ +++ { 0, 0, printargs, "SYS_5256" }, /* 5256 */ +++ { 0, 0, printargs, "SYS_5257" }, /* 5257 */ +++ { 0, 0, printargs, "SYS_5258" }, /* 5258 */ +++ { 0, 0, printargs, "SYS_5259" }, /* 5259 */ +++ { 0, 0, printargs, "SYS_5260" }, /* 5260 */ +++ { 0, 0, printargs, "SYS_5261" }, /* 5261 */ +++ { 0, 0, printargs, "SYS_5262" }, /* 5262 */ +++ { 0, 0, printargs, "SYS_5263" }, /* 5263 */ +++ { 0, 0, printargs, "SYS_5264" }, /* 5264 */ +++ { 0, 0, printargs, "SYS_5265" }, /* 5265 */ +++ { 0, 0, printargs, "SYS_5266" }, /* 5266 */ +++ { 0, 0, printargs, "SYS_5267" }, /* 5267 */ +++ { 0, 0, printargs, "SYS_5268" }, /* 5268 */ +++ { 0, 0, printargs, "SYS_5269" }, /* 5269 */ +++ { 0, 0, printargs, "SYS_5270" }, /* 5270 */ +++ { 0, 0, printargs, "SYS_5271" }, /* 5271 */ +++ { 0, 0, printargs, "SYS_5272" }, /* 5272 */ +++ { 0, 0, printargs, "SYS_5273" }, /* 5273 */ +++ { 0, 0, printargs, "SYS_5274" }, /* 5274 */ +++ { 0, 0, printargs, "SYS_5275" }, /* 5275 */ +++ { 0, 0, printargs, "SYS_5276" }, /* 5276 */ +++ { 0, 0, printargs, "SYS_5277" }, /* 5277 */ +++ { 0, 0, printargs, "SYS_5278" }, /* 5278 */ +++ { 0, 0, printargs, "SYS_5279" }, /* 5279 */ +++ { 0, 0, printargs, "SYS_5280" }, /* 5280 */ +++ { 0, 0, printargs, "SYS_5281" }, /* 5281 */ +++ { 0, 0, printargs, "SYS_5282" }, /* 5282 */ +++ { 0, 0, printargs, "SYS_5283" }, /* 5283 */ +++ { 0, 0, printargs, "SYS_5284" }, /* 5284 */ +++ { 0, 0, printargs, "SYS_5285" }, /* 5285 */ +++ { 0, 0, printargs, "SYS_5286" }, /* 5286 */ +++ { 0, 0, printargs, "SYS_5287" }, /* 5287 */ +++ { 0, 0, printargs, "SYS_5288" }, /* 5288 */ +++ { 0, 0, printargs, "SYS_5289" }, /* 5289 */ +++ { 0, 0, printargs, "SYS_5290" }, /* 5290 */ +++ { 0, 0, printargs, "SYS_5291" }, /* 5291 */ +++ { 0, 0, printargs, "SYS_5292" }, /* 5292 */ +++ { 0, 0, printargs, "SYS_5293" }, /* 5293 */ +++ { 0, 0, printargs, "SYS_5294" }, /* 5294 */ +++ { 0, 0, printargs, "SYS_5295" }, /* 5295 */ +++ { 0, 0, printargs, "SYS_5296" }, /* 5296 */ +++ { 0, 0, printargs, "SYS_5297" }, /* 5297 */ +++ { 0, 0, printargs, "SYS_5298" }, /* 5298 */ +++ { 0, 0, printargs, "SYS_5299" }, /* 5299 */ +++ { 0, 0, printargs, "SYS_5300" }, /* 5300 */ +++ { 0, 0, printargs, "SYS_5301" }, /* 5301 */ +++ { 0, 0, printargs, "SYS_5302" }, /* 5302 */ +++ { 0, 0, printargs, "SYS_5303" }, /* 5303 */ +++ { 0, 0, printargs, "SYS_5304" }, /* 5304 */ +++ { 0, 0, printargs, "SYS_5305" }, /* 5305 */ +++ { 0, 0, printargs, "SYS_5306" }, /* 5306 */ +++ { 0, 0, printargs, "SYS_5307" }, /* 5307 */ +++ { 0, 0, printargs, "SYS_5308" }, /* 5308 */ +++ { 0, 0, printargs, "SYS_5309" }, /* 5309 */ +++ { 0, 0, printargs, "SYS_5310" }, /* 5310 */ +++ { 0, 0, printargs, "SYS_5311" }, /* 5311 */ +++ { 0, 0, printargs, "SYS_5312" }, /* 5312 */ +++ { 0, 0, printargs, "SYS_5313" }, /* 5313 */ +++ { 0, 0, printargs, "SYS_5314" }, /* 5314 */ +++ { 0, 0, printargs, "SYS_5315" }, /* 5315 */ +++ { 0, 0, printargs, "SYS_5316" }, /* 5316 */ +++ { 0, 0, printargs, "SYS_5317" }, /* 5317 */ +++ { 0, 0, printargs, "SYS_5318" }, /* 5318 */ +++ { 0, 0, printargs, "SYS_5319" }, /* 5319 */ +++ { 0, 0, printargs, "SYS_5320" }, /* 5320 */ +++ { 0, 0, printargs, "SYS_5321" }, /* 5321 */ +++ { 0, 0, printargs, "SYS_5322" }, /* 5322 */ +++ { 0, 0, printargs, "SYS_5323" }, /* 5323 */ +++ { 0, 0, printargs, "SYS_5324" }, /* 5324 */ +++ { 0, 0, printargs, "SYS_5325" }, /* 5325 */ +++ { 0, 0, printargs, "SYS_5326" }, /* 5326 */ +++ { 0, 0, printargs, "SYS_5327" }, /* 5327 */ +++ { 0, 0, printargs, "SYS_5328" }, /* 5328 */ +++ { 0, 0, printargs, "SYS_5329" }, /* 5329 */ +++ { 0, 0, printargs, "SYS_5330" }, /* 5330 */ +++ { 0, 0, printargs, "SYS_5331" }, /* 5331 */ +++ { 0, 0, printargs, "SYS_5332" }, /* 5332 */ +++ { 0, 0, printargs, "SYS_5333" }, /* 5333 */ +++ { 0, 0, printargs, "SYS_5334" }, /* 5334 */ +++ { 0, 0, printargs, "SYS_5335" }, /* 5335 */ +++ { 0, 0, printargs, "SYS_5336" }, /* 5336 */ +++ { 0, 0, printargs, "SYS_5337" }, /* 5337 */ +++ { 0, 0, printargs, "SYS_5338" }, /* 5338 */ +++ { 0, 0, printargs, "SYS_5339" }, /* 5339 */ +++ { 0, 0, printargs, "SYS_5340" }, /* 5340 */ +++ { 0, 0, printargs, "SYS_5341" }, /* 5341 */ +++ { 0, 0, printargs, "SYS_5342" }, /* 5342 */ +++ { 0, 0, printargs, "SYS_5343" }, /* 5343 */ +++ { 0, 0, printargs, "SYS_5344" }, /* 5344 */ +++ { 0, 0, printargs, "SYS_5345" }, /* 5345 */ +++ { 0, 0, printargs, "SYS_5346" }, /* 5346 */ +++ { 0, 0, printargs, "SYS_5347" }, /* 5347 */ +++ { 0, 0, printargs, "SYS_5348" }, /* 5348 */ +++ { 0, 0, printargs, "SYS_5349" }, /* 5349 */ +++ { 0, 0, printargs, "SYS_5350" }, /* 5350 */ +++ { 0, 0, printargs, "SYS_5351" }, /* 5351 */ +++ { 0, 0, printargs, "SYS_5352" }, /* 5352 */ +++ { 0, 0, printargs, "SYS_5353" }, /* 5353 */ +++ { 0, 0, printargs, "SYS_5354" }, /* 5354 */ +++ { 0, 0, printargs, "SYS_5355" }, /* 5355 */ +++ { 0, 0, printargs, "SYS_5356" }, /* 5356 */ +++ { 0, 0, printargs, "SYS_5357" }, /* 5357 */ +++ { 0, 0, printargs, "SYS_5358" }, /* 5358 */ +++ { 0, 0, printargs, "SYS_5359" }, /* 5359 */ +++ { 0, 0, printargs, "SYS_5360" }, /* 5360 */ +++ { 0, 0, printargs, "SYS_5361" }, /* 5361 */ +++ { 0, 0, printargs, "SYS_5362" }, /* 5362 */ +++ { 0, 0, printargs, "SYS_5363" }, /* 5363 */ +++ { 0, 0, printargs, "SYS_5364" }, /* 5364 */ +++ { 0, 0, printargs, "SYS_5365" }, /* 5365 */ +++ { 0, 0, printargs, "SYS_5366" }, /* 5366 */ +++ { 0, 0, printargs, "SYS_5367" }, /* 5367 */ +++ { 0, 0, printargs, "SYS_5368" }, /* 5368 */ +++ { 0, 0, printargs, "SYS_5369" }, /* 5369 */ +++ { 0, 0, printargs, "SYS_5370" }, /* 5370 */ +++ { 0, 0, printargs, "SYS_5371" }, /* 5371 */ +++ { 0, 0, printargs, "SYS_5372" }, /* 5372 */ +++ { 0, 0, printargs, "SYS_5373" }, /* 5373 */ +++ { 0, 0, printargs, "SYS_5374" }, /* 5374 */ +++ { 0, 0, printargs, "SYS_5375" }, /* 5375 */ +++ { 0, 0, printargs, "SYS_5376" }, /* 5376 */ +++ { 0, 0, printargs, "SYS_5377" }, /* 5377 */ +++ { 0, 0, printargs, "SYS_5378" }, /* 5378 */ +++ { 0, 0, printargs, "SYS_5379" }, /* 5379 */ +++ { 0, 0, printargs, "SYS_5380" }, /* 5380 */ +++ { 0, 0, printargs, "SYS_5381" }, /* 5381 */ +++ { 0, 0, printargs, "SYS_5382" }, /* 5382 */ +++ { 0, 0, printargs, "SYS_5383" }, /* 5383 */ +++ { 0, 0, printargs, "SYS_5384" }, /* 5384 */ +++ { 0, 0, printargs, "SYS_5385" }, /* 5385 */ +++ { 0, 0, printargs, "SYS_5386" }, /* 5386 */ +++ { 0, 0, printargs, "SYS_5387" }, /* 5387 */ +++ { 0, 0, printargs, "SYS_5388" }, /* 5388 */ +++ { 0, 0, printargs, "SYS_5389" }, /* 5389 */ +++ { 0, 0, printargs, "SYS_5390" }, /* 5390 */ +++ { 0, 0, printargs, "SYS_5391" }, /* 5391 */ +++ { 0, 0, printargs, "SYS_5392" }, /* 5392 */ +++ { 0, 0, printargs, "SYS_5393" }, /* 5393 */ +++ { 0, 0, printargs, "SYS_5394" }, /* 5394 */ +++ { 0, 0, printargs, "SYS_5395" }, /* 5395 */ +++ { 0, 0, printargs, "SYS_5396" }, /* 5396 */ +++ { 0, 0, printargs, "SYS_5397" }, /* 5397 */ +++ { 0, 0, printargs, "SYS_5398" }, /* 5398 */ +++ { 0, 0, printargs, "SYS_5399" }, /* 5399 */ +++ { 0, 0, printargs, "SYS_5400" }, /* 5400 */ +++ { 0, 0, printargs, "SYS_5401" }, /* 5401 */ +++ { 0, 0, printargs, "SYS_5402" }, /* 5402 */ +++ { 0, 0, printargs, "SYS_5403" }, /* 5403 */ +++ { 0, 0, printargs, "SYS_5404" }, /* 5404 */ +++ { 0, 0, printargs, "SYS_5405" }, /* 5405 */ +++ { 0, 0, printargs, "SYS_5406" }, /* 5406 */ +++ { 0, 0, printargs, "SYS_5407" }, /* 5407 */ +++ { 0, 0, printargs, "SYS_5408" }, /* 5408 */ +++ { 0, 0, printargs, "SYS_5409" }, /* 5409 */ +++ { 0, 0, printargs, "SYS_5410" }, /* 5410 */ +++ { 0, 0, printargs, "SYS_5411" }, /* 5411 */ +++ { 0, 0, printargs, "SYS_5412" }, /* 5412 */ +++ { 0, 0, printargs, "SYS_5413" }, /* 5413 */ +++ { 0, 0, printargs, "SYS_5414" }, /* 5414 */ +++ { 0, 0, printargs, "SYS_5415" }, /* 5415 */ +++ { 0, 0, printargs, "SYS_5416" }, /* 5416 */ +++ { 0, 0, printargs, "SYS_5417" }, /* 5417 */ +++ { 0, 0, printargs, "SYS_5418" }, /* 5418 */ +++ { 0, 0, printargs, "SYS_5419" }, /* 5419 */ +++ { 0, 0, printargs, "SYS_5420" }, /* 5420 */ +++ { 0, 0, printargs, "SYS_5421" }, /* 5421 */ +++ { 0, 0, printargs, "SYS_5422" }, /* 5422 */ +++ { 0, 0, printargs, "SYS_5423" }, /* 5423 */ +++ { 0, 0, printargs, "SYS_5424" }, /* 5424 */ +++ { 0, 0, printargs, "SYS_5425" }, /* 5425 */ +++ { 0, 0, printargs, "SYS_5426" }, /* 5426 */ +++ { 0, 0, printargs, "SYS_5427" }, /* 5427 */ +++ { 0, 0, printargs, "SYS_5428" }, /* 5428 */ +++ { 0, 0, printargs, "SYS_5429" }, /* 5429 */ +++ { 0, 0, printargs, "SYS_5430" }, /* 5430 */ +++ { 0, 0, printargs, "SYS_5431" }, /* 5431 */ +++ { 0, 0, printargs, "SYS_5432" }, /* 5432 */ +++ { 0, 0, printargs, "SYS_5433" }, /* 5433 */ +++ { 0, 0, printargs, "SYS_5434" }, /* 5434 */ +++ { 0, 0, printargs, "SYS_5435" }, /* 5435 */ +++ { 0, 0, printargs, "SYS_5436" }, /* 5436 */ +++ { 0, 0, printargs, "SYS_5437" }, /* 5437 */ +++ { 0, 0, printargs, "SYS_5438" }, /* 5438 */ +++ { 0, 0, printargs, "SYS_5439" }, /* 5439 */ +++ { 0, 0, printargs, "SYS_5440" }, /* 5440 */ +++ { 0, 0, printargs, "SYS_5441" }, /* 5441 */ +++ { 0, 0, printargs, "SYS_5442" }, /* 5442 */ +++ { 0, 0, printargs, "SYS_5443" }, /* 5443 */ +++ { 0, 0, printargs, "SYS_5444" }, /* 5444 */ +++ { 0, 0, printargs, "SYS_5445" }, /* 5445 */ +++ { 0, 0, printargs, "SYS_5446" }, /* 5446 */ +++ { 0, 0, printargs, "SYS_5447" }, /* 5447 */ +++ { 0, 0, printargs, "SYS_5448" }, /* 5448 */ +++ { 0, 0, printargs, "SYS_5449" }, /* 5449 */ +++ { 0, 0, printargs, "SYS_5450" }, /* 5450 */ +++ { 0, 0, printargs, "SYS_5451" }, /* 5451 */ +++ { 0, 0, printargs, "SYS_5452" }, /* 5452 */ +++ { 0, 0, printargs, "SYS_5453" }, /* 5453 */ +++ { 0, 0, printargs, "SYS_5454" }, /* 5454 */ +++ { 0, 0, printargs, "SYS_5455" }, /* 5455 */ +++ { 0, 0, printargs, "SYS_5456" }, /* 5456 */ +++ { 0, 0, printargs, "SYS_5457" }, /* 5457 */ +++ { 0, 0, printargs, "SYS_5458" }, /* 5458 */ +++ { 0, 0, printargs, "SYS_5459" }, /* 5459 */ +++ { 0, 0, printargs, "SYS_5460" }, /* 5460 */ +++ { 0, 0, printargs, "SYS_5461" }, /* 5461 */ +++ { 0, 0, printargs, "SYS_5462" }, /* 5462 */ +++ { 0, 0, printargs, "SYS_5463" }, /* 5463 */ +++ { 0, 0, printargs, "SYS_5464" }, /* 5464 */ +++ { 0, 0, printargs, "SYS_5465" }, /* 5465 */ +++ { 0, 0, printargs, "SYS_5466" }, /* 5466 */ +++ { 0, 0, printargs, "SYS_5467" }, /* 5467 */ +++ { 0, 0, printargs, "SYS_5468" }, /* 5468 */ +++ { 0, 0, printargs, "SYS_5469" }, /* 5469 */ +++ { 0, 0, printargs, "SYS_5470" }, /* 5470 */ +++ { 0, 0, printargs, "SYS_5471" }, /* 5471 */ +++ { 0, 0, printargs, "SYS_5472" }, /* 5472 */ +++ { 0, 0, printargs, "SYS_5473" }, /* 5473 */ +++ { 0, 0, printargs, "SYS_5474" }, /* 5474 */ +++ { 0, 0, printargs, "SYS_5475" }, /* 5475 */ +++ { 0, 0, printargs, "SYS_5476" }, /* 5476 */ +++ { 0, 0, printargs, "SYS_5477" }, /* 5477 */ +++ { 0, 0, printargs, "SYS_5478" }, /* 5478 */ +++ { 0, 0, printargs, "SYS_5479" }, /* 5479 */ +++ { 0, 0, printargs, "SYS_5480" }, /* 5480 */ +++ { 0, 0, printargs, "SYS_5481" }, /* 5481 */ +++ { 0, 0, printargs, "SYS_5482" }, /* 5482 */ +++ { 0, 0, printargs, "SYS_5483" }, /* 5483 */ +++ { 0, 0, printargs, "SYS_5484" }, /* 5484 */ +++ { 0, 0, printargs, "SYS_5485" }, /* 5485 */ +++ { 0, 0, printargs, "SYS_5486" }, /* 5486 */ +++ { 0, 0, printargs, "SYS_5487" }, /* 5487 */ +++ { 0, 0, printargs, "SYS_5488" }, /* 5488 */ +++ { 0, 0, printargs, "SYS_5489" }, /* 5489 */ +++ { 0, 0, printargs, "SYS_5490" }, /* 5490 */ +++ { 0, 0, printargs, "SYS_5491" }, /* 5491 */ +++ { 0, 0, printargs, "SYS_5492" }, /* 5492 */ +++ { 0, 0, printargs, "SYS_5493" }, /* 5493 */ +++ { 0, 0, printargs, "SYS_5494" }, /* 5494 */ +++ { 0, 0, printargs, "SYS_5495" }, /* 5495 */ +++ { 0, 0, printargs, "SYS_5496" }, /* 5496 */ +++ { 0, 0, printargs, "SYS_5497" }, /* 5497 */ +++ { 0, 0, printargs, "SYS_5498" }, /* 5498 */ +++ { 0, 0, printargs, "SYS_5499" }, /* 5499 */ +++ { 0, 0, printargs, "SYS_5500" }, /* 5500 */ +++ { 0, 0, printargs, "SYS_5501" }, /* 5501 */ +++ { 0, 0, printargs, "SYS_5502" }, /* 5502 */ +++ { 0, 0, printargs, "SYS_5503" }, /* 5503 */ +++ { 0, 0, printargs, "SYS_5504" }, /* 5504 */ +++ { 0, 0, printargs, "SYS_5505" }, /* 5505 */ +++ { 0, 0, printargs, "SYS_5506" }, /* 5506 */ +++ { 0, 0, printargs, "SYS_5507" }, /* 5507 */ +++ { 0, 0, printargs, "SYS_5508" }, /* 5508 */ +++ { 0, 0, printargs, "SYS_5509" }, /* 5509 */ +++ { 0, 0, printargs, "SYS_5510" }, /* 5510 */ +++ { 0, 0, printargs, "SYS_5511" }, /* 5511 */ +++ { 0, 0, printargs, "SYS_5512" }, /* 5512 */ +++ { 0, 0, printargs, "SYS_5513" }, /* 5513 */ +++ { 0, 0, printargs, "SYS_5514" }, /* 5514 */ +++ { 0, 0, printargs, "SYS_5515" }, /* 5515 */ +++ { 0, 0, printargs, "SYS_5516" }, /* 5516 */ +++ { 0, 0, printargs, "SYS_5517" }, /* 5517 */ +++ { 0, 0, printargs, "SYS_5518" }, /* 5518 */ +++ { 0, 0, printargs, "SYS_5519" }, /* 5519 */ +++ { 0, 0, printargs, "SYS_5520" }, /* 5520 */ +++ { 0, 0, printargs, "SYS_5521" }, /* 5521 */ +++ { 0, 0, printargs, "SYS_5522" }, /* 5522 */ +++ { 0, 0, printargs, "SYS_5523" }, /* 5523 */ +++ { 0, 0, printargs, "SYS_5524" }, /* 5524 */ +++ { 0, 0, printargs, "SYS_5525" }, /* 5525 */ +++ { 0, 0, printargs, "SYS_5526" }, /* 5526 */ +++ { 0, 0, printargs, "SYS_5527" }, /* 5527 */ +++ { 0, 0, printargs, "SYS_5528" }, /* 5528 */ +++ { 0, 0, printargs, "SYS_5529" }, /* 5529 */ +++ { 0, 0, printargs, "SYS_5530" }, /* 5530 */ +++ { 0, 0, printargs, "SYS_5531" }, /* 5531 */ +++ { 0, 0, printargs, "SYS_5532" }, /* 5532 */ +++ { 0, 0, printargs, "SYS_5533" }, /* 5533 */ +++ { 0, 0, printargs, "SYS_5534" }, /* 5534 */ +++ { 0, 0, printargs, "SYS_5535" }, /* 5535 */ +++ { 0, 0, printargs, "SYS_5536" }, /* 5536 */ +++ { 0, 0, printargs, "SYS_5537" }, /* 5537 */ +++ { 0, 0, printargs, "SYS_5538" }, /* 5538 */ +++ { 0, 0, printargs, "SYS_5539" }, /* 5539 */ +++ { 0, 0, printargs, "SYS_5540" }, /* 5540 */ +++ { 0, 0, printargs, "SYS_5541" }, /* 5541 */ +++ { 0, 0, printargs, "SYS_5542" }, /* 5542 */ +++ { 0, 0, printargs, "SYS_5543" }, /* 5543 */ +++ { 0, 0, printargs, "SYS_5544" }, /* 5544 */ +++ { 0, 0, printargs, "SYS_5545" }, /* 5545 */ +++ { 0, 0, printargs, "SYS_5546" }, /* 5546 */ +++ { 0, 0, printargs, "SYS_5547" }, /* 5547 */ +++ { 0, 0, printargs, "SYS_5548" }, /* 5548 */ +++ { 0, 0, printargs, "SYS_5549" }, /* 5549 */ +++ { 0, 0, printargs, "SYS_5550" }, /* 5550 */ +++ { 0, 0, printargs, "SYS_5551" }, /* 5551 */ +++ { 0, 0, printargs, "SYS_5552" }, /* 5552 */ +++ { 0, 0, printargs, "SYS_5553" }, /* 5553 */ +++ { 0, 0, printargs, "SYS_5554" }, /* 5554 */ +++ { 0, 0, printargs, "SYS_5555" }, /* 5555 */ +++ { 0, 0, printargs, "SYS_5556" }, /* 5556 */ +++ { 0, 0, printargs, "SYS_5557" }, /* 5557 */ +++ { 0, 0, printargs, "SYS_5558" }, /* 5558 */ +++ { 0, 0, printargs, "SYS_5559" }, /* 5559 */ +++ { 0, 0, printargs, "SYS_5560" }, /* 5560 */ +++ { 0, 0, printargs, "SYS_5561" }, /* 5561 */ +++ { 0, 0, printargs, "SYS_5562" }, /* 5562 */ +++ { 0, 0, printargs, "SYS_5563" }, /* 5563 */ +++ { 0, 0, printargs, "SYS_5564" }, /* 5564 */ +++ { 0, 0, printargs, "SYS_5565" }, /* 5565 */ +++ { 0, 0, printargs, "SYS_5566" }, /* 5566 */ +++ { 0, 0, printargs, "SYS_5567" }, /* 5567 */ +++ { 0, 0, printargs, "SYS_5568" }, /* 5568 */ +++ { 0, 0, printargs, "SYS_5569" }, /* 5569 */ +++ { 0, 0, printargs, "SYS_5570" }, /* 5570 */ +++ { 0, 0, printargs, "SYS_5571" }, /* 5571 */ +++ { 0, 0, printargs, "SYS_5572" }, /* 5572 */ +++ { 0, 0, printargs, "SYS_5573" }, /* 5573 */ +++ { 0, 0, printargs, "SYS_5574" }, /* 5574 */ +++ { 0, 0, printargs, "SYS_5575" }, /* 5575 */ +++ { 0, 0, printargs, "SYS_5576" }, /* 5576 */ +++ { 0, 0, printargs, "SYS_5577" }, /* 5577 */ +++ { 0, 0, printargs, "SYS_5578" }, /* 5578 */ +++ { 0, 0, printargs, "SYS_5579" }, /* 5579 */ +++ { 0, 0, printargs, "SYS_5580" }, /* 5580 */ +++ { 0, 0, printargs, "SYS_5581" }, /* 5581 */ +++ { 0, 0, printargs, "SYS_5582" }, /* 5582 */ +++ { 0, 0, printargs, "SYS_5583" }, /* 5583 */ +++ { 0, 0, printargs, "SYS_5584" }, /* 5584 */ +++ { 0, 0, printargs, "SYS_5585" }, /* 5585 */ +++ { 0, 0, printargs, "SYS_5586" }, /* 5586 */ +++ { 0, 0, printargs, "SYS_5587" }, /* 5587 */ +++ { 0, 0, printargs, "SYS_5588" }, /* 5588 */ +++ { 0, 0, printargs, "SYS_5589" }, /* 5589 */ +++ { 0, 0, printargs, "SYS_5590" }, /* 5590 */ +++ { 0, 0, printargs, "SYS_5591" }, /* 5591 */ +++ { 0, 0, printargs, "SYS_5592" }, /* 5592 */ +++ { 0, 0, printargs, "SYS_5593" }, /* 5593 */ +++ { 0, 0, printargs, "SYS_5594" }, /* 5594 */ +++ { 0, 0, printargs, "SYS_5595" }, /* 5595 */ +++ { 0, 0, printargs, "SYS_5596" }, /* 5596 */ +++ { 0, 0, printargs, "SYS_5597" }, /* 5597 */ +++ { 0, 0, printargs, "SYS_5598" }, /* 5598 */ +++ { 0, 0, printargs, "SYS_5599" }, /* 5599 */ +++ { 0, 0, printargs, "SYS_5600" }, /* 5600 */ +++ { 0, 0, printargs, "SYS_5601" }, /* 5601 */ +++ { 0, 0, printargs, "SYS_5602" }, /* 5602 */ +++ { 0, 0, printargs, "SYS_5603" }, /* 5603 */ +++ { 0, 0, printargs, "SYS_5604" }, /* 5604 */ +++ { 0, 0, printargs, "SYS_5605" }, /* 5605 */ +++ { 0, 0, printargs, "SYS_5606" }, /* 5606 */ +++ { 0, 0, printargs, "SYS_5607" }, /* 5607 */ +++ { 0, 0, printargs, "SYS_5608" }, /* 5608 */ +++ { 0, 0, printargs, "SYS_5609" }, /* 5609 */ +++ { 0, 0, printargs, "SYS_5610" }, /* 5610 */ +++ { 0, 0, printargs, "SYS_5611" }, /* 5611 */ +++ { 0, 0, printargs, "SYS_5612" }, /* 5612 */ +++ { 0, 0, printargs, "SYS_5613" }, /* 5613 */ +++ { 0, 0, printargs, "SYS_5614" }, /* 5614 */ +++ { 0, 0, printargs, "SYS_5615" }, /* 5615 */ +++ { 0, 0, printargs, "SYS_5616" }, /* 5616 */ +++ { 0, 0, printargs, "SYS_5617" }, /* 5617 */ +++ { 0, 0, printargs, "SYS_5618" }, /* 5618 */ +++ { 0, 0, printargs, "SYS_5619" }, /* 5619 */ +++ { 0, 0, printargs, "SYS_5620" }, /* 5620 */ +++ { 0, 0, printargs, "SYS_5621" }, /* 5621 */ +++ { 0, 0, printargs, "SYS_5622" }, /* 5622 */ +++ { 0, 0, printargs, "SYS_5623" }, /* 5623 */ +++ { 0, 0, printargs, "SYS_5624" }, /* 5624 */ +++ { 0, 0, printargs, "SYS_5625" }, /* 5625 */ +++ { 0, 0, printargs, "SYS_5626" }, /* 5626 */ +++ { 0, 0, printargs, "SYS_5627" }, /* 5627 */ +++ { 0, 0, printargs, "SYS_5628" }, /* 5628 */ +++ { 0, 0, printargs, "SYS_5629" }, /* 5629 */ +++ { 0, 0, printargs, "SYS_5630" }, /* 5630 */ +++ { 0, 0, printargs, "SYS_5631" }, /* 5631 */ +++ { 0, 0, printargs, "SYS_5632" }, /* 5632 */ +++ { 0, 0, printargs, "SYS_5633" }, /* 5633 */ +++ { 0, 0, printargs, "SYS_5634" }, /* 5634 */ +++ { 0, 0, printargs, "SYS_5635" }, /* 5635 */ +++ { 0, 0, printargs, "SYS_5636" }, /* 5636 */ +++ { 0, 0, printargs, "SYS_5637" }, /* 5637 */ +++ { 0, 0, printargs, "SYS_5638" }, /* 5638 */ +++ { 0, 0, printargs, "SYS_5639" }, /* 5639 */ +++ { 0, 0, printargs, "SYS_5640" }, /* 5640 */ +++ { 0, 0, printargs, "SYS_5641" }, /* 5641 */ +++ { 0, 0, printargs, "SYS_5642" }, /* 5642 */ +++ { 0, 0, printargs, "SYS_5643" }, /* 5643 */ +++ { 0, 0, printargs, "SYS_5644" }, /* 5644 */ +++ { 0, 0, printargs, "SYS_5645" }, /* 5645 */ +++ { 0, 0, printargs, "SYS_5646" }, /* 5646 */ +++ { 0, 0, printargs, "SYS_5647" }, /* 5647 */ +++ { 0, 0, printargs, "SYS_5648" }, /* 5648 */ +++ { 0, 0, printargs, "SYS_5649" }, /* 5649 */ +++ { 0, 0, printargs, "SYS_5650" }, /* 5650 */ +++ { 0, 0, printargs, "SYS_5651" }, /* 5651 */ +++ { 0, 0, printargs, "SYS_5652" }, /* 5652 */ +++ { 0, 0, printargs, "SYS_5653" }, /* 5653 */ +++ { 0, 0, printargs, "SYS_5654" }, /* 5654 */ +++ { 0, 0, printargs, "SYS_5655" }, /* 5655 */ +++ { 0, 0, printargs, "SYS_5656" }, /* 5656 */ +++ { 0, 0, printargs, "SYS_5657" }, /* 5657 */ +++ { 0, 0, printargs, "SYS_5658" }, /* 5658 */ +++ { 0, 0, printargs, "SYS_5659" }, /* 5659 */ +++ { 0, 0, printargs, "SYS_5660" }, /* 5660 */ +++ { 0, 0, printargs, "SYS_5661" }, /* 5661 */ +++ { 0, 0, printargs, "SYS_5662" }, /* 5662 */ +++ { 0, 0, printargs, "SYS_5663" }, /* 5663 */ +++ { 0, 0, printargs, "SYS_5664" }, /* 5664 */ +++ { 0, 0, printargs, "SYS_5665" }, /* 5665 */ +++ { 0, 0, printargs, "SYS_5666" }, /* 5666 */ +++ { 0, 0, printargs, "SYS_5667" }, /* 5667 */ +++ { 0, 0, printargs, "SYS_5668" }, /* 5668 */ +++ { 0, 0, printargs, "SYS_5669" }, /* 5669 */ +++ { 0, 0, printargs, "SYS_5670" }, /* 5670 */ +++ { 0, 0, printargs, "SYS_5671" }, /* 5671 */ +++ { 0, 0, printargs, "SYS_5672" }, /* 5672 */ +++ { 0, 0, printargs, "SYS_5673" }, /* 5673 */ +++ { 0, 0, printargs, "SYS_5674" }, /* 5674 */ +++ { 0, 0, printargs, "SYS_5675" }, /* 5675 */ +++ { 0, 0, printargs, "SYS_5676" }, /* 5676 */ +++ { 0, 0, printargs, "SYS_5677" }, /* 5677 */ +++ { 0, 0, printargs, "SYS_5678" }, /* 5678 */ +++ { 0, 0, printargs, "SYS_5679" }, /* 5679 */ +++ { 0, 0, printargs, "SYS_5680" }, /* 5680 */ +++ { 0, 0, printargs, "SYS_5681" }, /* 5681 */ +++ { 0, 0, printargs, "SYS_5682" }, /* 5682 */ +++ { 0, 0, printargs, "SYS_5683" }, /* 5683 */ +++ { 0, 0, printargs, "SYS_5684" }, /* 5684 */ +++ { 0, 0, printargs, "SYS_5685" }, /* 5685 */ +++ { 0, 0, printargs, "SYS_5686" }, /* 5686 */ +++ { 0, 0, printargs, "SYS_5687" }, /* 5687 */ +++ { 0, 0, printargs, "SYS_5688" }, /* 5688 */ +++ { 0, 0, printargs, "SYS_5689" }, /* 5689 */ +++ { 0, 0, printargs, "SYS_5690" }, /* 5690 */ +++ { 0, 0, printargs, "SYS_5691" }, /* 5691 */ +++ { 0, 0, printargs, "SYS_5692" }, /* 5692 */ +++ { 0, 0, printargs, "SYS_5693" }, /* 5693 */ +++ { 0, 0, printargs, "SYS_5694" }, /* 5694 */ +++ { 0, 0, printargs, "SYS_5695" }, /* 5695 */ +++ { 0, 0, printargs, "SYS_5696" }, /* 5696 */ +++ { 0, 0, printargs, "SYS_5697" }, /* 5697 */ +++ { 0, 0, printargs, "SYS_5698" }, /* 5698 */ +++ { 0, 0, printargs, "SYS_5699" }, /* 5699 */ +++ { 0, 0, printargs, "SYS_5700" }, /* 5700 */ +++ { 0, 0, printargs, "SYS_5701" }, /* 5701 */ +++ { 0, 0, printargs, "SYS_5702" }, /* 5702 */ +++ { 0, 0, printargs, "SYS_5703" }, /* 5703 */ +++ { 0, 0, printargs, "SYS_5704" }, /* 5704 */ +++ { 0, 0, printargs, "SYS_5705" }, /* 5705 */ +++ { 0, 0, printargs, "SYS_5706" }, /* 5706 */ +++ { 0, 0, printargs, "SYS_5707" }, /* 5707 */ +++ { 0, 0, printargs, "SYS_5708" }, /* 5708 */ +++ { 0, 0, printargs, "SYS_5709" }, /* 5709 */ +++ { 0, 0, printargs, "SYS_5710" }, /* 5710 */ +++ { 0, 0, printargs, "SYS_5711" }, /* 5711 */ +++ { 0, 0, printargs, "SYS_5712" }, /* 5712 */ +++ { 0, 0, printargs, "SYS_5713" }, /* 5713 */ +++ { 0, 0, printargs, "SYS_5714" }, /* 5714 */ +++ { 0, 0, printargs, "SYS_5715" }, /* 5715 */ +++ { 0, 0, printargs, "SYS_5716" }, /* 5716 */ +++ { 0, 0, printargs, "SYS_5717" }, /* 5717 */ +++ { 0, 0, printargs, "SYS_5718" }, /* 5718 */ +++ { 0, 0, printargs, "SYS_5719" }, /* 5719 */ +++ { 0, 0, printargs, "SYS_5720" }, /* 5720 */ +++ { 0, 0, printargs, "SYS_5721" }, /* 5721 */ +++ { 0, 0, printargs, "SYS_5722" }, /* 5722 */ +++ { 0, 0, printargs, "SYS_5723" }, /* 5723 */ +++ { 0, 0, printargs, "SYS_5724" }, /* 5724 */ +++ { 0, 0, printargs, "SYS_5725" }, /* 5725 */ +++ { 0, 0, printargs, "SYS_5726" }, /* 5726 */ +++ { 0, 0, printargs, "SYS_5727" }, /* 5727 */ +++ { 0, 0, printargs, "SYS_5728" }, /* 5728 */ +++ { 0, 0, printargs, "SYS_5729" }, /* 5729 */ +++ { 0, 0, printargs, "SYS_5730" }, /* 5730 */ +++ { 0, 0, printargs, "SYS_5731" }, /* 5731 */ +++ { 0, 0, printargs, "SYS_5732" }, /* 5732 */ +++ { 0, 0, printargs, "SYS_5733" }, /* 5733 */ +++ { 0, 0, printargs, "SYS_5734" }, /* 5734 */ +++ { 0, 0, printargs, "SYS_5735" }, /* 5735 */ +++ { 0, 0, printargs, "SYS_5736" }, /* 5736 */ +++ { 0, 0, printargs, "SYS_5737" }, /* 5737 */ +++ { 0, 0, printargs, "SYS_5738" }, /* 5738 */ +++ { 0, 0, printargs, "SYS_5739" }, /* 5739 */ +++ { 0, 0, printargs, "SYS_5740" }, /* 5740 */ +++ { 0, 0, printargs, "SYS_5741" }, /* 5741 */ +++ { 0, 0, printargs, "SYS_5742" }, /* 5742 */ +++ { 0, 0, printargs, "SYS_5743" }, /* 5743 */ +++ { 0, 0, printargs, "SYS_5744" }, /* 5744 */ +++ { 0, 0, printargs, "SYS_5745" }, /* 5745 */ +++ { 0, 0, printargs, "SYS_5746" }, /* 5746 */ +++ { 0, 0, printargs, "SYS_5747" }, /* 5747 */ +++ { 0, 0, printargs, "SYS_5748" }, /* 5748 */ +++ { 0, 0, printargs, "SYS_5749" }, /* 5749 */ +++ { 0, 0, printargs, "SYS_5750" }, /* 5750 */ +++ { 0, 0, printargs, "SYS_5751" }, /* 5751 */ +++ { 0, 0, printargs, "SYS_5752" }, /* 5752 */ +++ { 0, 0, printargs, "SYS_5753" }, /* 5753 */ +++ { 0, 0, printargs, "SYS_5754" }, /* 5754 */ +++ { 0, 0, printargs, "SYS_5755" }, /* 5755 */ +++ { 0, 0, printargs, "SYS_5756" }, /* 5756 */ +++ { 0, 0, printargs, "SYS_5757" }, /* 5757 */ +++ { 0, 0, printargs, "SYS_5758" }, /* 5758 */ +++ { 0, 0, printargs, "SYS_5759" }, /* 5759 */ +++ { 0, 0, printargs, "SYS_5760" }, /* 5760 */ +++ { 0, 0, printargs, "SYS_5761" }, /* 5761 */ +++ { 0, 0, printargs, "SYS_5762" }, /* 5762 */ +++ { 0, 0, printargs, "SYS_5763" }, /* 5763 */ +++ { 0, 0, printargs, "SYS_5764" }, /* 5764 */ +++ { 0, 0, printargs, "SYS_5765" }, /* 5765 */ +++ { 0, 0, printargs, "SYS_5766" }, /* 5766 */ +++ { 0, 0, printargs, "SYS_5767" }, /* 5767 */ +++ { 0, 0, printargs, "SYS_5768" }, /* 5768 */ +++ { 0, 0, printargs, "SYS_5769" }, /* 5769 */ +++ { 0, 0, printargs, "SYS_5770" }, /* 5770 */ +++ { 0, 0, printargs, "SYS_5771" }, /* 5771 */ +++ { 0, 0, printargs, "SYS_5772" }, /* 5772 */ +++ { 0, 0, printargs, "SYS_5773" }, /* 5773 */ +++ { 0, 0, printargs, "SYS_5774" }, /* 5774 */ +++ { 0, 0, printargs, "SYS_5775" }, /* 5775 */ +++ { 0, 0, printargs, "SYS_5776" }, /* 5776 */ +++ { 0, 0, printargs, "SYS_5777" }, /* 5777 */ +++ { 0, 0, printargs, "SYS_5778" }, /* 5778 */ +++ { 0, 0, printargs, "SYS_5779" }, /* 5779 */ +++ { 0, 0, printargs, "SYS_5780" }, /* 5780 */ +++ { 0, 0, printargs, "SYS_5781" }, /* 5781 */ +++ { 0, 0, printargs, "SYS_5782" }, /* 5782 */ +++ { 0, 0, printargs, "SYS_5783" }, /* 5783 */ +++ { 0, 0, printargs, "SYS_5784" }, /* 5784 */ +++ { 0, 0, printargs, "SYS_5785" }, /* 5785 */ +++ { 0, 0, printargs, "SYS_5786" }, /* 5786 */ +++ { 0, 0, printargs, "SYS_5787" }, /* 5787 */ +++ { 0, 0, printargs, "SYS_5788" }, /* 5788 */ +++ { 0, 0, printargs, "SYS_5789" }, /* 5789 */ +++ { 0, 0, printargs, "SYS_5790" }, /* 5790 */ +++ { 0, 0, printargs, "SYS_5791" }, /* 5791 */ +++ { 0, 0, printargs, "SYS_5792" }, /* 5792 */ +++ { 0, 0, printargs, "SYS_5793" }, /* 5793 */ +++ { 0, 0, printargs, "SYS_5794" }, /* 5794 */ +++ { 0, 0, printargs, "SYS_5795" }, /* 5795 */ +++ { 0, 0, printargs, "SYS_5796" }, /* 5796 */ +++ { 0, 0, printargs, "SYS_5797" }, /* 5797 */ +++ { 0, 0, printargs, "SYS_5798" }, /* 5798 */ +++ { 0, 0, printargs, "SYS_5799" }, /* 5799 */ +++ { 0, 0, printargs, "SYS_5800" }, /* 5800 */ +++ { 0, 0, printargs, "SYS_5801" }, /* 5801 */ +++ { 0, 0, printargs, "SYS_5802" }, /* 5802 */ +++ { 0, 0, printargs, "SYS_5803" }, /* 5803 */ +++ { 0, 0, printargs, "SYS_5804" }, /* 5804 */ +++ { 0, 0, printargs, "SYS_5805" }, /* 5805 */ +++ { 0, 0, printargs, "SYS_5806" }, /* 5806 */ +++ { 0, 0, printargs, "SYS_5807" }, /* 5807 */ +++ { 0, 0, printargs, "SYS_5808" }, /* 5808 */ +++ { 0, 0, printargs, "SYS_5809" }, /* 5809 */ +++ { 0, 0, printargs, "SYS_5810" }, /* 5810 */ +++ { 0, 0, printargs, "SYS_5811" }, /* 5811 */ +++ { 0, 0, printargs, "SYS_5812" }, /* 5812 */ +++ { 0, 0, printargs, "SYS_5813" }, /* 5813 */ +++ { 0, 0, printargs, "SYS_5814" }, /* 5814 */ +++ { 0, 0, printargs, "SYS_5815" }, /* 5815 */ +++ { 0, 0, printargs, "SYS_5816" }, /* 5816 */ +++ { 0, 0, printargs, "SYS_5817" }, /* 5817 */ +++ { 0, 0, printargs, "SYS_5818" }, /* 5818 */ +++ { 0, 0, printargs, "SYS_5819" }, /* 5819 */ +++ { 0, 0, printargs, "SYS_5820" }, /* 5820 */ +++ { 0, 0, printargs, "SYS_5821" }, /* 5821 */ +++ { 0, 0, printargs, "SYS_5822" }, /* 5822 */ +++ { 0, 0, printargs, "SYS_5823" }, /* 5823 */ +++ { 0, 0, printargs, "SYS_5824" }, /* 5824 */ +++ { 0, 0, printargs, "SYS_5825" }, /* 5825 */ +++ { 0, 0, printargs, "SYS_5826" }, /* 5826 */ +++ { 0, 0, printargs, "SYS_5827" }, /* 5827 */ +++ { 0, 0, printargs, "SYS_5828" }, /* 5828 */ +++ { 0, 0, printargs, "SYS_5829" }, /* 5829 */ +++ { 0, 0, printargs, "SYS_5830" }, /* 5830 */ +++ { 0, 0, printargs, "SYS_5831" }, /* 5831 */ +++ { 0, 0, printargs, "SYS_5832" }, /* 5832 */ +++ { 0, 0, printargs, "SYS_5833" }, /* 5833 */ +++ { 0, 0, printargs, "SYS_5834" }, /* 5834 */ +++ { 0, 0, printargs, "SYS_5835" }, /* 5835 */ +++ { 0, 0, printargs, "SYS_5836" }, /* 5836 */ +++ { 0, 0, printargs, "SYS_5837" }, /* 5837 */ +++ { 0, 0, printargs, "SYS_5838" }, /* 5838 */ +++ { 0, 0, printargs, "SYS_5839" }, /* 5839 */ +++ { 0, 0, printargs, "SYS_5840" }, /* 5840 */ +++ { 0, 0, printargs, "SYS_5841" }, /* 5841 */ +++ { 0, 0, printargs, "SYS_5842" }, /* 5842 */ +++ { 0, 0, printargs, "SYS_5843" }, /* 5843 */ +++ { 0, 0, printargs, "SYS_5844" }, /* 5844 */ +++ { 0, 0, printargs, "SYS_5845" }, /* 5845 */ +++ { 0, 0, printargs, "SYS_5846" }, /* 5846 */ +++ { 0, 0, printargs, "SYS_5847" }, /* 5847 */ +++ { 0, 0, printargs, "SYS_5848" }, /* 5848 */ +++ { 0, 0, printargs, "SYS_5849" }, /* 5849 */ +++ { 0, 0, printargs, "SYS_5850" }, /* 5850 */ +++ { 0, 0, printargs, "SYS_5851" }, /* 5851 */ +++ { 0, 0, printargs, "SYS_5852" }, /* 5852 */ +++ { 0, 0, printargs, "SYS_5853" }, /* 5853 */ +++ { 0, 0, printargs, "SYS_5854" }, /* 5854 */ +++ { 0, 0, printargs, "SYS_5855" }, /* 5855 */ +++ { 0, 0, printargs, "SYS_5856" }, /* 5856 */ +++ { 0, 0, printargs, "SYS_5857" }, /* 5857 */ +++ { 0, 0, printargs, "SYS_5858" }, /* 5858 */ +++ { 0, 0, printargs, "SYS_5859" }, /* 5859 */ +++ { 0, 0, printargs, "SYS_5860" }, /* 5860 */ +++ { 0, 0, printargs, "SYS_5861" }, /* 5861 */ +++ { 0, 0, printargs, "SYS_5862" }, /* 5862 */ +++ { 0, 0, printargs, "SYS_5863" }, /* 5863 */ +++ { 0, 0, printargs, "SYS_5864" }, /* 5864 */ +++ { 0, 0, printargs, "SYS_5865" }, /* 5865 */ +++ { 0, 0, printargs, "SYS_5866" }, /* 5866 */ +++ { 0, 0, printargs, "SYS_5867" }, /* 5867 */ +++ { 0, 0, printargs, "SYS_5868" }, /* 5868 */ +++ { 0, 0, printargs, "SYS_5869" }, /* 5869 */ +++ { 0, 0, printargs, "SYS_5870" }, /* 5870 */ +++ { 0, 0, printargs, "SYS_5871" }, /* 5871 */ +++ { 0, 0, printargs, "SYS_5872" }, /* 5872 */ +++ { 0, 0, printargs, "SYS_5873" }, /* 5873 */ +++ { 0, 0, printargs, "SYS_5874" }, /* 5874 */ +++ { 0, 0, printargs, "SYS_5875" }, /* 5875 */ +++ { 0, 0, printargs, "SYS_5876" }, /* 5876 */ +++ { 0, 0, printargs, "SYS_5877" }, /* 5877 */ +++ { 0, 0, printargs, "SYS_5878" }, /* 5878 */ +++ { 0, 0, printargs, "SYS_5879" }, /* 5879 */ +++ { 0, 0, printargs, "SYS_5880" }, /* 5880 */ +++ { 0, 0, printargs, "SYS_5881" }, /* 5881 */ +++ { 0, 0, printargs, "SYS_5882" }, /* 5882 */ +++ { 0, 0, printargs, "SYS_5883" }, /* 5883 */ +++ { 0, 0, printargs, "SYS_5884" }, /* 5884 */ +++ { 0, 0, printargs, "SYS_5885" }, /* 5885 */ +++ { 0, 0, printargs, "SYS_5886" }, /* 5886 */ +++ { 0, 0, printargs, "SYS_5887" }, /* 5887 */ +++ { 0, 0, printargs, "SYS_5888" }, /* 5888 */ +++ { 0, 0, printargs, "SYS_5889" }, /* 5889 */ +++ { 0, 0, printargs, "SYS_5890" }, /* 5890 */ +++ { 0, 0, printargs, "SYS_5891" }, /* 5891 */ +++ { 0, 0, printargs, "SYS_5892" }, /* 5892 */ +++ { 0, 0, printargs, "SYS_5893" }, /* 5893 */ +++ { 0, 0, printargs, "SYS_5894" }, /* 5894 */ +++ { 0, 0, printargs, "SYS_5895" }, /* 5895 */ +++ { 0, 0, printargs, "SYS_5896" }, /* 5896 */ +++ { 0, 0, printargs, "SYS_5897" }, /* 5897 */ +++ { 0, 0, printargs, "SYS_5898" }, /* 5898 */ +++ { 0, 0, printargs, "SYS_5899" }, /* 5899 */ +++ { 0, 0, printargs, "SYS_5900" }, /* 5900 */ +++ { 0, 0, printargs, "SYS_5901" }, /* 5901 */ +++ { 0, 0, printargs, "SYS_5902" }, /* 5902 */ +++ { 0, 0, printargs, "SYS_5903" }, /* 5903 */ +++ { 0, 0, printargs, "SYS_5904" }, /* 5904 */ +++ { 0, 0, printargs, "SYS_5905" }, /* 5905 */ +++ { 0, 0, printargs, "SYS_5906" }, /* 5906 */ +++ { 0, 0, printargs, "SYS_5907" }, /* 5907 */ +++ { 0, 0, printargs, "SYS_5908" }, /* 5908 */ +++ { 0, 0, printargs, "SYS_5909" }, /* 5909 */ +++ { 0, 0, printargs, "SYS_5910" }, /* 5910 */ +++ { 0, 0, printargs, "SYS_5911" }, /* 5911 */ +++ { 0, 0, printargs, "SYS_5912" }, /* 5912 */ +++ { 0, 0, printargs, "SYS_5913" }, /* 5913 */ +++ { 0, 0, printargs, "SYS_5914" }, /* 5914 */ +++ { 0, 0, printargs, "SYS_5915" }, /* 5915 */ +++ { 0, 0, printargs, "SYS_5916" }, /* 5916 */ +++ { 0, 0, printargs, "SYS_5917" }, /* 5917 */ +++ { 0, 0, printargs, "SYS_5918" }, /* 5918 */ +++ { 0, 0, printargs, "SYS_5919" }, /* 5919 */ +++ { 0, 0, printargs, "SYS_5920" }, /* 5920 */ +++ { 0, 0, printargs, "SYS_5921" }, /* 5921 */ +++ { 0, 0, printargs, "SYS_5922" }, /* 5922 */ +++ { 0, 0, printargs, "SYS_5923" }, /* 5923 */ +++ { 0, 0, printargs, "SYS_5924" }, /* 5924 */ +++ { 0, 0, printargs, "SYS_5925" }, /* 5925 */ +++ { 0, 0, printargs, "SYS_5926" }, /* 5926 */ +++ { 0, 0, printargs, "SYS_5927" }, /* 5927 */ +++ { 0, 0, printargs, "SYS_5928" }, /* 5928 */ +++ { 0, 0, printargs, "SYS_5929" }, /* 5929 */ +++ { 0, 0, printargs, "SYS_5930" }, /* 5930 */ +++ { 0, 0, printargs, "SYS_5931" }, /* 5931 */ +++ { 0, 0, printargs, "SYS_5932" }, /* 5932 */ +++ { 0, 0, printargs, "SYS_5933" }, /* 5933 */ +++ { 0, 0, printargs, "SYS_5934" }, /* 5934 */ +++ { 0, 0, printargs, "SYS_5935" }, /* 5935 */ +++ { 0, 0, printargs, "SYS_5936" }, /* 5936 */ +++ { 0, 0, printargs, "SYS_5937" }, /* 5937 */ +++ { 0, 0, printargs, "SYS_5938" }, /* 5938 */ +++ { 0, 0, printargs, "SYS_5939" }, /* 5939 */ +++ { 0, 0, printargs, "SYS_5940" }, /* 5940 */ +++ { 0, 0, printargs, "SYS_5941" }, /* 5941 */ +++ { 0, 0, printargs, "SYS_5942" }, /* 5942 */ +++ { 0, 0, printargs, "SYS_5943" }, /* 5943 */ +++ { 0, 0, printargs, "SYS_5944" }, /* 5944 */ +++ { 0, 0, printargs, "SYS_5945" }, /* 5945 */ +++ { 0, 0, printargs, "SYS_5946" }, /* 5946 */ +++ { 0, 0, printargs, "SYS_5947" }, /* 5947 */ +++ { 0, 0, printargs, "SYS_5948" }, /* 5948 */ +++ { 0, 0, printargs, "SYS_5949" }, /* 5949 */ +++ { 0, 0, printargs, "SYS_5950" }, /* 5950 */ +++ { 0, 0, printargs, "SYS_5951" }, /* 5951 */ +++ { 0, 0, printargs, "SYS_5952" }, /* 5952 */ +++ { 0, 0, printargs, "SYS_5953" }, /* 5953 */ +++ { 0, 0, printargs, "SYS_5954" }, /* 5954 */ +++ { 0, 0, printargs, "SYS_5955" }, /* 5955 */ +++ { 0, 0, printargs, "SYS_5956" }, /* 5956 */ +++ { 0, 0, printargs, "SYS_5957" }, /* 5957 */ +++ { 0, 0, printargs, "SYS_5958" }, /* 5958 */ +++ { 0, 0, printargs, "SYS_5959" }, /* 5959 */ +++ { 0, 0, printargs, "SYS_5960" }, /* 5960 */ +++ { 0, 0, printargs, "SYS_5961" }, /* 5961 */ +++ { 0, 0, printargs, "SYS_5962" }, /* 5962 */ +++ { 0, 0, printargs, "SYS_5963" }, /* 5963 */ +++ { 0, 0, printargs, "SYS_5964" }, /* 5964 */ +++ { 0, 0, printargs, "SYS_5965" }, /* 5965 */ +++ { 0, 0, printargs, "SYS_5966" }, /* 5966 */ +++ { 0, 0, printargs, "SYS_5967" }, /* 5967 */ +++ { 0, 0, printargs, "SYS_5968" }, /* 5968 */ +++ { 0, 0, printargs, "SYS_5969" }, /* 5969 */ +++ { 0, 0, printargs, "SYS_5970" }, /* 5970 */ +++ { 0, 0, printargs, "SYS_5971" }, /* 5971 */ +++ { 0, 0, printargs, "SYS_5972" }, /* 5972 */ +++ { 0, 0, printargs, "SYS_5973" }, /* 5973 */ +++ { 0, 0, printargs, "SYS_5974" }, /* 5974 */ +++ { 0, 0, printargs, "SYS_5975" }, /* 5975 */ +++ { 0, 0, printargs, "SYS_5976" }, /* 5976 */ +++ { 0, 0, printargs, "SYS_5977" }, /* 5977 */ +++ { 0, 0, printargs, "SYS_5978" }, /* 5978 */ +++ { 0, 0, printargs, "SYS_5979" }, /* 5979 */ +++ { 0, 0, printargs, "SYS_5980" }, /* 5980 */ +++ { 0, 0, printargs, "SYS_5981" }, /* 5981 */ +++ { 0, 0, printargs, "SYS_5982" }, /* 5982 */ +++ { 0, 0, printargs, "SYS_5983" }, /* 5983 */ +++ { 0, 0, printargs, "SYS_5984" }, /* 5984 */ +++ { 0, 0, printargs, "SYS_5985" }, /* 5985 */ +++ { 0, 0, printargs, "SYS_5986" }, /* 5986 */ +++ { 0, 0, printargs, "SYS_5987" }, /* 5987 */ +++ { 0, 0, printargs, "SYS_5988" }, /* 5988 */ +++ { 0, 0, printargs, "SYS_5989" }, /* 5989 */ +++ { 0, 0, printargs, "SYS_5990" }, /* 5990 */ +++ { 0, 0, printargs, "SYS_5991" }, /* 5991 */ +++ { 0, 0, printargs, "SYS_5992" }, /* 5992 */ +++ { 0, 0, printargs, "SYS_5993" }, /* 5993 */ +++ { 0, 0, printargs, "SYS_5994" }, /* 5994 */ +++ { 0, 0, printargs, "SYS_5995" }, /* 5995 */ +++ { 0, 0, printargs, "SYS_5996" }, /* 5996 */ +++ { 0, 0, printargs, "SYS_5997" }, /* 5997 */ +++ { 0, 0, printargs, "SYS_5998" }, /* 5998 */ +++ { 0, 0, printargs, "SYS_5999" }, /* 5999 */ /* end of Linux N64 */ +++ +++#if defined (LINUX_MIPSN32) +++ /* For an N32 strace decode the N32 64-bit syscalls. */ +++ { 3, TF, sys_read, "read" }, /* 6000 */ /* start of Linux N32 */ +++ { 3, TF, sys_write, "write" }, /* 6001 */ +++ { 3, TF, sys_open, "open" }, /* 6002 */ +++ { 1, 0, sys_close, "close" }, /* 6003 */ +++ { 2, TF, sys_stat64, "stat" }, /* 6004 */ +++ { 2, 0, sys_fstat64, "fstat" }, /* 6005 */ +++ { 2, TF, sys_lstat64, "lstat" }, /* 6006 */ +++ { 3, 0, sys_poll, "poll" }, /* 6007 */ +++ { 3, 0, sys_lseek, "lseek" }, /* 6008 */ +++ { 6, 0, sys_mmap, "mmap" }, /* 6009 */ +++ { 3, 0, sys_mprotect, "mprotect" }, /* 6010 */ +++ { 2, 0, sys_munmap, "munmap" }, /* 6011 */ +++ { 1, 0, sys_brk, "brk" }, /* 6012 */ +++ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 6013 */ +++ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 6014 */ +++ { 3, 0, sys_ioctl, "ioctl" }, /* 6015 */ +++ { 6, TF, sys_pread64, "pread" }, /* 6016 */ +++ { 6, TF, sys_pwrite64, "pwrite" }, /* 6017 */ +++ { 3, 0, sys_readv, "readv" }, /* 6018 */ +++ { 3, 0, sys_writev, "writev" }, /* 6019 */ +++ { 2, TF, sys_access, "access" }, /* 6020 */ +++ { 1, 0, sys_pipe, "pipe" }, /* 6021 */ +++ { 5, 0, sys_select, "_newselect" }, /* 6022 */ +++ { 0, 0, sys_sched_yield, "sched_yield" }, /* 6023 */ +++ { 4, 0, sys_mremap, "mremap" }, /* 6024 */ +++ { 3, 0, sys_msync, "msync" }, /* 6025 */ +++ { 3, 0, printargs, "mincore" }, /* 6026 */ +++ { 3, 0, sys_madvise, "madvise" }, /* 6027 */ +++ { 3, TI, sys_shmget, "shmget" }, /* 6028 */ +++ { 3, TI, sys_shmat, "shmgat" }, /* 6029 */ +++ { 3, TI, sys_shmctl, "shmctl" }, /* 6030 */ +++ { 1, 0, sys_dup, "dup" }, /* 6031 */ +++ { 2, 0, sys_dup2, "dup2" }, /* 6032 */ +++ { 0, TS, sys_pause, "pause" }, /* 6033 */ +++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 6034 */ +++ { 2, 0, sys_getitimer, "getitimer" }, /* 6035 */ +++ { 3, 0, sys_setitimer, "setitimer" }, /* 6036 */ +++ { 1, 0, sys_alarm, "alarm" }, /* 6037 */ +++ { 0, 0, sys_getpid, "getpid" }, /* 6038 */ +++ { 4, TF, sys_sendfile, "sendfile" }, /* 6039 */ +++ { 2, 0, sys_socketcall, "socketcall" }, /* 6040 */ +++ { 3, TN, sys_connect, "connect" }, /* 6041 */ +++ { 3, TN, sys_accept, "accept" }, /* 6042 */ +++ { 6, TN, sys_sendto, "sendto" }, /* 6043 */ +++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 6044 */ +++ { 3, TN, sys_sendmsg, "sendmsg" }, /* 6045 */ +++ { 3, TN, sys_recvmsg, "recvmsg" }, /* 6046 */ +++ { 2, TN, sys_shutdown, "shutdown" }, /* 6047 */ +++ { 3, TN, sys_bind, "bind" }, /* 6048 */ +++ { 2, TN, sys_listen, "listen" }, /* 6049 */ +++ { 3, TN, sys_getsockname, "getsockname" }, /* 6050 */ +++ { 3, TN, sys_getpeername, "getpeername" }, /* 6051 */ +++ { 4, TN, sys_socketpair, "socketpair" }, /* 6052 */ +++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 6053 */ +++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 6054 */ +++ { 2, TP, sys_clone, "clone" }, /* 6055 */ +++ { 0, TP, sys_fork, "fork" }, /* 6056 */ +++ { 3, TF|TP, sys_execve, "execve" }, /* 6057 */ +++ { 1, TP, sys_exit, "exit" }, /* 6058 */ +++ { 4, TP, sys_wait4, "wait4" }, /* 6059 */ +++ { 2, TS, sys_kill, "kill" }, /* 6060 */ +++ { 1, 0, sys_uname, "uname" }, /* 6061 */ +++ { 3, TI, sys_semget, "semget" }, /* 6062 */ +++ { 3, TI, printargs, "semop" }, /* 6063 */ +++ { 4, TI, sys_semctl, "semctl" }, /* 6064 */ +++ { 1, TI, sys_shmdt, "shmdt" }, /* 6065 */ +++ { 2, TI, sys_msgget, "msgget" }, /* 6066 */ +++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 6067 */ +++ { 5, TI, sys_msgrcv, "msgrcv" }, /* 6068 */ +++ { 3, TI, sys_msgctl, "msgctl" }, /* 6069 */ +++ { 3, 0, sys_fcntl, "fcntl" }, /* 6070 */ +++ { 2, 0, sys_flock, "flock" }, /* 6071 */ +++ { 1, 0, sys_fsync, "fsync" }, /* 6072 */ +++ { 1, 0, sys_fdatasync, "fdatasync" }, /* 6073 */ +++ { 2, TF, sys_truncate, "truncate" }, /* 6074 */ +++ { 2, 0, sys_ftruncate, "ftruncate" }, /* 6075 */ +++ { 3, 0, sys_getdents, "getdents" }, /* 6076 */ +++ { 2, TF, sys_getcwd, "getcwd" }, /* 6077 */ +++ { 1, TF, sys_chdir, "chdir" }, /* 6078 */ +++ { 1, TF, sys_fchdir, "fchdir" }, /* 6079 */ +++ { 2, TF, sys_rename, "rename" }, /* 6080 */ +++ { 2, TF, sys_mkdir, "mkdir" }, /* 6081 */ +++ { 1, TF, sys_rmdir, "rmdir" }, /* 6082 */ +++ { 2, TF, sys_creat, "creat" }, /* 6083 */ +++ { 2, TF, sys_link, "link" }, /* 6084 */ +++ { 1, TF, sys_unlink, "unlink" }, /* 6085 */ +++ { 2, TF, sys_symlink, "symlink" }, /* 6086 */ +++ { 3, TF, sys_readlink, "readlink" }, /* 6087 */ +++ { 2, TF, sys_chmod, "chmod" }, /* 6088 */ +++ { 2, 0, sys_fchmod, "fchmod" }, /* 6089 */ +++ { 3, TF, sys_chown, "chown" }, /* 6090 */ +++ { 3, 0, sys_fchown, "fchown" }, /* 6091 */ +++ { 3, TF, sys_chown, "lchown" }, /* 6092 */ +++ { 1, 0, sys_umask, "umask" }, /* 6093 */ +++ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 6094 */ +++ { 2, 0, sys_getrlimit, "getrlimit" }, /* 6095 */ +++ { 2, 0, sys_getrusage, "getrusage" }, /* 6096 */ +++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 6097 */ +++ { 1, 0, sys_times, "times" }, /* 6098 */ +++ { 4, 0, sys_ptrace, "ptrace" }, /* 6099 */ +++ { 0, 0, sys_getuid, "getuid" }, /* 6100 */ +++ { 3, 0, sys_syslog, "syslog" }, /* 6101 */ +++ { 0, 0, sys_getgid, "getgid" }, /* 6102 */ +++ { 1, 0, sys_setuid, "setuid" }, /* 6103 */ +++ { 1, 0, sys_setgid, "setgid" }, /* 6104 */ +++ { 0, 0, sys_geteuid, "geteuid" }, /* 6105 */ +++ { 0, 0, sys_getegid, "getegid" }, /* 6106 */ +++ { 2, 0, sys_setpgid, "setpgid" }, /* 6107 */ +++ { 0, 0, sys_getppid, "getppid" }, /* 6108 */ +++ { 0, 0, sys_getpgrp, "getpgrp" }, /* 6109 */ +++ { 0, 0, sys_setsid, "setsid" }, /* 6110 */ +++ { 2, 0, sys_setreuid, "setreuid" }, /* 6111 */ +++ { 2, 0, sys_setregid, "setregid" }, /* 6112 */ +++ { 2, 0, sys_getgroups, "getgroups" }, /* 6113 */ +++ { 2, 0, sys_setgroups, "setgroups" }, /* 6114 */ +++ { 3, 0, sys_setresuid, "setresuid" }, /* 6115 */ +++ { 3, 0, sys_getresuid, "getresuid" }, /* 6116 */ +++ { 3, 0, sys_setresgid, "setresgid" }, /* 6117 */ +++ { 3, 0, sys_getresgid, "getresgid" }, /* 6118 */ +++ { 0, 0, sys_getpgid, "getpgid" }, /* 6119 */ +++ { 1, 0, sys_setfsuid, "setfsuid" }, /* 6120 */ +++ { 1, 0, sys_setfsgid, "setfsgid" }, /* 6121 */ +++ { 1, 0, sys_getsid, "getsid" }, /* 6122 */ +++ { 2, 0, sys_capget, "capget" }, /* 6123 */ +++ { 2, 0, sys_capset, "capset" }, /* 6124 */ +++ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 6125 */ +++ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"},/* 6126 */ +++ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"},/* 6127 */ +++ { 2, TS, sys_rt_sigsuspend, "rt_siguspend" }, /* 6128 */ +++ { 2, TS, sys_sigaltstack, "sigaltstatck" }, /* 6129 */ +++ { 2, TF, sys_utime, "utime" }, /* 6130 */ +++ { 3, TF, sys_mknod, "mknod" }, /* 6131 */ +++ { 1, 0, sys_personality, "personality" }, /* 6132 */ +++ { 2, 0, sys_ustat, "ustat" }, /* 6133 */ +++ { 3, 0, sys_statfs, "statfs" }, /* 6134 */ +++ { 3, 0, sys_fstatfs, "fstatfs" }, /* 6135 */ +++ { 5, 0, sys_sysfs, "sysfs" }, /* 6136 */ +++ { 2, 0, sys_getpriority, "getpriority" }, /* 6137 */ +++ { 3, 0, sys_setpriority, "setpriority" }, /* 6138 */ +++ { 2, 0, sys_sched_setparam, "sched_setparam"}, /* 6139 */ +++ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 6140 */ +++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 6141 */ +++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 6142 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 6143 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 6144 */ +++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 6145 */ +++ { 2, 0, sys_mlock, "mlock" }, /* 6146 */ +++ { 2, 0, sys_munlock, "munlock" }, /* 6147 */ +++ { 1, 0, sys_mlockall, "mlockall" }, /* 6148 */ +++ { 0, 0, sys_munlockall, "munlockall" }, /* 6149 */ +++ { 0, 0, sys_vhangup, "vhangup" }, /* 6150 */ +++ { 2, 0, sys_pivotroot, "pivot_root" }, /* 6151 */ +++ { 1, 0, sys_sysctl, "_sysctl" }, /* 6152 */ +++ { 5, 0, printargs, "prctl" }, /* 6153 */ +++ { 1, 0, sys_adjtimex, "adjtimex" }, /* 6154 */ +++ { 2, 0, sys_setrlimit, "setrlimit" }, /* 6155 */ +++ { 1, TF, sys_chroot, "chroot" }, /* 6156 */ +++ { 0, 0, sys_sync, "sync" }, /* 6157 */ +++ { 1, TF, sys_acct, "acct" }, /* 6158 */ +++ { 2, 0, sys_settimeofday, "settimeofday" }, /* 6159 */ +++ { 5, TF, sys_mount, "mount" }, /* 6160 */ +++ { 2, TF, sys_umount2, "umount" }, /* 6161 */ +++ { 1, TF, sys_swapon, "swapon" }, /* 6162 */ +++ { 1, 0, sys_swapoff, "swapoff" }, /* 6163 */ +++ { 3, 0, sys_reboot, "reboot" }, /* 6164 */ +++ { 2, 0, sys_sethostname, "sethostname" }, /* 6165 */ +++ { 2, 0, sys_setdomainname, "setdomainname" }, /* 6166 */ +++ { 2, 0, sys_create_module, "create_module" }, /* 6167 */ +++ { 4, 0, sys_init_module, "init_module" }, /* 6168 */ +++ { 1, 0, sys_delete_module, "delete_module" }, /* 6169 */ +++ { 1, 0, sys_get_kernel_syms, "get_kernel_syms"}, /* 6170 */ +++ { 5, 0, sys_query_module, "query_module" }, /* 6171 */ +++ { 4, 0, sys_quotactl, "quotactl" }, /* 6172 */ +++ { 3, 0, printargs, "nfsservctl" }, /* 6173 */ +++ { 5, TN, printargs, "getpmsg" }, /* 6174 */ +++ { 5, TN, printargs, "putpmsg" }, /* 6175 */ +++ { 0, 0, sys_afs_syscall, "afs_syscall" }, /* 6176 */ +++ { 0, 0, printargs, "reserved177" }, /* 6177 */ +++ { 0, 0, printargs, "gettid" }, /* 6178 */ +++ { 3, 0, sys_readahead, "readahead" }, /* 6179 */ +++ { 5, 0, sys_setxattr, "setxattr" }, /* 6180 */ +++ { 5, 0, sys_setxattr, "lsetxattr" }, /* 6181 */ +++ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 6182 */ +++ { 4, 0, sys_getxattr, "getxattr" }, /* 6183 */ +++ { 4, 0, sys_getxattr, "lgetxattr" }, /* 6184 */ +++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 6185 */ +++ { 3, 0, sys_listxattr, "listxattr" }, /* 6186 */ +++ { 3, 0, sys_listxattr, "llistxattr" }, /* 6187 */ +++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 6188 */ +++ { 2, 0, sys_removexattr, "removexattr" }, /* 6189 */ +++ { 2, 0, sys_removexattr, "lremovexattr" }, /* 6190 */ +++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 6191 */ +++ { 2, 0, sys_kill, "tkill" }, /* 6192 */ +++ { 1, 0, sys_time, "time" }, /* 6193 */ +++ { 5, 0, printargs, "futex" }, /* 6194 */ +++ { 3, 0, printargs, "sched_setaffinity"}, /* 6195 */ +++ { 3, 0, printargs, "sched_getaffinity"}, /* 6196 */ +++ { 3, 0, printargs, "cacheflush" }, /* 6197 */ +++ { 3, 0, printargs, "cachectl" }, /* 6198 */ +++ { 4, 0, sys_sysmips, "sysmips" }, /* 6199 */ +++ { 0, 0, printargs, "io_setup" }, /* 6200 */ +++ { 0, 0, printargs, "io_destroy" }, /* 6201 */ +++ { 0, 0, printargs, "io_getevents" }, /* 6202 */ +++ { 0, 0, printargs, "io_submit" }, /* 6203 */ +++ { 0, 0, printargs, "io_cancel" }, /* 6204 */ +++ { 1, TP, sys_exit, "exit_group"}, /* 6205 */ +++ { 3, 0, printargs, "lookup_dcookie" }, /* 6206 */ +++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 6207 */ +++ { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 6208 */ +++ { 3, TD, sys_epoll_wait, "epoll_wait" }, /* 6209 */ +++ { 5, 0, sys_remap_file_pages, "remap_file_pages" }, /* 6210 */ +++ { 1, TS, printargs, "rt_sigreturn" }, /* 6211 */ +++ { 3, 0, sys_fcntl, "fcntl64" }, /* 6212 */ +++ { 0, 0, printargs, "set_tid_address" }, /* 6213 */ +++ { 0, 0, printargs, "restart_syscall" }, /* 6214 */ +++ { 0, 0, printargs, "semtimedop" }, /* 6215 */ +++ { 0, 0, printargs, "fadvise64" }, /* 6216 */ +++ { 0, 0, printargs, "statfs64" }, /* 6217 */ +++ { 0, 0, printargs, "fstatfs64" }, /* 6218 */ +++ { 4, 0, printargs, "sendfile64" }, /* 6219 */ +++ { 3, 0, printargs, "timer_create" }, /* 6220 */ +++ { 4, 0, printargs, "timer_settime" }, /* 6221 */ +++ { 2, 0, printargs, "timer_gettime" }, /* 6222 */ +++ { 1, 0, printargs, "timer_getoverrun" }, /* 6223 */ +++ { 1, 0, printargs, "timer_delete" }, /* 6224 */ +++ { 2, 0, printargs, "clock_settime" }, /* 6225 */ +++ { 2, 0, printargs, "clock_gettime" }, /* 6226 */ +++ { 2, 0, printargs, "clock_getres" }, /* 6227 */ +++ { 4, 0, printargs, "clock_nanosleep" }, /* 6228 */ +++ { 3, 0, printargs, "tgkill" }, /* 6229 */ +++ { 2, 0, printargs, "utimes" }, /* 6230 */ +++#else +++ { 0, 0, printargs, "n32_read" }, /* 6000 */ +++ { 0, 0, printargs, "n32_write" }, /* 6001 */ +++ { 0, 0, printargs, "n32_open" }, /* 6002 */ +++ { 0, 0, printargs, "n32_close" }, /* 6003 */ +++ { 0, 0, printargs, "n32_stat" }, /* 6004 */ +++ { 0, 0, printargs, "n32_fstat" }, /* 6005 */ +++ { 0, 0, printargs, "n32_lstat" }, /* 6006 */ +++ { 0, 0, printargs, "n32_poll" }, /* 6007 */ +++ { 0, 0, printargs, "n32_lseek" }, /* 6008 */ +++ { 0, 0, printargs, "n32_mmap" }, /* 6009 */ +++ { 0, 0, printargs, "n32_mprotect" }, /* 6010 */ +++ { 0, 0, printargs, "n32_munmap" }, /* 6011 */ +++ { 0, 0, printargs, "n32_brk" }, /* 6012 */ +++ { 0, 0, printargs, "n32_rt_sigaction" }, /* 6013 */ +++ { 0, 0, printargs, "n32_rt_sigprocmask" }, /* 6014 */ +++ { 0, 0, printargs, "n32_ioctl" }, /* 6015 */ +++ { 0, 0, printargs, "n32_pread" }, /* 6016 */ +++ { 0, 0, printargs, "n32_pwrite" }, /* 6017 */ +++ { 0, 0, printargs, "n32_readv" }, /* 6018 */ +++ { 0, 0, printargs, "n32_writev" }, /* 6019 */ +++ { 0, 0, printargs, "n32_access" }, /* 6020 */ +++ { 0, 0, printargs, "n32_pipe" }, /* 6021 */ +++ { 0, 0, printargs, "n32__newselect" }, /* 6022 */ +++ { 0, 0, printargs, "n32_sched_yield" }, /* 6023 */ +++ { 0, 0, printargs, "n32_mremap" }, /* 6024 */ +++ { 0, 0, printargs, "n32_msync" }, /* 6025 */ +++ { 0, 0, printargs, "n32_mincore" }, /* 6026 */ +++ { 0, 0, printargs, "n32_madvise" }, /* 6027 */ +++ { 0, 0, printargs, "n32_shmget" }, /* 6028 */ +++ { 0, 0, printargs, "n32_shmgat" }, /* 6029 */ +++ { 0, 0, printargs, "n32_shmctl" }, /* 6030 */ +++ { 0, 0, printargs, "n32_dup" }, /* 6031 */ +++ { 0, 0, printargs, "n32_dup2" }, /* 6032 */ +++ { 0, 0, printargs, "n32_pause" }, /* 6033 */ +++ { 0, 0, printargs, "n32_nanosleep" }, /* 6034 */ +++ { 0, 0, printargs, "n32_getitimer" }, /* 6035 */ +++ { 0, 0, printargs, "n32_setitimer" }, /* 6036 */ +++ { 0, 0, printargs, "n32_alarm" }, /* 6037 */ +++ { 0, 0, printargs, "n32_getpid" }, /* 6038 */ +++ { 0, 0, printargs, "n32_sendfile" }, /* 6039 */ +++ { 0, 0, printargs, "n32_socketcall" }, /* 6040 */ +++ { 0, 0, printargs, "n32_connect" }, /* 6041 */ +++ { 0, 0, printargs, "n32_accept" }, /* 6042 */ +++ { 0, 0, printargs, "n32_sendto" }, /* 6043 */ +++ { 0, 0, printargs, "n32_recvfrom" }, /* 6044 */ +++ { 0, 0, printargs, "n32_sendmsg" }, /* 6045 */ +++ { 0, 0, printargs, "n32_recvmsg" }, /* 6046 */ +++ { 0, 0, printargs, "n32_shutdown" }, /* 6047 */ +++ { 0, 0, printargs, "n32_bind" }, /* 6048 */ +++ { 0, 0, printargs, "n32_listen" }, /* 6049 */ +++ { 0, 0, printargs, "n32_getsockname" }, /* 6050 */ +++ { 0, 0, printargs, "n32_getpeername" }, /* 6051 */ +++ { 0, 0, printargs, "n32_socketpair" }, /* 6052 */ +++ { 0, 0, printargs, "n32_setsockopt" }, /* 6053 */ +++ { 0, 0, printargs, "n32_getsockopt" }, /* 6054 */ +++ { 0, 0, printargs, "n32_clone" }, /* 6055 */ +++ { 0, 0, printargs, "n32_fork" }, /* 6056 */ +++ { 0, 0, printargs, "n32_execve" }, /* 6057 */ +++ { 0, 0, printargs, "n32_exit" }, /* 6058 */ +++ { 0, 0, printargs, "n32_wait4" }, /* 6059 */ +++ { 0, 0, printargs, "n32_kill" }, /* 6060 */ +++ { 0, 0, printargs, "n32_uname" }, /* 6061 */ +++ { 0, 0, printargs, "n32_semget" }, /* 6062 */ +++ { 0, 0, printargs, "n32_semop" }, /* 6063 */ +++ { 0, 0, printargs, "n32_semctl" }, /* 6064 */ +++ { 0, 0, printargs, "n32_shmdt" }, /* 6065 */ +++ { 0, 0, printargs, "n32_msgget" }, /* 6066 */ +++ { 0, 0, printargs, "n32_msgsnd" }, /* 6067 */ +++ { 0, 0, printargs, "n32_msgrcv" }, /* 6068 */ +++ { 0, 0, printargs, "n32_msgctl" }, /* 6069 */ +++ { 0, 0, printargs, "n32_fcntl" }, /* 6070 */ +++ { 0, 0, printargs, "n32_flock" }, /* 6071 */ +++ { 0, 0, printargs, "n32_fsync" }, /* 6072 */ +++ { 0, 0, printargs, "n32_fdatasync" }, /* 6073 */ +++ { 0, 0, printargs, "n32_truncate" }, /* 6074 */ +++ { 0, 0, printargs, "n32_ftruncate" }, /* 6075 */ +++ { 0, 0, printargs, "n32_getdents" }, /* 6076 */ +++ { 0, 0, printargs, "n32_getcwd" }, /* 6077 */ +++ { 0, 0, printargs, "n32_chdir" }, /* 6078 */ +++ { 0, 0, printargs, "n32_fchdir" }, /* 6079 */ +++ { 0, 0, printargs, "n32_rename" }, /* 6080 */ +++ { 0, 0, printargs, "n32_mkdir" }, /* 6081 */ +++ { 0, 0, printargs, "n32_rmdir" }, /* 6082 */ +++ { 0, 0, printargs, "n32_creat" }, /* 6083 */ +++ { 0, 0, printargs, "n32_link" }, /* 6084 */ +++ { 0, 0, printargs, "n32_unlink" }, /* 6085 */ +++ { 0, 0, printargs, "n32_symlink" }, /* 6086 */ +++ { 0, 0, printargs, "n32_readlink" }, /* 6087 */ +++ { 0, 0, printargs, "n32_chmod" }, /* 6088 */ +++ { 0, 0, printargs, "n32_fchmod" }, /* 6089 */ +++ { 0, 0, printargs, "n32_chown" }, /* 6090 */ +++ { 0, 0, printargs, "n32_fchown" }, /* 6091 */ +++ { 0, 0, printargs, "n32_lchown" }, /* 6092 */ +++ { 0, 0, printargs, "n32_umask" }, /* 6093 */ +++ { 0, 0, printargs, "n32_gettimeofday" }, /* 6094 */ +++ { 0, 0, printargs, "n32_getrlimit" }, /* 6095 */ +++ { 0, 0, printargs, "n32_getrusage" }, /* 6096 */ +++ { 0, 0, printargs, "n32_sysinfo" }, /* 6097 */ +++ { 0, 0, printargs, "n32_times" }, /* 6098 */ +++ { 0, 0, printargs, "n32_ptrace" }, /* 6099 */ +++ { 0, 0, printargs, "n32_getuid" }, /* 6100 */ +++ { 0, 0, printargs, "n32_syslog" }, /* 6101 */ +++ { 0, 0, printargs, "n32_getgid" }, /* 6102 */ +++ { 0, 0, printargs, "n32_setuid" }, /* 6103 */ +++ { 0, 0, printargs, "n32_setgid" }, /* 6104 */ +++ { 0, 0, printargs, "n32_geteuid" }, /* 6105 */ +++ { 0, 0, printargs, "n32_getegid" }, /* 6106 */ +++ { 0, 0, printargs, "n32_setpgid" }, /* 6107 */ +++ { 0, 0, printargs, "n32_getppid" }, /* 6108 */ +++ { 0, 0, printargs, "n32_getpgrp" }, /* 6109 */ +++ { 0, 0, printargs, "n32_setsid" }, /* 6110 */ +++ { 0, 0, printargs, "n32_setreuid" }, /* 6111 */ +++ { 0, 0, printargs, "n32_setregid" }, /* 6112 */ +++ { 0, 0, printargs, "n32_getgroups" }, /* 6113 */ +++ { 0, 0, printargs, "n32_setgroups" }, /* 6114 */ +++ { 0, 0, printargs, "n32_setresuid" }, /* 6115 */ +++ { 0, 0, printargs, "n32_getresuid" }, /* 6116 */ +++ { 0, 0, printargs, "n32_setresgid" }, /* 6117 */ +++ { 0, 0, printargs, "n32_getresgid" }, /* 6118 */ +++ { 0, 0, printargs, "n32_getpgid" }, /* 6119 */ +++ { 0, 0, printargs, "n32_setfsuid" }, /* 6120 */ +++ { 0, 0, printargs, "n32_setfsgid" }, /* 6121 */ +++ { 0, 0, printargs, "n32_getsid" }, /* 6122 */ +++ { 0, 0, printargs, "n32_capget" }, /* 6123 */ +++ { 0, 0, printargs, "n32_capset" }, /* 6124 */ +++ { 0, 0, printargs, "n32_rt_sigpending" }, /* 6125 */ +++ { 0, 0, printargs, "n32_rt_sigtimedwait" }, /* 6126 */ +++ { 0, 0, printargs, "n32_rt_sigqueueinfo" }, /* 6127 */ +++ { 0, 0, printargs, "n32_rt_siguspend" }, /* 6128 */ +++ { 0, 0, printargs, "n32_sigaltstatck" }, /* 6129 */ +++ { 0, 0, printargs, "n32_utime" }, /* 6130 */ +++ { 0, 0, printargs, "n32_mknod" }, /* 6131 */ +++ { 0, 0, printargs, "n32_personality" }, /* 6132 */ +++ { 0, 0, printargs, "n32_ustat" }, /* 6133 */ +++ { 0, 0, printargs, "n32_statfs" }, /* 6134 */ +++ { 0, 0, printargs, "n32_fstatfs" }, /* 6135 */ +++ { 0, 0, printargs, "n32_sysfs" }, /* 6136 */ +++ { 0, 0, printargs, "n32_getpriority" }, /* 6137 */ +++ { 0, 0, printargs, "n32_setpriority" }, /* 6138 */ +++ { 0, 0, printargs, "n32_sched_setparam" }, /* 6139 */ +++ { 0, 0, printargs, "n32_sched_getparam" }, /* 6140 */ +++ { 0, 0, printargs, "n32_sched_setscheduler"}, /* 6141 */ +++ { 0, 0, printargs, "n32_sched_getscheduler"}, /* 6142 */ +++ { 0, 0, printargs, "n32_sched_get_priority_max"}, /* 6143 */ +++ { 0, 0, printargs, "n32_sched_get_priority_min"}, /* 6144 */ +++ { 0, 0, printargs, "n32_sched_rr_get_interval"}, /* 6145 */ +++ { 0, 0, printargs, "n32_mlock" }, /* 6146 */ +++ { 0, 0, printargs, "n32_munlock" }, /* 6147 */ +++ { 0, 0, printargs, "n32_mlockall" }, /* 6148 */ +++ { 0, 0, printargs, "n32_munlockall" }, /* 6149 */ +++ { 0, 0, printargs, "n32_vhangup" }, /* 6150 */ +++ { 0, 0, printargs, "n32_pivot_root" }, /* 6151 */ +++ { 0, 0, printargs, "n32__sysctl" }, /* 6152 */ +++ { 0, 0, printargs, "n32_prctl" }, /* 6153 */ +++ { 0, 0, printargs, "n32_adjtimex" }, /* 6154 */ +++ { 0, 0, printargs, "n32_setrlimit" }, /* 6155 */ +++ { 0, 0, printargs, "n32_chroot" }, /* 6156 */ +++ { 0, 0, printargs, "n32_sync" }, /* 6157 */ +++ { 0, 0, printargs, "n32_acct" }, /* 6158 */ +++ { 0, 0, printargs, "n32_settimeofday" }, /* 6159 */ +++ { 0, 0, printargs, "n32_mount" }, /* 6160 */ +++ { 0, 0, printargs, "n32_umount" }, /* 6161 */ +++ { 0, 0, printargs, "n32_swapon" }, /* 6162 */ +++ { 0, 0, printargs, "n32_swapoff" }, /* 6163 */ +++ { 0, 0, printargs, "n32_reboot" }, /* 6164 */ +++ { 0, 0, printargs, "n32_sethostname" }, /* 6165 */ +++ { 0, 0, printargs, "n32_setdomainname" }, /* 6166 */ +++ { 0, 0, printargs, "n32_create_module" }, /* 6167 */ +++ { 0, 0, printargs, "n32_init_module" }, /* 6168 */ +++ { 0, 0, printargs, "n32_delete_module" }, /* 6169 */ +++ { 0, 0, printargs, "n32_get_kernel_syms" }, /* 6170 */ +++ { 0, 0, printargs, "n32_query_module" }, /* 6171 */ +++ { 0, 0, printargs, "n32_quotactl" }, /* 6172 */ +++ { 0, 0, printargs, "n32_nfsservctl" }, /* 6173 */ +++ { 0, 0, printargs, "n32_getpmsg" }, /* 6174 */ +++ { 0, 0, printargs, "n32_putpmsg" }, /* 6175 */ +++ { 0, 0, printargs, "n32_afs_syscall" }, /* 6176 */ +++ { 0, 0, printargs, "n32_reserved177" }, /* 6177 */ +++ { 0, 0, printargs, "n32_gettid" }, /* 6178 */ +++ { 0, 0, printargs, "n32_readahead" }, /* 6179 */ +++ { 0, 0, printargs, "n32_setxattr" }, /* 6180 */ +++ { 0, 0, printargs, "n32_lsetxattr" }, /* 6181 */ +++ { 0, 0, printargs, "n32_fsetxattr" }, /* 6182 */ +++ { 0, 0, printargs, "n32_getxattr" }, /* 6183 */ +++ { 0, 0, printargs, "n32_lgetxattr" }, /* 6184 */ +++ { 0, 0, printargs, "n32_fgetxattr" }, /* 6185 */ +++ { 0, 0, printargs, "n32_listxattr" }, /* 6186 */ +++ { 0, 0, printargs, "n32_llistxattr" }, /* 6187 */ +++ { 0, 0, printargs, "n32_flistxattr" }, /* 6188 */ +++ { 0, 0, printargs, "n32_removexattr" }, /* 6189 */ +++ { 0, 0, printargs, "n32_lremovexattr" }, /* 6190 */ +++ { 0, 0, printargs, "n32_fremovexattr" }, /* 6191 */ +++ { 0, 0, printargs, "n32_tkill" }, /* 6192 */ +++ { 0, 0, printargs, "n32_time" }, /* 6193 */ +++ { 0, 0, printargs, "n32_futex" }, /* 6194 */ +++ { 0, 0, printargs, "n32_sched_setaffinity" }, /* 6195 */ +++ { 0, 0, printargs, "n32_sched_getaffinity" }, /* 6196 */ +++ { 0, 0, printargs, "n32_cacheflush" }, /* 6197 */ +++ { 0, 0, printargs, "n32_cachectl" }, /* 6198 */ +++ { 0, 0, printargs, "n32_sysmips" }, /* 6199 */ +++ { 0, 0, printargs, "n32_io_setup" }, /* 6200 */ +++ { 0, 0, printargs, "n32_io_destroy" }, /* 6201 */ +++ { 0, 0, printargs, "n32_io_getevents" }, /* 6202 */ +++ { 0, 0, printargs, "n32_io_submit" }, /* 6203 */ +++ { 0, 0, printargs, "n32_io_cancel" }, /* 6204 */ +++ { 1, TP, printargs, "n32_exit_group" }, /* 6205 */ +++ { 0, 0, printargs, "n32_lookup_dcookie" }, /* 6206 */ +++ { 0, 0, printargs, "n32_epoll_create" }, /* 6207 */ +++ { 0, 0, printargs, "n32_epoll_ctl" }, /* 6208 */ +++ { 0, 0, printargs, "n32_epoll_wait" }, /* 6209 */ +++ { 0, 0, printargs, "n32_remap_file_pages" }, /* 6210 */ +++ { 0, 0, printargs, "n32_rt_sigreturn" }, /* 6211 */ +++ { 0, 0, printargs, "n32_fcntl64" }, /* 6212 */ +++ { 0, 0, printargs, "n32_set_tid_address" }, /* 6213 */ +++ { 0, 0, printargs, "n32_restart_syscall" }, /* 6214 */ +++ { 0, 0, printargs, "n32_semtimedop" }, /* 6215 */ +++ { 0, 0, printargs, "n32_fadvise64" }, /* 6216 */ +++ { 0, 0, printargs, "n32_statfs64" }, /* 6217 */ +++ { 0, 0, printargs, "n32_fstatfs64" }, /* 6218 */ +++ { 0, 0, printargs, "n32_sendfile64" }, /* 6219 */ +++ { 3, 0, printargs, "n32_timer_create" }, /* 6220 */ +++ { 4, 0, printargs, "n32_timer_settime" }, /* 6221 */ +++ { 2, 0, printargs, "n32_timer_gettime" }, /* 6222 */ +++ { 1, 0, printargs, "n32_timer_getoverrun" }, /* 6223 */ +++ { 1, 0, printargs, "n32_timer_delete" }, /* 6224 */ +++ { 2, 0, printargs, "n32_clock_settime" }, /* 6225 */ +++ { 2, 0, printargs, "n32_clock_gettime" }, /* 6226 */ +++ { 2, 0, printargs, "n32_clock_getres" }, /* 6227 */ +++ { 4, 0, printargs, "n32_clock_nanosleep" }, /* 6228 */ +++ { 3, 0, printargs, "n32_tgkill" }, /* 6229 */ +++ { 2, 0, printargs, "n32_utimes" }, /* 6230 */ +++#endif +++ { 0, 0, printargs, "SYS_6231" }, /* 6231 */ +++ { 0, 0, printargs, "SYS_6232" }, /* 6232 */ +++ { 0, 0, printargs, "SYS_6233" }, /* 6233 */ +++ { 0, 0, printargs, "SYS_6234" }, /* 6234 */ +++ { 0, 0, printargs, "SYS_6235" }, /* 6235 */ +++ { 0, 0, printargs, "SYS_6236" }, /* 6236 */ +++ { 0, 0, printargs, "SYS_6237" }, /* 6237 */ +++ { 0, 0, printargs, "SYS_6238" }, /* 6238 */ +++ { 0, 0, printargs, "SYS_6239" }, /* 6239 */ +++ { 0, 0, printargs, "SYS_6240" }, /* 6240 */ +++ { 0, 0, printargs, "SYS_6241" }, /* 6241 */ +++ { 0, 0, printargs, "SYS_6242" }, /* 6242 */ +++ { 0, 0, printargs, "SYS_6243" }, /* 6243 */ +++ { 0, 0, printargs, "SYS_6244" }, /* 6244 */ +++ { 0, 0, printargs, "SYS_6245" }, /* 6245 */ +++ { 0, 0, printargs, "SYS_6246" }, /* 6246 */ +++ { 0, 0, printargs, "SYS_6247" }, /* 6247 */ +++ { 0, 0, printargs, "SYS_6248" }, /* 6248 */ +++ { 0, 0, printargs, "SYS_6249" }, /* 6249 */ +++ { 0, 0, printargs, "SYS_6250" }, /* 6250 */ +++ { 0, 0, printargs, "SYS_6251" }, /* 6251 */ +++ { 0, 0, printargs, "SYS_6252" }, /* 6252 */ +++ { 0, 0, printargs, "SYS_6253" }, /* 6253 */ +++ { 0, 0, printargs, "SYS_6254" }, /* 6254 */ +++ { 0, 0, printargs, "SYS_6255" }, /* 6255 */ +++ { 0, 0, printargs, "SYS_6256" }, /* 6256 */ +++ { 0, 0, printargs, "SYS_6257" }, /* 6257 */ +++ { 0, 0, printargs, "SYS_6258" }, /* 6258 */ +++ { 0, 0, printargs, "SYS_6259" }, /* 6259 */ +++ { 0, 0, printargs, "SYS_6260" }, /* 6260 */ +++ { 0, 0, printargs, "SYS_6261" }, /* 6261 */ +++ { 0, 0, printargs, "SYS_6262" }, /* 6262 */ +++ { 0, 0, printargs, "SYS_6263" }, /* 6263 */ +++ { 0, 0, printargs, "SYS_6264" }, /* 6264 */ +++ { 0, 0, printargs, "SYS_6265" }, /* 6265 */ +++ { 0, 0, printargs, "SYS_6266" }, /* 6266 */ +++ { 0, 0, printargs, "SYS_6267" }, /* 6267 */ +++ { 0, 0, printargs, "SYS_6268" }, /* 6268 */ +++ { 0, 0, printargs, "SYS_6269" }, /* 6269 */ +++ { 0, 0, printargs, "SYS_6270" }, /* 6270 */ +++ { 0, 0, printargs, "SYS_6271" }, /* 6271 */ +++ { 0, 0, printargs, "SYS_6272" }, /* 6272 */ +++ { 0, 0, printargs, "SYS_6273" }, /* 6273 */ +++ { 0, 0, printargs, "SYS_6274" }, /* 6274 */ +++ { 0, 0, printargs, "SYS_6275" }, /* 6275 */ +++ { 0, 0, printargs, "SYS_6276" }, /* 6276 */ +++ { 0, 0, printargs, "SYS_6277" }, /* 6277 */ +++ { 0, 0, printargs, "SYS_6278" }, /* 6278 */ +++ { 0, 0, printargs, "SYS_6279" }, /* 6279 */ +++ { 0, 0, printargs, "SYS_6280" }, /* 6280 */ +++ { 0, 0, printargs, "SYS_6281" }, /* 6281 */ +++ { 0, 0, printargs, "SYS_6282" }, /* 6282 */ +++ { 0, 0, printargs, "SYS_6283" }, /* 6283 */ +++ { 0, 0, printargs, "SYS_6284" }, /* 6284 */ +++ { 0, 0, printargs, "SYS_6285" }, /* 6285 */ +++ { 0, 0, printargs, "SYS_6286" }, /* 6286 */ +++ { 0, 0, printargs, "SYS_6287" }, /* 6287 */ +++ { 0, 0, printargs, "SYS_6288" }, /* 6288 */ +++ { 0, 0, printargs, "SYS_6289" }, /* 6289 */ +++ { 0, 0, printargs, "SYS_6290" }, /* 6290 */ +++ { 0, 0, printargs, "SYS_6291" }, /* 6291 */ +++ { 0, 0, printargs, "SYS_6292" }, /* 6292 */ +++ { 0, 0, printargs, "SYS_6293" }, /* 6293 */ +++ { 0, 0, printargs, "SYS_6294" }, /* 6294 */ +++ { 0, 0, printargs, "SYS_6295" }, /* 6295 */ +++ { 0, 0, printargs, "SYS_6296" }, /* 6296 */ +++ { 0, 0, printargs, "SYS_6297" }, /* 6297 */ +++ { 0, 0, printargs, "SYS_6298" }, /* 6298 */ +++ { 0, 0, printargs, "SYS_6299" }, /* 6299 */ +++ { 0, 0, printargs, "SYS_6300" }, /* 6300 */ +++ { 0, 0, printargs, "SYS_6301" }, /* 6301 */ +++ { 0, 0, printargs, "SYS_6302" }, /* 6302 */ +++ { 0, 0, printargs, "SYS_6303" }, /* 6303 */ +++ { 0, 0, printargs, "SYS_6304" }, /* 6304 */ +++ { 0, 0, printargs, "SYS_6305" }, /* 6305 */ +++ { 0, 0, printargs, "SYS_6306" }, /* 6306 */ +++ { 0, 0, printargs, "SYS_6307" }, /* 6307 */ +++ { 0, 0, printargs, "SYS_6308" }, /* 6308 */ +++ { 0, 0, printargs, "SYS_6309" }, /* 6309 */ +++ { 0, 0, printargs, "SYS_6310" }, /* 6310 */ +++ { 0, 0, printargs, "SYS_6311" }, /* 6311 */ +++ { 0, 0, printargs, "SYS_6312" }, /* 6312 */ +++ { 0, 0, printargs, "SYS_6313" }, /* 6313 */ +++ { 0, 0, printargs, "SYS_6314" }, /* 6314 */ +++ { 0, 0, printargs, "SYS_6315" }, /* 6315 */ +++ { 0, 0, printargs, "SYS_6316" }, /* 6316 */ +++ { 0, 0, printargs, "SYS_6317" }, /* 6317 */ +++ { 0, 0, printargs, "SYS_6318" }, /* 6318 */ +++ { 0, 0, printargs, "SYS_6319" }, /* 6319 */ +++ { 0, 0, printargs, "SYS_6320" }, /* 6320 */ +++ { 0, 0, printargs, "SYS_6321" }, /* 6321 */ +++ { 0, 0, printargs, "SYS_6322" }, /* 6322 */ +++ { 0, 0, printargs, "SYS_6323" }, /* 6323 */ +++ { 0, 0, printargs, "SYS_6324" }, /* 6324 */ +++ { 0, 0, printargs, "SYS_6325" }, /* 6325 */ +++ { 0, 0, printargs, "SYS_6326" }, /* 6326 */ +++ { 0, 0, printargs, "SYS_6327" }, /* 6327 */ +++ { 0, 0, printargs, "SYS_6328" }, /* 6328 */ +++ { 0, 0, printargs, "SYS_6329" }, /* 6329 */ +++ { 0, 0, printargs, "SYS_6330" }, /* 6330 */ +++ { 0, 0, printargs, "SYS_6331" }, /* 6331 */ +++ { 0, 0, printargs, "SYS_6332" }, /* 6332 */ +++ { 0, 0, printargs, "SYS_6333" }, /* 6333 */ +++ { 0, 0, printargs, "SYS_6334" }, /* 6334 */ +++ { 0, 0, printargs, "SYS_6335" }, /* 6335 */ +++ { 0, 0, printargs, "SYS_6336" }, /* 6336 */ +++ { 0, 0, printargs, "SYS_6337" }, /* 6337 */ +++ { 0, 0, printargs, "SYS_6338" }, /* 6338 */ +++ { 0, 0, printargs, "SYS_6339" }, /* 6339 */ +++ { 0, 0, printargs, "SYS_6340" }, /* 6340 */ +++ { 0, 0, printargs, "SYS_6341" }, /* 6341 */ +++ { 0, 0, printargs, "SYS_6342" }, /* 6342 */ +++ { 0, 0, printargs, "SYS_6343" }, /* 6343 */ +++ { 0, 0, printargs, "SYS_6344" }, /* 6344 */ +++ { 0, 0, printargs, "SYS_6345" }, /* 6345 */ +++ { 0, 0, printargs, "SYS_6346" }, /* 6346 */ +++ { 0, 0, printargs, "SYS_6347" }, /* 6347 */ +++ { 0, 0, printargs, "SYS_6348" }, /* 6348 */ +++ { 0, 0, printargs, "SYS_6349" }, /* 6349 */ +++ { 0, 0, printargs, "SYS_6350" }, /* 6350 */ +++ { 0, 0, printargs, "SYS_6351" }, /* 6351 */ +++ { 0, 0, printargs, "SYS_6352" }, /* 6352 */ +++ { 0, 0, printargs, "SYS_6353" }, /* 6353 */ +++ { 0, 0, printargs, "SYS_6354" }, /* 6354 */ +++ { 0, 0, printargs, "SYS_6355" }, /* 6355 */ +++ { 0, 0, printargs, "SYS_6356" }, /* 6356 */ +++ { 0, 0, printargs, "SYS_6357" }, /* 6357 */ +++ { 0, 0, printargs, "SYS_6358" }, /* 6358 */ +++ { 0, 0, printargs, "SYS_6359" }, /* 6359 */ +++ { 0, 0, printargs, "SYS_6360" }, /* 6360 */ +++ { 0, 0, printargs, "SYS_6361" }, /* 6361 */ +++ { 0, 0, printargs, "SYS_6362" }, /* 6362 */ +++ { 0, 0, printargs, "SYS_6363" }, /* 6363 */ +++ { 0, 0, printargs, "SYS_6364" }, /* 6364 */ +++ { 0, 0, printargs, "SYS_6365" }, /* 6365 */ +++ { 0, 0, printargs, "SYS_6366" }, /* 6366 */ +++ { 0, 0, printargs, "SYS_6367" }, /* 6367 */ +++ { 0, 0, printargs, "SYS_6368" }, /* 6368 */ +++ { 0, 0, printargs, "SYS_6369" }, /* 6369 */ +++ { 0, 0, printargs, "SYS_6370" }, /* 6370 */ +++ { 0, 0, printargs, "SYS_6371" }, /* 6371 */ +++ { 0, 0, printargs, "SYS_6372" }, /* 6372 */ +++ { 0, 0, printargs, "SYS_6373" }, /* 6373 */ +++ { 0, 0, printargs, "SYS_6374" }, /* 6374 */ +++ { 0, 0, printargs, "SYS_6375" }, /* 6375 */ +++ { 0, 0, printargs, "SYS_6376" }, /* 6376 */ +++ { 0, 0, printargs, "SYS_6377" }, /* 6377 */ +++ { 0, 0, printargs, "SYS_6378" }, /* 6378 */ +++ { 0, 0, printargs, "SYS_6379" }, /* 6379 */ +++ { 0, 0, printargs, "SYS_6380" }, /* 6380 */ +++ { 0, 0, printargs, "SYS_6381" }, /* 6381 */ +++ { 0, 0, printargs, "SYS_6382" }, /* 6382 */ +++ { 0, 0, printargs, "SYS_6383" }, /* 6383 */ +++ { 0, 0, printargs, "SYS_6384" }, /* 6384 */ +++ { 0, 0, printargs, "SYS_6385" }, /* 6385 */ +++ { 0, 0, printargs, "SYS_6386" }, /* 6386 */ +++ { 0, 0, printargs, "SYS_6387" }, /* 6387 */ +++ { 0, 0, printargs, "SYS_6388" }, /* 6388 */ +++ { 0, 0, printargs, "SYS_6389" }, /* 6389 */ +++ { 0, 0, printargs, "SYS_6390" }, /* 6390 */ +++ { 0, 0, printargs, "SYS_6391" }, /* 6391 */ +++ { 0, 0, printargs, "SYS_6392" }, /* 6392 */ +++ { 0, 0, printargs, "SYS_6393" }, /* 6393 */ +++ { 0, 0, printargs, "SYS_6394" }, /* 6394 */ +++ { 0, 0, printargs, "SYS_6395" }, /* 6395 */ +++ { 0, 0, printargs, "SYS_6396" }, /* 6396 */ +++ { 0, 0, printargs, "SYS_6397" }, /* 6397 */ +++ { 0, 0, printargs, "SYS_6398" }, /* 6398 */ +++ { 0, 0, printargs, "SYS_6399" }, /* 6399 */ +++ { 0, 0, printargs, "SYS_6400" }, /* 6400 */ +++ { 0, 0, printargs, "SYS_6401" }, /* 6401 */ +++ { 0, 0, printargs, "SYS_6402" }, /* 6402 */ +++ { 0, 0, printargs, "SYS_6403" }, /* 6403 */ +++ { 0, 0, printargs, "SYS_6404" }, /* 6404 */ +++ { 0, 0, printargs, "SYS_6405" }, /* 6405 */ +++ { 0, 0, printargs, "SYS_6406" }, /* 6406 */ +++ { 0, 0, printargs, "SYS_6407" }, /* 6407 */ +++ { 0, 0, printargs, "SYS_6408" }, /* 6408 */ +++ { 0, 0, printargs, "SYS_6409" }, /* 6409 */ +++ { 0, 0, printargs, "SYS_6410" }, /* 6410 */ +++ { 0, 0, printargs, "SYS_6411" }, /* 6411 */ +++ { 0, 0, printargs, "SYS_6412" }, /* 6412 */ +++ { 0, 0, printargs, "SYS_6413" }, /* 6413 */ +++ { 0, 0, printargs, "SYS_6414" }, /* 6414 */ +++ { 0, 0, printargs, "SYS_6415" }, /* 6415 */ +++ { 0, 0, printargs, "SYS_6416" }, /* 6416 */ +++ { 0, 0, printargs, "SYS_6417" }, /* 6417 */ +++ { 0, 0, printargs, "SYS_6418" }, /* 6418 */ +++ { 0, 0, printargs, "SYS_6419" }, /* 6419 */ +++ { 0, 0, printargs, "SYS_6420" }, /* 6420 */ +++ { 0, 0, printargs, "SYS_6421" }, /* 6421 */ +++ { 0, 0, printargs, "SYS_6422" }, /* 6422 */ +++ { 0, 0, printargs, "SYS_6423" }, /* 6423 */ +++ { 0, 0, printargs, "SYS_6424" }, /* 6424 */ +++ { 0, 0, printargs, "SYS_6425" }, /* 6425 */ +++ { 0, 0, printargs, "SYS_6426" }, /* 6426 */ +++ { 0, 0, printargs, "SYS_6427" }, /* 6427 */ +++ { 0, 0, printargs, "SYS_6428" }, /* 6428 */ +++ { 0, 0, printargs, "SYS_6429" }, /* 6429 */ +++ { 0, 0, printargs, "SYS_6430" }, /* 6430 */ +++ { 0, 0, printargs, "SYS_6431" }, /* 6431 */ +++ { 0, 0, printargs, "SYS_6432" }, /* 6432 */ +++ { 0, 0, printargs, "SYS_6433" }, /* 6433 */ +++ { 0, 0, printargs, "SYS_6434" }, /* 6434 */ +++ { 0, 0, printargs, "SYS_6435" }, /* 6435 */ +++ { 0, 0, printargs, "SYS_6436" }, /* 6436 */ +++ { 0, 0, printargs, "SYS_6437" }, /* 6437 */ +++ { 0, 0, printargs, "SYS_6438" }, /* 6438 */ +++ { 0, 0, printargs, "SYS_6439" }, /* 6439 */ +++ { 0, 0, printargs, "SYS_6440" }, /* 6440 */ +++ { 0, 0, printargs, "SYS_6441" }, /* 6441 */ +++ { 0, 0, printargs, "SYS_6442" }, /* 6442 */ +++ { 0, 0, printargs, "SYS_6443" }, /* 6443 */ +++ { 0, 0, printargs, "SYS_6444" }, /* 6444 */ +++ { 0, 0, printargs, "SYS_6445" }, /* 6445 */ +++ { 0, 0, printargs, "SYS_6446" }, /* 6446 */ +++ { 0, 0, printargs, "SYS_6447" }, /* 6447 */ +++ { 0, 0, printargs, "SYS_6448" }, /* 6448 */ +++ { 0, 0, printargs, "SYS_6449" }, /* 6449 */ +++ { 0, 0, printargs, "SYS_6450" }, /* 6450 */ +++ { 0, 0, printargs, "SYS_6451" }, /* 6451 */ +++ { 0, 0, printargs, "SYS_6452" }, /* 6452 */ +++ { 0, 0, printargs, "SYS_6453" }, /* 6453 */ +++ { 0, 0, printargs, "SYS_6454" }, /* 6454 */ +++ { 0, 0, printargs, "SYS_6455" }, /* 6455 */ +++ { 0, 0, printargs, "SYS_6456" }, /* 6456 */ +++ { 0, 0, printargs, "SYS_6457" }, /* 6457 */ +++ { 0, 0, printargs, "SYS_6458" }, /* 6458 */ +++ { 0, 0, printargs, "SYS_6459" }, /* 6459 */ +++ { 0, 0, printargs, "SYS_6460" }, /* 6460 */ +++ { 0, 0, printargs, "SYS_6461" }, /* 6461 */ +++ { 0, 0, printargs, "SYS_6462" }, /* 6462 */ +++ { 0, 0, printargs, "SYS_6463" }, /* 6463 */ +++ { 0, 0, printargs, "SYS_6464" }, /* 6464 */ +++ { 0, 0, printargs, "SYS_6465" }, /* 6465 */ +++ { 0, 0, printargs, "SYS_6466" }, /* 6466 */ +++ { 0, 0, printargs, "SYS_6467" }, /* 6467 */ +++ { 0, 0, printargs, "SYS_6468" }, /* 6468 */ +++ { 0, 0, printargs, "SYS_6469" }, /* 6469 */ +++ { 0, 0, printargs, "SYS_6470" }, /* 6470 */ +++ { 0, 0, printargs, "SYS_6471" }, /* 6471 */ +++ { 0, 0, printargs, "SYS_6472" }, /* 6472 */ +++ { 0, 0, printargs, "SYS_6473" }, /* 6473 */ +++ { 0, 0, printargs, "SYS_6474" }, /* 6474 */ +++ { 0, 0, printargs, "SYS_6475" }, /* 6475 */ +++ { 0, 0, printargs, "SYS_6476" }, /* 6476 */ +++ { 0, 0, printargs, "SYS_6477" }, /* 6477 */ +++ { 0, 0, printargs, "SYS_6478" }, /* 6478 */ +++ { 0, 0, printargs, "SYS_6479" }, /* 6479 */ +++ { 0, 0, printargs, "SYS_6480" }, /* 6480 */ +++ { 0, 0, printargs, "SYS_6481" }, /* 6481 */ +++ { 0, 0, printargs, "SYS_6482" }, /* 6482 */ +++ { 0, 0, printargs, "SYS_6483" }, /* 6483 */ +++ { 0, 0, printargs, "SYS_6484" }, /* 6484 */ +++ { 0, 0, printargs, "SYS_6485" }, /* 6485 */ +++ { 0, 0, printargs, "SYS_6486" }, /* 6486 */ +++ { 0, 0, printargs, "SYS_6487" }, /* 6487 */ +++ { 0, 0, printargs, "SYS_6488" }, /* 6488 */ +++ { 0, 0, printargs, "SYS_6489" }, /* 6489 */ +++ { 0, 0, printargs, "SYS_6490" }, /* 6490 */ +++ { 0, 0, printargs, "SYS_6491" }, /* 6491 */ +++ { 0, 0, printargs, "SYS_6492" }, /* 6492 */ +++ { 0, 0, printargs, "SYS_6493" }, /* 6493 */ +++ { 0, 0, printargs, "SYS_6494" }, /* 6494 */ +++ { 0, 0, printargs, "SYS_6495" }, /* 6495 */ +++ { 0, 0, printargs, "SYS_6496" }, /* 6496 */ +++ { 0, 0, printargs, "SYS_6497" }, /* 6497 */ +++ { 0, 0, printargs, "SYS_6498" }, /* 6498 */ +++ { 0, 0, printargs, "SYS_6499" }, /* 6499 */ +++ { 0, 0, printargs, "SYS_6500" }, /* 6500 */ +++ { 0, 0, printargs, "SYS_6501" }, /* 6501 */ +++ { 0, 0, printargs, "SYS_6502" }, /* 6502 */ +++ { 0, 0, printargs, "SYS_6503" }, /* 6503 */ +++ { 0, 0, printargs, "SYS_6504" }, /* 6504 */ +++ { 0, 0, printargs, "SYS_6505" }, /* 6505 */ +++ { 0, 0, printargs, "SYS_6506" }, /* 6506 */ +++ { 0, 0, printargs, "SYS_6507" }, /* 6507 */ +++ { 0, 0, printargs, "SYS_6508" }, /* 6508 */ +++ { 0, 0, printargs, "SYS_6509" }, /* 6509 */ +++ { 0, 0, printargs, "SYS_6510" }, /* 6510 */ +++ { 0, 0, printargs, "SYS_6511" }, /* 6511 */ +++ { 0, 0, printargs, "SYS_6512" }, /* 6512 */ +++ { 0, 0, printargs, "SYS_6513" }, /* 6513 */ +++ { 0, 0, printargs, "SYS_6514" }, /* 6514 */ +++ { 0, 0, printargs, "SYS_6515" }, /* 6515 */ +++ { 0, 0, printargs, "SYS_6516" }, /* 6516 */ +++ { 0, 0, printargs, "SYS_6517" }, /* 6517 */ +++ { 0, 0, printargs, "SYS_6518" }, /* 6518 */ +++ { 0, 0, printargs, "SYS_6519" }, /* 6519 */ +++ { 0, 0, printargs, "SYS_6520" }, /* 6520 */ +++ { 0, 0, printargs, "SYS_6521" }, /* 6521 */ +++ { 0, 0, printargs, "SYS_6522" }, /* 6522 */ +++ { 0, 0, printargs, "SYS_6523" }, /* 6523 */ +++ { 0, 0, printargs, "SYS_6524" }, /* 6524 */ +++ { 0, 0, printargs, "SYS_6525" }, /* 6525 */ +++ { 0, 0, printargs, "SYS_6526" }, /* 6526 */ +++ { 0, 0, printargs, "SYS_6527" }, /* 6527 */ +++ { 0, 0, printargs, "SYS_6528" }, /* 6528 */ +++ { 0, 0, printargs, "SYS_6529" }, /* 6529 */ +++ { 0, 0, printargs, "SYS_6530" }, /* 6530 */ +++ { 0, 0, printargs, "SYS_6531" }, /* 6531 */ +++ { 0, 0, printargs, "SYS_6532" }, /* 6532 */ +++ { 0, 0, printargs, "SYS_6533" }, /* 6533 */ +++ { 0, 0, printargs, "SYS_6534" }, /* 6534 */ +++ { 0, 0, printargs, "SYS_6535" }, /* 6535 */ +++ { 0, 0, printargs, "SYS_6536" }, /* 6536 */ +++ { 0, 0, printargs, "SYS_6537" }, /* 6537 */ +++ { 0, 0, printargs, "SYS_6538" }, /* 6538 */ +++ { 0, 0, printargs, "SYS_6539" }, /* 6539 */ +++ { 0, 0, printargs, "SYS_6540" }, /* 6540 */ +++ { 0, 0, printargs, "SYS_6541" }, /* 6541 */ +++ { 0, 0, printargs, "SYS_6542" }, /* 6542 */ +++ { 0, 0, printargs, "SYS_6543" }, /* 6543 */ +++ { 0, 0, printargs, "SYS_6544" }, /* 6544 */ +++ { 0, 0, printargs, "SYS_6545" }, /* 6545 */ +++ { 0, 0, printargs, "SYS_6546" }, /* 6546 */ +++ { 0, 0, printargs, "SYS_6547" }, /* 6547 */ +++ { 0, 0, printargs, "SYS_6548" }, /* 6548 */ +++ { 0, 0, printargs, "SYS_6549" }, /* 6549 */ +++ { 0, 0, printargs, "SYS_6550" }, /* 6550 */ +++ { 0, 0, printargs, "SYS_6551" }, /* 6551 */ +++ { 0, 0, printargs, "SYS_6552" }, /* 6552 */ +++ { 0, 0, printargs, "SYS_6553" }, /* 6553 */ +++ { 0, 0, printargs, "SYS_6554" }, /* 6554 */ +++ { 0, 0, printargs, "SYS_6555" }, /* 6555 */ +++ { 0, 0, printargs, "SYS_6556" }, /* 6556 */ +++ { 0, 0, printargs, "SYS_6557" }, /* 6557 */ +++ { 0, 0, printargs, "SYS_6558" }, /* 6558 */ +++ { 0, 0, printargs, "SYS_6559" }, /* 6559 */ +++ { 0, 0, printargs, "SYS_6560" }, /* 6560 */ +++ { 0, 0, printargs, "SYS_6561" }, /* 6561 */ +++ { 0, 0, printargs, "SYS_6562" }, /* 6562 */ +++ { 0, 0, printargs, "SYS_6563" }, /* 6563 */ +++ { 0, 0, printargs, "SYS_6564" }, /* 6564 */ +++ { 0, 0, printargs, "SYS_6565" }, /* 6565 */ +++ { 0, 0, printargs, "SYS_6566" }, /* 6566 */ +++ { 0, 0, printargs, "SYS_6567" }, /* 6567 */ +++ { 0, 0, printargs, "SYS_6568" }, /* 6568 */ +++ { 0, 0, printargs, "SYS_6569" }, /* 6569 */ +++ { 0, 0, printargs, "SYS_6570" }, /* 6570 */ +++ { 0, 0, printargs, "SYS_6571" }, /* 6571 */ +++ { 0, 0, printargs, "SYS_6572" }, /* 6572 */ +++ { 0, 0, printargs, "SYS_6573" }, /* 6573 */ +++ { 0, 0, printargs, "SYS_6574" }, /* 6574 */ +++ { 0, 0, printargs, "SYS_6575" }, /* 6575 */ +++ { 0, 0, printargs, "SYS_6576" }, /* 6576 */ +++ { 0, 0, printargs, "SYS_6577" }, /* 6577 */ +++ { 0, 0, printargs, "SYS_6578" }, /* 6578 */ +++ { 0, 0, printargs, "SYS_6579" }, /* 6579 */ +++ { 0, 0, printargs, "SYS_6580" }, /* 6580 */ +++ { 0, 0, printargs, "SYS_6581" }, /* 6581 */ +++ { 0, 0, printargs, "SYS_6582" }, /* 6582 */ +++ { 0, 0, printargs, "SYS_6583" }, /* 6583 */ +++ { 0, 0, printargs, "SYS_6584" }, /* 6584 */ +++ { 0, 0, printargs, "SYS_6585" }, /* 6585 */ +++ { 0, 0, printargs, "SYS_6586" }, /* 6586 */ +++ { 0, 0, printargs, "SYS_6587" }, /* 6587 */ +++ { 0, 0, printargs, "SYS_6588" }, /* 6588 */ +++ { 0, 0, printargs, "SYS_6589" }, /* 6589 */ +++ { 0, 0, printargs, "SYS_6590" }, /* 6590 */ +++ { 0, 0, printargs, "SYS_6591" }, /* 6591 */ +++ { 0, 0, printargs, "SYS_6592" }, /* 6592 */ +++ { 0, 0, printargs, "SYS_6593" }, /* 6593 */ +++ { 0, 0, printargs, "SYS_6594" }, /* 6594 */ +++ { 0, 0, printargs, "SYS_6595" }, /* 6595 */ +++ { 0, 0, printargs, "SYS_6596" }, /* 6596 */ +++ { 0, 0, printargs, "SYS_6597" }, /* 6597 */ +++ { 0, 0, printargs, "SYS_6598" }, /* 6598 */ +++ { 0, 0, printargs, "SYS_6599" }, /* 6599 */ +++ { 0, 0, printargs, "SYS_6600" }, /* 6600 */ +++ { 0, 0, printargs, "SYS_6601" }, /* 6601 */ +++ { 0, 0, printargs, "SYS_6602" }, /* 6602 */ +++ { 0, 0, printargs, "SYS_6603" }, /* 6603 */ +++ { 0, 0, printargs, "SYS_6604" }, /* 6604 */ +++ { 0, 0, printargs, "SYS_6605" }, /* 6605 */ +++ { 0, 0, printargs, "SYS_6606" }, /* 6606 */ +++ { 0, 0, printargs, "SYS_6607" }, /* 6607 */ +++ { 0, 0, printargs, "SYS_6608" }, /* 6608 */ +++ { 0, 0, printargs, "SYS_6609" }, /* 6609 */ +++ { 0, 0, printargs, "SYS_6610" }, /* 6610 */ +++ { 0, 0, printargs, "SYS_6611" }, /* 6611 */ +++ { 0, 0, printargs, "SYS_6612" }, /* 6612 */ +++ { 0, 0, printargs, "SYS_6613" }, /* 6613 */ +++ { 0, 0, printargs, "SYS_6614" }, /* 6614 */ +++ { 0, 0, printargs, "SYS_6615" }, /* 6615 */ +++ { 0, 0, printargs, "SYS_6616" }, /* 6616 */ +++ { 0, 0, printargs, "SYS_6617" }, /* 6617 */ +++ { 0, 0, printargs, "SYS_6618" }, /* 6618 */ +++ { 0, 0, printargs, "SYS_6619" }, /* 6619 */ +++ { 0, 0, printargs, "SYS_6620" }, /* 6620 */ +++ { 0, 0, printargs, "SYS_6621" }, /* 6621 */ +++ { 0, 0, printargs, "SYS_6622" }, /* 6622 */ +++ { 0, 0, printargs, "SYS_6623" }, /* 6623 */ +++ { 0, 0, printargs, "SYS_6624" }, /* 6624 */ +++ { 0, 0, printargs, "SYS_6625" }, /* 6625 */ +++ { 0, 0, printargs, "SYS_6626" }, /* 6626 */ +++ { 0, 0, printargs, "SYS_6627" }, /* 6627 */ +++ { 0, 0, printargs, "SYS_6628" }, /* 6628 */ +++ { 0, 0, printargs, "SYS_6629" }, /* 6629 */ +++ { 0, 0, printargs, "SYS_6630" }, /* 6630 */ +++ { 0, 0, printargs, "SYS_6631" }, /* 6631 */ +++ { 0, 0, printargs, "SYS_6632" }, /* 6632 */ +++ { 0, 0, printargs, "SYS_6633" }, /* 6633 */ +++ { 0, 0, printargs, "SYS_6634" }, /* 6634 */ +++ { 0, 0, printargs, "SYS_6635" }, /* 6635 */ +++ { 0, 0, printargs, "SYS_6636" }, /* 6636 */ +++ { 0, 0, printargs, "SYS_6637" }, /* 6637 */ +++ { 0, 0, printargs, "SYS_6638" }, /* 6638 */ +++ { 0, 0, printargs, "SYS_6639" }, /* 6639 */ +++ { 0, 0, printargs, "SYS_6640" }, /* 6640 */ +++ { 0, 0, printargs, "SYS_6641" }, /* 6641 */ +++ { 0, 0, printargs, "SYS_6642" }, /* 6642 */ +++ { 0, 0, printargs, "SYS_6643" }, /* 6643 */ +++ { 0, 0, printargs, "SYS_6644" }, /* 6644 */ +++ { 0, 0, printargs, "SYS_6645" }, /* 6645 */ +++ { 0, 0, printargs, "SYS_6646" }, /* 6646 */ +++ { 0, 0, printargs, "SYS_6647" }, /* 6647 */ +++ { 0, 0, printargs, "SYS_6648" }, /* 6648 */ +++ { 0, 0, printargs, "SYS_6649" }, /* 6649 */ +++ { 0, 0, printargs, "SYS_6650" }, /* 6650 */ +++ { 0, 0, printargs, "SYS_6651" }, /* 6651 */ +++ { 0, 0, printargs, "SYS_6652" }, /* 6652 */ +++ { 0, 0, printargs, "SYS_6653" }, /* 6653 */ +++ { 0, 0, printargs, "SYS_6654" }, /* 6654 */ +++ { 0, 0, printargs, "SYS_6655" }, /* 6655 */ +++ { 0, 0, printargs, "SYS_6656" }, /* 6656 */ +++ { 0, 0, printargs, "SYS_6657" }, /* 6657 */ +++ { 0, 0, printargs, "SYS_6658" }, /* 6658 */ +++ { 0, 0, printargs, "SYS_6659" }, /* 6659 */ +++ { 0, 0, printargs, "SYS_6660" }, /* 6660 */ +++ { 0, 0, printargs, "SYS_6661" }, /* 6661 */ +++ { 0, 0, printargs, "SYS_6662" }, /* 6662 */ +++ { 0, 0, printargs, "SYS_6663" }, /* 6663 */ +++ { 0, 0, printargs, "SYS_6664" }, /* 6664 */ +++ { 0, 0, printargs, "SYS_6665" }, /* 6665 */ +++ { 0, 0, printargs, "SYS_6666" }, /* 6666 */ +++ { 0, 0, printargs, "SYS_6667" }, /* 6667 */ +++ { 0, 0, printargs, "SYS_6668" }, /* 6668 */ +++ { 0, 0, printargs, "SYS_6669" }, /* 6669 */ +++ { 0, 0, printargs, "SYS_6670" }, /* 6670 */ +++ { 0, 0, printargs, "SYS_6671" }, /* 6671 */ +++ { 0, 0, printargs, "SYS_6672" }, /* 6672 */ +++ { 0, 0, printargs, "SYS_6673" }, /* 6673 */ +++ { 0, 0, printargs, "SYS_6674" }, /* 6674 */ +++ { 0, 0, printargs, "SYS_6675" }, /* 6675 */ +++ { 0, 0, printargs, "SYS_6676" }, /* 6676 */ +++ { 0, 0, printargs, "SYS_6677" }, /* 6677 */ +++ { 0, 0, printargs, "SYS_6678" }, /* 6678 */ +++ { 0, 0, printargs, "SYS_6679" }, /* 6679 */ +++ { 0, 0, printargs, "SYS_6680" }, /* 6680 */ +++ { 0, 0, printargs, "SYS_6681" }, /* 6681 */ +++ { 0, 0, printargs, "SYS_6682" }, /* 6682 */ +++ { 0, 0, printargs, "SYS_6683" }, /* 6683 */ +++ { 0, 0, printargs, "SYS_6684" }, /* 6684 */ +++ { 0, 0, printargs, "SYS_6685" }, /* 6685 */ +++ { 0, 0, printargs, "SYS_6686" }, /* 6686 */ +++ { 0, 0, printargs, "SYS_6687" }, /* 6687 */ +++ { 0, 0, printargs, "SYS_6688" }, /* 6688 */ +++ { 0, 0, printargs, "SYS_6689" }, /* 6689 */ +++ { 0, 0, printargs, "SYS_6690" }, /* 6690 */ +++ { 0, 0, printargs, "SYS_6691" }, /* 6691 */ +++ { 0, 0, printargs, "SYS_6692" }, /* 6692 */ +++ { 0, 0, printargs, "SYS_6693" }, /* 6693 */ +++ { 0, 0, printargs, "SYS_6694" }, /* 6694 */ +++ { 0, 0, printargs, "SYS_6695" }, /* 6695 */ +++ { 0, 0, printargs, "SYS_6696" }, /* 6696 */ +++ { 0, 0, printargs, "SYS_6697" }, /* 6697 */ +++ { 0, 0, printargs, "SYS_6698" }, /* 6698 */ +++ { 0, 0, printargs, "SYS_6699" }, /* 6699 */ +++ { 0, 0, printargs, "SYS_6700" }, /* 6700 */ +++ { 0, 0, printargs, "SYS_6701" }, /* 6701 */ +++ { 0, 0, printargs, "SYS_6702" }, /* 6702 */ +++ { 0, 0, printargs, "SYS_6703" }, /* 6703 */ +++ { 0, 0, printargs, "SYS_6704" }, /* 6704 */ +++ { 0, 0, printargs, "SYS_6705" }, /* 6705 */ +++ { 0, 0, printargs, "SYS_6706" }, /* 6706 */ +++ { 0, 0, printargs, "SYS_6707" }, /* 6707 */ +++ { 0, 0, printargs, "SYS_6708" }, /* 6708 */ +++ { 0, 0, printargs, "SYS_6709" }, /* 6709 */ +++ { 0, 0, printargs, "SYS_6710" }, /* 6710 */ +++ { 0, 0, printargs, "SYS_6711" }, /* 6711 */ +++ { 0, 0, printargs, "SYS_6712" }, /* 6712 */ +++ { 0, 0, printargs, "SYS_6713" }, /* 6713 */ +++ { 0, 0, printargs, "SYS_6714" }, /* 6714 */ +++ { 0, 0, printargs, "SYS_6715" }, /* 6715 */ +++ { 0, 0, printargs, "SYS_6716" }, /* 6716 */ +++ { 0, 0, printargs, "SYS_6717" }, /* 6717 */ +++ { 0, 0, printargs, "SYS_6718" }, /* 6718 */ +++ { 0, 0, printargs, "SYS_6719" }, /* 6719 */ +++ { 0, 0, printargs, "SYS_6720" }, /* 6720 */ +++ { 0, 0, printargs, "SYS_6721" }, /* 6721 */ +++ { 0, 0, printargs, "SYS_6722" }, /* 6722 */ +++ { 0, 0, printargs, "SYS_6723" }, /* 6723 */ +++ { 0, 0, printargs, "SYS_6724" }, /* 6724 */ +++ { 0, 0, printargs, "SYS_6725" }, /* 6725 */ +++ { 0, 0, printargs, "SYS_6726" }, /* 6726 */ +++ { 0, 0, printargs, "SYS_6727" }, /* 6727 */ +++ { 0, 0, printargs, "SYS_6728" }, /* 6728 */ +++ { 0, 0, printargs, "SYS_6729" }, /* 6729 */ +++ { 0, 0, printargs, "SYS_6730" }, /* 6730 */ +++ { 0, 0, printargs, "SYS_6731" }, /* 6731 */ +++ { 0, 0, printargs, "SYS_6732" }, /* 6732 */ +++ { 0, 0, printargs, "SYS_6733" }, /* 6733 */ +++ { 0, 0, printargs, "SYS_6734" }, /* 6734 */ +++ { 0, 0, printargs, "SYS_6735" }, /* 6735 */ +++ { 0, 0, printargs, "SYS_6736" }, /* 6736 */ +++ { 0, 0, printargs, "SYS_6737" }, /* 6737 */ +++ { 0, 0, printargs, "SYS_6738" }, /* 6738 */ +++ { 0, 0, printargs, "SYS_6739" }, /* 6739 */ +++ { 0, 0, printargs, "SYS_6740" }, /* 6740 */ +++ { 0, 0, printargs, "SYS_6741" }, /* 6741 */ +++ { 0, 0, printargs, "SYS_6742" }, /* 6742 */ +++ { 0, 0, printargs, "SYS_6743" }, /* 6743 */ +++ { 0, 0, printargs, "SYS_6744" }, /* 6744 */ +++ { 0, 0, printargs, "SYS_6745" }, /* 6745 */ +++ { 0, 0, printargs, "SYS_6746" }, /* 6746 */ +++ { 0, 0, printargs, "SYS_6747" }, /* 6747 */ +++ { 0, 0, printargs, "SYS_6748" }, /* 6748 */ +++ { 0, 0, printargs, "SYS_6749" }, /* 6749 */ +++ { 0, 0, printargs, "SYS_6750" }, /* 6750 */ +++ { 0, 0, printargs, "SYS_6751" }, /* 6751 */ +++ { 0, 0, printargs, "SYS_6752" }, /* 6752 */ +++ { 0, 0, printargs, "SYS_6753" }, /* 6753 */ +++ { 0, 0, printargs, "SYS_6754" }, /* 6754 */ +++ { 0, 0, printargs, "SYS_6755" }, /* 6755 */ +++ { 0, 0, printargs, "SYS_6756" }, /* 6756 */ +++ { 0, 0, printargs, "SYS_6757" }, /* 6757 */ +++ { 0, 0, printargs, "SYS_6758" }, /* 6758 */ +++ { 0, 0, printargs, "SYS_6759" }, /* 6759 */ +++ { 0, 0, printargs, "SYS_6760" }, /* 6760 */ +++ { 0, 0, printargs, "SYS_6761" }, /* 6761 */ +++ { 0, 0, printargs, "SYS_6762" }, /* 6762 */ +++ { 0, 0, printargs, "SYS_6763" }, /* 6763 */ +++ { 0, 0, printargs, "SYS_6764" }, /* 6764 */ +++ { 0, 0, printargs, "SYS_6765" }, /* 6765 */ +++ { 0, 0, printargs, "SYS_6766" }, /* 6766 */ +++ { 0, 0, printargs, "SYS_6767" }, /* 6767 */ +++ { 0, 0, printargs, "SYS_6768" }, /* 6768 */ +++ { 0, 0, printargs, "SYS_6769" }, /* 6769 */ +++ { 0, 0, printargs, "SYS_6770" }, /* 6770 */ +++ { 0, 0, printargs, "SYS_6771" }, /* 6771 */ +++ { 0, 0, printargs, "SYS_6772" }, /* 6772 */ +++ { 0, 0, printargs, "SYS_6773" }, /* 6773 */ +++ { 0, 0, printargs, "SYS_6774" }, /* 6774 */ +++ { 0, 0, printargs, "SYS_6775" }, /* 6775 */ +++ { 0, 0, printargs, "SYS_6776" }, /* 6776 */ +++ { 0, 0, printargs, "SYS_6777" }, /* 6777 */ +++ { 0, 0, printargs, "SYS_6778" }, /* 6778 */ +++ { 0, 0, printargs, "SYS_6779" }, /* 6779 */ +++ { 0, 0, printargs, "SYS_6780" }, /* 6780 */ +++ { 0, 0, printargs, "SYS_6781" }, /* 6781 */ +++ { 0, 0, printargs, "SYS_6782" }, /* 6782 */ +++ { 0, 0, printargs, "SYS_6783" }, /* 6783 */ +++ { 0, 0, printargs, "SYS_6784" }, /* 6784 */ +++ { 0, 0, printargs, "SYS_6785" }, /* 6785 */ +++ { 0, 0, printargs, "SYS_6786" }, /* 6786 */ +++ { 0, 0, printargs, "SYS_6787" }, /* 6787 */ +++ { 0, 0, printargs, "SYS_6788" }, /* 6788 */ +++ { 0, 0, printargs, "SYS_6789" }, /* 6789 */ +++ { 0, 0, printargs, "SYS_6790" }, /* 6790 */ +++ { 0, 0, printargs, "SYS_6791" }, /* 6791 */ +++ { 0, 0, printargs, "SYS_6792" }, /* 6792 */ +++ { 0, 0, printargs, "SYS_6793" }, /* 6793 */ +++ { 0, 0, printargs, "SYS_6794" }, /* 6794 */ +++ { 0, 0, printargs, "SYS_6795" }, /* 6795 */ +++ { 0, 0, printargs, "SYS_6796" }, /* 6796 */ +++ { 0, 0, printargs, "SYS_6797" }, /* 6797 */ +++ { 0, 0, printargs, "SYS_6798" }, /* 6798 */ +++ { 0, 0, printargs, "SYS_6799" }, /* 6799 */ +++ { 0, 0, printargs, "SYS_6800" }, /* 6800 */ +++ { 0, 0, printargs, "SYS_6801" }, /* 6801 */ +++ { 0, 0, printargs, "SYS_6802" }, /* 6802 */ +++ { 0, 0, printargs, "SYS_6803" }, /* 6803 */ +++ { 0, 0, printargs, "SYS_6804" }, /* 6804 */ +++ { 0, 0, printargs, "SYS_6805" }, /* 6805 */ +++ { 0, 0, printargs, "SYS_6806" }, /* 6806 */ +++ { 0, 0, printargs, "SYS_6807" }, /* 6807 */ +++ { 0, 0, printargs, "SYS_6808" }, /* 6808 */ +++ { 0, 0, printargs, "SYS_6809" }, /* 6809 */ +++ { 0, 0, printargs, "SYS_6810" }, /* 6810 */ +++ { 0, 0, printargs, "SYS_6811" }, /* 6811 */ +++ { 0, 0, printargs, "SYS_6812" }, /* 6812 */ +++ { 0, 0, printargs, "SYS_6813" }, /* 6813 */ +++ { 0, 0, printargs, "SYS_6814" }, /* 6814 */ +++ { 0, 0, printargs, "SYS_6815" }, /* 6815 */ +++ { 0, 0, printargs, "SYS_6816" }, /* 6816 */ +++ { 0, 0, printargs, "SYS_6817" }, /* 6817 */ +++ { 0, 0, printargs, "SYS_6818" }, /* 6818 */ +++ { 0, 0, printargs, "SYS_6819" }, /* 6819 */ +++ { 0, 0, printargs, "SYS_6820" }, /* 6820 */ +++ { 0, 0, printargs, "SYS_6821" }, /* 6821 */ +++ { 0, 0, printargs, "SYS_6822" }, /* 6822 */ +++ { 0, 0, printargs, "SYS_6823" }, /* 6823 */ +++ { 0, 0, printargs, "SYS_6824" }, /* 6824 */ +++ { 0, 0, printargs, "SYS_6825" }, /* 6825 */ +++ { 0, 0, printargs, "SYS_6826" }, /* 6826 */ +++ { 0, 0, printargs, "SYS_6827" }, /* 6827 */ +++ { 0, 0, printargs, "SYS_6828" }, /* 6828 */ +++ { 0, 0, printargs, "SYS_6829" }, /* 6829 */ +++ { 0, 0, printargs, "SYS_6830" }, /* 6830 */ +++ { 0, 0, printargs, "SYS_6831" }, /* 6831 */ +++ { 0, 0, printargs, "SYS_6832" }, /* 6832 */ +++ { 0, 0, printargs, "SYS_6833" }, /* 6833 */ +++ { 0, 0, printargs, "SYS_6834" }, /* 6834 */ +++ { 0, 0, printargs, "SYS_6835" }, /* 6835 */ +++ { 0, 0, printargs, "SYS_6836" }, /* 6836 */ +++ { 0, 0, printargs, "SYS_6837" }, /* 6837 */ +++ { 0, 0, printargs, "SYS_6838" }, /* 6838 */ +++ { 0, 0, printargs, "SYS_6839" }, /* 6839 */ +++ { 0, 0, printargs, "SYS_6840" }, /* 6840 */ +++ { 0, 0, printargs, "SYS_6841" }, /* 6841 */ +++ { 0, 0, printargs, "SYS_6842" }, /* 6842 */ +++ { 0, 0, printargs, "SYS_6843" }, /* 6843 */ +++ { 0, 0, printargs, "SYS_6844" }, /* 6844 */ +++ { 0, 0, printargs, "SYS_6845" }, /* 6845 */ +++ { 0, 0, printargs, "SYS_6846" }, /* 6846 */ +++ { 0, 0, printargs, "SYS_6847" }, /* 6847 */ +++ { 0, 0, printargs, "SYS_6848" }, /* 6848 */ +++ { 0, 0, printargs, "SYS_6849" }, /* 6849 */ +++ { 0, 0, printargs, "SYS_6850" }, /* 6850 */ +++ { 0, 0, printargs, "SYS_6851" }, /* 6851 */ +++ { 0, 0, printargs, "SYS_6852" }, /* 6852 */ +++ { 0, 0, printargs, "SYS_6853" }, /* 6853 */ +++ { 0, 0, printargs, "SYS_6854" }, /* 6854 */ +++ { 0, 0, printargs, "SYS_6855" }, /* 6855 */ +++ { 0, 0, printargs, "SYS_6856" }, /* 6856 */ +++ { 0, 0, printargs, "SYS_6857" }, /* 6857 */ +++ { 0, 0, printargs, "SYS_6858" }, /* 6858 */ +++ { 0, 0, printargs, "SYS_6859" }, /* 6859 */ +++ { 0, 0, printargs, "SYS_6860" }, /* 6860 */ +++ { 0, 0, printargs, "SYS_6861" }, /* 6861 */ +++ { 0, 0, printargs, "SYS_6862" }, /* 6862 */ +++ { 0, 0, printargs, "SYS_6863" }, /* 6863 */ +++ { 0, 0, printargs, "SYS_6864" }, /* 6864 */ +++ { 0, 0, printargs, "SYS_6865" }, /* 6865 */ +++ { 0, 0, printargs, "SYS_6866" }, /* 6866 */ +++ { 0, 0, printargs, "SYS_6867" }, /* 6867 */ +++ { 0, 0, printargs, "SYS_6868" }, /* 6868 */ +++ { 0, 0, printargs, "SYS_6869" }, /* 6869 */ +++ { 0, 0, printargs, "SYS_6870" }, /* 6870 */ +++ { 0, 0, printargs, "SYS_6871" }, /* 6871 */ +++ { 0, 0, printargs, "SYS_6872" }, /* 6872 */ +++ { 0, 0, printargs, "SYS_6873" }, /* 6873 */ +++ { 0, 0, printargs, "SYS_6874" }, /* 6874 */ +++ { 0, 0, printargs, "SYS_6875" }, /* 6875 */ +++ { 0, 0, printargs, "SYS_6876" }, /* 6876 */ +++ { 0, 0, printargs, "SYS_6877" }, /* 6877 */ +++ { 0, 0, printargs, "SYS_6878" }, /* 6878 */ +++ { 0, 0, printargs, "SYS_6879" }, /* 6879 */ +++ { 0, 0, printargs, "SYS_6880" }, /* 6880 */ +++ { 0, 0, printargs, "SYS_6881" }, /* 6881 */ +++ { 0, 0, printargs, "SYS_6882" }, /* 6882 */ +++ { 0, 0, printargs, "SYS_6883" }, /* 6883 */ +++ { 0, 0, printargs, "SYS_6884" }, /* 6884 */ +++ { 0, 0, printargs, "SYS_6885" }, /* 6885 */ +++ { 0, 0, printargs, "SYS_6886" }, /* 6886 */ +++ { 0, 0, printargs, "SYS_6887" }, /* 6887 */ +++ { 0, 0, printargs, "SYS_6888" }, /* 6888 */ +++ { 0, 0, printargs, "SYS_6889" }, /* 6889 */ +++ { 0, 0, printargs, "SYS_6890" }, /* 6890 */ +++ { 0, 0, printargs, "SYS_6891" }, /* 6891 */ +++ { 0, 0, printargs, "SYS_6892" }, /* 6892 */ +++ { 0, 0, printargs, "SYS_6893" }, /* 6893 */ +++ { 0, 0, printargs, "SYS_6894" }, /* 6894 */ +++ { 0, 0, printargs, "SYS_6895" }, /* 6895 */ +++ { 0, 0, printargs, "SYS_6896" }, /* 6896 */ +++ { 0, 0, printargs, "SYS_6897" }, /* 6897 */ +++ { 0, 0, printargs, "SYS_6898" }, /* 6898 */ +++ { 0, 0, printargs, "SYS_6899" }, /* 6899 */ +++ { 0, 0, printargs, "SYS_6900" }, /* 6900 */ +++ { 0, 0, printargs, "SYS_6901" }, /* 6901 */ +++ { 0, 0, printargs, "SYS_6902" }, /* 6902 */ +++ { 0, 0, printargs, "SYS_6903" }, /* 6903 */ +++ { 0, 0, printargs, "SYS_6904" }, /* 6904 */ +++ { 0, 0, printargs, "SYS_6905" }, /* 6905 */ +++ { 0, 0, printargs, "SYS_6906" }, /* 6906 */ +++ { 0, 0, printargs, "SYS_6907" }, /* 6907 */ +++ { 0, 0, printargs, "SYS_6908" }, /* 6908 */ +++ { 0, 0, printargs, "SYS_6909" }, /* 6909 */ +++ { 0, 0, printargs, "SYS_6910" }, /* 6910 */ +++ { 0, 0, printargs, "SYS_6911" }, /* 6911 */ +++ { 0, 0, printargs, "SYS_6912" }, /* 6912 */ +++ { 0, 0, printargs, "SYS_6913" }, /* 6913 */ +++ { 0, 0, printargs, "SYS_6914" }, /* 6914 */ +++ { 0, 0, printargs, "SYS_6915" }, /* 6915 */ +++ { 0, 0, printargs, "SYS_6916" }, /* 6916 */ +++ { 0, 0, printargs, "SYS_6917" }, /* 6917 */ +++ { 0, 0, printargs, "SYS_6918" }, /* 6918 */ +++ { 0, 0, printargs, "SYS_6919" }, /* 6919 */ +++ { 0, 0, printargs, "SYS_6920" }, /* 6920 */ +++ { 0, 0, printargs, "SYS_6921" }, /* 6921 */ +++ { 0, 0, printargs, "SYS_6922" }, /* 6922 */ +++ { 0, 0, printargs, "SYS_6923" }, /* 6923 */ +++ { 0, 0, printargs, "SYS_6924" }, /* 6924 */ +++ { 0, 0, printargs, "SYS_6925" }, /* 6925 */ +++ { 0, 0, printargs, "SYS_6926" }, /* 6926 */ +++ { 0, 0, printargs, "SYS_6927" }, /* 6927 */ +++ { 0, 0, printargs, "SYS_6928" }, /* 6928 */ +++ { 0, 0, printargs, "SYS_6929" }, /* 6929 */ +++ { 0, 0, printargs, "SYS_6930" }, /* 6930 */ +++ { 0, 0, printargs, "SYS_6931" }, /* 6931 */ +++ { 0, 0, printargs, "SYS_6932" }, /* 6932 */ +++ { 0, 0, printargs, "SYS_6933" }, /* 6933 */ +++ { 0, 0, printargs, "SYS_6934" }, /* 6934 */ +++ { 0, 0, printargs, "SYS_6935" }, /* 6935 */ +++ { 0, 0, printargs, "SYS_6936" }, /* 6936 */ +++ { 0, 0, printargs, "SYS_6937" }, /* 6937 */ +++ { 0, 0, printargs, "SYS_6938" }, /* 6938 */ +++ { 0, 0, printargs, "SYS_6939" }, /* 6939 */ +++ { 0, 0, printargs, "SYS_6940" }, /* 6940 */ +++ { 0, 0, printargs, "SYS_6941" }, /* 6941 */ +++ { 0, 0, printargs, "SYS_6942" }, /* 6942 */ +++ { 0, 0, printargs, "SYS_6943" }, /* 6943 */ +++ { 0, 0, printargs, "SYS_6944" }, /* 6944 */ +++ { 0, 0, printargs, "SYS_6945" }, /* 6945 */ +++ { 0, 0, printargs, "SYS_6946" }, /* 6946 */ +++ { 0, 0, printargs, "SYS_6947" }, /* 6947 */ +++ { 0, 0, printargs, "SYS_6948" }, /* 6948 */ +++ { 0, 0, printargs, "SYS_6949" }, /* 6949 */ +++ { 0, 0, printargs, "SYS_6950" }, /* 6950 */ +++ { 0, 0, printargs, "SYS_6951" }, /* 6951 */ +++ { 0, 0, printargs, "SYS_6952" }, /* 6952 */ +++ { 0, 0, printargs, "SYS_6953" }, /* 6953 */ +++ { 0, 0, printargs, "SYS_6954" }, /* 6954 */ +++ { 0, 0, printargs, "SYS_6955" }, /* 6955 */ +++ { 0, 0, printargs, "SYS_6956" }, /* 6956 */ +++ { 0, 0, printargs, "SYS_6957" }, /* 6957 */ +++ { 0, 0, printargs, "SYS_6958" }, /* 6958 */ +++ { 0, 0, printargs, "SYS_6959" }, /* 6959 */ +++ { 0, 0, printargs, "SYS_6960" }, /* 6960 */ +++ { 0, 0, printargs, "SYS_6961" }, /* 6961 */ +++ { 0, 0, printargs, "SYS_6962" }, /* 6962 */ +++ { 0, 0, printargs, "SYS_6963" }, /* 6963 */ +++ { 0, 0, printargs, "SYS_6964" }, /* 6964 */ +++ { 0, 0, printargs, "SYS_6965" }, /* 6965 */ +++ { 0, 0, printargs, "SYS_6966" }, /* 6966 */ +++ { 0, 0, printargs, "SYS_6967" }, /* 6967 */ +++ { 0, 0, printargs, "SYS_6968" }, /* 6968 */ +++ { 0, 0, printargs, "SYS_6969" }, /* 6969 */ +++ { 0, 0, printargs, "SYS_6970" }, /* 6970 */ +++ { 0, 0, printargs, "SYS_6971" }, /* 6971 */ +++ { 0, 0, printargs, "SYS_6972" }, /* 6972 */ +++ { 0, 0, printargs, "SYS_6973" }, /* 6973 */ +++ { 0, 0, printargs, "SYS_6974" }, /* 6974 */ +++ { 0, 0, printargs, "SYS_6975" }, /* 6975 */ +++ { 0, 0, printargs, "SYS_6976" }, /* 6976 */ +++ { 0, 0, printargs, "SYS_6977" }, /* 6977 */ +++ { 0, 0, printargs, "SYS_6978" }, /* 6978 */ +++ { 0, 0, printargs, "SYS_6979" }, /* 6979 */ +++ { 0, 0, printargs, "SYS_6980" }, /* 6980 */ +++ { 0, 0, printargs, "SYS_6981" }, /* 6981 */ +++ { 0, 0, printargs, "SYS_6982" }, /* 6982 */ +++ { 0, 0, printargs, "SYS_6983" }, /* 6983 */ +++ { 0, 0, printargs, "SYS_6984" }, /* 6984 */ +++ { 0, 0, printargs, "SYS_6985" }, /* 6985 */ +++ { 0, 0, printargs, "SYS_6986" }, /* 6986 */ +++ { 0, 0, printargs, "SYS_6987" }, /* 6987 */ +++ { 0, 0, printargs, "SYS_6988" }, /* 6988 */ +++ { 0, 0, printargs, "SYS_6989" }, /* 6989 */ +++ { 0, 0, printargs, "SYS_6990" }, /* 6990 */ +++ { 0, 0, printargs, "SYS_6991" }, /* 6991 */ +++ { 0, 0, printargs, "SYS_6992" }, /* 6992 */ +++ { 0, 0, printargs, "SYS_6993" }, /* 6993 */ +++ { 0, 0, printargs, "SYS_6994" }, /* 6994 */ +++ { 0, 0, printargs, "SYS_6995" }, /* 6995 */ +++ { 0, 0, printargs, "SYS_6996" }, /* 6996 */ +++ { 0, 0, printargs, "SYS_6997" }, /* 6997 */ +++ { 0, 0, printargs, "SYS_6998" }, /* 6998 */ +++ { 0, 0, printargs, "SYS_6999" }, /* 6999 */ /* end of Linux N32 */ +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/004-no_cacheflush.patch.svn-base b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/004-no_cacheflush.patch.svn-base +new file mode 100644 +index 0000000..0a13143 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/004-no_cacheflush.patch.svn-base +@@ -0,0 +1,13 @@ ++--- a/system.c +++++ b/system.c ++@@ -70,10 +70,6 @@ ++ #include ++ #endif ++ ++-#ifdef SYS_cacheflush ++-#include ++-#endif ++- ++ #ifdef HAVE_LINUX_USTNAME_H ++ #include ++ #endif +diff --git a/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/010-cris_support.patch.svn-base b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/010-cris_support.patch.svn-base +new file mode 100644 +index 0000000..07aa964 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/.svn/text-base/010-cris_support.patch.svn-base +@@ -0,0 +1,345 @@ ++diff -Naur strace-4.5.16.ori/config.h.in strace-4.5.16/config.h.in ++--- strace-4.5.16.ori/config.h.in 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/config.h.in 2008-08-04 20:48:28.000000000 +0200 ++@@ -403,6 +403,12 @@ ++ /* Define for the AMD x86-64 architecture. */ ++ #undef X86_64 ++ +++/* Define for the CRISv10 architecture. */ +++#undef CRISV10 +++ +++/* Define for the CRISv32 architecture. */ +++#undef CRISV32 +++ ++ /* Enable GNU extensions on systems that have them. */ ++ #ifndef _GNU_SOURCE ++ # undef _GNU_SOURCE ++diff -Naur strace-4.5.16.ori/configure strace-4.5.16/configure ++--- strace-4.5.16.ori/configure 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/configure 2008-08-04 21:15:39.000000000 +0200 ++@@ -2539,6 +2539,22 @@ ++ _ACEOF ++ ++ ;; +++cris|crisv10) +++ arch=crisv10 +++ +++cat >>confdefs.h <<\_ACEOF +++#define CRISV10 1 +++_ACEOF +++ +++ ;; +++crisv32) +++ arch=crisv32 +++ +++cat >>confdefs.h <<\_ACEOF +++#define CRISV32 1 +++_ACEOF +++ +++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: NO!" >&5 ++ echo "${ECHO_T}NO!" >&6; } ++diff -Naur strace-4.5.16.ori/configure.ac strace-4.5.16/configure.ac ++--- strace-4.5.16.ori/configure.ac 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/configure.ac 2008-08-04 20:50:58.000000000 +0200 ++@@ -111,6 +111,14 @@ ++ AC_MSG_RESULT([NO!]) ++ AC_MSG_ERROR([architecture $host_cpu is not supported by strace]) ++ ;; +++cris|crisv10) +++ arch=crisv10 +++ AC_DEFINE([CRISV10], 1, [Define for the CRISv10 architecture.]) +++ ;; +++crisv32) +++ arch=crisv32 +++ AC_DEFINE([CRISV32], 1, [Define for the CRISv32 architecture.]) +++ ;; ++ esac ++ AC_MSG_RESULT($arch) ++ ++diff -Naur strace-4.5.16.ori/process.c strace-4.5.16/process.c ++--- strace-4.5.16.ori/process.c 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/process.c 2008-08-04 21:18:30.000000000 +0200 ++@@ -548,7 +548,7 @@ ++ # define ARG_PTID (known_scno(tcp) == SYS_clone2 ? 3 : 2) ++ # define ARG_CTID (known_scno(tcp) == SYS_clone2 ? 4 : 3) ++ # define ARG_TLS (known_scno(tcp) == SYS_clone2 ? 5 : 4) ++-# elif defined S390 || defined S390X +++# elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32 ++ # define ARG_STACK 0 ++ # define ARG_FLAGS 1 ++ # define ARG_PTID 2 ++@@ -704,6 +704,10 @@ ++ 0x100000 | new) < 0) ++ return -1; ++ return 0; +++#elif defined(CRISV10) || defined(CRISV32) +++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_R9), new) < 0) +++ return -1; +++ return 0; ++ #elif defined(ARM) ++ /* Some kernels support this, some (pre-2.6.16 or so) don't. */ ++ # ifndef PTRACE_SET_SYSCALL ++@@ -2934,6 +2938,77 @@ ++ { uoff(regs.r0), "r0" }, ++ { uoff(regs.r12_orig), "orig_r12" }, ++ #endif +++#ifdef CRISV10 +++ { 4*PT_FRAMETYPE, "4*PT_FRAMETYPE" }, +++ { 4*PT_ORIG_R10, "4*PT_ORIG_R10" }, +++ { 4*PT_R13, "4*PT_R13" }, +++ { 4*PT_R12, "4*PT_R12" }, +++ { 4*PT_R11, "4*PT_R11" }, +++ { 4*PT_R10, "4*PT_R10" }, +++ { 4*PT_R9, "4*PT_R9" }, +++ { 4*PT_R8, "4*PT_R8" }, +++ { 4*PT_R7, "4*PT_R7" }, +++ { 4*PT_R6, "4*PT_R6" }, +++ { 4*PT_R5, "4*PT_R5" }, +++ { 4*PT_R4, "4*PT_R4" }, +++ { 4*PT_R3, "4*PT_R3" }, +++ { 4*PT_R2, "4*PT_R2" }, +++ { 4*PT_R1, "4*PT_R1" }, +++ { 4*PT_R0, "4*PT_R0" }, +++ { 4*PT_MOF, "4*PT_MOF" }, +++ { 4*PT_DCCR, "4*PT_DCCR" }, +++ { 4*PT_SRP, "4*PT_SRP" }, +++ { 4*PT_IRP, "4*PT_IRP" }, +++ { 4*PT_CSRINSTR, "4*PT_CSRINSTR" }, +++ { 4*PT_CSRADDR, "4*PT_CSRADDR" }, +++ { 4*PT_CSRDATA, "4*PT_CSRDATA" }, +++ { 4*PT_USP, "4*PT_USP" }, +++#endif +++#ifdef CRISV32 +++ { 4*PT_ORIG_R10, "4*PT_ORIG_R10" }, +++ { 4*PT_R0, "4*PT_R0" }, +++ { 4*PT_R1, "4*PT_R1" }, +++ { 4*PT_R2, "4*PT_R2" }, +++ { 4*PT_R3, "4*PT_R3" }, +++ { 4*PT_R4, "4*PT_R4" }, +++ { 4*PT_R5, "4*PT_R5" }, +++ { 4*PT_R6, "4*PT_R6" }, +++ { 4*PT_R7, "4*PT_R7" }, +++ { 4*PT_R8, "4*PT_R8" }, +++ { 4*PT_R9, "4*PT_R9" }, +++ { 4*PT_R10, "4*PT_R10" }, +++ { 4*PT_R11, "4*PT_R11" }, +++ { 4*PT_R12, "4*PT_R12" }, +++ { 4*PT_R13, "4*PT_R13" }, +++ { 4*PT_ACR, "4*PT_ACR" }, +++ { 4*PT_SRS, "4*PT_SRS" }, +++ { 4*PT_MOF, "4*PT_MOF" }, +++ { 4*PT_SPC, "4*PT_SPC" }, +++ { 4*PT_CCS, "4*PT_CCS" }, +++ { 4*PT_SRP, "4*PT_SRP" }, +++ { 4*PT_ERP, "4*PT_ERP" }, +++ { 4*PT_EXS, "4*PT_EXS" }, +++ { 4*PT_EDA, "4*PT_EDA" }, +++ { 4*PT_USP, "4*PT_USP" }, +++ { 4*PT_PPC, "4*PT_PPC" }, +++ { 4*PT_BP_CTRL, "4*PT_BP_CTRL" }, +++ { 4*PT_BP+4, "4*PT_BP+4" }, +++ { 4*PT_BP+8, "4*PT_BP+8" }, +++ { 4*PT_BP+12, "4*PT_BP+12" }, +++ { 4*PT_BP+16, "4*PT_BP+16" }, +++ { 4*PT_BP+20, "4*PT_BP+20" }, +++ { 4*PT_BP+24, "4*PT_BP+24" }, +++ { 4*PT_BP+28, "4*PT_BP+28" }, +++ { 4*PT_BP+32, "4*PT_BP+32" }, +++ { 4*PT_BP+36, "4*PT_BP+36" }, +++ { 4*PT_BP+40, "4*PT_BP+40" }, +++ { 4*PT_BP+44, "4*PT_BP+44" }, +++ { 4*PT_BP+48, "4*PT_BP+48" }, +++ { 4*PT_BP+52, "4*PT_BP+52" }, +++ { 4*PT_BP+56, "4*PT_BP+56" }, +++#endif +++ +++#if !defined(CRISV10) && !defined(CRISV32) ++ #if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, ++ #endif ++@@ -2971,6 +3046,7 @@ ++ #if defined(I386) || defined(X86_64) ++ { uoff(u_debugreg), "offsetof(struct user, u_debugreg)" }, ++ #endif /* I386 */ +++#endif /* !CRISV10/!CRISV32 */ ++ #endif /* !IA64 */ ++ #endif /* !ALPHA */ ++ #endif /* !POWERPC/!SPARC */ ++diff -Naur strace-4.5.16.ori/signal.c strace-4.5.16/signal.c ++--- strace-4.5.16.ori/signal.c 2007-08-02 03:15:59.000000000 +0200 +++++ strace-4.5.16/signal.c 2008-08-04 20:57:04.000000000 +0200 ++@@ -1449,9 +1449,38 @@ ++ } ++ return 0; ++ #else +++#if defined(CRISV10) || defined(CRISV32) +++ struct sigcontext sc; +++ +++ if (entering(tcp)) { +++ long regs[PT_MAX+1]; +++ +++ tcp->u_arg[0] = 0; +++ +++ if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) { +++ perror("sigreturn: PTRACE_GETREGS"); +++ return 0; +++ } +++ if (umove(tcp, regs[PT_USP], &sc) < 0) +++ return 0; +++ tcp->u_arg[0] = 1; +++ tcp->u_arg[1] = sc.oldmask; +++ } else { +++ sigset_t sigm; +++ +++ long_to_sigset(tcp->u_arg[1], &sigm); +++ tcp->u_rval = tcp->u_error = 0; +++ if (tcp->u_arg[0] == 0) +++ return 0; +++ tcp->auxstr = sprintsigmask("mask now ", &sigm, 0); +++ return RVAL_NONE | RVAL_STR; +++ } +++ return 0; +++#else ++ #warning No sys_sigreturn() for this architecture ++ #warning (no problem, just a reminder :-) ++ return 0; +++#endif /* !CRISV10/!CRISV32 */ ++ #endif /* MIPS */ ++ #endif /* SPARC || SPARC64 */ ++ #endif /* ALPHA */ ++diff -Naur strace-4.5.16.ori/syscall.c strace-4.5.16/syscall.c ++--- strace-4.5.16.ori/syscall.c 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/syscall.c 2008-08-04 21:02:28.000000000 +0200 ++@@ -809,6 +809,8 @@ ++ static long r9; ++ #elif defined(X86_64) ++ static long rax; +++#elif defined(CRISV10) || defined(CRISV32) +++ static long r10; ++ #elif defined(AVR32) ++ static struct pt_regs regs; ++ #endif ++@@ -1294,7 +1296,10 @@ ++ return 0; ++ } ++ } ++-#endif /* AVR32 */ +++#elif defined(CRISV10) || defined(CRISV32) +++ if (upeek(pid, 4*PT_R9, &scno) < 0) +++ return -1; +++#endif /* CRISV10/CRISV32 */ ++ #endif /* LINUX */ ++ #ifdef SUNOS4 ++ if (upeek(pid, uoff(u_arg[7]), &scno) < 0) ++@@ -1489,6 +1494,14 @@ ++ fprintf(stderr, "stray syscall exit: r8 = %ld\n", r8); ++ return 0; ++ } +++#elif defined(CRISV10) || defined(CRISV32) +++ if (upeek(pid, 4*PT_R10, &r10) < 0) +++ return -1; +++ if (r10 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) { +++ if (debug) +++ fprintf(stderr, "stray syscall exit: r10 = %ld\n", r10); +++ return 0; +++ } ++ #endif ++ #endif /* LINUX */ ++ return 1; ++@@ -1663,6 +1676,17 @@ ++ tcp->u_rval = regs.r12; ++ u_error = 0; ++ } +++#else +++#if defined(CRISV10) || defined(CRISV32) +++ if (r10 && (unsigned) -r10 < nerrnos) { +++ tcp->u_rval = -1; +++ u_error = -r10; +++ } +++ else { +++ tcp->u_rval = r10; +++ u_error = 0; +++ } +++#endif /* CRISV10/CRISV32 */ ++ #endif /* AVR32 */ ++ #endif /* SH64 */ ++ #endif /* SH */ ++@@ -2175,6 +2199,23 @@ ++ tcp->u_arg[3] = regs.r9; ++ tcp->u_arg[4] = regs.r5; ++ tcp->u_arg[5] = regs.r3; +++#elif defined(CRISV10) || defined(CRISV32) +++ { +++ int i; +++ static const int crisregs[] = { +++ 4*PT_ORIG_R10, 4*PT_R11, 4*PT_R12, +++ 4*PT_R13, 4*PT_MOF, 4*PT_SRP +++ }; +++ +++ if (tcp->scno >= 0 && tcp->scno < nsyscalls) +++ tcp->u_nargs = sysent[tcp->scno].nargs; +++ else +++ tcp->u_nargs = 0; +++ for (i = 0; i < tcp->u_nargs; i++) { +++ if (upeek(pid, crisregs[i], &tcp->u_arg[i]) < 0) +++ return -1; +++ } +++ } ++ #else /* Other architecture (like i386) (32bits specific) */ ++ { ++ int i; ++diff -Naur strace-4.5.16.ori/util.c strace-4.5.16/util.c ++--- strace-4.5.16.ori/util.c 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/util.c 2008-08-04 21:05:37.000000000 +0200 ++@@ -1079,6 +1079,12 @@ ++ #elif defined(AVR32) ++ if (upeek(tcp->pid, REG_PC, &pc) < 0) ++ return -1; +++#elif defined(CRISV10) +++ if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0) +++ return -1; +++#elif defined(CRISV32) +++ if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0) +++ return -1; ++ #endif ++ return pc; ++ #endif /* LINUX */ ++@@ -1235,6 +1241,22 @@ ++ return; ++ } ++ tprintf("[%08lx] ", pc); +++#elif defined(CRISV10) +++ long pc; +++ +++ if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0) { +++ PRINTBADPC; +++ return; +++ } +++ tprintf("[%08lx] ", (unsigned long)pc); +++#elif defined(CRISV32) +++ long pc; +++ +++ if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0) { +++ PRINTBADPC; +++ return; +++ } +++ tprintf("[%08lx] ", (unsigned long)pc); ++ #endif /* !architecture */ ++ #endif /* LINUX */ ++ ++@@ -1419,6 +1441,13 @@ ++ # elif defined (AVR32) ++ # define arg0_offset (REG_R12) ++ # define arg1_offset (REG_R11) +++# elif defined CRISV10 || defined CRISV32 +++# define arg0_offset (4*PT_R11) +++# define arg1_offset (4*PT_ORIG_R10) +++# define restore_arg0(tcp, state, val) 0 +++# define restore_arg1(tcp, state, val) 0 +++# define arg0_index 1 +++# define arg1_index 0 ++ # else ++ # define arg0_offset 0 ++ # define arg1_offset 4 +diff --git a/feeds/packages/utils/strace/patches-4.5.16/001-arm_eabi_syscalls.patch b/feeds/packages/utils/strace/patches-4.5.16/001-arm_eabi_syscalls.patch +new file mode 100644 +index 0000000..52234c5 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/001-arm_eabi_syscalls.patch +@@ -0,0 +1,64 @@ ++Index: strace-4.5.16/linux/syscallent.h ++=================================================================== ++--- strace-4.5.16.orig/linux/syscallent.h 2007-08-02 03:37:55.000000000 +0200 +++++ strace-4.5.16/linux/syscallent.h 2008-05-11 15:35:45.000000000 +0200 ++@@ -130,7 +130,10 @@ ++ { 2, TF, sys_statfs, "statfs" }, /* 99 */ ++ { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ ++ { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ ++- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ +++ { 2, TD, sys_socketcall, "socketcall", +++#ifdef __NR_socketcall +++ SYS_socketcall }, /* 102 */ +++#endif ++ { 3, 0, sys_syslog, "syslog" }, /* 103 */ ++ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ ++ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ ++@@ -145,7 +148,10 @@ ++ { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ ++ { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ ++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ ++- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ +++ { 6, 0, sys_ipc, "ipc", +++#ifdef __NR_ipc +++ SYS_ipc }, /* 117 */ +++#endif ++ { 1, TD, sys_fsync, "fsync" }, /* 118 */ ++ { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ ++ { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ ++@@ -282,7 +288,11 @@ ++ { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ ++ { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ ++ { 5, 0, printargs, "SYS_251" }, /* 251 */ ++- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ +++ { 1, TP, sys_exit, "exit_group" +++#ifdef __NR_exit_group +++ , __NR_exit_group +++#endif +++ }, /* 252 */ ++ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ ++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ ++ { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ ++Index: strace-4.5.16/syscall.c ++=================================================================== ++--- strace-4.5.16.orig/syscall.c 2006-12-21 23:13:33.000000000 +0100 +++++ strace-4.5.16/syscall.c 2008-05-11 15:35:45.000000000 +0200 ++@@ -2383,14 +2383,18 @@ ++ switch (known_scno(tcp)) { ++ #ifdef LINUX ++ #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) +++#ifdef __NR_socketcall ++ case SYS_socketcall: ++ decode_subcall(tcp, SYS_socket_subcall, ++ SYS_socket_nsubcalls, deref_style); ++ break; +++#endif +++#ifdef __NR_ipc ++ case SYS_ipc: ++ decode_subcall(tcp, SYS_ipc_subcall, ++ SYS_ipc_nsubcalls, shift_style); ++ break; +++#endif ++ #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */ ++ #if defined (SPARC) || defined (SPARC64) ++ case SYS_socketcall: +diff --git a/feeds/packages/utils/strace/patches-4.5.16/002-arm_bad_syscall.patch b/feeds/packages/utils/strace/patches-4.5.16/002-arm_bad_syscall.patch +new file mode 100644 +index 0000000..4eb8a73 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/002-arm_bad_syscall.patch +@@ -0,0 +1,20 @@ ++Index: strace-4.5.16/syscall.c ++=================================================================== ++--- strace-4.5.16.orig/syscall.c 2008-05-11 15:35:45.000000000 +0200 +++++ strace-4.5.16/syscall.c 2008-05-11 15:36:09.000000000 +0200 ++@@ -1045,6 +1045,15 @@ ++ /* ++ * Note: we only deal with only 32-bit CPUs here. ++ */ +++ +++ if (!(tcp->flags & TCB_INSYSCALL) && +++ (tcp->flags & TCB_WAITEXECVE)) { +++ /* caught a fake syscall from the execve's exit */ +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ +++ ++ if (regs.ARM_cpsr & 0x20) { ++ /* ++ * Get the Thumb-mode system call number +diff --git a/feeds/packages/utils/strace/patches-4.5.16/003-avr32_support.patch b/feeds/packages/utils/strace/patches-4.5.16/003-avr32_support.patch +new file mode 100644 +index 0000000..79d9add +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/003-avr32_support.patch +@@ -0,0 +1,2080 @@ ++--- strace-4.5.16/configure 2008-05-11 15:51:53.000000000 +0200 +++++ strace-4.5.16/configure 2008-05-11 15:54:52.000000000 +0200 ++@@ -2531,6 +2531,14 @@ ++ _ACEOF ++ ++ ;; +++avr32*) +++ arch=avr32 +++ +++cat >>confdefs.h <<\_ACEOF +++#define AVR32 1 +++_ACEOF +++ +++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: NO!" >&5 ++ echo "${ECHO_T}NO!" >&6; } ++Index: strace-4.5.16/config.h.in ++=================================================================== ++--- strace-4.5.16.orig/config.h.in 2007-08-03 12:24:53.000000000 +0200 +++++ strace-4.5.16/config.h.in 2008-05-11 15:36:30.000000000 +0200 ++@@ -6,6 +6,9 @@ ++ /* Define for the ARM architecture. */ ++ #undef ARM ++ +++/* Define for the AVR32 architecture. */ +++#undef AVR32 +++ ++ /* Define for the FreeBSD operating system. */ ++ #undef FREEBSD ++ ++Index: strace-4.5.16/config.sub ++=================================================================== ++--- strace-4.5.16.orig/config.sub 2005-02-02 05:18:19.000000000 +0100 +++++ strace-4.5.16/config.sub 2008-05-11 15:38:53.000000000 +0200 ++@@ -230,7 +230,7 @@ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++- | 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 \ ++@@ -297,7 +297,7 @@ ++ | 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-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++Index: strace-4.5.16/configure.ac ++=================================================================== ++--- strace-4.5.16.orig/configure.ac 2007-08-03 12:06:42.000000000 +0200 +++++ strace-4.5.16/configure.ac 2008-05-11 15:36:30.000000000 +0200 ++@@ -103,6 +103,10 @@ ++ arch=x86_64 ++ AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.]) ++ ;; +++avr32*) +++ arch=avr32 +++ AC_DEFINE([AVR32], 1, [Define for the AVR32 architecture.]) +++ ;; ++ *) ++ AC_MSG_RESULT([NO!]) ++ AC_MSG_ERROR([architecture $host_cpu is not supported by strace]) ++Index: strace-4.5.16/defs.h ++=================================================================== ++--- strace-4.5.16.orig/defs.h 2007-07-24 03:57:11.000000000 +0200 +++++ strace-4.5.16/defs.h 2008-05-11 15:36:30.000000000 +0200 ++@@ -94,6 +94,9 @@ ++ # if defined(X86_64) ++ # define LINUX_X86_64 ++ # endif +++# if defined(AVR32) +++# define LINUX_AVR32 +++# endif ++ #endif ++ ++ #if defined(SVR4) || defined(FREEBSD) ++@@ -120,7 +123,7 @@ ++ #include ++ #endif /* FREEBSD */ ++ #else /* !USE_PROCFS */ ++-#if (defined(LINUXSPARC) || defined (LINUX_X86_64)) && defined(__GLIBC__) +++#if (defined(LINUXSPARC) || defined (LINUX_X86_64) || defined (LINUX_AVR32)) && defined(__GLIBC__) ++ #include ++ #else ++ /* Work around awkward prototype in ptrace.h. */ ++@@ -327,7 +330,7 @@ ++ #define TCB_FOLLOWFORK 00400 /* Process should have forks followed */ ++ #define TCB_REPRINT 01000 /* We should reprint this syscall on exit */ ++ #ifdef LINUX ++-# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) +++# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(AVR32) ++ # define TCB_WAITEXECVE 02000 /* ignore SIGTRAP after exceve */ ++ # endif ++ # define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */ ++Index: strace-4.5.16/linux/avr32/ioctlent.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ strace-4.5.16/linux/avr32/ioctlent.h 2008-05-11 15:36:30.000000000 +0200 ++@@ -0,0 +1,1268 @@ +++{"linux/fs.h", "FIBMAP", 0x1}, +++{"linux/fs.h", "FIGETBSZ", 0x2}, +++{"linux/fd.h", "FDCLRPRM", 0x241}, +++{"linux/fd.h", "FDMSGON", 0x245}, +++{"linux/fd.h", "FDMSGOFF", 0x246}, +++{"linux/fd.h", "FDFMTBEG", 0x247}, +++{"linux/fd.h", "FDFMTEND", 0x249}, +++{"linux/fd.h", "FDSETEMSGTRESH", 0x24a}, +++{"linux/fd.h", "FDFLUSH", 0x24b}, +++{"linux/fd.h", "FDRESET", 0x254}, +++{"linux/fd.h", "FDWERRORCLR", 0x256}, +++{"linux/fd.h", "FDRAWCMD", 0x258}, +++{"linux/fd.h", "FDTWADDLE", 0x259}, +++{"linux/fd.h", "FDEJECT", 0x25a}, +++{"linux/wireless.h", "IW_POWER_ALL_R", 0x300}, +++{"linux/in6.h", "IPV6_PRIORITY_RESERVED1", 0x300}, +++{"linux/apm_bios.h", "APM_DEVICE_PARALLEL", 0x300}, +++{"linux/hdreg.h", "HDIO_GETGEO", 0x301}, +++{"linux/ps2esdi.h", "HDIO_GETGEO", 0x301}, +++{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302}, +++{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304}, +++{"linux/hdreg.h", "HDIO_GET_QDMA", 0x305}, +++{"linux/hdreg.h", "HDIO_SET_XFER", 0x306}, +++{"linux/hdreg.h", "HDIO_OBSOLETE_IDENTITY", 0x307}, +++{"linux/hdreg.h", "HDIO_GET_KEEPSETTINGS", 0x308}, +++{"linux/hdreg.h", "HDIO_GET_32BIT", 0x309}, +++{"linux/hdreg.h", "HDIO_GET_NOWERR", 0x30a}, +++{"linux/hdreg.h", "HDIO_GET_DMA", 0x30b}, +++{"linux/hdreg.h", "HDIO_GET_NICE", 0x30c}, +++{"linux/hdreg.h", "HDIO_GET_IDENTITY", 0x30d}, +++{"linux/hdreg.h", "HDIO_GET_WCACHE", 0x30e}, +++{"linux/hdreg.h", "HDIO_GET_ACOUSTIC", 0x30f}, +++{"linux/hdreg.h", "HDIO_GET_ADDRESS", 0x310}, +++{"linux/hdreg.h", "HDIO_GET_BUSSTATE", 0x31a}, +++{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31b}, +++{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c}, +++{"linux/hdreg.h", "HDIO_DRIVE_TASKFILE", 0x31d}, +++{"linux/hdreg.h", "HDIO_DRIVE_TASK", 0x31e}, +++{"linux/hdreg.h", "HDIO_DRIVE_CMD", 0x31f}, +++{"linux/hdreg.h", "HDIO_SET_MULTCOUNT", 0x321}, +++{"linux/hdreg.h", "HDIO_SET_UNMASKINTR", 0x322}, +++{"linux/hdreg.h", "HDIO_SET_KEEPSETTINGS", 0x323}, +++{"linux/hdreg.h", "HDIO_SET_32BIT", 0x324}, +++{"linux/hdreg.h", "HDIO_SET_NOWERR", 0x325}, +++{"linux/hdreg.h", "HDIO_SET_DMA", 0x326}, +++{"linux/hdreg.h", "HDIO_SET_PIO_MODE", 0x327}, +++{"linux/hdreg.h", "HDIO_SCAN_HWIF", 0x328}, +++{"linux/hdreg.h", "HDIO_SET_NICE", 0x329}, +++{"linux/hdreg.h", "HDIO_UNREGISTER_HWIF", 0x32a}, +++{"linux/hdreg.h", "HDIO_SET_WCACHE", 0x32b}, +++{"linux/hdreg.h", "HDIO_SET_ACOUSTIC", 0x32c}, +++{"linux/hdreg.h", "HDIO_SET_BUSSTATE", 0x32d}, +++{"linux/hdreg.h", "HDIO_SET_QDMA", 0x32e}, +++{"linux/hdreg.h", "HDIO_SET_ADDRESS", 0x32f}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_CARDCO_1", 0x3ec}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_A_SQUARED", 0x3ed}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_COMSPEC_COMMUNICATIONS", 0x3ee}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_ANAKIN_RESEARCH", 0x3f1}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_MICROBOTICS", 0x3f2}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_ACCESS_ASSOCIATES_ALEGRA", 0x3f4}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_EXPANSION_TECHNOLOGIES", 0x3f6}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_ASDG", 0x3ff}, +++{"linux/apm_bios.h", "APM_DEVICE_PCMCIA", 0x600}, +++{"linux/ixjuser.h", "MIXER_PORT_CD_L", 0x600}, +++{"linux/in6.h", "IPV6_PRIORITY_INTERACTIVE", 0x600}, +++{"linux/lp.h", "LPCHAR", 0x601}, +++{"linux/lp.h", "LPTIME", 0x602}, +++{"linux/lp.h", "LPABORT", 0x604}, +++{"linux/lp.h", "LPSETIRQ", 0x605}, +++{"linux/lp.h", "LPGETIRQ", 0x606}, +++{"linux/lp.h", "LPWAIT", 0x608}, +++{"linux/lp.h", "LPCAREFUL", 0x609}, +++{"linux/lp.h", "LPABORTOPEN", 0x60a}, +++{"linux/lp.h", "LPGETSTATUS", 0x60b}, +++{"linux/lp.h", "LPRESET", 0x60c}, +++{"linux/lp.h", "LPGETSTATS", 0x60d}, +++{"linux/lp.h", "LPGETFLAGS", 0x60e}, +++{"linux/lp.h", "LPSETTIMEOUT", 0x60f}, +++{"linux/som.h", "SOM_LIB_RELOC", 0x619}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_1", 0x6e1}, +++{"linux/fs.h", "BLKROSET", 0x125d}, +++{"linux/fs.h", "BLKROGET", 0x125e}, +++{"linux/fs.h", "BLKRRPART", 0x125f}, +++{"linux/fs.h", "BLKGETSIZE", 0x1260}, +++{"linux/fs.h", "BLKFLSBUF", 0x1261}, +++{"linux/fs.h", "BLKRASET", 0x1262}, +++{"linux/fs.h", "BLKRAGET", 0x1263}, +++{"linux/fs.h", "BLKFRASET", 0x1264}, +++{"linux/fs.h", "BLKFRAGET", 0x1265}, +++{"linux/fs.h", "BLKSECTSET", 0x1266}, +++{"linux/fs.h", "BLKSECTGET", 0x1267}, +++{"linux/fs.h", "BLKSSZGET", 0x1268}, +++{"linux/blkpg.h", "BLKPG", 0x1269}, +++{"linux/fs.h", "BLKTRACESTART", 0x1274}, +++{"linux/fs.h", "BLKTRACESTOP", 0x1275}, +++{"linux/fs.h", "BLKTRACETEARDOWN", 0x1276}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_2", 0x2200}, +++{"scsi/sg.h", "SG_SET_TIMEOUT", 0x2201}, +++{"scsi/sg.h", "SG_GET_TIMEOUT", 0x2202}, +++{"scsi/sg.h", "SG_EMULATED_HOST", 0x2203}, +++{"scsi/sg.h", "SG_SET_TRANSFORM", 0x2204}, +++{"scsi/sg.h", "SG_GET_TRANSFORM", 0x2205}, +++{"linux/zorro_ids.h", "ZORRO_MANUF_APOLLO_3", 0x2222}, +++{"scsi/sg.h", "SG_GET_COMMAND_Q", 0x2270}, +++{"scsi/sg.h", "SG_SET_COMMAND_Q", 0x2271}, +++{"scsi/sg.h", "SG_GET_RESERVED_SIZE", 0x2272}, +++{"scsi/sg.h", "SG_SET_RESERVED_SIZE", 0x2275}, +++{"scsi/sg.h", "SG_GET_SCSI_ID", 0x2276}, +++{"scsi/sg.h", "SG_SET_FORCE_LOW_DMA", 0x2279}, +++{"scsi/sg.h", "SG_GET_LOW_DMA", 0x227a}, +++{"scsi/sg.h", "SG_SET_FORCE_PACK_ID", 0x227b}, +++{"scsi/sg.h", "SG_GET_PACK_ID", 0x227c}, +++{"scsi/sg.h", "SG_GET_NUM_WAITING", 0x227d}, +++{"scsi/sg.h", "SG_SET_DEBUG", 0x227e}, +++{"scsi/sg.h", "SG_GET_SG_TABLESIZE", 0x227f}, +++{"scsi/sg.h", "SG_GET_VERSION_NUM", 0x2282}, +++{"scsi/sg.h", "SG_NEXT_CMD_LEN", 0x2283}, +++{"scsi/sg.h", "SG_SCSI_RESET", 0x2284}, +++{"scsi/sg.h", "SG_IO", 0x2285}, +++{"scsi/sg.h", "SG_GET_REQUEST_TABLE", 0x2286}, +++{"scsi/sg.h", "SG_SET_KEEP_ORPHAN", 0x2287}, +++{"scsi/sg.h", "SG_GET_KEEP_ORPHAN", 0x2288}, +++{"linux/apm_bios.h", "APM_IOC_STANDBY", 0x4101}, +++{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101}, +++{"linux/apm_bios.h", "APM_IOC_SUSPEND", 0x4102}, +++{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102}, +++{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200}, +++{"linux/cciss_ioctl.h", "CCISS_REVALIDVOLS", 0x420a}, +++{"linux/cciss_ioctl.h", "CCISS_DEREGDISK", 0x420c}, +++{"linux/cciss_ioctl.h", "CCISS_REGNEWD", 0x420e}, +++{"linux/cciss_ioctl.h", "CCISS_RESCANDISK", 0x4210}, +++{"linux/fb.h", "FBIOGET_VSCREENINFO", 0x4600}, +++{"linux/fb.h", "FBIOPUT_VSCREENINFO", 0x4601}, +++{"linux/ps2esdi.h", "CMD_READ", 0x4601}, +++{"linux/fb.h", "FBIOGET_FSCREENINFO", 0x4602}, +++{"linux/ps2esdi.h", "CMD_WRITE", 0x4602}, +++{"linux/fb.h", "FBIOGETCMAP", 0x4604}, +++{"linux/fb.h", "FBIOPUTCMAP", 0x4605}, +++{"linux/fb.h", "FBIOPAN_DISPLAY", 0x4606}, +++{"linux/fb.h", "FBIOGET_CON2FBMAP", 0x460f}, +++{"linux/fb.h", "FBIOPUT_CON2FBMAP", 0x4610}, +++{"linux/fb.h", "FBIOBLANK", 0x4611}, +++{"linux/fb.h", "FBIO_ALLOC", 0x4613}, +++{"linux/fb.h", "FBIO_FREE", 0x4614}, +++{"linux/fb.h", "FBIOGET_GLYPH", 0x4615}, +++{"linux/fb.h", "FBIOGET_HWCINFO", 0x4616}, +++{"linux/fb.h", "FBIOPUT_MODEINFO", 0x4617}, +++{"linux/fb.h", "FBIOGET_DISPINFO", 0x4618}, +++{"linux/arcfb.h", "FBIO_WAITEVENT", 0x4688}, +++{"linux/hiddev.h", "HIDIOCAPPLICATION", 0x4802}, +++{"linux/hiddev.h", "HIDIOCINITREPORT", 0x4805}, +++{"linux/isdn.h", "IIOCNETAIF", 0x4901}, +++{"linux/isdn.h", "IIOCNETDIF", 0x4902}, +++{"linux/isdn.h", "IIOCNETSCF", 0x4903}, +++{"linux/isdn.h", "IIOCNETGCF", 0x4904}, +++{"linux/isdn.h", "IIOCNETANM", 0x4905}, +++{"linux/isdn.h", "IIOCNETDNM", 0x4906}, +++{"linux/isdn.h", "IIOCNETGNM", 0x4907}, +++{"linux/isdn.h", "IIOCGETSET", 0x4908}, +++{"linux/isdn.h", "IIOCSETSET", 0x4909}, +++{"linux/isdn.h", "IIOCSETVER", 0x490a}, +++{"linux/isdn.h", "IIOCNETHUP", 0x490b}, +++{"linux/isdn.h", "IIOCSETGST", 0x490c}, +++{"linux/isdn.h", "IIOCSETBRJ", 0x490d}, +++{"linux/isdn.h", "IIOCSIGPRF", 0x490e}, +++{"linux/isdn.h", "IIOCGETPRF", 0x490f}, +++{"linux/isdn.h", "IIOCSETPRF", 0x4910}, +++{"linux/isdn.h", "IIOCGETMAP", 0x4911}, +++{"linux/isdn.h", "IIOCSETMAP", 0x4912}, +++{"linux/isdn.h", "IIOCNETASL", 0x4913}, +++{"linux/isdn.h", "IIOCNETDIL", 0x4914}, +++{"linux/isdn.h", "IIOCGETCPS", 0x4915}, +++{"linux/isdn.h", "IIOCGETDVR", 0x4916}, +++{"linux/isdn.h", "IIOCNETLCR", 0x4917}, +++{"linux/isdn.h", "IIOCNETDWRSET", 0x4918}, +++{"linux/isdn.h", "IIOCNETALN", 0x4920}, +++{"linux/isdn.h", "IIOCNETDLN", 0x4921}, +++{"linux/isdn.h", "IIOCNETGPN", 0x4922}, +++{"linux/isdn.h", "IIOCDBGVAR", 0x497f}, +++{"linux/isdn.h", "IIOCDRVCTL", 0x4980}, +++{"linux/kd.h", "KIOCSOUND", 0x4b2f}, +++{"linux/kd.h", "KDMKTONE", 0x4b30}, +++{"linux/kd.h", "KDGETLED", 0x4b31}, +++{"linux/kd.h", "KDSETLED", 0x4b32}, +++{"linux/kd.h", "KDGKBTYPE", 0x4b33}, +++{"linux/kd.h", "KDADDIO", 0x4b34}, +++{"linux/kd.h", "KDDELIO", 0x4b35}, +++{"linux/kd.h", "KDENABIO", 0x4b36}, +++{"linux/kd.h", "KDDISABIO", 0x4b37}, +++{"linux/kd.h", "KDSETMODE", 0x4b3a}, +++{"linux/kd.h", "KDGETMODE", 0x4b3b}, +++{"linux/kd.h", "KDMAPDISP", 0x4b3c}, +++{"linux/kd.h", "KDUNMAPDISP", 0x4b3d}, +++{"linux/kd.h", "GIO_SCRNMAP", 0x4b40}, +++{"linux/kd.h", "PIO_SCRNMAP", 0x4b41}, +++{"linux/kd.h", "KDGKBMODE", 0x4b44}, +++{"linux/kd.h", "KDSKBMODE", 0x4b45}, +++{"linux/kd.h", "KDGKBENT", 0x4b46}, +++{"linux/kd.h", "KDSKBENT", 0x4b47}, +++{"linux/kd.h", "KDGKBSENT", 0x4b48}, +++{"linux/kd.h", "KDSKBSENT", 0x4b49}, +++{"linux/kd.h", "KDGKBDIACR", 0x4b4a}, +++{"linux/kd.h", "KDSKBDIACR", 0x4b4b}, +++{"linux/kd.h", "KDGETKEYCODE", 0x4b4c}, +++{"linux/kd.h", "KDSETKEYCODE", 0x4b4d}, +++{"linux/kd.h", "KDSIGACCEPT", 0x4b4e}, +++{"linux/kd.h", "KDKBDREP", 0x4b52}, +++{"linux/kd.h", "GIO_FONT", 0x4b60}, +++{"linux/kd.h", "PIO_FONT", 0x4b61}, +++{"linux/kd.h", "KDGKBMETA", 0x4b62}, +++{"linux/kd.h", "KDSKBMETA", 0x4b63}, +++{"linux/kd.h", "KDGKBLED", 0x4b64}, +++{"linux/kd.h", "KDSKBLED", 0x4b65}, +++{"linux/kd.h", "GIO_UNIMAP", 0x4b66}, +++{"linux/kd.h", "PIO_UNIMAP", 0x4b67}, +++{"linux/kd.h", "PIO_UNIMAPCLR", 0x4b68}, +++{"linux/kd.h", "GIO_UNISCRNMAP", 0x4b69}, +++{"linux/kd.h", "PIO_UNISCRNMAP", 0x4b6a}, +++{"linux/kd.h", "GIO_FONTX", 0x4b6b}, +++{"linux/kd.h", "PIO_FONTX", 0x4b6c}, +++{"linux/kd.h", "PIO_FONTRESET", 0x4b6d}, +++{"linux/kd.h", "GIO_CMAP", 0x4b70}, +++{"linux/kd.h", "PIO_CMAP", 0x4b71}, +++{"linux/kd.h", "KDFONTOP", 0x4b72}, +++{"linux/loop.h", "LOOP_SET_FD", 0x4c00}, +++{"linux/loop.h", "LOOP_CLR_FD", 0x4c01}, +++{"linux/loop.h", "LOOP_SET_STATUS", 0x4c02}, +++{"linux/loop.h", "LOOP_GET_STATUS", 0x4c03}, +++{"linux/loop.h", "LOOP_SET_STATUS64", 0x4c04}, +++{"linux/loop.h", "LOOP_GET_STATUS64", 0x4c05}, +++{"linux/loop.h", "LOOP_CHANGE_FD", 0x4c06}, +++{"mtd/mtd-abi.h", "MTDFILEMODE", 0x4d13}, +++{"linux/random.h", "RNDZAPENTCNT", 0x5204}, +++{"linux/random.h", "RNDCLEARPOOL", 0x5206}, +++{"linux/cdrom.h", "CDROMPAUSE", 0x5301}, +++{"linux/n_r3964.h", "R3964_ENABLE_SIGNALS", 0x5301}, +++{"linux/n_r3964.h", "R3964_SETPRIORITY", 0x5302}, +++{"linux/cdrom.h", "CDROMRESUME", 0x5302}, +++{"linux/n_r3964.h", "R3964_USE_BCC", 0x5303}, +++{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303}, +++{"linux/n_r3964.h", "R3964_READ_TELEGRAM", 0x5304}, +++{"linux/cdrom.h", "CDROMPLAYTRKIND", 0x5304}, +++{"linux/cdrom.h", "CDROMREADTOCHDR", 0x5305}, +++{"linux/cdrom.h", "CDROMREADTOCENTRY", 0x5306}, +++{"linux/cdrom.h", "CDROMSTOP", 0x5307}, +++{"linux/cdrom.h", "CDROMSTART", 0x5308}, +++{"linux/cdrom.h", "CDROMEJECT", 0x5309}, +++{"linux/cdrom.h", "CDROMVOLCTRL", 0x530a}, +++{"linux/cdrom.h", "CDROMSUBCHNL", 0x530b}, +++{"linux/cdrom.h", "CDROMREADMODE2", 0x530c}, +++{"linux/cdrom.h", "CDROMREADMODE1", 0x530d}, +++{"linux/cdrom.h", "CDROMREADAUDIO", 0x530e}, +++{"linux/cdrom.h", "CDROMEJECT_SW", 0x530f}, +++{"linux/cdrom.h", "CDROMMULTISESSION", 0x5310}, +++{"linux/cdrom.h", "CDROM_GET_MCN", 0x5311}, +++{"linux/cdrom.h", "CDROMRESET", 0x5312}, +++{"linux/cdrom.h", "CDROMVOLREAD", 0x5313}, +++{"linux/cdrom.h", "CDROMREADRAW", 0x5314}, +++{"linux/cdrom.h", "CDROMREADCOOKED", 0x5315}, +++{"linux/cdrom.h", "CDROMSEEK", 0x5316}, +++{"linux/cdrom.h", "CDROMPLAYBLK", 0x5317}, +++{"linux/cdrom.h", "CDROMREADALL", 0x5318}, +++{"linux/cdrom.h", "CDROMCLOSETRAY", 0x5319}, +++{"linux/cdrom.h", "CDROMGETSPINDOWN", 0x531d}, +++{"linux/cdrom.h", "CDROMSETSPINDOWN", 0x531e}, +++{"linux/cdrom.h", "CDROM_SET_OPTIONS", 0x5320}, +++{"linux/cdrom.h", "CDROM_CLEAR_OPTIONS", 0x5321}, +++{"linux/cdrom.h", "CDROM_SELECT_SPEED", 0x5322}, +++{"linux/cdrom.h", "CDROM_SELECT_DISC", 0x5323}, +++{"linux/cdrom.h", "CDROM_MEDIA_CHANGED", 0x5325}, +++{"linux/cdrom.h", "CDROM_DRIVE_STATUS", 0x5326}, +++{"linux/cdrom.h", "CDROM_DISC_STATUS", 0x5327}, +++{"linux/cdrom.h", "CDROM_CHANGER_NSLOTS", 0x5328}, +++{"linux/cdrom.h", "CDROM_LOCKDOOR", 0x5329}, +++{"linux/cdrom.h", "CDROM_DEBUG", 0x5330}, +++{"linux/cdrom.h", "CDROM_GET_CAPABILITY", 0x5331}, +++{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORLOCK", 0x5380}, +++{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORUNLOCK", 0x5381}, +++{"linux/cdrom.h", "CDROMAUDIOBUFSIZ", 0x5382}, +++{"scsi/scsi.h", "SCSI_IOCTL_GET_IDLUN", 0x5382}, +++{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_ENABLE", 0x5383}, +++{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_DISABLE", 0x5384}, +++{"scsi/scsi.h", "SCSI_IOCTL_PROBE_HOST", 0x5385}, +++{"scsi/scsi.h", "SCSI_IOCTL_GET_BUS_NUMBER", 0x5386}, +++{"linux/cdrom.h", "DVD_READ_STRUCT", 0x5390}, +++{"linux/cdrom.h", "DVD_WRITE_STRUCT", 0x5391}, +++{"linux/cdrom.h", "DVD_AUTH", 0x5392}, +++{"linux/cdrom.h", "CDROM_SEND_PACKET", 0x5393}, +++{"linux/cdrom.h", "CDROM_NEXT_WRITABLE", 0x5394}, +++{"linux/cdrom.h", "CDROM_LAST_WRITTEN", 0x5395}, +++{"asm/ioctls.h", "TCGETS", 0x5401}, +++{"asm/ioctls.h", "TCSETS", 0x5402}, +++{"asm/ioctls.h", "TCSETSW", 0x5403}, +++{"asm/ioctls.h", "TCSETSF", 0x5404}, +++{"asm/ioctls.h", "TCGETA", 0x5405}, +++{"asm/ioctls.h", "TCSETA", 0x5406}, +++{"asm/ioctls.h", "TCSETAW", 0x5407}, +++{"asm/ioctls.h", "TCSETAF", 0x5408}, +++{"asm/ioctls.h", "TCSBRK", 0x5409}, +++{"asm/ioctls.h", "TCXONC", 0x540a}, +++{"asm/ioctls.h", "TCFLSH", 0x540b}, +++{"asm/ioctls.h", "TIOCEXCL", 0x540c}, +++{"asm/ioctls.h", "TIOCNXCL", 0x540d}, +++{"asm/ioctls.h", "TIOCSCTTY", 0x540e}, +++{"asm/ioctls.h", "TIOCGPGRP", 0x540f}, +++{"asm/ioctls.h", "TIOCSPGRP", 0x5410}, +++{"asm/ioctls.h", "TIOCOUTQ", 0x5411}, +++{"asm/ioctls.h", "TIOCSTI", 0x5412}, +++{"asm/ioctls.h", "TIOCGWINSZ", 0x5413}, +++{"asm/ioctls.h", "TIOCSWINSZ", 0x5414}, +++{"asm/ioctls.h", "TIOCMGET", 0x5415}, +++{"asm/ioctls.h", "TIOCMBIS", 0x5416}, +++{"asm/ioctls.h", "TIOCMBIC", 0x5417}, +++{"asm/ioctls.h", "TIOCMSET", 0x5418}, +++{"asm/ioctls.h", "TIOCGSOFTCAR", 0x5419}, +++{"asm/ioctls.h", "TIOCSSOFTCAR", 0x541a}, +++{"asm/ioctls.h", "FIONREAD", 0x541b}, +++{"asm/ioctls.h", "TIOCLINUX", 0x541c}, +++{"asm/ioctls.h", "TIOCCONS", 0x541d}, +++{"asm/ioctls.h", "TIOCGSERIAL", 0x541e}, +++{"asm/ioctls.h", "TIOCSSERIAL", 0x541f}, +++{"asm/ioctls.h", "TIOCPKT", 0x5420}, +++{"asm/ioctls.h", "FIONBIO", 0x5421}, +++{"asm/ioctls.h", "TIOCNOTTY", 0x5422}, +++{"asm/ioctls.h", "TIOCSETD", 0x5423}, +++{"asm/ioctls.h", "TIOCGETD", 0x5424}, +++{"asm/ioctls.h", "TCSBRKP", 0x5425}, +++{"asm/ioctls.h", "TIOCSBRK", 0x5427}, +++{"asm/ioctls.h", "TIOCCBRK", 0x5428}, +++{"asm/ioctls.h", "TIOCGSID", 0x5429}, +++{"asm/ioctls.h", "FIONCLEX", 0x5450}, +++{"asm/ioctls.h", "FIOCLEX", 0x5451}, +++{"asm/ioctls.h", "FIOASYNC", 0x5452}, +++{"asm/ioctls.h", "TIOCSERCONFIG", 0x5453}, +++{"asm/ioctls.h", "TIOCSERGWILD", 0x5454}, +++{"asm/ioctls.h", "TIOCSERSWILD", 0x5455}, +++{"asm/ioctls.h", "TIOCGLCKTRMIOS", 0x5456}, +++{"asm/ioctls.h", "TIOCSLCKTRMIOS", 0x5457}, +++{"asm/ioctls.h", "TIOCSERGSTRUCT", 0x5458}, +++{"asm/ioctls.h", "TIOCSERGETLSR", 0x5459}, +++{"asm/ioctls.h", "TIOCSERGETMULTI", 0x545a}, +++{"asm/ioctls.h", "TIOCSERSETMULTI", 0x545b}, +++{"asm/ioctls.h", "TIOCMIWAIT", 0x545c}, +++{"asm/ioctls.h", "TIOCGICOUNT", 0x545d}, +++{"asm/ioctls.h", "TIOCGHAYESESP", 0x545e}, +++{"asm/ioctls.h", "TIOCSHAYESESP", 0x545f}, +++{"asm/ioctls.h", "FIOQSIZE", 0x5460}, +++{"linux/uinput.h", "UI_DEV_CREATE", 0x5501}, +++{"linux/uinput.h", "UI_DEV_DESTROY", 0x5502}, +++{"linux/vt.h", "VT_OPENQRY", 0x5600}, +++{"linux/vt.h", "VT_GETMODE", 0x5601}, +++{"linux/videodev2.h", "VIDIOC_RESERVED", 0x5601}, +++{"linux/vt.h", "VT_SETMODE", 0x5602}, +++{"linux/vt.h", "VT_GETSTATE", 0x5603}, +++{"linux/vt.h", "VT_SENDSIG", 0x5604}, +++{"linux/vt.h", "VT_RELDISP", 0x5605}, +++{"linux/vt.h", "VT_ACTIVATE", 0x5606}, +++{"linux/vt.h", "VT_WAITACTIVE", 0x5607}, +++{"linux/vt.h", "VT_DISALLOCATE", 0x5608}, +++{"linux/vt.h", "VT_RESIZE", 0x5609}, +++{"linux/vt.h", "VT_RESIZEX", 0x560a}, +++{"linux/vt.h", "VT_LOCKSWITCH", 0x560b}, +++{"linux/vt.h", "VT_UNLOCKSWITCH", 0x560c}, +++{"linux/vt.h", "VT_GETHIFONTMASK", 0x560d}, +++{"linux/videodev2.h", "VIDIOC_LOG_STATUS", 0x5646}, +++{"linux/sonet.h", "SONET_SETFRAMING", 0x6115}, +++{"linux/atm_nicstar.h", "NS_ADJBUFLEV", 0x6163}, +++{"linux/atm_tcp.h", "SIOCSIFATMTCP", 0x6180}, +++{"linux/atm_tcp.h", "ATMTCP_CREATE", 0x618e}, +++{"linux/atm_tcp.h", "ATMTCP_REMOVE", 0x618f}, +++{"linux/atmlec.h", "ATMLEC_CTRL", 0x61d0}, +++{"linux/atmlec.h", "ATMLEC_DATA", 0x61d1}, +++{"linux/atmlec.h", "ATMLEC_MCAST", 0x61d2}, +++{"linux/atmmpc.h", "ATMMPC_CTRL", 0x61d8}, +++{"linux/atmmpc.h", "ATMMPC_DATA", 0x61d9}, +++{"linux/atmclip.h", "SIOCMKCLIP", 0x61e0}, +++{"linux/atmarp.h", "ATMARPD_CTRL", 0x61e1}, +++{"linux/atmarp.h", "ATMARP_MKIP", 0x61e2}, +++{"linux/atmarp.h", "ATMARP_SETENTRY", 0x61e3}, +++{"linux/atmarp.h", "ATMARP_ENCAP", 0x61e5}, +++{"linux/atmsvc.h", "ATMSIGD_CTRL", 0x61f0}, +++{"linux/cm4000_cs.h", "CM_IOCSRDR", 0x6303}, +++{"linux/cm4000_cs.h", "CM_IOCARDOFF", 0x6304}, +++{"linux/chio.h", "CHIOINITELEM", 0x6311}, +++{"linux/comstats.h", "COM_GETPORTSTATS", 0x631e}, +++{"linux/comstats.h", "COM_CLRPORTSTATS", 0x631f}, +++{"linux/comstats.h", "COM_GETBRDSTATS", 0x6320}, +++{"linux/comstats.h", "COM_READPORT", 0x6328}, +++{"linux/comstats.h", "COM_READBOARD", 0x6329}, +++{"linux/comstats.h", "COM_READPANEL", 0x632a}, +++{"linux/video_decoder.h", "DECODER_DUMP", 0x64c0}, +++{"linux/hpet.h", "HPET_IE_ON", 0x6801}, +++{"linux/hpet.h", "HPET_IE_OFF", 0x6802}, +++{"linux/hpet.h", "HPET_EPI", 0x6804}, +++{"linux/hpet.h", "HPET_DPI", 0x6805}, +++{"linux/mmtimer.h", "MMTIMER_GETOFFSET", 0x6d00}, +++{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02}, +++{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03}, +++{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04}, +++{"linux/mmtimer.h", "MMTIMER_GETBITS", 0x6d04}, +++{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05}, +++{"linux/mmtimer.h", "MMTIMER_MMAPAVAIL", 0x6d06}, +++{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06}, +++{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07}, +++{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09}, +++{"linux/synclink.h", "MGSL_IOCSIF", 0x6d0a}, +++{"linux/synclink.h", "MGSL_IOCGIF", 0x6d0b}, +++{"linux/synclink.h", "MGSL_IOCCLRMODCOUNT", 0x6d0f}, +++{"linux/ncp_fs.h", "NCP_IOC_CONN_LOGGED_IN", 0x6e03}, +++{"linux/rtc.h", "RTC_AIE_ON", 0x7001}, +++{"linux/rtc.h", "RTC_AIE_OFF", 0x7002}, +++{"linux/rtc.h", "RTC_UIE_ON", 0x7003}, +++{"linux/rtc.h", "RTC_UIE_OFF", 0x7004}, +++{"linux/rtc.h", "RTC_PIE_ON", 0x7005}, +++{"linux/rtc.h", "RTC_PIE_OFF", 0x7006}, +++{"linux/rtc.h", "RTC_WIE_ON", 0x700f}, +++{"linux/rtc.h", "RTC_WIE_OFF", 0x7010}, +++{"linux/nvram.h", "NVRAM_INIT", 0x7040}, +++{"linux/nvram.h", "NVRAM_SETCKS", 0x7041}, +++{"linux/ppdev.h", "PPCLAIM", 0x708b}, +++{"linux/ppdev.h", "PPRELEASE", 0x708c}, +++{"linux/ppdev.h", "PPYIELD", 0x708d}, +++{"linux/ppdev.h", "PPEXCL", 0x708f}, +++{"linux/telephony.h", "PHONE_CAPABILITIES", 0x7180}, +++{"linux/telephony.h", "PHONE_RING", 0x7183}, +++{"linux/telephony.h", "PHONE_HOOKSTATE", 0x7184}, +++{"linux/telephony.h", "OLD_PHONE_RING_START", 0x7187}, +++{"linux/telephony.h", "PHONE_RING_STOP", 0x7188}, +++{"linux/telephony.h", "PHONE_REC_START", 0x718a}, +++{"linux/telephony.h", "PHONE_REC_STOP", 0x718b}, +++{"linux/telephony.h", "PHONE_REC_LEVEL", 0x718f}, +++{"linux/telephony.h", "PHONE_PLAY_START", 0x7191}, +++{"linux/telephony.h", "PHONE_PLAY_STOP", 0x7192}, +++{"linux/telephony.h", "PHONE_PLAY_LEVEL", 0x7195}, +++{"linux/telephony.h", "PHONE_GET_TONE_ON_TIME", 0x719e}, +++{"linux/telephony.h", "PHONE_GET_TONE_OFF_TIME", 0x719f}, +++{"linux/telephony.h", "PHONE_GET_TONE_STATE", 0x71a0}, +++{"linux/telephony.h", "PHONE_BUSY", 0x71a1}, +++{"linux/telephony.h", "PHONE_RINGBACK", 0x71a2}, +++{"linux/telephony.h", "PHONE_DIALTONE", 0x71a3}, +++{"linux/telephony.h", "PHONE_CPT_STOP", 0x71a4}, +++{"linux/telephony.h", "PHONE_PSTN_GET_STATE", 0x71a5}, +++{"linux/telephony.h", "PHONE_PSTN_LINETEST", 0x71a8}, +++{"linux/ixjuser.h", "IXJCTL_DSP_RESET", 0x71c0}, +++{"linux/ixjuser.h", "IXJCTL_DSP_IDLE", 0x71c5}, +++{"linux/ixjuser.h", "IXJCTL_TESTRAM", 0x71c6}, +++{"linux/ixjuser.h", "IXJCTL_AEC_STOP", 0x71cc}, +++{"linux/ixjuser.h", "IXJCTL_AEC_GET_LEVEL", 0x71cd}, +++{"linux/ixjuser.h", "IXJCTL_PSTN_LINETEST", 0x71d3}, +++{"linux/ixjuser.h", "IXJCTL_PLAY_CID", 0x71d7}, +++{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_CLEAR", 0x71e7}, +++{"linux/cdk.h", "STL_BINTR", 0x7314}, +++{"linux/cdk.h", "STL_BSTART", 0x7315}, +++{"linux/cdk.h", "STL_BSTOP", 0x7316}, +++{"linux/cdk.h", "STL_BRESET", 0x7317}, +++{"linux/cdk.h", "STL_GETPFLAG", 0x7350}, +++{"linux/cdk.h", "STL_SETPFLAG", 0x7351}, +++{"linux/if_ppp.h", "PPPIOCDISCONN", 0x7439}, +++{"linux/if_ppp.h", "PPPIOCXFERUNIT", 0x744e}, +++{"linux/meye.h", "MEYEIOC_STILLCAPT", 0x76c4}, +++{"linux/videotext.h", "VTXIOCPUTPAGE", 0x8108}, +++{"linux/videotext.h", "VTXIOCSETDISP", 0x8109}, +++{"linux/videotext.h", "VTXIOCPUTSTAT", 0x810a}, +++{"linux/videotext.h", "VTXIOCCLRCACHE", 0x810b}, +++{"asm/sockios.h", "FIOSETOWN", 0x8901}, +++{"asm/sockios.h", "SIOCSPGRP", 0x8902}, +++{"asm/sockios.h", "FIOGETOWN", 0x8903}, +++{"asm/sockios.h", "SIOCGPGRP", 0x8904}, +++{"asm/sockios.h", "SIOCATMARK", 0x8905}, +++{"asm/sockios.h", "SIOCGSTAMP", 0x8906}, +++{"linux/sockios.h", "SIOCADDRT", 0x890b}, +++{"linux/sockios.h", "SIOCDELRT", 0x890c}, +++{"linux/sockios.h", "SIOCRTMSG", 0x890d}, +++{"linux/sockios.h", "SIOCGIFNAME", 0x8910}, +++{"linux/sockios.h", "SIOCSIFLINK", 0x8911}, +++{"linux/sockios.h", "SIOCGIFCONF", 0x8912}, +++{"linux/sockios.h", "SIOCGIFFLAGS", 0x8913}, +++{"linux/sockios.h", "SIOCSIFFLAGS", 0x8914}, +++{"linux/sockios.h", "SIOCGIFADDR", 0x8915}, +++{"linux/sockios.h", "SIOCSIFADDR", 0x8916}, +++{"linux/sockios.h", "SIOCGIFDSTADDR", 0x8917}, +++{"linux/sockios.h", "SIOCSIFDSTADDR", 0x8918}, +++{"linux/sockios.h", "SIOCGIFBRDADDR", 0x8919}, +++{"linux/sockios.h", "SIOCSIFBRDADDR", 0x891a}, +++{"linux/sockios.h", "SIOCGIFNETMASK", 0x891b}, +++{"linux/sockios.h", "SIOCSIFNETMASK", 0x891c}, +++{"linux/sockios.h", "SIOCGIFMETRIC", 0x891d}, +++{"linux/sockios.h", "SIOCSIFMETRIC", 0x891e}, +++{"linux/sockios.h", "SIOCGIFMEM", 0x891f}, +++{"linux/sockios.h", "SIOCSIFMEM", 0x8920}, +++{"linux/sockios.h", "SIOCGIFMTU", 0x8921}, +++{"linux/sockios.h", "SIOCSIFMTU", 0x8922}, +++{"linux/sockios.h", "SIOCSIFNAME", 0x8923}, +++{"linux/sockios.h", "SIOCSIFHWADDR", 0x8924}, +++{"linux/sockios.h", "SIOCGIFENCAP", 0x8925}, +++{"linux/sockios.h", "SIOCSIFENCAP", 0x8926}, +++{"linux/sockios.h", "SIOCGIFHWADDR", 0x8927}, +++{"linux/sockios.h", "SIOCGIFSLAVE", 0x8929}, +++{"linux/sockios.h", "SIOCSIFSLAVE", 0x8930}, +++{"linux/sockios.h", "SIOCADDMULTI", 0x8931}, +++{"linux/sockios.h", "SIOCDELMULTI", 0x8932}, +++{"linux/sockios.h", "SIOCGIFINDEX", 0x8933}, +++{"linux/sockios.h", "SIOCSIFPFLAGS", 0x8934}, +++{"linux/sockios.h", "SIOCGIFPFLAGS", 0x8935}, +++{"linux/sockios.h", "SIOCDIFADDR", 0x8936}, +++{"linux/sockios.h", "SIOCSIFHWBROADCAST", 0x8937}, +++{"linux/sockios.h", "SIOCGIFCOUNT", 0x8938}, +++{"linux/sockios.h", "SIOCGIFBR", 0x8940}, +++{"linux/sockios.h", "SIOCSIFBR", 0x8941}, +++{"linux/sockios.h", "SIOCGIFTXQLEN", 0x8942}, +++{"linux/sockios.h", "SIOCSIFTXQLEN", 0x8943}, +++{"linux/sockios.h", "SIOCGIFDIVERT", 0x8944}, +++{"linux/sockios.h", "SIOCSIFDIVERT", 0x8945}, +++{"linux/sockios.h", "SIOCETHTOOL", 0x8946}, +++{"linux/sockios.h", "SIOCGMIIPHY", 0x8947}, +++{"linux/sockios.h", "SIOCGMIIREG", 0x8948}, +++{"linux/sockios.h", "SIOCSMIIREG", 0x8949}, +++{"linux/sockios.h", "SIOCWANDEV", 0x894a}, +++{"linux/sockios.h", "SIOCDARP", 0x8953}, +++{"linux/sockios.h", "SIOCGARP", 0x8954}, +++{"linux/sockios.h", "SIOCSARP", 0x8955}, +++{"linux/sockios.h", "SIOCDRARP", 0x8960}, +++{"linux/sockios.h", "SIOCGRARP", 0x8961}, +++{"linux/sockios.h", "SIOCSRARP", 0x8962}, +++{"linux/sockios.h", "SIOCGIFMAP", 0x8970}, +++{"linux/sockios.h", "SIOCSIFMAP", 0x8971}, +++{"linux/sockios.h", "SIOCADDDLCI", 0x8980}, +++{"linux/sockios.h", "SIOCDELDLCI", 0x8981}, +++{"linux/sockios.h", "SIOCGIFVLAN", 0x8982}, +++{"linux/sockios.h", "SIOCSIFVLAN", 0x8983}, +++{"linux/sockios.h", "SIOCBONDENSLAVE", 0x8990}, +++{"linux/sockios.h", "SIOCBONDRELEASE", 0x8991}, +++{"linux/sockios.h", "SIOCBONDSETHWADDR", 0x8992}, +++{"linux/sockios.h", "SIOCBONDSLAVEINFOQUERY", 0x8993}, +++{"linux/sockios.h", "SIOCBONDINFOQUERY", 0x8994}, +++{"linux/sockios.h", "SIOCBONDCHANGEACTIVE", 0x8995}, +++{"linux/sockios.h", "SIOCBRADDBR", 0x89a0}, +++{"linux/sockios.h", "SIOCBRDELBR", 0x89a1}, +++{"linux/sockios.h", "SIOCBRADDIF", 0x89a2}, +++{"linux/sockios.h", "SIOCBRDELIF", 0x89a3}, +++{"linux/sockios.h", "SIOCPROTOPRIVATE", 0x89e0}, +++{"linux/sockios.h", "SIOCDEVPRIVATE", 0x89f0}, +++{"linux/auto_fs.h", "AUTOFS_IOC_READY", 0x9360}, +++{"linux/auto_fs.h", "AUTOFS_IOC_FAIL", 0x9361}, +++{"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362}, +++{"linux/nbd.h", "NBD_SET_SOCK", 0xab00}, +++{"linux/nbd.h", "NBD_SET_BLKSIZE", 0xab01}, +++{"linux/nbd.h", "NBD_SET_SIZE", 0xab02}, +++{"linux/nbd.h", "NBD_DO_IT", 0xab03}, +++{"linux/nbd.h", "NBD_CLEAR_SOCK", 0xab04}, +++{"linux/nbd.h", "NBD_CLEAR_QUE", 0xab05}, +++{"linux/nbd.h", "NBD_PRINT_DEBUG", 0xab06}, +++{"linux/nbd.h", "NBD_SET_SIZE_BLOCKS", 0xab07}, +++{"linux/nbd.h", "NBD_DISCONNECT", 0xab08}, +++{"linux/raw.h", "RAW_SETBIND", 0xac00}, +++{"linux/raw.h", "RAW_GETBIND", 0xac01}, +++{"linux/if_pppox.h", "PPPOEIOCDFWD", 0xb101}, +++{"linux/cyclades.h", "CYGETMON", 0x435901}, +++{"linux/cyclades.h", "CYGETTHRESH", 0x435902}, +++{"linux/cyclades.h", "CYSETTHRESH", 0x435903}, +++{"linux/cyclades.h", "CYGETDEFTHRESH", 0x435904}, +++{"linux/cyclades.h", "CYSETDEFTHRESH", 0x435905}, +++{"linux/cyclades.h", "CYGETTIMEOUT", 0x435906}, +++{"linux/cyclades.h", "CYSETTIMEOUT", 0x435907}, +++{"linux/cyclades.h", "CYGETDEFTIMEOUT", 0x435908}, +++{"linux/cyclades.h", "CYSETDEFTIMEOUT", 0x435909}, +++{"linux/cyclades.h", "CYSETRFLOW", 0x43590a}, +++{"linux/cyclades.h", "CYGETRFLOW", 0x43590b}, +++{"linux/cyclades.h", "CYSETRTSDTR_INV", 0x43590c}, +++{"linux/cyclades.h", "CYGETRTSDTR_INV", 0x43590d}, +++{"linux/cyclades.h", "CYZSETPOLLCYCLE", 0x43590e}, +++{"linux/cyclades.h", "CYZGETPOLLCYCLE", 0x43590f}, +++{"linux/cyclades.h", "CYGETCD1400VER", 0x435910}, +++{"linux/cyclades.h", "CYGETCARDINFO", 0x435911}, +++{"linux/cyclades.h", "CYSETWAIT", 0x435912}, +++{"linux/cyclades.h", "CYGETWAIT", 0x435913}, +++{"linux/videodev2.h", "VIDIOC_S_PRIORITY", 0x40015644}, +++{"linux/ppdev.h", "PPWCONTROL", 0x40017084}, +++{"linux/ppdev.h", "PPWDATA", 0x40017086}, +++{"linux/ppdev.h", "PPWCTLONIRQ", 0x40017092}, +++{"linux/telephony.h", "PHONE_MAXRINGS", 0x40017185}, +++{"linux/telephony.h", "PHONE_PLAY_TONE", 0x4001719b}, +++{"linux/sonypi.h", "SONYPI_IOCSBRT", 0x40017600}, +++{"linux/sonypi.h", "SONYPI_IOCSBLUE", 0x40017609}, +++{"linux/sonypi.h", "SONYPI_IOCSFAN", 0x4001760b}, +++{"linux/atmdev.h", "ATM_SETBACKEND", 0x400261f2}, +++{"linux/atmdev.h", "ATM_NEWBACKENDIF", 0x400261f3}, +++{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40026e02}, +++{"linux/ppdev.h", "PPFCONTROL", 0x4002708e}, +++{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186}, +++{"linux/fs.h", "BLKBSZSET", 0x40041271}, +++{"linux/radeonfb.h", "FBIO_RADEON_SET_MIRROR", 0x40044004}, +++{"linux/agpgart.h", "AGPIOC_SETUP", 0x40044103}, +++{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40044104}, +++{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40044105}, +++{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107}, +++{"linux/agpgart.h", "AGPIOC_BIND", 0x40044108}, +++{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40044109}, +++{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40044202}, +++{"linux/cciss_ioctl.h", "CCISS_REGNEWDISK", 0x4004420d}, +++{"linux/input.h", "EVIOCRMFF", 0x40044581}, +++{"linux/input.h", "EVIOCGRAB", 0x40044590}, +++{"linux/matroxfb.h", "FBIO_WAITFORVSYNC", 0x40044620}, +++{"linux/hiddev.h", "HIDIOCSFLAG", 0x4004480f}, +++{"mtd/mtd-abi.h", "OTPGETREGIONCOUNT", 0x40044d0e}, +++{"linux/ticable.h", "IOCTL_TIUSB_TIMEOUT", 0x40044e20}, +++{"linux/ticable.h", "IOCTL_TIUSB_RESET_DEVICE", 0x40044e21}, +++{"linux/ticable.h", "IOCTL_TIUSB_RESET_PIPES", 0x40044e22}, +++{"linux/random.h", "RNDADDTOENTCNT", 0x40045201}, +++{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431}, +++{"linux/if_tun.h", "TUNSETNOCSUM", 0x400454c8}, +++{"linux/if_tun.h", "TUNSETDEBUG", 0x400454c9}, +++{"linux/if_tun.h", "TUNSETIFF", 0x400454ca}, +++{"linux/if_tun.h", "TUNSETPERSIST", 0x400454cb}, +++{"linux/if_tun.h", "TUNSETOWNER", 0x400454cc}, +++{"linux/if_tun.h", "TUNSETLINK", 0x400454cd}, +++{"linux/uinput.h", "UI_SET_EVBIT", 0x40045564}, +++{"linux/uinput.h", "UI_SET_KEYBIT", 0x40045565}, +++{"linux/uinput.h", "UI_SET_RELBIT", 0x40045566}, +++{"linux/uinput.h", "UI_SET_ABSBIT", 0x40045567}, +++{"linux/uinput.h", "UI_SET_MSCBIT", 0x40045568}, +++{"linux/uinput.h", "UI_SET_LEDBIT", 0x40045569}, +++{"linux/uinput.h", "UI_SET_SNDBIT", 0x4004556a}, +++{"linux/uinput.h", "UI_SET_FFBIT", 0x4004556b}, +++{"linux/uinput.h", "UI_SET_PHYS", 0x4004556c}, +++{"linux/uinput.h", "UI_SET_SWBIT", 0x4004556d}, +++{"linux/videodev2.h", "VIDIOC_OVERLAY", 0x4004560e}, +++{"linux/videodev2.h", "VIDIOC_STREAMON", 0x40045612}, +++{"linux/videodev2.h", "VIDIOC_STREAMOFF", 0x40045613}, +++{"linux/atmdev.h", "ATM_SETSC", 0x400461f1}, +++{"linux/atmdev.h", "ATM_DROPPARTY", 0x400461f5}, +++{"linux/cm4000_cs.h", "CM_IOCSPTS", 0x40046302}, +++{"linux/chio.h", "CHIOSPICKER", 0x40046305}, +++{"linux/cm4000_cs.h", "CM_IOSDBGLVL", 0x400463fa}, +++{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403}, +++{"linux/video_decoder.h", "DECODER_SET_INPUT", 0x40046404}, +++{"linux/video_decoder.h", "DECODER_SET_OUTPUT", 0x40046405}, +++{"linux/video_decoder.h", "DECODER_ENABLE_OUTPUT", 0x40046406}, +++{"linux/video_decoder.h", "DECODER_SET_GPIO", 0x40046408}, +++{"linux/video_decoder.h", "DECODER_SET_VBI_BYPASS", 0x4004640a}, +++{"linux/video_encoder.h", "ENCODER_SET_NORM", 0x40046502}, +++{"linux/video_encoder.h", "ENCODER_SET_INPUT", 0x40046503}, +++{"linux/video_encoder.h", "ENCODER_SET_OUTPUT", 0x40046504}, +++{"linux/video_encoder.h", "ENCODER_ENABLE_OUTPUT", 0x40046505}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETFLAGS", 0x40046602}, +++{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40046602}, +++{"linux/iflags.h", "IFLAGS_SET_IOC", 0x40046602}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION", 0x40046604}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETRSVSZ", 0x40046606}, +++{"linux/ext3_fs.h", "EXT3_IOC_GROUP_EXTEND", 0x40046607}, +++{"linux/hpet.h", "HPET_IRQFREQ", 0x40046806}, +++{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40046e02}, +++{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06}, +++{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c}, +++{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40046ef8}, +++{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40046efa}, +++{"linux/rtc.h", "RTC_IRQP_SET", 0x4004700c}, +++{"linux/rtc.h", "RTC_EPOCH_SET", 0x4004700e}, +++{"linux/ppdev.h", "PPSETMODE", 0x40047080}, +++{"linux/ppdev.h", "PPDATADIR", 0x40047090}, +++{"linux/ppdev.h", "PPNEGOT", 0x40047091}, +++{"linux/ppdev.h", "PPSETPHASE", 0x40047094}, +++{"linux/ppdev.h", "PPSETFLAGS", 0x4004709b}, +++{"linux/ticable.h", "IOCTL_TISER_DELAY", 0x400470a0}, +++{"linux/ticable.h", "IOCTL_TISER_TIMEOUT", 0x400470a1}, +++{"linux/ticable.h", "IOCTL_TIPAR_DELAY", 0x400470a8}, +++{"linux/ticable.h", "IOCTL_TIPAR_TIMEOUT", 0x400470a9}, +++{"linux/serio.h", "SPIOCSTYPE", 0x40047101}, +++{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40047182}, +++{"linux/telephony.h", "PHONE_RING_START", 0x40047187}, +++{"linux/telephony.h", "PHONE_REC_CODEC", 0x40047189}, +++{"linux/telephony.h", "PHONE_REC_DEPTH", 0x4004718c}, +++{"linux/telephony.h", "PHONE_FRAME", 0x4004718d}, +++{"linux/telephony.h", "PHONE_REC_VOLUME", 0x4004718e}, +++{"linux/telephony.h", "PHONE_PLAY_CODEC", 0x40047190}, +++{"linux/telephony.h", "PHONE_PLAY_DEPTH", 0x40047193}, +++{"linux/telephony.h", "PHONE_PLAY_VOLUME", 0x40047194}, +++{"linux/telephony.h", "PHONE_DTMF_OOB", 0x40047199}, +++{"linux/telephony.h", "PHONE_SET_TONE_ON_TIME", 0x4004719c}, +++{"linux/telephony.h", "PHONE_SET_TONE_OFF_TIME", 0x4004719d}, +++{"linux/telephony.h", "PHONE_PSTN_SET_STATE", 0x400471a4}, +++{"linux/telephony.h", "PHONE_WINK_DURATION", 0x400471a6}, +++{"linux/telephony.h", "PHONE_VAD", 0x400471a9}, +++{"linux/telephony.h", "PHONE_WINK", 0x400471aa}, +++{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400471c7}, +++{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8}, +++{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400471c9}, +++{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400471ca}, +++{"linux/ixjuser.h", "IXJCTL_AEC_START", 0x400471cb}, +++{"linux/ixjuser.h", "IXJCTL_SET_LED", 0x400471ce}, +++{"linux/ixjuser.h", "IXJCTL_MIXER", 0x400471cf}, +++{"linux/ixjuser.h", "IXJCTL_DAA_COEFF_SET", 0x400471d0}, +++{"linux/ixjuser.h", "IXJCTL_PORT", 0x400471d1}, +++{"linux/ixjuser.h", "IXJCTL_DAA_AGAIN", 0x400471d2}, +++{"linux/ixjuser.h", "IXJCTL_POTS_PSTN", 0x400471d5}, +++{"linux/ixjuser.h", "IXJCTL_FILTER_CADENCE", 0x400471d6}, +++{"linux/ixjuser.h", "IXJCTL_CIDCW", 0x400471d9}, +++{"linux/telephony.h", "PHONE_REC_VOLUME_LINEAR", 0x400471db}, +++{"linux/telephony.h", "PHONE_PLAY_VOLUME_LINEAR", 0x400471dc}, +++{"linux/ixjuser.h", "IXJCTL_SET_FILTER_RAW", 0x400471dd}, +++{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0}, +++{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1}, +++{"linux/ixjuser.h", "IXJCTL_DTMF_PRESCALE", 0x400471e8}, +++{"linux/ixjuser.h", "IXJCTL_SIGCTL", 0x400471e9}, +++{"linux/ixjuser.h", "IXJCTL_SC_RXG", 0x400471ea}, +++{"linux/ixjuser.h", "IXJCTL_SC_TXG", 0x400471eb}, +++{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd}, +++{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe}, +++{"linux/msdos_fs.h", "FAT_IOCTL_SET_ATTRIBUTES", 0x40047211}, +++{"linux/if_ppp.h", "PPPIOCATTCHAN", 0x40047438}, +++{"linux/if_ppp.h", "PPPIOCCONNECT", 0x4004743a}, +++{"linux/if_ppp.h", "PPPIOCSMRRU", 0x4004743b}, +++{"linux/if_ppp.h", "PPPIOCDETACH", 0x4004743c}, +++{"linux/if_ppp.h", "PPPIOCATTACH", 0x4004743d}, +++{"linux/if_ppp.h", "PPPIOCSDEBUG", 0x40047440}, +++{"linux/if_ppp.h", "PPPIOCSMAXCID", 0x40047451}, +++{"linux/if_ppp.h", "PPPIOCSMRU", 0x40047452}, +++{"linux/if_ppp.h", "PPPIOCSRASYNCMAP", 0x40047454}, +++{"linux/if_ppp.h", "PPPIOCSASYNCMAP", 0x40047457}, +++{"linux/if_ppp.h", "PPPIOCSFLAGS", 0x40047459}, +++{"linux/isdn_ppp.h", "PPPIOCBUNDLE", 0x40047481}, +++{"linux/isdn_ppp.h", "PPPIOCSMPFLAGS", 0x40047483}, +++{"linux/isdn_ppp.h", "PPPIOCSMPMTU", 0x40047484}, +++{"linux/isdn_ppp.h", "PPPIOCSMPMRU", 0x40047485}, +++{"linux/isdn_ppp.h", "PPPIOCSCOMPRESSOR", 0x40047487}, +++{"linux/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40047602}, +++{"linux/ext3_fs.h", "EXT3_IOC_SETVERSION_OLD", 0x40047602}, +++{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608}, +++{"linux/videodev.h", "VIDIOCSFREQ", 0x4004760f}, +++{"linux/videodev.h", "VIDIOCSYNC", 0x40047612}, +++{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619}, +++{"linux/meye.h", "MEYEIOC_QBUF_CAPT", 0x400476c2}, +++{"linux/videotext.h", "VTXIOCSETVIRT", 0x4004810c}, +++{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0}, +++{"linux/dn.h", "SIOCSNETADDR", 0x400489e0}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366}, +++{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4004b100}, +++{"linux/gigaset_dev.h", "GIGASET_BRKCHARS", 0x40064702}, +++{"linux/meye.h", "MEYEIOC_S_PARAMS", 0x400676c1}, +++{"linux/cciss_ioctl.h", "CCISS_SETINTINFO", 0x40084203}, +++{"linux/input.h", "EVIOCSREP", 0x40084503}, +++{"linux/input.h", "EVIOCSKEYCODE", 0x40084504}, +++{"mtd/mtd-abi.h", "MEMERASE", 0x40084d02}, +++{"mtd/mtd-abi.h", "MEMLOCK", 0x40084d05}, +++{"mtd/mtd-abi.h", "MEMUNLOCK", 0x40084d06}, +++{"mtd/mtd-abi.h", "MEMGETBADBLOCK", 0x40084d0b}, +++{"mtd/mtd-abi.h", "MEMSETBADBLOCK", 0x40084d0c}, +++{"linux/random.h", "RNDADDENTROPY", 0x40085203}, +++{"linux/videodev2.h", "VIDIOC_S_STD", 0x40085618}, +++{"linux/videodev2.h", "VIDIOC_S_CTRL_OLD", 0x4008561c}, +++{"linux/atmdev.h", "ATM_GETNAMES", 0x40086183}, +++{"linux/atmdev.h", "ATM_ADDPARTY", 0x400861f4}, +++{"linux/chio.h", "CHIOGSTATUS", 0x40086308}, +++{"linux/video_decoder.h", "DECODER_INIT", 0x40086409}, +++{"linux/mtio.h", "MTIOCTOP", 0x40086d01}, +++{"linux/ppdev.h", "PPSETTIME", 0x40087096}, +++{"linux/if_ppp.h", "PPPIOCSACTIVE", 0x40087446}, +++{"linux/if_ppp.h", "PPPIOCSPASS", 0x40087447}, +++{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b}, +++{"linux/fd.h", "FDFMTTRK", 0x400c0248}, +++{"linux/capi.h", "CAPI_REGISTER", 0x400c4301}, +++{"linux/hiddev.h", "HIDIOCGREPORT", 0x400c4807}, +++{"linux/hiddev.h", "HIDIOCSREPORT", 0x400c4808}, +++{"mtd/mtd-abi.h", "OTPGETREGIONINFO", 0x400c4d0f}, +++{"linux/uinput.h", "UI_END_FF_ERASE", 0x400c55cb}, +++{"linux/ite_gpio.h", "ITE_GPIO_OUT", 0x400c5a01}, +++{"linux/ite_gpio.h", "ITE_GPIO_INT_CTRL", 0x400c5a02}, +++{"linux/ite_gpio.h", "ITE_GPIO_IN_STATUS", 0x400c5a03}, +++{"linux/ite_gpio.h", "ITE_GPIO_OUT_STATUS", 0x400c5a04}, +++{"linux/ite_gpio.h", "ITE_GPIO_GEN_CTRL", 0x400c5a05}, +++{"linux/ite_gpio.h", "ITE_GPIO_INT_WAIT", 0x400c5a06}, +++{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x400c6132}, +++{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x400c6133}, +++{"linux/atmdev.h", "ATM_GETSTAT", 0x400c6150}, +++{"linux/atmdev.h", "ATM_GETSTATZ", 0x400c6151}, +++{"linux/atmdev.h", "ATM_GETLOOP", 0x400c6152}, +++{"linux/atmdev.h", "ATM_SETLOOP", 0x400c6153}, +++{"linux/atmdev.h", "ATM_QUERYLOOP", 0x400c6154}, +++{"linux/atm_eni.h", "ENI_MEMDUMP", 0x400c6160}, +++{"linux/atm_he.h", "HE_GET_REG", 0x400c6160}, +++{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x400c6161}, +++{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x400c6162}, +++{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x400c6162}, +++{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x400c6163}, +++{"linux/atm_eni.h", "ENI_SETMULT", 0x400c6167}, +++{"linux/atmdev.h", "ATM_GETLINKRATE", 0x400c6181}, +++{"linux/atmdev.h", "ATM_GETTYPE", 0x400c6184}, +++{"linux/atmdev.h", "ATM_GETESI", 0x400c6185}, +++{"linux/atmdev.h", "ATM_GETADDR", 0x400c6186}, +++{"linux/atmdev.h", "ATM_RSTADDR", 0x400c6187}, +++{"linux/atmdev.h", "ATM_ADDADDR", 0x400c6188}, +++{"linux/atmdev.h", "ATM_DELADDR", 0x400c6189}, +++{"linux/atmdev.h", "ATM_GETCIRANGE", 0x400c618a}, +++{"linux/atmdev.h", "ATM_SETCIRANGE", 0x400c618b}, +++{"linux/atmdev.h", "ATM_SETESI", 0x400c618c}, +++{"linux/atmdev.h", "ATM_SETESIF", 0x400c618d}, +++{"linux/atmdev.h", "ATM_ADDLECSADDR", 0x400c618e}, +++{"linux/atmdev.h", "ATM_DELLECSADDR", 0x400c618f}, +++{"linux/atmdev.h", "ATM_GETLECSADDR", 0x400c6190}, +++{"linux/chio.h", "CHIOPOSITION", 0x400c6303}, +++{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a}, +++{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08}, +++{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x400c744d}, +++{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618}, +++{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407}, +++{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607}, +++{"linux/cciss_ioctl.h", "CCISS_SETNODENAME", 0x40104205}, +++{"linux/synclink.h", "MGSL_IOCSGPIO", 0x40106d10}, +++{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613}, +++{"linux/fd.h", "FDSETMAXERRS", 0x4014024c}, +++{"linux/videodev2.h", "VIDIOC_S_CROP", 0x4014563c}, +++{"linux/chio.h", "CHIOMOVE", 0x40146301}, +++{"linux/videodev.h", "VIDIOCSFBUF", 0x4014760c}, +++{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617}, +++{"linux/hiddev.h", "HIDIOCSUSAGE", 0x4018480c}, +++{"linux/hiddev.h", "HIDIOCGCOLLECTIONINDEX", 0x40184810}, +++{"linux/ext3_fs.h", "EXT3_IOC_GROUP_ADD", 0x40186608}, +++{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4018761b}, +++{"linux/fd.h", "FDSETPRM", 0x401c0242}, +++{"linux/fd.h", "FDDEFPRM", 0x401c0243}, +++{"linux/atmbr2684.h", "BR2684_SETFILT", 0x401c6190}, +++{"linux/chio.h", "CHIOEXCHANGE", 0x401c6302}, +++{"linux/rtc.h", "RTC_PLL_SET", 0x401c7012}, +++{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40206d00}, +++{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f}, +++{"linux/videodev.h", "VIDIOCSWIN", 0x4020760a}, +++{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d}, +++{"linux/videotext.h", "VTXIOCCLRPAGE", 0x40208102}, +++{"linux/videotext.h", "VTXIOCCLRFOUND", 0x40208103}, +++{"linux/videotext.h", "VTXIOCPAGEREQ", 0x40208104}, +++{"linux/videotext.h", "VTXIOCGETSTAT", 0x40208105}, +++{"linux/videotext.h", "VTXIOCGETPAGE", 0x40208106}, +++{"linux/videotext.h", "VTXIOCSTOPDAU", 0x40208107}, +++{"linux/joystick.h", "JSIOCSCORR", 0x40246a21}, +++{"linux/rtc.h", "RTC_ALM_SET", 0x40247007}, +++{"linux/rtc.h", "RTC_SET_TIME", 0x4024700a}, +++{"linux/rtc.h", "RTC_WKALM_SET", 0x4028700f}, +++{"linux/smb_fs.h", "SMB_IOC_NEWCONN", 0x40287502}, +++{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611}, +++{"linux/videodev2.h", "VIDIOC_S_FBUF", 0x402c560b}, +++{"linux/videodev2.h", "VIDIOC_S_FREQUENCY", 0x402c5639}, +++{"linux/chio.h", "CHIOSVOLTAG", 0x40306312}, +++{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603}, +++{"linux/uinput.h", "UI_END_FF_UPLOAD", 0x403455c9}, +++{"linux/videodev2.h", "VIDIOC_S_AUDIO", 0x40345622}, +++{"linux/videodev2.h", "VIDIOC_S_AUDOUT", 0x40345632}, +++{"linux/videodev.h", "VIDIOCSTUNER", 0x40347605}, +++{"linux/joystick.h", "JSIOCSAXMAP", 0x40406a31}, +++{"linux/videodev2.h", "VIDIOC_S_MODULATOR", 0x40445637}, +++{"linux/videodev2.h", "VIDIOC_S_TUNER", 0x4054561e}, +++{"linux/fd.h", "FDSETDRVPRM", 0x40580290}, +++{"linux/chio.h", "CHIOGELEM", 0x406c6310}, +++{"linux/videodev2.h", "VIDIOC_S_JPEGCOMP", 0x408c563e}, +++{"mtd/mtd-abi.h", "MEMSETOOBSEL", 0x40c84d09}, +++{"linux/videodev2.h", "VIDIOC_S_PARM_OLD", 0x40cc5616}, +++{"linux/joystick.h", "JSIOCSBTNMAP", 0x42006a33}, +++{"linux/hiddev.h", "HIDIOCSUSAGES", 0x501c4814}, +++{"linux/videodev2.h", "VIDIOC_G_PRIORITY", 0x80015643}, +++{"linux/joystick.h", "JSIOCGAXES", 0x80016a11}, +++{"linux/joystick.h", "JSIOCGBUTTONS", 0x80016a12}, +++{"linux/ppdev.h", "PPRSTATUS", 0x80017081}, +++{"linux/ppdev.h", "PPRCONTROL", 0x80017083}, +++{"linux/ppdev.h", "PPRDATA", 0x80017085}, +++{"linux/sonypi.h", "SONYPI_IOCGBRT", 0x80017600}, +++{"linux/sonypi.h", "SONYPI_IOCGBATFLAGS", 0x80017607}, +++{"linux/sonypi.h", "SONYPI_IOCGBLUE", 0x80017608}, +++{"linux/sonypi.h", "SONYPI_IOCGFAN", 0x8001760a}, +++{"linux/sonypi.h", "SONYPI_IOCGTEMP", 0x8001760c}, +++{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321}, +++{"linux/capi.h", "CAPI_INSTALLED", 0x80024322}, +++{"linux/ipmi.h", "IPMICTL_REGISTER_FOR_CMD", 0x8002690e}, +++{"linux/ipmi.h", "IPMICTL_UNREGISTER_FOR_CMD", 0x8002690f}, +++{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80027501}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT1CAP", 0x80027602}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT1REM", 0x80027603}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT2CAP", 0x80027604}, +++{"linux/sonypi.h", "SONYPI_IOCGBAT2REM", 0x80027605}, +++{"linux/fs.h", "BLKBSZGET", 0x80041270}, +++{"linux/fs.h", "BLKGETSIZE64", 0x80041272}, +++{"linux/radeonfb.h", "FBIO_RADEON_GET_MIRROR", 0x80044003}, +++{"linux/agpgart.h", "AGPIOC_INFO", 0x80044100}, +++{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80044201}, +++{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80044203}, +++{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80044204}, +++{"linux/pmu.h", "PMU_IOC_CAN_SLEEP", 0x80044205}, +++{"linux/pmu.h", "PMU_IOC_GRAB_BACKLIGHT", 0x80044206}, +++{"linux/cciss_ioctl.h", "CCISS_GETHEARTBEAT", 0x80044206}, +++{"linux/cciss_ioctl.h", "CCISS_GETBUSTYPES", 0x80044207}, +++{"linux/cciss_ioctl.h", "CCISS_GETFIRMVER", 0x80044208}, +++{"linux/cciss_ioctl.h", "CCISS_GETDRIVVER", 0x80044209}, +++{"linux/capi.h", "CAPI_GET_FLAGS", 0x80044323}, +++{"linux/capi.h", "CAPI_SET_FLAGS", 0x80044324}, +++{"linux/capi.h", "CAPI_CLR_FLAGS", 0x80044325}, +++{"linux/capi.h", "CAPI_NCCI_OPENCOUNT", 0x80044326}, +++{"linux/capi.h", "CAPI_NCCI_GETUNIT", 0x80044327}, +++{"linux/input.h", "EVIOCGVERSION", 0x80044501}, +++{"linux/input.h", "EVIOCGEFFECTS", 0x80044584}, +++{"linux/arcfb.h", "FBIO_GETCONTROL2", 0x80044689}, +++{"linux/hiddev.h", "HIDIOCGVERSION", 0x80044801}, +++{"linux/hiddev.h", "HIDIOCGFLAG", 0x8004480e}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x80044d00}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x80044d01}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x80044d02}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x80044d03}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x80044d04}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x80044d05}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x80044d06}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x80044d07}, +++{"mtd/mtd-abi.h", "MEMGETREGIONCOUNT", 0x80044d07}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x80044d08}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x80044d09}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x80044d0a}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x80044d0b}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x80044d0c}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x80044d0d}, +++{"mtd/mtd-abi.h", "OTPSELECT", 0x80044d0d}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x80044d0e}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x80044d0f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x80044d10}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x80044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x80044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x80044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x80044dfb}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x80044dfc}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x80044dfd}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x80044dfe}, +++{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x80044dff}, +++{"linux/ticable.h", "IOCTL_TIUSB_GET_MAXPS", 0x80044e23}, +++{"linux/ticable.h", "IOCTL_TIUSB_GET_DEVID", 0x80044e24}, +++{"linux/random.h", "RNDGETENTCNT", 0x80045200}, +++{"asm/ioctls.h", "TIOCGPTN", 0x80045430}, +++{"linux/videodev2.h", "VIDIOC_G_INPUT", 0x80045626}, +++{"linux/videodev2.h", "VIDIOC_G_OUTPUT", 0x8004562e}, +++{"linux/watchdog.h", "WDIOC_GETSTATUS", 0x80045701}, +++{"linux/watchdog.h", "WDIOC_GETBOOTSTATUS", 0x80045702}, +++{"linux/watchdog.h", "WDIOC_GETTEMP", 0x80045703}, +++{"linux/watchdog.h", "WDIOC_SETOPTIONS", 0x80045704}, +++{"linux/watchdog.h", "WDIOC_KEEPALIVE", 0x80045705}, +++{"linux/watchdog.h", "WDIOC_GETTIMEOUT", 0x80045707}, +++{"linux/watchdog.h", "WDIOC_GETPRETIMEOUT", 0x80045709}, +++{"linux/watchdog.h", "WDIOC_GETTIMELEFT", 0x8004570a}, +++{"linux/sonet.h", "SONET_GETDIAG", 0x80046114}, +++{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116}, +++{"linux/cm4000_cs.h", "CM_IOCGSTATUS", 0x80046300}, +++{"linux/chio.h", "CHIOGPICKER", 0x80046304}, +++{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402}, +++{"linux/iflags.h", "IFLAGS_GET_IOC", 0x80046601}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETFLAGS", 0x80046601}, +++{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80046601}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION", 0x80046603}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETRSVSZ", 0x80046605}, +++{"linux/ext3_fs.h", "EXT3_IOC_WAIT_FOR_READONLY", 0x80046663}, +++{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908}, +++{"linux/ipmi.h", "IPMICTL_SET_GETS_EVENTS_CMD", 0x80046910}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_ADDRESS_CMD", 0x80046911}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_ADDRESS_CMD", 0x80046912}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_LUN_CMD", 0x80046913}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_LUN_CMD", 0x80046914}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD", 0x80046918}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD", 0x80046919}, +++{"linux/ipmi.h", "IPMICTL_SET_MY_CHANNEL_LUN_CMD", 0x8004691a}, +++{"linux/ipmi.h", "IPMICTL_GET_MY_CHANNEL_LUN_CMD", 0x8004691b}, +++{"linux/i8k.h", "I8K_BIOS_VERSION", 0x80046980}, +++{"linux/i8k.h", "I8K_MACHINE_ID", 0x80046981}, +++{"linux/i8k.h", "I8K_POWER_STATUS", 0x80046982}, +++{"linux/i8k.h", "I8K_FN_STATUS", 0x80046983}, +++{"linux/i8k.h", "I8K_GET_TEMP", 0x80046984}, +++{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01}, +++{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40}, +++{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80046c41}, +++{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80046c42}, +++{"linux/mmtimer.h", "MMTIMER_GETRES", 0x80046d01}, +++{"linux/mmtimer.h", "MMTIMER_GETFREQ", 0x80046d02}, +++{"linux/mtio.h", "MTIOCPOS", 0x80046d03}, +++{"linux/mmtimer.h", "MMTIMER_GETCOUNTER", 0x80046d09}, +++{"linux/zftape.h", "MTIOC_ZFTAPE_GETBLKSZ", 0x80046d68}, +++{"linux/ncp_fs.h", "NCP_IOC_SIGN_WANTED", 0x80046e06}, +++{"linux/ncp_fs.h", "NCP_IOC_SETDENTRYTTL", 0x80046e0c}, +++{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80046ef8}, +++{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80046ef9}, +++{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80046efb}, +++{"linux/rtc.h", "RTC_IRQP_READ", 0x8004700b}, +++{"linux/rtc.h", "RTC_EPOCH_READ", 0x8004700d}, +++{"linux/ppdev.h", "PPCLRIRQ", 0x80047093}, +++{"linux/ppdev.h", "PPGETMODES", 0x80047097}, +++{"linux/ppdev.h", "PPGETMODE", 0x80047098}, +++{"linux/ppdev.h", "PPGETPHASE", 0x80047099}, +++{"linux/ppdev.h", "PPGETFLAGS", 0x8004709a}, +++{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80047181}, +++{"linux/telephony.h", "PHONE_DTMF_READY", 0x80047196}, +++{"linux/telephony.h", "PHONE_GET_DTMF", 0x80047197}, +++{"linux/telephony.h", "PHONE_GET_DTMF_ASCII", 0x80047198}, +++{"linux/telephony.h", "PHONE_EXCEPTION", 0x8004719a}, +++{"linux/ixjuser.h", "IXJCTL_CARDTYPE", 0x800471c1}, +++{"linux/ixjuser.h", "IXJCTL_SERIAL", 0x800471c2}, +++{"linux/ixjuser.h", "IXJCTL_DSP_TYPE", 0x800471c3}, +++{"linux/ixjuser.h", "IXJCTL_DSP_VERSION", 0x800471c4}, +++{"linux/ixjuser.h", "IXJCTL_CID", 0x800471d4}, +++{"linux/ixjuser.h", "IXJCTL_VMWI", 0x800471d8}, +++{"linux/ixjuser.h", "IXJCTL_VERSION", 0x800471da}, +++{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800471e2}, +++{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800471e3}, +++{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800471e4}, +++{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800471e5}, +++{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800471e6}, +++{"linux/msdos_fs.h", "FAT_IOCTL_GET_ATTRIBUTES", 0x80047210}, +++{"linux/if_ppp.h", "PPPIOCGCHAN", 0x80047437}, +++{"linux/if_ppp.h", "PPPIOCGDEBUG", 0x80047441}, +++{"linux/if_ppp.h", "PPPIOCGMRU", 0x80047453}, +++{"linux/if_ppp.h", "PPPIOCGRASYNCMAP", 0x80047455}, +++{"linux/if_ppp.h", "PPPIOCGUNIT", 0x80047456}, +++{"linux/if_ppp.h", "PPPIOCGASYNCMAP", 0x80047458}, +++{"linux/if_ppp.h", "PPPIOCGFLAGS", 0x8004745a}, +++{"linux/isdn_ppp.h", "PPPIOCGMPFLAGS", 0x80047482}, +++{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID32", 0x80047503}, +++{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80047601}, +++{"linux/ext3_fs.h", "EXT3_IOC_GETVERSION_OLD", 0x80047601}, +++{"linux/videodev.h", "VIDIOCGFREQ", 0x8004760e}, +++{"linux/meye.h", "MEYEIOC_STILLJCAPT", 0x800476c5}, +++{"linux/dn.h", "SIOCGNETADDR", 0x800489e1}, +++{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1}, +++{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_PROTOSUBVER", 0x80049367}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_ASKREGHOST", 0x80049368}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_TOGGLEREGHOST", 0x80049369}, +++{"linux/auto_fs4.h", "AUTOFS_IOC_ASKUMOUNT", 0x80049370}, +++{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117}, +++{"linux/meye.h", "MEYEIOC_G_PARAMS", 0x800676c0}, +++{"linux/cciss_ioctl.h", "CCISS_GETPCIINFO", 0x80084201}, +++{"linux/cciss_ioctl.h", "CCISS_GETINTINFO", 0x80084202}, +++{"linux/input.h", "EVIOCGID", 0x80084502}, +++{"linux/input.h", "EVIOCGREP", 0x80084503}, +++{"linux/input.h", "EVIOCGKEYCODE", 0x80084504}, +++{"linux/random.h", "RNDGETPOOL", 0x80085202}, +++{"linux/videodev2.h", "VIDIOC_G_STD", 0x80085617}, +++{"linux/videodev2.h", "VIDIOC_QUERYSTD", 0x8008563f}, +++{"linux/i2o-dev.h", "I2OPASSTHRU", 0x8008690c}, +++{"linux/i2o-dev.h", "I2OPASSTHRU32", 0x8008690c}, +++{"linux/ipmi.h", "IPMICTL_SET_TIMING_PARMS_CMD", 0x80086916}, +++{"linux/ipmi.h", "IPMICTL_GET_TIMING_PARMS_CMD", 0x80086917}, +++{"linux/mtio.h", "MTIOCGETSIZE", 0x80086d09}, +++{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80086e0a}, +++{"linux/ppdev.h", "PPGETTIME", 0x80087095}, +++{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8008743f}, +++{"linux/cciss_ioctl.h", "CCISS_GETLUNINFO", 0x800c4211}, +++{"mtd/mtd-abi.h", "OTPLOCK", 0x800c4d10}, +++{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401}, +++{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501}, +++{"linux/hpet.h", "HPET_INFO", 0x800c6803}, +++{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x800c6e01}, +++{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08}, +++{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x800c6e09}, +++{"linux/videodev.h", "VIDIOCKEY", 0x800c760d}, +++{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606}, +++{"linux/fd.h", "FDGETDRVTYP", 0x8010020f}, +++{"linux/cciss_ioctl.h", "CCISS_GETNODENAME", 0x80104204}, +++{"mtd/mtd-abi.h", "ECCGETSTATS", 0x80104d12}, +++{"linux/synclink.h", "MGSL_IOCGGPIO", 0x80106d11}, +++{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488}, +++{"linux/videotext.h", "VTXIOCGETINFO", 0x80108101}, +++{"linux/fd.h", "FDGETMAXERRS", 0x8014020e}, +++{"linux/chio.h", "CHIOGPARAMS", 0x80146306}, +++{"linux/ipmi.h", "IPMICTL_SEND_COMMAND", 0x8014690d}, +++{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08}, +++{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07}, +++{"linux/videodev.h", "VIDIOCGFBUF", 0x8014760b}, +++{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615}, +++{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616}, +++{"linux/fd.h", "FDWERRORGET", 0x80180217}, +++{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05}, +++{"linux/fd.h", "FDGETPRM", 0x801c0204}, +++{"linux/hiddev.h", "HIDIOCGDEVINFO", 0x801c4803}, +++{"linux/ipmi.h", "IPMICTL_SEND_COMMAND_SETTIME", 0x801c6915}, +++{"linux/mtio.h", "MTIOCGET", 0x801c6d02}, +++{"linux/rtc.h", "RTC_PLL_GET", 0x801c7011}, +++{"linux/fd.h", "FDGETFDCSTAT", 0x80200215}, +++{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612}, +++{"mtd/mtd-abi.h", "MEMGETINFO", 0x80204d01}, +++{"linux/i2o-dev.h", "I2OGETIOPS", 0x80206900}, +++{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80206d01}, +++{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450}, +++{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80207486}, +++{"linux/videodev.h", "VIDIOCGWIN", 0x80207609}, +++{"linux/videodev.h", "VIDIOCGVBIFMT", 0x8020761c}, +++{"linux/sonet.h", "SONET_GETSTAT", 0x80246110}, +++{"linux/sonet.h", "SONET_GETSTATZ", 0x80246111}, +++{"linux/joystick.h", "JSIOCGCORR", 0x80246a22}, +++{"linux/rtc.h", "RTC_ALM_READ", 0x80247008}, +++{"linux/rtc.h", "RTC_RD_TIME", 0x80247009}, +++{"linux/watchdog.h", "WDIOC_GETSUPPORT", 0x80285700}, +++{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010}, +++{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610}, +++{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b}, +++{"linux/videodev2.h", "VIDIOC_G_FBUF", 0x802c560a}, +++{"linux/videodev2.h", "VIDIOC_CROPCAP_OLD", 0x802c563a}, +++{"linux/fd.h", "FDGETDRVSTAT", 0x80340212}, +++{"linux/fd.h", "FDPOLLDRVSTAT", 0x80340213}, +++{"linux/videodev2.h", "VIDIOC_G_AUDIO", 0x80345621}, +++{"linux/videodev2.h", "VIDIOC_G_AUDOUT", 0x80345631}, +++{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601}, +++{"linux/joystick.h", "JSIOCGAXMAP", 0x80406a32}, +++{"linux/fd.h", "FDGETDRVPRM", 0x80580211}, +++{"linux/videodev2.h", "VIDIOC_QUERYCAP", 0x80685600}, +++{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b}, +++{"linux/chio.h", "CHIOGVPARAMS", 0x80706313}, +++{"linux/videodev2.h", "VIDIOC_G_SLICED_VBI_CAP", 0x80745645}, +++{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614}, +++{"linux/videodev2.h", "VIDIOC_G_JPEGCOMP", 0x808c563d}, +++{"mtd/mtd-abi.h", "MEMGETOOBSEL", 0x80c84d0a}, +++{"linux/hiddev.h", "HIDIOCGSTRING", 0x81044804}, +++{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365}, +++{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a}, +++{"mtd/mtd-abi.h", "ECCGETLAYOUT", 0x81484d11}, +++{"linux/joystick.h", "JSIOCGBTNMAP", 0x82006a34}, +++{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82187201}, +++{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82187202}, +++{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0044106}, +++{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306}, +++{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308}, +++{"linux/gigaset_dev.h", "GIGASET_REDIR", 0xc0044700}, +++{"linux/gigaset_dev.h", "GIGASET_CONFIG", 0xc0044701}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0xc0044d00}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0xc0044d01}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0xc0044d02}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0xc0044d03}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0xc0044d04}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0xc0044d05}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0xc0044d06}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0xc0044d07}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0xc0044d08}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0xc0044d09}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0xc0044d0a}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0xc0044d0b}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0xc0044d0c}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0xc0044d0d}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0xc0044d0e}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0xc0044d0f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0xc0044d10}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0xc0044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0xc0044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0xc0044d1f}, +++{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0xc0044dff}, +++{"linux/videodev2.h", "VIDIOC_OVERLAY_OLD", 0xc004560e}, +++{"linux/videodev2.h", "VIDIOC_S_INPUT", 0xc0045627}, +++{"linux/videodev2.h", "VIDIOC_S_OUTPUT", 0xc004562f}, +++{"linux/watchdog.h", "WDIOC_SETTIMEOUT", 0xc0045706}, +++{"linux/watchdog.h", "WDIOC_SETPRETIMEOUT", 0xc0045708}, +++{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112}, +++{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113}, +++{"linux/cm4000_cs.h", "CM_IOCGATR", 0xc0046301}, +++{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc004630a}, +++{"linux/i8k.h", "I8K_GET_SPEED", 0xc0046985}, +++{"linux/i8k.h", "I8K_GET_FAN", 0xc0046986}, +++{"linux/i8k.h", "I8K_SET_FAN", 0xc0046987}, +++{"linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", 0xc0046c43}, +++{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08}, +++{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0046efa}, +++{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00471a7}, +++{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e}, +++{"linux/toshiba.h", "TOSH_SMM", 0xc0047490}, +++{"linux/meye.h", "MEYEIOC_SYNC", 0xc00476c3}, +++{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0049364}, +++{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0084320}, +++{"linux/videodev2.h", "VIDIOC_G_CTRL", 0xc008561b}, +++{"linux/videodev2.h", "VIDIOC_S_CTRL", 0xc008561c}, +++{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0086e0a}, +++{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c}, +++{"linux/hiddev.h", "HIDIOCGREPORTINFO", 0xc00c4809}, +++{"mtd/mtd-abi.h", "MEMWRITEOOB", 0xc00c4d03}, +++{"mtd/mtd-abi.h", "MEMREADOOB", 0xc00c4d04}, +++{"linux/uinput.h", "UI_BEGIN_FF_ERASE", 0xc00c55ca}, +++{"linux/ite_gpio.h", "ITE_GPIO_IN", 0xc00c5a00}, +++{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc00c6161}, +++{"linux/i2o-dev.h", "I2OHRTGET", 0xc00c6901}, +++{"linux/i2o-dev.h", "I2OLCTGET", 0xc00c6902}, +++{"linux/mtio.h", "MTIOCFTFORMAT", 0xc00c6d0a}, +++{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc00c6e09}, +++{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307}, +++{"linux/gigaset_dev.h", "GIGASET_VERSION", 0xc0104703}, +++{"linux/hiddev.h", "HIDIOCGCOLLECTIONINFO", 0xc0104811}, +++{"mtd/mtd-abi.h", "MEMGETREGIONINFO", 0xc0104d08}, +++{"linux/videodev2.h", "VIDIOC_REQBUFS", 0xc0105608}, +++{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0106d06}, +++{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0106d07}, +++{"linux/synclink.h", "MGSL_IOCWAITGPIO", 0xc0106d12}, +++{"linux/videodev2.h", "VIDIOC_G_CROP", 0xc014563b}, +++{"linux/hiddev.h", "HIDIOCGUSAGE", 0xc018480b}, +++{"linux/hiddev.h", "HIDIOCGUCODE", 0xc018480d}, +++{"linux/videodev2.h", "VIDIOC_G_EXT_CTRLS", 0xc0185647}, +++{"linux/videodev2.h", "VIDIOC_S_EXT_CTRLS", 0xc0185648}, +++{"linux/videodev2.h", "VIDIOC_TRY_EXT_CTRLS", 0xc0185649}, +++{"linux/pktcdvd.h", "PACKET_CTRL_CMD", 0xc0185801}, +++{"linux/i2o-dev.h", "I2OPARMSET", 0xc0186903}, +++{"linux/i2o-dev.h", "I2OPARMGET", 0xc0186904}, +++{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG_TRUNC", 0xc018690b}, +++{"linux/ipmi.h", "IPMICTL_RECEIVE_MSG", 0xc018690c}, +++{"linux/i2o-dev.h", "I2OSWDL", 0xc01c6905}, +++{"linux/i2o-dev.h", "I2OSWUL", 0xc01c6906}, +++{"linux/i2o-dev.h", "I2OSWDEL", 0xc01c6907}, +++{"linux/i2o-dev.h", "I2OHTML", 0xc01c6909}, +++{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b}, +++{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0246e04}, +++{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04}, +++{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b}, +++{"linux/videodev2.h", "VIDIOC_QUERYMENU", 0xc02c5625}, +++{"linux/videodev2.h", "VIDIOC_G_FREQUENCY", 0xc02c5638}, +++{"linux/videodev2.h", "VIDIOC_CROPCAP", 0xc02c563a}, +++{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602}, +++{"linux/uinput.h", "UI_BEGIN_FF_UPLOAD", 0xc03455c8}, +++{"linux/videodev2.h", "VIDIOC_G_AUDIO_OLD", 0xc0345621}, +++{"linux/videodev2.h", "VIDIOC_G_AUDOUT_OLD", 0xc0345631}, +++{"linux/videodev2.h", "VIDIOC_ENUMAUDIO", 0xc0345641}, +++{"linux/videodev2.h", "VIDIOC_ENUMAUDOUT", 0xc0345642}, +++{"linux/videodev.h", "VIDIOCGTUNER", 0xc0347604}, +++{"linux/hiddev.h", "HIDIOCGFIELDINFO", 0xc038480a}, +++{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309}, +++{"linux/videodev2.h", "VIDIOC_ENUM_FMT", 0xc0405602}, +++{"linux/videodev2.h", "VIDIOC_ENUMSTD", 0xc0405619}, +++{"linux/videodev2.h", "VIDIOC_QUERYBUF", 0xc0445609}, +++{"linux/videodev2.h", "VIDIOC_QBUF", 0xc044560f}, +++{"linux/videodev2.h", "VIDIOC_DQBUF", 0xc0445611}, +++{"linux/videodev2.h", "VIDIOC_QUERYCTRL", 0xc0445624}, +++{"linux/videodev2.h", "VIDIOC_G_MODULATOR", 0xc0445636}, +++{"linux/fb.h", "FBIO_CURSOR", 0xc0484608}, +++{"linux/videodev2.h", "VIDIOC_ENUMOUTPUT", 0xc0485630}, +++{"linux/videodev2.h", "VIDIOC_ENUMINPUT", 0xc04c561a}, +++{"linux/cciss_ioctl.h", "CCISS_PASSTHRU", 0xc054420b}, +++{"linux/videodev2.h", "VIDIOC_G_TUNER", 0xc054561d}, +++{"linux/cciss_ioctl.h", "CCISS_BIG_PASSTHRU", 0xc0584212}, +++{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480}, +++{"linux/videodev2.h", "VIDIOC_G_FMT", 0xc0cc5604}, +++{"linux/videodev2.h", "VIDIOC_S_FMT", 0xc0cc5605}, +++{"linux/videodev2.h", "VIDIOC_G_PARM", 0xc0cc5615}, +++{"linux/videodev2.h", "VIDIOC_S_PARM", 0xc0cc5616}, +++{"linux/videodev2.h", "VIDIOC_TRY_FMT", 0xc0cc5640}, +++{"linux/dm-ioctl.h", "DM_VERSION", 0xc134fd00}, +++{"linux/dm-ioctl.h", "DM_VERSION_32", 0xc134fd00}, +++{"linux/dm-ioctl.h", "DM_REMOVE_ALL_32", 0xc134fd01}, +++{"linux/dm-ioctl.h", "DM_REMOVE_ALL", 0xc134fd01}, +++{"linux/dm-ioctl.h", "DM_LIST_DEVICES_32", 0xc134fd02}, +++{"linux/dm-ioctl.h", "DM_LIST_DEVICES", 0xc134fd02}, +++{"linux/dm-ioctl.h", "DM_DEV_CREATE_32", 0xc134fd03}, +++{"linux/dm-ioctl.h", "DM_DEV_CREATE", 0xc134fd03}, +++{"linux/dm-ioctl.h", "DM_DEV_REMOVE", 0xc134fd04}, +++{"linux/dm-ioctl.h", "DM_DEV_REMOVE_32", 0xc134fd04}, +++{"linux/dm-ioctl.h", "DM_DEV_RENAME_32", 0xc134fd05}, +++{"linux/dm-ioctl.h", "DM_DEV_RENAME", 0xc134fd05}, +++{"linux/dm-ioctl.h", "DM_DEV_SUSPEND_32", 0xc134fd06}, +++{"linux/dm-ioctl.h", "DM_DEV_SUSPEND", 0xc134fd06}, +++{"linux/dm-ioctl.h", "DM_DEV_STATUS", 0xc134fd07}, +++{"linux/dm-ioctl.h", "DM_DEV_STATUS_32", 0xc134fd07}, +++{"linux/dm-ioctl.h", "DM_DEV_WAIT", 0xc134fd08}, +++{"linux/dm-ioctl.h", "DM_DEV_WAIT_32", 0xc134fd08}, +++{"linux/dm-ioctl.h", "DM_TABLE_LOAD", 0xc134fd09}, +++{"linux/dm-ioctl.h", "DM_TABLE_LOAD_32", 0xc134fd09}, +++{"linux/dm-ioctl.h", "DM_TABLE_CLEAR_32", 0xc134fd0a}, +++{"linux/dm-ioctl.h", "DM_TABLE_CLEAR", 0xc134fd0a}, +++{"linux/dm-ioctl.h", "DM_TABLE_DEPS_32", 0xc134fd0b}, +++{"linux/dm-ioctl.h", "DM_TABLE_DEPS", 0xc134fd0b}, +++{"linux/dm-ioctl.h", "DM_TABLE_STATUS", 0xc134fd0c}, +++{"linux/dm-ioctl.h", "DM_TABLE_STATUS_32", 0xc134fd0c}, +++{"linux/dm-ioctl.h", "DM_LIST_VERSIONS", 0xc134fd0d}, +++{"linux/dm-ioctl.h", "DM_LIST_VERSIONS_32", 0xc134fd0d}, +++{"linux/dm-ioctl.h", "DM_TARGET_MSG", 0xc134fd0e}, +++{"linux/dm-ioctl.h", "DM_TARGET_MSG_32", 0xc134fd0e}, +++{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY_32", 0xc134fd0f}, +++{"linux/dm-ioctl.h", "DM_DEV_SET_GEOMETRY", 0xc134fd0f}, +++{"linux/hiddev.h", "HIDIOCGUSAGES", 0xd01c4813}, ++Index: strace-4.5.16/linux/avr32/ioctlent.sh ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ strace-4.5.16/linux/avr32/ioctlent.sh 2008-05-11 15:36:30.000000000 +0200 ++@@ -0,0 +1,124 @@ +++#!/bin/sh +++# Copyright (c) 1993, 1994, 1995 Rick Sladkey +++# All rights reserved. +++# +++# Copyright (c) 1995, 1996 Michael Elizabeth Chastain +++# All rights reserved. +++# +++# 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. The name of the author may not be used to endorse or promote products +++# derived from this software without specific prior written permission. +++# +++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +++ +++# Files to find. +++file_find='asm/*.h linux/*.h scsi/*.h mtd/*.h' +++ +++# Files to stop. +++file_stop='asm/byteorder.h linux/config.h linux/elf-em.h linux/pci_ids.h linux/xd.h linux/reiserfs_fs.h linux/usbdevice_fs.h' +++ +++# Defs to find. +++# Work on the kernel source to convert all to df_iowr. +++# Don't know how to find low-numbered ioctls in linux/mc146818rtc.h. +++df_name='^[ ]*#[ ]*define[ ]+[A-Z_][A-Z0-9_]*[ ]+' +++df_iowr='_IO|_IOR|_IOW|_IOWR' +++df_NNNN='0[Xx](03|06|22|46|4B|4C|53|54|56|89|90)[0-9A-Fa-f][0-9A-Fa-f]' +++df_4359='0[Xx]4359[0-9A-Fa-f][0-9A-Fa-f]' # linux/cyclades.h +++df_470N='470[0-9]' # linux/fs.h (only in 1.2.13) +++df_smix='MIXER_READ|MIXER_WRITE' # linux/soundcard.h +++df_12NN='12[3-4][0-9]' # linux/umsdos_fs.h (only in 1.2.13) +++df_tail='([() ]|$)' +++def_find="$df_name($df_iowr|$df_NNNN|$df_4359|$df_470N|$df_smix|$df_12NN)$df_tail" +++ +++# Defs to stop. +++ds_tail='_MAGIC|_PATCH' +++ds_fdmp='FD(DEF|GET|SET)MEDIAPRM' # linux/fd.h aliases (only in 1.2.13) +++ds_mtio='MTIOC(GET|SET)CONFIG' # linux/mtio.h needs config (only in 1.2.13) +++ds_soundcard='_SIO(RW?|W)?' +++def_stop="$ds_tail|$ds_fdmp|$ds_mtio|$ds_soundcard" +++ +++# Validate arg count. +++if [ $# -ne 1 ] +++then +++ echo "usage: $0 include-directory" >&2 +++ exit 1 +++fi +++ +++# Grep through the files. +++( +++ # Construct list: find files minus stop files. +++ cd $1 || exit +++ file_list=`(ls $file_find $file_stop $file_stop 2>/dev/null) | sort | uniq -u` +++ +++ # Grep matching #define lines. +++ # Transform to C structure form. +++ # Filter out stop list. +++ egrep "$def_find" $file_list | +++ sed -n -e 's/^\(.*\):#[ ]*define[ ]*\([A-Z_][A-Z0-9_]*\).*$/ { "\1", "\2", \2 },/p' | +++ egrep -v "$def_stop" +++) > ioctlent.tmp +++ +++# Generate the output file. +++echo '/* This file is automatically generated by ioctlent.sh */' +++echo +++echo '#include ' +++echo '#include ' +++echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#define BAYCOM_DEBUG' +++echo +++echo '/* Needed for */' +++echo '#define CONFIG_COMPAT' +++echo +++echo '/* Needed for */' +++echo '#define CONFIG_JBD_DEBUG' +++echo +++echo '/* Needed for */' +++echo '#define LP_STATS' +++echo +++echo '/* Needed for */' +++echo '#define __OLD_VIDIOC_' +++echo +++echo '/* Needed for */' +++echo '#define ZFT_OBSOLETE' +++echo +++echo '/* Needed for */' +++echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#include ' +++#echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#include ' +++echo '#include ' +++echo +++echo '/* Needed for */' +++echo '#include ' +++echo +++awk '{ print "#include <" substr($2, 2, length($2) - 3) ">" }' ioctlent.tmp | sort -u +++echo +++echo 'struct ioctlent ioctlent [] =' +++echo '{' +++cat ioctlent.tmp +++echo '};' +++ +++# Clean up. +++rm -f ioctlent.tmp ++Index: strace-4.5.16/linux/avr32/syscallent.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ strace-4.5.16/linux/avr32/syscallent.h 2008-05-11 15:36:30.000000000 +0200 ++@@ -0,0 +1,307 @@ +++/* +++ * Copyright (c) 2004-2006 Atmel Corporation +++ * All rights reserved. +++ * +++ * 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. The name of the author may not be used to endorse or promote products +++ * derived from this software without specific prior written permission. +++ * +++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +++ * +++ * $Id$ +++ */ +++ +++ { 0, 0, sys_setup, "setup" }, /* 0 */ +++ { 1, TP, sys_exit, "_exit" }, /* 1 */ +++ { 0, TP, sys_fork, "fork" }, /* 2 */ +++ { 3, 0, sys_read, "read" }, /* 3 */ +++ { 3, 0, sys_write, "write" }, /* 4 */ +++ { 3, TF, sys_open, "open" }, /* 5 */ +++ { 1, 0, sys_close, "close" }, /* 6 */ +++ { 1, 0, sys_umask, "umask" }, /* 7 */ +++ { 2, TF, sys_creat, "creat" }, /* 8 */ +++ { 2, TF, sys_link, "link" }, /* 9 */ +++ { 1, TF, sys_unlink, "unlink" }, /* 10 */ +++ { 3, TF|TP, sys_execve, "execve" }, /* 11 */ +++ { 1, TF, sys_chdir, "chdir" }, /* 12 */ +++ { 1, 0, sys_time, "time" }, /* 13 */ +++ { 3, TF, sys_mknod, "mknod" }, /* 14 */ +++ { 2, TF, sys_chmod, "chmod" }, /* 15 */ +++ { 3, TF, sys_chown, "chown" }, /* 16 */ +++ { 3, TF, sys_chown, "lchown" }, /* 17 */ +++ { 3, 0, sys_lseek, "lseek" }, /* 18 */ +++ { 5, 0, sys_llseek, "_llseek" }, /* 19 */ +++ { 0, 0, sys_getpid, "getpid" }, /* 20 */ +++ { 5, TF, sys_mount, "mount" }, /* 21 */ +++ { 2, TF, sys_umount, "umount" }, /* 22 */ +++ { 1, 0, sys_setuid, "setuid" }, /* 23 */ +++ { 0, 0, sys_getuid, "getuid" }, /* 24 */ +++ { 1, 0, sys_stime, "stime" }, /* 25 */ +++ { 4, 0, sys_ptrace, "ptrace" }, /* 26 */ +++ { 1, 0, sys_alarm, "alarm" }, /* 27 */ +++ { 0, TS, sys_pause, "pause" }, /* 28 */ +++ { 2, TF, sys_utime, "utime" }, /* 29 */ +++ { 2, TF, sys_stat, "stat" }, /* 30 */ +++ { 2, 0, sys_fstat, "fstat" }, /* 31 */ +++ { 2, TF, sys_lstat, "lstat" }, /* 32 */ +++ { 2, TF, sys_access, "access" }, /* 33 */ +++ { 1, TF, sys_chroot, "chroot" }, /* 34 */ +++ { 0, 0, sys_sync, "sync" }, /* 35 */ +++ { 1, 0, sys_fsync, "fsync" }, /* 36 */ +++ { 2, TS, sys_kill, "kill" }, /* 37 */ +++ { 2, TF, sys_rename, "rename" }, /* 38 */ +++ { 2, TF, sys_mkdir, "mkdir" }, /* 39 */ +++ { 1, TF, sys_rmdir, "rmdir" }, /* 40 */ +++ { 1, 0, sys_dup, "dup" }, /* 41 */ +++ { 1, 0, sys_pipe, "pipe" }, /* 42 */ +++ { 1, 0, sys_times, "times" }, /* 43 */ +++ { 5, TP, sys_clone, "clone" }, /* 44 */ +++ { 1, 0, sys_brk, "brk" }, /* 45 */ +++ { 1, 0, sys_setgid, "setgid" }, /* 46 */ +++ { 0, 0, sys_getgid, "getgid" }, /* 47 */ +++ { 2, TF, sys_getcwd, "getcwd" }, /* 48 */ +++ { 0, 0, sys_geteuid, "geteuid" }, /* 49 */ +++ { 0, 0, sys_getegid, "getegid" }, /* 50 */ +++ { 1, TF, sys_acct, "acct" }, /* 51 */ +++ { 1, 0, sys_setfsuid, "setfsuid" }, /* 52 */ +++ { 1, 0, sys_setfsgid, "setfsgid" }, /* 53 */ +++ { 3, 0, sys_ioctl, "ioctl" }, /* 54 */ +++ { 3, 0, sys_fcntl, "fcntl" }, /* 55 */ +++ { 2, 0, sys_setpgid, "setpgid" }, /* 56 */ +++ { 4, 0, sys_mremap, "mremap" }, /* 57 */ +++ { 3, 0, sys_setresuid, "setresuid" }, /* 58 */ +++ { 3, 0, sys_getresuid, "getresuid" }, /* 59 */ +++ { 2, 0, sys_setreuid, "setreuid" }, /* 60 */ +++ { 2, 0, sys_setregid, "setregid" }, /* 61 */ +++ { 2, 0, sys_ustat, "ustat" }, /* 62 */ +++ { 2, 0, sys_dup2, "dup2" }, /* 63 */ +++ { 0, 0, sys_getppid, "getppid" }, /* 64 */ +++ { 0, 0, sys_getpgrp, "getpgrp" }, /* 65 */ +++ { 0, 0, sys_setsid, "setsid" }, /* 66 */ +++ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 67 */ +++ { 1, TS, printargs, "rt_sigreturn" }, /* 68 */ +++ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 69 */ +++ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 70 */ +++ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"}, /* 71 */ +++ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"}, /* 72 */ +++ { 2, TS, sys_rt_sigsuspend, "rt_sigsuspend" }, /* 73 */ +++ { 2, 0, sys_sethostname, "sethostname" }, /* 74 */ +++ { 2, 0, sys_setrlimit, "setrlimit" }, /* 75 */ +++ { 2, 0, sys_getrlimit, "old_getrlimit" }, /* 76 */ +++ { 2, 0, sys_getrusage, "getrusage" }, /* 77 */ +++ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 78 */ +++ { 2, 0, sys_settimeofday, "settimeofday" }, /* 79 */ +++ { 2, 0, sys_getgroups, "getgroups" }, /* 80 */ +++ { 2, 0, sys_setgroups, "setgroups" }, /* 81 */ +++ { 5, 0, sys_select, "select" }, /* 82 */ +++ { 2, TF, sys_symlink, "symlink" }, /* 83 */ +++ { 1, 0, sys_fchdir, "fchdir" }, /* 84 */ +++ { 3, TF, sys_readlink, "readlink" }, /* 85 */ +++ { 5, TF, sys_pread, "pread" }, /* 86 */ +++ { 5, TF, sys_pwrite, "pwrite" }, /* 87 */ +++ { 1, TF, sys_swapon, "swapon" }, /* 88 */ +++ { 3, 0, sys_reboot, "reboot" }, /* 89 */ +++ { 6, 0, sys_mmap, "mmap" }, /* 90 */ +++ { 2, 0, sys_munmap, "munmap" }, /* 91 */ +++ { 2, TF, sys_truncate, "truncate" }, /* 92 */ +++ { 2, 0, sys_ftruncate, "ftruncate" }, /* 93 */ +++ { 2, 0, sys_fchmod, "fchmod" }, /* 94 */ +++ { 3, 0, sys_fchown, "fchown" }, /* 95 */ +++ { 2, 0, sys_getpriority, "getpriority" }, /* 96 */ +++ { 3, 0, sys_setpriority, "setpriority" }, /* 97 */ +++ { 4, TP, sys_wait4, "wait4" }, /* 98 */ +++ { 2, TF, sys_statfs, "statfs" }, /* 99 */ +++ { 2, 0, sys_fstatfs, "fstatfs" }, /* 100 */ +++ { 0, 0, sys_vhangup, "vhangup" }, /* 101 */ +++ { 2, TS, sys_sigaltstack, "sigaltstack" }, /* 102 */ +++ { 3, 0, sys_syslog, "syslog" }, /* 103 */ +++ { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ +++ { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ +++ { 1, 0, sys_swapoff, "swapoff" }, /* 106 */ +++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 107 */ +++ { 6, 0, sys_ipc, "ipc" }, /* 108 */ +++ { 4, TF, sys_sendfile, "sendfile" }, /* 109 */ +++ { 2, 0, sys_setdomainname, "setdomainname" }, /* 110 */ +++ { 1, 0, sys_uname, "uname" }, /* 111 */ +++ { 1, 0, sys_adjtimex, "adjtimex" }, /* 112 */ +++ { 3, 0, sys_mprotect, "mprotect" }, /* 113 */ +++ { 0, TP, sys_vfork, "vfork" }, /* 114 */ +++ { 2, 0, sys_init_module, "init_module" }, /* 115 */ +++ { 1, 0, sys_delete_module, "delete_module" }, /* 116 */ +++ { 4, 0, sys_quotactl, "quotactl" }, /* 117 */ +++ { 1, 0, sys_getpgid, "getpgid" }, /* 118 */ +++ { 0, 0, sys_bdflush, "bdflush" }, /* 119 */ +++ { 3, 0, sys_sysfs, "sysfs" }, /* 120 */ +++ { 1, 0, sys_personality, "personality" }, /* 121 */ +++ { 5, 0, sys_afs_syscall, "afs_syscall" }, /* 122 */ +++ { 3, 0, sys_getdents, "getdents" }, /* 123 */ +++ { 2, 0, sys_flock, "flock" }, /* 124 */ +++ { 3, 0, sys_msync, "msync" }, /* 125 */ +++ { 3, 0, sys_readv, "readv" }, /* 126 */ +++ { 3, 0, sys_writev, "writev" }, /* 127 */ +++ { 1, 0, sys_getsid, "getsid" }, /* 128 */ +++ { 1, 0, sys_fdatasync, "fdatasync" }, /* 129 */ +++ { 1, 0, sys_sysctl, "_sysctl" }, /* 130 */ +++ { 2, 0, sys_mlock, "mlock" }, /* 131 */ +++ { 2, 0, sys_munlock, "munlock" }, /* 132 */ +++ { 2, 0, sys_mlockall, "mlockall" }, /* 133 */ +++ { 0, 0, sys_munlockall, "munlockall" }, /* 134 */ +++ { 0, 0, sys_sched_setparam, "sched_setparam"}, /* 135 */ +++ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 136 */ +++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 137 */ +++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 138 */ +++ { 0, 0, sys_sched_yield, "sched_yield"}, /* 139 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 140 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 141 */ +++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 142 */ +++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 143 */ +++ { 3, 0, sys_poll, "poll" }, /* 144 */ +++ { 3, 0, printargs, "nfsservctl" }, /* 145 */ +++ { 3, 0, sys_setresgid, "setresgid" }, /* 146 */ +++ { 3, 0, sys_getresgid, "getresgid" }, /* 147 */ +++ { 5, 0, sys_prctl, "prctl" }, /* 148 */ +++ { 3, TN, sys_socket, "socket" }, /* 149 */ +++ { 3, TN, sys_bind, "bind" }, /* 150 */ +++ { 3, TN, sys_connect, "connect" }, /* 151 */ +++ { 2, TN, sys_listen, "listen" }, /* 152 */ +++ { 3, TN, sys_accept, "accept" }, /* 153 */ +++ { 3, TN, sys_getsockname, "getsockname" }, /* 154 */ +++ { 3, TN, sys_getpeername, "getpeername" }, /* 155 */ +++ { 4, TN, sys_socketpair, "socketpair" }, /* 156 */ +++ { 4, TN, sys_send, "send" }, /* 157 */ +++ { 4, TN, sys_recv, "recv" }, /* 158 */ +++ { 6, TN, sys_sendto, "sendto" }, /* 159 */ +++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 160 */ +++ { 2, TN, sys_shutdown, "shutdown" }, /* 161 */ +++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 162 */ +++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 163 */ +++ { 3, TN, sys_sendmsg, "sendmsg" }, /* 164 */ +++ { 3, TN, sys_recvmsg, "recvmsg" }, /* 165 */ +++ { 3, TF, sys_truncate64, "truncate64" }, /* 166 */ +++ { 3, TF, sys_ftruncate64, "ftruncate64" }, /* 167 */ +++ { 2, TF, sys_stat64, "stat64" }, /* 168 */ +++ { 2, TF, sys_lstat64, "lstat64" }, /* 169 */ +++ { 2, TF, sys_fstat64, "fstat64" }, /* 170 */ +++ { 2, TF, sys_pivotroot, "pivot_root" }, /* 171 */ +++ { 3, 0, printargs, "mincore" }, /* 172 */ +++ { 3, 0, sys_madvise, "madvise" }, /* 173 */ +++ { 4, 0, sys_getdents64, "getdents64" }, /* 174 */ +++ { 3, 0, sys_fcntl, "fcntl64" }, /* 175 */ +++ { 0, 0, printargs, "gettid" }, /* 176 */ +++ { 4, 0, sys_readahead, "readahead" }, /* 177 */ +++ { 5, TF, sys_setxattr, "setxattr" }, /* 178 */ +++ { 5, TF, sys_setxattr, "lsetxattr" }, /* 179 */ +++ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 180 */ +++ { 4, TF, sys_getxattr, "getxattr" }, /* 181 */ +++ { 4, TF, sys_getxattr, "lgetxattr" }, /* 182 */ +++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 183 */ +++ { 3, TF, sys_listxattr, "listxattr" }, /* 184 */ +++ { 3, TF, sys_listxattr, "llistxattr" }, /* 185 */ +++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 186 */ +++ { 2, TF, sys_removexattr, "removexattr" }, /* 187 */ +++ { 2, TF, sys_removexattr, "lremovexattr" }, /* 188 */ +++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 189 */ +++ { 2, TS, sys_kill, "tkill" }, /* 190 */ +++ { 4, TF, sys_sendfile64, "sendfile64" }, /* 191 */ +++ { 5, 0, sys_futex, "futex" }, /* 192 */ +++ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 193 */ +++ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 194 */ +++ { 2, 0, sys_capget, "capget" }, /* 195 */ +++ { 2, 0, sys_capset, "capset" }, /* 196 */ +++ { 2, 0, sys_io_setup, "io_setup" }, /* 197 */ +++ { 1, 0, sys_io_destroy, "io_destroy" }, /* 198 */ +++ { 5, 0, sys_io_getevents, "io_getevents" }, /* 199 */ +++ { 3, 0, sys_io_submit, "io_submit" }, /* 200 */ +++ { 3, 0, sys_io_cancel, "io_cancel" }, /* 201 */ +++ { 6, 0, sys_fadvise64, "fadvise64" }, /* 202 */ +++ { 1, TP, sys_exit, "exit_group" }, /* 203 */ +++ { 4, 0, printargs, "lookup_dcookie"}, /* 204 */ +++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 205 */ +++ { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 206 */ +++ { 4, 0, sys_epoll_wait, "epoll_wait" }, /* 207 */ +++ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 208 */ +++ { 1, 0, printargs, "set_tid_address"}, /* 209 */ +++ { 3, 0, sys_timer_create, "timer_create" }, /* 210 */ +++ { 4, 0, sys_timer_settime, "timer_settime" }, /* 211 */ +++ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 212 */ +++ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 213 */ +++ { 1, 0, sys_timer_delete, "timer_delete" }, /* 214 */ +++ { 2, 0, sys_clock_settime, "clock_settime" }, /* 215 */ +++ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 216 */ +++ { 2, 0, sys_clock_getres, "clock_getres" }, /* 217 */ +++ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 218 */ +++ { 3, TF, sys_statfs64, "statfs64" }, /* 219 */ +++ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 220 */ +++ { 3, TS, sys_tgkill, "tgkill" }, /* 221 */ +++ { 5, 0, printargs, "SYS_222" }, /* 222 */ +++ { 2, TF, sys_utimes, "utimes" }, /* 223 */ +++ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 224 */ +++ { 3, 0, printargs, "cacheflush" }, /* 225 */ +++ { 0, 0, printargs, "vserver" }, /* 226 */ +++ { 4, 0, sys_mq_open, "mq_open" }, /* 227 */ +++ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 228 */ +++ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 229 */ +++ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 230 */ +++ { 2, 0, sys_mq_notify, "mq_notify" }, /* 231 */ +++ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 232 */ +++ { 4, 0, printargs, "kexec_load" }, /* 233 */ +++ { 1, 0, sys_waitid, "waitid" }, /* 234 */ +++ { 5, 0, printargs, "add_key" }, /* 235 */ +++ { 4, 0, printargs, "request_key" }, /* 236 */ +++ { 5, 0, printargs, "keyctl" }, /* 237 */ +++ { 3, 0, printargs, "ioprio_set" }, /* 238 */ +++ { 2, 0, printargs, "ioprio_get" }, /* 239 */ +++ { 1, 0, printargs, "inotify_init" }, /* 240 */ +++ { 3, 0, sys_inotify_add_watch, "inotify_add_watch" }, /* 241 */ +++ { 2, 0, sys_inotify_rm_watch, "inotify_rm_watch" }, /* 242 */ +++ { 4, 0, sys_openat, "openat" }, /* 243 */ +++ { 3, 0, sys_mkdirat, "mkdirat" }, /* 244 */ +++ { 4, 0, sys_mknodat, "mknodat" }, /* 245 */ +++ { 5, 0, sys_fchownat, "fchownat" }, /* 246 */ +++ { 3, 0, sys_futimesat, "futimesat" }, /* 247 */ +++ { 4, 0, printargs, "fstatat64" }, /* 248 */ +++ { 3, 0, sys_unlinkat, "unlinkat" }, /* 249 */ +++ { 4, 0, sys_renameat, "renameat" }, /* 250 */ +++ { 5, 0, sys_linkat, "linkat" }, /* 251 */ +++ { 3, 0, sys_symlinkat, "symlinkat" }, /* 252 */ +++ { 4, 0, sys_readlinkat, "readlinkat" }, /* 253 */ +++ { 3, 0, sys_fchmodat, "fchmodat" }, /* 254 */ +++ { 3, 0, sys_faccessat, "faccessat" }, /* 255 */ +++ { 6, 0, sys_pselect6, "pselect6" }, /* 256 */ +++ { 5, 0, sys_ppoll, "ppoll" }, /* 257 */ +++ { 1, 0, sys_unshare, "unshare" }, /* 258 */ +++ { 2, 0, printargs, "set_robust_list" }, /* 259 */ +++ { 3, 0, printargs, "get_robust_list" }, /* 260 */ +++ { 6, 0, printargs, "splice" }, /* 261 */ +++ { 4, 0, printargs, "sync_file_range" }, /* 262 */ +++ { 4, 0, printargs, "tee" }, /* 263 */ +++ { 4, 0, printargs, "vmsplice" }, /* 264 */ +++ { 6, 0, printargs, "sys_epoll_pwait" }, /* 265 */ +++ { 2, TI, sys_msgget, "msgget" }, /* 266 */ +++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 267 */ +++ { 5, TI, sys_msgrcv, "msgrcv" }, /* 268 */ +++ { 3, TI, sys_msgctl, "msgctl" }, /* 269 */ +++ { 3, TI, sys_semget, "semget" }, /* 270 */ +++ { 3, TI, sys_semop, "semop" }, /* 271 */ +++ { 4, TI, sys_semctl, "semctl" }, /* 272 */ +++ { 4, TI, sys_semtimedop, "semtimedop" }, /* 273 */ +++ { 3, TI, sys_shmat, "shmat" }, /* 274 */ +++ { 3, TI, sys_shmget, "shmget" }, /* 275 */ +++ { 1, TI, sys_shmdt, "shmdt" }, /* 276 */ +++ { 3, TI, sys_shmctl, "shmctl" }, /* 277 */ ++Index: strace-4.5.16/Makefile.am ++=================================================================== ++--- strace-4.5.16.orig/Makefile.am 2007-07-03 04:07:28.000000000 +0200 +++++ strace-4.5.16/Makefile.am 2008-05-11 15:36:30.000000000 +0200 ++@@ -29,6 +29,7 @@ ++ linux/alpha/errnoent.h linux/alpha/ioctlent.h \ ++ linux/alpha/signalent.h linux/alpha/syscallent.h \ ++ linux/arm/syscallent.h \ +++ linux/avr32/syscallent.h \ ++ linux/hppa/errnoent.h linux/hppa/ioctlent.h \ ++ linux/hppa/signalent.h linux/hppa/syscallent.h \ ++ linux/ia64/syscallent.h linux/ia64/errnoent.h \ ++Index: strace-4.5.16/Makefile.in ++=================================================================== ++--- strace-4.5.16.orig/Makefile.in 2007-08-03 12:24:40.000000000 +0200 +++++ strace-4.5.16/Makefile.in 2008-05-11 15:36:30.000000000 +0200 ++@@ -217,6 +217,7 @@ ++ linux/alpha/errnoent.h linux/alpha/ioctlent.h \ ++ linux/alpha/signalent.h linux/alpha/syscallent.h \ ++ linux/arm/syscallent.h \ +++ linux/avr32/syscallent.h \ ++ linux/hppa/errnoent.h linux/hppa/ioctlent.h \ ++ linux/hppa/signalent.h linux/hppa/syscallent.h \ ++ linux/ia64/syscallent.h linux/ia64/errnoent.h \ ++Index: strace-4.5.16/process.c ++=================================================================== ++--- strace-4.5.16.orig/process.c 2007-08-02 04:13:05.000000000 +0200 +++++ strace-4.5.16/process.c 2008-05-11 15:36:30.000000000 +0200 ++@@ -714,6 +714,10 @@ ++ return -1; ++ ++ return 0; +++#elif defined(AVR32) +++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_R8), new) < 0) +++ return -1; +++ return 0; ++ #else ++ #warning Do not know how to handle change_syscall for this architecture ++ #endif /* architecture */ ++@@ -794,6 +798,28 @@ ++ if (errno) ++ return -1; ++ } +++#elif defined(AVR32) +++ { +++ errno = 0; +++ if (argnum == 0) +++ ptrace(PTRACE_POKEUSER, tcp->pid, +++ (char *)(REG_R12_ORIG), +++ tcp->u_arg[argnum]); +++ else if (argnum < 4) +++ /* r11 .. r9 */ +++ ptrace(PTRACE_POKEUSER, tcp->pid, +++ (char *)(REG_R12 - 4 * argnum), +++ tcp->u_arg[argnum]); +++ else if (argnum < 6) +++ /* r6 .. r5 */ +++ ptrace(PTRACE_POKEUSER, tcp->pid, +++ (char *)(REG_R10 - 4 * argnum), +++ tcp->u_arg[argnum]); +++ else +++ return -E2BIG; +++ if (errno) +++ return -1; +++ } ++ #else ++ # warning Sorry, setargs not implemented for this architecture. ++ #endif ++@@ -2888,8 +2914,27 @@ ++ { uoff(regs.ARM_pc), "pc" }, ++ { uoff(regs.ARM_cpsr), "cpsr" }, ++ #endif ++- ++-#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) +++#ifdef AVR32 +++ { uoff(regs.sr), "sr" }, +++ { uoff(regs.pc), "pc" }, +++ { uoff(regs.lr), "lr" }, +++ { uoff(regs.sp), "sp" }, +++ { uoff(regs.r12), "r12" }, +++ { uoff(regs.r11), "r11" }, +++ { uoff(regs.r10), "r10" }, +++ { uoff(regs.r9), "r9" }, +++ { uoff(regs.r8), "r8" }, +++ { uoff(regs.r7), "r7" }, +++ { uoff(regs.r6), "r6" }, +++ { uoff(regs.r5), "r5" }, +++ { uoff(regs.r4), "r4" }, +++ { uoff(regs.r3), "r3" }, +++ { uoff(regs.r2), "r2" }, +++ { uoff(regs.r1), "r1" }, +++ { uoff(regs.r0), "r0" }, +++ { uoff(regs.r12_orig), "orig_r12" }, +++#endif +++#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, ++ #endif ++ #if defined(I386) || defined(X86_64) ++@@ -2905,20 +2950,20 @@ ++ #if !defined(SPARC64) ++ { uoff(start_code), "offsetof(struct user, start_code)" }, ++ #endif ++-#ifdef SH64 +++#if defined(SH64) || defined(AVR32) ++ { uoff(start_data), "offsetof(struct user, start_data)" }, ++ #endif ++ #if !defined(SPARC64) ++ { uoff(start_stack), "offsetof(struct user, start_stack)" }, ++ #endif ++ { uoff(signal), "offsetof(struct user, signal)" }, ++-#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) +++#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(reserved), "offsetof(struct user, reserved)" }, ++ #endif ++ #if !defined(SPARC64) ++ { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, ++ #endif ++-#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) +++#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" }, ++ #endif ++ { uoff(magic), "offsetof(struct user, magic)" }, ++Index: strace-4.5.16/syscall.c ++=================================================================== ++--- strace-4.5.16.orig/syscall.c 2008-05-11 15:36:09.000000000 +0200 +++++ strace-4.5.16/syscall.c 2008-05-11 15:36:30.000000000 +0200 ++@@ -809,6 +809,8 @@ ++ static long r9; ++ #elif defined(X86_64) ++ static long rax; +++#elif defined(AVR32) +++ static struct pt_regs regs; ++ #endif ++ #endif /* LINUX */ ++ #ifdef FREEBSD ++@@ -1273,7 +1275,26 @@ ++ return 0; ++ } ++ } ++-#endif /* SH64 */ +++#elif defined(AVR32) +++ /* +++ * Read complete register set in one go. +++ */ +++ if (ptrace(PTRACE_GETREGS, pid, NULL, ®s) < 0) +++ return -1; +++ +++ /* +++ * We only need to grab the syscall number on syscall entry. +++ */ +++ if (!(tcp->flags & TCB_INSYSCALL)) { +++ scno = regs.r8; +++ +++ /* Check if we return from execve. */ +++ if (tcp->flags & TCB_WAITEXECVE) { +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ } +++#endif /* AVR32 */ ++ #endif /* LINUX */ ++ #ifdef SUNOS4 ++ if (upeek(pid, uoff(u_arg[7]), &scno) < 0) ++@@ -1632,6 +1653,17 @@ ++ tcp->u_rval = r9; ++ u_error = 0; ++ } +++#else +++#ifdef AVR32 +++ if (regs.r12 && (unsigned) -regs.r12 < nerrnos) { +++ tcp->u_rval = -1; +++ u_error = -regs.r12; +++ } +++ else { +++ tcp->u_rval = regs.r12; +++ u_error = 0; +++ } +++#endif /* AVR32 */ ++ #endif /* SH64 */ ++ #endif /* SH */ ++ #endif /* HPPA */ ++@@ -1857,6 +1889,12 @@ ++ r9 = error ? -error : rval; ++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_GENERAL(9), r9) < 0) ++ return -1; +++#else +++#ifdef AVR32 +++ regs.r12 = error ? -error : rval; +++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)REG_R12, regs.r12) < 0) +++ return -1; +++#endif /* AVR32 */ ++ #endif /* SH64 */ ++ #endif /* SH */ ++ #endif /* HPPA */ ++@@ -2129,6 +2167,14 @@ ++ return -1; ++ } ++ } +++#elif defined(AVR32) +++ tcp->u_nargs = sysent[tcp->scno].nargs; +++ tcp->u_arg[0] = regs.r12; +++ tcp->u_arg[1] = regs.r11; +++ tcp->u_arg[2] = regs.r10; +++ tcp->u_arg[3] = regs.r9; +++ tcp->u_arg[4] = regs.r5; +++ tcp->u_arg[5] = regs.r3; ++ #else /* Other architecture (like i386) (32bits specific) */ ++ { ++ int i; ++@@ -2391,7 +2437,7 @@ ++ ++ switch (known_scno(tcp)) { ++ #ifdef LINUX ++-#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) +++#if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) && !defined(AVR32) ++ #ifdef __NR_socketcall ++ case SYS_socketcall: ++ decode_subcall(tcp, SYS_socket_subcall, ++@@ -2404,7 +2450,7 @@ ++ SYS_ipc_nsubcalls, shift_style); ++ break; ++ #endif ++-#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */ +++#endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA && !AVR32 */ ++ #if defined (SPARC) || defined (SPARC64) ++ case SYS_socketcall: ++ sparc_socket_decode (tcp); ++Index: strace-4.5.16/util.c ++=================================================================== ++--- strace-4.5.16.orig/util.c 2007-08-02 04:22:06.000000000 +0200 +++++ strace-4.5.16/util.c 2008-05-11 15:36:30.000000000 +0200 ++@@ -1076,6 +1076,9 @@ ++ #elif defined(SH64) ++ if (upeek(tcp->pid, REG_PC ,&pc) < 0) ++ return -1; +++#elif defined(AVR32) +++ if (upeek(tcp->pid, REG_PC, &pc) < 0) +++ return -1; ++ #endif ++ return pc; ++ #endif /* LINUX */ ++@@ -1224,6 +1227,14 @@ ++ return; ++ } ++ tprintf("[%08lx] ", pc); +++#elif defined(AVR32) +++ long pc; +++ +++ if (upeek(tcp->pid, REG_PC, &pc) < 0) { +++ tprintf("[????????] "); +++ return; +++ } +++ tprintf("[%08lx] ", pc); ++ #endif /* !architecture */ ++ #endif /* LINUX */ ++ ++@@ -1405,6 +1416,9 @@ ++ # define arg0_offset (REG_OFFSET+16) ++ # define arg1_offset (REG_OFFSET+24) ++ # define restore_arg0(tcp, state, val) 0 +++# elif defined (AVR32) +++# define arg0_offset (REG_R12) +++# define arg1_offset (REG_R11) ++ # else ++ # define arg0_offset 0 ++ # define arg1_offset 4 +diff --git a/feeds/packages/utils/strace/patches-4.5.16/004-mips64_support.patch b/feeds/packages/utils/strace/patches-4.5.16/004-mips64_support.patch +new file mode 100644 +index 0000000..f582054 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/004-mips64_support.patch +@@ -0,0 +1,3342 @@ ++2007-08-26 Daniel Jacobowitz ++ ++ * defs.h: Include . ++ (MAX_QUALS): Update for MIPS. ++ (LINUX_MIPSO32, LINUX_MIPSN32, LINUX_MIPSN64, LINUX_MIPS64): Define. ++ (struct tcb): Add ext_arg for MIPS N32. ++ (TCB_WAITEXECVE): Define for MIPS. ++ (ALIGN64): Use LINUX_MIPSO32. ++ * file.c (sys_lseek): Use ext_arg for MIPS N32. ++ (sys_readahead, sys_fadvise64_64): Likewise. ++ * io.c (sys_pread64, sys_pwrite64): Likewise. ++ * mem.c (print_mmap): Take OFFSET argument. ++ (sys_old_mmap): Update call to print_mmap. ++ (sys_mmap): Use ext_arg for MIPS N32. ++ * process.c (struct_user_offsets): Add MIPS registers. ++ * signal.c (sys_sigreturn): Handle MIPS N32 and MIPS N64. Correct ++ MIPS O32 call to sprintsigmask. ++ * syscall.c (internal_syscall): Handle MIPS N32. Check for ++ TCB_WAITEXECVE on MIPS. ++ (force_result): Add a comment about MIPS N32. ++ (syscall_enter): Handle MIPS N32 and MIPS N64. ++ * linux/syscall.h (sys_pread64, sys_pwrite64): Declare. ++ * linux/mips/syscallent.h: Include "dummy.h". Handle alternate ++ MIPS ABIs. ++ ++Index: defs.h ++=================================================================== ++RCS file: /cvsroot/strace/strace/defs.h,v ++retrieving revision 1.75 ++diff -u -p -r1.75 defs.h ++--- strace/defs.h 24 Jul 2007 01:57:11 -0000 1.75 +++++ strace/defs.h 26 Aug 2007 19:13:45 -0000 ++@@ -33,6 +33,10 @@ ++ #include "config.h" ++ #endif ++ +++#ifdef MIPS +++#include +++#endif +++ ++ #ifdef linux ++ #include ++ #endif ++@@ -47,7 +51,7 @@ ++ /* configuration section */ ++ #ifndef MAX_QUALS ++ #if defined(LINUX) && defined(MIPS) ++-#define MAX_QUALS 5000 /* maximum number of syscalls, signals, etc. */ +++#define MAX_QUALS 7000 /* maximum number of syscalls, signals, etc. */ ++ #else ++ #define MAX_QUALS 2048 /* maximum number of syscalls, signals, etc. */ ++ #endif ++@@ -97,6 +101,17 @@ ++ # if defined(AVR32) ++ # define LINUX_AVR32 ++ # endif +++# if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI32 +++# define LINUX_MIPSO32 +++# endif +++# if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_NABI32 +++# define LINUX_MIPSN32 +++# define LINUX_MIPS64 +++# endif +++# if defined(MIPS) && _MIPS_SIM == _MIPS_SIM_ABI64 +++# define LINUX_MIPSN64 +++# define LINUX_MIPS64 +++# endif ++ #endif ++ ++ #if defined(SVR4) || defined(FREEBSD) ++@@ -277,6 +292,9 @@ struct tcb { ++ long scno; /* System call number */ ++ int u_nargs; /* System call arguments */ ++ long u_arg[MAX_ARGS]; /* System call arguments */ +++#if defined (LINUX_MIPSN32) +++ long long ext_arg[MAX_ARGS]; /* System call arguments */ +++#endif ++ int u_error; /* Error code */ ++ long u_rval; /* (first) return value */ ++ #ifdef HAVE_LONG_LONG ++@@ -330,7 +348,7 @@ struct tcb { ++ #define TCB_FOLLOWFORK 00400 /* Process should have forks followed */ ++ #define TCB_REPRINT 01000 /* We should reprint this syscall on exit */ ++ #ifdef LINUX ++-# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(AVR32) +++# if defined(ALPHA) || defined(SPARC) || defined(SPARC64) || defined(POWERPC) || defined(IA64) || defined(HPPA) || defined(SH) || defined(SH64) || defined(S390) || defined(S390X) || defined(ARM) || defined(MIPS) ++ # define TCB_WAITEXECVE 02000 /* ignore SIGTRAP after exceve */ ++ # endif ++ # define TCB_CLONE_DETACHED 04000 /* CLONE_DETACHED set in creating syscall */ ++@@ -594,7 +612,7 @@ extern const int nsignals2; ++ ++ #if defined(FREEBSD) || (defined(LINUX) \ ++ && defined(POWERPC) && !defined(__powerpc64__)) \ ++- || (defined (LINUX) && defined (MIPS) && !defined(__mips64)) +++ || defined (LINUX_MIPSO32) ++ /* ARRGH! off_t args are aligned on 64 bit boundaries! */ ++ #define ALIGN64(tcp,arg) \ ++ do { \ ++Index: file.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/file.c,v ++retrieving revision 1.87 ++diff -u -p -r1.87 file.c ++--- strace/file.c 7 Aug 2007 01:22:49 -0000 1.87 +++++ strace/file.c 26 Aug 2007 19:13:46 -0000 ++@@ -494,6 +494,27 @@ static const struct xlat whence[] = { ++ }; ++ ++ #ifndef HAVE_LONG_LONG_OFF_T +++#if defined (LINUX_MIPSN32) +++int +++sys_lseek(tcp) +++struct tcb *tcp; +++{ +++ long long offset; +++ int _whence; +++ +++ if (entering(tcp)) { +++ tprintf("%ld, ", tcp->u_arg[0]); +++ offset = tcp->ext_arg[1]; +++ _whence = tcp->u_arg[2]; +++ if (_whence == SEEK_SET) +++ tprintf("%llu, ", offset); +++ else +++ tprintf("%lld, ", offset); +++ printxval(whence, _whence, "SEEK_???"); +++ } +++ return RVAL_UDECIMAL; +++} +++#else /* !LINUX_MIPSN32 */ ++ int ++ sys_lseek(tcp) ++ struct tcb *tcp; ++@@ -513,6 +534,7 @@ struct tcb *tcp; ++ } ++ return RVAL_UDECIMAL; ++ } +++#endif /* LINUX_MIPSN32 */ ++ #endif ++ ++ #ifdef LINUX ++@@ -552,7 +574,9 @@ struct tcb *tcp; ++ { ++ if (entering(tcp)) { ++ tprintf("%ld, %lld, %ld", tcp->u_arg[0], ++-# if defined IA64 || defined X86_64 || defined ALPHA +++# if defined LINUX_MIPSN32 +++ tcp->ext_arg[1], tcp->u_arg[2] +++# elif defined IA64 || defined X86_64 || defined ALPHA || defined LINUX_MIPSN64 ++ (long long int) tcp->u_arg[1], tcp->u_arg[2] ++ # else ++ LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]), tcp->u_arg[3] ++@@ -2822,7 +2846,10 @@ struct tcb *tcp; ++ if (entering(tcp)) { ++ tprintf("%ld, %lld, %lld, ", ++ tcp->u_arg[0], ++-# if defined IA64 || defined X86_64 || defined ALPHA +++#if defined LINUX_MIPSN32 +++ tcp->ext_arg[1], tcp->ext_arg[2]); +++ printxval(advise, tcp->u_arg[3], "POSIX_FADV_???"); +++#elif defined IA64 || defined X86_64 || defined ALPHA || defined LINUX_MIPSN64 ++ (long long int) tcp->u_arg[1], (long long int) tcp->u_arg[2]); ++ printxval(advise, tcp->u_arg[3], "POSIX_FADV_???"); ++ #else ++Index: io.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/io.c,v ++retrieving revision 1.21 ++diff -u -p -r1.21 io.c ++--- strace/io.c 13 Dec 2006 17:08:08 -0000 1.21 +++++ strace/io.c 26 Aug 2007 19:13:46 -0000 ++@@ -360,8 +360,12 @@ struct tcb *tcp; ++ tprintf("%#lx", tcp->u_arg[1]); ++ else ++ printstr(tcp, tcp->u_arg[1], tcp->u_rval); +++#ifdef MIPS_LINUXN32 +++ tprintf(", %lu, %#llx", tcp->u_arg[2], tcp->ext_arg[3]); +++#else ++ tprintf(", %lu, %#llx", tcp->u_arg[2], ++ LONG_LONG(tcp->u_arg[3], tcp->u_arg[4])); +++#endif ++ } ++ return 0; ++ } ++@@ -374,8 +378,12 @@ struct tcb *tcp; ++ ALIGN64 (tcp, 3); ++ tprintf("%ld, ", tcp->u_arg[0]); ++ printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]); +++#ifdef MIPS_LINUXN32 +++ tprintf(", %lu, %#llx", tcp->u_arg[2], tcp->ext_arg[3]); +++#else ++ tprintf(", %lu, %#llx", tcp->u_arg[2], ++ LONG_LONG(tcp->u_arg[3], tcp->u_arg[4])); +++#endif ++ } ++ return 0; ++ } ++Index: mem.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/mem.c,v ++retrieving revision 1.40 ++diff -u -p -r1.40 mem.c ++--- strace/mem.c 24 Jul 2007 01:52:58 -0000 1.40 +++++ strace/mem.c 26 Aug 2007 19:13:46 -0000 ++@@ -191,9 +191,10 @@ static const struct xlat mmap_flags[] = ++ #if !HAVE_LONG_LONG_OFF_T ++ static ++ int ++-print_mmap(tcp,u_arg) +++print_mmap(tcp,u_arg, offset) ++ struct tcb *tcp; ++ long *u_arg; +++long long offset; ++ { ++ if (entering(tcp)) { ++ /* addr */ ++@@ -216,7 +217,7 @@ long *u_arg; ++ /* fd (is always int, not long) */ ++ tprintf(", %d, ", (int)u_arg[4]); ++ /* offset */ ++- tprintf("%#lx", u_arg[5]); +++ tprintf("%#llx", offset); ++ } ++ return RVAL_HEX; ++ } ++@@ -265,7 +266,7 @@ struct tcb *tcp; ++ if (umoven(tcp, tcp->u_arg[0], sizeof u_arg, (char *) u_arg) == -1) ++ return 0; ++ #endif // defined(IA64) ++- return print_mmap(tcp, u_arg); +++ return print_mmap(tcp, u_arg, u_arg[5]); ++ ++ } ++ #endif ++@@ -274,6 +275,8 @@ int ++ sys_mmap(tcp) ++ struct tcb *tcp; ++ { +++ long long offset = tcp->u_arg[5]; +++ ++ #if defined(LINUX) && defined(SH64) ++ /* ++ * Old mmap differs from new mmap in specifying the ++@@ -281,9 +284,12 @@ struct tcb *tcp; ++ * pretend it's in byte units so the user only ever ++ * sees bytes in the printout. ++ */ ++- tcp->u_arg[5] <<= PAGE_SHIFT; +++ offset <<= PAGE_SHIFT; +++#endif +++#if defined(LINUX_MIPSN32) +++ offset = tcp->ext_arg[5]; ++ #endif ++- return print_mmap(tcp, tcp->u_arg); +++ return print_mmap(tcp, tcp->u_arg, offset); ++ } ++ #endif /* !HAVE_LONG_LONG_OFF_T */ ++ ++Index: process.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/process.c,v ++retrieving revision 1.107 ++diff -u -p -r1.107 process.c ++--- strace/process.c 2 Aug 2007 02:13:05 -0000 1.107 +++++ strace/process.c 26 Aug 2007 19:13:47 -0000 ++@@ -2934,6 +2934,79 @@ const struct xlat struct_user_offsets[] ++ { uoff(regs.r0), "r0" }, ++ { uoff(regs.r12_orig), "orig_r12" }, ++ #endif +++#ifdef MIPS +++ { 0, "r0" }, +++ { 1, "r1" }, +++ { 2, "r2" }, +++ { 3, "r3" }, +++ { 4, "r4" }, +++ { 5, "r5" }, +++ { 6, "r6" }, +++ { 7, "r7" }, +++ { 8, "r8" }, +++ { 9, "r9" }, +++ { 10, "r10" }, +++ { 11, "r11" }, +++ { 12, "r12" }, +++ { 13, "r13" }, +++ { 14, "r14" }, +++ { 15, "r15" }, +++ { 16, "r16" }, +++ { 17, "r17" }, +++ { 18, "r18" }, +++ { 19, "r19" }, +++ { 20, "r20" }, +++ { 21, "r21" }, +++ { 22, "r22" }, +++ { 23, "r23" }, +++ { 24, "r24" }, +++ { 25, "r25" }, +++ { 26, "r26" }, +++ { 27, "r27" }, +++ { 28, "r28" }, +++ { 29, "r29" }, +++ { 30, "r30" }, +++ { 31, "r31" }, +++ { 32, "f0" }, +++ { 33, "f1" }, +++ { 34, "f2" }, +++ { 35, "f3" }, +++ { 36, "f4" }, +++ { 37, "f5" }, +++ { 38, "f6" }, +++ { 39, "f7" }, +++ { 40, "f8" }, +++ { 41, "f9" }, +++ { 42, "f10" }, +++ { 43, "f11" }, +++ { 44, "f12" }, +++ { 45, "f13" }, +++ { 46, "f14" }, +++ { 47, "f15" }, +++ { 48, "f16" }, +++ { 49, "f17" }, +++ { 50, "f18" }, +++ { 51, "f19" }, +++ { 52, "f20" }, +++ { 53, "f21" }, +++ { 54, "f22" }, +++ { 55, "f23" }, +++ { 56, "f24" }, +++ { 57, "f25" }, +++ { 58, "f26" }, +++ { 59, "f27" }, +++ { 60, "f28" }, +++ { 61, "f29" }, +++ { 62, "f30" }, +++ { 63, "f31" }, +++ { 64, "pc" }, +++ { 65, "cause" }, +++ { 66, "badvaddr" }, +++ { 67, "mmhi" }, +++ { 68, "mmlo" }, +++ { 69, "fpcsr" }, +++ { 70, "fpeir" }, +++#endif ++ #if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, ++ #endif ++Index: signal.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/signal.c,v ++retrieving revision 1.61 ++diff -u -p -r1.61 signal.c ++--- strace/signal.c 2 Aug 2007 01:15:59 -0000 1.61 +++++ strace/signal.c 26 Aug 2007 19:13:47 -0000 ++@@ -1424,6 +1424,32 @@ struct tcb *tcp; ++ } ++ return 0; ++ #else +++#if defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64) +++ /* This decodes rt_sigreturn. The 64-bit ABIs do not have +++ sigreturn. */ +++ long sp; +++ struct ucontext uc; +++ +++ if(entering(tcp)) { +++ tcp->u_arg[0] = 0; +++ if (upeek(tcp->pid, REG_SP, &sp) < 0) +++ return 0; +++ /* There are six words followed by a 128-byte siginfo. */ +++ sp = sp + 6 * 4 + 128; +++ if (umove(tcp, sp, &uc) < 0) +++ return 0; +++ tcp->u_arg[0] = 1; +++ tcp->u_arg[1] = *(long *) &uc.uc_sigmask; +++ } else { +++ tcp->u_rval = tcp->u_error = 0; +++ if(tcp->u_arg[0] == 0) +++ return 0; +++ tcp->auxstr = sprintsigmask("mask now ", +++ (sigset_t *) &tcp->u_arg[1], 0); +++ return RVAL_NONE | RVAL_STR; +++ } +++ return 0; +++#else ++ #ifdef MIPS ++ long sp; ++ struct sigcontext sc; ++@@ -1444,7 +1470,8 @@ struct tcb *tcp; ++ tcp->u_rval = tcp->u_error = 0; ++ if(tcp->u_arg[0] == 0) ++ return 0; ++- tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1], 0); +++ tcp->auxstr = sprintsigmask("mask now ", +++ (sigset_t *) &tcp->u_arg[1], 0); ++ return RVAL_NONE | RVAL_STR; ++ } ++ return 0; ++@@ -1453,6 +1480,7 @@ struct tcb *tcp; ++ #warning (no problem, just a reminder :-) ++ return 0; ++ #endif /* MIPS */ +++#endif /* LINUX_MIPSN32 || LINUX_MIPSN64 */ ++ #endif /* SPARC || SPARC64 */ ++ #endif /* ALPHA */ ++ #endif /* !M68K */ ++Index: syscall.c ++=================================================================== ++RCS file: /cvsroot/strace/strace/syscall.c,v ++retrieving revision 1.89 ++diff -u -p -r1.89 syscall.c ++--- strace/syscall.c 22 Aug 2007 21:43:30 -0000 1.89 +++++ strace/syscall.c 26 Aug 2007 19:13:48 -0000 ++@@ -798,6 +798,9 @@ internal_syscall(struct tcb *tcp) ++ #elif defined (SPARC) || defined (SPARC64) ++ static struct regs regs; ++ static unsigned long trap; +++#elif defined(LINUX_MIPSN32) +++ static long long a3; +++ static long long r2; ++ #elif defined(MIPS) ++ static long a3; ++ static long r2; ++@@ -1102,14 +1105,44 @@ struct tcb *tcp; ++ #elif defined (M68K) ++ if (upeek(pid, 4*PT_ORIG_D0, &scno) < 0) ++ return -1; +++#elif defined (LINUX_MIPSN32) +++ unsigned long long regs[38]; +++ +++ if (ptrace (PTRACE_GETREGS, pid, NULL, (long) ®s) < 0) +++ return -1; +++ a3 = regs[REG_A3]; +++ r2 = regs[REG_V0]; +++ +++ if(!(tcp->flags & TCB_INSYSCALL)) { +++ scno = r2; +++ +++ /* Check if we return from execve. */ +++ if (scno == 0 && tcp->flags & TCB_WAITEXECVE) { +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ +++ if (scno < 0 || scno > nsyscalls) { +++ if(a3 == 0 || a3 == -1) { +++ if(debug) +++ fprintf (stderr, "stray syscall exit: v0 = %ld\n", scno); +++ return 0; +++ } +++ } +++ } ++ #elif defined (MIPS) ++ if (upeek(pid, REG_A3, &a3) < 0) ++ return -1; ++- ++ if(!(tcp->flags & TCB_INSYSCALL)) { ++ if (upeek(pid, REG_V0, &scno) < 0) ++ return -1; ++ +++ /* Check if we return from execve. */ +++ if (scno == 0 && tcp->flags & TCB_WAITEXECVE) { +++ tcp->flags &= ~TCB_WAITEXECVE; +++ return 0; +++ } +++ ++ if (scno < 0 || scno > nsyscalls) { ++ if(a3 == 0 || a3 == -1) { ++ if(debug) ++@@ -1768,6 +1801,7 @@ force_result(tcp, error, rval) ++ r2 = rval; ++ a3 = 0; ++ } +++ /* PTRACE_POKEUSER is OK even for n32 since rval is only a long. */ ++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_A3), a3) < 0 || ++ ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_V0), r2) < 0) ++ return -1; ++@@ -1993,6 +2027,27 @@ struct tcb *tcp; ++ tcp->u_nargs = 5; ++ } ++ } +++#elif defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64) +++ /* N32 and N64 both use up to six registers. */ +++ { +++ unsigned long long regs[38]; +++ int i, nargs; +++ +++ if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1) +++ nargs = tcp->u_nargs = sysent[tcp->scno].nargs; +++ else +++ nargs = tcp->u_nargs = MAX_ARGS; +++ +++ if (ptrace (PTRACE_GETREGS, pid, NULL, (long) ®s) < 0) +++ return -1; +++ +++ for(i = 0; i < nargs; i++) { +++ tcp->u_arg[i] = regs[REG_A0 + i]; +++# if defined (LINUX_MIPSN32) +++ tcp->ext_arg[i] = regs[REG_A0 + i]; +++# endif +++ } +++ } ++ #elif defined (MIPS) ++ { ++ long sp; ++Index: linux/syscall.h ++=================================================================== ++RCS file: /cvsroot/strace/strace/linux/syscall.h,v ++retrieving revision 1.55 ++diff -u -p -r1.55 syscall.h ++--- strace/linux/syscall.h 2 Aug 2007 01:37:55 -0000 1.55 +++++ strace/linux/syscall.h 26 Aug 2007 19:13:48 -0000 ++@@ -317,3 +317,5 @@ int sys_capget(), sys_capset(); ++ #ifdef M68K ++ int sys_cacheflush(); ++ #endif +++ +++int sys_pread64(), sys_pwrite64(); ++Index: linux/mips/syscallent.h ++=================================================================== ++RCS file: /cvsroot/strace/strace/linux/mips/syscallent.h,v ++retrieving revision 1.28 ++diff -u -p -r1.28 syscallent.h ++--- strace/linux/mips/syscallent.h 2 Aug 2007 01:44:14 -0000 1.28 +++++ strace/linux/mips/syscallent.h 26 Aug 2007 19:13:51 -0000 ++@@ -1,3 +1,5 @@ +++#include "dummy.h" +++ ++ { 0, 0, printargs, "svr4_syscall" }, /* 000 */ ++ { 0, 0, printargs, "svr4_exit" }, /* 001 */ ++ { 0, 0, printargs, "svr4_fork" }, /* 002 */ ++@@ -3998,6 +4000,8 @@ ++ { 0, 0, printargs, "SYS_3997" }, /* 3997 */ ++ { 0, 0, printargs, "SYS_3998" }, /* 3998 */ ++ { 0, 0, printargs, "SYS_3999" }, /* 3999 */ /* end of POSIX */ +++#if !defined (LINUX_MIPSN32) && !defined (LINUX_MIPSN64) +++ /* For an O32 strace, decode the o32 syscalls. */ ++ { 8, 0, printargs, "syscall" }, /* 4000 */ /* start of Linux o32 */ ++ { 1, TP, sys_exit, "exit" }, /* 4001 */ ++ { 0, TP, sys_fork, "fork" }, /* 4002 */ ++@@ -4161,8 +4165,8 @@ ++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 4160 */ ++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 4161 */ ++ { 0, 0, sys_sched_yield, "sched_yield" }, /* 4162 */ ++- { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max" }, /* 4163 */ ++- { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min" }, /* 4164 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 4163 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 4164 */ ++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 4165 */ ++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 4166 */ ++ { 4, 0, sys_mremap, "mremap" }, /* 4167 */ ++@@ -4318,6 +4322,328 @@ ++ { 3, TD|TS, sys_signalfd, "signalfd" }, /* 4317 */ ++ { 4, TD, sys_timerfd, "timerfd" }, /* 4318 */ ++ { 1, TD, sys_eventfd, "eventfd" }, /* 4319 */ +++#else +++ { 0, 0, printargs, "o32_syscall" }, /* 4000 */ +++ { 0, 0, printargs, "o32_exit" }, /* 4001 */ +++ { 0, 0, printargs, "o32_fork" }, /* 4002 */ +++ { 0, 0, printargs, "o32_read" }, /* 4003 */ +++ { 0, 0, printargs, "o32_write" }, /* 4004 */ +++ { 0, 0, printargs, "o32_open" }, /* 4005 */ +++ { 0, 0, printargs, "o32_close" }, /* 4006 */ +++ { 0, 0, printargs, "o32_waitpid" }, /* 4007 */ +++ { 0, 0, printargs, "o32_creat" }, /* 4008 */ +++ { 0, 0, printargs, "o32_link" }, /* 4009 */ +++ { 0, 0, printargs, "o32_unlink" }, /* 4010 */ +++ { 0, 0, printargs, "o32_execve" }, /* 4011 */ +++ { 0, 0, printargs, "o32_chdir" }, /* 4012 */ +++ { 0, 0, printargs, "o32_time" }, /* 4013 */ +++ { 0, 0, printargs, "o32_mknod" }, /* 4014 */ +++ { 0, 0, printargs, "o32_chmod" }, /* 4015 */ +++ { 0, 0, printargs, "o32_lchown" }, /* 4016 */ +++ { 0, 0, printargs, "o32_break" }, /* 4017 */ +++ { 0, 0, printargs, "o32_oldstat" }, /* 4018 */ +++ { 0, 0, printargs, "o32_lseek" }, /* 4019 */ +++ { 0, 0, printargs, "o32_getpid" }, /* 4020 */ +++ { 0, 0, printargs, "o32_mount" }, /* 4021 */ +++ { 0, 0, printargs, "o32_oldumount" }, /* 4022 */ +++ { 0, 0, printargs, "o32_setuid" }, /* 4023 */ +++ { 0, 0, printargs, "o32_getuid" }, /* 4024 */ +++ { 0, 0, printargs, "o32_stime" }, /* 4025 */ +++ { 0, 0, printargs, "o32_ptrace" }, /* 4026 */ +++ { 0, 0, printargs, "o32_alarm" }, /* 4027 */ +++ { 0, 0, printargs, "o32_oldfstat" }, /* 4028 */ +++ { 0, 0, printargs, "o32_pause" }, /* 4029 */ +++ { 0, 0, printargs, "o32_utime" }, /* 4030 */ +++ { 0, 0, printargs, "o32_stty" }, /* 4031 */ +++ { 0, 0, printargs, "o32_gtty" }, /* 4032 */ +++ { 0, 0, printargs, "o32_access" }, /* 4033 */ +++ { 0, 0, printargs, "o32_nice" }, /* 4034 */ +++ { 0, 0, printargs, "o32_ftime" }, /* 4035 */ +++ { 0, 0, printargs, "o32_sync" }, /* 4036 */ +++ { 0, 0, printargs, "o32_kill" }, /* 4037 */ +++ { 0, 0, printargs, "o32_rename" }, /* 4038 */ +++ { 0, 0, printargs, "o32_mkdir" }, /* 4039 */ +++ { 0, 0, printargs, "o32_rmdir" }, /* 4040 */ +++ { 0, 0, printargs, "o32_dup" }, /* 4041 */ +++ { 0, 0, printargs, "o32_pipe" }, /* 4042 */ +++ { 0, 0, printargs, "o32_times" }, /* 4043 */ +++ { 0, 0, printargs, "o32_prof" }, /* 4044 */ +++ { 0, 0, printargs, "o32_brk" }, /* 4045 */ +++ { 0, 0, printargs, "o32_setgid" }, /* 4046 */ +++ { 0, 0, printargs, "o32_getgid" }, /* 4047 */ +++ { 0, 0, printargs, "o32_signal" }, /* 4048 */ +++ { 0, 0, printargs, "o32_geteuid" }, /* 4049 */ +++ { 0, 0, printargs, "o32_getegid" }, /* 4050 */ +++ { 0, 0, printargs, "o32_acct" }, /* 4051 */ +++ { 0, 0, printargs, "o32_umount" }, /* 4052 */ +++ { 0, 0, printargs, "o32_lock" }, /* 4053 */ +++ { 0, 0, printargs, "o32_ioctl" }, /* 4054 */ +++ { 0, 0, printargs, "o32_fcntl" }, /* 4055 */ +++ { 0, 0, printargs, "o32_mpx" }, /* 4056 */ +++ { 0, 0, printargs, "o32_setpgid" }, /* 4057 */ +++ { 0, 0, printargs, "o32_ulimit" }, /* 4058 */ +++ { 0, 0, printargs, "o32_oldolduname" }, /* 4059 */ +++ { 0, 0, printargs, "o32_umask" }, /* 4060 */ +++ { 0, 0, printargs, "o32_chroot" }, /* 4061 */ +++ { 0, 0, printargs, "o32_ustat" }, /* 4062 */ +++ { 0, 0, printargs, "o32_dup2" }, /* 4063 */ +++ { 0, 0, printargs, "o32_getppid" }, /* 4064 */ +++ { 0, 0, printargs, "o32_getpgrp" }, /* 4065 */ +++ { 0, 0, printargs, "o32_setsid" }, /* 4066 */ +++ { 0, 0, printargs, "o32_sigaction" }, /* 4067 */ +++ { 0, 0, printargs, "o32_siggetmask" }, /* 4068 */ +++ { 0, 0, printargs, "o32_sigsetmask" }, /* 4069 */ +++ { 0, 0, printargs, "o32_setreuid" }, /* 4070 */ +++ { 0, 0, printargs, "o32_setregid" }, /* 4071 */ +++ { 0, 0, printargs, "o32_sigsuspend" }, /* 4072 */ +++ { 0, 0, printargs, "o32_sigpending" }, /* 4073 */ +++ { 0, 0, printargs, "o32_sethostname" }, /* 4074 */ +++ { 0, 0, printargs, "o32_setrlimit" }, /* 4075 */ +++ { 0, 0, printargs, "o32_getrlimit" }, /* 4076 */ +++ { 0, 0, printargs, "o32_getrusage" }, /* 4077 */ +++ { 0, 0, printargs, "o32_gettimeofday" }, /* 4078 */ +++ { 0, 0, printargs, "o32_settimeofday" }, /* 4079 */ +++ { 0, 0, printargs, "o32_getgroups" }, /* 4080 */ +++ { 0, 0, printargs, "o32_setgroups" }, /* 4081 */ +++ { 0, 0, printargs, "o32_reserved82" }, /* 4082 */ +++ { 0, 0, printargs, "o32_symlink" }, /* 4083 */ +++ { 0, 0, printargs, "o32_oldlstat" }, /* 4084 */ +++ { 0, 0, printargs, "o32_readlink" }, /* 4085 */ +++ { 0, 0, printargs, "o32_uselib" }, /* 4086 */ +++ { 0, 0, printargs, "o32_swapon" }, /* 4087 */ +++ { 0, 0, printargs, "o32_reboot" }, /* 4088 */ +++ { 0, 0, printargs, "o32_readdir" }, /* 4089 */ +++ { 0, 0, printargs, "o32_old_mmap" }, /* 4090 */ +++ { 0, 0, printargs, "o32_munmap" }, /* 4091 */ +++ { 0, 0, printargs, "o32_truncate" }, /* 4092 */ +++ { 0, 0, printargs, "o32_ftruncate" }, /* 4093 */ +++ { 0, 0, printargs, "o32_fchmod" }, /* 4094 */ +++ { 0, 0, printargs, "o32_fchown" }, /* 4095 */ +++ { 0, 0, printargs, "o32_getpriority" }, /* 4096 */ +++ { 0, 0, printargs, "o32_setpriority" }, /* 4097 */ +++ { 0, 0, printargs, "o32_profil" }, /* 4098 */ +++ { 0, 0, printargs, "o32_statfs" }, /* 4099 */ +++ { 0, 0, printargs, "o32_fstatfs" }, /* 4100 */ +++ { 0, 0, printargs, "o32_ioperm" }, /* 4101 */ +++ { 0, 0, printargs, "o32_socketcall" }, /* 4102 */ +++ { 0, 0, printargs, "o32_syslog" }, /* 4103 */ +++ { 0, 0, printargs, "o32_setitimer" }, /* 4104 */ +++ { 0, 0, printargs, "o32_getitimer" }, /* 4105 */ +++ { 0, 0, printargs, "o32_stat" }, /* 4106 */ +++ { 0, 0, printargs, "o32_lstat" }, /* 4107 */ +++ { 0, 0, printargs, "o32_fstat" }, /* 4108 */ +++ { 0, 0, printargs, "o32_olduname" }, /* 4109 */ +++ { 0, 0, printargs, "o32_iopl" }, /* 4110 */ +++ { 0, 0, printargs, "o32_vhangup" }, /* 4111 */ +++ { 0, 0, printargs, "o32_idle" }, /* 4112 */ +++ { 0, 0, printargs, "o32_vm86" }, /* 4113 */ +++ { 0, 0, printargs, "o32_wait4" }, /* 4114 */ +++ { 0, 0, printargs, "o32_swapoff" }, /* 4115 */ +++ { 0, 0, printargs, "o32_sysinfo" }, /* 4116 */ +++ { 0, 0, printargs, "o32_ipc" }, /* 4117 */ +++ { 0, 0, printargs, "o32_fsync" }, /* 4118 */ +++ { 0, 0, printargs, "o32_sigreturn" }, /* 4119 */ +++ { 0, 0, printargs, "o32_clone" }, /* 4120 */ +++ { 0, 0, printargs, "o32_setdomainname" }, /* 4121 */ +++ { 0, 0, printargs, "o32_uname" }, /* 4122 */ +++ { 0, 0, printargs, "o32_modify_ldt" }, /* 4123 */ +++ { 0, 0, printargs, "o32_adjtimex" }, /* 4124 */ +++ { 0, 0, printargs, "o32_mprotect" }, /* 4125 */ +++ { 0, 0, printargs, "o32_sigprocmask" }, /* 4126 */ +++ { 0, 0, printargs, "o32_create_module" }, /* 4127 */ +++ { 0, 0, printargs, "o32_init_module" }, /* 4128 */ +++ { 0, 0, printargs, "o32_delete_module" }, /* 4129 */ +++ { 0, 0, printargs, "o32_get_kernel_syms"}, /* 4130 */ +++ { 0, 0, printargs, "o32_quotactl" }, /* 4131 */ +++ { 0, 0, printargs, "o32_getpgid" }, /* 4132 */ +++ { 0, 0, printargs, "o32_fchdir" }, /* 4133 */ +++ { 0, 0, printargs, "o32_bdflush" }, /* 4134 */ +++ { 0, 0, printargs, "o32_sysfs" }, /* 4135 */ +++ { 0, 0, printargs, "o32_personality" }, /* 4136 */ +++ { 0, 0, printargs, "o32_afs_syscall" }, /* 4137 */ +++ { 0, 0, printargs, "o32_setfsuid" }, /* 4138 */ +++ { 0, 0, printargs, "o32_setfsgid" }, /* 4139 */ +++ { 0, 0, printargs, "o32__llseek" }, /* 4140 */ +++ { 0, 0, printargs, "o32_getdents" }, /* 4141 */ +++ { 0, 0, printargs, "o32__newselect" }, /* 4142 */ +++ { 0, 0, printargs, "o32_flock" }, /* 4143 */ +++ { 0, 0, printargs, "o32_msync" }, /* 4144 */ +++ { 0, 0, printargs, "o32_readv" }, /* 4145 */ +++ { 0, 0, printargs, "o32_writev" }, /* 4146 */ +++ { 0, 0, printargs, "o32_cacheflush" }, /* 4147 */ +++ { 0, 0, printargs, "o32_cachectl" }, /* 4148 */ +++ { 0, 0, printargs, "o32_sysmips" }, /* 4149 */ +++ { 0, 0, printargs, "o32_setup" }, /* 4150 */ +++ { 0, 0, printargs, "o32_getsid" }, /* 4151 */ +++ { 0, 0, printargs, "o32_fdatasync" }, /* 4152 */ +++ { 0, 0, printargs, "o32__sysctl" }, /* 4153 */ +++ { 0, 0, printargs, "o32_mlock" }, /* 4154 */ +++ { 0, 0, printargs, "o32_munlock" }, /* 4155 */ +++ { 0, 0, printargs, "o32_mlockall" }, /* 4156 */ +++ { 0, 0, printargs, "o32_munlockall" }, /* 4157 */ +++ { 0, 0, printargs, "o32_sched_setparam"}, /* 4158 */ +++ { 0, 0, printargs, "o32_sched_getparam"}, /* 4159 */ +++ { 0, 0, printargs, "o32_sched_setscheduler"}, /* 4160 */ +++ { 0, 0, printargs, "o32_sched_getscheduler"}, /* 4161 */ +++ { 0, 0, printargs, "o32_sched_yield" }, /* 4162 */ +++ { 0, 0, printargs, "o32_sched_get_priority_max"}, /* 4163 */ +++ { 0, 0, printargs, "o32_sched_get_priority_min"},/* 4164 */ +++ { 0, 0, printargs, "o32_sched_rr_get_interval"}, /* 4165 */ +++ { 0, 0, printargs, "o32_nanosleep" }, /* 4166 */ +++ { 0, 0, printargs, "o32_mremap" }, /* 4167 */ +++ { 0, 0, printargs, "o32_accept" }, /* 4168 */ +++ { 0, 0, printargs, "o32_bind" }, /* 4169 */ +++ { 0, 0, printargs, "o32_connect" }, /* 4170 */ +++ { 0, 0, printargs, "o32_getpeername" }, /* 4171 */ +++ { 0, 0, printargs, "o32_getsockname" }, /* 4172 */ +++ { 0, 0, printargs, "o32_getsockopt" }, /* 4173 */ +++ { 0, 0, printargs, "o32_listen" }, /* 4174 */ +++ { 0, 0, printargs, "o32_recv" }, /* 4175 */ +++ { 0, 0, printargs, "o32_recvfrom" }, /* 4176 */ +++ { 0, 0, printargs, "o32_recvmsg" }, /* 4177 */ +++ { 0, 0, printargs, "o32_send" }, /* 4178 */ +++ { 0, 0, printargs, "o32_sendmsg" }, /* 4179 */ +++ { 0, 0, printargs, "o32_sendto" }, /* 4180 */ +++ { 0, 0, printargs, "o32_setsockopt" }, /* 4181 */ +++ { 0, 0, printargs, "o32_shutdown" }, /* 4182 */ +++ { 0, 0, printargs, "o32_socket" }, /* 4183 */ +++ { 0, 0, printargs, "o32_socketpair" }, /* 4184 */ +++ { 0, 0, printargs, "o32_setresuid" }, /* 4185 */ +++ { 0, 0, printargs, "o32_getresuid" }, /* 4186 */ +++ { 0, 0, printargs, "o32_query_module" }, /* 4187 */ +++ { 0, 0, printargs, "o32_poll" }, /* 4188 */ +++ { 0, 0, printargs, "o32_nfsservctl" }, /* 4189 */ +++ { 0, 0, printargs, "o32_setresgid" }, /* 4190 */ +++ { 0, 0, printargs, "o32_getresgid" }, /* 4191 */ +++ { 0, 0, printargs, "o32_prctl" }, /* 4192 */ +++ { 0, 0, printargs, "o32_rt_sigreturn" }, /* 4193 */ +++ { 0, 0, printargs, "o32_rt_sigaction" }, /* 4194 */ +++ { 0, 0, printargs, "o32_rt_sigprocmask"}, /* 4195 */ +++ { 0, 0, printargs, "o32_rt_sigpending" }, /* 4196 */ +++ { 0, 0, printargs, "o32_rt_sigtimedwait"},/* 4197 */ +++ { 0, 0, printargs, "o32_rt_sigqueueinfo"},/* 4198 */ +++ { 0, 0, printargs, "o32_rt_siguspend" }, /* 4199 */ +++ { 0, 0, printargs, "o32_pread" }, /* 4200 */ +++ { 0, 0, printargs, "o32_pwrite" }, /* 4201 */ +++ { 0, 0, printargs, "o32_chown" }, /* 4202 */ +++ { 0, 0, printargs, "o32_getcwd" }, /* 4203 */ +++ { 0, 0, printargs, "o32_capget" }, /* 4204 */ +++ { 0, 0, printargs, "o32_capset" }, /* 4205 */ +++ { 0, 0, printargs, "o32_sigaltstatck" }, /* 4206 */ +++ { 0, 0, printargs, "o32_sendfile" }, /* 4207 */ +++ { 0, 0, printargs, "SYS_4208" }, /* 4208 */ +++ { 0, 0, printargs, "SYS_4209" }, /* 4209 */ +++ { 0, 0, printargs, "o32_mmap" }, /* 4210 */ +++ { 0, 0, printargs, "o32_truncate64" }, /* 4211 */ +++ { 0, 0, printargs, "o32_ftruncate64" }, /* 4212 */ +++ { 0, 0, printargs, "o32_stat64" }, /* 4213 */ +++ { 0, 0, printargs, "o32_lstat64" }, /* 4214 */ +++ { 0, 0, printargs, "o32_fstat64" }, /* 4215 */ +++ { 0, 0, printargs, "o32_pivot_root" }, /* 4216 */ +++ { 0, 0, printargs, "o32_mincore" }, /* 4217 */ +++ { 0, 0, printargs, "o32_madvise" }, /* 4218 */ +++ { 0, 0, printargs, "o32_getdents64" }, /* 4219 */ +++ { 0, 0, printargs, "o32_fcntl64" }, /* 4220 */ +++ { 0, 0, printargs, "SYS_4221" }, /* 4221 */ +++ { 0, 0, printargs, "o32_gettid" }, /* 4222 */ +++ { 5, TD, printargs, "o32_readahead" }, /* 4223 */ +++ { 5, TF, printargs, "o32_setxattr" }, /* 4224 */ +++ { 5, TF, printargs, "o32_lsetxattr" }, /* 4225 */ +++ { 5, TD, printargs, "o32_fsetxattr" }, /* 4226 */ +++ { 4, TF, printargs, "o32_getxattr" }, /* 4227 */ +++ { 4, TF, printargs, "o32_lgetxattr" }, /* 4228 */ +++ { 4, 0, printargs, "o32_fgetxattr" }, /* 4229 */ +++ { 3, TF, printargs, "o32_listxattr" }, /* 4230 */ +++ { 3, TF, printargs, "o32_llistxattr" }, /* 4231 */ +++ { 3, 0, printargs, "o32_flistxattr" }, /* 4232 */ +++ { 2, TF, printargs, "o32_removexattr" }, /* 4233 */ +++ { 2, TF, printargs, "o32_lremovexattr" }, /* 4234 */ +++ { 2, TD, printargs, "o32_fremovexattr" }, /* 4235 */ +++ { 2, TS, printargs, "o32_tkill" }, /* 4236 */ +++ { 5, TD, printargs, "o32_sendfile64" }, /* 4237 */ +++ { 6, 0, printargs, "o32_futex" }, /* 4238 */ +++ { 3, 0, printargs, "o32_sched_setaffinity"}, /* 4239 */ +++ { 3, 0, printargs, "o32_sched_getaffinity"}, /* 4240 */ +++ { 2, 0, printargs, "o32_io_setup" }, /* 4241 */ +++ { 1, 0, printargs, "o32_io_destroy" }, /* 4242 */ +++ { 5, 0, printargs, "o32_io_getevents" }, /* 4243 */ +++ { 3, 0, printargs, "o32_io_submit" }, /* 4244 */ +++ { 3, 0, printargs, "o32_io_cancel" }, /* 4245 */ +++ { 1, TP, printargs, "o32_exit_group" }, /* 4246 */ +++ { 3, 0, printargs, "o32_lookup_dcookie"}, /* 4247 */ +++ { 1, 0, printargs, "o32_epoll_create" }, /* 4248 */ +++ { 4, TD, printargs, "o32_epoll_ctl" }, /* 4249 */ +++ { 3, TD, printargs, "o32_epoll_wait" }, /* 4250 */ +++ { 5, 0, printargs, "o32_remap_file_pages"}, /* 4251 */ +++ { 1, 0, printargs, "o32_set_tid_address"}, /* 4252 */ +++ { 0, 0, printargs, "o32_restart_syscall"}, /* 4253 */ +++ { 7, 0, printargs, "o32_fadvise64_64" }, /* 4254 */ +++ { 3, TF, printargs, "o32_statfs64" }, /* 4255 */ +++ { 2, TD, printargs, "o32_fstatfs64" }, /* 4256 */ +++ { 3, 0, printargs, "o32_timer_create" }, /* 4257 */ +++ { 4, 0, printargs, "o32_timer_settime" }, /* 4258 */ +++ { 2, 0, printargs, "o32_timer_gettime" }, /* 4259 */ +++ { 1, 0, printargs, "o32_timer_getoverrun"}, /* 4260 */ +++ { 1, 0, printargs, "o32_timer_delete" }, /* 4261 */ +++ { 2, 0, printargs, "o32_clock_settime" }, /* 4262 */ +++ { 2, 0, printargs, "o32_clock_gettime" }, /* 4263 */ +++ { 2, 0, printargs, "o32_clock_getres" }, /* 4264 */ +++ { 4, 0, printargs, "o32_clock_nanosleep"}, /* 4265 */ +++ { 3, TS, printargs, "o32_tgkill" }, /* 4266 */ +++ { 2, TF, printargs, "o32_utimes" }, /* 4267 */ +++ { 4, 0, printargs, "o32_mbind" }, /* 4268 */ +++ { 0, 0, printargs, "o32_SYS_4269" }, /* 4269 */ +++ { 0, 0, printargs, "o32_SYS_4270" }, /* 4270 */ +++ { 4, 0, printargs, "o32_mq_open" }, /* 4271 */ +++ { 1, 0, printargs, "o32_mq_unlink" }, /* 4272 */ +++ { 5, 0, printargs, "o32_mq_timedsend" }, /* 4273 */ +++ { 5, 0, printargs, "o32_mq_timedreceive"}, /* 4274 */ +++ { 2, 0, printargs, "o32_mq_notify" }, /* 4275 */ +++ { 3, 0, printargs, "o32_mq_getsetattr" }, /* 4276 */ +++ { 0, 0, printargs, "o32_SYS_4277" }, /* 4277 */ +++ { 5, TP, printargs, "o32_waitid" }, /* 4278 */ +++ { 0, 0, printargs, "o32_SYS_4279" }, /* 4279 */ +++ { 5, 0, printargs, "o32_add_key" }, /* 4280 */ +++ { 4, 0, printargs, "o32_request_key" }, /* 4281 */ +++ { 5, 0, printargs, "o32_keyctl" }, /* 4282 */ +++ { 1, 0, printargs, "o32_set_thread_area" }, /* 4283 */ +++ { 0, TD, printargs, "o32_inotify_init" }, /* 4284 */ +++ { 3, TD, printargs, "o32_inotify_add_watch" }, /* 4285 */ +++ { 2, TD, printargs, "o32_inotify_rm_watch" }, /* 4286 */ +++ { 4, 0, printargs, "o32_migrate_pages" }, /* 4287 */ +++ { 4, TD|TF, printargs, "o32_openat" }, /* 4288 */ +++ { 3, TD|TF, printargs, "o32_mkdirat" }, /* 4289 */ +++ { 4, TD|TF, printargs, "o32_mknodat" }, /* 4290 */ +++ { 5, TD|TF, printargs, "o32_fchownat" }, /* 4291 */ +++ { 3, TD|TF, printargs, "o32_futimesat" }, /* 4292 */ +++ { 4, TD|TD, printargs, "o32_newfstatat" }, /* 4293 */ +++ { 3, TD|TF, printargs, "o32_unlinkat" }, /* 4294 */ +++ { 4, TD|TF, printargs, "o32_renameat" }, /* 4295 */ +++ { 5, TD|TF, printargs, "o32_linkat" }, /* 4296 */ +++ { 3, TD|TF, printargs, "o32_symlinkat" }, /* 4297 */ +++ { 4, TD|TF, printargs, "o32_readlinkat" }, /* 4298 */ +++ { 3, TD|TF, printargs, "o32_fchmodat" }, /* 4299 */ +++ { 3, TD|TF, printargs, "o32_faccessat" }, /* 4300 */ +++ { 6, TD, printargs, "o32_pselect6" }, /* 4301 */ +++ { 5, TD, printargs, "o32_ppoll" }, /* 4302 */ +++ { 1, TP, printargs, "o32_unshare" }, /* 4303 */ +++ { 6, TD, printargs, "o32_splice" }, /* 4304 */ +++ { 4, TD, printargs, "o32_sync_file_range" }, /* 4305 */ +++ { 0, 0, printargs, "o32_SYS_4306" }, /* 4306 */ +++ { 0, 0, printargs, "o32_SYS_4307" }, /* 4307 */ +++ { 6, 0, printargs, "o32_move_pages" }, /* 4308 */ +++ { 0, 0, printargs, "o32_SYS_4309" }, /* 4309 */ +++ { 0, 0, printargs, "o32_SYS_4310" }, /* 4310 */ +++ { 0, 0, printargs, "o32_SYS_4311" }, /* 4311 */ +++ { 3, 0, printargs, "o32_getcpu" }, /* 4312 */ +++ { 5, TD, printargs, "o32_epoll_pwait" }, /* 4313 */ +++ { 0, 0, printargs, "o32_SYS_4314" }, /* 4314 */ +++ { 0, 0, printargs, "o32_SYS_4315" }, /* 4315 */ +++ { 0, 0, printargs, "o32_SYS_4316" }, /* 4316 */ +++ { 3, TD|TS, printargs, "o32_signalfd" }, /* 4317 */ +++ { 4, TD, printargs, "o32_timerfd" }, /* 4318 */ +++ { 1, TD, printargs, "o32_eventfd" }, /* 4319 */ +++#endif ++ { 0, 0, printargs, "SYS_4320" }, /* 4320 */ ++ { 0, 0, printargs, "SYS_4321" }, /* 4321 */ ++ { 0, 0, printargs, "SYS_4322" }, /* 4322 */ ++@@ -4998,3 +5324,2464 @@ ++ { 0, 0, printargs, "SYS_4997" }, /* 4997 */ ++ { 0, 0, printargs, "SYS_4998" }, /* 4998 */ ++ { 0, 0, printargs, "SYS_4999" }, /* 4999 */ /* end of Linux o32 */ +++#if defined (LINUX_MIPSN64) +++ /* For an N64 strace decode the N64 64-bit syscalls. */ +++ { 3, TF, sys_read, "read" }, /* 5000 */ /* start of Linux N64 */ +++ { 3, TF, sys_write, "write" }, /* 5001 */ +++ { 3, TF, sys_open, "open" }, /* 5002 */ +++ { 1, 0, sys_close, "close" }, /* 5003 */ +++ { 2, TF, sys_stat, "stat" }, /* 5004 */ +++ { 2, 0, sys_fstat, "fstat" }, /* 5005 */ +++ { 2, TF, sys_lstat, "lstat" }, /* 5006 */ +++ { 3, 0, sys_poll, "poll" }, /* 5007 */ +++ { 3, 0, sys_lseek, "lseek" }, /* 5008 */ +++ { 6, 0, sys_mmap, "mmap" }, /* 5009 */ +++ { 3, 0, sys_mprotect, "mprotect" }, /* 5010 */ +++ { 2, 0, sys_munmap, "munmap" }, /* 5011 */ +++ { 1, 0, sys_brk, "brk" }, /* 5012 */ +++ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 5013 */ +++ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 5014 */ +++ { 3, 0, sys_ioctl, "ioctl" }, /* 5015 */ +++ { 6, TF, sys_pread64, "pread" }, /* 5016 */ +++ { 6, TF, sys_pwrite64, "pwrite" }, /* 5017 */ +++ { 3, 0, sys_readv, "readv" }, /* 5018 */ +++ { 3, 0, sys_writev, "writev" }, /* 5019 */ +++ { 2, TF, sys_access, "access" }, /* 5020 */ +++ { 1, 0, sys_pipe, "pipe" }, /* 5021 */ +++ { 5, 0, sys_select, "_newselect" }, /* 5022 */ +++ { 0, 0, sys_sched_yield, "sched_yield" }, /* 5023 */ +++ { 4, 0, sys_mremap, "mremap" }, /* 5024 */ +++ { 3, 0, sys_msync, "msync" }, /* 5025 */ +++ { 3, 0, printargs, "mincore" }, /* 5026 */ +++ { 3, 0, sys_madvise, "madvise" }, /* 5027 */ +++ { 3, TI, sys_shmget, "shmget" }, /* 5028 */ +++ { 3, TI, sys_shmat, "shmgat" }, /* 5029 */ +++ { 3, TI, sys_shmctl, "shmctl" }, /* 5030 */ +++ { 1, 0, sys_dup, "dup" }, /* 5031 */ +++ { 2, 0, sys_dup2, "dup2" }, /* 5032 */ +++ { 0, TS, sys_pause, "pause" }, /* 5033 */ +++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 5034 */ +++ { 2, 0, sys_getitimer, "getitimer" }, /* 5035 */ +++ { 3, 0, sys_setitimer, "setitimer" }, /* 5036 */ +++ { 1, 0, sys_alarm, "alarm" }, /* 5037 */ +++ { 0, 0, sys_getpid, "getpid" }, /* 5038 */ +++ { 4, TF, sys_sendfile, "sendfile" }, /* 5039 */ +++ { 2, 0, sys_socketcall, "socketcall" }, /* 5040 */ +++ { 3, TN, sys_connect, "connect" }, /* 5041 */ +++ { 3, TN, sys_accept, "accept" }, /* 5042 */ +++ { 6, TN, sys_sendto, "sendto" }, /* 5043 */ +++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 5044 */ +++ { 3, TN, sys_sendmsg, "sendmsg" }, /* 5045 */ +++ { 3, TN, sys_recvmsg, "recvmsg" }, /* 5046 */ +++ { 2, TN, sys_shutdown, "shutdown" }, /* 5047 */ +++ { 3, TN, sys_bind, "bind" }, /* 5048 */ +++ { 2, TN, sys_listen, "listen" }, /* 5049 */ +++ { 3, TN, sys_getsockname, "getsockname" }, /* 5050 */ +++ { 3, TN, sys_getpeername, "getpeername" }, /* 5051 */ +++ { 4, TN, sys_socketpair, "socketpair" }, /* 5052 */ +++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 5053 */ +++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 5054 */ +++ { 2, TP, sys_clone, "clone" }, /* 5055 */ +++ { 0, TP, sys_fork, "fork" }, /* 5056 */ +++ { 3, TF|TP, sys_execve, "execve" }, /* 5057 */ +++ { 1, TP, sys_exit, "exit" }, /* 5058 */ +++ { 4, TP, sys_wait4, "wait4" }, /* 5059 */ +++ { 2, TS, sys_kill, "kill" }, /* 5060 */ +++ { 1, 0, sys_uname, "uname" }, /* 5061 */ +++ { 3, TI, sys_semget, "semget" }, /* 5062 */ +++ { 3, TI, printargs, "semop" }, /* 5063 */ +++ { 4, TI, sys_semctl, "semctl" }, /* 5064 */ +++ { 1, TI, sys_shmdt, "shmdt" }, /* 5065 */ +++ { 2, TI, sys_msgget, "msgget" }, /* 5066 */ +++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 5067 */ +++ { 5, TI, sys_msgrcv, "msgrcv" }, /* 5068 */ +++ { 3, TI, sys_msgctl, "msgctl" }, /* 5069 */ +++ { 3, 0, sys_fcntl, "fcntl" }, /* 5070 */ +++ { 2, 0, sys_flock, "flock" }, /* 5071 */ +++ { 1, 0, sys_fsync, "fsync" }, /* 5072 */ +++ { 1, 0, sys_fdatasync, "fdatasync" }, /* 5073 */ +++ { 2, TF, sys_truncate, "truncate" }, /* 5074 */ +++ { 2, 0, sys_ftruncate, "ftruncate" }, /* 5075 */ +++ { 3, 0, sys_getdents, "getdents" }, /* 5076 */ +++ { 2, TF, sys_getcwd, "getcwd" }, /* 5077 */ +++ { 1, TF, sys_chdir, "chdir" }, /* 5078 */ +++ { 1, TF, sys_fchdir, "fchdir" }, /* 5079 */ +++ { 2, TF, sys_rename, "rename" }, /* 5080 */ +++ { 2, TF, sys_mkdir, "mkdir" }, /* 5081 */ +++ { 1, TF, sys_rmdir, "rmdir" }, /* 5082 */ +++ { 2, TF, sys_creat, "creat" }, /* 5083 */ +++ { 2, TF, sys_link, "link" }, /* 5084 */ +++ { 1, TF, sys_unlink, "unlink" }, /* 5085 */ +++ { 2, TF, sys_symlink, "symlink" }, /* 5086 */ +++ { 3, TF, sys_readlink, "readlink" }, /* 5087 */ +++ { 2, TF, sys_chmod, "chmod" }, /* 5088 */ +++ { 2, 0, sys_fchmod, "fchmod" }, /* 5089 */ +++ { 3, TF, sys_chown, "chown" }, /* 5090 */ +++ { 3, 0, sys_fchown, "fchown" }, /* 5091 */ +++ { 3, TF, sys_chown, "lchown" }, /* 5092 */ +++ { 1, 0, sys_umask, "umask" }, /* 5093 */ +++ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 5094 */ +++ { 2, 0, sys_getrlimit, "getrlimit" }, /* 5095 */ +++ { 2, 0, sys_getrusage, "getrusage" }, /* 5096 */ +++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 5097 */ +++ { 1, 0, sys_times, "times" }, /* 5098 */ +++ { 4, 0, sys_ptrace, "ptrace" }, /* 5099 */ +++ { 0, 0, sys_getuid, "getuid" }, /* 5100 */ +++ { 3, 0, sys_syslog, "syslog" }, /* 5101 */ +++ { 0, 0, sys_getgid, "getgid" }, /* 5102 */ +++ { 1, 0, sys_setuid, "setuid" }, /* 5103 */ +++ { 1, 0, sys_setgid, "setgid" }, /* 5104 */ +++ { 0, 0, sys_geteuid, "geteuid" }, /* 5105 */ +++ { 0, 0, sys_getegid, "getegid" }, /* 5106 */ +++ { 2, 0, sys_setpgid, "setpgid" }, /* 5107 */ +++ { 0, 0, sys_getppid, "getppid" }, /* 5108 */ +++ { 0, 0, sys_getpgrp, "getpgrp" }, /* 5109 */ +++ { 0, 0, sys_setsid, "setsid" }, /* 5110 */ +++ { 2, 0, sys_setreuid, "setreuid" }, /* 5111 */ +++ { 2, 0, sys_setregid, "setregid" }, /* 5112 */ +++ { 2, 0, sys_getgroups, "getgroups" }, /* 5113 */ +++ { 2, 0, sys_setgroups, "setgroups" }, /* 5114 */ +++ { 3, 0, sys_setresuid, "setresuid" }, /* 5115 */ +++ { 3, 0, sys_getresuid, "getresuid" }, /* 5116 */ +++ { 3, 0, sys_setresgid, "setresgid" }, /* 5117 */ +++ { 3, 0, sys_getresgid, "getresgid" }, /* 5118 */ +++ { 0, 0, sys_getpgid, "getpgid" }, /* 5119 */ +++ { 1, 0, sys_setfsuid, "setfsuid" }, /* 5120 */ +++ { 1, 0, sys_setfsgid, "setfsgid" }, /* 5121 */ +++ { 1, 0, sys_getsid, "getsid" }, /* 5122 */ +++ { 2, 0, sys_capget, "capget" }, /* 5123 */ +++ { 2, 0, sys_capset, "capset" }, /* 5124 */ +++ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 5125 */ +++ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"},/* 5126 */ +++ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"},/* 5127 */ +++ { 2, TS, sys_rt_sigsuspend, "rt_siguspend" }, /* 5128 */ +++ { 2, TS, sys_sigaltstack, "sigaltstatck" }, /* 5129 */ +++ { 2, TF, sys_utime, "utime" }, /* 5130 */ +++ { 3, TF, sys_mknod, "mknod" }, /* 5131 */ +++ { 1, 0, sys_personality, "personality" }, /* 5132 */ +++ { 2, 0, sys_ustat, "ustat" }, /* 5133 */ +++ { 3, 0, sys_statfs, "statfs" }, /* 5134 */ +++ { 3, 0, sys_fstatfs, "fstatfs" }, /* 5135 */ +++ { 5, 0, sys_sysfs, "sysfs" }, /* 5136 */ +++ { 2, 0, sys_getpriority, "getpriority" }, /* 5137 */ +++ { 3, 0, sys_setpriority, "setpriority" }, /* 5138 */ +++ { 2, 0, sys_sched_setparam, "sched_setparam"}, /* 5139 */ +++ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 5140 */ +++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 5141 */ +++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 5142 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 5143 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 5144 */ +++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 5145 */ +++ { 2, 0, sys_mlock, "mlock" }, /* 5146 */ +++ { 2, 0, sys_munlock, "munlock" }, /* 5147 */ +++ { 1, 0, sys_mlockall, "mlockall" }, /* 5148 */ +++ { 0, 0, sys_munlockall, "munlockall" }, /* 5149 */ +++ { 0, 0, sys_vhangup, "vhangup" }, /* 5150 */ +++ { 2, 0, sys_pivotroot, "pivot_root" }, /* 5151 */ +++ { 1, 0, sys_sysctl, "_sysctl" }, /* 5152 */ +++ { 5, 0, printargs, "prctl" }, /* 5153 */ +++ { 1, 0, sys_adjtimex, "adjtimex" }, /* 5154 */ +++ { 2, 0, sys_setrlimit, "setrlimit" }, /* 5155 */ +++ { 1, TF, sys_chroot, "chroot" }, /* 5156 */ +++ { 0, 0, sys_sync, "sync" }, /* 5157 */ +++ { 1, TF, sys_acct, "acct" }, /* 5158 */ +++ { 2, 0, sys_settimeofday, "settimeofday" }, /* 5159 */ +++ { 5, TF, sys_mount, "mount" }, /* 5160 */ +++ { 2, TF, sys_umount2, "umount" }, /* 5161 */ +++ { 1, TF, sys_swapon, "swapon" }, /* 5162 */ +++ { 1, 0, sys_swapoff, "swapoff" }, /* 5163 */ +++ { 3, 0, sys_reboot, "reboot" }, /* 5164 */ +++ { 2, 0, sys_sethostname, "sethostname" }, /* 5165 */ +++ { 2, 0, sys_setdomainname, "setdomainname" }, /* 5166 */ +++ { 2, 0, sys_create_module, "create_module" }, /* 5167 */ +++ { 4, 0, sys_init_module, "init_module" }, /* 5168 */ +++ { 1, 0, sys_delete_module, "delete_module" }, /* 5169 */ +++ { 1, 0, sys_get_kernel_syms, "get_kernel_syms"}, /* 5170 */ +++ { 5, 0, sys_query_module, "query_module" }, /* 5171 */ +++ { 4, 0, sys_quotactl, "quotactl" }, /* 5172 */ +++ { 3, 0, printargs, "nfsservctl" }, /* 5173 */ +++ { 5, TN, printargs, "getpmsg" }, /* 5174 */ +++ { 5, TN, printargs, "putpmsg" }, /* 5175 */ +++ { 0, 0, sys_afs_syscall, "afs_syscall" }, /* 5176 */ +++ { 0, 0, printargs, "reserved177" }, /* 5177 */ +++ { 0, 0, printargs, "gettid" }, /* 5178 */ +++ { 3, 0, sys_readahead, "readahead" }, /* 5179 */ +++ { 5, 0, sys_setxattr, "setxattr" }, /* 5180 */ +++ { 5, 0, sys_setxattr, "lsetxattr" }, /* 5181 */ +++ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 5182 */ +++ { 4, 0, sys_getxattr, "getxattr" }, /* 5183 */ +++ { 4, 0, sys_getxattr, "lgetxattr" }, /* 5184 */ +++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 5185 */ +++ { 3, 0, sys_listxattr, "listxattr" }, /* 5186 */ +++ { 3, 0, sys_listxattr, "llistxattr" }, /* 5187 */ +++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 5188 */ +++ { 2, 0, sys_removexattr, "removexattr" }, /* 5189 */ +++ { 2, 0, sys_removexattr, "lremovexattr" }, /* 5190 */ +++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 5191 */ +++ { 2, 0, sys_kill, "tkill" }, /* 5192 */ +++ { 1, 0, sys_time, "time" }, /* 5193 */ +++ { 5, 0, printargs, "futex" }, /* 5194 */ +++ { 3, 0, printargs, "sched_setaffinity"}, /* 5195 */ +++ { 3, 0, printargs, "sched_getaffinity"}, /* 5196 */ +++ { 3, 0, printargs, "cacheflush" }, /* 5197 */ +++ { 3, 0, printargs, "cachectl" }, /* 5198 */ +++ { 4, 0, sys_sysmips, "sysmips" }, /* 5199 */ +++ { 0, 0, printargs, "SYS_5200" }, /* 5200 */ +++ { 0, 0, printargs, "SYS_5201" }, /* 5201 */ +++ { 0, 0, printargs, "SYS_5202" }, /* 5202 */ +++ { 0, 0, printargs, "SYS_5203" }, /* 5203 */ +++ { 0, 0, printargs, "SYS_5204" }, /* 5204 */ +++ { 1, TP, sys_exit, "exit_group" }, /* 5205 */ +++ { 0, 0, printargs, "SYS_5206" }, /* 5206 */ +++ { 0, 0, printargs, "SYS_5207" }, /* 5207 */ +++ { 0, 0, printargs, "SYS_5208" }, /* 5208 */ +++ { 0, 0, printargs, "SYS_5209" }, /* 5209 */ +++ { 0, 0, printargs, "SYS_5210" }, /* 5210 */ +++ { 1, TS, printargs, "rt_sigreturn" }, /* 5211 */ +++ { 5, 0, printargs, "timer_create" }, /* 5212 */ +++ { 5, 0, printargs, "timer_settime" }, /* 5213 */ +++ { 5, 0, printargs, "timer_gettime" }, /* 5214 */ +++ { 5, 0, printargs, "timer_getoverrun"}, /* 5215 */ +++ { 5, 0, printargs, "timer_delete" }, /* 5216 */ +++ { 5, 0, printargs, "clock_settime" }, /* 5217 */ +++ { 5, 0, printargs, "clock_gettime" }, /* 5218 */ +++ { 5, 0, printargs, "clock_getres" }, /* 5219 */ +++ { 5, 0, printargs, "clock_nanosleep"}, /* 5220 */ +++#else +++ { 0, 0, printargs, "n64_read" }, /* 5000 */ +++ { 0, 0, printargs, "n64_write" }, /* 5001 */ +++ { 0, 0, printargs, "n64_open" }, /* 5002 */ +++ { 0, 0, printargs, "n64_close" }, /* 5003 */ +++ { 0, 0, printargs, "n64_stat" }, /* 5004 */ +++ { 0, 0, printargs, "n64_fstat" }, /* 5005 */ +++ { 0, 0, printargs, "n64_lstat" }, /* 5006 */ +++ { 0, 0, printargs, "n64_poll" }, /* 5007 */ +++ { 0, 0, printargs, "n64_lseek" }, /* 5008 */ +++ { 0, 0, printargs, "n64_mmap" }, /* 5009 */ +++ { 0, 0, printargs, "n64_mprotect" }, /* 5010 */ +++ { 0, 0, printargs, "n64_munmap" }, /* 5011 */ +++ { 0, 0, printargs, "n64_brk" }, /* 5012 */ +++ { 0, 0, printargs, "n64_rt_sigaction" }, /* 5013 */ +++ { 0, 0, printargs, "n64_rt_sigprocmask" }, /* 5014 */ +++ { 0, 0, printargs, "n64_ioctl" }, /* 5015 */ +++ { 0, 0, printargs, "n64_pread" }, /* 5016 */ +++ { 0, 0, printargs, "n64_pwrite" }, /* 5017 */ +++ { 0, 0, printargs, "n64_readv" }, /* 5018 */ +++ { 0, 0, printargs, "n64_writev" }, /* 5019 */ +++ { 0, 0, printargs, "n64_access" }, /* 5020 */ +++ { 0, 0, printargs, "n64_pipe" }, /* 5021 */ +++ { 0, 0, printargs, "n64__newselect" }, /* 5022 */ +++ { 0, 0, printargs, "n64_sched_yield" }, /* 5023 */ +++ { 0, 0, printargs, "n64_mremap" }, /* 5024 */ +++ { 0, 0, printargs, "n64_msync" }, /* 5025 */ +++ { 0, 0, printargs, "n64_mincore" }, /* 5026 */ +++ { 0, 0, printargs, "n64_madvise" }, /* 5027 */ +++ { 0, 0, printargs, "n64_shmget" }, /* 5028 */ +++ { 0, 0, printargs, "n64_shmgat" }, /* 5029 */ +++ { 0, 0, printargs, "n64_shmctl" }, /* 5030 */ +++ { 0, 0, printargs, "n64_dup" }, /* 5031 */ +++ { 0, 0, printargs, "n64_dup2" }, /* 5032 */ +++ { 0, 0, printargs, "n64_pause" }, /* 5033 */ +++ { 0, 0, printargs, "n64_nanosleep" }, /* 5034 */ +++ { 0, 0, printargs, "n64_getitimer" }, /* 5035 */ +++ { 0, 0, printargs, "n64_setitimer" }, /* 5036 */ +++ { 0, 0, printargs, "n64_alarm" }, /* 5037 */ +++ { 0, 0, printargs, "n64_getpid" }, /* 5038 */ +++ { 0, 0, printargs, "n64_sendfile" }, /* 5039 */ +++ { 0, 0, printargs, "n64_socketcall" }, /* 5040 */ +++ { 0, 0, printargs, "n64_connect" }, /* 5041 */ +++ { 0, 0, printargs, "n64_accept" }, /* 5042 */ +++ { 0, 0, printargs, "n64_sendto" }, /* 5043 */ +++ { 0, 0, printargs, "n64_recvfrom" }, /* 5044 */ +++ { 0, 0, printargs, "n64_sendmsg" }, /* 5045 */ +++ { 0, 0, printargs, "n64_recvmsg" }, /* 5046 */ +++ { 0, 0, printargs, "n64_shutdown" }, /* 5047 */ +++ { 0, 0, printargs, "n64_bind" }, /* 5048 */ +++ { 0, 0, printargs, "n64_listen" }, /* 5049 */ +++ { 0, 0, printargs, "n64_getsockname" }, /* 5050 */ +++ { 0, 0, printargs, "n64_getpeername" }, /* 5051 */ +++ { 0, 0, printargs, "n64_socketpair" }, /* 5052 */ +++ { 0, 0, printargs, "n64_setsockopt" }, /* 5053 */ +++ { 0, 0, printargs, "n64_getsockopt" }, /* 5054 */ +++ { 0, 0, printargs, "n64_clone" }, /* 5055 */ +++ { 0, 0, printargs, "n64_fork" }, /* 5056 */ +++ { 0, 0, printargs, "n64_execve" }, /* 5057 */ +++ { 0, 0, printargs, "n64_exit" }, /* 5058 */ +++ { 0, 0, printargs, "n64_wait4" }, /* 5059 */ +++ { 0, 0, printargs, "n64_kill" }, /* 5060 */ +++ { 0, 0, printargs, "n64_uname" }, /* 5061 */ +++ { 0, 0, printargs, "n64_semget" }, /* 5062 */ +++ { 0, 0, printargs, "n64_semop" }, /* 5063 */ +++ { 0, 0, printargs, "n64_semctl" }, /* 5064 */ +++ { 0, 0, printargs, "n64_shmdt" }, /* 5065 */ +++ { 0, 0, printargs, "n64_msgget" }, /* 5066 */ +++ { 0, 0, printargs, "n64_msgsnd" }, /* 5067 */ +++ { 0, 0, printargs, "n64_msgrcv" }, /* 5068 */ +++ { 0, 0, printargs, "n64_msgctl" }, /* 5069 */ +++ { 0, 0, printargs, "n64_fcntl" }, /* 5070 */ +++ { 0, 0, printargs, "n64_flock" }, /* 5071 */ +++ { 0, 0, printargs, "n64_fsync" }, /* 5072 */ +++ { 0, 0, printargs, "n64_fdatasync" }, /* 5073 */ +++ { 0, 0, printargs, "n64_truncate" }, /* 5074 */ +++ { 0, 0, printargs, "n64_ftruncate" }, /* 5075 */ +++ { 0, 0, printargs, "n64_getdents" }, /* 5076 */ +++ { 0, 0, printargs, "n64_getcwd" }, /* 5077 */ +++ { 0, 0, printargs, "n64_chdir" }, /* 5078 */ +++ { 0, 0, printargs, "n64_fchdir" }, /* 5079 */ +++ { 0, 0, printargs, "n64_rename" }, /* 5080 */ +++ { 0, 0, printargs, "n64_mkdir" }, /* 5081 */ +++ { 0, 0, printargs, "n64_rmdir" }, /* 5082 */ +++ { 0, 0, printargs, "n64_creat" }, /* 5083 */ +++ { 0, 0, printargs, "n64_link" }, /* 5084 */ +++ { 0, 0, printargs, "n64_unlink" }, /* 5085 */ +++ { 0, 0, printargs, "n64_symlink" }, /* 5086 */ +++ { 0, 0, printargs, "n64_readlink" }, /* 5087 */ +++ { 0, 0, printargs, "n64_chmod" }, /* 5088 */ +++ { 0, 0, printargs, "n64_fchmod" }, /* 5089 */ +++ { 0, 0, printargs, "n64_chown" }, /* 5090 */ +++ { 0, 0, printargs, "n64_fchown" }, /* 5091 */ +++ { 0, 0, printargs, "n64_lchown" }, /* 5092 */ +++ { 0, 0, printargs, "n64_umask" }, /* 5093 */ +++ { 0, 0, printargs, "n64_gettimeofday" }, /* 5094 */ +++ { 0, 0, printargs, "n64_getrlimit" }, /* 5095 */ +++ { 0, 0, printargs, "n64_getrusage" }, /* 5096 */ +++ { 0, 0, printargs, "n64_sysinfo" }, /* 5097 */ +++ { 0, 0, printargs, "n64_times" }, /* 5098 */ +++ { 0, 0, printargs, "n64_ptrace" }, /* 5099 */ +++ { 0, 0, printargs, "n64_getuid" }, /* 5100 */ +++ { 0, 0, printargs, "n64_syslog" }, /* 5101 */ +++ { 0, 0, printargs, "n64_getgid" }, /* 5102 */ +++ { 0, 0, printargs, "n64_setuid" }, /* 5103 */ +++ { 0, 0, printargs, "n64_setgid" }, /* 5104 */ +++ { 0, 0, printargs, "n64_geteuid" }, /* 5105 */ +++ { 0, 0, printargs, "n64_getegid" }, /* 5106 */ +++ { 0, 0, printargs, "n64_setpgid" }, /* 5107 */ +++ { 0, 0, printargs, "n64_getppid" }, /* 5108 */ +++ { 0, 0, printargs, "n64_getpgrp" }, /* 5109 */ +++ { 0, 0, printargs, "n64_setsid" }, /* 5110 */ +++ { 0, 0, printargs, "n64_setreuid" }, /* 5111 */ +++ { 0, 0, printargs, "n64_setregid" }, /* 5112 */ +++ { 0, 0, printargs, "n64_getgroups" }, /* 5113 */ +++ { 0, 0, printargs, "n64_setgroups" }, /* 5114 */ +++ { 0, 0, printargs, "n64_setresuid" }, /* 5115 */ +++ { 0, 0, printargs, "n64_getresuid" }, /* 5116 */ +++ { 0, 0, printargs, "n64_setresgid" }, /* 5117 */ +++ { 0, 0, printargs, "n64_getresgid" }, /* 5118 */ +++ { 0, 0, printargs, "n64_getpgid" }, /* 5119 */ +++ { 0, 0, printargs, "n64_setfsuid" }, /* 5120 */ +++ { 0, 0, printargs, "n64_setfsgid" }, /* 5121 */ +++ { 0, 0, printargs, "n64_getsid" }, /* 5122 */ +++ { 0, 0, printargs, "n64_capget" }, /* 5123 */ +++ { 0, 0, printargs, "n64_capset" }, /* 5124 */ +++ { 0, 0, printargs, "n64_rt_sigpending" }, /* 5125 */ +++ { 0, 0, printargs, "n64_rt_sigtimedwait" }, /* 5126 */ +++ { 0, 0, printargs, "n64_rt_sigqueueinfo" }, /* 5127 */ +++ { 0, 0, printargs, "n64_rt_siguspend" }, /* 5128 */ +++ { 0, 0, printargs, "n64_sigaltstatck" }, /* 5129 */ +++ { 0, 0, printargs, "n64_utime" }, /* 5130 */ +++ { 0, 0, printargs, "n64_mknod" }, /* 5131 */ +++ { 0, 0, printargs, "n64_personality" }, /* 5132 */ +++ { 0, 0, printargs, "n64_ustat" }, /* 5133 */ +++ { 0, 0, printargs, "n64_statfs" }, /* 5134 */ +++ { 0, 0, printargs, "n64_fstatfs" }, /* 5135 */ +++ { 0, 0, printargs, "n64_sysfs" }, /* 5136 */ +++ { 0, 0, printargs, "n64_getpriority" }, /* 5137 */ +++ { 0, 0, printargs, "n64_setpriority" }, /* 5138 */ +++ { 0, 0, printargs, "n64_sched_setparam" }, /* 5139 */ +++ { 0, 0, printargs, "n64_sched_getparam" }, /* 5140 */ +++ { 0, 0, printargs, "n64_sched_setscheduler"}, /* 5141 */ +++ { 0, 0, printargs, "n64_sched_getscheduler"}, /* 5142 */ +++ { 0, 0, printargs, "n64_sched_get_priority_max"}, /* 5143 */ +++ { 0, 0, printargs, "n64_sched_get_priority_min"}, /* 5144 */ +++ { 0, 0, printargs, "n64_sched_rr_get_interval"}, /* 5145 */ +++ { 0, 0, printargs, "n64_mlock" }, /* 5146 */ +++ { 0, 0, printargs, "n64_munlock" }, /* 5147 */ +++ { 0, 0, printargs, "n64_mlockall" }, /* 5148 */ +++ { 0, 0, printargs, "n64_munlockall" }, /* 5149 */ +++ { 0, 0, printargs, "n64_vhangup" }, /* 5150 */ +++ { 0, 0, printargs, "n64_pivot_root" }, /* 5151 */ +++ { 0, 0, printargs, "n64__sysctl" }, /* 5152 */ +++ { 0, 0, printargs, "n64_prctl" }, /* 5153 */ +++ { 0, 0, printargs, "n64_adjtimex" }, /* 5154 */ +++ { 0, 0, printargs, "n64_setrlimit" }, /* 5155 */ +++ { 0, 0, printargs, "n64_chroot" }, /* 5156 */ +++ { 0, 0, printargs, "n64_sync" }, /* 5157 */ +++ { 0, 0, printargs, "n64_acct" }, /* 5158 */ +++ { 0, 0, printargs, "n64_settimeofday" }, /* 5159 */ +++ { 0, 0, printargs, "n64_mount" }, /* 5160 */ +++ { 0, 0, printargs, "n64_umount" }, /* 5161 */ +++ { 0, 0, printargs, "n64_swapon" }, /* 5162 */ +++ { 0, 0, printargs, "n64_swapoff" }, /* 5163 */ +++ { 0, 0, printargs, "n64_reboot" }, /* 5164 */ +++ { 0, 0, printargs, "n64_sethostname" }, /* 5165 */ +++ { 0, 0, printargs, "n64_setdomainname" }, /* 5166 */ +++ { 0, 0, printargs, "n64_create_module" }, /* 5167 */ +++ { 0, 0, printargs, "n64_init_module" }, /* 5168 */ +++ { 0, 0, printargs, "n64_delete_module" }, /* 5169 */ +++ { 0, 0, printargs, "n64_get_kernel_syms" }, /* 5170 */ +++ { 0, 0, printargs, "n64_query_module" }, /* 5171 */ +++ { 0, 0, printargs, "n64_quotactl" }, /* 5172 */ +++ { 0, 0, printargs, "n64_nfsservctl" }, /* 5173 */ +++ { 0, 0, printargs, "n64_getpmsg" }, /* 5174 */ +++ { 0, 0, printargs, "n64_putpmsg" }, /* 5175 */ +++ { 0, 0, printargs, "n64_afs_syscall" }, /* 5176 */ +++ { 0, 0, printargs, "n64_reserved177" }, /* 5177 */ +++ { 0, 0, printargs, "n64_gettid" }, /* 5178 */ +++ { 0, 0, printargs, "n64_readahead" }, /* 5179 */ +++ { 0, 0, printargs, "n64_setxattr" }, /* 5180 */ +++ { 0, 0, printargs, "n64_lsetxattr" }, /* 5181 */ +++ { 0, 0, printargs, "n64_fsetxattr" }, /* 5182 */ +++ { 0, 0, printargs, "n64_getxattr" }, /* 5183 */ +++ { 0, 0, printargs, "n64_lgetxattr" }, /* 5184 */ +++ { 0, 0, printargs, "n64_fgetxattr" }, /* 5185 */ +++ { 0, 0, printargs, "n64_listxattr" }, /* 5186 */ +++ { 0, 0, printargs, "n64_llistxattr" }, /* 5187 */ +++ { 0, 0, printargs, "n64_flistxattr" }, /* 5188 */ +++ { 0, 0, printargs, "n64_removexattr" }, /* 5189 */ +++ { 0, 0, printargs, "n64_lremovexattr" }, /* 5190 */ +++ { 0, 0, printargs, "n64_fremovexattr" }, /* 5191 */ +++ { 0, 0, printargs, "n64_tkill" }, /* 5192 */ +++ { 0, 0, printargs, "n64_time" }, /* 5193 */ +++ { 0, 0, printargs, "n64_futex" }, /* 5194 */ +++ { 0, 0, printargs, "n64_sched_setaffinity" }, /* 5195 */ +++ { 0, 0, printargs, "n64_sched_getaffinity" }, /* 5196 */ +++ { 0, 0, printargs, "n64_cacheflush" }, /* 5197 */ +++ { 0, 0, printargs, "n64_cachectl" }, /* 5198 */ +++ { 0, 0, printargs, "n64_sysmips" }, /* 5199 */ +++ { 0, 0, printargs, "SYS_5200" }, /* 5200 */ +++ { 0, 0, printargs, "SYS_5201" }, /* 5201 */ +++ { 0, 0, printargs, "SYS_5202" }, /* 5202 */ +++ { 0, 0, printargs, "SYS_5203" }, /* 5203 */ +++ { 0, 0, printargs, "SYS_5204" }, /* 5204 */ +++ { 1, TP, printargs, "n64_exit_group" }, /* 5205 */ +++ { 0, 0, printargs, "SYS_5206" }, /* 5206 */ +++ { 0, 0, printargs, "SYS_5207" }, /* 5207 */ +++ { 0, 0, printargs, "SYS_5208" }, /* 5208 */ +++ { 0, 0, printargs, "SYS_5209" }, /* 5209 */ +++ { 0, 0, printargs, "SYS_5210" }, /* 5210 */ +++ { 0, 0, printargs, "n64_rt_sigreturn" }, /* 5211 */ +++ { 5, 0, printargs, "n64_timer_create" }, /* 5212 */ +++ { 5, 0, printargs, "n64_timer_settime" }, /* 5213 */ +++ { 5, 0, printargs, "n64_timer_gettime" }, /* 5214 */ +++ { 5, 0, printargs, "n64_timer_getoverrun"}, /* 5215 */ +++ { 5, 0, printargs, "n64_timer_delete" }, /* 5216 */ +++ { 5, 0, printargs, "n64_clock_settime" }, /* 5217 */ +++ { 5, 0, printargs, "n64_clock_gettime" }, /* 5218 */ +++ { 5, 0, printargs, "n64_clock_getres" }, /* 5219 */ +++ { 5, 0, printargs, "n64_clock_nanosleep"}, /* 5220 */ +++#endif +++ { 0, 0, printargs, "SYS_5221" }, /* 5221 */ +++ { 0, 0, printargs, "SYS_5222" }, /* 5222 */ +++ { 0, 0, printargs, "SYS_5223" }, /* 5223 */ +++ { 0, 0, printargs, "SYS_5224" }, /* 5224 */ +++ { 0, 0, printargs, "SYS_5225" }, /* 5225 */ +++ { 0, 0, printargs, "SYS_5226" }, /* 5226 */ +++ { 0, 0, printargs, "SYS_5227" }, /* 5227 */ +++ { 0, 0, printargs, "SYS_5228" }, /* 5228 */ +++ { 0, 0, printargs, "SYS_5229" }, /* 5229 */ +++ { 0, 0, printargs, "SYS_5230" }, /* 5230 */ +++ { 0, 0, printargs, "SYS_5231" }, /* 5231 */ +++ { 0, 0, printargs, "SYS_5232" }, /* 5232 */ +++ { 0, 0, printargs, "SYS_5233" }, /* 5233 */ +++ { 0, 0, printargs, "SYS_5234" }, /* 5234 */ +++ { 0, 0, printargs, "SYS_5235" }, /* 5235 */ +++ { 0, 0, printargs, "SYS_5236" }, /* 5236 */ +++ { 0, 0, printargs, "SYS_5237" }, /* 5237 */ +++ { 0, 0, printargs, "SYS_5238" }, /* 5238 */ +++ { 0, 0, printargs, "SYS_5239" }, /* 5239 */ +++ { 0, 0, printargs, "SYS_5240" }, /* 5240 */ +++ { 0, 0, printargs, "SYS_5241" }, /* 5241 */ +++ { 0, 0, printargs, "SYS_5242" }, /* 5242 */ +++ { 0, 0, printargs, "SYS_5243" }, /* 5243 */ +++ { 0, 0, printargs, "SYS_5244" }, /* 5244 */ +++ { 0, 0, printargs, "SYS_5245" }, /* 5245 */ +++ { 0, 0, printargs, "SYS_5246" }, /* 5246 */ +++ { 0, 0, printargs, "SYS_5247" }, /* 5247 */ +++ { 0, 0, printargs, "SYS_5248" }, /* 5248 */ +++ { 0, 0, printargs, "SYS_5249" }, /* 5249 */ +++ { 0, 0, printargs, "SYS_5250" }, /* 5250 */ +++ { 0, 0, printargs, "SYS_5251" }, /* 5251 */ +++ { 0, 0, printargs, "SYS_5252" }, /* 5252 */ +++ { 0, 0, printargs, "SYS_5253" }, /* 5253 */ +++ { 0, 0, printargs, "SYS_5254" }, /* 5254 */ +++ { 0, 0, printargs, "SYS_5255" }, /* 5255 */ +++ { 0, 0, printargs, "SYS_5256" }, /* 5256 */ +++ { 0, 0, printargs, "SYS_5257" }, /* 5257 */ +++ { 0, 0, printargs, "SYS_5258" }, /* 5258 */ +++ { 0, 0, printargs, "SYS_5259" }, /* 5259 */ +++ { 0, 0, printargs, "SYS_5260" }, /* 5260 */ +++ { 0, 0, printargs, "SYS_5261" }, /* 5261 */ +++ { 0, 0, printargs, "SYS_5262" }, /* 5262 */ +++ { 0, 0, printargs, "SYS_5263" }, /* 5263 */ +++ { 0, 0, printargs, "SYS_5264" }, /* 5264 */ +++ { 0, 0, printargs, "SYS_5265" }, /* 5265 */ +++ { 0, 0, printargs, "SYS_5266" }, /* 5266 */ +++ { 0, 0, printargs, "SYS_5267" }, /* 5267 */ +++ { 0, 0, printargs, "SYS_5268" }, /* 5268 */ +++ { 0, 0, printargs, "SYS_5269" }, /* 5269 */ +++ { 0, 0, printargs, "SYS_5270" }, /* 5270 */ +++ { 0, 0, printargs, "SYS_5271" }, /* 5271 */ +++ { 0, 0, printargs, "SYS_5272" }, /* 5272 */ +++ { 0, 0, printargs, "SYS_5273" }, /* 5273 */ +++ { 0, 0, printargs, "SYS_5274" }, /* 5274 */ +++ { 0, 0, printargs, "SYS_5275" }, /* 5275 */ +++ { 0, 0, printargs, "SYS_5276" }, /* 5276 */ +++ { 0, 0, printargs, "SYS_5277" }, /* 5277 */ +++ { 0, 0, printargs, "SYS_5278" }, /* 5278 */ +++ { 0, 0, printargs, "SYS_5279" }, /* 5279 */ +++ { 0, 0, printargs, "SYS_5280" }, /* 5280 */ +++ { 0, 0, printargs, "SYS_5281" }, /* 5281 */ +++ { 0, 0, printargs, "SYS_5282" }, /* 5282 */ +++ { 0, 0, printargs, "SYS_5283" }, /* 5283 */ +++ { 0, 0, printargs, "SYS_5284" }, /* 5284 */ +++ { 0, 0, printargs, "SYS_5285" }, /* 5285 */ +++ { 0, 0, printargs, "SYS_5286" }, /* 5286 */ +++ { 0, 0, printargs, "SYS_5287" }, /* 5287 */ +++ { 0, 0, printargs, "SYS_5288" }, /* 5288 */ +++ { 0, 0, printargs, "SYS_5289" }, /* 5289 */ +++ { 0, 0, printargs, "SYS_5290" }, /* 5290 */ +++ { 0, 0, printargs, "SYS_5291" }, /* 5291 */ +++ { 0, 0, printargs, "SYS_5292" }, /* 5292 */ +++ { 0, 0, printargs, "SYS_5293" }, /* 5293 */ +++ { 0, 0, printargs, "SYS_5294" }, /* 5294 */ +++ { 0, 0, printargs, "SYS_5295" }, /* 5295 */ +++ { 0, 0, printargs, "SYS_5296" }, /* 5296 */ +++ { 0, 0, printargs, "SYS_5297" }, /* 5297 */ +++ { 0, 0, printargs, "SYS_5298" }, /* 5298 */ +++ { 0, 0, printargs, "SYS_5299" }, /* 5299 */ +++ { 0, 0, printargs, "SYS_5300" }, /* 5300 */ +++ { 0, 0, printargs, "SYS_5301" }, /* 5301 */ +++ { 0, 0, printargs, "SYS_5302" }, /* 5302 */ +++ { 0, 0, printargs, "SYS_5303" }, /* 5303 */ +++ { 0, 0, printargs, "SYS_5304" }, /* 5304 */ +++ { 0, 0, printargs, "SYS_5305" }, /* 5305 */ +++ { 0, 0, printargs, "SYS_5306" }, /* 5306 */ +++ { 0, 0, printargs, "SYS_5307" }, /* 5307 */ +++ { 0, 0, printargs, "SYS_5308" }, /* 5308 */ +++ { 0, 0, printargs, "SYS_5309" }, /* 5309 */ +++ { 0, 0, printargs, "SYS_5310" }, /* 5310 */ +++ { 0, 0, printargs, "SYS_5311" }, /* 5311 */ +++ { 0, 0, printargs, "SYS_5312" }, /* 5312 */ +++ { 0, 0, printargs, "SYS_5313" }, /* 5313 */ +++ { 0, 0, printargs, "SYS_5314" }, /* 5314 */ +++ { 0, 0, printargs, "SYS_5315" }, /* 5315 */ +++ { 0, 0, printargs, "SYS_5316" }, /* 5316 */ +++ { 0, 0, printargs, "SYS_5317" }, /* 5317 */ +++ { 0, 0, printargs, "SYS_5318" }, /* 5318 */ +++ { 0, 0, printargs, "SYS_5319" }, /* 5319 */ +++ { 0, 0, printargs, "SYS_5320" }, /* 5320 */ +++ { 0, 0, printargs, "SYS_5321" }, /* 5321 */ +++ { 0, 0, printargs, "SYS_5322" }, /* 5322 */ +++ { 0, 0, printargs, "SYS_5323" }, /* 5323 */ +++ { 0, 0, printargs, "SYS_5324" }, /* 5324 */ +++ { 0, 0, printargs, "SYS_5325" }, /* 5325 */ +++ { 0, 0, printargs, "SYS_5326" }, /* 5326 */ +++ { 0, 0, printargs, "SYS_5327" }, /* 5327 */ +++ { 0, 0, printargs, "SYS_5328" }, /* 5328 */ +++ { 0, 0, printargs, "SYS_5329" }, /* 5329 */ +++ { 0, 0, printargs, "SYS_5330" }, /* 5330 */ +++ { 0, 0, printargs, "SYS_5331" }, /* 5331 */ +++ { 0, 0, printargs, "SYS_5332" }, /* 5332 */ +++ { 0, 0, printargs, "SYS_5333" }, /* 5333 */ +++ { 0, 0, printargs, "SYS_5334" }, /* 5334 */ +++ { 0, 0, printargs, "SYS_5335" }, /* 5335 */ +++ { 0, 0, printargs, "SYS_5336" }, /* 5336 */ +++ { 0, 0, printargs, "SYS_5337" }, /* 5337 */ +++ { 0, 0, printargs, "SYS_5338" }, /* 5338 */ +++ { 0, 0, printargs, "SYS_5339" }, /* 5339 */ +++ { 0, 0, printargs, "SYS_5340" }, /* 5340 */ +++ { 0, 0, printargs, "SYS_5341" }, /* 5341 */ +++ { 0, 0, printargs, "SYS_5342" }, /* 5342 */ +++ { 0, 0, printargs, "SYS_5343" }, /* 5343 */ +++ { 0, 0, printargs, "SYS_5344" }, /* 5344 */ +++ { 0, 0, printargs, "SYS_5345" }, /* 5345 */ +++ { 0, 0, printargs, "SYS_5346" }, /* 5346 */ +++ { 0, 0, printargs, "SYS_5347" }, /* 5347 */ +++ { 0, 0, printargs, "SYS_5348" }, /* 5348 */ +++ { 0, 0, printargs, "SYS_5349" }, /* 5349 */ +++ { 0, 0, printargs, "SYS_5350" }, /* 5350 */ +++ { 0, 0, printargs, "SYS_5351" }, /* 5351 */ +++ { 0, 0, printargs, "SYS_5352" }, /* 5352 */ +++ { 0, 0, printargs, "SYS_5353" }, /* 5353 */ +++ { 0, 0, printargs, "SYS_5354" }, /* 5354 */ +++ { 0, 0, printargs, "SYS_5355" }, /* 5355 */ +++ { 0, 0, printargs, "SYS_5356" }, /* 5356 */ +++ { 0, 0, printargs, "SYS_5357" }, /* 5357 */ +++ { 0, 0, printargs, "SYS_5358" }, /* 5358 */ +++ { 0, 0, printargs, "SYS_5359" }, /* 5359 */ +++ { 0, 0, printargs, "SYS_5360" }, /* 5360 */ +++ { 0, 0, printargs, "SYS_5361" }, /* 5361 */ +++ { 0, 0, printargs, "SYS_5362" }, /* 5362 */ +++ { 0, 0, printargs, "SYS_5363" }, /* 5363 */ +++ { 0, 0, printargs, "SYS_5364" }, /* 5364 */ +++ { 0, 0, printargs, "SYS_5365" }, /* 5365 */ +++ { 0, 0, printargs, "SYS_5366" }, /* 5366 */ +++ { 0, 0, printargs, "SYS_5367" }, /* 5367 */ +++ { 0, 0, printargs, "SYS_5368" }, /* 5368 */ +++ { 0, 0, printargs, "SYS_5369" }, /* 5369 */ +++ { 0, 0, printargs, "SYS_5370" }, /* 5370 */ +++ { 0, 0, printargs, "SYS_5371" }, /* 5371 */ +++ { 0, 0, printargs, "SYS_5372" }, /* 5372 */ +++ { 0, 0, printargs, "SYS_5373" }, /* 5373 */ +++ { 0, 0, printargs, "SYS_5374" }, /* 5374 */ +++ { 0, 0, printargs, "SYS_5375" }, /* 5375 */ +++ { 0, 0, printargs, "SYS_5376" }, /* 5376 */ +++ { 0, 0, printargs, "SYS_5377" }, /* 5377 */ +++ { 0, 0, printargs, "SYS_5378" }, /* 5378 */ +++ { 0, 0, printargs, "SYS_5379" }, /* 5379 */ +++ { 0, 0, printargs, "SYS_5380" }, /* 5380 */ +++ { 0, 0, printargs, "SYS_5381" }, /* 5381 */ +++ { 0, 0, printargs, "SYS_5382" }, /* 5382 */ +++ { 0, 0, printargs, "SYS_5383" }, /* 5383 */ +++ { 0, 0, printargs, "SYS_5384" }, /* 5384 */ +++ { 0, 0, printargs, "SYS_5385" }, /* 5385 */ +++ { 0, 0, printargs, "SYS_5386" }, /* 5386 */ +++ { 0, 0, printargs, "SYS_5387" }, /* 5387 */ +++ { 0, 0, printargs, "SYS_5388" }, /* 5388 */ +++ { 0, 0, printargs, "SYS_5389" }, /* 5389 */ +++ { 0, 0, printargs, "SYS_5390" }, /* 5390 */ +++ { 0, 0, printargs, "SYS_5391" }, /* 5391 */ +++ { 0, 0, printargs, "SYS_5392" }, /* 5392 */ +++ { 0, 0, printargs, "SYS_5393" }, /* 5393 */ +++ { 0, 0, printargs, "SYS_5394" }, /* 5394 */ +++ { 0, 0, printargs, "SYS_5395" }, /* 5395 */ +++ { 0, 0, printargs, "SYS_5396" }, /* 5396 */ +++ { 0, 0, printargs, "SYS_5397" }, /* 5397 */ +++ { 0, 0, printargs, "SYS_5398" }, /* 5398 */ +++ { 0, 0, printargs, "SYS_5399" }, /* 5399 */ +++ { 0, 0, printargs, "SYS_5400" }, /* 5400 */ +++ { 0, 0, printargs, "SYS_5401" }, /* 5401 */ +++ { 0, 0, printargs, "SYS_5402" }, /* 5402 */ +++ { 0, 0, printargs, "SYS_5403" }, /* 5403 */ +++ { 0, 0, printargs, "SYS_5404" }, /* 5404 */ +++ { 0, 0, printargs, "SYS_5405" }, /* 5405 */ +++ { 0, 0, printargs, "SYS_5406" }, /* 5406 */ +++ { 0, 0, printargs, "SYS_5407" }, /* 5407 */ +++ { 0, 0, printargs, "SYS_5408" }, /* 5408 */ +++ { 0, 0, printargs, "SYS_5409" }, /* 5409 */ +++ { 0, 0, printargs, "SYS_5410" }, /* 5410 */ +++ { 0, 0, printargs, "SYS_5411" }, /* 5411 */ +++ { 0, 0, printargs, "SYS_5412" }, /* 5412 */ +++ { 0, 0, printargs, "SYS_5413" }, /* 5413 */ +++ { 0, 0, printargs, "SYS_5414" }, /* 5414 */ +++ { 0, 0, printargs, "SYS_5415" }, /* 5415 */ +++ { 0, 0, printargs, "SYS_5416" }, /* 5416 */ +++ { 0, 0, printargs, "SYS_5417" }, /* 5417 */ +++ { 0, 0, printargs, "SYS_5418" }, /* 5418 */ +++ { 0, 0, printargs, "SYS_5419" }, /* 5419 */ +++ { 0, 0, printargs, "SYS_5420" }, /* 5420 */ +++ { 0, 0, printargs, "SYS_5421" }, /* 5421 */ +++ { 0, 0, printargs, "SYS_5422" }, /* 5422 */ +++ { 0, 0, printargs, "SYS_5423" }, /* 5423 */ +++ { 0, 0, printargs, "SYS_5424" }, /* 5424 */ +++ { 0, 0, printargs, "SYS_5425" }, /* 5425 */ +++ { 0, 0, printargs, "SYS_5426" }, /* 5426 */ +++ { 0, 0, printargs, "SYS_5427" }, /* 5427 */ +++ { 0, 0, printargs, "SYS_5428" }, /* 5428 */ +++ { 0, 0, printargs, "SYS_5429" }, /* 5429 */ +++ { 0, 0, printargs, "SYS_5430" }, /* 5430 */ +++ { 0, 0, printargs, "SYS_5431" }, /* 5431 */ +++ { 0, 0, printargs, "SYS_5432" }, /* 5432 */ +++ { 0, 0, printargs, "SYS_5433" }, /* 5433 */ +++ { 0, 0, printargs, "SYS_5434" }, /* 5434 */ +++ { 0, 0, printargs, "SYS_5435" }, /* 5435 */ +++ { 0, 0, printargs, "SYS_5436" }, /* 5436 */ +++ { 0, 0, printargs, "SYS_5437" }, /* 5437 */ +++ { 0, 0, printargs, "SYS_5438" }, /* 5438 */ +++ { 0, 0, printargs, "SYS_5439" }, /* 5439 */ +++ { 0, 0, printargs, "SYS_5440" }, /* 5440 */ +++ { 0, 0, printargs, "SYS_5441" }, /* 5441 */ +++ { 0, 0, printargs, "SYS_5442" }, /* 5442 */ +++ { 0, 0, printargs, "SYS_5443" }, /* 5443 */ +++ { 0, 0, printargs, "SYS_5444" }, /* 5444 */ +++ { 0, 0, printargs, "SYS_5445" }, /* 5445 */ +++ { 0, 0, printargs, "SYS_5446" }, /* 5446 */ +++ { 0, 0, printargs, "SYS_5447" }, /* 5447 */ +++ { 0, 0, printargs, "SYS_5448" }, /* 5448 */ +++ { 0, 0, printargs, "SYS_5449" }, /* 5449 */ +++ { 0, 0, printargs, "SYS_5450" }, /* 5450 */ +++ { 0, 0, printargs, "SYS_5451" }, /* 5451 */ +++ { 0, 0, printargs, "SYS_5452" }, /* 5452 */ +++ { 0, 0, printargs, "SYS_5453" }, /* 5453 */ +++ { 0, 0, printargs, "SYS_5454" }, /* 5454 */ +++ { 0, 0, printargs, "SYS_5455" }, /* 5455 */ +++ { 0, 0, printargs, "SYS_5456" }, /* 5456 */ +++ { 0, 0, printargs, "SYS_5457" }, /* 5457 */ +++ { 0, 0, printargs, "SYS_5458" }, /* 5458 */ +++ { 0, 0, printargs, "SYS_5459" }, /* 5459 */ +++ { 0, 0, printargs, "SYS_5460" }, /* 5460 */ +++ { 0, 0, printargs, "SYS_5461" }, /* 5461 */ +++ { 0, 0, printargs, "SYS_5462" }, /* 5462 */ +++ { 0, 0, printargs, "SYS_5463" }, /* 5463 */ +++ { 0, 0, printargs, "SYS_5464" }, /* 5464 */ +++ { 0, 0, printargs, "SYS_5465" }, /* 5465 */ +++ { 0, 0, printargs, "SYS_5466" }, /* 5466 */ +++ { 0, 0, printargs, "SYS_5467" }, /* 5467 */ +++ { 0, 0, printargs, "SYS_5468" }, /* 5468 */ +++ { 0, 0, printargs, "SYS_5469" }, /* 5469 */ +++ { 0, 0, printargs, "SYS_5470" }, /* 5470 */ +++ { 0, 0, printargs, "SYS_5471" }, /* 5471 */ +++ { 0, 0, printargs, "SYS_5472" }, /* 5472 */ +++ { 0, 0, printargs, "SYS_5473" }, /* 5473 */ +++ { 0, 0, printargs, "SYS_5474" }, /* 5474 */ +++ { 0, 0, printargs, "SYS_5475" }, /* 5475 */ +++ { 0, 0, printargs, "SYS_5476" }, /* 5476 */ +++ { 0, 0, printargs, "SYS_5477" }, /* 5477 */ +++ { 0, 0, printargs, "SYS_5478" }, /* 5478 */ +++ { 0, 0, printargs, "SYS_5479" }, /* 5479 */ +++ { 0, 0, printargs, "SYS_5480" }, /* 5480 */ +++ { 0, 0, printargs, "SYS_5481" }, /* 5481 */ +++ { 0, 0, printargs, "SYS_5482" }, /* 5482 */ +++ { 0, 0, printargs, "SYS_5483" }, /* 5483 */ +++ { 0, 0, printargs, "SYS_5484" }, /* 5484 */ +++ { 0, 0, printargs, "SYS_5485" }, /* 5485 */ +++ { 0, 0, printargs, "SYS_5486" }, /* 5486 */ +++ { 0, 0, printargs, "SYS_5487" }, /* 5487 */ +++ { 0, 0, printargs, "SYS_5488" }, /* 5488 */ +++ { 0, 0, printargs, "SYS_5489" }, /* 5489 */ +++ { 0, 0, printargs, "SYS_5490" }, /* 5490 */ +++ { 0, 0, printargs, "SYS_5491" }, /* 5491 */ +++ { 0, 0, printargs, "SYS_5492" }, /* 5492 */ +++ { 0, 0, printargs, "SYS_5493" }, /* 5493 */ +++ { 0, 0, printargs, "SYS_5494" }, /* 5494 */ +++ { 0, 0, printargs, "SYS_5495" }, /* 5495 */ +++ { 0, 0, printargs, "SYS_5496" }, /* 5496 */ +++ { 0, 0, printargs, "SYS_5497" }, /* 5497 */ +++ { 0, 0, printargs, "SYS_5498" }, /* 5498 */ +++ { 0, 0, printargs, "SYS_5499" }, /* 5499 */ +++ { 0, 0, printargs, "SYS_5500" }, /* 5500 */ +++ { 0, 0, printargs, "SYS_5501" }, /* 5501 */ +++ { 0, 0, printargs, "SYS_5502" }, /* 5502 */ +++ { 0, 0, printargs, "SYS_5503" }, /* 5503 */ +++ { 0, 0, printargs, "SYS_5504" }, /* 5504 */ +++ { 0, 0, printargs, "SYS_5505" }, /* 5505 */ +++ { 0, 0, printargs, "SYS_5506" }, /* 5506 */ +++ { 0, 0, printargs, "SYS_5507" }, /* 5507 */ +++ { 0, 0, printargs, "SYS_5508" }, /* 5508 */ +++ { 0, 0, printargs, "SYS_5509" }, /* 5509 */ +++ { 0, 0, printargs, "SYS_5510" }, /* 5510 */ +++ { 0, 0, printargs, "SYS_5511" }, /* 5511 */ +++ { 0, 0, printargs, "SYS_5512" }, /* 5512 */ +++ { 0, 0, printargs, "SYS_5513" }, /* 5513 */ +++ { 0, 0, printargs, "SYS_5514" }, /* 5514 */ +++ { 0, 0, printargs, "SYS_5515" }, /* 5515 */ +++ { 0, 0, printargs, "SYS_5516" }, /* 5516 */ +++ { 0, 0, printargs, "SYS_5517" }, /* 5517 */ +++ { 0, 0, printargs, "SYS_5518" }, /* 5518 */ +++ { 0, 0, printargs, "SYS_5519" }, /* 5519 */ +++ { 0, 0, printargs, "SYS_5520" }, /* 5520 */ +++ { 0, 0, printargs, "SYS_5521" }, /* 5521 */ +++ { 0, 0, printargs, "SYS_5522" }, /* 5522 */ +++ { 0, 0, printargs, "SYS_5523" }, /* 5523 */ +++ { 0, 0, printargs, "SYS_5524" }, /* 5524 */ +++ { 0, 0, printargs, "SYS_5525" }, /* 5525 */ +++ { 0, 0, printargs, "SYS_5526" }, /* 5526 */ +++ { 0, 0, printargs, "SYS_5527" }, /* 5527 */ +++ { 0, 0, printargs, "SYS_5528" }, /* 5528 */ +++ { 0, 0, printargs, "SYS_5529" }, /* 5529 */ +++ { 0, 0, printargs, "SYS_5530" }, /* 5530 */ +++ { 0, 0, printargs, "SYS_5531" }, /* 5531 */ +++ { 0, 0, printargs, "SYS_5532" }, /* 5532 */ +++ { 0, 0, printargs, "SYS_5533" }, /* 5533 */ +++ { 0, 0, printargs, "SYS_5534" }, /* 5534 */ +++ { 0, 0, printargs, "SYS_5535" }, /* 5535 */ +++ { 0, 0, printargs, "SYS_5536" }, /* 5536 */ +++ { 0, 0, printargs, "SYS_5537" }, /* 5537 */ +++ { 0, 0, printargs, "SYS_5538" }, /* 5538 */ +++ { 0, 0, printargs, "SYS_5539" }, /* 5539 */ +++ { 0, 0, printargs, "SYS_5540" }, /* 5540 */ +++ { 0, 0, printargs, "SYS_5541" }, /* 5541 */ +++ { 0, 0, printargs, "SYS_5542" }, /* 5542 */ +++ { 0, 0, printargs, "SYS_5543" }, /* 5543 */ +++ { 0, 0, printargs, "SYS_5544" }, /* 5544 */ +++ { 0, 0, printargs, "SYS_5545" }, /* 5545 */ +++ { 0, 0, printargs, "SYS_5546" }, /* 5546 */ +++ { 0, 0, printargs, "SYS_5547" }, /* 5547 */ +++ { 0, 0, printargs, "SYS_5548" }, /* 5548 */ +++ { 0, 0, printargs, "SYS_5549" }, /* 5549 */ +++ { 0, 0, printargs, "SYS_5550" }, /* 5550 */ +++ { 0, 0, printargs, "SYS_5551" }, /* 5551 */ +++ { 0, 0, printargs, "SYS_5552" }, /* 5552 */ +++ { 0, 0, printargs, "SYS_5553" }, /* 5553 */ +++ { 0, 0, printargs, "SYS_5554" }, /* 5554 */ +++ { 0, 0, printargs, "SYS_5555" }, /* 5555 */ +++ { 0, 0, printargs, "SYS_5556" }, /* 5556 */ +++ { 0, 0, printargs, "SYS_5557" }, /* 5557 */ +++ { 0, 0, printargs, "SYS_5558" }, /* 5558 */ +++ { 0, 0, printargs, "SYS_5559" }, /* 5559 */ +++ { 0, 0, printargs, "SYS_5560" }, /* 5560 */ +++ { 0, 0, printargs, "SYS_5561" }, /* 5561 */ +++ { 0, 0, printargs, "SYS_5562" }, /* 5562 */ +++ { 0, 0, printargs, "SYS_5563" }, /* 5563 */ +++ { 0, 0, printargs, "SYS_5564" }, /* 5564 */ +++ { 0, 0, printargs, "SYS_5565" }, /* 5565 */ +++ { 0, 0, printargs, "SYS_5566" }, /* 5566 */ +++ { 0, 0, printargs, "SYS_5567" }, /* 5567 */ +++ { 0, 0, printargs, "SYS_5568" }, /* 5568 */ +++ { 0, 0, printargs, "SYS_5569" }, /* 5569 */ +++ { 0, 0, printargs, "SYS_5570" }, /* 5570 */ +++ { 0, 0, printargs, "SYS_5571" }, /* 5571 */ +++ { 0, 0, printargs, "SYS_5572" }, /* 5572 */ +++ { 0, 0, printargs, "SYS_5573" }, /* 5573 */ +++ { 0, 0, printargs, "SYS_5574" }, /* 5574 */ +++ { 0, 0, printargs, "SYS_5575" }, /* 5575 */ +++ { 0, 0, printargs, "SYS_5576" }, /* 5576 */ +++ { 0, 0, printargs, "SYS_5577" }, /* 5577 */ +++ { 0, 0, printargs, "SYS_5578" }, /* 5578 */ +++ { 0, 0, printargs, "SYS_5579" }, /* 5579 */ +++ { 0, 0, printargs, "SYS_5580" }, /* 5580 */ +++ { 0, 0, printargs, "SYS_5581" }, /* 5581 */ +++ { 0, 0, printargs, "SYS_5582" }, /* 5582 */ +++ { 0, 0, printargs, "SYS_5583" }, /* 5583 */ +++ { 0, 0, printargs, "SYS_5584" }, /* 5584 */ +++ { 0, 0, printargs, "SYS_5585" }, /* 5585 */ +++ { 0, 0, printargs, "SYS_5586" }, /* 5586 */ +++ { 0, 0, printargs, "SYS_5587" }, /* 5587 */ +++ { 0, 0, printargs, "SYS_5588" }, /* 5588 */ +++ { 0, 0, printargs, "SYS_5589" }, /* 5589 */ +++ { 0, 0, printargs, "SYS_5590" }, /* 5590 */ +++ { 0, 0, printargs, "SYS_5591" }, /* 5591 */ +++ { 0, 0, printargs, "SYS_5592" }, /* 5592 */ +++ { 0, 0, printargs, "SYS_5593" }, /* 5593 */ +++ { 0, 0, printargs, "SYS_5594" }, /* 5594 */ +++ { 0, 0, printargs, "SYS_5595" }, /* 5595 */ +++ { 0, 0, printargs, "SYS_5596" }, /* 5596 */ +++ { 0, 0, printargs, "SYS_5597" }, /* 5597 */ +++ { 0, 0, printargs, "SYS_5598" }, /* 5598 */ +++ { 0, 0, printargs, "SYS_5599" }, /* 5599 */ +++ { 0, 0, printargs, "SYS_5600" }, /* 5600 */ +++ { 0, 0, printargs, "SYS_5601" }, /* 5601 */ +++ { 0, 0, printargs, "SYS_5602" }, /* 5602 */ +++ { 0, 0, printargs, "SYS_5603" }, /* 5603 */ +++ { 0, 0, printargs, "SYS_5604" }, /* 5604 */ +++ { 0, 0, printargs, "SYS_5605" }, /* 5605 */ +++ { 0, 0, printargs, "SYS_5606" }, /* 5606 */ +++ { 0, 0, printargs, "SYS_5607" }, /* 5607 */ +++ { 0, 0, printargs, "SYS_5608" }, /* 5608 */ +++ { 0, 0, printargs, "SYS_5609" }, /* 5609 */ +++ { 0, 0, printargs, "SYS_5610" }, /* 5610 */ +++ { 0, 0, printargs, "SYS_5611" }, /* 5611 */ +++ { 0, 0, printargs, "SYS_5612" }, /* 5612 */ +++ { 0, 0, printargs, "SYS_5613" }, /* 5613 */ +++ { 0, 0, printargs, "SYS_5614" }, /* 5614 */ +++ { 0, 0, printargs, "SYS_5615" }, /* 5615 */ +++ { 0, 0, printargs, "SYS_5616" }, /* 5616 */ +++ { 0, 0, printargs, "SYS_5617" }, /* 5617 */ +++ { 0, 0, printargs, "SYS_5618" }, /* 5618 */ +++ { 0, 0, printargs, "SYS_5619" }, /* 5619 */ +++ { 0, 0, printargs, "SYS_5620" }, /* 5620 */ +++ { 0, 0, printargs, "SYS_5621" }, /* 5621 */ +++ { 0, 0, printargs, "SYS_5622" }, /* 5622 */ +++ { 0, 0, printargs, "SYS_5623" }, /* 5623 */ +++ { 0, 0, printargs, "SYS_5624" }, /* 5624 */ +++ { 0, 0, printargs, "SYS_5625" }, /* 5625 */ +++ { 0, 0, printargs, "SYS_5626" }, /* 5626 */ +++ { 0, 0, printargs, "SYS_5627" }, /* 5627 */ +++ { 0, 0, printargs, "SYS_5628" }, /* 5628 */ +++ { 0, 0, printargs, "SYS_5629" }, /* 5629 */ +++ { 0, 0, printargs, "SYS_5630" }, /* 5630 */ +++ { 0, 0, printargs, "SYS_5631" }, /* 5631 */ +++ { 0, 0, printargs, "SYS_5632" }, /* 5632 */ +++ { 0, 0, printargs, "SYS_5633" }, /* 5633 */ +++ { 0, 0, printargs, "SYS_5634" }, /* 5634 */ +++ { 0, 0, printargs, "SYS_5635" }, /* 5635 */ +++ { 0, 0, printargs, "SYS_5636" }, /* 5636 */ +++ { 0, 0, printargs, "SYS_5637" }, /* 5637 */ +++ { 0, 0, printargs, "SYS_5638" }, /* 5638 */ +++ { 0, 0, printargs, "SYS_5639" }, /* 5639 */ +++ { 0, 0, printargs, "SYS_5640" }, /* 5640 */ +++ { 0, 0, printargs, "SYS_5641" }, /* 5641 */ +++ { 0, 0, printargs, "SYS_5642" }, /* 5642 */ +++ { 0, 0, printargs, "SYS_5643" }, /* 5643 */ +++ { 0, 0, printargs, "SYS_5644" }, /* 5644 */ +++ { 0, 0, printargs, "SYS_5645" }, /* 5645 */ +++ { 0, 0, printargs, "SYS_5646" }, /* 5646 */ +++ { 0, 0, printargs, "SYS_5647" }, /* 5647 */ +++ { 0, 0, printargs, "SYS_5648" }, /* 5648 */ +++ { 0, 0, printargs, "SYS_5649" }, /* 5649 */ +++ { 0, 0, printargs, "SYS_5650" }, /* 5650 */ +++ { 0, 0, printargs, "SYS_5651" }, /* 5651 */ +++ { 0, 0, printargs, "SYS_5652" }, /* 5652 */ +++ { 0, 0, printargs, "SYS_5653" }, /* 5653 */ +++ { 0, 0, printargs, "SYS_5654" }, /* 5654 */ +++ { 0, 0, printargs, "SYS_5655" }, /* 5655 */ +++ { 0, 0, printargs, "SYS_5656" }, /* 5656 */ +++ { 0, 0, printargs, "SYS_5657" }, /* 5657 */ +++ { 0, 0, printargs, "SYS_5658" }, /* 5658 */ +++ { 0, 0, printargs, "SYS_5659" }, /* 5659 */ +++ { 0, 0, printargs, "SYS_5660" }, /* 5660 */ +++ { 0, 0, printargs, "SYS_5661" }, /* 5661 */ +++ { 0, 0, printargs, "SYS_5662" }, /* 5662 */ +++ { 0, 0, printargs, "SYS_5663" }, /* 5663 */ +++ { 0, 0, printargs, "SYS_5664" }, /* 5664 */ +++ { 0, 0, printargs, "SYS_5665" }, /* 5665 */ +++ { 0, 0, printargs, "SYS_5666" }, /* 5666 */ +++ { 0, 0, printargs, "SYS_5667" }, /* 5667 */ +++ { 0, 0, printargs, "SYS_5668" }, /* 5668 */ +++ { 0, 0, printargs, "SYS_5669" }, /* 5669 */ +++ { 0, 0, printargs, "SYS_5670" }, /* 5670 */ +++ { 0, 0, printargs, "SYS_5671" }, /* 5671 */ +++ { 0, 0, printargs, "SYS_5672" }, /* 5672 */ +++ { 0, 0, printargs, "SYS_5673" }, /* 5673 */ +++ { 0, 0, printargs, "SYS_5674" }, /* 5674 */ +++ { 0, 0, printargs, "SYS_5675" }, /* 5675 */ +++ { 0, 0, printargs, "SYS_5676" }, /* 5676 */ +++ { 0, 0, printargs, "SYS_5677" }, /* 5677 */ +++ { 0, 0, printargs, "SYS_5678" }, /* 5678 */ +++ { 0, 0, printargs, "SYS_5679" }, /* 5679 */ +++ { 0, 0, printargs, "SYS_5680" }, /* 5680 */ +++ { 0, 0, printargs, "SYS_5681" }, /* 5681 */ +++ { 0, 0, printargs, "SYS_5682" }, /* 5682 */ +++ { 0, 0, printargs, "SYS_5683" }, /* 5683 */ +++ { 0, 0, printargs, "SYS_5684" }, /* 5684 */ +++ { 0, 0, printargs, "SYS_5685" }, /* 5685 */ +++ { 0, 0, printargs, "SYS_5686" }, /* 5686 */ +++ { 0, 0, printargs, "SYS_5687" }, /* 5687 */ +++ { 0, 0, printargs, "SYS_5688" }, /* 5688 */ +++ { 0, 0, printargs, "SYS_5689" }, /* 5689 */ +++ { 0, 0, printargs, "SYS_5690" }, /* 5690 */ +++ { 0, 0, printargs, "SYS_5691" }, /* 5691 */ +++ { 0, 0, printargs, "SYS_5692" }, /* 5692 */ +++ { 0, 0, printargs, "SYS_5693" }, /* 5693 */ +++ { 0, 0, printargs, "SYS_5694" }, /* 5694 */ +++ { 0, 0, printargs, "SYS_5695" }, /* 5695 */ +++ { 0, 0, printargs, "SYS_5696" }, /* 5696 */ +++ { 0, 0, printargs, "SYS_5697" }, /* 5697 */ +++ { 0, 0, printargs, "SYS_5698" }, /* 5698 */ +++ { 0, 0, printargs, "SYS_5699" }, /* 5699 */ +++ { 0, 0, printargs, "SYS_5700" }, /* 5700 */ +++ { 0, 0, printargs, "SYS_5701" }, /* 5701 */ +++ { 0, 0, printargs, "SYS_5702" }, /* 5702 */ +++ { 0, 0, printargs, "SYS_5703" }, /* 5703 */ +++ { 0, 0, printargs, "SYS_5704" }, /* 5704 */ +++ { 0, 0, printargs, "SYS_5705" }, /* 5705 */ +++ { 0, 0, printargs, "SYS_5706" }, /* 5706 */ +++ { 0, 0, printargs, "SYS_5707" }, /* 5707 */ +++ { 0, 0, printargs, "SYS_5708" }, /* 5708 */ +++ { 0, 0, printargs, "SYS_5709" }, /* 5709 */ +++ { 0, 0, printargs, "SYS_5710" }, /* 5710 */ +++ { 0, 0, printargs, "SYS_5711" }, /* 5711 */ +++ { 0, 0, printargs, "SYS_5712" }, /* 5712 */ +++ { 0, 0, printargs, "SYS_5713" }, /* 5713 */ +++ { 0, 0, printargs, "SYS_5714" }, /* 5714 */ +++ { 0, 0, printargs, "SYS_5715" }, /* 5715 */ +++ { 0, 0, printargs, "SYS_5716" }, /* 5716 */ +++ { 0, 0, printargs, "SYS_5717" }, /* 5717 */ +++ { 0, 0, printargs, "SYS_5718" }, /* 5718 */ +++ { 0, 0, printargs, "SYS_5719" }, /* 5719 */ +++ { 0, 0, printargs, "SYS_5720" }, /* 5720 */ +++ { 0, 0, printargs, "SYS_5721" }, /* 5721 */ +++ { 0, 0, printargs, "SYS_5722" }, /* 5722 */ +++ { 0, 0, printargs, "SYS_5723" }, /* 5723 */ +++ { 0, 0, printargs, "SYS_5724" }, /* 5724 */ +++ { 0, 0, printargs, "SYS_5725" }, /* 5725 */ +++ { 0, 0, printargs, "SYS_5726" }, /* 5726 */ +++ { 0, 0, printargs, "SYS_5727" }, /* 5727 */ +++ { 0, 0, printargs, "SYS_5728" }, /* 5728 */ +++ { 0, 0, printargs, "SYS_5729" }, /* 5729 */ +++ { 0, 0, printargs, "SYS_5730" }, /* 5730 */ +++ { 0, 0, printargs, "SYS_5731" }, /* 5731 */ +++ { 0, 0, printargs, "SYS_5732" }, /* 5732 */ +++ { 0, 0, printargs, "SYS_5733" }, /* 5733 */ +++ { 0, 0, printargs, "SYS_5734" }, /* 5734 */ +++ { 0, 0, printargs, "SYS_5735" }, /* 5735 */ +++ { 0, 0, printargs, "SYS_5736" }, /* 5736 */ +++ { 0, 0, printargs, "SYS_5737" }, /* 5737 */ +++ { 0, 0, printargs, "SYS_5738" }, /* 5738 */ +++ { 0, 0, printargs, "SYS_5739" }, /* 5739 */ +++ { 0, 0, printargs, "SYS_5740" }, /* 5740 */ +++ { 0, 0, printargs, "SYS_5741" }, /* 5741 */ +++ { 0, 0, printargs, "SYS_5742" }, /* 5742 */ +++ { 0, 0, printargs, "SYS_5743" }, /* 5743 */ +++ { 0, 0, printargs, "SYS_5744" }, /* 5744 */ +++ { 0, 0, printargs, "SYS_5745" }, /* 5745 */ +++ { 0, 0, printargs, "SYS_5746" }, /* 5746 */ +++ { 0, 0, printargs, "SYS_5747" }, /* 5747 */ +++ { 0, 0, printargs, "SYS_5748" }, /* 5748 */ +++ { 0, 0, printargs, "SYS_5749" }, /* 5749 */ +++ { 0, 0, printargs, "SYS_5750" }, /* 5750 */ +++ { 0, 0, printargs, "SYS_5751" }, /* 5751 */ +++ { 0, 0, printargs, "SYS_5752" }, /* 5752 */ +++ { 0, 0, printargs, "SYS_5753" }, /* 5753 */ +++ { 0, 0, printargs, "SYS_5754" }, /* 5754 */ +++ { 0, 0, printargs, "SYS_5755" }, /* 5755 */ +++ { 0, 0, printargs, "SYS_5756" }, /* 5756 */ +++ { 0, 0, printargs, "SYS_5757" }, /* 5757 */ +++ { 0, 0, printargs, "SYS_5758" }, /* 5758 */ +++ { 0, 0, printargs, "SYS_5759" }, /* 5759 */ +++ { 0, 0, printargs, "SYS_5760" }, /* 5760 */ +++ { 0, 0, printargs, "SYS_5761" }, /* 5761 */ +++ { 0, 0, printargs, "SYS_5762" }, /* 5762 */ +++ { 0, 0, printargs, "SYS_5763" }, /* 5763 */ +++ { 0, 0, printargs, "SYS_5764" }, /* 5764 */ +++ { 0, 0, printargs, "SYS_5765" }, /* 5765 */ +++ { 0, 0, printargs, "SYS_5766" }, /* 5766 */ +++ { 0, 0, printargs, "SYS_5767" }, /* 5767 */ +++ { 0, 0, printargs, "SYS_5768" }, /* 5768 */ +++ { 0, 0, printargs, "SYS_5769" }, /* 5769 */ +++ { 0, 0, printargs, "SYS_5770" }, /* 5770 */ +++ { 0, 0, printargs, "SYS_5771" }, /* 5771 */ +++ { 0, 0, printargs, "SYS_5772" }, /* 5772 */ +++ { 0, 0, printargs, "SYS_5773" }, /* 5773 */ +++ { 0, 0, printargs, "SYS_5774" }, /* 5774 */ +++ { 0, 0, printargs, "SYS_5775" }, /* 5775 */ +++ { 0, 0, printargs, "SYS_5776" }, /* 5776 */ +++ { 0, 0, printargs, "SYS_5777" }, /* 5777 */ +++ { 0, 0, printargs, "SYS_5778" }, /* 5778 */ +++ { 0, 0, printargs, "SYS_5779" }, /* 5779 */ +++ { 0, 0, printargs, "SYS_5780" }, /* 5780 */ +++ { 0, 0, printargs, "SYS_5781" }, /* 5781 */ +++ { 0, 0, printargs, "SYS_5782" }, /* 5782 */ +++ { 0, 0, printargs, "SYS_5783" }, /* 5783 */ +++ { 0, 0, printargs, "SYS_5784" }, /* 5784 */ +++ { 0, 0, printargs, "SYS_5785" }, /* 5785 */ +++ { 0, 0, printargs, "SYS_5786" }, /* 5786 */ +++ { 0, 0, printargs, "SYS_5787" }, /* 5787 */ +++ { 0, 0, printargs, "SYS_5788" }, /* 5788 */ +++ { 0, 0, printargs, "SYS_5789" }, /* 5789 */ +++ { 0, 0, printargs, "SYS_5790" }, /* 5790 */ +++ { 0, 0, printargs, "SYS_5791" }, /* 5791 */ +++ { 0, 0, printargs, "SYS_5792" }, /* 5792 */ +++ { 0, 0, printargs, "SYS_5793" }, /* 5793 */ +++ { 0, 0, printargs, "SYS_5794" }, /* 5794 */ +++ { 0, 0, printargs, "SYS_5795" }, /* 5795 */ +++ { 0, 0, printargs, "SYS_5796" }, /* 5796 */ +++ { 0, 0, printargs, "SYS_5797" }, /* 5797 */ +++ { 0, 0, printargs, "SYS_5798" }, /* 5798 */ +++ { 0, 0, printargs, "SYS_5799" }, /* 5799 */ +++ { 0, 0, printargs, "SYS_5800" }, /* 5800 */ +++ { 0, 0, printargs, "SYS_5801" }, /* 5801 */ +++ { 0, 0, printargs, "SYS_5802" }, /* 5802 */ +++ { 0, 0, printargs, "SYS_5803" }, /* 5803 */ +++ { 0, 0, printargs, "SYS_5804" }, /* 5804 */ +++ { 0, 0, printargs, "SYS_5805" }, /* 5805 */ +++ { 0, 0, printargs, "SYS_5806" }, /* 5806 */ +++ { 0, 0, printargs, "SYS_5807" }, /* 5807 */ +++ { 0, 0, printargs, "SYS_5808" }, /* 5808 */ +++ { 0, 0, printargs, "SYS_5809" }, /* 5809 */ +++ { 0, 0, printargs, "SYS_5810" }, /* 5810 */ +++ { 0, 0, printargs, "SYS_5811" }, /* 5811 */ +++ { 0, 0, printargs, "SYS_5812" }, /* 5812 */ +++ { 0, 0, printargs, "SYS_5813" }, /* 5813 */ +++ { 0, 0, printargs, "SYS_5814" }, /* 5814 */ +++ { 0, 0, printargs, "SYS_5815" }, /* 5815 */ +++ { 0, 0, printargs, "SYS_5816" }, /* 5816 */ +++ { 0, 0, printargs, "SYS_5817" }, /* 5817 */ +++ { 0, 0, printargs, "SYS_5818" }, /* 5818 */ +++ { 0, 0, printargs, "SYS_5819" }, /* 5819 */ +++ { 0, 0, printargs, "SYS_5820" }, /* 5820 */ +++ { 0, 0, printargs, "SYS_5821" }, /* 5821 */ +++ { 0, 0, printargs, "SYS_5822" }, /* 5822 */ +++ { 0, 0, printargs, "SYS_5823" }, /* 5823 */ +++ { 0, 0, printargs, "SYS_5824" }, /* 5824 */ +++ { 0, 0, printargs, "SYS_5825" }, /* 5825 */ +++ { 0, 0, printargs, "SYS_5826" }, /* 5826 */ +++ { 0, 0, printargs, "SYS_5827" }, /* 5827 */ +++ { 0, 0, printargs, "SYS_5828" }, /* 5828 */ +++ { 0, 0, printargs, "SYS_5829" }, /* 5829 */ +++ { 0, 0, printargs, "SYS_5830" }, /* 5830 */ +++ { 0, 0, printargs, "SYS_5831" }, /* 5831 */ +++ { 0, 0, printargs, "SYS_5832" }, /* 5832 */ +++ { 0, 0, printargs, "SYS_5833" }, /* 5833 */ +++ { 0, 0, printargs, "SYS_5834" }, /* 5834 */ +++ { 0, 0, printargs, "SYS_5835" }, /* 5835 */ +++ { 0, 0, printargs, "SYS_5836" }, /* 5836 */ +++ { 0, 0, printargs, "SYS_5837" }, /* 5837 */ +++ { 0, 0, printargs, "SYS_5838" }, /* 5838 */ +++ { 0, 0, printargs, "SYS_5839" }, /* 5839 */ +++ { 0, 0, printargs, "SYS_5840" }, /* 5840 */ +++ { 0, 0, printargs, "SYS_5841" }, /* 5841 */ +++ { 0, 0, printargs, "SYS_5842" }, /* 5842 */ +++ { 0, 0, printargs, "SYS_5843" }, /* 5843 */ +++ { 0, 0, printargs, "SYS_5844" }, /* 5844 */ +++ { 0, 0, printargs, "SYS_5845" }, /* 5845 */ +++ { 0, 0, printargs, "SYS_5846" }, /* 5846 */ +++ { 0, 0, printargs, "SYS_5847" }, /* 5847 */ +++ { 0, 0, printargs, "SYS_5848" }, /* 5848 */ +++ { 0, 0, printargs, "SYS_5849" }, /* 5849 */ +++ { 0, 0, printargs, "SYS_5850" }, /* 5850 */ +++ { 0, 0, printargs, "SYS_5851" }, /* 5851 */ +++ { 0, 0, printargs, "SYS_5852" }, /* 5852 */ +++ { 0, 0, printargs, "SYS_5853" }, /* 5853 */ +++ { 0, 0, printargs, "SYS_5854" }, /* 5854 */ +++ { 0, 0, printargs, "SYS_5855" }, /* 5855 */ +++ { 0, 0, printargs, "SYS_5856" }, /* 5856 */ +++ { 0, 0, printargs, "SYS_5857" }, /* 5857 */ +++ { 0, 0, printargs, "SYS_5858" }, /* 5858 */ +++ { 0, 0, printargs, "SYS_5859" }, /* 5859 */ +++ { 0, 0, printargs, "SYS_5860" }, /* 5860 */ +++ { 0, 0, printargs, "SYS_5861" }, /* 5861 */ +++ { 0, 0, printargs, "SYS_5862" }, /* 5862 */ +++ { 0, 0, printargs, "SYS_5863" }, /* 5863 */ +++ { 0, 0, printargs, "SYS_5864" }, /* 5864 */ +++ { 0, 0, printargs, "SYS_5865" }, /* 5865 */ +++ { 0, 0, printargs, "SYS_5866" }, /* 5866 */ +++ { 0, 0, printargs, "SYS_5867" }, /* 5867 */ +++ { 0, 0, printargs, "SYS_5868" }, /* 5868 */ +++ { 0, 0, printargs, "SYS_5869" }, /* 5869 */ +++ { 0, 0, printargs, "SYS_5870" }, /* 5870 */ +++ { 0, 0, printargs, "SYS_5871" }, /* 5871 */ +++ { 0, 0, printargs, "SYS_5872" }, /* 5872 */ +++ { 0, 0, printargs, "SYS_5873" }, /* 5873 */ +++ { 0, 0, printargs, "SYS_5874" }, /* 5874 */ +++ { 0, 0, printargs, "SYS_5875" }, /* 5875 */ +++ { 0, 0, printargs, "SYS_5876" }, /* 5876 */ +++ { 0, 0, printargs, "SYS_5877" }, /* 5877 */ +++ { 0, 0, printargs, "SYS_5878" }, /* 5878 */ +++ { 0, 0, printargs, "SYS_5879" }, /* 5879 */ +++ { 0, 0, printargs, "SYS_5880" }, /* 5880 */ +++ { 0, 0, printargs, "SYS_5881" }, /* 5881 */ +++ { 0, 0, printargs, "SYS_5882" }, /* 5882 */ +++ { 0, 0, printargs, "SYS_5883" }, /* 5883 */ +++ { 0, 0, printargs, "SYS_5884" }, /* 5884 */ +++ { 0, 0, printargs, "SYS_5885" }, /* 5885 */ +++ { 0, 0, printargs, "SYS_5886" }, /* 5886 */ +++ { 0, 0, printargs, "SYS_5887" }, /* 5887 */ +++ { 0, 0, printargs, "SYS_5888" }, /* 5888 */ +++ { 0, 0, printargs, "SYS_5889" }, /* 5889 */ +++ { 0, 0, printargs, "SYS_5890" }, /* 5890 */ +++ { 0, 0, printargs, "SYS_5891" }, /* 5891 */ +++ { 0, 0, printargs, "SYS_5892" }, /* 5892 */ +++ { 0, 0, printargs, "SYS_5893" }, /* 5893 */ +++ { 0, 0, printargs, "SYS_5894" }, /* 5894 */ +++ { 0, 0, printargs, "SYS_5895" }, /* 5895 */ +++ { 0, 0, printargs, "SYS_5896" }, /* 5896 */ +++ { 0, 0, printargs, "SYS_5897" }, /* 5897 */ +++ { 0, 0, printargs, "SYS_5898" }, /* 5898 */ +++ { 0, 0, printargs, "SYS_5899" }, /* 5899 */ +++ { 0, 0, printargs, "SYS_5900" }, /* 5900 */ +++ { 0, 0, printargs, "SYS_5901" }, /* 5901 */ +++ { 0, 0, printargs, "SYS_5902" }, /* 5902 */ +++ { 0, 0, printargs, "SYS_5903" }, /* 5903 */ +++ { 0, 0, printargs, "SYS_5904" }, /* 5904 */ +++ { 0, 0, printargs, "SYS_5905" }, /* 5905 */ +++ { 0, 0, printargs, "SYS_5906" }, /* 5906 */ +++ { 0, 0, printargs, "SYS_5907" }, /* 5907 */ +++ { 0, 0, printargs, "SYS_5908" }, /* 5908 */ +++ { 0, 0, printargs, "SYS_5909" }, /* 5909 */ +++ { 0, 0, printargs, "SYS_5910" }, /* 5910 */ +++ { 0, 0, printargs, "SYS_5911" }, /* 5911 */ +++ { 0, 0, printargs, "SYS_5912" }, /* 5912 */ +++ { 0, 0, printargs, "SYS_5913" }, /* 5913 */ +++ { 0, 0, printargs, "SYS_5914" }, /* 5914 */ +++ { 0, 0, printargs, "SYS_5915" }, /* 5915 */ +++ { 0, 0, printargs, "SYS_5916" }, /* 5916 */ +++ { 0, 0, printargs, "SYS_5917" }, /* 5917 */ +++ { 0, 0, printargs, "SYS_5918" }, /* 5918 */ +++ { 0, 0, printargs, "SYS_5919" }, /* 5919 */ +++ { 0, 0, printargs, "SYS_5920" }, /* 5920 */ +++ { 0, 0, printargs, "SYS_5921" }, /* 5921 */ +++ { 0, 0, printargs, "SYS_5922" }, /* 5922 */ +++ { 0, 0, printargs, "SYS_5923" }, /* 5923 */ +++ { 0, 0, printargs, "SYS_5924" }, /* 5924 */ +++ { 0, 0, printargs, "SYS_5925" }, /* 5925 */ +++ { 0, 0, printargs, "SYS_5926" }, /* 5926 */ +++ { 0, 0, printargs, "SYS_5927" }, /* 5927 */ +++ { 0, 0, printargs, "SYS_5928" }, /* 5928 */ +++ { 0, 0, printargs, "SYS_5929" }, /* 5929 */ +++ { 0, 0, printargs, "SYS_5930" }, /* 5930 */ +++ { 0, 0, printargs, "SYS_5931" }, /* 5931 */ +++ { 0, 0, printargs, "SYS_5932" }, /* 5932 */ +++ { 0, 0, printargs, "SYS_5933" }, /* 5933 */ +++ { 0, 0, printargs, "SYS_5934" }, /* 5934 */ +++ { 0, 0, printargs, "SYS_5935" }, /* 5935 */ +++ { 0, 0, printargs, "SYS_5936" }, /* 5936 */ +++ { 0, 0, printargs, "SYS_5937" }, /* 5937 */ +++ { 0, 0, printargs, "SYS_5938" }, /* 5938 */ +++ { 0, 0, printargs, "SYS_5939" }, /* 5939 */ +++ { 0, 0, printargs, "SYS_5940" }, /* 5940 */ +++ { 0, 0, printargs, "SYS_5941" }, /* 5941 */ +++ { 0, 0, printargs, "SYS_5942" }, /* 5942 */ +++ { 0, 0, printargs, "SYS_5943" }, /* 5943 */ +++ { 0, 0, printargs, "SYS_5944" }, /* 5944 */ +++ { 0, 0, printargs, "SYS_5945" }, /* 5945 */ +++ { 0, 0, printargs, "SYS_5946" }, /* 5946 */ +++ { 0, 0, printargs, "SYS_5947" }, /* 5947 */ +++ { 0, 0, printargs, "SYS_5948" }, /* 5948 */ +++ { 0, 0, printargs, "SYS_5949" }, /* 5949 */ +++ { 0, 0, printargs, "SYS_5950" }, /* 5950 */ +++ { 0, 0, printargs, "SYS_5951" }, /* 5951 */ +++ { 0, 0, printargs, "SYS_5952" }, /* 5952 */ +++ { 0, 0, printargs, "SYS_5953" }, /* 5953 */ +++ { 0, 0, printargs, "SYS_5954" }, /* 5954 */ +++ { 0, 0, printargs, "SYS_5955" }, /* 5955 */ +++ { 0, 0, printargs, "SYS_5956" }, /* 5956 */ +++ { 0, 0, printargs, "SYS_5957" }, /* 5957 */ +++ { 0, 0, printargs, "SYS_5958" }, /* 5958 */ +++ { 0, 0, printargs, "SYS_5959" }, /* 5959 */ +++ { 0, 0, printargs, "SYS_5960" }, /* 5960 */ +++ { 0, 0, printargs, "SYS_5961" }, /* 5961 */ +++ { 0, 0, printargs, "SYS_5962" }, /* 5962 */ +++ { 0, 0, printargs, "SYS_5963" }, /* 5963 */ +++ { 0, 0, printargs, "SYS_5964" }, /* 5964 */ +++ { 0, 0, printargs, "SYS_5965" }, /* 5965 */ +++ { 0, 0, printargs, "SYS_5966" }, /* 5966 */ +++ { 0, 0, printargs, "SYS_5967" }, /* 5967 */ +++ { 0, 0, printargs, "SYS_5968" }, /* 5968 */ +++ { 0, 0, printargs, "SYS_5969" }, /* 5969 */ +++ { 0, 0, printargs, "SYS_5970" }, /* 5970 */ +++ { 0, 0, printargs, "SYS_5971" }, /* 5971 */ +++ { 0, 0, printargs, "SYS_5972" }, /* 5972 */ +++ { 0, 0, printargs, "SYS_5973" }, /* 5973 */ +++ { 0, 0, printargs, "SYS_5974" }, /* 5974 */ +++ { 0, 0, printargs, "SYS_5975" }, /* 5975 */ +++ { 0, 0, printargs, "SYS_5976" }, /* 5976 */ +++ { 0, 0, printargs, "SYS_5977" }, /* 5977 */ +++ { 0, 0, printargs, "SYS_5978" }, /* 5978 */ +++ { 0, 0, printargs, "SYS_5979" }, /* 5979 */ +++ { 0, 0, printargs, "SYS_5980" }, /* 5980 */ +++ { 0, 0, printargs, "SYS_5981" }, /* 5981 */ +++ { 0, 0, printargs, "SYS_5982" }, /* 5982 */ +++ { 0, 0, printargs, "SYS_5983" }, /* 5983 */ +++ { 0, 0, printargs, "SYS_5984" }, /* 5984 */ +++ { 0, 0, printargs, "SYS_5985" }, /* 5985 */ +++ { 0, 0, printargs, "SYS_5986" }, /* 5986 */ +++ { 0, 0, printargs, "SYS_5987" }, /* 5987 */ +++ { 0, 0, printargs, "SYS_5988" }, /* 5988 */ +++ { 0, 0, printargs, "SYS_5989" }, /* 5989 */ +++ { 0, 0, printargs, "SYS_5990" }, /* 5990 */ +++ { 0, 0, printargs, "SYS_5991" }, /* 5991 */ +++ { 0, 0, printargs, "SYS_5992" }, /* 5992 */ +++ { 0, 0, printargs, "SYS_5993" }, /* 5993 */ +++ { 0, 0, printargs, "SYS_5994" }, /* 5994 */ +++ { 0, 0, printargs, "SYS_5995" }, /* 5995 */ +++ { 0, 0, printargs, "SYS_5996" }, /* 5996 */ +++ { 0, 0, printargs, "SYS_5997" }, /* 5997 */ +++ { 0, 0, printargs, "SYS_5998" }, /* 5998 */ +++ { 0, 0, printargs, "SYS_5999" }, /* 5999 */ /* end of Linux N64 */ +++ +++#if defined (LINUX_MIPSN32) +++ /* For an N32 strace decode the N32 64-bit syscalls. */ +++ { 3, TF, sys_read, "read" }, /* 6000 */ /* start of Linux N32 */ +++ { 3, TF, sys_write, "write" }, /* 6001 */ +++ { 3, TF, sys_open, "open" }, /* 6002 */ +++ { 1, 0, sys_close, "close" }, /* 6003 */ +++ { 2, TF, sys_stat64, "stat" }, /* 6004 */ +++ { 2, 0, sys_fstat64, "fstat" }, /* 6005 */ +++ { 2, TF, sys_lstat64, "lstat" }, /* 6006 */ +++ { 3, 0, sys_poll, "poll" }, /* 6007 */ +++ { 3, 0, sys_lseek, "lseek" }, /* 6008 */ +++ { 6, 0, sys_mmap, "mmap" }, /* 6009 */ +++ { 3, 0, sys_mprotect, "mprotect" }, /* 6010 */ +++ { 2, 0, sys_munmap, "munmap" }, /* 6011 */ +++ { 1, 0, sys_brk, "brk" }, /* 6012 */ +++ { 4, TS, sys_rt_sigaction, "rt_sigaction" }, /* 6013 */ +++ { 4, TS, sys_rt_sigprocmask, "rt_sigprocmask"}, /* 6014 */ +++ { 3, 0, sys_ioctl, "ioctl" }, /* 6015 */ +++ { 6, TF, sys_pread64, "pread" }, /* 6016 */ +++ { 6, TF, sys_pwrite64, "pwrite" }, /* 6017 */ +++ { 3, 0, sys_readv, "readv" }, /* 6018 */ +++ { 3, 0, sys_writev, "writev" }, /* 6019 */ +++ { 2, TF, sys_access, "access" }, /* 6020 */ +++ { 1, 0, sys_pipe, "pipe" }, /* 6021 */ +++ { 5, 0, sys_select, "_newselect" }, /* 6022 */ +++ { 0, 0, sys_sched_yield, "sched_yield" }, /* 6023 */ +++ { 4, 0, sys_mremap, "mremap" }, /* 6024 */ +++ { 3, 0, sys_msync, "msync" }, /* 6025 */ +++ { 3, 0, printargs, "mincore" }, /* 6026 */ +++ { 3, 0, sys_madvise, "madvise" }, /* 6027 */ +++ { 3, TI, sys_shmget, "shmget" }, /* 6028 */ +++ { 3, TI, sys_shmat, "shmgat" }, /* 6029 */ +++ { 3, TI, sys_shmctl, "shmctl" }, /* 6030 */ +++ { 1, 0, sys_dup, "dup" }, /* 6031 */ +++ { 2, 0, sys_dup2, "dup2" }, /* 6032 */ +++ { 0, TS, sys_pause, "pause" }, /* 6033 */ +++ { 2, 0, sys_nanosleep, "nanosleep" }, /* 6034 */ +++ { 2, 0, sys_getitimer, "getitimer" }, /* 6035 */ +++ { 3, 0, sys_setitimer, "setitimer" }, /* 6036 */ +++ { 1, 0, sys_alarm, "alarm" }, /* 6037 */ +++ { 0, 0, sys_getpid, "getpid" }, /* 6038 */ +++ { 4, TF, sys_sendfile, "sendfile" }, /* 6039 */ +++ { 2, 0, sys_socketcall, "socketcall" }, /* 6040 */ +++ { 3, TN, sys_connect, "connect" }, /* 6041 */ +++ { 3, TN, sys_accept, "accept" }, /* 6042 */ +++ { 6, TN, sys_sendto, "sendto" }, /* 6043 */ +++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 6044 */ +++ { 3, TN, sys_sendmsg, "sendmsg" }, /* 6045 */ +++ { 3, TN, sys_recvmsg, "recvmsg" }, /* 6046 */ +++ { 2, TN, sys_shutdown, "shutdown" }, /* 6047 */ +++ { 3, TN, sys_bind, "bind" }, /* 6048 */ +++ { 2, TN, sys_listen, "listen" }, /* 6049 */ +++ { 3, TN, sys_getsockname, "getsockname" }, /* 6050 */ +++ { 3, TN, sys_getpeername, "getpeername" }, /* 6051 */ +++ { 4, TN, sys_socketpair, "socketpair" }, /* 6052 */ +++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 6053 */ +++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 6054 */ +++ { 2, TP, sys_clone, "clone" }, /* 6055 */ +++ { 0, TP, sys_fork, "fork" }, /* 6056 */ +++ { 3, TF|TP, sys_execve, "execve" }, /* 6057 */ +++ { 1, TP, sys_exit, "exit" }, /* 6058 */ +++ { 4, TP, sys_wait4, "wait4" }, /* 6059 */ +++ { 2, TS, sys_kill, "kill" }, /* 6060 */ +++ { 1, 0, sys_uname, "uname" }, /* 6061 */ +++ { 3, TI, sys_semget, "semget" }, /* 6062 */ +++ { 3, TI, printargs, "semop" }, /* 6063 */ +++ { 4, TI, sys_semctl, "semctl" }, /* 6064 */ +++ { 1, TI, sys_shmdt, "shmdt" }, /* 6065 */ +++ { 2, TI, sys_msgget, "msgget" }, /* 6066 */ +++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 6067 */ +++ { 5, TI, sys_msgrcv, "msgrcv" }, /* 6068 */ +++ { 3, TI, sys_msgctl, "msgctl" }, /* 6069 */ +++ { 3, 0, sys_fcntl, "fcntl" }, /* 6070 */ +++ { 2, 0, sys_flock, "flock" }, /* 6071 */ +++ { 1, 0, sys_fsync, "fsync" }, /* 6072 */ +++ { 1, 0, sys_fdatasync, "fdatasync" }, /* 6073 */ +++ { 2, TF, sys_truncate, "truncate" }, /* 6074 */ +++ { 2, 0, sys_ftruncate, "ftruncate" }, /* 6075 */ +++ { 3, 0, sys_getdents, "getdents" }, /* 6076 */ +++ { 2, TF, sys_getcwd, "getcwd" }, /* 6077 */ +++ { 1, TF, sys_chdir, "chdir" }, /* 6078 */ +++ { 1, TF, sys_fchdir, "fchdir" }, /* 6079 */ +++ { 2, TF, sys_rename, "rename" }, /* 6080 */ +++ { 2, TF, sys_mkdir, "mkdir" }, /* 6081 */ +++ { 1, TF, sys_rmdir, "rmdir" }, /* 6082 */ +++ { 2, TF, sys_creat, "creat" }, /* 6083 */ +++ { 2, TF, sys_link, "link" }, /* 6084 */ +++ { 1, TF, sys_unlink, "unlink" }, /* 6085 */ +++ { 2, TF, sys_symlink, "symlink" }, /* 6086 */ +++ { 3, TF, sys_readlink, "readlink" }, /* 6087 */ +++ { 2, TF, sys_chmod, "chmod" }, /* 6088 */ +++ { 2, 0, sys_fchmod, "fchmod" }, /* 6089 */ +++ { 3, TF, sys_chown, "chown" }, /* 6090 */ +++ { 3, 0, sys_fchown, "fchown" }, /* 6091 */ +++ { 3, TF, sys_chown, "lchown" }, /* 6092 */ +++ { 1, 0, sys_umask, "umask" }, /* 6093 */ +++ { 2, 0, sys_gettimeofday, "gettimeofday" }, /* 6094 */ +++ { 2, 0, sys_getrlimit, "getrlimit" }, /* 6095 */ +++ { 2, 0, sys_getrusage, "getrusage" }, /* 6096 */ +++ { 1, 0, sys_sysinfo, "sysinfo" }, /* 6097 */ +++ { 1, 0, sys_times, "times" }, /* 6098 */ +++ { 4, 0, sys_ptrace, "ptrace" }, /* 6099 */ +++ { 0, 0, sys_getuid, "getuid" }, /* 6100 */ +++ { 3, 0, sys_syslog, "syslog" }, /* 6101 */ +++ { 0, 0, sys_getgid, "getgid" }, /* 6102 */ +++ { 1, 0, sys_setuid, "setuid" }, /* 6103 */ +++ { 1, 0, sys_setgid, "setgid" }, /* 6104 */ +++ { 0, 0, sys_geteuid, "geteuid" }, /* 6105 */ +++ { 0, 0, sys_getegid, "getegid" }, /* 6106 */ +++ { 2, 0, sys_setpgid, "setpgid" }, /* 6107 */ +++ { 0, 0, sys_getppid, "getppid" }, /* 6108 */ +++ { 0, 0, sys_getpgrp, "getpgrp" }, /* 6109 */ +++ { 0, 0, sys_setsid, "setsid" }, /* 6110 */ +++ { 2, 0, sys_setreuid, "setreuid" }, /* 6111 */ +++ { 2, 0, sys_setregid, "setregid" }, /* 6112 */ +++ { 2, 0, sys_getgroups, "getgroups" }, /* 6113 */ +++ { 2, 0, sys_setgroups, "setgroups" }, /* 6114 */ +++ { 3, 0, sys_setresuid, "setresuid" }, /* 6115 */ +++ { 3, 0, sys_getresuid, "getresuid" }, /* 6116 */ +++ { 3, 0, sys_setresgid, "setresgid" }, /* 6117 */ +++ { 3, 0, sys_getresgid, "getresgid" }, /* 6118 */ +++ { 0, 0, sys_getpgid, "getpgid" }, /* 6119 */ +++ { 1, 0, sys_setfsuid, "setfsuid" }, /* 6120 */ +++ { 1, 0, sys_setfsgid, "setfsgid" }, /* 6121 */ +++ { 1, 0, sys_getsid, "getsid" }, /* 6122 */ +++ { 2, 0, sys_capget, "capget" }, /* 6123 */ +++ { 2, 0, sys_capset, "capset" }, /* 6124 */ +++ { 2, TS, sys_rt_sigpending, "rt_sigpending" }, /* 6125 */ +++ { 4, TS, sys_rt_sigtimedwait, "rt_sigtimedwait"},/* 6126 */ +++ { 3, TS, sys_rt_sigqueueinfo, "rt_sigqueueinfo"},/* 6127 */ +++ { 2, TS, sys_rt_sigsuspend, "rt_siguspend" }, /* 6128 */ +++ { 2, TS, sys_sigaltstack, "sigaltstatck" }, /* 6129 */ +++ { 2, TF, sys_utime, "utime" }, /* 6130 */ +++ { 3, TF, sys_mknod, "mknod" }, /* 6131 */ +++ { 1, 0, sys_personality, "personality" }, /* 6132 */ +++ { 2, 0, sys_ustat, "ustat" }, /* 6133 */ +++ { 3, 0, sys_statfs, "statfs" }, /* 6134 */ +++ { 3, 0, sys_fstatfs, "fstatfs" }, /* 6135 */ +++ { 5, 0, sys_sysfs, "sysfs" }, /* 6136 */ +++ { 2, 0, sys_getpriority, "getpriority" }, /* 6137 */ +++ { 3, 0, sys_setpriority, "setpriority" }, /* 6138 */ +++ { 2, 0, sys_sched_setparam, "sched_setparam"}, /* 6139 */ +++ { 2, 0, sys_sched_getparam, "sched_getparam"}, /* 6140 */ +++ { 3, 0, sys_sched_setscheduler, "sched_setscheduler"}, /* 6141 */ +++ { 1, 0, sys_sched_getscheduler, "sched_getscheduler"}, /* 6142 */ +++ { 1, 0, sys_sched_get_priority_max,"sched_get_priority_max"}, /* 6143 */ +++ { 1, 0, sys_sched_get_priority_min,"sched_get_priority_min"}, /* 6144 */ +++ { 2, 0, sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 6145 */ +++ { 2, 0, sys_mlock, "mlock" }, /* 6146 */ +++ { 2, 0, sys_munlock, "munlock" }, /* 6147 */ +++ { 1, 0, sys_mlockall, "mlockall" }, /* 6148 */ +++ { 0, 0, sys_munlockall, "munlockall" }, /* 6149 */ +++ { 0, 0, sys_vhangup, "vhangup" }, /* 6150 */ +++ { 2, 0, sys_pivotroot, "pivot_root" }, /* 6151 */ +++ { 1, 0, sys_sysctl, "_sysctl" }, /* 6152 */ +++ { 5, 0, printargs, "prctl" }, /* 6153 */ +++ { 1, 0, sys_adjtimex, "adjtimex" }, /* 6154 */ +++ { 2, 0, sys_setrlimit, "setrlimit" }, /* 6155 */ +++ { 1, TF, sys_chroot, "chroot" }, /* 6156 */ +++ { 0, 0, sys_sync, "sync" }, /* 6157 */ +++ { 1, TF, sys_acct, "acct" }, /* 6158 */ +++ { 2, 0, sys_settimeofday, "settimeofday" }, /* 6159 */ +++ { 5, TF, sys_mount, "mount" }, /* 6160 */ +++ { 2, TF, sys_umount2, "umount" }, /* 6161 */ +++ { 1, TF, sys_swapon, "swapon" }, /* 6162 */ +++ { 1, 0, sys_swapoff, "swapoff" }, /* 6163 */ +++ { 3, 0, sys_reboot, "reboot" }, /* 6164 */ +++ { 2, 0, sys_sethostname, "sethostname" }, /* 6165 */ +++ { 2, 0, sys_setdomainname, "setdomainname" }, /* 6166 */ +++ { 2, 0, sys_create_module, "create_module" }, /* 6167 */ +++ { 4, 0, sys_init_module, "init_module" }, /* 6168 */ +++ { 1, 0, sys_delete_module, "delete_module" }, /* 6169 */ +++ { 1, 0, sys_get_kernel_syms, "get_kernel_syms"}, /* 6170 */ +++ { 5, 0, sys_query_module, "query_module" }, /* 6171 */ +++ { 4, 0, sys_quotactl, "quotactl" }, /* 6172 */ +++ { 3, 0, printargs, "nfsservctl" }, /* 6173 */ +++ { 5, TN, printargs, "getpmsg" }, /* 6174 */ +++ { 5, TN, printargs, "putpmsg" }, /* 6175 */ +++ { 0, 0, sys_afs_syscall, "afs_syscall" }, /* 6176 */ +++ { 0, 0, printargs, "reserved177" }, /* 6177 */ +++ { 0, 0, printargs, "gettid" }, /* 6178 */ +++ { 3, 0, sys_readahead, "readahead" }, /* 6179 */ +++ { 5, 0, sys_setxattr, "setxattr" }, /* 6180 */ +++ { 5, 0, sys_setxattr, "lsetxattr" }, /* 6181 */ +++ { 5, 0, sys_fsetxattr, "fsetxattr" }, /* 6182 */ +++ { 4, 0, sys_getxattr, "getxattr" }, /* 6183 */ +++ { 4, 0, sys_getxattr, "lgetxattr" }, /* 6184 */ +++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 6185 */ +++ { 3, 0, sys_listxattr, "listxattr" }, /* 6186 */ +++ { 3, 0, sys_listxattr, "llistxattr" }, /* 6187 */ +++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 6188 */ +++ { 2, 0, sys_removexattr, "removexattr" }, /* 6189 */ +++ { 2, 0, sys_removexattr, "lremovexattr" }, /* 6190 */ +++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 6191 */ +++ { 2, 0, sys_kill, "tkill" }, /* 6192 */ +++ { 1, 0, sys_time, "time" }, /* 6193 */ +++ { 5, 0, printargs, "futex" }, /* 6194 */ +++ { 3, 0, printargs, "sched_setaffinity"}, /* 6195 */ +++ { 3, 0, printargs, "sched_getaffinity"}, /* 6196 */ +++ { 3, 0, printargs, "cacheflush" }, /* 6197 */ +++ { 3, 0, printargs, "cachectl" }, /* 6198 */ +++ { 4, 0, sys_sysmips, "sysmips" }, /* 6199 */ +++ { 0, 0, printargs, "io_setup" }, /* 6200 */ +++ { 0, 0, printargs, "io_destroy" }, /* 6201 */ +++ { 0, 0, printargs, "io_getevents" }, /* 6202 */ +++ { 0, 0, printargs, "io_submit" }, /* 6203 */ +++ { 0, 0, printargs, "io_cancel" }, /* 6204 */ +++ { 1, TP, sys_exit, "exit_group"}, /* 6205 */ +++ { 3, 0, printargs, "lookup_dcookie" }, /* 6206 */ +++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 6207 */ +++ { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 6208 */ +++ { 3, TD, sys_epoll_wait, "epoll_wait" }, /* 6209 */ +++ { 5, 0, sys_remap_file_pages, "remap_file_pages" }, /* 6210 */ +++ { 1, TS, printargs, "rt_sigreturn" }, /* 6211 */ +++ { 3, 0, sys_fcntl, "fcntl64" }, /* 6212 */ +++ { 0, 0, printargs, "set_tid_address" }, /* 6213 */ +++ { 0, 0, printargs, "restart_syscall" }, /* 6214 */ +++ { 0, 0, printargs, "semtimedop" }, /* 6215 */ +++ { 0, 0, printargs, "fadvise64" }, /* 6216 */ +++ { 0, 0, printargs, "statfs64" }, /* 6217 */ +++ { 0, 0, printargs, "fstatfs64" }, /* 6218 */ +++ { 4, 0, printargs, "sendfile64" }, /* 6219 */ +++ { 3, 0, printargs, "timer_create" }, /* 6220 */ +++ { 4, 0, printargs, "timer_settime" }, /* 6221 */ +++ { 2, 0, printargs, "timer_gettime" }, /* 6222 */ +++ { 1, 0, printargs, "timer_getoverrun" }, /* 6223 */ +++ { 1, 0, printargs, "timer_delete" }, /* 6224 */ +++ { 2, 0, printargs, "clock_settime" }, /* 6225 */ +++ { 2, 0, printargs, "clock_gettime" }, /* 6226 */ +++ { 2, 0, printargs, "clock_getres" }, /* 6227 */ +++ { 4, 0, printargs, "clock_nanosleep" }, /* 6228 */ +++ { 3, 0, printargs, "tgkill" }, /* 6229 */ +++ { 2, 0, printargs, "utimes" }, /* 6230 */ +++#else +++ { 0, 0, printargs, "n32_read" }, /* 6000 */ +++ { 0, 0, printargs, "n32_write" }, /* 6001 */ +++ { 0, 0, printargs, "n32_open" }, /* 6002 */ +++ { 0, 0, printargs, "n32_close" }, /* 6003 */ +++ { 0, 0, printargs, "n32_stat" }, /* 6004 */ +++ { 0, 0, printargs, "n32_fstat" }, /* 6005 */ +++ { 0, 0, printargs, "n32_lstat" }, /* 6006 */ +++ { 0, 0, printargs, "n32_poll" }, /* 6007 */ +++ { 0, 0, printargs, "n32_lseek" }, /* 6008 */ +++ { 0, 0, printargs, "n32_mmap" }, /* 6009 */ +++ { 0, 0, printargs, "n32_mprotect" }, /* 6010 */ +++ { 0, 0, printargs, "n32_munmap" }, /* 6011 */ +++ { 0, 0, printargs, "n32_brk" }, /* 6012 */ +++ { 0, 0, printargs, "n32_rt_sigaction" }, /* 6013 */ +++ { 0, 0, printargs, "n32_rt_sigprocmask" }, /* 6014 */ +++ { 0, 0, printargs, "n32_ioctl" }, /* 6015 */ +++ { 0, 0, printargs, "n32_pread" }, /* 6016 */ +++ { 0, 0, printargs, "n32_pwrite" }, /* 6017 */ +++ { 0, 0, printargs, "n32_readv" }, /* 6018 */ +++ { 0, 0, printargs, "n32_writev" }, /* 6019 */ +++ { 0, 0, printargs, "n32_access" }, /* 6020 */ +++ { 0, 0, printargs, "n32_pipe" }, /* 6021 */ +++ { 0, 0, printargs, "n32__newselect" }, /* 6022 */ +++ { 0, 0, printargs, "n32_sched_yield" }, /* 6023 */ +++ { 0, 0, printargs, "n32_mremap" }, /* 6024 */ +++ { 0, 0, printargs, "n32_msync" }, /* 6025 */ +++ { 0, 0, printargs, "n32_mincore" }, /* 6026 */ +++ { 0, 0, printargs, "n32_madvise" }, /* 6027 */ +++ { 0, 0, printargs, "n32_shmget" }, /* 6028 */ +++ { 0, 0, printargs, "n32_shmgat" }, /* 6029 */ +++ { 0, 0, printargs, "n32_shmctl" }, /* 6030 */ +++ { 0, 0, printargs, "n32_dup" }, /* 6031 */ +++ { 0, 0, printargs, "n32_dup2" }, /* 6032 */ +++ { 0, 0, printargs, "n32_pause" }, /* 6033 */ +++ { 0, 0, printargs, "n32_nanosleep" }, /* 6034 */ +++ { 0, 0, printargs, "n32_getitimer" }, /* 6035 */ +++ { 0, 0, printargs, "n32_setitimer" }, /* 6036 */ +++ { 0, 0, printargs, "n32_alarm" }, /* 6037 */ +++ { 0, 0, printargs, "n32_getpid" }, /* 6038 */ +++ { 0, 0, printargs, "n32_sendfile" }, /* 6039 */ +++ { 0, 0, printargs, "n32_socketcall" }, /* 6040 */ +++ { 0, 0, printargs, "n32_connect" }, /* 6041 */ +++ { 0, 0, printargs, "n32_accept" }, /* 6042 */ +++ { 0, 0, printargs, "n32_sendto" }, /* 6043 */ +++ { 0, 0, printargs, "n32_recvfrom" }, /* 6044 */ +++ { 0, 0, printargs, "n32_sendmsg" }, /* 6045 */ +++ { 0, 0, printargs, "n32_recvmsg" }, /* 6046 */ +++ { 0, 0, printargs, "n32_shutdown" }, /* 6047 */ +++ { 0, 0, printargs, "n32_bind" }, /* 6048 */ +++ { 0, 0, printargs, "n32_listen" }, /* 6049 */ +++ { 0, 0, printargs, "n32_getsockname" }, /* 6050 */ +++ { 0, 0, printargs, "n32_getpeername" }, /* 6051 */ +++ { 0, 0, printargs, "n32_socketpair" }, /* 6052 */ +++ { 0, 0, printargs, "n32_setsockopt" }, /* 6053 */ +++ { 0, 0, printargs, "n32_getsockopt" }, /* 6054 */ +++ { 0, 0, printargs, "n32_clone" }, /* 6055 */ +++ { 0, 0, printargs, "n32_fork" }, /* 6056 */ +++ { 0, 0, printargs, "n32_execve" }, /* 6057 */ +++ { 0, 0, printargs, "n32_exit" }, /* 6058 */ +++ { 0, 0, printargs, "n32_wait4" }, /* 6059 */ +++ { 0, 0, printargs, "n32_kill" }, /* 6060 */ +++ { 0, 0, printargs, "n32_uname" }, /* 6061 */ +++ { 0, 0, printargs, "n32_semget" }, /* 6062 */ +++ { 0, 0, printargs, "n32_semop" }, /* 6063 */ +++ { 0, 0, printargs, "n32_semctl" }, /* 6064 */ +++ { 0, 0, printargs, "n32_shmdt" }, /* 6065 */ +++ { 0, 0, printargs, "n32_msgget" }, /* 6066 */ +++ { 0, 0, printargs, "n32_msgsnd" }, /* 6067 */ +++ { 0, 0, printargs, "n32_msgrcv" }, /* 6068 */ +++ { 0, 0, printargs, "n32_msgctl" }, /* 6069 */ +++ { 0, 0, printargs, "n32_fcntl" }, /* 6070 */ +++ { 0, 0, printargs, "n32_flock" }, /* 6071 */ +++ { 0, 0, printargs, "n32_fsync" }, /* 6072 */ +++ { 0, 0, printargs, "n32_fdatasync" }, /* 6073 */ +++ { 0, 0, printargs, "n32_truncate" }, /* 6074 */ +++ { 0, 0, printargs, "n32_ftruncate" }, /* 6075 */ +++ { 0, 0, printargs, "n32_getdents" }, /* 6076 */ +++ { 0, 0, printargs, "n32_getcwd" }, /* 6077 */ +++ { 0, 0, printargs, "n32_chdir" }, /* 6078 */ +++ { 0, 0, printargs, "n32_fchdir" }, /* 6079 */ +++ { 0, 0, printargs, "n32_rename" }, /* 6080 */ +++ { 0, 0, printargs, "n32_mkdir" }, /* 6081 */ +++ { 0, 0, printargs, "n32_rmdir" }, /* 6082 */ +++ { 0, 0, printargs, "n32_creat" }, /* 6083 */ +++ { 0, 0, printargs, "n32_link" }, /* 6084 */ +++ { 0, 0, printargs, "n32_unlink" }, /* 6085 */ +++ { 0, 0, printargs, "n32_symlink" }, /* 6086 */ +++ { 0, 0, printargs, "n32_readlink" }, /* 6087 */ +++ { 0, 0, printargs, "n32_chmod" }, /* 6088 */ +++ { 0, 0, printargs, "n32_fchmod" }, /* 6089 */ +++ { 0, 0, printargs, "n32_chown" }, /* 6090 */ +++ { 0, 0, printargs, "n32_fchown" }, /* 6091 */ +++ { 0, 0, printargs, "n32_lchown" }, /* 6092 */ +++ { 0, 0, printargs, "n32_umask" }, /* 6093 */ +++ { 0, 0, printargs, "n32_gettimeofday" }, /* 6094 */ +++ { 0, 0, printargs, "n32_getrlimit" }, /* 6095 */ +++ { 0, 0, printargs, "n32_getrusage" }, /* 6096 */ +++ { 0, 0, printargs, "n32_sysinfo" }, /* 6097 */ +++ { 0, 0, printargs, "n32_times" }, /* 6098 */ +++ { 0, 0, printargs, "n32_ptrace" }, /* 6099 */ +++ { 0, 0, printargs, "n32_getuid" }, /* 6100 */ +++ { 0, 0, printargs, "n32_syslog" }, /* 6101 */ +++ { 0, 0, printargs, "n32_getgid" }, /* 6102 */ +++ { 0, 0, printargs, "n32_setuid" }, /* 6103 */ +++ { 0, 0, printargs, "n32_setgid" }, /* 6104 */ +++ { 0, 0, printargs, "n32_geteuid" }, /* 6105 */ +++ { 0, 0, printargs, "n32_getegid" }, /* 6106 */ +++ { 0, 0, printargs, "n32_setpgid" }, /* 6107 */ +++ { 0, 0, printargs, "n32_getppid" }, /* 6108 */ +++ { 0, 0, printargs, "n32_getpgrp" }, /* 6109 */ +++ { 0, 0, printargs, "n32_setsid" }, /* 6110 */ +++ { 0, 0, printargs, "n32_setreuid" }, /* 6111 */ +++ { 0, 0, printargs, "n32_setregid" }, /* 6112 */ +++ { 0, 0, printargs, "n32_getgroups" }, /* 6113 */ +++ { 0, 0, printargs, "n32_setgroups" }, /* 6114 */ +++ { 0, 0, printargs, "n32_setresuid" }, /* 6115 */ +++ { 0, 0, printargs, "n32_getresuid" }, /* 6116 */ +++ { 0, 0, printargs, "n32_setresgid" }, /* 6117 */ +++ { 0, 0, printargs, "n32_getresgid" }, /* 6118 */ +++ { 0, 0, printargs, "n32_getpgid" }, /* 6119 */ +++ { 0, 0, printargs, "n32_setfsuid" }, /* 6120 */ +++ { 0, 0, printargs, "n32_setfsgid" }, /* 6121 */ +++ { 0, 0, printargs, "n32_getsid" }, /* 6122 */ +++ { 0, 0, printargs, "n32_capget" }, /* 6123 */ +++ { 0, 0, printargs, "n32_capset" }, /* 6124 */ +++ { 0, 0, printargs, "n32_rt_sigpending" }, /* 6125 */ +++ { 0, 0, printargs, "n32_rt_sigtimedwait" }, /* 6126 */ +++ { 0, 0, printargs, "n32_rt_sigqueueinfo" }, /* 6127 */ +++ { 0, 0, printargs, "n32_rt_siguspend" }, /* 6128 */ +++ { 0, 0, printargs, "n32_sigaltstatck" }, /* 6129 */ +++ { 0, 0, printargs, "n32_utime" }, /* 6130 */ +++ { 0, 0, printargs, "n32_mknod" }, /* 6131 */ +++ { 0, 0, printargs, "n32_personality" }, /* 6132 */ +++ { 0, 0, printargs, "n32_ustat" }, /* 6133 */ +++ { 0, 0, printargs, "n32_statfs" }, /* 6134 */ +++ { 0, 0, printargs, "n32_fstatfs" }, /* 6135 */ +++ { 0, 0, printargs, "n32_sysfs" }, /* 6136 */ +++ { 0, 0, printargs, "n32_getpriority" }, /* 6137 */ +++ { 0, 0, printargs, "n32_setpriority" }, /* 6138 */ +++ { 0, 0, printargs, "n32_sched_setparam" }, /* 6139 */ +++ { 0, 0, printargs, "n32_sched_getparam" }, /* 6140 */ +++ { 0, 0, printargs, "n32_sched_setscheduler"}, /* 6141 */ +++ { 0, 0, printargs, "n32_sched_getscheduler"}, /* 6142 */ +++ { 0, 0, printargs, "n32_sched_get_priority_max"}, /* 6143 */ +++ { 0, 0, printargs, "n32_sched_get_priority_min"}, /* 6144 */ +++ { 0, 0, printargs, "n32_sched_rr_get_interval"}, /* 6145 */ +++ { 0, 0, printargs, "n32_mlock" }, /* 6146 */ +++ { 0, 0, printargs, "n32_munlock" }, /* 6147 */ +++ { 0, 0, printargs, "n32_mlockall" }, /* 6148 */ +++ { 0, 0, printargs, "n32_munlockall" }, /* 6149 */ +++ { 0, 0, printargs, "n32_vhangup" }, /* 6150 */ +++ { 0, 0, printargs, "n32_pivot_root" }, /* 6151 */ +++ { 0, 0, printargs, "n32__sysctl" }, /* 6152 */ +++ { 0, 0, printargs, "n32_prctl" }, /* 6153 */ +++ { 0, 0, printargs, "n32_adjtimex" }, /* 6154 */ +++ { 0, 0, printargs, "n32_setrlimit" }, /* 6155 */ +++ { 0, 0, printargs, "n32_chroot" }, /* 6156 */ +++ { 0, 0, printargs, "n32_sync" }, /* 6157 */ +++ { 0, 0, printargs, "n32_acct" }, /* 6158 */ +++ { 0, 0, printargs, "n32_settimeofday" }, /* 6159 */ +++ { 0, 0, printargs, "n32_mount" }, /* 6160 */ +++ { 0, 0, printargs, "n32_umount" }, /* 6161 */ +++ { 0, 0, printargs, "n32_swapon" }, /* 6162 */ +++ { 0, 0, printargs, "n32_swapoff" }, /* 6163 */ +++ { 0, 0, printargs, "n32_reboot" }, /* 6164 */ +++ { 0, 0, printargs, "n32_sethostname" }, /* 6165 */ +++ { 0, 0, printargs, "n32_setdomainname" }, /* 6166 */ +++ { 0, 0, printargs, "n32_create_module" }, /* 6167 */ +++ { 0, 0, printargs, "n32_init_module" }, /* 6168 */ +++ { 0, 0, printargs, "n32_delete_module" }, /* 6169 */ +++ { 0, 0, printargs, "n32_get_kernel_syms" }, /* 6170 */ +++ { 0, 0, printargs, "n32_query_module" }, /* 6171 */ +++ { 0, 0, printargs, "n32_quotactl" }, /* 6172 */ +++ { 0, 0, printargs, "n32_nfsservctl" }, /* 6173 */ +++ { 0, 0, printargs, "n32_getpmsg" }, /* 6174 */ +++ { 0, 0, printargs, "n32_putpmsg" }, /* 6175 */ +++ { 0, 0, printargs, "n32_afs_syscall" }, /* 6176 */ +++ { 0, 0, printargs, "n32_reserved177" }, /* 6177 */ +++ { 0, 0, printargs, "n32_gettid" }, /* 6178 */ +++ { 0, 0, printargs, "n32_readahead" }, /* 6179 */ +++ { 0, 0, printargs, "n32_setxattr" }, /* 6180 */ +++ { 0, 0, printargs, "n32_lsetxattr" }, /* 6181 */ +++ { 0, 0, printargs, "n32_fsetxattr" }, /* 6182 */ +++ { 0, 0, printargs, "n32_getxattr" }, /* 6183 */ +++ { 0, 0, printargs, "n32_lgetxattr" }, /* 6184 */ +++ { 0, 0, printargs, "n32_fgetxattr" }, /* 6185 */ +++ { 0, 0, printargs, "n32_listxattr" }, /* 6186 */ +++ { 0, 0, printargs, "n32_llistxattr" }, /* 6187 */ +++ { 0, 0, printargs, "n32_flistxattr" }, /* 6188 */ +++ { 0, 0, printargs, "n32_removexattr" }, /* 6189 */ +++ { 0, 0, printargs, "n32_lremovexattr" }, /* 6190 */ +++ { 0, 0, printargs, "n32_fremovexattr" }, /* 6191 */ +++ { 0, 0, printargs, "n32_tkill" }, /* 6192 */ +++ { 0, 0, printargs, "n32_time" }, /* 6193 */ +++ { 0, 0, printargs, "n32_futex" }, /* 6194 */ +++ { 0, 0, printargs, "n32_sched_setaffinity" }, /* 6195 */ +++ { 0, 0, printargs, "n32_sched_getaffinity" }, /* 6196 */ +++ { 0, 0, printargs, "n32_cacheflush" }, /* 6197 */ +++ { 0, 0, printargs, "n32_cachectl" }, /* 6198 */ +++ { 0, 0, printargs, "n32_sysmips" }, /* 6199 */ +++ { 0, 0, printargs, "n32_io_setup" }, /* 6200 */ +++ { 0, 0, printargs, "n32_io_destroy" }, /* 6201 */ +++ { 0, 0, printargs, "n32_io_getevents" }, /* 6202 */ +++ { 0, 0, printargs, "n32_io_submit" }, /* 6203 */ +++ { 0, 0, printargs, "n32_io_cancel" }, /* 6204 */ +++ { 1, TP, printargs, "n32_exit_group" }, /* 6205 */ +++ { 0, 0, printargs, "n32_lookup_dcookie" }, /* 6206 */ +++ { 0, 0, printargs, "n32_epoll_create" }, /* 6207 */ +++ { 0, 0, printargs, "n32_epoll_ctl" }, /* 6208 */ +++ { 0, 0, printargs, "n32_epoll_wait" }, /* 6209 */ +++ { 0, 0, printargs, "n32_remap_file_pages" }, /* 6210 */ +++ { 0, 0, printargs, "n32_rt_sigreturn" }, /* 6211 */ +++ { 0, 0, printargs, "n32_fcntl64" }, /* 6212 */ +++ { 0, 0, printargs, "n32_set_tid_address" }, /* 6213 */ +++ { 0, 0, printargs, "n32_restart_syscall" }, /* 6214 */ +++ { 0, 0, printargs, "n32_semtimedop" }, /* 6215 */ +++ { 0, 0, printargs, "n32_fadvise64" }, /* 6216 */ +++ { 0, 0, printargs, "n32_statfs64" }, /* 6217 */ +++ { 0, 0, printargs, "n32_fstatfs64" }, /* 6218 */ +++ { 0, 0, printargs, "n32_sendfile64" }, /* 6219 */ +++ { 3, 0, printargs, "n32_timer_create" }, /* 6220 */ +++ { 4, 0, printargs, "n32_timer_settime" }, /* 6221 */ +++ { 2, 0, printargs, "n32_timer_gettime" }, /* 6222 */ +++ { 1, 0, printargs, "n32_timer_getoverrun" }, /* 6223 */ +++ { 1, 0, printargs, "n32_timer_delete" }, /* 6224 */ +++ { 2, 0, printargs, "n32_clock_settime" }, /* 6225 */ +++ { 2, 0, printargs, "n32_clock_gettime" }, /* 6226 */ +++ { 2, 0, printargs, "n32_clock_getres" }, /* 6227 */ +++ { 4, 0, printargs, "n32_clock_nanosleep" }, /* 6228 */ +++ { 3, 0, printargs, "n32_tgkill" }, /* 6229 */ +++ { 2, 0, printargs, "n32_utimes" }, /* 6230 */ +++#endif +++ { 0, 0, printargs, "SYS_6231" }, /* 6231 */ +++ { 0, 0, printargs, "SYS_6232" }, /* 6232 */ +++ { 0, 0, printargs, "SYS_6233" }, /* 6233 */ +++ { 0, 0, printargs, "SYS_6234" }, /* 6234 */ +++ { 0, 0, printargs, "SYS_6235" }, /* 6235 */ +++ { 0, 0, printargs, "SYS_6236" }, /* 6236 */ +++ { 0, 0, printargs, "SYS_6237" }, /* 6237 */ +++ { 0, 0, printargs, "SYS_6238" }, /* 6238 */ +++ { 0, 0, printargs, "SYS_6239" }, /* 6239 */ +++ { 0, 0, printargs, "SYS_6240" }, /* 6240 */ +++ { 0, 0, printargs, "SYS_6241" }, /* 6241 */ +++ { 0, 0, printargs, "SYS_6242" }, /* 6242 */ +++ { 0, 0, printargs, "SYS_6243" }, /* 6243 */ +++ { 0, 0, printargs, "SYS_6244" }, /* 6244 */ +++ { 0, 0, printargs, "SYS_6245" }, /* 6245 */ +++ { 0, 0, printargs, "SYS_6246" }, /* 6246 */ +++ { 0, 0, printargs, "SYS_6247" }, /* 6247 */ +++ { 0, 0, printargs, "SYS_6248" }, /* 6248 */ +++ { 0, 0, printargs, "SYS_6249" }, /* 6249 */ +++ { 0, 0, printargs, "SYS_6250" }, /* 6250 */ +++ { 0, 0, printargs, "SYS_6251" }, /* 6251 */ +++ { 0, 0, printargs, "SYS_6252" }, /* 6252 */ +++ { 0, 0, printargs, "SYS_6253" }, /* 6253 */ +++ { 0, 0, printargs, "SYS_6254" }, /* 6254 */ +++ { 0, 0, printargs, "SYS_6255" }, /* 6255 */ +++ { 0, 0, printargs, "SYS_6256" }, /* 6256 */ +++ { 0, 0, printargs, "SYS_6257" }, /* 6257 */ +++ { 0, 0, printargs, "SYS_6258" }, /* 6258 */ +++ { 0, 0, printargs, "SYS_6259" }, /* 6259 */ +++ { 0, 0, printargs, "SYS_6260" }, /* 6260 */ +++ { 0, 0, printargs, "SYS_6261" }, /* 6261 */ +++ { 0, 0, printargs, "SYS_6262" }, /* 6262 */ +++ { 0, 0, printargs, "SYS_6263" }, /* 6263 */ +++ { 0, 0, printargs, "SYS_6264" }, /* 6264 */ +++ { 0, 0, printargs, "SYS_6265" }, /* 6265 */ +++ { 0, 0, printargs, "SYS_6266" }, /* 6266 */ +++ { 0, 0, printargs, "SYS_6267" }, /* 6267 */ +++ { 0, 0, printargs, "SYS_6268" }, /* 6268 */ +++ { 0, 0, printargs, "SYS_6269" }, /* 6269 */ +++ { 0, 0, printargs, "SYS_6270" }, /* 6270 */ +++ { 0, 0, printargs, "SYS_6271" }, /* 6271 */ +++ { 0, 0, printargs, "SYS_6272" }, /* 6272 */ +++ { 0, 0, printargs, "SYS_6273" }, /* 6273 */ +++ { 0, 0, printargs, "SYS_6274" }, /* 6274 */ +++ { 0, 0, printargs, "SYS_6275" }, /* 6275 */ +++ { 0, 0, printargs, "SYS_6276" }, /* 6276 */ +++ { 0, 0, printargs, "SYS_6277" }, /* 6277 */ +++ { 0, 0, printargs, "SYS_6278" }, /* 6278 */ +++ { 0, 0, printargs, "SYS_6279" }, /* 6279 */ +++ { 0, 0, printargs, "SYS_6280" }, /* 6280 */ +++ { 0, 0, printargs, "SYS_6281" }, /* 6281 */ +++ { 0, 0, printargs, "SYS_6282" }, /* 6282 */ +++ { 0, 0, printargs, "SYS_6283" }, /* 6283 */ +++ { 0, 0, printargs, "SYS_6284" }, /* 6284 */ +++ { 0, 0, printargs, "SYS_6285" }, /* 6285 */ +++ { 0, 0, printargs, "SYS_6286" }, /* 6286 */ +++ { 0, 0, printargs, "SYS_6287" }, /* 6287 */ +++ { 0, 0, printargs, "SYS_6288" }, /* 6288 */ +++ { 0, 0, printargs, "SYS_6289" }, /* 6289 */ +++ { 0, 0, printargs, "SYS_6290" }, /* 6290 */ +++ { 0, 0, printargs, "SYS_6291" }, /* 6291 */ +++ { 0, 0, printargs, "SYS_6292" }, /* 6292 */ +++ { 0, 0, printargs, "SYS_6293" }, /* 6293 */ +++ { 0, 0, printargs, "SYS_6294" }, /* 6294 */ +++ { 0, 0, printargs, "SYS_6295" }, /* 6295 */ +++ { 0, 0, printargs, "SYS_6296" }, /* 6296 */ +++ { 0, 0, printargs, "SYS_6297" }, /* 6297 */ +++ { 0, 0, printargs, "SYS_6298" }, /* 6298 */ +++ { 0, 0, printargs, "SYS_6299" }, /* 6299 */ +++ { 0, 0, printargs, "SYS_6300" }, /* 6300 */ +++ { 0, 0, printargs, "SYS_6301" }, /* 6301 */ +++ { 0, 0, printargs, "SYS_6302" }, /* 6302 */ +++ { 0, 0, printargs, "SYS_6303" }, /* 6303 */ +++ { 0, 0, printargs, "SYS_6304" }, /* 6304 */ +++ { 0, 0, printargs, "SYS_6305" }, /* 6305 */ +++ { 0, 0, printargs, "SYS_6306" }, /* 6306 */ +++ { 0, 0, printargs, "SYS_6307" }, /* 6307 */ +++ { 0, 0, printargs, "SYS_6308" }, /* 6308 */ +++ { 0, 0, printargs, "SYS_6309" }, /* 6309 */ +++ { 0, 0, printargs, "SYS_6310" }, /* 6310 */ +++ { 0, 0, printargs, "SYS_6311" }, /* 6311 */ +++ { 0, 0, printargs, "SYS_6312" }, /* 6312 */ +++ { 0, 0, printargs, "SYS_6313" }, /* 6313 */ +++ { 0, 0, printargs, "SYS_6314" }, /* 6314 */ +++ { 0, 0, printargs, "SYS_6315" }, /* 6315 */ +++ { 0, 0, printargs, "SYS_6316" }, /* 6316 */ +++ { 0, 0, printargs, "SYS_6317" }, /* 6317 */ +++ { 0, 0, printargs, "SYS_6318" }, /* 6318 */ +++ { 0, 0, printargs, "SYS_6319" }, /* 6319 */ +++ { 0, 0, printargs, "SYS_6320" }, /* 6320 */ +++ { 0, 0, printargs, "SYS_6321" }, /* 6321 */ +++ { 0, 0, printargs, "SYS_6322" }, /* 6322 */ +++ { 0, 0, printargs, "SYS_6323" }, /* 6323 */ +++ { 0, 0, printargs, "SYS_6324" }, /* 6324 */ +++ { 0, 0, printargs, "SYS_6325" }, /* 6325 */ +++ { 0, 0, printargs, "SYS_6326" }, /* 6326 */ +++ { 0, 0, printargs, "SYS_6327" }, /* 6327 */ +++ { 0, 0, printargs, "SYS_6328" }, /* 6328 */ +++ { 0, 0, printargs, "SYS_6329" }, /* 6329 */ +++ { 0, 0, printargs, "SYS_6330" }, /* 6330 */ +++ { 0, 0, printargs, "SYS_6331" }, /* 6331 */ +++ { 0, 0, printargs, "SYS_6332" }, /* 6332 */ +++ { 0, 0, printargs, "SYS_6333" }, /* 6333 */ +++ { 0, 0, printargs, "SYS_6334" }, /* 6334 */ +++ { 0, 0, printargs, "SYS_6335" }, /* 6335 */ +++ { 0, 0, printargs, "SYS_6336" }, /* 6336 */ +++ { 0, 0, printargs, "SYS_6337" }, /* 6337 */ +++ { 0, 0, printargs, "SYS_6338" }, /* 6338 */ +++ { 0, 0, printargs, "SYS_6339" }, /* 6339 */ +++ { 0, 0, printargs, "SYS_6340" }, /* 6340 */ +++ { 0, 0, printargs, "SYS_6341" }, /* 6341 */ +++ { 0, 0, printargs, "SYS_6342" }, /* 6342 */ +++ { 0, 0, printargs, "SYS_6343" }, /* 6343 */ +++ { 0, 0, printargs, "SYS_6344" }, /* 6344 */ +++ { 0, 0, printargs, "SYS_6345" }, /* 6345 */ +++ { 0, 0, printargs, "SYS_6346" }, /* 6346 */ +++ { 0, 0, printargs, "SYS_6347" }, /* 6347 */ +++ { 0, 0, printargs, "SYS_6348" }, /* 6348 */ +++ { 0, 0, printargs, "SYS_6349" }, /* 6349 */ +++ { 0, 0, printargs, "SYS_6350" }, /* 6350 */ +++ { 0, 0, printargs, "SYS_6351" }, /* 6351 */ +++ { 0, 0, printargs, "SYS_6352" }, /* 6352 */ +++ { 0, 0, printargs, "SYS_6353" }, /* 6353 */ +++ { 0, 0, printargs, "SYS_6354" }, /* 6354 */ +++ { 0, 0, printargs, "SYS_6355" }, /* 6355 */ +++ { 0, 0, printargs, "SYS_6356" }, /* 6356 */ +++ { 0, 0, printargs, "SYS_6357" }, /* 6357 */ +++ { 0, 0, printargs, "SYS_6358" }, /* 6358 */ +++ { 0, 0, printargs, "SYS_6359" }, /* 6359 */ +++ { 0, 0, printargs, "SYS_6360" }, /* 6360 */ +++ { 0, 0, printargs, "SYS_6361" }, /* 6361 */ +++ { 0, 0, printargs, "SYS_6362" }, /* 6362 */ +++ { 0, 0, printargs, "SYS_6363" }, /* 6363 */ +++ { 0, 0, printargs, "SYS_6364" }, /* 6364 */ +++ { 0, 0, printargs, "SYS_6365" }, /* 6365 */ +++ { 0, 0, printargs, "SYS_6366" }, /* 6366 */ +++ { 0, 0, printargs, "SYS_6367" }, /* 6367 */ +++ { 0, 0, printargs, "SYS_6368" }, /* 6368 */ +++ { 0, 0, printargs, "SYS_6369" }, /* 6369 */ +++ { 0, 0, printargs, "SYS_6370" }, /* 6370 */ +++ { 0, 0, printargs, "SYS_6371" }, /* 6371 */ +++ { 0, 0, printargs, "SYS_6372" }, /* 6372 */ +++ { 0, 0, printargs, "SYS_6373" }, /* 6373 */ +++ { 0, 0, printargs, "SYS_6374" }, /* 6374 */ +++ { 0, 0, printargs, "SYS_6375" }, /* 6375 */ +++ { 0, 0, printargs, "SYS_6376" }, /* 6376 */ +++ { 0, 0, printargs, "SYS_6377" }, /* 6377 */ +++ { 0, 0, printargs, "SYS_6378" }, /* 6378 */ +++ { 0, 0, printargs, "SYS_6379" }, /* 6379 */ +++ { 0, 0, printargs, "SYS_6380" }, /* 6380 */ +++ { 0, 0, printargs, "SYS_6381" }, /* 6381 */ +++ { 0, 0, printargs, "SYS_6382" }, /* 6382 */ +++ { 0, 0, printargs, "SYS_6383" }, /* 6383 */ +++ { 0, 0, printargs, "SYS_6384" }, /* 6384 */ +++ { 0, 0, printargs, "SYS_6385" }, /* 6385 */ +++ { 0, 0, printargs, "SYS_6386" }, /* 6386 */ +++ { 0, 0, printargs, "SYS_6387" }, /* 6387 */ +++ { 0, 0, printargs, "SYS_6388" }, /* 6388 */ +++ { 0, 0, printargs, "SYS_6389" }, /* 6389 */ +++ { 0, 0, printargs, "SYS_6390" }, /* 6390 */ +++ { 0, 0, printargs, "SYS_6391" }, /* 6391 */ +++ { 0, 0, printargs, "SYS_6392" }, /* 6392 */ +++ { 0, 0, printargs, "SYS_6393" }, /* 6393 */ +++ { 0, 0, printargs, "SYS_6394" }, /* 6394 */ +++ { 0, 0, printargs, "SYS_6395" }, /* 6395 */ +++ { 0, 0, printargs, "SYS_6396" }, /* 6396 */ +++ { 0, 0, printargs, "SYS_6397" }, /* 6397 */ +++ { 0, 0, printargs, "SYS_6398" }, /* 6398 */ +++ { 0, 0, printargs, "SYS_6399" }, /* 6399 */ +++ { 0, 0, printargs, "SYS_6400" }, /* 6400 */ +++ { 0, 0, printargs, "SYS_6401" }, /* 6401 */ +++ { 0, 0, printargs, "SYS_6402" }, /* 6402 */ +++ { 0, 0, printargs, "SYS_6403" }, /* 6403 */ +++ { 0, 0, printargs, "SYS_6404" }, /* 6404 */ +++ { 0, 0, printargs, "SYS_6405" }, /* 6405 */ +++ { 0, 0, printargs, "SYS_6406" }, /* 6406 */ +++ { 0, 0, printargs, "SYS_6407" }, /* 6407 */ +++ { 0, 0, printargs, "SYS_6408" }, /* 6408 */ +++ { 0, 0, printargs, "SYS_6409" }, /* 6409 */ +++ { 0, 0, printargs, "SYS_6410" }, /* 6410 */ +++ { 0, 0, printargs, "SYS_6411" }, /* 6411 */ +++ { 0, 0, printargs, "SYS_6412" }, /* 6412 */ +++ { 0, 0, printargs, "SYS_6413" }, /* 6413 */ +++ { 0, 0, printargs, "SYS_6414" }, /* 6414 */ +++ { 0, 0, printargs, "SYS_6415" }, /* 6415 */ +++ { 0, 0, printargs, "SYS_6416" }, /* 6416 */ +++ { 0, 0, printargs, "SYS_6417" }, /* 6417 */ +++ { 0, 0, printargs, "SYS_6418" }, /* 6418 */ +++ { 0, 0, printargs, "SYS_6419" }, /* 6419 */ +++ { 0, 0, printargs, "SYS_6420" }, /* 6420 */ +++ { 0, 0, printargs, "SYS_6421" }, /* 6421 */ +++ { 0, 0, printargs, "SYS_6422" }, /* 6422 */ +++ { 0, 0, printargs, "SYS_6423" }, /* 6423 */ +++ { 0, 0, printargs, "SYS_6424" }, /* 6424 */ +++ { 0, 0, printargs, "SYS_6425" }, /* 6425 */ +++ { 0, 0, printargs, "SYS_6426" }, /* 6426 */ +++ { 0, 0, printargs, "SYS_6427" }, /* 6427 */ +++ { 0, 0, printargs, "SYS_6428" }, /* 6428 */ +++ { 0, 0, printargs, "SYS_6429" }, /* 6429 */ +++ { 0, 0, printargs, "SYS_6430" }, /* 6430 */ +++ { 0, 0, printargs, "SYS_6431" }, /* 6431 */ +++ { 0, 0, printargs, "SYS_6432" }, /* 6432 */ +++ { 0, 0, printargs, "SYS_6433" }, /* 6433 */ +++ { 0, 0, printargs, "SYS_6434" }, /* 6434 */ +++ { 0, 0, printargs, "SYS_6435" }, /* 6435 */ +++ { 0, 0, printargs, "SYS_6436" }, /* 6436 */ +++ { 0, 0, printargs, "SYS_6437" }, /* 6437 */ +++ { 0, 0, printargs, "SYS_6438" }, /* 6438 */ +++ { 0, 0, printargs, "SYS_6439" }, /* 6439 */ +++ { 0, 0, printargs, "SYS_6440" }, /* 6440 */ +++ { 0, 0, printargs, "SYS_6441" }, /* 6441 */ +++ { 0, 0, printargs, "SYS_6442" }, /* 6442 */ +++ { 0, 0, printargs, "SYS_6443" }, /* 6443 */ +++ { 0, 0, printargs, "SYS_6444" }, /* 6444 */ +++ { 0, 0, printargs, "SYS_6445" }, /* 6445 */ +++ { 0, 0, printargs, "SYS_6446" }, /* 6446 */ +++ { 0, 0, printargs, "SYS_6447" }, /* 6447 */ +++ { 0, 0, printargs, "SYS_6448" }, /* 6448 */ +++ { 0, 0, printargs, "SYS_6449" }, /* 6449 */ +++ { 0, 0, printargs, "SYS_6450" }, /* 6450 */ +++ { 0, 0, printargs, "SYS_6451" }, /* 6451 */ +++ { 0, 0, printargs, "SYS_6452" }, /* 6452 */ +++ { 0, 0, printargs, "SYS_6453" }, /* 6453 */ +++ { 0, 0, printargs, "SYS_6454" }, /* 6454 */ +++ { 0, 0, printargs, "SYS_6455" }, /* 6455 */ +++ { 0, 0, printargs, "SYS_6456" }, /* 6456 */ +++ { 0, 0, printargs, "SYS_6457" }, /* 6457 */ +++ { 0, 0, printargs, "SYS_6458" }, /* 6458 */ +++ { 0, 0, printargs, "SYS_6459" }, /* 6459 */ +++ { 0, 0, printargs, "SYS_6460" }, /* 6460 */ +++ { 0, 0, printargs, "SYS_6461" }, /* 6461 */ +++ { 0, 0, printargs, "SYS_6462" }, /* 6462 */ +++ { 0, 0, printargs, "SYS_6463" }, /* 6463 */ +++ { 0, 0, printargs, "SYS_6464" }, /* 6464 */ +++ { 0, 0, printargs, "SYS_6465" }, /* 6465 */ +++ { 0, 0, printargs, "SYS_6466" }, /* 6466 */ +++ { 0, 0, printargs, "SYS_6467" }, /* 6467 */ +++ { 0, 0, printargs, "SYS_6468" }, /* 6468 */ +++ { 0, 0, printargs, "SYS_6469" }, /* 6469 */ +++ { 0, 0, printargs, "SYS_6470" }, /* 6470 */ +++ { 0, 0, printargs, "SYS_6471" }, /* 6471 */ +++ { 0, 0, printargs, "SYS_6472" }, /* 6472 */ +++ { 0, 0, printargs, "SYS_6473" }, /* 6473 */ +++ { 0, 0, printargs, "SYS_6474" }, /* 6474 */ +++ { 0, 0, printargs, "SYS_6475" }, /* 6475 */ +++ { 0, 0, printargs, "SYS_6476" }, /* 6476 */ +++ { 0, 0, printargs, "SYS_6477" }, /* 6477 */ +++ { 0, 0, printargs, "SYS_6478" }, /* 6478 */ +++ { 0, 0, printargs, "SYS_6479" }, /* 6479 */ +++ { 0, 0, printargs, "SYS_6480" }, /* 6480 */ +++ { 0, 0, printargs, "SYS_6481" }, /* 6481 */ +++ { 0, 0, printargs, "SYS_6482" }, /* 6482 */ +++ { 0, 0, printargs, "SYS_6483" }, /* 6483 */ +++ { 0, 0, printargs, "SYS_6484" }, /* 6484 */ +++ { 0, 0, printargs, "SYS_6485" }, /* 6485 */ +++ { 0, 0, printargs, "SYS_6486" }, /* 6486 */ +++ { 0, 0, printargs, "SYS_6487" }, /* 6487 */ +++ { 0, 0, printargs, "SYS_6488" }, /* 6488 */ +++ { 0, 0, printargs, "SYS_6489" }, /* 6489 */ +++ { 0, 0, printargs, "SYS_6490" }, /* 6490 */ +++ { 0, 0, printargs, "SYS_6491" }, /* 6491 */ +++ { 0, 0, printargs, "SYS_6492" }, /* 6492 */ +++ { 0, 0, printargs, "SYS_6493" }, /* 6493 */ +++ { 0, 0, printargs, "SYS_6494" }, /* 6494 */ +++ { 0, 0, printargs, "SYS_6495" }, /* 6495 */ +++ { 0, 0, printargs, "SYS_6496" }, /* 6496 */ +++ { 0, 0, printargs, "SYS_6497" }, /* 6497 */ +++ { 0, 0, printargs, "SYS_6498" }, /* 6498 */ +++ { 0, 0, printargs, "SYS_6499" }, /* 6499 */ +++ { 0, 0, printargs, "SYS_6500" }, /* 6500 */ +++ { 0, 0, printargs, "SYS_6501" }, /* 6501 */ +++ { 0, 0, printargs, "SYS_6502" }, /* 6502 */ +++ { 0, 0, printargs, "SYS_6503" }, /* 6503 */ +++ { 0, 0, printargs, "SYS_6504" }, /* 6504 */ +++ { 0, 0, printargs, "SYS_6505" }, /* 6505 */ +++ { 0, 0, printargs, "SYS_6506" }, /* 6506 */ +++ { 0, 0, printargs, "SYS_6507" }, /* 6507 */ +++ { 0, 0, printargs, "SYS_6508" }, /* 6508 */ +++ { 0, 0, printargs, "SYS_6509" }, /* 6509 */ +++ { 0, 0, printargs, "SYS_6510" }, /* 6510 */ +++ { 0, 0, printargs, "SYS_6511" }, /* 6511 */ +++ { 0, 0, printargs, "SYS_6512" }, /* 6512 */ +++ { 0, 0, printargs, "SYS_6513" }, /* 6513 */ +++ { 0, 0, printargs, "SYS_6514" }, /* 6514 */ +++ { 0, 0, printargs, "SYS_6515" }, /* 6515 */ +++ { 0, 0, printargs, "SYS_6516" }, /* 6516 */ +++ { 0, 0, printargs, "SYS_6517" }, /* 6517 */ +++ { 0, 0, printargs, "SYS_6518" }, /* 6518 */ +++ { 0, 0, printargs, "SYS_6519" }, /* 6519 */ +++ { 0, 0, printargs, "SYS_6520" }, /* 6520 */ +++ { 0, 0, printargs, "SYS_6521" }, /* 6521 */ +++ { 0, 0, printargs, "SYS_6522" }, /* 6522 */ +++ { 0, 0, printargs, "SYS_6523" }, /* 6523 */ +++ { 0, 0, printargs, "SYS_6524" }, /* 6524 */ +++ { 0, 0, printargs, "SYS_6525" }, /* 6525 */ +++ { 0, 0, printargs, "SYS_6526" }, /* 6526 */ +++ { 0, 0, printargs, "SYS_6527" }, /* 6527 */ +++ { 0, 0, printargs, "SYS_6528" }, /* 6528 */ +++ { 0, 0, printargs, "SYS_6529" }, /* 6529 */ +++ { 0, 0, printargs, "SYS_6530" }, /* 6530 */ +++ { 0, 0, printargs, "SYS_6531" }, /* 6531 */ +++ { 0, 0, printargs, "SYS_6532" }, /* 6532 */ +++ { 0, 0, printargs, "SYS_6533" }, /* 6533 */ +++ { 0, 0, printargs, "SYS_6534" }, /* 6534 */ +++ { 0, 0, printargs, "SYS_6535" }, /* 6535 */ +++ { 0, 0, printargs, "SYS_6536" }, /* 6536 */ +++ { 0, 0, printargs, "SYS_6537" }, /* 6537 */ +++ { 0, 0, printargs, "SYS_6538" }, /* 6538 */ +++ { 0, 0, printargs, "SYS_6539" }, /* 6539 */ +++ { 0, 0, printargs, "SYS_6540" }, /* 6540 */ +++ { 0, 0, printargs, "SYS_6541" }, /* 6541 */ +++ { 0, 0, printargs, "SYS_6542" }, /* 6542 */ +++ { 0, 0, printargs, "SYS_6543" }, /* 6543 */ +++ { 0, 0, printargs, "SYS_6544" }, /* 6544 */ +++ { 0, 0, printargs, "SYS_6545" }, /* 6545 */ +++ { 0, 0, printargs, "SYS_6546" }, /* 6546 */ +++ { 0, 0, printargs, "SYS_6547" }, /* 6547 */ +++ { 0, 0, printargs, "SYS_6548" }, /* 6548 */ +++ { 0, 0, printargs, "SYS_6549" }, /* 6549 */ +++ { 0, 0, printargs, "SYS_6550" }, /* 6550 */ +++ { 0, 0, printargs, "SYS_6551" }, /* 6551 */ +++ { 0, 0, printargs, "SYS_6552" }, /* 6552 */ +++ { 0, 0, printargs, "SYS_6553" }, /* 6553 */ +++ { 0, 0, printargs, "SYS_6554" }, /* 6554 */ +++ { 0, 0, printargs, "SYS_6555" }, /* 6555 */ +++ { 0, 0, printargs, "SYS_6556" }, /* 6556 */ +++ { 0, 0, printargs, "SYS_6557" }, /* 6557 */ +++ { 0, 0, printargs, "SYS_6558" }, /* 6558 */ +++ { 0, 0, printargs, "SYS_6559" }, /* 6559 */ +++ { 0, 0, printargs, "SYS_6560" }, /* 6560 */ +++ { 0, 0, printargs, "SYS_6561" }, /* 6561 */ +++ { 0, 0, printargs, "SYS_6562" }, /* 6562 */ +++ { 0, 0, printargs, "SYS_6563" }, /* 6563 */ +++ { 0, 0, printargs, "SYS_6564" }, /* 6564 */ +++ { 0, 0, printargs, "SYS_6565" }, /* 6565 */ +++ { 0, 0, printargs, "SYS_6566" }, /* 6566 */ +++ { 0, 0, printargs, "SYS_6567" }, /* 6567 */ +++ { 0, 0, printargs, "SYS_6568" }, /* 6568 */ +++ { 0, 0, printargs, "SYS_6569" }, /* 6569 */ +++ { 0, 0, printargs, "SYS_6570" }, /* 6570 */ +++ { 0, 0, printargs, "SYS_6571" }, /* 6571 */ +++ { 0, 0, printargs, "SYS_6572" }, /* 6572 */ +++ { 0, 0, printargs, "SYS_6573" }, /* 6573 */ +++ { 0, 0, printargs, "SYS_6574" }, /* 6574 */ +++ { 0, 0, printargs, "SYS_6575" }, /* 6575 */ +++ { 0, 0, printargs, "SYS_6576" }, /* 6576 */ +++ { 0, 0, printargs, "SYS_6577" }, /* 6577 */ +++ { 0, 0, printargs, "SYS_6578" }, /* 6578 */ +++ { 0, 0, printargs, "SYS_6579" }, /* 6579 */ +++ { 0, 0, printargs, "SYS_6580" }, /* 6580 */ +++ { 0, 0, printargs, "SYS_6581" }, /* 6581 */ +++ { 0, 0, printargs, "SYS_6582" }, /* 6582 */ +++ { 0, 0, printargs, "SYS_6583" }, /* 6583 */ +++ { 0, 0, printargs, "SYS_6584" }, /* 6584 */ +++ { 0, 0, printargs, "SYS_6585" }, /* 6585 */ +++ { 0, 0, printargs, "SYS_6586" }, /* 6586 */ +++ { 0, 0, printargs, "SYS_6587" }, /* 6587 */ +++ { 0, 0, printargs, "SYS_6588" }, /* 6588 */ +++ { 0, 0, printargs, "SYS_6589" }, /* 6589 */ +++ { 0, 0, printargs, "SYS_6590" }, /* 6590 */ +++ { 0, 0, printargs, "SYS_6591" }, /* 6591 */ +++ { 0, 0, printargs, "SYS_6592" }, /* 6592 */ +++ { 0, 0, printargs, "SYS_6593" }, /* 6593 */ +++ { 0, 0, printargs, "SYS_6594" }, /* 6594 */ +++ { 0, 0, printargs, "SYS_6595" }, /* 6595 */ +++ { 0, 0, printargs, "SYS_6596" }, /* 6596 */ +++ { 0, 0, printargs, "SYS_6597" }, /* 6597 */ +++ { 0, 0, printargs, "SYS_6598" }, /* 6598 */ +++ { 0, 0, printargs, "SYS_6599" }, /* 6599 */ +++ { 0, 0, printargs, "SYS_6600" }, /* 6600 */ +++ { 0, 0, printargs, "SYS_6601" }, /* 6601 */ +++ { 0, 0, printargs, "SYS_6602" }, /* 6602 */ +++ { 0, 0, printargs, "SYS_6603" }, /* 6603 */ +++ { 0, 0, printargs, "SYS_6604" }, /* 6604 */ +++ { 0, 0, printargs, "SYS_6605" }, /* 6605 */ +++ { 0, 0, printargs, "SYS_6606" }, /* 6606 */ +++ { 0, 0, printargs, "SYS_6607" }, /* 6607 */ +++ { 0, 0, printargs, "SYS_6608" }, /* 6608 */ +++ { 0, 0, printargs, "SYS_6609" }, /* 6609 */ +++ { 0, 0, printargs, "SYS_6610" }, /* 6610 */ +++ { 0, 0, printargs, "SYS_6611" }, /* 6611 */ +++ { 0, 0, printargs, "SYS_6612" }, /* 6612 */ +++ { 0, 0, printargs, "SYS_6613" }, /* 6613 */ +++ { 0, 0, printargs, "SYS_6614" }, /* 6614 */ +++ { 0, 0, printargs, "SYS_6615" }, /* 6615 */ +++ { 0, 0, printargs, "SYS_6616" }, /* 6616 */ +++ { 0, 0, printargs, "SYS_6617" }, /* 6617 */ +++ { 0, 0, printargs, "SYS_6618" }, /* 6618 */ +++ { 0, 0, printargs, "SYS_6619" }, /* 6619 */ +++ { 0, 0, printargs, "SYS_6620" }, /* 6620 */ +++ { 0, 0, printargs, "SYS_6621" }, /* 6621 */ +++ { 0, 0, printargs, "SYS_6622" }, /* 6622 */ +++ { 0, 0, printargs, "SYS_6623" }, /* 6623 */ +++ { 0, 0, printargs, "SYS_6624" }, /* 6624 */ +++ { 0, 0, printargs, "SYS_6625" }, /* 6625 */ +++ { 0, 0, printargs, "SYS_6626" }, /* 6626 */ +++ { 0, 0, printargs, "SYS_6627" }, /* 6627 */ +++ { 0, 0, printargs, "SYS_6628" }, /* 6628 */ +++ { 0, 0, printargs, "SYS_6629" }, /* 6629 */ +++ { 0, 0, printargs, "SYS_6630" }, /* 6630 */ +++ { 0, 0, printargs, "SYS_6631" }, /* 6631 */ +++ { 0, 0, printargs, "SYS_6632" }, /* 6632 */ +++ { 0, 0, printargs, "SYS_6633" }, /* 6633 */ +++ { 0, 0, printargs, "SYS_6634" }, /* 6634 */ +++ { 0, 0, printargs, "SYS_6635" }, /* 6635 */ +++ { 0, 0, printargs, "SYS_6636" }, /* 6636 */ +++ { 0, 0, printargs, "SYS_6637" }, /* 6637 */ +++ { 0, 0, printargs, "SYS_6638" }, /* 6638 */ +++ { 0, 0, printargs, "SYS_6639" }, /* 6639 */ +++ { 0, 0, printargs, "SYS_6640" }, /* 6640 */ +++ { 0, 0, printargs, "SYS_6641" }, /* 6641 */ +++ { 0, 0, printargs, "SYS_6642" }, /* 6642 */ +++ { 0, 0, printargs, "SYS_6643" }, /* 6643 */ +++ { 0, 0, printargs, "SYS_6644" }, /* 6644 */ +++ { 0, 0, printargs, "SYS_6645" }, /* 6645 */ +++ { 0, 0, printargs, "SYS_6646" }, /* 6646 */ +++ { 0, 0, printargs, "SYS_6647" }, /* 6647 */ +++ { 0, 0, printargs, "SYS_6648" }, /* 6648 */ +++ { 0, 0, printargs, "SYS_6649" }, /* 6649 */ +++ { 0, 0, printargs, "SYS_6650" }, /* 6650 */ +++ { 0, 0, printargs, "SYS_6651" }, /* 6651 */ +++ { 0, 0, printargs, "SYS_6652" }, /* 6652 */ +++ { 0, 0, printargs, "SYS_6653" }, /* 6653 */ +++ { 0, 0, printargs, "SYS_6654" }, /* 6654 */ +++ { 0, 0, printargs, "SYS_6655" }, /* 6655 */ +++ { 0, 0, printargs, "SYS_6656" }, /* 6656 */ +++ { 0, 0, printargs, "SYS_6657" }, /* 6657 */ +++ { 0, 0, printargs, "SYS_6658" }, /* 6658 */ +++ { 0, 0, printargs, "SYS_6659" }, /* 6659 */ +++ { 0, 0, printargs, "SYS_6660" }, /* 6660 */ +++ { 0, 0, printargs, "SYS_6661" }, /* 6661 */ +++ { 0, 0, printargs, "SYS_6662" }, /* 6662 */ +++ { 0, 0, printargs, "SYS_6663" }, /* 6663 */ +++ { 0, 0, printargs, "SYS_6664" }, /* 6664 */ +++ { 0, 0, printargs, "SYS_6665" }, /* 6665 */ +++ { 0, 0, printargs, "SYS_6666" }, /* 6666 */ +++ { 0, 0, printargs, "SYS_6667" }, /* 6667 */ +++ { 0, 0, printargs, "SYS_6668" }, /* 6668 */ +++ { 0, 0, printargs, "SYS_6669" }, /* 6669 */ +++ { 0, 0, printargs, "SYS_6670" }, /* 6670 */ +++ { 0, 0, printargs, "SYS_6671" }, /* 6671 */ +++ { 0, 0, printargs, "SYS_6672" }, /* 6672 */ +++ { 0, 0, printargs, "SYS_6673" }, /* 6673 */ +++ { 0, 0, printargs, "SYS_6674" }, /* 6674 */ +++ { 0, 0, printargs, "SYS_6675" }, /* 6675 */ +++ { 0, 0, printargs, "SYS_6676" }, /* 6676 */ +++ { 0, 0, printargs, "SYS_6677" }, /* 6677 */ +++ { 0, 0, printargs, "SYS_6678" }, /* 6678 */ +++ { 0, 0, printargs, "SYS_6679" }, /* 6679 */ +++ { 0, 0, printargs, "SYS_6680" }, /* 6680 */ +++ { 0, 0, printargs, "SYS_6681" }, /* 6681 */ +++ { 0, 0, printargs, "SYS_6682" }, /* 6682 */ +++ { 0, 0, printargs, "SYS_6683" }, /* 6683 */ +++ { 0, 0, printargs, "SYS_6684" }, /* 6684 */ +++ { 0, 0, printargs, "SYS_6685" }, /* 6685 */ +++ { 0, 0, printargs, "SYS_6686" }, /* 6686 */ +++ { 0, 0, printargs, "SYS_6687" }, /* 6687 */ +++ { 0, 0, printargs, "SYS_6688" }, /* 6688 */ +++ { 0, 0, printargs, "SYS_6689" }, /* 6689 */ +++ { 0, 0, printargs, "SYS_6690" }, /* 6690 */ +++ { 0, 0, printargs, "SYS_6691" }, /* 6691 */ +++ { 0, 0, printargs, "SYS_6692" }, /* 6692 */ +++ { 0, 0, printargs, "SYS_6693" }, /* 6693 */ +++ { 0, 0, printargs, "SYS_6694" }, /* 6694 */ +++ { 0, 0, printargs, "SYS_6695" }, /* 6695 */ +++ { 0, 0, printargs, "SYS_6696" }, /* 6696 */ +++ { 0, 0, printargs, "SYS_6697" }, /* 6697 */ +++ { 0, 0, printargs, "SYS_6698" }, /* 6698 */ +++ { 0, 0, printargs, "SYS_6699" }, /* 6699 */ +++ { 0, 0, printargs, "SYS_6700" }, /* 6700 */ +++ { 0, 0, printargs, "SYS_6701" }, /* 6701 */ +++ { 0, 0, printargs, "SYS_6702" }, /* 6702 */ +++ { 0, 0, printargs, "SYS_6703" }, /* 6703 */ +++ { 0, 0, printargs, "SYS_6704" }, /* 6704 */ +++ { 0, 0, printargs, "SYS_6705" }, /* 6705 */ +++ { 0, 0, printargs, "SYS_6706" }, /* 6706 */ +++ { 0, 0, printargs, "SYS_6707" }, /* 6707 */ +++ { 0, 0, printargs, "SYS_6708" }, /* 6708 */ +++ { 0, 0, printargs, "SYS_6709" }, /* 6709 */ +++ { 0, 0, printargs, "SYS_6710" }, /* 6710 */ +++ { 0, 0, printargs, "SYS_6711" }, /* 6711 */ +++ { 0, 0, printargs, "SYS_6712" }, /* 6712 */ +++ { 0, 0, printargs, "SYS_6713" }, /* 6713 */ +++ { 0, 0, printargs, "SYS_6714" }, /* 6714 */ +++ { 0, 0, printargs, "SYS_6715" }, /* 6715 */ +++ { 0, 0, printargs, "SYS_6716" }, /* 6716 */ +++ { 0, 0, printargs, "SYS_6717" }, /* 6717 */ +++ { 0, 0, printargs, "SYS_6718" }, /* 6718 */ +++ { 0, 0, printargs, "SYS_6719" }, /* 6719 */ +++ { 0, 0, printargs, "SYS_6720" }, /* 6720 */ +++ { 0, 0, printargs, "SYS_6721" }, /* 6721 */ +++ { 0, 0, printargs, "SYS_6722" }, /* 6722 */ +++ { 0, 0, printargs, "SYS_6723" }, /* 6723 */ +++ { 0, 0, printargs, "SYS_6724" }, /* 6724 */ +++ { 0, 0, printargs, "SYS_6725" }, /* 6725 */ +++ { 0, 0, printargs, "SYS_6726" }, /* 6726 */ +++ { 0, 0, printargs, "SYS_6727" }, /* 6727 */ +++ { 0, 0, printargs, "SYS_6728" }, /* 6728 */ +++ { 0, 0, printargs, "SYS_6729" }, /* 6729 */ +++ { 0, 0, printargs, "SYS_6730" }, /* 6730 */ +++ { 0, 0, printargs, "SYS_6731" }, /* 6731 */ +++ { 0, 0, printargs, "SYS_6732" }, /* 6732 */ +++ { 0, 0, printargs, "SYS_6733" }, /* 6733 */ +++ { 0, 0, printargs, "SYS_6734" }, /* 6734 */ +++ { 0, 0, printargs, "SYS_6735" }, /* 6735 */ +++ { 0, 0, printargs, "SYS_6736" }, /* 6736 */ +++ { 0, 0, printargs, "SYS_6737" }, /* 6737 */ +++ { 0, 0, printargs, "SYS_6738" }, /* 6738 */ +++ { 0, 0, printargs, "SYS_6739" }, /* 6739 */ +++ { 0, 0, printargs, "SYS_6740" }, /* 6740 */ +++ { 0, 0, printargs, "SYS_6741" }, /* 6741 */ +++ { 0, 0, printargs, "SYS_6742" }, /* 6742 */ +++ { 0, 0, printargs, "SYS_6743" }, /* 6743 */ +++ { 0, 0, printargs, "SYS_6744" }, /* 6744 */ +++ { 0, 0, printargs, "SYS_6745" }, /* 6745 */ +++ { 0, 0, printargs, "SYS_6746" }, /* 6746 */ +++ { 0, 0, printargs, "SYS_6747" }, /* 6747 */ +++ { 0, 0, printargs, "SYS_6748" }, /* 6748 */ +++ { 0, 0, printargs, "SYS_6749" }, /* 6749 */ +++ { 0, 0, printargs, "SYS_6750" }, /* 6750 */ +++ { 0, 0, printargs, "SYS_6751" }, /* 6751 */ +++ { 0, 0, printargs, "SYS_6752" }, /* 6752 */ +++ { 0, 0, printargs, "SYS_6753" }, /* 6753 */ +++ { 0, 0, printargs, "SYS_6754" }, /* 6754 */ +++ { 0, 0, printargs, "SYS_6755" }, /* 6755 */ +++ { 0, 0, printargs, "SYS_6756" }, /* 6756 */ +++ { 0, 0, printargs, "SYS_6757" }, /* 6757 */ +++ { 0, 0, printargs, "SYS_6758" }, /* 6758 */ +++ { 0, 0, printargs, "SYS_6759" }, /* 6759 */ +++ { 0, 0, printargs, "SYS_6760" }, /* 6760 */ +++ { 0, 0, printargs, "SYS_6761" }, /* 6761 */ +++ { 0, 0, printargs, "SYS_6762" }, /* 6762 */ +++ { 0, 0, printargs, "SYS_6763" }, /* 6763 */ +++ { 0, 0, printargs, "SYS_6764" }, /* 6764 */ +++ { 0, 0, printargs, "SYS_6765" }, /* 6765 */ +++ { 0, 0, printargs, "SYS_6766" }, /* 6766 */ +++ { 0, 0, printargs, "SYS_6767" }, /* 6767 */ +++ { 0, 0, printargs, "SYS_6768" }, /* 6768 */ +++ { 0, 0, printargs, "SYS_6769" }, /* 6769 */ +++ { 0, 0, printargs, "SYS_6770" }, /* 6770 */ +++ { 0, 0, printargs, "SYS_6771" }, /* 6771 */ +++ { 0, 0, printargs, "SYS_6772" }, /* 6772 */ +++ { 0, 0, printargs, "SYS_6773" }, /* 6773 */ +++ { 0, 0, printargs, "SYS_6774" }, /* 6774 */ +++ { 0, 0, printargs, "SYS_6775" }, /* 6775 */ +++ { 0, 0, printargs, "SYS_6776" }, /* 6776 */ +++ { 0, 0, printargs, "SYS_6777" }, /* 6777 */ +++ { 0, 0, printargs, "SYS_6778" }, /* 6778 */ +++ { 0, 0, printargs, "SYS_6779" }, /* 6779 */ +++ { 0, 0, printargs, "SYS_6780" }, /* 6780 */ +++ { 0, 0, printargs, "SYS_6781" }, /* 6781 */ +++ { 0, 0, printargs, "SYS_6782" }, /* 6782 */ +++ { 0, 0, printargs, "SYS_6783" }, /* 6783 */ +++ { 0, 0, printargs, "SYS_6784" }, /* 6784 */ +++ { 0, 0, printargs, "SYS_6785" }, /* 6785 */ +++ { 0, 0, printargs, "SYS_6786" }, /* 6786 */ +++ { 0, 0, printargs, "SYS_6787" }, /* 6787 */ +++ { 0, 0, printargs, "SYS_6788" }, /* 6788 */ +++ { 0, 0, printargs, "SYS_6789" }, /* 6789 */ +++ { 0, 0, printargs, "SYS_6790" }, /* 6790 */ +++ { 0, 0, printargs, "SYS_6791" }, /* 6791 */ +++ { 0, 0, printargs, "SYS_6792" }, /* 6792 */ +++ { 0, 0, printargs, "SYS_6793" }, /* 6793 */ +++ { 0, 0, printargs, "SYS_6794" }, /* 6794 */ +++ { 0, 0, printargs, "SYS_6795" }, /* 6795 */ +++ { 0, 0, printargs, "SYS_6796" }, /* 6796 */ +++ { 0, 0, printargs, "SYS_6797" }, /* 6797 */ +++ { 0, 0, printargs, "SYS_6798" }, /* 6798 */ +++ { 0, 0, printargs, "SYS_6799" }, /* 6799 */ +++ { 0, 0, printargs, "SYS_6800" }, /* 6800 */ +++ { 0, 0, printargs, "SYS_6801" }, /* 6801 */ +++ { 0, 0, printargs, "SYS_6802" }, /* 6802 */ +++ { 0, 0, printargs, "SYS_6803" }, /* 6803 */ +++ { 0, 0, printargs, "SYS_6804" }, /* 6804 */ +++ { 0, 0, printargs, "SYS_6805" }, /* 6805 */ +++ { 0, 0, printargs, "SYS_6806" }, /* 6806 */ +++ { 0, 0, printargs, "SYS_6807" }, /* 6807 */ +++ { 0, 0, printargs, "SYS_6808" }, /* 6808 */ +++ { 0, 0, printargs, "SYS_6809" }, /* 6809 */ +++ { 0, 0, printargs, "SYS_6810" }, /* 6810 */ +++ { 0, 0, printargs, "SYS_6811" }, /* 6811 */ +++ { 0, 0, printargs, "SYS_6812" }, /* 6812 */ +++ { 0, 0, printargs, "SYS_6813" }, /* 6813 */ +++ { 0, 0, printargs, "SYS_6814" }, /* 6814 */ +++ { 0, 0, printargs, "SYS_6815" }, /* 6815 */ +++ { 0, 0, printargs, "SYS_6816" }, /* 6816 */ +++ { 0, 0, printargs, "SYS_6817" }, /* 6817 */ +++ { 0, 0, printargs, "SYS_6818" }, /* 6818 */ +++ { 0, 0, printargs, "SYS_6819" }, /* 6819 */ +++ { 0, 0, printargs, "SYS_6820" }, /* 6820 */ +++ { 0, 0, printargs, "SYS_6821" }, /* 6821 */ +++ { 0, 0, printargs, "SYS_6822" }, /* 6822 */ +++ { 0, 0, printargs, "SYS_6823" }, /* 6823 */ +++ { 0, 0, printargs, "SYS_6824" }, /* 6824 */ +++ { 0, 0, printargs, "SYS_6825" }, /* 6825 */ +++ { 0, 0, printargs, "SYS_6826" }, /* 6826 */ +++ { 0, 0, printargs, "SYS_6827" }, /* 6827 */ +++ { 0, 0, printargs, "SYS_6828" }, /* 6828 */ +++ { 0, 0, printargs, "SYS_6829" }, /* 6829 */ +++ { 0, 0, printargs, "SYS_6830" }, /* 6830 */ +++ { 0, 0, printargs, "SYS_6831" }, /* 6831 */ +++ { 0, 0, printargs, "SYS_6832" }, /* 6832 */ +++ { 0, 0, printargs, "SYS_6833" }, /* 6833 */ +++ { 0, 0, printargs, "SYS_6834" }, /* 6834 */ +++ { 0, 0, printargs, "SYS_6835" }, /* 6835 */ +++ { 0, 0, printargs, "SYS_6836" }, /* 6836 */ +++ { 0, 0, printargs, "SYS_6837" }, /* 6837 */ +++ { 0, 0, printargs, "SYS_6838" }, /* 6838 */ +++ { 0, 0, printargs, "SYS_6839" }, /* 6839 */ +++ { 0, 0, printargs, "SYS_6840" }, /* 6840 */ +++ { 0, 0, printargs, "SYS_6841" }, /* 6841 */ +++ { 0, 0, printargs, "SYS_6842" }, /* 6842 */ +++ { 0, 0, printargs, "SYS_6843" }, /* 6843 */ +++ { 0, 0, printargs, "SYS_6844" }, /* 6844 */ +++ { 0, 0, printargs, "SYS_6845" }, /* 6845 */ +++ { 0, 0, printargs, "SYS_6846" }, /* 6846 */ +++ { 0, 0, printargs, "SYS_6847" }, /* 6847 */ +++ { 0, 0, printargs, "SYS_6848" }, /* 6848 */ +++ { 0, 0, printargs, "SYS_6849" }, /* 6849 */ +++ { 0, 0, printargs, "SYS_6850" }, /* 6850 */ +++ { 0, 0, printargs, "SYS_6851" }, /* 6851 */ +++ { 0, 0, printargs, "SYS_6852" }, /* 6852 */ +++ { 0, 0, printargs, "SYS_6853" }, /* 6853 */ +++ { 0, 0, printargs, "SYS_6854" }, /* 6854 */ +++ { 0, 0, printargs, "SYS_6855" }, /* 6855 */ +++ { 0, 0, printargs, "SYS_6856" }, /* 6856 */ +++ { 0, 0, printargs, "SYS_6857" }, /* 6857 */ +++ { 0, 0, printargs, "SYS_6858" }, /* 6858 */ +++ { 0, 0, printargs, "SYS_6859" }, /* 6859 */ +++ { 0, 0, printargs, "SYS_6860" }, /* 6860 */ +++ { 0, 0, printargs, "SYS_6861" }, /* 6861 */ +++ { 0, 0, printargs, "SYS_6862" }, /* 6862 */ +++ { 0, 0, printargs, "SYS_6863" }, /* 6863 */ +++ { 0, 0, printargs, "SYS_6864" }, /* 6864 */ +++ { 0, 0, printargs, "SYS_6865" }, /* 6865 */ +++ { 0, 0, printargs, "SYS_6866" }, /* 6866 */ +++ { 0, 0, printargs, "SYS_6867" }, /* 6867 */ +++ { 0, 0, printargs, "SYS_6868" }, /* 6868 */ +++ { 0, 0, printargs, "SYS_6869" }, /* 6869 */ +++ { 0, 0, printargs, "SYS_6870" }, /* 6870 */ +++ { 0, 0, printargs, "SYS_6871" }, /* 6871 */ +++ { 0, 0, printargs, "SYS_6872" }, /* 6872 */ +++ { 0, 0, printargs, "SYS_6873" }, /* 6873 */ +++ { 0, 0, printargs, "SYS_6874" }, /* 6874 */ +++ { 0, 0, printargs, "SYS_6875" }, /* 6875 */ +++ { 0, 0, printargs, "SYS_6876" }, /* 6876 */ +++ { 0, 0, printargs, "SYS_6877" }, /* 6877 */ +++ { 0, 0, printargs, "SYS_6878" }, /* 6878 */ +++ { 0, 0, printargs, "SYS_6879" }, /* 6879 */ +++ { 0, 0, printargs, "SYS_6880" }, /* 6880 */ +++ { 0, 0, printargs, "SYS_6881" }, /* 6881 */ +++ { 0, 0, printargs, "SYS_6882" }, /* 6882 */ +++ { 0, 0, printargs, "SYS_6883" }, /* 6883 */ +++ { 0, 0, printargs, "SYS_6884" }, /* 6884 */ +++ { 0, 0, printargs, "SYS_6885" }, /* 6885 */ +++ { 0, 0, printargs, "SYS_6886" }, /* 6886 */ +++ { 0, 0, printargs, "SYS_6887" }, /* 6887 */ +++ { 0, 0, printargs, "SYS_6888" }, /* 6888 */ +++ { 0, 0, printargs, "SYS_6889" }, /* 6889 */ +++ { 0, 0, printargs, "SYS_6890" }, /* 6890 */ +++ { 0, 0, printargs, "SYS_6891" }, /* 6891 */ +++ { 0, 0, printargs, "SYS_6892" }, /* 6892 */ +++ { 0, 0, printargs, "SYS_6893" }, /* 6893 */ +++ { 0, 0, printargs, "SYS_6894" }, /* 6894 */ +++ { 0, 0, printargs, "SYS_6895" }, /* 6895 */ +++ { 0, 0, printargs, "SYS_6896" }, /* 6896 */ +++ { 0, 0, printargs, "SYS_6897" }, /* 6897 */ +++ { 0, 0, printargs, "SYS_6898" }, /* 6898 */ +++ { 0, 0, printargs, "SYS_6899" }, /* 6899 */ +++ { 0, 0, printargs, "SYS_6900" }, /* 6900 */ +++ { 0, 0, printargs, "SYS_6901" }, /* 6901 */ +++ { 0, 0, printargs, "SYS_6902" }, /* 6902 */ +++ { 0, 0, printargs, "SYS_6903" }, /* 6903 */ +++ { 0, 0, printargs, "SYS_6904" }, /* 6904 */ +++ { 0, 0, printargs, "SYS_6905" }, /* 6905 */ +++ { 0, 0, printargs, "SYS_6906" }, /* 6906 */ +++ { 0, 0, printargs, "SYS_6907" }, /* 6907 */ +++ { 0, 0, printargs, "SYS_6908" }, /* 6908 */ +++ { 0, 0, printargs, "SYS_6909" }, /* 6909 */ +++ { 0, 0, printargs, "SYS_6910" }, /* 6910 */ +++ { 0, 0, printargs, "SYS_6911" }, /* 6911 */ +++ { 0, 0, printargs, "SYS_6912" }, /* 6912 */ +++ { 0, 0, printargs, "SYS_6913" }, /* 6913 */ +++ { 0, 0, printargs, "SYS_6914" }, /* 6914 */ +++ { 0, 0, printargs, "SYS_6915" }, /* 6915 */ +++ { 0, 0, printargs, "SYS_6916" }, /* 6916 */ +++ { 0, 0, printargs, "SYS_6917" }, /* 6917 */ +++ { 0, 0, printargs, "SYS_6918" }, /* 6918 */ +++ { 0, 0, printargs, "SYS_6919" }, /* 6919 */ +++ { 0, 0, printargs, "SYS_6920" }, /* 6920 */ +++ { 0, 0, printargs, "SYS_6921" }, /* 6921 */ +++ { 0, 0, printargs, "SYS_6922" }, /* 6922 */ +++ { 0, 0, printargs, "SYS_6923" }, /* 6923 */ +++ { 0, 0, printargs, "SYS_6924" }, /* 6924 */ +++ { 0, 0, printargs, "SYS_6925" }, /* 6925 */ +++ { 0, 0, printargs, "SYS_6926" }, /* 6926 */ +++ { 0, 0, printargs, "SYS_6927" }, /* 6927 */ +++ { 0, 0, printargs, "SYS_6928" }, /* 6928 */ +++ { 0, 0, printargs, "SYS_6929" }, /* 6929 */ +++ { 0, 0, printargs, "SYS_6930" }, /* 6930 */ +++ { 0, 0, printargs, "SYS_6931" }, /* 6931 */ +++ { 0, 0, printargs, "SYS_6932" }, /* 6932 */ +++ { 0, 0, printargs, "SYS_6933" }, /* 6933 */ +++ { 0, 0, printargs, "SYS_6934" }, /* 6934 */ +++ { 0, 0, printargs, "SYS_6935" }, /* 6935 */ +++ { 0, 0, printargs, "SYS_6936" }, /* 6936 */ +++ { 0, 0, printargs, "SYS_6937" }, /* 6937 */ +++ { 0, 0, printargs, "SYS_6938" }, /* 6938 */ +++ { 0, 0, printargs, "SYS_6939" }, /* 6939 */ +++ { 0, 0, printargs, "SYS_6940" }, /* 6940 */ +++ { 0, 0, printargs, "SYS_6941" }, /* 6941 */ +++ { 0, 0, printargs, "SYS_6942" }, /* 6942 */ +++ { 0, 0, printargs, "SYS_6943" }, /* 6943 */ +++ { 0, 0, printargs, "SYS_6944" }, /* 6944 */ +++ { 0, 0, printargs, "SYS_6945" }, /* 6945 */ +++ { 0, 0, printargs, "SYS_6946" }, /* 6946 */ +++ { 0, 0, printargs, "SYS_6947" }, /* 6947 */ +++ { 0, 0, printargs, "SYS_6948" }, /* 6948 */ +++ { 0, 0, printargs, "SYS_6949" }, /* 6949 */ +++ { 0, 0, printargs, "SYS_6950" }, /* 6950 */ +++ { 0, 0, printargs, "SYS_6951" }, /* 6951 */ +++ { 0, 0, printargs, "SYS_6952" }, /* 6952 */ +++ { 0, 0, printargs, "SYS_6953" }, /* 6953 */ +++ { 0, 0, printargs, "SYS_6954" }, /* 6954 */ +++ { 0, 0, printargs, "SYS_6955" }, /* 6955 */ +++ { 0, 0, printargs, "SYS_6956" }, /* 6956 */ +++ { 0, 0, printargs, "SYS_6957" }, /* 6957 */ +++ { 0, 0, printargs, "SYS_6958" }, /* 6958 */ +++ { 0, 0, printargs, "SYS_6959" }, /* 6959 */ +++ { 0, 0, printargs, "SYS_6960" }, /* 6960 */ +++ { 0, 0, printargs, "SYS_6961" }, /* 6961 */ +++ { 0, 0, printargs, "SYS_6962" }, /* 6962 */ +++ { 0, 0, printargs, "SYS_6963" }, /* 6963 */ +++ { 0, 0, printargs, "SYS_6964" }, /* 6964 */ +++ { 0, 0, printargs, "SYS_6965" }, /* 6965 */ +++ { 0, 0, printargs, "SYS_6966" }, /* 6966 */ +++ { 0, 0, printargs, "SYS_6967" }, /* 6967 */ +++ { 0, 0, printargs, "SYS_6968" }, /* 6968 */ +++ { 0, 0, printargs, "SYS_6969" }, /* 6969 */ +++ { 0, 0, printargs, "SYS_6970" }, /* 6970 */ +++ { 0, 0, printargs, "SYS_6971" }, /* 6971 */ +++ { 0, 0, printargs, "SYS_6972" }, /* 6972 */ +++ { 0, 0, printargs, "SYS_6973" }, /* 6973 */ +++ { 0, 0, printargs, "SYS_6974" }, /* 6974 */ +++ { 0, 0, printargs, "SYS_6975" }, /* 6975 */ +++ { 0, 0, printargs, "SYS_6976" }, /* 6976 */ +++ { 0, 0, printargs, "SYS_6977" }, /* 6977 */ +++ { 0, 0, printargs, "SYS_6978" }, /* 6978 */ +++ { 0, 0, printargs, "SYS_6979" }, /* 6979 */ +++ { 0, 0, printargs, "SYS_6980" }, /* 6980 */ +++ { 0, 0, printargs, "SYS_6981" }, /* 6981 */ +++ { 0, 0, printargs, "SYS_6982" }, /* 6982 */ +++ { 0, 0, printargs, "SYS_6983" }, /* 6983 */ +++ { 0, 0, printargs, "SYS_6984" }, /* 6984 */ +++ { 0, 0, printargs, "SYS_6985" }, /* 6985 */ +++ { 0, 0, printargs, "SYS_6986" }, /* 6986 */ +++ { 0, 0, printargs, "SYS_6987" }, /* 6987 */ +++ { 0, 0, printargs, "SYS_6988" }, /* 6988 */ +++ { 0, 0, printargs, "SYS_6989" }, /* 6989 */ +++ { 0, 0, printargs, "SYS_6990" }, /* 6990 */ +++ { 0, 0, printargs, "SYS_6991" }, /* 6991 */ +++ { 0, 0, printargs, "SYS_6992" }, /* 6992 */ +++ { 0, 0, printargs, "SYS_6993" }, /* 6993 */ +++ { 0, 0, printargs, "SYS_6994" }, /* 6994 */ +++ { 0, 0, printargs, "SYS_6995" }, /* 6995 */ +++ { 0, 0, printargs, "SYS_6996" }, /* 6996 */ +++ { 0, 0, printargs, "SYS_6997" }, /* 6997 */ +++ { 0, 0, printargs, "SYS_6998" }, /* 6998 */ +++ { 0, 0, printargs, "SYS_6999" }, /* 6999 */ /* end of Linux N32 */ +diff --git a/feeds/packages/utils/strace/patches-4.5.16/004-no_cacheflush.patch b/feeds/packages/utils/strace/patches-4.5.16/004-no_cacheflush.patch +new file mode 100644 +index 0000000..0a13143 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/004-no_cacheflush.patch +@@ -0,0 +1,13 @@ ++--- a/system.c +++++ b/system.c ++@@ -70,10 +70,6 @@ ++ #include ++ #endif ++ ++-#ifdef SYS_cacheflush ++-#include ++-#endif ++- ++ #ifdef HAVE_LINUX_USTNAME_H ++ #include ++ #endif +diff --git a/feeds/packages/utils/strace/patches-4.5.16/010-cris_support.patch b/feeds/packages/utils/strace/patches-4.5.16/010-cris_support.patch +new file mode 100644 +index 0000000..07aa964 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches-4.5.16/010-cris_support.patch +@@ -0,0 +1,345 @@ ++diff -Naur strace-4.5.16.ori/config.h.in strace-4.5.16/config.h.in ++--- strace-4.5.16.ori/config.h.in 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/config.h.in 2008-08-04 20:48:28.000000000 +0200 ++@@ -403,6 +403,12 @@ ++ /* Define for the AMD x86-64 architecture. */ ++ #undef X86_64 ++ +++/* Define for the CRISv10 architecture. */ +++#undef CRISV10 +++ +++/* Define for the CRISv32 architecture. */ +++#undef CRISV32 +++ ++ /* Enable GNU extensions on systems that have them. */ ++ #ifndef _GNU_SOURCE ++ # undef _GNU_SOURCE ++diff -Naur strace-4.5.16.ori/configure strace-4.5.16/configure ++--- strace-4.5.16.ori/configure 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/configure 2008-08-04 21:15:39.000000000 +0200 ++@@ -2539,6 +2539,22 @@ ++ _ACEOF ++ ++ ;; +++cris|crisv10) +++ arch=crisv10 +++ +++cat >>confdefs.h <<\_ACEOF +++#define CRISV10 1 +++_ACEOF +++ +++ ;; +++crisv32) +++ arch=crisv32 +++ +++cat >>confdefs.h <<\_ACEOF +++#define CRISV32 1 +++_ACEOF +++ +++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: NO!" >&5 ++ echo "${ECHO_T}NO!" >&6; } ++diff -Naur strace-4.5.16.ori/configure.ac strace-4.5.16/configure.ac ++--- strace-4.5.16.ori/configure.ac 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/configure.ac 2008-08-04 20:50:58.000000000 +0200 ++@@ -111,6 +111,14 @@ ++ AC_MSG_RESULT([NO!]) ++ AC_MSG_ERROR([architecture $host_cpu is not supported by strace]) ++ ;; +++cris|crisv10) +++ arch=crisv10 +++ AC_DEFINE([CRISV10], 1, [Define for the CRISv10 architecture.]) +++ ;; +++crisv32) +++ arch=crisv32 +++ AC_DEFINE([CRISV32], 1, [Define for the CRISv32 architecture.]) +++ ;; ++ esac ++ AC_MSG_RESULT($arch) ++ ++diff -Naur strace-4.5.16.ori/process.c strace-4.5.16/process.c ++--- strace-4.5.16.ori/process.c 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/process.c 2008-08-04 21:18:30.000000000 +0200 ++@@ -548,7 +548,7 @@ ++ # define ARG_PTID (known_scno(tcp) == SYS_clone2 ? 3 : 2) ++ # define ARG_CTID (known_scno(tcp) == SYS_clone2 ? 4 : 3) ++ # define ARG_TLS (known_scno(tcp) == SYS_clone2 ? 5 : 4) ++-# elif defined S390 || defined S390X +++# elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32 ++ # define ARG_STACK 0 ++ # define ARG_FLAGS 1 ++ # define ARG_PTID 2 ++@@ -704,6 +704,10 @@ ++ 0x100000 | new) < 0) ++ return -1; ++ return 0; +++#elif defined(CRISV10) || defined(CRISV32) +++ if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_R9), new) < 0) +++ return -1; +++ return 0; ++ #elif defined(ARM) ++ /* Some kernels support this, some (pre-2.6.16 or so) don't. */ ++ # ifndef PTRACE_SET_SYSCALL ++@@ -2934,6 +2938,77 @@ ++ { uoff(regs.r0), "r0" }, ++ { uoff(regs.r12_orig), "orig_r12" }, ++ #endif +++#ifdef CRISV10 +++ { 4*PT_FRAMETYPE, "4*PT_FRAMETYPE" }, +++ { 4*PT_ORIG_R10, "4*PT_ORIG_R10" }, +++ { 4*PT_R13, "4*PT_R13" }, +++ { 4*PT_R12, "4*PT_R12" }, +++ { 4*PT_R11, "4*PT_R11" }, +++ { 4*PT_R10, "4*PT_R10" }, +++ { 4*PT_R9, "4*PT_R9" }, +++ { 4*PT_R8, "4*PT_R8" }, +++ { 4*PT_R7, "4*PT_R7" }, +++ { 4*PT_R6, "4*PT_R6" }, +++ { 4*PT_R5, "4*PT_R5" }, +++ { 4*PT_R4, "4*PT_R4" }, +++ { 4*PT_R3, "4*PT_R3" }, +++ { 4*PT_R2, "4*PT_R2" }, +++ { 4*PT_R1, "4*PT_R1" }, +++ { 4*PT_R0, "4*PT_R0" }, +++ { 4*PT_MOF, "4*PT_MOF" }, +++ { 4*PT_DCCR, "4*PT_DCCR" }, +++ { 4*PT_SRP, "4*PT_SRP" }, +++ { 4*PT_IRP, "4*PT_IRP" }, +++ { 4*PT_CSRINSTR, "4*PT_CSRINSTR" }, +++ { 4*PT_CSRADDR, "4*PT_CSRADDR" }, +++ { 4*PT_CSRDATA, "4*PT_CSRDATA" }, +++ { 4*PT_USP, "4*PT_USP" }, +++#endif +++#ifdef CRISV32 +++ { 4*PT_ORIG_R10, "4*PT_ORIG_R10" }, +++ { 4*PT_R0, "4*PT_R0" }, +++ { 4*PT_R1, "4*PT_R1" }, +++ { 4*PT_R2, "4*PT_R2" }, +++ { 4*PT_R3, "4*PT_R3" }, +++ { 4*PT_R4, "4*PT_R4" }, +++ { 4*PT_R5, "4*PT_R5" }, +++ { 4*PT_R6, "4*PT_R6" }, +++ { 4*PT_R7, "4*PT_R7" }, +++ { 4*PT_R8, "4*PT_R8" }, +++ { 4*PT_R9, "4*PT_R9" }, +++ { 4*PT_R10, "4*PT_R10" }, +++ { 4*PT_R11, "4*PT_R11" }, +++ { 4*PT_R12, "4*PT_R12" }, +++ { 4*PT_R13, "4*PT_R13" }, +++ { 4*PT_ACR, "4*PT_ACR" }, +++ { 4*PT_SRS, "4*PT_SRS" }, +++ { 4*PT_MOF, "4*PT_MOF" }, +++ { 4*PT_SPC, "4*PT_SPC" }, +++ { 4*PT_CCS, "4*PT_CCS" }, +++ { 4*PT_SRP, "4*PT_SRP" }, +++ { 4*PT_ERP, "4*PT_ERP" }, +++ { 4*PT_EXS, "4*PT_EXS" }, +++ { 4*PT_EDA, "4*PT_EDA" }, +++ { 4*PT_USP, "4*PT_USP" }, +++ { 4*PT_PPC, "4*PT_PPC" }, +++ { 4*PT_BP_CTRL, "4*PT_BP_CTRL" }, +++ { 4*PT_BP+4, "4*PT_BP+4" }, +++ { 4*PT_BP+8, "4*PT_BP+8" }, +++ { 4*PT_BP+12, "4*PT_BP+12" }, +++ { 4*PT_BP+16, "4*PT_BP+16" }, +++ { 4*PT_BP+20, "4*PT_BP+20" }, +++ { 4*PT_BP+24, "4*PT_BP+24" }, +++ { 4*PT_BP+28, "4*PT_BP+28" }, +++ { 4*PT_BP+32, "4*PT_BP+32" }, +++ { 4*PT_BP+36, "4*PT_BP+36" }, +++ { 4*PT_BP+40, "4*PT_BP+40" }, +++ { 4*PT_BP+44, "4*PT_BP+44" }, +++ { 4*PT_BP+48, "4*PT_BP+48" }, +++ { 4*PT_BP+52, "4*PT_BP+52" }, +++ { 4*PT_BP+56, "4*PT_BP+56" }, +++#endif +++ +++#if !defined(CRISV10) && !defined(CRISV32) ++ #if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(AVR32) ++ { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, ++ #endif ++@@ -2971,6 +3046,7 @@ ++ #if defined(I386) || defined(X86_64) ++ { uoff(u_debugreg), "offsetof(struct user, u_debugreg)" }, ++ #endif /* I386 */ +++#endif /* !CRISV10/!CRISV32 */ ++ #endif /* !IA64 */ ++ #endif /* !ALPHA */ ++ #endif /* !POWERPC/!SPARC */ ++diff -Naur strace-4.5.16.ori/signal.c strace-4.5.16/signal.c ++--- strace-4.5.16.ori/signal.c 2007-08-02 03:15:59.000000000 +0200 +++++ strace-4.5.16/signal.c 2008-08-04 20:57:04.000000000 +0200 ++@@ -1449,9 +1449,38 @@ ++ } ++ return 0; ++ #else +++#if defined(CRISV10) || defined(CRISV32) +++ struct sigcontext sc; +++ +++ if (entering(tcp)) { +++ long regs[PT_MAX+1]; +++ +++ tcp->u_arg[0] = 0; +++ +++ if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) { +++ perror("sigreturn: PTRACE_GETREGS"); +++ return 0; +++ } +++ if (umove(tcp, regs[PT_USP], &sc) < 0) +++ return 0; +++ tcp->u_arg[0] = 1; +++ tcp->u_arg[1] = sc.oldmask; +++ } else { +++ sigset_t sigm; +++ +++ long_to_sigset(tcp->u_arg[1], &sigm); +++ tcp->u_rval = tcp->u_error = 0; +++ if (tcp->u_arg[0] == 0) +++ return 0; +++ tcp->auxstr = sprintsigmask("mask now ", &sigm, 0); +++ return RVAL_NONE | RVAL_STR; +++ } +++ return 0; +++#else ++ #warning No sys_sigreturn() for this architecture ++ #warning (no problem, just a reminder :-) ++ return 0; +++#endif /* !CRISV10/!CRISV32 */ ++ #endif /* MIPS */ ++ #endif /* SPARC || SPARC64 */ ++ #endif /* ALPHA */ ++diff -Naur strace-4.5.16.ori/syscall.c strace-4.5.16/syscall.c ++--- strace-4.5.16.ori/syscall.c 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/syscall.c 2008-08-04 21:02:28.000000000 +0200 ++@@ -809,6 +809,8 @@ ++ static long r9; ++ #elif defined(X86_64) ++ static long rax; +++#elif defined(CRISV10) || defined(CRISV32) +++ static long r10; ++ #elif defined(AVR32) ++ static struct pt_regs regs; ++ #endif ++@@ -1294,7 +1296,10 @@ ++ return 0; ++ } ++ } ++-#endif /* AVR32 */ +++#elif defined(CRISV10) || defined(CRISV32) +++ if (upeek(pid, 4*PT_R9, &scno) < 0) +++ return -1; +++#endif /* CRISV10/CRISV32 */ ++ #endif /* LINUX */ ++ #ifdef SUNOS4 ++ if (upeek(pid, uoff(u_arg[7]), &scno) < 0) ++@@ -1489,6 +1494,14 @@ ++ fprintf(stderr, "stray syscall exit: r8 = %ld\n", r8); ++ return 0; ++ } +++#elif defined(CRISV10) || defined(CRISV32) +++ if (upeek(pid, 4*PT_R10, &r10) < 0) +++ return -1; +++ if (r10 != -ENOSYS && !(tcp->flags & TCB_INSYSCALL)) { +++ if (debug) +++ fprintf(stderr, "stray syscall exit: r10 = %ld\n", r10); +++ return 0; +++ } ++ #endif ++ #endif /* LINUX */ ++ return 1; ++@@ -1663,6 +1676,17 @@ ++ tcp->u_rval = regs.r12; ++ u_error = 0; ++ } +++#else +++#if defined(CRISV10) || defined(CRISV32) +++ if (r10 && (unsigned) -r10 < nerrnos) { +++ tcp->u_rval = -1; +++ u_error = -r10; +++ } +++ else { +++ tcp->u_rval = r10; +++ u_error = 0; +++ } +++#endif /* CRISV10/CRISV32 */ ++ #endif /* AVR32 */ ++ #endif /* SH64 */ ++ #endif /* SH */ ++@@ -2175,6 +2199,23 @@ ++ tcp->u_arg[3] = regs.r9; ++ tcp->u_arg[4] = regs.r5; ++ tcp->u_arg[5] = regs.r3; +++#elif defined(CRISV10) || defined(CRISV32) +++ { +++ int i; +++ static const int crisregs[] = { +++ 4*PT_ORIG_R10, 4*PT_R11, 4*PT_R12, +++ 4*PT_R13, 4*PT_MOF, 4*PT_SRP +++ }; +++ +++ if (tcp->scno >= 0 && tcp->scno < nsyscalls) +++ tcp->u_nargs = sysent[tcp->scno].nargs; +++ else +++ tcp->u_nargs = 0; +++ for (i = 0; i < tcp->u_nargs; i++) { +++ if (upeek(pid, crisregs[i], &tcp->u_arg[i]) < 0) +++ return -1; +++ } +++ } ++ #else /* Other architecture (like i386) (32bits specific) */ ++ { ++ int i; ++diff -Naur strace-4.5.16.ori/util.c strace-4.5.16/util.c ++--- strace-4.5.16.ori/util.c 2008-08-04 20:11:11.000000000 +0200 +++++ strace-4.5.16/util.c 2008-08-04 21:05:37.000000000 +0200 ++@@ -1079,6 +1079,12 @@ ++ #elif defined(AVR32) ++ if (upeek(tcp->pid, REG_PC, &pc) < 0) ++ return -1; +++#elif defined(CRISV10) +++ if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0) +++ return -1; +++#elif defined(CRISV32) +++ if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0) +++ return -1; ++ #endif ++ return pc; ++ #endif /* LINUX */ ++@@ -1235,6 +1241,22 @@ ++ return; ++ } ++ tprintf("[%08lx] ", pc); +++#elif defined(CRISV10) +++ long pc; +++ +++ if (upeek(tcp->pid, 4*PT_IRP, &pc) < 0) { +++ PRINTBADPC; +++ return; +++ } +++ tprintf("[%08lx] ", (unsigned long)pc); +++#elif defined(CRISV32) +++ long pc; +++ +++ if (upeek(tcp->pid, 4*PT_ERP, &pc) < 0) { +++ PRINTBADPC; +++ return; +++ } +++ tprintf("[%08lx] ", (unsigned long)pc); ++ #endif /* !architecture */ ++ #endif /* LINUX */ ++ ++@@ -1419,6 +1441,13 @@ ++ # elif defined (AVR32) ++ # define arg0_offset (REG_R12) ++ # define arg1_offset (REG_R11) +++# elif defined CRISV10 || defined CRISV32 +++# define arg0_offset (4*PT_R11) +++# define arg1_offset (4*PT_ORIG_R10) +++# define restore_arg0(tcp, state, val) 0 +++# define restore_arg1(tcp, state, val) 0 +++# define arg0_index 1 +++# define arg1_index 0 ++ # else ++ # define arg0_offset 0 ++ # define arg1_offset 4 +diff --git a/feeds/packages/utils/strace/patches/.svn/entries b/feeds/packages/utils/strace/patches/.svn/entries +new file mode 100644 +index 0000000..414333f +--- /dev/null ++++ b/feeds/packages/utils/strace/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/strace/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-11-19T14:37:33.614449Z ++34257 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-eglibc_2_16_process_vm_readv.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++99f934bd5d8888e149ff0a54b977c3b0 ++2012-11-19T14:37:33.614449Z ++34257 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1995 ++ +diff --git a/feeds/packages/utils/strace/patches/.svn/text-base/001-eglibc_2_16_process_vm_readv.patch.svn-base b/feeds/packages/utils/strace/patches/.svn/text-base/001-eglibc_2_16_process_vm_readv.patch.svn-base +new file mode 100644 +index 0000000..9fdb758 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches/.svn/text-base/001-eglibc_2_16_process_vm_readv.patch.svn-base +@@ -0,0 +1,50 @@ ++Upstream-Status: Backport ++ ++https://bugs.gentoo.org/414637 ++ ++From 302e8ec6cd62912a3cd6494ce6702f4ad8dae0e2 Mon Sep 17 00:00:00 2001 ++From: Mike Frysinger ++Date: Fri, 4 May 2012 19:30:59 -0400 ++Subject: [PATCH] util: fix building when glibc has a stub process_vm_readv ++ ++If you have a newer glibc which provides process_vm_readv, but it is built ++against older kernel headers which lack __NR_process_vm_readv, the library ++will contain a stub implementation that just returns ENOSYS. Autoconf ++checks for this case explicitly and will declare it as unavailable. So we ++end up in a case where the headers provide the prototype, but autoconf has ++not defined HAVE_PROCESS_VM_READV, so we hit the same build failure again: ++ ++util.c:738:16: error: static declaration of 'process_vm_readv' follows non-static declaration ++/usr/include/bits/uio.h:58:16: note: previous declaration of 'process_vm_readv' was here ++ ++So rename our local function to something unique, and add a define so the ++callers all hit the right place. ++ ++* util.c (strace_process_vm_readv): Rename from process_vm_readv. ++(process_vm_readv): Define to strace_process_vm_readv. ++ ++Signed-off-by: Mike Frysinger ++--- ++ util.c | 4 +++- ++ 1 file changed, 3 insertions(+), 1 deletion(-) ++ ++--- a/util.c +++++ b/util.c ++@@ -735,7 +735,8 @@ static bool process_vm_readv_not_support ++ ++ #if defined(__NR_process_vm_readv) ++ static bool process_vm_readv_not_supported = 0; ++-static ssize_t process_vm_readv(pid_t pid, +++/* Have to avoid duplicating with the C library headers. */ +++static ssize_t strace_process_vm_readv(pid_t pid, ++ const struct iovec *lvec, ++ unsigned long liovcnt, ++ const struct iovec *rvec, ++@@ -744,6 +745,7 @@ static ssize_t process_vm_readv(pid_t pi ++ { ++ return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags); ++ } +++#define process_vm_readv strace_process_vm_readv ++ #else ++ static bool process_vm_readv_not_supported = 1; ++ # define process_vm_readv(...) (errno = ENOSYS, -1) +diff --git a/feeds/packages/utils/strace/patches/001-eglibc_2_16_process_vm_readv.patch b/feeds/packages/utils/strace/patches/001-eglibc_2_16_process_vm_readv.patch +new file mode 100644 +index 0000000..9fdb758 +--- /dev/null ++++ b/feeds/packages/utils/strace/patches/001-eglibc_2_16_process_vm_readv.patch +@@ -0,0 +1,50 @@ ++Upstream-Status: Backport ++ ++https://bugs.gentoo.org/414637 ++ ++From 302e8ec6cd62912a3cd6494ce6702f4ad8dae0e2 Mon Sep 17 00:00:00 2001 ++From: Mike Frysinger ++Date: Fri, 4 May 2012 19:30:59 -0400 ++Subject: [PATCH] util: fix building when glibc has a stub process_vm_readv ++ ++If you have a newer glibc which provides process_vm_readv, but it is built ++against older kernel headers which lack __NR_process_vm_readv, the library ++will contain a stub implementation that just returns ENOSYS. Autoconf ++checks for this case explicitly and will declare it as unavailable. So we ++end up in a case where the headers provide the prototype, but autoconf has ++not defined HAVE_PROCESS_VM_READV, so we hit the same build failure again: ++ ++util.c:738:16: error: static declaration of 'process_vm_readv' follows non-static declaration ++/usr/include/bits/uio.h:58:16: note: previous declaration of 'process_vm_readv' was here ++ ++So rename our local function to something unique, and add a define so the ++callers all hit the right place. ++ ++* util.c (strace_process_vm_readv): Rename from process_vm_readv. ++(process_vm_readv): Define to strace_process_vm_readv. ++ ++Signed-off-by: Mike Frysinger ++--- ++ util.c | 4 +++- ++ 1 file changed, 3 insertions(+), 1 deletion(-) ++ ++--- a/util.c +++++ b/util.c ++@@ -735,7 +735,8 @@ static bool process_vm_readv_not_support ++ ++ #if defined(__NR_process_vm_readv) ++ static bool process_vm_readv_not_supported = 0; ++-static ssize_t process_vm_readv(pid_t pid, +++/* Have to avoid duplicating with the C library headers. */ +++static ssize_t strace_process_vm_readv(pid_t pid, ++ const struct iovec *lvec, ++ unsigned long liovcnt, ++ const struct iovec *rvec, ++@@ -744,6 +745,7 @@ static ssize_t process_vm_readv(pid_t pi ++ { ++ return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags); ++ } +++#define process_vm_readv strace_process_vm_readv ++ #else ++ static bool process_vm_readv_not_supported = 1; ++ # define process_vm_readv(...) (errno = ENOSYS, -1) +diff --git a/feeds/packages/utils/stress/.svn/entries b/feeds/packages/utils/stress/.svn/entries +new file mode 100644 +index 0000000..f0285df +--- /dev/null ++++ b/feeds/packages/utils/stress/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/stress ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f1e0bdcac42b46f5a9a2d59a425ff651 ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++993 ++ +diff --git a/feeds/packages/utils/stress/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/stress/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..12203fa +--- /dev/null ++++ b/feeds/packages/utils/stress/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=stress ++PKG_VERSION:=1.0.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://weather.ou.edu/~apw/projects/stress ++PKG_MD5SUM:=a607afa695a511765b40993a64c6e2f4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/stress ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=stress is a simple stress utility ++ URL:=http://weather.ou.edu/~apw/projects/stress/ ++endef ++ ++define Package/stress/description ++stress is a simple tool that imposes certain types of compute \ stress on ++UNIX-like operating systems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --prefix="/usr" ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" ++ ++define Package/stress/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stress $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,stress)) +diff --git a/feeds/packages/utils/stress/Makefile b/feeds/packages/utils/stress/Makefile +new file mode 100644 +index 0000000..12203fa +--- /dev/null ++++ b/feeds/packages/utils/stress/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=stress ++PKG_VERSION:=1.0.4 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://weather.ou.edu/~apw/projects/stress ++PKG_MD5SUM:=a607afa695a511765b40993a64c6e2f4 ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/stress ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=stress is a simple stress utility ++ URL:=http://weather.ou.edu/~apw/projects/stress/ ++endef ++ ++define Package/stress/description ++stress is a simple tool that imposes certain types of compute \ stress on ++UNIX-like operating systems. ++endef ++ ++CONFIGURE_ARGS += \ ++ --prefix="/usr" ++ ++MAKE_FLAGS += \ ++ CFLAGS="$(TARGET_CFLAGS)" ++ ++define Package/stress/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stress $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,stress)) +diff --git a/feeds/packages/utils/sysstat/.svn/entries b/feeds/packages/utils/sysstat/.svn/entries +new file mode 100644 +index 0000000..5d409c8 +--- /dev/null ++++ b/feeds/packages/utils/sysstat/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sysstat ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-01-03T20:57:05.992581Z ++19027 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7c695e56b8d82357a603bbc1cc1d319f ++2010-01-03T20:57:05.992581Z ++19027 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1638 ++ +diff --git a/feeds/packages/utils/sysstat/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/sysstat/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4be0bb1 +--- /dev/null ++++ b/feeds/packages/utils/sysstat/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,59 @@ ++# ++# 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:=sysstat ++PKG_VERSION:=9.0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard ++PKG_MD5SUM:=e069daf192d259de905d7f8cdd85dc4e ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sysstat ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Sysstat performance monitoring tools ++ URL:=http://pagesperso-orange.fr/sebastien.godard/index.html ++endef ++ ++define Package/sysstat/description ++ The sysstat utilities are a collection of performance monitoring tools for ++ Linux. These include sar, sadf, mpstat, iostat, pidstat and sa tools. ++endef ++ ++define Package/sysstat/conffiles ++/etc/sysstat/sysstat.ioconf ++/etc/sysstat/config ++endef ++ ++CONFIGURE_VARS+= \ ++ sa_lib_dir="/usr/lib/sysstat" \ ++ sa_dir="/var/log/sysstat" \ ++ conf_dir="/etc/sysstat" \ ++ ++CONFIGURE_ARGS+= \ ++ --disable-documentation \ ++ ++define Package/sysstat/install ++ $(INSTALL_DIR) $(1)/usr/lib/sysstat ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/sysstat/{sadc,sa1,sa2} $(1)/usr/lib/sysstat/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sar,sadf,iostat,mpstat,pidstat} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/sysstat ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sysstat/sysstat.ioconf $(1)/etc/sysstat/ ++ $(INSTALL_CONF) ./files/config $(1)/etc/sysstat/config ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/sysstat.init $(1)/etc/init.d/sysstat ++endef ++ ++$(eval $(call BuildPackage,sysstat)) +diff --git a/feeds/packages/utils/sysstat/Makefile b/feeds/packages/utils/sysstat/Makefile +new file mode 100644 +index 0000000..4be0bb1 +--- /dev/null ++++ b/feeds/packages/utils/sysstat/Makefile +@@ -0,0 +1,59 @@ ++# ++# 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:=sysstat ++PKG_VERSION:=9.0.6 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard ++PKG_MD5SUM:=e069daf192d259de905d7f8cdd85dc4e ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sysstat ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Sysstat performance monitoring tools ++ URL:=http://pagesperso-orange.fr/sebastien.godard/index.html ++endef ++ ++define Package/sysstat/description ++ The sysstat utilities are a collection of performance monitoring tools for ++ Linux. These include sar, sadf, mpstat, iostat, pidstat and sa tools. ++endef ++ ++define Package/sysstat/conffiles ++/etc/sysstat/sysstat.ioconf ++/etc/sysstat/config ++endef ++ ++CONFIGURE_VARS+= \ ++ sa_lib_dir="/usr/lib/sysstat" \ ++ sa_dir="/var/log/sysstat" \ ++ conf_dir="/etc/sysstat" \ ++ ++CONFIGURE_ARGS+= \ ++ --disable-documentation \ ++ ++define Package/sysstat/install ++ $(INSTALL_DIR) $(1)/usr/lib/sysstat ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/sysstat/{sadc,sa1,sa2} $(1)/usr/lib/sysstat/ ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sar,sadf,iostat,mpstat,pidstat} $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/etc/sysstat ++ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sysstat/sysstat.ioconf $(1)/etc/sysstat/ ++ $(INSTALL_CONF) ./files/config $(1)/etc/sysstat/config ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/sysstat.init $(1)/etc/init.d/sysstat ++endef ++ ++$(eval $(call BuildPackage,sysstat)) +diff --git a/feeds/packages/utils/sysstat/files/.svn/entries b/feeds/packages/utils/sysstat/files/.svn/entries +new file mode 100644 +index 0000000..651993e +--- /dev/null ++++ b/feeds/packages/utils/sysstat/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/sysstat/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-08-14T13:48:03.512615Z ++17256 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2980a0edc3fc1adcd1444aa5b77e5167 ++2008-11-16T11:53:37.316277Z ++13227 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++91 ++ ++sysstat.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7047e159703d04d9d4adf3a27159b670 ++2009-08-14T13:48:03.512615Z ++17256 ++florian ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++222 ++ +diff --git a/feeds/packages/utils/sysstat/files/.svn/prop-base/sysstat.init.svn-base b/feeds/packages/utils/sysstat/files/.svn/prop-base/sysstat.init.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/sysstat/files/.svn/prop-base/sysstat.init.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/sysstat/files/.svn/text-base/config.svn-base b/feeds/packages/utils/sysstat/files/.svn/text-base/config.svn-base +new file mode 100644 +index 0000000..2d2721a +--- /dev/null ++++ b/feeds/packages/utils/sysstat/files/.svn/text-base/config.svn-base +@@ -0,0 +1,4 @@ ++# How long to keep log files (days), maximum is a month ++# Used by sa2(8) script ++HISTORY=3 ++ +diff --git a/feeds/packages/utils/sysstat/files/.svn/text-base/sysstat.init.svn-base b/feeds/packages/utils/sysstat/files/.svn/text-base/sysstat.init.svn-base +new file mode 100644 +index 0000000..02039d5 +--- /dev/null ++++ b/feeds/packages/utils/sysstat/files/.svn/text-base/sysstat.init.svn-base +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++ ++# The init file runs the sadc command in order to write ++# the "LINUX RESTART" mark to the daily data file ++ ++START=99 ++ ++start() { ++ mkdir -p /var/log/sysstat ++ /usr/lib/sysstat/sadc -S DISK -F -L - ++} ++ +diff --git a/feeds/packages/utils/sysstat/files/config b/feeds/packages/utils/sysstat/files/config +new file mode 100644 +index 0000000..2d2721a +--- /dev/null ++++ b/feeds/packages/utils/sysstat/files/config +@@ -0,0 +1,4 @@ ++# How long to keep log files (days), maximum is a month ++# Used by sa2(8) script ++HISTORY=3 ++ +diff --git a/feeds/packages/utils/sysstat/files/sysstat.init b/feeds/packages/utils/sysstat/files/sysstat.init +new file mode 100755 +index 0000000..02039d5 +--- /dev/null ++++ b/feeds/packages/utils/sysstat/files/sysstat.init +@@ -0,0 +1,12 @@ ++#!/bin/sh /etc/rc.common ++ ++# The init file runs the sadc command in order to write ++# the "LINUX RESTART" mark to the daily data file ++ ++START=99 ++ ++start() { ++ mkdir -p /var/log/sysstat ++ /usr/lib/sysstat/sadc -S DISK -F -L - ++} ++ +diff --git a/feeds/packages/utils/tar/.svn/entries b/feeds/packages/utils/tar/.svn/entries +new file mode 100644 +index 0000000..d2b8fc7 +--- /dev/null ++++ b/feeds/packages/utils/tar/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tar ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-19T16:43:40.643886Z ++29813 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++5a3f44d796edaaf89936e611405a1ab4 ++2012-01-19T16:43:40.643886Z ++29813 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1307 ++ +diff --git a/feeds/packages/utils/tar/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/tar/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..431893e +--- /dev/null ++++ b/feeds/packages/utils/tar/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2008 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/tar/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/tar/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7f346f6 +--- /dev/null ++++ b/feeds/packages/utils/tar/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,60 @@ ++# ++# 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:=tar ++PKG_VERSION:=1.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@GNU/$(PKG_NAME) ++PKG_MD5SUM:=41e2ca4b924ec7860e51b43ad06cdb7e ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tar ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bzip2 ++ 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/feeds/packages/utils/tar/Makefile b/feeds/packages/utils/tar/Makefile +new file mode 100644 +index 0000000..7f346f6 +--- /dev/null ++++ b/feeds/packages/utils/tar/Makefile +@@ -0,0 +1,60 @@ ++# ++# 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:=tar ++PKG_VERSION:=1.23 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@GNU/$(PKG_NAME) ++PKG_MD5SUM:=41e2ca4b924ec7860e51b43ad06cdb7e ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tar ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+bzip2 ++ 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/feeds/packages/utils/taskwarrior/.svn/entries b/feeds/packages/utils/taskwarrior/.svn/entries +new file mode 100644 +index 0000000..4e4b02c +--- /dev/null ++++ b/feeds/packages/utils/taskwarrior/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/taskwarrior ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:40.351934Z ++32285 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++ae038f4def2a150e021123a008177083 ++2012-06-12T23:47:40.351934Z ++32285 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1007 ++ +diff --git a/feeds/packages/utils/taskwarrior/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/taskwarrior/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/taskwarrior/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/taskwarrior/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/taskwarrior/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..26b1c80 +--- /dev/null ++++ b/feeds/packages/utils/taskwarrior/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 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:=taskwarrior ++PKG_VERSION:=2.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=task-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.taskwarrior.org/download/ ++PKG_MD5SUM:=b850b49f8b69bb4049c07d0914a0f7af ++ ++PKG_INSTALL:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/task-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++define Package/taskwarrior ++ TITLE:=taskwarrior ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses +libstdcpp ++ URL:=http://taskwarrior.org/projects/show/taskwarrior ++ MAINTAINER:=Xiangfu Liu ++endef ++ ++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/feeds/packages/utils/taskwarrior/Makefile b/feeds/packages/utils/taskwarrior/Makefile +new file mode 100644 +index 0000000..26b1c80 +--- /dev/null ++++ b/feeds/packages/utils/taskwarrior/Makefile +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 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:=taskwarrior ++PKG_VERSION:=2.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=task-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.taskwarrior.org/download/ ++PKG_MD5SUM:=b850b49f8b69bb4049c07d0914a0f7af ++ ++PKG_INSTALL:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/task-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++define Package/taskwarrior ++ TITLE:=taskwarrior ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libncurses +libstdcpp ++ URL:=http://taskwarrior.org/projects/show/taskwarrior ++ MAINTAINER:=Xiangfu Liu ++endef ++ ++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/feeds/packages/utils/tcpser/.svn/entries b/feeds/packages/utils/tcpser/.svn/entries +new file mode 100644 +index 0000000..ab9da4b +--- /dev/null ++++ b/feeds/packages/utils/tcpser/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tcpser ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-27T08:29:06.655427Z ++33567 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++34d82196f9a8b8c89abf019db2466271 ++2012-09-27T08:29:06.655427Z ++33567 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1563 ++ +diff --git a/feeds/packages/utils/tcpser/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/tcpser/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c0df184 +--- /dev/null ++++ b/feeds/packages/utils/tcpser/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2009 Marek Drapal ++# 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:=tcpser ++PKG_VERSION:=1.0rc12 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.jbrain.com/pub/linux/serial/ ++PKG_MD5SUM:=e712ae9fe6893bc825026b6dee6da9c0 ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tcpser ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Hayes compatible modem emulator ++ URL:=http://www.jbrain.com/pub/linux/serial/ ++ DEPENDS:=+libpthread ++endef ++ ++define Package/tcpser/description ++ TCPSER turns a PC serial port into an emulated Hayes compatible modem ++ that uses TCP/IP for incoming and outgoing connections. It can be used ++ to allow older applications and systems designed for modem use ++ to operate on the Internet. TCPSER supports all standard Hayes commands, ++ and understands extended and vendor proprietary commands (though it does ++ not implement many of them). TCPSER can be used for both inbound and ++ outbound connections. ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(CP) $(PKG_BUILD_DIR)/../$(PKG_NAME)/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" ++endef ++ ++define Package/tcpser/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpser $(1)/usr/bin/ ++endef ++ ++ ++$(eval $(call BuildPackage,tcpser)) +diff --git a/feeds/packages/utils/tcpser/Makefile b/feeds/packages/utils/tcpser/Makefile +new file mode 100644 +index 0000000..c0df184 +--- /dev/null ++++ b/feeds/packages/utils/tcpser/Makefile +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2009 Marek Drapal ++# 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:=tcpser ++PKG_VERSION:=1.0rc12 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.jbrain.com/pub/linux/serial/ ++PKG_MD5SUM:=e712ae9fe6893bc825026b6dee6da9c0 ++ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tcpser ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Hayes compatible modem emulator ++ URL:=http://www.jbrain.com/pub/linux/serial/ ++ DEPENDS:=+libpthread ++endef ++ ++define Package/tcpser/description ++ TCPSER turns a PC serial port into an emulated Hayes compatible modem ++ that uses TCP/IP for incoming and outgoing connections. It can be used ++ to allow older applications and systems designed for modem use ++ to operate on the Internet. TCPSER supports all standard Hayes commands, ++ and understands extended and vendor proprietary commands (though it does ++ not implement many of them). TCPSER can be used for both inbound and ++ outbound connections. ++endef ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(CP) $(PKG_BUILD_DIR)/../$(PKG_NAME)/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" ++endef ++ ++define Package/tcpser/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpser $(1)/usr/bin/ ++endef ++ ++ ++$(eval $(call BuildPackage,tcpser)) +diff --git a/feeds/packages/utils/tcsh/.svn/entries b/feeds/packages/utils/tcsh/.svn/entries +new file mode 100644 +index 0000000..4ec9477 +--- /dev/null ++++ b/feeds/packages/utils/tcsh/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tcsh ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-19T15:19:16.910161Z ++25046 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c8e3cc182c042f1ee8ee5273f97d8886 ++2011-01-19T15:19:16.910161Z ++25046 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1386 ++ +diff --git a/feeds/packages/utils/tcsh/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/tcsh/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b1b431f +--- /dev/null ++++ b/feeds/packages/utils/tcsh/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 2011 Nuno Goncalves ++# ++# 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.17.00 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/tcsh/ ++PKG_MD5SUM:=c47de903e3d52f6824c8dd0c91eeb477 ++ ++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/ ++ MAINTAINER:=Nuno Goncalves ++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/feeds/packages/utils/tcsh/Makefile b/feeds/packages/utils/tcsh/Makefile +new file mode 100644 +index 0000000..b1b431f +--- /dev/null ++++ b/feeds/packages/utils/tcsh/Makefile +@@ -0,0 +1,52 @@ ++# ++# Copyright (C) 2011 Nuno Goncalves ++# ++# 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.17.00 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/tcsh/ ++PKG_MD5SUM:=c47de903e3d52f6824c8dd0c91eeb477 ++ ++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/ ++ MAINTAINER:=Nuno Goncalves ++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/feeds/packages/utils/tcsh/patches/.svn/entries b/feeds/packages/utils/tcsh/patches/.svn/entries +new file mode 100644 +index 0000000..abc547b +--- /dev/null ++++ b/feeds/packages/utils/tcsh/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tcsh/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-01-19T15:19:16.910161Z ++25046 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-gethost ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2e0b729b148fff7f13c9784db1886017 ++2011-01-19T15:19:16.910161Z ++25046 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++386 ++ ++002-NLS ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++154148eab6cdf6550f643fba5d727ddb ++2011-01-19T15:19:16.910161Z ++25046 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++151 ++ +diff --git a/feeds/packages/utils/tcsh/patches/.svn/text-base/001-gethost.svn-base b/feeds/packages/utils/tcsh/patches/.svn/text-base/001-gethost.svn-base +new file mode 100644 +index 0000000..62342e2 +--- /dev/null ++++ b/feeds/packages/utils/tcsh/patches/.svn/text-base/001-gethost.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -365,7 +365,7 @@ ++ ++ gethost: gethost.c sh.err.h tc.const.h sh.h ++ rm -f gethost ++- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} +++ gcc -o gethost -g -O2 -I. -I. -D_PATH_TCSHELL='"/usr/local/bin/tcsh"' $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} ++ ++ tc.defs.c: gethost host.defs ++ @rm -f $@.tmp +diff --git a/feeds/packages/utils/tcsh/patches/.svn/text-base/002-NLS.svn-base b/feeds/packages/utils/tcsh/patches/.svn/text-base/002-NLS.svn-base +new file mode 100644 +index 0000000..9c52afd +--- /dev/null ++++ b/feeds/packages/utils/tcsh/patches/.svn/text-base/002-NLS.svn-base +@@ -0,0 +1,9 @@ ++--- a/config/linux +++++ b/config/linux ++@@ -106,6 +106,4 @@ ++ #endif ++ #define ECHO_STYLE BOTH_ECHO ++ ++-#define NLS_CATALOGS ++- ++ #endif /* _h_config */ +diff --git a/feeds/packages/utils/tcsh/patches/001-gethost b/feeds/packages/utils/tcsh/patches/001-gethost +new file mode 100644 +index 0000000..62342e2 +--- /dev/null ++++ b/feeds/packages/utils/tcsh/patches/001-gethost +@@ -0,0 +1,11 @@ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -365,7 +365,7 @@ ++ ++ gethost: gethost.c sh.err.h tc.const.h sh.h ++ rm -f gethost ++- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} +++ gcc -o gethost -g -O2 -I. -I. -D_PATH_TCSHELL='"/usr/local/bin/tcsh"' $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS} ++ ++ tc.defs.c: gethost host.defs ++ @rm -f $@.tmp +diff --git a/feeds/packages/utils/tcsh/patches/002-NLS b/feeds/packages/utils/tcsh/patches/002-NLS +new file mode 100644 +index 0000000..9c52afd +--- /dev/null ++++ b/feeds/packages/utils/tcsh/patches/002-NLS +@@ -0,0 +1,9 @@ ++--- a/config/linux +++++ b/config/linux ++@@ -106,6 +106,4 @@ ++ #endif ++ #define ECHO_STYLE BOTH_ECHO ++ ++-#define NLS_CATALOGS ++- ++ #endif /* _h_config */ +diff --git a/feeds/packages/utils/tesseract/.svn/entries b/feeds/packages/utils/tesseract/.svn/entries +new file mode 100644 +index 0000000..9ff97ca +--- /dev/null ++++ b/feeds/packages/utils/tesseract/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tesseract ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++3df6f31c58f316f502942d2dbd06add6 ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1473 ++ +diff --git a/feeds/packages/utils/tesseract/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/tesseract/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..86c152b +--- /dev/null ++++ b/feeds/packages/utils/tesseract/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=tesseract ++PKG_VERSION:=3.01 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://tesseract-ocr.googlecode.com/files/ ++PKG_MD5SUM:=1ba496e51a42358fb9d3ffe781b2d20a ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tesseract ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Tesseract Open Source OCR Engine ++ URL:=http://tesseract-ocr.googlecode.com/ ++ DEPENDS:=+libleptonica +libpthread +libstdcpp ++endef ++ ++CONFIGURE_ARGS += \ ++ LIBLEPT_HEADERSDIR="$(STAGING_DIR)/usr/include" \ ++ ++TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(SED) '1s/^\xEF\xBB\xBF//' $(PKG_BUILD_DIR)/ccutil/strngs.h ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/tesseract $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtesseract.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/tesseract/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/lib*.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,tesseract)) +diff --git a/feeds/packages/utils/tesseract/Makefile b/feeds/packages/utils/tesseract/Makefile +new file mode 100644 +index 0000000..86c152b +--- /dev/null ++++ b/feeds/packages/utils/tesseract/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=tesseract ++PKG_VERSION:=3.01 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://tesseract-ocr.googlecode.com/files/ ++PKG_MD5SUM:=1ba496e51a42358fb9d3ffe781b2d20a ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/tesseract ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Tesseract Open Source OCR Engine ++ URL:=http://tesseract-ocr.googlecode.com/ ++ DEPENDS:=+libleptonica +libpthread +libstdcpp ++endef ++ ++CONFIGURE_ARGS += \ ++ LIBLEPT_HEADERSDIR="$(STAGING_DIR)/usr/include" \ ++ ++TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++ $(SED) '1s/^\xEF\xBB\xBF//' $(PKG_BUILD_DIR)/ccutil/strngs.h ++endef ++ ++define Build/InstallDev ++ $(INSTALL_DIR) $(1)/usr/include ++ $(CP) $(PKG_INSTALL_DIR)/usr/include/tesseract $(1)/usr/include/ ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtesseract.{a,so*} $(1)/usr/lib/ ++endef ++ ++define Package/tesseract/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/lib*.so.* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/share ++ $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ ++endef ++ ++$(eval $(call BuildPackage,tesseract)) +diff --git a/feeds/packages/utils/testusb/.svn/entries b/feeds/packages/utils/testusb/.svn/entries +new file mode 100644 +index 0000000..81a94f5 +--- /dev/null ++++ b/feeds/packages/utils/testusb/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/testusb ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++6ad4a8c550e973fa372a948e669331a8 ++2011-11-11T18:07:06.624899Z ++28960 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++980 ++ +diff --git a/feeds/packages/utils/testusb/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/testusb/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/testusb/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/testusb/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/testusb/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..4364799 +--- /dev/null ++++ b/feeds/packages/utils/testusb/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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:=testusb ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_DEPENDS := libpthread ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/testusb ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@DEVEL +libpthread ++ TITLE:=USB testing utility ++ URL:=http://www.linux-usb.org/usbtest/testusb.c ++endef ++ ++define Package/testusb/description ++ This tool can be used to perform various tests with use of the usbtest driver. ++endef ++ ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -Os -lpthread $(PKG_BUILD_DIR)/testusb.c -o $(PKG_BUILD_DIR)/$(PKG_NAME) ++endef ++ ++define Package/testusb/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/testusb $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,testusb)) +diff --git a/feeds/packages/utils/testusb/Makefile b/feeds/packages/utils/testusb/Makefile +new file mode 100644 +index 0000000..4364799 +--- /dev/null ++++ b/feeds/packages/utils/testusb/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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:=testusb ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) ++PKG_BUILD_DEPENDS := libpthread ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/testusb ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=@DEVEL +libpthread ++ TITLE:=USB testing utility ++ URL:=http://www.linux-usb.org/usbtest/testusb.c ++endef ++ ++define Package/testusb/description ++ This tool can be used to perform various tests with use of the usbtest driver. ++endef ++ ++define Build/Prepare ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Build/Compile ++ $(TARGET_CC) $(TARGET_CFLAGS) -Os -lpthread $(PKG_BUILD_DIR)/testusb.c -o $(PKG_BUILD_DIR)/$(PKG_NAME) ++endef ++ ++define Package/testusb/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/testusb $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,testusb)) +diff --git a/feeds/packages/utils/testusb/src/.svn/entries b/feeds/packages/utils/testusb/src/.svn/entries +new file mode 100644 +index 0000000..72f698b +--- /dev/null ++++ b/feeds/packages/utils/testusb/src/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/testusb/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++testusb.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++6ea43c9bb07780e7261efa4b7a1f686c ++2009-04-17T15:22:00.575847Z ++15247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10288 ++ +diff --git a/feeds/packages/utils/testusb/src/.svn/prop-base/testusb.c.svn-base b/feeds/packages/utils/testusb/src/.svn/prop-base/testusb.c.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/testusb/src/.svn/prop-base/testusb.c.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/testusb/src/.svn/text-base/testusb.c.svn-base b/feeds/packages/utils/testusb/src/.svn/text-base/testusb.c.svn-base +new file mode 100644 +index 0000000..28e25ca +--- /dev/null ++++ b/feeds/packages/utils/testusb/src/.svn/text-base/testusb.c.svn-base +@@ -0,0 +1,427 @@ ++/* $(CROSS_COMPILE)cc -Wall -g -lpthread -o testusb testusb.c */ ++ ++/* ++ * Copyright (c) 2002 by David Brownell ++ * ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++/*-------------------------------------------------------------------------*/ ++ ++#define TEST_CASES 30 ++ ++// FIXME make these public somewhere; usbdevfs.h? ++ ++struct usbtest_param { ++ // inputs ++ unsigned test_num; /* 0..(TEST_CASES-1) */ ++ unsigned iterations; ++ unsigned length; ++ unsigned vary; ++ unsigned sglen; ++ ++ // outputs ++ struct timeval duration; ++}; ++#define USBTEST_REQUEST _IOWR('U', 100, struct usbtest_param) ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* #include */ ++ ++struct usb_device_descriptor { ++ __u8 bLength; ++ __u8 bDescriptorType; ++ __u16 bcdUSB; ++ __u8 bDeviceClass; ++ __u8 bDeviceSubClass; ++ __u8 bDeviceProtocol; ++ __u8 bMaxPacketSize0; ++ __u16 idVendor; ++ __u16 idProduct; ++ __u16 bcdDevice; ++ __u8 iManufacturer; ++ __u8 iProduct; ++ __u8 iSerialNumber; ++ __u8 bNumConfigurations; ++} __attribute__ ((packed)); ++ ++enum usb_device_speed { ++ USB_SPEED_UNKNOWN = 0, /* enumerating */ ++ USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */ ++ USB_SPEED_HIGH /* usb 2.0 */ ++}; ++ ++/*-------------------------------------------------------------------------*/ ++ ++static char *speed (enum usb_device_speed s) ++{ ++ switch (s) { ++ case USB_SPEED_UNKNOWN: return "unknown"; ++ case USB_SPEED_LOW: return "low"; ++ case USB_SPEED_FULL: return "full"; ++ case USB_SPEED_HIGH: return "high"; ++ default: return "??"; ++ } ++} ++ ++struct testdev { ++ struct testdev *next; ++ char *name; ++ pthread_t thread; ++ enum usb_device_speed speed; ++ unsigned ifnum : 8; ++ unsigned forever : 1; ++ int test; ++ ++ struct usbtest_param param; ++}; ++static struct testdev *testdevs; ++ ++static int is_testdev (struct usb_device_descriptor *dev) ++{ ++ /* FX2 with (tweaked) bulksrc firmware */ ++ if (dev->idVendor == 0x0547 && dev->idProduct == 0x1002) ++ return 1; ++ ++ /*----------------------------------------------------*/ ++ ++ /* devices that start up using the EZ-USB default device and ++ * which we can use after loading simple firmware. hotplug ++ * can fxload it, and then run this test driver. ++ * ++ * we return false positives in two cases: ++ * - the device has a "real" driver (maybe usb-serial) that ++ * renumerates. the device should vanish quickly. ++ * - the device doesn't have the test firmware installed. ++ */ ++ ++ /* generic EZ-USB FX controller */ ++ if (dev->idVendor == 0x0547 && dev->idProduct == 0x2235) ++ return 1; ++ ++ /* generic EZ-USB FX2 controller */ ++ if (dev->idVendor == 0x04b4 && dev->idProduct == 0x8613) ++ return 1; ++ ++ /* CY3671 development board with EZ-USB FX */ ++ if (dev->idVendor == 0x0547 && dev->idProduct == 0x0080) ++ return 1; ++ ++ /* Keyspan 19Qi uses an21xx (original EZ-USB) */ ++ if (dev->idVendor == 0x06cd && dev->idProduct == 0x010b) ++ return 1; ++ ++ /*----------------------------------------------------*/ ++ ++ /* "gadget zero", Linux-USB test software */ ++ if (dev->idVendor == 0x0525 && dev->idProduct == 0xa4a0) ++ return 1; ++ ++ /* user mode subset of that */ ++ if (dev->idVendor == 0x0525 && dev->idProduct == 0xa4a4) ++ return 1; ++ ++ /* iso version of usermode code */ ++ if (dev->idVendor == 0x0525 && dev->idProduct == 0xa4a3) ++ return 1; ++ ++ /* some GPL'd test firmware uses these IDs */ ++ ++ if (dev->idVendor == 0xfff0 && dev->idProduct == 0xfff0) ++ return 1; ++ ++ /*----------------------------------------------------*/ ++ ++ /* iBOT2 high speed webcam */ ++ if (dev->idVendor == 0x0b62 && dev->idProduct == 0x0059) ++ return 1; ++ ++ return 0; ++} ++ ++static int find_testdev (const char *name, const struct stat *sb, int flag) ++{ ++ int fd; ++ struct usb_device_descriptor dev; ++ ++ if (flag != FTW_F) ++ return 0; ++ /* ignore /proc/bus/usb/{devices,drivers} */ ++ if (strrchr (name, '/')[1] == 'd') ++ return 0; ++ ++ if ((fd = open (name, O_RDONLY)) < 0) { ++ perror ("can't open dev file r/o"); ++ return 0; ++ } ++ if (read (fd, &dev, sizeof dev) != sizeof dev) ++ fputs ("short devfile read!\n", stderr); ++ else if (is_testdev (&dev)) { ++ struct testdev *entry; ++ ++ if ((entry = calloc (1, sizeof *entry)) == 0) { ++ fputs ("no mem!\n", stderr); ++ goto done; ++ } ++ entry->name = strdup (name); ++ if (!entry->name) { ++ free (entry); ++ goto done; ++ } ++ ++ // FIXME better to look at each interface and ask if it's ++ // bound to 'usbtest', rather than assume interface 0 ++ entry->ifnum = 0; ++ ++ // FIXME ask usbfs what speed; update USBDEVFS_CONNECTINFO ++ // so it tells about high speed etc ++ ++ fprintf (stderr, "%s speed\t%s\n", ++ speed (entry->speed), entry->name); ++ ++ entry->next = testdevs; ++ testdevs = entry; ++ } ++ ++done: ++ close (fd); ++ return 0; ++} ++ ++static int ++usbdev_ioctl (int fd, int ifno, unsigned request, void *param) ++{ ++ struct usbdevfs_ioctl wrapper; ++ ++ wrapper.ifno = ifno; ++ wrapper.ioctl_code = request; ++ wrapper.data = param; ++ ++ return ioctl (fd, USBDEVFS_IOCTL, &wrapper); ++} ++ ++static void *handle_testdev (void *arg) ++{ ++ struct testdev *dev = arg; ++ int fd, i; ++ int status; ++ ++ if ((fd = open (dev->name, O_RDWR)) < 0) { ++ perror ("can't open dev file r/w"); ++ return 0; ++ } ++ ++restart: ++ for (i = 0; i < TEST_CASES; i++) { ++ if (dev->test != -1 && dev->test != i) ++ continue; ++ dev->param.test_num = i; ++ ++ status = usbdev_ioctl (fd, dev->ifnum, ++ USBTEST_REQUEST, &dev->param); ++ if (status < 0 && errno == EOPNOTSUPP) ++ continue; ++ ++ /* FIXME need a "syslog it" option for background testing */ ++ ++ /* NOTE: each thread emits complete lines; no fragments! */ ++ if (status < 0) { ++ char buf [80]; ++ int err = errno; ++ ++ if (strerror_r (errno, buf, sizeof buf)) { ++ snprintf (buf, sizeof buf, "error %d", err); ++ errno = err; ++ } ++ printf ("%s test %d --> %d (%s)\n", ++ dev->name, i, errno, buf); ++ } else ++ printf ("%s test %d, %4d.%.06d secs\n", dev->name, i, ++ (int) dev->param.duration.tv_sec, ++ (int) dev->param.duration.tv_usec); ++ ++ fflush (stdout); ++ } ++ if (dev->forever) ++ goto restart; ++ ++ close (fd); ++ return arg; ++} ++ ++int main (int argc, char **argv) ++{ ++ int c; ++ struct testdev *entry; ++ char *device; ++ int all = 0, forever = 0, not = 0; ++ int test = -1 /* all */; ++ struct usbtest_param param; ++ ++ /* pick defaults that works with all speeds, without short packets. ++ * ++ * Best per-frame data rates: ++ * high speed, bulk 512 * 13 * 8 = 53248 ++ * interrupt 1024 * 3 * 8 = 24576 ++ * full speed, bulk/intr 64 * 19 = 1216 ++ * interrupt 64 * 1 = 64 ++ * low speed, interrupt 8 * 1 = 8 ++ */ ++ param.iterations = 1000; ++ param.length = 512; ++ param.vary = 512; ++ param.sglen = 32; ++ ++ /* for easy use when hotplugging */ ++ device = getenv ("DEVICE"); ++ ++ while ((c = getopt (argc, argv, "D:ac:g:hns:t:v:")) != EOF) ++ switch (c) { ++ case 'D': /* device, if only one */ ++ device = optarg; ++ continue; ++ case 'a': /* use all devices */ ++ device = 0; ++ all = 1; ++ continue; ++ case 'c': /* count iterations */ ++ param.iterations = atoi (optarg); ++ if (param.iterations < 0) ++ goto usage; ++ continue; ++ case 'g': /* scatter/gather entries */ ++ param.sglen = atoi (optarg); ++ if (param.sglen < 0) ++ goto usage; ++ continue; ++ case 'l': /* loop forever */ ++ forever = 1; ++ continue; ++ case 'n': /* no test running! */ ++ not = 1; ++ continue; ++ case 's': /* size of packet */ ++ param.length = atoi (optarg); ++ if (param.length < 0) ++ goto usage; ++ continue; ++ case 't': /* run just one test */ ++ test = atoi (optarg); ++ if (test < 0) ++ goto usage; ++ continue; ++ case 'v': /* vary packet size by ... */ ++ param.vary = atoi (optarg); ++ if (param.vary < 0) ++ goto usage; ++ continue; ++ case '?': ++ case 'h': ++ default: ++usage: ++ fprintf (stderr, "usage: %s [-an] [-D dev]\n" ++ "\t[-c iterations] [-t testnum]\n" ++ "\t[-s packetsize] [-g sglen] [-v vary]\n", ++ argv [0]); ++ return 1; ++ } ++ if (optind != argc) ++ goto usage; ++ if (!all && !device) { ++ fprintf (stderr, "must specify '-a' or '-D dev', " ++ "or DEVICE=/proc/bus/usb/BBB/DDD in env\n"); ++ goto usage; ++ } ++ ++ if ((c = open ("/proc/bus/usb/devices", O_RDONLY)) < 0) { ++ fputs ("usbfs files are missing\n", stderr); ++ return -1; ++ } ++ ++ /* collect and list the test devices */ ++ if (ftw ("/proc/bus/usb", find_testdev, 3) != 0) { ++ fputs ("ftw failed; is usbfs missing?\n", stderr); ++ return -1; ++ } ++ ++ /* quit, run single test, or create test threads */ ++ if (!testdevs && !device) { ++ fputs ("no test devices recognized\n", stderr); ++ return -1; ++ } ++ if (not) ++ return 0; ++ if (testdevs && testdevs->next == 0 && !device) ++ device = testdevs->name; ++ for (entry = testdevs; entry; entry = entry->next) { ++ int status; ++ ++ entry->param = param; ++ entry->forever = forever; ++ entry->test = test; ++ ++ if (device) { ++ if (strcmp (entry->name, device)) ++ continue; ++ return handle_testdev (entry) != entry; ++ } ++ status = pthread_create (&entry->thread, 0, handle_testdev, entry); ++ if (status) { ++ perror ("pthread_create"); ++ continue; ++ } ++ } ++ if (device) { ++ struct testdev dev; ++ ++ /* kernel can recognize test devices we don't */ ++ fprintf (stderr, "%s: %s may see only control tests\n", ++ argv [0], device); ++ ++ memset (&dev, 0, sizeof dev); ++ dev.name = device; ++ dev.param = param; ++ dev.forever = forever; ++ dev.test = test; ++ return handle_testdev (&dev) != &dev; ++ } ++ ++ /* wait for tests to complete */ ++ for (entry = testdevs; entry; entry = entry->next) { ++ void *retval; ++ ++ if (pthread_join (entry->thread, &retval)) ++ perror ("pthread_join"); ++ /* testing errors discarded! */ ++ } ++ ++ return 0; ++} +diff --git a/feeds/packages/utils/testusb/src/testusb.c b/feeds/packages/utils/testusb/src/testusb.c +new file mode 100644 +index 0000000..28e25ca +--- /dev/null ++++ b/feeds/packages/utils/testusb/src/testusb.c +@@ -0,0 +1,427 @@ ++/* $(CROSS_COMPILE)cc -Wall -g -lpthread -o testusb testusb.c */ ++ ++/* ++ * Copyright (c) 2002 by David Brownell ++ * ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++/*-------------------------------------------------------------------------*/ ++ ++#define TEST_CASES 30 ++ ++// FIXME make these public somewhere; usbdevfs.h? ++ ++struct usbtest_param { ++ // inputs ++ unsigned test_num; /* 0..(TEST_CASES-1) */ ++ unsigned iterations; ++ unsigned length; ++ unsigned vary; ++ unsigned sglen; ++ ++ // outputs ++ struct timeval duration; ++}; ++#define USBTEST_REQUEST _IOWR('U', 100, struct usbtest_param) ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* #include */ ++ ++struct usb_device_descriptor { ++ __u8 bLength; ++ __u8 bDescriptorType; ++ __u16 bcdUSB; ++ __u8 bDeviceClass; ++ __u8 bDeviceSubClass; ++ __u8 bDeviceProtocol; ++ __u8 bMaxPacketSize0; ++ __u16 idVendor; ++ __u16 idProduct; ++ __u16 bcdDevice; ++ __u8 iManufacturer; ++ __u8 iProduct; ++ __u8 iSerialNumber; ++ __u8 bNumConfigurations; ++} __attribute__ ((packed)); ++ ++enum usb_device_speed { ++ USB_SPEED_UNKNOWN = 0, /* enumerating */ ++ USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */ ++ USB_SPEED_HIGH /* usb 2.0 */ ++}; ++ ++/*-------------------------------------------------------------------------*/ ++ ++static char *speed (enum usb_device_speed s) ++{ ++ switch (s) { ++ case USB_SPEED_UNKNOWN: return "unknown"; ++ case USB_SPEED_LOW: return "low"; ++ case USB_SPEED_FULL: return "full"; ++ case USB_SPEED_HIGH: return "high"; ++ default: return "??"; ++ } ++} ++ ++struct testdev { ++ struct testdev *next; ++ char *name; ++ pthread_t thread; ++ enum usb_device_speed speed; ++ unsigned ifnum : 8; ++ unsigned forever : 1; ++ int test; ++ ++ struct usbtest_param param; ++}; ++static struct testdev *testdevs; ++ ++static int is_testdev (struct usb_device_descriptor *dev) ++{ ++ /* FX2 with (tweaked) bulksrc firmware */ ++ if (dev->idVendor == 0x0547 && dev->idProduct == 0x1002) ++ return 1; ++ ++ /*----------------------------------------------------*/ ++ ++ /* devices that start up using the EZ-USB default device and ++ * which we can use after loading simple firmware. hotplug ++ * can fxload it, and then run this test driver. ++ * ++ * we return false positives in two cases: ++ * - the device has a "real" driver (maybe usb-serial) that ++ * renumerates. the device should vanish quickly. ++ * - the device doesn't have the test firmware installed. ++ */ ++ ++ /* generic EZ-USB FX controller */ ++ if (dev->idVendor == 0x0547 && dev->idProduct == 0x2235) ++ return 1; ++ ++ /* generic EZ-USB FX2 controller */ ++ if (dev->idVendor == 0x04b4 && dev->idProduct == 0x8613) ++ return 1; ++ ++ /* CY3671 development board with EZ-USB FX */ ++ if (dev->idVendor == 0x0547 && dev->idProduct == 0x0080) ++ return 1; ++ ++ /* Keyspan 19Qi uses an21xx (original EZ-USB) */ ++ if (dev->idVendor == 0x06cd && dev->idProduct == 0x010b) ++ return 1; ++ ++ /*----------------------------------------------------*/ ++ ++ /* "gadget zero", Linux-USB test software */ ++ if (dev->idVendor == 0x0525 && dev->idProduct == 0xa4a0) ++ return 1; ++ ++ /* user mode subset of that */ ++ if (dev->idVendor == 0x0525 && dev->idProduct == 0xa4a4) ++ return 1; ++ ++ /* iso version of usermode code */ ++ if (dev->idVendor == 0x0525 && dev->idProduct == 0xa4a3) ++ return 1; ++ ++ /* some GPL'd test firmware uses these IDs */ ++ ++ if (dev->idVendor == 0xfff0 && dev->idProduct == 0xfff0) ++ return 1; ++ ++ /*----------------------------------------------------*/ ++ ++ /* iBOT2 high speed webcam */ ++ if (dev->idVendor == 0x0b62 && dev->idProduct == 0x0059) ++ return 1; ++ ++ return 0; ++} ++ ++static int find_testdev (const char *name, const struct stat *sb, int flag) ++{ ++ int fd; ++ struct usb_device_descriptor dev; ++ ++ if (flag != FTW_F) ++ return 0; ++ /* ignore /proc/bus/usb/{devices,drivers} */ ++ if (strrchr (name, '/')[1] == 'd') ++ return 0; ++ ++ if ((fd = open (name, O_RDONLY)) < 0) { ++ perror ("can't open dev file r/o"); ++ return 0; ++ } ++ if (read (fd, &dev, sizeof dev) != sizeof dev) ++ fputs ("short devfile read!\n", stderr); ++ else if (is_testdev (&dev)) { ++ struct testdev *entry; ++ ++ if ((entry = calloc (1, sizeof *entry)) == 0) { ++ fputs ("no mem!\n", stderr); ++ goto done; ++ } ++ entry->name = strdup (name); ++ if (!entry->name) { ++ free (entry); ++ goto done; ++ } ++ ++ // FIXME better to look at each interface and ask if it's ++ // bound to 'usbtest', rather than assume interface 0 ++ entry->ifnum = 0; ++ ++ // FIXME ask usbfs what speed; update USBDEVFS_CONNECTINFO ++ // so it tells about high speed etc ++ ++ fprintf (stderr, "%s speed\t%s\n", ++ speed (entry->speed), entry->name); ++ ++ entry->next = testdevs; ++ testdevs = entry; ++ } ++ ++done: ++ close (fd); ++ return 0; ++} ++ ++static int ++usbdev_ioctl (int fd, int ifno, unsigned request, void *param) ++{ ++ struct usbdevfs_ioctl wrapper; ++ ++ wrapper.ifno = ifno; ++ wrapper.ioctl_code = request; ++ wrapper.data = param; ++ ++ return ioctl (fd, USBDEVFS_IOCTL, &wrapper); ++} ++ ++static void *handle_testdev (void *arg) ++{ ++ struct testdev *dev = arg; ++ int fd, i; ++ int status; ++ ++ if ((fd = open (dev->name, O_RDWR)) < 0) { ++ perror ("can't open dev file r/w"); ++ return 0; ++ } ++ ++restart: ++ for (i = 0; i < TEST_CASES; i++) { ++ if (dev->test != -1 && dev->test != i) ++ continue; ++ dev->param.test_num = i; ++ ++ status = usbdev_ioctl (fd, dev->ifnum, ++ USBTEST_REQUEST, &dev->param); ++ if (status < 0 && errno == EOPNOTSUPP) ++ continue; ++ ++ /* FIXME need a "syslog it" option for background testing */ ++ ++ /* NOTE: each thread emits complete lines; no fragments! */ ++ if (status < 0) { ++ char buf [80]; ++ int err = errno; ++ ++ if (strerror_r (errno, buf, sizeof buf)) { ++ snprintf (buf, sizeof buf, "error %d", err); ++ errno = err; ++ } ++ printf ("%s test %d --> %d (%s)\n", ++ dev->name, i, errno, buf); ++ } else ++ printf ("%s test %d, %4d.%.06d secs\n", dev->name, i, ++ (int) dev->param.duration.tv_sec, ++ (int) dev->param.duration.tv_usec); ++ ++ fflush (stdout); ++ } ++ if (dev->forever) ++ goto restart; ++ ++ close (fd); ++ return arg; ++} ++ ++int main (int argc, char **argv) ++{ ++ int c; ++ struct testdev *entry; ++ char *device; ++ int all = 0, forever = 0, not = 0; ++ int test = -1 /* all */; ++ struct usbtest_param param; ++ ++ /* pick defaults that works with all speeds, without short packets. ++ * ++ * Best per-frame data rates: ++ * high speed, bulk 512 * 13 * 8 = 53248 ++ * interrupt 1024 * 3 * 8 = 24576 ++ * full speed, bulk/intr 64 * 19 = 1216 ++ * interrupt 64 * 1 = 64 ++ * low speed, interrupt 8 * 1 = 8 ++ */ ++ param.iterations = 1000; ++ param.length = 512; ++ param.vary = 512; ++ param.sglen = 32; ++ ++ /* for easy use when hotplugging */ ++ device = getenv ("DEVICE"); ++ ++ while ((c = getopt (argc, argv, "D:ac:g:hns:t:v:")) != EOF) ++ switch (c) { ++ case 'D': /* device, if only one */ ++ device = optarg; ++ continue; ++ case 'a': /* use all devices */ ++ device = 0; ++ all = 1; ++ continue; ++ case 'c': /* count iterations */ ++ param.iterations = atoi (optarg); ++ if (param.iterations < 0) ++ goto usage; ++ continue; ++ case 'g': /* scatter/gather entries */ ++ param.sglen = atoi (optarg); ++ if (param.sglen < 0) ++ goto usage; ++ continue; ++ case 'l': /* loop forever */ ++ forever = 1; ++ continue; ++ case 'n': /* no test running! */ ++ not = 1; ++ continue; ++ case 's': /* size of packet */ ++ param.length = atoi (optarg); ++ if (param.length < 0) ++ goto usage; ++ continue; ++ case 't': /* run just one test */ ++ test = atoi (optarg); ++ if (test < 0) ++ goto usage; ++ continue; ++ case 'v': /* vary packet size by ... */ ++ param.vary = atoi (optarg); ++ if (param.vary < 0) ++ goto usage; ++ continue; ++ case '?': ++ case 'h': ++ default: ++usage: ++ fprintf (stderr, "usage: %s [-an] [-D dev]\n" ++ "\t[-c iterations] [-t testnum]\n" ++ "\t[-s packetsize] [-g sglen] [-v vary]\n", ++ argv [0]); ++ return 1; ++ } ++ if (optind != argc) ++ goto usage; ++ if (!all && !device) { ++ fprintf (stderr, "must specify '-a' or '-D dev', " ++ "or DEVICE=/proc/bus/usb/BBB/DDD in env\n"); ++ goto usage; ++ } ++ ++ if ((c = open ("/proc/bus/usb/devices", O_RDONLY)) < 0) { ++ fputs ("usbfs files are missing\n", stderr); ++ return -1; ++ } ++ ++ /* collect and list the test devices */ ++ if (ftw ("/proc/bus/usb", find_testdev, 3) != 0) { ++ fputs ("ftw failed; is usbfs missing?\n", stderr); ++ return -1; ++ } ++ ++ /* quit, run single test, or create test threads */ ++ if (!testdevs && !device) { ++ fputs ("no test devices recognized\n", stderr); ++ return -1; ++ } ++ if (not) ++ return 0; ++ if (testdevs && testdevs->next == 0 && !device) ++ device = testdevs->name; ++ for (entry = testdevs; entry; entry = entry->next) { ++ int status; ++ ++ entry->param = param; ++ entry->forever = forever; ++ entry->test = test; ++ ++ if (device) { ++ if (strcmp (entry->name, device)) ++ continue; ++ return handle_testdev (entry) != entry; ++ } ++ status = pthread_create (&entry->thread, 0, handle_testdev, entry); ++ if (status) { ++ perror ("pthread_create"); ++ continue; ++ } ++ } ++ if (device) { ++ struct testdev dev; ++ ++ /* kernel can recognize test devices we don't */ ++ fprintf (stderr, "%s: %s may see only control tests\n", ++ argv [0], device); ++ ++ memset (&dev, 0, sizeof dev); ++ dev.name = device; ++ dev.param = param; ++ dev.forever = forever; ++ dev.test = test; ++ return handle_testdev (&dev) != &dev; ++ } ++ ++ /* wait for tests to complete */ ++ for (entry = testdevs; entry; entry = entry->next) { ++ void *retval; ++ ++ if (pthread_join (entry->thread, &retval)) ++ perror ("pthread_join"); ++ /* testing errors discarded! */ ++ } ++ ++ return 0; ++} +diff --git a/feeds/packages/utils/time/.svn/entries b/feeds/packages/utils/time/.svn/entries +new file mode 100644 +index 0000000..c06943c +--- /dev/null ++++ b/feeds/packages/utils/time/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/time ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++7f9e1a8ed7a9c7e4e7c1a8bf81a5868e ++2012-06-11T21:18:33.553794Z ++32206 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1497 ++ +diff --git a/feeds/packages/utils/time/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/time/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7c0e15a +--- /dev/null ++++ b/feeds/packages/utils/time/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,57 @@ ++# ++# 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:=time ++PKG_VERSION:=1.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/time ++PKG_MD5SUM:=e38d2b8b34b1ca259cf7b053caac32b3 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/time ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The GNU time utility ++ URL:=http://www.gnu.org/software/time/ ++endef ++ ++define Package/time/description ++ `time' is a program that measures many of the CPU resources, such as time and ++ memory, that other programs use. The GNU version can format the output in ++ arbitrary ways by using a printf-style format string to include various ++ resource measurements. Some systems do not provide much information about ++ program resource use; `time' reports unavailable information as zero values. ++endef ++ ++define Package/time/preinst ++#!/bin/sh ++if [ -e $${IPKG_INSTROOT}/usr/bin/time ]; then ++ rm $${IPKG_INSTROOT}/usr/bin/time; ++fi ++endef ++ ++define Package/time/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/time $(1)/usr/bin/ ++endef ++ ++define Package/time/postrm ++#!/bin/sh ++ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/time ++$${IPKG_INSTROOT}/usr/bin/time 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/time ++exit 0 ++endef ++ ++$(eval $(call BuildPackage,time)) +diff --git a/feeds/packages/utils/time/Makefile b/feeds/packages/utils/time/Makefile +new file mode 100644 +index 0000000..7c0e15a +--- /dev/null ++++ b/feeds/packages/utils/time/Makefile +@@ -0,0 +1,57 @@ ++# ++# 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:=time ++PKG_VERSION:=1.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@GNU/time ++PKG_MD5SUM:=e38d2b8b34b1ca259cf7b053caac32b3 ++ ++PKG_FIXUP:=autoreconf ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/time ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The GNU time utility ++ URL:=http://www.gnu.org/software/time/ ++endef ++ ++define Package/time/description ++ `time' is a program that measures many of the CPU resources, such as time and ++ memory, that other programs use. The GNU version can format the output in ++ arbitrary ways by using a printf-style format string to include various ++ resource measurements. Some systems do not provide much information about ++ program resource use; `time' reports unavailable information as zero values. ++endef ++ ++define Package/time/preinst ++#!/bin/sh ++if [ -e $${IPKG_INSTROOT}/usr/bin/time ]; then ++ rm $${IPKG_INSTROOT}/usr/bin/time; ++fi ++endef ++ ++define Package/time/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/time $(1)/usr/bin/ ++endef ++ ++define Package/time/postrm ++#!/bin/sh ++ln -sf ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/time ++$${IPKG_INSTROOT}/usr/bin/time 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/time ++exit 0 ++endef ++ ++$(eval $(call BuildPackage,time)) +diff --git a/feeds/packages/utils/time/patches/.svn/entries b/feeds/packages/utils/time/patches/.svn/entries +new file mode 100644 +index 0000000..7c83f8f +--- /dev/null ++++ b/feeds/packages/utils/time/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/time/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-08-15T03:38:32.680634Z ++27986 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-fix-configure.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e93a13bb2201ecdcf38dd984faacebc3 ++2011-08-15T03:38:32.680634Z ++27986 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++550 ++ ++002-fix-rusage.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++55151d2acbc93b4070ef068e8bf2f237 ++2011-08-15T03:38:32.680634Z ++27986 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++251 ++ +diff --git a/feeds/packages/utils/time/patches/.svn/text-base/001-fix-configure.patch.svn-base b/feeds/packages/utils/time/patches/.svn/text-base/001-fix-configure.patch.svn-base +new file mode 100644 +index 0000000..6d4af09 +--- /dev/null ++++ b/feeds/packages/utils/time/patches/.svn/text-base/001-fix-configure.patch.svn-base +@@ -0,0 +1,22 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -1,9 +1,6 @@ ++ dnl Process this file with autoconf to produce a configure script. ++ AC_INIT(time.c) ++-VERSION=1.7 ++-AC_SUBST(VERSION) ++-PACKAGE=time ++-AC_SUBST(PACKAGE) +++AM_INIT_AUTOMAKE(time, 1.7) ++ ++ AC_ARG_PROGRAM ++ ++@@ -15,7 +12,7 @@ AC_PROG_INSTALL ++ dnl Checks for header files. ++ AC_HEADER_STDC ++ AC_HEADER_SYS_WAIT ++-AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h) +++AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h sys/resource.h) ++ ++ dnl Checks for typedefs, structures, and compiler characteristics. ++ AC_C_CONST +diff --git a/feeds/packages/utils/time/patches/.svn/text-base/002-fix-rusage.patch.svn-base b/feeds/packages/utils/time/patches/.svn/text-base/002-fix-rusage.patch.svn-base +new file mode 100644 +index 0000000..714cf0c +--- /dev/null ++++ b/feeds/packages/utils/time/patches/.svn/text-base/002-fix-rusage.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/resuse.h +++++ b/resuse.h ++@@ -36,7 +36,7 @@ struct timeval ++ # include ++ #else ++ # define TV_MSEC tv_usec / 1000 ++-# if HAVE_WAIT3 +++# if HAVE_SYS_RESOURCE_H ++ # include ++ # else ++ /* Process resource usage structure. */ +diff --git a/feeds/packages/utils/time/patches/001-fix-configure.patch b/feeds/packages/utils/time/patches/001-fix-configure.patch +new file mode 100644 +index 0000000..6d4af09 +--- /dev/null ++++ b/feeds/packages/utils/time/patches/001-fix-configure.patch +@@ -0,0 +1,22 @@ ++--- a/configure.in +++++ b/configure.in ++@@ -1,9 +1,6 @@ ++ dnl Process this file with autoconf to produce a configure script. ++ AC_INIT(time.c) ++-VERSION=1.7 ++-AC_SUBST(VERSION) ++-PACKAGE=time ++-AC_SUBST(PACKAGE) +++AM_INIT_AUTOMAKE(time, 1.7) ++ ++ AC_ARG_PROGRAM ++ ++@@ -15,7 +12,7 @@ AC_PROG_INSTALL ++ dnl Checks for header files. ++ AC_HEADER_STDC ++ AC_HEADER_SYS_WAIT ++-AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h) +++AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h sys/resource.h) ++ ++ dnl Checks for typedefs, structures, and compiler characteristics. ++ AC_C_CONST +diff --git a/feeds/packages/utils/time/patches/002-fix-rusage.patch b/feeds/packages/utils/time/patches/002-fix-rusage.patch +new file mode 100644 +index 0000000..714cf0c +--- /dev/null ++++ b/feeds/packages/utils/time/patches/002-fix-rusage.patch +@@ -0,0 +1,11 @@ ++--- a/resuse.h +++++ b/resuse.h ++@@ -36,7 +36,7 @@ struct timeval ++ # include ++ #else ++ # define TV_MSEC tv_usec / 1000 ++-# if HAVE_WAIT3 +++# if HAVE_SYS_RESOURCE_H ++ # include ++ # else ++ /* Process resource usage structure. */ +diff --git a/feeds/packages/utils/tmux/.svn/entries b/feeds/packages/utils/tmux/.svn/entries +new file mode 100644 +index 0000000..972f4e0 +--- /dev/null ++++ b/feeds/packages/utils/tmux/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tmux ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-07T14:49:34.440956Z ++30355 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c08b5b8f2b5581d34e21f956b5fd7d8a ++2012-02-07T14:49:34.440956Z ++30355 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++897 ++ +diff --git a/feeds/packages/utils/tmux/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/tmux/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b704b01 +--- /dev/null ++++ b/feeds/packages/utils/tmux/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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.6 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/tmux ++PKG_MD5SUM:=3e37db24aa596bf108a0442a81c845b3 ++ ++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/feeds/packages/utils/tmux/Makefile b/feeds/packages/utils/tmux/Makefile +new file mode 100644 +index 0000000..b704b01 +--- /dev/null ++++ b/feeds/packages/utils/tmux/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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.6 ++PKG_RELEASE:=2 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/tmux ++PKG_MD5SUM:=3e37db24aa596bf108a0442a81c845b3 ++ ++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/feeds/packages/utils/tmux/patches/.svn/entries b/feeds/packages/utils/tmux/patches/.svn/entries +new file mode 100644 +index 0000000..c926a69 +--- /dev/null ++++ b/feeds/packages/utils/tmux/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/tmux/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-02-07T14:49:34.440956Z ++30355 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-b64_ntop-conflict.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++12b425a27f2f627a0cf75556bc57ff7b ++2012-02-07T14:49:34.440956Z ++30355 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1318 ++ +diff --git a/feeds/packages/utils/tmux/patches/.svn/text-base/100-b64_ntop-conflict.patch.svn-base b/feeds/packages/utils/tmux/patches/.svn/text-base/100-b64_ntop-conflict.patch.svn-base +new file mode 100644 +index 0000000..8e7a8d7 +--- /dev/null ++++ b/feeds/packages/utils/tmux/patches/.svn/text-base/100-b64_ntop-conflict.patch.svn-base +@@ -0,0 +1,41 @@ ++Index: tmux-1.6/compat.h ++=================================================================== ++--- tmux-1.6.orig/compat.h +++++ tmux-1.6/compat.h ++@@ -198,7 +198,9 @@ int daemon(int, int); ++ ++ #ifndef HAVE_B64_NTOP ++ /* b64_ntop.c */ ++-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 ++Index: tmux-1.6/compat/b64_ntop.c ++=================================================================== ++--- tmux-1.6.orig/compat/b64_ntop.c +++++ tmux-1.6/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]; ++Index: tmux-1.6/tty.c ++=================================================================== ++--- tmux-1.6.orig/tty.c +++++ tmux-1.6/tty.c ++@@ -1006,7 +1006,7 @@ tty_cmd_setselection(struct tty *tty, co ++ 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); ++ ++ xfree(buf); +diff --git a/feeds/packages/utils/tmux/patches/100-b64_ntop-conflict.patch b/feeds/packages/utils/tmux/patches/100-b64_ntop-conflict.patch +new file mode 100644 +index 0000000..8e7a8d7 +--- /dev/null ++++ b/feeds/packages/utils/tmux/patches/100-b64_ntop-conflict.patch +@@ -0,0 +1,41 @@ ++Index: tmux-1.6/compat.h ++=================================================================== ++--- tmux-1.6.orig/compat.h +++++ tmux-1.6/compat.h ++@@ -198,7 +198,9 @@ int daemon(int, int); ++ ++ #ifndef HAVE_B64_NTOP ++ /* b64_ntop.c */ ++-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 ++Index: tmux-1.6/compat/b64_ntop.c ++=================================================================== ++--- tmux-1.6.orig/compat/b64_ntop.c +++++ tmux-1.6/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]; ++Index: tmux-1.6/tty.c ++=================================================================== ++--- tmux-1.6.orig/tty.c +++++ tmux-1.6/tty.c ++@@ -1006,7 +1006,7 @@ tty_cmd_setselection(struct tty *tty, co ++ 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); ++ ++ xfree(buf); +diff --git a/feeds/packages/utils/triggerhappy/.svn/entries b/feeds/packages/utils/triggerhappy/.svn/entries +new file mode 100644 +index 0000000..7a38804 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/triggerhappy ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-28T21:22:30.001457Z ++26340 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9aafabcac4eba3c4fdbee59c0d4f30bf ++2011-03-28T21:22:30.001457Z ++26340 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1633 ++ +diff --git a/feeds/packages/utils/triggerhappy/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/triggerhappy/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..aa3ea19 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,52 @@ ++# ++# 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:=cb3ed9ba849ff5926fa47fd1ae042fa0083edaf5 ++PKG_RELEASE:=1 ++ ++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) ++ ++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/feeds/packages/utils/triggerhappy/Makefile b/feeds/packages/utils/triggerhappy/Makefile +new file mode 100644 +index 0000000..aa3ea19 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/Makefile +@@ -0,0 +1,52 @@ ++# ++# 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:=cb3ed9ba849ff5926fa47fd1ae042fa0083edaf5 ++PKG_RELEASE:=1 ++ ++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) ++ ++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/feeds/packages/utils/triggerhappy/files/.svn/entries b/feeds/packages/utils/triggerhappy/files/.svn/entries +new file mode 100644 +index 0000000..148bbbc +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/triggerhappy/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-11-17T12:09:45.164865Z ++24018 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++triggerhappy-example.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++396cd83d6a8a719130b0fbc71d8fb76e ++2010-11-17T12:09:45.164865Z ++24018 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++452 ++ ++triggerhappy.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++278552c02cb25c053c6bb82f463d3367 ++2010-11-17T12:09:45.164865Z ++24018 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++297 ++ ++triggerhappy.init ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++86c90ac9a7e8b954347d1856664baf2f ++2010-11-17T12:09:45.164865Z ++24018 ++mirko ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++235 ++ +diff --git a/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy-example.conf.svn-base b/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy-example.conf.svn-base +new file mode 100644 +index 0000000..3a8017a +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy-example.conf.svn-base +@@ -0,0 +1,14 @@ ++# 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: ++# ++# ++# 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/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy.hotplug.svn-base b/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy.hotplug.svn-base +new file mode 100644 +index 0000000..78ad349 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy.hotplug.svn-base +@@ -0,0 +1,15 @@ ++#!/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/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy.init.svn-base b/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy.init.svn-base +new file mode 100644 +index 0000000..e846d29 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/.svn/text-base/triggerhappy.init.svn-base +@@ -0,0 +1,10 @@ ++#!/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/feeds/packages/utils/triggerhappy/files/triggerhappy-example.conf b/feeds/packages/utils/triggerhappy/files/triggerhappy-example.conf +new file mode 100644 +index 0000000..3a8017a +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/triggerhappy-example.conf +@@ -0,0 +1,14 @@ ++# 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: ++# ++# ++# 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/feeds/packages/utils/triggerhappy/files/triggerhappy.hotplug b/feeds/packages/utils/triggerhappy/files/triggerhappy.hotplug +new file mode 100644 +index 0000000..78ad349 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/triggerhappy.hotplug +@@ -0,0 +1,15 @@ ++#!/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/feeds/packages/utils/triggerhappy/files/triggerhappy.init b/feeds/packages/utils/triggerhappy/files/triggerhappy.init +new file mode 100644 +index 0000000..e846d29 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/files/triggerhappy.init +@@ -0,0 +1,10 @@ ++#!/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/feeds/packages/utils/triggerhappy/patches/.svn/entries b/feeds/packages/utils/triggerhappy/patches/.svn/entries +new file mode 100644 +index 0000000..1115067 +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/triggerhappy/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-06T17:26:48.832405Z ++25890 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-fix-LINUX_INPUT_H.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++431c68bae85209ccdf12588ec621b402 ++2011-03-06T17:26:48.832405Z ++25890 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++416 ++ +diff --git a/feeds/packages/utils/triggerhappy/patches/.svn/text-base/100-fix-LINUX_INPUT_H.patch.svn-base b/feeds/packages/utils/triggerhappy/patches/.svn/text-base/100-fix-LINUX_INPUT_H.patch.svn-base +new file mode 100644 +index 0000000..13ecd8c +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/patches/.svn/text-base/100-fix-LINUX_INPUT_H.patch.svn-base +@@ -0,0 +1,11 @@ ++--- 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 ' | $(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/feeds/packages/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch b/feeds/packages/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch +new file mode 100644 +index 0000000..13ecd8c +--- /dev/null ++++ b/feeds/packages/utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch +@@ -0,0 +1,11 @@ ++--- 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 ' | $(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/feeds/packages/utils/uboot-envtools-mmc/.svn/entries b/feeds/packages/utils/uboot-envtools-mmc/.svn/entries +new file mode 100644 +index 0000000..abfb2a6 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/uboot-envtools-mmc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++18f98dd8d642abb24229c575497d08f5 ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1174 ++ +diff --git a/feeds/packages/utils/uboot-envtools-mmc/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/uboot-envtools-mmc/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..5c09639 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# ++# 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:=uboot-envtools-mmc ++PKG_VERSION:=20081215 ++PKG_RELEASE:=1.1 ++ ++PKG_SOURCE:=uboot-envtools_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/u/uboot-envtools/ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TAR_CMD=$(HOST_TAR) --strip-components 1 -C "$(PKG_BUILD_DIR)" $(TAR_OPTIONS) ++ ++TARGET_CFLAGS += -DCONFIG_ENV_IS_IN_MMC ++ ++define Package/uboot-envtools-mmc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=read/modify U-Boot bootloader environment in MMC flash ++ DEPENDS:= +zlib ++ URL:=http://www.denx.de/wiki/U-Boot ++endef ++ ++define Package/uboot-envtools-mmc/description ++ This package includes tools to read and modify U-Boot bootloader environment. ++ This package is patched to to allow reading/writing to block devices. ++endef ++ ++define Package/uboot-envtools-mmc/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fw_printenv $(1)/usr/sbin/ ++ ln -sf fw_printenv $(1)/usr/sbin/fw_setenv ++endef ++ ++$(eval $(call BuildPackage,uboot-envtools-mmc)) +diff --git a/feeds/packages/utils/uboot-envtools-mmc/Makefile b/feeds/packages/utils/uboot-envtools-mmc/Makefile +new file mode 100644 +index 0000000..5c09639 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/Makefile +@@ -0,0 +1,42 @@ ++# ++# 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:=uboot-envtools-mmc ++PKG_VERSION:=20081215 ++PKG_RELEASE:=1.1 ++ ++PKG_SOURCE:=uboot-envtools_$(PKG_VERSION).orig.tar.gz ++PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/u/uboot-envtools/ ++ ++include $(INCLUDE_DIR)/package.mk ++ ++TAR_CMD=$(HOST_TAR) --strip-components 1 -C "$(PKG_BUILD_DIR)" $(TAR_OPTIONS) ++ ++TARGET_CFLAGS += -DCONFIG_ENV_IS_IN_MMC ++ ++define Package/uboot-envtools-mmc ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=read/modify U-Boot bootloader environment in MMC flash ++ DEPENDS:= +zlib ++ URL:=http://www.denx.de/wiki/U-Boot ++endef ++ ++define Package/uboot-envtools-mmc/description ++ This package includes tools to read and modify U-Boot bootloader environment. ++ This package is patched to to allow reading/writing to block devices. ++endef ++ ++define Package/uboot-envtools-mmc/install ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fw_printenv $(1)/usr/sbin/ ++ ln -sf fw_printenv $(1)/usr/sbin/fw_setenv ++endef ++ ++$(eval $(call BuildPackage,uboot-envtools-mmc)) +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/entries b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/entries +new file mode 100644 +index 0000000..cc7ec71 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/entries +@@ -0,0 +1,232 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/uboot-envtools-mmc/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++006-mmc-hack.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++eea3b2212359fc0b0b0b5c3652d7b2e6 ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1611 ++ ++005-no-restrictions.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++2cbc60076c17618e3703c45501a6285a ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++395 ++ ++001-crc32_func_signature.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f02349ace14d1609e5c79d41d106291c ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3631 ++ ++007-fsync.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c2df8a67f3de4523b9302a15714dd0f7 ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++898 ++ ++003-nor-eraselen.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9435a29ed1877d5715001e67a04b88f8 ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++382 ++ ++002-makefile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++275d4fc00dfeaf439f5d6365afb0b87a ++2013-01-21T15:27:41.106585Z ++35271 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++846 ++ +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/001-crc32_func_signature.patch.svn-base b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/001-crc32_func_signature.patch.svn-base +new file mode 100644 +index 0000000..9298cbd +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/001-crc32_func_signature.patch.svn-base +@@ -0,0 +1,125 @@ ++--- a/crc32.c +++++ b/crc32.c ++@@ -8,11 +8,7 @@ ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++-#ifndef USE_HOSTCC /* Shut down "ANSI does not permit..." warnings */ ++-#include ++-#else ++ #include ++-#endif ++ ++ #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) ++ #include ++@@ -136,7 +132,7 @@ local const uint32_t crc_table[256] = { ++ ++ #if 0 ++ /* ========================================================================= ++- * This function can be used by asm versions of crc32() +++ * This function can be used by asm versions of uboot_crc32() ++ */ ++ const uint32_t * ZEXPORT get_crc_table() ++ { ++@@ -154,7 +150,7 @@ const uint32_t * ZEXPORT get_crc_table() ++ #define DO8(buf) DO4(buf); DO4(buf); ++ ++ /* ========================================================================= */ ++-uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len) +++uint32_t ZEXPORT uboot_crc32 (uint32_t crc, const Bytef *buf, uInt len) ++ { ++ #ifdef DYNAMIC_CRC_TABLE ++ if (crc_table_empty) ++@@ -217,12 +213,12 @@ uint32_t ZEXPORT crc32_wd (uint32_t crc, ++ chunk = end - curr; ++ if (chunk > chunk_sz) ++ chunk = chunk_sz; ++- crc = crc32 (crc, curr, chunk); +++ crc = uboot_crc32 (crc, curr, chunk); ++ curr += chunk; ++ WATCHDOG_RESET (); ++ } ++ #else ++- crc = crc32 (crc, buf, len); +++ crc = uboot_crc32 (crc, buf, len); ++ #endif ++ ++ return crc; ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -216,9 +216,9 @@ static int parse_config (void); ++ #if defined(CONFIG_FILE) ++ static int get_config (char *); ++ #endif ++-static inline ulong getenvsize (void) +++static inline uint32_t getenvsize (void) ++ { ++- ulong rc = CONFIG_ENV_SIZE - sizeof (long); +++ uint32_t rc = CONFIG_ENV_SIZE - sizeof (uint32_t); ++ ++ if (HaveRedundEnv) ++ rc -= sizeof (char); ++@@ -437,7 +437,7 @@ int fw_setenv (int argc, char *argv[]) ++ /* ++ * Update CRC ++ */ ++- *environment.crc = crc32 (0, (uint8_t *) environment.data, ENV_SIZE); +++ *environment.crc = uboot_crc32 (0, (uint8_t *) environment.data, ENV_SIZE); ++ ++ /* write environment back to flash */ ++ if (flash_io (O_RDWR)) { ++@@ -627,7 +627,7 @@ static int flash_write_buf (int dev, int ++ data = malloc (erase_len); ++ if (!data) { ++ fprintf (stderr, ++- "Cannot malloc %u bytes: %s\n", +++ "Cannot malloc %zu bytes: %s\n", ++ erase_len, strerror (errno)); ++ return -1; ++ } ++@@ -883,11 +883,11 @@ static char *envmatch (char * s1, char * ++ static int env_init (void) ++ { ++ int crc0, crc0_ok; ++- char flag0; +++ unsigned char flag0; ++ void *addr0; ++ ++ int crc1, crc1_ok; ++- char flag1; +++ unsigned char flag1; ++ void *addr1; ++ ++ struct env_image_single *single; ++@@ -923,7 +923,7 @@ static int env_init (void) ++ if (flash_io (O_RDONLY)) ++ return -1; ++ ++- crc0 = crc32 (0, (uint8_t *) environment.data, ENV_SIZE); +++ crc0 = uboot_crc32 (0, (uint8_t *) environment.data, ENV_SIZE); ++ crc0_ok = (crc0 == *environment.crc); ++ if (!HaveRedundEnv) { ++ if (!crc0_ok) { ++@@ -964,7 +964,7 @@ static int env_init (void) ++ return -1; ++ } ++ ++- crc1 = crc32 (0, (uint8_t *) redundant->data, ENV_SIZE); +++ crc1 = uboot_crc32 (0, (uint8_t *) redundant->data, ENV_SIZE); ++ crc1_ok = (crc1 == redundant->crc); ++ flag1 = redundant->flags; ++ ++--- a/fw_env.h +++++ b/fw_env.h ++@@ -47,8 +47,10 @@ ++ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ ++ "bootm" ++ +++# include +++ ++ extern int fw_printenv(int argc, char *argv[]); ++ extern char *fw_getenv (char *name); ++ extern int fw_setenv (int argc, char *argv[]); ++ ++-extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned); +++extern uint32_t uboot_crc32 (uint32_t, const unsigned char *, unsigned); +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/002-makefile.patch.svn-base b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/002-makefile.patch.svn-base +new file mode 100644 +index 0000000..9dd8d82 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/002-makefile.patch.svn-base +@@ -0,0 +1,36 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -21,12 +21,10 @@ ++ # MA 02111-1307 USA ++ # ++ ++-include $(TOPDIR)/config.mk ++- ++ SRCS := $(obj)crc32.c fw_env.c fw_env_main.c ++ HEADERS := fw_env.h ++ ++-CPPFLAGS := -Wall -DUSE_HOSTCC -I$(SRCTREE)/include +++CPPFLAGS := -Wall $(CFLAGS) ++ ++ ifeq ($(MTD_VERSION),old) ++ CPPFLAGS += -DMTD_OLD ++@@ -35,18 +33,7 @@ endif ++ all: $(obj)fw_printenv ++ ++ $(obj)fw_printenv: $(SRCS) $(HEADERS) ++- $(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv +++ $(CC) $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv ++ ++ clean: ++ rm -f $(obj)fw_printenv $(obj)crc32.c ++- ++-$(obj)crc32.c: ++- ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c ++- ++-######################################################################### ++- ++-include $(TOPDIR)/rules.mk ++- ++-sinclude $(obj).depend ++- ++-######################################################################### +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/003-nor-eraselen.patch.svn-base b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/003-nor-eraselen.patch.svn-base +new file mode 100644 +index 0000000..2673986 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/003-nor-eraselen.patch.svn-base +@@ -0,0 +1,14 @@ ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -605,7 +605,10 @@ static int flash_write_buf (int dev, int ++ erase_offset = offset & ~(blocklen - 1); ++ ++ /* Maximum area we may use */ ++- erase_len = top_of_range - erase_offset; +++ if (mtd_type == MTD_NANDFLASH) +++ erase_len = top_of_range - erase_offset; +++ else +++ erase_len = blocklen; ++ ++ blockstart = erase_offset; ++ /* Offset inside a block */ +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/005-no-restrictions.patch.svn-base b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/005-no-restrictions.patch.svn-base +new file mode 100644 +index 0000000..b40d929 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/005-no-restrictions.patch.svn-base +@@ -0,0 +1,17 @@ ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -375,12 +375,14 @@ int fw_setenv (int argc, char *argv[]) ++ /* ++ * Ethernet Address and serial# can be set only once ++ */ +++#if 0 ++ if ((strcmp (name, "ethaddr") == 0) || ++ (strcmp (name, "serial#") == 0)) { ++ fprintf (stderr, "Can't overwrite \"%s\"\n", name); ++ errno = EROFS; ++ return -1; ++ } +++#endif ++ ++ if (*++nxt == '\0') { ++ *env = '\0'; +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/006-mmc-hack.patch.svn-base b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/006-mmc-hack.patch.svn-base +new file mode 100644 +index 0000000..8c3f8bc +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/006-mmc-hack.patch.svn-base +@@ -0,0 +1,61 @@ ++From e0c083da93fcf570f46bc74daaf72e7e7a1526a8 Mon Sep 17 00:00:00 2001 ++From: Michael Heimpold ++Date: Wed, 28 Sep 2011 23:29:12 +0200 ++Subject: [PATCH] Hack to allow reading and storing env on MMC ++ ++--- ++ fw_env.c | 12 ++++++++++-- ++ 1 files changed, 10 insertions(+), 2 deletions(-) ++ ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -681,6 +681,7 @@ static int flash_write_buf (int dev, int ++ } ++ ++ erase.start = blockstart; +++#ifndef CONFIG_ENV_IS_IN_MMC ++ ioctl (fd, MEMUNLOCK, &erase); ++ ++ if (ioctl (fd, MEMERASE, &erase) != 0) { ++@@ -689,6 +690,7 @@ static int flash_write_buf (int dev, int ++ strerror (errno)); ++ return -1; ++ } +++#endif ++ ++ if (lseek (fd, blockstart, SEEK_SET) == -1) { ++ fprintf (stderr, ++@@ -706,8 +708,9 @@ static int flash_write_buf (int dev, int ++ return -1; ++ } ++ +++#ifndef CONFIG_ENV_IS_IN_MMC ++ ioctl (fd, MEMLOCK, &erase); ++- +++#endif ++ processed += blocklen; ++ block_seek = 0; ++ blockstart += blocklen; ++@@ -785,9 +788,10 @@ static int flash_write (int fd_current, ++ ++ static int flash_read (int fd) ++ { ++- struct mtd_info_user mtdinfo; ++ int rc; ++ +++#ifndef CONFIG_ENV_IS_IN_MMC +++ struct mtd_info_user mtdinfo; ++ rc = ioctl (fd, MEMGETINFO, &mtdinfo); ++ if (rc < 0) { ++ perror ("Cannot get MTD information"); ++@@ -803,6 +807,10 @@ static int flash_read (int fd) ++ ++ rc = flash_read_buf (dev_current, fd, environment.image, CONFIG_ENV_SIZE, ++ DEVOFFSET (dev_current), mtdinfo.type); +++#else +++ rc = flash_read_buf (dev_current, fd, environment.image, CONFIG_ENV_SIZE, +++ DEVOFFSET (dev_current), 0); +++#endif ++ ++ return (rc != CONFIG_ENV_SIZE) ? -1 : 0; ++ } +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/007-fsync.patch.svn-base b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/007-fsync.patch.svn-base +new file mode 100644 +index 0000000..4307378 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/.svn/text-base/007-fsync.patch.svn-base +@@ -0,0 +1,36 @@ ++From 9ef3d800d08dd673ccb5b7a12a69e94394cf2167 Mon Sep 17 00:00:00 2001 ++From: Michael Heimpold ++Date: Sat, 11 Aug 2012 21:33:46 +0200 ++Subject: [PATCH] Ensure that data is written to disk ++ ++--- ++ fw_env.c | 12 ++++++++++++ ++ 1 files changed, 12 insertions(+), 0 deletions(-) ++ ++diff --git a/fw_env.c b/fw_env.c ++index bed8fae..ee15f33 100644 ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -849,7 +849,19 @@ static int flash_io (int mode) ++ ++ rc = flash_write (fd_current, fd_target, dev_target); ++ +++ if (fsync (fd_current)) { +++ fprintf (stderr, +++ "fsync failed on %s: %s\n", +++ DEVNAME (dev_current), strerror (errno)); +++ } +++ ++ if (HaveRedundEnv) { +++ if (fsync (fd_target)) { +++ fprintf (stderr, +++ "fsync failed on %s: %s\n", +++ DEVNAME (dev_current), strerror (errno)); +++ } +++ ++ if (close (fd_target)) { ++ fprintf (stderr, ++ "I/O error on %s: %s\n", ++-- ++1.7.2.5 ++ +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/001-crc32_func_signature.patch b/feeds/packages/utils/uboot-envtools-mmc/patches/001-crc32_func_signature.patch +new file mode 100644 +index 0000000..9298cbd +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/001-crc32_func_signature.patch +@@ -0,0 +1,125 @@ ++--- a/crc32.c +++++ b/crc32.c ++@@ -8,11 +8,7 @@ ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++-#ifndef USE_HOSTCC /* Shut down "ANSI does not permit..." warnings */ ++-#include ++-#else ++ #include ++-#endif ++ ++ #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) ++ #include ++@@ -136,7 +132,7 @@ local const uint32_t crc_table[256] = { ++ ++ #if 0 ++ /* ========================================================================= ++- * This function can be used by asm versions of crc32() +++ * This function can be used by asm versions of uboot_crc32() ++ */ ++ const uint32_t * ZEXPORT get_crc_table() ++ { ++@@ -154,7 +150,7 @@ const uint32_t * ZEXPORT get_crc_table() ++ #define DO8(buf) DO4(buf); DO4(buf); ++ ++ /* ========================================================================= */ ++-uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len) +++uint32_t ZEXPORT uboot_crc32 (uint32_t crc, const Bytef *buf, uInt len) ++ { ++ #ifdef DYNAMIC_CRC_TABLE ++ if (crc_table_empty) ++@@ -217,12 +213,12 @@ uint32_t ZEXPORT crc32_wd (uint32_t crc, ++ chunk = end - curr; ++ if (chunk > chunk_sz) ++ chunk = chunk_sz; ++- crc = crc32 (crc, curr, chunk); +++ crc = uboot_crc32 (crc, curr, chunk); ++ curr += chunk; ++ WATCHDOG_RESET (); ++ } ++ #else ++- crc = crc32 (crc, buf, len); +++ crc = uboot_crc32 (crc, buf, len); ++ #endif ++ ++ return crc; ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -216,9 +216,9 @@ static int parse_config (void); ++ #if defined(CONFIG_FILE) ++ static int get_config (char *); ++ #endif ++-static inline ulong getenvsize (void) +++static inline uint32_t getenvsize (void) ++ { ++- ulong rc = CONFIG_ENV_SIZE - sizeof (long); +++ uint32_t rc = CONFIG_ENV_SIZE - sizeof (uint32_t); ++ ++ if (HaveRedundEnv) ++ rc -= sizeof (char); ++@@ -437,7 +437,7 @@ int fw_setenv (int argc, char *argv[]) ++ /* ++ * Update CRC ++ */ ++- *environment.crc = crc32 (0, (uint8_t *) environment.data, ENV_SIZE); +++ *environment.crc = uboot_crc32 (0, (uint8_t *) environment.data, ENV_SIZE); ++ ++ /* write environment back to flash */ ++ if (flash_io (O_RDWR)) { ++@@ -627,7 +627,7 @@ static int flash_write_buf (int dev, int ++ data = malloc (erase_len); ++ if (!data) { ++ fprintf (stderr, ++- "Cannot malloc %u bytes: %s\n", +++ "Cannot malloc %zu bytes: %s\n", ++ erase_len, strerror (errno)); ++ return -1; ++ } ++@@ -883,11 +883,11 @@ static char *envmatch (char * s1, char * ++ static int env_init (void) ++ { ++ int crc0, crc0_ok; ++- char flag0; +++ unsigned char flag0; ++ void *addr0; ++ ++ int crc1, crc1_ok; ++- char flag1; +++ unsigned char flag1; ++ void *addr1; ++ ++ struct env_image_single *single; ++@@ -923,7 +923,7 @@ static int env_init (void) ++ if (flash_io (O_RDONLY)) ++ return -1; ++ ++- crc0 = crc32 (0, (uint8_t *) environment.data, ENV_SIZE); +++ crc0 = uboot_crc32 (0, (uint8_t *) environment.data, ENV_SIZE); ++ crc0_ok = (crc0 == *environment.crc); ++ if (!HaveRedundEnv) { ++ if (!crc0_ok) { ++@@ -964,7 +964,7 @@ static int env_init (void) ++ return -1; ++ } ++ ++- crc1 = crc32 (0, (uint8_t *) redundant->data, ENV_SIZE); +++ crc1 = uboot_crc32 (0, (uint8_t *) redundant->data, ENV_SIZE); ++ crc1_ok = (crc1 == redundant->crc); ++ flag1 = redundant->flags; ++ ++--- a/fw_env.h +++++ b/fw_env.h ++@@ -47,8 +47,10 @@ ++ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ ++ "bootm" ++ +++# include +++ ++ extern int fw_printenv(int argc, char *argv[]); ++ extern char *fw_getenv (char *name); ++ extern int fw_setenv (int argc, char *argv[]); ++ ++-extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned); +++extern uint32_t uboot_crc32 (uint32_t, const unsigned char *, unsigned); +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/002-makefile.patch b/feeds/packages/utils/uboot-envtools-mmc/patches/002-makefile.patch +new file mode 100644 +index 0000000..9dd8d82 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/002-makefile.patch +@@ -0,0 +1,36 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -21,12 +21,10 @@ ++ # MA 02111-1307 USA ++ # ++ ++-include $(TOPDIR)/config.mk ++- ++ SRCS := $(obj)crc32.c fw_env.c fw_env_main.c ++ HEADERS := fw_env.h ++ ++-CPPFLAGS := -Wall -DUSE_HOSTCC -I$(SRCTREE)/include +++CPPFLAGS := -Wall $(CFLAGS) ++ ++ ifeq ($(MTD_VERSION),old) ++ CPPFLAGS += -DMTD_OLD ++@@ -35,18 +33,7 @@ endif ++ all: $(obj)fw_printenv ++ ++ $(obj)fw_printenv: $(SRCS) $(HEADERS) ++- $(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv +++ $(CC) $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv ++ ++ clean: ++ rm -f $(obj)fw_printenv $(obj)crc32.c ++- ++-$(obj)crc32.c: ++- ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c ++- ++-######################################################################### ++- ++-include $(TOPDIR)/rules.mk ++- ++-sinclude $(obj).depend ++- ++-######################################################################### +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/003-nor-eraselen.patch b/feeds/packages/utils/uboot-envtools-mmc/patches/003-nor-eraselen.patch +new file mode 100644 +index 0000000..2673986 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/003-nor-eraselen.patch +@@ -0,0 +1,14 @@ ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -605,7 +605,10 @@ static int flash_write_buf (int dev, int ++ erase_offset = offset & ~(blocklen - 1); ++ ++ /* Maximum area we may use */ ++- erase_len = top_of_range - erase_offset; +++ if (mtd_type == MTD_NANDFLASH) +++ erase_len = top_of_range - erase_offset; +++ else +++ erase_len = blocklen; ++ ++ blockstart = erase_offset; ++ /* Offset inside a block */ +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/005-no-restrictions.patch b/feeds/packages/utils/uboot-envtools-mmc/patches/005-no-restrictions.patch +new file mode 100644 +index 0000000..b40d929 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/005-no-restrictions.patch +@@ -0,0 +1,17 @@ ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -375,12 +375,14 @@ int fw_setenv (int argc, char *argv[]) ++ /* ++ * Ethernet Address and serial# can be set only once ++ */ +++#if 0 ++ if ((strcmp (name, "ethaddr") == 0) || ++ (strcmp (name, "serial#") == 0)) { ++ fprintf (stderr, "Can't overwrite \"%s\"\n", name); ++ errno = EROFS; ++ return -1; ++ } +++#endif ++ ++ if (*++nxt == '\0') { ++ *env = '\0'; +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/006-mmc-hack.patch b/feeds/packages/utils/uboot-envtools-mmc/patches/006-mmc-hack.patch +new file mode 100644 +index 0000000..8c3f8bc +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/006-mmc-hack.patch +@@ -0,0 +1,61 @@ ++From e0c083da93fcf570f46bc74daaf72e7e7a1526a8 Mon Sep 17 00:00:00 2001 ++From: Michael Heimpold ++Date: Wed, 28 Sep 2011 23:29:12 +0200 ++Subject: [PATCH] Hack to allow reading and storing env on MMC ++ ++--- ++ fw_env.c | 12 ++++++++++-- ++ 1 files changed, 10 insertions(+), 2 deletions(-) ++ ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -681,6 +681,7 @@ static int flash_write_buf (int dev, int ++ } ++ ++ erase.start = blockstart; +++#ifndef CONFIG_ENV_IS_IN_MMC ++ ioctl (fd, MEMUNLOCK, &erase); ++ ++ if (ioctl (fd, MEMERASE, &erase) != 0) { ++@@ -689,6 +690,7 @@ static int flash_write_buf (int dev, int ++ strerror (errno)); ++ return -1; ++ } +++#endif ++ ++ if (lseek (fd, blockstart, SEEK_SET) == -1) { ++ fprintf (stderr, ++@@ -706,8 +708,9 @@ static int flash_write_buf (int dev, int ++ return -1; ++ } ++ +++#ifndef CONFIG_ENV_IS_IN_MMC ++ ioctl (fd, MEMLOCK, &erase); ++- +++#endif ++ processed += blocklen; ++ block_seek = 0; ++ blockstart += blocklen; ++@@ -785,9 +788,10 @@ static int flash_write (int fd_current, ++ ++ static int flash_read (int fd) ++ { ++- struct mtd_info_user mtdinfo; ++ int rc; ++ +++#ifndef CONFIG_ENV_IS_IN_MMC +++ struct mtd_info_user mtdinfo; ++ rc = ioctl (fd, MEMGETINFO, &mtdinfo); ++ if (rc < 0) { ++ perror ("Cannot get MTD information"); ++@@ -803,6 +807,10 @@ static int flash_read (int fd) ++ ++ rc = flash_read_buf (dev_current, fd, environment.image, CONFIG_ENV_SIZE, ++ DEVOFFSET (dev_current), mtdinfo.type); +++#else +++ rc = flash_read_buf (dev_current, fd, environment.image, CONFIG_ENV_SIZE, +++ DEVOFFSET (dev_current), 0); +++#endif ++ ++ return (rc != CONFIG_ENV_SIZE) ? -1 : 0; ++ } +diff --git a/feeds/packages/utils/uboot-envtools-mmc/patches/007-fsync.patch b/feeds/packages/utils/uboot-envtools-mmc/patches/007-fsync.patch +new file mode 100644 +index 0000000..4307378 +--- /dev/null ++++ b/feeds/packages/utils/uboot-envtools-mmc/patches/007-fsync.patch +@@ -0,0 +1,36 @@ ++From 9ef3d800d08dd673ccb5b7a12a69e94394cf2167 Mon Sep 17 00:00:00 2001 ++From: Michael Heimpold ++Date: Sat, 11 Aug 2012 21:33:46 +0200 ++Subject: [PATCH] Ensure that data is written to disk ++ ++--- ++ fw_env.c | 12 ++++++++++++ ++ 1 files changed, 12 insertions(+), 0 deletions(-) ++ ++diff --git a/fw_env.c b/fw_env.c ++index bed8fae..ee15f33 100644 ++--- a/fw_env.c +++++ b/fw_env.c ++@@ -849,7 +849,19 @@ static int flash_io (int mode) ++ ++ rc = flash_write (fd_current, fd_target, dev_target); ++ +++ if (fsync (fd_current)) { +++ fprintf (stderr, +++ "fsync failed on %s: %s\n", +++ DEVNAME (dev_current), strerror (errno)); +++ } +++ ++ if (HaveRedundEnv) { +++ if (fsync (fd_target)) { +++ fprintf (stderr, +++ "fsync failed on %s: %s\n", +++ DEVNAME (dev_current), strerror (errno)); +++ } +++ ++ if (close (fd_target)) { ++ fprintf (stderr, ++ "I/O error on %s: %s\n", ++-- ++1.7.2.5 ++ +diff --git a/feeds/packages/utils/unrar/.svn/entries b/feeds/packages/utils/unrar/.svn/entries +new file mode 100644 +index 0000000..37bcac0 +--- /dev/null ++++ b/feeds/packages/utils/unrar/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/unrar ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-03T21:35:49.898796Z ++32972 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c7bc16be8d7b7a54753a2b0f4e4719f3 ++2012-08-03T21:35:49.898796Z ++32972 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1125 ++ +diff --git a/feeds/packages/utils/unrar/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/unrar/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..373b1fe +--- /dev/null ++++ b/feeds/packages/utils/unrar/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,48 @@ ++# ++# 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:=unrar ++PKG_VERSION:=4.0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.rarlab.com/rar ++PKG_MD5SUM:=41b0a9bca945b4ae2608421afd8f606e ++ ++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) ++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 ++ $(call Build/Configure/Default, ) ++ ln -s $(PKG_BUILD_DIR)/makefile.unix $(PKG_BUILD_DIR)/Makefile ++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/feeds/packages/utils/unrar/Makefile b/feeds/packages/utils/unrar/Makefile +new file mode 100644 +index 0000000..373b1fe +--- /dev/null ++++ b/feeds/packages/utils/unrar/Makefile +@@ -0,0 +1,48 @@ ++# ++# 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:=unrar ++PKG_VERSION:=4.0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://www.rarlab.com/rar ++PKG_MD5SUM:=41b0a9bca945b4ae2608421afd8f606e ++ ++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) ++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 ++ $(call Build/Configure/Default, ) ++ ln -s $(PKG_BUILD_DIR)/makefile.unix $(PKG_BUILD_DIR)/Makefile ++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/feeds/packages/utils/unzip/.svn/entries b/feeds/packages/utils/unzip/.svn/entries +new file mode 100644 +index 0000000..1fb9008 +--- /dev/null ++++ b/feeds/packages/utils/unzip/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/unzip ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-20T15:21:37.400235Z ++16522 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++b767145b989b373d3b24445c88b648cb ++2009-06-20T15:21:37.400235Z ++16522 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1391 ++ +diff --git a/feeds/packages/utils/unzip/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/unzip/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f012816 +--- /dev/null ++++ b/feeds/packages/utils/unzip/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2006-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:=unzip ++PKG_VERSION:=5.52 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)552.zip ++PKG_SOURCE_URL:=@SF/infozip ++PKG_MD5SUM:=3d55b4e7375c3d0b81feca52dc0e4d48 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) ++ ++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 ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile generic \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \ ++ 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/feeds/packages/utils/unzip/Makefile b/feeds/packages/utils/unzip/Makefile +new file mode 100644 +index 0000000..f012816 +--- /dev/null ++++ b/feeds/packages/utils/unzip/Makefile +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2006-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:=unzip ++PKG_VERSION:=5.52 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)552.zip ++PKG_SOURCE_URL:=@SF/infozip ++PKG_MD5SUM:=3d55b4e7375c3d0b81feca52dc0e4d48 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) ++ ++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 ++ ++define Build/Compile ++ $(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile generic \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \ ++ 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/feeds/packages/utils/upx/.svn/entries b/feeds/packages/utils/upx/.svn/entries +new file mode 100644 +index 0000000..07a2783 +--- /dev/null ++++ b/feeds/packages/utils/upx/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/upx ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-01-13T22:12:45.712989Z ++29739 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++6102883adb5fbcc5716f632bd66b5acf ++2012-01-13T22:12:45.712989Z ++29739 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1327 ++ +diff --git a/feeds/packages/utils/upx/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/upx/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..1d9faac +--- /dev/null ++++ b/feeds/packages/utils/upx/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=upx ++PKG_VERSION:=3.08 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 ++PKG_SOURCE_URL:=http://upx.sourceforge.net/download \ ++ http://upx.sourceforge.net/download/00-OLD-VERSIONS ++PKG_MD5SUM:=54c76fa52cad578ff23ef98aee91e3f5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/upx ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libucl +libstdcpp +zlib ++ TITLE:=The Ultimate Packer for eXecutables ++ URL:=http://upx.sourceforge.net/ ++endef ++ ++define Package/upx/description ++UPX is a free, portable, extendable, high-performance executable packer for ++several different executable formats. It achieves an excellent compression ratio ++and offers very fast decompression. Your executables suffer no memory overhead ++or other drawbacks for most of the formats supported, because of in-place ++decompression. ++endef ++ ++MAKE_PATH := src ++MAKE_VARS += \ ++ exeext="" ++ ++TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) ++ ++TARGET_CPPFLAGS += \ ++ -DUCL_NO_ASM \ ++ ++define Package/upx/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/upx $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,upx)) +diff --git a/feeds/packages/utils/upx/Makefile b/feeds/packages/utils/upx/Makefile +new file mode 100644 +index 0000000..1d9faac +--- /dev/null ++++ b/feeds/packages/utils/upx/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=upx ++PKG_VERSION:=3.08 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 ++PKG_SOURCE_URL:=http://upx.sourceforge.net/download \ ++ http://upx.sourceforge.net/download/00-OLD-VERSIONS ++PKG_MD5SUM:=54c76fa52cad578ff23ef98aee91e3f5 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/upx ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libucl +libstdcpp +zlib ++ TITLE:=The Ultimate Packer for eXecutables ++ URL:=http://upx.sourceforge.net/ ++endef ++ ++define Package/upx/description ++UPX is a free, portable, extendable, high-performance executable packer for ++several different executable formats. It achieves an excellent compression ratio ++and offers very fast decompression. Your executables suffer no memory overhead ++or other drawbacks for most of the formats supported, because of in-place ++decompression. ++endef ++ ++MAKE_PATH := src ++MAKE_VARS += \ ++ exeext="" ++ ++TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) ++ ++TARGET_CPPFLAGS += \ ++ -DUCL_NO_ASM \ ++ ++define Package/upx/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/upx $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,upx)) +diff --git a/feeds/packages/utils/upx/patches/.svn/entries b/feeds/packages/utils/upx/patches/.svn/entries +new file mode 100644 +index 0000000..beb7107 +--- /dev/null ++++ b/feeds/packages/utils/upx/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/upx/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-05-23T21:11:51.204427Z ++21553 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++100-disable_doc.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++9c7dcebbb9dbe4616ef0e6d40509560f ++2010-05-23T21:11:51.204427Z ++21553 ++swalker ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++234 ++ +diff --git a/feeds/packages/utils/upx/patches/.svn/text-base/100-disable_doc.patch.svn-base b/feeds/packages/utils/upx/patches/.svn/text-base/100-disable_doc.patch.svn-base +new file mode 100644 +index 0000000..d960c00 +--- /dev/null ++++ b/feeds/packages/utils/upx/patches/.svn/text-base/100-disable_doc.patch.svn-base +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -35,7 +35,7 @@ ifeq ($(BUILD_STUB),1) ++ $(MAKE) -C src/stub $@ ++ endif ++ $(MAKE) -C src $@ ++- $(MAKE) -C doc $@ +++# $(MAKE) -C doc $@ ++ ++ ++ .PHONY: default all mostlyclean clean distclean maintainer-clean +diff --git a/feeds/packages/utils/upx/patches/100-disable_doc.patch b/feeds/packages/utils/upx/patches/100-disable_doc.patch +new file mode 100644 +index 0000000..d960c00 +--- /dev/null ++++ b/feeds/packages/utils/upx/patches/100-disable_doc.patch +@@ -0,0 +1,11 @@ ++--- a/Makefile +++++ b/Makefile ++@@ -35,7 +35,7 @@ ifeq ($(BUILD_STUB),1) ++ $(MAKE) -C src/stub $@ ++ endif ++ $(MAKE) -C src $@ ++- $(MAKE) -C doc $@ +++# $(MAKE) -C doc $@ ++ ++ ++ .PHONY: default all mostlyclean clean distclean maintainer-clean +diff --git a/feeds/packages/utils/usbmuxd/.svn/entries b/feeds/packages/utils/usbmuxd/.svn/entries +new file mode 100644 +index 0000000..441816d +--- /dev/null ++++ b/feeds/packages/utils/usbmuxd/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/usbmuxd ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:26.791961Z ++33084 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++8a38ca4ec206aebe313f1833726b851c ++2012-08-10T15:49:26.791961Z ++33084 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2537 ++ +diff --git a/feeds/packages/utils/usbmuxd/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/usbmuxd/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..7b3f03b +--- /dev/null ++++ b/feeds/packages/utils/usbmuxd/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,86 @@ ++# ++# Copyright (C) 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:=usbmuxd ++PKG_VERSION:=1.0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://marcansoft.com/uploads/usbmuxd ++PKG_MD5SUM:=6f431541f3177fa06aa6df9ceecb2da0 ++ ++CMAKE_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++define Package/usbmuxd/Default ++ TITLE:=USB multiplexing daemon ++ URL:=http://marcansoft.com/blog/iphonelinux/usbmuxd/ ++endef ++ ++define Package/usbmuxd/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/usbmuxd ++ $(call Package/usbmuxd/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+librt +libusb-1.0 +libusbmuxd ++endef ++ ++define Package/usbmuxd/description ++ $(call Package/usbmuxd/Default/description) ++endef ++ ++define Package/libusbmuxd ++ $(call Package/usbmuxd/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= library ++ DEPENDS:=+libplist +libpthread +libxml2 +zlib ++endef ++ ++define Package/libusbmuxd/description ++ $(call Package/usbmuxd/Default/description) ++ This package contains the usbmuxd 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$(LIB_SUFFIX)/libusbmuxd.so* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/ ++ $(SED) 's,lib$(LIB_SUFFIX),lib,g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc ++ $(SED) 's,\-dirty,$(PKG_VERSION),g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc ++endef ++ ++define Package/usbmuxd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/iproxy $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmuxd $(1)/usr/sbin/ ++endef ++ ++define Package/libusbmuxd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libusbmuxd.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,usbmuxd)) ++$(eval $(call BuildPackage,libusbmuxd)) +diff --git a/feeds/packages/utils/usbmuxd/Makefile b/feeds/packages/utils/usbmuxd/Makefile +new file mode 100644 +index 0000000..7b3f03b +--- /dev/null ++++ b/feeds/packages/utils/usbmuxd/Makefile +@@ -0,0 +1,86 @@ ++# ++# Copyright (C) 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:=usbmuxd ++PKG_VERSION:=1.0.7 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=http://marcansoft.com/uploads/usbmuxd ++PKG_MD5SUM:=6f431541f3177fa06aa6df9ceecb2da0 ++ ++CMAKE_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/cmake.mk ++ ++define Package/usbmuxd/Default ++ TITLE:=USB multiplexing daemon ++ URL:=http://marcansoft.com/blog/iphonelinux/usbmuxd/ ++endef ++ ++define Package/usbmuxd/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/usbmuxd ++ $(call Package/usbmuxd/Default) ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+librt +libusb-1.0 +libusbmuxd ++endef ++ ++define Package/usbmuxd/description ++ $(call Package/usbmuxd/Default/description) ++endef ++ ++define Package/libusbmuxd ++ $(call Package/usbmuxd/Default) ++ SECTION:=libs ++ CATEGORY:=Libraries ++ TITLE+= library ++ DEPENDS:=+libplist +libpthread +libxml2 +zlib ++endef ++ ++define Package/libusbmuxd/description ++ $(call Package/usbmuxd/Default/description) ++ This package contains the usbmuxd 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$(LIB_SUFFIX)/libusbmuxd.so* $(1)/usr/lib/ ++ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/ ++ $(SED) 's,lib$(LIB_SUFFIX),lib,g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc ++ $(SED) 's,\-dirty,$(PKG_VERSION),g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc ++endef ++ ++define Package/usbmuxd/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/iproxy $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmuxd $(1)/usr/sbin/ ++endef ++ ++define Package/libusbmuxd/install ++ $(INSTALL_DIR) $(1)/usr/lib ++ $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libusbmuxd.so* $(1)/usr/lib/ ++endef ++ ++$(eval $(call BuildPackage,usbmuxd)) ++$(eval $(call BuildPackage,libusbmuxd)) +diff --git a/feeds/packages/utils/vim/.svn/entries b/feeds/packages/utils/vim/.svn/entries +new file mode 100644 +index 0000000..4b8abda +--- /dev/null ++++ b/feeds/packages/utils/vim/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/vim ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++bef97ae3fcc4df41fa976024a5e92e4d ++2012-09-23T09:58:24.597730Z ++33524 ++nbd ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4520 ++ +diff --git a/feeds/packages/utils/vim/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/vim/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/vim/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/vim/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/vim/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..0f7a687 +--- /dev/null ++++ b/feeds/packages/utils/vim/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,192 @@ ++# ++# 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:=vim ++PKG_VERSION:=7.3 ++PKG_RELEASE:=1 ++VIMVER:=73 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/ ++PKG_MD5SUM:=5b9510a17074e2b37d8bb38ae09edbf2 ++ ++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 ++endef ++ ++define Package/vim/conffiles ++/usr/share/vim/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 \ ++ --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) -C $(PKG_BUILD_DIR) clean ++ +$(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) -C $(PKG_BUILD_DIR) clean ++ +$(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/feeds/packages/utils/vim/Makefile b/feeds/packages/utils/vim/Makefile +new file mode 100644 +index 0000000..0f7a687 +--- /dev/null ++++ b/feeds/packages/utils/vim/Makefile +@@ -0,0 +1,192 @@ ++# ++# 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:=vim ++PKG_VERSION:=7.3 ++PKG_RELEASE:=1 ++VIMVER:=73 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/ ++PKG_MD5SUM:=5b9510a17074e2b37d8bb38ae09edbf2 ++ ++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 ++endef ++ ++define Package/vim/conffiles ++/usr/share/vim/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 \ ++ --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) -C $(PKG_BUILD_DIR) clean ++ +$(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) -C $(PKG_BUILD_DIR) clean ++ +$(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/feeds/packages/utils/vim/files/.svn/entries b/feeds/packages/utils/vim/files/.svn/entries +new file mode 100644 +index 0000000..db506c0 +--- /dev/null ++++ b/feeds/packages/utils/vim/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/vim/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-03T10:16:16.549334Z ++32031 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++vimrc ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++d181b8fc1f95d9f204b4500d876febf8 ++2012-06-03T10:16:16.549334Z ++32031 ++luka ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++567 ++ ++vimrc.full ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++79ec715a82bf8e39ec390bd2096ea81e ++2012-06-03T10:16:16.549334Z ++32031 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++833 ++ +diff --git a/feeds/packages/utils/vim/files/.svn/prop-base/vimrc.svn-base b/feeds/packages/utils/vim/files/.svn/prop-base/vimrc.svn-base +new file mode 100644 +index 0000000..bdbd305 +--- /dev/null ++++ b/feeds/packages/utils/vim/files/.svn/prop-base/vimrc.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/vim/files/.svn/text-base/vimrc.full.svn-base b/feeds/packages/utils/vim/files/.svn/text-base/vimrc.full.svn-base +new file mode 100644 +index 0000000..114cf07 +--- /dev/null ++++ b/feeds/packages/utils/vim/files/.svn/text-base/vimrc.full.svn-base +@@ -0,0 +1,24 @@ ++set showcmd " show (partial) command in status line ++set showmatch " show matching brackets ++set ignorecase " do case insensitive matching ++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=[3%p1%dm ++ set t_Sb=[4%p1%dm ++ else ++ set t_Sf=[3%dm ++ set t_Sb=[4%dm ++ endif ++endif +diff --git a/feeds/packages/utils/vim/files/.svn/text-base/vimrc.svn-base b/feeds/packages/utils/vim/files/.svn/text-base/vimrc.svn-base +new file mode 100644 +index 0000000..00b952d +--- /dev/null ++++ b/feeds/packages/utils/vim/files/.svn/text-base/vimrc.svn-base +@@ -0,0 +1,12 @@ ++set showcmd " show (partial) command in status line ++set showmatch " show matching brackets ++set ignorecase " do case insensitive matching ++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/feeds/packages/utils/vim/files/vimrc b/feeds/packages/utils/vim/files/vimrc +new file mode 100644 +index 0000000..00b952d +--- /dev/null ++++ b/feeds/packages/utils/vim/files/vimrc +@@ -0,0 +1,12 @@ ++set showcmd " show (partial) command in status line ++set showmatch " show matching brackets ++set ignorecase " do case insensitive matching ++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/feeds/packages/utils/vim/files/vimrc.full b/feeds/packages/utils/vim/files/vimrc.full +new file mode 100644 +index 0000000..114cf07 +--- /dev/null ++++ b/feeds/packages/utils/vim/files/vimrc.full +@@ -0,0 +1,24 @@ ++set showcmd " show (partial) command in status line ++set showmatch " show matching brackets ++set ignorecase " do case insensitive matching ++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=[3%p1%dm ++ set t_Sb=[4%p1%dm ++ else ++ set t_Sf=[3%dm ++ set t_Sb=[4%dm ++ endif ++endif +diff --git a/feeds/packages/utils/vim/patches/.svn/entries b/feeds/packages/utils/vim/patches/.svn/entries +new file mode 100644 +index 0000000..aa92322 +--- /dev/null ++++ b/feeds/packages/utils/vim/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/vim/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-03T10:16:16.549334Z ++32031 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-cross_compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++94e2ba34830534961208030ea29f6529 ++2012-06-03T10:16:16.549334Z ++32031 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1103 ++ +diff --git a/feeds/packages/utils/vim/patches/.svn/text-base/001-cross_compile.patch.svn-base b/feeds/packages/utils/vim/patches/.svn/text-base/001-cross_compile.patch.svn-base +new file mode 100644 +index 0000000..553dde7 +--- /dev/null ++++ b/feeds/packages/utils/vim/patches/.svn/text-base/001-cross_compile.patch.svn-base +@@ -0,0 +1,38 @@ ++--- a/src/auto/configure +++++ b/src/auto/configure ++@@ -11641,34 +11641,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_fn_error "could not compile program using uint32_t." "$LINENO" 5 ++-else ++- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++-/* end confdefs.h. */ ++- ++-#ifdef HAVE_STDINT_H ++-# include ++-#endif ++-#ifdef HAVE_INTTYPES_H ++-# include ++-#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 ++ ++ ++ +diff --git a/feeds/packages/utils/vim/patches/001-cross_compile.patch b/feeds/packages/utils/vim/patches/001-cross_compile.patch +new file mode 100644 +index 0000000..553dde7 +--- /dev/null ++++ b/feeds/packages/utils/vim/patches/001-cross_compile.patch +@@ -0,0 +1,38 @@ ++--- a/src/auto/configure +++++ b/src/auto/configure ++@@ -11641,34 +11641,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_fn_error "could not compile program using uint32_t." "$LINENO" 5 ++-else ++- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++-/* end confdefs.h. */ ++- ++-#ifdef HAVE_STDINT_H ++-# include ++-#endif ++-#ifdef HAVE_INTTYPES_H ++-# include ++-#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 ++ ++ ++ +diff --git a/feeds/packages/utils/watchcat/.svn/entries b/feeds/packages/utils/watchcat/.svn/entries +new file mode 100644 +index 0000000..6b5fdff +--- /dev/null ++++ b/feeds/packages/utils/watchcat/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/watchcat ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-08T16:44:50.098259Z ++31652 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++4a5ba9fef0aeb4695dac46eab9261969 ++2011-01-05T15:33:39.469623Z ++24909 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1083 ++ +diff --git a/feeds/packages/utils/watchcat/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/watchcat/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..f03c6e7 +--- /dev/null ++++ b/feeds/packages/utils/watchcat/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# 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 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/watchcat ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Enable the configuration of programed reboots ++ MAINTAINER:=Nuno Goncalves ++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/feeds/packages/utils/watchcat/Makefile b/feeds/packages/utils/watchcat/Makefile +new file mode 100644 +index 0000000..f03c6e7 +--- /dev/null ++++ b/feeds/packages/utils/watchcat/Makefile +@@ -0,0 +1,43 @@ ++# ++# 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 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/watchcat ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Enable the configuration of programed reboots ++ MAINTAINER:=Nuno Goncalves ++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/feeds/packages/utils/watchcat/files/.svn/entries b/feeds/packages/utils/watchcat/files/.svn/entries +new file mode 100644 +index 0000000..84c5a75 +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/.svn/entries +@@ -0,0 +1,130 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/watchcat/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-05-08T16:44:50.098259Z ++31652 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++initd_watchcat ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++270db5e817c8faca15347b225d98b500 ++2011-01-05T15:33:39.469623Z ++24909 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3232 ++ ++uci_defaults_watchcat ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++eea9508d4ed06e0e935b0a2af7de493b ++2012-05-08T16:44:50.098259Z ++31652 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++255 ++ ++watchcat.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++b91c96bc17ddaf2c289cda6061e58c73 ++2011-01-05T15:33:39.469623Z ++24909 ++nunojpg ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1641 ++ +diff --git a/feeds/packages/utils/watchcat/files/.svn/text-base/initd_watchcat.svn-base b/feeds/packages/utils/watchcat/files/.svn/text-base/initd_watchcat.svn-base +new file mode 100644 +index 0000000..36e353f +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/.svn/text-base/initd_watchcat.svn-base +@@ -0,0 +1,108 @@ ++#!/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/feeds/packages/utils/watchcat/files/.svn/text-base/uci_defaults_watchcat.svn-base b/feeds/packages/utils/watchcat/files/.svn/text-base/uci_defaults_watchcat.svn-base +new file mode 100644 +index 0000000..49def81 +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/.svn/text-base/uci_defaults_watchcat.svn-base +@@ -0,0 +1,10 @@ ++#!/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/feeds/packages/utils/watchcat/files/.svn/text-base/watchcat.sh.svn-base b/feeds/packages/utils/watchcat/files/.svn/text-base/watchcat.sh.svn-base +new file mode 100644 +index 0000000..ee9b6bd +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/.svn/text-base/watchcat.sh.svn-base +@@ -0,0 +1,69 @@ ++#!/bin/sh ++ ++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/feeds/packages/utils/watchcat/files/initd_watchcat b/feeds/packages/utils/watchcat/files/initd_watchcat +new file mode 100644 +index 0000000..36e353f +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/initd_watchcat +@@ -0,0 +1,108 @@ ++#!/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/feeds/packages/utils/watchcat/files/uci_defaults_watchcat b/feeds/packages/utils/watchcat/files/uci_defaults_watchcat +new file mode 100644 +index 0000000..49def81 +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/uci_defaults_watchcat +@@ -0,0 +1,10 @@ ++#!/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/feeds/packages/utils/watchcat/files/watchcat.sh b/feeds/packages/utils/watchcat/files/watchcat.sh +new file mode 100644 +index 0000000..ee9b6bd +--- /dev/null ++++ b/feeds/packages/utils/watchcat/files/watchcat.sh +@@ -0,0 +1,69 @@ ++#!/bin/sh ++ ++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/feeds/packages/utils/wattsup/.svn/entries b/feeds/packages/utils/wattsup/.svn/entries +new file mode 100644 +index 0000000..ef136e4 +--- /dev/null ++++ b/feeds/packages/utils/wattsup/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wattsup ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-30T20:10:45.562902Z ++26380 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++src ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++ac597a3987dbe902843a64af0dc13bc5 ++2011-03-30T20:10:45.562902Z ++26380 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++637 ++ +diff --git a/feeds/packages/utils/wattsup/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/wattsup/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..ced69d8 +--- /dev/null ++++ b/feeds/packages/utils/wattsup/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,31 @@ ++# 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:=wattsup ++PKG_RELEASE:=1 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wattsup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Wattsup polling utility ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/wattsup/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wattsup $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,wattsup)) +diff --git a/feeds/packages/utils/wattsup/Makefile b/feeds/packages/utils/wattsup/Makefile +new file mode 100644 +index 0000000..ced69d8 +--- /dev/null ++++ b/feeds/packages/utils/wattsup/Makefile +@@ -0,0 +1,31 @@ ++# 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:=wattsup ++PKG_RELEASE:=1 ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wattsup ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Wattsup polling utility ++endef ++ ++define Build/Prepare ++ mkdir -p $(PKG_BUILD_DIR) ++ $(CP) ./src/* $(PKG_BUILD_DIR)/ ++endef ++ ++define Package/wattsup/install ++ $(INSTALL_DIR) $(1)/usr/bin/ ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wattsup $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,wattsup)) +diff --git a/feeds/packages/utils/wattsup/src/.svn/entries b/feeds/packages/utils/wattsup/src/.svn/entries +new file mode 100644 +index 0000000..58d4fb0 +--- /dev/null ++++ b/feeds/packages/utils/wattsup/src/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wattsup/src ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-03-30T20:10:45.562902Z ++26380 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wattsup.c ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++5c20ac4ae4654ddb68695d0334103a2b ++2011-03-30T20:10:45.562902Z ++26380 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++32831 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:29.000000Z ++fe4f4a19bb0460b53e6622b7b404e7b8 ++2011-03-30T20:10:45.562902Z ++26380 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++134 ++ +diff --git a/feeds/packages/utils/wattsup/src/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/wattsup/src/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b9a687a +--- /dev/null ++++ b/feeds/packages/utils/wattsup/src/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,8 @@ ++wattsup: wattsup.o ++ $(CC) $(LDFLAGS) wattsup.o -o wattsup ++ ++wattsup.o: wattsup.c ++ $(CC) $(CFLAGS) -c wattsup.c ++ ++clean: ++ rm *.o wattsup +diff --git a/feeds/packages/utils/wattsup/src/.svn/text-base/wattsup.c.svn-base b/feeds/packages/utils/wattsup/src/.svn/text-base/wattsup.c.svn-base +new file mode 100644 +index 0000000..8b26ad6 +--- /dev/null ++++ b/feeds/packages/utils/wattsup/src/.svn/text-base/wattsup.c.svn-base +@@ -0,0 +1,1877 @@ ++/* ++ * wattsup - Program for controlling the Watts Up? Pro Device ++ * ++ * ++ * Copyright (c) 2005 Patrick Mochel ++ * ++ * This program is released under the GPLv2 ++ * ++ * ++ * Compiled with: ++ * ++ * gcc -O2 -Wall -o wattsup wattsup.c ++ * ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++static const char * wu_version = "0.02"; ++ ++ ++#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) ++ ++static const char * prog_name = "wattsup"; ++ ++static const char * sysfs_path_start = "/sys/class/tty"; ++ ++static char * wu_device = "ttyUSB0"; ++static int wu_fd = 0; ++static int wu_count = 0; ++static int wu_debug = 0; ++static char *wu_delim = ", "; ++static int wu_final = 0; ++static int wu_interval = 1; ++static int wu_label = 0; ++static int wu_newline = 0; ++static int wu_suppress = 0; ++ ++static int wu_localtime = 0; ++static int wu_gmtime = 0; ++ ++static int wu_info_all = 0; ++static int wu_no_data = 0; ++static int wu_set_only = 0; ++ ++#define wu_strlen 256 ++#define wu_num_fields 18 ++#define wu_param_len 16 ++ ++struct wu_packet { ++ unsigned int cmd; ++ unsigned int sub_cmd; ++ unsigned int count; ++ char buf[wu_strlen]; ++ int len; ++ char * field[wu_num_fields]; ++ char * label[wu_num_fields]; ++}; ++ ++ ++struct wu_data { ++ unsigned int watts; ++ unsigned int volts; ++ unsigned int amps; ++ unsigned int watt_hours; ++ ++ unsigned int cost; ++ unsigned int mo_kWh; ++ unsigned int mo_cost; ++ unsigned int max_watts; ++ ++ unsigned int max_volts; ++ unsigned int max_amps; ++ unsigned int min_watts; ++ unsigned int min_volts; ++ ++ unsigned int min_amps; ++ unsigned int power_factor; ++ unsigned int duty_cycle; ++ unsigned int power_cycle; ++}; ++ ++struct wu_options { ++ char * longopt; ++ int shortopt; ++ int param; ++ int flag; ++ char * value; ++ ++ char * descr; ++ char * option; ++ char * format; ++ ++ int (*show)(int dev_fd); ++ int (*store)(int dev_fd); ++}; ++ ++enum { ++ wu_option_help = 0, ++ wu_option_version, ++ ++ wu_option_debug, ++ ++ wu_option_count, ++ wu_option_final, ++ ++ wu_option_delim, ++ wu_option_newline, ++ wu_option_localtime, ++ wu_option_gmtime, ++ wu_option_label, ++ ++ wu_option_suppress, ++ ++ wu_option_cal, ++ wu_option_header, ++ ++ wu_option_interval, ++ wu_option_mode, ++ wu_option_user, ++ ++ wu_option_info_all, ++ wu_option_no_data, ++ wu_option_set_only, ++}; ++ ++ ++static char * wu_option_value(unsigned int index); ++ ++ ++enum { ++ wu_field_watts = 0, ++ wu_field_volts, ++ wu_field_amps, ++ ++ wu_field_watt_hours, ++ wu_field_cost, ++ wu_field_mo_kwh, ++ wu_field_mo_cost, ++ ++ wu_field_max_watts, ++ wu_field_max_volts, ++ wu_field_max_amps, ++ ++ wu_field_min_watts, ++ wu_field_min_volts, ++ wu_field_min_amps, ++ ++ wu_field_power_factor, ++ wu_field_duty_cycle, ++ wu_field_power_cycle, ++}; ++ ++struct wu_field { ++ unsigned int enable; ++ char * name; ++ char * descr; ++}; ++ ++static struct wu_field wu_fields[wu_num_fields] = { ++ [wu_field_watts] = { ++ .name = "watts", ++ .descr = "Watt Consumption", ++ }, ++ ++ [wu_field_min_watts] = { ++ .name = "min-watts", ++ .descr = "Minimum Watts Consumed", ++ }, ++ ++ [wu_field_max_watts] = { ++ .name = "max-watts", ++ .descr = "Maxium Watts Consumed", ++ }, ++ ++ [wu_field_volts] = { ++ .name = "volts", ++ .descr = "Volts Consumption", ++ }, ++ ++ [wu_field_min_volts] = { ++ .name = "max-volts", ++ .descr = "Minimum Volts Consumed", ++ }, ++ ++ [wu_field_max_volts] = { ++ .name = "min-volts", ++ .descr = "Maximum Volts Consumed", ++ }, ++ ++ [wu_field_amps] = { ++ .name = "amps", ++ .descr = "Amp Consumption", ++ }, ++ ++ [wu_field_min_amps] = { ++ .name = "min-amps", ++ .descr = "Minimum Amps Consumed", ++ }, ++ ++ [wu_field_max_amps] = { ++ .name = "max-amps", ++ .descr = "Maximum Amps Consumed", ++ }, ++ ++ [wu_field_watt_hours] = { ++ .name = "kwh", ++ .descr = "Average KWH", ++ }, ++ ++ [wu_field_mo_kwh] = { ++ .name = "mo-kwh", ++ .descr = "Average monthly KWH", ++ }, ++ ++ [wu_field_cost] = { ++ .name = "cost", ++ .descr = "Cost per watt", ++ }, ++ ++ [wu_field_mo_cost] = { ++ .name = "mo-cost", ++ .descr = "Monthly Cost", ++ }, ++ ++ [wu_field_power_factor] = { ++ .name = "power-factor", ++ .descr = "Ratio of Watts vs. Volt Amps", ++ }, ++ ++ [wu_field_duty_cycle] = { ++ .name = "duty-cycle", ++ .descr = "Percent of the Time On vs. Time Off", ++ }, ++ ++ [wu_field_power_cycle] = { ++ .name = "power-cycle", ++ .descr = "Indication of power cycle", ++ }, ++ ++}; ++ ++ ++ ++static void msg_start(const char * fmt, ...) ++{ ++ va_list(ap); ++ va_start(ap, fmt); ++ vprintf(fmt, ap); ++ va_end(ap); ++} ++ ++static void msg_end(void) ++{ ++ printf("\n"); ++} ++ ++static void msg(const char * fmt, ...) ++{ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vprintf(fmt, ap); ++ va_end(ap); ++} ++ ++static void dbg(const char * fmt, ...) ++{ ++ va_list ap; ++ ++ if (wu_debug) { ++ va_start(ap, fmt); ++ msg_start("%s: [debug] ", prog_name); ++ vprintf(fmt, ap); ++ msg_end(); ++ va_end(ap); ++ } ++} ++ ++static void err(const char * fmt, ...) ++{ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ fprintf(stderr, "%s: [error] ", prog_name); ++ vfprintf(stderr, fmt, ap); ++ fprintf(stderr, "\n"); ++ va_end(ap); ++} ++ ++static void perr(const char * fmt, ...) ++{ ++ char buf[1024]; ++ int n; ++ va_list ap; ++ ++ va_start(ap, fmt); ++ n = sprintf(buf, "%s: [error] ", prog_name); ++ vsnprintf(buf + n, sizeof(buf) - n, fmt, ap); ++ perror(buf); ++ va_end(ap); ++} ++ ++static int ret_err(int err) ++{ ++ errno = err; ++ return -1; ++} ++ ++ ++static void print_packet(struct wu_packet * p, char * str) ++{ ++ int i; ++ ++ if (!wu_suppress) ++ msg_start("Watts Up? %s\n", str); ++ for (i = 0; i< p->count; i++) { ++ if (i) ++ msg("%s", wu_newline ? "\n" : wu_delim); ++ if (wu_label) ++ msg("[%s] ", p->label[i]); ++ msg(p->field[i]); ++ } ++ msg_end(); ++} ++ ++ ++static void print_time(void) ++{ ++ time_t t; ++ struct tm * tm; ++ ++ if (wu_localtime || wu_gmtime) { ++ time(&t); ++ ++ if (wu_localtime) ++ tm = localtime(&t); ++ else ++ tm = gmtime(&t); ++ ++ msg("[%02d:%02d:%02d] ", ++ tm->tm_hour, tm->tm_min, tm->tm_sec); ++ } ++} ++ ++static void print_packet_filter(struct wu_packet * p, ++ int (*filter_ok)(struct wu_packet * p, int i, char * str)) ++{ ++ char buf[256]; ++ int printed; ++ int i; ++ ++ print_time(); ++ for (i = 0, printed = 0; i< p->count; i++) { ++ if (!filter_ok(p, i, buf)) ++ continue; ++ ++ if (printed++) ++ msg("%s", wu_newline ? "\n" : wu_delim); ++ if (wu_label) ++ msg("[%s] ", p->label[i]); ++ msg(buf); ++ } ++ msg_end(); ++} ++ ++ ++/* ++ * Device should be something like "ttyS0" ++ */ ++ ++static int open_device(char * device_name, int * dev_fd) ++{ ++ struct stat s; ++ int ret; ++ int cur_fd; ++ ++ cur_fd = open(".", O_RDONLY); ++ if (cur_fd< 0) { ++ perr("Could not open current directory."); ++ return cur_fd; ++ } ++ ++ ret = chdir(sysfs_path_start); ++ if (ret) { ++ perr(sysfs_path_start); ++ return ret; ++ } ++ ++ /* ++ * First, check if /sys/class/tty// exists. ++ */ ++ ++ dbg("Checking sysfs path: %s/%s", sysfs_path_start, device_name); ++ ++ ret = stat(device_name,&s); ++ if (ret< 0) { ++ perr(device_name); ++ goto Done; ++ } ++ ++ if (!S_ISDIR(s.st_mode)) { ++ errno = -ENOTDIR; ++ err("%s is not a TTY device.", device_name); ++ goto Done; ++ } ++ ++ dbg("%s is a registered TTY device", device_name); ++ ++ fchdir(cur_fd); ++ ++ ++ /* ++ * Check if device node exists and is writable ++ */ ++ chdir("/dev"); ++ ++ ret = stat(device_name,&s); ++ if (ret< 0) { ++ perr("/dev/%s (device node)", device_name); ++ goto Done; ++ } ++ ++ if (!S_ISCHR(s.st_mode)) { ++ errno = -ENOTTY; ++ ret = -1; ++ err("%s is not a TTY character device.", device_name); ++ goto Done; ++ } ++ ++ dbg("%s has a device node", device_name); ++ ++ ret = access(device_name, R_OK | W_OK); ++ if (ret) { ++ perr("%s: Not writable?", device_name); ++ goto Done; ++ } ++ ++ ret = open(device_name, O_RDWR | O_NONBLOCK); ++ if (ret< 0) { ++ perr("Could not open %s"); ++ goto Done; ++ } ++ *dev_fd = ret; ++ ret = 0; ++Done: ++ fchdir(cur_fd); ++ close(cur_fd); ++ return ret; ++} ++ ++ ++static int setup_serial_device(int dev_fd) ++{ ++ struct termios t; ++ int ret; ++ ++ ret = tcgetattr(dev_fd,&t); ++ if (ret) ++ return ret; ++ ++ cfmakeraw(&t); ++ cfsetispeed(&t, B115200); ++ cfsetospeed(&t, B115200); ++ tcflush(dev_fd, TCIFLUSH); ++ ++ t.c_iflag |= IGNPAR; ++ t.c_cflag&= ~CSTOPB; ++ ret = tcsetattr(dev_fd, TCSANOW,&t); ++ ++ if (ret) { ++ perr("setting terminal attributes"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++ ++static int wu_write(int fd, struct wu_packet * p) ++{ ++ int ret; ++ int n; ++ int i; ++ char * s = p->buf; ++ ++ memset(p->buf, 0, sizeof(p->buf)); ++ n = sprintf(p->buf, "#%c,%c,%d", p->cmd, p->sub_cmd, p->count); ++ p->len = n; ++ s = p->buf + n; ++ ++ for (i = 0; i< p->count; i++) { ++ if ((p->len + strlen(p->field[i]) + 4)>= sizeof(p->buf)) { ++ err("Overflowed command string"); ++ return ret_err(EOVERFLOW); ++ } ++ n = sprintf(s, ",%s", p->field[i]); ++ s += n; ++ p->len += n; ++ } ++ p->buf[p->len++] = ';'; ++ ++ dbg("Writing '%s' (strlen = %d) (len = %d) to device", ++ p->buf, strlen(p->buf), p->len); ++ ret = write(fd, p->buf, p->len); ++ if (ret != p->len) ++ perr("Writing to device"); ++ ++ return ret>= 0 ? 0 : ret; ++} ++ ++ ++static void dump_packet(struct wu_packet * p) ++{ ++ int i; ++ ++ dbg("Packet - Command '%c' %d parameters", p->cmd, p->count); ++ ++ for (i = 0; i< p->count; i++) ++ dbg("[%2d] [%20s] = \"%s\"", i, p->label[i], p->field[i]); ++} ++ ++ ++static int parse_packet(struct wu_packet * p) ++{ ++ char * s, *next; ++ int i; ++ ++ p->buf[p->len] = '\0'; ++ ++ dbg("Parsing Packet, Raw buffer is (%d bytes) [%s]", ++ p->len, p->buf); ++ ++ s = p->buf; ++ ++ /* ++ * First character should be '#' ++ */ ++ if (s) { ++ s = strchr(s, '#'); ++ if (s) ++ s++; ++ else { ++ dbg("Invalid packet"); ++ return ret_err(EFAULT); ++ } ++ } else { ++ dbg("Invalid packet"); ++ return ret_err(EFAULT); ++ } ++ ++ /* ++ * Command character is first ++ */ ++ next = strchr(s, ','); ++ if (next) { ++ p->cmd = *s; ++ s = ++next; ++ } else { ++ dbg("Invalid Command field [%s]", s); ++ return ret_err(EFAULT); ++ } ++ ++ /* ++ * Next character is the subcommand, and should be '-' ++ * Though, it doesn't matter, because we just ++ * discard it anyway. ++ */ ++ next = strchr(s, ','); ++ if (next) { ++ p->sub_cmd = *s; ++ s = ++next; ++ } else { ++ dbg("Invalid 2nd field"); ++ return ret_err(EFAULT); ++ } ++ ++ /* ++ * Next is the number of parameters, ++ * which should always be> 0. ++ */ ++ next = strchr(s, ','); ++ if (next) { ++ *next++ = '\0'; ++ p->count = atoi(s); ++ s = next; ++ } else { ++ dbg("Couldn't determine number of parameters"); ++ return ret_err(EFAULT); ++ } ++ ++ dbg("Have %d parameter%s (cmd = '%c')", ++ p->count, p->count> 1 ? "s" : "", p->cmd); ++ ++ /* ++ * Now, we loop over the rest of the string, ++ * storing a pointer to each in p->field[]. ++ * ++ * The last character was originally a ';', but may have been ++ * overwritten with a '\0', so we make sure to catch ++ * that when converting the last parameter. ++ */ ++ for (i = 0; i< p->count; i++) { ++ next = strpbrk(s, ",;"); ++ if (next) { ++ *next++ = '\0'; ++ } else { ++ if (i< (p->count - 1)) { ++ dbg("Malformed parameter string [%s]", s); ++ return ret_err(EFAULT); ++ } ++ } ++ ++ /* ++ * Skip leading white space in fields ++ */ ++ while (isspace(*s)) ++ s++; ++ p->field[i] = s; ++ s = next; ++ } ++ dump_packet(p); ++ return 0; ++} ++ ++ ++static int wu_read(int fd, struct wu_packet * p) ++{ ++ fd_set read_fd; ++ struct timeval tv; ++ int ret; ++ ++ FD_ZERO(&read_fd); ++ FD_SET(fd,&read_fd); ++ ++ tv.tv_sec = 2; ++ tv.tv_usec = 0; ++ ++ ret = select(fd + 1,&read_fd, NULL, NULL,&tv); ++ if (ret< 0) { ++ perr("select on terminal device"); ++ return ret; ++ } else if (ret> 0) { ++ ++ ret = read(fd, p->buf, wu_strlen); ++ if (ret< 0) { ++ perr("Reading from device"); ++ return ret; ++ } ++ p->len = ret; ++ } else { ++ dbg("Device timed out while reading"); ++ return ret_err(ETIME); ++ } ++ return parse_packet(p); ++} ++ ++ ++static int wu_show_header(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'H', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "watts header", ++ [1] = "volts header", ++ [2] = "amps header", ++ [3] = "kWh header", ++ [4] = "cost header", ++ [5] = "mo. kWh header", ++ [6] = "mo. cost header", ++ [7] = "max watts header", ++ [8] = "max volts header", ++ [9] = "max amps header", ++ [10] = "min watts header", ++ [11] = "min volts header", ++ [12] = "min amps header", ++ [13] = "power factor header", ++ [14] = "duty cycle header", ++ [15] = "power cycle header", ++ } ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting header strings"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading header strings"); ++ return ret; ++ } ++ ++ print_packet(&p, "Header Record"); ++ ++ return 0; ++} ++ ++ ++static int wu_show_cal(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'F', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "flags", ++ [1] = "sample count", ++ [2] = "volts gain", ++ [3] = "volts bias", ++ [4] = "amps gain", ++ [5] = "amps bias", ++ [6] = "amps offset", ++ [7] = "low amps gain", ++ [8] = "low amps bias", ++ [9] = "low amps offset", ++ [10] = "watts gain", ++ [11] = "watts offset", ++ [12] = "low watts gain", ++ [13] = "low watts offset", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting calibration parameters"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading header strings"); ++ return ret; ++ } ++ print_packet(&p, "Calibration Settings"); ++ ++ return 0; ++} ++ ++static int wu_start_log(void) ++{ ++ struct wu_packet p = { ++ .cmd = 'L', ++ .sub_cmd = 'W', ++ .count = 3, ++ .field = { ++ [0] = "E", ++ [1] = "1", ++ [2] = "1", ++ }, ++ }; ++ int ret; ++ ++ /* ++ * Start up logging ++ */ ++ ret = wu_write(wu_fd,&p); ++ if (!ret) ++ sleep(1); ++ else { ++ perr("Starting External Logging"); ++ return ret; ++ } ++ return ret; ++} ++ ++static int wu_stop_log(void) ++{ ++ struct wu_packet p = { ++ .cmd = 'L', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "time stamp", ++ [1] = "interval", ++ }, ++ }; ++ int ret; ++ ++ /* ++ * Stop logging and read time stamp. ++ */ ++ ret = wu_write(wu_fd,&p); ++ if (ret) { ++ perr("Stopping External Logging"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(wu_fd,&p); ++ if (ret) { ++ perr("Reading final time stamp"); ++ return ret; ++ } ++ if (wu_final) ++ print_packet(&p, "Final Time Stamp and Interval"); ++ return ret; ++} ++ ++static int filter_data(struct wu_packet * p, int i, char * buf) ++{ ++ if (i< wu_num_fields) { ++ if (wu_fields[i].enable) { ++ double val = strtod(p->field[i], NULL); ++ snprintf(buf, 256, "%.1f", val / 10.0); ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++static int wu_clear(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'R', ++ .sub_cmd = 'W', ++ .count = 0, ++ }; ++ int ret; ++ ++ /* ++ * Clear the memory ++ */ ++ ret = wu_write(fd,&p); ++ if (ret) ++ perr("Clearing memory"); ++ else ++ sleep(2); ++ ++ /* ++ * Dummy read ++ */ ++ wu_read(fd,&p); ++ return ret; ++ ++} ++ ++static int wu_read_data(int fd) ++{ ++ struct wu_packet p = { ++ .label = { ++ [0] = "watts", ++ [1] = "volts", ++ [2] = "amps", ++ [3] = "watt hours", ++ [4] = "cost", ++ [5] = "mo. kWh", ++ [6] = "mo. cost", ++ [7] = "max watts", ++ [8] = "max volts", ++ [9] = "max amps", ++ [10] = "min watts", ++ [11] = "min volts", ++ [12] = "min amps", ++ [13] = "power factor", ++ [14] = "duty cycle", ++ [15] = "power cycle", ++ }, ++ }; ++ int num_read = 0; ++ int retry = 0; ++ int ret; ++ int i; ++ ++ static const int wu_max_retry = 2; ++ ++ i = 0; ++ while (1) { ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ if (++retry< wu_max_retry) { ++ dbg("Bad record back, retrying\n"); ++ sleep(wu_interval); ++ continue; ++ } else if (retry == wu_max_retry) { ++ dbg("Still couldn't get a good record, resetting\n"); ++ wu_stop_log(); ++ wu_clear(fd); ++ wu_start_log(); ++ num_read = 0; ++ sleep(wu_interval); ++ continue; ++ } ++ perr("Blech. Giving up on read"); ++ break; ++ } else if (retry) ++ retry = 0; ++ ++ dbg("[%d] ", num_read); ++ num_read++; ++ print_packet_filter(&p, filter_data); ++ ++ if (wu_count&& (++i == wu_count)) ++ break; ++ ++ sleep(wu_interval); ++ } ++ return 0; ++ ++} ++ ++ ++static int wu_show_interval(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'S', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "reserved", ++ [1] = "interval", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting interval"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading interval"); ++ return ret; ++ } ++ print_packet(&p, "Interval Settings"); ++ ++ return 0; ++} ++ ++static int wu_write_interval(int fd, unsigned int seconds, ++ unsigned int interval) ++{ ++ char str_seconds[wu_param_len]; ++ char str_interval[wu_param_len]; ++ struct wu_packet p = { ++ .cmd = 'S', ++ .sub_cmd = 'W', ++ .count = 2, ++ .field = { ++ [0] = str_seconds, ++ [1] = str_interval, ++ }, ++ }; ++ int ret; ++ ++ snprintf(str_seconds, wu_param_len, "%ud", seconds); ++ snprintf(str_interval, wu_param_len, "%ud", interval); ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Setting Sampling Interval"); ++ return ret; ++ } ++ sleep(1); ++ return 0; ++} ++ ++static int wu_store_interval(int fd) ++{ ++ char * s = wu_option_value(wu_option_interval); ++ char * end; ++ ++ wu_interval = strtol(s,&end, 0); ++ if (*end) { ++ err("Invalid interval: %s", s); ++ return ret_err(EINVAL); ++ } ++ return wu_write_interval(fd, 1, wu_interval); ++} ++ ++static int wu_show_mode(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'M', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "display mode", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting device display mode"); ++ return ret; ++ } ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reaing device display mode"); ++ return ret; ++ } ++ dump_packet(&p); ++ return ret; ++} ++ ++static int wu_write_mode(int fd, int mode) ++{ ++ char str_mode[wu_param_len]; ++ struct wu_packet p = { ++ .cmd = 'M', ++ .sub_cmd = 'W', ++ .count = 1, ++ .field = { ++ [0] = str_mode, ++ }, ++ }; ++ int ret; ++ ++ snprintf(str_mode, wu_param_len, "%ud", mode); ++ ret = wu_write(fd,&p); ++ if (ret) ++ perr("Setting device display mode"); ++ else ++ sleep(1); ++ return ret; ++} ++ ++static int wu_store_mode(int fd) ++{ ++ char * s = wu_option_value(wu_option_mode); ++ char * end; ++ unsigned int mode; ++ ++ mode = strtol(s,&end, 0); ++ if (*end) { ++ err("Invalid mode: %s", s); ++ return ret_err(EINVAL); ++ } ++ return wu_write_mode(fd, mode); ++} ++ ++ ++ ++static int wu_show_user(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'U', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "cost per kWh", ++ [1] = "2nd tier cost", ++ [2] = "2nd tier threshold", ++ [3] = "duty cycle threshold", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting user parameters"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading user parameters"); ++ return ret; ++ } ++ print_packet(&p, "User Settings"); ++ return 0; ++} ++ ++ ++static int wu_write_user(int fd, unsigned int kwh_cost, ++ unsigned int second_tier_cost, ++ unsigned int second_tier_threshold, ++ unsigned int duty_cycle_threshold) ++{ ++ char str_kwh_cost[wu_param_len]; ++ char str_2nd_tier_cost[wu_param_len]; ++ char str_2nd_tier_threshold[wu_param_len]; ++ char str_duty_cycle_threshold[wu_param_len]; ++ ++ struct wu_packet p = { ++ .cmd = 'U', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = str_kwh_cost, ++ [1] = str_2nd_tier_cost, ++ [2] = str_2nd_tier_threshold, ++ [3] = str_duty_cycle_threshold, ++ }, ++ }; ++ int ret; ++ ++ snprintf(str_kwh_cost, wu_param_len, "%ud", kwh_cost); ++ snprintf(str_2nd_tier_cost, wu_param_len, "%ud", ++ second_tier_cost); ++ snprintf(str_2nd_tier_threshold, wu_param_len, "%ud", ++ second_tier_threshold); ++ snprintf(str_duty_cycle_threshold, wu_param_len, "%ud", ++ duty_cycle_threshold); ++ ++ ret = wu_write(fd,&p); ++ if (ret) ++ perr("Writing user parameters"); ++ else ++ sleep(1); ++ return ret; ++} ++ ++static int wu_store_user(int fd) ++{ ++ unsigned int kwh_cost; ++ unsigned int second_tier_cost; ++ unsigned int second_tier_threshold; ++ unsigned int duty_cycle_threshold; ++ char * buf = wu_option_value(wu_option_user); ++ char * s = buf; ++ char * next; ++ ++ if (!buf) { ++ err("No user parameters?"); ++ return ret_err(EINVAL); ++ } ++ ++ kwh_cost = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ ++ second_tier_cost = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ ++ second_tier_threshold = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ ++ duty_cycle_threshold = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ return wu_write_user(fd, kwh_cost, second_tier_cost, ++ second_tier_threshold, duty_cycle_threshold); ++} ++ ++ ++static void enable_field(char * name) ++{ ++ int i; ++ ++ for (i = 0; i< wu_num_fields; i++) { ++ if (!strcasecmp(wu_fields[i].name, name)) { ++ wu_fields[i].enable = 1; ++ break; ++ } ++ } ++} ++ ++static void enable_all_fields(void) ++{ ++ int i; ++ ++ for (i = 0; i< wu_num_fields; i++) ++ wu_fields[i].enable = 1; ++} ++ ++ ++ ++static int wu_show_help(int); ++static int wu_show_version(int); ++ ++ ++ ++static int wu_store_count(int unused) ++{ ++ char * s = wu_option_value(wu_option_count); ++ char * end; ++ ++ if (s) { ++ wu_count = strtol(s,&end, 0); ++ if (*end) { ++ err("Bad count field"); ++ return ret_err(EINVAL); ++ } ++ } ++ return 0; ++} ++ ++static int wu_store_debug(int unused) ++{ ++ wu_debug = 1; ++ return 0; ++} ++ ++static int wu_store_delim(int unused) ++{ ++ char * s = wu_option_value(wu_option_delim); ++ ++ if (s) ++ wu_delim = s; ++ return 0; ++} ++ ++static int wu_store_final(int unused) ++{ ++ wu_final = 1; ++ return 0; ++} ++ ++static int wu_store_label(int unused) ++{ ++ wu_label = 1; ++ return 0; ++} ++ ++static int wu_store_newline(int unused) ++{ ++ wu_newline = 1; ++ return 0; ++} ++ ++static int wu_store_suppress(int unused) ++{ ++ wu_suppress = 1; ++ return 0; ++} ++ ++static int wu_store_localtime(int unused) ++{ ++ wu_localtime = 1; ++ return 0; ++} ++ ++static int wu_store_gmtime(int unused) ++{ ++ wu_gmtime = 1; ++ return 0; ++} ++ ++static int wu_store_info_all(int unused) ++{ ++ wu_info_all = 1; ++ return 0; ++} ++ ++static int wu_store_no_data(int unused) ++{ ++ wu_no_data = 1; ++ return 0; ++} ++ ++static int wu_store_set_only(int unused) ++{ ++ wu_set_only = 1; ++ return 0; ++} ++ ++ ++/** ++ * wu_options - command line options and their associated flags ++ * ++ */ ++static struct wu_options wu_options[] = { ++ ++ /* ++ * Help! ++ */ ++ [wu_option_help] = { ++ .longopt = "help", ++ .shortopt = 'h', ++ .param = 0, ++ .descr = "Display help text and exit", ++ .show = wu_show_help, ++ }, ++ ++ [wu_option_version] = { ++ .longopt = "version", ++ .shortopt = 'V', ++ .param = 0, ++ .descr = "Display version information and exit", ++ .show = wu_show_version, ++ }, ++ ++ /* ++ * Modifies the output for all other options ++ */ ++ [wu_option_debug] = { ++ .longopt = "debug", ++ .shortopt = 'd', ++ .param = 0, ++ .descr = "Print out debugging messages", ++ .store = wu_store_debug, ++ }, ++ ++ /* ++ * For data reading.. ++ */ ++ [wu_option_count] = { ++ .longopt = "count", ++ .shortopt = 'c', ++ .param = 1, ++ .descr = "Specify number of data samples", ++ .option = "", ++ .store = wu_store_count, ++ }, ++ ++ [wu_option_final] = { ++ .longopt = "final", ++ .shortopt = 'z', ++ .param = 0, ++ .descr = "Print final interval information", ++ .store = wu_store_final, ++ }, ++ ++ /* ++ * Modifies output for each option (most relevant for data) ++ */ ++ [wu_option_delim] = { ++ .longopt = "delim", ++ .shortopt = 'f', ++ .param = 1, ++ .descr = "Set field delimiter (default \", \")", ++ .option = "", ++ .store = wu_store_delim, ++ }, ++ ++ [wu_option_newline] = { ++ .longopt = "newline", ++ .shortopt = 'n', ++ .param = 0, ++ .descr = "Use '\\n' as delimter instead", ++ .store = wu_store_newline, ++ }, ++ ++ [wu_option_localtime] = { ++ .longopt = "localtime", ++ .shortopt = 't', ++ .param = 0, ++ .descr = "Print localtime with each data reading", ++ .store = wu_store_localtime, ++ }, ++ ++ [wu_option_gmtime] = { ++ .longopt = "gmtime", ++ .shortopt = 'g', ++ .param = 0, ++ .descr = "Print GMT time with each data reading", ++ .store = wu_store_gmtime, ++ }, ++ ++ [wu_option_label] = { ++ .longopt = "label", ++ .shortopt = 'l', ++ .param = 0, ++ .descr = "Show labels of each field", ++ .store = wu_store_label, ++ }, ++ ++ /* ++ * Relevant for each of the fields below ++ */ ++ [wu_option_suppress] = { ++ .longopt = "suppress", ++ .shortopt = 's', ++ .param = 0, ++ .descr = "Suppress printing of the field description", ++ .store = wu_store_suppress, ++ }, ++ ++ /* ++ * These options print values from the device and exit. ++ */ ++ [wu_option_cal] = { ++ .longopt = "calibrate", ++ .shortopt = 'b', ++ .param = 0, ++ .descr = "Print calibration parameters", ++ .show = wu_show_cal, ++ }, ++ ++ [wu_option_header] = { ++ .longopt = "header", ++ .shortopt = 'r', ++ .param = 0, ++ .descr = "Print data field names (as read from device)", ++ .show = wu_show_header, ++ }, ++ ++ /* ++ * These options have an optional parameter. ++ * W/o that parameter, they print values from the device. ++ * W/ that parameter, they set that option and read data. ++ * ++ * Except when the 'set-only' parameter is used, then the ++ * parameters are set, then re-read and printed. ++ */ ++ [wu_option_interval] = { ++ .longopt = "interval", ++ .shortopt = 'i', ++ .param = 2, ++ .descr = "Get/Set sampling interval", ++ .option = "", ++ .show = wu_show_interval, ++ .store = wu_store_interval, ++ }, ++ ++ [wu_option_mode] = { ++ .longopt = "mode", ++ .shortopt = 'm', ++ .param = 2, ++ .descr = "Get/Set display mode", ++ .option = "", ++ .show = wu_show_mode, ++ .store = wu_store_mode, ++ }, ++ ++ [wu_option_user] = { ++ .longopt = "user", ++ .shortopt = 'u', ++ .param = 2, ++ .descr = "Get/Set user parameters", ++ .option = "", ++ .format = ",<2nd tier cost>," ++ "<2nd tier threshold>," ++ "", ++ .show = wu_show_user, ++ .store = wu_store_user, ++ }, ++ ++ [wu_option_info_all] = { ++ .longopt = "show-all", ++ .shortopt = 'a', ++ .param = 0, ++ .descr = "Show all device parameters", ++ .store = wu_store_info_all, ++ }, ++ ++ [wu_option_no_data] = { ++ .longopt = "no-data", ++ .shortopt = 'N', ++ .param = 0, ++ .descr = "Don't read any data (just read device info)", ++ .store = wu_store_no_data, ++ }, ++ ++ [wu_option_set_only] = { ++ .longopt = "set-only", ++ .shortopt = 'S', ++ .param = 0, ++ .descr = "Set parameters only (don't read them back)", ++ .store = wu_store_set_only, ++ }, ++}; ++ ++#define wu_num_options ARRAY_SIZE(wu_options) ++ ++static int wu_show_version(int unused) ++{ ++ printf("%s Version %s\n", prog_name, wu_version); ++ return 0; ++} ++ ++static int wu_show_help(int unused) ++{ ++ int i; ++ int n; ++ ++ wu_show_version(unused); ++ printf(" A program for interfacing with the Watts Up? Power Meter\n"); ++ printf("\n"); ++ ++ printf("Usage: %s [ ... ] [ ... ]\n", ++ prog_name); ++ printf("\n"); ++ ++ printf(" is the serial port the device is connected at.\n"); ++ printf("\n"); ++ ++ printf(" are any of the following:\n"); ++ for (i = 0; i< wu_num_options; i++) { ++ n = printf(" -%c", wu_options[i].shortopt); ++ ++ if (wu_options[i].param == 0) ++ n = printf(" "); ++ else if (wu_options[i].param == 1) ++ n = printf(" %s", wu_options[i].option); ++ else if (wu_options[i].param == 2) ++ n = printf(" [%s]", wu_options[i].option); ++ ++ n += printf("%*c| ", n - 12, ' '); ++ n += printf("--%s", wu_options[i].longopt); ++ ++ if (wu_options[i].param == 0) ++ n += printf(" "); ++ else if (wu_options[i].param == 1) ++ n += printf("=%s", wu_options[i].option); ++ else if (wu_options[i].param == 2) ++ n += printf("[=%s]", wu_options[i].option); ++ ++ printf("%*c%s\n", ++ 40 - n, ' ', wu_options[i].descr); ++ } ++ printf("\n"); ++ printf(" specifies which of these to print out (default: ALL)\n"); ++ for (i = 0; i< wu_num_fields; i++) { ++ printf("%12s -- %s\n", wu_fields[i].name, wu_fields[i].descr); ++ } ++ printf("\n"); ++ ++ return 0; ++} ++ ++ ++static char * wu_option_value(unsigned int index) ++{ ++ return (index< wu_num_options) ? wu_options[index].value : NULL; ++} ++ ++ ++static int wu_check_option_show(int index) ++{ ++ /* ++ * Return 1 if we need to print something out for ++ * a particular option. ++ */ ++ if (index< wu_num_options) { ++ if (wu_options[index].flag) { ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++static int wu_check_option_store(int index) ++{ ++ /* ++ * Return a 1 if this option is set. ++ */ ++ ++ if (index< wu_num_options) { ++ if (wu_options[index].flag) { ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++ ++static int wu_show(int index, int dev_fd) ++{ ++ if (wu_options[index].show) ++ return wu_options[index].show(dev_fd); ++ return 0; ++} ++ ++/* ++ * Check if the option is set, and call its method if so. ++ * Return whether or not we did anything.. ++ */ ++ ++static int wu_check_show(int index, int dev_fd) ++{ ++ if (wu_check_option_show(index)) { ++ wu_show(index, dev_fd); ++ return 1; ++ } ++ return 0; ++} ++ ++ ++/* ++ * Check if the option is set and if so, call it ++ * Return the value from the ->store() method. ++ */ ++ ++static int wu_check_store(int index, int dev_fd) ++{ ++ if (wu_check_option_store(index)) { ++ if (wu_options[index].store) ++ return wu_options[index].store(dev_fd); ++ } ++ return 0; ++} ++ ++ ++static void make_longopt(struct option * l) ++{ ++ int i; ++ ++ for (i = 0; i< wu_num_options; i++) { ++ l[i].name = wu_options[i].longopt; ++ l[i].has_arg = wu_options[i].param; ++ l[i].flag =&wu_options[i].flag; ++ l[i].val = 0; ++ } ++} ++ ++static void make_shortopt(char * str) ++{ ++ int i; ++ char * s = str; ++ ++ for (i = 0; i< wu_num_options; i++) { ++ *s++ = wu_options[i].shortopt; ++ if (wu_options[i].param) ++ *s++ = wu_options[i].param == 1 ? ':' : ';'; ++ } ++} ++ ++static void enable_short_option(int c, char * arg) ++{ ++ int i; ++ ++ /* ++ * Friggin' getopt_long() will return the ++ * character if we get a short option (e.g. '-h'), ++ * instead of returning 0 like it does when it ++ * gets a long option (e.g. "--help"). Ugh. ++ */ ++ for (i = 0; i< wu_num_options; i++) { ++ if (wu_options[i].shortopt == c) { ++ wu_options[i].flag = 1; ++ if (arg) ++ wu_options[i].value = strdup(arg); ++ break; ++ } ++ } ++} ++ ++static int parse_args(int argc, char ** argv) ++{ ++ struct option longopts[wu_num_options + 1] = { }; ++ char shortopts[wu_num_options * 2] = ""; ++ ++ make_longopt(longopts); ++ make_shortopt(shortopts); ++ ++ ++ while (1) { ++ int c; ++ int index; ++ ++ c = getopt_long(argc, argv, shortopts, ++ longopts,&index); ++ if (c == -1) ++ break; ++ ++ switch (c) { ++ case 0: ++ wu_options[index].flag = 1; ++ if (optarg) ++ wu_options[index].value = strdup(optarg); ++ ++ printf("long option: val = %c, optarg = %s\n", ++ wu_options[index].shortopt, optarg); ++ break; ++ case '?': ++ err("Bad parameter"); ++ return ret_err(EINVAL); ++ break; ++ default: ++ enable_short_option(c, optarg); ++ break; ++ } ++ } ++ ++ /* ++ * Check for help request now and bail after ++ * printing it, if it's set. ++ */ ++ if (wu_check_show(wu_option_help, 0)) ++ exit(0); ++ ++ if (wu_check_show(wu_option_version, 0)) ++ exit(0); ++ ++ /* ++ * Fields to print out ++ */ ++ if (optind< argc) { ++ int i; ++ ++ wu_device = argv[optind++]; ++ ++ if (optind< argc) { ++ for (i = optind; i< argc; i++) ++ enable_field(argv[i]); ++ } else ++ enable_all_fields(); ++ ++ } else { ++ wu_show(wu_option_help, 0); ++ return ret_err(EINVAL); ++ } ++ return 0; ++} ++ ++ ++int main(int argc, char ** argv) ++{ ++ int ret; ++ int fd = 0; ++ ++ ret = parse_args(argc, argv); ++ if (ret) ++ return 0; ++ ++ /* ++ * Try to enable debugging early ++ */ ++ if ((ret = wu_check_store(wu_option_debug, 0))) ++ goto Close; ++ ++ ret = open_device(wu_device,&fd); ++ if (ret) ++ return ret; ++ ++ dbg("%s: Open for business", wu_device); ++ ++ ret = setup_serial_device(fd); ++ if (ret) ++ goto Close; ++ ++ wu_clear(fd); ++ ++ wu_fd = fd; ++ ++ /* ++ * Set delimeter before we print out any fields. ++ */ ++ if ((ret = wu_check_store(wu_option_delim, fd))) ++ goto Close; ++ ++ /* ++ * Ditto for 'label' and 'newline' flags. ++ */ ++ if ((ret = wu_check_store(wu_option_label, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_newline, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_suppress, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_localtime, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_gmtime, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_set_only, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_no_data, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_info_all, fd))) ++ goto Close; ++ ++ ++ /* ++ * Options to set device parameters. ++ */ ++ if ((ret = wu_check_store(wu_option_interval, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_mode, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_user, fd))) ++ goto Close; ++ ++ /* ++ * Check for options to print device info ++ */ ++ if (wu_info_all) { ++ wu_show(wu_option_cal, fd); ++ wu_show(wu_option_header, fd); ++ wu_show(wu_option_interval, fd); ++ wu_show(wu_option_mode, fd); ++ wu_show(wu_option_user, fd); ++ } else { ++ wu_check_show(wu_option_cal, fd); ++ wu_check_show(wu_option_header, fd); ++ ++ if (!wu_set_only) { ++ wu_check_show(wu_option_interval, fd); ++ wu_check_show(wu_option_mode, fd); ++ wu_check_show(wu_option_user, fd); ++ } ++ } ++ ++ if (!wu_no_data) { ++ ++ if ((ret = wu_check_store(wu_option_count, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_final, fd))) ++ goto Close; ++ ++ if ((ret = wu_start_log())) ++ goto Close; ++ ++ wu_read_data(fd); ++ ++ wu_stop_log(); ++ } ++Close: ++ close(fd); ++ return ret; ++} ++ ++ +diff --git a/feeds/packages/utils/wattsup/src/Makefile b/feeds/packages/utils/wattsup/src/Makefile +new file mode 100644 +index 0000000..b9a687a +--- /dev/null ++++ b/feeds/packages/utils/wattsup/src/Makefile +@@ -0,0 +1,8 @@ ++wattsup: wattsup.o ++ $(CC) $(LDFLAGS) wattsup.o -o wattsup ++ ++wattsup.o: wattsup.c ++ $(CC) $(CFLAGS) -c wattsup.c ++ ++clean: ++ rm *.o wattsup +diff --git a/feeds/packages/utils/wattsup/src/wattsup.c b/feeds/packages/utils/wattsup/src/wattsup.c +new file mode 100644 +index 0000000..8b26ad6 +--- /dev/null ++++ b/feeds/packages/utils/wattsup/src/wattsup.c +@@ -0,0 +1,1877 @@ ++/* ++ * wattsup - Program for controlling the Watts Up? Pro Device ++ * ++ * ++ * Copyright (c) 2005 Patrick Mochel ++ * ++ * This program is released under the GPLv2 ++ * ++ * ++ * Compiled with: ++ * ++ * gcc -O2 -Wall -o wattsup wattsup.c ++ * ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++static const char * wu_version = "0.02"; ++ ++ ++#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) ++ ++static const char * prog_name = "wattsup"; ++ ++static const char * sysfs_path_start = "/sys/class/tty"; ++ ++static char * wu_device = "ttyUSB0"; ++static int wu_fd = 0; ++static int wu_count = 0; ++static int wu_debug = 0; ++static char *wu_delim = ", "; ++static int wu_final = 0; ++static int wu_interval = 1; ++static int wu_label = 0; ++static int wu_newline = 0; ++static int wu_suppress = 0; ++ ++static int wu_localtime = 0; ++static int wu_gmtime = 0; ++ ++static int wu_info_all = 0; ++static int wu_no_data = 0; ++static int wu_set_only = 0; ++ ++#define wu_strlen 256 ++#define wu_num_fields 18 ++#define wu_param_len 16 ++ ++struct wu_packet { ++ unsigned int cmd; ++ unsigned int sub_cmd; ++ unsigned int count; ++ char buf[wu_strlen]; ++ int len; ++ char * field[wu_num_fields]; ++ char * label[wu_num_fields]; ++}; ++ ++ ++struct wu_data { ++ unsigned int watts; ++ unsigned int volts; ++ unsigned int amps; ++ unsigned int watt_hours; ++ ++ unsigned int cost; ++ unsigned int mo_kWh; ++ unsigned int mo_cost; ++ unsigned int max_watts; ++ ++ unsigned int max_volts; ++ unsigned int max_amps; ++ unsigned int min_watts; ++ unsigned int min_volts; ++ ++ unsigned int min_amps; ++ unsigned int power_factor; ++ unsigned int duty_cycle; ++ unsigned int power_cycle; ++}; ++ ++struct wu_options { ++ char * longopt; ++ int shortopt; ++ int param; ++ int flag; ++ char * value; ++ ++ char * descr; ++ char * option; ++ char * format; ++ ++ int (*show)(int dev_fd); ++ int (*store)(int dev_fd); ++}; ++ ++enum { ++ wu_option_help = 0, ++ wu_option_version, ++ ++ wu_option_debug, ++ ++ wu_option_count, ++ wu_option_final, ++ ++ wu_option_delim, ++ wu_option_newline, ++ wu_option_localtime, ++ wu_option_gmtime, ++ wu_option_label, ++ ++ wu_option_suppress, ++ ++ wu_option_cal, ++ wu_option_header, ++ ++ wu_option_interval, ++ wu_option_mode, ++ wu_option_user, ++ ++ wu_option_info_all, ++ wu_option_no_data, ++ wu_option_set_only, ++}; ++ ++ ++static char * wu_option_value(unsigned int index); ++ ++ ++enum { ++ wu_field_watts = 0, ++ wu_field_volts, ++ wu_field_amps, ++ ++ wu_field_watt_hours, ++ wu_field_cost, ++ wu_field_mo_kwh, ++ wu_field_mo_cost, ++ ++ wu_field_max_watts, ++ wu_field_max_volts, ++ wu_field_max_amps, ++ ++ wu_field_min_watts, ++ wu_field_min_volts, ++ wu_field_min_amps, ++ ++ wu_field_power_factor, ++ wu_field_duty_cycle, ++ wu_field_power_cycle, ++}; ++ ++struct wu_field { ++ unsigned int enable; ++ char * name; ++ char * descr; ++}; ++ ++static struct wu_field wu_fields[wu_num_fields] = { ++ [wu_field_watts] = { ++ .name = "watts", ++ .descr = "Watt Consumption", ++ }, ++ ++ [wu_field_min_watts] = { ++ .name = "min-watts", ++ .descr = "Minimum Watts Consumed", ++ }, ++ ++ [wu_field_max_watts] = { ++ .name = "max-watts", ++ .descr = "Maxium Watts Consumed", ++ }, ++ ++ [wu_field_volts] = { ++ .name = "volts", ++ .descr = "Volts Consumption", ++ }, ++ ++ [wu_field_min_volts] = { ++ .name = "max-volts", ++ .descr = "Minimum Volts Consumed", ++ }, ++ ++ [wu_field_max_volts] = { ++ .name = "min-volts", ++ .descr = "Maximum Volts Consumed", ++ }, ++ ++ [wu_field_amps] = { ++ .name = "amps", ++ .descr = "Amp Consumption", ++ }, ++ ++ [wu_field_min_amps] = { ++ .name = "min-amps", ++ .descr = "Minimum Amps Consumed", ++ }, ++ ++ [wu_field_max_amps] = { ++ .name = "max-amps", ++ .descr = "Maximum Amps Consumed", ++ }, ++ ++ [wu_field_watt_hours] = { ++ .name = "kwh", ++ .descr = "Average KWH", ++ }, ++ ++ [wu_field_mo_kwh] = { ++ .name = "mo-kwh", ++ .descr = "Average monthly KWH", ++ }, ++ ++ [wu_field_cost] = { ++ .name = "cost", ++ .descr = "Cost per watt", ++ }, ++ ++ [wu_field_mo_cost] = { ++ .name = "mo-cost", ++ .descr = "Monthly Cost", ++ }, ++ ++ [wu_field_power_factor] = { ++ .name = "power-factor", ++ .descr = "Ratio of Watts vs. Volt Amps", ++ }, ++ ++ [wu_field_duty_cycle] = { ++ .name = "duty-cycle", ++ .descr = "Percent of the Time On vs. Time Off", ++ }, ++ ++ [wu_field_power_cycle] = { ++ .name = "power-cycle", ++ .descr = "Indication of power cycle", ++ }, ++ ++}; ++ ++ ++ ++static void msg_start(const char * fmt, ...) ++{ ++ va_list(ap); ++ va_start(ap, fmt); ++ vprintf(fmt, ap); ++ va_end(ap); ++} ++ ++static void msg_end(void) ++{ ++ printf("\n"); ++} ++ ++static void msg(const char * fmt, ...) ++{ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vprintf(fmt, ap); ++ va_end(ap); ++} ++ ++static void dbg(const char * fmt, ...) ++{ ++ va_list ap; ++ ++ if (wu_debug) { ++ va_start(ap, fmt); ++ msg_start("%s: [debug] ", prog_name); ++ vprintf(fmt, ap); ++ msg_end(); ++ va_end(ap); ++ } ++} ++ ++static void err(const char * fmt, ...) ++{ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ fprintf(stderr, "%s: [error] ", prog_name); ++ vfprintf(stderr, fmt, ap); ++ fprintf(stderr, "\n"); ++ va_end(ap); ++} ++ ++static void perr(const char * fmt, ...) ++{ ++ char buf[1024]; ++ int n; ++ va_list ap; ++ ++ va_start(ap, fmt); ++ n = sprintf(buf, "%s: [error] ", prog_name); ++ vsnprintf(buf + n, sizeof(buf) - n, fmt, ap); ++ perror(buf); ++ va_end(ap); ++} ++ ++static int ret_err(int err) ++{ ++ errno = err; ++ return -1; ++} ++ ++ ++static void print_packet(struct wu_packet * p, char * str) ++{ ++ int i; ++ ++ if (!wu_suppress) ++ msg_start("Watts Up? %s\n", str); ++ for (i = 0; i< p->count; i++) { ++ if (i) ++ msg("%s", wu_newline ? "\n" : wu_delim); ++ if (wu_label) ++ msg("[%s] ", p->label[i]); ++ msg(p->field[i]); ++ } ++ msg_end(); ++} ++ ++ ++static void print_time(void) ++{ ++ time_t t; ++ struct tm * tm; ++ ++ if (wu_localtime || wu_gmtime) { ++ time(&t); ++ ++ if (wu_localtime) ++ tm = localtime(&t); ++ else ++ tm = gmtime(&t); ++ ++ msg("[%02d:%02d:%02d] ", ++ tm->tm_hour, tm->tm_min, tm->tm_sec); ++ } ++} ++ ++static void print_packet_filter(struct wu_packet * p, ++ int (*filter_ok)(struct wu_packet * p, int i, char * str)) ++{ ++ char buf[256]; ++ int printed; ++ int i; ++ ++ print_time(); ++ for (i = 0, printed = 0; i< p->count; i++) { ++ if (!filter_ok(p, i, buf)) ++ continue; ++ ++ if (printed++) ++ msg("%s", wu_newline ? "\n" : wu_delim); ++ if (wu_label) ++ msg("[%s] ", p->label[i]); ++ msg(buf); ++ } ++ msg_end(); ++} ++ ++ ++/* ++ * Device should be something like "ttyS0" ++ */ ++ ++static int open_device(char * device_name, int * dev_fd) ++{ ++ struct stat s; ++ int ret; ++ int cur_fd; ++ ++ cur_fd = open(".", O_RDONLY); ++ if (cur_fd< 0) { ++ perr("Could not open current directory."); ++ return cur_fd; ++ } ++ ++ ret = chdir(sysfs_path_start); ++ if (ret) { ++ perr(sysfs_path_start); ++ return ret; ++ } ++ ++ /* ++ * First, check if /sys/class/tty// exists. ++ */ ++ ++ dbg("Checking sysfs path: %s/%s", sysfs_path_start, device_name); ++ ++ ret = stat(device_name,&s); ++ if (ret< 0) { ++ perr(device_name); ++ goto Done; ++ } ++ ++ if (!S_ISDIR(s.st_mode)) { ++ errno = -ENOTDIR; ++ err("%s is not a TTY device.", device_name); ++ goto Done; ++ } ++ ++ dbg("%s is a registered TTY device", device_name); ++ ++ fchdir(cur_fd); ++ ++ ++ /* ++ * Check if device node exists and is writable ++ */ ++ chdir("/dev"); ++ ++ ret = stat(device_name,&s); ++ if (ret< 0) { ++ perr("/dev/%s (device node)", device_name); ++ goto Done; ++ } ++ ++ if (!S_ISCHR(s.st_mode)) { ++ errno = -ENOTTY; ++ ret = -1; ++ err("%s is not a TTY character device.", device_name); ++ goto Done; ++ } ++ ++ dbg("%s has a device node", device_name); ++ ++ ret = access(device_name, R_OK | W_OK); ++ if (ret) { ++ perr("%s: Not writable?", device_name); ++ goto Done; ++ } ++ ++ ret = open(device_name, O_RDWR | O_NONBLOCK); ++ if (ret< 0) { ++ perr("Could not open %s"); ++ goto Done; ++ } ++ *dev_fd = ret; ++ ret = 0; ++Done: ++ fchdir(cur_fd); ++ close(cur_fd); ++ return ret; ++} ++ ++ ++static int setup_serial_device(int dev_fd) ++{ ++ struct termios t; ++ int ret; ++ ++ ret = tcgetattr(dev_fd,&t); ++ if (ret) ++ return ret; ++ ++ cfmakeraw(&t); ++ cfsetispeed(&t, B115200); ++ cfsetospeed(&t, B115200); ++ tcflush(dev_fd, TCIFLUSH); ++ ++ t.c_iflag |= IGNPAR; ++ t.c_cflag&= ~CSTOPB; ++ ret = tcsetattr(dev_fd, TCSANOW,&t); ++ ++ if (ret) { ++ perr("setting terminal attributes"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++ ++static int wu_write(int fd, struct wu_packet * p) ++{ ++ int ret; ++ int n; ++ int i; ++ char * s = p->buf; ++ ++ memset(p->buf, 0, sizeof(p->buf)); ++ n = sprintf(p->buf, "#%c,%c,%d", p->cmd, p->sub_cmd, p->count); ++ p->len = n; ++ s = p->buf + n; ++ ++ for (i = 0; i< p->count; i++) { ++ if ((p->len + strlen(p->field[i]) + 4)>= sizeof(p->buf)) { ++ err("Overflowed command string"); ++ return ret_err(EOVERFLOW); ++ } ++ n = sprintf(s, ",%s", p->field[i]); ++ s += n; ++ p->len += n; ++ } ++ p->buf[p->len++] = ';'; ++ ++ dbg("Writing '%s' (strlen = %d) (len = %d) to device", ++ p->buf, strlen(p->buf), p->len); ++ ret = write(fd, p->buf, p->len); ++ if (ret != p->len) ++ perr("Writing to device"); ++ ++ return ret>= 0 ? 0 : ret; ++} ++ ++ ++static void dump_packet(struct wu_packet * p) ++{ ++ int i; ++ ++ dbg("Packet - Command '%c' %d parameters", p->cmd, p->count); ++ ++ for (i = 0; i< p->count; i++) ++ dbg("[%2d] [%20s] = \"%s\"", i, p->label[i], p->field[i]); ++} ++ ++ ++static int parse_packet(struct wu_packet * p) ++{ ++ char * s, *next; ++ int i; ++ ++ p->buf[p->len] = '\0'; ++ ++ dbg("Parsing Packet, Raw buffer is (%d bytes) [%s]", ++ p->len, p->buf); ++ ++ s = p->buf; ++ ++ /* ++ * First character should be '#' ++ */ ++ if (s) { ++ s = strchr(s, '#'); ++ if (s) ++ s++; ++ else { ++ dbg("Invalid packet"); ++ return ret_err(EFAULT); ++ } ++ } else { ++ dbg("Invalid packet"); ++ return ret_err(EFAULT); ++ } ++ ++ /* ++ * Command character is first ++ */ ++ next = strchr(s, ','); ++ if (next) { ++ p->cmd = *s; ++ s = ++next; ++ } else { ++ dbg("Invalid Command field [%s]", s); ++ return ret_err(EFAULT); ++ } ++ ++ /* ++ * Next character is the subcommand, and should be '-' ++ * Though, it doesn't matter, because we just ++ * discard it anyway. ++ */ ++ next = strchr(s, ','); ++ if (next) { ++ p->sub_cmd = *s; ++ s = ++next; ++ } else { ++ dbg("Invalid 2nd field"); ++ return ret_err(EFAULT); ++ } ++ ++ /* ++ * Next is the number of parameters, ++ * which should always be> 0. ++ */ ++ next = strchr(s, ','); ++ if (next) { ++ *next++ = '\0'; ++ p->count = atoi(s); ++ s = next; ++ } else { ++ dbg("Couldn't determine number of parameters"); ++ return ret_err(EFAULT); ++ } ++ ++ dbg("Have %d parameter%s (cmd = '%c')", ++ p->count, p->count> 1 ? "s" : "", p->cmd); ++ ++ /* ++ * Now, we loop over the rest of the string, ++ * storing a pointer to each in p->field[]. ++ * ++ * The last character was originally a ';', but may have been ++ * overwritten with a '\0', so we make sure to catch ++ * that when converting the last parameter. ++ */ ++ for (i = 0; i< p->count; i++) { ++ next = strpbrk(s, ",;"); ++ if (next) { ++ *next++ = '\0'; ++ } else { ++ if (i< (p->count - 1)) { ++ dbg("Malformed parameter string [%s]", s); ++ return ret_err(EFAULT); ++ } ++ } ++ ++ /* ++ * Skip leading white space in fields ++ */ ++ while (isspace(*s)) ++ s++; ++ p->field[i] = s; ++ s = next; ++ } ++ dump_packet(p); ++ return 0; ++} ++ ++ ++static int wu_read(int fd, struct wu_packet * p) ++{ ++ fd_set read_fd; ++ struct timeval tv; ++ int ret; ++ ++ FD_ZERO(&read_fd); ++ FD_SET(fd,&read_fd); ++ ++ tv.tv_sec = 2; ++ tv.tv_usec = 0; ++ ++ ret = select(fd + 1,&read_fd, NULL, NULL,&tv); ++ if (ret< 0) { ++ perr("select on terminal device"); ++ return ret; ++ } else if (ret> 0) { ++ ++ ret = read(fd, p->buf, wu_strlen); ++ if (ret< 0) { ++ perr("Reading from device"); ++ return ret; ++ } ++ p->len = ret; ++ } else { ++ dbg("Device timed out while reading"); ++ return ret_err(ETIME); ++ } ++ return parse_packet(p); ++} ++ ++ ++static int wu_show_header(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'H', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "watts header", ++ [1] = "volts header", ++ [2] = "amps header", ++ [3] = "kWh header", ++ [4] = "cost header", ++ [5] = "mo. kWh header", ++ [6] = "mo. cost header", ++ [7] = "max watts header", ++ [8] = "max volts header", ++ [9] = "max amps header", ++ [10] = "min watts header", ++ [11] = "min volts header", ++ [12] = "min amps header", ++ [13] = "power factor header", ++ [14] = "duty cycle header", ++ [15] = "power cycle header", ++ } ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting header strings"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading header strings"); ++ return ret; ++ } ++ ++ print_packet(&p, "Header Record"); ++ ++ return 0; ++} ++ ++ ++static int wu_show_cal(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'F', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "flags", ++ [1] = "sample count", ++ [2] = "volts gain", ++ [3] = "volts bias", ++ [4] = "amps gain", ++ [5] = "amps bias", ++ [6] = "amps offset", ++ [7] = "low amps gain", ++ [8] = "low amps bias", ++ [9] = "low amps offset", ++ [10] = "watts gain", ++ [11] = "watts offset", ++ [12] = "low watts gain", ++ [13] = "low watts offset", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting calibration parameters"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading header strings"); ++ return ret; ++ } ++ print_packet(&p, "Calibration Settings"); ++ ++ return 0; ++} ++ ++static int wu_start_log(void) ++{ ++ struct wu_packet p = { ++ .cmd = 'L', ++ .sub_cmd = 'W', ++ .count = 3, ++ .field = { ++ [0] = "E", ++ [1] = "1", ++ [2] = "1", ++ }, ++ }; ++ int ret; ++ ++ /* ++ * Start up logging ++ */ ++ ret = wu_write(wu_fd,&p); ++ if (!ret) ++ sleep(1); ++ else { ++ perr("Starting External Logging"); ++ return ret; ++ } ++ return ret; ++} ++ ++static int wu_stop_log(void) ++{ ++ struct wu_packet p = { ++ .cmd = 'L', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "time stamp", ++ [1] = "interval", ++ }, ++ }; ++ int ret; ++ ++ /* ++ * Stop logging and read time stamp. ++ */ ++ ret = wu_write(wu_fd,&p); ++ if (ret) { ++ perr("Stopping External Logging"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(wu_fd,&p); ++ if (ret) { ++ perr("Reading final time stamp"); ++ return ret; ++ } ++ if (wu_final) ++ print_packet(&p, "Final Time Stamp and Interval"); ++ return ret; ++} ++ ++static int filter_data(struct wu_packet * p, int i, char * buf) ++{ ++ if (i< wu_num_fields) { ++ if (wu_fields[i].enable) { ++ double val = strtod(p->field[i], NULL); ++ snprintf(buf, 256, "%.1f", val / 10.0); ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++static int wu_clear(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'R', ++ .sub_cmd = 'W', ++ .count = 0, ++ }; ++ int ret; ++ ++ /* ++ * Clear the memory ++ */ ++ ret = wu_write(fd,&p); ++ if (ret) ++ perr("Clearing memory"); ++ else ++ sleep(2); ++ ++ /* ++ * Dummy read ++ */ ++ wu_read(fd,&p); ++ return ret; ++ ++} ++ ++static int wu_read_data(int fd) ++{ ++ struct wu_packet p = { ++ .label = { ++ [0] = "watts", ++ [1] = "volts", ++ [2] = "amps", ++ [3] = "watt hours", ++ [4] = "cost", ++ [5] = "mo. kWh", ++ [6] = "mo. cost", ++ [7] = "max watts", ++ [8] = "max volts", ++ [9] = "max amps", ++ [10] = "min watts", ++ [11] = "min volts", ++ [12] = "min amps", ++ [13] = "power factor", ++ [14] = "duty cycle", ++ [15] = "power cycle", ++ }, ++ }; ++ int num_read = 0; ++ int retry = 0; ++ int ret; ++ int i; ++ ++ static const int wu_max_retry = 2; ++ ++ i = 0; ++ while (1) { ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ if (++retry< wu_max_retry) { ++ dbg("Bad record back, retrying\n"); ++ sleep(wu_interval); ++ continue; ++ } else if (retry == wu_max_retry) { ++ dbg("Still couldn't get a good record, resetting\n"); ++ wu_stop_log(); ++ wu_clear(fd); ++ wu_start_log(); ++ num_read = 0; ++ sleep(wu_interval); ++ continue; ++ } ++ perr("Blech. Giving up on read"); ++ break; ++ } else if (retry) ++ retry = 0; ++ ++ dbg("[%d] ", num_read); ++ num_read++; ++ print_packet_filter(&p, filter_data); ++ ++ if (wu_count&& (++i == wu_count)) ++ break; ++ ++ sleep(wu_interval); ++ } ++ return 0; ++ ++} ++ ++ ++static int wu_show_interval(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'S', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "reserved", ++ [1] = "interval", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting interval"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading interval"); ++ return ret; ++ } ++ print_packet(&p, "Interval Settings"); ++ ++ return 0; ++} ++ ++static int wu_write_interval(int fd, unsigned int seconds, ++ unsigned int interval) ++{ ++ char str_seconds[wu_param_len]; ++ char str_interval[wu_param_len]; ++ struct wu_packet p = { ++ .cmd = 'S', ++ .sub_cmd = 'W', ++ .count = 2, ++ .field = { ++ [0] = str_seconds, ++ [1] = str_interval, ++ }, ++ }; ++ int ret; ++ ++ snprintf(str_seconds, wu_param_len, "%ud", seconds); ++ snprintf(str_interval, wu_param_len, "%ud", interval); ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Setting Sampling Interval"); ++ return ret; ++ } ++ sleep(1); ++ return 0; ++} ++ ++static int wu_store_interval(int fd) ++{ ++ char * s = wu_option_value(wu_option_interval); ++ char * end; ++ ++ wu_interval = strtol(s,&end, 0); ++ if (*end) { ++ err("Invalid interval: %s", s); ++ return ret_err(EINVAL); ++ } ++ return wu_write_interval(fd, 1, wu_interval); ++} ++ ++static int wu_show_mode(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'M', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "display mode", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting device display mode"); ++ return ret; ++ } ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reaing device display mode"); ++ return ret; ++ } ++ dump_packet(&p); ++ return ret; ++} ++ ++static int wu_write_mode(int fd, int mode) ++{ ++ char str_mode[wu_param_len]; ++ struct wu_packet p = { ++ .cmd = 'M', ++ .sub_cmd = 'W', ++ .count = 1, ++ .field = { ++ [0] = str_mode, ++ }, ++ }; ++ int ret; ++ ++ snprintf(str_mode, wu_param_len, "%ud", mode); ++ ret = wu_write(fd,&p); ++ if (ret) ++ perr("Setting device display mode"); ++ else ++ sleep(1); ++ return ret; ++} ++ ++static int wu_store_mode(int fd) ++{ ++ char * s = wu_option_value(wu_option_mode); ++ char * end; ++ unsigned int mode; ++ ++ mode = strtol(s,&end, 0); ++ if (*end) { ++ err("Invalid mode: %s", s); ++ return ret_err(EINVAL); ++ } ++ return wu_write_mode(fd, mode); ++} ++ ++ ++ ++static int wu_show_user(int fd) ++{ ++ struct wu_packet p = { ++ .cmd = 'U', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = "cost per kWh", ++ [1] = "2nd tier cost", ++ [2] = "2nd tier threshold", ++ [3] = "duty cycle threshold", ++ }, ++ }; ++ int ret; ++ ++ ret = wu_write(fd,&p); ++ if (ret) { ++ perr("Requesting user parameters"); ++ return ret; ++ } ++ sleep(1); ++ ++ ret = wu_read(fd,&p); ++ if (ret) { ++ perr("Reading user parameters"); ++ return ret; ++ } ++ print_packet(&p, "User Settings"); ++ return 0; ++} ++ ++ ++static int wu_write_user(int fd, unsigned int kwh_cost, ++ unsigned int second_tier_cost, ++ unsigned int second_tier_threshold, ++ unsigned int duty_cycle_threshold) ++{ ++ char str_kwh_cost[wu_param_len]; ++ char str_2nd_tier_cost[wu_param_len]; ++ char str_2nd_tier_threshold[wu_param_len]; ++ char str_duty_cycle_threshold[wu_param_len]; ++ ++ struct wu_packet p = { ++ .cmd = 'U', ++ .sub_cmd = 'R', ++ .count = 0, ++ .label = { ++ [0] = str_kwh_cost, ++ [1] = str_2nd_tier_cost, ++ [2] = str_2nd_tier_threshold, ++ [3] = str_duty_cycle_threshold, ++ }, ++ }; ++ int ret; ++ ++ snprintf(str_kwh_cost, wu_param_len, "%ud", kwh_cost); ++ snprintf(str_2nd_tier_cost, wu_param_len, "%ud", ++ second_tier_cost); ++ snprintf(str_2nd_tier_threshold, wu_param_len, "%ud", ++ second_tier_threshold); ++ snprintf(str_duty_cycle_threshold, wu_param_len, "%ud", ++ duty_cycle_threshold); ++ ++ ret = wu_write(fd,&p); ++ if (ret) ++ perr("Writing user parameters"); ++ else ++ sleep(1); ++ return ret; ++} ++ ++static int wu_store_user(int fd) ++{ ++ unsigned int kwh_cost; ++ unsigned int second_tier_cost; ++ unsigned int second_tier_threshold; ++ unsigned int duty_cycle_threshold; ++ char * buf = wu_option_value(wu_option_user); ++ char * s = buf; ++ char * next; ++ ++ if (!buf) { ++ err("No user parameters?"); ++ return ret_err(EINVAL); ++ } ++ ++ kwh_cost = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ ++ second_tier_cost = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ ++ second_tier_threshold = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ ++ duty_cycle_threshold = strtoul(s,&next, 0); ++ if (next == s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ s = next; ++ while (s&& !isdigit(*s)) ++ s++; ++ if (!s) { ++ err("Incomplete user parameters"); ++ return ret_err(EINVAL); ++ } ++ ++ return wu_write_user(fd, kwh_cost, second_tier_cost, ++ second_tier_threshold, duty_cycle_threshold); ++} ++ ++ ++static void enable_field(char * name) ++{ ++ int i; ++ ++ for (i = 0; i< wu_num_fields; i++) { ++ if (!strcasecmp(wu_fields[i].name, name)) { ++ wu_fields[i].enable = 1; ++ break; ++ } ++ } ++} ++ ++static void enable_all_fields(void) ++{ ++ int i; ++ ++ for (i = 0; i< wu_num_fields; i++) ++ wu_fields[i].enable = 1; ++} ++ ++ ++ ++static int wu_show_help(int); ++static int wu_show_version(int); ++ ++ ++ ++static int wu_store_count(int unused) ++{ ++ char * s = wu_option_value(wu_option_count); ++ char * end; ++ ++ if (s) { ++ wu_count = strtol(s,&end, 0); ++ if (*end) { ++ err("Bad count field"); ++ return ret_err(EINVAL); ++ } ++ } ++ return 0; ++} ++ ++static int wu_store_debug(int unused) ++{ ++ wu_debug = 1; ++ return 0; ++} ++ ++static int wu_store_delim(int unused) ++{ ++ char * s = wu_option_value(wu_option_delim); ++ ++ if (s) ++ wu_delim = s; ++ return 0; ++} ++ ++static int wu_store_final(int unused) ++{ ++ wu_final = 1; ++ return 0; ++} ++ ++static int wu_store_label(int unused) ++{ ++ wu_label = 1; ++ return 0; ++} ++ ++static int wu_store_newline(int unused) ++{ ++ wu_newline = 1; ++ return 0; ++} ++ ++static int wu_store_suppress(int unused) ++{ ++ wu_suppress = 1; ++ return 0; ++} ++ ++static int wu_store_localtime(int unused) ++{ ++ wu_localtime = 1; ++ return 0; ++} ++ ++static int wu_store_gmtime(int unused) ++{ ++ wu_gmtime = 1; ++ return 0; ++} ++ ++static int wu_store_info_all(int unused) ++{ ++ wu_info_all = 1; ++ return 0; ++} ++ ++static int wu_store_no_data(int unused) ++{ ++ wu_no_data = 1; ++ return 0; ++} ++ ++static int wu_store_set_only(int unused) ++{ ++ wu_set_only = 1; ++ return 0; ++} ++ ++ ++/** ++ * wu_options - command line options and their associated flags ++ * ++ */ ++static struct wu_options wu_options[] = { ++ ++ /* ++ * Help! ++ */ ++ [wu_option_help] = { ++ .longopt = "help", ++ .shortopt = 'h', ++ .param = 0, ++ .descr = "Display help text and exit", ++ .show = wu_show_help, ++ }, ++ ++ [wu_option_version] = { ++ .longopt = "version", ++ .shortopt = 'V', ++ .param = 0, ++ .descr = "Display version information and exit", ++ .show = wu_show_version, ++ }, ++ ++ /* ++ * Modifies the output for all other options ++ */ ++ [wu_option_debug] = { ++ .longopt = "debug", ++ .shortopt = 'd', ++ .param = 0, ++ .descr = "Print out debugging messages", ++ .store = wu_store_debug, ++ }, ++ ++ /* ++ * For data reading.. ++ */ ++ [wu_option_count] = { ++ .longopt = "count", ++ .shortopt = 'c', ++ .param = 1, ++ .descr = "Specify number of data samples", ++ .option = "", ++ .store = wu_store_count, ++ }, ++ ++ [wu_option_final] = { ++ .longopt = "final", ++ .shortopt = 'z', ++ .param = 0, ++ .descr = "Print final interval information", ++ .store = wu_store_final, ++ }, ++ ++ /* ++ * Modifies output for each option (most relevant for data) ++ */ ++ [wu_option_delim] = { ++ .longopt = "delim", ++ .shortopt = 'f', ++ .param = 1, ++ .descr = "Set field delimiter (default \", \")", ++ .option = "", ++ .store = wu_store_delim, ++ }, ++ ++ [wu_option_newline] = { ++ .longopt = "newline", ++ .shortopt = 'n', ++ .param = 0, ++ .descr = "Use '\\n' as delimter instead", ++ .store = wu_store_newline, ++ }, ++ ++ [wu_option_localtime] = { ++ .longopt = "localtime", ++ .shortopt = 't', ++ .param = 0, ++ .descr = "Print localtime with each data reading", ++ .store = wu_store_localtime, ++ }, ++ ++ [wu_option_gmtime] = { ++ .longopt = "gmtime", ++ .shortopt = 'g', ++ .param = 0, ++ .descr = "Print GMT time with each data reading", ++ .store = wu_store_gmtime, ++ }, ++ ++ [wu_option_label] = { ++ .longopt = "label", ++ .shortopt = 'l', ++ .param = 0, ++ .descr = "Show labels of each field", ++ .store = wu_store_label, ++ }, ++ ++ /* ++ * Relevant for each of the fields below ++ */ ++ [wu_option_suppress] = { ++ .longopt = "suppress", ++ .shortopt = 's', ++ .param = 0, ++ .descr = "Suppress printing of the field description", ++ .store = wu_store_suppress, ++ }, ++ ++ /* ++ * These options print values from the device and exit. ++ */ ++ [wu_option_cal] = { ++ .longopt = "calibrate", ++ .shortopt = 'b', ++ .param = 0, ++ .descr = "Print calibration parameters", ++ .show = wu_show_cal, ++ }, ++ ++ [wu_option_header] = { ++ .longopt = "header", ++ .shortopt = 'r', ++ .param = 0, ++ .descr = "Print data field names (as read from device)", ++ .show = wu_show_header, ++ }, ++ ++ /* ++ * These options have an optional parameter. ++ * W/o that parameter, they print values from the device. ++ * W/ that parameter, they set that option and read data. ++ * ++ * Except when the 'set-only' parameter is used, then the ++ * parameters are set, then re-read and printed. ++ */ ++ [wu_option_interval] = { ++ .longopt = "interval", ++ .shortopt = 'i', ++ .param = 2, ++ .descr = "Get/Set sampling interval", ++ .option = "", ++ .show = wu_show_interval, ++ .store = wu_store_interval, ++ }, ++ ++ [wu_option_mode] = { ++ .longopt = "mode", ++ .shortopt = 'm', ++ .param = 2, ++ .descr = "Get/Set display mode", ++ .option = "", ++ .show = wu_show_mode, ++ .store = wu_store_mode, ++ }, ++ ++ [wu_option_user] = { ++ .longopt = "user", ++ .shortopt = 'u', ++ .param = 2, ++ .descr = "Get/Set user parameters", ++ .option = "", ++ .format = ",<2nd tier cost>," ++ "<2nd tier threshold>," ++ "", ++ .show = wu_show_user, ++ .store = wu_store_user, ++ }, ++ ++ [wu_option_info_all] = { ++ .longopt = "show-all", ++ .shortopt = 'a', ++ .param = 0, ++ .descr = "Show all device parameters", ++ .store = wu_store_info_all, ++ }, ++ ++ [wu_option_no_data] = { ++ .longopt = "no-data", ++ .shortopt = 'N', ++ .param = 0, ++ .descr = "Don't read any data (just read device info)", ++ .store = wu_store_no_data, ++ }, ++ ++ [wu_option_set_only] = { ++ .longopt = "set-only", ++ .shortopt = 'S', ++ .param = 0, ++ .descr = "Set parameters only (don't read them back)", ++ .store = wu_store_set_only, ++ }, ++}; ++ ++#define wu_num_options ARRAY_SIZE(wu_options) ++ ++static int wu_show_version(int unused) ++{ ++ printf("%s Version %s\n", prog_name, wu_version); ++ return 0; ++} ++ ++static int wu_show_help(int unused) ++{ ++ int i; ++ int n; ++ ++ wu_show_version(unused); ++ printf(" A program for interfacing with the Watts Up? Power Meter\n"); ++ printf("\n"); ++ ++ printf("Usage: %s [ ... ] [ ... ]\n", ++ prog_name); ++ printf("\n"); ++ ++ printf(" is the serial port the device is connected at.\n"); ++ printf("\n"); ++ ++ printf(" are any of the following:\n"); ++ for (i = 0; i< wu_num_options; i++) { ++ n = printf(" -%c", wu_options[i].shortopt); ++ ++ if (wu_options[i].param == 0) ++ n = printf(" "); ++ else if (wu_options[i].param == 1) ++ n = printf(" %s", wu_options[i].option); ++ else if (wu_options[i].param == 2) ++ n = printf(" [%s]", wu_options[i].option); ++ ++ n += printf("%*c| ", n - 12, ' '); ++ n += printf("--%s", wu_options[i].longopt); ++ ++ if (wu_options[i].param == 0) ++ n += printf(" "); ++ else if (wu_options[i].param == 1) ++ n += printf("=%s", wu_options[i].option); ++ else if (wu_options[i].param == 2) ++ n += printf("[=%s]", wu_options[i].option); ++ ++ printf("%*c%s\n", ++ 40 - n, ' ', wu_options[i].descr); ++ } ++ printf("\n"); ++ printf(" specifies which of these to print out (default: ALL)\n"); ++ for (i = 0; i< wu_num_fields; i++) { ++ printf("%12s -- %s\n", wu_fields[i].name, wu_fields[i].descr); ++ } ++ printf("\n"); ++ ++ return 0; ++} ++ ++ ++static char * wu_option_value(unsigned int index) ++{ ++ return (index< wu_num_options) ? wu_options[index].value : NULL; ++} ++ ++ ++static int wu_check_option_show(int index) ++{ ++ /* ++ * Return 1 if we need to print something out for ++ * a particular option. ++ */ ++ if (index< wu_num_options) { ++ if (wu_options[index].flag) { ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++static int wu_check_option_store(int index) ++{ ++ /* ++ * Return a 1 if this option is set. ++ */ ++ ++ if (index< wu_num_options) { ++ if (wu_options[index].flag) { ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++ ++static int wu_show(int index, int dev_fd) ++{ ++ if (wu_options[index].show) ++ return wu_options[index].show(dev_fd); ++ return 0; ++} ++ ++/* ++ * Check if the option is set, and call its method if so. ++ * Return whether or not we did anything.. ++ */ ++ ++static int wu_check_show(int index, int dev_fd) ++{ ++ if (wu_check_option_show(index)) { ++ wu_show(index, dev_fd); ++ return 1; ++ } ++ return 0; ++} ++ ++ ++/* ++ * Check if the option is set and if so, call it ++ * Return the value from the ->store() method. ++ */ ++ ++static int wu_check_store(int index, int dev_fd) ++{ ++ if (wu_check_option_store(index)) { ++ if (wu_options[index].store) ++ return wu_options[index].store(dev_fd); ++ } ++ return 0; ++} ++ ++ ++static void make_longopt(struct option * l) ++{ ++ int i; ++ ++ for (i = 0; i< wu_num_options; i++) { ++ l[i].name = wu_options[i].longopt; ++ l[i].has_arg = wu_options[i].param; ++ l[i].flag =&wu_options[i].flag; ++ l[i].val = 0; ++ } ++} ++ ++static void make_shortopt(char * str) ++{ ++ int i; ++ char * s = str; ++ ++ for (i = 0; i< wu_num_options; i++) { ++ *s++ = wu_options[i].shortopt; ++ if (wu_options[i].param) ++ *s++ = wu_options[i].param == 1 ? ':' : ';'; ++ } ++} ++ ++static void enable_short_option(int c, char * arg) ++{ ++ int i; ++ ++ /* ++ * Friggin' getopt_long() will return the ++ * character if we get a short option (e.g. '-h'), ++ * instead of returning 0 like it does when it ++ * gets a long option (e.g. "--help"). Ugh. ++ */ ++ for (i = 0; i< wu_num_options; i++) { ++ if (wu_options[i].shortopt == c) { ++ wu_options[i].flag = 1; ++ if (arg) ++ wu_options[i].value = strdup(arg); ++ break; ++ } ++ } ++} ++ ++static int parse_args(int argc, char ** argv) ++{ ++ struct option longopts[wu_num_options + 1] = { }; ++ char shortopts[wu_num_options * 2] = ""; ++ ++ make_longopt(longopts); ++ make_shortopt(shortopts); ++ ++ ++ while (1) { ++ int c; ++ int index; ++ ++ c = getopt_long(argc, argv, shortopts, ++ longopts,&index); ++ if (c == -1) ++ break; ++ ++ switch (c) { ++ case 0: ++ wu_options[index].flag = 1; ++ if (optarg) ++ wu_options[index].value = strdup(optarg); ++ ++ printf("long option: val = %c, optarg = %s\n", ++ wu_options[index].shortopt, optarg); ++ break; ++ case '?': ++ err("Bad parameter"); ++ return ret_err(EINVAL); ++ break; ++ default: ++ enable_short_option(c, optarg); ++ break; ++ } ++ } ++ ++ /* ++ * Check for help request now and bail after ++ * printing it, if it's set. ++ */ ++ if (wu_check_show(wu_option_help, 0)) ++ exit(0); ++ ++ if (wu_check_show(wu_option_version, 0)) ++ exit(0); ++ ++ /* ++ * Fields to print out ++ */ ++ if (optind< argc) { ++ int i; ++ ++ wu_device = argv[optind++]; ++ ++ if (optind< argc) { ++ for (i = optind; i< argc; i++) ++ enable_field(argv[i]); ++ } else ++ enable_all_fields(); ++ ++ } else { ++ wu_show(wu_option_help, 0); ++ return ret_err(EINVAL); ++ } ++ return 0; ++} ++ ++ ++int main(int argc, char ** argv) ++{ ++ int ret; ++ int fd = 0; ++ ++ ret = parse_args(argc, argv); ++ if (ret) ++ return 0; ++ ++ /* ++ * Try to enable debugging early ++ */ ++ if ((ret = wu_check_store(wu_option_debug, 0))) ++ goto Close; ++ ++ ret = open_device(wu_device,&fd); ++ if (ret) ++ return ret; ++ ++ dbg("%s: Open for business", wu_device); ++ ++ ret = setup_serial_device(fd); ++ if (ret) ++ goto Close; ++ ++ wu_clear(fd); ++ ++ wu_fd = fd; ++ ++ /* ++ * Set delimeter before we print out any fields. ++ */ ++ if ((ret = wu_check_store(wu_option_delim, fd))) ++ goto Close; ++ ++ /* ++ * Ditto for 'label' and 'newline' flags. ++ */ ++ if ((ret = wu_check_store(wu_option_label, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_newline, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_suppress, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_localtime, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_gmtime, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_set_only, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_no_data, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_info_all, fd))) ++ goto Close; ++ ++ ++ /* ++ * Options to set device parameters. ++ */ ++ if ((ret = wu_check_store(wu_option_interval, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_mode, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_user, fd))) ++ goto Close; ++ ++ /* ++ * Check for options to print device info ++ */ ++ if (wu_info_all) { ++ wu_show(wu_option_cal, fd); ++ wu_show(wu_option_header, fd); ++ wu_show(wu_option_interval, fd); ++ wu_show(wu_option_mode, fd); ++ wu_show(wu_option_user, fd); ++ } else { ++ wu_check_show(wu_option_cal, fd); ++ wu_check_show(wu_option_header, fd); ++ ++ if (!wu_set_only) { ++ wu_check_show(wu_option_interval, fd); ++ wu_check_show(wu_option_mode, fd); ++ wu_check_show(wu_option_user, fd); ++ } ++ } ++ ++ if (!wu_no_data) { ++ ++ if ((ret = wu_check_store(wu_option_count, fd))) ++ goto Close; ++ ++ if ((ret = wu_check_store(wu_option_final, fd))) ++ goto Close; ++ ++ if ((ret = wu_start_log())) ++ goto Close; ++ ++ wu_read_data(fd); ++ ++ wu_stop_log(); ++ } ++Close: ++ close(fd); ++ return ret; ++} ++ ++ +diff --git a/feeds/packages/utils/wifitoggle/.svn/entries b/feeds/packages/utils/wifitoggle/.svn/entries +new file mode 100644 +index 0000000..a778d51 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wifitoggle ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-31T12:47:50.983302Z ++35415 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++c7c6bbe71189d4ca058ffb160846050b ++2013-01-31T12:47:50.983302Z ++35415 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1082 ++ +diff --git a/feeds/packages/utils/wifitoggle/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/wifitoggle/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b3154b6 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2010-2013 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:=3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wifitoggle ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Script to toggle Wi-Fi with a button and UCI config ++ MAINTAINER:=Nuno Goncalves ++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/feeds/packages/utils/wifitoggle/Makefile b/feeds/packages/utils/wifitoggle/Makefile +new file mode 100644 +index 0000000..b3154b6 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/Makefile +@@ -0,0 +1,43 @@ ++# ++# Copyright (C) 2010-2013 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:=3 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wifitoggle ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=Script to toggle Wi-Fi with a button and UCI config ++ MAINTAINER:=Nuno Goncalves ++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/feeds/packages/utils/wifitoggle/files/.svn/entries b/feeds/packages/utils/wifitoggle/files/.svn/entries +new file mode 100644 +index 0000000..12658f3 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wifitoggle/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-01-31T12:47:50.983302Z ++35415 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wifitoggle.hotplug ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++74b7ca31d90a45622c9e41ca9a8da839 ++2013-01-31T12:47:50.983302Z ++35415 ++jow ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4922 ++ ++wifitoggle.config ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++dd59d0366aac3b619db733640a106599 ++2011-11-18T23:13:31.903529Z ++29247 ++nico ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++261 ++ +diff --git a/feeds/packages/utils/wifitoggle/files/.svn/prop-base/wifitoggle.config.svn-base b/feeds/packages/utils/wifitoggle/files/.svn/prop-base/wifitoggle.config.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/.svn/prop-base/wifitoggle.config.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/wifitoggle/files/.svn/prop-base/wifitoggle.hotplug.svn-base b/feeds/packages/utils/wifitoggle/files/.svn/prop-base/wifitoggle.hotplug.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/.svn/prop-base/wifitoggle.hotplug.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/packages/utils/wifitoggle/files/.svn/text-base/wifitoggle.config.svn-base b/feeds/packages/utils/wifitoggle/files/.svn/text-base/wifitoggle.config.svn-base +new file mode 100644 +index 0000000..f3bec29 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/.svn/text-base/wifitoggle.config.svn-base +@@ -0,0 +1,11 @@ ++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/feeds/packages/utils/wifitoggle/files/.svn/text-base/wifitoggle.hotplug.svn-base b/feeds/packages/utils/wifitoggle/files/.svn/text-base/wifitoggle.hotplug.svn-base +new file mode 100644 +index 0000000..174693e +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/.svn/text-base/wifitoggle.hotplug.svn-base +@@ -0,0 +1,167 @@ ++# /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 ++ wifi ++} ++ ++ ++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/feeds/packages/utils/wifitoggle/files/wifitoggle.config b/feeds/packages/utils/wifitoggle/files/wifitoggle.config +new file mode 100755 +index 0000000..f3bec29 +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/wifitoggle.config +@@ -0,0 +1,11 @@ ++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/feeds/packages/utils/wifitoggle/files/wifitoggle.hotplug b/feeds/packages/utils/wifitoggle/files/wifitoggle.hotplug +new file mode 100755 +index 0000000..174693e +--- /dev/null ++++ b/feeds/packages/utils/wifitoggle/files/wifitoggle.hotplug +@@ -0,0 +1,167 @@ ++# /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 ++ wifi ++} ++ ++ ++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/feeds/packages/utils/wview/.svn/entries b/feeds/packages/utils/wview/.svn/entries +new file mode 100644 +index 0000000..d5d39c3 +--- /dev/null ++++ b/feeds/packages/utils/wview/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wview ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-13T20:04:10.117337Z ++33177 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++files ++dir ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++193500822392232f9b6c7dc4087a4455 ++2012-08-13T20:04:10.117337Z ++33177 ++blogic ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11451 ++ +diff --git a/feeds/packages/utils/wview/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/wview/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..72fe4df +--- /dev/null ++++ b/feeds/packages/utils/wview/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,170 @@ ++# ++# Copyright (C) 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:=wview ++PKG_VERSION:=5.19.0-jgoerzen ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++PKG_SOURCE_URL:=git://github.com/jgoerzen/wview.git ++PKG_SOURCE_VERSION:=7bfac6c11e756290c38e7b5862a4c51b6bc6c51e ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wview ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libcurl +zlib +libpng +libgd +libreadline +libsqlite3 +libusb-1.0 +radlib +sqlite3-cli ++ TITLE:=Wview Weather Station Software ++ URL:=http://www.wviewweather.com/ ++endef ++ ++define Package/wview/description ++ Wview is a collection of linux/unix daemons which interface with a supported ++ weather station to retrieve archive records (if generated by the station) and ++ current conditions. If the station does not generate archive records ++ internally, wview will auto-generate archive records based on the sensor ++ readings collected for that interval. The archive records and High/Low (HILOW) ++ data are stored in SQLite3 databases. At a configurable interval, wview will ++ utilize the archive history and current conditions to generate weather images ++ (buckets, dials and graphs) and HTML web pages based on user-configurable HTML ++ templates. ++ ++ After install you need to create a directory holding archive and create the ++ database there by running there ++ sqlite3 wview-archive.sdb '.read /etc/wview/wview-archive.sql' ++ ++ Then copy all your theme files to the appropriate place (on a non-volatile ++ storage), and html-templates.conf to /etc/wview/; then wviewconfig to configure ++ the system. ++ ++ Read and amend /etc/init.d/wview appropriately for your particular setup! ++endef ++ ++define Package/wview/prerm ++#!/bin/sh ++if [ -z "$${IPKG_INSTROOT}" ]; then ++ echo "Removing rc.d symlink for wview" ++ /etc/init.d/wview disable ++fi ++exit 0 ++endef ++ ++define Package/wview/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cwop/wvcwopd $(1)/usr/bin/wvcwopd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/http/wvhttpd $(1)/usr/bin/wvhttpd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/procmon/wvpmond $(1)/usr/bin/wvpmond ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/hilowcreate/hilowcreate $(1)/usr/bin/hilowcreate ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/sqlite2wlk/sqlite2wlk $(1)/usr/bin/sqlite2wlk ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/htmlgenerator/htmlgend $(1)/usr/bin/htmlgend ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/VantagePro/vpconfig/vpinstall $(1)/usr/bin/vpinstall ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftp/wviewftpd $(1)/usr/bin/wviewftpd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssh/wviewsshd $(1)/usr/bin/wviewsshd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/Virtual/wviewd_virtual $(1)/usr/bin/wviewd_virtual ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/archive-be2le/arc_be2le $(1)/usr/bin/arc_be2le ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/archive-le2be/arc_le2be $(1)/usr/bin/arc_le2be ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/alarms/wvalarmd $(1)/usr/bin/wvalarmd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/wlk2sqlite/wlk2sqlite $(1)/usr/bin/wlk2sqlite ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/Simulator/wviewd_sim $(1)/usr/bin/wviewd_sim ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/TWI/wviewd_twi $(1)/usr/bin/wviewd_twi ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/VantagePro/wviewd_vpro $(1)/usr/bin/wviewd_vpro ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wviewconfig/wviewconfig $(1)/usr/bin/wviewconfig ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wviewconfig/wviewhtmlconfig $(1)/usr/bin/wviewhtmlconfig ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WH1080/wviewd_wh1080 $(1)/usr/bin/wviewd_wh1080 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WMR918/wviewd_wmr918 $(1)/usr/bin/wviewd_wmr918 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WS-2300/wviewd_ws2300 $(1)/usr/bin/wviewd_ws2300 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WMRUSB/wviewd_wmrusb $(1)/usr/bin/wviewd_wmrusb ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WXT510/wviewd_wxt510 $(1)/usr/bin/wviewd_wxt510 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/VantagePro/vpconfig/vpconfig $(1)/usr/bin/vpconfig ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wviewconfig/wviewcleardata $(1)/usr/bin/wviewcleardata ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/TE923/wviewd_te923 $(1)/usr/bin/wviewd_te923 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WXT510/wxt510config/wxt510config $(1)/usr/bin/wxt510config ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/etc/init.d/wview $(1)/etc/init.d/ ++ $(INSTALL_DIR) $(1)/etc/wview ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/wview-conf.sql $(1)/etc/wview/wview-conf.sql ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/graphics.conf $(1)/etc/wview/graphics.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/post-generate.sh $(1)/etc/wview/post-generate.sh ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/images.conf $(1)/etc/wview/images.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/images-user.conf $(1)/etc/wview/images-user.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/arcrec-header.conf $(1)/etc/wview/arcrec-header.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/pre-generate.sh $(1)/etc/wview/pre-generate.sh ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/wview-conf-update.sql $(1)/etc/wview/wview-conf-update.sql ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/forecast.conf-no-forecast $(1)/etc/wview/forecast.conf-no-forecast ++ echo $(PKG_VERSION) > $(1)/etc/wview/wview-version ++ echo wviewd_sim > $(1)/etc/wview/wview-binary ++ ++# This should never be defined as the user is expected to manually install all the ++# theme files he wants to an appropriate place and to specify that place in the config. ++# Leaving here for the future reference to be able to prepare a full variant of the package ++ifdef INSTALL_TEMPLATES ++ $(INSTALL_DIR) $(1)/etc/wview/html ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/Template-Skins-HOWTO.txt $(1)/etc/wview/html/Template-Skins-HOWTO.txt ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/parameterlist.htx $(1)/etc/wview/html/parameterlist.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/parameterlist.txt $(1)/etc/wview/html/parameterlist.txt ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/awekas_wl.htx-metric $(1)/etc/wview/html/awekas_wl.htx-metric ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Current.htx $(1)/etc/wview/html/Current.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/html-templates.conf $(1)/etc/wview/html/html-templates.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Weekly.htx $(1)/etc/wview/html/Weekly.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Monthly.htx $(1)/etc/wview/html/Monthly.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/data.htx $(1)/etc/wview/html/data.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/index-day.htx $(1)/etc/wview/html/index-day.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Yearly.htx $(1)/etc/wview/html/Yearly.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Daily.htx $(1)/etc/wview/html/Daily.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/almanac.htx $(1)/etc/wview/html/almanac.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/header-big.incx $(1)/etc/wview/html/header-big.incx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/index.htx $(1)/etc/wview/html/index.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/awekas_wl.htx-us $(1)/etc/wview/html/awekas_wl.htx-us ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Current_Conditions.htx $(1)/etc/wview/html/Current_Conditions.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/header.incx $(1)/etc/wview/html/header.incx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/index-night.htx $(1)/etc/wview/html/index-night.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/wxrss.xtx $(1)/etc/wview/html/wxrss.xtx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/readings.incx $(1)/etc/wview/html/readings.incx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/nav-buttons.incx $(1)/etc/wview/html/nav-buttons.incx ++ $(INSTALL_DIR) $(1)/etc/wview/alarms ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/examples/alarms/outtempMax.sh $(1)/etc/wview/alarms/outtempMax.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/examples/alarms/outtempMin.sh $(1)/etc/wview/alarms/outtempMin.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/examples/alarms/outtempMaxEmail.sh $(1)/etc/wview/alarms/outtempMaxEmail.sh ++ $(INSTALL_DIR) $(1)/var/run/wview ++ $(INSTALL_DIR) $(1)/var/wview/img ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-partlycloudy.gif $(1)/var/wview/img/fc-icon-partlycloudy.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-rain.gif $(1)/var/wview/img/fc-icon-rain.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/chart_bg.png $(1)/var/wview/img/chart_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/dot_bg.png $(1)/var/wview/img/dot_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-snowandrain.gif $(1)/var/wview/img/fc-icon-snowandrain.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/Clouds.jpg $(1)/var/wview/img/Clouds.jpg ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/Clouds-blue.jpg $(1)/var/wview/img/Clouds-blue.jpg ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-partlycloudyandsnow.gif $(1)/var/wview/img/fc-icon-partlycloudyandsnow.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/dial_bg.png $(1)/var/wview/img/dial_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-snow.gif $(1)/var/wview/img/fc-icon-snow.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/bucket_bg.png $(1)/var/wview/img/bucket_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-cloudy.gif $(1)/var/wview/img/fc-icon-cloudy.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/django_bg.jpg $(1)/var/wview/img/django_bg.jpg ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-sunny.gif $(1)/var/wview/img/fc-icon-sunny.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-partlycloudyandrain.gif $(1)/var/wview/img/fc-icon-partlycloudyandrain.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/above-clouds.jpg $(1)/var/wview/img/above-clouds.jpg ++ ++# These files and the directories should be created manually wherever the user is going to ++# have her weather archive and the generated html files ++ $(INSTALL_DIR) $(1)/var/wview/img/NOAA ++ $(INSTALL_DIR) $(1)/var/wview/img/Archive ++ $(INSTALL_DIR) $(1)/var/wview/noaa ++ $(INSTALL_DIR) $(1)/var/wview/alarms ++ $(INSTALL_DIR) $(1)/var/wview/archive ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/archive/wview-archive.sql $(1)/var/wview/archive/wview-archive.sql ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/archive/readme.txt $(1)/var/wview/archive/readme.txt ++endif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/archive/wview-archive.sql $(1)/etc/wview/wview-archive.sql ++endef ++ ++$(eval $(call BuildPackage,wview)) ++ +diff --git a/feeds/packages/utils/wview/Makefile b/feeds/packages/utils/wview/Makefile +new file mode 100644 +index 0000000..72fe4df +--- /dev/null ++++ b/feeds/packages/utils/wview/Makefile +@@ -0,0 +1,170 @@ ++# ++# Copyright (C) 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:=wview ++PKG_VERSION:=5.19.0-jgoerzen ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++PKG_SOURCE_URL:=git://github.com/jgoerzen/wview.git ++PKG_SOURCE_VERSION:=7bfac6c11e756290c38e7b5862a4c51b6bc6c51e ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz ++ ++PKG_FIXUP:=autoreconf ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wview ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libcurl +zlib +libpng +libgd +libreadline +libsqlite3 +libusb-1.0 +radlib +sqlite3-cli ++ TITLE:=Wview Weather Station Software ++ URL:=http://www.wviewweather.com/ ++endef ++ ++define Package/wview/description ++ Wview is a collection of linux/unix daemons which interface with a supported ++ weather station to retrieve archive records (if generated by the station) and ++ current conditions. If the station does not generate archive records ++ internally, wview will auto-generate archive records based on the sensor ++ readings collected for that interval. The archive records and High/Low (HILOW) ++ data are stored in SQLite3 databases. At a configurable interval, wview will ++ utilize the archive history and current conditions to generate weather images ++ (buckets, dials and graphs) and HTML web pages based on user-configurable HTML ++ templates. ++ ++ After install you need to create a directory holding archive and create the ++ database there by running there ++ sqlite3 wview-archive.sdb '.read /etc/wview/wview-archive.sql' ++ ++ Then copy all your theme files to the appropriate place (on a non-volatile ++ storage), and html-templates.conf to /etc/wview/; then wviewconfig to configure ++ the system. ++ ++ Read and amend /etc/init.d/wview appropriately for your particular setup! ++endef ++ ++define Package/wview/prerm ++#!/bin/sh ++if [ -z "$${IPKG_INSTROOT}" ]; then ++ echo "Removing rc.d symlink for wview" ++ /etc/init.d/wview disable ++fi ++exit 0 ++endef ++ ++define Package/wview/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/cwop/wvcwopd $(1)/usr/bin/wvcwopd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/http/wvhttpd $(1)/usr/bin/wvhttpd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/procmon/wvpmond $(1)/usr/bin/wvpmond ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/hilowcreate/hilowcreate $(1)/usr/bin/hilowcreate ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/sqlite2wlk/sqlite2wlk $(1)/usr/bin/sqlite2wlk ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/htmlgenerator/htmlgend $(1)/usr/bin/htmlgend ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/VantagePro/vpconfig/vpinstall $(1)/usr/bin/vpinstall ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftp/wviewftpd $(1)/usr/bin/wviewftpd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssh/wviewsshd $(1)/usr/bin/wviewsshd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/Virtual/wviewd_virtual $(1)/usr/bin/wviewd_virtual ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/archive-be2le/arc_be2le $(1)/usr/bin/arc_be2le ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/archive-le2be/arc_le2be $(1)/usr/bin/arc_le2be ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/alarms/wvalarmd $(1)/usr/bin/wvalarmd ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/wlk2sqlite/wlk2sqlite $(1)/usr/bin/wlk2sqlite ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/Simulator/wviewd_sim $(1)/usr/bin/wviewd_sim ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/TWI/wviewd_twi $(1)/usr/bin/wviewd_twi ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/VantagePro/wviewd_vpro $(1)/usr/bin/wviewd_vpro ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wviewconfig/wviewconfig $(1)/usr/bin/wviewconfig ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wviewconfig/wviewhtmlconfig $(1)/usr/bin/wviewhtmlconfig ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WH1080/wviewd_wh1080 $(1)/usr/bin/wviewd_wh1080 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WMR918/wviewd_wmr918 $(1)/usr/bin/wviewd_wmr918 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WS-2300/wviewd_ws2300 $(1)/usr/bin/wviewd_ws2300 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WMRUSB/wviewd_wmrusb $(1)/usr/bin/wviewd_wmrusb ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WXT510/wviewd_wxt510 $(1)/usr/bin/wviewd_wxt510 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/VantagePro/vpconfig/vpconfig $(1)/usr/bin/vpconfig ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/wviewconfig/wviewcleardata $(1)/usr/bin/wviewcleardata ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/TE923/wviewd_te923 $(1)/usr/bin/wviewd_te923 ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations/WXT510/wxt510config/wxt510config $(1)/usr/bin/wxt510config ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) ./files/etc/init.d/wview $(1)/etc/init.d/ ++ $(INSTALL_DIR) $(1)/etc/wview ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/wview-conf.sql $(1)/etc/wview/wview-conf.sql ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/graphics.conf $(1)/etc/wview/graphics.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/post-generate.sh $(1)/etc/wview/post-generate.sh ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/images.conf $(1)/etc/wview/images.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/images-user.conf $(1)/etc/wview/images-user.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/arcrec-header.conf $(1)/etc/wview/arcrec-header.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/pre-generate.sh $(1)/etc/wview/pre-generate.sh ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/wview-conf-update.sql $(1)/etc/wview/wview-conf-update.sql ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/conf/forecast.conf-no-forecast $(1)/etc/wview/forecast.conf-no-forecast ++ echo $(PKG_VERSION) > $(1)/etc/wview/wview-version ++ echo wviewd_sim > $(1)/etc/wview/wview-binary ++ ++# This should never be defined as the user is expected to manually install all the ++# theme files he wants to an appropriate place and to specify that place in the config. ++# Leaving here for the future reference to be able to prepare a full variant of the package ++ifdef INSTALL_TEMPLATES ++ $(INSTALL_DIR) $(1)/etc/wview/html ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/Template-Skins-HOWTO.txt $(1)/etc/wview/html/Template-Skins-HOWTO.txt ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/parameterlist.htx $(1)/etc/wview/html/parameterlist.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/parameterlist.txt $(1)/etc/wview/html/parameterlist.txt ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/awekas_wl.htx-metric $(1)/etc/wview/html/awekas_wl.htx-metric ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Current.htx $(1)/etc/wview/html/Current.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/html-templates.conf $(1)/etc/wview/html/html-templates.conf ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Weekly.htx $(1)/etc/wview/html/Weekly.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Monthly.htx $(1)/etc/wview/html/Monthly.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/data.htx $(1)/etc/wview/html/data.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/index-day.htx $(1)/etc/wview/html/index-day.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Yearly.htx $(1)/etc/wview/html/Yearly.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Daily.htx $(1)/etc/wview/html/Daily.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/almanac.htx $(1)/etc/wview/html/almanac.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/header-big.incx $(1)/etc/wview/html/header-big.incx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/index.htx $(1)/etc/wview/html/index.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/awekas_wl.htx-us $(1)/etc/wview/html/awekas_wl.htx-us ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/Current_Conditions.htx $(1)/etc/wview/html/Current_Conditions.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/header.incx $(1)/etc/wview/html/header.incx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/index-night.htx $(1)/etc/wview/html/index-night.htx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/wxrss.xtx $(1)/etc/wview/html/wxrss.xtx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/readings.incx $(1)/etc/wview/html/readings.incx ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/standard/nav-buttons.incx $(1)/etc/wview/html/nav-buttons.incx ++ $(INSTALL_DIR) $(1)/etc/wview/alarms ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/examples/alarms/outtempMax.sh $(1)/etc/wview/alarms/outtempMax.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/examples/alarms/outtempMin.sh $(1)/etc/wview/alarms/outtempMin.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/examples/alarms/outtempMaxEmail.sh $(1)/etc/wview/alarms/outtempMaxEmail.sh ++ $(INSTALL_DIR) $(1)/var/run/wview ++ $(INSTALL_DIR) $(1)/var/wview/img ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-partlycloudy.gif $(1)/var/wview/img/fc-icon-partlycloudy.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-rain.gif $(1)/var/wview/img/fc-icon-rain.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/chart_bg.png $(1)/var/wview/img/chart_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/dot_bg.png $(1)/var/wview/img/dot_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-snowandrain.gif $(1)/var/wview/img/fc-icon-snowandrain.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/Clouds.jpg $(1)/var/wview/img/Clouds.jpg ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/Clouds-blue.jpg $(1)/var/wview/img/Clouds-blue.jpg ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-partlycloudyandsnow.gif $(1)/var/wview/img/fc-icon-partlycloudyandsnow.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/dial_bg.png $(1)/var/wview/img/dial_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-snow.gif $(1)/var/wview/img/fc-icon-snow.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/bucket_bg.png $(1)/var/wview/img/bucket_bg.png ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-cloudy.gif $(1)/var/wview/img/fc-icon-cloudy.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/django_bg.jpg $(1)/var/wview/img/django_bg.jpg ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-sunny.gif $(1)/var/wview/img/fc-icon-sunny.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/fc-icon-partlycloudyandrain.gif $(1)/var/wview/img/fc-icon-partlycloudyandrain.gif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/examples/html/chrome/static/above-clouds.jpg $(1)/var/wview/img/above-clouds.jpg ++ ++# These files and the directories should be created manually wherever the user is going to ++# have her weather archive and the generated html files ++ $(INSTALL_DIR) $(1)/var/wview/img/NOAA ++ $(INSTALL_DIR) $(1)/var/wview/img/Archive ++ $(INSTALL_DIR) $(1)/var/wview/noaa ++ $(INSTALL_DIR) $(1)/var/wview/alarms ++ $(INSTALL_DIR) $(1)/var/wview/archive ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/archive/wview-archive.sql $(1)/var/wview/archive/wview-archive.sql ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/archive/readme.txt $(1)/var/wview/archive/readme.txt ++endif ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/archive/wview-archive.sql $(1)/etc/wview/wview-archive.sql ++endef ++ ++$(eval $(call BuildPackage,wview)) ++ +diff --git a/feeds/packages/utils/wview/files/.svn/entries b/feeds/packages/utils/wview/files/.svn/entries +new file mode 100644 +index 0000000..c41ebfb +--- /dev/null ++++ b/feeds/packages/utils/wview/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wview/files ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++etc ++dir ++ +diff --git a/feeds/packages/utils/wview/files/etc/.svn/entries b/feeds/packages/utils/wview/files/etc/.svn/entries +new file mode 100644 +index 0000000..c2f4e06 +--- /dev/null ++++ b/feeds/packages/utils/wview/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wview/files/etc ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++init.d ++dir ++ +diff --git a/feeds/packages/utils/wview/files/etc/init.d/.svn/entries b/feeds/packages/utils/wview/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..28b0019 +--- /dev/null ++++ b/feeds/packages/utils/wview/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wview/files/etc/init.d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++wview ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++874abeb4cdbae8126bc2f4179a41d52a ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1638 ++ +diff --git a/feeds/packages/utils/wview/files/etc/init.d/.svn/text-base/wview.svn-base b/feeds/packages/utils/wview/files/etc/init.d/.svn/text-base/wview.svn-base +new file mode 100644 +index 0000000..b212d28 +--- /dev/null ++++ b/feeds/packages/utils/wview/files/etc/init.d/.svn/text-base/wview.svn-base +@@ -0,0 +1,55 @@ ++#!/bin/sh /etc/rc.common ++ ++START=99 ++ ++CONF_DIRECTORY=/etc/wview ++RUN_DIRECTORY=/var/wview ++WVIEW_INSTALL_DIR=/usr/bin ++ ++WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` ++WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE ++ ++WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` ++WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE ++HTMLD_BIN=$WVIEW_INSTALL_DIR/htmlgend ++FTPD_BIN=$WVIEW_INSTALL_DIR/wviewftpd ++SSHD_BIN=$WVIEW_INSTALL_DIR/wviewsshd ++ALARMD_BIN=$WVIEW_INSTALL_DIR/wvalarmd ++CWOPD_BIN=$WVIEW_INSTALL_DIR/wvcwopd ++HTTP_BIN=$WVIEW_INSTALL_DIR/wvhttpd ++RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted ++PMOND_BIN=$WVIEW_INSTALL_DIR/wvpmond ++ ++RADROUTER_PID=$RUN_DIRECTORY/radmrouted.pid ++WVIEWD_PID=$RUN_DIRECTORY/wviewd.pid ++HTMLD_PID=$RUN_DIRECTORY/htmlgend.pid ++FTPD_PID=$RUN_DIRECTORY/wviewftpd.pid ++SSHD_PID=$RUN_DIRECTORY/wviewsshd.pid ++ALARMD_PID=$RUN_DIRECTORY/wvalarmd.pid ++CWOPD_PID=$RUN_DIRECTORY/wvcwopd.pid ++HTTP_PID=$RUN_DIRECTORY/wvhttpd.pid ++PMOND_PID=$RUN_DIRECTORY/wvpmond.pid ++ ++start() { ++ mkdir /mnt/extusb 2> /dev/null ++ mount /dev/sda1 /mnt/extusb 2> /dev/null ++ mkdir $RUN_DIRECTORY 2> /dev/null ++ ln -snf /mnt/extusb/wview-html $CONF_DIRECTORY/html ++ ln -snf /mnt/extusb/wview-data/measurements-archive /var/wview/archive ++ start-stop-daemon -S -x $RADROUTER_BIN -- 1 $RUN_DIRECTORY ++ sleep 1 ++ start-stop-daemon -S -x $WVIEWD_BIN ++ sleep 1 ++ for i in HTMLD ALARMD CWOPD HTTP FTPD SSHD PMOND; do ++ start-stop-daemon -S -x $(eval echo \$$(echo ${i}_BIN)) ++ done ++} ++ ++stop() { ++ for i in RADROUTER WVIEWD HTMLD ALARMD CWOPD HTTP FTPD SSHD PMOND; do ++ PID_FILE=$(eval echo \$$(echo ${i}_PID)) ++ start-stop-daemon -K -s TERM -p $PID_FILE ++ rm -f $PID_FILE ++ done ++} ++ +diff --git a/feeds/packages/utils/wview/files/etc/init.d/wview b/feeds/packages/utils/wview/files/etc/init.d/wview +new file mode 100644 +index 0000000..b212d28 +--- /dev/null ++++ b/feeds/packages/utils/wview/files/etc/init.d/wview +@@ -0,0 +1,55 @@ ++#!/bin/sh /etc/rc.common ++ ++START=99 ++ ++CONF_DIRECTORY=/etc/wview ++RUN_DIRECTORY=/var/wview ++WVIEW_INSTALL_DIR=/usr/bin ++ ++WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` ++WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE ++ ++WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary` ++WVIEWD_BIN=$WVIEW_INSTALL_DIR/$WVIEWD_FILE ++HTMLD_BIN=$WVIEW_INSTALL_DIR/htmlgend ++FTPD_BIN=$WVIEW_INSTALL_DIR/wviewftpd ++SSHD_BIN=$WVIEW_INSTALL_DIR/wviewsshd ++ALARMD_BIN=$WVIEW_INSTALL_DIR/wvalarmd ++CWOPD_BIN=$WVIEW_INSTALL_DIR/wvcwopd ++HTTP_BIN=$WVIEW_INSTALL_DIR/wvhttpd ++RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted ++PMOND_BIN=$WVIEW_INSTALL_DIR/wvpmond ++ ++RADROUTER_PID=$RUN_DIRECTORY/radmrouted.pid ++WVIEWD_PID=$RUN_DIRECTORY/wviewd.pid ++HTMLD_PID=$RUN_DIRECTORY/htmlgend.pid ++FTPD_PID=$RUN_DIRECTORY/wviewftpd.pid ++SSHD_PID=$RUN_DIRECTORY/wviewsshd.pid ++ALARMD_PID=$RUN_DIRECTORY/wvalarmd.pid ++CWOPD_PID=$RUN_DIRECTORY/wvcwopd.pid ++HTTP_PID=$RUN_DIRECTORY/wvhttpd.pid ++PMOND_PID=$RUN_DIRECTORY/wvpmond.pid ++ ++start() { ++ mkdir /mnt/extusb 2> /dev/null ++ mount /dev/sda1 /mnt/extusb 2> /dev/null ++ mkdir $RUN_DIRECTORY 2> /dev/null ++ ln -snf /mnt/extusb/wview-html $CONF_DIRECTORY/html ++ ln -snf /mnt/extusb/wview-data/measurements-archive /var/wview/archive ++ start-stop-daemon -S -x $RADROUTER_BIN -- 1 $RUN_DIRECTORY ++ sleep 1 ++ start-stop-daemon -S -x $WVIEWD_BIN ++ sleep 1 ++ for i in HTMLD ALARMD CWOPD HTTP FTPD SSHD PMOND; do ++ start-stop-daemon -S -x $(eval echo \$$(echo ${i}_BIN)) ++ done ++} ++ ++stop() { ++ for i in RADROUTER WVIEWD HTMLD ALARMD CWOPD HTTP FTPD SSHD PMOND; do ++ PID_FILE=$(eval echo \$$(echo ${i}_PID)) ++ start-stop-daemon -K -s TERM -p $PID_FILE ++ rm -f $PID_FILE ++ done ++} ++ +diff --git a/feeds/packages/utils/wview/patches/.svn/entries b/feeds/packages/utils/wview/patches/.svn/entries +new file mode 100644 +index 0000000..2a39103 +--- /dev/null ++++ b/feeds/packages/utils/wview/patches/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wview/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++010-fix-cross-compile.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++41c00c8f843b5b2255a5254d0702b958 ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++15443 ++ ++020-use-standard-awk.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++0e2d17dcb7839f75476a13eea6b76272 ++2012-08-10T15:49:25.384203Z ++33083 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++580 ++ +diff --git a/feeds/packages/utils/wview/patches/.svn/text-base/010-fix-cross-compile.patch.svn-base b/feeds/packages/utils/wview/patches/.svn/text-base/010-fix-cross-compile.patch.svn-base +new file mode 100644 +index 0000000..59523bf +--- /dev/null ++++ b/feeds/packages/utils/wview/patches/.svn/text-base/010-fix-cross-compile.patch.svn-base +@@ -0,0 +1,499 @@ ++--- a/alarms/Makefile.am +++++ b/alarms/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = wvalarmd ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -36,9 +35,7 @@ wvalarmd_SOURCES = \ ++ wvalarmd_LDADD = ++ ++ # define library directories ++-wvalarmd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvalarmd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/cwop/Makefile.am +++++ b/cwop/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = wvcwopd ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -32,9 +31,7 @@ wvcwopd_SOURCES = \ ++ wvcwopd_LDADD = ++ ++ # define library directories ++-wvcwopd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvcwopd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/ftp/Makefile.am +++++ b/ftp/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewftpd ++ ++ # define include directories ++ INCLUDES = -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -D_GNU_SOURCE ++@@ -33,9 +32,7 @@ wviewftpd_SOURCES = \ ++ wviewftpd_LDADD = -lssl -lcurl ++ ++ # define library directories ++-wviewftpd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewftpd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/htmlgenerator/Makefile.am +++++ b/htmlgenerator/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = htmlgend ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -66,9 +65,7 @@ htmlgend_SOURCES = \ ++ htmlgend_LDADD = ++ ++ # define library directories ++-htmlgend_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-htmlgend_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/http/Makefile.am +++++ b/http/Makefile.am ++@@ -8,9 +8,6 @@ bin_PROGRAMS = wvhttpd ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++- -I/usr/include \ ++- -I/usr/local/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -38,9 +35,7 @@ wvhttpd_SOURCES = \ ++ wvhttpd_LDADD = -lssl -lcurl ++ ++ # define library directories ++-wvhttpd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvhttpd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/procmon/Makefile.am +++++ b/procmon/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = wvpmond ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -33,9 +32,7 @@ wvpmond_SOURCES = \ ++ wvpmond_LDADD = ++ ++ # define library directories ++-wvpmond_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvpmond_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/ssh/Makefile.am +++++ b/ssh/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewsshd ++ ++ # define include directories ++ INCLUDES = -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -D_GNU_SOURCE ++@@ -33,9 +32,7 @@ wviewsshd_SOURCES = \ ++ wviewsshd_LDADD = ++ ++ # define library directories ++-wviewsshd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewsshd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/Simulator/Makefile.am +++++ b/stations/Simulator/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_sim ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -52,9 +51,7 @@ wviewd_sim_SOURCES = \ ++ wviewd_sim_LDADD = ++ ++ # define library directories ++-wviewd_sim_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_sim_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/TE923/Makefile.am +++++ b/stations/TE923/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_te923 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -53,11 +52,9 @@ wviewd_te923_SOURCES = \ ++ ++ if DARWIN ++ wviewd_te923_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c ++-wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation ++ wviewd_te923_LDADD = ++ else ++ wviewd_te923_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c ++-wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib ++ if FREEBSD ++ wviewd_te923_LDADD = -lusb ++ else ++--- a/stations/TWI/Makefile.am +++++ b/stations/TWI/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_twi ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -57,9 +56,7 @@ wviewd_twi_SOURCES = \ ++ wviewd_twi_LDADD = ++ ++ # define library directories ++-wviewd_twi_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_twi_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/VantagePro/Makefile.am +++++ b/stations/VantagePro/Makefile.am ++@@ -9,7 +9,6 @@ bin_PROGRAMS = wviewd_vpro ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -56,9 +55,7 @@ wviewd_vpro_SOURCES = \ ++ wviewd_vpro_LDADD = ++ ++ # define library directories ++-wviewd_vpro_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_vpro_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/VantagePro/vpconfig/Makefile.am +++++ b/stations/VantagePro/vpconfig/Makefile.am ++@@ -13,7 +13,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -D_VP_CONFIG_ONLY \ ++@@ -40,10 +39,8 @@ vpconfig_SOURCES = \ ++ vpconfig_LDADD = ++ ++ # define library directories ++-vpconfig_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-vpconfig_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++ CLEANFILES = $(bin_SCRIPTS) ++--- a/stations/Virtual/Makefile.am +++++ b/stations/Virtual/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_virtual ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -58,9 +57,7 @@ wviewd_virtual_SOURCES = \ ++ wviewd_virtual_LDADD = ++ ++ # define library directories ++-wviewd_virtual_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_virtual_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WH1080/Makefile.am +++++ b/stations/WH1080/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_wh1080 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -53,11 +52,9 @@ wviewd_wh1080_SOURCES = \ ++ ++ if DARWIN ++ wviewd_wh1080_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c ++-wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation ++ wviewd_wh1080_LDADD = ++ else ++ wviewd_wh1080_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c ++-wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib ++ if FREEBSD ++ wviewd_wh1080_LDADD = -lusb ++ else ++--- a/stations/WMR918/Makefile.am +++++ b/stations/WMR918/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_wmr918 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -56,9 +55,7 @@ wviewd_wmr918_SOURCES = \ ++ wviewd_wmr918_LDADD = ++ ++ # define library directories ++-wviewd_wmr918_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_wmr918_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WMRUSB/Makefile.am +++++ b/stations/WMRUSB/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_wmrusb ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -52,11 +51,9 @@ wviewd_wmrusb_SOURCES = \ ++ ++ if DARWIN ++ wviewd_wmrusb_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c ++-wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation ++ wviewd_wmrusb_LDADD = ++ else ++ wviewd_wmrusb_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c ++-wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib ++ if FREEBSD ++ wviewd_wmrusb_LDADD = -lusb ++ else ++--- a/stations/WS-2300/Makefile.am +++++ b/stations/WS-2300/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_ws2300 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -56,9 +55,7 @@ wviewd_ws2300_SOURCES = \ ++ wviewd_ws2300_LDADD = ++ ++ # define library directories ++-wviewd_ws2300_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_ws2300_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WXT510/Makefile.am +++++ b/stations/WXT510/Makefile.am ++@@ -10,7 +10,6 @@ bin_PROGRAMS = wviewd_wxt510 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -59,9 +58,7 @@ wviewd_wxt510_SOURCES = \ ++ wviewd_wxt510_LDADD = ++ ++ # define library directories ++-wviewd_wxt510_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_wxt510_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WXT510/wxt510config/Makefile.am +++++ b/stations/WXT510/wxt510config/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++ -I$(top_srcdir)/stations/WXT510 \ ++- -I$(prefix)/include \ ++ -D_WXT510_CONFIG_ONLY \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -38,9 +37,7 @@ wxt510config_SOURCES = \ ++ wxt510config_LDADD = ++ ++ # define library directories ++-wxt510config_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wxt510config_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/archive-be2le/Makefile.am +++++ b/utilities/archive-be2le/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -31,9 +30,7 @@ arc_be2le_SOURCES = \ ++ arc_be2le_LDADD = ++ ++ # define library directories ++-arc_be2le_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-arc_be2le_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/archive-le2be/Makefile.am +++++ b/utilities/archive-le2be/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -31,9 +30,7 @@ arc_le2be_SOURCES = \ ++ arc_le2be_LDADD = ++ ++ # define library directories ++-arc_le2be_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-arc_le2be_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/hilowcreate/Makefile.am +++++ b/utilities/hilowcreate/Makefile.am ++@@ -6,7 +6,6 @@ bin_PROGRAMS = hilowcreate ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES=1 \ ++@@ -28,9 +27,7 @@ hilowcreate_SOURCES = \ ++ hilowcreate_LDADD = ++ ++ # define library directories ++-hilowcreate_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-hilowcreate_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/sqlite2wlk/Makefile.am +++++ b/utilities/sqlite2wlk/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -29,9 +28,7 @@ sqlite2wlk_SOURCES = \ ++ sqlite2wlk_LDADD = ++ ++ # define library directories ++-sqlite2wlk_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-sqlite2wlk_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/wlk2sqlite/Makefile.am +++++ b/utilities/wlk2sqlite/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -29,9 +28,7 @@ wlk2sqlite_SOURCES = \ ++ wlk2sqlite_LDADD = ++ ++ # define library directories ++-wlk2sqlite_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wlk2sqlite_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/common/hidapi-linux.c +++++ b/stations/common/hidapi-linux.c ++@@ -79,7 +79,6 @@ ++ #else ++ #include "libusb-1.0/libusb.h" ++ #endif ++-#include "iconv.h" ++ ++ #include "hidapi.h" ++ +diff --git a/feeds/packages/utils/wview/patches/.svn/text-base/020-use-standard-awk.patch.svn-base b/feeds/packages/utils/wview/patches/.svn/text-base/020-use-standard-awk.patch.svn-base +new file mode 100644 +index 0000000..4959bf6 +--- /dev/null ++++ b/feeds/packages/utils/wview/patches/.svn/text-base/020-use-standard-awk.patch.svn-base +@@ -0,0 +1,20 @@ ++--- a/wviewconfig/wviewconfig.sh +++++ b/wviewconfig/wviewconfig.sh ++@@ -206,7 +206,7 @@ get_wview_conf_interactive() ++ cd $WVIEW_CONF_DIR ++ ++ # Edit parms one at a time: ++- gawk -F"|" '{ +++ awk -F"|" '{ ++ sysstring=sprintf("./editparm \"%s\" \"%s\" \"%s\" \"%s\"", $1, $2, $3, $4) ++ system(sysstring) ++ }' $WVIEW_CONF_DIR/parms.out ++@@ -234,7 +234,7 @@ set_config_from_file() ++ cd $WVIEW_CONF_DIR ++ ++ # Update parms one at a time: ++- gawk -F"=" '{ +++ awk -F"=" '{ ++ sysstring=sprintf("./updateparm \"%s\" \"%s\"", $1, $2) ++ system(sysstring) ++ }' $SET_FILE +diff --git a/feeds/packages/utils/wview/patches/010-fix-cross-compile.patch b/feeds/packages/utils/wview/patches/010-fix-cross-compile.patch +new file mode 100644 +index 0000000..59523bf +--- /dev/null ++++ b/feeds/packages/utils/wview/patches/010-fix-cross-compile.patch +@@ -0,0 +1,499 @@ ++--- a/alarms/Makefile.am +++++ b/alarms/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = wvalarmd ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -36,9 +35,7 @@ wvalarmd_SOURCES = \ ++ wvalarmd_LDADD = ++ ++ # define library directories ++-wvalarmd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvalarmd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/cwop/Makefile.am +++++ b/cwop/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = wvcwopd ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -32,9 +31,7 @@ wvcwopd_SOURCES = \ ++ wvcwopd_LDADD = ++ ++ # define library directories ++-wvcwopd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvcwopd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/ftp/Makefile.am +++++ b/ftp/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewftpd ++ ++ # define include directories ++ INCLUDES = -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -D_GNU_SOURCE ++@@ -33,9 +32,7 @@ wviewftpd_SOURCES = \ ++ wviewftpd_LDADD = -lssl -lcurl ++ ++ # define library directories ++-wviewftpd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewftpd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/htmlgenerator/Makefile.am +++++ b/htmlgenerator/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = htmlgend ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -66,9 +65,7 @@ htmlgend_SOURCES = \ ++ htmlgend_LDADD = ++ ++ # define library directories ++-htmlgend_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-htmlgend_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/http/Makefile.am +++++ b/http/Makefile.am ++@@ -8,9 +8,6 @@ bin_PROGRAMS = wvhttpd ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++- -I/usr/include \ ++- -I/usr/local/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -38,9 +35,7 @@ wvhttpd_SOURCES = \ ++ wvhttpd_LDADD = -lssl -lcurl ++ ++ # define library directories ++-wvhttpd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvhttpd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/procmon/Makefile.am +++++ b/procmon/Makefile.am ++@@ -8,7 +8,6 @@ bin_PROGRAMS = wvpmond ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -33,9 +32,7 @@ wvpmond_SOURCES = \ ++ wvpmond_LDADD = ++ ++ # define library directories ++-wvpmond_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wvpmond_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/ssh/Makefile.am +++++ b/ssh/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewsshd ++ ++ # define include directories ++ INCLUDES = -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -D_GNU_SOURCE ++@@ -33,9 +32,7 @@ wviewsshd_SOURCES = \ ++ wviewsshd_LDADD = ++ ++ # define library directories ++-wviewsshd_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewsshd_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/Simulator/Makefile.am +++++ b/stations/Simulator/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_sim ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -52,9 +51,7 @@ wviewd_sim_SOURCES = \ ++ wviewd_sim_LDADD = ++ ++ # define library directories ++-wviewd_sim_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_sim_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/TE923/Makefile.am +++++ b/stations/TE923/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_te923 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -53,11 +52,9 @@ wviewd_te923_SOURCES = \ ++ ++ if DARWIN ++ wviewd_te923_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c ++-wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation ++ wviewd_te923_LDADD = ++ else ++ wviewd_te923_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c ++-wviewd_te923_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib ++ if FREEBSD ++ wviewd_te923_LDADD = -lusb ++ else ++--- a/stations/TWI/Makefile.am +++++ b/stations/TWI/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_twi ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -57,9 +56,7 @@ wviewd_twi_SOURCES = \ ++ wviewd_twi_LDADD = ++ ++ # define library directories ++-wviewd_twi_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_twi_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/VantagePro/Makefile.am +++++ b/stations/VantagePro/Makefile.am ++@@ -9,7 +9,6 @@ bin_PROGRAMS = wviewd_vpro ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -56,9 +55,7 @@ wviewd_vpro_SOURCES = \ ++ wviewd_vpro_LDADD = ++ ++ # define library directories ++-wviewd_vpro_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_vpro_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/VantagePro/vpconfig/Makefile.am +++++ b/stations/VantagePro/vpconfig/Makefile.am ++@@ -13,7 +13,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -D_VP_CONFIG_ONLY \ ++@@ -40,10 +39,8 @@ vpconfig_SOURCES = \ ++ vpconfig_LDADD = ++ ++ # define library directories ++-vpconfig_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-vpconfig_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++ CLEANFILES = $(bin_SCRIPTS) ++--- a/stations/Virtual/Makefile.am +++++ b/stations/Virtual/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_virtual ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -58,9 +57,7 @@ wviewd_virtual_SOURCES = \ ++ wviewd_virtual_LDADD = ++ ++ # define library directories ++-wviewd_virtual_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_virtual_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WH1080/Makefile.am +++++ b/stations/WH1080/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_wh1080 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -53,11 +52,9 @@ wviewd_wh1080_SOURCES = \ ++ ++ if DARWIN ++ wviewd_wh1080_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c ++-wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation ++ wviewd_wh1080_LDADD = ++ else ++ wviewd_wh1080_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c ++-wviewd_wh1080_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib ++ if FREEBSD ++ wviewd_wh1080_LDADD = -lusb ++ else ++--- a/stations/WMR918/Makefile.am +++++ b/stations/WMR918/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_wmr918 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -56,9 +55,7 @@ wviewd_wmr918_SOURCES = \ ++ wviewd_wmr918_LDADD = ++ ++ # define library directories ++-wviewd_wmr918_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_wmr918_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WMRUSB/Makefile.am +++++ b/stations/WMRUSB/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_wmrusb ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -52,11 +51,9 @@ wviewd_wmrusb_SOURCES = \ ++ ++ if DARWIN ++ wviewd_wmrusb_SOURCES += $(top_srcdir)/stations/common/hidapi-osx.c ++-wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib -framework IOKit -framework CoreFoundation ++ wviewd_wmrusb_LDADD = ++ else ++ wviewd_wmrusb_SOURCES += $(top_srcdir)/stations/common/hidapi-linux.c ++-wviewd_wmrusb_LDFLAGS = -L$(prefix)/lib -L/usr/lib -L/usr/local/lib ++ if FREEBSD ++ wviewd_wmrusb_LDADD = -lusb ++ else ++--- a/stations/WS-2300/Makefile.am +++++ b/stations/WS-2300/Makefile.am ++@@ -7,7 +7,6 @@ bin_PROGRAMS = wviewd_ws2300 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -56,9 +55,7 @@ wviewd_ws2300_SOURCES = \ ++ wviewd_ws2300_LDADD = ++ ++ # define library directories ++-wviewd_ws2300_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_ws2300_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WXT510/Makefile.am +++++ b/stations/WXT510/Makefile.am ++@@ -10,7 +10,6 @@ bin_PROGRAMS = wviewd_wxt510 ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++- -I$(prefix)/include \ ++ -D_GNU_SOURCE \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -59,9 +58,7 @@ wviewd_wxt510_SOURCES = \ ++ wviewd_wxt510_LDADD = ++ ++ # define library directories ++-wviewd_wxt510_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wviewd_wxt510_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/WXT510/wxt510config/Makefile.am +++++ b/stations/WXT510/wxt510config/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/common \ ++ -I$(top_srcdir)/stations/WXT510 \ ++- -I$(prefix)/include \ ++ -D_WXT510_CONFIG_ONLY \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++@@ -38,9 +37,7 @@ wxt510config_SOURCES = \ ++ wxt510config_LDADD = ++ ++ # define library directories ++-wxt510config_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wxt510config_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/archive-be2le/Makefile.am +++++ b/utilities/archive-be2le/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -31,9 +30,7 @@ arc_be2le_SOURCES = \ ++ arc_be2le_LDADD = ++ ++ # define library directories ++-arc_be2le_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-arc_be2le_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/archive-le2be/Makefile.am +++++ b/utilities/archive-le2be/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -31,9 +30,7 @@ arc_le2be_SOURCES = \ ++ arc_le2be_LDADD = ++ ++ # define library directories ++-arc_le2be_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-arc_le2be_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/hilowcreate/Makefile.am +++++ b/utilities/hilowcreate/Makefile.am ++@@ -6,7 +6,6 @@ bin_PROGRAMS = hilowcreate ++ # define include directories ++ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES=1 \ ++@@ -28,9 +27,7 @@ hilowcreate_SOURCES = \ ++ hilowcreate_LDADD = ++ ++ # define library directories ++-hilowcreate_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-hilowcreate_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/sqlite2wlk/Makefile.am +++++ b/utilities/sqlite2wlk/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -29,9 +28,7 @@ sqlite2wlk_SOURCES = \ ++ sqlite2wlk_LDADD = ++ ++ # define library directories ++-sqlite2wlk_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-sqlite2wlk_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/utilities/wlk2sqlite/Makefile.am +++++ b/utilities/wlk2sqlite/Makefile.am ++@@ -8,7 +8,6 @@ INCLUDES = \ ++ -I$(top_srcdir)/common \ ++ -I$(top_srcdir)/stations/VantagePro \ ++ -I$(top_srcdir)/utilities \ ++- -I$(prefix)/include \ ++ -DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \ ++ -DWV_RUN_DIR=\"$(localstatedir)/wview\" \ ++ -DBUILD_UTILITIES \ ++@@ -29,9 +28,7 @@ wlk2sqlite_SOURCES = \ ++ wlk2sqlite_LDADD = ++ ++ # define library directories ++-wlk2sqlite_LDFLAGS = -L$(prefix)/lib -L$(prefix)/usr/lib -L/usr/lib ++ ++ if CROSSCOMPILE ++-wlk2sqlite_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o ++ endif ++ ++--- a/stations/common/hidapi-linux.c +++++ b/stations/common/hidapi-linux.c ++@@ -79,7 +79,6 @@ ++ #else ++ #include "libusb-1.0/libusb.h" ++ #endif ++-#include "iconv.h" ++ ++ #include "hidapi.h" ++ +diff --git a/feeds/packages/utils/wview/patches/020-use-standard-awk.patch b/feeds/packages/utils/wview/patches/020-use-standard-awk.patch +new file mode 100644 +index 0000000..4959bf6 +--- /dev/null ++++ b/feeds/packages/utils/wview/patches/020-use-standard-awk.patch +@@ -0,0 +1,20 @@ ++--- a/wviewconfig/wviewconfig.sh +++++ b/wviewconfig/wviewconfig.sh ++@@ -206,7 +206,7 @@ get_wview_conf_interactive() ++ cd $WVIEW_CONF_DIR ++ ++ # Edit parms one at a time: ++- gawk -F"|" '{ +++ awk -F"|" '{ ++ sysstring=sprintf("./editparm \"%s\" \"%s\" \"%s\" \"%s\"", $1, $2, $3, $4) ++ system(sysstring) ++ }' $WVIEW_CONF_DIR/parms.out ++@@ -234,7 +234,7 @@ set_config_from_file() ++ cd $WVIEW_CONF_DIR ++ ++ # Update parms one at a time: ++- gawk -F"=" '{ +++ awk -F"=" '{ ++ sysstring=sprintf("./updateparm \"%s\" \"%s\"", $1, $2) ++ system(sysstring) ++ }' $SET_FILE +diff --git a/feeds/packages/utils/wx200d/.svn/entries b/feeds/packages/utils/wx200d/.svn/entries +new file mode 100644 +index 0000000..02d849e +--- /dev/null ++++ b/feeds/packages/utils/wx200d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/wx200d ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++c7760330fc04c7f1bc678129d5a30668 ++2010-02-18T13:10:21.112707Z ++19705 ++lars ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1169 ++ +diff --git a/feeds/packages/utils/wx200d/.svn/prop-base/Makefile.svn-base b/feeds/packages/utils/wx200d/.svn/prop-base/Makefile.svn-base +new file mode 100644 +index 0000000..f899379 +--- /dev/null ++++ b/feeds/packages/utils/wx200d/.svn/prop-base/Makefile.svn-base +@@ -0,0 +1,13 @@ ++K 9 ++copyright ++V 30 ++Copyright (C) 2006 OpenWrt.org ++K 7 ++licence ++V 5 ++GPLv2 ++K 13 ++svn:eol-style ++V 6 ++native ++END +diff --git a/feeds/packages/utils/wx200d/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/wx200d/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c33d071 +--- /dev/null ++++ b/feeds/packages/utils/wx200d/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,51 @@ ++# ++# 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:=wx200d ++PKG_VERSION:=1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/wx200d ++PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wx200d ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libpq ++ TITLE:=weather station data collector ++ URL:=http://wx200d.sourceforge.net/ ++endef ++ ++define Package/wx200d/description ++ wx200d is a weather station data collector and server daemon ++ for the WX200, WM918, WMR918 and WMR968 weather station ++ hardware. ++endef ++ ++# uses GNU configure ++ ++define Package/wx200d/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ ++ $(PKG_INSTALL_DIR)/usr/bin/wxstdout \ ++ $(PKG_INSTALL_DIR)/usr/bin/wxfilter \ ++ $(PKG_INSTALL_DIR)/usr/bin/wxdebug \ ++ $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ ++ $(PKG_INSTALL_DIR)/usr/sbin/wxread \ ++ $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,wx200d)) +diff --git a/feeds/packages/utils/wx200d/Makefile b/feeds/packages/utils/wx200d/Makefile +new file mode 100644 +index 0000000..c33d071 +--- /dev/null ++++ b/feeds/packages/utils/wx200d/Makefile +@@ -0,0 +1,51 @@ ++# ++# 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:=wx200d ++PKG_VERSION:=1.3 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=@SF/wx200d ++PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/wx200d ++ SECTION:=utils ++ CATEGORY:=Utilities ++ DEPENDS:=+libpq ++ TITLE:=weather station data collector ++ URL:=http://wx200d.sourceforge.net/ ++endef ++ ++define Package/wx200d/description ++ wx200d is a weather station data collector and server daemon ++ for the WX200, WM918, WMR918 and WMR968 weather station ++ hardware. ++endef ++ ++# uses GNU configure ++ ++define Package/wx200d/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ ++ $(PKG_INSTALL_DIR)/usr/bin/wxstdout \ ++ $(PKG_INSTALL_DIR)/usr/bin/wxfilter \ ++ $(PKG_INSTALL_DIR)/usr/bin/wxdebug \ ++ $(1)/usr/bin/ ++ $(INSTALL_DIR) $(1)/usr/sbin/ ++ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ ++ $(PKG_INSTALL_DIR)/usr/sbin/wxread \ ++ $(1)/usr/sbin/ ++endef ++ ++$(eval $(call BuildPackage,wx200d)) +diff --git a/feeds/packages/utils/xdelta3/.svn/entries b/feeds/packages/utils/xdelta3/.svn/entries +new file mode 100644 +index 0000000..426f364 +--- /dev/null ++++ b/feeds/packages/utils/xdelta3/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/xdelta3 ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-13T17:29:25.784715Z ++28231 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++patches ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++f740b5d99f9d0ae6d495f515a10c2454 ++2011-09-13T17:29:25.784715Z ++28231 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1149 ++ +diff --git a/feeds/packages/utils/xdelta3/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/xdelta3/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..c330000 +--- /dev/null ++++ b/feeds/packages/utils/xdelta3/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,42 @@ ++# ++# Copyright (C) 2011 Alexander Gordeev ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=xdelta3 ++PKG_VERSION:=3.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=xdelta$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xdelta.googlecode.com/files ++PKG_MD5SUM:=5fe038be3a266d2a7913e10d1cec6d88 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/xdelta$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xdelta3 ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://xdelta.org ++ TITLE:=A diff utility which works with binary files ++endef ++ ++define Package/xdelta3/description ++ Xdelta3 is a set of tools designed to compute changes between binary ++ files. These changes (delta files) are similar to the output of the ++ "diff" program, in that they may be used to store and transmit only ++ the changes between files. The "delta files" that Xdelta3 manages are ++ stored in RFC3284 (VCDIFF) format. ++endef ++ ++define Package/xdelta3/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/xdelta3 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,xdelta3)) +diff --git a/feeds/packages/utils/xdelta3/Makefile b/feeds/packages/utils/xdelta3/Makefile +new file mode 100644 +index 0000000..c330000 +--- /dev/null ++++ b/feeds/packages/utils/xdelta3/Makefile +@@ -0,0 +1,42 @@ ++# ++# Copyright (C) 2011 Alexander Gordeev ++# ++# This is free software, licensed under the GNU General Public License v2. ++# See /LICENSE for more information. ++# ++ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=xdelta3 ++PKG_VERSION:=3.0.0 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=xdelta$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://xdelta.googlecode.com/files ++PKG_MD5SUM:=5fe038be3a266d2a7913e10d1cec6d88 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/xdelta$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/xdelta3 ++ SECTION:=utils ++ CATEGORY:=Utilities ++ URL:=http://xdelta.org ++ TITLE:=A diff utility which works with binary files ++endef ++ ++define Package/xdelta3/description ++ Xdelta3 is a set of tools designed to compute changes between binary ++ files. These changes (delta files) are similar to the output of the ++ "diff" program, in that they may be used to store and transmit only ++ the changes between files. The "delta files" that Xdelta3 manages are ++ stored in RFC3284 (VCDIFF) format. ++endef ++ ++define Package/xdelta3/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/xdelta3 $(1)/usr/bin/ ++endef ++ ++$(eval $(call BuildPackage,xdelta3)) +diff --git a/feeds/packages/utils/xdelta3/patches/.svn/entries b/feeds/packages/utils/xdelta3/patches/.svn/entries +new file mode 100644 +index 0000000..ac221c5 +--- /dev/null ++++ b/feeds/packages/utils/xdelta3/patches/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/xdelta3/patches ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-09-13T17:29:25.784715Z ++28231 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++001-decrease-default-window-size.patch ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++6045c0c25a5b86f1b7baf3fd9241fcd0 ++2011-09-13T17:29:25.784715Z ++28231 ++florian ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++531 ++ +diff --git a/feeds/packages/utils/xdelta3/patches/.svn/text-base/001-decrease-default-window-size.patch.svn-base b/feeds/packages/utils/xdelta3/patches/.svn/text-base/001-decrease-default-window-size.patch.svn-base +new file mode 100644 +index 0000000..3fd134d +--- /dev/null ++++ b/feeds/packages/utils/xdelta3/patches/.svn/text-base/001-decrease-default-window-size.patch.svn-base +@@ -0,0 +1,19 @@ ++diff --git a/xdelta3.h b/xdelta3.h ++index 5dafd8d..22bc37f 100644 ++--- a/xdelta3.h +++++ b/xdelta3.h ++@@ -38,12 +38,12 @@ ++ * buffer is used directly. ++ */ ++ #ifndef XD3_DEFAULT_WINSIZE ++-#define XD3_DEFAULT_WINSIZE (1U << 23) +++#define XD3_DEFAULT_WINSIZE (1U << 16) ++ #endif ++ ++ /* Default total size of the source window used in xdelta3-main.h */ ++ #ifndef XD3_DEFAULT_SRCWINSZ ++-#define XD3_DEFAULT_SRCWINSZ (1U << 26) +++#define XD3_DEFAULT_SRCWINSZ (1U << 19) ++ #endif ++ ++ /* When Xdelta requests a memory allocation for certain buffers, it +diff --git a/feeds/packages/utils/xdelta3/patches/001-decrease-default-window-size.patch b/feeds/packages/utils/xdelta3/patches/001-decrease-default-window-size.patch +new file mode 100644 +index 0000000..3fd134d +--- /dev/null ++++ b/feeds/packages/utils/xdelta3/patches/001-decrease-default-window-size.patch +@@ -0,0 +1,19 @@ ++diff --git a/xdelta3.h b/xdelta3.h ++index 5dafd8d..22bc37f 100644 ++--- a/xdelta3.h +++++ b/xdelta3.h ++@@ -38,12 +38,12 @@ ++ * buffer is used directly. ++ */ ++ #ifndef XD3_DEFAULT_WINSIZE ++-#define XD3_DEFAULT_WINSIZE (1U << 23) +++#define XD3_DEFAULT_WINSIZE (1U << 16) ++ #endif ++ ++ /* Default total size of the source window used in xdelta3-main.h */ ++ #ifndef XD3_DEFAULT_SRCWINSZ ++-#define XD3_DEFAULT_SRCWINSZ (1U << 26) +++#define XD3_DEFAULT_SRCWINSZ (1U << 19) ++ #endif ++ ++ /* When Xdelta requests a memory allocation for certain buffers, it +diff --git a/feeds/packages/utils/zile/.svn/entries b/feeds/packages/utils/zile/.svn/entries +new file mode 100644 +index 0000000..316fb85 +--- /dev/null ++++ b/feeds/packages/utils/zile/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/zile ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2012-06-12T23:47:48.779493Z ++32291 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++2ee63f81b49ee40127887499c2276469 ++2012-06-12T23:47:48.779493Z ++32291 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1050 ++ +diff --git a/feeds/packages/utils/zile/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/zile/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d3071d0 +--- /dev/null ++++ b/feeds/packages/utils/zile/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,45 @@ ++# ++# 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:=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_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/feeds/packages/utils/zile/Makefile b/feeds/packages/utils/zile/Makefile +new file mode 100644 +index 0000000..d3071d0 +--- /dev/null ++++ b/feeds/packages/utils/zile/Makefile +@@ -0,0 +1,45 @@ ++# ++# 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:=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_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/feeds/packages/utils/zip/.svn/entries b/feeds/packages/utils/zip/.svn/entries +new file mode 100644 +index 0000000..25ada31 +--- /dev/null ++++ b/feeds/packages/utils/zip/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/zip ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2009-06-20T15:21:37.400235Z ++16522 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++e2a3430d1af1d0cdbcb579a73f972c6f ++2009-06-20T15:21:37.400235Z ++16522 ++hauke ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1364 ++ +diff --git a/feeds/packages/utils/zip/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/zip/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..d0b5df7 +--- /dev/null ++++ b/feeds/packages/utils/zip/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2007-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:=zip ++PKG_VERSION:=2.32 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)232.zip ++PKG_SOURCE_URL:=@SF/infozip ++PKG_MD5SUM:=da947ed356e5fdb30ff4bc3dc7698f33 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) ++ ++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 \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \ ++ LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \ ++ 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/feeds/packages/utils/zip/Makefile b/feeds/packages/utils/zip/Makefile +new file mode 100644 +index 0000000..d0b5df7 +--- /dev/null ++++ b/feeds/packages/utils/zip/Makefile +@@ -0,0 +1,56 @@ ++# ++# Copyright (C) 2007-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:=zip ++PKG_VERSION:=2.32 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)232.zip ++PKG_SOURCE_URL:=@SF/infozip ++PKG_MD5SUM:=da947ed356e5fdb30ff4bc3dc7698f33 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) ++ ++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 \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ prefix="$(PKG_INSTALL_DIR)/usr" \ ++ CFLAGS="$(TARGET_CFLAGS)" \ ++ CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \ ++ LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \ ++ 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/feeds/packages/utils/zoneinfo/.svn/entries b/feeds/packages/utils/zoneinfo/.svn/entries +new file mode 100644 +index 0000000..4ee59e3 +--- /dev/null ++++ b/feeds/packages/utils/zoneinfo/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/zoneinfo ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2011-11-30T20:00:04.942076Z ++29370 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:30.000000Z ++27ae010b8cdad0db0734d446a6a9009b ++2011-11-30T20:00:04.942076Z ++29370 ++jow ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6898 ++ +diff --git a/feeds/packages/utils/zoneinfo/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/zoneinfo/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..741e64b +--- /dev/null ++++ b/feeds/packages/utils/zoneinfo/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,254 @@ ++# ++# Copyright (C) 2007-2011 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:=2011n ++PKG_VERSION_CODE:=2011i ++PKG_RELEASE:=1 ++ ++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:=20dbfb28efa008ddbf6dd34601ea40fa ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Download/tzcode ++ FILE=$(PKG_SOURCE_CODE) ++ URL=$(PKG_SOURCE_URL) ++ MD5SUM=cf7f4335b7c8682899fa2814e711c1b2 ++endef ++ ++$(eval $(call Download,tzcode)) ++ ++define Package/zoneinfo/Default ++ SUBMENU:=zoneinfo ++ TITLE:=Zone Information ++ SECTION:=utils ++ CATEGORY:=Utilities ++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 Package/zoneinfo-middleeast ++$(call Package/zoneinfo/Default) ++ TITLE:=Zone Information (MiddleEast) ++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 ++ ++define Package/zoneinfo-middleeast/install ++ $(INSTALL_DIR) $(1)/usr/share/zoneinfo ++ for i in Egypt Libya Iran Israel Turkey Mideast ; 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)) ++$(eval $(call BuildPackage,zoneinfo-middleeast)) ++ +diff --git a/feeds/packages/utils/zoneinfo/Makefile b/feeds/packages/utils/zoneinfo/Makefile +new file mode 100644 +index 0000000..741e64b +--- /dev/null ++++ b/feeds/packages/utils/zoneinfo/Makefile +@@ -0,0 +1,254 @@ ++# ++# Copyright (C) 2007-2011 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:=2011n ++PKG_VERSION_CODE:=2011i ++PKG_RELEASE:=1 ++ ++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:=20dbfb28efa008ddbf6dd34601ea40fa ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Download/tzcode ++ FILE=$(PKG_SOURCE_CODE) ++ URL=$(PKG_SOURCE_URL) ++ MD5SUM=cf7f4335b7c8682899fa2814e711c1b2 ++endef ++ ++$(eval $(call Download,tzcode)) ++ ++define Package/zoneinfo/Default ++ SUBMENU:=zoneinfo ++ TITLE:=Zone Information ++ SECTION:=utils ++ CATEGORY:=Utilities ++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 Package/zoneinfo-middleeast ++$(call Package/zoneinfo/Default) ++ TITLE:=Zone Information (MiddleEast) ++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 ++ ++define Package/zoneinfo-middleeast/install ++ $(INSTALL_DIR) $(1)/usr/share/zoneinfo ++ for i in Egypt Libya Iran Israel Turkey Mideast ; 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)) ++$(eval $(call BuildPackage,zoneinfo-middleeast)) ++ +diff --git a/feeds/packages/utils/zsh/.svn/entries b/feeds/packages/utils/zsh/.svn/entries +new file mode 100644 +index 0000000..01ad571 +--- /dev/null ++++ b/feeds/packages/utils/zsh/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++36060 ++svn://svn.openwrt.org/openwrt/packages/utils/zsh ++svn://svn.openwrt.org/openwrt ++ ++ ++ ++2013-02-18T13:47:15.885717Z ++35666 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3c298f89-4303-0410-b956-a3cf2f4a3e73 ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:31.000000Z ++87d6a8a7a122194ccbfe1626249eccb3 ++2013-02-18T13:47:15.885717Z ++35666 ++luka ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2442 ++ +diff --git a/feeds/packages/utils/zsh/.svn/text-base/Makefile.svn-base b/feeds/packages/utils/zsh/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..a006845 +--- /dev/null ++++ b/feeds/packages/utils/zsh/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,73 @@ ++# ++# 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:=zsh ++PKG_VERSION:=5.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/zsh ++PKG_MD5SUM:=b8f2ad691acf58b3252225746480dcad ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/zsh ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The Z shell ++ DEPENDS:=+libncurses +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 \ ++ --with-term-lib="ncurses" \ ++ ) ++ # 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)) +diff --git a/feeds/packages/utils/zsh/Makefile b/feeds/packages/utils/zsh/Makefile +new file mode 100644 +index 0000000..a006845 +--- /dev/null ++++ b/feeds/packages/utils/zsh/Makefile +@@ -0,0 +1,73 @@ ++# ++# 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:=zsh ++PKG_VERSION:=5.0.2 ++PKG_RELEASE:=1 ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 ++PKG_SOURCE_URL:=@SF/zsh ++PKG_MD5SUM:=b8f2ad691acf58b3252225746480dcad ++ ++PKG_INSTALL:=1 ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/zsh ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=The Z shell ++ DEPENDS:=+libncurses +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 \ ++ --with-term-lib="ncurses" \ ++ ) ++ # 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)) +diff --git a/feeds/xwrt/.svn/all-wcprops b/feeds/xwrt/.svn/all-wcprops +new file mode 100644 +index 0000000..481a69b +--- /dev/null ++++ b/feeds/xwrt/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 32 ++/svn/!svn/ver/4987/trunk/package ++END +diff --git a/feeds/xwrt/.svn/dir-prop-base b/feeds/xwrt/.svn/dir-prop-base +new file mode 100644 +index 0000000..b470680 +--- /dev/null ++++ b/feeds/xwrt/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 9 ++svk:merge ++V 65 ++37f03152-6227-0410-a929-8f56fb06ea43:/trunk/package/webif-mesh:34 ++END +diff --git a/feeds/xwrt/.svn/entries b/feeds/xwrt/.svn/entries +new file mode 100644 +index 0000000..1303e46 +--- /dev/null ++++ b/feeds/xwrt/.svn/entries +@@ -0,0 +1,79 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++webif-asterisk ++dir ++ ++webif-applications ++dir ++ ++webif-mesh ++dir ++ ++m-route ++dir ++ ++webif-iw-lua ++dir ++ ++webif-netsukuku ++dir ++ ++webif-hotspot ++dir ++ ++webif-batman ++dir ++ ++webif-fonheartbeat ++dir ++ ++webif ++dir ++ ++webif-vpn ++dir ++ ++netsukuku ++dir ++ ++webif-iw-lua-chillispot ++dir ++ ++webif-freeloader ++dir ++ ++logtrigger ++dir ++ ++webif-iw-lua-openssl ++dir ++ ++webif-iw-lua-openvpn ++dir ++ +diff --git a/feeds/xwrt/logtrigger/.svn/all-wcprops b/feeds/xwrt/logtrigger/.svn/all-wcprops +new file mode 100644 +index 0000000..d1a5d79 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 43 ++/svn/!svn/ver/4965/trunk/package/logtrigger ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 52 ++/svn/!svn/ver/4965/trunk/package/logtrigger/Makefile ++END +diff --git a/feeds/xwrt/logtrigger/.svn/entries b/feeds/xwrt/logtrigger/.svn/entries +new file mode 100644 +index 0000000..7294645 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/.svn/entries +@@ -0,0 +1,65 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/logtrigger ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2011-02-27T23:49:45.772383Z ++4965 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++files ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:56.000000Z ++3499b00256cf3374c533d2d572db8f87 ++2011-02-27T23:49:45.772383Z ++4965 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1824 ++ +diff --git a/feeds/xwrt/logtrigger/.svn/text-base/Makefile.svn-base b/feeds/xwrt/logtrigger/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..afca508 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,61 @@ ++# ++# 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:=logtrigger ++PKG_RELEASE:=04 ++PKG_VERSION:=1.$(PKG_RELEASE) ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://logtrigger.googlecode.com/files/ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++define Package/logtrigger ++ SECTION:=Utils ++ CATEGORY:=Utilities ++ DEPENDS:=libuci ++ TITLE:=logtrigger help you to monitor syslog and run some script for all or specific log event ++endef ++ ++TARGET_CPPFLAGS := \ ++ -I$(STAGING_DIR)/usr/include/ \ ++ -I$(LINUX_DIR)/include \ ++ -I$(PKG_BUILD_DIR) \ ++ -Wall \ ++ -DOPENWRT \ ++ $(TARGET_CPPFLAGS) ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++endef ++ ++define Build/Compile ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ OPENWRT=1 \ ++ LIBS="$(TARGET_LDFLAGS) -lm -luci" ++endef ++ ++define Package/logtrigger/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/logtrigger ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/OpenWrt/logtrigger.init $(1)/etc/init.d/logtrigger ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/logtrigger $(1)/usr/bin/logtrigger ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/info.sh $(1)/etc/logtrigger/info.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/info.lua $(1)/etc/logtrigger/info.lua ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/ipblock.sh $(1)/etc/logtrigger/ipblock.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/ipblock.lua $(1)/etc/logtrigger/ipblock.lua ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/conffile/OpenWrt/logtrigger.conf $(1)/etc/config/logtrigger ++endef ++ ++$(eval $(call BuildPackage,logtrigger)) +diff --git a/feeds/xwrt/logtrigger/Makefile b/feeds/xwrt/logtrigger/Makefile +new file mode 100644 +index 0000000..afca508 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=logtrigger ++PKG_RELEASE:=04 ++PKG_VERSION:=1.$(PKG_RELEASE) ++ ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz ++PKG_SOURCE_URL:=http://logtrigger.googlecode.com/files/ ++ ++include $(INCLUDE_DIR)/package.mk ++include $(INCLUDE_DIR)/kernel.mk ++ ++define Package/logtrigger ++ SECTION:=Utils ++ CATEGORY:=Utilities ++ DEPENDS:=libuci ++ TITLE:=logtrigger help you to monitor syslog and run some script for all or specific log event ++endef ++ ++TARGET_CPPFLAGS := \ ++ -I$(STAGING_DIR)/usr/include/ \ ++ -I$(LINUX_DIR)/include \ ++ -I$(PKG_BUILD_DIR) \ ++ -Wall \ ++ -DOPENWRT \ ++ $(TARGET_CPPFLAGS) ++ ++define Build/Prepare ++ $(call Build/Prepare/Default) ++endef ++ ++define Build/Compile ++ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ ++ $(MAKE) -C $(PKG_BUILD_DIR) \ ++ $(TARGET_CONFIGURE_OPTS) \ ++ OPENWRT=1 \ ++ LIBS="$(TARGET_LDFLAGS) -lm -luci" ++endef ++ ++define Package/logtrigger/install ++ $(INSTALL_DIR) $(1)/usr/bin ++ $(INSTALL_DIR) $(1)/etc/config ++ $(INSTALL_DIR) $(1)/etc/logtrigger ++ $(INSTALL_DIR) $(1)/etc/init.d ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/OpenWrt/logtrigger.init $(1)/etc/init.d/logtrigger ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/logtrigger $(1)/usr/bin/logtrigger ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/info.sh $(1)/etc/logtrigger/info.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/info.lua $(1)/etc/logtrigger/info.lua ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/ipblock.sh $(1)/etc/logtrigger/ipblock.sh ++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/conffile/scripts/ipblock.lua $(1)/etc/logtrigger/ipblock.lua ++ $(INSTALL_DATA) $(PKG_BUILD_DIR)/conffile/OpenWrt/logtrigger.conf $(1)/etc/config/logtrigger ++endef ++ ++$(eval $(call BuildPackage,logtrigger)) +diff --git a/feeds/xwrt/logtrigger/files/.svn/all-wcprops b/feeds/xwrt/logtrigger/files/.svn/all-wcprops +new file mode 100644 +index 0000000..62f4b42 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 49 ++/svn/!svn/ver/4955/trunk/package/logtrigger/files ++END +diff --git a/feeds/xwrt/logtrigger/files/.svn/entries b/feeds/xwrt/logtrigger/files/.svn/entries +new file mode 100644 +index 0000000..3f933ef +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/logtrigger/files ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2010-12-18T22:37:26.168926Z ++4955 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++etc ++dir ++ +diff --git a/feeds/xwrt/logtrigger/files/etc/.svn/all-wcprops b/feeds/xwrt/logtrigger/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..659d992 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 53 ++/svn/!svn/ver/4955/trunk/package/logtrigger/files/etc ++END +diff --git a/feeds/xwrt/logtrigger/files/etc/.svn/entries b/feeds/xwrt/logtrigger/files/etc/.svn/entries +new file mode 100644 +index 0000000..9ea6c34 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/etc/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/logtrigger/files/etc ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2010-12-18T22:37:26.168926Z ++4955 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++init.d ++dir ++ +diff --git a/feeds/xwrt/logtrigger/files/etc/init.d/.svn/all-wcprops b/feeds/xwrt/logtrigger/files/etc/init.d/.svn/all-wcprops +new file mode 100644 +index 0000000..6547d99 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/etc/init.d/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/svn/!svn/ver/4949/trunk/package/logtrigger/files/etc/init.d ++END ++logtrigger ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/svn/!svn/ver/4949/trunk/package/logtrigger/files/etc/init.d/logtrigger ++END +diff --git a/feeds/xwrt/logtrigger/files/etc/init.d/.svn/entries b/feeds/xwrt/logtrigger/files/etc/init.d/.svn/entries +new file mode 100644 +index 0000000..1884e34 +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/etc/init.d/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/logtrigger/files/etc/init.d ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2010-12-13T09:41:04.263556Z ++4949 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++logtrigger ++file ++ ++ ++ ++ ++2013-03-17T12:17:56.000000Z ++c211e0b12c40d8a19d14480cd7d4bdba ++2010-12-13T09:41:04.263556Z ++4949 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++148 ++ +diff --git a/feeds/xwrt/logtrigger/files/etc/init.d/.svn/text-base/logtrigger.svn-base b/feeds/xwrt/logtrigger/files/etc/init.d/.svn/text-base/logtrigger.svn-base +new file mode 100644 +index 0000000..c442d6c +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/etc/init.d/.svn/text-base/logtrigger.svn-base +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=11 ++STOP=97 ++ ++start() { ++ logtrigger & ++} ++ ++stop() { ++ killall logtrigger ++} +diff --git a/feeds/xwrt/logtrigger/files/etc/init.d/logtrigger b/feeds/xwrt/logtrigger/files/etc/init.d/logtrigger +new file mode 100644 +index 0000000..c442d6c +--- /dev/null ++++ b/feeds/xwrt/logtrigger/files/etc/init.d/logtrigger +@@ -0,0 +1,13 @@ ++#!/bin/sh /etc/rc.common ++# Copyright (C) 2006 OpenWrt.org ++ ++START=11 ++STOP=97 ++ ++start() { ++ logtrigger & ++} ++ ++stop() { ++ killall logtrigger ++} +diff --git a/feeds/xwrt/m-route/.svn/all-wcprops b/feeds/xwrt/m-route/.svn/all-wcprops +new file mode 100644 +index 0000000..693270b +--- /dev/null ++++ b/feeds/xwrt/m-route/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 40 ++/svn/!svn/ver/4987/trunk/package/m-route ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 49 ++/svn/!svn/ver/4826/trunk/package/m-route/Makefile ++END +diff --git a/feeds/xwrt/m-route/.svn/entries b/feeds/xwrt/m-route/.svn/entries +new file mode 100644 +index 0000000..4fc4344 +--- /dev/null ++++ b/feeds/xwrt/m-route/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++files ++dir ++ ++ipkg ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++22322892b0896e908cb3e0991e5c2062 ++2009-09-08T14:26:01.882506Z ++4826 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++563 ++ +diff --git a/feeds/xwrt/m-route/.svn/text-base/Makefile.svn-base b/feeds/xwrt/m-route/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..b24202a +--- /dev/null ++++ b/feeds/xwrt/m-route/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,27 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=m-route ++PKG_VERSION:=0.2 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/m-route ++ SECTION:=admin ++ CATEGORY:=Network ++ DEPENDS:=+ip ++ TITLE:=Load Balancing scrip for Multi Wan Connections ++endef ++ ++define Build/Compile ++endef ++ ++define Package/m-route/install ++ $(CP) -a ./files/* $(1)/ ++ $(INSTALL_BIN) ./files/etc/hotplug.d/iface/* $(1)/etc/hotplug.d/iface/ ++ $(INSTALL_BIN) ./files/lib/mroute/* $(1)/lib/mroute/ ++endef ++ ++$(eval $(call BuildPackage,m-route)) +diff --git a/feeds/xwrt/m-route/Makefile b/feeds/xwrt/m-route/Makefile +new file mode 100644 +index 0000000..b24202a +--- /dev/null ++++ b/feeds/xwrt/m-route/Makefile +@@ -0,0 +1,27 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=m-route ++PKG_VERSION:=0.2 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/m-route ++ SECTION:=admin ++ CATEGORY:=Network ++ DEPENDS:=+ip ++ TITLE:=Load Balancing scrip for Multi Wan Connections ++endef ++ ++define Build/Compile ++endef ++ ++define Package/m-route/install ++ $(CP) -a ./files/* $(1)/ ++ $(INSTALL_BIN) ./files/etc/hotplug.d/iface/* $(1)/etc/hotplug.d/iface/ ++ $(INSTALL_BIN) ./files/lib/mroute/* $(1)/lib/mroute/ ++endef ++ ++$(eval $(call BuildPackage,m-route)) +diff --git a/feeds/xwrt/m-route/files/.svn/all-wcprops b/feeds/xwrt/m-route/files/.svn/all-wcprops +new file mode 100644 +index 0000000..7f12846 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 46 ++/svn/!svn/ver/4987/trunk/package/m-route/files ++END +diff --git a/feeds/xwrt/m-route/files/.svn/entries b/feeds/xwrt/m-route/files/.svn/entries +new file mode 100644 +index 0000000..c7e412a +--- /dev/null ++++ b/feeds/xwrt/m-route/files/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++lib ++dir ++ ++etc ++dir ++ +diff --git a/feeds/xwrt/m-route/files/etc/.svn/all-wcprops b/feeds/xwrt/m-route/files/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..252b8ab +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 50 ++/svn/!svn/ver/4987/trunk/package/m-route/files/etc ++END +diff --git a/feeds/xwrt/m-route/files/etc/.svn/entries b/feeds/xwrt/m-route/files/etc/.svn/entries +new file mode 100644 +index 0000000..faaec21 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files/etc ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++hotplug.d ++dir ++ ++config ++dir ++ +diff --git a/feeds/xwrt/m-route/files/etc/config/.svn/all-wcprops b/feeds/xwrt/m-route/files/etc/config/.svn/all-wcprops +new file mode 100644 +index 0000000..f9984c1 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/config/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 57 ++/svn/!svn/ver/4987/trunk/package/m-route/files/etc/config ++END ++mroute ++K 25 ++svn:wc:ra_dav:version-url ++V 64 ++/svn/!svn/ver/4987/trunk/package/m-route/files/etc/config/mroute ++END +diff --git a/feeds/xwrt/m-route/files/etc/config/.svn/entries b/feeds/xwrt/m-route/files/etc/config/.svn/entries +new file mode 100644 +index 0000000..d330080 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/config/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files/etc/config ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++mroute ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++29f371433be4c7f48530b8dc3a460992 ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1589 ++ +diff --git a/feeds/xwrt/m-route/files/etc/config/.svn/text-base/mroute.svn-base b/feeds/xwrt/m-route/files/etc/config/.svn/text-base/mroute.svn-base +new file mode 100644 +index 0000000..2dd075c +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/config/.svn/text-base/mroute.svn-base +@@ -0,0 +1,77 @@ ++config 'websettings' 'webadmin' ++ option 'userlevel' '1' ++ option 'enable' '1' ++ ++config 'mroute' 'settings' ++ option 'os' 'OpenWrt' ++ option 'debug' '0' ++ option 'sleeptime' '5' ++ option 'testip' '204.225.44.3' ++ option 'timeout' '2' ++ option 'success' '2' ++ option 'failure' '3' ++ option 'resetif' '5' ++ option 'mroute_dns' '8.8.8.8 8.8.4.4' ++ ++config 'wanif' 'wan' ++ option 'name' 'Provider1' ++ option 'weight' '5' ++ option 'mroute_dns' '204.117.121.235' ++ ++config 'wanif' 'wan2' ++ option 'name' 'Provider2' ++ option 'weight' '1' ++ option 'mroute_dns' '198.68.161.67' ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan ++ option mark 5 ++ option protocol udp ++ option dport '5060 4569' ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan2 ++ option mark 6 ++ option protocol tcp ++ option dport '6666' ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan ++ option mark 4 ++ option protocol tcp ++ option destination 'openwrt.org' ++ option dport '80' ++ ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan2 ++ option mark 3 ++ option protocol tcp ++ option destination 'x-wrt.org' ++ option dport '80' ++ ++#config mangles ++## option input '192.168.1.1' ++# option outwan wan2 ++# option mark 1 ++# option destination 'mail.provider2.com' ++# option port '25' ++# option protocol tcp ++ ++#config mangles ++## option input '192.168.1.1' ++# option outwan wan ++# option mark 2 ++# option protocol 'tcp' ++# option destination 'pop3.provider1.com smtp.provider1.com' ++# option dport '25' ++ ++config 'lanif' 'lan' ++ option 'name' 'LAN' ++ ++config 'mroute' 'system' ++ option 'apply' '/usr/lib/lua/lua-xwrt/applys/mroute.lua' +diff --git a/feeds/xwrt/m-route/files/etc/config/mroute b/feeds/xwrt/m-route/files/etc/config/mroute +new file mode 100644 +index 0000000..2dd075c +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/config/mroute +@@ -0,0 +1,77 @@ ++config 'websettings' 'webadmin' ++ option 'userlevel' '1' ++ option 'enable' '1' ++ ++config 'mroute' 'settings' ++ option 'os' 'OpenWrt' ++ option 'debug' '0' ++ option 'sleeptime' '5' ++ option 'testip' '204.225.44.3' ++ option 'timeout' '2' ++ option 'success' '2' ++ option 'failure' '3' ++ option 'resetif' '5' ++ option 'mroute_dns' '8.8.8.8 8.8.4.4' ++ ++config 'wanif' 'wan' ++ option 'name' 'Provider1' ++ option 'weight' '5' ++ option 'mroute_dns' '204.117.121.235' ++ ++config 'wanif' 'wan2' ++ option 'name' 'Provider2' ++ option 'weight' '1' ++ option 'mroute_dns' '198.68.161.67' ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan ++ option mark 5 ++ option protocol udp ++ option dport '5060 4569' ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan2 ++ option mark 6 ++ option protocol tcp ++ option dport '6666' ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan ++ option mark 4 ++ option protocol tcp ++ option destination 'openwrt.org' ++ option dport '80' ++ ++ ++config mangles ++# option input '192.168.1.1' ++ option outwan wan2 ++ option mark 3 ++ option protocol tcp ++ option destination 'x-wrt.org' ++ option dport '80' ++ ++#config mangles ++## option input '192.168.1.1' ++# option outwan wan2 ++# option mark 1 ++# option destination 'mail.provider2.com' ++# option port '25' ++# option protocol tcp ++ ++#config mangles ++## option input '192.168.1.1' ++# option outwan wan ++# option mark 2 ++# option protocol 'tcp' ++# option destination 'pop3.provider1.com smtp.provider1.com' ++# option dport '25' ++ ++config 'lanif' 'lan' ++ option 'name' 'LAN' ++ ++config 'mroute' 'system' ++ option 'apply' '/usr/lib/lua/lua-xwrt/applys/mroute.lua' +diff --git a/feeds/xwrt/m-route/files/etc/hotplug.d/.svn/all-wcprops b/feeds/xwrt/m-route/files/etc/hotplug.d/.svn/all-wcprops +new file mode 100644 +index 0000000..09197f4 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/hotplug.d/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/svn/!svn/ver/4987/trunk/package/m-route/files/etc/hotplug.d ++END +diff --git a/feeds/xwrt/m-route/files/etc/hotplug.d/.svn/entries b/feeds/xwrt/m-route/files/etc/hotplug.d/.svn/entries +new file mode 100644 +index 0000000..2538eaa +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/hotplug.d/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files/etc/hotplug.d ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++iface ++dir ++ +diff --git a/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/all-wcprops b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/all-wcprops +new file mode 100644 +index 0000000..f252a89 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/svn/!svn/ver/4987/trunk/package/m-route/files/etc/hotplug.d/iface ++END ++09-routes ++K 25 ++svn:wc:ra_dav:version-url ++V 76 ++/svn/!svn/ver/4987/trunk/package/m-route/files/etc/hotplug.d/iface/09-routes ++END +diff --git a/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/entries b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/entries +new file mode 100644 +index 0000000..b12f1c2 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files/etc/hotplug.d/iface ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++09-routes ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++d99d1af10d8825d42d87b37ca493c48f ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11260 ++ +diff --git a/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/text-base/09-routes.svn-base b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/text-base/09-routes.svn-base +new file mode 100644 +index 0000000..6a47ed1 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/.svn/text-base/09-routes.svn-base +@@ -0,0 +1,426 @@ ++#!/bin/sh ++# Copyright (C) 2009 Fabian Omar Franzotti ++# http://pastebin.ca/2098184 ++# ++#include /lib/network ++. /etc/functions.sh ++. /lib/config/uci.sh ++ ++local INTERFACE="$INTERFACE" ++local DEVICE="$DEVICE" ++ ++saveundo () { ++ [ ! -e /var/mroute/$DEVICE ] && mkdir -p /var/mroute/$DEVICE ++ [ ! -e /var/mroute/$DEVICE/$1 ] && echo "rm /var/mroute/$DEVICE/$1" > /var/mroute/$DEVICE/$1 ++ sed -e "1i $2" /var/mroute/$DEVICE/$1 > /var/mroute/$DEVICE/$1.tmp ++ mv -f /var/mroute/$DEVICE/$1.tmp /var/mroute/$DEVICE/$1 ++} ++ ++undo () { ++ file="/var/mroute/$DEVICE/$1" ++ echo "undo $file" ++ if [ -e "$file" ]; then ++ sh "$file" ++# cat "$file" | awk '{ print $0; system( $0 ); }' ++ echo "End $file" ++# rm $file ++ fi ++ ++# [ -e "$file" ] && { ++# while read line; do echo "$line"; eval "$line"; done < $file ++# echo "" > $file ++# } ++# ++# [ -e "$file" ] && { ++# sleep 3 ++# rm "$file" ++# } ++ ++} ++ ++log_debug() { ++ if [ $DEBUG -eq $1 -o $1 -lt 4 ]; then ++ logger -t mroute -p $1 -s $2 ++ fi ++} ++ ++set_rtTables () { ++# ++# reserved values ++# ++# echo 255 local > /etc/iproute2/rt_tables ++# echo 254 main >> /etc/iproute2/rt_tables ++# echo 253 default >> /etc/iproute2/rt_tables ++# echo 0 unspec >> /etc/iproute2/rt_tables ++ local n ++ local RT ++ ++ n=200 ++ RT=${1}_rt ++ if [ -z "`cat /etc/iproute2/rt_tables | grep $RT`" ] ; then ++ while [ "`cat /etc/iproute2/rt_tables | grep "^$n"`" ] ++ do ++ n=`expr $n + 1` ++ done ++ echo "$n $RT" >> /etc/iproute2/rt_tables ++ log_debug 5 "set_rt_Tables:$n $RT" ++ n=`expr $n + 1` ++ fi ++ eval ${1}_RT_TABLE=$RT ++ log_debug 5 "set_rt_Tables:${1}_RT_TABLE=$RT.....OK" ++} ++ ++uci_get() { ++ uci -P /var/state get "$1" 2>/dev/null ++} ++ ++local iftype=$(uci_get "mroute.$INTERFACE") ++[ -z "$iftype" ] && exit 0 ++ ++add_new_wan () { ++ local network ++ local device ++ local ipaddr ++ local type ++ config_get network $1 network ++ [ -z "$network" ] && return ++ config_get ipaddr $1 ipaddr ++ config_get device $1 device ++ type=$(uci_get "mroute.$1") ++ [ "$type" = "lanif" ] && unset ipaddr ++ ++ add_net_to_rt $1 "add_new_wan" ${INTERFACE}_rt $network $device $ipaddr ++} ++ ++add_marks () { ++ local outwan ++ local input ++ local protocol ++ local destination ++ local port ++ local mark ++ local RUN ++ local status ++# status=$(uci_get_state mroute $INTERFACE status) ++# [ -z "$status" -o "$status" == "0" ] && return ++ config_get mark $1 mark ++ config_get outwan $1 outwan ++ [ -z "$mark" ] && return ++ [ -z "$outwan" ] && return ++ [ "$outwan" != "$INTERFACE" ] && return ++ config_get input $1 input ++ config_get protocol $1 protocol ++ config_get destination $1 destination ++ config_get ports $1 dport ++ if [ -z "$protocol" ]; then ++ protocol="" ++ else ++ protocol="-p $protocol" ++ fi ++ ++ if [ -z "$input" ]; then ++ RUN="ip rule add fwmark $mark table ${outwan}_rt" ++ DEL="ip rule del fwmark $mark table ${outwan}_rt" ++ input="" ++ else ++ RUN="ip rule add from $input fwmark $mark table ${outwan}_rt" ++ DEL="ip rule del from $input fwmark $mark table ${outwan}_rt" ++ input="-i $input" ++ fi ++ saveundo mark "$DEL" ++ echo $RUN ++ eval $RUN ++ if [ -z "$destination" ]; then ++ for port in $ports; do ++ RUN="iptables -A PREROUTING -t mangle $input $protocol --dport $port -j MARK --set-mark $mark" ++ DEL="iptables -D PREROUTING -t mangle $input $protocol --dport $port -j MARK --set-mark $mark" ++ saveundo iptables "$DEL" ++ echo $RUN ++ eval $RUN ++ done ++ else ++ for dest in $destination; do ++ dest="-d $dest" ++ if [ -z $ports ]; then ++ RUN="iptables -A PREROUTING -t mangle $input $protocol $dest -j MARK --set-mark $mark" ++ DEL="iptables -D PREROUTING -t mangle $input $protocol $dest -j MARK --set-mark $mark" ++ saveundo iptables "$DEL" ++ echo $RUN ++ eval $RUN ++ else ++ for port in $ports; do ++ RUN="iptables -A PREROUTING -t mangle $input $protocol $dest --dport $port -j MARK --set-mark $mark" ++ DEL="iptables -D PREROUTING -t mangle $input $protocol $dest --dport $port -j MARK --set-mark $mark" ++ saveundo iptables "$DEL" ++ echo $RUN ++ eval $RUN ++ done ++ fi ++ done ++ fi ++} ++ ++add_wan_default () { ++ local RUN="ip route add default via $new_gateway table ${INTERFACE}_rt" ++ local DEL="ip route del default via $new_gateway table ${INTERFACE}_rt" ++ saveundo route "$DEL" ++ log_debug 5 "add_wan($new_name):$RUN" ++ echo $RUN ++ eval $RUN ++} ++ ++add_net_to_rt () { ++ # iface = $1 ++ # howsend = $2 ++ # rt_table = $3 ++ # network = $4 ++ # device = $5 ++ # ipaddr = $6 ++ local RUN="ip route add $4 dev $5 src $6 table $3" ++ local DEL="ip route del $4 dev $5 src $6 table $3" ++ [ -z "$6" ] && { ++ RUN="ip route add $4 dev $5 table $3" ++ DEL="ip route del $4 dev $5 table $3" ++ } ++ log_debug 5 "$2 ($new_name)$1 $3:$RUN" ++ saveundo route "$DEL" ++ echo $RUN ++ eval $RUN ++} ++ ++add_rule () { ++ local RUN ++ local mark=$(uci_get "mroute.${INTERFACE}.mark") ++ [ -n "$mark" ] && { ++ config_foreach add_lans_rules lanif ++ } ++ RUN="ip rule add from $new_ipaddr table ${INTERFACE}_rt" ++ DEL="ip rule del from $new_ipaddr table ${INTERFACE}_rt" ++ log_debug 5 "add_rule($new_name):$RUN" ++ saveundo rule "$DEL" ++ echo $RUN ++ eval $RUN ++} ++ ++add_lans_rules () { ++ local lan_device ++ local lan_ipaddr ++ config_get lan_device $1 device ++ config_get lan_ipaddr $1 ipaddr ++ config_get lan_network $1 network ++ RUN="ip rule add from $lan_ipaddr fwmark $mark table ${INTERFACE}_rt" ++ DEL="ip rule del from $lan_ipaddr fwmark $mark table ${INTERFACE}_rt" ++ log_debug 5 "add_rule($new_name):$RUN" ++ saveundo rule "$DEL" ++ echo $RUN ++ eval $RUN ++} ++ ++add_route () { ++ local gateway ++ local status ++ local device ++ local weight ++ local name ++ config_get gateway $1 gateway ++ config_get status $1 status ++ ++ [ -z "$gateway" -o -z "$status" ] && return ++ [ "$status" -eq "0" ] && return ++ ++ config_get device $1 device ++ config_get weight $1 weight ++ config_get name $1 name ++ append ROUTE "nexthop via $gateway dev $device weight $weight" ++ ONE_ROUTE="ip route replace default scope global via $gateway dev $device" ++# last_device=$device ++# last_gateway=$gateway ++ COUNT=$(expr ${COUNT} + 1) ++} ++ ++set_route () { ++ local LEVEL ++ local COUNT=0 ++ local ROUTE ++ local ONE_ROUTE ++ ++ config_load mroute ++ config_foreach add_route wanif ++ case $COUNT in ++ 0) ++ MSG="No active connections" ++ LEVEL=3 ++ ROUTE=$(ip route | grep "default" | awk '{ print "ip route del default"}') ++ ;; ++ 1) ++ LEVEL=4 ++ MSG="Active connection $(uci_get "mroute.$last_device.name")" ++ ROUTE=$ONE_ROUTE ++ ;; ++ *) ++# ROUTE=${ROUTE#* } ++ ROUTE="ip route replace default scope global $ROUTE" ++ MSG="Active Load Balancing connections ($COUNT)" ++ LEVEL=5 ++ ;; ++ esac ++ log_debug $LEVEL "$MSG" ++# echo $ROUTE ++ log_debug $LEVEL "$ROUTE" ++ echo $RUN ++ eval $ROUTE ++} ++ ++come_up () { ++ [ "$TYPE" = "wanif" ] && { ++ ### When set network state gateway to "0.0.0.0" 10-routes do not change routes settings. ### ++ [ "$(uci_get "network.$INTERFACE.proto")" = "dhcp" ] && uci_set_state network $INTERFACE gateway "0.0.0.0" ++# echo "Entering multi-wan configuration for ($new_name) $INTERFACE interface" ++ set_rtTables $INTERFACE ++ echo "0" > /proc/sys/net/ipv4/conf/$DEVICE/rp_filter ++ config_load mroute ++# remove_wan $INTERFACE ++ ++ add_net_to_rt $INTERFACE "add_it_self" ${INTERFACE}_rt $new_network $DEVICE $new_ipaddr ++ config_foreach add_new_wan wanif ++ config_foreach add_new_wan lanif ++ add_net_to_rt $INTERFACE "add_new_wan" ${INTERFACE}_rt 127.0.0.0/8 lo ++ ++ add_wan_default ++ add_rule ++ uci_set_state mroute $INTERFACE rt_table ${INTERFACE}_rt ++ } ++ uci_set_state mroute $INTERFACE device $DEVICE ++ uci_set_state mroute $INTERFACE proto $PROTO ++ uci_set_state mroute $INTERFACE ipaddr $new_ipaddr ++# uci_set_state mroute $INTERFACE netmask $new_netmask ++ uci_set_state mroute $INTERFACE gateway $new_gateway ++ uci_set_state mroute $INTERFACE network $new_network ++ uci_set_state mroute $INTERFACE status "1" ++ [ "$TYPE" = "wanif" ] && { ++ local new_dns=$(uci_get_state network "$INTERFACE" dns) ++# [ -z "$new_dns" ] && new_dns="$new_gateway 8.8.8.8 8.8.4.4" ++ uci_set_state mroute $INTERFACE dns "$new_dns" ++ setdns ++ set_route ++ config_foreach add_marks mangles ++ runping ++ } ++} ++ ++go_down () { ++ [ "$TYPE" = "wanif" ] && { ++ stopping ++ undo iptables ++ undo mark ++ undo rule ++ undo route ++ } ++} ++ ++setdns () { ++N=" ++" ++ local resolv ++ for ldns in $(uci show mroute -P /var/state/ | grep 'dns=' | sed -e 's/.*dns=//g' | sed -e 's/^[ \t]+|[ \t]+$//g'); do ++ resolv="$resolv nameserver $ldns$N" ++ done ++ for ldns in $(uci show network -P /var/state/ | grep 'dns=' | sed -e 's/.*dns=//g' | sed -e 's/^[ \t]+|[ \t]+$//g'); do ++ resolv="$resolv nameserver $ldns$N" ++ done ++ resolv=$(echo "$resolv" | sed '/^$/d' | sed 's/^[ ]*//g' | sort | uniq) ++ echo "$resolv" >> /tmp/resolv.conf.auto ++ resolv=$(cat /tmp/resolv.conf.auto) ++ resolv=$(echo "$resolv" | sed '/^$/d' | sed 's/^[ ]*//g' | sort | uniq) ++ echo "$resolv" > /tmp/resolv.conf.auto ++# echo "$resolv" ++} ++ ++stopping() { ++ [ -f /var/mroute/$DEVICE/pid ] && { ++ kill $(cat /tmp/mroute/$DEVICE/pid) ++ rm /var/mroute/$DEVICE/pid > /dev/null 2>&1 ++ } ++ ++ for pid in $(ps aux | grep 'mrping ${DEVICE} ${INTERFACE}' | sed -e '/grep/d' | awk '{print $1}'); do ++ RUN="kill $pid" ++ echo $RUN ++ eval $RUN ++ done ++} ++ ++runping () { ++ mkdir -p /var/mroute/$DEVICE > /dev/null 2>&1 ++ /lib/mroute/mrping $DEVICE $INTERFACE & ++ echo $! > /var/mroute/$DEVICE/pid ++} ++ ++local TYPE=$(uci_get "mroute.$INTERFACE") ++local DEBUG=$(uci_get "mroute.settings.debug") ++ ++local new_ipaddr=$(uci_get "network.$INTERFACE.ipaddr") ++local new_netmask=$(uci_get "network.$INTERFACE.netmask") ++new_netmask=${new_netmask:-"255.255.255.0"} ++local new_dns=$(uci_get "network.$INTERFACE.dns") ++local new_resolv_dns=$(uci_get "network.$INTERFACE.resolv_dns") ++local new_gateway=$(uci_get "network.$INTERFACE.lease_gateway") ++local new_name=$(uci_get "mroute.$INTERFACE.name") ++new_gateway=${new_gateway:-$(uci_get "network.$INTERFACE.gateway")} ++[ "$new_gateway" == "0.0.0.0" ] && unset new_gateway ++local calc=$(ipcalc.sh $new_ipaddr $new_netmask) ++local prefix=${calc##*=} ++local new_network=${calc##*NETWORK=} ++new_network=$(echo $new_network | sed 's/.PRE.*//') ++[ -z "$new_network" ] && new_network=$new_gateway || new_network="$new_network/$prefix" ++ ++echo "$INTERFACE $ACTION" ++[ "$TYPE" != "wanif" ] && exit 0 ++case "$ACTION" in ++ ifup) ++## [ "$(uci_get "mroute.webadmin.enable")" = "1" ] && { ++# go_down ++ [ -z "$new_gatewa" ] && { ++ come_up ++ } ++## } ++ ;; ++ update) ++ echo "############## UPDATE $INTERFACE ################" ++ local old_device=$(uci_get_state mroute $INTERFACE device) ++ local old_ipaddr=$(uci_get_state mroute $INTERFACE ipaddr ) ++ local old_netmask=$(uci_get_state mroute $INTERFACE netmask ) ++ local old_gateway=$(uci_get_state mroute $INTERFACE gateway ) ++ [ "$old_device" != "$DEVICE" -o \ ++ "$old_ipaddr" != "$new_ipaddr" -o \ ++ "$old_gateway" != "$new_gateway" -o \ ++ "$old_network" != "$new_network" ] && { ++ go_down ++ come_up ++ } ++ log_debug 5 "update proccess for $INTERFACE" ++ ;; ++ ifdown) ++ [ "$TYPE" = "wanif" ] && { ++ uci_revert_state mroute $INTERFACE ++ uci_revert_state network $INTERFACE gateway ++ ip route ++ go_down ++ set_route ++ } ++ ;; ++ changeRoute) ++ [ "$TYPE" = "wanif" ] && { ++ echo "################### $INTERFACE INTERNET($STATUS) ####################" ++ [ "$STATUS" = "1" ] && config_foreach add_marks mangles ++ [ "$STATUS" = "0" ] && { ++ undo iptables ++ undo mark ++# rm -f /tmp/mroute/$DEVICE/iptables ++# rm -f /tmp/mroute/$DEVICE/iptables ++ } ++ set_route ++ log_debug 5 "changRoute:ip route flush cahche" ++ ip route flush cache ++ } ++ ;; ++esac +diff --git a/feeds/xwrt/m-route/files/etc/hotplug.d/iface/09-routes b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/09-routes +new file mode 100644 +index 0000000..6a47ed1 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/etc/hotplug.d/iface/09-routes +@@ -0,0 +1,426 @@ ++#!/bin/sh ++# Copyright (C) 2009 Fabian Omar Franzotti ++# http://pastebin.ca/2098184 ++# ++#include /lib/network ++. /etc/functions.sh ++. /lib/config/uci.sh ++ ++local INTERFACE="$INTERFACE" ++local DEVICE="$DEVICE" ++ ++saveundo () { ++ [ ! -e /var/mroute/$DEVICE ] && mkdir -p /var/mroute/$DEVICE ++ [ ! -e /var/mroute/$DEVICE/$1 ] && echo "rm /var/mroute/$DEVICE/$1" > /var/mroute/$DEVICE/$1 ++ sed -e "1i $2" /var/mroute/$DEVICE/$1 > /var/mroute/$DEVICE/$1.tmp ++ mv -f /var/mroute/$DEVICE/$1.tmp /var/mroute/$DEVICE/$1 ++} ++ ++undo () { ++ file="/var/mroute/$DEVICE/$1" ++ echo "undo $file" ++ if [ -e "$file" ]; then ++ sh "$file" ++# cat "$file" | awk '{ print $0; system( $0 ); }' ++ echo "End $file" ++# rm $file ++ fi ++ ++# [ -e "$file" ] && { ++# while read line; do echo "$line"; eval "$line"; done < $file ++# echo "" > $file ++# } ++# ++# [ -e "$file" ] && { ++# sleep 3 ++# rm "$file" ++# } ++ ++} ++ ++log_debug() { ++ if [ $DEBUG -eq $1 -o $1 -lt 4 ]; then ++ logger -t mroute -p $1 -s $2 ++ fi ++} ++ ++set_rtTables () { ++# ++# reserved values ++# ++# echo 255 local > /etc/iproute2/rt_tables ++# echo 254 main >> /etc/iproute2/rt_tables ++# echo 253 default >> /etc/iproute2/rt_tables ++# echo 0 unspec >> /etc/iproute2/rt_tables ++ local n ++ local RT ++ ++ n=200 ++ RT=${1}_rt ++ if [ -z "`cat /etc/iproute2/rt_tables | grep $RT`" ] ; then ++ while [ "`cat /etc/iproute2/rt_tables | grep "^$n"`" ] ++ do ++ n=`expr $n + 1` ++ done ++ echo "$n $RT" >> /etc/iproute2/rt_tables ++ log_debug 5 "set_rt_Tables:$n $RT" ++ n=`expr $n + 1` ++ fi ++ eval ${1}_RT_TABLE=$RT ++ log_debug 5 "set_rt_Tables:${1}_RT_TABLE=$RT.....OK" ++} ++ ++uci_get() { ++ uci -P /var/state get "$1" 2>/dev/null ++} ++ ++local iftype=$(uci_get "mroute.$INTERFACE") ++[ -z "$iftype" ] && exit 0 ++ ++add_new_wan () { ++ local network ++ local device ++ local ipaddr ++ local type ++ config_get network $1 network ++ [ -z "$network" ] && return ++ config_get ipaddr $1 ipaddr ++ config_get device $1 device ++ type=$(uci_get "mroute.$1") ++ [ "$type" = "lanif" ] && unset ipaddr ++ ++ add_net_to_rt $1 "add_new_wan" ${INTERFACE}_rt $network $device $ipaddr ++} ++ ++add_marks () { ++ local outwan ++ local input ++ local protocol ++ local destination ++ local port ++ local mark ++ local RUN ++ local status ++# status=$(uci_get_state mroute $INTERFACE status) ++# [ -z "$status" -o "$status" == "0" ] && return ++ config_get mark $1 mark ++ config_get outwan $1 outwan ++ [ -z "$mark" ] && return ++ [ -z "$outwan" ] && return ++ [ "$outwan" != "$INTERFACE" ] && return ++ config_get input $1 input ++ config_get protocol $1 protocol ++ config_get destination $1 destination ++ config_get ports $1 dport ++ if [ -z "$protocol" ]; then ++ protocol="" ++ else ++ protocol="-p $protocol" ++ fi ++ ++ if [ -z "$input" ]; then ++ RUN="ip rule add fwmark $mark table ${outwan}_rt" ++ DEL="ip rule del fwmark $mark table ${outwan}_rt" ++ input="" ++ else ++ RUN="ip rule add from $input fwmark $mark table ${outwan}_rt" ++ DEL="ip rule del from $input fwmark $mark table ${outwan}_rt" ++ input="-i $input" ++ fi ++ saveundo mark "$DEL" ++ echo $RUN ++ eval $RUN ++ if [ -z "$destination" ]; then ++ for port in $ports; do ++ RUN="iptables -A PREROUTING -t mangle $input $protocol --dport $port -j MARK --set-mark $mark" ++ DEL="iptables -D PREROUTING -t mangle $input $protocol --dport $port -j MARK --set-mark $mark" ++ saveundo iptables "$DEL" ++ echo $RUN ++ eval $RUN ++ done ++ else ++ for dest in $destination; do ++ dest="-d $dest" ++ if [ -z $ports ]; then ++ RUN="iptables -A PREROUTING -t mangle $input $protocol $dest -j MARK --set-mark $mark" ++ DEL="iptables -D PREROUTING -t mangle $input $protocol $dest -j MARK --set-mark $mark" ++ saveundo iptables "$DEL" ++ echo $RUN ++ eval $RUN ++ else ++ for port in $ports; do ++ RUN="iptables -A PREROUTING -t mangle $input $protocol $dest --dport $port -j MARK --set-mark $mark" ++ DEL="iptables -D PREROUTING -t mangle $input $protocol $dest --dport $port -j MARK --set-mark $mark" ++ saveundo iptables "$DEL" ++ echo $RUN ++ eval $RUN ++ done ++ fi ++ done ++ fi ++} ++ ++add_wan_default () { ++ local RUN="ip route add default via $new_gateway table ${INTERFACE}_rt" ++ local DEL="ip route del default via $new_gateway table ${INTERFACE}_rt" ++ saveundo route "$DEL" ++ log_debug 5 "add_wan($new_name):$RUN" ++ echo $RUN ++ eval $RUN ++} ++ ++add_net_to_rt () { ++ # iface = $1 ++ # howsend = $2 ++ # rt_table = $3 ++ # network = $4 ++ # device = $5 ++ # ipaddr = $6 ++ local RUN="ip route add $4 dev $5 src $6 table $3" ++ local DEL="ip route del $4 dev $5 src $6 table $3" ++ [ -z "$6" ] && { ++ RUN="ip route add $4 dev $5 table $3" ++ DEL="ip route del $4 dev $5 table $3" ++ } ++ log_debug 5 "$2 ($new_name)$1 $3:$RUN" ++ saveundo route "$DEL" ++ echo $RUN ++ eval $RUN ++} ++ ++add_rule () { ++ local RUN ++ local mark=$(uci_get "mroute.${INTERFACE}.mark") ++ [ -n "$mark" ] && { ++ config_foreach add_lans_rules lanif ++ } ++ RUN="ip rule add from $new_ipaddr table ${INTERFACE}_rt" ++ DEL="ip rule del from $new_ipaddr table ${INTERFACE}_rt" ++ log_debug 5 "add_rule($new_name):$RUN" ++ saveundo rule "$DEL" ++ echo $RUN ++ eval $RUN ++} ++ ++add_lans_rules () { ++ local lan_device ++ local lan_ipaddr ++ config_get lan_device $1 device ++ config_get lan_ipaddr $1 ipaddr ++ config_get lan_network $1 network ++ RUN="ip rule add from $lan_ipaddr fwmark $mark table ${INTERFACE}_rt" ++ DEL="ip rule del from $lan_ipaddr fwmark $mark table ${INTERFACE}_rt" ++ log_debug 5 "add_rule($new_name):$RUN" ++ saveundo rule "$DEL" ++ echo $RUN ++ eval $RUN ++} ++ ++add_route () { ++ local gateway ++ local status ++ local device ++ local weight ++ local name ++ config_get gateway $1 gateway ++ config_get status $1 status ++ ++ [ -z "$gateway" -o -z "$status" ] && return ++ [ "$status" -eq "0" ] && return ++ ++ config_get device $1 device ++ config_get weight $1 weight ++ config_get name $1 name ++ append ROUTE "nexthop via $gateway dev $device weight $weight" ++ ONE_ROUTE="ip route replace default scope global via $gateway dev $device" ++# last_device=$device ++# last_gateway=$gateway ++ COUNT=$(expr ${COUNT} + 1) ++} ++ ++set_route () { ++ local LEVEL ++ local COUNT=0 ++ local ROUTE ++ local ONE_ROUTE ++ ++ config_load mroute ++ config_foreach add_route wanif ++ case $COUNT in ++ 0) ++ MSG="No active connections" ++ LEVEL=3 ++ ROUTE=$(ip route | grep "default" | awk '{ print "ip route del default"}') ++ ;; ++ 1) ++ LEVEL=4 ++ MSG="Active connection $(uci_get "mroute.$last_device.name")" ++ ROUTE=$ONE_ROUTE ++ ;; ++ *) ++# ROUTE=${ROUTE#* } ++ ROUTE="ip route replace default scope global $ROUTE" ++ MSG="Active Load Balancing connections ($COUNT)" ++ LEVEL=5 ++ ;; ++ esac ++ log_debug $LEVEL "$MSG" ++# echo $ROUTE ++ log_debug $LEVEL "$ROUTE" ++ echo $RUN ++ eval $ROUTE ++} ++ ++come_up () { ++ [ "$TYPE" = "wanif" ] && { ++ ### When set network state gateway to "0.0.0.0" 10-routes do not change routes settings. ### ++ [ "$(uci_get "network.$INTERFACE.proto")" = "dhcp" ] && uci_set_state network $INTERFACE gateway "0.0.0.0" ++# echo "Entering multi-wan configuration for ($new_name) $INTERFACE interface" ++ set_rtTables $INTERFACE ++ echo "0" > /proc/sys/net/ipv4/conf/$DEVICE/rp_filter ++ config_load mroute ++# remove_wan $INTERFACE ++ ++ add_net_to_rt $INTERFACE "add_it_self" ${INTERFACE}_rt $new_network $DEVICE $new_ipaddr ++ config_foreach add_new_wan wanif ++ config_foreach add_new_wan lanif ++ add_net_to_rt $INTERFACE "add_new_wan" ${INTERFACE}_rt 127.0.0.0/8 lo ++ ++ add_wan_default ++ add_rule ++ uci_set_state mroute $INTERFACE rt_table ${INTERFACE}_rt ++ } ++ uci_set_state mroute $INTERFACE device $DEVICE ++ uci_set_state mroute $INTERFACE proto $PROTO ++ uci_set_state mroute $INTERFACE ipaddr $new_ipaddr ++# uci_set_state mroute $INTERFACE netmask $new_netmask ++ uci_set_state mroute $INTERFACE gateway $new_gateway ++ uci_set_state mroute $INTERFACE network $new_network ++ uci_set_state mroute $INTERFACE status "1" ++ [ "$TYPE" = "wanif" ] && { ++ local new_dns=$(uci_get_state network "$INTERFACE" dns) ++# [ -z "$new_dns" ] && new_dns="$new_gateway 8.8.8.8 8.8.4.4" ++ uci_set_state mroute $INTERFACE dns "$new_dns" ++ setdns ++ set_route ++ config_foreach add_marks mangles ++ runping ++ } ++} ++ ++go_down () { ++ [ "$TYPE" = "wanif" ] && { ++ stopping ++ undo iptables ++ undo mark ++ undo rule ++ undo route ++ } ++} ++ ++setdns () { ++N=" ++" ++ local resolv ++ for ldns in $(uci show mroute -P /var/state/ | grep 'dns=' | sed -e 's/.*dns=//g' | sed -e 's/^[ \t]+|[ \t]+$//g'); do ++ resolv="$resolv nameserver $ldns$N" ++ done ++ for ldns in $(uci show network -P /var/state/ | grep 'dns=' | sed -e 's/.*dns=//g' | sed -e 's/^[ \t]+|[ \t]+$//g'); do ++ resolv="$resolv nameserver $ldns$N" ++ done ++ resolv=$(echo "$resolv" | sed '/^$/d' | sed 's/^[ ]*//g' | sort | uniq) ++ echo "$resolv" >> /tmp/resolv.conf.auto ++ resolv=$(cat /tmp/resolv.conf.auto) ++ resolv=$(echo "$resolv" | sed '/^$/d' | sed 's/^[ ]*//g' | sort | uniq) ++ echo "$resolv" > /tmp/resolv.conf.auto ++# echo "$resolv" ++} ++ ++stopping() { ++ [ -f /var/mroute/$DEVICE/pid ] && { ++ kill $(cat /tmp/mroute/$DEVICE/pid) ++ rm /var/mroute/$DEVICE/pid > /dev/null 2>&1 ++ } ++ ++ for pid in $(ps aux | grep 'mrping ${DEVICE} ${INTERFACE}' | sed -e '/grep/d' | awk '{print $1}'); do ++ RUN="kill $pid" ++ echo $RUN ++ eval $RUN ++ done ++} ++ ++runping () { ++ mkdir -p /var/mroute/$DEVICE > /dev/null 2>&1 ++ /lib/mroute/mrping $DEVICE $INTERFACE & ++ echo $! > /var/mroute/$DEVICE/pid ++} ++ ++local TYPE=$(uci_get "mroute.$INTERFACE") ++local DEBUG=$(uci_get "mroute.settings.debug") ++ ++local new_ipaddr=$(uci_get "network.$INTERFACE.ipaddr") ++local new_netmask=$(uci_get "network.$INTERFACE.netmask") ++new_netmask=${new_netmask:-"255.255.255.0"} ++local new_dns=$(uci_get "network.$INTERFACE.dns") ++local new_resolv_dns=$(uci_get "network.$INTERFACE.resolv_dns") ++local new_gateway=$(uci_get "network.$INTERFACE.lease_gateway") ++local new_name=$(uci_get "mroute.$INTERFACE.name") ++new_gateway=${new_gateway:-$(uci_get "network.$INTERFACE.gateway")} ++[ "$new_gateway" == "0.0.0.0" ] && unset new_gateway ++local calc=$(ipcalc.sh $new_ipaddr $new_netmask) ++local prefix=${calc##*=} ++local new_network=${calc##*NETWORK=} ++new_network=$(echo $new_network | sed 's/.PRE.*//') ++[ -z "$new_network" ] && new_network=$new_gateway || new_network="$new_network/$prefix" ++ ++echo "$INTERFACE $ACTION" ++[ "$TYPE" != "wanif" ] && exit 0 ++case "$ACTION" in ++ ifup) ++## [ "$(uci_get "mroute.webadmin.enable")" = "1" ] && { ++# go_down ++ [ -z "$new_gatewa" ] && { ++ come_up ++ } ++## } ++ ;; ++ update) ++ echo "############## UPDATE $INTERFACE ################" ++ local old_device=$(uci_get_state mroute $INTERFACE device) ++ local old_ipaddr=$(uci_get_state mroute $INTERFACE ipaddr ) ++ local old_netmask=$(uci_get_state mroute $INTERFACE netmask ) ++ local old_gateway=$(uci_get_state mroute $INTERFACE gateway ) ++ [ "$old_device" != "$DEVICE" -o \ ++ "$old_ipaddr" != "$new_ipaddr" -o \ ++ "$old_gateway" != "$new_gateway" -o \ ++ "$old_network" != "$new_network" ] && { ++ go_down ++ come_up ++ } ++ log_debug 5 "update proccess for $INTERFACE" ++ ;; ++ ifdown) ++ [ "$TYPE" = "wanif" ] && { ++ uci_revert_state mroute $INTERFACE ++ uci_revert_state network $INTERFACE gateway ++ ip route ++ go_down ++ set_route ++ } ++ ;; ++ changeRoute) ++ [ "$TYPE" = "wanif" ] && { ++ echo "################### $INTERFACE INTERNET($STATUS) ####################" ++ [ "$STATUS" = "1" ] && config_foreach add_marks mangles ++ [ "$STATUS" = "0" ] && { ++ undo iptables ++ undo mark ++# rm -f /tmp/mroute/$DEVICE/iptables ++# rm -f /tmp/mroute/$DEVICE/iptables ++ } ++ set_route ++ log_debug 5 "changRoute:ip route flush cahche" ++ ip route flush cache ++ } ++ ;; ++esac +diff --git a/feeds/xwrt/m-route/files/lib/.svn/all-wcprops b/feeds/xwrt/m-route/files/lib/.svn/all-wcprops +new file mode 100644 +index 0000000..6053843 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/lib/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 50 ++/svn/!svn/ver/4987/trunk/package/m-route/files/lib ++END +diff --git a/feeds/xwrt/m-route/files/lib/.svn/entries b/feeds/xwrt/m-route/files/lib/.svn/entries +new file mode 100644 +index 0000000..48e926e +--- /dev/null ++++ b/feeds/xwrt/m-route/files/lib/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files/lib ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++mroute ++dir ++ +diff --git a/feeds/xwrt/m-route/files/lib/mroute/.svn/all-wcprops b/feeds/xwrt/m-route/files/lib/mroute/.svn/all-wcprops +new file mode 100644 +index 0000000..54441f8 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/lib/mroute/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 57 ++/svn/!svn/ver/4987/trunk/package/m-route/files/lib/mroute ++END ++mrping ++K 25 ++svn:wc:ra_dav:version-url ++V 64 ++/svn/!svn/ver/4987/trunk/package/m-route/files/lib/mroute/mrping ++END +diff --git a/feeds/xwrt/m-route/files/lib/mroute/.svn/entries b/feeds/xwrt/m-route/files/lib/mroute/.svn/entries +new file mode 100644 +index 0000000..27d9bd1 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/lib/mroute/.svn/entries +@@ -0,0 +1,62 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/files/lib/mroute ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++mrping ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++da286b0c0a215f5e57217c1f21417fc1 ++2012-01-03T15:20:39.059736Z ++4987 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2855 ++ +diff --git a/feeds/xwrt/m-route/files/lib/mroute/.svn/text-base/mrping.svn-base b/feeds/xwrt/m-route/files/lib/mroute/.svn/text-base/mrping.svn-base +new file mode 100644 +index 0000000..5c6e8b2 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/lib/mroute/.svn/text-base/mrping.svn-base +@@ -0,0 +1,104 @@ ++#!/bin/sh ++ ++. /etc/functions.sh ++. /lib/config/uci.sh ++ ++internetping () { ++ ip route replace default via $gateway dev $DEVICE table default > /dev/null 2>&1 ++ ping -W $TIMEOUT -I $DEVICE -c 1 $TESTIP > /dev/null 2>&1 ++ cps=$? ++ if [ "$cps" -eq 1 ]; then ++ internetc=$(expr $internetc + 1) ++ else ++ internetc="0" ++ fi ++# echo "$MYINTERFACE ping $DEVICE $TESTIP Error($cps) count($internetc)" ++ if [ "$STATUS" -eq "0" ]; then ++ [ "$internetc" -eq 0 ] && { ++ STATUS=1 ++ uci_set_state mroute "$MYINTERFACE" status 1 ++ env -i ACTION="changeRoute" INTERFACE="$MYINTERFACE" DEVICE="$DEVICE" PROTO="$proto" STATUS="$STATUS" /sbin/hotplug-call iface ++ return ++ } ++ [ "$internetc" -ne 0 ] && { ++ gatewayping ++ } ++ else ++ [ "$internetc" -eq 2 ] && { ++ STATUS="0" ++# echo "$MYINTERFACE Internet = $STATUS - cps = $cps" ++ uci_set_state mroute "$MYINTERFACE" status 0 ++ env -i ACTION="changeRoute" INTERFACE="$MYINTERFACE" DEVICE="$DEVICE" PROTO="$proto" STATUS="$STATUS" /sbin/hotplug-call iface ++ } ++ [ "$internetc" -ne 0 ] && { ++ gatewayping ++ } ++ fi ++} ++ ++gatewayping () { ++ ip route replace default via $gateway dev $DEVICE table default > /dev/null 2>&1 ++ ping -W $TIMEOUT -I $DEVICE -c 1 $gateway > /dev/null 2>&1 ++ gwp=$? ++ if [ "$gwp" == "1" ]; then ++ gatewayerror=$(expr $gatewayerror + 1) ++ [ "$gatewayerror" -gt 1 ] && { ++# echo "RESET INTERFACE $MYINTERFACE" ++ ifup $MYINTERFACE ++ } ++ else ++ gatewayerror=0 ++ fi ++# echo "$MYINTERFACE ping $DEVICE $gateway Error($gwp) count($internetc)" ++} ++ ++myping(){ ++ internetping ++# echo "$MYINTERFACE Internet=$STATUS - cps=$cps count($internetc)" ++ [ "$STATUS" -eq 1 ] && rx_packets=$(cat /sys/class/net/$DEVICE/statistics/rx_packets) ++} ++ ++local DEVICE=$1 ++local MYINTERFACE=$2 ++#echo "PING $MYINTERFACE" ++# ++uci_load mroute ++TESTIP="$CONFIG_settings_testip" ++TIMEOUT="$CONFIG_settings_timeout" ++SLEEPTIME="$CONFIG_settings_sleeptime" ++local proto=$(uci_get_state network "$MYINTERFACE" proto) ++local gateway=$(uci_get_state mroute "$MYINTERFACE" gateway) ++ping -W $TIMEOUT -I $device -c 1 $TESTIP > /dev/null 2>&1 ++cps=$? ++ping -W $TIMEOUT -I $device -c 1 $gateway > /dev/null 2>&1 ++gwp=$? ++rx_bytes=$(cat /sys/class/net/$DEVICE/statistics/rx_bytes) ++rx_packets=$(cat /sys/class/net/$DEVICE/statistics/rx_packets) ++rx_prev=0 ++count=0 ++internetc=0 ++gatewayerror=0 ++ ++STATUS="1" #$(uci_get_state mroute "$MYINTERFACE" status) ++while : ; do ++ devstatus=$(cat /sys/class/net/$DEVICE/operstate) ++ if [ "up" == "$devstatus" ]; then ++ if [ "$rx_packets" == "$rx_prev" ]; then #### No RX trafic in MYINTERFACE ++# count=$(expr $count + 1) ++# if [ "$count" -eq 2 ]; then ++ myping ++# fi ++ else ++ count=0 ++ sleep $SLEEPTIME ++# echo "$MYINTERFACE $rx_packets" ++ rx_prev="$rx_packets" ++ rx_packets=$(cat /sys/class/net/$DEVICE/statistics/rx_packets) ++ fi ++ sleep 1 ++# sleep $SLEEPTIME ++ else ++# echo "$MYINTERFACE $devstatus" ++ ifup $MYINTERFACE ++ fi ++done +diff --git a/feeds/xwrt/m-route/files/lib/mroute/mrping b/feeds/xwrt/m-route/files/lib/mroute/mrping +new file mode 100644 +index 0000000..5c6e8b2 +--- /dev/null ++++ b/feeds/xwrt/m-route/files/lib/mroute/mrping +@@ -0,0 +1,104 @@ ++#!/bin/sh ++ ++. /etc/functions.sh ++. /lib/config/uci.sh ++ ++internetping () { ++ ip route replace default via $gateway dev $DEVICE table default > /dev/null 2>&1 ++ ping -W $TIMEOUT -I $DEVICE -c 1 $TESTIP > /dev/null 2>&1 ++ cps=$? ++ if [ "$cps" -eq 1 ]; then ++ internetc=$(expr $internetc + 1) ++ else ++ internetc="0" ++ fi ++# echo "$MYINTERFACE ping $DEVICE $TESTIP Error($cps) count($internetc)" ++ if [ "$STATUS" -eq "0" ]; then ++ [ "$internetc" -eq 0 ] && { ++ STATUS=1 ++ uci_set_state mroute "$MYINTERFACE" status 1 ++ env -i ACTION="changeRoute" INTERFACE="$MYINTERFACE" DEVICE="$DEVICE" PROTO="$proto" STATUS="$STATUS" /sbin/hotplug-call iface ++ return ++ } ++ [ "$internetc" -ne 0 ] && { ++ gatewayping ++ } ++ else ++ [ "$internetc" -eq 2 ] && { ++ STATUS="0" ++# echo "$MYINTERFACE Internet = $STATUS - cps = $cps" ++ uci_set_state mroute "$MYINTERFACE" status 0 ++ env -i ACTION="changeRoute" INTERFACE="$MYINTERFACE" DEVICE="$DEVICE" PROTO="$proto" STATUS="$STATUS" /sbin/hotplug-call iface ++ } ++ [ "$internetc" -ne 0 ] && { ++ gatewayping ++ } ++ fi ++} ++ ++gatewayping () { ++ ip route replace default via $gateway dev $DEVICE table default > /dev/null 2>&1 ++ ping -W $TIMEOUT -I $DEVICE -c 1 $gateway > /dev/null 2>&1 ++ gwp=$? ++ if [ "$gwp" == "1" ]; then ++ gatewayerror=$(expr $gatewayerror + 1) ++ [ "$gatewayerror" -gt 1 ] && { ++# echo "RESET INTERFACE $MYINTERFACE" ++ ifup $MYINTERFACE ++ } ++ else ++ gatewayerror=0 ++ fi ++# echo "$MYINTERFACE ping $DEVICE $gateway Error($gwp) count($internetc)" ++} ++ ++myping(){ ++ internetping ++# echo "$MYINTERFACE Internet=$STATUS - cps=$cps count($internetc)" ++ [ "$STATUS" -eq 1 ] && rx_packets=$(cat /sys/class/net/$DEVICE/statistics/rx_packets) ++} ++ ++local DEVICE=$1 ++local MYINTERFACE=$2 ++#echo "PING $MYINTERFACE" ++# ++uci_load mroute ++TESTIP="$CONFIG_settings_testip" ++TIMEOUT="$CONFIG_settings_timeout" ++SLEEPTIME="$CONFIG_settings_sleeptime" ++local proto=$(uci_get_state network "$MYINTERFACE" proto) ++local gateway=$(uci_get_state mroute "$MYINTERFACE" gateway) ++ping -W $TIMEOUT -I $device -c 1 $TESTIP > /dev/null 2>&1 ++cps=$? ++ping -W $TIMEOUT -I $device -c 1 $gateway > /dev/null 2>&1 ++gwp=$? ++rx_bytes=$(cat /sys/class/net/$DEVICE/statistics/rx_bytes) ++rx_packets=$(cat /sys/class/net/$DEVICE/statistics/rx_packets) ++rx_prev=0 ++count=0 ++internetc=0 ++gatewayerror=0 ++ ++STATUS="1" #$(uci_get_state mroute "$MYINTERFACE" status) ++while : ; do ++ devstatus=$(cat /sys/class/net/$DEVICE/operstate) ++ if [ "up" == "$devstatus" ]; then ++ if [ "$rx_packets" == "$rx_prev" ]; then #### No RX trafic in MYINTERFACE ++# count=$(expr $count + 1) ++# if [ "$count" -eq 2 ]; then ++ myping ++# fi ++ else ++ count=0 ++ sleep $SLEEPTIME ++# echo "$MYINTERFACE $rx_packets" ++ rx_prev="$rx_packets" ++ rx_packets=$(cat /sys/class/net/$DEVICE/statistics/rx_packets) ++ fi ++ sleep 1 ++# sleep $SLEEPTIME ++ else ++# echo "$MYINTERFACE $devstatus" ++ ifup $MYINTERFACE ++ fi ++done +diff --git a/feeds/xwrt/m-route/ipkg/.svn/all-wcprops b/feeds/xwrt/m-route/ipkg/.svn/all-wcprops +new file mode 100644 +index 0000000..1ad8337 +--- /dev/null ++++ b/feeds/xwrt/m-route/ipkg/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 45 ++/svn/!svn/ver/4643/trunk/package/m-route/ipkg ++END +diff --git a/feeds/xwrt/m-route/ipkg/.svn/entries b/feeds/xwrt/m-route/ipkg/.svn/entries +new file mode 100644 +index 0000000..e2b082e +--- /dev/null ++++ b/feeds/xwrt/m-route/ipkg/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/m-route/ipkg ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-01-10T17:55:44.730441Z ++4643 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ +diff --git a/feeds/xwrt/netsukuku/.svn/all-wcprops b/feeds/xwrt/netsukuku/.svn/all-wcprops +new file mode 100644 +index 0000000..1bb10eb +--- /dev/null ++++ b/feeds/xwrt/netsukuku/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 42 ++/svn/!svn/ver/3399/trunk/package/netsukuku ++END +diff --git a/feeds/xwrt/netsukuku/.svn/dir-prop-base b/feeds/xwrt/netsukuku/.svn/dir-prop-base +new file mode 100644 +index 0000000..b38a26b +--- /dev/null ++++ b/feeds/xwrt/netsukuku/.svn/dir-prop-base +@@ -0,0 +1,5 @@ ++K 9 ++svk:merge ++V 64 ++37f03152-6227-0410-a929-8f56fb06ea43:/trunk/package/netsukuku:58 ++END +diff --git a/feeds/xwrt/netsukuku/.svn/entries b/feeds/xwrt/netsukuku/.svn/entries +new file mode 100644 +index 0000000..62c235d +--- /dev/null ++++ b/feeds/xwrt/netsukuku/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/netsukuku ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2007-03-11T19:36:20.115926Z ++2871 ++wallace78 ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++files ++dir ++ +diff --git a/feeds/xwrt/netsukuku/files/.svn/all-wcprops b/feeds/xwrt/netsukuku/files/.svn/all-wcprops +new file mode 100644 +index 0000000..c4889bf +--- /dev/null ++++ b/feeds/xwrt/netsukuku/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 48 ++/svn/!svn/ver/3399/trunk/package/netsukuku/files ++END +diff --git a/feeds/xwrt/netsukuku/files/.svn/entries b/feeds/xwrt/netsukuku/files/.svn/entries +new file mode 100644 +index 0000000..3dd4748 +--- /dev/null ++++ b/feeds/xwrt/netsukuku/files/.svn/entries +@@ -0,0 +1,28 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/netsukuku/files ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2007-03-11T19:36:20.115926Z ++2871 ++wallace78 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ +diff --git a/feeds/xwrt/webif-applications/.svn/all-wcprops b/feeds/xwrt/webif-applications/.svn/all-wcprops +new file mode 100644 +index 0000000..dfcddb4 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 51 ++/svn/!svn/ver/4804/trunk/package/webif-applications ++END ++Makefile ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/svn/!svn/ver/4790/trunk/package/webif-applications/Makefile ++END +diff --git a/feeds/xwrt/webif-applications/.svn/entries b/feeds/xwrt/webif-applications/.svn/entries +new file mode 100644 +index 0000000..aa88166 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/.svn/entries +@@ -0,0 +1,68 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++files ++dir ++ ++ipkg ++dir ++ ++Makefile ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++db4912ba9007904e8e86ce76d96829f4 ++2009-08-14T17:35:24.543376Z ++4790 ++fofware@gmail.com ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++602 ++ +diff --git a/feeds/xwrt/webif-applications/.svn/text-base/Makefile.svn-base b/feeds/xwrt/webif-applications/.svn/text-base/Makefile.svn-base +new file mode 100644 +index 0000000..46b69db +--- /dev/null ++++ b/feeds/xwrt/webif-applications/.svn/text-base/Makefile.svn-base +@@ -0,0 +1,29 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=webif-applications ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/webif-applications ++ SECTION:=admin ++ CATEGORY:=Administration ++ SUBMENU:=webif ++ DEPENDS:=+webif ++ TITLE:=XWrt applications plugin ++endef ++ ++define Build/Compile ++endef ++ ++ ++define Package/webif-applications/install ++ $(CP) -a ./files/* $(1)/ ++ $(INSTALL_BIN) ./files/www/cgi-bin/webif/* $(1)/www/cgi-bin/webif/ ++endef ++ ++$(eval $(call BuildPackage,webif-applications)) +diff --git a/feeds/xwrt/webif-applications/Makefile b/feeds/xwrt/webif-applications/Makefile +new file mode 100644 +index 0000000..46b69db +--- /dev/null ++++ b/feeds/xwrt/webif-applications/Makefile +@@ -0,0 +1,29 @@ ++include $(TOPDIR)/rules.mk ++ ++PKG_NAME:=webif-applications ++PKG_VERSION:=0.1 ++PKG_RELEASE:=1 ++ ++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ++PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/webif-applications ++ SECTION:=admin ++ CATEGORY:=Administration ++ SUBMENU:=webif ++ DEPENDS:=+webif ++ TITLE:=XWrt applications plugin ++endef ++ ++define Build/Compile ++endef ++ ++ ++define Package/webif-applications/install ++ $(CP) -a ./files/* $(1)/ ++ $(INSTALL_BIN) ./files/www/cgi-bin/webif/* $(1)/www/cgi-bin/webif/ ++endef ++ ++$(eval $(call BuildPackage,webif-applications)) +diff --git a/feeds/xwrt/webif-applications/files/.svn/all-wcprops b/feeds/xwrt/webif-applications/files/.svn/all-wcprops +new file mode 100644 +index 0000000..1f942e3 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 57 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files ++END +diff --git a/feeds/xwrt/webif-applications/files/.svn/entries b/feeds/xwrt/webif-applications/files/.svn/entries +new file mode 100644 +index 0000000..6baf291 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications/files ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++www ++dir ++ +diff --git a/feeds/xwrt/webif-applications/files/www/.svn/all-wcprops b/feeds/xwrt/webif-applications/files/www/.svn/all-wcprops +new file mode 100644 +index 0000000..c7d7c5e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 61 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www ++END +diff --git a/feeds/xwrt/webif-applications/files/www/.svn/entries b/feeds/xwrt/webif-applications/files/www/.svn/entries +new file mode 100644 +index 0000000..4c8d330 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/.svn/entries +@@ -0,0 +1,34 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications/files/www ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++images ++dir ++ ++cgi-bin ++dir ++ +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/.svn/all-wcprops b/feeds/xwrt/webif-applications/files/www/cgi-bin/.svn/all-wcprops +new file mode 100644 +index 0000000..980f894 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/.svn/all-wcprops +@@ -0,0 +1,5 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/.svn/entries b/feeds/xwrt/webif-applications/files/www/cgi-bin/.svn/entries +new file mode 100644 +index 0000000..3327af2 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/.svn/entries +@@ -0,0 +1,31 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications/files/www/cgi-bin ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++webif ++dir ++ +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/all-wcprops b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/all-wcprops +new file mode 100644 +index 0000000..4a13fbf +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/all-wcprops +@@ -0,0 +1,59 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 75 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif ++END ++applications.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 91 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications.sh ++END ++applications-cifs.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-cifs.sh ++END ++applications-hydra.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 97 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-hydra.sh ++END ++applications-shell.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 97 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-shell.sh ++END ++applications-dlmanager.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 101 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-dlmanager.sh ++END ++applications-ipkg.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-ipkg.sh ++END ++applications-swap.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 96 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-swap.sh ++END ++applications-proftpd.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 99 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-proftpd.sh ++END ++applications-aircrack.sh ++K 25 ++svn:wc:ra_dav:version-url ++V 100 ++/svn/!svn/ver/4804/trunk/package/webif-applications/files/www/cgi-bin/webif/applications-aircrack.sh ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/entries b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/entries +new file mode 100644 +index 0000000..9095ed8 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/entries +@@ -0,0 +1,334 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications/files/www/cgi-bin/webif ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++applications.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++1cdf45f4d98fe2b056affeb3fb2efac8 ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++16541 ++ ++applications-cifs.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++f69c4d3be44b7e979dd21096751854bf ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6012 ++ ++applications-hydra.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++a2c3ebfb6c2560103cca820ca8548231 ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9257 ++ ++applications-shell.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++ac2698ef9ef27ec7946047b2ea50b162 ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++5235 ++ ++applications-dlmanager.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++17e5104cb77b311e206a26c9f913018d ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++11930 ++ ++applications-ipkg.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++d2d06f18f92d9676b57bde1ac10c56b2 ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2088 ++ ++applications-swap.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++a48300976d3675ba96e7120b3bc570ea ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3909 ++ ++applications-proftpd.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++ab571171e7d013dc50540a3d8d564b4e ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4335 ++ ++applications-aircrack.sh ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++9bc660a8275c997a9372496532c7d77f ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++14044 ++ +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-aircrack.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-aircrack.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-aircrack.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-cifs.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-cifs.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-cifs.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-dlmanager.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-dlmanager.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-dlmanager.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-hydra.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-hydra.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-hydra.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-ipkg.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-ipkg.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-ipkg.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-proftpd.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-proftpd.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-proftpd.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-shell.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-shell.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-shell.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-swap.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-swap.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications-swap.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications.sh.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/prop-base/applications.sh.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-aircrack.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-aircrack.sh.svn-base +new file mode 100644 +index 0000000..5638097 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-aircrack.sh.svn-base +@@ -0,0 +1,303 @@ ++#!/usr/bin/webif-page ++ ++# ++. /usr/lib/webif/webif.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "AirCrack" "" "aircrack-ng" ++ ++ if is_package_installed "aircrack-ng" && is_package_installed "libpthread" ; then ++ mkdir /wep 2> /dev/null ++ ##### Make config file ++ ++ if [ ! -s "/etc/config/app.aircrack" ] ; then ++ echo "config aircrack set ++ option path '/wep' ++ option cpath '/wep' ++ option ivs 'checked' ++ option key '128'" > /etc/config/app.aircrack ++ fi ++ echo_install_complete ++ fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "AirCrack" "app.aircrack" "aircrack-ng" "libpthread" ++ rmdir /wep 2> /dev/null ++exit ++fi ++ ++if is_package_installed "aircrack-ng" && is_package_installed "libpthread" ; then ++ ++ cat < ++
++EOF ++ ######## Read config ++ uci_load "app.aircrack" ++ CFG_PATH="$CONFIG_set_path" ++ CFG_CPATH="$CONFIG_set_cpath" ++ CFG_WPATH="$CONFIG_set_wpath" ++ CFG_CHANNEL="$CONFIG_set_channel" ++ CFG_BOOTAIR="$CONFIG_set_bootaircrack" ++ CFG_BOOTDUMP="$CONFIG_set_bootairodump" ++ #CFG_BOOTPLAY="$CONFIG_set_bootairoplay" ++ CFG_IVS="$CONFIG_set_ivs" ++ CFG_KEY="$CONFIG_set_key" ++ ++ if equal $CFG_IVS "checked" ; then hIVS="--ivs" ; fi ++ ++ ######## Run/Stop Airodump ++ if ! empty "$FORM_run_airodump"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=airodump "
Starting Airodump ...
" ++ killall -q airodump-ng 2> /dev/null ++ wlc monitor 1 ++ airodump-ng $hIVS -w $CFG_PATH/key prism0 > /dev/null 2>&1 ++ exit ++ fi ++ if ! empty "$FORM_stop_airodump"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=airodump "
Stopping Airodump ...
" ++ killall -q airodump-ng ++ exit ++ fi ++ ++ ######## Run/Stop Aircrack ++ if ! empty "$FORM_run_aircrack"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=aircrack "
Starting Aircrack ...
" ++ killall -q aircrack-ng 2> /dev/null ++ if ! equal $CFG_KEY "" ; then hN="-n "$CFG_KEY ; fi ++ if [ $(echo $FORM_selectMAC | awk '{ print $2 }') -lt 50000 ] ; then ++ echo "" ++ else aircrack-ng -q -s $hN -f 4 -x1 -b $(echo $FORM_selectMAC | awk '{ print $1 }') $CFG_CPATH > $CFG_PATH/aircrack.key & ++ fi ++ exit ++ fi ++ if ! empty "$FORM_stop_aircrack"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=aircrack "
Stopping Aircrack ...
" ++ killall -q aircrack-ng ++ exit ++ fi ++ ++ ######## Save AirCrack ++ if ! empty "$FORM_save_aircrack"; then ++ ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
saving ...
" ++ uci_set "app.aircrack" "set" "cpath" "$FORM_aircpath" ++ uci_set "app.aircrack" "set" "wpath" "$FORM_wpapath" ++ uci_set "app.aircrack" "set" "key" "$FORM_keytype" ++ ++ #---- If checkbox on startup AirCrack ---- ++ if ! empty "$FORM_aircrack_startup"; then ++ uci_set "app.aircrack" "set" "bootaircrack" "checked" ++ ++ if [ -s "/etc/init.d/aircrack" ] ; then rm /etc/init.d/aircrack ; fi ++echo "#!/bin/sh ++start() { ++}" > /etc/init.d/aircrack ++ ++ ln -s /etc/init.d/aircrack /etc/rc.d/S95aircrack ++ chmod 755 /etc/init.d/aircrack ++ else ++ uci_set "app.aircrack" "set" "bootaircrack" "" ++ if [ -s "/etc/init.d/aircrack" ] ; then rm /etc/init.d/aircrack ; rm /etc/rc.d/S95aircrack; fi ++ fi #----------------------------------- ++ ++ uci_commit "app.aircrack" ++ rm /tmp/aircrack.ivs 2> /dev/null ++ exit ++ fi ++ ++ ######## Save AiroDump ++ if ! empty "$FORM_save_airodump"; then ++ ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
saving ...
" ++ uci_set "app.aircrack" "set" "path" "$FORM_airdpath" ++ ++ #---- If checkbox on startup AiroDump ---- ++ if ! empty "$FORM_airodump_startup"; then ++ uci_set "app.aircrack" "set" "bootairodump" "checked" ++ ++ if [ -s "/etc/init.d/airodump" ] ; then rm /etc/init.d/airodump ; fi ++ ++echo "#!/bin/sh ++ ++wlc monitor 1 ++airodump-ng $hIVS -w $CFG_PATH/key prism0 &" > /etc/init.d/airodump ++ ++ ln -s /etc/init.d/airodump /etc/rc.d/S96airodump ++ chmod 755 /etc/init.d/airodump ++ else ++ uci_set "app.aircrack" "set" "bootairodump" "" ++ if [ -s "/etc/init.d/airodump" ] ; then rm /etc/init.d/airodump ; rm /etc/rc.d/S96airodump; fi ++ fi #----------------------------------- ++ ++ if ! empty "$FORM_chkivs"; then ++ uci_set "app.aircrack" "set" "ivs" "checked" ++ else uci_set "app.aircrack" "set" "ivs" "" ; fi ++ ++ uci_commit "app.aircrack" ++ exit ++ fi ++ ++if [ "$FORM_page" = "aircrack" ]; then ######################## ++ ++####### Check if airodump is running ++ if [ $(ps | grep -c aircrack-ng) = "1" ] ; then ++ ++ cat < ++
Aircrack is not running
  
++ ++EOF ++if [ -s "$CFG_PATH/aircrack.key" ]; then ++ echo "
" ++ grep '' < $CFG_PATH/aircrack.key ++ echo "
" ++fi ++ ++if [ -s "/tmp/aircrack.ivs" ]; then ++ echo "
" ++ echo "" ++ ++ exec 0" ++ ++fi ++ done ++ echo "
MAC Address
SSID
Encryption
IVs
$a_bssid
$a_ssid
$a_enc
$(echo $a_ivs | sed -e s/'('//g)
" ++fi ++ if [ -s $CFG_CPATH ] && [ ! -s "/tmp/aircrack.ivs" ]; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Reading IVs ...
" ++ aircrack-ng $CFG_CPATH | grep -vE 'Opening|# BSSID|Read|Index' > /tmp/aircrack.ivs & ++ sleep 1 ++ killall -q aircrack-ng ++ fi ++ ++ echo "
" ++ ++ else echo "
Aircrack is succesfully started  


" ++ fi ++ ++ cat <Aircrack Configuration
++ ++ ++
++ ++ ++EOF ++ HTML_Table_Line 2 ++ echo "" ++ ++ HTML_Table_TR "b2" "CAP/IVS File:" "" 200 ++ HTML_Table_TR "b3" "" "
" ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Run on boot

" ++ HTML_Table_TR "" "" "" ++ ++ echo "

Key Type:
" ++ ++ TIP 0 "Encryption key" ++ TIP 0 "Path to captured .cap or .ivs file" ++exit ++elif [ "$FORM_page" = "airodump" ]; then ######################## ++ ++ ++ ####### Check if airodump is running ++ if [ $(ps | grep -c airodump-ng) = "1" ] ; then ++ ++ cat < ++
Airodump is not running
  
++
++EOF ++ else echo "
Airodump is succesfully started  


" ++ fi ++ ++ cat <AiroDump Configuration
++
++ ++EOF ++ HTML_Table_Line 2 ++ HTML_Table_TR "b1" "
Storage Path:" "
" 200 ++ HTML_Table_TR "b2" "Channel:" "" ++ HTML_Table_TR "" "" " Save only captured IVs" ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Run on boot

" ++ HTML_Table_TR "" "" "" ++ echo "
" ++ ++ TIP 0 "Path where airodump-ng will store IVS." ++ TIP 0 "Set specific channel to scan. [nothing = all]" ++exit ++elif [ "$FORM_page" = "airoplay" ]; then ######################## ++ echo "in development..." ++exit ++else ######################## ++ ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "Captured_File width='80%'" "IVS" "Action" ++ ++ if [ "$FORM_page" = "showstatus" ]; then ++ echo "
$(grep '' < $CFG_PATH/$FORM_file.txt)
" ++ elif [ "$FORM_page" = "deletestatus" ]; then ++ APP_Refresh_Page $SCRIPT_NAME "
Deleting $FORM_file ...
" ++ rm $CFG_PATH/$FORM_file.txt ++ rm $CFG_PATH/$FORM_file.ivs ++ elif [ "$FORM_page" = "aircrackit" ]; then ++ rm /tmp/aircrack.ivs 2> /dev/null ++ uci_set "app.aircrack" "set" "cpath" "$CFG_PATH/$FORM_file.ivs" ++ uci_commit "app.aircrack" ++ APP_Refresh_Page $SCRIPT_NAME?page=aircrack "
Prepearing ($FORM_file) for Aircrack ...
" ++ exit ++ elif [ "$FORM_page" = "savestatus" ]; then ++ (cd $CFG_PATH; tar czf /www/$FORM_file.tgz $CFG_PATH/$FORM_file.* ) > /dev/null 2>&1 ++ APP_Refresh_Page "/$FORM_file.tgz" "" ++ sleep 25 ; rm /www/$FORM_file.tgz ++ exit ++ else ++ ls -a $CFG_PATH | grep ".txt" | sed -e s/'.txt'//g | awk '{ print $1 }' | while read output; ++ do ++ if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo " $output
?
Save AirCrack Delete
" ++ done ++ fi ++ echo "" ++fi ++echo "
" ++fi ++?> +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-cifs.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-cifs.sh.svn-base +new file mode 100644 +index 0000000..67bd826 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-cifs.sh.svn-base +@@ -0,0 +1,169 @@ ++#!/usr/bin/webif-page ++ ++# ++ ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "Samba Client" "" "kmod-fs-cifs -force-depends" "cifsmount" ++ ++ if is_package_installed "kmod-fs-cifs" && is_package_installed "cifsmount" ; then ++ ++ insmod cifs 2> /dev/null ++ ##### Make config file ++ ++ if [ ! -s "/etc/config/cifs" ] ; then ++echo "config samba net ++ option ip '' ++ option pc '' ++ option grp 'workgroup' ++ ++config samba login ++ option usr 'guest' ++ option pwd '' ++ ++config samba mount ++ option startup '0' ++ option share 'smb' ++ option mnt '/mnt'" > /etc/config/cifs ++ fi ++ echo_install_complete ++ fi ++ ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "Samba Client" "cifs" "kmod-fs-cifs" "cifsmount" ++ rmmod cifs 2> /dev/null ++exit ++fi ++ ++if is_package_installed "kmod-fs-cifs" && is_package_installed "cifsmount" ; then ++ ++######## Read config ++ ++uci_load "cifs" ++NET_IP="$CONFIG_net_ip" ++NET_PC="$CONFIG_net_pc" ++NET_GRP="$CONFIG_net_grp" ++ ++LOGIN_USR="$CONFIG_login_usr" ++LOGIN_PWD="$CONFIG_login_pwd" ++ ++MOUNT_SRT="$CONFIG_mount_startup" ++MOUNT_SHARE="$CONFIG_mount_share" ++MOUNT_MNT="$CONFIG_mount_mnt" ++ ++cat <Status

++EOF ++ ++ ++######## Try to map CIFS ++if ! empty "$FORM_mapcifs"; then ++echo "" ++echo "
Mounting file system...." ++#insmod cifs ++mount -t cifs //$NET_IP/$MOUNT_SHARE /$MOUNT_MNT -o unc=\\\\$NET_PC\\$MOUNT_SHARE,ip=$NET_IP,user=$LOGIN_USR,pass=$LOGIN_PWD,dom=$NET_GRP ++exit ++fi ++ ++######### Save CIFS ++if ! empty "$FORM_save_cifs"; then ++echo "" ++echo "
saving...." ++ ++uci_set "cifs" "net" "ip" "$FORM_smb_ip" ++uci_set "cifs" "net" "pc" "$FORM_smb_pc" ++uci_set "cifs" "net" "grp" "$FORM_smb_wrkgrp" ++uci_set "cifs" "login" "usr" "$FORM_smb_usr" ++uci_set "cifs" "login" "pwd" "$FORM_smb_pwd" ++ ++ ### If checkbox on startup ++ if ! empty "$FORM_chkstartup"; then ++ uci_set "cifs" "mount" "startup" "checked" ++ if [ -s "/etc/init.d/cifs" ] ; then rm /etc/init.d/cifs ; fi ++ echo "#!/bin/sh ++ ++START=96 ++mount -t cifs //$NET_IP/$MOUNT_SHARE /$MOUNT_MNT -o unc=\\\\\\\\$NET_PC\\\\$MOUNT_SHARE,ip=$NET_IP,user=$LOGIN_USR,pass=$LOGIN_PWD,dom=$NET_GRP" > /etc/init.d/cifs ++ ln -s /etc/init.d/cifs /etc/rc.d/S96cifs ++ chmod 755 /etc/init.d/cifs ++ else ### else ++ uci_set "cifs" "mount" "startup" "" ++ if [ -s "/etc/init.d/cifs" ] ; then rm /etc/init.d/cifs ; rm /etc/rc.d/S96cifs; fi ++ fi ### end if checkbox on startup ++ ++uci_set "cifs" "mount" "share" "$FORM_smb_dir" ++uci_set "cifs" "mount" "mnt" "$FORM_smb_mnt" ++uci_commit "cifs" ++ ++exit ++fi ++ ++if ! empty "$FORM_unmount"; then ++echo "" ++echo "
Unmounting file system...." ++umount -l -r -f $MOUNT_MNT ++exit ++fi ++ ++#echo "'"$(ps | grep -c cifs)"'" ++####### Check if df is mounted ++if equal $( df |grep "$MOUNT_MNT" ) "" ; then ++ ++cat <Network drive is not mounted.

++
++
++
++
++EOF ++else echo "
Network drive is succesfully maped in $MOUNT_MNT  


" ++fi ++ ++cat <Samba Configuration
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
IP Address
PC name
Workgroup
  
Username
Password
  
  mount on boot
Shared Folder
Mount Path
  
 
++EOF ++ ++TIP 450 "An IP address (Internet Protocol address) is a unique address that devices use in order to identify and communicate with each other on a network.

Example: 192.168.1.5" ++TIP 450 "A Computer Name is a unique name assigned to each computer on a network.

Example: Tux" ++TIP 450 "Workgroup is a group of computers participating on a network.

Example: Workgroup" ++TIP 450 "Shared Folder is a directory which can be viewd by any person connected to that client at that time.

Example: documents/todays" ++TIP 450 "Location on the router to create virtual directory from shared folder

Example: /mnt" ++TIP 450 "A user in computing context is one who uses a computer system.

Example: joesmith" ++TIP 450 "A password is a form of secret authentication data that is used to control access to a resource.

Example: hBjGX56" ++echo "
" ++ ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-dlmanager.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-dlmanager.sh.svn-base +new file mode 100644 +index 0000000..c9d5d5f +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-dlmanager.sh.svn-base +@@ -0,0 +1,280 @@ ++#!/usr/bin/webif-page "-U /tmp -u 4096" ++ ++# ++ ++. /usr/lib/webif/webif.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++filename="" ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "Download Manager" "" "ctorrent" "curl" ++ ++ if is_package_installed "ctorrent" && is_package_installed "curl" ; then ++ ##### Make config file ++ ++ if [ ! -s "/etc/config/app.dlmanager" ] ; then ++ echo "config dlmanager general ++ option tmp '/etc/dlmanager' ++config dlmanager http ++ option destination '/mnt/sd' ++config dlmanager ftp ++ option destination '/mnt/sd' ++config dlmanager torrent ++ option destination '/mnt/sd'" > /etc/config/app.dlmanager ++ mkdir /etc/dlmanager ++ mkdir /etc/dlmanager/http ++ mkdir /etc/dlmanager/ftp ++ mkdir /etc/dlmanager/torrents ++ mkdir /etc/dlmanager/history ++ fi ++ echo_install_complete ++ Load_remote_libs ++ ln -s /usr/lib/libuClibc++-0.2.1.so /lib/libuClibc++.so.0 ++ ln -s /usr/lib/libcurl.so.3.0.0 /lib/libcurl.so.3 ++ ln -s /usr/lib/libz.so.1.2.3 /lib/libz.so.1 ++ ln -s $ipklocation/usr/bin/ctorrent /usr/sbin/ctorrent ++ ln -s $ipklocation/usr/bin/curl /usr/sbin/curl ++ fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "Download Manager" "app.dlmanager" "ctorrent" "uclibcxx" "curl" "libcurl" "libopenssl" "zlib" ++ rm /lib/libuClibc++.so.0 2> /dev/null ++ rm /lib/libcurl.so.3 2> /dev/null ++ rm /lib/libz.so.1 2> /dev/null ++ rm /usr/sbin/ctorrent 2> /dev/null ++ rm /usr/sbin/curl 2> /dev/null ++exit ++fi ++ ++if is_package_installed "ctorrent" && is_package_installed "curl" ; then ++ ++ ######## Read config ++ uci_load "app.dlmanager" ++ TMP_PATH="$CONFIG_general_tmp" ++ HTTP_PATH="$CONFIG_http_destination" ++ TORRENT_PATH="$CONFIG_torrent_destination" ++ ++ cat < ++
++EOF ++GetFilenameFromPath(){ ++ echo $1 | sed -e s/'\\'/'\n'/g | awk '{ print $1 }' | while read output; ++ do echo $output > /tmp/.filename ++ done ++ filename=$(grep '' < /tmp/.filename) ++} ++HTTP_Download(){ ++ _HTTP=$(grep '' < $1$2 ) ++ _HTTPS=$(echo $_HTTP | cut -c1-5) ++ if equal $_HTTPS "https"; then _K="-k -3"; fi ++ ++ if equal $3 1 ; then ++ if [ -s "$HTTP_PATH/$2" ] ; then _RESUME="-C $(ls -l $HTTP_PATH/$2 | awk '{ print $5 }')" ; fi ++ curl $_RESUME $_K -o $HTTP_PATH/$2 $_HTTP 2> /dev/null ++ else curl -I $_K $_HTTP > $1.$2 2> /dev/null ###To read the HTTP header first for fileinfo (size) ++ fi ++} ++HTTP_DL_Detail(){ ++ TIP 500 "
$1
" ++} ++########################################################## ++ if ! equal "$FORM_uploadbt" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
File sucessfully uploaded ...
" ++ GetFilenameFromPath $(echo $FORM_uploadname | sed -e s/' '/'_'/g) ++ mv $FORM_uploadbt $TMP_PATH/torrents/$filename ++ exit ++ fi ++ ++ if ! equal "$FORM_urlbt" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
File is downloading ...
" ++ wget -q $FORM_urlbt -P $TMP_PATH/torrents/ ++ exit ++ fi ++ ++ if ! equal "$FORM_urlhttp" ""; then ++ GetFilenameFromPath $(echo $FORM_uploadname | sed -e s/'\/'/'\\'/g) ++ ++ if [ -s "$HTTP_PATH/$filename" ] ; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
File already exist in \"$HTTP_PATH\" ...
" ++ else APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Adding File to List ...
" ++ echo "$FORM_urlhttp" > $TMP_PATH/http/$filename ++ HTTP_Download $TMP_PATH/http/ $filename ++ fi ++ exit ++ fi ++ ++ if ! equal "$FORM_start_torrent" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Starting torrent download ...
" ++ ctorrent -e 0 -s /mnt/ $TMP_PATH/torrents/$FORM_file ++ exit ++ fi ++ ++ if ! equal "$FORM_start_http" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=http "
Starting HTTP download ...
" ++ FILE_PATH=$(grep '' < $TMP_PATH/http/$FORM_file ) ++ HTTP_Download $TMP_PATH/http/ $FORM_file ++ HTTP_Download $TMP_PATH/http/ $FORM_file 1 ++ #mv $TMP_PATH/http/$FORM_file $TMP_PATH/history/$FORM_file ++ #rm $TMP_PATH/http/.$FORM_file ++ exit ++ fi ++ if ! equal "$FORM_stop_http" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=http "
Stopping HTTP downloads ...
" ++ killall -q curl ++ exit ++ fi ++ ++ if ! equal "$FORM_save_torrent" "" ; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Saving Settings ...
" ++ uci_set "app.dlmanager" "torrent" "destination" "$FORM_dest" ++ uci_commit "app.dlmanager" ++ exit ++ fi ++ if ! equal "$FORM_save_http" "" ; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Saving Settings ...
" ++ uci_set "app.dlmanager" "http" "destination" "$FORM_dest" ++ uci_commit "app.dlmanager" ++ exit ++ fi ++if [ "$FORM_page" = "http" ]; then ++ ++ echo "Status

" ++ if [ $(ps | grep -c curl) = "1" ] ; then ++ echo "
HTTP downloading stopped


" ++ else echo "
HTTP downloading sucessfully started  


" ++ fi ++ cat < ++function java1() { ++document.addnew.uploadname.value = document.addnew.urlhttp.value; ++} ++ ++EOF ++ HTML_Form $SCRIPT_NAME "addnew" ++ echo "Add New File

" ++ HTML_Table_Line 2 ++ HTML_Table_TR "b1" "URL Address:" "  " 200 ++ HTML_Table_Line 2 ++ HTML_Table_TR "b2" "Destination:" "


" 0 ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Start downloading on boot

" 0 ++ HTML_Table_TR "" "" "" 0 ++ echo "
" ++ ++ TIP 0 "Specify URL address of web file" ++ TIP 0 "Location to where files will be downloaded" ++ ++ if [ "$FORM_do" = "del_http" ]; then ++ echo "
Web File \"$FORM_file\" deleted

" ++ rm $TMP_PATH/http/$FORM_file ++ fi ++ ++ echo "Web File List:

" ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "File_Name width='80%'" "Status" "Action" ++ ++ ++ ls $TMP_PATH/http | while read output; ++ do if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ FILE_SIZE=$(grep 'ength:' < $TMP_PATH/http/.$output | sed -e s/'Content-Length:'//g -e s/'Content-length:'//g | awk '{ print $1 }') ++ FILE_SIZE_ONDISK=$(ls -l $HTTP_PATH/$output | awk '{ print $5 }') 2> /dev/null ++ if equal $FILE_SIZE_ONDISK "" ; then FILE_SIZE_ONDISK=0; fi ++ echo "" ++ HTTP_DL_Detail "File: $output
Location: $(grep '' < $TMP_PATH/http/$output)
Total Size: $FILE_SIZE (bytes) - $(expr $FILE_SIZE / 1024 / 1024 2> /dev/null) (MB)
Downloaded: $FILE_SIZE_ONDISK (bytes)" ++ echo " $output$(expr $FILE_SIZE_ONDISK \* 100 / $FILE_SIZE 2> /dev/null)%Start Download Delete" ++ done ++ ++elif [ "$FORM_page" = "ftp" ]; then ++ echo "in developemnt..." ++ ++elif [ "$FORM_page" = "torrent" ]; then ++ ++ echo "Status

" ++ if [ $(ps | grep -c ctorrent) = "1" ] ; then ++ echo "
Torrent downloading stopped


" ++ else echo "
Torrent Client is sucessfully started  


" ++ fi ++ ++ cat < ++function java1() { ++document.addnew.uploadname.value = document.addnew.uploadbt.value; ++} ++ ++EOF ++ HTML_Form $SCRIPT_NAME "addnew" ++ echo "Add New Torrent

" ++ ++ HTML_Table_Line 2 ++ HTML_Table_TR "b1" "Local torrent:" "  " 200 ++ HTML_Table_TR "b2" "Web torrent:" "  " 0 ++ HTML_Table_Line 2 ++ HTML_Table_TR "b3" "Destination:" "


" 0 ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Start downloading on boot

" 0 ++ HTML_Table_TR "" "" "" 0 ++ echo "
" ++ ++ TIP 0 "You may upload new torrents from local disk" ++ TIP 0 "Specify URL address of torrent file" ++ TIP 0 "Location to where the torrents will be downloaded" ++ ++ if [ "$FORM_do" = "delete" ]; then ++ echo "
Torrent \"$FORM_file\" deleted

" ++ rm $TMP_PATH/torrents/$FORM_file ++ fi ++ ++ echo "Torrents List:

" ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "File_Name width='80%'" "Status" "Action" ++ ++ ls $TMP_PATH/torrents | while read output; ++ do if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo " $output
?
Start Download Delete
" ++ done ++ ++elif [ "$FORM_page" = "history" ]; then ++ if [ "$FORM_do" = "delete" ]; then ++ echo "History \"$FORM_file\" cleaned

" ++ rm $TMP_PATH/history/$FORM_file ++ fi ++ echo "History List:

" ++ HTML_Table 1 "100%" "999999" "align='center'" 4 "Type" "File_Name width='80%'" "Status" "Action" ++ ++ ls $TMP_PATH/history | while read output; ++ do ++ if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo "? $output100%Re Download Delete" ++ done ++ ++else ++ echo "Files currently downloading:

" ++ echo "" ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "File_Name width='80%'" "Status" "Action" ++ ++ ps | grep 'curl' | awk '{ print $1 }' | while read output; ++ do if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo " $output? Stop" ++ done ++fi ++echo "" ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-hydra.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-hydra.sh.svn-base +new file mode 100644 +index 0000000..2e7f9fd +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-hydra.sh.svn-base +@@ -0,0 +1,226 @@ ++#!/usr/bin/webif-page "-U /tmp -u 4096" ++ ++# ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "Hydra 4.5" "" "" ++ wget -q http://www.hackerpimps.com/fairuzawrt/bin/hydra -P /usr/sbin/ ++ wget -q http://www.phenoelit.de/obiwan/common-passwords.txt -P /etc/ ++ mv /etc/common-passwords.txt /etc/pwd.lst ++ ++ if [ -s "/usr/sbin/hydra" ] ; then ++ chmod 755 /usr/sbin/hydra ++ echo "config hydra conf ++ option ip '' ++ option service 'http' ++ option path '' ++ option usr 'admin' ++ option pwd '/etc/pwd.lst'" > /etc/config/hydra ++ ++ echo_install_complete ++ fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "Hydra 4.5" "hydra" ++ rm /usr/sbin/hydra ++ rm /etc/pwd.lst 2> /dev/null ++exit ++fi ++ ++if [ -s "/usr/sbin/hydra" ] ; then ++ ++echo "$HTMLHEADStatus

" ++ ++if equal $FORM_action "upload" ; then echo "... File sucessfully uploaded
" ++ ++ if [ $FORM_usrorpwd = "usr" ] ; then ++ mv $FORM_uploadfile /etc/usr.lst ++ uci_set "hydra" "conf" "usr" "/etc/usr.lst" ++ else mv $FORM_uploadfile /etc/pwd.lst ++ uci_set "hydra" "conf" "pwd" "/etc/pwd.lst" ++ fi ++ uci_commit "hydra" ++fi ++ ++######### Save Hydra ++if ! empty "$FORM_save_hydra"; then ++echo "" ++echo "
saving...." ++ ++uci_set "hydra" "conf" "ip" "$FORM_h_ip" ++uci_set "hydra" "conf" "service" "$FORM_service" ++uci_set "hydra" "conf" "port" "$FORM_h_port" ++uci_set "hydra" "conf" "path" "$FORM_h_path" ++uci_set "hydra" "conf" "usr" "$FORM_h_usr" ++uci_set "hydra" "conf" "pwd" "$FORM_h_pwd" ++uci_set "hydra" "conf" "wait" "$FORM_h_wait" ++ ++ ### If session checkbox on ++ if ! empty "$FORM_chksession"; then ++ uci_set "hydra" "conf" "session" "checked" ++ else uci_set "hydra" "conf" "session" "" ; fi ++ ++uci_commit "hydra" ++exit ++fi ++ ######## Read config ++ ++ uci_load "hydra" ++ CFG_IP="$CONFIG_conf_ip" ++ CFG_SRV="$CONFIG_conf_service" ++ CFG_PORT="$CONFIG_conf_port" ++ CFG_RSESSION="$CONFIG_conf_session" ++ CFG_PATH="$CONFIG_conf_path" ++ CFG_USR="$CONFIG_conf_usr" ++ CFG_PWD="$CONFIG_conf_pwd" ++ CFG_WAIT="$CONFIG_conf_wait" ++ ++ ######## Run Hydra ++ if ! empty "$FORM_runhydra"; then ++ APP_Refresh_Page $SCRIPT_NAME "
Starting Hydra ...
" ++ ++ if [ -s "$CFG_USR" ] ; then hL="-L" ; else hL="-l" ; fi ++ if [ -s "$CFG_PWD" ] ; then hP="-P" ; else hP="-p" ; fi ++ if ! equal $CFG_PATH "" ; then hM="-m $CFG_PATH" ; fi ++ if ! equal $CFG_WAIT "" ; then hW="-w $CFG_WAIT" ; fi ++ if equal $CFG_RSESSION "checked" ; then hR="-R" ; fi ++ ++ if [ $CFG_SRV = "http" ] ; then ++ hydra -f $hR $hL $CFG_USR $hP $CFG_PWD $hW -e ns $CFG_IP http $hM > /tmp/hydra.www ++ elif [ $CFG_SRV = "ftp" ] ; then ++ hydra -f $hR $hL $CFG_USR $hP $CFG_PWD $hW -e ns $CFG_IP ftp > /tmp/hydra.ftp ++ elif [ $CFG_SRV = "telnet" ] ; then ++ #NOT TESTED YET ++ #hydra -f $hR $hL $CFG_USR $hP $CFG_PWD $hW -e ns $CFG_IP telnet > /tmp/hydra.telnet ++ echo "" ++ fi ++ exit ++ fi ++ ++ ######## Stop Hydra ++ if ! empty "$FORM_stophydra"; then ++ echo "
Stopping Hydra ..." ++ killall -q hydra ++ exit ++ fi ++ ######## Reset Hydra ++ if ! empty "$FORM_resethydra"; then ++ rm /tmp/hydra.www 2> /dev/null ++ rm /tmp/hydra.ftp 2> /dev/null ++ rm /tmp/hydra.telnet 2> /dev/null ++ echo "" ++ echo "
Reseting Hydra ..." ++ exit ++ fi ++ ++ ####### Check if hydra is running ++ pscheck=$(ps | grep -c 'hydra -f') ++ if [ $pscheck = "1" ] ; then ++ if [ -s "/tmp/hydra.www" ] ; then pwd_www=$( grep "\[www\]" < /tmp/hydra.www) ; fi ++ if [ -s "/tmp/hydra.ftp" ] ; then pwd_ftp=$( grep "\[ftp\]" < /tmp/hydra.ftp) ; fi ++ if [ -s "/tmp/hydra.telnet" ] ; then pwd_telnet=$( grep "\[telnet\]" < /tmp/hydra.telnet) ; fi ++ echo "
Hydra is not running
  
" ++ else ++ echo "
Hydra is running as '$CFG_USR' : '$CFG_PWD'  
" ++ fi ++ ++if equal $pwd_www "" && equal $pwd_ftp "" && equal $pwd_telnet "" ; then ++ echo "No sucessfull logins found so far...

" ++else ++cat <Found sucessfull logins!

WARNING: Change your passwords immediately!!!

++
++
++$pwd_www
++$pwd_ftp
++$pwd_telnet
++

++EOF ++fi ++ ++cat < ++ ++EOF ++ ++DIV_Windows_Header 0 ++ ++cat <Upload File
++
++ ++ ++ ++ ++ ++ ++
++
++Hydra Configuration
++
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
IP Address
Service
Port
Username  
Password List  
Wait Time
  
 Restore a previous aborted/crashed session
  
 
++EOF ++ ++TIP 450 "IP address to attack.

Example: 192.168.1.5" ++TIP 450 "Service to attack.

Example: http,ftp,telnet,ssh" ++TIP 0 "Port # of service of different from default" ++TIP 450 "Aditional parameter.

Example:" ++TIP 450 "Single username or text file with list of usernames.

Example: admin or /tmp/usr.lst" ++TIP 450 "Single password or text file with list of passwords.

Example: password or /tmp/passwd.lst" ++TIP 450 "Defines the max wait time in seconds for responses (default: 30)" ++echo "" ++ ++fi ++?> +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-ipkg.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-ipkg.sh.svn-base +new file mode 100644 +index 0000000..0a1a47c +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-ipkg.sh.svn-base +@@ -0,0 +1,76 @@ ++#!/usr/bin/webif-page ++ ++# ++ ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_remove" ; then ++ echo "
Restoring ipkg configuration ...

"
++
++	if [ -s "/etc/profile.bak" ] ; then
++
++	rm /etc/profile 
++	mv /etc/profile.bak /etc/profile 
++
++	if [ -s "/etc/ipkg.conf.bak" ] ; then rm /etc/ipkg.conf ; mv /etc/ipkg.conf.bak /etc/ipkg.conf ; fi
++
++	rm /etc/config/app.ipkg
++
++	else
++	echo "Sorry cannot restore ... Try manually."
++	fi
++	echo "
Done." ++exit ++fi ++ ++if [ -s "/etc/config/app.ipkg" ] ; then ++ ++ uci_load "app.ipkg" ++ location="$CONFIG_int_location" ++ ++cat < ++Status

++EOF ++ ++######### Save ipkg ++if ! empty "$FORM_save_ipkg"; then ++echo "" ++echo "
saving...." ++ ++uci_set "app.ipkg" "int" "location" "$FORM_location" ++uci_commit "app.ipkg" ++ ++exit ++fi ++ ++echo "
ipkg is configured ($location)  


" ++ ++cat <ipkg Configuration
++
++
++ ++ ++ ++ ++ ++ ++ ++
  
Location
  
 
++EOF ++ ++TIP 450 "Path to where Applications will install, if router is out of RAM

Example: /mnt/usb" ++echo "" ++ ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-proftpd.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-proftpd.sh.svn-base +new file mode 100644 +index 0000000..1b99da8 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-proftpd.sh.svn-base +@@ -0,0 +1,179 @@ ++#!/usr/bin/webif-page ++ ++# ++ ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ #App_package_install "FTP Server" "http://ftp.osuosl.org/pub/nslu2/feeds/unslung/wl500g/" "openssl_0.9.7l-3_mipsel.ipk" "proftpd_1.2.10-5_mipsel.ipk" ++ ++ App_package_install "FTP Server" "http://192.168.0.7/" "openssl_0.9.7l-3_mipsel.ipk" "proftpd_1.2.10-5_mipsel.ipk" ++ #ipkg $loc install $url1"proftpd_1.3.0a-1_mipsel.ipk" -force-overwrite -force-defaults ++ ++ if is_package_installed "openssl" && is_package_installed "proftpd" ; then ++ ++ #### Small patches to get it working with webif^2 ++ #cp $loc/opt/etc/proftpd.conf /etc/proftpd.conf ++ ++echo "ServerName \"ProFTPD Webif^2 Installation\" ++ServerType standalone ++DefaultServer on ++WtmpLog off ++Port 21 ++Umask 022 ++MaxInstances 10 ++PassivePorts 49873 49873 ++ ++MaxClients 3 \"550 Too Many Users (Limit=%m)\" ++MaxClientsPerHost 1 \"551 One connection per IP\" ++ ++DirFakeUser on ~ ++DirFakeGroup on ~ ++ ++ ++ RootLogin On ++ RequireValidShell off ++ #AuthUserFile /etc/passwd ++ AuthUserFile /etc/passwd ++ ++ AllowStoreRestart on ++ ++ ++DefaultRoot /www/ ++ ++ ++ ++ AllowAll ++ ++ ++ ++User root ++Group root ++ ++AllowOverwrite on" > /etc/proftpd.conf ++ ++ #if equal $(grep "nobody:" < /etc/group) "" ; then echo "nobody:x:65535:" >> /etc/group ; fi ++ mkdir /opt ++ mkdir /opt/var ++ mkdir /opt/var/proftpd ++ ln -s $loc/opt/sbin/proftpd /usr/sbin/proftpd ++ ++ #### Check if first time /etc/config exists ++ ++ if [ -s "/etc/config/app.proftpd" ] ; then ++ echo "" ++ else ++ echo "config proftpd net ++ option port '21'" > /etc/config/app.proftpd ++ fi ++ ++ Load_remote_libs ++ echo_install_complete ++fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ echo "
Removing FTP Server packages ...

"
++	remove_package "proftpd"
++	remove_package "openssl"
++	rm /etc/config/app.proftpd
++	rm /etc/proftpd.conf
++	echo "
Done." ++exit ++fi ++ ++if is_package_installed "openssl" && is_package_installed "proftpd" ; then ++ ++ ++######## Read config ++ ++uci_load "app.proftpd" ++NET_PORT="$CONFIG_net_port" ++ ++ ++HEADER=" ++" ++ ++cat < ++Status

++EOF ++ ++######## Try start Proftpd ++if ! empty "$FORM_startftp"; then ++echo "" ++echo "
Starting FTP Server ...
" ++proftpd -c /etc/proftpd.conf & ++exit ++fi ++ ++######### Save Proftpd ++if ! empty "$FORM_save_proftpd"; then ++echo "" ++echo "
saving...." ++ ++uci_set "app.proftpd" "net" "port" "$FORM_ftp_port" ++uci_commit "app.proftpd" ++ ++exit ++fi ++ ++if ! empty "$FORM_stopftp"; then ++echo "" ++echo "
Stopping FTP Server ..." ++killall -q proftpd ++exit ++fi ++ ++####### Check if proftpd is running ++#echo "'"$(ps | grep -c proftpd)"'" ++if [ $(ps | grep -c proftpd) = "1" ] ; then ++ ++cat < ++
FTP Server is not running
  
++ ++
++EOF ++ ++else ++ ++echo "
FTP Server is succesfully started  


" ++fi ++ ++cat <FTP Server Configuration
++
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
  
Port
  
 
++
++EOF ++ ++TIP 450 "Port number

Default: 21" ++echo "" ++ ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-shell.sh.svn-base b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-shell.sh.svn-base +new file mode 100644 +index 0000000..9b52446 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/.svn/text-base/applications-shell.sh.svn-base +@@ -0,0 +1,132 @@ ++#!/bin/sh ++######################################### ++# Applications Common Functions ++# ++# Author(s) [in order of work date]: ++# Dmytro Dykhman ++# ++ ++tipcount=1 ++location="" ++ ++HEADER="HTTP/1.0 200 OK ++Content-type: text/html; charset=UTF-8 ++ ++" ++ ++HTMLHEAD=" ++ ++ ++ ++ ++ ++" ++ ++TIP(){ ++if [ $1 != 0 ]; then ++style="style='width: $1px;'" ++fi ++echo "
$2
" ++let "tipcount+=1" ++} ++ ++Load_remote_libs(){ ++ uci_load "app.ipkg" ++ loc="$CONFIG_int_location" ++ ++ echo "#!/bin/sh" > /tmp/.D43S.tmp ++ echo "START=98" > /tmp/.D43S.tmp ++ echo "ls -l $loc/usr/lib/ | awk '{print \" if [ ! -f /usr/lib/\"\$9\" ] \\n then \\n ln -s $loc/usr/lib/\"\$9\" /usr/lib/\"\$9\" \\n fi\"}' > /tmp/.lib1.tmp" >> /tmp/.D43S.tmp ++ echo "ls -l $loc/opt/lib/ | awk '{print \" if [ ! -f /usr/lib/\"\$9\" ] \\n then \\n ln -s $loc/opt/lib/\"\$9\" /usr/lib/\"\$9\" \\n fi\"}' > /tmp/.lib2.tmp" >> /tmp/.D43S.tmp ++ echo "ls -l $loc/lib/ | awk '{print \" if [ ! -f /usr/lib/\"\$9\" ] \\n then \\n ln -s $loc/lib/\"\$9\" /usr/lib/\"\$9\" \\n fi\"}' > /tmp/.lib3.tmp" >> /tmp/.D43S.tmp ++ echo "sh /tmp/.lib1.tmp ; rm /tmp/.lib1.tmp" >> /tmp/.D43S.tmp ++ echo "sh /tmp/.lib2.tmp ; rm /tmp/.lib2.tmp" >> /tmp/.D43S.tmp ++ echo "sh /tmp/.lib3.tmp ; rm /tmp/.lib3.tmp" >> /tmp/.D43S.tmp ++ sh /tmp/.D43S.tmp 2> /dev/null ; rm /tmp/.D43S.tmp ++} ++ ++Check_ipkg_update(){ ++ if [ ! -s "/usr/lib/ipkg/lists/X-Wrt" ] || [ ! -s "/usr/lib/ipkg/lists/snapshots" ] ; then ipkg update ; fi ++} ++ ++App_package_install(){ ++ if ! empty "$FORM_ipkg"; then location="-d "$FORM_ipkg ; fi ++ ++ uci_load "app.ipkg" ++ ipklocation="$CONFIG_int_location" ++ url1=$2 ++ ++ if equal $(df | grep '/mnt'| awk '{ print $6 }') "" && equal $FORM_ipkg "app" ; then ++ echo "

Installation path is currently down! Please check your external storage." ++ exit ; fi ++ ++ echo "Installing $1 package(s) ...

"
++	
++	Check_ipkg_update
++
++	if ! equal $3 "" ; then ipkg $location install $url1$3 -force-overwrite ; fi
++	if ! equal $4 "" ; then ipkg $location install $url1$4 -force-overwrite ; fi
++	if ! equal $5 "" ; then ipkg $location install $url1$5 -force-overwrite ; fi
++	if ! equal $6 "" ; then ipkg $location install $url1$6 -force-overwrite ; fi
++	if ! equal $7 "" ; then ipkg $location install $url1$7 -force-overwrite ; fi
++	if ! equal $8 "" ; then ipkg $location install $url1$8 -force-overwrite ; fi
++	if ! equal $9 "" ; then ipkg $location install $url1$9 -force-overwrite ; fi
++}
++
++App_package_remove(){
++	echo "Removing $1 packag(e) ...

"
++	rm /etc/config/$2 2> /dev/null
++	if ! equal $3 "" ; then ipkg remove "$3" ; fi
++	if ! equal $4 "" ; then ipkg remove "$4" ; fi
++	if ! equal $5 "" ; then ipkg remove "$5" ; fi
++	if ! equal $6 "" ; then ipkg remove "$6" ; fi
++	if ! equal $7 "" ; then ipkg remove "$7" ; fi
++	if ! equal $8 "" ; then ipkg remove "$8" ; fi
++	if ! equal $9 "" ; then ipkg remove "$9" ; fi
++	echo_remove_complete
++}
++
++echo_install_complete(){
++	echo "

Installation Complete"
++}
++echo_remove_complete(){
++	echo "

Uninstall Complete" ++} ++ ++DIV_Windows_Header(){ ++ echo " ++EOF ++ ++fi ++ ++if [ "$FORM_package" = "install" ]; then ++ ++ echo "" ++ if [ ! -d $FORM_prompt ] || [ "$FORM_prompt" = "" ] || [ "$FORM_prompt" = " " ] ; then ++ echo "Directory '$FORM_prompt' missing - I will try to mount it (hint: Samba Client)" ++ exit ++ fi ++ echo "
Applying changes to ipkg ...

To disable or change location goto \"Network Applications\" -> \"ipkg\"" ++ echo "config ipkg int ++ option location '$FORM_prompt'" > /etc/config/app.ipkg ++ if equal $(grep "$FORM_prompt" < /etc/ipkg.conf) "" ; then #<-Check make sure we do't have same entry ++ ++ cp /etc/ipkg.conf /etc/ipkg.conf.bak ++ echo " ++dest app $FORM_prompt" >> /etc/ipkg.conf ++ ++ ### --- Read file ++ tempfile=$(mktemp /tmp/.ipkg.XXXXXX) ++ chmod 644 $tempfile ++ exec 3<&0 ++ exec 0> $tempfile ++ else ++ echo "$line" >> $tempfile ++ fi ++ else ++ ++ # TODO Make this less compilated! becase echo cuts \ and saves us: export PS1='u@h:w$ ' ++ # ++ if equal $(echo $line | cut -c1-10 | sed -e s/' '//g) "exportPS1" ; then echo "export PS1='\u@\h:\w\\\$ '" >> $tempfile ; else echo "$line" >> $tempfile ; fi ++ ++ fi ++ done ++ ++ mv /etc/profile /etc/profile.bak ++ mv $tempfile /etc/profile ++ exec 0<&3 ++ exit 0 ++ ### --- ++ ++ fi ++ ++ exit ++fi ++?> ++ +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-aircrack.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-aircrack.sh +new file mode 100755 +index 0000000..5638097 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-aircrack.sh +@@ -0,0 +1,303 @@ ++#!/usr/bin/webif-page ++ ++# ++. /usr/lib/webif/webif.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "AirCrack" "" "aircrack-ng" ++ ++ if is_package_installed "aircrack-ng" && is_package_installed "libpthread" ; then ++ mkdir /wep 2> /dev/null ++ ##### Make config file ++ ++ if [ ! -s "/etc/config/app.aircrack" ] ; then ++ echo "config aircrack set ++ option path '/wep' ++ option cpath '/wep' ++ option ivs 'checked' ++ option key '128'" > /etc/config/app.aircrack ++ fi ++ echo_install_complete ++ fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "AirCrack" "app.aircrack" "aircrack-ng" "libpthread" ++ rmdir /wep 2> /dev/null ++exit ++fi ++ ++if is_package_installed "aircrack-ng" && is_package_installed "libpthread" ; then ++ ++ cat < ++
++EOF ++ ######## Read config ++ uci_load "app.aircrack" ++ CFG_PATH="$CONFIG_set_path" ++ CFG_CPATH="$CONFIG_set_cpath" ++ CFG_WPATH="$CONFIG_set_wpath" ++ CFG_CHANNEL="$CONFIG_set_channel" ++ CFG_BOOTAIR="$CONFIG_set_bootaircrack" ++ CFG_BOOTDUMP="$CONFIG_set_bootairodump" ++ #CFG_BOOTPLAY="$CONFIG_set_bootairoplay" ++ CFG_IVS="$CONFIG_set_ivs" ++ CFG_KEY="$CONFIG_set_key" ++ ++ if equal $CFG_IVS "checked" ; then hIVS="--ivs" ; fi ++ ++ ######## Run/Stop Airodump ++ if ! empty "$FORM_run_airodump"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=airodump "
Starting Airodump ...
" ++ killall -q airodump-ng 2> /dev/null ++ wlc monitor 1 ++ airodump-ng $hIVS -w $CFG_PATH/key prism0 > /dev/null 2>&1 ++ exit ++ fi ++ if ! empty "$FORM_stop_airodump"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=airodump "
Stopping Airodump ...
" ++ killall -q airodump-ng ++ exit ++ fi ++ ++ ######## Run/Stop Aircrack ++ if ! empty "$FORM_run_aircrack"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=aircrack "
Starting Aircrack ...
" ++ killall -q aircrack-ng 2> /dev/null ++ if ! equal $CFG_KEY "" ; then hN="-n "$CFG_KEY ; fi ++ if [ $(echo $FORM_selectMAC | awk '{ print $2 }') -lt 50000 ] ; then ++ echo "" ++ else aircrack-ng -q -s $hN -f 4 -x1 -b $(echo $FORM_selectMAC | awk '{ print $1 }') $CFG_CPATH > $CFG_PATH/aircrack.key & ++ fi ++ exit ++ fi ++ if ! empty "$FORM_stop_aircrack"; then ++ APP_Refresh_Page $SCRIPT_NAME?page=aircrack "
Stopping Aircrack ...
" ++ killall -q aircrack-ng ++ exit ++ fi ++ ++ ######## Save AirCrack ++ if ! empty "$FORM_save_aircrack"; then ++ ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
saving ...
" ++ uci_set "app.aircrack" "set" "cpath" "$FORM_aircpath" ++ uci_set "app.aircrack" "set" "wpath" "$FORM_wpapath" ++ uci_set "app.aircrack" "set" "key" "$FORM_keytype" ++ ++ #---- If checkbox on startup AirCrack ---- ++ if ! empty "$FORM_aircrack_startup"; then ++ uci_set "app.aircrack" "set" "bootaircrack" "checked" ++ ++ if [ -s "/etc/init.d/aircrack" ] ; then rm /etc/init.d/aircrack ; fi ++echo "#!/bin/sh ++start() { ++}" > /etc/init.d/aircrack ++ ++ ln -s /etc/init.d/aircrack /etc/rc.d/S95aircrack ++ chmod 755 /etc/init.d/aircrack ++ else ++ uci_set "app.aircrack" "set" "bootaircrack" "" ++ if [ -s "/etc/init.d/aircrack" ] ; then rm /etc/init.d/aircrack ; rm /etc/rc.d/S95aircrack; fi ++ fi #----------------------------------- ++ ++ uci_commit "app.aircrack" ++ rm /tmp/aircrack.ivs 2> /dev/null ++ exit ++ fi ++ ++ ######## Save AiroDump ++ if ! empty "$FORM_save_airodump"; then ++ ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
saving ...
" ++ uci_set "app.aircrack" "set" "path" "$FORM_airdpath" ++ ++ #---- If checkbox on startup AiroDump ---- ++ if ! empty "$FORM_airodump_startup"; then ++ uci_set "app.aircrack" "set" "bootairodump" "checked" ++ ++ if [ -s "/etc/init.d/airodump" ] ; then rm /etc/init.d/airodump ; fi ++ ++echo "#!/bin/sh ++ ++wlc monitor 1 ++airodump-ng $hIVS -w $CFG_PATH/key prism0 &" > /etc/init.d/airodump ++ ++ ln -s /etc/init.d/airodump /etc/rc.d/S96airodump ++ chmod 755 /etc/init.d/airodump ++ else ++ uci_set "app.aircrack" "set" "bootairodump" "" ++ if [ -s "/etc/init.d/airodump" ] ; then rm /etc/init.d/airodump ; rm /etc/rc.d/S96airodump; fi ++ fi #----------------------------------- ++ ++ if ! empty "$FORM_chkivs"; then ++ uci_set "app.aircrack" "set" "ivs" "checked" ++ else uci_set "app.aircrack" "set" "ivs" "" ; fi ++ ++ uci_commit "app.aircrack" ++ exit ++ fi ++ ++if [ "$FORM_page" = "aircrack" ]; then ######################## ++ ++####### Check if airodump is running ++ if [ $(ps | grep -c aircrack-ng) = "1" ] ; then ++ ++ cat < ++
Aircrack is not running
  
++ ++EOF ++if [ -s "$CFG_PATH/aircrack.key" ]; then ++ echo "
" ++ grep '' < $CFG_PATH/aircrack.key ++ echo "
" ++fi ++ ++if [ -s "/tmp/aircrack.ivs" ]; then ++ echo "
" ++ echo "" ++ ++ exec 0" ++ ++fi ++ done ++ echo "
MAC Address
SSID
Encryption
IVs
$a_bssid
$a_ssid
$a_enc
$(echo $a_ivs | sed -e s/'('//g)
" ++fi ++ if [ -s $CFG_CPATH ] && [ ! -s "/tmp/aircrack.ivs" ]; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Reading IVs ...
" ++ aircrack-ng $CFG_CPATH | grep -vE 'Opening|# BSSID|Read|Index' > /tmp/aircrack.ivs & ++ sleep 1 ++ killall -q aircrack-ng ++ fi ++ ++ echo "
" ++ ++ else echo "
Aircrack is succesfully started  


" ++ fi ++ ++ cat <Aircrack Configuration
++ ++ ++
++ ++ ++EOF ++ HTML_Table_Line 2 ++ echo "" ++ ++ HTML_Table_TR "b2" "CAP/IVS File:" "" 200 ++ HTML_Table_TR "b3" "" "
" ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Run on boot

" ++ HTML_Table_TR "" "" "" ++ ++ echo "

Key Type:
" ++ ++ TIP 0 "Encryption key" ++ TIP 0 "Path to captured .cap or .ivs file" ++exit ++elif [ "$FORM_page" = "airodump" ]; then ######################## ++ ++ ++ ####### Check if airodump is running ++ if [ $(ps | grep -c airodump-ng) = "1" ] ; then ++ ++ cat < ++
Airodump is not running
  
++
++EOF ++ else echo "
Airodump is succesfully started  


" ++ fi ++ ++ cat <AiroDump Configuration
++
++ ++EOF ++ HTML_Table_Line 2 ++ HTML_Table_TR "b1" "
Storage Path:" "
" 200 ++ HTML_Table_TR "b2" "Channel:" "" ++ HTML_Table_TR "" "" " Save only captured IVs" ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Run on boot

" ++ HTML_Table_TR "" "" "" ++ echo "
" ++ ++ TIP 0 "Path where airodump-ng will store IVS." ++ TIP 0 "Set specific channel to scan. [nothing = all]" ++exit ++elif [ "$FORM_page" = "airoplay" ]; then ######################## ++ echo "in development..." ++exit ++else ######################## ++ ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "Captured_File width='80%'" "IVS" "Action" ++ ++ if [ "$FORM_page" = "showstatus" ]; then ++ echo "
$(grep '' < $CFG_PATH/$FORM_file.txt)
" ++ elif [ "$FORM_page" = "deletestatus" ]; then ++ APP_Refresh_Page $SCRIPT_NAME "
Deleting $FORM_file ...
" ++ rm $CFG_PATH/$FORM_file.txt ++ rm $CFG_PATH/$FORM_file.ivs ++ elif [ "$FORM_page" = "aircrackit" ]; then ++ rm /tmp/aircrack.ivs 2> /dev/null ++ uci_set "app.aircrack" "set" "cpath" "$CFG_PATH/$FORM_file.ivs" ++ uci_commit "app.aircrack" ++ APP_Refresh_Page $SCRIPT_NAME?page=aircrack "
Prepearing ($FORM_file) for Aircrack ...
" ++ exit ++ elif [ "$FORM_page" = "savestatus" ]; then ++ (cd $CFG_PATH; tar czf /www/$FORM_file.tgz $CFG_PATH/$FORM_file.* ) > /dev/null 2>&1 ++ APP_Refresh_Page "/$FORM_file.tgz" "" ++ sleep 25 ; rm /www/$FORM_file.tgz ++ exit ++ else ++ ls -a $CFG_PATH | grep ".txt" | sed -e s/'.txt'//g | awk '{ print $1 }' | while read output; ++ do ++ if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo " $output
?
Save AirCrack Delete
" ++ done ++ fi ++ echo "" ++fi ++echo "
" ++fi ++?> +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-cifs.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-cifs.sh +new file mode 100755 +index 0000000..67bd826 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-cifs.sh +@@ -0,0 +1,169 @@ ++#!/usr/bin/webif-page ++ ++# ++ ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "Samba Client" "" "kmod-fs-cifs -force-depends" "cifsmount" ++ ++ if is_package_installed "kmod-fs-cifs" && is_package_installed "cifsmount" ; then ++ ++ insmod cifs 2> /dev/null ++ ##### Make config file ++ ++ if [ ! -s "/etc/config/cifs" ] ; then ++echo "config samba net ++ option ip '' ++ option pc '' ++ option grp 'workgroup' ++ ++config samba login ++ option usr 'guest' ++ option pwd '' ++ ++config samba mount ++ option startup '0' ++ option share 'smb' ++ option mnt '/mnt'" > /etc/config/cifs ++ fi ++ echo_install_complete ++ fi ++ ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "Samba Client" "cifs" "kmod-fs-cifs" "cifsmount" ++ rmmod cifs 2> /dev/null ++exit ++fi ++ ++if is_package_installed "kmod-fs-cifs" && is_package_installed "cifsmount" ; then ++ ++######## Read config ++ ++uci_load "cifs" ++NET_IP="$CONFIG_net_ip" ++NET_PC="$CONFIG_net_pc" ++NET_GRP="$CONFIG_net_grp" ++ ++LOGIN_USR="$CONFIG_login_usr" ++LOGIN_PWD="$CONFIG_login_pwd" ++ ++MOUNT_SRT="$CONFIG_mount_startup" ++MOUNT_SHARE="$CONFIG_mount_share" ++MOUNT_MNT="$CONFIG_mount_mnt" ++ ++cat <Status

++EOF ++ ++ ++######## Try to map CIFS ++if ! empty "$FORM_mapcifs"; then ++echo "" ++echo "
Mounting file system...." ++#insmod cifs ++mount -t cifs //$NET_IP/$MOUNT_SHARE /$MOUNT_MNT -o unc=\\\\$NET_PC\\$MOUNT_SHARE,ip=$NET_IP,user=$LOGIN_USR,pass=$LOGIN_PWD,dom=$NET_GRP ++exit ++fi ++ ++######### Save CIFS ++if ! empty "$FORM_save_cifs"; then ++echo "" ++echo "
saving...." ++ ++uci_set "cifs" "net" "ip" "$FORM_smb_ip" ++uci_set "cifs" "net" "pc" "$FORM_smb_pc" ++uci_set "cifs" "net" "grp" "$FORM_smb_wrkgrp" ++uci_set "cifs" "login" "usr" "$FORM_smb_usr" ++uci_set "cifs" "login" "pwd" "$FORM_smb_pwd" ++ ++ ### If checkbox on startup ++ if ! empty "$FORM_chkstartup"; then ++ uci_set "cifs" "mount" "startup" "checked" ++ if [ -s "/etc/init.d/cifs" ] ; then rm /etc/init.d/cifs ; fi ++ echo "#!/bin/sh ++ ++START=96 ++mount -t cifs //$NET_IP/$MOUNT_SHARE /$MOUNT_MNT -o unc=\\\\\\\\$NET_PC\\\\$MOUNT_SHARE,ip=$NET_IP,user=$LOGIN_USR,pass=$LOGIN_PWD,dom=$NET_GRP" > /etc/init.d/cifs ++ ln -s /etc/init.d/cifs /etc/rc.d/S96cifs ++ chmod 755 /etc/init.d/cifs ++ else ### else ++ uci_set "cifs" "mount" "startup" "" ++ if [ -s "/etc/init.d/cifs" ] ; then rm /etc/init.d/cifs ; rm /etc/rc.d/S96cifs; fi ++ fi ### end if checkbox on startup ++ ++uci_set "cifs" "mount" "share" "$FORM_smb_dir" ++uci_set "cifs" "mount" "mnt" "$FORM_smb_mnt" ++uci_commit "cifs" ++ ++exit ++fi ++ ++if ! empty "$FORM_unmount"; then ++echo "" ++echo "
Unmounting file system...." ++umount -l -r -f $MOUNT_MNT ++exit ++fi ++ ++#echo "'"$(ps | grep -c cifs)"'" ++####### Check if df is mounted ++if equal $( df |grep "$MOUNT_MNT" ) "" ; then ++ ++cat <Network drive is not mounted.

++
++
++
++
++EOF ++else echo "
Network drive is succesfully maped in $MOUNT_MNT  


" ++fi ++ ++cat <Samba Configuration
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
IP Address
PC name
Workgroup
  
Username
Password
  
  mount on boot
Shared Folder
Mount Path
  
 
++EOF ++ ++TIP 450 "An IP address (Internet Protocol address) is a unique address that devices use in order to identify and communicate with each other on a network.

Example: 192.168.1.5" ++TIP 450 "A Computer Name is a unique name assigned to each computer on a network.

Example: Tux" ++TIP 450 "Workgroup is a group of computers participating on a network.

Example: Workgroup" ++TIP 450 "Shared Folder is a directory which can be viewd by any person connected to that client at that time.

Example: documents/todays" ++TIP 450 "Location on the router to create virtual directory from shared folder

Example: /mnt" ++TIP 450 "A user in computing context is one who uses a computer system.

Example: joesmith" ++TIP 450 "A password is a form of secret authentication data that is used to control access to a resource.

Example: hBjGX56" ++echo "
" ++ ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-dlmanager.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-dlmanager.sh +new file mode 100755 +index 0000000..c9d5d5f +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-dlmanager.sh +@@ -0,0 +1,280 @@ ++#!/usr/bin/webif-page "-U /tmp -u 4096" ++ ++# ++ ++. /usr/lib/webif/webif.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++filename="" ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "Download Manager" "" "ctorrent" "curl" ++ ++ if is_package_installed "ctorrent" && is_package_installed "curl" ; then ++ ##### Make config file ++ ++ if [ ! -s "/etc/config/app.dlmanager" ] ; then ++ echo "config dlmanager general ++ option tmp '/etc/dlmanager' ++config dlmanager http ++ option destination '/mnt/sd' ++config dlmanager ftp ++ option destination '/mnt/sd' ++config dlmanager torrent ++ option destination '/mnt/sd'" > /etc/config/app.dlmanager ++ mkdir /etc/dlmanager ++ mkdir /etc/dlmanager/http ++ mkdir /etc/dlmanager/ftp ++ mkdir /etc/dlmanager/torrents ++ mkdir /etc/dlmanager/history ++ fi ++ echo_install_complete ++ Load_remote_libs ++ ln -s /usr/lib/libuClibc++-0.2.1.so /lib/libuClibc++.so.0 ++ ln -s /usr/lib/libcurl.so.3.0.0 /lib/libcurl.so.3 ++ ln -s /usr/lib/libz.so.1.2.3 /lib/libz.so.1 ++ ln -s $ipklocation/usr/bin/ctorrent /usr/sbin/ctorrent ++ ln -s $ipklocation/usr/bin/curl /usr/sbin/curl ++ fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "Download Manager" "app.dlmanager" "ctorrent" "uclibcxx" "curl" "libcurl" "libopenssl" "zlib" ++ rm /lib/libuClibc++.so.0 2> /dev/null ++ rm /lib/libcurl.so.3 2> /dev/null ++ rm /lib/libz.so.1 2> /dev/null ++ rm /usr/sbin/ctorrent 2> /dev/null ++ rm /usr/sbin/curl 2> /dev/null ++exit ++fi ++ ++if is_package_installed "ctorrent" && is_package_installed "curl" ; then ++ ++ ######## Read config ++ uci_load "app.dlmanager" ++ TMP_PATH="$CONFIG_general_tmp" ++ HTTP_PATH="$CONFIG_http_destination" ++ TORRENT_PATH="$CONFIG_torrent_destination" ++ ++ cat < ++
++EOF ++GetFilenameFromPath(){ ++ echo $1 | sed -e s/'\\'/'\n'/g | awk '{ print $1 }' | while read output; ++ do echo $output > /tmp/.filename ++ done ++ filename=$(grep '' < /tmp/.filename) ++} ++HTTP_Download(){ ++ _HTTP=$(grep '' < $1$2 ) ++ _HTTPS=$(echo $_HTTP | cut -c1-5) ++ if equal $_HTTPS "https"; then _K="-k -3"; fi ++ ++ if equal $3 1 ; then ++ if [ -s "$HTTP_PATH/$2" ] ; then _RESUME="-C $(ls -l $HTTP_PATH/$2 | awk '{ print $5 }')" ; fi ++ curl $_RESUME $_K -o $HTTP_PATH/$2 $_HTTP 2> /dev/null ++ else curl -I $_K $_HTTP > $1.$2 2> /dev/null ###To read the HTTP header first for fileinfo (size) ++ fi ++} ++HTTP_DL_Detail(){ ++ TIP 500 "
$1
" ++} ++########################################################## ++ if ! equal "$FORM_uploadbt" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
File sucessfully uploaded ...
" ++ GetFilenameFromPath $(echo $FORM_uploadname | sed -e s/' '/'_'/g) ++ mv $FORM_uploadbt $TMP_PATH/torrents/$filename ++ exit ++ fi ++ ++ if ! equal "$FORM_urlbt" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
File is downloading ...
" ++ wget -q $FORM_urlbt -P $TMP_PATH/torrents/ ++ exit ++ fi ++ ++ if ! equal "$FORM_urlhttp" ""; then ++ GetFilenameFromPath $(echo $FORM_uploadname | sed -e s/'\/'/'\\'/g) ++ ++ if [ -s "$HTTP_PATH/$filename" ] ; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
File already exist in \"$HTTP_PATH\" ...
" ++ else APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Adding File to List ...
" ++ echo "$FORM_urlhttp" > $TMP_PATH/http/$filename ++ HTTP_Download $TMP_PATH/http/ $filename ++ fi ++ exit ++ fi ++ ++ if ! equal "$FORM_start_torrent" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Starting torrent download ...
" ++ ctorrent -e 0 -s /mnt/ $TMP_PATH/torrents/$FORM_file ++ exit ++ fi ++ ++ if ! equal "$FORM_start_http" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=http "
Starting HTTP download ...
" ++ FILE_PATH=$(grep '' < $TMP_PATH/http/$FORM_file ) ++ HTTP_Download $TMP_PATH/http/ $FORM_file ++ HTTP_Download $TMP_PATH/http/ $FORM_file 1 ++ #mv $TMP_PATH/http/$FORM_file $TMP_PATH/history/$FORM_file ++ #rm $TMP_PATH/http/.$FORM_file ++ exit ++ fi ++ if ! equal "$FORM_stop_http" ""; then ++ APP_Refresh_Page $SCRIPT_NAME?page=http "
Stopping HTTP downloads ...
" ++ killall -q curl ++ exit ++ fi ++ ++ if ! equal "$FORM_save_torrent" "" ; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Saving Settings ...
" ++ uci_set "app.dlmanager" "torrent" "destination" "$FORM_dest" ++ uci_commit "app.dlmanager" ++ exit ++ fi ++ if ! equal "$FORM_save_http" "" ; then ++ APP_Refresh_Page $SCRIPT_NAME?page=$FORM_page "
Saving Settings ...
" ++ uci_set "app.dlmanager" "http" "destination" "$FORM_dest" ++ uci_commit "app.dlmanager" ++ exit ++ fi ++if [ "$FORM_page" = "http" ]; then ++ ++ echo "Status

" ++ if [ $(ps | grep -c curl) = "1" ] ; then ++ echo "
HTTP downloading stopped


" ++ else echo "
HTTP downloading sucessfully started  


" ++ fi ++ cat < ++function java1() { ++document.addnew.uploadname.value = document.addnew.urlhttp.value; ++} ++ ++EOF ++ HTML_Form $SCRIPT_NAME "addnew" ++ echo "Add New File

" ++ HTML_Table_Line 2 ++ HTML_Table_TR "b1" "URL Address:" "  " 200 ++ HTML_Table_Line 2 ++ HTML_Table_TR "b2" "Destination:" "


" 0 ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Start downloading on boot

" 0 ++ HTML_Table_TR "" "" "" 0 ++ echo "
" ++ ++ TIP 0 "Specify URL address of web file" ++ TIP 0 "Location to where files will be downloaded" ++ ++ if [ "$FORM_do" = "del_http" ]; then ++ echo "
Web File \"$FORM_file\" deleted

" ++ rm $TMP_PATH/http/$FORM_file ++ fi ++ ++ echo "Web File List:

" ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "File_Name width='80%'" "Status" "Action" ++ ++ ++ ls $TMP_PATH/http | while read output; ++ do if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ FILE_SIZE=$(grep 'ength:' < $TMP_PATH/http/.$output | sed -e s/'Content-Length:'//g -e s/'Content-length:'//g | awk '{ print $1 }') ++ FILE_SIZE_ONDISK=$(ls -l $HTTP_PATH/$output | awk '{ print $5 }') 2> /dev/null ++ if equal $FILE_SIZE_ONDISK "" ; then FILE_SIZE_ONDISK=0; fi ++ echo "" ++ HTTP_DL_Detail "File: $output
Location: $(grep '' < $TMP_PATH/http/$output)
Total Size: $FILE_SIZE (bytes) - $(expr $FILE_SIZE / 1024 / 1024 2> /dev/null) (MB)
Downloaded: $FILE_SIZE_ONDISK (bytes)" ++ echo " $output$(expr $FILE_SIZE_ONDISK \* 100 / $FILE_SIZE 2> /dev/null)%Start Download Delete" ++ done ++ ++elif [ "$FORM_page" = "ftp" ]; then ++ echo "in developemnt..." ++ ++elif [ "$FORM_page" = "torrent" ]; then ++ ++ echo "Status

" ++ if [ $(ps | grep -c ctorrent) = "1" ] ; then ++ echo "
Torrent downloading stopped


" ++ else echo "
Torrent Client is sucessfully started  


" ++ fi ++ ++ cat < ++function java1() { ++document.addnew.uploadname.value = document.addnew.uploadbt.value; ++} ++ ++EOF ++ HTML_Form $SCRIPT_NAME "addnew" ++ echo "Add New Torrent

" ++ ++ HTML_Table_Line 2 ++ HTML_Table_TR "b1" "Local torrent:" "  " 200 ++ HTML_Table_TR "b2" "Web torrent:" "  " 0 ++ HTML_Table_Line 2 ++ HTML_Table_TR "b3" "Destination:" "


" 0 ++ HTML_Table_Line 2 ++ HTML_Table_TR "" "" " Start downloading on boot

" 0 ++ HTML_Table_TR "" "" "" 0 ++ echo "
" ++ ++ TIP 0 "You may upload new torrents from local disk" ++ TIP 0 "Specify URL address of torrent file" ++ TIP 0 "Location to where the torrents will be downloaded" ++ ++ if [ "$FORM_do" = "delete" ]; then ++ echo "
Torrent \"$FORM_file\" deleted

" ++ rm $TMP_PATH/torrents/$FORM_file ++ fi ++ ++ echo "Torrents List:

" ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "File_Name width='80%'" "Status" "Action" ++ ++ ls $TMP_PATH/torrents | while read output; ++ do if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo " $output
?
Start Download Delete
" ++ done ++ ++elif [ "$FORM_page" = "history" ]; then ++ if [ "$FORM_do" = "delete" ]; then ++ echo "History \"$FORM_file\" cleaned

" ++ rm $TMP_PATH/history/$FORM_file ++ fi ++ echo "History List:

" ++ HTML_Table 1 "100%" "999999" "align='center'" 4 "Type" "File_Name width='80%'" "Status" "Action" ++ ++ ls $TMP_PATH/history | while read output; ++ do ++ if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo "? $output100%Re Download Delete" ++ done ++ ++else ++ echo "Files currently downloading:

" ++ echo "" ++ HTML_Table 1 "100%" "999999" "align='center'" 3 "File_Name width='80%'" "Status" "Action" ++ ++ ps | grep 'curl' | awk '{ print $1 }' | while read output; ++ do if [ "$color" = "#FFFFFF" ] ; then color="#E6E6E6" ; else color="#FFFFFF" ; fi ++ echo " $output? Stop" ++ done ++fi ++echo "" ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-hydra.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-hydra.sh +new file mode 100755 +index 0000000..2e7f9fd +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-hydra.sh +@@ -0,0 +1,226 @@ ++#!/usr/bin/webif-page "-U /tmp -u 4096" ++ ++# ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++ ++if ! empty "$FORM_package"; then ++ ++ App_package_install "Hydra 4.5" "" "" ++ wget -q http://www.hackerpimps.com/fairuzawrt/bin/hydra -P /usr/sbin/ ++ wget -q http://www.phenoelit.de/obiwan/common-passwords.txt -P /etc/ ++ mv /etc/common-passwords.txt /etc/pwd.lst ++ ++ if [ -s "/usr/sbin/hydra" ] ; then ++ chmod 755 /usr/sbin/hydra ++ echo "config hydra conf ++ option ip '' ++ option service 'http' ++ option path '' ++ option usr 'admin' ++ option pwd '/etc/pwd.lst'" > /etc/config/hydra ++ ++ echo_install_complete ++ fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ App_package_remove "Hydra 4.5" "hydra" ++ rm /usr/sbin/hydra ++ rm /etc/pwd.lst 2> /dev/null ++exit ++fi ++ ++if [ -s "/usr/sbin/hydra" ] ; then ++ ++echo "$HTMLHEADStatus

" ++ ++if equal $FORM_action "upload" ; then echo "... File sucessfully uploaded
" ++ ++ if [ $FORM_usrorpwd = "usr" ] ; then ++ mv $FORM_uploadfile /etc/usr.lst ++ uci_set "hydra" "conf" "usr" "/etc/usr.lst" ++ else mv $FORM_uploadfile /etc/pwd.lst ++ uci_set "hydra" "conf" "pwd" "/etc/pwd.lst" ++ fi ++ uci_commit "hydra" ++fi ++ ++######### Save Hydra ++if ! empty "$FORM_save_hydra"; then ++echo "" ++echo "
saving...." ++ ++uci_set "hydra" "conf" "ip" "$FORM_h_ip" ++uci_set "hydra" "conf" "service" "$FORM_service" ++uci_set "hydra" "conf" "port" "$FORM_h_port" ++uci_set "hydra" "conf" "path" "$FORM_h_path" ++uci_set "hydra" "conf" "usr" "$FORM_h_usr" ++uci_set "hydra" "conf" "pwd" "$FORM_h_pwd" ++uci_set "hydra" "conf" "wait" "$FORM_h_wait" ++ ++ ### If session checkbox on ++ if ! empty "$FORM_chksession"; then ++ uci_set "hydra" "conf" "session" "checked" ++ else uci_set "hydra" "conf" "session" "" ; fi ++ ++uci_commit "hydra" ++exit ++fi ++ ######## Read config ++ ++ uci_load "hydra" ++ CFG_IP="$CONFIG_conf_ip" ++ CFG_SRV="$CONFIG_conf_service" ++ CFG_PORT="$CONFIG_conf_port" ++ CFG_RSESSION="$CONFIG_conf_session" ++ CFG_PATH="$CONFIG_conf_path" ++ CFG_USR="$CONFIG_conf_usr" ++ CFG_PWD="$CONFIG_conf_pwd" ++ CFG_WAIT="$CONFIG_conf_wait" ++ ++ ######## Run Hydra ++ if ! empty "$FORM_runhydra"; then ++ APP_Refresh_Page $SCRIPT_NAME "
Starting Hydra ...
" ++ ++ if [ -s "$CFG_USR" ] ; then hL="-L" ; else hL="-l" ; fi ++ if [ -s "$CFG_PWD" ] ; then hP="-P" ; else hP="-p" ; fi ++ if ! equal $CFG_PATH "" ; then hM="-m $CFG_PATH" ; fi ++ if ! equal $CFG_WAIT "" ; then hW="-w $CFG_WAIT" ; fi ++ if equal $CFG_RSESSION "checked" ; then hR="-R" ; fi ++ ++ if [ $CFG_SRV = "http" ] ; then ++ hydra -f $hR $hL $CFG_USR $hP $CFG_PWD $hW -e ns $CFG_IP http $hM > /tmp/hydra.www ++ elif [ $CFG_SRV = "ftp" ] ; then ++ hydra -f $hR $hL $CFG_USR $hP $CFG_PWD $hW -e ns $CFG_IP ftp > /tmp/hydra.ftp ++ elif [ $CFG_SRV = "telnet" ] ; then ++ #NOT TESTED YET ++ #hydra -f $hR $hL $CFG_USR $hP $CFG_PWD $hW -e ns $CFG_IP telnet > /tmp/hydra.telnet ++ echo "" ++ fi ++ exit ++ fi ++ ++ ######## Stop Hydra ++ if ! empty "$FORM_stophydra"; then ++ echo "
Stopping Hydra ..." ++ killall -q hydra ++ exit ++ fi ++ ######## Reset Hydra ++ if ! empty "$FORM_resethydra"; then ++ rm /tmp/hydra.www 2> /dev/null ++ rm /tmp/hydra.ftp 2> /dev/null ++ rm /tmp/hydra.telnet 2> /dev/null ++ echo "" ++ echo "
Reseting Hydra ..." ++ exit ++ fi ++ ++ ####### Check if hydra is running ++ pscheck=$(ps | grep -c 'hydra -f') ++ if [ $pscheck = "1" ] ; then ++ if [ -s "/tmp/hydra.www" ] ; then pwd_www=$( grep "\[www\]" < /tmp/hydra.www) ; fi ++ if [ -s "/tmp/hydra.ftp" ] ; then pwd_ftp=$( grep "\[ftp\]" < /tmp/hydra.ftp) ; fi ++ if [ -s "/tmp/hydra.telnet" ] ; then pwd_telnet=$( grep "\[telnet\]" < /tmp/hydra.telnet) ; fi ++ echo "
Hydra is not running
  
" ++ else ++ echo "
Hydra is running as '$CFG_USR' : '$CFG_PWD'  
" ++ fi ++ ++if equal $pwd_www "" && equal $pwd_ftp "" && equal $pwd_telnet "" ; then ++ echo "No sucessfull logins found so far...

" ++else ++cat <Found sucessfull logins!

WARNING: Change your passwords immediately!!!

++
++
++$pwd_www
++$pwd_ftp
++$pwd_telnet
++

++EOF ++fi ++ ++cat < ++ ++EOF ++ ++DIV_Windows_Header 0 ++ ++cat <Upload File
++
++ ++ ++ ++ ++ ++ ++
++
++Hydra Configuration
++
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
IP Address
Service
Port
Username  
Password List  
Wait Time
  
 Restore a previous aborted/crashed session
  
 
++EOF ++ ++TIP 450 "IP address to attack.

Example: 192.168.1.5" ++TIP 450 "Service to attack.

Example: http,ftp,telnet,ssh" ++TIP 0 "Port # of service of different from default" ++TIP 450 "Aditional parameter.

Example:" ++TIP 450 "Single username or text file with list of usernames.

Example: admin or /tmp/usr.lst" ++TIP 450 "Single password or text file with list of passwords.

Example: password or /tmp/passwd.lst" ++TIP 450 "Defines the max wait time in seconds for responses (default: 30)" ++echo "" ++ ++fi ++?> +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-ipkg.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-ipkg.sh +new file mode 100755 +index 0000000..0a1a47c +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-ipkg.sh +@@ -0,0 +1,76 @@ ++#!/usr/bin/webif-page ++ ++# ++ ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_remove" ; then ++ echo "
Restoring ipkg configuration ...

"
++
++	if [ -s "/etc/profile.bak" ] ; then
++
++	rm /etc/profile 
++	mv /etc/profile.bak /etc/profile 
++
++	if [ -s "/etc/ipkg.conf.bak" ] ; then rm /etc/ipkg.conf ; mv /etc/ipkg.conf.bak /etc/ipkg.conf ; fi
++
++	rm /etc/config/app.ipkg
++
++	else
++	echo "Sorry cannot restore ... Try manually."
++	fi
++	echo "
Done." ++exit ++fi ++ ++if [ -s "/etc/config/app.ipkg" ] ; then ++ ++ uci_load "app.ipkg" ++ location="$CONFIG_int_location" ++ ++cat < ++Status

++EOF ++ ++######### Save ipkg ++if ! empty "$FORM_save_ipkg"; then ++echo "" ++echo "
saving...." ++ ++uci_set "app.ipkg" "int" "location" "$FORM_location" ++uci_commit "app.ipkg" ++ ++exit ++fi ++ ++echo "
ipkg is configured ($location)  


" ++ ++cat <ipkg Configuration
++
++
++ ++ ++ ++ ++ ++ ++ ++
  
Location
  
 
++EOF ++ ++TIP 450 "Path to where Applications will install, if router is out of RAM

Example: /mnt/usb" ++echo "" ++ ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-proftpd.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-proftpd.sh +new file mode 100755 +index 0000000..1b99da8 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-proftpd.sh +@@ -0,0 +1,179 @@ ++#!/usr/bin/webif-page ++ ++# ++ ++. /usr/lib/webif/functions.sh ++. /lib/config/uci.sh ++. /www/cgi-bin/webif/applications-shell.sh ++ ++echo "$HEADER" ++ ++if ! empty "$FORM_package"; then ++ ++ #App_package_install "FTP Server" "http://ftp.osuosl.org/pub/nslu2/feeds/unslung/wl500g/" "openssl_0.9.7l-3_mipsel.ipk" "proftpd_1.2.10-5_mipsel.ipk" ++ ++ App_package_install "FTP Server" "http://192.168.0.7/" "openssl_0.9.7l-3_mipsel.ipk" "proftpd_1.2.10-5_mipsel.ipk" ++ #ipkg $loc install $url1"proftpd_1.3.0a-1_mipsel.ipk" -force-overwrite -force-defaults ++ ++ if is_package_installed "openssl" && is_package_installed "proftpd" ; then ++ ++ #### Small patches to get it working with webif^2 ++ #cp $loc/opt/etc/proftpd.conf /etc/proftpd.conf ++ ++echo "ServerName \"ProFTPD Webif^2 Installation\" ++ServerType standalone ++DefaultServer on ++WtmpLog off ++Port 21 ++Umask 022 ++MaxInstances 10 ++PassivePorts 49873 49873 ++ ++MaxClients 3 \"550 Too Many Users (Limit=%m)\" ++MaxClientsPerHost 1 \"551 One connection per IP\" ++ ++DirFakeUser on ~ ++DirFakeGroup on ~ ++ ++ ++ RootLogin On ++ RequireValidShell off ++ #AuthUserFile /etc/passwd ++ AuthUserFile /etc/passwd ++ ++ AllowStoreRestart on ++ ++ ++DefaultRoot /www/ ++ ++ ++ ++ AllowAll ++ ++ ++ ++User root ++Group root ++ ++AllowOverwrite on" > /etc/proftpd.conf ++ ++ #if equal $(grep "nobody:" < /etc/group) "" ; then echo "nobody:x:65535:" >> /etc/group ; fi ++ mkdir /opt ++ mkdir /opt/var ++ mkdir /opt/var/proftpd ++ ln -s $loc/opt/sbin/proftpd /usr/sbin/proftpd ++ ++ #### Check if first time /etc/config exists ++ ++ if [ -s "/etc/config/app.proftpd" ] ; then ++ echo "" ++ else ++ echo "config proftpd net ++ option port '21'" > /etc/config/app.proftpd ++ fi ++ ++ Load_remote_libs ++ echo_install_complete ++fi ++exit ++fi ++ ++if ! empty "$FORM_remove"; then ++ echo "
Removing FTP Server packages ...

"
++	remove_package "proftpd"
++	remove_package "openssl"
++	rm /etc/config/app.proftpd
++	rm /etc/proftpd.conf
++	echo "
Done." ++exit ++fi ++ ++if is_package_installed "openssl" && is_package_installed "proftpd" ; then ++ ++ ++######## Read config ++ ++uci_load "app.proftpd" ++NET_PORT="$CONFIG_net_port" ++ ++ ++HEADER=" ++" ++ ++cat < ++Status

++EOF ++ ++######## Try start Proftpd ++if ! empty "$FORM_startftp"; then ++echo "" ++echo "
Starting FTP Server ...
" ++proftpd -c /etc/proftpd.conf & ++exit ++fi ++ ++######### Save Proftpd ++if ! empty "$FORM_save_proftpd"; then ++echo "" ++echo "
saving...." ++ ++uci_set "app.proftpd" "net" "port" "$FORM_ftp_port" ++uci_commit "app.proftpd" ++ ++exit ++fi ++ ++if ! empty "$FORM_stopftp"; then ++echo "" ++echo "
Stopping FTP Server ..." ++killall -q proftpd ++exit ++fi ++ ++####### Check if proftpd is running ++#echo "'"$(ps | grep -c proftpd)"'" ++if [ $(ps | grep -c proftpd) = "1" ] ; then ++ ++cat < ++
FTP Server is not running
  
++ ++
++EOF ++ ++else ++ ++echo "
FTP Server is succesfully started  


" ++fi ++ ++cat <FTP Server Configuration
++
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
  
Port
  
 
++
++EOF ++ ++TIP 450 "Port number

Default: 21" ++echo "" ++ ++fi ++?> +\ No newline at end of file +diff --git a/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-shell.sh b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-shell.sh +new file mode 100755 +index 0000000..9b52446 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/cgi-bin/webif/applications-shell.sh +@@ -0,0 +1,132 @@ ++#!/bin/sh ++######################################### ++# Applications Common Functions ++# ++# Author(s) [in order of work date]: ++# Dmytro Dykhman ++# ++ ++tipcount=1 ++location="" ++ ++HEADER="HTTP/1.0 200 OK ++Content-type: text/html; charset=UTF-8 ++ ++" ++ ++HTMLHEAD=" ++ ++ ++ ++ ++ ++" ++ ++TIP(){ ++if [ $1 != 0 ]; then ++style="style='width: $1px;'" ++fi ++echo "
$2
" ++let "tipcount+=1" ++} ++ ++Load_remote_libs(){ ++ uci_load "app.ipkg" ++ loc="$CONFIG_int_location" ++ ++ echo "#!/bin/sh" > /tmp/.D43S.tmp ++ echo "START=98" > /tmp/.D43S.tmp ++ echo "ls -l $loc/usr/lib/ | awk '{print \" if [ ! -f /usr/lib/\"\$9\" ] \\n then \\n ln -s $loc/usr/lib/\"\$9\" /usr/lib/\"\$9\" \\n fi\"}' > /tmp/.lib1.tmp" >> /tmp/.D43S.tmp ++ echo "ls -l $loc/opt/lib/ | awk '{print \" if [ ! -f /usr/lib/\"\$9\" ] \\n then \\n ln -s $loc/opt/lib/\"\$9\" /usr/lib/\"\$9\" \\n fi\"}' > /tmp/.lib2.tmp" >> /tmp/.D43S.tmp ++ echo "ls -l $loc/lib/ | awk '{print \" if [ ! -f /usr/lib/\"\$9\" ] \\n then \\n ln -s $loc/lib/\"\$9\" /usr/lib/\"\$9\" \\n fi\"}' > /tmp/.lib3.tmp" >> /tmp/.D43S.tmp ++ echo "sh /tmp/.lib1.tmp ; rm /tmp/.lib1.tmp" >> /tmp/.D43S.tmp ++ echo "sh /tmp/.lib2.tmp ; rm /tmp/.lib2.tmp" >> /tmp/.D43S.tmp ++ echo "sh /tmp/.lib3.tmp ; rm /tmp/.lib3.tmp" >> /tmp/.D43S.tmp ++ sh /tmp/.D43S.tmp 2> /dev/null ; rm /tmp/.D43S.tmp ++} ++ ++Check_ipkg_update(){ ++ if [ ! -s "/usr/lib/ipkg/lists/X-Wrt" ] || [ ! -s "/usr/lib/ipkg/lists/snapshots" ] ; then ipkg update ; fi ++} ++ ++App_package_install(){ ++ if ! empty "$FORM_ipkg"; then location="-d "$FORM_ipkg ; fi ++ ++ uci_load "app.ipkg" ++ ipklocation="$CONFIG_int_location" ++ url1=$2 ++ ++ if equal $(df | grep '/mnt'| awk '{ print $6 }') "" && equal $FORM_ipkg "app" ; then ++ echo "

Installation path is currently down! Please check your external storage." ++ exit ; fi ++ ++ echo "Installing $1 package(s) ...

"
++	
++	Check_ipkg_update
++
++	if ! equal $3 "" ; then ipkg $location install $url1$3 -force-overwrite ; fi
++	if ! equal $4 "" ; then ipkg $location install $url1$4 -force-overwrite ; fi
++	if ! equal $5 "" ; then ipkg $location install $url1$5 -force-overwrite ; fi
++	if ! equal $6 "" ; then ipkg $location install $url1$6 -force-overwrite ; fi
++	if ! equal $7 "" ; then ipkg $location install $url1$7 -force-overwrite ; fi
++	if ! equal $8 "" ; then ipkg $location install $url1$8 -force-overwrite ; fi
++	if ! equal $9 "" ; then ipkg $location install $url1$9 -force-overwrite ; fi
++}
++
++App_package_remove(){
++	echo "Removing $1 packag(e) ...

"
++	rm /etc/config/$2 2> /dev/null
++	if ! equal $3 "" ; then ipkg remove "$3" ; fi
++	if ! equal $4 "" ; then ipkg remove "$4" ; fi
++	if ! equal $5 "" ; then ipkg remove "$5" ; fi
++	if ! equal $6 "" ; then ipkg remove "$6" ; fi
++	if ! equal $7 "" ; then ipkg remove "$7" ; fi
++	if ! equal $8 "" ; then ipkg remove "$8" ; fi
++	if ! equal $9 "" ; then ipkg remove "$9" ; fi
++	echo_remove_complete
++}
++
++echo_install_complete(){
++	echo "

Installation Complete"
++}
++echo_remove_complete(){
++	echo "

Uninstall Complete" ++} ++ ++DIV_Windows_Header(){ ++ echo " ++EOF ++ ++fi ++ ++if [ "$FORM_package" = "install" ]; then ++ ++ echo "" ++ if [ ! -d $FORM_prompt ] || [ "$FORM_prompt" = "" ] || [ "$FORM_prompt" = " " ] ; then ++ echo "Directory '$FORM_prompt' missing - I will try to mount it (hint: Samba Client)" ++ exit ++ fi ++ echo "
Applying changes to ipkg ...

To disable or change location goto \"Network Applications\" -> \"ipkg\"" ++ echo "config ipkg int ++ option location '$FORM_prompt'" > /etc/config/app.ipkg ++ if equal $(grep "$FORM_prompt" < /etc/ipkg.conf) "" ; then #<-Check make sure we do't have same entry ++ ++ cp /etc/ipkg.conf /etc/ipkg.conf.bak ++ echo " ++dest app $FORM_prompt" >> /etc/ipkg.conf ++ ++ ### --- Read file ++ tempfile=$(mktemp /tmp/.ipkg.XXXXXX) ++ chmod 644 $tempfile ++ exec 3<&0 ++ exec 0> $tempfile ++ else ++ echo "$line" >> $tempfile ++ fi ++ else ++ ++ # TODO Make this less compilated! becase echo cuts \ and saves us: export PS1='u@h:w$ ' ++ # ++ if equal $(echo $line | cut -c1-10 | sed -e s/' '//g) "exportPS1" ; then echo "export PS1='\u@\h:\w\\\$ '" >> $tempfile ; else echo "$line" >> $tempfile ; fi ++ ++ fi ++ done ++ ++ mv /etc/profile /etc/profile.bak ++ mv $tempfile /etc/profile ++ exec 0<&3 ++ exit 0 ++ ### --- ++ ++ fi ++ ++ exit ++fi ++?> ++ +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/all-wcprops b/feeds/xwrt/webif-applications/files/www/images/.svn/all-wcprops +new file mode 100644 +index 0000000..b14bb22 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/all-wcprops +@@ -0,0 +1,95 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 68 ++/svn/!svn/ver/4638/trunk/package/webif-applications/files/www/images ++END ++app.11.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.11.jpg ++END ++dvsts.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/dvsts.jpg ++END ++arrwd.gif ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/arrwd.gif ++END ++app.1.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.1.jpg ++END ++app.3.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.3.jpg ++END ++app.4.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.4.jpg ++END ++app.5.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.5.jpg ++END ++app.6.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.6.jpg ++END ++app13.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app13.jpg ++END ++app.7.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.7.jpg ++END ++arrwu.gif ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/arrwu.gif ++END ++app.8.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.8.jpg ++END ++app.9.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 78 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.9.jpg ++END ++app.14.gif ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.14.gif ++END ++app.10.jpg ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/svn/!svn/ver/3441/trunk/package/webif-applications/files/www/images/app.10.jpg ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/entries b/feeds/xwrt/webif-applications/files/www/images/.svn/entries +new file mode 100644 +index 0000000..68cd590 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/entries +@@ -0,0 +1,538 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications/files/www/images ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-01-08T17:58:43.246710Z ++4638 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++app.11.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++7e21ba4de7711253c481712dacaa3d17 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1005 ++ ++dvsts.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++5d8e1e96eb09d5588233897f170e13c4 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1007 ++ ++arrwd.gif ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++f6a296d37f491ee4e111d81cdf9413b5 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++203 ++ ++app.1.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++dc2cbab020532fcd365e51547bd968e3 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1695 ++ ++app.3.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++29e95ed9ff24581726a63248790778dc ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1236 ++ ++app.4.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++2162b70863887c78ae16592462831b7b ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1298 ++ ++app.5.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++6c4a3b9bc7aa13eefa7fe51292e578eb ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1282 ++ ++app.6.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++26b3e6785e5faef2283d1e4d93f05d0d ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1274 ++ ++app13.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++124678961a4609f20361274412a80414 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1541 ++ ++app.7.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++6dc5f7b70bafbae73d34a6f82d8c301f ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1770 ++ ++arrwu.gif ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++709dbce396b5f1efe7db61dbda45ea39 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++201 ++ ++app.8.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++c7a6c3dfa65223ed7d37bf6026c438b8 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1302 ++ ++app.9.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++bb499953069835128141c696bbec10e7 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1228 ++ ++app.14.gif ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++037550d04747572d9a1e707f666844a9 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++920 ++ ++app.10.jpg ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++3335226bc43d4741feae5245e05b5456 ++2007-07-10T17:32:11.932681Z ++3441 ++thepeople ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1280 ++ +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.1.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.1.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.1.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.10.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.10.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.10.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.11.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.11.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.11.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.14.gif.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.14.gif.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.14.gif.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.3.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.3.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.3.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.4.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.4.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.4.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.5.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.5.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.5.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.6.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.6.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.6.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.7.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.7.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.7.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.8.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.8.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.8.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.9.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.9.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app.9.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app13.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app13.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/app13.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/arrwd.gif.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/arrwd.gif.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/arrwd.gif.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/arrwu.gif.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/arrwu.gif.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/arrwu.gif.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/dvsts.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/dvsts.jpg.svn-base +new file mode 100644 +index 0000000..5e9587e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/files/www/images/.svn/prop-base/dvsts.jpg.svn-base +@@ -0,0 +1,5 @@ ++K 13 ++svn:mime-type ++V 24 ++application/octet-stream ++END +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.1.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.1.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..0ddcb1ce4e25f285f3d4fcce3be21d9aff1a6be2 +GIT binary patch +literal 1695 +zcma)%e>@ZTAICp4`+*IUXfuxanW-?&iM08$`Rz6*;ihAL+)iOL6{7gIyUN$p2_ +zk=kfI6bg+(>0wZ4wNMy6jKK~AjGnPE7He!wu&}To*nAKKsimc_t8Z#(Xljnzi8KFT +z{J)7x0x(G62ppjh4A8(ppcsg%8(aWDLjwv?pZQ(L_Lin*Xn%2~&R!h3f+i +z2ows1AYlJ-)exihEDW3|@E!D64#C;mFpm+(wah1}7eSy9*oV@;2LOzwlLdut08_?t +z@|p-cE(w2e_8#V{#sErvhXw|U0SCc4er|2_lYWKpAC}!6`GrFs14Rk@antk;ZSWJ0$Ce~m{t&v5rIz&~GZ1G3zs^rLn!r-FriLLJ47Tf_5r-w@oO1 +z?-hN)V?yFm-!6WtjGg;A!FH~Ox&QdL9&I>VdxZD*_xbRiA|A?to&0b`*cG3m6bPaI +z))U1q5BQ04x%+x-zdFsh%f2!nABg}B-X%sbqqyFdHaK(U%gH&4RrjXOnE!o +zh5@bbRJTacCL2#bS7sJOZ|>hX{^b7cH|JS}?ms6@%+Ob@#JBVQ5XJ5dNe^s`(}9PD +z=mbbzx5)BNW(+&QvpNp#!I=q{GHqhGDO+1k!j=E=iwN&6m)<@62 +zNu8yNpPZ*{hAv$@6*9H3m_<5x`S~%0O;KdDNZgWESyjb{j>BB;(j2;nmE9QfPP~Bn +z#5BozZZ@BIl4i^5lmIuY>t{?eI6hLxaAO;>Ri4p&sp2Kc%=<^)b`#wvC(s4t`nlNS +z4k6}h4|>1HL3U5AWTt*$pv5@NAuQTrAJ+3uU$8qj +z^(xRAJ4l?*_0G|w4L(<4g9TwU>}PbD8I|7Tgw +z7H#(@8&Aegq_H+U-NNt*rAB)D?y3MiSUF_4>d@qPavV+#`;;=S&%1iLu4(k%{>E62 +z|NF4nU42}1QVHV#6hBH{V;g6rdCebM94$}(=EBR0{`*rM#79Z9J1n8u=snBKjXy{& +zH>Bo!Qq6v^T)>S5{eZhB;M&_BnG?=Q5?G4p)4y&XtNv|?xLS}OCFg6kwe%-)-TsY_ +z>#x54)#J>8@8-|iD>tb<;#nSRzjs0UQ1f6|%+aa-VxqGkY-rxz?c=Anqve4GeZd0_ +zk_K4@Tl>~6rBhD$?ZM*JpyX3LwWSj$>kOqzEzRF15%5KALeKXSPSiHT{%uA>A@7r%DqWif$!O +z+L^WvyPuT0k?ud(v(Uawj!i5{pm25Xy)Yd1@{&%C%oj2*jsyZfuVE39XxHfSHt6v9 +z1V5_Lrz(%y{3yASPt89=OLNK%(WJ8f2RY3qE5gBK!5d%ICXSN8EM +z56augl>jeFkyGdTa#UXos_f!3))eE=ui}X*LIwGd0Hy*pab0hhrb7ir>F=^>bt{vM +z$OuCCrw7AY1>&11yNJN9@-I0T3#;xNZQOMY`(k=@%r3Ebndi&MR*;`YI>&PotuD+M +zp*Uhm70yghFRP<$U(@0gw}w8vB4TnpBZE&M_wgb=NH)3uWegm9LCDsD|g>Z6a}cB{{;b! +B$Cdy9 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.10.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.10.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..e4a9d9b317a4fab615b0cd83b66aa556b9e755da +GIT binary patch +literal 1280 +zcmYk4eKb^g7{`D2&bwyjx@L@ZHD0H2Vzo1+Xi@9rnZ9qGXL;?5=}R +zBvEZ0QAxt287d4lDkkft5gOT=Nhz9In{7!uJMEr2`+5HRexK)izJEN%5#tkJ9vl!9 +z03aBEMAHD{G(i2*6H+n(1n>X=o=GwQx^H5tI0+$wV=1@nQ_)e!}$&5QR*pm{F)^W>kbqry`6`Ck)Gf +z11vEHYJ!1TVJsF4vtqL`jLqh7oH(2>_pZhcfRau1csR%rz$k=6A)^Z90RY1|$W-$) +zL=uhwU_2QDI0*W`fx{DEKr{z1gu_8ZJc00^3BfoNPXHD~2flCoat1Sew{ge)s_wQqsFfeJGq|s? +zTeb{B`d?-`lU0le+5VIJc>d81#LTQJ<KCjc{}L6Bhb6W1Y$p_FSJDFe+fK8}D%NKo +zP>ucllwCUDF!_5$w)0~}e$VY!TTZ$U9%J0+pC}o5($+J!W#uyu^KN#=jXL#p@|wu7 +zz`oG7Rn3jFSgZ>+94+@SU)+HLNBXTXjd!sd(T2Zm4j>fc>4QU<+TaZaj3-;+A1J +zQciz6mfXc25@q{)wc3Qe*mwNQUe7<9Q}7vmMM)mZxpVQU5sJ1J!nRra;aewpS;{2p +z)xw-gYI5T7;|ah8R-HXMY^N>1s2+_?Ypu3%?p0_#zoNoUGQBx-OZ7jkbR%moI%D{3)IraAKHT~qI9!rPo(p2z%Ya(QFRyRP1A0fc=+ +z1B{0a6~lWqLsPN)k&wRDh3zXgyKGhX#k8(|U-rz5orhe(ibo@+{=f;cPrq0`Q{=s) +zL7Ne0rC2&ryeYxyqfn^ZE^qbEnvGnNF7+#99~e5ILk4pvLM*EC-cpp~(l`2(Awd>q +z*4xN}ZCEbD+NZNa8^;!^@9}jMo=PdOi7B@o61>Kza%u$YGiDhU*drrAp-r3rp +zz?WTqeR-*H>12DA!Tn`)M)LTQdlTh%#SuG7rSE$MwYN?G_iYo>HR8Qz`%Q|_Q+#(( +acY0(CD>NCN+#DR-d;+|@e7w8@f;@acz#}LiEFvl*EFdWPKf+MUz`(@B40I(Nu(C0;Ffg(+GB7hT +z!UaJLW)>z!0R|>UW+ql9Ru-rpMxbUv79mzeLq}n@K&3(>Wf9TFi3=}24B9NnzzEdA +z!VEWskwK7&Sy9L_QAwD^FmR&C|62?^Kv^b1W(@ +z3|gyp2A=z{+iYek>lD5WhW*^1_s2)=z0<775gs1=!g1lw8J{1oIN8BzcPGm966Ylk +z){4TVcR9Uug^mamUwE3O!aT)^XX(@)ABQO=FAiU=UpF~8nA*>3!2>O{{k`y^wpdOt4qIG1O=w4#8W@n6kA6_s|+Q!lS(|GKt4_i_Hs;zge# +z%;q#tw|Tzfr;z)tz_*#!nY@3W=4a2px76&$KZoQ;>~UqU7Mb5l$?0tG@Nj?d_R7C? +z^G*LVSZ)=~bvQVMTP~$m*)2ohRKIb_%}tBU`<11YJl-F8S=xE+@k95lrCFz9=PSS6 +z({6a4p>X4xs+!N2nO|Kh`TWx3_PO(W|JB((6T1AkY?{m*(_GaiW1~&?Z~5<@xcyj* +zYR8}AlWO;h`%WFw;n~wREroxf@9n!QqSkmny!m$bdAYAMR&H>#sT4kv|1~u1q87KD +z`jh8%B@f$oCO*=BeeCSfiR6K>Z&bQisI(YZVvFNP7dmirFwCwn~qh~(J?l`QII8CO(P;lxjlTDe| +z7fj&ii`85=(QI$GMgGNnLC0?vA6!)eAIFF#YesK=@ojCx3tyXMYn8+8wme!9|NkZc +DVRU^i + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.14.gif.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.14.gif.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..efcc57182342139d21072efc0db123f87afbd2eb +GIT binary patch +literal 920 +zcmV;J184k4Nk%v~VM_oo0L%aY|Ns9^h&dBhB3Gb3Q{AV?cw+w1QCC(5MVpuU6$G6YZ`bgbH>{wh}1bbO};!mp4y!mt7VU?#AnVADH;$ +zP!9umW)l<;4jGCL5EK&xW_tu1fI$cmcmxv=4RIz24Gr!gA`0}!4Mj-vwuI2#V04v)j8xh@R}6AvU0wUX8Z3>1F=4YkCw%_a{K5+o3| +z!|Ce7nye!f0}0aMDG%lE>!f%2@ysF+3H;IfvJP5=2pbMEP?w+|i4AB5u6VF;SOi3| +zM!0f7Awt6h2^h=+AVHwS6SWfmL^!shfdh{qDUASka)bm13`~-I;J}^<2n<5HtEs|) +z$Qck6;yg%UB!F=VA`(r}(_B!HSg~f?*5Kf_sVWdq0Esgz&a&ierUkoVELjEzl?DyE +z_UTu)CX9wO)(L@M1SKO}jX)D`2?QIWIz90cq)x*nZa%)iWyV;-kn0UCp+Un5po_c2 +zDg1);1_F2gZO#nCXlfR(p@5QLFZP@Xq@y6475m2_mN?V5lHKfpg~; +zqDO~b!B9`zE|{cwBH@Dv1r`j5KS2I~f%4=FJh#xH&jv&e9MHa(LIQ^iaxQ$gP+s*G7ASQ&gi0n&K=33k}twoaZ8bAPWb2jGzD^{Y=K$Ze{$w3p?HIOF;L;@PXd;1vk&iboz;Xqcsrty-FCv1;hFx=X1=L%D7q899@S +zWOsR`xvgfaR^riU>WX$}rI-zt$7H5bjA@X`{%3c#-S3-uGw<`}edjyRpfbDy7NNl* +z!2m)5AVdlnW&j*?V0W4XK)?t9;EJF*KnN7>O-csBPJ}>)5s(jXCMG7PCOA`5906;J +zCBSAloEc2Auz)QrNJMj_!{$UHnQToa6RA`hjY?&+SS&W@s~|iUi(i2^!{g0h0)YUN +zkVYVp|27~~t%!)Ms5W-i*4B15bUKwvr!$!hCiCk($IuC2Q{V>N(2zYq!4MjT3_YL# +z$%la;B<8=u00?blY=S}{`u`jlK`1n^04NBJhA4q0z1+qoKXc+Lov?Qx1 +zcAh4q=A4r{GMsadi0&&BcuBO7vx=&dA!db}eQCEdv~IfglKtBjQ!jc{tCQxI4~6Y5 +z+SC%g-b&1tJzJixKkbb5SZum+hTvLWQ~JT%N**)%D@PG+r+%=yjA=Ym-*Y>6&As4- +zOquBJOqj|(>!#%Bgi9m-oo~*kl0bTM5>&mtr2d*>O8mrMu4Zfyk|U5 +zJQIIDF1uprU^ +zUL4BC_tjq(ZCUF4y<$7Qrz)q9^;GfMtL9;XU@r2oaD%|f7x&?fvWstyFY2Cq%xyn4 +z;Sq0JU3o4cJ5<}rZ+Z2O&klS%^IRp~lYPa~reTcZxJh1^?Q;&R07m$;AAt=0~8>FR*F-ojcJ%kTDqsptv0 +z#C5Xq*l%Nkc2?wg&7@|KZ&uva_6JHEu*h0hOChaiMsSSX7**H12zm+To8ZlRY3;iQ +zG>62O_>I#Bz`7E~j;N4tj~y4(^?-G6cJQL~S5`%>y*Vblm1(alUkbXc+yZj_f4;Gh +zn*TxH%oGnkfC^*#EqC&|Ej9Y@lex|7YGNK$|CrAF>F|EX4n;_<=SAzTJlnk2Cjv)` +zZQdIDujSapcx^WEey~ZRXThkHq +zU~+1-q;aUr|CFHQ+9q0B`0ZAC)@i>3c&GMl=> + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.4.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.4.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..8b1b2a4a496873dd2f1d605497efc40a4933c36b +GIT binary patch +literal 1298 +zcmX|*2~d)07{}j_5Aj3g!w(3FnhHF~(lXLX)7@6PR!9*qQY-Vwc2l$PqSD+-&10=i +zQYf)mZFRKlz&s)iEwfsTrcv`i+tjSx+72P@vSP8_?f1+)@67+1-}64k0pkd;=B@Kx +z2Ot~(v8DpX=Kx!i8WX<-a4-ZxraS+G +zU=HKWZ~%d32LFdMFAfF}-pm@{AQ*>-%?Jee%M`-F7~Tv}Sl(2^G9f$4Cz@uy`xrM+ +zYBW=E?&6%fbtrfYSaNM(|S<)K|?Ykebrm}6M(9PVpAE+9+J*Sx*EKVfY)olZ%q-}58sYMtUyz+xv2 +z*=>uZ9y?Ro?EcZdAlyfDEW8RATIVOZlx#2Wm5%u<iMGFfu@ +zpx290&XF$X(qrTv<(5eG>I)7|K2r_a*wgzr`<9Lhbj^+&L-oansx`{rdy9PS)2zSO +z?GQ}%-W!inU8yh7j;EK1YI1*iiO(I#a1YurGWH<@sVJ#jXlPD@jbP&~w~HhF6OMkT +z21lc(McVs$uPxjfkgc=*yvL9U+to7J3i`Qj2_FvR=|}bOpLL(_cV(Q9d(~K#G(dbU +zDb5@yTG{kazdYnysvw>3{+Lh7mQPkbCZLl|AG)L^p8a!k2H6)6I?`$@%*Nx==INlf +zJN$>V>NLH+*_+D2J`G;k*B5-W`*ELoLKk|xe}05gyfiuNA=sNIu=J>9Ca9 +zLmr-m303E`mHA6g|3)IZzRzP8ewTIoP{$qe_IcHIB7Hz%PFuL<&brVt>iW!%DCxDD +z%X|6TY=v=oOdMU^cy`wG)V_w6gZ;C)k+BN3iOLMYj{NYuBpK7y+fQ0?^oAsO3RyjiJ|OmZg~uOT~)O!PlWITAx#5MZV~oBzVjOR;N_K#DRqL@Ub-yEf-MZ4kq*R_>>3 +zYx{dn%uVn>eioygQ?e5~+vWZ{6Tjh-%_AvZ^5j0j9F6;dn-8iVaP;e?Hf+YGVAbE5Jr!99y5$< +z5%}}q7gLFDpI1H`BQA+dRXc=matG}KTFuNyhlgEz@8nmOJ0!I=2C?G1>)#Sn6IRNo +z8AU3*KVMkB%AwQqq&hq%)9Geme67LY6I1%cwYjnA@R`N2)%W&uY?F8Jmt1dYRoSc< +up^${g|>NCNTpS!+d;+|@e7w8@f;>Qyk4KPSNLWNzh+jfNN=iaP +zSxHGrSse}-IXO5uxj4BwIl1|`dAa!n`G7!B7;J#Bgdjf<2ug^Fi-?Gbi-ELDNhvBS +zC@RABtN%a1AjrXBz+k}4sKme|$jB_n`2PsQ1O^5sCMIT}Ghu+0orMi3z{tS}0x(e! +z&BDmcBmh(nq?nmF_#twPOw25T3_`4mY=(})lSK|*RJs)0EXE#~SlGDHC}`3lW#`3* +zFN=!`GB7f;Ffy{U!VF{-1X`kK$RZ@1I8n(cNtyLS;6*2s|F;-;m>Gf2V-{qvXDBbe +zv*Mw}Y@3;miY}tlEu`TEGE90N%w%vZbL-XL>D7pO&kH5$UZ|dcXX?0oW +z!my*yLSuE5|2=JivaoiA61ml1|J_?>j@9O^FaTbxvlkc8o&N!x0P+m3Lc(>)1)3U7xJ&uc}s{H)*xrTSKY~PIV9Iwia +z(GL$zjkix#-SE|BgOi2bKb@tMPX?_m6j4!e4>I7NsZ-zWD|gP|@a->I3fwPsxpAbk$a+OK&h+3=VFDjpy9Tr~^GU={VlG8)m +z8pF;mGc(H|6G`e%2!Jzx?6vHROsAQlZ}{GDo#AjYNufK=CS9^E3+bZ^-M5fEA$V2?{@uGm&LC9 +z?wQX|)|!2|6c=~?F>imRr@m?LzWHnNeB#rJx0e<7{LE69z0GZ3aA$ei-Tw?lU2BSt +zbQdKYa?3H)-F;Z9x_07&eT{q9%(sqMpI-Ls)aA8Fn>Mv%vP@#rvJshk^H|^g{@bia +zZ`({=VVr$Qe*Y?G=hEiDQ-#$@Q&!$8(YD^2oLw{Ht7^8<^xVB{&(8Uo9Q(azS=PsE +zMiGzFUGo95_W^nAPI=PgygsaXPDUxQN;CihG#^7B-AGBj2))XVN=6obR*HR#8;CxKVMwz9Qm{Odw +zW>lJJW>!QgXqK9_$fK>SCQP9`rQ0yDW|oyHqjl(P;uH9%K0A3NSH7o!j +z0N^?b*sTB#6LW;y00f)>01F+_2*8GLGtzi~+wMppdp{@yXqWdmI@%qLLc3$#&}cWT +zmxl+|!@~=9cXX^f?1{q@@HkHriA*MuXjCed=Kl%E6^(XvbH%v2Vz3ww3>L;Zfbsty +zz>{E42QbN-NFWf1-tToXnL_cUP(Jzo_I3cH0Ugkh5EUR`2nj>>8{i-S2qXkK-u#G@ +zGtvcxfIjdsbWA4*37owE0zx8?NHjFm`2bjPWFVx +zWbf{vEh{}Fd4l`SwQ@eLy +z&FM}uEMAGxqKxq_ii?4xq)Ea4@~+PZ)21q?^vr&K(qF-MwGS>|ET21=-_(~BS{d_g +z8}VRF|HG6Z%V)|64KG!rcpx=*%I-1Ns(%+dRR|xmI~o|{thUHnT(vbit=ZeKZg}*n +z4xhPw#~HdV`B=)~NhUXd^RCpyH|O4gTde9eyi(gW-v;T`j +z1oiWu50dX~CdbPYXU@ExsN#NKc%m$q#-Iu9(VV|hVI_T**Ls)wklR}myLt(C$8NU`F!w6wy>jW82{|Y +zp##tJtgnxBS#8g>c}oiSPjNbCjZ7tXES0}iN{&w)R<^7d7TgIWM87qH0n<=cWrtSo +Q=X}oBw+=N2b=3ane>Fr3s{jB1 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.7.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.7.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..fd04e9b7bfd6e55c75f91cc2039dff45673d22ee +GIT binary patch +literal 1770 +zcma)&cTm%L8pglL@0UUnLqazz+f;t2s>0sBvpzsS()ULCcp$jkO7j6fXE1$2;2q$2_X>MG5;$R8VO?{ECN6P`d<#gCNB{vL +zVI&#@WnjKqvP4!SBjN#)o&pRjgI-%EactG|%9jR+XC +z{ek~nLI5%nGPhTNwHe>(C@P`eCl=JT&1BrM@X_se2(xsQjRV4V0wftC13U2X!Rse# +zdtnzhjhQ%Fw)gOftCcBpcLS5!B7L6)oM1sq$2TuB1AZ-BFwM$K@RaXyT=`-|yLCJ- +z)jC>2alIgY`Ho0P>*v;_cMEgHQn{)EwRM;#cd-5E(~*Y)dn$9+*M3T)v22uoGtPTf +zz)WLo7MGpP5!_;lq>_}>N8it1+X}lU1LW3=rKSz8*5+LK^x`t?2hTvA*!jMe)0yJD +zk_|+!;iWenzceZ59AjB6_az7KGB}Sv@3JQ{LO^1el}8(DK{dj`SPnf=%i{7+GmAr& +zqB_0USWN52uF`7t@@c;~it4J7xPw*jAv~xnZvWqt`A4{YKGx^_%*@%$3Qs%cldgT1 +zb&wNJdE7%V#9onm7cy;|JjsaC!F~-ob>;9nkDW3z?ssJat!1Z7tB6W^tREC_HK&EG +z)1kX~@~j4}My4X-YJ!l!p=Cr#yEtK8RTPbYZu0Q-LfxdOiL=bn>Eg}CMz6o6KL4%L +zxKRHWI@RC=OKx9Z3HR+V|5F%!so#cIK-vWb#9iXB6J49(YoUd~lT$f8eexf#+fCMO +zj=FJWAim9JzlsY#RjDYVVx!rS(5R6x{-P~uFc718U{4$?p35yV?K4{KXxw}ha(8a& +z;<2DREw(-Tj*9h4KdyG{wZNs9x(ZhClCJvjrim=x0xrc~Kfr!3Dm=j>dhqg$>uoH& +zV0d_^*8&k$F&UR5AO-_%o?fUSiAl==oN3na!Bjg2--txzb-i-0BY1aTsIN^aQxyy2gj$4+D|< +zo>f&D(8T2pm7t;O-|6}djkS(Z9~SjOOya&(vGB{FXOG65@?p4s^Ye`iuVGz{7$(jB +z%~2Z!jhk?AqEI}rCN!9I&wa!RFP(3?Te40SYh}s@h;EM@VY506l4;&em7VqPQYt1t +zm0gXvI@#QDpnG(SPaT%_*VpW2ulmdFqe|1I#zwubEg4fD=PC`%&08mU(lC0KGOwV3 +zOQAW&)bCJWaq}Vk&6^4y91$;5;2R_+)Fh)HQA~<| +zC)YWLdP7|ME0r-+p8j4v0arK$a(zkFgixROkXKKQADtJNDQmElx?*>_w$wD(-^z~4 +zI$2UPbbqjFPuXZ#JV%oHc=4re^={yN!}+Px%buy(L~06SJhnLRg`v+GN}(f5;lB47 +zYgouR?QEH*9@@yCZj4vwSn8@2I-vku-|j2De@7V=usy#8L&<} +zAFNs{jlbxd@x?4Shn?FSYT8#?B=~mc_1$N`!O~UrOzqv-2fb%#5j)$4kq_jL8U=6+ +zw)mNcq@DMsHV!=St)M2B%fM*oV}G6utW7KOPp8FSNj++-X5#+G$nswY{hOM)U$WG!3Y=gryk;uZ?@>7AQD +zQz5x%S<+}Nw>GPTJMQb2Y}IvDKq<}A)^)G)ChGa}&BaG%)1GT;>TYeZ?+0B_ZU3zH +z=HBSqD@ovhxu|uqezwm+NSXT_xis?w(M>hR`o|{G$=(^0w;ZjniQL_XgbQyp=5AIN +e`YSy=QsI6|y-=m2S#+*mBq$?p+S)nE#{LQI3Gt2q + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.8.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app.8.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..22cf5665a9de33bf400d9f7fc75d5a904f80f3d9 +GIT binary patch +literal 1302 +zcmX|-4K&kx7{`Bm|Br3<-1$rEu<* +z+eS +zkw}IK`b;9gMieTIN-?6-O-$%?3l@uI!Tt^c4?%bXydfTMNHQcEl3+S#;0(QU-g|EA4VBpM)47&1U20UC|OLb(5%2qX#(Uuy^Q`Q7 +zd(T)b%YzYmClZ6ge4D3#9*kn5xo#~KsyHs)FL#J#Pt&OYLBA0RqhR0yQa06yij!m1 +z`Qkqe&PfBA8#lyR=4D;kE$NHTaom$%8IjhM)fOA-uD{Yxx)QXTJ{y`)6Z2?W(gPqB}O98(diQ +zpr9hfz*)ktEqAHs+fHy5U(}}xZ5(^9sXT^4yqb#DzP6H-WQV^F_|$bRNnALc!XBf~ +zlQmUNmsS22nDwdrwNol*CN_Coy^a`EZNrO7u&_O<*wOv>OJTc1pkKlAPWuiVmNoHCk+RgB} +zI8wKL->24qZgur?%>33e#n2|Fk-ZR>Gie+%;b2@oE)8(iv#?!4^B#`XxmzsbD +z8Pb(MKFE9Fbnsy93ucWnp|bFXw_Ewi*tV0%3C?!Sqvu@d*iKh1Z${xSy&kkzCJ_l3 +zFP2(Csva346As%(YkWxJ;Q(TNTghhE^hJgJsEU}5f5i6UC|!fnO!y?T>2G{k2o{@Jy-DM +ztJr>;woqARg$E)(olq7DIk(U^zte%mS3VtYR?EYC6NG|n?@PnnPNS09*xTLvUB@p< +zhip%oh5U5>l9g3nlzAL)P3{TljhRP2qOvD)Vm7snYG0XVKXr7pi-1oIzAp6MXXEZM +zyewxj%W2JX!Hi(+xT2JI@AqUQ>mEtSqS@HdnUblqF_Qrz_M0b)A+rndcmQ|I3yFBi +z^o+51Yc6io=7m15ThQH*BuzRdyB@q**eM;L|2%=H1l6yZ7t*$5|sk +yUv)PH9||olyLY65Oo+FNIwj60UnFR;;?ue4sT+FGcqA< +z!s9oQ5F(L8BqE3j(SQkpP$*Oi1)_57=)2;f;*&#(09UF@Z!N5=i6^6|(8a +z0aF?oF+ir7(Wq1^&5TZ`(dcw0(}v01=-cZ%0Aggg=LAF60EIv>0_nRzJ^&~fGQ8XX +zi-XY^6!eh|696;@hESUU3I)L^G#bYL*MU$l8Ub4{4Chd5GS*wcq8ti)oOrs*r{s!D +zPPHilKEyFF8vcI?LK)I91MTd6$Ql!xNItFTyxla)(mw$N!wVDwBVad3n-WySxhosb +zF-B~ZyWA%+7tc#i6~E-U-0Eg#b~lbND)2iBEfAi~4zAM9WwexW5|duNyFKL8zNhX8XSxR8d0)s;p({vn}IQ9_WCu-}Wffx~{ui=W`3WHt%MAkFV_;mq^Un +z=CWN=2TwLP9w->k3UyAVP89KdysGkE545#a#JN^Vr77~<<}Kek6)sC3wAyXXdN;5? +zSN^#`?$egy@Tec~*{A4;*f%#MWp`6UDE? +zM+)}F@12k<=Q@fWH4z#i-S^ScmYlj5RCyj2d#U~D?6?f80-dH!;6 +zQF4!X<)2$ShJ>m^wtdk$-pC!RbVcdcqk%Z;^(;|(Jg)GkAVL2tf6=N+MouelgV#vn +zHMgdo121Aq7CL&}j$Rd2?!0=?T{RC0MRa0f7-{XqSDG?!T|q;nO#X9s5~a5`At*$} +zsxK62FwOjQOz+G1<9|``5z=4t6Wr%3P6+#I#rMOw_ab5}Rx1D0CKpTElb&sT_ho~S +zE!;k{)y|lLoW3!gTeqEb=0TaN^O#+)y(`N{&36_wA8bvXa4dH1uU)V4w_3bgv=}03 +z&zHvZrJccBKGU|-6_+N|z8Iad=yFn`X=6*Qtygo(k%;J=VKt5PmL4lBj$CTl-5HY| +zk;k9ncste)(N{BQ15skmdXTR6V#8PrZyWTK6(zlpx)`^VG1z4GDDCVr|GgyK;nVKc +z8yZ2X*uGpGTU=&-XEnU^7lEg$lddp1d$Z_qvgNk8Yevqk{PPhBtNaTkb1OAYytl+f +zvEv|Fz5Ge)g9|-fNdZd>R&NTIW((4GEnIiZWTT@Wo!!b=aDP7aaQr$;?!le)^>Psl +zKf8&GnmNCmHa$A-5V_a7i8*QJO{wP^_i0OhS94r5yOP_EHV8`ZUm2;R_q#-oLZuPIku5Y@mIJ3Z87&5B&@5_vgz1 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app13.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/app13.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..ea20fb8707368393d73485cd14685e86f154eeb0 +GIT binary patch +literal 1541 +zcma)%c{r4N6vuz_zOz_|H#1pA<7#e~WGh>il439=7mcpv;bu#+PDmt1%B?IJbxRuA +zmoTD{wG5%27Ny0cp)8ld;37BCGI#1exBKt?oaZ^udCvEIpL34*m3SB^(x{G9fPw%B +zkOUCV0K_)N|L`$@0%!n$nWQxb@HPPvet{r>C+VQX0+0%Dn6F4OP6mg?$;e6LaME&k +zSy?$*Sv(^54Fs=()5c|u(t-6+TXwn@_W2Q**&`IAABi~0IutA!$4LC&kQe}h)?BmM#sxEf +zpl?01u#SR_a#hOSveS2?J~WGQYLm9 +zm|9_t9f+?fW+;0~$#3=4jy_&spm~adqK(Q>6wRwVzB|+)qJem&EvTNB*vE_4Xchx! +z{Y2?kO;jf@yVa+Qy~;K{tQtYjy8yO`Tzb9o)$&Ulx~9%R$bF$T={PQ;O!p6-BPO|S +zJVNbr@aEt5z0L59-Smz@kBg7xYZ4p83auB5AvQNI-HMcx&(9`TB9$NaTa%9*-G +z7TMp+i;sWGl~Yl0*7?u`$dYn +z_cyLHA=W$5clkASVFE| +z#~}_w=-A<3aU`$D8K{5WEvons+8e-I{_Y*Zt +zJ#>>3^;U*w+DzD?(c#qEk4aHEsvHxyt~eo`>wadce6u^n&RDBKFzv%!%}kRqS6QSA +ze0T9{ENre3D&xeUoOZZzV4P(VnUK7!d(!2S;awHQZ2ua1&_hy6rm@v^AMI(YgZC}# +z%{NUAT8y7fKNTGjUUZ&Ow2z@U6fB!A2HaD^+wF@k +zU@ON=q$(VnvRw|JsDT<+!s|qb)eblDJtt>7M}zh=d!h*Dm#jlFn{xD3+_x>0oLp#= +zl`X6ExEDt=W*LM9gG@F)Fz&;s+v7XJhtT^sZw9c#VOh1l8alOE>lQtQwpI4wvsJN! +zC4{A5xr`o<`^&8{T6h=RI?l_r#G~r8a}9Q<_W03Q&FR$@t>dRNKRS(6tgEk8Ip~{9 +zs_1g#u?p>#-Mm|{YpphJ(JMTfAJEX7ul+-8P!*b>Gmw-KBgYVybCmr*CCzzUSYySqGtOMMAh@&jbu;^AUF_ZJDq7Nux`x|Xe`rqNeDXK +ztVj9EV1MOn+*D8iRy|OIL}28;p%`R1%Ppk`i5(e_#%2nww{0Z=Zx_3~r>67yMM$G1lwnJ;W(CO`-tjTxb#xQ@m#kzp6{lf +zPj!$0FNMPpS3Fh($|ck2Y(S+$1GNee7_dt%xBCT$x4VoP%Syx6(zYuF2g^_II#$Qi +z!}%XVerAA3gLMam6iJ7OXb)G7j!$Khbz+c}mY0uSn}-G*3j%qcdMtFNha0J?s|f%* +Djj2{5 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/dvsts.jpg.svn-base b/feeds/xwrt/webif-applications/files/www/images/.svn/text-base/dvsts.jpg.svn-base +new file mode 100644 +index 0000000000000000000000000000000000000000..b8ec16b4f67cfe31931f601145acb3282b46de05 +GIT binary patch +literal 1007 +zcmex=TaUl^P5E2)cmXVW@7FSVG +zS65LnH8wUjwT1&mUT$t)K3)MnJ^>Lvem)Tq0YO0l5m^xtQ4tYYRVi^GkWy7pmXniH +zR?yH;Rn^ciGBPkSg6p^be}F-dgTa8ofSFN=fk}{&S&;Gn5eAU6nV193tvi*f{ZG^W?>s*%KFTG;+EW +zEHWv1bBU{%njn(-5Uu}jG4L=0trlb!WUy!0^khF{*I}0J(o5Ph4!vu#bX#|N-F(;V +zd%|VX^GiQwaT`xM@wg)DTun*0$h(iqHr@M}_ANcvemF4x-Aw(f@eku&ne{%*-f-vl +z`tC@mo{YWog`VjhKB4NdcF}Fq!z(!E#hT4aFuOi|j_=IPsX`vTGR;+z6GIlSx7s#8 +zys6Q>!uLjA&BdCidp1p5x@9h$&O2A)tRZFijHl;tyexN~@yV%*X`w1Pxks(!YPHf% +z{rmR4b#31InZB?0q`5inGL1acwD^dI(vENG+a5@y_rG_$_N3Bp3VVCr!&6V+yjhwS +zkv_RB_HK^|({X=O`=3p-@9Q)DXUPAyHuQ$(Y{|)6PpBjX=REwi?S@1~NWbBN%!%&v +zO!m!sWt}J1pF8_@llLo+SJ%{DN}ijmRy*Ifnfr?9$IoKd+#;t(yWOJ +zFI66Vn!h_<_USdpdpXCf;_p97b!~euZPa^1N$TBU9nA$H@dsXhyLN5*PixNUmNRA? +z&bipK`G^98uh83G79Ea0QTv`RJ6G_fe#-1W5qnEpOzg6!5c4S~!@%{k*5pY|efHo^ +z_Rgz!184mDwc^v#_xgGIvQB%?tT)zp!g^yPbG&TSAC3CQ8?*mx`L~tjSvp7Y9z!|9 +zG_g0Qm{`UUm0_D_$;t@ZOeA}rg)10WJ)ZR6HSL=HbV2}Bes8i@!NU3q95iwn3}4qb5`=6-!`{`wI}y5-dxN6|0V$Yeub|9 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app.1.jpg b/feeds/xwrt/webif-applications/files/www/images/app.1.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..0ddcb1ce4e25f285f3d4fcce3be21d9aff1a6be2 +GIT binary patch +literal 1695 +zcma)%e>@ZTAICp4`+*IUXfuxanW-?&iM08$`Rz6*;ihAL+)iOL6{7gIyUN$p2_ +zk=kfI6bg+(>0wZ4wNMy6jKK~AjGnPE7He!wu&}To*nAKKsimc_t8Z#(Xljnzi8KFT +z{J)7x0x(G62ppjh4A8(ppcsg%8(aWDLjwv?pZQ(L_Lin*Xn%2~&R!h3f+i +z2ows1AYlJ-)exihEDW3|@E!D64#C;mFpm+(wah1}7eSy9*oV@;2LOzwlLdut08_?t +z@|p-cE(w2e_8#V{#sErvhXw|U0SCc4er|2_lYWKpAC}!6`GrFs14Rk@antk;ZSWJ0$Ce~m{t&v5rIz&~GZ1G3zs^rLn!r-FriLLJ47Tf_5r-w@oO1 +z?-hN)V?yFm-!6WtjGg;A!FH~Ox&QdL9&I>VdxZD*_xbRiA|A?to&0b`*cG3m6bPaI +z))U1q5BQ04x%+x-zdFsh%f2!nABg}B-X%sbqqyFdHaK(U%gH&4RrjXOnE!o +zh5@bbRJTacCL2#bS7sJOZ|>hX{^b7cH|JS}?ms6@%+Ob@#JBVQ5XJ5dNe^s`(}9PD +z=mbbzx5)BNW(+&QvpNp#!I=q{GHqhGDO+1k!j=E=iwN&6m)<@62 +zNu8yNpPZ*{hAv$@6*9H3m_<5x`S~%0O;KdDNZgWESyjb{j>BB;(j2;nmE9QfPP~Bn +z#5BozZZ@BIl4i^5lmIuY>t{?eI6hLxaAO;>Ri4p&sp2Kc%=<^)b`#wvC(s4t`nlNS +z4k6}h4|>1HL3U5AWTt*$pv5@NAuQTrAJ+3uU$8qj +z^(xRAJ4l?*_0G|w4L(<4g9TwU>}PbD8I|7Tgw +z7H#(@8&Aegq_H+U-NNt*rAB)D?y3MiSUF_4>d@qPavV+#`;;=S&%1iLu4(k%{>E62 +z|NF4nU42}1QVHV#6hBH{V;g6rdCebM94$}(=EBR0{`*rM#79Z9J1n8u=snBKjXy{& +zH>Bo!Qq6v^T)>S5{eZhB;M&_BnG?=Q5?G4p)4y&XtNv|?xLS}OCFg6kwe%-)-TsY_ +z>#x54)#J>8@8-|iD>tb<;#nSRzjs0UQ1f6|%+aa-VxqGkY-rxz?c=Anqve4GeZd0_ +zk_K4@Tl>~6rBhD$?ZM*JpyX3LwWSj$>kOqzEzRF15%5KALeKXSPSiHT{%uA>A@7r%DqWif$!O +z+L^WvyPuT0k?ud(v(Uawj!i5{pm25Xy)Yd1@{&%C%oj2*jsyZfuVE39XxHfSHt6v9 +z1V5_Lrz(%y{3yASPt89=OLNK%(WJ8f2RY3qE5gBK!5d%ICXSN8EM +z56augl>jeFkyGdTa#UXos_f!3))eE=ui}X*LIwGd0Hy*pab0hhrb7ir>F=^>bt{vM +z$OuCCrw7AY1>&11yNJN9@-I0T3#;xNZQOMY`(k=@%r3Ebndi&MR*;`YI>&PotuD+M +zp*Uhm70yghFRP<$U(@0gw}w8vB4TnpBZE&M_wgb=NH)3uWegm9LCDsD|g>Z6a}cB{{;b! +B$Cdy9 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app.10.jpg b/feeds/xwrt/webif-applications/files/www/images/app.10.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..e4a9d9b317a4fab615b0cd83b66aa556b9e755da +GIT binary patch +literal 1280 +zcmYk4eKb^g7{`D2&bwyjx@L@ZHD0H2Vzo1+Xi@9rnZ9qGXL;?5=}R +zBvEZ0QAxt287d4lDkkft5gOT=Nhz9In{7!uJMEr2`+5HRexK)izJEN%5#tkJ9vl!9 +z03aBEMAHD{G(i2*6H+n(1n>X=o=GwQx^H5tI0+$wV=1@nQ_)e!}$&5QR*pm{F)^W>kbqry`6`Ck)Gf +z11vEHYJ!1TVJsF4vtqL`jLqh7oH(2>_pZhcfRau1csR%rz$k=6A)^Z90RY1|$W-$) +zL=uhwU_2QDI0*W`fx{DEKr{z1gu_8ZJc00^3BfoNPXHD~2flCoat1Sew{ge)s_wQqsFfeJGq|s? +zTeb{B`d?-`lU0le+5VIJc>d81#LTQJ<KCjc{}L6Bhb6W1Y$p_FSJDFe+fK8}D%NKo +zP>ucllwCUDF!_5$w)0~}e$VY!TTZ$U9%J0+pC}o5($+J!W#uyu^KN#=jXL#p@|wu7 +zz`oG7Rn3jFSgZ>+94+@SU)+HLNBXTXjd!sd(T2Zm4j>fc>4QU<+TaZaj3-;+A1J +zQciz6mfXc25@q{)wc3Qe*mwNQUe7<9Q}7vmMM)mZxpVQU5sJ1J!nRra;aewpS;{2p +z)xw-gYI5T7;|ah8R-HXMY^N>1s2+_?Ypu3%?p0_#zoNoUGQBx-OZ7jkbR%moI%D{3)IraAKHT~qI9!rPo(p2z%Ya(QFRyRP1A0fc=+ +z1B{0a6~lWqLsPN)k&wRDh3zXgyKGhX#k8(|U-rz5orhe(ibo@+{=f;cPrq0`Q{=s) +zL7Ne0rC2&ryeYxyqfn^ZE^qbEnvGnNF7+#99~e5ILk4pvLM*EC-cpp~(l`2(Awd>q +z*4xN}ZCEbD+NZNa8^;!^@9}jMo=PdOi7B@o61>Kza%u$YGiDhU*drrAp-r3rp +zz?WTqeR-*H>12DA!Tn`)M)LTQdlTh%#SuG7rSE$MwYN?G_iYo>HR8Qz`%Q|_Q+#(( +acY0(CD>NCN+#DR-d;+|@e7w8@f;@acz#}LiEFvl*EFdWPKf+MUz`(@B40I(Nu(C0;Ffg(+GB7hT +z!UaJLW)>z!0R|>UW+ql9Ru-rpMxbUv79mzeLq}n@K&3(>Wf9TFi3=}24B9NnzzEdA +z!VEWskwK7&Sy9L_QAwD^FmR&C|62?^Kv^b1W(@ +z3|gyp2A=z{+iYek>lD5WhW*^1_s2)=z0<775gs1=!g1lw8J{1oIN8BzcPGm966Ylk +z){4TVcR9Uug^mamUwE3O!aT)^XX(@)ABQO=FAiU=UpF~8nA*>3!2>O{{k`y^wpdOt4qIG1O=w4#8W@n6kA6_s|+Q!lS(|GKt4_i_Hs;zge# +z%;q#tw|Tzfr;z)tz_*#!nY@3W=4a2px76&$KZoQ;>~UqU7Mb5l$?0tG@Nj?d_R7C? +z^G*LVSZ)=~bvQVMTP~$m*)2ohRKIb_%}tBU`<11YJl-F8S=xE+@k95lrCFz9=PSS6 +z({6a4p>X4xs+!N2nO|Kh`TWx3_PO(W|JB((6T1AkY?{m*(_GaiW1~&?Z~5<@xcyj* +zYR8}AlWO;h`%WFw;n~wREroxf@9n!QqSkmny!m$bdAYAMR&H>#sT4kv|1~u1q87KD +z`jh8%B@f$oCO*=BeeCSfiR6K>Z&bQisI(YZVvFNP7dmirFwCwn~qh~(J?l`QII8CO(P;lxjlTDe| +z7fj&ii`85=(QI$GMgGNnLC0?vA6!)eAIFF#YesK=@ojCx3tyXMYn8+8wme!9|NkZc +DVRU^i + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app.14.gif b/feeds/xwrt/webif-applications/files/www/images/app.14.gif +new file mode 100644 +index 0000000000000000000000000000000000000000..efcc57182342139d21072efc0db123f87afbd2eb +GIT binary patch +literal 920 +zcmV;J184k4Nk%v~VM_oo0L%aY|Ns9^h&dBhB3Gb3Q{AV?cw+w1QCC(5MVpuU6$G6YZ`bgbH>{wh}1bbO};!mp4y!mt7VU?#AnVADH;$ +zP!9umW)l<;4jGCL5EK&xW_tu1fI$cmcmxv=4RIz24Gr!gA`0}!4Mj-vwuI2#V04v)j8xh@R}6AvU0wUX8Z3>1F=4YkCw%_a{K5+o3| +z!|Ce7nye!f0}0aMDG%lE>!f%2@ysF+3H;IfvJP5=2pbMEP?w+|i4AB5u6VF;SOi3| +zM!0f7Awt6h2^h=+AVHwS6SWfmL^!shfdh{qDUASka)bm13`~-I;J}^<2n<5HtEs|) +z$Qck6;yg%UB!F=VA`(r}(_B!HSg~f?*5Kf_sVWdq0Esgz&a&ierUkoVELjEzl?DyE +z_UTu)CX9wO)(L@M1SKO}jX)D`2?QIWIz90cq)x*nZa%)iWyV;-kn0UCp+Un5po_c2 +zDg1);1_F2gZO#nCXlfR(p@5QLFZP@Xq@y6475m2_mN?V5lHKfpg~; +zqDO~b!B9`zE|{cwBH@Dv1r`j5KS2I~f%4=FJh#xH&jv&e9MHa(LIQ^iaxQ$gP+s*G7ASQ&gi0n&K=33k}twoaZ8bAPWb2jGzD^{Y=K$Ze{$w3p?HIOF;L;@PXd;1vk&iboz;Xqcsrty-FCv1;hFx=X1=L%D7q899@S +zWOsR`xvgfaR^riU>WX$}rI-zt$7H5bjA@X`{%3c#-S3-uGw<`}edjyRpfbDy7NNl* +z!2m)5AVdlnW&j*?V0W4XK)?t9;EJF*KnN7>O-csBPJ}>)5s(jXCMG7PCOA`5906;J +zCBSAloEc2Auz)QrNJMj_!{$UHnQToa6RA`hjY?&+SS&W@s~|iUi(i2^!{g0h0)YUN +zkVYVp|27~~t%!)Ms5W-i*4B15bUKwvr!$!hCiCk($IuC2Q{V>N(2zYq!4MjT3_YL# +z$%la;B<8=u00?blY=S}{`u`jlK`1n^04NBJhA4q0z1+qoKXc+Lov?Qx1 +zcAh4q=A4r{GMsadi0&&BcuBO7vx=&dA!db}eQCEdv~IfglKtBjQ!jc{tCQxI4~6Y5 +z+SC%g-b&1tJzJixKkbb5SZum+hTvLWQ~JT%N**)%D@PG+r+%=yjA=Ym-*Y>6&As4- +zOquBJOqj|(>!#%Bgi9m-oo~*kl0bTM5>&mtr2d*>O8mrMu4Zfyk|U5 +zJQIIDF1uprU^ +zUL4BC_tjq(ZCUF4y<$7Qrz)q9^;GfMtL9;XU@r2oaD%|f7x&?fvWstyFY2Cq%xyn4 +z;Sq0JU3o4cJ5<}rZ+Z2O&klS%^IRp~lYPa~reTcZxJh1^?Q;&R07m$;AAt=0~8>FR*F-ojcJ%kTDqsptv0 +z#C5Xq*l%Nkc2?wg&7@|KZ&uva_6JHEu*h0hOChaiMsSSX7**H12zm+To8ZlRY3;iQ +zG>62O_>I#Bz`7E~j;N4tj~y4(^?-G6cJQL~S5`%>y*Vblm1(alUkbXc+yZj_f4;Gh +zn*TxH%oGnkfC^*#EqC&|Ej9Y@lex|7YGNK$|CrAF>F|EX4n;_<=SAzTJlnk2Cjv)` +zZQdIDujSapcx^WEey~ZRXThkHq +zU~+1-q;aUr|CFHQ+9q0B`0ZAC)@i>3c&GMl=> + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app.4.jpg b/feeds/xwrt/webif-applications/files/www/images/app.4.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..8b1b2a4a496873dd2f1d605497efc40a4933c36b +GIT binary patch +literal 1298 +zcmX|*2~d)07{}j_5Aj3g!w(3FnhHF~(lXLX)7@6PR!9*qQY-Vwc2l$PqSD+-&10=i +zQYf)mZFRKlz&s)iEwfsTrcv`i+tjSx+72P@vSP8_?f1+)@67+1-}64k0pkd;=B@Kx +z2Ot~(v8DpX=Kx!i8WX<-a4-ZxraS+G +zU=HKWZ~%d32LFdMFAfF}-pm@{AQ*>-%?Jee%M`-F7~Tv}Sl(2^G9f$4Cz@uy`xrM+ +zYBW=E?&6%fbtrfYSaNM(|S<)K|?Ykebrm}6M(9PVpAE+9+J*Sx*EKVfY)olZ%q-}58sYMtUyz+xv2 +z*=>uZ9y?Ro?EcZdAlyfDEW8RATIVOZlx#2Wm5%u<iMGFfu@ +zpx290&XF$X(qrTv<(5eG>I)7|K2r_a*wgzr`<9Lhbj^+&L-oansx`{rdy9PS)2zSO +z?GQ}%-W!inU8yh7j;EK1YI1*iiO(I#a1YurGWH<@sVJ#jXlPD@jbP&~w~HhF6OMkT +z21lc(McVs$uPxjfkgc=*yvL9U+to7J3i`Qj2_FvR=|}bOpLL(_cV(Q9d(~K#G(dbU +zDb5@yTG{kazdYnysvw>3{+Lh7mQPkbCZLl|AG)L^p8a!k2H6)6I?`$@%*Nx==INlf +zJN$>V>NLH+*_+D2J`G;k*B5-W`*ELoLKk|xe}05gyfiuNA=sNIu=J>9Ca9 +zLmr-m303E`mHA6g|3)IZzRzP8ewTIoP{$qe_IcHIB7Hz%PFuL<&brVt>iW!%DCxDD +z%X|6TY=v=oOdMU^cy`wG)V_w6gZ;C)k+BN3iOLMYj{NYuBpK7y+fQ0?^oAsO3RyjiJ|OmZg~uOT~)O!PlWITAx#5MZV~oBzVjOR;N_K#DRqL@Ub-yEf-MZ4kq*R_>>3 +zYx{dn%uVn>eioygQ?e5~+vWZ{6Tjh-%_AvZ^5j0j9F6;dn-8iVaP;e?Hf+YGVAbE5Jr!99y5$< +z5%}}q7gLFDpI1H`BQA+dRXc=matG}KTFuNyhlgEz@8nmOJ0!I=2C?G1>)#Sn6IRNo +z8AU3*KVMkB%AwQqq&hq%)9Geme67LY6I1%cwYjnA@R`N2)%W&uY?F8Jmt1dYRoSc< +up^${g|>NCNTpS!+d;+|@e7w8@f;>Qyk4KPSNLWNzh+jfNN=iaP +zSxHGrSse}-IXO5uxj4BwIl1|`dAa!n`G7!B7;J#Bgdjf<2ug^Fi-?Gbi-ELDNhvBS +zC@RABtN%a1AjrXBz+k}4sKme|$jB_n`2PsQ1O^5sCMIT}Ghu+0orMi3z{tS}0x(e! +z&BDmcBmh(nq?nmF_#twPOw25T3_`4mY=(})lSK|*RJs)0EXE#~SlGDHC}`3lW#`3* +zFN=!`GB7f;Ffy{U!VF{-1X`kK$RZ@1I8n(cNtyLS;6*2s|F;-;m>Gf2V-{qvXDBbe +zv*Mw}Y@3;miY}tlEu`TEGE90N%w%vZbL-XL>D7pO&kH5$UZ|dcXX?0oW +z!my*yLSuE5|2=JivaoiA61ml1|J_?>j@9O^FaTbxvlkc8o&N!x0P+m3Lc(>)1)3U7xJ&uc}s{H)*xrTSKY~PIV9Iwia +z(GL$zjkix#-SE|BgOi2bKb@tMPX?_m6j4!e4>I7NsZ-zWD|gP|@a->I3fwPsxpAbk$a+OK&h+3=VFDjpy9Tr~^GU={VlG8)m +z8pF;mGc(H|6G`e%2!Jzx?6vHROsAQlZ}{GDo#AjYNufK=CS9^E3+bZ^-M5fEA$V2?{@uGm&LC9 +z?wQX|)|!2|6c=~?F>imRr@m?LzWHnNeB#rJx0e<7{LE69z0GZ3aA$ei-Tw?lU2BSt +zbQdKYa?3H)-F;Z9x_07&eT{q9%(sqMpI-Ls)aA8Fn>Mv%vP@#rvJshk^H|^g{@bia +zZ`({=VVr$Qe*Y?G=hEiDQ-#$@Q&!$8(YD^2oLw{Ht7^8<^xVB{&(8Uo9Q(azS=PsE +zMiGzFUGo95_W^nAPI=PgygsaXPDUxQN;CihG#^7B-AGBj2))XVN=6obR*HR#8;CxKVMwz9Qm{Odw +zW>lJJW>!QgXqK9_$fK>SCQP9`rQ0yDW|oyHqjl(P;uH9%K0A3NSH7o!j +z0N^?b*sTB#6LW;y00f)>01F+_2*8GLGtzi~+wMppdp{@yXqWdmI@%qLLc3$#&}cWT +zmxl+|!@~=9cXX^f?1{q@@HkHriA*MuXjCed=Kl%E6^(XvbH%v2Vz3ww3>L;Zfbsty +zz>{E42QbN-NFWf1-tToXnL_cUP(Jzo_I3cH0Ugkh5EUR`2nj>>8{i-S2qXkK-u#G@ +zGtvcxfIjdsbWA4*37owE0zx8?NHjFm`2bjPWFVx +zWbf{vEh{}Fd4l`SwQ@eLy +z&FM}uEMAGxqKxq_ii?4xq)Ea4@~+PZ)21q?^vr&K(qF-MwGS>|ET21=-_(~BS{d_g +z8}VRF|HG6Z%V)|64KG!rcpx=*%I-1Ns(%+dRR|xmI~o|{thUHnT(vbit=ZeKZg}*n +z4xhPw#~HdV`B=)~NhUXd^RCpyH|O4gTde9eyi(gW-v;T`j +z1oiWu50dX~CdbPYXU@ExsN#NKc%m$q#-Iu9(VV|hVI_T**Ls)wklR}myLt(C$8NU`F!w6wy>jW82{|Y +zp##tJtgnxBS#8g>c}oiSPjNbCjZ7tXES0}iN{&w)R<^7d7TgIWM87qH0n<=cWrtSo +Q=X}oBw+=N2b=3ane>Fr3s{jB1 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app.7.jpg b/feeds/xwrt/webif-applications/files/www/images/app.7.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..fd04e9b7bfd6e55c75f91cc2039dff45673d22ee +GIT binary patch +literal 1770 +zcma)&cTm%L8pglL@0UUnLqazz+f;t2s>0sBvpzsS()ULCcp$jkO7j6fXE1$2;2q$2_X>MG5;$R8VO?{ECN6P`d<#gCNB{vL +zVI&#@WnjKqvP4!SBjN#)o&pRjgI-%EactG|%9jR+XC +z{ek~nLI5%nGPhTNwHe>(C@P`eCl=JT&1BrM@X_se2(xsQjRV4V0wftC13U2X!Rse# +zdtnzhjhQ%Fw)gOftCcBpcLS5!B7L6)oM1sq$2TuB1AZ-BFwM$K@RaXyT=`-|yLCJ- +z)jC>2alIgY`Ho0P>*v;_cMEgHQn{)EwRM;#cd-5E(~*Y)dn$9+*M3T)v22uoGtPTf +zz)WLo7MGpP5!_;lq>_}>N8it1+X}lU1LW3=rKSz8*5+LK^x`t?2hTvA*!jMe)0yJD +zk_|+!;iWenzceZ59AjB6_az7KGB}Sv@3JQ{LO^1el}8(DK{dj`SPnf=%i{7+GmAr& +zqB_0USWN52uF`7t@@c;~it4J7xPw*jAv~xnZvWqt`A4{YKGx^_%*@%$3Qs%cldgT1 +zb&wNJdE7%V#9onm7cy;|JjsaC!F~-ob>;9nkDW3z?ssJat!1Z7tB6W^tREC_HK&EG +z)1kX~@~j4}My4X-YJ!l!p=Cr#yEtK8RTPbYZu0Q-LfxdOiL=bn>Eg}CMz6o6KL4%L +zxKRHWI@RC=OKx9Z3HR+V|5F%!so#cIK-vWb#9iXB6J49(YoUd~lT$f8eexf#+fCMO +zj=FJWAim9JzlsY#RjDYVVx!rS(5R6x{-P~uFc718U{4$?p35yV?K4{KXxw}ha(8a& +z;<2DREw(-Tj*9h4KdyG{wZNs9x(ZhClCJvjrim=x0xrc~Kfr!3Dm=j>dhqg$>uoH& +zV0d_^*8&k$F&UR5AO-_%o?fUSiAl==oN3na!Bjg2--txzb-i-0BY1aTsIN^aQxyy2gj$4+D|< +zo>f&D(8T2pm7t;O-|6}djkS(Z9~SjOOya&(vGB{FXOG65@?p4s^Ye`iuVGz{7$(jB +z%~2Z!jhk?AqEI}rCN!9I&wa!RFP(3?Te40SYh}s@h;EM@VY506l4;&em7VqPQYt1t +zm0gXvI@#QDpnG(SPaT%_*VpW2ulmdFqe|1I#zwubEg4fD=PC`%&08mU(lC0KGOwV3 +zOQAW&)bCJWaq}Vk&6^4y91$;5;2R_+)Fh)HQA~<| +zC)YWLdP7|ME0r-+p8j4v0arK$a(zkFgixROkXKKQADtJNDQmElx?*>_w$wD(-^z~4 +zI$2UPbbqjFPuXZ#JV%oHc=4re^={yN!}+Px%buy(L~06SJhnLRg`v+GN}(f5;lB47 +zYgouR?QEH*9@@yCZj4vwSn8@2I-vku-|j2De@7V=usy#8L&<} +zAFNs{jlbxd@x?4Shn?FSYT8#?B=~mc_1$N`!O~UrOzqv-2fb%#5j)$4kq_jL8U=6+ +zw)mNcq@DMsHV!=St)M2B%fM*oV}G6utW7KOPp8FSNj++-X5#+G$nswY{hOM)U$WG!3Y=gryk;uZ?@>7AQD +zQz5x%S<+}Nw>GPTJMQb2Y}IvDKq<}A)^)G)ChGa}&BaG%)1GT;>TYeZ?+0B_ZU3zH +z=HBSqD@ovhxu|uqezwm+NSXT_xis?w(M>hR`o|{G$=(^0w;ZjniQL_XgbQyp=5AIN +e`YSy=QsI6|y-=m2S#+*mBq$?p+S)nE#{LQI3Gt2q + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app.8.jpg b/feeds/xwrt/webif-applications/files/www/images/app.8.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..22cf5665a9de33bf400d9f7fc75d5a904f80f3d9 +GIT binary patch +literal 1302 +zcmX|-4K&kx7{`Bm|Br3<-1$rEu<* +z+eS +zkw}IK`b;9gMieTIN-?6-O-$%?3l@uI!Tt^c4?%bXydfTMNHQcEl3+S#;0(QU-g|EA4VBpM)47&1U20UC|OLb(5%2qX#(Uuy^Q`Q7 +zd(T)b%YzYmClZ6ge4D3#9*kn5xo#~KsyHs)FL#J#Pt&OYLBA0RqhR0yQa06yij!m1 +z`Qkqe&PfBA8#lyR=4D;kE$NHTaom$%8IjhM)fOA-uD{Yxx)QXTJ{y`)6Z2?W(gPqB}O98(diQ +zpr9hfz*)ktEqAHs+fHy5U(}}xZ5(^9sXT^4yqb#DzP6H-WQV^F_|$bRNnALc!XBf~ +zlQmUNmsS22nDwdrwNol*CN_Coy^a`EZNrO7u&_O<*wOv>OJTc1pkKlAPWuiVmNoHCk+RgB} +zI8wKL->24qZgur?%>33e#n2|Fk-ZR>Gie+%;b2@oE)8(iv#?!4^B#`XxmzsbD +z8Pb(MKFE9Fbnsy93ucWnp|bFXw_Ewi*tV0%3C?!Sqvu@d*iKh1Z${xSy&kkzCJ_l3 +zFP2(Csva346As%(YkWxJ;Q(TNTghhE^hJgJsEU}5f5i6UC|!fnO!y?T>2G{k2o{@Jy-DM +ztJr>;woqARg$E)(olq7DIk(U^zte%mS3VtYR?EYC6NG|n?@PnnPNS09*xTLvUB@p< +zhip%oh5U5>l9g3nlzAL)P3{TljhRP2qOvD)Vm7snYG0XVKXr7pi-1oIzAp6MXXEZM +zyewxj%W2JX!Hi(+xT2JI@AqUQ>mEtSqS@HdnUblqF_Qrz_M0b)A+rndcmQ|I3yFBi +z^o+51Yc6io=7m15ThQH*BuzRdyB@q**eM;L|2%=H1l6yZ7t*$5|sk +yUv)PH9||olyLY65Oo+FNIwj60UnFR;;?ue4sT+FGcqA< +z!s9oQ5F(L8BqE3j(SQkpP$*Oi1)_57=)2;f;*&#(09UF@Z!N5=i6^6|(8a +z0aF?oF+ir7(Wq1^&5TZ`(dcw0(}v01=-cZ%0Aggg=LAF60EIv>0_nRzJ^&~fGQ8XX +zi-XY^6!eh|696;@hESUU3I)L^G#bYL*MU$l8Ub4{4Chd5GS*wcq8ti)oOrs*r{s!D +zPPHilKEyFF8vcI?LK)I91MTd6$Ql!xNItFTyxla)(mw$N!wVDwBVad3n-WySxhosb +zF-B~ZyWA%+7tc#i6~E-U-0Eg#b~lbND)2iBEfAi~4zAM9WwexW5|duNyFKL8zNhX8XSxR8d0)s;p({vn}IQ9_WCu-}Wffx~{ui=W`3WHt%MAkFV_;mq^Un +z=CWN=2TwLP9w->k3UyAVP89KdysGkE545#a#JN^Vr77~<<}Kek6)sC3wAyXXdN;5? +zSN^#`?$egy@Tec~*{A4;*f%#MWp`6UDE? +zM+)}F@12k<=Q@fWH4z#i-S^ScmYlj5RCyj2d#U~D?6?f80-dH!;6 +zQF4!X<)2$ShJ>m^wtdk$-pC!RbVcdcqk%Z;^(;|(Jg)GkAVL2tf6=N+MouelgV#vn +zHMgdo121Aq7CL&}j$Rd2?!0=?T{RC0MRa0f7-{XqSDG?!T|q;nO#X9s5~a5`At*$} +zsxK62FwOjQOz+G1<9|``5z=4t6Wr%3P6+#I#rMOw_ab5}Rx1D0CKpTElb&sT_ho~S +zE!;k{)y|lLoW3!gTeqEb=0TaN^O#+)y(`N{&36_wA8bvXa4dH1uU)V4w_3bgv=}03 +z&zHvZrJccBKGU|-6_+N|z8Iad=yFn`X=6*Qtygo(k%;J=VKt5PmL4lBj$CTl-5HY| +zk;k9ncste)(N{BQ15skmdXTR6V#8PrZyWTK6(zlpx)`^VG1z4GDDCVr|GgyK;nVKc +z8yZ2X*uGpGTU=&-XEnU^7lEg$lddp1d$Z_qvgNk8Yevqk{PPhBtNaTkb1OAYytl+f +zvEv|Fz5Ge)g9|-fNdZd>R&NTIW((4GEnIiZWTT@Wo!!b=aDP7aaQr$;?!le)^>Psl +zKf8&GnmNCmHa$A-5V_a7i8*QJO{wP^_i0OhS94r5yOP_EHV8`ZUm2;R_q#-oLZuPIku5Y@mIJ3Z87&5B&@5_vgz1 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/app13.jpg b/feeds/xwrt/webif-applications/files/www/images/app13.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..ea20fb8707368393d73485cd14685e86f154eeb0 +GIT binary patch +literal 1541 +zcma)%c{r4N6vuz_zOz_|H#1pA<7#e~WGh>il439=7mcpv;bu#+PDmt1%B?IJbxRuA +zmoTD{wG5%27Ny0cp)8ld;37BCGI#1exBKt?oaZ^udCvEIpL34*m3SB^(x{G9fPw%B +zkOUCV0K_)N|L`$@0%!n$nWQxb@HPPvet{r>C+VQX0+0%Dn6F4OP6mg?$;e6LaME&k +zSy?$*Sv(^54Fs=()5c|u(t-6+TXwn@_W2Q**&`IAABi~0IutA!$4LC&kQe}h)?BmM#sxEf +zpl?01u#SR_a#hOSveS2?J~WGQYLm9 +zm|9_t9f+?fW+;0~$#3=4jy_&spm~adqK(Q>6wRwVzB|+)qJem&EvTNB*vE_4Xchx! +z{Y2?kO;jf@yVa+Qy~;K{tQtYjy8yO`Tzb9o)$&Ulx~9%R$bF$T={PQ;O!p6-BPO|S +zJVNbr@aEt5z0L59-Smz@kBg7xYZ4p83auB5AvQNI-HMcx&(9`TB9$NaTa%9*-G +z7TMp+i;sWGl~Yl0*7?u`$dYn +z_cyLHA=W$5clkASVFE| +z#~}_w=-A<3aU`$D8K{5WEvons+8e-I{_Y*Zt +zJ#>>3^;U*w+DzD?(c#qEk4aHEsvHxyt~eo`>wadce6u^n&RDBKFzv%!%}kRqS6QSA +ze0T9{ENre3D&xeUoOZZzV4P(VnUK7!d(!2S;awHQZ2ua1&_hy6rm@v^AMI(YgZC}# +z%{NUAT8y7fKNTGjUUZ&Ow2z@U6fB!A2HaD^+wF@k +zU@ON=q$(VnvRw|JsDT<+!s|qb)eblDJtt>7M}zh=d!h*Dm#jlFn{xD3+_x>0oLp#= +zl`X6ExEDt=W*LM9gG@F)Fz&;s+v7XJhtT^sZw9c#VOh1l8alOE>lQtQwpI4wvsJN! +zC4{A5xr`o<`^&8{T6h=RI?l_r#G~r8a}9Q<_W03Q&FR$@t>dRNKRS(6tgEk8Ip~{9 +zs_1g#u?p>#-Mm|{YpphJ(JMTfAJEX7ul+-8P!*b>Gmw-KBgYVybCmr*CCzzUSYySqGtOMMAh@&jbu;^AUF_ZJDq7Nux`x|Xe`rqNeDXK +ztVj9EV1MOn+*D8iRy|OIL}28;p%`R1%Ppk`i5(e_#%2nww{0Z=Zx_3~r>67yMM$G1lwnJ;W(CO`-tjTxb#xQ@m#kzp6{lf +zPj!$0FNMPpS3Fh($|ck2Y(S+$1GNee7_dt%xBCT$x4VoP%Syx6(zYuF2g^_II#$Qi +z!}%XVerAA3gLMam6iJ7OXb)G7j!$Khbz+c}mY0uSn}-G*3j%qcdMtFNha0J?s|f%* +Djj2{5 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/files/www/images/dvsts.jpg b/feeds/xwrt/webif-applications/files/www/images/dvsts.jpg +new file mode 100644 +index 0000000000000000000000000000000000000000..b8ec16b4f67cfe31931f601145acb3282b46de05 +GIT binary patch +literal 1007 +zcmex=TaUl^P5E2)cmXVW@7FSVG +zS65LnH8wUjwT1&mUT$t)K3)MnJ^>Lvem)Tq0YO0l5m^xtQ4tYYRVi^GkWy7pmXniH +zR?yH;Rn^ciGBPkSg6p^be}F-dgTa8ofSFN=fk}{&S&;Gn5eAU6nV193tvi*f{ZG^W?>s*%KFTG;+EW +zEHWv1bBU{%njn(-5Uu}jG4L=0trlb!WUy!0^khF{*I}0J(o5Ph4!vu#bX#|N-F(;V +zd%|VX^GiQwaT`xM@wg)DTun*0$h(iqHr@M}_ANcvemF4x-Aw(f@eku&ne{%*-f-vl +z`tC@mo{YWog`VjhKB4NdcF}Fq!z(!E#hT4aFuOi|j_=IPsX`vTGR;+z6GIlSx7s#8 +zys6Q>!uLjA&BdCidp1p5x@9h$&O2A)tRZFijHl;tyexN~@yV%*X`w1Pxks(!YPHf% +z{rmR4b#31InZB?0q`5inGL1acwD^dI(vENG+a5@y_rG_$_N3Bp3VVCr!&6V+yjhwS +zkv_RB_HK^|({X=O`=3p-@9Q)DXUPAyHuQ$(Y{|)6PpBjX=REwi?S@1~NWbBN%!%&v +zO!m!sWt}J1pF8_@llLo+SJ%{DN}ijmRy*Ifnfr?9$IoKd+#;t(yWOJ +zFI66Vn!h_<_USdpdpXCf;_p97b!~euZPa^1N$TBU9nA$H@dsXhyLN5*PixNUmNRA? +z&bipK`G^98uh83G79Ea0QTv`RJ6G_fe#-1W5qnEpOzg6!5c4S~!@%{k*5pY|efHo^ +z_Rgz!184mDwc^v#_xgGIvQB%?tT)zp!g^yPbG&TSAC3CQ8?*mx`L~tjSvp7Y9z!|9 +zG_g0Qm{`UUm0_D_$;t@ZOeA}rg)10WJ)ZR6HSL=HbV2}Bes8i@!NU3q95iwn3}4qb5`=6-!`{`wI}y5-dxN6|0V$Yeub|9 + +literal 0 +HcmV?d00001 + +diff --git a/feeds/xwrt/webif-applications/ipkg/.svn/all-wcprops b/feeds/xwrt/webif-applications/ipkg/.svn/all-wcprops +new file mode 100644 +index 0000000..58b5b29 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/.svn/all-wcprops +@@ -0,0 +1,17 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 56 ++/svn/!svn/ver/4804/trunk/package/webif-applications/ipkg ++END ++webif-applications.postinst ++K 25 ++svn:wc:ra_dav:version-url ++V 84 ++/svn/!svn/ver/4804/trunk/package/webif-applications/ipkg/webif-applications.postinst ++END ++webif-applications.postrm ++K 25 ++svn:wc:ra_dav:version-url ++V 82 ++/svn/!svn/ver/4804/trunk/package/webif-applications/ipkg/webif-applications.postrm ++END +diff --git a/feeds/xwrt/webif-applications/ipkg/.svn/entries b/feeds/xwrt/webif-applications/ipkg/.svn/entries +new file mode 100644 +index 0000000..dabe27b +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/.svn/entries +@@ -0,0 +1,96 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-applications/ipkg ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++webif-applications.postinst ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++3561ec6f23ef190e6447c303e8c0e34c ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++356 ++ ++webif-applications.postrm ++file ++ ++ ++ ++ ++2013-03-17T12:17:54.000000Z ++8a81c8e13f60fbf9edea9e7615ca96a1 ++2009-08-15T16:26:47.908394Z ++4804 ++lubekgc ++has-props ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++147 ++ +diff --git a/feeds/xwrt/webif-applications/ipkg/.svn/prop-base/webif-applications.postinst.svn-base b/feeds/xwrt/webif-applications/ipkg/.svn/prop-base/webif-applications.postinst.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/.svn/prop-base/webif-applications.postinst.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/ipkg/.svn/prop-base/webif-applications.postrm.svn-base b/feeds/xwrt/webif-applications/ipkg/.svn/prop-base/webif-applications.postrm.svn-base +new file mode 100644 +index 0000000..869ac71 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/.svn/prop-base/webif-applications.postrm.svn-base +@@ -0,0 +1,5 @@ ++K 14 ++svn:executable ++V 1 ++* ++END +diff --git a/feeds/xwrt/webif-applications/ipkg/.svn/text-base/webif-applications.postinst.svn-base b/feeds/xwrt/webif-applications/ipkg/.svn/text-base/webif-applications.postinst.svn-base +new file mode 100644 +index 0000000..b906f2e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/.svn/text-base/webif-applications.postinst.svn-base +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# ++# Webif post-install script. ++# ++if $(grep -q "Mesh" "${IPKG_INSTROOT}/www/cgi-bin/webif/.categories"); then ++ sed -i '/##WEBIF:category:Mesh/a##WEBIF:category:Applications' "${IPKG_INSTROOT}/www/cgi-bin/webif/.categories" ++else ++ sed -i '/##WEBIF:category:Network/a##WEBIF:category:Applications' "${IPKG_INSTROOT}/www/cgi-bin/webif/.categories" ++fi +diff --git a/feeds/xwrt/webif-applications/ipkg/.svn/text-base/webif-applications.postrm.svn-base b/feeds/xwrt/webif-applications/ipkg/.svn/text-base/webif-applications.postrm.svn-base +new file mode 100644 +index 0000000..a85fbe1 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/.svn/text-base/webif-applications.postrm.svn-base +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# ++# Webif post-removal script. ++# ++sed -e '/##WEBIF:category:Applications/d' -i ${IPKG_INSTROOT}/www/cgi-bin/webif/.categories 2>/dev/null +diff --git a/feeds/xwrt/webif-applications/ipkg/webif-applications.postinst b/feeds/xwrt/webif-applications/ipkg/webif-applications.postinst +new file mode 100755 +index 0000000..b906f2e +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/webif-applications.postinst +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# ++# Webif post-install script. ++# ++if $(grep -q "Mesh" "${IPKG_INSTROOT}/www/cgi-bin/webif/.categories"); then ++ sed -i '/##WEBIF:category:Mesh/a##WEBIF:category:Applications' "${IPKG_INSTROOT}/www/cgi-bin/webif/.categories" ++else ++ sed -i '/##WEBIF:category:Network/a##WEBIF:category:Applications' "${IPKG_INSTROOT}/www/cgi-bin/webif/.categories" ++fi +diff --git a/feeds/xwrt/webif-applications/ipkg/webif-applications.postrm b/feeds/xwrt/webif-applications/ipkg/webif-applications.postrm +new file mode 100755 +index 0000000..a85fbe1 +--- /dev/null ++++ b/feeds/xwrt/webif-applications/ipkg/webif-applications.postrm +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# ++# Webif post-removal script. ++# ++sed -e '/##WEBIF:category:Applications/d' -i ${IPKG_INSTROOT}/www/cgi-bin/webif/.categories 2>/dev/null +diff --git a/feeds/xwrt/webif-asterisk/.svn/all-wcprops b/feeds/xwrt/webif-asterisk/.svn/all-wcprops +new file mode 100644 +index 0000000..921fa47 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/all-wcprops +@@ -0,0 +1,41 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 47 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk ++END ++PhoneSetup_en.html ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/PhoneSetup_en.html ++END ++UserManual_en.html ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/UserManual_en.html ++END ++MngrManual_en.html ++K 25 ++svn:wc:ra_dav:version-url ++V 66 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/MngrManual_en.html ++END ++sysinfo.txt ++K 25 ++svn:wc:ra_dav:version-url ++V 59 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/sysinfo.txt ++END ++readme.txt ++K 25 ++svn:wc:ra_dav:version-url ++V 58 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/readme.txt ++END ++packages.txt ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/packages.txt ++END +diff --git a/feeds/xwrt/webif-asterisk/.svn/entries b/feeds/xwrt/webif-asterisk/.svn/entries +new file mode 100644 +index 0000000..08add09 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/entries +@@ -0,0 +1,247 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-asterisk ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++PhoneSetup_en.html ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++d5a990c3a59cb34bebf574a44c543705 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++37130 ++ ++UserManual_en.html ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++6dd53f65f4a190ee7fd2c3b0361f2a90 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++28753 ++ ++www ++dir ++ ++lib ++dir ++ ++MngrManual_en.html ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++0284433f500d673f303c8e3a3e10bc1a ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++69425 ++ ++sysinfo.txt ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++7e92845dc550856613effd69ffd189ad ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++10872 ++ ++usr ++dir ++ ++etc ++dir ++ ++readme.txt ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++967526919eeb96458994d5f8c65ed597 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++8304 ++ ++packages.txt ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++d79243ad92980c6ef5010b27a6a102ac ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1657 ++ ++mnt ++dir ++ +diff --git a/feeds/xwrt/webif-asterisk/.svn/text-base/MngrManual_en.html.svn-base b/feeds/xwrt/webif-asterisk/.svn/text-base/MngrManual_en.html.svn-base +new file mode 100644 +index 0000000..de86055 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/text-base/MngrManual_en.html.svn-base +@@ -0,0 +1,1078 @@ ++ ++ ++MARS: Manager manual ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
MARS
++Mini-PBX / Wireless Router
++Manager Manual
1 - Introduction
++2 - Connections and WWW ++interface access
3 - PPPoE / DHCP ++Configuration (WAN)
++
ADSL
++Cable
++Switch
4 - WI-FI Configuration
++5 ++- Dynamic DNS Service
++6 - Asterisk ++MARS Configuration ++
System
++Extensions
++Trunks
++Servers
++Queue
++Time conditions

7 - Phone-in ++Dictation
++8 - Automated ++Dialer
++9 - WebCall
++10 ++- WebCall Form
++
Introduction

The ++installation and configuration of the MARS system can be simply ++accomplished by proceeding by steps as described by the list of topics ++above. In short, you must connect the system, configure the router, ++that is the Internet access and the wireless access point, and if ++desired the client for the dynamic DNS service. Then the PBX must be ++configured as well as the VoIP telephones.

++Some steps are optionals, according to the functions used, in which ++case this will be indicated in the text.

Required Informations

++You will need the following informations provided by your Internet ++service provider and your VoIP provider:
  • Your ++user ++name and the password for your Internet service (ADSL / PPPoE),
    • ++
  • The address of the SMTP  Server used ++to send emails.
  • The user ++name (Or DID / Tel No.) of your(s) VoIP lines ++with password and the URL (Internet address or domain name) of the ++service. 
    • ++
If you will use the dynamic DNS service you will need:
++
  • Your user ++name and password as well as your domain ++name chosen when you create your account.
++Finally if you interconnect systems together you will need:
    ++
  • The server ++names and passwords of the MARS systems as well ++as the IP address (or domain name) of all systems.
++
Connections and WWW ++interface access

Connections

First, ++connect port one of the router to your PC ++network card using a standard network cable.
++Then connect your broadband modem to the WAN connector of the router ++using a standard network cable.
++Power up the MARS system and wait until booting is done ( < 1 ++min.)

Initial ++configuration

++The local LAN address of the MARS system is set by default ++to:  192.168.1.1
++Make ++sure that the network adapter of the PC you are using is set to use a ++static IP address in the same segment, but different than the MARS ++system. For instance: 192.168.1.10
++
Open the network configuration utility (For ++Windows: ++Start | Settings | Network Connections | Local area connection.)
++Click on the "Properties" and select the Internet ++Protocol (TCP/IP).
Click again on the ++"Properties button"
++
If ++your network adapter is configured to obtain an IP address ++automatically (DHCP) or on a static address in a different network ++segment than 192.168.1.x, modify the config for the IP protocol as ++following:

++Check the "Use the following address" checkbox and set:
IP Address: ++192.168.1.10
Mask: 255.255.255.0
Gateway: 192.168.1.1

++You can now access MARS' WWW interface by pointing ++your browser to the following URL: http://192.168.1.1
++The user name is "root" ++and the password is "Mars08". ++(The pwd may be different, use the one given)

++The ++WWW interface allows you to configure the network interfaces (LAN / WAN ++/ WI-FI), the PPPoE client (ADSL) and or DHCP, the dynamic DNS client ++and give access to the configuration panels of the MARS system.
++
PPPoE / DHCP / Switch ++(WAN) Configuration ++

To ++configure the Internet connection, select the "Network" option from ++the main menu and then the "WAN-LAN" ++option.

++Important: ++The MARS system has it's own DHCP (Dynamic Host Configuration Protocol) ++ server which is used to configure the network interfaces on ++the ++local LAN and behave as a DHCP client for the WAN side (Internet). It ++is very important that only one DHCP server is activated on a given LAN ++otherwise some configuration problems would occur. In consequence, make ++sure that you modem (or any other device) does not  use it's ++DHCP ++server for the LAN, otherwise configure the device as a DHCP client or ++else disable the DHCP server and use a static IP address for the ++device. This static address must be set in the same network segment ++than the MARS system. (Usually at 192.168.1.1) For example: ++192.168.1.80.

ADSL ++Modem / ++PPPoE:

If ++you use ADSL for your internet  connection, you will need to ++configure the PPoE client to allow the system to automatically connect ++to your ISP on startup.

++- Select ++"PPPoE" ++under ++"Connection ++Type"
++- Enter the values under PPP ++Settings

 ++ ++ ++ ++ ++
Redial ++Policy Keep Alive
Redial ++Timeout 30
Username <As given by your ISP>
Password <As given by your ISP>
MTU 1492 ++ (unless your ISP say something ++else)

Make ++sure you save the changes by clicking on the "Save changes" button and ++the appy the changes  by pressing the "Apply changes" button.
++The ++system should now connect to your ISP automatically on startup. You may ++need to reboot the system (Using the "Reboot" option from the "System" ++menu option). 


Cable Modem / DHCP:

If ++you use a cable Internet connection, ++ select "DHCP" under  "Connection Type".
++Make ++sure you save the changes by ++clicking on the "Save changes" button and the appy the changes ++ by ++pressing the "Apply changes" button.
++You ++may need to "power cycle" both your cable modem and the MARS system in ++order for the cable modem's DHCP server to assign a WAN address to the ++MARS system. Turn off the power on the cable modem and disconnect the ++power cord on the MARS system and wait 1 - 2 minutes. Then power on the ++cable modem  and then the MARS system.
++You can verify the status of the connection using the "Status / ++Interface" menu option.

Switch ++/ None:
LAN ++Configuration

 ++ ++ ++
LAN ++IP Address 192.168.1.1
++
Netmask 255.255.255.0
Default ++Gateway 192.168.1.1


LAN DNS Servers Configuration
++
Enter 192.168.1.1 in the edit box and press the Add Button. You ++should then see the following under

192.168.1.1 ++ Remove

++Press the Save ++button at the bottom of the screen and then the Apply ++link to apply changes.



Connecting to the Internet

++Once the ++Internet connection configuration is done, you will need to reconfigure ++your PCs network adapter so it gets an IP address assigned by the ++system.

++- Open the Network configuration utility. (Under Windows: ++Start | Settings | Network & ++Dial up connections  | Local area Network.)
++- Press the Properties button and select Internet ++Protocol (TCP/IP).
- Press once again on the ++"Properties" button and ++select "Obtain an IP address automatically".

++

Verifying the connection.
++
You ++can verify the Internet connectivity from the main menu by selecting ++the "Status" ++menu option and then "Interfaces". ++Here is an example ++display:

WAN

++ ++
IP ++Address 216.209.xxx.xxx ++P-t-P
DNS ++Server 1 216.209.xxx.xxx
DNS ++Server 2 216.209.xxx.xxx

It may also be ++necessary to restart your ADSL / Cable modem. Remove the power on the ++MARS system and then reboot your modem ... then put the power back on ++the MARS system.  After restarting the MARS system, you should ++see than an IP address has ++been assigned to the WAN interface as well as to the DNS servers. ++Otherwise, double check your PPPoE settings.

WI-FI Configuration

To ++configure the WI-FI access point, select the "Network" menu option and ++then "Wireless". The WI-FI access point allows to connect devices with ++WI-FI network capability to your local area network. Theses devices can ++be portable computer or WI-FI VoIP phones.

++If you do not want to ++use the WI-FI access point, you can disable it by selecting "Disabled" ++under "Wireless Interface", otherwise set this to "Enabled".
++The select "WEP " under "Encryption Type" and enter a "PassPhrase" that ++will be used to create the key and press the "Generate 128 bits key" button ++to generate the key. Take note of the pass phrase and WEP key as you ++will need these to configure the client that will connect  to ++the ++access point.

Make ++sure you save ++the changes by ++clicking on the "Save changes" button and the apply the changes ++ by ++pressing the "Apply changes" button.

WI-FI Clients ++Configuration
++
It ++is impossible to describe here the exact procedure to configure the ++WI-FI clients but as a general rule, an configuration utility will be ++provided. This will allow to locate the access point and get access by ++specifying the encryption as "WEP"  using a 128 bits key and ++by ++providing either the pass phrase or WEP key used on the access point. ++You will then be able to connect the PC or WI-FI phone to the local ++LAN. The WI-FI client will memorize the informations and will use it to ++connect to the AP on startup.
Dynamic DNS Service

MARS ++provides a dynamic DNS client which can provide a fixed domain name to ++your system. The dynamic DNS service client will contact the service ++DNS server to update your public IP address when it is ++ assigned ++or renewed by your ISP.  To use this service, you must first ++create an account and the configure the system's client. You don't ++really need this service you you do not use WebCall or do not link ++multiple systems together.


DynDNS account creation

++Go to http://www.dyndns.com ++, select the "New Account" link and complete the form to ++create ++your free DynDNS account. Write down your user name, password and ++chosen domain name. You can select a domain name with different ++suffixes like dyndns.org or dyndns.biz etc ... You must supply an ++unused prefix which together with the selected suffix will form your ++unique domain name. For instance: "my-mars.dyndns.org" ++or "my-company.dyndns.biz". ++After having created your account, you will receive ++a confirmation ++at the given email address which you must reply to validate ++your ++account.



Configuration

++Once your DynDNS account has been created and activated, you can ++configure the MARS client by selecting the "Network" menu item ++and then "DynDNS".
++
++ ++ ++ ++ ++ ++
DynDNSEnable
DynDNS ++Service dyndns
User ++Name <Your ++DynDNS ++user name>
Password <dyndns account ++password>
Host ++Name <Your DynDNS ++domain ++name>. Ex: mars.dyndns.org
WildcardDisabled
Server ++Name members.dyndns.org
++
Max ++Interval (sec) 86400 ++(60 secs * 60 mins * 24 hrs ) Renew every 24 ++hours.

++Make sure you save ++the changes by ++clicking on the "Save changes" button and the apply the changes ++ by ++pressing the "Apply changes" button.

MARS ++DynDNS client will contact the DynDNS server regularly to communicate ++the current public IP address of the system. The DynDNS domain name ++servers will then be able to supply the correct IP address when someone ++request your DynDNS domain name.
++
DynDNS client ++verification

You ++can verify that the dydns client works properly by using the "ping" ++utility that is accessible from the menu under "Status" ++/ "Diagnostics". Enter your dyndns domain name in the edit box and ++press the "Ping" button. If everything works, you should get the result ++after a few seconds. The first line will indicate the IP address given ++by the DynDNS domain name server for your domain name. Example:
++ 
PING my-mars.dyndns.org (216.239.76.53): 56 data bytes
Verify ++that the given IP address is the same as displayed under "Status" / ++"Interface" for the WAN interface. If not, double check the DynDNS ++client data and make sure your account has been activated and try to ++reboot the system. ("System" / "Reboot").

MARS Configuration


To ++configure the PBX part of the MARS system you need to set the ++genral system  parameters, the extensions,  and the ++external ++lines (trunks). Then depending on the desired options the queue ++parameters and the time conditions. Finally if you want to interconnect ++MARS systems together, you will need to configure the Server section.
++
System: ++This section allows to set the general ++system parameters.

++ ++ ++ ++ ++ ++ ++
System ++ID
++(Server No): 		The "System ID" ++is used to ++establish the base extension ++when two or more MARS systems are interconnected. In this case, each ++system must use a different system ID. The "Server ID" will determinate ++which the system local extensions . The ID 1 will assign extensions ++200-203. The ID "2" will set 300 - 303, the "3" will use extensions ++"400 - 403 and finally System ID 4 will use extension 500 to 503 as ++local internal extensions. If the system is not linked to any other the ++use "Server ID" 1. (Extensions 200-203).
Service Main ++Language (E/F): This is the ++default main ++system language. Use "E" for ++English and "F" for French. For a bilingual system, the "welcome" ++message of the auto attendant allows to select the secondary language ++by pressing the "9" key.
Admin ++Email: The administrator ++email ++address. This will be used to send the daily calls reports.
SMTP ++Server: The address of the ++SMTP server ++used to send email (given by your Internet Service Provider)
Cell ++Phone Gateway Pwd: The ++access code for the Cell ++to VoIP gateway. This code should  use only disits and be of a ++minimum size of 4 or 5 digits.
Local Prefixes:  ++ This allows to get your local prefixes list ++according to your ++given area code and telephone number prefix. Enter your 3 digits area ++code and the first 3 digits of your telephone number and press the ++"Save" button to save.  The press the "Get" button to get the ++list ++of prefixes from the Internet.  (Make sure you  have ++Internet ++connectivity before using this function.)
Local ++Prefixes List: This displays the (read only) list ++of local ++prefix.

++

Extensions: ++This ++section allows to define up to four extensions used by the system. ++These extensions can use the SIP or IAX2 protocol. Only the used ++extensions should be defined.

++ ++ ++ ++ ++
ExtensionThis is the extension number. This is fixed and ++cant be modified. You will need to specify this value as the "User ID" or ++"UserName" when configuring the telephone that is attached to this ++extension.
Password: Enter ++the access code for the extension. You will ++also need this value to configure the telephone attached to this ++extension
SIP/IAX2: Enter ++SIP or IAX2 according to the protocol used ++by the VoIP phone , ATA or "softphone" ++used.
Dial: Enter ++SIP / IAX2 followed by a forward slash ++followed by the extension. Ex: SIP/200 ++ ou  IAX2/203
++
CallerID: ++ The number used to display the internal calls. ++Usually the extension number or user name. Ex: 200
EMail:The email address for the voice mail to email ++expedition for this extension. Ex: my-email@my-isp.com

IMPORTANT:  
++
  • After ++having configured the extension, you must configure the telephone ++attached to this extension using the extension number as user ++name and ++given password. (default to ext. number)

Trunks: ++This is used to configure the external lines of the system. You can ++define up to two VoIP lines using the SIP or IAX2 protocol. You can ++also define a PSTN line when using the FXO adapter.  Fill only ++the ++entries which are in use by the system. Use the "Save" button under ++each section to save any modification.

++ ++ ++ ++ ++ ++ ++ ++ ++
VoIP
ProtocolThis define the protocol used for the VoIP line. ++ Use the "Save" button if changing protocol to update display.
UserName ++(/DID) The UserName or DID (telephone number) as ++given ++by your VoIP provider.
PasswordThe password or secret for this line. (as given ++by your VoIP provider).
HostYour VoIP host. (as given by your VoIP ++provider) 
PSTN
FXO1 If you ++use an conventional external line using ++the FXO adater enter FXO1 ++( F X Oh one). otherwise leave blank.
Caller ID The phone number for this line

After ++adding a new trunk you should issue a "SIP Reload" (or "IAX Reload") ++command (from the Management  menu) and then  verify ++the ++connectivity using the "Sip Registry" (or "IAX registry") command which ++will display the status of the registrations with the service provider.
++

Servers: ++
This ++section is used to define the local and remote MARS servers when ++interconnecting systems. Up to four MARS systems can be interconnected. ++Each of the system must be assigned a unique "Server ID" ++ which ++will determine the extensions assigned to the server as well as the ++local server ID. For instance the first MARS system will be defined as ++"Server 1"  and will use extensions 200 to 203 and will be ++defined ++in the "Server 1" entry of this page. The entry "Server 2" must contain ++the informations for the server with extension 300 - 303. The "Server ++3" for the server with extension 400 - 403 and Server "4" for ++the ++one having extensions 500 to 503. The entry which correspond to the ++local server depends on it's server ID. You must specify the ++server name / password and host (static IP or DynDNS domain name) for ++all interconnected servers, including the local one.

++ ++
Server ++UserName The name assigned to the external MARS ++system  (or local)
PasswordThe password of the external MARS system (or ++local)
Host ++(IP or dyndns) The IP address  (or ++DynDNS domain name) ++of the MARS system
++
After ++the servers have been defined you should issue a "IAX Reload" command ++(from the Management  menu) on all interconnected servers. You ++can ++then verify the connectivity using the "IAX registry" command which ++will display the status of the registrations with the other systems. If ++the connection fail, check on each side if you can ping the other side ++domain name or IP address. (Using System / Diagnostics menu option). ++Once the connection is established, each side should be able to dial ++the other one by dialing it's 3 digits extensions number.
++

Queue: This ++section is used to define the usage and parameters of the call queue. ++The default value is set to use the call queue only when the automated ++attendant has been deactivated.  If desired, you can modify ++the ++queue usage here.

++ ++
Use ++Queue Define the usage of the call queue.
++"When Auto-Attendant Off" ++ Use only when the automated attendant is deactivated.
++"Always" Use ++at all time (Never use the Automated attendant)
++"Never" Do ++not use. Direct the calls directly to voice mail of main ++extension if AA is deactivated.
Queue Strategy Set ++the call handling by the call queue
++"Round Robin" ++Contact an extension then another until an extension answers.
++"Ring ++All" Ring all extensions and direct the call to the first ++one who answer.
Members:You can select the extension that will be used in ++the call queue.
++

Time ++Conditions: This ++section allow to define a schedule to allow a specific treatment ++according to the current day and time. When activated, calls received ++outside of the deffile:///Y:/openWRT/Doc/MARS_en.htmline ++working period will be directed to the voice mail ++for the main extension.

++ ++ ++ ++
Enable Activate time conditions
From ++Hours Start of opening hours.  ++Enter as hh:mm. in 24 hour format. For example: 09:00
To ++Hours End of opening hours. Enter ++as hh:mm. in ++24 hour format. For example: 18:00
Days Opening ++days. Enter as a 3 char. day ++name  (mon,tue,wed,thu,fri,sat,sun) followed by a dash ++followed by the ending day.
++Ex. mon-fri 

Phone-in Dictation

MARS Phone-In Dictation ++application is a multi-user dictation system ++that can be used with local telephone or over a VoIP line to allow ++callers to record dictation and deliver it to a receipient ++(transcriptionist) over ++the internet. The system is designed to complement or replace ++the traditional methods of ++recording and message delivery by a decentralised, ++inexpensive appliance.

++The dictation system can set to be used for a single user or multiple ++callers (recorders) and / or receivers (transcriptionnist) accounts.
++
Callers accounts can be assigned a given receiver ++account OR ++ can select the receiver account.
++The system can use caller ID to identify the caller or user ID ++/ password.

++Receivers account can be set  for each individual user ++(transcriptionist)  each with their and delivery mode ++and destination.

Configuration
++
General Phone-In ++Dial 

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Sender's Name: This will be used to ++identify the system in ++Emails.
++Enter the name that will be printed as the sender in the emails
Callers Account: Use if this is not ++checked the system will not use any ++caller account. This should be used only  
++where there is only one recording user.
++Check to use Callers Accounts to identify callers.  
++ICheck to use caller account  so that the system will try to ++match the caller ID or ask the  callers it's Id and password.
Mailbox Account: Use If unchecked the ++system will use the default ++destination.
++Check if more than one Receiver use the system.
++The system will either use the assigned mailbox or ask the account to ++to caller.
Archiving: ++Select FTP to backup all recordings to given FTP server. ++ Set to USB Only for no external backup .
FTP ++UserNameEnter ++Backup FTP user name
FTP ++PasswordEnter ++Backup FTP Password
FTP ++HostEnter ++Backup FTP Host

The callers account are used to ++identify the users who call -in to ++record dictations.


++ ++ ++ ++ ++ ++ ++

Callers ++Accounts  

User Name: Name of user
++This will be printed in the email as the sender of the message
Caller ID: Tel.No. of user
++This will be used to identify  this caller.
++The caller ID will also be prited in the destination email
Password: Password.
++If calling from a different caller IId, the caller can use the User No ++and Password to log in.
Receiver ++Account: ++ Select the receiver account
++If set to a mailbox account, the system will not ask the caller and ++record in the given  maibox account number.
++If set to UserSeclect,  allows ++this caller to select a destination account number. This ++option can be used when a caller will want to send different dictation ++to different transcriptionnist.

The Mailbox or receiver's account are used to ++identify the receivers of ++the dictations. This is used when more than one receiver or ++transcriptionnist user will use the system.

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

Mailboxes Accounts ++(Inbox) 

Account: ++ Select the user account
++Select an account number to create or edit it.
Name: Name of user.
Password: Password. 
Delivery ++mode: Select the ++delivery mode of recordings
++Select if message should be delivered by Email ++or FTP or none ++to leave the message on
++the system when you want to access the message localy through ++the WWW interface using a ++regular browser.
EMail ++ Enter the email whe the ++message for this user will be delivered. Used if email delivery ++selected.
Delivery mode: ++Select the delivery mode of recordings
EMail
FTP UserNameEnter ++Mailbox FTP user name for the user of this mailbox.
FTP PasswordEnter ++Mailbox FTP password  for the user of this mailbox.
FTP HostEnter ++Mailbox FTP host  for the user of this mailbox.

Using ++the Phone-In Dictation ++system

Recording ++a dictation.
The recording of dictations is ++done by calling in and ++follow a simple voice menu. Once the caller and the destination mailbox ++have been identified the caller is asked to the main menu. At this ++point, the system will ask to enter a recording number.
++Recordings are identified by a recording number, which allows to ++identify the recordings and to resume recording in a ++subsequent ++call.

++Record and Playback mode
++If the given recording number is a new recording, the system will ++switch to recording mode.  
++If a recording with the given number already exists, the system will ++swich to playback mode. 

Record mode
++Press the "1" key to start recording and the pound (#) key to stop. ++ Make sure you talk clearly  and directly in the ++telelephone ++microphone when recording.
++After recording you can use the "3" key to switch to playback mode. ++ The "9" key is used to erase the current recording and start ++over.
++Once a recording is completed it can be left for later addition or sent ++to the destination by pressing the "0" key.

++Record Menu
Press ++"1" to start recording.
++Press "3" to switch to ++playback mode.
++Press "9"  to ++erase and start over this recording.
Press "0" to close and send this ++recording.
Press the * Key to go back to ++the main menu.

Playback Mode
++While in playback mode some pre-defines keys allows to rewind, paus and ++go forward as follow:
++Press the "1" key to start playback. 
++Press "4" to 'rewind' 1/10 of the duration of the ++recording.
++Press "5" to pause and restart playback
++Press "6" to go forward 1/10 of the duration of the ++recording.
++Press "0" to start from the beginning.
++Press the "#" key to stop playback and go back to the menu.
++
Playback menu.
Press ++"1" to start playback.
++Press "3" to switch to ++recording mode.
++Press "0" to close and ++send this recording.
++Press the * Key to go ++back to the main menu.

Using with local extensions
++The system can be used with VoIp devices, that is VoIP phones, ++sofware phones running on a PC with sound card, conventional telephone ++with ATA adapter or VoIP WI-FI phone,  that are connected ++either ++directly or remotely to the system as extensions.  The VoIP ++telephones can be connected directly to the device through the local ++area network or directly on one of the 4 network connector on the ++appliance itself.  It is also possible to log on to the device ++as ++a normal extension from a remote location over the internet. Up to 8 ++extensions can be accomodated and these can be connected either ++directly to the device, trough the LAN or event remotely over the ++Internet.

Accessing ++the system from a local extension
++To access the dictation system from a local or remotely connected ++extension, dial the 3 digits number (from 100 to 131) of the ++destination mailbox you whish to record to.  In the case of a ++single destination use the mailbox number 100.

++Using with VoIP line
The system can also use a ++normal VoIP line using the standard ++SIP protocol as provided by numerous services providers.  The ++dictation system can then be accessed by calling a normal telephone ++number from any regular or mobile.phone. Many VoIp provider offer 'pay ++as you go' formulas that allow you to receive several simultaneous ++calls for a very low rate (as low as less tha 1 c / min)  from ++the ++whole country.  Refer to the system configuration for more ++info on ++configuration.

++Recordings
++All recordings are archived in the system's USB memory that serve as a ++static storage . The recordings are accessible through the web ++interface by selecting Asterisk and Recordings on the menu. ++Here ++is the recording's web interface


++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

New Recordings

++

Help

++
Account:  
Select the receiver account
Rec. Date SizeSend Archive
3-1.WAV  Mon Dec 22 10:17:19   34316  Send ++VEmail   Archive
3-2.WAV  Mon Dec 22 10:21:57   46016  Send ++VEmail   Archive
3-4.WAV  Mon Dec 22 11:29:00   34966  Send ++VEmail   Archive

Archive

++
12-2008   ++11-2008   ++10-2008   ++09-2008   ++08-2008   ++07-2008   ++
06-2008   ++01-2009   ++

A ++list allow to select the destination mailbox  for which the ++currently active recording are displyed. Once a recording is closed and ++sent it will be archived in a sub directory defined by ++the month ++and year the recording was done.  Recordings are named with se ++sender's number followed by the recording number.

++Recording playback and ++downlowd from a web browser.
++To play a recording, simply clink on the link  formed by the ++recording name. The recording can also be download on you local disk by ++right click on the link ans selecting "Save Link as" or a similar ++function.

++The recording can be sent to the destination as define by the mailbox ++account by seleting the "Send ++VEmail" link .
++Finally the recording can be archived by selection the "Archive" link. This ++will move the recording file to the archive directory.

++Recordings Archive
++All the recordings are archived in the USB memory  in a ++sub directory defined by the month and year the ++recording was ++done. You can select the month and year directory in the Archive ++display. The display is similar except for file names which are ++prepended the full date plus a sequence number that ++insure ++unique names.
Automated Dialer

MARS Automated Dialer ++offers sophisticated features with an easy to ++use  Web based interface to allow you to prepare and save ++calling lists.
++You can create up to 9 different lists with different phone ++numbers  lists, messages and applications.  You can ++then run ++the lists at any time you wish. 

++ ++ ++ ++ ++ ++ ++
Call List Management This allow you to ++select one of the call list for ++creation / edition
Call ++List Name: This is the name given to ++this call list. ++Informational only.
Source ++Caller ID: This will be set as the source caller ++ID for the ++outgoing calls. Note that certain ISP will not allow you to change ++this, and in this case, will have no effect.
Application: Select one of the ++application that will be run ++after the call has been replied.
++ ++ ++ ++ ++
Call and play Message Call and then ++play the message and the menu ++for message acknowledgment and hangup.
Call and Xfer to Extension Call, play ++the message and then offer to ++talk to an agent by pressing the "0" key.
Call and Xfer to queue Call, play ++the message and then ++offer to talk to an agent by pressing the "0" key. Use the queue ++defined in the Queue menu for agents extensions.
Call, play and Voice Mail Call, ++play the message and then offer to ++leave a message to Voice Mail. The message is left in the mailbox of ++the ++define extension. (see below)
Call ++and Xfer on answer. Call and transfer immediatly ++after the call ++is answered . The call is transfered to the given extension (see below)
Wait ++Time: The time to wait after call ++initiation before ++assuming there was no answer (in secs.)
Extension / Voice Mail: Extension or ++Voice Mailbox to transfer the call ++after the user asks or for the predictive dialer aplplication.
Trunk: Trunk ++to use for outgoing calls (default to SIP ++registration 1)
Max. ++Calls per Trunk: Number of simultaneous calls to ++place on the line.
Send ++Email Report: Send an email report of the results ++at the end of ++the call list. The report is sent using the SMTP server and the email ++destination address define in the System menu
Call Prefix: Some ISPs may ++require to use the "1" for ++long distance ++number.  You can either add it to your phone number list ++ or ++use the 10 digits number and enter the "1" prefix here.
Prompts:: Display if the ++prompts are present. Call and ++select *93 to record these. You can also upload a prompt recorded in ++studio from your system hard drive. Select the prompt displayed in the ++list, then select a file and the click the UploadPrompt button. These ++prompts must be recorded in "Raw muLaw". Contact us if you need help to ++convert your  recordings to the required format.
Activity Traces Display the ++call results. Press the refresh ++button to get a new display.
++
Creating ++a call list

++To create a call list, select the Dialer Sub-Menu under the Asterisk ++menu ++option. You can create up to 9 different lists with different ++features.
++First select the call list number, using the call list List Management ++selection list and the press the "refresh" button to activate it. The ++select and enter the desired parameters and click the SaveDef button to ++save the currently selected call list.

Loading the Call List

++Once the required parameters are selected and the list saved you can ++upload a call list of numbers. This is a ascii text file that contains ++one phone number per line.

Recording
++
The Dialer uses up to four user recorded prompts. These are:
++Intro: ++  This is the first prompt played after the call is answered. ++It should contains a introduction message: Ex: "Hello! Here is a message from ..."
++MainMsg: ++This is the main message you want to be played to the callee.
++Menu: ++This is the menu played after the main message. This should offer to:
++Acknowledge reception of the message. Option "1".
++To repeat the main message. Option "2"
++To hang up. Star Key
++Depending on the application, offer to transfer to an agent or to leave ++a message. Option "0".
++Here is an example of a menu prompt for the "Transfer to extension ++application":

To acknowledge the ++reception of theis message, press "1".
To repeat the ++message, Press "2".
++If you wish to ++talk to one of our agent, press "0".
To hangup, press ++the start key.
++
Bye: ++This is the parting prompt: Ex: "Thank you for listening to this ++message. Goodbye !"

++You can record these message by calling the system from any extension ++and selection *93. Select the Call List Number, then the prompt. You ++can playback, record or delete the selected prompt from the selected ++list.

++You can also upload a prompt from your system hard disc. These prompts ++must be recorded in "Raw muLaw" format. Please contact us if you need ++to have some of your recordings converted.

Starting a Campaign

++Once a call list has been defined, the call list uploaded and the ++prompts ++recorded it is ready to be used. To start calling the numbers, press ++the "Start" button. You can pause an ongoing call list by pressing the ++:Stop" button and resume it by pressing the "Resume" button.

++You can have a refreshed display of the Call Activity by pressing the ++"Refresh" button.
++A line will be displayed when a call is sent in the queue and at the ++end of the call, the result, acknowledge status and ++duration of the ++call (if answered).
++Once the call list is terminated and all call have finished, a summary ++of the campaign will be displayed and sent to the manager by  ++email ++if  this option has been selected for this call list.
++
Webcall Form
++

The ++WebCall form is displayed on your site and is used to transmit the ++call request to the MARS system.  This form can be used in any ++WWW page to send a command to your MARS system to initiate an outbound ++call in between the given extension to the user entered phone number.
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Here is the HTML code form the WebCall form ++shown on the right.
++A HTML table is used for better control of the presentation.
++Note: For more clarity the style codes have been omitted. You can copy ++the whole form HTML code from the textarea box below.

++
++ ++ ++ ++ ++ ++ ++
Call Me Now  !
First Name
Last Name
Company
Email
Area Code + ++Tel.No.
(10 digits)
++Ex: 5145551212

++
<form  name="NetCall" ++enctype="application/x-www-form-urlencoded" method="post"
++ action="http://<YOUR_MARS_URL>:32345/cgi-bin/webcall.sh">
<table border="0" ++cellpadding="1" cellspacing="1">
++<tbody><tr align="center">
++<td colspan="2">Appelez ++Moi !</td></tr>
<tr><th>Pr&eacute;nom</th>
++<td><input ++ maxlength="15" size="15" ++name="FirstName"></td></tr>
<tr><th>Nom</th>
++<td><input ++ maxlength="15" size="15" ++name="LastName"></td></tr>
<tr><th>Compagnie</th>
++<td><input ++maxlength="32" size="15" name="Company"></td></tr>
<tr><th>Courriel</th>
++<td><input ++maxlength="31" size="15" name="Email"></td></tr>
<tr><th>Code Reg. +++ Tel.No.(10 chiffres) Ex: 5145551212</th>
++<td> <input ++ maxlength="10"  size="10" ++name="TelNo"></td></tr>
<tr><td  colspan="2"></td></tr>
++<tr><td  ++colspan="2">
<input ++ name="AccountNo" ++value="200" type="hidden">
<input ++ name="Language" value="F" type="hidden">
<input ++name="Submit" value="Call Me Now !" type="submit">
++</td></tr>
++<tr><td ++style="background-color: rgb(0, 0, 153);" ++colspan="2"></td></tr>
++</tbody></table>
++</form>

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Explanation of the WebCall form fields
Field NameType
action: FormM URL ++of the WebCall server. Insert the domain name (or dyndns domain) of ++your MARS system. Exemple:
action="http://<YOUR_MARS_URL>:32345/cgi-bin/webcall.sh">
++Ex: action="http://mars.dyndns.org:32345/cgi-bin/webcall.sh" ++ (mandatory) ++
FirstName TextF Text type ++field. Max length 15 ++chars (facultative)
LastNameTextF Text type ++field. Max length 15 ++chars (facultative)
EmailTextF Text type ++field. Max length 32 chars ++(facultative)
TelNoTextMText type field.. Must ++be exactly 10 digits ++(mandatory)
AccountNo Text/HiddenM Extension ++used. (200 - 207) Hidden field (mandatory) ++Ex: ++value="200"
LanguageText/HiddenF Language ++of caller. (E ++/ F) ++Default to English ++Hidden field ++(facultative). Ex:value="F"
OnSuccessText/HiddenFURL ++to send the caller on success. This page should inform the the ++user requesting the call about the result of the procedure. This page ++should tell the user that he will shortly receive a call and maybe warn ++him to make sure it's line is available.
.If these fields are not given the user ++will be sent to the URL defined efined in the WebCall configuration ++panel or if not set a basic HTML page with result message will be ++returned.
OnDisabledText/HiddenFURL ++to send the caller when WebCall service has been disabled. This may tell the hours of availability of the service.
OnTelNoErrorText/HiddenFURL ++to send the caller when the TelNo field is not filled properly. (Only ++accepts 10 digits). This should tel the user that the procedure failed because of  an improper phone number has been given.
OnBlackListText/HiddenFURL ++to send the caller when the caller has been black listed. This should ++tell the user that he is not allowed to use the service anymore.
submit submitM Used to ++accept and submit the ++form. "submit" type field (mandatory)


Using WebCall with links .

Instead ++of using a form (and a POST method) you could also use a link ++ with a GET method.
Just create an HTML link with ++the destination phone number and the extension given as parameters.
As ++an example this would call extension 200 and then place an external ++call to 555 555-1212 (assuming your MARS system is at 192.168.1.1 )

<a ++href="http://192.168.1.1:32345/cgi-bin/webcall.sh?AccountNo=200&TelNo=5555551212"> ++Phone to dial </a>

Using ++this technique, the WebCall ++service can also be used as a web based directory  ... Just create ++a page with links to your frequenly  called number,.
You ++could also use a form pointed to your local MARS system (192.168.1.xxx) ++and have an ask for an extension to originate the call from.

Using WebCall from a browser.

Or simply enter the URL in your browser address bar:  http://192.168.1.1:32345/cgi-bin/webcall.sh?AccountNo=200&TelNo=5555551212



++
+\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/.svn/text-base/PhoneSetup_en.html.svn-base b/feeds/xwrt/webif-asterisk/.svn/text-base/PhoneSetup_en.html.svn-base +new file mode 100644 +index 0000000..9a434d3 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/text-base/PhoneSetup_en.html.svn-base +@@ -0,0 +1,381 @@ ++ ++ ++MARS: User's Manual ++ ++ ++ ++

++
MARS
++A small hybrid PBX embedded in a WI-FI router.
Setup for ++GrandStream BT-200 Phone
Setup for X-Lite Softphone
Basic ++Settings
++
These instructions are for a GrandStream BT-200 but should be similar with any other GrandStream VoIP phone.

1- Connect your VoIP phone to one LAN port of the MARS system

2- Find the current IP Address of the phone, using the phone menu.

3- ++Point your browser to this IP address to get the GS phone's HTTP ++interface. (The default pwd is: admin) and select the "Basic Settings" ++Tab.

4- Set the telephone to use a static IP address.   ++(For simplicity, i like to use a static IP which ends with the ++extension number in the Local LAN. Ex: 192.168.1.200 for ext 200. This ++makes getting to the GS HTTP interface easier as it has a fixed IP ++address which allow to conveniently create bookmark in your browser to ++get to the GS phone interface.)
IP Address: 192.168.1.200
Subnet Mask: 255.255.255.0
Default Router: 192.168.1.1 (MARS' system LAN IP address)
DNS Server 1: 192.168.1.1 (MARS' system LAN IP address)

5-Set your TimeZone

6- Device ++Mode: Switch and save the configuration by pressing the "Update" button

7- Select the Advanced Settings Tab, and set the "Local RTP Port" ++to a value from 10000 to 10016. Each phone should be assigned a ++different RTP port with a separation of 2 port. I.e. Ext 200 uses RTP ++port 10000. Ext 201 uses 10002 ext 202 uses 10004 etc ... This step is ++not really required unless you plan to connect trough a NAT. In the ++default configuration, MARS' firewall "opens" port 10000 to 10128.

8- Save and update you changes by pressing the "Update" button

9- Select the "Account Tab" and set the following value (This example is for extension 200)
Account Name: <User Name>
SIP ++Server: 192.168.1.1 (MARS' system LAN IP address)
Sip User ID: 200 (Extension number)
Authenticate ID: 200 (Extension number)
Authenticate ++Password: 200 (Extension number)

Voice ++Mail UserID: *98
Send ++DTMF:  via RTP (RFC2833) ++
Enable ++Call Features: No
Preferred ++Vocoder: 1-PCMU  2-GSM

10- Save and update you changes by pressing the "Update" button

After this step the GS phone should register with the MARS system and be ready to use.
Try calling *77 (Send) .. the system should say the extension number.
Call 7777 (Send or #) to simulate an incoming call (Automated attendant ...)
See the user Manual for more options.
NOTE: The first call to the system will take up to 5 seconds to be answered. The next calls will then be answered immediately.
++
++ ++
Grandstream Device ++Configuration
++ ++ ++
STATUSBASIC ++SETTINGSADVANCED ++SETTINGSACCOUNT ++
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
End ++User Password:   (purposely not displayed ++for security protection)
IP Address: ++
++
dynamically ++assigned via DHCP (default) or PPPoE
(will attempt PPPoE if ++DHCP fails and following is non-blank)
++ ++ ++ ++ ++ ++
 PPPoE account ID:
 PPPoE password:
  Host ++name
(Option 12):
  Domain ++name
(Option 15):
  Vendor ++Class ID
(Option 60):
++ Preferred DNS server: . . ++.
statically configured ++as:
++ ++ ++ ++ ++ ++ ++ ++
      IP Address:  (*1)   . ++. . ++
      Subnet Mask:   . ++. .
      Default Router: (*2)   . ++. .
      DNS Server 1:(*2) ++   ++. ++. .
      DNS Server 2:   . ++. .
Time ++Zone:   ++
  Allow DHCP Option 2 to override Time Zone ++setting:
    No ++    Yes
Daylight ++Savings Time:   No ++     Yes  
++ Optional Rule:
Date ++Display Format:   Year-Month-Day
++  Month-Day-Year
++  Day-Month-Year ++
Display ++Account Name
instead of Date: 		  ++ No      Yes
 
System Device Mode
Device ++Mode:   ++Switch ++(default) NAT/Router ++     ++
 
NAT/Router Configuration ++(Not used ...)
 
WAN ++side http access:   No      Yes ++  (WAN side access to http server will be rejected if set to ++No)
Reply ++to ICMP on WAN port:   No      Yes ++  (Unit will not respond to PING from WAN side if set to No)
Cloned ++WAN MAC Addr:     ++      ++  (in hex format)
LAN Subnet Mask:   (default ++is 255.255.255.0)
LAN DHCP Base IP:   (base IP ++for the LAN port, default is 192.168.2.1)
DHCP IP Lease Time:   (in units ++of hours, default is 120 hours or 5 days)
DMZ IP:   ++
Port Forwarding:     WAN port ++   LAN IP ++           LAN ++port   Protocol
++      ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
   ++   ++
All Rights ++Reserved Grandstream Networks, Inc. 2004-2006


(*1) ++ Set to 192.168.1.Ext ++. Ex: 192.168.1.200 for extension 200, 192.168.1.201 for ext. 201 etc.
(*2) ++ Set to the LAN IP address of the MARS system (default ++192.168.1.1)
Advanced ++Settings
++
local ++RTP port:   (1024-65535, default 5004) Select from 10000 to ++10016
Use ++random port:   No      Yes
Account 
++
++ ++
Grandstream Device ++Configuration
++ ++ ++ ++
STATUSBASIC ++SETTINGSADVANCED ++SETTINGSACCOUNT ++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

Account Name:   (e.g., ++MyCompany)
SIP ++Server:   (e.g., sip.mycompany.com, or ++IP address) MARS IP ++
Outbound ++Proxy:   (e.g., proxy.myprovider.com, or IP address, if ++any)
SIP ++User ID:   ++(the user part of an SIP address)
Authenticate ID:   (can be identical to or ++different from SIP User ID)
Authenticate ++Password:   ++(purposely not displayed for security protection)
Name:   ++(optional, e.g., John Doe)
Use DNS SRV:   ++ ++No      Yes
User ++ID is phone number:    No       Yes
SIP ++Registration:    No ++      Yes
Unregister ++On Reboot:    No       Yes
Register ++Expiration:   (in minutes. default 1 hour, max 45 days)
local ++SIP port:   (default 5060)
SIP T1 ++Timeout:  
SIP ++T2 Interval:  
NAT ++Traversal (STUN):   No     No, but ++send keep-alive     Yes
SUBSCRIBE ++for MWI:   No ++    Yes ++
Proxy-Require: ++   ++
Voice ++Mail UserID:   (User ID/extension for 3rd party voice mail ++system)
Send ++DTMF:   ++in-audio ++    via RTP (RFC2833) ++    via SIP INFO
Early ++Dial:   No ++      Yes (use "Yes" only if proxy supports 484 ++response)
Dial Plan Prefix:   (this ++prefix string is added to each dialed number)
Enable ++Call Features:   ++ No      Yes (if ++Yes, Call Forwarding & Call-Waiting-Disable are supported ++locally)
Session Expiration:   (in ++seconds. default 180 seconds)
Min-SE: ++   ++(in seconds. default and minimum 90 seconds)
Caller ++Request Timer:    No       Yes ++(Request for timer when making outbound calls)
Callee ++Request Timer:    No       Yes (When ++caller supports timer but did not request one)
Force ++Timer:    No       Yes (Use ++timer even when remote party does not support)
UAC ++Specify Refresher:   UAC ++  ++UAS     Omit (Recommended)
UAS ++Specify Refresher:   UAC   UAS (When UAC did not specify ++refresher tag)
Force INVITE:    No ++      Yes (Always refresh with ++INVITE instead of UPDATE)
Enable ++100rel:    No       Yes
Account ++Ring Tone:   system ring ++tone
  custom ring tone 1
  custom ring ++tone 2
  custom ring tone 3
++
Send Anonymous:   No ++     Yes   (caller ID will be blocked if ++set to Yes)
Anonymous Method:   Use From Header ++     Use Privacy Header  
Auto ++Answer:   No      Yes ++ 
Allow Auto Answer by Call-Info: ++   No    ++  Yes  
Turn ++off speaker on
remote disconnect: 		  ++ No      Yes ++ 
Check SIP User ID
for ++incoming INVITE: 		  No      Yes ++ 
Preferred ++Vocoder:
(in listed order)
choice ++1:   ++
choice 2: ++  ++
choice 3:   ++
choice 4:   ++		 choice 5:   ++
choice 6:   ++
choice 7:   ++
choice 8:   ++
SRTP ++Mode:   Disabled      Enabled ++but not forced       Enabled and forced   ++
Special Feature:   ++

   ++  
All Rights ++Reserved Grandstream Networks, Inc. 2004-2006
X-Lite Softphone Setup
These instructions are for X-Lite V3 but the setup is similar for most other software phones.

1- Right click on the display and select "Sip Account Setting"
2- Select add to create a new SIP account and enter the following values (This example is for extension 200):

Account:
Display Name:  <Phone's user name>
User Name: 200
Password: 200
Domain: 192.168.1.1

3- Press the Apply button and exit ...

X-lite should now connect to the MARS system.

+\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/.svn/text-base/UserManual_en.html.svn-base b/feeds/xwrt/webif-asterisk/.svn/text-base/UserManual_en.html.svn-base +new file mode 100644 +index 0000000..19aa609 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/text-base/UserManual_en.html.svn-base +@@ -0,0 +1,967 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ MARS: User's Manual ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

++ ++
MARS
++ ++A small hybrid PBX embedded in a WI-FI router.
++ ++User Manual

++ ++

++ ++ 1- Place a call
++ ++ ++
General rules
++ ++Internal calls (inter extensions)
++ ++Local calls
++ ++Long distance calls
++ ++International calls
++Placing a call using another system lines
++ ++
++ ++
++ ++ 2- Call Transfers
++ ++ ++
Supervised transfer
++ ++Blind transfer
++ ++Call parking.
++ ++
++ ++ 3- Functions
++ ++
++ ++ 4- Automated attendant
++ ++ ++ ++
Recording the menus
++ ++
++ ++ 5- Voice Mail
++ ++
++ ++ 6- WebCall
++ ++
++ ++ 7- Cell to VoIP gateway
++ ++
++ ++
Place a call

++ ++ General rules
++ ++
++ ++ ++
As a general rule, when dialing ++an external number you must always dial "9"  first, followed by the ++telephone number.
++ ++Most of the entries needs to be terminated either by using the '#"' (pound) key or by pressing ++the telephone's 'Send' button.
++ ++
++ ++
++ ++ Internal calls ++ ++
To call an internal extension, ++simply dial the 3 digits extension and terminate with the '#' key (or ++press the send button) Ex: 201#
++ ++
++ ++ External calls
++ ++ ++
To ++place an external call from an extension, you must first dial the '9' ++to get an external line, followed by the full 10 digits telephone ++number you  wish to reach and terminate with the '#' key (or ++'Send'). Ex:  9 5145551212 #. ++ 
++ ++
++ ++You ++can also place a call within you own area code  (as defined ++in the configuration)  by omitting the area code and dialing the ++number  as a 7 digits number. For instance, if you dial 9 5551212 # the system will insert ++ your area code in front of the number before placing the call.
++ ++
++ ++If you hear a fast busy tone, it means that all external lines are busy.
++ ++
++ ++
++ ++ Long distance calls
++ ++ ++
The ++best way to place a long distance call is to dial it as a local call, ++that is, as a 10 digits number, without pre pending a "1" in front of ++the number.
++ ++Ex:  9 4185551212 #. The ++system will then use it's database of local prefixes to determinate if ++the call is local or long distance and will route the call accordingly.
++ ++
++ ++
++ ++ Tool free calls
++ ++ ++
To call a 'tool free' number, ++ using the 800,  866, ++877, 888 prefixes,  you can enter or not the "1" ++prefix.  That is you can dial "9 ++1800 5551212 #" or "9 ++8005551212 #". The system will recognize the 'tool free' number ++and use the PSTN line in priority.
++ ++.
++ ++
++ ++ International calls
++ ++ ++
For the international calls, you ++must dial the 011 prefix as usual. Ex:  "9 011 46701234567 #".
++ ++
++ ++
++ ++ Force PSTN call
++ ++ ++
You can force a call to use the ++conventional line (PSTN) by using the prefix "8" rather than the "9". ++For example,  8 5145551212 #.
++ ++ For a long distance call you must then use the "1" prefix ++as in: Ex: 8 1 418 5551212 #. ++The "8" prefix indicate to use only the PSTN line.
++
++
++ ++ Force VoIP Call.
++
You can also tell the system to use a VoIP line exclusively by using the "7" prefix instead of the "9". For instance: : 7 5145551212 #.
++ For a long distance call, you must not enter the "1" prefix.  Ex: 7 4185551212 #. The "7" prefix indicate to the system to use a VoIP line only.
++
++
++ Place a call using the lines of another system.
++ ++
When ++MARS system are interconnected,  it makes possible to use the ++external line of a remote system to place a call. For instance the ++extension "200" on a system A in a given area code can place a call ++using the external lines of system B located in a different area code. ++To use a remore server's lines to place a call, preoend the 10 digits ++telephone number you wish to cal with " * <Server No>" (start followed by the server number (1-4), rather than the usual "9" prefix. For instance, call " *2 418 5551212 # " ++to dial the given number on server # 2 (Ext: 300-303) from an extension ++on server # 1 (Ext: 200-203).  In the other direction, call ++ " *1 514 5551212 # " from an extension on system # 2 (Ex: 300) to use a line on server #1 to place the call.
++
++
++ ++ ++
Call Transfers

++ ++After ++receiving a call, it is very easy to transfer the call to another ++extension or even to an external number. The system offers two modes of ++call transfers. The "supervised" transfer and the "non supervised" or ++"blind" transfer.
++ ++
++ ++ Supervised transfer.
++ ++ ++
After having answered the call, ++enter the sequence   " * ++0 " (star followed by zero).. ++You will then hear "Transfer". Dial the 3 digits number of the ++extension you wish to transfer the call to. Example: 201. You can then ++talk with your colleague to announce the call transfer. After you ++hang-up, the caller will immediately be connected.
++ ++Note: The "Transfer Key" of your telephone can only be used to do a ++"blind" call transfer. (See below.)
++ ++
++ ++
++ ++ Blind transfer
++ ++ ++
For a blind transfer, enter ++the sequence: " # 0 " ++(pound followed by zero) ++(or use the "Transfer" key on your telephone.) and enter the 3 digits ++number of the extension  you wish to transfer the call to. ++ Contrary to the supervised transfer, you will be disconnected ++immediately and the caller will be connected to the destination ++extension, without allowing you to talk to the the person at the ++destination extension.
++ ++
++ ++
++ ++ External transfer
++ ++ ++
To ++transfer an incoming call to an external transfer, proceed as explained ++above with the "# 0" or "* 0" sequence and enter the "9" followed by ++the 10 digits external number and terminate with "#" (or send). ++Example: ++ 9 514555 1212 #.
++ ++
++ ++
++ ++ Call parking
++ ++ ++
Rather than transferring a call, ++it can sometimes be useful to "Park" the call and retrieve it from a ++different extension.
++ ++To "park" a call, do a supervised call transfer (as explained above) to ++the extension number "700". ++The system will then tell you the extension number to be used to ++retrieve the call from any other extension. (Usually "701"). To get the parked call back, ++ enter the parked extension number (701) followed by the pound key ++("#"). Ex: 701#
++ ++
++ ++
++ ++
++ ++
Features / Functions

++ ++Here is a list of the features accessible from all ++connected extensions.
++ ++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Unconditional Call Transfer (cancellation) *70Call this to cancel unconditional call transfer
Unconditional Call Transfer (activation) *71Activates Unconditional Call Transfer to the given ++extension or external phone number.
Call Transfer on Busy (cancellation) *72Cancellation of the Call Transfer on Busy
Call Transfer on Busy (activation) *73Activation of the call transfer when your extension is ++busy.
Do Not Disturb (cancellation) *74Cancellation of the "Do Not Disturb" feature
Do Not Disturb (activation) *75Activation of the Cancellation of the "Do Not Disturb" ++feature. Call directed to the voice mail.
Clock *76
++ ++
Extension  *77Give the extension number you are calling from (test)
Echo Test *78Replay what you say in real time.
Automated Attendant (Activation) *80Activation of the Automated Attendant (default)
Automated Attendant (Deactivation) *81Deactivation of the Automated Attendant. Calls are ++directed to the call queue or to the manager extension according to the ++configuration.
WebCall ++(Activation) *82WebCall available (default)
WebCall ++(Deactivation) *83WebCall not available. Users will receive a message ++saying that the service is not currently available.
Temporary unavailable (Cancellation) *84Deactivation 
Temporary unavailable  (activation) *85Send all calls to the manager voice mailbox, until ++deactivated.
Web Audio *88Enter the 3 digits program number or "000" to get the ++list by email.
Status AA, WebCall and TA *89Give the status of the automated attendant, WebCall and ++the "Temporarily Unavailable" .
Welcome message recording. *90Allows to record your personalized Automated ++Attendant's  "Welcome" message.
Main Menu recording (default language) *91Allows to record the AA main menu in the main language
Main Menu recording (second language) *92Allows to record the AA main menu in the second ++language (if used).
Voice Mailbox access  *98Direct access to the extension's Voice Mailbox .
Any Voice Mailbox access  *99Access to the given mailbox number. (Ask mailbox ++(extension) number and Pwd).
Cell to VoIP gateway access. 5555Access to the Cell to VoIP gateway. Enter the access ++code and then the number to dial.
Simulate an external incoming call   7777For tests.
Simulate a call on a remote system777(1-4)Simulate an external call on a remote system. The last digit is the server number (1 - 4)
++ ++ 
++ ++
Automated Attendant

++ ++The ++Automated Attendant allows an incoming call to be directed according to ++the caller selection from a vocal menu. You can record your own ++personalized welcome message by calling the system and entering "*90" , the main menu in the default ++language can be recorded using "*91" ++and finally the main menu in the second language using "*92".
++ ++
++ ++ Welcome Message
++ ++
++ ++ This ++message is used to greet the caller and, if desired, to let him to ++access the service in the second language. If you want to offer a ++choice of language for the service, this message should be ++bilingual and offer the second language by pressing the "9" key. Here ++is an example for a bilingual system with English as the default ++language:
++ ++
++ ++ Thank you for calling Tele ++Data, Merci d'appeller Tele Data, Pour un service en ++Français, faite le "9".
++ ++ Or with French as the ++default language:
++ ++ "Merci d'appeller Tele Data, ++thank you for calling Tele Data. For a service in English, please press ++"9".
++ ++For an unilingual system, record only the first sentence (omit the ++language choice).
++ ++
++ ++If the caller select the second language by pressing "9", the main menu ++will be said using the second language.
++ ++
++ ++ Main Menu
++ ++
++ ++This ++menu allows the caller to either enter a known extension number or ++select the destination by number using a menu. Here is an example.
++ ++
++ ++ If you know your party's ++extension, enter it now.
++ ++ For the sales department, press ++"1".
++ ++ For accounting, press "2".
++ ++ For technical support, ++press  "3".
++ ++ For human resources, press "4".
++ ++ ... or stay online to ++reach an operator.
++ ++
++ ++ If your system is bilingual, you will have to record the ++main menu in both languages.
++ ++
++ ++Selecting ++"1" on the main menu will direct the call to the first extension ++(Usually 200), "2" will go to the 2nd (201), "3" to the "3th" (202) and ++"4" to the 4th extension (203). If the caller does not select a ++destination after the given time, the call will be directed to the ++manager or first extension (200).
++ ++
++ ++If the call is not answered ++within 20 seconds, the caller will be invited to leave a voice mail ++message in the mailbox of the contacted extension.
++ ++
++ ++
Voice Mail

++ ++Each ++extension has their voice mail mailbox in the system.  The ++mailbox number is the same as the extension. The mailbox can be ++accessed by using "*98", ++the access code is by default the same of the extension number (i.e. ++Ext. 200 has mailbox 200 with default pwd 200)
++ ++
++ ++Function "*99" ++allows to access a mailbox different than the current extension. The ++system will then ask for the mailbox (extension) number and password.
++ ++
++ ++All ++voice mails received in all mailboxes will get immediately sent by ++email ++at the email address given in the extension configuration panel. ++ The voice messages will be sent by email as an audio attachment. ++The audio file format is WAV (MS GSM6.10) and can be played on any ++Windows system by simply double clicking on the audio message ++attachment. The MS GSM6.10 format is handled automatically on mostly ++all Windows versions.
++ ++
++ ++
WebCall

++ ++The ++WebCall service allows visitors of your WWW site to request a call by ++simply entering their telephone number in a form on your site and ++pressing the "Call Me Now" button.  The call request is received ++by the MARS system which will then call the given extension (specified ++as a hidden field in the form) , notify the agent of the WebCall ++request and then call the visitor at the given phone number and finally ++establish the communication with the agent (extension)
++ ++
++ ++The agent (extension) can then handle the call as if they would have ++called the visitor. For instance, Hello, ++Here is Paul from Acme Inc. you have requested a call ... ?
++ ++
++ ++ WebCall User's Data
++ ++
++ ++Once ++the visitor of your WWW site press the "Call Me Now !" button, the ++system will receive the call request and the data entered by the user ++and make it available from your browser at the following URL: http://<MARS IP ++ Address>/calldata.html  For example: http://192.168.1.1/calldata.html  By ++pointing your browser to this URL, you will have immediately access to ++the data entered by tour visitor, even before the beginning of the call.
++ ++
++ ++The ++easiest and quickest way to access the WebCall data is to create a link ++on your PCs desktop to the page mentioned above. This way you will have ++access to the information as soon as you are notified of the request.
++ ++
++ ++ Black List
++ ++
++ ++The ++"Black List" allows to block the request of a user that would abuse the ++system. To add an user to the list, simply click on the "Add To Black ++List" button on the call data display (see above). The telephone number ++and the IP address will be memorized and the user will be notified that ++he is not allowed to use the service on any future call request.
++ ++
++ ++ Activation / Deactivation
++ ++ The ++WebCall service is active by default, that is, it is ready to receive a ++call request from a form on your WWW site. You can deactivate the ++service by using the "*83" ++sequence and activate it using "*82". ++When the service is deactivated, the users will be warned that the ++service is currently unavailable.
++ ++
++ ++
Cell to VoIP ++gateway

++ ++MARS ++also supply a gateway to allow a mobile phone user (cell) to place long ++distance call from using the system's VoIP line. Just call the system ++on the conventional line and enter the "extension" 5555 followed by ++the gateway's password (as defined in the system config.). From ++then on you can dial the 10 digits phone number of the number you wish ++to call. Do not enter the "9"  nor the "1" prefix for long ++distance.
++ ++
++ ++The system will use the VoIP line to place the cal and voilà ! A ++long distance call from your mobile at VoIP cost !
++ ++
++ ++
Web Audio

++ ++Web ++Audio offers hundreds of quality audio archive program. You can access ++this function by dialing "*88". The system will then ask for the 3 ++digits program number. The system will then download the audio program ++and will play it for you. The required time for the download will vary ++depending on the duration of the program and will usually be of a few ++seconds up to about 30 - 45 seconds for a one hour program.
++ ++
++ ++While ++playing, you can forward one minute by pressing the "6" key ++or rewind one minute by pressing "4". You can also pause and ++restart the playback by pressing "5" or interrupt it and go back to the ++program menu by pressing the "#" key.
++ ++
++ ++Program list
++ ++
++ ++You ++can receive the program list and their 3 digits codes by email by ++entering "000" as the program number. The system will then send the ++list at the manager email address (extension 200).
++ ++
++ ++ Among our favorites:
++ ++
++ ++Hell's Bell's A radio history of the telephone. Excellent ! 8 episodes ++of 30 mins each.  Progr: 201 ++à 208
++ ++Jim Lowell, Apollo 13. An interview with Apollo 13 mission's ++commandant" from "Tech Nations"  Progr: 505
++ ++Science is NOT funny : "Dr. Science" and "Saint-Silicon" Interview with ++humorists Progr: 559
++ ++ ++ ++ 
Bram Stroker: Dracula (excerpts) Part 1: (700) Part 2: (701) Part 3 (702)
++ ++
++ ++
++ ++ ++ +diff --git a/feeds/xwrt/webif-asterisk/.svn/text-base/packages.txt.svn-base b/feeds/xwrt/webif-asterisk/.svn/text-base/packages.txt.svn-base +new file mode 100644 +index 0000000..e0aa503 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/text-base/packages.txt.svn-base +@@ -0,0 +1,55 @@ ++Installed Packages ++ ++ASUS WL-500G Premium ++ ++Action Package Version Description ++Uninstall asterisk14 1.4.11-1 ++Uninstall asterisk14-format-mp3 1.4.7-1 ++Uninstall asterisk14-res-agi 1.4.11-1 ++Uninstall asterisk14-voicemail 1.4.11-1 ++Uninstall base-files-brcm-2.4 10-12557 ++Uninstall bridge 1.0.6-1 ++Uninstall busybox 1.4.2-2 ++Uninstall dnsmasq 2.39-1 ++Uninstall dropbear 0.50-2 ++Uninstall e2fsprogs 1.39-1 ++Uninstall fdisk 2.12r-2 ++Uninstall haserl 0.8.0-2 ++Uninstall iptables 1.3.7-1 ++Uninstall kernel 2.4.34-brcm-1 ++Uninstall kmod-brcm-wl 2.4.34+4.80.53.0-1 ++Uninstall kmod-diag 2+2.4.34-brcm-1 ++Uninstall kmod-fs-ext2 2.4.34-brcm-1 ++Uninstall kmod-fs-msdos 2.4.34-brcm-1 ++Uninstall kmod-fs-vfat 2.4.34-brcm-1 ++Uninstall kmod-ipt-nathelper 2.4.34-brcm-1 ++Uninstall kmod-ppp 2.4.34-brcm-1 ++Uninstall kmod-pppoe 2.4.34-brcm-1 ++Uninstall kmod-scsi-core 2.4.34-brcm-1 ++Uninstall kmod-switch 2.4.34-brcm-1 ++Uninstall kmod-usb-core 2.4.34-brcm-1 ++Uninstall kmod-usb-storage 2.4.34-brcm-1 ++Uninstall kmod-usb-uhci 2.4.34-brcm-1 ++Uninstall kmod-usb2 2.4.34-brcm-1 ++Uninstall kmod-wlcompat 2.4.34+brcm-6 ++Uninstall libgcc 3.4.6-10 ++Uninstall libltdl 1.5.22-1 ++Uninstall libncurses 5.6-1 ++Uninstall libopenssl 0.9.8e-1 ++Uninstall libpopt 1.7-4 ++Uninstall libpthread 0.9.28-10 ++Uninstall libuuid 1.39-1 ++Uninstall mtd 5 ++Uninstall ntpclient 2003_194-4 ++Uninstall nvram 1 ++Uninstall openssl-util 0.9.8e-1 ++Uninstall ppp 2.4.3-8 ++Uninstall ppp-mod-pppoe 2.4.3-8 ++Uninstall ssmtp 2.61-2 ++Uninstall uclibc 0.9.28-10 ++Uninstall webif 0.3-12 ++Uninstall wget-nossl 1.10.2-2 ++Uninstall wireless-tools 29-1 ++Uninstall wlc 4.80.53.0-1 ++Uninstall wput 0.5-1 ++Uninstall zlib 1.2.3-4 +\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/.svn/text-base/readme.txt.svn-base b/feeds/xwrt/webif-asterisk/.svn/text-base/readme.txt.svn-base +new file mode 100644 +index 0000000..047fd66 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/text-base/readme.txt.svn-base +@@ -0,0 +1,291 @@ ++MARS: A simple Asterisk GUI for OpenWRT . ++By Noël Bouchard ++Tele Data Inc. 2007-2009 ++Email: mars@teledata.qc.ca ++ +++========================================================+ ++ ++Installation ++ ++Backup ++Upload the compressed file to the root directory of the target system ++and decompress using: ++ ++tar -czvf files.tar.gz ++tar -xzvf mars.tar.gz ++ ++See the 'File content' section below for details. ++ ++- Asterisk Menu ++ ++The file /www/cgi-bin/webif/.categories needs to be edited so that the ++Asterisk menu shows on the WebIf menu ++ ++##WEBIF:category:- ++##WEBIF:category:Asterisk ++ ++- Asterisk auto start ++ ++The file /etc/init.d/asterisk contains asterisk startup script. ++To have asterisk start on reboot add a symbolic link to this file ++to the /etc/rc.d directory: ++ ++cd /etc/rc.d ++ln -s /etc/init.d/asterisk /etc/rc.d/S80asterisk ++ ++- External Storage ++ ++The scripts assume that the asterisk sounds and music on hold ++file as weel as the voicemail storage will be on an extenal directory. ++These are assume to be in the external directory: /mnt/disc0_1/asterisk ++ ++the following symbolic link in /usr/lib/asterisk are used ++ ++ln -s /mnt/disc0_1/asterisk/moh-native /usr/lib/asterisk/moh-native ++ln -s /mnt/disc0_1/asterisk/sounds /usr/lib/asterisk/sounds ++ln -s /mnt/disc0_1/asterisk/voicemail /var/spool/asterisk/voicemail ++ ++You may need to modifiy the /etc/init.d/asterisk startup script and the symbolic links ++if you use a different location. ++ +++========================================================+ ++ ++Startup ++ ++The configuration is read from the uci config file (/etc/config/mars) ++to asterisk global variable. The config can be loaded from the command line ++after asterisk has started by issuing the following command. ++ ++asterisk -rx 'originate Local/#16 extension ++ ++This will execute the folowing dialplan code: ++ ++exten => #16,1,Set(NVRAM_READ=FALSE) ++exten => #16,n,NoCDR(); ++exten => #16,n,Macro(get-config-file) ++exten => #16,n,Hangup() ++ ++[macro-get-config-file] ++; Call an agi to read and copy the config to global variable ++exten => s,1,AGI(get_config_file.sh) ++exten => s,n,SetGlobalVar(NVRAM_READ=TRUE) ++ +++========================================================+ ++ ++DialPlan ++ +++========================================================+ ++ ++WebCall ++ ++This feature allows to initiate a call from a given extension to an external ++phone number using a HTML form on any Web Site ++ ++ ++Modification to /etc/init.d/httpd ++ ++WebCallEnabled=$(uci get mars.webcall.AST_WebCallEnabled) ++if [ "$WebCallEnabled" = "1" ]; then ++ httpd -p 32345 -h /www/webcall -r MARS ++fi ++ +++========================================================+ ++ ++Warranty ++ +++========================================================+ ++ ++Asterisk modules needed ++ ++app_cdr.so ++app_chanisavail.so ++app_controlplayback.so ++app_db.so ++app_dial.so ++app_echo.so ++app_exec.so ++app_hasnewvoicemail.so ++app_macro.so ++app_mixmonitor.so ++app_playback.so ++app_queue.so ++app_read.so ++app_record.so ++app_sayunixtime.so ++app_setcallerid.so ++app_setcdruserfield.so ++app_stack.so ++app_system.so ++app_transfer.so ++app_userevent.so ++app_verbose.so ++app_voicemail.so ++cdr_csv.so ++cdr_manager.so ++chan_iax2.so ++chan_local.so ++chan_sip.so ++codec_a_mu.so ++codec_gsm.so ++codec_ulaw.so ++format_g729.so ++format_gsm.so ++format_pcm.so ++format_sln.so ++ormat_wav.so ++format_wav_gsm.so ++func_callerid.so ++func_cdr.so ++func_channel.so ++func_cut.so ++func_db.so ++func_env.so ++func_global.so ++func_groupcount.so ++func_language.so ++func_logic.so ++func_math.so ++func_md5.so ++func_moh.so ++func_realtime.so ++func_strings.so ++func_timeout.so ++pbx_config.so ++pbx_spool.so ++res_adsi.so ++res_agi.so ++res_clioriginate.so ++res_convert.so ++res_features.so ++res_indications.so ++res_monitor.so ++res_musiconhold.so ++ ++Note: This list may include module that will not be used +++========================================================+ ++ ++File content: ++ ++readme.txt : This file ++ ++/etc ++ ++These are asterisk configuration files that were modified ++for the MARS system ++ ++/etc/asterisk/asterisk.conf ++/etc/asterisk/cdr.conf ++/etc/asterisk/cdr_manager.conf ++/etc/asterisk/extensions.conf : This is the dialplan ++/etc/asterisk/features.conf ++/etc/asterisk/http.conf : Modified for the WebCall feature ++/etc/asterisk/iax.conf ++/etc/asterisk/logger.conf ++/etc/asterisk/manager.conf ++/etc/asterisk/modules.conf ++/etc/asterisk/musiconhold.conf ++/etc/asterisk/queues.conf ++/etc/asterisk/rtp.conf ++/etc/asterisk/sip.conf ++/etc/asterisk/users.conf ++/etc/asterisk/voicemail.conf ++ ++/etc/config/mars : The mars uci config file ++ ++/etc/init.d/asterisk : Modified asterisk startup script ++/etc/init.d/httpd : modified httpd startup script ++ ++/usr ++ ++These are agi scripts and example WebAudio list file ++ ++/usr/lib/asterisk/agi-bin/get_config_file.sh : get config from UCI file to asterisk Global Vars ++/usr/lib/asterisk/agi-bin/getlocalprefixes.sh ++/usr/lib/asterisk/agi-bin/getnvram.sh ++/usr/lib/asterisk/agi-bin/getnvramvars.sh : get config from nvram to asterisk Global Vars ++/usr/lib/asterisk/agi-bin/islocalprefix.sh : test if a dialed phone no is in local prefix list ++/usr/lib/asterisk/agi-bin/send_wa_dir.sh : email WebAudio directory to admin email ++/usr/lib/asterisk/agi-bin/web_audio.sh : get URL for given program number. ++/usr/lib/asterisk/agi-bin/web_audio.txt : WebAudio program list ++ ++These files are for the status display module ++/usr/lib/asterisk/static-http/asterisk-status.html ++/usr/lib/asterisk/static-http/asterisk-status.js ++/usr/lib/asterisk/static-http/astman.css ++/usr/lib/asterisk/static-http/astman.js ++/usr/lib/asterisk/static-http/floating_window_with_tabs.css ++/usr/lib/asterisk/static-http/floating_window_with_tabs.js ++/usr/lib/asterisk/static-http/floating_window_with_tabs-skin2.css ++/usr/lib/asterisk/static-http/images ++/usr/lib/asterisk/static-http/prototype.js ++/usr/lib/asterisk/static-http/setup.css ++/usr/lib/asterisk/static-http/images/bg_pgns.gif ++/usr/lib/asterisk/static-http/images/digiumlogo.gif ++/usr/lib/asterisk/static-http/images/floating_window_resize.gif ++/usr/lib/asterisk/static-http/images/mod_temp1_02.gif ++/usr/lib/asterisk/static-http/images/mod_temp1_03.gif ++/usr/lib/asterisk/static-http/images/prototype.js ++/usr/lib/asterisk/static-http/images/select_arrow.gif ++/usr/lib/asterisk/static-http/images/select_arrow_down.gif ++/usr/lib/asterisk/static-http/images/select_arrow_over.gif ++/usr/lib/asterisk/static-http/images/setup.css ++/usr/lib/asterisk/static-http/images/skin2_tab_left_active.gif ++/usr/lib/asterisk/static-http/images/skin2_tab_left_inactive.gif ++/usr/lib/asterisk/static-http/images/skin2_tab_right_active.gif ++/usr/lib/asterisk/static-http/images/skin2_tab_right_inactive.gif ++/usr/lib/asterisk/static-http/images/tab_center_active.gif ++/usr/lib/asterisk/static-http/images/tab_left_active.gif ++/usr/lib/asterisk/static-http/images/tab_left_inactive.gif ++/usr/lib/asterisk/static-http/images/tab_right_active.gif ++/usr/lib/asterisk/static-http/images/tab_right_inactive.gif ++/usr/lib/asterisk/static-http/images/TD_LOGO2.gif ++ ++Modified Webif File ++/usr/lib/webif/apply.sh : modified to include mars apply ++/usr/lib/webif/apply-mars.sh : new apply addon ++/usr/lib/webif/form.awk : One modif in header ++Modified to process MARS data on apply ++/usr/lib/webif/webif.sh ++ ++/www ++ ++/www/mars.js : JavaScript used by MARS ++ ++/www/cgi-bin/webcall/webcall_black_list.sh : Black list script for WebCall ++ ++These files implement the asterisk GUI as webif pages. ++/www/cgi-bin/webif/.categories : modified to add asterisk sub-menu ++/www/cgi-bin/webif/ast_functions.sh ++/www/cgi-bin/webif/asterisk-calllog.sh ++/www/cgi-bin/webif/asterisk-editor.sh ++/www/cgi-bin/webif/asterisk-extensions.sh ++/www/cgi-bin/webif/asterisk-management.sh ++/www/cgi-bin/webif/asterisk-servers.sh ++/www/cgi-bin/webif/asterisk-status.sh ++/www/cgi-bin/webif/asterisk-system.sh ++/www/cgi-bin/webif/asterisk-trunks.sh ++/www/cgi-bin/webif/asterisk-webcall.sh ++/www/cgi-bin/webif/get_area_codes.sh ++/www/cgi-bin/webif/parse_asterisk_calls.awk ++/www/cgi-bin/webif/send_call_log.sh ++/www/cgi-bin/webif/send_wrt_log.sh ++ ++Files used by the WebCall feature ++/www/webcall/td_icon.ico ++/www/webcall/cgi-bin/call_template.html ++/www/webcall/cgi-bin/call_template_fr.html ++/www/webcall/cgi-bin/webcall.sh ++/www/webcall/images/talk.jpg ++ +++========================================================+ ++ ++Contact: ++ ++TELE DATA Inc. ++Noel Bouchard ++mars@teledata.qc.ca ++or ++514 723 3987 ++(9-5 EST mon-fri) ++ +++========================================================+ +diff --git a/feeds/xwrt/webif-asterisk/.svn/text-base/sysinfo.txt.svn-base b/feeds/xwrt/webif-asterisk/.svn/text-base/sysinfo.txt.svn-base +new file mode 100644 +index 0000000..7334e9f +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/.svn/text-base/sysinfo.txt.svn-base +@@ -0,0 +1,308 @@ ++MARS by Noel Bouchard, TELE DATA Inc. ++mars@teledata.qc.ca ++ +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++ ++Firmware OpenWrt Kamikaze - With X-Wrt Extensions 7.09 ++Kernel Linux 2.4.34 #94 Tue Sep 9 02:58:48 CDT 2008 ++MAC 00:1D:60:DE:BF:DB ++Device ASUS WL-500g Premium ++Board Broadcom BCM4704 chip rev 9 ++Username root ++ ++Web mgt. console Webif² ++Version r4306 ++ ++MARS MARS V2.2 by TELE DATA Inc. 02/2009 ++Asterisk Asterisk 1.4.11 ++ ++MARS V2.21 by TELE DATA Inc. 02/2009 ++Asterisk 1.4.11 built by micha @ namib on a i686 running Linux on 2007-11-03 11:30:09 UTC ++Linux 2.4.34 #94 Tue Sep 9 02:58:48 CDT 2008 ++ ++system type : Broadcom BCM4704 chip rev 9 ++processor : 0 ++cpu model : BCM3302 V0.6 ++BogoMIPS : 262.96 ++ +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++ ++USB Memory (required) ++ ++/mnt/disc0_1 ++/dev/scsi/host0/bus0/target0/lun0/part1 ++ ++File systems ++Device Path Mount Point File System Read/Write Action ++/dev/scsi/host0/bus0/target0/lun0/part1 /mnt/disc0_1 ext2 Read/Write ++ ++Loaded USB drivers ++hub ++usb-storage ++usbdevfs ++ ++USB Storage SETUP ++ ++1- Create Partition with ++fdisk /dev/scsi/host0/bus0/target0/lun0/disc ++ ++Type 'm' for menu. ++- delete any existing partition 'd' and enter partition number and 'w' to write change. ++- create a new partition 'n' using all space ++- set partition type to 83 (Linux) using the 't' command ++- use the 'w' command to write partition and exit ++ ++ipkg install e2fsprogs ++(ln -s /proc/mounts /etc/mtab) ++ ++'format' partition with the following command ++mke2fs -j /dev/scsi/host0/bus0/target0/lun0/part1 ++ ++mount /dev/scsi/host0/bus0/target0/lun0/part1 /mnt/disc0_1 ++ +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++System info ++ ++Free ++ ++total used free shared buffers ++Mem: 30512 27300 3212 0 1240 ++Swap: 0 0 0 ++Total: 30512 27300 3212 ++ ++ ++df ++ ++Filesystem 1k-blocks Used Available Use% Mounted on ++none 15256 1784 13472 12% /tmp ++/dev/mtdblock/4 6016 5852 164 97% /jffs ++mini_fo:/jffs 1344 1344 0 100% / ++/dev/scsi/host0/bus0/target0/lun0/part1 378951 83216 276170 23% /mnt/disc0_1 ++ ++ ++mount ++ ++rootfs on / type rootfs (rw) ++/dev/root on /rom type squashfs (ro) ++none on /dev type devfs (rw) ++none on /proc type proc (rw) ++none on /tmp type tmpfs (rw,nosuid,nodev) ++none on /dev/pts type devpts (rw) ++/dev/mtdblock/4 on /jffs type jffs2 (rw) ++mini_fo:/jffs on / type mini_fo (rw) ++none on /proc/bus/usb type usbfs (rw) ++/dev/scsi/host0/bus0/target0/lun0/part1 on /mnt/disc0_1 type ext2 (rw) ++ ++ ++ps ++ ++ PID Uid VmSize Stat Command ++ 1 root 400 S init ++ 2 root SW [keventd] ++ 3 root SWN [ksoftirqd_CPU0] ++ 4 root SW [kswapd] ++ 5 root SW [bdflush] ++ 6 root SW [kupdated] ++ 9 root SW [mtdblockd] ++ 54 root SWN [jffs2_gcd_mtd4] ++ 67 root 408 S logger -s -p 6 -t ++ 70 root 404 S init ++ 78 root 392 S /sbin/syslogd -C16 -m 0 ++ 83 root 372 S /sbin/klogd ++ 229 root SW [khubd] ++ 250 root 444 S udhcpc -t 0 -i eth0.1 -b -p /var/run/eth0.1.pid -R ++ 351 root SW [usb-storage-0] ++ 352 root SW [scsi_eh_0] ++ 430 root SW [usb-storage-1] ++ 431 root SW [scsi_eh_1] ++ 451 root 428 S crond -c /etc/crontabs ++ 457 root 416 S /usr/sbin/dropbear -p 22 ++ 465 root 428 S httpd -p 80 -h /www -r OpenWrt ++ 472 root 412 S httpd -p 32345 -h /www/webcall -r MARS ++ 489 nobody 444 S /usr/sbin/dnsmasq -I br-lan --dhcp-range=lan,192.168. ++20138 root 4576 S /usr/sbin/asterisk ++20139 root 4576 S /usr/sbin/asterisk ++20141 root 4576 S /usr/sbin/asterisk ++20142 root 4576 S /usr/sbin/asterisk ++20143 root 4576 S /usr/sbin/asterisk ++20144 root 4576 S /usr/sbin/asterisk ++20145 root 4576 S /usr/sbin/asterisk ++20146 root 4576 S /usr/sbin/asterisk ++20147 root 4576 S /usr/sbin/asterisk ++20148 root 4576 S /usr/sbin/asterisk ++20149 root 4576 S /usr/sbin/asterisk ++20150 root 4576 S /usr/sbin/asterisk ++20151 root 4576 S /usr/sbin/asterisk ++20152 root 4576 S /usr/sbin/asterisk ++20153 root 4576 S /usr/sbin/asterisk ++20154 root 4576 S /usr/sbin/asterisk ++20155 root 4576 S /usr/sbin/asterisk ++20156 root 4576 S /usr/sbin/asterisk ++20157 root 4576 S /usr/sbin/asterisk ++20158 root 4576 S /usr/sbin/asterisk ++20159 root 4576 S /usr/sbin/asterisk ++20212 root 4576 S /usr/sbin/asterisk ++16926 root 576 S /usr/sbin/dropbear -p 22 ++16927 root 468 S -ash ++17189 root 592 S /usr/sbin/dropbear -p 22 ++17190 root 584 S -ash ++17505 root 400 S /bin/sh -c /www/cgi-bin/webif/pid_send_all.sh > /dev/ ++17506 root 464 S /bin/sh /www/cgi-bin/webif/pid_send_all.sh ++17626 root 284 S sleep 1 ++17627 root 472 S httpd -p 80 -h /www -r OpenWrt ++17628 root 252 S /usr/bin/webif-page /www/cgi-bin/webif/test_email.sh ++17629 root 404 S sh -c /usr/bin/haserl /www/cgi-bin/webif/test_email.s ++17630 root 260 S /usr/bin/haserl /www/cgi-bin/webif/test_email.sh ++17631 root 580 S /bin/sh ++17635 root 420 R ps ++ ++ ++Ethernet/Wireless Physical Connections ++ ++IP address HW type Flags HW address Mask Device ++192.168.1.100 0x1 0x2 00:0E:A6:3B:28:9E * br-lan ++192.168.1.1 0x1 0x2 00:18:39:FF:F8:C2 * br-lan ++ ++ ++ ++Routing Table ++ ++Kernel IP routing table ++Destination Gateway Genmask Flags MSS Window irtt Iface ++192.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 br-lan ++0.0.0.0 192.168.1.1 0.0.0.0 UG 0 0 0 br-lan ++ ++ ++ ++Router Listening Ports ++ ++Active Internet connections (only servers) ++Proto Recv-Q Send-Q Local Address Foreign Address State ++tcp 0 0 0.0.0.0:5038 0.0.0.0:* LISTEN ++tcp 0 0 0.0.0.0:80 0.0.0.0:* LISTEN ++tcp 0 0 0.0.0.0:53 0.0.0.0:* LISTEN ++tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN ++tcp 0 0 0.0.0.0:8088 0.0.0.0:* LISTEN ++tcp 0 0 0.0.0.0:32345 0.0.0.0:* LISTEN ++udp 0 0 0.0.0.0:1025 0.0.0.0:* ++udp 0 0 0.0.0.0:53 0.0.0.0:* ++udp 0 0 0.0.0.0:67 0.0.0.0:* ++udp 0 0 0.0.0.0:5060 0.0.0.0:* ++udp 0 0 0.0.0.0:4569 0.0.0.0:* ++ ++ ++ ++Connections to the Router ++ ++Active Internet connections (w/o servers) ++Proto Recv-Q Send-Q Local Address Foreign Address State ++tcp 0 0 192.168.1.10:80 192.168.1.100:1962 TIME_WAIT ++tcp 0 0 192.168.1.10:80 192.168.1.100:1958 TIME_WAIT ++tcp 0 0 192.168.1.10:80 192.168.1.100:1967 ESTABLISHED ++tcp 0 0 192.168.1.10:80 192.168.1.100:1959 TIME_WAIT ++tcp 0 0 192.168.1.10:80 192.168.1.100:1960 TIME_WAIT ++tcp 0 0 192.168.1.10:80 192.168.1.100:1965 TIME_WAIT ++tcp 0 0 192.168.1.10:22 192.168.1.100:1957 ESTABLISHED ++tcp 0 0 192.168.1.10:22 192.168.1.100:1953 ESTABLISHED ++ +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++ ++Modifs to /usr/lib/webif/apply.sh ++ ++ ## MARS config added by NB ++ "mars") ++ echo 'Stopping Asterisk
' ++ /etc/init.d/asterisk stop ++ sleep 2 ++ echo 'Restarting Asterisk
' ++ /etc/init.d/asterisk start ++ ;; +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++ ++Loaded Modules ++Module Size Count Used by ++diag 25520 0 (unused) ++ehci-hcd 20556 0 (unused) ++ext2 40304 1 ++fat 34448 0 [msdos vfat] ++ip_conntrack_ftp 4272 1 ++ip_conntrack_irc 3128 1 ++ip_conntrack_tftp 1712 0 (unused) ++ip_nat_ftp 2960 0 (unused) ++ip_nat_irc 2336 0 (unused) ++msdos 6028 0 (unused) ++ppp_async 7884 0 (unused) ++ppp_generic 22300 0 [ppp_async] ++scsi_mod 66048 3 [usb-storage sd_mod] ++sd_mod 12500 2 ++slhc 6064 0 [ppp_generic] ++switch-core 4864 0 [switch-robo] ++switch-robo 4540 0 (unused) ++uhci 29044 0 (unused) ++usb-storage 68240 1 ++usbcore 71296 1 [usb-storage ehci-hcd uhci] ++vfat 11340 0 (unused) ++wl 630776 0 (unused) ++wlcompat 14944 0 (unused) ++Total 1091104 ++ +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++ ++Installed Packages ++ ++ASUS WL-500G Premium ++ ++Action Package Version Description ++Uninstall asterisk14 1.4.11-1 ++Uninstall asterisk14-format-mp3 1.4.7-1 ++Uninstall asterisk14-res-agi 1.4.11-1 ++Uninstall asterisk14-voicemail 1.4.11-1 ++Uninstall base-files-brcm-2.4 10-12557 ++Uninstall bridge 1.0.6-1 ++Uninstall busybox 1.4.2-2 ++Uninstall dnsmasq 2.39-1 ++Uninstall dropbear 0.50-2 ++Uninstall e2fsprogs 1.39-1 ++Uninstall fdisk 2.12r-2 ++Uninstall haserl 0.8.0-2 ++Uninstall iptables 1.3.7-1 ++Uninstall kernel 2.4.34-brcm-1 ++Uninstall kmod-brcm-wl 2.4.34+4.80.53.0-1 ++Uninstall kmod-diag 2+2.4.34-brcm-1 ++Uninstall kmod-fs-ext2 2.4.34-brcm-1 ++Uninstall kmod-fs-msdos 2.4.34-brcm-1 ++Uninstall kmod-fs-vfat 2.4.34-brcm-1 ++Uninstall kmod-ipt-nathelper 2.4.34-brcm-1 ++Uninstall kmod-ppp 2.4.34-brcm-1 ++Uninstall kmod-pppoe 2.4.34-brcm-1 ++Uninstall kmod-scsi-core 2.4.34-brcm-1 ++Uninstall kmod-switch 2.4.34-brcm-1 ++Uninstall kmod-usb-core 2.4.34-brcm-1 ++Uninstall kmod-usb-storage 2.4.34-brcm-1 ++Uninstall kmod-usb-uhci 2.4.34-brcm-1 ++Uninstall kmod-usb2 2.4.34-brcm-1 ++Uninstall kmod-wlcompat 2.4.34+brcm-6 ++Uninstall libgcc 3.4.6-10 ++Uninstall libltdl 1.5.22-1 ++Uninstall libncurses 5.6-1 ++Uninstall libopenssl 0.9.8e-1 ++Uninstall libpopt 1.7-4 ++Uninstall libpthread 0.9.28-10 ++Uninstall libuuid 1.39-1 ++Uninstall mtd 5 ++Uninstall ntpclient 2003_194-4 ++Uninstall nvram 1 ++Uninstall openssl-util 0.9.8e-1 ++Uninstall ppp 2.4.3-8 ++Uninstall ppp-mod-pppoe 2.4.3-8 ++Uninstall ssmtp 2.61-2 ++Uninstall uclibc 0.9.28-10 ++Uninstall webif 0.3-12 ++Uninstall wget-nossl 1.10.2-2 ++Uninstall wireless-tools 29-1 ++Uninstall wlc 4.80.53.0-1 ++Uninstall wput 0.5-1 ++Uninstall zlib 1.2.3-4 ++ +++ - - - - - - - - - - - - - - - - - - - - - - - - -+ ++ +diff --git a/feeds/xwrt/webif-asterisk/MngrManual_en.html b/feeds/xwrt/webif-asterisk/MngrManual_en.html +new file mode 100644 +index 0000000..de86055 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/MngrManual_en.html +@@ -0,0 +1,1078 @@ ++ ++ ++MARS: Manager manual ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
MARS
++Mini-PBX / Wireless Router
++Manager Manual
1 - Introduction
++2 - Connections and WWW ++interface access
3 - PPPoE / DHCP ++Configuration (WAN)
++
ADSL
++Cable
++Switch
4 - WI-FI Configuration
++5 ++- Dynamic DNS Service
++6 - Asterisk ++MARS Configuration ++
System
++Extensions
++Trunks
++Servers
++Queue
++Time conditions

7 - Phone-in ++Dictation
++8 - Automated ++Dialer
++9 - WebCall
++10 ++- WebCall Form
++
Introduction

The ++installation and configuration of the MARS system can be simply ++accomplished by proceeding by steps as described by the list of topics ++above. In short, you must connect the system, configure the router, ++that is the Internet access and the wireless access point, and if ++desired the client for the dynamic DNS service. Then the PBX must be ++configured as well as the VoIP telephones.

++Some steps are optionals, according to the functions used, in which ++case this will be indicated in the text.

Required Informations

++You will need the following informations provided by your Internet ++service provider and your VoIP provider:
  • Your ++user ++name and the password for your Internet service (ADSL / PPPoE),
    • ++
  • The address of the SMTP  Server used ++to send emails.
  • The user ++name (Or DID / Tel No.) of your(s) VoIP lines ++with password and the URL (Internet address or domain name) of the ++service. 
    • ++
If you will use the dynamic DNS service you will need:
++
  • Your user ++name and password as well as your domain ++name chosen when you create your account.
++Finally if you interconnect systems together you will need:
    ++
  • The server ++names and passwords of the MARS systems as well ++as the IP address (or domain name) of all systems.
++
Connections and WWW ++interface access

Connections

First, ++connect port one of the router to your PC ++network card using a standard network cable.
++Then connect your broadband modem to the WAN connector of the router ++using a standard network cable.
++Power up the MARS system and wait until booting is done ( < 1 ++min.)

Initial ++configuration

++The local LAN address of the MARS system is set by default ++to:  192.168.1.1
++Make ++sure that the network adapter of the PC you are using is set to use a ++static IP address in the same segment, but different than the MARS ++system. For instance: 192.168.1.10
++
Open the network configuration utility (For ++Windows: ++Start | Settings | Network Connections | Local area connection.)
++Click on the "Properties" and select the Internet ++Protocol (TCP/IP).
Click again on the ++"Properties button"
++
If ++your network adapter is configured to obtain an IP address ++automatically (DHCP) or on a static address in a different network ++segment than 192.168.1.x, modify the config for the IP protocol as ++following:

++Check the "Use the following address" checkbox and set:
IP Address: ++192.168.1.10
Mask: 255.255.255.0
Gateway: 192.168.1.1

++You can now access MARS' WWW interface by pointing ++your browser to the following URL: http://192.168.1.1
++The user name is "root" ++and the password is "Mars08". ++(The pwd may be different, use the one given)

++The ++WWW interface allows you to configure the network interfaces (LAN / WAN ++/ WI-FI), the PPPoE client (ADSL) and or DHCP, the dynamic DNS client ++and give access to the configuration panels of the MARS system.
++
PPPoE / DHCP / Switch ++(WAN) Configuration ++

To ++configure the Internet connection, select the "Network" option from ++the main menu and then the "WAN-LAN" ++option.

++Important: ++The MARS system has it's own DHCP (Dynamic Host Configuration Protocol) ++ server which is used to configure the network interfaces on ++the ++local LAN and behave as a DHCP client for the WAN side (Internet). It ++is very important that only one DHCP server is activated on a given LAN ++otherwise some configuration problems would occur. In consequence, make ++sure that you modem (or any other device) does not  use it's ++DHCP ++server for the LAN, otherwise configure the device as a DHCP client or ++else disable the DHCP server and use a static IP address for the ++device. This static address must be set in the same network segment ++than the MARS system. (Usually at 192.168.1.1) For example: ++192.168.1.80.

ADSL ++Modem / ++PPPoE:

If ++you use ADSL for your internet  connection, you will need to ++configure the PPoE client to allow the system to automatically connect ++to your ISP on startup.

++- Select ++"PPPoE" ++under ++"Connection ++Type"
++- Enter the values under PPP ++Settings

 ++ ++ ++ ++ ++
Redial ++Policy Keep Alive
Redial ++Timeout 30
Username <As given by your ISP>
Password <As given by your ISP>
MTU 1492 ++ (unless your ISP say something ++else)

Make ++sure you save the changes by clicking on the "Save changes" button and ++the appy the changes  by pressing the "Apply changes" button.
++The ++system should now connect to your ISP automatically on startup. You may ++need to reboot the system (Using the "Reboot" option from the "System" ++menu option). 


Cable Modem / DHCP:

If ++you use a cable Internet connection, ++ select "DHCP" under  "Connection Type".
++Make ++sure you save the changes by ++clicking on the "Save changes" button and the appy the changes ++ by ++pressing the "Apply changes" button.
++You ++may need to "power cycle" both your cable modem and the MARS system in ++order for the cable modem's DHCP server to assign a WAN address to the ++MARS system. Turn off the power on the cable modem and disconnect the ++power cord on the MARS system and wait 1 - 2 minutes. Then power on the ++cable modem  and then the MARS system.
++You can verify the status of the connection using the "Status / ++Interface" menu option.

Switch ++/ None:
LAN ++Configuration

 ++ ++ ++
LAN ++IP Address 192.168.1.1
++
Netmask 255.255.255.0
Default ++Gateway 192.168.1.1


LAN DNS Servers Configuration
++
Enter 192.168.1.1 in the edit box and press the Add Button. You ++should then see the following under

192.168.1.1 ++ Remove

++Press the Save ++button at the bottom of the screen and then the Apply ++link to apply changes.



Connecting to the Internet

++Once the ++Internet connection configuration is done, you will need to reconfigure ++your PCs network adapter so it gets an IP address assigned by the ++system.

++- Open the Network configuration utility. (Under Windows: ++Start | Settings | Network & ++Dial up connections  | Local area Network.)
++- Press the Properties button and select Internet ++Protocol (TCP/IP).
- Press once again on the ++"Properties" button and ++select "Obtain an IP address automatically".

++

Verifying the connection.
++
You ++can verify the Internet connectivity from the main menu by selecting ++the "Status" ++menu option and then "Interfaces". ++Here is an example ++display:

WAN

++ ++
IP ++Address 216.209.xxx.xxx ++P-t-P
DNS ++Server 1 216.209.xxx.xxx
DNS ++Server 2 216.209.xxx.xxx

It may also be ++necessary to restart your ADSL / Cable modem. Remove the power on the ++MARS system and then reboot your modem ... then put the power back on ++the MARS system.  After restarting the MARS system, you should ++see than an IP address has ++been assigned to the WAN interface as well as to the DNS servers. ++Otherwise, double check your PPPoE settings.

WI-FI Configuration

To ++configure the WI-FI access point, select the "Network" menu option and ++then "Wireless". The WI-FI access point allows to connect devices with ++WI-FI network capability to your local area network. Theses devices can ++be portable computer or WI-FI VoIP phones.

++If you do not want to ++use the WI-FI access point, you can disable it by selecting "Disabled" ++under "Wireless Interface", otherwise set this to "Enabled".
++The select "WEP " under "Encryption Type" and enter a "PassPhrase" that ++will be used to create the key and press the "Generate 128 bits key" button ++to generate the key. Take note of the pass phrase and WEP key as you ++will need these to configure the client that will connect  to ++the ++access point.

Make ++sure you save ++the changes by ++clicking on the "Save changes" button and the apply the changes ++ by ++pressing the "Apply changes" button.

WI-FI Clients ++Configuration
++
It ++is impossible to describe here the exact procedure to configure the ++WI-FI clients but as a general rule, an configuration utility will be ++provided. This will allow to locate the access point and get access by ++specifying the encryption as "WEP"  using a 128 bits key and ++by ++providing either the pass phrase or WEP key used on the access point. ++You will then be able to connect the PC or WI-FI phone to the local ++LAN. The WI-FI client will memorize the informations and will use it to ++connect to the AP on startup.
Dynamic DNS Service

MARS ++provides a dynamic DNS client which can provide a fixed domain name to ++your system. The dynamic DNS service client will contact the service ++DNS server to update your public IP address when it is ++ assigned ++or renewed by your ISP.  To use this service, you must first ++create an account and the configure the system's client. You don't ++really need this service you you do not use WebCall or do not link ++multiple systems together.


DynDNS account creation

++Go to http://www.dyndns.com ++, select the "New Account" link and complete the form to ++create ++your free DynDNS account. Write down your user name, password and ++chosen domain name. You can select a domain name with different ++suffixes like dyndns.org or dyndns.biz etc ... You must supply an ++unused prefix which together with the selected suffix will form your ++unique domain name. For instance: "my-mars.dyndns.org" ++or "my-company.dyndns.biz". ++After having created your account, you will receive ++a confirmation ++at the given email address which you must reply to validate ++your ++account.



Configuration

++Once your DynDNS account has been created and activated, you can ++configure the MARS client by selecting the "Network" menu item ++and then "DynDNS".
++
++ ++ ++ ++ ++ ++
DynDNSEnable
DynDNS ++Service dyndns
User ++Name <Your ++DynDNS ++user name>
Password <dyndns account ++password>
Host ++Name <Your DynDNS ++domain ++name>. Ex: mars.dyndns.org
WildcardDisabled
Server ++Name members.dyndns.org
++
Max ++Interval (sec) 86400 ++(60 secs * 60 mins * 24 hrs ) Renew every 24 ++hours.

++Make sure you save ++the changes by ++clicking on the "Save changes" button and the apply the changes ++ by ++pressing the "Apply changes" button.

MARS ++DynDNS client will contact the DynDNS server regularly to communicate ++the current public IP address of the system. The DynDNS domain name ++servers will then be able to supply the correct IP address when someone ++request your DynDNS domain name.
++
DynDNS client ++verification

You ++can verify that the dydns client works properly by using the "ping" ++utility that is accessible from the menu under "Status" ++/ "Diagnostics". Enter your dyndns domain name in the edit box and ++press the "Ping" button. If everything works, you should get the result ++after a few seconds. The first line will indicate the IP address given ++by the DynDNS domain name server for your domain name. Example:
++ 
PING my-mars.dyndns.org (216.239.76.53): 56 data bytes
Verify ++that the given IP address is the same as displayed under "Status" / ++"Interface" for the WAN interface. If not, double check the DynDNS ++client data and make sure your account has been activated and try to ++reboot the system. ("System" / "Reboot").

MARS Configuration


To ++configure the PBX part of the MARS system you need to set the ++genral system  parameters, the extensions,  and the ++external ++lines (trunks). Then depending on the desired options the queue ++parameters and the time conditions. Finally if you want to interconnect ++MARS systems together, you will need to configure the Server section.
++
System: ++This section allows to set the general ++system parameters.

++ ++ ++ ++ ++ ++ ++
System ++ID
++(Server No): 		The "System ID" ++is used to ++establish the base extension ++when two or more MARS systems are interconnected. In this case, each ++system must use a different system ID. The "Server ID" will determinate ++which the system local extensions . The ID 1 will assign extensions ++200-203. The ID "2" will set 300 - 303, the "3" will use extensions ++"400 - 403 and finally System ID 4 will use extension 500 to 503 as ++local internal extensions. If the system is not linked to any other the ++use "Server ID" 1. (Extensions 200-203).
Service Main ++Language (E/F): This is the ++default main ++system language. Use "E" for ++English and "F" for French. For a bilingual system, the "welcome" ++message of the auto attendant allows to select the secondary language ++by pressing the "9" key.
Admin ++Email: The administrator ++email ++address. This will be used to send the daily calls reports.
SMTP ++Server: The address of the ++SMTP server ++used to send email (given by your Internet Service Provider)
Cell ++Phone Gateway Pwd: The ++access code for the Cell ++to VoIP gateway. This code should  use only disits and be of a ++minimum size of 4 or 5 digits.
Local Prefixes:  ++ This allows to get your local prefixes list ++according to your ++given area code and telephone number prefix. Enter your 3 digits area ++code and the first 3 digits of your telephone number and press the ++"Save" button to save.  The press the "Get" button to get the ++list ++of prefixes from the Internet.  (Make sure you  have ++Internet ++connectivity before using this function.)
Local ++Prefixes List: This displays the (read only) list ++of local ++prefix.

++

Extensions: ++This ++section allows to define up to four extensions used by the system. ++These extensions can use the SIP or IAX2 protocol. Only the used ++extensions should be defined.

++ ++ ++ ++ ++
ExtensionThis is the extension number. This is fixed and ++cant be modified. You will need to specify this value as the "User ID" or ++"UserName" when configuring the telephone that is attached to this ++extension.
Password: Enter ++the access code for the extension. You will ++also need this value to configure the telephone attached to this ++extension
SIP/IAX2: Enter ++SIP or IAX2 according to the protocol used ++by the VoIP phone , ATA or "softphone" ++used.
Dial: Enter ++SIP / IAX2 followed by a forward slash ++followed by the extension. Ex: SIP/200 ++ ou  IAX2/203
++
CallerID: ++ The number used to display the internal calls. ++Usually the extension number or user name. Ex: 200
EMail:The email address for the voice mail to email ++expedition for this extension. Ex: my-email@my-isp.com

IMPORTANT:  
++
  • After ++having configured the extension, you must configure the telephone ++attached to this extension using the extension number as user ++name and ++given password. (default to ext. number)

Trunks: ++This is used to configure the external lines of the system. You can ++define up to two VoIP lines using the SIP or IAX2 protocol. You can ++also define a PSTN line when using the FXO adapter.  Fill only ++the ++entries which are in use by the system. Use the "Save" button under ++each section to save any modification.

++ ++ ++ ++ ++ ++ ++ ++ ++
VoIP
ProtocolThis define the protocol used for the VoIP line. ++ Use the "Save" button if changing protocol to update display.
UserName ++(/DID) The UserName or DID (telephone number) as ++given ++by your VoIP provider.
PasswordThe password or secret for this line. (as given ++by your VoIP provider).
HostYour VoIP host. (as given by your VoIP ++provider) 
PSTN
FXO1 If you ++use an conventional external line using ++the FXO adater enter FXO1 ++( F X Oh one). otherwise leave blank.
Caller ID The phone number for this line

After ++adding a new trunk you should issue a "SIP Reload" (or "IAX Reload") ++command (from the Management  menu) and then  verify ++the ++connectivity using the "Sip Registry" (or "IAX registry") command which ++will display the status of the registrations with the service provider.
++

Servers: ++
This ++section is used to define the local and remote MARS servers when ++interconnecting systems. Up to four MARS systems can be interconnected. ++Each of the system must be assigned a unique "Server ID" ++ which ++will determine the extensions assigned to the server as well as the ++local server ID. For instance the first MARS system will be defined as ++"Server 1"  and will use extensions 200 to 203 and will be ++defined ++in the "Server 1" entry of this page. The entry "Server 2" must contain ++the informations for the server with extension 300 - 303. The "Server ++3" for the server with extension 400 - 403 and Server "4" for ++the ++one having extensions 500 to 503. The entry which correspond to the ++local server depends on it's server ID. You must specify the ++server name / password and host (static IP or DynDNS domain name) for ++all interconnected servers, including the local one.

++ ++
Server ++UserName The name assigned to the external MARS ++system  (or local)
PasswordThe password of the external MARS system (or ++local)
Host ++(IP or dyndns) The IP address  (or ++DynDNS domain name) ++of the MARS system
++
After ++the servers have been defined you should issue a "IAX Reload" command ++(from the Management  menu) on all interconnected servers. You ++can ++then verify the connectivity using the "IAX registry" command which ++will display the status of the registrations with the other systems. If ++the connection fail, check on each side if you can ping the other side ++domain name or IP address. (Using System / Diagnostics menu option). ++Once the connection is established, each side should be able to dial ++the other one by dialing it's 3 digits extensions number.
++

Queue: This ++section is used to define the usage and parameters of the call queue. ++The default value is set to use the call queue only when the automated ++attendant has been deactivated.  If desired, you can modify ++the ++queue usage here.

++ ++
Use ++Queue Define the usage of the call queue.
++"When Auto-Attendant Off" ++ Use only when the automated attendant is deactivated.
++"Always" Use ++at all time (Never use the Automated attendant)
++"Never" Do ++not use. Direct the calls directly to voice mail of main ++extension if AA is deactivated.
Queue Strategy Set ++the call handling by the call queue
++"Round Robin" ++Contact an extension then another until an extension answers.
++"Ring ++All" Ring all extensions and direct the call to the first ++one who answer.
Members:You can select the extension that will be used in ++the call queue.
++

Time ++Conditions: This ++section allow to define a schedule to allow a specific treatment ++according to the current day and time. When activated, calls received ++outside of the deffile:///Y:/openWRT/Doc/MARS_en.htmline ++working period will be directed to the voice mail ++for the main extension.

++ ++ ++ ++
Enable Activate time conditions
From ++Hours Start of opening hours.  ++Enter as hh:mm. in 24 hour format. For example: 09:00
To ++Hours End of opening hours. Enter ++as hh:mm. in ++24 hour format. For example: 18:00
Days Opening ++days. Enter as a 3 char. day ++name  (mon,tue,wed,thu,fri,sat,sun) followed by a dash ++followed by the ending day.
++Ex. mon-fri 

Phone-in Dictation

MARS Phone-In Dictation ++application is a multi-user dictation system ++that can be used with local telephone or over a VoIP line to allow ++callers to record dictation and deliver it to a receipient ++(transcriptionist) over ++the internet. The system is designed to complement or replace ++the traditional methods of ++recording and message delivery by a decentralised, ++inexpensive appliance.

++The dictation system can set to be used for a single user or multiple ++callers (recorders) and / or receivers (transcriptionnist) accounts.
++
Callers accounts can be assigned a given receiver ++account OR ++ can select the receiver account.
++The system can use caller ID to identify the caller or user ID ++/ password.

++Receivers account can be set  for each individual user ++(transcriptionist)  each with their and delivery mode ++and destination.

Configuration
++
General Phone-In ++Dial 

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Sender's Name: This will be used to ++identify the system in ++Emails.
++Enter the name that will be printed as the sender in the emails
Callers Account: Use if this is not ++checked the system will not use any ++caller account. This should be used only  
++where there is only one recording user.
++Check to use Callers Accounts to identify callers.  
++ICheck to use caller account  so that the system will try to ++match the caller ID or ask the  callers it's Id and password.
Mailbox Account: Use If unchecked the ++system will use the default ++destination.
++Check if more than one Receiver use the system.
++The system will either use the assigned mailbox or ask the account to ++to caller.
Archiving: ++Select FTP to backup all recordings to given FTP server. ++ Set to USB Only for no external backup .
FTP ++UserNameEnter ++Backup FTP user name
FTP ++PasswordEnter ++Backup FTP Password
FTP ++HostEnter ++Backup FTP Host

The callers account are used to ++identify the users who call -in to ++record dictations.


++ ++ ++ ++ ++ ++ ++

Callers ++Accounts  

User Name: Name of user
++This will be printed in the email as the sender of the message
Caller ID: Tel.No. of user
++This will be used to identify  this caller.
++The caller ID will also be prited in the destination email
Password: Password.
++If calling from a different caller IId, the caller can use the User No ++and Password to log in.
Receiver ++Account: ++ Select the receiver account
++If set to a mailbox account, the system will not ask the caller and ++record in the given  maibox account number.
++If set to UserSeclect,  allows ++this caller to select a destination account number. This ++option can be used when a caller will want to send different dictation ++to different transcriptionnist.

The Mailbox or receiver's account are used to ++identify the receivers of ++the dictations. This is used when more than one receiver or ++transcriptionnist user will use the system.

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

Mailboxes Accounts ++(Inbox) 

Account: ++ Select the user account
++Select an account number to create or edit it.
Name: Name of user.
Password: Password. 
Delivery ++mode: Select the ++delivery mode of recordings
++Select if message should be delivered by Email ++or FTP or none ++to leave the message on
++the system when you want to access the message localy through ++the WWW interface using a ++regular browser.
EMail ++ Enter the email whe the ++message for this user will be delivered. Used if email delivery ++selected.
Delivery mode: ++Select the delivery mode of recordings
EMail
FTP UserNameEnter ++Mailbox FTP user name for the user of this mailbox.
FTP PasswordEnter ++Mailbox FTP password  for the user of this mailbox.
FTP HostEnter ++Mailbox FTP host  for the user of this mailbox.

Using ++the Phone-In Dictation ++system

Recording ++a dictation.
The recording of dictations is ++done by calling in and ++follow a simple voice menu. Once the caller and the destination mailbox ++have been identified the caller is asked to the main menu. At this ++point, the system will ask to enter a recording number.
++Recordings are identified by a recording number, which allows to ++identify the recordings and to resume recording in a ++subsequent ++call.

++Record and Playback mode
++If the given recording number is a new recording, the system will ++switch to recording mode.  
++If a recording with the given number already exists, the system will ++swich to playback mode. 

Record mode
++Press the "1" key to start recording and the pound (#) key to stop. ++ Make sure you talk clearly  and directly in the ++telelephone ++microphone when recording.
++After recording you can use the "3" key to switch to playback mode. ++ The "9" key is used to erase the current recording and start ++over.
++Once a recording is completed it can be left for later addition or sent ++to the destination by pressing the "0" key.

++Record Menu
Press ++"1" to start recording.
++Press "3" to switch to ++playback mode.
++Press "9"  to ++erase and start over this recording.
Press "0" to close and send this ++recording.
Press the * Key to go back to ++the main menu.

Playback Mode
++While in playback mode some pre-defines keys allows to rewind, paus and ++go forward as follow:
++Press the "1" key to start playback. 
++Press "4" to 'rewind' 1/10 of the duration of the ++recording.
++Press "5" to pause and restart playback
++Press "6" to go forward 1/10 of the duration of the ++recording.
++Press "0" to start from the beginning.
++Press the "#" key to stop playback and go back to the menu.
++
Playback menu.
Press ++"1" to start playback.
++Press "3" to switch to ++recording mode.
++Press "0" to close and ++send this recording.
++Press the * Key to go ++back to the main menu.

Using with local extensions
++The system can be used with VoIp devices, that is VoIP phones, ++sofware phones running on a PC with sound card, conventional telephone ++with ATA adapter or VoIP WI-FI phone,  that are connected ++either ++directly or remotely to the system as extensions.  The VoIP ++telephones can be connected directly to the device through the local ++area network or directly on one of the 4 network connector on the ++appliance itself.  It is also possible to log on to the device ++as ++a normal extension from a remote location over the internet. Up to 8 ++extensions can be accomodated and these can be connected either ++directly to the device, trough the LAN or event remotely over the ++Internet.

Accessing ++the system from a local extension
++To access the dictation system from a local or remotely connected ++extension, dial the 3 digits number (from 100 to 131) of the ++destination mailbox you whish to record to.  In the case of a ++single destination use the mailbox number 100.

++Using with VoIP line
The system can also use a ++normal VoIP line using the standard ++SIP protocol as provided by numerous services providers.  The ++dictation system can then be accessed by calling a normal telephone ++number from any regular or mobile.phone. Many VoIp provider offer 'pay ++as you go' formulas that allow you to receive several simultaneous ++calls for a very low rate (as low as less tha 1 c / min)  from ++the ++whole country.  Refer to the system configuration for more ++info on ++configuration.

++Recordings
++All recordings are archived in the system's USB memory that serve as a ++static storage . The recordings are accessible through the web ++interface by selecting Asterisk and Recordings on the menu. ++Here ++is the recording's web interface


++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

New Recordings

++

Help

++
Account:  
Select the receiver account
Rec. Date SizeSend Archive
3-1.WAV  Mon Dec 22 10:17:19   34316  Send ++VEmail   Archive
3-2.WAV  Mon Dec 22 10:21:57   46016  Send ++VEmail   Archive
3-4.WAV  Mon Dec 22 11:29:00   34966  Send ++VEmail   Archive

Archive

++
12-2008   ++11-2008   ++10-2008   ++09-2008   ++08-2008   ++07-2008   ++
06-2008   ++01-2009   ++

A ++list allow to select the destination mailbox  for which the ++currently active recording are displyed. Once a recording is closed and ++sent it will be archived in a sub directory defined by ++the month ++and year the recording was done.  Recordings are named with se ++sender's number followed by the recording number.

++Recording playback and ++downlowd from a web browser.
++To play a recording, simply clink on the link  formed by the ++recording name. The recording can also be download on you local disk by ++right click on the link ans selecting "Save Link as" or a similar ++function.

++The recording can be sent to the destination as define by the mailbox ++account by seleting the "Send ++VEmail" link .
++Finally the recording can be archived by selection the "Archive" link. This ++will move the recording file to the archive directory.

++Recordings Archive
++All the recordings are archived in the USB memory  in a ++sub directory defined by the month and year the ++recording was ++done. You can select the month and year directory in the Archive ++display. The display is similar except for file names which are ++prepended the full date plus a sequence number that ++insure ++unique names.
Automated Dialer

MARS Automated Dialer ++offers sophisticated features with an easy to ++use  Web based interface to allow you to prepare and save ++calling lists.
++You can create up to 9 different lists with different phone ++numbers  lists, messages and applications.  You can ++then run ++the lists at any time you wish. 

++ ++ ++ ++ ++ ++ ++
Call List Management This allow you to ++select one of the call list for ++creation / edition
Call ++List Name: This is the name given to ++this call list. ++Informational only.
Source ++Caller ID: This will be set as the source caller ++ID for the ++outgoing calls. Note that certain ISP will not allow you to change ++this, and in this case, will have no effect.
Application: Select one of the ++application that will be run ++after the call has been replied.
++ ++ ++ ++ ++
Call and play Message Call and then ++play the message and the menu ++for message acknowledgment and hangup.
Call and Xfer to Extension Call, play ++the message and then offer to ++talk to an agent by pressing the "0" key.
Call and Xfer to queue Call, play ++the message and then ++offer to talk to an agent by pressing the "0" key. Use the queue ++defined in the Queue menu for agents extensions.
Call, play and Voice Mail Call, ++play the message and then offer to ++leave a message to Voice Mail. The message is left in the mailbox of ++the ++define extension. (see below)
Call ++and Xfer on answer. Call and transfer immediatly ++after the call ++is answered . The call is transfered to the given extension (see below)
Wait ++Time: The time to wait after call ++initiation before ++assuming there was no answer (in secs.)
Extension / Voice Mail: Extension or ++Voice Mailbox to transfer the call ++after the user asks or for the predictive dialer aplplication.
Trunk: Trunk ++to use for outgoing calls (default to SIP ++registration 1)
Max. ++Calls per Trunk: Number of simultaneous calls to ++place on the line.
Send ++Email Report: Send an email report of the results ++at the end of ++the call list. The report is sent using the SMTP server and the email ++destination address define in the System menu
Call Prefix: Some ISPs may ++require to use the "1" for ++long distance ++number.  You can either add it to your phone number list ++ or ++use the 10 digits number and enter the "1" prefix here.
Prompts:: Display if the ++prompts are present. Call and ++select *93 to record these. You can also upload a prompt recorded in ++studio from your system hard drive. Select the prompt displayed in the ++list, then select a file and the click the UploadPrompt button. These ++prompts must be recorded in "Raw muLaw". Contact us if you need help to ++convert your  recordings to the required format.
Activity Traces Display the ++call results. Press the refresh ++button to get a new display.
++
Creating ++a call list

++To create a call list, select the Dialer Sub-Menu under the Asterisk ++menu ++option. You can create up to 9 different lists with different ++features.
++First select the call list number, using the call list List Management ++selection list and the press the "refresh" button to activate it. The ++select and enter the desired parameters and click the SaveDef button to ++save the currently selected call list.

Loading the Call List

++Once the required parameters are selected and the list saved you can ++upload a call list of numbers. This is a ascii text file that contains ++one phone number per line.

Recording
++
The Dialer uses up to four user recorded prompts. These are:
++Intro: ++  This is the first prompt played after the call is answered. ++It should contains a introduction message: Ex: "Hello! Here is a message from ..."
++MainMsg: ++This is the main message you want to be played to the callee.
++Menu: ++This is the menu played after the main message. This should offer to:
++Acknowledge reception of the message. Option "1".
++To repeat the main message. Option "2"
++To hang up. Star Key
++Depending on the application, offer to transfer to an agent or to leave ++a message. Option "0".
++Here is an example of a menu prompt for the "Transfer to extension ++application":

To acknowledge the ++reception of theis message, press "1".
To repeat the ++message, Press "2".
++If you wish to ++talk to one of our agent, press "0".
To hangup, press ++the start key.
++
Bye: ++This is the parting prompt: Ex: "Thank you for listening to this ++message. Goodbye !"

++You can record these message by calling the system from any extension ++and selection *93. Select the Call List Number, then the prompt. You ++can playback, record or delete the selected prompt from the selected ++list.

++You can also upload a prompt from your system hard disc. These prompts ++must be recorded in "Raw muLaw" format. Please contact us if you need ++to have some of your recordings converted.

Starting a Campaign

++Once a call list has been defined, the call list uploaded and the ++prompts ++recorded it is ready to be used. To start calling the numbers, press ++the "Start" button. You can pause an ongoing call list by pressing the ++:Stop" button and resume it by pressing the "Resume" button.

++You can have a refreshed display of the Call Activity by pressing the ++"Refresh" button.
++A line will be displayed when a call is sent in the queue and at the ++end of the call, the result, acknowledge status and ++duration of the ++call (if answered).
++Once the call list is terminated and all call have finished, a summary ++of the campaign will be displayed and sent to the manager by  ++email ++if  this option has been selected for this call list.
++
Webcall Form
++

The ++WebCall form is displayed on your site and is used to transmit the ++call request to the MARS system.  This form can be used in any ++WWW page to send a command to your MARS system to initiate an outbound ++call in between the given extension to the user entered phone number.
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Here is the HTML code form the WebCall form ++shown on the right.
++A HTML table is used for better control of the presentation.
++Note: For more clarity the style codes have been omitted. You can copy ++the whole form HTML code from the textarea box below.

++
++ ++ ++ ++ ++ ++ ++
Call Me Now  !
First Name
Last Name
Company
Email
Area Code + ++Tel.No.
(10 digits)
++Ex: 5145551212

++
<form  name="NetCall" ++enctype="application/x-www-form-urlencoded" method="post"
++ action="http://<YOUR_MARS_URL>:32345/cgi-bin/webcall.sh">
<table border="0" ++cellpadding="1" cellspacing="1">
++<tbody><tr align="center">
++<td colspan="2">Appelez ++Moi !</td></tr>
<tr><th>Pr&eacute;nom</th>
++<td><input ++ maxlength="15" size="15" ++name="FirstName"></td></tr>
<tr><th>Nom</th>
++<td><input ++ maxlength="15" size="15" ++name="LastName"></td></tr>
<tr><th>Compagnie</th>
++<td><input ++maxlength="32" size="15" name="Company"></td></tr>
<tr><th>Courriel</th>
++<td><input ++maxlength="31" size="15" name="Email"></td></tr>
<tr><th>Code Reg. +++ Tel.No.(10 chiffres) Ex: 5145551212</th>
++<td> <input ++ maxlength="10"  size="10" ++name="TelNo"></td></tr>
<tr><td  colspan="2"></td></tr>
++<tr><td  ++colspan="2">
<input ++ name="AccountNo" ++value="200" type="hidden">
<input ++ name="Language" value="F" type="hidden">
<input ++name="Submit" value="Call Me Now !" type="submit">
++</td></tr>
++<tr><td ++style="background-color: rgb(0, 0, 153);" ++colspan="2"></td></tr>
++</tbody></table>
++</form>

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Explanation of the WebCall form fields
Field NameType
action: FormM URL ++of the WebCall server. Insert the domain name (or dyndns domain) of ++your MARS system. Exemple:
action="http://<YOUR_MARS_URL>:32345/cgi-bin/webcall.sh">
++Ex: action="http://mars.dyndns.org:32345/cgi-bin/webcall.sh" ++ (mandatory) ++
FirstName TextF Text type ++field. Max length 15 ++chars (facultative)
LastNameTextF Text type ++field. Max length 15 ++chars (facultative)
EmailTextF Text type ++field. Max length 32 chars ++(facultative)
TelNoTextMText type field.. Must ++be exactly 10 digits ++(mandatory)
AccountNo Text/HiddenM Extension ++used. (200 - 207) Hidden field (mandatory) ++Ex: ++value="200"
LanguageText/HiddenF Language ++of caller. (E ++/ F) ++Default to English ++Hidden field ++(facultative). Ex:value="F"
OnSuccessText/HiddenFURL ++to send the caller on success. This page should inform the the ++user requesting the call about the result of the procedure. This page ++should tell the user that he will shortly receive a call and maybe warn ++him to make sure it's line is available.
.If these fields are not given the user ++will be sent to the URL defined efined in the WebCall configuration ++panel or if not set a basic HTML page with result message will be ++returned.
OnDisabledText/HiddenFURL ++to send the caller when WebCall service has been disabled. This may tell the hours of availability of the service.
OnTelNoErrorText/HiddenFURL ++to send the caller when the TelNo field is not filled properly. (Only ++accepts 10 digits). This should tel the user that the procedure failed because of  an improper phone number has been given.
OnBlackListText/HiddenFURL ++to send the caller when the caller has been black listed. This should ++tell the user that he is not allowed to use the service anymore.
submit submitM Used to ++accept and submit the ++form. "submit" type field (mandatory)


Using WebCall with links .

Instead ++of using a form (and a POST method) you could also use a link ++ with a GET method.
Just create an HTML link with ++the destination phone number and the extension given as parameters.
As ++an example this would call extension 200 and then place an external ++call to 555 555-1212 (assuming your MARS system is at 192.168.1.1 )

<a ++href="http://192.168.1.1:32345/cgi-bin/webcall.sh?AccountNo=200&TelNo=5555551212"> ++Phone to dial </a>

Using ++this technique, the WebCall ++service can also be used as a web based directory  ... Just create ++a page with links to your frequenly  called number,.
You ++could also use a form pointed to your local MARS system (192.168.1.xxx) ++and have an ask for an extension to originate the call from.

Using WebCall from a browser.

Or simply enter the URL in your browser address bar:  http://192.168.1.1:32345/cgi-bin/webcall.sh?AccountNo=200&TelNo=5555551212



++
+\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/PhoneSetup_en.html b/feeds/xwrt/webif-asterisk/PhoneSetup_en.html +new file mode 100644 +index 0000000..9a434d3 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/PhoneSetup_en.html +@@ -0,0 +1,381 @@ ++ ++ ++MARS: User's Manual ++ ++ ++ ++

++
MARS
++A small hybrid PBX embedded in a WI-FI router.
Setup for ++GrandStream BT-200 Phone
Setup for X-Lite Softphone
Basic ++Settings
++
These instructions are for a GrandStream BT-200 but should be similar with any other GrandStream VoIP phone.

1- Connect your VoIP phone to one LAN port of the MARS system

2- Find the current IP Address of the phone, using the phone menu.

3- ++Point your browser to this IP address to get the GS phone's HTTP ++interface. (The default pwd is: admin) and select the "Basic Settings" ++Tab.

4- Set the telephone to use a static IP address.   ++(For simplicity, i like to use a static IP which ends with the ++extension number in the Local LAN. Ex: 192.168.1.200 for ext 200. This ++makes getting to the GS HTTP interface easier as it has a fixed IP ++address which allow to conveniently create bookmark in your browser to ++get to the GS phone interface.)
IP Address: 192.168.1.200
Subnet Mask: 255.255.255.0
Default Router: 192.168.1.1 (MARS' system LAN IP address)
DNS Server 1: 192.168.1.1 (MARS' system LAN IP address)

5-Set your TimeZone

6- Device ++Mode: Switch and save the configuration by pressing the "Update" button

7- Select the Advanced Settings Tab, and set the "Local RTP Port" ++to a value from 10000 to 10016. Each phone should be assigned a ++different RTP port with a separation of 2 port. I.e. Ext 200 uses RTP ++port 10000. Ext 201 uses 10002 ext 202 uses 10004 etc ... This step is ++not really required unless you plan to connect trough a NAT. In the ++default configuration, MARS' firewall "opens" port 10000 to 10128.

8- Save and update you changes by pressing the "Update" button

9- Select the "Account Tab" and set the following value (This example is for extension 200)
Account Name: <User Name>
SIP ++Server: 192.168.1.1 (MARS' system LAN IP address)
Sip User ID: 200 (Extension number)
Authenticate ID: 200 (Extension number)
Authenticate ++Password: 200 (Extension number)

Voice ++Mail UserID: *98
Send ++DTMF:  via RTP (RFC2833) ++
Enable ++Call Features: No
Preferred ++Vocoder: 1-PCMU  2-GSM

10- Save and update you changes by pressing the "Update" button

After this step the GS phone should register with the MARS system and be ready to use.
Try calling *77 (Send) .. the system should say the extension number.
Call 7777 (Send or #) to simulate an incoming call (Automated attendant ...)
See the user Manual for more options.
NOTE: The first call to the system will take up to 5 seconds to be answered. The next calls will then be answered immediately.
++
++ ++
Grandstream Device ++Configuration
++ ++ ++
STATUSBASIC ++SETTINGSADVANCED ++SETTINGSACCOUNT ++
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
End ++User Password:   (purposely not displayed ++for security protection)
IP Address: ++
++
dynamically ++assigned via DHCP (default) or PPPoE
(will attempt PPPoE if ++DHCP fails and following is non-blank)
++ ++ ++ ++ ++ ++
 PPPoE account ID:
 PPPoE password:
  Host ++name
(Option 12):
  Domain ++name
(Option 15):
  Vendor ++Class ID
(Option 60):
++ Preferred DNS server: . . ++.
statically configured ++as:
++ ++ ++ ++ ++ ++ ++ ++
      IP Address:  (*1)   . ++. . ++
      Subnet Mask:   . ++. .
      Default Router: (*2)   . ++. .
      DNS Server 1:(*2) ++   ++. ++. .
      DNS Server 2:   . ++. .
Time ++Zone:   ++
  Allow DHCP Option 2 to override Time Zone ++setting:
    No ++    Yes
Daylight ++Savings Time:   No ++     Yes  
++ Optional Rule:
Date ++Display Format:   Year-Month-Day
++  Month-Day-Year
++  Day-Month-Year ++
Display ++Account Name
instead of Date: 		  ++ No      Yes
 
System Device Mode
Device ++Mode:   ++Switch ++(default) NAT/Router ++     ++
 
NAT/Router Configuration ++(Not used ...)
 
WAN ++side http access:   No      Yes ++  (WAN side access to http server will be rejected if set to ++No)
Reply ++to ICMP on WAN port:   No      Yes ++  (Unit will not respond to PING from WAN side if set to No)
Cloned ++WAN MAC Addr:     ++      ++  (in hex format)
LAN Subnet Mask:   (default ++is 255.255.255.0)
LAN DHCP Base IP:   (base IP ++for the LAN port, default is 192.168.2.1)
DHCP IP Lease Time:   (in units ++of hours, default is 120 hours or 5 days)
DMZ IP:   ++
Port Forwarding:     WAN port ++   LAN IP ++           LAN ++port   Protocol
++      ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
     ++   ++   ++   ++
   ++   ++
All Rights ++Reserved Grandstream Networks, Inc. 2004-2006


(*1) ++ Set to 192.168.1.Ext ++. Ex: 192.168.1.200 for extension 200, 192.168.1.201 for ext. 201 etc.
(*2) ++ Set to the LAN IP address of the MARS system (default ++192.168.1.1)
Advanced ++Settings
++
local ++RTP port:   (1024-65535, default 5004) Select from 10000 to ++10016
Use ++random port:   No      Yes
Account 
++
++ ++
Grandstream Device ++Configuration
++ ++ ++ ++
STATUSBASIC ++SETTINGSADVANCED ++SETTINGSACCOUNT ++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

Account Name:   (e.g., ++MyCompany)
SIP ++Server:   (e.g., sip.mycompany.com, or ++IP address) MARS IP ++
Outbound ++Proxy:   (e.g., proxy.myprovider.com, or IP address, if ++any)
SIP ++User ID:   ++(the user part of an SIP address)
Authenticate ID:   (can be identical to or ++different from SIP User ID)
Authenticate ++Password:   ++(purposely not displayed for security protection)
Name:   ++(optional, e.g., John Doe)
Use DNS SRV:   ++ ++No      Yes
User ++ID is phone number:    No       Yes
SIP ++Registration:    No ++      Yes
Unregister ++On Reboot:    No       Yes
Register ++Expiration:   (in minutes. default 1 hour, max 45 days)
local ++SIP port:   (default 5060)
SIP T1 ++Timeout:  
SIP ++T2 Interval:  
NAT ++Traversal (STUN):   No     No, but ++send keep-alive     Yes
SUBSCRIBE ++for MWI:   No ++    Yes ++
Proxy-Require: ++   ++
Voice ++Mail UserID:   (User ID/extension for 3rd party voice mail ++system)
Send ++DTMF:   ++in-audio ++    via RTP (RFC2833) ++    via SIP INFO
Early ++Dial:   No ++      Yes (use "Yes" only if proxy supports 484 ++response)
Dial Plan Prefix:   (this ++prefix string is added to each dialed number)
Enable ++Call Features:   ++ No      Yes (if ++Yes, Call Forwarding & Call-Waiting-Disable are supported ++locally)
Session Expiration:   (in ++seconds. default 180 seconds)
Min-SE: ++   ++(in seconds. default and minimum 90 seconds)
Caller ++Request Timer:    No       Yes ++(Request for timer when making outbound calls)
Callee ++Request Timer:    No       Yes (When ++caller supports timer but did not request one)
Force ++Timer:    No       Yes (Use ++timer even when remote party does not support)
UAC ++Specify Refresher:   UAC ++  ++UAS     Omit (Recommended)
UAS ++Specify Refresher:   UAC   UAS (When UAC did not specify ++refresher tag)
Force INVITE:    No ++      Yes (Always refresh with ++INVITE instead of UPDATE)
Enable ++100rel:    No       Yes
Account ++Ring Tone:   system ring ++tone
  custom ring tone 1
  custom ring ++tone 2
  custom ring tone 3
++
Send Anonymous:   No ++     Yes   (caller ID will be blocked if ++set to Yes)
Anonymous Method:   Use From Header ++     Use Privacy Header  
Auto ++Answer:   No      Yes ++ 
Allow Auto Answer by Call-Info: ++   No    ++  Yes  
Turn ++off speaker on
remote disconnect: 		  ++ No      Yes ++ 
Check SIP User ID
for ++incoming INVITE: 		  No      Yes ++ 
Preferred ++Vocoder:
(in listed order)
choice ++1:   ++
choice 2: ++  ++
choice 3:   ++
choice 4:   ++		 choice 5:   ++
choice 6:   ++
choice 7:   ++
choice 8:   ++
SRTP ++Mode:   Disabled      Enabled ++but not forced       Enabled and forced   ++
Special Feature:   ++

   ++  
All Rights ++Reserved Grandstream Networks, Inc. 2004-2006
X-Lite Softphone Setup
These instructions are for X-Lite V3 but the setup is similar for most other software phones.

1- Right click on the display and select "Sip Account Setting"
2- Select add to create a new SIP account and enter the following values (This example is for extension 200):

Account:
Display Name:  <Phone's user name>
User Name: 200
Password: 200
Domain: 192.168.1.1

3- Press the Apply button and exit ...

X-lite should now connect to the MARS system.

+\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/UserManual_en.html b/feeds/xwrt/webif-asterisk/UserManual_en.html +new file mode 100644 +index 0000000..19aa609 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/UserManual_en.html +@@ -0,0 +1,967 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ MARS: User's Manual ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++

++ ++
MARS
++ ++A small hybrid PBX embedded in a WI-FI router.
++ ++User Manual

++ ++

++ ++ 1- Place a call
++ ++ ++
General rules
++ ++Internal calls (inter extensions)
++ ++Local calls
++ ++Long distance calls
++ ++International calls
++Placing a call using another system lines
++ ++
++ ++
++ ++ 2- Call Transfers
++ ++ ++
Supervised transfer
++ ++Blind transfer
++ ++Call parking.
++ ++
++ ++ 3- Functions
++ ++
++ ++ 4- Automated attendant
++ ++ ++ ++
Recording the menus
++ ++
++ ++ 5- Voice Mail
++ ++
++ ++ 6- WebCall
++ ++
++ ++ 7- Cell to VoIP gateway
++ ++
++ ++
Place a call

++ ++ General rules
++ ++
++ ++ ++
As a general rule, when dialing ++an external number you must always dial "9"  first, followed by the ++telephone number.
++ ++Most of the entries needs to be terminated either by using the '#"' (pound) key or by pressing ++the telephone's 'Send' button.
++ ++
++ ++
++ ++ Internal calls ++ ++
To call an internal extension, ++simply dial the 3 digits extension and terminate with the '#' key (or ++press the send button) Ex: 201#
++ ++
++ ++ External calls
++ ++ ++
To ++place an external call from an extension, you must first dial the '9' ++to get an external line, followed by the full 10 digits telephone ++number you  wish to reach and terminate with the '#' key (or ++'Send'). Ex:  9 5145551212 #. ++ 
++ ++
++ ++You ++can also place a call within you own area code  (as defined ++in the configuration)  by omitting the area code and dialing the ++number  as a 7 digits number. For instance, if you dial 9 5551212 # the system will insert ++ your area code in front of the number before placing the call.
++ ++
++ ++If you hear a fast busy tone, it means that all external lines are busy.
++ ++
++ ++
++ ++ Long distance calls
++ ++ ++
The ++best way to place a long distance call is to dial it as a local call, ++that is, as a 10 digits number, without pre pending a "1" in front of ++the number.
++ ++Ex:  9 4185551212 #. The ++system will then use it's database of local prefixes to determinate if ++the call is local or long distance and will route the call accordingly.
++ ++
++ ++
++ ++ Tool free calls
++ ++ ++
To call a 'tool free' number, ++ using the 800,  866, ++877, 888 prefixes,  you can enter or not the "1" ++prefix.  That is you can dial "9 ++1800 5551212 #" or "9 ++8005551212 #". The system will recognize the 'tool free' number ++and use the PSTN line in priority.
++ ++.
++ ++
++ ++ International calls
++ ++ ++
For the international calls, you ++must dial the 011 prefix as usual. Ex:  "9 011 46701234567 #".
++ ++
++ ++
++ ++ Force PSTN call
++ ++ ++
You can force a call to use the ++conventional line (PSTN) by using the prefix "8" rather than the "9". ++For example,  8 5145551212 #.
++ ++ For a long distance call you must then use the "1" prefix ++as in: Ex: 8 1 418 5551212 #. ++The "8" prefix indicate to use only the PSTN line.
++
++
++ ++ Force VoIP Call.
++
You can also tell the system to use a VoIP line exclusively by using the "7" prefix instead of the "9". For instance: : 7 5145551212 #.
++ For a long distance call, you must not enter the "1" prefix.  Ex: 7 4185551212 #. The "7" prefix indicate to the system to use a VoIP line only.
++
++
++ Place a call using the lines of another system.
++ ++
When ++MARS system are interconnected,  it makes possible to use the ++external line of a remote system to place a call. For instance the ++extension "200" on a system A in a given area code can place a call ++using the external lines of system B located in a different area code. ++To use a remore server's lines to place a call, preoend the 10 digits ++telephone number you wish to cal with " * <Server No>" (start followed by the server number (1-4), rather than the usual "9" prefix. For instance, call " *2 418 5551212 # " ++to dial the given number on server # 2 (Ext: 300-303) from an extension ++on server # 1 (Ext: 200-203).  In the other direction, call ++ " *1 514 5551212 # " from an extension on system # 2 (Ex: 300) to use a line on server #1 to place the call.
++
++
++ ++ ++
Call Transfers

++ ++After ++receiving a call, it is very easy to transfer the call to another ++extension or even to an external number. The system offers two modes of ++call transfers. The "supervised" transfer and the "non supervised" or ++"blind" transfer.
++ ++
++ ++ Supervised transfer.
++ ++ ++
After having answered the call, ++enter the sequence   " * ++0 " (star followed by zero).. ++You will then hear "Transfer". Dial the 3 digits number of the ++extension you wish to transfer the call to. Example: 201. You can then ++talk with your colleague to announce the call transfer. After you ++hang-up, the caller will immediately be connected.
++ ++Note: The "Transfer Key" of your telephone can only be used to do a ++"blind" call transfer. (See below.)
++ ++
++ ++
++ ++ Blind transfer
++ ++ ++
For a blind transfer, enter ++the sequence: " # 0 " ++(pound followed by zero) ++(or use the "Transfer" key on your telephone.) and enter the 3 digits ++number of the extension  you wish to transfer the call to. ++ Contrary to the supervised transfer, you will be disconnected ++immediately and the caller will be connected to the destination ++extension, without allowing you to talk to the the person at the ++destination extension.
++ ++
++ ++
++ ++ External transfer
++ ++ ++
To ++transfer an incoming call to an external transfer, proceed as explained ++above with the "# 0" or "* 0" sequence and enter the "9" followed by ++the 10 digits external number and terminate with "#" (or send). ++Example: ++ 9 514555 1212 #.
++ ++
++ ++
++ ++ Call parking
++ ++ ++
Rather than transferring a call, ++it can sometimes be useful to "Park" the call and retrieve it from a ++different extension.
++ ++To "park" a call, do a supervised call transfer (as explained above) to ++the extension number "700". ++The system will then tell you the extension number to be used to ++retrieve the call from any other extension. (Usually "701"). To get the parked call back, ++ enter the parked extension number (701) followed by the pound key ++("#"). Ex: 701#
++ ++
++ ++
++ ++
++ ++
Features / Functions

++ ++Here is a list of the features accessible from all ++connected extensions.
++ ++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
Unconditional Call Transfer (cancellation) *70Call this to cancel unconditional call transfer
Unconditional Call Transfer (activation) *71Activates Unconditional Call Transfer to the given ++extension or external phone number.
Call Transfer on Busy (cancellation) *72Cancellation of the Call Transfer on Busy
Call Transfer on Busy (activation) *73Activation of the call transfer when your extension is ++busy.
Do Not Disturb (cancellation) *74Cancellation of the "Do Not Disturb" feature
Do Not Disturb (activation) *75Activation of the Cancellation of the "Do Not Disturb" ++feature. Call directed to the voice mail.
Clock *76
++ ++
Extension  *77Give the extension number you are calling from (test)
Echo Test *78Replay what you say in real time.
Automated Attendant (Activation) *80Activation of the Automated Attendant (default)
Automated Attendant (Deactivation) *81Deactivation of the Automated Attendant. Calls are ++directed to the call queue or to the manager extension according to the ++configuration.
WebCall ++(Activation) *82WebCall available (default)
WebCall ++(Deactivation) *83WebCall not available. Users will receive a message ++saying that the service is not currently available.
Temporary unavailable (Cancellation) *84Deactivation 
Temporary unavailable  (activation) *85Send all calls to the manager voice mailbox, until ++deactivated.
Web Audio *88Enter the 3 digits program number or "000" to get the ++list by email.
Status AA, WebCall and TA *89Give the status of the automated attendant, WebCall and ++the "Temporarily Unavailable" .
Welcome message recording. *90Allows to record your personalized Automated ++Attendant's  "Welcome" message.
Main Menu recording (default language) *91Allows to record the AA main menu in the main language
Main Menu recording (second language) *92Allows to record the AA main menu in the second ++language (if used).
Voice Mailbox access  *98Direct access to the extension's Voice Mailbox .
Any Voice Mailbox access  *99Access to the given mailbox number. (Ask mailbox ++(extension) number and Pwd).
Cell to VoIP gateway access. 5555Access to the Cell to VoIP gateway. Enter the access ++code and then the number to dial.
Simulate an external incoming call   7777For tests.
Simulate a call on a remote system777(1-4)Simulate an external call on a remote system. The last digit is the server number (1 - 4)
++ ++ 
++ ++
Automated Attendant

++ ++The ++Automated Attendant allows an incoming call to be directed according to ++the caller selection from a vocal menu. You can record your own ++personalized welcome message by calling the system and entering "*90" , the main menu in the default ++language can be recorded using "*91" ++and finally the main menu in the second language using "*92".
++ ++
++ ++ Welcome Message
++ ++
++ ++ This ++message is used to greet the caller and, if desired, to let him to ++access the service in the second language. If you want to offer a ++choice of language for the service, this message should be ++bilingual and offer the second language by pressing the "9" key. Here ++is an example for a bilingual system with English as the default ++language:
++ ++
++ ++ Thank you for calling Tele ++Data, Merci d'appeller Tele Data, Pour un service en ++Français, faite le "9".
++ ++ Or with French as the ++default language:
++ ++ "Merci d'appeller Tele Data, ++thank you for calling Tele Data. For a service in English, please press ++"9".
++ ++For an unilingual system, record only the first sentence (omit the ++language choice).
++ ++
++ ++If the caller select the second language by pressing "9", the main menu ++will be said using the second language.
++ ++
++ ++ Main Menu
++ ++
++ ++This ++menu allows the caller to either enter a known extension number or ++select the destination by number using a menu. Here is an example.
++ ++
++ ++ If you know your party's ++extension, enter it now.
++ ++ For the sales department, press ++"1".
++ ++ For accounting, press "2".
++ ++ For technical support, ++press  "3".
++ ++ For human resources, press "4".
++ ++ ... or stay online to ++reach an operator.
++ ++
++ ++ If your system is bilingual, you will have to record the ++main menu in both languages.
++ ++
++ ++Selecting ++"1" on the main menu will direct the call to the first extension ++(Usually 200), "2" will go to the 2nd (201), "3" to the "3th" (202) and ++"4" to the 4th extension (203). If the caller does not select a ++destination after the given time, the call will be directed to the ++manager or first extension (200).
++ ++
++ ++If the call is not answered ++within 20 seconds, the caller will be invited to leave a voice mail ++message in the mailbox of the contacted extension.
++ ++
++ ++
Voice Mail

++ ++Each ++extension has their voice mail mailbox in the system.  The ++mailbox number is the same as the extension. The mailbox can be ++accessed by using "*98", ++the access code is by default the same of the extension number (i.e. ++Ext. 200 has mailbox 200 with default pwd 200)
++ ++
++ ++Function "*99" ++allows to access a mailbox different than the current extension. The ++system will then ask for the mailbox (extension) number and password.
++ ++
++ ++All ++voice mails received in all mailboxes will get immediately sent by ++email ++at the email address given in the extension configuration panel. ++ The voice messages will be sent by email as an audio attachment. ++The audio file format is WAV (MS GSM6.10) and can be played on any ++Windows system by simply double clicking on the audio message ++attachment. The MS GSM6.10 format is handled automatically on mostly ++all Windows versions.
++ ++
++ ++
WebCall

++ ++The ++WebCall service allows visitors of your WWW site to request a call by ++simply entering their telephone number in a form on your site and ++pressing the "Call Me Now" button.  The call request is received ++by the MARS system which will then call the given extension (specified ++as a hidden field in the form) , notify the agent of the WebCall ++request and then call the visitor at the given phone number and finally ++establish the communication with the agent (extension)
++ ++
++ ++The agent (extension) can then handle the call as if they would have ++called the visitor. For instance, Hello, ++Here is Paul from Acme Inc. you have requested a call ... ?
++ ++
++ ++ WebCall User's Data
++ ++
++ ++Once ++the visitor of your WWW site press the "Call Me Now !" button, the ++system will receive the call request and the data entered by the user ++and make it available from your browser at the following URL: http://<MARS IP ++ Address>/calldata.html  For example: http://192.168.1.1/calldata.html  By ++pointing your browser to this URL, you will have immediately access to ++the data entered by tour visitor, even before the beginning of the call.
++ ++
++ ++The ++easiest and quickest way to access the WebCall data is to create a link ++on your PCs desktop to the page mentioned above. This way you will have ++access to the information as soon as you are notified of the request.
++ ++
++ ++ Black List
++ ++
++ ++The ++"Black List" allows to block the request of a user that would abuse the ++system. To add an user to the list, simply click on the "Add To Black ++List" button on the call data display (see above). The telephone number ++and the IP address will be memorized and the user will be notified that ++he is not allowed to use the service on any future call request.
++ ++
++ ++ Activation / Deactivation
++ ++ The ++WebCall service is active by default, that is, it is ready to receive a ++call request from a form on your WWW site. You can deactivate the ++service by using the "*83" ++sequence and activate it using "*82". ++When the service is deactivated, the users will be warned that the ++service is currently unavailable.
++ ++
++ ++
Cell to VoIP ++gateway

++ ++MARS ++also supply a gateway to allow a mobile phone user (cell) to place long ++distance call from using the system's VoIP line. Just call the system ++on the conventional line and enter the "extension" 5555 followed by ++the gateway's password (as defined in the system config.). From ++then on you can dial the 10 digits phone number of the number you wish ++to call. Do not enter the "9"  nor the "1" prefix for long ++distance.
++ ++
++ ++The system will use the VoIP line to place the cal and voilà ! A ++long distance call from your mobile at VoIP cost !
++ ++
++ ++
Web Audio

++ ++Web ++Audio offers hundreds of quality audio archive program. You can access ++this function by dialing "*88". The system will then ask for the 3 ++digits program number. The system will then download the audio program ++and will play it for you. The required time for the download will vary ++depending on the duration of the program and will usually be of a few ++seconds up to about 30 - 45 seconds for a one hour program.
++ ++
++ ++While ++playing, you can forward one minute by pressing the "6" key ++or rewind one minute by pressing "4". You can also pause and ++restart the playback by pressing "5" or interrupt it and go back to the ++program menu by pressing the "#" key.
++ ++
++ ++Program list
++ ++
++ ++You ++can receive the program list and their 3 digits codes by email by ++entering "000" as the program number. The system will then send the ++list at the manager email address (extension 200).
++ ++
++ ++ Among our favorites:
++ ++
++ ++Hell's Bell's A radio history of the telephone. Excellent ! 8 episodes ++of 30 mins each.  Progr: 201 ++à 208
++ ++Jim Lowell, Apollo 13. An interview with Apollo 13 mission's ++commandant" from "Tech Nations"  Progr: 505
++ ++Science is NOT funny : "Dr. Science" and "Saint-Silicon" Interview with ++humorists Progr: 559
++ ++ ++ ++ 
Bram Stroker: Dracula (excerpts) Part 1: (700) Part 2: (701) Part 3 (702)
++ ++
++ ++
++ ++ ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/.svn/all-wcprops b/feeds/xwrt/webif-asterisk/etc/.svn/all-wcprops +new file mode 100644 +index 0000000..bece713 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/.svn/all-wcprops +@@ -0,0 +1,11 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 51 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc ++END ++ipkg.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 61 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/ipkg.conf ++END +diff --git a/feeds/xwrt/webif-asterisk/etc/.svn/entries b/feeds/xwrt/webif-asterisk/etc/.svn/entries +new file mode 100644 +index 0000000..ccc1da1 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/.svn/entries +@@ -0,0 +1,77 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-asterisk/etc ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++config ++dir ++ ++init.d ++dir ++ ++asterisk ++dir ++ ++rc.d ++dir ++ ++crontab ++dir ++ ++ipkg.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++c321fe6910d7b12c6ffd658866a86e8a ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++361 ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/.svn/text-base/ipkg.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/.svn/text-base/ipkg.conf.svn-base +new file mode 100644 +index 0000000..64fe79e +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/.svn/text-base/ipkg.conf.svn-base +@@ -0,0 +1,7 @@ ++src Asterisk.1.4 http://members.home.nl/hans.zandbelt/openwrt/8.09/mipsel/packages/ ++src X-WRT http://downloads.x-wrt.org/xwrt/kamikaze/7.09/brcm-2.4/packages/ ++src packages http://downloads.openwrt.org/kamikaze/packages/mipsel/ ++src release http://downloads.openwrt.org/kamikaze/7.09/brcm-2.4/packages/ ++dest root / ++dest ram /tmp ++dest usb-mem /mnt/disc0_1/packages +\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/all-wcprops b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/all-wcprops +new file mode 100644 +index 0000000..3fe9e0c +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/all-wcprops +@@ -0,0 +1,263 @@ ++K 25 ++svn:wc:ra_dav:version-url ++V 60 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk ++END ++say.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/say.conf ++END ++extensions.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 76 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/extensions.conf ++END ++codecs.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/codecs.conf ++END ++voicemail_additional.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 86 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/voicemail_additional.conf ++END ++users.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/users.conf ++END ++amd.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/amd.conf ++END ++queues_custom.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/queues_custom.conf ++END ++cdr_manager.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/cdr_manager.conf ++END ++cdr_custom.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 76 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/cdr_custom.conf ++END ++indications.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/indications.conf ++END ++enum.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/enum.conf ++END ++rtp.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/rtp.conf ++END ++voicemail.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 75 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/voicemail.conf ++END ++cdr.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/cdr.conf ++END ++manager.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 73 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/manager.conf ++END ++misdn.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/misdn.conf ++END ++extensions.ael ++K 25 ++svn:wc:ra_dav:version-url ++V 75 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/extensions.ael ++END ++privacy.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 73 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/privacy.conf ++END ++features.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/features.conf ++END ++iax.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/iax.conf ++END ++sip_notify.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 76 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/sip_notify.conf ++END ++musiconhold.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 77 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/musiconhold.conf ++END ++asterisk.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/asterisk.conf ++END ++res_snmp.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/res_snmp.conf ++END ++extconfig.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 75 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/extconfig.conf ++END ++iaxprov.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 73 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/iaxprov.conf ++END ++dnsmgr.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/dnsmgr.conf ++END ++sip.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/sip.conf ++END ++smdi.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/smdi.conf ++END ++osp.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 69 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/osp.conf ++END ++gtalk.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/gtalk.conf ++END ++queues.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/queues.conf ++END ++modules.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 73 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/modules.conf ++END ++iax_custom.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 76 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/iax_custom.conf ++END ++muted.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 71 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/muted.conf ++END ++logger.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/logger.conf ++END ++h323.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/h323.conf ++END ++http.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 70 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/http.conf ++END ++alarmreceiver.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 79 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/alarmreceiver.conf ++END ++agents.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/agents.conf ++END ++followme.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 74 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/followme.conf ++END ++jabber.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 72 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/jabber.conf ++END ++sip_custom.conf ++K 25 ++svn:wc:ra_dav:version-url ++V 76 ++/svn/!svn/ver/4828/trunk/package/webif-asterisk/etc/asterisk/sip_custom.conf ++END +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/entries b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/entries +new file mode 100644 +index 0000000..52767fb +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/entries +@@ -0,0 +1,1490 @@ ++10 ++ ++dir ++4987 ++http://x-wrt.googlecode.com/svn/trunk/package/webif-asterisk/etc/asterisk ++http://x-wrt.googlecode.com/svn ++ ++ ++ ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2dee665f-611b-0410-ab39-d748a57cfec1 ++ ++say.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++99f502acae1c850b997430019a70324c ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6893 ++ ++extensions.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++40742bbc2f56190ada0f79b3a14dafa5 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++38091 ++ ++codecs.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++96c73b7456a11d3636e23672c976b9d7 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1655 ++ ++voicemail_additional.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++d784fa8b6d98d27699781bd9a7cf19f0 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2 ++ ++users.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++8fceb2ff1065fa841f36a7a5a69555de ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2203 ++ ++amd.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++38bc9e65bd30515c0580b5b8b55997a7 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++767 ++ ++queues_custom.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++4a57c2cc72567fb77eaf68741184e8fd ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++193 ++ ++cdr_manager.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++93803a4797bf9fc3237140f08c263f39 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++75 ++ ++cdr_custom.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++77a3c4587fc878572f995f68cbeea2ef ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++388 ++ ++indications.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++c5ff7f0cb65f9ac661db92048c4011d4 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++24418 ++ ++enum.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++0b4e5309bd7af2c678b60e462d48cbea ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++585 ++ ++rtp.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++79da865d48eec02eabed3a3175f9866d ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++397 ++ ++voicemail.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++4a7f806acb7072897d05160e37f261de ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++916 ++ ++cdr.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++71df8fce902b5c60340b41b5372a10dd ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2957 ++ ++misdn.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++43a2c0b6d5bad5b5a59c33bf92973792 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++9269 ++ ++manager.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++4cea7cf064c7f3d10a46a93d4a4a3aa6 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1399 ++ ++extensions.ael ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++5c5b9df9aae56cf90377f483f18db1a7 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++12237 ++ ++privacy.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++0e6eb2c35cd1ef9232910793f1dc5a44 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++81 ++ ++features.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++56346311a356f7c30a207255f2345588 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++4951 ++ ++iax.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++707a56096dd637ece545dae9a1955f48 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1847 ++ ++sip_notify.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++42ca0a423ad2ee1772e6a93450aea661 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++317 ++ ++musiconhold.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++07b3b8d27fcc9c278b56b915f40152d2 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++119 ++ ++asterisk.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++b865f67d57cf8a98ea4a5a0a36e5fbd0 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++565 ++ ++res_snmp.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++cf7163a1f761797a82c403df06cfa048 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++244 ++ ++extconfig.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++fa8847b682b0cc424cf46fa912ea4c2c ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1327 ++ ++iaxprov.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++ab525d3056cba32e47bd225e1f5b82a0 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2354 ++ ++dnsmgr.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++d260ad8169ae2910f8837703e133d510 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++188 ++ ++sip.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++72462970724af37c87917aeb826ccc21 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1591 ++ ++smdi.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++a7e64456a64b4c2f68d06df168d4908b ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1498 ++ ++osp.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++f8cb767c9532c0676e0b706e288b3858 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1961 ++ ++gtalk.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++3b87f98028efc77c8a0b49f4a75cea5f ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++479 ++ ++queues.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++d1ab9054e104ee3a98f5f11e742dc7a5 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++6806 ++ ++modules.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++ebd8b5334b49e856d0359604fc49a447 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7582 ++ ++iax_custom.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++1fa27ca9bc7e938a251ffc7cf38b4e7a ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++70 ++ ++muted.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++eba4097713b470c62ecf62de0da65816 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++1261 ++ ++logger.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++27b95ca682d0746945a851f059a96d83 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2158 ++ ++h323.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++aa8864064489c774c1c3fc616d459a0a ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++7304 ++ ++http.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++3599bcaacbd9e4e3706be2de5b144e5b ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++523 ++ ++alarmreceiver.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++f8f9f8c03d74c47991d3db8a1c0c9f30 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2227 ++ ++agents.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++115c73c72d0c2c9b18a08efb35f98047 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++2338 ++ ++followme.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++edba916dab912d7c8b6662df282aca5a ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++3782 ++ ++jabber.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++bd427858694a2e28ed634f44dccd2642 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++729 ++ ++sip_custom.conf ++file ++ ++ ++ ++ ++2013-03-17T12:17:53.000000Z ++83f300684935eee081ae56e34d3a5fb1 ++2009-11-15T06:46:08.349908Z ++4828 ++kemen04 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++58 ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/agents.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/agents.conf.svn-base +new file mode 100644 +index 0000000..cee61d8 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/agents.conf.svn-base +@@ -0,0 +1,90 @@ ++[general] ++; ++; Define whether callbacklogins should be stored in astdb for ++; persistence. Persistent logins will be reloaded after ++; Asterisk restarts. ++; ++persistentagents=yes ++; ++; Agent configuration ++; ++; ++[agents] ++; ++; Define autologoff times if appropriate. This is how long ++; the phone has to ring with no answer before the agent is ++; automatically logged off (in seconds) ++; ++;autologoff=15 ++; ++; Define ackcall to require an acknowledgement by '#' when ++; an agent logs in using agentcallbacklogin. Default is "no". ++; ++;ackcall=no ++; ++; Define wrapuptime. This is the minimum amount of time when ++; after disconnecting before the caller can receive a new call ++; note this is in milliseconds. ++; ++;wrapuptime=5000 ++; ++; Define the default musiconhold for agents ++; musiconhold => music_class ++; ++;musiconhold => default ++; ++; Define updatecdr. This is whether or not to change the source ++; channel in the CDR record for this call to agent/agent_id so ++; that we know which agent generates the call ++; ++;updatecdr=no ++; ++; Group memberships for agents (may change in mid-file) ++; ++;group=3 ++;group=1,2 ++;group= ++; ++; -------------------------------------------------- ++; This section is devoted to recording agent's calls ++; The keywords are global to the chan_agent channel driver ++; ++; Enable recording calls addressed to agents. It's turned off by default. ++;recordagentcalls=yes ++; ++; The format to be used to record the calls: wav, gsm, wav49. ++; By default its "wav". ++;recordformat=gsm ++; ++; Insert into CDR userfield a name of the the created recording ++; By default it's turned off. ++;createlink=yes ++; ++; The text to be added to the name of the recording. Allows forming a url link. ++;urlprefix=http://localhost/calls/ ++; ++; The optional directory to save the conversations in. The default is ++; /var/spool/asterisk/monitor ++;savecallsin=/var/calls ++; ++; An optional custom beep sound file to play to always-connected agents. ++;custom_beep=beep ++; ++; -------------------------------------------------- ++; ++; This section contains the agent definitions, in the form: ++; ++; agent => agentid,agentpassword,name ++; ++;agent => 1001,4321,Mark Spencer ++;agent => 1002,4321,Will Meadows ++ ++;agent => 300,300,Ext300 ++;agent => 301,301,Ext301 ++;agent => 302,302,Ext302 ++;agent => 303,303,Ext303 ++;agent => 304,304,Ext304 ++;agent => 305,305,Ext305 ++;agent => 306,306,Ext306 ++;agent => 307,307,Ext307 ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/alarmreceiver.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/alarmreceiver.conf.svn-base +new file mode 100644 +index 0000000..bf767de +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/alarmreceiver.conf.svn-base +@@ -0,0 +1,80 @@ ++; ++; alarmreceiver.conf ++; ++; Sample configuration file for the Asterisk alarm receiver application. ++; ++ ++ ++[general] ++ ++; ++; Specify a timestamp format for the metadata section of the event files ++; Default is %a %b %d, %Y @ %H:%M:%S %Z ++ ++timestampformat = %a %b %d, %Y @ %H:%M:%S %Z ++ ++; ++; Specify a command to execute when the caller hangs up ++; ++; Default is none ++; ++ ++;eventcmd = yourprogram -yourargs ... ++ ++; ++; Specify a spool directory for the event files. This setting is required ++; if you want the app to be useful. Event files written to the spool ++; directory will be of the template event-XXXXXX, where XXXXXX is a random ++; and unique alphanumeric string. ++; ++; Default is none, and the events will be dropped on the floor. ++; ++ ++eventspooldir = /tmp ++ ++; ++; The alarmreceiver app can either log the events one-at-a-time to individual ++; files in the spool directory, or it can store them until the caller ++; disconnects and write them all to one file. ++; ++; The default setting for logindividualevents is no. ++; ++ ++logindividualevents = no ++ ++; ++; The timeout for receiving the first DTMF digit is adjustable from 1000 msec. ++; to 10000 msec. The default is 2000 msec. Note: if you wish to test the ++; receiver by entering digits manually, set this to a reasonable time out ++; like 10000 milliseconds. ++ ++fdtimeout = 2000 ++ ++; ++; The timeout for receiving subsequent DTMF digits is adjustable from ++; 110 msec. to 4000 msec. The default is 200 msec. Note: if you wish to test ++; the receiver by entering digits manually, set this to a reasonable time out ++; like 4000 milliseconds. ++; ++ ++sdtimeout = 200 ++ ++; ++; The loudness of the ACK and Kissoff tones is adjustable from 100 to 8192. ++; The default is 8192. This shouldn't need to be messed with, but is included ++; just in case there are problems with signal levels. ++; ++ ++loudness = 8192 ++ ++; ++; The db-family setting allows the user to capture statistics on the number of ++; calls, and the errors the alarm receiver sees. The default is for no ++; db-family name to be defined and the database logging to be turned off. ++; ++ ++;db-family = yourfamily: ++ ++; ++; End of alarmreceiver.conf ++; +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/amd.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/amd.conf.svn-base +new file mode 100644 +index 0000000..ce4808a +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/amd.conf.svn-base +@@ -0,0 +1,18 @@ ++; ++; Answering Machine Detection Configuration ++; ++ ++[general] ++initial_silence = 2500 ; Maximum silence duration before the greeting. ++ ; If exceeded then MACHINE. ++greeting = 1500 ; Maximum length of a greeting. If exceeded then MACHINE. ++after_greeting_silence = 800 ; Silence after detecting a greeting. ++ ; If exceeded then HUMAN ++total_analysis_time = 5000 ; Maximum time allowed for the algorithm to decide ++ ; on a HUMAN or MACHINE ++min_word_length = 100 ; Minimum duration of Voice to considered as a word ++between_words_silence = 50 ; Minimum duration of silence after a word to consider ++ ; the audio what follows as a new word ++maximum_number_of_words = 3 ; Maximum number of words in the greeting. ++ ; If exceeded then MACHINE ++silence_threshold = 256 +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/asterisk.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/asterisk.conf.svn-base +new file mode 100644 +index 0000000..3d4305f +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/asterisk.conf.svn-base +@@ -0,0 +1,20 @@ ++[directories] ++astetcdir => /etc/asterisk ++astmoddir => /usr/lib/asterisk/modules ++astvarlibdir => /usr/lib/asterisk ++astdatadir => /usr/lib/asterisk ++astagidir => /usr/lib/asterisk/agi-bin ++astspooldir => /var/spool/asterisk ++astrundir => /var/run ++astlogdir => /var/log/asterisk ++ ++;[options] ++;internal_timing = yes ++;systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues ++; Changing the following lines may compromise your security. ++;[files] ++;astctlpermissions = 0660 ++;astctlowner = root ++;astctlgroup = apache ++;astctl = asterisk.ctl ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr.conf.svn-base +new file mode 100644 +index 0000000..2070d2b +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr.conf.svn-base +@@ -0,0 +1,70 @@ ++; ++; Asterisk Call Detail Record engine configuration ++; ++; CDR is Call Detail Record, which provides logging services via a variety of ++; pluggable backend modules. Detailed call information can be recorded to ++; databases, files, etc. Useful for billing, fraud prevention, compliance with ++; Sarbanes-Oxley aka The Enron Act, QOS evaluations, and more. ++; ++ ++[general] ++ ++; Define whether or not to use CDR logging. Setting this to "no" will override ++; any loading of backend CDR modules. Default is "yes". ++enable=yes ++ ++; Define the CDR batch mode, where instead of posting the CDR at the end of ++; every call, the data will be stored in a buffer to help alleviate load on the ++; asterisk server. Default is "no". ++; ++; WARNING WARNING WARNING ++; Use of batch mode may result in data loss after unsafe asterisk termination ++; ie. software crash, power failure, kill -9, etc. ++; WARNING WARNING WARNING ++; ++;batch=no ++ ++; Define the maximum number of CDRs to accumulate in the buffer before posting ++; them to the backend engines. 'batch' must be set to 'yes'. Default is 100. ++;size=100 ++ ++; Define the maximum time to accumulate CDRs in the buffer before posting them ++; to the backend engines. If this time limit is reached, then it will post the ++; records, regardless of the value defined for 'size'. 'batch' must be set to ++; 'yes'. Note that time is in seconds. Default is 300 (5 minutes). ++;time=300 ++ ++; The CDR engine uses the internal asterisk scheduler to determine when to post ++; records. Posting can either occur inside the scheduler thread, or a new ++; thread can be spawned for the submission of every batch. For small batches, ++; it might be acceptable to just use the scheduler thread, so set this to "yes". ++; For large batches, say anything over size=10, a new thread is recommended, so ++; set this to "no". Default is "no". ++;scheduleronly=no ++ ++; When shutting down asterisk, you can block until the CDRs are submitted. If ++; you don't, then data will likely be lost. You can always check the size of ++; the CDR batch buffer with the CLI "cdr status" command. To enable blocking on ++; submission of CDR data during asterisk shutdown, set this to "yes". Default ++; is "yes". ++;safeshutdown=yes ++; ++ ++; Normally, CDR's are not closed out until after all extensions are finished ++; executing. By enabling this option, the CDR will be ended before executing ++; the "h" extension so that CDR values such as "end" and "billsec" may be ++; retrieved inside of of this extension. ++;endbeforehexten=no ++ ++[csv] ; NOTE IMPORTANT MUST BE UNCOMMENTED for Master.csv to be written ++; usegmtime=no ;log date/time in GMT ++;loguniqueid=yes ;log uniqueid ++loguserfield=yes ;log user field ++ ++;[radius] ++;usegmtime=yes ;log date/time in GMT ++;loguniqueid=yes ;log uniqueid ++;loguserfield=yes ;log user field ++; Set this to the location of the radiusclient-ng configuration file ++; The default is /etc/radiusclient-ng/radiusclient.conf ++;radiuscfg => /usr/local/etc/radiusclient-ng/radiusclient.conf +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr_custom.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr_custom.conf.svn-base +new file mode 100644 +index 0000000..4af17c3 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr_custom.conf.svn-base +@@ -0,0 +1,6 @@ ++; ++; Mappings for custom config file ++; ++[mappings] ++Master.csv => "${CDR(clid)}","${CDR(src)}","${CDR(dst)}","${CDR(dcontext)}","${CDR(channel)}","${CDR(dstchannel)}","${CDR(lastapp)}","${CDR(lastdata)}","${CDR(start)}","${CDR(answer)}","${CDR(end)}","${CDR(duration)}","${CDR(billsec)}","${CDR(disposition)}","${CDR(amaflags)}","${CDR(accountcode)}","${CDR(uniqueid)}","${CDR(userfield)}" ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr_manager.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr_manager.conf.svn-base +new file mode 100644 +index 0000000..d359038 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/cdr_manager.conf.svn-base +@@ -0,0 +1,7 @@ ++; ++; Asterisk Call Management CDR ++; ++[general] ++; enabled = no ++enabled = yes ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/codecs.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/codecs.conf.svn-base +new file mode 100644 +index 0000000..c8caeab +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/codecs.conf.svn-base +@@ -0,0 +1,65 @@ ++[speex] ++; CBR encoding quality [0..10] ++; used only when vbr = false ++quality => 3 ++ ++; codec complexity [0..10] ++; tradeoff between cpu/quality ++complexity => 2 ++ ++; perceptual enhancement [true / false] ++; improves clarity of decoded speech ++enhancement => true ++ ++; voice activity detection [true / false] ++; reduces bitrate when no voice detected, used only for CBR ++; (implicit in VBR/ABR) ++vad => true ++ ++; variable bit rate [true / false] ++; uses bit rate proportionate to voice complexity ++vbr => true ++ ++; available bit rate [bps, 0 = off] ++; encoding quality modulated to match this target bit rate ++; not recommended with dtx or pp_vad - may cause bandwidth spikes ++abr => 0 ++ ++; VBR encoding quality [0-10] ++; floating-point values allowed ++vbr_quality => 4 ++ ++; discontinuous transmission [true / false] ++; stops transmitting completely when silence is detected ++; pp_vad is far more effective but more CPU intensive ++dtx => false ++ ++; preprocessor configuration ++; these options only affect Speex v1.1.8 or newer ++ ++; enable preprocessor [true / false] ++; allows dsp functionality below but incurs CPU overhead ++preprocess => false ++ ++; preproc voice activity detection [true / false] ++; more advanced equivalent of DTX, based on voice frequencies ++pp_vad => false ++ ++; preproc automatic gain control [true / false] ++pp_agc => false ++pp_agc_level => 8000 ++ ++; preproc denoiser [true / false] ++pp_denoise => false ++ ++; preproc dereverb [true / false] ++pp_dereverb => false ++pp_dereverb_decay => 0.4 ++pp_dereverb_level => 0.3 ++ ++ ++[plc] ++; for all codecs which do not support native PLC ++; this determines whether to perform generic PLC ++; there is a minor performance penalty for this ++genericplc => true +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/dnsmgr.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/dnsmgr.conf.svn-base +new file mode 100644 +index 0000000..5125487 +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/dnsmgr.conf.svn-base +@@ -0,0 +1,5 @@ ++[general] ++enable=yes ; enable creation of managed DNS lookups ++ ; default is 'no' ++refreshinterval=1200 ; refresh managed DNS lookups every seconds ++ ; default is 300 (5 minutes) +\ No newline at end of file +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/enum.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/enum.conf.svn-base +new file mode 100644 +index 0000000..b7e02bf +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/enum.conf.svn-base +@@ -0,0 +1,22 @@ ++; ++; ENUM Configuration for resolving phone numbers over DNS ++; ++; Sample config for Asterisk ++; This file is reloaded at "reload enum" in the CLI ++; ++[general] ++; ++; The search list for domains may be customized. Domains are searched ++; in the order they are listed here. ++; ++search => e164.arpa ++; ++; If you'd like to use the E.164.org public ENUM registry in addition ++; to the official e164.arpa one, uncomment the following line ++; ++;search => e164.org ++; ++; As there are more H323 drivers available you have to select to which ++; drive a H323 URI will map. Default is "H323". ++; ++h323driver => H323 +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/extconfig.conf.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/extconfig.conf.svn-base +new file mode 100644 +index 0000000..a6c399f +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/extconfig.conf.svn-base +@@ -0,0 +1,53 @@ ++; ++; Static and realtime external configuration ++; engine configuration ++; ++; Please read doc/extconfig.txt for basic table ++; formatting information. ++; ++[settings] ++; ++; Static configuration files: ++; ++; file.conf => driver,database[,table] ++; ++; maps a particular configuration file to the given ++; database driver, database and table (or uses the ++; name of the file as the table if not specified) ++; ++;uncomment to load queues.conf via the odbc engine. ++; ++;queues.conf => odbc,asterisk,ast_config ++; ++; The following files CANNOT be loaded from Realtime storage: ++; asterisk.conf ++; extconfig.conf (this file) ++; logger.conf ++; ++; Additionally, the following files cannot be loaded from ++; Realtime storage unless the storage driver is loaded ++; early using 'preload' statements in modules.conf: ++; manager.conf ++; cdr.conf ++; rtp.conf ++; ++; ++; Realtime configuration engine ++; ++; maps a particular family of realtime ++; configuration to a given database driver, ++; database and table (or uses the name of ++; the family if the table is not specified ++; ++;example => odbc,asterisk,alttable ++;example2 => ldap,"dc=oxymium,dc=net",example2 ++; ++;iaxusers => odbc,asterisk ++;iaxpeers => odbc,asterisk ++;sipusers => odbc,asterisk ++;sippeers => odbc,asterisk ++;voicemail => odbc,asterisk ++;extensions => odbc,asterisk ++;queues => odbc,asterisk ++;queue_members => odbc,asterisk ++ +diff --git a/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/extensions.ael.svn-base b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/extensions.ael.svn-base +new file mode 100644 +index 0000000..0c09bbc +--- /dev/null ++++ b/feeds/xwrt/webif-asterisk/etc/asterisk/.svn/text-base/extensions.ael.svn-base +@@ -0,0 +1,447 @@ ++// ++// Example AEL config file ++// ++// ++// Static extension configuration file, used by ++// the pbx_config module. This is where you configure all your ++// inbound and outbound calls in Asterisk. ++// ++// This configuration file is reloaded ++// - With the "extensions reload" command in the CLI ++// - With the "reload" command (that reloads everything) in the CLI ++ ++// The "Globals" category contains global variables that can be referenced ++// in the dialplan by using the GLOBAL dialplan function: ++// ${GLOBAL(VARIABLE)} ++// ${${GLOBAL(VARIABLE)}} or ${text${GLOBAL(VARIABLE)}} or any hybrid ++// Unix/Linux environmental variables are reached with the ENV dialplan ++// function: ${ENV(VARIABLE)} ++// ++ ++globals { ++ CONSOLE="Console/dsp"; // Console interface for demo ++ //CONSOLE=Zap/1 ++ //CONSOLE=Phone/phone0 ++ IAXINFO=guest; // IAXtel username/password ++ //IAXINFO="myuser:mypass"; ++ TRUNK="Zap/g2"; // Trunk interface ++ // ++ // Note the 'g2' in the TRUNK variable above. It specifies which group (defined ++ // in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in ++ // the specified group. The four possible options are: ++ // ++ // g: select the lowest-numbered non-busy Zap channel ++ // (aka. ascending sequential hunt group). ++ // G: select the highest-numbered non-busy Zap channel ++ // (aka. descending sequential hunt group). ++ // r: use a round-robin search, starting at the next highest channel than last ++ // time (aka. ascending rotary hunt group). ++ // R: use a round-robin search, starting at the next lowest channel than last ++ // time (aka. descending rotary hunt group). ++ // ++ TRUNKMSD=1; // MSD digits to strip (usually 1 or 0) ++ //TRUNK=IAX2/user:pass@provider ++}; ++ ++// ++// Any category other than "General" and "Globals" represent ++// extension contexts, which are collections of extensions. ++// ++// Extension names may be numbers, letters, or combinations ++// thereof. If an extension name is prefixed by a '_' ++// character, it is interpreted as a pattern rather than a ++// literal. In patterns, some characters have special meanings: ++// ++// X - any digit from 0-9 ++// Z - any digit from 1-9 ++// N - any digit from 2-9 ++// [1235-9] - any digit in the brackets (in this example, 1,2,3,5,6,7,8,9) ++// . - wildcard, matches anything remaining (e.g. _9011. matches ++// anything starting with 9011 excluding 9011 itself) ++// ! - wildcard, causes the matching process to complete as soon as ++// it can unambiguously determine that no other matches are possible ++// ++// For example the extension _NXXXXXX would match normal 7 digit dialings, ++// while _1NXXNXXXXXX would represent an area code plus phone number ++// preceded by a one. ++// ++// Each step of an extension is ordered by priority, which must ++// always start with 1 to be considered a valid extension. The priority ++// "next" or "n" means the previous priority plus one, regardless of whether ++// the previous priority was associated with the current extension or not. ++// The priority "same" or "s" means the same as the previously specified ++// priority, again regardless of whether the previous entry was for the ++// same extension. Priorities may be immediately followed by a plus sign ++// and another integer to add that amount (most useful with 's' or 'n'). ++// Priorities may then also have an alias, or label, in ++// parenthesis after their name which can be used in goto situations ++// ++// Contexts contain several lines, one for each step of each ++// extension, which can take one of two forms as listed below, ++// with the first form being preferred. One may include another ++// context in the current one as well, optionally with a ++// date and time. Included contexts are included in the order ++// they are listed. ++// ++//context name { ++// exten-name => { ++// application(arg1,arg2,...); ++// ++// Timing list for includes is ++// ++//